fix(api): Support method and header parameters from ImageURISource

Author: wcandillon

src/index.tsx

@@ -8,7 +8,12 @@ const BASE_DIR = RNFetchBlob.fs.dirs.CacheDir + "/react-native-img-cache";
 const FILE_PREFIX = Platform.OS === "ios" ? "" : "file://";
 export type CacheHandler = (path: string) => void;
 
+export interface CachedImageURISource extends ImageURISource {
+    uri: string;
+}
+
 type CacheEntry = {
+    source: CachedImageURISource;
     downloading: boolean;
     handlers: CacheHandler[];
     path: string | undefined;
@@ -40,20 +45,18 @@ export class ImageCache {
         return ImageCache.instance;
     }
 
-    static getCache(): ImageCache {
-        return ImageCache.get();
-    }
-
     private cache: { [uri: string]: CacheEntry } = {};
 
     clear() {
         this.cache = {};
         return RNFetchBlob.fs.unlink(BASE_DIR);
     }
 
-    on(uri: string, handler: CacheHandler, immutable?: boolean) {
+    on(source: CachedImageURISource, handler: CacheHandler, immutable?: boolean) {
+        const {uri} = source;
         if (!this.cache[uri]) {
             this.cache[uri] = {
+                source,
                 downloading: false,
                 handlers: [handler],
                 immutable: immutable === true,
@@ -91,11 +94,14 @@ export class ImageCache {
         }
     }
 
-    private download(uri: string, cache: CacheEntry) {
+    private download(cache: CacheEntry) {
+        const {source} = cache;
+        const {uri} = source;
         if (!cache.downloading) {
             const path = this.getPath(uri, cache.immutable);
             cache.downloading = true;
-            cache.task = RNFetchBlob.config({ path }).fetch("GET", uri, {});
+            const method = source.method ? source.method : "GET";
+            cache.task = RNFetchBlob.config({ path }).fetch(method, uri, source.headers);
             cache.task.then(() => {
                 cache.downloading = false;
                 cache.path = path;
@@ -116,11 +122,11 @@ export class ImageCache {
                 if (exists) {
                     this.notify(uri);
                 } else {
-                    this.download(uri, cache);
+                    this.download(cache);
                 }
             });
         } else {
-            this.download(uri, cache);
+            this.download(cache);
         }
 
     }
@@ -165,11 +171,11 @@ export abstract class BaseCachedImage<P extends CachedImageProps> extends Compon
         }
     }
 
-    private observe(uri: string, mutable: boolean) {
-        if (uri !== this.uri) {
+    private observe(source: CachedImageURISource, mutable: boolean) {
+        if (source.uri !== this.uri) {
             this.dispose();
-            this.uri = uri;
-            ImageCache.get().on(uri, this.handler, !mutable);
+            this.uri = source.uri;
+            ImageCache.get().on(source, this.handler, !mutable);
         }
     }
 
@@ -185,15 +191,26 @@ export abstract class BaseCachedImage<P extends CachedImageProps> extends Compon
         return props;
     }
 
+
+    private checkSource(source: ImageURISource | ImageURISource[]): CachedImageURISource {
+        if (Array.isArray(source)) {
+            throw new Error(`Giving multiple URIs to CachedImage is not yet support.
+            If you want to see this feature supported, please file and issue at
+             https://github.com/wcandillon/react-native-img-cache`);
+        } else if (!source.uri) {
+            throw new Error(`uri property missing ImageURISource parameter.`);
+        }
+        return source as CachedImageURISource;
+    }
+
     componentWillMount() {
-        const {mutable} = this.props;
-        const source = this.props.source as ImageURISource;
-        this.observe(source.uri as string, mutable === true);
+        const {mutable, source} = this.props;
+        this.observe(this.checkSource(source), mutable === true);
     }
 
     componentWillReceiveProps(nextProps: P) {
         const {source, mutable} = nextProps;
-        this.observe((source as ImageURISource).uri as string, mutable === true);
+        this.observe(this.checkSource(source), mutable === true);
     }
 
     componentWillUnmount() {