@sfutureapps/db-sdk 0.3.11 → 0.3.12

package/dist/index.d.mts

@@ -31,13 +31,14 @@ declare class HttpClient {
     private baseUrl;
     private apiKey?;
     private accessToken?;
-    private fetcher;
     private extraHeaders;
-    private timeoutMs;
     constructor(baseUrl: string, opts?: ClientOptions);
-    post<T>(path: string, body: any, init?: (RequestInit & {
+    httpFetch(input: RequestInfo, init?: RequestInit & {
         timeoutMs?: number;
-    })): Promise<DbResponse<T>>;
+    }): Promise<any>;
+    post<T>(path: string, body: any, init?: RequestInit & {
+        timeoutMs?: number;
+    }): Promise<DbResponse<T>>;
 }
 
 type OrderOpts = {

package/dist/index.d.ts

@@ -31,13 +31,14 @@ declare class HttpClient {
     private baseUrl;
     private apiKey?;
     private accessToken?;
-    private fetcher;
     private extraHeaders;
-    private timeoutMs;
     constructor(baseUrl: string, opts?: ClientOptions);
-    post<T>(path: string, body: any, init?: (RequestInit & {
+    httpFetch(input: RequestInfo, init?: RequestInit & {
         timeoutMs?: number;
-    })): Promise<DbResponse<T>>;
+    }): Promise<any>;
+    post<T>(path: string, body: any, init?: RequestInit & {
+        timeoutMs?: number;
+    }): Promise<DbResponse<T>>;
 }
 
 type OrderOpts = {

package/dist/index.js

@@ -30,18 +30,32 @@ var HttpClient = class {
     this.baseUrl = baseUrl.replace(/\/+$/, "");
     this.apiKey = opts.apiKey;
     this.accessToken = opts.accessToken;
-    this.timeoutMs = opts.timeoutMs ?? 15e3;
     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."
-      );
+      throw new Error("Fetch API is not available in this environment. Provide ClientOptions.fetch or a global fetch polyfill.");
     }
-    const thisArg = g.window && g.window.fetch === fetchImpl ? g.window : g;
-    this.fetcher = fetchImpl.bind(thisArg);
     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;
+      }
+      return payload;
+    } finally {
+      clearTimeout(id);
+    }
+  }
   async post(path, body, init = {}) {
     const headers = {
       "Content-Type": "application/json",
@@ -50,55 +64,35 @@ var HttpClient = class {
     if (this.apiKey) headers["x-api-key"] = this.apiKey;
     const token = this.accessToken?.();
     if (token) headers["Authorization"] = `Bearer ${token}`;
-    const { timeoutMs = this.timeoutMs, ...restInit } = init;
-    const ac = new AbortController();
-    const timeoutId = setTimeout(() => ac.abort(), Math.max(0, timeoutMs));
-    if (restInit.signal) {
-      if (restInit.signal.aborted) {
-        ac.abort();
-      } else {
-        restInit.signal.addEventListener("abort", () => ac.abort(), { once: true });
-      }
-    }
-    let res;
     try {
-      res = await this.fetcher(`${this.baseUrl}${path}`, {
-        ...restInit,
+      const { payload } = await this.httpFetch(`${this.baseUrl}${path}`, {
+        ...init,
         method: "POST",
         headers: {
           ...headers,
-          ...restInit.headers
+          ...init.headers
         },
-        body: JSON.stringify(body),
-        signal: ac.signal
+        body: JSON.stringify(body)
       });
+      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 } };
     } catch (e) {
       const isAbort = e?.name === "AbortError";
       return {
         data: null,
         error: {
-          status: 0,
+          status: e?.status ?? 0,
           message: isAbort ? "Request timeout" : e?.message || "Network error",
-          details: e
+          details: e?.body ?? e
         }
       };
-    } finally {
-      clearTimeout(timeoutId);
-    }
-    const text = await res.text();
-    if (!res.ok) {
-      return { data: null, error: { status: res.status, message: text || res.statusText } };
-    }
-    try {
-      const json = JSON.parse(text || "{}");
-      return {
-        data: json.data ?? null,
-        count: json.count ?? null,
-        meta: json.meta ?? null,
-        error: json.error ?? null
-      };
-    } catch {
-      return { data: null, error: { status: res.status, message: "Invalid JSON response", details: text } };
     }
   }
 };

package/dist/index.mjs

@@ -4,18 +4,32 @@ var HttpClient = class {
     this.baseUrl = baseUrl.replace(/\/+$/, "");
     this.apiKey = opts.apiKey;
     this.accessToken = opts.accessToken;
-    this.timeoutMs = opts.timeoutMs ?? 15e3;
     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."
-      );
+      throw new Error("Fetch API is not available in this environment. Provide ClientOptions.fetch or a global fetch polyfill.");
     }
-    const thisArg = g.window && g.window.fetch === fetchImpl ? g.window : g;
-    this.fetcher = fetchImpl.bind(thisArg);
     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;
+      }
+      return payload;
+    } finally {
+      clearTimeout(id);
+    }
+  }
   async post(path, body, init = {}) {
     const headers = {
       "Content-Type": "application/json",
@@ -24,55 +38,35 @@ var HttpClient = class {
     if (this.apiKey) headers["x-api-key"] = this.apiKey;
     const token = this.accessToken?.();
     if (token) headers["Authorization"] = `Bearer ${token}`;
-    const { timeoutMs = this.timeoutMs, ...restInit } = init;
-    const ac = new AbortController();
-    const timeoutId = setTimeout(() => ac.abort(), Math.max(0, timeoutMs));
-    if (restInit.signal) {
-      if (restInit.signal.aborted) {
-        ac.abort();
-      } else {
-        restInit.signal.addEventListener("abort", () => ac.abort(), { once: true });
-      }
-    }
-    let res;
     try {
-      res = await this.fetcher(`${this.baseUrl}${path}`, {
-        ...restInit,
+      const { payload } = await this.httpFetch(`${this.baseUrl}${path}`, {
+        ...init,
         method: "POST",
         headers: {
           ...headers,
-          ...restInit.headers
+          ...init.headers
         },
-        body: JSON.stringify(body),
-        signal: ac.signal
+        body: JSON.stringify(body)
       });
+      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 } };
     } catch (e) {
       const isAbort = e?.name === "AbortError";
       return {
         data: null,
         error: {
-          status: 0,
+          status: e?.status ?? 0,
           message: isAbort ? "Request timeout" : e?.message || "Network error",
-          details: e
+          details: e?.body ?? e
         }
       };
-    } finally {
-      clearTimeout(timeoutId);
-    }
-    const text = await res.text();
-    if (!res.ok) {
-      return { data: null, error: { status: res.status, message: text || res.statusText } };
-    }
-    try {
-      const json = JSON.parse(text || "{}");
-      return {
-        data: json.data ?? null,
-        count: json.count ?? null,
-        meta: json.meta ?? null,
-        error: json.error ?? null
-      };
-    } catch {
-      return { data: null, error: { status: res.status, message: "Invalid JSON response", details: text } };
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sfutureapps/db-sdk",
-  "version": "0.3.11",
+  "version": "0.3.12",
   "description": "SfutureApps JS SDK for ThinkPHP DB Gateway (MySQL)",
   "license": "MIT",
   "main": "dist/index.cjs",