@rich-automation/lotto 1.0.0 → 2.0.1

package/README.md

@@ -1,15 +1,14 @@
 # @rich-automation/lotto
 
-[![npm](https://img.shields.io/npm/v/@rich-automation/lotto.svg?style=popout&colorB=yellow)](https://www.npmjs.com/package/@rich-automation/lotto)
-[![ci](https://github.com/rich-automation/lotto-module/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/rich-automation/lotto-module/actions/workflows/ci.yml)
+[![npm](https://img.shields.io/npm/v/@rich-automation/lotto.svg?style=popout&colorB=yellow)](https://www.npmjs.com/package/@rich-automation/lotto)  
+[![ci](https://github.com/rich-automation/lotto-module/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/rich-automation/lotto-module/actions/workflows/ci.yml)  
 [![codecov](https://codecov.io/gh/rich-automation/lotto-module/branch/main/graph/badge.svg?token=18IAW1OW77)](https://codecov.io/gh/rich-automation/lotto-module)
 
-`@rich-automation/lotto` 패키지는 headless browser를 이용해 js환경에서 자동으로 로또를 구매할 수 있는 인터페이스를 제공합니다.
+`@rich-automation/lotto`는 headless browser를 활용해 JS 환경에서 로또를 자동으로 구매할 수 있는 인터페이스를 제공합니다.
 
+## 설치
 
-
-## Installation
-```shell
+```bash
 # npm
 npm install @rich-automation/lotto
 
@@ -17,105 +16,119 @@ npm install @rich-automation/lotto
 yarn add @rich-automation/lotto
 ```
 
-## Preparation
-1. 내부적으로 playwright/puppeteer를 사용하므로 머신에 chromium 을 미리 설치해주셔야 합니다. ([link](https://github.com/rich-automation/lotto-module/blob/main/package.json#L38-L39))
-2. [동행복권](https://dhlottery.co.kr/common.do?method=main) 사이트를 통해 구매가 이루어지며 예치금 충전은 지원하지 않으므로 미리 동행복권 계정에 예치금을 충전해두어야합니다.
+## 준비 사항
+
+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) 사이트에서 진행되며, 예치금 충전 기능은 없으므로 미리 계정에 예치금을 충전해두어야 합니다.
+
+## 사용법
+
+### 기본 설정
 
-## Usage
-### 공통
-lottoService 객체 인스턴스를 생성합니다.
 ```js
 import { LottoService } from '@rich-automation/lotto';
+import { chromium } from 'playwright';
+import puppeteer from 'puppeteer';
 
-const lottoService = new LottoService();
-//...
+// playwright 로 시작, 모든 기능 사용 가능
+const lottoService = new LottoService({
+  controller: chromium // puppeteer
+});
+
+// puppeteer 로 시작, 모든 기능 사용 가능
+const lottoService = new LottoService({
+  controller: puppeteer
+});
+
+// API 모드로 시작, check / getCheckWinningLink 기능만 사용 가능
+const lottoService = new LottoService({
+  controller: 'api'
+});
 ```
-LottoService 클래스의 생성자는 BrowserConfigs를 인수로 받을 수 있습니다. 인수로 전달된 configs는 다음과 같은 속성을 가질 수 있습니다:
 
-- `controller(default: 'playwright')`: 내부적으로 어떤 컨트롤러(puppeteer/playwright)를 사용할 지 지정할 수 있습니다.
-- `headless(default: false)`: 브라우저의 헤드리스 모드 여부를 설정합니다.
-- `defaultViewport(default: { width: 1080, height: 1024 })`: 브라우저의 기본 뷰포트 크기를 설정합니다.
-- `logLevel(default:2)`:콘솔 로그 수준을 설정합니다. (NONE = -1, ERROR = 0, WARN = 1, INFO = 2, DEBUG = 3)
+옵션 설명:
+
+- `controller`: (필수) `puppeteer`, `playwright` 모듈 또는 `"api"`
+- `headless`: 기본값 `false`
+- `defaultViewport`: 기본값 `{ width: 1080, height: 1024 }`
+- `logLevel`: 기본값 `2` (NONE = -1, ERROR = 0, WARN = 1, INFO = 2, DEBUG = 3)
+
 ```js
-//example
-import {LottoService, LogLevel} from '@rich-automation/lotto'
+import { LottoService, LogLevel } from '@rich-automation/lotto';
 
 const lottoService = new LottoService({
+  controller: chromium,
   headless: true,
-  defaultViewport: { width: 1280, height: 720 }, 
+  defaultViewport: { width: 1280, height: 720 },
   logLevel: LogLevel.DEBUG
 });
 ```
-### 구매
-```js
-import {LottoService} from "@rich-automation/lotto";
 
-const ID = "<YOUR_ID>";
-const PWD = "<YOUR_PASSWORD>";
+### 로또 구매
 
-const lottoService = new LottoService({
-    headless:true
-});
+```js
+const ID = '<YOUR_ID>';
+const PWD = '<YOUR_PASSWORD>';
 
-await lottoService.signIn(ID,PWD);
+await lottoService.signIn(ID, PWD);
 
 const numbers = await lottoService.purchase(5);
-console.log(numbers); //[[ 1, 14, 21, 27, 30, 44 ],[ 4, 5, 27, 29, 40, 44 ],[ 9, 18, 19, 24, 38, 42 ],[ 4, 6, 13, 20, 38, 39 ],[ 8, 9, 10, 19, 32, 40 ]]
-
-
 
+console.log(numbers); // [[ 1, 14, 21, 27, 30, 44 ],[ 4, 5, 27, 29, 40, 44 ],[ 9, 18, 19, 24, 38, 42 ],[ 4, 6, 13, 20, 38, 39 ],[ 8, 9, 10, 19, 32, 40 ]]
 ```
 
 ### 당첨 확인
-이번 회차 당첨 확인
-```js
-import {getLastLottoRound,LottoService} from "@rich-automation/lotto";
 
-const numbers = "[[1,2,3,4,5,6],[5,6,7,8,9,10]";
+이번 회차 확인:
 
-const lottoService = new LottoService({
-    headless:true
-});
+```js
+import { getLastLottoRound } from '@rich-automation/lotto';
+
+const numbers = [
+  [1, 2, 3, 4, 5, 6],
+  [5, 6, 7, 8, 9, 10]
+];
 
 const currentRound = getLastLottoRound();
 
-const result = await lottoService.check(numbers,currentRound)
-console.log(result) //[{rank:1,matchedNumbers:[1,2,3,4,5,6]},{rank:5,matchedNumbers:[5,6]]
-```
-다음 회차 당첨 링크 생성
-```js
-import {getNextLottoRound,LottoService} from "@rich-automation/lotto";
+const result = await lottoService.check(numbers, currentRound);
 
-const numbers = "[[1,2,3,4,5,6],[5,6,7,8,9,10]";
+console.log(result); // [{rank:1,matchedNumbers:[1,2,3,4,5,6]},{rank:5,matchedNumbers:[5,6]]
+```
 
+다음 회차 링크 생성:
 
-const lottoService = new LottoService({
-    headless:true
-});
+```js
+import { getNextLottoRound } from '@rich-automation/lotto';
 
 const nextRound = getNextLottoRound();
-const link = lottoService.getCheckWinningLink(numbers,nextRound);
-console.log(link) //"https://dhlottery.co.kr/qr.do?method=winQr&v=1071q010203040506q050607080910";
+const link = lottoService.getCheckWinningLink(numbers, nextRound);
 
+console.log(link); // "https://dhlottery.co.kr/qr.do?method=winQr&v=1071q010203040506q050607080910";
 ```
 
+## API
+
+### `signIn(id: string, password: string): Promise<string>`
+
+동행복권 로그인, 성공 시 로그인 쿠키 반환
+
+### `signInWithCookie(cookies: string): Promise<string>`
+
+쿠키 기반 로그인
+
+### `purchase(amount?: number): Promise<number[][]>`
+
+로또 번호 자동 구매 (1~5 게임)
+
+### `check(numbers: number[][], round?: number): Promise<{ rank:number; matchedNumbers:number[] }[]>`
+
+(API) 당첨 결과 확인
+
+### `getCheckWinningLink(numbers: number[][], round?: number): string`
+
+(API) 당첨 확인 링크 생성
+
+### `destroy(): Promise<void>`
 
-## Method
-### signIn
-- `(id: string, password: string) => Promise<string>`
-- description: id와 pwd를 입력받아 동행복권에 로그인합니다. 성공할경우 로그인 쿠키를 반환합니다.
-### signInWithCookie
-- `(cookies: string) => Promise<string>`
-- description: 로그인 쿠키를 입력받아 동행복권에 로그인합니다. 성공할경우 로그인 쿠키를 반환합니다.
-### purchase
-- `(amount?: number) => Promise<number[][]>`
-- description: 구매할 게임 횟수를 입력받아 로또를 구매하고, 구매한 번호를 이차원 배열 형태로 반환합니다. amount는 1~5사이 값을 가집니다.
-### check
-- `(numbers: number[][], round?: number) => Promise<{ rank:number; matchedNumbers:number[] }[]>`
-- description: 회차와 해당 회차에 구매한 로또번호를 입력받아 당첨 등수(rank)와 맞춘 번호(matchedNumbers)목록을 반환합니다. 회차를 지정하지 않으면 최신 회차를 기준으로 확인합니다.
-### getCheckWinningLink
-- `(numbers: number[][], round?: number) => string`
-- description: 회차와 구매한 로또 번호를 입력받아 당첨 확인 링크를 생성합니다. 로또 번호는 해당 회차에 구매한 모든 게임을 이차원 배열 형태로 입력받습니다. 회차를 지정하지 않으면 다음 회차를 기준으로 링크를 생성합니다.
-### destroy
-- `() => Promise<void>`
-- description: LottoService 인스턴스에서 사용한 브라우저 컨트롤러를 종료합니다.
+브라우저 인스턴스 종료

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,9 +2,10 @@
 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',

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/api/index.js

@@ -0,0 +1,28 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.APIModeController = void 0;
+class APIModeController {
+    constructor(configs, logger) {
+        this.focus = () => __awaiter(this, void 0, void 0, function* () {
+            throw new Error('APIModeController does not support focus method');
+        });
+        this.close = () => __awaiter(this, void 0, void 0, function* () {
+            this.logger.warn('APIModeController does not support close method');
+        });
+        this.cleanPages = () => __awaiter(this, void 0, void 0, function* () {
+            this.logger.warn('APIModeController does not support cleanPages method');
+        });
+        this.logger = logger;
+        this.configs = configs;
+    }
+}
+exports.APIModeController = APIModeController;

package/lib/cjs/controllers/factory.js

@@ -3,12 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBrowserController = void 0;
 const puppeteer_1 = require("./puppeteer");
 const playwright_1 = require("./playwright");
-function createBrowserController(name, configs, logger) {
-    switch (name) {
-        case 'puppeteer':
-            return new puppeteer_1.PuppeteerController(configs, logger);
-        case 'playwright':
-            return new playwright_1.PlaywrightController(configs, logger);
+const api_1 = require("./api");
+function createBrowserController(configs, logger) {
+    if (isAPIMode(configs)) {
+        return new api_1.APIModeController(configs, logger);
     }
+    if (isPlaywright(configs)) {
+        return new playwright_1.PlaywrightController(configs, logger);
+    }
+    if (isPuppeteer(configs)) {
+        return new puppeteer_1.PuppeteerController(configs, logger);
+    }
+    throw new Error('Invalid browser controller');
 }
 exports.createBrowserController = createBrowserController;
+function isAPIMode(configs) {
+    return configs.controller === 'api';
+}
+function isPlaywright(configs) {
+    return typeof configs.controller !== 'string' && 'connectOverCDP' in configs.controller;
+}
+function isPuppeteer(configs) {
+    return typeof configs.controller !== 'string' && 'executablePath' in configs.controller;
+}

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

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlaywrightController = void 0;
-const playwright_1 = require("playwright");
 const deferred_1 = require("../../utils/deferred");
 const playwright_page_1 = require("./playwright.page");
 const constants_1 = require("../../constants");
@@ -69,7 +68,7 @@ class PlaywrightController {
         });
         this.configs = configs;
         this.logger = logger;
-        playwright_1.chromium.launch(this.configs).then((browser) => __awaiter(this, void 0, void 0, function* () {
+        this.configs.controller.launch(this.configs).then((browser) => __awaiter(this, void 0, void 0, function* () {
             this.browser = browser;
             this.context = yield browser.newContext();
         }));

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/index.js

@@ -8,12 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PuppeteerController = void 0;
-const puppeteer_1 = __importDefault(require("puppeteer"));
 const deferred_1 = require("../../utils/deferred");
 const puppeteer_page_1 = require("./puppeteer.page");
 const constants_1 = require("../../constants");
@@ -71,8 +67,8 @@ class PuppeteerController {
         });
         this.configs = configs;
         this.logger = logger;
-        puppeteer_1.default
-            .launch(Object.assign(Object.assign({}, this.configs), { headless: this.configs.headless === true ? 'new' : this.configs.headless }))
+        configs.controller
+            .launch(Object.assign(Object.assign({}, this.configs), { headless: this.configs.headless === true }))
             .then((browser) => __awaiter(this, void 0, void 0, function* () {
             this.browser = browser;
         }));

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/lottoError.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const invertObject_1 = require("./utils/invertObject");
 const BaseErrorCode = {
     NETWORK_ERROR: 100001,
+    NOT_SUPPORTED: 110000,
     UNKNOWN_ERROR: 199999
 };
 const LoginErrorCode = {
@@ -25,7 +26,8 @@ const ErrorMessage = {
     [ErrorCode.INVALID_ROUND]: '로또 회차가 올바르지 않습니다.',
     [ErrorCode.INVALID_LOTTO_NUMBER]: '로또 번호가 올바르지 않습니다.',
     [ErrorCode.NOT_AUTHENTICATED]: '인증되지 않았습니다.',
-    [ErrorCode.PURCHASE_UNAVAILABLE]: '현재는 로또 구매가 불가능합니다.'
+    [ErrorCode.PURCHASE_UNAVAILABLE]: '현재는 로또 구매가 불가능합니다.',
+    [ErrorCode.NOT_SUPPORTED]: '지원되지 않는 기능입니다.'
 };
 class LottoError extends Error {
     static NetworkError() {
@@ -52,6 +54,9 @@ class LottoError extends Error {
     static PurchaseUnavailable() {
         return new LottoError(ErrorCode.PURCHASE_UNAVAILABLE);
     }
+    static NotSupported(message) {
+        return new LottoError(ErrorCode.NOT_SUPPORTED, message);
+    }
     static get code() {
         return ErrorCode;
     }

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"));
@@ -30,14 +29,19 @@ const getCheckWinningLink_1 = require("./utils/getCheckWinningLink");
 const getNextLottoRound_1 = require("./utils/getNextLottoRound");
 class LottoService {
     constructor(configs) {
-        var _a;
         this.context = {
             authenticated: false
         };
         this.destroy = () => __awaiter(this, void 0, void 0, function* () {
+            if (this.browserController.configs.controller === 'api') {
+                throw lottoError_1.default.NotSupported('API mode does not support destroy.');
+            }
             return (0, lazyRun_1.lazyRun)(this.browserController.close, constants_1.CONST.BROWSER_DESTROY_SAFE_TIMEOUT);
         });
         this.signInWithCookie = (cookies) => __awaiter(this, void 0, void 0, function* () {
+            if (this.browserController.configs.controller === 'api') {
+                throw lottoError_1.default.NotSupported('API mode does not support signInWithCookie.');
+            }
             // 쿠키 설정 & 페이지 이동
             const page = yield this.browserController.focus(0);
             this.logger.debug('[signInWithCookie]', 'setCookies');
@@ -59,46 +63,45 @@ class LottoService {
             return page.getCookies();
         });
         this.signIn = (id, password) => __awaiter(this, void 0, void 0, function* () {
-            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;
+            if (this.browserController.configs.controller === 'api') {
+                throw lottoError_1.default.NotSupported('API mode does not support signIn.');
+            }
+            // 페이지 이동
+            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') {
+                throw lottoError_1.default.NotSupported('API mode does not support purchase.');
+            }
             if (!this.context.authenticated)
                 throw lottoError_1.default.NotAuthenticated();
             this.logger.debug('[purchase]', 'validatePurchaseAvailability');
@@ -142,8 +145,8 @@ class LottoService {
             this.logger.debug('[getCheckWinningLink]', 'getCheckWinningLink');
             return (0, getCheckWinningLink_1.getCheckWinningLink)(numbers, round);
         };
-        this.logger = new logger_1.default(configs === null || configs === void 0 ? void 0 : configs.logLevel, '[LottoService]');
-        this.browserController = (0, factory_1.createBrowserController)((_a = configs === null || configs === void 0 ? void 0 : configs.controller) !== null && _a !== void 0 ? _a : 'playwright', Object.assign({ defaultViewport: { width: 1080, height: 1024 } }, configs), this.logger);
+        this.logger = new logger_1.default(configs.logLevel, '[LottoService]');
+        this.browserController = (0, factory_1.createBrowserController)(Object.assign({ defaultViewport: { width: 1080, height: 1024 } }, configs), this.logger);
     }
 }
 exports.LottoService = LottoService;

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,7 +1,8 @@
 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',

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/api/index.js

@@ -0,0 +1,25 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import {} from '../../logger';
+export class APIModeController {
+    constructor(configs, logger) {
+        this.focus = () => __awaiter(this, void 0, void 0, function* () {
+            throw new Error('APIModeController does not support focus method');
+        });
+        this.close = () => __awaiter(this, void 0, void 0, function* () {
+            this.logger.warn('APIModeController does not support close method');
+        });
+        this.cleanPages = () => __awaiter(this, void 0, void 0, function* () {
+            this.logger.warn('APIModeController does not support cleanPages method');
+        });
+        this.logger = logger;
+        this.configs = configs;
+    }
+}

package/lib/esm/controllers/factory.js

@@ -1,10 +1,24 @@
 import { PuppeteerController } from './puppeteer';
 import { PlaywrightController } from './playwright';
-export function createBrowserController(name, configs, logger) {
-    switch (name) {
-        case 'puppeteer':
-            return new PuppeteerController(configs, logger);
-        case 'playwright':
-            return new PlaywrightController(configs, logger);
+import { APIModeController } from './api';
+export function createBrowserController(configs, logger) {
+    if (isAPIMode(configs)) {
+        return new APIModeController(configs, logger);
     }
+    if (isPlaywright(configs)) {
+        return new PlaywrightController(configs, logger);
+    }
+    if (isPuppeteer(configs)) {
+        return new PuppeteerController(configs, logger);
+    }
+    throw new Error('Invalid browser controller');
+}
+function isAPIMode(configs) {
+    return configs.controller === 'api';
+}
+function isPlaywright(configs) {
+    return typeof configs.controller !== 'string' && 'connectOverCDP' in configs.controller;
+}
+function isPuppeteer(configs) {
+    return typeof configs.controller !== 'string' && 'executablePath' in configs.controller;
 }

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

@@ -7,7 +7,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { chromium } from 'playwright';
 import { deferred } from '../../utils/deferred';
 import { PlaywrightPage } from './playwright.page';
 import { CONST } from '../../constants';
@@ -67,7 +66,7 @@ export class PlaywrightController {
         });
         this.configs = configs;
         this.logger = logger;
-        chromium.launch(this.configs).then((browser) => __awaiter(this, void 0, void 0, function* () {
+        this.configs.controller.launch(this.configs).then((browser) => __awaiter(this, void 0, void 0, function* () {
             this.browser = browser;
             this.context = yield browser.newContext();
         }));

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/index.js

@@ -7,7 +7,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import puppeteer, { Browser } from 'puppeteer';
 import { deferred } from '../../utils/deferred';
 import { PuppeteerPage } from './puppeteer.page';
 import { CONST } from '../../constants';
@@ -66,8 +65,8 @@ export class PuppeteerController {
         });
         this.configs = configs;
         this.logger = logger;
-        puppeteer
-            .launch(Object.assign(Object.assign({}, this.configs), { headless: this.configs.headless === true ? 'new' : this.configs.headless }))
+        configs.controller
+            .launch(Object.assign(Object.assign({}, this.configs), { headless: this.configs.headless === true }))
             .then((browser) => __awaiter(this, void 0, void 0, function* () {
             this.browser = browser;
         }));

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

@@ -7,7 +7,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Page } from 'puppeteer';
 import { deferred } from '../../utils/deferred';
 import { lazyRun } from '../../utils/lazyRun';
 export class PuppeteerPage {
@@ -51,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/lottoError.js

@@ -1,6 +1,7 @@
 import { invertObject } from './utils/invertObject';
 const BaseErrorCode = {
     NETWORK_ERROR: 100001,
+    NOT_SUPPORTED: 110000,
     UNKNOWN_ERROR: 199999
 };
 const LoginErrorCode = {
@@ -23,7 +24,8 @@ const ErrorMessage = {
     [ErrorCode.INVALID_ROUND]: '로또 회차가 올바르지 않습니다.',
     [ErrorCode.INVALID_LOTTO_NUMBER]: '로또 번호가 올바르지 않습니다.',
     [ErrorCode.NOT_AUTHENTICATED]: '인증되지 않았습니다.',
-    [ErrorCode.PURCHASE_UNAVAILABLE]: '현재는 로또 구매가 불가능합니다.'
+    [ErrorCode.PURCHASE_UNAVAILABLE]: '현재는 로또 구매가 불가능합니다.',
+    [ErrorCode.NOT_SUPPORTED]: '지원되지 않는 기능입니다.'
 };
 export default class LottoError extends Error {
     static NetworkError() {
@@ -50,6 +52,9 @@ export default class LottoError extends Error {
     static PurchaseUnavailable() {
         return new LottoError(ErrorCode.PURCHASE_UNAVAILABLE);
     }
+    static NotSupported(message) {
+        return new LottoError(ErrorCode.NOT_SUPPORTED, message);
+    }
     static get code() {
         return ErrorCode;
     }

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';
@@ -24,14 +23,19 @@ import { getCheckWinningLink } from './utils/getCheckWinningLink';
 import { getNextLottoRound } from './utils/getNextLottoRound';
 export class LottoService {
     constructor(configs) {
-        var _a;
         this.context = {
             authenticated: false
         };
         this.destroy = () => __awaiter(this, void 0, void 0, function* () {
+            if (this.browserController.configs.controller === 'api') {
+                throw LottoError.NotSupported('API mode does not support destroy.');
+            }
             return lazyRun(this.browserController.close, CONST.BROWSER_DESTROY_SAFE_TIMEOUT);
         });
         this.signInWithCookie = (cookies) => __awaiter(this, void 0, void 0, function* () {
+            if (this.browserController.configs.controller === 'api') {
+                throw LottoError.NotSupported('API mode does not support signInWithCookie.');
+            }
             // 쿠키 설정 & 페이지 이동
             const page = yield this.browserController.focus(0);
             this.logger.debug('[signInWithCookie]', 'setCookies');
@@ -53,46 +57,45 @@ export class LottoService {
             return page.getCookies();
         });
         this.signIn = (id, password) => __awaiter(this, void 0, void 0, function* () {
-            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;
+            if (this.browserController.configs.controller === 'api') {
+                throw LottoError.NotSupported('API mode does not support signIn.');
+            }
+            // 페이지 이동
+            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') {
+                throw LottoError.NotSupported('API mode does not support purchase.');
+            }
             if (!this.context.authenticated)
                 throw LottoError.NotAuthenticated();
             this.logger.debug('[purchase]', 'validatePurchaseAvailability');
@@ -136,7 +139,7 @@ export class LottoService {
             this.logger.debug('[getCheckWinningLink]', 'getCheckWinningLink');
             return getCheckWinningLink(numbers, round);
         };
-        this.logger = new Logger(configs === null || configs === void 0 ? void 0 : configs.logLevel, '[LottoService]');
-        this.browserController = createBrowserController((_a = configs === null || configs === void 0 ? void 0 : configs.controller) !== null && _a !== void 0 ? _a : 'playwright', Object.assign({ defaultViewport: { width: 1080, height: 1024 } }, configs), this.logger);
+        this.logger = new Logger(configs.logLevel, '[LottoService]');
+        this.browserController = createBrowserController(Object.assign({ defaultViewport: { width: 1080, height: 1024 } }, configs), this.logger);
     }
 }

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/api/index.d.ts

@@ -0,0 +1,13 @@
+import type { BrowserConfigs, BrowserControllerInterface } from '../../types';
+import type { Browser, BrowserContext } from 'playwright';
+import { type LoggerInterface } from '../../logger';
+export declare class APIModeController implements BrowserControllerInterface {
+    configs: BrowserConfigs;
+    logger: LoggerInterface;
+    browser: Browser;
+    context: BrowserContext;
+    constructor(configs: BrowserConfigs, logger: LoggerInterface);
+    focus: () => Promise<never>;
+    close: () => Promise<void>;
+    cleanPages: () => Promise<void>;
+}

package/lib/typescript/controllers/factory.d.ts

@@ -1,3 +1,3 @@
-import type { BrowserConfigs, BrowserControllerInterface } from '../types';
+import type { BrowserConfigs, BrowserController, BrowserControllerInterface } from '../types';
 import type { LoggerInterface } from '../logger';
-export declare function createBrowserController(name: 'puppeteer' | 'playwright', configs: BrowserConfigs, logger: LoggerInterface): BrowserControllerInterface;
+export declare function createBrowserController<T extends BrowserController>(configs: BrowserConfigs<T>, logger: LoggerInterface): BrowserControllerInterface;

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

@@ -1,13 +1,14 @@
 import type { BrowserConfigs, BrowserControllerInterface } from '../../types';
 import type { Browser, BrowserContext } from 'playwright';
+import type { BrowserType } from 'playwright-core';
 import { PlaywrightPage } from './playwright.page';
 import { type LoggerInterface } from '../../logger';
-export declare class PlaywrightController implements BrowserControllerInterface {
-    configs: BrowserConfigs;
+export declare class PlaywrightController implements BrowserControllerInterface<BrowserType> {
+    configs: BrowserConfigs<BrowserType>;
     logger: LoggerInterface;
     browser: Browser;
     context: BrowserContext;
-    constructor(configs: BrowserConfigs, logger: LoggerInterface);
+    constructor(configs: BrowserConfigs<BrowserType>, logger: LoggerInterface);
     private getBrowserContext;
     focus: (pageIndex?: number) => Promise<PlaywrightPage>;
     close: () => Promise<void>;

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/index.d.ts

@@ -1,12 +1,12 @@
 import type { BrowserConfigs, BrowserControllerInterface } from '../../types';
-import { Browser } from 'puppeteer';
 import { PuppeteerPage } from './puppeteer.page';
 import { type LoggerInterface } from '../../logger';
-export declare class PuppeteerController implements BrowserControllerInterface {
-    configs: BrowserConfigs;
+import type { PuppeteerNode, Browser } from 'puppeteer';
+export declare class PuppeteerController implements BrowserControllerInterface<PuppeteerNode> {
+    configs: BrowserConfigs<PuppeteerNode>;
     logger: LoggerInterface;
     browser: Browser;
-    constructor(configs: BrowserConfigs, logger: LoggerInterface);
+    constructor(configs: BrowserConfigs<PuppeteerNode>, logger: LoggerInterface);
     private getBrowser;
     focus: (pageIndex?: number) => Promise<PuppeteerPage>;
     close: () => Promise<void>;

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

@@ -1,5 +1,5 @@
 import type { BrowserPageEvents, BrowserPageInterface, FakeDOMElement, StringifiedCookies } from '../../types';
-import { Page } from 'puppeteer';
+import type { Page } from 'puppeteer';
 import type { LoggerInterface } from '../../logger';
 export declare class PuppeteerPage implements BrowserPageInterface {
     page: Page;
@@ -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/lottoError.d.ts

@@ -6,6 +6,7 @@ declare const ErrorCode: {
     CREDENTIALS_INCORRECT: 200001;
     INVALID_COOKIE: 200002;
     NETWORK_ERROR: 100001;
+    NOT_SUPPORTED: 110000;
     UNKNOWN_ERROR: 199999;
 };
 type ErrorCodeNumber = (typeof ErrorCode)[keyof typeof ErrorCode];
@@ -18,6 +19,7 @@ export default class LottoError extends Error {
     static InvalidLottoNumber(): LottoError;
     static NotAuthenticated(): LottoError;
     static PurchaseUnavailable(): LottoError;
+    static NotSupported(message?: string): LottoError;
     static get code(): {
         INVALID_ROUND: 300001;
         INVALID_LOTTO_NUMBER: 300002;
@@ -26,10 +28,11 @@ export default class LottoError extends Error {
         CREDENTIALS_INCORRECT: 200001;
         INVALID_COOKIE: 200002;
         NETWORK_ERROR: 100001;
+        NOT_SUPPORTED: 110000;
         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" | "UNKNOWN_ERROR";
+    static getName(code: ErrorCodeNumber): "INVALID_ROUND" | "INVALID_LOTTO_NUMBER" | "NOT_AUTHENTICATED" | "PURCHASE_UNAVAILABLE" | "CREDENTIALS_INCORRECT" | "INVALID_COOKIE" | "NETWORK_ERROR" | "NOT_SUPPORTED" | "UNKNOWN_ERROR";
     code: number;
     constructor(code: ErrorCodeNumber, message?: string);
 }

package/lib/typescript/lottoService.d.ts

@@ -6,7 +6,7 @@ export declare class LottoService implements LottoServiceInterface {
     };
     browserController: BrowserControllerInterface;
     logger: LoggerInterface;
-    constructor(configs?: BrowserConfigs);
+    constructor(configs: BrowserConfigs);
     destroy: () => Promise<void>;
     signInWithCookie: (cookies: string) => Promise<string>;
     signIn: (id: string, password: string) => Promise<string>;

package/lib/typescript/types.d.ts

@@ -1,4 +1,6 @@
 import type { LogLevel } from './logger';
+import type { PuppeteerNode } from 'puppeteer';
+import type { BrowserType } from 'playwright-core';
 export interface LottoServiceInterface {
     destroy(): Promise<void>;
     signIn(id: string, password: string): Promise<string>;
@@ -10,8 +12,9 @@ export interface LottoServiceInterface {
     purchase(amount: number): Promise<number[][]>;
     getCheckWinningLink(numbers: number[][], round: number): string;
 }
-export interface BrowserConfigs {
-    controller?: 'puppeteer' | 'playwright';
+export type BrowserController = PuppeteerNode | BrowserType | 'api';
+export interface BrowserConfigs<T extends BrowserController = BrowserController> {
+    controller: T;
     logLevel?: LogLevel;
     headless?: boolean;
     defaultViewport?: {
@@ -21,8 +24,8 @@ export interface BrowserConfigs {
     [key: string]: unknown;
     args?: string[];
 }
-export interface BrowserControllerInterface {
-    configs: BrowserConfigs;
+export interface BrowserControllerInterface<T extends BrowserController = BrowserController> {
+    configs: BrowserConfigs<T>;
     focus(pageIndex?: number): Promise<BrowserPageInterface>;
     cleanPages(remainingPageIndex: number[]): Promise<void>;
     close(): Promise<void>;
@@ -34,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>;
@@ -50,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": "1.0.0",
+  "version": "2.0.1",
   "description": "Lotto module",
   "publishConfig": {
     "access": "public",
@@ -35,7 +35,7 @@
     "build:esm": "tsc --project tsconfig.esm.json && echo '{\"type\": \"module\"}' > lib/esm/package.json",
     "build:dts": "tsc --project tsconfig.json --emitDeclarationOnly --declaration --declarationDir lib/typescript",
     "test": "jest --forceExit --detectOpenHandles",
-    "install:puppeteer": "node ./node_modules/puppeteer/install.js",
+    "install:puppeteer": "node ./node_modules/puppeteer/install.mjs",
     "install:playwright": "npx playwright install chromium --with-deps",
     "fix": "yarn fix:eslint && yarn fix:prettier",
     "fix:eslint": "eslint --fix src --ext js,jsx,ts,tsx ",
@@ -46,11 +46,21 @@
     "lint:prettier": "prettier --check \"src/**/*.{ts,tsx,js}\""
   },
   "dependencies": {
-    "axios": "^1.3.5",
-    "dayjs": "^1.11.7",
+    "axios": "^1.8.4",
+    "dayjs": "^1.11.13"
+  },
+  "peerDependencies": {
     "playwright": "^1.35.0",
     "puppeteer": "^20.5.0"
   },
+  "peerDependenciesMeta": {
+    "playwright": {
+      "optional": true
+    },
+    "puppeteer": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@babel/core": "^7.21.4",
     "@babel/preset-env": "^7.21.4",
@@ -64,7 +74,9 @@
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "jest": "^29.5.0",
+    "playwright": "^1.51.1",
     "prettier": "^2.8.7",
+    "puppeteer": "^24.6.1",
     "release-it": "^15.10.3",
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"