@sfutureapps/db-sdk 0.3.12 → 0.3.13

package/dist/index.d.mts

@@ -1,3 +1,5 @@
+import { AxiosRequestConfig } from 'axios';
+
 type FilterOp = "eq" | "neq" | "gt" | "gte" | "lt" | "lte" | "like" | "notLike" | "between" | "notBetween" | "in" | "notIn" | "isNull" | "notNull" | "regexp" | "notRegexp" | "time" | "findInSet";
 type Filter = {
     col: string;
@@ -22,9 +24,7 @@ type DbResponse<T> = {
 type ClientOptions = {
     apiKey?: string;
     accessToken?: () => string | null;
-    fetch?: typeof fetch;
     headers?: Record<string, string>;
-    timeoutMs?: number;
 };
 
 declare class HttpClient {
@@ -32,13 +32,9 @@ declare class HttpClient {
     private apiKey?;
     private accessToken?;
     private extraHeaders;
+    private ax;
     constructor(baseUrl: string, opts?: ClientOptions);
-    httpFetch(input: RequestInfo, init?: RequestInit & {
-        timeoutMs?: number;
-    }): Promise<any>;
-    post<T>(path: string, body: any, init?: RequestInit & {
-        timeoutMs?: number;
-    }): Promise<DbResponse<T>>;
+    post<T>(path: string, body: any, config?: AxiosRequestConfig): Promise<DbResponse<T>>;
 }
 
 type OrderOpts = {

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+import { AxiosRequestConfig } from 'axios';
+
 type FilterOp = "eq" | "neq" | "gt" | "gte" | "lt" | "lte" | "like" | "notLike" | "between" | "notBetween" | "in" | "notIn" | "isNull" | "notNull" | "regexp" | "notRegexp" | "time" | "findInSet";
 type Filter = {
     col: string;
@@ -22,9 +24,7 @@ type DbResponse<T> = {
 type ClientOptions = {
     apiKey?: string;
     accessToken?: () => string | null;
-    fetch?: typeof fetch;
     headers?: Record<string, string>;
-    timeoutMs?: number;
 };
 
 declare class HttpClient {
@@ -32,13 +32,9 @@ declare class HttpClient {
     private apiKey?;
     private accessToken?;
     private extraHeaders;
+    private ax;
     constructor(baseUrl: string, opts?: ClientOptions);
-    httpFetch(input: RequestInfo, init?: RequestInit & {
-        timeoutMs?: number;
-    }): Promise<any>;
-    post<T>(path: string, body: any, init?: RequestInit & {
-        timeoutMs?: number;
-    }): Promise<DbResponse<T>>;
+    post<T>(path: string, body: any, config?: AxiosRequestConfig): Promise<DbResponse<T>>;
 }
 
 type OrderOpts = {

package/dist/index.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -25,72 +35,51 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/client.ts
+var import_axios = __toESM(require("axios"));
 var HttpClient = class {
   constructor(baseUrl, opts = {}) {
     this.baseUrl = baseUrl.replace(/\/+$/, "");
     this.apiKey = opts.apiKey;
     this.accessToken = opts.accessToken;
-    const g = globalThis;
-    const fetchImpl = opts.fetch ?? g.fetch ?? g.window?.fetch;
-    if (typeof fetchImpl !== "function") {
-      throw new Error("Fetch API is not available in this environment. Provide ClientOptions.fetch or a global fetch polyfill.");
-    }
     this.extraHeaders = opts.headers ?? {};
-  }
-  async httpFetch(input, init = {}) {
-    const { timeoutMs = 15e3, ...rest } = init;
-    const ac = new AbortController();
-    const id = setTimeout(() => ac.abort(), timeoutMs);
-    try {
-      const res = await fetch(input, { ...rest, signal: ac.signal });
-      const ct = res.headers.get("content-type") || "";
-      const payload = ct.includes("application/json") ? await res.json() : await res.text();
-      if (!res.ok) {
-        const err = new Error(`HTTP ${res.status} ${res.statusText}`);
-        err.status = res.status;
-        err.body = payload;
-        throw err;
+    this.ax = import_axios.default.create({
+      baseURL: this.baseUrl,
+      timeout: 15e3,
+      headers: {
+        "Content-Type": "application/json",
+        ...this.extraHeaders
       }
-      return payload;
-    } finally {
-      clearTimeout(id);
-    }
+    });
   }
-  async post(path, body, init = {}) {
+  async post(path, body, config = {}) {
     const headers = {
-      "Content-Type": "application/json",
-      ...this.extraHeaders
+      ...this.extraHeaders,
+      ...config.headers
     };
     if (this.apiKey) headers["x-api-key"] = this.apiKey;
     const token = this.accessToken?.();
     if (token) headers["Authorization"] = `Bearer ${token}`;
     try {
-      const { payload } = await this.httpFetch(`${this.baseUrl}${path}`, {
-        ...init,
-        method: "POST",
-        headers: {
-          ...headers,
-          ...init.headers
-        },
-        body: JSON.stringify(body)
+      const res = await this.ax.post(path, body, {
+        ...config,
+        headers
       });
-      if (payload && typeof payload === "object") {
-        return {
-          data: payload.data ?? null,
-          count: payload.count ?? null,
-          meta: payload.meta ?? null,
-          error: payload.error ?? null
-        };
-      }
-      return { data: null, error: { status: 200, message: "Invalid JSON response", details: payload } };
+      const payload = res.data;
+      return {
+        data: payload?.data ?? null,
+        count: payload?.count ?? null,
+        meta: payload?.meta ?? null,
+        error: payload?.error ?? null
+      };
     } catch (e) {
-      const isAbort = e?.name === "AbortError";
+      const status = e?.response?.status ?? 0;
+      const payload = e?.response?.data ?? null;
       return {
         data: null,
         error: {
-          status: e?.status ?? 0,
-          message: isAbort ? "Request timeout" : e?.message || "Network error",
-          details: e?.body ?? e
+          status,
+          message: payload?.error?.message ?? e?.message ?? "Network error",
+          details: payload ?? e
         }
       };
     }

package/dist/index.mjs

@@ -1,70 +1,49 @@
 // src/client.ts
+import axios from "axios";
 var HttpClient = class {
   constructor(baseUrl, opts = {}) {
     this.baseUrl = baseUrl.replace(/\/+$/, "");
     this.apiKey = opts.apiKey;
     this.accessToken = opts.accessToken;
-    const g = globalThis;
-    const fetchImpl = opts.fetch ?? g.fetch ?? g.window?.fetch;
-    if (typeof fetchImpl !== "function") {
-      throw new Error("Fetch API is not available in this environment. Provide ClientOptions.fetch or a global fetch polyfill.");
-    }
     this.extraHeaders = opts.headers ?? {};
-  }
-  async httpFetch(input, init = {}) {
-    const { timeoutMs = 15e3, ...rest } = init;
-    const ac = new AbortController();
-    const id = setTimeout(() => ac.abort(), timeoutMs);
-    try {
-      const res = await fetch(input, { ...rest, signal: ac.signal });
-      const ct = res.headers.get("content-type") || "";
-      const payload = ct.includes("application/json") ? await res.json() : await res.text();
-      if (!res.ok) {
-        const err = new Error(`HTTP ${res.status} ${res.statusText}`);
-        err.status = res.status;
-        err.body = payload;
-        throw err;
+    this.ax = axios.create({
+      baseURL: this.baseUrl,
+      timeout: 15e3,
+      headers: {
+        "Content-Type": "application/json",
+        ...this.extraHeaders
       }
-      return payload;
-    } finally {
-      clearTimeout(id);
-    }
+    });
   }
-  async post(path, body, init = {}) {
+  async post(path, body, config = {}) {
     const headers = {
-      "Content-Type": "application/json",
-      ...this.extraHeaders
+      ...this.extraHeaders,
+      ...config.headers
     };
     if (this.apiKey) headers["x-api-key"] = this.apiKey;
     const token = this.accessToken?.();
     if (token) headers["Authorization"] = `Bearer ${token}`;
     try {
-      const { payload } = await this.httpFetch(`${this.baseUrl}${path}`, {
-        ...init,
-        method: "POST",
-        headers: {
-          ...headers,
-          ...init.headers
-        },
-        body: JSON.stringify(body)
+      const res = await this.ax.post(path, body, {
+        ...config,
+        headers
       });
-      if (payload && typeof payload === "object") {
-        return {
-          data: payload.data ?? null,
-          count: payload.count ?? null,
-          meta: payload.meta ?? null,
-          error: payload.error ?? null
-        };
-      }
-      return { data: null, error: { status: 200, message: "Invalid JSON response", details: payload } };
+      const payload = res.data;
+      return {
+        data: payload?.data ?? null,
+        count: payload?.count ?? null,
+        meta: payload?.meta ?? null,
+        error: payload?.error ?? null
+      };
     } catch (e) {
-      const isAbort = e?.name === "AbortError";
+      const status = e?.response?.status ?? 0;
+      const payload = e?.response?.data ?? null;
       return {
         data: null,
         error: {
-          status: e?.status ?? 0,
-          message: isAbort ? "Request timeout" : e?.message || "Network error",
-          details: e?.body ?? e
+          status,
+          message: payload?.error?.message ?? e?.message ?? "Network error",
+          details: payload ?? e
         }
       };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sfutureapps/db-sdk",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "description": "SfutureApps JS SDK for ThinkPHP DB Gateway (MySQL)",
   "license": "MIT",
   "main": "dist/index.cjs",
@@ -35,5 +35,8 @@
     "typescript",
     "sFutureApps",
     "sfutureapps.com"
-  ]
+  ],
+  "dependencies": {
+    "axios": "^1.13.2"
+  }
 }