react-native-nitro-fetch 0.1.7 → 0.2.1

package/nitrogen/generated/shared/c++/RequestException.hpp

@@ -0,0 +1,83 @@
+///
+/// RequestException.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#if __has_include(<NitroModules/JSIConverter.hpp>)
+#include <NitroModules/JSIConverter.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/NitroDefines.hpp>)
+#include <NitroModules/NitroDefines.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/JSIHelpers.hpp>)
+#include <NitroModules/JSIHelpers.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
+
+
+#include <string>
+
+namespace margelo::nitro::nitrofetch {
+
+  /**
+   * A struct which can be represented as a JavaScript object (RequestException).
+   */
+  struct RequestException final {
+  public:
+    std::string message     SWIFT_PRIVATE;
+
+  public:
+    RequestException() = default;
+    explicit RequestException(std::string message): message(message) {}
+
+  public:
+    friend bool operator==(const RequestException& lhs, const RequestException& rhs) = default;
+  };
+
+} // namespace margelo::nitro::nitrofetch
+
+namespace margelo::nitro {
+
+  // C++ RequestException <> JS RequestException (object)
+  template <>
+  struct JSIConverter<margelo::nitro::nitrofetch::RequestException> final {
+    static inline margelo::nitro::nitrofetch::RequestException fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+      jsi::Object obj = arg.asObject(runtime);
+      return margelo::nitro::nitrofetch::RequestException(
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "message")))
+      );
+    }
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::nitrofetch::RequestException& arg) {
+      jsi::Object obj(runtime);
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "message"), JSIConverter<std::string>::toJSI(runtime, arg.message));
+      return obj;
+    }
+    static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
+      if (!value.isObject()) {
+        return false;
+      }
+      jsi::Object obj = value.getObject(runtime);
+      if (!nitro::isPlainObject(runtime, obj)) {
+        return false;
+      }
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "message")))) return false;
+      return true;
+    }
+  };
+
+} // namespace margelo::nitro

package/nitrogen/generated/shared/c++/UrlResponseInfo.hpp

