@sfutureapps/db-sdk 0.3.16 → 0.3.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sfutureapps/db-sdk",
-  "version": "0.3.16",
+  "version": "0.3.17",
   "description": "SfutureApps JS SDK for ThinkPHP DB Gateway (MySQL)",
   "license": "MIT",
   "type": "module",

package/src/client.js

@@ -1,53 +1,191 @@
-import axios from "axios";
-
-export class HttpClient {
-  constructor(baseUrl, opts = {}) {
-    this.baseUrl = String(baseUrl).replace(/\/+$/, "");
-    this.apiKey = opts.apiKey;
-    this.accessToken = opts.accessToken;
-    this.extraHeaders = opts.headers || {};
-
-    this.ax = axios.create({
-      baseURL: this.baseUrl,
-      timeout: opts.timeoutMs || 15000,
-      headers: {
-        "Content-Type": "application/json",
-        ...this.extraHeaders,
-      },
-    });
-  }
-
-  async post(path, body, config = {}) {
-    const headers = {
-      ...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 res = await this.ax.post(path, body, { ...config, headers });
-      const payload = res.data || {};
-      return {
-        data: payload.data ?? null,
-        count: payload.count ?? null,
-        meta: payload.meta ?? null,
-        error: payload.error ?? null,
-      };
-    } catch (e) {
-      const status = e?.response?.status ?? 0;
-      const payload = e?.response?.data ?? null;
-      return {
-        data: null,
-        error: {
-          status,
-          message: payload?.error?.message ?? e?.message ?? "Network error",
-          details: payload ?? e,
-        },
-      };
+// form-urlencoded request helpers (Vite / React / Next / Node safe)
+
+// --- Env helpers -------------------------------------------------------------
+
+function getEnv(key, fallback = "") {
+  // Node / Next server
+  if (typeof process !== "undefined" && process.env) {
+    if (process.env[ key ] !== undefined) return process.env[ key ];
+    if (process.env[ `NEXT_PUBLIC_${key}` ] !== undefined) return process.env[ `NEXT_PUBLIC_${key}` ];
+    if (process.env[ `VITE_${key}` ] !== undefined) return process.env[ `VITE_${key}` ];
+    if (process.env[ `REACT_APP_${key}` ] !== undefined) return process.env[ `REACT_APP_${key}` ];
+  }
+  // Vite client
+  if (typeof import.meta !== "undefined" && import.meta.env) {
+    if (import.meta.env[ key ] !== undefined) return import.meta.env[ key ];
+    if (import.meta.env[ `VITE_${key}` ] !== undefined) return import.meta.env[ `VITE_${key}` ];
+    if (import.meta.env[ `NEXT_PUBLIC_${key}` ] !== undefined) return import.meta.env[ `NEXT_PUBLIC_${key}` ];
+    if (import.meta.env[ `REACT_APP_${key}` ] !== undefined) return import.meta.env[ `REACT_APP_${key}` ];
+  }
+  // Browser globals (optional)
+  if (typeof window !== "undefined") {
+    if (window[ key ] !== undefined) return window[ key ];
+    if (window.ENV?.[ key ] !== undefined) return window.ENV[ key ];
+  }
+  return fallback;
+}
+
+// Only accept explicit API_URL (which also maps to NEXT_PUBLIC_API_URL / VITE_API_URL / REACT_APP_API_URL via getEnv)
+const API_URL = (getEnv("API_URL") || "").replace(/\/+$/, "");
+const API_KEY = getEnv("API_KEY") || "";
+const TOKEN_NAME = getEnv("TOKEN_NAME", "token") || "token";
+const IS_AUTH = String(getEnv("IS_AUTH") || "").toLowerCase();
+const REQUIRE_AUTH = [ "true", "1", "yes" ].includes(IS_AUTH);
+
+// If you never want token on GET, set INCLUDE_TOKEN_IN_GET=false explicitly.
+const INCLUDE_TOKEN_IN_GET = String(getEnv("INCLUDE_TOKEN_IN_GET", "true")).toLowerCase();
+const ADD_TOKEN_TO_GET = [ "true", "1", "yes" ].includes(INCLUDE_TOKEN_IN_GET);
+
+if (!API_URL) {
+  throw new Error(
+    "API_URL (or BASE_URL) is required. For Vite use VITE_API_URL, for Next use NEXT_PUBLIC_API_URL, for CRA use REACT_APP_API_URL."
+  );
+}
+
+// --- Utilities ---------------------------------------------------------------
+
+export function getToken() {
+  try {
+    if (typeof window !== "undefined" && window.localStorage) {
+      const t = window.localStorage.getItem(TOKEN_NAME);
+      if (t) return t;
     }
+  } catch (_) { }
+  // Fallback (SSR): allow env var named as TOKEN_NAME to carry the value
+  const fromEnv = getEnv(TOKEN_NAME, "");
+  return fromEnv || "";
+}
+
+export function toForm(data) {
+  if (!data || typeof data !== "object") return undefined;
+  const form = new URLSearchParams();
+  for (const [ k, v ] of Object.entries(data)) {
+    if (v === undefined || v === null) continue;
+    if (Array.isArray(v)) {
+      for (const item of v) form.append(k, String(item));
+    } else if (typeof v === "object") {
+      form.append(k, JSON.stringify(v));
+    } else {
+      form.append(k, String(v));
+    }
+  }
+  return form.toString();
+}
+
+/**
+ * Build a full URL by joining API_URL and endpoint, then append params.
+ * - Keeps API_URL path segments (e.g., '/api') intact.
+ * - Accepts endpoint with or without leading slash.
+ */
+export function buildUrl(endpoint = "", params) {
+  const base = API_URL.replace(/\/+$/, ""); // trim trailing slashes
+  const ep = String(endpoint || "").replace(/^\/+/, ""); // trim leading slashes
+  const full = ep ? `${base}/${ep}` : base;
+  const url = new URL(full);
+
+  if (params && typeof params === "object") {
+    for (const [ k, v ] of Object.entries(params)) {
+      if (v === undefined || v === null) continue;
+      if (Array.isArray(v)) {
+        for (const item of v) url.searchParams.append(k, String(item));
+      } else if (typeof v === "object") {
+        url.searchParams.append(k, JSON.stringify(v));
+      } else {
+        url.searchParams.append(k, String(v));
+      }
+    }
+  }
+  return url;
+}
+
+export async function httpFetch(input, init = {}) {
+  const { timeoutMs = 15000, ...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.body = payload;
+      throw err;
+    }
+    return payload;
+  } finally {
+    clearTimeout(id);
   }
 }
+
+// --- HTTP helpers ------------------------------------------------------------
+
+export async function get({ endpoint, params } = {}) {
+  if (!endpoint || typeof endpoint !== "string") {
+    throw new Error("Invalid URL");
+  }
+
+  const url = buildUrl(endpoint, params);
+
+  // console.log("GET", url.toString());
+
+
+  if (REQUIRE_AUTH && ADD_TOKEN_TO_GET) {
+    const token = getToken();
+    if (!token) throw new Error(`Auth required but token '${TOKEN_NAME}' not found`);
+    url.searchParams.set("token", token);
+  }
+
+  const headers = {
+    Accept: "application/json",
+    ...(API_KEY ? { "X-API-Key": API_KEY } : {}),
+  };
+
+  return httpFetch(url.toString(), { method: "POST", headers });
+}
+
+export default async function post({ endpoint, data, params } = {}) {
+  if (!endpoint || typeof endpoint !== "string") {
+    throw new Error("Invalid URL");
+  }
+
+  // Compatibility with earlier behavior
+  if (!data && !params) return get({ endpoint });
+  if (!data && params) return get({ endpoint, params });
+
+  if (data !== null && typeof data !== "object") {
+    throw new Error("Invalid data");
+  }
+
+  const url = buildUrl(endpoint, params);
+
+  // console.log("POST", url.toString());
+
+  const headers = {
+    "Content-Type": "application/x-www-form-urlencoded",
+    Accept: "application/json",
+    ...(API_KEY ? { "X-API-Key": API_KEY } : {}),
+  };
+
+  const bodyObj = { ...(data || {}) };
+
+  if (REQUIRE_AUTH) {
+    const token = getToken();
+    if (!token) throw new Error(`Auth required but token '${TOKEN_NAME}' not found`);
+    bodyObj.token = token;
+  }
+
+  return httpFetch(url.toString(), {
+    method: "POST",
+    headers,
+    body: toForm(bodyObj),
+  });
+}
+
+/*
+Usage notes:
+- Set VITE_API_URL=https://m3menu.nealika.net/api (or NEXT_PUBLIC_API_URL / REACT_APP_API_URL).
+- Call with endpoint WITHOUT a leading slash, e.g.:
+    await get({ endpoint: "hotel/list", params: { page: 1 } });
+    await post({ endpoint: "auth/login", data: { email, password } });
+- If you pass a full absolute URL as `endpoint`, it will override the base (standard URL behavior).
+*/

package/src/index.js

@@ -1,11 +1,9 @@
-import { HttpClient } from "./client.js";
 import { QueryBuilder } from "./query-builder.js";
 
 export function createClient(baseUrl, opts = {}) {
-  const http = new HttpClient(baseUrl, opts);
   return {
     from(table) {
-      return new QueryBuilder(http, table);
+      return new QueryBuilder(table);
     },
   };
 }

package/src/query-builder.js

@@ -1,9 +1,10 @@
+import post from "./client";
+
 export class QueryBuilder {
-  constructor(client, table) {
-    this.client = client;
+  constructor(table) {
     this.tableName = table;
 
-    this._select = ["*"];
+    this._select = [ "*" ];
     this._filters = [];
     this._order = [];
     this._limit = null;
@@ -22,7 +23,7 @@ export class QueryBuilder {
   // ---- select ----
   select(columns = "*") {
     const cols = String(columns).trim();
-    this._select = cols === "*" || cols === "" ? ["*"] : cols.split(",").map(s => s.trim()).filter(Boolean);
+    this._select = cols === "*" || cols === "" ? [ "*" ] : cols.split(",").map(s => s.trim()).filter(Boolean);
     return this;
   }
 
@@ -124,12 +125,12 @@ export class QueryBuilder {
     if (this._page !== null) payload.page = this._page;
     if (this._offset !== null) payload.offset = this._offset;
 
-    const res = await this.client.post("/db/v1/query", payload);
+    const res = await post({ endpoint: "/db/v1/query", data: payload });
 
     if (res.error) return res;
 
     if (this._single) {
-      const first = Array.isArray(res.data) ? (res.data[0] ?? null) : null;
+      const first = Array.isArray(res.data) ? (res.data[ 0 ] ?? null) : null;
       return { data: first, error: null, count: res.count ?? null, meta: res.meta ?? null };
     }
 
@@ -138,11 +139,15 @@ export class QueryBuilder {
 
   // ---- aggregates ----
   _agg(fn, field = "*") {
-    return this.client.post("/db/v1/query", {
-      table: this.tableName,
-      aggregate: { fn, field },
-      filters: this._filters,
+    return post({
+      endpoint: "/db/v1/query",
+      data: {
+        table: this.tableName,
+        aggregate: { fn, field },
+        filters: this._filters,
+      }
     });
+
   }
 
   count(field = "*") { return this._agg("count", field); }
@@ -153,20 +158,29 @@ export class QueryBuilder {
 
   // ---- write ----
   insert(values) {
-    return this.client.post("/db/v1/insert", { table: this.tableName, values });
+    return post({
+      endpoint: "/db/v1/insert",
+      data: { table: this.tableName, values }
+    });
   }
 
   update(values) {
     if (this._filters.length === 0) {
       return Promise.resolve({ data: null, error: { message: "Update requires filters (e.g. .eq('id', 1))" } });
     }
-    return this.client.post("/db/v1/update", { table: this.tableName, values, filters: this._filters });
+    return post({
+      endpoint: "/db/v1/update",
+      data: { table: this.tableName, values, filters: this._filters }
+    });
   }
 
   delete() {
     if (this._filters.length === 0) {
       return Promise.resolve({ data: null, error: { message: "Delete requires filters (e.g. .eq('id', 1))" } });
     }
-    return this.client.post("/db/v1/delete", { table: this.tableName, filters: this._filters });
+    return post({
+      endpoint: "/db/v1/delete",
+      data: { table: this.tableName, filters: this._filters }
+    });
   }
 }