@nocobase/plugin-multi-app-share-collection 0.12.0-alpha.5 → 0.13.0-alpha.1

package/dist/server/plugin.d.ts

@@ -4,6 +4,5 @@ export declare class MultiAppShareCollectionPlugin extends Plugin {
     beforeEnable(): Promise<void>;
     beforeLoad(): Promise<void>;
     load(): Promise<void>;
-    requiredPlugins(): any[];
 }
 export default MultiAppShareCollectionPlugin;

package/dist/server/plugin.js

@@ -76,6 +76,7 @@ class SubAppPlugin extends server.Plugin {
       await next();
     });
     subApp.on("beforeInstall", async () => {
+      await subApp.db.sync();
       const subAppPluginsCollection = subApp.db.getCollection("applicationPlugins");
       const mainAppPluginsCollection = mainApp.db.getCollection("applicationPlugins");
       await subApp.db.sequelize.query(`TRUNCATE ${subAppPluginsCollection.quotedTableName()}`);
@@ -90,6 +91,7 @@ class SubAppPlugin extends server.Plugin {
       await subApp.db.sequelize.query(`
         SELECT setval('${sequenceName[0]["pg_get_serial_sequence"]}', (SELECT max("id") FROM ${subAppPluginsCollection.quotedTableName()}));
       `);
+      await subApp.reload();
       console.log(`sync plugins from ${mainApp.name} app to sub app ${subApp.name}`);
     });
   }
