Merge upstream preserve features

.env.example

@@ -1,11 +1,19 @@
+# The IP address of your Meshtastic node
 MESHTASTIC_IP=192.168.123.123
 ADMIN_NODES='!aae8900d'
 
+# The root URL of the Meshflow API
 STORAGE_API_ROOT='http://localhost:8000'
 STORAGE_API_TOKEN=...
-
 # Features
 ENABLE_TCP_PROXY=true
+# Handshake Cache size for TCP proxy (how many historical packets to cache to allow new clients to catch up quickly)
+PROXY_HANDSHAKE_CACHE_SIZE=100
+# Rolling Cache size for TCP proxy (how many recent packets to keep in the rolling buffer)
+PROXY_ROLLING_CACHE_SIZE=100
+ENABLE_FEATURE_NODE_TOTALS=true
+FREQUENCY_OF_NODE_REPORTS=3
+CHANNEL_FOR_NODE_TOTAL_BROADCAST=2
 
 # Commands
 ENABLE_COMMAND_PING=true
@@ -17,3 +25,25 @@ ENABLE_COMMAND_WHOAMI=true
 ENABLE_COMMAND_PREFS=true
 ENABLE_COMMAND_ADMIN=true
 ENABLE_COMMAND_STATUS=true
+
+# API Version (usually 1 or 2)
+STORAGE_API_VERSION=2
+
+# Use these if you want to upload to a second API (usually used during testing)
+# STORAGE_API_2_ROOT=...
+# STORAGE_API_2_VERSION=2
+# STORAGE_API_2_TOKEN=...
+
+# Use this if you want to receive commands from the Meshflow server (e.g. traceroute)
+MESHFLOW_WS_URL=ws://localhost:8000
+
+# Comma-separated portnums to skip when submitting packets to the API (e.g. custom or rejected portnums)
+IGNORE_PORTNUMS=345,ROUTING_APP
+
+# Traceroute config (for WebSocket commands)
+TR_HOPS_LIMIT=5
+# Min seconds between traceroutes (firmware enforces ~30s; we rate-limit client-side)
+TR_MIN_INTERVAL_SEC=30
+
+# Max hops for text messages sent by the bot (1-7, default 5)
+TEXT_MESSAGE_MAX_HOPS=5

.github/pull_request_template.md

@@ -0,0 +1,26 @@
+# Summary
+
+<!--
+Describe the change for the benefit of the reviewer, and for someone
+who may be writing release notes
+
+Make sure to mention any breaking changes or manual steps which need
+to be performed when shipping to pre-prod or prod
+-->
+
+<!--
+## Background
+You can optionally add a Background section here if the change requires
+more context
+ -->
+
+## Testing performed
+
+<!--
+you don't need to evidence testing, but any testing relating
+to this change  shold be described
+
+e.g.
+* updated unit/integration tests
+* manually verified in pre-prod
+-->

.github/workflows/armv7-docker-base-image-build.yaml

@@ -20,10 +20,10 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Log in to GitHub Container Registry
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin

.github/workflows/dev.yaml

@@ -0,0 +1,34 @@
+name: dev
+
+on:
+  push:
+    branches:
+      - dev
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  extract-dev-tag:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v6
+
+      - name: Get short SHA
+        id: get_sha
+        run: |
+          SHORT_SHA=$(echo $GITHUB_SHA | cut -c1-7)
+          echo "VERSION_LABEL=dev-$SHORT_SHA" >> "$GITHUB_OUTPUT"
+
+    outputs:
+      VERSION_LABEL: ${{ steps.get_sha.outputs.VERSION_LABEL }}
+
+  build:
+    needs:
+      - extract-dev-tag
+    uses: ./.github/workflows/docker-build.yaml
+    with:
+      VERSION_LABEL: ${{ needs.extract-dev-tag.outputs.VERSION_LABEL }}
+      ENVIRONMENT: dev

.github/workflows/docker-build.yaml

@@ -3,88 +3,130 @@ name: docker-build-and-push
 on:
   workflow_call:
     inputs:
-      VERSION_TAG:
+      VERSION_LABEL:
         required: true
         type: string
-      IS_LATEST:
-        required: false
-        type: boolean
-        default: false
-      IS_PRERELEASE:
-        required: false
-        type: boolean
-        default: false
+      ENVIRONMENT:
+        required: true
+        type: string
+        description: "dev | preprod | prod"
 
+env:
+  IMAGE: ghcr.io/${{ github.repository }}
 
 permissions:
   contents: read
   packages: write
 
-
 jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-
+  build:
     strategy:
+      fail-fast: false
       matrix:
-        platform: [ linux/amd64, linux/arm/v7, linux/arm64 ]
         include:
           - platform: linux/amd64
-            base_image: "python:3.12"
-          - platform: linux/arm/v7
-            base_image: "ghcr.io/pskillen/meshtastic-bot-armv7-base:py3.12"
+            runner: ubuntu-latest
+            artifact: linux-amd64
           - platform: linux/arm64
-            base_image: "arm64v8/python:3.12"
+            runner: ubuntu-24.04-arm
+            artifact: linux-arm64
+    runs-on: ${{ matrix.runner }}
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
-      - name: Log in to GitHub Container Registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
+      - name: Build and push by digest
+        id: build
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          platforms: ${{ matrix.platform }}
+          outputs: type=image,name=${{ env.IMAGE }},push-by-digest=true,name-canonical=true,push=true
+          build-args: |
+            VERSION=${{ inputs.VERSION_LABEL }}
+          cache-from: type=gha,scope=${{ github.ref_name }}-meshtastic-bot
+          cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-meshtastic-bot
 
