@nocobase/server 3.0.0-alpha.1 → 3.0.0-alpha.11

package/lib/event-queue.js

@@ -84,7 +84,9 @@ const _MemoryEventQueueAdapter = class _MemoryEventQueueAdapter {
       return;
     }
     const reading = this.reading.get(channel) || [];
-    const count = (event.concurrency || QUEUE_DEFAULT_CONCURRENCY) - reading.length;
+    const queue = this.queues.get(channel);
+    const concurrency = event.concurrency ?? QUEUE_DEFAULT_CONCURRENCY;
+    const count = concurrency <= 0 ? (queue == null ? void 0 : queue.length) || 0 : concurrency - reading.length;
     if (count <= 0) {
       return;
     }

package/lib/gateway/index.d.ts

@@ -89,6 +89,7 @@ export declare class Gateway extends EventEmitter {
     private resolveLegacyV2SettingsRedirect;
     private getPortalRootPublicPath;
     private getPortalAppPublicPath;
+    private resolvePortalRootEntryRedirect;
     private getPortalMatch;
     private isPortalIndexRequest;
     private getPortalDistRoot;

package/lib/gateway/index.js

@@ -358,10 +358,6 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
         from: "/admin/settings/mail/oauth2",
         to: "/admin/settings/mail/oauth2"
       },
-      {
-        from: "/admin/ai/knowledge-base/detail",
-        to: "/settings/ai/knowledge-base/detail"
-      },
       {
         from: "/admin/workflow/executions",
         to: "/settings/workflow/executions"
@@ -394,6 +390,22 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
     }
     return `${this.getPortalRootPublicPath()}apps/${(0, import_utils3.normalizePortalAppName)(appName)}/`;
   }
+  resolvePortalRootEntryRedirect(pathname) {
+    const portalRootPublicPath = this.getPortalRootPublicPath();
+    const v2PublicPath = this.getV2PublicPath();
+    if (v2PublicPath === portalRootPublicPath) {
+      return null;
+    }
+    if (pathname === portalRootPublicPath || pathname === portalRootPublicPath.slice(0, -1)) {
+      return v2PublicPath;
+    }
+    const portalAppsPublicPath = `${portalRootPublicPath}apps/`;
+    if (!pathname.startsWith(portalAppsPublicPath)) {
+      return null;
+    }
+    const match = /^([A-Za-z0-9_-]+)\/?$/.exec(pathname.slice(portalAppsPublicPath.length));
+    return match ? `${v2PublicPath}apps/${match[1]}/` : null;
+  }
   getPortalMatch(pathname) {
     const portalRootPublicPath = this.getPortalRootPublicPath();
     if (!pathname.startsWith(portalRootPublicPath)) {
@@ -580,6 +592,13 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
       res.end();
       return;
     }
+    const portalRootEntryRedirect = this.resolvePortalRootEntryRedirect(pathname);
+    if (portalRootEntryRedirect) {
+      res.statusCode = 302;
+      res.setHeader("Location", `${portalRootEntryRedirect}${search || ""}`);
+      res.end();
+      return;
+    }
     const supervisor = import_app_supervisor.AppSupervisor.getInstance();
     let handleApp = "main";
     try {
@@ -680,12 +699,6 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
             return;
           }
         }
