@chaosity/location-client-react 0.1.5 → 0.1.6

package/dist/provider/LocationClientProvider.d.ts

@@ -3,6 +3,8 @@ import { GeoPlacesClient, ClientConfig } from '@chaosity/location-client';
 interface LocationClientContextValue {
     config: ClientConfig | null;
     client: GeoPlacesClient | null;
+    getToken: () => string | undefined;
+    ensureValidToken: () => Promise<void>;
     loading: boolean;
     error: string | null;
 }

package/dist/provider/LocationClientProvider.js

@@ -3,6 +3,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { createContext, useContext, useEffect, useState, useRef, useCallback } from 'react';
 import { GeoPlacesClient } from '@chaosity/location-client';
 import debug from 'debug';
+import { jwtDecode } from 'jwt-decode';
 const log = debug('location-client-react:provider');
 const LocationClientContext = createContext(undefined);
 export function LocationClientProvider({ children, getConfig, refreshBuffer = 60 }) {
@@ -10,12 +11,16 @@ export function LocationClientProvider({ children, getConfig, refreshBuffer = 60
     const [client, setClient] = useState(null);
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState(null);
+    const tokenRef = useRef(undefined);
     const expiresAtRef = useRef(null);
     const getConfigRef = useRef(getConfig);
+    const tokenGenerationCount = useRef(0);
     // Update ref when getConfig changes
     useEffect(() => {
         getConfigRef.current = getConfig;
     }, [getConfig]);
+    // Token getter function (stable reference)
+    const getToken = useCallback(() => tokenRef.current, []);
     // Check if token is expired or about to expire
     const isTokenExpired = useCallback(() => {
         if (!expiresAtRef.current)
@@ -28,15 +33,29 @@ export function LocationClientProvider({ children, getConfig, refreshBuffer = 60
             return;
         const timeUntilExpiry = expiresAtRef.current ? Math.floor((expiresAtRef.current - Date.now()) / 1000) : 0;
         log('Token expired or expiring soon (expires in %ds), refreshing...', timeUntilExpiry);
+        tokenGenerationCount.current++;
         try {
             const cfg = await getConfigRef.current();
             setConfig(cfg);
-            setClient(new GeoPlacesClient(cfg));
-            if (cfg.expiresAt) {
-                expiresAtRef.current = cfg.expiresAt;
-                const newExpiry = Math.floor((cfg.expiresAt - Date.now()) / 1000);
-                log('Token refreshed successfully (new token expires in %ds)', newExpiry);
-            }
+            tokenRef.current = cfg.token;
+            expiresAtRef.current = null;
+            const baseClient = new GeoPlacesClient(cfg);
+            const wrappedClient = new Proxy(baseClient, {
+                get(target, prop) {
+                    if (prop === 'send') {
+                        return async (command) => {
+                            await ensureValidToken();
+                            return target.send(command);
+                        };
+                    }
+                    return target[prop];
+                }
+            });
+            setClient(wrappedClient);
+            const decoded = jwtDecode(cfg.token);
+            expiresAtRef.current = decoded.exp * 1000;
+            const newExpiry = Math.floor((decoded.exp * 1000 - Date.now()) / 1000);
+            log('Token refreshed successfully (new token expires in %ds)', newExpiry);
         }
         catch (err) {
             log('Token refresh failed: %s', err instanceof Error ? err.message : 'Unknown error');
@@ -46,17 +65,32 @@ export function LocationClientProvider({ children, getConfig, refreshBuffer = 60
     // Initial load
     useEffect(() => {
         log('Initializing LocationClientProvider');
+        tokenGenerationCount.current++;
         getConfig()
             .then((cfg) => {
             setConfig(cfg);
-            setClient(new GeoPlacesClient(cfg));
-            if (cfg.expiresAt) {
-                expiresAtRef.current = cfg.expiresAt;
-                const expiry = Math.floor((cfg.expiresAt - Date.now()) / 1000);
+            tokenRef.current = cfg.token;
+            const baseClient = new GeoPlacesClient(cfg);
+            const wrappedClient = new Proxy(baseClient, {
+                get(target, prop) {
+                    if (prop === 'send') {
+                        return async (command) => {
+                            await ensureValidToken();
+                            return target.send(command);
+                        };
+                    }
+                    return target[prop];
+                }
+            });
+            setClient(wrappedClient);
+            try {
+                const decoded = jwtDecode(cfg.token);
+                expiresAtRef.current = decoded.exp * 1000;
+                const expiry = Math.floor((decoded.exp * 1000 - Date.now()) / 1000);
                 log('Client initialized (token expires in %ds)', expiry);
             }
-            else {
-                log('Client initialized (no expiry info)');
+            catch (err) {
+                log('Failed to decode token, no expiry info');
             }
             setLoading(false);
         })
@@ -65,14 +99,14 @@ export function LocationClientProvider({ children, getConfig, refreshBuffer = 60
             setError(err instanceof Error ? err.message : 'Failed to initialize client');
             setLoading(false);
         });
-    }, [getConfig]);
+    }, [ensureValidToken]);
     // Check token validity on every state change
     useEffect(() => {
         if (!loading && config) {
             ensureValidToken();
         }
     }, [config, loading, ensureValidToken]);
-    return (_jsx(LocationClientContext.Provider, { value: { config, client, loading, error }, children: children }));
+    return (_jsx(LocationClientContext.Provider, { value: { config, client, getToken, ensureValidToken, loading, error }, children: children }));
 }
 export function useLocationClient() {
     const context = useContext(LocationClientContext);

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@chaosity/location-client-react",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "React bindings for Chaosity Location Service client",
+  "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -27,16 +28,17 @@
     "url": "https://github.com/chaosity-io/location-service-client-react/issues"
   },
   "dependencies": {
-    "@chaosity/location-client": "^0.1.3",
-    "debug": "^4.4.3"
+    "@chaosity/location-client": "^0.1.5",
+    "debug": "^4.4.3",
+    "jwt-decode": "^4.0.0"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
-    "@types/react": "^18.0.0",
-    "react": "^18.0.0",
+    "@types/react": "^19.0.0",
+    "react": "^19.0.0",
     "typescript": "^5.0.0"
   },
   "files": [