zone4code-sdk 1.0.5 → 1.0.7

package/dist/index.js

@@ -17,6 +17,22 @@ function decodeJwtPayload(token) {
     return null;
   }
 }
+function normalizeHeaders(headers) {
+  const result = {};
+  if (!headers) return result;
+  if (typeof Headers !== "undefined" && headers instanceof Headers) {
+    headers.forEach((value, key) => {
+      result[key] = value;
+    });
+  } else if (Array.isArray(headers)) {
+    for (const [key, value] of headers) {
+      result[key] = value;
+    }
+  } else {
+    Object.assign(result, headers);
+  }
+  return result;
+}
 var AuthClient = class _AuthClient {
   gatewayUrl;
   tenantId;
@@ -26,26 +42,39 @@ var AuthClient = class _AuthClient {
   token = null;
   refreshTokenValue = null;
   fetchFn;
+  autoRefresh;
+  tokenExpiryBuffer;
+  onSessionExpiredCallback;
+  sessionExpiredListeners = [];
+  activeRefreshPromise = null;
+  storageLoadedPromise;
   static TOKEN_KEY_PREFIX = "z4c_token_";
   constructor(options) {
+    const storage = options.storage;
+    const storageKey = options.storageKey || _AuthClient.TOKEN_KEY_PREFIX + options.tenantId;
+    const refreshStorageKey = storageKey + "_refresh";
     this.gatewayUrl = options.gatewayUrl.replace(/\/+$/, "");
     this.tenantId = options.tenantId;
-    this.storage = options.storage;
-    this.storageKey = options.storageKey || _AuthClient.TOKEN_KEY_PREFIX + this.tenantId;
-    this.refreshStorageKey = this.storageKey + "_refresh";
+    this.storage = storage;
+    this.storageKey = storageKey;
+    this.refreshStorageKey = refreshStorageKey;
     this.fetchFn = options.fetchFn || (typeof fetch !== "undefined" ? fetch : globalThis.fetch);
-    if (options.initialToken) {
-      this.setToken(options.initialToken);
-    } else {
-      Promise.resolve(this.storage.getItem(this.storageKey)).then((stored) => {
-        if (stored) this.token = stored;
-      }).catch(() => {
-      });
-      Promise.resolve(this.storage.getItem(this.refreshStorageKey)).then((stored) => {
-        if (stored) this.refreshTokenValue = stored;
-      }).catch(() => {
-      });
-    }
+    this.autoRefresh = options.autoRefresh ?? true;
+    this.tokenExpiryBuffer = options.tokenExpiryBuffer ?? 30;
+    this.onSessionExpiredCallback = options.onSessionExpired;
+    this.storageLoadedPromise = (async () => {
+      if (options.initialToken) {
+        this.setToken(options.initialToken);
+      } else {
+        try {
+          const storedToken = await storage.getItem(storageKey);
+          if (storedToken) this.token = storedToken;
+          const storedRefresh = await storage.getItem(refreshStorageKey);
+          if (storedRefresh) this.refreshTokenValue = storedRefresh;
+        } catch {
+        }
+      }
+    })();
   }
   getToken() {
     return this.token;
@@ -72,6 +101,94 @@ var AuthClient = class _AuthClient {
   isAuthenticated() {
     return !!this.token;
   }
+  /**
+   * Check whether the current access token is expired or expiring within bufferSeconds
+   */
+  isTokenExpired(bufferSeconds = this.tokenExpiryBuffer) {
+    if (!this.token) return true;
+    const payload = decodeJwtPayload(this.token);
+    if (!payload || typeof payload.exp !== "number") return false;
+    const nowSeconds = Math.floor(Date.now() / 1e3);
+    return nowSeconds >= payload.exp - bufferSeconds;
+  }
+  /**
+   * Returns a valid access token, proactively refreshing it if expired and autoRefresh is enabled
+   */
+  async getValidToken() {
+    await this.storageLoadedPromise;
+    if (!this.token) return null;
+    if (!this.autoRefresh) return this.token;
+    if (this.isTokenExpired()) {
+      const refreshToken = this.getRefreshToken();
+      if (refreshToken) {
+        try {
+          const res = await this.refreshToken(refreshToken);
+          return res.token || this.token;
+        } catch {
+          return null;
+        }
+      } else {
+        this.notifySessionExpired();
+        return null;
+      }
+    }
+    return this.token;
+  }
+  /**
+   * Register a callback triggered when session has expired completely
+   */
+  onSessionExpired(listener) {
+    this.sessionExpiredListeners.push(listener);
+    return () => {
+      this.sessionExpiredListeners = this.sessionExpiredListeners.filter((l) => l !== listener);
+    };
+  }
+  notifySessionExpired() {
+    this.logout();
+    for (const listener of this.sessionExpiredListeners) {
+      try {
+        listener();
+      } catch (e) {
+        console.error("Error in onSessionExpired listener:", e);
+      }
+    }
+    if (this.onSessionExpiredCallback) {
+      try {
+        this.onSessionExpiredCallback();
+      } catch (e) {
+        console.error("Error in onSessionExpired callback:", e);
+      }
+    }
+  }
+  /**
+   * Perform an HTTP request with automatic Authorization injection, proactive refresh, and reactive 401 retry
+   */
+  async fetchWithAuth(url, init = {}) {
+    await this.storageLoadedPromise;
+    const token = await this.getValidToken();
+    const headers = normalizeHeaders(init.headers);
+    if (!headers["x-tenant-id"] && !headers["X-Tenant-Id"]) {
+      headers["x-tenant-id"] = this.tenantId;
+    }
+    if (init.body && !headers["Content-Type"] && !headers["content-type"]) {
+      headers["Content-Type"] = "application/json";
+    }
+    if (token && !headers["Authorization"] && !headers["authorization"]) {
+      headers["Authorization"] = `Bearer ${token}`;
+    }
+    let res = await this.fetchFn(url, { ...init, headers });
+    if (res.status === 401 && this.autoRefresh && this.getRefreshToken()) {
+      try {
+        const refreshed = await this.refreshToken();
+        if (refreshed?.token) {
+          headers["Authorization"] = `Bearer ${refreshed.token}`;
+          res = await this.fetchFn(url, { ...init, headers });
+        }
+      } catch {
+      }
+    }
+    return res;
+  }
   /**
    * Synchronously parse and return current authenticated user from JWT token
    */
@@ -227,36 +344,48 @@ var AuthClient = class _AuthClient {
   async refreshToken(refreshToken) {
     const tokenToUse = refreshToken || this.getRefreshToken();
     if (!tokenToUse) {
+      this.notifySessionExpired();
       throw new Error("No refresh token available");
     }
-    const url = `${this.gatewayUrl}/auth/${this.tenantId}/refresh`;
-    const res = await this.fetchFn(url, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "x-tenant-id": this.tenantId
-      },
-      body: JSON.stringify({ refresh_token: tokenToUse })
-    });
-    if (!res.ok) {
-      const err = await res.json().catch(() => ({ message: res.statusText }));
-      throw new Error(err.message || err.error || `Token refresh failed with HTTP ${res.status}`);
+    if (this.activeRefreshPromise) {
+      return this.activeRefreshPromise;
     }
-    const json = await res.json();
-    const token = json.token || json.access_token;
-    if (token) {
-      this.setToken(token);
-    }
-    if (json.refresh_token) {
-      this.setRefreshToken(json.refresh_token);
-    }
-    const user = this.getUser() || json.user;
-    return {
-      token: token || "",
-      refreshToken: json.refresh_token,
-      user,
-      ...json
-    };
+    this.activeRefreshPromise = (async () => {
+      try {
+        const url = `${this.gatewayUrl}/auth/${this.tenantId}/refresh`;
+        const res = await this.fetchFn(url, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            "x-tenant-id": this.tenantId
+          },
+          body: JSON.stringify({ refresh_token: tokenToUse })
+        });
+        if (!res.ok) {
+          const err = await res.json().catch(() => ({ message: res.statusText }));
+          this.notifySessionExpired();
+          throw new Error(err.message || err.error || `Token refresh failed with HTTP ${res.status}`);
+        }
+        const json = await res.json();
+        const token = json.token || json.access_token;
+        if (token) {
+          this.setToken(token);
+        }
+        if (json.refresh_token) {
+          this.setRefreshToken(json.refresh_token);
+        }
+        const user = this.getUser() || json.user;
+        return {
+          token: token || "",
+          refreshToken: json.refresh_token,
+          user,
+          ...json
+        };
+      } finally {
+        this.activeRefreshPromise = null;
+      }
+    })();
+    return this.activeRefreshPromise;
   }
   /**
    * Request password reset email
@@ -385,13 +514,15 @@ var EntityQueryBuilder = class {
   typeName;
   getToken;
   fetchFn;
+  fetchWithAuth;
   queryParams = new URLSearchParams();
   constructor(options) {
     this.gatewayUrl = options.gatewayUrl.replace(/\/+$/, "");
     this.tenantId = options.tenantId;
     this.typeName = options.typeName;
-    this.getToken = options.getToken;
+    this.getToken = options.getToken || (() => null);
     this.fetchFn = options.fetchFn || (typeof fetch !== "undefined" ? fetch : globalThis.fetch);
+    this.fetchWithAuth = options.fetchWithAuth;
   }
   getHeaders() {
     const headers = {
@@ -404,6 +535,13 @@ var EntityQueryBuilder = class {
     }
     return headers;
   }
+  async executeRequest(url, init = {}) {
+    if (this.fetchWithAuth) {
+      return this.fetchWithAuth(url, init);
+    }
+    const headers = { ...this.getHeaders(), ...init.headers || {} };
+    return this.fetchFn(url, { ...init, headers });
+  }
   // ----------------------------------------------------
   // Filter Operators
   // ----------------------------------------------------
@@ -512,9 +650,7 @@ var EntityQueryBuilder = class {
   async list() {
     const qs = this.queryParams.toString();
     const url = `${this.gatewayUrl}/generic/${this.tenantId}/${this.typeName}${qs ? `?${qs}` : ""}`;
-    const res = await this.fetchFn(url, {
-      headers: this.getHeaders()
-    });
+    const res = await this.executeRequest(url);
     if (!res.ok) {
       const err = await res.json().catch(() => ({ message: res.statusText }));
       throw new Error(err.message || `Query failed with HTTP ${res.status}`);
@@ -537,9 +673,7 @@ var EntityQueryBuilder = class {
     }
     const qs = params.toString();
     const url = `${this.gatewayUrl}/generic/${this.tenantId}/${this.typeName}/${id}${qs ? `?${qs}` : ""}`;
-    const res = await this.fetchFn(url, {
-      headers: this.getHeaders()
-    });
+    const res = await this.executeRequest(url);
     if (!res.ok) {
       const err = await res.json().catch(() => ({ message: res.statusText }));
       throw new Error(err.message || `Failed to fetch ${this.typeName}/${id}`);
@@ -551,9 +685,8 @@ var EntityQueryBuilder = class {
    */
   async create(data) {
     const url = `${this.gatewayUrl}/generic/${this.tenantId}/${this.typeName}`;
-    const res = await this.fetchFn(url, {
+    const res = await this.executeRequest(url, {
       method: "POST",
-      headers: this.getHeaders(),
       body: JSON.stringify(data)
     });
     if (!res.ok) {
@@ -567,9 +700,8 @@ var EntityQueryBuilder = class {
    */
   async update(id, partialData) {
     const url = `${this.gatewayUrl}/generic/${this.tenantId}/${this.typeName}/${id}`;
-    const res = await this.fetchFn(url, {
+    const res = await this.executeRequest(url, {
       method: "PATCH",
-      headers: this.getHeaders(),
       body: JSON.stringify(partialData)
     });
     if (!res.ok) {
@@ -583,9 +715,8 @@ var EntityQueryBuilder = class {
    */
   async delete(id) {
     const url = `${this.gatewayUrl}/generic/${this.tenantId}/${this.typeName}/${id}`;
-    const res = await this.fetchFn(url, {
-      method: "DELETE",
-      headers: this.getHeaders()
+    const res = await this.executeRequest(url, {
+      method: "DELETE"
     });
     if (!res.ok) {
       const err = await res.json().catch(() => ({ message: res.statusText }));
@@ -598,9 +729,7 @@ var EntityQueryBuilder = class {
    */
   async revisions(id) {
     const url = `${this.gatewayUrl}/generic/${this.tenantId}/${this.typeName}/${id}/revisions`;
-    const res = await this.fetchFn(url, {
-      headers: this.getHeaders()
-    });
+    const res = await this.executeRequest(url);
     if (!res.ok) {
       const err = await res.json().catch(() => ({ message: res.statusText }));
       throw new Error(err.message || `Failed to fetch revisions for ${this.typeName}/${id}`);
@@ -613,9 +742,7 @@ var EntityQueryBuilder = class {
   async getRelations(id, lang) {
     const qs = lang ? `?lang=${encodeURIComponent(lang)}` : "";
     const url = `${this.gatewayUrl}/generic/${this.tenantId}/${this.typeName}/${id}/relations${qs}`;
-    const res = await this.fetchFn(url, {
-      headers: this.getHeaders()
-    });
+    const res = await this.executeRequest(url);
     if (!res.ok) {
       const err = await res.json().catch(() => ({ message: res.statusText }));
       throw new Error(err.message || `Failed to fetch relations for ${this.typeName}/${id}`);
@@ -653,9 +780,8 @@ var EntityQueryBuilder = class {
       };
     }
     const url = `${this.gatewayUrl}/generic/${this.tenantId}/${this.typeName}/${id}/relations`;
-    const res = await this.fetchFn(url, {
+    const res = await this.executeRequest(url, {
       method: "POST",
-      headers: this.getHeaders(),
       body: JSON.stringify(payload)
     });
     if (!res.ok) {
@@ -669,9 +795,8 @@ var EntityQueryBuilder = class {
    */
   async setLinks(id, payload) {
     const url = `${this.gatewayUrl}/generic/${this.tenantId}/${this.typeName}/${id}/relations`;
-    const res = await this.fetchFn(url, {
+    const res = await this.executeRequest(url, {
       method: "PUT",
-      headers: this.getHeaders(),
       body: JSON.stringify(payload)
     });
     if (!res.ok) {
@@ -685,9 +810,8 @@ var EntityQueryBuilder = class {
    */
   async unlink(id, relationName, targetId, targetTypeName) {
     const url = `${this.gatewayUrl}/generic/${this.tenantId}/${this.typeName}/${id}/relations/${encodeURIComponent(relationName)}/${encodeURIComponent(targetId)}?targetTypeName=${encodeURIComponent(targetTypeName)}`;
-    const res = await this.fetchFn(url, {
-      method: "DELETE",
-      headers: this.getHeaders()
+    const res = await this.executeRequest(url, {
+      method: "DELETE"
     });
     if (!res.ok) {
       const err = await res.json().catch(() => ({ message: res.statusText }));
@@ -700,9 +824,8 @@ var EntityQueryBuilder = class {
    */
   async action(actionName, payload) {
     const url = `${this.gatewayUrl}/generic/${this.tenantId}/${this.typeName}/actions/${actionName}`;
-    const res = await this.fetchFn(url, {
+    const res = await this.executeRequest(url, {
       method: "POST",
-      headers: this.getHeaders(),
       body: payload ? JSON.stringify(payload) : void 0
     });
     if (!res.ok) {
@@ -716,9 +839,8 @@ var EntityQueryBuilder = class {
    */
   async instanceAction(id, actionName, payload) {
     const url = `${this.gatewayUrl}/generic/${this.tenantId}/${this.typeName}/${id}/actions/${actionName}`;
-    const res = await this.fetchFn(url, {
+    const res = await this.executeRequest(url, {
       method: "POST",
-      headers: this.getHeaders(),
       body: payload ? JSON.stringify(payload) : void 0
     });
     if (!res.ok) {
@@ -733,9 +855,8 @@ var EntityQueryBuilder = class {
   async exportCsv() {
     const qs = this.queryParams.toString();
     const url = `${this.gatewayUrl}/generic/${this.tenantId}/${this.typeName}/export/csv${qs ? `?${qs}` : ""}`;
-    const res = await this.fetchFn(url, {
+    const res = await this.executeRequest(url, {
       headers: {
-        ...this.getHeaders(),
         "Accept": "text/csv"
       }
     });
@@ -753,11 +874,13 @@ var SchemaClient = class {
   tenantId;
   getToken;
   fetchFn;
+  fetchWithAuth;
   constructor(options) {
     this.gatewayUrl = options.gatewayUrl.replace(/\/+$/, "");
     this.tenantId = options.tenantId;
-    this.getToken = options.getToken;
+    this.getToken = options.getToken || (() => null);
     this.fetchFn = options.fetchFn || (typeof fetch !== "undefined" ? fetch : globalThis.fetch);
+    this.fetchWithAuth = options.fetchWithAuth;
   }
   getHeaders() {
     const headers = {
@@ -775,11 +898,11 @@ var SchemaClient = class {
    */
   async define(definition) {
     const url = `${this.gatewayUrl}/generic/${this.tenantId}/definition`;
-    const res = await this.fetchFn(url, {
+    const init = {
       method: "POST",
-      headers: this.getHeaders(),
       body: JSON.stringify(definition)
-    });
+    };
+    const res = this.fetchWithAuth ? await this.fetchWithAuth(url, init) : await this.fetchFn(url, { ...init, headers: this.getHeaders() });
     if (!res.ok) {
       const err = await res.json().catch(() => ({ message: res.statusText }));
       throw new Error(err.message || `Failed to define schema for ${definition.typeName}`);
@@ -833,13 +956,17 @@ var Zone4CodeClient = class {
       storage: this.storage,
       storageKey: config.storageKey,
       initialToken: config.token,
-      fetchFn: this.fetchFn
+      fetchFn: this.fetchFn,
+      autoRefresh: config.autoRefresh,
+      tokenExpiryBuffer: config.tokenExpiryBuffer,
+      onSessionExpired: config.onSessionExpired
     });
     this.schema = new SchemaClient({
       gatewayUrl: this.gatewayUrl,
       tenantId: this.tenantId,
       getToken: () => this.auth.getToken(),
-      fetchFn: this.fetchFn
+      fetchFn: this.fetchFn,
+      fetchWithAuth: (url, init) => this.auth.fetchWithAuth(url, init)
     });
   }
   /**
@@ -851,7 +978,8 @@ var Zone4CodeClient = class {
       tenantId: this.tenantId,
       typeName,
       getToken: () => this.auth.getToken(),
-      fetchFn: this.fetchFn
+      fetchFn: this.fetchFn,
+      fetchWithAuth: (url, init) => this.auth.fetchWithAuth(url, init)
     });
   }
   /**
@@ -860,21 +988,17 @@ var Zone4CodeClient = class {
   entities(typeName) {
     return this.from(typeName);
   }
+  /**
+   * Register a listener called whenever the session expires completely
+   */
+  onSessionExpired(callback) {
+    return this.auth.onSessionExpired(callback);
+  }
   /**
    * Get current authenticated user profile and platform wallet
    */
   async getMe() {
-    const token = this.auth.getToken();
-    if (!token) {
-      throw new Error("Not authenticated: please call login() or setToken() first");
-    }
-    const res = await this.fetchFn(`${this.gatewayUrl}/generic/${this.tenantId}/me`, {
-      headers: {
-        "Content-Type": "application/json",
-        "Authorization": `Bearer ${token}`,
-        "x-tenant-id": this.tenantId
-      }
-    });
+    const res = await this.auth.fetchWithAuth(`${this.gatewayUrl}/generic/${this.tenantId}/me`);
     if (!res.ok) {
       const err = await res.json().catch(() => ({ message: res.statusText }));
       throw new Error(err.message || `Failed to fetch profile & wallet (HTTP ${res.status})`);