Update MeshAgent from Fork

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,58 @@
+<!--
+⚠️ NO AI SLOP!!!
+⚠️ If you didn't do manual QA and testing on this PR you shouldn't be PRing
+-->
+
+# Summary
+
+In this pull request, the following changes are made:
+
+- Foobar was changed to FooFoo, because ...
+
+<!--Please link any GitHub issues or tasks that this pull request addresses-->
+
+- Relates to #issue-number <!--this links the related issue-->
+- Resolves #issue-number <!--this auto-closes the issue-->
+
+<details>
+<summary>Please follow this checklist to avoid unnecessary back and forth (click to expand)</summary>
+
+- [ ] 🧠 I used LLMs/AI in this contribution and reviewed all generated content.
+      I understand that I am responsible for and able to explain every line of code I submit.
+- [ ] 🛠️ I have self-reviewed my code and self-tested it against a MeshCentral server to ensure it works as expected.
+- [ ] 🖥️ My change compiles on every platform it affects (Windows / Linux / macOS / FreeBSD), and I have considered
+      the impact on platforms and architectures I could not test.
+- [ ] 📦 If I changed JavaScript modules under `modules/`, I re-embedded them so the compiled-in copies in
+      `microscript/ILibDuktape_Polyfills.c` match (the agent runs the embedded copies, not the files on disk).
+- [ ] 🤖 I ran the agent self-test where appropriate (see "Self Test" in [readme.md](../readme.md)).
+- [ ] 📄 Documentation updates are included (if applicable), e.g. the `.msh` options table in [readme.md](../readme.md).
+- [ ] 🧰 Updates to vendored dependencies (OpenSSL, zlib, ...) are listed and explained.
+- [ ] ⚠️ CI passes and is green (Windows / Linux / macOS / FreeBSD builds and CodeQL).
+
+</details>
+
+## Testing
+
+<!--
+Describe how you tested this change: which platforms/architectures you ran the agent on,
+and the MeshCentral server version you tested against.
+-->
+
+| Platform (OS / distro / arch) | Tested | Result |
+| ----------------------------- | ------ | ------ |
+| e.g. Windows 11 x64           | ✅     |        |
+| e.g. Debian 13 x64 (Wayland)  | ✅     |        |
+
+## Screenshots for Visual Changes
+
+<!--
+If this pull request changes anything with a visual outcome (remote desktop/KVM, terminal,
+file transfer, installer dialogs), please include before & after screenshots.
+If not, remove this section.
+
+Please upload the image directly here by pasting it or dragging and dropping.
+-->
+
+| Event | Before                | After                |
+| ----- | --------------------- | -------------------- |
+|       | ![Before](image-link) | ![After](image-link) |

.github/workflows/codeql-analysis.yml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
@@ -26,7 +26,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       # Override language selection by uncommenting this and choosing your languages
       with:
          languages: javascript, cpp
@@ -49,4 +49,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/freebsd-build.yml

@@ -0,0 +1,33 @@
+name: FreeBSD Build
+run-name: Build FreeBSD versions of MeshAgent
+on:
+  push:
+  pull_request:
+jobs:
+  freebsd-build-x86-64:
+    name: FreeBSD x86_64 (ARCHID=30)
+    # GitHub has no FreeBSD runners, so the build runs inside a FreeBSD VM on a Linux runner.
+    # Binaries built on an older FreeBSD release run on all newer ones, but not vice versa,
+    # so build on the oldest release CI can still support: 13.5 covers 13.x (TrueNAS CORE,
+    # older OPNsense/pfSense) through 15.x. FreeBSD 13 is EOL — if its pkg repo or VM image
+    # disappears and the "prepare" step starts failing, bump the release to 14.4.
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v7.0.0
+      - name: Build meshagent (x86_64) in FreeBSD VM
+        uses: vmactions/freebsd-vm@v1
+        with:
+          release: "13.5"
+          # The makefile generates ILibDuktape_Commit.h only when git works — without git the
+          # build fails on a missing header. safe.directory is needed because the rsynced
+          # repo is owned by the runner uid, not the VM user, so git refuses it otherwise.
+          prepare: |
+            pkg install -y gmake git
+            git config --global --add safe.directory '*'
+          run: gmake -j4 freebsd ARCHID=30
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v7.0.1
+        with:
+          name: meshagent-freebsd-x86_64
+          path: ${{ github.workspace }}/meshagent_*

.github/workflows/linux-build.yml

