@trillboards/edge-sdk 0.2.56 → 0.2.58

package/deploy/macos/build-macos-pkg.sh

@@ -433,8 +433,11 @@ fi
 # AppKit keeps the installer small and gives customers a real application window
 # while the existing, proven setup engine runs invisibly in the background.
 SETUP_APP_MACOS="$SETUP_APP/Contents/MacOS"
+SETUP_APP_RESOURCES="$SETUP_APP/Contents/Resources"
 SETUP_APP_BIN="$SETUP_APP_MACOS/Trillboards CCTV Setup"
-mkdir -p "$SETUP_APP_MACOS"
+mkdir -p "$SETUP_APP_MACOS" "$SETUP_APP_RESOURCES"
+cp "$PKG_ROOT/deploy/branding/SenseAnythingConnector.icns" \
+  "$SETUP_APP_RESOURCES/SenseAnythingConnector.icns"
 log "Building native Trillboards CCTV Setup.app…"
 if [ "$UNIVERSAL" -eq 1 ]; then
   clang -fobjc-arc -Wall -Wextra -Werror -O2 -mmacosx-version-min=12.0 -arch arm64 -arch x86_64 -framework Cocoa \
@@ -466,6 +469,7 @@ cat > "$SETUP_APP/Contents/Info.plist" <<PLIST
   <key>CFBundleDisplayName</key><string>Trillboards CCTV Setup</string>
   <key>CFBundleExecutable</key><string>Trillboards CCTV Setup</string>
   <key>CFBundleIdentifier</key><string>com.trillboards.cctv-setup</string>
+  <key>CFBundleIconFile</key><string>SenseAnythingConnector</string>
   <key>CFBundleInfoDictionaryVersion</key><string>6.0</string>
   <key>CFBundleName</key><string>Trillboards CCTV Setup</string>
   <key>CFBundlePackageType</key><string>APPL</string>

package/deploy/windows/build-windows.ps1

