Merge pull request #2248 from balena-os/node-20

Update Node to v20

Dockerfile.template

@@ -1,8 +1,8 @@
 ARG ARCH=%%BALENA_ARCH%%
 ARG FATRW_VERSION=0.2.9
-ARG NODE="nodejs~=18"
-ARG NPM="npm~=9"
-ARG ALPINE_VERSION="3.18"
+ARG NODE="nodejs~=20"
+ARG NPM="npm~=10"
+ARG ALPINE_VERSION="3.19"
 
 ###################################################
 # Build the supervisor dependencies

README.md

@@ -45,7 +45,7 @@ Here's a few guidelines to make the process easier for everyone involved.
 
 These are the system requirements for developing and testing the balenaSupervisor on a local machine
 
-- [Node.js](https://nodejs.org/en) v18 or latest
+- [Node.js](https://nodejs.org/en) v20 or latest
 - [Rust](https://www.rust-lang.org/) v1.64 or latest for installing the [@balena/systemd](https://www.npmjs.com/package/@balena/systemd) NPM package.
 - If developing on an architecture not supported by default by [node-sqlite3](https://github.com/TryGhost/node-sqlite3#prebuilt-binaries), a C++ compiler and linker are also required, plus the libsqlite development headers.
 
@@ -195,7 +195,7 @@ To run type checks, and unit tests, you can use:
 npm run test
 ```
 
-The supervisor runs on Node v12.16.2, so using that specific
+The supervisor runs on Node v20, so using that specific
 version will ensure tests run in the same environment as
 production.
 

package.json

@@ -35,13 +35,12 @@
     "sqlite3": "^5.1.6"
   },
   "engines": {
-    "node": "^18.18.0",
-    "npm": "^9.8.1"
+    "node": ">=20 <21",
+    "npm": ">=10"
   },
   "devDependencies": {
     "@balena/contrato": "^0.6.0",
     "@balena/es-version": "^1.0.1",
-    "@balena/happy-eyeballs": "0.0.6",
     "@balena/lint": "^7.3.0",
     "@types/bluebird": "^3.5.37",
     "@types/chai": "^4.3.3",
@@ -60,7 +59,7 @@
     "@types/mocha": "^8.2.3",
     "@types/mock-fs": "^4.13.1",
     "@types/morgan": "^1.9.3",
-    "@types/node": "^18.11.7",
+    "@types/node": "^20.11.24",
     "@types/request": "^2.48.8",
     "@types/rewire": "^2.5.28",
     "@types/rimraf": "^2.0.5",

src/app.ts

@@ -142,7 +142,6 @@ async function mdnsLookup(
 	};
 })();
 
-import '@balena/happy-eyeballs/eye-patch';
 import Supervisor from './supervisor';
 import process from 'process';
 import log from './lib/supervisor-console';

src/logging/balena-backend.ts

@@ -31,7 +31,7 @@ export class BalenaLogBackend extends LogBackend {
 	private gzip: zlib.Gzip | null = null;
 	private opts: Options;
 	private stream: stream.PassThrough;
-	private timeout: NodeJS.Timer;
+	private timeout: NodeJS.Timeout;
 
 	public initialised = false;