@travetto/web-http 7.1.3 → 8.0.0-alpha.0

package/README.md

@@ -126,20 +126,20 @@ export class WebHttpConfig {
   async postConstruct(): Promise<void> {
     this.tls ??= (this.httpVersion === '2' || !!this.tlsKeys);
     this.port = (this.port < 0 ? await NetUtil.getFreePort() : this.port);
-    this.bindAddress ||= await NetUtil.getLocalAddress();
+    this.bindAddress ||= NetUtil.getLocalAddress();
 
     if (!this.tls) {
       // Clear out keys if tls is not set
       this.tlsKeys = undefined;
     } else if (!this.tlsKeys) {
       if (Runtime.production) {
-        throw new AppError('Default tls keys are only valid for development use, please specify a config value at web.tls.keys');
+        throw new RuntimeError('Default tls keys are only valid for development use, please specify a config value at web.tls.keys');
       }
       this.tlsKeys = await WebTlsUtil.generateKeyPair();
     } else {
       if (this.tlsKeys.key.length < 100) { // We have files or resources
-        this.tlsKeys.key = (await RuntimeResources.read(this.tlsKeys.key, true)).toString('utf8');
-        this.tlsKeys.cert = (await RuntimeResources.read(this.tlsKeys.cert, true)).toString('utf8');
+        this.tlsKeys.key = await RuntimeResources.readText(this.tlsKeys.key);
+        this.tlsKeys.cert = await RuntimeResources.readText(this.tlsKeys.cert);
       }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/web-http",
-  "version": "7.1.3",
+  "version": "8.0.0-alpha.0",
   "type": "module",
   "description": "Web HTTP Server Support",
   "keywords": [
@@ -27,11 +27,11 @@
     "directory": "module/web-http"
   },
   "dependencies": {
-    "@travetto/web": "^7.1.3"
+    "@travetto/web": "^8.0.0-alpha.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.1.3",
-    "@travetto/test": "^7.1.3"
+    "@travetto/cli": "^8.0.0-alpha.0",
+    "@travetto/test": "^8.0.0-alpha.0"
   },
   "peerDependenciesMeta": {
     "@travetto/test": {

package/src/config.ts

@@ -1,6 +1,6 @@
 import { Config, EnvVar } from '@travetto/config';
 import { Ignore, Secret } from '@travetto/schema';
-import { AppError, Runtime, RuntimeResources } from '@travetto/runtime';
+import { RuntimeError, Runtime, RuntimeResources } from '@travetto/runtime';
 import { NetUtil } from '@travetto/web';
 
 import type { WebSecureKeyPair } from './types.ts';
@@ -48,20 +48,20 @@ export class WebHttpConfig {
   async postConstruct(): Promise<void> {
     this.tls ??= (this.httpVersion === '2' || !!this.tlsKeys);
     this.port = (this.port < 0 ? await NetUtil.getFreePort() : this.port);
-    this.bindAddress ||= await NetUtil.getLocalAddress();
+    this.bindAddress ||= NetUtil.getLocalAddress();
 
     if (!this.tls) {
       // Clear out keys if tls is not set
       this.tlsKeys = undefined;
     } else if (!this.tlsKeys) {
       if (Runtime.production) {
-        throw new AppError('Default tls keys are only valid for development use, please specify a config value at web.tls.keys');
+        throw new RuntimeError('Default tls keys are only valid for development use, please specify a config value at web.tls.keys');
       }
       this.tlsKeys = await WebTlsUtil.generateKeyPair();
     } else {
       if (this.tlsKeys.key.length < 100) { // We have files or resources
-        this.tlsKeys.key = (await RuntimeResources.read(this.tlsKeys.key, true)).toString('utf8');
-        this.tlsKeys.cert = (await RuntimeResources.read(this.tlsKeys.cert, true)).toString('utf8');
+        this.tlsKeys.key = await RuntimeResources.readText(this.tlsKeys.key);
+        this.tlsKeys.cert = await RuntimeResources.readText(this.tlsKeys.cert);
       }
     }
 

package/src/http.ts

@@ -2,11 +2,10 @@ import type net from 'node:net';
 import http from 'node:http';
 import http2 from 'node:http2';
 import https from 'node:https';
-import { pipeline } from 'node:stream/promises';
 import { TLSSocket } from 'node:tls';
 
 import { WebBodyUtil, WebCommonUtil, type WebDispatcher, WebRequest, WebResponse } from '@travetto/web';
-import { BinaryUtil, castTo, ShutdownManager } from '@travetto/runtime';
+import { type BinaryType, BinaryUtil, castTo, ShutdownManager } from '@travetto/runtime';
 
 import type { WebSecureKeyPair, WebServerHandle } from './types.ts';
 
@@ -119,7 +118,7 @@ export class WebHttpUtil {
         httpQuery: Object.fromEntries(new URLSearchParams(query)),
       },
       headers: request.headers,
-      body: WebBodyUtil.markRaw(request)
+      body: WebBodyUtil.markRawBinary(request)
     });
   }
 
@@ -127,18 +126,14 @@ export class WebHttpUtil {
    * Send WebResponse to outbound http response
    */
   static async respondToServerResponse(webResponse: WebResponse, response: HttpResponse): Promise<void> {
-    const binaryResponse = new WebResponse({ context: webResponse.context, ...WebBodyUtil.toBinaryMessage(webResponse) });
+    const binaryResponse = new WebResponse<BinaryType>({ context: webResponse.context, ...WebBodyUtil.toBinaryMessage(webResponse) });
     binaryResponse.headers.forEach((value, key) => response.setHeader(key, value));
     response.statusCode = WebCommonUtil.getStatusCode(binaryResponse);
-    const body = binaryResponse.body;
 
-    if (BinaryUtil.isReadable(body)) {
-      await pipeline(body, response);
-    } else {
-      if (body) {
-        // Weird type union that http2 uses
-        'stream' in response ? response.write(body) : response.write(body);
-      }
+    if (binaryResponse.body) {
+      await BinaryUtil.pipeline(binaryResponse.body, response);
+    }
+    if (!response.closed) {
       response.end();
     }
   }

package/src/tls.ts

@@ -1,4 +1,3 @@
-import { PackageUtil } from '@travetto/manifest';
 import { Runtime } from '@travetto/runtime';
 
 import type { WebSecureKeyPair } from './types.ts';
@@ -18,7 +17,7 @@ export class WebTlsUtil {
     try {
       forge = (await import('node-forge')).default;
     } catch {
-      const install = PackageUtil.getInstallCommand(Runtime, 'node-forge');
+      const install = Runtime.getInstallCommand('node-forge');
       throw new Error(`In order to generate TLS keys, you must install node-forge, "${install}"`);
     }
 

package/support/test/dispatcher.ts

@@ -1,16 +1,11 @@
-import type { Readable } from 'node:stream';
-import { buffer } from 'node:stream/consumers';
-
 import { Inject, Injectable } from '@travetto/di';
 import { type WebFilterContext, WebResponse, type WebDispatcher, WebBodyUtil } from '@travetto/web';
-import { castTo } from '@travetto/runtime';
+import { BinaryUtil, castTo } from '@travetto/runtime';
 
 import { WebTestDispatchUtil } from '@travetto/web/support/test/dispatch-util.ts';
 
 import type { WebHttpConfig } from '../../src/config.ts';
 
-const toBuffer = (src: Buffer | Readable) => Buffer.isBuffer(src) ? src : buffer(src);
-
 /**
  * Support for invoking http requests against the server
  */
@@ -23,7 +18,9 @@ export class FetchWebDispatcher implements WebDispatcher {
   async dispatch({ request }: WebFilterContext): Promise<WebResponse> {
     const baseRequest = await WebTestDispatchUtil.applyRequestBody(request);
     const finalPath = WebTestDispatchUtil.buildPath(baseRequest);
-    const body: RequestInit['body'] = WebBodyUtil.isRaw(request.body) ? await toBuffer(request.body) : castTo(request.body);
+    const body: RequestInit['body'] = WebBodyUtil.isRawBinary(request.body) ?
+      await BinaryUtil.toBinaryArray(request.body) :
+      castTo(request.body);
     const { context: { httpMethod: method }, headers } = request;
 
     const response = await fetch(
@@ -33,7 +30,7 @@ export class FetchWebDispatcher implements WebDispatcher {
 
     return await WebTestDispatchUtil.finalizeResponseBody(
       new WebResponse({
-        body: Buffer.from(await response.arrayBuffer()),
+        body: await response.arrayBuffer(),
         context: { httpStatusCode: response.status },
         headers: response.headers
       })