Fix curl fails on browser

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
ktock · Apr 9, 2024 · e659fd9 · e659fd9
1 parent c2d228e
commit e659fd9
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 18 deletions.
diff --git a/examples/wasi-browser/htdocs/worker-util.js b/examples/wasi-browser/htdocs/worker-util.js
@@ -184,7 +184,7 @@ function wasiHackSocket(wasi, listenfd, connfd) {
     }
     var _fd_prestat_get = wasi.wasiImport.fd_prestat_get;
     wasi.wasiImport.fd_prestat_get = (fd, prestat_ptr) => {
-        if ((fd == listenfd) || (fd <= connfd)){ // reserve socket-related fds
+        if ((fd == listenfd) || (fd == connfd)){ // reserve socket-related fds
             let buffer = new DataView(wasi.inst.exports.memory.buffer);
             buffer.setUint8(prestat_ptr, 1);
             return 0;

diff --git a/extras/runcontainerjs/src/web/runcontainer.js b/extras/runcontainerjs/src/web/runcontainer.js
@@ -217,31 +217,66 @@ function connect(name, shared, toNet) {
                             connObj.request.body = connObj.reqBodybuf;
                         }
                         fetch(connObj.address, connObj.request).then((resp) => {
-                            var headers = {};
-                            for (const key of resp.headers.keys()) {
-                                headers[key] = resp.headers.get(key);
-                            }
-                            connObj.response = new TextEncoder().encode(JSON.stringify({
-                                bodyUsed: resp.bodyUsed,
-                                headers: headers,
-                                redirected: resp.redirected,
-                                status: resp.status,
-                                statusText: resp.statusText,
-                                type: resp.type,
-                                url: resp.url
-                            })),
                             connObj.done = false;
                             connObj.respBodybuf = new Uint8Array(0);
                             if (resp.ok) {
                                 resp.arrayBuffer().then((data) => {
+                                    var headers = {};
+                                    for (const key of resp.headers.keys()) {
+                                        if (data.byteLength > 0) {
+                                            if (key == "content-encoding") {
+                                                continue;
+                                            }
+                                            if (key == "content-length") {
+                                                headers[key] = data.byteLength.toString();
+                                                continue;
+                                            }
+                                        }
+                                        headers[key] = resp.headers.get(key);
+                                    }
+                                    connObj.response = new TextEncoder().encode(JSON.stringify({
+                                        bodyUsed: resp.bodyUsed,
+                                        headers: headers,
+                                        redirected: resp.redirected,
+                                        status: resp.status,
+                                        statusText: resp.statusText,
+                                        type: resp.type,
+                                        url: resp.url
+                                    }));
                                     connObj.respBodybuf = new Uint8Array(data);
                                     connObj.done = true;
                                 }).catch((error) => {
+                                    var headers = {};
+                                    for (const key of resp.headers.keys()) {
+                                        headers[key] = resp.headers.get(key);
+                                    }
+                                    connObj.response = new TextEncoder().encode(JSON.stringify({
+                                        bodyUsed: resp.bodyUsed,
+                                        headers: headers,
+                                        redirected: resp.redirected,
+                                        status: resp.status,
+                                        statusText: resp.statusText,
+                                        type: resp.type,
+                                        url: resp.url
+                                    }));
                                     connObj.respBodybuf = new Uint8Array(0);
                                     connObj.done = true;
                                     console.log("failed to fetch body: " + error);
                                 });
                             } else {
+                                var headers = {};
+                                for (const key of resp.headers.keys()) {
+                                    headers[key] = resp.headers.get(key);
+                                }
+                                connObj.response = new TextEncoder().encode(JSON.stringify({
+                                    bodyUsed: resp.bodyUsed,
+                                    headers: headers,
+                                    redirected: resp.redirected,
+                                    status: resp.status,
+                                    statusText: resp.statusText,
+                                    type: resp.type,
+                                    url: resp.url
+                                }));
                                 connObj.done = true;
                             }
                         }).catch((error) => {

diff --git a/extras/runcontainerjs/src/web/wasi-util.js b/extras/runcontainerjs/src/web/wasi-util.js
@@ -168,7 +168,7 @@ export function wasiHackSocket(wasi, listenfd, connfd, sockAccept, sockSend, soc
     }
     var _fd_prestat_get = wasi.wasiImport.fd_prestat_get;
     wasi.wasiImport.fd_prestat_get = (fd, prestat_ptr) => {
-        if ((fd == listenfd) || (fd <= connfd)){ // reserve socket-related fds
+        if ((fd == listenfd) || (fd == connfd)){ // reserve socket-related fds
             let buffer = new DataView(wasi.inst.exports.memory.buffer);
             buffer.setUint8(prestat_ptr, 1);
             return 0;

diff --git a/extras/runcontainerjs/src/web/worker-util.js b/extras/runcontainerjs/src/web/worker-util.js
@@ -1,5 +1,5 @@
 import { Event, EventType, Subscription, SubscriptionClock, SubscriptionFdReadWrite, SubscriptionU, wasiHackSocket } from './wasi-util';
-import { WASI, PreopenDirectory } from "@bjorn3/browser_wasi_shim";
+import { WASI, PreopenDirectory, File } from "@bjorn3/browser_wasi_shim";
 import * as wasitype from "@bjorn3/browser_wasi_shim";
 
 export function startContainer(info, cargs, ttyClient) {
@@ -423,12 +423,12 @@ function getCertDir(cert) {
             var o = ret.fd_obj;
             ret.fd_obj.fd_pread = (view8, iovs, offset) => {
                 var old_offset = o.file_pos;
-                var r = o.fd_seek(offset, WHENCE_SET);
+                var r = o.fd_seek(offset, wasitype.wasi.WHENCE_SET);
                 if (r.ret != 0) {
                     return { ret: -1, nread: 0 };
                 }
                 var read_ret = o.fd_read(view8, iovs);
-                r = o.fd_seek(old_offset, WHENCE_SET);
+                r = o.fd_seek(old_offset, wasitype.wasi.WHENCE_SET);
                 if (r.ret != 0) {
                     return { ret: -1, nread: 0 };
                 }