Move error utilities to @httptoolkit/util too

Author: pimterry

src/api/rest-api.ts

@@ -10,8 +10,8 @@ import type {
     RouteParameters
 } from 'express-serve-static-core';
 import type { ParsedQs } from 'qs';
+import { ErrorLike, StatusError } from '@httptoolkit/util';
 
-import { ErrorLike, StatusError } from '../util/error';
 import { logError } from '../error-tracking';
 import { ApiModel } from './api-model';
 import * as Client from '../client/client-types';
@@ -195,8 +195,8 @@ function handleErrors<
             // Use default error handler if response started (kills the connection)
             if (res.headersSent) return next(error)
             else {
-                const status = (error.status && error.status >= 400 && error.status < 600)
-                    ? error.status
+                const status = (error.statusCode && error.statusCode >= 400 && error.statusCode < 600)
+                    ? error.statusCode
                     : 500;
 
                 res.status(status).send({

src/browsers.ts

@@ -1,7 +1,7 @@
 import * as path from 'path';
 import { promisify } from 'util';
 
-import { delay } from '@httptoolkit/util';
+import { delay, isErrorLike } from '@httptoolkit/util';
 import getBrowserLauncherCb from '@httptoolkit/browser-launcher';
 import {
     LaunchOptions,
@@ -12,7 +12,6 @@ import {
 } from '@httptoolkit/browser-launcher';
 
 import { logError } from './error-tracking';
-import { isErrorLike } from './util/error';
 import { readFile, deleteFile } from './util/fs';
 
 const getBrowserLauncher = promisify(getBrowserLauncherCb);

src/index.ts

@@ -3,7 +3,7 @@ import * as fs from 'fs';
 import envPaths from 'env-paths';
 import { Mutex } from 'async-mutex';
 
-import { delay } from '@httptoolkit/util';
+import { delay, isErrorLike } from '@httptoolkit/util';
 import {
     PluggableAdmin,
     generateCACertificate
@@ -22,7 +22,6 @@ import { checkBrowserConfig } from './browsers';
 import { logError } from './error-tracking';
 import { IS_PROD_BUILD, MOCKTTP_ALLOWED_ORIGINS } from './constants';
 
-import { isErrorLike } from './util/error';
 import { readFile, checkAccess, writeFile, ensureDirectoryExists } from './util/fs';
 
 import { registerShutdownHandler, shutdown } from './shutdown';

src/interceptors/android/adb-commands.ts

@@ -2,10 +2,9 @@ import * as stream from 'stream';
 import * as path from 'path';
 
 import adb, * as Adb from '@devicefarmer/adbkit';
-import { delay } from '@httptoolkit/util';
+import { delay, isErrorLike } from '@httptoolkit/util';
 
 import { logError } from '../../error-tracking';
-import { isErrorLike } from '../../util/error';
 import { waitUntil } from '../../util/promise';
 import { getCertificateFingerprint, parseCert } from '../../certificates';
 import { streamToBuffer } from '../../util/stream';

src/interceptors/electron.ts

@@ -2,15 +2,14 @@ import _ from 'lodash';
 import { spawn } from 'child_process';
 import * as path from 'path';
 
-import { delay } from '@httptoolkit/util';
+import { delay, ErrorLike, isErrorLike } from '@httptoolkit/util';
 import { getPortPromise as getPort } from 'portfinder';
 import { generateSPKIFingerprint } from 'mockttp';
 import ChromeRemoteInterface = require('chrome-remote-interface');
 
 import { Interceptor } from '.';
 
 import { HtkConfig } from '../config';
-import { ErrorLike, isErrorLike } from '../util/error';
 import { canAccess, readFile } from '../util/fs';
 import { windowsClose } from '../util/process-management';
 import { getInheritableCurrentEnv, getTerminalEnvVars, OVERRIDES_DIR } from './terminal/terminal-env-overrides';

src/interceptors/fresh-firefox.ts

@@ -2,13 +2,12 @@ import _ from 'lodash';
 import * as path from 'path';
 import { SpawnOptions } from 'child_process';
 
-import { delay } from '@httptoolkit/util';
+import { delay, isErrorLike } from '@httptoolkit/util';
 
 import { APP_ROOT } from '../constants';
 import { HtkConfig } from '../config';
 import { logError } from '../error-tracking';
 
-import { isErrorLike } from '../util/error';
 import { isSnap, getSnapConfigPath } from '../util/snap';
 
 import { launchBrowser, BrowserInstance, getBrowserDetails } from '../browsers';

src/interceptors/frida/frida-integration.ts

@@ -1,8 +1,8 @@
 import * as FridaJs from 'frida-js';
+import { CustomError } from '@httptoolkit/util';
 
 import { getReachableInterfaces } from '../../util/network';
 import { buildIpTestScript } from './frida-scripts';
-import { ErrorWithCode } from '../../util/error';
 
 /**
  * Terminology:
@@ -46,7 +46,11 @@ export async function testAndSelectProxyAddress(
         ips.push(...options.extraAddresses);
     }
 
-    if (ips.length === 0) throw new ErrorWithCode('unreachable-proxy', "Couldn't detect proxy external IP");
+    if (ips.length === 0) {
+        throw new CustomError("Couldn't detect proxy external IP", {
+            code: 'unreachable-proxy'
+        });
+    }
 
     const ipTestScript = await buildIpTestScript(ips, proxyPort);
 
@@ -57,13 +61,11 @@ export async function testAndSelectProxyAddress(
                     if (message.payload.type === 'connected') {
                         resolve(message.payload.ip as string);
                     } else if (message.payload.type === 'connection-failed') {
-                        reject(new ErrorWithCode('unreachable-proxy',
-                            `Could not connect to proxy on port ${proxyPort} at ${
-                                ips.length > 1
-                                ? `any of: ${ips.join(', ')}`
-                                : ips[0]
-                            }`
-                        ));
+                        reject(new CustomError(`Could not connect to proxy on port ${proxyPort} at ${
+                            ips.length > 1
+                            ? `any of: ${ips.join(', ')}`
+                            : ips[0]
+                        }`, { code: 'unreachable-proxy' }));
                     } else {
                         reject(new Error(`Unexpected message type: ${message.payload.type}`));
                     }

src/interceptors/index.ts

@@ -1,8 +1,8 @@
 import _ from 'lodash';
+import { ErrorLike } from '@httptoolkit/util';
 
 import { HtkConfig } from '../config';
 import { addShutdownHandler } from '../shutdown';
-import { ErrorLike } from '../util/error';
 
 import { FreshFirefox, FreshFirefoxDeveloper, FreshFirefoxNightly } from './fresh-firefox';
 import {

src/interceptors/jvm.ts

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import * as path from 'path';
 
-import { delay } from '@httptoolkit/util';
+import { delay, ErrorLike } from '@httptoolkit/util';
 
 import { Interceptor } from '.';
 
@@ -10,7 +10,6 @@ import { spawnToResult, waitForExit } from '../util/process-management';
 import { OVERRIDE_JAVA_AGENT } from './terminal/terminal-env-overrides';
 import { logError } from '../error-tracking';
 import { commandExists, canAccess } from '../util/fs';
-import { ErrorLike } from '../util/error';
 
 type JvmTarget = { pid: string, name: string, interceptedByProxy: number | undefined };
 

src/interceptors/terminal/fresh-terminal-interceptor.ts

@@ -2,12 +2,12 @@ import _ from 'lodash';
 import { spawn, ChildProcess, SpawnOptions } from 'child_process';
 import * as GSettings from 'node-gsettings-wrapper';
 
+import { isErrorLike } from '@httptoolkit/util';
 import { findExecutableById } from '@httptoolkit/osx-find-executable';
 
 import { Interceptor } from '..';
 import { HtkConfig } from '../../config';
 import { logError, addBreadcrumb } from '../../error-tracking';
-import { isErrorLike } from '../../util/error';
 import { canAccess, commandExists, getRealPath, resolveCommandPath } from '../../util/fs';
 import { spawnToResult } from '../../util/process-management';