@nocobase/server 0.7.6-alpha.2 → 0.8.0-alpha.10

package/lib/plugin-manager/PluginManagerRepository.js

@@ -0,0 +1,121 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PluginManagerRepository = void 0;
+
+function _database() {
+  const data = require("@nocobase/database");
+
+  _database = function _database() {
+    return data;
+  };
+
+  return data;
+}
+
+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 _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 PluginManagerRepository extends _database().Repository {
+  constructor(...args) {
+    super(...args);
+    this.pm = void 0;
+  }
+
+  setPluginManager(pm) {
+    this.pm = pm;
+  }
+
+  remove(name) {
+    var _this = this;
+
+    return _asyncToGenerator(function* () {
+      yield _this.destroy({
+        filter: {
+          name
+        }
+      });
+    })();
+  }
+
+  enable(name) {
+    var _this2 = this;
+
+    return _asyncToGenerator(function* () {
+      const pluginNames = typeof name === 'string' ? [name] : name;
+      yield _this2.update({
+        filter: {
+          name
+        },
+        values: {
+          enabled: true,
+          installed: true
+        }
+      });
+      return pluginNames;
+    })();
+  }
+
+  disable(name) {
+    var _this3 = this;
+
+    return _asyncToGenerator(function* () {
+      const pluginNames = typeof name === 'string' ? [name] : name;
+      yield _this3.update({
+        filter: {
+          name
+        },
+        values: {
+          enabled: false,
+          installed: false
+        }
+      });
+      return pluginNames;
+    })();
+  }
+
+  load() {
+    var _this4 = this;
+
+    return _asyncToGenerator(function* () {
+      const items = yield _this4.find();
+
+      var _iterator = _createForOfIteratorHelper(items),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          const item = _step.value;
+          yield _this4.pm.addStatic(item.get('name'), _objectSpread(_objectSpread({}, item.get('options')), {}, {
+            name: item.get('name'),
+            version: item.get('version'),
+            enabled: item.get('enabled'),
+            async: true
+          }));
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    })();
+  }
+
+}
+
+exports.PluginManagerRepository = PluginManagerRepository;

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

@@ -0,0 +1 @@
+export * from './PluginManager';

package/lib/plugin-manager/index.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _PluginManager = require("./PluginManager");
+
+Object.keys(_PluginManager).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _PluginManager[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _PluginManager[key];
+    }
+  });
+});

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

@@ -0,0 +1,14 @@
+declare const _default: {
+    name: string;
+    repository: string;
+    fields: ({
+        type: string;
+        name: string;
+        unique: boolean;
+    } | {
+        type: string;
+        name: string;
+        unique?: undefined;
+    })[];
+};
+export default _default;

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

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  name: 'applicationPlugins',
+  repository: 'PluginManagerRepository',
+  fields: [{
+    type: 'string',
+    name: 'name',
+    unique: true
+  }, {
+    type: 'string',
+    name: 'version'
+  }, {
+    type: 'boolean',
+    name: 'enabled'
+  }, {
+    type: 'boolean',
+    name: 'installed'
+  }, {
+    type: 'boolean',
+    name: 'builtIn'
+  }, {
+    type: 'json',
+    name: 'options'
+  }]
+};
+exports.default = _default;

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

@@ -0,0 +1,11 @@
+declare const _default: {
+    name: string;
+    actions: {
+        add(ctx: any, next: any): Promise<void>;
+        enable(ctx: any, next: any): Promise<void>;
+        disable(ctx: any, next: any): Promise<void>;
+        upgrade(ctx: any, next: any): Promise<void>;
+        remove(ctx: any, next: any): Promise<void>;
+    };
+};
+export default _default;

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

