sendfile error handling and more exit handlers

Author: Arlen22

packages/events/src/index.ts

@@ -22,10 +22,8 @@ export class ServerEvents extends EventEmitter<ServerEventsMap> {
     eventName: keyof ServerEventsMap | K,
     ...args: K extends keyof ServerEventsMap ? ServerEventsMap[K] : never
   ) {
-    // console.log(eventName);
-    // console.time(eventName as string);
+    // the node implementation handles once in the once handler, not in emit
     await Promise.all(this.listeners(eventName).map(e => e(...args)));
-    // console.timeEnd(eventName as string);
   }
 }
 

packages/server/src/index.ts

@@ -8,6 +8,7 @@ import type { Http2ServerRequest, Http2ServerResponse } from "http2";
 import type { ServerRequest } from "./StateObject";
 import { Z2, zod as z } from "./Z2";
 import { dump } from "wtfnode";
+import { caughtPromise } from "./utils";
 
 export * from "./listeners";
 export * from "./router";
@@ -28,12 +29,7 @@ export async function startup() {
 
 }
 
-function caughtPromise<F extends (...args: any) => any>(
-  wrapped: F,
-  onrejected: (reason: any) => ReturnType<F>
-): (...args: Parameters<F>) => ReturnType<F> {
-  return (...args: Parameters<F>) => wrapped(...args).catch(onrejected);
-}
+
 
 
 let exiting = false;

packages/server/src/listeners.ts

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { ok } from "node:assert";
 import { createServer, IncomingMessage, Server, ServerResponse } from "node:http";
-import { createSecureServer, Http2SecureServer, Http2ServerRequest, Http2ServerResponse, SecureServerOptions } from "node:http2";
+import { createSecureServer, Http2SecureServer, Http2ServerRequest, Http2ServerResponse, Http2Session, SecureServerOptions } from "node:http2";
 import { Router } from "./router";
 import { serverEvents } from '@tiddlywiki/events';
 import { GenericRequest, GenericResponse } from './streamer';
@@ -23,6 +23,7 @@ export class ListenerBase {
     ) => {
       this.handleRequest(req, res);
     });
+
     this.server.on('error', (error: NodeJS.ErrnoException) => {
 
       if (error.syscall !== 'listen') {
@@ -79,7 +80,11 @@ export class ListenerHTTPS extends ListenerBase {
       return { key, cert, allowHTTP1: true, };
     })();
     super(createSecureServer(options), router, bindInfo, config);
-
+    this.server.on("session", (session: Http2Session) => {
+      const closeSession = () => { session.close(); }
+      serverEvents.on("exit", closeSession);
+      session.on("close", () => { serverEvents.off("exit", closeSession); })
+    });
   }
 
 }

packages/server/src/streamer.ts

@@ -2,7 +2,7 @@ import * as http2 from 'node:http2';
 import send, { SendOptions } from 'send';
 import { Readable } from 'stream';
 import { IncomingMessage, ServerResponse, IncomingHttpHeaders as NodeIncomingHeaders, OutgoingHttpHeaders, OutgoingHttpHeader } from 'node:http';
-import { is } from './utils';
+import { caughtPromise, is } from './utils';
 import { createReadStream } from 'node:fs';
 import { Writable } from 'node:stream';
 import Debug from "debug";
@@ -361,19 +361,32 @@ export class Streamer {
     });
     return new Promise<typeof STREAM_ENDED>((resolve, reject) => {
 
-      sender.on("error", (err) => Promise.resolve().then(async (): Promise<typeof STREAM_ENDED> => {
+      sender.on("error", caughtPromise(async (err) => {
+        interface SendError {
+          errno: -2,
+          code: 'ENOENT',
+          syscall: 'stat',
+          /** The absolute file path that was resolved and didn't exist */
+          path: string,
+          expose: boolean,
+          /** status and statusCode are identical */
+          statusCode: number,
+          /** status and statusCode are identical */
+          status: number
+        }
         if (err === 404 || err?.statusCode === 404) {
-          return (await on404?.()) ?? this.sendEmpty(404);
+          if (on404) on404();
+          else this.sendEmpty(404);
         } else {
           console.log(err);
-          throw this.sendEmpty(500);
+          this.sendEmpty(500);
         }
-      }).then(resolve, reject));
+      }, reject));
 
-      sender.on("directory", () => Promise.resolve().then(async (): Promise<typeof STREAM_ENDED> => {
-        return (await onDir?.())
-          ?? this.sendEmpty(404, { "x-reason": "Directory listing not allowed" })
-      }).then(resolve, reject));
+      sender.on("directory", caughtPromise(async () => {
+        if (onDir) onDir();
+        else this.sendEmpty(404, { "x-reason": "Directory listing not allowed" })
+      }, reject));
 
       sender.on("stream", (fileStream) => {
         this.compressor.beforeWriteHead();

packages/server/src/utils.ts

@@ -156,4 +156,9 @@ export declare interface JsonArray extends Array<JsonValue> { }
 export declare type JsonObject = { [Key in string]?: JsonValue; };
 export declare type JsonValue = string | number | boolean | JsonObject | JsonArray | null | Date;
 
-
+export function caughtPromise<F extends (...args: any) => any, C extends (reason: any) => any>(
+  wrapped: F,
+  onrejected: C
+): (...args: Parameters<F>) => ReturnType<F | C> {
+  return (...args: Parameters<F>) => wrapped(...args).catch(onrejected);
+}