@nocobase/server 0.18.0-alpha.1 → 0.18.0-alpha.8

package/lib/app-supervisor.js

@@ -152,6 +152,7 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
     if (this.apps[app.name]) {
       throw new Error(`app ${app.name} already exists`);
     }
+    app.logger.info(`add app ${app.name} into supervisor`, { submodule: "supervisor", method: "addApp" });
     this.bindAppEvents(app);
     this.apps[app.name] = app;
     this.emit("afterAppAdded", app);

package/lib/application.d.ts

@@ -5,13 +5,14 @@ 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';
-import { AppLoggerOptions, Logger } from '@nocobase/logger';
+import { AppLogger, AppLoggerOptions, LoggerOptions } from '@nocobase/logger';
 import { ResourceOptions, Resourcer } from '@nocobase/resourcer';
 import { AsyncEmitter, ToposortOptions } from '@nocobase/utils';
 import { Command, CommandOptions, ParseOptions } from 'commander';
 import { IncomingMessage, Server, ServerResponse } from 'http';
 import { i18n, InitOptions } from 'i18next';
 import Koa, { DefaultContext as KoaDefaultContext, DefaultState as KoaDefaultState } from 'koa';
+import { RecordableHistogram } from 'node:perf_hooks';
 import { AppCommand } from './app-command';
 import { AppSupervisor } from './app-supervisor';
 import { CronJobManager } from './cron/cron-job-manager';
@@ -19,7 +20,6 @@ import { ApplicationVersion } from './helpers/application-version';
 import { Locale } from './locale';
 import { Plugin } from './plugin';
 import { InstallOptions, PluginManager } from './plugin-manager';
-import { RecordableHistogram } from 'node:perf_hooks';
 export type PluginType = string | typeof Plugin;
 export type PluginConfiguration = PluginType | [PluginType, any];
 export interface ResourcerOptions {
@@ -101,8 +101,8 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get cronJobManager(): CronJobManager;
     protected _db: Database;
     get db(): Database;
-    protected _logger: Logger;
-    get logger(): Logger;
+    protected _logger: AppLogger;
+    get logger(): AppLogger;
     protected _resourcer: Resourcer;
     get resourcer(): Resourcer;
     protected _cacheManager: CacheManager;
@@ -125,7 +125,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get localeManager(): Locale;
     protected _version: ApplicationVersion;
     get version(): ApplicationVersion;
-    get log(): Logger;
+    get log(): AppLogger;
     get name(): string;
     isMaintaining(): boolean;
     getMaintaining(): MaintainingCommandStatus;
@@ -149,6 +149,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     createCli(): AppCommand;
     runAsCLI(argv?: string[], options?: ParseOptions & {
         throwError?: boolean;
+        reqId?: string;
     }): Promise<AppCommand>;
     start(options?: StartOptions): Promise<void>;
     emitStartedEvent(options?: StartOptions): Promise<void>;
@@ -165,6 +166,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
         name: string;
     };
     reInitEvents(): void;
+    createLogger(options: LoggerOptions): import("winston").Logger;
     protected init(): void;
     protected createDatabase(options: ApplicationOptions): Database;
 }

package/lib/application.js

@@ -37,6 +37,8 @@ var import_auth = require("@nocobase/auth");
 var import_database = __toESM(require("@nocobase/database"));
 var import_logger = require("@nocobase/logger");
 var import_utils = require("@nocobase/utils");
+var import_chalk = __toESM(require("chalk"));
+var import_crypto = require("crypto");
 var import_koa = __toESM(require("koa"));
 var import_koa_compose = __toESM(require("koa-compose"));
 var import_lodash = __toESM(require("lodash"));
@@ -52,11 +54,11 @@ var import_application_version = require("./helpers/application-version");
 var import_locale = require("./locale");
 var import_plugin_manager = require("./plugin-manager");
 var import_package = __toESM(require("../package.json"));
