@nocobase/server 2.1.0-beta.30 → 2.1.0-beta.33

package/lib/constants.d.ts

@@ -0,0 +1,9 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";

package/lib/constants.js

@@ -0,0 +1,36 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var constants_exports = {};
+__export(constants_exports, {
+  OFFICIAL_PLUGIN_PREFIX: () => OFFICIAL_PLUGIN_PREFIX
+});
+module.exports = __toCommonJS(constants_exports);
+const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  OFFICIAL_PLUGIN_PREFIX
+});

package/lib/gateway/index.js

@@ -66,6 +66,7 @@ var import_plugin_manager = require("../plugin-manager");
 var import_errors = require("./errors");
 var import_ipc_socket_client = require("./ipc-socket-client");
 var import_ipc_socket_server = require("./ipc-socket-server");
+var import_static_file_security = require("./static-file-security");
 var import_utils3 = require("./utils");
 var import_ws_server = require("./ws-server");
 var import_node_worker_threads = require("node:worker_threads");
@@ -286,6 +287,7 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
   getV2RuntimeConfig() {
     return {
       __nocobase_public_path__: this.getV2PublicPath(),
+      __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,
       __nocobase_api_client_storage_type__: import_node_process.default.env.API_CLIENT_STORAGE_TYPE,
@@ -357,6 +359,10 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
           return;
         }
       }
+      const headers = (0, import_static_file_security.getStorageUploadSecurityHeaders)(pathname);
+      for (const [key, value] of Object.entries(headers)) {
+        res.setHeader(key, value);
+      }
       req.url = req.url.substring(APP_PUBLIC_PATH.length + "storage".length);
       await compress(req, res);
       return (0, import_serve_handler.default)(req, res, {

package/lib/gateway/static-file-security.d.ts

@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare function hasActiveContentExtension(pathname?: string): boolean;
+export declare function getStorageUploadSecurityHeaders(pathname?: string): Record<string, string>;

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

@@ -0,0 +1,69 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var static_file_security_exports = {};
+__export(static_file_security_exports, {
+  getStorageUploadSecurityHeaders: () => getStorageUploadSecurityHeaders,
+  hasActiveContentExtension: () => hasActiveContentExtension
+});
+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"]);
+function stripQueryAndHash(pathname = "") {
+  return pathname.split("?")[0].split("#")[0];
+}
+__name(stripQueryAndHash, "stripQueryAndHash");
+function hasActiveContentExtension(pathname = "") {
+  const ext = import_node_path.default.extname(stripQueryAndHash(pathname)).toLowerCase();
+  return ACTIVE_CONTENT_EXTENSIONS.has(ext);
+}
+__name(hasActiveContentExtension, "hasActiveContentExtension");
+function getStorageUploadSecurityHeaders(pathname = "") {
+  const headers = {
+    "X-Content-Type-Options": "nosniff"
+  };
+  if (hasActiveContentExtension(pathname)) {
+    headers["Content-Disposition"] = "attachment";
+  }
+  return headers;
+}
+__name(getStorageUploadSecurityHeaders, "getStorageUploadSecurityHeaders");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getStorageUploadSecurityHeaders,
+  hasActiveContentExtension
+});

package/lib/index.d.ts

@@ -23,7 +23,8 @@ export * from './worker-id-allocator';
 export * from './worker-mode';
 export * from './redis-connection-manager';
 export * from './main-data-source';
-export declare const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
+export * from './constants';
+export type { LocaleSource, LocaleSourceText } from './locale';
 export { appendToBuiltInPlugins, findAllPlugins, findBuiltInPlugins, findLocalPlugins, packageNameTrim, } from './plugin-manager/findPackageNames';
 export { runPluginStaticImports } from './run-plugin-static-imports';
 export { createContextVariablesScope } from './helper';

package/lib/index.js