@@ -0,0 +1,123 @@
+///
+/// UrlResponseInfo.hpp
+/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
+/// https://github.com/mrousavy/nitro
+/// Copyright © Marc Rousavy @ Margelo
+///
+
+#pragma once
+
+#if __has_include(<NitroModules/JSIConverter.hpp>)
+#include <NitroModules/JSIConverter.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/NitroDefines.hpp>)
+#include <NitroModules/NitroDefines.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/JSIHelpers.hpp>)
+#include <NitroModules/JSIHelpers.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+#if __has_include(<NitroModules/PropNameIDCache.hpp>)
+#include <NitroModules/PropNameIDCache.hpp>
+#else
+#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
+#endif
+
+// Forward declaration of `HttpHeader` to properly resolve imports.
+namespace margelo::nitro::nitrofetch { struct HttpHeader; }
+
+#include <string>
+#include <unordered_map>
+#include "HttpHeader.hpp"
+#include <vector>
+
+namespace margelo::nitro::nitrofetch {
+
+  /**
+   * A struct which can be represented as a JavaScript object (UrlResponseInfo).
+   */
+  struct UrlResponseInfo final {
+  public:
+    std::string url     SWIFT_PRIVATE;
+    double httpStatusCode     SWIFT_PRIVATE;
+    std::string httpStatusText     SWIFT_PRIVATE;
+    std::unordered_map<std::string, std::string> allHeaders     SWIFT_PRIVATE;
+    std::vector<HttpHeader> allHeadersAsList     SWIFT_PRIVATE;
+    std::vector<std::string> urlChain     SWIFT_PRIVATE;
+    std::string negotiatedProtocol     SWIFT_PRIVATE;
+    std::string proxyServer     SWIFT_PRIVATE;
+    double receivedByteCount     SWIFT_PRIVATE;
+    bool wasCached     SWIFT_PRIVATE;
+
+  public:
+    UrlResponseInfo() = default;
+    explicit UrlResponseInfo(std::string url, double httpStatusCode, std::string httpStatusText, std::unordered_map<std::string, std::string> allHeaders, std::vector<HttpHeader> allHeadersAsList, std::vector<std::string> urlChain, std::string negotiatedProtocol, std::string proxyServer, double receivedByteCount, bool wasCached): url(url), httpStatusCode(httpStatusCode), httpStatusText(httpStatusText), allHeaders(allHeaders), allHeadersAsList(allHeadersAsList), urlChain(urlChain), negotiatedProtocol(negotiatedProtocol), proxyServer(proxyServer), receivedByteCount(receivedByteCount), wasCached(wasCached) {}
+
+  public:
+    friend bool operator==(const UrlResponseInfo& lhs, const UrlResponseInfo& rhs) = default;
+  };
+
+} // namespace margelo::nitro::nitrofetch
+
+namespace margelo::nitro {
+
+  // C++ UrlResponseInfo <> JS UrlResponseInfo (object)
+  template <>
+  struct JSIConverter<margelo::nitro::nitrofetch::UrlResponseInfo> final {
+    static inline margelo::nitro::nitrofetch::UrlResponseInfo fromJSI(jsi::Runtime& runtime, const jsi::Value& arg) {
+      jsi::Object obj = arg.asObject(runtime);
+      return margelo::nitro::nitrofetch::UrlResponseInfo(
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "url"))),
+        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "httpStatusCode"))),
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "httpStatusText"))),
+        JSIConverter<std::unordered_map<std::string, std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "allHeaders"))),
+        JSIConverter<std::vector<margelo::nitro::nitrofetch::HttpHeader>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "allHeadersAsList"))),
+        JSIConverter<std::vector<std::string>>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "urlChain"))),
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "negotiatedProtocol"))),
+        JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "proxyServer"))),
+        JSIConverter<double>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "receivedByteCount"))),
+        JSIConverter<bool>::fromJSI(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "wasCached")))
+      );
+    }
+    static inline jsi::Value toJSI(jsi::Runtime& runtime, const margelo::nitro::nitrofetch::UrlResponseInfo& arg) {
+      jsi::Object obj(runtime);
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "url"), JSIConverter<std::string>::toJSI(runtime, arg.url));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "httpStatusCode"), JSIConverter<double>::toJSI(runtime, arg.httpStatusCode));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "httpStatusText"), JSIConverter<std::string>::toJSI(runtime, arg.httpStatusText));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "allHeaders"), JSIConverter<std::unordered_map<std::string, std::string>>::toJSI(runtime, arg.allHeaders));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "allHeadersAsList"), JSIConverter<std::vector<margelo::nitro::nitrofetch::HttpHeader>>::toJSI(runtime, arg.allHeadersAsList));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "urlChain"), JSIConverter<std::vector<std::string>>::toJSI(runtime, arg.urlChain));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "negotiatedProtocol"), JSIConverter<std::string>::toJSI(runtime, arg.negotiatedProtocol));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "proxyServer"), JSIConverter<std::string>::toJSI(runtime, arg.proxyServer));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "receivedByteCount"), JSIConverter<double>::toJSI(runtime, arg.receivedByteCount));
+      obj.setProperty(runtime, PropNameIDCache::get(runtime, "wasCached"), JSIConverter<bool>::toJSI(runtime, arg.wasCached));
+      return obj;
+    }
+    static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
+      if (!value.isObject()) {
+        return false;
+      }
+      jsi::Object obj = value.getObject(runtime);
+      if (!nitro::isPlainObject(runtime, obj)) {
+        return false;
+      }
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "url")))) return false;
+      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "httpStatusCode")))) return false;
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "httpStatusText")))) return false;
+      if (!JSIConverter<std::unordered_map<std::string, std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "allHeaders")))) return false;
+      if (!JSIConverter<std::vector<margelo::nitro::nitrofetch::HttpHeader>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "allHeadersAsList")))) return false;
+      if (!JSIConverter<std::vector<std::string>>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "urlChain")))) return false;
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "negotiatedProtocol")))) return false;
+      if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "proxyServer")))) return false;
+      if (!JSIConverter<double>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "receivedByteCount")))) return false;
+      if (!JSIConverter<bool>::canConvert(runtime, obj.getProperty(runtime, PropNameIDCache::get(runtime, "wasCached")))) return false;
+      return true;
+    }
+  };
+
+} // namespace margelo::nitro

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-fetch",
-  "version": "0.1.7",
+  "version": "0.2.1",
   "description": "Awesome Fetch :)",
   "main": "./lib/module/index.js",
   "module": "./lib/module/index.js",
