@nocobase/server 2.2.0-beta.10 → 2.2.0-beta.12

package/lib/app-supervisor/index.d.ts

@@ -49,6 +49,7 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     private commandAdapterName;
     private appDbCreator;
     private appConditions;
+    private appManifests;
     private appSsoIssuer?;
     appOptionsFactory: AppOptionsFactory;
     private environmentHeartbeatInterval;
@@ -117,6 +118,8 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     removeAppManifest(appName: string, namespace: string): Promise<void>;
     getAppManifestItems<T = unknown>(appName: string, namespace: string): Promise<T[]>;
     getAppManifests<T = unknown>(namespace: string, appNames: string[]): Promise<Record<string, T[]>>;
+    private getAppManifestKey;
+    private getOrCreateAppManifest;
     registerAppCondition(name: string, condition: AppCondition): void;
     unregisterAppCondition(name: string): void;
     getAppCondition(name: string): AppCondition;

package/lib/app-supervisor/index.js

@@ -70,6 +70,7 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
   commandAdapterName;
   appDbCreator = new import_condition_registry.ConditionalRegistry();
   appConditions = /* @__PURE__ */ new Map();
+  appManifests = /* @__PURE__ */ new Map();
   appSsoIssuer;
   appOptionsFactory = import_app_options_factory.appOptionsFactory;
   environmentHeartbeatInterval = 2 * 60 * 1e3;
@@ -284,6 +285,7 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
     await this.processAdapter.removeAllApps();
     await ((_b = (_a = this.discoveryAdapter).dispose) == null ? void 0 : _b.call(_a));
     await ((_d = (_c = this.commandAdapter) == null ? void 0 : _c.dispose) == null ? void 0 : _d.call(_c));
+    this.appManifests.clear();
     if (this.environmentHeartbeatTimer) {
       this.environmentHeartbeatTimer = null;
     }
