Skip to content

feat(protocol-http): implement SRA HttpResponse #4520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions packages/protocol-http/src/httpResponse.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
import { Fields } from "./Fields";
import { HttpResponse } from "./httpResponse";

describe("HttpResponse", () => {
describe("construction", () => {
it.each([
["constructor", new HttpResponse({ statusCode: 200 })],
["`from` factory method", HttpResponse.from({ status: 200 })],
])("can be constructed using %s", (_, response) => {
expect(response.status).toEqual(200);
expect(response.fields).toEqual(Fields.from([]));
expect(response.statusCode).toEqual(200);
expect(response.headers).toEqual({});
});
it("populates `fields` when using constructor", () => {
const response = new HttpResponse({ statusCode: 200, headers: { foo: "bar" } });
expect(response.fields.getField("foo")?.toString()).toEqual("bar");
});

it("can be constructed with object spread syntax", () => {
const baseResponse = new HttpResponse({
statusCode: 200,
headers: { foo: "bar" },
body: "body",
});
const updatedResponse = new HttpResponse({
...baseResponse,
headers: {
...baseResponse.headers,
baz: "qux",
},
});
expect(updatedResponse.body).toEqual(baseResponse.body);
expect(updatedResponse.headers).toEqual({ ...baseResponse.headers, baz: "qux" });
});
});

describe("deprecated properties and their getters/setters", () => {
const mockHeaders = {
foo: "bar",
baz: "qux",
};
const mockFields = Fields.from([
{ name: "foo", values: ["bar"] },
{ name: "baz", values: ["qux"] },
]);

it("can be set via constructor", () => {
const response = new HttpResponse({ headers: mockHeaders, statusCode: 200 });
expect(response.headers).toEqual(mockHeaders);
expect(response.statusCode).toEqual(200);
});

it("can be set explicitly", () => {
const response = new HttpResponse({ statusCode: 200 });
response.headers = mockHeaders;
response.statusCode = 201;
expect(response.headers).toEqual(mockHeaders);
expect(response.statusCode).toEqual(201);
});

it("updates non-deprecated property when set via constructor", () => {
const response = new HttpResponse({ statusCode: 200 });
response.headers = mockHeaders;
response.statusCode = 201;
expect(response.fields).toEqual(mockFields);
expect(response.status).toEqual(201);
});
});
});
84 changes: 74 additions & 10 deletions packages/protocol-http/src/httpResponse.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,88 @@
import { HeaderBag, HttpMessage, HttpResponse as IHttpResponse } from "@aws-sdk/types";
import { HeaderBag, HttpMessage, Response } from "@aws-sdk/types";

type HttpResponseOptions = Partial<HttpMessage> & {
import { Fields } from "./Fields";
import { getHeadersProxy, headersToFields } from "./headersProxy";

export type HttpResponseOptions = Partial<HttpMessage> & {
statusCode: number;
};

export interface HttpResponse extends IHttpResponse {}
export type HttpResponseFromOptions = {
status: number;
reason?: string;
fields?: Fields;
body?: any;
};

export interface HttpResponse extends Response {
status: number;
reason?: string;
fields: Fields;
body: any;
}

export class HttpResponse implements Response {
public status: number;
public reason?: string;
public fields: Fields;
public body: any;

/**
* @deprecated Use {@link status}
*/
public statusCode = -1;

export class HttpResponse {
public statusCode: number;
public headers: HeaderBag;
public body?: any;
/**
* @deprecated Use {@link fields}
*/
public headers: HeaderBag = {};

/**
* @deprecated Use {@link HttpResponse.from}
*/
constructor(options: HttpResponseOptions) {
this.statusCode = options.statusCode;
this.headers = options.headers || {};
this.status = options.statusCode;
this.fields = headersToFields(options.headers || {});
this.body = options.body;
// Deprecated properties are accessed using getters and setters.
// Object.defineProperties is used so the properties are still considered
// enumerable.
// eslint-disable-next-line @typescript-eslint/no-this-alias
const httpResponse = this;
Object.defineProperties(httpResponse, {
statusCode: {
enumerable: true,
get() {
return httpResponse.status;
},
set(statusCode: number) {
httpResponse.status = statusCode;
},
},
headers: {
enumerable: true,
get() {
return getHeadersProxy(httpResponse.fields);
},
set(headers: HeaderBag) {
httpResponse.fields = headersToFields(headers);
},
},
});
}

static from(options: HttpResponseFromOptions) {
const response = new HttpResponse({ statusCode: options.status, body: options.body });
response.reason = options.reason;
// Constructor handles setting default values for fields.
if (options.fields) {
response.fields = options.fields;
}
return response;
}

static isInstance(response: unknown): response is HttpResponse {
//determine if response is a valid HttpResponse
// determine if response is a valid HttpResponse
if (!response) return false;
const resp = response as any;
return typeof resp.statusCode === "number" && typeof resp.headers === "object";
Expand Down
2 changes: 2 additions & 0 deletions packages/types/src/http.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ export interface HttpRequest extends HttpMessage, Endpoint {
*
* Represents an HTTP message as received in reply to a request. Contains a
* numeric status code in addition to standard message properties.
*
* @deprecated Replaced by implementation HttpResponse in @aws-sdk/protocol-http.
*/
export interface HttpResponse extends HttpMessage {
statusCode: number;
Expand Down