agora-electron-sdk 4.2.0-dev.4 → 4.2.0-dev.8

package/js/Renderer/{GlRenderer → WebGLRenderer}/index.js

@@ -39,43 +39,45 @@ const yuvShaderSource = 'precision mediump float;' +
     '  gl_FragColor=vec4(r,g,b,1.0);' +
     '}';
 class GlRenderer extends IRenderer_1.IRenderer {
+    gl;
+    handleContextLost;
+    program;
+    positionLocation;
+    texCoordLocation;
+    yTexture;
+    uTexture;
+    vTexture;
+    texCoordBuffer;
+    surfaceBuffer;
+    // @ts-ignore
+    parentElement;
+    container;
+    // @ts-ignore
+    canvas;
+    renderImageCount = 0;
+    initWidth = 0;
+    initHeight = 0;
+    initRotation = 0;
+    clientWidth = 0;
+    clientHeight = 0;
+    contentMode = 0;
+    event = new events_1.EventEmitter();
+    firstFrameRender = false;
+    lastImageWidth = 0;
+    lastImageHeight = 0;
+    lastImageRotation = 0;
+    videoBuffer = {};
+    observer;
+    failInitRenderCB;
     constructor(failCallback) {
         super();
-        this.renderImageCount = 0;
-        this.initWidth = 0;
-        this.initHeight = 0;
-        this.initRotation = 0;
-        this.clientWidth = 0;
-        this.clientHeight = 0;
-        this.contentMode = 0;
-        this.event = new events_1.EventEmitter();
-        this.firstFrameRender = false;
-        this.lastImageWidth = 0;
-        this.lastImageHeight = 0;
-        this.lastImageRotation = 0;
-        this.videoBuffer = {};
         this.failInitRenderCB = failCallback;
     }
     bind(view) {
         super.bind(view);
-        // this.initCanvas(
-        //   view,
-        //   view.clientWidth,
-        //   view.clientHeight,
-        //   this.initRotation,
-        //   console.warn
-        // );
-        // const ResizeObserver = window.ResizeObserver;
-        // if (ResizeObserver) {
-        //   this.observer = new ResizeObserver(() => {
-        //     this.refreshCanvas && this.refreshCanvas();
-        //   });
-        //   this.observer.observe(view);
-        // }
     }
     unbind() {
-        // @ts-ignore
-        this.observer && this.observer.unobserve && this.observer.disconnect();
+        this.observer?.unobserve && this.observer.disconnect();
         this.program = undefined;
         this.positionLocation = undefined;
         this.texCoordLocation = undefined;
@@ -120,46 +122,38 @@ class GlRenderer extends IRenderer_1.IRenderer {
                 // Cover
                 if (rotation === 0 || rotation === 180) {
                     if (this.clientWidth / this.clientHeight > width / height) {
-                        // @ts-ignore
-                        this.canvas.style.zoom = this.clientWidth / width;
+                        this.canvas.style.transform = `scale(${this.clientWidth / width})`;
                     }
                     else {
-                        // @ts-ignore
-                        this.canvas.style.zoom = this.clientHeight / height;
+                        this.canvas.style.transform = `scale(${this.clientHeight / height})`;
                     }
                 }
                 else {
                     // 90, 270
                     if (this.clientHeight / this.clientWidth > width / height) {
-                        // @ts-ignore
-                        this.canvas.style.zoom = this.clientHeight / width;
+                        this.canvas.style.transform = `scale(${this.clientHeight / width})`;
                     }
                     else {
-                        // @ts-ignore
-                        this.canvas.style.zoom = this.clientWidth / height;
+                        this.canvas.style.transform = `scale(${this.clientWidth / height})`;
                     }
                 }
                 // Contain
             }
             else if (rotation === 0 || rotation === 180) {
                 if (this.clientWidth / this.clientHeight > width / height) {
-                    // @ts-ignore
-                    this.canvas.style.zoom = this.clientHeight / height;
+                    this.canvas.style.transform = `scale(${this.clientHeight / height})`;
                 }
                 else {
-                    // @ts-ignore
-                    this.canvas.style.zoom = this.clientWidth / width;
+                    this.canvas.style.transform = `scale(${this.clientWidth / width})`;
                 }
             }
             else {
                 // 90, 270
                 if (this.clientHeight / this.clientWidth > width / height) {
-                    // @ts-ignore
-                    this.canvas.style.zoom = this.clientWidth / height;
+                    this.canvas.style.transform = `scale(${this.clientWidth / height})`;
                 }
                 else {
-                    // @ts-ignore
-                    this.canvas.style.zoom = this.clientHeight / width;
+                    this.canvas.style.transform = `scale(${this.clientHeight / width})`;
                 }
             }
         }

package/js/Renderer/YUVCanvasRenderer/index.js

@@ -13,6 +13,10 @@ const isEqual = require('lodash.isequal');
 const YUVBuffer = require('yuv-buffer');
 const YUVCanvas = require('yuv-canvas');
 class YUVCanvasRenderer extends IRenderer_1.IRenderer {
+    _cacheCanvasOptions;
+    _yuvCanvasSink;
+    _container;
+    _videoFrame;
     constructor() {
         super();
         this._videoFrame = {
@@ -46,7 +50,6 @@ class YUVCanvasRenderer extends IRenderer_1.IRenderer {
         });
     }
     unbind() {
-        var _a, _b;
         if (this._container) {
             this._container.replaceChildren();
             this._container = undefined;
@@ -58,8 +61,8 @@ class YUVCanvasRenderer extends IRenderer_1.IRenderer {
         if (this.canvas) {
             this.canvas = undefined;
         }
-        if (this._yuvCanvasSink && ((_a = this._yuvCanvasSink) === null || _a === void 0 ? void 0 : _a.loseContext)) {
-            (_b = this._yuvCanvasSink) === null || _b === void 0 ? void 0 : _b.loseContext();
+        if (this._yuvCanvasSink && this._yuvCanvasSink?.loseContext) {
+            this._yuvCanvasSink?.loseContext();
         }
     }
     zoom(vertical, contentMode = AgoraMediaBase_1.RenderModeType.RenderModeFit, width, height, clientWidth, clientHeight) {
@@ -127,11 +130,9 @@ class YUVCanvasRenderer extends IRenderer_1.IRenderer {
             let transformItems = [];
             transformItems.push(`rotateZ(${options.rotation}deg)`);
             let scale = this.zoom(options.rotation === 90 || options.rotation === 270, options.contentMode, options.frameWidth, options.frameHeight, options.clientWidth, options.clientHeight);
-            // @ts-ignore
-            this.canvas.style.zoom = scale.toString();
+            this.canvas.style.transform = `scale(${scale.toString()})`;
             if (transformItems.length > 0) {
-                let transform = `${transformItems.join(' ')}`;
-                this.canvas.style.transform = transform;
+                this.canvas.style.transform = `${transformItems.join(' ')}`;
             }
         }
     }

package/js/Renderer/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./IRenderer"), exports);
+__exportStar(require("./IRendererManager"), exports);

package/js/Utils.js

@@ -91,7 +91,7 @@ exports.objsKeysToLowerCase = objsKeysToLowerCase;
  */
 const formatConfigByVideoSourceType = (videoSourceType, originChannelId = '', originUid = 0) => {
     if (videoSourceType === undefined || videoSourceType === null) {
-        throw new Error(`must set videoSourceType`);
+        throw new Error(`must set videoSourceType:${videoSourceType}`);
     }
     let uid = originUid;
     let channelId = originChannelId;
@@ -106,13 +106,13 @@ const formatConfigByVideoSourceType = (videoSourceType, originChannelId = '', or
             break;
         case AgoraMediaBase_1.VideoSourceType.VideoSourceRemote:
             if (!uid || !channelId) {
-                throw new Error(`must set uid:${uid}} and channelId:${channelId}`);
+                throw new Error(`must set uid:${uid} and channelId:${channelId}`);
             }
             break;
         case AgoraMediaBase_1.VideoSourceType.VideoSourceMediaPlayer:
             channelId = '';
             if (!uid) {
-                throw new Error(`must set uid(mediaPlayerId):${uid}}}`);
+                throw new Error(`must set mediaPlayerId:${uid}`);
             }
             break;
         default:
@@ -125,10 +125,9 @@ exports.formatConfigByVideoSourceType = formatConfigByVideoSourceType;
  * @ignore
  */
 const getDefaultRendererVideoConfig = (config) => {
-    var _a, _b;
-    const rendererOptions = Object.assign({}, (_b = (_a = exports.AgoraEnv.AgoraRendererManager) === null || _a === void 0 ? void 0 : _a.defaultRenderConfig) === null || _b === void 0 ? void 0 : _b.rendererOptions, config.rendererOptions);
+    const rendererOptions = Object.assign({}, exports.AgoraEnv.AgoraRendererManager?.defaultRenderConfig?.rendererOptions, config.rendererOptions);
     const { uid, channelId, videoSourceType } = (0, exports.formatConfigByVideoSourceType)(config.videoSourceType, config.channelId, config.uid);
-    return Object.assign(Object.assign({}, config), { uid, channelId, videoSourceType, rendererOptions });
+    return { ...config, uid, channelId, videoSourceType, rendererOptions };
 };
 exports.getDefaultRendererVideoConfig = getDefaultRendererVideoConfig;
 /**
@@ -164,7 +163,6 @@ const agora = require('../build/Release/agora_node_ext');
 exports.AgoraEnv = {
     enableLogging: true,
     enableDebugLogging: false,
+    webEnvReady: true,
     AgoraElectronBridge: new agora.AgoraElectronBridge(),
 };
-// @ts-ignore
-(window || global).AgoraEnv = exports.AgoraEnv;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-electron-sdk",
-  "version": "4.2.0-dev.4",
+  "version": "4.2.0-dev.8",
   "description": "agora-electron-sdk",
   "main": "js/AgoraSdk",
   "types": "types/AgoraSdk.d.ts",
@@ -59,6 +59,7 @@
     "@commitlint/config-conventional": "^17.0.2",
     "@evilmartians/lefthook": "^1.2.2",
     "@release-it/conventional-changelog": "^5.0.0",
+    "@types/json-bigint": "^1.0.1",
     "@typescript-eslint/eslint-plugin": "^5.30.5",
     "@typescript-eslint/parser": "^5.30.5",
     "cmake-js": "6.3.2",
@@ -77,7 +78,7 @@
     "typescript": "^4.5.2"
   },
   "engines": {
-    "node": ">= 16.0.0"
+    "node": ">= 14.0.0"
   },
   "packageManager": "^yarn@1.22.15",
   "commitlint": {
@@ -230,7 +231,7 @@
     "yuv-canvas": "1.2.6"
   },
   "agora_electron": {
-    "iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.2.0-dev.4_DCG_Windows_Video_20230410_1051.zip",
-    "iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.2.0-dev.4_DCG_Mac_Video_20230410_1051.zip"
+    "iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.2.0-dev.8_DCG_Windows_Video_20230417_1118.zip",
+    "iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.2.0-dev.8_DCG_Mac_Video_20230417_1121.zip"
   }
 }

package/scripts/buildJS.js

@@ -7,8 +7,7 @@ const buildJS = async (cb) => {
   logger.info('Build js from typescript');
   await cleanJSDir();
   await cleanTypesDir();
-  await exec('tsc', { silent: false });
-  await exec('tsc -p dtsconfig.json', { silent: false });
+  await exec('tsc -p tsconfig.build.json', { silent: false });
   cb();
 };
 

package/scripts/getConfig.js

@@ -4,7 +4,6 @@ const minimist = require('minimist');
 
 const logger = require('./logger');
 
-//@ts-ignore
 const { INIT_CWD } = minimist(process.argv.slice(2), {
   string: ['INIT_CWD'],
   default: {},

package/ts/AgoraSdk.ts

@@ -2,6 +2,8 @@ import { IMediaPlayerCacheManager } from './Private/IAgoraMediaPlayer';
 import { IRtcEngineEx } from './Private/IAgoraRtcEngineEx';
 import { IMediaPlayerCacheManagerImpl } from './Private/impl/IAgoraMediaPlayerImpl';
 import { RtcEngineExInternal } from './Private/internal/RtcEngineExInternal';
+import { AgoraEnvOptions } from './Types';
+import { AgoraEnv } from './Utils';
 
 export * from './Private/AgoraBase';
 export * from './Private/AgoraMediaBase';
@@ -17,7 +19,7 @@ export * from './Private/IAgoraRtcEngine';
 export * from './Private/IAgoraRtcEngineEx';
 export * from './Private/IAgoraSpatialAudio';
 export * from './Private/IAudioDeviceManager';
-export * from './Renderer/RendererManager';
+export * from './Renderer';
 export * from './Types';
 export * from './Utils';
 
@@ -30,7 +32,8 @@ const instance = new RtcEngineExInternal();
  * @returns
  * One IRtcEngine object.
  */
-export function createAgoraRtcEngine(): IRtcEngineEx {
+export function createAgoraRtcEngine(options?: AgoraEnvOptions): IRtcEngineEx {
+  Object.assign(AgoraEnv, options);
   return instance;
 }
 

package/ts/Private/IAgoraMediaPlayer.ts

@@ -312,6 +312,51 @@ export abstract class IMediaPlayer {
     observer: IMediaPlayerSourceObserver
   ): number;
 
+  /**
+   * Registers an audio frame observer object.
+   *
+   * @param mode The use mode of the audio frame. See RawAudioFrameOpModeType .
+   */
+  abstract registerAudioFrameObserver(
+    observer: IAudioPcmFrameSink,
+    mode?: RawAudioFrameOpModeType
+  ): number;
+
+  /**
+   * Unregisters an audio observer.
+   *
+   * @param observer The audio observer. See IMediaPlayerAudioFrameObserver .
+   *
+   * @returns
+   * 0: Success.< 0: Failure.
+   */
+  abstract unregisterAudioFrameObserver(observer: IAudioPcmFrameSink): number;
+
+  /**
+   * Registers a video frame observer object.
+   * You need to implement the IMediaPlayerVideoFrameObserver class in this method and register callbacks according to your scenarios. After you successfully register the video frame observer, the SDK triggers the registered callbacks each time a video frame is received.
+   *
+   * @param observer The video observer, reporting the reception of each video frame. See IMediaPlayerVideoFrameObserver .
+   *
+   * @returns
+   * 0: Success.< 0: Failure.
+   */
+  abstract registerVideoFrameObserver(
+    observer: IMediaPlayerVideoFrameObserver
+  ): number;
+
+  /**
+   * Unregisters the video frame observer.
+   *
+   * @param observer The video observer, reporting the reception of each video frame. See IMediaPlayerVideoFrameObserver .
+   *
+   * @returns
+   * 0: Success.< 0: Failure.
+   */
+  abstract unregisterVideoFrameObserver(
+    observer: IMediaPlayerVideoFrameObserver
+  ): number;
+
   /**
    * @ignore
    */
@@ -447,51 +492,6 @@ export abstract class IMediaPlayer {
    * @ignore
    */
   abstract setSoundPositionParams(pan: number, gain: number): number;
-
-  /**
-   * Registers an audio frame observer object.
-   *
-   * @param mode The use mode of the audio frame. See RawAudioFrameOpModeType .
-   */
-  abstract registerAudioFrameObserver(
-    observer: IAudioPcmFrameSink,
-    mode?: RawAudioFrameOpModeType
-  ): number;
-
-  /**
-   * Unregisters an audio observer.
-   *
-   * @param observer The audio observer. See IMediaPlayerAudioFrameObserver .
-   *
-   * @returns
-   * 0: Success.< 0: Failure.
-   */
-  abstract unregisterAudioFrameObserver(observer: IAudioPcmFrameSink): number;
-
-  /**
-   * Registers a video frame observer object.
-   * You need to implement the IMediaPlayerVideoFrameObserver class in this method and register callbacks according to your scenarios. After you successfully register the video frame observer, the SDK triggers the registered callbacks each time a video frame is received.
-   *
-   * @param observer The video observer, reporting the reception of each video frame. See IMediaPlayerVideoFrameObserver .
-   *
-   * @returns
-   * 0: Success.< 0: Failure.
-   */
-  abstract registerVideoFrameObserver(
-    observer: IMediaPlayerVideoFrameObserver
-  ): number;
-
-  /**
-   * Unregisters the video frame observer.
-   *
-   * @param observer The video observer, reporting the reception of each video frame. See IMediaPlayerVideoFrameObserver .
-   *
-   * @returns
-   * 0: Success.< 0: Failure.
-   */
-  abstract unregisterVideoFrameObserver(
-    observer: IMediaPlayerVideoFrameObserver
-  ): number;
 }
 
 /**

package/ts/Private/IAgoraRtcEngine.ts

@@ -1087,9 +1087,9 @@ export class ChannelMediaOptions {
    */
   publishMediaPlayerVideoTrack?: boolean;
   /**
-   * Whether to publish the local transcoded video:true: Publish the local transcoded video.false: (Default) Do not publish the local transcoded video.
+   * @ignore
    */
-  publishTrancodedVideoTrack?: boolean;
+  publishTranscodedVideoTrack?: boolean;
   /**
    * Whether to automatically subscribe to all remote audio streams when the user joins a channel:true: (Default) Automatically subscribe to all remote audio streams.false: Do not automatically subscribe to any remote audio streams.
    */
@@ -4796,7 +4796,7 @@ export abstract class IRtcEngine {
   /**
    * @ignore
    */
-  abstract startScreenCaptureDesktop(
+  abstract startScreenCaptureBySourceType(
     sourceType: VideoSourceType,
     config: ScreenCaptureConfiguration
   ): number;
@@ -4830,6 +4830,14 @@ export abstract class IRtcEngine {
    */
   abstract setScreenCaptureScenario(screenScenario: ScreenScenarioType): number;
 
+  /**
+   * Stops screen sharing.
+   *
+   * @returns
+   * 0: Success.< 0: Failure.
+   */
+  abstract stopScreenCapture(): number;
+
   /**
    * Stops the local video preview.
    * After calling startPreview to start the preview, if you want to close the local video preview, call this method.Call this method before joining a channel or after leaving a channel.
@@ -4839,7 +4847,7 @@ export abstract class IRtcEngine {
    * @returns
    * < 0: Failure.
    */
-  abstract stopScreenCapture(sourceType?: VideoSourceType): number;
+  abstract stopScreenCaptureBySourceType(sourceType: VideoSourceType): number;
 
   /**
    * Retrieves the call ID.
@@ -5590,27 +5598,7 @@ export abstract class IRtcEngine {
   /**
    * @ignore
    */
-  abstract getNtpTimeInMs(): number;
-
-  /**
-   * Destroys a video renderer object.
-   *
-   * @param view The HTMLElement object to be destroyed.
-   */
-  abstract destroyRendererByView(view: any): void;
-
-  /**
-   * Destroys multiple video renderer objects at one time.
-   *
-   * @param sourceType The type of the video frame, see VideoSourceType .
-   * @param channelId The channel name. This parameter signifies the channel in which users engage in real-time audio and video interaction. Under the premise of the same App ID, users who fill in the same channel ID enter the same channel for audio and video interaction. The string length must be less than 64 bytes. Supported characters:All lowercase English letters: a to z.All uppercase English letters: A to Z.All numeric characters: 0 to 9.Space"!", "#", "$", "%", "&", "(", ")", "+", "-", ":", ";", "<", "= ", ".", ">", "?", "@", "[", "]", "^", "_", "{", "}", "|", "~", ","
-   * @param uid The user ID of the remote user.
-   */
-  abstract destroyRendererByConfig(
-    sourceType: VideoSourceType,
-    channelId?: string,
-    uid?: number
-  ): void;
+  abstract getNtpWallTimeInMs(): number;
 
   /**
    * Gets the IAudioDeviceManager object to manage audio devices.
@@ -5680,6 +5668,26 @@ export abstract class IRtcEngine {
    */
   abstract setMaxMetadataSize(size: number): number;
 
+  /**
+   * Destroys a video renderer object.
+   *
+   * @param view The HTMLElement object to be destroyed.
+   */
+  abstract destroyRendererByView(view: any): void;
+
+  /**
+   * Destroys multiple video renderer objects at one time.
+   *
+   * @param sourceType The type of the video frame, see VideoSourceType .
+   * @param channelId The channel name. This parameter signifies the channel in which users engage in real-time audio and video interaction. Under the premise of the same App ID, users who fill in the same channel ID enter the same channel for audio and video interaction. The string length must be less than 64 bytes. Supported characters:All lowercase English letters: a to z.All uppercase English letters: A to Z.All numeric characters: 0 to 9.Space"!", "#", "$", "%", "&", "(", ")", "+", "-", ":", ";", "<", "= ", ".", ">", "?", "@", "[", "]", "^", "_", "{", "}", "|", "~", ","
+   * @param uid The user ID of the remote user.
+   */
+  abstract destroyRendererByConfig(
+    sourceType: VideoSourceType,
+    channelId?: string,
+    uid?: number
+  ): void;
+
   /**
    * Unregisters the encoded audio frame observer.
    *