v0.3.21-debug.1

Author: viktormarinho

client.ts

@@ -1,4 +1,3 @@
-import { request } from "undici";
 import { makeWebSocket } from "./channel.js";
 import pkg from "./package.json" with { type: "json" };
 import { handleServerMessage } from "./handlers.client.js";
@@ -44,7 +43,6 @@ export const connectMainThread = async (
 ): Promise<Connected> => {
   const closed = Promise.withResolvers<Error | undefined>();
   const registered = Promise.withResolvers<void>();
-  const client = request; // Use undici.request for Node.js to allow host header override
 
   const socket = new WebSocket(
     `${opts.server}/_connect?${CLIENT_VERSION_QUERY_STRING}=${pkg.version}`,
@@ -64,7 +62,6 @@ export const connectMainThread = async (
   (async () => {
     let reason: undefined | Error;
     const state: ClientState = {
-      client,
       localAddr: opts.localAddr,
       live: false,
       requests: {},

handlers.client.ts

@@ -21,6 +21,22 @@ import type {
   WSMessage,
 } from "./messages.js";
 import { arrayBufferSerializer } from "./serializers.js";
+import { request as undiciRequest } from "undici";
+import { Readable } from 'stream';
+
+function nodeReadableToWebReadable(nodeStream: Readable): ReadableStream<Uint8Array> {
+  return new ReadableStream({
+    start(controller) {
+      nodeStream.on('data', chunk => controller.enqueue(chunk));
+      nodeStream.on('end', () => controller.close());
+      nodeStream.on('error', err => controller.error(err));
+    },
+    cancel() {
+      nodeStream.destroy();
+    }
+  });
+}
+
 
 /**
  * Handler for the 'registered' server message.
@@ -239,38 +255,37 @@ async function doFetch(
   // Read from the stream
   const signal = link(clientCh.signal, reqSignal);
   try {
-    const response = await fetch(
+    const response = await undiciRequest(
       new URL(request.url, state.localAddr),
       {
-        ...state.client ? { client: state.client } : {},
-        redirect: "manual",
-        method: request.method,
-        headers: state.client
-          ? { ...request.headers, host: request.domain }
-          : request.headers,
-        body: request.body,
+        method: request.method as any,
+        headers: { ...request.headers, host: request.domain },
+        body: request.body as any,
         ...(request.body ? { duplex: "half" } : {}),
         signal,
       },
     );
 
     const headers: Record<string, Array<string>> = {};
 
-    response.headers.forEach((value, key) => {
-      headers[key] ??= [];
-      headers[key].push(value);
-    });
+    for (const [key, value] of Object.entries(response.headers)) {
+      if (typeof value === 'string') {
+        headers[key] = [value];
+      } else if (Array.isArray(value)) {
+        headers[key] = value;
+      }
+    }
 
     await clientCh.send({
       type: "response-start",
       id: request.id,
-      statusCode: response.status,
-      statusMessage: response.statusText,
+      statusCode: response.statusCode,
+      statusMessage: "OK",
       headers,
     });
 
     const body = response?.body;
-    const stream = body ? makeChanStream(body) : undefined;
+    const stream = body ? makeChanStream(nodeReadableToWebReadable(body)) : undefined;
     for await (const chunk of stream?.recv(signal) ?? []) {
       await clientCh.send({
         type: "data",

messages.ts

@@ -106,7 +106,6 @@ export interface ClientState {
   wsSockets: Record<string, WebSocket>;
   live: boolean;
   localAddr: string;
-  client?: typeof import("undici").request; // Use undici.request for Node.js
 }
 
 export interface ClientHostController {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deco-cx/warp-node",
-  "version": "0.3.16",
+  "version": "0.3.21-debug.1",
   "description": "WebSocket tunneling library for Node.js and other runtimes",
   "type": "module",
   "main": "dist/mod.js",