@nocobase/server 1.9.0-beta.9 → 1.9.1

package/lib/application.js

@@ -948,7 +948,7 @@ const _Application = class _Application extends import_koa.default {
         }
       }
     });
-    this._dataSourceManager.use(this._authManager.middleware(), { tag: "auth" });
+    this._dataSourceManager.use(this._authManager.middleware(), { tag: "auth", before: "default" });
     this._dataSourceManager.use(import_validate_filter_params.default, { tag: "validate-filter-params", before: ["auth"] });
     this._dataSourceManager.use(import_middlewares.parseVariables, {
       group: "parseVariables",

package/lib/gateway/index.d.ts

@@ -47,6 +47,8 @@ export declare class Gateway extends EventEmitter {
     private port;
     private host;
     private socketPath;
+    private terminating;
+    private onTerminate;
     private constructor();
     static getInstance(options?: any): Gateway;
     static getIPCSocketClient(): Promise<false | IPCSocketClient>;

package/lib/gateway/index.js

@@ -86,10 +86,37 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   port = import_node_process.default.env.APP_PORT ? parseInt(import_node_process.default.env.APP_PORT) : null;
   host = "0.0.0.0";
   socketPath = (0, import_path.resolve)(import_node_process.default.cwd(), "storage", "gateway.sock");
+  terminating = false;
+  onTerminate = /* @__PURE__ */ __name(async (signal) => {
+    var _a;
+    if (this.terminating) {
+      return;
+    }
+    this.terminating = true;
+    const supervisor = import_app_supervisor.AppSupervisor.getInstance();
+    const apps = Object.values(supervisor.apps || {});
+    try {
+      for (const app of apps) {
+        try {
+          await app.destroy({ signal });
+        } catch (error) {
+          const logger = (app == null ? void 0 : app.log) ?? console;
+          (_a = logger.error) == null ? void 0 : _a.call(logger, error);
+        }
+      }
+      await supervisor.destroy();
+    } catch (error) {
+      console.error("Failed to shutdown applications gracefully", error);
+    } finally {
+      this.destroy();
+    }
+  }, "onTerminate");
   constructor() {
     super();
     this.reset();
     this.socketPath = getSocketPath();
+    import_node_process.default.once("SIGTERM", this.onTerminate);
+    import_node_process.default.once("SIGINT", this.onTerminate);
   }
   static getInstance(options = {}) {
     if (!_Gateway.instance) {
@@ -106,6 +133,8 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     }
   }
   destroy() {
+    import_node_process.default.off("SIGTERM", this.onTerminate);
+    import_node_process.default.off("SIGINT", this.onTerminate);
     this.reset();
     _Gateway.instance = null;
   }
@@ -137,6 +166,10 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
       this.ipcSocketServer.close();
       this.ipcSocketServer = null;
     }
+    if (this.wsServer) {
+      this.wsServer.close();
+      this.wsServer = null;
+    }
   }
   addAppSelectorMiddleware(middleware, options) {
     if (this.selectorMiddlewares.nodes.some((existingFunc) => existingFunc.toString() === middleware.toString())) {
@@ -169,7 +202,15 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     res.end(JSON.stringify({ error }));
   }
   responseErrorWithCode(code, res, options) {
+    const log = this.getLogger(options.appName, res);
     const error = (0, import_errors.applyErrorWithArgs)((0, import_errors.getErrorWithCode)(code), options);
+    log.error(error.message, {
+      method: "responseErrorWithCode",
+      code,
+      error,
+      statusCode: res.statusCode,
+      appName: options.appName
+    });
     this.responseError(res, error);
   }
   async requestHandler(req, res) {

package/lib/locale/locale.js

@@ -138,7 +138,7 @@ const _Locale = class _Locale {
         if (!packageName) {
           continue;
         }
-        const res = (0, import_resource.getResource)(packageName, lang);
+        const res = await (0, import_resource.getResource)(packageName, lang);
         if (res) {
           resources[packageName] = { ...res };
           if (packageName.includes(import__.OFFICIAL_PLUGIN_PREFIX)) {

package/lib/locale/resource.js

@@ -40,7 +40,7 @@ __export(resource_exports, {
   getResource: () => getResource
 });
 module.exports = __toCommonJS(resource_exports);
-var import_utils = require("@nocobase/utils");
+var import_promises = __toESM(require("fs/promises"));
 const arr2obj = /* @__PURE__ */ __name((items) => {
   const obj = {};
   for (const item of items) {
@@ -48,7 +48,7 @@ const arr2obj = /* @__PURE__ */ __name((items) => {
   }
   return obj;
 }, "arr2obj");
-const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true) => {
+const getResource = /* @__PURE__ */ __name(async (packageName, lang, isPlugin = true) => {
   const resources = [];
   const prefixes = [isPlugin ? "dist" : "lib"];
   if (process.env.APP_ENV !== "production") {
@@ -63,13 +63,10 @@ const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true)
   }
   for (const prefix of prefixes) {
     try {
-      const file = `${packageName}/${prefix}/locale/${lang}`;
+      const file = `${packageName}/${prefix}/locale/${lang}.json`;
       const f = require.resolve(file);
-      if (process.env.APP_ENV !== "production") {
-        delete require.cache[f];
-      }
-      const resource = (0, import_utils.requireModule)(file);
-      resources.push(resource);
+      const resource = await import_promises.default.readFile(f, "utf8");
+      resources.push(JSON.parse(resource));
     } catch (error) {
     }
     if (resources.length) {
@@ -77,7 +74,7 @@ const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true)
     }
   }
   if (resources.length === 0 && lang.replace("-", "_") !== lang) {
-    return getResource(packageName, lang.replace("-", "_"));
+    return await getResource(packageName, lang.replace("-", "_"));
   }
   return arr2obj(resources);
 }, "getResource");

package/lib/migrations/20250902230900-update-primary-keys.js

@@ -82,9 +82,7 @@ const _update_primary_keys_default = class _update_primary_keys_default extends
         } else {
           await queryInterface.changeColumn(tableName, "id", {
             type: import_sequelize.DataTypes.BIGINT,
-            primaryKey: true,
-            allowNull: false,
-            autoIncrement: false
+            allowNull: false
           });
         }
       }

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

@@ -90,7 +90,7 @@ const _PluginManager = class _PluginManager {
       namespace: "core/pm",
       directory: (0, import_path.resolve)(__dirname, "../migrations")
     });
-    this.app.resourcer.use(import_middleware.uploadMiddleware);
+    this.app.resourceManager.use(import_middleware.uploadMiddleware, { tag: "upload", after: "acl" });
   }
   /**
    * @internal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "1.9.0-beta.9",
+  "version": "1.9.1",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,20 +10,20 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "1.9.0-beta.9",
-    "@nocobase/actions": "1.9.0-beta.9",
-    "@nocobase/auth": "1.9.0-beta.9",
-    "@nocobase/cache": "1.9.0-beta.9",
-    "@nocobase/data-source-manager": "1.9.0-beta.9",
-    "@nocobase/database": "1.9.0-beta.9",
-    "@nocobase/evaluators": "1.9.0-beta.9",
-    "@nocobase/lock-manager": "1.9.0-beta.9",
-    "@nocobase/logger": "1.9.0-beta.9",
-    "@nocobase/resourcer": "1.9.0-beta.9",
-    "@nocobase/sdk": "1.9.0-beta.9",
-    "@nocobase/snowflake-id": "1.9.0-beta.9",
-    "@nocobase/telemetry": "1.9.0-beta.9",
-    "@nocobase/utils": "1.9.0-beta.9",
+    "@nocobase/acl": "1.9.1",
+    "@nocobase/actions": "1.9.1",
+    "@nocobase/auth": "1.9.1",
+    "@nocobase/cache": "1.9.1",
+    "@nocobase/data-source-manager": "1.9.1",
+    "@nocobase/database": "1.9.1",
+    "@nocobase/evaluators": "1.9.1",
+    "@nocobase/lock-manager": "1.9.1",
+    "@nocobase/logger": "1.9.1",
+    "@nocobase/resourcer": "1.9.1",
+    "@nocobase/sdk": "1.9.1",
+    "@nocobase/snowflake-id": "1.9.1",
+    "@nocobase/telemetry": "1.9.1",
+    "@nocobase/utils": "1.9.1",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -59,5 +59,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "b44464f1d1bbc96022d0f622e0a2f1d7e8d7142f"
+  "gitHead": "8a4face22c9be89c86484b97351e48f2ced3a834"
 }