one 2.6.4 → 2.6.5

package/dist/cjs/server/assetRange.cjs

@@ -23,35 +23,103 @@ __export(assetRange_exports, { withRange: () => withRange });
 module.exports = __toCommonJS(assetRange_exports);
 async function withRange(request, response) {
 	const range = request.headers.get("range");
-	if (!range || request.method !== "GET" || response.status !== 200 || response.headers.has("content-range") || response.headers.has("content-encoding")) {
+	if (!range || request.method !== "GET" || response.status !== 200 || !response.body || response.headers.has("content-range") || response.headers.has("content-encoding") || !ifRangeMatches(request.headers.get("if-range"), response.headers)) {
 		return response;
 	}
 	const match = /^bytes=(\d*)-(\d*)$/.exec(range.trim());
 	if (!match || !match[1] && !match[2]) return response;
-	const bytes = new Uint8Array(await response.arrayBuffer());
-	const size = bytes.byteLength;
-	let start;
-	let end;
-	if (!match[1]) {
-		start = Math.max(0, size - Number(match[2]));
-		end = size - 1;
-	} else {
-		start = Number(match[1]);
-		end = match[2] ? Math.min(Number(match[2]), size - 1) : size - 1;
-	}
+	const length = response.headers.get("content-length");
+	const known = length && /^\d+$/.test(length) ? Number(length) : void 0;
 	const headers = new Headers(response.headers);
 	headers.set("accept-ranges", "bytes");
-	if (start >= size || start > end) {
+	headers.delete("content-length");
+	const { size, kept, keptStart } = await readRange(response.body, match, known);
+	const span = resolve(match, size);
+	if (!span) {
 		headers.set("content-range", `bytes */${size}`);
 		return new Response(null, {
 			status: 416,
 			headers
 		});
 	}
-	headers.set("content-range", `bytes ${start}-${end}/${size}`);
-	headers.set("content-length", String(end - start + 1));
-	return new Response(bytes.subarray(start, end + 1), {
+	headers.set("content-range", `bytes ${span.start}-${span.end}/${size}`);
+	headers.set("content-length", String(span.end - span.start + 1));
+	return new Response(kept.subarray(span.start - keptStart, span.end - keptStart + 1), {
 		status: 206,
 		headers
 	});
 }
+function ifRangeMatches(ifRange, headers) {
+	if (!ifRange) return true;
+	const value = ifRange.trim();
+	if (value.startsWith("\"")) {
+		const etag = headers.get("etag");
+		return !!etag && !etag.startsWith("W/") && etag === value;
+	}
+	if (value.startsWith("W/")) return false;
+	return headers.get("last-modified") === value;
+}
+function resolve(match, size) {
+	let start;
+	let end;
+	if (!match[1]) {
+		start = Math.max(0, size - Number(match[2]));
+		end = size - 1;
+	} else {
+		start = Number(match[1]);
+		end = match[2] ? Math.min(Number(match[2]), size - 1) : size - 1;
+	}
+	if (start >= size || start > end) return;
+	return {
+		start,
+		end
+	};
+}
+async function readRange(body, match, known) {
+	const span = known === void 0 ? void 0 : resolve(match, known) ?? {
+		start: known,
+		end: -1
+	};
+	const suffix = !span && !match[1] ? Number(match[2]) : 0;
+	const from = span ? span.start : match[1] ? Number(match[1]) : 0;
+	const to = span ? span.end : match[2] && match[1] ? Number(match[2]) : Number.POSITIVE_INFINITY;
+	const chunks = [];
+	let keptBytes = 0;
+	let size = 0;
+	const reader = body.getReader();
+	while (known === void 0 || size <= to) {
+		const { done, value } = await reader.read();
+		if (done) break;
+		const chunkStart = size;
+		size += value.byteLength;
+		if (suffix) {
+			chunks.push(value);
+			keptBytes += value.byteLength;
+			while (chunks.length > 1 && keptBytes - chunks[0].byteLength >= suffix) {
+				keptBytes -= chunks.shift().byteLength;
+			}
+			continue;
+		}
+		const lo = Math.max(from, chunkStart);
+		const hi = Math.min(to + 1, size);
+		if (hi > lo) {
+			chunks.push(value.subarray(lo - chunkStart, hi - chunkStart));
+			keptBytes += hi - lo;
+		}
+	}
+	if (known !== void 0) {
+		await reader.cancel();
+		size = known;
+	}
+	const kept = new Uint8Array(keptBytes);
+	let at = 0;
+	for (const chunk of chunks) {
+		kept.set(chunk, at);
+		at += chunk.byteLength;
+	}
+	return {
+		size,
+		kept,
+		keptStart: suffix ? size - keptBytes : from
+	};
+}

package/dist/cjs/server/assetRange.native.cjs

@@ -25,35 +25,121 @@ __export(assetRange_exports, { withRange: () => withRange });
 module.exports = __toCommonJS(assetRange_exports);
 async function withRange(request, response) {
 	var range = request.headers.get("range");
-	if (!range || request.method !== "GET" || response.status !== 200 || response.headers.has("content-range") || response.headers.has("content-encoding")) {
+	if (!range || request.method !== "GET" || response.status !== 200 || !response.body || response.headers.has("content-range") || response.headers.has("content-encoding") || !ifRangeMatches(request.headers.get("if-range"), response.headers)) {
 		return response;
 	}
 	var match = /^bytes=(\d*)-(\d*)$/.exec(range.trim());
 	if (!match || !match[1] && !match[2]) return response;
-	var bytes = new Uint8Array(await response.arrayBuffer());
-	var size = bytes.byteLength;
-	var start;
-	var end;
-	if (!match[1]) {
-		start = Math.max(0, size - Number(match[2]));
-		end = size - 1;
-	} else {
-		start = Number(match[1]);
-		end = match[2] ? Math.min(Number(match[2]), size - 1) : size - 1;
-	}
+	var length = response.headers.get("content-length");
+	var known = length && /^\d+$/.test(length) ? Number(length) : void 0;
 	var headers = new Headers(response.headers);
 	headers.set("accept-ranges", "bytes");
-	if (start >= size || start > end) {
+	headers.delete("content-length");
+	var { size, kept, keptStart } = await readRange(response.body, match, known);
+	var span = resolve(match, size);
+	if (!span) {
 		headers.set("content-range", `bytes */${size}`);
 		return new Response(null, {
 			status: 416,
 			headers
 		});
 	}
-	headers.set("content-range", `bytes ${start}-${end}/${size}`);
-	headers.set("content-length", String(end - start + 1));
-	return new Response(bytes.subarray(start, end + 1), {
+	headers.set("content-range", `bytes ${span.start}-${span.end}/${size}`);
+	headers.set("content-length", String(span.end - span.start + 1));
+	return new Response(kept.subarray(span.start - keptStart, span.end - keptStart + 1), {
 		status: 206,
 		headers
 	});
 }
+function ifRangeMatches(ifRange, headers) {
+	if (!ifRange) return true;
+	var value = ifRange.trim();
+	if (value.startsWith("\"")) {
+		var etag = headers.get("etag");
+		return !!etag && !etag.startsWith("W/") && etag === value;
+	}
+	if (value.startsWith("W/")) return false;
+	return headers.get("last-modified") === value;
+}
+function resolve(match, size) {
+	var start;
+	var end;
+	if (!match[1]) {
+		start = Math.max(0, size - Number(match[2]));
+		end = size - 1;
+	} else {
+		start = Number(match[1]);
+		end = match[2] ? Math.min(Number(match[2]), size - 1) : size - 1;
+	}
+	if (start >= size || start > end) return;
+	return {
+		start,
+		end
+	};
+}
+async function readRange(body, match, known) {
+	var _resolve;
+	var span = known === void 0 ? void 0 : (_resolve = resolve(match, known)) !== null && _resolve !== void 0 ? _resolve : {
+		start: known,
+		end: -1
+	};
+	var suffix = !span && !match[1] ? Number(match[2]) : 0;
+	var from = span ? span.start : match[1] ? Number(match[1]) : 0;
+	var to = span ? span.end : match[2] && match[1] ? Number(match[2]) : Number.POSITIVE_INFINITY;
+	var chunks = [];
+	var keptBytes = 0;
+	var size = 0;
+	var reader = body.getReader();
+	while (known === void 0 || size <= to) {
+		var { done, value } = await reader.read();
+		if (done) break;
+		var chunkStart = size;
+		size += value.byteLength;
+		if (suffix) {
+			chunks.push(value);
+			keptBytes += value.byteLength;
+			while (chunks.length > 1 && keptBytes - chunks[0].byteLength >= suffix) {
+				keptBytes -= chunks.shift().byteLength;
+			}
+			continue;
+		}
+		var lo = Math.max(from, chunkStart);
+		var hi = Math.min(to + 1, size);
+		if (hi > lo) {
+			chunks.push(value.subarray(lo - chunkStart, hi - chunkStart));
+			keptBytes += hi - lo;
+		}
+	}
+	if (known !== void 0) {
+		await reader.cancel();
+		size = known;
+	}
+	var kept = new Uint8Array(keptBytes);
+	var at = 0;
+	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+	try {
+		for (var _iterator = chunks[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+			var chunk = _step.value;
+			kept.set(chunk, at);
+			at += chunk.byteLength;
+		}
+	} catch (err) {
+		_didIteratorError = true;
+		_iteratorError = err;
+	} finally {
+		try {
+			if (!_iteratorNormalCompletion && _iterator.return != null) {
+				_iterator.return();
+			}
+		} finally {
+			if (_didIteratorError) {
+				throw _iteratorError;
+			}
+		}
+	}
+	return {
+		size,
+		kept,
+		keptStart: suffix ? size - keptBytes : from
+	};
+}

package/dist/cjs/server/assetRange.native.js

@@ -25,37 +25,123 @@ __export(assetRange_exports, { withRange: () => withRange });
 module.exports = __toCommonJS(assetRange_exports);
 async function withRange(request, response) {
 	var range = request.headers.get("range");
-	if (!range || request.method !== "GET" || response.status !== 200 || response.headers.has("content-range") || response.headers.has("content-encoding")) {
+	if (!range || request.method !== "GET" || response.status !== 200 || !response.body || response.headers.has("content-range") || response.headers.has("content-encoding") || !ifRangeMatches(request.headers.get("if-range"), response.headers)) {
 		return response;
 	}
 	var match = /^bytes=(\d*)-(\d*)$/.exec(range.trim());
 	if (!match || !match[1] && !match[2]) return response;
-	var bytes = new Uint8Array(await response.arrayBuffer());
-	var size = bytes.byteLength;
-	var start;
-	var end;
-	if (!match[1]) {
-		start = Math.max(0, size - Number(match[2]));
-		end = size - 1;
-	} else {
-		start = Number(match[1]);
-		end = match[2] ? Math.min(Number(match[2]), size - 1) : size - 1;
-	}
+	var length = response.headers.get("content-length");
+	var known = length && /^\d+$/.test(length) ? Number(length) : void 0;
 	var headers = new Headers(response.headers);
 	headers.set("accept-ranges", "bytes");
-	if (start >= size || start > end) {
+	headers.delete("content-length");
+	var { size, kept, keptStart } = await readRange(response.body, match, known);
+	var span = resolve(match, size);
+	if (!span) {
 		headers.set("content-range", `bytes */${size}`);
 		return new Response(null, {
 			status: 416,
 			headers
 		});
 	}
-	headers.set("content-range", `bytes ${start}-${end}/${size}`);
-	headers.set("content-length", String(end - start + 1));
-	return new Response(bytes.subarray(start, end + 1), {
+	headers.set("content-range", `bytes ${span.start}-${span.end}/${size}`);
+	headers.set("content-length", String(span.end - span.start + 1));
+	return new Response(kept.subarray(span.start - keptStart, span.end - keptStart + 1), {
 		status: 206,
 		headers
 	});
 }
+function ifRangeMatches(ifRange, headers) {
+	if (!ifRange) return true;
+	var value = ifRange.trim();
+	if (value.startsWith("\"")) {
+		var etag = headers.get("etag");
+		return !!etag && !etag.startsWith("W/") && etag === value;
+	}
+	if (value.startsWith("W/")) return false;
+	return headers.get("last-modified") === value;
+}
+function resolve(match, size) {
+	var start;
+	var end;
+	if (!match[1]) {
+		start = Math.max(0, size - Number(match[2]));
+		end = size - 1;
+	} else {
+		start = Number(match[1]);
+		end = match[2] ? Math.min(Number(match[2]), size - 1) : size - 1;
+	}
+	if (start >= size || start > end) return;
+	return {
+		start,
+		end
+	};
+}
+async function readRange(body, match, known) {
+	var _resolve;
+	var span = known === void 0 ? void 0 : (_resolve = resolve(match, known)) !== null && _resolve !== void 0 ? _resolve : {
+		start: known,
+		end: -1
+	};
+	var suffix = !span && !match[1] ? Number(match[2]) : 0;
+	var from = span ? span.start : match[1] ? Number(match[1]) : 0;
+	var to = span ? span.end : match[2] && match[1] ? Number(match[2]) : Number.POSITIVE_INFINITY;
+	var chunks = [];
+	var keptBytes = 0;
+	var size = 0;
+	var reader = body.getReader();
+	while (known === void 0 || size <= to) {
+		var { done, value } = await reader.read();
+		if (done) break;
+		var chunkStart = size;
+		size += value.byteLength;
+		if (suffix) {
+			chunks.push(value);
+			keptBytes += value.byteLength;
+			while (chunks.length > 1 && keptBytes - chunks[0].byteLength >= suffix) {
+				keptBytes -= chunks.shift().byteLength;
+			}
+			continue;
+		}
+		var lo = Math.max(from, chunkStart);
+		var hi = Math.min(to + 1, size);
+		if (hi > lo) {
+			chunks.push(value.subarray(lo - chunkStart, hi - chunkStart));
+			keptBytes += hi - lo;
+		}
+	}
+	if (known !== void 0) {
+		await reader.cancel();
+		size = known;
+	}
+	var kept = new Uint8Array(keptBytes);
+	var at = 0;
+	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+	try {
+		for (var _iterator = chunks[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+			var chunk = _step.value;
+			kept.set(chunk, at);
+			at += chunk.byteLength;
+		}
+	} catch (err) {
+		_didIteratorError = true;
+		_iteratorError = err;
+	} finally {
+		try {
+			if (!_iteratorNormalCompletion && _iterator.return != null) {
+				_iterator.return();
+			}
+		} finally {
+			if (_didIteratorError) {
+				throw _iteratorError;
+			}
+		}
+	}
+	return {
+		size,
+		kept,
+		keptStart: suffix ? size - keptBytes : from
+	};
+}
 
 //# sourceMappingURL=assetRange.native.js.map

package/dist/cjs/server/assetRange.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"assetRange.native.js","names":[],"sources":["cjs/server/assetRange.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar assetRange_exports = {};\n__export(assetRange_exports, {\n  withRange: () => withRange\n});\nmodule.exports = __toCommonJS(assetRange_exports);\nasync function withRange(request, response) {\n  var range = request.headers.get(\"range\");\n  if (!range || request.method !== \"GET\" || response.status !== 200 || response.headers.has(\"content-range\") || response.headers.has(\"content-encoding\")) {\n    return response;\n  }\n  var match = /^bytes=(\\d*)-(\\d*)$/.exec(range.trim());\n  if (!match || !match[1] && !match[2]) return response;\n  var bytes = new Uint8Array(await response.arrayBuffer());\n  var size = bytes.byteLength;\n  var start;\n  var end;\n  if (!match[1]) {\n    start = Math.max(0, size - Number(match[2]));\n    end = size - 1;\n  } else {\n    start = Number(match[1]);\n    end = match[2] ? Math.min(Number(match[2]), size - 1) : size - 1;\n  }\n  var headers = new Headers(response.headers);\n  headers.set(\"accept-ranges\", \"bytes\");\n  if (start >= size || start > end) {\n    headers.set(\"content-range\", `bytes */${size}`);\n    return new Response(null, {\n      status: 416,\n      headers\n    });\n  }\n  headers.set(\"content-range\", `bytes ${start}-${end}/${size}`);\n  headers.set(\"content-length\", String(end - start + 1));\n  return new Response(bytes.subarray(start, end + 1), {\n    status: 206,\n    headers\n  });\n}\n//# sourceMappingURL=assetRange.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,qBAAqB,CAAC;AAC1B,SAAS,oBAAoB,EAC3B,iBAAiB,UACnB,CAAC;AACD,OAAO,UAAU,aAAa,kBAAkB;AAChD,eAAe,UAAU,SAAS,UAAU;CAC1C,IAAI,QAAQ,QAAQ,QAAQ,IAAI,OAAO;CACvC,IAAI,CAAC,SAAS,QAAQ,WAAW,SAAS,SAAS,WAAW,OAAO,SAAS,QAAQ,IAAI,eAAe,KAAK,SAAS,QAAQ,IAAI,kBAAkB,GAAG;EACtJ,OAAO;CACT;CACA,IAAI,QAAQ,sBAAsB,KAAK,MAAM,KAAK,CAAC;CACnD,IAAI,CAAC,SAAS,CAAC,MAAM,MAAM,CAAC,MAAM,IAAI,OAAO;CAC7C,IAAI,QAAQ,IAAI,WAAW,MAAM,SAAS,YAAY,CAAC;CACvD,IAAI,OAAO,MAAM;CACjB,IAAI;CACJ,IAAI;CACJ,IAAI,CAAC,MAAM,IAAI;EACb,QAAQ,KAAK,IAAI,GAAG,OAAO,OAAO,MAAM,EAAE,CAAC;EAC3C,MAAM,OAAO;CACf,OAAO;EACL,QAAQ,OAAO,MAAM,EAAE;EACvB,MAAM,MAAM,KAAK,KAAK,IAAI,OAAO,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,OAAO;CACjE;CACA,IAAI,UAAU,IAAI,QAAQ,SAAS,OAAO;CAC1C,QAAQ,IAAI,iBAAiB,OAAO;CACpC,IAAI,SAAS,QAAQ,QAAQ,KAAK;EAChC,QAAQ,IAAI,iBAAiB,WAAW,MAAM;EAC9C,OAAO,IAAI,SAAS,MAAM;GACxB,QAAQ;GACR;EACF,CAAC;CACH;CACA,QAAQ,IAAI,iBAAiB,SAAS,MAAM,GAAG,IAAI,GAAG,MAAM;CAC5D,QAAQ,IAAI,kBAAkB,OAAO,MAAM,QAAQ,CAAC,CAAC;CACrD,OAAO,IAAI,SAAS,MAAM,SAAS,OAAO,MAAM,CAAC,GAAG;EAClD,QAAQ;EACR;CACF,CAAC;AACH"}
+{"version":3,"file":"assetRange.native.js","names":[],"sources":["cjs/server/assetRange.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n  for (var name in all)\n    __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n  if (from && typeof from === \"object\" || typeof from === \"function\") {\n    for (let key of __getOwnPropNames(from))\n      if (!__hasOwnProp.call(to, key) && key !== except)\n        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n  }\n  return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar assetRange_exports = {};\n__export(assetRange_exports, {\n  withRange: () => withRange\n});\nmodule.exports = __toCommonJS(assetRange_exports);\nasync function withRange(request, response) {\n  var range = request.headers.get(\"range\");\n  if (!range || request.method !== \"GET\" || response.status !== 200 || !response.body || response.headers.has(\"content-range\") || response.headers.has(\"content-encoding\") || !ifRangeMatches(request.headers.get(\"if-range\"), response.headers)) {\n    return response;\n  }\n  var match = /^bytes=(\\d*)-(\\d*)$/.exec(range.trim());\n  if (!match || !match[1] && !match[2]) return response;\n  var length = response.headers.get(\"content-length\");\n  var known = length && /^\\d+$/.test(length) ? Number(length) : void 0;\n  var headers = new Headers(response.headers);\n  headers.set(\"accept-ranges\", \"bytes\");\n  headers.delete(\"content-length\");\n  var { size, kept, keptStart } = await readRange(response.body, match, known);\n  var span = resolve(match, size);\n  if (!span) {\n    headers.set(\"content-range\", `bytes */${size}`);\n    return new Response(null, {\n      status: 416,\n      headers\n    });\n  }\n  headers.set(\"content-range\", `bytes ${span.start}-${span.end}/${size}`);\n  headers.set(\"content-length\", String(span.end - span.start + 1));\n  return new Response(kept.subarray(span.start - keptStart, span.end - keptStart + 1), {\n    status: 206,\n    headers\n  });\n}\nfunction ifRangeMatches(ifRange, headers) {\n  if (!ifRange) return true;\n  var value = ifRange.trim();\n  if (value.startsWith('\"')) {\n    var etag = headers.get(\"etag\");\n    return !!etag && !etag.startsWith(\"W/\") && etag === value;\n  }\n  if (value.startsWith(\"W/\")) return false;\n  return headers.get(\"last-modified\") === value;\n}\nfunction resolve(match, size) {\n  var start;\n  var end;\n  if (!match[1]) {\n    start = Math.max(0, size - Number(match[2]));\n    end = size - 1;\n  } else {\n    start = Number(match[1]);\n    end = match[2] ? Math.min(Number(match[2]), size - 1) : size - 1;\n  }\n  if (start >= size || start > end) return;\n  return {\n    start,\n    end\n  };\n}\nasync function readRange(body, match, known) {\n  var _resolve;\n  var span = known === void 0 ? void 0 : (_resolve = resolve(match, known)) !== null && _resolve !== void 0 ? _resolve : {\n    start: known,\n    end: -1\n  };\n  var suffix = !span && !match[1] ? Number(match[2]) : 0;\n  var from = span ? span.start : match[1] ? Number(match[1]) : 0;\n  var to = span ? span.end : match[2] && match[1] ? Number(match[2]) : Number.POSITIVE_INFINITY;\n  var chunks = [];\n  var keptBytes = 0;\n  var size = 0;\n  var reader = body.getReader();\n  while (known === void 0 || size <= to) {\n    var { done, value } = await reader.read();\n    if (done) break;\n    var chunkStart = size;\n    size += value.byteLength;\n    if (suffix) {\n      chunks.push(value);\n      keptBytes += value.byteLength;\n      while (chunks.length > 1 && keptBytes - chunks[0].byteLength >= suffix) {\n        keptBytes -= chunks.shift().byteLength;\n      }\n      continue;\n    }\n    var lo = Math.max(from, chunkStart);\n    var hi = Math.min(to + 1, size);\n    if (hi > lo) {\n      chunks.push(value.subarray(lo - chunkStart, hi - chunkStart));\n      keptBytes += hi - lo;\n    }\n  }\n  if (known !== void 0) {\n    await reader.cancel();\n    size = known;\n  }\n  var kept = new Uint8Array(keptBytes);\n  var at = 0;\n  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n  try {\n    for (var _iterator = chunks[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n      var chunk = _step.value;\n      kept.set(chunk, at);\n      at += chunk.byteLength;\n    }\n  } catch (err) {\n    _didIteratorError = true;\n    _iteratorError = err;\n  } finally {\n    try {\n      if (!_iteratorNormalCompletion && _iterator.return != null) {\n        _iterator.return();\n      }\n    } finally {\n      if (_didIteratorError) {\n        throw _iteratorError;\n      }\n    }\n  }\n  return {\n    size,\n    kept,\n    keptStart: suffix ? size - keptBytes : from\n  };\n}\n//# sourceMappingURL=assetRange.js.map\n"],"mappings":"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"}

package/dist/esm/server/assetRange.mjs

@@ -1,37 +1,105 @@
 async function withRange(request, response) {
 	const range = request.headers.get("range");
-	if (!range || request.method !== "GET" || response.status !== 200 || response.headers.has("content-range") || response.headers.has("content-encoding")) {
+	if (!range || request.method !== "GET" || response.status !== 200 || !response.body || response.headers.has("content-range") || response.headers.has("content-encoding") || !ifRangeMatches(request.headers.get("if-range"), response.headers)) {
 		return response;
 	}
 	const match = /^bytes=(\d*)-(\d*)$/.exec(range.trim());
 	if (!match || !match[1] && !match[2]) return response;
-	const bytes = new Uint8Array(await response.arrayBuffer());
-	const size = bytes.byteLength;
-	let start;
-	let end;
-	if (!match[1]) {
-		start = Math.max(0, size - Number(match[2]));
-		end = size - 1;
-	} else {
-		start = Number(match[1]);
-		end = match[2] ? Math.min(Number(match[2]), size - 1) : size - 1;
-	}
+	const length = response.headers.get("content-length");
+	const known = length && /^\d+$/.test(length) ? Number(length) : void 0;
 	const headers = new Headers(response.headers);
 	headers.set("accept-ranges", "bytes");
-	if (start >= size || start > end) {
+	headers.delete("content-length");
+	const { size, kept, keptStart } = await readRange(response.body, match, known);
+	const span = resolve(match, size);
+	if (!span) {
 		headers.set("content-range", `bytes */${size}`);
 		return new Response(null, {
 			status: 416,
 			headers
 		});
 	}
-	headers.set("content-range", `bytes ${start}-${end}/${size}`);
-	headers.set("content-length", String(end - start + 1));
-	return new Response(bytes.subarray(start, end + 1), {
+	headers.set("content-range", `bytes ${span.start}-${span.end}/${size}`);
+	headers.set("content-length", String(span.end - span.start + 1));
+	return new Response(kept.subarray(span.start - keptStart, span.end - keptStart + 1), {
 		status: 206,
 		headers
 	});
 }
+function ifRangeMatches(ifRange, headers) {
+	if (!ifRange) return true;
+	const value = ifRange.trim();
+	if (value.startsWith("\"")) {
+		const etag = headers.get("etag");
+		return !!etag && !etag.startsWith("W/") && etag === value;
+	}
+	if (value.startsWith("W/")) return false;
+	return headers.get("last-modified") === value;
+}
+function resolve(match, size) {
+	let start;
+	let end;
+	if (!match[1]) {
+		start = Math.max(0, size - Number(match[2]));
+		end = size - 1;
+	} else {
+		start = Number(match[1]);
+		end = match[2] ? Math.min(Number(match[2]), size - 1) : size - 1;
+	}
+	if (start >= size || start > end) return;
+	return {
+		start,
+		end
+	};
+}
+async function readRange(body, match, known) {
+	const span = known === void 0 ? void 0 : resolve(match, known) ?? {
+		start: known,
+		end: -1
+	};
+	const suffix = !span && !match[1] ? Number(match[2]) : 0;
+	const from = span ? span.start : match[1] ? Number(match[1]) : 0;
+	const to = span ? span.end : match[2] && match[1] ? Number(match[2]) : Number.POSITIVE_INFINITY;
+	const chunks = [];
+	let keptBytes = 0;
+	let size = 0;
+	const reader = body.getReader();
+	while (known === void 0 || size <= to) {
+		const { done, value } = await reader.read();
+		if (done) break;
+		const chunkStart = size;
+		size += value.byteLength;
+		if (suffix) {
+			chunks.push(value);
+			keptBytes += value.byteLength;
+			while (chunks.length > 1 && keptBytes - chunks[0].byteLength >= suffix) {
+				keptBytes -= chunks.shift().byteLength;
+			}
+			continue;
+		}
+		const lo = Math.max(from, chunkStart);
+		const hi = Math.min(to + 1, size);
+		if (hi > lo) {
+			chunks.push(value.subarray(lo - chunkStart, hi - chunkStart));
+			keptBytes += hi - lo;
+		}
+	}
+	if (known !== void 0) {
+		await reader.cancel();
+		size = known;
+	}
+	const kept = new Uint8Array(keptBytes);
+	let at = 0;
+	for (const chunk of chunks) {
+		kept.set(chunk, at);
+		at += chunk.byteLength;
+	}
+	return {
+		size,
+		kept,
+		keptStart: suffix ? size - keptBytes : from
+	};
+}
 
 export { withRange };
 //# sourceMappingURL=assetRange.mjs.map

package/dist/esm/server/assetRange.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"assetRange.js","names":[],"sources":["esm/server/assetRange.js"],"sourcesContent":["async function withRange(request, response) {\n  const range = request.headers.get(\"range\");\n  if (!range || request.method !== \"GET\" || response.status !== 200 || response.headers.has(\"content-range\") || response.headers.has(\"content-encoding\")) {\n    return response;\n  }\n  const match = /^bytes=(\\d*)-(\\d*)$/.exec(range.trim());\n  if (!match || !match[1] && !match[2]) return response;\n  const bytes = new Uint8Array(await response.arrayBuffer());\n  const size = bytes.byteLength;\n  let start;\n  let end;\n  if (!match[1]) {\n    start = Math.max(0, size - Number(match[2]));\n    end = size - 1;\n  } else {\n    start = Number(match[1]);\n    end = match[2] ? Math.min(Number(match[2]), size - 1) : size - 1;\n  }\n  const headers = new Headers(response.headers);\n  headers.set(\"accept-ranges\", \"bytes\");\n  if (start >= size || start > end) {\n    headers.set(\"content-range\", `bytes */${size}`);\n    return new Response(null, { status: 416, headers });\n  }\n  headers.set(\"content-range\", `bytes ${start}-${end}/${size}`);\n  headers.set(\"content-length\", String(end - start + 1));\n  return new Response(bytes.subarray(start, end + 1), { status: 206, headers });\n}\nexport {\n  withRange\n};\n//# sourceMappingURL=assetRange.js.map\n"],"mappings":";AAAA,eAAe,UAAU,SAAS,UAAU;CAC1C,MAAM,QAAQ,QAAQ,QAAQ,IAAI,OAAO;CACzC,IAAI,CAAC,SAAS,QAAQ,WAAW,SAAS,SAAS,WAAW,OAAO,SAAS,QAAQ,IAAI,eAAe,KAAK,SAAS,QAAQ,IAAI,kBAAkB,GAAG;EACtJ,OAAO;CACT;CACA,MAAM,QAAQ,sBAAsB,KAAK,MAAM,KAAK,CAAC;CACrD,IAAI,CAAC,SAAS,CAAC,MAAM,MAAM,CAAC,MAAM,IAAI,OAAO;CAC7C,MAAM,QAAQ,IAAI,WAAW,MAAM,SAAS,YAAY,CAAC;CACzD,MAAM,OAAO,MAAM;CACnB,IAAI;CACJ,IAAI;CACJ,IAAI,CAAC,MAAM,IAAI;EACb,QAAQ,KAAK,IAAI,GAAG,OAAO,OAAO,MAAM,EAAE,CAAC;EAC3C,MAAM,OAAO;CACf,OAAO;EACL,QAAQ,OAAO,MAAM,EAAE;EACvB,MAAM,MAAM,KAAK,KAAK,IAAI,OAAO,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,OAAO;CACjE;CACA,MAAM,UAAU,IAAI,QAAQ,SAAS,OAAO;CAC5C,QAAQ,IAAI,iBAAiB,OAAO;CACpC,IAAI,SAAS,QAAQ,QAAQ,KAAK;EAChC,QAAQ,IAAI,iBAAiB,WAAW,MAAM;EAC9C,OAAO,IAAI,SAAS,MAAM;GAAE,QAAQ;GAAK;EAAQ,CAAC;CACpD;CACA,QAAQ,IAAI,iBAAiB,SAAS,MAAM,GAAG,IAAI,GAAG,MAAM;CAC5D,QAAQ,IAAI,kBAAkB,OAAO,MAAM,QAAQ,CAAC,CAAC;CACrD,OAAO,IAAI,SAAS,MAAM,SAAS,OAAO,MAAM,CAAC,GAAG;EAAE,QAAQ;EAAK;CAAQ,CAAC;AAC9E"}
+{"version":3,"file":"assetRange.js","names":[],"sources":["esm/server/assetRange.js"],"sourcesContent":["async function withRange(request, response) {\n  const range = request.headers.get(\"range\");\n  if (!range || request.method !== \"GET\" || response.status !== 200 || !response.body || response.headers.has(\"content-range\") || response.headers.has(\"content-encoding\") || !ifRangeMatches(request.headers.get(\"if-range\"), response.headers)) {\n    return response;\n  }\n  const match = /^bytes=(\\d*)-(\\d*)$/.exec(range.trim());\n  if (!match || !match[1] && !match[2]) return response;\n  const length = response.headers.get(\"content-length\");\n  const known = length && /^\\d+$/.test(length) ? Number(length) : void 0;\n  const headers = new Headers(response.headers);\n  headers.set(\"accept-ranges\", \"bytes\");\n  headers.delete(\"content-length\");\n  const { size, kept, keptStart } = await readRange(response.body, match, known);\n  const span = resolve(match, size);\n  if (!span) {\n    headers.set(\"content-range\", `bytes */${size}`);\n    return new Response(null, { status: 416, headers });\n  }\n  headers.set(\"content-range\", `bytes ${span.start}-${span.end}/${size}`);\n  headers.set(\"content-length\", String(span.end - span.start + 1));\n  return new Response(kept.subarray(span.start - keptStart, span.end - keptStart + 1), {\n    status: 206,\n    headers\n  });\n}\nfunction ifRangeMatches(ifRange, headers) {\n  if (!ifRange) return true;\n  const value = ifRange.trim();\n  if (value.startsWith('\"')) {\n    const etag = headers.get(\"etag\");\n    return !!etag && !etag.startsWith(\"W/\") && etag === value;\n  }\n  if (value.startsWith(\"W/\")) return false;\n  return headers.get(\"last-modified\") === value;\n}\nfunction resolve(match, size) {\n  let start;\n  let end;\n  if (!match[1]) {\n    start = Math.max(0, size - Number(match[2]));\n    end = size - 1;\n  } else {\n    start = Number(match[1]);\n    end = match[2] ? Math.min(Number(match[2]), size - 1) : size - 1;\n  }\n  if (start >= size || start > end) return;\n  return { start, end };\n}\nasync function readRange(body, match, known) {\n  const span = known === void 0 ? void 0 : resolve(match, known) ?? { start: known, end: -1 };\n  const suffix = !span && !match[1] ? Number(match[2]) : 0;\n  const from = span ? span.start : match[1] ? Number(match[1]) : 0;\n  const to = span ? span.end : match[2] && match[1] ? Number(match[2]) : Number.POSITIVE_INFINITY;\n  const chunks = [];\n  let keptBytes = 0;\n  let size = 0;\n  const reader = body.getReader();\n  while (known === void 0 || size <= to) {\n    const { done, value } = await reader.read();\n    if (done) break;\n    const chunkStart = size;\n    size += value.byteLength;\n    if (suffix) {\n      chunks.push(value);\n      keptBytes += value.byteLength;\n      while (chunks.length > 1 && keptBytes - chunks[0].byteLength >= suffix) {\n        keptBytes -= chunks.shift().byteLength;\n      }\n      continue;\n    }\n    const lo = Math.max(from, chunkStart);\n    const hi = Math.min(to + 1, size);\n    if (hi > lo) {\n      chunks.push(value.subarray(lo - chunkStart, hi - chunkStart));\n      keptBytes += hi - lo;\n    }\n  }\n  if (known !== void 0) {\n    await reader.cancel();\n    size = known;\n  }\n  const kept = new Uint8Array(keptBytes);\n  let at = 0;\n  for (const chunk of chunks) {\n    kept.set(chunk, at);\n    at += chunk.byteLength;\n  }\n  return { size, kept, keptStart: suffix ? size - keptBytes : from };\n}\nexport {\n  withRange\n};\n//# sourceMappingURL=assetRange.js.map\n"],"mappings":"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"}

package/dist/esm/server/assetRange.native.js

@@ -1,37 +1,123 @@
 async function withRange(request, response) {
 	var range = request.headers.get("range");
-	if (!range || request.method !== "GET" || response.status !== 200 || response.headers.has("content-range") || response.headers.has("content-encoding")) {
+	if (!range || request.method !== "GET" || response.status !== 200 || !response.body || response.headers.has("content-range") || response.headers.has("content-encoding") || !ifRangeMatches(request.headers.get("if-range"), response.headers)) {
 		return response;
 	}
 	var match = /^bytes=(\d*)-(\d*)$/.exec(range.trim());
 	if (!match || !match[1] && !match[2]) return response;
-	var bytes = new Uint8Array(await response.arrayBuffer());
-	var size = bytes.byteLength;
-	var start;
-	var end;
-	if (!match[1]) {
-		start = Math.max(0, size - Number(match[2]));
-		end = size - 1;
-	} else {
-		start = Number(match[1]);
-		end = match[2] ? Math.min(Number(match[2]), size - 1) : size - 1;
-	}
+	var length = response.headers.get("content-length");
+	var known = length && /^\d+$/.test(length) ? Number(length) : void 0;
 	var headers = new Headers(response.headers);
 	headers.set("accept-ranges", "bytes");
-	if (start >= size || start > end) {
+	headers.delete("content-length");
+	var { size, kept, keptStart } = await readRange(response.body, match, known);
+	var span = resolve(match, size);
+	if (!span) {
 		headers.set("content-range", `bytes */${size}`);
 		return new Response(null, {
 			status: 416,
 			headers
 		});
 	}
-	headers.set("content-range", `bytes ${start}-${end}/${size}`);
-	headers.set("content-length", String(end - start + 1));
-	return new Response(bytes.subarray(start, end + 1), {
+	headers.set("content-range", `bytes ${span.start}-${span.end}/${size}`);
+	headers.set("content-length", String(span.end - span.start + 1));
+	return new Response(kept.subarray(span.start - keptStart, span.end - keptStart + 1), {
 		status: 206,
 		headers
 	});
 }
+function ifRangeMatches(ifRange, headers) {
+	if (!ifRange) return true;
+	var value = ifRange.trim();
+	if (value.startsWith("\"")) {
+		var etag = headers.get("etag");
+		return !!etag && !etag.startsWith("W/") && etag === value;
+	}
+	if (value.startsWith("W/")) return false;
+	return headers.get("last-modified") === value;
+}
+function resolve(match, size) {
+	var start;
+	var end;
+	if (!match[1]) {
+		start = Math.max(0, size - Number(match[2]));
+		end = size - 1;
+	} else {
+		start = Number(match[1]);
+		end = match[2] ? Math.min(Number(match[2]), size - 1) : size - 1;
+	}
+	if (start >= size || start > end) return;
+	return {
+		start,
+		end
+	};
+}
+async function readRange(body, match, known) {
+	var _resolve;
+	var span = known === void 0 ? void 0 : (_resolve = resolve(match, known)) !== null && _resolve !== void 0 ? _resolve : {
+		start: known,
+		end: -1
+	};
+	var suffix = !span && !match[1] ? Number(match[2]) : 0;
+	var from = span ? span.start : match[1] ? Number(match[1]) : 0;
+	var to = span ? span.end : match[2] && match[1] ? Number(match[2]) : Number.POSITIVE_INFINITY;
+	var chunks = [];
+	var keptBytes = 0;
+	var size = 0;
+	var reader = body.getReader();
+	while (known === void 0 || size <= to) {
+		var { done, value } = await reader.read();
+		if (done) break;
+		var chunkStart = size;
+		size += value.byteLength;
+		if (suffix) {
+			chunks.push(value);
+			keptBytes += value.byteLength;
+			while (chunks.length > 1 && keptBytes - chunks[0].byteLength >= suffix) {
+				keptBytes -= chunks.shift().byteLength;
+			}
+			continue;
+		}
+		var lo = Math.max(from, chunkStart);
+		var hi = Math.min(to + 1, size);
+		if (hi > lo) {
+			chunks.push(value.subarray(lo - chunkStart, hi - chunkStart));
+			keptBytes += hi - lo;
+		}
+	}
+	if (known !== void 0) {
+		await reader.cancel();
+		size = known;
+	}
+	var kept = new Uint8Array(keptBytes);
+	var at = 0;
+	var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+	try {
+		for (var _iterator = chunks[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+			var chunk = _step.value;
+			kept.set(chunk, at);
+			at += chunk.byteLength;
+		}
+	} catch (err) {
+		_didIteratorError = true;
+		_iteratorError = err;
+	} finally {
+		try {
+			if (!_iteratorNormalCompletion && _iterator.return != null) {
+				_iterator.return();
+			}
+		} finally {
+			if (_didIteratorError) {
+				throw _iteratorError;
+			}
+		}
+	}
+	return {
+		size,
+		kept,
+		keptStart: suffix ? size - keptBytes : from
+	};
+}
 
 export { withRange };
 //# sourceMappingURL=assetRange.native.js.map

package/dist/esm/server/assetRange.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"assetRange.native.js","names":[],"sources":["esm/server/assetRange.native.js"],"sourcesContent":["async function withRange(request, response) {\n  var range = request.headers.get(\"range\");\n  if (!range || request.method !== \"GET\" || response.status !== 200 || response.headers.has(\"content-range\") || response.headers.has(\"content-encoding\")) {\n    return response;\n  }\n  var match = /^bytes=(\\d*)-(\\d*)$/.exec(range.trim());\n  if (!match || !match[1] && !match[2]) return response;\n  var bytes = new Uint8Array(await response.arrayBuffer());\n  var size = bytes.byteLength;\n  var start;\n  var end;\n  if (!match[1]) {\n    start = Math.max(0, size - Number(match[2]));\n    end = size - 1;\n  } else {\n    start = Number(match[1]);\n    end = match[2] ? Math.min(Number(match[2]), size - 1) : size - 1;\n  }\n  var headers = new Headers(response.headers);\n  headers.set(\"accept-ranges\", \"bytes\");\n  if (start >= size || start > end) {\n    headers.set(\"content-range\", `bytes */${size}`);\n    return new Response(null, {\n      status: 416,\n      headers\n    });\n  }\n  headers.set(\"content-range\", `bytes ${start}-${end}/${size}`);\n  headers.set(\"content-length\", String(end - start + 1));\n  return new Response(bytes.subarray(start, end + 1), {\n    status: 206,\n    headers\n  });\n}\nexport {\n  withRange\n};\n//# sourceMappingURL=assetRange.js.map\n"],"mappings":";AAAA,eAAe,UAAU,SAAS,UAAU;CAC1C,IAAI,QAAQ,QAAQ,QAAQ,IAAI,OAAO;CACvC,IAAI,CAAC,SAAS,QAAQ,WAAW,SAAS,SAAS,WAAW,OAAO,SAAS,QAAQ,IAAI,eAAe,KAAK,SAAS,QAAQ,IAAI,kBAAkB,GAAG;EACtJ,OAAO;CACT;CACA,IAAI,QAAQ,sBAAsB,KAAK,MAAM,KAAK,CAAC;CACnD,IAAI,CAAC,SAAS,CAAC,MAAM,MAAM,CAAC,MAAM,IAAI,OAAO;CAC7C,IAAI,QAAQ,IAAI,WAAW,MAAM,SAAS,YAAY,CAAC;CACvD,IAAI,OAAO,MAAM;CACjB,IAAI;CACJ,IAAI;CACJ,IAAI,CAAC,MAAM,IAAI;EACb,QAAQ,KAAK,IAAI,GAAG,OAAO,OAAO,MAAM,EAAE,CAAC;EAC3C,MAAM,OAAO;CACf,OAAO;EACL,QAAQ,OAAO,MAAM,EAAE;EACvB,MAAM,MAAM,KAAK,KAAK,IAAI,OAAO,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,OAAO;CACjE;CACA,IAAI,UAAU,IAAI,QAAQ,SAAS,OAAO;CAC1C,QAAQ,IAAI,iBAAiB,OAAO;CACpC,IAAI,SAAS,QAAQ,QAAQ,KAAK;EAChC,QAAQ,IAAI,iBAAiB,WAAW,MAAM;EAC9C,OAAO,IAAI,SAAS,MAAM;GACxB,QAAQ;GACR;EACF,CAAC;CACH;CACA,QAAQ,IAAI,iBAAiB,SAAS,MAAM,GAAG,IAAI,GAAG,MAAM;CAC5D,QAAQ,IAAI,kBAAkB,OAAO,MAAM,QAAQ,CAAC,CAAC;CACrD,OAAO,IAAI,SAAS,MAAM,SAAS,OAAO,MAAM,CAAC,GAAG;EAClD,QAAQ;EACR;CACF,CAAC;AACH"}
+{"version":3,"file":"assetRange.native.js","names":[],"sources":["esm/server/assetRange.native.js"],"sourcesContent":["async function withRange(request, response) {\n  var range = request.headers.get(\"range\");\n  if (!range || request.method !== \"GET\" || response.status !== 200 || !response.body || response.headers.has(\"content-range\") || response.headers.has(\"content-encoding\") || !ifRangeMatches(request.headers.get(\"if-range\"), response.headers)) {\n    return response;\n  }\n  var match = /^bytes=(\\d*)-(\\d*)$/.exec(range.trim());\n  if (!match || !match[1] && !match[2]) return response;\n  var length = response.headers.get(\"content-length\");\n  var known = length && /^\\d+$/.test(length) ? Number(length) : void 0;\n  var headers = new Headers(response.headers);\n  headers.set(\"accept-ranges\", \"bytes\");\n  headers.delete(\"content-length\");\n  var { size, kept, keptStart } = await readRange(response.body, match, known);\n  var span = resolve(match, size);\n  if (!span) {\n    headers.set(\"content-range\", `bytes */${size}`);\n    return new Response(null, {\n      status: 416,\n      headers\n    });\n  }\n  headers.set(\"content-range\", `bytes ${span.start}-${span.end}/${size}`);\n  headers.set(\"content-length\", String(span.end - span.start + 1));\n  return new Response(kept.subarray(span.start - keptStart, span.end - keptStart + 1), {\n    status: 206,\n    headers\n  });\n}\nfunction ifRangeMatches(ifRange, headers) {\n  if (!ifRange) return true;\n  var value = ifRange.trim();\n  if (value.startsWith('\"')) {\n    var etag = headers.get(\"etag\");\n    return !!etag && !etag.startsWith(\"W/\") && etag === value;\n  }\n  if (value.startsWith(\"W/\")) return false;\n  return headers.get(\"last-modified\") === value;\n}\nfunction resolve(match, size) {\n  var start;\n  var end;\n  if (!match[1]) {\n    start = Math.max(0, size - Number(match[2]));\n    end = size - 1;\n  } else {\n    start = Number(match[1]);\n    end = match[2] ? Math.min(Number(match[2]), size - 1) : size - 1;\n  }\n  if (start >= size || start > end) return;\n  return {\n    start,\n    end\n  };\n}\nasync function readRange(body, match, known) {\n  var _resolve;\n  var span = known === void 0 ? void 0 : (_resolve = resolve(match, known)) !== null && _resolve !== void 0 ? _resolve : {\n    start: known,\n    end: -1\n  };\n  var suffix = !span && !match[1] ? Number(match[2]) : 0;\n  var from = span ? span.start : match[1] ? Number(match[1]) : 0;\n  var to = span ? span.end : match[2] && match[1] ? Number(match[2]) : Number.POSITIVE_INFINITY;\n  var chunks = [];\n  var keptBytes = 0;\n  var size = 0;\n  var reader = body.getReader();\n  while (known === void 0 || size <= to) {\n    var { done, value } = await reader.read();\n    if (done) break;\n    var chunkStart = size;\n    size += value.byteLength;\n    if (suffix) {\n      chunks.push(value);\n      keptBytes += value.byteLength;\n      while (chunks.length > 1 && keptBytes - chunks[0].byteLength >= suffix) {\n        keptBytes -= chunks.shift().byteLength;\n      }\n      continue;\n    }\n    var lo = Math.max(from, chunkStart);\n    var hi = Math.min(to + 1, size);\n    if (hi > lo) {\n      chunks.push(value.subarray(lo - chunkStart, hi - chunkStart));\n      keptBytes += hi - lo;\n    }\n  }\n  if (known !== void 0) {\n    await reader.cancel();\n    size = known;\n  }\n  var kept = new Uint8Array(keptBytes);\n  var at = 0;\n  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;\n  try {\n    for (var _iterator = chunks[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {\n      var chunk = _step.value;\n      kept.set(chunk, at);\n      at += chunk.byteLength;\n    }\n  } catch (err) {\n    _didIteratorError = true;\n    _iteratorError = err;\n  } finally {\n    try {\n      if (!_iteratorNormalCompletion && _iterator.return != null) {\n        _iterator.return();\n      }\n    } finally {\n      if (_didIteratorError) {\n        throw _iteratorError;\n      }\n    }\n  }\n  return {\n    size,\n    kept,\n    keptStart: suffix ? size - keptBytes : from\n  };\n}\nexport {\n  withRange\n};\n//# sourceMappingURL=assetRange.js.map\n"],"mappings":"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"}

package/nitrogen/generated/ios/One-Swift-Cxx-Bridge.hpp

@@ -305,9 +305,9 @@ namespace margelo::nitro::one { struct LocationPlace; }
 // Forward declaration of `LocationPosition` to properly resolve imports.
 namespace margelo::nitro::one { struct LocationPosition; }
 // Forward declaration of `LocationRegion` to properly resolve imports.
+namespace margelo::nitro::one { struct LocationRegion; }
 // Forward declaration of `MailComposeResult` to properly resolve imports.
 namespace margelo::nitro::one { enum class MailComposeResult; }
-namespace margelo::nitro::one { struct LocationRegion; }
 // Forward declaration of `MapCoordinate` to properly resolve imports.
 namespace margelo::nitro::one { struct MapCoordinate; }
 // Forward declaration of `MapPlace` to properly resolve imports.
@@ -1736,15 +1736,6 @@ namespace margelo::nitro::one::bridge::swift {
   inline Result_std__shared_ptr_Promise_AudioRecordingResult___ create_Result_std__shared_ptr_Promise_AudioRecordingResult___(const std::exception_ptr& error) noexcept {
     return Result<std::shared_ptr<Promise<AudioRecordingResult>>>::withError(error);
   }
-
-  // pragma MARK: Result<std::string>
-  using Result_std__string_ = Result<std::string>;
-  inline Result_std__string_ create_Result_std__string_(const std::string& value) noexcept {
-    return Result<std::string>::withValue(value);
-  }
-  inline Result_std__string_ create_Result_std__string_(const std::exception_ptr& error) noexcept {
-    return Result<std::string>::withError(error);
-  }
   
   // pragma MARK: Result<std::string>
   using Result_std__string_ = Result<std::string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "description": "One is a React framework for web, iOS, and Android apps.",
   "license": "BSD-3-Clause",
   "sideEffects": [
@@ -236,18 +236,18 @@
     "@react-navigation/native-stack": "8.0.0-alpha.58",
     "@react-navigation/routers": "8.0.0-alpha.20",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/color-scheme": "2.6.4",
-    "@vxrn/compiler": "2.6.4",
-    "@vxrn/resolve": "2.6.4",
-    "@vxrn/tslib-lite": "2.6.4",
-    "@vxrn/use-isomorphic-layout-effect": "2.6.4",
-    "@vxrn/utils": "2.6.4",
-    "@vxrn/vite-plugin-metro": "2.6.4",
+    "@vxrn/color-scheme": "2.6.5",
+    "@vxrn/compiler": "2.6.5",
+    "@vxrn/resolve": "2.6.5",
+    "@vxrn/tslib-lite": "2.6.5",
+    "@vxrn/use-isomorphic-layout-effect": "2.6.5",
+    "@vxrn/utils": "2.6.5",
+    "@vxrn/vite-plugin-metro": "2.6.5",
     "babel-dead-code-elimination": "1.0.10",
     "babel-plugin-module-resolver": "^5.0.2",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "2.6.4",
+    "create-vxrn": "2.6.5",
     "escape-string-regexp": "^5.0.0",
     "fast-deep-equal": "^3.1.3",
     "fast-glob": "^3.3.3",
@@ -269,7 +269,7 @@
     "tsconfig-paths": "^4",
     "use-latest-callback": "^0.2.3",
     "vite": "^8.2.2",
-    "vxrn": "2.6.4",
+    "vxrn": "2.6.5",
     "web-streams-polyfill": "^4.3.0",
     "ws": "^8.21.0",
     "xxhashjs": "^0.2.2"
@@ -337,7 +337,7 @@
     "@types/react-dom": "^19.2.2",
     "@types/react-test-renderer": "^19.1.0",
     "@types/xxhashjs": "^0.2.4",
-    "@vxrn/emitter": "2.6.4",
+    "@vxrn/emitter": "2.6.5",
     "depcheck": "^1.4.7",
     "esbuild": "^0.25.12",
     "immer": "^10.1.1",
@@ -513,7 +513,7 @@
       }
     }
   },
-  "releaseSourceCommit": "998d85218a91e5b25b16853238342fa410403e4d",
+  "releaseSourceCommit": "97c5295fca304e7fc443ed228f087c51dc63bc69",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/onejs/one.git",

package/src/server/assetRange.test.ts

@@ -4,12 +4,13 @@ import { withRange } from './assetRange'
 const bytes = Uint8Array.from({ length: 100 }, (_, i) => i)
 
 // the assets binding streams in chunks; split so ranges cross chunk edges
-function asset(headers: Record<string, string> = {}) {
+function asset(headers: Record<string, string> = {}, pulled = { chunks: 0 }) {
   const chunks = [bytes.slice(0, 30), bytes.slice(30, 70), bytes.slice(70)]
   const body = new ReadableStream<Uint8Array>({
-    start(controller) {
-      for (const chunk of chunks) controller.enqueue(chunk)
-      controller.close()
+    pull(controller) {
+      const chunk = chunks[pulled.chunks++]
+      if (chunk) controller.enqueue(chunk)
+      else controller.close()
     },
   })
   return new Response(body, {
@@ -19,8 +20,8 @@ function asset(headers: Record<string, string> = {}) {
   })
 }
 
-function get(range?: string) {
-  return new Request('https://x.test/a.webm', range ? { headers: { range } } : {})
+function get(range?: string, headers: Record<string, string> = {}) {
+  return new Request('https://x.test/a.webm', { headers: range ? { range, ...headers } : headers })
 }
 
 async function body(response: Response) {
@@ -57,10 +58,49 @@ describe('withRange', () => {
     expect(await body(clamped)).toEqual([98, 99])
   })
 
-  it('answers 416 past the end', async () => {
-    const res = await withRange(get('bytes=100-'), asset())
-    expect(res.status).toBe(416)
-    expect(res.headers.get('content-range')).toBe('bytes */100')
+  it('answers 416 past the end without the full length', async () => {
+    for (const headers of [{}, { 'content-length': '100' }] as Record<string, string>[]) {
+      const res = await withRange(get('bytes=100-'), asset(headers))
+      expect(res.status).toBe(416)
+      expect(res.headers.get('content-range')).toBe('bytes */100')
+      expect(res.headers.get('content-length')).toBeNull()
+      expect(await body(res)).toEqual([])
+    }
+  })
+
+  it('streams only the requested bytes when the length is known', async () => {
+    const pulled = { chunks: 0 }
+    const res = await withRange(get('bytes=0-1'), asset({ 'content-length': '100' }, pulled))
+    expect(res.status).toBe(206)
+    expect(res.headers.get('content-range')).toBe('bytes 0-1/100')
+    expect(res.headers.get('content-length')).toBe('2')
+    expect(await body(res)).toEqual([0, 1])
+    expect(pulled.chunks).toBeLessThan(3)
+
+    const cross = await withRange(get('bytes=25-74'), asset({ 'content-length': '100' }))
+    expect(await body(cross)).toEqual(Array.from(bytes.slice(25, 75)))
+
+    const suffix = await withRange(get('bytes=-5'), asset({ 'content-length': '100' }))
+    expect(suffix.headers.get('content-range')).toBe('bytes 95-99/100')
+    expect(await body(suffix)).toEqual([95, 96, 97, 98, 99])
+  })
+
+  it('honors If-Range only for a matching strong validator', async () => {
+    const tagged = { etag: '"new"', 'last-modified': 'Mon, 12 Oct 2026 00:00:00 GMT' }
+    const fresh = await withRange(get('bytes=0-1', { 'if-range': '"new"' }), asset(tagged))
+    expect(fresh.status).toBe(206)
+    const date = await withRange(
+      get('bytes=0-1', { 'if-range': 'Mon, 12 Oct 2026 00:00:00 GMT' }),
+      asset(tagged)
+    )
+    expect(date.status).toBe(206)
+
+    for (const ifRange of ['"old"', 'W/"new"', 'Sun, 11 Oct 2026 00:00:00 GMT']) {
+      const response = asset(tagged)
+      expect(await withRange(get('bytes=0-1', { 'if-range': ifRange }), response)).toBe(response)
+    }
+    const weak = asset({ etag: 'W/"new"' })
+    expect(await withRange(get('bytes=0-1', { 'if-range': 'W/"new"' }), weak)).toBe(weak)
   })
 
   it('keeps the full response without a usable single range', async () => {

package/src/server/assetRange.ts

@@ -1,15 +1,17 @@
 // cloudflare's assets binding ignores Range and always answers 200 with the
-// whole file and no content-length, which safari refuses for <video>. this
-// reads that full response and answers the 206 (or 416) the browser asked
-// for. multi-range requests keep the full 200, which http allows.
+// whole file, usually with no content-length, which safari refuses for
+// <video>. this answers the 206 (or 416) the browser asked for. multi-range
+// requests and stale If-Range validators keep the full 200, which http allows.
 export async function withRange(request: Request, response: Response): Promise<Response> {
   const range = request.headers.get('range')
   if (
     !range ||
     request.method !== 'GET' ||
     response.status !== 200 ||
+    !response.body ||
     response.headers.has('content-range') ||
-    response.headers.has('content-encoding')
+    response.headers.has('content-encoding') ||
+    !ifRangeMatches(request.headers.get('if-range'), response.headers)
   ) {
     return response
   }
@@ -17,9 +19,43 @@ export async function withRange(request: Request, response: Response): Promise<R
   const match = /^bytes=(\d*)-(\d*)$/.exec(range.trim())
   if (!match || (!match[1] && !match[2])) return response
 
-  const bytes = new Uint8Array(await response.arrayBuffer())
-  const size = bytes.byteLength
+  const length = response.headers.get('content-length')
+  const known = length && /^\d+$/.test(length) ? Number(length) : undefined
 
+  const headers = new Headers(response.headers)
+  headers.set('accept-ranges', 'bytes')
+  headers.delete('content-length')
+
+  // only the requested bytes are kept in memory. with a known size reading
+  // stops after them; without one the size only comes from reading to the end
+  const { size, kept, keptStart } = await readRange(response.body, match, known)
+  const span = resolve(match, size)
+  if (!span) {
+    headers.set('content-range', `bytes */${size}`)
+    return new Response(null, { status: 416, headers })
+  }
+  headers.set('content-range', `bytes ${span.start}-${span.end}/${size}`)
+  headers.set('content-length', String(span.end - span.start + 1))
+  return new Response(kept.subarray(span.start - keptStart, span.end - keptStart + 1), {
+    status: 206,
+    headers,
+  })
+}
+
+// rfc 9110 13.1.5: honor the range only when the validator still matches,
+// using a strong etag comparison or an exact last-modified date
+function ifRangeMatches(ifRange: string | null, headers: Headers) {
+  if (!ifRange) return true
+  const value = ifRange.trim()
+  if (value.startsWith('"')) {
+    const etag = headers.get('etag')
+    return !!etag && !etag.startsWith('W/') && etag === value
+  }
+  if (value.startsWith('W/')) return false
+  return headers.get('last-modified') === value
+}
+
+function resolve(match: RegExpExecArray, size: number) {
   let start: number
   let end: number
   if (!match[1]) {
@@ -30,16 +66,56 @@ export async function withRange(request: Request, response: Response): Promise<R
     start = Number(match[1])
     end = match[2] ? Math.min(Number(match[2]), size - 1) : size - 1
   }
+  if (start >= size || start > end) return
+  return { start, end }
+}
 
-  const headers = new Headers(response.headers)
-  headers.set('accept-ranges', 'bytes')
+async function readRange(
+  body: ReadableStream<Uint8Array>,
+  match: RegExpExecArray,
+  known: number | undefined
+) {
+  const span = known === undefined ? undefined : (resolve(match, known) ?? { start: known, end: -1 })
+  // an unknown-size suffix range keeps a rolling tail of the requested length
+  const suffix = !span && !match[1] ? Number(match[2]) : 0
+  const from = span ? span.start : match[1] ? Number(match[1]) : 0
+  const to = span ? span.end : match[2] && match[1] ? Number(match[2]) : Number.POSITIVE_INFINITY
 
-  if (start >= size || start > end) {
-    headers.set('content-range', `bytes */${size}`)
-    return new Response(null, { status: 416, headers })
+  const chunks: Uint8Array[] = []
+  let keptBytes = 0
+  let size = 0
+  const reader = body.getReader()
+  while (known === undefined || size <= to) {
+    const { done, value } = await reader.read()
+    if (done) break
+    const chunkStart = size
+    size += value.byteLength
+    if (suffix) {
+      chunks.push(value)
+      keptBytes += value.byteLength
+      // drop whole chunks that fall before the rolling tail
+      while (chunks.length > 1 && keptBytes - chunks[0].byteLength >= suffix) {
+        keptBytes -= chunks.shift()!.byteLength
+      }
+      continue
+    }
+    const lo = Math.max(from, chunkStart)
+    const hi = Math.min(to + 1, size)
+    if (hi > lo) {
+      chunks.push(value.subarray(lo - chunkStart, hi - chunkStart))
+      keptBytes += hi - lo
+    }
+  }
+  if (known !== undefined) {
+    await reader.cancel()
+    size = known
   }
 
-  headers.set('content-range', `bytes ${start}-${end}/${size}`)
-  headers.set('content-length', String(end - start + 1))
-  return new Response(bytes.subarray(start, end + 1), { status: 206, headers })
+  const kept = new Uint8Array(keptBytes)
+  let at = 0
+  for (const chunk of chunks) {
+    kept.set(chunk, at)
+    at += chunk.byteLength
+  }
+  return { size, kept, keptStart: suffix ? size - keptBytes : from }
 }

package/types/server/assetRange.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assetRange.d.ts","sourceRoot":"","sources":["../../src/server/assetRange.ts"],"names":[],"mappings":"AAIA,wBAAsB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAwCvF"}
+{"version":3,"file":"assetRange.d.ts","sourceRoot":"","sources":["../../src/server/assetRange.ts"],"names":[],"mappings":"AAIA,wBAAsB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAsCvF"}