@nocobase/server 0.9.1-alpha.2 → 0.9.2-alpha.2

package/lib/acl/index.js

@@ -4,44 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createACL = createACL;
-
 function _acl() {
   const data = require("@nocobase/acl");
-
   _acl = function _acl() {
     return data;
   };
-
   return data;
 }
-
 var _availableAction = require("./available-action");
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 const configureResources = ['roles', 'users', 'collections', 'fields', 'collections.fields', 'roles.collections', 'roles.resources', 'rolesResourcesScopes', 'availableActions'];
-
 function createACL() {
   const acl = new (_acl().ACL)();
-
   for (var _i = 0, _Object$entries = Object.entries(_availableAction.availableActions); _i < _Object$entries.length; _i++) {
     const _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-          actionName = _Object$entries$_i[0],
-          actionParams = _Object$entries$_i[1];
-
+      actionName = _Object$entries$_i[0],
+      actionParams = _Object$entries$_i[1];
     acl.setAvailableAction(actionName, actionParams);
   }
-
   acl.registerConfigResources(configureResources);
   return acl;
 }

package/lib/app-manager.d.ts

@@ -1,19 +1,19 @@
 /// <reference types="node" />
-import EventEmitter from 'events';
 import http, { IncomingMessage, ServerResponse } from 'http';
-import Application, { ApplicationOptions } from './application';
-declare type AppSelector = (req: IncomingMessage) => Application | string | undefined | null;
-export declare class AppManager extends EventEmitter {
-    app: Application;
+import Application from './application';
+declare type AppSelectorReturn = Application | string | undefined | null;
+declare type AppSelector = (req: IncomingMessage) => AppSelectorReturn | Promise<AppSelectorReturn>;
+export declare class AppManager {
     applications: Map<string, Application>;
+    app: Application;
     constructor(app: Application);
+    bindMainApplication(mainApp: Application): void;
     appSelector: AppSelector;
-    createApplication(name: string, options: ApplicationOptions): Application;
+    addSubApp(application: any): Application;
     removeApplication(name: string): Promise<void>;
     setAppSelector(selector: AppSelector): void;
-    listen(...args: any[]): http.Server;
+    listen(...args: any[]): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
     getApplication(appName: string, options?: {}): Promise<null | Application>;
-    callback(): (req: IncomingMessage, res: ServerResponse) => Promise<void>;
-    emitAsync: (event: string | symbol, ...args: any[]) => Promise<boolean>;
+    callback(): (req: IncomingMessage, res: ServerResponse) => Promise<http.ServerResponse<http.IncomingMessage>>;
 }
 export {};

package/lib/app-manager.js

@@ -4,133 +4,106 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AppManager = void 0;
-
-function _utils() {
-  const data = require("@nocobase/utils");
-
-  _utils = function _utils() {
-    return data;
-  };
-
-  return data;
-}
-
-function _events() {
-  const data = _interopRequireDefault(require("events"));
-
-  _events = function _events() {
-    return data;
-  };
-
-  return data;
-}
-
 function _http() {
   const data = _interopRequireDefault(require("http"));
-
   _http = function _http() {
     return data;
   };
-
   return data;
 }
-
-var _application = _interopRequireDefault(require("./application"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-class AppManager extends _events().default {
+class AppManager {
   constructor(app) {
-    var _this;
-
-    super();
-    _this = this;
-    this.app = void 0;
+    var _this = this;
     this.applications = new Map();
-
-    this.appSelector = req => this.app;
-
-    this.app = app;
-    app.on('beforeStop', /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator(function* (mainApp, options) {
-        return yield Promise.all([..._this.applications.values()].map(application => application.stop(options)));
+    this.app = void 0;
+    this.appSelector = /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator(function* (req) {
+        return _this.app;
       });
-
-      return function (_x, _x2) {
+      return function (_x) {
         return _ref.apply(this, arguments);
       };
-    }());
-    app.on('afterDestroy', /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator(function* (mainApp, options) {
-        return yield Promise.all([..._this.applications.values()].map(application => application.destroy(options)));
-      });
-
-      return function (_x3, _x4) {
-        return _ref2.apply(this, arguments);
-      };
-    }());
+    }();
+    this.bindMainApplication(app);
   }
-
-  createApplication(name, options) {
-    const application = new _application.default(options);
-    this.applications.set(name, application);
+  bindMainApplication(mainApp) {
+    var _this2 = this;
+    this.app = mainApp;
+    const passEventToSubApps = (eventName, method) => {
+      mainApp.on(eventName, /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator(function* (mainApp, options) {
+          console.log(`receive event ${eventName} from ${mainApp.name}`);
+          var _iterator = _createForOfIteratorHelper(_this2.applications.values()),
+            _step;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              const application = _step.value;
+              console.log(`pass ${eventName} to ${application.name} `);
+              yield application[method](options);
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+        });
+        return function (_x2, _x3) {
+          return _ref2.apply(this, arguments);
+        };
+      }());
+    };
+    passEventToSubApps('beforeDestroy', 'destroy');
+    passEventToSubApps('beforeStop', 'stop');
+  }
+  addSubApp(application) {
+    this.applications.set(application.name, application);
+    this.app.emit('afterSubAppAdded', application);
     return application;
   }
-
   removeApplication(name) {
-    var _this2 = this;
-
+    var _this3 = this;
     return _asyncToGenerator(function* () {
-      const application = _this2.applications.get(name);
-
+      const application = _this3.applications.get(name);
       if (!application) {
         return;
       }
-
       yield application.destroy();
-
-      _this2.applications.delete(name);
+      console.log(`remove application ${name}`);
+      _this3.applications.delete(name);
     })();
   }
-
   setAppSelector(selector) {
     this.appSelector = selector;
   }
-
   listen(...args) {
     const server = _http().default.createServer(this.callback());
-
     return server.listen(...args);
   }
-
   getApplication(appName, options = {}) {
-    var _this3 = this;
-
+    var _this4 = this;
     return _asyncToGenerator(function* () {
-      yield _this3.emitAsync('beforeGetApplication', {
-        appManager: _this3,
+      yield _this4.app.emitAsync('beforeGetApplication', {
+        appManager: _this4,
         name: appName,
         options
       });
-      return _this3.applications.get(appName);
+      return _this4.applications.get(appName);
     })();
   }
-
   callback() {
-    var _this4 = this;
-
+    var _this5 = this;
     return /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator(function* (req, res) {
-        const appManager = _this4.app.appManager;
-        let handleApp = appManager.appSelector(req) || appManager.app;
-
+        const appManager = _this5.app.appManager;
+        let handleApp = (yield appManager.appSelector(req)) || appManager.app;
         if (typeof handleApp === 'string') {
           handleApp = yield appManager.getApplication(handleApp);
-
           if (!handleApp) {
             res.statusCode = 404;
             return res.end(JSON.stringify({
@@ -140,18 +113,14 @@ class AppManager extends _events().default {
               }]
             }));
           }
+          if (handleApp.stopped) yield handleApp.start();
         }
-
         handleApp.callback()(req, res);
       });
-
-      return function (_x5, _x6) {
+      return function (_x4, _x5) {
         return _ref3.apply(this, arguments);
       };
     }();
   }
-
 }
-
-exports.AppManager = AppManager;
-(0, _utils().applyMixins)(AppManager, [_utils().AsyncEmitter]);
+exports.AppManager = AppManager;