@saltcorn/plugins-loader 1.1.0-beta.2 → 1.1.0-beta.21

package/download_utils.js

@@ -69,13 +69,15 @@ const loadTarball = (rootFolder, url, name) => {
           } else
             reject(
               new Error(
-                `Error downloading tarball: http code ${redirect.statusCode}`
+                `Error downloading tarball from ${url}: http code ${redirect.statusCode}`
               )
             );
         });
       } else if (res.statusCode !== 200)
         reject(
-          new Error(`Error downloading tarball: http code ${res.statusCode}`)
+          new Error(
+            `Error downloading tarball from ${url}: http code ${res.statusCode}`
+          )
         );
       else {
         const filePath = await writeTarball(res);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/plugins-loader",
-  "version": "1.1.0-beta.2",
+  "version": "1.1.0-beta.21",
   "description": "Saltcorn plugin loader",
   "homepage": "https://saltcorn.com",
   "scripts": {
@@ -11,7 +11,7 @@
   "dependencies": {
     "env-paths": "^2.2.0",
     "npm-registry-fetch": "17.1.0",
-    "@saltcorn/data": "1.1.0-beta.2"
+    "@saltcorn/data": "1.1.0-beta.21"
   },
   "author": "Christian Hugo",
   "license": "MIT",

package/plugin_installer.js

@@ -111,10 +111,10 @@ class PluginInstaller {
         await this.movePlugin(wasInstalled);
         if (await tarballExists(this.rootFolder, this.plugin))
           await removeTarball(this.rootFolder, this.plugin);
+        pckJSON = await readPackageJson(this.pckJsonPath);
+        const msg = this.checkEngineWarning(pckJSON);
+        if (msg && !msgs.includes(msg)) msgs.push(msg);
       }
-      pckJSON = await readPackageJson(this.pckJsonPath);
-      const msg = this.checkEngineWarning(pckJSON);
-      if (msg && !msgs.includes(msg)) msgs.push(msg);
     };
     await installer();
     let module = null;
@@ -125,15 +125,21 @@ class PluginInstaller {
       // but without a valid node modules folder
       module = await this.loadMainFile(pckJSON);
     } catch (e) {
-      getState().log(
-        2,
-        `Error loading plugin ${this.plugin.name}. Removing and trying again.`
-      );
       if (force) {
+        getState().log(
+          2,
+          `Error loading plugin ${this.plugin.name}. Removing and trying again.`
+        );
         await this.remove();
         pckJSON = null;
         await installer();
-      }
+      } else
+        getState().log(
+          2,
+          `Error loading plugin ${this.plugin.name}. Trying again with reload flag. ` +
+            "A server restart may be required."
+        );
+
       module = await this.loadMainFile(pckJSON, true);
       loadedWithReload = true;
     }
@@ -287,7 +293,13 @@ class PluginInstaller {
           });
         }
         child.on("exit", (exitCode, signal) => {
-          resolve({ success: exitCode === 0 });
+          if (exitCode !== 0) {
+            reject(
+              new Error(
+                `NPM install failed for ${pckJSON.name} with exit code ${exitCode}`
+              )
+            );
+          } else resolve();
         });
         child.on("error", (msg) => {
           reject(msg);

package/stable_versioning.js

@@ -17,7 +17,7 @@ const doCheck = (pluginVersion, versionInfos, scVersion) => {
     getState().log(4, `invalid saltcorn version: ${scVersion}`);
     return true;
   }
-  return semver.satisfies(scVersion, scEngine);
+  return semver.satisfies(scVersion, scEngine, { includePrerelease: true });
 };
 
 /**
@@ -83,7 +83,7 @@ const isEngineSatisfied = (scEngine, scVersion) => {
     getState().log(4, `invalid saltcorn version: ${scVersion}`);
     return true;
   }
-  return semver.satisfies(safeScVersion, scEngine);
+  return semver.satisfies(safeScVersion, scEngine, { includePrerelease: true });
 };
 
 /**