@nocobase/plugin-multi-app-manager 0.14.0-alpha.6 → 0.14.0-alpha.7

package/dist/externalVersion.js

@@ -1,12 +1,12 @@
 module.exports = {
-  "@nocobase/client": "0.14.0-alpha.6",
+  "@nocobase/client": "0.14.0-alpha.7",
   "antd": "5.8.6",
   "react": "18.2.0",
   "@formily/react": "2.2.27",
   "react-router-dom": "6.14.1",
   "react-i18next": "11.18.6",
-  "@nocobase/database": "0.14.0-alpha.6",
-  "@nocobase/server": "0.14.0-alpha.6",
+  "@nocobase/database": "0.14.0-alpha.7",
+  "@nocobase/server": "0.14.0-alpha.7",
   "async-mutex": "0.3.2",
   "lodash": "4.17.21",
   "mysql2": "2.3.3",

package/dist/node_modules/qs/package.json

@@ -1 +1 @@
-{"name":"qs","description":"A querystring parser that supports nesting and arrays, with a depth limit","homepage":"https://github.com/ljharb/qs","version":"6.11.2","repository":{"type":"git","url":"https://github.com/ljharb/qs.git"},"funding":{"url":"https://github.com/sponsors/ljharb"},"main":"lib/index.js","contributors":[{"name":"Jordan Harband","email":"ljharb@gmail.com","url":"http://ljharb.codes"}],"keywords":["querystring","qs","query","url","parse","stringify"],"engines":{"node":">=0.6"},"dependencies":{"side-channel":"^1.0.4"},"devDependencies":{"@ljharb/eslint-config":"^21.0.1","aud":"^2.0.2","browserify":"^16.5.2","eclint":"^2.8.1","eslint":"=8.8.0","evalmd":"^0.0.19","for-each":"^0.3.3","has-override-mistake":"^1.0.0","has-property-descriptors":"^1.0.0","has-symbols":"^1.0.3","iconv-lite":"^0.5.1","in-publish":"^2.0.1","mkdirp":"^0.5.5","mock-property":"^1.0.0","npmignore":"^0.3.0","nyc":"^10.3.2","object-inspect":"^1.12.3","qs-iconv":"^1.0.4","safe-publish-latest":"^2.0.0","safer-buffer":"^2.1.2","tape":"^5.6.3"},"scripts":{"prepack":"npmignore --auto --commentLines=autogenerated","prepublishOnly":"safe-publish-latest && npm run dist","prepublish":"not-in-publish || npm run prepublishOnly","pretest":"npm run --silent readme && npm run --silent lint","test":"npm run tests-only","tests-only":"nyc tape 'test/**/*.js'","posttest":"aud --production","readme":"evalmd README.md","postlint":"eclint check $(git ls-files | xargs find 2> /dev/null | grep -vE 'node_modules|\\.git' | grep -v dist/)","lint":"eslint --ext=js,mjs .","dist":"mkdirp dist && browserify --standalone Qs lib/index.js > dist/qs.js"},"license":"BSD-3-Clause","publishConfig":{"ignore":["!dist/*","bower.json","component.json",".github/workflows"]},"_lastModified":"2023-09-22T08:37:41.507Z"}
+{"name":"qs","description":"A querystring parser that supports nesting and arrays, with a depth limit","homepage":"https://github.com/ljharb/qs","version":"6.11.2","repository":{"type":"git","url":"https://github.com/ljharb/qs.git"},"funding":{"url":"https://github.com/sponsors/ljharb"},"main":"lib/index.js","contributors":[{"name":"Jordan Harband","email":"ljharb@gmail.com","url":"http://ljharb.codes"}],"keywords":["querystring","qs","query","url","parse","stringify"],"engines":{"node":">=0.6"},"dependencies":{"side-channel":"^1.0.4"},"devDependencies":{"@ljharb/eslint-config":"^21.0.1","aud":"^2.0.2","browserify":"^16.5.2","eclint":"^2.8.1","eslint":"=8.8.0","evalmd":"^0.0.19","for-each":"^0.3.3","has-override-mistake":"^1.0.0","has-property-descriptors":"^1.0.0","has-symbols":"^1.0.3","iconv-lite":"^0.5.1","in-publish":"^2.0.1","mkdirp":"^0.5.5","mock-property":"^1.0.0","npmignore":"^0.3.0","nyc":"^10.3.2","object-inspect":"^1.12.3","qs-iconv":"^1.0.4","safe-publish-latest":"^2.0.0","safer-buffer":"^2.1.2","tape":"^5.6.3"},"scripts":{"prepack":"npmignore --auto --commentLines=autogenerated","prepublishOnly":"safe-publish-latest && npm run dist","prepublish":"not-in-publish || npm run prepublishOnly","pretest":"npm run --silent readme && npm run --silent lint","test":"npm run tests-only","tests-only":"nyc tape 'test/**/*.js'","posttest":"aud --production","readme":"evalmd README.md","postlint":"eclint check $(git ls-files | xargs find 2> /dev/null | grep -vE 'node_modules|\\.git' | grep -v dist/)","lint":"eslint --ext=js,mjs .","dist":"mkdirp dist && browserify --standalone Qs lib/index.js > dist/qs.js"},"license":"BSD-3-Clause","publishConfig":{"ignore":["!dist/*","bower.json","component.json",".github/workflows"]},"_lastModified":"2023-10-07T08:31:01.365Z"}

package/dist/server/server.d.ts

@@ -2,11 +2,14 @@ import { IDatabaseOptions, Transactionable } from '@nocobase/database';
 import Application, { Plugin } from '@nocobase/server';
 export type AppDbCreator = (app: Application, transaction?: Transactionable) => Promise<void>;
 export type AppOptionsFactory = (appName: string, mainApp: Application) => any;
+export type SubAppUpgradeHandler = (mainApp: Application) => Promise<void>;
 export declare class PluginMultiAppManager extends Plugin {
     appDbCreator: AppDbCreator;
     appOptionsFactory: AppOptionsFactory;
+    subAppUpgradeHandler: SubAppUpgradeHandler;
     private beforeGetApplicationMutex;
     static getDatabaseConfig(app: Application): IDatabaseOptions;
+    setSubAppUpgradeHandler(handler: SubAppUpgradeHandler): void;
     setAppOptionsFactory(factory: AppOptionsFactory): void;
     setAppDbCreator(appDbCreator: AppDbCreator): void;
     beforeLoad(): void;

package/dist/server/server.js

@@ -38,6 +38,40 @@ var import_path = __toESM(require("path"));
 var import_qs = __toESM(require("qs"));
 var import_url = require("url");
 var import_server2 = require("../server");
+const defaultSubAppUpgradeHandle = async (mainApp) => {
+  const repository = mainApp.db.getRepository("applications");
+  const findOptions = {};
+  const appSupervisor = import_server.AppSupervisor.getInstance();
+  if (appSupervisor.runningMode == "single") {
+    findOptions["filter"] = {
+      name: appSupervisor.singleAppName
+    };
+  }
+  const instances = await repository.find(findOptions);
+  for (const instance of instances) {
+    const instanceOptions = instance.get("options");
+    if ((instanceOptions == null ? void 0 : instanceOptions.standaloneDeployment) && appSupervisor.runningMode !== "single") {
+      continue;
+    }
+    const beforeSubAppStatus = import_server.AppSupervisor.getInstance().getAppStatus(instance.name);
+    const subApp = await appSupervisor.getApp(instance.name, {
+      upgrading: true
+    });
+    console.log({ beforeSubAppStatus });
+    try {
+      mainApp.setMaintainingMessage(`upgrading sub app ${instance.name}...`);
+      console.log(`${instance.name}: upgrading...`);
+      await subApp.runAsCLI(["upgrade"], { from: "user" });
+      if (!beforeSubAppStatus && import_server.AppSupervisor.getInstance().getAppStatus(instance.name) === "initialized") {
+        await import_server.AppSupervisor.getInstance().removeApp(instance.name);
+      }
+    } catch (error) {
+      console.log(`${instance.name}: upgrade failed`);
+      mainApp.logger.error(error);
+      console.error(error);
+    }
+  }
+};
 const defaultDbCreator = async (app) => {
   const databaseOptions = app.options.database;
   const { host, port, username, password, dialect, database } = databaseOptions;
@@ -90,11 +124,15 @@ const defaultAppOptionsFactory = (appName, mainApp) => {
 class PluginMultiAppManager extends import_server.Plugin {
   appDbCreator = defaultDbCreator;
   appOptionsFactory = defaultAppOptionsFactory;
+  subAppUpgradeHandler = defaultSubAppUpgradeHandle;
   beforeGetApplicationMutex = new import_async_mutex.Mutex();
   static getDatabaseConfig(app) {
     const oldConfig = app.options.database instanceof import_database.Database ? app.options.database.options : app.options.database;
     return import_lodash.default.cloneDeep(import_lodash.default.omit(oldConfig, ["migrator"]));
   }
+  setSubAppUpgradeHandler(handler) {
+    this.subAppUpgradeHandler = handler;
+  }
   setAppOptionsFactory(factory) {
     this.appOptionsFactory = factory;
   }
@@ -216,39 +254,7 @@ class PluginMultiAppManager extends import_server.Plugin {
       }
     });
     this.app.on("afterUpgrade", async (app, options) => {
-      const cliArgs = options == null ? void 0 : options.cliArgs;
-      const repository = this.db.getRepository("applications");
-      const findOptions = {};
-      const appSupervisor = import_server.AppSupervisor.getInstance();
-      if (appSupervisor.runningMode == "single") {
-        findOptions["filter"] = {
-          name: appSupervisor.singleAppName
-        };
-      }
-      const instances = await repository.find(findOptions);
-      for (const instance of instances) {
-        const instanceOptions = instance.get("options");
-        if ((instanceOptions == null ? void 0 : instanceOptions.standaloneDeployment) && appSupervisor.runningMode !== "single") {
-          continue;
-        }
-        const beforeSubAppStatus = import_server.AppSupervisor.getInstance().getAppStatus(instance.name);
-        const subApp = await appSupervisor.getApp(instance.name, {
-          upgrading: true
-        });
-        console.log({ beforeSubAppStatus });
-        try {
-          this.app.setMaintainingMessage(`upgrading sub app ${instance.name}...`);
-          console.log(`${instance.name}: upgrading...`);
-          await subApp.runAsCLI(["upgrade"], { from: "user" });
-          if (!beforeSubAppStatus && import_server.AppSupervisor.getInstance().getAppStatus(instance.name) === "initialized") {
-            await import_server.AppSupervisor.getInstance().removeApp(instance.name);
-          }
-        } catch (error) {
-          console.log(`${instance.name}: upgrade failed`);
-          this.app.logger.error(error);
-          console.error(error);
-        }
-      }
+      await this.subAppUpgradeHandler(app);
     });
     this.app.resourcer.registerActionHandlers({
       "applications:listPinned": async (ctx, next) => {

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "多应用管理器",
   "description": "Dynamically create multiple apps without separate deployments",
   "description.zh-CN": "无需单独部署即可动态创建多个应用",
-  "version": "0.14.0-alpha.6",
+  "version": "0.14.0-alpha.7",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "devDependencies": {
@@ -25,5 +25,5 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "7f2858222231c207030b57704a0bb6ebc98e4e45"
+  "gitHead": "dc958417d27ed0753439bcef192be91a03dfc30f"
 }