Merge pull request #8 from Sudo-Ivan/debian-packaging

Add debian packaging support.

.github/workflows/build.yml

@@ -12,53 +12,15 @@ jobs:
       contents: write
     steps:
       - name: Clone Repo
-        uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1
+        uses: actions/checkout@v1
 
       - name: Install NodeJS
-        uses: actions/setup-node@f1f314fca9dfce2769ece7d933488f076716723e # v1
+        uses: actions/setup-node@v1
-        with:
-          node-version: 22
-
-      - name: Install Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
-        with:
-          python-version: "3.13"
-
-      - name: Install Python Deps
-        run: pip install -r requirements.txt
-
-      - name: Install NodeJS Deps
-        run: npm install
-
-      - name: Build Electron App
-        run: npm run dist
-
-      - name: Create Release
-        id: create_release
-        uses: ncipollo/release-action@b7eabc95ff50cbeeedec83973935c8f306dfcd0b # v1
-        with:
-          draft: true
-          allowUpdates: true
-          replacesArtifacts: true
-          omitDraftDuringUpdate: true
-          omitNameDuringUpdate: true
-          artifacts: "dist/*-win-installer.exe,dist/*-win-portable.exe"
-
-  build_mac:
-    runs-on: macos-13
-    permissions:
-      contents: write
-    steps:
-      - name: Clone Repo
-        uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1
-
-      - name: Install NodeJS
-        uses: actions/setup-node@f1f314fca9dfce2769ece7d933488f076716723e # v1
         with:
           node-version: 18
 
       - name: Install Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
 
@@ -73,7 +35,45 @@ jobs:
 
       - name: Create Release
         id: create_release
-        uses: ncipollo/release-action@b7eabc95ff50cbeeedec83973935c8f306dfcd0b # v1
+        uses: ncipollo/release-action@v1
+        with:
+          draft: true
+          allowUpdates: true
+          replacesArtifacts: true
+          omitDraftDuringUpdate: true
+          omitNameDuringUpdate: true
+          artifacts: "dist/*-win-installer.exe,dist/*-win-portable.exe"
+
+  build_mac:
+    runs-on: macos-13
+    permissions:
+      contents: write
+    steps:
+      - name: Clone Repo
+        uses: actions/checkout@v1
+
+      - name: Install NodeJS
+        uses: actions/setup-node@v1
+        with:
+          node-version: 18
+
+      - name: Install Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install Python Deps
+        run: pip install -r requirements.txt
+
+      - name: Install NodeJS Deps
+        run: npm install
+
+      - name: Build Electron App
+        run: npm run dist
+
+      - name: Create Release
+        id: create_release
+        uses: ncipollo/release-action@v1
         with:
           draft: true
           allowUpdates: true
@@ -88,17 +88,17 @@ jobs:
       contents: write
     steps:
       - name: Clone Repo
-        uses: actions/checkout@50fbc622fc4ef5163becd7fab6573eac35f8462e # v1
+        uses: actions/checkout@v1
 
       - name: Install NodeJS
-        uses: actions/setup-node@f1f314fca9dfce2769ece7d933488f076716723e # v1
+        uses: actions/setup-node@v1
         with:
-          node-version: 22
+          node-version: 18
 
       - name: Install Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.13"
+          python-version: "3.11"
 
       - name: Install Python Deps
         run: pip install -r requirements.txt
@@ -111,7 +111,7 @@ jobs:
 
       - name: Create Release
         id: create_release
-        uses: ncipollo/release-action@b7eabc95ff50cbeeedec83973935c8f306dfcd0b # v1
+        uses: ncipollo/release-action@v1
         with:
           draft: true
           allowUpdates: true
@@ -127,34 +127,31 @@ jobs:
       contents: read
     steps:
       - name: Clone Repo
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
+        uses: actions/checkout@v4
-
-      - name: Set lowercase repository owner
-        run: echo "REPO_OWNER_LC=${GITHUB_REPOSITORY_OWNER,,}" >> $GITHUB_ENV
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to the GitHub Container registry
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker images
-        uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5
+        uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: >-
+          tags: |
-            ghcr.io/${{ env.REPO_OWNER_LC }}/reticulum-meshchat:latest,
+            ghcr.io/liamcottle/reticulum-meshchat:latest
-            ghcr.io/${{ env.REPO_OWNER_LC }}/reticulum-meshchat:${{ github.ref_name }}
+            ghcr.io/liamcottle/reticulum-meshchat:${{ github.ref_name }}
-          labels: >-
+          labels: |
-            org.opencontainers.image.title=Reticulum MeshChat,
+            org.opencontainers.image.title=Reticulum MeshChat
-            org.opencontainers.image.description=Docker image for Reticulum MeshChat,
+            org.opencontainers.image.description=Docker image for Reticulum MeshChat
-            org.opencontainers.image.url=https://github.com/${{ github.repository }}/pkgs/container/reticulum-meshchat/
+            org.opencontainers.image.url=https://github.com/liamcottle/reticulum-meshchat/pkgs/container/reticulum-meshchat/

