@nocobase/plugin-multi-app-manager 1.4.0-beta.1 → 1.5.0-alpha.3

package/dist/externalVersion.js

@@ -8,18 +8,18 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.4.0-beta.1",
+  "@nocobase/client": "1.5.0-alpha.3",
   "antd": "5.12.8",
   "react": "18.2.0",
   "@formily/react": "2.3.0",
   "antd-style": "3.7.1",
   "react-router-dom": "6.21.0",
   "react-i18next": "11.18.6",
-  "@nocobase/database": "1.4.0-beta.1",
-  "@nocobase/server": "1.4.0-beta.1",
+  "@nocobase/database": "1.5.0-alpha.3",
+  "@nocobase/server": "1.5.0-alpha.3",
   "lodash": "4.17.21",
   "mysql2": "3.11.0",
   "pg": "8.11.3",
-  "@nocobase/utils": "1.4.0-beta.1",
+  "@nocobase/utils": "1.5.0-alpha.3",
   "@formily/shared": "2.3.2"
 };

package/dist/node_modules/mariadb/package.json

@@ -1 +1 @@
-{"name":"mariadb","version":"2.5.6","description":"fast mariadb/mysql connector.","main":"promise.js","types":"types/index.d.ts","directories":{"lib":"lib","test":"test"},"private":false,"scripts":{"test":"npm run test:types-prettier && npm run test:prettier && npm run test:types && npm run test:lint && npm run test:base","test:base":"mocha --no-parallel --timeout 5000 \"test/**/*.js\" ","test:lint":"eslint \"{lib,test}/**/*.js\" ","test:types":"eslint \"types/*.ts\" ","test:types-prettier":"prettier --write \"types/*.ts\"","test:prettier":"prettier --write \"{tools,lib,test,benchmarks}/**/*.js\"","coverage":"npm run coverage:test && npm run coverage:report","coverage:test":"nyc mocha --no-parallel --timeout 5000 \"test/**/*.js\"","coverage:report":"nyc report --reporter=text-lcov > coverage.lcov && codecov","benchmark":"node ./benchmarks/benchmarks.js","generate":"node ./tools/generate-mariadb.js"},"repository":{"type":"git","url":"git+https://github.com/mariadb-corporation/mariadb-connector-nodejs.git"},"keywords":["mariadb","mysql","client","driver","connector"],"files":["lib","types/index.d.ts","promise.js","callback.js"],"engines":{"node":">= 10.13"},"author":"Diego Dupin <diego.dupin@mariadb.com>","license":"LGPL-2.1-or-later","dependencies":{"@types/geojson":"^7946.0.8","@types/node":"^17.0.10","denque":"^2.0.1","iconv-lite":"^0.6.3","long":"^5.2.0","moment-timezone":"^0.5.34","please-upgrade-node":"^3.2.0"},"devDependencies":{"@typescript-eslint/eslint-plugin":"^5.10.0","@typescript-eslint/parser":"^5.10.0","benchmark":"^2.1.4","chai":"^4.3.4","codecov":"^3.8.2","chalk":"^4.1.2","dom-parser":"^0.1.6","error-stack-parser":"^2.0.6","eslint":"^8.7.0","eslint-config-prettier":"^8.3.0","eslint-plugin-markdown":"^2.2.1","eslint-plugin-prettier":"^4.0.0","mocha":"^9.2.0","mocha-lcov-reporter":"^1.3.0","nyc":"^15.1.0","prettier":"^2.5.1","typescript":"^4.5.5"},"bugs":{"url":"https://jira.mariadb.org/projects/CONJS/"},"homepage":"https://github.com/mariadb-corporation/mariadb-connector-nodejs#readme","_lastModified":"2024-11-19T15:03:09.287Z"}
+{"name":"mariadb","version":"2.5.6","description":"fast mariadb/mysql connector.","main":"promise.js","types":"types/index.d.ts","directories":{"lib":"lib","test":"test"},"private":false,"scripts":{"test":"npm run test:types-prettier && npm run test:prettier && npm run test:types && npm run test:lint && npm run test:base","test:base":"mocha --no-parallel --timeout 5000 \"test/**/*.js\" ","test:lint":"eslint \"{lib,test}/**/*.js\" ","test:types":"eslint \"types/*.ts\" ","test:types-prettier":"prettier --write \"types/*.ts\"","test:prettier":"prettier --write \"{tools,lib,test,benchmarks}/**/*.js\"","coverage":"npm run coverage:test && npm run coverage:report","coverage:test":"nyc mocha --no-parallel --timeout 5000 \"test/**/*.js\"","coverage:report":"nyc report --reporter=text-lcov > coverage.lcov && codecov","benchmark":"node ./benchmarks/benchmarks.js","generate":"node ./tools/generate-mariadb.js"},"repository":{"type":"git","url":"git+https://github.com/mariadb-corporation/mariadb-connector-nodejs.git"},"keywords":["mariadb","mysql","client","driver","connector"],"files":["lib","types/index.d.ts","promise.js","callback.js"],"engines":{"node":">= 10.13"},"author":"Diego Dupin <diego.dupin@mariadb.com>","license":"LGPL-2.1-or-later","dependencies":{"@types/geojson":"^7946.0.8","@types/node":"^17.0.10","denque":"^2.0.1","iconv-lite":"^0.6.3","long":"^5.2.0","moment-timezone":"^0.5.34","please-upgrade-node":"^3.2.0"},"devDependencies":{"@typescript-eslint/eslint-plugin":"^5.10.0","@typescript-eslint/parser":"^5.10.0","benchmark":"^2.1.4","chai":"^4.3.4","codecov":"^3.8.2","chalk":"^4.1.2","dom-parser":"^0.1.6","error-stack-parser":"^2.0.6","eslint":"^8.7.0","eslint-config-prettier":"^8.3.0","eslint-plugin-markdown":"^2.2.1","eslint-plugin-prettier":"^4.0.0","mocha":"^9.2.0","mocha-lcov-reporter":"^1.3.0","nyc":"^15.1.0","prettier":"^2.5.1","typescript":"^4.5.5"},"bugs":{"url":"https://jira.mariadb.org/projects/CONJS/"},"homepage":"https://github.com/mariadb-corporation/mariadb-connector-nodejs#readme","_lastModified":"2024-11-21T01:47:12.362Z"}

