@nocobase/server 2.2.0-beta.1 → 2.2.0-beta.11

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 appSsoIssuer?;
     appOptionsFactory: AppOptionsFactory;
     private environmentHeartbeatInterval;
     private environmentHeartbeatTimer;
@@ -81,6 +82,8 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     registerAppDbCreator(condition: Predicate<AppDbCreatorOptions>, creator: AppDbCreator, priority?: number): void;
     createDatabase(options: AppDbCreatorOptions): Promise<void>;
     setAppOptionsFactory(factory: AppOptionsFactory): void;
+    setAppSsoIssuer(issuer?: string): void;
+    getAppSsoIssuer(): string;
     bootstrapApp(appName: string): Promise<void>;
     initApp({ appName, options }: {
         appName: string;
@@ -108,6 +111,12 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     getAppLastSeenAt(appName: string): Promise<number>;
     addAppModel(appModel: AppModel): Promise<void>;
     getAppModel(appName: string): Promise<AppModel>;
+    listAppModels(): Promise<AppModel[]>;
+    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[]>>;
     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();
+  appSsoIssuer;
   appOptionsFactory = import_app_options_factory.appOptionsFactory;
   environmentHeartbeatInterval = 2 * 60 * 1e3;
   environmentHeartbeatTimer = null;
@@ -228,6 +229,13 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
   setAppOptionsFactory(factory) {
     this.appOptionsFactory = factory ?? import_app_options_factory.appOptionsFactory;
   }
+  setAppSsoIssuer(issuer) {
+    const normalized = String(issuer || "").trim().replace(/\/+$/, "");
+    this.appSsoIssuer = normalized || void 0;
+  }
+  getAppSsoIssuer() {
+    return this.appSsoIssuer;
+  }
   async bootstrapApp(appName) {
     return this.processAdapter.bootstrapApp(appName);
   }
@@ -421,6 +429,51 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
   async getAppModel(appName) {
     return this.discoveryAdapter.getAppModel(appName);
   }
+  async listAppModels() {
+    if (typeof this.discoveryAdapter.listAppModels !== "function") {
+      return [];
+    }
+    return this.discoveryAdapter.listAppModels();
+  }
+  async setAppManifestItem(appName, namespace, itemKey, item) {
+    if (typeof this.discoveryAdapter.setAppManifestItem !== "function") {
+      return;
+    }
+    return this.discoveryAdapter.setAppManifestItem(appName, namespace, itemKey, item);
+  }
+  async removeAppManifestItem(appName, namespace, itemKey) {
+    if (typeof this.discoveryAdapter.removeAppManifestItem !== "function") {
+      return;
+    }
+    return this.discoveryAdapter.removeAppManifestItem(appName, namespace, itemKey);
+  }
+  async removeAppManifest(appName, namespace) {
+    if (typeof this.discoveryAdapter.removeAppManifest !== "function") {
+      return;
+    }
+    return this.discoveryAdapter.removeAppManifest(appName, namespace);
+  }
+  async getAppManifestItems(appName, namespace) {
+    if (typeof this.discoveryAdapter.getAppManifestItems !== "function") {
+      return [];
+    }
+    return this.discoveryAdapter.getAppManifestItems(appName, namespace);
+  }
+  async getAppManifests(namespace, appNames) {
+    if (typeof this.discoveryAdapter.getAppManifests === "function") {
+      return this.discoveryAdapter.getAppManifests(namespace, appNames);
+    }
+    const result = {};
+    await Promise.all(
+      appNames.map(async (appName) => {
+        const manifest = await this.getAppManifestItems(appName, namespace);
+        if (manifest.length > 0) {
+          result[appName] = manifest;
+        }
+      })
+    );
+    return result;
+  }
   registerAppCondition(name, condition) {
     this.appConditions.set(name, condition);
   }

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

@@ -16,11 +16,18 @@ 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>;
@@ -37,4 +44,6 @@ 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,6 +39,7 @@ 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 });
@@ -78,6 +79,34 @@ const _MainOnlyAdapter = class _MainOnlyAdapter {
   getApps() {
     return Object.values(this.apps);
   }
+  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;
@@ -159,6 +188,19 @@ 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/lib/app-supervisor/types.d.ts

@@ -66,6 +66,7 @@ export type AppModel = {
     environments?: string[];
     options: AppModelOptions;
 };
+export type AppManifestValue = unknown;
 export type AppCondition = {
     filter?: Record<string, any>;
     match?: (appModel: AppModel) => boolean;
@@ -115,11 +116,17 @@ export interface AppDiscoveryAdapter {
     loadAppModels?(mainApp: Application): Promise<void>;
     getAppsStatuses?(appNames?: string[]): Promise<AppStatusesResult> | AppStatusesResult;
     getAppsByCondition?(conditionName: string, condition: AppCondition, options?: GetAppsByConditionOptions): Promise<string[]>;
+    listAppModels?(): Promise<AppModel[]>;
     addAppsToCondition?(conditionName: string, environmentName: string, appNames: string[]): Promise<void>;
     removeAppsFromCondition?(conditionName: string, environmentName: string, appNames: string[]): Promise<void>;
     addAppModel?(appModel: AppModel): Promise<void>;
     getAppModel?(appName: string): Promise<AppModel>;
     removeAppModel?(appName: string): Promise<void>;
+    setAppManifestItem?(appName: string, namespace: string, itemKey: string, item: AppManifestValue): Promise<void>;
+    removeAppManifestItem?(appName: string, namespace: string, itemKey: string): Promise<void>;
+    removeAppManifest?(appName: string, namespace: string): Promise<void>;
+    getAppManifestItems?<T = AppManifestValue>(appName: string, namespace: string): Promise<T[]>;
+    getAppManifests?<T = AppManifestValue>(namespace: string, appNames: string[]): Promise<Record<string, T[]>>;
     getAppNameByCName?(cname: string): Promise<string | null>;
     registerEnvironment?(environment: EnvironmentInfo): Promise<boolean>;
     unregisterEnvironment?(): Promise<void>;

package/lib/plugin-manager/deps.js

@@ -47,7 +47,7 @@ const deps = {
   koa: "3.x",
   "@koa/cors": "5.x",
   "@koa/router": "13.x",
-  multer: "1.x",
+  multer: "2.x",
   "@koa/multer": "3.x",
   "koa-bodyparser": "4.x",
   "koa-static": "5.x",

package/lib/plugin-manager/findPackageNames.js

@@ -62,6 +62,7 @@ async function trim(packageNames) {
 }
 __name(trim, "trim");
 const excludes = [
+  "external-db-data-source",
   "@nocobase/plugin-audit-logs",
   "@nocobase/plugin-backup-restore",
   "@nocobase/plugin-charts",

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

@@ -302,12 +302,19 @@ var resource_default = {
       if (!keys.length) {
         ctx.throw(400, "plugin name invalid");
       }
+      for (const key of keys) {
+        try {
+          (0, import_utils2.assertSafePluginPackageName)(key);
+        } catch (error) {
+          ctx.throw(400, "plugin name invalid");
+        }
+      }
       const awaitResponse = coerceAwaitResponse(awaitResponseRaw);
       const argv = ["pm", "enable", ...keys];
       if (awaitResponse) {
         await app.runAsCLI(argv, { from: "user", throwError: true });
       } else {
-        void app.runAsCLI(argv, { from: "user" }).catch((err) => {
+        app.runAsCLI(argv, { from: "user" }).catch((err) => {
           app.log.error(err);
         });
       }
@@ -326,7 +333,7 @@ var resource_default = {
       if (awaitResponse) {
         await app.runAsCLI(argv, { from: "user", throwError: true });
       } else {
-        void app.runAsCLI(argv, { from: "user" }).catch((err) => {
+        app.runAsCLI(argv, { from: "user" }).catch((err) => {
           app.log.error(err);
         });
       }
@@ -344,7 +351,7 @@ var resource_default = {
       await next();
     },
     async list(ctx, next) {
-      const { mode } = ctx.action.params;
+      const { mode, v2 } = ctx.action.params;
       if (mode === "summary") {
         ctx.body = await (0, import_utils2.pmListSummary)(ctx.app);
         return next();
@@ -352,7 +359,18 @@ var resource_default = {
       const locale = ctx.getCurrentLocale();
       const pm = ctx.app.pm;
       const plugin = pm.get("nocobase");
-      ctx.body = await plugin.getAllPlugins(locale);
+      const plugins = await plugin.getAllPlugins(locale);
+      ctx.body = plugins.filter((item) => {
+        var _a;
+        if (process.env.NOCOBASE_SHOW_DEPRECATED_PLUGINS === "true") {
+          return true;
+        }
+        if (!v2) {
+          return true;
+        }
+        const nocobaseConfig = ((_a = item == null ? void 0 : item.packageJson) == null ? void 0 : _a.nocobase) || {};
+        return nocobaseConfig.internal !== true && nocobaseConfig.deprecated !== true;
+      });
       await next();
     },
     async listEnabled(ctx, next) {

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

@@ -233,6 +233,7 @@ const _PluginManager = class _PluginManager {
     }
   }
   static async parseName(nameOrPkg) {
+    (0, import_utils2.assertSafePluginPackageName)(nameOrPkg);
     if (this.parsedNames[nameOrPkg]) {
       return this.parsedNames[nameOrPkg];
     }

package/lib/plugin.js

@@ -276,7 +276,7 @@ const _Plugin = class _Plugin {
       "fr-FR": "fr/"
     };
     if (packageName.startsWith("@nocobase/plugin-")) {
-      packageJson.homepage = `https://v2.docs.nocobase.com/${langMap[locale] || ""}plugins/${packageName}`;
+      packageJson.homepage = `https://docs.nocobase.com/${langMap[locale] || ""}plugins/${packageName}`;
     }
     const results = {
       ...this.options,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.2.0-beta.1",
+  "version": "2.2.0-beta.11",
   "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.1",
-    "@nocobase/actions": "2.2.0-beta.1",
-    "@nocobase/ai": "2.2.0-beta.1",
-    "@nocobase/auth": "2.2.0-beta.1",
-    "@nocobase/cache": "2.2.0-beta.1",
-    "@nocobase/data-source-manager": "2.2.0-beta.1",
-    "@nocobase/database": "2.2.0-beta.1",
-    "@nocobase/evaluators": "2.2.0-beta.1",
-    "@nocobase/lock-manager": "2.2.0-beta.1",
-    "@nocobase/logger": "2.2.0-beta.1",
-    "@nocobase/resourcer": "2.2.0-beta.1",
-    "@nocobase/sdk": "2.2.0-beta.1",
-    "@nocobase/snowflake-id": "2.2.0-beta.1",
-    "@nocobase/telemetry": "2.2.0-beta.1",
-    "@nocobase/utils": "2.2.0-beta.1",
+    "@nocobase/acl": "2.2.0-beta.11",
+    "@nocobase/actions": "2.2.0-beta.11",
+    "@nocobase/ai": "2.2.0-beta.11",
+    "@nocobase/auth": "2.2.0-beta.11",
+    "@nocobase/cache": "2.2.0-beta.11",
+    "@nocobase/data-source-manager": "2.2.0-beta.11",
+    "@nocobase/database": "2.2.0-beta.11",
+    "@nocobase/evaluators": "2.2.0-beta.11",
+    "@nocobase/lock-manager": "2.2.0-beta.11",
+    "@nocobase/logger": "2.2.0-beta.11",
+    "@nocobase/resourcer": "2.2.0-beta.11",
+    "@nocobase/sdk": "2.2.0-beta.11",
+    "@nocobase/snowflake-id": "2.2.0-beta.11",
+    "@nocobase/telemetry": "2.2.0-beta.11",
+    "@nocobase/utils": "2.2.0-beta.11",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -47,7 +47,7 @@
     "koa-send": "^5.0.1",
     "koa-static": "^5.0.0",
     "lodash": "^4.17.21",
-    "multer": "^1.4.5-lts.2",
+    "multer": "^2.1.1",
     "nanoid": "^3.3.11",
     "p-queue": "^6.6.2",
     "redis": "^5.10.0",
@@ -61,5 +61,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "f82fa9d0c3aa8e00e53dd94e404a312483b4866b"
+  "gitHead": "8dab25af2bb83a81da68158d0dcf836f96103d61"
 }