.github/workflows/manual-docker-build.yml

@@ -11,35 +11,32 @@ jobs:
       contents: read
     steps:
       - name: Clone Repo
-        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
+        uses: actions/checkout@v4
-
-      - name: Set lowercase repository owner
-        run: echo "REPO_OWNER_LC=${GITHUB_REPOSITORY_OWNER,,}" >> $GITHUB_ENV
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to the GitHub Container registry
-        uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker images
-        uses: docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25 # v5
+        uses: docker/build-push-action@v5
         with:
           context: .
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: >-
+          tags: |
-            ghcr.io/${{ env.REPO_OWNER_LC }}/reticulum-meshchat:latest,
+            ghcr.io/liamcottle/reticulum-meshchat:latest
-            ghcr.io/${{ env.REPO_OWNER_LC }}/reticulum-meshchat:${{ github.ref_name }}
+            ghcr.io/liamcottle/reticulum-meshchat:${{ github.ref_name }}
-          labels: >-
+          labels: |
-            org.opencontainers.image.title=Reticulum MeshChat,
+            org.opencontainers.image.title=Reticulum MeshChat
-            org.opencontainers.image.description=Docker image for Reticulum MeshChat,
+            org.opencontainers.image.description=Docker image for Reticulum MeshChat
-            org.opencontainers.image.url=https://github.com/${{ github.repository }}/pkgs/container/reticulum-meshchat/
+            org.opencontainers.image.url=https://github.com/liamcottle/reticulum-meshchat/pkgs/container/reticulum-meshchat/
 

meshchat.py

@@ -374,13 +374,6 @@ class ReticulumMeshChat:
                 if "interface_enabled" in interface:
                     interface["interface_enabled"] = "true"
 
-                keys_to_remove = []
-                for key, value in interface.items():
-                    if value is None:
-                        keys_to_remove.append(key)
-                for key in keys_to_remove:
-                    del interface[key]
-
             # save config
             self.reticulum.config.write()
 
@@ -404,13 +397,6 @@ class ReticulumMeshChat:
                 if "interface_enabled" in interface:
                     interface["interface_enabled"] = "false"
 
-                keys_to_remove = []
-                for key, value in interface.items():
-                    if value is None:
-                        keys_to_remove.append(key)
-                for key in keys_to_remove:
-                    del interface[key]
-
             # save config
             self.reticulum.config.write()
 
@@ -522,7 +508,7 @@ class ReticulumMeshChat:
             # handle I2P interface
             if interface_type == "I2PInterface":
                 interface_details['connectable'] = "True"
-                InterfaceEditor.update_value(interface_details, data, "peers")
+                interface_details["peers"] = data.get('peers')
 
             # handle tcp server interface
             if interface_type == "TCPServerInterface":

package.json

@@ -17,7 +17,7 @@
     "node": ">=18"
   },
   "devDependencies": {
-    "electron": "^35.7.5",
+    "electron": "^30.0.8",
     "electron-builder": "^24.6.3"
   },
   "build": {
@@ -102,7 +102,7 @@
     "@tailwindcss/forms": "^0.5.9",
     "@vitejs/plugin-vue": "^5.2.1",
     "autoprefixer": "^10.4.20",
-    "axios": "^1.12.0",
+    "axios": "^1.10.0",
     "click-outside-vue3": "^4.0.1",
     "compressorjs": "^1.2.1",
     "electron-prompt": "^1.7.0",
@@ -114,7 +114,7 @@
     "tailwindcss": "^3.4.17",
     "vis-data": "^7.1.9",
     "vis-network": "^9.1.9",
-    "vite": "^6.4.1",
+    "vite": "^6.0.5",
     "vite-plugin-vuetify": "^2.0.4",
     "vue-router": "^4.5.0",
     "vuetify": "^3.7.6"

requirements.txt

@@ -1,6 +1,6 @@
 aiohttp>=3.12.14
 cx_freeze>=7.0.0
-lxmf>=0.9.2
+lxmf>=0.8.0
 peewee>=3.18.1
-rns>=1.0.1
+rns>=1.0.0
 websockets>=14.2