Simplify worker class

thomasdondorf · Oct 15, 2020 · fbe7378 · fbe7378
1 parent fbd9a9f
commit fbe7378
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 53 deletions.
diff --git a/package.json b/package.json
@@ -6,10 +6,10 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "./node_modules/.bin/jest",
-    "coverage": "./node_modules/.bin/jest --coverage",
-    "dev": "./node_modules/.bin/tsc --watch",
-    "lint": "./node_modules/.bin/tslint -c tslint.json --project test/_config/tsconfig.json \"src/**/*.ts\" \"test/**/*.ts\""
+    "test": "jest",
+    "coverage": "jest --coverage",
+    "dev": "tsc --watch",
+    "lint": "tslint -c tslint.json --project test/_config/tsconfig.json \"src/**/*.ts\" \"test/**/*.ts\""
   },
   "author": "Thomas Dondorf",
   "repository": {

diff --git a/src/Cluster.ts b/src/Cluster.ts
@@ -199,8 +199,6 @@ export default class Cluster<JobData = any, ReturnData = any> extends EventEmitt
         }
 
         const worker = new Worker<JobData, ReturnData>({
-            cluster: this,
-            args: [''], // this.options.args,
             browser: workerBrowserInstance,
             id: workerId,
         });

diff --git a/src/Worker.ts b/src/Worker.ts
@@ -1,20 +1,12 @@
-
 import Job from './Job';
-import Cluster, { TaskFunction } from './Cluster';
-import { Page } from 'puppeteer';
-import { timeoutExecute, debugGenerator, log } from './util';
+import { TaskFunction } from './Cluster';
+import { debugGenerator, log, timeoutExecute } from './util';
 import { inspect } from 'util';
-import { WorkerInstance, JobInstance } from './concurrency/ConcurrencyImplementation';
+import { WorkerInstance } from './concurrency/ConcurrencyImplementation';
 
 const debug = debugGenerator('Worker');
 
-const DEFAULT_OPTIONS = {
-    args: [],
-};
-
 interface WorkerOptions {
-    cluster: Cluster;
-    args: string[];
     id: number;
     browser: WorkerInstance;
 }
@@ -33,18 +25,23 @@ export interface WorkData {
 
 export type WorkResult = WorkError | WorkData;
 
-export default class Worker<JobData, ReturnData> implements WorkerOptions {
+const success = (data: any): WorkData => ({
+    data,
+    type: 'success',
+});
+
+const error = (errorState?: Error): WorkError => ({
+    type: 'error',
+    error: errorState || new Error(),
+});
 
-    cluster: Cluster;
-    args: string[];
+export default class Worker<JobData, ReturnData> {
     id: number;
     browser: WorkerInstance;
 
     activeTarget: Job<JobData, ReturnData> | null = null;
 
-    public constructor({ cluster, args, id, browser }: WorkerOptions) {
-        this.cluster = cluster;
-        this.args = args;
+    public constructor({ id, browser }: WorkerOptions) {
         this.id = id;
         this.browser = browser;
 
@@ -58,27 +55,8 @@ export default class Worker<JobData, ReturnData> implements WorkerOptions {
         ): Promise<WorkResult> {
         this.activeTarget = job;
 
-        let jobInstance: JobInstance | null = null;
-        let page: Page | null = null;
-
-        let tries = 0;
-
-        while (jobInstance === null) {
-            try {
-                jobInstance = await this.browser.jobInstance();
-                page = jobInstance.resources.page;
-            } catch (err) {
-                debug(`Error getting browser page (try: ${tries}), message: ${err.message}`);
-                await this.browser.repair();
-                tries += 1;
-                if (tries >= BROWSER_INSTANCE_TRIES) {
-                    throw new Error('Unable to get browser page');
-                }
-            }
-        }
-
-         // We can be sure that page is set now, otherwise an exception would've been thrown
-        page = page as Page; // this is just for TypeScript
+        const jobInstance = await this.getJobInstance();
+        const page = jobInstance.resources.page;
 
         let errorState: Error | null = null;
 
@@ -119,17 +97,20 @@ export default class Worker<JobData, ReturnData> implements WorkerOptions {
         }
 
         this.activeTarget = null;
+        return errorState ? error(errorState) : success(result);
+    }
 
-        if (errorState) {
-            return {
-                type: 'error',
-                error: errorState || new Error('asf'),
-            };
+    private async getJobInstance() {
+        for (let attempt = 0; attempt < BROWSER_INSTANCE_TRIES; attempt += 1) {
+            try {
+                return await this.browser.jobInstance();
+            } catch (err) {
+                debug(`Error getting browser page (try: ${attempt}), message: ${err.message}`);
+                await this.browser.repair();
+            }
         }
-        return {
-            data: result,
-            type: 'success',
-        };
+
+        throw new Error('Unable to get browser page');
     }
 
     public async close(): Promise<void> {