fix(protocol-http): revert SRA HttpRequest (aws#4514)

This reverts commit d9d24b0.
A bug was found with this commit when using a Symbol as a key, or
a non-string as a value in `request.headers`.

Author: milesziemer

packages/middleware-host-header/src/index.spec.ts

@@ -20,16 +20,17 @@ describe("hostHeaderMiddleware", () => {
     expect(mockNextHandler.mock.calls[0][0].request.headers.host).toBe("foo.amazonaws.com");
   });
 
+
   it("should include port in host header when set", async () => {
     expect.assertions(2);
     const middleware = hostHeaderMiddleware({ requestHandler: {} as any });
     const handler = middleware(mockNextHandler, {} as any);
     await handler({
       input: {},
-      request: new HttpRequest({ hostname: "foo.amazonaws.com", port: 9000 }),
+      request: new HttpRequest({ hostname: "foo.amazonaws.com", port: 443 }),
     });
     expect(mockNextHandler.mock.calls.length).toEqual(1);
-    expect(mockNextHandler.mock.calls[0][0].request.headers.host).toBe("foo.amazonaws.com:9000");
+    expect(mockNextHandler.mock.calls[0][0].request.headers.host).toBe("foo.amazonaws.com:443");
   });
 
   it("should not set host header if already set", async () => {

packages/middleware-sdk-transcribe-streaming/src/middleware-endpoint.spec.ts

@@ -45,7 +45,7 @@ describe("websocketURLMiddleware", () => {
       expect(HttpRequest.isInstance(args.request)).toBeTruthy();
       const processed = args.request as HttpRequest;
       expect(processed.protocol).toEqual("wss:");
-      expect(processed.port).toEqual(8443);
+      expect(processed.hostname).toEqual("transcribestreaming.us-east-1.amazonaws.com:8443");
       expect(processed.path).toEqual("/stream-transcription-websocket");
       expect(processed.method).toEqual("GET");
       done();

packages/middleware-sdk-transcribe-streaming/src/middleware-endpoint.ts

@@ -19,8 +19,8 @@ export const websocketURLMiddleware =
     if (HttpRequest.isInstance(request) && options.requestHandler.metadata?.handlerProtocol === "websocket") {
       // Update http/2 endpoint to WebSocket-specific endpoint.
       request.protocol = "wss:";
-      // Update port for using WebSocket.
-      request.port = 8443;
+      // Append port to hostname because it needs to be signed together
+      request.hostname = `${request.hostname}:8443`;
       request.path = `${request.path}-websocket`;
       request.method = "GET";
 

packages/protocol-http/package.json

@@ -9,7 +9,7 @@
     "build:types": "tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
     "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo",
-    "test": "jest --coverage"
+    "test": "jest"
   },
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",

packages/protocol-http/src/Field.ts

@@ -1,18 +1,18 @@
 import { FieldPosition } from "./FieldPosition";
 
-export type FieldOptions = {
+export type FieldOptions = { 
   name: string;
-  kind?: FieldPosition;
+  kind?: FieldPosition
   values?: string[];
 };
 
 /**
  * A name-value pair representing a single field
  * transmitted in an HTTP Request or Response.
- *
+ * 
  * The kind will dictate metadata placement within
  * an HTTP message.
- *
+ * 
  * All field names are case insensitive and
  * case-variance must be treated as equivalent.
  * Names MAY be normalized but SHOULD be preserved
@@ -31,8 +31,8 @@ export class Field {
   }
 
   /**
-   * Appends a value to the field.
-   *
+   * Appends a value to the field. 
+   * 
    * @param value The value to append.
    */
   public add(value: string): void {
@@ -41,7 +41,7 @@ export class Field {
 
   /**
    * Overwrite existing field values.
-   *
+   * 
    * @param values The new field values.
    */
   public set(values: string[]): void {
@@ -50,26 +50,28 @@ export class Field {
 
   /**
    * Remove all matching entries from list.
-   *
+   * 
    * @param value Value to remove.
    */
   public remove(value: string): void {
     this.values = this.values.filter((v) => v !== value);
   }
 
   /**
-   * Get comma-delimited string to be sent over the wire.
-   *
+   * Get comma-delimited string.
+   * 
    * @returns String representation of {@link Field}.
    */
   public toString(): string {
-    // Values with commas MUST be double-quoted
-    return this.values.map((v) => (v.includes(",") ? `"${v}"` : v)).join(", ");
+    // Values with spaces or commas MUST be double-quoted
+    return this.values
+      .map((v) => (v.includes(",") || v.includes(" ") ? `"${v}"` : v))
+      .join(", ");
   }
 
   /**
    * Get string values as a list
-   *
+   * 
    * @returns Values in {@link Field} as a list.
    */
   public get(): string[] {

packages/protocol-http/src/Fields.ts

@@ -1,7 +1,7 @@
-import { Field, FieldOptions } from "./Field";
+import { Field } from "./Field";
 import { FieldPosition } from "./FieldPosition";
 
-export type FieldsOptions = { fields?: Field[]; encoding?: string };
+export type FieldsOptions = { fields?: Field[]; encoding?: string; };
 
 /**
  * Collection of Field entries mapped by name.
@@ -18,7 +18,7 @@ export class Fields {
   /**
    * Set entry for a {@link Field} name. The `name`
    * attribute will be used to key the collection.
-   *
+   * 
    * @param field The {@link Field} to set.
    */
   public setField(field: Field): void {
@@ -27,7 +27,7 @@ export class Fields {
 
   /**
    *  Retrieve {@link Field} entry by name.
-   *
+   * 
    * @param name The name of the {@link Field} entry
    *  to retrieve
    * @returns The {@link Field} if it exists.
@@ -38,48 +38,22 @@ export class Fields {
 
   /**
    * Delete entry from collection.
-   *
+   * 
    * @param name Name of the entry to delete.
-   */
+   */ 
   public removeField(name: string): void {
     delete this.entries[name.toLowerCase()];
   }
 
   /**
    * Helper function for retrieving specific types of fields.
    * Used to grab all headers or all trailers.
-   *
+   * 
    * @param kind {@link FieldPosition} of entries to retrieve.
    * @returns The {@link Field} entries with the specified
    *  {@link FieldPosition}.
    */
   public getByType(kind: FieldPosition): Field[] {
     return Object.values(this.entries).filter((field) => field.kind === kind);
   }
-
-  /**
-   * Retrieves all the {@link Field}s in the collection.
-   * Includes headers and trailers.
-   *
-   * @returns All fields in the collection.
-   */
-  public getAll(): Field[] {
-    return Object.values(this.entries);
-  }
-
-  /**
-   * Utility for creating {@link Fields} without having to
-   * construct each {@link Field} individually.
-   *
-   * @param fieldsToCreate List of arguments used to create each
-   *  {@link Field}.
-   * @param encoding Optional encoding of resultant {@link Fields}.
-   * @returns The {@link Fields} instance.
-   */
-  public static from(fieldsToCreate: FieldOptions[], encoding?: string): Fields {
-    return fieldsToCreate.reduce((fields, fieldArgs) => {
-      fields.setField(new Field(fieldArgs));
-      return fields;
-    }, new Fields({ encoding }));
-  }
 }