code cleanup

.eslintrc.json

@@ -1,10 +1,10 @@
 {
-    "root": true,
-    "parser": "@typescript-eslint/parser",
-    "parserOptions": {
-        "project": ["./tsconfig.json"],
-        "ecmaVersion": 2022,
-        "sourceType": "module"
-    },
-    "extends": ["eslint-config-cityssm"]
+  "root": true,
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "project": ["./tsconfig.json"],
+    "ecmaVersion": 2022,
+    "sourceType": "module"
+  },
+  "extends": ["eslint-config-cityssm"]
 }

.prettierignore

@@ -1,2 +1 @@
-*.ejs
 *.js

.prettierrc.json

@@ -1,7 +1,7 @@
 {
     "trailingComma": "none",
-    "tabWidth": 4,
-    "semi": true,
-    "singleQuote": false,
-    "printWidth": 100
-}
+    "tabWidth": 2,
+    "semi": false,
+    "singleQuote": true,
+    "bracketSpacing": true
+  }

README.md

@@ -5,7 +5,6 @@
 [![Code Climate maintainability](https://img.shields.io/codeclimate/maintainability/cityssm/wsib-clearance-check)](https://codeclimate.com/github/cityssm/wsib-clearance-check)
 [![Code Climate coverage](https://img.shields.io/codeclimate/coverage/cityssm/wsib-clearance-check)](https://codeclimate.com/github/cityssm/wsib-clearance-check)
 [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/cityssm/wsib-clearance-check/coverage.yml)](https://github.com/cityssm/wsib-clearance-check/actions/workflows/coverage.yml)
-[![Snyk Vulnerabilities for GitHub Repo](https://img.shields.io/snyk/vulnerabilities/github/cityssm/wsib-clearance-check)](https://app.snyk.io/org/cityssm/project/18c6a1c4-1d7a-4161-85e4-003bfe84a57f)
 
 A tool to scrape the clearance certificate status from the
 [WSIB Online Services Clearance Certificate Website](https://onlineservices.wsib.on.ca/EClearanceWeb/eclearance/start).

browser-global.d.ts → browserGlobal.d.ts

@@ -1,4 +1,4 @@
-import type { Browser } from "puppeteer";
+import type { Browser } from 'puppeteer';
 export declare const setHeadless: (headlessStatus: boolean) => void;
 export declare const pageTimeoutMillis = 90000;
 export declare function getBrowserGlobal(): Promise<Browser>;

browser-global.js → browserGlobal.js

@@ -1,6 +1,6 @@
-import { setIntervalAsync } from "set-interval-async/dynamic";
-import { clearIntervalAsync } from "set-interval-async";
-import puppeteer from "puppeteer";
+import puppeteer from 'puppeteer';
+import { clearIntervalAsync } from 'set-interval-async';
+import { setIntervalAsync } from 'set-interval-async/dynamic';
 let headless = true;
 export const setHeadless = (headlessStatus) => {
     headless = headlessStatus;
@@ -12,19 +12,17 @@ let browserGlobal;
 let browserGlobalInitializedTime = 0;
 let browserGlobalTimer;
 function isBrowserGlobalReady() {
-    if (browserGlobal && browserGlobalInitializedTime + browserGlobalExpiryMillis > Date.now()) {
-        return true;
-    }
-    return false;
+    return Boolean(browserGlobal !== undefined &&
+        browserGlobalInitializedTime + browserGlobalExpiryMillis > Date.now());
 }
 export async function getBrowserGlobal() {
     if (!isBrowserGlobalReady()) {
         await cleanUpBrowserGlobal();
         keepBrowserGlobalAlive();
         browserGlobal = await puppeteer.launch({
-            headless,
+            headless: headless ? 'new' : false,
             timeout: browserStartupTimeoutMillis,
-            args: ["--lang-en-CA,en"]
+            args: ['--lang-en-CA,en']
         });
         keepBrowserGlobalAlive();
         browserGlobalTimer = setIntervalAsync(cleanUpBrowserGlobal, browserGlobalExpiryMillis);
@@ -42,14 +40,14 @@ export async function cleanUpBrowserGlobal(useForce = false) {
         try {
             await browserGlobal.close();
         }
-        catch (_a) {
+        catch {
         }
         browserGlobal = undefined;
         if (browserGlobalTimer) {
             try {
-                clearIntervalAsync(browserGlobalTimer);
+                await clearIntervalAsync(browserGlobalTimer);
             }
-            catch (_b) {
+            catch {
             }
             browserGlobalTimer = undefined;
         }

browserGlobal.ts

@@ -0,0 +1,90 @@
+import type { Browser } from 'puppeteer'
+import puppeteer from 'puppeteer'
+import { clearIntervalAsync } from 'set-interval-async'
+import { setIntervalAsync } from 'set-interval-async/dynamic'
+
+/*
+ * Headless Debug Setting
+ */
+
+let headless = true
+
+export const setHeadless = (headlessStatus: boolean): void => {
+  headless = headlessStatus
+}
+
+/*
+ * Browser Global
+ */
+
+export const pageTimeoutMillis = 90_000
+const browserStartupTimeoutMillis = 3 * 60_000
+
+const browserGlobalExpiryMillis =
+  Math.max(browserStartupTimeoutMillis, pageTimeoutMillis) + 10_000
+
+let browserGlobal: Browser | undefined
+let browserGlobalInitializedTime = 0
+let browserGlobalTimer
+
+function isBrowserGlobalReady(): boolean {
+  return Boolean(
+    browserGlobal !== undefined &&
+      browserGlobalInitializedTime + browserGlobalExpiryMillis > Date.now()
+  )
+}
+
+export async function getBrowserGlobal(): Promise<Browser> {
+  if (!isBrowserGlobalReady()) {
+    await cleanUpBrowserGlobal()
+
+    keepBrowserGlobalAlive()
+
+    browserGlobal = await puppeteer.launch({
+      headless: headless ? 'new' : false,
+      timeout: browserStartupTimeoutMillis,
+      args: ['--lang-en-CA,en']
+    })
+
+    keepBrowserGlobalAlive()
+
+    browserGlobalTimer = setIntervalAsync(
+      cleanUpBrowserGlobal,
+      browserGlobalExpiryMillis
+    )
+  }
+
+  return browserGlobal as Browser
+}
+
+export function keepBrowserGlobalAlive(): void {
+  browserGlobalInitializedTime = Date.now()
+}
+
+export async function cleanUpBrowserGlobal(useForce = false): Promise<void> {
+  if (useForce) {
+    browserGlobalInitializedTime = 0
+  }
+
+  if (!isBrowserGlobalReady()) {
+    try {
+      await browserGlobal.close()
+    } catch {
+      // ignore
+    }
+
+    browserGlobal = undefined
+
+    if (browserGlobalTimer) {
+      try {
+        await clearIntervalAsync(browserGlobalTimer)
+      } catch {
+        // ignore
+      }
+
+      browserGlobalTimer = undefined
+    }
+
+    browserGlobalInitializedTime = 0
+  }
+}

cli.js

@@ -1,6 +1,6 @@
-import { getClearanceByAccountNumber, cleanUpBrowser } from "./index.js";
+import { getClearanceByAccountNumber, cleanUpBrowser } from './index.js';
 const cli = async () => {
-    const accountNumbers = process.argv[2].split(",");
+    const accountNumbers = process.argv[2].split(',');
     for (const accountNumber of accountNumbers) {
         const results = await getClearanceByAccountNumber(accountNumber);
         console.log(results);

cli.ts

@@ -1,14 +1,14 @@
-import { getClearanceByAccountNumber, cleanUpBrowser } from "./index.js";
+import { getClearanceByAccountNumber, cleanUpBrowser } from './index.js'
 
 const cli = async () => {
-    const accountNumbers = process.argv[2].split(",");
+  const accountNumbers = process.argv[2].split(',')
 
-    for (const accountNumber of accountNumbers) {
-        const results = await getClearanceByAccountNumber(accountNumber);
-        console.log(results);
-    }
+  for (const accountNumber of accountNumbers) {
+    const results = await getClearanceByAccountNumber(accountNumber)
+    console.log(results)
+  }
 
-    await cleanUpBrowser();
-};
+  await cleanUpBrowser()
+}
 
-cli();
+cli()

config.js

@@ -1,14 +1,14 @@
-export const clearanceStart_url = "https://clearances.wsib.ca/Clearances/eclearance/start";
-export const clearanceStart_searchFormSelector = "#TOKENSimpleSearchForm";
-export const clearanceStart_searchFieldSelector = "#simpleAccountNumbersTOKEN";
+export const clearanceStart_url = 'https://clearances.wsib.ca/Clearances/eclearance/start';
+export const clearanceStart_searchFormSelector = '#TOKENSimpleSearchForm';
+export const clearanceStart_searchFieldSelector = '#simpleAccountNumbersTOKEN';
 export const clearanceResult_certificateLinkSelector = "#eClearanceWorkspaceTargSubDivFormXX .fancytable a[rel='eClearanceWorkspaceContent'][href^='GCSearchCertDet']";
-export const clearanceResult_certificateBadStandingSelector = "#eClearanceWorkspaceTargSubDivFormXX .fancytable .badstanding";
-export const clearanceResult_defaultErrorMessage = "Clearance certificate link not found.";
-export const certificate_tableSelector = "#eClearanceWorkspaceDivForm .fancytable";
-export const certificateField_contractorLegalTradeName = "Contractor Legal / Trade Name";
-export const certificateField_contractorAddress = "Contractor Address";
-export const certificateField_naicsCodes = "Contractor NAICS Code and Code Description";
-export const certificateField_clearanceCertificateNumber = "Clearance certificate number";
-export const certificateField_validityPeriod = "Validity period (dd-mmm-yyyy)";
-export const certificateField_principalLegalTradeName = "Principal Legal / Trade Name";
-export const certificateField_principalAddress = "Principal Address";
+export const clearanceResult_certificateBadStandingSelector = '#eClearanceWorkspaceTargSubDivFormXX .fancytable .badstanding';
+export const clearanceResult_defaultErrorMessage = 'Clearance certificate link not found.';
+export const certificate_tableSelector = '#eClearanceWorkspaceDivForm .fancytable';
+export const certificateField_contractorLegalTradeName = 'Contractor Legal / Trade Name';
+export const certificateField_contractorAddress = 'Contractor Address';
+export const certificateField_naicsCodes = 'Contractor NAICS Code and Code Description';
+export const certificateField_clearanceCertificateNumber = 'Clearance certificate number';
+export const certificateField_validityPeriod = 'Validity period (dd-mmm-yyyy)';
+export const certificateField_principalLegalTradeName = 'Principal Legal / Trade Name';
+export const certificateField_principalAddress = 'Principal Address';

config.ts

@@ -1,26 +1,33 @@
 // Search Form
 
-export const clearanceStart_url = "https://clearances.wsib.ca/Clearances/eclearance/start";
+export const clearanceStart_url =
+  'https://clearances.wsib.ca/Clearances/eclearance/start'
 
-export const clearanceStart_searchFormSelector = "#TOKENSimpleSearchForm";
-export const clearanceStart_searchFieldSelector = "#simpleAccountNumbersTOKEN";
+export const clearanceStart_searchFormSelector = '#TOKENSimpleSearchForm'
+export const clearanceStart_searchFieldSelector = '#simpleAccountNumbersTOKEN'
 
 // Search Results
 
 export const clearanceResult_certificateLinkSelector =
-    "#eClearanceWorkspaceTargSubDivFormXX .fancytable a[rel='eClearanceWorkspaceContent'][href^='GCSearchCertDet']";
+  "#eClearanceWorkspaceTargSubDivFormXX .fancytable a[rel='eClearanceWorkspaceContent'][href^='GCSearchCertDet']"
 export const clearanceResult_certificateBadStandingSelector =
-    "#eClearanceWorkspaceTargSubDivFormXX .fancytable .badstanding";
-export const clearanceResult_defaultErrorMessage = "Clearance certificate link not found.";
+  '#eClearanceWorkspaceTargSubDivFormXX .fancytable .badstanding'
+export const clearanceResult_defaultErrorMessage =
+  'Clearance certificate link not found.'
 
 // Certificate
 
-export const certificate_tableSelector = "#eClearanceWorkspaceDivForm .fancytable";
+export const certificate_tableSelector =
+  '#eClearanceWorkspaceDivForm .fancytable'
 
-export const certificateField_contractorLegalTradeName = "Contractor Legal / Trade Name";
-export const certificateField_contractorAddress = "Contractor Address";
-export const certificateField_naicsCodes = "Contractor NAICS Code and Code Description";
-export const certificateField_clearanceCertificateNumber = "Clearance certificate number";
-export const certificateField_validityPeriod = "Validity period (dd-mmm-yyyy)";
-export const certificateField_principalLegalTradeName = "Principal Legal / Trade Name";
-export const certificateField_principalAddress = "Principal Address";
+export const certificateField_contractorLegalTradeName =
+  'Contractor Legal / Trade Name'
+export const certificateField_contractorAddress = 'Contractor Address'
+export const certificateField_naicsCodes =
+  'Contractor NAICS Code and Code Description'
+export const certificateField_clearanceCertificateNumber =
+  'Clearance certificate number'
+export const certificateField_validityPeriod = 'Validity period (dd-mmm-yyyy)'
+export const certificateField_principalLegalTradeName =
+  'Principal Legal / Trade Name'
+export const certificateField_principalAddress = 'Principal Address'