diff --git a/CHANGELOG.md b/CHANGELOG.md index c325bc00..28d79609 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,7 +62,7 @@ All notable changes to this project will be documented in this file. ### Changed - **Dependencies**: **RNS** updated to **1.2.5**, **LXMF** to **0.9.7**, **aiohttp** to **3.13.5** in Python, **requirements.txt**, **Chaquopy** metadata, and Android **build.gradle**, **micron-parser** lockfile refresh, and general **pnpm** / **package** bumps for 4.6.2. -- **Vendored LXMFy**: Refreshed `vendor/lxmfy` from upstream [LXMFy/LXMFy](https://git.quad4.io/LXMFy/LXMFy) at `0a6ba8c9fd0f306be614d0edce44e4e805c025b0` (LXMF field helpers for structured bot commands, expanded docs, and new tests). Bundled package version remains **1.6.2**. `vendor/README.txt` lists the revision pointer. +- **Vendored LXMFy**: Refreshed `vendor/lxmfy` from upstream LXMFy at `0a6ba8c9fd0f306be614d0edce44e4e805c025b0` (LXMF field helpers for structured bot commands, expanded docs, and new tests). Bundled package version remains **1.6.2**. `vendor/README.txt` lists the revision pointer. - **CI**: Docker images publish the **:latest** tag on version tag pushes, **main** and **master** branch builds are enabled, and the Bunny Storage release folder is pruned before uploads. Release descriptions now include a SHA256 checksum table for all assets. - **async_utils**: Tighter coroutine scheduling limits with **logging when work is dropped**. Removed the **Python 3.13 asyncio** compatibility patch in favor of cleaner scheduling assumptions. Adds regression tests for **HTTPS file responses** (including sendfile-style paths). - **reticulum_config**: Default Reticulum configuration is applied via **file-backed writes** instead of embedding large default text only through the previous helper path (tests updated). diff --git a/Dockerfile b/Dockerfile index 30197484..49704d18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -84,7 +84,7 @@ COPY --from=builder --chown=meshchat:meshchat /opt/venv /opt/venv COPY scripts/docker-entrypoint.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh -LABEL org.opencontainers.image.source="https://git.quad4.io/RNS-Things/MeshChatX" +LABEL org.opencontainers.image.source="https://github.com/Quad4-Software/MeshChatX" LABEL org.opencontainers.image.description="MeshChatX is a all in one Reticulum client." LABEL org.opencontainers.image.licenses="MIT AND 0BSD" LABEL org.opencontainers.image.authors="Quad4" diff --git a/Dockerfile.hardened b/Dockerfile.hardened index c8add4be..dced0cf2 100644 --- a/Dockerfile.hardened +++ b/Dockerfile.hardened @@ -74,7 +74,7 @@ RUN apk add --no-cache opus libffi shadow && \ COPY --from=builder --chown=meshchat:meshchat /opt/venv /opt/venv COPY scripts/docker_entrypoint_chainguard.py /docker-entrypoint.py -LABEL org.opencontainers.image.source="https://git.quad4.io/RNS-Things/MeshChatX" +LABEL org.opencontainers.image.source="https://github.com/Quad4-Software/MeshChatX" LABEL org.opencontainers.image.description="MeshChatX is a all in one Reticulum client." LABEL org.opencontainers.image.licenses="MIT AND 0BSD" LABEL org.opencontainers.image.authors="Quad4" diff --git a/FAQ.md b/FAQ.md index fc035eb0..a6db6629 100644 --- a/FAQ.md +++ b/FAQ.md @@ -16,7 +16,7 @@ Not for the foreseeable future. MeshChatX will continue to use the official Reti **Can you move your repository under a community organization?** -No. Until the day I stop maintaining MeshChatX, it will remain under Quad4 control. The official source code is both on `git.quad4.io` and on Reticulum via rngit, while GitHub and other places are mirrors only. You are always welcome to fork if you do not like the way I do things. +No. Until the day I stop maintaining MeshChatX, it will remain under Quad4 control. The official source code is available at `github.com/Quad4-Software/MeshChatX` and `lavaforge.org/Reticulum-Things/MeshChatX`, and also on Reticulum via rngit; all other places are mirrors. You are always welcome to fork if you do not like the way I do things. **Why are PRs disabled on GitHub?** diff --git a/README.md b/README.md index 54abf7c0..0eb24e0f 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ A extensively modified and feature-rich fork of [Reticulum MeshChat](https://git This project is independent from the original Reticulum MeshChat project and is not affiliated with it. - Website: [meshchatx.com](https://meshchatx.com) -- Source: [git.quad4.io/RNS-Things/MeshChatX](https://git.quad4.io/RNS-Things/MeshChatX) -- Official GitHub Mirror: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) +- Source: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) +- Mirror: [lavaforge.org/Reticulum-Things/MeshChatX](https://lavaforge.org/Reticulum-Things/MeshChatX) - Releases: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) - Changelog: [`CHANGELOG.md`](CHANGELOG.md) - Donate: [`donate.md`](donate.md) ([Donation](#donation)) @@ -156,7 +156,7 @@ pipx install ./reticulum_meshchatx-*-py3-none-any.whl Use this when developing or when you need a local custom build. ```bash -git clone https://git.quad4.io/RNS-Things/MeshChatX.git +git clone https://github.com/Quad4-Software/MeshChatX.git cd MeshChatX corepack enable pnpm config set verify-store-integrity true diff --git a/docs/meshchatx_on_android_with_termux.md b/docs/meshchatx_on_android_with_termux.md index e4e10c32..9048d00e 100644 --- a/docs/meshchatx_on_android_with_termux.md +++ b/docs/meshchatx_on_android_with_termux.md @@ -20,7 +20,7 @@ pkg install build-essential ### Download and Install Wheel -Download the latest wheel from the [releases page](https://git.quad4.io/RNS-Things/MeshChatX/releases), then: +Download the latest wheel from the [releases page](https://github.com/Quad4-Software/MeshChatX/releases), then: ``` pip install reticulum_meshchatx-*-py3-none-any.whl @@ -64,7 +64,7 @@ corepack prepare pnpm@latest --activate ### Clone and Build ``` -git clone https://git.quad4.io/RNS-Things/MeshChatX.git +git clone https://github.com/Quad4-Software/MeshChatX.git cd MeshChatX pip install uv uv sync --group dev diff --git a/forge.config.js b/forge.config.js index a11254dc..119870af 100644 --- a/forge.config.js +++ b/forge.config.js @@ -58,7 +58,7 @@ module.exports = { config: { options: { maintainer: "Quad4", - homepage: "https://git.quad4.io/RNS-Things/MeshChatX", + homepage: "https://github.com/Quad4-Software/MeshChatX", categories: ["Network"], }, }, diff --git a/lang/README.de.md b/lang/README.de.md index 8cdcb365..1dd00c44 100644 --- a/lang/README.de.md +++ b/lang/README.de.md @@ -7,8 +7,8 @@ Ein umfassend modifizierter und funktionsreicher Fork von Reticulum MeshChat von Dieses Projekt ist unabhaengig vom originalen Reticulum MeshChat und steht in keiner Verbindung dazu. - Website: [meshchatx.com](https://meshchatx.com) -- Quellcode: [git.quad4.io/RNS-Things/MeshChatX](https://git.quad4.io/RNS-Things/MeshChatX) -- Offizielles GitHub-Mirror: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) +- Quellcode: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) +- Mirror: [lavaforge.org/Reticulum-Things/MeshChatX](https://lavaforge.org/Reticulum-Things/MeshChatX) - Releases: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) - Aenderungsprotokoll: [`CHANGELOG.md`](../CHANGELOG.md) - Spenden: [`donate.md`](../donate.md) ([Spenden](#spenden)) @@ -161,7 +161,7 @@ pipx install ./reticulum_meshchatx-*-py3-none-any.whl Fuer Entwicklung oder lokale Custom-Builds. ```bash -git clone https://git.quad4.io/RNS-Things/MeshChatX.git +git clone https://github.com/Quad4-Software/MeshChatX.git cd MeshChatX corepack enable pnpm config set verify-store-integrity true diff --git a/lang/README.it.md b/lang/README.it.md index e981ea6a..1c58b9ef 100644 --- a/lang/README.it.md +++ b/lang/README.it.md @@ -7,8 +7,8 @@ Un fork ampiamente modificato e ricco di funzionalita di Reticulum MeshChat di L Questo progetto e indipendente dal progetto originale Reticulum MeshChat e non e affiliato ad esso. - Sito web: [meshchatx.com](https://meshchatx.com) -- Codice sorgente: [git.quad4.io/RNS-Things/MeshChatX](https://git.quad4.io/RNS-Things/MeshChatX) -- Mirror ufficiale su GitHub: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) +- Codice sorgente: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) +- Mirror: [lavaforge.org/Reticulum-Things/MeshChatX](https://lavaforge.org/Reticulum-Things/MeshChatX) - Release: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) - Changelog: [`CHANGELOG.md`](../CHANGELOG.md) - Donazioni: [`donate.md`](../donate.md) ([Donazioni](#donazioni)) @@ -161,7 +161,7 @@ pipx install ./reticulum_meshchatx-*-py3-none-any.whl Per sviluppo o build locali personalizzate. ```bash -git clone https://git.quad4.io/RNS-Things/MeshChatX.git +git clone https://github.com/Quad4-Software/MeshChatX.git cd MeshChatX corepack enable pnpm config set verify-store-integrity true diff --git a/lang/README.ja.md b/lang/README.ja.md index ef307322..ff5f2d39 100644 --- a/lang/README.ja.md +++ b/lang/README.ja.md @@ -7,8 +7,8 @@ Liam Cottle 氏による Reticulum MeshChat を大幅に改修・機能拡張し 本プロジェクトはオリジナルの Reticulum MeshChat とは独立しており、提携関係にありません。 - ウェブサイト: [meshchatx.com](https://meshchatx.com) -- ソースコード: [git.quad4.io/RNS-Things/MeshChatX](https://git.quad4.io/RNS-Things/MeshChatX) -- 公式 GitHub ミラー: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) +- ソースコード: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) +- ミラー: [lavaforge.org/Reticulum-Things/MeshChatX](https://lavaforge.org/Reticulum-Things/MeshChatX) - リリース: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) - 変更履歴: [`CHANGELOG.md`](../CHANGELOG.md) - 寄付: [`donate.md`](../donate.md) ([寄付](#寄付)) @@ -161,7 +161,7 @@ pipx install ./reticulum_meshchatx-*-py3-none-any.whl 開発時やローカルのカスタムビルド向け。 ```bash -git clone https://git.quad4.io/RNS-Things/MeshChatX.git +git clone https://github.com/Quad4-Software/MeshChatX.git cd MeshChatX corepack enable pnpm config set verify-store-integrity true diff --git a/lang/README.ru.md b/lang/README.ru.md index 11cab696..60b266ad 100644 --- a/lang/README.ru.md +++ b/lang/README.ru.md @@ -7,8 +7,8 @@ Этот проект независим от оригинального Reticulum MeshChat и не связан с ним. - Сайт: [meshchatx.com](https://meshchatx.com) -- Исходный код: [git.quad4.io/RNS-Things/MeshChatX](https://git.quad4.io/RNS-Things/MeshChatX) -- Официальное зеркало на GitHub: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) +- Исходный код: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) +- Зеркало: [lavaforge.org/Reticulum-Things/MeshChatX](https://lavaforge.org/Reticulum-Things/MeshChatX) - Релизы: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) - Журнал изменений: [`CHANGELOG.md`](../CHANGELOG.md) - Поддержка проекта: [`donate.md`](../donate.md) ([Поддержка проекта](#поддержка-проекта)) @@ -161,7 +161,7 @@ pipx install ./reticulum_meshchatx-*-py3-none-any.whl Для разработки или локальной сборки. ```bash -git clone https://git.quad4.io/RNS-Things/MeshChatX.git +git clone https://github.com/Quad4-Software/MeshChatX.git cd MeshChatX corepack enable pnpm config set verify-store-integrity true diff --git a/lang/README.zh.md b/lang/README.zh.md index 38d25408..f7fcef80 100644 --- a/lang/README.zh.md +++ b/lang/README.zh.md @@ -7,8 +7,8 @@ Liam Cottle 开发的 Reticulum MeshChat 的一个功能丰富的深度修改分 本项目独立于原始 Reticulum MeshChat 项目，与其无关联。 - 网站: [meshchatx.com](https://meshchatx.com) -- 源码: [git.quad4.io/RNS-Things/MeshChatX](https://git.quad4.io/RNS-Things/MeshChatX) -- 官方 GitHub 镜像: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) +- 源码: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) +- 镜像: [lavaforge.org/Reticulum-Things/MeshChatX](https://lavaforge.org/Reticulum-Things/MeshChatX) - 发行版: [github.com/Quad4-Software/MeshChatX](https://github.com/Quad4-Software/MeshChatX) - 变更日志: [`CHANGELOG.md`](../CHANGELOG.md) - 捐赠: [`donate.md`](../donate.md) ([捐赠](#捐赠)) @@ -161,7 +161,7 @@ pipx install ./reticulum_meshchatx-*-py3-none-any.whl 在开发或需要本地定制构建时使用。 ```bash -git clone https://git.quad4.io/RNS-Things/MeshChatX.git +git clone https://github.com/Quad4-Software/MeshChatX.git cd MeshChatX corepack enable pnpm config set verify-store-integrity true diff --git a/meshchatx/src/frontend/public/meshchatx-docs/meshchatx_on_android_with_termux.md b/meshchatx/src/frontend/public/meshchatx-docs/meshchatx_on_android_with_termux.md index e4e10c32..9048d00e 100644 --- a/meshchatx/src/frontend/public/meshchatx-docs/meshchatx_on_android_with_termux.md +++ b/meshchatx/src/frontend/public/meshchatx-docs/meshchatx_on_android_with_termux.md @@ -20,7 +20,7 @@ pkg install build-essential ### Download and Install Wheel -Download the latest wheel from the [releases page](https://git.quad4.io/RNS-Things/MeshChatX/releases), then: +Download the latest wheel from the [releases page](https://github.com/Quad4-Software/MeshChatX/releases), then: ``` pip install reticulum_meshchatx-*-py3-none-any.whl @@ -64,7 +64,7 @@ corepack prepare pnpm@latest --activate ### Clone and Build ``` -git clone https://git.quad4.io/RNS-Things/MeshChatX.git +git clone https://github.com/Quad4-Software/MeshChatX.git cd MeshChatX pip install uv uv sync --group dev diff --git a/meshchatx/src/frontend/public/meshchatx-docs/meshchatx_on_raspberry_pi.md b/meshchatx/src/frontend/public/meshchatx-docs/meshchatx_on_raspberry_pi.md index 1d23b6c0..b8ab6464 100644 --- a/meshchatx/src/frontend/public/meshchatx-docs/meshchatx_on_raspberry_pi.md +++ b/meshchatx/src/frontend/public/meshchatx-docs/meshchatx_on_raspberry_pi.md @@ -8,7 +8,7 @@ This install path uses a release wheel, which already includes frontend assets. ## Automated Setup Scripts ```bash -curl -fsSL 'https://git.quad4.io/RNS-Things/MeshChatX/raw/branch/master/scripts/rpi/install_meshchatx.sh' | bash +curl -fsSL 'https://github.com/Quad4-Software/MeshChatX/raw/branch/master/scripts/rpi/install_meshchatx.sh' | bash ``` If you have the repo cloned locally already: @@ -71,7 +71,7 @@ pipx install /path/to/reticulum_meshchatx--py3-none-any.whl Direct example (v4.4.0): ```bash -pipx install "https://git.quad4.io/RNS-Things/MeshChatX/releases/download/v4.4.0/reticulum_meshchatx-4.4.0-py3-none-any.whl" +pipx install "https://github.com/Quad4-Software/MeshChatX/releases/download/v4.4.0/reticulum_meshchatx-4.4.0-py3-none-any.whl" ``` `py3-none-any` wheels are architecture-independent, so the same wheel artifact @@ -93,7 +93,7 @@ cd ~/meshchatx python3 -m venv .venv source .venv/bin/activate python -m pip install --upgrade pip -python -m pip install "https://git.quad4.io/RNS-Things/MeshChatX/releases/download/v4.4.0/reticulum_meshchatx-4.4.0-py3-none-any.whl" +python -m pip install "https://github.com/Quad4-Software/MeshChatX/releases/download/v4.4.0/reticulum_meshchatx-4.4.0-py3-none-any.whl" ``` Run command in venv mode: diff --git a/package.json b/package.json index 45bc32f0..34f1f310 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "reticulum-meshchatx", "version": "4.6.3", "description": "A simple mesh network communications app powered by the Reticulum Network Stack", - "homepage": "https://git.quad4.io/RNS-Things/MeshChatX", + "homepage": "https://github.com/Quad4-Software/MeshChatX", "desktopName": "reticulum-meshchatx.desktop", "author": { "name": "Quad4" diff --git a/packaging/arch/.SRCINFO b/packaging/arch/.SRCINFO index 5eb92253..ec4bf6c0 100644 --- a/packaging/arch/.SRCINFO +++ b/packaging/arch/.SRCINFO @@ -2,7 +2,7 @@ pkgbase = reticulum-meshchatx-git pkgdesc = A simple mesh network communications app powered by the Reticulum Network Stack pkgver = 4.2.1.r28.gdde0442 pkgrel = 1 - url = https://git.quad4.io/RNS-Things/MeshChatX + url = https://github.com/Quad4-Software/MeshChatX arch = x86_64 arch = aarch64 license = 0BSD @@ -18,7 +18,7 @@ pkgbase = reticulum-meshchatx-git depends = espeak-ng provides = reticulum-meshchatx conflicts = reticulum-meshchatx - source = reticulum-meshchatx::git+https://git.quad4.io/RNS-Things/MeshChatX.git + source = reticulum-meshchatx::git+https://github.com/Quad4-Software/MeshChatX.git source = reticulum-meshchatx.desktop sha256sums = SKIP sha256sums = 366182e198df672bb51893f7cf7f339079bf80319c24c107216c1b96d33fd267 diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index aced0d2d..5401c466 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -5,13 +5,13 @@ pkgver=4.6.3.r0.gebacc00 pkgrel=1 pkgdesc="A simple mesh network communications app powered by the Reticulum Network Stack" arch=('x86_64' 'aarch64') -url="https://git.quad4.io/RNS-Things/MeshChatX" +url="https://github.com/Quad4-Software/MeshChatX" license=('0BSD' 'MIT') depends=('opus' 'opusfile' 'portaudio' 'espeak-ng') makedepends=('git' 'nodejs' 'pnpm' 'python' 'python-poetry') provides=("$_pkgname") conflicts=("$_pkgname") -source=("$_pkgname::git+https://git.quad4.io/RNS-Things/MeshChatX.git" +source=("$_pkgname::git+https://github.com/Quad4-Software/MeshChatX.git" "reticulum-meshchatx.desktop") sha256sums=('SKIP' '366182e198df672bb51893f7cf7f339079bf80319c24c107216c1b96d33fd267') diff --git a/pyproject.toml b/pyproject.toml index c157468a..a23e96a3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,7 +44,7 @@ meshchatx-repository-http = "meshchatx.repository_http_standalone:main" lxmfy = "lxmfy.cli:main" [project.urls] -Homepage = "https://git.quad4.io/RNS-Things/MeshChatX" +Homepage = "https://github.com/Quad4-Software/MeshChatX" [tool.setuptools.packages.find] where = [".", "vendor/lxmfy"]