allow passing Headers object to res.set

Signed-off-by: karthik2804 <[email protected]> pull in latest changes Signed-off-by: karthik2804 <[email protected]>
fermyon · Jun 13, 2024 · 6ac9b48 · 6ac9b48
1 parent bc626f7
commit 6ac9b48
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 61 deletions.
diff --git a/bin/wit/spin.wit b/bin/wit/spin.wit
@@ -2,6 +2,7 @@ package fermyon:[email protected];
 
 world spin-imports {
   import wasi:http/outgoing-handler@0.2.0;
+  include wasi:cli/imports@0.2.0;
   import llm;
   import redis;
   import postgres;

diff --git a/lib/inboundHttp.d.ts b/lib/inboundHttp.d.ts
@@ -11,7 +11,7 @@ export declare class ResponseBuilder {
     getStatus(): number;
     set(arg1: string | {
         [key: string]: string;
-    }, arg2?: string): ResponseBuilder;
+    } | Headers, arg2?: string): ResponseBuilder;
     send(value?: BodyInit): void;
     write(value: BodyInit): void;
     end(): void;

diff --git a/lib/inboundHttp.js b/lib/inboundHttp.js
@@ -23,6 +23,11 @@ export class ResponseBuilder {
         if (typeof arg1 === 'string' && typeof arg2 === 'string') {
             this.headers.set(arg1, arg2);
         }
+        else if (typeof arg1 === 'object' && arg1 instanceof Headers) {
+            arg1.forEach((value, key) => {
+                this.headers.set(key, value);
+            });
+        }
         else if (typeof arg1 === 'object' && arg2 === undefined) {
             for (const key in arg1) {
                 this.headers.set(key, arg1[key]);

diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/webpack/index.js b/plugins/webpack/index.js
@@ -2,6 +2,8 @@ class SpinSdkPlugin {
     constructor() {
         this.externals = {
             "wasi:http/[email protected]": "wasi:http/[email protected]",
+            "wasi:cli/[email protected]": "wasi:cli/[email protected]",
+            "wasi:filesystem/[email protected]": "wasi:filesystem/[email protected]",
             "fermyon:spin/[email protected]": "fermyon:spin/[email protected]",
             "fermyon:spin/[email protected]": "fermyon:spin/[email protected]",
             "fermyon:spin/[email protected]": "fermyon:spin/[email protected]",

diff --git a/src/inboundHttp.ts b/src/inboundHttp.ts
@@ -22,14 +22,18 @@ export class ResponseBuilder {
     return this.statusCode;
   }
   set(
-    arg1: string | { [key: string]: string },
+    arg1: string | { [key: string]: string } | Headers,
     arg2?: string,
   ): ResponseBuilder {
     if (this.hasWrittenHeaders) {
       throw new Error('Headers already sent');
     }
     if (typeof arg1 === 'string' && typeof arg2 === 'string') {
       this.headers.set(arg1, arg2);
+    } else if (typeof arg1 === 'object' && arg1 instanceof Headers) {
+      arg1.forEach((value, key) => {
+        this.headers.set(key, value);
+      });
     } else if (typeof arg1 === 'object' && arg2 === undefined) {
       for (const key in arg1) {
         this.headers.set(key, arg1[key]);