agora-electron-sdk 4.2.6 → 4.3.0-dev.1

package/js/Utils.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 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)) {
@@ -20,8 +9,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AgoraEnv = exports.classMix = exports.getDefaultRendererVideoConfig = exports.formatConfigByVideoSourceType = exports.objsKeysToLowerCase = exports.parseJSON = exports.logDebug = exports.logInfo = exports.logError = exports.logWarn = exports.deprecate = exports.DEBUG_TAG = exports.TAG = void 0;
-var AgoraMediaBase_1 = require("./Private/AgoraMediaBase");
+exports.AgoraEnv = exports.isSupportWebGL = exports.classMix = exports.objsKeysToLowerCase = exports.logDebug = exports.logInfo = exports.logError = exports.logWarn = exports.DEBUG_TAG = exports.TAG = void 0;
 /**
  * @ignore
  */
@@ -30,13 +18,6 @@ exports.TAG = '[Agora]: ';
  * @ignore
  */
 exports.DEBUG_TAG = '[Agora Debug]: ';
-/**
- * @ignore
- */
-var deprecate = function (originApi, replaceApi) {
-    return (0, exports.logError)("".concat(exports.TAG, " This method ").concat(originApi, " will be deprecated soon. "), replaceApi ? "Please use ".concat(replaceApi, " instead") : '');
-};
-exports.deprecate = deprecate;
 /**
  * @ignore
  */
@@ -76,7 +57,7 @@ var logInfo = function (msg) {
     if (!exports.AgoraEnv.enableLogging) {
         return;
     }
-    console.log.apply(console, __spreadArray(["".concat(exports.TAG, " ").concat(msg)], optParams, false));
+    console.info.apply(console, __spreadArray(["".concat(exports.TAG, " ").concat(msg)], optParams, false));
 };
 exports.logInfo = logInfo;
 /**
@@ -90,26 +71,9 @@ var logDebug = function (msg) {
     if (!exports.AgoraEnv.enableLogging || !exports.AgoraEnv.enableDebugLogging) {
         return;
     }
-    console.warn.apply(console, __spreadArray(["".concat(exports.DEBUG_TAG, " ").concat(msg)], optParams, false));
+    console.debug.apply(console, __spreadArray(["".concat(exports.DEBUG_TAG, " ").concat(msg)], optParams, false));
 };
 exports.logDebug = logDebug;
-/**
- * @ignore
- */
-var parseJSON = function (jsonString) {
-    if (jsonString === '') {
-        return jsonString;
-    }
-    var obj;
-    try {
-        obj = JSON.parse(jsonString);
-    }
-    catch (error) {
-        (0, exports.logError)('parseJSON', error);
-    }
-    return obj || jsonString;
-};
-exports.parseJSON = parseJSON;
 /**
  * @ignore
  */
@@ -124,53 +88,6 @@ var objsKeysToLowerCase = function (array) {
     });
 };
 exports.objsKeysToLowerCase = objsKeysToLowerCase;
-/**
- * @ignore
- */
-var formatConfigByVideoSourceType = function (videoSourceType, originChannelId, originUid) {
-    if (originChannelId === void 0) { originChannelId = ''; }
-    if (originUid === void 0) { originUid = 0; }
-    if (videoSourceType === undefined || videoSourceType === null) {
-        throw new Error("must set videoSourceType:".concat(videoSourceType));
-    }
-    var uid = originUid;
-    var channelId = originChannelId;
-    switch (videoSourceType) {
-        case AgoraMediaBase_1.VideoSourceType.VideoSourceCamera:
-        case AgoraMediaBase_1.VideoSourceType.VideoSourceCameraPrimary:
-        case AgoraMediaBase_1.VideoSourceType.VideoSourceScreen:
-        case AgoraMediaBase_1.VideoSourceType.VideoSourceScreenSecondary:
-        case AgoraMediaBase_1.VideoSourceType.VideoSourceTranscoded:
-            channelId = '';
-            uid = 0;
-            break;
-        case AgoraMediaBase_1.VideoSourceType.VideoSourceRemote:
-            if (!uid || !channelId) {
-                throw new Error("must set uid:".concat(uid, " and channelId:").concat(channelId));
-            }
-            break;
-        case AgoraMediaBase_1.VideoSourceType.VideoSourceMediaPlayer:
-            channelId = '';
-            if (!uid) {
-                throw new Error("must set mediaPlayerId:".concat(uid));
-            }
-            break;
-        default:
-            break;
-    }
-    return { uid: uid, channelId: channelId, videoSourceType: videoSourceType };
-};
-exports.formatConfigByVideoSourceType = formatConfigByVideoSourceType;
-/**
- * @ignore
- */
-var getDefaultRendererVideoConfig = function (config) {
-    var _a, _b;
-    var 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);
-    var _c = (0, exports.formatConfigByVideoSourceType)(config.videoSourceType, config.channelId, config.uid), uid = _c.uid, channelId = _c.channelId, videoSourceType = _c.videoSourceType;
-    return __assign(__assign({}, config), { uid: uid, channelId: channelId, videoSourceType: videoSourceType, rendererOptions: rendererOptions });
-};
-exports.getDefaultRendererVideoConfig = getDefaultRendererVideoConfig;
 /**
  * @ignore
  */
