@sfutureapps/db-sdk 0.3.10 → 0.3.11

package/dist/index.d.mts

@@ -24,6 +24,7 @@ type ClientOptions = {
     accessToken?: () => string | null;
     fetch?: typeof fetch;
     headers?: Record<string, string>;
+    timeoutMs?: number;
 };
 
 declare class HttpClient {
@@ -32,8 +33,11 @@ declare class HttpClient {
     private accessToken?;
     private fetcher;
     private extraHeaders;
+    private timeoutMs;
     constructor(baseUrl: string, opts?: ClientOptions);
-    post<T>(path: string, body: any): Promise<DbResponse<T>>;
+    post<T>(path: string, body: any, init?: (RequestInit & {
+        timeoutMs?: number;
+    })): Promise<DbResponse<T>>;
 }
 
 type OrderOpts = {

package/dist/index.d.ts

@@ -24,6 +24,7 @@ type ClientOptions = {
     accessToken?: () => string | null;
     fetch?: typeof fetch;
     headers?: Record<string, string>;
+    timeoutMs?: number;
 };
 
 declare class HttpClient {
@@ -32,8 +33,11 @@ declare class HttpClient {
     private accessToken?;
     private fetcher;
     private extraHeaders;
+    private timeoutMs;
     constructor(baseUrl: string, opts?: ClientOptions);
-    post<T>(path: string, body: any): Promise<DbResponse<T>>;
+    post<T>(path: string, body: any, init?: (RequestInit & {
+        timeoutMs?: number;
+    })): Promise<DbResponse<T>>;
 }
 
 type OrderOpts = {

package/dist/index.js

@@ -30,6 +30,7 @@ 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") {
@@ -41,7 +42,7 @@ var HttpClient = class {
     this.fetcher = fetchImpl.bind(thisArg);
     this.extraHeaders = opts.headers ?? {};
   }
-  async post(path, body) {
+  async post(path, body, init = {}) {
     const headers = {
       "Content-Type": "application/json",
       ...this.extraHeaders
@@ -49,11 +50,41 @@ var HttpClient = class {
     if (this.apiKey) headers["x-api-key"] = this.apiKey;
     const token = this.accessToken?.();
     if (token) headers["Authorization"] = `Bearer ${token}`;
-    const res = await this.fetcher(`${this.baseUrl}${path}`, {
-      method: "POST",
-      headers,
-      body: JSON.stringify(body)
-    });
+    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,
+        method: "POST",
+        headers: {
+          ...headers,
+          ...restInit.headers
+        },
+        body: JSON.stringify(body),
+        signal: ac.signal
+      });
+    } catch (e) {
+      const isAbort = e?.name === "AbortError";
+      return {
+        data: null,
+        error: {
+          status: 0,
+          message: isAbort ? "Request timeout" : e?.message || "Network error",
+          details: e
+        }
+      };
+    } finally {
+      clearTimeout(timeoutId);
+    }
     const text = await res.text();
     if (!res.ok) {
       return { data: null, error: { status: res.status, message: text || res.statusText } };

package/dist/index.mjs

@@ -4,6 +4,7 @@ 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") {
@@ -15,7 +16,7 @@ var HttpClient = class {
     this.fetcher = fetchImpl.bind(thisArg);
     this.extraHeaders = opts.headers ?? {};
   }
-  async post(path, body) {
+  async post(path, body, init = {}) {
     const headers = {
       "Content-Type": "application/json",
       ...this.extraHeaders
@@ -23,11 +24,41 @@ var HttpClient = class {
     if (this.apiKey) headers["x-api-key"] = this.apiKey;
     const token = this.accessToken?.();
     if (token) headers["Authorization"] = `Bearer ${token}`;
-    const res = await this.fetcher(`${this.baseUrl}${path}`, {
-      method: "POST",
-      headers,
-      body: JSON.stringify(body)
-    });
+    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,
+        method: "POST",
+        headers: {
+          ...headers,
+          ...restInit.headers
+        },
+        body: JSON.stringify(body),
+        signal: ac.signal
+      });
+    } catch (e) {
+      const isAbort = e?.name === "AbortError";
+      return {
+        data: null,
+        error: {
+          status: 0,
+          message: isAbort ? "Request timeout" : e?.message || "Network error",
+          details: e
+        }
+      };
+    } finally {
+      clearTimeout(timeoutId);
+    }
     const text = await res.text();
     if (!res.ok) {
       return { data: null, error: { status: res.status, message: text || res.statusText } };

package/package.json

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