jiren 1.3.1 → 1.4.0

package/components/client-node-native.ts

@@ -183,7 +183,7 @@ export class JirenClient<
             if (cacheConfig?.enabled) {
               const cached = self.cache.get(baseUrl, options?.path, options);
               if (cached) {
-                return self.rehydrateResponse(cached);
+                return cached as any;
               }
             }
 
@@ -535,39 +535,42 @@ export class JirenClient<
         // Copy body content
         buffer = Buffer.from(koffi.decode(bodyPtr, "uint8_t", len));
 
-        // Handle GZIP compression
+        // Handle GZIP compression - search for magic bytes in first 16 bytes
+        // (handles chunked encoding or other framing that may add prefix bytes)
         const contentEncoding = headersProxy["content-encoding"]?.toLowerCase();
+        let gzipOffset = -1;
 
-        if (
-          contentEncoding === "gzip" ||
-          (buffer.length > 2 && buffer[0] === 0x1f && buffer[1] === 0x8b)
-        ) {
+        // Search for gzip magic bytes (0x1f 0x8b) in first 16 bytes
+        for (let i = 0; i < Math.min(16, buffer.length - 1); i++) {
+          if (buffer[i] === 0x1f && buffer[i + 1] === 0x8b) {
+            gzipOffset = i;
+            break;
+          }
+        }
+
+        if (contentEncoding === "gzip" || gzipOffset >= 0) {
           try {
-            console.log("[Jiren] Attempting gunzip...");
-            buffer = zlib.gunzipSync(buffer);
-            console.log("[Jiren] Gunzip success!");
+            // If we found gzip at an offset, slice from there
+            const gzipData = gzipOffset > 0 ? buffer.slice(gzipOffset) : buffer;
+            console.log(
+              `[Jiren] Decompressing gzip (offset: ${
+                gzipOffset >= 0 ? gzipOffset : 0
+              }, size: ${gzipData.length})`
+            );
+            buffer = zlib.gunzipSync(gzipData);
           } catch (e) {
             console.warn("Failed to gunzip response body:", e);
           }
         }
       }
 
-      // Convert to base64 for caching persistence
-      let base64Data = "";
-      try {
-        base64Data = buffer.toString("base64");
-      } catch (e) {
-        // Should not happen
-      }
-
       let bodyUsed = false;
       const consumeBody = () => {
         bodyUsed = true;
       };
 
-      const bodyObj: JirenResponseBody<T> & { _raw?: string } = {
+      const bodyObj: JirenResponseBody<T> = {
         bodyUsed: false,
-        _raw: base64Data,
         arrayBuffer: async () => {
           consumeBody();
           return buffer.buffer.slice(
@@ -607,63 +610,6 @@ export class JirenClient<
       lib.symbols.zclient_response_free(respPtr);
     }
   }
-
-  /**
-   * Rehydrates a cached response object by restoring the body interface methods.
-   * This is necessary because JSON serialization strips functions.
-   */
-  private rehydrateResponse(cached: any): JirenResponse {
-    // If it already has methods, return as is
-    if (typeof cached.body.text === "function") return cached;
-
-    // Retrieve raw data
-    const rawData = cached.body._raw;
-    let buffer: Buffer;
-
-    if (rawData) {
-      buffer = Buffer.from(rawData, "base64");
-    } else {
-      buffer = Buffer.from("");
-    }
-
-    let bodyUsed = cached.body.bodyUsed || false;
-    const consumeBody = () => {
-      bodyUsed = true;
-    };
-
-    const bodyObj: JirenResponseBody = {
-      _raw: rawData, // Keep it for re-caching if needed
-      bodyUsed,
-      arrayBuffer: async () => {
-        consumeBody();
-        return buffer.buffer.slice(
-          buffer.byteOffset,
-          buffer.byteOffset + buffer.byteLength
-        ) as ArrayBuffer;
-      },
-      blob: async () => {
-        consumeBody();
-        return new Blob([buffer as any]);
-      },
-      text: async () => {
-        consumeBody();
-        return buffer.toString("utf-8");
-      },
-      json: async <R = any>(): Promise<R> => {
-        consumeBody();
-        return JSON.parse(buffer.toString("utf-8"));
-      },
-    } as any;
-
-    Object.defineProperty(bodyObj, "bodyUsed", {
-      get: () => bodyUsed,
-    });
-
-    return {
-      ...cached,
-      body: bodyObj,
-    };
-  }
 }
 
 class NativeHeaders {

package/components/client.ts

@@ -220,7 +220,7 @@ export class JirenClient<
               // Try to get from cache
               const cached = self.cache.get(baseUrl, options?.path, options);
               if (cached) {
-                return self.rehydrateResponse(cached);
+                return cached as any;
               }
             }
 
@@ -699,14 +699,6 @@ export class JirenClient<
         buffer = toArrayBuffer(bodyPtr, 0, len).slice(0);
       }
 
