Revert "refactor(service-providers): add agoraAppId config in join …

…room (#2…" (#2153) This reverts commit 4ff8041.
netless-io · Jul 12, 2024 · a7f8525 · a7f8525
1 parent 4ff8041
commit a7f8525
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 40 deletions.
diff --git a/packages/flat-server-api/src/room.ts b/packages/flat-server-api/src/room.ts
@@ -103,7 +103,6 @@ export interface JoinRoomResult {
     rtmToken: string;
     showGuide: boolean;
     region: Region;
-    agoraAppId?: string;
     billing?: {
         /** minutes */
         limit: number;

diff --git a/packages/flat-services/src/services/text-chat/text-chat.ts b/packages/flat-services/src/services/text-chat/text-chat.ts
@@ -14,7 +14,6 @@ export interface IServiceTextChatJoinRoomConfig {
     ownerUUID: string;
     uid: string;
     token?: string | null;
-    agoraAppId?: string | null;
 }
 
 export abstract class IServiceTextChat implements IService {

diff --git a/packages/flat-services/src/services/video-chat/video-chat.ts b/packages/flat-services/src/services/video-chat/video-chat.ts
@@ -30,7 +30,6 @@ export interface IServiceVideoChatJoinRoomConfig {
     shareScreenUID: IServiceVideoChatUID;
     shareScreenToken: string;
     mirror?: boolean;
-    agoraAppId?: string | null;
 }
 
 export abstract class IServiceVideoChat implements IService {

diff --git a/packages/flat-stores/src/classroom-store/index.ts b/packages/flat-stores/src/classroom-store/index.ts
@@ -376,7 +376,6 @@ export class ClassroomStore {
             ownerUUID: this.ownerUUID,
             uid: this.userUUID,
             token: globalStore.rtmToken,
-            agoraAppId: globalStore.agoraAppId,
         });
 
         const fastboard = await this.whiteboardStore.joinWhiteboardRoom();
@@ -1509,7 +1508,6 @@ export class ClassroomStore {
                 shareScreenUID: String(globalStore.rtcShareScreen?.uid || -1),
                 shareScreenToken: globalStore.rtcShareScreen?.token || "",
                 mirror: preferencesStore.mirrorMode,
-                agoraAppId: globalStore.agoraAppId,
             });
 
             if (preferencesStore.cameraId) {

diff --git a/packages/flat-stores/src/global-store.ts b/packages/flat-stores/src/global-store.ts
@@ -67,7 +67,6 @@ export class GlobalStore {
      * Room's region, services (currently only whiteboard) must use this value to join the room.
      */
     public region: Region | null = null;
-    public agoraAppId: string | null = null;
     public rtcToken: string | null = null;
     public rtcUID: number | null = null;
     public rtcShareScreen: {
@@ -220,7 +219,6 @@ export class GlobalStore {
                 | "rtcUID"
                 | "rtcShareScreen"
                 | "region"
-                | "agoraAppId"
             >
         >,
     ): void => {
@@ -232,7 +230,6 @@ export class GlobalStore {
             "rtcUID",
             "rtcShareScreen",
             "region",
-            "agoraAppId",
         ] as const;
         for (const key of keys) {
             const value = config[key];

diff --git a/packages/flat-stores/src/room-store.ts b/packages/flat-stores/src/room-store.ts
@@ -57,7 +57,6 @@ export interface RoomItem {
         expireAt: number;
         vipLevel: 0 | 1;
     };
-    agoraAppId?: string;
 }
 
 // Only keep sub-room ids. sub-room info are stored in ordinaryRooms.
@@ -145,7 +144,6 @@ export class RoomStore {
             ownerUUID: data.ownerUUID,
             roomType: data.roomType,
             billing: data.billing,
-            agoraAppId: data.agoraAppId,
         });
         return data;
     }

diff --git a/service-providers/agora-rtc/agora-rtc-electron/src/agora-rtc-electron.ts b/service-providers/agora-rtc/agora-rtc-electron/src/agora-rtc-electron.ts
@@ -32,12 +32,11 @@ export class AgoraRTCElectron extends IServiceVideoChat {
     public readonly isMac: boolean;
     public readonly shareScreen = new AgoraRTCElectronShareScreen({ rtc: this });
 
+    public readonly APP_ID: string;
     public readonly rtcEngine: AgoraSdk;
 
     private readonly _roomSideEffect = new SideEffectManager();
 
-    public APP_ID: string;
-
     private _cameraID?: string;
     private _micID?: string;
     private _speakerID?: string;
@@ -204,12 +203,6 @@ export class AgoraRTCElectron extends IServiceVideoChat {
             }
             this.leaveRoom();
         }
-
-        if (config.agoraAppId && config.agoraAppId !== this.APP_ID) {
-            this.rtcEngine.release(true);
-            this.rtcEngine.initialize((this.APP_ID = config.agoraAppId));
-        }
-
         return this._join(config);
     }
 

diff --git a/service-providers/agora-rtc/agora-rtc-web/src/agora-rtc-web.ts b/service-providers/agora-rtc/agora-rtc-web/src/agora-rtc-web.ts
@@ -42,6 +42,8 @@ export interface AgoraRTCWebConfig {
 }
 
 export class AgoraRTCWeb extends IServiceVideoChat {
+    public readonly APP_ID: string;
+
     public readonly shareScreen: AgoraRTCWebShareScreen;
 
     private readonly _roomSideEffect = new SideEffectManager();
@@ -50,7 +52,6 @@ export class AgoraRTCWeb extends IServiceVideoChat {
     private _pLeavingRoom?: Promise<unknown>;
     private _testingAudio?: HTMLAudioElement;
 
-    public APP_ID: string;
     public client?: IAgoraRTCClient;
     public mode?: IServiceVideoChatMode;
 
@@ -357,7 +358,6 @@ export class AgoraRTCWeb extends IServiceVideoChat {
         shareScreenUID,
         shareScreenToken,
         mirror,
-        agoraAppId,
     }: IServiceVideoChatJoinRoomConfig): Promise<void> {
         this._roomSideEffect.flushAll();
 
@@ -494,10 +494,6 @@ export class AgoraRTCWeb extends IServiceVideoChat {
             }),
         );
 
-        if (agoraAppId && agoraAppId !== this.APP_ID) {
-            this.APP_ID = agoraAppId;
-        }
-
         await client.join(
             this.APP_ID,
             roomUUID,

diff --git a/service-providers/agora-rtm/src/rtm.ts b/service-providers/agora-rtm/src/rtm.ts
@@ -24,14 +24,14 @@ export class AgoraRTM extends IServiceTextChat {
     private _pJoiningRoom?: Promise<unknown>;
     private _pLeavingRoom?: Promise<unknown>;
 
-    public client: RtmClient;
+    public readonly client: RtmClient;
     public channel?: RtmChannel;
 
     private roomUUID?: string;
     private userUUID?: string;
     private token?: string;
 
-    public constructor(public APP_ID: string) {
+    public constructor(APP_ID: string) {
         super();
         if (!APP_ID) {
             throw new Error("APP_ID is not set");
@@ -185,21 +185,13 @@ export class AgoraRTM extends IServiceTextChat {
         token,
         roomUUID,
         ownerUUID,
-        agoraAppId,
     }: IServiceTextChatJoinRoomConfig): Promise<void> {
         this.token = token || (await generateRTMToken());
 
         if (!this.token) {
             throw new Error("Missing Agora RTM token");
         }
 
-        if (agoraAppId && agoraAppId !== this.APP_ID) {
-            this.APP_ID = agoraAppId;
-            this.client = RtmEngine.createInstance(this.APP_ID, {
-                logFilter: RtmEngine.LOG_FILTER_WARNING,
-            });
-        }
-
         this._roomSideEffect.add(() => {
             const handler = async (): Promise<void> => {
                 this.token = await generateRTMToken();

diff --git a/service-providers/agora-rtm2/src/rtm2.ts b/service-providers/agora-rtm2/src/rtm2.ts
@@ -28,7 +28,7 @@ export class AgoraRTM2 extends IServiceTextChat {
     private userUUID?: string;
     private token?: string;
 
-    public constructor(public APP_ID: string) {
+    public constructor(private readonly APP_ID: string) {
         super();
         if (!APP_ID) {
             throw new Error("APP_ID is not set");
@@ -162,18 +162,13 @@ export class AgoraRTM2 extends IServiceTextChat {
         token,
         roomUUID,
         ownerUUID,
-        agoraAppId,
     }: IServiceTextChatJoinRoomConfig): Promise<void> {
         this.token = token || (await generateRTMToken());
 
         if (!this.token) {
             throw new Error("Missing Agora RTM token");
         }
 
-        if (agoraAppId && agoraAppId !== this.APP_ID) {
-            this.APP_ID = agoraAppId;
-        }
-
         const client = (this.client = new RTM(this.APP_ID, uid, {
             logLevel: "warn",
             logUpload: !process.env.DEV,