Remove site. Update portal-plugin

claabs · Sep 5, 2021 · 39f1fcd · 39f1fcd
1 parent d951dde
commit 39f1fcd
Show file tree

Hide file tree

Showing 23 changed files with 71 additions and 3,573 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -3,6 +3,4 @@
 !src
 !package*.json
 !tsconfig.json
-!entrypoint.sh
-
-src/site/public/node_modules
+!entrypoint.sh
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -14,10 +14,9 @@
         "editor.formatOnSave": false,
     },
     "eslint.enable": true,
-    "typescript.tsdk": "node_modules\\typescript\\lib",
+    "typescript.tsdk": "node_modules/typescript/lib",
     "docker.defaultRegistryPath": "charlocharlie",
     "eslint.workingDirectories": [
-        ".",
-        "./src/site/public"
+        "."
     ]
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,14 +5,14 @@
   "main": "src/index.ts",
   "scripts": {
     "start": "node dist/src/index.js",
-    "start:ts": "DEBUG=puppeteer-extra-plugin:portal ts-node src/index.ts",
-    "build": "rm -rf dist && tsc && cd src/site/public && npm run build && cd ../../.. && npx copyfiles -E src/**/public/*.html src/**/public/*.bundle.js dist",
-    "lint": "tsc --noEmit && eslint **/*.ts && (cd src/site/public && npm run lint)",
+    "start:ts": "DEBUG=puppeteer-extra-plugin:portal* ts-node src/index.ts",
+    "build": "rm -rf dist && tsc",
+    "lint": "tsc --noEmit && eslint **/*.ts",
     "test": "jest",
     "redeem": "ts-node commands.ts redeem",
     "create": "ts-node commands.ts create",
     "docker:build": "docker build . -t charlocharlie/epicgames-freegames-node:latest --target deploy",
-    "docker:build-test": "docker build . -t charlocharlie/epicgames-freegames-test:latest --target deploy"
+    "docker:build-dev": "docker build . -t charlocharlie/epicgames-freegames:dev --target deploy"
   },
   "dependencies": {
     "cookie-parser": "^1.4.5",
@@ -36,7 +36,7 @@
     "pino-pretty": "^3.6.1",
     "puppeteer": "^5.5.0",
     "puppeteer-extra": "^3.1.18",
-    "puppeteer-extra-plugin-portal": "^3.0.0-rc.4",
+    "puppeteer-extra-plugin-portal": "^3.0.0-rc.5",
     "puppeteer-extra-plugin-stealth": "^2.7.8",
     "qs": "^6.9.4",
     "set-cookie-parser": "^2.4.3",
@@ -93,8 +93,7 @@
     "**/*.config.js",
     "**/node_modules/**",
     "dist/**",
-    "**/*.d.ts",
-    "src/site/public/*"
+    "**/*.d.ts"
   ],
   "license": "MIT"
-}
+}
diff --git a/src/common/config.ts b/src/common/config.ts
@@ -3,10 +3,7 @@ import json5 from 'json5';
 import fs from 'fs';
 import path from 'path';
 import { config as dotenv } from 'dotenv';
-import {
-  WebPortalConnectionConfig,
-  ChromiumRemoteDebuggingConnectionConfig,
-} from 'puppeteer-extra-plugin-portal';
+import { WebPortalConnectionConfig } from 'puppeteer-extra-plugin-portal';
 
 dotenv();
 
@@ -53,7 +50,6 @@ export interface PartialConfig {
   email?: PartialEmailConfig;
   hcaptchaAccessibilityUrl?: string;
   webPortalConfig?: WebPortalConnectionConfig;
-  webSocketConfig?: ChromiumRemoteDebuggingConnectionConfig;
 }
 
 export interface ConfigObject extends PartialConfig {
@@ -68,7 +64,6 @@ export interface ConfigObject extends PartialConfig {
   email: EmailConfig;
   hcaptchaAccessibilityUrl?: string;
   webPortalConfig?: WebPortalConnectionConfig;
-  webSocketConfig?: ChromiumRemoteDebuggingConnectionConfig;
 }
 
 const EXTENSIONS = ['json', 'json5']; // Allow .json or .json5 extension
@@ -116,7 +111,6 @@ function validateConfig(config: PartialConfig): ConfigObject {
       email: (config.email as unknown) as EmailConfig,
       hcaptchaAccessibilityUrl: config.hcaptchaAccessibilityUrl,
       webPortalConfig: config.webPortalConfig,
-      webSocketConfig: config.webSocketConfig,
     };
     return validConfig;
   } catch (err) {

diff --git a/src/common/puppeteer.ts b/src/common/puppeteer.ts
@@ -1,9 +1,6 @@
 import puppeteer from 'puppeteer-extra';
 import { Cookie, Page, SetCookie } from 'puppeteer';
-import PortalPlugin, {
-  ChromiumRemoteDebuggingConnectionConfig,
-  WebPortalConnectionConfig,
-} from 'puppeteer-extra-plugin-portal';
+import PortalPlugin, { WebPortalConnectionConfig } from 'puppeteer-extra-plugin-portal';
 import objectAssignDeep from 'object-assign-deep';
 import StealthPlugin from 'puppeteer-extra-plugin-stealth';
 import { ToughCookieFileStore } from './request';
@@ -16,15 +13,9 @@ const defaultWebPortalConfig: WebPortalConnectionConfig = {
   },
 };
 
-const defaultWebSocketConfig: ChromiumRemoteDebuggingConnectionConfig = {
-  // baseUrl: 'ws://localhost:3001',
-  // port: 3001,
-};
-
 puppeteer.use(
   PortalPlugin({
     webPortalConfig: objectAssignDeep(defaultWebPortalConfig, config.webPortalConfig),
-    webSocketConfig: objectAssignDeep(defaultWebSocketConfig, config.webSocketConfig),
   })
 );
 
@@ -86,8 +77,8 @@ export function toughCookieFileStoreToPuppeteerCookie(tcfs: ToughCookieFileStore
 }
 
 export function getDevtoolsUrl(page: Page): string {
-  // eslint-disable-next-line no-underscore-dangle
-  const targetId = (page as any)._target._targetId as string;
+  // eslint-disable-next-line no-underscore-dangle,@typescript-eslint/no-explicit-any
+  const targetId: string = (page.target() as any)._targetId;
   const wsEndpoint = new URL(page.browser().wsEndpoint());
   // devtools://devtools/bundled/inspector.html?ws=127.0.0.1:35871/devtools/page/2B4E5714B42640A1C61AB9EE7E432730
   return `devtools://devtools/bundled/inspector.html?ws=${wsEndpoint.host}/devtools/page/${targetId}`;

diff --git a/src/index.ts b/src/index.ts
@@ -6,7 +6,6 @@ import Login from './login';
 import FreeGames from './free-games';
 import Purchase from './purchase';
 import { newCookieJar } from './common/request';
-import './site/app';
 
 async function main(): Promise<void> {
   const accountPromises = config.accounts.map(async (account, index) => {