ilabs-flir 2.0.4 → 2.0.6

package/scripts/fetch-binaries.js

@@ -69,12 +69,55 @@ 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 {
+      if (process.platform === 'win32') {
+        execSync(`tar -xf "${zipPath}" -C "${TMP_DIR}"`, { stdio: 'inherit' });
+      } else {
+        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) {
@@ -133,27 +176,67 @@ async function run() {
       return;
     }
 
-    // Ensure target folders exist - but do NOT create them automatically.
-    if (!fs.existsSync(DEST_ANDROID)) {
-      throw new Error(`Android libs folder ${DEST_ANDROID} does not exist. Please create it (e.g. npm pack or ensure published package includes it).`);
-    }
-    if (!fs.existsSync(DEST_IOS)) {
-      throw new Error(`iOS Frameworks folder ${DEST_IOS} does not exist. Please create it before install.`);
-    }
+    // (previous 'ensure target folders exist' logic removed; handling now occurs after args parsing)
 
     ensureTmp();
 
     const argv = process.argv.slice(2);
-    const args = argv.reduce((acc, cur) => {
-      if (cur.startsWith('--')) acc[cur.replace(/^--/, '')] = true;
-      else acc[cur] = true;
-      return acc;
-    }, {});
+    const args = {};
+    for (let i = 0; i < argv.length; i++) {
+      const cur = argv[i];
+      if (cur.startsWith('--')) {
+        if (cur.includes('=')) {
+          const parts = cur.split('=');
+          const key = parts.shift().replace(/^--/, '');
+          const value = parts.join('=');
+          args[key] = value;
+        } else {
+          // if following arg exists and doesn't start with '-', use it as the value
+          const next = argv[i+1];
+          if (next && !next.startsWith('-')) {
+            args[cur.replace(/^--/, '')] = next;
+            i++;
+          } else {
+            args[cur.replace(/^--/, '')] = true;
+          }
+        }
+      } else if (cur.startsWith('-')) {
+        const key = cur.replace(/^-+/, '');
+        const next = argv[i+1];
+        if (next && !next.startsWith('-')) {
+          args[key] = next;
+          i++;
+        } else {
+          args[key] = true;
+        }
+      } else {
+        args[cur] = true;
+      }
+    }
 
     // Skip if present per-platform
     const skipIfPresent = args['skip-if-present'] || args['skipIfPresent'] || false;
     const platformArg = args['platform'] || args['p'] || 'all';
 
+    // Determine whether to create missing dest directories automatically; default is true unless explicitly disabled
+    const noCreate = process.env.FLIR_SDK_NO_CREATE_DEST === '1' || process.env.FLIR_SDK_NO_CREATE_DEST === 'true' || args['no-create-dest'] || args['noCreateDest'];
+    if ((platformArg === 'all' || platformArg === 'android') && !fs.existsSync(DEST_ANDROID)) {
+      if (noCreate) {
+        throw new Error(`Android libs folder ${DEST_ANDROID} does not exist. Please create it (e.g. npm pack or ensure published package includes it).`);
+      } else {
+        console.log(`Android libs folder ${DEST_ANDROID} not found — creating it.`);
+        fs.mkdirSync(DEST_ANDROID, { recursive: true });
+      }
+    }
+    if ((platformArg === 'all' || platformArg === 'ios') && !fs.existsSync(DEST_IOS)) {
+      if (noCreate) {
+        throw new Error(`iOS Frameworks folder ${DEST_IOS} does not exist. Please create it before install.`);
+      } else {
+        console.log(`iOS Frameworks folder ${DEST_IOS} not found — creating it.`);
+        fs.mkdirSync(DEST_IOS, { recursive: true });
+      }
+    }
+
     // Short circuit checks: if skipIfPresent set and files exist, skip per platform
     if (skipIfPresent && platformArg !== 'ios' && hasAndroidAar(DEST_ANDROID)) {
       console.log('Android AAR(s) detected in libs folder; skipping Android fetch.');
@@ -193,6 +276,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) {}
   }
 }
 

package/sdk-manifest.json

