hellfire 0.32.0 → 0.32.1

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [0.32.1](http://10.16.100.57/diffusion/115/paladin/compare/v0.32.0...v0.32.1) (2025-12-16)
+
+
+
 # [0.32.0](http://10.16.100.57/diffusion/115/paladin/compare/v0.31.11...v0.32.0) (2025-12-15)
 
 

package/dist/index.js

@@ -10446,13 +10446,50 @@ function executeTask() {
         }
 
         numRequest++;
-        task.execute().then(function (res) {
-          if (!res.sizeInBytes && task.extra.backupId) {
-            // 解析图像数据出问题导致得到的图像是空的
-            // 目前碰到的问题是DR图像压缩后一部分图像会出现解析失败问题，尝试获取原始图像来解决
-            task.backupExecute().then(function (backupRes) {
-              task.putCacheByBackup();
 
+        if (task.loadBackup) {
+          // 图像加载失败手动reload时走wado fall
+          task.backupExecute().then(function (backupRes) {
+            task.putCacheByBackup();
+
+            if (executeCallback) {
+              executeCallback(task, taskPool.length);
+            }
+
+            numRequest--;
+            task.callbacks && task.callbacks.map(function (callback) {
+              callback({
+                success: true,
+                res: backupRes
+              });
+            });
+            delete cachedTask[task.key];
+            executeTask();
+          });
+        } else {
+          task.execute().then(function (res) {
+            if (!res.sizeInBytes && task.extra.backupId) {
+              // 解析图像数据出问题导致得到的图像是空的
+              // 目前碰到的问题是DR图像压缩后一部分图像会出现解析失败问题，尝试获取原始图像来解决
+              task.backupExecute().then(function (backupRes) {
+                task.putCacheByBackup();
+
+                if (executeCallback) {
+                  executeCallback(task, taskPool.length);
+                }
+
+                numRequest--;
+                task.callbacks && task.callbacks.map(function (callback) {
+                  callback({
+                    success: true,
+                    res: backupRes
+                  });
+                });
+                delete cachedTask[task.key];
+                executeTask();
+              });
+            } else {
+              // 获得正常的图像数据
               if (executeCallback) {
                 executeCallback(task, taskPool.length);
               }
@@ -10461,52 +10498,37 @@ function executeTask() {
               task.callbacks && task.callbacks.map(function (callback) {
                 callback({
                   success: true,
-                  res: backupRes
+                  res: res
                 });
               });
               delete cachedTask[task.key];
               executeTask();
-            });
-          } else {
-            // 获得正常的图像数据
-            if (executeCallback) {
-              executeCallback(task, taskPool.length);
             }
-
+          }, function (err) {
+            // 请求失败 重试机制
             numRequest--;
-            task.callbacks && task.callbacks.map(function (callback) {
-              callback({
-                success: true,
-                res: res
-              });
-            });
-            delete cachedTask[task.key];
-            executeTask();
-          }
-        }, function (err) {
-          // 请求失败 重试机制
-          numRequest--;
 
-          if (task.retry > 0) {
-            var _task = _objectSpread$5(_objectSpread$5({}, task), {}, {
-              retry: task.retry - 1,
-              priority: 999
-            });
+            if (task.retry > 0) {
+              var _task = _objectSpread$5(_objectSpread$5({}, task), {}, {
+                retry: task.retry - 1,
+                priority: 999
+              });
 
-            taskPool.push(_task);
-          } else {
-            task.callbacks && task.callbacks.map(function (callback) {
-              callback({
-                success: false,
-                err: err
+              taskPool.push(_task);
+            } else {
+              task.callbacks && task.callbacks.map(function (callback) {
+                callback({
+                  success: false,
+                  err: err
+                });
               });
-            });
-            errorCache[task.key] = task;
-            delete cachedTask[task.key];
-          }
+              errorCache[task.key] = task;
+              delete cachedTask[task.key];
+            }
 
-          executeTask();
-        });
+            executeTask();
+          });
+        }
       };
 
       for (var i = 0; i < executeRequest; i++) {
@@ -10677,7 +10699,7 @@ function changePriorityBySeries(seriesInstanceUID, series) {
   }
 }
 
-function handleTopPriorityTask(imageId, priority, resolve, reject) {
+function handleTopPriorityTask(imageId, priority, resolve, reject, loadBackupImage) {
   var _priority = highLevelPriority;
 
   if (priority || priority === 0) {
@@ -10689,11 +10711,22 @@ function handleTopPriorityTask(imageId, priority, resolve, reject) {
 
   var match = imageId.match(/series\/(.*?)\/instances/);
   var seriesUId = match ? match[1] : null;
+  var backupId;
+  var queryIndex = imageId.indexOf('?');
+
+  if (queryIndex !== -1) {
+    backupId = "".concat(imageId.slice(0, queryIndex), "-full").concat(imageId.slice(queryIndex));
+  } else {
+    backupId = "".concat(imageId, "-full");
+  }
+
   var imageTask = buildImageRequestTask(imageId, {
     priority: _priority,
     extra: {
-      series: seriesUId
-    }
+      series: seriesUId,
+      backupId: backupId
+    },
+    loadBackup: !!loadBackupImage
   });
   addLoadImageTask(imageTask).then(function (res) {
     resolve(res);
@@ -10702,7 +10735,7 @@ function handleTopPriorityTask(imageId, priority, resolve, reject) {
   });
 }
 
-function loadAndCacheImagePlus(imageId, priority, forceRefresh) {
+function loadAndCacheImagePlus(imageId, priority, forceRefresh, loadBackupImage) {
   return new Promise(function (resolve, reject) {
     if (forceRefresh) {
       cornerstone.imageCache.removeImageLoadObject(imageId);
@@ -10713,7 +10746,7 @@ function loadAndCacheImagePlus(imageId, priority, forceRefresh) {
     if (imageLoadObject && !forceRefresh) {
       imageLoadObject.promise.then(function (image) {
         if (!image.sizeInBytes) {
-          handleTopPriorityTask(imageId, priority, resolve, reject);
+          handleTopPriorityTask(imageId, priority, resolve, reject, loadBackupImage);
         } else {
           resolve(image);
         }
@@ -10721,7 +10754,7 @@ function loadAndCacheImagePlus(imageId, priority, forceRefresh) {
         reject(err);
       });
     } else {
-      handleTopPriorityTask(imageId, priority, resolve, reject);
+      handleTopPriorityTask(imageId, priority, resolve, reject, loadBackupImage);
     }
   });
 }
@@ -10735,7 +10768,12 @@ function buildImageRequestTask(imageId) {
       return cornerstone.loadAndCacheImage(imageId);
     },
     backupExecute: function backupExecute() {
-      cornerstone.imageCache.removeImageLoadObject(imageId);
+      var imageLoadObject = cornerstone.imageCache.getImageLoadObject(imageId);
+
+      if (imageLoadObject) {
+        cornerstone.imageCache.removeImageLoadObject(imageId);
+      }
+
       return cornerstone.loadAndCacheImage(config.extra.backupId);
     },
     putCacheByBackup: function putCacheByBackup() {
@@ -80559,14 +80597,22 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
       loadHandlerManager$1.setEndLoadHandler(_this.doneLoadingHandler, _this.element);
       loadHandlerManager$1.setErrorLoadingHandler(_this.errorLoadingHandler, _this.element); // trigger first loading
 
-      (_this2 = _this).triggerfirstLoading.apply(_this2, arguments);
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+
+      (_this2 = _this).triggerfirstLoading.apply(_this2, args);
 
       var stack = _this.state.stack;
       var imageId = stack && stack.imageIds[stack.currentImageIdIndex];
       var imagePromise;
 
       try {
-        imagePromise = loadAndCacheImagePlus(imageId);
+        if (args[0] && args[0].retry) {
+          imagePromise = loadAndCacheImagePlus(imageId, null, true, true);
+        } else {
+          imagePromise = loadAndCacheImagePlus(imageId);
+        }
       } catch (error) {
         console.error(error);
 
@@ -81000,7 +81046,9 @@ var DicomViewport = /*#__PURE__*/function (_Component) {
 
             onClickDomErrorReRenderButton && onClickDomErrorReRenderButton();
           } else {
-            _this3.loadImage(ev);
+            _this3.loadImage({
+              retry: true
+            });
           }
         }
       }), /*#__PURE__*/React__default.createElement("canvas", {