ilabs-flir 2.0.4 → 2.0.5

package/ios/Flir/src/FlirState.m

@@ -1,135 +1,135 @@
-//
-//  FlirState.m
-//  Flir
-//
-//  Shared state singleton for FLIR frame and temperature data
-//
-
-#import "FlirState.h"
-
-static FlirState *_sharedState = nil;
-
-@implementation FlirState {
-  NSArray<NSNumber *> *_temperatureData;
-  int _imageWidth;
-  int _imageHeight;
-  dispatch_queue_t _accessQueue;
-}
-
-+ (instancetype)shared {
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    _sharedState = [[FlirState alloc] init];
-  });
-  return _sharedState;
-}
-
-- (instancetype)init {
-  if (self = [super init]) {
-    _lastTemperature = NAN;
-    _latestImage = nil;
-    _temperatureData = nil;
-    _imageWidth = 0;
-    _imageHeight = 0;
-    _accessQueue =
-        dispatch_queue_create("com.flir.state.access", DISPATCH_QUEUE_SERIAL);
-  }
-  return self;
-}
-
-- (int)imageWidth {
-  return _imageWidth;
-}
-
-- (int)imageHeight {
-  return _imageHeight;
-}
-
-- (double)getTemperatureAt:(int)x y:(int)y {
-  // First try the temperature data array if available
-  double t = [self queryTemperatureAtPoint:x y:y];
-  if (!isnan(t)) {
-    return t;
-  }
-  // Fall back to last sampled temperature
-  return self.lastTemperature;
-}
-
-- (double)queryTemperatureAtPoint:(int)x y:(int)y {
-  __block double result = NAN;
-
-  dispatch_sync(_accessQueue, ^{
-    if (_temperatureData == nil || _imageWidth == 0 || _imageHeight == 0) {
-      return;
-    }
-
-    // Bounds check
-    if (x < 0 || x >= _imageWidth || y < 0 || y >= _imageHeight) {
-      return;
-    }
-
-    // Access flattened array: index = y * width + x
-    NSInteger index = y * _imageWidth + x;
-    if (index < 0 || index >= (NSInteger)[_temperatureData count]) {
-      return;
-    }
-
-    result = [_temperatureData[index] doubleValue];
-  });
-
-  return result;
-}
-
-- (void)updateFrame:(UIImage *)image {
-  [self updateFrame:image withTemperatureData:nil];
-}
-
-- (void)updateFrame:(UIImage *)image
-    withTemperatureData:(NSArray<NSNumber *> *)tempData {
-  if (!image)
-    return;
-
-  dispatch_async(_accessQueue, ^{
-    self.latestImage = image;
-
-    if (tempData != nil) {
-      self->_temperatureData = [tempData copy];
-      self->_imageWidth = (int)image.size.width;
-      self->_imageHeight = (int)image.size.height;
-    }
-  });
-
-  // Invoke texture callback on main thread (for Metal filters, texture unit 7)
-  if (self.onTextureUpdate) {
-    dispatch_async(dispatch_get_main_queue(), ^{
-      if (self.onTextureUpdate) {
-        self.onTextureUpdate(image, 7);
-      }
-    });
-  }
-
-  // Sample temperature at center point and invoke callback
-  if (self.onTemperatureUpdate) {
-    int centerX = (int)(image.size.width / 2);
-    int centerY = (int)(image.size.height / 2);
-    double temp = [self getTemperatureAt:centerX y:centerY];
-
-    dispatch_async(dispatch_get_main_queue(), ^{
-      if (self.onTemperatureUpdate) {
-        self.onTemperatureUpdate(temp, centerX, centerY);
-      }
-    });
-  }
-}
-
-- (void)reset {
-  dispatch_async(_accessQueue, ^{
-    self.latestImage = nil;
-    self.lastTemperature = NAN;
-    self->_temperatureData = nil;
-    self->_imageWidth = 0;
-    self->_imageHeight = 0;
-  });
-}
-
-@end
+//
+//  FlirState.m
+//  Flir
+//
+//  Shared state singleton for FLIR frame and temperature data
+//
+
+#import "FlirState.h"
+
+static FlirState *_sharedState = nil;
+
+@implementation FlirState {
+  NSArray<NSNumber *> *_temperatureData;
+  int _imageWidth;
+  int _imageHeight;
+  dispatch_queue_t _accessQueue;
+}
+
++ (instancetype)shared {
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    _sharedState = [[FlirState alloc] init];
+  });
+  return _sharedState;
+}
+
+- (instancetype)init {
+  if (self = [super init]) {
+    _lastTemperature = NAN;
+    _latestImage = nil;
+    _temperatureData = nil;
+    _imageWidth = 0;
+    _imageHeight = 0;
+    _accessQueue =
+        dispatch_queue_create("com.flir.state.access", DISPATCH_QUEUE_SERIAL);
+  }
+  return self;
+}
+
+- (int)imageWidth {
+  return _imageWidth;
+}
+
+- (int)imageHeight {
+  return _imageHeight;
+}
+
+- (double)getTemperatureAt:(int)x y:(int)y {
+  // First try the temperature data array if available
+  double t = [self queryTemperatureAtPoint:x y:y];
+  if (!isnan(t)) {
+    return t;
+  }
+  // Fall back to last sampled temperature
+  return self.lastTemperature;
+}
+
+- (double)queryTemperatureAtPoint:(int)x y:(int)y {
+  __block double result = NAN;
+
+  dispatch_sync(_accessQueue, ^{
+    if (_temperatureData == nil || _imageWidth == 0 || _imageHeight == 0) {
+      return;
+    }
+
+    // Bounds check
+    if (x < 0 || x >= _imageWidth || y < 0 || y >= _imageHeight) {
+      return;
+    }
+
+    // Access flattened array: index = y * width + x
+    NSInteger index = y * _imageWidth + x;
+    if (index < 0 || index >= (NSInteger)[_temperatureData count]) {
+      return;
+    }
+
+    result = [_temperatureData[index] doubleValue];
+  });
+
+  return result;
+}
+
+- (void)updateFrame:(UIImage *)image {
+  [self updateFrame:image withTemperatureData:nil];
+}
+
+- (void)updateFrame:(UIImage *)image
+    withTemperatureData:(NSArray<NSNumber *> *)tempData {
+  if (!image)
+    return;
+
+  dispatch_async(_accessQueue, ^{
+    self.latestImage = image;
+
+    if (tempData != nil) {
+      self->_temperatureData = [tempData copy];
+      self->_imageWidth = (int)image.size.width;
+      self->_imageHeight = (int)image.size.height;
+    }
+  });
+
+  // Invoke texture callback on main thread (for Metal filters, texture unit 7)
+  if (self.onTextureUpdate) {
+    dispatch_async(dispatch_get_main_queue(), ^{
+      if (self.onTextureUpdate) {
+        self.onTextureUpdate(image, 7);
+      }
+    });
+  }
+
+  // Sample temperature at center point and invoke callback
+  if (self.onTemperatureUpdate) {
+    int centerX = (int)(image.size.width / 2);
+    int centerY = (int)(image.size.height / 2);
+    double temp = [self getTemperatureAt:centerX y:centerY];
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+      if (self.onTemperatureUpdate) {
+        self.onTemperatureUpdate(temp, centerX, centerY);
+      }
+    });
+  }
+}
+
+- (void)reset {
+  dispatch_async(_accessQueue, ^{
+    self.latestImage = nil;
+    self.lastTemperature = NAN;
+    self->_temperatureData = nil;
+    self->_imageWidth = 0;
+    self->_imageHeight = 0;
+  });
+}
+
+@end

