agora-appbuilder-core 4.0.0-beta.71 → 4.0.0-beta.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-appbuilder-core",
-  "version": "4.0.0-beta.71",
+  "version": "4.0.0-beta.73",
   "description": "React Native template for RTE app builder",
   "main": "index.js",
   "files": [

package/template/_package-lock.json

@@ -20,8 +20,9 @@
         "agora-extension-ai-denoiser": "1.1.0",
         "agora-extension-virtual-background": "^1.1.3",
         "agora-react-native-rtm": "1.5.1",
-        "agora-rtc-sdk-ng": "4.20.0",
+        "agora-rtc-sdk-ng": "4.20.1",
         "agora-rtm-sdk": "1.5.1",
+        "buffer": "^6.0.3",
         "electron-log": "4.3.5",
         "electron-squirrel-startup": "1.0.0",
         "electron-updater": "4.3.9",
@@ -91,7 +92,6 @@
         "@types/webpack-env": "^1.16.4",
         "@typescript-eslint/eslint-plugin": "6.4.0",
         "@typescript-eslint/parser": "6.4.0",
-        "agora-rtc-sdk-ng-special": "4.18.3-special.2",
         "babel-jest": "^29.2.1",
         "babel-loader": "8.2.4",
         "babel-plugin-module-resolver": "4.1.0",
@@ -130,6 +130,9 @@
         "node": ">=16"
       }
     },
+    "AgoraRTC_N-production.js": {
+      "extraneous": true
+    },
     "node_modules/@aashutoshrathi/word-wrap": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
@@ -140,12 +143,12 @@
       }
     },
     "node_modules/@agora-js/media": {
-      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@agora-js/media/-/media-4.20.0.tgz",
-      "integrity": "sha512-cprH3BmxiM2fEbbdSORCv0/LMl+7R4Zq5MUbCCRV4/BWDoDL+Fdp5otUi1GOoVV4jWNepDl7pkOOH64IfJ1n0Q==",
+      "version": "4.20.1",
+      "resolved": "https://registry.npmjs.org/@agora-js/media/-/media-4.20.1.tgz",
+      "integrity": "sha512-BPuSfg5Wa7FKpbqwGLKvDBk8cXd2tpB8M6Cp1Vx7DY1wLRk2oD1XO9PRIM0QZVFJxo16+D9g+lkIQ+zOvygVyw==",
       "dependencies": {
-        "@agora-js/report": "^4.20.0",
-        "@agora-js/shared": "^4.20.0",
+        "@agora-js/report": "4.20.1",
+        "@agora-js/shared": "4.20.1",
         "agora-rte-extension": "^1.2.4",
         "axios": "^0.27.2",
         "pako": "^2.1.0",
@@ -153,18 +156,18 @@
       }
     },
     "node_modules/@agora-js/report": {
-      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@agora-js/report/-/report-4.20.0.tgz",
-      "integrity": "sha512-TaY+4M1qEdAtM4xmYDUlmzQdGmao23ljnrcBGtS1BXdTrDTH/GbN6+/NAng5Zp5TmBniYwpMHvfPwfVW9LX8Gg==",
+      "version": "4.20.1",
+      "resolved": "https://registry.npmjs.org/@agora-js/report/-/report-4.20.1.tgz",
+      "integrity": "sha512-dNcAKlsoMAdCkS3nhQhM5EGRABsph4klF4DbAXsfWVL4yVdWBEo/9bHtlHKqX594XDVSYLR3PQDYwwdqL33YRw==",
       "dependencies": {
-        "@agora-js/shared": "^4.20.0",
+        "@agora-js/shared": "4.20.1",
         "axios": "^0.27.2"
       }
     },
     "node_modules/@agora-js/shared": {
-      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@agora-js/shared/-/shared-4.20.0.tgz",
-      "integrity": "sha512-+Em8k8MJsYlZ5ItqJidXHdNbn/vmQi3/P0hjh0jsHsMZLwz0l9kETbo5Q7Lq/so8IyrHQw4DoK5Jen0/B4uW4w==",
+      "version": "4.20.1",
+      "resolved": "https://registry.npmjs.org/@agora-js/shared/-/shared-4.20.1.tgz",
+      "integrity": "sha512-MOZnIi9w6m2m5MIx9J2fzA8+RPLOGMpU+1j7c6UtF1g//9yJa3a3lDlX9aRddRHvh1J30dwL/VUnbVviCT/x5w==",
       "dependencies": {
         "axios": "^0.27.2",
         "ua-parser-js": "^0.7.34"
@@ -7665,13 +7668,13 @@
       }
     },
     "node_modules/agora-rtc-sdk-ng": {
-      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/agora-rtc-sdk-ng/-/agora-rtc-sdk-ng-4.20.0.tgz",
-      "integrity": "sha512-jgMn6NXuFKQ0nVkLP2hGn+Asxbx+DSV0gn5PY6X0iF7LC2xqsqEzGhehLASxliS81JjhMNKE72hHEzrQn0qtvQ==",
+      "version": "4.20.1",
+      "resolved": "https://registry.npmjs.org/agora-rtc-sdk-ng/-/agora-rtc-sdk-ng-4.20.1.tgz",
+      "integrity": "sha512-k/heeT3DE72K6D1sZCN1k5K2wIBzSwW4q1hsxk9AOQLdrdPY5GFWQVn66k/WGyP67lEPFe0ZTKFh9+8Gc284FA==",
       "dependencies": {
-        "@agora-js/media": "^4.20.0",
-        "@agora-js/report": "^4.20.0",
-        "@agora-js/shared": "^4.20.0",
+        "@agora-js/media": "4.20.1",
+        "@agora-js/report": "4.20.1",
+        "@agora-js/shared": "4.20.1",
         "agora-rte-extension": "^1.2.4",
         "axios": "^0.27.2",
         "formdata-polyfill": "^4.0.7",
@@ -7679,15 +7682,6 @@
         "webrtc-adapter": "8.2.0"
       }
     },