-      // Convert to base64 for caching persistence
-      let base64Data = "";
-      try {
-        base64Data = Buffer.from(buffer).toString("base64");
-      } catch (e) {
-        // Should not happen for valid buffer
-      }
-
       let bodyUsed = false;
       const consumeBody = () => {
         if (bodyUsed) {
@@ -714,9 +706,8 @@ export class JirenClient<
         bodyUsed = true;
       };
 
-      const bodyObj: JirenResponseBody<T> & { _raw?: string } = {
+      const bodyObj: JirenResponseBody<T> = {
         bodyUsed: false,
-        _raw: base64Data,
         arrayBuffer: async () => {
           consumeBody();
           if (Buffer.isBuffer(buffer)) {
@@ -791,64 +782,6 @@ export class JirenClient<
 
     return { headers, serializedBody };
   }
-
-  /**
-   * Rehydrates a cached response object by restoring the body interface methods.
-   * This is necessary because JSON serialization strips functions.
-   */
-  private rehydrateResponse(cached: any): JirenResponse {
-    // If it already has methods, return as is
-    if (typeof cached.body.text === "function") return cached;
-
-    // Retrieve raw data
-    const rawData = cached.body._raw;
-    let buffer: Buffer;
-
-    if (rawData) {
-      buffer = Buffer.from(rawData, "base64");
-    } else {
-      buffer = Buffer.from("");
-    }
-
-    let bodyUsed = cached.body.bodyUsed || false;
-    const consumeBody = () => {
-      bodyUsed = true;
-    };
-
-    const bodyObj: JirenResponseBody = {
-      _raw: rawData, // Keep it for re-caching if needed
-      bodyUsed,
-      arrayBuffer: async () => {
-        consumeBody();
-        return buffer.buffer.slice(
-          buffer.byteOffset,
-          buffer.byteOffset + buffer.byteLength
-        ) as ArrayBuffer;
-      },
-      blob: async () => {
-        consumeBody();
-        return new Blob([buffer]);
-      },
-      text: async () => {
-        consumeBody();
-        return new TextDecoder().decode(buffer);
-      },
-      json: async <R = any>(): Promise<R> => {
-        consumeBody();
-        const text = new TextDecoder().decode(buffer);
-        return JSON.parse(text);
-      },
-    } as any;
-
-    Object.defineProperty(bodyObj, "bodyUsed", {
-      get: () => bodyUsed,
-    });
-
-    return {
-      ...cached,
-      body: bodyObj,
-    };
-  }
 }
 
 class NativeHeaders {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "jiren",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "author": "",
-  "main": "dist/index-node.js",
-  "module": "dist/index.js",
+  "main": "index.ts",
+  "module": "index.ts",
   "types": "index.ts",
   "devDependencies": {
     "@types/bun": "^1.3.4"
@@ -17,8 +17,7 @@
     "index-node.ts",
     "types",
     "lib",
-    "components",
-    "dist"
+    "components"
   ],
   "keywords": [
     "http",
@@ -35,7 +34,6 @@
   "license": "MIT",
   "scripts": {
     "build:zig": "cd .. && zig build --release=fast",
-    "build": "bun build ./index.ts --outfile ./dist/index.js --target bun && bun build ./index-node.ts --outfile ./dist/index-node.js --target node --external koffi",
     "test": "bun run examples/basic.ts"
   },
   "engines": {
@@ -45,14 +43,8 @@
   "type": "module",
   "exports": {
     ".": {
-      "bun": {
-        "types": "./index.ts",
-        "default": "./dist/index.js"
-      },
-      "default": {
-        "types": "./index-node.ts",
-        "default": "./dist/index-node.js"
-      }
+      "bun": "./index.ts",
+      "default": "./index-node.ts"
     },
     "./package.json": "./package.json"
   },