fix(server): renderer path

toeverything · Sep 19, 2024 · 2b93bc2 · 2b93bc2
1 parent 6921c30
commit 2b93bc2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/.github/helm/affine/templates/ingress.yaml b/.github/helm/affine/templates/ingress.yaml
@@ -60,14 +60,7 @@ spec:
                 name: affine-graphql
                 port:
                   number: {{ .Values.graphql.service.port }}
-          - path: /workspace/([^/]+)/(home|all|search|collection|tag|trash)
-            pathType: ImplementationSpecific
-            backend:
-              service:
-                name: affine-web
-                port:
-                  number: {{ .Values.web.service.port }}
-          - path: /workspace/([^/]+)/.+
+          - path: /workspace/([^/]+)/([^/]+)$
             pathType: ImplementationSpecific
             backend:
               service:

diff --git a/packages/backend/server/src/core/doc-renderer/controller.ts b/packages/backend/server/src/core/doc-renderer/controller.ts
@@ -33,6 +33,16 @@ const defaultAssets: HtmlAssets = {
   description: '',
 };
 
+// TODO(@forehalo): reuse routes with frontend
+const staticPaths = new Set([
+  'all',
+  'home',
+  'search',
+  'collection',
+  'tag',
+  'trash',
+]);
+
 @Controller('/workspace')
 export class DocRendererController {
   private readonly logger = new Logger(DocRendererController.name);
@@ -84,14 +94,17 @@ export class DocRendererController {
         : this.webAssets;
 
     let opts: RenderOptions | null = null;
-    try {
-      opts =
-        workspaceId === docId
-          ? await this.getWorkspaceContent(workspaceId)
-          : await this.getPageContent(workspaceId, docId);
-      metrics.doc.counter('render').add(1);
-    } catch (e) {
-      this.logger.error('failed to render page', e);
+
+    if (!staticPaths.has(docId)) {
+      try {
+        opts =
+          workspaceId === docId
+            ? await this.getWorkspaceContent(workspaceId)
+            : await this.getPageContent(workspaceId, docId);
+        metrics.doc.counter('render').add(1);
+      } catch (e) {
+        this.logger.error('failed to render page', e);
+      }
     }
 
     res.setHeader('Content-Type', 'text/html');