electron-screenshots 0.2.0 → 0.3.2

package/lib/preload.js

@@ -1,40 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var electron_1 = require("electron");
 var map = new Map();
@@ -43,44 +7,6 @@ electron_1.contextBridge.exposeInMainWorld('screenshots', {
         console.log('contextBridge ready');
         electron_1.ipcRenderer.send('SCREENSHOTS:ready');
     },
-    capture: function (display) { return __awaiter(void 0, void 0, void 0, function () {
-        var sources, source;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    console.log('contextBridge capture', display);
-                    return [4 /*yield*/, electron_1.desktopCapturer.getSources({
-                            types: ['screen'],
-                            thumbnailSize: {
-                                width: display.width,
-                                height: display.height
-                            }
-                        })];
-                case 1:
-                    sources = _a.sent();
-                    // Linux系统上，screen.getDisplayNearestPoint 返回的 Display 对象的 id 和 这儿 source 对象上的 display_id(Linux上，这个值是空字符串) 或 id 的中间部分，都不一致
-                    // 但是，如果只有一个显示器的话，其实不用判断，直接返回就行
-                    if (sources.length === 1) {
-                        source = sources[0];
-                    }
-                    else {
-                        source = sources.find(function (source) {
-                            return source.display_id === display.id.toString() || source.id.startsWith("screen:".concat(display.id, ":"));
-                        });
-                    }
-                    if (!source) {
-                        console.error(sources);
-                        console.error(display);
-                        throw new Error('没有获取到截图数据');
-                    }
-                    return [2 /*return*/, source.thumbnail.toDataURL()];
-            }
-        });
-    }); },
-    captured: function () {
-        console.log('contextBridge captured');
-        electron_1.ipcRenderer.send('SCREENSHOTS:captured');
-    },
     save: function (arrayBuffer, data) {
         console.log('contextBridge save', arrayBuffer, data);
         electron_1.ipcRenderer.send('SCREENSHOTS:save', Buffer.from(arrayBuffer), data);

package/lib/screenshots.d.ts

@@ -27,6 +27,7 @@ export default class Screenshots extends Events {
      * 初始化窗口
      */
     private createWindow;
+    private capture;
     /**
      * 绑定ipc时间处理
      */

package/lib/screenshots.js

@@ -14,6 +14,25 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -98,11 +117,11 @@ var Screenshots = /** @class */ (function (_super) {
             if (_this.$win && !_this.$win.isDestroyed()) {
                 _this.$win.close();
             }
-            _this.createWindow();
+            var boundAndDisplay = (0, getBoundAndDisplay_1.default)();
+            _this.createWindow(boundAndDisplay);
             // 捕捉桌面之后显示窗口
             // 避免截图窗口自己被截图
-            electron_1.ipcMain.once('SCREENSHOTS:captured', function () {
-                (0, logger_1.default)('SCREENSHOTS:captured');
+            _this.capture(boundAndDisplay).then(function () {
                 if (!_this.$win)
                     return;
                 // linux截图存在黑屏，这里设置为false就不会出现这个问题
@@ -136,8 +155,8 @@ var Screenshots = /** @class */ (function (_super) {
     /**
      * 初始化窗口
      */
-    Screenshots.prototype.createWindow = function () {
-        var _a = (0, getBoundAndDisplay_1.default)(), bound = _a.bound, display = _a.display;
+    Screenshots.prototype.createWindow = function (_a) {
+        var bound = _a.bound;
         this.$win = new electron_1.BrowserWindow({
             title: 'screenshots',
             x: bound.x,
@@ -173,8 +192,66 @@ var Screenshots = /** @class */ (function (_super) {
         });
         this.$win.setBrowserView(this.$view);
         this.$view.setBounds(bound);
-        (0, logger_1.default)('SCREENSHOTS:capture');
-        this.$view.webContents.send('SCREENSHOTS:capture', display);
+    };
+    Screenshots.prototype.capture = function (_a) {
+        var display = _a.display;
+        return __awaiter(this, void 0, void 0, function () {
+            var NodeScreenshots, capturer, image, err_1, sources, source;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        (0, logger_1.default)('SCREENSHOTS:capture');
+                        _b.label = 1;
+                    case 1:
+                        _b.trys.push([1, 4, , 6]);
+                        return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('node-screenshots')); })];
+                    case 2:
+                        NodeScreenshots = (_b.sent()).Screenshots;
+                        capturer = NodeScreenshots.fromDisplay(display.id);
+                        (0, logger_1.default)('SCREENSHOTS:NodeScreenshots.fromDisplay(%d) %o', display.id, capturer);
+                        if (!capturer) {
+                            throw new Error("NodeScreenshots.fromDisplay(".concat(display.id, ") get null"));
+                        }
+                        return [4 /*yield*/, capturer.capture()];
+                    case 3:
+                        image = _b.sent();
+                        this.$view.webContents.send('SCREENSHOTS:capture', display, "data:image/png;base64,".concat(image.toString('base64')));
+                        return [3 /*break*/, 6];
+                    case 4:
+                        err_1 = _b.sent();
+                        (0, logger_1.default)('SCREENSHOTS:capturer.capture() error %o', err_1);
+                        return [4 /*yield*/, electron_1.desktopCapturer.getSources({
+                                types: ['screen'],
+                                thumbnailSize: {
+                                    width: display.width,
+                                    height: display.height
+                                }
+                            })];
+                    case 5:
+                        sources = _b.sent();
+                        source = void 0;
+                        // Linux系统上，screen.getDisplayNearestPoint 返回的 Display 对象的 id 和 这儿 source 对象上的 display_id(Linux上，这个值是空字符串) 或 id 的中间部分，都不一致
+                        // 但是，如果只有一个显示器的话，其实不用判断，直接返回就行
+                        if (sources.length === 1) {
+                            source = sources[0];
+                        }
+                        else {
+                            source = sources.find(function (source) {
+                                return source.display_id === display.id.toString() || source.id.startsWith("screen:".concat(display.id, ":"));
+                            });
+                        }
+                        if (!source) {
+                            console.error(sources);
+                            console.error(display);
+                            console.error("Can't find screen source");
+                            return [2 /*return*/];
+                        }
+                        this.$view.webContents.send('SCREENSHOTS:capture', display, source.thumbnail.toDataURL());
+                        return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/];
+                }
+            });
+        });
     };
     /**
      * 绑定ipc时间处理

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-screenshots",
-  "version": "0.2.0",
+  "version": "0.3.2",
   "description": "electron 截图插件",
   "types": "lib/screenshots.d.ts",
   "main": "lib/screenshots.js",
@@ -9,7 +9,7 @@
   ],
   "scripts": {
     "prepublishOnly": "npm run build",
-    "start": "DEBUG=screenshots electron lib/index.js",
+    "start": "cross-env DEBUG=screenshots electron lib/index.js",
     "dev": "tsc --sourceMap --watch",
     "build": "npm run lint && npm run clean && tsc",
     "lint": "eslint . --ext .js,.ts --fix",
@@ -36,7 +36,8 @@
   },
   "dependencies": {
     "debug": "^4.3.3",
-    "react-screenshots": "^0.2.0"
+    "node-screenshots": "^0.0.2",
+    "react-screenshots": "^0.3.1"
   },
   "peerDependencies": {
     "electron": ">=11"
@@ -45,6 +46,7 @@
     "@types/debug": "^4.1.7",
     "@typescript-eslint/eslint-plugin": "^5.10.0",
     "@typescript-eslint/parser": "^5.10.0",
+    "cross-env": "^7.0.3",
     "electron": "^16.0.7",
     "electron-debug": "^3.2.0",
     "eslint": "^8.7.0",
@@ -55,5 +57,5 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.5.5"
   },
-  "gitHead": "fd9f7978424724e99ebc89250f45360ca48926c1"
+  "gitHead": "600c72efd111a7077640611c32f01c06443c7b8c"
 }