@nocobase/server 0.8.0-alpha.9 → 0.8.1-alpha.3

package/lib/application.d.ts

@@ -3,6 +3,7 @@
 import { ACL } from '@nocobase/acl';
 import { Cache, ICacheConfig } from '@nocobase/cache';
 import Database, { Collection, CollectionOptions, IDatabaseOptions } from '@nocobase/database';
+import { AppLoggerOptions, Logger } from '@nocobase/logger';
 import Resourcer, { ResourceOptions } from '@nocobase/resourcer';
 import { AsyncEmitter, ToposortOptions } from '@nocobase/utils';
 import { Command, CommandOptions, ParseOptions } from 'commander';
@@ -27,6 +28,7 @@ export interface ApplicationOptions {
     i18n?: i18n | InitOptions;
     plugins?: PluginConfiguration[];
     acl?: boolean;
+    logger?: AppLoggerOptions;
     pmSock?: string;
 }
 export interface DefaultState extends KoaDefaultState {
@@ -60,6 +62,7 @@ interface ListenOptions {
 }
 interface StartOptions {
     cliArgs?: any[];
+    dbSync?: boolean;
     listen?: ListenOptions;
 }
 export declare class ApplicationVersion {
@@ -73,6 +76,7 @@ export declare class ApplicationVersion {
 export declare class Application<StateT = DefaultState, ContextT = DefaultContext> extends Koa implements AsyncEmitter {
     options: ApplicationOptions;
     protected _db: Database;
+    protected _logger: Logger;
     protected _resourcer: Resourcer;
     protected _cache: Cache;
     protected _cli: Command;
@@ -94,6 +98,8 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get pm(): PluginManager;
     get version(): ApplicationVersion;
     get appManager(): AppManager;
+    get logger(): Logger;
+    get log(): Logger;
     protected init(): void;
     private createDatabase;
     getVersion(): any;
@@ -114,6 +120,10 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     listen(...args: any[]): Server;
     stop(options?: any): Promise<void>;
     destroy(options?: any): Promise<void>;
+    dbVersionCheck(options?: {
+        exit?: boolean;
+    }): Promise<boolean>;
+    isInstalled(): Promise<boolean>;
     install(options?: InstallOptions): Promise<void>;
     upgrade(options?: any): Promise<void>;
     emitAsync: (event: string | symbol, ...args: any[]) => Promise<boolean>;

package/lib/application.js

@@ -35,6 +35,16 @@ function _database() {
   return data;
 }
 
+function _logger() {
+  const data = require("@nocobase/logger");
+
+  _logger = function _logger() {
+    return data;
+  };
+
+  return data;
+}
+
 function _utils() {
   const data = require("@nocobase/utils");
 
@@ -45,6 +55,16 @@ function _utils() {
   return data;
 }
 
+function _chalk() {
+  const data = _interopRequireDefault(require("chalk"));
+
+  _chalk = function _chalk() {
+    return data;
+  };
+
+  return data;
+}
+
 function _commander() {
   const data = require("commander");
 
@@ -75,16 +95,6 @@ function _koaCompose() {
   return data;
 }
 
-function _lodash() {
-  const data = require("lodash");
-
-  _lodash = function _lodash() {
-    return data;
-  };
-
-  return data;
-}
-
 function _semver() {
   const data = _interopRequireDefault(require("semver"));
 
@@ -155,6 +165,11 @@ class ApplicationVersion {
     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');
       }
 
@@ -206,6 +221,7 @@ class Application extends _koa().default {
     super();
     this.options = void 0;
     this._db = void 0;
+    this._logger = void 0;
     this._resourcer = void 0;
     this._cache = void 0;
     this._cli = void 0;
@@ -256,8 +272,18 @@ class Application extends _koa().default {
     return this._appManager;
   }
 
+  get logger() {
+    return this._logger;
+  }
+
+  get log() {
+    return this._logger;
+  }
+
   init() {
-    const options = this.options; // @ts-ignore
+    const options = this.options;
+    const logger = (0, _logger().createAppLogger)(options.logger);
+    this._logger = logger.instance; // @ts-ignore
 
     this._events = []; // @ts-ignore
 
@@ -266,6 +292,9 @@ class Application extends _koa().default {
     this.middleware = new (_utils().Toposort)();
     this.plugins = new Map();
     this._acl = (0, _acl.createACL)();
+    this.use(logger.middleware, {
+      tag: 'logger'
+    });
 
     if (this._db) {
       // MaxListenersExceededWarning
@@ -278,6 +307,7 @@ class Application extends _koa().default {
     this._i18n = (0, _helper.createI18n)(options);
     this._cache = (0, _cache().createCache)(options.cache);
     this.context.db = this._db;
+    this.context.logger = this._logger;
     this.context.resourcer = this._resourcer;
     this.context.cache = this._cache;
 
@@ -371,6 +401,7 @@ class Application extends _koa().default {
 
     return _asyncToGenerator(function* () {
       if (options === null || options === void 0 ? void 0 : options.reload) {
+        console.log(`Reload the application configuration`);
         const oldDb = _this4._db;
 
         _this4.init();
@@ -410,9 +441,25 @@ class Application extends _koa().default {
     var _this7 = this;
 
     return _asyncToGenerator(function* () {
-      yield _this7.load({
-        method: argv === null || argv === void 0 ? void 0 : argv[2]
+      try {
+        yield _this7.db.auth({
+          retry: 30
+        });
+      } catch (error) {
+        console.log(_chalk().default.red(error.message));
+        process.exit(1);
+      }
+
+      yield _this7.dbVersionCheck({
+        exit: true
       });
+
+      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);
     })();
   }
@@ -428,6 +475,11 @@ class Application extends _koa().default {
         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) {
@@ -499,7 +551,7 @@ class Application extends _koa().default {
     })();
   }
 
-  install(options = {}) {
+  dbVersionCheck(options) {
     var _this11 = this;
 
     return _asyncToGenerator(function* () {
@@ -510,42 +562,84 @@ class Application extends _koa().default {
       });
 
       if (!r) {
-        console.log('The database only supports MySQL 8.0.17 and above, SQLite 3.x and PostgreSQL 10+');
-        return;
+        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 (options === null || options === void 0 ? void 0 : options.clean) {
-        yield _this11.db.clean((0, _lodash().isBoolean)(options.clean) ? {
-          drop: options.clean
-        } : options.clean);
-        yield _this11.reload({
+      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') {
+          console.log(_chalk().default.red(`mysql variable 'lower_case_table_names' must be set to '0' or '2'`));
+
+          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({
+          drop: true
+        });
+        yield _this13.reload({
           method: 'install'
         });
       }
 
-      yield _this11.emitAsync('beforeInstall', _this11, options);
-      yield _this11.db.sync(options === null || options === void 0 ? void 0 : options.sync);
-      yield _this11.pm.install(options);
-      yield _this11.version.update();
-      yield _this11.emitAsync('afterInstall', _this11, options);
+      yield _this13.emitAsync('beforeInstall', _this13, options);
+      yield _this13.db.sync();
+      yield _this13.pm.install(options);
+      yield _this13.version.update();
+      yield _this13.emitAsync('afterInstall', _this13, options);
     })();
   }
 
   upgrade(options = {}) {
-    var _this12 = this;
+    var _this14 = this;
 
     return _asyncToGenerator(function* () {
-      yield _this12.emitAsync('beforeUpgrade', _this12, options);
+      yield _this14.emitAsync('beforeUpgrade', _this14, options);
       const force = false;
-      yield _this12.db.migrator.up();
-      yield _this12.db.sync({
+      yield _this14.db.migrator.up();
+      yield _this14.db.sync({
         force,
         alter: {
           drop: force
         }
       });
-      yield _this12.version.update();
-      yield _this12.emitAsync('afterUpgrade', _this12, options);
+      yield _this14.version.update();
+      yield _this14.emitAsync('afterUpgrade', _this14, options);
     })();
   }
 

package/lib/commands/db-sync.js

@@ -13,7 +13,6 @@ var _default = app => {
   app.command('db:sync').action( /*#__PURE__*/_asyncToGenerator(function* (...cliArgs) {
     const opts = cliArgs[0];
     console.log('db sync...');
-    yield app.emitAsync('cli.beforeDbSync', ...cliArgs);
     const force = false;
     yield app.db.sync({
       force,

package/lib/commands/install.js

@@ -22,21 +22,19 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 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); }); }; }
 
 var _default = app => {
-  app.command('install').option('-f, --force').option('-c, --clean').option('-s, --silent').option('-r, --retry [retry]').action( /*#__PURE__*/_asyncToGenerator(function* (...cliArgs) {
+  app.command('install').option('-f, --force').option('-c, --clean').option('-s, --silent').option('-r, --retry [retry]').option('-I, --ignore-installed').action( /*#__PURE__*/_asyncToGenerator(function* (...cliArgs) {
     let installed = false;
     const opts = cliArgs[0];
 
-    try {
-      yield app.db.auth({
-        retry: opts.retry || 1
-      });
-    } catch (error) {
-      console.log(_chalk().default.red('Unable to connect to the database. Please check the database environment variables in the .env file.'));
-      return;
+    if (opts.ignoreInstalled) {
+      if (yield app.isInstalled()) {
+        console.log('Application installed');
+        return;
+      }
     }
 
     if (!(opts === null || opts === void 0 ? void 0 : opts.clean) && !(opts === null || opts === void 0 ? void 0 : opts.force)) {
-      if ((yield app.db.collectionExistsInDb('applicationVersion')) || (yield app.db.collectionExistsInDb('collections'))) {
+      if (yield app.isInstalled()) {
         installed = true;
 
         if (!opts.silent) {
@@ -45,6 +43,8 @@ var _default = app => {
           let command = '$ yarn nocobase install -f';
           console.log(_chalk().default.yellow(command));
           console.log();
+          console.log(_chalk().default.red('This operation will clear the database!!!'));
+          console.log();
         }
 
         return;

package/lib/commands/pm.js

@@ -12,6 +12,14 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 var _default = app => {
   app.command('pm').argument('<method>').arguments('<plugins...>').action( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(function* (method, plugins, options, ...args) {
+      if (method === 'add') {
+        const _require = require('@nocobase/cli/src/util'),
+              run = _require.run;
+
+        console.log('Install dependencies and rebuild workspaces');
+        yield run('yarn', ['install']);
+      }
+
       app.pm.clientWrite({
         method,
         plugins

package/lib/commands/start.js

@@ -10,11 +10,12 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 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); }); }; }
 
 var _default = app => {
-  app.command('start').option('-s, --silent').option('-p, --port [post]').option('-h, --host [host]').action( /*#__PURE__*/_asyncToGenerator(function* (...cliArgs) {
+  app.command('start').option('-s, --silent').option('-p, --port [post]').option('-h, --host [host]').option('--db-sync').action( /*#__PURE__*/_asyncToGenerator(function* (...cliArgs) {
     const opts = cliArgs[0];
     const port = opts.port || process.env.APP_PORT || 13000;
     const host = opts.host || process.env.APP_HOST || '0.0.0.0';
     yield app.start({
+      dbSync: opts === null || opts === void 0 ? void 0 : opts.dbSync,
       cliArgs,
       listen: {
         port,

package/lib/helper.js

@@ -108,14 +108,16 @@ function registerMiddlewares(app, options) {
 
   if (options.bodyParser !== false) {
     app.use((0, _koaBodyparser().default)(_objectSpread({}, options.bodyParser)), {
-      tag: 'bodyParser'
+      tag: 'bodyParser',
+      after: 'logger'
     });
   }
 
   app.use( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(function* (ctx, next) {
       ctx.getBearerToken = () => {
-        return ctx.get('Authorization').replace(/^Bearer\s+/gi, '');
+        const token = ctx.get('Authorization').replace(/^Bearer\s+/gi, '');
+        return token || ctx.query.token;
       };
 
       yield next();

package/lib/middlewares/data-wrapping.js

@@ -78,6 +78,10 @@ function dataWrapping() {
             data: ctx.body
           };
         }
+      } else if (ctx.action) {
+        ctx.body = {
+          data: ctx.body
+        };
       }
     });
 

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

@@ -25,6 +25,7 @@ export declare class PluginManager {
     addStaticMultiple(plugins: any): void;
     getPlugins(): Map<string, Plugin<any>>;
     get(name: string): Plugin<any>;
+    has(name: string): boolean;
     clientWrite(data: any): void;
     listen(): Promise<net.Server>;
     create(name: string | string[]): Promise<void>;
@@ -37,6 +38,7 @@ export declare class PluginManager {
     disable(name: string | string[]): Promise<void>;
     remove(name: string | string[]): Promise<void>;
     static getPackageName(name: string): string;
+    static getPluginPkgPrefix(): string[];
     static findPackage(name: string): Promise<string>;
     static resolvePlugin(pluginName: string): any;
 }

package/lib/plugin-manager/PluginManager.js

@@ -125,6 +125,7 @@ class PluginManager {
     this.repository.setPluginManager(this);
     this.app.resourcer.define(_resource.default);
     this.app.acl.allow('pm', ['enable', 'disable', 'remove'], 'allowConfigure');
+    this.app.acl.allow('applicationPlugins', 'list', 'allowConfigure');
     this.server = _net().default.createServer(socket => {
       socket.on('data', /*#__PURE__*/function () {
         var _ref = _asyncToGenerator(function* (data) {
@@ -167,6 +168,9 @@ class PluginManager {
         return _ref2.apply(this, arguments);
       };
     }());
+    this.app.on('beforeUpgrade', /*#__PURE__*/_asyncToGenerator(function* () {
+      yield _this.collection.sync();
+    }));
     this.addStaticMultiple(options.plugins);
   }
 
@@ -199,6 +203,10 @@ class PluginManager {
     return this.plugins.get(name);
   }
 
+  has(name) {
+    return this.plugins.has(name);
+  }
+
   clientWrite(data) {
     var _this2 = this;
 
@@ -256,7 +264,7 @@ class PluginManager {
             run = _require.run;
 
       const createPlugin = /*#__PURE__*/function () {
-        var _ref4 = _asyncToGenerator(function* (name) {
+        var _ref5 = _asyncToGenerator(function* (name) {
           const _require2 = require('@nocobase/cli/src/plugin-generator'),
                 PluginGenerator = _require2.PluginGenerator;
 
@@ -271,7 +279,7 @@ class PluginManager {
         });
 
         return function createPlugin(_x4) {
-          return _ref4.apply(this, arguments);
+          return _ref5.apply(this, arguments);
         };
       }();
 
@@ -327,7 +335,7 @@ class PluginManager {
     const pluginName = instance.getName();
 
     if (this.plugins.has(pluginName)) {
-      throw new Error(`plugin name [${pluginName}] exists`);
+      throw new Error(`plugin name [${pluginName}] already exists`);
     }
 
     this.plugins.set(pluginName, instance);
@@ -349,8 +357,7 @@ class PluginManager {
           yield t.rollback();
           throw error;
         }
-      } // console.log(`adding ${plugin} plugin`);
-
+      }
 
       const packageName = yield PluginManager.findPackage(plugin);
 
@@ -367,26 +374,25 @@ class PluginManager {
         }
       });
 
-      if (model) {
-        throw new Error(`${plugin} plugin already exists`);
+      if (!model) {
+        const enabled = options.enabled,
+              builtIn = options.builtIn,
+              installed = options.installed,
+              others = _objectWithoutProperties(options, _excluded);
+
+        model = yield _this4.repository.create({
+          transaction,
+          values: {
+            name: plugin,
+            version: packageJson.version,
+            enabled: !!enabled,
+            builtIn: !!builtIn,
+            installed: !!installed,
+            options: _objectSpread({}, others)
+          }
+        });
       }
 
-      const enabled = options.enabled,
-            builtIn = options.builtIn,
-            installed = options.installed,
-            others = _objectWithoutProperties(options, _excluded);
-
-      yield _this4.repository.create({
-        transaction,
-        values: {
-          name: plugin,
-          version: packageJson.version,
-          enabled: !!enabled,
-          builtIn: !!builtIn,
-          installed: !!installed,
-          options: _objectSpread({}, others)
-        }
-      });
       const file = (0, _path().resolve)(process.cwd(), 'packages', process.env.APP_PACKAGE_ROOT || 'app', 'client/src/plugins', `${plugin}.ts`);
 
       if (!_fs().default.existsSync(file)) {
@@ -589,7 +595,7 @@ class PluginManager {
   }
 
   static getPackageName(name) {
-    const prefixes = (process.env.PLUGIN_PACKAGE_PREFIX || '@nocobase/plugin-,@nocobase/preset-').split(',');
+    const prefixes = this.getPluginPkgPrefix();
 
     var _iterator9 = _createForOfIteratorHelper(prefixes),
         _step9;
@@ -615,6 +621,10 @@ class PluginManager {
     throw new Error(`${name} plugin does not exist`);
   }
 
+  static getPluginPkgPrefix() {
+    return (process.env.PLUGIN_PACKAGE_PREFIX || '@nocobase/plugin-,@nocobase/preset-,@nocobase/plugin-pro-').split(',');
+  }
+
   static findPackage(name) {
     var _this10 = this;
 
@@ -624,7 +634,9 @@ class PluginManager {
 
         return packageName;
       } catch (error) {
-        const prefixes = (process.env.PLUGIN_PACKAGE_PREFIX || '@nocobase/plugin-,@nocobase/preset-').split(',');
+        console.log(`\`${name}\` plugin not found locally`);
+
+        const prefixes = _this10.getPluginPkgPrefix();
 
         var _iterator10 = _createForOfIteratorHelper(prefixes),
             _step10;
@@ -635,9 +647,11 @@ class PluginManager {
 
             try {
               const packageName = `${prefix}${name}`;
+              console.log(`Try to find ${packageName}`);
               yield (0, _execa().default)('npm', ['v', packageName, 'versions']);
-              console.log(`${packageName} is downloading...`);
+              console.log(`${packageName} downloading`);
               yield (0, _execa().default)('yarn', ['add', packageName, '-W']);
+              console.log(`${packageName} downloaded`);
               return packageName;
             } catch (error) {
               continue;
@@ -650,7 +664,7 @@ class PluginManager {
         }
       }
 
-      throw new Error(`${name} plugin does not exist`);
+      throw new Error(`No available packages found, ${name} plugin does not exist`);
     })();
   }
 

package/lib/plugin.d.ts

@@ -1,4 +1,3 @@
-import { Database } from '@nocobase/database';
 import { Application } from './application';
 import { InstallOptions } from './plugin-manager';
 export interface PluginInterface {
@@ -21,8 +20,8 @@ export declare type PluginType = typeof Plugin;
 export declare abstract class Plugin<O = any> implements PluginInterface {
     options: any;
     app: Application;
-    db: Database;
     constructor(app: Application, options?: any);
+    get db(): import("@nocobase/database").default;
     get enabled(): any;
     set enabled(value: any);
     setOptions(options: any): void;

package/lib/plugin.js

@@ -13,13 +13,15 @@ class Plugin {
   constructor(app, options) {
     this.options = void 0;
     this.app = void 0;
-    this.db = void 0;
     this.app = app;
-    this.db = app.db;
     this.setOptions(options);
     this.afterAdd();
   }
 
+  get db() {
+    return this.app.db;
+  }
+
   get enabled() {
     return this.options.enabled;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "0.8.0-alpha.9",
+  "version": "0.8.1-alpha.3",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -14,10 +14,11 @@
     "@hapi/topo": "^6.0.0",
     "@koa/cors": "^3.1.0",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "0.8.0-alpha.9",
-    "@nocobase/actions": "0.8.0-alpha.9",
-    "@nocobase/database": "0.8.0-alpha.9",
-    "@nocobase/resourcer": "0.8.0-alpha.9",
+    "@nocobase/acl": "0.8.1-alpha.3",
+    "@nocobase/actions": "0.8.1-alpha.3",
+    "@nocobase/database": "0.8.1-alpha.3",
+    "@nocobase/logger": "0.8.1-alpha.3",
+    "@nocobase/resourcer": "0.8.1-alpha.3",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "find-package-json": "^1.2.0",
@@ -32,5 +33,5 @@
   "devDependencies": {
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "6afe02d59bb22df0f96a7605c9001dcc17a30d6a"
+  "gitHead": "e03df3df5962b99d9fbf5b6e33fbe2b23f14f3d3"
 }