@nocobase/server 2.1.0-alpha.40 → 2.1.0-alpha.46

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

@@ -13,7 +13,7 @@ import { IncomingMessage, ServerResponse } from 'http';
 import { AsyncEmitter } from '@nocobase/utils';
 import { EventEmitter } from 'events';
 import Application, { ApplicationOptions } from '../application';
-import type { AppDiscoveryAdapter, AppProcessAdapter, AppStatus, EnvironmentInfo, GetAppOptions, ProcessCommand, AppDbCreator, AppOptionsFactory, AppDbCreatorOptions, AppCommandAdapter, AppModel, BootstrapLock } from './types';
+import type { AppDiscoveryAdapter, AppProcessAdapter, AppStatus, EnvironmentInfo, GetAppOptions, ProcessCommand, AppDbCreator, AppOptionsFactory, AppDbCreatorOptions, AppCommandAdapter, AppModel, BootstrapLock, AppCondition, GetAppsByConditionOptions } from './types';
 import { Predicate } from './condition-registry';
 import { PubSubManagerPublishOptions } from '../pub-sub-manager';
 import { Transaction, Transactionable } from '@nocobase/database';
@@ -48,6 +48,7 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     private processAdapterName;
     private commandAdapterName;
     private appDbCreator;
+    private appConditions;
     appOptionsFactory: AppOptionsFactory;
     private environmentHeartbeatInterval;
     private environmentHeartbeatTimer;
@@ -107,11 +108,15 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     getAppLastSeenAt(appName: string): Promise<number>;
     addAppModel(appModel: AppModel): Promise<void>;
     getAppModel(appName: string): Promise<AppModel>;
+    registerAppCondition(name: string, condition: AppCondition): void;
+    unregisterAppCondition(name: string): void;
+    getAppCondition(name: string): AppCondition;
+    getAppConditions(): [string, AppCondition][];
+    getAppsByCondition(conditionName: string, options?: GetAppsByConditionOptions): Promise<string[]>;
     removeAppModel(appName: string): Promise<void>;
     getAppNameByCName(cname: string): Promise<string>;
-    addAutoStartApps(environmentName: string, appNames: string[]): Promise<void>;
-    getAutoStartApps(): Promise<string[]>;
-    removeAutoStartApps(environmentName: string, appNames: string[]): Promise<void>;
+    addAppsToCondition(conditionName: string, environmentName: string, appNames: string[]): Promise<void>;
+    removeAppsFromCondition(conditionName: string, environmentName: string, appNames: string[]): Promise<void>;
     addApp(app: Application): Application<import("../application").DefaultState, import("../application").DefaultContext>;
     getApp(appName: string, options?: GetAppOptions): Promise<Application<import("../application").DefaultState, import("../application").DefaultContext>>;
     hasApp(appName: string): boolean;
@@ -134,6 +139,9 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     upgradeApp(appName: string, context?: {
         requestId: string;
     }): Promise<void>;
+    dispatchAppEvent(appName: string, event: string, payload?: any, context?: {
+        requestId: string;
+    }): Promise<void>;
     /**
      * @deprecated
      * use {#getApps} instead
@@ -157,5 +165,5 @@ export declare class AppSupervisor extends EventEmitter implements AsyncEmitter
     on(eventName: string | symbol, listener: (...args: any[]) => void): this;
     private bindAppEvents;
 }
-export type { AppDiscoveryAdapter, AppProcessAdapter, AppCommandAdapter, AppStatus, ProcessCommand, EnvironmentInfo, GetAppOptions, AppDbCreator, AppOptionsFactory, AppModel, AppModelOptions, BootstrapLock, } from './types';
+export type { AppDiscoveryAdapter, AppProcessAdapter, AppCommandAdapter, AppStatus, ProcessCommand, EnvironmentInfo, GetAppOptions, AppDbCreator, AppOptionsFactory, AppModel, AppModelOptions, AppCondition, GetAppsByConditionOptions, BootstrapLock, } from './types';
 export { MainOnlyAdapter } from './main-only-adapter';

package/lib/app-supervisor/index.js

@@ -69,6 +69,7 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
   processAdapterName;
   commandAdapterName;
   appDbCreator = new import_condition_registry.ConditionalRegistry();
+  appConditions = /* @__PURE__ */ new Map();
   appOptionsFactory = import_app_options_factory.appOptionsFactory;
   environmentHeartbeatInterval = 2 * 60 * 1e3;
   environmentHeartbeatTimer = null;
