react-native-executorch 0.3.3 → 0.4.1

package/ios/RnExecutorch/models/image_segmentation/ImageSegmentationModel.mm

@@ -0,0 +1,146 @@
+#import "ImageSegmentationModel.h"
+#import "../../utils/Conversions.h"
+#import "../../utils/ImageProcessor.h"
+#import "../../utils/Numerical.h"
+#import "Constants.h"
+#import <unordered_set>
+
+@interface ImageSegmentationModel ()
+- (NSArray *)preprocess:(cv::Mat &)input;
+- (NSDictionary *)postprocess:(NSArray *)output
+                returnClasses:(NSArray *)classesOfInterest
+                       resize:(BOOL)resize;
+@end
+
+@implementation ImageSegmentationModel {
+  cv::Size originalSize;
+}
+
+- (cv::Size)getModelImageSize {
+  NSArray *inputShape = [module getInputShape:@0];
+  NSNumber *widthNumber = inputShape.lastObject;
+  NSNumber *heightNumber = inputShape[inputShape.count - 2];
+
+  int height = [heightNumber intValue];
+  int width = [widthNumber intValue];
+
+  return cv::Size(height, width);
+}
+
+- (NSArray *)preprocess:(cv::Mat &)input {
+  originalSize = cv::Size(input.cols, input.rows);
+
+  cv::Size modelImageSize = [self getModelImageSize];
+  cv::Mat output;
+  cv::resize(input, output, modelImageSize);
+
+  NSArray *modelInput = [ImageProcessor matToNSArray:output];
+  return modelInput;
+}
+
+std::vector<cv::Mat> extractResults(NSArray *result, std::size_t numLabels,
+                                    cv::Size modelImageSize,
+                                    cv::Size originalSize, BOOL resize) {
+  std::size_t numModelPixels = modelImageSize.height * modelImageSize.width;
+
+  std::vector<cv::Mat> resizedLabelScores(numLabels);
+  for (std::size_t label = 0; label < numLabels; ++label) {
+    cv::Mat labelMat = cv::Mat(modelImageSize, CV_64F);
+
+    for (std::size_t pixel = 0; pixel < numModelPixels; ++pixel) {
+      int row = pixel / modelImageSize.width;
+      int col = pixel % modelImageSize.width;
+      labelMat.at<double>(row, col) =
+          [result[label * numModelPixels + pixel] doubleValue];
+    }
+
+    if (resize) {
+      cv::resize(labelMat, resizedLabelScores[label], originalSize);
+    } else {
+      resizedLabelScores[label] = std::move(labelMat);
+    }
+  }
+  return resizedLabelScores;
+}
+
+void adjustScoresPerPixel(std::vector<cv::Mat> &labelScores, cv::Mat &argMax,
+                          cv::Size outputSize, std::size_t numLabels) {
+  std::size_t numOutputPixels = outputSize.height * outputSize.width;
+  for (std::size_t pixel = 0; pixel < numOutputPixels; ++pixel) {
+    int row = pixel / outputSize.width;
+    int col = pixel % outputSize.width;
+    std::vector<double> scores;
+    scores.reserve(numLabels);
+    for (const auto &mat : labelScores) {
+      scores.push_back(mat.at<double>(row, col));
+    }
+
+    std::vector<double> adjustedScores = softmax(scores);
+
+    for (std::size_t label = 0; label < numLabels; ++label) {
+      labelScores[label].at<double>(row, col) = adjustedScores[label];
+    }
+
+    auto maxIt = std::max_element(scores.begin(), scores.end());
+    argMax.at<int>(row, col) = std::distance(scores.begin(), maxIt);
+  }
+}
+
+- (NSDictionary *)postprocess:(NSArray *)output
+                returnClasses:(NSArray *)classesOfInterest
+                       resize:(BOOL)resize {
+  cv::Size modelImageSize = [self getModelImageSize];
+
+  std::size_t numLabels = deeplabv3_resnet50_labels.size();
+
+  NSAssert((std::size_t)output.count ==
+               numLabels * modelImageSize.height * modelImageSize.width,
+           @"Model generated unexpected output size.");
+
+  // For each label extract it's matrix,
+  // and rescale it to the original size if `resize`
+  std::vector<cv::Mat> resizedLabelScores =
+      extractResults(output, numLabels, modelImageSize, originalSize, resize);
+
+  cv::Size outputSize = resize ? originalSize : modelImageSize;
+  cv::Mat argMax = cv::Mat(outputSize, CV_32S);
+
+  // For each pixel apply softmax across all the labels and calculate the argMax
+  adjustScoresPerPixel(resizedLabelScores, argMax, outputSize, numLabels);
+
+  std::unordered_set<std::string> labelSet;
+
+  for (id label in classesOfInterest) {
+    labelSet.insert(std::string([label UTF8String]));
+  }
+
+  NSMutableDictionary *result = [NSMutableDictionary dictionary];
+
+  // Convert to NSArray and populate the final dictionary
+  for (std::size_t label = 0; label < numLabels; ++label) {
+    if (labelSet.contains(deeplabv3_resnet50_labels[label])) {
+      NSString *labelString = @(deeplabv3_resnet50_labels[label].c_str());
+      NSArray *arr = simpleMatToNSArray<double>(resizedLabelScores[label]);
+      result[labelString] = arr;
+    }
+  }
+
+  result[@"ARGMAX"] = simpleMatToNSArray<int>(argMax);
+
+  return result;
+}
+
+- (NSDictionary *)runModel:(cv::Mat &)input
+             returnClasses:(NSArray *)classesOfInterest
+                    resize:(BOOL)resize {
+  NSArray *modelInput = [self preprocess:input];
+  NSArray *result = [self forward:@[ modelInput ]];
+
+  NSDictionary *output = [self postprocess:result[0]
+                             returnClasses:classesOfInterest
+                                    resize:resize];
+
+  return output;
+}
+
+@end

