@nocobase/server 0.19.0-alpha.9 → 0.20.0-alpha.2

package/lib/application.d.ts

@@ -1,7 +1,5 @@
 /// <reference types="node" />
-/// <reference types="node" />
 /// <reference types="koa-bodyparser" />
-import { ACL } from '@nocobase/acl';
 import { AuthManager, AuthManagerOptions } from '@nocobase/auth';
 import { Cache, CacheManager, CacheManagerOptions } from '@nocobase/cache';
 import Database, { CollectionOptions, IDatabaseOptions } from '@nocobase/database';
@@ -10,7 +8,7 @@ import { ResourceOptions, Resourcer } from '@nocobase/resourcer';
 import { Telemetry, TelemetryOptions } from '@nocobase/telemetry';
 import { AsyncEmitter, ToposortOptions } from '@nocobase/utils';
 import { Command, CommandOptions, ParseOptions } from 'commander';
-import { IncomingMessage, Server, ServerResponse } from 'http';
+import { IncomingMessage, ServerResponse } from 'http';
 import { i18n, InitOptions } from 'i18next';
 import Koa, { DefaultContext as KoaDefaultContext, DefaultState as KoaDefaultState } from 'koa';
 import { RecordableHistogram } from 'node:perf_hooks';
@@ -21,6 +19,7 @@ import { ApplicationVersion } from './helpers/application-version';
 import { Locale } from './locale';
 import { Plugin } from './plugin';
 import { InstallOptions, PluginManager } from './plugin-manager';
