@chaosity/location-client-react 0.1.3 → 0.1.6

package/dist/provider/LocationClientProvider.d.ts

@@ -1,15 +1,20 @@
-import React from 'react';
+import type { ReactNode } from 'react';
 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;
 }
 export interface LocationClientProviderProps {
-    children: React.ReactNode;
-    getConfig: () => Promise<ClientConfig>;
+    children: ReactNode;
+    getConfig: () => Promise<ClientConfig & {
+        expiresAt?: number;
+    }>;
+    refreshBuffer?: number;
 }
-export declare function LocationClientProvider({ children, getConfig }: LocationClientProviderProps): React.JSX.Element;
+export declare function LocationClientProvider({ children, getConfig, refreshBuffer }: LocationClientProviderProps): import("react/jsx-runtime").JSX.Element;
 export declare function useLocationClient(): LocationClientContextValue;
 export {};

package/dist/provider/LocationClientProvider.js

@@ -1,24 +1,112 @@
-import React, { createContext, useContext, useEffect, useState } from 'react';
+'use client';
+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 }) {
+export function LocationClientProvider({ children, getConfig, refreshBuffer = 60 }) {
     const [config, setConfig] = useState(null);
     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)
+            return false;
+        return Date.now() >= (expiresAtRef.current - refreshBuffer * 1000);
+    }, [refreshBuffer]);
+    // Refresh token if needed
+    const ensureValidToken = useCallback(async () => {
+        if (!isTokenExpired())
+            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);
+            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');
+            setError(err instanceof Error ? err.message : 'Failed to refresh token');
+        }
+    }, [isTokenExpired]);
+    // Initial load
+    useEffect(() => {
+        log('Initializing LocationClientProvider');
+        tokenGenerationCount.current++;
         getConfig()
             .then((cfg) => {
             setConfig(cfg);
-            setClient(new GeoPlacesClient(cfg));
+            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);
+            }
+            catch (err) {
+                log('Failed to decode token, no expiry info');
+            }
             setLoading(false);
         })
             .catch((err) => {
+            log('Initialization failed: %s', err instanceof Error ? err.message : 'Unknown error');
             setError(err instanceof Error ? err.message : 'Failed to initialize client');
             setLoading(false);
         });
-    }, []);
-    return (React.createElement(LocationClientContext.Provider, { value: { config, client, loading, error } }, children));
+    }, [ensureValidToken]);
+    // Check token validity on every state change
+    useEffect(() => {
+        if (!loading && config) {
+            ensureValidToken();
+        }
+    }, [config, loading, ensureValidToken]);
+    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.3",
+  "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,15 +28,18 @@
     "url": "https://github.com/chaosity-io/location-service-client-react/issues"
   },
   "dependencies": {
-    "@chaosity/location-client": "^0.1.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/react": "^18.0.0",
-    "typescript": "^5.0.0",
-    "react": "^18.0.0"
+    "@types/debug": "^4.1.12",
+    "@types/react": "^19.0.0",
+    "react": "^19.0.0",
+    "typescript": "^5.0.0"
   },
   "files": [
     "dist",