@@ -0,0 +1,51 @@
+name: Linux Build
+run-name: Build Linux versions of MeshAgent
+on:
+  push:
+  pull_request:
+jobs:
+  linux-build-x86:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v7.0.0
+      - name: Install Packages
+        run: |
+          sudo dpkg --add-architecture i386 &&
+          sudo apt clean all && sudo apt update && 
+          sudo apt-get install -y libx11-dev libxtst-dev libxext-dev libjpeg62-dev build-essential &&
+          sudo apt-get install -y linux-libc-dev:i386 libc6-dev-i386 libjpeg62-dev:i386 &&
+          sudo apt-get install -y libc6-armel-cross libc6-dev-armel-cross binutils-arm-linux-gnueabi libncurses5-dev gcc-arm-linux-gnueabihf && 
+          sudo apt-get install -y libxrandr-dev
+      - name: Build 32 Bit Linux
+        run: make -j4 linux ARCHID=5 && make clean
+      - name: Build 64 Bit Linux
+        run: make -j4 linux ARCHID=6 && make clean
+      - name: Build 32 Bit NOKVM Linux
+        run: make -j4 linux ARCHID=19 && make clean
+      - name: Build 64 Bit NOKVM Linux
+        run: make -j4 linux ARCHID=20 && make clean
+      - name: Build 64 Bit Alpine Linux
+        run: make -j4 linux ARCHID=33 && make clean
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v7.0.1
+        with:
+          name: meshagent-binaries-x86
+          path: ${{ github.workspace }}/meshagent_*
+
+  linux-build-arm:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v7.0.0
+      - name: Install Packages
+        run: |
+          sudo apt clean all && sudo apt update &&
+          sudo apt-get install -y libx11-dev libxtst-dev libxext-dev libjpeg-dev libxrandr-dev build-essential
+      - name: Build ARM64 Linux
+        run: make -j4 linux ARCHID=26 && make clean
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v7.0.1
+        with:
+          name: meshagent-binaries-arm
+          path: ${{ github.workspace }}/meshagent_*

.github/workflows/mac-build.yml

@@ -0,0 +1,33 @@
+name: macOS Build
+run-name: Build MacOS versions of MeshAgent
+on:
+  push:
+  pull_request:
+jobs:
+  macos-build-arm64:
+    name: macOS arm64 (ARCHID=29)
+    runs-on: macos-15
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v7.0.0
+      - name: Build meshagent (arm64, KVM enabled)
+        run: make -j4 macos ARCHID=29
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v7.0.1
+        with:
+          name: meshagent-macos-arm64
+          path: ${{ github.workspace }}/meshagent_*
+
+  macos-build-x86_64:
+    name: macOS x86_64 (ARCHID=16)
+    runs-on: macos-15-intel
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v7.0.0
+      - name: Build meshagent (x86_64, KVM enabled)
+        run: make -j4 macos ARCHID=16
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v7.0.1
+        with:
+          name: meshagent-macos-x86_64
+          path: ${{ github.workspace }}/meshagent_*

.github/workflows/windows-build.yml

