Fixing the import cycles

Author: Ron Radtke

blobResponse.js renamed to class/ReactnativeBlobUtilBlobResponse.js

@@ -1,6 +1,6 @@
-import {ReactNativeBlobUtilResponseInfo, ReactNativeBlobUtilStream} from "types";
-import fs from "fs";
-import polyfill from "polyfill";
+import {ReactNativeBlobUtilResponseInfo, ReactNativeBlobUtilStream} from "../types";
+import fs from "../fs";
+import polyfill from "../polyfill";
 
 /**
  * ReactNativeBlobUtil response object class.

fetch.js

@@ -1,7 +1,26 @@
-import {ReactNativeBlobUtilConfig} from "types";
-import URIUtil from "utils/uri";
-import fs from "fs";
-import getUUID from "utils/uuid";
+import {ReactNativeBlobUtilConfig} from "./types";
+import URIUtil from "./utils/uri";
+import fs from "./fs";
+import getUUID from "./utils/uuid";
+import {DeviceEventEmitter, NativeModules} from "react-native";
+import {FetchBlobResponse} from "./class/ReactnativeBlobUtilBlobResponse";
+
+const emitter = DeviceEventEmitter;
+const ReactNativeBlobUtil = NativeModules.ReactNativeBlobUtil;
+
+// register message channel event handler.
+emitter.addListener("ReactNativeBlobUtilMessage", (e) => {
+
+    if (e.event === 'warn') {
+        console.warn(e.detail);
+    }
+    else if (e.event === 'error') {
+        throw e.detail;
+    }
+    else {
+        console.log("ReactNativeBlobUtil native message", e.detail);
+    }
+});
 
 export function wrap(path: string): string {
     const prefix = path.startsWith('content://') ? 'ReactNativeBlobUtil-content://' : 'ReactNativeBlobUtil-file://';

index.js

@@ -43,20 +43,6 @@ if (Platform.OS === 'ios') {
     });
 }
 
-// register message channel event handler.
-emitter.addListener("ReactNativeBlobUtilMessage", (e) => {
-
-    if (e.event === 'warn') {
-        console.warn(e.detail);
-    }
-    else if (e.event === 'error') {
-        throw e.detail;
-    }
-    else {
-        console.log("ReactNativeBlobUtil native message", e.detail);
-    }
-});
-
 // Show warning if native module not detected
 if (!ReactNativeBlobUtil || !ReactNativeBlobUtil.fetchBlobForm || !ReactNativeBlobUtil.fetchBlob) {
     console.warn(
@@ -67,7 +53,7 @@ if (!ReactNativeBlobUtil || !ReactNativeBlobUtil.fetchBlobForm || !ReactNativeBl
 }
 export {ReactNativeBlobUtilConfig, ReactNativeBlobUtilResponseInfo, ReactNativeBlobUtilStream} from './types';
 export URIUtil from './utils/uri';
-export {FetchBlobResponse} from './blobResponse';
+export {FetchBlobResponse} from './class/ReactnativeBlobUtilBlobResponse';
 export getUUID from './utils/uuid';
 export default {
     fetch,

polyfill/Blob.js

@@ -7,7 +7,7 @@ import getUUID from '../utils/uuid';
 import Log from '../utils/log.js';
 import EventTarget from './EventTarget';
 
-import ReactNativeBlobUtil from "../index";
+import {wrap} from "../fetch";
 
 const log = new Log('Blob');
 const blobCacheDir = fs.dirs.DocumentDir + '/ReactNativeBlobUtil-blobs/';
@@ -237,7 +237,7 @@ export default class Blob extends EventTarget {
         let resPath = blobCacheDir + getBlobName();
         let pass = false;
         log.debug('fs.slice new blob will at', resPath);
-        let result = new Blob(ReactNativeBlobUtil.wrap(resPath), {type: contentType}, true);
+        let result = new Blob(wrap(resPath), {type: contentType}, true);
         fs.exists(blobCacheDir)
             .then((exist) => {
                 if (exist)

polyfill/Fetch.js

@@ -1,8 +1,7 @@
 import Log from '../utils/log.js';
 import Blob from './Blob';
-import {NativeModules} from "react-native";
-
-const ReactNativeBlobUtil: ReactNativeBlobUtilNative = NativeModules.ReactNativeBlobUtil;
+import {wrap, config as RNconfig} from "../fetch";
+import type {ReactNativeBlobUtilConfig} from "../types";
 
 const log = new Log('FetchPolyfill');
 
@@ -40,12 +39,12 @@ class ReactNativeBlobUtilFetchPolyfill {
                     promise = Blob.build(body).then((b) => {
                         blobCache = b;
                         options.headers['Content-Type'] = 'multipart/form-data;boundary=' + b.multipartBoundary;
-                        return Promise.resolve(ReactNativeBlobUtil.wrap(b._ref));
+                        return Promise.resolve(wrap(b._ref));
                     });
                 }
                 // When request body is a Blob, use file URI of the Blob as request body.
                 else if (body.isReactNativeBlobUtilPolyfill)
-                    promise = Promise.resolve(ReactNativeBlobUtil.wrap(body.blobPath));
+                    promise = Promise.resolve(wrap(body.blobPath));
                 else if (typeof body !== 'object' && options.headers['Content-Type'] !== 'application/json')
                     promise = Promise.resolve(JSON.stringify(body));
                 else if (typeof body !== 'string')
@@ -60,7 +59,7 @@ class ReactNativeBlobUtilFetchPolyfill {
             let progressHandler, uploadHandler, cancelHandler;
             let statefulPromise = promise
                 .then((body) => {
-                    let task = ReactNativeBlobUtil.config(config)
+                    let task = RNconfig(config)
                         .fetch(options.method, url, options.headers, body);
                     if (progressHandler)
                         task.progress(progressHandler);