package/dist/server/models/application.js

@@ -41,7 +41,11 @@ class ApplicationModel extends import_database.Model {
       ...(0, import_utils.merge)(appOptions, appModelOptions),
       name: appName
     };
-    return new import_server.Application(subAppOptions);
+    const subApp = new import_server.Application(subAppOptions);
+    subApp.on("afterStart", () => {
+      mainApp.emit("subAppStarted", subApp);
+    });
+    return subApp;
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/server/server.d.ts

@@ -20,6 +20,7 @@ export declare class PluginMultiAppManagerServer extends Plugin {
     appOptionsFactory: AppOptionsFactory;
     subAppUpgradeHandler: SubAppUpgradeHandler;
     static getDatabaseConfig(app: Application): IDatabaseOptions;
+    handleSyncMessage(message: any): Promise<void>;
     setSubAppUpgradeHandler(handler: SubAppUpgradeHandler): void;
     setAppOptionsFactory(factory: AppOptionsFactory): void;
     setAppDbCreator(appDbCreator: AppDbCreator): void;

package/dist/server/server.js

@@ -148,6 +148,31 @@ class PluginMultiAppManagerServer extends import_server.Plugin {
     }
     return import_lodash.default.cloneDeep(import_lodash.default.omit(oldConfig, ["migrator"]));
   }
+  async handleSyncMessage(message) {
+    const { type } = message;
+    if (type === "subAppStarted") {
+      const { appName } = message;
+      const model = await this.app.db.getRepository("applications").findOne({
+        filter: {
+          name: appName
+        }
+      });
+      if (!model) {
+        return;
+      }
+      if (import_server.AppSupervisor.getInstance().hasApp(appName)) {
+        return;
+      }
+      const subApp = model.registerToSupervisor(this.app, {
+        appOptionsFactory: this.appOptionsFactory
+      });
+      subApp.runCommand("start", "--quickstart");
+    }
+    if (type === "removeApp") {
+      const { appName } = message;
+      await import_server.AppSupervisor.getInstance().removeApp(appName);
+    }
+  }
   setSubAppUpgradeHandler(handler) {
     this.subAppUpgradeHandler = handler;
   }
@@ -176,6 +201,12 @@ class PluginMultiAppManagerServer extends import_server.Plugin {
         const subApp = model.registerToSupervisor(this.app, {
           appOptionsFactory: this.appOptionsFactory
         });
+        subApp.on("afterStart", async () => {
+          this.sendSyncMessage({
+            type: "subAppStarted",
+            appName: name
+          });
+        });
         const quickstart = async () => {
           await this.appDbCreator(subApp, {
             transaction,
@@ -190,8 +221,17 @@ class PluginMultiAppManagerServer extends import_server.Plugin {
         }
       }
     );
-    this.db.on("applications.afterDestroy", async (model) => {
+    this.db.on("applications.afterDestroy", async (model, options) => {
       await import_server.AppSupervisor.getInstance().removeApp(model.get("name"));
+      this.sendSyncMessage(
+        {
+          type: "removeApp",
+          appName: model.get("name")
+        },
+        {
+          transaction: options.transaction
+        }
+      );
     });
     const self = this;
     async function LazyLoadApplication({
@@ -223,6 +263,12 @@ class PluginMultiAppManagerServer extends import_server.Plugin {
       const subApp = applicationRecord.registerToSupervisor(mainApp, {
         appOptionsFactory: self.appOptionsFactory
       });
+      subApp.on("afterStart", async () => {
+        this.sendSyncMessage({
+          type: "subAppStarted",
+          appName: name
+        });
+      });
       if (!loadButNotStart) {
         await subApp.runCommand("start", "--quickstart");
       }

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "多应用管理器",
   "description": "Dynamically create multiple apps without separate deployments.",
   "description.zh-CN": "无需单独部署即可动态创建多个应用。",
-  "version": "1.4.0-beta.1",
+  "version": "1.5.0-alpha.3",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/multi-app-manager",
@@ -14,7 +14,7 @@
     "@formily/shared": "2.x",
     "antd": "5.x",
     "antd-style": "3.x",
-    "async-mutex": "^0.3.2",
+    "async-mutex": "^0.5.0",
     "mysql2": "^3.11.0",
     "pg": "^8.7.3",
     "react": "18.x",
@@ -28,7 +28,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "1ece4e558ba445088dbb658bd458eb0004295326",
+  "gitHead": "5e01d81e7bb07f9a35b271ce903fb0dcd0d83fcf",
   "keywords": [
     "system"
   ]