@@ -241,8 +241,9 @@ if (-not $makensis) { Die "makensis not found on PATH (install NSIS: choco insta
 $InnerDir = Join-Path $DistDir "inner"
 New-Item -ItemType Directory -Force -Path $InnerDir | Out-Null
 $out = Join-Path $InnerDir "TrillboardsEdgeSetup-core-$Version-x64.exe"
+$appIcon = (Resolve-Path -LiteralPath (Join-Path $Here "..\branding\SenseAnythingConnector.ico")).Path
 Log "Compiling inner NSIS connector installer…"
-& $makensis "/DPAYLOAD_DIR=$Payload" "/DAPP_VERSION=$Version" "/DOUT_FILE=$out" "$Here\installer.nsi"
+& $makensis "/DPAYLOAD_DIR=$Payload" "/DAPP_VERSION=$Version" "/DAPP_ICON=$appIcon" "/DOUT_FILE=$out" "$Here\installer.nsi"
 if ($LASTEXITCODE -ne 0) { Die "makensis failed (code $LASTEXITCODE)" }
 if (-not (Test-Path $out)) { Die "installer .exe not produced at $out" }
 $sizeMb = [math]::Round((Get-Item $out).Length / 1MB, 1)

package/deploy/windows/bundle-windows-installer.ps1

@@ -18,7 +18,8 @@ param(
   [string]$ModelUrl = "https://huggingface.co/litert-community/gemma-4-E2B-it-litert-lm/resolve/main/gemma-4-E2B-it.litertlm",
   [string]$ModelSha256 = "181938105e0eefd105961417e8da75903eacda102c4fce9ce90f50b97139a63c",
   [string]$SevenZipSdkUrl = "https://www.7-zip.org/a/lzma2602.7z",
-  [string]$SevenZipSdkSha256 = "2878c85f5f43a4a4e0952b1fd4e5fe097c1c143997a8047c7e1e788892aa9357"
+  [string]$SevenZipSdkSha256 = "2878c85f5f43a4a4e0952b1fd4e5fe097c1c143997a8047c7e1e788892aa9357",
+  [string]$IconPath = ""
 )
 
 $ErrorActionPreference = "Stop"
@@ -27,6 +28,10 @@ $DistDir = Join-Path $Here "dist-installer"
 $Scratch = Join-Path $DistDir "bundle-scratch"
 $Stage = Join-Path $Scratch "payload"
 $ModelId = "gemma-4-E2B-it.litertlm"
+if ([string]::IsNullOrWhiteSpace($IconPath)) {
+  $IconPath = Join-Path $Here "..\branding\SenseAnythingConnector.ico"
+}
+$IconPath = (Resolve-Path -LiteralPath $IconPath).Path
 
 function Log([string]$Message) { Write-Host "[bundle] $Message" -ForegroundColor Blue }
 function Fail([string]$Message) { throw "[bundle] $Message" }
@@ -79,6 +84,11 @@ if ($LASTEXITCODE -ne 0) { Fail "could not extract the LZMA SDK" }
 $sfxModule = Get-ChildItem -LiteralPath $sfxTools -Recurse -File -Filter "7zSD.sfx" | Select-Object -First 1
 if (-not $sfxModule) { Fail "official 7zSD.sfx installer module was not found" }
 
+# Brand the executable module before appending the config and archive. This
+# keeps the SFX overlay byte-for-byte intact and the final Authenticode signing
+# step covers both the application icon and the customer payload.
+& (Join-Path $Here "set-executable-icon.ps1") -ExecutablePath $sfxModule.FullName -IconPath $IconPath
+
 $innerName = "TrillboardsEdgeSetup-core.exe"
 Copy-Item -LiteralPath $InnerInstaller -Destination (Join-Path $Stage $innerName) -Force
 $sevenZipNotice = @'

package/deploy/windows/installer.nsi

@@ -20,10 +20,15 @@
 !ifndef OUT_FILE
   !define OUT_FILE "TrillboardsEdgeSetup.exe"
 !endif
+!ifndef APP_ICON
+  !error "APP_ICON not defined (pass /DAPP_ICON=...)"
+!endif
 
 !define APP_NAME "Trillboards Edge - CCTV Connector"
 !define TASK_NAME "TrillboardsEdge"
 !define LITERT_TASK_NAME "TrillboardsLiteRtLm"
+!define MUI_ICON "${APP_ICON}"
+!define MUI_UNICON "${APP_ICON}"
 
 Var ModelSource
 ; -- Unattended (MDM/Intune/SCCM) parameters --------------------------------
@@ -42,6 +47,8 @@ OutFile "${OUT_FILE}"
 Unicode True
 RequestExecutionLevel user                 ; per-user, no admin/UAC
 InstallDir "$LOCALAPPDATA\Trillboards\edge"
+Icon "${APP_ICON}"
+UninstallIcon "${APP_ICON}"
 SetCompressor /SOLID lzma
 ShowInstDetails show
 BrandingText "Trillboards"
@@ -176,6 +183,7 @@ Section "Install"
     Abort
   ${EndIf}
   SetOutPath "$INSTDIR"
+  File /oname=SenseAnythingConnector.ico "${APP_ICON}"
 
   ; The outer signed self-extractor passes its checksum-pinned model here. This
   ; is synchronous and required: pairing is never offered while AI is absent or
@@ -226,7 +234,7 @@ Section "Install"
 
   ; Start Menu shortcuts.
   CreateDirectory "$SMPROGRAMS\Trillboards"
-  CreateShortcut "$SMPROGRAMS\Trillboards\Trillboards CCTV Setup.lnk" "$WINDIR\System32\wscript.exe" '$\"$INSTDIR\bin\trillboards-setup.vbs$\"'
+  CreateShortcut "$SMPROGRAMS\Trillboards\Trillboards CCTV Setup.lnk" "$WINDIR\System32\wscript.exe" '$\"$INSTDIR\bin\trillboards-setup.vbs$\"' "$INSTDIR\SenseAnythingConnector.ico" 0
   CreateShortcut "$SMPROGRAMS\Trillboards\Uninstall Trillboards Edge.lnk" "$INSTDIR\uninstall.exe"
 
   ; Uninstaller + Add/Remove Programs entry (per-user hive).
@@ -235,6 +243,7 @@ Section "Install"
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\TrillboardsEdge" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\TrillboardsEdge" "DisplayVersion" "${APP_VERSION}"
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\TrillboardsEdge" "Publisher" "Trillboards"
+  WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\TrillboardsEdge" "DisplayIcon" "$INSTDIR\SenseAnythingConnector.ico"
   WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\TrillboardsEdge" "NoModify" 1
   WriteRegDWORD HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\TrillboardsEdge" "NoRepair" 1
 SectionEnd

package/deploy/windows/set-executable-icon.ps1

@@ -0,0 +1,354 @@
+<#
+.SYNOPSIS
+  Replaces every application icon group in a Windows executable.
+
+.DESCRIPTION
+  The customer installer uses the official 7-Zip SFX module, whose generic
+  icon would otherwise become the icon customers see in Explorer. This helper
+  updates that module before the installer payload is appended and signed.
+#>
+[CmdletBinding()]
+param(
+  [Parameter(Mandatory = $true)][string]$ExecutablePath,
+  [Parameter(Mandatory = $true)][string]$IconPath
+)
+
+$ErrorActionPreference = "Stop"
+
+if ([Environment]::OSVersion.Platform -ne [PlatformID]::Win32NT) {
+  throw "set-executable-icon.ps1 must run on Windows"
+}
+
+$ExecutablePath = (Resolve-Path -LiteralPath $ExecutablePath).Path
+$IconPath = (Resolve-Path -LiteralPath $IconPath).Path
+
+Add-Type -TypeDefinition @'
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Runtime.InteropServices;
+
+namespace SenseAnything.Build
+{
+    public static class ExecutableIcon
+    {
+        private const uint LoadLibraryAsDataFile = 0x00000002;
+        private const int ResourceTypeIcon = 3;
+        private const int ResourceTypeGroupIcon = 14;
+        private const int ResourceTypeNotFound = 1813;
+        private const int ResourceLanguageNotFound = 1815;
+        private const ushort DefaultLanguage = 1033;
+        private const ushort FirstReplacementIconId = 50000;
+
+        private sealed class IconImage
+        {
+            public byte Width;
+            public byte Height;
+            public byte ColorCount;
+            public byte Reserved;
+            public ushort Planes;
+            public ushort BitCount;
+            public byte[] Data;
+        }
+
+        private sealed class ResourceGroup
+        {
+            public bool IsInteger;
+            public ushort IntegerName;
+            public string StringName;
+            public readonly List<ushort> Languages = new List<ushort>();
+        }
+
+        private delegate bool EnumResourceNameProc(
+            IntPtr module,
+            IntPtr type,
+            IntPtr name,
+            IntPtr parameter);
+
+        private delegate bool EnumResourceLanguageProc(
+            IntPtr module,
+            IntPtr type,
+            IntPtr name,
+            ushort language,
+            IntPtr parameter);
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        private static extern IntPtr LoadLibraryExW(
+            string fileName,
+            IntPtr file,
+            uint flags);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool FreeLibrary(IntPtr module);
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool EnumResourceNamesW(
+            IntPtr module,
+            IntPtr type,
+            EnumResourceNameProc callback,
+            IntPtr parameter);
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, EntryPoint = "EnumResourceLanguagesW", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool EnumResourceLanguagesById(
+            IntPtr module,
+            IntPtr type,
+            IntPtr name,
+            EnumResourceLanguageProc callback,
+            IntPtr parameter);
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, EntryPoint = "EnumResourceLanguagesW", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool EnumResourceLanguagesByName(
+            IntPtr module,
+            IntPtr type,
+            string name,
+            EnumResourceLanguageProc callback,
+            IntPtr parameter);
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        private static extern IntPtr BeginUpdateResourceW(
+            string fileName,
+            [MarshalAs(UnmanagedType.Bool)] bool deleteExistingResources);
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, EntryPoint = "UpdateResourceW", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool UpdateResourceById(
+            IntPtr update,
+            IntPtr type,
+            IntPtr name,
+            ushort language,
+            byte[] data,
+            uint dataSize);
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, EntryPoint = "UpdateResourceW", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool UpdateResourceByName(
+            IntPtr update,
+            IntPtr type,
+            string name,
+            ushort language,
+            byte[] data,
+            uint dataSize);
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool EndUpdateResourceW(
+            IntPtr update,
+            [MarshalAs(UnmanagedType.Bool)] bool discard);
+
+        public static void Replace(string executablePath, string iconPath)
+        {
+            List<IconImage> images = ReadIcon(iconPath);
+            List<ResourceGroup> groups = ReadIconGroups(executablePath);
+            if (groups.Count == 0)
+            {
+                ResourceGroup group = new ResourceGroup();
+                group.IsInteger = true;
+                group.IntegerName = 101;
+                group.Languages.Add(DefaultLanguage);
+                groups.Add(group);
+            }
+
+            HashSet<ushort> languages = new HashSet<ushort>();
+            foreach (ResourceGroup group in groups)
+            {
+                if (group.Languages.Count == 0)
+                    group.Languages.Add(DefaultLanguage);
+                foreach (ushort language in group.Languages)
+                    languages.Add(language);
+            }
+
+            IntPtr update = BeginUpdateResourceW(executablePath, false);
+            if (update == IntPtr.Zero)
+                throw new Win32Exception(Marshal.GetLastWin32Error(), "Could not open the executable resources");
+
+            bool committed = false;
+            try
+            {
+                foreach (ushort language in languages)
+                {
+                    for (int index = 0; index < images.Count; index++)
+                    {
+                        ushort imageId = checked((ushort)(FirstReplacementIconId + index));
+                        IconImage image = images[index];
+                        Require(UpdateResourceById(
+                            update,
+                            MakeResource(ResourceTypeIcon),
+                            MakeResource(imageId),
+                            language,
+                            image.Data,
+                            (uint)image.Data.Length),
+                            "Could not write an icon image resource");
+                    }
+                }
+
+                byte[] groupData = BuildGroupData(images);
+                foreach (ResourceGroup group in groups)
+                {
+                    foreach (ushort language in group.Languages)
+                    {
+                        bool result = group.IsInteger
+                            ? UpdateResourceById(
+                                update,
+                                MakeResource(ResourceTypeGroupIcon),
+                                MakeResource(group.IntegerName),
+                                language,
+                                groupData,
+                                (uint)groupData.Length)
+                            : UpdateResourceByName(
+                                update,
+                                MakeResource(ResourceTypeGroupIcon),
+                                group.StringName,
+                                language,
+                                groupData,
+                                (uint)groupData.Length);
+                        Require(result, "Could not write an icon group resource");
+                    }
+                }
+
+                Require(EndUpdateResourceW(update, false), "Could not commit the executable icon");
+                committed = true;
+            }
+            finally
+            {
+                if (!committed)
+                    EndUpdateResourceW(update, true);
+            }
+        }
+
+        private static List<ResourceGroup> ReadIconGroups(string executablePath)
+        {
+            IntPtr module = LoadLibraryExW(executablePath, IntPtr.Zero, LoadLibraryAsDataFile);
+            if (module == IntPtr.Zero)
+                throw new Win32Exception(Marshal.GetLastWin32Error(), "Could not read the executable resources");
+
+            List<ResourceGroup> groups = new List<ResourceGroup>();
+            try
+            {
+                EnumResourceNameProc nameCallback = delegate(IntPtr callbackModule, IntPtr type, IntPtr name, IntPtr parameter)
+                {
+                    ResourceGroup group = new ResourceGroup();
+                    group.IsInteger = IsIntegerResource(name);
+                    if (group.IsInteger)
+                        group.IntegerName = unchecked((ushort)name.ToInt64());
+                    else
+                        group.StringName = Marshal.PtrToStringUni(name);
+
+                    EnumResourceLanguageProc languageCallback = delegate(IntPtr languageModule, IntPtr languageType, IntPtr languageName, ushort language, IntPtr languageParameter)
+                    {
+                        group.Languages.Add(language);
+                        return true;
+                    };
+
+                    bool languageResult = group.IsInteger
+                        ? EnumResourceLanguagesById(callbackModule, type, MakeResource(group.IntegerName), languageCallback, IntPtr.Zero)
+                        : EnumResourceLanguagesByName(callbackModule, type, group.StringName, languageCallback, IntPtr.Zero);
+                    int languageError = Marshal.GetLastWin32Error();
+                    if (!languageResult && languageError != ResourceLanguageNotFound)
+                        throw new Win32Exception(languageError, "Could not enumerate icon resource languages");
+
+                    groups.Add(group);
+                    return true;
+                };
+
+                bool result = EnumResourceNamesW(
+                    module,
+                    MakeResource(ResourceTypeGroupIcon),
+                    nameCallback,
+                    IntPtr.Zero);
+                int error = Marshal.GetLastWin32Error();
+                if (!result && error != ResourceTypeNotFound)
+                    throw new Win32Exception(error, "Could not enumerate executable icon groups");
+            }
+            finally
+            {
+                FreeLibrary(module);
+            }
+            return groups;
+        }
+
+        private static List<IconImage> ReadIcon(string iconPath)
+        {
+            using (FileStream stream = File.OpenRead(iconPath))
+            using (BinaryReader reader = new BinaryReader(stream))
+            {
+                ushort reserved = reader.ReadUInt16();
+                ushort type = reader.ReadUInt16();
+                ushort count = reader.ReadUInt16();
+                if (reserved != 0 || type != 1 || count == 0)
+                    throw new InvalidDataException("The application icon is not a valid ICO file");
+
+                List<IconImage> images = new List<IconImage>();
+                for (int index = 0; index < count; index++)
+                {
+                    IconImage image = new IconImage();
+                    image.Width = reader.ReadByte();
+                    image.Height = reader.ReadByte();
+                    image.ColorCount = reader.ReadByte();
+                    image.Reserved = reader.ReadByte();
+                    image.Planes = reader.ReadUInt16();
+                    image.BitCount = reader.ReadUInt16();
+                    uint byteCount = reader.ReadUInt32();
+                    uint offset = reader.ReadUInt32();
+
+                    long returnPosition = stream.Position;
+                    if ((long)offset + byteCount > stream.Length)
+                        throw new InvalidDataException("An ICO image points outside the file");
+                    stream.Position = offset;
+                    image.Data = reader.ReadBytes(checked((int)byteCount));
+                    stream.Position = returnPosition;
+                    images.Add(image);
+                }
+                return images;
+            }
+        }
+
+        private static byte[] BuildGroupData(List<IconImage> images)
+        {
+            using (MemoryStream stream = new MemoryStream())
+            using (BinaryWriter writer = new BinaryWriter(stream))
+            {
+                writer.Write((ushort)0);
+                writer.Write((ushort)1);
+                writer.Write(checked((ushort)images.Count));
+                for (int index = 0; index < images.Count; index++)
+                {
+                    IconImage image = images[index];
+                    writer.Write(image.Width);
+                    writer.Write(image.Height);
+                    writer.Write(image.ColorCount);
+                    writer.Write(image.Reserved);
+                    writer.Write(image.Planes);
+                    writer.Write(image.BitCount);
+                    writer.Write((uint)image.Data.Length);
+                    writer.Write(checked((ushort)(FirstReplacementIconId + index)));
+                }
+                return stream.ToArray();
+            }
+        }
+
+        private static bool IsIntegerResource(IntPtr value)
+        {
+            return (value.ToInt64() >> 16) == 0;
+        }
+
+        private static IntPtr MakeResource(int value)
+        {
+            return new IntPtr(value & 0xffff);
+        }
+
+        private static void Require(bool result, string message)
+        {
+            if (!result)
+                throw new Win32Exception(Marshal.GetLastWin32Error(), message);
+        }
+    }
+}
+'@
+
+[SenseAnything.Build.ExecutableIcon]::Replace($ExecutablePath, $IconPath)
+Write-Host "[icon] applied Sense Anything icon to $ExecutablePath" -ForegroundColor Green

package/dist/EdgeAgent.js

@@ -44,7 +44,7 @@ const edge_ads_1 = require("@trillboards/edge-ads");
 const CommandRouter_1 = require("./CommandRouter");
 const config_1 = require("./config");
 const dataDir_1 = require("./dataDir");
-const SDK_VERSION = '0.2.56';
+const SDK_VERSION = '0.2.58';
 class EdgeAgent extends events_1.EventEmitter {
     constructor(config, deps) {
         super();

package/dist/diagnose.d.ts

@@ -31,7 +31,7 @@ export interface DiagnosticReport {
         skipped: number;
     };
 }
-declare const SDK_VERSION = "0.2.56";
+declare const SDK_VERSION = "0.2.58";
 declare function checkNodeVersion(): CheckResult;
 declare function checkPlatform(): CheckResult;
 declare function checkMemory(): CheckResult;

package/dist/diagnose.js

@@ -63,7 +63,7 @@ const localNetworkAccess_1 = require("./localNetworkAccess");
 // ---------------------------------------------------------------------------
 // SDK version — mirrors package.json; kept in sync by CI
 // ---------------------------------------------------------------------------
-const SDK_VERSION = '0.2.56';
+const SDK_VERSION = '0.2.58';
 exports._SDK_VERSION = SDK_VERSION;
 // ---------------------------------------------------------------------------
 // ANSI helpers (no external deps)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trillboards/edge-sdk",
-  "version": "0.2.56",
+  "version": "0.2.58",
   "description": "Composable cross-platform Edge AI SDK for audience sensing on DOOH/CTV devices",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",