@nocobase/server 1.9.26 → 1.9.27

package/lib/gateway/errors.js

@@ -44,6 +44,15 @@ __export(errors_exports, {
 module.exports = __toCommonJS(errors_exports);
 var import_app_supervisor = require("../app-supervisor");
 var import_lodash = __toESM(require("lodash"));
+function getMaintaining(app) {
+  var _a;
+  return (_a = app == null ? void 0 : app.getMaintaining) == null ? void 0 : _a.call(app);
+}
+__name(getMaintaining, "getMaintaining");
+function getAppName(app) {
+  return (app == null ? void 0 : app.name) || "unknown";
+}
+__name(getAppName, "getAppName");
 const errors = {
   APP_NOT_FOUND: {
     status: 404,
@@ -53,6 +62,9 @@ const errors = {
   APP_ERROR: {
     status: 503,
     message: /* @__PURE__ */ __name(({ app }) => {
+      if (!(app == null ? void 0 : app.name)) {
+        return "";
+      }
       const error = import_app_supervisor.AppSupervisor.getInstance().appErrors[app.name];
       if (!error) {
         return "";
@@ -64,25 +76,31 @@ const errors = {
       return message;
     }, "message"),
     code: /* @__PURE__ */ __name(({ app }) => {
+      if (!(app == null ? void 0 : app.name)) {
+        return "APP_ERROR";
+      }
       const error = import_app_supervisor.AppSupervisor.getInstance().appErrors[app.name];
-      return error["code"] || "APP_ERROR";
+      return (error == null ? void 0 : error["code"]) || "APP_ERROR";
     }, "code"),
-    command: /* @__PURE__ */ __name(({ app }) => app.getMaintaining().command, "command"),
+    command: /* @__PURE__ */ __name(({ app }) => {
+      var _a;
+      return (_a = getMaintaining(app)) == null ? void 0 : _a.command;
+    }, "command"),
     maintaining: true
   },
   APP_STARTING: {
     status: 503,
-    message: /* @__PURE__ */ __name(({ app }) => app.maintainingMessage, "message"),
+    message: /* @__PURE__ */ __name(({ app }) => (app == null ? void 0 : app.maintainingMessage) || "", "message"),
     maintaining: true
   },
   APP_STOPPED: {
     status: 503,
-    message: /* @__PURE__ */ __name(({ app }) => `application ${app.name} is stopped`, "message"),
+    message: /* @__PURE__ */ __name(({ app }) => `application ${getAppName(app)} is stopped`, "message"),
     maintaining: true
   },
   APP_INITIALIZED: {
     status: 503,
-    message: /* @__PURE__ */ __name(({ app }) => `application ${app.name} is initialized, waiting for command`, "message"),
+    message: /* @__PURE__ */ __name(({ app }) => `application ${getAppName(app)} is initialized, waiting for command`, "message"),
     maintaining: true
   },
   APP_INITIALIZING: {
@@ -93,25 +111,40 @@ const errors = {
   COMMAND_ERROR: {
     status: 503,
     maintaining: true,
-    message: /* @__PURE__ */ __name(({ app }) => app.getMaintaining().error.message, "message"),
-    command: /* @__PURE__ */ __name(({ app }) => app.getMaintaining().command, "command")
+    message: /* @__PURE__ */ __name(({ app }) => {
+      var _a, _b;
+      return ((_b = (_a = getMaintaining(app)) == null ? void 0 : _a.error) == null ? void 0 : _b.message) || "";
+    }, "message"),
+    command: /* @__PURE__ */ __name(({ app }) => {
+      var _a;
+      return (_a = getMaintaining(app)) == null ? void 0 : _a.command;
+    }, "command")
   },
   COMMAND_END: {
     status: 503,
     maintaining: true,
-    message: /* @__PURE__ */ __name(({ app }) => `${app.getMaintaining().command.name} running end`, "message"),
-    command: /* @__PURE__ */ __name(({ app }) => app.getMaintaining().command, "command")
+    message: /* @__PURE__ */ __name(({ app }) => {
+      var _a, _b;
+      return `${((_b = (_a = getMaintaining(app)) == null ? void 0 : _a.command) == null ? void 0 : _b.name) || "command"} running end`;
+    }, "message"),
+    command: /* @__PURE__ */ __name(({ app }) => {
+      var _a;
+      return (_a = getMaintaining(app)) == null ? void 0 : _a.command;
+    }, "command")
   },
   APP_COMMANDING: {
     status: 503,
     maintaining: true,
-    message: /* @__PURE__ */ __name(({ app, message }) => message || app.maintainingMessage, "message"),
-    command: /* @__PURE__ */ __name(({ app, command }) => command || app.getMaintaining().command, "command")
+    message: /* @__PURE__ */ __name(({ app, message }) => message || (app == null ? void 0 : app.maintainingMessage) || "", "message"),
+    command: /* @__PURE__ */ __name(({ app, command }) => {
+      var _a;
+      return command || ((_a = getMaintaining(app)) == null ? void 0 : _a.command);
+    }, "command")
   },
   APP_RUNNING: {
     status: 200,
     maintaining: false,
-    message: /* @__PURE__ */ __name(({ message, app }) => message || `application ${app.name} is running`, "message")
+    message: /* @__PURE__ */ __name(({ message, app }) => message || `application ${getAppName(app)} is running`, "message")
   },
   UNKNOWN_ERROR: {
     status: 500,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "1.9.26",
+  "version": "1.9.27",
   "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.26",
-    "@nocobase/actions": "1.9.26",
-    "@nocobase/auth": "1.9.26",
-    "@nocobase/cache": "1.9.26",
-    "@nocobase/data-source-manager": "1.9.26",
-    "@nocobase/database": "1.9.26",
-    "@nocobase/evaluators": "1.9.26",
-    "@nocobase/lock-manager": "1.9.26",
-    "@nocobase/logger": "1.9.26",
-    "@nocobase/resourcer": "1.9.26",
-    "@nocobase/sdk": "1.9.26",
-    "@nocobase/snowflake-id": "1.9.26",
-    "@nocobase/telemetry": "1.9.26",
-    "@nocobase/utils": "1.9.26",
+    "@nocobase/acl": "1.9.27",
+    "@nocobase/actions": "1.9.27",
+    "@nocobase/auth": "1.9.27",
+    "@nocobase/cache": "1.9.27",
+    "@nocobase/data-source-manager": "1.9.27",
+    "@nocobase/database": "1.9.27",
+    "@nocobase/evaluators": "1.9.27",
+    "@nocobase/lock-manager": "1.9.27",
+    "@nocobase/logger": "1.9.27",
+    "@nocobase/resourcer": "1.9.27",
+    "@nocobase/sdk": "1.9.27",
+    "@nocobase/snowflake-id": "1.9.27",
+    "@nocobase/telemetry": "1.9.27",
+    "@nocobase/utils": "1.9.27",
     "@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": "794e25d4aca20fbc68769ad7b1266860bd45ac5c"
+  "gitHead": "0d262aa7ddb76d88184eabd408686bb3960a67f6"
 }