@rich-automation/lotto 2.0.1 → 2.0.3

package/lib/cjs/constants/selectors.js

@@ -10,7 +10,7 @@ exports.SELECTORS = {
     PURCHASE_TYPE_RANDOM_BTN: 'a[href="#divWay2Buy1"]#num2',
     PURCHASE_AMOUNT_SELECT: 'select#amoundApply',
     PURCHASE_AMOUNT_CONFIRM_BTN: 'input[value="확인"]#btnSelectNum',
-    PURCHASE_BTN: 'input[value="구매하기"]#btnBuy',
+    PURCHASE_BTN: 'button#btnBuy',
     PURCHASE_CONFIRM_BTN: 'input[value="확인"][onclick="javascript:closepopupLayerConfirm(true);"]',
     PURCHASE_NUMBER_LIST: '#reportRow .nums'
 };

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

@@ -97,5 +97,10 @@ class PlaywrightPage {
         this.page.on(event, callback);
         return () => this.page.off(event, callback);
     }
+    waitForSelector(selector, timeout = 10000) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.page.waitForSelector(selector, { timeout });
+        });
+    }
 }
 exports.PlaywrightPage = PlaywrightPage;

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

@@ -101,5 +101,10 @@ class PuppeteerPage {
         this.page.on(event, callback);
         return () => this.page.off(event, callback);
     }
+    waitForSelector(selector, timeout = 10000) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.page.waitForSelector(selector, { timeout });
+        });
+    }
 }
 exports.PuppeteerPage = PuppeteerPage;

package/lib/cjs/lottoError.js

@@ -14,7 +14,8 @@ const LottoErrorCode = {
     INVALID_ROUND: 300001,
     INVALID_LOTTO_NUMBER: 300002,
     NOT_AUTHENTICATED: 300003,
-    PURCHASE_UNAVAILABLE: 300004
+    PURCHASE_UNAVAILABLE: 300004,
+    PURCHASE_FAILED: 300005
 };
 const ErrorCode = Object.assign(Object.assign(Object.assign({}, BaseErrorCode), LoginErrorCode), LottoErrorCode);
 const ErrorName = (0, invertObject_1.invertObject)(ErrorCode);
@@ -27,6 +28,7 @@ const ErrorMessage = {
     [ErrorCode.INVALID_LOTTO_NUMBER]: '로또 번호가 올바르지 않습니다.',
     [ErrorCode.NOT_AUTHENTICATED]: '인증되지 않았습니다.',
     [ErrorCode.PURCHASE_UNAVAILABLE]: '현재는 로또 구매가 불가능합니다.',
+    [ErrorCode.PURCHASE_FAILED]: '로또 구매에 실패했습니다.',
     [ErrorCode.NOT_SUPPORTED]: '지원되지 않는 기능입니다.'
 };
 class LottoError extends Error {
@@ -54,6 +56,9 @@ class LottoError extends Error {
     static PurchaseUnavailable() {
         return new LottoError(ErrorCode.PURCHASE_UNAVAILABLE);
     }
+    static PurchaseFailed(message) {
+        return new LottoError(ErrorCode.PURCHASE_FAILED, message);
+    }
     static NotSupported(message) {
         return new LottoError(ErrorCode.NOT_SUPPORTED, message);
     }

package/lib/cjs/lottoService.js

@@ -128,12 +128,27 @@ class LottoService {
             yield page.click(selectors_1.SELECTORS.PURCHASE_BTN);
             this.logger.debug('[purchase]', 'click purchase confirm button');
             yield page.click(selectors_1.SELECTORS.PURCHASE_CONFIRM_BTN);
-            yield page.wait(1000);
+            this.logger.debug('[purchase]', 'wait for purchase result');
+            try {
+                yield page.waitForSelector(selectors_1.SELECTORS.PURCHASE_NUMBER_LIST, 5000);
+            }
+            catch (e) {
+                this.logger.error('[purchase]', 'failed to wait for purchase result selector', selectors_1.SELECTORS.PURCHASE_NUMBER_LIST, e);
+                throw lottoError_1.default.PurchaseFailed('구매 결과 로딩 타임아웃');
+            }
             // game result
-            this.logger.debug('[purchase]', 'print result');
-            return page.querySelectorAll(selectors_1.SELECTORS.PURCHASE_NUMBER_LIST, elems => {
+            const result = yield page.querySelectorAll(selectors_1.SELECTORS.PURCHASE_NUMBER_LIST, elems => {
                 return elems.map(it => Array.from(it.children).map(child => Number(child.innerHTML)));
             });
+            this.logger.debug('[purchase]', 'print result', result);
+            if (result.length === 0 || result.some(nums => nums.length === 0)) {
+                this.logger.error('[purchase]', 'failed to parse purchase result', {
+                    selector: selectors_1.SELECTORS.PURCHASE_NUMBER_LIST,
+                    result
+                });
+                throw lottoError_1.default.PurchaseFailed('구매 결과 파싱 실패');
+            }
+            return result;
         });
         this.check = (numbers, round = (0, getLastLottoRound_1.getLastLottoRound)()) => __awaiter(this, void 0, void 0, function* () {
             numbers.forEach(number => (0, validateLottoNumber_1.validateLottoNumber)(number));

package/lib/esm/constants/selectors.js

@@ -7,7 +7,7 @@ export const SELECTORS = {
     PURCHASE_TYPE_RANDOM_BTN: 'a[href="#divWay2Buy1"]#num2',
     PURCHASE_AMOUNT_SELECT: 'select#amoundApply',
     PURCHASE_AMOUNT_CONFIRM_BTN: 'input[value="확인"]#btnSelectNum',
-    PURCHASE_BTN: 'input[value="구매하기"]#btnBuy',
+    PURCHASE_BTN: 'button#btnBuy',
     PURCHASE_CONFIRM_BTN: 'input[value="확인"][onclick="javascript:closepopupLayerConfirm(true);"]',
     PURCHASE_NUMBER_LIST: '#reportRow .nums'
 };

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

@@ -94,4 +94,9 @@ export class PlaywrightPage {
         this.page.on(event, callback);
         return () => this.page.off(event, callback);
     }
+    waitForSelector(selector, timeout = 10000) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.page.waitForSelector(selector, { timeout });
+        });
+    }
 }

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

@@ -98,4 +98,9 @@ export class PuppeteerPage {
         this.page.on(event, callback);
         return () => this.page.off(event, callback);
     }
+    waitForSelector(selector, timeout = 10000) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.page.waitForSelector(selector, { timeout });
+        });
+    }
 }