@@ -37,7 +37,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var src_exports = {};
 __export(src_exports, {
-  OFFICIAL_PLUGIN_PREFIX: () => OFFICIAL_PLUGIN_PREFIX,
   appendToBuiltInPlugins: () => import_findPackageNames.appendToBuiltInPlugins,
   createContextVariablesScope: () => import_helper.createContextVariablesScope,
   default: () => import_application.Application,
@@ -66,13 +65,12 @@ __reExport(src_exports, require("./worker-id-allocator"), module.exports);
 __reExport(src_exports, require("./worker-mode"), module.exports);
 __reExport(src_exports, require("./redis-connection-manager"), module.exports);
 __reExport(src_exports, require("./main-data-source"), module.exports);
+__reExport(src_exports, require("./constants"), module.exports);
 var import_findPackageNames = require("./plugin-manager/findPackageNames");
 var import_run_plugin_static_imports = require("./run-plugin-static-imports");
 var import_helper = require("./helper");
-const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  OFFICIAL_PLUGIN_PREFIX,
   appendToBuiltInPlugins,
   createContextVariablesScope,
   findAllPlugins,
@@ -95,5 +93,6 @@ const OFFICIAL_PLUGIN_PREFIX = "@nocobase/plugin-";
   ...require("./worker-id-allocator"),
   ...require("./worker-mode"),
   ...require("./redis-connection-manager"),
-  ...require("./main-data-source")
+  ...require("./main-data-source"),
+  ...require("./constants")
 });

package/lib/locale/locale.d.ts

@@ -15,6 +15,24 @@ export interface ResourceStorer {
     }>;
     reset?: () => Promise<void>;
 }