package/ios/RnExecutorch/models/object_detection/SSDLiteLargeModel.mm

@@ -1,7 +1,6 @@
 #include "SSDLiteLargeModel.hpp"
 #include "../../utils/ObjectDetectionUtils.hpp"
 #include "ImageProcessor.h"
-#include <vector>
 
 float constexpr iouThreshold = 0.55;
 float constexpr detectionThreshold = 0.7;
@@ -54,7 +53,7 @@ int constexpr modelInputHeight = 320;
   int inputImageWidth = size.width;
   int inputImageHeight = size.height;
   NSArray *modelInput = [self preprocess:input];
-  NSArray *forwardResult = [self forward:modelInput];
+  NSArray *forwardResult = [self forward:@[ modelInput ]];
   NSArray *output =
       [self postprocess:forwardResult
              widthRatio:inputImageWidth / (float)modelInputWidth

package/ios/RnExecutorch/models/ocr/Detector.h

@@ -1,7 +1,5 @@
 #import "BaseModel.h"
-#import "RecognitionHandler.h"
 #import "opencv2/opencv.hpp"
-#import "utils/Constants.h"
 
 @interface Detector : BaseModel
 

package/ios/RnExecutorch/models/ocr/Detector.mm

@@ -1,5 +1,6 @@
 #import "Detector.h"
 #import "../../utils/ImageProcessor.h"
+#import "utils/Constants.h"
 #import "utils/DetectorUtils.h"
 #import "utils/OCRUtils.h"
 
@@ -92,7 +93,7 @@
 
 - (NSArray *)runModel:(cv::Mat &)input {
   NSArray *modelInput = [self preprocess:input];
-  NSArray *modelResult = [self forward:modelInput];
+  NSArray *modelResult = [self forward:@[ modelInput ]];
   NSArray *result = [self postprocess:modelResult];
   return result;
 }

package/ios/RnExecutorch/models/ocr/RecognitionHandler.h

@@ -3,10 +3,11 @@
 @interface RecognitionHandler : NSObject
 
 - (instancetype)initWithSymbols:(NSString *)symbols;
-- (void)loadRecognizers:(NSString *)largeRecognizerPath
-    mediumRecognizerPath:(NSString *)mediumRecognizerPath
-     smallRecognizerPath:(NSString *)smallRecognizerPath
-              completion:(void (^)(BOOL, NSNumber *))completion;
+
+- (NSNumber *)loadRecognizers:(NSString *)largeRecognizerPath
+         mediumRecognizerPath:(NSString *)mediumRecognizerPath
+          smallRecognizerPath:(NSString *)smallRecognizerPath;
+
 - (NSArray *)recognize:(NSArray<NSDictionary *> *)bBoxesList
                imgGray:(cv::Mat)imgGray
           desiredWidth:(int)desiredWidth

package/ios/RnExecutorch/models/ocr/RecognitionHandler.mm

@@ -1,12 +1,9 @@
 #import "RecognitionHandler.h"
-#import "../../utils/ImageProcessor.h"
 #import "./utils/CTCLabelConverter.h"
 #import "./utils/Constants.h"
 #import "./utils/OCRUtils.h"
 #import "./utils/RecognizerUtils.h"
-#import "ExecutorchLib/ETModel.h"
 #import "Recognizer.h"
-#import <React/RCTBridgeModule.h>
 
 /*
  RecognitionHandler class is responsible for loading and choosing the
@@ -34,15 +31,12 @@
   return self;
 }
 
-- (void)loadRecognizers:(NSString *)largeRecognizerPath
-    mediumRecognizerPath:(NSString *)mediumRecognizerPath
-     smallRecognizerPath:(NSString *)smallRecognizerPath
-              completion:(void (^)(BOOL, NSNumber *))completion {
-  dispatch_group_t group = dispatch_group_create();
-  __block BOOL allSuccessful = YES;
-
+- (NSNumber *)loadRecognizers:(NSString *)largeRecognizerPath
+         mediumRecognizerPath:(NSString *)mediumRecognizerPath
+          smallRecognizerPath:(NSString *)smallRecognizerPath {
   NSArray<Recognizer *> *recognizers =
       @[ recognizerLarge, recognizerMedium, recognizerSmall ];
+
   NSArray<NSString *> *paths =
       @[ largeRecognizerPath, mediumRecognizerPath, smallRecognizerPath ];
 
@@ -50,24 +44,13 @@
     Recognizer *recognizer = recognizers[i];
     NSString *path = paths[i];
 
-    dispatch_group_enter(group);
-    [recognizer loadModel:[NSURL URLWithString:path]
-               completion:^(BOOL success, NSNumber *errorCode) {
-                 if (!success) {
-                   allSuccessful = NO;
-                   dispatch_group_leave(group);
-                   completion(NO, errorCode);
-                   return;
-                 }
-                 dispatch_group_leave(group);
-               }];
+    NSNumber *errorCode = [recognizer loadModel:path];
+    if ([errorCode intValue] != 0) {
+      return errorCode;
+    }
   }
 
-  dispatch_group_notify(group, dispatch_get_main_queue(), ^{
-    if (allSuccessful) {
-      completion(YES, @(0));
-    }
-  });
+  return @0;
 }
 
 - (NSArray *)runModel:(cv::Mat)croppedImage {

package/ios/RnExecutorch/models/ocr/Recognizer.mm

@@ -1,7 +1,6 @@
 #import "Recognizer.h"
 #import "../../utils/ImageProcessor.h"
 #import "RecognizerUtils.h"
-#import "utils/OCRUtils.h"
 
 /*
  The model used as detector is based on CRNN paper.
@@ -69,7 +68,7 @@
 
 - (NSArray *)runModel:(cv::Mat &)input {
   NSArray *modelInput = [self preprocess:input];
-  NSArray *modelResult = [self forward:modelInput];
+  NSArray *modelResult = [self forward:@[ modelInput ]];
   NSArray *result = [self postprocess:modelResult];
 
   return result;

package/ios/RnExecutorch/models/ocr/VerticalDetector.h

@@ -1,7 +1,5 @@
 #import "BaseModel.h"
-#import "RecognitionHandler.h"
 #import "opencv2/opencv.hpp"
-#import "utils/Constants.h"
 
 @interface VerticalDetector : BaseModel
 

package/ios/RnExecutorch/models/ocr/VerticalDetector.mm

@@ -1,5 +1,6 @@
 #import "VerticalDetector.h"
 #import "../../utils/ImageProcessor.h"
+#import "utils/Constants.h"
 #import "utils/DetectorUtils.h"
 #import "utils/OCRUtils.h"
 
@@ -109,7 +110,7 @@
 
 - (NSArray *)runModel:(cv::Mat &)input {
   NSArray *modelInput = [self preprocess:input];
-  NSArray *modelResult = [self forward:modelInput];
+  NSArray *modelResult = [self forward:@[ modelInput ]];
   NSArray *result = [self postprocess:modelResult];
   return result;
 }

package/ios/RnExecutorch/models/ocr/utils/OCRUtils.mm

@@ -1,5 +1,4 @@
 #import "OCRUtils.h"
-#import "RecognizerUtils.h"
 
 @implementation OCRUtils
 

package/ios/RnExecutorch/models/stt/Moonshine.mm

@@ -1,9 +1,4 @@
 #import "Moonshine.hpp"
-#import "ExecutorchLib/ETModel.h"
-#import "MoonshineEncoder.hpp"
-#import "Moonshinedecoder.hpp"
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
 
 @implementation Moonshine {
   MoonshineEncoder *encoder;
@@ -66,4 +61,4 @@
       }];
 }
 
-@end
+@end

package/ios/RnExecutorch/models/stt/SpeechToTextBaseModel.mm

@@ -1,6 +1,4 @@
 #import "SpeechToTextBaseModel.hpp"
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
 
 @implementation SpeechToTextBaseModel
 
@@ -8,16 +6,14 @@
               withSource:(NSString *)source
                onSuccess:(void (^)(void))success
                onFailure:(void (^)(NSString *))failure {
+  NSNumber *errorCode = [model loadModel:source];
 
-  [model loadModel:[NSURL URLWithString:source]
-        completion:^(BOOL isSuccess, NSNumber *errorCode) {
-          if (isSuccess) {
-            success();
-          } else {
-            failure([NSString
-                stringWithFormat:@"%ld", (long)[errorCode longValue]]);
-          }
-        }];
+  if ([errorCode intValue] != 0) {
+    failure([NSString stringWithFormat:@"%ld", (long)[errorCode longValue]]);
+    return;
+  }
+
+  success();
 }
 
 @end

package/ios/RnExecutorch/models/stt/Whisper.mm

@@ -1,11 +1,6 @@
 #import "Whisper.hpp"
-#import "../../utils/SFFT.hpp"
-#import "../../utils/ScalarType.h"
-#import "ExecutorchLib/ETModel.h"
 #import "WhisperEncoder.hpp"
 #import "Whisperdecoder.hpp"
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
 
 @implementation Whisper {
   WhisperEncoder *encoder;

package/ios/RnExecutorch/models/{StyleTransferModel.h → style_transfer/StyleTransferModel.h}

@@ -1,4 +1,4 @@
-#import "BaseModel.h"
+#import "../BaseModel.h"
 #import "opencv2/opencv.hpp"
 
 @interface StyleTransferModel : BaseModel

package/ios/RnExecutorch/models/{StyleTransferModel.mm → style_transfer/StyleTransferModel.mm}

@@ -1,6 +1,5 @@
 #import "StyleTransferModel.h"
-#import "../utils/ImageProcessor.h"
-#import "opencv2/opencv.hpp"
+#import "../../utils/ImageProcessor.h"
 
 @implementation StyleTransferModel {
   cv::Size originalSize;
@@ -42,7 +41,7 @@
 
 - (cv::Mat)runModel:(cv::Mat &)input {
   NSArray *modelInput = [self preprocess:input];
-  NSArray *result = [self forward:modelInput];
+  NSArray *result = [self forward:@[ modelInput ]];
   input = [self postprocess:result[0]];
 
   return input;

package/ios/RnExecutorch/models/text_embeddings/TextEmbeddingsModel.h

@@ -0,0 +1,15 @@
+#import "BaseModel.h"
+#import "ExecutorchLib/HuggingFaceTokenizer.h"
+
+@interface TextEmbeddingsModel : BaseModel {
+@protected
+  HuggingFaceTokenizer *tokenizer;
+}
+
+- (void)loadTokenizer:(NSString *)tokenizerSource;
+- (NSArray *)preprocess:(NSString *)input;
+- (NSArray *)runModel:(NSString *)input;
+- (NSArray *)postprocess:(NSArray *)input
+           attentionMask:(NSArray *)attentionMask;
+
+@end

package/ios/RnExecutorch/models/text_embeddings/TextEmbeddingsModel.mm

@@ -0,0 +1,45 @@
+#import "TextEmbeddingsModel.h"
+#import "TextEmbeddingsUtils.h"
+
+@implementation TextEmbeddingsModel
+
+- (NSArray *)preprocess:(NSString *)input {
+  NSArray *input_ids = [self->tokenizer encode:input];
+  NSMutableArray *attention_mask = [NSMutableArray new];
+  for (int i = 0; i < [input_ids count]; i++) {
+    [attention_mask addObject:@((int)([input_ids[i] intValue] != 0))];
+  }
+  return @[ input_ids, attention_mask ]; // [2, tokens]
+}
+
+- (NSArray *)postprocess:(NSArray *)modelOutput   // [tokens * embedding_dim]
+           attentionMask:(NSArray *)attentionMask // [tokens]
+{
+  NSArray *embeddings = [TextEmbeddingsUtils meanPooling:modelOutput
+                                           attentionMask:attentionMask];
+  return [TextEmbeddingsUtils normalize:embeddings];
+}
+
+- (NSArray *)runModel:(NSString *)input {
+  NSArray *modelInput = [self preprocess:input];
+
+  NSMutableArray *inputTypes = [NSMutableArray arrayWithObjects:@4, @4, nil];
+  NSMutableArray *shapes = [NSMutableArray new];
+
+  NSNumber *tokenCount = @([modelInput[0] count]);
+  for (__unused id _ in modelInput) {
+    [shapes addObject:[NSMutableArray arrayWithObjects:@1, tokenCount, nil]];
+  }
+
+  NSArray *modelOutput = [self forward:modelInput
+                                shapes:shapes
+                            inputTypes:inputTypes];
+  return [self postprocess:modelOutput[0] attentionMask:modelInput[1]];
+}
+
+- (void)loadTokenizer:(NSString *)tokenizerSource {
+  tokenizer =
+      [[HuggingFaceTokenizer alloc] initWithTokenizerPath:tokenizerSource];
+}
+
+@end

package/ios/RnExecutorch/models/text_embeddings/TextEmbeddingsUtils.h

@@ -0,0 +1,8 @@
+@interface TextEmbeddingsUtils : NSObject
+
++ (NSArray *)meanPooling:(NSArray *)modelOutput
+           attentionMask:(NSArray *)attentionMask;
+
++ (NSArray *)normalize:(NSArray *)embeddings;
+
+@end

package/ios/RnExecutorch/models/text_embeddings/TextEmbeddingsUtils.mm

@@ -0,0 +1,49 @@
+#import "TextEmbeddingsUtils.h"
+
+@implementation TextEmbeddingsUtils
+
++ (NSArray *)meanPooling:(NSArray *)modelOutput
+           attentionMask:(NSArray *)attentionMask {
+  NSInteger modelOutputLength = [modelOutput count];
+  NSInteger attentionMaskLength = [attentionMask count];
+  NSInteger embeddingDim = modelOutputLength / attentionMaskLength;
+
+  NSMutableArray *result = [NSMutableArray arrayWithCapacity:embeddingDim];
+
+  double sumMask = 0.0;
+  for (NSNumber *maskValue in attentionMask) {
+    sumMask += [maskValue intValue];
+  }
+  sumMask = fmax(sumMask, 1e-9);
+
+  for (NSInteger i = 0; i < embeddingDim; i++) {
+    double sum = 0;
+    for (NSInteger j = 0; j < attentionMaskLength; j++) {
+      sum += [modelOutput[j * embeddingDim + i] doubleValue] *
+             [attentionMask[j] intValue];
+    }
+    [result addObject:@(sum / sumMask)];
+  }
+
+  return result;
+}
+
++ (NSArray *)normalize:(NSArray *)embeddings {
+  NSInteger embeddingDim = [embeddings count];
+  double sum = 0.0;
+
+  for (NSNumber *value in embeddings) {
+    sum += [value doubleValue] * [value doubleValue];
+  }
+  sum = fmax(sqrt(sum), 1e-9);
+
+  NSMutableArray *normalizedResult =
+      [NSMutableArray arrayWithCapacity:embeddingDim];
+  for (NSNumber *value in embeddings) {
+    [normalizedResult addObject:@([value doubleValue] / sum)];
+  }
+
+  return normalizedResult;
+}
+
+@end

package/ios/RnExecutorch/utils/Conversions.h

@@ -0,0 +1,15 @@
+#import "opencv2/opencv.hpp"
+
+// Convert a matrix containing a single value per cell to a NSArray
+template <typename T>
+NSArray* simpleMatToNSArray(const cv::Mat& mat) {
+    std::size_t numPixels = mat.rows * mat.cols;
+    NSMutableArray *arr = [[NSMutableArray alloc] initWithCapacity:numPixels];
+
+    for (std::size_t x = 0; x < mat.rows; ++x) {
+        for (std::size_t y = 0; y < mat.cols; ++y) {
+            arr[x * mat.cols + y] = @(mat.at<T>(x, y));
+        }
+    }
+    return arr;
+}

package/ios/RnExecutorch/utils/ImageProcessor.h

@@ -1,4 +1,3 @@
-#import <UIKit/UIKit.h>
 #import <opencv2/opencv.hpp>
 
 @interface ImageProcessor : NSObject

package/ios/RnExecutorch/{models/classification/Utils.h → utils/Numerical.h}

@@ -1,3 +1 @@
-#include <vector>
-
 std::vector<double> softmax(const std::vector<double> &v);

package/ios/RnExecutorch/{models/classification/Utils.mm → utils/Numerical.mm}

@@ -1,6 +1,4 @@
 #include "Utils.h"
-#include <cmath>
-#include <vector>
 
 std::vector<double> softmax(const std::vector<double> &v) {
   std::vector<double> result(v.size());

package/ios/RnExecutorch/utils/ObjectDetectionUtils.mm

@@ -1,7 +1,5 @@
 #include "ObjectDetectionUtils.hpp"
 #include "Constants.h"
-#include <map>
-#include <vector>
 
 NSString *floatLabelToNSString(float label) {
   int intLabel = static_cast<int>(label);

package/ios/RnExecutorch/utils/SFFT.mm

@@ -68,4 +68,4 @@
   free(a.imagp);
 }
 
-@end
+@end

package/ios/RnExecutorch/utils/ScalarType.h

@@ -1,8 +1,6 @@
 #ifndef ScalarType_h
 #define ScalarType_h
 
-#import <Foundation/Foundation.h>
-
 @interface ScalarType : NSObject
 
 @property(class, nonatomic, readonly) NSNumber *Int8;

package/lib/module/Error.js

@@ -1,25 +1,36 @@
 "use strict";
 
 export let ETError = /*#__PURE__*/function (ETError) {
+  // React-native-ExecuTorch errors
   ETError[ETError["UndefinedError"] = 101] = "UndefinedError";
   ETError[ETError["ModuleNotLoaded"] = 102] = "ModuleNotLoaded";
   ETError[ETError["FileWriteFailed"] = 103] = "FileWriteFailed";
   ETError[ETError["ModelGenerating"] = 104] = "ModelGenerating";
   ETError[ETError["LanguageNotSupported"] = 105] = "LanguageNotSupported";
   ETError[ETError["InvalidModelSource"] = 255] = "InvalidModelSource";
+  //SpeechToText errors
+  ETError[ETError["MultilingualConfiguration"] = 160] = "MultilingualConfiguration";
+  ETError[ETError["MissingDataChunk"] = 161] = "MissingDataChunk";
+  ETError[ETError["StreamingNotStarted"] = 162] = "StreamingNotStarted";
+  // ExecuTorch mapped errors
+  // Based on: https://github.com/pytorch/executorch/blob/main/runtime/core/error.h
+  // System errors
   ETError[ETError["Ok"] = 0] = "Ok";
   ETError[ETError["Internal"] = 1] = "Internal";
   ETError[ETError["InvalidState"] = 2] = "InvalidState";
   ETError[ETError["EndOfMethod"] = 3] = "EndOfMethod";
+  // Logical errors
   ETError[ETError["NotSupported"] = 16] = "NotSupported";
   ETError[ETError["NotImplemented"] = 17] = "NotImplemented";
   ETError[ETError["InvalidArgument"] = 18] = "InvalidArgument";
   ETError[ETError["InvalidType"] = 19] = "InvalidType";
   ETError[ETError["OperatorMissing"] = 20] = "OperatorMissing";
+  // Resource errors
   ETError[ETError["NotFound"] = 32] = "NotFound";
   ETError[ETError["MemoryAllocationFailed"] = 33] = "MemoryAllocationFailed";
   ETError[ETError["AccessFailed"] = 34] = "AccessFailed";
   ETError[ETError["InvalidProgram"] = 35] = "InvalidProgram";
+  // Delegate errors
   ETError[ETError["DelegateInvalidCompatibility"] = 48] = "DelegateInvalidCompatibility";
   ETError[ETError["DelegateMemoryAllocationFailed"] = 49] = "DelegateMemoryAllocationFailed";
   ETError[ETError["DelegateInvalidHandle"] = 50] = "DelegateInvalidHandle";
@@ -30,9 +41,12 @@ export const getError = e => {
     if (e in ETError) return ETError[e];
     return ETError[ETError.UndefinedError];
   }
+
+  // try to extract number from message (can contain false positives)
   const error = e;
   const errorCode = parseInt(error.message, 10);
-  if (errorCode in ETError) return ETError[errorCode];
-  return ETError[ETError.UndefinedError];
+  const message = Number.isNaN(errorCode) ? error.message : ' ' + error.message.slice(`${errorCode}`.length).trimStart();
+  const ETErrorMessage = errorCode in ETError ? ETError[errorCode] : ETError[ETError.UndefinedError];
+  return ETErrorMessage + message;
 };
 //# sourceMappingURL=Error.js.map

package/lib/module/Error.js.map

@@ -1 +1 @@
-{"version":3,"names":["ETError","getError","e","UndefinedError","error","errorCode","parseInt","message"],"sourceRoot":"../../src","sources":["Error.ts"],"mappings":";;AAAA,WAAYA,OAAO,0BAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAA,OAAPA,OAAO;AAAA;AAoCnB,OAAO,MAAMC,QAAQ,GAAIC,CAAoB,IAAa;EACxD,IAAI,OAAOA,CAAC,KAAK,QAAQ,EAAE;IACzB,IAAIA,CAAC,IAAIF,OAAO,EAAE,OAAOA,OAAO,CAACE,CAAC,CAAC;IACnC,OAAOF,OAAO,CAACA,OAAO,CAACG,cAAc,CAAC;EACxC;EAEA,MAAMC,KAAK,GAAGF,CAAU;EACxB,MAAMG,SAAS,GAAGC,QAAQ,CAACF,KAAK,CAACG,OAAO,EAAE,EAAE,CAAC;EAC7C,IAAIF,SAAS,IAAIL,OAAO,EAAE,OAAOA,OAAO,CAACK,SAAS,CAAC;EACnD,OAAOL,OAAO,CAACA,OAAO,CAACG,cAAc,CAAC;AACxC,CAAC","ignoreList":[]}
+{"version":3,"names":["ETError","getError","e","UndefinedError","error","errorCode","parseInt","message","Number","isNaN","slice","length","trimStart","ETErrorMessage"],"sourceRoot":"../../src","sources":["Error.ts"],"mappings":";;AAAA,WAAYA,OAAO,0BAAPA,OAAO;EACjB;EADUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EASjB;EATUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAcjB;EACA;EACA;EAhBUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAsBjB;EAtBUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EA6BjB;EA7BUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAmCjB;EAnCUA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAPA,OAAO,CAAPA,OAAO;EAAA,OAAPA,OAAO;AAAA;AAyCnB,OAAO,MAAMC,QAAQ,GAAIC,CAA4B,IAAa;EAChE,IAAI,OAAOA,CAAC,KAAK,QAAQ,EAAE;IACzB,IAAIA,CAAC,IAAIF,OAAO,EAAE,OAAOA,OAAO,CAACE,CAAC,CAAC;IACnC,OAAOF,OAAO,CAACA,OAAO,CAACG,cAAc,CAAC;EACxC;;EAEA;EACA,MAAMC,KAAK,GAAGF,CAAU;EACxB,MAAMG,SAAS,GAAGC,QAAQ,CAACF,KAAK,CAACG,OAAO,EAAE,EAAE,CAAC;EAC7C,MAAMA,OAAO,GAAGC,MAAM,CAACC,KAAK,CAACJ,SAAS,CAAC,GACnCD,KAAK,CAACG,OAAO,GACb,GAAG,GAAGH,KAAK,CAACG,OAAO,CAACG,KAAK,CAAC,GAAGL,SAAS,EAAE,CAACM,MAAM,CAAC,CAACC,SAAS,CAAC,CAAC;EAEhE,MAAMC,cAAc,GAClBR,SAAS,IAAIL,OAAO,GAAGA,OAAO,CAACK,SAAS,CAAC,GAAGL,OAAO,CAACA,OAAO,CAACG,cAAc,CACjE;EAEX,OAAOU,cAAc,GAAGN,OAAO;AACjC,CAAC","ignoreList":[]}