@saltcorn/plugins-loader 0.9.5-beta.9 → 0.9.6-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/plugins-loader",
-  "version": "0.9.5-beta.9",
+  "version": "0.9.6-beta.0",
   "description": "Saltcorn plugin loader",
   "homepage": "https://saltcorn.com",
   "scripts": {
@@ -10,7 +10,8 @@
   },
   "dependencies": {
     "env-paths": "^2.2.0",
-    "@saltcorn/data": "0.9.5-beta.9"
+    "npm-registry-fetch": "16.0.0",
+    "@saltcorn/data": "0.9.6-beta.0"
   },
   "author": "Christian Hugo",
   "license": "MIT",

package/plugin_installer.js

@@ -25,6 +25,17 @@ const readPackageJson = async (filePath) => {
   else return null;
 };
 
+const npmInstallNeeded = (oldPckJSON, newPckJSON) => {
+  const oldDeps = oldPckJSON.dependencies || {};
+  const oldDevDeps = oldPckJSON.devDependencies || {};
+  const newDeps = newPckJSON.dependencies || {};
+  const newDevDeps = newPckJSON.devDependencies || {};
+  return (
+    JSON.stringify(oldDeps) !== JSON.stringify(newDeps) ||
+    JSON.stringify(oldDevDeps) !== JSON.stringify(newDevDeps)
+  );
+};
+
 class PluginInstaller {
   constructor(plugin, opts = {}) {
     this.plugin = plugin;
@@ -55,9 +66,14 @@ class PluginInstaller {
     const installer = async () => {
       if (await this.prepPluginsFolder(force, pckJSON)) {
         const tmpPckJSON = await this.removeDependencies(
-          await readPackageJson(this.tempPckJsonPath)
+          await readPackageJson(this.tempPckJsonPath),
+          true
         );
-        await this.npmInstall(tmpPckJSON);
+        if (
+          !pckJSON ||
+          npmInstallNeeded(await this.removeDependencies(pckJSON), tmpPckJSON)
+        )
+          await this.npmInstall(tmpPckJSON);
         await this.movePlugin();
         if (await tarballExists(this.plugin)) await removeTarball(this.plugin);
       }
@@ -88,7 +104,7 @@ class PluginInstaller {
       version: pckJSON.version,
       plugin_module: module,
       location: this.pluginDir,
-      name: this.name,
+      name: this.plugin.name,
       loadedWithReload,
     };
   }
@@ -100,29 +116,30 @@ class PluginInstaller {
 
   async prepPluginsFolder(force, pckJSON) {
     let wasLoaded = false;
+    const folderExists = await pathExists(this.pluginDir);
     switch (this.plugin.source) {
       case "npm":
         if (
           (force && !(await this.versionIsInstalled(pckJSON))) ||
-          !(await pathExists(this.pluginDir))
+          !folderExists
         ) {
           wasLoaded = await downloadFromNpm(this.plugin, this.tempDir, pckJSON);
         }
         break;
       case "github":
-        if (force || !(await pathExists(this.pluginDir))) {
+        if (force || !folderExists) {
           await downloadFromGithub(this.plugin, this.tempDir);
           wasLoaded = true;
         }
         break;
       case "local":
-        if (force || !(await pathExists(this.pluginDir))) {
+        if (force || !folderExists) {
           await copy(this.plugin.location, this.tempDir);
           wasLoaded = true;
         }
         break;
       case "git":
-        if (force || !(await pathExists(this.pluginDir))) {
+        if (force || !folderExists) {
           await gitPullOrClone(this.plugin, this.tempDir);
           this.pckJsonPath = join(this.pluginDir, "package.json");
           wasLoaded = true;
@@ -176,7 +193,7 @@ class PluginInstaller {
     }
   }
 
-  async removeDependencies(tmpPckJSON) {
+  async removeDependencies(tmpPckJSON, writeToDisk) {
     const pckJSON = { ...tmpPckJSON };
     const oldDepsLength = Object.keys(pckJSON.dependencies || {}).length;
     const oldDevDepsLength = Object.keys(pckJSON.devDependencies || {}).length;
@@ -188,8 +205,9 @@ class PluginInstaller {
     if (pckJSON.dependencies) staticsRemover(pckJSON.dependencies);
     if (pckJSON.devDependencies) staticsRemover(pckJSON.devDependencies);
     if (
-      Object.keys(pckJSON.dependencies || {}).length !== oldDepsLength ||
-      Object.keys(pckJSON.devDependencies || {}).length !== oldDevDepsLength
+      writeToDisk &&
+      (Object.keys(pckJSON.dependencies || {}).length !== oldDepsLength ||
+        Object.keys(pckJSON.devDependencies || {}).length !== oldDevDepsLength)
     )
       await writeFile(
         join(this.tempDir, "package.json"),
@@ -199,6 +217,7 @@ class PluginInstaller {
   }
 
   async npmInstall(pckJSON) {
+    getState().log(5, `NPM install plugin: ${pckJSON.name}`);
     const isWindows = process.platform === "win32";
     if (
       Object.keys(pckJSON.dependencies || {}).length > 0 ||
@@ -222,12 +241,24 @@ class PluginInstaller {
 
   async movePlugin() {
     const isWindows = process.platform === "win32";
+    const copyMove = async () => {
+      await cp(this.tempDir, this.pluginDir, { recursive: true, force: true });
+      try {
+        await rm(this.tempDir, { recursive: true });
+      } catch (error) {
+        getState().log(2, `Error removing temp folder ${this.tempDir}`);
+      }
+    };
     if (await pathExists(this.pluginDir))
       await rm(this.pluginDir, { recursive: true });
     await mkdir(this.pluginDir, { recursive: true });
-    if (!isWindows) await rename(this.tempDir, this.pluginDir);
-    else
-      await cp(this.tempDir, this.pluginDir, { recursive: true, force: true });
+    if (!isWindows) {
+      try {
+        await rename(this.tempDir, this.pluginDir);
+      } catch (error) {
+        await copyMove();
+      }
+    } else await copyMove();
   }
 }