@@ -69,23 +69,23 @@
     "@eslint/eslintrc": "^3.3.0",
     "@eslint/js": "^9.22.0",
     "@evilmartians/lefthook": "^1.5.0",
-    "@react-native/babel-preset": "0.81.0",
-    "@react-native/eslint-config": "^0.78.0",
+    "@react-native/babel-preset": "0.85.0-rc.0",
+    "@react-native/eslint-config": "^0.85.0-rc.0",
     "@release-it/conventional-changelog": "^9.0.2",
     "@types/jest": "^29.5.5",
-    "@types/react": "^19.1.0",
+    "@types/react": "^19.2.0",
     "commitlint": "^19.6.1",
     "del-cli": "^5.1.0",
     "eslint": "^9.22.0",
     "eslint-config-prettier": "^10.1.1",
     "eslint-plugin-prettier": "^5.2.3",
     "jest": "^29.7.0",
-    "nitrogen": "^0.29.2",
+    "nitrogen": "^0.35.2",
     "prettier": "^3.0.3",
-    "react": "19.1.0",
-    "react-native": "0.81.0",
+    "react": "19.2.3",
+    "react-native": "0.85.0-rc.0",
     "react-native-builder-bob": "^0.40.13",
-    "react-native-nitro-modules": "^0.29.2",
+    "react-native-nitro-modules": "^0.35.2",
     "release-it": "^17.10.0",
     "turbo": "^1.10.7",
     "typescript": "^5.8.3"
@@ -93,7 +93,7 @@
   "peerDependencies": {
     "react": "*",
     "react-native": "*",
-    "react-native-nitro-modules": "^0.29.2",
+    "react-native-nitro-modules": "^0.35.2",
     "react-native-worklets-core": "^1.6.0"
   },
   "peerDependenciesMeta": {
@@ -101,6 +101,9 @@
       "optional": true
     }
   },
+  "dependencies": {
+    "web-streams-polyfill": "^4.2.0"
+  },
   "workspaces": [
     "example"
   ],
