electron-screenshots 0.3.0 → 0.4.0

package/README.md

@@ -80,11 +80,17 @@ module.exports = {
 
 ## Methods
 
+- `Lang`类型产考`react-screenshots`中的`Lang`类型
 - `Lang`类型产考`react-screenshots`中的`Lang`类型
 
 ```ts
-interface ScreenshotsOpts {
-  lang: Partial<Lang>
+export type LoggerFn = (...args: unknown[]) => void
+export type Logger = Debugger | LoggerFn
+export interface ScreenshotsOpts {
+  lang?: Partial<Lang>
+  // 调用日志，默认值为 debug('electron-screenshots')
+  // debug https://www.npmjs.com/package/debug
+  logger?: Logger
 }
 ```
 

package/lib/index.js

@@ -10,6 +10,13 @@ electron_1.app.whenReady().then(function () {
     var screenshots = new screenshots_1.default({
         lang: {
             operation_rectangle_title: '矩形2323'
+        },
+        logger: function () {
+            var args = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                args[_i] = arguments[_i];
+            }
+            return console.log(args);
         }
     });
     electron_1.globalShortcut.register('ctrl+shift+a', function () {

package/lib/screenshots.d.ts

@@ -1,14 +1,19 @@
 /// <reference types="node" />
+import { Debugger } from 'debug';
 import { BrowserWindow, BrowserView } from 'electron';
 import Events from 'events';
 import { Bounds, Lang } from 'react-screenshots';
+export declare type LoggerFn = (...args: unknown[]) => void;
+export declare type Logger = Debugger | LoggerFn;
 export interface ScreenshotsOpts {
-    lang: Partial<Lang>;
+    lang?: Partial<Lang>;
+    logger?: Logger;
 }
 export { Bounds, Lang };
 export default class Screenshots extends Events {
     $win: BrowserWindow | null;
     $view: BrowserView;
+    private logger;
     private isReady;
     constructor(opts?: ScreenshotsOpts);
     /**

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) {
@@ -54,13 +73,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var debug_1 = __importDefault(require("debug"));
 var electron_1 = require("electron");
 var promises_1 = __importDefault(require("fs/promises"));
 var event_1 = __importDefault(require("./event"));
 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 Screenshots = /** @class */ (function (_super) {
     __extends(Screenshots, _super);
     function Screenshots(opts) {
@@ -77,10 +96,11 @@ var Screenshots = /** @class */ (function (_super) {
         });
         _this.isReady = new Promise(function (resolve) {
             electron_1.ipcMain.once('SCREENSHOTS:ready', function () {
-                (0, logger_1.default)('SCREENSHOTS:ready');
+                _this.logger('SCREENSHOTS:ready');
                 resolve();
             });
         });
+        _this.logger = (opts === null || opts === void 0 ? void 0 : opts.logger) || (0, debug_1.default)('electron-screenshots');
         _this.listenIpc();
         _this.$view.webContents.loadURL("file://".concat(require.resolve('react-screenshots/electron/electron.html')));
         if (opts === null || opts === void 0 ? void 0 : opts.lang) {
@@ -93,7 +113,7 @@ var Screenshots = /** @class */ (function (_super) {
      */
     Screenshots.prototype.startCapture = function () {
         var _this = this;
-        (0, logger_1.default)('startCapture');
+        this.logger('startCapture');
         this.isReady.then(function () {
             if (_this.$win && !_this.$win.isDestroyed()) {
                 _this.$win.close();
@@ -116,7 +136,7 @@ var Screenshots = /** @class */ (function (_super) {
      * 结束截图
      */
     Screenshots.prototype.endCapture = function () {
-        (0, logger_1.default)('endCapture');
+        this.logger('endCapture');
         if (!this.$win)
             return;
         this.$win.setSimpleFullScreen(false);
@@ -129,7 +149,7 @@ var Screenshots = /** @class */ (function (_super) {
     Screenshots.prototype.setLang = function (lang) {
         var _this = this;
         this.isReady.then(function () {
-            (0, logger_1.default)('setLang', lang);
+            _this.logger('setLang', lang);
             _this.$view.webContents.send('SCREENSHOTS:setLang', lang);
         });
     };
@@ -177,11 +197,30 @@ 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 NodeScreenshots, capturer, image, err_1, sources, source;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        (0, logger_1.default)('SCREENSHOTS:capture');
+                        this.logger('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);
+                        this.logger('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();
+                        this.logger('SCREENSHOTS:capturer.capture() error %o', err_1);
                         return [4 /*yield*/, electron_1.desktopCapturer.getSources({
                                 types: ['screen'],
                                 thumbnailSize: {
@@ -189,8 +228,9 @@ var Screenshots = /** @class */ (function (_super) {
                                     height: display.height
                                 }
                             })];
-                    case 1:
+                    case 5:
                         sources = _b.sent();
+                        source = void 0;
                         // Linux系统上，screen.getDisplayNearestPoint 返回的 Display 对象的 id 和 这儿 source 对象上的 display_id(Linux上，这个值是空字符串) 或 id 的中间部分，都不一致
                         // 但是，如果只有一个显示器的话，其实不用判断，直接返回就行
                         if (sources.length === 1) {
@@ -208,7 +248,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*/, 6];
+                    case 6: return [2 /*return*/];
                 }
             });
         });
@@ -222,7 +263,7 @@ var Screenshots = /** @class */ (function (_super) {
          * OK事件
          */
         electron_1.ipcMain.on('SCREENSHOTS:ok', function (e, buffer, bounds) {
-            (0, logger_1.default)('SCREENSHOTS:ok', buffer, bounds);
+            _this.logger('SCREENSHOTS:ok', buffer, bounds);
             var event = new event_1.default();
             _this.emit('ok', event, buffer, bounds);
             if (event.defaultPrevented) {
@@ -235,7 +276,7 @@ var Screenshots = /** @class */ (function (_super) {
          * CANCEL事件
          */
         electron_1.ipcMain.on('SCREENSHOTS:cancel', function () {
-            (0, logger_1.default)('SCREENSHOTS:cancel');
+            _this.logger('SCREENSHOTS:cancel');
             var event = new event_1.default();
             _this.emit('cancel', event);
             if (event.defaultPrevented) {
@@ -251,7 +292,7 @@ var Screenshots = /** @class */ (function (_super) {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        (0, logger_1.default)('SCREENSHOTS:save', buffer, bounds);
+                        this.logger('SCREENSHOTS:save', buffer, bounds);
                         event = new event_1.default();
                         this.emit('save', event, buffer, bounds);
                         if (event.defaultPrevented || !this.$win) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-screenshots",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "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=electron-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.3.0"
+    "node-screenshots": "^0.0.2",
+    "react-screenshots": "^0.4.0"
   },
   "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": "d9d3774ba9cf7d713d3895f1b01731ca05736406"
+  "gitHead": "7f08cb538a014a14ca26111065f61953059be570"
 }

package/lib/logger.d.ts

@@ -1,3 +0,0 @@
-import debug from 'debug';
-declare const _default: debug.Debugger;
-export default _default;

package/lib/logger.js

@@ -1,7 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var debug_1 = __importDefault(require("debug"));
-exports.default = (0, debug_1.default)('screenshots');