ilabs-flir 2.0.3 → 2.0.5

package/scripts/fetch-binaries.js

@@ -0,0 +1,241 @@
+#!/usr/bin/env node
+'use strict';
+const https = require('https');
+const http = require('http');
+const fs = require('fs');
+const path = require('path');
+const { execSync } = require('child_process');
+
+let IOS_URL = 'https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/ios.zip';
+let ANDROID_URL = 'https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/android.zip';
+// Manifest override
+try {
+  const manifest = require(path.join(__dirname, '..', 'sdk-manifest.json'));
+  if (manifest && manifest.ios && manifest.ios.directDownload && manifest.ios.directDownload.downloadUrl) {
+    IOS_URL = manifest.ios.directDownload.downloadUrl;
+  } else if (manifest && manifest.ios && manifest.ios.downloadUrl) {
+    IOS_URL = manifest.ios.downloadUrl;
+  }
+  if (manifest && manifest.android && manifest.android.directDownload && manifest.android.directDownload.downloadUrl) {
+    ANDROID_URL = manifest.android.directDownload.downloadUrl;
+  }
+} catch (err) {
+  // ignore - fall back to embedded constants
+}
+const TMP_DIR = path.join(__dirname, '..', '.tmp-fetch-binaries');
+const DEST_IOS = path.join(__dirname, '..', 'ios', 'Flir', 'Frameworks');
+const DEST_ANDROID = path.join(__dirname, '..', 'android', 'Flir', 'libs');
+
+function ensureTmp() {
+  if (!fs.existsSync(TMP_DIR)) fs.mkdirSync(TMP_DIR, { recursive: true });
+}
+
+function httpGetWithRedirect(url) {
+  return new Promise((resolve, reject) => {
+    const getter = url.startsWith('https://') ? https : http;
+    getter.get(url, (res) => {
+      if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+        resolve(httpGetWithRedirect(res.headers.location));
+      } else if (res.statusCode === 200) {
+        resolve(res);
+      } else {
+        reject(new Error(`Request failed. Status code: ${res.statusCode}`));
+      }
+    }).on('error', reject);
+  });
+}
+
+async function download(url, outPath) {
+  return new Promise(async (resolve, reject) => {
+    console.log(`Downloading ${url}`);
+    try {
+      const res = await httpGetWithRedirect(url);
+      const file = fs.createWriteStream(outPath);
+      res.pipe(file);
+      res.on('end', () => file.end());
+      file.on('finish', () => {
+        console.log(`Saved to ${outPath}`);
+        resolve(outPath);
+      });
+      file.on('error', reject);
+    } catch (err) {
+      reject(err);
+    }
+  });
+}
+
+function extractZip(zipPath, dest) {
+  // We do NOT create `dest` if missing (user insisted). Fail if not exist.
+  if (!fs.existsSync(dest)) {
+    throw new Error(`Destination folder ${dest} does not exist. Please create it and re-run installation.`);
+  }
+  // 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) {
+  if (!fs.existsSync(tmpFolder)) return;
+  const entries = fs.readdirSync(tmpFolder, { withFileTypes: true });
+  entries.forEach(entry => {
+    const fullPath = path.join(tmpFolder, entry.name);
+    if (entry.isDirectory()) {
+      // xcframeworks are directories *.xcframework
+      if (entry.name.endsWith('.xcframework') || entry.name.endsWith('.framework') || entry.name.endsWith('.dylib')) {
+        const dest = path.join(destFolder, entry.name);
+        console.log(`Copy/overwrite ${entry.name} -> ${destFolder}`);
+        // remove existing
+        if (fs.existsSync(dest)) fs.rmSync(dest, { recursive: true, force: true });
+        fs.renameSync(fullPath, dest);
+      } else {
+        // recursively copy from nested folders
+        copyIosExtractedFiles(fullPath, destFolder);
+      }
+    }
+  });
+}
+
+function copyAndroidExtractedFiles(tmpFolder, destFolder) {
+  if (!fs.existsSync(tmpFolder)) return;
+  const entries = fs.readdirSync(tmpFolder, { withFileTypes: true });
+  entries.forEach(entry => {
+    const fullPath = path.join(tmpFolder, entry.name);
+    if (entry.isFile() && entry.name.endsWith('.aar')) {
+      const dest = path.join(destFolder, entry.name);
+      console.log(`Copy/overwrite ${entry.name} -> ${destFolder}`);
+      if (!fs.existsSync(destFolder)) {
+        throw new Error(`Destination folder ${destFolder} does not exist. Please create it and re-run installation.`);
+      }
+      fs.copyFileSync(fullPath, dest);
+    } else if (entry.isDirectory()) {
+      copyAndroidExtractedFiles(fullPath, destFolder);
+    }
+  });
+}
+
+function hasAndroidAar(folder) {
+  if (!fs.existsSync(folder)) return false;
+  return fs.readdirSync(folder).some(f => f.endsWith('.aar'));
+}
+
+function hasIosFrameworks(folder) {
+  if (!fs.existsSync(folder)) return false;
+  return fs.readdirSync(folder).some(f => f.endsWith('.xcframework') || f.endsWith('.framework') || f.endsWith('.dylib'));
+}
+
+async function run() {
+  try {
+    if (process.env.FLIR_SDK_SKIP_DOWNLOAD === '1' || process.env.FLIR_SDK_SKIP_DOWNLOAD === 'true') {
+      console.log('FLIR_SDK_SKIP_DOWNLOAD set; skipping binary fetch.');
+      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.`);
+    }
+
+    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;
+    }, {});
+
+    // Skip if present per-platform
+    const skipIfPresent = args['skip-if-present'] || args['skipIfPresent'] || false;
+    const platformArg = args['platform'] || args['p'] || 'all';
+
+    // 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.');
+    } else if (platformArg === 'all' || platformArg === 'android') {
+      // Download Android zip
+      const androidZip = path.join(TMP_DIR, 'android.zip');
+      await download(ANDROID_URL, androidZip);
+      // Extract to TMP_DIR
+      extractZip(androidZip, DEST_ANDROID);
+      // Copy AARs from TMP_DIR to libs
+      copyAndroidExtractedFiles(TMP_DIR, DEST_ANDROID);
+      fs.rmSync(androidZip);
+    }
+
+    // Clean out TMP_DIR (remove all contents) to avoid conflicts for iOS
+    fs.readdirSync(TMP_DIR).forEach(f => {
+      const fp = path.join(TMP_DIR, f);
+      try { fs.rmSync(fp, { recursive: true, force: true }); } catch (e) {}
+    });
+
+    if (skipIfPresent && platformArg !== 'android' && hasIosFrameworks(DEST_IOS)) {
+      console.log('iOS frameworks detected in Frameworks folder; skipping iOS fetch.');
+    } else if (platformArg === 'all' || platformArg === 'ios') {
+      // Download iOS zip
+      const iosZip = path.join(TMP_DIR, 'ios.zip');
+      await download(IOS_URL, iosZip);
+      extractZip(iosZip, DEST_IOS);
+      // Move xcframeworks and dylibs
+      copyIosExtractedFiles(TMP_DIR, DEST_IOS);
+      fs.rmSync(iosZip);
+    }
+
+    // Cleanup tmp
+    try { fs.rmSync(TMP_DIR, { recursive: true, force: true }); } catch (e) {}
+
+    console.log('FLIR SDK binaries fetched and installed into the package folders.');
+  } 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) {}
+  }
+}
+
+run();

package/sdk-manifest.json

@@ -1,53 +1,51 @@
-{
-  "version": "2.0.0",
-  "sdkVersion": "5.0.0",
-  "ios": {
-    "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v2.0.0/ios-sdk.zip",
-    "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": {
-    "packages": {
-      "arm64-v8a": {
-        "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/flir-sdk-arm64-v8a.zip",
-        "sizeBytes": 36328411
-      },
-      "armeabi-v7a": {
-        "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/flir-sdk-armeabi-v7a.zip",
-        "sizeBytes": 33248516
-      },
-      "x86_64": {
-        "downloadUrl": "https://github.com/PraveenOjha/flir-sdk-binaries/releases/download/v1.0.1/flir-sdk-x86_64.zip",
-        "sizeBytes": 38421590
-      }
-    }
-  },
-  "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,76 +1,63 @@
-export interface DownloadProgress {
-    bytesDownloaded: number;
-    totalBytes: number;
-    percent: number;
-}
-
-export interface FlirDownloadAPI {
-    isAvailable(): Promise<boolean>;
-    getDownloadSize(): Promise<number>;
-    getDownloadSizeFormatted(): Promise<string>;
-    download(onProgress?: (progress: DownloadProgress) => void): Promise<void>;
-    cancel(): void;
-    delete(): Promise<boolean>;
-}
-
-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>;
-}
-
-export declare const FlirDownload: FlirDownloadAPI;
-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 @@
-export { FlirDownload } from './FlirDownload';
-
-// 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,7 +1,6 @@
-export { FlirDownload } from './FlirDownload';
-export type { DownloadProgress, FlirDownloadAPI } from './FlirDownload';
-
-// 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;

package/android/Flir/src/main/java/flir/android/FlirDownloadManager.kt

@@ -1,55 +0,0 @@
-package flir.android
-
-import com.facebook.react.bridge.*
-
-/**
- * FlirDownloadManager - React Native module for SDK status
- * 
- * Since the SDK is now bundled in the AAR, this module just reports
- * that the SDK is always available.
- */
-class FlirDownloadManager(private val reactContext: ReactApplicationContext) : 
-    ReactContextBaseJavaModule(reactContext) {
-    
-    override fun getName() = "FlirDownloadManager"
-    
-    @ReactMethod
-    fun isFlirAvailable(promise: Promise) {
-        // SDK is bundled - always available
-        promise.resolve(true)
-    }
-    
-    @ReactMethod
-    fun getDownloadSize(promise: Promise) {
-        // No download needed
-        promise.resolve(0.0)
-    }
-    
-    @ReactMethod
-    fun getDeviceArch(promise: Promise) {
-        promise.resolve(FlirSDKLoader.getDeviceArch())
-    }
-    
-    @ReactMethod
-    fun downloadFlirSDK(promise: Promise) {
-        // SDK is bundled - no download needed
-        promise.resolve(true)
-    }
-    
-    @ReactMethod
-    fun getSDKStatus(promise: Promise) {
-        val status = Arguments.createMap().apply {
-            putBoolean("available", true)
-            putBoolean("bundled", true)
-            putString("arch", FlirSDKLoader.getDeviceArch())
-            putString("version", "4.16.0")
-        }
-        promise.resolve(status)
-    }
-    
-    @ReactMethod
-    fun cancelDownload(promise: Promise) {
-        // Nothing to cancel
-        promise.resolve(true)
-    }
-}

package/android/Flir/src/main/java/flir/android/FlirDownloadPackage.kt

@@ -1,16 +0,0 @@
-package flir.android
-
-import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.NativeModule
-import com.facebook.react.bridge.ReactApplicationContext
-import com.facebook.react.uimanager.ViewManager
-
-class FlirDownloadPackage : ReactPackage {
-    override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        return listOf(FlirDownloadManager(reactContext))
-    }
-    
-    override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {
-        return emptyList()
-    }
-}

package/ios/Flir/Frameworks/MeterLink.xcframework/Info.plist

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>AvailableLibraries</key>
-	<array>
-		<dict>
-			<key>BinaryPath</key>
-			<string>MeterLink.framework/MeterLink</string>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>MeterLink.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
-		<dict>
-			<key>BinaryPath</key>
-			<string>MeterLink.framework/MeterLink</string>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
-			<key>LibraryPath</key>
-			<string>MeterLink.framework</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-		</dict>
-	</array>
-	<key>CFBundlePackageType</key>
-	<string>XFWK</string>
-	<key>XCFrameworkFormatVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>