@travetto/web-http 7.0.0-rc.3 → 7.0.0-rc.5

package/README.md

@@ -41,7 +41,6 @@ Initialized {
     env: 'local',
     debug: false,
     production: false,
-    dynamic: false,
     resourcePaths: [
       './doc-exec/resources'
     ],
@@ -212,7 +211,6 @@ Initialized {
     env: 'prod',
     debug: false,
     production: true,
-    dynamic: false,
     resourcePaths: [
       './doc-exec/resources'
     ],
@@ -297,7 +295,7 @@ export class WebHttpUtil {
    * Build a simple request handler
    * @param dispatcher
    */
-  static buildHandler(dispatcher: WebDispatcher): (req: HttpRequest, res: HttpResponse) => Promise<void>;
+  static buildHandler(dispatcher: WebDispatcher): (request: HttpRequest, response: HttpResponse) => Promise<void>;
   /**
    * Start an http server
    */
@@ -305,11 +303,11 @@ export class WebHttpUtil {
   /**
    * Create a WebRequest given an incoming http request
    */
-  static toWebRequest(req: HttpRequest): WebRequest;
+  static toWebRequest(request: HttpRequest): WebRequest;
   /**
    * Send WebResponse to outbound http response
    */
-  static async respondToServerResponse(webRes: WebResponse, res: HttpResponse): Promise<void>;
+  static async respondToServerResponse(webResponse: WebResponse, response: HttpResponse): Promise<void>;
 }
 ```
 
@@ -317,11 +315,11 @@ Specifically, looking at `buildHandler`,
 
 **Code: Web Http Utilities**
 ```typescript
-static buildHandler(dispatcher: WebDispatcher): (req: HttpRequest, res: HttpResponse) => Promise<void> {
-    return async (req: HttpRequest, res: HttpResponse): Promise<void> => {
-      const request = this.toWebRequest(req);
-      const response = await dispatcher.dispatch({ request });
-      this.respondToServerResponse(response, res);
+static buildHandler(dispatcher: WebDispatcher): (request: HttpRequest, response: HttpResponse) => Promise<void> {
+    return async (request: HttpRequest, response: HttpResponse): Promise<void> => {
+      const webRequest = this.toWebRequest(request);
+      const webResponse = await dispatcher.dispatch({ request: webRequest });
+      this.respondToServerResponse(webResponse, response);
     };
   }
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/web-http",
-  "version": "7.0.0-rc.3",
+  "version": "7.0.0-rc.5",
   "description": "Web HTTP Server Support",
   "keywords": [
     "web",
@@ -26,11 +26,11 @@
     "directory": "module/web-http"
   },
   "dependencies": {
-    "@travetto/web": "^7.0.0-rc.2"
+    "@travetto/web": "^7.0.0-rc.4"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.0.0-rc.1",
-    "@travetto/test": "^7.0.0-rc.1"
+    "@travetto/cli": "^7.0.0-rc.3",
+    "@travetto/test": "^7.0.0-rc.3"
   },
   "peerDependenciesMeta": {
     "@travetto/test": {

package/src/http.ts

@@ -30,11 +30,11 @@ export class WebHttpUtil {
    * Build a simple request handler
    * @param dispatcher
    */
-  static buildHandler(dispatcher: WebDispatcher): (req: HttpRequest, res: HttpResponse) => Promise<void> {
-    return async (req: HttpRequest, res: HttpResponse): Promise<void> => {
-      const request = this.toWebRequest(req);
-      const response = await dispatcher.dispatch({ request });
-      this.respondToServerResponse(response, res);
+  static buildHandler(dispatcher: WebDispatcher): (request: HttpRequest, response: HttpResponse) => Promise<void> {
+    return async (request: HttpRequest, response: HttpResponse): Promise<void> => {
+      const webRequest = this.toWebRequest(request);
+      const webResponse = await dispatcher.dispatch({ request: webRequest });
+      this.respondToServerResponse(webResponse, response);
     };
   }
 
@@ -61,7 +61,7 @@ export class WebHttpUtil {
       }
     }
 
-    const complete = new Promise<void>(r => target.on('close', r));
+    const complete = new Promise<void>(onClose => target.on('close', onClose));
 
     // Track connections for shutdown
     const activeConnections = new Set<HttpSocket>();
@@ -103,43 +103,43 @@ export class WebHttpUtil {
   /**
    * Create a WebRequest given an incoming http request
    */
-  static toWebRequest(req: HttpRequest): WebRequest {
-    const secure = req.socket instanceof TLSSocket;
-    const [path, query] = (req.url ?? '/').split('?') ?? [];
+  static toWebRequest(request: HttpRequest): WebRequest {
+    const secure = request.socket instanceof TLSSocket;
+    const [path, query] = (request.url ?? '/').split('?') ?? [];
     return new WebRequest({
       context: {
         connection: {
-          ip: req.socket.remoteAddress!,
-          host: req.headers.host,
+          ip: request.socket.remoteAddress!,
+          host: request.headers.host,
           httpProtocol: secure ? 'https' : 'http',
-          port: req.socket.localPort
+          port: request.socket.localPort
         },
-        httpMethod: castTo(req.method?.toUpperCase()),
+        httpMethod: castTo(request.method?.toUpperCase()),
         path,
         httpQuery: Object.fromEntries(new URLSearchParams(query)),
       },
-      headers: req.headers,
-      body: WebBodyUtil.markRaw(req)
+      headers: request.headers,
+      body: WebBodyUtil.markRaw(request)
     });
   }
 
   /**
    * Send WebResponse to outbound http response
    */
-  static async respondToServerResponse(webRes: WebResponse, res: HttpResponse): Promise<void> {
-    const binaryResponse = new WebResponse({ context: webRes.context, ...WebBodyUtil.toBinaryMessage(webRes) });
-    binaryResponse.headers.forEach((v, k) => res.setHeader(k, v));
-    res.statusCode = WebCommonUtil.getStatusCode(binaryResponse);
+  static async respondToServerResponse(webResponse: WebResponse, response: HttpResponse): Promise<void> {
+    const binaryResponse = new WebResponse({ 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, res);
+      await pipeline(body, response);
     } else {
       if (body) {
         // Weird type union that http2 uses
-        'stream' in res ? res.write(body) : res.write(body);
+        'stream' in response ? response.write(body) : response.write(body);
       }
-      res.end();
+      response.end();
     }
   }
 }

package/support/cli.web_http.ts

@@ -9,14 +9,14 @@ import type { WebHttpServer } from '../src/types.ts';
 /**
  * Run a web server
  */
-@CliCommand({ runTarget: true, with: { debugIpc: true, canRestart: true, module: true, env: true } })
+@CliCommand({ runTarget: true, with: { debugIpc: true, restartForDev: true, module: true, env: true } })
 export class WebHttpCommand implements CliCommandShape {
 
   /** Port to run on */
   port?: number;
 
   /** Kill conflicting port owner */
-  killConflict?: boolean;
+  killConflict?: boolean = !Runtime.production;
 
   preMain(): void {
     if (this.port) {
@@ -28,12 +28,12 @@ export class WebHttpCommand implements CliCommandShape {
     await Registry.init();
     const instance = await DependencyRegistryIndex.getInstance(toConcrete<WebHttpServer>());
 
-    const handle = await Util.acquireWithRetry(
-      () => instance.serve(),
-      NetUtil.freePortOnConflict,
-      this.killConflict && !Runtime.production ? 5 : 1
-    );
-
-    return handle.complete;
+    if (this.killConflict) {
+      const handle = await Util.acquireWithRetry(() => instance.serve(), NetUtil.freePortOnConflict, 5);
+      return handle.complete;
+    } else {
+      const handle = await instance.serve();
+      return handle.complete;
+    }
   }
 }