@travetto/web-connect 7.0.0-rc.2 → 7.0.0-rc.3

package/README.md

@@ -33,8 +33,8 @@ async authenticate(input: object, ctx: WebFilterContext): Promise<Principal | un
       state: PassportUtil.enhanceState(ctx, requestOptions.state)
     };
 
-    const user = await WebConnectUtil.invoke<V>(ctx, (req, res, next) =>
-      passport.authenticate(this.#strategyName, options, next)(req, res)
+    const user = await WebConnectUtil.invoke<V>(ctx, (request, response, next) =>
+      passport.authenticate(this.#strategyName, options, next)(request, response)
     );
 
     if (user) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/web-connect",
-  "version": "7.0.0-rc.2",
+  "version": "7.0.0-rc.3",
   "description": "Web integration for Connect-Like Resources",
   "keywords": [
     "web",
@@ -24,11 +24,11 @@
     "directory": "module/web-connect"
   },
   "dependencies": {
-    "@travetto/web": "^7.0.0-rc.2"
+    "@travetto/web": "^7.0.0-rc.3"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.0.0-rc.1",
-    "@travetto/test": "^7.0.0-rc.1"
+    "@travetto/cli": "^7.0.0-rc.2",
+    "@travetto/test": "^7.0.0-rc.2"
   },
   "peerDependenciesMeta": {
     "@travetto/test": {

package/src/connect.ts

@@ -68,14 +68,14 @@ export class ConnectResponse implements Pick<ServerResponse,
     return this.#response.context.httpStatusCode;
   }
 
-  set statusCode(val: number) {
-    this.#response.context.httpStatusCode = val;
+  set statusCode(code: number) {
+    this.#response.context.httpStatusCode = code;
   }
 
   writeHead(statusCode: unknown, statusMessage?: unknown, headers?: unknown): this {
     this.#response.context.httpStatusCode = castTo(statusCode);
-    for (const [k, v] of Object.entries(headers ?? {})) {
-      this.#response.headers.set(k, v);
+    for (const [key, value] of Object.entries(headers ?? {})) {
+      this.#response.headers.set(key, value);
     }
     this.#headersSent = true;
     return this;
@@ -119,7 +119,7 @@ export class ConnectResponse implements Pick<ServerResponse,
   flushHeaders(): void {
     this.#headersSent = true;
   }
-  write(chunk: unknown, encoding?: unknown, callback?: (err?: Error) => void): boolean {
+  write(chunk: unknown, encoding?: unknown, callback?: (error?: Error) => void): boolean {
     if (this.#headersSent) {
       this.flushHeaders();
     }
@@ -137,13 +137,13 @@ export class ConnectResponse implements Pick<ServerResponse,
     return this;
   }
 
-  end(chunk?: unknown, encoding?: unknown, cb?: () => void): this {
+  end(chunk?: unknown, encoding?: unknown, callback?: () => void): this {
     this.flushHeaders();
     if (chunk) {
       this.write(chunk, encoding);
     }
     this.#finished = true;
-    cb?.();
+    callback?.();
     for (const item of this.#onEndHandlers) {
       item();
     }

package/src/util.ts

@@ -5,7 +5,7 @@ import { WebFilterContext } from '@travetto/web';
 import { ConnectRequest, ConnectResponse } from './connect';
 
 
-type Middleware = (req: IncomingMessage, res: ServerResponse, next: (err?: unknown) => void) => void;
+type Middleware = (request: IncomingMessage, response: ServerResponse, next: (error?: unknown) => void) => void;
 
 /**
  * Utilities for invoking express middleware with a WebFilterContext
@@ -18,20 +18,20 @@ export class WebConnectUtil {
    */
   static async invoke<T>(ctx: WebFilterContext,
     handler: (
-      req: IncomingMessage,
-      res: ServerResponse,
-      next: (err: Error | null | undefined, value: T | undefined | null) => void
+      request: IncomingMessage,
+      response: ServerResponse,
+      next: (error: Error | null | undefined, value: T | undefined | null) => void
     ) => Middleware
   ): Promise<T | undefined> {
-    const connectReq = ConnectRequest.get(ctx.request);
-    const connectRes = ConnectResponse.get();
+    const connectRequest = ConnectRequest.get(ctx.request);
+    const connectResponse = ConnectResponse.get();
 
-    const p = Promise.withResolvers<T | undefined>();
-    connectRes.on('end', () => p.resolve(null!));
+    const promise = Promise.withResolvers<T | undefined>();
+    connectResponse.on('end', () => promise.resolve(null!));
 
-    handler(connectReq, connectRes, (err, value) => err ? p.reject(err) : p.resolve(value!));
-    const result = await p.promise;
-    connectRes.throwIfSent();
+    handler(connectRequest, connectResponse, (error, value) => error ? promise.reject(error) : promise.resolve(value!));
+    const result = await promise.promise;
+    connectResponse.throwIfSent();
     return result;
   }
 }