package/lib/esm/lottoError.js

@@ -12,7 +12,8 @@ const LottoErrorCode = {
     INVALID_ROUND: 300001,
     INVALID_LOTTO_NUMBER: 300002,
     NOT_AUTHENTICATED: 300003,
-    PURCHASE_UNAVAILABLE: 300004
+    PURCHASE_UNAVAILABLE: 300004,
+    PURCHASE_FAILED: 300005
 };
 const ErrorCode = Object.assign(Object.assign(Object.assign({}, BaseErrorCode), LoginErrorCode), LottoErrorCode);
 const ErrorName = invertObject(ErrorCode);
@@ -25,6 +26,7 @@ const ErrorMessage = {
     [ErrorCode.INVALID_LOTTO_NUMBER]: '로또 번호가 올바르지 않습니다.',
     [ErrorCode.NOT_AUTHENTICATED]: '인증되지 않았습니다.',
     [ErrorCode.PURCHASE_UNAVAILABLE]: '현재는 로또 구매가 불가능합니다.',
+    [ErrorCode.PURCHASE_FAILED]: '로또 구매에 실패했습니다.',
     [ErrorCode.NOT_SUPPORTED]: '지원되지 않는 기능입니다.'
 };
 export default class LottoError extends Error {
@@ -52,6 +54,9 @@ export default class LottoError extends Error {
     static PurchaseUnavailable() {
         return new LottoError(ErrorCode.PURCHASE_UNAVAILABLE);
     }
+    static PurchaseFailed(message) {
+        return new LottoError(ErrorCode.PURCHASE_FAILED, message);
+    }
     static NotSupported(message) {
         return new LottoError(ErrorCode.NOT_SUPPORTED, message);
     }

package/lib/esm/lottoService.js

@@ -122,12 +122,27 @@ export class LottoService {
             yield page.click(SELECTORS.PURCHASE_BTN);
             this.logger.debug('[purchase]', 'click purchase confirm button');
             yield page.click(SELECTORS.PURCHASE_CONFIRM_BTN);
-            yield page.wait(1000);
+            this.logger.debug('[purchase]', 'wait for purchase result');
+            try {
+                yield page.waitForSelector(SELECTORS.PURCHASE_NUMBER_LIST, 5000);
+            }
+            catch (e) {
+                this.logger.error('[purchase]', 'failed to wait for purchase result selector', SELECTORS.PURCHASE_NUMBER_LIST, e);
+                throw LottoError.PurchaseFailed('구매 결과 로딩 타임아웃');
+            }
             // game result
-            this.logger.debug('[purchase]', 'print result');
-            return page.querySelectorAll(SELECTORS.PURCHASE_NUMBER_LIST, elems => {
+            const result = yield page.querySelectorAll(SELECTORS.PURCHASE_NUMBER_LIST, elems => {
                 return elems.map(it => Array.from(it.children).map(child => Number(child.innerHTML)));
             });
+            this.logger.debug('[purchase]', 'print result', result);
+            if (result.length === 0 || result.some(nums => nums.length === 0)) {
+                this.logger.error('[purchase]', 'failed to parse purchase result', {
+                    selector: SELECTORS.PURCHASE_NUMBER_LIST,
+                    result
+                });
+                throw LottoError.PurchaseFailed('구매 결과 파싱 실패');
+            }
+            return result;
         });
         this.check = (numbers, round = getLastLottoRound()) => __awaiter(this, void 0, void 0, function* () {
             numbers.forEach(number => validateLottoNumber(number));

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

@@ -18,4 +18,5 @@ export declare class PlaywrightPage implements BrowserPageInterface {
     setCookies(cookies: StringifiedCookies): Promise<void>;
     wait(param: 'idle' | 'load' | number): Promise<void>;
     on(event: BrowserPageEvents, callback: (...args: unknown[]) => void): () => Page;
+    waitForSelector(selector: string, timeout?: number): Promise<void>;
 }

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

@@ -16,4 +16,5 @@ export declare class PuppeteerPage implements BrowserPageInterface {
     setCookies(cookies: StringifiedCookies): Promise<void>;
     wait(param: 'idle' | 'load' | number): Promise<void>;
     on(event: BrowserPageEvents, callback: (...args: unknown[]) => void): () => Page;
+    waitForSelector(selector: string, timeout?: number): Promise<void>;
 }

package/lib/typescript/lottoError.d.ts

@@ -3,6 +3,7 @@ declare const ErrorCode: {
     INVALID_LOTTO_NUMBER: 300002;
     NOT_AUTHENTICATED: 300003;
     PURCHASE_UNAVAILABLE: 300004;
+    PURCHASE_FAILED: 300005;
     CREDENTIALS_INCORRECT: 200001;
     INVALID_COOKIE: 200002;
     NETWORK_ERROR: 100001;
@@ -19,12 +20,14 @@ export default class LottoError extends Error {
     static InvalidLottoNumber(): LottoError;
     static NotAuthenticated(): LottoError;
     static PurchaseUnavailable(): LottoError;
+    static PurchaseFailed(message?: string): LottoError;
     static NotSupported(message?: string): LottoError;
     static get code(): {
         INVALID_ROUND: 300001;
         INVALID_LOTTO_NUMBER: 300002;
         NOT_AUTHENTICATED: 300003;
         PURCHASE_UNAVAILABLE: 300004;
+        PURCHASE_FAILED: 300005;
         CREDENTIALS_INCORRECT: 200001;
         INVALID_COOKIE: 200002;
         NETWORK_ERROR: 100001;
@@ -32,7 +35,7 @@ export default class LottoError extends Error {
         UNKNOWN_ERROR: 199999;
     };
     static getMessage(code: ErrorCodeNumber): string;
-    static getName(code: ErrorCodeNumber): "INVALID_ROUND" | "INVALID_LOTTO_NUMBER" | "NOT_AUTHENTICATED" | "PURCHASE_UNAVAILABLE" | "CREDENTIALS_INCORRECT" | "INVALID_COOKIE" | "NETWORK_ERROR" | "NOT_SUPPORTED" | "UNKNOWN_ERROR";
+    static getName(code: ErrorCodeNumber): "INVALID_ROUND" | "INVALID_LOTTO_NUMBER" | "NOT_AUTHENTICATED" | "PURCHASE_UNAVAILABLE" | "PURCHASE_FAILED" | "CREDENTIALS_INCORRECT" | "INVALID_COOKIE" | "NETWORK_ERROR" | "NOT_SUPPORTED" | "UNKNOWN_ERROR";
     code: number;
     constructor(code: ErrorCodeNumber, message?: string);
 }

package/lib/typescript/types.d.ts

@@ -41,6 +41,7 @@ export interface BrowserPageInterface {
     wait(time: number): Promise<void>;
     wait(type: 'load'): Promise<void>;
     wait(type: 'idle'): Promise<void>;
+    waitForSelector(selector: string, timeout?: number): Promise<void>;
     getCookies(): Promise<StringifiedCookies>;
     setCookies(cookies: StringifiedCookies): Promise<void>;
     on(event: BrowserPageEvents, callback: (...args: any[]) => void): Unsubscribe;

package/package.json

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