@nocobase/plugin-multi-app-manager 0.9.4-alpha.2 → 0.10.0-alpha.2

package/lib/client/AppManager.d.ts

@@ -1 +1,2 @@
-export declare const AppManager: () => JSX.Element;
+import React from 'react';
+export declare const AppManager: () => React.JSX.Element;

package/lib/client/Settings.d.ts

@@ -1 +1,2 @@
-export declare const Settings: () => JSX.Element;
+import React from 'react';
+export declare const Settings: () => React.JSX.Element;

package/lib/client/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 export { tableActionColumnSchema } from './settings/schemas/applications';
-declare const _default: (props: any) => JSX.Element;
+declare const _default: (props: any) => React.JSX.Element;
 export default _default;

package/lib/client/index.js

@@ -44,7 +44,6 @@ var _utils = require("./utils");
 var _applications = require("./settings/schemas/applications");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const MultiAppManager = () => {
-  const history = (0, _reactRouterDom().useHistory)();
   const _useRequest = (0, _client().useRequest)({
       resource: 'applications',
       action: 'listPinned'

package/lib/server/server.d.ts

@@ -5,6 +5,7 @@ export declare type AppOptionsFactory = (appName: string, mainApp: Application)
 export declare class PluginMultiAppManager extends Plugin {
     appDbCreator: AppDbCreator;
     appOptionsFactory: AppOptionsFactory;
+    private beforeGetApplicationMutex;
     setAppOptionsFactory(factory: AppOptionsFactory): void;
     setAppDbCreator(appDbCreator: AppDbCreator): void;
     static getDatabaseConfig(app: Application): IDatabaseOptions;

package/lib/server/server.js

@@ -33,6 +33,13 @@ function path() {
   return data;
 }
 var _application = require("./models/application");
+function _asyncMutex() {
+  const data = require("async-mutex");
+  _asyncMutex = function _asyncMutex() {
+    return data;
+  };
+  return data;
+}
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -113,6 +120,7 @@ class PluginMultiAppManager extends _server().Plugin {
     super(...args);
     this.appDbCreator = defaultDbCreator;
     this.appOptionsFactory = defaultAppOptionsFactory;
+    this.beforeGetApplicationMutex = new (_asyncMutex().Mutex)();
   }
   setAppOptionsFactory(factory) {
     this.appOptionsFactory = factory;
@@ -197,36 +205,38 @@ class PluginMultiAppManager extends _server().Plugin {
           name,
           options
         }) {
-          if (appManager.applications.has(name)) {
-            return;
-          }
-          const applicationRecord = yield _this.app.db.getRepository('applications').findOne({
-            filter: {
-              name
+          yield _this.beforeGetApplicationMutex.runExclusive( /*#__PURE__*/_asyncToGenerator(function* () {
+            if (appManager.applications.has(name)) {
+              return;
             }
-          });
-          const instanceOptions = applicationRecord.get('options');
-          // skip standalone deployment application
-          if ((instanceOptions === null || instanceOptions === void 0 ? void 0 : instanceOptions.standaloneDeployment) && appManager.runningMode !== 'single') {
-            return;
-          }
-          if (!applicationRecord) {
-            return;
-          }
-          const subApp = yield applicationRecord.registerToMainApp(_this.app, {
-            appOptionsFactory: _this.appOptionsFactory
-          });
-          // must skip load on upgrade
-          if (!(options === null || options === void 0 ? void 0 : options.upgrading)) {
-            yield subApp.load();
-          }
+            const applicationRecord = yield _this.app.db.getRepository('applications').findOne({
+              filter: {
+                name
+              }
+            });
+            const instanceOptions = applicationRecord.get('options');
+            // skip standalone deployment application
+            if ((instanceOptions === null || instanceOptions === void 0 ? void 0 : instanceOptions.standaloneDeployment) && appManager.runningMode !== 'single') {
+              return;
+            }
+            if (!applicationRecord) {
+              return;
+            }
+            const subApp = yield applicationRecord.registerToMainApp(_this.app, {
+              appOptionsFactory: _this.appOptionsFactory
+            });
+            // must skip load on upgrade
+            if (!(options === null || options === void 0 ? void 0 : options.upgrading)) {
+              yield subApp.load();
+            }
+          }));
         });
         return function (_x6) {
           return _ref5.apply(this, arguments);
         };
       }());
       _this.app.on('afterStart', /*#__PURE__*/function () {
-        var _ref6 = _asyncToGenerator(function* (app) {
+        var _ref7 = _asyncToGenerator(function* (app) {
           const repository = _this.db.getRepository('applications');
           const appManager = _this.app.appManager;
           if (appManager.runningMode == 'single') {
@@ -272,11 +282,11 @@ class PluginMultiAppManager extends _server().Plugin {
           }
         });
         return function (_x7) {
-          return _ref6.apply(this, arguments);
+          return _ref7.apply(this, arguments);
         };
       }());
       _this.app.on('afterUpgrade', /*#__PURE__*/function () {
-        var _ref7 = _asyncToGenerator(function* (app, options) {
+        var _ref8 = _asyncToGenerator(function* (app, options) {
           const cliArgs = options === null || options === void 0 ? void 0 : options.cliArgs;
           const repository = _this.db.getRepository('applications');
           const findOptions = {};
@@ -321,7 +331,7 @@ class PluginMultiAppManager extends _server().Plugin {
           }
         });
         return function (_x8, _x9) {
-          return _ref7.apply(this, arguments);
+          return _ref8.apply(this, arguments);
         };
       }());
       _this.app.resourcer.registerActionHandlers({

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@nocobase/plugin-multi-app-manager",
-  "version": "0.9.4-alpha.2",
-  "description": "",
+  "displayName": "multi app manager",
+  "displayName.zh-CN": "多应用管理",
+  "description": "manage app",
+  "description.zh-CN": "管理应用",
+  "version": "0.10.0-alpha.2",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/server": "0.9.4-alpha.2"
+    "@nocobase/server": "0.10.0-alpha.2",
+    "async-mutex": "^0.3.2"
   },
-  "gitHead": "2bc19a85bf9425aa220b6c467315c8087f333a7e"
+  "gitHead": "85028ae1733fcbd46ecd5d291dacbdc175f7f073"
 }