@rich-automation/lotto 2.0.5 → 2.0.6

package/README.md

@@ -20,6 +20,7 @@ yarn add @rich-automation/lotto
 
 1. 내부적으로 Playwright 또는 Puppeteer를 사용하므로, Chromium이 사전에 설치되어 있어야 합니다. ([링크](https://github.com/rich-automation/lotto-module/blob/main/package.json#L38-L39))
 2. 구매는 [동행복권](https://dhlottery.co.kr/common.do?method=main) 사이트에서 진행되며, 예치금 충전 기능은 없으므로 미리 계정에 예치금을 충전해두어야 합니다.
+3. 건전 구매 서약서에 동의하세요 (https://www.dhlottery.co.kr/hpns/sdnsCamPainView), 1년 주기로 동의가 필요합니다.
 
 ## 사용법
 

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

@@ -23,9 +23,10 @@ class PlaywrightPage {
             return this.page.url();
         });
     }
-    goto(url) {
+    goto(url, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.page.goto(url, { waitUntil: 'load' });
+            const waitUntil = (options === null || options === void 0 ? void 0 : options.waitUntil) === 'idle' ? 'networkidle' : 'load';
+            yield this.page.goto(url, { waitUntil });
         });
     }
     fill(selector, value) {

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

@@ -22,9 +22,10 @@ class PuppeteerPage {
             return this.page.url();
         });
     }
-    goto(url) {
+    goto(url, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.page.goto(url, { waitUntil: 'load' });
+            const waitUntil = (options === null || options === void 0 ? void 0 : options.waitUntil) === 'idle' ? 'networkidle0' : 'load';
+            yield this.page.goto(url, { waitUntil });
         });
     }
     fill(selector, value) {

package/lib/cjs/lottoService.js

@@ -66,10 +66,10 @@ class LottoService {
             if (this.browserController.configs.controller === 'api') {
                 throw lottoError_1.default.NotSupported('API mode does not support signIn.');
             }
-            // 페이지 이동
+            // 페이지 이동 (RSA 키 로딩 등 비동기 스크립트 완료까지 대기)
             const page = yield this.browserController.focus(0);
             this.logger.debug('[signIn]', 'goto', 'login page');
-            yield page.goto(urls_1.URLS.LOGIN);
+            yield page.goto(urls_1.URLS.LOGIN, { waitUntil: 'idle' });
             this.logger.debug('[signIn]', 'page url', yield page.url());
             // 로그인 시도
             this.logger.debug('[signIn]', 'try login');

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

@@ -20,9 +20,10 @@ export class PlaywrightPage {
             return this.page.url();
         });
     }
-    goto(url) {
+    goto(url, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.page.goto(url, { waitUntil: 'load' });
+            const waitUntil = (options === null || options === void 0 ? void 0 : options.waitUntil) === 'idle' ? 'networkidle' : 'load';
+            yield this.page.goto(url, { waitUntil });
         });
     }
     fill(selector, value) {

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

@@ -19,9 +19,10 @@ export class PuppeteerPage {
             return this.page.url();
         });
     }
-    goto(url) {
+    goto(url, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.page.goto(url, { waitUntil: 'load' });
+            const waitUntil = (options === null || options === void 0 ? void 0 : options.waitUntil) === 'idle' ? 'networkidle0' : 'load';
+            yield this.page.goto(url, { waitUntil });
         });
     }
     fill(selector, value) {

package/lib/esm/lottoService.js

@@ -60,10 +60,10 @@ export class LottoService {
             if (this.browserController.configs.controller === 'api') {
                 throw LottoError.NotSupported('API mode does not support signIn.');
             }
-            // 페이지 이동
+            // 페이지 이동 (RSA 키 로딩 등 비동기 스크립트 완료까지 대기)
             const page = yield this.browserController.focus(0);
             this.logger.debug('[signIn]', 'goto', 'login page');
-            yield page.goto(URLS.LOGIN);
+            yield page.goto(URLS.LOGIN, { waitUntil: 'idle' });
             this.logger.debug('[signIn]', 'page url', yield page.url());
             // 로그인 시도
             this.logger.debug('[signIn]', 'try login');

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

@@ -8,7 +8,9 @@ export declare class PlaywrightPage implements BrowserPageInterface {
     logger?: LoggerInterface;
     constructor(context: BrowserContext, page: Page, logger?: LoggerInterface);
     url(): Promise<string>;
-    goto(url: string): Promise<void>;
+    goto(url: string, options?: {
+        waitUntil?: 'load' | 'idle';
+    }): Promise<void>;
     fill(selector: string, value: string | number): Promise<void>;
     click(selector: string, domDirect?: boolean): Promise<void>;
     select(selector: string, value: string): Promise<void>;

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

@@ -6,7 +6,9 @@ export declare class PuppeteerPage implements BrowserPageInterface {
     logger?: LoggerInterface;
     constructor(page: Page, logger?: LoggerInterface);
     url(): Promise<string>;
-    goto(url: string): Promise<void>;
+    goto(url: string, options?: {
+        waitUntil?: 'load' | 'idle';
+    }): Promise<void>;
     fill(selector: string, value: string | number): Promise<void>;
     click(selector: string, domDirect?: boolean): Promise<void>;
     select(selector: string, value: string): Promise<void>;

package/lib/typescript/types.d.ts

@@ -32,7 +32,9 @@ export interface BrowserControllerInterface<T extends BrowserController = Browse
 }
 export interface BrowserPageInterface {
     url(): Promise<string>;
-    goto(url: string): Promise<void>;
+    goto(url: string, options?: {
+        waitUntil?: 'load' | 'idle';
+    }): Promise<void>;
     fill(selector: string, value: string | number): Promise<void>;
     click(selector: string, domDirect?: boolean): Promise<void>;
     select(selector: string, value: string): Promise<void>;

package/package.json

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