electron-screenshots 0.5.26 → 0.5.28

package/README.md

@@ -18,6 +18,7 @@ import { app, globalShortcut } from "electron";
 import Screenshots from "./screenshots";
 
 app.whenReady().then(() => {
+  app.setAppUserModelId('com.electron.screenshots')
   const screenshots = new Screenshots();
   globalShortcut.register("ctrl+shift+a", () => {
     screenshots.startCapture();
@@ -44,7 +45,7 @@ app.whenReady().then(() => {
   // 保存后的回调事件
   screenshots.on("afterSave", (e, buffer, bounds, isSaved) => {
     console.log("capture", buffer, bounds);
-    console.log("isSaved", isSaved) // 是否保存成功
+    console.log("isSaved", isSaved); // 是否保存成功
   });
   debug({ showDevTools: true, devToolsMode: "undocked" });
 });
@@ -83,6 +84,22 @@ module.exports = {
 };
 ```
 
+- vite 配置示例：
+
+```js
+// vite.config.js
+import { defineConfig } from "vite";
+import viteExternals from "vite-plugin-externals";
+
+export default defineConfig({
+  plugins: [
+    viteExternals({
+      "electron-screenshots": 'require("electron-screenshots")', // 模块名称: 全局变量
+    }),
+  ],
+});
+```
+
 - esc 取消截图，可用以下代码实现按 esc 取消截图
 
 ```js

package/lib/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Debugger } from 'debug';
 import { BrowserView, BrowserWindow } from 'electron';
 import Events from 'events';

package/lib/index.js

@@ -30,13 +30,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __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) {
@@ -47,8 +57,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["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.");
@@ -213,10 +223,10 @@ var Screenshots = /** @class */ (function (_super) {
      * 初始化窗口
      */
     Screenshots.prototype.createWindow = function (display) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
             var windowTypes;
             var _this = this;
+            var _a, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0: 
@@ -310,41 +320,51 @@ 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 Monitor, point, monitor, image, buffer, err_1, 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]);
+                        _a.trys.push([1, 5, , 7]);
                         return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require('node-screenshots')); })];
                     case 2:
