@cornerstonejs/core 1.74.2 → 1.74.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "1.74.2",
+  "version": "1.74.4",
   "description": "",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -47,5 +47,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "1556e7f436257a38321b48c99f0682f82bb25ad0"
+  "gitHead": "2671f86e3ff632928128f490ca34dee71074f5ee"
 }

package/src/cache/cache.ts

@@ -38,7 +38,7 @@ class Cache implements ICache {
   private _imageCacheSize = 0;
   private _volumeCacheSize = 0;
   private _maxCacheSize = 3 * ONE_GB;
-  private _maxInstanceSize = 2 * ONE_GB - 8;
+  private _maxInstanceSize = 4 * ONE_GB - 8;
 
   constructor() {
     // used to store object data (contour, surface, etc.)

package/src/loaders/volumeLoader.ts

@@ -12,6 +12,9 @@ import triggerEvent from '../utilities/triggerEvent';
 import cloneDeep from 'lodash.clonedeep';
 
 import {
+  createUint16SharedArray,
+  createUint8SharedArray,
+  createFloat32SharedArray,
   generateVolumePropsFromImageIds,
   getBufferConfiguration,
   uuidv4,
@@ -641,8 +644,24 @@ function generateVolumeScalarData(
 
   let volumeScalarData;
   if (targetBuffer?.sharedArrayBuffer) {
-    const buffer = new SharedArrayBuffer(numBytes);
-    volumeScalarData = new TypedArrayConstructor(buffer);
+    switch (targetBuffer.type) {
+      case 'Float32Array':
+        volumeScalarData = createFloat32SharedArray(scalarLength);
+        break;
+      case 'Uint8Array':
+        volumeScalarData = createUint8SharedArray(scalarLength);
+        break;
+      case 'Uint16Array':
+        volumeScalarData = createUint16SharedArray(scalarLength);
+        break;
+      case 'Int16Array':
+        volumeScalarData = createUint16SharedArray(scalarLength);
+        break;
+      default:
+        throw new Error(
+          'generateVolumeScalarData: SharedArrayBuffer is not supported for the specified target buffer type'
+        );
+    }
   } else {
     volumeScalarData = new TypedArrayConstructor(scalarLength);
   }

package/src/utilities/createFloat32SharedArray.ts

@@ -1,6 +1,10 @@
-import global from '../global';
 import { getShouldUseSharedArrayBuffer } from '../init';
 
+const SMALL_MEMORY_LIMIT = 2 * 1024 * 1024 * 1024 - 2;
+const BIG_MEMORY_LIMIT = SMALL_MEMORY_LIMIT * 2;
+// Wasm page size
+const PAGE_SIZE = 65536;
+
 /**
  * A helper function that creates a new Float32Array that utilized a shared
  * array buffer. This allows the array to be updated  simultaneously in
@@ -37,9 +41,20 @@ function createFloat32SharedArray(length: number): Float32Array {
     );
   }
 
-  const sharedArrayBuffer = new SharedArrayBuffer(length * 4);
+  const byteLength = length * 4;
 
-  return new Float32Array(sharedArrayBuffer);
+  if (byteLength < SMALL_MEMORY_LIMIT) {
+    const sharedArrayBuffer = new SharedArrayBuffer(byteLength);
+    return new Float32Array(sharedArrayBuffer);
+  } else if (byteLength < BIG_MEMORY_LIMIT) {
+    const pages = Math.ceil(byteLength / PAGE_SIZE);
+    const memory = new WebAssembly.Memory({
+      initial: pages,
+      maximum: pages,
+      shared: true,
+    });
+    return new Float32Array(memory.buffer, 0, length);
+  }
 }
 
 export default createFloat32SharedArray;