fix: end timer on stream end or error

lib/handlers/map.get.js

@@ -96,12 +96,19 @@ const MapGet = class MapGet {
 			} else {
 				outgoing.statusCode = 200;
 				outgoing.stream = file.stream;
+
+				outgoing.stream.on("error", (err) => {
+					this._log.info(`map:get - File stream error - ${err}`);
+					end({ labels: { success: false, status: 503, type: "map" } });
+				});
+
+				outgoing.stream.on("end", () => {
+					end({ labels: { status: outgoing.statusCode, type: "map" } });
+				});
 			}
 
 			this._log.debug(`map:get - Import map found - Pathname: ${path}`);
 
-			end({ labels: { status: outgoing.statusCode, type: "map" } });
-
 			return outgoing;
 			// eslint-disable-next-line no-unused-vars
 		} catch (error) {

lib/handlers/pkg.get.js

@@ -105,12 +105,19 @@ const PkgGet = class PkgGet {
 			} else {
 				outgoing.statusCode = 200;
 				outgoing.stream = file.stream;
+
+				outgoing.stream.on("error", (err) => {
+					this._log.info(`pkg:get - File stream error - ${err}`);
+					end({ labels: { success: false, status: 503, type } });
+				});
+
+				outgoing.stream.on("end", () => {
+					end({ labels: { status: outgoing.statusCode, type } });
+				});
 			}
 
 			this._log.debug(`pkg:get - Asset found - Pathname: ${path}`);
 
-			end({ labels: { status: outgoing.statusCode, type } });
-
 			return outgoing;
 			// eslint-disable-next-line no-unused-vars
 		} catch (error) {

lib/handlers/pkg.log.js

@@ -98,12 +98,19 @@ const PkgLog = class PkgLog {
 			} else {
 				outgoing.statusCode = 200;
 				outgoing.stream = file.stream;
+
+				outgoing.stream.on("error", (err) => {
+					this._log.info(`pkg:log - File stream error - ${err}`);
+					end({ labels: { success: false, status: 503, type } });
+				});
+
+				outgoing.stream.on("end", () => {
+					end({ labels: { status: outgoing.statusCode, type } });
+				});
 			}
 
 			this._log.debug(`pkg:log - Package log found - Pathname: ${path}`);
 
-			end({ labels: { status: outgoing.statusCode, type } });
-
 			return outgoing;
 			// eslint-disable-next-line no-unused-vars
 		} catch (error) {

lib/handlers/versions.get.js

@@ -90,12 +90,19 @@ const VersionsGet = class VersionsGet {
 			} else {
 				outgoing.statusCode = 200;
 				outgoing.stream = file.stream;
+
+				outgoing.stream.on("error", (err) => {
+					this._log.info(`pkg:latest - File stream error - ${err}`);
+					end({ labels: { success: false, status: 503, type } });
+				});
+
+				outgoing.stream.on("end", () => {
+					end({ labels: { status: outgoing.statusCode, type } });
+				});
 			}
 
 			this._log.debug(`pkg:latest - Package log found - Pathname: ${path}`);
 
-			end({ labels: { status: outgoing.statusCode, type } });
-
 			return outgoing;
 			// eslint-disable-next-line no-unused-vars
 		} catch (error) {

lib/sinks/test.js

@@ -13,6 +13,8 @@ const DEFAULT_ROOT_PATH = "/eik";
  * @deprecated Use eik/sink-memory or implement your own. This class will be removed in a future version of core.
  */
 export default class SinkTest extends Sink {
+	readDelay = 0;
+
 	constructor({ rootPath = DEFAULT_ROOT_PATH } = {}) {
 		super();
 		this._rootPath = rootPath;
@@ -193,12 +195,22 @@ export default class SinkTest extends Sink {
 				etag: entry.hash,
 			});
 
+			const readDelay = this.readDelay;
 			file.stream = new Readable({
 				read() {
-					payload.forEach((item) => {
-						this.push(item);
-					});
-					this.push(null);
+					if (readDelay) {
+						setTimeout(() => {
+							payload.forEach((item) => {
+								this.push(item);
+							});
+							this.push(null);
+						}, readDelay);
+					} else {
+						payload.forEach((item) => {
+							this.push(item);
+						});
+						this.push(null);
+					}
 				},
 			});
 

test/handlers/pkg.get.js

@@ -33,6 +33,7 @@ const Request = class Request extends PassThrough {
 
 tap.test("pkg.get() - URL parameters is URL encoded", async (t) => {
 	const sink = new Sink();
+	sink.readDelay = 10_000;
 	sink.set("/local/pkg/@foo/bar-lib/8.1.4-1/foo/main.js", "payload");
 
 	const h = new Handler({ sink });