Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
feat: support server render html (#5471)
Kilu.He52e7fb49cd02
diff --git a/.github/workflows/deploy_test_web.yaml b/.github/workflows/deploy_test_web.yamlindex 49a96458f9..f7d3339d77 100644--- a/.github/workflows/deploy_test_web.yaml+++ b/.github/workflows/deploy_test_web.yaml@@ -62,7 +62,7 @@ jobs:with:SSH_PRIVATE_KEY: ${{ env.SSH_PRIVATE_KEY }}ARGS: "-rlgoDzvc -i"- SOURCE: "frontend/appflowy_web_app/dist frontend/appflowy_web_app/Dockerfile frontend/appflowy_web_app/nginx.conf frontend/appflowy_web_app/.env nginx-signed.crt nginx-signed.key"+ SOURCE: "frontend/appflowy_web_app/dist frontend/appflowy_web_app/server.cjs frontend/appflowy_web_app/start.sh frontend/appflowy_web_app/Dockerfile frontend/appflowy_web_app/nginx.conf frontend/appflowy_web_app/.env nginx-signed.crt nginx-signed.key"REMOTE_HOST: ${{ env.REMOTE_HOST }}REMOTE_USER: ${{ env.REMOTE_USER }}EXCLUDE: "frontend/appflowy_web_app/dist/, frontend/appflowy_web_app/node_modules/"diff --git a/frontend/appflowy_web_app/Dockerfile b/frontend/appflowy_web_app/Dockerfileindex e7094ffe14..97e3a85559 100644--- a/frontend/appflowy_web_app/Dockerfile+++ b/frontend/appflowy_web_app/Dockerfile@@ -1,8 +1,14 @@-FROM node:latest+FROM oven/bun:latest++WORKDIR /appRUN apt-get update && \apt-get install -y nginx+RUN bun install cheerio pino axios pino-pretty++COPY . .+RUN addgroup --system nginx && \adduser --system --no-create-home --disabled-login --ingroup nginx nginx@@ -18,6 +24,11 @@ COPY nginx-signed.key /etc/ssl/private/nginx-signed.keyRUN chown -R nginx:nginx /etc/ssl/certs/nginx-signed.crt /etc/ssl/private/nginx-signed.key+COPY start.sh /app/start.sh++RUN chmod +x /app/start.sh++EXPOSE 80 443-CMD ["nginx", "-g", "daemon off;"]+CMD ["/app/start.sh"]diff --git a/frontend/appflowy_web_app/index.html b/frontend/appflowy_web_app/index.htmlindex 3d8bc89cd6..a71f082fc3 100644--- a/frontend/appflowy_web_app/index.html+++ b/frontend/appflowy_web_app/index.html@@ -4,8 +4,28 @@<meta charset="UTF-8" /><link rel="icon" type="image/svg+xml" href="/appflowy.svg" /><meta name="viewport" content="width=device-width, initial-scale=1.0">-<title>AppFlowy</title>+ <meta name="description"+ content="AppFlowy is an AI collaborative workspace where you achieve more without losing control of your data"+ />+ <meta property="og:title" content="AppFlowy" />+ <meta property="og:description"+ content="AppFlowy is an AI collaborative workspace where you achieve more without losing control of your data"+ />+ <meta property="og:image"+ content="https://d3uafhn8yrvdfn.cloudfront.net/website/production/_next/static/media/og-image.e347bfb5.png"+ />+ <meta property="og:url" content="https://appflowy.com" />+ <meta name="twitter:card" content="summary_large_image" />+ <meta name="twitter:title" content="AppFlowy" />+ <meta name="twitter:description"+ content="AppFlowy is an AI collaborative workspace where you achieve more without losing control of your data"+ />+ <meta name="twitter:image"+ content="https://d3uafhn8yrvdfn.cloudfront.net/website/production/_next/static/media/og-image.e347bfb5.png"+ />+ <meta name="twitter:site" content="@appflowy" />+ <meta name="twitter:creator" content="@appflowy" /></head><body id="body"><div id="root"></div>diff --git a/frontend/appflowy_web_app/nginx.conf b/frontend/appflowy_web_app/nginx.confindex 56529cca1a..729255a778 100644--- a/frontend/appflowy_web_app/nginx.conf+++ b/frontend/appflowy_web_app/nginx.conf@@ -30,6 +30,10 @@ http {gzip_http_version 1.0;+ gzip_comp_level 5;++ gzip_vary on;+gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript application/javascript application/wasm;# Existing server block for HTTP@@ -61,15 +65,22 @@ http {ssl_prefer_server_ciphers on;location / {- root /usr/share/nginx/html;- index index.html index.htm;- try_files $uri $uri/ /index.html;+ proxy_pass http://localhost:3000;+ proxy_http_version 1.1;+ proxy_set_header Upgrade $http_upgrade;+ proxy_set_header Connection 'upgrade';+ proxy_set_header Host $host;+ proxy_cache_bypass $http_upgrade;}location /static/ {root /usr/share/nginx/html;expires 30d;access_log off;+ location ~* \.wasm$ {+ types { application/wasm wasm; }+ default_type application/wasm;+ }}location /appflowy.svg {diff --git a/frontend/appflowy_web_app/pnpm-lock.yaml b/frontend/appflowy_web_app/pnpm-lock.yamlindex b3e7c8496a..37a34b9470 100644--- a/frontend/appflowy_web_app/pnpm-lock.yaml+++ b/frontend/appflowy_web_app/pnpm-lock.yaml@@ -8862,7 +8862,7 @@ packages:resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}dependencies:- safe-buffer: 5.1.2+ safe-buffer: 5.2.1dev: true@@ -9604,6 +9604,10 @@ packages:resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}+ resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}+ dev: true+resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}engines: {node: '>= 0.4'}diff --git a/frontend/appflowy_web_app/server.cjs b/frontend/appflowy_web_app/server.cjsnew file mode 100644index 0000000000..e13c337faa--- /dev/null+++ b/frontend/appflowy_web_app/server.cjs@@ -0,0 +1,114 @@+const path = require('path');+const fs = require('fs');+const pino = require('pino');+const cheerio = require('cheerio');+const axios = require('axios');++const distDir = path.join(__dirname, 'dist');+const indexPath = path.join(distDir, 'index.html');++const setOrUpdateMetaTag = ($, selector, attribute, content) => {+ if ($(selector).length === 0) {+ $('head').append(`<meta ${attribute}="${selector.match(/\[(.*?)\]/)[1]}" content="${content}">`);+ } else {+ $(selector).attr('content', content);+ }+};+// Create a new logger instance+const logger = pino({+ transport: {+ target: 'pino-pretty',+ level: 'info',+ options: {+ colorize: true,+ translateTime: 'SYS:standard',+ destination: `${__dirname}/pino-logger.log`,+ },+ },+});++const logRequestTimer = (req) => {+ const start = Date.now();+ const pathname = new URL(req.url).pathname;+ logger.info(`Incoming request: ${pathname}`);+ return () => {+ const duration = Date.now() - start;+ logger.info(`Request for ${pathname} took ${duration}ms`);+ };+};++const fetchMetaData = async (url) => {+ try {+ const response = await axios.get(url);+ return response.data;+ } catch (error) {+ logger.error('Error fetching meta data', error);+ return null;+ }+};++const createServer = async (req) => {+ const timer = logRequestTimer(req);++ if (req.method === 'GET') {+ const pageId = req.url.split('/').pop();+ let htmlData = fs.readFileSync(indexPath, 'utf8');+ const $ = cheerio.load(htmlData);+ if (!pageId) {+ timer();+ return new Response($.html(), {+ headers: { 'Content-Type': 'text/html' },+ });+ }++ const description = 'Write, share, comment, react, and publish docs quickly and securely on AppFlowy.';+ let title = 'AppFlowy';+ const url = 'https://appflowy.com';+ let image = 'https://d3uafhn8yrvdfn.cloudfront.net/website/production/_next/static/media/og-image.e347bfb5.png';+ // Inject meta data into the HTML to support SEO and social sharing+ // if (metaData) {+ // title = metaData.title;+ // image = metaData.image;+ // }++ $('title').text(title);+ setOrUpdateMetaTag($, 'meta[name="description"]', 'name', description);+ setOrUpdateMetaTag($, 'meta[property="og:title"]', 'property', title);+ setOrUpdateMetaTag($, 'meta[property="og:description"]', 'property', description);+ setOrUpdateMetaTag($, 'meta[property="og:image"]', 'property', image);+ setOrUpdateMetaTag($, 'meta[property="og:url"]', 'property', url);+ setOrUpdateMetaTag($, 'meta[property="og:type"]', 'property', 'article');+ setOrUpdateMetaTag($, 'meta[name="twitter:card"]', 'name', 'summary_large_image');+ setOrUpdateMetaTag($, 'meta[name="twitter:title"]', 'name', title);+ setOrUpdateMetaTag($, 'meta[name="twitter:description"]', 'name', description);+ setOrUpdateMetaTag($, 'meta[name="twitter:image"]', 'name', image);++ timer();+ return new Response($.html(), {+ headers: { 'Content-Type': 'text/html' },+ });+ } else {+ timer();+ logger.error({ message: 'Method not allowed', method: req.method });+ return new Response('Method not allowed', { status: 405 });+ }+};++const start = () => {+ try {+ Bun.serve({+ port: 3000,+ fetch: createServer,+ error: (err) => {+ logger.error(`Internal Server Error: ${err}`);+ return new Response('Internal Server Error', { status: 500 });+ },+ });+ logger.info(`Server is running on port 3000`);+ } catch (err) {+ logger.error(err);+ process.exit(1);+ }+};++start();diff --git a/frontend/appflowy_web_app/src/components/editor/CollaborativeEditor.tsx b/frontend/appflowy_web_app/src/components/editor/CollaborativeEditor.tsxindex 8820296780..02a27f17ed 100644--- a/frontend/appflowy_web_app/src/components/editor/CollaborativeEditor.tsx+++ b/frontend/appflowy_web_app/src/components/editor/CollaborativeEditor.tsx@@ -30,6 +30,7 @@ function CollaborativeEditor({ doc }: { doc: Y.Doc }) {useEffect(() => {if (!editor) return;+editor.connect();setIsConnected(true);diff --git a/frontend/appflowy_web_app/start.sh b/frontend/appflowy_web_app/start.shnew file mode 100644index 0000000000..b4691baa1a--- /dev/null+++ b/frontend/appflowy_web_app/start.sh@@ -0,0 +1,10 @@+#!/bin/bash++# Start the frontend server+bun run server.cjs &++# Start the nginx server+service nginx start++tail -f /dev/null+