-    "node_modules/agora-rtc-sdk-ng-special": {
-      "version": "4.18.3-special.2",
-      "resolved": "https://registry.npmjs.org/agora-rtc-sdk-ng-special/-/agora-rtc-sdk-ng-special-4.18.3-special.2.tgz",
-      "integrity": "sha512-++G/Ulb5B+bi54et47OEJVS6NKVVW1mBeu5x/03A9aAZdIac+IYv8RsgMC0dnW+n7sWIgaevWbIopxxclZgC0g==",
-      "dev": true,
-      "dependencies": {
-        "agora-rte-extension": "^1.2.3"
-      }
-    },
     "node_modules/agora-rtc-sdk-ng/node_modules/ua-parser-js": {
       "version": "0.7.37",
       "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.37.tgz",
@@ -9134,6 +9128,29 @@
         "readable-stream": "^3.4.0"
       }
     },
+    "node_modules/bl/node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
     "node_modules/bl/node_modules/readable-stream": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -9353,9 +9370,9 @@
       }
     },
     "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
       "funding": [
         {
           "type": "github",
@@ -9372,7 +9389,7 @@
       ],
       "dependencies": {
         "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
+        "ieee754": "^1.2.1"
       }
     },
     "node_modules/buffer-alloc": {
@@ -10658,6 +10675,31 @@
         "buffer": "^5.1.0"
       }
     },
+    "node_modules/crc/node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "optional": true,
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
     "node_modules/cross-env": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
@@ -26178,29 +26220,6 @@
         "react-native": "*"
       }
     },
-    "node_modules/react-native-agora/node_modules/buffer": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.2.1"
-      }
-    },
     "node_modules/react-native-document-picker": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/react-native-document-picker/-/react-native-document-picker-9.1.0.tgz",