@@ -436,28 +438,31 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
     return this.discoveryAdapter.listAppModels();
   }
   async setAppManifestItem(appName, namespace, itemKey, item) {
-    if (typeof this.discoveryAdapter.setAppManifestItem !== "function") {
-      return;
+    if (typeof this.discoveryAdapter.setAppManifestItem === "function") {
+      return this.discoveryAdapter.setAppManifestItem(appName, namespace, itemKey, item);
     }
-    return this.discoveryAdapter.setAppManifestItem(appName, namespace, itemKey, item);
+    const manifest = this.getOrCreateAppManifest(appName, namespace);
+    manifest.set(itemKey, item);
   }
   async removeAppManifestItem(appName, namespace, itemKey) {
-    if (typeof this.discoveryAdapter.removeAppManifestItem !== "function") {
-      return;
+    var _a;
+    if (typeof this.discoveryAdapter.removeAppManifestItem === "function") {
+      return this.discoveryAdapter.removeAppManifestItem(appName, namespace, itemKey);
     }
-    return this.discoveryAdapter.removeAppManifestItem(appName, namespace, itemKey);
+    (_a = this.appManifests.get(this.getAppManifestKey(appName, namespace))) == null ? void 0 : _a.delete(itemKey);
   }
   async removeAppManifest(appName, namespace) {
-    if (typeof this.discoveryAdapter.removeAppManifest !== "function") {
-      return;
+    if (typeof this.discoveryAdapter.removeAppManifest === "function") {
+      return this.discoveryAdapter.removeAppManifest(appName, namespace);
     }
-    return this.discoveryAdapter.removeAppManifest(appName, namespace);
+    this.appManifests.delete(this.getAppManifestKey(appName, namespace));
   }
   async getAppManifestItems(appName, namespace) {
-    if (typeof this.discoveryAdapter.getAppManifestItems !== "function") {
-      return [];
+    var _a;
+    if (typeof this.discoveryAdapter.getAppManifestItems === "function") {
+      return this.discoveryAdapter.getAppManifestItems(appName, namespace);
     }
-    return this.discoveryAdapter.getAppManifestItems(appName, namespace);
+    return Array.from(((_a = this.appManifests.get(this.getAppManifestKey(appName, namespace))) == null ? void 0 : _a.values()) || []);
   }
   async getAppManifests(namespace, appNames) {
     if (typeof this.discoveryAdapter.getAppManifests === "function") {
@@ -474,6 +479,19 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
     );
     return result;
   }
+  getAppManifestKey(appName, namespace) {
+    return `${namespace}:${appName}`;
+  }
+  getOrCreateAppManifest(appName, namespace) {
+    const key = this.getAppManifestKey(appName, namespace);
+    const manifest = this.appManifests.get(key);
+    if (manifest) {
+      return manifest;
+    }
+    const nextManifest = /* @__PURE__ */ new Map();
+    this.appManifests.set(key, nextManifest);
+    return nextManifest;
+  }
   registerAppCondition(name, condition) {
     this.appConditions.set(name, condition);
   }

package/lib/app-supervisor/main-only-adapter.d.ts

@@ -16,18 +16,12 @@ export declare class MainOnlyAdapter implements AppDiscoveryAdapter, AppProcessA
     apps: Record<string, Application>;
     status: AppStatus;
     appErrors: Record<string, Error>;
-    private readonly appManifests;
     constructor(supervisor: AppSupervisor);
     getApp(appName: string, options?: GetAppOptions): Promise<Application<import("../application").DefaultState, import("../application").DefaultContext>>;
     bootstrapApp(appName: string): Promise<void>;
     addApp(app: Application): Application<import("../application").DefaultState, import("../application").DefaultContext>;
     getApps(): Application<import("../application").DefaultState, import("../application").DefaultContext>[];
     listAppModels(): Promise<any[]>;
-    setAppManifestItem(appName: string, namespace: string, itemKey: string, item: unknown): Promise<void>;
-    removeAppManifestItem(appName: string, namespace: string, itemKey: string): Promise<void>;
-    removeAppManifest(appName: string, namespace: string): Promise<void>;
-    getAppManifestItems<T = unknown>(appName: string, namespace: string): Promise<T[]>;
-    getAppManifests<T = unknown>(namespace: string, appNames: string[]): Promise<Record<string, T[]>>;
     hasApp(appName: string): boolean;
     startApp(appName: string): Promise<void>;
     stopApp(appName: string): Promise<void>;
@@ -44,6 +38,4 @@ export declare class MainOnlyAdapter implements AppDiscoveryAdapter, AppProcessA
     clearAppError(appName: string): void;
     setAppLastSeenAt(): void;
     getAppLastSeenAt(appName: string): any;
-    private getAppManifestKey;
-    private getOrCreateAppManifest;
 }

package/lib/app-supervisor/main-only-adapter.js

@@ -39,7 +39,6 @@ const _MainOnlyAdapter = class _MainOnlyAdapter {
   apps = {};
   status;
   appErrors = {};
-  appManifests = /* @__PURE__ */ new Map();
   async getApp(appName, options = {}) {
     if (appName !== "main") {
       this.supervisor.logger.warn(`only main app is supported`, { method: "getApp", appName });
@@ -82,31 +81,6 @@ const _MainOnlyAdapter = class _MainOnlyAdapter {
   async listAppModels() {
     return [];
   }
-  async setAppManifestItem(appName, namespace, itemKey, item) {
-    const manifest = this.getOrCreateAppManifest(appName, namespace);
-    manifest.set(itemKey, item);
-  }
-  async removeAppManifestItem(appName, namespace, itemKey) {
-    var _a;
-    (_a = this.appManifests.get(this.getAppManifestKey(appName, namespace))) == null ? void 0 : _a.delete(itemKey);
-  }
-  async removeAppManifest(appName, namespace) {
-    this.appManifests.delete(this.getAppManifestKey(appName, namespace));
-  }
-  async getAppManifestItems(appName, namespace) {
-    var _a;
-    return Array.from(((_a = this.appManifests.get(this.getAppManifestKey(appName, namespace))) == null ? void 0 : _a.values()) || []);
-  }
-  async getAppManifests(namespace, appNames) {
-    const result = {};
-    for (const appName of appNames) {
-      const data = await this.getAppManifestItems(appName, namespace);
-      if (data.length > 0) {
-        result[appName] = data;
-      }
-    }
-    return result;
-  }
   hasApp(appName) {
     if (appName !== "main") {
       return false;
@@ -188,19 +162,6 @@ const _MainOnlyAdapter = class _MainOnlyAdapter {
   getAppLastSeenAt(appName) {
     return null;
   }
-  getAppManifestKey(appName, namespace) {
-    return `${namespace}:${appName}`;
-  }
-  getOrCreateAppManifest(appName, namespace) {
-    const key = this.getAppManifestKey(appName, namespace);
-    const manifest = this.appManifests.get(key);
-    if (manifest) {
-      return manifest;
-    }
-    const nextManifest = /* @__PURE__ */ new Map();
-    this.appManifests.set(key, nextManifest);
-    return nextManifest;
-  }
 };
 __name(_MainOnlyAdapter, "MainOnlyAdapter");
 let MainOnlyAdapter = _MainOnlyAdapter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.2.0-beta.10",
+  "version": "2.2.0-beta.12",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -10,21 +10,21 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "2.2.0-beta.10",
-    "@nocobase/actions": "2.2.0-beta.10",
-    "@nocobase/ai": "2.2.0-beta.10",
-    "@nocobase/auth": "2.2.0-beta.10",
-    "@nocobase/cache": "2.2.0-beta.10",
-    "@nocobase/data-source-manager": "2.2.0-beta.10",
-    "@nocobase/database": "2.2.0-beta.10",
-    "@nocobase/evaluators": "2.2.0-beta.10",
-    "@nocobase/lock-manager": "2.2.0-beta.10",
-    "@nocobase/logger": "2.2.0-beta.10",
-    "@nocobase/resourcer": "2.2.0-beta.10",
-    "@nocobase/sdk": "2.2.0-beta.10",
-    "@nocobase/snowflake-id": "2.2.0-beta.10",
-    "@nocobase/telemetry": "2.2.0-beta.10",
-    "@nocobase/utils": "2.2.0-beta.10",
+    "@nocobase/acl": "2.2.0-beta.12",
+    "@nocobase/actions": "2.2.0-beta.12",
+    "@nocobase/ai": "2.2.0-beta.12",
+    "@nocobase/auth": "2.2.0-beta.12",
+    "@nocobase/cache": "2.2.0-beta.12",
+    "@nocobase/data-source-manager": "2.2.0-beta.12",
+    "@nocobase/database": "2.2.0-beta.12",
+    "@nocobase/evaluators": "2.2.0-beta.12",
+    "@nocobase/lock-manager": "2.2.0-beta.12",
+    "@nocobase/logger": "2.2.0-beta.12",
+    "@nocobase/resourcer": "2.2.0-beta.12",
+    "@nocobase/sdk": "2.2.0-beta.12",
+    "@nocobase/snowflake-id": "2.2.0-beta.12",
+    "@nocobase/telemetry": "2.2.0-beta.12",
+    "@nocobase/utils": "2.2.0-beta.12",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -61,5 +61,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "d572beec24de46df948f28db72b25303a63bf62d"
+  "gitHead": "ad8ed32d47eaec2dc56f15999934f720787d5070"
 }