-      - name: Setup vars
+      - name: Export digest
         run: |
-          PLATFORM_TAG=$(echo "${{ matrix.platform }}" | sed 's|/|-|g')
-          echo "PLATFORM_TAG=$PLATFORM_TAG" >> $GITHUB_ENV
+          mkdir -p ${{ runner.temp }}/digests
+          echo "${{ steps.build.outputs.digest }}" | sed 's/^sha256://' | xargs -I{} touch "${{ runner.temp }}/digests/{}"
 
-      - name: Build and Push Docker Image
-        run: |
-          docker buildx build \
-            --platform ${{ matrix.platform }} \
-            --build-arg BASE_IMAGE=${{ matrix.base_image }} \
-            -t ghcr.io/${{ github.repository }}:${{ inputs.VERSION_TAG }}-${{ env.PLATFORM_TAG }} \
-            --push .
+      - name: Upload digest artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: digests-${{ matrix.artifact }}
+          path: ${{ runner.temp }}/digests/*
+          retention-days: 1
 
-  create-manifest:
+  merge:
+    needs: build
     runs-on: ubuntu-latest
-    needs:
-      - build-and-push
 
     steps:
       - name: Log in to GitHub Container Registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
+        uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Create and Push Multi-Arch Manifest
-        run: |
-          docker buildx imagetools create \
-            -t ghcr.io/${{ github.repository }}:${{ inputs.VERSION_TAG }} \
-            ghcr.io/${{ github.repository }}:${{ inputs.VERSION_TAG }}-linux-amd64 \
-            ghcr.io/${{ github.repository }}:${{ inputs.VERSION_TAG }}-linux-arm-v7 \
-            ghcr.io/${{ github.repository }}:${{ inputs.VERSION_TAG }}-linux-arm64 
-
-      - name: Tag as Latest or RC
-        if: ${{ inputs.IS_LATEST == true }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+
+      - name: Download digest artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: ${{ runner.temp }}/digests
+          pattern: digests-*
+          merge-multiple: true
+
+      - name: Create and push multi-arch manifest
+        working-directory: ${{ runner.temp }}/digests
         run: |
-          if [[ "${{ inputs.IS_PRERELEASE }}" == "true" ]]; then
+          DIGEST_REFS=$(printf "${{ env.IMAGE }}@sha256:%s " *)
+          if [ "${{ inputs.ENVIRONMENT }}" = "dev" ]; then
+            docker buildx imagetools create -t ${{ env.IMAGE }}:latest-dev ${DIGEST_REFS}
+          elif [ "${{ inputs.ENVIRONMENT }}" = "preprod" ]; then
             docker buildx imagetools create \
-              -t ghcr.io/${{ github.repository }}:latest-rc \
-              ghcr.io/${{ github.repository }}:${{ inputs.VERSION_TAG }}
+              -t ${{ env.IMAGE }}:${{ inputs.VERSION_LABEL }} \
+              -t ${{ env.IMAGE }}:latest-rc \
+              ${DIGEST_REFS}
           else
+            VERSION="${{ inputs.VERSION_LABEL }}"
+            MAJOR=$(echo "${VERSION}" | cut -d. -f1)
+            MINOR=$(echo "${VERSION}" | cut -d. -f2)
             docker buildx imagetools create \
-              -t ghcr.io/${{ github.repository }}:latest \
-              ghcr.io/${{ github.repository }}:${{ inputs.VERSION_TAG }}
+              -t ${{ env.IMAGE }}:${VERSION} \
+              -t ${{ env.IMAGE }}:latest \
+              -t ${{ env.IMAGE }}:${MAJOR} \
+              -t ${{ env.IMAGE }}:${MAJOR}.${MINOR} \
+              ${DIGEST_REFS}
           fi
+
+  cleanup:
+    runs-on: ubuntu-latest
+    needs:
+      - build
+      - merge
+    if: always() && !cancelled() && needs.merge.result == 'success'
+    steps:
+      - name: Delete untagged images
+        uses: Chizkiyahu/delete-untagged-ghcr-action@v6.1.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          repository_owner: ${{ github.repository_owner }}
+          package_name: meshtastic-bot
+          owner_type: user
+          untagged_only: true

.github/workflows/main.yaml

@@ -0,0 +1,34 @@
+name: Release main
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  extract-dev-tag:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v6
+
+      - name: Get short SHA
+        id: get_sha
+        run: |
+          SHORT_SHA=$(echo $GITHUB_SHA | cut -c1-7)
+          echo "VERSION_LABEL=main-$SHORT_SHA" >> "$GITHUB_OUTPUT"
+
+    outputs:
+      VERSION_LABEL: ${{ steps.get_sha.outputs.VERSION_LABEL }}
+
+  build:
+    needs:
+      - extract-dev-tag
+    uses: ./.github/workflows/docker-build.yaml
+    with:
+      VERSION_LABEL: ${{ needs.extract-dev-tag.outputs.VERSION_LABEL }}
+      ENVIRONMENT: dev

.github/workflows/pull-request.yaml

@@ -3,6 +3,10 @@ name: pull request
 on:
   pull_request:
 
+concurrency:
+  group: pr-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
 jobs:
   UnitTest:
     uses: ./.github/workflows/unit-tests.yaml