@nocobase/server 1.7.0-beta.7 → 1.7.0-beta.9

package/lib/app-supervisor.js

@@ -245,7 +245,7 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
         this.setAppStatus(app.name, "running");
       }
     });
-    app.on("afterStop", async () => {
+    app.on("__stopped", async () => {
       this.setAppStatus(app.name, "stopped");
     });
     app.on("maintaining", (maintainingStatus) => {

package/lib/application.js

@@ -365,6 +365,8 @@ const _Application = class _Application extends import_koa.default {
       return;
     }
     this.log.info("app reinitializing");
+    await this.emitAsync("beforeStop");
+    await this.emitAsync("afterStop");
     if (this.cacheManager) {
       await this.cacheManager.close();
     }
@@ -677,6 +679,7 @@ const _Application = class _Application extends import_koa.default {
       await this.telemetry.shutdown();
     }
     await this.emitAsync("afterStop", this, options);
+    this.emit("__stopped", this, options);
     this.stopped = true;
     log.info(`app has stopped`, { method: "stop" });
     this._started = null;

package/lib/middlewares/parse-variables.js

@@ -82,7 +82,7 @@ async function parseVariables(ctx, next) {
       // 新的命名方式，防止和 formily 内置变量冲突
       $nDate: (0, import_utils.getDateVars)(),
       $user: getUser(ctx),
-      $nRole: ctx.state.currentRole
+      $nRole: ctx.state.currentRole === "__union__" ? ctx.state.currentRoles : ctx.state.currentRole
     }
   });
   await next();

package/lib/run-plugin-static-imports.js

@@ -30,17 +30,21 @@ __export(run_plugin_static_imports_exports, {
   runPluginStaticImports: () => runPluginStaticImports
 });
 module.exports = __toCommonJS(run_plugin_static_imports_exports);
+var import_logger = require("@nocobase/logger");
 var import_server = require("@nocobase/server");
+var import_utils = require("@nocobase/utils");
 async function runPluginStaticImports() {
   const packages = await (0, import_server.findAllPlugins)();
   for (const name of packages) {
     const { packageName } = await import_server.PluginManager.parseName(name);
     try {
-      const plugin = require(packageName);
+      const plugin = await (0, import_utils.importModule)(packageName);
       if (plugin && plugin.staticImport) {
+        import_logger.logger.info("run static import", { packageName });
         await plugin.staticImport();
       }
     } catch (error) {
+      import_logger.logger.error(error, { packageName });
       continue;
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "1.7.0-beta.7",
+  "version": "1.7.0-beta.9",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,19 +10,19 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.0.2",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "1.7.0-beta.7",
-    "@nocobase/actions": "1.7.0-beta.7",
-    "@nocobase/auth": "1.7.0-beta.7",
-    "@nocobase/cache": "1.7.0-beta.7",
-    "@nocobase/data-source-manager": "1.7.0-beta.7",
-    "@nocobase/database": "1.7.0-beta.7",
-    "@nocobase/evaluators": "1.7.0-beta.7",
-    "@nocobase/lock-manager": "1.7.0-beta.7",
-    "@nocobase/logger": "1.7.0-beta.7",
-    "@nocobase/resourcer": "1.7.0-beta.7",
-    "@nocobase/sdk": "1.7.0-beta.7",
-    "@nocobase/telemetry": "1.7.0-beta.7",
-    "@nocobase/utils": "1.7.0-beta.7",
+    "@nocobase/acl": "1.7.0-beta.9",
+    "@nocobase/actions": "1.7.0-beta.9",
+    "@nocobase/auth": "1.7.0-beta.9",
+    "@nocobase/cache": "1.7.0-beta.9",
+    "@nocobase/data-source-manager": "1.7.0-beta.9",
+    "@nocobase/database": "1.7.0-beta.9",
+    "@nocobase/evaluators": "1.7.0-beta.9",
+    "@nocobase/lock-manager": "1.7.0-beta.9",
+    "@nocobase/logger": "1.7.0-beta.9",
+    "@nocobase/resourcer": "1.7.0-beta.9",
+    "@nocobase/sdk": "1.7.0-beta.9",
+    "@nocobase/telemetry": "1.7.0-beta.9",
+    "@nocobase/utils": "1.7.0-beta.9",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -56,5 +56,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "cd4ee4a58c0dc80418a71b3bba3b56552b85526f"
+  "gitHead": "7013a5080f3695d7750ab21005c90d2172c16480"
 }