@veryfi/veryfi-sdk 1.5.1 → 1.5.2

package/lib/client/request.js

@@ -1,7 +1,19 @@
 const Client = require('../client/constructor');
-const axios = require('axios').default;
-const FormData = require('form-data');
-const {promisify} = require("util");
+const { Readable } = require('stream');
+
+/**
+ * Convert a Node.js Readable stream to a Buffer.
+ * @private
+ * @param {stream.Readable} stream
+ * @returns {Promise<Buffer>}
+ */
+async function streamToBuffer(stream) {
+    const chunks = [];
+    for await (const chunk of stream) {
+        chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+    }
+    return Buffer.concat(chunks);
+}
 
 /**
  * Submit the HTTP request.
@@ -22,6 +34,15 @@ Client.prototype._request = async function (http_verb, endpoint_name, request_ar
     let partner = (options && options.skip_partner) ? "" : "/partner";
     let api_url = `${this.base_url}api/${api_version}${partner}${endpoint_name}`;
 
+    if (params && Object.keys(params).length > 0) {
+        const query = new URLSearchParams(
+            Object.entries(params).filter(([, v]) => v != null).map(([k, v]) => [k, String(v)])
+        ).toString();
+        if (query) {
+            api_url += `?${query}`;
+        }
+    }
+
     if (this.client_secret) {
         let timestamp = Date.now();
         let signature = this._generate_signature(request_arguments, timestamp);
@@ -31,33 +52,46 @@ Client.prototype._request = async function (http_verb, endpoint_name, request_ar
         });
     }
 
+    let body;
     if (has_files) {
         const formData = new FormData();
-        Object.entries(request_arguments).forEach(([key, value]) => {
-            if (value != null) {
-                formData.append(key, key === "file" ? value : value.toString());
+        for (const [key, value] of Object.entries(request_arguments)) {
+            if (value == null) continue;
+            if (key === "file") {
+                const buf = value instanceof Readable ? await streamToBuffer(value) : Buffer.from(value);
+                formData.append(key, new Blob([buf]));
+            } else {
+                formData.append(key, value.toString());
             }
-        });
-        headers = Object.assign(headers, formData.getHeaders());
-        const getLength = promisify(formData.getLength).bind(formData);
-        headers['Content-Length'] = await getLength()
-        request_arguments = formData;
+        }
+        // Let fetch set Content-Type with boundary automatically
+        delete headers["Content-Type"];
+        body = formData;
     } else {
-        request_arguments = JSON.stringify(request_arguments);
+        body = JSON.stringify(request_arguments);
     }
+
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), this.timeout * 1000);
+
     try {
-        return await axios.request({
+        const response = await fetch(api_url, {
             method: http_verb,
-            maxBodyLength: Infinity,
-            url: api_url,
             headers: headers,
-            data: request_arguments,
-            timeout: this.timeout * 1000,
-            params: params
+            body: ["GET", "HEAD"].includes(http_verb.toUpperCase()) ? undefined : body,
+            signal: controller.signal,
         });
-    } catch (response) {
-        let errorStatus = response?.response?.status;
-        let errorInfo = response?.response?.data;
-        throw new Error(`Error: ${errorStatus} ${JSON.stringify(errorInfo)}`);
+        const data = await response.json();
+        if (!response.ok) {
+            throw new Error(`Error: ${response.status} ${JSON.stringify(data)}`);
+        }
+        return { data };
+    } catch (err) {
+        if (err.name === 'AbortError') {
+            throw new Error(`Error: Request timed out after ${this.timeout} seconds`);
+        }
+        throw err;
+    } finally {
+        clearTimeout(timeoutId);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veryfi/veryfi-sdk",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Node.js module for communicating with the Veryfi OCR API",
   "main": "lib/client/client.js",
   "typings": "lib/types/Client.ts",
@@ -34,10 +34,6 @@
     "ts-jest": "^29.4.12",
     "typescript": "^5.9.3"
   },
-  "dependencies": {
-    "axios": "^1.19.0",
-    "form-data": "^4.0.6"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/veryfi/veryfi-nodejs"