Fix release process (#283)

* Use node 22 for release action

* Use upload-artifact@v4

Fixes:
This request has been automatically failed because it uses a deprecated version of `actions/upload-artifact: v3`

* Increase sauce connect ready timeout from 30s to 60s

* Increase sauce connect close timeout from 5s to 10s

* Increase timeout for sc e2e tests

* Do not fail silently if error is not caused by a http request itself

Author: budziam

.github/workflows/npm-publish.yml

@@ -22,14 +22,14 @@ jobs:
       - name: Setup Node version
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 22
       - name: Install dependencies
         run: npm ci
       - run: npm run build
       - name: Run tests
         run: npm test
       - name: Upload built package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: compiled-package
           path: build/
@@ -43,7 +43,7 @@ jobs:
       - name: Setup Node version
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 22
           registry-url: https://registry.npmjs.org/
       - name: Setup Git
         run: |

e2e/sc.test.js

@@ -5,7 +5,7 @@ const ID = process.env.GITHUB_RUN_ID ?? '(local)';
 // in GitHub Actions, otherwise it fails for untrusted PRs
 const SKIP_TEST = process.env.GITHUB_RUN_ID && !process.env.SAUCE_USERNAME;
 
-jest.setTimeout(60 * 1000); // 60s should be sufficient to boot SC
+jest.setTimeout(120 * 1000); // 120s should be sufficient to run all SC tests
 
 /**
  * unmock
@@ -77,9 +77,3 @@ test('should be able to run Sauce Connect', async () => {
   console.log('Sauce Connect started successfully, shutting down...');
   await sc.close();
 });
-
-afterAll(async () => {
-  // this is here because for whatever reason, we're logging output from
-  // sc _after_ sc.close() has fulfilled. this is disallowed by jest, for whatever reason
-  await new Promise((resolve) => setTimeout(resolve, 5000));
-});

src/constants.js

@@ -329,6 +329,6 @@ export const SC_PARAMS_TO_STRIP = [
   ...SAUCE_CONNECT_CLI_PARAM_ALIASES,
 ];
 
-export const SC_CLOSE_TIMEOUT = 5000;
-export const SC_READY_TIMEOUT = 30000;
+export const SC_CLOSE_TIMEOUT = 10000;
+export const SC_READY_TIMEOUT = 60000;
 export const SC_HEALTHCHECK_TIMEOUT = 1000;

src/sauceConnectHealthcheck.js

@@ -6,7 +6,7 @@ export default class SauceConnectHealthCheck {
       signal: AbortSignal.timeout(SC_HEALTHCHECK_TIMEOUT),
     });
     if (response.status !== 200) {
-      throw new Error(`response status code ${response.status} != 200`);
+      throw new TypeError(`response status code ${response.status} != 200`);
     }
   }
 }

src/sauceConnectManager.js

@@ -6,10 +6,10 @@ import {
 import SauceConnectHealthCheck from './sauceConnectHealthcheck';
 
 export class SauceConnectManager {
-  constructor(cp, logger) {
+  constructor(cp, logger, healthcheck) {
     this.cp = cp;
     this.logger = logger || (() => {});
-    this.healthcheck = new SauceConnectHealthCheck();
+    this.healthcheck = healthcheck || new SauceConnectHealthCheck();
     this._healthcheckInterval = null;
     this._readyTimeout = null;
   }
@@ -41,10 +41,18 @@ export class SauceConnectManager {
 
         this.healthcheck
           .perform(apiAddress)
-          .then(() => clearInterval(this._healthcheckInterval))
-          .then(() => clearTimeout(this._readyTimeout))
-          .then(resolve)
-          .catch(() => {});
+          .then(() => {
+            clearInterval(this._healthcheckInterval);
+            clearTimeout(this._readyTimeout);
+            resolve();
+          })
+          .catch((err) => {
+            if (err.name !== 'TypeError') {
+              clearInterval(this._healthcheckInterval);
+              clearTimeout(this._readyTimeout);
+              reject(err);
+            }
+          });
       }, SC_HEALTHCHECK_TIMEOUT);
 
       this._readyTimeout = setTimeout(() => {

tests/sauceConnectManager.test.js

@@ -19,6 +19,27 @@ describe('SauceConnectManager', () => {
       );
     });
 
+    test('error when requesting healthcheck', async () => {
+      const manager = new SauceConnectManager(
+        {
+          stderr: {
+            on: jest.fn(),
+          },
+          stdout: {
+            on: jest.fn(),
+          },
+        },
+        undefined,
+        {
+          async perform() {
+            throw new Error('custom error');
+          },
+        }
+      );
+      const error = await manager.waitForReady(':8042').catch((err) => err);
+      expect(error.message).toBe('custom error');
+    });
+
     describe('waiting too long for healthcheck', () => {
       let origTimeout = constants.SC_READY_TIMEOUT;
       beforeEach(() => {