trtc-electron-sdk 10.3.100-alpha.2 → 10.3.100-alpha.3

package/liteav/trtc.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { EventEmitter } from 'events';
 import { AudioMusicParam, Rect, TRTCAppScene, TRTCAudioEffectParam, TRTCAudioQuality, TRTCBeautyStyle, TRTCDeviceState, TRTCDeviceType, TRTCLogLevel, TRTCRenderParams, TRTCRoleType, TRTCSwitchRoomParam, TRTCVideoBufferType, TRTCVideoFillMode, TRTCVideoFrame, TRTCVideoPixelFormat, TRTCVideoRotation, TRTCVideoStreamType, TRTCWaterMarkSrcType, PluginInfo, TRTCAudioRecordingParams, TRTCScreenCaptureSourceInfo, TRTCScreenCaptureProperty } from './trtc_define';
 export * from './trtc_define';
@@ -43,6 +44,7 @@ declare class TRTCCloud extends EventEmitter {
     private enableRenderFrame;
     private screenCaptureStreamType;
     private isScreenCapturing;
+    private userStreamDumpRecord;
     constructor();
     /**
      * 创建 TRTCCloud 对象单例
@@ -2026,6 +2028,15 @@ declare class TRTCCloud extends EventEmitter {
      * @throws {Error}
      */
     _writefile(path: string, data: any): void;
+    _dumpframe(options: {
+        uid: string;
+        type: number;
+        timestamp: number;
+        width: number;
+        height: number;
+        pixelFormat: number;
+        data: Uint8Array | Buffer;
+    }): void;
     _writeLog(info: string): void;
     _onUserRenderCallback(callback: (userid: string, streamType: TRTCVideoStreamType, videoframe: TRTCVideoFrame) => void, format: TRTCVideoPixelFormat, userid: string, streamType: TRTCVideoStreamType, width: number, height: number, timestamp: number, rotation: number, data: any): void;
     _initImageData(width: number, height: number): void;

package/liteav/trtc.js

@@ -155,6 +155,7 @@ class TRTCCloud extends events_1.EventEmitter {
         this.remoteVideoCallback = new Map();
         secMethods(this);
         this.callExperimentalAPI("{\"api\":\"setCurrentEnvironment\",\"params\" :{\"electron\":true}}");
+        this.userStreamDumpRecord = new Map();
     }
     /**
      * 创建 TRTCCloud 对象单例
@@ -183,6 +184,7 @@ class TRTCCloud extends events_1.EventEmitter {
     }
     setExternalRenderEnabled(enabled) {
         this.isExternalRenderEnabled = enabled;
+        console.log('trtc:setExternalRenderEnabled:', enabled);
     }
     /**
      * 清理资源
@@ -2717,7 +2719,7 @@ class TRTCCloud extends events_1.EventEmitter {
         if (userId !== undefined && userId !== null
             && pixelFormat !== undefined && bufferType !== undefined && callback !== undefined) {
             if (callback !== null) {
-                let remotecallback = new VideoRenderCallback();
+                const remotecallback = new VideoRenderCallback();
                 remotecallback.callback = callback;
                 remotecallback.pixelFormat = pixelFormat;
                 this.remoteVideoCallback.set(String(userId), remotecallback);
@@ -3182,7 +3184,7 @@ class TRTCCloud extends events_1.EventEmitter {
     startCameraDeviceTest(view) {
         if (view !== undefined) {
             if (view !== null) {
-                let key = this.getKey(CAMERA_DEVICE_TEST_VIEW, trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
+                const key = this.getKey(CAMERA_DEVICE_TEST_VIEW, trtc_define_1.TRTCVideoStreamType.TRTCVideoStreamTypeBig);
                 this._initRender(key, view);
                 const renderer = this.streams.get(key);
                 renderer.setContentMode(trtc_define_1.TRTCVideoFillMode.TRTCVideoFillMode_Fill);
@@ -3386,7 +3388,7 @@ class TRTCCloud extends events_1.EventEmitter {
                         this._onRenderFrame(id, type, width, height, timestamp, rotation, videoBufferInfo.buffer);
                     }
                     else {
-                        // 宽高发生变化，不能渲染，此时JS层新建了Buffer，低层C++回调上来的是写入旧Buffer的帧，渲染会导致录屏
+                        // 宽高发生变化，不能渲染，此时JS层新建了Buffer，低层C++回调上来的是写入旧Buffer的帧，渲染会导致绿屏
                         console.warn('trtc: received old buffer size data:', id, type, width, height, videoBufferInfo.width, videoBufferInfo.height);
                     }
                 }
@@ -3419,7 +3421,7 @@ class TRTCCloud extends events_1.EventEmitter {
         if (this.renderMode !== mode) {
             this.renderMode = mode;
             // 遍历原有的renderer，改为新的渲染模式
-            let oldStreams = new Map();
+            const oldStreams = new Map();
             this.streams.forEach((value, key, map) => {
                 oldStreams.set(key, value);
             });
@@ -3510,14 +3512,24 @@ class TRTCCloud extends events_1.EventEmitter {
         }
     }
     _getRenderer(uid, type) {
-        let key = this.getKey(uid, type);
+        const key = this.getKey(uid, type);
         return this.streams.get(key);
     }
     _onRenderFrame(uid, type, width, height, timestamp, rotation, data) {
+        console.log(`trtc:_onRenderFrame:${uid}_${type}_${timestamp}_${width}_${height}_${this.pixelformate}`);
+        this._dumpframe({
+            uid,
+            type,
+            timestamp,
+            width,
+            height,
+            pixelFormat: this.pixelformate,
+            data: new Uint8Array(data.slice(0))
+        });
         // 由于 mac 监听自定义渲染回调后不会回调 onFirstVideoFrame ，所以在这里自己实现回调 onFirstVideoFrame
         if (this._isMacPlatform()) {
             setImmediate(() => {
-                let index = this.firstVideoFrameList.findIndex(function (item) {
+                const index = this.firstVideoFrameList.findIndex(function (item) {
                     return uid === item.uid && type === item.type;
                 });
                 if (index === -1) {
@@ -3578,11 +3590,12 @@ class TRTCCloud extends events_1.EventEmitter {
                 this._onRealRender(uid, streamType, width, height, timestamp, rotation, data);
             }
             //回调远程给用户数据
-            let remoteCallback = this.remoteVideoCallback.get(uid);
+            const remoteCallback = this.remoteVideoCallback.get(uid);
             if (remoteCallback !== undefined &&
                 remoteCallback !== null &&
                 remoteCallback.callback !== undefined &&
                 remoteCallback.callback !== null) {
+                console.log(`trtc:remote_render_callback_${uid}_${type}_${timestamp}_${remoteCallback.pixelFormat}`);
                 this._onUserRenderCallback(remoteCallback.callback, remoteCallback.pixelFormat, uid, type, width, height, timestamp, rotation, data);
             }
         }
@@ -3682,22 +3695,51 @@ class TRTCCloud extends events_1.EventEmitter {
      * @throws {Error}
      */
     _writefile(path, data) {
-        let fs = require('fs');
-        fs.writeFile(path, data, (err) => {
-            if (err) {
-                throw err;
+        try {
+            // const fs = require("fs");
+            if (global.fs && global.fs.writeFile) {
+                global.fs.writeFile(path, data, (err) => {
+                    if (err) {
+                        throw err;
+                    }
+                    else {
+                        console.log('trtc:write file ok, path:' + path);
+                    }
+                });
             }
             else {
-                console.log('trtc:write file ok, path:' + path);
+                console.error('trtc: _writeFile failed.', global.fs, global.fs.writeFile);
             }
-        });
+        }
+        catch (err) {
+            console.error('trtc: _writeFile failed.', err);
+        }
+    }
+    _dumpframe(options) {
+        if (global.homedir) {
+            const { uid, type, timestamp, width, height, data, pixelFormat } = options;
+            const timestampSecond = Math.floor(timestamp / 5000);
+            const key = `${uid}_${type}_${timestampSecond}`;
+            const timestampRecord = this.userStreamDumpRecord.get(key);
+            if (timestampRecord || timestampSecond === 0) {
+                return;
+            }
+            const midPath = this._isMacPlatform() ? "/Documents/log/" : "/AppData/Roaming/liteav/log/";
+            const fileName = `${uid}_${type}_${timestamp}_${width}_${height}_${pixelFormat}.jfdump`;
+            const fullPath = `${global.homedir}${midPath}${fileName}`;
+            this._writefile(fullPath, data);
+            this.userStreamDumpRecord.set(key, timestampSecond);
+        }
+        else {
+            console.error("trtc: no homedir, please add in Electron preload.js");
+        }
     }
     _writeLog(info) {
         this.rtcCloud.writeLog(info);
     }
     _onUserRenderCallback(callback, format, userid, streamType, width, height, timestamp, rotation, data) {
         if (callback !== null) {
-            let videoframe = new trtc_define_1.TRTCVideoFrame();
+            const videoframe = new trtc_define_1.TRTCVideoFrame();
             videoframe.videoFormat = format;
             videoframe.bufferType = trtc_define_1.TRTCVideoBufferType.TRTCVideoBufferType_Buffer;
             videoframe.textureId = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trtc-electron-sdk",
-  "version": "10.3.100-alpha.2",
+  "version": "10.3.100-alpha.3",
   "description": "trtc electron sdk",
   "main": "./liteav/trtc.js",
   "types": "./liteav/trtc.d.ts",