@@ -101,6 +103,10 @@ class MultiAppShareCollectionPlugin extends server.Plugin {
     if (!this.db.inDialect("postgres")) {
       throw new Error("multi-app-share-collection plugin only support postgres");
     }
+    const plugin = this.pm.get("multi-app-manager");
+    if (!plugin.enabled) {
+      throw new Error(`${this.name} plugin need multi-app-manager plugin enabled`);
+    }
   }
   async beforeLoad() {
     if (!this.db.inDialect("postgres")) {
@@ -110,24 +116,30 @@ class MultiAppShareCollectionPlugin extends server.Plugin {
       if (lodash__default.default.get(options, "loadFromDatabase")) {
         for (const application of await this.app.db.getCollection("applications").repository.find()) {
           const appName = application.get("name");
-          const subApp = await this.app.appManager.getApplication(appName);
+          const subApp = await server.AppSupervisor.getInstance().getApp(appName);
           await callback(subApp);
         }
         return;
       }
-      const subApps = [...this.app.appManager.applications.values()];
+      const subApps = [...server.AppSupervisor.getInstance().subApps()];
       for (const subApp of subApps) {
         await callback(subApp);
       }
     };
-    this.app.on("afterSubAppAdded", (subApp) => {
-      subApp.plugin(SubAppPlugin, { name: "sub-app", mainApp: this.app });
-    });
+    const mainApp = this.app;
+    function addPluginToSubApp(app) {
+      if (app.name !== "main") {
+        app.plugin(SubAppPlugin, { name: "sub-app", mainApp });
+      }
+    }
+    if (server.AppSupervisor.getInstance().listeners("afterAppAdded").filter((f) => f.name == addPluginToSubApp.name).length == 0) {
+      server.AppSupervisor.getInstance().on("afterAppAdded", addPluginToSubApp);
+    }
     this.app.db.on("users.afterCreateWithAssociations", async (model, options) => {
       await traverseSubApps(async (subApp) => {
         const { transaction } = options;
         const repository = subApp.db.getRepository("roles");
-        const subAppModel = await subApp.db.getCollection("users").repository.findOne({
+        const subAppUserModel = await subApp.db.getCollection("users").repository.findOne({
           filter: {
             id: model.get("id")
           },
@@ -139,72 +151,36 @@ class MultiAppShareCollectionPlugin extends server.Plugin {
           },
           transaction
         });
-        if (defaultRole && await subAppModel.countRoles({ transaction }) == 0) {
-          await subAppModel.addRoles(defaultRole, { transaction });
+        if (defaultRole && await subAppUserModel.countRoles({ transaction }) == 0) {
+          await subAppUserModel.addRoles(defaultRole, { transaction });
         }
       });
     });
-    this.app.db.on("collection:loaded", async ({ transaction, collection }) => {
-      await traverseSubApps(async (subApp) => {
-        const name = collection.name;
-        const collectionRecord = await subApp.db.getRepository("collections").findOne({
-          filter: {
-            name
-          },
-          transaction
-        });
-        await collectionRecord.load({ transaction });
+    this.app.on("__restarted", () => {
+      traverseSubApps((subApp) => {
+        subApp.runCommand("restart");
       });
     });
-    this.app.db.on("field:loaded", async ({ transaction, fieldKey }) => {
-      await traverseSubApps(async (subApp) => {
-        const fieldRecord = await subApp.db.getRepository("fields").findOne({
-          filterByTk: fieldKey,
-          transaction
-        });
-        if (fieldRecord) {
-          await fieldRecord.load({ transaction });
-        }
-      });
-    });
-    this.app.on("afterEnablePlugin", async (pluginName) => {
-      await traverseSubApps(
-        async (subApp) => {
+    this.app.on("afterEnablePlugin", (pluginNames) => {
+      traverseSubApps((subApp) => {
+        for (const pluginName of lodash__default.default.castArray(pluginNames)) {
           if (subAppFilteredPlugins.includes(pluginName))
             return;
-          await subApp.pm.enable(pluginName);
-        },
-        {
-          loadFromDatabase: true
+          subApp.runAsCLI(["pm", "enable", pluginName], { from: "user" });
         }
-      );
+      });
     });
-    this.app.on("afterDisablePlugin", async (pluginName) => {
-      await traverseSubApps(
-        async (subApp) => {
+    this.app.on("afterDisablePlugin", (pluginNames) => {
+      traverseSubApps((subApp) => {
+        for (const pluginName of lodash__default.default.castArray(pluginNames)) {
           if (subAppFilteredPlugins.includes(pluginName))
             return;
-          await subApp.pm.disable(pluginName);
-        },
-        {
-          loadFromDatabase: true
+          subApp.runAsCLI(["pm", "disable", pluginName], { from: "user" });
         }
-      );
-    });
-    this.app.db.on("field.afterRemove", (removedField) => {
-      const subApps = [...this.app.appManager.applications.values()];
-      for (const subApp of subApps) {
-        const collectionName = removedField.collection.name;
-        const collection = subApp.db.getCollection(collectionName);
-        if (!collection) {
-          subApp.log.warn(`collection ${collectionName} not found in ${subApp.name}`);
-          continue;
-        }
-        collection.removeField(removedField.name);
-      }
+      });
     });
     this.app.db.on(`afterRemoveCollection`, (collection) => {
-      const subApps = [...this.app.appManager.applications.values()];
+      const subApps = [...server.AppSupervisor.getInstance().subApps()];
       for (const subApp of subApps) {
         subApp.db.removeCollection(collection.name);
       }
@@ -235,7 +211,7 @@ class MultiAppShareCollectionPlugin extends server.Plugin {
         ...mainAppDbConfig,
         schema: appName
       };
-      const plugins = [...mainApp.pm.getPlugins().keys()].filter(
+      const plugins = [...mainApp.pm.getAliases()].filter(
         (name) => name !== "multi-app-manager" && name !== "multi-app-share-collection"
       );
       return {
@@ -268,9 +244,6 @@ class MultiAppShareCollectionPlugin extends server.Plugin {
       await this.app.db.sequelize.query(`CREATE SCHEMA IF NOT EXISTS ${schema}`);
     });
   }
-  requiredPlugins() {
-    return ["multi-app-manager"];
-  }
 }
 var plugin_default = MultiAppShareCollectionPlugin;
 

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "多应用数据共享",
   "description": "multi app share collection",
   "description.zh-CN": "多应用数据共享",
-  "version": "0.12.0-alpha.5",
+  "version": "0.13.0-alpha.1",
   "main": "./dist/server/index.js",
   "devDependencies": {
     "@formily/react": "2.x",
@@ -23,5 +23,5 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "689cc16e83361c4d0b91907e0deac30bdb907692"
+  "gitHead": "0ebd4e85a1b0b0d0943768ab6cb5c3d824562239"
 }