Good progress towards node-native TS & ESM

This updates TS (disabling lib checking to handle Oclif broken types)
and Node types, and migrates to fully eraseable syntax, and handles most
of the ESM style steps along the way.

Only extra steps for the basics are:
* type: module on the package
* Adding an extra layer on .default (for some reason) on Oclif update &
  adbkit package imports.
* Migrating assorted __dirname to import.meta.url.

Unfortunately though, fully switching to ESM seems very challenging with
Oclif, so we can't quite finish the job here. Maybe we tie that into
cutting out Oclif entirely later?

Author: pimterry

package-lock.json

@@ -112,14 +112,14 @@
     "@types/klaw": "^3.0.2",
     "@types/lodash": "^4.14.117",
     "@types/mocha": "^5.2.5",
-    "@types/node": "~20.11.18",
+    "@types/node": "^24.10.0",
     "@types/node-forge": "^0.9.9",
     "@types/request-promise-native": "^1.0.15",
     "@types/rimraf": "^2.0.2",
     "@types/ws": "^6.0.1",
     "axios": "^1.8.2",
     "bent": "^1.5.13",
-    "chai": "^4.2.0",
+    "chai": "^6.2.0",
     "check-msvc-runtime": "^0.1.1",
     "copy-webpack-plugin": "^11.0.0",
     "cross-env": "^7.0.3",
@@ -128,7 +128,7 @@
     "got": "^11.8.5",
     "graphql.js": "^0.6.1",
     "klaw": "^4.0.1",
-    "mocha": "^10.8.2",
+    "mocha": "^11.7.5",
     "needle": "^2.4.0",
     "node-noop": "^1.0.0",
     "npm-run-all": "^4.1.5",
@@ -140,8 +140,8 @@
     "superagent": "^7.1.1",
     "ts-loader": "^9.4.2",
     "ts-node": "^10.9.2",
-    "tsx": "^4.19.3",
-    "typescript": "~4.7",
+    "tsx": "^4.20.6",
+    "typescript": "^5.9.3",
     "umd-compat-loader": "^2.1.2",
     "undici": "^5.29.0",
     "unirest": "^0.6.0",

package.json

@@ -2,7 +2,7 @@ import * as path from 'path';
 import type { Stats } from 'fs';
 import * as fs from 'fs/promises';
 import klaw from 'klaw';
