@nocobase/server 1.0.0-alpha.11 → 1.0.0-alpha.13

package/lib/app-supervisor.d.ts

@@ -25,6 +25,7 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     apps: {
         [appName: string]: Application;
     };
+    lastSeenAt: Map<string, number>;
     appErrors: {
         [appName: string]: Error;
     };
@@ -57,6 +58,7 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     getAppStatus(appName: string, defaultStatus?: AppStatus): AppStatus | null;
     bootMainApp(options: ApplicationOptions): Application<import("./application").DefaultState, import("./application").DefaultContext>;
     hasApp(appName: string): boolean;
+    touchApp(appName: string): void;
     addApp(app: Application): Application<import("./application").DefaultState, import("./application").DefaultContext>;
     getAppsNames(): Promise<string[]>;
     removeApp(appName: string): Promise<void>;

package/lib/app-supervisor.js

@@ -54,6 +54,7 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
   runningMode = "multiple";
   singleAppName = null;
   apps = {};
+  lastSeenAt = /* @__PURE__ */ new Map();
   appErrors = {};
   appStatus = {};
   lastMaintainingMessage = {};
@@ -156,6 +157,12 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
   hasApp(appName) {
     return !!this.apps[appName];
   }
+  touchApp(appName) {
+    if (!this.hasApp(appName)) {
+      return;
+    }
+    this.lastSeenAt.set(appName, Math.floor(Date.now() / 1e3));
+  }
   // add app into supervisor
   addApp(app) {
     if (this.apps[app.name]) {
@@ -203,6 +210,7 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
       delete this.appErrors[app.name];
       delete this.lastMaintainingMessage[app.name];
       delete this.statusBeforeCommanding[app.name];
+      this.lastSeenAt.delete(app.name);
     });
     app.on("maintainingMessageChanged", ({ message, maintainingStatus }) => {
       if (this.lastMaintainingMessage[app.name] === message) {

package/lib/application.js

@@ -69,6 +69,7 @@ var import_data_source_manager = require("@nocobase/data-source-manager");
 var import_package = __toESM(require("../package.json"));
 var import_main_data_source = require("./main-data-source");
 var import_validate_filter_params = __toESM(require("./middlewares/validate-filter-params"));
+var import_path2 = __toESM(require("path"));
 const _Application = class _Application extends import_koa.default {
   constructor(options) {
     super();
@@ -702,7 +703,7 @@ const _Application = class _Application extends import_koa.default {
     const { dirname } = options;
     return (0, import_logger.createLogger)({
       ...options,
-      dirname: (0, import_logger.getLoggerFilePath)(this.name || "main", dirname || "")
+      dirname: (0, import_logger.getLoggerFilePath)(import_path2.default.join(this.name || "main", dirname || ""))
     });
   }
   createCLI() {

package/lib/gateway/index.js

@@ -240,6 +240,9 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
       res.end("ok");
       return;
     }
+    if (handleApp !== "main") {
+      import_app_supervisor.AppSupervisor.getInstance().touchApp(handleApp);
+    }
     app.callback()(req, res);
   }
   getAppSelectorMiddlewares() {

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

@@ -820,20 +820,18 @@ const _PluginManager = class _PluginManager {
       if (!await this.app.isStarted()) {
         this.app.log.debug("app upgrading");
         await this.app.runCommand("upgrade");
-        await (0, import_execa.default)("yarn", ["nocobase", "refresh"], {
+        await (0, import_helper.tsxRerunning)();
+        await (0, import_execa.default)("yarn", ["nocobase", "pm2-restart"], {
           env: process.env
         });
         return;
       }
       const file = (0, import_path.resolve)(process.cwd(), "storage/app-upgrading");
       await import_fs.default.promises.writeFile(file, "", "utf-8");
-      if (process.env.IS_DEV_CMD) {
-        await (0, import_helper.tsxRerunning)();
-      } else {
-        await (0, import_execa.default)("yarn", ["nocobase", "pm2-restart"], {
-          env: process.env
-        });
-      }
+      await (0, import_helper.tsxRerunning)();
+      await (0, import_execa.default)("yarn", ["nocobase", "pm2-restart"], {
+        env: process.env
+      });
     }, "upgrade");
     if (Array.isArray(nameOrPkg)) {
       for (const name of nameOrPkg) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "1.0.0-alpha.11",
+    "version": "1.0.0-alpha.13",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "AGPL-3.0",
@@ -10,18 +10,18 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "1.0.0-alpha.11",
-        "@nocobase/actions": "1.0.0-alpha.11",
-        "@nocobase/auth": "1.0.0-alpha.11",
-        "@nocobase/cache": "1.0.0-alpha.11",
-        "@nocobase/data-source-manager": "1.0.0-alpha.11",
-        "@nocobase/database": "1.0.0-alpha.11",
-        "@nocobase/evaluators": "1.0.0-alpha.11",
-        "@nocobase/logger": "1.0.0-alpha.11",
-        "@nocobase/resourcer": "1.0.0-alpha.11",
-        "@nocobase/sdk": "1.0.0-alpha.11",
-        "@nocobase/telemetry": "1.0.0-alpha.11",
-        "@nocobase/utils": "1.0.0-alpha.11",
+        "@nocobase/acl": "1.0.0-alpha.13",
+        "@nocobase/actions": "1.0.0-alpha.13",
+        "@nocobase/auth": "1.0.0-alpha.13",
+        "@nocobase/cache": "1.0.0-alpha.13",
+        "@nocobase/data-source-manager": "1.0.0-alpha.13",
+        "@nocobase/database": "1.0.0-alpha.13",
+        "@nocobase/evaluators": "1.0.0-alpha.13",
+        "@nocobase/logger": "1.0.0-alpha.13",
+        "@nocobase/resourcer": "1.0.0-alpha.13",
+        "@nocobase/sdk": "1.0.0-alpha.13",
+        "@nocobase/telemetry": "1.0.0-alpha.13",
+        "@nocobase/utils": "1.0.0-alpha.13",
         "@types/decompress": "4.2.4",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",
@@ -54,5 +54,5 @@
         "@types/serve-handler": "^6.1.1",
         "@types/ws": "^8.5.5"
     },
-    "gitHead": "00ffb260456e5a22701fd16c87112a92708d9dc1"
+    "gitHead": "bd97adef70762a6691b5b58ca6572672a8cdf838"
 }