@@ -118,7 +121,7 @@
       "publish": true
     },
     "github": {
-      "release": false
+      "release": true
     }
   },
   "prettier": {

package/src/NitroCronet.nitro.ts

@@ -0,0 +1,72 @@
+import type { HybridObject } from 'react-native-nitro-modules';
+
+export interface HttpHeader {
+  key: string;
+  value: string;
+}
+
+export interface UrlResponseInfo {
+  url: string;
+  httpStatusCode: number;
+  httpStatusText: string;
+  allHeaders: Record<string, string>;
+  allHeadersAsList: HttpHeader[];
+  urlChain: string[];
+  negotiatedProtocol: string;
+  proxyServer: string;
+  receivedByteCount: number;
+  wasCached: boolean;
+}
+
+export interface RequestException {
+  message: string;
+}
+
+export interface UrlRequest extends HybridObject<{
+  android: 'kotlin';
+  ios: 'swift';
+}> {
+  start(): void;
+  followRedirect(): void;
+  read(): void;
+  cancel(): void;
+  isDone(): boolean;
+}
+
+export interface UrlRequestBuilder extends HybridObject<{
+  android: 'kotlin';
+  ios: 'swift';
+}> {
+  setHttpMethod(httpMethod: string): void;
+  addHeader(name: string, value: string): void;
+  setUploadBody(body: ArrayBuffer | string): void;
+  disableCache(): void;
+  onSucceeded(callback: (info: UrlResponseInfo) => void): void;
+  onFailed(
+    callback: (
+      info: UrlResponseInfo | undefined,
+      error: RequestException
+    ) => void
+  ): void;
+  onCanceled(callback: (info: UrlResponseInfo | undefined) => void): void;
+  onRedirectReceived(
+    callback: (info: UrlResponseInfo, newLocationUrl: string) => void
+  ): void;
+  onResponseStarted(callback: (info: UrlResponseInfo) => void): void;
+  onReadCompleted(
+    callback: (
+      info: UrlResponseInfo,
+      byteBuffer: ArrayBuffer,
+      bytesRead: number
+    ) => void
+  ): void;
+  build(): UrlRequest;
+}
+
+// The new streaming client — separate from NitroFetchClient
+export interface NitroCronet extends HybridObject<{
+  android: 'kotlin';
+  ios: 'swift';
+}> {
+  newUrlRequestBuilder(url: string): UrlRequestBuilder;
+}

package/src/NitroFetch.nitro.ts

@@ -14,6 +14,15 @@ export interface NitroHeader {
   key: string;
   value: string;
 }
+
+export interface NitroFormDataPart {
+  name: string;
+  value?: string;
+  fileUri?: string;
+  fileName?: string;
+  mimeType?: string;
+}
+
 export interface NitroRequest {
   url: string;
   method?: NitroRequestMethod;
@@ -22,9 +31,13 @@ export interface NitroRequest {
   // Body as either UTF-8 string or raw bytes.
   bodyString?: string;
   bodyBytes?: string; //will be ArrayBuffer in future
+  // Multipart form data parts (for file uploads)
+  bodyFormData?: NitroFormDataPart[];
   // Controls
   timeoutMs?: number;
   followRedirects?: boolean; // default true
+  // Optional ID used for cancellation via cancelRequest()
+  requestId?: string;
 }
 
 export interface NitroResponse {
@@ -39,8 +52,10 @@ export interface NitroResponse {
   bodyBytes?: string; //will be ArrayBuffer in future
 }
 
-export interface NitroFetchClient
-  extends HybridObject<{ ios: 'swift'; android: 'kotlin' }> {
+export interface NitroFetchClient extends HybridObject<{
+  ios: 'swift';
+  android: 'kotlin';
+}> {
   // Client-binded request that uses the env configured at creation.
   request(req: NitroRequest): Promise<NitroResponse>;
   // Start a prefetch for a given request; expects a header `prefetchKey`.
@@ -48,10 +63,15 @@ export interface NitroFetchClient
 
   // Synchronous version of request for worklets
   requestSync(req: NitroRequest): NitroResponse;
+
+  // Cancel an in-flight request by its requestId
+  cancelRequest(requestId: string): void;
 }
 
-export interface NitroFetch
-  extends HybridObject<{ ios: 'swift'; android: 'kotlin' }> {
+export interface NitroFetch extends HybridObject<{
+  ios: 'swift';
+  android: 'kotlin';
+}> {
   // Create a client bound to a given environment (e.g., cache dir).
   createClient(): NitroFetchClient;
 
@@ -59,8 +79,10 @@ export interface NitroFetch
   // shutdown(): void;
 }
 
-export interface NativeStorage
-  extends HybridObject<{ ios: 'swift'; android: 'kotlin' }> {
+export interface NativeStorage extends HybridObject<{
+  ios: 'swift';
+  android: 'kotlin';
+}> {
   getString(key: string): string;
   setString(key: string, value: string): void;
   removeString(key: string): void;

package/src/NitroInstances.ts

@@ -3,6 +3,7 @@ import type {
   NitroFetch as NitroFetchType,
   NativeStorage as NativeStorageType,
 } from './NitroFetch.nitro';
+import type { NitroCronet } from './NitroCronet.nitro';
 
 // Create singletons once per JS runtime
 export const NitroFetch: NitroFetchType =
@@ -12,3 +13,6 @@ export const NativeStorage: NativeStorageType =
   NitroModules.createHybridObject<NativeStorageType>('NativeStorage');
 
 export const boxedNitroFetch = NitroModules.box(NitroFetch);
+
+export const NitroCronetSingleton =
+  NitroModules.createHybridObject<NitroCronet>('NitroCronet');