@rich-automation/lotto 0.0.4 → 0.1.1

package/lib/cjs/index.js

@@ -1,7 +1,24 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCurrentLottoRound = exports.LottoService = void 0;
+exports.LogLevel = exports.getCurrentLottoRound = exports.LottoService = void 0;
 var lottoService_1 = require("./lottoService");
 Object.defineProperty(exports, "LottoService", { enumerable: true, get: function () { return lottoService_1.LottoService; } });
 var getCurrentLottoRound_1 = require("./utils/getCurrentLottoRound");
 Object.defineProperty(exports, "getCurrentLottoRound", { enumerable: true, get: function () { return getCurrentLottoRound_1.getCurrentLottoRound; } });
+var logger_1 = require("./logger");
+Object.defineProperty(exports, "LogLevel", { enumerable: true, get: function () { return logger_1.LogLevel; } });
+__exportStar(require("./types"), exports);

package/lib/cjs/lottoService.js

@@ -99,35 +99,45 @@ class LottoService {
         this.purchase = (amount = 5) => __awaiter(this, void 0, void 0, function* () {
             if (!this.context.authenticated)
                 throw lottoError_1.default.NotAuthenticated();
+            this.logger.debug('[purchase]', 'validatePurchaseAvailability');
             (0, validatePurchaseAvailability_1.validatePurchaseAvailability)();
             // move
+            this.logger.debug('[purchase]', 'move to lotto game page');
             const page = yield this.browserController.focus(0);
             yield page.goto(urls_1.URLS.LOTTO_645);
             // click auto button
+            this.logger.debug('[purchase]', 'click purchase type button -> auto');
             yield page.click(selectors_1.SELECTORS.PURCHASE_TYPE_RANDOM_BTN);
             // set and confirm amount
             const amountString = String(Math.max(1, Math.min(5, amount)));
+            this.logger.debug('[purchase]', `select purchase amount${amountString} -> amount confirm`);
             yield page.select(selectors_1.SELECTORS.PURCHASE_AMOUNT_SELECT, amountString);
             yield page.click(selectors_1.SELECTORS.PURCHASE_AMOUNT_CONFIRM_BTN);
             // click purchase button
+            this.logger.debug('[purchase]', 'click purchase button');
             yield page.click(selectors_1.SELECTORS.PURCHASE_BTN);
+            yield page.wait(500);
+            this.logger.debug('[purchase]', 'click purchase confirm button');
             yield page.click(selectors_1.SELECTORS.PURCHASE_CONFIRM_BTN);
             yield page.wait(1000);
             // game result
+            this.logger.debug('[purchase]', 'print result');
             return page.querySelectorAll(selectors_1.SELECTORS.PURCHASE_NUMBER_LIST, elems => {
                 return elems.map(it => Array.from(it.children).map(child => Number(child.innerHTML)));
             });
         });
         this.check = (numbers, round = (0, getCurrentLottoRound_1.getCurrentLottoRound)()) => __awaiter(this, void 0, void 0, function* () {
             (0, validateLottoNumber_1.validateLottoNumber)(numbers);
+            this.logger.debug('[check]', 'getWinningNumbers');
             const winningNumbers = yield (0, getWinningNumbers_1.getWinningNumbers)(round);
             return (0, checkWinning_1.checkWinning)(numbers, winningNumbers);
         });
         this.getCheckWinningLink = (round, numbers) => {
+            this.logger.debug('[getCheckWinningLink]', 'getCheckWinningLink');
             return (0, getCheckWinningLink_1.getCheckWinningLink)(round, numbers);
         };
         this.logger = new logger_1.default(configs === null || configs === void 0 ? void 0 : configs.logLevel, '[LottoService]');
-        this.browserController = (0, factory_1.createBrowserController)('puppeteer', Object.assign({ headless: false, defaultViewport: { width: 1080, height: 1024 } }, configs), this.logger);
+        this.browserController = (0, factory_1.createBrowserController)('puppeteer', Object.assign(Object.assign({ defaultViewport: { width: 1080, height: 1024 } }, configs), { headless: (configs === null || configs === void 0 ? void 0 : configs.headless) === false ? false : 'new' }), this.logger);
     }
 }
 exports.LottoService = LottoService;

package/lib/cjs/package.json

@@ -0,0 +1 @@
+{"type": "commonjs"}

package/lib/esm/index.js

@@ -1,2 +1,4 @@
 export { LottoService } from './lottoService';
 export { getCurrentLottoRound } from './utils/getCurrentLottoRound';
+export { LogLevel } from './logger';
+export * from './types';

package/lib/esm/lottoService.js

