refactor(flat-pages): extract invite code from clipboard (netless-io#2090)

hyrious · web-flow · commit e1d31fe16080 · 2023-11-21T16:12:07.000+08:00
diff --git a/desktop/renderer-app/package.json b/desktop/renderer-app/package.json
@@ -25,7 +25,6 @@
     "@netless/app-slide": "0.3.0-canary.20",
     "@netless/flat-i18n": "workspace:*",
     "@netless/flat-pages": "workspace:*",
-    "@netless/flat-stores": "workspace:*",
     "@netless/flat-server-api": "workspace:*",
     "@netless/flat-service-provider-agora-cloud-recording": "workspace:*",
     "@netless/flat-service-provider-agora-rtc-electron": "workspace:*",
@@ -36,8 +35,9 @@
     "@netless/flat-service-provider-file-preview-netless": "workspace:*",
     "@netless/flat-service-provider-file-preview-netless-slide": "workspace:*",
     "@netless/flat-services": "workspace:*",
+    "@netless/flat-stores": "workspace:*",
     "antd": "^4.23.2",
-    "axios": "^0.27.2",
+    "axios": "^1.6.2",
     "classnames": "^2.3.1",
     "date-fns": "^2.29.3",
     "dotenv-expand": "^9.0.0",
diff --git a/packages/flat-pages/package.json b/packages/flat-pages/package.json
@@ -18,7 +18,7 @@
     "@netless/sync-player": "^1.0.7",
     "@wopjs/dom": "^0.1.3",
     "antd": "^4.23.2",
-    "axios": "^0.27.2",
+    "axios": "^1.6.2",
     "classnames": "^2.3.1",
     "date-fns": "^2.29.3",
     "flat-components": "workspace:*",
diff --git a/packages/flat-pages/src/HomePage/MainRoomMenu/JoinRoomBox.tsx b/packages/flat-pages/src/HomePage/MainRoomMenu/JoinRoomBox.tsx
@@ -21,6 +21,8 @@ export interface JoinRoomBoxProps {
 const ROOM_UUID_RE =
     /(?:[A-Z]{2}-)?(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)/i;
 
+const INVITE_CODE_RE = /[0-9]{3,4} [0-9]{3} [0-9]{4}/;
+
 export const JoinRoomBox = observer<JoinRoomBoxProps>(function JoinRoomBox({ onJoinRoom }) {
     const t = useTranslate();
     const sp = useSafePromise();
@@ -152,7 +154,11 @@ export const JoinRoomBox = observer<JoinRoomBoxProps>(function JoinRoomBox({ onJ
     async function extractUUIDFromClipboard(): Promise<string | undefined> {
         const text = await navigator.clipboard.readText();
         const m = ROOM_UUID_RE.exec(text);
-        return m?.[0];
+        if (m) {
+            return m[0];
+        }
+        const m2 = INVITE_CODE_RE.exec(text);
+        return m2?.[0];
     }
 
     async function handleShowModal(): Promise<void> {
diff --git a/packages/flat-stores/src/utils/upload-task-manager/upload-task.ts b/packages/flat-stores/src/utils/upload-task-manager/upload-task.ts
@@ -1,6 +1,6 @@
 import { makeAutoObservable, observable } from "mobx";
 import { v4 as v4uuid } from "uuid";
-import Axios, { CancelTokenSource } from "axios";
+import Axios, { CancelTokenSource, AxiosProgressEvent } from "axios";
 import {
     uploadFinish,
     uploadStart,
@@ -117,8 +117,8 @@ export class UploadTask {
                 headers: {
                     "Content-Type": "multipart/form-data",
                 },
-                onUploadProgress: (e: ProgressEvent) => {
-                    this.updatePercent(Math.floor((100 * e.loaded) / e.total));
+                onUploadProgress: (e: AxiosProgressEvent) => {
+                    e.total && this.updatePercent(Math.floor((100 * e.loaded) / e.total));
                 },
                 cancelToken: this._cancelTokenSource.token,
             });
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/web/flat-web/package.json b/web/flat-web/package.json
