agora-electron-sdk 4.3.2 → 4.4.0-dev.1

package/js/Renderer/YUVCanvasRenderer/index.js

@@ -1,44 +1,24 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.YUVCanvasRenderer = void 0;
-var IRenderer_1 = require("../IRenderer");
-var YUVBuffer = require('yuv-buffer');
-var YUVCanvas = require('yuv-canvas');
-var YUVCanvasRenderer = /** @class */ (function (_super) {
-    __extends(YUVCanvasRenderer, _super);
-    function YUVCanvasRenderer() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    YUVCanvasRenderer.prototype.bind = function (element) {
-        _super.prototype.bind.call(this, element);
+const IRenderer_1 = require("../IRenderer");
+const YUVBuffer = require('yuv-buffer');
+const YUVCanvas = require('yuv-canvas');
+class YUVCanvasRenderer extends IRenderer_1.IRenderer {
+    bind(element) {
+        super.bind(element);
         this.frameSink = YUVCanvas.attach(this.canvas, {
             webGL: false,
         });
-    };
-    YUVCanvasRenderer.prototype.drawFrame = function (_a) {
-        var width = _a.width, height = _a.height, yStride = _a.yStride, uStride = _a.uStride, vStride = _a.vStride, yBuffer = _a.yBuffer, uBuffer = _a.uBuffer, vBuffer = _a.vBuffer, rotation = _a.rotation;
-        this.rotateCanvas({ width: width, height: height, rotation: rotation });
+    }
+    drawFrame({ width, height, yStride, uStride, vStride, yBuffer, uBuffer, vBuffer, rotation, }) {
+        this.rotateCanvas({ width, height, rotation });
         this.updateRenderMode();
         if (!this.frameSink)
             return;
         this.frameSink.drawFrame(YUVBuffer.frame(YUVBuffer.format({
-            width: width,
-            height: height,
+            width,
+            height,
             chromaWidth: width / 2,
             chromaHeight: height / 2,
             cropLeft: yStride - width,
@@ -52,15 +32,13 @@ var YUVCanvasRenderer = /** @class */ (function (_super) {
             bytes: vBuffer,
             stride: vStride,
         }));
-        _super.prototype.drawFrame.call(this);
-    };
-    YUVCanvasRenderer.prototype.rotateCanvas = function (_a) {
-        var width = _a.width, height = _a.height, rotation = _a.rotation;
-        _super.prototype.rotateCanvas.call(this, { width: width, height: height, rotation: rotation });
+        super.drawFrame();
+    }
+    rotateCanvas({ width, height, rotation }) {
+        super.rotateCanvas({ width, height, rotation });
         if (!this.canvas)
             return;
-        this.canvas.style.transform += " rotateZ(".concat(rotation, "deg)");
-    };
-    return YUVCanvasRenderer;
-}(IRenderer_1.IRenderer));
+        this.canvas.style.transform += ` rotateZ(${rotation}deg)`;
+    }
+}
 exports.YUVCanvasRenderer = YUVCanvasRenderer;

package/js/Utils.js

@@ -1,15 +1,6 @@
 "use strict";
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AgoraEnv = exports.isSupportWebGL = exports.classMix = exports.objsKeysToLowerCase = exports.logDebug = exports.logInfo = exports.logError = exports.logWarn = exports.DEBUG_TAG = exports.TAG = void 0;
+exports.AgoraEnv = exports.isSupportWebGL = exports.classMix = exports.objsKeysToLowerCase = exports.logDebug = exports.logInfo = exports.logError = exports.logWarn = exports.parseIntPtr2Number = exports.DEBUG_TAG = exports.TAG = void 0;
 /**
  * @ignore
  */
@@ -21,67 +12,67 @@ exports.DEBUG_TAG = '[Agora Debug]: ';
 /**
  * @ignore
  */
-var logWarn = function (msg) {
-    var optParams = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        optParams[_i - 1] = arguments[_i];
+function parseIntPtr2Number(value) {
+    try {
+        let bigIntVal = BigInt(value);
+        if (bigIntVal > 2n ** 63n - 1n) {
+            bigIntVal -= 2n ** 64n;
+        }
+        return Number(bigIntVal);
+    }
+    catch (e) {
+        return value;
     }
+}
+exports.parseIntPtr2Number = parseIntPtr2Number;
+/**
+ * @ignore
+ */
+const logWarn = (msg, ...optParams) => {
     if (!exports.AgoraEnv.enableLogging) {
         return;
     }
-    console.warn.apply(console, __spreadArray(["".concat(exports.TAG, " ").concat(msg)], optParams, false));
+    console.warn(`${exports.TAG} ${msg}`, ...optParams);
 };
 exports.logWarn = logWarn;
 /**
  * @ignore
  */
-var logError = function (msg) {
-    var optParams = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        optParams[_i - 1] = arguments[_i];
-    }
+const logError = (msg, ...optParams) => {
     if (!exports.AgoraEnv.enableLogging) {
         return;
     }
-    console.error.apply(console, __spreadArray(["".concat(exports.TAG, " ").concat(msg)], optParams, false));
+    console.error(`${exports.TAG} ${msg}`, ...optParams);
 };
 exports.logError = logError;
 /**
  * @ignore
  */
-var logInfo = function (msg) {
-    var optParams = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        optParams[_i - 1] = arguments[_i];
-    }
+const logInfo = (msg, ...optParams) => {
     if (!exports.AgoraEnv.enableLogging) {
         return;
     }
-    console.info.apply(console, __spreadArray(["".concat(exports.TAG, " ").concat(msg)], optParams, false));
+    console.info(`${exports.TAG} ${msg}`, ...optParams);
 };
 exports.logInfo = logInfo;
 /**
  * @ignore
  */
-var logDebug = function (msg) {
-    var optParams = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        optParams[_i - 1] = arguments[_i];
-    }
+const logDebug = (msg, ...optParams) => {
     if (!exports.AgoraEnv.enableLogging || !exports.AgoraEnv.enableDebugLogging) {
         return;
     }
-    console.debug.apply(console, __spreadArray(["".concat(exports.DEBUG_TAG, " ").concat(msg)], optParams, false));
+    console.debug(`${exports.DEBUG_TAG} ${msg}`, ...optParams);
 };
 exports.logDebug = logDebug;
 /**
  * @ignore
  */
-var objsKeysToLowerCase = function (array) {
-    array.forEach(function (obj) {
-        for (var key in obj) {
+const objsKeysToLowerCase = (array) => {
+    array.forEach((obj) => {
+        for (const key in obj) {
             if (Object.prototype.hasOwnProperty.call(obj, key)) {
-                var element = obj[key];
+                const element = obj[key];
                 obj[key.toLocaleLowerCase()] = element;
             }
         }
@@ -91,22 +82,15 @@ exports.objsKeysToLowerCase = objsKeysToLowerCase;
 /**
  * @ignore
  */
-function classMix() {
-    var mixins = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        mixins[_i] = arguments[_i];
-    }
-    var MixClass = /** @class */ (function () {
-        function MixClass() {
-            for (var _i = 0, mixins_2 = mixins; _i < mixins_2.length; _i++) {
-                var mixin = mixins_2[_i];
+function classMix(...mixins) {
+    class MixClass {
+        constructor() {
+            for (let mixin of mixins) {
                 copyProperties(this, new mixin()); // 拷贝实例属性
             }
         }
-        return MixClass;
-    }());
-    for (var _a = 0, mixins_1 = mixins; _a < mixins_1.length; _a++) {
-        var mixin = mixins_1[_a];
+    }
+    for (let mixin of mixins) {
         copyProperties(MixClass, mixin); // 拷贝静态属性
         copyProperties(MixClass.prototype, mixin.prototype); // 拷贝原型属性
     }
@@ -114,10 +98,9 @@ function classMix() {
 }
 exports.classMix = classMix;
 function copyProperties(target, source) {
-    for (var _i = 0, _a = Reflect.ownKeys(source); _i < _a.length; _i++) {
-        var key = _a[_i];
+    for (let key of Reflect.ownKeys(source)) {
         if (key !== 'constructor' && key !== 'prototype' && key !== 'name') {
-            var desc = Object.getOwnPropertyDescriptor(source, key);
+            let desc = Object.getOwnPropertyDescriptor(source, key);
             Object.defineProperty(target, key, desc);
         }
     }
@@ -126,24 +109,22 @@ function copyProperties(target, source) {
  * @ignore
  */
 function isSupportWebGL() {
-    var _a;
-    var flag = false;
-    var canvas = document.createElement('canvas');
+    let flag = false;
+    const canvas = document.createElement('canvas');
     try {
-        var getContext = function (contextNames) {
-            if (contextNames === void 0) { contextNames = ['webgl2', 'webgl', 'experimental-webgl']; }
-            for (var i = 0; i < contextNames.length; i++) {
-                var contextName = contextNames[i];
-                var context = canvas === null || canvas === void 0 ? void 0 : canvas.getContext(contextName);
+        const getContext = (contextNames = ['webgl2', 'webgl', 'experimental-webgl']) => {
+            for (let i = 0; i < contextNames.length; i++) {
+                const contextName = contextNames[i];
+                const context = canvas?.getContext(contextName);
                 if (context) {
                     return context;
                 }
             }
             return null;
         };
-        var gl = getContext();
+        let gl = getContext();
         flag = !!gl;
-        (_a = gl === null || gl === void 0 ? void 0 : gl.getExtension('WEBGL_lose_context')) === null || _a === void 0 ? void 0 : _a.loseContext();
+        gl?.getExtension('WEBGL_lose_context')?.loseContext();
         gl = null;
         (0, exports.logInfo)('Your browser support webGL');
     }
@@ -154,7 +135,7 @@ function isSupportWebGL() {
     return flag;
 }
 exports.isSupportWebGL = isSupportWebGL;
-var AgoraNode = require('../build/Release/agora_node_ext');
+const AgoraNode = require('../build/Release/agora_node_ext');
 /**
  * @ignore
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-electron-sdk",
-  "version": "4.3.2",
+  "version": "4.4.0-dev.1",
   "description": "agora-electron-sdk",
   "main": "js/AgoraSdk",
   "types": "types/AgoraSdk.d.ts",
@@ -16,9 +16,11 @@
     "!**/__tests__"
   ],
   "scripts": {
+    "postinstall": "yarn checkElectron",
     "totalBuild": "cross-env-shell gulp totalBuild \\\"--INIT_CWD=$INIT_CWD\\\"",
     "build": "cross-env-shell gulp build \\\"--INIT_CWD=$INIT_CWD\\\"",
     "clean": "cross-env-shell gulp clean \\\"--INIT_CWD=$INIT_CWD\\\"",
+    "checkElectron": "cross-env-shell gulp checkElectron \\\"--INIT_CWD=$INIT_CWD\\\"",
     "syncLib": "cross-env-shell gulp syncLib \\\"--INIT_CWD=$INIT_CWD\\\"",
     "buildJS": "cross-env-shell gulp buildJS \\\"--INIT_CWD=$INIT_CWD\\\"",
     "zipBuild": "cross-env-shell gulp zipBuild \\\"--INIT_CWD=$INIT_CWD\\\"",
@@ -37,7 +39,8 @@
     "install": "cross-env-shell gulp NPM_Install \\\"--INIT_CWD=$INIT_CWD\\\"",
     "release": "release-it",
     "example": "yarn --cwd example",
-    "bootstrap": "yarn config set agora-electron-sdk-pre-built 0 && yarn example && yarn install && yarn patch-package && yarn build:ts-interface && yarn totalBuild && yarn link && yarn example link agora-electron-sdk && yarn config delete agora-electron-sdk-pre-built",
+    "example:prepare": "yarn example && cross-env-shell gulp checkElectron \\\"--INIT_CWD=$INIT_CWD/example\\\" \"--electron_path=$INIT_CWD/example/node_modules/electron/dist\"",
+    "bootstrap": "yarn config set agora-electron-sdk-pre-built 0 && yarn example && yarn install && yarn patch-package && yarn build:ts-interface && yarn totalBuild && yarn link && yarn example link agora-electron-sdk && yarn config delete agora-electron-sdk-pre-built && yarn example:prepare",
     "build:ts-interface": "ts-interface-builder ts/Private/*.ts -o ts/Private/ti/"
   },
   "keywords": [
@@ -87,7 +90,6 @@
   "engines": {
     "node": ">= 14.0.0"
   },
-  "packageManager": "^yarn@1.22.15",
   "jest": {
     "modulePathIgnorePatterns": [
       "<rootDir>/example/node_modules",
@@ -136,9 +138,9 @@
     "yuv-canvas": "1.2.6"
   },
   "agora_electron": {
-    "iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.3.2-build.1_DCG_Windows_Video_Standalone_20240604_0456_441.zip",
-    "iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.3.2-build.1_DCG_Mac_Video_Standalone_20240604_0500_404.zip",
-    "native_sdk_win": "https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows_v4.3.2_FULL.zip",
-    "native_sdk_mac": "https://download.agora.io/sdk/release/Agora_Native_SDK_for_Mac_v4.3.2_FULL.zip"
+    "iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.4.0-dev.4_DCG_Windows_Video_Standalone_20240624_0313_450.zip",
+    "iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.4.0-dev.4_DCG_Mac_Video_Standalone_20240624_0313_413.zip",
+    "native_sdk_win": "https://download.agora.io/sdk/release/AgoraRtcEngine_windows_Preview_4.4.0-dev.4.zip",
+    "native_sdk_mac": "https://download.agora.io/sdk/release/AgoraRtcEngine_macOS_Preview_4.4.0-dev.4.zip"
   }
 }

package/scripts/checkElectron.js

@@ -0,0 +1,41 @@
+const path = require('path');
+
+const download = require('download');
+
+const { cleanDir } = require('./clean');
+const getConfig = require('./getConfig');
+const logger = require('./logger');
+
+const config = getConfig();
+const { electron_version, arch, platform } = config;
+let { electron_path } = config;
+const checkElectron = async (cb) => {
+  logger.info(`start sync electron`);
+  if (!electron_version || platform !== 'darwin') {
+    cb();
+    logger.info('electron_version is not set or os is not mac, skip sync');
+    return;
+  }
+
+  if (!electron_path) {
+    try {
+      electron_path = require.resolve('electron');
+    } catch (error) {
+      logger.info('Electron is not installed, skip sync');
+      cb();
+      return;
+    }
+  }
+  let tp = path.join(electron_path, `../dist`);
+  let downloadUrl = `https://download.agora.io/sdk/release/electron-v${electron_version}-${platform}-${arch}.zip`;
+  logger.info(`Downloading:${downloadUrl}`);
+  await cleanDir(tp);
+  await download(downloadUrl, tp, {
+    extract: true,
+  });
+  logger.info(`Finish download:${downloadUrl}`);
+  logger.info(`sync electron success`);
+  cb();
+};
+
+module.exports = checkElectron;

package/scripts/downloadPrebuild.js

@@ -8,16 +8,12 @@ const getConfig = require('./getConfig');
 const logger = require('./logger');
 const { getOS } = require('./util');
 
-const {
-  platform,
-  packageVersion,
-  arch,
-  no_symbol,
-  native_sdk_mac,
-  native_sdk_win,
-} = getConfig();
+const { platform, arch, no_symbol, native_sdk_mac, native_sdk_win } =
+  getConfig();
 
 const workspaceDir = `${path.join(__dirname, '..')}`;
+const packageVersion = '4.3.2';
+const normalizePath = (filePath) => filePath.split(path.sep).join('/');
 
 const getDownloadURL = () => {
   let downloadUrl = `https://download.agora.io/sdk/release/Electron-${getOS()}-${packageVersion}-napi.zip`;
@@ -29,7 +25,7 @@ const getDownloadURL = () => {
 
 const getNativeDownloadURL = () => {
   let downloadUrl = '';
-  if (platform === 'win32' && arch === 'x64') {
+  if (platform === 'win32') {
     downloadUrl = native_sdk_win;
   } else if (platform === 'darwin') {
     downloadUrl = native_sdk_mac;
@@ -38,15 +34,25 @@ const getNativeDownloadURL = () => {
 };
 
 const matchNativeFile = (path) => {
-  if (platform === 'win32' && arch === 'ia32') {
-    return /^sdk\/x86\/.*\.dll$/.test(path);
-  } else if (platform === 'win32' && arch === 'x64') {
-    return /^sdk\/x86_64\/.*\.dll$/.test(path);
-  } else if (platform === 'darwin') {
-    return /^libs\/.*\.xcframework\/macos-arm64_x86_64\/.*\.framework$/.test(
-      path
-    );
+  let result = false;
+  switch (platform) {
+    case 'win32':
+      switch (arch) {
+        case 'ia32':
+          result = path.startsWith('sdk/x86/') && path.endsWith('.dll');
+          break;
+        case 'x64':
+          result = path.startsWith('sdk/x86_64/') && path.endsWith('.dll');
+          break;
+      }
+      break;
+    case 'darwin':
+      result =
+        path.startsWith('libs') &&
+        /^libs\/.*\.xcframework\/macos-arm64_x86_64\//.test(path);
+      break;
   }
+  return result;
 };
 
 const macNoSymbolList = [
@@ -126,16 +132,42 @@ module.exports = async () => {
   if (nativeDownloadURL) {
     logger.info('Native SDK URL  %s ', nativeDownloadURL);
     logger.info('Downloading native SDK for Agora Electron SDK...');
-    await download(nativeDownloadURL, `${buildDir}/Release`, {
+    const nativeLibDir = path.resolve(__dirname, `${buildDir}/Release`);
+    await download(nativeDownloadURL, nativeLibDir, {
       strip: 1,
       extract: true,
       filter: (file) => {
-        return (
-          file.type !== 'directory' &&
-          matchNativeFile(file.path) &&
-          !file.path.endsWith(path.sep) &&
-          file.data.length !== 0
-        );
+        file.path = normalizePath(file.path);
+        if (matchNativeFile(file.path)) {
+          if (file.type === 'file' && file.path.endsWith('/')) {
+            file.type = 'directory';
+          }
+          switch (platform) {
+            case 'win32':
+              switch (arch) {
+                case 'ia32':
+                  file.path = file.path.replace(/^sdk\/x86\//, '');
+                  break;
+                case 'x64':
+                  file.path = file.path.replace(/^sdk\/x86_64\//, '');
+                  break;
+              }
+              break;
+            case 'darwin':
+              file.path = file.path.replace(
+                /^libs\/.*\.xcframework\/macos-arm64_x86_64\//,
+                ''
+              );
+              if (fs.exists(`${nativeLibDir}/${file.path}`)) {
+                fs.remove(`${nativeLibDir}/${file.path}`);
+              }
+              break;
+          }
+          logger.info(`move native file: ${file.path} → ${nativeLibDir}`);
+          return true;
+        } else {
+          return false;
+        }
       },
     });
   }

package/scripts/synclib.js

@@ -23,12 +23,12 @@ const downloadSDK = async ({
   await download(sdkURL, destDir, {
     strip: strip,
     extract: true,
-    filter: (file) => {
-      return (
-        file.type !== 'directory' &&
-        !file.path.endsWith(path.sep) &&
-        file.data.length !== 0
-      );
+    //https://github.com/kevva/decompress/issues/68
+    map: (file) => {
+      if (file.type === 'file' && file.path.endsWith('/')) {
+        file.type = 'directory';
+      }
+      return file;
     },
   });
   logger.info(`Finish download:${sdkURL}`);