refactor(flat-server-api): choose server domain logic

netless-io · Aug 25, 2023 · 8524e5c · 8524e5c
1 parent d073b49
commit 8524e5c
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 20 deletions.
diff --git a/cspell.config.js b/cspell.config.js
@@ -125,6 +125,7 @@ module.exports = {
         "mpegurl", // hls.js
         "wopjs", // @wopjs/dom
         "xstate",
+        "mrmime",
 
         // less
         "isstring",

diff --git a/packages/flat-server-api/src/constants.ts b/packages/flat-server-api/src/constants.ts
@@ -1,3 +1,8 @@
+export const FLAT_REGION = process.env.FLAT_REGION;
+
+// { CN: '...', SG: '...' }
+export const SERVER_DOMAINS = process.env.FLAT_SERVER_DOMAINS as unknown as Record<string, string>;
+
 export const CURRENT_SERVER_DOMAIN = process.env.FLAT_SERVER_DOMAIN;
 
 export const FLAT_SERVER_BASE_URL = `https://${CURRENT_SERVER_DOMAIN}`;

diff --git a/packages/flat-server-api/src/utils.ts b/packages/flat-server-api/src/utils.ts
@@ -1,4 +1,11 @@
-import { FLAT_SERVER_BASE_URL_V1, FLAT_SERVER_BASE_URL_V2, Region, Status } from "./constants";
+import {
+    FLAT_REGION,
+    FLAT_SERVER_BASE_URL_V1,
+    FLAT_SERVER_BASE_URL_V2,
+    Region,
+    SERVER_DOMAINS,
+    Status,
+} from "./constants";
 import { ServerRequestError, RequestErrorCode } from "./error";
 import { v4 as uuidv4 } from "uuid";
 
@@ -26,7 +33,17 @@ export function setFlatAuthToken(token: string): void {
     localStorage.setItem("FlatAuthToken", token);
 }
 
-const defaultRegion = FLAT_SERVER_BASE_URL_V1.includes("-sg") ? Region.SG : Region.CN_HZ;
+function getDefaultRegion(): Region {
+    if (FLAT_REGION === "CN") {
+        return Region.CN_HZ;
+    }
+    if (FLAT_REGION === "SG") {
+        return Region.SG;
+    }
+    throw new Error("Unknown FLAT_REGION: " + FLAT_REGION);
+}
+
+const defaultRegion = getDefaultRegion();
 
 export function chooseServer(payload: any, enableFlatServerV2?: boolean): string {
     let server = enableFlatServerV2 ? FLAT_SERVER_BASE_URL_V2 : FLAT_SERVER_BASE_URL_V1;
@@ -44,28 +61,21 @@ export function chooseServer(payload: any, enableFlatServerV2?: boolean): string
             if ((uuid.length === 11 && uuid[0] === "2") || uuid.startsWith("SG-")) {
                 region = Region.SG;
             }
-            // Legacy room
-            if (uuid.length === 10) {
-                region = Region.CN_HZ;
-            }
         }
     }
     if (region === defaultRegion) {
         return server;
     }
 
-    // replace the left most part of domain, currently we have "{api}" for cn-hz, "{api}-sg" for sg
-    server = server.replace(/^https:\/\/([-\w]+)/, (_, name: string) => {
-        // normalize
-        if (name.endsWith("-sg")) {
-            name = name.slice(0, -3);
-        }
-        // add suffix if needed
-        if (region === Region.SG) {
-            name += "-sg";
-        }
-        return `https://${name}`;
-    });
+    // replace server domain with another region's
+    server = `https://${SERVER_DOMAINS[region.slice(0, 2).toUpperCase()]}/${
+        enableFlatServerV2 ? "v2" : "v1"
+    }`;
+
+    if (server.includes("undefined")) {
+        console.log("server domains:", SERVER_DOMAINS);
+        throw new Error(`Failed to choose server for region: ${region}`);
+    }
 
     return server;
 }

diff --git a/packages/flat-vite-plugins/dotenv.js b/packages/flat-vite-plugins/dotenv.js
@@ -39,6 +39,9 @@ exports.dotenv = function dotenv(envDir) {
                 define["process.env.FLAT_REGION"] = JSON.stringify(configRegion());
             }
 
+            define["process.env.FLAT_SERVER_DOMAINS"] = JSON.stringify(
+                getServerDomains(envDir, mode),
+            );
             define["process.env.VERSION"] = JSON.stringify(version);
 
             config.define = { ...config.define, ...define };
@@ -60,3 +63,21 @@ const getEnvConfigContent = (envDir, mode) => {
 
     return null;
 };
+
+/**
+ * @param {string} envDir e.g. "path/to/flat/config/CN"
+ * @param {'development' | 'production'} mode
+ * @returns {{CN: string, US: string}}
+ */
+const getServerDomains = (envDir, mode) => {
+    const configDir = path.dirname(envDir);
+    const regions = fs.readdirSync(configDir); // should be ['CN', 'SG']
+    const result = {};
+    for (const region of regions) {
+        const content = getEnvConfigContent(path.join(configDir, region), mode);
+        if (content) {
+            result[region] = dotenvReal.parse(content).FLAT_SERVER_DOMAIN;
+        }
+    }
+    return result;
+};
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/web/flat-web/package.json b/web/flat-web/package.json
@@ -70,6 +70,7 @@
     "dotenv": "^16.0.2",
     "dotenv-expand": "^9.0.0",
     "eslint-loader": "^4.0.2",
+    "mrmime": "^1.0.1",
     "vite-plugin-compression": "^0.5.1"
   }
 }
diff --git a/web/flat-web/scripts/vite-plugin-inline-assets.ts b/web/flat-web/scripts/vite-plugin-inline-assets.ts
@@ -1,6 +1,6 @@
 import type { Plugin } from "vite";
 import { promises as fsp } from "fs";
-import mime from "mime/lite";
+import { lookup } from "mrmime";
 import svgToTinyDataUri from "@netless/mini-svg-data-uri";
 
 // e.g:
@@ -17,7 +17,7 @@ export function inlineAssets(): Plugin {
                 const content = await fsp.readFile(id);
                 const url = id.endsWith(".svg")
                     ? svgToTinyDataUri(content.toString("utf-8"), "utf8")
-                    : `data:${mime.getType(id)};base64,${content.toString("base64")}`;
+                    : `data:${lookup(id)};base64,${content.toString("base64")}`;
                 return `export default ${JSON.stringify(url)};`;
             }
             return null;