@@ -32241,12 +32260,12 @@
       "dev": true
     },
     "@agora-js/media": {
-      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@agora-js/media/-/media-4.20.0.tgz",
-      "integrity": "sha512-cprH3BmxiM2fEbbdSORCv0/LMl+7R4Zq5MUbCCRV4/BWDoDL+Fdp5otUi1GOoVV4jWNepDl7pkOOH64IfJ1n0Q==",
+      "version": "4.20.1",
+      "resolved": "https://registry.npmjs.org/@agora-js/media/-/media-4.20.1.tgz",
+      "integrity": "sha512-BPuSfg5Wa7FKpbqwGLKvDBk8cXd2tpB8M6Cp1Vx7DY1wLRk2oD1XO9PRIM0QZVFJxo16+D9g+lkIQ+zOvygVyw==",
       "requires": {
-        "@agora-js/report": "^4.20.0",
-        "@agora-js/shared": "^4.20.0",
+        "@agora-js/report": "4.20.1",
+        "@agora-js/shared": "4.20.1",
         "agora-rte-extension": "^1.2.4",
         "axios": "^0.27.2",
         "pako": "^2.1.0",
@@ -32254,18 +32273,18 @@
       }
     },
     "@agora-js/report": {
-      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@agora-js/report/-/report-4.20.0.tgz",
-      "integrity": "sha512-TaY+4M1qEdAtM4xmYDUlmzQdGmao23ljnrcBGtS1BXdTrDTH/GbN6+/NAng5Zp5TmBniYwpMHvfPwfVW9LX8Gg==",
+      "version": "4.20.1",
+      "resolved": "https://registry.npmjs.org/@agora-js/report/-/report-4.20.1.tgz",
+      "integrity": "sha512-dNcAKlsoMAdCkS3nhQhM5EGRABsph4klF4DbAXsfWVL4yVdWBEo/9bHtlHKqX594XDVSYLR3PQDYwwdqL33YRw==",
       "requires": {
-        "@agora-js/shared": "^4.20.0",
+        "@agora-js/shared": "4.20.1",
         "axios": "^0.27.2"
       }
     },
     "@agora-js/shared": {
-      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/@agora-js/shared/-/shared-4.20.0.tgz",
-      "integrity": "sha512-+Em8k8MJsYlZ5ItqJidXHdNbn/vmQi3/P0hjh0jsHsMZLwz0l9kETbo5Q7Lq/so8IyrHQw4DoK5Jen0/B4uW4w==",
+      "version": "4.20.1",
+      "resolved": "https://registry.npmjs.org/@agora-js/shared/-/shared-4.20.1.tgz",
+      "integrity": "sha512-MOZnIi9w6m2m5MIx9J2fzA8+RPLOGMpU+1j7c6UtF1g//9yJa3a3lDlX9aRddRHvh1J30dwL/VUnbVviCT/x5w==",
       "requires": {
         "axios": "^0.27.2",
         "ua-parser-js": "^0.7.34"
@@ -37763,13 +37782,13 @@
       "requires": {}
     },
     "agora-rtc-sdk-ng": {
-      "version": "4.20.0",
-      "resolved": "https://registry.npmjs.org/agora-rtc-sdk-ng/-/agora-rtc-sdk-ng-4.20.0.tgz",
-      "integrity": "sha512-jgMn6NXuFKQ0nVkLP2hGn+Asxbx+DSV0gn5PY6X0iF7LC2xqsqEzGhehLASxliS81JjhMNKE72hHEzrQn0qtvQ==",
+      "version": "4.20.1",
+      "resolved": "https://registry.npmjs.org/agora-rtc-sdk-ng/-/agora-rtc-sdk-ng-4.20.1.tgz",
+      "integrity": "sha512-k/heeT3DE72K6D1sZCN1k5K2wIBzSwW4q1hsxk9AOQLdrdPY5GFWQVn66k/WGyP67lEPFe0ZTKFh9+8Gc284FA==",
       "requires": {
-        "@agora-js/media": "^4.20.0",
-        "@agora-js/report": "^4.20.0",
-        "@agora-js/shared": "^4.20.0",
+        "@agora-js/media": "4.20.1",
+        "@agora-js/report": "4.20.1",
+        "@agora-js/shared": "4.20.1",
         "agora-rte-extension": "^1.2.4",
         "axios": "^0.27.2",
         "formdata-polyfill": "^4.0.7",
@@ -37784,15 +37803,6 @@
         }
       }
     },
