ziex 0.1.0-dev.1259 → 0.1.0-dev.1360

package/wasm/index.js

@@ -193,6 +193,76 @@ class ZigJS {
     return decoder.decode(data);
   }
 }
+// src/fetch.ts
+function createFetchImports(getMemory) {
+  const encoder2 = new TextEncoder;
+  const decoder2 = new TextDecoder;
+  function readStr(ptr, len) {
+    return decoder2.decode(new Uint8Array(getMemory().buffer, ptr, len));
+  }
+  function writeBytes(buf_ptr, buf_max, data) {
+    if (data.length > buf_max)
+      return -2;
+    new Uint8Array(getMemory().buffer, buf_ptr, data.length).set(data);
+    return data.length;
+  }
+  function readBytes(ptr, len) {
+    return new Uint8Array(getMemory().buffer, ptr, len);
+  }
+  function parseHeaders(headersJson) {
+    let headers = {};
+    try {
+      headers = JSON.parse(headersJson);
+    } catch {
+      for (const line of headersJson.split(`
+`)) {
+        const colonIdx = line.indexOf(":");
+        if (colonIdx > 0) {
+          headers[line.slice(0, colonIdx)] = line.slice(colonIdx + 1);
+        }
+      }
+    }
+    return headers;
+  }
+  async function doFetch(url_ptr, url_len, method_ptr, method_len, headers_ptr, headers_len, body_ptr, body_len, timeout_ms, status_out, buf_ptr, buf_max) {
+    const url = readStr(url_ptr, url_len);
+    const method = method_len > 0 ? readStr(method_ptr, method_len) : "GET";
+    const headersJson = headers_len > 0 ? readStr(headers_ptr, headers_len) : "{}";
+    const body = body_len > 0 ? readBytes(body_ptr, body_len) : undefined;
+    const headers = parseHeaders(headersJson);
+    const controller = new AbortController;
+    const timeout = timeout_ms > 0 ? setTimeout(() => controller.abort(), timeout_ms) : null;
+    try {
+      const response = await fetch(url, {
+        method,
+        headers: Object.keys(headers).length > 0 ? headers : undefined,
+        body: method !== "GET" && method !== "HEAD" ? body : undefined,
+        signal: controller.signal
+      });
+      if (timeout)
+        clearTimeout(timeout);
+      new DataView(getMemory().buffer).setUint16(status_out, response.status, true);
+      const bytes = new Uint8Array(await response.arrayBuffer());
+      return writeBytes(buf_ptr, buf_max, bytes);
+    } catch (err) {
+      if (timeout)
+        clearTimeout(timeout);
+      const msg = err instanceof Error ? err.message : String(err);
+      console.error(`wasm fetch failed: ${url} (${msg})`);
+      return -1;
+    }
+  }
+  const Suspending = WebAssembly.Suspending;
+  if (typeof Suspending !== "function") {
+    return {
+      fetch: (_url_ptr, _url_len, _method_ptr, _method_len, _headers_ptr, _headers_len, _body_ptr, _body_len, _timeout_ms, _status_out, _buf_ptr, _buf_max) => -1
+    };
+  }
+  return {
+    fetch: new Suspending(doFetch)
+  };
+}
+
 // src/wasm/core.ts
 var CallbackType = {
   Event: 0,
@@ -291,7 +361,7 @@ class ZxBridgeCore {
     const url = readString(urlPtr, urlLen);
     const method = methodLen > 0 ? readString(methodPtr, methodLen) : "GET";
     const headersJson = headersLen > 0 ? readString(headersPtr, headersLen) : "{}";
-    const body = bodyLen > 0 ? readString(bodyPtr, bodyLen) : undefined;
+    const body = bodyLen > 0 ? getMemoryView().subarray(bodyPtr, bodyPtr + bodyLen) : undefined;
     let headers = {};
     try {
       headers = JSON.parse(headersJson);
@@ -315,8 +385,8 @@ class ZxBridgeCore {
     fetch(url, fetchOptions).then(async (response) => {
       if (timeout)
         clearTimeout(timeout);
-      const text = await response.text();
-      this._notifyFetchComplete(fetchId, response.status, text, false);
+      const bytes = new Uint8Array(await response.arrayBuffer());
+      this._notifyFetchComplete(fetchId, response.status, bytes, false);
     }).catch((error) => {
       if (timeout)
         clearTimeout(timeout);
@@ -327,7 +397,7 @@ class ZxBridgeCore {
   }
   _notifyFetchComplete(fetchId, statusCode, body, isError) {
     const handler = this.#fetchCompleteHandler;
-    const encoded = textEncoder.encode(body);
+    const encoded = typeof body === "string" ? textEncoder.encode(body) : body;
     const ptr = this._alloc(encoded.length);
     writeBytes(ptr, encoded);
     invokeWasmExport(handler, fetchId, statusCode, ptr, encoded.length, isError ? 1 : 0);
@@ -384,6 +454,11 @@ class ZxBridgeCore {
   static createImportObject(bridgeRef) {
     return {
       ...jsz.importObject(),
+      __zx_net: createFetchImports(() => {
+        if (!jsz.memory)
+          throw new Error("WASM memory is not ready");
+        return jsz.memory;
+      }),
       __zx: {
         _log: (level, ptr, len) => ZxBridgeCore.log(level, ptr, len),
         _fetchAsync: (urlPtr, urlLen, methodPtr, methodLen, headersPtr, headersLen, bodyPtr, bodyLen, timeoutMs, fetchId) => {
@@ -682,12 +757,12 @@ class ZxBridge extends ZxBridgeCore {
   clearEventHandlerModes(velementId) {
     eventHandlerModes.delete(velementId);
   }
-  submitFormActionAsync(form, statesJson, fetchId) {
+  submitFormActionAsync(form, actionId, statesJson, fetchId) {
     const formData = new FormData(form);
     formData.append("__$states", statesJson);
     fetch(window.location.href, {
       method: "POST",
-      headers: { "X-ZX-Action": "1" },
+      headers: { "x-action": String(actionId >>> 0) },
       body: formData
     }).then(async (response) => {
       const text = await response.text();
@@ -793,6 +868,11 @@ class ZxBridge extends ZxBridgeCore {
   static createImportObject(bridgeRef) {
     return {
       ...jsz.importObject(),
+      __zx_net: createFetchImports(() => {
+        if (!jsz.memory)
+          throw new Error("WASM memory is not ready");
+        return jsz.memory;
+      }),
       __zx: {
         _log: (level, ptr, len) => ZxBridgeCore.log(level, ptr, len),
         _setEventHandlerMode: (vnodeId, eventTypeId, maySuspend) => {
@@ -911,23 +991,23 @@ class ZxBridge extends ZxBridgeCore {
           writeBytes(bufPtr, bytes.subarray(0, len));
           return len;
         },
-        _submitFormAction: (vnodeId) => {
+        _submitFormAction: (vnodeId, actionId) => {
           const form = domNodes.get(vnodeId);
           if (!form || !(form instanceof HTMLFormElement))
             return;
           const formData = new FormData(form);
           fetch(window.location.href, {
             method: "POST",
-            headers: { "X-ZX-Action": "1" },
+            headers: { "x-action": String(actionId >>> 0) },
             body: formData
           }).catch(() => {});
         },
-        _submitFormActionAsync: (vnodeId, statesPtr, statesLen, fetchId) => {
+        _submitFormActionAsync: (vnodeId, actionId, statesPtr, statesLen, fetchId) => {
           const form = domNodes.get(vnodeId);
           if (!form || !(form instanceof HTMLFormElement))
             return;
           const statesJson = statesLen > 0 ? readString(statesPtr, statesLen) : "[]";
-          bridgeRef.current?.submitFormActionAsync(form, statesJson, fetchId);
+          bridgeRef.current?.submitFormActionAsync(form, actionId, statesJson, fetchId);
         }
       }
     };
@@ -1259,7 +1339,8 @@ async function init(options = {}) {
       domNodes.clear();
     }
   };
-  registerDevReinit(normalizedOptions);
+  if (true)
+    registerDevReinit(normalizedOptions);
   return { source, bridge };
 }
 export {