fix graaljs

devsnek · Jun 20, 2022 · d6fc0d2 · iamstolis · Jul 7, 2022 · d6fc0d2
1 parent bd523e5
commit d6fc0d2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/engines/graaljs.js b/src/engines/graaljs.js
@@ -62,12 +62,15 @@ class GraalJSInstaller extends Installer {
   async install() {
     const root = `graalvm-ce-java11-${this.version}`;
     if (platform === 'darwin-x64') {
+      await this.registerAsset(`${root}/Contents/Home/languages/js/graaljs.jar`);
       await this.registerAsset(`${root}/Contents/Home/languages/js/lib/libjsvm.dylib`);
       this.binPath = await this.registerBinary(`${root}/Contents/Home/languages/js/bin/js`, 'graaljs');
     } else if (platform === 'win32-x64') {
+      await this.registerAsset(`${root}/languages/js/graaljs.jar`);
       await this.registerAsset(`${root}/languages/js/lib/jsvm.dll`);
       this.binPath = await this.registerBinary(`${root}/languages/js/bin/js.exe`, 'graaljs.exe');
     } else {
+      await this.registerAsset(`${root}/languages/js/graaljs.jar`);
       await this.registerAsset(`${root}/languages/js/lib/libjsvm.so`);
       this.binPath = await this.registerBinary(`${root}/languages/js/bin/js`, 'graaljs');
     }

diff --git a/src/installer.js b/src/installer.js
@@ -12,6 +12,8 @@ const fetch = require('node-fetch');
 const { ESVU_PATH, ensureDirectory, symlink, platform, rmdir } = require('./common');
 const Logger = require('./logger');
 
+const DL_FILE_PREFIX = 'esvu-';
+
 function hash(string) {
   const h = crypto.createHash('md5');
   h.update(string);
@@ -67,7 +69,7 @@ class EngineInstaller {
           throw new Error(`Got ${r.status}`);
         }
         const rURL = new URL(r.url);
-        const l = path.join(os.tmpdir(), hash(url) + path.extname(rURL.pathname));
+        const l = path.join(os.tmpdir(), DL_FILE_PREFIX + hash(url) + path.extname(rURL.pathname));
         const sink = fs.createWriteStream(l);
         const progress = logger.progress(+r.headers.get('content-length'));
         await new Promise((resolve, reject) => {
@@ -176,6 +178,9 @@ class EngineInstaller {
         }
       });
     });
+    if (files.length === 0) {
+      throw new Error(`No files matched ${pattern}`);
+    }
     await Promise.all(files.map((file) =>
       this.registerAsset(path.relative(this.extractedPath, file))));
   }