@nocobase/data-source-manager 1.2.21-alpha → 1.2.23-alpha

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

@@ -9,9 +9,14 @@
 import { ToposortOptions } from '@nocobase/utils';
 import { DataSource } from './data-source';
 import { DataSourceFactory } from './data-source-factory';
+import { Logger, LoggerOptions } from '@nocobase/logger';
 type DataSourceHook = (dataSource: DataSource) => void;
+type DataSourceManagerOptions = {
+    logger?: LoggerOptions | Logger;
+    app?: any;
+};
 export declare class DataSourceManager {
-    options: {};
+    options: DataSourceManagerOptions;
     dataSources: Map<string, DataSource>;
     /**
      * @internal
@@ -20,7 +25,7 @@ export declare class DataSourceManager {
     protected middlewares: any[];
     private onceHooks;
     private beforeAddHooks;
-    constructor(options?: {});
+    constructor(options?: DataSourceManagerOptions);
     get(dataSourceKey: string): DataSource;
     add(dataSource: DataSource, options?: any): Promise<void>;
     use(fn: any, options?: ToposortOptions): void;

package/lib/data-source-manager.js

@@ -31,11 +31,19 @@ __export(data_source_manager_exports, {
 });
 module.exports = __toCommonJS(data_source_manager_exports);
 var import_data_source_factory = require("./data-source-factory");
+var import_logger = require("@nocobase/logger");
 const _DataSourceManager = class _DataSourceManager {
   constructor(options = {}) {
     this.options = options;
     this.dataSources = /* @__PURE__ */ new Map();
     this.middlewares = [];
+    if (options.app) {
+      options.app.on("beforeStop", async () => {
+        for (const dataSource of this.dataSources.values()) {
+          await dataSource.close();
+        }
+      });
+    }
   }
   dataSources;
   /**
@@ -49,9 +57,24 @@ const _DataSourceManager = class _DataSourceManager {
     return this.dataSources.get(dataSourceKey);
   }
   async add(dataSource, options = {}) {
+    let logger;
+    if (this.options.logger) {
+      if (typeof this.options.logger["log"] === "function") {
+        logger = this.options.logger;
+      } else {
+        logger = (0, import_logger.createLogger)(this.options.logger);
+      }
+    } else {
+      logger = (0, import_logger.createConsoleLogger)();
+    }
+    dataSource.setLogger(logger);
     for (const hook of this.beforeAddHooks) {
       hook(dataSource);
     }
+    const oldDataSource = this.dataSources.get(dataSource.name);
+    if (oldDataSource) {
+      await oldDataSource.close();
+    }
     await dataSource.load(options);
     this.dataSources.set(dataSource.name, dataSource);
     for (const hook of this.onceHooks) {

package/lib/data-source.d.ts

@@ -11,13 +11,16 @@ import { ACL } from '@nocobase/acl';
 import { ResourceManager } from '@nocobase/resourcer';
 import EventEmitter from 'events';
 import { ICollectionManager } from './types';
+import { Logger } from '@nocobase/logger';
 export type DataSourceOptions = any;
 export declare abstract class DataSource extends EventEmitter {
     protected options: DataSourceOptions;
     collectionManager: ICollectionManager;
     resourceManager: ResourceManager;
     acl: ACL;
+    logger: Logger;
     constructor(options: DataSourceOptions);
+    setLogger(logger: Logger): void;
     get name(): any;
     static testConnection(options?: any): Promise<boolean>;
     init(options?: DataSourceOptions): void;
@@ -25,6 +28,7 @@ export declare abstract class DataSource extends EventEmitter {
     createACL(): ACL;
     createResourceManager(options: any): ResourceManager;
     load(options?: any): Promise<void>;
+    close(): Promise<void>;
     abstract createCollectionManager(options?: any): ICollectionManager;
     protected collectionToResourceMiddleware(): (ctx: any, next: any) => Promise<any>;
 }

package/lib/data-source.js

@@ -54,6 +54,10 @@ const _DataSource = class _DataSource extends import_events.default {
   collectionManager;
   resourceManager;
   acl;
+  logger;
+  setLogger(logger) {
+    this.logger = logger;
+  }
   get name() {
     return this.options.name;
   }
@@ -97,6 +101,8 @@ const _DataSource = class _DataSource extends import_events.default {
   }
   async load(options = {}) {
   }
+  async close() {
+  }
   collectionToResourceMiddleware() {
     return async (ctx, next) => {
       const params = (0, import_resourcer.parseRequest)(

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "1.2.21-alpha",
+  "version": "1.2.23-alpha",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "1.2.21-alpha",
-    "@nocobase/cache": "1.2.21-alpha",
-    "@nocobase/database": "1.2.21-alpha",
-    "@nocobase/resourcer": "1.2.21-alpha",
-    "@nocobase/utils": "1.2.21-alpha",
+    "@nocobase/actions": "1.2.23-alpha",
+    "@nocobase/cache": "1.2.23-alpha",
+    "@nocobase/database": "1.2.23-alpha",
+    "@nocobase/resourcer": "1.2.23-alpha",
+    "@nocobase/utils": "1.2.23-alpha",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },
@@ -19,5 +19,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/auth"
   },
-  "gitHead": "16299a326eecf8630268654284f35c0aabe6b42f"
+  "gitHead": "e2ee9d3c39d123cfdb0b50bfb6d381eaa4a96f77"
 }