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

package/lib/application.js

@@ -4,151 +4,106 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ApplicationVersion = exports.Application = void 0;
-
 function _actions() {
   const data = require("@nocobase/actions");
-
   _actions = function _actions() {
     return data;
   };
-
   return data;
 }
-
 function _cache() {
   const data = require("@nocobase/cache");
-
   _cache = function _cache() {
     return data;
   };
-
   return data;
 }
-
 function _database() {
   const data = _interopRequireDefault(require("@nocobase/database"));
-
   _database = function _database() {
     return data;
   };
-
   return data;
 }
-
 function _logger() {
   const data = require("@nocobase/logger");
-
   _logger = function _logger() {
     return data;
   };
-
   return data;
 }
-
 function _utils() {
   const data = require("@nocobase/utils");
-
   _utils = function _utils() {
     return data;
   };
-
   return data;
 }
-
 function _chalk() {
   const data = _interopRequireDefault(require("chalk"));
-
   _chalk = function _chalk() {
     return data;
   };
-
   return data;
 }
-
 function _commander() {
   const data = require("commander");
-
   _commander = function _commander() {
     return data;
   };
-
   return data;
 }
-
 function _koa() {
   const data = _interopRequireDefault(require("koa"));
-
   _koa = function _koa() {
     return data;
   };
-
   return data;
 }
-
 function _koaCompose() {
   const data = _interopRequireDefault(require("koa-compose"));
-
   _koaCompose = function _koaCompose() {
     return data;
   };
-
   return data;
 }
-
 function _semver() {
   const data = _interopRequireDefault(require("semver"));
-
   _semver = function _semver() {
     return data;
   };
-
   return data;
 }
-
 function _util() {
   const data = require("util");
-
   _util = function _util() {
     return data;
   };
-
   return data;
 }
-
 var _acl = require("./acl");
-
 var _appManager = require("./app-manager");
-
 var _commands = require("./commands");
-
 var _helper = require("./helper");
-
 var _pluginManager = require("./plugin-manager");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 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); }); }; }
-
 const packageJson = require('../package.json');
