@ahoo-wang/fetcher-cosec 1.6.3 → 1.6.6

package/dist/deviceIdStorage.d.ts

@@ -1,4 +1,4 @@
-import { KeyStorage } from './storage';
+import { KeyStorage } from '@ahoo-wang/fetcher-storage';
 export declare const DEFAULT_COSEC_DEVICE_ID_KEY = "cosec-device-id";
 /**
  * Storage class for managing device identifiers.

package/dist/deviceIdStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deviceIdStorage.d.ts","sourceRoot":"","sources":["../src/deviceIdStorage.ts"],"names":[],"mappings":"AAcA,OAAO,EAA2B,UAAU,EAAE,MAAM,WAAW,CAAC;AAGhE,eAAO,MAAM,2BAA2B,oBAAoB,CAAC;AAE7D;;GAEG;AACH,qBAAa,eAAgB,SAAQ,UAAU,CAAC,MAAM,CAAC;gBACzC,GAAG,GAAE,MAAoC;IAQrD;;;;OAIG;IACH,gBAAgB,IAAI,MAAM;IAI1B;;;;OAIG;IACH,WAAW,IAAI,MAAM;CAYtB"}
+{"version":3,"file":"deviceIdStorage.d.ts","sourceRoot":"","sources":["../src/deviceIdStorage.ts"],"names":[],"mappings":"AAcA,OAAO,EAA+C,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAErG,eAAO,MAAM,2BAA2B,oBAAoB,CAAC;AAE7D;;GAEG;AACH,qBAAa,eAAgB,SAAQ,UAAU,CAAC,MAAM,CAAC;gBACzC,GAAG,GAAE,MAAoC;IAQrD;;;;OAIG;IACH,gBAAgB,IAAI,MAAM;IAI1B;;;;OAIG;IACH,WAAW,IAAI,MAAM;CAYtB"}

package/dist/index.d.ts

@@ -1,4 +1,3 @@
-export * from './storage';
 export * from './cosecRequestInterceptor';
 export * from './cosecResponseInterceptor';
 export * from './deviceIdStorage';
@@ -6,9 +5,7 @@ export * from './idGenerator';
 export * from './jwts';
 export * from './jwtToken';
 export * from './jwtTokenManager';
-export * from './serializer';
 export * from './tokenRefresher';
 export * from './tokenStorage';
 export * from './types';
-export * from './env';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,WAAW,CAAC;AAC1B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC"}

package/dist/index.es.js

@@ -1,9 +1,96 @@
-import { REQUEST_BODY_INTERCEPTOR_ORDER as k, ResultExtractors as y } from "@ahoo-wang/fetcher";
-import { nanoid as m } from "nanoid";
-function E() {
+import { REQUEST_BODY_INTERCEPTOR_ORDER as m, ResultExtractors as y } from "@ahoo-wang/fetcher";
+import { nanoid as S } from "nanoid";
+const a = class a {
+};
+a.DEVICE_ID = "CoSec-Device-Id", a.APP_ID = "CoSec-App-Id", a.AUTHORIZATION = "Authorization", a.REQUEST_ID = "CoSec-Request-Id";
+let i = a;
+const l = class l {
+};
+l.UNAUTHORIZED = 401;
+let h = l;
+const x = {
+  ALLOW: { authorized: !0, reason: "Allow" },
+  EXPLICIT_DENY: { authorized: !1, reason: "Explicit Deny" },
+  IMPLICIT_DENY: { authorized: !1, reason: "Implicit Deny" },
+  TOKEN_EXPIRED: { authorized: !1, reason: "Token Expired" },
+  TOO_MANY_REQUESTS: { authorized: !1, reason: "Too Many Requests" }
+};
+class C {
+  /**
+   * Generate a unique request ID.
+   *
+   * @returns A unique request ID
+   */
+  generateId() {
+    return S();
+  }
+}
+const E = new C(), O = "CoSecRequestInterceptor", _ = m + 1e3, g = "Ignore-Refresh-Token";
+class J {
+  /**
+   * Creates a new CoSecRequestInterceptor instance.
+   * @param options - The CoSec configuration options including appId, deviceIdStorage, and tokenManager
+   */
+  constructor(e) {
+    this.name = O, this.order = _, this.options = e;
+  }
+  /**
+   * Intercept requests to add CoSec authentication headers.
+   *
+   * This method adds the following headers to each request:
+   * - CoSec-App-Id: The application identifier from the CoSec options
+   * - CoSec-Device-Id: A unique device identifier, either retrieved from storage or generated
+   * - CoSec-Request-Id: A unique identifier for this specific request
+   * - Authorization: Bearer token if available in token storage
+   *
+   * @param exchange - The fetch exchange containing the request to process
+   *
+   * @remarks
+   * This method runs after RequestBodyInterceptor but before FetchInterceptor.
+   * It ensures that authentication headers are added to the request after all
+   * body processing is complete. The positioning allows for proper authentication
+   * header addition after all request body transformations are finished, ensuring
+   * that the final request is properly authenticated before being sent over the network.
+   * This execution order prevents authentication headers from being overwritten by
+   * subsequent request processing interceptors.
+   *
+   * The method also handles token refreshing when the current token is expired but still refreshable.
+   * It will attempt to refresh the token before adding the Authorization header to the request.
+   */
+  async intercept(e) {
+    const t = E.generateId(), s = this.options.deviceIdStorage.getOrCreate(), o = e.ensureRequestHeaders();
+    o[i.APP_ID] = this.options.appId, o[i.DEVICE_ID] = s, o[i.REQUEST_ID] = t;
+    let n = this.options.tokenManager.currentToken;
+    !n || o[i.AUTHORIZATION] || (!e.attributes.has(g) && n.isRefreshNeeded && n.isRefreshable && await this.options.tokenManager.refresh(), n = this.options.tokenManager.currentToken, n && (o[i.AUTHORIZATION] = `Bearer ${n.access.token}`));
+  }
+}
+const N = "CoSecResponseInterceptor", D = Number.MIN_SAFE_INTEGER + 1e3;
+class q {
+  /**
+   * Creates a new CoSecResponseInterceptor instance.
+   * @param options - The CoSec configuration options including token storage and refresher
+   */
+  constructor(e) {
+    this.name = N, this.order = D, this.options = e;
+  }
+  /**
+   * Intercepts the response and handles unauthorized responses by refreshing tokens.
+   * @param exchange - The fetch exchange containing request and response information
+   */
+  async intercept(e) {
+    const t = e.response;
+    if (t && t.status === h.UNAUTHORIZED && this.options.tokenManager.isRefreshable)
+      try {
+        await this.options.tokenManager.refresh(), await e.fetcher.interceptors.exchange(e);
+      } catch (s) {
+        throw this.options.tokenManager.tokenStorage.remove(), s;
+      }
+  }
+}
+function f() {
   return typeof window < "u";
 }
