react-native-nitro-fetch 1.3.1 → 1.3.3

package/src/fetch.ts

@@ -758,6 +758,8 @@ export async function prefetch(
   await client.prefetch(req);
 }
 
+const AUTOPREFETCH_QUEUE_KEY = 'nitrofetch_autoprefetch_queue';
+
 // Persist a request to storage so native can prefetch it on app start.
 export async function prefetchOnAppStart(
   input: RequestInfo | URL,
@@ -803,12 +805,9 @@ export async function prefetchOnAppStart(
 
   // Write or append to storage queue
   try {
-    const KEY = 'nitrofetch_autoprefetch_queue';
     let arr: any[] = [];
     try {
-      const raw = NativeStorageSingleton.getString(
-        'nitrofetch_autoprefetch_queue'
-      );
+      const raw = NativeStorageSingleton.getString(AUTOPREFETCH_QUEUE_KEY);
       if (raw) arr = JSON.parse(raw);
       if (!Array.isArray(arr)) arr = [];
     } catch {
@@ -818,7 +817,10 @@ export async function prefetchOnAppStart(
       arr = arr.filter((e) => e && e.prefetchKey !== prefetchKey);
     }
     arr.push(entry);
-    NativeStorageSingleton.setString(KEY, JSON.stringify(arr));
+    NativeStorageSingleton.setString(
+      AUTOPREFETCH_QUEUE_KEY,
+      JSON.stringify(arr)
+    );
   } catch (e) {
     console.warn('Failed to persist prefetch queue', e);
   }
@@ -829,12 +831,9 @@ export async function removeFromAutoPrefetch(
   prefetchKey: string
 ): Promise<void> {
   try {
-    const KEY = 'nitrofetch_autoprefetch_queue';
     let arr: any[] = [];
     try {
-      const raw = NativeStorageSingleton.getString(
-        'nitrofetch_autoprefetch_queue'
-      );
+      const raw = NativeStorageSingleton.getString(AUTOPREFETCH_QUEUE_KEY);
       if (raw) arr = JSON.parse(raw);
       if (!Array.isArray(arr)) arr = [];
     } catch {
@@ -842,9 +841,12 @@ export async function removeFromAutoPrefetch(
     }
     const next = arr.filter((e) => e && e.prefetchKey !== prefetchKey);
     if (next.length === 0) {
-      NativeStorageSingleton.removeString(KEY);
+      NativeStorageSingleton.removeString(AUTOPREFETCH_QUEUE_KEY);
     } else if (next.length !== arr.length) {
-      NativeStorageSingleton.setString(KEY, JSON.stringify(next));
+      NativeStorageSingleton.setString(
+        AUTOPREFETCH_QUEUE_KEY,
+        JSON.stringify(next)
+      );
     }
   } catch (e) {
     console.warn('Failed to remove from prefetch queue', e);
@@ -853,15 +855,12 @@ export async function removeFromAutoPrefetch(
 
 // Remove all entries from the auto-prefetch queue.
 export async function removeAllFromAutoprefetch(): Promise<void> {
-  const KEY = 'nitrofetch_autoprefetch_queue';
-  NativeStorageSingleton.setString(KEY, JSON.stringify([]));
+  NativeStorageSingleton.setString(AUTOPREFETCH_QUEUE_KEY, JSON.stringify([]));
 }
 
 export function __readAutoPrefetchQueue(): Array<Record<string, any>> {
   try {
-    const raw = NativeStorageSingleton.getString(
-      'nitrofetch_autoprefetch_queue'
-    );
+    const raw = NativeStorageSingleton.getString(AUTOPREFETCH_QUEUE_KEY);
     if (!raw) return [];
     const parsed = JSON.parse(raw);
     return Array.isArray(parsed) ? parsed : [];

package/src/index.js

@@ -1,9 +1,24 @@
-export { nitroFetch as fetch, nitroFetchOnWorklet, prefetch, prefetchOnAppStart, removeFromAutoPrefetch, removeAllFromAutoprefetch, __readAutoPrefetchQueue, } from './fetch';
+export {
+  nitroFetch as fetch,
+  nitroFetchOnWorklet,
+  prefetch,
+  prefetchOnAppStart,
+  removeFromAutoPrefetch,
+  removeAllFromAutoprefetch,
+  __readAutoPrefetchQueue,
+} from './fetch';
 export { NitroHeaders as Headers } from './Headers';
 export { NitroResponse as Response } from './Response';
 export { NitroRequest as Request } from './Request';
 export { NitroFetch } from './NitroInstances';
-export { registerTokenRefresh, clearTokenRefresh, callRefreshEndpoint, getStoredTokenRefreshConfig, getNestedField, applyTemplate, } from './tokenRefresh';
+export {
+  registerTokenRefresh,
+  clearTokenRefresh,
+  callRefreshEndpoint,
+  getStoredTokenRefreshConfig,
+  getNestedField,
+  applyTemplate,
+} from './tokenRefresh';
 export { NetworkInspector } from './NetworkInspector';
 export { generateCurl } from './CurlGenerator';
 export { profileFetch } from './HermesProfiler';

package/src/index.web.js

@@ -9,96 +9,98 @@ export { NetworkInspector } from './NetworkInspector';
 export { generateCurl } from './CurlGenerator';
 export { profileFetch } from './HermesProfiler';
 export async function fetch(input, init) {
-    let resolvedInput = input;
-    let resolvedInit = init;
-    if (input instanceof NitroRequestClass) {
-        const method = (init?.method ?? input.method).toUpperCase();
-        const hasBodyMethod = method !== 'GET' && method !== 'HEAD';
-        let body = init?.body;
-        if (body === undefined && hasBodyMethod) {
-            const bytes = await input.arrayBuffer().catch(() => undefined);
-            body = bytes && bytes.byteLength > 0 ? bytes : null;
-        }
-        resolvedInput = input.url;
-        resolvedInit = {
-            ...init,
-            method,
-            headers: (init?.headers ??
-                input.headers),
-            body,
-            redirect: init?.redirect ?? input.redirect,
-            cache: init?.cache ?? input.cache,
-            signal: init?.signal ?? input.signal,
-        };
+  let resolvedInput = input;
+  let resolvedInit = init;
+  if (input instanceof NitroRequestClass) {
+    const method = (init?.method ?? input.method).toUpperCase();
+    const hasBodyMethod = method !== 'GET' && method !== 'HEAD';
+    let body = init?.body;
+    if (body === undefined && hasBodyMethod) {
+      const bytes = await input.arrayBuffer().catch(() => undefined);
+      body = bytes && bytes.byteLength > 0 ? bytes : null;
     }
-    return globalThis.fetch(resolvedInput, resolvedInit);
+    resolvedInput = input.url;
+    resolvedInit = {
+      ...init,
+      method,
+      headers: init?.headers ?? input.headers,
+      body,
+      redirect: init?.redirect ?? input.redirect,
+      cache: init?.cache ?? input.cache,
+      signal: init?.signal ?? input.signal,
+    };
+  }
+  return globalThis.fetch(resolvedInput, resolvedInit);
 }
 export async function nitroFetchOnWorklet(input, init, mapWorklet, _options) {
-    console.warn('nitroFetchOnWorklet: worklets are not available on web; running on the JS thread');
-    const res = await globalThis.fetch(input, init);
-    const bodyBytes = await res.clone().arrayBuffer();
-    let bodyString;
-    try {
-        bodyString = await res.clone().text();
-    }
-    catch {
-        bodyString = undefined;
-    }
-    const headers = [];
-    res.headers.forEach((v, k) => headers.push({ key: k, value: v }));
-    return mapWorklet({
-        url: res.url,
-        status: res.status,
-        statusText: res.statusText,
-        ok: res.ok,
-        redirected: res.redirected ?? false,
-        headers,
-        bodyBytes,
-        bodyString,
-    });
+  console.warn(
+    'nitroFetchOnWorklet: worklets are not available on web; running on the JS thread'
+  );
+  const res = await globalThis.fetch(input, init);
+  const bodyBytes = await res.clone().arrayBuffer();
+  let bodyString;
+  try {
+    bodyString = await res.clone().text();
+  } catch {
+    bodyString = undefined;
+  }
+  const headers = [];
+  res.headers.forEach((v, k) => headers.push({ key: k, value: v }));
+  return mapWorklet({
+    url: res.url,
+    status: res.status,
+    statusText: res.statusText,
+    ok: res.ok,
+    redirected: res.redirected ?? false,
+    headers,
+    bodyBytes,
+    bodyString,
+  });
 }
 export async function prefetch(_input, _init) {
-    console.warn('prefetch is not available on web');
+  console.warn('prefetch is not available on web');
 }
 export async function prefetchOnAppStart(_input, _init) {
-    console.warn('prefetchOnAppStart is not available on web');
+  console.warn('prefetchOnAppStart is not available on web');
 }
 export async function removeFromAutoPrefetch(_prefetchKey) {
-    console.warn('removeFromAutoPrefetch is not available on web');
+  console.warn('removeFromAutoPrefetch is not available on web');
 }
 export async function removeAllFromAutoprefetch() {
-    console.warn('removeAllFromAutoprefetch is not available on web');
+  console.warn('removeAllFromAutoprefetch is not available on web');
 }
-export const NitroFetch = new Proxy({}, {
+export const NitroFetch = new Proxy(
+  {},
+  {
     get(_target, prop) {
-        console.warn(`NitroFetch.${String(prop)} is not available on web`);
-        return undefined;
+      console.warn(`NitroFetch.${String(prop)} is not available on web`);
+      return undefined;
     },
-});
+  }
+);
 export function registerTokenRefresh(_options) {
-    console.warn('registerTokenRefresh is not available on web');
+  console.warn('registerTokenRefresh is not available on web');
 }
 export function clearTokenRefresh(_target) {
-    console.warn('clearTokenRefresh is not available on web');
+  console.warn('clearTokenRefresh is not available on web');
 }
 export async function callRefreshEndpoint(_config) {
-    console.warn('callRefreshEndpoint is not available on web');
-    return {};
+  console.warn('callRefreshEndpoint is not available on web');
+  return {};
 }
 export function getStoredTokenRefreshConfig(_target) {
-    console.warn('getStoredTokenRefreshConfig is not available on web');
-    return null;
+  console.warn('getStoredTokenRefreshConfig is not available on web');
+  return null;
 }
 export function getNestedField(obj, dotPath) {
-    const parts = dotPath.split('.');
-    let current = obj;
-    for (const part of parts) {
-        if (current == null || typeof current !== 'object')
-            return undefined;
-        current = current[part];
-    }
-    return current != null ? String(current) : undefined;
+  const parts = dotPath.split('.');
+  let current = obj;
+  for (const part of parts) {
+    if (current == null || typeof current !== 'object') return undefined;
+    current = current[part];
+  }
+  return current != null ? String(current) : undefined;
 }
 export function applyTemplate(template, value) {
-    return template.replace(/\{\{value\}\}/g, value);
+  return template.replace(/\{\{value\}\}/g, value);
 }

package/src/tokenRefresh.js

@@ -9,96 +9,94 @@ const KEY_FETCH_CACHE = 'nitro_token_refresh_fetch_cache';
  * Resolve a dot-notation path inside a parsed JSON object.
  */
 export function getNestedField(obj, dotPath) {
-    const parts = dotPath.split('.');
-    let current = obj;
-    for (const part of parts) {
-        if (current == null || typeof current !== 'object')
-            return undefined;
-        current = current[part];
-    }
-    return current != null ? String(current) : undefined;
+  const parts = dotPath.split('.');
+  let current = obj;
+  for (const part of parts) {
+    if (current == null || typeof current !== 'object') return undefined;
+    current = current[part];
+  }
+  return current != null ? String(current) : undefined;
 }
 export function applyTemplate(template, value) {
-    return template.replace(/\{\{value\}\}/g, value);
+  return template.replace(/\{\{value\}\}/g, value);
 }
 function applyCompositeTemplate(template, values) {
-    return template.replace(/\{\{(\w+)\}\}/g, (_, key) => values[key] ?? '');
+  return template.replace(/\{\{(\w+)\}\}/g, (_, key) => values[key] ?? '');
 }
 export async function callRefreshEndpoint(config) {
-    const method = config.method ?? 'POST';
-    const response = await fetch(config.url, {
-        method,
-        headers: config.headers,
-        body: config.body,
-    });
-    if (!response.ok) {
-        throw new Error(`Token refresh failed: ${response.status} ${response.statusText}`);
-    }
-    const headers = {};
-    if (config.responseType === 'text') {
-        const text = await response.text();
-        if (config.textHeader) {
-            headers[config.textHeader] = config.textTemplate
-                ? applyTemplate(config.textTemplate, text)
-                : text;
-        }
-        return headers;
+  const method = config.method ?? 'POST';
+  const response = await fetch(config.url, {
+    method,
+    headers: config.headers,
+    body: config.body,
+  });
+  if (!response.ok) {
+    throw new Error(
+      `Token refresh failed: ${response.status} ${response.statusText}`
+    );
+  }
+  const headers = {};
+  if (config.responseType === 'text') {
+    const text = await response.text();
+    if (config.textHeader) {
+      headers[config.textHeader] = config.textTemplate
+        ? applyTemplate(config.textTemplate, text)
+        : text;
     }
-    // Default: json
-    const json = await response.json();
-    if (config.mappings) {
-        for (const mapping of config.mappings) {
-            const value = getNestedField(json, mapping.jsonPath);
-            if (value != null) {
-                headers[mapping.header] = mapping.valueTemplate
-                    ? applyTemplate(mapping.valueTemplate, value)
-                    : value;
-            }
-        }
+    return headers;
+  }
+  // Default: json
+  const json = await response.json();
+  if (config.mappings) {
+    for (const mapping of config.mappings) {
+      const value = getNestedField(json, mapping.jsonPath);
+      if (value != null) {
+        headers[mapping.header] = mapping.valueTemplate
+          ? applyTemplate(mapping.valueTemplate, value)
+          : value;
+      }
     }
-    if (config.compositeHeaders) {
-        for (const comp of config.compositeHeaders) {
-            const values = {};
-            for (const [placeholder, jsonPath] of Object.entries(comp.paths)) {
-                const val = getNestedField(json, jsonPath);
-                if (val != null)
-                    values[placeholder] = val;
-            }
-            headers[comp.header] = applyCompositeTemplate(comp.template, values);
-        }
+  }
+  if (config.compositeHeaders) {
+    for (const comp of config.compositeHeaders) {
+      const values = {};
+      for (const [placeholder, jsonPath] of Object.entries(comp.paths)) {
+        const val = getNestedField(json, jsonPath);
+        if (val != null) values[placeholder] = val;
+      }
+      headers[comp.header] = applyCompositeTemplate(comp.template, values);
     }
-    return headers;
+  }
+  return headers;
 }
 export function registerTokenRefresh(options) {
-    const { target, ...config } = options;
-    const raw = JSON.stringify(config);
-    if (target === 'websocket' || target === 'all') {
-        NativeStorageSingleton.setSecureString(KEY_WS, raw);
-    }
-    if (target === 'fetch' || target === 'all') {
-        NativeStorageSingleton.setSecureString(KEY_FETCH, raw);
-    }
+  const { target, ...config } = options;
+  const raw = JSON.stringify(config);
+  if (target === 'websocket' || target === 'all') {
+    NativeStorageSingleton.setSecureString(KEY_WS, raw);
+  }
+  if (target === 'fetch' || target === 'all') {
+    NativeStorageSingleton.setSecureString(KEY_FETCH, raw);
+  }
 }
 export function clearTokenRefresh(target) {
-    const t = target ?? 'all';
-    if (t === 'websocket' || t === 'all') {
-        NativeStorageSingleton.removeSecureString(KEY_WS);
-        NativeStorageSingleton.removeSecureString(KEY_WS_CACHE);
-    }
-    if (t === 'fetch' || t === 'all') {
-        NativeStorageSingleton.removeSecureString(KEY_FETCH);
-        NativeStorageSingleton.removeSecureString(KEY_FETCH_CACHE);
-    }
+  const t = target ?? 'all';
+  if (t === 'websocket' || t === 'all') {
+    NativeStorageSingleton.removeSecureString(KEY_WS);
+    NativeStorageSingleton.removeSecureString(KEY_WS_CACHE);
+  }
+  if (t === 'fetch' || t === 'all') {
+    NativeStorageSingleton.removeSecureString(KEY_FETCH);
+    NativeStorageSingleton.removeSecureString(KEY_FETCH_CACHE);
+  }
 }
 export function getStoredTokenRefreshConfig(target) {
-    const key = target === 'websocket' ? KEY_WS : KEY_FETCH;
-    try {
-        const raw = NativeStorageSingleton.getSecureString(key);
-        if (!raw)
-            return null;
-        return JSON.parse(raw);
-    }
-    catch {
-        return null;
-    }
+  const key = target === 'websocket' ? KEY_WS : KEY_FETCH;
+  try {
+    const raw = NativeStorageSingleton.getSecureString(key);
+    if (!raw) return null;
+    return JSON.parse(raw);
+  } catch {
+    return null;
+  }
 }

package/src/tokenRefresh.ts

@@ -20,6 +20,18 @@ type TokenRefreshCompositeHeader = {
   paths: Record<string, string>;
 };
 
+type TokenRefreshBodyMapping = {
+  jsonPath: string;
+  bodyPath: string;
+  valueTemplate?: string;
+};
+
+type TokenRefreshFormDataMapping = {
+  jsonPath: string;
+  field: string;
+  valueTemplate?: string;
+};
+
 export type TokenRefreshConfig = {
   url: string;
   method?: 'GET' | 'POST' | 'PUT' | 'PATCH';
@@ -30,6 +42,10 @@ export type TokenRefreshConfig = {
   compositeHeaders?: TokenRefreshCompositeHeader[];
   textHeader?: string;
   textTemplate?: string;
+  bodyMappings?: TokenRefreshBodyMapping[];
+  formDataMappings?: TokenRefreshFormDataMapping[];
+  bodyTextPath?: string;
+  formDataTextField?: string;
   onFailure?: 'skip' | 'useStoredHeaders';
 };
 

package/src/utf8.js

@@ -2,39 +2,40 @@ let _TextEncoder;
 let _TextDecoder;
 const NITRO_TEXT_DECODER_PKG = 'react-native-nitro-text-decoder';
 function loadOptionalTextCodec() {
-    try {
-        // Hide require from the bundler so the package stays truly optional.
-        // eslint-disable-next-line no-new-func
-        const dynamicRequire = new Function('mod', 'return require(mod);');
-        return dynamicRequire(NITRO_TEXT_DECODER_PKG);
-    }
-    catch {
-        return {};
-    }
+  try {
+    // Hide require from the bundler so the package stays truly optional.
+    // eslint-disable-next-line no-new-func
+    const dynamicRequire = new Function('mod', 'return require(mod);');
+    return dynamicRequire(NITRO_TEXT_DECODER_PKG);
+  } catch {
+    return {};
+  }
 }
 if (typeof TextEncoder !== 'undefined') {
-    _TextEncoder = TextEncoder;
-}
-else {
-    _TextEncoder = loadOptionalTextCodec().TextEncoder;
+  _TextEncoder = TextEncoder;
+} else {
+  _TextEncoder = loadOptionalTextCodec().TextEncoder;
 }
 if (typeof TextDecoder !== 'undefined') {
-    _TextDecoder = TextDecoder;
-}
-else {
-    _TextDecoder = loadOptionalTextCodec().TextDecoder;
+  _TextDecoder = TextDecoder;
+} else {
+  _TextDecoder = loadOptionalTextCodec().TextDecoder;
 }
 export function stringToUTF8(str) {
-    if (!_TextEncoder) {
-        console.warn('stringToUTF8: TextEncoder not available. Install react-native-nitro-text-decoder.');
-        return new Uint8Array(0);
-    }
-    return new _TextEncoder().encode(str);
+  if (!_TextEncoder) {
+    console.warn(
+      'stringToUTF8: TextEncoder not available. Install react-native-nitro-text-decoder.'
+    );
+    return new Uint8Array(0);
+  }
+  return new _TextEncoder().encode(str);
 }
 export function utf8ToString(bytes) {
-    if (!_TextDecoder) {
-        console.warn('utf8ToString: TextDecoder not available. Install react-native-nitro-text-decoder.');
-        return '';
-    }
-    return new _TextDecoder().decode(bytes);
+  if (!_TextDecoder) {
+    console.warn(
+      'utf8ToString: TextDecoder not available. Install react-native-nitro-text-decoder.'
+    );
+    return '';
+  }
+  return new _TextDecoder().decode(bytes);
 }