@aics/vole-core 3.15.1 → 3.15.2

package/es/loaders/OmeZarrLoader.js

@@ -9,7 +9,7 @@ import { composeSubregion, computePackedAtlasDims, convertSubregionToPixels, pic
 import ChunkPrefetchIterator from "./zarr_utils/ChunkPrefetchIterator.js";
 import { getScale, getSourceChannelNames, matchSourceScaleLevels, orderByDimension, orderByTCZYX, remapAxesToTCZYX } from "./zarr_utils/utils.js";
 import { VolumeLoadError, VolumeLoadErrorType, wrapVolumeLoadError } from "./VolumeLoadError.js";
-import wrapArray from "./zarr_utils/wrapArray.js";
+import wrapArray, { RelaxedFetchStore } from "./zarr_utils/wrappers.js";
 import { assertMetadataHasMultiscales, toOMEZarrMetaV4, validateOMEZarrMetadata } from "./zarr_utils/validation.js";
 const CHUNK_REQUEST_CANCEL_REASON = "chunk request cancelled";
 
@@ -96,7 +96,7 @@ class OMEZarrLoader extends ThreadableVolumeLoader {
 
     // Create one `ZarrSource` per URL
     const sourceProms = urlsArr.map(async (url, i) => {
-      const store = new zarr.FetchStore(url);
+      const store = new RelaxedFetchStore(url);
       const root = zarr.root(store);
       const group = await zarr.open(root, {
         kind: "group"

package/es/loaders/zarr_utils/{wrapArray.js → wrappers.js}

@@ -1,3 +1,4 @@
+import { FetchStore } from "zarrita";
 import { isChunk } from "../../VolumeCache.js";
 export default function wrapArray(array, basePath, cache, queue) {
   const path = basePath.endsWith("/") ? basePath.slice(0, -1) : basePath;
@@ -36,4 +37,23 @@ export default function wrapArray(array, basePath, cache, queue) {
       return value;
     }
   });
+}
+export class RelaxedFetchStore extends FetchStore {
+  constructor(baseUrl, options) {
+    super(baseUrl, options);
+  }
+
+  // Solution for https://github.com/manzt/zarrita.js/pull/212
+  // taken from https://github.com/vitessce/vitessce/pull/2069
+  async get(key, options = {}) {
+    try {
+      return await super.get(key, options);
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (e) {
+      if (e?.message?.startsWith("Unexpected response status 403")) {
+        return undefined;
+      }
+      throw e;
+    }
+  }
 }

package/es/types/loaders/zarr_utils/{wrapArray.d.ts → wrappers.d.ts}

@@ -1,7 +1,12 @@
-import type { Array as ZarrArray, AsyncReadable, DataType } from "zarrita";
+import type { AbsolutePath, Array as ZarrArray, AsyncReadable, DataType } from "zarrita";
+import { FetchStore } from "zarrita";
 import VolumeCache from "../../VolumeCache.js";
 import type { WrappedArrayOpts } from "./types.js";
 import SubscribableRequestQueue from "../../utils/SubscribableRequestQueue.js";
 type AsyncReadableExt<Opts> = AsyncReadable<Opts & WrappedArrayOpts>;
 export default function wrapArray<T extends DataType, Opts = unknown, Store extends AsyncReadable<Opts> = AsyncReadable<Opts>>(array: ZarrArray<T, Store>, basePath: string, cache?: VolumeCache, queue?: SubscribableRequestQueue): ZarrArray<T, AsyncReadableExt<Opts>>;
+export declare class RelaxedFetchStore extends FetchStore {
+    constructor(baseUrl: string, options?: RequestInit);
+    get(key: AbsolutePath, options?: RequestInit): Promise<Uint8Array | undefined>;
+}
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aics/vole-core",
-  "version": "3.15.1",
+  "version": "3.15.2",
   "description": "volume renderer for 3d, 4d, or 5d imaging data with OME-Zarr support",
   "main": "es/index.js",
   "type": "module",
@@ -39,7 +39,7 @@
     "three": "^0.171.0",
     "throttled-queue": "^2.1.4",
     "tweakpane": "^3.1.9",
-    "zarrita": "^0.4.0"
+    "zarrita": "^0.5.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.25.6",