package/ios/Flir/src/FlirViewManager.h

@@ -1,16 +1,16 @@
-//
-//  FlirViewManager.h
-//  Flir
-//
-//  React Native view manager for FLIR preview
-//
-
-#import <React/RCTViewManager.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface FlirViewManager : RCTViewManager
-
-@end
-
-NS_ASSUME_NONNULL_END
+//
+//  FlirViewManager.h
+//  Flir
+//
+//  React Native view manager for FLIR preview
+//
+
+#import <React/RCTViewManager.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FlirViewManager : RCTViewManager
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/Flir/src/FlirViewManager.m

@@ -1,27 +1,27 @@
-//
-//  FlirViewManager.m
-//  Flir
-//
-//  React Native view manager for FLIR preview
-//
-
-#import "FlirViewManager.h"
-#import "FlirPreviewView.h"
-#import <React/RCTUIManager.h>
-
-@implementation FlirViewManager
-
-RCT_EXPORT_MODULE(FlirPreviewView)
-
-+ (BOOL)requiresMainQueueSetup {
-  return YES;
-}
-
-- (UIView *)view {
-  return [[FlirPreviewView alloc] init];
-}
-
-RCT_EXPORT_VIEW_PROPERTY(showTemperature, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(showFallback, BOOL)
-
-@end
+//
+//  FlirViewManager.m
+//  Flir
+//
+//  React Native view manager for FLIR preview
+//
+
+#import "FlirViewManager.h"
+#import "FlirPreviewView.h"
+#import <React/RCTUIManager.h>
+
+@implementation FlirViewManager
+
+RCT_EXPORT_MODULE(FlirPreviewView)
+
++ (BOOL)requiresMainQueueSetup {
+  return YES;
+}
+
+- (UIView *)view {
+  return [[FlirPreviewView alloc] init];
+}
+
+RCT_EXPORT_VIEW_PROPERTY(showTemperature, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(showFallback, BOOL)
+
+@end

package/package.json

@@ -1,72 +1,73 @@
-{
-  "name": "ilabs-flir",
-  "version": "2.0.4",
-  "description": "FLIR Thermal SDK for React Native - iOS & Android (bundled at compile time via postinstall)",
-  "main": "src/index.js",
-  "types": "src/index.d.ts",
-  "scripts": {
-    "postinstall": "node scripts/fetch-binaries.js",
-    "fetch-binaries": "node scripts/fetch-binaries.js",
-    "typecheck": "tsc --noEmit"
-  },
-  "files": [
-    "src/",
-    "android/Flir/src/",
-    "android/Flir/build.gradle.kts",
-    "android/Flir/libs/",
-    "ios/Flir/src/",
-    "ios/Flir/SDKLoader/",
-    "ios/Flir/Framework/",
-    "ios/Flir/Frameworks/",
-    "app.plugin.js",
-    "Flir.podspec",
-    "sdk-manifest.json",
-    "scripts/",
-    "expo-module.config.json",
-    "react-native.config.js"
-  ],
-  "keywords": [
-    "flir",
-    "thermal",
-    "thermal-camera",
-    "react-native",
-    "expo",
-    "expo-plugin",
-    "config-plugin",
-    "flir-one",
-    "thermal-imaging",
-    "infrared",
-    "ios",
-    "android"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/PraveenOjha/flir.git"
-  },
-  "homepage": "https://github.com/PraveenOjha/flir#readme",
-  "bugs": {
-    "url": "https://github.com/PraveenOjha/flir/issues"
-  },
-  "author": "Praveen Ojha",
-  "license": "MIT",
-  "peerDependencies": {
-    "react": "*",
-    "react-native": ">=0.60.0"
-  },
-  "dependencies": {
-    "@expo/config-plugins": "^7.0.0"
-  },
-  "devDependencies": {
-    "typescript": "^5.0.0",
-    "@types/react": "*",
-    "@types/react-native": "*"
-  },
-  "react-native": {
-    "ios": {
-      "podspec": "./Flir.podspec"
-    },
-    "android": {
-      "sourceDir": "./android/Flir"
-    }
-  }
+{
+  "name": "ilabs-flir",
+  "version": "2.0.5",
+  "description": "FLIR Thermal SDK for React Native - iOS & Android (bundled at compile time via postinstall)",
+  "main": "src/index.js",
+  "types": "src/index.d.ts",
+  "scripts": {
+    "postinstall": "node scripts/fetch-binaries.js",
+    "fetch-binaries": "node scripts/fetch-binaries.js",
+    "typecheck": "tsc --noEmit"
+  },
+  "files": [
+    "src/",
+    "android/Flir/src/",
+    "android/Flir/build.gradle.kts",
+    "android/Flir/libs/",
+    "ios/Flir/src/",
+    "ios/Flir/SDKLoader/",
+    "ios/Flir/Framework/",
+    "ios/Flir/Frameworks/",
+    "app.plugin.js",
+    "Flir.podspec",
+    "sdk-manifest.json",
+    "scripts/",
+    "expo-module.config.json",
+    "react-native.config.js"
+  ],
+  "keywords": [
+    "flir",
+    "thermal",
+    "thermal-camera",
+    "react-native",
+    "expo",
+    "expo-plugin",
+    "config-plugin",
+    "flir-one",
+    "thermal-imaging",
+    "infrared",
+    "ios",
+    "android"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/PraveenOjha/flir.git"
+  },
+  "homepage": "https://github.com/PraveenOjha/flir#readme",
+  "bugs": {
+    "url": "https://github.com/PraveenOjha/flir/issues"
+  },
+  "author": "Praveen Ojha",
+  "license": "MIT",
+  "peerDependencies": {
+    "react": "*",
+    "react-native": ">=0.60.0"
+  },
+  "dependencies": {
+    "@expo/config-plugins": "^7.0.0",
+    "adm-zip": "^0.5.10"
+  },
+  "devDependencies": {
+    "typescript": "^5.0.0",
+    "@types/react": "*",
+    "@types/react-native": "*"
+  },
+  "react-native": {
+    "ios": {
+      "podspec": "./Flir.podspec"
+    },
+    "android": {
+      "sourceDir": "./android/Flir"
+    }
+  }
 }

package/react-native.config.js

@@ -1,14 +1,14 @@
-module.exports = {
-    dependency: {
-        platforms: {
-            android: {
-                sourceDir: './android/Flir',
-                packageImportPath: 'import flir.android.FlirPackage;',
-                packageInstance: 'new FlirPackage()',
-            },
-            ios: {
-                podspecPath: './Flir.podspec',
-            },
-        },
-    },
-};
+module.exports = {
+    dependency: {
+        platforms: {
+            android: {
+                sourceDir: './android/Flir',
+                packageImportPath: 'import flir.android.FlirPackage;',
+                packageInstance: 'new FlirPackage()',
+            },
+            ios: {
+                podspecPath: './Flir.podspec',
+            },
+        },
+    },
+};

package/scripts/fetch-binaries.js

@@ -69,12 +69,51 @@ function extractZip(zipPath, dest) {
   if (!fs.existsSync(dest)) {
     throw new Error(`Destination folder ${dest} does not exist. Please create it and re-run installation.`);
   }
-  if (process.platform === 'win32') {
-    // Use PowerShell Expand-Archive
-    execSync(`powershell -NoProfile -Command "Expand-Archive -Force -LiteralPath '${zipPath}' -DestinationPath '${TMP_DIR}'"`, { stdio: 'inherit' });
-  } else {
-    execSync(`unzip -o '${zipPath}' -d '${TMP_DIR}'`, { stdio: 'inherit' });
+  // Preferred: use a pure-Node extractor (adm-zip) so the script is platform-independent.
+  try {
+    const AdmZip = require('adm-zip');
+    const zip = new AdmZip(zipPath);
+    zip.extractAllTo(TMP_DIR, true);
+    return;
+  } catch (e) {
+    // If adm-zip isn't available, fall back to system tools.
+    console.log('adm-zip not available, falling back to system extraction tools');
   }
+  // Next preference: system `unzip` (macOS, Linux, and many developer environments). If `unzip` is not available,
+  // try `tar -xf` (some platforms provide bsdtar which can extract zip files), otherwise fail with a helpful message.
+  const cmdExists = (cmd) => {
+    try {
+      if (process.platform === 'win32') {
+        execSync(`where ${cmd}`, { stdio: 'ignore' });
+      } else {
+        execSync(`which ${cmd}`, { stdio: 'ignore' });
+      }
+      return true;
+    } catch (_err) {
+      return false;
+    }
+  };
+
+  if (cmdExists('unzip')) {
+    try {
+      execSync(`unzip -o '${zipPath}' -d '${TMP_DIR}'`, { stdio: 'inherit' });
+      return;
+    } catch (err) {
+      throw new Error(`Failed to extract zip using 'unzip'. Consider installing 'unzip' or adding 'adm-zip' package. Original error: ${err.message}`);
+    }
+  }
+
+  // 'tar' can sometimes extract zip files (via bsdtar). Try it as a last resort.
+  if (cmdExists('tar')) {
+    try {
+      execSync(`tar -xf '${zipPath}' -C '${TMP_DIR}'`, { stdio: 'inherit' });
+      return;
+    } catch (err) {
+      throw new Error(`Failed to extract zip using 'tar'. Consider installing 'unzip' or add 'adm-zip' package. Original error: ${err.message}`);
+    }
+  }
+
+  throw new Error(`No extractor found: please install 'unzip' or add the 'adm-zip' dependency in your project so the fetch script can extract SDK binaries.`);
 }
 
 function copyIosExtractedFiles(tmpFolder, destFolder) {
@@ -193,6 +232,9 @@ async function run() {
   } catch (err) {
     console.error('Failed to fetch binaries:', err.message);
     process.exit(1);
+  } finally {
+    // Always attempt to remove temporary folder to avoid leaving cruft
+    try { fs.rmSync(TMP_DIR, { recursive: true, force: true }); } catch (e) {}
   }
 }