@nocobase/plugin-multi-app-manager 2.0.0-beta.9 → 2.0.1

package/dist/server/server.js

@@ -42,8 +42,8 @@ module.exports = __toCommonJS(server_exports);
 var import_database = require("@nocobase/database");
 var import_server = require("@nocobase/server");
 var import_lodash = __toESM(require("lodash"));
-var import_path = __toESM(require("path"));
 var import_server2 = require("../server");
+var import_legacy_adapter = require("./adapters/legacy-adapter");
 const defaultSubAppUpgradeHandle = async (mainApp) => {
   const repository = mainApp.db.getRepository("applications");
   const findOptions = {};
@@ -63,14 +63,14 @@ const defaultSubAppUpgradeHandle = async (mainApp) => {
     if ((instanceOptions == null ? void 0 : instanceOptions.standaloneDeployment) && appSupervisor.runningMode !== "single") {
       continue;
     }
-    const beforeSubAppStatus = import_server.AppSupervisor.getInstance().getAppStatus(instance.name);
+    const beforeSubAppStatus = await import_server.AppSupervisor.getInstance().getAppStatus(instance.name);
     const subApp = await appSupervisor.getApp(instance.name, {
       upgrading: true
     });
     try {
       mainApp.setMaintainingMessage(`upgrading sub app ${instance.name}...`);
       await subApp.runAsCLI(["upgrade"], { from: "user" });
-      if (!beforeSubAppStatus && import_server.AppSupervisor.getInstance().getAppStatus(instance.name) === "initialized") {
+      if (!beforeSubAppStatus && await import_server.AppSupervisor.getInstance().getAppStatus(instance.name) === "initialized") {
         await import_server.AppSupervisor.getInstance().removeApp(instance.name);
       }
     } catch (error) {
@@ -80,77 +80,19 @@ const defaultSubAppUpgradeHandle = async (mainApp) => {
     }
   }
 };
-const defaultDbCreator = async (app) => {
-  const databaseOptions = app.options.database;
-  const { host, port, username, password, dialect, database, schema } = databaseOptions;
-  if (dialect === "mysql") {
-    const mysql = require("mysql2/promise");
-    const connection = await mysql.createConnection({ host, port, user: username, password });
-    await connection.query(`CREATE DATABASE IF NOT EXISTS \`${database}\`;`);
-    await connection.close();
-  }
-  if (dialect === "mariadb") {
-    const mariadb = require("mariadb");
-    const connection = await mariadb.createConnection({ host, port, user: username, password });
-    await connection.query(`CREATE DATABASE IF NOT EXISTS \`${database}\`;`);
-    await connection.end();
-  }
-  if (["postgres", "kingbase"].includes(dialect)) {
-    const { Client } = require("pg");
-    const client = new Client({
-      host,
-      port,
-      user: username,
-      password,
-      database: dialect
-    });
-    await client.connect();
-    try {
-      if (process.env.USE_DB_SCHEMA_IN_SUBAPP === "true") {
-        await client.query(`CREATE SCHEMA IF NOT EXISTS ${schema}`);
-      } else {
-        await client.query(`CREATE DATABASE "${database}"`);
-      }
-    } catch (e) {
-      console.log(e);
-    }
-    await client.end();
-  }
-};
-const defaultAppOptionsFactory = (appName, mainApp) => {
-  const rawDatabaseOptions = PluginMultiAppManagerServer.getDatabaseConfig(mainApp);
-  if (rawDatabaseOptions.dialect === "sqlite") {
-    const mainAppStorage = rawDatabaseOptions.storage;
-    if (mainAppStorage !== ":memory:") {
-      const mainStorageDir = import_path.default.dirname(mainAppStorage);
-      rawDatabaseOptions.storage = import_path.default.join(mainStorageDir, `${appName}.sqlite`);
-    }
-  } else if (process.env.USE_DB_SCHEMA_IN_SUBAPP === "true" && ["postgres", "kingbase"].includes(rawDatabaseOptions.dialect)) {
-    rawDatabaseOptions.schema = appName;
-  } else {
-    rawDatabaseOptions.database = appName;
-  }
-  return {
-    database: {
-      ...rawDatabaseOptions,
-      tablePrefix: ""
-    },
-    plugins: ["nocobase"],
-    resourcer: {
-      prefix: process.env.API_BASE_PATH
-    },
-    cacheManager: {
-      ...mainApp.options.cacheManager,
-      prefix: appName
-    },
-    logger: mainApp.options.logger
-  };
-};
 class PluginMultiAppManagerServer extends import_server.Plugin {
-  appDbCreator = defaultDbCreator;
-  appOptionsFactory = defaultAppOptionsFactory;
   subAppUpgradeHandler = defaultSubAppUpgradeHandle;
   meter;
+  setSubAppUpgradeHandler(handler) {
+    this.subAppUpgradeHandler = handler;
+  }
+  static registerLegacyAdapter() {
+    const factory = ({ supervisor }) => new import_legacy_adapter.LegacyAdapter(supervisor);
+    import_server.AppSupervisor.registerDiscoveryAdapter("legacy", factory);
+    import_server.AppSupervisor.registerProcessAdapter("legacy", factory);
+    import_server.AppSupervisor.setDefaultDiscoveryAdapter("legacy");
+    import_server.AppSupervisor.setDefaultProcessAdapter("legacy");
+  }
   static getDatabaseConfig(app) {
     let oldConfig = app.options.database instanceof import_database.Database ? app.options.database.options : app.options.database;
     if (!oldConfig && app.db) {
@@ -158,43 +100,11 @@ 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 === "subAppStopped") {
-      const { appName } = message;
-      await import_server.AppSupervisor.getInstance().stopApp(appName);
-    }
-    if (type === "removeApp") {
-      const { appName } = message;
-      await import_server.AppSupervisor.getInstance().removeApp(appName);
-    }
-  }
-  setSubAppUpgradeHandler(handler) {
-    this.subAppUpgradeHandler = handler;
-  }
-  setAppOptionsFactory(factory) {
-    this.appOptionsFactory = factory;
+  setAppOptionsFactory(appOptionsFactory) {
+    import_server.AppSupervisor.getInstance().setAppOptionsFactory(appOptionsFactory);
   }
-  setAppDbCreator(appDbCreator) {
-    this.appDbCreator = appDbCreator;
+  static staticImport() {
+    this.registerLegacyAdapter();
   }
   beforeLoad() {
     this.db.registerModels({
@@ -207,6 +117,10 @@ class PluginMultiAppManagerServer extends import_server.Plugin {
     }
   }
   setMetrics() {
+    const supervisor = import_server.AppSupervisor.getInstance();
+    if (supervisor.getDiscoveryAdapter().name !== "legacy") {
+      return;
+    }
     this.meter = this.app.telemetry.metric.getMeter();
     if (!this.meter) {
       return;
@@ -216,7 +130,6 @@ class PluginMultiAppManagerServer extends import_server.Plugin {
     });
     this.meter.addBatchObservableCallback(
       (observableResult) => {
-        const supervisor = import_server.AppSupervisor.getInstance();
         const allStatuses = { ...supervisor.appStatus };
         const createCounts = () => ({
           preparing: 0,
@@ -243,6 +156,7 @@ class PluginMultiAppManagerServer extends import_server.Plugin {
     );
   }
   async load() {
+    const supervisor = import_server.AppSupervisor.getInstance();
     this.setMetrics();
     this.db.on(
       "applications.afterCreateWithAssociations",
@@ -253,34 +167,23 @@ class PluginMultiAppManagerServer extends import_server.Plugin {
         if (name === "main") {
           throw new Error('Application name "main" is reserved');
         }
-        const subApp = model.registerToSupervisor(this.app, {
-          appOptionsFactory: this.appOptionsFactory
-        });
-        subApp.on("afterStart", async () => {
-          this.sendSyncMessage({
-            type: "subAppStarted",
-            appName: name
-          });
-        });
-        subApp.on("afterStop", async () => {
-          this.sendSyncMessage({
-            type: "subAppStopped",
-            appName: name
-          });
+        const subApp = supervisor.registerApp({
+          appModel: model,
+          mainApp: this.app
         });
         const quickstart = async () => {
           try {
-            await this.appDbCreator(subApp, {
+            await supervisor.createDatabase({
+              app: subApp,
               transaction,
-              applicationModel: model,
-              context: options.context
+              appOptions: model.get("options") || {}
             });
           } catch (error) {
             this.log.error(error, { method: "appDbCreator" });
-            import_server.AppSupervisor.getInstance().setAppStatus(subApp.name, "error");
+            await supervisor.setAppStatus(subApp.name, "error");
             return;
           }
-          await import_server.AppSupervisor.getInstance().getApp(subApp.name);
+          await supervisor.getApp(subApp.name);
         };
         if ((_a = options == null ? void 0 : options.context) == null ? void 0 : _a.waitSubAppInstall) {
           await quickstart();
@@ -292,65 +195,9 @@ class PluginMultiAppManagerServer extends import_server.Plugin {
         }
       }
     );
-    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
-        }
-      );
+    this.db.on("applications.afterDestroy", async (model) => {
+      await supervisor.removeApp(model.get("name"));
     });
-    const self = this;
-    async function LazyLoadApplication({
-      appSupervisor,
-      appName,
-      options
-    }) {
-      const loadButNotStart = options == null ? void 0 : options.upgrading;
-      const name = appName;
-      if (appSupervisor.hasApp(name)) {
-        return;
-      }
-      const mainApp = await appSupervisor.getApp("main");
-      if (!mainApp) {
-        return;
-      }
-      const applicationRecord = await mainApp.db.getRepository("applications").findOne({
-        filter: {
-          name
-        }
-      });
-      if (!applicationRecord) {
-        return;
-      }
-      const instanceOptions = applicationRecord.get("options");
-      if ((instanceOptions == null ? void 0 : instanceOptions.standaloneDeployment) && appSupervisor.runningMode !== "single") {
-        return;
-      }
-      const subApp = applicationRecord.registerToSupervisor(mainApp, {
-        appOptionsFactory: self.appOptionsFactory
-      });
-      subApp.on("afterStart", async () => {
-        this.sendSyncMessage({
-          type: "subAppStarted",
-          appName: name
-        });
-      });
-      subApp.on("afterStop", async () => {
-        this.sendSyncMessage({
-          type: "subAppStopped",
-          appName: name
-        });
-      });
-      if (!loadButNotStart) {
-        await subApp.runCommand("start", "--quickstart");
-      }
-    }
-    import_server.AppSupervisor.getInstance().setAppBootstrapper(LazyLoadApplication.bind(this));
     import_server.Gateway.getInstance().addAppSelectorMiddleware(async (ctx, next) => {
       const { req } = ctx;
       if (!ctx.resolvedAppName && req.headers["x-hostname"]) {
@@ -372,12 +219,12 @@ class PluginMultiAppManagerServer extends import_server.Plugin {
     });
     this.app.on("afterStart", async (app) => {
       const repository = this.db.getRepository("applications");
-      const appSupervisor = import_server.AppSupervisor.getInstance();
+      const appSupervisor = supervisor;
       this.app.setMaintainingMessage("starting sub applications...");
       if (appSupervisor.runningMode == "single") {
         import_server.Gateway.getInstance().addAppSelectorMiddleware((ctx) => ctx.resolvedAppName = appSupervisor.singleAppName);
         try {
-          await import_server.AppSupervisor.getInstance().getApp(appSupervisor.singleAppName);
+          await supervisor.getApp(appSupervisor.singleAppName);
         } catch (err) {
           console.error("Auto register sub application in single mode failed: ", appSupervisor.singleAppName, err);
         }
@@ -390,7 +237,7 @@ class PluginMultiAppManagerServer extends import_server.Plugin {
           }
         });
         for (const subAppInstance of subApps) {
-          import_server.AppSupervisor.getInstance().getApp(subAppInstance.name);
+          supervisor.getApp(subAppInstance.name);
         }
       } catch (err) {
         this.log.error("Auto register sub applications failed: ", err);
@@ -413,7 +260,7 @@ class PluginMultiAppManagerServer extends import_server.Plugin {
     this.app.resourcer.registerActionHandlers({
       "applications:stop": async (ctx, next) => {
         const { filterByTk } = ctx.action.params;
-        import_server.AppSupervisor.getInstance().stopApp(filterByTk);
+        supervisor.stopApp(filterByTk);
         ctx.body = "ok";
         await next();
       }
@@ -421,7 +268,7 @@ class PluginMultiAppManagerServer extends import_server.Plugin {
     this.app.resourcer.registerActionHandlers({
       "applications:start": async (ctx, next) => {
         const { filterByTk } = ctx.action.params;
-        import_server.AppSupervisor.getInstance().startApp(filterByTk);
+        supervisor.startApp(filterByTk);
         ctx.body = "ok";
         await next();
       }
@@ -443,7 +290,7 @@ class PluginMultiAppManagerServer extends import_server.Plugin {
       if (actionName === "list" && resourceName === "applications") {
         const applications = ctx.body.rows;
         for (const application of applications) {
-          const appStatus = import_server.AppSupervisor.getInstance().getAppStatus(application.name, "stopped");
+          const appStatus = await supervisor.getAppStatus(application.name, "stopped");
           application.status = appStatus;
         }
       }

package/package.json

@@ -6,7 +6,7 @@
   "description": "Multi-app runs applications in a process-sharing manner, suitable for testing and demo environments only. Do not use it in production.",
   "description.ru-RU": "Позволяет динамически создавать несколько приложений без отдельных развертываний.",
   "description.zh-CN": "多应用以进程共享的方式运行，仅适合测试和演示环境，生产环境下请勿使用。",
-  "version": "2.0.0-beta.9",
+  "version": "2.0.1",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/multi-app-manager",
@@ -31,7 +31,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "36ef50291e22fe1024c819b8748d51a59a5ea4f8",
+  "gitHead": "e41d74b50e2025555dc71969a20fee180b8d0d0d",
   "keywords": [
     "system"
   ]