chore(server): enable renderer for all deployment (#8283)
This commit is contained in:
15
.github/helm/affine/templates/ingress.yaml
vendored
15
.github/helm/affine/templates/ingress.yaml
vendored
@@ -60,15 +60,20 @@ spec:
|
|||||||
name: affine-graphql
|
name: affine-graphql
|
||||||
port:
|
port:
|
||||||
number: {{ .Values.graphql.service.port }}
|
number: {{ .Values.graphql.service.port }}
|
||||||
{{- if eq .Values.global.app.buildType "canary" }}
|
- path: /workspace/([^/]+)/(home|all|search|collection|tag|trash)
|
||||||
- path: /workspace
|
pathType: ImplementationSpecific
|
||||||
pathType: Prefix
|
backend:
|
||||||
|
service:
|
||||||
|
name: affine-web
|
||||||
|
port:
|
||||||
|
number: {{ .Values.web.service.port }}
|
||||||
|
- path: /workspace/([^/]+)/.+
|
||||||
|
pathType: ImplementationSpecific
|
||||||
backend:
|
backend:
|
||||||
service:
|
service:
|
||||||
name: affine-renderer
|
name: affine-renderer
|
||||||
port:
|
port:
|
||||||
number: {{ .Values.graphql.service.port }}
|
number: {{ .Values.renderer.service.port }}
|
||||||
{{- end }}
|
|
||||||
- path: /
|
- path: /
|
||||||
pathType: Prefix
|
pathType: Prefix
|
||||||
backend:
|
backend:
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ const defaultAssets: HtmlAssets = {
|
|||||||
description: '',
|
description: '',
|
||||||
};
|
};
|
||||||
|
|
||||||
@Controller('/workspace/:workspaceId/:docId')
|
@Controller('/workspace')
|
||||||
export class DocRendererController {
|
export class DocRendererController {
|
||||||
private readonly logger = new Logger(DocRendererController.name);
|
private readonly logger = new Logger(DocRendererController.name);
|
||||||
private readonly webAssets: HtmlAssets = defaultAssets;
|
private readonly webAssets: HtmlAssets = defaultAssets;
|
||||||
@@ -68,7 +68,7 @@ export class DocRendererController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Public()
|
@Public()
|
||||||
@Get()
|
@Get('/:workspaceId/:docId')
|
||||||
async render(
|
async render(
|
||||||
@Req() req: Request,
|
@Req() req: Request,
|
||||||
@Res() res: Response,
|
@Res() res: Response,
|
||||||
@@ -87,7 +87,7 @@ export class DocRendererController {
|
|||||||
try {
|
try {
|
||||||
opts =
|
opts =
|
||||||
workspaceId === docId
|
workspaceId === docId
|
||||||
? await this.renderWorkspace(workspaceId)
|
? await this.getWorkspaceContent(workspaceId)
|
||||||
: await this.getPageContent(workspaceId, docId);
|
: await this.getPageContent(workspaceId, docId);
|
||||||
metrics.doc.counter('render').add(1);
|
metrics.doc.counter('render').add(1);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
@@ -123,7 +123,7 @@ export class DocRendererController {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async renderWorkspace(
|
private async getWorkspaceContent(
|
||||||
workspaceId: string
|
workspaceId: string
|
||||||
): Promise<RenderOptions | null> {
|
): Promise<RenderOptions | null> {
|
||||||
const allowUrlPreview = await this.permission.allowUrlPreview(workspaceId);
|
const allowUrlPreview = await this.permission.allowUrlPreview(workspaceId);
|
||||||
|
|||||||
Reference in New Issue
Block a user