@nocobase/server 2.0.0-alpha.53 → 2.0.0-alpha.55

package/lib/application.js

@@ -949,6 +949,11 @@ const _Application = class _Application extends import_koa.default {
       name: "auth",
       actions: import_auth.actions
     });
+    this._dataSourceManager.beforeAddDataSource((dataSource) => {
+      if (dataSource.collectionManager instanceof import_data_source_manager.SequelizeCollectionManager) {
+        (0, import_snowflake_id_field.setupSnowflakeIdField)(this, dataSource.collectionManager.db);
+      }
+    });
     this._dataSourceManager.afterAddDataSource((dataSource) => {
       if (dataSource.collectionManager instanceof import_data_source_manager.SequelizeCollectionManager) {
         for (const [actionName, actionParams] of Object.entries(import_available_action.availableActions)) {
@@ -990,7 +995,6 @@ const _Application = class _Application extends import_koa.default {
       app: this
     });
     this.dataSourceManager.dataSources.set("main", mainDataSourceInstance);
-    (0, import_snowflake_id_field.setupSnowflakeIdField)(this);
   }
   createDatabase(options) {
     const logging = /* @__PURE__ */ __name((...args) => {

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,7 +62,10 @@ const errors = {
   APP_ERROR: {
     status: 503,
     message: /* @__PURE__ */ __name(({ app }) => {
-      const error = import_app_supervisor.AppSupervisor.getInstance().appErrors[app == null ? void 0 : app.name];
+      if (!(app == null ? void 0 : app.name)) {
+        return "";
+      }
+      const error = import_app_supervisor.AppSupervisor.getInstance().appErrors[app.name];
       if (!error) {
         return "";
       }
@@ -64,10 +76,16 @@ const errors = {
       return message;
     }, "message"),
     code: /* @__PURE__ */ __name(({ app }) => {
-      const error = import_app_supervisor.AppSupervisor.getInstance().appErrors[app == null ? void 0 : app.name];
-      return error["code"] || "APP_ERROR";
+      if (!(app == null ? void 0 : app.name)) {
+        return "APP_ERROR";
+      }
+      const error = import_app_supervisor.AppSupervisor.getInstance().appErrors[app.name];
+      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_PREPARING: {
@@ -77,17 +95,17 @@ const errors = {
   },
   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 == null ? void 0 : 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 == null ? void 0 : app.name} is initialized, please refresh the page`, "message"),
+    message: /* @__PURE__ */ __name(({ app }) => `application ${getAppName(app)} is initialized, waiting for command`, "message"),
     maintaining: true
   },
   APP_INITIALIZING: {
@@ -98,25 +116,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 == null ? void 0 : app.name} is running`, "message")
+    message: /* @__PURE__ */ __name(({ message, app }) => message || `application ${getAppName(app)} is running`, "message")
   },
   UNKNOWN_ERROR: {
     status: 500,

package/lib/plugin-manager/deps.js

@@ -76,6 +76,6 @@ const deps = {
   lodash: "4.x",
   "china-division": "2.x",
   cronstrue: "2.x",
-  "@nocobase/license-kit": "0.2.x"
+  "@nocobase/license-kit": "0.3.x"
 };
 var deps_default = deps;

package/lib/snowflake-id-field.d.ts

@@ -6,5 +6,6 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+import { Database } from '@nocobase/database';
 import Application from './application';
-export declare function setupSnowflakeIdField(app: Application): void;
+export declare function setupSnowflakeIdField(app: Application, db: Database): void;

package/lib/snowflake-id-field.js

@@ -31,13 +31,13 @@ __export(snowflake_id_field_exports, {
 });
 module.exports = __toCommonJS(snowflake_id_field_exports);
 var import_database = require("@nocobase/database");
-function setupSnowflakeIdField(app) {
+function setupSnowflakeIdField(app, db) {
   const _SnowflakeIdField = class _SnowflakeIdField extends import_database.SnowflakeIdField {
   };
   __name(_SnowflakeIdField, "SnowflakeIdField");
   let SnowflakeIdField = _SnowflakeIdField;
   SnowflakeIdField.setApp(app);
-  app.db.registerFieldTypes({
+  db.registerFieldTypes({
     snowflakeId: SnowflakeIdField
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.0.0-alpha.53",
+  "version": "2.0.0-alpha.55",
   "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": "2.0.0-alpha.53",
-    "@nocobase/actions": "2.0.0-alpha.53",
-    "@nocobase/auth": "2.0.0-alpha.53",
-    "@nocobase/cache": "2.0.0-alpha.53",
-    "@nocobase/data-source-manager": "2.0.0-alpha.53",
-    "@nocobase/database": "2.0.0-alpha.53",
-    "@nocobase/evaluators": "2.0.0-alpha.53",
-    "@nocobase/lock-manager": "2.0.0-alpha.53",
-    "@nocobase/logger": "2.0.0-alpha.53",
-    "@nocobase/resourcer": "2.0.0-alpha.53",
-    "@nocobase/sdk": "2.0.0-alpha.53",
-    "@nocobase/snowflake-id": "2.0.0-alpha.53",
-    "@nocobase/telemetry": "2.0.0-alpha.53",
-    "@nocobase/utils": "2.0.0-alpha.53",
+    "@nocobase/acl": "2.0.0-alpha.55",
+    "@nocobase/actions": "2.0.0-alpha.55",
+    "@nocobase/auth": "2.0.0-alpha.55",
+    "@nocobase/cache": "2.0.0-alpha.55",
+    "@nocobase/data-source-manager": "2.0.0-alpha.55",
+    "@nocobase/database": "2.0.0-alpha.55",
+    "@nocobase/evaluators": "2.0.0-alpha.55",
+    "@nocobase/lock-manager": "2.0.0-alpha.55",
+    "@nocobase/logger": "2.0.0-alpha.55",
+    "@nocobase/resourcer": "2.0.0-alpha.55",
+    "@nocobase/sdk": "2.0.0-alpha.55",
+    "@nocobase/snowflake-id": "2.0.0-alpha.55",
+    "@nocobase/telemetry": "2.0.0-alpha.55",
+    "@nocobase/utils": "2.0.0-alpha.55",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -60,5 +60,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "ff30cf8261f5a97b3f24c3752af5bbc564167b37"
+  "gitHead": "7e65ad6b6e4e76a51f82c69b04b563fbcc7e1c25"
 }