eedatek-electron-screenrecord 2.1.3 → 2.1.5

package/lib/index.d.ts

@@ -34,6 +34,7 @@ export default class ScreenRecord extends Events {
     private isRecording;
     private mouseMoveListener;
     private scaleFactor;
+    private sourceId;
     constructor(opts?: ScreenRecordOpts);
     updateButtonBounds(bounds: {
         x: number;

package/lib/index.js

@@ -45,6 +45,7 @@ class ScreenRecord extends events_1.default {
     isRecording = false;
     mouseMoveListener = null;
     scaleFactor = 1;
+    sourceId = "";
     constructor(opts) {
         super();
         this.logger = opts?.logger || (0, debug_1.default)("electron-screenshots");
@@ -55,6 +56,7 @@ class ScreenRecord extends events_1.default {
     //更新开始、结束录屏按钮区域
     updateButtonBounds(bounds) {
         this.logger(`updateButtonBounds x:${bounds.x} y:${bounds.y} w:${bounds.width} h:${bounds.height}`);
+        this.isRecording = true;
         this.buttonBounds = bounds;
     }
     startMouseTracking() {
@@ -67,6 +69,7 @@ class ScreenRecord extends events_1.default {
             // const mousePos = screen.getCursorScreenPoint();
             const mousePos = robot.getMousePos();
             const winBounds = this.$win?.getBounds();
+            // console.log(`mousePos: x:${mousePos.x} y: ${mousePos.y}`);
             // 计算鼠标是否在按钮区域内
             const isInButtonArea = this.isMouseInButtonArea(mousePos, winBounds);
             if (isInButtonArea) {
@@ -107,6 +110,7 @@ class ScreenRecord extends events_1.default {
      */
     async startCapture() {
         this.logger("startCapture");
+        this.reset();
         const display = (0, getDisplay_1.default)();
         //全屏的截图base64
         const [imageUrl] = await Promise.all([this.capture(display)]);
@@ -231,6 +235,7 @@ class ScreenRecord extends events_1.default {
             // })
             this.$win.on("closed", () => {
                 this.emit("windowClosed", this.$win);
+                this.isRecording = false;
                 this.$win = null;
                 this.stopMouseTracking();
             });
@@ -282,36 +287,8 @@ class ScreenRecord extends events_1.default {
                 this.logger("SCREENRECORD:capture Can't find screen source. sources: %o, display: %o", sources, display);
                 throw new Error("Can't find screen source");
             }
+            this.sourceId = source.id;
             return source.thumbnail.toDataURL();
-            // const { Screenshots: NodeScreenshots } = await import('node-screenshots');
-            // const capturer = NodeScreenshots.fromPoint(
-            //   display.x + display.width / 2,
-            //   display.y + display.height / 2,
-            // );
-            // this.logger(
-            //   'SCREENRECORD:capture NodeScreenshots.fromPoint arguments %o',
-            //   display,
-            // );
-            // this.logger(
-            //   'SCREENRECORD:capture NodeScreenshots.fromPoint return %o',
-            //   capturer
-            //     ? {
-            //       id: capturer.id,
-            //       x: capturer.x,
-            //       y: capturer.y,
-            //       width: capturer.width,
-            //       height: capturer.height,
-            //       rotation: capturer.rotation,
-            //       scaleFactor: capturer.scaleFactor,
-            //       isPrimary: capturer.isPrimary,
-            //     }
-            //     : null,
-            // );
-            // if (!capturer) {
-            //   throw new Error(`NodeScreenshots.fromDisplay(${display.id}) get null`);
-            // }
-            // const image = await capturer.capture();
-            // return `data:image/png;base64,${image.toString('base64')}`;
         }
         catch (err) {
             this.logger("SCREENRECORD:capture NodeScreenshots capture() error %o", err);
@@ -337,6 +314,7 @@ class ScreenRecord extends events_1.default {
                 this.logger("SCREENRECORD:capture Can't find screen source. sources: %o, display: %o", sources, display);
                 throw new Error("Can't find screen source");
             }
+            this.sourceId = source.id;
             return source.thumbnail.toDataURL();
         }
     }
@@ -355,7 +333,6 @@ class ScreenRecord extends events_1.default {
             this.logger("callback SCREENRECORD:ok");
             this.$win?.setIgnoreMouseEvents(true, { forward: true });
             if (process.platform !== "win32") {
-                this.isRecording = true;
                 this.startMouseTracking();
             }
         });
@@ -370,7 +347,6 @@ class ScreenRecord extends events_1.default {
          * CANCEL事件
          */
         electron_1.ipcMain.on("SCREENRECORD:cancel", () => {
-            this.isRecording = false;
             this.logger("callback SCREENRECORD:cancel");
             this.$win?.setIgnoreMouseEvents(false);
             if (process.platform !== "win32") {
@@ -411,10 +387,20 @@ class ScreenRecord extends events_1.default {
             this.updateButtonBounds(data);
         });
         electron_1.ipcMain.handle("SCREENRECORD:get-desktop-capturer-source", async () => {
-            return [
+            const sources = [
                 ...(await electron_1.desktopCapturer.getSources({ types: ["screen", "window"] })),
                 ...(await selfWindws()),
             ];
+            if (sources.length > 0) {
+                sources.forEach((source) => {
+                    this.logger("sources name" + source.name + " id:" + source.id);
+                });
+            }
+            return sources;
+        });
+        electron_1.ipcMain.handle("SCREENRECORD:get-desktop-capturer-source-id", async () => {
+            this.logger("sources id:" + this.sourceId);
+            return this.sourceId;
         });
         electron_1.ipcMain.handle("SCREENRECORD:get-display-nearest-point", async () => {
             if (this.$win) {

package/lib/preload.js

@@ -53,6 +53,9 @@ electron_1.contextBridge.exposeInMainWorld('screenshots', {
     invokeGetDesktopCapturerSource: () => {
         return electron_1.ipcRenderer.invoke('SCREENRECORD:get-desktop-capturer-source');
     },
+    invokeGetDesktopCapturerSourceId: () => {
+        return electron_1.ipcRenderer.invoke('SCREENRECORD:get-desktop-capturer-source-id');
+    },
     invokeGetDisplayNearestPoint: () => {
         return electron_1.ipcRenderer.invoke('SCREENRECORD:get-display-nearest-point');
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eedatek-electron-screenrecord",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "description": "electron 录屏插件",
   "types": "lib/index.d.ts",
   "main": "lib/index.cjs.js",
@@ -34,7 +34,7 @@
   "dependencies": {
     "@jitsi/robotjs": "0.6.18",
     "debug": "^4.3.4",
-    "eedatek-react-screenrecord": "^2.0.9",
+    "eedatek-react-screenrecord": "^2.1.5",
     "fs-extra": "^11.1.1"
   },
   "peerDependencies": {