Merge pull request #58 from balena-io-modules/5.x

5.x

Author: Page-

.gitattributes

@@ -0,0 +1,6 @@
+# Set all files to use line feed endings (since we can't match only ones without an extension)
+* eol=lf
+# And then reset all the files with extensions back to default
+*.* -eol
+
+*.sh text eol=lf

lib/btrfs.ts

@@ -1,4 +1,4 @@
-import { spawn } from './utils';
+import { spawn } from './utils.js';
 
 export const deleteSubvolAsync = function (subvol: string) {
 	return spawn('btrfs', ['subvolume', 'delete', subvol]).waitAsync();

lib/docker-delta.ts

@@ -1,12 +1,12 @@
 import path from 'node:path';
-import Bluebird from 'bluebird';
 import stream from 'node:stream';
 import { TypedError } from 'typed-error';
-import * as rsync from './rsync';
-import * as btrfs from './btrfs';
-import { spawn } from './utils';
+import * as rsync from './rsync.js';
+import * as btrfs from './btrfs.js';
+import { spawn } from './utils.js';
 import type Dockerode from 'dockerode';
 import * as dt from 'docker-toolbelt';
+import pTimeout from 'p-timeout';
 
 const DELTA_OUT_OF_SYNC_CODES = [19, 23, 24];
 
@@ -139,16 +139,16 @@ async function applyBatch(
 	let p = stream.promises.pipeline(batch, rsyncProcess.stdin!);
 
 	if (timeout !== 0) {
-		p = Bluebird.resolve(p).timeout(timeout);
+		p = pTimeout(p, { milliseconds: timeout });
 	}
 
 	try {
 		await p;
 		log('Batch input stream ended; waiting for rsync...');
 		try {
-			await Bluebird.resolve(rsyncProcess.waitAsync()).timeout(
-				RSYNC_EXIT_TIMEOUT,
-			);
+			await pTimeout(rsyncProcess.waitAsync(), {
+				milliseconds: RSYNC_EXIT_TIMEOUT,
+			});
 			log('rsync exited cleanly');
 		} catch (err) {
 			log(`Error waiting for rsync to exit: ${err}`);

lib/rsync.ts

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import tmp from 'tmp-promise';
 import path from 'node:path';
-import { spawn, mkfifoSync } from './utils';
+import { spawn, mkfifoSync } from './utils.js';
 
 export const createRsyncStream = async function (
 	src: string,

package.json

@@ -2,7 +2,11 @@
   "name": "docker-delta",
   "version": "4.1.1",
   "description": "Generate binary filesystem diffs between docker images to speed up distribution",
-  "main": "out/docker-delta",
+  "type": "module",
+  "main": "out/docker-delta.js",
+  "engines": {
+    "node": ">=22.22.0 <23.0.0 || >=24.13.0"
+  },
   "scripts": {
     "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/",
@@ -12,23 +16,22 @@
   "author": "Balena Ltd.",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@balena/lint": "^9.3.8",
-    "@types/bluebird": "^3.5.42",
-    "@types/dockerode": "^3.3.44",
-    "@types/node": "^16.18.126",
-    "chai": "^4.5.0",
+    "@balena/lint": "^9.3.12",
+    "@types/dockerode": "^4.0.1",
+    "@types/node": "^22.19.8",
+    "chai": "^6.2.2",
     "chai-events": "0.0.3",
     "chai-stream": "0.0.0",
     "husky": "^9.1.7",
     "JSONStream": "^1.3.5",
-    "lint-staged": "^16.2.3",
-    "mocha": "^11.7.4",
+    "lint-staged": "^16.2.7",
+    "mocha": "^11.7.5",
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "bluebird": "^3.7.2",
-    "docker-toolbelt": "^6.0.13",
+    "docker-toolbelt": "^7.0.0",
     "dockerode": "^4.0.9",
+    "p-timeout": "^7.0.1",
     "tmp-promise": "^3.0.3",
     "typed-error": "^3.2.2"
   },

test.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -o errexit
 
 function cleanup() {

test/docker-delta.spec.js

@@ -1,17 +1,18 @@
-/* eslint-disable @typescript-eslint/no-require-imports */
-const { describe, before, it } = require('mocha');
-const chai = require('chai');
+import { describe, before, it } from 'mocha';
+import * as chai from 'chai';
 
-chai.use(require('chai-events'));
-chai.use(require('chai-stream'));
+import chaiEvents from 'chai-events';
+import chaiStream from 'chai-stream';
+chai.use(chaiEvents);
+chai.use(chaiStream);
 
-const JSONStream = require('JSONStream');
-const stream = require('node:stream');
-const Dockerode = require('dockerode');
+import JSONStream from 'JSONStream';
+import stream from 'node:stream';
+import Dockerode from 'dockerode';
 
 const docker = new Dockerode();
 
-const dockerDelta = require('..');
+import * as dockerDelta from '../out/docker-delta.js';
 
 const { expect } = chai;
 

tsconfig.json

@@ -1,6 +1,6 @@
 {
 	"compilerOptions": {
-		"module": "Node16",
+		"module": "Node20",
 		"strict": true,
 		"noUnusedParameters": true,
 		"noUnusedLocals": true,
@@ -9,7 +9,7 @@
 		"removeComments": true,
 		"rootDir": "lib",
 		"sourceMap": true,
-		"target": "es2022",
+		"target": "es2024",
 		"declaration": true,
 		"skipLibCheck": true,
 		"resolveJsonModule": true,