@saltcorn/cli 1.5.0-beta.9 → 1.5.0-rc.2

package/oclif.manifest.json

@@ -258,6 +258,25 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "syncOnReconnect": {
+          "description": "Run Synchronizations and return into online mode when the network connection is restored. When disabled, you still can do this manually.",
+          "name": "syncOnReconnect",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "pushSync": {
+          "description": "When offline mode is enabled, synchronize the synchedTables tables when a push notification is received.",
+          "name": "pushSync",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "syncInterval": {
+          "description": "Perdiodic interval (in minutes) to run synchronizations in the background. This is just a min interval, depending on system conditions, the actual time may be longer.",
+          "name": "syncInterval",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "provisioningProfile": {
           "description": "This profile will be used to sign your app",
           "name": "provisioningProfile",
@@ -1153,6 +1172,42 @@
         "plugins.js"
       ]
     },
+    "pre-install-modules": {
+      "aliases": [],
+      "args": {
+        "pluginSelector": {
+          "description": "Either 'all' to pre-install all plugins or one specific plugin name",
+          "name": "pluginSelector",
+          "required": true
+        }
+      },
+      "description": "Pre-install modules required by Saltcorn before running the application.",
+      "flags": {
+        "store_endpoint": {
+          "description": "Saltcorn Modules Store endpoint",
+          "name": "store_endpoint",
+          "required": false,
+          "default": "https://store.saltcorn.com/api/extensions",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "pre-install-modules",
+      "pluginAlias": "@saltcorn/cli",
+      "pluginName": "@saltcorn/cli",
+      "pluginType": "core",
+      "strict": true,
+      "enableJsonFlag": false,
+      "isESM": false,
+      "relativePath": [
+        "src",
+        "commands",
+        "pre-install-modules.js"
+      ]
+    },
     "prepare": {
       "aliases": [],
       "args": {},
@@ -1860,9 +1915,16 @@
           "multiple": false,
           "type": "option"
         },
-        "syncTimestamp": {
+        "newSyncTimestamp": {
           "description": "new timestamp for the sync_info rows",
-          "name": "syncTimestamp",
+          "name": "newSyncTimestamp",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "oldSyncTimestamp": {
+          "description": "TODO",
+          "name": "oldSyncTimestamp",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -2253,5 +2315,5 @@
       ]
     }
   },
-  "version": "1.5.0-beta.9"
+  "version": "1.5.0-rc.2"
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@saltcorn/cli",
   "description": "Command-line interface for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
-  "version": "1.5.0-beta.9",
+  "version": "1.5.0-rc.2",
   "author": "Tom Nielsen @glutamate",
   "bin": {
     "saltcorn": "./bin/saltcorn"
@@ -11,13 +11,13 @@
   "dependencies": {
     "@oclif/core": "4.4.0",
     "@oclif/plugin-plugins": "^5.4.26",
-    "@saltcorn/admin-models": "1.5.0-beta.9",
-    "@saltcorn/common-code": "1.5.0-beta.9",
-    "@saltcorn/data": "1.5.0-beta.9",
-    "@saltcorn/mobile-app": "1.5.0-beta.9",
-    "@saltcorn/mobile-builder": "1.5.0-beta.9",
-    "@saltcorn/plugins-loader": "1.5.0-beta.9",
-    "@saltcorn/server": "1.5.0-beta.9",
+    "@saltcorn/admin-models": "1.5.0-rc.2",
+    "@saltcorn/common-code": "1.5.0-rc.2",
+    "@saltcorn/data": "1.5.0-rc.2",
+    "@saltcorn/mobile-app": "1.5.0-rc.2",
+    "@saltcorn/mobile-builder": "1.5.0-rc.2",
+    "@saltcorn/plugins-loader": "1.5.0-rc.2",
+    "@saltcorn/server": "1.5.0-rc.2",
     "contractis": "^0.1.0",
     "dateformat": "^4.6.3",
     "inquirer": "^12.3.3",

package/src/commands/build-app.js

@@ -137,6 +137,9 @@ class BuildAppCommand extends Command {
         autoPublicLogin: flags.autoPublicLogin,
         showContinueAsPublicUser: flags.showContinueAsPublicUser,
         allowOfflineMode: flags.allowOfflineMode,
+        syncOnReconnect: flags.syncOnReconnect,
+        pushSync: flags.pushSync,
+        syncInterval: flags.syncInterval,
         allowShareTo: flags.allowShareTo,
         plugins: await this.uniquePlugins(flags.includedPlugins),
         copyTargetDir: flags.copyAppDirectory,
@@ -314,6 +317,26 @@ BuildAppCommand.flags = {
     description:
       "Switch to offline mode when there is no internet, sync the data when a connection is available again.",
   }),
+  syncOnReconnect: Flags.boolean({
+    name: "Sync on connection restored",
+    string: "syncOnReconnect",
+    description:
+      "Run Synchronizations and return into online mode when the network connection is restored. " +
+      "When disabled, you still can do this manually.",
+  }),
+  pushSync: Flags.boolean({
+    name: "Push sync",
+    string: "pushSync",
+    description:
+      "When offline mode is enabled, synchronize the synchedTables tables when a push notification is received.",
+  }),
+  syncInterval: Flags.string({
+    name: "Periodic Sync Interval",
+    string: "syncInterval",
+    description:
+      "Perdiodic interval (in minutes) to run synchronizations in the background. " +
+      "This is just a min interval, depending on system conditions, the actual time may be longer.",
+  }),
   provisioningProfile: Flags.string({
     name: "provisioning profile",
     string: "provisioningProfile",

package/src/commands/dev/release.js

@@ -234,6 +234,17 @@ class ReleaseCommand extends Command {
         `cli@${version} --omit=dev`,
       ),
     );
+    const isolatedDockerfile = fs.readFileSync(
+      `Dockerfile.isolated.release`,
+      "utf8",
+    );
+    fs.writeFileSync(
+      `Dockerfile.isolated.release`,
+      isolatedDockerfile.replace(
+        /cli@.* --omit=dev/,
+        `cli@${version} --omit=dev`,
+      ),
+    );
     //git commit tag and push
     runCmd("git", ["commit", "-am", "v" + version], {
       stdio: "inherit",

package/src/commands/pre-install-modules.js

@@ -0,0 +1,105 @@
+const { Command, Flags, Args } = require("@oclif/core");
+const fs = require("fs");
+const path = require("path");
+const Plugin = require("@saltcorn/data/models/plugin");
+const PluginInstaller = require("@saltcorn/plugins-loader/plugin_installer");
+const {
+  getFetchProxyOptions,
+  pluginsFolderRoot,
+} = require("@saltcorn/data/utils");
+const npmFetch = require("npm-registry-fetch");
+
+const upsertInfosFile = (plugins) => {
+  const entriesFile = path.join(pluginsFolderRoot, "store_entries.json");
+  if (!fs.existsSync(pluginsFolderRoot))
+    fs.mkdirSync(pluginsFolderRoot, { recursive: true });
+  if (!fs.existsSync(entriesFile))
+    fs.writeFileSync(
+      entriesFile,
+      JSON.stringify(plugins.map((plugin) => ({ ...plugin })))
+    );
+  else {
+    const existingEntries = JSON.parse(fs.readFileSync(entriesFile, "utf8"));
+    const updatedEntries = [...existingEntries];
+    for (const plugin of plugins) {
+      const index = updatedEntries.findIndex(
+        (entry) => entry.name === plugin.name
+      );
+      if (index !== -1) {
+        updatedEntries[index] = { ...plugin };
+      } else {
+        updatedEntries.push({ ...plugin });
+      }
+    }
+    fs.writeFileSync(entriesFile, JSON.stringify(updatedEntries));
+  }
+};
+
+const latestVersion = async (packageName) => {
+  const pkgInfo = await npmFetch.json(
+    `https://registry.npmjs.org/${packageName}`,
+    getFetchProxyOptions()
+  );
+  return pkgInfo["dist-tags"].latest;
+};
+
+class PreInstallModulesCommand extends Command {
+  async run() {
+    const { flags, args } = await this.parse(PreInstallModulesCommand);
+
+    if (args.pluginSelector === "all") {
+      const plugins = await Plugin.store_plugins_available_from_store(
+        flags.store_endpoint
+      );
+      for (const plugin of plugins) {
+        const latestVer = await latestVersion(plugin.location);
+        plugin.version = latestVer;
+        console.log(`Latest version of ${plugin.name} is ${latestVer}`);
+        const installer = new PluginInstaller(plugin, {
+          rootFolder: pluginsFolderRoot,
+        });
+        await installer.install(true, true);
+      }
+      upsertInfosFile(plugins);
+    } else {
+      const plugin = await Plugin.store_by_name(
+        args.pluginSelector,
+        flags.store_endpoint
+      );
+      if (!plugin)
+        throw new Error(
+          `Plugin ${args.pluginSelector} not found in store at ${flags.store_endpoint}`
+        );
+
+      const latestVer = await latestVersion(plugin.location);
+      plugin.version = latestVer;
+      console.log(`Latest version of ${plugin.name} is ${latestVer}`);
+      const installer = new PluginInstaller(plugin, {
+        rootFolder: pluginsFolderRoot,
+      });
+      await installer.install(true, true);
+      upsertInfosFile([plugin]);
+    }
+  }
+}
+
+PreInstallModulesCommand.description =
+  "Pre-install modules required by Saltcorn before running the application.";
+
+PreInstallModulesCommand.args = {
+  pluginSelector: Args.string({
+    required: true,
+    description:
+      "Either 'all' to pre-install all plugins or one specific plugin name",
+  }),
+};
+
+PreInstallModulesCommand.flags = {
+  store_endpoint: Flags.string({
+    description: "Saltcorn Modules Store endpoint",
+    required: false,
+    default: "https://store.saltcorn.com/api/extensions",
+  }),
+};
+
+module.exports = PreInstallModulesCommand;