Skip to content
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

[feat] added ability to opt-out from mime formatted header names #145

Merged
merged 12 commits into from
May 6, 2021
Merged
40 changes: 20 additions & 20 deletions nats-base-client/headers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ export interface MsgHdrs extends Iterable<[string, string[]]> {
hasError: boolean;
status: string;
code: number;
get(k: string): string;
set(k: string, v: string): void;
append(k: string, v: string): void;
has(k: string): boolean;
values(k: string): string[];
delete(k: string): void;
get(k: string, mime?: boolean): string;
set(k: string, v: string, mime?: boolean): void;
append(k: string, v: string, mime?: boolean): void;
has(k: string, mime?: boolean): boolean;
values(k: string, mime?: boolean): string[];
delete(k: string, mime?: boolean): void;
}

export function headers(): MsgHdrs {
Expand Down Expand Up @@ -59,7 +59,7 @@ export class MsgHdrsImpl implements MsgHdrs {
return count;
}

equals(mh: MsgHdrsImpl) {
equals(mh: MsgHdrsImpl): boolean {
if (
mh && this.headers.size === mh.headers.size &&
this.code === mh.code
Expand All @@ -76,8 +76,8 @@ export class MsgHdrsImpl implements MsgHdrs {
return false;
}
}
return true;
}
return true;
}
return false;
}
Expand Down Expand Up @@ -182,24 +182,24 @@ export class MsgHdrsImpl implements MsgHdrs {
return k.trim();
}

get(k: string): string {
const key = MsgHdrsImpl.canonicalMIMEHeaderKey(k);
get(k: string, mime = true): string {
const key = mime ? MsgHdrsImpl.canonicalMIMEHeaderKey(k) : k;
aricart marked this conversation as resolved.
Show resolved Hide resolved
const a = this.headers.get(key);
return a ? a[0] : "";
}

has(k: string): boolean {
return this.get(k) !== "";
has(k: string, mime = true): boolean {
return this.get(k, mime) !== "";
}

set(k: string, v: string): void {
const key = MsgHdrsImpl.canonicalMIMEHeaderKey(k);
set(k: string, v: string, mime = true): void {
const key = mime ? MsgHdrsImpl.canonicalMIMEHeaderKey(k) : k;
aricart marked this conversation as resolved.
Show resolved Hide resolved
const value = MsgHdrsImpl.validHeaderValue(v);
this.headers.set(key, [value]);
}

append(k: string, v: string): void {
const key = MsgHdrsImpl.canonicalMIMEHeaderKey(k);
append(k: string, v: string, mime = true): void {
const key = mime ? MsgHdrsImpl.canonicalMIMEHeaderKey(k) : k;
const value = MsgHdrsImpl.validHeaderValue(v);
let a = this.headers.get(key);
if (!a) {
Expand All @@ -209,13 +209,13 @@ export class MsgHdrsImpl implements MsgHdrs {
a.push(value);
}

values(k: string): string[] {
const key = MsgHdrsImpl.canonicalMIMEHeaderKey(k);
values(k: string, mime = true): string[] {
const key = mime ? MsgHdrsImpl.canonicalMIMEHeaderKey(k) : k;
return this.headers.get(key) || [];
}

delete(k: string): void {
const key = MsgHdrsImpl.canonicalMIMEHeaderKey(k);
delete(k: string, mime = true): void {
const key = mime ? MsgHdrsImpl.canonicalMIMEHeaderKey(k) : k;
this.headers.delete(key);
}

Expand Down
55 changes: 55 additions & 0 deletions tests/headers_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,58 @@ Deno.test("headers - status", () => {
checkStatus(503, "No Responders");
checkStatus(404, "No Messages");
});

Deno.test("headers - non MIME", () => {
const h = headers();
h.set("a", "aa");
assertEquals(h.get("A"), "aa");
assertEquals(h.get("A", false), "aa");
assertEquals(h.get("a", false), "");

h.set("b", "bb", false);
assertEquals(h.get("B"), "");
assertEquals(h.get("b"), "");
assertEquals(h.get("b", false), "bb");

h.append("c", "cc");
assertEquals(h.values("c"), ["cc"]);
assertEquals(h.values("C"), ["cc"]);
assertEquals(h.values("c", false), []);

h.append("d", "cc", false);
assertEquals(h.values("d"), []);
assertEquals(h.values("D"), []);
assertEquals(h.values("d", false), ["cc"]);

h.delete("c", false);
assertEquals(h.values("c"), ["cc"]);
assertEquals(h.values("C"), ["cc"]);

h.delete("c");
assertEquals(h.values("c"), []);
assertEquals(h.values("C"), []);
});

Deno.test("headers - values should be arrays", () => {
const h = headers();
h.set("a", "aa");
h.append("a", "bb");
assertEquals(h.get("a"), "aa");
assertEquals(h.values("a"), ["aa", "bb"]);
});

Deno.test("headers - equality", () => {
const a = headers() as MsgHdrsImpl;
const b = headers() as MsgHdrsImpl;
assert(a.equals(b));

a.set("a", "b");
b.set("a", "b");
assert(a.equals(b));

b.append("a", "bb");
assert(!a.equals(b));

a.append("a", "cc");
assert(!a.equals(b));
});