chore(server): enable renderer for all deployment

toeverything · Sep 18, 2024 · dbb3c0d · dbb3c0d
1 parent fab23d2
commit dbb3c0d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/.github/helm/affine/templates/ingress.yaml b/.github/helm/affine/templates/ingress.yaml
@@ -60,15 +60,20 @@ spec:
                 name: affine-graphql
                 port:
                   number: {{ .Values.graphql.service.port }}
-          {{- if eq .Values.global.app.buildType "canary" }}
-          - path: /workspace
+          - path: /workspace/([^/]+)/(home|all|search|collection|tag|trash)
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: affine-web
+                port:
+                  number: {{ .Values.web.service.port }}
+          - path: /workspace/([^/]+)/.+
             pathType: Prefix
             backend:
               service:
                 name: affine-renderer
                 port:
-                  number: {{ .Values.graphql.service.port }}
-          {{- end }}
+                  number: {{ .Values.renderer.service.port }}
           - path: /
             pathType: Prefix
             backend:

diff --git a/packages/backend/server/src/core/doc-renderer/controller.ts b/packages/backend/server/src/core/doc-renderer/controller.ts
@@ -33,7 +33,7 @@ const defaultAssets: HtmlAssets = {
   description: '',
 };
 
-@Controller('/workspace/:workspaceId/:docId')
+@Controller('/workspace')
 export class DocRendererController {
   private readonly logger = new Logger(DocRendererController.name);
   private readonly webAssets: HtmlAssets = defaultAssets;
@@ -68,7 +68,7 @@ export class DocRendererController {
   }
 
   @Public()
-  @Get()
+  @Get('/:workspaceId/:docId')
   async render(
     @Req() req: Request,
     @Res() res: Response,
@@ -87,7 +87,7 @@ export class DocRendererController {
     try {
       opts =
         workspaceId === docId
-          ? await this.renderWorkspace(workspaceId)
+          ? await this.getWorkspaceContent(workspaceId)
           : await this.getPageContent(workspaceId, docId);
       metrics.doc.counter('render').add(1);
     } catch (e) {
@@ -123,7 +123,7 @@ export class DocRendererController {
     return null;
   }
 
-  private async renderWorkspace(
+  private async getWorkspaceContent(
     workspaceId: string
   ): Promise<RenderOptions | null> {
     const allowUrlPreview = await this.permission.allowUrlPreview(workspaceId);