@@ -205,7 +122,39 @@ function copyProperties(target, source) {
         }
     }
 }
-var agora = require('../build/Release/agora_node_ext');
+/**
+ * @ignore
+ */
+function isSupportWebGL() {
+    var _a;
+    var flag = false;
+    var 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);
+                if (context) {
+                    return context;
+                }
+            }
+            return null;
+        };
+        var 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 = null;
+        (0, exports.logInfo)('Your browser support webGL');
+    }
+    catch (e) {
+        (0, exports.logWarn)('Your browser may not support webGL');
+        flag = false;
+    }
+    return flag;
+}
+exports.isSupportWebGL = isSupportWebGL;
+var AgoraNode = require('../build/Release/agora_node_ext');
 /**
  * @ignore
  */
@@ -213,5 +162,5 @@ exports.AgoraEnv = {
     enableLogging: true,
     enableDebugLogging: false,
     webEnvReady: true,
-    AgoraElectronBridge: new agora.AgoraElectronBridge(),
+    AgoraElectronBridge: new AgoraNode.AgoraElectronBridge(),
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-electron-sdk",
-  "version": "4.2.6",
+  "version": "4.3.0-dev.1",
   "description": "agora-electron-sdk",
   "main": "js/AgoraSdk",
   "types": "types/AgoraSdk.d.ts",
@@ -10,6 +10,7 @@
     "ts",
     "types",
     "scripts",
+    "!scripts/terra",
     "gulpfile.js",
     "CHANGELOG.md",
     "!**/__tests__"
@@ -135,7 +136,7 @@
     "yuv-canvas": "1.2.6"
   },
   "agora_electron": {
-    "iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.2.6-build.3_DCG_Windows_Video_20231116_0243.zip",
-    "iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.2.6-build.3_DCG_Mac_Video_20231116_0243.zip"
+    "iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.3.0-build.2_DCG_Windows_Video_20240219_0110.zip",
+    "iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.3.0-build.2_DCG_Mac_Video_20240219_0110.zip"
   }
 }

package/scripts/clean.js

@@ -15,6 +15,18 @@ exports.cleanIrisDir = async () => {
   logger.info(`clean:${destIrisSDKDir}`);
 };
 
+exports.cleanIrisUselessFile = async () => {
+  let uselessFileList = [
+    `${destIrisSDKDir}/MAC/Release/AgoraRtcWrapperUnity.bundle`,
+  ];
+  for (let file of uselessFileList) {
+    if (fs.existsSync(file)) {
+      await fs.remove(file);
+      logger.info(`clean:${file}`);
+    }
+  }
+};
+
 exports.cleanBuildDir = async () => {
   await fs.remove(buildDir);
   logger.info(`clean:${buildDir}`);

package/scripts/synclib.js

@@ -2,7 +2,11 @@ const path = require('path');
 
 const download = require('download');
 
-const { destIrisSDKDir, cleanIrisDir } = require('./clean');
+const {
+  destIrisSDKDir,
+  cleanIrisDir,
+  cleanIrisUselessFile,
+} = require('./clean');
 const getConfig = require('./getConfig');
 const logger = require('./logger');
 const { getOS } = require('./util');
@@ -33,7 +37,9 @@ const syncLib = async (cb) => {
   const os = getOS();
   await downloadSDK({
     preHook: cleanIrisDir,
-    postHook: () => {},
+    postHook: () => {
+      os === 'mac' && cleanIrisUselessFile();
+    },
     sdkURL: os === 'mac' ? iris_sdk_mac : iris_sdk_win,
     destDir: destIrisSDKDir,
   });