-class O {
+class A {
   constructor() {
     this.store = /* @__PURE__ */ new Map(), this.listeners = /* @__PURE__ */ new Set();
   }
@@ -70,7 +157,7 @@ class O {
    * @param eventInit - The initialization object for the StorageEvent
    */
   notifyListeners(e) {
-    E() && window.location && (e.url = e.url || window.location.href), e.storageArea = this, this.listeners.forEach((t) => {
+    f() && window.location && (e.url = e.url || window.location.href), e.storageArea = this, this.listeners.forEach((t) => {
       try {
         t(e);
       } catch (s) {
@@ -79,7 +166,7 @@ class O {
     });
   }
 }
-class _ {
+class P {
   /**
    * Creates a new BrowserListenableStorage instance.
    * @param storage - The native Storage object to wrap (e.g., localStorage or sessionStorage)
@@ -142,37 +229,8 @@ class _ {
     this.storage.setItem(e, t);
   }
 }
-const u = "storage", h = () => E() ? new _(window.localStorage) : new O();
-class N {
-  /**
-   * Serializes a value to a JSON string
-   * @param value The value to serialize
-   * @returns The JSON string representation of the value
-   */
-  /**
-   * Serializes a value to a JSON string
-   * @param value The value to serialize
-   * @returns The JSON string representation of the value
-   */
-  serialize(e) {
-    return JSON.stringify(e);
-  }
-  /**
-   * Deserializes a JSON string to a value
-   * @template V The type of the deserialized value
-   * @param value The JSON string to deserialize
-   * @returns The deserialized value
-   */
-  /**
-   * Deserializes a JSON string to a value
-   * @param value The JSON string to deserialize
-   * @returns The deserialized value
-   */
-  deserialize(e) {
-    return JSON.parse(e);
-  }
-}
-class g {
+const u = "storage", c = () => f() ? new P(window.localStorage) : new A();
+class I {
   /**
    * Returns the value as-is without serialization
    * @param value The value to pass through
@@ -201,19 +259,19 @@ class g {
     return e;
   }
 }
-const x = new N(), C = new g();
-function z() {
-  return C;
+const z = new I();
+function v() {
+  return z;
 }
-class f {
+class p {
   /**
    * Creates a new KeyStorage instance
    * @param options Configuration options for the storage
    */
   constructor(e) {
-    this.cacheValue = null, this.listener = (t) => {
-      t.key === this.key && (this.cacheValue = null, t.newValue && this.refreshCache(t.newValue));
-    }, this.key = e.key, this.serializer = e.serializer ?? z(), this.storage = e.storage ?? h(), this.storage.addListener(this.listener);
+    this.cacheValue = null, this.refreshCacheListener = (t) => {
+      this.cacheValue = null, t.newValue && this.refreshCache(t.newValue);
+    }, this.key = e.key, this.serializer = e.serializer ?? v(), this.storage = e.storage ?? c(), this.addListener(this.refreshCacheListener);
   }
   /**
    * Refreshes the cached value by deserializing the provided string
@@ -222,6 +280,12 @@ class f {
   refreshCache(e) {
     this.cacheValue = this.serializer.deserialize(e);
   }
+  addListener(e) {
+    const t = (s) => {
+      s.key === this.key && e(s);
+    };
+    return this.storage.addListener(t);
+  }
   /**
    * Gets the value associated with the key from storage
    * Uses cached value if available, otherwise retrieves from storage and caches it
@@ -250,100 +314,13 @@ class f {
     this.storage.removeItem(this.key), this.cacheValue = null;
   }
 }
-const a = class a {
-};
-a.DEVICE_ID = "CoSec-Device-Id", a.APP_ID = "CoSec-App-Id", a.AUTHORIZATION = "Authorization", a.REQUEST_ID = "CoSec-Request-Id";
-let n = a;
-const l = class l {
-};
-l.UNAUTHORIZED = 401;
-let c = l;
-const Y = {
-  ALLOW: { authorized: !0, reason: "Allow" },
-  EXPLICIT_DENY: { authorized: !1, reason: "Explicit Deny" },
-  IMPLICIT_DENY: { authorized: !1, reason: "Implicit Deny" },
-  TOKEN_EXPIRED: { authorized: !1, reason: "Token Expired" },
-  TOO_MANY_REQUESTS: { authorized: !1, reason: "Too Many Requests" }
-};
-class A {
-  /**
-   * Generate a unique request ID.
-   *
-   * @returns A unique request ID
-   */
-  generateId() {
-    return m();
-  }
-}
-const I = new A(), D = "CoSecRequestInterceptor", P = k + 1e3, p = "Ignore-Refresh-Token";
-class q {
-  /**
-   * Creates a new CoSecRequestInterceptor instance.
-   * @param options - The CoSec configuration options including appId, deviceIdStorage, and tokenManager
-   */
-  constructor(e) {
-    this.name = D, this.order = P, this.options = e;
-  }
-  /**
-   * Intercept requests to add CoSec authentication headers.
-   *
-   * This method adds the following headers to each request:
-   * - CoSec-App-Id: The application identifier from the CoSec options
-   * - CoSec-Device-Id: A unique device identifier, either retrieved from storage or generated
-   * - CoSec-Request-Id: A unique identifier for this specific request
-   * - Authorization: Bearer token if available in token storage
-   *
-   * @param exchange - The fetch exchange containing the request to process
-   *
-   * @remarks
-   * This method runs after RequestBodyInterceptor but before FetchInterceptor.
-   * It ensures that authentication headers are added to the request after all
-   * body processing is complete. The positioning allows for proper authentication
-   * header addition after all request body transformations are finished, ensuring
-   * that the final request is properly authenticated before being sent over the network.
-   * This execution order prevents authentication headers from being overwritten by
-   * subsequent request processing interceptors.
-   *
-   * The method also handles token refreshing when the current token is expired but still refreshable.
-   * It will attempt to refresh the token before adding the Authorization header to the request.
-   */
-  async intercept(e) {
-    const t = I.generateId(), s = this.options.deviceIdStorage.getOrCreate(), i = e.ensureRequestHeaders();
-    i[n.APP_ID] = this.options.appId, i[n.DEVICE_ID] = s, i[n.REQUEST_ID] = t;
-    let o = this.options.tokenManager.currentToken;
-    !o || i[n.AUTHORIZATION] || (!e.attributes.has(p) && o.isRefreshNeeded && o.isRefreshable && await this.options.tokenManager.refresh(), o = this.options.tokenManager.currentToken, o && (i[n.AUTHORIZATION] = `Bearer ${o.access.token}`));
-  }
-}
-const U = "CoSecResponseInterceptor", V = Number.MIN_SAFE_INTEGER + 1e3;
-class K {
-  /**
-   * Creates a new CoSecResponseInterceptor instance.
-   * @param options - The CoSec configuration options including token storage and refresher
-   */
-  constructor(e) {
-    this.name = U, this.order = V, this.options = e;
-  }
-  /**
-   * Intercepts the response and handles unauthorized responses by refreshing tokens.
-   * @param exchange - The fetch exchange containing request and response information
-   */
-  async intercept(e) {
-    const t = e.response;
-    if (t && t.status === c.UNAUTHORIZED && this.options.tokenManager.isRefreshable)
-      try {
-        await this.options.tokenManager.refresh(), await e.fetcher.interceptors.exchange(e);
-      } catch (s) {
-        throw this.options.tokenManager.tokenStorage.remove(), s;
-      }
-  }
-}
-const L = "cosec-device-id";
-class B extends f {
-  constructor(e = L) {
+const U = "cosec-device-id";
+class Y extends p {
+  constructor(e = U) {
     super({
       key: e,
-      serializer: new g(),
-      storage: h()
+      serializer: new I(),
+      storage: c()
     });
   }
   /**
@@ -352,7 +329,7 @@ class B extends f {
    * @returns A newly generated device ID
    */
   generateDeviceId() {
-    return I.generateId();
+    return E.generateId();
   }
   /**
    * Get or create a device ID.
@@ -369,20 +346,20 @@ function T(r) {
     const e = r.split(".");
     if (e.length !== 3)
       return null;
-    const s = e[1].replace(/-/g, "+").replace(/_/g, "/"), i = s.padEnd(
+    const s = e[1].replace(/-/g, "+").replace(/_/g, "/"), o = s.padEnd(
       s.length + (4 - s.length % 4) % 4,
       "="
-    ), o = decodeURIComponent(
-      atob(i).split("").map(function(S) {
-        return "%" + ("00" + S.charCodeAt(0).toString(16)).slice(-2);
+    ), n = decodeURIComponent(
+      atob(o).split("").map(function(w) {
+        return "%" + ("00" + w.charCodeAt(0).toString(16)).slice(-2);
       }).join("")
     );
-    return JSON.parse(o);
+    return JSON.parse(n);
   } catch (e) {
     return console.error("Failed to parse JWT token", e), null;
   }
 }
-function b(r, e = 0) {
+function L(r, e = 0) {
   const t = typeof r == "string" ? T(r) : r;
   if (!t)
     return !0;
@@ -401,7 +378,7 @@ class d {
    * @returns true if the token is expired, false otherwise
    */
   get isExpired() {
-    return b(this.payload, this.earlyPeriod);
+    return L(this.payload, this.earlyPeriod);
   }
 }
 class R {
@@ -426,7 +403,7 @@ class R {
     return !this.refresh.isExpired;
   }
 }
-class w {
+class k {
   constructor(e = 0) {
     this.earlyPeriod = e;
   }
@@ -448,8 +425,8 @@ class w {
     return JSON.stringify(e.token);
   }
 }
-const Q = new w();
-class j {
+const K = new k();
+class Q {
   /**
    * Creates a new JwtTokenManager instance
    * @param tokenStorage The storage used to persist tokens
@@ -524,18 +501,18 @@ class F {
       },
       {
         resultExtractor: y.Json,
-        attributes: /* @__PURE__ */ new Map([[p, !0]])
+        attributes: /* @__PURE__ */ new Map([[g, !0]])
       }
     );
   }
 }
-const M = "cosec-token";
-class G extends f {
-  constructor(e = M, t = 0) {
+const V = "cosec-token";
+class Z extends p {
+  constructor(e = V, t = 0) {
     super({
       key: e,
-      storage: h(),
-      serializer: new w(t)
+      storage: c(),
+      serializer: new k(t)
     }), this.earlyPeriod = t;
   }
   setCompositeToken(e) {
@@ -545,40 +522,29 @@ class G extends f {
   }
 }
 export {
-  Y as AuthorizeResults,
-  _ as BrowserListenableStorage,
-  D as COSEC_REQUEST_INTERCEPTOR_NAME,
-  P as COSEC_REQUEST_INTERCEPTOR_ORDER,
-  U as COSEC_RESPONSE_INTERCEPTOR_NAME,
-  V as COSEC_RESPONSE_INTERCEPTOR_ORDER,
-  n as CoSecHeaders,
-  q as CoSecRequestInterceptor,
-  K as CoSecResponseInterceptor,
+  x as AuthorizeResults,
+  O as COSEC_REQUEST_INTERCEPTOR_NAME,
+  _ as COSEC_REQUEST_INTERCEPTOR_ORDER,
+  N as COSEC_RESPONSE_INTERCEPTOR_NAME,
+  D as COSEC_RESPONSE_INTERCEPTOR_ORDER,
+  i as CoSecHeaders,
+  J as CoSecRequestInterceptor,
+  q as CoSecResponseInterceptor,
   F as CoSecTokenRefresher,
-  L as DEFAULT_COSEC_DEVICE_ID_KEY,
-  M as DEFAULT_COSEC_TOKEN_KEY,
-  B as DeviceIdStorage,
-  p as IGNORE_REFRESH_TOKEN_ATTRIBUTE_KEY,
-  g as IdentitySerializer,
-  O as InMemoryListenableStorage,
-  N as JsonSerializer,
+  U as DEFAULT_COSEC_DEVICE_ID_KEY,
+  V as DEFAULT_COSEC_TOKEN_KEY,
+  Y as DeviceIdStorage,
+  g as IGNORE_REFRESH_TOKEN_ATTRIBUTE_KEY,
   R as JwtCompositeToken,
-  w as JwtCompositeTokenSerializer,
+  k as JwtCompositeTokenSerializer,
   d as JwtToken,
-  j as JwtTokenManager,
-  f as KeyStorage,
-  A as NanoIdGenerator,
-  c as ResponseCodes,
-  u as STORAGE_EVENT_TYPE,
-  G as TokenStorage,
-  h as createListenableStorage,
-  I as idGenerator,
-  C as identitySerializer,
-  E as isBrowser,
-  b as isTokenExpired,
-  x as jsonSerializer,
-  Q as jwtCompositeTokenSerializer,
-  T as parseJwtPayload,
-  z as typedIdentitySerializer
+  Q as JwtTokenManager,
+  C as NanoIdGenerator,
+  h as ResponseCodes,
+  Z as TokenStorage,
+  E as idGenerator,
+  L as isTokenExpired,
+  K as jwtCompositeTokenSerializer,
+  T as parseJwtPayload
 };
 //# sourceMappingURL=index.es.js.map