lean-s3 0.9.12 → 0.9.23

package/dist/index.d.mts

@@ -18,7 +18,7 @@ declare class S3BucketEntry {
   /**
    * @internal
    */
-  static parse(source: any): S3BucketEntry;
+  static parse(this: void, source: any): S3BucketEntry;
 }
 //#endregion
 //#region src/branded.d.ts
@@ -523,11 +523,11 @@ declare class S3Client {
    */
   [kSignedRequest](region: Region, endpoint: Endpoint, bucket: BucketName, method: HttpMethod, pathWithoutBucket: ObjectKey, query: string | undefined, body: string | Buffer | Uint8Array | Readable | undefined, additionalSignedHeaders: Record<string, string> | undefined, additionalUnsignedHeaders: Record<string, string> | undefined, contentHash: Buffer | undefined, signal: AbortSignal | undefined): Promise<Dispatcher.ResponseData<null>>;
   /** @internal */
-  [kWrite](path: ObjectKey, data: string | Buffer | Uint8Array | Readable, contentType: string, contentLength: number | undefined, contentHash: Buffer | undefined, rageStart: number | undefined, rangeEndExclusive: number | undefined, signal?: AbortSignal | undefined): Promise<void>;
+  [kWrite](path: ObjectKey, data: string | Buffer | Uint8Array | Readable, contentType: string, contentLength: number | undefined, contentHash: Buffer | undefined, rangeStart: number | undefined, rangeEndExclusive: number | undefined, signal?: AbortSignal): Promise<void>;
   /**
    * @internal
    */
-  [kStream](path: ObjectKey, contentHash: Buffer | undefined, rageStart: number | undefined, rangeEndExclusive: number | undefined): ReadableStream<Uint8Array>;
+  [kStream](path: ObjectKey, contentHash: Buffer | undefined, rangeStart: number | undefined, rangeEndExclusive: number | undefined, signal?: AbortSignal): ReadableStream<Uint8Array>;
   [nodeUtil.inspect.custom](_depth?: number, options?: nodeUtil.InspectOptions): string;
 }
 //#endregion

package/dist/index.mjs

@@ -3,7 +3,6 @@ import { Readable } from "node:stream";
 import { Agent, request } from "undici";
 import { XMLBuilder, XMLParser } from "fast-xml-parser";
 import { createHash, createHmac } from "node:crypto";
-
 //#region src/S3Stat.ts
 var S3Stat = class S3Stat {
 	etag;
@@ -30,7 +29,6 @@ var S3Stat = class S3Stat {
 		return new S3Stat(etag, new Date(lm), size, ct);
 	}
 };
