@nocobase/server 1.4.0-alpha → 1.4.0-alpha.0

package/lib/application.d.ts

@@ -162,6 +162,8 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     private _maintainingStatusBeforeCommand;
     private _actionCommand;
     constructor(options: ApplicationOptions);
+    private static staticCommands;
+    static addCommand(callback: (app: Application) => void): void;
     private _sqlLogger;
     get sqlLogger(): Logger;
     protected _logger: SystemLogger;
@@ -243,6 +245,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
      * @deprecated
      */
     getVersion(): string;
+    getPackageVersion(): string;
     /**
      * This method is deprecated and should not be used.
      * Use {@link #this.pm.addPreset()} instead.
@@ -278,6 +281,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
      * @internal
      */
     reInit(): Promise<void>;
+    createCacheManager(): Promise<CacheManager>;
     load(options?: LoadOptions): Promise<void>;
     reload(options?: LoadOptions): Promise<void>;
     /**

package/lib/application.js

@@ -13,6 +13,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
@@ -35,6 +36,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var application_exports = {};
 __export(application_exports, {
   Application: () => Application,
@@ -119,6 +121,9 @@ const _Application = class _Application extends import_koa.default {
   _maintainingCommandStatus;
   _maintainingStatusBeforeCommand;
   _actionCommand;
+  static addCommand(callback) {
+    this.staticCommands.push(callback);
+  }
   _sqlLogger;
   get sqlLogger() {
     return this._sqlLogger;
@@ -272,6 +277,9 @@ const _Application = class _Application extends import_koa.default {
   getVersion() {
     return import_package.default.version;
   }
+  getPackageVersion() {
+    return import_package.default.version;
+  }
   /**
    * This method is deprecated and should not be used.
    * Use {@link #this.pm.addPreset()} instead.
@@ -283,7 +291,7 @@ const _Application = class _Application extends import_koa.default {
   }
   // @ts-ignore
   use(middleware, options) {
-    this.middleware.add(middleware, options);
+    this.middleware.add((0, import_utils.wrapMiddlewareWithLogging)(middleware, this.logger), options);
     return this;
   }
   /**
@@ -349,6 +357,10 @@ const _Application = class _Application extends import_koa.default {
     }
     this._loaded = false;
   }
+  async createCacheManager() {
+    this._cacheManager = await (0, import_cache2.createCacheManager)(this, this.options.cacheManager);
+    return this._cacheManager;
+  }
   async load(options) {
     var _a;
     if (this._loaded) {
@@ -372,7 +384,7 @@ const _Application = class _Application extends import_koa.default {
     if (this.cacheManager) {
       await this.cacheManager.close();
     }
-    this._cacheManager = await (0, import_cache2.createCacheManager)(this, this.options.cacheManager);
+    this._cacheManager = await this.createCacheManager();
     this.log.debug("init plugins");
     this.setMaintainingMessage("init plugins");
     await this.pm.initPlugins();
@@ -850,6 +862,9 @@ const _Application = class _Application extends import_koa.default {
     }
     (0, import_commands.registerCli)(this);
     this._version = new import_application_version.ApplicationVersion(this);
+    for (const callback of _Application.staticCommands) {
+      callback(this);
+    }
   }
   createMainDataSource(options) {
     const mainDataSourceInstance = new import_main_data_source.MainDataSource({
@@ -866,14 +881,19 @@ const _Application = class _Application extends import_koa.default {
     this.dataSourceManager.dataSources.set("main", mainDataSourceInstance);
   }
   createDatabase(options) {
-    const logging = /* @__PURE__ */ __name((msg) => {
+    const logging = /* @__PURE__ */ __name((...args) => {
+      let msg = args[0];
       if (typeof msg === "string") {
         msg = msg.replace(/[\r\n]/gm, "").replace(/\s+/g, " ");
       }
       if (msg.includes("INSERT INTO")) {
         msg = msg.substring(0, 2e3) + "...";
       }
-      this._sqlLogger.debug({ message: msg, app: this.name, reqId: this.context.reqId });
+      const content = { message: msg, app: this.name, reqId: this.context.reqId };
+      if (args[1] && typeof args[1] === "number") {
+        content.executeTime = args[1];
+      }
+      this._sqlLogger.debug(content);
     }, "logging");
     const dbOptions = options.database instanceof import_database.default ? options.database.options : options.database;
     const db = new import_database.default({
@@ -888,6 +908,7 @@ const _Application = class _Application extends import_koa.default {
   }
 };
 __name(_Application, "Application");
+__publicField(_Application, "staticCommands", []);
 let Application = _Application;
 (0, import_utils.applyMixins)(Application, [import_utils.AsyncEmitter]);
 var application_default = Application;

package/lib/gateway/index.js

@@ -265,7 +265,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     if (!process.env.IS_DEV_CMD) {
       return;
     }
-    const file = (0, import_path.resolve)(process.cwd(), "storage/app.watch.ts");
+    const file = process.env.WATCH_FILE;
     if (!import_fs.default.existsSync(file)) {
       await import_fs.default.promises.writeFile(file, `export const watchId = '${(0, import_utils.uid)()}';`, "utf-8");
     }

package/lib/helper.js

@@ -54,14 +54,13 @@ 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_data_wrapping = require("./middlewares/data-wrapping");
 var import_i18n = require("./middlewares/i18n");
 function createI18n(options) {
   const instance = import_i18next.default.createInstance();
   instance.init({
-    lng: "en-US",
+    lng: process.env.INIT_LANG || "en-US",
     resources: {},
     keySeparator: false,
     nsSeparator: false,
@@ -76,10 +75,13 @@ function createResourcer(options) {
 __name(createResourcer, "createResourcer");
 function registerMiddlewares(app, options) {
   var _a;
-  app.use(async (ctx, next) => {
-    app.context.reqId = (0, import_crypto.randomUUID)();
-    await next();
-  });
+  app.use(
+    /* @__PURE__ */ __name(async function generateReqId(ctx, next) {
+      app.context.reqId = (0, import_crypto.randomUUID)();
+      await next();
+    }, "generateReqId"),
+    { tag: "generateReqId" }
+  );
   app.use((0, import_logger.requestLogger)(app.name, app.requestLogger, (_a = options.logger) == null ? void 0 : _a.request), { tag: "logger" });
   app.use(
     (0, import_cors.default)({
@@ -106,16 +108,16 @@ function registerMiddlewares(app, options) {
       }
     );
   }
-  app.use(async (ctx, next) => {
+  app.use(/* @__PURE__ */ __name(async function getBearerToken(ctx, next) {
     ctx.getBearerToken = () => {
       const token = ctx.get("Authorization").replace(/^Bearer\s+/gi, "");
       return token || ctx.query.token;
     };
     await next();
-  });
-  app.use(import_i18n.i18n, { tag: "i18n", after: "cors" });
+  }, "getBearerToken"));
+  app.use(import_i18n.i18n, { tag: "i18n", before: "cors" });
   if (options.dataWrapping !== false) {
-    app.use((0, import_data_wrapping.dataWrapping)(), { tag: "dataWrapping", after: "i18n" });
+    app.use((0, import_data_wrapping.dataWrapping)(), { tag: "dataWrapping", after: "cors" });
   }
   app.use(app.dataSourceManager.middleware(), { tag: "dataSource", after: "dataWrapping" });
 }
@@ -148,8 +150,7 @@ const getCommandFullName = /* @__PURE__ */ __name((command) => {
 }, "getCommandFullName");
 /* istanbul ignore next -- @preserve */
 const tsxRerunning = /* @__PURE__ */ __name(async () => {
-  const file = (0, import_path.resolve)(process.cwd(), "storage/app.watch.ts");
-  await import_fs.default.promises.writeFile(file, `export const watchId = '${(0, import_utils.uid)()}';`, "utf-8");
+  await import_fs.default.promises.writeFile(process.env.WATCH_FILE, `export const watchId = '${(0, import_utils.uid)()}';`, "utf-8");
 }, "tsxRerunning");
 /* istanbul ignore next -- @preserve */
 const enablePerfHooks = /* @__PURE__ */ __name((app) => {

package/lib/middlewares/data-template.d.ts

@@ -7,4 +7,4 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Context } from '@nocobase/actions';
-export declare const dataTemplate: (ctx: Context, next: any) => Promise<void>;
+export declare function dataTemplate(ctx: Context, next: any): Promise<void>;

package/lib/middlewares/data-template.js

@@ -30,7 +30,7 @@ __export(data_template_exports, {
   dataTemplate: () => dataTemplate
 });
 module.exports = __toCommonJS(data_template_exports);
-const dataTemplate = /* @__PURE__ */ __name(async (ctx, next) => {
+async function dataTemplate(ctx, next) {
   const { resourceName, actionName } = ctx.action;
   const { isTemplate, fields } = ctx.action.params;
   await next();
@@ -40,7 +40,8 @@ const dataTemplate = /* @__PURE__ */ __name(async (ctx, next) => {
       include: fields
     });
   }
-}, "dataTemplate");
+}
+__name(dataTemplate, "dataTemplate");
 const traverseHasMany = /* @__PURE__ */ __name((arr, { collection, exclude = [], include = [] }) => {
   if (!arr) {
     return arr;

package/lib/middlewares/i18n.js

@@ -41,7 +41,7 @@ async function i18n(ctx, next) {
   ctx.i18n = i18n2;
   ctx.t = i18n2.t.bind(i18n2);
   if (lng !== "*" && lng) {
-    i18n2.changeLanguage(lng);
+    await i18n2.changeLanguage(lng);
     await localeManager.loadResourcesByLang(lng);
   }
   await next();

package/lib/middlewares/parse-variables.d.ts

@@ -6,4 +6,4 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-export declare const parseVariables: (ctx: any, next: any) => Promise<any>;
+export declare function parseVariables(ctx: any, next: any): Promise<any>;

package/lib/middlewares/parse-variables.js

@@ -59,7 +59,7 @@ function isNumeric(str) {
   return !isNaN(str) && !isNaN(parseFloat(str));
 }
 __name(isNumeric, "isNumeric");
-const parseVariables = /* @__PURE__ */ __name(async (ctx, next) => {
+async function parseVariables(ctx, next) {
   const filter = ctx.action.params.filter;
   if (!filter) {
     return next();
@@ -86,7 +86,8 @@ const parseVariables = /* @__PURE__ */ __name(async (ctx, next) => {
     }
   });
   await next();
-}, "parseVariables");
+}
+__name(parseVariables, "parseVariables");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   parseVariables

package/lib/plugin-manager/deps.js

@@ -63,7 +63,7 @@ const deps = {
   i18next: "22.x",
   "react-i18next": "11.x",
   "@dnd-kit/accessibility": "3.x",
-  "@dnd-kit/core": "5.x",
+  "@dnd-kit/core": "6.x",
   "@dnd-kit/modifiers": "6.x",
   "@dnd-kit/sortable": "6.x",
   "@dnd-kit/utilities": "3.x",

package/lib/plugin-manager/findPackageNames.js

@@ -68,6 +68,18 @@ async function trim(packageNames) {
   return names;
 }
 __name(trim, "trim");
+const excludes = [
+  "@nocobase/plugin-audit-logs",
+  "@nocobase/plugin-backup-restore",
+  "@nocobase/plugin-charts",
+  "@nocobase/plugin-disable-pm-add",
+  "@nocobase/plugin-mobile-client",
+  "@nocobase/plugin-mock-collections",
+  "@nocobase/plugin-multi-app-share-collection",
+  "@nocobase/plugin-notifications",
+  "@nocobase/plugin-snapshot-field",
+  "@nocobase/plugin-workflow-test"
+];
 async function findPackageNames() {
   const patterns = [
     "./packages/plugins/*/package.json",
@@ -88,22 +100,10 @@ async function findPackageNames() {
         return packageJson.name;
       })
     );
-    const excludes = [
-      "@nocobase/plugin-audit-logs",
-      "@nocobase/plugin-backup-restore",
-      "@nocobase/plugin-charts",
-      "@nocobase/plugin-disable-pm-add",
-      "@nocobase/plugin-mobile-client",
-      "@nocobase/plugin-mock-collections",
-      "@nocobase/plugin-multi-app-share-collection",
-      "@nocobase/plugin-notifications",
-      "@nocobase/plugin-snapshot-field",
-      "@nocobase/plugin-workflow-test"
-    ];
     const nocobasePlugins = await findNocobasePlugins();
     const { APPEND_PRESET_BUILT_IN_PLUGINS = "", APPEND_PRESET_LOCAL_PLUGINS = "" } = process.env;
     return trim(
-      import_lodash.default.difference(packageNames, excludes).filter(Boolean).concat(nocobasePlugins).concat(splitNames(APPEND_PRESET_BUILT_IN_PLUGINS)).concat(splitNames(APPEND_PRESET_LOCAL_PLUGINS))
+      packageNames.filter((pkg) => pkg && !excludes.includes(pkg)).concat(nocobasePlugins).concat(splitNames(APPEND_PRESET_BUILT_IN_PLUGINS)).concat(splitNames(APPEND_PRESET_LOCAL_PLUGINS))
     );
   } catch (error) {
     return [];
@@ -121,7 +121,7 @@ async function findNocobasePlugins() {
   try {
     const packageJson = await getPackageJson();
     const pluginNames = Object.keys(packageJson.dependencies).filter((name) => name.startsWith("@nocobase/plugin-"));
-    return trim(pluginNames);
+    return trim(pluginNames.filter((pkg) => pkg && !excludes.includes(pkg)));
   } catch (error) {
     return [];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "1.4.0-alpha",
+    "version": "1.4.0-alpha.0",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "AGPL-3.0",
@@ -10,18 +10,18 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "1.4.0-alpha",
-        "@nocobase/actions": "1.4.0-alpha",
-        "@nocobase/auth": "1.4.0-alpha",
-        "@nocobase/cache": "1.4.0-alpha",
-        "@nocobase/data-source-manager": "1.4.0-alpha",
-        "@nocobase/database": "1.4.0-alpha",
-        "@nocobase/evaluators": "1.4.0-alpha",
-        "@nocobase/logger": "1.4.0-alpha",
-        "@nocobase/resourcer": "1.4.0-alpha",
-        "@nocobase/sdk": "1.4.0-alpha",
-        "@nocobase/telemetry": "1.4.0-alpha",
-        "@nocobase/utils": "1.4.0-alpha",
+        "@nocobase/acl": "1.4.0-alpha.0",
+        "@nocobase/actions": "1.4.0-alpha.0",
+        "@nocobase/auth": "1.4.0-alpha.0",
+        "@nocobase/cache": "1.4.0-alpha.0",
+        "@nocobase/data-source-manager": "1.4.0-alpha.0",
+        "@nocobase/database": "1.4.0-alpha.0",
+        "@nocobase/evaluators": "1.4.0-alpha.0",
+        "@nocobase/logger": "1.4.0-alpha.0",
+        "@nocobase/resourcer": "1.4.0-alpha.0",
+        "@nocobase/sdk": "1.4.0-alpha.0",
+        "@nocobase/telemetry": "1.4.0-alpha.0",
+        "@nocobase/utils": "1.4.0-alpha.0",
         "@types/decompress": "4.2.7",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",
@@ -54,5 +54,5 @@
         "@types/serve-handler": "^6.1.1",
         "@types/ws": "^8.5.5"
     },
-    "gitHead": "f097a2bddec152522b5645bd5d451f4c866d2060"
+    "gitHead": "8ffa7b54bbaf720c0c9857da4b19a99110dffc4b"
 }