@@ -0,0 +1,84 @@
+"use strict";
+
+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); }); }; }
+
+var _default = {
+  name: 'pm',
+  actions: {
+    add(ctx, next) {
+      return _asyncToGenerator(function* () {
+        const pm = ctx.app.pm;
+        const filterByTk = ctx.action.params.filterByTk;
+
+        if (!filterByTk) {
+          ctx.throw(400, 'plugin name invalid');
+        }
+
+        yield pm.add(filterByTk);
+        ctx.body = filterByTk;
+        yield next();
+      })();
+    },
+
+    enable(ctx, next) {
+      return _asyncToGenerator(function* () {
+        const pm = ctx.app.pm;
+        const filterByTk = ctx.action.params.filterByTk;
+
+        if (!filterByTk) {
+          ctx.throw(400, 'plugin name invalid');
+        }
+
+        yield pm.enable(filterByTk);
+        ctx.body = filterByTk;
+        yield next();
+      })();
+    },
+
+    disable(ctx, next) {
+      return _asyncToGenerator(function* () {
+        const pm = ctx.app.pm;
+        const filterByTk = ctx.action.params.filterByTk;
+
+        if (!filterByTk) {
+          ctx.throw(400, 'plugin name invalid');
+        }
+
+        yield pm.disable(filterByTk);
+        ctx.body = filterByTk;
+        yield next();
+      })();
+    },
+
+    upgrade(ctx, next) {
+      return _asyncToGenerator(function* () {
+        ctx.body = 'ok';
+        yield next();
+      })();
+    },
+
+    remove(ctx, next) {
+      return _asyncToGenerator(function* () {
+        const pm = ctx.app.pm;
+        const filterByTk = ctx.action.params.filterByTk;
+
+        if (!filterByTk) {
+          ctx.throw(400, 'plugin name invalid');
+        }
+
+        yield pm.remove(filterByTk);
+        ctx.body = filterByTk;
+        yield next();
+      })();
+    }
+
+  }
+};
+exports.default = _default;

package/lib/plugin.d.ts

@@ -11,6 +11,7 @@ export interface PluginOptions {
     displayName?: string;
     description?: string;
     version?: string;
+    enabled?: boolean;
     install?: (this: Plugin) => void;
     load?: (this: Plugin) => void;
     plugin?: typeof Plugin;
@@ -18,16 +19,20 @@ export interface PluginOptions {
 }
 export declare type PluginType = typeof Plugin;
 export declare abstract class Plugin<O = any> implements PluginInterface {
-    options: O;
+    options: any;
     app: Application;
     db: Database;
-    constructor(app: Application, options?: O);
-    setOptions(options: O): void;
-    abstract getName(): string;
+    constructor(app: Application, options?: any);
+    get enabled(): any;
+    set enabled(value: any);
+    setOptions(options: any): void;
+    getName(): any;
+    afterAdd(): void;
     beforeLoad(): void;
-    install(options?: InstallOptions): Promise<void>;
     load(): Promise<void>;
-    collectionPath(): any;
-    protected getPackageName(dirname: string): any;
+    install(options?: InstallOptions): Promise<void>;
+    afterEnable(): Promise<void>;
+    afterDisable(): Promise<void>;
+    remove(): Promise<void>;
 }
 export default Plugin;

package/lib/plugin.js

@@ -5,18 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.Plugin = void 0;
 
-function _findPackageJson() {
-  const data = _interopRequireDefault(require("find-package-json"));
-
-  _findPackageJson = function _findPackageJson() {
-    return data;
-  };
-
-  return data;
-}
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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); }); }; }
@@ -29,40 +17,47 @@ class Plugin {
     this.app = app;
     this.db = app.db;
     this.setOptions(options);
+    this.afterAdd();
+  }
+
+  get enabled() {
+    return this.options.enabled;
+  }
+
+  set enabled(value) {
+    this.options.enabled = value;
   }
 
   setOptions(options) {
     this.options = options || {};
   }
 
+  getName() {
+    return this.options.name;
+  }
+
+  afterAdd() {}
+
   beforeLoad() {}
 