+import { DataSourceManager, SequelizeDataSource } from '@nocobase/data-source-manager';
 export type PluginType = string | typeof Plugin;
 export type PluginConfiguration = PluginType | [PluginType, any];
 export interface ResourcerOptions {
@@ -84,7 +83,6 @@ export type MaintainingCommandStatus = {
 };
 export declare class Application<StateT = DefaultState, ContextT = DefaultContext> extends Koa implements AsyncEmitter {
     options: ApplicationOptions;
-    listenServer: Server;
     middleware: any;
     stopped: boolean;
     ready: boolean;
@@ -110,12 +108,11 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get maintainingMessage(): string;
     protected _cronJobManager: CronJobManager;
     get cronJobManager(): CronJobManager;
-    protected _db: Database;
+    get mainDataSource(): SequelizeDataSource;
     get db(): Database;
     protected _logger: SystemLogger;
     get logger(): SystemLogger;
-    protected _resourcer: Resourcer;
-    get resourcer(): Resourcer;
+    get resourcer(): import("@nocobase/data-source-manager").ResourceManager;
     protected _cacheManager: CacheManager;
     get cacheManager(): CacheManager;
     protected _cache: Cache;
@@ -127,8 +124,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get i18n(): i18n;
     protected _pm: PluginManager;
     get pm(): PluginManager;
-    protected _acl: ACL;
-    get acl(): ACL;
+    get acl(): import("@nocobase/acl").ACL;
     protected _authManager: AuthManager;
     get authManager(): AuthManager;
     protected _locales: Locale;
@@ -140,7 +136,8 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get version(): ApplicationVersion;
     get log(): SystemLogger;
     get name(): string;
-    isMaintaining(): boolean;
+    protected _dataSourceManager: DataSourceManager;
+    get dataSourceManager(): DataSourceManager;
     getMaintaining(): MaintainingCommandStatus;
     setMaintaining(_maintainingCommandStatus: MaintainingCommandStatus): void;
     setMaintainingMessage(message: string): void;
@@ -167,6 +164,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     parse(argv?: string[]): Promise<AppCommand>;
     authenticate(): Promise<void>;
     runCommand(command: string, ...args: any[]): Promise<AppCommand>;
+    runCommandThrowError(command: string, ...args: any[]): Promise<AppCommand>;
     createCli(): AppCommand;
     loadMigrations(options: any): Promise<{
         beforeLoad: any[];
@@ -206,6 +204,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     reInitEvents(): void;
     createLogger(options: LoggerOptions): import("winston").Logger;
     protected init(): void;
+    protected createMainDataSource(options: ApplicationOptions): void;
     protected createDatabase(options: ApplicationOptions): Database;
 }
 export default Application;

package/lib/application.js

@@ -45,7 +45,7 @@ var import_koa_compose = __toESM(require("koa-compose"));
 var import_lodash = __toESM(require("lodash"));
 var import_path = require("path");
 var import_semver = __toESM(require("semver"));
-var import_acl2 = require("./acl");
+var import_acl = require("./acl");
 var import_app_command = require("./app-command");
 var import_app_supervisor = require("./app-supervisor");
 var import_cache2 = require("./cache");
@@ -56,7 +56,9 @@ var import_helper = require("./helper");
 var import_application_version = require("./helpers/application-version");
 var import_locale = require("./locale");
 var import_plugin_manager = require("./plugin-manager");
+var import_data_source_manager = require("@nocobase/data-source-manager");
 var import_package = __toESM(require("../package.json"));
+var import_main_data_source = require("./main-data-source");
 const _Application = class _Application extends import_koa.default {
   constructor(options) {
     super();
@@ -66,7 +68,6 @@ const _Application = class _Application extends import_koa.default {
     this.init();
     this._appSupervisor.addApp(this);
   }
-  listenServer;
   stopped = false;
   ready = false;
   rawOptions;
@@ -93,17 +94,22 @@ const _Application = class _Application extends import_koa.default {
   get cronJobManager() {
     return this._cronJobManager;
   }
-  _db;
+  get mainDataSource() {
+    var _a;
+    return (_a = this.dataSourceManager) == null ? void 0 : _a.dataSources.get("main");
+  }
   get db() {
-    return this._db;
+    if (!this.mainDataSource) {
+      return null;
+    }
+    return this.mainDataSource.collectionManager.db;
   }
   _logger;
   get logger() {
     return this._logger;
   }
-  _resourcer;
   get resourcer() {
-    return this._resourcer;
+    return this.mainDataSource.resourceManager;
   }
   _cacheManager;
   get cacheManager() {
@@ -128,9 +134,8 @@ const _Application = class _Application extends import_koa.default {
   get pm() {
     return this._pm;
   }
-  _acl;
   get acl() {
-    return this._acl;
+    return this.mainDataSource.acl;
   }
   _authManager;
   get authManager() {
@@ -157,8 +162,9 @@ const _Application = class _Application extends import_koa.default {
   get name() {
     return this.options.name || "main";
   }
-  isMaintaining() {
-    return this._maintaining;
+  _dataSourceManager;
+  get dataSourceManager() {
+    return this._dataSourceManager;
   }
   getMaintaining() {
     return this._maintainingCommandStatus;
@@ -231,7 +237,7 @@ const _Application = class _Application extends import_koa.default {
     if (this.telemetry.started) {
       await this.telemetry.shutdown();
     }
-    const oldDb = this._db;
+    const oldDb = this.db;
     this.init();
     if (!oldDb.closed()) {
       await oldDb.close();
@@ -252,7 +258,7 @@ const _Application = class _Application extends import_koa.default {
       if (this.telemetry.started) {
         await this.telemetry.shutdown();
       }
-      const oldDb = this._db;
+      const oldDb = this.db;
       this.init();
       if (!oldDb.closed()) {
         await oldDb.close();
@@ -271,6 +277,9 @@ const _Application = class _Application extends import_koa.default {
       this.telemetry.start();
     }
     await this.pm.load(options);
+    if (options == null ? void 0 : options.sync) {
+      await this.db.sync();
+    }
     this.setMaintainingMessage("emit afterLoad");
     if ((options == null ? void 0 : options.hooks) !== false) {
       await this.emitAsync("afterLoad", this, options);
@@ -311,6 +320,9 @@ const _Application = class _Application extends import_koa.default {
   async runCommand(command, ...args) {
     return await this.runAsCLI([command, ...args], { from: "user" });
   }
+  async runCommandThrowError(command, ...args) {
+    return await this.runAsCLI([command, ...args], { from: "user", throwError: true });
+  }
   createCli() {
     const command = new import_app_command.AppCommand("nocobase").usage("[command] [options]").hook("preAction", async (_, actionCommand) => {
       this._actionCommand = actionCommand;
@@ -591,8 +603,7 @@ const _Application = class _Application extends import_koa.default {
     await this.pm.initOtherPlugins();
     const migrator3 = await this.pm.loadOtherMigrations();
     await migrator3.beforeLoad.up();
-    await this.load();
-    await this.db.sync();
+    await this.load({ sync: true });
     await migrator3.afterSync.up();
     await this.pm.upgrade();
     await migrator1.afterLoad.up();
@@ -641,17 +652,15 @@ const _Application = class _Application extends import_koa.default {
     this.reInitEvents();
     this.middleware = new import_utils.Toposort();
     this.plugins = /* @__PURE__ */ new Map();
-    this._acl = (0, import_acl2.createACL)();
-    this._cronJobManager = new import_cron_job_manager.CronJobManager(this);
-    if (this._db) {
-      this._db.removeAllListeners();
+    if (this.db) {
+      this.db.removeAllListeners();
     }
-    this._db = this.createDatabase(options);
-    this._resourcer = (0, import_helper.createResourcer)(options);
+    this.createMainDataSource(options);
+    this._cronJobManager = new import_cron_job_manager.CronJobManager(this);
     this._cli = this.createCli();
     this._i18n = (0, import_helper.createI18n)(options);
-    this.context.db = this._db;
-    this.context.resourcer = this._resourcer;
+    this.context.db = this.db;
+    this.context.resourcer = this.resourcer;
     this.context.cacheManager = this._cacheManager;
     this.context.cache = this._cache;
     const plugins = this._pm ? this._pm.options.plugins : options.plugins;
@@ -673,9 +682,10 @@ const _Application = class _Application extends import_koa.default {
       name: "auth",
       actions: import_auth.actions
     });
-    this._resourcer.use(this._authManager.middleware(), { tag: "auth" });
+    this._dataSourceManager.use(this._authManager.middleware(), { tag: "auth" });
+    this.resourcer.use(this._authManager.middleware(), { tag: "auth" });
     if (this.options.acl !== false) {
-      this._resourcer.use(this._acl.middleware(), { tag: "acl", after: ["auth"] });
+      this.resourcer.use(this.acl.middleware(), { tag: "acl", after: ["auth"] });
     }
     this._locales = new import_locale.Locale((0, import_helper.createAppProxy)(this));
     if (options.perfHooks) {
@@ -688,6 +698,16 @@ const _Application = class _Application extends import_koa.default {
     (0, import_commands.registerCli)(this);
     this._version = new import_application_version.ApplicationVersion(this);
   }
+  createMainDataSource(options) {
+    const mainDataSourceInstance = new import_main_data_source.MainDataSource({
+      name: "main",
+      database: this.createDatabase(options),
+      acl: (0, import_acl.createACL)(),
+      resourceManager: (0, import_helper.createResourcer)(options)
+    });
+    this._dataSourceManager = new import_data_source_manager.DataSourceManager();
+    this.dataSourceManager.dataSources.set("main", mainDataSourceInstance);
+  }
   createDatabase(options) {
     const sqlLogger = this.createLogger({
       filename: "sql",

package/lib/commands/db-sync.js

@@ -22,9 +22,13 @@ __export(db_sync_exports, {
 });
 module.exports = __toCommonJS(db_sync_exports);
 var db_sync_default = /* @__PURE__ */ __name((app) => {
-  app.command("db:sync").auth().action(async (...cliArgs) => {
+  app.command("db:sync").auth().preload().action(async (...cliArgs) => {
     const [opts] = cliArgs;
     console.log("db sync...");
+    const Collection = app.db.getCollection("collections");
+    if (Collection) {
+      await Collection.repository.load();
+    }
     const force = false;
     await app.db.sync({
       force,

package/lib/commands/start.js

@@ -25,7 +25,7 @@ var import_application_not_install = require("../errors/application-not-install"
 var start_default = /* @__PURE__ */ __name((app) => {
   app.command("start").auth().option("--db-sync").option("--quickstart").action(async (...cliArgs) => {
     const [options] = cliArgs;
-    console.log("options", options);
+    console.log("start options", options);
     if (options.quickstart) {
       if (await app.isInstalled()) {
         await app.upgrade();

package/lib/helper.d.ts

@@ -1,9 +1,7 @@
-import Database from '@nocobase/database';
 import { Resourcer } from '@nocobase/resourcer';
 import { Command } from 'commander';
 import Application, { ApplicationOptions } from './application';
 export declare function createI18n(options: ApplicationOptions): import("i18next").i18n;
-export declare function createDatabase(options: ApplicationOptions): Database;
 export declare function createResourcer(options: ApplicationOptions): Resourcer;
 export declare function registerMiddlewares(app: Application, options: ApplicationOptions): void;
 export declare const createAppProxy: (app: Application) => Application<import("./application").DefaultState, import("./application").DefaultContext>;

package/lib/helper.js

@@ -29,7 +29,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var helper_exports = {};
 __export(helper_exports, {
   createAppProxy: () => createAppProxy,
-  createDatabase: () => createDatabase,
   createI18n: () => createI18n,
   createResourcer: () => createResourcer,
   enablePerfHooks: () => enablePerfHooks,
@@ -39,21 +38,20 @@ __export(helper_exports, {
 });
 module.exports = __toCommonJS(helper_exports);
 var import_cors = __toESM(require("@koa/cors"));
-var import_database = __toESM(require("@nocobase/database"));
+var import_logger = require("@nocobase/logger");
 var import_resourcer = require("@nocobase/resourcer");
 var import_utils = require("@nocobase/utils");
+var import_crypto = require("crypto");
 var import_fs = __toESM(require("fs"));
 var import_i18next = __toESM(require("i18next"));
 var import_koa_bodyparser = __toESM(require("koa-bodyparser"));
 var import_path = require("path");
+var import_perf_hooks = require("perf_hooks");
 var import_middlewares = require("./middlewares");
 var import_data_template = require("./middlewares/data-template");
 var import_data_wrapping = require("./middlewares/data-wrapping");
 var import_db2resource = require("./middlewares/db2resource");
 var import_i18n = require("./middlewares/i18n");
-var import_logger = require("@nocobase/logger");
-var import_crypto = require("crypto");
-var import_perf_hooks = require("perf_hooks");
 function createI18n(options) {
   const instance = import_i18next.default.createInstance();
   instance.init({
@@ -66,14 +64,6 @@ function createI18n(options) {
   return instance;
 }
 __name(createI18n, "createI18n");
-function createDatabase(options) {
-  if (options.database instanceof import_database.default) {
-    return options.database;
-  } else {
-    return new import_database.default(options.database);
-  }
-}
-__name(createDatabase, "createDatabase");
 function createResourcer(options) {
   return new import_resourcer.Resourcer({ ...options.resourcer });
 }
@@ -127,7 +117,8 @@ function registerMiddlewares(app, options) {
   });
   app.resourcer.use(import_data_template.dateTemplate, { tag: "dateTemplate", after: "acl" });
   app.use(import_db2resource.db2resource, { tag: "db2resource", after: "dataWrapping" });
-  app.use(app.resourcer.restApiMiddleware(), { tag: "restApi", after: "db2resource" });
+  app.use(app.resourcer.restApiMiddleware({ skipIfDataSourceExists: true }), { tag: "restApi", after: "db2resource" });
+  app.use(app.dataSourceManager.middleware(), { tag: "dataSource", after: "restApi" });
 }
 __name(registerMiddlewares, "registerMiddlewares");
 const createAppProxy = /* @__PURE__ */ __name((app) => {
@@ -192,7 +183,6 @@ const enablePerfHooks = /* @__PURE__ */ __name((app) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createAppProxy,
-  createDatabase,
   createI18n,
   createResourcer,
   enablePerfHooks,

package/lib/helpers/multiple-instance-manager.d.ts

@@ -0,0 +1,6 @@
+export declare class MultipleInstanceManager<Item> {
+    map: Map<string, Item>;
+    constructor();
+    get(key: string): Item;
+    set(key: string, value: Item): void;
+}

package/lib/helpers/multiple-instance-manager.js

@@ -0,0 +1,40 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var multiple_instance_manager_exports = {};
+__export(multiple_instance_manager_exports, {
+  MultipleInstanceManager: () => MultipleInstanceManager
+});
+module.exports = __toCommonJS(multiple_instance_manager_exports);
+const _MultipleInstanceManager = class _MultipleInstanceManager {
+  map = /* @__PURE__ */ new Map();
+  constructor() {
+  }
+  get(key) {
+    return this.map.get(key);
+  }
+  set(key, value) {
+    this.map.set(key, value);
+  }
+};
+__name(_MultipleInstanceManager, "MultipleInstanceManager");
+let MultipleInstanceManager = _MultipleInstanceManager;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  MultipleInstanceManager
+});

package/lib/main-data-source.d.ts

@@ -0,0 +1,4 @@
+import { DataSourceOptions, SequelizeDataSource } from '@nocobase/data-source-manager';
+export declare class MainDataSource extends SequelizeDataSource {
+    init(options?: DataSourceOptions): void;
+}

package/lib/main-data-source.js

@@ -0,0 +1,45 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var main_data_source_exports = {};
+__export(main_data_source_exports, {
+  MainDataSource: () => MainDataSource
+});
+module.exports = __toCommonJS(main_data_source_exports);
+var import_data_source_manager = require("@nocobase/data-source-manager");
+const _MainDataSource = class _MainDataSource extends import_data_source_manager.SequelizeDataSource {
+  init(options = {}) {
+    const { acl, resourceManager, database } = options;
+    this.acl = acl;
+    this.resourceManager = resourceManager;
+    this.collectionManager = this.createCollectionManager({
+      collectionManager: {
+        database,
+        collectionsFilter: (collection) => {
+          return collection.options.loadedFromCollectionManager;
+        }
+      }
+    });
+  }
+};
+__name(_MainDataSource, "MainDataSource");
+let MainDataSource = _MainDataSource;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  MainDataSource
+});

package/lib/middlewares/db2resource.js

@@ -23,7 +23,11 @@ __export(db2resource_exports, {
 });
 module.exports = __toCommonJS(db2resource_exports);
 var import_resourcer = require("@nocobase/resourcer");
-function db2resource(ctx, next) {
+async function db2resource(ctx, next) {
+  const dataSource = ctx.get("x-data-source");
+  if (dataSource) {
+    return next();
+  }
   const resourcer = ctx.resourcer;
   const database = ctx.db;
   const params = (0, import_resourcer.parseRequest)(
@@ -43,7 +47,12 @@ function db2resource(ctx, next) {
   if (resourcer.isDefined(resourceName)) {
     return next();
   }
-  const [collectionName, fieldName] = resourceName.split(".");
+  const splitResult = resourceName.split(".");
+  let collectionName = splitResult[0];
+  const fieldName = splitResult[1];
+  if (collectionName.includes("@")) {
+    collectionName = collectionName.split("@")[1];
+  }
   if (!database.hasCollection(collectionName)) {
     return next();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "0.19.0-alpha.9",
+    "version": "0.20.0-alpha.2",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "Apache-2.0",
@@ -10,17 +10,18 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "0.19.0-alpha.9",
-        "@nocobase/actions": "0.19.0-alpha.9",
-        "@nocobase/auth": "0.19.0-alpha.9",
-        "@nocobase/cache": "0.19.0-alpha.9",
-        "@nocobase/database": "0.19.0-alpha.9",
-        "@nocobase/evaluators": "0.19.0-alpha.9",
-        "@nocobase/logger": "0.19.0-alpha.9",
-        "@nocobase/resourcer": "0.19.0-alpha.9",
-        "@nocobase/sdk": "0.19.0-alpha.9",
-        "@nocobase/telemetry": "0.19.0-alpha.9",
-        "@nocobase/utils": "0.19.0-alpha.9",
+        "@nocobase/acl": "0.20.0-alpha.2",
+        "@nocobase/actions": "0.20.0-alpha.2",
+        "@nocobase/auth": "0.20.0-alpha.2",
+        "@nocobase/cache": "0.20.0-alpha.2",
+        "@nocobase/data-source-manager": "0.20.0-alpha.2",
+        "@nocobase/database": "0.20.0-alpha.2",
+        "@nocobase/evaluators": "0.20.0-alpha.2",
+        "@nocobase/logger": "0.20.0-alpha.2",
+        "@nocobase/resourcer": "0.20.0-alpha.2",
+        "@nocobase/sdk": "0.20.0-alpha.2",
+        "@nocobase/telemetry": "0.20.0-alpha.2",
+        "@nocobase/utils": "0.20.0-alpha.2",
         "@types/decompress": "4.2.4",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",
@@ -53,5 +54,5 @@
         "@types/serve-handler": "^6.1.1",
         "@types/ws": "^8.5.5"
     },
-    "gitHead": "975f9c58a1995df6a8d7a4d191a0dc4a9769ebc5"
+    "gitHead": "6fb885dfc3554e4b0f29e9a7a1eecbbe85d0eebb"
 }