apinow-sdk 0.11.19 → 0.12.0

package/dist/index.js

@@ -1,51 +1,53 @@
 import { ethers, Wallet, parseUnits, isAddress } from 'ethers';
+import fetch from 'node-fetch'; // Import node-fetch
 // Default RPC URLs
 const DEFAULT_ETH_RPC = 'https://rpc.ankr.com/eth';
 const DEFAULT_BASE_RPC = 'https://mainnet.base.org';
 // --- Helper function for fetch (Keep this) ---
 async function fetchJson(url, options) {
-    console.error(`fetchJson: Called with URL: ${url}`);
+    console.error(`fetchJson (using node-fetch): Called with URL: ${url}`);
     // Safer logging for options to avoid mutating Uint8Array body
     if (options) {
         const { body, ...optionsWithoutBody } = options; // Destructure to separate body for logging
-        console.error(`fetchJson: Called with options (metadata):`, JSON.stringify(optionsWithoutBody, null, 2));
+        console.error(`fetchJson (using node-fetch): Called with options (metadata):`, JSON.stringify(optionsWithoutBody, null, 2));
         if (options.headers) { // Log headers from original options
             const headers = options.headers;
             const contentLengthHeader = headers['Content-Length'] || headers['content-length'];
-            console.error(`fetchJson: Content-Length in options.headers before fetch: ${contentLengthHeader}`);
+            console.error(`fetchJson (using node-fetch): Content-Length in options.headers before fetch: ${contentLengthHeader}`);
         }
         if (body) {
-            if (body instanceof Uint8Array) {
-                // Log info about Uint8Array without converting it with String() or full JSON.stringify
-                const firstNBytes = body.slice(0, Math.min(body.length, 100)); // Get first 100 bytes or less
-                let snippet = "";
-                try {
-                    snippet = new TextDecoder("utf-8", { fatal: false }).decode(firstNBytes);
-                }
-                catch (e) {
-                    snippet = "(binary data, could not decode as UTF-8)";
-                }
-                console.error(`fetchJson: Body in options is Uint8Array, length: ${body.length}. Snippet (first ~100 bytes): ${snippet}`);
+            // For node-fetch, string or Buffer bodies are common.
+            // If we are passing a string, its length in bytes is what Content-Length should be.
+            // If it's a Buffer, Buffer.length.
+            if (typeof body === 'string') {
+                console.error(`fetchJson (using node-fetch): Body in options is string, length: ${body.length}. Snippet (first ~100 chars): ${body.substring(0, 100)}`);
+            }
+            else if (body instanceof Buffer) {
+                console.error(`fetchJson (using node-fetch): Body in options is Buffer, length: ${body.length}. Snippet (first ~100 bytes as hex): ${body.slice(0, 100).toString('hex')}`);
+            }
+            else if (body instanceof Uint8Array) {
+                // This case should ideally not be hit if txResponse prepares a string or Buffer
+                console.error(`fetchJson (using node-fetch): Body in options is Uint8Array, length: ${body.length}.`);
             }
             else {
-                // For string or other stringifiable bodies
                 try {
-                    console.error(`fetchJson: Body in options before fetch (first 500 chars): ${String(body).substring(0, 500)}`);
+                    console.error(`fetchJson (using node-fetch): Body in options before fetch (first 500 chars): ${String(body).substring(0, 500)}`);
                 }
                 catch (e) {
-                    console.error(`fetchJson: Body in options before fetch: (Could not be easily stringified for logging)`);
+                    console.error(`fetchJson (using node-fetch): Body in options before fetch: (Could not be easily stringified for logging)`);
                 }
             }
         }
         else {
-            console.error(`fetchJson: No body in options.`);
+            console.error(`fetchJson (using node-fetch): No body in options.`);
         }
     }
     else {
-        console.error(`fetchJson: Called with no options.`);
+        console.error(`fetchJson (using node-fetch): Called with no options.`);
     }
-    const response = await fetch(url, options); // IMPORTANT: Pass original options to fetch
-    console.error(`fetchJson: Response status: ${response.status}, ok: ${response.ok}`);
+    // @ts-ignore options might not perfectly match node-fetch's expected type if RequestInit from lib.dom.d.ts is too different
+    const response = await fetch(url, options);
+    console.error(`fetchJson (using node-fetch): Response status: ${response.status}, ok: ${response.ok}`);
     if (!response.ok) {
         const errorBody = await response.text();
         console.error(`fetchJson: Error response body: ${errorBody}`);
@@ -204,12 +206,13 @@ class ApiNow {
         else {
             // --- POST/PUT/etc.: Set data as body ---
             if (opts.data) {
-                console.error(`txResponse: Setting data as body for ${method} request:`, opts.data);
+                console.error(`txResponse: Setting data as body for ${method} request (to be used with node-fetch):`, opts.data);
                 const requestBodyString = JSON.stringify(opts.data);
-                const bodyBytes = new TextEncoder().encode(requestBodyString); // Convert to Uint8Array
-                fetchOptions.body = bodyBytes; // Use Uint8Array as the body
-                // Let fetch/undici set the Content-Length for Uint8Array
-                // (fetchOptions.headers as Record<string, string>)['Content-Length'] = String(bodyBytes.length);
+                // node-fetch can handle string bodies directly. For Content-Length:
+                const bodyBytes = new TextEncoder().encode(requestBodyString);
+                fetchOptions.body = requestBodyString; // Use the string as the body for node-fetch
+                // Explicitly set Content-Length from the byte length of the string
+                fetchOptions.headers['Content-Length'] = String(bodyBytes.length);
             }
         }
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apinow-sdk",
-  "version": "0.11.19",
+  "version": "0.12.0",
   "description": "ApiNow SDK · The endpoint vending machine",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,8 @@
   "license": "MIT",
   "dependencies": {
     "apinow-sdk": "^0.11.19",
-    "ethers": "^6.13.5"
+    "ethers": "^6.13.5",
+    "node-fetch": "^3.3.2"
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",