@travetto/web 6.0.2 → 6.0.3

package/README.md

@@ -2,7 +2,7 @@
 <!-- Please modify https://github.com/travetto/travetto/tree/main/module/web/DOC.tsx and execute "npx trv doc" to rebuild -->
 # Web API
 
-## Declarative support creating for Web Applications
+## Declarative support for creating Web Applications
 
 **Install: @travetto/web**
 ```bash

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@travetto/web",
-  "version": "6.0.2",
-  "description": "Declarative support creating for Web Applications",
+  "version": "6.0.3",
+  "description": "Declarative support for creating Web Applications",
   "keywords": [
     "web",
     "decorators",
@@ -25,18 +25,18 @@
     "directory": "module/web"
   },
   "dependencies": {
-    "@travetto/config": "^6.0.0",
-    "@travetto/context": "^6.0.0",
-    "@travetto/di": "^6.0.0",
-    "@travetto/registry": "^6.0.0",
-    "@travetto/runtime": "^6.0.0",
-    "@travetto/schema": "^6.0.0",
+    "@travetto/config": "^6.0.1",
+    "@travetto/context": "^6.0.1",
+    "@travetto/di": "^6.0.1",
+    "@travetto/registry": "^6.0.1",
+    "@travetto/runtime": "^6.0.1",
+    "@travetto/schema": "^6.0.1",
     "find-my-way": "^9.3.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^6.0.0",
-    "@travetto/test": "^6.0.1",
-    "@travetto/transformer": "^6.0.0"
+    "@travetto/cli": "^6.0.1",
+    "@travetto/test": "^6.0.2",
+    "@travetto/transformer": "^6.0.1"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/types/headers.ts

@@ -15,7 +15,7 @@ export class WebHeaders extends Headers {
 
     if (o && !passed) {
       for (const [k, v] of (Array.isArray(o) ? o : Object.entries(o))) {
-        if (v !== undefined && v !== null) {
+        if (v !== undefined && v !== null && !k.startsWith(':')) {
           this.append(k, castTo(v));
         }
       }

package/src/util/common.ts

@@ -24,13 +24,13 @@ const ERROR_CATEGORY_STATUS: Record<ErrorCategory, number> = {
   unavailable: 503,
 };
 
-export class WebCommonUtil {
-  static #unitMapping: Record<string, number> = {
-    kb: 2 ** 10,
-    mb: 2 ** 20,
-    gb: 2 ** 30,
-  };
+const UNIT_MAPPING: Record<string, number> = {
+  kb: 2 ** 10,
+  mb: 2 ** 20,
+  gb: 2 ** 30,
+};
 
+export class WebCommonUtil {
   static #convert(rule: string): RegExp {
     const core = (rule.endsWith('/*') || !rule.includes('/')) ?
       `${rule.replace(/[/].{0,20}$/, '')}\/.*` : rule;
@@ -148,6 +148,6 @@ export class WebCommonUtil {
       return input;
     }
     const [, num, unit] = input.toLowerCase().split(/(\d+)/);
-    return parseInt(num, 10) * (this.#unitMapping[unit] ?? 1);
+    return parseInt(num, 10) * (UNIT_MAPPING[unit] ?? 1);
   }
 }

package/src/util/net.ts

@@ -58,4 +58,18 @@ export class NetUtil {
 
     return useIPv4 ? '0.0.0.0' : '::';
   }
+
+  /**
+   * Free a port if it is in use, typically used to resolve port conflicts.
+   * @param err The error that may indicate a port conflict
+   * @returns Returns true if the port was freed, false if not handled
+   */
+  static async freePortOnConflict(err: unknown): Promise<boolean> {
+    if (NetUtil.isPortUsedError(err) && typeof err.port === 'number') {
+      await NetUtil.freePort(err.port);
+      return true;
+    } else {
+      return false;
+    }
+  }
 }

package/support/test/dispatch-util.ts

@@ -64,30 +64,11 @@ export class WebTestDispatchUtil {
     return response;
   }
 
-  static async toFetchRequestInit(request: WebRequest): Promise<{ init: RequestInit, path: string }> {
-    const { context: { httpQuery: query, httpMethod: method, path }, headers } = request;
-
-    let q = '';
-    if (query && Object.keys(query).length) {
-      const pairs = Object.fromEntries(Object.entries(query).map(([k, v]) => [k, v === null || v === undefined ? '' : `${v}`] as const));
-      q = `?${new URLSearchParams(pairs).toString()}`;
+  static buildPath(request: WebRequest): string {
+    const params = new URLSearchParams();
+    for (const [k, v] of Object.entries(request.context.httpQuery ?? {})) {
+      params.set(k, v === null || v === undefined ? '' : `${v}`);
     }
-
-    const finalPath = `${path}${q}`;
-
-    const body: RequestInit['body'] =
-      WebBodyUtil.isRaw(request.body) ?
-        await toBuffer(request.body) :
-        castTo(request.body);
-
-    return { path: finalPath, init: { headers, method, body } };
-  }
-
-  static async fromFetchResponse(response: Response): Promise<WebResponse> {
-    return new WebResponse({
-      body: Buffer.from(await response.arrayBuffer()),
-      context: { httpStatusCode: response.status },
-      headers: response.headers
-    });
+    return [request.context.path, params.toString()].join('?').replace(/[?]$/, '');
   }
 }

package/support/test/suite/base.ts

@@ -18,7 +18,7 @@ export class WebTestConfig implements ConfigSource {
           cookie: { secure: false },
           trustProxy: { ips: ['*'] },
           http: {
-            ssl: { active: false },
+            tls: false,
             port: -1,
           },
           etag: {