feat(service-providers): add RTM 2.0 (#2126)

netless-io · Jun 24, 2024 · 99d8f12 · 99d8f12
1 parent 2ed815a
commit 99d8f12
Show file tree

Hide file tree

Showing 13 changed files with 641 additions and 16 deletions.
diff --git a/desktop/renderer-app/package.json b/desktop/renderer-app/package.json
@@ -29,6 +29,7 @@
     "@netless/flat-service-provider-agora-cloud-recording": "workspace:*",
     "@netless/flat-service-provider-agora-rtc-electron": "workspace:*",
     "@netless/flat-service-provider-agora-rtm": "workspace:*",
+    "@netless/flat-service-provider-agora-rtm2": "workspace:*",
     "@netless/flat-service-provider-fastboard": "workspace:*",
     "@netless/flat-service-provider-file-convert-h5": "workspace:*",
     "@netless/flat-service-provider-file-convert-netless": "workspace:*",

diff --git a/desktop/renderer-app/src/tasks/init-flat-services.ts b/desktop/renderer-app/src/tasks/init-flat-services.ts
@@ -119,8 +119,8 @@ export function initFlatServices(): void {
     });
 
     flatServices.register("textChat", async () => {
-        const { AgoraRTM } = await import("@netless/flat-service-provider-agora-rtm");
-        return new AgoraRTM(config.agora.appId);
+        const { AgoraRTM2 } = await import("@netless/flat-service-provider-agora-rtm2");
+        return new AgoraRTM2(config.agora.appId);
     });
 
     flatServices.register("whiteboard", async () => {

diff --git a/packages/flat-pages/package.json b/packages/flat-pages/package.json
@@ -13,6 +13,7 @@
     "@netless/flat-server-api": "workspace:*",
     "@netless/flat-service-provider-agora-rtc-web": "workspace:*",
     "@netless/flat-service-provider-agora-rtm": "workspace:*",
+    "@netless/flat-service-provider-agora-rtm2": "workspace:*",
     "@netless/flat-services": "workspace:*",
     "@netless/flat-stores": "workspace:*",
     "@netless/sync-player": "^1.0.7",

diff --git a/packages/flat-stores/src/classroom-store/index.ts b/packages/flat-stores/src/classroom-store/index.ts
@@ -880,6 +880,7 @@ export class ClassroomStore {
 
     public async destroy(): Promise<void> {
         this.sideEffect.flushAll();
+        (window as any).classroomStore = null;
 
         await this.stopRecording();
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/service-providers/agora-rtc/agora-rtc-web/package.json b/service-providers/agora-rtc/agora-rtc-web/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@netless/flat-services": "workspace:*",
-    "agora-rtc-sdk-ng": "4.16.0",
+    "agora-rtc-sdk-ng": "^4.20.0",
     "side-effect-manager": "^1.2.1",
     "value-enhancer": "^1.3.2"
   }

diff --git a/service-providers/agora-rtm2/README.md b/service-providers/agora-rtm2/README.md
@@ -0,0 +1,3 @@
+# @netless/flat-service-provider-agora-rtm2
+
+Implements the `textChat` Flat service.
diff --git a/service-providers/agora-rtm2/package.json b/service-providers/agora-rtm2/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "@netless/flat-service-provider-agora-rtm2",
+  "version": "0.1.0",
+  "description": "Agora Realtime Messaging 2.0",
+  "main": "src/index.ts",
+  "private": true,
+  "license": "MIT",
+  "scripts": {
+    "build": "tsc"
+  },
+  "devDependencies": {
+    "prettier": "^3.2.4",
+    "typescript": "^4.8.3"
+  },
+  "dependencies": {
+    "@netless/flat-server-api": "workspace:*",
+    "@netless/flat-services": "workspace:*",
+    "agora-rtm": "^2.1.10",
+    "side-effect-manager": "^1.2.1",
+    "uuid": "^9.0.0"
+  }
+}
diff --git a/service-providers/agora-rtm2/src/index.ts b/service-providers/agora-rtm2/src/index.ts
@@ -0,0 +1 @@
+export * from "./rtm2";