@rich-automation/lotto 2.0.0 → 2.0.2

package/lib/cjs/apis/dhlottery/getWinningNumbers.js

@@ -15,16 +15,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getWinningNumbers = void 0;
 const axios_1 = __importDefault(require("axios"));
 const lottoError_1 = __importDefault(require("../../lottoError"));
-const getWinningNumbers = (volume) => __awaiter(void 0, void 0, void 0, function* () {
+const getWinningNumbers = (round) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
     let res;
     try {
-        res = yield axios_1.default.get(`https://www.dhlottery.co.kr/common.do?method=getLottoNumber&drwNo=${volume}`);
+        res = yield axios_1.default.get(`https://dhlottery.co.kr/lt645/selectPstLt645Info.do?srchStrLtEpsd=${round}&srchEndLtEpsd=${round}`);
     }
-    catch (_a) {
+    catch (_c) {
         throw lottoError_1.default.NetworkError();
     }
-    if (res.data.returnValue == 'success') {
-        return toOrderedWinningNumbers(res.data);
+    const item = (_b = (_a = res.data.data) === null || _a === void 0 ? void 0 : _a.list) === null || _b === void 0 ? void 0 : _b[0];
+    if (item) {
+        return toOrderedWinningNumbers(item);
     }
     else {
         throw lottoError_1.default.InvalidRound();
@@ -32,5 +34,5 @@ const getWinningNumbers = (volume) => __awaiter(void 0, void 0, void 0, function
 });
 exports.getWinningNumbers = getWinningNumbers;
 function toOrderedWinningNumbers(data) {
-    return [data.drwtNo1, data.drwtNo2, data.drwtNo3, data.drwtNo4, data.drwtNo5, data.drwtNo6, data.bnusNo];
+    return [data.tm1WnNo, data.tm2WnNo, data.tm3WnNo, data.tm4WnNo, data.tm5WnNo, data.tm6WnNo, data.bnsWnNo];
 }

package/lib/cjs/constants/index.js

@@ -8,6 +8,8 @@ exports.CONST = {
     BROWSER_DESTROY_SAFE_TIMEOUT: 1000,
     BROWSER_PAGE_POPUP_WAIT: 1500,
     BROWSER_PAGE_DIALOG_WAIT: 10000,
+    BROWSER_LOGIN_WAIT: 5000,
     WEEK_TO_MILLISECOND: 604800000,
-    THOUSAND_ROUND_DATE: '2022-01-29T11:50:00Z'
+    THOUSAND_ROUND_DATE: '2022-01-29T11:50:00Z',
+    LOGIN_ERROR_MESSAGE: '아이디 또는 비밀번호가 일치하지 않습니다'
 };

package/lib/cjs/constants/selectors.js

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SELECTORS = void 0;
 exports.SELECTORS = {
-    ID_INPUT: '#userId',
-    PWD_INPUT: '#article > div:nth-child(2) > div > form > div > div.inner > fieldset > div.form > input[type=password]:nth-child(2)',
-    LOGIN_BUTTON: '#article > div:nth-child(2) > div > form > div > div.inner > fieldset > div.form > a',
+    ID_INPUT: '#inpUserId',
+    PWD_INPUT: '#inpUserPswdEncn',
+    LOGIN_BUTTON: '#btnLogin',
+    LOGIN_ERROR_POPUP: '.msgPop[role="alertdialog"]',
     ENVIRONMENT_ALERT_CONFIRM: 'input[value="확인"][onclick="javascript:closepopupLayerAlert();"]',
     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/constants/urls.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.URLS = void 0;
 exports.URLS = {
-    MAIN: 'https://dhlottery.co.kr/common.do?method=main',
-    LOGIN: 'https://dhlottery.co.kr/user.do?method=login&returnUrl=',
+    MAIN: 'https://dhlottery.co.kr/main',
+    LOGIN: 'https://dhlottery.co.kr/login',
     LOTTO_645: 'https://ol.dhlottery.co.kr/olotto/game/game645.do',
     CHECK_WINNING: 'https://dhlottery.co.kr/qr.do'
 };

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

@@ -54,6 +54,16 @@ class PlaywrightPage {
     querySelectorAll(selector, callback) {
         return this.page.$$eval(selector, callback);
     }
+    exists(selector, containsText) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (containsText) {
+                const count = yield this.page.locator(selector).filter({ hasText: containsText }).count();
+                return count > 0;
+            }
+            const count = yield this.page.locator(selector).count();
+            return count > 0;
+        });
+    }
     getCookies() {
         return __awaiter(this, void 0, void 0, function* () {
             const cookies = yield this.context.cookies();

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

@@ -53,6 +53,21 @@ class PuppeteerPage {
     querySelectorAll(selector, callback) {
         return this.page.$$eval(selector, callback);
     }
+    exists(selector, containsText) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (containsText) {
+                const elements = yield this.page.$$(selector);
+                for (const el of elements) {
+                    const text = yield el.evaluate(node => node.textContent);
+                    if (text === null || text === void 0 ? void 0 : text.includes(containsText))
+                        return true;
+                }
+                return false;
+            }
+            const element = yield this.page.$(selector);
+            return element !== null;
+        });
+    }
     getCookies() {
         return __awaiter(this, void 0, void 0, function* () {
             const cookies = yield this.page.cookies();

package/lib/cjs/lottoService.js

@@ -17,7 +17,6 @@ const lottoError_1 = __importDefault(require("./lottoError"));
 const selectors_1 = require("./constants/selectors");
 const factory_1 = require("./controllers/factory");
 const urls_1 = require("./constants/urls");
-const deferred_1 = require("./utils/deferred");
 const constants_1 = require("./constants");
 const lazyRun_1 = require("./utils/lazyRun");
 const logger_1 = __importDefault(require("./logger"));
@@ -67,44 +66,37 @@ class LottoService {
             if (this.browserController.configs.controller === 'api') {
                 throw lottoError_1.default.NotSupported('API mode does not support signIn.');
             }
-            const p = (0, deferred_1.deferred)();
-            queueMicrotask(() => __awaiter(this, void 0, void 0, function* () {
-                // 페이지 이동
-                const page = yield this.browserController.focus(0);
-                this.logger.debug('[signIn]', 'goto', 'login page');
-                yield page.goto(urls_1.URLS.LOGIN);
-                this.logger.debug('[signIn]', 'page url', yield page.url());
-                const unsubscribe = page.on('response', (response) => __awaiter(this, void 0, void 0, function* () {
-                    const url = response.url();
-                    switch (true) {
-                        // 로그인 실패
-                        case url.includes(urls_1.URLS.LOGIN.replace('https://', '')): {
-                            this.logger.info('[signIn]', 'fallback to login page', 'failure');
-                            unsubscribe();
-                            p.reject(lottoError_1.default.CredentialsIncorrect());
-                            break;
-                        }
-                        // 로그인 성공
-                        case url.includes(urls_1.URLS.MAIN.replace('https://', '')): {
-                            this.logger.info('[signIn]', 'fallback to main page', 'success');
-                            this.context.authenticated = true;
-                            unsubscribe();
-                            this.logger.debug('[signIn]', 'clear popups');
-                            yield page.wait(constants_1.CONST.BROWSER_PAGE_POPUP_WAIT);
-                            yield this.browserController.cleanPages([0]);
-                            const cookies = yield page.getCookies();
-                            p.resolve(cookies);
-                            break;
-                        }
-                    }
-                }));
-                // 로그인 시도
-                this.logger.debug('[signIn]', 'try login');
-                yield page.fill(selectors_1.SELECTORS.ID_INPUT, id);
-                yield page.fill(selectors_1.SELECTORS.PWD_INPUT, password);
-                yield page.click(selectors_1.SELECTORS.LOGIN_BUTTON);
-            }));
-            return p.promise;
+            // 페이지 이동
+            const page = yield this.browserController.focus(0);
+            this.logger.debug('[signIn]', 'goto', 'login page');
+            yield page.goto(urls_1.URLS.LOGIN);
+            this.logger.debug('[signIn]', 'page url', yield page.url());
+            // 로그인 시도
+            this.logger.debug('[signIn]', 'try login');
+            yield page.fill(selectors_1.SELECTORS.ID_INPUT, id);
+            yield page.fill(selectors_1.SELECTORS.PWD_INPUT, password);
+            yield page.click(selectors_1.SELECTORS.LOGIN_BUTTON);
+            // 결과 대기
+            yield page.wait(constants_1.CONST.BROWSER_LOGIN_WAIT);
+            // 결과 확인
+            const currentUrl = yield page.url();
+            // 성공: MAIN URL로 이동됨
+            if (currentUrl.includes(urls_1.URLS.MAIN)) {
+                this.logger.info('[signIn]', 'success');
+                this.context.authenticated = true;
+                this.logger.debug('[signIn]', 'clear popups');
+                yield page.wait(constants_1.CONST.BROWSER_PAGE_POPUP_WAIT);
+                yield this.browserController.cleanPages([0]);
+                return page.getCookies();
+            }
+            // 실패: 로그인 에러 팝업 확인
+            if (yield page.exists(selectors_1.SELECTORS.LOGIN_ERROR_POPUP, constants_1.CONST.LOGIN_ERROR_MESSAGE)) {
+                this.logger.info('[signIn]', 'failed', 'credentials incorrect');
+                throw lottoError_1.default.CredentialsIncorrect();
+            }
+            // 기타 실패
+            this.logger.info('[signIn]', 'failed', 'unknown');
+            throw lottoError_1.default.CredentialsIncorrect();
         });
         this.purchase = (amount = 5) => __awaiter(this, void 0, void 0, function* () {
             if (this.browserController.configs.controller === 'api') {

package/lib/esm/apis/dhlottery/getWinningNumbers.js

@@ -9,21 +9,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import axios from 'axios';
 import LottoError from '../../lottoError';
-export const getWinningNumbers = (volume) => __awaiter(void 0, void 0, void 0, function* () {
+export const getWinningNumbers = (round) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
     let res;
     try {
-        res = yield axios.get(`https://www.dhlottery.co.kr/common.do?method=getLottoNumber&drwNo=${volume}`);
+        res = yield axios.get(`https://dhlottery.co.kr/lt645/selectPstLt645Info.do?srchStrLtEpsd=${round}&srchEndLtEpsd=${round}`);
     }
-    catch (_a) {
+    catch (_c) {
         throw LottoError.NetworkError();
     }
-    if (res.data.returnValue == 'success') {
-        return toOrderedWinningNumbers(res.data);
+    const item = (_b = (_a = res.data.data) === null || _a === void 0 ? void 0 : _a.list) === null || _b === void 0 ? void 0 : _b[0];
+    if (item) {
+        return toOrderedWinningNumbers(item);
     }
     else {
         throw LottoError.InvalidRound();
     }
 });
 function toOrderedWinningNumbers(data) {
-    return [data.drwtNo1, data.drwtNo2, data.drwtNo3, data.drwtNo4, data.drwtNo5, data.drwtNo6, data.bnusNo];
+    return [data.tm1WnNo, data.tm2WnNo, data.tm3WnNo, data.tm4WnNo, data.tm5WnNo, data.tm6WnNo, data.bnsWnNo];
 }

package/lib/esm/constants/index.js

@@ -5,6 +5,8 @@ export const CONST = {
     BROWSER_DESTROY_SAFE_TIMEOUT: 1000,
     BROWSER_PAGE_POPUP_WAIT: 1500,
     BROWSER_PAGE_DIALOG_WAIT: 10000,
+    BROWSER_LOGIN_WAIT: 5000,
     WEEK_TO_MILLISECOND: 604800000,
-    THOUSAND_ROUND_DATE: '2022-01-29T11:50:00Z'
+    THOUSAND_ROUND_DATE: '2022-01-29T11:50:00Z',
+    LOGIN_ERROR_MESSAGE: '아이디 또는 비밀번호가 일치하지 않습니다'
 };

package/lib/esm/constants/selectors.js

@@ -1,12 +1,13 @@
 export const SELECTORS = {
-    ID_INPUT: '#userId',
-    PWD_INPUT: '#article > div:nth-child(2) > div > form > div > div.inner > fieldset > div.form > input[type=password]:nth-child(2)',
-    LOGIN_BUTTON: '#article > div:nth-child(2) > div > form > div > div.inner > fieldset > div.form > a',
+    ID_INPUT: '#inpUserId',
+    PWD_INPUT: '#inpUserPswdEncn',
+    LOGIN_BUTTON: '#btnLogin',
+    LOGIN_ERROR_POPUP: '.msgPop[role="alertdialog"]',
     ENVIRONMENT_ALERT_CONFIRM: 'input[value="확인"][onclick="javascript:closepopupLayerAlert();"]',
     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/constants/urls.js

@@ -1,6 +1,6 @@
 export const URLS = {
-    MAIN: 'https://dhlottery.co.kr/common.do?method=main',
-    LOGIN: 'https://dhlottery.co.kr/user.do?method=login&returnUrl=',
+    MAIN: 'https://dhlottery.co.kr/main',
+    LOGIN: 'https://dhlottery.co.kr/login',
     LOTTO_645: 'https://ol.dhlottery.co.kr/olotto/game/game645.do',
     CHECK_WINNING: 'https://dhlottery.co.kr/qr.do'
 };

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

@@ -51,6 +51,16 @@ export class PlaywrightPage {
     querySelectorAll(selector, callback) {
         return this.page.$$eval(selector, callback);
     }
+    exists(selector, containsText) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (containsText) {
+                const count = yield this.page.locator(selector).filter({ hasText: containsText }).count();
+                return count > 0;
+            }
+            const count = yield this.page.locator(selector).count();
+            return count > 0;
+        });
+    }
     getCookies() {
         return __awaiter(this, void 0, void 0, function* () {
             const cookies = yield this.context.cookies();

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

@@ -50,6 +50,21 @@ export class PuppeteerPage {
     querySelectorAll(selector, callback) {
         return this.page.$$eval(selector, callback);
     }
+    exists(selector, containsText) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (containsText) {
+                const elements = yield this.page.$$(selector);
+                for (const el of elements) {
+                    const text = yield el.evaluate(node => node.textContent);
+                    if (text === null || text === void 0 ? void 0 : text.includes(containsText))
+                        return true;
+                }
+                return false;
+            }
+            const element = yield this.page.$(selector);
+            return element !== null;
+        });
+    }
     getCookies() {
         return __awaiter(this, void 0, void 0, function* () {
             const cookies = yield this.page.cookies();

package/lib/esm/lottoService.js

@@ -11,7 +11,6 @@ import LottoError from './lottoError';
 import { SELECTORS } from './constants/selectors';
 import { createBrowserController } from './controllers/factory';
 import { URLS } from './constants/urls';
-import { deferred } from './utils/deferred';
 import { CONST } from './constants';
 import { lazyRun } from './utils/lazyRun';
 import Logger, {} from './logger';
@@ -61,44 +60,37 @@ export class LottoService {
             if (this.browserController.configs.controller === 'api') {
                 throw LottoError.NotSupported('API mode does not support signIn.');
             }
-            const p = deferred();
-            queueMicrotask(() => __awaiter(this, void 0, void 0, function* () {
-                // 페이지 이동
-                const page = yield this.browserController.focus(0);
-                this.logger.debug('[signIn]', 'goto', 'login page');
-                yield page.goto(URLS.LOGIN);
-                this.logger.debug('[signIn]', 'page url', yield page.url());
-                const unsubscribe = page.on('response', (response) => __awaiter(this, void 0, void 0, function* () {
-                    const url = response.url();
-                    switch (true) {
-                        // 로그인 실패
-                        case url.includes(URLS.LOGIN.replace('https://', '')): {
-                            this.logger.info('[signIn]', 'fallback to login page', 'failure');
-                            unsubscribe();
-                            p.reject(LottoError.CredentialsIncorrect());
-                            break;
-                        }
-                        // 로그인 성공
-                        case url.includes(URLS.MAIN.replace('https://', '')): {
-                            this.logger.info('[signIn]', 'fallback to main page', 'success');
-                            this.context.authenticated = true;
-                            unsubscribe();
-                            this.logger.debug('[signIn]', 'clear popups');
-                            yield page.wait(CONST.BROWSER_PAGE_POPUP_WAIT);
-                            yield this.browserController.cleanPages([0]);
-                            const cookies = yield page.getCookies();
-                            p.resolve(cookies);
-                            break;
-                        }
-                    }
-                }));
-                // 로그인 시도
-                this.logger.debug('[signIn]', 'try login');
-                yield page.fill(SELECTORS.ID_INPUT, id);
-                yield page.fill(SELECTORS.PWD_INPUT, password);
-                yield page.click(SELECTORS.LOGIN_BUTTON);
-            }));
-            return p.promise;
+            // 페이지 이동
+            const page = yield this.browserController.focus(0);
+            this.logger.debug('[signIn]', 'goto', 'login page');
+            yield page.goto(URLS.LOGIN);
+            this.logger.debug('[signIn]', 'page url', yield page.url());
+            // 로그인 시도
+            this.logger.debug('[signIn]', 'try login');
+            yield page.fill(SELECTORS.ID_INPUT, id);
+            yield page.fill(SELECTORS.PWD_INPUT, password);
+            yield page.click(SELECTORS.LOGIN_BUTTON);
+            // 결과 대기
+            yield page.wait(CONST.BROWSER_LOGIN_WAIT);
+            // 결과 확인
+            const currentUrl = yield page.url();
+            // 성공: MAIN URL로 이동됨
+            if (currentUrl.includes(URLS.MAIN)) {
+                this.logger.info('[signIn]', 'success');
+                this.context.authenticated = true;
+                this.logger.debug('[signIn]', 'clear popups');
+                yield page.wait(CONST.BROWSER_PAGE_POPUP_WAIT);
+                yield this.browserController.cleanPages([0]);
+                return page.getCookies();
+            }
+            // 실패: 로그인 에러 팝업 확인
+            if (yield page.exists(SELECTORS.LOGIN_ERROR_POPUP, CONST.LOGIN_ERROR_MESSAGE)) {
+                this.logger.info('[signIn]', 'failed', 'credentials incorrect');
+                throw LottoError.CredentialsIncorrect();
+            }
+            // 기타 실패
+            this.logger.info('[signIn]', 'failed', 'unknown');
+            throw LottoError.CredentialsIncorrect();
         });
         this.purchase = (amount = 5) => __awaiter(this, void 0, void 0, function* () {
             if (this.browserController.configs.controller === 'api') {

package/lib/typescript/apis/dhlottery/getWinningNumbers.d.ts

@@ -1 +1 @@
-export declare const getWinningNumbers: (volume: number) => Promise<number[]>;
+export declare const getWinningNumbers: (round: number) => Promise<number[]>;

package/lib/typescript/constants/index.d.ts

@@ -5,6 +5,8 @@ export declare const CONST: {
     BROWSER_DESTROY_SAFE_TIMEOUT: number;
     BROWSER_PAGE_POPUP_WAIT: number;
     BROWSER_PAGE_DIALOG_WAIT: number;
+    BROWSER_LOGIN_WAIT: number;
     WEEK_TO_MILLISECOND: number;
     THOUSAND_ROUND_DATE: string;
+    LOGIN_ERROR_MESSAGE: string;
 };

package/lib/typescript/constants/selectors.d.ts

@@ -2,6 +2,7 @@ export declare const SELECTORS: {
     ID_INPUT: string;
     PWD_INPUT: string;
     LOGIN_BUTTON: string;
+    LOGIN_ERROR_POPUP: string;
     ENVIRONMENT_ALERT_CONFIRM: string;
     PURCHASE_TYPE_RANDOM_BTN: string;
     PURCHASE_AMOUNT_SELECT: string;

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

@@ -13,6 +13,7 @@ export declare class PlaywrightPage implements BrowserPageInterface {
     click(selector: string, domDirect?: boolean): Promise<void>;
     select(selector: string, value: string): Promise<void>;
     querySelectorAll<T>(selector: string, callback: (elems: FakeDOMElement[]) => T): Promise<T>;
+    exists(selector: string, containsText?: string): Promise<boolean>;
     getCookies(): Promise<string>;
     setCookies(cookies: StringifiedCookies): Promise<void>;
     wait(param: 'idle' | 'load' | number): Promise<void>;

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

@@ -11,6 +11,7 @@ export declare class PuppeteerPage implements BrowserPageInterface {
     click(selector: string, domDirect?: boolean): Promise<void>;
     select(selector: string, value: string): Promise<void>;
     querySelectorAll<T>(selector: string, callback: (elems: FakeDOMElement[]) => T): Promise<T>;
+    exists(selector: string, containsText?: string): Promise<boolean>;
     getCookies(): Promise<string>;
     setCookies(cookies: StringifiedCookies): Promise<void>;
     wait(param: 'idle' | 'load' | number): Promise<void>;

package/lib/typescript/types.d.ts

@@ -37,6 +37,7 @@ export interface BrowserPageInterface {
     click(selector: string, domDirect?: boolean): Promise<void>;
     select(selector: string, value: string): Promise<void>;
     querySelectorAll<T>(selector: string, callback: (elems: FakeDOMElement[]) => T): Promise<T>;
+    exists(selector: string, containsText?: string): Promise<boolean>;
     wait(time: number): Promise<void>;
     wait(type: 'load'): Promise<void>;
     wait(type: 'idle'): Promise<void>;
@@ -53,14 +54,20 @@ export type BrowserPageEvents = 'response';
 export type Unsubscribe = () => void;
 export type StringifiedCookies = string;
 export type GetWinningNumbersResponse = {
-    returnValue: 'success' | 'fail';
-    drwtNo1: number;
-    drwtNo2: number;
-    drwtNo3: number;
-    drwtNo4: number;
-    drwtNo5: number;
-    drwtNo6: number;
-    bnusNo: number;
+    resultCode: string | null;
+    resultMessage: string | null;
+    data: {
+        list: Array<{
+            ltEpsd: number;
+            tm1WnNo: number;
+            tm2WnNo: number;
+            tm3WnNo: number;
+            tm4WnNo: number;
+            tm5WnNo: number;
+            tm6WnNo: number;
+            bnsWnNo: number;
+        }>;
+    };
 };
 declare global {
     namespace NodeJS {

package/package.json

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