+export type LocaleSourceText = {
+    text: string;
+    module: string;
+};
+export type LocaleSource = {
+    title: string;
+    sync?: (ctx: any) => Promise<{
+        [module: string]: {
+            [text: string]: string;
+        };
+    }>;
+    namespace?: string;
+    collections?: {
+        collection: string;
+        fields?: string[];
+        getTexts?: (instance: any, options?: any) => LocaleSourceText[] | Promise<LocaleSourceText[]>;
+    }[];
+};
 export declare class Locale {
     app: Application;
     cache: Cache;
@@ -23,18 +41,24 @@ export declare class Locale {
     resourceCached: Map<any, any>;
     i18nInstances: Map<any, any>;
     resourceStorers: Registry<ResourceStorer>;
+    sources: Registry<LocaleSource>;
     constructor(app: Application);
     load(): Promise<void>;
     reset(): Promise<void>;
     reload(): Promise<void>;
     setLocaleFn(name: string, fn: (lang: string) => Promise<any>): void;
     registerResourceStorer(name: string, storer: ResourceStorer): void;
+    registerSource(name: string, source: LocaleSource): void;
+    syncSources(ctx: any, types: string[]): Promise<{
+        [module: string]: any;
+    }>;
     get(lang: string): Promise<{
         resources: any;
     }>;
     wrapCache(key: string, fn: () => any): Promise<any>;
     loadResourcesByLang(lang: string): Promise<void>;
     getCacheResources(lang: string): Promise<any>;
+    getBuiltInResources(lang: string): Promise<{}>;
     getResources(lang: string): Promise<{}>;
     getI18nInstance(lang: string): Promise<any>;
 }

package/lib/locale/locale.js

@@ -41,8 +41,8 @@ __export(locale_exports, {
 });
 module.exports = __toCommonJS(locale_exports);
 var import_utils = require("@nocobase/utils");
+var import_constants = require("../constants");
 var import_resource = require("./resource");
-var import__ = require("..");
 var import_deepmerge = __toESM(require("deepmerge"));
 const _Locale = class _Locale {
   app;
@@ -52,6 +52,7 @@ const _Locale = class _Locale {
   resourceCached = /* @__PURE__ */ new Map();
   i18nInstances = /* @__PURE__ */ new Map();
   resourceStorers = new import_utils.Registry();
+  sources = new import_utils.Registry();
   constructor(app) {
     this.app = app;
     this.app.on("afterLoad", async () => {
@@ -92,6 +93,25 @@ const _Locale = class _Locale {
   registerResourceStorer(name, storer) {
     this.resourceStorers.register(name, storer);
   }
+  registerSource(name, source) {
+    this.sources.register(name, source);
+  }
+  async syncSources(ctx, types) {
+    const resources = { client: {} };
+    const sources = Array.from(this.sources.getKeys());
+    const syncSources = sources.filter((source) => types.includes(source) && this.sources.get(source).sync);
+    const promises = syncSources.map((source) => this.sources.get(source).sync(ctx));
+    const results = await Promise.all(promises);
+    return results.reduce((result, resource) => {
+      Object.entries(resource).forEach(([module2, texts]) => {
+        result[module2] = {
+          ...result[module2] || {},
+          ...texts
+        };
+      });
+      return result;
+    }, resources);
+  }
   async get(lang) {
     const defaults = {
       resources: await this.getCacheResources(lang)
@@ -124,7 +144,7 @@ const _Locale = class _Locale {
     }
     return await this.wrapCache(`resources:${lang}`, () => this.getResources(lang));
   }
-  async getResources(lang) {
+  async getBuiltInResources(lang) {
     var _a;
     const resources = {};
     const names = this.app.pm.getPlugins().keys();
@@ -141,13 +161,17 @@ const _Locale = class _Locale {
         const res = await (0, import_resource.getResource)(packageName, lang);
         if (res) {
           resources[packageName] = { ...res };
-          if (packageName.includes(import__.OFFICIAL_PLUGIN_PREFIX)) {
-            resources[packageName.substring(import__.OFFICIAL_PLUGIN_PREFIX.length)] = { ...res };
+          if (packageName.includes(import_constants.OFFICIAL_PLUGIN_PREFIX)) {
+            resources[packageName.substring(import_constants.OFFICIAL_PLUGIN_PREFIX.length)] = { ...res };
           }
         }
       } catch (err) {
       }
     }
+    return resources;
+  }
+  async getResources(lang) {
+    const resources = await this.getBuiltInResources(lang);
     const storers = this.resourceStorers.getValues();
     for (const storer of storers) {
       const custom = await storer.getResources(lang);
@@ -156,7 +180,7 @@ const _Locale = class _Locale {
         const resource = resources[module2];
         const customResource = custom[key];
         resources[module2] = resource ? (0, import_deepmerge.default)(resource, customResource) : customResource;
-        const pkgName = `${import__.OFFICIAL_PLUGIN_PREFIX}${module2}`;
+        const pkgName = `${import_constants.OFFICIAL_PLUGIN_PREFIX}${module2}`;
         if (resources[pkgName]) {
           resources[pkgName] = { ...resources[module2] };
         }

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

@@ -135,12 +135,19 @@ async function listEnabledPlugins(ctx, lane = "client") {
     const url = await PackageUrls.get(item.packageName, lane);
     const { name, packageName, options } = item.toJSON();
     if (url) {
-      arr.push({
+      const entry = {
         name,
         packageName,
         options,
         url
-      });
+      };
+      if (lane === "client" && await PackageUrls.hasClientEntry(packageName, "client-v2")) {
+        const clientV2Url = await PackageUrls.get(packageName, "client-v2");
+        if (clientV2Url) {
+          entry.clientV2Url = clientV2Url;
+        }
+      }
+      arr.push(entry);
     }
   }
   return arr;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.1.0-beta.30",
+  "version": "2.1.0-beta.33",
   "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-beta.30",
-    "@nocobase/actions": "2.1.0-beta.30",
-    "@nocobase/ai": "2.1.0-beta.30",
-    "@nocobase/auth": "2.1.0-beta.30",
-    "@nocobase/cache": "2.1.0-beta.30",
-    "@nocobase/data-source-manager": "2.1.0-beta.30",
-    "@nocobase/database": "2.1.0-beta.30",
-    "@nocobase/evaluators": "2.1.0-beta.30",
-    "@nocobase/lock-manager": "2.1.0-beta.30",
-    "@nocobase/logger": "2.1.0-beta.30",
-    "@nocobase/resourcer": "2.1.0-beta.30",
-    "@nocobase/sdk": "2.1.0-beta.30",
-    "@nocobase/snowflake-id": "2.1.0-beta.30",
-    "@nocobase/telemetry": "2.1.0-beta.30",
-    "@nocobase/utils": "2.1.0-beta.30",
+    "@nocobase/acl": "2.1.0-beta.33",
+    "@nocobase/actions": "2.1.0-beta.33",
+    "@nocobase/ai": "2.1.0-beta.33",
+    "@nocobase/auth": "2.1.0-beta.33",
+    "@nocobase/cache": "2.1.0-beta.33",
+    "@nocobase/data-source-manager": "2.1.0-beta.33",
+    "@nocobase/database": "2.1.0-beta.33",
+    "@nocobase/evaluators": "2.1.0-beta.33",
+    "@nocobase/lock-manager": "2.1.0-beta.33",
+    "@nocobase/logger": "2.1.0-beta.33",
+    "@nocobase/resourcer": "2.1.0-beta.33",
+    "@nocobase/sdk": "2.1.0-beta.33",
+    "@nocobase/snowflake-id": "2.1.0-beta.33",
+    "@nocobase/telemetry": "2.1.0-beta.33",
+    "@nocobase/utils": "2.1.0-beta.33",
     "@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": "1a493069cd0d8a4f403668bfe592879678c894b2"
+  "gitHead": "4815c394e80a264fa8ed619246280923c47aeb72"
 }