-import { spawn as spawnAsync, SpawnOptions } from 'child_process';
+import { spawn as spawnAsync, type SpawnOptions } from 'child_process';
 
 const spawn = (command: string, args: string[] = [], options: SpawnOptions = {}) => {
     return new Promise<void>((resolve, reject) => {

prepare.ts

@@ -1,35 +1,50 @@
 import * as _ from 'lodash';
 import * as os from 'os';
 
-import { ErrorLike, delay } from '@httptoolkit/util';
+import { type ErrorLike, delay } from '@httptoolkit/util';
 import { generateSPKIFingerprint } from 'mockttp';
 import { getSystemProxy } from 'os-proxy-config';
 
-import { SERVER_VERSION } from "../constants";
-import { logError, addBreadcrumb } from '../error-tracking';
+import { SERVER_VERSION } from '../constants.ts';
+import { logError, addBreadcrumb } from '../error-tracking.ts';
 
-import { HtkConfig } from "../config";
-import { ActivationError, Interceptor } from "../interceptors";
-import { getDnsServer } from '../dns-server';
-import { getCertExpiry, parseCert } from '../certificates';
+import type { HtkConfig } from '../config.d.ts';
+import { ActivationError, Interceptor } from '../interceptors/index.ts';
+import { getDnsServer } from '../dns-server.ts';
+import { getCertExpiry, parseCert } from '../certificates.ts';
 
-import * as Client from '../client/client-types';
-import { HttpClient } from '../client/http-client';
+import * as Client from '../client/client-types.ts';
+import { HttpClient } from '../client/http-client.ts';
 
 const INTERCEPTOR_TIMEOUT = 1000;
 
 export class ApiModel {
 
+    private config: HtkConfig;
+    private interceptors: _.Dictionary<Interceptor>;
+    private getRuleParamKeys: () => string[];
+    private httpClient: HttpClient;
+    private callbacks: {
+        onTriggerUpdate: () => void,
+        onTriggerShutdown: () => void
+    };
+
     constructor(
-        private config: HtkConfig,
-        private interceptors: _.Dictionary<Interceptor>,
-        private getRuleParamKeys: () => string[],
-        private httpClient: HttpClient,
-        private callbacks: {
+        config: HtkConfig,
+        interceptors: _.Dictionary<Interceptor>,
+        getRuleParamKeys: () => string[],
+        httpClient: HttpClient,
+        callbacks: {
             onTriggerUpdate: () => void,
             onTriggerShutdown: () => void
         }
-    ) {}
+    ) {
+        this.config = config;
+        this.interceptors = interceptors;
+        this.getRuleParamKeys = getRuleParamKeys;
+        this.httpClient = httpClient;
+        this.callbacks = callbacks;
+    }
 
     getVersion() {
         return SERVER_VERSION;

src/api/api-model.ts

@@ -4,15 +4,15 @@ import express from 'express';
 import cors from 'cors';
 import corsGate from 'cors-gate';
 
-import { HtkConfig } from '../config';
-import { buildInterceptors } from '../interceptors';
-import { ALLOWED_ORIGINS } from '../constants';
-import { shutdown } from '../shutdown';
-
-import { ApiModel } from './api-model';
-import { exposeGraphQLAPI } from './graphql-api';
-import { exposeRestAPI } from './rest-api';
-import { HttpClient } from '../client/http-client';
+import type { HtkConfig } from '../config.d.ts';
+import { buildInterceptors } from '../interceptors/index.ts';
+import { ALLOWED_ORIGINS } from '../constants.ts';
+import { shutdown } from '../shutdown.ts';
+
+import { ApiModel } from './api-model.ts';
+import { exposeGraphQLAPI } from './graphql-api.ts';
+import { exposeRestAPI } from './rest-api.ts';
+import { HttpClient } from '../client/http-client.ts';
 
 /**
  * This file contains the core server API, used by the UI to query

src/api/api-server.ts

@@ -4,8 +4,9 @@ import type { Application as ExpressApp } from 'express';
 import { makeExecutableSchema } from '@graphql-tools/schema';
 import { GraphQLScalarType } from 'graphql';
 import { createHandler as createGraphQLHandler } from 'graphql-http/lib/use/express';
-import gql from 'graphql-tag';
-import { ApiModel } from './api-model';
+import { gql } from 'graphql-tag';
+
+import { ApiModel } from './api-model.ts';
 
 const typeDefs = gql`
     type Query {

src/api/graphql-api.ts

@@ -10,11 +10,11 @@ import type {
     RouteParameters
 } from 'express-serve-static-core';
 import type { ParsedQs } from 'qs';
-import { ErrorLike, StatusError } from '@httptoolkit/util';
+import { type ErrorLike, StatusError } from '@httptoolkit/util';
 
-import { logError } from '../error-tracking';
-import { ApiModel } from './api-model';
-import * as Client from '../client/client-types';
+import { logError } from '../error-tracking.ts';
+import { ApiModel } from './api-model.ts';
+import * as Client from '../client/client-types.ts';
 
 /**
  * This file exposes the API model via a REST-ish classic HTTP API.

src/api/rest-api.ts

@@ -2,24 +2,24 @@ import * as path from 'path';
 import { promisify } from 'util';
 
 import { delay, isErrorLike } from '@httptoolkit/util';
-import getBrowserLauncherCb from '@httptoolkit/browser-launcher';
-import {
-    LaunchOptions,
-    Launch,
-    BrowserInstance,
-    Browser,
-    update as updateBrowserCacheCb
+import getBrowserLauncherCb, {
+    type LaunchOptions,
+    type Launch,
+    type BrowserInstance,
+    type Browser
 } from '@httptoolkit/browser-launcher';
 
-import { logError } from './error-tracking';
-import { readFile, deleteFile } from './util/fs';
+const updateBrowserCacheCb = getBrowserLauncherCb.update;
+
+import { logError } from './error-tracking.ts';
+import { readFile, deleteFile } from './util/fs.ts';
 
 const getBrowserLauncher = promisify(getBrowserLauncherCb);
 const updateBrowserCache: (configPath: string) => Promise<unknown> = promisify(updateBrowserCacheCb);
 
 const browserConfigPath = (configPath: string) => path.join(configPath, 'browsers.json');
 
-export { BrowserInstance, Browser };
+export type { BrowserInstance, Browser };
 
 export async function checkBrowserConfig(configPath: string) {
     // It's not clear why, but sometimes the browser config can become corrupted, so it's not valid JSON
@@ -87,7 +87,7 @@ export const getBrowserDetails = async (configPath: string, variant: string): Pr
     return browsers.find(b => b.name === variant);
 };
 
-export { LaunchOptions };
+export type { LaunchOptions };
 
 export const launchBrowser = async (url: string, options: LaunchOptions, configPath: string) => {
     const launcher = await getLauncher(configPath);

src/browsers.ts

@@ -1,8 +1,8 @@
-import { getLocal, Mockttp } from 'mockttp';
+import { getLocal, type Mockttp } from 'mockttp';
 import { getDeferred } from '@httptoolkit/util';
 
-import { HtkConfig } from './config';
-import { EPHEMERAL_PORT_RANGE } from './constants';
+import type { HtkConfig } from './config.d.ts';
+import { EPHEMERAL_PORT_RANGE } from './constants.ts';
 
 const buildPage = (style: string, script?: string, body?: string) =>
     `<html>
@@ -27,7 +27,11 @@ const buildPage = (style: string, script?: string, body?: string) =>
 
 export class CertCheckServer {
 
-    constructor(private config: HtkConfig) { }
+    private config: HtkConfig;
+
+    constructor(config: HtkConfig) {
+        this.config = config;
+    }
 
     private server: Mockttp | undefined;
 

src/cert-check-server.ts

@@ -1,5 +1,5 @@
 import * as crypto from 'crypto';
-import * as forge from 'node-forge';
+import forge from 'node-forge';
 
 export const parseCert = forge.pki.certificateFromPem;