-    "agora-rtc-sdk-ng-special": {
-      "version": "4.18.3-special.2",
-      "resolved": "https://registry.npmjs.org/agora-rtc-sdk-ng-special/-/agora-rtc-sdk-ng-special-4.18.3-special.2.tgz",
-      "integrity": "sha512-++G/Ulb5B+bi54et47OEJVS6NKVVW1mBeu5x/03A9aAZdIac+IYv8RsgMC0dnW+n7sWIgaevWbIopxxclZgC0g==",
-      "dev": true,
-      "requires": {
-        "agora-rte-extension": "^1.2.3"
-      }
-    },
     "agora-rte-extension": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/agora-rte-extension/-/agora-rte-extension-1.2.4.tgz",
@@ -38884,6 +38894,15 @@
         "readable-stream": "^3.4.0"
       },
       "dependencies": {
+        "buffer": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+          "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.1.13"
+          }
+        },
         "readable-stream": {
           "version": "3.6.2",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -39062,12 +39081,12 @@
       }
     },
     "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+      "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
       "requires": {
         "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
+        "ieee754": "^1.2.1"
       }
     },
     "buffer-alloc": {
@@ -40081,6 +40100,19 @@
       "optional": true,
       "requires": {
         "buffer": "^5.1.0"
+      },
+      "dependencies": {
+        "buffer": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+          "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "base64-js": "^1.3.1",
+            "ieee754": "^1.1.13"
+          }
+        }
       }
     },
     "cross-env": {
@@ -51729,17 +51761,6 @@
       "integrity": "sha512-R+Sb2HKNXUvklCYtDzLuaA1/HbmnFKM5Elc87Q03qM7Wp9M3L7F6PkY72GXexj4wssPlMHTfsA4YAJDsdfkwMg==",
       "requires": {
         "buffer": "^6.0.3"
-      },
-      "dependencies": {
-        "buffer": {
-          "version": "6.0.3",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-          "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-          "requires": {
-            "base64-js": "^1.3.1",
-            "ieee754": "^1.2.1"
-          }
-        }
       }
     },
     "react-native-document-picker": {

package/template/agora-rn-uikit/src/Contexts/PropsContext.tsx

@@ -120,10 +120,8 @@ export interface RtcPropsInterface {
   callActive?: boolean;
   encryption?: {
     key: string;
-    mode:
-      | EncryptionMode.AES128XTS
-      | EncryptionMode.AES256XTS
-      | EncryptionMode.AES128ECB;
+    mode: EncryptionMode.AES128GCM2 | EncryptionMode.AES128GCM2;
+    salt: number[];
   };
   // commented for v1 release
   // lifecycle?: {

package/template/agora-rn-uikit/src/Rtc/Join.tsx

@@ -48,15 +48,21 @@ const Join: React.FC<{
     const videoState = defaultContent[maxUid].video;
     async function join() {
       if (
-        rtcProps.encryption &&
+        rtcProps?.encryption &&
         rtcProps.encryption.key &&
-        rtcProps.encryption.mode
+        rtcProps.encryption.mode &&
+        rtcProps.encryption.salt
       ) {
-        console.log('using channel encryption', rtcProps.encryption);
-        await engine.enableEncryption(true, {
-          encryptionKey: rtcProps.encryption.key,
-          encryptionMode: rtcProps.encryption.mode,
-        });
+        console.log('using channel encryption', rtcProps?.encryption);
+        try {
+          await engine.enableEncryption(true, {
+            encryptionKey: rtcProps?.encryption.key,
+            encryptionMode: rtcProps?.encryption.mode,
+            encryptionKdfSalt: rtcProps?.encryption.salt,
+          });
+        } catch (error) {
+          console.warn('encryption error', error);
+        }
       }
       if (
         !audioRoom &&

package/template/bridge/rtc/webNg/RtcEngine.ts

@@ -902,15 +902,25 @@ export default class RtcEngine {
     config: {
       encryptionMode: RnEncryptionEnum;
       encryptionKey: string;
+      encryptionKdfSalt: string;
     },
   ): Promise<void> {
     let mode: EncryptionMode;
     mode = this.getEncryptionMode(enabled, config?.encryptionMode);
-    console.log('setting encryption ===>', mode);
     try {
       await Promise.all([
-        this.client.setEncryptionConfig(mode, config.encryptionKey),
-        this.screenClient.setEncryptionConfig(mode, config.encryptionKey),
+        this.client.setEncryptionConfig(
+          mode,
+          config.encryptionKey,
+          config.encryptionKdfSalt,
+          true, // encryptDataStream
+        ),
+        this.screenClient.setEncryptionConfig(
+          mode,
+          config.encryptionKey,
+          config.encryptionKdfSalt,
+          true, // encryptDataStream
+        ),
       ]);
     } catch (e) {
       throw e;

package/template/package.json

@@ -60,8 +60,9 @@
     "agora-extension-ai-denoiser": "1.1.0",
     "agora-extension-virtual-background": "^1.1.3",
     "agora-react-native-rtm": "1.5.1",
-    "agora-rtc-sdk-ng": "4.20.0",
+    "agora-rtc-sdk-ng": "4.20.1",
     "agora-rtm-sdk": "1.5.1",
+    "buffer": "^6.0.3",
     "electron-log": "4.3.5",
     "electron-squirrel-startup": "1.0.0",
     "electron-updater": "4.3.9",
@@ -131,7 +132,6 @@
     "@types/webpack-env": "^1.16.4",
     "@typescript-eslint/eslint-plugin": "6.4.0",
     "@typescript-eslint/parser": "6.4.0",
-    "agora-rtc-sdk-ng-special": "4.18.3-special.2",
     "babel-jest": "^29.2.1",
     "babel-loader": "8.2.4",
     "babel-plugin-module-resolver": "4.1.0",

package/template/src/components/room-info/useRoomInfo.tsx

@@ -44,6 +44,7 @@ export interface RoomInfoContextInterface {
     token?: string;
     rtmToken?: string;
     encryptionSecret?: string;
+    encryptionSecretSalt?: Uint8Array;
     screenShareUid?: string;
     screenShareToken?: string;
   };

package/template/src/pages/VideoCall.tsx

@@ -170,7 +170,7 @@ const VideoCall: React.FC = () => {
     profile: $config.PROFILE,
     dual: true,
     encryption: $config.ENCRYPTION_ENABLED
-      ? {key: null, mode: RnEncryptionEnum.AES256GCM, screenKey: null}
+      ? {key: null, mode: RnEncryptionEnum.AES128GCM2, screenKey: null}
       : false,
     role: ClientRole.Broadcaster,
     geoFencing: $config.GEO_FENCING,
@@ -278,8 +278,9 @@ const VideoCall: React.FC = () => {
         encryption: $config.ENCRYPTION_ENABLED
           ? {
               key: data.encryptionSecret,
-              mode: RnEncryptionEnum.AES256GCM,
+              mode: RnEncryptionEnum.AES256GCM2,
               screenKey: data.encryptionSecret,
+              salt: data.encryptionSecretSalt,
             }
           : false,
         screenShareUid: data.screenShareUid,

package/template/src/subComponents/caption/useSTTAPI.tsx

@@ -32,8 +32,7 @@ const useSTTAPI = (): IuseSTTAPI => {
   } = useCaption();
 
   const currentLangRef = React.useRef<LanguageType[]>([]);
-  const STT_API_URL = `${$config.BACKEND_ENDPOINT}/v1/sttv2`;
-  const OLD_STT_API_URL = `${$config.BACKEND_ENDPOINT}/v1/stt`;
+  const STT_API_URL = `${$config.BACKEND_ENDPOINT}/v1/stt`;
   const username = useGetName();
   const localUid = useLocalUid();
   const {rtcProps} = useContext(PropsContext);
@@ -43,31 +42,21 @@ const useSTTAPI = (): IuseSTTAPI => {
   }, [language]);
 
   const apiCall = async (method: string, lang: LanguageType[] = []) => {
-    const response = await fetch(
-      `${
-        method === 'stop' || !$config.ENCRYPTION_ENABLED
-          ? OLD_STT_API_URL
-          : STT_API_URL
-      }/${method}`,
-      {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-          authorization: store.token ? `Bearer ${store.token}` : '',
-        },
-        body: JSON.stringify({
-          passphrase: roomId?.host || '',
-          lang:
-            method === 'stop' || !$config.ENCRYPTION_ENABLED
-              ? lang.join(',')
-              : lang,
-          dataStream_uid: 111111, // bot ID
-          encryption_mode: $config.ENCRYPTION_ENABLED
-            ? rtcProps.encryption.mode
-            : null,
-        }),
+    const response = await fetch(`${STT_API_URL}/${method}`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        authorization: store.token ? `Bearer ${store.token}` : '',
       },
-    );
+      body: JSON.stringify({
+        passphrase: roomId?.host || '',
+        lang: lang,
+        dataStream_uid: 111111, // bot ID
+        encryption_mode: $config.ENCRYPTION_ENABLED
+          ? rtcProps.encryption.mode
+          : null,
+      }),
+    });
     const res = await response.json();
     return res;
   };

package/template/src/utils/index.tsx

@@ -1,3 +1,4 @@
+const Buffer = require('buffer/').Buffer;
 type Entry<T> = {
   [K in keyof T]: [K, T[K]];
 }[keyof T];
@@ -83,3 +84,16 @@ export function isURL(str) {
   var url = new RegExp(urlRegex, 'i');
   return str.length < 2083 && url.test(str);
 }
+
+export const base64ToUint8Array = (base64Str: string) => {
+  let decodedData;
+
+  decodedData = Buffer.from(base64Str, 'base64').toString('binary');
+
+  const result = new Uint8Array(new ArrayBuffer(decodedData.length));
+  for (let i = 0; i < decodedData.length; i += 1) {
+    result[i] = decodedData.charCodeAt(i);
+  }
+
+  return result;
+};

package/template/src/utils/useJoinRoom.ts

@@ -6,6 +6,7 @@ import {useSetRoomInfo} from '../components/room-info/useSetRoomInfo';
 import {GraphQLContext} from '../components/GraphQLProvider';
 import useGetName from './useGetName';
 import useWaitingRoomAPI from '../subComponents/waiting-rooms/useWaitingRoomAPI';
+import {base64ToUint8Array} from '../utils';
 
 const JOIN_CHANNEL_PHRASE_AND_GET_USER = gql`
   query JoinChannel($passphrase: String!) {
@@ -14,6 +15,7 @@ const JOIN_CHANNEL_PHRASE_AND_GET_USER = gql`
       title
       isHost
       secret
+      secretSalt
       mainUser {
         rtc
         rtm
@@ -43,6 +45,7 @@ const JOIN_CHANNEL_PHRASE = gql`
       title
       isHost
       secret
+      secretSalt
       mainUser {
         rtc
         rtm
@@ -130,6 +133,13 @@ export default function useJoinRoom() {
               ? data.secret
               : data.joinChannel.secret;
           }
+          if (data?.joinChannel?.secretSalt || data?.secretSalt) {
+            roomInfo.encryptionSecretSalt = base64ToUint8Array(
+              isWaitingRoomEnabled
+                ? data.secretSalt
+                : data.joinChannel.secretSalt,
+            );
+          }
           if (data?.joinChannel?.screenShare?.uid || data?.screenShare?.uid) {
             roomInfo.screenShareUid = isWaitingRoomEnabled
               ? data.screenShare.uid