@@ -420,6 +421,28 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
   async getAppModel(appName) {
     return this.discoveryAdapter.getAppModel(appName);
   }
+  registerAppCondition(name, condition) {
+    this.appConditions.set(name, condition);
+  }
+  unregisterAppCondition(name) {
+    this.appConditions.delete(name);
+  }
+  getAppCondition(name) {
+    return this.appConditions.get(name);
+  }
+  getAppConditions() {
+    return Array.from(this.appConditions.entries());
+  }
+  async getAppsByCondition(conditionName, options = {}) {
+    const condition = this.getAppCondition(conditionName);
+    if (!condition || typeof this.discoveryAdapter.getAppsByCondition !== "function") {
+      return [];
+    }
+    return this.discoveryAdapter.getAppsByCondition(conditionName, condition, {
+      ...options,
+      environmentName: options.allEnvironments ? options.environmentName : options.environmentName ?? this.environmentName
+    });
+  }
   async removeAppModel(appName) {
     if (typeof this.discoveryAdapter.removeAppModel !== "function") {
       return;
@@ -432,23 +455,17 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
     }
     return this.discoveryAdapter.getAppNameByCName(cname);
   }
-  async addAutoStartApps(environmentName, appNames) {
-    if (typeof this.discoveryAdapter.addAutoStartApps !== "function") {
+  async addAppsToCondition(conditionName, environmentName, appNames) {
+    if (typeof this.discoveryAdapter.addAppsToCondition !== "function") {
       return;
     }
-    return this.discoveryAdapter.addAutoStartApps(environmentName, appNames);
-  }
-  async getAutoStartApps() {
-    if (typeof this.discoveryAdapter.getAutoStartApps === "function") {
-      return this.discoveryAdapter.getAutoStartApps(this.environmentName);
-    }
-    return [];
+    return this.discoveryAdapter.addAppsToCondition(conditionName, environmentName, appNames);
   }
-  async removeAutoStartApps(environmentName, appNames) {
-    if (typeof this.discoveryAdapter.addAutoStartApps !== "function") {
+  async removeAppsFromCondition(conditionName, environmentName, appNames) {
+    if (typeof this.discoveryAdapter.removeAppsFromCondition !== "function") {
       return;
     }
-    return this.discoveryAdapter.removeAutoStartApps(environmentName, appNames);
+    return this.discoveryAdapter.removeAppsFromCondition(conditionName, environmentName, appNames);
   }
   addApp(app) {
     this.processAdapter.addApp(app);
@@ -477,6 +494,10 @@ const _AppSupervisor = class _AppSupervisor extends import_events.EventEmitter {
   async upgradeApp(appName, context) {
     await this.processAdapter.upgradeApp(appName, context);
   }
+  async dispatchAppEvent(appName, event, payload, context) {
+    var _a, _b;
+    return (_b = (_a = this.processAdapter).dispatchAppEvent) == null ? void 0 : _b.call(_a, appName, event, payload, context);
+  }
   /**
    * @deprecated
    * use {#getApps} instead

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

@@ -26,6 +26,9 @@ export declare class MainOnlyAdapter implements AppDiscoveryAdapter, AppProcessA
     stopApp(appName: string): Promise<void>;
     removeApp(appName: string): Promise<void>;
     upgradeApp(appName: string): Promise<void>;
+    dispatchAppEvent(appName: string, event: string, payload?: any, _context?: {
+        requestId: string;
+    }): Promise<void>;
     removeAllApps(): Promise<void>;
     setAppStatus(appName: string, status: AppStatus, options?: {}): void;
     getAppStatus(appName: string, defaultStatus?: AppStatus): AppStatus;

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

@@ -124,6 +124,13 @@ const _MainOnlyAdapter = class _MainOnlyAdapter {
     }
     await this.apps[appName].runCommand("upgrade");
   }
+  async dispatchAppEvent(appName, event, payload, _context) {
+    const app = await this.getApp(appName, { withOutBootStrap: true });
+    if (!app) {
+      return;
+    }
+    await app.emitAsync(event, payload);
+  }
   async removeAllApps() {
     return this.removeApp("main");
   }

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

@@ -57,11 +57,23 @@ export type AppModelOptions = {
 };
 export type AppModel = {
     name: string;
+    title?: string;
+    icon?: string;
     cname?: string;
+    sort?: number;
+    pinned?: boolean;
     environment?: string;
     environments?: string[];
     options: AppModelOptions;
 };
+export type AppCondition = {
+    filter?: Record<string, any>;
+    match?: (appModel: AppModel) => boolean;
+};
+export type GetAppsByConditionOptions = {
+    environmentName?: string;
+    allEnvironments?: boolean;
+};
 export type ProcessCommand = {
     requestId: string;
     appName: string;
@@ -102,9 +114,9 @@ export interface AppDiscoveryAdapter {
     clearAppStatus?(appName: string): void | Promise<void>;
     loadAppModels?(mainApp: Application): Promise<void>;
     getAppsStatuses?(appNames?: string[]): Promise<AppStatusesResult> | AppStatusesResult;
-    addAutoStartApps?(environmentName: string, appName: string[]): Promise<void>;
-    getAutoStartApps?(environmentName: string): Promise<string[]>;
-    removeAutoStartApps?(environmentName: string, appNames: string[]): Promise<void>;
+    getAppsByCondition?(conditionName: string, condition: AppCondition, options?: GetAppsByConditionOptions): Promise<string[]>;
+    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>;
@@ -149,6 +161,9 @@ export interface AppProcessAdapter {
     upgradeApp?(appName: string, context?: {
         requestId: string;
     }): Promise<void>;
+    dispatchAppEvent?(appName: string, event: string, payload?: any, context?: {
+        requestId: string;
+    }): Promise<void>;
     removeAllApps?(): Promise<void>;
     setAppError?(appName: string, error: Error): void;
     hasAppError?(appName: string): boolean;

package/lib/gateway/index.js

@@ -287,6 +287,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   getV2RuntimeConfig() {
     return {
       __nocobase_public_path__: this.getV2PublicPath(),
+      __nocobase_modern_client_prefix__: (0, import_utils3.normalizeModernClientPrefix)(import_node_process.default.env.APP_MODERN_CLIENT_PREFIX),
       __webpack_public_path__: import_node_process.default.env.CDN_BASE_URL ? `${import_node_process.default.env.CDN_BASE_URL.replace(/\/+$/, "")}/` : "",
       __nocobase_api_base_url__: import_node_process.default.env.API_BASE_URL || import_node_process.default.env.API_BASE_PATH,
       __nocobase_api_client_storage_prefix__: import_node_process.default.env.API_CLIENT_STORAGE_PREFIX,
@@ -306,12 +307,12 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   }
   getV2AssetPublicPath() {
     if (import_node_process.default.env.CDN_BASE_URL) {
-      return `${import_node_process.default.env.CDN_BASE_URL.replace(/\/+$/, "")}/v2/`;
+      return `${import_node_process.default.env.CDN_BASE_URL.replace(/\/+$/, "")}/${import_utils3.MODERN_CLIENT_DIST_DIR}/`;
     }
     return this.getV2PublicPath();
   }
   getV2IndexTemplate() {
-    const file = `${import_node_process.default.env.APP_PACKAGE_ROOT}/dist/client/v2/index.html`;
+    const file = `${import_node_process.default.env.APP_PACKAGE_ROOT}/dist/client/${import_utils3.MODERN_CLIENT_DIST_DIR}/index.html`;
     if (!import_fs.default.existsSync(file)) {
       return null;
     }
@@ -409,6 +410,10 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
           }
         }
         req.url = req.url.substring(APP_PUBLIC_PATH.length - 1);
+        const modernPrefix = (0, import_utils3.normalizeModernClientPrefix)(import_node_process.default.env.APP_MODERN_CLIENT_PREFIX);
+        if (modernPrefix !== import_utils3.MODERN_CLIENT_DIST_DIR && req.url.startsWith(`/${modernPrefix}/`)) {
+          req.url = `/${import_utils3.MODERN_CLIENT_DIST_DIR}/${req.url.slice(modernPrefix.length + 2)}`;
+        }
         await compress(req, res);
         return (0, import_serve_handler.default)(req, res, {
           public: `${import_node_process.default.env.APP_PACKAGE_ROOT}/dist/client`

package/lib/gateway/static-file-security.js

@@ -42,7 +42,7 @@ __export(static_file_security_exports, {
 });
 module.exports = __toCommonJS(static_file_security_exports);
 var import_node_path = __toESM(require("node:path"));
-const ACTIVE_CONTENT_EXTENSIONS = /* @__PURE__ */ new Set([".htm", ".html", ".svg", ".svgz", ".xhtml"]);
+const ACTIVE_CONTENT_EXTENSIONS = /* @__PURE__ */ new Set([".htm", ".html", ".pdf", ".svg", ".svgz", ".xhtml"]);
 function stripQueryAndHash(pathname = "") {
   return pathname.split("?")[0].split("#")[0];
 }

package/lib/gateway/utils.d.ts

@@ -9,7 +9,9 @@
 /// <reference types="node" />
 import { IncomingMessage } from 'http';
 import { IncomingRequest } from '.';
+export declare const MODERN_CLIENT_DIST_DIR = "v";
 export declare function resolvePublicPath(appPublicPath?: string): string;
+export declare function normalizeModernClientPrefix(value?: string): string;
 export declare function resolveV2PublicPath(appPublicPath?: string): string;
 export declare function rewriteV2AssetPublicPath(html: string, assetPublicPath: string): string;
 export declare function injectRuntimeScript(html: string, runtimeScript: string): string;

package/lib/gateway/utils.js

@@ -27,23 +27,32 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
+  MODERN_CLIENT_DIST_DIR: () => MODERN_CLIENT_DIST_DIR,
   getHost: () => getHost,
   getHostname: () => getHostname,
   injectRuntimeScript: () => injectRuntimeScript,
+  normalizeModernClientPrefix: () => normalizeModernClientPrefix,
   resolvePublicPath: () => resolvePublicPath,
   resolveV2PublicPath: () => resolveV2PublicPath,
   rewriteV2AssetPublicPath: () => rewriteV2AssetPublicPath
 });
 module.exports = __toCommonJS(utils_exports);
+const MODERN_CLIENT_DIST_DIR = "v";
 function resolvePublicPath(appPublicPath = "/") {
   const normalized = String(appPublicPath || "/").trim() || "/";
   const withLeadingSlash = normalized.startsWith("/") ? normalized : `/${normalized}`;
   return withLeadingSlash.endsWith("/") ? withLeadingSlash : `${withLeadingSlash}/`;
 }
 __name(resolvePublicPath, "resolvePublicPath");
+function normalizeModernClientPrefix(value) {
+  const segment = String(value || "").trim().replace(/^\/+|\/+$/g, "");
+  return segment || MODERN_CLIENT_DIST_DIR;
+}
+__name(normalizeModernClientPrefix, "normalizeModernClientPrefix");
 function resolveV2PublicPath(appPublicPath = "/") {
   const publicPath = resolvePublicPath(appPublicPath);
-  return `${publicPath.replace(/\/$/, "")}/v2/`;
+  const prefix = normalizeModernClientPrefix(process.env.APP_MODERN_CLIENT_PREFIX);
+  return `${publicPath.replace(/\/$/, "")}/${prefix}/`;
 }
 __name(resolveV2PublicPath, "resolveV2PublicPath");
 function ensureTrailingSlash(value) {
@@ -52,10 +61,12 @@ function ensureTrailingSlash(value) {
 __name(ensureTrailingSlash, "ensureTrailingSlash");
 function rewriteV2AssetPublicPath(html, assetPublicPath) {
   const normalizedAssetPublicPath = ensureTrailingSlash(assetPublicPath);
-  if (normalizedAssetPublicPath === "/v2/") {
+  const sentinel = `/${MODERN_CLIENT_DIST_DIR}/`;
+  if (normalizedAssetPublicPath === sentinel) {
     return html;
   }
-  return html.replace(/((?:src|href)=["'])\/v2\//g, `$1${normalizedAssetPublicPath}`);
+  const sentinelPattern = new RegExp(`((?:src|href)=["'])${sentinel.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`, "g");
+  return html.replace(sentinelPattern, `$1${normalizedAssetPublicPath}`);
 }
 __name(rewriteV2AssetPublicPath, "rewriteV2AssetPublicPath");
 function injectRuntimeScript(html, runtimeScript) {
@@ -106,9 +117,11 @@ function getHostname(req) {
 __name(getHostname, "getHostname");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  MODERN_CLIENT_DIST_DIR,
   getHost,
   getHostname,
   injectRuntimeScript,
+  normalizeModernClientPrefix,
   resolvePublicPath,
   resolveV2PublicPath,
   rewriteV2AssetPublicPath

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.1.0-alpha.40",
+  "version": "2.1.0-alpha.46",
   "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.1.0-alpha.40",
-    "@nocobase/actions": "2.1.0-alpha.40",
-    "@nocobase/ai": "2.1.0-alpha.40",
-    "@nocobase/auth": "2.1.0-alpha.40",
-    "@nocobase/cache": "2.1.0-alpha.40",
-    "@nocobase/data-source-manager": "2.1.0-alpha.40",
-    "@nocobase/database": "2.1.0-alpha.40",
-    "@nocobase/evaluators": "2.1.0-alpha.40",
-    "@nocobase/lock-manager": "2.1.0-alpha.40",
-    "@nocobase/logger": "2.1.0-alpha.40",
-    "@nocobase/resourcer": "2.1.0-alpha.40",
-    "@nocobase/sdk": "2.1.0-alpha.40",
-    "@nocobase/snowflake-id": "2.1.0-alpha.40",
-    "@nocobase/telemetry": "2.1.0-alpha.40",
-    "@nocobase/utils": "2.1.0-alpha.40",
+    "@nocobase/acl": "2.1.0-alpha.46",
+    "@nocobase/actions": "2.1.0-alpha.46",
+    "@nocobase/ai": "2.1.0-alpha.46",
+    "@nocobase/auth": "2.1.0-alpha.46",
+    "@nocobase/cache": "2.1.0-alpha.46",
+    "@nocobase/data-source-manager": "2.1.0-alpha.46",
+    "@nocobase/database": "2.1.0-alpha.46",
+    "@nocobase/evaluators": "2.1.0-alpha.46",
+    "@nocobase/lock-manager": "2.1.0-alpha.46",
+    "@nocobase/logger": "2.1.0-alpha.46",
+    "@nocobase/resourcer": "2.1.0-alpha.46",
+    "@nocobase/sdk": "2.1.0-alpha.46",
+    "@nocobase/snowflake-id": "2.1.0-alpha.46",
+    "@nocobase/telemetry": "2.1.0-alpha.46",
+    "@nocobase/utils": "2.1.0-alpha.46",
     "@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": "e73f99dd0abefe847f2e50ff0fea1f41a82fd048"
+  "gitHead": "42b269944cdd1908d7a848c0af4936fe94c03bb7"
 }