fix(image-source): url loading under different conditions

NathanWalker · NathanWalker · commit 70cab3f36b91 · 2025-11-20T16:51:35.000-06:00
diff --git a/apps/toolbox/src/pages/image-async.ts b/apps/toolbox/src/pages/image-async.ts
@@ -8,7 +8,7 @@ export function navigatingTo(args: EventData) {
 }
 
 export class SampleData extends Observable {
-	src: string = 'https://source.unsplash.com/random';
+	src: string = 'https://i.pravatar.cc/300';
 	savedData: string = '';
 	resizedImage: ImageSource;
 	async save() {
diff --git a/packages/core/http/http-shared.ts b/packages/core/http/http-shared.ts
@@ -1,21 +1,7 @@
-// Shared types and interfaces for http and image-source modules.
-// Only put platform-agnostic types/interfaces here.
-
 // Example: (add more as needed)
-// TODO: look at removing this after circulars are completely resolved.
+// Note: Circular dep help between http and image-source.
+// Interfaces can be moved around further in future to help avoid.
 export interface ImageSourceLike {
 	toBase64String(format: string, quality?: number): string;
 	// ... add other shared methods/properties as needed
 }
-
-// Circular dependency resolution handling (http <--> image-source)
-let _getImage: (arg: any) => Promise<ImageSourceLike>;
-export function getImageRequest(arg: any): Promise<ImageSourceLike> {
-	if (_getImage) {
-		return _getImage(arg);
-	}
-	return Promise.reject(new Error('No getImage request handler set.'));
-}
-export function setGetImageRequest(fn: (arg: any) => Promise<ImageSourceLike>) {
-	_getImage = fn;
-}
diff --git a/packages/core/http/index.ts b/packages/core/http/index.ts
@@ -1,4 +1,4 @@
-import { setGetImageRequest, type ImageSourceLike } from './http-shared';
+import { type ImageSourceLike } from './http-shared';
 import { request } from './http-request';
 export { request } from './http-request';
 export * from './http-interfaces';
@@ -51,7 +51,6 @@ export function getImage(arg: any): Promise<ImageSourceLike> {
 		);
 	});
 }
-setGetImageRequest(getImage);
 
 export function getFile(arg: any, destinationFilePath?: string): Promise<any> {
 	return new Promise<any>((resolve, reject) => {
diff --git a/packages/core/image-source/index.android.ts b/packages/core/image-source/index.android.ts
@@ -1,6 +1,6 @@
 import { ImageSource as ImageSourceDefinition, iosSymbolScaleType } from '.';
 import { ImageAsset } from '../image-asset';
-import { getImageRequest } from '../http/http-shared';
+import { getImage } from '../http';
 import { path as fsPath, knownFolders } from '../file-system';
 import { isFileOrResourcePath, RESOURCE_PREFIX, layout } from '../utils';
 import { getNativeApp } from '../application/helpers-common';
@@ -63,7 +63,7 @@ export class ImageSource implements ImageSourceDefinition {
 	}
 
 	static fromUrl(url: string): Promise<ImageSource> {
-		return getImageRequest(url) as Promise<ImageSource>;
+		return getImage(url) as Promise<ImageSource>;
 	}
 
 	static fromResourceSync(name: string): ImageSource {
diff --git a/packages/core/image-source/index.ios.ts b/packages/core/image-source/index.ios.ts
@@ -7,7 +7,7 @@ import { Trace } from '../trace';
 import { path as fsPath, knownFolders } from '../file-system';
 import { isFileOrResourcePath, RESOURCE_PREFIX, layout, releaseNativeObject, SYSTEM_PREFIX } from '../utils';
 import { getScaledDimensions } from './image-source-common';
-import { getImageRequest } from '../http/http-shared';
+import { getImage } from '../http';
 
 export { isFileOrResourcePath };
 
@@ -58,7 +58,7 @@ export class ImageSource implements ImageSourceDefinition {
 	}
 
 	static fromUrl(url: string): Promise<ImageSource> {
-		return getImageRequest(url) as Promise<ImageSource>;
+		return getImage(url) as Promise<ImageSource>;
 	}
 
 	static iosSystemScaleFor(scale: iosSymbolScaleType) {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ export function navigatingTo(args: EventData) {`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`export class SampleData extends Observable {`
`11`		`- src: string = 'https://source.unsplash.com/random';`
	`11`	`+ src: string = 'https://i.pravatar.cc/300';`
`12`	`12`	`savedData: string = '';`
`13`	`13`	`resizedImage: ImageSource;`
`14`	`14`	`async save() {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import { ImageSource as ImageSourceDefinition, iosSymbolScaleType } from '.';`
`2`	`2`	`import { ImageAsset } from '../image-asset';`
`3`		`-import { getImageRequest } from '../http/http-shared';`
	`3`	`+import { getImage } from '../http';`
`4`	`4`	`import { path as fsPath, knownFolders } from '../file-system';`
`5`	`5`	`import { isFileOrResourcePath, RESOURCE_PREFIX, layout } from '../utils';`
`6`	`6`	`import { getNativeApp } from '../application/helpers-common';`
`@@ -63,7 +63,7 @@ export class ImageSource implements ImageSourceDefinition {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`static fromUrl(url: string): Promise<ImageSource> {`
`66`		`- return getImageRequest(url) as Promise<ImageSource>;`
	`66`	`+ return getImage(url) as Promise<ImageSource>;`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`static fromResourceSync(name: string): ImageSource {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import { Trace } from '../trace';`
`7`	`7`	`import { path as fsPath, knownFolders } from '../file-system';`
`8`	`8`	`import { isFileOrResourcePath, RESOURCE_PREFIX, layout, releaseNativeObject, SYSTEM_PREFIX } from '../utils';`
`9`	`9`	`import { getScaledDimensions } from './image-source-common';`
`10`		`-import { getImageRequest } from '../http/http-shared';`
	`10`	`+import { getImage } from '../http';`
`11`	`11`
`12`	`12`	`export { isFileOrResourcePath };`
`13`	`13`
`@@ -58,7 +58,7 @@ export class ImageSource implements ImageSourceDefinition {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`static fromUrl(url: string): Promise<ImageSource> {`
`61`		`- return getImageRequest(url) as Promise<ImageSource>;`
	`61`	`+ return getImage(url) as Promise<ImageSource>;`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`static iosSystemScaleFor(scale: iosSymbolScaleType) {`