jiren 1.3.0 → 1.3.1

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 cached as any;
+                return self.rehydrateResponse(cached);
               }
             }
 
@@ -538,18 +538,6 @@ export class JirenClient<
         // Handle GZIP compression
         const contentEncoding = headersProxy["content-encoding"]?.toLowerCase();
 
-        // DEBUG LOGS
-        if (len > 0) {
-          console.log(`[Jiren] Body len: ${len}, Encoding: ${contentEncoding}`);
-          if (buffer.length > 2) {
-            console.log(
-              `[Jiren] Bytes: 0x${buffer[0]?.toString(
-                16
-              )} 0x${buffer[1]?.toString(16)} 0x${buffer[2]?.toString(16)}`
-            );
-          }
-        }
-
         if (
           contentEncoding === "gzip" ||
           (buffer.length > 2 && buffer[0] === 0x1f && buffer[1] === 0x8b)
@@ -564,13 +552,22 @@ export class JirenClient<
         }
       }
 
+      // 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> = {
+      const bodyObj: JirenResponseBody<T> & { _raw?: string } = {
         bodyUsed: false,
+        _raw: base64Data,
         arrayBuffer: async () => {
           consumeBody();
           return buffer.buffer.slice(
@@ -610,6 +607,63 @@ 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 cached as any;
+                return self.rehydrateResponse(cached);
               }
             }
 
@@ -699,6 +699,14 @@ 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) {
@@ -706,8 +714,9 @@ export class JirenClient<
         bodyUsed = true;
       };
 
-      const bodyObj: JirenResponseBody<T> = {
+      const bodyObj: JirenResponseBody<T> & { _raw?: string } = {
         bodyUsed: false,
+        _raw: base64Data,
         arrayBuffer: async () => {
           consumeBody();
           if (Buffer.isBuffer(buffer)) {
@@ -782,6 +791,64 @@ 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 {