-  install(options) {
+  load() {
     return _asyncToGenerator(function* () {})();
   }
 
-  load() {
-    var _this = this;
-
-    return _asyncToGenerator(function* () {
-      const collectionPath = _this.collectionPath();
+  install(options) {
+    return _asyncToGenerator(function* () {})();
+  }
 
-      if (collectionPath) {
-        yield _this.db.import({
-          directory: collectionPath
-        });
-      }
-    })();
+  afterEnable() {
+    return _asyncToGenerator(function* () {})();
   }
 
-  collectionPath() {
-    return null;
+  afterDisable() {
+    return _asyncToGenerator(function* () {})();
   }
 
-  getPackageName(dirname) {
-    const f = (0, _findPackageJson().default)(dirname);
-    const packageObj = f.next().value;
-    return packageObj['name'];
+  remove() {
+    return _asyncToGenerator(function* () {})();
   }
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "0.7.6-alpha.2",
+  "version": "0.8.0-alpha.10",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -11,12 +11,13 @@
     }
   ],
   "dependencies": {
+    "@hapi/topo": "^6.0.0",
     "@koa/cors": "^3.1.0",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "0.7.6-alpha.2",
-    "@nocobase/actions": "0.7.6-alpha.2",
-    "@nocobase/database": "0.7.6-alpha.2",
-    "@nocobase/resourcer": "0.7.6-alpha.2",
+    "@nocobase/acl": "0.8.0-alpha.10",
+    "@nocobase/actions": "0.8.0-alpha.10",
+    "@nocobase/database": "0.8.0-alpha.10",
+    "@nocobase/resourcer": "0.8.0-alpha.10",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "find-package-json": "^1.2.0",
@@ -25,10 +26,11 @@
     "koa-bodyparser": "^4.3.0",
     "koa-static": "^5.0.0",
     "lodash": "^4.17.21",
-    "semver": "^7.3.7"
+    "semver": "^7.3.7",
+    "xpipe": "^1.0.5"
   },
   "devDependencies": {
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "2cfccff9d3ff14c521bf317fa7ee4efa18444c92"
+  "gitHead": "a9723cdeadc764eba634b5815685177679025c83"
 }

package/lib/plugin-manager.d.ts

@@ -1,26 +0,0 @@
-import { CleanOptions, SyncOptions } from '@nocobase/database';
-import Application from './application';
-import { Plugin } from './plugin';
-interface PluginManagerOptions {
-    app: Application;
-}
-export interface InstallOptions {
-    cliArgs?: any[];
-    clean?: CleanOptions | boolean;
-    sync?: SyncOptions;
-}
-declare type PluginConstructor<P, O = any> = {
-    new (app: Application, options: O): P;
-};
-export declare class PluginManager {
-    app: Application;
-    protected plugins: Map<string, Plugin<any>>;
-    constructor(options: PluginManagerOptions);
-    getPlugins(): Map<string, Plugin<any>>;
-    get(name: string): Plugin<any>;
-    add<P extends Plugin = Plugin, O = any>(pluginClass: PluginConstructor<P, O>, options?: O): P;
-    load(): Promise<void>;
-    install(options?: InstallOptions): Promise<void>;
-    static resolvePlugin(pluginName: string): any;
-}
-export {};

package/lib/plugin-manager.js

@@ -1,130 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.PluginManager = void 0;
-
-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 _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 _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-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(_e2) { throw _e2; }, 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(_e3) { didErr = true; err = _e3; }, 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 PluginManager {
-  constructor(options) {
-    this.app = void 0;
-    this.plugins = new Map();
-    this.app = options.app;
-  }
-
-  getPlugins() {
-    return this.plugins;
-  }
-
-  get(name) {
-    return this.plugins.get(name);
-  }
-
-  add(pluginClass, options) {
-    const instance = new pluginClass(this.app, options);
-    const name = instance.getName();
-
-    if (this.plugins.has(name)) {
-      throw new Error(`plugin name [${name}] `);
-    }
-
-    this.plugins.set(name, instance);
-    return instance;
-  }
-
-  load() {
-    var _this = this;
-
-    return _asyncToGenerator(function* () {
-      yield _this.app.emitAsync('beforeLoadAll');
-
-      var _iterator = _createForOfIteratorHelper(_this.plugins),
-          _step;
-
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          const _step$value = _slicedToArray(_step.value, 2),
-                name = _step$value[0],
-                plugin = _step$value[1];
-
-          yield plugin.beforeLoad();
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-
-      var _iterator2 = _createForOfIteratorHelper(_this.plugins),
-          _step2;
-
-      try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          const _step2$value = _slicedToArray(_step2.value, 2),
-                name = _step2$value[0],
-                plugin = _step2$value[1];
-
-          yield _this.app.emitAsync('beforeLoadPlugin', plugin);
-          yield plugin.load();
-          yield _this.app.emitAsync('afterLoadPlugin', plugin);
-        }
-      } catch (err) {
-        _iterator2.e(err);
-      } finally {
-        _iterator2.f();
-      }
-
-      yield _this.app.emitAsync('afterLoadAll');
-    })();
-  }
-
-  install(options = {}) {
-    var _this2 = this;
-
-    return _asyncToGenerator(function* () {
-      var _iterator3 = _createForOfIteratorHelper(_this2.plugins),
-          _step3;
-
-      try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          const _step3$value = _slicedToArray(_step3.value, 2),
-                name = _step3$value[0],
-                plugin = _step3$value[1];
-
-          yield _this2.app.emitAsync('beforeInstallPlugin', plugin, options);
-          yield plugin.install(options);
-          yield _this2.app.emitAsync('afterInstallPlugin', plugin, options);
-        }
-      } catch (err) {
-        _iterator3.e(err);
-      } finally {
-        _iterator3.f();
-      }
-    })();
-  }
-
-  static resolvePlugin(pluginName) {
-    return require(pluginName).default;
-  }
-
-}
-
-exports.PluginManager = PluginManager;