@react-three/fiber 8.15.3 → 8.15.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @react-three/fiber
 
+## 8.15.4
+
+### Patch Changes
+
+- 634e5db5: fix(native): harden Blob URI check for Android
+
 ## 8.15.3
 
 ### Patch Changes

package/native/dist/react-three-fiber-native.cjs.dev.js

@@ -282,18 +282,71 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(function CanvasWrapper(p
   })));
 });
 
-function polyfills() {
-  // http://stackoverflow.com/questions/105034
-  function uuidv4() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
-      const r = Math.random() * 16 | 0,
-        v = c == 'x' ? r : r & 0x3 | 0x8;
-      return v.toString(16);
-    });
+// http://stackoverflow.com/questions/105034
+function uuidv4() {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
+    const r = Math.random() * 16 | 0,
+      v = c == 'x' ? r : r & 0x3 | 0x8;
+    return v.toString(16);
+  });
+}
+async function getAsset(input) {
+  if (typeof input === 'string') {
+    var _NativeModules$BlobMo;
+    // Don't process storage
+    if (input.startsWith('file:')) return input;
+
+    // Unpack Blobs from react-native BlobManager
+    // https://github.com/facebook/react-native/issues/22681#issuecomment-523258955
+    if (input.startsWith('blob:') || input.startsWith((_NativeModules$BlobMo = reactNative.NativeModules.BlobModule) == null ? void 0 : _NativeModules$BlobMo.BLOB_URI_SCHEME)) {
+      const blob = await new Promise((res, rej) => {
+        const xhr = new XMLHttpRequest();
+        xhr.open('GET', input);
+        xhr.responseType = 'blob';
+        xhr.onload = () => res(xhr.response);
+        xhr.onerror = rej;
+        xhr.send();
+      });
+      const data = await new Promise((res, rej) => {
+        const reader = new FileReader();
+        reader.onload = () => res(reader.result);
+        reader.onerror = rej;
+        reader.readAsText(blob);
+      });
+      input = `data:${blob.type};base64,${data}`;
+    }
+
+    // Create safe URI for JSI serialization
+    if (input.startsWith('data:')) {
+      const [header, data] = input.split(';base64,');
+      const [, type] = header.split('/');
+      const uri = fs__namespace.cacheDirectory + uuidv4() + `.${type}`;
+      await fs__namespace.writeAsStringAsync(uri, data, {
+        encoding: fs__namespace.EncodingType.Base64
+      });
+      return uri;
+    }
   }
 
-  // Patch Blob for ArrayBuffer if unsupported
-  // https://github.com/facebook/react-native/pull/39276
+  // Download bundler module or external URL
+  const asset = await expoAsset.Asset.fromModule(input).downloadAsync();
+  let uri = asset.localUri || asset.uri;
+
+  // Unpack assets in Android Release Mode
+  if (!uri.includes(':')) {
+    const file = `${fs__namespace.cacheDirectory}ExponentAsset-${asset.hash}.${asset.type}`;
+    await fs__namespace.copyAsync({
+      from: uri,
+      to: file
+    });
+    uri = file;
+  }
+  return uri;
+}
+function polyfills() {
+  // Patch Blob for ArrayBuffer and URL if unsupported
+  // https://github.com/pmndrs/react-three-fiber/pull/3059
+  // https://github.com/pmndrs/react-three-fiber/issues/3058
   if (reactNative.Platform.OS !== 'web') {
     try {
       const blob = new Blob([new ArrayBuffer(4)]);
@@ -301,124 +354,34 @@ function polyfills() {
       URL.revokeObjectURL(url);
     } catch (_) {
       const BlobManager = require('react-native/Libraries/Blob/BlobManager.js');
-      let BLOB_URL_PREFIX = null;
-      const {
-        BlobModule
-      } = reactNative.NativeModules;
-      if (BlobModule && typeof BlobModule.BLOB_URI_SCHEME === 'string') {
-        BLOB_URL_PREFIX = BlobModule.BLOB_URI_SCHEME + ':';
-        if (typeof BlobModule.BLOB_URI_HOST === 'string') {
-          BLOB_URL_PREFIX += `//${BlobModule.BLOB_URI_HOST}/`;
+      const createObjectURL = URL.createObjectURL;
+      URL.createObjectURL = function (blob) {
+        if (blob.data._base64) {
+          return `data:${blob.type};base64,${blob.data._base64}`;
         }
-      }
-      URL.createObjectURL = function createObjectURL(blob) {
-        const data = blob.data;
-        if (BLOB_URL_PREFIX === null) {
-          // https://github.com/pmndrs/react-three-fiber/issues/3058
-          // throw new Error('Cannot create URL for blob!')
-          return `data:${blob.type};base64,${data._base64}`;
-        }
-        return `${BLOB_URL_PREFIX}${data.blobId}?offset=${data.offset}&size=${blob.size}`;
+        return createObjectURL(blob);
       };
-      BlobManager.createFromParts = function createFromParts(parts, options) {
-        const blobId = uuidv4();
-        const items = parts.map(part => {
+      const createFromParts = BlobManager.createFromParts;
+      BlobManager.createFromParts = function (parts, options) {
+        var _NativeModules$BlobMo2;
+        parts = parts.map(part => {
           if (part instanceof ArrayBuffer || ArrayBuffer.isView(part)) {
-            const data = base64Js.fromByteArray(new Uint8Array(part));
-            return {
-              data,
-              type: 'string'
-            };
-          } else if (part instanceof Blob) {
-            return {
-              data: part.data,
-              type: 'blob'
-            };
-          } else {
-            return {
-              data: String(part),
-              type: 'string'
-            };
-          }
-        });
-        const size = items.reduce((acc, curr) => {
-          if (curr.type === 'string') {
-            return acc + global.unescape(encodeURI(curr.data)).length;
-          } else {
-            return acc + curr.data.size;
+            part = base64Js.fromByteArray(new Uint8Array(part));
           }
-        }, 0);
-        reactNative.NativeModules.BlobModule.createFromParts(items, blobId);
-        const blob = BlobManager.createFromOptions({
-          blobId,
-          offset: 0,
-          size,
-          type: options ? options.type : '',
-          lastModified: options ? options.lastModified : Date.now()
+          return part;
         });
-        if (BLOB_URL_PREFIX === null) {
-          let data = '';
-          for (const item of items) {
-            var _item$data$_base;
-            data += (_item$data$_base = item.data._base64) != null ? _item$data$_base : item.data;
+        const blob = createFromParts(parts, options);
+        if (!((_NativeModules$BlobMo2 = reactNative.NativeModules.BlobModule) != null && _NativeModules$BlobMo2.BLOB_URI_SCHEME)) {
+          blob.data._base64 = '';
+          for (const part of parts) {
+            var _data$_base, _data;
+            blob.data._base64 += (_data$_base = (_data = part.data) == null ? void 0 : _data._base64) != null ? _data$_base : part;
           }
-          blob.data._base64 = data;
         }
         return blob;
       };
     }
   }
-  async function getAsset(input) {
-    if (typeof input === 'string') {
-      // Don't process storage
-      if (input.startsWith('file:')) return input;
-
-      // Unpack Blobs from react-native BlobManager
-      if (input.startsWith('blob:')) {
-        const blob = await new Promise((res, rej) => {
-          const xhr = new XMLHttpRequest();
-          xhr.open('GET', input);
-          xhr.responseType = 'blob';
-          xhr.onload = () => res(xhr.response);
-          xhr.onerror = rej;
-          xhr.send();
-        });
-        const data = await new Promise((res, rej) => {
-          const reader = new FileReader();
-          reader.onload = () => res(reader.result);
-          reader.onerror = rej;
-          reader.readAsText(blob);
-        });
-        input = `data:${blob.type};base64,${data}`;
-      }
-
-      // Create safe URI for JSI
-      if (input.startsWith('data:')) {
-        const [header, data] = input.split(';base64,');
-        const [, type] = header.split('/');
-        const uri = fs__namespace.cacheDirectory + uuidv4() + `.${type}`;
-        await fs__namespace.writeAsStringAsync(uri, data, {
-          encoding: fs__namespace.EncodingType.Base64
-        });
-        return uri;
-      }
-    }
-
-    // Download bundler module or external URL
-    const asset = await expoAsset.Asset.fromModule(input).downloadAsync();
-    let uri = asset.localUri || asset.uri;
-
-    // Unpack assets in Android Release Mode
-    if (!uri.includes(':')) {
-      const file = `${fs__namespace.cacheDirectory}ExponentAsset-${asset.hash}.${asset.type}`;
-      await fs__namespace.copyAsync({
-        from: uri,
-        to: file
-      });
-      uri = file;
-    }
-    return uri;
-  }
 
   // Don't pre-process urls, let expo-asset generate an absolute URL
   const extractUrlBase = THREE__namespace.LoaderUtils.extractUrlBase.bind(THREE__namespace.LoaderUtils);
@@ -427,7 +390,6 @@ function polyfills() {
   // There's no Image in native, so create a data texture instead
   THREE__namespace.TextureLoader.prototype.load = function load(url, onLoad, onProgress, onError) {
     if (this.path && typeof url === 'string') url = this.path + url;
-    this.manager.itemStart(url);
     const texture = new THREE__namespace.Texture();
     getAsset(url).then(async uri => {
       // https://github.com/expo/expo-three/pull/266
@@ -453,12 +415,7 @@ function polyfills() {
       // @ts-ignore
       texture.isDataTexture = true;
       onLoad == null ? void 0 : onLoad(texture);
-    }).catch(error => {
-      onError == null ? void 0 : onError(error);
-      this.manager.itemError(url);
-    }).finally(() => {
-      this.manager.itemEnd(url);
-    });
+    }).catch(onError);
     return texture;
   };
 

package/native/dist/react-three-fiber-native.cjs.prod.js

@@ -282,18 +282,71 @@ const Canvas = /*#__PURE__*/React__namespace.forwardRef(function CanvasWrapper(p
   })));
 });
 
-function polyfills() {
-  // http://stackoverflow.com/questions/105034
-  function uuidv4() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
-      const r = Math.random() * 16 | 0,
-        v = c == 'x' ? r : r & 0x3 | 0x8;
-      return v.toString(16);
-    });
+// http://stackoverflow.com/questions/105034
+function uuidv4() {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
+    const r = Math.random() * 16 | 0,
+      v = c == 'x' ? r : r & 0x3 | 0x8;
+    return v.toString(16);
+  });
+}
+async function getAsset(input) {
+  if (typeof input === 'string') {
+    var _NativeModules$BlobMo;
+    // Don't process storage
+    if (input.startsWith('file:')) return input;
+
+    // Unpack Blobs from react-native BlobManager
+    // https://github.com/facebook/react-native/issues/22681#issuecomment-523258955
+    if (input.startsWith('blob:') || input.startsWith((_NativeModules$BlobMo = reactNative.NativeModules.BlobModule) == null ? void 0 : _NativeModules$BlobMo.BLOB_URI_SCHEME)) {
+      const blob = await new Promise((res, rej) => {
+        const xhr = new XMLHttpRequest();
+        xhr.open('GET', input);
+        xhr.responseType = 'blob';
+        xhr.onload = () => res(xhr.response);
+        xhr.onerror = rej;
+        xhr.send();
+      });
+      const data = await new Promise((res, rej) => {
+        const reader = new FileReader();
+        reader.onload = () => res(reader.result);
+        reader.onerror = rej;
+        reader.readAsText(blob);
+      });
+      input = `data:${blob.type};base64,${data}`;
+    }
+
+    // Create safe URI for JSI serialization
+    if (input.startsWith('data:')) {
+      const [header, data] = input.split(';base64,');
+      const [, type] = header.split('/');
+      const uri = fs__namespace.cacheDirectory + uuidv4() + `.${type}`;
+      await fs__namespace.writeAsStringAsync(uri, data, {
+        encoding: fs__namespace.EncodingType.Base64
+      });
+      return uri;
+    }
   }
 
-  // Patch Blob for ArrayBuffer if unsupported
-  // https://github.com/facebook/react-native/pull/39276
+  // Download bundler module or external URL
+  const asset = await expoAsset.Asset.fromModule(input).downloadAsync();
+  let uri = asset.localUri || asset.uri;
+
+  // Unpack assets in Android Release Mode
+  if (!uri.includes(':')) {
+    const file = `${fs__namespace.cacheDirectory}ExponentAsset-${asset.hash}.${asset.type}`;
+    await fs__namespace.copyAsync({
+      from: uri,
+      to: file
+    });
+    uri = file;
+  }
+  return uri;
+}
+function polyfills() {
+  // Patch Blob for ArrayBuffer and URL if unsupported
+  // https://github.com/pmndrs/react-three-fiber/pull/3059
+  // https://github.com/pmndrs/react-three-fiber/issues/3058
   if (reactNative.Platform.OS !== 'web') {
     try {
       const blob = new Blob([new ArrayBuffer(4)]);
@@ -301,124 +354,34 @@ function polyfills() {
       URL.revokeObjectURL(url);
     } catch (_) {
       const BlobManager = require('react-native/Libraries/Blob/BlobManager.js');
-      let BLOB_URL_PREFIX = null;
-      const {
-        BlobModule
-      } = reactNative.NativeModules;
-      if (BlobModule && typeof BlobModule.BLOB_URI_SCHEME === 'string') {
-        BLOB_URL_PREFIX = BlobModule.BLOB_URI_SCHEME + ':';
-        if (typeof BlobModule.BLOB_URI_HOST === 'string') {
-          BLOB_URL_PREFIX += `//${BlobModule.BLOB_URI_HOST}/`;
+      const createObjectURL = URL.createObjectURL;
+      URL.createObjectURL = function (blob) {
+        if (blob.data._base64) {
+          return `data:${blob.type};base64,${blob.data._base64}`;
         }
-      }
-      URL.createObjectURL = function createObjectURL(blob) {
-        const data = blob.data;
-        if (BLOB_URL_PREFIX === null) {
-          // https://github.com/pmndrs/react-three-fiber/issues/3058
-          // throw new Error('Cannot create URL for blob!')
-          return `data:${blob.type};base64,${data._base64}`;
-        }
-        return `${BLOB_URL_PREFIX}${data.blobId}?offset=${data.offset}&size=${blob.size}`;
+        return createObjectURL(blob);
       };
-      BlobManager.createFromParts = function createFromParts(parts, options) {
-        const blobId = uuidv4();
-        const items = parts.map(part => {
+      const createFromParts = BlobManager.createFromParts;
+      BlobManager.createFromParts = function (parts, options) {
+        var _NativeModules$BlobMo2;
+        parts = parts.map(part => {
           if (part instanceof ArrayBuffer || ArrayBuffer.isView(part)) {
-            const data = base64Js.fromByteArray(new Uint8Array(part));
-            return {
-              data,
-              type: 'string'
-            };
-          } else if (part instanceof Blob) {
-            return {
-              data: part.data,
-              type: 'blob'
-            };
-          } else {
-            return {
-              data: String(part),
-              type: 'string'
-            };
-          }
-        });
-        const size = items.reduce((acc, curr) => {
-          if (curr.type === 'string') {
-            return acc + global.unescape(encodeURI(curr.data)).length;
-          } else {
-            return acc + curr.data.size;
+            part = base64Js.fromByteArray(new Uint8Array(part));
           }
-        }, 0);
-        reactNative.NativeModules.BlobModule.createFromParts(items, blobId);
-        const blob = BlobManager.createFromOptions({
-          blobId,
-          offset: 0,
-          size,
-          type: options ? options.type : '',
-          lastModified: options ? options.lastModified : Date.now()
+          return part;
         });
-        if (BLOB_URL_PREFIX === null) {
-          let data = '';
-          for (const item of items) {
-            var _item$data$_base;
-            data += (_item$data$_base = item.data._base64) != null ? _item$data$_base : item.data;
+        const blob = createFromParts(parts, options);
+        if (!((_NativeModules$BlobMo2 = reactNative.NativeModules.BlobModule) != null && _NativeModules$BlobMo2.BLOB_URI_SCHEME)) {
+          blob.data._base64 = '';
+          for (const part of parts) {
+            var _data$_base, _data;
+            blob.data._base64 += (_data$_base = (_data = part.data) == null ? void 0 : _data._base64) != null ? _data$_base : part;
           }
-          blob.data._base64 = data;
         }
         return blob;
       };
     }
   }
-  async function getAsset(input) {
-    if (typeof input === 'string') {
-      // Don't process storage
-      if (input.startsWith('file:')) return input;
-
-      // Unpack Blobs from react-native BlobManager
-      if (input.startsWith('blob:')) {
-        const blob = await new Promise((res, rej) => {
-          const xhr = new XMLHttpRequest();
-          xhr.open('GET', input);
-          xhr.responseType = 'blob';
-          xhr.onload = () => res(xhr.response);
-          xhr.onerror = rej;
-          xhr.send();
-        });
-        const data = await new Promise((res, rej) => {
-          const reader = new FileReader();
-          reader.onload = () => res(reader.result);
-          reader.onerror = rej;
-          reader.readAsText(blob);
-        });
-        input = `data:${blob.type};base64,${data}`;
-      }
-
-      // Create safe URI for JSI
-      if (input.startsWith('data:')) {
-        const [header, data] = input.split(';base64,');
-        const [, type] = header.split('/');
-        const uri = fs__namespace.cacheDirectory + uuidv4() + `.${type}`;
-        await fs__namespace.writeAsStringAsync(uri, data, {
-          encoding: fs__namespace.EncodingType.Base64
-        });
-        return uri;
-      }
-    }
-
-    // Download bundler module or external URL
-    const asset = await expoAsset.Asset.fromModule(input).downloadAsync();
-    let uri = asset.localUri || asset.uri;
-
-    // Unpack assets in Android Release Mode
-    if (!uri.includes(':')) {
-      const file = `${fs__namespace.cacheDirectory}ExponentAsset-${asset.hash}.${asset.type}`;
-      await fs__namespace.copyAsync({
-        from: uri,
-        to: file
-      });
-      uri = file;
-    }
-    return uri;
-  }
 
   // Don't pre-process urls, let expo-asset generate an absolute URL
   const extractUrlBase = THREE__namespace.LoaderUtils.extractUrlBase.bind(THREE__namespace.LoaderUtils);
@@ -427,7 +390,6 @@ function polyfills() {
   // There's no Image in native, so create a data texture instead
   THREE__namespace.TextureLoader.prototype.load = function load(url, onLoad, onProgress, onError) {
     if (this.path && typeof url === 'string') url = this.path + url;
-    this.manager.itemStart(url);
     const texture = new THREE__namespace.Texture();
     getAsset(url).then(async uri => {
       // https://github.com/expo/expo-three/pull/266
@@ -453,12 +415,7 @@ function polyfills() {
       // @ts-ignore
       texture.isDataTexture = true;
       onLoad == null ? void 0 : onLoad(texture);
-    }).catch(error => {
-      onError == null ? void 0 : onError(error);
-      this.manager.itemError(url);
-    }).finally(() => {
-      this.manager.itemEnd(url);
-    });
+    }).catch(onError);
     return texture;
   };
 

package/native/dist/react-three-fiber-native.esm.js

@@ -257,18 +257,71 @@ const Canvas = /*#__PURE__*/React.forwardRef(function CanvasWrapper(props, ref)
   })));
 });
 
-function polyfills() {
-  // http://stackoverflow.com/questions/105034
-  function uuidv4() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
-      const r = Math.random() * 16 | 0,
-        v = c == 'x' ? r : r & 0x3 | 0x8;
-      return v.toString(16);
-    });
+// http://stackoverflow.com/questions/105034
+function uuidv4() {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
+    const r = Math.random() * 16 | 0,
+      v = c == 'x' ? r : r & 0x3 | 0x8;
+    return v.toString(16);
+  });
+}
+async function getAsset(input) {
+  if (typeof input === 'string') {
+    var _NativeModules$BlobMo;
+    // Don't process storage
+    if (input.startsWith('file:')) return input;
+
+    // Unpack Blobs from react-native BlobManager
+    // https://github.com/facebook/react-native/issues/22681#issuecomment-523258955
+    if (input.startsWith('blob:') || input.startsWith((_NativeModules$BlobMo = NativeModules.BlobModule) == null ? void 0 : _NativeModules$BlobMo.BLOB_URI_SCHEME)) {
+      const blob = await new Promise((res, rej) => {
+        const xhr = new XMLHttpRequest();
+        xhr.open('GET', input);
+        xhr.responseType = 'blob';
+        xhr.onload = () => res(xhr.response);
+        xhr.onerror = rej;
+        xhr.send();
+      });
+      const data = await new Promise((res, rej) => {
+        const reader = new FileReader();
+        reader.onload = () => res(reader.result);
+        reader.onerror = rej;
+        reader.readAsText(blob);
+      });
+      input = `data:${blob.type};base64,${data}`;
+    }
+
+    // Create safe URI for JSI serialization
+    if (input.startsWith('data:')) {
+      const [header, data] = input.split(';base64,');
+      const [, type] = header.split('/');
+      const uri = fs.cacheDirectory + uuidv4() + `.${type}`;
+      await fs.writeAsStringAsync(uri, data, {
+        encoding: fs.EncodingType.Base64
+      });
+      return uri;
+    }
   }
 
-  // Patch Blob for ArrayBuffer if unsupported
-  // https://github.com/facebook/react-native/pull/39276
+  // Download bundler module or external URL
+  const asset = await Asset.fromModule(input).downloadAsync();
+  let uri = asset.localUri || asset.uri;
+
+  // Unpack assets in Android Release Mode
+  if (!uri.includes(':')) {
+    const file = `${fs.cacheDirectory}ExponentAsset-${asset.hash}.${asset.type}`;
+    await fs.copyAsync({
+      from: uri,
+      to: file
+    });
+    uri = file;
+  }
+  return uri;
+}
+function polyfills() {
+  // Patch Blob for ArrayBuffer and URL if unsupported
+  // https://github.com/pmndrs/react-three-fiber/pull/3059
+  // https://github.com/pmndrs/react-three-fiber/issues/3058
   if (Platform.OS !== 'web') {
     try {
       const blob = new Blob([new ArrayBuffer(4)]);
@@ -276,124 +329,34 @@ function polyfills() {
       URL.revokeObjectURL(url);
     } catch (_) {
       const BlobManager = require('react-native/Libraries/Blob/BlobManager.js');
-      let BLOB_URL_PREFIX = null;
-      const {
-        BlobModule
-      } = NativeModules;
-      if (BlobModule && typeof BlobModule.BLOB_URI_SCHEME === 'string') {
-        BLOB_URL_PREFIX = BlobModule.BLOB_URI_SCHEME + ':';
-        if (typeof BlobModule.BLOB_URI_HOST === 'string') {
-          BLOB_URL_PREFIX += `//${BlobModule.BLOB_URI_HOST}/`;
+      const createObjectURL = URL.createObjectURL;
+      URL.createObjectURL = function (blob) {
+        if (blob.data._base64) {
+          return `data:${blob.type};base64,${blob.data._base64}`;
         }
-      }
-      URL.createObjectURL = function createObjectURL(blob) {
-        const data = blob.data;
-        if (BLOB_URL_PREFIX === null) {
-          // https://github.com/pmndrs/react-three-fiber/issues/3058
-          // throw new Error('Cannot create URL for blob!')
-          return `data:${blob.type};base64,${data._base64}`;
-        }
-        return `${BLOB_URL_PREFIX}${data.blobId}?offset=${data.offset}&size=${blob.size}`;
+        return createObjectURL(blob);
       };
-      BlobManager.createFromParts = function createFromParts(parts, options) {
-        const blobId = uuidv4();
-        const items = parts.map(part => {
+      const createFromParts = BlobManager.createFromParts;
+      BlobManager.createFromParts = function (parts, options) {
+        var _NativeModules$BlobMo2;
+        parts = parts.map(part => {
           if (part instanceof ArrayBuffer || ArrayBuffer.isView(part)) {
-            const data = fromByteArray(new Uint8Array(part));
-            return {
-              data,
-              type: 'string'
-            };
-          } else if (part instanceof Blob) {
-            return {
-              data: part.data,
-              type: 'blob'
-            };
-          } else {
-            return {
-              data: String(part),
-              type: 'string'
-            };
-          }
-        });
-        const size = items.reduce((acc, curr) => {
-          if (curr.type === 'string') {
-            return acc + global.unescape(encodeURI(curr.data)).length;
-          } else {
-            return acc + curr.data.size;
+            part = fromByteArray(new Uint8Array(part));
           }
-        }, 0);
-        NativeModules.BlobModule.createFromParts(items, blobId);
-        const blob = BlobManager.createFromOptions({
-          blobId,
-          offset: 0,
-          size,
-          type: options ? options.type : '',
-          lastModified: options ? options.lastModified : Date.now()
+          return part;
         });
-        if (BLOB_URL_PREFIX === null) {
-          let data = '';
-          for (const item of items) {
-            var _item$data$_base;
-            data += (_item$data$_base = item.data._base64) != null ? _item$data$_base : item.data;
+        const blob = createFromParts(parts, options);
+        if (!((_NativeModules$BlobMo2 = NativeModules.BlobModule) != null && _NativeModules$BlobMo2.BLOB_URI_SCHEME)) {
+          blob.data._base64 = '';
+          for (const part of parts) {
+            var _data$_base, _data;
+            blob.data._base64 += (_data$_base = (_data = part.data) == null ? void 0 : _data._base64) != null ? _data$_base : part;
           }
-          blob.data._base64 = data;
         }
         return blob;
       };
     }
   }
-  async function getAsset(input) {
-    if (typeof input === 'string') {
-      // Don't process storage
-      if (input.startsWith('file:')) return input;
-
-      // Unpack Blobs from react-native BlobManager
-      if (input.startsWith('blob:')) {
-        const blob = await new Promise((res, rej) => {
-          const xhr = new XMLHttpRequest();
-          xhr.open('GET', input);
-          xhr.responseType = 'blob';
-          xhr.onload = () => res(xhr.response);
-          xhr.onerror = rej;
-          xhr.send();
-        });
-        const data = await new Promise((res, rej) => {
-          const reader = new FileReader();
-          reader.onload = () => res(reader.result);
-          reader.onerror = rej;
-          reader.readAsText(blob);
-        });
-        input = `data:${blob.type};base64,${data}`;
-      }
-
-      // Create safe URI for JSI
-      if (input.startsWith('data:')) {
-        const [header, data] = input.split(';base64,');
-        const [, type] = header.split('/');
-        const uri = fs.cacheDirectory + uuidv4() + `.${type}`;
-        await fs.writeAsStringAsync(uri, data, {
-          encoding: fs.EncodingType.Base64
-        });
-        return uri;
-      }
-    }
-
-    // Download bundler module or external URL
-    const asset = await Asset.fromModule(input).downloadAsync();
-    let uri = asset.localUri || asset.uri;
-
-    // Unpack assets in Android Release Mode
-    if (!uri.includes(':')) {
-      const file = `${fs.cacheDirectory}ExponentAsset-${asset.hash}.${asset.type}`;
-      await fs.copyAsync({
-        from: uri,
-        to: file
-      });
-      uri = file;
-    }
-    return uri;
-  }
 
   // Don't pre-process urls, let expo-asset generate an absolute URL
   const extractUrlBase = THREE.LoaderUtils.extractUrlBase.bind(THREE.LoaderUtils);
@@ -402,7 +365,6 @@ function polyfills() {
   // There's no Image in native, so create a data texture instead
   THREE.TextureLoader.prototype.load = function load(url, onLoad, onProgress, onError) {
     if (this.path && typeof url === 'string') url = this.path + url;
-    this.manager.itemStart(url);
     const texture = new THREE.Texture();
     getAsset(url).then(async uri => {
       // https://github.com/expo/expo-three/pull/266
@@ -428,12 +390,7 @@ function polyfills() {
       // @ts-ignore
       texture.isDataTexture = true;
       onLoad == null ? void 0 : onLoad(texture);
-    }).catch(error => {
-      onError == null ? void 0 : onError(error);
-      this.manager.itemError(url);
-    }).finally(() => {
-      this.manager.itemEnd(url);
-    });
+    }).catch(onError);
     return texture;
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-three/fiber",
-  "version": "8.15.3",
+  "version": "8.15.4",
   "description": "A React renderer for Threejs",
   "keywords": [
     "react",