feat: support 4.2.3

.github/workflows/build.yml

@@ -22,7 +22,7 @@ on:
     types: [ published ]
 
 jobs:
-  build:
+  build-jenkins:
     runs-on: ubuntu-latest
     steps:
       - name: Build
@@ -32,3 +32,79 @@ jobs:
           curl -X POST -sS -D- -o/dev/null ${{secrets.JENKINS_BUILD_URL}} \
           -H 'Content-Type: application/json' \
           -d "{\"branch\": \"${{github.ref_name}}\", \"type\": \"${type}\"}"
+
+  build-windows:
+    if: ${{ inputs.type == 'demo' }}
+    strategy:
+      matrix:
+        arch: [ ia32, x64 ]
+    runs-on: windows-latest
+    env:
+      npm_config_arch: ${{ matrix.arch }}
+      npm_config_agora_electron_arch: ${{ matrix.arch }}
+      npm_config_agora_electron_sdk_arch: ${{ matrix.arch }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup
+
+      - name: Build SDK
+        run: |
+          yarn totalBuild
+          yarn zipBuild
+          yarn link
+
+      - name: Build Example
+        run: |
+          yarn install
+          yarn link agora-electron-sdk
+          yarn dist:win --${{ matrix.arch }}
+          yarn unlink agora-electron-sdk
+        working-directory: example
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: AgoraRtcNgExample-win-${{ matrix.arch }}
+          path: |
+            example/dist/Agora-Electron-API-Example-*-win.zip
+
+
+  build-mac:
+    if: ${{ inputs.type == 'demo' }}
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup
+
+      - name: Build SDK
+        run: |
+          yarn totalBuild
+          yarn zipBuild
+          yarn link
+
+      - name: Build Example
+        run: |
+          yarn install
+          yarn link agora-electron-sdk
+          yarn dist:mac
+          yarn unlink agora-electron-sdk
+        env: 
+          USE_HARD_LINKS: false
+        working-directory: example
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: AgoraRtcNgExample-mac
+          path: |
+            example/dist/Agora-Electron-API-Example-*-mac.zip
+
+  notification:
+    runs-on: ubuntu-latest
+    needs: [ build-windows, build-mac ]
+    steps:
+      - run: |
+          curl -X POST "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${{ secrets.WECHAT_KEY }}" -d '{"msgtype":"text","text":{"content":"Electron Example:\n${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}}'

.github/workflows/terra.yml

@@ -2,6 +2,11 @@ name: Generate codes
 
 on:
   workflow_dispatch:
+    inputs:
+      terra-ref:
+        description: The terra repo ref
+        required: true
+        default: "main"
 
 jobs:
   generate-codes:
@@ -19,6 +24,7 @@ jobs:
           LLVM_DOWNLOAD_URL: |
             https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.6/clang+llvm-15.0.6-x86_64-linux-gnu-ubuntu-18.04.tar.xz
         with:
+          terra-ref: ${{ inputs.terra-ref }}
           target-path: ${{ github.workspace }}
           config: ci/config/terra_config.yaml
           output-dir: ts/Private

CHANGELOG.md

@@ -1,5 +1,12 @@
 
 
+## [4.2.3-dev.3](https://github.com/AgoraIO-Extensions/Electron-SDK/compare/v4.2.2...v4.2.3-dev.3) (2023-09-22)
+
+
+### Bug Fixes
+
+* `GetVideoFrame ret is` log too much ([43e6519](https://github.com/AgoraIO-Extensions/Electron-SDK/commit/43e6519c630acf3e4233a891bf5b4f7d938813b3))
+
 ## [4.2.2](https://github.com/AgoraIO-Extensions/Electron-SDK/compare/v4.2.1...v4.2.2) (2023-08-01)
 
 

README.md

@@ -126,10 +126,10 @@ $ npm install #or yarn
 $ npm install --agora_electron_sdk_pre_built=false
 
 # build  32 bit architecture on Windows
-$ npm install --verbose --agora_electron_sdk_pre_built=false  --agora_electron_sdk_arch=ia32
+$ npm install --agora_electron_sdk_pre_built=false  --agora_electron_sdk_arch=ia32
 
 # build  64 bit architecture on Windows
-$ npm install --verbose --agora_electron_sdk_pre_built=false  --agora_electron_sdk_arch=x64
+$ npm install --agora_electron_sdk_pre_built=false  --agora_electron_sdk_arch=x64
 ```
 
 ## 🤝 Contributing [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://github.com/AgoraIO-Extensions/Electron-SDK/pulls)

ci/config/terra_config.yaml

@@ -1,4 +1,4 @@
-include: shared:rtc_4.2.2/shared_configs.yaml
+include: shared:rtc_4.2.3/shared_configs.yaml
 
 language: ts
 

ci/electron-sdk-build-mac-release.sh

@@ -8,12 +8,12 @@ npm config set ELECTRON_MIRROR http://npm.taobao.org/mirrors/electron/
 rm -rf node_modules
 rm -rf sdk
 rm -rf tmp
-# npm install --verbose
+# npm install
 #
 # Example 2
 npm config set agora_electron_sdk_pre_built false
-npm install --verbose
-npm run totalBuild --verbose
+npm install
+npm run totalBuild
 npm run zipBuild
 npm config delete agora_electron_sdk_pre_built
 #

ci/electron-sdk-build-windows-release.bat

@@ -6,13 +6,13 @@ call npm config list
 call npm config set agora_electron_sdk_pre_built false
 if %1 == ia32 (
     echo sdk_ia32
-    call npm install --verbose --agora_electron_sdk_arch=ia32
-    call npm run totalBuild --verbose --agora_electron_sdk_arch=ia32
+    call npm install --agora_electron_sdk_arch=ia32
+    call npm run totalBuild --agora_electron_sdk_arch=ia32
 )
 if %1 == x64 (
     echo sdk_x64
-    call npm install --verbose --agora_electron_sdk_arch=x64
-    call npm run totalBuild --verbose --agora_electron_sdk_arch=x64
+    call npm install --agora_electron_sdk_arch=x64
+    call npm run totalBuild --agora_electron_sdk_arch=x64
 )
 call npm config delete agora_electron_sdk_pre_built
 

ci/packager-mac.sh

@@ -41,9 +41,7 @@ packExample() {
   export USE_HARD_LINKS=false
   yarn dist:mac
 
-  pushd dist/mac
-  zip -ry $(pwd)/../../../${outterZipName} Agora-Electron-API-Example.app
-  popd
+  cp -f dist/Agora-Electron-API-Example-*.zip ../${outterZipName}
   popd
 }
 

example/package.json

@@ -7,30 +7,35 @@
     "start": "electron-webpack dev",
     "compile": "electron-webpack",
     "rebuild": "electron-rebuild -f -o ref-napi",
-    "dist": "yarn compile && electron-builder",
-    "dist:mac": "yarn dist --dir -c.compression=store -c.mac.identity=null",
-    "dist:win32": "yarn compile && electron-builder --publish never --win --ia32",
-    "dist:win64": "yarn compile && electron-builder --publish never --win --x64",
-    "switchEnv:win32": "cd .. && @powershell -NoProfile -ExecutionPolicy Unrestricted -Command ./ci/packager-win.ps1 1 switchEnv",
-    "switchEnv:win64": "cd .. && @powershell -NoProfile -ExecutionPolicy Unrestricted -Command ./ci/packager-win.ps1 2 switchEnv"
+    "dist": "npm run compile && electron-builder",
+    "dist:mac": "npm run dist -- --mac",
+    "dist:win": "npm run dist -- --win",
+    "dist:win32": "npm run dist:win -- --ia32",
+    "dist:win64": "npm run dist:win -- --x64"
   },
   "build": {
-    "asar": false,
+    "appId": "agora.io.ElectronApiExample",
+    "asar": true,
+    "asarUnpack": [
+      "node_modules/agora-electron-sdk"
+    ],
     "buildDependenciesFromSource": true,
+    "compression": "normal",
     "productName": "Agora-Electron-API-Example",
-    "appId": "agora.io.ElectronApiExample",
+    "publish": [],
     "files": [
       "!*.log"
     ],
     "mac": {
-      "target": [
-        "dir"
-      ],
-      "type": "distribution",
-      "hardenedRuntime": true,
       "entitlements": "assets/entitlements.mac.plist",
       "entitlementsInherit": "assets/entitlements.mac.plist",
-      "gatekeeperAssess": false
+      "gatekeeperAssess": false,
+      "hardenedRuntime": true,
+      "identity": null,
+      "target": [
+        "zip"
+      ],
+      "type": "distribution"
     },
     "dmg": {
       "contents": [
@@ -52,10 +57,10 @@
       ]
     },
     "linux": {
+      "category": "Development",
       "target": [
         "AppImage"
-      ],
-      "category": "Development"
+      ]
     },
     "directories": {
       "buildResources": "assets"
@@ -65,7 +70,7 @@
     ]
   },
   "dependencies": {
-    "agora-electron-sdk": "4.2.2",
+    "agora-electron-sdk": "4.2.3-dev.3",
     "antd": "^4.20.3",
     "download": "^8.0.0",
     "ffi-napi": "^4.0.3",

example/src/renderer/components/BaseComponent.tsx

@@ -108,10 +108,10 @@ export abstract class BaseComponent<
       'elapsed',
       elapsed
     );
-    const { remoteUsers } = this.state;
-    if (remoteUsers === undefined) return;
-    this.setState({
-      remoteUsers: [...remoteUsers!, remoteUid],
+    this.setState((preState) => {
+      return {
+        remoteUsers: [...(preState.remoteUsers ?? []), remoteUid],
+      };
     });
   }
 
@@ -129,10 +129,12 @@ export abstract class BaseComponent<
       'reason',
       reason
     );
-    const { remoteUsers } = this.state;
-    if (remoteUsers === undefined) return;
-    this.setState({
-      remoteUsers: remoteUsers!.filter((value) => value !== remoteUid),
+    this.setState((preState) => {
+      return {
+        remoteUsers: (preState.remoteUsers ?? []).filter(
+          (value) => value !== remoteUid
+        ),
+      };
     });
   }
 

example/src/renderer/components/RtcSurfaceView/index.tsx

@@ -116,13 +116,15 @@ export class RtcSurfaceView extends Component<Props, State> {
 
   render() {
     const { canvas } = this.props;
-    const { isMirror, uniqueId } = this.state;
+    const { uniqueId } = this.state;
 
     return (
       <div
         className={styles['window-item']}
         onClick={() => {
-          this.setState({ isMirror: !isMirror }, this.updateRender);
+          this.setState((preState) => {
+            return { isMirror: !preState.isMirror };
+          }, this.updateRender);
         }}
       >
         <div

example/src/renderer/examples/advanced/ContentInspect/ContentInspect.tsx

@@ -173,17 +173,24 @@ export default class ContentInspect
                 this.error('interval is invalid');
                 return;
               }
-              this.setState({
-                modules: [...modules, { type, interval }],
+              this.setState((preState) => {
+                return {
+                  modules: [
+                    ...preState.modules,
+                    { type: preState.type, interval: preState.interval },
+                  ],
+                };
               });
             }}
           />
           <AgoraButton
             title={'Remove'}
             onPress={() => {
-              modules.pop();
-              this.setState({
-                modules: modules,
+              this.setState((preState) => {
+                preState.modules.pop();
+                return {
+                  modules: preState.modules,
+                };
               });
             }}
           />

example/src/renderer/examples/advanced/DeviceManager/DeviceManager.tsx

@@ -342,8 +342,10 @@ export default class DeviceManager
           })}
           value={playbackDeviceId}
           onValueChange={(value, index) => {
-            this.setState({
-              playbackDeviceId: playbackDevices?.at(index)?.deviceId,
+            this.setState((preState) => {
+              return {
+                playbackDeviceId: preState.playbackDevices?.at(index)?.deviceId,
+              };
             });
           }}
         />
@@ -358,8 +360,11 @@ export default class DeviceManager
           })}
           value={recordingDeviceId}
           onValueChange={(value, index) => {
-            this.setState({
-              recordingDeviceId: recordingDevices?.at(index)?.deviceId,
+            this.setState((preState) => {
+              return {
+                recordingDeviceId:
+                  preState.recordingDevices?.at(index)?.deviceId,
+              };
             });
           }}
         />
@@ -374,8 +379,10 @@ export default class DeviceManager
           })}
           value={videoDeviceId}
           onValueChange={(value, index) => {
-            this.setState({
-              videoDeviceId: videoDevices?.at(index)?.deviceId,
+            this.setState((preState) => {
+              return {
+                videoDeviceId: preState.videoDevices?.at(index)?.deviceId,
+              };
             });
           }}
         />