electron-screenshots 0.3.0 → 0.3.1

package/lib/screenshots.js

@@ -61,6 +61,7 @@ var events_1 = __importDefault(require("events"));
 var padStart_1 = __importDefault(require("./padStart"));
 var getBoundAndDisplay_1 = __importDefault(require("./getBoundAndDisplay"));
 var logger_1 = __importDefault(require("./logger"));
+var node_screenshots_1 = require("node-screenshots");
 var Screenshots = /** @class */ (function (_super) {
     __extends(Screenshots, _super);
     function Screenshots(opts) {
@@ -177,11 +178,27 @@ var Screenshots = /** @class */ (function (_super) {
     Screenshots.prototype.capture = function (_a) {
         var display = _a.display;
         return __awaiter(this, void 0, void 0, function () {
-            var sources, source;
+            var 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, 3, , 5]);
+                        capturer = node_screenshots_1.Screenshots.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 2:
+                        image = _b.sent();
+                        this.$view.webContents.send('SCREENSHOTS:capture', display, "data:image/png;base64,".concat(image.toString('base64')));
+                        return [3 /*break*/, 5];
+                    case 3:
+                        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: {
@@ -189,8 +206,9 @@ var Screenshots = /** @class */ (function (_super) {
                                     height: display.height
                                 }
                             })];
-                    case 1:
+                    case 4:
                         sources = _b.sent();
+                        source = void 0;
                         // Linux系统上，screen.getDisplayNearestPoint 返回的 Display 对象的 id 和 这儿 source 对象上的 display_id(Linux上，这个值是空字符串) 或 id 的中间部分，都不一致
                         // 但是，如果只有一个显示器的话，其实不用判断，直接返回就行
                         if (sources.length === 1) {
@@ -208,7 +226,8 @@ var Screenshots = /** @class */ (function (_super) {
                             return [2 /*return*/];
                         }
                         this.$view.webContents.send('SCREENSHOTS:capture', display, source.thumbnail.toDataURL());
-                        return [2 /*return*/];
+                        return [3 /*break*/, 5];
+                    case 5: return [2 /*return*/];
                 }
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-screenshots",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "electron 截图插件",
   "types": "lib/screenshots.d.ts",
   "main": "lib/screenshots.js",
@@ -36,7 +36,8 @@
   },
   "dependencies": {
     "debug": "^4.3.3",
-    "react-screenshots": "^0.3.0"
+    "node-screenshots": "^0.0.2",
+    "react-screenshots": "^0.3.1"
   },
   "peerDependencies": {
     "electron": ">=11"
@@ -55,5 +56,5 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.5.5"
   },
-  "gitHead": "d9d3774ba9cf7d713d3895f1b01731ca05736406"
+  "gitHead": "9249caaff3da43effcf0b4ae72d2691c0d7d4595"
 }