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

package/lib/app-manager.d.ts

@@ -4,7 +4,7 @@ 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 {
-    private app;
+    app: Application;
     applications: Map<string, Application>;
     constructor(app: Application);
     appSelector: AppSelector;
@@ -12,7 +12,7 @@ export declare class AppManager extends EventEmitter {
     removeApplication(name: string): Promise<void>;
     setAppSelector(selector: AppSelector): void;
     listen(...args: any[]): http.Server;
-    getApplication(appName: string): Promise<null | Application>;
+    getApplication(appName: string, options?: {}): Promise<null | Application>;
     callback(): (req: IncomingMessage, res: ServerResponse) => Promise<void>;
     emitAsync: (event: string | symbol, ...args: any[]) => Promise<boolean>;
 }

package/lib/app-manager.js

@@ -107,13 +107,14 @@ class AppManager extends _events().default {
     return server.listen(...args);
   }
 
-  getApplication(appName) {
+  getApplication(appName, options = {}) {
     var _this3 = this;
 
     return _asyncToGenerator(function* () {
       yield _this3.emitAsync('beforeGetApplication', {
         appManager: _this3,
-        name: appName
+        name: appName,
+        options
       });
       return _this3.applications.get(appName);
     })();
@@ -124,17 +125,18 @@ class AppManager extends _events().default {
 
     return /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator(function* (req, res) {
-        let handleApp = _this4.appSelector(req) || _this4.app;
+        const appManager = _this4.app.appManager;
+        let handleApp = appManager.appSelector(req) || appManager.app;
 
         if (typeof handleApp === 'string') {
-          handleApp = yield _this4.getApplication(handleApp);
+          handleApp = yield appManager.getApplication(handleApp);
 
           if (!handleApp) {
             res.statusCode = 404;
             return res.end(JSON.stringify({
               redirectTo: process.env.APP_NOT_FOUND_REDIRECT_TO,
               errors: [{
-                message: 'Not Found'
+                message: 'Application Not Found'
               }]
             }));
           }

package/lib/application.d.ts

@@ -30,6 +30,7 @@ export interface ApplicationOptions {
     acl?: boolean;
     logger?: AppLoggerOptions;
     pmSock?: string;
+    name?: string;
 }
 export interface DefaultState extends KoaDefaultState {
     currentUser?: any;
@@ -88,6 +89,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     protected plugins: Map<string, Plugin<any>>;
     listenServer: Server;
     middleware: any;
+    stopped: boolean;
     constructor(options: ApplicationOptions);
     get db(): Database;
     get cache(): Cache;
@@ -100,6 +102,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get appManager(): AppManager;
     get logger(): Logger;
     get log(): Logger;
+    get name(): string;
     protected init(): void;
     private createDatabase;
     getVersion(): any;
@@ -127,5 +130,8 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     install(options?: InstallOptions): Promise<void>;
     upgrade(options?: any): Promise<void>;
     emitAsync: (event: string | symbol, ...args: any[]) => Promise<boolean>;
+    toJSON(): {
+        appName: string;
+    };
 }
 export default Application;

package/lib/application.js

@@ -148,6 +148,8 @@ class ApplicationVersion {
     if (!app.db.hasCollection('applicationVersion')) {
       app.db.collection({
         name: 'applicationVersion',
+        namespace: 'core',
+        duplicator: 'required',
         timestamps: false,
         fields: [{
           name: 'value',
@@ -232,6 +234,7 @@ 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();
   }
@@ -280,6 +283,10 @@ class Application extends _koa().default {
     return this._logger;
   }
 
+  get name() {
+    return this.options.name || 'main';
+  }
+
   init() {
     const options = this.options;
     const logger = (0, _logger().createAppLogger)(options.logger);
@@ -340,13 +347,15 @@ class Application extends _koa().default {
   }
 
   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() {
@@ -453,6 +462,7 @@ class Application extends _koa().default {
       yield _this7.dbVersionCheck({
         exit: true
       });
+      yield _this7.db.prepare();
 
       if ((argv === null || argv === void 0 ? void 0 : argv[2]) !== 'upgrade') {
         yield _this7.load({
@@ -508,6 +518,7 @@ class Application extends _koa().default {
       }
 
       yield _this8.emitAsync('afterStart', _this8, options);
+      _this8.stopped = false;
     })();
   }
 
@@ -519,6 +530,12 @@ class Application extends _koa().default {
     var _this9 = this;
 
     return _asyncToGenerator(function* () {
+      if (_this9.stopped) {
+        _this9.log.warn(`Application ${_this9.name} already stopped`);
+
+        return;
+      }
+
       yield _this9.emitAsync('beforeStop', _this9, options);
 
       try {
@@ -538,6 +555,7 @@ class Application extends _koa().default {
       }
 
       yield _this9.emitAsync('afterStop', _this9, options);
+      _this9.stopped = true;
     })();
   }
 
@@ -576,8 +594,8 @@ class Application extends _koa().default {
           plain: true
         });
 
-        if ((result === null || result === void 0 ? void 0 : result.Value) === '1') {
-          console.log(_chalk().default.red(`mysql variable 'lower_case_table_names' must be set to '0' or '2'`));
+        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();
@@ -643,6 +661,12 @@ class Application extends _koa().default {
     })();
   }
 
+  toJSON() {
+    return {
+      appName: this.name
+    };
+  }
+
 }
 
 exports.Application = Application;

package/lib/helper.js

@@ -81,7 +81,9 @@ function createI18n(options) {
 
   instance.init(_objectSpread({
     lng: 'en-US',
-    resources: {}
+    resources: {},
+    keySeparator: false,
+    nsSeparator: false
   }, options.i18n));
   return instance;
 }

package/lib/plugin-manager/PluginManager.d.ts

@@ -32,12 +32,13 @@ export declare class PluginManager {
     clone(): PluginManager;
     addStatic(plugin?: any, options?: any): any;
     generateClientFile(plugin: string, packageName: string): Promise<void>;
-    add(plugin: any, options?: any, transaction?: any): any;
+    add(plugin: any, options?: any, transaction?: any): Promise<any>;
     load(options?: any): Promise<void>;
     install(options?: InstallOptions): Promise<void>;
     enable(name: string | string[]): Promise<void>;
     disable(name: string | string[]): Promise<void>;
     remove(name: string | string[]): Promise<void>;
+    static getPackageJson(packageName: string): any;
     static getPackageName(name: string): string;
     static getPluginPkgPrefix(): string[];
     static findPackage(name: string): Promise<string>;

package/lib/plugin-manager/PluginManager.js

@@ -371,7 +371,22 @@ class PluginManager {
         const t = transaction || (yield _this4.app.db.sequelize.transaction());
 
         try {
-          const items = yield Promise.all(plugin.map(p => _this4.add(p, options, t)));
+          const items = [];
+
+          var _iterator3 = _createForOfIteratorHelper(plugin),
+              _step3;
+
+          try {
+            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              const p = _step3.value;
+              items.push(yield _this4.add(p, options, t));
+            }
+          } catch (err) {
+            _iterator3.e(err);
+          } finally {
+            _iterator3.f();
+          }
+
           yield t.commit();
           return items;
         } catch (error) {
@@ -381,9 +396,6 @@ class PluginManager {
       }
 
       const packageName = yield PluginManager.findPackage(plugin);
-
-      const packageJson = require(`${packageName}/package.json`);
-
       yield _this4.generateClientFile(plugin, packageName);
 
       const instance = _this4.addStatic(plugin, _objectSpread(_objectSpread({}, options), {}, {
@@ -396,6 +408,7 @@ class PluginManager {
           name: plugin
         }
       });
+      const packageJson = PluginManager.getPackageJson(packageName);
 
       if (!model) {
         const enabled = options.enabled,
@@ -403,7 +416,7 @@ class PluginManager {
               installed = options.installed,
               others = _objectWithoutProperties(options, _excluded);
 
-        model = yield _this4.repository.create({
+        yield _this4.repository.create({
           transaction,
           values: {
             name: plugin,
@@ -424,14 +437,14 @@ class PluginManager {
     var _this5 = this;
 
     return _asyncToGenerator(function* () {
-      var _iterator3 = _createForOfIteratorHelper(_this5.plugins),
-          _step3;
+      var _iterator4 = _createForOfIteratorHelper(_this5.plugins),
+          _step4;
 
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          const _step3$value = _slicedToArray(_step3.value, 2),
-                name = _step3$value[0],
-                plugin = _step3$value[1];
+        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+          const _step4$value = _slicedToArray(_step4.value, 2),
+                name = _step4$value[0],
+                plugin = _step4$value[1];
 
           if (!plugin.enabled) {
             continue;
@@ -440,19 +453,19 @@ class PluginManager {
           yield plugin.beforeLoad();
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator4.e(err);
       } finally {
-        _iterator3.f();
+        _iterator4.f();
       }
 
-      var _iterator4 = _createForOfIteratorHelper(_this5.plugins),
-          _step4;
+      var _iterator5 = _createForOfIteratorHelper(_this5.plugins),
+          _step5;
 
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          const _step4$value = _slicedToArray(_step4.value, 2),
-                name = _step4$value[0],
-                plugin = _step4$value[1];
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          const _step5$value = _slicedToArray(_step5.value, 2),
+                name = _step5$value[0],
+                plugin = _step5$value[1];
 
           if (!plugin.enabled) {
             continue;
@@ -463,9 +476,9 @@ class PluginManager {
           yield _this5.app.emitAsync('afterLoadPlugin', plugin, options);
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator4.f();
+        _iterator5.f();
       }
     })();
   }
@@ -474,14 +487,14 @@ class PluginManager {
     var _this6 = this;
 
     return _asyncToGenerator(function* () {
-      var _iterator5 = _createForOfIteratorHelper(_this6.plugins),
-          _step5;
+      var _iterator6 = _createForOfIteratorHelper(_this6.plugins),
+          _step6;
 
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          const _step5$value = _slicedToArray(_step5.value, 2),
-                name = _step5$value[0],
-                plugin = _step5$value[1];
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          const _step6$value = _slicedToArray(_step6.value, 2),
+                name = _step6$value[0],
+                plugin = _step6$value[1];
 
           if (!plugin.enabled) {
             continue;
@@ -492,9 +505,9 @@ class PluginManager {
           yield _this6.app.emitAsync('afterInstallPlugin', plugin, options);
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator5.f();
+        _iterator6.f();
       }
     })();
   }
@@ -508,12 +521,12 @@ class PluginManager {
         yield _this7.app.reload();
         yield _this7.app.db.sync();
 
-        var _iterator6 = _createForOfIteratorHelper(pluginNames),
-            _step6;
+        var _iterator7 = _createForOfIteratorHelper(pluginNames),
+            _step7;
 
         try {
-          for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-            const pluginName = _step6.value;
+          for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+            const pluginName = _step7.value;
 
             const plugin = _this7.app.getPlugin(pluginName);
 
@@ -525,9 +538,9 @@ class PluginManager {
             yield plugin.afterEnable();
           }
         } catch (err) {
-          _iterator6.e(err);
+          _iterator7.e(err);
         } finally {
-          _iterator6.f();
+          _iterator7.f();
         }
       } catch (error) {
         throw error;
@@ -543,12 +556,12 @@ class PluginManager {
         const pluginNames = yield _this8.repository.disable(name);
         yield _this8.app.reload();
 
-        var _iterator7 = _createForOfIteratorHelper(pluginNames),
-            _step7;
+        var _iterator8 = _createForOfIteratorHelper(pluginNames),
+            _step8;
 
         try {
-          for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-            const pluginName = _step7.value;
+          for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+            const pluginName = _step8.value;
 
             const plugin = _this8.app.getPlugin(pluginName);
 
@@ -559,9 +572,9 @@ class PluginManager {
             yield plugin.afterDisable();
           }
         } catch (err) {
-          _iterator7.e(err);
+          _iterator8.e(err);
         } finally {
-          _iterator7.f();
+          _iterator8.f();
         }
       } catch (error) {
         throw error;
@@ -575,12 +588,12 @@ class PluginManager {
     return _asyncToGenerator(function* () {
       const pluginNames = typeof name === 'string' ? [name] : name;
 
-      var _iterator8 = _createForOfIteratorHelper(pluginNames),
-          _step8;
+      var _iterator9 = _createForOfIteratorHelper(pluginNames),
+          _step9;
 
       try {
-        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-          const pluginName = _step8.value;
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          const pluginName = _step9.value;
 
           const plugin = _this9.app.getPlugin(pluginName);
 
@@ -591,9 +604,9 @@ class PluginManager {
           yield plugin.remove();
         }
       } catch (err) {
-        _iterator8.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator8.f();
+        _iterator9.f();
       }
 
       yield _this9.repository.remove(name);
@@ -602,15 +615,19 @@ class PluginManager {
     })();
   }
 
+  static getPackageJson(packageName) {
+    return require(`${packageName}/package.json`);
+  }
+
   static getPackageName(name) {
     const prefixes = this.getPluginPkgPrefix();
 
-    var _iterator9 = _createForOfIteratorHelper(prefixes),
-        _step9;
+    var _iterator10 = _createForOfIteratorHelper(prefixes),
+        _step10;
 
     try {
-      for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-        const prefix = _step9.value;
+      for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+        const prefix = _step10.value;
 
         try {
           require.resolve(`${prefix}${name}`);
@@ -621,9 +638,9 @@ class PluginManager {
         }
       }
     } catch (err) {
-      _iterator9.e(err);
+      _iterator10.e(err);
     } finally {
-      _iterator9.f();
+      _iterator10.f();
     }
 
     throw new Error(`${name} plugin does not exist`);
@@ -646,12 +663,12 @@ class PluginManager {
 
         const prefixes = _this10.getPluginPkgPrefix();
 
-        var _iterator10 = _createForOfIteratorHelper(prefixes),
-            _step10;
+        var _iterator11 = _createForOfIteratorHelper(prefixes),
+            _step11;
 
         try {
-          for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-            const prefix = _step10.value;
+          for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+            const prefix = _step11.value;
 
             try {
               const packageName = `${prefix}${name}`;
@@ -666,9 +683,9 @@ class PluginManager {
             }
           }
         } catch (err) {
-          _iterator10.e(err);
+          _iterator11.e(err);
         } finally {
-          _iterator10.f();
+          _iterator11.f();
         }
       }
 

package/lib/plugin-manager/PluginManagerRepository.js

@@ -93,7 +93,10 @@ class PluginManagerRepository extends _database().Repository {
     var _this4 = this;
 
     return _asyncToGenerator(function* () {
-      const items = yield _this4.find();
+      // sort plugins by id
+      const items = yield _this4.find({
+        sort: 'id'
+      });
 
       var _iterator = _createForOfIteratorHelper(items),
           _step;

package/lib/plugin-manager/options/collection.d.ts

@@ -1,5 +1,7 @@
 declare const _default: {
     name: string;
+    namespace: string;
+    duplicator: string;
     repository: string;
     fields: ({
         type: string;

package/lib/plugin-manager/options/collection.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _default = {
   name: 'applicationPlugins',
+  namespace: 'core',
+  duplicator: 'required',
   repository: 'PluginManagerRepository',
   fields: [{
     type: 'string',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "0.9.0-alpha.2",
+  "version": "0.9.1-alpha.2",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -8,11 +8,11 @@
     "@hapi/topo": "^6.0.0",
     "@koa/cors": "^3.1.0",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "0.9.0-alpha.2",
-    "@nocobase/actions": "0.9.0-alpha.2",
-    "@nocobase/database": "0.9.0-alpha.2",
-    "@nocobase/logger": "0.9.0-alpha.2",
-    "@nocobase/resourcer": "0.9.0-alpha.2",
+    "@nocobase/acl": "0.9.1-alpha.2",
+    "@nocobase/actions": "0.9.1-alpha.2",
+    "@nocobase/database": "0.9.1-alpha.2",
+    "@nocobase/logger": "0.9.1-alpha.2",
+    "@nocobase/resourcer": "0.9.1-alpha.2",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "find-package-json": "^1.2.0",
@@ -27,5 +27,5 @@
   "devDependencies": {
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "b8f76ad38e60e677c5bb4aab0a4cdb28d98a0f49"
+  "gitHead": "d588a68eca4feed4642a4cb317301011266fe5c9"
 }