@nocobase/server 0.17.0-alpha.4 → 0.17.0-alpha.6

package/lib/application.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 /// <reference types="koa-bodyparser" />
 import { ACL } from '@nocobase/acl';
 import { AuthManager, AuthManagerOptions } from '@nocobase/auth';
@@ -18,6 +19,7 @@ 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 {
@@ -38,6 +40,7 @@ export interface ApplicationOptions {
     pmSock?: string;
     name?: string;
     authManager?: AuthManagerOptions;
+    perfHooks?: boolean;
 }
 export interface DefaultState extends KoaDefaultState {
     currentUser?: any;
@@ -80,6 +83,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
         name: string;
     };
     running: boolean;
+    perfHistograms: Map<string, RecordableHistogram>;
     protected plugins: Map<string, Plugin<any>>;
     protected _appSupervisor: AppSupervisor;
     protected _started: boolean;

package/lib/application.js

@@ -67,6 +67,7 @@ const _Application = class _Application extends import_koa.default {
   rawOptions;
   activatedCommand = null;
   running = false;
+  perfHistograms = /* @__PURE__ */ new Map();
   plugins = /* @__PURE__ */ new Map();
   _appSupervisor = import_app_supervisor.AppSupervisor.getInstance();
   _started;
@@ -395,6 +396,9 @@ const _Application = class _Application extends import_koa.default {
     } catch (e) {
       this.log.error(e);
     }
+    if (this._cacheManager) {
+      await this._cacheManager.close();
+    }
     await this.emitAsync("afterStop", this, options);
     this.stopped = true;
     this.log.info(`${this.name} is stopped`);
@@ -526,6 +530,9 @@ const _Application = class _Application extends import_koa.default {
       this._resourcer.use(this._acl.middleware(), { tag: "acl", after: ["auth"] });
     }
     this._locales = new import_locale.Locale((0, import_helper.createAppProxy)(this));
+    if (options.perfHooks) {
+      (0, import_helper.enablePerfHooks)(this);
+    }
     (0, import_helper.registerMiddlewares)(this, options);
     if (options.registerActions !== false) {
       (0, import_actions.registerActions)(this);

package/lib/helper.d.ts

@@ -9,3 +9,4 @@ export declare function registerMiddlewares(app: Application, options: Applicati
 export declare const createAppProxy: (app: Application) => Application<import("./application").DefaultState, import("./application").DefaultContext>;
 export declare const getCommandFullName: (command: Command) => string;
 export declare const tsxRerunning: () => Promise<void>;
+export declare const enablePerfHooks: (app: Application) => void;

package/lib/helper.js

@@ -32,6 +32,7 @@ __export(helper_exports, {
   createDatabase: () => createDatabase,
   createI18n: () => createI18n,
   createResourcer: () => createResourcer,
+  enablePerfHooks: () => enablePerfHooks,
   getCommandFullName: () => getCommandFullName,
   registerMiddlewares: () => registerMiddlewares,
   tsxRerunning: () => tsxRerunning
@@ -50,6 +51,7 @@ 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_perf_hooks = require("perf_hooks");
 function createI18n(options) {
   const instance = import_i18next.default.createInstance();
   instance.init({
@@ -111,7 +113,10 @@ function registerMiddlewares(app, options) {
   if (options.dataWrapping !== false) {
     app.use((0, import_data_wrapping.dataWrapping)(), { tag: "dataWrapping", after: "i18n" });
   }
-  app.resourcer.use(import_middlewares.parseVariables, { tag: "parseVariables", after: "acl" });
+  app.resourcer.use(import_middlewares.parseVariables, {
+    tag: "parseVariables",
+    after: "acl"
+  });
   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" });
@@ -147,12 +152,42 @@ 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");
 }, "tsxRerunning");
+const enablePerfHooks = /* @__PURE__ */ __name((app) => {
+  app.context.getPerfHistogram = (name) => {
+    if (!app.perfHistograms.has(name)) {
+      app.perfHistograms.set(name, (0, import_perf_hooks.createHistogram)());
+    }
+    return app.perfHistograms.get(name);
+  };
+  app.resourcer.define({
+    name: "perf",
+    actions: {
+      view: async (ctx, next) => {
+        const result = {};
+        const histograms = ctx.app.perfHistograms;
+        const sortedHistograms = [...histograms.entries()].sort(([i, a], [j, b]) => b.mean - a.mean);
+        sortedHistograms.forEach(([name, histogram]) => {
+          result[name] = histogram;
+        });
+        ctx.body = result;
+        await next();
+      },
+      reset: async (ctx, next) => {
+        const histograms = ctx.app.perfHistograms;
+        histograms.forEach((histogram) => histogram.reset());
+        await next();
+      }
+    }
+  });
+  app.acl.allow("perf", "*", "public");
+}, "enablePerfHooks");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createAppProxy,
   createDatabase,
   createI18n,
   createResourcer,
+  enablePerfHooks,
   getCommandFullName,
   registerMiddlewares,
   tsxRerunning

package/lib/locale/locale.d.ts

@@ -6,6 +6,7 @@ export declare class Locale {
     defaultLang: string;
     localeFn: Map<any, any>;
     resourceCached: Map<any, any>;
+    i18nInstances: Map<any, any>;
     constructor(app: Application);
     load(): Promise<void>;
     setLocaleFn(name: string, fn: (lang: string) => Promise<any>): void;
@@ -16,4 +17,5 @@ export declare class Locale {
     loadResourcesByLang(lang: string): Promise<void>;
     getCacheResources(lang: string): Promise<any>;
     getResources(lang: string): {};
+    getI18nInstance(lang: string): Promise<any>;
 }

package/lib/locale/locale.js

@@ -29,6 +29,7 @@ const _Locale = class _Locale {
   defaultLang = "en-US";
   localeFn = /* @__PURE__ */ new Map();
   resourceCached = /* @__PURE__ */ new Map();
+  i18nInstances = /* @__PURE__ */ new Map();
   constructor(app) {
     this.app = app;
     this.app.on("afterLoad", async () => {
@@ -105,6 +106,17 @@ const _Locale = class _Locale {
     });
     return resources;
   }
+  async getI18nInstance(lang) {
+    if (lang === "*" || !lang) {
+      return this.app.i18n.cloneInstance({ initImmediate: false });
+    }
+    let instance = this.i18nInstances.get(lang);
+    if (!instance) {
+      instance = this.app.i18n.cloneInstance({ initImmediate: false });
+      this.i18nInstances.set(lang, instance);
+    }
+    return instance;
+  }
 };
 __name(_Locale, "Locale");
 let Locale = _Locale;

package/lib/middlewares/i18n.js

@@ -22,17 +22,18 @@ __export(i18n_exports, {
 });
 module.exports = __toCommonJS(i18n_exports);
 async function i18n(ctx, next) {
-  const i18n2 = ctx.app.i18n.cloneInstance({ initImmediate: false });
-  ctx.i18n = i18n2;
-  ctx.t = i18n2.t.bind(i18n2);
   ctx.getCurrentLocale = () => {
     const lng2 = ctx.get("X-Locale") || ctx.request.query.locale || ctx.app.i18n.language || ctx.acceptsLanguages().shift() || "en-US";
     return lng2;
   };
   const lng = ctx.getCurrentLocale();
+  const localeManager = ctx.app.localeManager;
+  const i18n2 = await localeManager.getI18nInstance(lng);
+  ctx.i18n = i18n2;
+  ctx.t = i18n2.t.bind(i18n2);
   if (lng !== "*" && lng) {
     i18n2.changeLanguage(lng);
-    await ctx.app.localeManager.loadResourcesByLang(lng);
+    await localeManager.loadResourcesByLang(lng);
   }
   await next();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "0.17.0-alpha.4",
+  "version": "0.17.0-alpha.6",
   "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.17.0-alpha.4",
-    "@nocobase/actions": "0.17.0-alpha.4",
-    "@nocobase/auth": "0.17.0-alpha.4",
-    "@nocobase/cache": "0.17.0-alpha.4",
-    "@nocobase/database": "0.17.0-alpha.4",
-    "@nocobase/evaluators": "0.17.0-alpha.4",
-    "@nocobase/logger": "0.17.0-alpha.4",
-    "@nocobase/resourcer": "0.17.0-alpha.4",
-    "@nocobase/sdk": "0.17.0-alpha.4",
-    "@nocobase/utils": "0.17.0-alpha.4",
+    "@nocobase/acl": "0.17.0-alpha.6",
+    "@nocobase/actions": "0.17.0-alpha.6",
+    "@nocobase/auth": "0.17.0-alpha.6",
+    "@nocobase/cache": "0.17.0-alpha.6",
+    "@nocobase/database": "0.17.0-alpha.6",
+    "@nocobase/evaluators": "0.17.0-alpha.6",
+    "@nocobase/logger": "0.17.0-alpha.6",
+    "@nocobase/resourcer": "0.17.0-alpha.6",
+    "@nocobase/sdk": "0.17.0-alpha.6",
+    "@nocobase/utils": "0.17.0-alpha.6",
     "@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": "663b03a3799a70ba1a2bc6a0d686e679331a50ad"
+  "gitHead": "f92f8bcdf6d5baf07566381e9425ebca11e19626"
 }