-                        NodeScreenshots = (_a.sent()).Screenshots;
-                        capturer = NodeScreenshots.fromPoint(display.x + display.width / 2, display.y + display.height / 2);
-                        this.logger('SCREENSHOTS:capture NodeScreenshots.fromPoint arguments %o', display);
-                        this.logger('SCREENSHOTS: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(".concat(display.id, ") get null"));
+                        Monitor = (_a.sent()).Monitor;
+                        point = {
+                            x: display.x + display.width / 2,
+                            y: display.y + display.height / 2,
+                        };
+                        if (process.platform === 'win32') {
+                            point = electron_1.screen.screenToDipPoint(point);
                         }
-                        return [4 /*yield*/, capturer.capture()];
+                        monitor = Monitor.fromPoint(point.x, point.y);
+                        this.logger('SCREENSHOTS:capture Monitor.fromPoint arguments %o', display);
+                        this.logger('SCREENSHOTS:capture Monitor.fromPoint return %o', {
+                            id: monitor === null || monitor === void 0 ? void 0 : monitor.id,
+                            name: monitor === null || monitor === void 0 ? void 0 : monitor.name,
+                            x: monitor === null || monitor === void 0 ? void 0 : monitor.x,
+                            y: monitor === null || monitor === void 0 ? void 0 : monitor.y,
+                            width: monitor === null || monitor === void 0 ? void 0 : monitor.width,
+                            height: monitor === null || monitor === void 0 ? void 0 : monitor.height,
+                            rotation: monitor === null || monitor === void 0 ? void 0 : monitor.rotation,
+                            scaleFactor: monitor === null || monitor === void 0 ? void 0 : monitor.scaleFactor,
+                            frequency: monitor === null || monitor === void 0 ? void 0 : monitor.frequency,
+                            isPrimary: monitor === null || monitor === void 0 ? void 0 : monitor.isPrimary,
+                        });
+                        if (!monitor) {
+                            throw new Error("Monitor.fromDisplay(".concat(display.id, ") get null"));
+                        }
+                        return [4 /*yield*/, monitor.captureImage()];
                     case 3:
                         image = _a.sent();
-                        return [2 /*return*/, "data:image/png;base64,".concat(image.toString('base64'))];
+                        return [4 /*yield*/, image.toPng(true)];
                     case 4:
+                        buffer = _a.sent();
+                        return [2 /*return*/, "data:image/png;base64,".concat(buffer.toString('base64'))];
+                    case 5:
                         err_1 = _a.sent();
-                        this.logger('SCREENSHOTS:capture NodeScreenshots capture() error %o', err_1);
+                        this.logger('SCREENSHOTS:capture Monitor capture() error %o', err_1);
                         return [4 /*yield*/, electron_1.desktopCapturer.getSources({
                                 types: ['screen'],
                                 thumbnailSize: {
@@ -352,7 +372,7 @@ var Screenshots = /** @class */ (function (_super) {
                                     height: display.height * display.scaleFactor,
                                 },
                             })];
-                    case 5:
+                    case 6:
                         sources = _a.sent();
                         source = void 0;
                         // Linux系统上，screen.getDisplayNearestPoint 返回的 Display 对象的 id
@@ -370,7 +390,7 @@ var Screenshots = /** @class */ (function (_super) {
                             throw new Error("Can't find screen source");
                         }
                         return [2 /*return*/, source.thumbnail.toDataURL()];
-                    case 6: return [2 /*return*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         });

package/lib/padStart.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = padStart;
 /**
  * 如果string字符串长度小于 length 则在左侧填充字符
  * 如果超出length长度则截断超出的部分。
@@ -16,4 +17,3 @@ function padStart(string, length, chars) {
     }
     return str;
 }
-exports.default = padStart;

package/package.json

@@ -1,63 +1,62 @@
-{
-  "name": "electron-screenshots",
-  "version": "0.5.26",
-  "description": "electron 截图插件",
-  "types": "lib/index.d.ts",
-  "main": "lib/index.cjs.js",
-  "module": "lib/index.js",
-  "files": [
-    "lib/**"
-  ],
-  "scripts": {
-    "prepublishOnly": "npm run build",
-    "start": "cross-env DEBUG=electron-screenshots electron lib/demo.js",
-    "dev": "tsc --sourceMap --watch",
-    "build": "npm run lint && npm run clean && tsc",
-    "lint": "eslint . --ext .js,.ts --fix",
-    "clean": "rimraf lib"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/nashaofu/screenshots.git"
-  },
-  "keywords": [
-    "electron",
-    "shortcut",
-    "screenshot",
-    "cropper"
-  ],
-  "author": "nashaofu",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/nashaofu/screenshots/issues"
-  },
-  "homepage": "https://github.com/nashaofu/screenshots/tree/master/packages/electron-screenshots#readme",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "dependencies": {
-    "debug": "^4.3.4",
-    "fs-extra": "^11.1.1",
-    "node-screenshots": "^0.1.9",
-    "react-screenshots": "^0.5.22"
-  },
-  "peerDependencies": {
-    "electron": ">=14"
-  },
-  "devDependencies": {
-    "@types/debug": "^4.1.7",
-    "@types/fs-extra": "^11.0.1",
-    "@types/node": "^18.15.11",
-    "@typescript-eslint/eslint-plugin": "^5.57.0",
-    "@typescript-eslint/parser": "^5.57.0",
-    "cross-env": "^7.0.3",
-    "electron": "^23.2.0",
-    "eslint": "^8.37.0",
-    "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-plugin-import": "^2.27.5",
-    "rimraf": "^4.4.1",
-    "typescript": "^5.0.2"
-  },
-  "gitHead": "9b74455da4a2fc479d243d0e8a9caaad34d6f425"
-}
+{
+  "name": "electron-screenshots",
+  "version": "0.5.28",
+  "description": "electron 截图插件",
+  "types": "lib/index.d.ts",
+  "main": "lib/index.cjs.js",
+  "module": "lib/index.js",
+  "files": [
+    "lib/**"
+  ],
+  "scripts": {
+    "prepublishOnly": "npm run build",
+    "start": "cross-env DEBUG=electron-screenshots electron lib/demo.js",
+    "dev": "tsc --sourceMap --watch",
+    "build": "npm run lint && npm run clean && tsc",
+    "lint": "eslint . --ext .js,.ts --fix",
+    "clean": "rimraf lib"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/nashaofu/screenshots.git"
+  },
+  "keywords": [
+    "electron",
+    "shortcut",
+    "screenshot",
+    "cropper"
+  ],
+  "author": "nashaofu",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/nashaofu/screenshots/issues"
+  },
+  "homepage": "https://github.com/nashaofu/screenshots/tree/master/packages/electron-screenshots#readme",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
+  "dependencies": {
+    "debug": "^4.3.4",
+    "fs-extra": "^11.1.1",
+    "node-screenshots": "^0.2.1",
+    "react-screenshots": "^0.5.22"
+  },
+  "peerDependencies": {
+    "electron": ">=14"
+  },
+  "devDependencies": {
+    "@types/debug": "^4.1.7",
+    "@types/fs-extra": "^11.0.1",
+    "@types/node": "^18.15.11",
+    "@typescript-eslint/eslint-plugin": "^5.57.0",
+    "@typescript-eslint/parser": "^5.57.0",
+    "cross-env": "^7.0.3",
+    "electron": "^23.2.0",
+    "eslint": "^8.37.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-config-airbnb-typescript": "^17.0.0",
+    "eslint-plugin-import": "^2.27.5",
+    "rimraf": "^4.4.1",
+    "typescript": "^5.0.2"
+  }
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 nashaofu
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.