-        if (!pathname.startsWith(portalMatch.publicPath)) {
-          res.statusCode = 302;
-          res.setHeader("Location", `${portalMatch.publicPath}${search || ""}`);
-          res.end();
-          return;
-        }
         const portalDistRoot = this.getPortalDistRoot(portalMatch);
         const portalIndex = (0, import_path.resolve)(portalDistRoot, "index.html");
         if (!import_fs.default.existsSync(portalIndex)) {
@@ -693,6 +706,12 @@ const _Gateway = class _Gateway extends import_events.EventEmitter {
           res.end();
           return;
         }
+        if (!pathname.startsWith(portalMatch.publicPath)) {
+          res.statusCode = 302;
+          res.setHeader("Location", `${portalMatch.publicPath}${search || ""}`);
+          res.end();
+          return;
+        }
         if (this.isPortalIndexRequest(pathname, portalMatch.publicPath)) {
           res.setHeader("Content-Type", "text/html; charset=utf-8");
           res.end(import_fs.default.readFileSync(portalIndex, "utf-8"));

package/lib/helper.js

@@ -112,7 +112,7 @@ function registerMiddlewares(app, options) {
   app.use(
     (0, import_cors.default)({
       credentials: isWhitelistedCorsOrigin,
-      exposeHeaders: ["content-disposition"],
+      exposeHeaders: ["content-disposition", "x-new-token"],
       origin: resolveCorsOrigin,
       ...options.cors
     }),
@@ -138,6 +138,7 @@ function registerMiddlewares(app, options) {
   }
   app.use(/* @__PURE__ */ __name(async function getBearerToken(ctx, next) {
     ctx.getBearerToken = () => {
+      var _a2;
       const authorization = ctx.get("Authorization");
       if (authorization) {
         ctx.state.pendingAuthTokenSource = "authorization";
@@ -147,7 +148,8 @@ function registerMiddlewares(app, options) {
         ctx.state.pendingAuthTokenSource = "query";
         return ctx.query.token;
       }
-      const cookieToken = ctx.cookies.get((0, import_utils.getAuthCookieName)("authToken", app.name));
+      const canUseAuthCookie = Boolean((_a2 = ctx.state) == null ? void 0 : _a2.fileAccess) && ["GET", "HEAD"].includes(ctx.method);
+      const cookieToken = canUseAuthCookie ? ctx.cookies.get((0, import_utils.getAuthCookieName)("authToken", app.name)) : void 0;
       ctx.state.pendingAuthTokenSource = cookieToken ? "cookie" : void 0;
       return cookieToken;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0-alpha.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": "3.0.0-alpha.1",
-    "@nocobase/actions": "3.0.0-alpha.1",
-    "@nocobase/ai": "3.0.0-alpha.1",
-    "@nocobase/auth": "3.0.0-alpha.1",
-    "@nocobase/cache": "3.0.0-alpha.1",
-    "@nocobase/data-source-manager": "3.0.0-alpha.1",
-    "@nocobase/database": "3.0.0-alpha.1",
-    "@nocobase/evaluators": "3.0.0-alpha.1",
-    "@nocobase/lock-manager": "3.0.0-alpha.1",
-    "@nocobase/logger": "3.0.0-alpha.1",
-    "@nocobase/resourcer": "3.0.0-alpha.1",
-    "@nocobase/sdk": "3.0.0-alpha.1",
-    "@nocobase/snowflake-id": "3.0.0-alpha.1",
-    "@nocobase/telemetry": "3.0.0-alpha.1",
-    "@nocobase/utils": "3.0.0-alpha.1",
+    "@nocobase/acl": "3.0.0-alpha.11",
+    "@nocobase/actions": "3.0.0-alpha.11",
+    "@nocobase/ai": "3.0.0-alpha.11",
+    "@nocobase/auth": "3.0.0-alpha.11",
+    "@nocobase/cache": "3.0.0-alpha.11",
+    "@nocobase/data-source-manager": "3.0.0-alpha.11",
+    "@nocobase/database": "3.0.0-alpha.11",
+    "@nocobase/evaluators": "3.0.0-alpha.11",
+    "@nocobase/lock-manager": "3.0.0-alpha.11",
+    "@nocobase/logger": "3.0.0-alpha.11",
+    "@nocobase/resourcer": "3.0.0-alpha.11",
+    "@nocobase/sdk": "3.0.0-alpha.11",
+    "@nocobase/snowflake-id": "3.0.0-alpha.11",
+    "@nocobase/telemetry": "3.0.0-alpha.11",
+    "@nocobase/utils": "3.0.0-alpha.11",
     "@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": "22d8be8ece179cfa5c8a4ebb2c896c92bd418e03"
+  "gitHead": "03574f3a2d10b1ed8469dc7405aa0c4696d6d1d1"
 }