-
 class ApplicationVersion {
   constructor(app) {
     this.app = void 0;
     this.collection = void 0;
     this.app = app;
-
     if (!app.db.hasCollection('applicationVersion')) {
       app.db.collection({
         name: 'applicationVersion',
-        namespace: 'core',
+        namespace: 'core.applicationVersion',
         duplicator: 'required',
         timestamps: false,
         fields: [{
@@ -157,31 +112,23 @@ class ApplicationVersion {
         }]
       });
     }
-
     this.collection = this.app.db.getCollection('applicationVersion');
   }
-
   get() {
     var _this = this;
-
     return _asyncToGenerator(function* () {
       if (yield _this.app.db.collectionExistsInDb('applicationVersion')) {
         const model = yield _this.collection.model.findOne();
-
         if (!model) {
           return null;
         }
-
         return model.get('value');
       }
-
       return null;
     })();
   }
-
   update() {
     var _this2 = this;
-
     return _asyncToGenerator(function* () {
       yield _this2.collection.sync();
       yield _this2.collection.model.destroy({
@@ -192,32 +139,24 @@ class ApplicationVersion {
       });
     })();
   }
-
   satisfies(range) {
     var _this3 = this;
-
     return _asyncToGenerator(function* () {
       if (yield _this3.app.db.collectionExistsInDb('applicationVersion')) {
         const model = yield _this3.collection.model.findOne();
         const version = model === null || model === void 0 ? void 0 : model.value;
-
         if (!version) {
           return true;
         }
-
         return _semver().default.satisfies(version, range, {
           includePrerelease: true
         });
       }
-
       return true;
     })();
   }
-
 }
-
 exports.ApplicationVersion = ApplicationVersion;
-
 class Application extends _koa().default {
   constructor(options) {
     super();
@@ -234,65 +173,53 @@ class Application extends _koa().default {
     this._version = void 0;
     this.plugins = new Map();
     this.listenServer = void 0;
+    this.stopped = false;
     this.options = options;
     this.init();
   }
-
   get db() {
     return this._db;
   }
-
   get cache() {
     return this._cache;
   }
-
   get resourcer() {
     return this._resourcer;
   }
-
   get cli() {
     return this._cli;
   }
-
   get acl() {
     return this._acl;
   }
-
   get i18n() {
     return this._i18n;
   }
-
   get pm() {
     return this._pm;
   }
-
   get version() {
     return this._version;
   }
-
   get appManager() {
     return this._appManager;
   }
-
   get logger() {
     return this._logger;
   }
-
   get log() {
     return this._logger;
   }
-
   get name() {
     return this.options.name || 'main';
   }
-
   init() {
     const options = this.options;
     const logger = (0, _logger().createAppLogger)(options.logger);
-    this._logger = logger.instance; // @ts-ignore
-
-    this._events = []; // @ts-ignore
-
+    this._logger = logger.instance;
+    // @ts-ignore
+    this._events = [];
+    // @ts-ignore
     this._eventsCount = [];
     this.removeAllListeners();
     this.middleware = new (_utils().Toposort)();
@@ -301,12 +228,10 @@ class Application extends _koa().default {
     this.use(logger.middleware, {
       tag: 'logger'
     });
-
     if (this._db) {
       // MaxListenersExceededWarning
       this._db.removeAllListeners();
     }
-
     this._db = this.createDatabase(options);
     this._resourcer = (0, _helper.createResourcer)(options);
     this._cli = new (_commander().Command)('nocobase').usage('[command] [options]');
@@ -316,7 +241,6 @@ class Application extends _koa().default {
     this.context.logger = this._logger;
     this.context.resourcer = this._resourcer;
     this.context.cache = this._cache;
-
     if (this._pm) {
       this._pm = this._pm.clone();
     } else {
@@ -325,127 +249,105 @@ class Application extends _koa().default {
         plugins: options.plugins
       });
     }
-
-    this._appManager = new _appManager.AppManager(this);
-
+    if (this._appManager) {
+      this._appManager.bindMainApplication(this);
+    } else {
+      this._appManager = new _appManager.AppManager(this);
+    }
     if (this.options.acl !== false) {
       this._resourcer.use(this._acl.middleware(), {
         tag: 'acl',
         after: ['parseToken']
       });
     }
-
     (0, _helper.registerMiddlewares)(this, options);
-
     if (options.registerActions !== false) {
       (0, _actions().registerActions)(this);
     }
-
     (0, _commands.registerCli)(this);
     this._version = new ApplicationVersion(this);
   }
-
   createDatabase(options) {
-    return new (_database().default)(_objectSpread(_objectSpread({}, options.database instanceof _database().default ? options.database.options : options.database), {}, {
+    const db = new (_database().default)(_objectSpread(_objectSpread({}, options.database instanceof _database().default ? options.database.options : options.database), {}, {
       migrator: {
         context: {
           app: this
         }
       }
     }));
+    db.setLogger(this._logger);
+    return db;
   }
-
   getVersion() {
     return packageJson.version;
   }
-
   plugin(pluginClass, options) {
     return this.pm.addStatic(pluginClass, options);
-  } // @ts-ignore
-
-
+  }
+  // @ts-ignore
   use(middleware, options) {
     this.middleware.add(middleware, options);
     return this;
   }
-
   callback() {
     const fn = (0, _koaCompose().default)(this.middleware.nodes);
     if (!this.listenerCount('error')) this.on('error', this.onerror);
-
     const handleRequest = (req, res) => {
-      const ctx = this.createContext(req, res); // @ts-ignore
-
+      const ctx = this.createContext(req, res);
+      // @ts-ignore
       return this.handleRequest(ctx, fn);
     };
-
     return handleRequest;
   }
-
   collection(options) {
     return this.db.collection(options);
   }
-
   resource(options) {
     return this.resourcer.define(options);
   }
-
   actions(handlers, options) {
     return this.resourcer.registerActions(handlers);
   }
-
   command(name, desc, opts) {
     return this.cli.command(name, desc, opts).allowUnknownOption();
   }
-
   findCommand(name) {
     return this.cli._findCommand(name);
   }
-
   load(options) {
     var _this4 = this;
-
     return _asyncToGenerator(function* () {
       if (options === null || options === void 0 ? void 0 : options.reload) {
-        console.log(`Reload the application configuration`);
+        console.log(`Reload the ${_this4.name} application configuration`);
         const oldDb = _this4._db;
-
         _this4.init();
-
         yield oldDb.close();
       }
-
       yield _this4.emitAsync('beforeLoad', _this4, options);
       yield _this4.pm.load(options);
       yield _this4.emitAsync('afterLoad', _this4, options);
     })();
   }
-
   reload(options) {
     var _this5 = this;
-
     return _asyncToGenerator(function* () {
       yield _this5.load(_objectSpread(_objectSpread({}, options), {}, {
         reload: true
       }));
+      yield _this5.emitAsync('afterReload', _this5, options);
     })();
   }
-
   getPlugin(name) {
     return this.pm.get(name);
   }
-
   parse(argv = process.argv) {
     var _this6 = this;
-
     return _asyncToGenerator(function* () {
       return _this6.runAsCLI(argv);
     })();
   }
-
   runAsCLI(argv = process.argv, options) {
     var _this7 = this;
-
     return _asyncToGenerator(function* () {
       try {
         yield _this7.db.auth({
@@ -455,48 +357,36 @@ class Application extends _koa().default {
         console.log(_chalk().default.red(error.message));
         process.exit(1);
       }
-
       yield _this7.dbVersionCheck({
         exit: true
       });
       yield _this7.db.prepare();
-
       if ((argv === null || argv === void 0 ? void 0 : argv[2]) !== 'upgrade') {
         yield _this7.load({
           method: argv === null || argv === void 0 ? void 0 : argv[2]
         });
       }
-
       return _this7.cli.parseAsync(argv, options);
     })();
   }
-
   start(options = {}) {
     var _this8 = this;
-
     return _asyncToGenerator(function* () {
       var _options$listen;
-
-      // reconnect database
       if (_this8.db.closed()) {
         yield _this8.db.reconnect();
       }
-
       if (options.dbSync) {
         console.log('db sync...');
         yield _this8.db.sync();
       }
-
       yield _this8.emitAsync('beforeStart', _this8, options);
-
       if (options === null || options === void 0 ? void 0 : (_options$listen = options.listen) === null || _options$listen === void 0 ? void 0 : _options$listen.port) {
         const pmServer = yield _this8.pm.listen();
-
         const listen = () => new Promise((resolve, reject) => {
           const Server = _this8.listen(options === null || options === void 0 ? void 0 : options.listen, () => {
             resolve(Server);
           });
-
           Server.on('error', err => {
             reject(err);
           });
@@ -504,7 +394,6 @@ class Application extends _koa().default {
             pmServer.close();
           });
         });
-
         try {
           //@ts-ignore
           _this8.listenServer = yield listen();
@@ -513,21 +402,26 @@ class Application extends _koa().default {
           process.exit(1);
         }
       }
-
       yield _this8.emitAsync('afterStart', _this8, options);
+      _this8.stopped = false;
     })();
   }
-
   listen(...args) {
     return this.appManager.listen(...args);
   }
-
   stop(options = {}) {
     var _this9 = this;
-
     return _asyncToGenerator(function* () {
+      if (_this9.stopped) {
+        _this9.log.warn(`Application ${_this9.name} already stopped`);
+        return;
+      }
       yield _this9.emitAsync('beforeStop', _this9, options);
-
+      // close http server
+      if (_this9.listenServer) {
+        yield (0, _util().promisify)(_this9.listenServer.close).call(_this9.listenServer);
+        _this9.listenServer = null;
+      }
       try {
         // close database connection
         // silent if database already closed
@@ -536,84 +430,61 @@ class Application extends _koa().default {
         }
       } catch (e) {
         console.log(e);
-      } // close http server
-
-
-      if (_this9.listenServer) {
-        yield (0, _util().promisify)(_this9.listenServer.close).call(_this9.listenServer);
-        _this9.listenServer = null;
       }
-
       yield _this9.emitAsync('afterStop', _this9, options);
+      _this9.stopped = true;
+      console.log(`${_this9.name} is stopped`);
     })();
   }
-
   destroy(options = {}) {
     var _this10 = this;
-
     return _asyncToGenerator(function* () {
       yield _this10.emitAsync('beforeDestroy', _this10, options);
       yield _this10.stop(options);
       yield _this10.emitAsync('afterDestroy', _this10, options);
     })();
   }
-
   dbVersionCheck(options) {
     var _this11 = this;
-
     return _asyncToGenerator(function* () {
       const r = yield _this11.db.version.satisfies({
         mysql: '>=8.0.17',
         sqlite: '3.x',
         postgres: '>=10'
       });
-
       if (!r) {
         console.log(_chalk().default.red('The database only supports MySQL 8.0.17 and above, SQLite 3.x and PostgreSQL 10+'));
-
         if (options === null || options === void 0 ? void 0 : options.exit) {
           process.exit();
         }
-
         return false;
       }
-
       if (_this11.db.inDialect('mysql')) {
         const result = yield _this11.db.sequelize.query(`SHOW VARIABLES LIKE 'lower_case_table_names'`, {
           plain: true
         });
-
         if ((result === null || result === void 0 ? void 0 : result.Value) === '1' && !_this11.db.options.underscored) {
           console.log(`Your database lower_case_table_names=1, please add ${_chalk().default.yellow('DB_UNDERSCORED=true')} to the .env file`);
-
           if (options === null || options === void 0 ? void 0 : options.exit) {
             process.exit();
           }
-
           return false;
         }
       }
-
       return true;
     })();
   }
-
   isInstalled() {
     var _this12 = this;
-
     return _asyncToGenerator(function* () {
       return (yield _this12.db.collectionExistsInDb('applicationVersion')) || (yield _this12.db.collectionExistsInDb('collections'));
     })();
   }
-
   install(options = {}) {
     var _this13 = this;
-
     return _asyncToGenerator(function* () {
       var _options$sync;
-
       console.log('Database dialect: ' + _this13.db.sequelize.getDialect());
-
       if ((options === null || options === void 0 ? void 0 : options.clean) || (options === null || options === void 0 ? void 0 : (_options$sync = options.sync) === null || _options$sync === void 0 ? void 0 : _options$sync.force)) {
         console.log('Truncate database and reload app configuration');
         yield _this13.db.clean({
@@ -623,7 +494,6 @@ class Application extends _koa().default {
           method: 'install'
         });
       }
-
       yield _this13.emitAsync('beforeInstall', _this13, options);
       yield _this13.db.sync();
       yield _this13.pm.install(options);
@@ -631,10 +501,8 @@ class Application extends _koa().default {
       yield _this13.emitAsync('afterInstall', _this13, options);
     })();
   }
-
   upgrade(options = {}) {
     var _this14 = this;
-
     return _asyncToGenerator(function* () {
       yield _this14.emitAsync('beforeUpgrade', _this14, options);
       const force = false;
@@ -649,15 +517,12 @@ class Application extends _koa().default {
       yield _this14.emitAsync('afterUpgrade', _this14, options);
     })();
   }
-
   toJSON() {
     return {
       appName: this.name
     };
   }
-
 }
-
 exports.Application = Application;
 (0, _utils().applyMixins)(Application, [_utils().AsyncEmitter]);
 var _default = Application;

package/lib/commands/console.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 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); }); }; }
-
 const REPL = require('repl');
-
 var _default = app => {
   app.command('console').action( /*#__PURE__*/_asyncToGenerator(function* () {
     yield app.start();
@@ -21,16 +17,13 @@ var _default = app => {
           console.log(err);
           process.exit(1);
         }
-
         yield app.stop();
         process.exit(0);
       });
-
       return function (_x) {
         return _ref2.apply(this, arguments);
       };
     }());
   }));
 };
-
 exports.default = _default;