@rich-automation/lotto 0.1.1 → 0.1.3

package/lib/cjs/controllers/puppeteer/index.js

@@ -45,14 +45,14 @@ class PuppeteerController {
             const pages = yield browser.pages();
             if (pages.length === 0) {
                 const page = yield browser.newPage();
-                return new puppeteer_page_1.PuppeteerPage(page);
+                return new puppeteer_page_1.PuppeteerPage(page, this.logger);
             }
             else {
                 const isWithinRange = Math.max(0, Math.min(pageIndex, pages.length - 1)) === pageIndex;
                 const page = pages.at(isWithinRange ? pageIndex : -1);
                 if (!page)
                     throw new Error('Page is not found');
-                return new puppeteer_page_1.PuppeteerPage(page);
+                return new puppeteer_page_1.PuppeteerPage(page, this.logger);
             }
         });
         this.close = () => __awaiter(this, void 0, void 0, function* () {

package/lib/cjs/controllers/puppeteer/puppeteer.page.js

@@ -13,7 +13,9 @@ exports.PuppeteerPage = void 0;
 const deferred_1 = require("../../utils/deferred");
 const lazyRun_1 = require("../../utils/lazyRun");
 class PuppeteerPage {
-    constructor(page) {
+    constructor(page, logger) {
+        this.page = page;
+        this.logger = logger;
         this.page = page;
     }
     url() {
@@ -31,9 +33,17 @@ class PuppeteerPage {
             yield this.page.type(selector, value.toString());
         });
     }
-    click(selector) {
+    click(selector, useWaitForSelector = false) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.page.click(selector);
+            if (useWaitForSelector) {
+                const handle = yield this.page.waitForSelector(selector, { timeout: 15000 });
+                (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug('[PuppeteerPage]', '[click]', 'handle', handle);
+                handle === null || handle === void 0 ? void 0 : handle.click();
+            }
+            else {
+                yield this.page.click(selector);
+            }
         });
     }
     select(selector, value) {

package/lib/cjs/lottoService.js

@@ -110,15 +110,24 @@ class LottoService {
             yield page.click(selectors_1.SELECTORS.PURCHASE_TYPE_RANDOM_BTN);
             // set and confirm amount
             const amountString = String(Math.max(1, Math.min(5, amount)));
-            this.logger.debug('[purchase]', `select purchase amount${amountString} -> amount confirm`);
+            this.logger.debug('[purchase]', `select purchase amount(${amountString}) -> amount confirm`);
             yield page.select(selectors_1.SELECTORS.PURCHASE_AMOUNT_SELECT, amountString);
             yield page.click(selectors_1.SELECTORS.PURCHASE_AMOUNT_CONFIRM_BTN);
             // click purchase button
             this.logger.debug('[purchase]', 'click purchase button');
             yield page.click(selectors_1.SELECTORS.PURCHASE_BTN);
-            yield page.wait(500);
             this.logger.debug('[purchase]', 'click purchase confirm button');
-            yield page.click(selectors_1.SELECTORS.PURCHASE_CONFIRM_BTN);
+            try {
+                yield page.click(selectors_1.SELECTORS.PURCHASE_CONFIRM_BTN, true);
+            }
+            catch (e) {
+                this.logger.debug('[purchase]', 'purchase confirm failure', e);
+                this.logger.debug('[purchase]', 'print node');
+                yield page.querySelectorAll(selectors_1.SELECTORS.PURCHASE_CONFIRM_BTN, elems => {
+                    this.logger.debug('[purchase]', elems);
+                });
+                throw e;
+            }
             yield page.wait(1000);
             // game result
             this.logger.debug('[purchase]', 'print result');

package/lib/esm/controllers/puppeteer/index.js

@@ -40,14 +40,14 @@ export class PuppeteerController {
             const pages = yield browser.pages();
             if (pages.length === 0) {
                 const page = yield browser.newPage();
-                return new PuppeteerPage(page);
+                return new PuppeteerPage(page, this.logger);
             }
             else {
                 const isWithinRange = Math.max(0, Math.min(pageIndex, pages.length - 1)) === pageIndex;
                 const page = pages.at(isWithinRange ? pageIndex : -1);
                 if (!page)
                     throw new Error('Page is not found');
-                return new PuppeteerPage(page);
+                return new PuppeteerPage(page, this.logger);
             }
         });
         this.close = () => __awaiter(this, void 0, void 0, function* () {

package/lib/esm/controllers/puppeteer/puppeteer.page.js

@@ -11,7 +11,9 @@ import { Page } from 'puppeteer';
 import { deferred } from '../../utils/deferred';
 import { lazyRun } from '../../utils/lazyRun';
 export class PuppeteerPage {
-    constructor(page) {
+    constructor(page, logger) {
+        this.page = page;
+        this.logger = logger;
         this.page = page;
     }
     url() {
@@ -29,9 +31,17 @@ export class PuppeteerPage {
             yield this.page.type(selector, value.toString());
         });
     }
-    click(selector) {
+    click(selector, useWaitForSelector = false) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.page.click(selector);
+            if (useWaitForSelector) {
+                const handle = yield this.page.waitForSelector(selector, { timeout: 15000 });
+                (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug('[PuppeteerPage]', '[click]', 'handle', handle);
+                handle === null || handle === void 0 ? void 0 : handle.click();
+            }
+            else {
+                yield this.page.click(selector);
+            }
         });
     }
     select(selector, value) {

package/lib/esm/lottoService.js

@@ -104,15 +104,24 @@ export class LottoService {
             yield page.click(SELECTORS.PURCHASE_TYPE_RANDOM_BTN);
             // set and confirm amount
             const amountString = String(Math.max(1, Math.min(5, amount)));
-            this.logger.debug('[purchase]', `select purchase amount${amountString} -> amount confirm`);
+            this.logger.debug('[purchase]', `select purchase amount(${amountString}) -> amount confirm`);
             yield page.select(SELECTORS.PURCHASE_AMOUNT_SELECT, amountString);
             yield page.click(SELECTORS.PURCHASE_AMOUNT_CONFIRM_BTN);
             // click purchase button
             this.logger.debug('[purchase]', 'click purchase button');
             yield page.click(SELECTORS.PURCHASE_BTN);
-            yield page.wait(500);
             this.logger.debug('[purchase]', 'click purchase confirm button');
-            yield page.click(SELECTORS.PURCHASE_CONFIRM_BTN);
+            try {
+                yield page.click(SELECTORS.PURCHASE_CONFIRM_BTN, true);
+            }
+            catch (e) {
+                this.logger.debug('[purchase]', 'purchase confirm failure', e);
+                this.logger.debug('[purchase]', 'print node');
+                yield page.querySelectorAll(SELECTORS.PURCHASE_CONFIRM_BTN, elems => {
+                    this.logger.debug('[purchase]', elems);
+                });
+                throw e;
+            }
             yield page.wait(1000);
             // game result
             this.logger.debug('[purchase]', 'print result');

package/lib/typescript/controllers/puppeteer/puppeteer.page.d.ts

@@ -1,12 +1,14 @@
 import type { BrowserPageEvents, BrowserPageInterface, FakeDOMElement, StringifiedCookies } from '../../types';
 import { Page } from 'puppeteer';
+import type { LoggerInterface } from '../../logger';
 export declare class PuppeteerPage implements BrowserPageInterface {
     page: Page;
-    constructor(page: Page);
+    logger?: LoggerInterface | undefined;
+    constructor(page: Page, logger?: LoggerInterface | undefined);
     url(): Promise<string>;
     goto(url: string): Promise<void>;
     fill(selector: string, value: string | number): Promise<void>;
-    click(selector: string): Promise<void>;
+    click(selector: string, useWaitForSelector?: boolean): Promise<void>;
     select(selector: string, value: string): Promise<void>;
     querySelectorAll<T>(selector: string, callback: (elems: FakeDOMElement[]) => T): Promise<T>;
     getCookies(): Promise<string>;

package/lib/typescript/types.d.ts

@@ -30,7 +30,7 @@ export interface BrowserPageInterface {
     url(): Promise<string>;
     goto(url: string): Promise<void>;
     fill(selector: string, value: string | number): Promise<void>;
-    click(selector: string): Promise<void>;
+    click(selector: string, useWaitForSelector?: boolean): Promise<void>;
     select(selector: string, value: string): Promise<void>;
     querySelectorAll<T>(selector: string, callback: (elems: FakeDOMElement[]) => T): Promise<T>;
     wait(time: number): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rich-automation/lotto",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Lotto module",
   "publishConfig": {
     "access": "public",