-var import_chalk = __toESM(require("chalk"));
 const _Application = class _Application extends import_koa.default {
   constructor(options) {
     super();
     this.options = options;
+    this.context.reqId = (0, import_crypto.randomUUID)();
     this.rawOptions = this.name == "main" ? import_lodash.default.cloneDeep(options) : {};
     this.init();
     this._appSupervisor.addApp(this);
@@ -174,7 +176,7 @@ const _Application = class _Application extends import_koa.default {
     return import_package.default.version;
   }
   plugin(pluginClass, options) {
-    this.log.debug(`add plugin ${pluginClass.name}`);
+    this.log.debug(`add plugin`, { method: "plugin", name: pluginClass.name });
     this.pm.addPreset(pluginClass, options);
   }
   // @ts-ignore
@@ -212,7 +214,7 @@ const _Application = class _Application extends import_koa.default {
     }
     if (options == null ? void 0 : options.reload) {
       this.setMaintainingMessage("app reload");
-      this.log.info(`app.reload()`);
+      this.log.info(`app.reload()`, { method: "load" });
       const oldDb = this._db;
       this.init();
       if (!oldDb.closed()) {
@@ -234,17 +236,17 @@ const _Application = class _Application extends import_koa.default {
     this._loaded = true;
   }
   async reload(options) {
-    this.log.debug(`start reload`);
+    this.log.debug(`start reload`, { method: "reload" });
     this._loaded = false;
     await this.emitAsync("beforeReload", this, options);
     await this.load({
       ...options,
       reload: true
     });
-    this.log.debug("emit afterReload");
+    this.log.debug("emit afterReload", { method: "reload" });
     this.setMaintainingMessage("emit afterReload");
     await this.emitAsync("afterReload", this, options);
-    this.log.debug(`finish reload`);
+    this.log.debug(`finish reload`, { method: "reload" });
   }
   getPlugin(name) {
     return this.pm.get(name);
@@ -295,6 +297,10 @@ const _Application = class _Application extends import_koa.default {
     if (this.activatedCommand) {
       return;
     }
+    if (options.reqId) {
+      this.context.reqId = options.reqId;
+      this._logger = this._logger.child({ reqId: this.context.reqId });
+    }
     this._maintainingStatusBeforeCommand = this._maintainingCommandStatus;
     try {
       const command = await this.cli.parseAsync(argv, options);
@@ -381,37 +387,37 @@ const _Application = class _Application extends import_koa.default {
     this.emit("__restarted", this, options);
   }
   async stop(options = {}) {
-    this.log.debug("stop app...");
+    this.log.debug("stop app...", { method: "stop" });
     this.setMaintainingMessage("stopping app...");
     if (this.stopped) {
-      this.log.warn(`Application ${this.name} already stopped`);
+      this.log.warn(`Application ${this.name} already stopped`, { method: "stop" });
       return;
     }
     await this.emitAsync("beforeStop", this, options);
     try {
       if (!this.db.closed()) {
-        this.logger.info(`close db`);
+        this.log.info(`close db`, { method: "stop" });
         await this.db.close();
       }
     } catch (e) {
-      this.log.error(e);
+      this.log.error(e.message, { method: "stop", err: e.stack });
     }
     if (this._cacheManager) {
       await this._cacheManager.close();
     }
     await this.emitAsync("afterStop", this, options);
     this.stopped = true;
-    this.log.info(`${this.name} is stopped`);
+    this.log.info(`${this.name} is stopped`, { method: "stop" });
     this._started = false;
   }
   async destroy(options = {}) {
-    this.logger.debug("start destroy app");
+    this.log.debug("start destroy app", { method: "destory" });
     this.setMaintainingMessage("destroying app...");
     await this.emitAsync("beforeDestroy", this, options);
     await this.stop(options);
-    this.logger.debug("emit afterDestroy");
+    this.log.debug("emit afterDestroy", { method: "destory" });
     await this.emitAsync("afterDestroy", this, options);
-    this.logger.debug("finish destroy app");
+    this.log.debug("finish destroy app", { method: "destory" });
   }
   async isInstalled() {
     return await this.db.collectionExistsInDb("applicationVersion") || await this.db.collectionExistsInDb("collections");
@@ -419,24 +425,24 @@ const _Application = class _Application extends import_koa.default {
   async install(options = {}) {
     var _a, _b;
     this.setMaintainingMessage("installing app...");
-    this.log.debug("Database dialect: " + this.db.sequelize.getDialect());
+    this.log.debug("Database dialect: " + this.db.sequelize.getDialect(), { method: "install" });
     if ((options == null ? void 0 : options.clean) || ((_a = options == null ? void 0 : options.sync) == null ? void 0 : _a.force)) {
-      this.log.debug("truncate database");
+      this.log.debug("truncate database", { method: "install" });
       await this.db.clean({ drop: true });
-      this.log.debug("app reloading");
+      this.log.debug("app reloading", { method: "install" });
       await this.reload();
     } else if (await this.isInstalled()) {
-      this.log.warn("app is installed");
+      this.log.warn("app is installed", { method: "install" });
       return;
     }
-    this.log.debug("emit beforeInstall");
+    this.log.debug("emit beforeInstall", { method: "install" });
     this.setMaintainingMessage("call beforeInstall hook...");
     await this.emitAsync("beforeInstall", this, options);
-    this.log.debug("start install plugins");
+    this.log.debug("start install plugins", { method: "install" });
     await this.pm.install(options);
-    this.log.debug("update version");
+    this.log.debug("update version", { method: "install" });
     await this.version.update();
-    this.log.debug("emit afterInstall");
+    this.log.debug("emit afterInstall", { method: "install" });
     this.setMaintainingMessage("call afterInstall hook...");
     await this.emitAsync("afterInstall", this, options);
     if ((_b = this._maintainingStatusBeforeCommand) == null ? void 0 : _b.error) {
@@ -484,21 +490,28 @@ const _Application = class _Application extends import_koa.default {
       }
     }
   }
+  createLogger(options) {
+    const { dirname } = options;
+    return (0, import_logger.createLogger)({
+      ...options,
+      dirname: (0, import_logger.getLoggerFilePath)(this.name || "main", dirname || "")
+    });
+  }
   init() {
+    var _a;
     const options = this.options;
-    const logger = (0, import_logger.createAppLogger)({
-      ...options.logger,
-      defaultMeta: {
-        app: this.name
-      }
+    this._logger = (0, import_logger.createAppLogger)({
+      app: this.name,
+      ...((_a = options.logger) == null ? void 0 : _a.system) || {}
+    }).child({
+      reqId: this.context.reqId,
+      module: "application"
     });
-    this._logger = logger.instance;
     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);
-    this.use(logger.middleware, { tag: "logger" });
     if (this._db) {
       this._db.removeAllListeners();
     }
@@ -507,7 +520,6 @@ const _Application = class _Application extends import_koa.default {
     this._cli = this.createCli();
     this._i18n = (0, import_helper.createI18n)(options);
     this.context.db = this._db;
-    this.context.logger = this._logger;
     this.context.resourcer = this._resourcer;
     this.context.cacheManager = this._cacheManager;
     this.context.cache = this._cache;
@@ -541,13 +553,28 @@ const _Application = class _Application extends import_koa.default {
     this._version = new import_application_version.ApplicationVersion(this);
   }
   createDatabase(options) {
+    const sqlLogger = this.createLogger({
+      filename: "sql",
+      level: "debug"
+    });
+    const logging = /* @__PURE__ */ __name((msg) => {
+      if (typeof msg === "string") {
+        msg = msg.replace(/[\r\n]/gm, "").replace(/\s+/g, " ");
+      }
+      if (msg.includes("INSERT INTO")) {
+        msg = msg.substring(0, 2e3) + "...";
+      }
+      sqlLogger.debug({ reqId: this.context.reqId, message: msg });
+    }, "logging");
+    const dbOptions = options.database instanceof import_database.default ? options.database.options : options.database;
     const db = new import_database.default({
-      ...options.database instanceof import_database.default ? options.database.options : options.database,
+      ...dbOptions,
+      logging: dbOptions.logging ? logging : false,
       migrator: {
         context: { app: this }
-      }
+      },
+      logger: this._logger.child({ module: "database" })
     });
-    db.setLogger(this._logger);
     return db;
   }
 };

package/lib/gateway/index.d.ts

@@ -41,6 +41,7 @@ export declare class Gateway extends EventEmitter {
     destroy(): void;
     reset(): void;
     addAppSelectorMiddleware(middleware: AppSelectorMiddleware, options?: ToposortOptions): void;
+    logger(req: IncomingRequest): Promise<import("winston").Logger>;
     responseError(res: ServerResponse, error: {
         status: number;
         maintaining: boolean;

package/lib/gateway/index.js

@@ -56,6 +56,8 @@ var import_errors = require("./errors");
 var import_ipc_socket_client = require("./ipc-socket-client");
 var import_ipc_socket_server = require("./ipc-socket-server");
 var import_ws_server = require("./ws-server");
+var import_logger = require("@nocobase/logger");
+var import_crypto = require("crypto");
 const compress = (0, import_node_util.promisify)((0, import_compression.default)());
 const _Gateway = class _Gateway extends import_events.EventEmitter {
   /**
@@ -121,6 +123,12 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     this.selectorMiddlewares.add(middleware, options);
     this.emit("appSelectorChanged");
   }
+  async logger(req) {
+    const reqId = (0, import_crypto.randomUUID)();
+    const appName = await this.getRequestHandleAppName(req);
+    req.headers["reqId"] = reqId;
+    return (0, import_logger.createLogger)({ filename: `${appName}_request` }).child({ reqId });
+  }
   responseError(res, error) {
     res.setHeader("Content-Type", "application/json");
     res.statusCode = error.status;

package/lib/gateway/ipc-socket-client.d.ts

@@ -2,12 +2,15 @@
 /// <reference types="node" />
 import net from 'net';
 import * as events from 'events';
+import { Logger } from '@nocobase/logger';
 export declare const writeJSON: (socket: net.Socket, data: object) => void;
 export declare class IPCSocketClient extends events.EventEmitter {
     client: net.Socket;
+    logger: Logger;
     constructor(client: net.Socket);
     static getConnection(serverPath: string): Promise<IPCSocketClient>;
-    handleServerMessage({ type, payload }: {
+    handleServerMessage({ reqId, type, payload }: {
+        reqId: any;
         type: any;
         payload: any;
     }): Promise<void>;

package/lib/gateway/ipc-socket-client.js

@@ -34,13 +34,16 @@ __export(ipc_socket_client_exports, {
 module.exports = __toCommonJS(ipc_socket_client_exports);
 var import_net = __toESM(require("net"));
 var events = __toESM(require("events"));
+var import_logger = require("@nocobase/logger");
 const writeJSON = /* @__PURE__ */ __name((socket, data) => {
   socket.write(JSON.stringify(data) + "\n", "utf8");
 }, "writeJSON");
 const _IPCSocketClient = class _IPCSocketClient extends events.EventEmitter {
   client;
+  logger;
   constructor(client) {
     super();
+    this.logger = (0, import_logger.createConsoleLogger)();
     this.client = client;
     this.client.on("data", (data) => {
       const dataAsString = data.toString();
@@ -64,19 +67,19 @@ const _IPCSocketClient = class _IPCSocketClient extends events.EventEmitter {
       });
     });
   }
-  async handleServerMessage({ type, payload }) {
+  async handleServerMessage({ reqId, type, payload }) {
     switch (type) {
       case "error":
-        console.error(payload.message);
+        this.logger.error({ reqId, message: `${payload.message}|${payload.stack}` });
         break;
       case "success":
-        console.log("success");
+        this.logger.info({ reqId, message: "success" });
         break;
       default:
-        console.log({ type, payload });
+        this.logger.info({ reqId, message: JSON.stringify({ type, payload }) });
         break;
     }
-    this.emit("response", { type, payload });
+    this.emit("response", { reqId, type, payload });
   }
   close() {
     this.client.end();

package/lib/gateway/ipc-socket-server.d.ts

@@ -4,7 +4,8 @@ export declare class IPCSocketServer {
     socketServer: net.Server;
     constructor(server: net.Server);
     static buildServer(socketPath: string): IPCSocketServer;
-    static handleClientMessage({ type, payload }: {
+    static handleClientMessage({ reqId, type, payload }: {
+        reqId: any;
         type: any;
         payload: any;
     }): Promise<import("../app-command").AppCommand>;

package/lib/gateway/ipc-socket-server.js

@@ -35,6 +35,7 @@ var import_net = __toESM(require("net"));
 var import_fs = __toESM(require("fs"));
 var import_app_supervisor = require("../app-supervisor");
 var import_ipc_socket_client = require("./ipc-socket-client");
+var import_crypto = require("crypto");
 const _IPCSocketServer = class _IPCSocketServer {
   socketServer;
   constructor(server) {
@@ -56,16 +57,20 @@ const _IPCSocketServer = class _IPCSocketServer {
           if (message.length === 0) {
             continue;
           }
+          const reqId = (0, import_crypto.randomUUID)();
           const dataObj = JSON.parse(message);
-          _IPCSocketServer.handleClientMessage(dataObj).then(() => {
+          _IPCSocketServer.handleClientMessage({ reqId, ...dataObj }).then(() => {
             (0, import_ipc_socket_client.writeJSON)(c, {
+              reqId,
               type: "success"
             });
           }).catch((err) => {
             (0, import_ipc_socket_client.writeJSON)(c, {
+              reqId,
               type: "error",
               payload: {
-                message: err.message
+                message: err.message,
+                stack: err.stack
               }
             });
           });
@@ -77,7 +82,7 @@ const _IPCSocketServer = class _IPCSocketServer {
     });
     return new _IPCSocketServer(socketServer);
   }
-  static async handleClientMessage({ type, payload }) {
+  static async handleClientMessage({ reqId, type, payload }) {
     console.log(`cli received message ${type}`);
     if (type === "passCliArgv") {
       const argv = payload.argv;
@@ -89,6 +94,7 @@ const _IPCSocketServer = class _IPCSocketServer {
         throw new Error("Not handle by ipc server");
       }
       return mainApp.runAsCLI(argv, {
+        reqId,
         from: "node",
         throwError: true
       });

package/lib/gateway/ws-server.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import WebSocket from 'ws';
 import { IncomingMessage } from 'http';
+import { Logger } from '@nocobase/logger';
 declare class WebSocketWithId extends WebSocket {
     id: string;
 }
@@ -14,6 +15,7 @@ interface WebSocketClient {
 export declare class WSServer {
     wss: WebSocket.Server;
     webSocketClients: Map<string, WebSocketClient>;
+    logger: Logger;
     constructor();
     addNewConnection(ws: WebSocketWithId, request: IncomingMessage): WebSocketClient;
     setClientApp(client: WebSocketClient): Promise<void>;

package/lib/gateway/ws-server.js

@@ -45,6 +45,7 @@ __name(getPayloadByErrorCode, "getPayloadByErrorCode");
 const _WSServer = class _WSServer {
   wss;
   webSocketClients = /* @__PURE__ */ new Map();
+  logger;
   constructor() {
     this.wss = new import_ws.WebSocketServer({ noServer: true });
     this.wss.on("connection", (ws, request) => {

package/lib/helper.js

@@ -51,6 +51,8 @@ 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();
@@ -77,6 +79,11 @@ function createResourcer(options) {
 }
 __name(createResourcer, "createResourcer");
 function registerMiddlewares(app, options) {
+  app.use(async (ctx, next) => {
+    app.context.reqId = (0, import_crypto.randomUUID)();
+    await next();
+  });
+  app.use((0, import_logger.requestLogger)(app.name, options.logger), { tag: "logger" });
   app.use(
     (0, import_cors.default)({
       exposeHeaders: ["content-disposition"],

package/lib/helpers/application-version.d.ts

@@ -5,6 +5,6 @@ export declare class ApplicationVersion {
     protected collection: Collection;
     constructor(app: Application);
     get(): Promise<any>;
-    update(): Promise<void>;
+    update(version?: string): Promise<void>;
     satisfies(range: string): Promise<boolean>;
 }

package/lib/helpers/application-version.js

@@ -58,13 +58,13 @@ const _ApplicationVersion = class _ApplicationVersion {
     }
     return null;
   }
-  async update() {
+  async update(version) {
     await this.collection.sync();
     await this.collection.model.destroy({
       truncate: true
     });
     await this.collection.model.create({
-      value: this.app.getVersion()
+      value: version || this.app.getVersion()
     });
   }
   async satisfies(range) {

package/lib/locale/locale.js

@@ -33,10 +33,10 @@ const _Locale = class _Locale {
   constructor(app) {
     this.app = app;
     this.app.on("afterLoad", async () => {
-      this.app.log.debug("load locale resource");
+      this.app.log.debug("load locale resource", { submodule: "locale", method: "onAfterLoad" });
       this.app.setMaintainingMessage("load locale resource");
       await this.load();
-      this.app.log.debug("locale resource loaded");
+      this.app.log.debug("locale resource loaded", { submodule: "locale", method: "onAfterLoad" });
       this.app.setMaintainingMessage("locale resource loaded");
     });
   }
@@ -97,8 +97,8 @@ const _Locale = class _Locale {
         const res = (0, import_resource.getResource)(packageName, lang);
         if (res) {
           resources[packageName] = { ...res };
-          if (name !== packageName) {
-            resources[name] = { ...res };
+          if (packageName.includes("@nocobase/plugin-")) {
+            resources[packageName.substring("@nocobase/plugin-".length)] = { ...res };
           }
         }
       } catch (err) {

package/lib/migrations/20230912193824-package-name-unique.js

@@ -49,7 +49,7 @@ const _package_name_unique_default = class _package_name_unique_default extends
       if (plugin.packageName) {
         continue;
       }
-      const packageName = import_plugin_manager.PluginManager.getPackageName(name);
+      const packageName = await import_plugin_manager.PluginManager.getPackageName(name);
       await repository.update({
         filter: {
           name

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

@@ -221,7 +221,7 @@ const _PluginManager = class _PluginManager {
     } catch (error) {
       console.error(error);
     }
-    this.app.log.debug(`adding plugin [${options.name}]...`);
+    this.app.log.debug(`adding plugin...`, { method: "add", submodule: "plugin-manager", name: options.name });
     let P;
     try {
       P = await _PluginManager.resolvePlugin(options.packageName || plugin, isUpgrade, !!options.packageName);
@@ -262,7 +262,7 @@ const _PluginManager = class _PluginManager {
       if (!plugin.enabled) {
         continue;
       }
-      this.app.logger.debug(`before load plugin [${name}]...`);
+      this.app.logger.debug(`before load plugin...`, { submodule: "plugin-manager", method: "load", name });
       await plugin.beforeLoad();
     }
     current = 0;
@@ -277,11 +277,11 @@ const _PluginManager = class _PluginManager {
         continue;
       }
       await this.app.emitAsync("beforeLoadPlugin", plugin, options);
-      this.app.logger.debug(`loading plugin [${name}]...`);
+      this.app.logger.debug(`loading plugin...`, { submodule: "plugin-manager", method: "load", name });
       await plugin.load();
       plugin.state.loaded = true;
       await this.app.emitAsync("afterLoadPlugin", plugin, options);
-      this.app.logger.debug(`after load plugin [${name}]...`);
+      this.app.logger.debug(`after load plugin...`, { submodule: "plugin-manager", method: "load", name });
     }
     this.app.setMaintainingMessage("loaded plugins");
   }
@@ -490,11 +490,11 @@ const _PluginManager = class _PluginManager {
     const name = plugin.getName();
     await plugin.beforeLoad();
     await this.app.emitAsync("beforeLoadPlugin", plugin, {});
-    this.app.logger.debug(`loading plugin [${name}]...`);
+    this.app.logger.debug(`loading plugin...`, { submodule: "plugin-manager", method: "loadOne", name });
     await plugin.load();
     plugin.state.loaded = true;
     await this.app.emitAsync("afterLoadPlugin", plugin, {});
-    this.app.logger.debug(`after load plugin [${name}]...`);
+    this.app.logger.debug(`after load plugin...`, { submodule: "plugin-manager", method: "loadOne", name });
     this.app.setMaintainingMessage(`loaded plugin ${plugin.name}`);
   }
   async addViaCLI(urlOrName, options) {

package/lib/plugin.d.ts

@@ -1,4 +1,6 @@
 import { Model } from '@nocobase/database';
+import { LoggerOptions } from '@nocobase/logger';
+import type { TFuncKey, TOptions } from 'i18next';
 import { Application } from './application';
 import { InstallOptions } from './plugin-manager';
 export interface PluginInterface {
@@ -33,6 +35,7 @@ export declare abstract class Plugin<O = any> implements PluginInterface {
     set installed(value: any);
     setOptions(options: any): void;
     getName(): any;
+    createLogger(options: LoggerOptions): import("winston").Logger;
     afterAdd(): void;
     beforeLoad(): void;
     load(): Promise<void>;
@@ -45,6 +48,7 @@ export declare abstract class Plugin<O = any> implements PluginInterface {
     afterRemove(): Promise<void>;
     importCollections(collectionsPath: string): Promise<void>;
     requiredPlugins(): any[];
+    t(text: TFuncKey | TFuncKey[], options?: TOptions): import("i18next").TFunctionDetailedResult<object>;
     toJSON(options?: any): Promise<any>;
 }
 export default Plugin;

package/lib/plugin.js

@@ -46,7 +46,10 @@ const _Plugin = class _Plugin {
     this.setOptions(options);
   }
   get log() {
-    return this.app.log;
+    return this.app.log.child({
+      reqId: this.app.context.reqId,
+      module: this.name
+    });
   }
   get name() {
     return this.options.name;
@@ -75,6 +78,9 @@ const _Plugin = class _Plugin {
   getName() {
     return this.options.name;
   }
+  createLogger(options) {
+    return this.app.createLogger(options);
+  }
   afterAdd() {
   }
   beforeLoad() {
@@ -104,6 +110,9 @@ const _Plugin = class _Plugin {
   requiredPlugins() {
     return [];
   }
+  t(text, options = {}) {
+    return this.app.i18n.t(text, { ns: this.options["packageName"], ...options });
+  }
   async toJSON(options = {}) {
     const { locale = "en-US" } = options;
     const { name, packageName, packageJson } = this.options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "0.18.0-alpha.1",
+  "version": "0.18.0-alpha.8",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -10,16 +10,16 @@
     "@koa/cors": "^3.1.0",
     "@koa/multer": "^3.0.2",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "0.18.0-alpha.1",
-    "@nocobase/actions": "0.18.0-alpha.1",
-    "@nocobase/auth": "0.18.0-alpha.1",
-    "@nocobase/cache": "0.18.0-alpha.1",
-    "@nocobase/database": "0.18.0-alpha.1",
-    "@nocobase/evaluators": "0.18.0-alpha.1",
-    "@nocobase/logger": "0.18.0-alpha.1",
-    "@nocobase/resourcer": "0.18.0-alpha.1",
-    "@nocobase/sdk": "0.18.0-alpha.1",
-    "@nocobase/utils": "0.18.0-alpha.1",
+    "@nocobase/acl": "0.18.0-alpha.8",
+    "@nocobase/actions": "0.18.0-alpha.8",
+    "@nocobase/auth": "0.18.0-alpha.8",
+    "@nocobase/cache": "0.18.0-alpha.8",
+    "@nocobase/database": "0.18.0-alpha.8",
+    "@nocobase/evaluators": "0.18.0-alpha.8",
+    "@nocobase/logger": "0.18.0-alpha.8",
+    "@nocobase/resourcer": "0.18.0-alpha.8",
+    "@nocobase/sdk": "0.18.0-alpha.8",
+    "@nocobase/utils": "0.18.0-alpha.8",
     "@types/decompress": "4.2.4",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -52,5 +52,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "0f5f1c0a37dc397a9dc4c8eec0c4ec20fd8107b0"
+  "gitHead": "727d42f6f14e5f863831da3dbf3255ba1165b567"
 }