electron-screenshots 0.5.11 → 0.5.13

package/lib/screenshots.js

@@ -14,29 +14,6 @@ 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;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (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) {
@@ -237,8 +214,8 @@ var Screenshots = /** @class */ (function (_super) {
                                 show: false,
                                 autoHideMenuBar: true,
                                 transparent: true,
-                                // resizable 设置为 false 会导致页面崩溃
-                                // resizable: false,
+                                // mac resizable 设置为 false 会导致页面崩溃
+                                resizable: process.platform !== 'darwin',
                                 movable: false,
                                 // focusable: true, 否则窗口不能及时响应esc按键，输入框也不能输入
                                 focusable: true,
@@ -303,29 +280,11 @@ var Screenshots = /** @class */ (function (_super) {
     };
     Screenshots.prototype.capture = function (display) {
         return __awaiter(this, void 0, void 0, function () {
-            var NodeScreenshots, capturer, image, err_1, sources, source;
+            var sources, source;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.logger('SCREENSHOTS:capture');
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 4, , 6]);
-                        return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('node-screenshots')); })];
-                    case 2:
-                        NodeScreenshots = (_a.sent()).Screenshots;
-                        capturer = NodeScreenshots.fromDisplay(display.id);
-                        this.logger('SCREENSHOTS:capture 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 = _a.sent();
-                        return [2 /*return*/, "data:image/png;base64,".concat(image.toString('base64'))];
-                    case 4:
-                        err_1 = _a.sent();
-                        this.logger('SCREENSHOTS:capture NodeScreenshots capture() error %o', err_1);
                         return [4 /*yield*/, electron_1.desktopCapturer.getSources({
                                 types: ['screen'],
                                 thumbnailSize: {
@@ -333,9 +292,8 @@ var Screenshots = /** @class */ (function (_super) {
                                     height: display.height
                                 }
                             })];
-                    case 5:
+                    case 1:
                         sources = _a.sent();
-                        source = void 0;
                         // Linux系统上，screen.getDisplayNearestPoint 返回的 Display 对象的 id
                         // 和这里 source 对象上的 display_id(Linux上，这个值是空字符串) 或 id 的中间部分，都不一致
                         // 但是，如果只有一个显示器的话，其实不用判断，直接返回就行
@@ -352,7 +310,6 @@ var Screenshots = /** @class */ (function (_super) {
                             throw new Error("Can't find screen source");
                         }
                         return [2 /*return*/, source.thumbnail.toDataURL()];
-                    case 6: return [2 /*return*/];
                 }
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-screenshots",
-  "version": "0.5.11",
+  "version": "0.5.13",
   "description": "electron 截图插件",
   "types": "lib/screenshots.d.ts",
   "main": "lib/screenshots.js",
@@ -37,7 +37,6 @@
   "dependencies": {
     "debug": "^4.3.3",
     "fs-extra": "^10.1.0",
-    "node-screenshots": "^0.0.10",
     "react-screenshots": "^0.5.10"
   },
   "peerDependencies": {
@@ -58,5 +57,5 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.5.5"
   },
-  "gitHead": "344628b8e5d6ec0eba886954c39c5ce6a465f5f1"
+  "gitHead": "081f17d3622ea422bc121f96aedd35802693d735"
 }