@@ -1,51 +1,51 @@
-{
-  "version": "2.0.0",
-  "sdkVersion": "5.0.0",
-  "ios": {
-    "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/ios.zip",
-    "directDownload": {
-      "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/ios.zip",
-      "sha256": "",
-      "sizeBytes": 0
-    },
-    
-    "sha256": "",
-    "sizeBytes": 0,
-    "xcframeworks": [
-      "ThermalSDK.xcframework",
-      "MeterLink.xcframework",
-      "libavcodec.61.dylib.xcframework",
-      "libavdevice.61.dylib.xcframework",
-      "libavfilter.10.dylib.xcframework",
-      "libavformat.61.dylib.xcframework",
-      "libavutil.59.dylib.xcframework",
-      "liblive666.dylib.xcframework",
-      "libswresample.5.dylib.xcframework",
-      "libswscale.8.dylib.xcframework"
-    ],
-    "minDeploymentTarget": "13.0",
-    "supportedArchitectures": [
-      "arm64",
-      "arm64_x86_64-simulator"
-    ]
-  },
-  "android": {
-   
-    "directDownload": {
-      "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/android.zip",
-      "sha256": "",
-      "sizeBytes": 0
-    }
-  },
-  "buildFlags": {
-    "ios": {
-      "withSDK": {
-        "FLIR_ENABLED": "1",
-        "FLIR_SDK_AVAILABLE": "1"
-      },
-      "withoutSDK": {
-        "FLIR_DISABLED": "1"
-      }
-    }
-  }
+{
+  "version": "2.0.0",
+  "sdkVersion": "5.0.0",
+  "ios": {
+    "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/ios.zip",
+    "directDownload": {
+      "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/ios.zip",
+      "sha256": "",
+      "sizeBytes": 0
+    },
+    
+    "sha256": "",
+    "sizeBytes": 0,
+    "xcframeworks": [
+      "ThermalSDK.xcframework",
+      "MeterLink.xcframework",
+      "libavcodec.61.dylib.xcframework",
+      "libavdevice.61.dylib.xcframework",
+      "libavfilter.10.dylib.xcframework",
+      "libavformat.61.dylib.xcframework",
+      "libavutil.59.dylib.xcframework",
+      "liblive666.dylib.xcframework",
+      "libswresample.5.dylib.xcframework",
+      "libswscale.8.dylib.xcframework"
+    ],
+    "minDeploymentTarget": "13.0",
+    "supportedArchitectures": [
+      "arm64",
+      "arm64_x86_64-simulator"
+    ]
+  },
+  "android": {
+   
+    "directDownload": {
+      "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/android.zip",
+      "sha256": "",
+      "sizeBytes": 0
+    }
+  },
+  "buildFlags": {
+    "ios": {
+      "withSDK": {
+        "FLIR_ENABLED": "1",
+        "FLIR_SDK_AVAILABLE": "1"
+      },
+      "withoutSDK": {
+        "FLIR_DISABLED": "1"
+      }
+    }
+  }
 }

package/src/index.d.ts

@@ -1,63 +1,63 @@
-// FlirDownload API removed: the SDK is bundled at compile time and runtime downloading is not supported.
-
-export interface SDKStatus {
-    available: boolean;
-    arch: string;
-    dexPath: string;
-    nativeLibPath: string;
-    dexExists: boolean;
-    nativeLibsExist: boolean;
-}
-
-export interface SDKInitResult {
-    initialized: boolean;
-    message?: string;
-    error?: string;
-    errorType?: string;
-}
-
-export interface FlirDebugInfo {
-    sdkAvailable: boolean;
-    arch: string;
-    sdkClassesLoaded: boolean;
-    discoveredDeviceCount: number;
-    isConnected: boolean;
-    isStreaming: boolean;
-    connectedDevice: string;
-}
-
-export interface FlirDevice {
-    id: string;
-    name: string;
-    communicationType: 'USB' | 'NETWORK' | 'EMULATOR';
-    isEmulator: boolean;
-}
-
-export interface FlirModuleAPI {
-    // Temperature APIs
-    getTemperatureFromColor(color: number): Promise<number>;
-    getLatestFramePath(): Promise<string | null>;
-    getTemperatureAt(x: number, y: number): Promise<number>;
-    
-    // Status APIs
-    isEmulator(): Promise<boolean>;
-    isDeviceConnected(): Promise<boolean>;
-    getConnectedDeviceInfo(): Promise<string>;
-    isSDKDownloaded(): Promise<boolean>;
-    getSDKStatus(): Promise<SDKStatus>;
-    
-    // Discovery & Connection APIs
-    startDiscovery(): Promise<boolean>;
-    stopDiscovery(): Promise<boolean>;
-    startEmulator(emulatorType: string): Promise<boolean>;
-    connectToDevice(deviceId: string): Promise<boolean>;
-    stopFlir(): Promise<boolean>;
-    getDiscoveredDevices(): Promise<FlirDevice[]>;
-    
-    // Debug APIs
-    initializeSDK(): Promise<SDKInitResult>;
-    getDebugInfo(): Promise<FlirDebugInfo>;
-}
-
-// FlirDownload removed. Use `FlirModule` APIs instead.
-export declare const FlirModule: FlirModuleAPI;
+// FlirDownload API removed: the SDK is bundled at compile time and runtime downloading is not supported.
+
+export interface SDKStatus {
+    available: boolean;
+    arch: string;
+    dexPath: string;
+    nativeLibPath: string;
+    dexExists: boolean;
+    nativeLibsExist: boolean;
+}
+
+export interface SDKInitResult {
+    initialized: boolean;
+    message?: string;
+    error?: string;
+    errorType?: string;
+}
+
+export interface FlirDebugInfo {
+    sdkAvailable: boolean;
+    arch: string;
+    sdkClassesLoaded: boolean;
+    discoveredDeviceCount: number;
+    isConnected: boolean;
+    isStreaming: boolean;
+    connectedDevice: string;
+}
+
+export interface FlirDevice {
+    id: string;
+    name: string;
+    communicationType: 'USB' | 'NETWORK' | 'EMULATOR';
+    isEmulator: boolean;
+}
+
+export interface FlirModuleAPI {
+    // Temperature APIs
+    getTemperatureFromColor(color: number): Promise<number>;
+    getLatestFramePath(): Promise<string | null>;
+    getTemperatureAt(x: number, y: number): Promise<number>;
+    
+    // Status APIs
+    isEmulator(): Promise<boolean>;
+    isDeviceConnected(): Promise<boolean>;
+    getConnectedDeviceInfo(): Promise<string>;
+    isSDKDownloaded(): Promise<boolean>;
+    getSDKStatus(): Promise<SDKStatus>;
+    
+    // Discovery & Connection APIs
+    startDiscovery(): Promise<boolean>;
+    stopDiscovery(): Promise<boolean>;
+    startEmulator(emulatorType: string): Promise<boolean>;
+    connectToDevice(deviceId: string): Promise<boolean>;
+    stopFlir(): Promise<boolean>;
+    getDiscoveredDevices(): Promise<FlirDevice[]>;
+    
+    // Debug APIs
+    initializeSDK(): Promise<SDKInitResult>;
+    getDebugInfo(): Promise<FlirDebugInfo>;
+}
+
+// FlirDownload removed. Use `FlirModule` APIs instead.
+export declare const FlirModule: FlirModuleAPI;

package/src/index.js

@@ -1,7 +1,7 @@
-// FlirDownload removed; use `FlirModule` for runtime access to SDK features.
-
-// Re-export existing FlirModule functionality
-// Note: FlirModule should be imported from the native module
-import { NativeModules } from 'react-native';
-export const FlirModule = NativeModules.FlirModule;
-
+// FlirDownload removed; use `FlirModule` for runtime access to SDK features.
+
+// Re-export existing FlirModule functionality
+// Note: FlirModule should be imported from the native module
+import { NativeModules } from 'react-native';
+export const FlirModule = NativeModules.FlirModule;
+

package/src/index.ts

@@ -1,6 +1,6 @@
-// FlirDownload removed: SDK is now bundled at compile time; runtime downloads are no longer supported.
-
-// Re-export existing FlirModule functionality
-// Note: FlirModule should be imported from the native module
-import { NativeModules } from 'react-native';
-export const FlirModule = NativeModules.FlirModule;
+// FlirDownload removed: SDK is now bundled at compile time; runtime downloads are no longer supported.
+
+// Re-export existing FlirModule functionality
+// Note: FlirModule should be imported from the native module
+import { NativeModules } from 'react-native';
+export const FlirModule = NativeModules.FlirModule;