electron-screenshots 0.3.1 → 0.3.2

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) {
@@ -61,7 +80,6 @@ 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) {
@@ -178,25 +196,28 @@ var Screenshots = /** @class */ (function (_super) {
     Screenshots.prototype.capture = function (_a) {
         var display = _a.display;
         return __awaiter(this, void 0, void 0, function () {
-            var capturer, image, err_1, sources, source;
+            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, 3, , 5]);
-                        capturer = node_screenshots_1.Screenshots.fromDisplay(display.id);
+                        _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 2:
+                    case 3:
                         image = _b.sent();
                         this.$view.webContents.send('SCREENSHOTS:capture', display, "data:image/png;base64,".concat(image.toString('base64')));
-                        return [3 /*break*/, 5];
-                    case 3:
+                        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({
@@ -206,7 +227,7 @@ var Screenshots = /** @class */ (function (_super) {
                                     height: display.height
                                 }
                             })];
-                    case 4:
+                    case 5:
                         sources = _b.sent();
                         source = void 0;
                         // Linux系统上，screen.getDisplayNearestPoint 返回的 Display 对象的 id 和 这儿 source 对象上的 display_id(Linux上，这个值是空字符串) 或 id 的中间部分，都不一致
@@ -226,8 +247,8 @@ var Screenshots = /** @class */ (function (_super) {
                             return [2 /*return*/];
                         }
                         this.$view.webContents.send('SCREENSHOTS:capture', display, source.thumbnail.toDataURL());
-                        return [3 /*break*/, 5];
-                    case 5: return [2 /*return*/];
+                        return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/];
                 }
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-screenshots",
-  "version": "0.3.1",
+  "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",
@@ -46,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",
@@ -56,5 +57,5 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.5.5"
   },
-  "gitHead": "9249caaff3da43effcf0b4ae72d2691c0d7d4595"
+  "gitHead": "600c72efd111a7077640611c32f01c06443c7b8c"
 }