@@ -93,34 +93,44 @@ export class LottoService {
         this.purchase = (amount = 5) => __awaiter(this, void 0, void 0, function* () {
             if (!this.context.authenticated)
                 throw LottoError.NotAuthenticated();
+            this.logger.debug('[purchase]', 'validatePurchaseAvailability');
             validatePurchaseAvailability();
             // move
+            this.logger.debug('[purchase]', 'move to lotto game page');
             const page = yield this.browserController.focus(0);
             yield page.goto(URLS.LOTTO_645);
             // click auto button
+            this.logger.debug('[purchase]', 'click purchase type button -> auto');
             yield page.click(SELECTORS.PURCHASE_TYPE_RANDOM_BTN);
             // set and confirm amount
             const amountString = String(Math.max(1, Math.min(5, amount)));
+            this.logger.debug('[purchase]', `select purchase amount${amountString} -> amount confirm`);
             yield page.select(SELECTORS.PURCHASE_AMOUNT_SELECT, amountString);
             yield page.click(SELECTORS.PURCHASE_AMOUNT_CONFIRM_BTN);
             // click purchase button
+            this.logger.debug('[purchase]', 'click purchase button');
             yield page.click(SELECTORS.PURCHASE_BTN);
+            yield page.wait(500);
+            this.logger.debug('[purchase]', 'click purchase confirm button');
             yield page.click(SELECTORS.PURCHASE_CONFIRM_BTN);
             yield page.wait(1000);
             // game result
+            this.logger.debug('[purchase]', 'print result');
             return page.querySelectorAll(SELECTORS.PURCHASE_NUMBER_LIST, elems => {
                 return elems.map(it => Array.from(it.children).map(child => Number(child.innerHTML)));
             });
         });
         this.check = (numbers, round = getCurrentLottoRound()) => __awaiter(this, void 0, void 0, function* () {
             validateLottoNumber(numbers);
+            this.logger.debug('[check]', 'getWinningNumbers');
             const winningNumbers = yield getWinningNumbers(round);
             return checkWinning(numbers, winningNumbers);
         });
         this.getCheckWinningLink = (round, numbers) => {
+            this.logger.debug('[getCheckWinningLink]', 'getCheckWinningLink');
             return getCheckWinningLink(round, numbers);
         };
         this.logger = new Logger(configs === null || configs === void 0 ? void 0 : configs.logLevel, '[LottoService]');
-        this.browserController = createBrowserController('puppeteer', Object.assign({ headless: false, defaultViewport: { width: 1080, height: 1024 } }, configs), this.logger);
+        this.browserController = createBrowserController('puppeteer', Object.assign(Object.assign({ defaultViewport: { width: 1080, height: 1024 } }, configs), { headless: (configs === null || configs === void 0 ? void 0 : configs.headless) === false ? false : 'new' }), this.logger);
     }
 }

package/lib/esm/package.json

@@ -0,0 +1 @@
+{"type": "module"}

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

@@ -12,5 +12,5 @@ export declare class PuppeteerPage implements BrowserPageInterface {
     getCookies(): Promise<string>;
     setCookies(cookies: StringifiedCookies): Promise<void>;
     wait(param: 'idle' | 'load' | number): Promise<void>;
-    on(event: BrowserPageEvents, callback: (...args: unknown[]) => void): () => import("puppeteer").EventEmitter;
+    on(event: BrowserPageEvents, callback: (...args: unknown[]) => void): () => Page;
 }

package/lib/typescript/index.d.ts

@@ -1,2 +1,4 @@
 export { LottoService } from './lottoService';
 export { getCurrentLottoRound } from './utils/getCurrentLottoRound';
+export { LogLevel } from './logger';
+export * from './types';

package/lib/typescript/types.d.ts

@@ -12,7 +12,7 @@ export interface LottoServiceInterface {
 }
 export interface BrowserConfigs {
     logLevel?: LogLevel;
-    headless?: boolean;
+    headless?: boolean | 'new';
     defaultViewport?: {
         width: number;
         height: number;

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@rich-automation/lotto",
-  "version": "0.0.4",
+  "version": "0.1.1",
   "description": "Lotto module",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
   },
   "contributors": [
     {
@@ -26,10 +27,12 @@
   "packageManager": "yarn@1.22.19",
   "scripts": {
     "prepack": "yarn build",
+    "release:ci": "release-it --ci --npm.skipChecks",
+    "release:ci:test": "release-it --ci --npm.skipChecks --dry-run",
     "start": "ts-node ./example/app",
     "build": "rm -rf lib && yarn build:cjs && yarn build:esm && yarn build:dts",
-    "build:cjs": "tsc --project tsconfig.cjs.json --verbatimModuleSyntax false",
-    "build:esm": "tsc --project tsconfig.esm.json",
+    "build:cjs": "tsc --project tsconfig.cjs.json --verbatimModuleSyntax false && echo '{\"type\": \"commonjs\"}' > lib/cjs/package.json",
+    "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:chrome": "node ./node_modules/puppeteer/install.js",
@@ -44,7 +47,7 @@
   "dependencies": {
     "axios": "^1.3.5",
     "dayjs": "^1.11.7",
-    "puppeteer": "^19.8.5"
+    "puppeteer": "^20.5.0"
   },
   "devDependencies": {
     "@babel/core": "^7.21.4",