@saltcorn/plugins-loader 0.9.6-beta.0 → 0.9.6-beta.1

package/download_utils.js

@@ -9,17 +9,15 @@ const { createWriteStream, unlink } = require("fs");
 const { get } = require("https");
 const npmFetch = require("npm-registry-fetch");
 
-const rootFolder = process.cwd();
-
-const downloadFromGithub = async (plugin, pluginDir) => {
+const downloadFromGithub = async (plugin, rootFolder, pluginDir) => {
   const tarballUrl = `https://api.github.com/repos/${plugin.location}/tarball`;
   const fileName = plugin.name.split("/").pop();
-  const filePath = await loadTarball(tarballUrl, fileName);
+  const filePath = await loadTarball(rootFolder, tarballUrl, fileName);
   await mkdir(pluginDir, { recursive: true });
   await extractTarball(filePath, pluginDir);
 };
 
-const downloadFromNpm = async (plugin, pluginDir, pckJson) => {
+const downloadFromNpm = async (plugin, rootFolder, pluginDir, pckJson) => {
   const pkgInfo = await npmFetch.json(
     `https://registry.npmjs.org/${plugin.location}`
   );
@@ -32,14 +30,14 @@ const downloadFromNpm = async (plugin, pluginDir, pckJson) => {
   else {
     const tarballUrl = pkgInfo.versions[vToInstall].dist.tarball;
     const fileName = plugin.name.split("/").pop();
-    const filePath = await loadTarball(tarballUrl, fileName);
+    const filePath = await loadTarball(rootFolder, tarballUrl, fileName);
     await mkdir(pluginDir, { recursive: true });
     await extractTarball(filePath, pluginDir);
     return true;
   }
 };
 
-const loadTarball = (url, name) => {
+const loadTarball = (rootFolder, url, name) => {
   const options = {
     headers: {
       "User-Agent": "request",
@@ -94,7 +92,6 @@ const loadTarball = (url, name) => {
  * @param plugin
  */
 const gitPullOrClone = async (plugin, pluginDir) => {
-  await fs.promises.mkdir("git_plugins", { recursive: true });
   let keyfnm,
     setKey = `-c core.sshCommand="ssh -oBatchMode=yes -o 'StrictHostKeyChecking no'" `;
   if (plugin.deploy_private_key) {
@@ -125,12 +122,12 @@ const extractTarball = async (tarFile, destination) => {
   });
 };
 
-const tarballExists = async (plugin) => {
+const tarballExists = async (rootFolder, plugin) => {
   const fileName = `${plugin.name.split("/").pop()}.tar.gz`;
   return await pathExists(join(rootFolder, "plugins_folder", fileName));
 };
 
-const removeTarball = async (plugin) => {
+const removeTarball = async (rootFolder, plugin) => {
   const fileName = `${plugin.name.split("/").pop()}.tar.gz`;
   await rm(join(rootFolder, "plugins_folder", fileName));
 };

package/package.json

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

package/plugin_installer.js

@@ -39,7 +39,8 @@ const npmInstallNeeded = (oldPckJSON, newPckJSON) => {
 class PluginInstaller {
   constructor(plugin, opts = {}) {
     this.plugin = plugin;
-    this.rootFolder = opts.rootFolder || process.cwd();
+    this.rootFolder =
+      opts.rootFolder || envPaths("saltcorn", { suffix: "plugins" }).data;
     this.tempRootFolder =
       opts.tempRootFolder || envPaths("saltcorn", { suffix: "tmp" }).temp;
     const tokens =
@@ -75,7 +76,8 @@ class PluginInstaller {
         )
           await this.npmInstall(tmpPckJSON);
         await this.movePlugin();
-        if (await tarballExists(this.plugin)) await removeTarball(this.plugin);
+        if (await tarballExists(this.rootFolder, this.plugin))
+          await removeTarball(this.rootFolder, this.plugin);
       }
       pckJSON = await readPackageJson(this.pckJsonPath);
     };
@@ -123,12 +125,17 @@ class PluginInstaller {
           (force && !(await this.versionIsInstalled(pckJSON))) ||
           !folderExists
         ) {
-          wasLoaded = await downloadFromNpm(this.plugin, this.tempDir, pckJSON);
+          wasLoaded = await downloadFromNpm(
+            this.plugin,
+            this.rootFolder,
+            this.tempDir,
+            pckJSON
+          );
         }
         break;
       case "github":
         if (force || !folderExists) {
-          await downloadFromGithub(this.plugin, this.tempDir);
+          await downloadFromGithub(this.plugin, this.rootFolder, this.tempDir);
           wasLoaded = true;
         }
         break;
@@ -153,7 +160,8 @@ class PluginInstaller {
     const isWindows = process.platform === "win32";
     const ensureFn = async (folder) => {
       const pluginsFolder = join(this.rootFolder, folder);
-      if (!(await pathExists(pluginsFolder))) await mkdir(pluginsFolder);
+      if (!(await pathExists(pluginsFolder)))
+        await mkdir(pluginsFolder, { recursive: true });
       const symLinkDst = join(pluginsFolder, "node_modules");
       const symLinkSrc = (await isGitCheckout())
         ? join(__dirname, "..", "..", "node_modules")