-
 //#endregion
 //#region src/S3Error.ts
 var S3Error = class extends Error {
@@ -40,7 +38,7 @@ var S3Error = class extends Error {
 	message;
 	/** The HTTP status code. */
 	status;
-	constructor(code, path, { message = void 0, cause = void 0, status = void 0 } = {}) {
+	constructor(code, path, { message, cause, status } = {}) {
 		super(message, { cause });
 		this.code = code;
 		this.path = path;
@@ -48,7 +46,6 @@ var S3Error = class extends Error {
 		this.status = status;
 	}
 };
-
 //#endregion
 //#region src/S3BucketEntry.ts
 /**
@@ -78,7 +75,6 @@ var S3BucketEntry = class S3BucketEntry {
 		return new S3BucketEntry(source.Key, source.Size, new Date(source.LastModified), source.ETag, source.StorageClass, source.ChecksumAlgorithm, source.ChecksumType);
 	}
 };
-
 //#endregion
 //#region src/sign.ts
 function deriveSigningKey(date, region, secretAccessKey) {
@@ -116,7 +112,6 @@ function sha256(data) {
 function md5Base64(data) {
 	return createHash("md5").update(data).digest("base64");
 }
-
 //#endregion
 //#region src/KeyCache.ts
 var KeyCache = class {
@@ -135,7 +130,6 @@ var KeyCache = class {
 		return newKey;
 	}
 };
-
 //#endregion
 //#region src/AmzDate.ts
 const ONE_DAY = 1e3 * 60 * 60 * 24;
@@ -157,7 +151,6 @@ function pad4(v) {
 function pad2(v) {
 	return v < 10 ? `0${v}` : v.toString();
 }
-
 //#endregion
 //#region src/url.ts
 function buildRequestUrl(endpoint, bucket, region, path) {
@@ -196,7 +189,6 @@ function prepareHeadersForSigning(unfilteredHeadersUnsorted) {
 function getRangeHeader(start, endExclusive) {
 	return typeof start === "number" || typeof endExclusive === "number" ? `bytes=${start ?? 0}-${typeof endExclusive === "number" ? endExclusive - 1 : ""}` : void 0;
 }
-
 //#endregion
 //#region src/error.ts
 const xmlParser$1 = new XMLParser();
@@ -215,8 +207,14 @@ async function getResponseError(response, path) {
 }
 function fromStatusCode(code, path) {
 	switch (code) {
-		case 404: return new S3Error("NoSuchKey", path, { message: "The specified key does not exist." });
-		case 403: return new S3Error("AccessDenied", path, { message: "Access denied to the key." });
+		case 404: return new S3Error("NoSuchKey", path, {
+			message: "The specified key does not exist.",
+			status: code
+		});
+		case 403: return new S3Error("AccessDenied", path, {
+			message: "Access denied to the key.",
+			status: code
+		});
 		default: return;
 	}
 }
@@ -236,17 +234,14 @@ function parseAndGetXmlError(body, path) {
 	}
 	return new S3Error(error.Code || "Unknown", path, { message: error.Message || void 0 });
 }
-
 //#endregion
 //#region src/request.ts
 function getAuthorizationHeader(keyCache, method, path, query, date, sortedSignedHeaders, region, contentHashStr, accessKeyId, secretAccessKey) {
 	const dataDigest = createCanonicalDataDigest(method, path, query, sortedSignedHeaders, contentHashStr);
-	const signingKey = keyCache.computeIfAbsent(date, region, accessKeyId, secretAccessKey);
-	const signature = signCanonicalDataHash(signingKey, dataDigest, date, region);
+	const signature = signCanonicalDataHash(keyCache.computeIfAbsent(date, region, accessKeyId, secretAccessKey), dataDigest, date, region);
 	const signedHeadersSpec = Object.keys(sortedSignedHeaders).join(";");
 	return `AWS4-HMAC-SHA256 Credential=${`${accessKeyId}/${date.date}/${region}/s3/aws4_request`}, SignedHeaders=${signedHeadersSpec}, Signature=${signature}`;
 }
-
 //#endregion
 //#region src/branded.ts
 function ensureValidBucketName(bucket) {
@@ -282,13 +277,11 @@ function ensureValidRegion(region) {
 	if (region.length < 1) throw new RangeError("`region` must be at least 1 character long.");
 	return region;
 }
-
 //#endregion
 //#region src/assertNever.ts
 function assertNever(v) {
 	throw new TypeError(`Expected value not to have type ${typeof v}`);
 }
-
 //#endregion
 //#region src/encode.ts
 /**
@@ -311,7 +304,6 @@ function getContentDispositionHeader(value) {
 function encodeURIComponentExtended(value) {
 	return encodeURIComponent(value).replaceAll(":", "%3A").replaceAll("+", "%2B").replaceAll("(", "%28").replaceAll(")", "%29").replaceAll(",", "%2C").replaceAll("'", "%27").replaceAll("*", "%2A");
 }
-
 //#endregion
 //#region src/S3Client.ts
 const kWrite = Symbol("kWrite");
@@ -442,8 +434,7 @@ var S3Client = class {
 		const contentDisposition = options.response?.contentDisposition;
 		const responseContentDisposition = contentDisposition ? getContentDispositionHeader(contentDisposition) : void 0;
 		const res = buildRequestUrl(endpoint, bucket, region, ensureValidPath(path));
-		const now = /* @__PURE__ */ new Date();
-		const date = getAmzDate(now);
+		const date = getAmzDate(/* @__PURE__ */ new Date());
 		const query = buildSearchParams(`${this.#options.accessKeyId}/${date.date}/${region}/s3/aws4_request`, date, options.expiresIn ?? 3600, typeof contentLength === "number" || typeof contentType === "string" ? typeof contentLength === "number" && typeof contentType === "string" ? "content-length;content-type;host" : typeof contentLength === "number" ? "content-length;host" : typeof contentType === "string" ? "content-type;host" : "" : "host", unsignedPayload, options.storageClass, this.#options.sessionToken, options.acl, responseContentDisposition);
 		const dataDigest = typeof contentLength === "number" || typeof contentType === "string" ? createCanonicalDataDigest(method, res.pathname, query, typeof contentLength === "number" && typeof contentType === "string" ? {
 			"content-length": String(contentLength),
@@ -456,8 +447,7 @@ var S3Client = class {
 			"content-type": contentType,
 			host: res.host
 		} : {}, unsignedPayload) : createCanonicalDataDigestHostOnly(method, res.pathname, query, res.host);
-		const signingKey = this.#keyCache.computeIfAbsent(date, region, this.#options.accessKeyId, this.#options.secretAccessKey);
-		res.search = `${query}&X-Amz-Signature=${signCanonicalDataHash(signingKey, dataDigest, date, region)}`;
+		res.search = `${query}&X-Amz-Signature=${signCanonicalDataHash(this.#keyCache.computeIfAbsent(date, region, this.#options.accessKeyId, this.#options.secretAccessKey), dataDigest, date, region)}`;
 		return res.toString();
 	}
 	presignPost(options) {
@@ -925,11 +915,11 @@ var S3Client = class {
 	async [kSignedRequest](region, endpoint, bucket, method, pathWithoutBucket, query, body, additionalSignedHeaders, additionalUnsignedHeaders, contentHash, signal) {
 		const url = buildRequestUrl(endpoint, bucket, region, pathWithoutBucket);
 		if (query) url.search = query;
-		const now$3 = now();
-		const contentHashStr = contentHash?.toString("hex") ?? unsignedPayload;
+		const now$2 = now();
+		const contentHashStr = contentHash?.toString("hex") ?? "UNSIGNED-PAYLOAD";
 		const headersToBeSigned = prepareHeadersForSigning({
 			host: url.host,
-			"x-amz-date": now$3.dateTime,
+			"x-amz-date": now$2.dateTime,
 			"x-amz-content-sha256": contentHashStr,
 			...additionalSignedHeaders
 		});
@@ -940,7 +930,7 @@ var S3Client = class {
 				dispatcher: this.#dispatcher,
 				headers: {
 					...headersToBeSigned,
-					authorization: getAuthorizationHeader(this.#keyCache, method, url.pathname, query ?? "", now$3, headersToBeSigned, region, contentHashStr, this.#options.accessKeyId, this.#options.secretAccessKey),
+					authorization: getAuthorizationHeader(this.#keyCache, method, url.pathname, query ?? "", now$2, headersToBeSigned, region, contentHashStr, this.#options.accessKeyId, this.#options.secretAccessKey),
 					...additionalUnsignedHeaders,
 					"user-agent": "lean-s3"
 				},
@@ -955,20 +945,20 @@ var S3Client = class {
 		}
 	}
 	/** @internal */
-	async [kWrite](path, data, contentType, contentLength, contentHash, rageStart, rangeEndExclusive, signal = void 0) {
+	async [kWrite](path, data, contentType, contentLength, contentHash, rangeStart, rangeEndExclusive, signal) {
 		const bucket = this.#options.bucket;
 		const endpoint = this.#options.endpoint;
 		const region = this.#options.region;
 		const url = buildRequestUrl(endpoint, bucket, region, path);
-		const now$2 = now();
-		const contentHashStr = contentHash?.toString("hex") ?? unsignedPayload;
+		const now$3 = now();
+		const contentHashStr = contentHash?.toString("hex") ?? "UNSIGNED-PAYLOAD";
 		const headersToBeSigned = prepareHeadersForSigning({
 			"content-length": contentLength?.toString() ?? void 0,
 			"content-type": contentType,
 			host: url.host,
-			range: getRangeHeader(rageStart, rangeEndExclusive),
+			range: getRangeHeader(rangeStart, rangeEndExclusive),
 			"x-amz-content-sha256": contentHashStr,
-			"x-amz-date": now$2.dateTime
+			"x-amz-date": now$3.dateTime
 		});
 		let response;
 		try {
@@ -978,7 +968,7 @@ var S3Client = class {
 				dispatcher: this.#dispatcher,
 				headers: {
 					...headersToBeSigned,
-					authorization: getAuthorizationHeader(this.#keyCache, "PUT", url.pathname, url.search, now$2, headersToBeSigned, region, contentHashStr, this.#options.accessKeyId, this.#options.secretAccessKey),
+					authorization: getAuthorizationHeader(this.#keyCache, "PUT", url.pathname, url.search, now$3, headersToBeSigned, region, contentHashStr, this.#options.accessKeyId, this.#options.secretAccessKey),
 					"user-agent": "lean-s3"
 				},
 				body: data
@@ -991,20 +981,23 @@ var S3Client = class {
 			});
 		}
 		const status = response.statusCode;
-		if (200 <= status && status < 300) return;
+		if (200 <= status && status < 300) {
+			response.body.dump();
+			return;
+		}
 		throw await getResponseError(response, path);
 	}
 	/**
 	* @internal
 	*/
-	[kStream](path, contentHash, rageStart, rangeEndExclusive) {
+	[kStream](path, contentHash, rangeStart, rangeEndExclusive, signal) {
 		const bucket = this.#options.bucket;
 		const endpoint = this.#options.endpoint;
 		const region = this.#options.region;
 		const now$1 = now();
 		const url = buildRequestUrl(endpoint, bucket, region, path);
-		const range = getRangeHeader(rageStart, rangeEndExclusive);
-		const contentHashStr = contentHash?.toString("hex") ?? unsignedPayload;
+		const range = getRangeHeader(rangeStart, rangeEndExclusive);
+		const contentHashStr = contentHash?.toString("hex") ?? "UNSIGNED-PAYLOAD";
 		const headersToBeSigned = prepareHeadersForSigning({
 			"amz-sdk-invocation-id": crypto.randomUUID(),
 			host: url.host,
@@ -1024,7 +1017,7 @@ var S3Client = class {
 				};
 				request(url, {
 					method: "GET",
-					signal: ac.signal,
+					signal: signal ? AbortSignal.any([signal, ac.signal]) : ac.signal,
 					dispatcher: this.#dispatcher,
 					headers: {
 						...headersToBeSigned,
@@ -1120,7 +1113,6 @@ function ensureParsedXml(text) {
 		});
 	}
 }
-
 //#endregion
 //#region src/S3File.ts
 var S3File = class S3File {
@@ -1289,6 +1281,5 @@ var S3File = class S3File {
 		return `S3File ${nodeUtil.formatWithOptions(options, properties)}`;
 	}
 };
-
 //#endregion
-export { S3BucketEntry, S3Client, S3Error, S3File, S3Stat };
+export { S3BucketEntry, S3Client, S3Error, S3File, S3Stat };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lean-s3",
-  "version": "0.9.12",
+  "version": "0.9.23",
   "description": "A server-side S3 API for the regular user.",
   "keywords": [
     "AWS S3",
@@ -34,35 +34,35 @@
   "types": "./dist/index.d.mts",
   "scripts": {
     "build": "tsdown",
-    "test": "tsgo && tsx --test src/*.test.ts src/test/*.test.ts",
-    "test:integration": "tsgo && tsx --test src/test/test.integration.ts",
-    "ci": "oxlint --deny-warnings -f github",
+    "test": "tsgo && node --test src/*.test.ts src/test/*.test.ts",
+    "test:integration": "tsgo && node --test src/test/test.integration.ts",
+    "ci": "oxlint --type-aware --deny-warnings -f github",
     "docs": "typedoc",
     "format": "oxfmt",
-    "lint": "oxlint",
-    "lint:fix": "oxlint --fix",
+    "lint": "oxlint --type-aware",
+    "lint:fix": "oxlint --type-aware --fix",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "fast-xml-parser": "^5.3.7",
-    "undici": "^7.22.0"
+    "fast-xml-parser": "^5.8.0",
+    "undici": "^8.2.0"
   },
   "devDependencies": {
-    "@testcontainers/localstack": "^11.12.0",
-    "@testcontainers/minio": "^11.12.0",
-    "@testcontainers/s3mock": "^11.12.0",
-    "@types/node": "^25.3.0",
-    "@typescript/native-preview": "^7.0.0-dev.20260220.1",
-    "expect": "^30.2.0",
-    "lefthook": "^2.1.1",
-    "oxfmt": "^0.34.0",
-    "oxlint": "^1.49.0",
-    "testcontainers": "^11.12.0",
-    "tsdown": "^0.20.3",
-    "tsx": "^4.21.0",
-    "typedoc": "^0.28.17"
+    "@testcontainers/localstack": "^11.14.0",
+    "@testcontainers/minio": "^11.14.0",
+    "@testcontainers/s3mock": "^11.14.0",
+    "@types/node": "^25.7.0",
+    "@typescript/native-preview": "^7.0.0-dev.20260511.1",
+    "expect": "^30.4.1",
+    "lefthook": "^2.1.6",
+    "oxfmt": "^0.49.0",
+    "oxlint": "^1.64.0",
+    "oxlint-tsgolint": "^0.22.1",
+    "testcontainers": "^11.14.0",
+    "tsdown": "^0.22.0",
+    "typedoc": "^0.28.19"
   },
   "engines": {
-    "node": "^20.19.5 || ^22.21.1 || ^24.11.0 || ^25.1.0"
+    "node": "^22.22.2 || ^24.15.0 || ^26.1.0"
   }
 }