Merge pull request #52 from balena-io-modules/update-deps

Update dependencies

Author: Page-

.husky/pre-commit

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 npx --no lint-staged

Dockerfile.test

@@ -1,4 +1,4 @@
-FROM docker:23-dind
+FROM docker:28-dind
 
 RUN set -eux; apk add --no-cache \
 	rsync \

lib/docker-delta.ts

@@ -105,7 +105,7 @@ function parseDeltaStream(input: stream.PassThrough) {
 						reject(new Error('Unknown version: ' + metadata.version));
 					}
 				} catch (error) {
-					reject(error);
+					reject(error as Error);
 				}
 			}
 		};
@@ -146,16 +146,16 @@ async function applyBatch(
 		await p;
 		log('Batch input stream ended; waiting for rsync...');
 		try {
-			await Bluebird.resolve(await rsyncProcess.waitAsync()).timeout(
+			await Bluebird.resolve(rsyncProcess.waitAsync()).timeout(
 				RSYNC_EXIT_TIMEOUT,
 			);
 			log('rsync exited cleanly');
 		} catch (err) {
-			log('Error waiting for rsync to exit: ' + err);
+			log(`Error waiting for rsync to exit: ${err}`);
 			throw err;
 		}
 	} catch (err) {
-		log('Killing rsync with force due to error: ' + err);
+		log(`Killing rsync with force due to error: ${err}`);
 		rsyncProcess.kill('SIGUSR1');
 		log('Waiting for rsync to exit...');
 		await rsyncProcess.waitAsync();
@@ -236,7 +236,7 @@ export const applyDelta = function (
 		deltaStream.emit('id', dstId);
 	}).catch(async function (e) {
 		log('Error: ' + e);
-		if (e.code != null && DELTA_OUT_OF_SYNC_CODES.indexOf(e.code) >= 0) {
+		if (e.code != null && DELTA_OUT_OF_SYNC_CODES.includes(e.code)) {
 			deltaStream.emit('error', new OutOfSyncError('Incompatible image'));
 		} else {
 			deltaStream.emit('error', e);

lib/rsync.ts

@@ -56,7 +56,7 @@ export const createRsyncStream = async function (
 			await ps.waitAsync();
 			log('rsync exited');
 		} catch (e) {
-			log('rsync exited with error: ' + e);
+			log(`rsync exited with error: ${e}`);
 		} finally {
 			void cleanup();
 			// eslint-disable-next-line no-unsafe-finally -- We always want to rethrow the original error

package.json

@@ -4,32 +4,31 @@
   "description": "Generate binary filesystem diffs between docker images to speed up distribution",
   "main": "out/docker-delta",
   "scripts": {
-    "prettify": "balena-lint -t tsconfig.dev.json --fix -e js -e ts lib/ test/",
+    "lint-fix": "balena-lint -t tsconfig.dev.json --fix -e js -e ts lib/ test/",
     "lint": "balena-lint -t tsconfig.dev.json -e js -e ts lib/ test/",
     "test": "bash ./test.sh",
-    "prepare": "node -e \"try { require('husky').install() } catch (e) {if (e.code !== 'MODULE_NOT_FOUND') throw e}\" && npx tsc"
+    "prepare": "node -e \"try { (await import('husky')).default() } catch (e) { if (e.code !== 'ERR_MODULE_NOT_FOUND') throw e }\" --input-type module && npx tsc"
   },
   "author": "Balena Ltd.",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@balena/lint": "^7.2.4",
+    "@balena/lint": "^9.3.8",
     "@types/bluebird": "^3.5.42",
-    "@types/dockerode": "^3.3.23",
-    "@types/node": "^16.18.63",
-    "chai": "^4.3.10",
+    "@types/dockerode": "^3.3.44",
+    "@types/node": "^16.18.126",
+    "chai": "^4.5.0",
     "chai-events": "0.0.3",
     "chai-stream": "0.0.0",
-    "event-stream": "3.3.5",
-    "husky": "^8.0.3",
+    "husky": "^9.1.7",
     "JSONStream": "^1.3.5",
-    "lint-staged": "^15.1.0",
-    "mocha": "^10.2.0",
-    "typescript": "^5.3.2"
+    "lint-staged": "^16.2.3",
+    "mocha": "^11.7.4",
+    "typescript": "^5.9.3"
   },
   "dependencies": {
     "bluebird": "^3.7.2",
-    "docker-toolbelt": "^6.0.2",
-    "dockerode": "^4.0.2",
+    "docker-toolbelt": "^6.0.13",
+    "dockerode": "^4.0.9",
     "tmp-promise": "^3.0.3",
     "typed-error": "^3.2.2"
   },

repo.yml

@@ -0,0 +1,4 @@
+type: 'node'
+upstream:
+  - repo: 'docker-toolbelt'
+    url: 'https://github.com/balena-io-modules/docker-toolbelt'

test/docker-delta.spec.js

@@ -1,11 +1,10 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable @typescript-eslint/no-require-imports */
 const { describe, before, it } = require('mocha');
 const chai = require('chai');
 
 chai.use(require('chai-events'));
 chai.use(require('chai-stream'));
 
-const es = require('event-stream');
 const JSONStream = require('JSONStream');
 const stream = require('node:stream');
 const Dockerode = require('dockerode');
@@ -30,12 +29,16 @@ async function buildImg(name, dockerfile) {
 	await stream.promises.pipeline(
 		res,
 		JSONStream.parse(),
-		es.through(function (data) {
-			if (data.error) {
-				this.emit('error', data.error);
-			} else {
-				console.log(data);
-			}
+		new stream.Transform({
+			objectMode: true,
+			transform(data, _enc, cb) {
+				if (data.error) {
+					cb(data.error);
+				} else {
+					console.log(data);
+					cb();
+				}
+			},
 		}),
 	);
 }