@deot/dev-test 2.8.1 → 2.9.0

package/dist/index.cjs

@@ -123,8 +123,7 @@ class Command {
     return response;
   }
   async press(key, timeout = 200) {
-    if (!key || this.isClose)
-      return;
+    if (!key || this.isClose) return;
     await this.schedule.target;
     this.schedule.target = new Promise((resolve) => {
       this.schedule.complete = resolve;
@@ -331,7 +330,7 @@ class Launch {
       }
       this._browser = puppeteer.launch({
         ...this.puppeteerOptions,
-        headless: "new"
+        headless: true
       });
       this._browser.then((browser) => {
         this.browser = browser;
@@ -371,36 +370,55 @@ class Launch {
   }
 }
 
-class Scheduler {
+class Interrupter {
+  static of(options) {
+    return new Interrupter(options);
+  }
+  options = {};
   _success;
   _fail;
   _task;
   _finish = false;
-  constructor() {
-    this.next();
+  constructor(options) {
+    if (options) {
+      this.options = options;
+    }
+    this._generateTask();
   }
-  next = (v) => {
+  _generateTask = () => {
+    this._task = new Promise((resolve, reject) => {
+      this._success = (value) => {
+        this._fail = void 0;
+        resolve(value);
+      };
+      this._fail = (value) => {
+        this._success = void 0;
+        reject(value);
+      };
+    });
+  };
+  next = async (v) => {
     if (!this._finish) {
       this._success?.(v);
-      this._task = new Promise((resolve, reject) => {
-        this._success = (value) => {
-          this._fail = void 0;
-          resolve(value);
-        };
-        this._fail = (value) => {
-          this._success = void 0;
-          reject(value);
-        };
-      });
+      await this._task;
+      await Promise.resolve();
+      this._generateTask();
+    } else {
+      await this._task;
     }
-    return this;
   };
-  nextWithError = (v) => {
+  nextWithError = async (v) => {
     if (!this._finish) {
       this._fail?.(v);
-      this.next();
+      try {
+        await this._task;
+      } catch {
+        await Promise.resolve();
+        this._generateTask();
+      }
+    } else {
+      await this._task;
     }
-    return this;
   };
   finish = (v) => {
     this._success?.(v);
@@ -488,8 +506,7 @@ const utils = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
 
 let defaultHost = "";
 const host = (force) => {
-  if (!force && defaultHost)
-    return defaultHost;
+  if (!force && defaultHost) return defaultHost;
   const ips = [];
   const ntwk = os__namespace.networkInterfaces();
   for (const k in ntwk) {
@@ -506,8 +523,7 @@ const host = (force) => {
 defaultHost = host();
 const port = (host$ = defaultHost, port$ = 1024) => {
   /* istanbul ignore next -- @preserve */
-  if (port$ < 1024)
-    throw new Error("port < 1024");
+  if (port$ < 1024) throw new Error("port < 1024");
   return new Promise((resolve, reject) => {
     const server = http__namespace.createServer();
     server.unref();
@@ -548,8 +564,8 @@ const server = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
 
 exports.Command = Command;
 exports.E2E = e2e;
+exports.Interrupter = Interrupter;
 exports.Launch = Launch;
 exports.Operater = Operater;
-exports.Scheduler = Scheduler;
 exports.Server = server;
 exports.Utils = utils;

package/dist/index.d.ts

@@ -1,11 +1,9 @@
-/// <reference types="node" />
-
 import type { Browser } from 'puppeteer';
 import * as childProcess from 'child_process';
 import type { ClickOptions } from 'puppeteer';
+import type { LaunchOptions } from 'puppeteer';
 import type { Nullable } from '@deot/dev-shared';
 import type { Page } from 'puppeteer';
-import type { PuppeteerLaunchOptions } from 'puppeteer';
 
 declare const available: () => Promise<{
     host: string;
@@ -58,13 +56,35 @@ declare const host: (force?: boolean) => string;
 
 declare const impl: () => Launch;
 
+export declare class Interrupter<T = any> {
+    static of(options?: InterrupterOptions): Interrupter<any>;
+    options: InterrupterOptions;
+    _success?: Func<any>;
+    _fail?: Func<any>;
+    _task: Promise<any>;
+    _finish: boolean;
+    constructor(options?: InterrupterOptions);
+    _generateTask: () => void;
+    next: (v?: T) => Promise<void>;
+    nextWithError: (v?: any) => Promise<void>;
+    finish: (v?: T) => this;
+    finishWithError: (v?: T) => this;
+    then(resolve: Func<T>, reject?: Func<T>): Promise<void>;
+    catch(callback?: Func<T>): Promise<any>;
+    finally(callback?: Func<void>): Promise<any>;
+}
+
+declare interface InterrupterOptions {
+    timeout?: number;
+}
+
 export declare class Launch {
     browser: Browser;
     page: Page;
     operater: Operater;
     private _browser;
     private _page;
-    puppeteerOptions: PuppeteerLaunchOptions;
+    puppeteerOptions: LaunchOptions;
     options: {
         logLevel?: string;
     };
@@ -96,21 +116,6 @@ export declare class Operater {
 
 declare const port: (host$?: string, port$?: number) => Promise<unknown>;
 
-export declare class Scheduler<T = any> {
-    _success?: Func<any>;
-    _fail?: Func<any>;
-    _task: Promise<any>;
-    _finish: boolean;
-    constructor();
-    next: (v?: T) => this;
-    nextWithError: (v?: any) => this;
-    finish: (v?: T) => this;
-    finishWithError: (v?: T) => this;
-    then(resolve: Func<T>, reject: Func<T>): Promise<void>;
-    catch(callback?: Func<T>): Promise<any>;
-    finally(callback?: Func<void>): Promise<any>;
-}
-
 declare namespace Server {
     export {
         host,

package/dist/index.js

@@ -98,8 +98,7 @@ class Command {
     return response;
   }
   async press(key, timeout = 200) {
-    if (!key || this.isClose)
-      return;
+    if (!key || this.isClose) return;
     await this.schedule.target;
     this.schedule.target = new Promise((resolve) => {
       this.schedule.complete = resolve;
@@ -306,7 +305,7 @@ class Launch {
       }
       this._browser = puppeteer.launch({
         ...this.puppeteerOptions,
-        headless: "new"
+        headless: true
       });
       this._browser.then((browser) => {
         this.browser = browser;
@@ -346,36 +345,55 @@ class Launch {
   }
 }
 
-class Scheduler {
+class Interrupter {
+  static of(options) {
+    return new Interrupter(options);
+  }
+  options = {};
   _success;
   _fail;
   _task;
   _finish = false;
-  constructor() {
-    this.next();
+  constructor(options) {
+    if (options) {
+      this.options = options;
+    }
+    this._generateTask();
   }
-  next = (v) => {
+  _generateTask = () => {
+    this._task = new Promise((resolve, reject) => {
+      this._success = (value) => {
+        this._fail = void 0;
+        resolve(value);
+      };
+      this._fail = (value) => {
+        this._success = void 0;
+        reject(value);
+      };
+    });
+  };
+  next = async (v) => {
     if (!this._finish) {
       this._success?.(v);
-      this._task = new Promise((resolve, reject) => {
-        this._success = (value) => {
-          this._fail = void 0;
-          resolve(value);
-        };
-        this._fail = (value) => {
-          this._success = void 0;
-          reject(value);
-        };
-      });
+      await this._task;
+      await Promise.resolve();
+      this._generateTask();
+    } else {
+      await this._task;
     }
-    return this;
   };
-  nextWithError = (v) => {
+  nextWithError = async (v) => {
     if (!this._finish) {
       this._fail?.(v);
-      this.next();
+      try {
+        await this._task;
+      } catch {
+        await Promise.resolve();
+        this._generateTask();
+      }
+    } else {
+      await this._task;
     }
-    return this;
   };
   finish = (v) => {
     this._success?.(v);
@@ -463,8 +481,7 @@ const utils = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
 
 let defaultHost = "";
 const host = (force) => {
-  if (!force && defaultHost)
-    return defaultHost;
+  if (!force && defaultHost) return defaultHost;
   const ips = [];
   const ntwk = os.networkInterfaces();
   for (const k in ntwk) {
@@ -481,8 +498,7 @@ const host = (force) => {
 defaultHost = host();
 const port = (host$ = defaultHost, port$ = 1024) => {
   /* istanbul ignore next -- @preserve */
-  if (port$ < 1024)
-    throw new Error("port < 1024");
+  if (port$ < 1024) throw new Error("port < 1024");
   return new Promise((resolve, reject) => {
     const server = http.createServer();
     server.unref();
@@ -521,4 +537,4 @@ const server = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
 	port
 }, Symbol.toStringTag, { value: 'Module' }));
 
-export { Command, e2e as E2E, Launch, Operater, Scheduler, server as Server, utils as Utils };
+export { Command, e2e as E2E, Interrupter, Launch, Operater, server as Server, utils as Utils };

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@deot/dev-test",
-  "version": "2.8.1",
+  "version": "2.9.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
-      "require": "./dist/index.cjs",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.cjs"
     }
   },
   "files": [
@@ -19,7 +19,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@deot/dev-shared": "^2.8.0",
-    "puppeteer": "^21.6.1"
+    "@deot/dev-shared": "^2.9.0",
+    "puppeteer": "^24.2.0"
   }
 }