From 388e1e9135030ca87be9e5b4ff0114507df6844e Mon Sep 17 00:00:00 2001
From: MiaoWoo <admin@yumc.pw>
Date: Tue, 24 Sep 2019 10:10:17 +0800
Subject: [PATCH] fix: module download error at windows remove okhttp lib

Signed-off-by: MiaoWoo <admin@yumc.pw>
---
 pom.xml                            | 19 -------------------
 src/main/resources/core/require.js | 10 ++++++----
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8c2cf96..e21b652 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,10 +33,6 @@
                     <artifactSet>
                         <includes>
                             <include>org.kamranzafar:jtar</include>
-                            <include>com.squareup.okhttp3:okhttp</include>
-                            <include>com.squareup.okio:okio</include>
-                            <include>org.jetbrains.kotlin:kotlin-stdlib</include>
-                            <include>org.jetbrains.kotlin:kotlin-stdlib-common</include>
                         </includes>
                     </artifactSet>
                 </configuration>
@@ -167,21 +163,6 @@
             <artifactId>jtar</artifactId>
             <version>2.3</version>
         </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
-            <version>1.3.50</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib-common</artifactId>
-            <version>1.3.50</version>
-        </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
diff --git a/src/main/resources/core/require.js b/src/main/resources/core/require.js
index 9acf4b0..f448258 100644
--- a/src/main/resources/core/require.js
+++ b/src/main/resources/core/require.js
@@ -230,8 +230,9 @@
         // handle name es6-map/implement => es6-map @ms/common/dist/reflect => @ms/common
         var name_arr = name.split('/');
         var module_name = name.startsWith('@') ? name_arr[0] + '/' + name_arr[1] : name_arr[0];
-        var tempFile = Files.createTempDirectory('MiaoScript').resolve(module_name + '.tgz');
-        Files.copy(new URL('https://repo.yumc.pw/repository/npm/' + module_name).openStream(), tempFile, StandardCopyOption.REPLACE_EXISTING)
+        // at windows need replace file name java.lang.IllegalArgumentException: Invalid prefix or suffix
+        var tempFile = Files.createTempFile(module_name.replace('/', '_'), 'json');
+        Files.copy(new URL('https://repo.yumc.pw/repository/npm/' + module_name).openStream(), tempFile, StandardCopyOption.REPLACE_EXISTING);
         var info = JSON.parse(new java.lang.String(Files.readAllBytes(tempFile), 'UTF-8'));
         var url = info.versions[info['dist-tags']['latest']].dist.tarball;
         console.log('node_module ' + module_name + ' not found at local but exist at internet ' + url + ' downloading...')
@@ -258,9 +259,10 @@
         optional = __assign({ cache: true }, optional);
         if (file === undefined) {
             try {
-                if (optional.recursive || notFoundModules[name]) {
+                // excloud local dir, prevent too many recursive call and cache not found module
+                if (name.startsWith('.') || name.startsWith('/') || optional.recursive || notFoundModules[name]) {
                     console.log(name, path, optional, notFoundModules[name])
-                    throw new Error("Can't found module " + name + ' in network!')
+                    throw new Error("Can't found module " + name + ' at local or network!')
                 }
                 optional.recursive = true;
                 return _require(download(name), path, optional);