@@ -0,0 +1,27 @@
+name: Windows Build
+
+run-name: Build Windows versions of MeshAgent
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  windows-build:
+    runs-on: ${{ matrix.platform == 'ARM64' && 'windows-11-arm' || 'windows-2022' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [x64, x86, ARM64]
+    steps:
+    - uses: actions/checkout@v7
+    - name: Setup Visual Studio
+      uses: microsoft/setup-msbuild@v3
+    - name: Build ${{ matrix.platform }}
+      run: msbuild MeshAgent-2022.sln /p:Configuration=Release /p:Platform=${{ matrix.platform }}
+    - name: Upload ${{ matrix.platform }} artifacts
+      uses: actions/upload-artifact@v7
+      with:
+        name: meshagent-windows-${{ matrix.platform }}
+        path: Release/*.exe
+

.gitignore

@@ -332,4 +332,12 @@ ASALocalRun/
 
 *.o
 ToolChains/
-.DS_Store
+.DS_Store
+
+# Build files
+# Regenerated every build
+microscript/ILibDuktape_Commit.h
+
+# compiled builds: meshagent_<arch>, DEBUG_meshagent_<arch>
+/meshagent_*
+/DEBUG_meshagent_*

com.meshagent.kvm.plist

@@ -0,0 +1,48 @@
+<?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>Label</key>
+    <string>com.meshagent.kvm</string>
+
+    <!--
+        Launchd loads this LaunchAgent into gui/<console-uid> (and
+        LoginWindow), so the kvm process runs natively in the user's
+        GUI audit session. com.apple.replayd is reachable from this
+        session, which is what makes ScreenCaptureKit / ReplayKit
+        screen-capture work on macOS Tahoe without the
+        audit_session_join workaround the daemon-spawn path needs.
+    -->
+    <key>LimitLoadToSessionType</key>
+    <array>
+        <string>Aqua</string>
+        <string>LoginWindow</string>
+    </array>
+
+    <key>ProgramArguments</key>
+    <array>
+        <string>/usr/local/mesh_services/meshagent/meshagent/meshagent</string>
+        <string>-kvmagent</string>
+    </array>
+
+    <!--
+        Always restart unless we exited cleanly. ThrottleInterval keeps
+        us from hammering on a persistent failure (e.g., replayd genuinely
+        unreachable).
+    -->
+    <key>RunAtLoad</key>
+    <true/>
+    <key>KeepAlive</key>
+    <dict>
+        <key>SuccessfulExit</key>
+        <false/>
+    </dict>
+    <key>ThrottleInterval</key>
+    <integer>30</integer>
+
+    <key>StandardOutPath</key>
+    <string>/tmp/meshagent-kvm.stdout.log</string>
+    <key>StandardErrorPath</key>
+    <string>/tmp/meshagent-kvm.stderr.log</string>
+</dict>
+</plist>

makefile

@@ -9,21 +9,27 @@
 #
 # To build MeshAgent2 on Linux you first got to download the dev libraries to compile the agent, we need x11, txt, ext and jpeg. To install, do this:
 #	Using APT:
-#		sudo apt-get install libx11-dev libxtst-dev libxext-dev libjpeg62-dev
+#		sudo apt-get install libx11-dev libxtst-dev libxext-dev libjpeg62-dev libxrandr-dev
 #
 #	Using YUM:
-#		sudo yum install libX11-devel libXtst-devel libXext-devel libjpeg-devel
+#		sudo yum install libX11-devel libXtst-devel libXext-devel libjpeg-devel libXrandr-devel
 #
 #	NOTE: If you install headers for jpeg8, you need to put the compiled .a in the v80 folder, and specify JPEGVER=v80 when building MeshAgent
 #		eg: make linux ARCHID=6 JPEGVER=v80
 #
 #
 # To build for 32 bit on 64 bit linux 
-#  sudo apt-get install linux-libc-dev:i386 libc6-dev-i386 libjpeg62-dev:i386
+#  sudo apt-get install linux-libc-dev:i386 libc6-dev-i386 libjpeg62-dev:i386 libxrandr-dev:i386
 #
 # To install ARM Cross Compiler for Raspberry PI
 #  sudo apt-get install libc6-armel-cross libc6-dev-armel-cross binutils-arm-linux-gnueabi libncurses5-dev gcc-arm-linux-gnueabihf
 #
+# To build universal binaries for macOS, you need to install the Xcode command line tools,
+# and then use the following commands to build x86_64 and arm64 binaries, then combine them into a universal binary with lipo:
+#   make macos ARCHID=16   																		# macOS x86 64 bit
+#   make macos ARCHID=29																		# macOS ARM 64 bit
+#   lipo -create -output meshagent_osx-universal-64 meshagent_osx-x86-64 meshagent_osx-arm-64	# Combine the two binaries into a universal binary
+# 
 # Special builds:
 #
 #   make linux ARCHID=6 WEBLOG=1 KVM=0      # Linux x86 64 bit, with Web Logging, and KVM disabled
@@ -804,7 +810,7 @@ freebsd:
 	$(STRIP)
 
 openbsd:
-	$(MAKE) EXENAME="$(EXENAME)_$(ARCHNAME)$(EXENAME2)" ADDITIONALSOURCES="$(LINUXKVMSOURCES)"  AID="$(ARCHID)" CFLAGS="-std=gnu99 -Wall -DJPEGMAXBUF=$(KVMMaxTile) -DMESH_AGENTID=$(ARCHID) -D_POSIX -D_FREEBSD -D_OPENBSD -DILIB_NO_TIMEDJOIN -D_NOHECI -D_NOILIBSTACKDEBUG -DMICROSTACK_PROXY -fno-strict-aliasing $(INCDIRS) $(CFLAGS) $(CEXTRA)" LDFLAGS="$(BSDSSL) $(BSDFLAGS) -L. -lpthread -lz -lutil $(LDFLAGS) $(LDEXTRA)"
+	$(MAKE) EXENAME="$(EXENAME)_$(ARCHNAME)$(EXENAME2)" ADDITIONALSOURCES="$(LINUXKVMSOURCES)"  AID="$(ARCHID)" CFLAGS="-std=gnu99 -Wall -DJPEGMAXBUF=$(KVMMaxTile) -DMESH_AGENTID=$(ARCHID) -D_POSIX -D_FREEBSD -D_OPENBSD -D_NOHECI -D_NOILIBSTACKDEBUG -DMICROSTACK_PROXY -fno-strict-aliasing $(INCDIRS) $(CFLAGS) $(CEXTRA)" LDFLAGS="$(BSDSSL) $(BSDFLAGS) -L. -lpthread -lz -lutil $(LDFLAGS) $(LDEXTRA)"
 	$(SYMBOLCP)
 	$(STRIP)
 

meshconsole/MeshConsole-2022.vcxproj

@@ -195,7 +195,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{E377F156-BAED-4086-B534-3CC43164607A}</ProjectGuid>
     <RootNamespace>MicrostackDuktape</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>MeshConsole-2022</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />