Compare commits

...

33 Commits

Author SHA1 Message Date
dea21b8515 Update README 2025-11-30 21:03:27 -06:00
deepsource-io[bot]
c14619e3e3 ci: add .deepsource.toml 2025-12-01 03:01:23 +00:00
bc20f85cbf Update README 2025-11-30 21:00:11 -06:00
8ec7acd57e Refactor error handling and improve code clarity
- Updated exception handling across multiple files to specify Exception type, enhancing clarity and maintainability.
- Renamed several route handler functions in meshchat.py for better readability and consistency.
- Added noqa comments to suppress linting warnings for specific lines in database.py and other files.
2025-11-30 21:00:04 -06:00
59e76de4cc update docker-compose 2025-11-30 20:59:54 -06:00
cc30e6abc1 code cleanup 2025-11-30 20:51:30 -06:00
6dffe70e9b update UI/UX 2025-11-30 20:44:15 -06:00
c054d16f08 Add destination blocking feature in AudioCallManager
- Modified AudioCallManager to accept a callback for checking if a destination is blocked.
- Implemented logic in AudioCallReceiver to reject incoming calls from blocked sources based on the provided callback.
- Enhanced error handling for remote identity retrieval during call connection.
2025-11-30 20:42:32 -06:00
1dbd9a5697 update Makefile 2025-11-30 20:42:23 -06:00
65d6656f47 Refactor executable path resolution in Electron main process
- Updated the executable name to include 'X' for compatibility with setup.py.
- Enhanced the logic to determine the executable path by checking multiple possible locations for both packaged and development modes.
- Added error handling to log and display a message if the executable cannot be found.
2025-11-30 20:42:15 -06:00
a3cb84fa06 Implement spam and blocking features in database and API
- Incremented database version to 6 and added 'is_spam' column to LxmfMessage model.
- Introduced BlockedDestination and SpamKeyword models for managing blocked destinations and spam keywords.
- Added API endpoints for managing blocked destinations and spam keywords, including create, read, and delete operations.
- Enhanced message handling to mark messages as spam based on keywords and block messages from blocked sources.
2025-11-30 20:41:48 -06:00
5fcc86d65a Update dependencies and enhance package configuration
- Upgraded Electron from version 35.7.5 to 39.2.4.
- Updated baseline-browser-mapping and electron-to-chromium to their latest versions.
- Improved package description and author information in package.json.
- Changed build-backend script to use virtual environment Python.
- Enabled ASAR packaging and specified unpacking rules for build files.
2025-11-30 20:41:36 -06:00
253872eb57 update 2025-11-30 20:41:19 -06:00
609a7ede6c update Makefil 2025-11-30 20:25:09 -06:00
49b9bd7782 Update README 2025-11-30 20:15:41 -06:00
c83b90f4f8 Enhance Network Visualiser UI and functionality
- Redesigned control panel for better accessibility and aesthetics.
- Added loading state for update button and improved tooltip styles.
- Introduced conversation fetching and icon generation for user nodes.
- Updated node and edge styling for improved visibility and user experience.
- Enhanced sidebar search functionality to display dynamic placeholder text.
2025-11-30 20:13:41 -06:00
d48a6d9620 Rnode flasher updates 2025-11-30 19:59:56 -06:00
ef80e7a7c4 UI/UX Updates 2025-11-30 19:59:44 -06:00
5967cd827f update ui/ux 2025-11-30 19:38:17 -06:00
52558a7167 update rnode flasher tool page 2025-11-30 19:38:01 -06:00
24194d7e98 adjust scrollbars 2025-11-30 19:18:18 -06:00
273ecfbbbf Update 2025-11-30 19:15:11 -06:00
c65cb04da9 Overhual entire codebase part 1
- Big UI/UX changes
- Improved Config parser
- Some minor improvements and changes
2025-11-30 19:09:08 -06:00
919d191e61 Add download cancellation feature for nomadnet files and pages
- Implemented tracking for active downloads with unique IDs.
- Added functionality to cancel ongoing downloads from the client side.
- Updated UI to include cancel buttons for file and page downloads.
- Enhanced download success, failure, and progress handling to include download IDs for better tracking.
2025-11-28 13:42:25 -06:00
5374a62e96 Update package-lock.json to version 2.32.3, reflecting the version change from 2.32.2. 2025-11-25 12:22:19 -06:00
2e0dfe8700 Update package.json to version 2.32.3 2025-11-25 12:19:52 -06:00
2f30be1490 remove workflow 2025-11-25 12:19:45 -06:00
79aa2bbaa5 Fix Interface error 2025-11-25 12:18:43 -06:00
c92a86015c Update package.json and package-lock.json to version 2.32.2, including dependency updates for Vue and Vuetify packages. 2025-11-25 12:05:36 -06:00
432845195d Update requirements.txt: bump rns version from 1.0.3 to 1.0.4 2025-11-25 12:04:26 -06:00
50a1bf6b3f Fix setup.py: Make build relocatable and portable by adding path replacement and zipping packages 2025-11-25 12:04:05 -06:00
8c39fdf190 Update build.yml: Change Python version from 3.13 to 3.12 2025-11-25 12:03:48 -06:00
9e352e5058 fix prop node app data parsing 2025-11-21 11:51:14 -06:00
55 changed files with 6412 additions and 3124 deletions

10
.deepsource.toml Normal file
View File

@@ -0,0 +1,10 @@
version = 1
[[analyzers]]
name = "python"
[analyzers.meta]
runtime_version = "3.x.x"
[[analyzers]]
name = "docker"

View File

@@ -1,29 +0,0 @@
name: Bearer Master
on:
push:
branches:
- master
permissions:
security-events: write
jobs:
rule_check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
- name: Bearer
uses: bearer/bearer-action@828eeb928ce2f4a7ca5ed57fb8b59508cb8c79bc # v2
with:
format: sarif
output: results.sarif
- name: Upload SARIF file
if: always()
uses: github/codeql-action/upload-sarif@2827891b2e5e0510dceab8c3619f4fe255451277 # v4
with:
sarif_file: results.sarif
category: bearer-security-scan

View File

@@ -22,10 +22,13 @@ jobs:
- name: Install Python - name: Install Python
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5 uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
with: with:
python-version: "3.13" python-version: "3.12"
- name: Install Python Deps - name: Install Python Deps
run: pip install -r requirements.txt run: |
python -m venv venv
venv\Scripts\pip install --upgrade pip
venv\Scripts\pip install -r requirements.txt
- name: Install NodeJS Deps - name: Install NodeJS Deps
run: npm install run: npm install
@@ -63,7 +66,10 @@ jobs:
python-version: "3.11" python-version: "3.11"
- name: Install Python Deps - name: Install Python Deps
run: pip install -r requirements.txt run: |
python3 -m venv venv
venv/bin/pip install --upgrade pip
venv/bin/pip install -r requirements.txt
- name: Install NodeJS Deps - name: Install NodeJS Deps
run: npm install run: npm install
@@ -98,10 +104,16 @@ jobs:
- name: Install Python - name: Install Python
uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5 uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
with: with:
python-version: "3.13" python-version: "3.12"
- name: Install patchelf
run: sudo apt-get update && sudo apt-get install -y patchelf
- name: Install Python Deps - name: Install Python Deps
run: pip install -r requirements.txt run: |
python3 -m venv venv
venv/bin/pip install --upgrade pip
venv/bin/pip install -r requirements.txt
- name: Install NodeJS Deps - name: Install NodeJS Deps
run: npm install run: npm install

View File

@@ -1,23 +1,41 @@
.PHONY: install run clean .PHONY: install run clean build build-appimage build-exe dist
VENV = venv VENV = venv
PYTHON = $(VENV)/bin/python PYTHON = $(VENV)/bin/python
PIP = $(VENV)/bin/pip PIP = $(VENV)/bin/pip
NPM = npm
install: $(VENV) install: $(VENV) node_modules
npm install
$(VENV): $(VENV):
python3 -m venv $(VENV) python3 -m venv $(VENV)
$(PIP) install --upgrade pip $(PIP) install --upgrade pip
$(PIP) install -r requirements.txt $(PIP) install -r requirements.txt
node_modules:
$(NPM) install
run: install run: install
$(PYTHON) meshchat.py $(PYTHON) meshchat.py
build: install
$(NPM) run build
build-appimage: build
$(NPM) run electron-postinstall
$(NPM) run dist -- --linux AppImage
build-exe: build
$(NPM) run electron-postinstall
$(NPM) run dist -- --win portable
dist: build-appimage
clean: clean:
rm -rf $(VENV) rm -rf $(VENV)
rm -rf node_modules rm -rf node_modules
rm -rf build
rm -rf dist

View File

@@ -1,13 +1,22 @@
# Reticulum MeshChatX # Reticulum MeshChatX
Custom fork of [Reticulum MeshChat](https://github.com/liamcottle/reticulum-meshchat) A heavily customized fork of [Reticulum MeshChat](https://github.com/liamcottle/reticulum-meshchat), any meaningful, stable and tested modifications will be submitted as a PR upstream.
## Features of this fork ## Features of this fork
- More stats in about page. - [x] Custom UI/UX (actively being improved)
- Exe and Appimage builds with Python 3.13 and Node.js 22 - [x] Ability to set inbound and propagation node stamps.
- Actions are pinned to full-length SHA hashes. - [x] Better config parsing.
- Docker images are smaller and use SHA256 hashes for the images. - [x] Cancel page fetching or file downloads
- [x] Block recieving messages from users.
- [ ] Spam filter (based on keywords)
- [ ] Multi-identity support.
- [x] More stats on about page.
- [x] Actions are pinned to full-length SHA hashes.
- [x] Docker images are smaller and use SHA256 hashes for the images.
- [x] Electron improvements.
- [x] Latest updates for NPM and Python dependencies (bleeding edge)
- [x] Ruff linting, CodeQL Advanced and Bearer SAST fixes.
## Usage ## Usage

31
TODO.md Normal file
View File

@@ -0,0 +1,31 @@
1. for messages fix:
convo goes off edge, near edge should be ... 3 dots
long names push the last message/announced seconds/time to right and nearly off the side, fix please
2. interfaces:
3 dots background circle is a oval, fix to be circle
on 3 dots clicked there is still white background the buttons have dark backgrounds though but main dropdown window is white fix depdning on theme
also on 3 dots drop down it still makes me scroll down in that interfaces window, we can expand that interfaces box os something so this crap doesnt hapen or if dropdown is above it
rework propagation nodes page with new UI/UX please like rest of app.
1. the attachment dropups/popups are white on dark mode, they need a ui/ux rework.
2. for settings add ability to set inbound stamp, ref lxmf via python -c if needed.
3. add multi-identity / account suport and a switcher at bottom with ability to create, delete or import/export identies from other apps.
for all this you will likely need to look at my ren chat app for stamps, multi-identity, /mnt/projects/ren-messenger/
its pretty simple.
translator tool
reticulum documentation tool
lxmfy bot tool
page downloader tool
page snapshots

View File

@@ -1,60 +1,73 @@
from datetime import datetime, timezone from datetime import datetime, timezone
from peewee import * from peewee import * # noqa: F403
from playhouse.migrate import migrate as migrate_database, SqliteMigrator from playhouse.migrate import SqliteMigrator
from playhouse.migrate import migrate as migrate_database
latest_version = 5 # increment each time new database migrations are added latest_version = 6 # increment each time new database migrations are added
database = DatabaseProxy() # use a proxy object, as we will init real db client inside meshchat.py database = (
DatabaseProxy() # noqa: F405
) # use a proxy object, as we will init real db client inside meshchat.py
migrator = SqliteMigrator(database) migrator = SqliteMigrator(database)
# migrates the database # migrates the database
def migrate(current_version): def migrate(current_version):
# migrate to version 2 # migrate to version 2
if current_version < 2: if current_version < 2:
migrate_database( migrate_database(
migrator.add_column("lxmf_messages", 'delivery_attempts', LxmfMessage.delivery_attempts), migrator.add_column(
migrator.add_column("lxmf_messages", 'next_delivery_attempt_at', LxmfMessage.next_delivery_attempt_at), "lxmf_messages", "delivery_attempts", LxmfMessage.delivery_attempts,
),
migrator.add_column(
"lxmf_messages",
"next_delivery_attempt_at",
LxmfMessage.next_delivery_attempt_at,
),
) )
# migrate to version 3 # migrate to version 3
if current_version < 3: if current_version < 3:
migrate_database( migrate_database(
migrator.add_column("lxmf_messages", 'rssi', LxmfMessage.rssi), migrator.add_column("lxmf_messages", "rssi", LxmfMessage.rssi),
migrator.add_column("lxmf_messages", 'snr', LxmfMessage.snr), migrator.add_column("lxmf_messages", "snr", LxmfMessage.snr),
migrator.add_column("lxmf_messages", 'quality', LxmfMessage.quality), migrator.add_column("lxmf_messages", "quality", LxmfMessage.quality),
) )
# migrate to version 4 # migrate to version 4
if current_version < 4: if current_version < 4:
migrate_database( migrate_database(
migrator.add_column("lxmf_messages", 'method', LxmfMessage.method), migrator.add_column("lxmf_messages", "method", LxmfMessage.method),
) )
# migrate to version 5 # migrate to version 5
if current_version < 5: if current_version < 5:
migrate_database( migrate_database(
migrator.add_column("announces", 'rssi', Announce.rssi), migrator.add_column("announces", "rssi", Announce.rssi),
migrator.add_column("announces", 'snr', Announce.snr), migrator.add_column("announces", "snr", Announce.snr),
migrator.add_column("announces", 'quality', Announce.quality), migrator.add_column("announces", "quality", Announce.quality),
)
# migrate to version 6
if current_version < 6:
migrate_database(
migrator.add_column("lxmf_messages", "is_spam", LxmfMessage.is_spam),
) )
return latest_version return latest_version
class BaseModel(Model): class BaseModel(Model): # noqa: F405
class Meta: class Meta:
database = database database = database
class Config(BaseModel): class Config(BaseModel):
id = BigAutoField() # noqa: F405
id = BigAutoField() key = CharField(unique=True) # noqa: F405
key = CharField(unique=True) value = TextField() # noqa: F405
value = TextField() created_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
created_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) updated_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
updated_at = DateTimeField(default=lambda: datetime.now(timezone.utc))
# define table name # define table name
class Meta: class Meta:
@@ -62,19 +75,26 @@ class Config(BaseModel):
class Announce(BaseModel): class Announce(BaseModel):
id = BigAutoField() # noqa: F405
destination_hash = CharField( # noqa: F405
unique=True,
) # unique destination hash that was announced
aspect = TextField( # noqa: F405
index=True,
) # aspect is not included in announce, but we want to filter saved announces by aspect
identity_hash = CharField( # noqa: F405
index=True,
) # identity hash that announced the destination
identity_public_key = ( # noqa: F405
CharField() # noqa: F405
) # base64 encoded public key, incase we want to recreate the identity manually
app_data = TextField(null=True) # noqa: F405 # base64 encoded app data bytes
rssi = IntegerField(null=True) # noqa: F405
snr = FloatField(null=True) # noqa: F405
quality = FloatField(null=True) # noqa: F405
id = BigAutoField() created_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
destination_hash = CharField(unique=True) # unique destination hash that was announced updated_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
aspect = TextField(index=True) # aspect is not included in announce, but we want to filter saved announces by aspect
identity_hash = CharField(index=True) # identity hash that announced the destination
identity_public_key = CharField() # base64 encoded public key, incase we want to recreate the identity manually
app_data = TextField(null=True) # base64 encoded app data bytes
rssi = IntegerField(null=True)
snr = FloatField(null=True)
quality = FloatField(null=True)
created_at = DateTimeField(default=lambda: datetime.now(timezone.utc))
updated_at = DateTimeField(default=lambda: datetime.now(timezone.utc))
# define table name # define table name
class Meta: class Meta:
@@ -82,13 +102,12 @@ class Announce(BaseModel):
class CustomDestinationDisplayName(BaseModel): class CustomDestinationDisplayName(BaseModel):
id = BigAutoField() # noqa: F405
destination_hash = CharField(unique=True) # noqa: F405 # unique destination hash
display_name = CharField() # noqa: F405 # custom display name for the destination hash
id = BigAutoField() created_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
destination_hash = CharField(unique=True) # unique destination hash updated_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
display_name = CharField() # custom display name for the destination hash
created_at = DateTimeField(default=lambda: datetime.now(timezone.utc))
updated_at = DateTimeField(default=lambda: datetime.now(timezone.utc))
# define table name # define table name
class Meta: class Meta:
@@ -96,14 +115,13 @@ class CustomDestinationDisplayName(BaseModel):
class FavouriteDestination(BaseModel): class FavouriteDestination(BaseModel):
id = BigAutoField() # noqa: F405
destination_hash = CharField(unique=True) # noqa: F405 # unique destination hash
display_name = CharField() # noqa: F405 # custom display name for the destination hash
aspect = CharField() # noqa: F405 # e.g: nomadnetwork.node
id = BigAutoField() created_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
destination_hash = CharField(unique=True) # unique destination hash updated_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
display_name = CharField() # custom display name for the destination hash
aspect = CharField() # e.g: nomadnetwork.node
created_at = DateTimeField(default=lambda: datetime.now(timezone.utc))
updated_at = DateTimeField(default=lambda: datetime.now(timezone.utc))
# define table name # define table name
class Meta: class Meta:
@@ -111,26 +129,36 @@ class FavouriteDestination(BaseModel):
class LxmfMessage(BaseModel): class LxmfMessage(BaseModel):
id = BigAutoField() # noqa: F405
id = BigAutoField() hash = CharField(unique=True) # noqa: F405 # unique lxmf message hash
hash = CharField(unique=True) # unique lxmf message hash source_hash = CharField(index=True) # noqa: F405
source_hash = CharField(index=True) destination_hash = CharField(index=True) # noqa: F405
destination_hash = CharField(index=True) state = ( # noqa: F405
state = CharField() # state is converted from internal int to a human friendly string CharField() # noqa: F405
progress = FloatField() # progress is converted from internal float 0.00-1.00 to float between 0.00/100 (2 decimal places) ) # state is converted from internal int to a human friendly string
is_incoming = BooleanField() # if true, we should ignore state, it's set to draft by default on incoming messages progress = FloatField() # noqa: F405 # progress is converted from internal float 0.00-1.00 to float between 0.00/100 (2 decimal places)
method = CharField(null=True) # what method is being used to send the message, e.g: direct, propagated is_incoming = BooleanField() # noqa: F405 # if true, we should ignore state, it's set to draft by default on incoming messages
delivery_attempts = IntegerField(default=0) # how many times delivery has been attempted for this message method = CharField( # noqa: F405
next_delivery_attempt_at = FloatField(null=True) # timestamp of when the message will attempt delivery again null=True,
title = TextField() ) # what method is being used to send the message, e.g: direct, propagated
content = TextField() delivery_attempts = IntegerField( # noqa: F405
fields = TextField() # json string default=0,
timestamp = FloatField() # timestamp of when the message was originally created (before ever being sent) ) # how many times delivery has been attempted for this message
rssi = IntegerField(null=True) next_delivery_attempt_at = FloatField( # noqa: F405
snr = FloatField(null=True) null=True,
quality = FloatField(null=True) ) # timestamp of when the message will attempt delivery again
created_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) title = TextField() # noqa: F405
updated_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) content = TextField() # noqa: F405
fields = TextField() # noqa: F405 # json string
timestamp = ( # noqa: F405
FloatField() # noqa: F405
) # timestamp of when the message was originally created (before ever being sent)
rssi = IntegerField(null=True) # noqa: F405
snr = FloatField(null=True) # noqa: F405
quality = FloatField(null=True) # noqa: F405
is_spam = BooleanField(default=False) # noqa: F405 # if true, message is marked as spam
created_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
updated_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
# define table name # define table name
class Meta: class Meta:
@@ -138,13 +166,12 @@ class LxmfMessage(BaseModel):
class LxmfConversationReadState(BaseModel): class LxmfConversationReadState(BaseModel):
id = BigAutoField() # noqa: F405
destination_hash = CharField(unique=True) # noqa: F405 # unique destination hash
last_read_at = DateTimeField() # noqa: F405
id = BigAutoField() created_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
destination_hash = CharField(unique=True) # unique destination hash updated_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
last_read_at = DateTimeField()
created_at = DateTimeField(default=lambda: datetime.now(timezone.utc))
updated_at = DateTimeField(default=lambda: datetime.now(timezone.utc))
# define table name # define table name
class Meta: class Meta:
@@ -152,16 +179,43 @@ class LxmfConversationReadState(BaseModel):
class LxmfUserIcon(BaseModel): class LxmfUserIcon(BaseModel):
id = BigAutoField() # noqa: F405
destination_hash = CharField(unique=True) # noqa: F405 # unique destination hash
icon_name = CharField() # noqa: F405 # material design icon name for the destination hash
foreground_colour = CharField() # noqa: F405 # hex colour to use for foreground (icon colour)
background_colour = ( # noqa: F405
CharField() # noqa: F405
) # hex colour to use for background (background colour)
id = BigAutoField() created_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
destination_hash = CharField(unique=True) # unique destination hash updated_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
icon_name = CharField() # material design icon name for the destination hash
foreground_colour = CharField() # hex colour to use for foreground (icon colour)
background_colour = CharField() # hex colour to use for background (background colour)
created_at = DateTimeField(default=lambda: datetime.now(timezone.utc))
updated_at = DateTimeField(default=lambda: datetime.now(timezone.utc))
# define table name # define table name
class Meta: class Meta:
table_name = "lxmf_user_icons" table_name = "lxmf_user_icons"
class BlockedDestination(BaseModel):
id = BigAutoField() # noqa: F405
destination_hash = CharField( # noqa: F405
unique=True, index=True,
) # unique destination hash that is blocked
created_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
updated_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
# define table name
class Meta:
table_name = "blocked_destinations"
class SpamKeyword(BaseModel):
id = BigAutoField() # noqa: F405
keyword = CharField( # noqa: F405
unique=True, index=True,
) # keyword to match against message content
created_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
updated_at = DateTimeField(default=lambda: datetime.now(timezone.utc)) # noqa: F405
# define table name
class Meta:
table_name = "spam_keywords"

View File

@@ -1,12 +1,12 @@
services: services:
reticulum-meshchat: reticulum-meshchat:
container_name: reticulum-meshchat container_name: reticulum-meshchat
image: ghcr.io/liamcottle/reticulum-meshchat:latest image: ghcr.io/sudo-ivan/reticulum-meshchat:latest
pull_policy: always pull_policy: always
restart: unless-stopped restart: unless-stopped
# Make the meshchat web interface accessible from the host on port 8000 # Make the meshchat web interface accessible from the host on port 8000
ports: ports:
- 0.0.0.0:8000:8000 - 127.0.0.1:8000:8000
volumes: volumes:
- meshchat-config:/config - meshchat-config:/config
# Uncomment if you have a USB device connected, such as an RNode # Uncomment if you have a USB device connected, such as an RNode

View File

@@ -1,10 +0,0 @@
# Donate
Thank you for considering donating, this helps support my work on this project 😁
## How can I donate?
- Bitcoin: bc1qy22smke8n4c54evdxmp7lpy9p0e6m9tavtlg2q
- Ethereum: 0xc64CFbA5D0BF7664158c5671F64d446395b3bF3D
- Buy me a Coffee: [https://ko-fi.com/liamcottle](https://ko-fi.com/liamcottle)
- Sponsor on GitHub: [https://github.com/sponsors/liamcottle](https://github.com/sponsors/liamcottle)

View File

@@ -179,13 +179,53 @@ app.whenReady().then(async () => {
} }
// find path to python/cxfreeze reticulum meshchat executable // find path to python/cxfreeze reticulum meshchat executable
const exeName = process.platform === "win32" ? "ReticulumMeshChat.exe" : "ReticulumMeshChat"; // Note: setup.py creates ReticulumMeshChatX (with X), not ReticulumMeshChat
var exe = path.join(__dirname, `build/exe/${exeName}`); const exeName = process.platform === "win32" ? "ReticulumMeshChatX.exe" : "ReticulumMeshChatX";
// if dist exe doesn't exist, check local build // get app path (handles both development and packaged app)
if(!fs.existsSync(exe)){ const appPath = app.getAppPath();
exe = path.join(__dirname, '..', `build/exe/${exeName}`); // get resources path (where extraFiles are placed)
const resourcesPath = process.resourcesPath || path.join(appPath, '..', '..');
var exe = null;
// when packaged, extraFiles are placed at resources/app/electron/build/exe
// when packaged with asar, unpacked files are in app.asar.unpacked/ directory
// app.getAppPath() returns the path to app.asar, so unpacked is at the same level
const possiblePaths = [
// packaged app - extraFiles location (resources/app/electron/build/exe)
path.join(resourcesPath, 'app', 'electron', 'build', 'exe', exeName),
// packaged app with asar (unpacked files from asarUnpack)
path.join(appPath, '..', 'app.asar.unpacked', 'build', 'exe', exeName),
// packaged app without asar (relative to app path)
path.join(appPath, 'build', 'exe', exeName),
// development mode (relative to electron directory)
path.join(__dirname, 'build', 'exe', exeName),
// development mode (relative to project root)
path.join(__dirname, '..', 'build', 'exe', exeName),
];
// find the first path that exists
for(const possibleExe of possiblePaths){
if(fs.existsSync(possibleExe)){
exe = possibleExe;
break;
}
} }
// verify executable exists
if(!exe || !fs.existsSync(exe)){
const errorMsg = `Could not find executable: ${exeName}\nChecked paths:\n${possiblePaths.join('\n')}\n\nApp path: ${appPath}\nResources path: ${resourcesPath}`;
log(errorMsg);
if(mainWindow){
await dialog.showMessageBox(mainWindow, {
message: errorMsg,
});
}
app.quit();
return;
}
log(`Found executable at: ${exe}`);
try { try {

View File

File diff suppressed because it is too large Load Diff

143
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "reticulum-meshchat", "name": "reticulum-meshchat",
"version": "2.32.1", "version": "2.32.3",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "reticulum-meshchat", "name": "reticulum-meshchat",
"version": "2.32.1", "version": "2.32.3",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@mdi/js": "^7.4.47", "@mdi/js": "^7.4.47",
@@ -31,7 +31,7 @@
"vuetify": "^3.7.6" "vuetify": "^3.7.6"
}, },
"devDependencies": { "devDependencies": {
"electron": "^35.7.5", "electron": "^39.2.4",
"electron-builder": "^24.6.3" "electron-builder": "^24.6.3"
}, },
"engines": { "engines": {
@@ -1622,39 +1622,39 @@
} }
}, },
"node_modules/@vue/compiler-core": { "node_modules/@vue/compiler-core": {
"version": "3.5.24", "version": "3.5.25",
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.24.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.25.tgz",
"integrity": "sha512-eDl5H57AOpNakGNAkFDH+y7kTqrQpJkZFXhWZQGyx/5Wh7B1uQYvcWkvZi11BDhscPgj8N7XV3oRwiPnx1Vrig==", "integrity": "sha512-vay5/oQJdsNHmliWoZfHPoVZZRmnSWhug0BYT34njkYTPqClh3DNWLkZNJBVSjsNMrg0CCrBfoKkjZQPM/QVUw==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@babel/parser": "^7.28.5", "@babel/parser": "^7.28.5",
"@vue/shared": "3.5.24", "@vue/shared": "3.5.25",
"entities": "^4.5.0", "entities": "^4.5.0",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"source-map-js": "^1.2.1" "source-map-js": "^1.2.1"
} }
}, },
"node_modules/@vue/compiler-dom": { "node_modules/@vue/compiler-dom": {
"version": "3.5.24", "version": "3.5.25",
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.24.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.25.tgz",
"integrity": "sha512-1QHGAvs53gXkWdd3ZMGYuvQFXHW4ksKWPG8HP8/2BscrbZ0brw183q2oNWjMrSWImYLHxHrx1ItBQr50I/q2zw==", "integrity": "sha512-4We0OAcMZsKgYoGlMjzYvaoErltdFI2/25wqanuTu+S4gismOTRTBPi4IASOjxWdzIwrYSjnqONfKvuqkXzE2Q==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@vue/compiler-core": "3.5.24", "@vue/compiler-core": "3.5.25",
"@vue/shared": "3.5.24" "@vue/shared": "3.5.25"
} }
}, },
"node_modules/@vue/compiler-sfc": { "node_modules/@vue/compiler-sfc": {
"version": "3.5.24", "version": "3.5.25",
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.24.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.25.tgz",
"integrity": "sha512-8EG5YPRgmTB+YxYBM3VXy8zHD9SWHUJLIGPhDovo3Z8VOgvP+O7UP5vl0J4BBPWYD9vxtBabzW1EuEZ+Cqs14g==", "integrity": "sha512-PUgKp2rn8fFsI++lF2sO7gwO2d9Yj57Utr5yEsDf3GNaQcowCLKL7sf+LvVFvtJDXUp/03+dC6f2+LCv5aK1ag==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@babel/parser": "^7.28.5", "@babel/parser": "^7.28.5",
"@vue/compiler-core": "3.5.24", "@vue/compiler-core": "3.5.25",
"@vue/compiler-dom": "3.5.24", "@vue/compiler-dom": "3.5.25",
"@vue/compiler-ssr": "3.5.24", "@vue/compiler-ssr": "3.5.25",
"@vue/shared": "3.5.24", "@vue/shared": "3.5.25",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"magic-string": "^0.30.21", "magic-string": "^0.30.21",
"postcss": "^8.5.6", "postcss": "^8.5.6",
@@ -1662,13 +1662,13 @@
} }
}, },
"node_modules/@vue/compiler-ssr": { "node_modules/@vue/compiler-ssr": {
"version": "3.5.24", "version": "3.5.25",
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.24.tgz", "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.25.tgz",
"integrity": "sha512-trOvMWNBMQ/odMRHW7Ae1CdfYx+7MuiQu62Jtu36gMLXcaoqKvAyh+P73sYG9ll+6jLB6QPovqoKGGZROzkFFg==", "integrity": "sha512-ritPSKLBcParnsKYi+GNtbdbrIE1mtuFEJ4U1sWeuOMlIziK5GtOL85t5RhsNy4uWIXPgk+OUdpnXiTdzn8o3A==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@vue/compiler-dom": "3.5.24", "@vue/compiler-dom": "3.5.25",
"@vue/shared": "3.5.24" "@vue/shared": "3.5.25"
} }
}, },
"node_modules/@vue/devtools-api": { "node_modules/@vue/devtools-api": {
@@ -1678,53 +1678,53 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/@vue/reactivity": { "node_modules/@vue/reactivity": {
"version": "3.5.24", "version": "3.5.25",
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.24.tgz", "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.25.tgz",
"integrity": "sha512-BM8kBhtlkkbnyl4q+HiF5R5BL0ycDPfihowulm02q3WYp2vxgPcJuZO866qa/0u3idbMntKEtVNuAUp5bw4teg==", "integrity": "sha512-5xfAypCQepv4Jog1U4zn8cZIcbKKFka3AgWHEFQeK65OW+Ys4XybP6z2kKgws4YB43KGpqp5D/K3go2UPPunLA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@vue/shared": "3.5.24" "@vue/shared": "3.5.25"
} }
}, },
"node_modules/@vue/runtime-core": { "node_modules/@vue/runtime-core": {
"version": "3.5.24", "version": "3.5.25",
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.24.tgz", "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.25.tgz",
"integrity": "sha512-RYP/byyKDgNIqfX/gNb2PB55dJmM97jc9wyF3jK7QUInYKypK2exmZMNwnjueWwGceEkP6NChd3D2ZVEp9undQ==", "integrity": "sha512-Z751v203YWwYzy460bzsYQISDfPjHTl+6Zzwo/a3CsAf+0ccEjQ8c+0CdX1WsumRTHeywvyUFtW6KvNukT/smA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@vue/reactivity": "3.5.24", "@vue/reactivity": "3.5.25",
"@vue/shared": "3.5.24" "@vue/shared": "3.5.25"
} }
}, },
"node_modules/@vue/runtime-dom": { "node_modules/@vue/runtime-dom": {
"version": "3.5.24", "version": "3.5.25",
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.24.tgz", "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.25.tgz",
"integrity": "sha512-Z8ANhr/i0XIluonHVjbUkjvn+CyrxbXRIxR7wn7+X7xlcb7dJsfITZbkVOeJZdP8VZwfrWRsWdShH6pngMxRjw==", "integrity": "sha512-a4WrkYFbb19i9pjkz38zJBg8wa/rboNERq3+hRRb0dHiJh13c+6kAbgqCPfMaJ2gg4weWD3APZswASOfmKwamA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@vue/reactivity": "3.5.24", "@vue/reactivity": "3.5.25",
"@vue/runtime-core": "3.5.24", "@vue/runtime-core": "3.5.25",
"@vue/shared": "3.5.24", "@vue/shared": "3.5.25",
"csstype": "^3.1.3" "csstype": "^3.1.3"
} }
}, },
"node_modules/@vue/server-renderer": { "node_modules/@vue/server-renderer": {
"version": "3.5.24", "version": "3.5.25",
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.24.tgz", "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.25.tgz",
"integrity": "sha512-Yh2j2Y4G/0/4z/xJ1Bad4mxaAk++C2v4kaa8oSYTMJBJ00/ndPuxCnWeot0/7/qafQFLh5pr6xeV6SdMcE/G1w==", "integrity": "sha512-UJaXR54vMG61i8XNIzTSf2Q7MOqZHpp8+x3XLGtE3+fL+nQd+k7O5+X3D/uWrnQXOdMw5VPih+Uremcw+u1woQ==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@vue/compiler-ssr": "3.5.24", "@vue/compiler-ssr": "3.5.25",
"@vue/shared": "3.5.24" "@vue/shared": "3.5.25"
}, },
"peerDependencies": { "peerDependencies": {
"vue": "3.5.24" "vue": "3.5.25"
} }
}, },
"node_modules/@vue/shared": { "node_modules/@vue/shared": {
"version": "3.5.24", "version": "3.5.25",
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.24.tgz", "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.25.tgz",
"integrity": "sha512-9cwHL2EsJBdi8NY22pngYYWzkTDhld6fAD6jlaeloNGciNSJL6bLpbxVgXl96X00Jtc6YWQv96YA/0sxex/k1A==", "integrity": "sha512-AbOPdQQnAnzs58H2FrrDxYj/TJfmeS2jdfEEhgiKINy+bnOANmVizIEgq1r+C5zsbs6l1CCQxtcj71rwNQ4jWg==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/@vuetify/loader-shared": { "node_modules/@vuetify/loader-shared": {
@@ -2163,9 +2163,9 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/baseline-browser-mapping": { "node_modules/baseline-browser-mapping": {
"version": "2.8.30", "version": "2.8.32",
"resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.30.tgz", "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.32.tgz",
"integrity": "sha512-aTUKW4ptQhS64+v2d6IkPzymEzzhw+G0bA1g3uBRV3+ntkH+svttKseW5IOR4Ed6NUVKqnY7qT3dKvzQ7io4AA==", "integrity": "sha512-OPz5aBThlyLFgxyhdwf/s2+8ab3OvT7AdTNvKHBwpXomIYeXqpUUuT8LrdtxZSsWJ4R4CU1un4XGh5Ez3nlTpw==",
"license": "Apache-2.0", "license": "Apache-2.0",
"bin": { "bin": {
"baseline-browser-mapping": "dist/cli.js" "baseline-browser-mapping": "dist/cli.js"
@@ -2467,9 +2467,9 @@
} }
}, },
"node_modules/caniuse-lite": { "node_modules/caniuse-lite": {
"version": "1.0.30001756", "version": "1.0.30001757",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001756.tgz", "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001757.tgz",
"integrity": "sha512-4HnCNKbMLkLdhJz3TToeVWHSnfJvPaq6vu/eRP0Ahub/07n484XHhBF5AJoSGHdVrS8tKFauUQz8Bp9P7LVx7A==", "integrity": "sha512-r0nnL/I28Zi/yjk1el6ilj27tKcdjLsNqAOZr0yVjWPrSQyHgKI2INaEWw21bAQSv2LXRt1XuCS/GomNpWOxsQ==",
"funding": [ "funding": [
{ {
"type": "opencollective", "type": "opencollective",
@@ -3025,6 +3025,7 @@
"integrity": "sha512-rcJUkMfnJpfCboZoOOPf4L29TRtEieHNOeAbYPWPxlaBw/Z1RKrRA86dOI9rwaI4tQSc/RD82zTNHprfUHXsoQ==", "integrity": "sha512-rcJUkMfnJpfCboZoOOPf4L29TRtEieHNOeAbYPWPxlaBw/Z1RKrRA86dOI9rwaI4tQSc/RD82zTNHprfUHXsoQ==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"app-builder-lib": "24.13.3", "app-builder-lib": "24.13.3",
"builder-util": "24.13.1", "builder-util": "24.13.1",
@@ -3166,9 +3167,9 @@
} }
}, },
"node_modules/electron": { "node_modules/electron": {
"version": "35.7.5", "version": "39.2.4",
"resolved": "https://registry.npmjs.org/electron/-/electron-35.7.5.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-39.2.4.tgz",
"integrity": "sha512-dnL+JvLraKZl7iusXTVTGYs10TKfzUi30uEDTqsmTm0guN9V2tbOjTzyIZbh9n3ygUjgEYyo+igAwMRXIi3IPw==", "integrity": "sha512-KxPtwpFceQKSxRtUY39piHLYhJMMyHfOhc70e6zRnKGrbRdK6hzEqssth8IGjlKOdkeT4KCvIEngnNraYk39+g==",
"dev": true, "dev": true,
"hasInstallScript": true, "hasInstallScript": true,
"license": "MIT", "license": "MIT",
@@ -3361,9 +3362,9 @@
} }
}, },
"node_modules/electron-to-chromium": { "node_modules/electron-to-chromium": {
"version": "1.5.259", "version": "1.5.262",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.259.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.262.tgz",
"integrity": "sha512-I+oLXgpEJzD6Cwuwt1gYjxsDmu/S/Kd41mmLA3O+/uH2pFRO/DvOjUyGozL8j3KeLV6WyZ7ssPwELMsXCcsJAQ==", "integrity": "sha512-NlAsMteRHek05jRUxUR0a5jpjYq9ykk6+kO0yRaMi5moe7u0fVIOeQ3Y30A8dIiWFBNUoQGi1ljb1i5VtS9WQQ==",
"license": "ISC" "license": "ISC"
}, },
"node_modules/emoji-regex": { "node_modules/emoji-regex": {
@@ -6432,17 +6433,17 @@
} }
}, },
"node_modules/vue": { "node_modules/vue": {
"version": "3.5.24", "version": "3.5.25",
"resolved": "https://registry.npmjs.org/vue/-/vue-3.5.24.tgz", "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.25.tgz",
"integrity": "sha512-uTHDOpVQTMjcGgrqFPSb8iO2m1DUvo+WbGqoXQz8Y1CeBYQ0FXf2z1gLRaBtHjlRz7zZUBHxjVB5VTLzYkvftg==", "integrity": "sha512-YLVdgv2K13WJ6n+kD5owehKtEXwdwXuj2TTyJMsO7pSeKw2bfRNZGjhB7YzrpbMYj5b5QsUebHpOqR3R3ziy/g==",
"license": "MIT", "license": "MIT",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"@vue/compiler-dom": "3.5.24", "@vue/compiler-dom": "3.5.25",
"@vue/compiler-sfc": "3.5.24", "@vue/compiler-sfc": "3.5.25",
"@vue/runtime-dom": "3.5.24", "@vue/runtime-dom": "3.5.25",
"@vue/server-renderer": "3.5.24", "@vue/server-renderer": "3.5.25",
"@vue/shared": "3.5.24" "@vue/shared": "3.5.25"
}, },
"peerDependencies": { "peerDependencies": {
"typescript": "*" "typescript": "*"
@@ -6469,9 +6470,9 @@
} }
}, },
"node_modules/vuetify": { "node_modules/vuetify": {
"version": "3.10.11", "version": "3.11.0",
"resolved": "https://registry.npmjs.org/vuetify/-/vuetify-3.10.11.tgz", "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-3.11.0.tgz",
"integrity": "sha512-hfllXT0/C3O5nZyIRalaDU7ClMIrKrKAbjH0T8xbSUb7FcJrHOqPZfEkSXwrKxajv6EA1rwEOvCZoLDhunnjrQ==", "integrity": "sha512-ITGeT3uaTIwI2SdyTvtE45tY6FlS2oWklfLU47s2K0ZHnu1it35p9lz8oE15Id8ThtKyQojQGobMkN+korheEw==",
"license": "MIT", "license": "MIT",
"peer": true, "peer": true,
"funding": { "funding": {

View File

@@ -1,12 +1,13 @@
{ {
"name": "reticulum-meshchat", "name": "reticulum-meshchat",
"version": "2.32.1", "version": "2.32.3",
"description": "", "description": "A simple mesh network communications app powered by the Reticulum Network Stack",
"author": "Sudo-Ivan",
"main": "electron/main.js", "main": "electron/main.js",
"scripts": { "scripts": {
"watch": "npm run build-frontend -- --watch", "watch": "npm run build-frontend -- --watch",
"build-frontend": "vite build", "build-frontend": "vite build",
"build-backend": "python setup.py build", "build-backend": "venv/bin/python setup.py build",
"build": "npm run build-frontend && npm run build-backend", "build": "npm run build-frontend && npm run build-backend",
"electron-postinstall": "electron-builder install-app-deps", "electron-postinstall": "electron-builder install-app-deps",
"electron": "npm run electron-postinstall && npm run build && electron .", "electron": "npm run electron-postinstall && npm run build && electron .",
@@ -17,13 +18,16 @@
"node": ">=18" "node": ">=18"
}, },
"devDependencies": { "devDependencies": {
"electron": "^35.7.5", "electron": "^39.2.4",
"electron-builder": "^24.6.3" "electron-builder": "^24.6.3"
}, },
"build": { "build": {
"appId": "com.liamcottle.reticulummeshchat", "appId": "com.sudoivan.reticulummeshchat",
"productName": "Reticulum MeshChat", "productName": "Reticulum MeshChatX",
"asar": false, "asar": true,
"asarUnpack": [
"build/exe/**/*"
],
"files": [ "files": [
"electron/**/*" "electron/**/*"
], ],
@@ -74,7 +78,8 @@
"AppImage", "AppImage",
"deb" "deb"
], ],
"maintainer": "Liam Cottle <liam@liamcottle.com>", "maintainer": "Sudo-Ivan",
"category": "Network",
"extraFiles": [ "extraFiles": [
{ {
"from": "build/exe", "from": "build/exe",

View File

@@ -3,5 +3,5 @@ cx_freeze>=7.0.0
lxmf>=0.9.3 lxmf>=0.9.3
peewee>=3.18.1 peewee>=3.18.1
psutil>=7.1.3 psutil>=7.1.3
rns>=1.0.3 rns>=1.0.4
websockets>=14.2 websockets>=14.2

View File

@@ -1,44 +1,50 @@
from cx_Freeze import setup, Executable from cx_Freeze import Executable, setup
setup( setup(
name='ReticulumMeshChat', name="ReticulumMeshChatX",
version='1.0.0', version="1.0.0",
description='A simple mesh network communications app powered by the Reticulum Network Stack', description="A simple mesh network communications app powered by the Reticulum Network Stack",
executables=[ executables=[
Executable( Executable(
script='meshchat.py', # this script to run script="meshchat.py", # this script to run
base=None, # we are running a console application, not a gui base=None, # we are running a console application, not a gui
target_name='ReticulumMeshChat', # creates ReticulumMeshChat.exe target_name="ReticulumMeshChatX", # creates ReticulumMeshChatX.exe
shortcut_name='ReticulumMeshChat', # name shown in shortcut shortcut_name="ReticulumMeshChatX", # name shown in shortcut
shortcut_dir='ProgramMenuFolder', # put the shortcut in windows start menu shortcut_dir="ProgramMenuFolder", # put the shortcut in windows start menu
icon='logo/icon.ico', # set the icon for the exe icon="logo/icon.ico", # set the icon for the exe
copyright='Copyright (c) 2024 Liam Cottle', copyright="Copyright (c) 2024 Liam Cottle",
), ),
], ],
options={ options={
'build_exe': { "build_exe": {
# libs that are required # libs that are required
'packages': [ "packages": [
# required for dynamic import fix # required for dynamic import fix
# https://github.com/marcelotduarte/cx_Freeze/discussions/2039 # https://github.com/marcelotduarte/cx_Freeze/discussions/2039
# https://github.com/marcelotduarte/cx_Freeze/issues/2041 # https://github.com/marcelotduarte/cx_Freeze/issues/2041
'RNS', "RNS",
"RNS.Interfaces",
"LXMF",
], ],
# files that are required # files that are required
'include_files': [ "include_files": [
'package.json', # used to determine app version from python "package.json", # used to determine app version from python
'public/', # static files served by web server "public/", # static files served by web server
], ],
# slim down the build by excluding these unused libs # slim down the build by excluding these unused libs
'excludes': [ "excludes": [
'PIL', # saves ~200MB "PIL", # saves ~200MB
], ],
# this has the same effect as the -O command line option when executing CPython directly. # this has the same effect as the -O command line option when executing CPython directly.
# it also prevents assert statements from executing, removes docstrings and sets __debug__ to False. # it also prevents assert statements from executing, removes docstrings and sets __debug__ to False.
# https://stackoverflow.com/a/57948104 # https://stackoverflow.com/a/57948104
"optimize": 2, "optimize": 2,
# change where exe is built to # change where exe is built to
'build_exe': 'build/exe', "build_exe": "build/exe",
# make the build relocatable by replacing absolute paths
"replace_paths": [
("*", ""),
],
}, },
}, },
) )

View File

@@ -7,7 +7,6 @@ import sys
# this class forces stream writes to be flushed immediately # this class forces stream writes to be flushed immediately
class ImmediateFlushingStreamWrapper: class ImmediateFlushingStreamWrapper:
def __init__(self, stream): def __init__(self, stream):
self.stream = stream self.stream = stream

View File

@@ -1,16 +1,23 @@
# an announce handler that forwards announces to a provided callback for the provided aspect filter # an announce handler that forwards announces to a provided callback for the provided aspect filter
# this handler exists so we can have access to the original aspect, as this is not provided in the announce itself # this handler exists so we can have access to the original aspect, as this is not provided in the announce itself
class AnnounceHandler: class AnnounceHandler:
def __init__(self, aspect_filter: str, received_announce_callback): def __init__(self, aspect_filter: str, received_announce_callback):
self.aspect_filter = aspect_filter self.aspect_filter = aspect_filter
self.received_announce_callback = received_announce_callback self.received_announce_callback = received_announce_callback
# we will just pass the received announce back to the provided callback # we will just pass the received announce back to the provided callback
def received_announce(self, destination_hash, announced_identity, app_data, announce_packet_hash): def received_announce(
self, destination_hash, announced_identity, app_data, announce_packet_hash,
):
try: try:
# handle received announce # handle received announce
self.received_announce_callback(self.aspect_filter, destination_hash, announced_identity, app_data, announce_packet_hash) self.received_announce_callback(
except: self.aspect_filter,
destination_hash,
announced_identity,
app_data,
announce_packet_hash,
)
except Exception: # noqa: E722
# ignore failure to handle received announce # ignore failure to handle received announce
pass pass

View File

@@ -1,9 +1,8 @@
import asyncio import asyncio
from typing import Coroutine from collections.abc import Coroutine
class AsyncUtils: class AsyncUtils:
# remember main loop # remember main loop
main_loop: asyncio.AbstractEventLoop | None = None main_loop: asyncio.AbstractEventLoop | None = None
@@ -15,7 +14,6 @@ class AsyncUtils:
# it will run the async function on the main event loop if possible, otherwise it logs a warning # it will run the async function on the main event loop if possible, otherwise it logs a warning
@staticmethod @staticmethod
def run_async(coroutine: Coroutine): def run_async(coroutine: Coroutine):
# run provided coroutine on main event loop, ensuring thread safety # run provided coroutine on main event loop, ensuring thread safety
if AsyncUtils.main_loop and AsyncUtils.main_loop.is_running(): if AsyncUtils.main_loop and AsyncUtils.main_loop.is_running():
asyncio.run_coroutine_threadsafe(coroutine, AsyncUtils.main_loop) asyncio.run_coroutine_threadsafe(coroutine, AsyncUtils.main_loop)

View File

@@ -1,11 +1,10 @@
import asyncio import asyncio
import time import time
from typing import List
import RNS import RNS
# todo optionally identity self over link # TODO optionally identity self over link
# todo allowlist/denylist for incoming calls # TODO allowlist/denylist for incoming calls
class CallFailedException(Exception): class CallFailedException(Exception):
@@ -13,7 +12,6 @@ class CallFailedException(Exception):
class AudioCall: class AudioCall:
def __init__(self, link: RNS.Link, is_outbound: bool): def __init__(self, link: RNS.Link, is_outbound: bool):
self.link = link self.link = link
self.is_outbound = is_outbound self.is_outbound = is_outbound
@@ -41,21 +39,25 @@ class AudioCall:
# handle packet received over link # handle packet received over link
def on_packet(self, message, packet): def on_packet(self, message, packet):
# send audio received from call initiator to all audio packet listeners # send audio received from call initiator to all audio packet listeners
for audio_packet_listener in self.audio_packet_listeners: for audio_packet_listener in self.audio_packet_listeners:
audio_packet_listener(message) audio_packet_listener(message)
# send an audio packet over the link # send an audio packet over the link
def send_audio_packet(self, data): def send_audio_packet(self, data):
# do nothing if link is not active # do nothing if link is not active
if self.is_active() is False: if self.is_active() is False:
return return
# drop audio packet if it is too big to send # drop audio packet if it is too big to send
if len(data) > RNS.Link.MDU: if len(data) > RNS.Link.MDU:
print("[AudioCall] dropping audio packet " + str(len(data)) + " bytes exceeds the link packet MDU of " + str(RNS.Link.MDU) + " bytes") print(
"[AudioCall] dropping audio packet "
+ str(len(data))
+ " bytes exceeds the link packet MDU of "
+ str(RNS.Link.MDU)
+ " bytes",
)
return return
# send codec2 audio received from call receiver to call initiator over reticulum link # send codec2 audio received from call receiver to call initiator over reticulum link
@@ -73,25 +75,26 @@ class AudioCall:
def hangup(self): def hangup(self):
print("[AudioCall] hangup") print("[AudioCall] hangup")
self.link.teardown() self.link.teardown()
pass
class AudioCallManager: class AudioCallManager:
def __init__(self, identity: RNS.Identity, is_destination_blocked_callback=None):
def __init__(self, identity: RNS.Identity):
self.identity = identity self.identity = identity
self.on_incoming_call_callback = None self.on_incoming_call_callback = None
self.on_outgoing_call_callback = None self.on_outgoing_call_callback = None
self.is_destination_blocked_callback = is_destination_blocked_callback
self.audio_call_receiver = AudioCallReceiver(manager=self) self.audio_call_receiver = AudioCallReceiver(manager=self)
# remember audio calls # remember audio calls
self.audio_calls: List[AudioCall] = [] self.audio_calls: list[AudioCall] = []
# announces the audio call destination # announces the audio call destination
def announce(self, app_data=None): def announce(self, app_data=None):
self.audio_call_receiver.destination.announce(app_data) self.audio_call_receiver.destination.announce(app_data)
print("[AudioCallManager] announced destination: " + RNS.prettyhexrep(self.audio_call_receiver.destination.hash)) print(
"[AudioCallManager] announced destination: "
+ RNS.prettyhexrep(self.audio_call_receiver.destination.hash),
)
# set the callback for incoming calls # set the callback for incoming calls
def register_incoming_call_callback(self, callback): def register_incoming_call_callback(self, callback):
@@ -103,7 +106,6 @@ class AudioCallManager:
# handle incoming calls from audio call receiver # handle incoming calls from audio call receiver
def handle_incoming_call(self, audio_call: AudioCall): def handle_incoming_call(self, audio_call: AudioCall):
# remember it # remember it
self.audio_calls.append(audio_call) self.audio_calls.append(audio_call)
@@ -113,7 +115,6 @@ class AudioCallManager:
# handle outgoing calls # handle outgoing calls
def handle_outgoing_call(self, audio_call: AudioCall): def handle_outgoing_call(self, audio_call: AudioCall):
# remember it # remember it
self.audio_calls.append(audio_call) self.audio_calls.append(audio_call)
@@ -142,22 +143,24 @@ class AudioCallManager:
def hangup_all(self): def hangup_all(self):
for audio_call in self.audio_calls: for audio_call in self.audio_calls:
audio_call.hangup() audio_call.hangup()
return None
# attempts to initiate a call to the provided destination and returns the link hash on success # attempts to initiate a call to the provided destination and returns the link hash on success
async def initiate(self, destination_hash: bytes, timeout_seconds: int = 15) -> AudioCall: async def initiate(
self, destination_hash: bytes, timeout_seconds: int = 15,
) -> AudioCall:
# determine when to timeout # determine when to timeout
timeout_after_seconds = time.time() + timeout_seconds timeout_after_seconds = time.time() + timeout_seconds
# check if we have a path to the destination # check if we have a path to the destination
if not RNS.Transport.has_path(destination_hash): if not RNS.Transport.has_path(destination_hash):
# we don't have a path, so we need to request it # we don't have a path, so we need to request it
RNS.Transport.request_path(destination_hash) RNS.Transport.request_path(destination_hash)
# wait until we have a path, or give up after the configured timeout # wait until we have a path, or give up after the configured timeout
while not RNS.Transport.has_path(destination_hash) and time.time() < timeout_after_seconds: while (
not RNS.Transport.has_path(destination_hash)
and time.time() < timeout_after_seconds
):
await asyncio.sleep(0.1) await asyncio.sleep(0.1)
# if we still don't have a path, we can't establish a link, so bail out # if we still don't have a path, we can't establish a link, so bail out
@@ -171,14 +174,16 @@ class AudioCallManager:
RNS.Destination.OUT, RNS.Destination.OUT,
RNS.Destination.SINGLE, RNS.Destination.SINGLE,
"call", "call",
"audio" "audio",
) )
# create link # create link
link = RNS.Link(server_destination) link = RNS.Link(server_destination)
# wait until we have established a link, or give up after the configured timeout # wait until we have established a link, or give up after the configured timeout
while link.status is not RNS.Link.ACTIVE and time.time() < timeout_after_seconds: while (
link.status is not RNS.Link.ACTIVE and time.time() < timeout_after_seconds
):
await asyncio.sleep(0.1) await asyncio.sleep(0.1)
# if we still haven't established a link, bail out # if we still haven't established a link, bail out
@@ -191,16 +196,14 @@ class AudioCallManager:
# handle new outgoing call # handle new outgoing call
self.handle_outgoing_call(audio_call) self.handle_outgoing_call(audio_call)
# todo: this can be optional, it's only being sent by default for ui, can be removed # TODO: this can be optional, it's only being sent by default for ui, can be removed
link.identify(self.identity) link.identify(self.identity)
return audio_call return audio_call
class AudioCallReceiver: class AudioCallReceiver:
def __init__(self, manager: AudioCallManager): def __init__(self, manager: AudioCallManager):
self.manager = manager self.manager = manager
# create destination for receiving audio calls # create destination for receiving audio calls
@@ -224,8 +227,24 @@ class AudioCallReceiver:
# client connected to us, set up an audio call instance # client connected to us, set up an audio call instance
def client_connected(self, link: RNS.Link): def client_connected(self, link: RNS.Link):
# check if source is blocked
if self.manager.is_destination_blocked_callback is not None:
try:
# try to get remote identity hash
remote_identity = link.get_remote_identity()
if remote_identity is not None:
source_hash = remote_identity.hash.hex()
if self.manager.is_destination_blocked_callback(source_hash):
print(
f"Rejecting audio call from blocked source: {source_hash}",
)
link.teardown()
return
except Exception: # noqa: E722
# if we can't get identity yet, we'll check later
pass
# todo: this can be optional, it's only being sent by default for ui, can be removed # TODO: this can be optional, it's only being sent by default for ui, can be removed
link.identify(self.manager.identity) link.identify(self.manager.identity)
# create audio call # create audio call

View File

@@ -1,10 +1,8 @@
class ColourUtils: class ColourUtils:
@staticmethod @staticmethod
def hex_colour_to_byte_array(hex_colour): def hex_colour_to_byte_array(hex_colour):
# remove leading "#" # remove leading "#"
hex_colour = hex_colour.lstrip('#') hex_colour = hex_colour.lstrip("#")
# convert the remaining hex string to bytes # convert the remaining hex string to bytes
return bytes.fromhex(hex_colour) return bytes.fromhex(hex_colour)

View File

@@ -2,30 +2,90 @@ import RNS.vendor.configobj
class InterfaceConfigParser: class InterfaceConfigParser:
@staticmethod @staticmethod
def parse(text): def parse(text):
# get lines from provided text # get lines from provided text
lines = text.splitlines() lines = text.splitlines()
stripped_lines = [line.strip() for line in lines]
# ensure [interfaces] section exists # ensure [interfaces] section exists
if "[interfaces]" not in lines: if "[interfaces]" not in stripped_lines:
lines.insert(0, "[interfaces]") lines.insert(0, "[interfaces]")
stripped_lines.insert(0, "[interfaces]")
# parse lines as rns config object try:
config = RNS.vendor.configobj.ConfigObj(lines) # parse lines as rns config object
config = RNS.vendor.configobj.ConfigObj(lines)
except Exception as e:
print(f"Failed to parse interface config with ConfigObj: {e}")
return InterfaceConfigParser._parse_best_effort(lines)
# get interfaces from config # get interfaces from config
config_interfaces = config.get("interfaces") config_interfaces = config.get("interfaces", {})
if config_interfaces is None:
return []
# process interfaces # process interfaces
interfaces = [] interfaces = []
for interface_name in config_interfaces: for interface_name in config_interfaces:
# ensure interface has a name # ensure interface has a name
interface_config = config_interfaces[interface_name] interface_config = config_interfaces[interface_name]
interface_config["name"] = interface_name interface_config["name"] = interface_name
interfaces.append(interface_config) interfaces.append(interface_config)
return interfaces return interfaces
@staticmethod
def _parse_best_effort(lines):
interfaces = []
current_interface_name = None
current_interface = {}
current_sub_name = None
current_sub = None
def commit_sub():
nonlocal current_sub_name, current_sub
if current_sub_name and current_sub is not None:
current_interface[current_sub_name] = current_sub
current_sub_name = None
current_sub = None
def commit_interface():
nonlocal current_interface_name, current_interface
if current_interface_name:
# shallow copy to avoid future mutation
interfaces.append(dict(current_interface))
current_interface_name = None
current_interface = {}
for raw_line in lines:
line = raw_line.strip()
if line == "" or line.startswith("#"):
continue
if line.lower() == "[interfaces]":
continue
if line.startswith("[[[") and line.endswith("]]]"):
commit_sub()
current_sub_name = line[3:-3].strip()
current_sub = {}
continue
if line.startswith("[[") and line.endswith("]]"):
commit_sub()
commit_interface()
current_interface_name = line[2:-2].strip()
current_interface = {"name": current_interface_name}
continue
if "=" in line and current_interface_name is not None:
key, value = line.split("=", 1)
target = current_sub if current_sub is not None else current_interface
target[key.strip()] = value.strip()
# commit any pending sections
commit_sub()
commit_interface()
return interfaces

View File

@@ -1,8 +1,6 @@
class InterfaceEditor: class InterfaceEditor:
@staticmethod @staticmethod
def update_value(interface_details: dict, data: dict, key: str): def update_value(interface_details: dict, data: dict, key: str):
# update value if provided and not empty # update value if provided and not empty
value = data.get(key) value = data.get(key)
if value is not None and value != "": if value is not None and value != "":
@@ -10,5 +8,4 @@ class InterfaceEditor:
return return
# otherwise remove existing value # otherwise remove existing value
if key in interface_details: interface_details.pop(key, None)
del interface_details[key]

View File

@@ -8,7 +8,6 @@ from websockets.sync.connection import Connection
class WebsocketClientInterface(Interface): class WebsocketClientInterface(Interface):
# TODO: required? # TODO: required?
DEFAULT_IFAC_SIZE = 16 DEFAULT_IFAC_SIZE = 16
@@ -18,7 +17,6 @@ class WebsocketClientInterface(Interface):
return f"WebsocketClientInterface[{self.name}/{self.target_url}]" return f"WebsocketClientInterface[{self.name}/{self.target_url}]"
def __init__(self, owner, configuration, websocket: Connection = None): def __init__(self, owner, configuration, websocket: Connection = None):
super().__init__() super().__init__()
self.owner = owner self.owner = owner
@@ -26,8 +24,8 @@ class WebsocketClientInterface(Interface):
self.IN = True self.IN = True
self.OUT = False self.OUT = False
self.HW_MTU = 262144 # 256KiB self.HW_MTU = 262144 # 256KiB
self.bitrate = 1_000_000_000 # 1Gbps self.bitrate = 1_000_000_000 # 1Gbps
self.mode = RNS.Interfaces.Interface.Interface.MODE_FULL self.mode = RNS.Interfaces.Interface.Interface.MODE_FULL
# parse config # parse config
@@ -48,7 +46,6 @@ class WebsocketClientInterface(Interface):
# called when a full packet has been received over the websocket # called when a full packet has been received over the websocket
def process_incoming(self, data): def process_incoming(self, data):
# do nothing if offline or detached # do nothing if offline or detached
if not self.online or self.detached: if not self.online or self.detached:
return return
@@ -65,7 +62,6 @@ class WebsocketClientInterface(Interface):
# the running reticulum transport instance will call this method whenever the interface must transmit a packet # the running reticulum transport instance will call this method whenever the interface must transmit a packet
def process_outgoing(self, data): def process_outgoing(self, data):
# do nothing if offline or detached # do nothing if offline or detached
if not self.online or self.detached: if not self.online or self.detached:
return return
@@ -74,8 +70,10 @@ class WebsocketClientInterface(Interface):
try: try:
self.websocket.send(data) self.websocket.send(data)
except Exception as e: except Exception as e:
RNS.log(f"Exception occurred while transmitting via {str(self)}", RNS.LOG_ERROR) RNS.log(
RNS.log(f"The contained exception was: {str(e)}", RNS.LOG_ERROR) f"Exception occurred while transmitting via {self!s}", RNS.LOG_ERROR,
)
RNS.log(f"The contained exception was: {e!s}", RNS.LOG_ERROR)
return return
# update sent bytes counter # update sent bytes counter
@@ -87,27 +85,27 @@ class WebsocketClientInterface(Interface):
# connect to the configured websocket server # connect to the configured websocket server
def connect(self): def connect(self):
# do nothing if interface is detached # do nothing if interface is detached
if self.detached: if self.detached:
return return
# connect to websocket server # connect to websocket server
try: try:
RNS.log(f"Connecting to Websocket for {str(self)}...", RNS.LOG_DEBUG) RNS.log(f"Connecting to Websocket for {self!s}...", RNS.LOG_DEBUG)
self.websocket = connect(f"{self.target_url}", max_size=None, compression=None) self.websocket = connect(
RNS.log(f"Connected to Websocket for {str(self)}", RNS.LOG_DEBUG) f"{self.target_url}", max_size=None, compression=None,
)
RNS.log(f"Connected to Websocket for {self!s}", RNS.LOG_DEBUG)
self.read_loop() self.read_loop()
except Exception as e: except Exception as e:
RNS.log(f"{self} failed with error: {e}", RNS.LOG_ERROR) RNS.log(f"{self} failed with error: {e}", RNS.LOG_ERROR)
# auto reconnect after delay # auto reconnect after delay
RNS.log(f"Websocket disconnected for {str(self)}...", RNS.LOG_DEBUG) RNS.log(f"Websocket disconnected for {self!s}...", RNS.LOG_DEBUG)
time.sleep(self.RECONNECT_DELAY_SECONDS) time.sleep(self.RECONNECT_DELAY_SECONDS)
self.connect() self.connect()
def read_loop(self): def read_loop(self):
self.online = True self.online = True
try: try:
@@ -119,7 +117,6 @@ class WebsocketClientInterface(Interface):
self.online = False self.online = False
def detach(self): def detach(self):
# mark as offline # mark as offline
self.online = False self.online = False
@@ -130,5 +127,6 @@ class WebsocketClientInterface(Interface):
# mark as detached # mark as detached
self.detached = True self.detached = True
# set interface class RNS should use when importing this external interface # set interface class RNS should use when importing this external interface
interface_class = WebsocketClientInterface interface_class = WebsocketClientInterface

View File

@@ -3,33 +3,31 @@ import time
import RNS import RNS
from RNS.Interfaces.Interface import Interface from RNS.Interfaces.Interface import Interface
from websockets.sync.server import Server from websockets.sync.server import Server, ServerConnection, serve
from websockets.sync.server import serve
from websockets.sync.server import ServerConnection
from src.backend.interfaces.WebsocketClientInterface import WebsocketClientInterface from src.backend.interfaces.WebsocketClientInterface import WebsocketClientInterface
class WebsocketServerInterface(Interface): class WebsocketServerInterface(Interface):
# TODO: required? # TODO: required?
DEFAULT_IFAC_SIZE = 16 DEFAULT_IFAC_SIZE = 16
RESTART_DELAY_SECONDS = 5 RESTART_DELAY_SECONDS = 5
def __str__(self): def __str__(self):
return f"WebsocketServerInterface[{self.name}/{self.listen_ip}:{self.listen_port}]" return (
f"WebsocketServerInterface[{self.name}/{self.listen_ip}:{self.listen_port}]"
)
def __init__(self, owner, configuration): def __init__(self, owner, configuration):
super().__init__() super().__init__()
self.owner = owner self.owner = owner
self.IN = True self.IN = True
self.OUT = False self.OUT = False
self.HW_MTU = 262144 # 256KiB self.HW_MTU = 262144 # 256KiB
self.bitrate = 1_000_000_000 # 1Gbps self.bitrate = 1_000_000_000 # 1Gbps
self.mode = RNS.Interfaces.Interface.Interface.MODE_FULL self.mode = RNS.Interfaces.Interface.Interface.MODE_FULL
self.server: Server | None = None self.server: Server | None = None
@@ -61,12 +59,12 @@ class WebsocketServerInterface(Interface):
def clients(self): def clients(self):
return len(self.spawned_interfaces) return len(self.spawned_interfaces)
# todo docs # TODO docs
def received_announce(self, from_spawned=False): def received_announce(self, from_spawned=False):
if from_spawned: if from_spawned:
self.ia_freq_deque.append(time.time()) self.ia_freq_deque.append(time.time())
# todo docs # TODO docs
def sent_announce(self, from_spawned=False): def sent_announce(self, from_spawned=False):
if from_spawned: if from_spawned:
self.oa_freq_deque.append(time.time()) self.oa_freq_deque.append(time.time())
@@ -80,17 +78,19 @@ class WebsocketServerInterface(Interface):
pass pass
def serve(self): def serve(self):
# handle new websocket client connections # handle new websocket client connections
def on_websocket_client_connected(websocket: ServerConnection): def on_websocket_client_connected(websocket: ServerConnection):
# create new child interface # create new child interface
RNS.log("Accepting incoming WebSocket connection", RNS.LOG_VERBOSE) RNS.log("Accepting incoming WebSocket connection", RNS.LOG_VERBOSE)
spawned_interface = WebsocketClientInterface(self.owner, { spawned_interface = WebsocketClientInterface(
"name": f"Client on {self.name}", self.owner,
"target_host": websocket.remote_address[0], {
"target_port": str(websocket.remote_address[1]), "name": f"Client on {self.name}",
}, websocket=websocket) "target_host": websocket.remote_address[0],
"target_port": str(websocket.remote_address[1]),
},
websocket=websocket,
)
# configure child interface # configure child interface
spawned_interface.IN = self.IN spawned_interface.IN = self.IN
@@ -101,16 +101,19 @@ class WebsocketServerInterface(Interface):
spawned_interface.parent_interface = self spawned_interface.parent_interface = self
spawned_interface.online = True spawned_interface.online = True
# todo implement? # TODO implement?
spawned_interface.announce_rate_target = None spawned_interface.announce_rate_target = None
spawned_interface.announce_rate_grace = None spawned_interface.announce_rate_grace = None
spawned_interface.announce_rate_penalty = None spawned_interface.announce_rate_penalty = None
# todo ifac? # TODO ifac?
# todo announce rates? # TODO announce rates?
# activate child interface # activate child interface
RNS.log(f"Spawned new WebsocketClientInterface: {spawned_interface}", RNS.LOG_VERBOSE) RNS.log(
f"Spawned new WebsocketClientInterface: {spawned_interface}",
RNS.LOG_VERBOSE,
)
RNS.Transport.interfaces.append(spawned_interface) RNS.Transport.interfaces.append(spawned_interface)
# associate child interface with this interface # associate child interface with this interface
@@ -126,8 +129,13 @@ class WebsocketServerInterface(Interface):
# run websocket server # run websocket server
try: try:
RNS.log(f"Starting Websocket server for {str(self)}...", RNS.LOG_DEBUG) RNS.log(f"Starting Websocket server for {self!s}...", RNS.LOG_DEBUG)
with serve(on_websocket_client_connected, self.listen_ip, self.listen_port, compression=None) as server: with serve(
on_websocket_client_connected,
self.listen_ip,
self.listen_port,
compression=None,
) as server:
self.online = True self.online = True
self.server = server self.server = server
server.serve_forever() server.serve_forever()
@@ -136,12 +144,11 @@ class WebsocketServerInterface(Interface):
# websocket server is no longer running, let's restart it # websocket server is no longer running, let's restart it
self.online = False self.online = False
RNS.log(f"Websocket server stopped for {str(self)}...", RNS.LOG_DEBUG) RNS.log(f"Websocket server stopped for {self!s}...", RNS.LOG_DEBUG)
time.sleep(self.RESTART_DELAY_SECONDS) time.sleep(self.RESTART_DELAY_SECONDS)
self.serve() self.serve()
def detach(self): def detach(self):
# mark as offline # mark as offline
self.online = False self.online = False
@@ -152,5 +159,6 @@ class WebsocketServerInterface(Interface):
# mark as detached # mark as detached
self.detached = True self.detached = True
# set interface class RNS should use when importing this external interface # set interface class RNS should use when importing this external interface
interface_class = WebsocketServerInterface interface_class = WebsocketServerInterface

View File

@@ -1,9 +1,5 @@
from typing import List
# helper class for passing around an lxmf audio field # helper class for passing around an lxmf audio field
class LxmfAudioField: class LxmfAudioField:
def __init__(self, audio_mode: int, audio_bytes: bytes): def __init__(self, audio_mode: int, audio_bytes: bytes):
self.audio_mode = audio_mode self.audio_mode = audio_mode
self.audio_bytes = audio_bytes self.audio_bytes = audio_bytes
@@ -11,7 +7,6 @@ class LxmfAudioField:
# helper class for passing around an lxmf image field # helper class for passing around an lxmf image field
class LxmfImageField: class LxmfImageField:
def __init__(self, image_type: str, image_bytes: bytes): def __init__(self, image_type: str, image_bytes: bytes):
self.image_type = image_type self.image_type = image_type
self.image_bytes = image_bytes self.image_bytes = image_bytes
@@ -19,7 +14,6 @@ class LxmfImageField:
# helper class for passing around an lxmf file attachment # helper class for passing around an lxmf file attachment
class LxmfFileAttachment: class LxmfFileAttachment:
def __init__(self, file_name: str, file_bytes: bytes): def __init__(self, file_name: str, file_bytes: bytes):
self.file_name = file_name self.file_name = file_name
self.file_bytes = file_bytes self.file_bytes = file_bytes
@@ -27,7 +21,5 @@ class LxmfFileAttachment:
# helper class for passing around an lxmf file attachments field # helper class for passing around an lxmf file attachments field
class LxmfFileAttachmentsField: class LxmfFileAttachmentsField:
def __init__(self, file_attachments: list[LxmfFileAttachment]):
def __init__(self, file_attachments: List[LxmfFileAttachment]):
self.file_attachments = file_attachments self.file_attachments = file_attachments

View File

@@ -7,12 +7,6 @@
<link rel="icon" type="image/png" href="favicons/favicon-512x512.png"/> <link rel="icon" type="image/png" href="favicons/favicon-512x512.png"/>
<title>Phone | Reticulum MeshChat</title> <title>Phone | Reticulum MeshChat</title>
<!-- codec2 -->
<script src="assets/js/codec2-emscripten/c2enc.js"></script>
<script src="assets/js/codec2-emscripten/c2dec.js"></script>
<script src="assets/js/codec2-emscripten/sox.js"></script>
<script src="assets/js/codec2-emscripten/codec2-lib.js"></script>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>

View File

@@ -1,10 +1,16 @@
import axios from 'axios'; import axios from 'axios';
import {createApp} from 'vue'; import { createApp } from 'vue';
import "./style.css"; import "./style.css";
import CallPage from "./components/call/CallPage.vue"; import CallPage from "./components/call/CallPage.vue";
import { ensureCodec2ScriptsLoaded } from "./js/Codec2Loader";
// provide axios globally // provide axios globally
window.axios = axios; window.axios = axios;
createApp(CallPage) async function bootstrap() {
.mount('#app'); await ensureCodec2ScriptsLoaded();
createApp(CallPage)
.mount('#app');
}
bootstrap();

View File

@@ -1,54 +1,86 @@
<template> <template>
<div :class="{'dark': config?.theme === 'dark'}" class="h-screen w-full flex flex-col"> <div :class="{'dark': config?.theme === 'dark'}" class="h-screen w-full flex flex-col bg-slate-50 dark:bg-zinc-950 transition-colors">
<!-- header --> <div v-if="isPopoutMode" class="flex flex-1 h-full w-full overflow-hidden bg-slate-50/90 dark:bg-zinc-950">
<div class="flex bg-white dark:bg-zinc-950 p-2 border-gray-300 dark:border-zinc-900 border-b min-h-16"> <RouterView class="flex-1"/>
<div class="flex w-full">
<div class="hidden sm:flex my-auto w-12 h-12 mr-2">
<img class="w-12 h-12" src="/assets/images/logo-chat-bubble.png" />
</div>
<div class="my-auto">
<div @click="onAppNameClick" class="font-bold cursor-pointer text-gray-900 dark:text-zinc-100">Reticulum MeshChat</div>
<div class="text-sm text-gray-700 dark:text-white">
Developed by
<a target="_blank" href="https://liamcottle.com" class="text-blue-500 dark:text-blue-400">Liam Cottle</a>
</div>
</div>
<div class="flex my-auto ml-auto mr-0 sm:mr-2 space-x-1 sm:space-x-2">
<button @click="syncPropagationNode" type="button" class="rounded-full">
<span class="flex text-gray-700 dark:text-white bg-gray-100 dark:bg-zinc-800 hover:bg-gray-200 dark:hover:bg-zinc-600 px-2 py-1 rounded-full">
<span :class="{ 'animate-spin': isSyncingPropagationNode }">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
<path stroke-linecap="round" stroke-linejoin="round" d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
</svg>
</span>
<span class="hidden sm:inline-block my-auto mx-1 text-sm">Sync Messages</span>
</span>
</button>
<button @click="composeNewMessage" type="button" class="rounded-full">
<span class="flex text-gray-700 dark:text-white bg-gray-100 dark:bg-zinc-800 hover:bg-gray-200 dark:hover:bg-zinc-600 px-2 py-1 rounded-full">
<span>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round" d="M21.75 6.75v10.5a2.25 2.25 0 0 1-2.25 2.25h-15a2.25 2.25 0 0 1-2.25-2.25V6.75m19.5 0A2.25 2.25 0 0 0 19.5 4.5h-15a2.25 2.25 0 0 0-2.25 2.25m19.5 0v.243a2.25 2.25 0 0 1-1.07 1.916l-7.5 4.615a2.25 2.25 0 0 1-2.36 0L3.32 8.91a2.25 2.25 0 0 1-1.07-1.916V6.75" />
</svg>
</span>
<span class="hidden sm:inline-block my-auto mx-1 text-sm">Compose</span>
</span>
</button>
</div>
</div>
</div> </div>
<!-- middle --> <template v-else>
<div ref="middle" class="flex h-full w-full overflow-auto">
<!-- sidebar --> <!-- header -->
<div class="bg-white flex w-72 min-w-72 flex-col dark:bg-zinc-950"> <div class="flex bg-white/80 dark:bg-zinc-900/70 backdrop-blur border-gray-200 dark:border-zinc-800 border-b min-h-16 shadow-sm transition-colors">
<div class="flex grow flex-col overflow-y-auto border-r border-gray-200 bg-white dark:border-zinc-900 dark:bg-zinc-950"> <div class="flex w-full">
<div class="hidden sm:flex my-auto w-12 h-12 mr-2 rounded-xl overflow-hidden bg-white/70 dark:bg-zinc-800/80 border border-gray-200 dark:border-zinc-700 shadow-inner">
<img class="w-12 h-12 object-contain p-1.5" src="/assets/images/logo-chat-bubble.png" />
</div>
<div class="my-auto">
<div @click="onAppNameClick" class="font-semibold cursor-pointer text-gray-900 dark:text-zinc-100 tracking-tight text-lg">Reticulum MeshChatX</div>
<div class="text-sm text-gray-600 dark:text-zinc-300">
Custom fork by
<a target="_blank" href="https://github.com/Sudo-Ivan" class="text-blue-500 dark:text-blue-300 hover:underline">Sudo-Ivan</a>
</div>
</div>
<div class="flex my-auto ml-auto mr-0 sm:mr-2 space-x-2">
<button @click="syncPropagationNode" type="button" class="rounded-full">
<span class="flex text-gray-800 dark:text-zinc-100 bg-white dark:bg-zinc-800/80 border border-gray-200 dark:border-zinc-700 hover:border-blue-400 dark:hover:border-blue-400/60 px-3 py-1.5 rounded-full shadow-sm transition">
<span :class="{ 'animate-spin': isSyncingPropagationNode }">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
<path stroke-linecap="round" stroke-linejoin="round" d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
</svg>
</span>
<span class="hidden sm:inline-block my-auto mx-1 text-sm font-medium">Sync Messages</span>
</span>
</button>
<button @click="composeNewMessage" type="button" class="rounded-full">
<span class="flex text-white bg-gradient-to-r from-blue-500 via-indigo-500 to-purple-500 hover:from-blue-500/90 hover:to-purple-500/90 px-3 py-1.5 rounded-full shadow-md transition">
<span>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round" d="M21.75 6.75v10.5a2.25 2.25 0 0 1-2.25 2.25h-15a2.25 2.25 0 0 1-2.25-2.25V6.75m19.5 0A2.25 2.25 0 0 0 19.5 4.5h-15a2.25 2.25 0 0 0-2.25 2.25m19.5 0v.243a2.25 2.25 0 0 1-1.07 1.916l-7.5 4.615a2.25 2.25 0 0 1-2.36 0L3.32 8.91a2.25 2.25 0 0 1-1.07-1.916V6.75" />
</svg>
</span>
<span class="hidden sm:inline-block my-auto mx-1 text-sm font-semibold">Compose</span>
</span>
</button>
</div>
</div>
</div>
<!-- navigation --> <!-- onboarding / guidance -->
<div class="flex-1"> <div v-if="hasGuidanceMessages" class="border-b border-amber-200/60 bg-amber-50/70 text-amber-900 dark:bg-amber-950/30 dark:border-amber-800/40 dark:text-amber-100 transition">
<ul class="py-2 pr-2 space-y-1"> <div class="max-w-5xl mx-auto px-4 py-4 space-y-3">
<div
v-for="message in guidanceMessages"
:key="message.id"
class="flex flex-col gap-2 rounded-2xl border p-4 text-sm sm:flex-row sm:items-center shadow-sm"
:class="guidanceCardClass(message)"
>
<div class="space-y-1">
<div class="font-semibold">{{ message.title }}</div>
<div class="text-xs sm:text-sm text-amber-900/80 dark:text-amber-100/80">{{ message.description }}</div>
</div>
<div v-if="message.action_route" class="sm:ml-auto">
<button
type="button"
@click="navigateTo(message.action_route)"
class="inline-flex items-center rounded-full bg-amber-600/90 px-3 py-1.5 text-xs font-semibold text-white shadow hover:bg-amber-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-amber-600"
>
{{ message.action_label || 'Open' }}
</button>
</div>
</div>
</div>
</div>
<!-- middle -->
<div ref="middle" class="flex h-full w-full overflow-hidden bg-slate-50/80 dark:bg-zinc-950 transition-colors">
<!-- sidebar -->
<div class="bg-transparent flex w-72 min-w-72 flex-col">
<div class="flex grow flex-col overflow-y-auto border-r border-gray-200/70 bg-white/80 dark:border-zinc-800 dark:bg-zinc-900/70 backdrop-blur">
<!-- navigation -->
<div class="flex-1">
<ul class="py-3 pr-2 space-y-1">
<!-- messages --> <!-- messages -->
<li> <li>
@@ -144,8 +176,8 @@
<div> <div>
<!-- my identity --> <!-- my identity -->
<div v-if="config" class="bg-white border-t dark:border-zinc-900 dark:bg-zinc-950"> <div v-if="config" class="bg-white/80 border-t dark:border-zinc-800 dark:bg-zinc-900/70 backdrop-blur">
<div @click="isShowingMyIdentitySection = !isShowingMyIdentitySection" class="flex text-gray-700 p-2 cursor-pointer"> <div @click="isShowingMyIdentitySection = !isShowingMyIdentitySection" class="flex text-gray-700 p-3 cursor-pointer">
<div class="my-auto mr-2"> <div class="my-auto mr-2">
<RouterLink @click.stop :to="{ name: 'profile.icon' }"> <RouterLink @click.stop :to="{ name: 'profile.icon' }">
<LxmfUserIcon <LxmfUserIcon
@@ -162,8 +194,8 @@
</button> </button>
</div> </div>
</div> </div>
<div v-if="isShowingMyIdentitySection" class="divide-y text-gray-900 border-t border-gray-300 dark:text-zinc-200 dark:border-zinc-900"> <div v-if="isShowingMyIdentitySection" class="divide-y text-gray-900 border-t border-gray-200 dark:text-zinc-200 dark:border-zinc-800">
<div class="p-1"> <div class="p-2">
<input <input
v-model="displayName" v-model="displayName"
type="text" type="text"
@@ -172,11 +204,11 @@
dark:bg-zinc-800 dark:border-zinc-600 dark:text-zinc-200 dark:focus:ring-blue-400 dark:focus:border-blue-400" dark:bg-zinc-800 dark:border-zinc-600 dark:text-zinc-200 dark:focus:ring-blue-400 dark:focus:border-blue-400"
> >
</div> </div>
<div class="p-1 dark:border-zinc-900"> <div class="p-2 dark:border-zinc-900">
<div>Identity Hash</div> <div>Identity Hash</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">{{ config.identity_hash }}</div> <div class="text-sm text-gray-700 dark:text-zinc-400">{{ config.identity_hash }}</div>
</div> </div>
<div class="p-1 dark:border-zinc-900"> <div class="p-2 dark:border-zinc-900">
<div>LXMF Address</div> <div>LXMF Address</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">{{ config.lxmf_address_hash }}</div> <div class="text-sm text-gray-700 dark:text-zinc-400">{{ config.lxmf_address_hash }}</div>
</div> </div>
@@ -184,8 +216,8 @@
</div> </div>
<!-- auto announce --> <!-- auto announce -->
<div v-if="config" class="bg-white border-t dark:bg-zinc-950 dark:border-zinc-900"> <div v-if="config" class="bg-white/80 border-t dark:bg-zinc-900/70 dark:border-zinc-800">
<div @click="isShowingAnnounceSection = !isShowingAnnounceSection" class="flex text-gray-700 p-2 cursor-pointer dark:text-white"> <div @click="isShowingAnnounceSection = !isShowingAnnounceSection" class="flex text-gray-700 p-3 cursor-pointer dark:text-white">
<div class="my-auto mr-2"> <div class="my-auto mr-2">
<svg <svg
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
@@ -214,8 +246,8 @@
</button> </button>
</div> </div>
</div> </div>
<div v-if="isShowingAnnounceSection" class="divide-y text-gray-900 border-t border-gray-300 dark:text-zinc-200 dark:border-zinc-900"> <div v-if="isShowingAnnounceSection" class="divide-y text-gray-900 border-t border-gray-200 dark:text-zinc-200 dark:border-zinc-900">
<div class="p-1 dark:border-zinc-900"> <div class="p-2 dark:border-zinc-900">
<select <select
v-model="config.auto_announce_interval_seconds" v-model="config.auto_announce_interval_seconds"
@change="onAnnounceIntervalSecondsChange" @change="onAnnounceIntervalSecondsChange"
@@ -240,8 +272,8 @@
</div> </div>
<!-- audio calls --> <!-- audio calls -->
<div v-if="config" class="bg-white border-t dark:bg-zinc-950 dark:border-zinc-900"> <div v-if="config" class="bg-white/80 border-t dark:bg-zinc-900/70 dark:border-zinc-900">
<div @click="isShowingCallsSection = !isShowingCallsSection" class="flex text-gray-700 p-2 cursor-pointer"> <div @click="isShowingCallsSection = !isShowingCallsSection" class="flex text-gray-700 p-3 cursor-pointer">
<div class="my-auto mr-2"> <div class="my-auto mr-2">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="dark:text-white w-6 h-6"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="dark:text-white w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round" d="M2.25 6.75c0 8.284 6.716 15 15 15h2.25a2.25 2.25 0 0 0 2.25-2.25v-1.372c0-.516-.351-.966-.852-1.091l-4.423-1.106c-.44-.11-.902.055-1.173.417l-.97 1.293c-.282.376-.769.542-1.21.38a12.035 12.035 0 0 1-7.143-7.143c-.162-.441.004-.928.38-1.21l1.293-.97c.363-.271.527-.734.417-1.173L6.963 3.102a1.125 1.125 0 0 0-1.091-.852H4.5A2.25 2.25 0 0 0 2.25 4.5v2.25Z" /> <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 6.75c0 8.284 6.716 15 15 15h2.25a2.25 2.25 0 0 0 2.25-2.25v-1.372c0-.516-.351-.966-.852-1.091l-4.423-1.106c-.44-.11-.902.055-1.173.417l-.97 1.293c-.282.376-.769.542-1.21.38a12.035 12.035 0 0 1-7.143-7.143c-.162-.441.004-.928.38-1.21l1.293-.97c.363-.271.527-.734.417-1.173L6.963 3.102a1.125 1.125 0 0 0-1.091-.852H4.5A2.25 2.25 0 0 0 2.25 4.5v2.25Z" />
@@ -249,19 +281,15 @@
</div> </div>
<div class="my-auto dark:text-white">Calls</div> <div class="my-auto dark:text-white">Calls</div>
<div class="ml-auto"> <div class="ml-auto">
<a @click.stop href="../call.html" target="_blank" class="my-auto inline-flex items-center gap-x-1 rounded-md bg-gray-500 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 <RouterLink :to="{ name: 'call' }" class="inline-flex items-center justify-center w-8 h-8 rounded-lg bg-gray-100 dark:bg-zinc-800 hover:bg-gray-200 dark:hover:bg-zinc-700 text-gray-700 dark:text-zinc-300 transition-colors overflow-hidden">
dark:bg-zinc-800 dark:text-white dark:hover:bg-zinc-700 dark:focus-visible:outline-zinc-500 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-4 h-4 flex-shrink-0">
"> <path fill-rule="evenodd" d="M2.25 6.75c0 8.284 6.716 15 15 15h2.25a2.25 2.25 0 0 0 2.25-2.25v-1.372c0-.516-.351-.966-.852-1.091l-4.423-1.106c-.44-.11-.902.055-1.173.417l-.97 1.293c-.282.376-.769.542-1.21.38a12.035 12.035 0 0 1-7.143-7.143c-.162-.441.004-.928.38-1.21l1.293-.97c.363-.271.527-.734.417-1.173L6.963 3.102a1.125 1.125 0 0 0-1.091-.852H4.5A2.25 2.25 0 0 0 2.25 4.5v2.25Z" clip-rule="evenodd" />
<span>Open Phone</span>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
<path fill-rule="evenodd" d="M4.25 5.5a.75.75 0 0 0-.75.75v8.5c0 .414.336.75.75.75h8.5a.75.75 0 0 0 .75-.75v-4a.75.75 0 0 1 1.5 0v4A2.25 2.25 0 0 1 12.75 17h-8.5A2.25 2.25 0 0 1 2 14.75v-8.5A2.25 2.25 0 0 1 4.25 4h5a.75.75 0 0 1 0 1.5h-5Z" clip-rule="evenodd" />
<path fill-rule="evenodd" d="M6.194 12.753a.75.75 0 0 0 1.06.053L16.5 4.44v2.81a.75.75 0 0 0 1.5 0v-4.5a.75.75 0 0 0-.75-.75h-4.5a.75.75 0 0 0 0 1.5h2.553l-9.056 8.194a.75.75 0 0 0-.053 1.06Z" clip-rule="evenodd" />
</svg> </svg>
</a> </RouterLink>
</div> </div>
</div> </div>
<div v-if="isShowingCallsSection" class="divide-y text-gray-900 border-t border-gray-300 dark:border-zinc-900"> <div v-if="isShowingCallsSection" class="divide-y text-gray-900 border-t border-gray-200 dark:border-zinc-900">
<div class="p-1 flex dark:border-zinc-900 dark:text-white"> <div class="p-2 flex dark:border-zinc-900 dark:text-white">
<div> <div>
<div>Status</div> <div>Status</div>
<div class="text-sm text-gray-700 dark:text-white"> <div class="text-sm text-gray-700 dark:text-white">
@@ -299,9 +327,10 @@ dark:bg-zinc-800 dark:text-white dark:hover:bg-zinc-700 dark:focus-visible:outli
</div> </div>
</div> </div>
<RouterView/> <RouterView v-if="!isPopoutMode"/>
</div> </div>
</template>
</div> </div>
</template> </template>
@@ -326,6 +355,7 @@ export default {
return { return {
reloadInterval: null, reloadInterval: null,
appInfoInterval: null,
isShowingMyIdentitySection: true, isShowingMyIdentitySection: true,
isShowingAnnounceSection: true, isShowingAnnounceSection: true,
@@ -343,6 +373,7 @@ export default {
beforeUnmount() { beforeUnmount() {
clearInterval(this.reloadInterval); clearInterval(this.reloadInterval);
clearInterval(this.appInfoInterval);
// stop listening for websocket messages // stop listening for websocket messages
WebSocketConnection.off("message", this.onWebsocketMessage); WebSocketConnection.off("message", this.onWebsocketMessage);
@@ -354,6 +385,7 @@ export default {
WebSocketConnection.on("message", this.onWebsocketMessage); WebSocketConnection.on("message", this.onWebsocketMessage);
this.getAppInfo(); this.getAppInfo();
this.getConfig();
this.updateCallsList(); this.updateCallsList();
this.updatePropagationNodeStatus(); this.updatePropagationNodeStatus();
@@ -362,9 +394,52 @@ export default {
this.updateCallsList(); this.updateCallsList();
this.updatePropagationNodeStatus(); this.updatePropagationNodeStatus();
}, 3000); }, 3000);
this.appInfoInterval = setInterval(() => {
this.getAppInfo();
}, 15000);
}, },
computed: {
currentPopoutType() {
if(this.$route?.meta?.popoutType){
return this.$route.meta.popoutType;
}
return this.$route?.query?.popout ?? this.getHashPopoutValue();
},
isPopoutMode() {
return this.currentPopoutType != null;
},
hasGuidanceMessages() {
return this.guidanceMessages.length > 0;
},
guidanceMessages() {
if (!this.appInfo || !Array.isArray(this.appInfo.user_guidance)) {
return [];
}
return this.appInfo.user_guidance;
},
},
methods: { methods: {
guidanceCardClass(message) {
switch(message.severity){
case 'warning':
return 'border-amber-200 bg-white text-amber-900 dark:bg-transparent dark:border-amber-300/40';
case 'info':
default:
return 'border-amber-100 bg-white text-amber-900 dark:bg-transparent dark:border-amber-200/30';
}
},
navigateTo(routePath) {
if (!routePath) {
return;
}
this.$router.push(routePath);
},
getHashPopoutValue() {
const hash = window.location.hash || "";
const match = hash.match(/popout=([^&]+)/);
return match ? decodeURIComponent(match[1]) : null;
},
async onWebsocketMessage(message) { async onWebsocketMessage(message) {
const json = JSON.parse(message.data); const json = JSON.parse(message.data);
switch(json.type){ switch(json.type){

View File

@@ -1,5 +1,5 @@
<template> <template>
<button type="button" class="text-gray-700 bg-gray-100 dark:bg-zinc-600 dark:text-white dark:hover:bg-zinc-700 dark:focus-visible:outline-zinc-500 hover:bg-gray-200 p-2 rounded-full"> <button type="button" class="text-gray-700 bg-gray-100 dark:bg-zinc-600 dark:text-white dark:hover:bg-zinc-700 dark:focus-visible:outline-zinc-500 hover:bg-gray-200 p-2 rounded-full w-8 h-8 flex items-center justify-center flex-shrink-0">
<slot/> <slot/>
</button> </button>
</template> </template>

View File

@@ -1,253 +1,200 @@
<template> <template>
<div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] dark:bg-zinc-950"> <div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] bg-gradient-to-br from-slate-50 via-slate-100 to-white dark:from-zinc-950 dark:via-zinc-900 dark:to-zinc-900">
<div class="overflow-y-auto space-y-2 p-2"> <div class="flex-1 overflow-y-auto w-full px-4 md:px-8 py-6">
<div class="space-y-4 w-full max-w-6xl mx-auto">
<!-- app info --> <div v-if="appInfo" class="glass-card">
<div v-if="appInfo" class="bg-white dark:bg-zinc-900 rounded shadow"> <div class="flex flex-col gap-4 md:flex-row md:items-center">
<div class="flex border-b border-gray-300 dark:border-zinc-700 text-gray-700 dark:text-zinc-200 p-2 font-semibold">App Info</div> <div class="flex-1 space-y-2">
<div class="divide-y divide-gray-200 dark:divide-zinc-800 text-gray-900 dark:text-zinc-200"> <div class="text-xs uppercase tracking-wide text-gray-500 dark:text-gray-400">About</div>
<div class="text-3xl font-semibold text-gray-900 dark:text-white">Reticulum MeshChatX</div>
<div class="text-sm text-gray-600 dark:text-gray-300">
v{{ appInfo.version }} RNS {{ appInfo.rns_version }} LXMF {{ appInfo.lxmf_version }} Python {{ appInfo.python_version }}
</div>
</div>
<div v-if="isElectron" class="flex flex-col sm:flex-row gap-2">
<button @click="relaunch" type="button" class="primary-chip px-4 py-2 text-sm justify-center">
<MaterialDesignIcon icon-name="restart" class="w-4 h-4"/>
Restart App
</button>
</div>
</div>
<div class="grid gap-3 sm:grid-cols-3 mt-4 text-sm text-gray-700 dark:text-gray-300">
<div>
<div class="glass-label">Config path</div>
<div class="monospace-field break-all">{{ appInfo.reticulum_config_path }}</div>
<button v-if="isElectron" @click="showReticulumConfigFile" type="button" class="secondary-chip mt-2 text-xs">
<MaterialDesignIcon icon-name="folder" class="w-4 h-4"/>
Reveal
</button>
</div>
<div>
<div class="glass-label">Database path</div>
<div class="monospace-field break-all">{{ appInfo.database_path }}</div>
<button v-if="isElectron" @click="showDatabaseFile" type="button" class="secondary-chip mt-2 text-xs">
<MaterialDesignIcon icon-name="database" class="w-4 h-4"/>
Reveal
</button>
</div>
<div>
<div class="glass-label">Database size</div>
<div class="text-lg font-semibold text-gray-900 dark:text-white">{{ formatBytes(appInfo.database_file_size) }}</div>
</div>
</div>
</div>
<!-- version --> <div class="grid gap-4 lg:grid-cols-2">
<div class="flex p-1"> <div v-if="appInfo?.memory_usage" class="glass-card space-y-3">
<div class="mr-auto"> <header class="flex items-center gap-2">
<div>Versions</div> <MaterialDesignIcon icon-name="chip" class="w-5 h-5 text-blue-500"/>
<div class="text-sm text-gray-700 dark:text-zinc-400"> <div>
MeshChat v{{ appInfo.version }} RNS v{{ appInfo.rns_version }} LXMF v{{ appInfo.lxmf_version }} Python v{{ appInfo.python_version }} <div class="text-lg font-semibold text-gray-900 dark:text-white">System Resources</div>
<div class="text-xs text-emerald-500 flex items-center gap-1">
<span class="w-2 h-2 rounded-full bg-emerald-500 animate-pulse"></span>
Live
</div> </div>
</div> </div>
<div class="hidden sm:block mx-2 my-auto"> </header>
<a target="_blank" <div class="metric-row">
href="https://github.com/liamcottle/reticulum-meshchat/releases" <div>
type="button" <div class="glass-label">Memory (RSS)</div>
class="my-auto inline-flex items-center gap-x-1 rounded-md bg-gray-500 dark:bg-zinc-700 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 dark:hover:bg-zinc-600 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 dark:focus-visible:outline-zinc-600"> <div class="metric-value">{{ formatBytes(appInfo.memory_usage.rss) }}</div>
Check for Updates </div>
</a> <div>
<div class="glass-label">Virtual Memory</div>
<div class="metric-value">{{ formatBytes(appInfo.memory_usage.vms) }}</div>
</div> </div>
</div> </div>
</div>
<!-- reticulum config path --> <div v-if="appInfo?.network_stats" class="glass-card space-y-3">
<div class="flex p-1"> <header class="flex items-center gap-2">
<div class="mr-auto"> <MaterialDesignIcon icon-name="access-point-network" class="w-5 h-5 text-purple-500"/>
<div>Reticulum Config Path</div> <div>
<div class="text-sm text-gray-700 dark:text-zinc-400 break-all">{{ appInfo.reticulum_config_path }}</div> <div class="text-lg font-semibold text-gray-900 dark:text-white">Network Stats</div>
<div class="text-xs text-emerald-500 flex items-center gap-1">
<span class="w-2 h-2 rounded-full bg-emerald-500 animate-pulse"></span>
Live
</div>
</div> </div>
<div v-if="isElectron" class="mx-2 my-auto"> </header>
<button @click="showReticulumConfigFile" <div class="metric-row">
type="button" <div>
class="my-auto inline-flex items-center gap-x-1 rounded-md bg-gray-500 dark:bg-zinc-700 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 dark:hover:bg-zinc-600 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 dark:focus-visible:outline-zinc-600"> <div class="glass-label">Sent</div>
Show in Folder <div class="metric-value">{{ formatBytes(appInfo.network_stats.bytes_sent) }}</div>
</button> </div>
<div>
<div class="glass-label">Received</div>
<div class="metric-value">{{ formatBytes(appInfo.network_stats.bytes_recv) }}</div>
</div> </div>
</div> </div>
<div class="metric-row">
<!-- database path --> <div>
<div class="flex p-1"> <div class="glass-label">Packets Sent</div>
<div class="mr-auto"> <div class="metric-value">{{ formatNumber(appInfo.network_stats.packets_sent) }}</div>
<div>Database Path</div>
<div class="text-sm text-gray-700 dark:text-zinc-400 break-all">{{ appInfo.database_path }}</div>
</div> </div>
<div v-if="isElectron" class="mx-2 my-auto"> <div>
<button @click="showDatabaseFile" <div class="glass-label">Packets Received</div>
type="button" <div class="metric-value">{{ formatNumber(appInfo.network_stats.packets_recv) }}</div>
class="my-auto inline-flex items-center gap-x-1 rounded-md bg-gray-500 dark:bg-zinc-700 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 dark:hover:bg-zinc-600 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 dark:focus-visible:outline-zinc-600">
Show in Folder
</button>
</div> </div>
</div> </div>
</div>
<!-- database file size --> <div v-if="appInfo?.reticulum_stats" class="glass-card space-y-3">
<div class="p-1"> <header class="flex items-center gap-2">
<div>Database File Size</div> <MaterialDesignIcon icon-name="diagram-projector" class="w-5 h-5 text-indigo-500"/>
<div class="text-sm text-gray-700 dark:text-zinc-400">{{ formatBytes(appInfo.database_file_size) }}</div> <div>
<div class="text-lg font-semibold text-gray-900 dark:text-white">Reticulum Stats</div>
<div class="text-xs text-emerald-500 flex items-center gap-1">
<span class="w-2 h-2 rounded-full bg-emerald-500 animate-pulse"></span>
Live
</div>
</div>
</header>
<div class="metric-grid">
<div>
<div class="glass-label">Total Paths</div>
<div class="metric-value">{{ formatNumber(appInfo.reticulum_stats.total_paths) }}</div>
</div>
<div>
<div class="glass-label">Announces / sec</div>
<div class="metric-value">{{ formatNumber(appInfo.reticulum_stats.announces_per_second) }}</div>
</div>
<div>
<div class="glass-label">Announces / min</div>
<div class="metric-value">{{ formatNumber(appInfo.reticulum_stats.announces_per_minute) }}</div>
</div>
<div>
<div class="glass-label">Announces / hr</div>
<div class="metric-value">{{ formatNumber(appInfo.reticulum_stats.announces_per_hour) }}</div>
</div>
</div> </div>
</div>
<div v-if="appInfo?.download_stats" class="glass-card space-y-3">
<header class="flex items-center gap-2">
<MaterialDesignIcon icon-name="download" class="w-5 h-5 text-sky-500"/>
<div>
<div class="text-lg font-semibold text-gray-900 dark:text-white">Download Activity</div>
<div class="text-xs text-emerald-500 flex items-center gap-1">
<span class="w-2 h-2 rounded-full bg-emerald-500 animate-pulse"></span>
Live
</div>
</div>
</header>
<div class="metric-value">
<span v-if="appInfo.download_stats.avg_download_speed_bps !== null">
{{ formatBytesPerSecond(appInfo.download_stats.avg_download_speed_bps) }}
</span>
<span v-else class="text-sm text-gray-500">No downloads yet</span>
</div>
</div> </div>
</div> </div>
<!-- system resources --> <div v-if="appInfo" class="glass-card space-y-3">
<div v-if="appInfo && appInfo.memory_usage" class="bg-white dark:bg-zinc-900 rounded shadow"> <div class="text-lg font-semibold text-gray-900 dark:text-white">Runtime Status</div>
<div class="flex border-b border-gray-300 dark:border-zinc-700 text-gray-700 dark:text-zinc-200 p-2 font-semibold"> <div class="flex flex-wrap gap-3">
System Resources <span :class="statusPillClass(!appInfo.is_connected_to_shared_instance)">
<span class="ml-auto text-xs text-green-600 dark:text-green-400 flex items-center"> <MaterialDesignIcon icon-name="server" class="w-4 h-4"/>
<span class="w-2 h-2 bg-green-500 rounded-full mr-1 animate-pulse"></span> {{ appInfo.is_connected_to_shared_instance ? 'Shared Instance' : 'Standalone Instance' }}
Live </span>
<span :class="statusPillClass(appInfo.is_transport_enabled)">
<MaterialDesignIcon icon-name="transit-connection" class="w-4 h-4"/>
{{ appInfo.is_transport_enabled ? 'Transport Enabled' : 'Transport Disabled' }}
</span> </span>
</div> </div>
<div class="divide-y divide-gray-200 dark:divide-zinc-800 text-gray-900 dark:text-zinc-200">
<!-- memory usage -->
<div class="flex p-1">
<div class="mr-auto">
<div>Memory Usage (RSS)</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">{{ formatBytes(appInfo.memory_usage.rss) }}</div>
</div>
</div>
<!-- virtual memory -->
<div class="flex p-1">
<div class="mr-auto">
<div>Virtual Memory Size</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">{{ formatBytes(appInfo.memory_usage.vms) }}</div>
</div>
</div>
</div>
</div> </div>
<!-- network statistics --> <div v-if="config" class="glass-card space-y-4">
<div v-if="appInfo && appInfo.network_stats" class="bg-white dark:bg-zinc-900 rounded shadow"> <div class="text-lg font-semibold text-gray-900 dark:text-white">Identity & Addresses</div>
<div class="flex border-b border-gray-300 dark:border-zinc-700 text-gray-700 dark:text-zinc-200 p-2 font-semibold"> <div class="grid gap-3 md:grid-cols-2">
Network Statistics <div class="address-card">
<span class="ml-auto text-xs text-green-600 dark:text-green-400 flex items-center"> <div class="glass-label">Identity Hash</div>
<span class="w-2 h-2 bg-green-500 rounded-full mr-1 animate-pulse"></span> <div class="monospace-field break-all">{{ config.identity_hash }}</div>
Live <button @click="copyValue(config.identity_hash, 'Identity Hash')" type="button" class="secondary-chip mt-3 text-xs">
</span> <MaterialDesignIcon icon-name="content-copy" class="w-4 h-4"/>
</div> Copy
<div class="divide-y divide-gray-200 dark:divide-zinc-800 text-gray-900 dark:text-zinc-200"> </button>
<!-- bytes sent -->
<div class="flex p-1">
<div class="mr-auto">
<div>Data Sent</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">{{ formatBytes(appInfo.network_stats.bytes_sent) }}</div>
</div>
</div> </div>
<div class="address-card">
<!-- bytes received --> <div class="glass-label">LXMF Address</div>
<div class="flex p-1"> <div class="monospace-field break-all">{{ config.lxmf_address_hash }}</div>
<div class="mr-auto"> <button @click="copyValue(config.lxmf_address_hash, 'LXMF Address')" type="button" class="secondary-chip mt-3 text-xs">
<div>Data Received</div> <MaterialDesignIcon icon-name="account-network" class="w-4 h-4"/>
<div class="text-sm text-gray-700 dark:text-zinc-400">{{ formatBytes(appInfo.network_stats.bytes_recv) }}</div> Copy
</div> </button>
</div> </div>
<div class="address-card">
<!-- packets sent --> <div class="glass-label">Propagation Node</div>
<div class="p-1"> <div class="monospace-field break-all">{{ config.lxmf_local_propagation_node_address_hash || '—' }}</div>
<div>Packets Sent</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">{{ formatNumber(appInfo.network_stats.packets_sent) }}</div>
</div> </div>
<div class="address-card">
<!-- packets received --> <div class="glass-label">Audio Call Address</div>
<div class="p-1"> <div class="monospace-field break-all">{{ config.audio_call_address_hash || '—' }}</div>
<div>Packets Received</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">{{ formatNumber(appInfo.network_stats.packets_recv) }}</div>
</div>
</div>
</div>
<!-- reticulum statistics -->
<div v-if="appInfo && appInfo.reticulum_stats" class="bg-white dark:bg-zinc-900 rounded shadow">
<div class="flex border-b border-gray-300 dark:border-zinc-700 text-gray-700 dark:text-zinc-200 p-2 font-semibold">
Reticulum Statistics
<span class="ml-auto text-xs text-green-600 dark:text-green-400 flex items-center">
<span class="w-2 h-2 bg-green-500 rounded-full mr-1 animate-pulse"></span>
Live
</span>
</div>
<div class="divide-y divide-gray-200 dark:divide-zinc-800 text-gray-900 dark:text-zinc-200">
<!-- total paths -->
<div class="p-1">
<div>Total Paths</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">{{ formatNumber(appInfo.reticulum_stats.total_paths) }}</div>
</div>
<!-- announces per second -->
<div class="p-1">
<div>Announces per Second</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">{{ formatNumber(appInfo.reticulum_stats.announces_per_second) }}</div>
</div>
<!-- announces per minute -->
<div class="p-1">
<div>Announces per Minute</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">{{ formatNumber(appInfo.reticulum_stats.announces_per_minute) }}</div>
</div>
<!-- announces per hour -->
<div class="p-1">
<div>Announces per Hour</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">{{ formatNumber(appInfo.reticulum_stats.announces_per_hour) }}</div>
</div>
</div>
</div>
<!-- download statistics -->
<div v-if="appInfo && appInfo.download_stats" class="bg-white dark:bg-zinc-900 rounded shadow">
<div class="flex border-b border-gray-300 dark:border-zinc-700 text-gray-700 dark:text-zinc-200 p-2 font-semibold">
Download Statistics
<span class="ml-auto text-xs text-green-600 dark:text-green-400 flex items-center">
<span class="w-2 h-2 bg-green-500 rounded-full mr-1 animate-pulse"></span>
Live
</span>
</div>
<div class="divide-y divide-gray-200 dark:divide-zinc-800 text-gray-900 dark:text-zinc-200">
<!-- average download speed -->
<div class="p-1">
<div>Average Download Speed</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">
<span v-if="appInfo.download_stats.avg_download_speed_bps !== null">
{{ formatBytesPerSecond(appInfo.download_stats.avg_download_speed_bps) }}
</span>
<span v-else>No downloads yet</span>
</div>
</div>
</div>
</div>
<!-- reticulum status -->
<div v-if="appInfo" class="bg-white dark:bg-zinc-900 rounded shadow">
<div class="flex border-b border-gray-300 dark:border-zinc-700 text-gray-700 dark:text-zinc-200 p-2 font-semibold">Reticulum Status</div>
<div class="divide-y divide-gray-200 dark:divide-zinc-800 text-gray-900 dark:text-zinc-200">
<!-- instance mode -->
<div class="p-1">
<div>Instance Mode</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">
<span v-if="appInfo.is_connected_to_shared_instance" class="text-orange-600 dark:text-orange-400">Connected to Shared Instance</span>
<span v-else class="text-green-600 dark:text-green-400">Running as Standalone Instance</span>
</div>
</div>
<!-- transport mode -->
<div class="p-1">
<div>Transport Mode</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">
<span v-if="appInfo.is_transport_enabled" class="text-green-600 dark:text-green-400">Transport Enabled</span>
<span v-else class="text-orange-600 dark:text-orange-400">Transport Disabled</span>
</div>
</div>
</div>
</div>
<!-- my addresses -->
<div v-if="config" class="bg-white dark:bg-zinc-900 rounded shadow">
<div class="flex border-b border-gray-300 dark:border-zinc-700 text-gray-700 dark:text-zinc-200 p-2 font-semibold">My Addresses</div>
<div class="divide-y divide-gray-200 dark:divide-zinc-800 text-gray-900 dark:text-zinc-200">
<div class="p-1">
<div>Identity Hash</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">{{ config.identity_hash }}</div>
</div>
<div class="p-1">
<div>LXMF Address</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">{{ config.lxmf_address_hash }}</div>
</div>
<div class="p-1">
<div>LXMF Propagation Node Address</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">{{ config.lxmf_local_propagation_node_address_hash }}</div>
</div>
<div class="p-1">
<div>Audio Call Address</div>
<div class="text-sm text-gray-700 dark:text-zinc-400">{{ config.audio_call_address_hash }}</div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>
</template> </template>
@@ -255,8 +202,13 @@
<script> <script>
import Utils from "../../js/Utils"; import Utils from "../../js/Utils";
import ElectronUtils from "../../js/ElectronUtils"; import ElectronUtils from "../../js/ElectronUtils";
import MaterialDesignIcon from "../MaterialDesignIcon.vue";
import DialogUtils from "../../js/DialogUtils";
export default { export default {
name: 'AboutPage', name: 'AboutPage',
components: {
MaterialDesignIcon,
},
data() { data() {
return { return {
appInfo: null, appInfo: null,
@@ -296,6 +248,20 @@ export default {
console.log(e); console.log(e);
} }
}, },
async copyValue(value, label) {
if(!value){
return;
}
try {
await navigator.clipboard.writeText(value);
DialogUtils.toast?.(`${label} copied`) ?? DialogUtils.alert(`${label} copied to clipboard`);
} catch(e) {
DialogUtils.alert(`Failed to copy ${label}`);
}
},
relaunch() {
ElectronUtils.relaunch();
},
showReticulumConfigFile() { showReticulumConfigFile() {
const reticulumConfigPath = this.appInfo.reticulum_config_path; const reticulumConfigPath = this.appInfo.reticulum_config_path;
if(reticulumConfigPath){ if(reticulumConfigPath){
@@ -317,6 +283,11 @@ export default {
formatBytesPerSecond: function(bytesPerSecond) { formatBytesPerSecond: function(bytesPerSecond) {
return Utils.formatBytesPerSecond(bytesPerSecond); return Utils.formatBytesPerSecond(bytesPerSecond);
}, },
statusPillClass(isGood) {
return isGood
? "inline-flex items-center gap-1 rounded-full bg-emerald-100 text-emerald-700 px-3 py-1 text-xs font-semibold"
: "inline-flex items-center gap-1 rounded-full bg-orange-100 text-orange-700 px-3 py-1 text-xs font-semibold";
},
}, },
computed: { computed: {
isElectron() { isElectron() {

View File

@@ -1,61 +1,62 @@
<template> <template>
<div class="flex w-full h-full bg-gray-100 dark:bg-zinc-950" :class="{'dark': config?.theme === 'dark'}"> <div class="flex w-full h-full bg-gray-50 dark:bg-zinc-950" :class="{'dark': config?.theme === 'dark'}">
<div class="mx-auto my-auto w-full max-w-xl p-4"> <div class="mx-auto my-auto w-full max-w-2xl p-4 sm:p-6">
<!-- in active call --> <!-- in active call -->
<div v-if="isWebsocketConnected" class="w-full"> <div v-if="isWebsocketConnected" class="w-full">
<div class="border rounded-xl bg-white shadow w-full"> <div class="border border-gray-200 dark:border-zinc-800 rounded-2xl bg-white dark:bg-zinc-900 shadow-lg w-full overflow-hidden">
<div class="flex border-b border-gray-300 text-gray-700 p-2"> <div class="flex items-center border-b border-gray-200 dark:border-zinc-800 bg-white/80 dark:bg-zinc-900/80 backdrop-blur-sm px-4 py-3">
<div class="my-auto mr-2"> <div class="my-auto mr-2">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round" d="M2.25 6.75c0 8.284 6.716 15 15 15h2.25a2.25 2.25 0 0 0 2.25-2.25v-1.372c0-.516-.351-.966-.852-1.091l-4.423-1.106c-.44-.11-.902.055-1.173.417l-.97 1.293c-.282.376-.769.542-1.21.38a12.035 12.035 0 0 1-7.143-7.143c-.162-.441.004-.928.38-1.21l1.293-.97c.363-.271.527-.734.417-1.173L6.963 3.102a1.125 1.125 0 0 0-1.091-.852H4.5A2.25 2.25 0 0 0 2.25 4.5v2.25Z" /> <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 6.75c0 8.284 6.716 15 15 15h2.25a2.25 2.25 0 0 0 2.25-2.25v-1.372c0-.516-.351-.966-.852-1.091l-4.423-1.106c-.44-.11-.902.055-1.173.417l-.97 1.293c-.282.376-.769.542-1.21.38a12.035 12.035 0 0 1-7.143-7.143c-.162-.441.004-.928.38-1.21l1.293-.97c.363-.271.527-.734.417-1.173L6.963 3.102a1.125 1.125 0 0 0-1.091-.852H4.5A2.25 2.25 0 0 0 2.25 4.5v2.25Z" />
</svg> </svg>
</div> </div>
<div class="my-auto">Active Call</div> <div class="font-semibold text-gray-900 dark:text-zinc-100">Active Call</div>
</div> </div>
<div class="border-b border-gray-300 text-gray-700 p-2"> <div class="border-b border-gray-200 dark:border-zinc-800 p-4 space-y-3">
<div class="mb-2"> <div>
<div class="mb-1 text-sm font-medium text-gray-900">Call Hash</div> <div class="mb-1 text-xs font-semibold text-gray-500 dark:text-zinc-400 uppercase tracking-wide">Call Hash</div>
<div class="text-xs text-gray-600">{{ audioCall?.hash || "Unknown" }}</div> <div class="text-sm text-gray-900 dark:text-zinc-100 font-mono">{{ audioCall?.hash || "Unknown" }}</div>
</div> </div>
<div class="mb-2"> <div>
<div class="mb-1 text-sm font-medium text-gray-900">Remote Identity Hash</div> <div class="mb-1 text-xs font-semibold text-gray-500 dark:text-zinc-400 uppercase tracking-wide">Remote Identity Hash</div>
<div class="text-xs text-gray-600">{{ audioCall?.remote_identity_hash || "Unknown" }}</div> <div class="text-sm text-gray-900 dark:text-zinc-100 font-mono">{{ audioCall?.remote_identity_hash || "Unknown" }}</div>
</div> </div>
<div class="mb-2"> <div>
<div class="mb-1 text-sm font-medium text-gray-900">Remote Destination Hash</div> <div class="mb-1 text-xs font-semibold text-gray-500 dark:text-zinc-400 uppercase tracking-wide">Remote Destination Hash</div>
<div class="text-xs text-gray-600">{{ audioCall?.remote_destination_hash || "Unknown" }}</div> <div class="text-sm text-gray-900 dark:text-zinc-100 font-mono">{{ audioCall?.remote_destination_hash || "Unknown" }}</div>
</div> </div>
<div class="mb-2"> <div>
<div class="mb-1 text-sm font-medium text-gray-900">Path</div> <div class="mb-1 text-xs font-semibold text-gray-500 dark:text-zinc-400 uppercase tracking-wide">Path</div>
<div class="text-xs text-gray-600"> <div class="text-sm text-gray-900 dark:text-zinc-100">
<span v-if="audioCall?.path">{{ audioCall.path.hops }} {{ audioCall.path.hops === 1 ? 'hop' : 'hops' }} away via {{ audioCall.path.next_hop_interface }}</span> <span v-if="audioCall?.path">{{ audioCall.path.hops }} {{ audioCall.path.hops === 1 ? 'hop' : 'hops' }} away via {{ audioCall.path.next_hop_interface }}</span>
<span v-else>Unknown</span> <span v-else>Unknown</span>
</div> </div>
</div> </div>
<div class="mb-2"> <div class="grid grid-cols-2 gap-3">
<div class="mb-1 text-sm font-medium text-gray-900">TX Bytes</div> <div>
<div class="text-xs text-gray-600">{{ formatBytes(txBytes) }}</div> <div class="mb-1 text-xs font-semibold text-gray-500 dark:text-zinc-400 uppercase tracking-wide">TX Bytes</div>
</div> <div class="text-sm text-gray-900 dark:text-zinc-100 font-semibold">{{ formatBytes(txBytes) }}</div>
</div>
<div class="mb-2"> <div>
<div class="mb-1 text-sm font-medium text-gray-900">RX Bytes</div> <div class="mb-1 text-xs font-semibold text-gray-500 dark:text-zinc-400 uppercase tracking-wide">RX Bytes</div>
<div class="text-xs text-gray-600">{{ formatBytes(rxBytes) }}</div> <div class="text-sm text-gray-900 dark:text-zinc-100 font-semibold">{{ formatBytes(rxBytes) }}</div>
</div> </div>
<div class="mb-2">
<div class="mb-1 text-sm font-medium text-gray-900">Incoming Audio</div>
<div class="text-xs text-gray-600">{{ remoteAudioCodec || "Unknown" }}</div>
</div> </div>
<div> <div>
<div class="mb-1 text-sm font-medium text-gray-900">Outgoing Audio</div> <div class="mb-1 text-xs font-semibold text-gray-500 dark:text-zinc-400 uppercase tracking-wide">Incoming Audio</div>
<select v-model="codecMode" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5"> <div class="text-sm text-gray-900 dark:text-zinc-100">{{ remoteAudioCodec || "Unknown" }}</div>
</div>
<div>
<div class="mb-1 text-xs font-semibold text-gray-500 dark:text-zinc-400 uppercase tracking-wide">Outgoing Audio</div>
<select v-model="codecMode" class="bg-white dark:bg-zinc-900 border border-gray-200 dark:border-zinc-800 text-gray-900 dark:text-zinc-100 text-sm rounded-xl focus:ring-2 focus:ring-blue-500/50 focus:border-blue-500 block w-full px-3 py-2 shadow-sm transition-all">
<option value="MODE_3200">Codec2 3200</option> <option value="MODE_3200">Codec2 3200</option>
<option value="MODE_2400">Codec2 2400</option> <option value="MODE_2400">Codec2 2400</option>
<option value="MODE_1600">Codec2 1600</option> <option value="MODE_1600">Codec2 1600</option>
@@ -69,10 +70,10 @@
</div> </div>
</div> </div>
<div class="flex text-gray-900 p-2"> <div class="flex items-center gap-2 px-4 py-3 bg-gray-50 dark:bg-zinc-900/50">
<!-- toggle mic --> <!-- toggle mic -->
<button @click="isMicMuted = !isMicMuted" type="button" :class="[ isMicMuted ? 'bg-red-500 hover:bg-red-400 focus-visible:outline-red-500' : 'bg-gray-500 hover:bg-gray-400 focus-visible:outline-gray-500' ]" class="my-auto inline-flex items-center gap-x-1 rounded-full p-2 text-sm font-semibold text-white shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2"> <button @click="isMicMuted = !isMicMuted" type="button" :class="[ isMicMuted ? 'bg-red-600 hover:bg-red-700 dark:bg-red-600 dark:hover:bg-red-700 focus-visible:outline-red-500' : 'bg-gray-600 hover:bg-gray-700 dark:bg-gray-600 dark:hover:bg-gray-700 focus-visible:outline-gray-500' ]" class="inline-flex items-center justify-center gap-x-1.5 rounded-xl px-4 py-2.5 text-sm font-semibold text-white shadow-sm transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2">
<svg v-if="isMicMuted" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256" class="w-5 h-5"> <svg v-if="isMicMuted" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256" class="w-5 h-5">
<path d="M213.38,229.92a8,8,0,0,1-11.3-.54l-30.92-34A78.83,78.83,0,0,1,136,207.59V240a8,8,0,0,1-16,0V207.6A80.11,80.11,0,0,1,48,128a8,8,0,0,1,16,0,64.07,64.07,0,0,0,64,64,63.41,63.41,0,0,0,32.21-8.68l-11.1-12.2A48,48,0,0,1,80,128V95.09L42.08,53.38A8,8,0,0,1,53.92,42.62l160,176A8,8,0,0,1,213.38,229.92Zm-24.19-63.13a7.88,7.88,0,0,0,3.51.82,8,8,0,0,0,7.19-4.49A79.16,79.16,0,0,0,208,128a8,8,0,0,0-16,0,63.32,63.32,0,0,1-6.48,28.09A8,8,0,0,0,189.19,166.79Zm-27.33-29.22A8,8,0,0,0,175.74,133a49.49,49.49,0,0,0,.26-5V64A48,48,0,0,0,84,44.87a8,8,0,0,0,1.41,8.57Z"></path> <path d="M213.38,229.92a8,8,0,0,1-11.3-.54l-30.92-34A78.83,78.83,0,0,1,136,207.59V240a8,8,0,0,1-16,0V207.6A80.11,80.11,0,0,1,48,128a8,8,0,0,1,16,0,64.07,64.07,0,0,0,64,64,63.41,63.41,0,0,0,32.21-8.68l-11.1-12.2A48,48,0,0,1,80,128V95.09L42.08,53.38A8,8,0,0,1,53.92,42.62l160,176A8,8,0,0,1,213.38,229.92Zm-24.19-63.13a7.88,7.88,0,0,0,3.51.82,8,8,0,0,0,7.19-4.49A79.16,79.16,0,0,0,208,128a8,8,0,0,0-16,0,63.32,63.32,0,0,1-6.48,28.09A8,8,0,0,0,189.19,166.79Zm-27.33-29.22A8,8,0,0,0,175.74,133a49.49,49.49,0,0,0,.26-5V64A48,48,0,0,0,84,44.87a8,8,0,0,0,1.41,8.57Z"></path>
</svg> </svg>
@@ -82,7 +83,7 @@
</button> </button>
<!-- toggle sound --> <!-- toggle sound -->
<button @click="isSoundMuted = !isSoundMuted" type="button" :class="[ isSoundMuted ? 'bg-red-500 hover:bg-red-400 focus-visible:outline-red-500' : 'bg-gray-500 hover:bg-gray-400 focus-visible:outline-gray-500' ]" class="ml-1 my-auto inline-flex items-center gap-x-1 rounded-full p-2 text-sm font-semibold text-white shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2"> <button @click="isSoundMuted = !isSoundMuted" type="button" :class="[ isSoundMuted ? 'bg-red-600 hover:bg-red-700 dark:bg-red-600 dark:hover:bg-red-700 focus-visible:outline-red-500' : 'bg-gray-600 hover:bg-gray-700 dark:bg-gray-600 dark:hover:bg-gray-700 focus-visible:outline-gray-500' ]" class="inline-flex items-center justify-center gap-x-1.5 rounded-xl px-4 py-2.5 text-sm font-semibold text-white shadow-sm transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2">
<svg v-if="isSoundMuted" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5"> <svg v-if="isSoundMuted" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
<path d="M10.047 3.062a.75.75 0 0 1 .453.688v12.5a.75.75 0 0 1-1.264.546L5.203 13H2.667a.75.75 0 0 1-.7-.48A6.985 6.985 0 0 1 1.5 10c0-.887.165-1.737.468-2.52a.75.75 0 0 1 .7-.48h2.535l4.033-3.796a.75.75 0 0 1 .811-.142ZM13.78 7.22a.75.75 0 1 0-1.06 1.06L14.44 10l-1.72 1.72a.75.75 0 0 0 1.06 1.06l1.72-1.72 1.72 1.72a.75.75 0 1 0 1.06-1.06L16.56 10l1.72-1.72a.75.75 0 0 0-1.06-1.06L15.5 8.94l-1.72-1.72Z" /> <path d="M10.047 3.062a.75.75 0 0 1 .453.688v12.5a.75.75 0 0 1-1.264.546L5.203 13H2.667a.75.75 0 0 1-.7-.48A6.985 6.985 0 0 1 1.5 10c0-.887.165-1.737.468-2.52a.75.75 0 0 1 .7-.48h2.535l4.033-3.796a.75.75 0 0 1 .811-.142ZM13.78 7.22a.75.75 0 1 0-1.06 1.06L14.44 10l-1.72 1.72a.75.75 0 0 0 1.06 1.06l1.72-1.72 1.72 1.72a.75.75 0 1 0 1.06-1.06L16.56 10l1.72-1.72a.75.75 0 0 0-1.06-1.06L15.5 8.94l-1.72-1.72Z" />
</svg> </svg>
@@ -93,7 +94,7 @@
</button> </button>
<!-- leave call --> <!-- leave call -->
<button @click="leaveCall" type="button" class="ml-auto mr-1 my-auto inline-flex items-center gap-x-1 rounded-full bg-blue-500 p-2 text-sm font-semibold text-white shadow-sm hover:bg-blue-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-500"> <button @click="leaveCall" type="button" class="ml-auto inline-flex items-center gap-x-1.5 rounded-xl bg-blue-600 hover:bg-blue-700 dark:bg-blue-600 dark:hover:bg-blue-700 px-4 py-2.5 text-sm font-semibold text-white shadow-sm transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-500">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
<path fill-rule="evenodd" d="M7.793 2.232a.75.75 0 0 1-.025 1.06L3.622 7.25h10.003a5.375 5.375 0 0 1 0 10.75H10.75a.75.75 0 0 1 0-1.5h2.875a3.875 3.875 0 0 0 0-7.75H3.622l4.146 3.957a.75.75 0 0 1-1.036 1.085l-5.5-5.25a.75.75 0 0 1 0-1.085l5.5-5.25a.75.75 0 0 1 1.06.025Z" clip-rule="evenodd" /> <path fill-rule="evenodd" d="M7.793 2.232a.75.75 0 0 1-.025 1.06L3.622 7.25h10.003a5.375 5.375 0 0 1 0 10.75H10.75a.75.75 0 0 1 0-1.5h2.875a3.875 3.875 0 0 0 0-7.75H3.622l4.146 3.957a.75.75 0 0 1-1.036 1.085l-5.5-5.25a.75.75 0 0 1 0-1.085l5.5-5.25a.75.75 0 0 1 1.06.025Z" clip-rule="evenodd" />
</svg> </svg>
@@ -101,7 +102,7 @@
</button> </button>
<!-- hangup call --> <!-- hangup call -->
<button @click="hangupCall(audioCall.hash)" type="button" class="my-auto inline-flex items-center gap-x-1 rounded-full bg-red-500 p-2 text-sm font-semibold text-white shadow-sm hover:bg-red-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-red-500"> <button @click="hangupCall(audioCall.hash)" type="button" class="inline-flex items-center gap-x-1.5 rounded-xl bg-red-600 hover:bg-red-700 dark:bg-red-600 dark:hover:bg-red-700 px-4 py-2.5 text-sm font-semibold text-white shadow-sm transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-red-500">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5 rotate-[135deg] translate-y-0.5"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5 rotate-[135deg] translate-y-0.5">
<path fill-rule="evenodd" d="M2 3.5A1.5 1.5 0 0 1 3.5 2h1.148a1.5 1.5 0 0 1 1.465 1.175l.716 3.223a1.5 1.5 0 0 1-1.052 1.767l-.933.267c-.41.117-.643.555-.48.95a11.542 11.542 0 0 0 6.254 6.254c.395.163.833-.07.95-.48l.267-.933a1.5 1.5 0 0 1 1.767-1.052l3.223.716A1.5 1.5 0 0 1 18 15.352V16.5a1.5 1.5 0 0 1-1.5 1.5H15c-1.149 0-2.263-.15-3.326-.43A13.022 13.022 0 0 1 2.43 8.326 13.019 13.019 0 0 1 2 5V3.5Z" clip-rule="evenodd" /> <path fill-rule="evenodd" d="M2 3.5A1.5 1.5 0 0 1 3.5 2h1.148a1.5 1.5 0 0 1 1.465 1.175l.716 3.223a1.5 1.5 0 0 1-1.052 1.767l-.933.267c-.41.117-.643.555-.48.95a11.542 11.542 0 0 0 6.254 6.254c.395.163.833-.07.95-.48l.267-.933a1.5 1.5 0 0 1 1.767-1.052l3.223.716A1.5 1.5 0 0 1 18 15.352V16.5a1.5 1.5 0 0 1-1.5 1.5H15c-1.149 0-2.263-.15-3.326-.43A13.022 13.022 0 0 1 2.43 8.326 13.019 13.019 0 0 1 2 5V3.5Z" clip-rule="evenodd" />
</svg> </svg>
@@ -116,60 +117,56 @@
<div v-else class="w-full space-y-2"> <div v-else class="w-full space-y-2">
<!-- dialer --> <!-- dialer -->
<div class="border rounded-xl bg-white shadow w-full overflow-hidden dark:border-zinc-900"> <div class="border border-gray-200 dark:border-zinc-800 rounded-2xl bg-white dark:bg-zinc-900 shadow-lg w-full overflow-hidden">
<div class="flex border-b border-gray-300 text-gray-700 p-2 dark:bg-zinc-800 dark:text-white"> <div class="flex items-center border-b border-gray-200 dark:border-zinc-800 bg-white/80 dark:bg-zinc-900/80 backdrop-blur-sm px-4 py-3">
<div class="my-auto mr-2"> <div class="my-auto mr-2">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6 dark:text-white"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6 dark:text-white">
<path stroke-linecap="round" stroke-linejoin="round" d="M2.25 6.75c0 8.284 6.716 15 15 15h2.25a2.25 2.25 0 0 0 2.25-2.25v-1.372c0-.516-.351-.966-.852-1.091l-4.423-1.106c-.44-.11-.902.055-1.173.417l-.97 1.293c-.282.376-.769.542-1.21.38a12.035 12.035 0 0 1-7.143-7.143c-.162-.441.004-.928.38-1.21l1.293-.97c.363-.271.527-.734.417-1.173L6.963 3.102a1.125 1.125 0 0 0-1.091-.852H4.5A2.25 2.25 0 0 0 2.25 4.5v2.25Z" /> <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 6.75c0 8.284 6.716 15 15 15h2.25a2.25 2.25 0 0 0 2.25-2.25v-1.372c0-.516-.351-.966-.852-1.091l-4.423-1.106c-.44-.11-.902.055-1.173.417l-.97 1.293c-.282.376-.769.542-1.21.38a12.035 12.035 0 0 1-7.143-7.143c-.162-.441.004-.928.38-1.21l1.293-.97c.363-.271.527-.734.417-1.173L6.963 3.102a1.125 1.125 0 0 0-1.091-.852H4.5A2.25 2.25 0 0 0 2.25 4.5v2.25Z" />
</svg> </svg>
</div> </div>
<div class="my-auto">Start a new Call</div> <div class="font-semibold text-gray-900 dark:text-zinc-100">Start a new Call</div>
</div> </div>
<div class="flex border-b border-gray-300 text-gray-900 p-2 space-x-2 dark:bg-zinc-700 dark:text-zinc-100 dark:border-zinc-800"> <div class="p-4 space-y-3">
<div class="flex-1"> <div class="flex gap-2">
<input v-model="destinationHash" type="text" placeholder="Enter Destination Hash" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2 dark:bg-zinc-800 dark:border-zinc-700 dark:text-zinc-100"> <input v-model="destinationHash" @keydown.enter.exact.prevent="initiateCall(destinationHash)" type="text" placeholder="Enter Destination Hash" class="flex-1 bg-white dark:bg-zinc-900 border border-gray-200 dark:border-zinc-800 text-gray-900 dark:text-zinc-100 text-sm rounded-xl focus:ring-2 focus:ring-blue-500/50 focus:border-blue-500 px-4 py-2.5 shadow-sm transition-all placeholder:text-gray-400 dark:placeholder:text-zinc-500">
<button @click="initiateCall(destinationHash)" :disabled="isInitiatingCall || !destinationHash || destinationHash.trim() === ''" type="button" :class="[ isInitiatingCall || !destinationHash || destinationHash.trim() === '' ? 'bg-gray-400 dark:bg-zinc-500 focus-visible:outline-gray-500 cursor-not-allowed' : 'bg-green-600 hover:bg-green-700 dark:bg-green-600 dark:hover:bg-green-700 focus-visible:outline-green-500' ]" class="inline-flex items-center gap-x-1.5 rounded-xl px-4 py-2.5 text-sm font-semibold text-white shadow-sm transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2">
<svg v-if="isInitiatingCall" class="animate-spin h-4 w-4" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
</svg>
<span v-if="isInitiatingCall">Calling...</span>
<span v-else>Call</span>
</button>
</div> </div>
<button @click="initiateCall(destinationHash)" :disabled="isInitiatingCall" type="button" :class="[ isInitiatingCall ? 'bg-gray-400 focus-visible:outline-gray-500' : 'bg-green-500 hover:bg-green-400 focus-visible:outline-green-500' ]" class="my-auto inline-flex items-center gap-x-1 rounded-md p-2 text-sm font-semibold text-white shadow-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2">
<span v-if="isInitiatingCall">
<span>Calling...</span>
</span>
<span v-else>Initiate Call</span>
</button>
</div> </div>
<div class="flex p-1 dark:bg-zinc-700 dark:border-zinc-600"> <div class="flex items-center justify-between px-4 py-3 border-t border-gray-200 dark:border-zinc-800 bg-gray-50 dark:bg-zinc-900/50">
<div> <div>
<div class='dark:text-white'>My Destination Hash</div> <div class="text-xs font-semibold text-gray-500 dark:text-zinc-400 uppercase tracking-wide">My Destination Hash</div>
<div class="text-sm text-gray-700 dark:text-zinc-100">{{ myAudioCallAddressHash || "Unknown" }}</div> <div class="text-sm text-gray-900 dark:text-zinc-100 font-mono mt-0.5">{{ myAudioCallAddressHash || "Unknown" }}</div>
</div>
<div class="ml-auto my-auto mr-1">
<a @click="announce" href="javascript:void(0)" class="rounded-full">
<div class="flex text-gray-700 bg-gray-100 hover:bg-gray-200 px-2 py-1 rounded-full">
<div>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round" d="M8.288 15.038a5.25 5.25 0 0 1 7.424 0M5.106 11.856c3.807-3.808 9.98-3.808 13.788 0M1.924 8.674c5.565-5.565 14.587-5.565 20.152 0M12.53 18.22l-.53.53-.53-.53a.75.75 0 0 1 1.06 0Z" />
</svg>
</div>
<div class="my-auto mx-1 text-sm">Announce</div>
</div>
</a>
</div> </div>
<button @click="announce" type="button" class="inline-flex items-center gap-x-1.5 rounded-xl bg-gray-600 hover:bg-gray-700 dark:bg-gray-600 dark:hover:bg-gray-700 px-4 py-2 text-sm font-semibold text-white shadow-sm transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
<path stroke-linecap="round" stroke-linejoin="round" d="M8.288 15.038a5.25 5.25 0 0 1 7.424 0M5.106 11.856c3.807-3.808 9.98-3.808 13.788 0M1.924 8.674c5.565-5.565 14.587-5.565 20.152 0M12.53 18.22l-.53.53-.53-.53a.75.75 0 0 1 1.06 0Z" />
</svg>
<span>Announce</span>
</button>
</div> </div>
</div> </div>
<!-- active calls --> <!-- active calls -->
<div v-if="activeAudioCalls.length > 0" class="border rounded-xl bg-white shadow w-full overflow-hidden dark:bg-zinc-800 dark:border-zinc-700 dark:text-zinc-100"> <div v-if="activeAudioCalls.length > 0" class="border border-gray-200 dark:border-zinc-800 rounded-2xl bg-white dark:bg-zinc-900 shadow-lg w-full overflow-hidden">
<div class="flex border-b border-gray-300 text-gray-700 p-2 dark:text-zinc-100"> <div class="flex items-center border-b border-gray-200 dark:border-zinc-800 bg-white/80 dark:bg-zinc-900/80 backdrop-blur-sm px-4 py-3">
<div class="my-auto mr-2"> <div class="my-auto mr-2">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round" d="M8.25 6.75h12M8.25 12h12m-12 5.25h12M3.75 6.75h.007v.008H3.75V6.75Zm.375 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0ZM3.75 12h.007v.008H3.75V12Zm.375 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm-.375 5.25h.007v.008H3.75v-.008Zm.375 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Z" /> <path stroke-linecap="round" stroke-linejoin="round" d="M8.25 6.75h12M8.25 12h12m-12 5.25h12M3.75 6.75h.007v.008H3.75V6.75Zm.375 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0ZM3.75 12h.007v.008H3.75V12Zm.375 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm-.375 5.25h.007v.008H3.75v-.008Zm.375 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Z" />
</svg> </svg>
</div> </div>
<div class="my-auto">Active Calls</div> <div class="font-semibold text-gray-900 dark:text-zinc-100">Active Calls</div>
</div> </div>
<div class="divide-y"> <div class="divide-y divide-gray-200 dark:divide-zinc-800">
<div v-for="audioCall in activeAudioCalls" class="flex p-2"> <div v-for="audioCall in activeAudioCalls" class="flex items-center p-4 hover:bg-gray-50 dark:hover:bg-zinc-900/50 transition-colors">
<div class="mr-2 my-auto"> <div class="mr-3 flex-shrink-0">
<div class="bg-gray-100 p-2 rounded-full"> <div class="bg-gray-100 dark:bg-zinc-800 p-2.5 rounded-xl">
<svg v-if="audioCall.is_outbound" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5"> <svg v-if="audioCall.is_outbound" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
<path d="M3.5 2A1.5 1.5 0 0 0 2 3.5V5c0 1.149.15 2.263.43 3.326a13.022 13.022 0 0 0 9.244 9.244c1.063.28 2.177.43 3.326.43h1.5a1.5 1.5 0 0 0 1.5-1.5v-1.148a1.5 1.5 0 0 0-1.175-1.465l-3.223-.716a1.5 1.5 0 0 0-1.767 1.052l-.267.933c-.117.41-.555.643-.95.48a11.542 11.542 0 0 1-6.254-6.254c-.163-.395.07-.833.48-.95l.933-.267a1.5 1.5 0 0 0 1.052-1.767l-.716-3.223A1.5 1.5 0 0 0 4.648 2H3.5ZM16.5 4.56l-3.22 3.22a.75.75 0 1 1-1.06-1.06l3.22-3.22h-2.69a.75.75 0 0 1 0-1.5h4.5a.75.75 0 0 1 .75.75v4.5a.75.75 0 0 1-1.5 0V4.56Z" /> <path d="M3.5 2A1.5 1.5 0 0 0 2 3.5V5c0 1.149.15 2.263.43 3.326a13.022 13.022 0 0 0 9.244 9.244c1.063.28 2.177.43 3.326.43h1.5a1.5 1.5 0 0 0 1.5-1.5v-1.148a1.5 1.5 0 0 0-1.175-1.465l-3.223-.716a1.5 1.5 0 0 0-1.767 1.052l-.267.933c-.117.41-.555.643-.95.48a11.542 11.542 0 0 1-6.254-6.254c-.163-.395.07-.833.48-.95l.933-.267a1.5 1.5 0 0 0 1.052-1.767l-.716-3.223A1.5 1.5 0 0 0 4.648 2H3.5ZM16.5 4.56l-3.22 3.22a.75.75 0 1 1-1.06-1.06l3.22-3.22h-2.69a.75.75 0 0 1 0-1.5h4.5a.75.75 0 0 1 .75.75v4.5a.75.75 0 0 1-1.5 0V4.56Z" />
</svg> </svg>
@@ -178,24 +175,24 @@
</svg> </svg>
</div> </div>
</div> </div>
<div> <div class="flex-1 min-w-0">
<div>{{ audioCall.remote_destination_hash || "Unknown" }}</div> <div class="font-medium text-gray-900 dark:text-zinc-100 truncate">{{ audioCall.remote_destination_hash || "Unknown" }}</div>
<div class="text-sm text-gray-500 dark:text-zinc-100"> <div class="text-sm text-gray-500 dark:text-zinc-400">
<span v-if="audioCall.is_outbound">Outgoing Call...</span> <span v-if="audioCall.is_outbound">Outgoing Call...</span>
<span v-else>Incoming Call...</span> <span v-else>Incoming Call...</span>
</div> </div>
</div> </div>
<div class="flex space-x-2 ml-auto my-auto mx-2"> <div class="flex items-center gap-2 ml-auto flex-shrink-0">
<!-- rejoin call --> <!-- rejoin call -->
<button v-if="audioCall.is_active" title="Join Call" @click="joinCall(audioCall.hash)" type="button" class="my-auto inline-flex items-center gap-x-1 rounded-full bg-green-500 p-2 text-sm font-semibold text-white shadow-sm hover:bg-green-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-green-500"> <button v-if="audioCall.is_active" title="Join Call" @click="joinCall(audioCall.hash)" type="button" class="inline-flex items-center justify-center gap-x-1.5 rounded-xl bg-green-600 hover:bg-green-700 dark:bg-green-600 dark:hover:bg-green-700 px-3 py-2 text-sm font-semibold text-white shadow-sm transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-green-500">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
<path fill-rule="evenodd" d="M2 3.5A1.5 1.5 0 0 1 3.5 2h1.148a1.5 1.5 0 0 1 1.465 1.175l.716 3.223a1.5 1.5 0 0 1-1.052 1.767l-.933.267c-.41.117-.643.555-.48.95a11.542 11.542 0 0 0 6.254 6.254c.395.163.833-.07.95-.48l.267-.933a1.5 1.5 0 0 1 1.767-1.052l3.223.716A1.5 1.5 0 0 1 18 15.352V16.5a1.5 1.5 0 0 1-1.5 1.5H15c-1.149 0-2.263-.15-3.326-.43A13.022 13.022 0 0 1 2.43 8.326 13.019 13.019 0 0 1 2 5V3.5Z" clip-rule="evenodd" /> <path fill-rule="evenodd" d="M2 3.5A1.5 1.5 0 0 1 3.5 2h1.148a1.5 1.5 0 0 1 1.465 1.175l.716 3.223a1.5 1.5 0 0 1-1.052 1.767l-.933.267c-.41.117-.643.555-.48.95a11.542 11.542 0 0 0 6.254 6.254c.395.163.833-.07.95-.48l.267-.933a1.5 1.5 0 0 1 1.767-1.052l3.223.716A1.5 1.5 0 0 1 18 15.352V16.5a1.5 1.5 0 0 1-1.5 1.5H15c-1.149 0-2.263-.15-3.326-.43A13.022 13.022 0 0 1 2.43 8.326 13.019 13.019 0 0 1 2 5V3.5Z" clip-rule="evenodd" />
</svg> </svg>
</button> </button>
<!-- hangup call --> <!-- hangup call -->
<button v-if="audioCall.is_active" title="Hangup Call" @click="hangupCall(audioCall.hash)" type="button" class="my-auto inline-flex items-center gap-x-1 rounded-full bg-red-500 p-2 text-sm font-semibold text-white shadow-sm hover:bg-red-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-red-500"> <button v-if="audioCall.is_active" title="Hangup Call" @click="hangupCall(audioCall.hash)" type="button" class="inline-flex items-center justify-center gap-x-1.5 rounded-xl bg-red-600 hover:bg-red-700 dark:bg-red-600 dark:hover:bg-red-700 px-3 py-2 text-sm font-semibold text-white shadow-sm transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-red-500">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5 rotate-[135deg] translate-y-0.5"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5 rotate-[135deg] translate-y-0.5">
<path fill-rule="evenodd" d="M2 3.5A1.5 1.5 0 0 1 3.5 2h1.148a1.5 1.5 0 0 1 1.465 1.175l.716 3.223a1.5 1.5 0 0 1-1.052 1.767l-.933.267c-.41.117-.643.555-.48.95a11.542 11.542 0 0 0 6.254 6.254c.395.163.833-.07.95-.48l.267-.933a1.5 1.5 0 0 1 1.767-1.052l3.223.716A1.5 1.5 0 0 1 18 15.352V16.5a1.5 1.5 0 0 1-1.5 1.5H15c-1.149 0-2.263-.15-3.326-.43A13.022 13.022 0 0 1 2.43 8.326 13.019 13.019 0 0 1 2 5V3.5Z" clip-rule="evenodd" /> <path fill-rule="evenodd" d="M2 3.5A1.5 1.5 0 0 1 3.5 2h1.148a1.5 1.5 0 0 1 1.465 1.175l.716 3.223a1.5 1.5 0 0 1-1.052 1.767l-.933.267c-.41.117-.643.555-.48.95a11.542 11.542 0 0 0 6.254 6.254c.395.163.833-.07.95-.48l.267-.933a1.5 1.5 0 0 1 1.767-1.052l3.223.716A1.5 1.5 0 0 1 18 15.352V16.5a1.5 1.5 0 0 1-1.5 1.5H15c-1.149 0-2.263-.15-3.326-.43A13.022 13.022 0 0 1 2.43 8.326 13.019 13.019 0 0 1 2 5V3.5Z" clip-rule="evenodd" />
</svg> </svg>
@@ -207,24 +204,22 @@
</div> </div>
<!-- call history --> <!-- call history -->
<div v-if="inactiveAudioCalls.length > 0" class="border rounded-xl bg-white shadow w-full overflow-hidden dark:bg-zinc-800 dark:border-zinc-700 dark:text-zinc-100"> <div v-if="inactiveAudioCalls.length > 0" class="border border-gray-200 dark:border-zinc-800 rounded-2xl bg-white dark:bg-zinc-900 shadow-lg w-full overflow-hidden">
<div class="flex border-b border-gray-300 text-gray-700 p-2"> <div class="flex items-center justify-between border-b border-gray-200 dark:border-zinc-800 bg-white/80 dark:bg-zinc-900/80 backdrop-blur-sm px-4 py-3">
<div class="my-auto mr-2"> <div class="my-auto mr-2">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round" d="M8.25 6.75h12M8.25 12h12m-12 5.25h12M3.75 6.75h.007v.008H3.75V6.75Zm.375 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0ZM3.75 12h.007v.008H3.75V12Zm.375 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm-.375 5.25h.007v.008H3.75v-.008Zm.375 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Z" /> <path stroke-linecap="round" stroke-linejoin="round" d="M8.25 6.75h12M8.25 12h12m-12 5.25h12M3.75 6.75h.007v.008H3.75V6.75Zm.375 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0ZM3.75 12h.007v.008H3.75V12Zm.375 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm-.375 5.25h.007v.008H3.75v-.008Zm.375 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Z" />
</svg> </svg>
</div> </div>
<div class="my-auto">Call History</div> <div class="font-semibold text-gray-900 dark:text-zinc-100">Call History</div>
<div class="ml-auto"> <button @click="clearCallHistory" type="button" class="inline-flex items-center gap-x-1.5 rounded-xl bg-gray-600 hover:bg-gray-700 dark:bg-gray-600 dark:hover:bg-gray-700 px-3 py-1.5 text-xs font-semibold text-white shadow-sm transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500">
<button @click="clearCallHistory" type="button" class="my-auto inline-flex items-center gap-x-1 rounded-md bg-gray-500 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500"> Clear All
Clear All </button>
</button>
</div>
</div> </div>
<div class="divide-y"> <div class="divide-y divide-gray-200 dark:divide-zinc-800">
<div v-for="audioCall in inactiveAudioCalls" class="group flex p-2"> <div v-for="audioCall in inactiveAudioCalls" class="group flex items-center p-4 hover:bg-gray-50 dark:hover:bg-zinc-900/50 transition-colors">
<div class="mr-2 my-auto"> <div class="mr-3 flex-shrink-0">
<div class="bg-gray-100 p-2 rounded-full"> <div class="bg-gray-100 dark:bg-zinc-800 p-2.5 rounded-xl">
<svg v-if="audioCall.is_outbound" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5"> <svg v-if="audioCall.is_outbound" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
<path d="M3.5 2A1.5 1.5 0 0 0 2 3.5V5c0 1.149.15 2.263.43 3.326a13.022 13.022 0 0 0 9.244 9.244c1.063.28 2.177.43 3.326.43h1.5a1.5 1.5 0 0 0 1.5-1.5v-1.148a1.5 1.5 0 0 0-1.175-1.465l-3.223-.716a1.5 1.5 0 0 0-1.767 1.052l-.267.933c-.117.41-.555.643-.95.48a11.542 11.542 0 0 1-6.254-6.254c-.163-.395.07-.833.48-.95l.933-.267a1.5 1.5 0 0 0 1.052-1.767l-.716-3.223A1.5 1.5 0 0 0 4.648 2H3.5ZM16.5 4.56l-3.22 3.22a.75.75 0 1 1-1.06-1.06l3.22-3.22h-2.69a.75.75 0 0 1 0-1.5h4.5a.75.75 0 0 1 .75.75v4.5a.75.75 0 0 1-1.5 0V4.56Z" /> <path d="M3.5 2A1.5 1.5 0 0 0 2 3.5V5c0 1.149.15 2.263.43 3.326a13.022 13.022 0 0 0 9.244 9.244c1.063.28 2.177.43 3.326.43h1.5a1.5 1.5 0 0 0 1.5-1.5v-1.148a1.5 1.5 0 0 0-1.175-1.465l-3.223-.716a1.5 1.5 0 0 0-1.767 1.052l-.267.933c-.117.41-.555.643-.95.48a11.542 11.542 0 0 1-6.254-6.254c-.163-.395.07-.833.48-.95l.933-.267a1.5 1.5 0 0 0 1.052-1.767l-.716-3.223A1.5 1.5 0 0 0 4.648 2H3.5ZM16.5 4.56l-3.22 3.22a.75.75 0 1 1-1.06-1.06l3.22-3.22h-2.69a.75.75 0 0 1 0-1.5h4.5a.75.75 0 0 1 .75.75v4.5a.75.75 0 0 1-1.5 0V4.56Z" />
</svg> </svg>
@@ -233,14 +228,14 @@
</svg> </svg>
</div> </div>
</div> </div>
<div> <div class="flex-1 min-w-0">
<div>Destination: {{ audioCall.remote_destination_hash || "Unknown" }}</div> <div class="font-medium text-gray-900 dark:text-zinc-100 truncate">{{ audioCall.remote_destination_hash || "Unknown" }}</div>
<div class="text-sm text-gray-500">Call Hash: {{ audioCall.hash }}</div> <div class="text-sm text-gray-500 dark:text-zinc-400 font-mono">Call Hash: {{ audioCall.hash }}</div>
</div> </div>
<div class="hidden group-hover:flex space-x-2 ml-auto my-auto mx-2"> <div class="hidden group-hover:flex items-center gap-2 ml-auto flex-shrink-0">
<!-- delete call --> <!-- delete call -->
<button @click="deleteCall(audioCall.hash)" type="button" class="my-auto inline-flex items-center gap-x-1 rounded-full bg-gray-100 p-2 text-sm font-semibold text-gray-700 shadow-sm hover:bg-gray-200 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500"> <button @click="deleteCall(audioCall.hash)" type="button" class="inline-flex items-center justify-center gap-x-1.5 rounded-xl bg-gray-100 dark:bg-zinc-800 hover:bg-gray-200 dark:hover:bg-zinc-700 px-3 py-2 text-sm font-semibold text-gray-700 dark:text-zinc-300 shadow-sm transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
<path d="M6.28 5.22a.75.75 0 0 0-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 1 0 1.06 1.06L10 11.06l3.72 3.72a.75.75 0 1 0 1.06-1.06L11.06 10l3.72-3.72a.75.75 0 0 0-1.06-1.06L10 8.94 6.28 5.22Z" /> <path d="M6.28 5.22a.75.75 0 0 0-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 1 0 1.06 1.06L10 11.06l3.72 3.72a.75.75 0 1 0 1.06-1.06L11.06 10l3.72-3.72a.75.75 0 0 0-1.06-1.06L10 8.94 6.28 5.22Z" />
</svg> </svg>

View File

@@ -1,16 +1,17 @@
<template> <template>
<div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] dark:bg-zinc-950"> <div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] bg-gradient-to-br from-slate-50 via-slate-100 to-white dark:from-zinc-950 dark:via-zinc-900 dark:to-zinc-900">
<div class="overflow-y-auto p-2 space-y-2"> <div class="overflow-y-auto p-3 md:p-6 space-y-4 max-w-5xl mx-auto w-full">
<!-- community interfaces --> <!-- community interfaces -->
<div v-if="!isEditingInterface && config != null && config.show_suggested_community_interfaces" class="bg-white rounded shadow divide-y divide-gray-200 dark:bg-zinc-900"> <div v-if="!isEditingInterface && config != null && config.show_suggested_community_interfaces" class="bg-white/95 dark:bg-zinc-900/80 backdrop-blur border border-gray-200 dark:border-zinc-800 rounded-3xl shadow-lg divide-y divide-gray-200 dark:divide-zinc-800">
<div class="flex p-2"> <div class="flex p-3">
<div class="my-auto mr-auto"> <div class="my-auto mr-auto">
<div class="font-bold dark:text-white">Community Interfaces</div> <div class="text-xs uppercase tracking-wide text-gray-500 dark:text-gray-400">Quick start</div>
<div class="text-sm dark:text-gray-100">These TCP interfaces serve as a quick way to test Reticulum. We suggest running your own as these may not always be available.</div> <div class="font-semibold text-lg text-gray-900 dark:text-white">Community Interfaces</div>
<div class="text-sm text-gray-600 dark:text-gray-200">One-click helpers for public TCP relays. Spin up your own when possible to ensure availability.</div>
</div> </div>
<div class="my-auto ml-2"> <div class="my-auto ml-2">
<button @click="updateConfig({'show_suggested_community_interfaces': false})" type="button" class="text-gray-700 bg-gray-100 hover:bg-gray-200 p-2 rounded-full dark:bg-zinc-600 dark:text-white dark:hover:bg-zinc-700 dark:focus-visible:outline-zinc-500"> <button @click="updateConfig({'show_suggested_community_interfaces': false})" type="button" class="text-gray-700 bg-white border border-gray-200 hover:border-red-300 p-2 rounded-full shadow-sm dark:bg-zinc-800 dark:text-white dark:border-zinc-700 dark:hover:border-red-400">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
<path d="M6.28 5.22a.75.75 0 0 0-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 1 0 1.06 1.06L10 11.06l3.72 3.72a.75.75 0 1 0 1.06-1.06L11.06 10l3.72-3.72a.75.75 0 0 0-1.06-1.06L10 8.94 6.28 5.22Z"/> <path d="M6.28 5.22a.75.75 0 0 0-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 1 0 1.06 1.06L10 11.06l3.72 3.72a.75.75 0 1 0 1.06-1.06L11.06 10l3.72-3.72a.75.75 0 0 0-1.06-1.06L10 8.94 6.28 5.22Z"/>
</svg> </svg>
@@ -19,31 +20,31 @@
</div> </div>
<div class="divide-y divide-gray-200 dark:text-white"> <div class="divide-y divide-gray-200 dark:text-white">
<div class="flex px-2 py-1"> <div class="flex px-3 py-2 items-center">
<div class="my-auto mr-auto"> <div class="my-auto mr-auto">
<div>RNS Testnet Amsterdam</div> <div class="font-semibold text-gray-900 dark:text-gray-100">RNS Testnet Amsterdam</div>
<div class="text-xs">amsterdam.connect.reticulum.network:4965</div> <div class="text-xs text-gray-600 dark:text-gray-300">amsterdam.connect.reticulum.network:4965</div>
</div> </div>
<div class="ml-2 my-auto"> <div class="ml-2 my-auto">
<button <button
@click="newInterfaceName='RNS Testnet Amsterdam';newInterfaceType='TCPClientInterface';newInterfaceTargetHost='amsterdam.connect.reticulum.network';newInterfaceTargetPort='4965'" @click="newInterfaceName='RNS Testnet Amsterdam';newInterfaceType='TCPClientInterface';newInterfaceTargetHost='amsterdam.connect.reticulum.network';newInterfaceTargetPort='4965'"
type="button" type="button"
class="inline-flex items-center gap-x-1 rounded-md bg-gray-500 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500"> class="inline-flex items-center gap-x-2 rounded-full bg-blue-600/90 px-3 py-1.5 text-xs font-semibold text-white shadow hover:bg-blue-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-500">
<span>Use Interface</span> <span>Use Interface</span>
</button> </button>
</div> </div>
</div> </div>
<div class="flex px-2 py-1"> <div class="flex px-3 py-2 items-center">
<div class="my-auto mr-auto"> <div class="my-auto mr-auto">
<div>RNS Testnet BetweenTheBorders</div> <div class="font-semibold text-gray-900 dark:text-gray-100">RNS Testnet BetweenTheBorders</div>
<div class="text-xs">reticulum.betweentheborders.com:4242</div> <div class="text-xs text-gray-600 dark:text-gray-300">reticulum.betweentheborders.com:4242</div>
</div> </div>
<div class="ml-2 my-auto"> <div class="ml-2 my-auto">
<button <button
@click="newInterfaceName='RNS Testnet BetweenTheBorders';newInterfaceType='TCPClientInterface';newInterfaceTargetHost='reticulum.betweentheborders.com';newInterfaceTargetPort='4242'" @click="newInterfaceName='RNS Testnet BetweenTheBorders';newInterfaceType='TCPClientInterface';newInterfaceTargetHost='reticulum.betweentheborders.com';newInterfaceTargetPort='4242'"
type="button" type="button"
class="inline-flex items-center gap-x-1 rounded-md bg-gray-500 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500"> class="inline-flex items-center gap-x-2 rounded-full bg-blue-600/90 px-3 py-1.5 text-xs font-semibold text-white shadow hover:bg-blue-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-500">
<span>Use Interface</span> <span>Use Interface</span>
</button> </button>
</div> </div>
@@ -53,44 +54,64 @@
</div> </div>
<!-- add interface form --> <!-- add interface form -->
<div class="bg-white rounded shadow divide-y divide-gray-300 dark:divide-zinc-700 dark:bg-zinc-900"> <div class="bg-white/95 dark:bg-zinc-900/85 backdrop-blur border border-gray-200 dark:border-zinc-800 rounded-3xl shadow-xl">
<div class="p-2 font-bold dark:text-white"> <div class="flex flex-wrap gap-3 items-center p-3 border-b border-gray-200 dark:border-zinc-800">
<span v-if="isEditingInterface">Edit Interface</span> <div>
<span v-else>Add Interface</span> <div class="text-xs uppercase tracking-wide text-gray-500 dark:text-gray-400">{{ isEditingInterface ? 'Update' : 'Create' }}</div>
<div class="text-xl font-semibold text-gray-900 dark:text-white">
{{ isEditingInterface ? 'Edit Interface' : 'Add Interface' }}
</div>
<div class="text-sm text-gray-600 dark:text-gray-300">Name your connection and select its transport type.</div>
</div>
<div class="flex-1"></div>
<div class="flex gap-2">
<button @click="loadComports" type="button" class="secondary-chip text-xs">
Reload Ports
</button>
<RouterLink :to="{ name: 'interfaces' }" class="secondary-chip text-xs">
View All
</RouterLink>
</div>
</div> </div>
<div class="p-2 space-y-3"> <div class="p-3 md:p-5 space-y-4">
<!-- iGeneric interface settings --> <!-- iGeneric interface settings -->
<!-- interface name --> <!-- interface name -->
<div> <div>
<FormLabel class="mb-1">Name</FormLabel> <FormLabel class="glass-label">Name</FormLabel>
<input type="text" :disabled="isEditingInterface" placeholder="New Interface Name" <input type="text" :disabled="isEditingInterface" placeholder="New Interface Name"
v-model="newInterfaceName" v-model="newInterfaceName"
class="border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-zinc-900 dark:border-zinc-600 dark:text-white" class="input-field"
:class="[ isEditingInterface ? 'cursor-not-allowed bg-gray-200' : 'bg-gray-50' ]"> :class="[ isEditingInterface ? 'cursor-not-allowed bg-gray-200 dark:bg-zinc-800' : '' ]">
<FormSubLabel>Interface names must be unique.</FormSubLabel> <FormSubLabel class="text-xs">Interface names must be unique.</FormSubLabel>
</div> </div>
<!-- interface type --> <!-- interface type -->
<div class="mb-2"> <div>
<FormLabel class="mb-1">Type</FormLabel> <FormLabel class="glass-label">Type</FormLabel>
<select v-model="newInterfaceType" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-zinc-900 dark:border-zinc-600 dark:text-white"> <select v-model="newInterfaceType" class="input-field">
<option disabled selected>--</option> <option disabled selected>Pick a category</option>
<option value="AutoInterface">Auto Interface</option> <optgroup label="Automatic">
<option disabled selected>RNodes</option> <option value="AutoInterface">Auto Interface</option>
<option value="RNodeInterface">RNode Interface</option> </optgroup>
<option value="RNodeMultiInterface">RNode Multi Interface</option> <optgroup label="RNodes">
<option disabled selected>IP Networks</option> <option value="RNodeInterface">RNode Interface</option>
<option value="TCPClientInterface">TCP Client Interface</option> <option value="RNodeMultiInterface">RNode Multi Interface</option>
<option value="TCPServerInterface">TCP Server Interface</option> </optgroup>
<option value="UDPInterface">UDP Interface</option> <optgroup label="IP Networks">
<option value="I2PInterface">I2P Interface</option> <option value="TCPClientInterface">TCP Client Interface</option>
<option disabled selected>Hardware</option> <option value="TCPServerInterface">TCP Server Interface</option>
<option value="SerialInterface">Serial Interface</option> <option value="UDPInterface">UDP Interface</option>
<option value="KISSInterface">KISS Interface</option> <option value="I2PInterface">I2P Interface</option>
<option hidden value="AX25KISSInterface">AX.25 KISS Interface</option> </optgroup>
<option disabled selected>Other</option> <optgroup label="Hardware">
<option value="PipeInterface">Pipe Interface</option> <option value="SerialInterface">Serial Interface</option>
<option value="KISSInterface">KISS Interface</option>
<option value="AX25KISSInterface">AX.25 KISS Interface</option>
</optgroup>
<optgroup label="Pipelines">
<option value="PipeInterface">Pipe Interface</option>
</optgroup>
</select> </select>
<FormSubLabel> <FormSubLabel>
Need help? <a class="text-blue-500 underline" href="https://reticulum.network/manual/interfaces.html" target="_blank">Reticulum Docs: Configuring Interfaces</a> Need help? <a class="text-blue-500 underline" href="https://reticulum.network/manual/interfaces.html" target="_blank">Reticulum Docs: Configuring Interfaces</a>
@@ -101,13 +122,13 @@
<!-- interface target host --> <!-- interface target host -->
<div v-if="newInterfaceType === 'TCPClientInterface'" class="mb-2"> <div v-if="newInterfaceType === 'TCPClientInterface'" class="mb-2">
<FormLabel class="mb-1">Target Host</FormLabel> <FormLabel class="mb-1">Target Host</FormLabel>
<input type="text" placeholder="e.g: example.com" v-model="newInterfaceTargetHost" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-zinc-900 dark:border-zinc-600 dark:text-white dark:focus:ring-blue-600 dark:focus:border-blue-600"> <input type="text" placeholder="e.g: example.com" v-model="newInterfaceTargetHost" class="input-field">
</div> </div>
<!-- interface target port --> <!-- interface target port -->
<div v-if="newInterfaceType === 'TCPClientInterface'" class="mb-2"> <div v-if="newInterfaceType === 'TCPClientInterface'" class="mb-2">
<FormLabel class="mb-1">Target Port</FormLabel> <FormLabel class="mb-1">Target Port</FormLabel>
<input type="text" placeholder="e.g: 1234" v-model="newInterfaceTargetPort" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-zinc-900 dark:border-zinc-600 dark:text-white dark:focus:ring-blue-600 dark:focus:border-blue-600"> <input type="text" placeholder="e.g: 1234" v-model="newInterfaceTargetPort" class="input-field">
</div> </div>
<!-- TCPServerInterface --> <!-- TCPServerInterface -->
@@ -1317,3 +1338,24 @@ export default {
}, },
} }
</script> </script>
<style scoped>
.glass-card {
@apply bg-white/95 dark:bg-zinc-900/85 backdrop-blur border border-gray-200 dark:border-zinc-800 rounded-3xl shadow-xl;
}
.input-field {
@apply bg-gray-50/90 dark:bg-zinc-900/80 border border-gray-200 dark:border-zinc-700 text-sm rounded-2xl focus:ring-2 focus:ring-blue-400 focus:border-blue-400 dark:focus:ring-blue-500 dark:focus:border-blue-500 block w-full p-2.5 text-gray-900 dark:text-gray-100 transition;
}
.glass-label {
@apply mb-1 text-sm font-semibold text-gray-800 dark:text-gray-200;
}
.primary-chip {
@apply inline-flex items-center gap-x-2 rounded-full bg-blue-600/90 px-3 py-1.5 text-xs font-semibold text-white shadow hover:bg-blue-500 transition;
}
.secondary-chip {
@apply inline-flex items-center gap-x-2 rounded-full border border-gray-300 dark:border-zinc-700 px-3 py-1.5 text-xs font-semibold text-gray-700 dark:text-gray-100 bg-white/80 dark:bg-zinc-900/70 hover:border-blue-400;
}
.glass-field {
@apply space-y-1;
}
</style>

View File

@@ -125,9 +125,10 @@ export default {
this.importableInterfaces = []; this.importableInterfaces = [];
this.selectedInterfaces = []; this.selectedInterfaces = [];
}, },
dismiss() { dismiss(result = false) {
this.isShowing = false; this.isShowing = false;
this.$emit("dismissed"); const imported = result === true;
this.$emit("dismissed", imported);
}, },
clearSelectedFile() { clearSelectedFile() {
this.selectedFile = null; this.selectedFile = null;
@@ -221,7 +222,7 @@ export default {
}); });
// dismiss modal // dismiss modal
this.dismiss(); this.dismiss(true);
// tell user interfaces were imported // tell user interfaces were imported
DialogUtils.alert("Interfaces imported successfully. MeshChat must be restarted for these changes to take effect."); DialogUtils.alert("Interfaces imported successfully. MeshChat must be restarted for these changes to take effect.");

View File

@@ -1,207 +1,117 @@
<template> <template>
<div class="border rounded bg-white shadow dark:bg-zinc-800 dark:border-zinc-700"> <div class="interface-card">
<div class="flex gap-4 items-start">
<!-- IFAC info --> <div class="interface-card__icon">
<div v-if="iface._stats?.ifac_signature != null" class="bg-gray-50 p-1 text-sm text-gray-500 space-x-1 border-b dark:bg-zinc-800 dark:border-zinc-700"> <MaterialDesignIcon :icon-name="iconName" class="w-6 h-6"/>
<div class="flex text-sm"> </div>
<div class="my-auto"> <div class="flex-1 space-y-2">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="size-4 text-green-500"> <div class="flex items-center gap-2 flex-wrap">
<path fill-rule="evenodd" d="M10 1a4.5 4.5 0 0 0-4.5 4.5V9H5a2 2 0 0 0-2 2v6a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-6a2 2 0 0 0-2-2h-.5V5.5A4.5 4.5 0 0 0 10 1Zm3 8V5.5a3 3 0 1 0-6 0V9h6Z" clip-rule="evenodd" /> <div class="text-lg font-semibold text-gray-900 dark:text-white truncate">{{ iface._name }}</div>
</svg> <span class="type-chip">{{ iface.type }}</span>
<span :class="statusChipClass">{{ isInterfaceEnabled(iface) ? 'Enabled' : 'Disabled' }}</span>
</div> </div>
<span class="ml-1 my-auto"> <div class="text-sm text-gray-600 dark:text-gray-300">
<span class="text-green-500">{{ iface._stats.ifac_size * 8 }}-bit IFAC</span> <span v-if="iface._stats?.ifac_netname != null">• Network Name: <span class="text-purple-500">{{ iface._stats.ifac_netname }}</span></span> • Signature <span @click="onIFACSignatureClick(iface._stats.ifac_signature)" class="cursor-pointer">&lt;{{ iface._stats.ifac_signature.slice(0, 6) }}...{{ iface._stats.ifac_signature.slice(-6) }}&gt;</span> {{ description }}
</span> </div>
</div> <div class="flex flex-wrap gap-2 text-xs text-gray-600 dark:text-gray-300">
</div> <span class="stat-chip" v-if="iface._stats?.bitrate">Bitrate {{ formatBitsPerSecond(iface._stats?.bitrate ?? 0) }}</span>
<span class="stat-chip">TX {{ formatBytes(iface._stats?.txb ?? 0) }}</span>
<div class="flex py-2"> <span class="stat-chip">RX {{ formatBytes(iface._stats?.rxb ?? 0) }}</span>
<span class="stat-chip" v-if="iface.type === 'RNodeInterface' && iface._stats?.noise_floor">Noise {{ iface._stats?.noise_floor }} dBm</span>
<!-- icon --> <span class="stat-chip" v-if="iface._stats?.clients != null">Clients {{ iface._stats?.clients }}</span>
<div class="my-auto mx-2"> </div>
<div v-if="iface._stats?.ifac_signature" class="ifac-line">
<svg v-if="iface.type === 'AutoInterface'" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256" class="size-6 dark:text-white"> <span class="text-emerald-500 font-semibold">{{ iface._stats.ifac_size * 8 }}-bit IFAC</span>
<path d="M219.31,108.68l-80-80a16,16,0,0,0-22.62,0l-80,80A15.87,15.87,0,0,0,32,120v96a8,8,0,0,0,8,8h64a8,8,0,0,0,8-8V160h32v56a8,8,0,0,0,8,8h64a8,8,0,0,0,8-8V120A15.87,15.87,0,0,0,219.31,108.68ZM208,208H160V152a8,8,0,0,0-8-8H104a8,8,0,0,0-8,8v56H48V120l80-80,80,80Z"></path> <span v-if="iface._stats?.ifac_netname"> {{ iface._stats.ifac_netname }}</span>
</svg> <span></span>
<button @click="onIFACSignatureClick(iface._stats.ifac_signature)" type="button" class="text-blue-500 hover:underline">
<svg v-else-if="iface.type === 'RNodeInterface'" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256" class="size-6 dark:text-white"> {{ iface._stats.ifac_signature.slice(0, 8) }}{{ iface._stats.ifac_signature.slice(-8) }}
<path d="M128,88a40,40,0,1,0,40,40A40,40,0,0,0,128,88Zm0,64a24,24,0,1,1,24-24A24,24,0,0,1,128,152Zm73.71,7.14a80,80,0,0,1-14.08,22.2,8,8,0,0,1-11.92-10.67,63.95,63.95,0,0,0,0-85.33,8,8,0,1,1,11.92-10.67,80.08,80.08,0,0,1,14.08,84.47ZM69,103.09a64,64,0,0,0,11.26,67.58,8,8,0,0,1-11.92,10.67,79.93,79.93,0,0,1,0-106.67A8,8,0,1,1,80.29,85.34,63.77,63.77,0,0,0,69,103.09ZM248,128a119.58,119.58,0,0,1-34.29,84,8,8,0,1,1-11.42-11.2,103.9,103.9,0,0,0,0-145.56A8,8,0,1,1,213.71,44,119.58,119.58,0,0,1,248,128ZM53.71,200.78A8,8,0,1,1,42.29,212a119.87,119.87,0,0,1,0-168,8,8,0,1,1,11.42,11.2,103.9,103.9,0,0,0,0,145.56Z"></path> </button>
</svg>
<svg v-else-if="iface.type === 'TCPClientInterface' || iface.type === 'TCPServerInterface' || iface.type === 'UDPInterface'" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256" class="size-6 dark:text-white">
<path d="M128,24h0A104,104,0,1,0,232,128,104.12,104.12,0,0,0,128,24Zm88,104a87.61,87.61,0,0,1-3.33,24H174.16a157.44,157.44,0,0,0,0-48h38.51A87.61,87.61,0,0,1,216,128ZM102,168H154a115.11,115.11,0,0,1-26,45A115.27,115.27,0,0,1,102,168Zm-3.9-16a140.84,140.84,0,0,1,0-48h59.88a140.84,140.84,0,0,1,0,48ZM40,128a87.61,87.61,0,0,1,3.33-24H81.84a157.44,157.44,0,0,0,0,48H43.33A87.61,87.61,0,0,1,40,128ZM154,88H102a115.11,115.11,0,0,1,26-45A115.27,115.27,0,0,1,154,88Zm52.33,0H170.71a135.28,135.28,0,0,0-22.3-45.6A88.29,88.29,0,0,1,206.37,88ZM107.59,42.4A135.28,135.28,0,0,0,85.29,88H49.63A88.29,88.29,0,0,1,107.59,42.4ZM49.63,168H85.29a135.28,135.28,0,0,0,22.3,45.6A88.29,88.29,0,0,1,49.63,168Zm98.78,45.6a135.28,135.28,0,0,0,22.3-45.6h35.66A88.29,88.29,0,0,1,148.41,213.6Z"></path>
</svg>
<svg v-else-if="iface.type === 'SerialInterface'" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256" class="size-6 dark:text-white">
<path d="M252.44,121.34l-48-32A8,8,0,0,0,192,96v24H72V72h33a32,32,0,1,0,0-16H72A16,16,0,0,0,56,72v48H8a8,8,0,0,0,0,16H56v48a16,16,0,0,0,16,16h32v8a16,16,0,0,0,16,16h32a16,16,0,0,0,16-16V176a16,16,0,0,0-16-16H120a16,16,0,0,0-16,16v8H72V136H192v24a8,8,0,0,0,12.44,6.66l48-32a8,8,0,0,0,0-13.32ZM136,48a16,16,0,1,1-16,16A16,16,0,0,1,136,48ZM120,176h32v32H120Zm88-30.95V111l25.58,17Z"></path>
</svg>
<svg v-else-if="iface.type === 'RNodeMultiInterface'" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256" class="size-6 dark:text-white"><path d="M128,88a40,40,0,1,0,40,40A40,40,0,0,0,128,88Zm0,64a24,24,0,1,1,24-24A24,24,0,0,1,128,152Zm73.71,7.14a80,80,0,0,1-14.08,22.2,8,8,0,0,1-11.92-10.67,63.95,63.95,0,0,0,0-85.33,8,8,0,1,1,11.92-10.67,80.08,80.08,0,0,1,14.08,84.47ZM69,103.09a64,64,0,0,0,11.26,67.58,8,8,0,0,1-11.92,10.67,79.93,79.93,0,0,1,0-106.67A8,8,0,1,1,80.29,85.34,63.77,63.77,0,0,0,69,103.09ZM248,128a119.58,119.58,0,0,1-34.29,84,8,8,0,1,1-11.42-11.2,103.9,103.9,0,0,0,0-145.56A8,8,0,1,1,213.71,44,119.58,119.58,0,0,1,248,128ZM53.71,200.78A8,8,0,1,1,42.29,212a119.87,119.87,0,0,1,0-168,8,8,0,1,1,11.42,11.2,103.9,103.9,0,0,0,0,145.56Z"></path></svg>
<svg v-else-if="iface.type === 'I2PInterface'" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256" class="size-6 dark:text-white"><path d="M72,92A12,12,0,1,1,60,80,12,12,0,0,1,72,92Zm56-12a12,12,0,1,0,12,12A12,12,0,0,0,128,80Zm68,24a12,12,0,1,0-12-12A12,12,0,0,0,196,104ZM60,152a12,12,0,1,0,12,12A12,12,0,0,0,60,152Zm68,0a12,12,0,1,0,12,12A12,12,0,0,0,128,152Zm68,0a12,12,0,1,0,12,12A12,12,0,0,0,196,152Z"></path></svg>
<svg v-else-if="iface.type === 'KISSInterface' || iface.type === 'AX25KISSInterface'" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256" class="size-6 dark:text-white"><path d="M104,168a8,8,0,0,1-8,8H64a8,8,0,0,1,0-16H96A8,8,0,0,1,104,168Zm-8-40H64a8,8,0,0,0,0,16H96a8,8,0,0,0,0-16Zm0-32H64a8,8,0,0,0,0,16H96a8,8,0,0,0,0-16ZM232,80V192a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V72a8,8,0,0,1,5.7-7.66l160-48a8,8,0,0,1,4.6,15.33L86.51,64H216A16,16,0,0,1,232,80ZM216,192V80H40V192H216Zm-16-56a40,40,0,1,1-40-40A40,40,0,0,1,200,136Zm-16,0a24,24,0,1,0-24,24A24,24,0,0,0,184,136Z"></path></svg>
<svg v-else-if="iface.type === 'PipeInterface'" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256" class="size-6 dark:text-white"><path d="M128,128a8,8,0,0,1-3,6.25l-40,32a8,8,0,1,1-10-12.5L107.19,128,75,102.25a8,8,0,1,1,10-12.5l40,32A8,8,0,0,1,128,128Zm48,24H136a8,8,0,0,0,0,16h40a8,8,0,0,0,0-16Zm56-96V200a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V56A16,16,0,0,1,40,40H216A16,16,0,0,1,232,56ZM216,200V56H40V200H216Z"></path></svg>
<svg v-else xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256" class="size-6 dark:text-white">
<path d="M140,180a12,12,0,1,1-12-12A12,12,0,0,1,140,180ZM128,72c-22.06,0-40,16.15-40,36v4a8,8,0,0,0,16,0v-4c0-11,10.77-20,24-20s24,9,24,20-10.77,20-24,20a8,8,0,0,0-8,8v8a8,8,0,0,0,16,0v-.72c18.24-3.35,32-17.9,32-35.28C168,88.15,150.06,72,128,72Zm104,56A104,104,0,1,1,128,24,104.11,104.11,0,0,1,232,128Zm-16,0a88,88,0,1,0-88,88A88.1,88.1,0,0,0,216,128Z"></path>
</svg>
</div>
<!-- interface details -->
<div>
<div class="font-semibold leading-5 dark:text-white">{{ iface._name }}</div>
<div class="text-sm flex space-x-1 dark:text-zinc-100">
<!-- auto interface -->
<div v-if="iface.type === 'AutoInterface'">
{{ iface.type }} Ethernet and WiFi
</div>
<!-- tcp client interface -->
<div v-else-if="iface.type === 'TCPClientInterface'">
{{ iface.type }} {{ iface.target_host }}:{{ iface.target_port }}
</div>
<!-- tcp server interface -->
<div v-else-if="iface.type === 'TCPServerInterface'">
{{ iface.type }} {{ iface.listen_ip }}:{{ iface.listen_port }}
</div>
<!-- other interface types -->
<div v-else>{{ iface.type }}</div>
</div> </div>
</div> </div>
<div class="flex flex-col gap-2 items-end">
<!-- enabled state badge --> <button
<div class="ml-auto my-auto mr-2"> v-if="isInterfaceEnabled(iface)"
<span v-if="isInterfaceEnabled(iface)" class="inline-flex items-center rounded-full bg-green-50 px-2 py-1 text-xs font-medium text-green-700 ring-1 ring-inset ring-green-600/20">Enabled</span> @click="disableInterface"
<span v-else class="inline-flex items-center rounded-full bg-red-50 px-2 py-1 text-xs font-medium text-red-700 ring-1 ring-inset ring-red-600/20">Disabled</span> type="button"
</div> class="secondary-chip text-xs"
>
<!-- enable/disable interface button --> <MaterialDesignIcon icon-name="power" class="w-4 h-4"/>
<div class="my-auto mr-1"> Disable
<button v-if="isInterfaceEnabled(iface)" @click="disableInterface" type="button" class="cursor-pointer">
<span class="flex text-gray-700 bg-gray-100 dark:bg-zinc-600 dark:text-white dark:hover:bg-zinc-700 dark:focus-visible:outline-zinc-500 hover:bg-gray-200 p-2 rounded-full">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-5">
<path stroke-linecap="round" stroke-linejoin="round" d="M5.636 5.636a9 9 0 1 0 12.728 0M12 3v9" />
</svg>
</span>
</button> </button>
<button v-else @click="enableInterface" type="button" class="cursor-pointer"> <button
<span class="flex text-gray-700 bg-gray-100 dark:bg-zinc-600 dark:text-white dark:hover:bg-zinc-700 dark:focus-visible:outline-zinc-500 hover:bg-gray-200 p-2 rounded-full"> v-else
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-5"> @click="enableInterface"
<path stroke-linecap="round" stroke-linejoin="round" d="M5.636 5.636a9 9 0 1 0 12.728 0M12 3v9" /> type="button"
</svg> class="primary-chip text-xs"
</span> >
<MaterialDesignIcon icon-name="power" class="w-4 h-4"/>
Enable
</button> </button>
</div>
<div class="my-auto mr-2">
<DropDownMenu> <DropDownMenu>
<template v-slot:button> <template #button>
<IconButton> <IconButton>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-5"> <MaterialDesignIcon icon-name="dots-vertical" class="w-5 h-5"/>
<path stroke-linecap="round" stroke-linejoin="round" d="M12 6.75a.75.75 0 1 1 0-1.5.75.75 0 0 1 0 1.5ZM12 12.75a.75.75 0 1 1 0-1.5.75.75 0 0 1 0 1.5ZM12 18.75a.75.75 0 1 1 0-1.5.75.75 0 0 1 0 1.5Z" />
</svg>
</IconButton> </IconButton>
</template> </template>
<template v-slot:items> <template #items>
<div class="max-h-60 overflow-auto py-1 space-y-1 pr-1">
<!-- enable/disable interface button --> <DropDownMenuItem @click="editInterface">
<div class="border-b dark:border-zinc-700"> <MaterialDesignIcon icon-name="pencil" class="w-5 h-5"/>
<span>Edit Interface</span>
<!-- enable interface button -->
<DropDownMenuItem v-if="isInterfaceEnabled(iface)" @click="disableInterface">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-5">
<path fill-rule="evenodd" d="M12 2.25a.75.75 0 0 1 .75.75v9a.75.75 0 0 1-1.5 0V3a.75.75 0 0 1 .75-.75ZM6.166 5.106a.75.75 0 0 1 0 1.06 8.25 8.25 0 1 0 11.668 0 .75.75 0 1 1 1.06-1.06c3.808 3.807 3.808 9.98 0 13.788-3.807 3.808-9.98 3.808-13.788 0-3.808-3.807-3.808-9.98 0-13.788a.75.75 0 0 1 1.06 0Z" clip-rule="evenodd" />
</svg>
<span>Disable Interface</span>
</DropDownMenuItem> </DropDownMenuItem>
<DropDownMenuItem @click="exportInterface">
<DropDownMenuItem v-else @click="enableInterface"> <MaterialDesignIcon icon-name="export" class="w-5 h-5"/>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-5"> <span>Export Interface</span>
<path fill-rule="evenodd" d="M12 2.25a.75.75 0 0 1 .75.75v9a.75.75 0 0 1-1.5 0V3a.75.75 0 0 1 .75-.75ZM6.166 5.106a.75.75 0 0 1 0 1.06 8.25 8.25 0 1 0 11.668 0 .75.75 0 1 1 1.06-1.06c3.808 3.807 3.808 9.98 0 13.788-3.807 3.808-9.98 3.808-13.788 0-3.808-3.807-3.808-9.98 0-13.788a.75.75 0 0 1 1.06 0Z" clip-rule="evenodd" />
</svg>
<span>Enable Interface</span>
</DropDownMenuItem> </DropDownMenuItem>
</div>
<!-- edit interface button -->
<DropDownMenuItem @click="editInterface">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-5">
<path d="M21.731 2.269a2.625 2.625 0 0 0-3.712 0l-1.157 1.157 3.712 3.712 1.157-1.157a2.625 2.625 0 0 0 0-3.712ZM19.513 8.199l-3.712-3.712-12.15 12.15a5.25 5.25 0 0 0-1.32 2.214l-.8 2.685a.75.75 0 0 0 .933.933l2.685-.8a5.25 5.25 0 0 0 2.214-1.32L19.513 8.2Z" />
</svg>
<span>Edit Interface</span>
</DropDownMenuItem>
<!-- export interface button -->
<DropDownMenuItem @click="exportInterface">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-5">
<path fill-rule="evenodd" d="M12 2.25a.75.75 0 0 1 .75.75v11.69l3.22-3.22a.75.75 0 1 1 1.06 1.06l-4.5 4.5a.75.75 0 0 1-1.06 0l-4.5-4.5a.75.75 0 1 1 1.06-1.06l3.22 3.22V3a.75.75 0 0 1 .75-.75Zm-9 13.5a.75.75 0 0 1 .75.75v2.25a1.5 1.5 0 0 0 1.5 1.5h13.5a1.5 1.5 0 0 0 1.5-1.5V16.5a.75.75 0 0 1 1.5 0v2.25a3 3 0 0 1-3 3H5.25a3 3 0 0 1-3-3V16.5a.75.75 0 0 1 .75-.75Z" clip-rule="evenodd" />
</svg>
<span>Export Interface</span>
</DropDownMenuItem>
<!-- delete interface button -->
<div class="border-t dark:border-zinc-700">
<DropDownMenuItem @click="deleteInterface"> <DropDownMenuItem @click="deleteInterface">
<svg class="size-5 text-red-500" viewBox="0 0 20 20" fill="currentColor"> <MaterialDesignIcon icon-name="trash-can" class="w-5 h-5 text-red-500"/>
<path fill-rule="evenodd" d="M8.75 1A2.75 2.75 0 0 0 6 3.75v.443c-.795.077-1.584.176-2.365.298a.75.75 0 1 0 .23 1.482l.149-.022.841 10.518A2.75 2.75 0 0 0 7.596 19h4.807a2.75 2.75 0 0 0 2.742-2.53l.841-10.52.149.023a.75.75 0 0 0 .23-1.482A41.03 41.03 0 0 0 14 4.193V3.75A2.75 2.75 0 0 0 11.25 1h-2.5ZM10 4c.84 0 1.673.025 2.5.075V3.75c0-.69-.56-1.25-1.25-1.25h-2.5c-.69 0-1.25.56-1.25 1.25v.325C8.327 4.025 9.16 4 10 4ZM8.58 7.72a.75.75 0 0 0-1.5.06l.3 7.5a.75.75 0 1 0 1.5-.06l-.3-7.5Zm4.34.06a.75.75 0 1 0-1.5-.06l-.3 7.5a.75.75 0 1 0 1.5.06l.3-7.5Z" clip-rule="evenodd" />
</svg>
<span class="text-red-500">Delete Interface</span> <span class="text-red-500">Delete Interface</span>
</DropDownMenuItem> </DropDownMenuItem>
</div> </div>
</template> </template>
</DropDownMenu> </DropDownMenu>
</div> </div>
</div> </div>
<!-- extra interface details --> <div v-if="['UDPInterface', 'RNodeInterface'].includes(iface.type)" class="mt-4 grid gap-2 text-sm text-gray-700 dark:text-gray-300">
<div v-if="['UDPInterface', 'RNodeInterface'].includes(iface.type)" class="p-1 text-sm border-t dark:text-zinc-100 dark:border-zinc-700"> <div v-if="iface.type === 'UDPInterface'" class="detail-grid">
<div>
<!-- udp interface --> <div class="detail-label">Listen</div>
<div v-if="iface.type === 'UDPInterface'"> <div class="detail-value">{{ iface.listen_ip }}:{{ iface.listen_port }}</div>
<div>Listen: {{ iface.listen_ip }}:{{ iface.listen_port }}</div> </div>
<div>Forward: {{ iface.forward_ip }}:{{ iface.forward_port }}</div> <div>
<div class="detail-label">Forward</div>
<div class="detail-value">{{ iface.forward_ip }}:{{ iface.forward_port }}</div>
</div>
</div> </div>
<div v-else-if="iface.type === 'RNodeInterface'" class="detail-grid">
<!-- rnode interface details --> <div>
<div v-else-if="iface.type === 'RNodeInterface'"> <div class="detail-label">Port</div>
<div>Port: {{ iface.port }}</div> <div class="detail-value">{{ iface.port }}</div>
<div>Frequency: {{ formatFrequency(iface.frequency) }}</div> </div>
<div>Bandwidth: {{ formatFrequency(iface.bandwidth) }}</div> <div>
<div>Spreading Factor: {{ iface.spreadingfactor }}</div> <div class="detail-label">Frequency</div>
<div>Coding Rate: {{ iface.codingrate }}</div> <div class="detail-value">{{ formatFrequency(iface.frequency) }}</div>
<div>Transmit Power: {{ iface.txpower }}dBm</div> </div>
<div>
<div class="detail-label">Bandwidth</div>
<div class="detail-value">{{ formatFrequency(iface.bandwidth) }}</div>
</div>
<div>
<div class="detail-label">Spreading Factor</div>
<div class="detail-value">{{ iface.spreadingfactor }}</div>
</div>
<div>
<div class="detail-label">Coding Rate</div>
<div class="detail-value">{{ iface.codingrate }}</div>
</div>
<div>
<div class="detail-label">TX Power</div>
<div class="detail-value">{{ iface.txpower }} dBm</div>
</div>
</div> </div>
</div> </div>
<div class="flex bg-gray-50 p-1 text-sm text-gray-500 space-x-1 border-t rounded-b dark:bg-zinc-800 dark:text-white dark:border-zinc-700">
<!-- status -->
<div v-if="iface._stats?.status === true" class="text-sm text-green-500">Connected</div>
<div v-else class="text-sm text-red-500">Disconnected</div>
<!-- stats -->
<div> Bitrate: {{ formatBitsPerSecond(iface._stats?.bitrate ?? 0) }}</div>
<div> TX: {{ formatBytes(iface._stats?.txb ?? 0) }}</div>
<div> RX: {{ formatBytes(iface._stats?.rxb ?? 0) }}</div>
<div v-if="iface.type === 'RNodeInterface'"> Noise Floor: {{
iface._stats?.noise_floor
}} dBm
</div>
<div v-if="iface._stats?.clients != null"> Clients: {{ iface._stats?.clients }}</div>
</div>
</div> </div>
</template> </template>
@@ -211,6 +121,7 @@ import Utils from "../../js/Utils";
import DropDownMenuItem from "../DropDownMenuItem.vue"; import DropDownMenuItem from "../DropDownMenuItem.vue";
import IconButton from "../IconButton.vue"; import IconButton from "../IconButton.vue";
import DropDownMenu from "../DropDownMenu.vue"; import DropDownMenu from "../DropDownMenu.vue";
import MaterialDesignIcon from "../MaterialDesignIcon.vue";
export default { export default {
name: 'Interface', name: 'Interface',
@@ -218,6 +129,7 @@ export default {
DropDownMenu, DropDownMenu,
IconButton, IconButton,
DropDownMenuItem, DropDownMenuItem,
MaterialDesignIcon,
}, },
props: { props: {
iface: Object, iface: Object,
@@ -259,5 +171,81 @@ export default {
return Utils.formatFrequency(hz); return Utils.formatFrequency(hz);
}, },
}, },
computed: {
iconName() {
switch (this.iface.type) {
case "AutoInterface":
return "home-automation";
case "RNodeInterface":
return "radio-tower";
case "RNodeMultiInterface":
return "access-point-network";
case "TCPClientInterface":
return "lan-connect";
case "TCPServerInterface":
return "lan";
case "UDPInterface":
return "wan";
case "SerialInterface":
return "usb-port";
case "KISSInterface":
case "AX25KISSInterface":
return "antenna";
case "I2PInterface":
return "eye";
case "PipeInterface":
return "pipe";
default:
return "server-network";
}
},
description() {
if (this.iface.type === "TCPClientInterface") {
return `${this.iface.target_host}:${this.iface.target_port}`;
}
if (this.iface.type === "TCPServerInterface" || this.iface.type === "UDPInterface") {
return `${this.iface.listen_ip}:${this.iface.listen_port}`;
}
if (this.iface.type === "SerialInterface") {
return `${this.iface.port} @ ${this.iface.speed || "9600"}bps`;
}
if (this.iface.type === "AutoInterface") {
return "Auto-detect Ethernet and Wi-Fi peers";
}
return this.iface.description || "Custom interface";
},
statusChipClass() {
return this.isInterfaceEnabled(this.iface)
? "inline-flex items-center rounded-full bg-green-100 text-green-700 px-2 py-0.5 text-xs font-semibold"
: "inline-flex items-center rounded-full bg-red-100 text-red-700 px-2 py-0.5 text-xs font-semibold";
},
},
} }
</script> </script>
<style scoped>
.interface-card {
@apply bg-white/95 dark:bg-zinc-900/85 backdrop-blur border border-gray-200 dark:border-zinc-800 rounded-3xl shadow-lg p-4 space-y-3;
}
.interface-card__icon {
@apply w-12 h-12 rounded-2xl bg-blue-50 text-blue-600 dark:bg-blue-900/40 dark:text-blue-200 flex items-center justify-center;
}
.type-chip {
@apply inline-flex items-center rounded-full bg-gray-100 dark:bg-zinc-800 px-2 py-0.5 text-xs font-semibold text-gray-600 dark:text-gray-200;
}
.stat-chip {
@apply inline-flex items-center rounded-full border border-gray-200 dark:border-zinc-700 px-2 py-0.5;
}
.ifac-line {
@apply text-xs flex flex-wrap items-center gap-1;
}
.detail-grid {
@apply grid gap-3 sm:grid-cols-2;
}
.detail-label {
@apply text-xs uppercase tracking-wide text-gray-500 dark:text-gray-400;
}
.detail-value {
@apply text-sm font-medium text-gray-900 dark:text-white;
}
</style>

View File

@@ -1,85 +1,87 @@
<template> <template>
<div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] dark:bg-zinc-950"> <div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] bg-gradient-to-br from-slate-50 via-slate-100 to-white dark:from-zinc-950 dark:via-zinc-900 dark:to-zinc-900">
<div class="overflow-y-auto p-2 space-y-2"> <div class="overflow-y-auto p-3 md:p-6 space-y-4 max-w-6xl mx-auto w-full">
<!-- warning - keeping orange-500 for warning visibility in both modes --> <div v-if="showRestartReminder" class="bg-gradient-to-r from-amber-500 to-orange-500 text-white rounded-3xl shadow-xl p-4 flex flex-wrap gap-3 items-center">
<div class="flex bg-orange-500 p-2 text-sm font-semibold leading-6 text-white rounded shadow"> <div class="flex items-center gap-3">
<div class="my-auto"> <MaterialDesignIcon icon-name="alert" class="w-6 h-6"/>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6"> <div>
<path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" /> <div class="text-lg font-semibold">Restart required</div>
</svg> <div class="text-sm">Reticulum MeshChat must be restarted for any interface changes to take effect.</div>
</div>
</div> </div>
<div class="ml-2 my-auto">Reticulum MeshChat must be restarted for any interface changes to take effect.</div> <button v-if="isElectron" @click="relaunch" type="button" class="ml-auto inline-flex items-center gap-2 rounded-full border border-white/40 px-4 py-1.5 text-sm font-semibold text-white hover:bg-white/10 transition">
<button v-if="isElectron" <MaterialDesignIcon icon-name="restart" class="w-4 h-4"/>
@click="relaunch" Restart now
type="button"
class="ml-auto my-auto inline-flex items-center gap-x-1 rounded-md bg-white dark:bg-zinc-800 px-2 py-1 text-sm font-semibold text-black dark:text-zinc-200 shadow-sm hover:bg-gray-50 dark:hover:bg-zinc-700 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-white dark:focus-visible:outline-zinc-700">
<span>Restart Now</span>
</button> </button>
</div> </div>
<div class="flex space-x-1"> <div class="glass-card space-y-4">
<div class="flex flex-wrap gap-3 items-center">
<!-- Add Interface button --> <div class="flex-1">
<RouterLink :to="{ name: 'interfaces.add' }"> <div class="text-xs uppercase tracking-wide text-gray-500 dark:text-gray-400">Manage</div>
<button type="button" <div class="text-xl font-semibold text-gray-900 dark:text-white">Interfaces</div>
class="my-auto inline-flex items-center gap-x-1 rounded-md bg-gray-500 dark:bg-zinc-700 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 dark:hover:bg-zinc-600 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 dark:focus-visible:outline-zinc-700"> <div class="text-sm text-gray-600 dark:text-gray-300">Search, filter and export your Reticulum adapters.</div>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-5"> </div>
<path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" /> <div class="flex flex-wrap gap-2">
</svg> <RouterLink :to="{ name: 'interfaces.add' }" class="primary-chip px-4 py-2 text-sm">
<span>Add Interface</span> <MaterialDesignIcon icon-name="plus" class="w-4 h-4"/>
</button> Add Interface
</RouterLink> </RouterLink>
<button @click="showImportInterfacesModal" type="button" class="secondary-chip text-sm">
<!-- Import button --> <MaterialDesignIcon icon-name="import" class="w-4 h-4"/>
<div class="my-auto"> Import
<button @click="showImportInterfacesModal" type="button" class="inline-flex items-center gap-x-1 rounded-md bg-gray-500 dark:bg-zinc-700 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 dark:hover:bg-zinc-600 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 dark:focus-visible:outline-zinc-700"> </button>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-5"> <button @click="exportInterfaces" type="button" class="secondary-chip text-sm">
<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5M16.5 12L12 16.5m0 0L7.5 12m4.5 4.5V3" /> <MaterialDesignIcon icon-name="export" class="w-4 h-4"/>
</svg> Export all
<span>Import</span> </button>
</button> </div>
</div> </div>
<div class="flex flex-wrap gap-3 items-center">
<!-- Export button --> <div class="flex-1">
<div class="my-auto"> <input
<button @click="exportInterfaces" type="button" class="inline-flex items-center gap-x-1 rounded-md bg-gray-500 dark:bg-zinc-700 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 dark:hover:bg-zinc-600 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 dark:focus-visible:outline-zinc-700"> v-model="searchTerm"
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-5"> type="text"
<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5m-13.5-9L12 3m0 0l4.5 4.5M12 3v13.5" /> placeholder="Search by name, type, host..."
</svg> class="input-field"
<span>Export</span> />
</button> </div>
<div class="flex gap-2 flex-wrap">
<button type="button" @click="setStatusFilter('all')" :class="filterChipClass(statusFilter === 'all')">All</button>
<button type="button" @click="setStatusFilter('enabled')" :class="filterChipClass(statusFilter === 'enabled')">Enabled</button>
<button type="button" @click="setStatusFilter('disabled')" :class="filterChipClass(statusFilter === 'disabled')">Disabled</button>
</div>
<div class="w-full sm:w-60">
<select v-model="typeFilter" class="input-field">
<option value="all">All types</option>
<option v-for="type in sortedInterfaceTypes" :key="type" :value="type">{{ type }}</option>
</select>
</div>
</div> </div>
</div> </div>
<!-- enabled interfaces --> <div v-if="filteredInterfaces.length === 0" class="glass-card text-center py-10 text-gray-500 dark:text-gray-300">
<Interface <MaterialDesignIcon icon-name="lan-disconnect" class="w-10 h-10 mx-auto mb-3"/>
v-for="iface of enabledInterfaces" <div class="text-lg font-semibold">No interfaces found</div>
:iface="iface" <div class="text-sm">Adjust your search or add a new interface.</div>
@enable="enableInterface(iface._name)" </div>
@disable="disableInterface(iface._name)"
@edit="editInterface(iface._name)"
@export="exportInterface(iface._name)"
@delete="deleteInterface(iface._name)"/>
<!-- disabled interfaces -->
<div v-if="disabledInterfaces.length > 0" class="font-semibold dark:text-zinc-200">Disabled Interfaces</div>
<Interface
v-for="iface of disabledInterfaces"
:iface="iface"
@enable="enableInterface(iface._name)"
@disable="disableInterface(iface._name)"
@edit="editInterface(iface._name)"
@export="exportInterface(iface._name)"
@delete="deleteInterface(iface._name)"/>
<div v-else class="grid gap-4 xl:grid-cols-2">
<Interface
v-for="iface of filteredInterfaces"
:key="iface._name"
:iface="iface"
@enable="enableInterface(iface._name)"
@disable="disableInterface(iface._name)"
@edit="editInterface(iface._name)"
@export="exportInterface(iface._name)"
@delete="deleteInterface(iface._name)"/>
</div>
</div> </div>
</div> </div>
<!-- Import Dialog -->
<ImportInterfacesModal ref="import-interfaces-modal" @dismissed="onImportInterfacesModalDismissed"/> <ImportInterfacesModal ref="import-interfaces-modal" @dismissed="onImportInterfacesModalDismissed"/>
</template> </template>
<script> <script>
@@ -89,18 +91,24 @@ import Interface from "./Interface.vue";
import Utils from "../../js/Utils"; import Utils from "../../js/Utils";
import ImportInterfacesModal from "./ImportInterfacesModal.vue"; import ImportInterfacesModal from "./ImportInterfacesModal.vue";
import DownloadUtils from "../../js/DownloadUtils"; import DownloadUtils from "../../js/DownloadUtils";
import MaterialDesignIcon from "../MaterialDesignIcon.vue";
export default { export default {
name: 'InterfacesPage', name: 'InterfacesPage',
components: { components: {
ImportInterfacesModal, ImportInterfacesModal,
Interface, Interface,
MaterialDesignIcon,
}, },
data() { data() {
return { return {
interfaces: {}, interfaces: {},
interfaceStats: {}, interfaceStats: {},
reloadInterval: null, reloadInterval: null,
searchTerm: "",
statusFilter: "all",
typeFilter: "all",
hasPendingInterfaceChanges: false,
}; };
}, },
beforeUnmount() { beforeUnmount() {
@@ -121,6 +129,9 @@ export default {
relaunch() { relaunch() {
ElectronUtils.relaunch(); ElectronUtils.relaunch();
}, },
trackInterfaceChange() {
this.hasPendingInterfaceChanges = true;
},
isInterfaceEnabled: function(iface) { isInterfaceEnabled: function(iface) {
return Utils.isInterfaceEnabled(iface); return Utils.isInterfaceEnabled(iface);
}, },
@@ -155,6 +166,7 @@ export default {
await window.axios.post(`/api/v1/reticulum/interfaces/enable`, { await window.axios.post(`/api/v1/reticulum/interfaces/enable`, {
name: interfaceName, name: interfaceName,
}); });
this.trackInterfaceChange();
} catch(e) { } catch(e) {
DialogUtils.alert("failed to enable interface"); DialogUtils.alert("failed to enable interface");
console.log(e); console.log(e);
@@ -171,6 +183,7 @@ export default {
await window.axios.post(`/api/v1/reticulum/interfaces/disable`, { await window.axios.post(`/api/v1/reticulum/interfaces/disable`, {
name: interfaceName, name: interfaceName,
}); });
this.trackInterfaceChange();
} catch(e) { } catch(e) {
DialogUtils.alert("failed to disable interface"); DialogUtils.alert("failed to disable interface");
console.log(e); console.log(e);
@@ -200,6 +213,7 @@ export default {
await window.axios.post(`/api/v1/reticulum/interfaces/delete`, { await window.axios.post(`/api/v1/reticulum/interfaces/delete`, {
name: interfaceName, name: interfaceName,
}); });
this.trackInterfaceChange();
} catch(e) { } catch(e) {
DialogUtils.alert("failed to delete interface"); DialogUtils.alert("failed to delete interface");
console.log(e); console.log(e);
@@ -214,6 +228,7 @@ export default {
// fetch exported interfaces // fetch exported interfaces
const response = await window.axios.post('/api/v1/reticulum/interfaces/export'); const response = await window.axios.post('/api/v1/reticulum/interfaces/export');
this.trackInterfaceChange();
// download file to browser // download file to browser
DownloadUtils.downloadFile("meshchat_interfaces.txt", new Blob([response.data])); DownloadUtils.downloadFile("meshchat_interfaces.txt", new Blob([response.data]));
@@ -232,6 +247,7 @@ export default {
interfaceName, interfaceName,
], ],
}); });
this.trackInterfaceChange();
// download file to browser // download file to browser
DownloadUtils.downloadFile(`${interfaceName}.txt`, new Blob([response.data])); DownloadUtils.downloadFile(`${interfaceName}.txt`, new Blob([response.data]));
@@ -244,15 +260,29 @@ export default {
showImportInterfacesModal() { showImportInterfacesModal() {
this.$refs["import-interfaces-modal"].show(); this.$refs["import-interfaces-modal"].show();
}, },
onImportInterfacesModalDismissed() { onImportInterfacesModalDismissed(imported = false) {
// reload interfaces as something may have been imported // reload interfaces as something may have been imported
this.loadInterfaces(); this.loadInterfaces();
if(imported){
this.trackInterfaceChange();
}
},
setStatusFilter(value) {
this.statusFilter = value;
},
filterChipClass(isActive) {
return isActive
? "primary-chip text-xs"
: "secondary-chip text-xs";
}, },
}, },
computed: { computed: {
isElectron() { isElectron() {
return ElectronUtils.isElectron(); return ElectronUtils.isElectron();
}, },
showRestartReminder() {
return this.hasPendingInterfaceChanges;
},
interfacesWithStats() { interfacesWithStats() {
const results = []; const results = [];
for(const [interfaceName, iface] of Object.entries(this.interfaces)){ for(const [interfaceName, iface] of Object.entries(this.interfaces)){
@@ -268,6 +298,43 @@ export default {
disabledInterfaces() { disabledInterfaces() {
return this.interfacesWithStats.filter((iface) => !this.isInterfaceEnabled(iface)); return this.interfacesWithStats.filter((iface) => !this.isInterfaceEnabled(iface));
}, },
filteredInterfaces() {
const search = this.searchTerm.toLowerCase().trim();
return this.interfacesWithStats
.filter((iface) => {
if (this.statusFilter === "enabled" && !this.isInterfaceEnabled(iface)) {
return false;
}
if (this.statusFilter === "disabled" && this.isInterfaceEnabled(iface)) {
return false;
}
if (this.typeFilter !== "all" && iface.type !== this.typeFilter) {
return false;
}
if (!search) {
return true;
}
const haystack = [
iface._name,
iface.type,
iface.target_host,
iface.target_port,
iface.listen_ip,
iface.listen_port,
].filter(Boolean).join(" ").toLowerCase();
return haystack.includes(search);
})
.sort((a, b) => {
const enabledDiff = Number(this.isInterfaceEnabled(b)) - Number(this.isInterfaceEnabled(a));
if (enabledDiff !== 0) return enabledDiff;
return a._name.localeCompare(b._name);
});
},
sortedInterfaceTypes() {
const types = new Set();
this.interfacesWithStats.forEach((iface) => types.add(iface.type));
return Array.from(types).sort();
},
}, },
} }
</script> </script>

View File

@@ -1,22 +1,16 @@
<template> <template>
<div class="inline-flex rounded-md shadow-sm"> <div class="inline-flex">
<button v-if="isRecordingAudioAttachment" @click="stopRecordingAudioAttachment" type="button" class="my-auto mr-1 inline-flex items-center gap-x-1 rounded-md bg-red-500 px-2.5 py-1.5 text-sm font-semibold text-white shadow-sm hover:bg-red-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-red-500 dark:bg-zinc-800 dark:text-white dark:hover:bg-zinc-700 dark:focus-visible:outline-zinc-500"> <button v-if="isRecordingAudioAttachment" @click="stopRecordingAudioAttachment" type="button" class="my-auto inline-flex items-center gap-x-1 rounded-full border border-red-200 bg-red-50 px-3 py-1.5 text-xs font-semibold text-red-700 shadow-sm hover:border-red-400 transition dark:border-red-500/40 dark:bg-red-900/30 dark:text-red-100">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="size-5"> <MaterialDesignIcon icon-name="microphone" class="w-4 h-4"/>
<path d="M7 4a3 3 0 0 1 6 0v6a3 3 0 1 1-6 0V4Z" />
<path d="M5.5 9.643a.75.75 0 0 0-1.5 0V10c0 3.06 2.29 5.585 5.25 5.954V17.5h-1.5a.75.75 0 0 0 0 1.5h4.5a.75.75 0 0 0 0-1.5h-1.5v-1.546A6.001 6.001 0 0 0 16 10v-.357a.75.75 0 0 0-1.5 0V10a4.5 4.5 0 0 1-9 0v-.357Z" />
</svg>
<span class="ml-1"> <span class="ml-1">
<slot/> <slot/>
</span> </span>
</button> </button>
<button v-else @click="showMenu" type="button" class="my-auto mr-1 inline-flex items-center gap-x-1 rounded-md bg-gray-500 px-2.5 py-1.5 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 dark:bg-zinc-800 dark:text-white dark:hover:bg-zinc-700 dark:focus-visible:outline-zinc-500"> <button v-else @click="showMenu" type="button" class="my-auto inline-flex items-center gap-x-1 rounded-full border border-gray-200 dark:border-zinc-700 bg-white/90 dark:bg-zinc-900/80 px-3 py-1.5 text-xs font-semibold text-gray-800 dark:text-gray-100 shadow-sm hover:border-blue-400 dark:hover:border-blue-500 transition">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="size-5"> <MaterialDesignIcon icon-name="microphone-plus" class="w-4 h-4"/>
<path d="M7 4a3 3 0 0 1 6 0v6a3 3 0 1 1-6 0V4Z" /> <span class="hidden xl:inline-block whitespace-nowrap">Add Voice</span>
<path d="M5.5 9.643a.75.75 0 0 0-1.5 0V10c0 3.06 2.29 5.585 5.25 5.954V17.5h-1.5a.75.75 0 0 0 0 1.5h4.5a.75.75 0 0 0 0-1.5h-1.5v-1.546A6.001 6.001 0 0 0 16 10v-.357a.75.75 0 0 0-1.5 0V10a4.5 4.5 0 0 1-9 0v-.357Z" />
</svg>
<span class="ml-1 hidden xl:inline-block whitespace-nowrap">Add Voice</span>
</button> </button>
<div class="relative block"> <div class="relative block">
@@ -27,11 +21,11 @@
leave-active-class="transition ease-in duration-75" leave-active-class="transition ease-in duration-75"
leave-from-class="transform opacity-100 scale-100" leave-from-class="transform opacity-100 scale-100"
leave-to-class="transform opacity-0 scale-95"> leave-to-class="transform opacity-0 scale-95">
<div v-if="isShowingMenu" v-click-outside="hideMenu" class="absolute bottom-0 -ml-11 sm:right-0 sm:ml-0 z-10 mb-10 rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none"> <div v-if="isShowingMenu" v-click-outside="hideMenu" class="absolute bottom-0 -ml-11 sm:right-0 sm:ml-0 z-10 mb-10 rounded-xl bg-white dark:bg-zinc-900 shadow-lg ring-1 ring-gray-200 dark:ring-zinc-800 focus:outline-none">
<div class="py-1"> <div class="py-1">
<button @click="startRecordingCodec2('1200')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 whitespace-nowrap">Low Quality - Codec2 (1200)</button> <button @click="startRecordingCodec2('1200')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 dark:text-zinc-300 hover:bg-gray-100 dark:hover:bg-zinc-800 whitespace-nowrap">Low Quality - Codec2 (1200)</button>
<button @click="startRecordingCodec2('3200')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 whitespace-nowrap">Medium Quality - Codec2 (3200)</button> <button @click="startRecordingCodec2('3200')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 dark:text-zinc-300 hover:bg-gray-100 dark:hover:bg-zinc-800 whitespace-nowrap">Medium Quality - Codec2 (3200)</button>
<button @click="startRecordingOpus()" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 whitespace-nowrap">High Quality - OPUS</button> <button @click="startRecordingOpus()" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 dark:text-zinc-300 hover:bg-gray-100 dark:hover:bg-zinc-800 whitespace-nowrap">High Quality - OPUS</button>
</div> </div>
</div> </div>
</Transition> </Transition>
@@ -41,8 +35,12 @@
</template> </template>
<script> <script>
import MaterialDesignIcon from "../MaterialDesignIcon.vue";
export default { export default {
name: 'AddAudioButton', name: 'AddAudioButton',
components: {
MaterialDesignIcon,
},
props: { props: {
isRecordingAudioAttachment: Boolean, isRecordingAudioAttachment: Boolean,
}, },

View File

@@ -1,11 +1,9 @@
<template> <template>
<div class="inline-flex rounded-md shadow-sm"> <div class="inline-flex">
<button @click="showMenu" type="button" class="my-auto mr-1 inline-flex items-center gap-x-1 rounded-md bg-gray-500 px-2.5 py-1.5 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 dark:bg-zinc-800 dark:text-white dark:hover:bg-zinc-700 dark:focus-visible:outline-zinc-500"> <button @click="showMenu" type="button" class="my-auto inline-flex items-center gap-x-1 rounded-full border border-gray-200 dark:border-zinc-700 bg-white/90 dark:bg-zinc-900/80 px-3 py-1.5 text-xs font-semibold text-gray-800 dark:text-gray-100 shadow-sm hover:border-blue-400 dark:hover:border-blue-500 transition">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-5"> <MaterialDesignIcon icon-name="image-plus" class="w-4 h-4"/>
<path fill-rule="evenodd" d="M1.5 6a2.25 2.25 0 0 1 2.25-2.25h16.5A2.25 2.25 0 0 1 22.5 6v12a2.25 2.25 0 0 1-2.25 2.25H3.75A2.25 2.25 0 0 1 1.5 18V6ZM3 16.06V18c0 .414.336.75.75.75h16.5A.75.75 0 0 0 21 18v-1.94l-2.69-2.689a1.5 1.5 0 0 0-2.12 0l-.88.879.97.97a.75.75 0 1 1-1.06 1.06l-5.16-5.159a1.5 1.5 0 0 0-2.12 0L3 16.061Zm10.125-7.81a1.125 1.125 0 1 1 2.25 0 1.125 1.125 0 0 1-2.25 0Z" clip-rule="evenodd" /> <span class="hidden xl:inline-block whitespace-nowrap">Add Image</span>
</svg>
<span class="ml-1 hidden xl:inline-block whitespace-nowrap">Add Image</span>
</button> </button>
<div class="relative block"> <div class="relative block">
@@ -16,12 +14,12 @@
leave-active-class="transition ease-in duration-75" leave-active-class="transition ease-in duration-75"
leave-from-class="transform opacity-100 scale-100" leave-from-class="transform opacity-100 scale-100"
leave-to-class="transform opacity-0 scale-95"> leave-to-class="transform opacity-0 scale-95">
<div v-if="isShowingMenu" v-click-outside="hideMenu" class="absolute bottom-0 -ml-11 sm:right-0 sm:ml-0 z-10 mb-10 rounded-md bg-white shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none"> <div v-if="isShowingMenu" v-click-outside="hideMenu" class="absolute bottom-0 -ml-11 sm:right-0 sm:ml-0 z-10 mb-10 rounded-xl bg-white dark:bg-zinc-900 shadow-lg ring-1 ring-gray-200 dark:ring-zinc-800 focus:outline-none">
<div class="py-1"> <div class="py-1">
<button @click="addImage('low')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 whitespace-nowrap">Low Quality (320x320)</button> <button @click="addImage('low')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 dark:text-zinc-300 hover:bg-gray-100 dark:hover:bg-zinc-800 whitespace-nowrap">Low Quality (320x320)</button>
<button @click="addImage('medium')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 whitespace-nowrap">Medium Quality (640x640)</button> <button @click="addImage('medium')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 dark:text-zinc-300 hover:bg-gray-100 dark:hover:bg-zinc-800 whitespace-nowrap">Medium Quality (640x640)</button>
<button @click="addImage('high')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 whitespace-nowrap">High Quality (1280x1280)</button> <button @click="addImage('high')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 dark:text-zinc-300 hover:bg-gray-100 dark:hover:bg-zinc-800 whitespace-nowrap">High Quality (1280x1280)</button>
<button @click="addImage('original')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 whitespace-nowrap">Original Quality</button> <button @click="addImage('original')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 dark:text-zinc-300 hover:bg-gray-100 dark:hover:bg-zinc-800 whitespace-nowrap">Original Quality</button>
</div> </div>
</div> </div>
</Transition> </Transition>
@@ -36,8 +34,12 @@
<script> <script>
import Compressor from 'compressorjs'; import Compressor from 'compressorjs';
import DialogUtils from "../../js/DialogUtils"; import DialogUtils from "../../js/DialogUtils";
import MaterialDesignIcon from "../MaterialDesignIcon.vue";
export default { export default {
name: 'AddImageButton', name: 'AddImageButton',
components: {
MaterialDesignIcon,
},
emits: [ emits: [
"add-image", "add-image",
], ],

View File

@@ -35,6 +35,20 @@
<span>Set Custom Display Name</span> <span>Set Custom Display Name</span>
</DropDownMenuItem> </DropDownMenuItem>
<!-- block/unblock button -->
<div class="border-t">
<DropDownMenuItem v-if="!isBlocked" @click="onBlockDestination">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-5 text-red-500">
<path fill-rule="evenodd" d="M12 1.5a5.25 5.25 0 0 0-5.25 5.25v3a3 3 0 0 0-3 3v6.75a3 3 0 0 0 3 3h10.5a3 3 0 0 0 3-3V13.5a3 3 0 0 0-3-3v-3c0-2.9-2.35-5.25-5.25-5.25Zm-1.5 8.25v3a1.5 1.5 0 0 0 3 0v-3a1.5 1.5 0 0 0-3 0Z" clip-rule="evenodd" />
</svg>
<span class="text-red-500">Block User</span>
</DropDownMenuItem>
<DropDownMenuItem v-else @click="onUnblockDestination">
<MaterialDesignIcon icon-name="check-circle" class="size-5 text-green-500"/>
<span class="text-green-500">Unblock User</span>
</DropDownMenuItem>
</div>
<!-- delete message history button --> <!-- delete message history button -->
<div class="border-t"> <div class="border-t">
<DropDownMenuItem @click="onDeleteMessageHistory"> <DropDownMenuItem @click="onDeleteMessageHistory">
@@ -53,6 +67,7 @@
import DropDownMenu from "../DropDownMenu.vue"; import DropDownMenu from "../DropDownMenu.vue";
import DropDownMenuItem from "../DropDownMenuItem.vue"; import DropDownMenuItem from "../DropDownMenuItem.vue";
import IconButton from "../IconButton.vue"; import IconButton from "../IconButton.vue";
import MaterialDesignIcon from "../MaterialDesignIcon.vue";
import DialogUtils from "../../js/DialogUtils"; import DialogUtils from "../../js/DialogUtils";
export default { export default {
@@ -61,6 +76,7 @@ export default {
IconButton, IconButton,
DropDownMenuItem, DropDownMenuItem,
DropDownMenu, DropDownMenu,
MaterialDesignIcon,
}, },
props: { props: {
peer: Object, peer: Object,
@@ -68,8 +84,72 @@ export default {
emits: [ emits: [
"conversation-deleted", "conversation-deleted",
"set-custom-display-name", "set-custom-display-name",
"block-status-changed",
], ],
data() {
return {
isBlocked: false,
blockedDestinations: [],
};
},
async mounted() {
await this.loadBlockedDestinations();
},
watch: {
peer: {
handler() {
this.checkIfBlocked();
},
immediate: true,
},
},
methods: { methods: {
async loadBlockedDestinations() {
try {
const response = await window.axios.get("/api/v1/blocked-destinations");
this.blockedDestinations = response.data.blocked_destinations || [];
this.checkIfBlocked();
} catch(e) {
console.log(e);
}
},
checkIfBlocked() {
if (!this.peer) {
this.isBlocked = false;
return;
}
this.isBlocked = this.blockedDestinations.some(
b => b.destination_hash === this.peer.destination_hash
);
},
async onBlockDestination() {
if (!await DialogUtils.confirm("Are you sure you want to block this user? They will not be able to send you messages or establish links.")) {
return;
}
try {
await window.axios.post("/api/v1/blocked-destinations", {
destination_hash: this.peer.destination_hash,
});
await this.loadBlockedDestinations();
DialogUtils.alert("User blocked successfully");
this.$emit("block-status-changed");
} catch(e) {
DialogUtils.alert("Failed to block user");
console.log(e);
}
},
async onUnblockDestination() {
try {
await window.axios.delete(`/api/v1/blocked-destinations/${this.peer.destination_hash}`);
await this.loadBlockedDestinations();
DialogUtils.alert("User unblocked successfully");
this.$emit("block-status-changed");
} catch(e) {
DialogUtils.alert("Failed to unblock user");
console.log(e);
}
},
async onDeleteMessageHistory() { async onDeleteMessageHistory() {
// ask user to confirm deleting conversation history // ask user to confirm deleting conversation history

View File

@@ -1,33 +1,35 @@
<template> <template>
<!-- peer selected --> <!-- peer selected -->
<div v-if="selectedPeer" class="flex flex-col h-full bg-white overflow-hidden sm:m-2 sm:border sm:rounded-xl sm:shadow dark:bg-zinc-950 dark:border-zinc-800"> <div v-if="selectedPeer" class="flex flex-col h-full bg-white dark:bg-zinc-950 overflow-hidden sm:m-3 sm:border sm:rounded-2xl sm:shadow-lg border-gray-200/50 dark:border-zinc-800/50 transition-all">
<!-- header --> <!-- header -->
<div class="flex p-2 border-b border-gray-300 dark:border-zinc-800"> <div class="flex items-center px-4 py-3 border-b border-gray-200/60 dark:border-zinc-800/60 bg-white/80 dark:bg-zinc-900/50 backdrop-blur-sm">
<!-- peer icon --> <!-- peer icon -->
<div class="my-auto mr-2"> <div class="flex-shrink-0 mr-3">
<div v-if="selectedPeer.lxmf_user_icon" class="p-2 rounded" :style="{ 'color': selectedPeer.lxmf_user_icon.foreground_colour, 'background-color': selectedPeer.lxmf_user_icon.background_colour }"> <div v-if="selectedPeer.lxmf_user_icon" class="p-2 rounded shadow-sm" :style="{ 'color': selectedPeer.lxmf_user_icon.foreground_colour, 'background-color': selectedPeer.lxmf_user_icon.background_colour }">
<MaterialDesignIcon :icon-name="selectedPeer.lxmf_user_icon.icon_name" class="w-6 h-6"/> <MaterialDesignIcon :icon-name="selectedPeer.lxmf_user_icon.icon_name" class="w-6 h-6"/>
</div> </div>
<div v-else class="bg-gray-200 dark:bg-zinc-700 text-gray-500 dark:text-gray-400 p-2 rounded"> <div v-else class="bg-gray-200 dark:bg-zinc-700 text-gray-500 dark:text-gray-400 p-2 rounded shadow-sm">
<MaterialDesignIcon icon-name="account-outline" class="w-6 h-6"/> <MaterialDesignIcon icon-name="account-outline" class="w-6 h-6"/>
</div> </div>
</div> </div>
<!-- peer info --> <!-- peer info -->
<div> <div class="min-w-0 flex-1">
<div @click="updateCustomDisplayName" class="flex cursor-pointer"> <div @click="updateCustomDisplayName" class="flex items-center cursor-pointer min-w-0 group">
<div v-if="selectedPeer.custom_display_name != null" class="my-auto mr-1 dark:text-white" title="Custom Display Name"> <div v-if="selectedPeer.custom_display_name != null" class="mr-1.5 text-gray-500 dark:text-zinc-400 group-hover:text-gray-700 dark:group-hover:text-zinc-200 transition-colors" title="Custom Display Name">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-3.5 h-3.5">
<path stroke-linecap="round" stroke-linejoin="round" d="M9.568 3H5.25A2.25 2.25 0 0 0 3 5.25v4.318c0 .597.237 1.17.659 1.591l9.581 9.581c.699.699 1.78.872 2.607.33a18.095 18.095 0 0 0 5.223-5.223c.542-.827.369-1.908-.33-2.607L11.16 3.66A2.25 2.25 0 0 0 9.568 3Z" /> <path stroke-linecap="round" stroke-linejoin="round" d="M9.568 3H5.25A2.25 2.25 0 0 0 3 5.25v4.318c0 .597.237 1.17.659 1.591l9.581 9.581c.699.699 1.78.872 2.607.33a18.095 18.095 0 0 0 5.223-5.223c.542-.827.369-1.908-.33-2.607L11.16 3.66A2.25 2.25 0 0 0 9.568 3Z" />
<path stroke-linecap="round" stroke-linejoin="round" d="M6 6h.008v.008H6V6Z" /> <path stroke-linecap="round" stroke-linejoin="round" d="M6 6h.008v.008H6V6Z" />
</svg> </svg>
</div> </div>
<div class="my-auto font-semibold dark:text-white" :title="selectedPeer.display_name">{{ selectedPeer.custom_display_name ?? selectedPeer.display_name }}</div> <div class="font-semibold text-gray-900 dark:text-zinc-100 truncate max-w-xs sm:max-w-sm text-base" :title="selectedPeer.custom_display_name ?? selectedPeer.display_name">
{{ selectedPeer.custom_display_name ?? selectedPeer.display_name }}
</div>
</div> </div>
<div class="text-sm dark:text-zinc-300"> <div class="text-xs text-gray-500 dark:text-zinc-400 mt-0.5">
<!-- destination hash --> <!-- destination hash -->
<div class="inline-block mr-1"> <div class="inline-block mr-1">
@@ -62,18 +64,22 @@
</div> </div>
<!-- dropdown menu --> <!-- dropdown menu -->
<div class="ml-auto my-auto mx-2"> <div class="ml-auto flex items-center gap-1">
<ConversationDropDownMenu <ConversationDropDownMenu
v-if="selectedPeer" v-if="selectedPeer"
:peer="selectedPeer" :peer="selectedPeer"
@conversation-deleted="onConversationDeleted" @conversation-deleted="onConversationDeleted"
@set-custom-display-name="updateCustomDisplayName"/> @set-custom-display-name="updateCustomDisplayName"
</div> @block-status-changed="loadBlockedDestinations"/>
<!-- popout button -->
<IconButton @click="openConversationPopout" title="Pop out chat" class="text-gray-500 dark:text-zinc-400 hover:text-gray-700 dark:hover:text-zinc-200">
<MaterialDesignIcon icon-name="open-in-new" class="w-4 h-4"/>
</IconButton>
<!-- close button --> <!-- close button -->
<div class="my-auto mr-2"> <IconButton @click="close" class="text-gray-500 dark:text-zinc-400 hover:text-gray-700 dark:hover:text-zinc-200">
<IconButton @click="close"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-4 h-4">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
<path d="M6.28 5.22a.75.75 0 0 0-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 1 0 1.06 1.06L10 11.06l3.72 3.72a.75.75 0 1 0 1.06-1.06L11.06 10l3.72-3.72a.75.75 0 0 0-1.06-1.06L10 8.94 6.28 5.22Z" /> <path d="M6.28 5.22a.75.75 0 0 0-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 1 0 1.06 1.06L10 11.06l3.72 3.72a.75.75 0 1 0 1.06-1.06L11.06 10l3.72-3.72a.75.75 0 0 0-1.06-1.06L10 8.94 6.28 5.22Z" />
</svg> </svg>
</IconButton> </IconButton>
@@ -82,37 +88,59 @@
</div> </div>
<!-- chat items --> <!-- chat items -->
<div @scroll="onMessagesScroll" id="messages" class="h-full overflow-y-scroll"> <div @scroll="onMessagesScroll" id="messages" class="h-full overflow-y-scroll bg-gray-50/30 dark:bg-zinc-950/50">
<div v-if="selectedPeerChatItems.length > 0" class="flex flex-col flex-col-reverse p-3"> <div v-if="selectedPeerChatItems.length > 0" class="flex flex-col flex-col-reverse px-4 py-6">
<div v-for="chatItem of selectedPeerChatItemsReversed" :key="chatItem.lxmf_message.hash" class="flex flex-col max-w-xl mt-3" :class="{ 'ml-auto pl-4 md:pl-16 items-end': chatItem.is_outbound, 'mr-auto pr-4 md:pr-16 items-start': !chatItem.is_outbound }"> <div v-for="chatItem of selectedPeerChatItemsReversed" :key="chatItem.lxmf_message.hash" class="flex flex-col max-w-[75%] sm:max-w-[65%] lg:max-w-[55%] mb-4 group" :class="{ 'ml-auto items-end': chatItem.is_outbound, 'mr-auto items-start': !chatItem.is_outbound }">
<!-- message content --> <!-- message content -->
<div @click="onChatItemClick(chatItem)" class="border border-gray-300 dark:border-zinc-800 rounded-xl shadow overflow-hidden" :class="[ ['cancelled', 'failed'].includes(chatItem.lxmf_message.state) ? 'bg-red-500 text-white' : chatItem.is_outbound ? 'bg-[#3b82f6] text-white' : 'bg-[#efefef]' ]"> <div @click="onChatItemClick(chatItem)" class="relative rounded-2xl overflow-hidden transition-all duration-200 hover:shadow-md" :class="[
['cancelled', 'failed'].includes(chatItem.lxmf_message.state)
? 'bg-red-500 text-white shadow-sm'
: chatItem.lxmf_message.is_spam
? 'bg-yellow-100 dark:bg-yellow-900/30 text-yellow-900 dark:text-yellow-100 border border-yellow-300 dark:border-yellow-700 shadow-sm'
: chatItem.is_outbound
? 'bg-blue-600 text-white shadow-sm'
: 'bg-white dark:bg-zinc-900 text-gray-900 dark:text-zinc-100 border border-gray-200/60 dark:border-zinc-800/60 shadow-sm'
]">
<div class="w-full space-y-0.5 px-2.5 py-1"> <div class="w-full space-y-1 px-4 py-2.5">
<!-- spam badge -->
<div v-if="chatItem.lxmf_message.is_spam" class="flex items-center gap-1.5 text-xs font-medium mb-1" :class="chatItem.is_outbound ? 'text-yellow-200' : 'text-yellow-700 dark:text-yellow-300'">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="w-4 h-4">
<path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z" />
</svg>
<span>Marked as Spam</span>
</div>
<!-- content --> <!-- content -->
<div v-if="chatItem.lxmf_message.content" style="white-space:pre-wrap;word-break:break-word;font-family:inherit;">{{ chatItem.lxmf_message.content }}</div> <div v-if="chatItem.lxmf_message.content" class="text-sm leading-relaxed whitespace-pre-wrap break-words" style="font-family:inherit;">{{ chatItem.lxmf_message.content }}</div>
<!-- image field --> <!-- image field -->
<div v-if="chatItem.lxmf_message.fields?.image"> <div v-if="chatItem.lxmf_message.fields?.image" class="relative group mt-1 -mx-1">
<img @click.stop="openImage(`data:image/${chatItem.lxmf_message.fields.image.image_type};base64,${chatItem.lxmf_message.fields.image.image_bytes}`)" :src="`data:image/${chatItem.lxmf_message.fields.image.image_type};base64,${chatItem.lxmf_message.fields.image.image_bytes}`" class="w-full rounded-md cursor-pointer"/> <img
@click.stop="openImage(`data:image/${chatItem.lxmf_message.fields.image.image_type};base64,${chatItem.lxmf_message.fields.image.image_bytes}`)"
:src="`data:image/${chatItem.lxmf_message.fields.image.image_type};base64,${chatItem.lxmf_message.fields.image.image_bytes}`"
class="w-full rounded-lg cursor-pointer transition-transform group-hover:scale-[1.01]"/>
<div class="absolute bottom-2 left-2 bg-black/60 backdrop-blur-sm text-white text-xs px-2.5 py-1 rounded-lg flex items-center gap-1.5">
<span>{{ (chatItem.lxmf_message.fields.image.image_type ?? 'image').toUpperCase() }}</span>
<span></span>
<span>{{ formatBase64Bytes(chatItem.lxmf_message.fields.image.image_bytes) }}</span>
</div>
</div> </div>
<!-- audio field --> <!-- audio field -->
<div v-if="chatItem.lxmf_message.fields?.audio" class="pb-1"> <div v-if="chatItem.lxmf_message.fields?.audio" class="pb-1">
<!-- audio is loaded --> <!-- audio is loaded -->
<audio v-if="lxmfMessageAudioAttachmentCache[chatItem.lxmf_message.hash]" controls class="shadow rounded-full" style="height:54px;"> <audio v-if="lxmfMessageAudioAttachmentCache[chatItem.lxmf_message.hash]" controls class="w-full rounded-lg shadow-sm" style="height:54px;" :class="chatItem.is_outbound ? 'audio-controls-light' : 'audio-controls-dark'"></audio>
<source :src="lxmfMessageAudioAttachmentCache[chatItem.lxmf_message.hash]" type="audio/wav"/>
</audio>
<!-- audio is not yet loaded --> <!-- audio is not yet loaded -->
<!-- min height to make sure audio player doesn't cause height increase after loading --> <!-- min height to make sure audio player doesn't cause height increase after loading -->
<div v-else style="min-height:54px;" class="flex"> <div v-else style="min-height:54px;" class="flex">
<button @click="downloadFileFromBase64('audio.bin', chatItem.lxmf_message.fields.audio.audio_bytes)" type="button" class="my-auto flex border border-gray-300 dark:border-zinc-800 hover:bg-gray-100 rounded px-2 py-1 text-sm text-gray-700 font-semibold cursor-pointer space-x-2 bg-[#efefef]"> <button @click="downloadFileFromBase64('audio.bin', chatItem.lxmf_message.fields.audio.audio_bytes)" type="button" class="my-auto flex items-center gap-2 border border-gray-200/60 dark:border-zinc-700 hover:bg-gray-50 dark:hover:bg-zinc-800 rounded-lg px-3 py-2 text-sm font-medium transition-colors" :class="chatItem.is_outbound ? 'bg-white/20 text-white border-white/20 hover:bg-white/30' : 'bg-gray-50 dark:bg-zinc-800/50 text-gray-700 dark:text-zinc-300'">
<span class="my-auto"> <span class="my-auto">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
<path stroke-linecap="round" stroke-linejoin="round" d="m9 9 10.5-3m0 6.553v3.75a2.25 2.25 0 0 1-1.632 2.163l-1.32.377a1.803 1.803 0 1 1-.99-3.467l2.31-.66a2.25 2.25 0 0 0 1.632-2.163Zm0 0V2.25L9 5.25v10.303m0 0v3.75a2.25 2.25 0 0 1-1.632 2.163l-1.32.377a1.803 1.803 0 0 1-.99-3.467l2.31-.66A2.25 2.25 0 0 0 9 15.553Z" /> <path stroke-linecap="round" stroke-linejoin="round" d="m9 9 10.5-3m0 6.553v3.75a2.25 2.25 0 0 1-1.632 2.163l-1.32.377a1.803 1.803 0 1 1-.99-3.467l2.31-.66a2.25 2.25 0 0 0 1.632-2.163Zm0 0V2.25L9 5.25v10.303m0 0v3.75a2.25 2.25 0 0 1-1.632 2.163l-1.32.377a1.803 1.803 0 0 1-.99-3.467l2.31-.66A2.25 2.25 0 0 0 9 15.553Z" />
@@ -129,17 +157,30 @@
</button> </button>
</div> </div>
<div class="text-xs mt-1.5" :class="chatItem.is_outbound ? 'text-white/70' : 'text-gray-500 dark:text-zinc-400'">
Audio • {{ formatBase64Bytes(chatItem.lxmf_message.fields.audio.audio_bytes) }}
</div>
</div> </div>
<!-- file attachment fields --> <!-- file attachment fields -->
<div v-if="chatItem.lxmf_message.fields?.file_attachments" class="space-y-1"> <div v-if="chatItem.lxmf_message.fields?.file_attachments" class="space-y-2 mt-1">
<a @click.stop target="_blank" :download="file_attachment.file_name" :href="`data:application/octet-stream;base64,${file_attachment.file_bytes}`" v-for="file_attachment of chatItem.lxmf_message.fields?.file_attachments ?? []" class="flex border border-gray-300 dark:border-zinc-800 hover:bg-gray-100 rounded px-2 py-1 text-sm text-gray-700 font-semibold cursor-pointer space-x-2 bg-[#efefef]"> <a
v-for="file_attachment of chatItem.lxmf_message.fields?.file_attachments ?? []"
:key="file_attachment.file_name"
@click.stop
target="_blank"
:download="file_attachment.file_name"
:href="`data:application/octet-stream;base64,${file_attachment.file_bytes}`"
class="flex items-center gap-3 border rounded-lg px-3 py-2 text-sm font-medium cursor-pointer transition-colors" :class="chatItem.is_outbound ? 'bg-white/20 text-white border-white/20 hover:bg-white/30' : 'bg-gray-50 dark:bg-zinc-800/50 text-gray-700 dark:text-zinc-300 border-gray-200/60 dark:border-zinc-700 hover:bg-gray-100 dark:hover:bg-zinc-800'">
<div class="my-auto"> <div class="my-auto">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round" d="m18.375 12.739-7.693 7.693a4.5 4.5 0 0 1-6.364-6.364l10.94-10.94A3 3 0 1 1 19.5 7.372L8.552 18.32m.009-.01-.01.01m5.699-9.941-7.81 7.81a1.5 1.5 0 0 0 2.112 2.13"></path> <path stroke-linecap="round" stroke-linejoin="round" d="m18.375 12.739-7.693 7.693a4.5 4.5 0 0 1-6.364-6.364l10.94-10.94A3 3 0 1 1 19.5 7.372L8.552 18.32m.009-.01-.01.01m5.699-9.941-7.81 7.81a1.5 1.5 0 0 0 2.112 2.13"></path>
</svg> </svg>
</div> </div>
<div class="my-auto w-full">{{ file_attachment.file_name }}</div> <div class="flex-1 min-w-0">
<div class="truncate">{{ file_attachment.file_name }}</div>
<div class="text-xs font-normal mt-0.5" :class="chatItem.is_outbound ? 'text-white/60' : 'text-gray-500 dark:text-zinc-400'">{{ formatBase64Bytes(file_attachment.file_bytes) }}</div>
</div>
<div class="my-auto"> <div class="my-auto">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 0 0 5.25 21h13.5A2.25 2.25 0 0 0 21 18.75V16.5M16.5 12 12 16.5m0 0L7.5 12m4.5 4.5V3" /> <path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 0 0 5.25 21h13.5A2.25 2.25 0 0 0 21 18.75V16.5M16.5 12 12 16.5m0 0L7.5 12m4.5 4.5V3" />
@@ -151,10 +192,10 @@
</div> </div>
<!-- actions --> <!-- actions -->
<div v-if="chatItem.is_actions_expanded" class="border-t p-1 bg-[#efefef] text-white"> <div v-if="chatItem.is_actions_expanded" class="border-t px-4 py-2.5" :class="chatItem.is_outbound ? 'border-white/20 bg-white/10' : 'border-gray-200/60 dark:border-zinc-800/60 bg-gray-50/50 dark:bg-zinc-900/50'">
<!-- delete message --> <!-- delete message -->
<button @click.stop="deleteChatItem(chatItem)" type="button" class="inline-flex items-center gap-x-1 rounded-md bg-red-500 px-2 py-1 text-xs font-semibold text-white shadow-sm hover:bg-red-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-red-500"> <button @click.stop="deleteChatItem(chatItem)" type="button" class="inline-flex items-center gap-x-1.5 rounded-lg bg-red-500 px-3 py-1.5 text-xs font-semibold text-white shadow-sm hover:bg-red-600 transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-red-500">
Delete Delete
</button> </button>
@@ -163,12 +204,12 @@
</div> </div>
<!-- message state --> <!-- message state -->
<div v-if="chatItem.is_outbound" class="flex text-right" :class="[ ['cancelled', 'failed'].includes(chatItem.lxmf_message.state) ? 'text-red-500' : 'text-gray-500' ]"> <div v-if="chatItem.is_outbound" class="flex text-right mt-1.5 px-1" :class="[ ['cancelled', 'failed'].includes(chatItem.lxmf_message.state) ? 'text-red-500 dark:text-red-400' : 'text-gray-400 dark:text-zinc-500' ]">
<div class="flex ml-auto space-x-1"> <div class="flex ml-auto items-center space-x-1.5 text-xs">
<!-- state label --> <!-- state label -->
<div class="my-auto"> <div class="my-auto">
<span @click="showSentMessageInfo(chatItem.lxmf_message)" class="space-x-1 cursor-pointer"> <span @click="toggleSentMessageInfo(chatItem.lxmf_message.hash)" class="space-x-1 cursor-pointer hover:underline">
<span>{{ chatItem.lxmf_message.state }}</span> <span>{{ chatItem.lxmf_message.state }}</span>
<span v-if="chatItem.lxmf_message.state === 'outbound' && chatItem.lxmf_message.delivery_attempts >= 1">(attempt {{ chatItem.lxmf_message.delivery_attempts + 1 }})</span> <span v-if="chatItem.lxmf_message.state === 'outbound' && chatItem.lxmf_message.delivery_attempts >= 1">(attempt {{ chatItem.lxmf_message.delivery_attempts + 1 }})</span>
<span v-if="chatItem.lxmf_message.state === 'sent' && chatItem.lxmf_message.method === 'opportunistic' && chatItem.lxmf_message.delivery_attempts >= 1">(attempt {{ chatItem.lxmf_message.delivery_attempts }})</span> <span v-if="chatItem.lxmf_message.state === 'sent' && chatItem.lxmf_message.method === 'opportunistic' && chatItem.lxmf_message.delivery_attempts >= 1">(attempt {{ chatItem.lxmf_message.delivery_attempts }})</span>
@@ -211,18 +252,23 @@
</div> </div>
<!-- inbound message info --> <!-- inbound message info -->
<div v-if="!chatItem.is_outbound" class="text-xs text-gray-500 mt-0.5 flex flex-col"> <div v-if="!chatItem.is_outbound" class="text-xs text-gray-400 dark:text-zinc-500 mt-1.5 px-1 flex flex-col">
<!-- received timestamp --> <!-- received timestamp -->
<span @click="showReceivedMessageInfo(chatItem.lxmf_message)" class="cursor-pointer">{{ formatTimeAgo(chatItem.lxmf_message.created_at) }}</span> <span @click="toggleReceivedMessageInfo(chatItem.lxmf_message.hash)" class="cursor-pointer hover:underline">{{ formatTimeAgo(chatItem.lxmf_message.created_at) }}</span>
</div> </div>
<!-- expanded message details -->
<div v-if="expandedMessageInfo === chatItem.lxmf_message.hash" class="mt-2 px-1 text-xs text-gray-500 dark:text-zinc-400 space-y-0.5">
<div v-for="(line, index) in getMessageInfoLines(chatItem.lxmf_message, chatItem.is_outbound)" :key="index">{{ line }}</div>
</div>
</div> </div>
<!-- load previous --> <!-- load previous -->
<button v-show="!isLoadingPrevious && hasMorePrevious" id="load-previous" @click="loadPrevious" type="button" class="flex space-x-2 mx-auto bg-gray-200 px-3 py-1 hover:bg-gray-300 rounded-full shadow"> <button v-show="!isLoadingPrevious && hasMorePrevious" id="load-previous" @click="loadPrevious" type="button" class="flex items-center gap-2 mx-auto mt-4 bg-white dark:bg-zinc-900 border border-gray-200 dark:border-zinc-800 px-4 py-2 hover:bg-gray-50 dark:hover:bg-zinc-800 rounded-full shadow-sm text-sm font-medium text-gray-700 dark:text-zinc-300 transition-colors">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
<path stroke-linecap="round" stroke-linejoin="round" d="m15 11.25-3-3m0 0-3 3m3-3v7.5M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" /> <path stroke-linecap="round" stroke-linejoin="round" d="m15 11.25-3-3m0 0-3 3m3-3v7.5M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
</svg> </svg>
<span>Load Previous</span> <span>Load Previous</span>
@@ -233,83 +279,60 @@
</div> </div>
<!-- send message --> <!-- send message -->
<div class="w-full border-gray-300 dark:border-zinc-800 border-t p-2"> <div class="w-full border-t border-gray-200/60 dark:border-zinc-800/60 bg-white/80 dark:bg-zinc-900/50 backdrop-blur-sm px-3 sm:px-4 py-2.5">
<div class="mx-auto"> <div class="w-full">
<!-- blocked user notification -->
<div v-if="isSelectedPeerBlocked" class="mb-3 p-3 bg-yellow-50 dark:bg-yellow-900/20 border border-yellow-200 dark:border-yellow-800 rounded-lg flex items-center gap-2">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="w-5 h-5 text-yellow-600 dark:text-yellow-400 flex-shrink-0">
<path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z" />
</svg>
<span class="text-sm text-yellow-800 dark:text-yellow-200">You have blocked this user. They cannot send you messages or establish links.</span>
</div>
<!-- message composer --> <!-- message composer -->
<div> <div>
<!-- image attachment --> <div class="space-y-2">
<div v-if="newMessageImage" class="mb-2"> <!-- image attachment -->
<div @click.stop="openImage(newMessageImageUrl)" class="cursor-pointer w-32 h-32 rounded shadow border relative overflow-hidden"> <div v-if="newMessageImage" class="attachment-card">
<div class="attachment-card__preview" @click.stop="openImage(newMessageImageUrl)">
<!-- image preview --> <img v-if="newMessageImageUrl" :src="newMessageImageUrl" class="w-full h-full object-cover rounded-lg"/>
<img v-if="newMessageImageUrl" :src="newMessageImageUrl" class="w-full h-full object-cover"/>
<!-- remove button (top right) -->
<div class="absolute top-0 right-0 p-1">
<div @click.stop="removeImageAttachment" class="cursor-pointer">
<div class="flex text-gray-700 bg-gray-100 hover:bg-gray-200 p-1 rounded-full">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-4 h-4">
<path d="M6.28 5.22a.75.75 0 0 0-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 1 0 1.06 1.06L10 11.06l3.72 3.72a.75.75 0 1 0 1.06-1.06L11.06 10l3.72-3.72a.75.75 0 0 0-1.06-1.06L10 8.94 6.28 5.22Z" />
</svg>
</div>
</div>
</div> </div>
<div class="attachment-card__body">
<!-- image size (bottom left) --> <div class="attachment-card__title">Image Attachment</div>
<div class="absolute bottom-0 left-0 p-1"> <div class="attachment-card__meta">{{ formatBytes(newMessageImage.size) }}</div>
<div class="bg-gray-100 rounded border text-sm px-1">{{ formatBytes(newMessageImage.size) }}</div>
</div> </div>
<button @click.stop="removeImageAttachment" type="button" class="attachment-card__remove">
<MaterialDesignIcon icon-name="close" class="w-4 h-4"/>
</button>
</div> </div>
</div>
<!-- audio attachment -->
<div v-if="newMessageAudio" class="mb-2">
<div class="flex flex-wrap gap-1">
<div class="flex border border-gray-300 dark:border-zinc-800 rounded text-gray-700 divide-x divide-gray-300 overflow-hidden">
<div class="flex p-1">
<!-- audio preview -->
<div>
<audio controls class="h-10">
<source :src="newMessageAudio.audio_preview_url" type="audio/wav"/>
</audio>
</div>
<!-- encoded file size -->
<div class="my-auto px-1 text-sm text-gray-500">
{{ formatBytes(newMessageAudio.audio_blob.size) }}
</div>
</div>
<!-- remove audio attachment -->
<div @click="removeAudioAttachment" class="flex my-auto text-sm text-gray-500 h-full px-1 hover:bg-gray-200 cursor-pointer">
<svg class="w-5 h-5 my-auto" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
</svg>
</div>
<!-- audio attachment -->
<div v-if="newMessageAudio" class="attachment-card">
<div class="attachment-card__body w-full">
<div class="attachment-card__title">Voice Note</div>
<div class="attachment-card__meta">{{ formatBytes(newMessageAudio.audio_blob.size) }}</div>
<audio controls class="w-full mt-2 rounded-lg shadow-sm audio-controls-dark" style="height:54px;">
<source :src="newMessageAudio.audio_preview_url" type="audio/wav"/>
</audio>
</div> </div>
<button @click="removeAudioAttachment" type="button" class="attachment-card__remove">
<MaterialDesignIcon icon-name="delete" class="w-4 h-4"/>
</button>
</div> </div>
</div>
<!-- file attachments --> <!-- file attachments -->
<div v-if="newMessageFiles.length > 0" class="mb-2"> <div v-if="newMessageFiles.length > 0" class="flex flex-wrap gap-2">
<div class="flex flex-wrap gap-1"> <div v-for="file in newMessageFiles" :key="file.name + file.size" class="attachment-chip">
<div v-for="file in newMessageFiles" class="flex border border-gray-300 dark:border-zinc-800 rounded text-gray-700 divide-x divide-gray-300 overflow-hidden dark:border-zinc-800"> <div class="flex items-center gap-2">
<div class="my-auto px-1"> <MaterialDesignIcon icon-name="paperclip" class="w-4 h-4 text-gray-500 dark:text-gray-300"/>
<span class="mr-1">{{ file.name }}</span> <div class="text-sm text-gray-800 dark:text-gray-200 truncate max-w-[160px]">{{ file.name }}</div>
<span class="my-auto text-sm text-gray-500">{{ formatBytes(file.size) }}</span> <span class="text-xs text-gray-500 dark:text-gray-400">{{ formatBytes(file.size) }}</span>
</div>
<div @click="removeFileAttachment(file)" class="flex my-auto text-sm text-gray-500 h-full px-1 hover:bg-gray-200 cursor-pointer">
<svg class="w-5 h-5 my-auto" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
</svg>
</div> </div>
<button @click="removeFileAttachment(file)" type="button" class="attachment-chip__remove">
<MaterialDesignIcon icon-name="close" class="w-3.5 h-3.5"/>
</button>
</div> </div>
</div> </div>
</div> </div>
@@ -322,38 +345,23 @@
v-model="newMessageText" v-model="newMessageText"
@keydown.enter.exact.native.prevent="onEnterPressed" @keydown.enter.exact.native.prevent="onEnterPressed"
@keydown.enter.shift.exact.native.prevent="onShiftEnterPressed" @keydown.enter.shift.exact.native.prevent="onShiftEnterPressed"
class="bg-gray-50 border border-gray-300 dark:border-zinc-800 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-zinc-800 dark:text-zinc-100 dark:border-zinc-900" class="bg-white dark:bg-zinc-900 border border-gray-200 dark:border-zinc-800 text-gray-900 dark:text-zinc-100 text-sm rounded-xl focus:ring-2 focus:ring-blue-500/50 focus:border-blue-500 block w-full px-3 sm:px-4 py-2 resize-none shadow-sm transition-all placeholder:text-gray-400 dark:placeholder:text-zinc-500"
rows="3" rows="2"
placeholder="Send a message..."></textarea> placeholder="Type a message..."></textarea>
<!-- action button --> <!-- action button -->
<div class="flex mt-2"> <div class="flex flex-wrap gap-2 items-center mt-2">
<button @click="addFilesToMessage" type="button" class="attachment-action-button">
<!-- add files --> <MaterialDesignIcon icon-name="paperclip-plus" class="w-4 h-4"/>
<button @click="addFilesToMessage" type="button" class="my-auto mr-1 inline-flex items-center gap-x-1 rounded-md bg-gray-500 px-2.5 py-1.5 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 dark:bg-zinc-800 dark:text-white dark:hover:bg-zinc-700 dark:focus-visible:outline-zinc-500"> <span>Add Files</span>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="w-5 h-5">
<path fill-rule="evenodd" d="M5.625 1.5H9a3.75 3.75 0 0 1 3.75 3.75v1.875c0 1.036.84 1.875 1.875 1.875H16.5a3.75 3.75 0 0 1 3.75 3.75v7.875c0 1.035-.84 1.875-1.875 1.875H5.625a1.875 1.875 0 0 1-1.875-1.875V3.375c0-1.036.84-1.875 1.875-1.875ZM12.75 12a.75.75 0 0 0-1.5 0v2.25H9a.75.75 0 0 0 0 1.5h2.25V18a.75.75 0 0 0 1.5 0v-2.25H15a.75.75 0 0 0 0-1.5h-2.25V12Z" clip-rule="evenodd" />
<path d="M14.25 5.25a5.23 5.23 0 0 0-1.279-3.434 9.768 9.768 0 0 1 6.963 6.963A5.23 5.23 0 0 0 16.5 7.5h-1.875a.375.375 0 0 1-.375-.375V5.25Z" />
</svg>
<span class="ml-1 hidden xl:inline-block whitespace-nowrap">Add Files</span>
</button> </button>
<AddImageButton @add-image="onImageSelected"/>
<!-- add image --> <AddAudioButton
<div> :is-recording-audio-attachment="isRecordingAudioAttachment"
<AddImageButton @add-image="onImageSelected"/> @start-recording="startRecordingAudioAttachment($event)"
</div> @stop-recording="stopRecordingAudioAttachment">
<span>Recording: {{ audioAttachmentRecordingDuration }}</span>
<!-- add audio --> </AddAudioButton>
<div>
<AddAudioButton
:is-recording-audio-attachment="isRecordingAudioAttachment"
@start-recording="startRecordingAudioAttachment($event)"
@stop-recording="stopRecordingAudioAttachment">
<span>Recording: {{ audioAttachmentRecordingDuration }}</span>
</AddAudioButton>
</div>
<!-- send message -->
<div class="ml-auto my-auto"> <div class="ml-auto my-auto">
<SendMessageButton <SendMessageButton
@send="sendMessage" @send="sendMessage"
@@ -362,7 +370,6 @@
:can-send-message="canSendMessage" :can-send-message="canSendMessage"
:delivery-method="newMessageDeliveryMethod"/> :delivery-method="newMessageDeliveryMethod"/>
</div> </div>
</div> </div>
</div> </div>
@@ -376,23 +383,53 @@
</div> </div>
<!-- no peer selected --> <!-- no peer selected -->
<div v-else class="flex flex-col mx-auto my-auto text-center leading-5"> <div v-else class="flex flex-col h-full items-center justify-center">
<div class="mx-auto mb-1 "> <div class="w-full max-w-md px-4">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6 dark:text-white"> <div class="mb-6 text-center">
<path stroke-linecap="round" stroke-linejoin="round" d="M20.25 8.511c.884.284 1.5 1.128 1.5 2.097v4.286c0 1.136-.847 2.1-1.98 2.193-.34.027-.68.052-1.02.072v3.091l-3-3c-1.354 0-2.694-.055-4.02-.163a2.115 2.115 0 0 1-.825-.242m9.345-8.334a2.126 2.126 0 0 0-.476-.095 48.64 48.64 0 0 0-8.048 0c-1.131.094-1.976 1.057-1.976 2.192v4.286c0 .837.46 1.58 1.155 1.951m9.345-8.334V6.637c0-1.621-1.152-3.026-2.76-3.235A48.455 48.455 0 0 0 11.25 3c-2.115 0-4.198.137-6.24.402-1.608.209-2.76 1.614-2.76 3.235v6.226c0 1.621 1.152 3.026 2.76 3.235.577.075 1.157.14 1.74.194V21l4.155-4.155" /> <div class="w-16 h-16 mx-auto mb-4 rounded-2xl bg-gradient-to-br from-blue-100 to-blue-200 dark:from-blue-900/30 dark:to-blue-800/30 flex items-center justify-center">
</svg> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-8 h-8 text-blue-600 dark:text-blue-400">
</div> <path stroke-linecap="round" stroke-linejoin="round" d="M20.25 8.511c.884.284 1.5 1.128 1.5 2.097v4.286c0 1.136-.847 2.1-1.98 2.193-.34.027-.68.052-1.02.072v3.091l-3-3c-1.354 0-2.694-.055-4.02-.163a2.115 2.115 0 0 1-.825-.242m9.345-8.334a2.126 2.126 0 0 0-.476-.095 48.64 48.64 0 0 0-8.048 0c-1.131.094-1.976 1.057-1.976 2.192v4.286c0 .837.46 1.58 1.155 1.951m9.345-8.334V6.637c0-1.621-1.152-3.026-2.76-3.235A48.455 48.455 0 0 0 11.25 3c-2.115 0-4.198.137-6.24.402-1.608.209-2.76 1.614-2.76 3.235v6.226c0 1.621 1.152 3.026 2.76 3.235.577.075 1.157.14 1.74.194V21l4.155-4.155" />
<div class="font-semibold dark:text-white">No Active Chat</div> </svg>
<div class='dark:text-zinc-300'>Select a Peer to start chatting!</div> </div>
<div class="mx-auto mt-2"> <h3 class="text-lg font-semibold text-gray-900 dark:text-zinc-100 mb-1">No Active Chat</h3>
<button @click.stop="openLXMFAddress" type="button" <p class="text-sm text-gray-500 dark:text-zinc-400">Select a peer from the sidebar or enter an address below</p>
class="my-auto inline-flex items-center gap-x-1 rounded-md bg-gray-500 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 </div>
dark:bg-zinc-800 dark:text-white dark:hover:bg-zinc-700 dark:focus-visible:outline-zinc-500">
Enter an LXMF Address <!-- compose message input -->
</button> <div class="w-full">
<input
ref="compose-input"
id="compose-input"
:readonly="isSendingMessage"
v-model="composeAddress"
@keydown.enter.exact.prevent="onComposeEnterPressed"
type="text"
class="w-full bg-white dark:bg-zinc-900 border border-gray-200 dark:border-zinc-800 text-gray-900 dark:text-zinc-100 text-sm rounded-xl focus:ring-2 focus:ring-blue-500/50 focus:border-blue-500 px-4 py-2.5 shadow-sm transition-all placeholder:text-gray-400 dark:placeholder:text-zinc-500"
placeholder="Enter LXMF address..."/>
</div>
</div> </div>
</div> </div>
<!-- image modal -->
<Transition
enter-active-class="transition ease-out duration-200"
enter-from-class="opacity-0"
enter-to-class="opacity-100"
leave-active-class="transition ease-in duration-150"
leave-from-class="opacity-100"
leave-to-class="opacity-0">
<div v-if="imageModalUrl" @click="closeImageModal" class="fixed inset-0 z-50 flex items-center justify-center bg-black/80 dark:bg-black/90 backdrop-blur-sm p-4">
<div @click.stop class="relative max-w-7xl max-h-full">
<button @click="closeImageModal" type="button" class="absolute -top-12 right-0 inline-flex items-center justify-center w-10 h-10 rounded-xl bg-white/10 dark:bg-zinc-900/10 hover:bg-white/20 dark:hover:bg-zinc-900/20 text-white transition-colors">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-5 h-5">
<path d="M6.28 5.22a.75.75 0 0 0-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 1 0 1.06 1.06L10 11.06l3.72 3.72a.75.75 0 1 0 1.06-1.06L11.06 10l3.72-3.72a.75.75 0 0 0-1.06-1.06L10 8.94 6.28 5.22Z" />
</svg>
</button>
<img :src="imageModalUrl" class="max-w-full max-h-[90vh] rounded-xl shadow-2xl" alt="Image preview"/>
</div>
</div>
</Transition>
</template> </template>
<script> <script>
@@ -446,6 +483,7 @@ export default {
newMessageFiles: [], newMessageFiles: [],
isSendingMessage: false, isSendingMessage: false,
autoScrollOnNewMessage: true, autoScrollOnNewMessage: true,
composeAddress: "",
isRecordingAudioAttachment: false, isRecordingAudioAttachment: false,
audioAttachmentMicrophoneRecorder: null, audioAttachmentMicrophoneRecorder: null,
@@ -454,6 +492,10 @@ export default {
audioAttachmentRecordingDuration: null, audioAttachmentRecordingDuration: null,
audioAttachmentRecordingTimer: null, audioAttachmentRecordingTimer: null,
lxmfMessageAudioAttachmentCache: {}, lxmfMessageAudioAttachmentCache: {},
expandedMessageInfo: null,
imageModalUrl: null,
isSelectedPeerBlocked: false,
blockedDestinations: [],
lxmfAudioModeToCodec2ModeMap: { lxmfAudioModeToCodec2ModeMap: {
// https://github.com/markqvist/LXMF/blob/master/LXMF/LXMF.py#L21 // https://github.com/markqvist/LXMF/blob/master/LXMF/LXMF.py#L21
0x01: "450PWB", // AM_CODEC2_450PWB 0x01: "450PWB", // AM_CODEC2_450PWB
@@ -472,14 +514,47 @@ export default {
beforeUnmount() { beforeUnmount() {
// stop listening for websocket messages // stop listening for websocket messages
WebSocketConnection.off("message", this.onWebsocketMessage); WebSocketConnection.off("message", this.onWebsocketMessage);
GlobalEmitter.off("compose-new-message", this.onComposeNewMessageEvent);
},
watch: {
selectedPeer: {
handler() {
this.checkIfSelectedPeerBlocked();
},
immediate: true,
},
}, },
mounted() { mounted() {
// listen for websocket messages // listen for websocket messages
WebSocketConnection.on("message", this.onWebsocketMessage); WebSocketConnection.on("message", this.onWebsocketMessage);
// listen for compose new message event
GlobalEmitter.on("compose-new-message", this.onComposeNewMessageEvent);
// load blocked destinations
this.loadBlockedDestinations();
}, },
methods: { methods: {
async loadBlockedDestinations() {
try {
const response = await window.axios.get("/api/v1/blocked-destinations");
this.blockedDestinations = response.data.blocked_destinations || [];
this.checkIfSelectedPeerBlocked();
} catch(e) {
console.log(e);
}
},
checkIfSelectedPeerBlocked() {
if (!this.selectedPeer) {
this.isSelectedPeerBlocked = false;
return;
}
this.isSelectedPeerBlocked = this.blockedDestinations.some(
b => b.destination_hash === this.selectedPeer.destination_hash
);
},
close() { close() {
this.$emit("close"); this.$emit("close");
}, },
@@ -614,6 +689,37 @@ export default {
openLXMFAddress() { openLXMFAddress() {
GlobalEmitter.emit("compose-new-message"); GlobalEmitter.emit("compose-new-message");
}, },
onComposeNewMessageEvent(destinationHash) {
if(!this.selectedPeer && !destinationHash){
this.$nextTick(() => {
const composeInput = document.getElementById("compose-input");
if(composeInput){
composeInput.focus();
}
});
}
},
async onComposeSubmit() {
if(!this.composeAddress || this.composeAddress.trim() === ""){
return;
}
let destinationHash = this.composeAddress.trim();
this.composeAddress = "";
await this.handleComposeAddress(destinationHash);
},
onComposeEnterPressed() {
this.onComposeSubmit();
},
async handleComposeAddress(destinationHash) {
if(destinationHash.startsWith("lxmf@")){
destinationHash = destinationHash.replace("lxmf@", "");
}
if(destinationHash.length !== 32){
DialogUtils.alert("Invalid Address");
return;
}
GlobalEmitter.emit("compose-new-message", destinationHash);
},
onLxmfMessageReceived(lxmfMessage) { onLxmfMessageReceived(lxmfMessage) {
// add inbound message to ui // add inbound message to ui
@@ -862,16 +968,10 @@ export default {
} }
}, },
openImage: async function(url) { openImage: async function(url) {
this.imageModalUrl = url;
// convert data uri to blob },
const blob = await (await fetch(url)).blob(); closeImageModal() {
this.imageModalUrl = null;
// create blob url
const fileUrl = window.URL.createObjectURL(blob);
// open new tab
window.open(fileUrl);
}, },
downloadFileFromBase64: async function(fileName, fileBytesBase64) { downloadFileFromBase64: async function(fileName, fileBytesBase64) {
@@ -1205,6 +1305,23 @@ export default {
formatBytes: function(bytes) { formatBytes: function(bytes) {
return Utils.formatBytes(bytes); return Utils.formatBytes(bytes);
}, },
base64ByteLength(base64String) {
if(!base64String){
return 0;
}
const padding = (base64String.match(/=+$/) || [""])[0].length;
return Math.floor(base64String.length * 3 / 4) - padding;
},
formatBase64Bytes(base64String) {
return this.formatBytes(this.base64ByteLength(base64String));
},
openConversationPopout() {
if (!this.selectedPeer) return;
const destinationHash = this.selectedPeer.destination_hash || "";
const encodedHash = encodeURIComponent(destinationHash);
const url = `${window.location.origin}${window.location.pathname}#/popout/messages/${encodedHash}`;
window.open(url, "_blank", "width=960,height=720,noopener");
},
onFileInputChange: function(event) { onFileInputChange: function(event) {
for(const file of event.target.files){ for(const file of event.target.files){
this.newMessageFiles.push(file); this.newMessageFiles.push(file);
@@ -1464,89 +1581,64 @@ export default {
this.$emit("reload-conversations"); this.$emit("reload-conversations");
}, },
showSentMessageInfo: function(lxmfMessage) { toggleSentMessageInfo: function(messageHash) {
if(this.expandedMessageInfo === messageHash){
// basic info this.expandedMessageInfo = null;
const info = [ } else {
`Created: ${Utils.convertUnixMillisToLocalDateTimeString(lxmfMessage.timestamp * 1000)}`, this.expandedMessageInfo = messageHash;
`Method: ${lxmfMessage.method ?? "unknown"}`,
];
// add audio attachment size
if(lxmfMessage.fields?.audio?.audio_bytes){
const audioBytesLength = atob(lxmfMessage.fields?.audio?.audio_bytes).length;
info.push(`Audio Attachment: ${this.formatBytes(audioBytesLength)}`);
} }
// add image attachment size
if(lxmfMessage.fields?.image?.image_bytes){
const imageBytesLength = atob(lxmfMessage.fields?.image?.image_bytes).length;
info.push(`Image Attachment: ${this.formatBytes(imageBytesLength)}`);
}
// add file attachments size
if(lxmfMessage.fields?.file_attachments){
var filesLength = 0;
for(const fileAttachment of lxmfMessage.fields?.file_attachments){
const fileBytesLength = atob(fileAttachment.file_bytes).length;
filesLength += fileBytesLength;
}
info.push(`File Attachments: ${this.formatBytes(filesLength)}`);
}
// show message info
DialogUtils.alert(info.join("\n"));
}, },
showReceivedMessageInfo: function(lxmfMessage) { toggleReceivedMessageInfo: function(messageHash) {
if(this.expandedMessageInfo === messageHash){
this.expandedMessageInfo = null;
} else {
this.expandedMessageInfo = messageHash;
}
},
getMessageInfoLines: function(lxmfMessage, isOutbound) {
const lines = [];
// basic info if(isOutbound){
const info = [ lines.push(`Created: ${Utils.convertUnixMillisToLocalDateTimeString(lxmfMessage.timestamp * 1000)}`);
`Sent: ${Utils.convertUnixMillisToLocalDateTimeString(lxmfMessage.timestamp * 1000)}`, } else {
`Received: ${Utils.convertDateTimeToLocalDateTimeString(new Date(lxmfMessage.created_at))}`, lines.push(`Sent: ${Utils.convertUnixMillisToLocalDateTimeString(lxmfMessage.timestamp * 1000)}`);
`Method: ${lxmfMessage.method ?? "unknown"}`, lines.push(`Received: ${Utils.convertDateTimeToLocalDateTimeString(new Date(lxmfMessage.created_at))}`);
]; }
lines.push(`Method: ${lxmfMessage.method ?? "unknown"}`);
// add audio attachment size
if(lxmfMessage.fields?.audio?.audio_bytes){ if(lxmfMessage.fields?.audio?.audio_bytes){
const audioBytesLength = atob(lxmfMessage.fields?.audio?.audio_bytes).length; const audioBytesLength = atob(lxmfMessage.fields?.audio?.audio_bytes).length;
info.push(`Audio Attachment: ${this.formatBytes(audioBytesLength)}`); lines.push(`Audio Attachment: ${this.formatBytes(audioBytesLength)}`);
} }
// add image attachment size
if(lxmfMessage.fields?.image?.image_bytes){ if(lxmfMessage.fields?.image?.image_bytes){
const imageBytesLength = atob(lxmfMessage.fields?.image?.image_bytes).length; const imageBytesLength = atob(lxmfMessage.fields?.image?.image_bytes).length;
info.push(`Image Attachment: ${this.formatBytes(imageBytesLength)}`); lines.push(`Image Attachment: ${this.formatBytes(imageBytesLength)}`);
} }
// add file attachments size
if(lxmfMessage.fields?.file_attachments){ if(lxmfMessage.fields?.file_attachments){
var filesLength = 0; var filesLength = 0;
for(const fileAttachment of lxmfMessage.fields?.file_attachments){ for(const fileAttachment of lxmfMessage.fields?.file_attachments){
const fileBytesLength = atob(fileAttachment.file_bytes).length; const fileBytesLength = atob(fileAttachment.file_bytes).length;
filesLength += fileBytesLength; filesLength += fileBytesLength;
} }
info.push(`File Attachments: ${this.formatBytes(filesLength)}`); lines.push(`File Attachments: ${this.formatBytes(filesLength)}`);
} }
// add signal quality if available if(!isOutbound){
if(lxmfMessage.quality != null){ if(lxmfMessage.quality != null){
info.push(`Signal Quality: ${lxmfMessage.quality}%`); lines.push(`Signal Quality: ${lxmfMessage.quality}%`);
}
if(lxmfMessage.rssi != null){
lines.push(`RSSI: ${lxmfMessage.rssi}dBm`);
}
if(lxmfMessage.snr != null){
lines.push(`SNR: ${lxmfMessage.snr}dB`);
}
} }
// add rssi if available return lines;
if(lxmfMessage.rssi != null){
info.push(`RSSI: ${lxmfMessage.rssi}dBm`);
}
// add snr if available
if(lxmfMessage.snr != null){
info.push(`SNR: ${lxmfMessage.snr}dB`);
}
// show message info
DialogUtils.alert(info.join("\n"));
}, },
}, },
computed: { computed: {
@@ -1618,3 +1710,57 @@ export default {
}, },
} }
</script> </script>
<style scoped>
.attachment-card {
@apply relative flex gap-3 border border-gray-200 dark:border-zinc-800 rounded-2xl p-3 shadow-sm;
background-color: white;
}
.dark .attachment-card {
background-color: rgb(24 24 27);
}
.attachment-card__preview {
@apply w-24 h-24 overflow-hidden rounded-xl bg-gray-100 dark:bg-zinc-800 cursor-pointer;
}
.attachment-card__body {
@apply flex-1;
}
.attachment-card__title {
@apply text-sm font-semibold text-gray-800 dark:text-gray-100;
}
.attachment-card__meta {
@apply text-xs text-gray-500 dark:text-gray-400;
}
.attachment-card__remove {
@apply absolute top-2 right-2 inline-flex items-center justify-center w-6 h-6 rounded-full bg-gray-200 dark:bg-zinc-800 text-gray-600 dark:text-gray-200 hover:bg-red-100 hover:text-red-600 dark:hover:bg-red-900/40;
}
.attachment-chip {
@apply flex items-center justify-between gap-2 border border-gray-200 dark:border-zinc-800 rounded-full px-3 py-1 text-xs shadow-sm;
background-color: white;
}
.dark .attachment-chip {
background-color: rgb(24 24 27);
}
.attachment-chip__remove {
@apply inline-flex items-center justify-center text-gray-500 dark:text-gray-300 hover:text-red-500;
}
.attachment-action-button {
@apply inline-flex items-center gap-1 rounded-full border border-gray-200 dark:border-zinc-700 bg-white/90 dark:bg-zinc-900/80 px-3 py-1.5 text-xs font-semibold text-gray-800 dark:text-gray-100 shadow-sm hover:border-blue-400 dark:hover:border-blue-500 transition;
}
.audio-controls-light {
filter: invert(1) hue-rotate(180deg);
}
.dark .audio-controls-light {
filter: none;
}
.audio-controls-dark {
filter: none;
}
.dark .audio-controls-dark {
filter: invert(1) hue-rotate(180deg);
}
</style>

View File

@@ -1,13 +1,21 @@
<template> <template>
<MessagesSidebar <MessagesSidebar
v-if="!isPopoutMode"
:conversations="conversations" :conversations="conversations"
:peers="peers" :peers="peers"
:selected-destination-hash="selectedPeer?.destination_hash" :selected-destination-hash="selectedPeer?.destination_hash"
:conversation-search-term="conversationSearchTerm"
:filter-unread-only="filterUnreadOnly"
:filter-failed-only="filterFailedOnly"
:filter-has-attachments-only="filterHasAttachmentsOnly"
:is-loading="isLoadingConversations"
@conversation-click="onConversationClick" @conversation-click="onConversationClick"
@peer-click="onPeerClick"/> @peer-click="onPeerClick"
@conversation-search-changed="onConversationSearchChanged"
@conversation-filter-changed="onConversationFilterChanged"/>
<div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] dark:bg-zinc-950"> <div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] bg-gradient-to-br from-white via-slate-50 to-slate-100 dark:from-zinc-950 dark:via-zinc-900 dark:to-zinc-900/80">
<!-- messages tab --> <!-- messages tab -->
<ConversationViewer <ConversationViewer
@@ -45,6 +53,7 @@ export default {
return { return {
reloadInterval: null, reloadInterval: null,
conversationRefreshTimeout: null,
config: null, config: null,
peers: {}, peers: {},
@@ -53,11 +62,18 @@ export default {
conversations: [], conversations: [],
lxmfDeliveryAnnounces: [], lxmfDeliveryAnnounces: [],
conversationSearchTerm: "",
filterUnreadOnly: false,
filterFailedOnly: false,
filterHasAttachmentsOnly: false,
isLoadingConversations: false,
}; };
}, },
beforeUnmount() { beforeUnmount() {
clearInterval(this.reloadInterval); clearInterval(this.reloadInterval);
clearTimeout(this.conversationRefreshTimeout);
// stop listening for websocket messages // stop listening for websocket messages
WebSocketConnection.off("message", this.onWebsocketMessage); WebSocketConnection.off("message", this.onWebsocketMessage);
@@ -87,37 +103,36 @@ export default {
}, },
methods: { methods: {
async onComposeNewMessage(destinationHash) { async onComposeNewMessage(destinationHash) {
// ask for destination address if not provided
if(destinationHash == null){ if(destinationHash == null){
destinationHash = await DialogUtils.prompt("Enter LXMF Address"); if(this.selectedPeer){
if(!destinationHash){
return; return;
} }
this.$nextTick(() => {
const composeInput = document.getElementById("compose-input");
if(composeInput){
composeInput.focus();
}
});
return;
} }
// if user provided an address with an "lxmf@" prefix, lets remove that to get the raw destination hash
if(destinationHash.startsWith("lxmf@")){ if(destinationHash.startsWith("lxmf@")){
destinationHash = destinationHash.replace("lxmf@", ""); destinationHash = destinationHash.replace("lxmf@", "");
} }
// fetch updated announce as we might be composing new message before we loaded the announces list
await this.getLxmfDeliveryAnnounce(destinationHash); await this.getLxmfDeliveryAnnounce(destinationHash);
// attempt to find existing peer so we can show their name
const existingPeer = this.peers[destinationHash]; const existingPeer = this.peers[destinationHash];
if(existingPeer){ if(existingPeer){
this.onPeerClick(existingPeer); this.onPeerClick(existingPeer);
return; return;
} }
// simple attempt to prevent garbage input
if(destinationHash.length !== 32){ if(destinationHash.length !== 32){
DialogUtils.alert("Invalid Address"); DialogUtils.alert("Invalid Address");
return; return;
} }
// we didn't find an existing peer, so just use an unknown name
this.onPeerClick({ this.onPeerClick({
display_name: "Unknown Peer", display_name: "Unknown Peer",
destination_hash: destinationHash, destination_hash: destinationHash,
@@ -200,13 +215,34 @@ export default {
}, },
async getConversations() { async getConversations() {
try { try {
const response = await window.axios.get(`/api/v1/lxmf/conversations`); this.isLoadingConversations = true;
const response = await window.axios.get(`/api/v1/lxmf/conversations`, {
params: this.buildConversationQueryParams(),
});
this.conversations = response.data.conversations; this.conversations = response.data.conversations;
} catch(e) { } catch(e) {
// do nothing if failed to load conversations // do nothing if failed to load conversations
console.log(e); console.log(e);
} finally {
this.isLoadingConversations = false;
} }
}, },
buildConversationQueryParams() {
const params = {};
if(this.conversationSearchTerm && this.conversationSearchTerm.trim() !== ""){
params.search = this.conversationSearchTerm.trim();
}
if(this.filterUnreadOnly){
params.filter_unread = true;
}
if(this.filterFailedOnly){
params.filter_failed = true;
}
if(this.filterHasAttachmentsOnly){
params.filter_has_attachments = true;
}
return params;
},
updatePeerFromAnnounce: function(announce) { updatePeerFromAnnounce: function(announce) {
this.peers[announce.destination_hash] = announce; this.peers[announce.destination_hash] = announce;
}, },
@@ -216,12 +252,17 @@ export default {
this.selectedPeer = peer; this.selectedPeer = peer;
// update current route // update current route
this.$router.replace({ const routeName = this.isPopoutMode ? "messages-popout" : "messages";
name: "messages", const routeOptions = {
name: routeName,
params: { params: {
destinationHash: peer.destination_hash, destinationHash: peer.destination_hash,
}, },
}); };
if(!this.isPopoutMode && this.$route?.query){
routeOptions.query = { ...this.$route.query };
}
this.$router.replace(routeOptions);
}, },
onConversationClick: function(conversation) { onConversationClick: function(conversation) {
@@ -238,11 +279,57 @@ export default {
// clear selected peer // clear selected peer
this.selectedPeer = null; this.selectedPeer = null;
// update current route if(this.isPopoutMode){
this.$router.replace({ window.close();
name: "messages", return;
}); }
// update current route
const routeName = this.isPopoutMode ? "messages-popout" : "messages";
const routeOptions = { name: routeName };
if(!this.isPopoutMode && this.$route?.query){
routeOptions.query = { ...this.$route.query };
}
this.$router.replace(routeOptions);
},
requestConversationsRefresh() {
if(this.conversationRefreshTimeout){
clearTimeout(this.conversationRefreshTimeout);
}
this.conversationRefreshTimeout = setTimeout(() => {
this.getConversations();
}, 250);
},
onConversationSearchChanged(term) {
this.conversationSearchTerm = term;
this.requestConversationsRefresh();
},
onConversationFilterChanged(filterKey) {
if(filterKey === 'unread'){
this.filterUnreadOnly = !this.filterUnreadOnly;
} else if(filterKey === 'failed'){
this.filterFailedOnly = !this.filterFailedOnly;
} else if(filterKey === 'attachments'){
this.filterHasAttachmentsOnly = !this.filterHasAttachmentsOnly;
}
this.requestConversationsRefresh();
},
getHashPopoutValue() {
const hash = window.location.hash || "";
const match = hash.match(/popout=([^&]+)/);
return match ? decodeURIComponent(match[1]) : null;
},
},
computed: {
popoutRouteType() {
if(this.$route?.meta?.popoutType){
return this.$route.meta.popoutType;
}
return this.$route?.query?.popout ?? this.getHashPopoutValue();
},
isPopoutMode() {
return this.popoutRouteType === "conversation";
}, },
}, },
watch: { watch: {

View File

@@ -2,25 +2,40 @@
<div class="flex flex-col w-80 min-w-80"> <div class="flex flex-col w-80 min-w-80">
<!-- tabs --> <!-- tabs -->
<div class="bg-white dark:bg-zinc-950 border-b border-r border-gray-200 dark:border-zinc-700"> <div class="bg-transparent border-b border-r border-gray-200/70 dark:border-zinc-700/80 backdrop-blur">
<div class="-mb-px flex"> <div class="-mb-px flex">
<div @click="tab = 'conversations'" class="w-full border-b-2 py-3 px-1 text-center text-sm font-medium cursor-pointer" :class="[ tab === 'conversations' ? 'border-blue-500 text-blue-600 dark:border-blue-400 dark:text-blue-400' : 'border-transparent text-gray-500 dark:text-gray-400 hover:border-gray-300 dark:hover:border-zinc-600 hover:text-gray-700 dark:hover:text-gray-300']">Conversations</div> <div @click="tab = 'conversations'" class="w-full border-b-2 py-3 px-1 text-center text-sm font-semibold tracking-wide uppercase cursor-pointer transition" :class="[ tab === 'conversations' ? 'border-blue-500 text-blue-600 dark:border-blue-400 dark:text-blue-300' : 'border-transparent text-gray-500 dark:text-gray-400 hover:border-gray-300 dark:hover:border-zinc-600 hover:text-gray-700 dark:hover:text-gray-200']">Conversations</div>
<div @click="tab = 'announces'" class="w-full border-b-2 py-3 px-1 text-center text-sm font-medium cursor-pointer" :class="[ tab === 'announces' ? 'border-blue-500 text-blue-600 dark:border-blue-400 dark:text-blue-400' : 'border-transparent text-gray-500 dark:text-gray-400 hover:border-gray-300 dark:hover:border-zinc-600 hover:text-gray-700 dark:hover:text-gray-300']">Announces</div> <div @click="tab = 'announces'" class="w-full border-b-2 py-3 px-1 text-center text-sm font-semibold tracking-wide uppercase cursor-pointer transition" :class="[ tab === 'announces' ? 'border-blue-500 text-blue-600 dark:border-blue-400 dark:text-blue-300' : 'border-transparent text-gray-500 dark:text-gray-400 hover:border-gray-300 dark:hover:border-zinc-600 hover:text-gray-700 dark:hover:text-gray-200']">Announces</div>
</div> </div>
</div> </div>
<!-- conversations --> <!-- conversations -->
<div v-if="tab === 'conversations'" class="flex-1 flex flex-col bg-white dark:bg-zinc-950 border-r border-gray-200 dark:border-zinc-700 overflow-hidden"> <div v-if="tab === 'conversations'" class="flex-1 flex flex-col bg-white dark:bg-zinc-950 border-r border-gray-200 dark:border-zinc-700 overflow-hidden min-h-0">
<!-- search --> <!-- search + filters -->
<div v-if="conversations.length > 0" class="p-1 border-b border-gray-300 dark:border-zinc-700"> <div v-if="conversations.length > 0" class="p-1 border-b border-gray-300 dark:border-zinc-700 space-y-2">
<input v-model="conversationsSearchTerm" type="text" :placeholder="`Search ${conversations.length} Conversations...`" class="bg-gray-50 dark:bg-zinc-700 border border-gray-300 dark:border-zinc-600 text-gray-900 dark:text-gray-100 text-sm rounded-lg focus:ring-blue-500 dark:focus:ring-blue-600 focus:border-blue-500 dark:focus:border-blue-600 block w-full p-2.5"> <input
:value="conversationSearchTerm"
@input="onConversationSearchInput"
type="text"
:placeholder="`Search ${conversations.length} conversations...`"
class="input-field">
<div class="flex flex-wrap gap-1">
<button type="button" @click="toggleFilter('unread')" :class="filterChipClasses(filterUnreadOnly)">Unread</button>
<button type="button" @click="toggleFilter('failed')" :class="filterChipClasses(filterFailedOnly)">Failed</button>
<button type="button" @click="toggleFilter('attachments')" :class="filterChipClasses(filterHasAttachmentsOnly)">Attachments</button>
</div>
</div> </div>
<!-- peers --> <!-- conversations -->
<div class="flex h-full overflow-y-auto"> <div class="flex h-full overflow-y-auto">
<div v-if="searchedConversations.length > 0" class="w-full"> <div v-if="displayedConversations.length > 0" class="w-full">
<div @click="onConversationClick(conversation)" v-for="conversation of searchedConversations" class="flex cursor-pointer p-2 border-l-2" :class="[ conversation.destination_hash === selectedDestinationHash ? 'bg-gray-100 dark:bg-zinc-700 border-blue-500 dark:border-blue-400' : 'bg-white dark:bg-zinc-950 border-transparent hover:bg-gray-50 dark:hover:bg-zinc-700 hover:border-gray-200 dark:hover:border-zinc-600' ]"> <div
v-for="conversation of displayedConversations"
:key="conversation.destination_hash"
@click="onConversationClick(conversation)"
class="flex cursor-pointer p-2 border-l-2"
:class="[ conversation.destination_hash === selectedDestinationHash ? 'bg-gray-100 dark:bg-zinc-700 border-blue-500 dark:border-blue-400' : 'bg-white dark:bg-zinc-950 border-transparent hover:bg-gray-50 dark:hover:bg-zinc-700 hover:border-gray-200 dark:hover:border-zinc-600' ]">
<div class="my-auto mr-2"> <div class="my-auto mr-2">
<div v-if="conversation.lxmf_user_icon" class="p-2 rounded" :style="{ 'color': conversation.lxmf_user_icon.foreground_colour, 'background-color': conversation.lxmf_user_icon.background_colour }"> <div v-if="conversation.lxmf_user_icon" class="p-2 rounded" :style="{ 'color': conversation.lxmf_user_icon.foreground_colour, 'background-color': conversation.lxmf_user_icon.background_colour }">
<MaterialDesignIcon :icon-name="conversation.lxmf_user_icon.icon_name" class="w-6 h-6"/> <MaterialDesignIcon :icon-name="conversation.lxmf_user_icon.icon_name" class="w-6 h-6"/>
@@ -29,22 +44,45 @@
<MaterialDesignIcon icon-name="account-outline" class="w-6 h-6"/> <MaterialDesignIcon icon-name="account-outline" class="w-6 h-6"/>
</div> </div>
</div> </div>
<div class="mr-auto"> <div class="mr-auto w-full pr-2 min-w-0">
<div class="text-gray-900 dark:text-gray-100" :class="{ 'font-semibold': conversation.is_unread || conversation.failed_messages_count > 0 }">{{ conversation.custom_display_name ?? conversation.display_name }}</div> <div class="flex justify-between gap-2 min-w-0">
<div class="text-gray-500 dark:text-gray-400 text-sm">{{ formatTimeAgo(conversation.updated_at) }}</div> <div class="text-gray-900 dark:text-gray-100 truncate min-w-0" :title="conversation.custom_display_name ?? conversation.display_name" :class="{ 'font-semibold': conversation.is_unread || conversation.failed_messages_count > 0 }">
{{ conversation.custom_display_name ?? conversation.display_name }}
</div>
<div class="text-gray-500 dark:text-gray-400 text-xs whitespace-nowrap flex-shrink-0">
{{ formatTimeAgo(conversation.updated_at) }}
</div>
</div>
<div class="text-gray-600 dark:text-gray-400 text-xs mt-0.5 truncate">
{{ conversation.latest_message_preview ?? conversation.latest_message_title ?? 'No messages yet' }}
</div>
</div> </div>
<div v-if="conversation.is_unread" class="my-auto ml-2 mr-2"> <div class="flex items-center space-x-1">
<div class="bg-blue-500 dark:bg-blue-400 rounded-full p-1"></div> <div v-if="conversation.has_attachments" class="text-gray-500 dark:text-gray-300">
</div> <MaterialDesignIcon icon-name="paperclip" class="w-4 h-4"/>
<div v-else-if="conversation.failed_messages_count" class="my-auto ml-2 mr-2"> </div>
<div class="bg-red-500 dark:bg-red-400 rounded-full p-1"></div> <div v-if="conversation.is_unread" class="my-auto ml-1">
<div class="bg-blue-500 dark:bg-blue-400 rounded-full p-1"></div>
</div>
<div v-else-if="conversation.failed_messages_count" class="my-auto ml-1">
<div class="bg-red-500 dark:bg-red-400 rounded-full p-1"></div>
</div>
</div> </div>
</div> </div>
</div> </div>
<div v-else class="mx-auto my-auto text-center leading-5"> <div v-else class="mx-auto my-auto text-center leading-5">
<div v-if="isLoading" class="flex flex-col text-gray-900 dark:text-gray-100">
<div class="mx-auto mb-1 animate-spin text-gray-500">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round" d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
</svg>
</div>
<div class="font-semibold">Loading conversations</div>
</div>
<!-- no conversations at all --> <!-- no conversations at all -->
<div v-if="conversations.length === 0" class="flex flex-col text-gray-900 dark:text-gray-100"> <div v-else-if="conversations.length === 0" class="flex flex-col text-gray-900 dark:text-gray-100">
<div class="mx-auto mb-1"> <div class="mx-auto mb-1">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
<path stroke-linecap="round" stroke-linejoin="round" d="M2.25 13.5h3.86a2.25 2.25 0 0 1 2.012 1.244l.256.512a2.25 2.25 0 0 0 2.013 1.244h3.218a2.25 2.25 0 0 0 2.013-1.244l.256-.512a2.25 2.25 0 0 1 2.013-1.244h3.859m-19.5.338V18a2.25 2.25 0 0 0 2.25 2.25h15A2.25 2.25 0 0 0 21.75 18v-4.162c0-.224-.034-.447-.1-.661L19.24 5.338a2.25 2.25 0 0 0-2.15-1.588H6.911a2.25 2.25 0 0 0-2.15 1.588L2.35 13.177a2.25 2.25 0 0 0-.1.661Z" /> <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 13.5h3.86a2.25 2.25 0 0 1 2.012 1.244l.256.512a2.25 2.25 0 0 0 2.013 1.244h3.218a2.25 2.25 0 0 0 2.013-1.244l.256-.512a2.25 2.25 0 0 1 2.013-1.244h3.859m-19.5.338V18a2.25 2.25 0 0 0 2.25 2.25h15A2.25 2.25 0 0 0 21.75 18v-4.162c0-.224-.034-.447-.1-.661L19.24 5.338a2.25 2.25 0 0 0-2.15-1.588H6.911a2.25 2.25 0 0 0-2.15 1.588L2.35 13.177a2.25 2.25 0 0 0-.1.661Z" />
@@ -55,25 +93,25 @@
</div> </div>
<!-- is searching, but no results --> <!-- is searching, but no results -->
<div v-if="conversationsSearchTerm !== '' && conversations.length > 0" class="flex flex-col text-gray-900 dark:text-gray-100"> <div v-else-if="conversationSearchTerm !== ''" class="flex flex-col text-gray-900 dark:text-gray-100">
<div class="mx-auto mb-1"> <div class="mx-auto mb-1">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" /> <path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" />
</svg> </svg>
</div> </div>
<div class="font-semibold">No Search Results</div> <div class="font-semibold">No Search Results</div>
<div>Your search didn't match any Conversations!</div> <div>Your search didn't match any conversations.</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- discover --> <!-- discover -->
<div v-if="tab === 'announces'" class="flex-1 flex flex-col bg-white dark:bg-zinc-950 border-r border-gray-200 dark:border-zinc-700 overflow-hidden"> <div v-if="tab === 'announces'" class="flex-1 flex flex-col bg-white dark:bg-zinc-950 border-r border-gray-200 dark:border-zinc-700 overflow-hidden min-h-0">
<!-- search --> <!-- search -->
<div v-if="peersCount > 0" class="p-1 border-b border-gray-300 dark:border-zinc-700"> <div v-if="peersCount > 0" class="p-1 border-b border-gray-300 dark:border-zinc-700">
<input v-model="peersSearchTerm" type="text" :placeholder="`Search ${peersCount} recent announces...`" class="bg-gray-50 dark:bg-zinc-700 border border-gray-300 dark:border-zinc-600 text-gray-900 dark:text-gray-100 text-sm rounded-lg focus:ring-blue-500 dark:focus:ring-blue-600 focus:border-blue-500 dark:focus:border-blue-600 block w-full p-2.5"> <input v-model="peersSearchTerm" type="text" :placeholder="`Search ${peersCount} recent announces...`" class="input-field">
</div> </div>
<!-- peers --> <!-- peers -->
@@ -88,8 +126,8 @@
<MaterialDesignIcon icon-name="account-outline" class="w-6 h-6"/> <MaterialDesignIcon icon-name="account-outline" class="w-6 h-6"/>
</div> </div>
</div> </div>
<div> <div class="min-w-0 flex-1">
<div class="text-gray-900 dark:text-gray-100">{{ peer.custom_display_name ?? peer.display_name }}</div> <div class="text-gray-900 dark:text-gray-100 truncate" :title="peer.custom_display_name ?? peer.display_name">{{ peer.custom_display_name ?? peer.display_name }}</div>
<div class="flex space-x-1 text-gray-500 dark:text-gray-400 text-sm"> <div class="flex space-x-1 text-gray-500 dark:text-gray-400 text-sm">
<!-- time ago --> <!-- time ago -->
@@ -150,15 +188,35 @@ import MaterialDesignIcon from "../MaterialDesignIcon.vue";
export default { export default {
name: 'MessagesSidebar', name: 'MessagesSidebar',
components: {MaterialDesignIcon}, components: {MaterialDesignIcon},
emits: ["conversation-click", "peer-click", "conversation-search-changed", "conversation-filter-changed"],
props: { props: {
peers: Object, peers: Object,
conversations: Array, conversations: Array,
selectedDestinationHash: String, selectedDestinationHash: String,
conversationSearchTerm: {
type: String,
default: "",
},
filterUnreadOnly: {
type: Boolean,
default: false,
},
filterFailedOnly: {
type: Boolean,
default: false,
},
filterHasAttachmentsOnly: {
type: Boolean,
default: false,
},
isLoading: {
type: Boolean,
default: false,
},
}, },
data() { data() {
return { return {
tab: "conversations", tab: "conversations",
conversationsSearchTerm: "",
peersSearchTerm: "", peersSearchTerm: "",
}; };
}, },
@@ -172,16 +230,23 @@ export default {
formatTimeAgo: function(datetimeString) { formatTimeAgo: function(datetimeString) {
return Utils.formatTimeAgo(datetimeString); return Utils.formatTimeAgo(datetimeString);
}, },
onConversationSearchInput(event) {
this.$emit("conversation-search-changed", event.target.value);
},
toggleFilter(filterKey) {
this.$emit("conversation-filter-changed", filterKey);
},
filterChipClasses(isActive) {
const base = "px-2 py-1 rounded-full text-xs font-semibold transition-colors";
if (isActive) {
return `${base} bg-blue-600 text-white dark:bg-blue-500`;
}
return `${base} bg-gray-100 text-gray-700 dark:bg-zinc-800 dark:text-zinc-200`;
},
}, },
computed: { computed: {
searchedConversations() { displayedConversations() {
return this.conversations.filter((conversation) => { return this.conversations;
const search = this.conversationsSearchTerm.toLowerCase();
const matchesDisplayName = conversation.display_name.toLowerCase().includes(search);
const matchesCustomDisplayName = conversation.custom_display_name?.toLowerCase()?.includes(search) === true;
const matchesDestinationHash = conversation.destination_hash.toLowerCase().includes(search);
return matchesDisplayName || matchesCustomDisplayName || matchesDestinationHash;
});
}, },
peersCount() { peersCount() {
return Object.keys(this.peers).length; return Object.keys(this.peers).length;

View File

@@ -1,19 +1,28 @@
<template> <template>
<div class="inline-flex rounded-md shadow-sm"> <div class="relative inline-flex rounded-xl shadow-sm">
<!-- send button --> <!-- send button -->
<button @click="send" :disabled="!canSendMessage" type="button" class="my-auto inline-flex items-center rounded-l-md px-2.5 py-1.5 text-sm font-semibold text-white focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2" :class="[ canSendMessage ? 'bg-blue-500 dark:bg-blue-600 hover:bg-blue-400 dark:hover:bg-blue-500 focus-visible:outline-blue-500 dark:focus-visible:outline-blue-600' : 'bg-gray-400 dark:bg-zinc-500 focus-visible:outline-gray-500 dark:focus-visible:outline-zinc-500 cursor-not-allowed']"> <button @click="send" :disabled="!canSendMessage" type="button" class="inline-flex items-center gap-2 rounded-l-xl px-4 py-2.5 text-sm font-semibold text-white transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2" :class="[ canSendMessage ? 'bg-blue-600 dark:bg-blue-600 hover:bg-blue-700 dark:hover:bg-blue-700 focus-visible:outline-blue-500' : 'bg-gray-400 dark:bg-zinc-500 focus-visible:outline-gray-500 cursor-not-allowed']">
<span v-if="isSendingMessage">Sending...</span> <svg v-if="!isSendingMessage" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
<span v-else class="space-x-1"> <path stroke-linecap="round" stroke-linejoin="round" d="M6 12 3.269 3.125A59.769 59.769 0 0 1 21.485 12 59.768 59.768 0 0 1 3.27 20.875L5.999 12Zm0 0h7.5" />
<span>Send</span> </svg>
<span v-if="deliveryMethod === 'direct'">(Direct Link)</span> <span v-if="isSendingMessage" class="flex items-center gap-2">
<span v-if="deliveryMethod === 'opportunistic'">(Opportunistic)</span> <svg class="animate-spin h-4 w-4" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
<span v-if="deliveryMethod === 'propagated'">(Propagated)</span> <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
</svg>
Sending...
</span>
<span v-else>
<span v-if="deliveryMethod === 'direct'">Send (Direct)</span>
<span v-else-if="deliveryMethod === 'opportunistic'">Send (Opportunistic)</span>
<span v-else-if="deliveryMethod === 'propagated'">Send (Propagated)</span>
<span v-else>Send</span>
</span> </span>
</button> </button>
<div class="relative"> <div class="relative">
<!-- dropdown button --> <!-- dropdown button -->
<button @click="showMenu" :disabled="!canSendMessage" type="button" class="my-auto border-l relative inline-flex items-center rounded-r-md px-2 py-1.5 text-white focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2" :class="[ canSendMessage ? 'bg-blue-500 dark:bg-blue-600 hover:bg-blue-400 dark:hover:bg-blue-500 focus-visible:outline-blue-500 dark:focus-visible:outline-blue-600 border-blue-600 dark:border-blue-700' : 'bg-gray-400 dark:bg-zinc-500 focus-visible:outline-gray-500 dark:focus-visible:outline-zinc-500 border-gray-500 dark:border-zinc-600 cursor-not-allowed']"> <button @click="showMenu" :disabled="!canSendMessage" type="button" class="border-l relative inline-flex items-center justify-center rounded-r-xl px-2.5 py-2.5 text-white transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2" :class="[ canSendMessage ? 'bg-blue-600 dark:bg-blue-600 hover:bg-blue-700 dark:hover:bg-blue-700 focus-visible:outline-blue-500 border-blue-700 dark:border-blue-800' : 'bg-gray-400 dark:bg-zinc-500 focus-visible:outline-gray-500 border-gray-500 dark:border-zinc-600 cursor-not-allowed']">
<svg class="h-5 w-5" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" data-slot="icon"> <svg class="h-4 w-4" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
<path fill-rule="evenodd" d="M5.22 8.22a.75.75 0 0 1 1.06 0L10 11.94l3.72-3.72a.75.75 0 1 1 1.06 1.06l-4.25 4.25a.75.75 0 0 1-1.06 0L5.22 9.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" /> <path fill-rule="evenodd" d="M5.22 8.22a.75.75 0 0 1 1.06 0L10 11.94l3.72-3.72a.75.75 0 1 1 1.06 1.06l-4.25 4.25a.75.75 0 0 1-1.06 0L5.22 9.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" />
</svg> </svg>
</button> </button>
@@ -25,12 +34,12 @@
leave-active-class="transition ease-in duration-75" leave-active-class="transition ease-in duration-75"
leave-from-class="transform opacity-100 scale-100" leave-from-class="transform opacity-100 scale-100"
leave-to-class="transform opacity-0 scale-95"> leave-to-class="transform opacity-0 scale-95">
<div v-if="isShowingMenu" v-click-outside="hideMenu" class="absolute bottom-0 -ml-11 right-0 ml-0 z-10 mb-10 rounded-md bg-white dark:bg-zinc-800 shadow-lg ring-1 ring-black dark:ring-zinc-700 ring-opacity-5 focus:outline-none"> <div v-if="isShowingMenu" v-click-outside="hideMenu" class="absolute bottom-full right-0 mb-1 z-10 rounded-xl bg-white dark:bg-zinc-900 shadow-lg ring-1 ring-gray-200 dark:ring-zinc-800 focus:outline-none overflow-hidden min-w-[200px]">
<div class="py-1"> <div class="py-1">
<button @click="setDeliveryMethod(null)" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-zinc-700 whitespace-nowrap border-b border-gray-200 dark:border-zinc-700">Send Automatically</button> <button @click="setDeliveryMethod(null)" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-zinc-800 whitespace-nowrap border-b border-gray-100 dark:border-zinc-800">Send Automatically</button>
<button @click="setDeliveryMethod('direct')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-zinc-700 whitespace-nowrap">Send over Direct Link</button> <button @click="setDeliveryMethod('direct')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-zinc-800 whitespace-nowrap">Send over Direct Link</button>
<button @click="setDeliveryMethod('opportunistic')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-zinc-700 whitespace-nowrap">Send Opportunistically</button> <button @click="setDeliveryMethod('opportunistic')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-zinc-800 whitespace-nowrap">Send Opportunistically</button>
<button @click="setDeliveryMethod('propagated')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-zinc-700 whitespace-nowrap">Send to Propagation Node</button> <button @click="setDeliveryMethod('propagated')" type="button" class="w-full block text-left px-4 py-2 text-sm text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-zinc-800 whitespace-nowrap">Send to Propagation Node</button>
</div> </div>
</div> </div>
</Transition> </Transition>

View File

@@ -3,38 +3,41 @@
<!-- network --> <!-- network -->
<div id="network" class="w-full h-full"></div> <div id="network" class="w-full h-full"></div>
<!-- controls --> <!-- controls -->
<div class="absolute flex bottom-0 left-0 bg-gray-100 dark:bg-zinc-900 p-2"> <div class="absolute bottom-4 left-4 z-10">
<div class="bg-white dark:bg-zinc-800 rounded shadow min-w-52"> <div class="border border-gray-200 dark:border-zinc-800 bg-white dark:bg-zinc-900 rounded-2xl shadow-lg overflow-hidden min-w-[240px]">
<div @click="isShowingControls = !isShowingControls" class="flex text-gray-700 dark:text-gray-300 p-2 cursor-pointer"> <div @click="isShowingControls = !isShowingControls" class="flex items-center px-4 py-3 border-b border-gray-200 dark:border-zinc-800 bg-white/80 dark:bg-zinc-900/50 backdrop-blur-sm cursor-pointer hover:bg-gray-50 dark:hover:bg-zinc-800 transition-colors">
<div class="my-auto">Reticulum Network</div> <div class="flex-1 font-semibold text-gray-900 dark:text-zinc-100">Reticulum Network</div>
<div class="flex ml-auto"> <button
<button @click.stop="update"
@click.stop="update" type="button"
type="button" class="inline-flex items-center justify-center w-8 h-8 rounded-lg bg-blue-600 hover:bg-blue-700 dark:bg-blue-600 dark:hover:bg-blue-700 text-white shadow-sm transition-colors"
class="my-auto inline-flex items-center gap-x-1 rounded-md bg-gray-500 dark:bg-zinc-700 px-1 py-0.5 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 dark:hover:bg-zinc-600 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 dark:focus-visible:outline-zinc-600" :disabled="isUpdating"
> >
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-5 text-white"> <svg v-if="!isUpdating" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
<path stroke-linecap="round" stroke-linejoin="round" d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" /> <path stroke-linecap="round" stroke-linejoin="round" d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
</svg> </svg>
</button> <svg v-else class="animate-spin h-4 w-4" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
</div> <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
</svg>
</button>
</div> </div>
<div v-if="isShowingControls" class="divide-y dark:divide-zinc-700 text-gray-900 dark:text-white border-t border-gray-300 dark:border-zinc-700"> <div v-if="isShowingControls" class="px-4 py-3 space-y-3">
<div class="px-1 py-2"> <div class="flex items-center gap-2">
<div class="flex items-start"> <input
<div class="flex items-center h-5"> v-model="autoReload"
<input type="checkbox"
v-model="autoReload" id="auto-reload"
type="checkbox" class="w-4 h-4 border border-gray-300 dark:border-zinc-600 rounded bg-white dark:bg-zinc-900 text-blue-600 focus:ring-2 focus:ring-blue-500/50 focus:ring-offset-0"
class="w-4 h-4 border border-gray-300 dark:border-zinc-600 rounded bg-gray-50 dark:bg-zinc-900 focus:ring-3 focus:ring-blue-300 dark:focus:ring-blue-800" >
> <label for="auto-reload" class="text-sm font-medium text-gray-900 dark:text-zinc-100 cursor-pointer">Auto Update (5 sec)</label>
</div>
<label class="ml-2 text-sm font-medium text-gray-900 dark:text-white">Auto Update (5 sec)</label>
</div>
</div> </div>
<div class="p-1"> <div class="pt-2 border-t border-gray-200 dark:border-zinc-800">
<div class="text-black dark:text-white">Interfaces</div> <div class="text-sm font-semibold text-gray-900 dark:text-zinc-100 mb-1">Interfaces</div>
<div class="text-sm text-gray-700 dark:text-gray-300">{{ onlineInterfaces.length }} Online, {{ offlineInterfaces.length }} Offline</div> <div class="text-xs text-gray-600 dark:text-zinc-400">
<span class="text-green-600 dark:text-green-400 font-medium">{{ onlineInterfaces.length }}</span> Online,
<span class="text-red-600 dark:text-red-400 font-medium">{{ offlineInterfaces.length }}</span> Offline
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -45,7 +48,24 @@
<style> <style>
.vis-tooltip { .vis-tooltip {
color: white !important; color: white !important;
background: rgba(0, 0, 0, 0.75) !important; background: rgba(0, 0, 0, 0.85) !important;
border-radius: 0.5rem !important;
padding: 0.5rem 0.75rem !important;
font-size: 0.875rem !important;
box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06) !important;
}
.dark .vis-tooltip {
background: rgba(24, 24, 27, 0.95) !important;
border: 1px solid rgba(63, 63, 70, 0.5) !important;
}
#network {
background-color: rgb(249, 250, 251);
}
.dark #network {
background-color: rgb(9, 9, 11);
} }
</style> </style>
@@ -53,6 +73,7 @@
import "vis-network/styles/vis-network.css"; import "vis-network/styles/vis-network.css";
import { Network } from "vis-network"; import { Network } from "vis-network";
import { DataSet } from "vis-data"; import { DataSet } from "vis-data";
import * as mdi from "@mdi/js";
import Utils from "../../js/Utils"; import Utils from "../../js/Utils";
export default { export default {
name: 'NetworkVisualiser', name: 'NetworkVisualiser',
@@ -62,12 +83,15 @@ export default {
autoReload: false, autoReload: false,
reloadInterval: null, reloadInterval: null,
isShowingControls: true, isShowingControls: true,
isUpdating: false,
interfaces: [], interfaces: [],
pathTable: [], pathTable: [],
announces: {}, announces: {},
conversations: {},
network: null, network: null,
nodes: new DataSet(), nodes: new DataSet(),
edges: new DataSet(), edges: new DataSet(),
iconCache: {},
}; };
}, },
beforeUnmount() { beforeUnmount() {
@@ -118,6 +142,70 @@ export default {
console.log(e); console.log(e);
} }
}, },
async getConversations() {
try {
const response = await window.axios.get(`/api/v1/lxmf/conversations`);
this.conversations = {};
for(const conversation of response.data.conversations){
this.conversations[conversation.destination_hash] = conversation;
}
} catch(e) {
console.log(e);
}
},
async createIconImage(iconName, foregroundColor, backgroundColor, size = 32) {
const cacheKey = `${iconName}-${foregroundColor}-${backgroundColor}-${size}`;
if(this.iconCache[cacheKey]){
return this.iconCache[cacheKey];
}
return new Promise((resolve) => {
const canvas = document.createElement('canvas');
canvas.width = size;
canvas.height = size;
const ctx = canvas.getContext('2d');
// draw background circle
ctx.fillStyle = backgroundColor;
ctx.beginPath();
ctx.arc(size / 2, size / 2, size / 2 - 1, 0, 2 * Math.PI);
ctx.fill();
// load MDI icon SVG
const iconSvg = this.getMdiIconSvg(iconName, foregroundColor);
const img = new Image();
const svgBlob = new Blob([iconSvg], { type: 'image/svg+xml' });
const url = URL.createObjectURL(svgBlob);
img.onload = () => {
ctx.drawImage(img, size * 0.2, size * 0.2, size * 0.6, size * 0.6);
URL.revokeObjectURL(url);
const dataUrl = canvas.toDataURL();
this.iconCache[cacheKey] = dataUrl;
resolve(dataUrl);
};
img.onerror = () => {
URL.revokeObjectURL(url);
const dataUrl = canvas.toDataURL();
this.iconCache[cacheKey] = dataUrl;
resolve(dataUrl);
};
img.src = url;
});
},
getMdiIconSvg(iconName, foregroundColor) {
const mdiIconName = "mdi" + iconName.split("-").map((word) => {
return word.charAt(0).toUpperCase() + word.slice(1);
}).join("");
const iconPath = mdi[mdiIconName] || mdi["mdiAccountOutline"];
return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="${foregroundColor}" d="${iconPath}"/></svg>`;
},
async createMdiIconImage(iconName, size = 32) {
const foregroundColor = '#ffffff';
const backgroundColor = '#6b7280';
return await this.createIconImage(iconName, foregroundColor, backgroundColor, size);
},
async init() { async init() {
// create network ui // create network ui
@@ -135,11 +223,23 @@ export default {
}, },
nodes: { nodes: {
color: { color: {
border: "#000000", border: "#e5e7eb",
highlight: { highlight: {
border: "#000000", border: "#3b82f6",
}, },
}, },
font: {
color: "#111827",
size: 14,
background: "rgba(255, 255, 255, 0.9)",
},
},
edges: {
color: {
color: "#9ca3af",
highlight: "#3b82f6",
},
width: 2,
}, },
physics: { physics: {
barnesHut: { barnesHut: {
@@ -256,14 +356,24 @@ export default {
}, },
async update() { async update() {
await this.getConfig(); this.isUpdating = true;
await this.getInterfaceStats(); try {
await this.getPathTable(); await this.getConfig();
await this.getAnnounces(); await this.getInterfaceStats();
await this.getPathTable();
await this.getAnnounces();
await this.getConversations();
} finally {
this.isUpdating = false;
}
const nodes = []; const nodes = [];
const edges = []; const edges = [];
const isDarkMode = document.documentElement.classList.contains('dark');
const fontColor = isDarkMode ? "#f4f4f5" : "#111827";
const fontBackground = isDarkMode ? "rgba(24, 24, 27, 0.9)" : "rgba(255, 255, 255, 0.9)";
// add me // add me
nodes.push({ nodes.push({
id: "me", id: "me",
@@ -275,8 +385,8 @@ export default {
`Identity: ${this.config?.identity_hash ?? 'Unknown'}`, `Identity: ${this.config?.identity_hash ?? 'Unknown'}`,
].join("\n"), ].join("\n"),
font: { font: {
color: "#000000", color: fontColor,
background: "#ffffff", background: fontBackground,
}, },
}); });
@@ -305,8 +415,8 @@ export default {
].join("\n"), ].join("\n"),
size: 30, size: 30,
font: { font: {
color: "#000000", color: fontColor,
background: '#ffffff', background: fontBackground,
}, },
shape: "circularImage", shape: "circularImage",
image: entry.status ? "/assets/images/network-visualiser/interface_connected.png" : "/assets/images/network-visualiser/interface_disconnected.png", image: entry.status ? "/assets/images/network-visualiser/interface_connected.png" : "/assets/images/network-visualiser/interface_disconnected.png",
@@ -322,12 +432,9 @@ export default {
id: `${entry.parent_interface_name}~${entry.name}`, id: `${entry.parent_interface_name}~${entry.name}`,
from: entry.parent_interface_name, from: entry.parent_interface_name,
to: entry.name, to: entry.name,
color: "transparent", color: entry.status ? "#22c55e" : "#ef4444",
width: 3,
length: 300, length: 300,
background: {
enabled: true,
color: entry.status ? "#22c55e" : "#ef4444",
},
}); });
} else { } else {
// add edge from me to interface // add edge from me to interface
@@ -335,12 +442,9 @@ export default {
id: `me~${entry.name}`, id: `me~${entry.name}`,
from: "me", from: "me",
to: entry.name, to: entry.name,
color: "transparent", color: entry.status ? "#22c55e" : "#ef4444",
width: 3,
length: 300, length: 300,
background: {
enabled: true,
color: entry.status ? "#22c55e" : "#ef4444",
},
}); });
} }
@@ -375,9 +479,22 @@ export default {
if(announce.aspect === "lxmf.delivery"){ if(announce.aspect === "lxmf.delivery"){
const name = announce.custom_display_name ?? announce.display_name; const name = announce.custom_display_name ?? announce.display_name;
const conversation = this.conversations[announce.destination_hash];
node.shape = "circularImage"; node.shape = "circularImage";
node.image = entry.hops === 1 ? "/assets/images/network-visualiser/user_1hop.png" : "/assets/images/network-visualiser/user.png";
if(conversation?.lxmf_user_icon){
const iconImage = await this.createIconImage(
conversation.lxmf_user_icon.icon_name,
conversation.lxmf_user_icon.foreground_colour,
conversation.lxmf_user_icon.background_colour,
40
);
node.image = iconImage;
node.size = 30;
} else {
node.image = entry.hops === 1 ? "/assets/images/network-visualiser/user_1hop.png" : "/assets/images/network-visualiser/user.png";
}
node.label = name; node.label = name;
node.title = [ node.title = [
@@ -423,7 +540,8 @@ export default {
id: `${entry.interface}~${entry.hash}`, id: `${entry.interface}~${entry.hash}`,
from: entry.interface, from: entry.interface,
to: entry.hash, to: entry.hash,
color: "gray", color: isDarkMode ? "#71717a" : "#9ca3af",
width: 2,
}); });
} }
@@ -504,3 +622,4 @@ export default {
}, },
} }
</script> </script>

View File

@@ -2,6 +2,7 @@
<!-- nomadnetwork sidebar --> <!-- nomadnetwork sidebar -->
<NomadNetworkSidebar <NomadNetworkSidebar
v-if="!isPopoutMode"
:nodes="nodes" :nodes="nodes"
:favourites="favourites" :favourites="favourites"
:selected-destination-hash="selectedNode?.destination_hash" :selected-destination-hash="selectedNode?.destination_hash"
@@ -11,7 +12,7 @@
<div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] dark:bg-zinc-950"> <div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] dark:bg-zinc-950">
<!-- node --> <!-- node -->
<div v-if="selectedNode" class="flex flex-col h-full bg-white dark:bg-zinc-950 overflow-hidden sm:m-2 sm:border dark:border-zinc-800 sm:rounded-xl sm:shadow dark:shadow-zinc-900"> <div v-if="selectedNode" class="flex flex-col h-full min-h-0 bg-white dark:bg-zinc-950 overflow-hidden sm:m-2 sm:border dark:border-zinc-800 sm:rounded-xl sm:shadow dark:shadow-zinc-900">
<!-- header --> <!-- header -->
<div class="flex p-2 border-b border-gray-300 dark:border-zinc-800"> <div class="flex p-2 border-b border-gray-300 dark:border-zinc-800">
@@ -38,9 +39,9 @@
</div> </div>
<!-- node info --> <!-- node info -->
<div class="my-auto dark:text-gray-100"> <div class="my-auto dark:text-gray-100 flex-1 min-w-0 flex items-baseline gap-1">
<span class="font-semibold">{{ selectedNode.display_name }}</span> <span class="font-semibold truncate inline-block max-w-xs sm:max-w-sm" :title="selectedNode.display_name">{{ selectedNode.display_name }}</span>
<span v-if="selectedNodePath" @click="onDestinationPathClick(selectedNodePath)" class="text-sm cursor-pointer"> - {{ selectedNodePath.hops }} {{ selectedNodePath.hops === 1 ? 'hop' : 'hops' }} away</span> <span v-if="selectedNodePath" @click="onDestinationPathClick(selectedNodePath)" class="text-sm cursor-pointer whitespace-nowrap"> - {{ selectedNodePath.hops }} {{ selectedNodePath.hops === 1 ? 'hop' : 'hops' }} away</span>
</div> </div>
<!-- identify button --> <!-- identify button -->
@@ -56,6 +57,20 @@
</div> </div>
</div> </div>
<!-- popout button -->
<div class="my-auto mr-2">
<div @click="openNomadnetPopout" class="cursor-pointer">
<div class="flex text-gray-700 dark:text-gray-300 bg-gray-100 dark:bg-zinc-800 hover:bg-gray-200 dark:hover:bg-zinc-700 p-1 rounded-full">
<div>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-5">
<path d="M17 3.75h3.25A.75.75 0 0 1 21 4.5v3.25a.75.75 0 0 1-1.5 0V6.31l-4.97 4.97a.75.75 0 1 1-1.06-1.06l4.97-4.97H17a.75.75 0 0 1 0-1.5Z"/>
<path d="M5.25 6A2.25 2.25 0 0 0 3 8.25v10.5A2.25 2.25 0 0 0 5.25 21h10.5A2.25 2.25 0 0 0 18 18.75v-6a.75.75 0 0 0-1.5 0v6c0 .414-.336.75-.75.75H5.25a.75.75 0 0 1-.75-.75V8.25c0-.414.336-.75.75-.75h6a.75.75 0 0 0 0-1.5h-6Z"/>
</svg>
</div>
</div>
</div>
</div>
<!-- close button --> <!-- close button -->
<div class="my-auto mr-2"> <div class="my-auto mr-2">
<div @click="onCloseNodeViewer" class="cursor-pointer"> <div @click="onCloseNodeViewer" class="cursor-pointer">
@@ -103,7 +118,7 @@
</div> </div>
<!-- page content --> <!-- page content -->
<div class="h-full overflow-y-scroll p-3 bg-black text-white nodeContainer"> <div class="flex-1 overflow-y-auto p-3 bg-black text-white nodeContainer">
<div class="flex" v-if="isLoadingNodePage"> <div class="flex" v-if="isLoadingNodePage">
<div class="my-auto"> <div class="my-auto">
<svg class="animate-spin -ml-1 mr-3 h-5 w-5 text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"> <svg class="animate-spin -ml-1 mr-3 h-5 w-5 text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">
@@ -111,7 +126,10 @@
<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path> <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
</svg> </svg>
</div> </div>
<div class="my-auto">Loading {{ nodePageProgress }}%</div> <div class="my-auto flex-1">Loading {{ nodePageProgress }}%</div>
<button @click="cancelPageDownload" type="button" class="my-auto text-white bg-red-600 hover:bg-red-700 dark:bg-red-700 dark:hover:bg-red-800 rounded px-3 py-1 text-sm font-semibold cursor-pointer ml-3">
Cancel
</button>
</div> </div>
<pre v-else v-html="renderedNodePageContent()" class="h-full break-words whitespace-pre-wrap"></pre> <pre v-else v-html="renderedNodePageContent()" class="h-full break-words whitespace-pre-wrap"></pre>
</div> </div>
@@ -124,12 +142,15 @@
<path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path> <path class="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
</svg> </svg>
</div> </div>
<div class="my-auto"> <div class="my-auto flex-1">
Downloading: {{ nodeFilePath }} ({{ nodeFileProgress }}%) Downloading: {{ nodeFilePath }} ({{ nodeFileProgress }}%)
<span v-if="nodeFileDownloadSpeed !== null" class="ml-2 text-sm"> <span v-if="nodeFileDownloadSpeed !== null" class="ml-2 text-sm">
- {{ formatBytesPerSecond(nodeFileDownloadSpeed) }} - {{ formatBytesPerSecond(nodeFileDownloadSpeed) }}
</span> </span>
</div> </div>
<button @click="cancelFileDownload" type="button" class="my-auto text-white bg-red-600 hover:bg-red-700 dark:bg-red-700 dark:hover:bg-red-800 rounded px-3 py-1 text-sm font-semibold cursor-pointer">
Cancel
</button>
</div> </div>
</div> </div>
@@ -215,6 +236,7 @@ export default {
nodePageProgress: 0, nodePageProgress: 0,
nodePagePathHistory: [], nodePagePathHistory: [],
nodePageCache: {}, nodePageCache: {},
currentPageDownloadId: null,
isDownloadingNodeFile: false, isDownloadingNodeFile: false,
nodeFilePath: null, nodeFilePath: null,
@@ -223,6 +245,7 @@ export default {
nodeFileLastProgressTime: null, nodeFileLastProgressTime: null,
nodeFileLastProgressValue: 0, nodeFileLastProgressValue: 0,
nodeFileDownloadSpeed: null, nodeFileDownloadSpeed: null,
currentFileDownloadId: null,
nomadnetPageDownloadCallbacks: {}, nomadnetPageDownloadCallbacks: {},
nomadnetFileDownloadCallbacks: {}, nomadnetFileDownloadCallbacks: {},
@@ -266,7 +289,27 @@ export default {
}, 5000); }, 5000);
}, },
computed: {
popoutRouteType() {
if(this.$route?.meta?.popoutType){
return this.$route.meta.popoutType;
}
return this.$route?.query?.popout ?? this.getHashPopoutValue();
},
isPopoutMode() {
return this.popoutRouteType === "nomad";
},
},
methods: { methods: {
openNomadnetPopout() {
if (!this.selectedNode) {
return;
}
const destinationHash = this.selectedNode.destination_hash || "";
const encodedHash = encodeURIComponent(destinationHash);
const url = `${window.location.origin}${window.location.pathname}#/popout/nomadnetwork/${encodedHash}`;
window.open(url, "_blank", "width=1100,height=800,noopener");
},
onElementClick(event) { onElementClick(event) {
// find the closest ancestor (or the clicked element itself) with data-action="openNode" // find the closest ancestor (or the clicked element itself) with data-action="openNode"
@@ -297,6 +340,13 @@ export default {
// get data from server // get data from server
const nomadnetPageDownload = json.nomadnet_page_download; const nomadnetPageDownload = json.nomadnet_page_download;
const downloadId = json.download_id;
// handle started status
if(nomadnetPageDownload.status === "started"){
this.currentPageDownloadId = downloadId;
return;
}
// find download callbacks // find download callbacks
const getNomadnetPageDownloadCallbackKey = this.getNomadnetPageDownloadCallbackKey(nomadnetPageDownload.destination_hash, nomadnetPageDownload.page_path); const getNomadnetPageDownloadCallbackKey = this.getNomadnetPageDownloadCallbackKey(nomadnetPageDownload.destination_hash, nomadnetPageDownload.page_path);
@@ -310,6 +360,7 @@ export default {
if(nomadnetPageDownload.status === "success" && nomadnetPageDownloadCallback.onSuccessCallback){ if(nomadnetPageDownload.status === "success" && nomadnetPageDownloadCallback.onSuccessCallback){
nomadnetPageDownloadCallback.onSuccessCallback(nomadnetPageDownload.page_content); nomadnetPageDownloadCallback.onSuccessCallback(nomadnetPageDownload.page_content);
delete this.nomadnetPageDownloadCallbacks[getNomadnetPageDownloadCallbackKey]; delete this.nomadnetPageDownloadCallbacks[getNomadnetPageDownloadCallbackKey];
this.currentPageDownloadId = null;
return; return;
} }
@@ -317,6 +368,7 @@ export default {
if(nomadnetPageDownload.status === "failure" && nomadnetPageDownloadCallback.onFailureCallback){ if(nomadnetPageDownload.status === "failure" && nomadnetPageDownloadCallback.onFailureCallback){
nomadnetPageDownloadCallback.onFailureCallback(nomadnetPageDownload.failure_reason); nomadnetPageDownloadCallback.onFailureCallback(nomadnetPageDownload.failure_reason);
delete this.nomadnetPageDownloadCallbacks[getNomadnetPageDownloadCallbackKey]; delete this.nomadnetPageDownloadCallbacks[getNomadnetPageDownloadCallbackKey];
this.currentPageDownloadId = null;
return; return;
} }
@@ -333,6 +385,13 @@ export default {
// get data from server // get data from server
const nomadnetFileDownload = json.nomadnet_file_download; const nomadnetFileDownload = json.nomadnet_file_download;
const downloadId = json.download_id;
// handle started status
if(nomadnetFileDownload.status === "started"){
this.currentFileDownloadId = downloadId;
return;
}
// find download callbacks // find download callbacks
const getNomadnetFileDownloadCallbackKey = this.getNomadnetFileDownloadCallbackKey(nomadnetFileDownload.destination_hash, nomadnetFileDownload.file_path); const getNomadnetFileDownloadCallbackKey = this.getNomadnetFileDownloadCallbackKey(nomadnetFileDownload.destination_hash, nomadnetFileDownload.file_path);
@@ -346,6 +405,7 @@ export default {
if(nomadnetFileDownload.status === "success" && nomadnetFileDownloadCallback.onSuccessCallback){ if(nomadnetFileDownload.status === "success" && nomadnetFileDownloadCallback.onSuccessCallback){
nomadnetFileDownloadCallback.onSuccessCallback(nomadnetFileDownload.file_name, nomadnetFileDownload.file_bytes); nomadnetFileDownloadCallback.onSuccessCallback(nomadnetFileDownload.file_name, nomadnetFileDownload.file_bytes);
delete this.nomadnetFileDownloadCallbacks[getNomadnetFileDownloadCallbackKey]; delete this.nomadnetFileDownloadCallbacks[getNomadnetFileDownloadCallbackKey];
this.currentFileDownloadId = null;
return; return;
} }
@@ -353,6 +413,7 @@ export default {
if(nomadnetFileDownload.status === "failure" && nomadnetFileDownloadCallback.onFailureCallback){ if(nomadnetFileDownload.status === "failure" && nomadnetFileDownloadCallback.onFailureCallback){
nomadnetFileDownloadCallback.onFailureCallback(nomadnetFileDownload.failure_reason); nomadnetFileDownloadCallback.onFailureCallback(nomadnetFileDownload.failure_reason);
delete this.nomadnetFileDownloadCallbacks[getNomadnetFileDownloadCallbackKey]; delete this.nomadnetFileDownloadCallbacks[getNomadnetFileDownloadCallbackKey];
this.currentFileDownloadId = null;
return; return;
} }
@@ -365,6 +426,26 @@ export default {
break; break;
} }
case 'nomadnet.download.cancelled': {
// handle download cancellation
const downloadId = json.download_id;
// clear page download if it matches
if(this.currentPageDownloadId === downloadId){
this.currentPageDownloadId = null;
this.isLoadingNodePage = false;
this.nodePageContent = "Download cancelled";
}
// clear file download if it matches
if(this.currentFileDownloadId === downloadId){
this.currentFileDownloadId = null;
this.isDownloadingNodeFile = false;
this.nodeFileDownloadSpeed = null;
}
break;
}
} }
}, },
onDestinationPathClick: function(path) { onDestinationPathClick: function(path) {
@@ -480,12 +561,17 @@ export default {
async loadNodePage(destinationHash, pagePath, fieldData = null, addToHistory = true, loadFromCache = true) { async loadNodePage(destinationHash, pagePath, fieldData = null, addToHistory = true, loadFromCache = true) {
// update current route // update current route
this.$router.replace({ const routeName = this.isPopoutMode ? "nomadnetwork-popout" : "nomadnetwork";
name: "nomadnetwork", const routeOptions = {
name: routeName,
params: { params: {
destinationHash: destinationHash, destinationHash: destinationHash,
}, },
}); };
if(!this.isPopoutMode && this.$route?.query){
routeOptions.query = { ...this.$route.query };
}
this.$router.replace(routeOptions);
// get new sequence for this page load // get new sequence for this page load
const seq = ++this.nodePageRequestSequence; const seq = ++this.nodePageRequestSequence;
@@ -736,8 +822,9 @@ export default {
if(url.startsWith("lxmf@")){ if(url.startsWith("lxmf@")){
const destinationHash = url.replace("lxmf@", ""); const destinationHash = url.replace("lxmf@", "");
if(destinationHash.length === 32){ if(destinationHash.length === 32){
const routeName = this.isPopoutMode ? "messages-popout" : "messages";
await this.$router.push({ await this.$router.push({
name: "messages", name: routeName,
params: { params: {
destinationHash: destinationHash, destinationHash: destinationHash,
}, },
@@ -936,10 +1023,18 @@ export default {
// clear selected node // clear selected node
this.selectedNode = null; this.selectedNode = null;
if(this.isPopoutMode){
window.close();
return;
}
// update current route // update current route
this.$router.replace({ const routeName = this.isPopoutMode ? "nomadnetwork-popout" : "nomadnetwork";
name: "nomadnetwork", const routeOptions = { name: routeName };
}); if(!this.isPopoutMode && this.$route?.query){
routeOptions.query = { ...this.$route.query };
}
this.$router.replace(routeOptions);
}, },
getNomadnetPageDownloadCallbackKey: function(destinationHash, pagePath) { getNomadnetPageDownloadCallbackKey: function(destinationHash, pagePath) {
@@ -984,6 +1079,11 @@ export default {
DialogUtils.alert(e.response?.data?.message ?? "Failed to identify!"); DialogUtils.alert(e.response?.data?.message ?? "Failed to identify!");
} }
}, },
getHashPopoutValue() {
const hash = window.location.hash || "";
const match = hash.match(/popout=([^&]+)/);
return match ? decodeURIComponent(match[1]) : null;
},
downloadNomadNetFile(destinationHash, filePath, onSuccessCallback, onFailureCallback, onProgressCallback) { downloadNomadNetFile(destinationHash, filePath, onSuccessCallback, onFailureCallback, onProgressCallback) {
try { try {
@@ -1034,6 +1134,22 @@ export default {
renderedNodePageContent() { renderedNodePageContent() {
return this.renderPageContent(this.nodePagePath, this.nodePageContent); return this.renderPageContent(this.nodePagePath, this.nodePageContent);
}, },
cancelPageDownload() {
if(this.currentPageDownloadId !== null){
WebSocketConnection.send(JSON.stringify({
"type": "nomadnet.download.cancel",
"download_id": this.currentPageDownloadId,
}));
}
},
cancelFileDownload() {
if(this.currentFileDownloadId !== null){
WebSocketConnection.send(JSON.stringify({
"type": "nomadnet.download.cancel",
"download_id": this.currentFileDownloadId,
}));
}
},
}, },
} }
</script> </script>

View File

@@ -1,153 +1,90 @@
<template> <template>
<div class="flex flex-col w-80 min-w-80"> <div class="flex flex-col w-80 min-w-80 min-h-0 bg-white/90 dark:bg-zinc-950/80 backdrop-blur border-r border-gray-200 dark:border-zinc-800">
<!-- tabs --> <div class="flex">
<div class="bg-white dark:bg-zinc-950 border-b border-r border-gray-200 dark:border-zinc-700"> <button @click="tab = 'favourites'" type="button" class="sidebar-tab" :class="{ 'sidebar-tab--active': tab === 'favourites' }">
<div class="-mb-px flex"> Favourites
<div @click="tab = 'favourites'" class="w-full border-b-2 py-3 px-1 text-center text-sm font-medium cursor-pointer" :class="[ tab === 'favourites' ? 'border-blue-500 text-blue-600 dark:border-blue-400 dark:text-blue-400' : 'border-transparent text-gray-500 dark:text-gray-400 hover:border-gray-300 dark:hover:border-zinc-600 hover:text-gray-700 dark:hover:text-gray-300']">Favourites</div> </button>
<div @click="tab = 'announces'" class="w-full border-b-2 py-3 px-1 text-center text-sm font-medium cursor-pointer" :class="[ tab === 'announces' ? 'border-blue-500 text-blue-600 dark:border-blue-400 dark:text-blue-400' : 'border-transparent text-gray-500 dark:text-gray-400 hover:border-gray-300 dark:hover:border-zinc-600 hover:text-gray-700 dark:hover:text-gray-300']">Announces</div> <button @click="tab = 'announces'" type="button" class="sidebar-tab" :class="{ 'sidebar-tab--active': tab === 'announces' }">
</div> Announces
</button>
</div> </div>
<!-- favourites --> <div v-if="tab === 'favourites'" class="flex-1 flex flex-col min-h-0">
<div v-if="tab === 'favourites'" class="flex-1 flex flex-col bg-white dark:bg-zinc-950 border-r border-gray-200 dark:border-zinc-700 overflow-hidden"> <div class="p-3 border-b border-gray-200 dark:border-zinc-800">
<input v-model="favouritesSearchTerm" type="text" :placeholder="`Search ${favourites.length} favourites...`" class="input-field"/>
<!-- search -->
<div v-if="favourites.length > 0" class="p-1 border-b border-gray-300 dark:border-zinc-700">
<input v-model="favouritesSearchTerm" type="text" :placeholder="`Search ${favourites.length} Favourites...`" class="bg-gray-50 dark:bg-zinc-700 border border-gray-300 dark:border-zinc-600 text-gray-900 dark:text-gray-100 text-sm rounded-lg focus:ring-blue-500 dark:focus:ring-blue-600 focus:border-blue-500 dark:focus:border-blue-600 block w-full p-2.5">
</div> </div>
<div class="flex-1 overflow-y-auto px-2 pb-4">
<!-- peers --> <div v-if="searchedFavourites.length > 0" class="space-y-2 pt-2">
<div class="flex h-full overflow-y-auto"> <div
<div v-if="searchedFavourites.length > 0" class="w-full"> v-for="favourite of searchedFavourites"
<div @click="onFavouriteClick(favourite)" v-for="favourite of searchedFavourites" class="flex cursor-pointer p-2 border-l-2" :class="[ favourite.destination_hash === selectedDestinationHash ? 'bg-gray-100 dark:bg-zinc-700 border-blue-500 dark:border-blue-400' : 'bg-white dark:bg-zinc-950 border-transparent hover:bg-gray-50 dark:hover:bg-zinc-700 hover:border-gray-200 dark:hover:border-zinc-600' ]"> :key="favourite.destination_hash"
<div class="my-auto mr-2"> @click="onFavouriteClick(favourite)"
<div class="bg-gray-200 dark:bg-zinc-800 text-gray-500 dark:text-gray-400 p-2 rounded"> class="favourite-card"
<MaterialDesignIcon icon-name="server-network-outline" class="w-6 h-6"/> :class="[
</div> favourite.destination_hash === selectedDestinationHash ? 'favourite-card--active' : '',
</div> draggingFavouriteHash === favourite.destination_hash ? 'favourite-card--dragging' : ''
<div>
<div class="text-gray-900 dark:text-gray-100">{{ favourite.display_name }}</div>
<div class="text-gray-500 dark:text-gray-400 text-sm">{{ formatDestinationHash(favourite.destination_hash) }}</div>
</div>
<div class="ml-auto my-auto">
<DropDownMenu>
<template v-slot:button>
<IconButton class="bg-transparent dark:bg-transparent">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-5">
<path stroke-linecap="round" stroke-linejoin="round" d="M12 6.75a.75.75 0 1 1 0-1.5.75.75 0 0 1 0 1.5ZM12 12.75a.75.75 0 1 1 0-1.5.75.75 0 0 1 0 1.5ZM12 18.75a.75.75 0 1 1 0-1.5.75.75 0 0 1 0 1.5Z" />
</svg>
</IconButton>
</template>
<template v-slot:items>
<!-- rename button -->
<DropDownMenuItem @click="onRenameFavourite(favourite)">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-5">
<path fill-rule="evenodd" d="M5.25 2.25a3 3 0 0 0-3 3v4.318a3 3 0 0 0 .879 2.121l9.58 9.581c.92.92 2.39 1.186 3.548.428a18.849 18.849 0 0 0 5.441-5.44c.758-1.16.492-2.629-.428-3.548l-9.58-9.581a3 3 0 0 0-2.122-.879H5.25ZM6.375 7.5a1.125 1.125 0 1 0 0-2.25 1.125 1.125 0 0 0 0 2.25Z" clip-rule="evenodd" />
</svg>
<span>Rename Favourite</span>
</DropDownMenuItem>
<!-- remove favourite button -->
<div>
<DropDownMenuItem @click="onRemoveFavourite(favourite)">
<svg class="size-5 text-red-500" viewBox="0 0 20 20" fill="currentColor">
<path fill-rule="evenodd" d="M8.75 1A2.75 2.75 0 0 0 6 3.75v.443c-.795.077-1.584.176-2.365.298a.75.75 0 1 0 .23 1.482l.149-.022.841 10.518A2.75 2.75 0 0 0 7.596 19h4.807a2.75 2.75 0 0 0 2.742-2.53l.841-10.52.149.023a.75.75 0 0 0 .23-1.482A41.03 41.03 0 0 0 14 4.193V3.75A2.75 2.75 0 0 0 11.25 1h-2.5ZM10 4c.84 0 1.673.025 2.5.075V3.75c0-.69-.56-1.25-1.25-1.25h-2.5c-.69 0-1.25.56-1.25 1.25v.325C8.327 4.025 9.16 4 10 4ZM8.58 7.72a.75.75 0 0 0-1.5.06l.3 7.5a.75.75 0 1 0 1.5-.06l-.3-7.5Zm4.34.06a.75.75 0 1 0-1.5-.06l-.3 7.5a.75.75 0 1 0 1.5.06l.3-7.5Z" clip-rule="evenodd" />
</svg>
<span class="text-red-500">Remove Favourite</span>
</DropDownMenuItem>
</div>
</template>
</DropDownMenu>
</div>
</div>
</div>
<div v-else class="mx-auto my-auto text-center leading-5">
<!-- no favourites at all -->
<div v-if="favourites.length === 0" class="flex flex-col text-gray-900 dark:text-gray-100">
<div class="mx-auto mb-1">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
<path stroke-linecap="round" stroke-linejoin="round" d="M11.48 3.499a.562.562 0 0 1 1.04 0l2.125 5.111a.563.563 0 0 0 .475.345l5.518.442c.499.04.701.663.321.988l-4.204 3.602a.563.563 0 0 0-.182.557l1.285 5.385a.562.562 0 0 1-.84.61l-4.725-2.885a.562.562 0 0 0-.586 0L6.982 20.54a.562.562 0 0 1-.84-.61l1.285-5.386a.562.562 0 0 0-.182-.557l-4.204-3.602a.562.562 0 0 1 .321-.988l5.518-.442a.563.563 0 0 0 .475-.345L11.48 3.5Z" />
</svg>
</div>
<div class="font-semibold">No Favourites</div>
<div>Discover nodes on the Announces tab.</div>
</div>
<!-- is searching, but no results -->
<div v-if="favouritesSearchTerm !== '' && favourites.length > 0" class="flex flex-col text-gray-900 dark:text-gray-100">
<div class="mx-auto mb-1">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" />
</svg>
</div>
<div class="font-semibold">No Search Results</div>
<div>Your search didn't match any Favourites!</div>
</div>
</div>
</div>
</div>
<!-- announces -->
<div v-if="tab === 'announces'" class="flex-1 flex flex-col bg-white dark:bg-zinc-950 border-r dark:border-zinc-800 overflow-hidden">
<!-- search -->
<div v-if="nodesCount > 0" class="p-1 border-b border-gray-300 dark:border-zinc-800">
<input
v-model="nodesSearchTerm"
type="text"
:placeholder="`Search ${nodesCount} Nodes...`"
class="bg-gray-50 dark:bg-zinc-900 border border-gray-300 dark:border-zinc-700 text-gray-900 dark:text-gray-100 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:placeholder-gray-400"
>
</div>
<!-- nodes -->
<div class="flex h-full overflow-y-auto">
<div v-if="searchedNodes.length > 0" class="w-full">
<div
@click="onNodeClick(node)"
v-for="node of searchedNodes"
class="flex cursor-pointer p-2 border-l-2"
:class="[
node.destination_hash === selectedDestinationHash
? 'bg-gray-100 dark:bg-zinc-800 border-blue-500'
: 'bg-white dark:bg-zinc-950 border-transparent hover:bg-gray-50 dark:hover:bg-zinc-900 hover:border-gray-200 dark:hover:border-zinc-700'
]" ]"
draggable="true"
@dragstart="onFavouriteDragStart($event, favourite)"
@dragover.prevent="onFavouriteDragOver($event)"
@drop.prevent="onFavouriteDrop($event, favourite)"
@dragend="onFavouriteDragEnd"
> >
<div class="my-auto mr-2"> <div class="favourite-card__icon">
<div class="bg-gray-200 dark:bg-zinc-800 text-gray-500 dark:text-gray-400 p-2 rounded"> <MaterialDesignIcon icon-name="server-network" class="w-5 h-5"/>
<MaterialDesignIcon icon-name="server-network-outline" class="w-6 h-6"/> </div>
</div> <div class="flex-1">
<div class="text-sm font-semibold text-gray-900 dark:text-white truncate" :title="favourite.display_name">{{ favourite.display_name }}</div>
<div class="text-xs text-gray-500 dark:text-gray-400">{{ formatDestinationHash(favourite.destination_hash) }}</div>
</div>
<DropDownMenu>
<template #button>
<IconButton class="bg-transparent dark:bg-transparent w-8 h-8 p-0 flex items-center justify-center">
<MaterialDesignIcon icon-name="dots-vertical" class="w-5 h-5"/>
</IconButton>
</template>
<template #items>
<DropDownMenuItem @click="onRenameFavourite(favourite)">
<MaterialDesignIcon icon-name="pencil" class="w-5 h-5"/>
<span>Rename</span>
</DropDownMenuItem>
<DropDownMenuItem @click="onRemoveFavourite(favourite)">
<MaterialDesignIcon icon-name="trash-can" class="w-5 h-5 text-red-500"/>
<span class="text-red-500">Remove</span>
</DropDownMenuItem>
</template>
</DropDownMenu>
</div>
</div>
<div v-else class="empty-state">
<MaterialDesignIcon icon-name="star-outline" class="w-8 h-8"/>
<div class="font-semibold">No favourites</div>
<div class="text-sm text-gray-500 dark:text-gray-400">Add nodes from the announces tab.</div>
</div>
</div>
</div>
<div v-else class="flex-1 flex flex-col min-h-0">
<div class="p-3 border-b border-gray-200 dark:border-zinc-800">
<input v-model="nodesSearchTerm" type="text" placeholder="Search announces" class="input-field"/>
</div>
<div class="flex-1 overflow-y-auto px-2 pb-4">
<div v-if="searchedNodes.length > 0" class="space-y-2 pt-2">
<div v-for="node of searchedNodes" :key="node.destination_hash" @click="onNodeClick(node)" class="announce-card" :class="{ 'announce-card--active': node.destination_hash === selectedDestinationHash }">
<div class="announce-card__icon">
<MaterialDesignIcon icon-name="satellite-uplink" class="w-5 h-5"/>
</div> </div>
<div> <div>
<div class="text-gray-900 dark:text-gray-100">{{ node.display_name }}</div> <div class="text-sm font-semibold text-gray-900 dark:text-white truncate" :title="node.display_name">{{ node.display_name }}</div>
<div class="text-gray-500 dark:text-gray-400 text-sm">{{ formatTimeAgo(node.updated_at) }}</div> <div class="text-xs text-gray-500 dark:text-gray-400">Announced {{ formatTimeAgo(node.updated_at) }}</div>
</div> </div>
</div> </div>
</div> </div>
<div v-else class="mx-auto my-auto text-center leading-5"> <div v-else class="empty-state">
<!-- no nodes at all --> <MaterialDesignIcon icon-name="radar" class="w-8 h-8"/>
<div v-if="nodesCount === 0" class="flex flex-col"> <div class="font-semibold">No announces yet</div>
<div class="mx-auto mb-1"> <div class="text-sm text-gray-500 dark:text-gray-400">Listening for peers on the mesh.</div>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6 text-gray-500 dark:text-gray-400">
<path stroke-linecap="round" stroke-linejoin="round" d="M9.879 7.519c1.171-1.025 3.071-1.025 4.242 0 1.172 1.025 1.172 2.687 0 3.712-.203.179-.43.326-.67.442-.745.361-1.45.999-1.45 1.827v.75M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9 5.25h.008v.008H12v-.008Z" />
</svg>
</div>
<div class="font-semibold text-gray-900 dark:text-gray-100">No Nodes Discovered</div>
<div class="text-gray-500 dark:text-gray-400">Waiting for a node to announce!</div>
</div>
<!-- is searching, but no results -->
<div v-if="nodesSearchTerm !== '' && nodesCount > 0" class="flex flex-col">
<div class="mx-auto mb-1">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6 text-gray-500 dark:text-gray-400">
<path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" />
</svg>
</div>
<div class="font-semibold text-gray-900 dark:text-gray-100">No Search Results</div>
<div class="text-gray-500 dark:text-gray-400">Your search didn't match any Nodes!</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -176,8 +113,22 @@ export default {
tab: "favourites", tab: "favourites",
favouritesSearchTerm: "", favouritesSearchTerm: "",
nodesSearchTerm: "", nodesSearchTerm: "",
favouritesOrder: [],
draggingFavouriteHash: null,
}; };
}, },
mounted() {
this.loadFavouriteOrder();
this.ensureFavouriteOrder();
},
watch: {
favourites: {
handler() {
this.ensureFavouriteOrder();
},
deep: true,
},
},
methods: { methods: {
onNodeClick(node) { onNodeClick(node) {
this.$emit("node-click", node); this.$emit("node-click", node);
@@ -191,6 +142,67 @@ export default {
onRemoveFavourite(favourite) { onRemoveFavourite(favourite) {
this.$emit("remove-favourite", favourite); this.$emit("remove-favourite", favourite);
}, },
loadFavouriteOrder() {
try {
const stored = localStorage.getItem("meshchat.nomadnet.favourites");
if(stored){
this.favouritesOrder = JSON.parse(stored);
}
} catch(e) {
console.log(e);
}
},
persistFavouriteOrder() {
localStorage.setItem("meshchat.nomadnet.favourites", JSON.stringify(this.favouritesOrder));
},
ensureFavouriteOrder() {
const hashes = this.favourites.map((fav) => fav.destination_hash);
const nextOrder = this.favouritesOrder.filter((hash) => hashes.includes(hash));
hashes.forEach((hash) => {
if(!nextOrder.includes(hash)){
nextOrder.push(hash);
}
});
if(JSON.stringify(nextOrder) !== JSON.stringify(this.favouritesOrder)){
this.favouritesOrder = nextOrder;
this.persistFavouriteOrder();
}
},
onFavouriteDragStart(event, favourite) {
try {
if(event?.dataTransfer){
event.dataTransfer.effectAllowed = "move";
event.dataTransfer.setData("text/plain", favourite.destination_hash);
}
} catch(e) {
// ignore for browsers that prevent setting drag meta
}
this.draggingFavouriteHash = favourite.destination_hash;
},
onFavouriteDragOver(event) {
if(event?.dataTransfer){
event.dataTransfer.dropEffect = "move";
}
},
onFavouriteDrop(event, targetFavourite) {
if(!this.draggingFavouriteHash || this.draggingFavouriteHash === targetFavourite.destination_hash){
return;
}
const fromIndex = this.favouritesOrder.indexOf(this.draggingFavouriteHash);
const toIndex = this.favouritesOrder.indexOf(targetFavourite.destination_hash);
if(fromIndex === -1 || toIndex === -1){
return;
}
const updated = [...this.favouritesOrder];
updated.splice(fromIndex, 1);
updated.splice(toIndex, 0, this.draggingFavouriteHash);
this.favouritesOrder = updated;
this.persistFavouriteOrder();
this.draggingFavouriteHash = null;
},
onFavouriteDragEnd() {
this.draggingFavouriteHash = null;
},
formatTimeAgo: function(datetimeString) { formatTimeAgo: function(datetimeString) {
return Utils.formatTimeAgo(datetimeString); return Utils.formatTimeAgo(datetimeString);
}, },
@@ -219,8 +231,13 @@ export default {
return matchesDisplayName || matchesDestinationHash; return matchesDisplayName || matchesDestinationHash;
}); });
}, },
orderedFavourites() {
return [...this.favourites].sort((a, b) => {
return this.favouritesOrder.indexOf(a.destination_hash) - this.favouritesOrder.indexOf(b.destination_hash);
});
},
searchedFavourites() { searchedFavourites() {
return this.favourites.filter((favourite) => { return this.orderedFavourites.filter((favourite) => {
const search = this.favouritesSearchTerm.toLowerCase(); const search = this.favouritesSearchTerm.toLowerCase();
const matchesDisplayName = favourite.display_name.toLowerCase().includes(search); const matchesDisplayName = favourite.display_name.toLowerCase().includes(search);
const matchesCustomDisplayName = favourite.custom_display_name?.toLowerCase()?.includes(search) === true; const matchesCustomDisplayName = favourite.custom_display_name?.toLowerCase()?.includes(search) === true;
@@ -231,3 +248,34 @@ export default {
}, },
} }
</script> </script>
<style scoped>
.sidebar-tab {
@apply w-1/2 py-3 text-sm font-semibold text-gray-500 dark:text-gray-400 border-b-2 border-transparent transition;
}
.sidebar-tab--active {
@apply text-blue-600 border-blue-500 dark:text-blue-300 dark:border-blue-400;
}
.favourite-card {
@apply flex items-center gap-3 rounded-2xl border border-gray-200 dark:border-zinc-800 bg-white/90 dark:bg-zinc-900/70 px-3 py-2 cursor-pointer hover:border-blue-400 dark:hover:border-blue-500;
}
.favourite-card--active {
@apply border-blue-500 dark:border-blue-400 bg-blue-50/60 dark:bg-blue-900/30;
}
.favourite-card__icon,
.announce-card__icon {
@apply w-10 h-10 rounded-xl bg-gray-100 dark:bg-zinc-800 flex items-center justify-center text-gray-500 dark:text-gray-300;
}
.favourite-card--dragging {
@apply opacity-60 ring-2 ring-blue-300 dark:ring-blue-600;
}
.announce-card {
@apply flex items-center gap-3 rounded-2xl border border-gray-200 dark:border-zinc-800 bg-white/90 dark:bg-zinc-900/70 px-3 py-2 cursor-pointer hover:border-blue-400 dark:hover:border-blue-500;
}
.announce-card--active {
@apply border-blue-500 dark:border-blue-400 bg-blue-50/70 dark:bg-blue-900/30;
}
.empty-state {
@apply flex flex-col items-center justify-center text-center gap-2 text-gray-500 dark:text-gray-400 mt-20;
}
</style>

View File

@@ -1,59 +1,85 @@
<template> <template>
<div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] dark:bg-zinc-950"> <div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] bg-gradient-to-br from-slate-50 via-slate-100 to-white dark:from-zinc-950 dark:via-zinc-900 dark:to-zinc-900">
<div class="flex flex-col h-full space-y-2 p-2 overflow-y-auto"> <div class="flex-1 overflow-y-auto w-full px-4 md:px-8 py-6">
<div class="space-y-4 w-full max-w-4xl mx-auto">
<!-- appearance --> <div class="glass-card space-y-5">
<div class="bg-white dark:bg-zinc-800 rounded shadow"> <div class="space-y-2">
<div class="flex border-b border-gray-300 dark:border-zinc-700 text-gray-700 dark:text-gray-200 p-2 font-semibold">Ping</div> <div class="text-xs uppercase tracking-wide text-gray-500 dark:text-gray-400">Diagnostics</div>
<div class="dark:divide-zinc-700 text-gray-900 dark:text-gray-100 p-2"> <div class="text-2xl font-semibold text-gray-900 dark:text-white">Ping Mesh Peers</div>
Only lxmf.delivery destinations can be pinged. <div class="text-sm text-gray-600 dark:text-gray-300">Only <code class="font-mono text-xs">lxmf.delivery</code> destinations respond to ping.</div>
</div> </div>
</div>
<!-- inputs --> <div class="grid md:grid-cols-2 gap-4">
<div class="bg-white dark:bg-zinc-800 rounded shadow"> <div>
<div class="divide-y divide-gray-300 dark:divide-zinc-700 text-gray-900 dark:text-gray-100"> <label class="glass-label">Destination Hash</label>
<input v-model="destinationHash" type="text" placeholder="e.g. 7b746057a7294469799cd8d7d429676a" class="input-field font-mono"/>
<div class="p-2"> </div>
<div class="text-sm font-medium text-gray-900 dark:text-gray-100">Destination Hash</div> <div>
<div class="flex"> <label class="glass-label">Ping Timeout (seconds)</label>
<input v-model="destinationHash" type="text" placeholder="e.g: 7b746057a7294469799cd8d7d429676a" class="bg-gray-50 dark:bg-zinc-700 border border-gray-300 dark:border-zinc-600 text-gray-900 dark:text-gray-100 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 dark:focus:ring-blue-600 dark:focus:border-blue-600 block w-full p-2.5"> <input v-model="timeout" type="number" min="1" class="input-field"/>
</div> </div>
</div> </div>
<div class="p-2"> <div class="flex flex-wrap gap-2">
<div class="text-sm font-medium text-gray-900 dark:text-gray-100">Ping Timeout (seconds)</div> <button v-if="!isRunning" @click="start" type="button" class="primary-chip px-4 py-2 text-sm">
<div class="flex"> <MaterialDesignIcon icon-name="play" class="w-4 h-4"/>
<input v-model="timeout" type="number" placeholder="Timeout" class="bg-gray-50 dark:bg-zinc-700 border border-gray-300 dark:border-zinc-600 text-gray-900 dark:text-gray-100 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 dark:focus:ring-blue-600 dark:focus:border-blue-600 block w-full p-2.5"> Start Ping
</div>
</div>
<div class="p-2 space-x-1">
<button v-if="!isRunning" @click="start" type="button" class="my-auto inline-flex items-center gap-x-1 rounded-md bg-gray-500 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 dark:bg-zinc-700 dark:text-white dark:hover:bg-zinc-600 dark:focus-visible:outline-zinc-500">
Start
</button> </button>
<button v-if="isRunning" @click="stop" type="button" class="my-auto inline-flex items-center gap-x-1 rounded-md bg-gray-500 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 dark:bg-zinc-700 dark:text-white dark:hover:bg-zinc-600 dark:focus-visible:outline-zinc-500"> <button v-else @click="stop" type="button" class="secondary-chip px-4 py-2 text-sm text-red-600 dark:text-red-300 border-red-200 dark:border-red-500/50">
<MaterialDesignIcon icon-name="pause" class="w-4 h-4"/>
Stop Stop
</button> </button>
<button @click="clear" type="button" class="my-auto inline-flex items-center gap-x-1 rounded-md bg-gray-500 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 dark:bg-zinc-700 dark:text-white dark:hover:bg-zinc-600 dark:focus-visible:outline-zinc-500"> <button @click="clear" type="button" class="secondary-chip px-4 py-2 text-sm">
<MaterialDesignIcon icon-name="broom" class="w-4 h-4"/>
Clear Results Clear Results
</button> </button>
<button @click="dropPath" type="button" class="my-auto inline-flex items-center gap-x-1 rounded-md bg-red-500 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-red-400 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-red-500"> <button @click="dropPath" type="button" class="inline-flex items-center gap-2 rounded-full bg-red-600/90 px-4 py-2 text-sm font-semibold text-white shadow hover:bg-red-500 transition">
<MaterialDesignIcon icon-name="link-variant-remove" class="w-4 h-4"/>
Drop Path Drop Path
</button> </button>
</div> </div>
<div class="flex flex-wrap gap-2 text-xs font-semibold">
<span :class="[isRunning ? 'bg-emerald-100 text-emerald-700 dark:bg-emerald-900/40 dark:text-emerald-200' : 'bg-gray-200 text-gray-700 dark:bg-zinc-800 dark:text-gray-200', 'rounded-full px-3 py-1']">
Status: {{ isRunning ? 'Running' : 'Idle' }}
</span>
<span v-if="lastPingSummary?.duration" class="rounded-full px-3 py-1 bg-blue-100 text-blue-700 dark:bg-blue-900/40 dark:text-blue-200">
Last RTT: {{ lastPingSummary.duration }}
</span>
<span v-if="lastPingSummary?.error" class="rounded-full px-3 py-1 bg-red-100 text-red-700 dark:bg-red-900/40 dark:text-red-200">
Last Error: {{ lastPingSummary.error }}
</span>
</div>
</div> </div>
</div>
<!-- results --> <div class="glass-card flex flex-col min-h-[320px] space-y-3">
<div class="flex flex-col h-full bg-white dark:bg-zinc-800 rounded shadow overflow-hidden min-h-52"> <div class="flex items-center justify-between gap-4">
<div class="flex border-b border-gray-300 dark:border-zinc-700 text-gray-700 dark:text-gray-200 p-2 font-semibold">Results</div> <div>
<div id="results" class="flex flex-col h-full bg-black text-white dark:bg-zinc-800 dark:text-gray-200 p-2 overflow-y-auto overflow-x-auto font-mono whitespace-nowrap"> <div class="text-sm font-semibold text-gray-900 dark:text-white">Console Output</div>
<div v-for="pingResult of pingResults" class="w-fit">{{ pingResult }}</div> <div class="text-xs text-gray-500 dark:text-gray-400">Streaming seq responses in real time</div>
</div>
<div class="text-xs text-gray-500 dark:text-gray-400">
seq #{{ seq }}
</div>
</div>
<div v-if="lastPingSummary && !lastPingSummary.error" class="flex flex-wrap gap-2 text-xs text-gray-700 dark:text-gray-200">
<span v-if="lastPingSummary.hopsThere != null" class="stat-chip">Hops there: {{ lastPingSummary.hopsThere }}</span>
<span v-if="lastPingSummary.hopsBack != null" class="stat-chip">Hops back: {{ lastPingSummary.hopsBack }}</span>
<span v-if="lastPingSummary.rssi != null" class="stat-chip">RSSI {{ lastPingSummary.rssi }} dBm</span>
<span v-if="lastPingSummary.snr != null" class="stat-chip">SNR {{ lastPingSummary.snr }} dB</span>
<span v-if="lastPingSummary.quality != null" class="stat-chip">Quality {{ lastPingSummary.quality }}%</span>
<span v-if="lastPingSummary.via" class="stat-chip">Interface {{ lastPingSummary.via }}</span>
</div>
<div id="results" class="flex-1 overflow-y-auto rounded-2xl bg-black/80 text-emerald-300 font-mono text-xs p-3 space-y-1 shadow-inner border border-zinc-900">
<div v-if="pingResults.length === 0" class="text-emerald-500/80">No pings yet. Start a run to collect RTT data.</div>
<div v-for="(pingResult, index) in pingResults" :key="`${index}-${pingResult}`" class="whitespace-pre-wrap">{{ pingResult }}</div>
</div>
</div> </div>
</div>
</div>
</div> </div>
</div> </div>
</template> </template>
@@ -61,9 +87,13 @@
<script> <script>
import {CanceledError} from "axios"; import {CanceledError} from "axios";
import DialogUtils from "../../js/DialogUtils"; import DialogUtils from "../../js/DialogUtils";
import MaterialDesignIcon from "../MaterialDesignIcon.vue";
export default { export default {
name: 'PingPage', name: 'PingPage',
components: {
MaterialDesignIcon,
},
data() { data() {
return { return {
isRunning: false, isRunning: false,
@@ -72,6 +102,7 @@ export default {
seq: 0, seq: 0,
pingResults: [], pingResults: [],
abortController: null, abortController: null,
lastPingSummary: null,
}; };
}, },
beforeUnmount() { beforeUnmount() {
@@ -116,10 +147,13 @@ export default {
}, },
async stop() { async stop() {
this.isRunning = false; this.isRunning = false;
this.abortController.abort(); if(this.abortController){
this.abortController.abort();
}
}, },
async clear() { async clear() {
this.pingResults = []; this.pingResults = [];
this.lastPingSummary = null;
}, },
async sleep(millis) { async sleep(millis) {
return new Promise((resolve, reject) => setTimeout(resolve, millis)); return new Promise((resolve, reject) => setTimeout(resolve, millis));
@@ -168,6 +202,15 @@ export default {
// update ui // update ui
this.addPingResult(info.join(" ")); this.addPingResult(info.join(" "));
this.lastPingSummary = {
duration: rttDurationString,
hopsThere: pingResult.hops_there,
hopsBack: pingResult.hops_back,
rssi: pingResult.rssi,
snr: pingResult.snr,
quality: pingResult.quality,
via: pingResult.receiving_interface,
};
} catch(e) { } catch(e) {
@@ -181,6 +224,9 @@ export default {
// add ping error to results // add ping error to results
const message = e.response?.data?.message ?? e; const message = e.response?.data?.message ?? e;
this.addPingResult(`seq=${this.seq} error=${message}`); this.addPingResult(`seq=${this.seq} error=${message}`);
this.lastPingSummary = {
error: typeof message === "string" ? message : JSON.stringify(message),
};
} }
}, },

View File

@@ -1,43 +1,78 @@
<template> <template>
<div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] dark:bg-zinc-950"> <div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] bg-gray-50 dark:bg-zinc-950">
<!-- search --> <!-- search and sort -->
<div v-if="propagationNodes.length > 0" class="flex bg-white dark:bg-zinc-800 p-1 border-b border-gray-300 dark:border-zinc-700"> <div v-if="propagationNodes.length > 0" class="flex flex-col sm:flex-row gap-2 bg-white dark:bg-zinc-900 border-b border-gray-200 dark:border-zinc-800 px-4 py-3">
<input v-model="searchTerm" type="text" :placeholder="`Search ${propagationNodes.length} Propagation Nodes...`" class="w-full bg-gray-50 dark:bg-zinc-700 border border-gray-300 dark:border-zinc-600 text-gray-900 dark:text-gray-100 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 dark:focus:ring-blue-600 dark:focus:border-blue-600 block w-full p-2.5"> <input v-model="searchTerm" type="text" :placeholder="`Search ${propagationNodes.length} Propagation Nodes...`" class="flex-1 bg-white dark:bg-zinc-900 border border-gray-200 dark:border-zinc-800 text-gray-900 dark:text-zinc-100 text-sm rounded-xl focus:ring-2 focus:ring-blue-500/50 focus:border-blue-500 px-4 py-2 shadow-sm transition-all placeholder:text-gray-400 dark:placeholder:text-zinc-500">
<select v-model="sortBy" class="bg-white dark:bg-zinc-900 border border-gray-200 dark:border-zinc-800 text-gray-900 dark:text-zinc-100 text-sm rounded-xl focus:ring-2 focus:ring-blue-500/50 focus:border-blue-500 px-4 py-2 shadow-sm transition-all min-w-[180px]">
<option value="name">Sort by Name</option>
<option value="name-desc">Sort by Name (Z-A)</option>
<option value="recent">Sort by Recent</option>
<option value="oldest">Sort by Oldest</option>
<option value="preferred">Preferred First</option>
</select>
</div> </div>
<!-- propagation nodes --> <!-- propagation nodes -->
<div class="h-full overflow-y-auto"> <div class="h-full overflow-y-auto px-4 py-4">
<div v-if="searchedPropagationNodes.length > 0" class="p-2 space-y-2 w-full"> <div v-if="paginatedNodes.length > 0" class="space-y-3 w-full">
<div v-for="propagationNode of searchedPropagationNodes" class="border dark:border-zinc-700 rounded bg-white dark:bg-zinc-800 shadow"> <div v-for="propagationNode of paginatedNodes" :key="propagationNode.destination_hash" class="border border-gray-200 dark:border-zinc-800 rounded-2xl bg-white dark:bg-zinc-900 shadow-sm hover:shadow-md transition-shadow overflow-hidden" :class="{ 'ring-2 ring-blue-500 dark:ring-blue-400': config.lxmf_preferred_propagation_node_destination_hash === propagationNode.destination_hash }">
<div class="p-1 flex"> <div class="p-4 flex items-center gap-3">
<div class="my-auto"> <div class="flex-1 min-w-0">
<div class="font-semibold text-gray-900 dark:text-gray-100">{{ propagationNode.operator_display_name ?? "Unknown Operator" }}</div> <div class="flex items-center gap-2 mb-1">
<div class="text-sm text-gray-700 dark:text-gray-300"><{{ propagationNode.destination_hash }}></div> <div class="font-semibold text-gray-900 dark:text-zinc-100 truncate">{{ propagationNode.operator_display_name ?? "Unknown Operator" }}</div>
<span v-if="config.lxmf_preferred_propagation_node_destination_hash === propagationNode.destination_hash" class="inline-flex items-center gap-1 rounded-full bg-blue-100 dark:bg-blue-900/30 px-2 py-0.5 text-xs font-semibold text-blue-700 dark:text-blue-300">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="w-3 h-3">
<path fill-rule="evenodd" d="M10 18a8 8 0 1 0 0-16 8 8 0 0 0 0 16Zm3.857-9.809a.75.75 0 0 0-1.214-.882l-3.483 4.79-1.88-1.88a.75.75 0 1 0-1.06 1.061l2.5 2.5a.75.75 0 0 0 1.137-.089l4-5.5Z" clip-rule="evenodd" />
</svg>
Preferred
</span>
<span v-if="propagationNode.is_propagation_enabled === false" class="inline-flex items-center gap-1 rounded-full bg-red-100 dark:bg-red-900/30 px-2 py-0.5 text-xs font-semibold text-red-700 dark:text-red-300">
Disabled
</span>
</div>
<div class="text-sm text-gray-600 dark:text-zinc-400 font-mono truncate"><{{ propagationNode.destination_hash }}></div>
<div class="text-xs text-gray-500 dark:text-zinc-500 mt-1">Announced {{ formatTimeAgo(propagationNode.updated_at) }}</div>
</div> </div>
<div class="ml-auto my-auto"> <div class="flex-shrink-0">
<button v-if="config.lxmf_preferred_propagation_node_destination_hash === propagationNode.destination_hash" @click="stopUsingPropagationNode" type="button" class="my-auto inline-flex items-center gap-x-1 rounded-md bg-red-500 dark:bg-red-600 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-red-400 dark:hover:bg-red-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-red-500 dark:focus-visible:outline-red-600"> <button v-if="config.lxmf_preferred_propagation_node_destination_hash === propagationNode.destination_hash" @click="stopUsingPropagationNode" type="button" class="inline-flex items-center gap-x-1.5 rounded-xl bg-red-600 hover:bg-red-700 dark:bg-red-600 dark:hover:bg-red-700 px-4 py-2 text-sm font-semibold text-white shadow-sm transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-red-500">
Stop Using Node Stop Using
</button> </button>
<button v-else @click="usePropagationNode(propagationNode.destination_hash)" type="button" class="my-auto inline-flex items-center gap-x-1 rounded-md bg-gray-500 dark:bg-zinc-600 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 dark:hover:bg-zinc-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 dark:focus-visible:outline-zinc-600"> <button v-else @click="usePropagationNode(propagationNode.destination_hash)" type="button" class="inline-flex items-center gap-x-1.5 rounded-xl bg-blue-600 hover:bg-blue-700 dark:bg-blue-600 dark:hover:bg-blue-700 px-4 py-2 text-sm font-semibold text-white shadow-sm transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-500">
Set as Preferred Set as Preferred
</button> </button>
</div> </div>
</div> </div>
<div class="bg-gray-50 dark:bg-zinc-900 p-1">
<div class="text-gray-500 dark:text-gray-400 text-sm">
<span>Announced {{ formatTimeAgo(propagationNode.updated_at) }}</span>
<span v-if="propagationNode.is_propagation_enabled === false">
<span> <span class="text-red-500 dark:text-red-400">Disabled by Operator</span></span>
</span>
<span v-if="config.lxmf_preferred_propagation_node_destination_hash === propagationNode.destination_hash">
<span> <span class="text-green-500 dark:text-green-400">Preferred</span></span>
</span>
</div>
</div>
</div> </div>
</div> </div>
<div v-else class="flex h-full">
<!-- pagination -->
<div v-if="totalPages > 1" class="flex items-center justify-between mt-6 pt-4 border-t border-gray-200 dark:border-zinc-800">
<div class="text-sm text-gray-600 dark:text-zinc-400">
Showing {{ startIndex + 1 }}-{{ endIndex }} of {{ sortedAndSearchedPropagationNodes.length }}
</div>
<div class="flex items-center gap-2">
<button @click="currentPage = Math.max(1, currentPage - 1)" :disabled="currentPage === 1" type="button" class="inline-flex items-center gap-x-1.5 rounded-xl bg-white dark:bg-zinc-900 border border-gray-200 dark:border-zinc-800 hover:bg-gray-50 dark:hover:bg-zinc-800 disabled:opacity-50 disabled:cursor-not-allowed px-3 py-2 text-sm font-medium text-gray-700 dark:text-zinc-300 shadow-sm transition-colors">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
<path stroke-linecap="round" stroke-linejoin="round" d="M15.75 19.5 8.25 12l7.5-7.5" />
</svg>
Previous
</button>
<div class="flex items-center gap-1">
<button v-for="page in visiblePages" :key="page" @click="currentPage = page" type="button" :class="[ page === currentPage ? 'bg-blue-600 text-white dark:bg-blue-600' : 'bg-white dark:bg-zinc-900 text-gray-700 dark:text-zinc-300 hover:bg-gray-50 dark:hover:bg-zinc-800' ]" class="w-10 h-10 rounded-xl border border-gray-200 dark:border-zinc-800 text-sm font-medium shadow-sm transition-colors">
{{ page }}
</button>
</div>
<button @click="currentPage = Math.min(totalPages, currentPage + 1)" :disabled="currentPage === totalPages" type="button" class="inline-flex items-center gap-x-1.5 rounded-xl bg-white dark:bg-zinc-900 border border-gray-200 dark:border-zinc-800 hover:bg-gray-50 dark:hover:bg-zinc-800 disabled:opacity-50 disabled:cursor-not-allowed px-3 py-2 text-sm font-medium text-gray-700 dark:text-zinc-300 shadow-sm transition-colors">
Next
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
<path stroke-linecap="round" stroke-linejoin="round" d="m8.25 4.5 7.5 7.5-7.5 7.5" />
</svg>
</button>
</div>
</div>
<div v-else-if="sortedAndSearchedPropagationNodes.length === 0" class="flex h-full">
<div class="mx-auto my-auto text-center leading-5 text-gray-900 dark:text-gray-100"> <div class="mx-auto my-auto text-center leading-5 text-gray-900 dark:text-gray-100">
<!-- no propagation nodes at all --> <!-- no propagation nodes at all -->
@@ -49,8 +84,8 @@
</div> </div>
<div class="font-semibold">No Propagation Nodes</div> <div class="font-semibold">No Propagation Nodes</div>
<div>Check back later, once someone has announced.</div> <div>Check back later, once someone has announced.</div>
<div class="mt-2"> <div class="mt-4">
<button @click="loadPropagationNodes" type="button" class="my-auto inline-flex items-center gap-x-1 rounded-md bg-gray-500 dark:bg-zinc-600 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 dark:hover:bg-zinc-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 dark:focus-visible:outline-zinc-600"> <button @click="loadPropagationNodes" type="button" class="inline-flex items-center gap-x-1.5 rounded-xl bg-blue-600 hover:bg-blue-700 dark:bg-blue-600 dark:hover:bg-blue-700 px-4 py-2 text-sm font-semibold text-white shadow-sm transition-colors focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-500">
Reload Reload
</button> </button>
</div> </div>
@@ -83,10 +118,13 @@ export default {
data() { data() {
return { return {
searchTerm: "", searchTerm: "",
sortBy: "preferred",
propagationNodes: [], propagationNodes: [],
config: { config: {
lxmf_preferred_propagation_node_destination_hash: null, lxmf_preferred_propagation_node_destination_hash: null,
}, },
currentPage: 1,
itemsPerPage: 20,
}; };
}, },
beforeUnmount() { beforeUnmount() {
@@ -158,6 +196,14 @@ export default {
return Utils.formatTimeAgo(datetimeString); return Utils.formatTimeAgo(datetimeString);
}, },
}, },
watch: {
searchTerm() {
this.currentPage = 1;
},
sortBy() {
this.currentPage = 1;
},
},
computed: { computed: {
searchedPropagationNodes() { searchedPropagationNodes() {
return this.propagationNodes.filter((propagationNode) => { return this.propagationNodes.filter((propagationNode) => {
@@ -167,6 +213,79 @@ export default {
return matchesOperatorDisplayName || matchesDestinationHash; return matchesOperatorDisplayName || matchesDestinationHash;
}); });
}, },
sortedAndSearchedPropagationNodes() {
let nodes = [...this.searchedPropagationNodes];
switch(this.sortBy) {
case "name":
nodes.sort((a, b) => {
const nameA = (a.operator_display_name ?? "Unknown Operator").toLowerCase();
const nameB = (b.operator_display_name ?? "Unknown Operator").toLowerCase();
return nameA.localeCompare(nameB);
});
break;
case "name-desc":
nodes.sort((a, b) => {
const nameA = (a.operator_display_name ?? "Unknown Operator").toLowerCase();
const nameB = (b.operator_display_name ?? "Unknown Operator").toLowerCase();
return nameB.localeCompare(nameA);
});
break;
case "recent":
nodes.sort((a, b) => {
const timeA = new Date(a.updated_at).getTime();
const timeB = new Date(b.updated_at).getTime();
return timeB - timeA;
});
break;
case "oldest":
nodes.sort((a, b) => {
const timeA = new Date(a.updated_at).getTime();
const timeB = new Date(b.updated_at).getTime();
return timeA - timeB;
});
break;
case "preferred":
default:
nodes.sort((a, b) => {
const aIsPreferred = this.config.lxmf_preferred_propagation_node_destination_hash === a.destination_hash;
const bIsPreferred = this.config.lxmf_preferred_propagation_node_destination_hash === b.destination_hash;
if(aIsPreferred && !bIsPreferred) return -1;
if(!aIsPreferred && bIsPreferred) return 1;
const timeA = new Date(a.updated_at).getTime();
const timeB = new Date(b.updated_at).getTime();
return timeB - timeA;
});
break;
}
return nodes;
},
totalPages() {
return Math.ceil(this.sortedAndSearchedPropagationNodes.length / this.itemsPerPage);
},
startIndex() {
return (this.currentPage - 1) * this.itemsPerPage;
},
endIndex() {
return Math.min(this.startIndex + this.itemsPerPage, this.sortedAndSearchedPropagationNodes.length);
},
paginatedNodes() {
return this.sortedAndSearchedPropagationNodes.slice(this.startIndex, this.endIndex);
},
visiblePages() {
const pages = [];
const maxVisible = 5;
let start = Math.max(1, this.currentPage - Math.floor(maxVisible / 2));
let end = Math.min(this.totalPages, start + maxVisible - 1);
if(end - start < maxVisible - 1) {
start = Math.max(1, end - maxVisible + 1);
}
for(let i = start; i <= end; i++) {
pages.push(i);
}
return pages;
},
}, },
} }
</script> </script>

View File

@@ -1,148 +1,212 @@
<template> <template>
<div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] dark:bg-zinc-950"> <div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] bg-gradient-to-br from-slate-50 via-slate-100 to-white dark:from-zinc-950 dark:via-zinc-900 dark:to-zinc-900">
<div class="overflow-y-auto space-y-2 p-2"> <div class="flex-1 overflow-y-auto w-full px-4 md:px-8 py-6">
<div class="space-y-4 w-full max-w-6xl mx-auto">
<!-- appearance --> <!-- hero card -->
<div class="bg-white dark:bg-zinc-800 rounded shadow"> <div class="bg-white/90 dark:bg-zinc-900/80 backdrop-blur border border-gray-200 dark:border-zinc-800 rounded-3xl shadow-xl p-5 md:p-6">
<div class="flex border-b border-gray-300 dark:border-zinc-700 text-gray-700 dark:text-gray-200 p-2 font-semibold">Appearance</div> <div class="flex flex-col md:flex-row md:items-center gap-4">
<div class="divide-y divide-gray-300 dark:divide-zinc-700 text-gray-900 dark:text-gray-100"> <div class="flex-1 space-y-1">
<div class="text-xs uppercase tracking-wide text-gray-500 dark:text-gray-400">Profile</div>
<div class="p-2"> <div class="text-2xl font-semibold text-gray-900 dark:text-white">{{ config.display_name }}</div>
<div class="flex"> <div class="text-sm text-gray-600 dark:text-gray-300">Manage your identity, transport participation and LXMF defaults.</div>
<select v-model="config.theme" @change="onThemeChange" class="bg-gray-50 dark:bg-zinc-700 border border-gray-300 dark:border-zinc-600 text-gray-900 dark:text-gray-100 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 dark:focus:ring-blue-600 dark:focus:border-blue-600 block w-full p-2.5"> </div>
<option value="light">Light Theme</option> <div class="flex flex-col sm:flex-row gap-2">
<option value="dark">Dark Theme</option> <button @click="copyValue(config.identity_hash, 'Identity Hash')" type="button" class="inline-flex items-center justify-center gap-x-2 rounded-xl border border-gray-200 dark:border-zinc-700 bg-white dark:bg-zinc-800 px-4 py-2 text-sm font-semibold text-gray-900 dark:text-zinc-100 shadow-sm hover:border-blue-400 dark:hover:border-blue-400/70 transition">
</select> <MaterialDesignIcon icon-name="content-copy" class="w-4 h-4"/>
</div> Identity
</button>
<button @click="copyValue(config.lxmf_address_hash, 'LXMF Address')" type="button" class="inline-flex items-center justify-center gap-x-2 rounded-xl bg-gradient-to-r from-blue-500 via-indigo-500 to-purple-500 px-4 py-2 text-sm font-semibold text-white shadow hover:shadow-md transition">
<MaterialDesignIcon icon-name="account-plus" class="w-4 h-4"/>
LXMF Address
</button>
</div>
</div>
<transition name="fade">
<div v-if="copyToast" class="mt-3 rounded-full bg-emerald-100 text-emerald-800 dark:bg-emerald-900/40 dark:text-emerald-200 px-3 py-1 text-xs inline-flex items-center gap-2">
{{ copyToast }}
<span class="w-2 h-2 rounded-full bg-emerald-500 animate-ping"></span>
</div>
</transition>
<div class="grid grid-cols-1 sm:grid-cols-3 gap-2 mt-4 text-sm text-gray-600 dark:text-gray-300">
<div class="rounded-2xl border border-gray-200 dark:border-zinc-800 p-3 bg-white/70 dark:bg-zinc-900/70">
<div class="text-xs uppercase tracking-wide">Theme</div>
<div class="font-semibold text-gray-900 dark:text-white capitalize">{{ config.theme }} mode</div>
</div>
<div class="rounded-2xl border border-gray-200 dark:border-zinc-800 p-3 bg-white/70 dark:bg-zinc-900/70">
<div class="text-xs uppercase tracking-wide">Transport</div>
<div class="font-semibold text-gray-900 dark:text-white">{{ config.is_transport_enabled ? 'Enabled' : 'Disabled' }}</div>
</div>
<div class="rounded-2xl border border-gray-200 dark:border-zinc-800 p-3 bg-white/70 dark:bg-zinc-900/70">
<div class="text-xs uppercase tracking-wide">Propagation</div>
<div class="font-semibold text-gray-900 dark:text-white">{{ config.lxmf_local_propagation_node_enabled ? 'Local node running' : 'Client-only' }}</div>
</div>
</div>
<div class="grid gap-3 mt-4 text-sm text-gray-700 dark:text-gray-200 sm:grid-cols-2">
<div class="address-card">
<div class="address-card__label">Identity Hash</div>
<div class="address-card__value monospace-field">{{ config.identity_hash }}</div>
<button @click="copyValue(config.identity_hash, 'Identity Hash')" type="button" class="address-card__action">
<MaterialDesignIcon icon-name="content-copy" class="w-4 h-4"/>
Copy
</button>
</div>
<div class="address-card">
<div class="address-card__label">LXMF Address</div>
<div class="address-card__value monospace-field">{{ config.lxmf_address_hash }}</div>
<button @click="copyValue(config.lxmf_address_hash, 'LXMF Address')" type="button" class="address-card__action">
<MaterialDesignIcon icon-name="content-copy" class="w-4 h-4"/>
Copy
</button>
</div> </div>
</div> </div>
</div> </div>
<!-- transport mode --> <!-- settings grid -->
<div class="bg-white dark:bg-zinc-800 rounded shadow"> <div class="grid gap-4 lg:grid-cols-2">
<div class="flex border-b border-gray-300 dark:border-zinc-700 text-gray-700 dark:text-gray-200 p-2 font-semibold">Transport Mode</div>
<div class="divide-y divide-gray-300 dark:divide-zinc-700 text-gray-900 dark:text-gray-100">
<div class="p-2"> <!-- Appearance -->
<div class="flex items-start"> <section class="glass-card">
<div class="flex items-center h-5"> <header class="glass-card__header">
<input v-model="config.is_transport_enabled" @change="onIsTransportEnabledChange" type="checkbox" class="w-4 h-4 border border-gray-300 dark:border-zinc-600 rounded bg-gray-50 dark:bg-zinc-700 focus:ring-3 focus:ring-blue-300 dark:focus:ring-blue-600"> <div>
</div> <div class="glass-card__eyebrow">Personalise</div>
<label class="ml-2 text-sm font-medium text-gray-900 dark:text-gray-100">Enable Transport Mode</label> <h2>Appearance</h2>
<p>Switch between light and dark presets anytime.</p>
</div> </div>
<div class="text-sm text-gray-700 dark:text-gray-300">When enabled, MeshChat will route traffic for other peers, respond to path requests and pass announces over your interfaces.</div> </header>
<div class="text-sm text-gray-700 dark:text-gray-300">Changing this setting requires you to restart MeshChat.</div> <div class="glass-card__body space-y-3">
</div> <select v-model="config.theme" @change="onThemeChange" class="input-field">
<option value="light">Light Theme</option>
</div> <option value="dark">Dark Theme</option>
</div> </select>
<div class="flex items-center justify-between text-sm text-gray-600 dark:text-gray-300 border border-dashed border-gray-200 dark:border-zinc-800 rounded-2xl px-3 py-2">
<!-- interfaces --> <div>Live preview updates instantly.</div>
<div class="bg-white dark:bg-zinc-800 rounded shadow"> <span class="inline-flex items-center gap-1 text-blue-500 dark:text-blue-300 text-xs font-semibold uppercase">
<div class="flex border-b border-gray-300 dark:border-zinc-700 text-gray-700 dark:text-gray-200 p-2 font-semibold">Interfaces</div> <span class="w-1.5 h-1.5 rounded-full bg-blue-500"></span>
<div class="divide-y divide-gray-300 dark:divide-zinc-700 text-gray-900 dark:text-gray-100"> Realtime
</span>
<div class="p-2">
<div class="flex items-start">
<div class="flex items-center h-5">
<input v-model="config.show_suggested_community_interfaces" @change="onShowSuggestedCommunityInterfacesChange" type="checkbox" class="w-4 h-4 border border-gray-300 dark:border-zinc-600 rounded bg-gray-50 dark:bg-zinc-700 focus:ring-3 focus:ring-blue-300 dark:focus:ring-blue-600">
</div>
<label class="ml-2 text-sm font-medium text-gray-900 dark:text-gray-100">Show Community Interfaces</label>
</div> </div>
<div class="text-sm text-gray-700 dark:text-gray-300">When enabled, community interfaces will be shown on the Add Interface page.</div>
</div> </div>
</section>
</div> <!-- Transport -->
</div> <section class="glass-card">
<header class="glass-card__header">
<!-- messages --> <div>
<div class="bg-white dark:bg-zinc-800 rounded shadow"> <div class="glass-card__eyebrow">Reticulum</div>
<div class="flex border-b border-gray-300 dark:border-zinc-700 text-gray-700 dark:text-gray-200 p-2 font-semibold">Messages</div> <h2>Transport Mode</h2>
<div class="divide-y divide-gray-300 dark:divide-zinc-700 text-gray-900 dark:text-gray-100"> <p>Relay paths and traffic for nearby peers.</p>
<div class="p-2">
<div class="flex items-start">
<div class="flex items-center h-5">
<input v-model="config.auto_resend_failed_messages_when_announce_received" @change="onAutoResendFailedMessagesWhenAnnounceReceivedChange" type="checkbox" class="w-4 h-4 border border-gray-300 dark:border-zinc-600 rounded bg-gray-50 dark:bg-zinc-700 focus:ring-3 focus:ring-blue-300 dark:focus:ring-blue-600">
</div>
<label class="ml-2 text-sm font-medium text-gray-900 dark:text-gray-100">Auto resend</label>
</div> </div>
<div class="text-sm text-gray-700 dark:text-gray-300">When enabled, failed messages will auto resend when an announce is received from the intended destination.</div> </header>
<div class="glass-card__body space-y-3">
<label class="setting-toggle">
<input type="checkbox" v-model="config.is_transport_enabled" @change="onIsTransportEnabledChange">
<span class="setting-toggle__label">
<span class="setting-toggle__title">Enable Transport Mode</span>
<span class="setting-toggle__description">Route announces, respond to path requests and help your mesh stay online.</span>
<span class="setting-toggle__hint">Requires restart after toggling.</span>
</span>
</label>
</div> </div>
</section>
<div class="p-2"> <!-- Interfaces -->
<div class="flex items-start"> <section class="glass-card">
<div class="flex items-center h-5"> <header class="glass-card__header">
<input v-model="config.allow_auto_resending_failed_messages_with_attachments" @change="onAllowAutoResendingFailedMessagesWithAttachmentsChange" type="checkbox" class="w-4 h-4 border border-gray-300 dark:border-zinc-600 rounded bg-gray-50 dark:bg-zinc-700 focus:ring-3 focus:ring-blue-300 dark:focus:ring-blue-600"> <div>
</div> <div class="glass-card__eyebrow">Adapters</div>
<label class="ml-2 text-sm font-medium text-gray-900 dark:text-gray-100">Allow resending with attachments</label> <h2>Interfaces</h2>
<p>Show curated community configs inside the interface wizard.</p>
</div> </div>
<div class="text-sm text-gray-700 dark:text-gray-300">When enabled, failed messages that have attachments are allowed to auto resend.</div> </header>
<div class="glass-card__body space-y-3">
<label class="setting-toggle">
<input type="checkbox" v-model="config.show_suggested_community_interfaces" @change="onShowSuggestedCommunityInterfacesChange">
<span class="setting-toggle__label">
<span class="setting-toggle__title">Show Community Interfaces</span>
<span class="setting-toggle__description">Surface community-maintained presets while adding new interfaces.</span>
</span>
</label>
</div> </div>
</section>
<div class="p-2"> <!-- Messages -->
<div class="flex items-start"> <section class="glass-card">
<div class="flex items-center h-5"> <header class="glass-card__header">
<input v-model="config.auto_send_failed_messages_to_propagation_node" @change="onAutoSendFailedMessagesToPropagationNodeChange" type="checkbox" class="w-4 h-4 border border-gray-300 dark:border-zinc-600 rounded bg-gray-50 dark:bg-zinc-700 focus:ring-3 focus:ring-blue-300 dark:focus:ring-blue-600"> <div>
</div> <div class="glass-card__eyebrow">Reliability</div>
<label class="ml-2 text-sm font-medium text-gray-900 dark:text-gray-100">Auto send to propagation node</label> <h2>Messages</h2>
<p>Control how MeshChat retries or escalates failed deliveries.</p>
</div>
</header>
<div class="glass-card__body space-y-3">
<label class="setting-toggle">
<input type="checkbox" v-model="config.auto_resend_failed_messages_when_announce_received" @change="onAutoResendFailedMessagesWhenAnnounceReceivedChange">
<span class="setting-toggle__label">
<span class="setting-toggle__title">Auto resend when peer announces</span>
<span class="setting-toggle__description">Failed messages automatically retry once the destination broadcasts again.</span>
</span>
</label>
<label class="setting-toggle">
<input type="checkbox" v-model="config.allow_auto_resending_failed_messages_with_attachments" @change="onAllowAutoResendingFailedMessagesWithAttachmentsChange">
<span class="setting-toggle__label">
<span class="setting-toggle__title">Allow retries with attachments</span>
<span class="setting-toggle__description">Large payloads will also be retried (useful when both peers have high limits).</span>
</span>
</label>
<label class="setting-toggle">
<input type="checkbox" v-model="config.auto_send_failed_messages_to_propagation_node" @change="onAutoSendFailedMessagesToPropagationNodeChange">
<span class="setting-toggle__label">
<span class="setting-toggle__title">Auto fall back to propagation node</span>
<span class="setting-toggle__description">Failed direct deliveries are queued on your preferred propagation node.</span>
</span>
</label>
<div class="space-y-2">
<div class="text-sm font-medium text-gray-900 dark:text-gray-100">Inbound Message Stamp Cost</div>
<input v-model.number="config.lxmf_inbound_stamp_cost" @input="onLxmfInboundStampCostChange" type="number" min="1" max="254" placeholder="8" class="input-field">
<div class="text-xs text-gray-600 dark:text-gray-400">
Require proof-of-work stamps for direct delivery messages sent to you. Higher values require more computational work from senders. Range: 1-254. Default: 8.
</div>
</div> </div>
<div class="text-sm text-gray-700 dark:text-gray-300">When enabled, messages that fail to send will be sent to the configured propagation node.</div>
</div> </div>
</section>
</div> <!-- Propagation nodes -->
</div> <section class="glass-card lg:col-span-2">
<header class="glass-card__header">
<!-- propagation nodes --> <div>
<div class="bg-white dark:bg-zinc-800 rounded shadow"> <div class="glass-card__eyebrow">LXMF</div>
<div class="flex border-b border-gray-300 dark:border-zinc-700 text-gray-700 dark:text-gray-200 p-2 font-semibold"> <h2>Propagation Nodes</h2>
<div class="my-auto mr-auto">Propagation Nodes</div> <p>Keep conversations flowing even when peers are offline.</p>
<div class="my-auto"> </div>
<RouterLink :to="{ name: 'propagation-nodes' }" class="my-auto inline-flex items-center gap-x-1 rounded-md bg-gray-500 dark:bg-zinc-600 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-gray-400 dark:hover:bg-zinc-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-gray-500 dark:focus-visible:outline-zinc-500"> <RouterLink :to="{ name: 'propagation-nodes' }" class="primary-chip">
Browse Nodes Browse Nodes
</RouterLink> </RouterLink>
</div> </header>
</div> <div class="glass-card__body space-y-5">
<div class="divide-y divide-gray-300 dark:divide-zinc-700 text-gray-900 dark:text-gray-100"> <div class="info-callout">
<ul class="list-disc list-inside space-y-1 text-sm">
<div class="p-2"> <li>Propagation nodes hold messages securely until recipients sync again.</li>
<div class="text-sm text-gray-700 dark:text-gray-300"> <li>Nodes peer with each other to distribute encrypted payloads.</li>
<ul class="list-disc list-inside"> <li>Most nodes retain data ~30 days, then discard undelivered items.</li>
<li>When you send a message, the intended recipient may be offline and your message will fail to send.</li>
<li>Instead, messages can be sent to propagation nodes, which store the messages and allow recipients to retrieve them when they're next online.</li>
<li>Propagation nodes automatically peer and sync messages with each other, creating an encrypted, distributed message store.</li>
<li>By default, propagation nodes store messages for up to 30 days. If the recipient hasn't retrieved it by then, the message will be lost.</li>
<li>At this time, delivery reports are unavailable for messages sent to propagation nodes.</li>
</ul> </ul>
</div> </div>
</div> <label class="setting-toggle">
<input type="checkbox" v-model="config.lxmf_local_propagation_node_enabled" @change="onLxmfLocalPropagationNodeEnabledChange">
<div class="p-2"> <span class="setting-toggle__label">
<div class="flex items-start"> <span class="setting-toggle__title">Run a local propagation node</span>
<div class="flex items-center h-5"> <span class="setting-toggle__description">MeshChat will announce and maintain a node using this local destination hash.</span>
<input v-model="config.lxmf_local_propagation_node_enabled" @change="onLxmfLocalPropagationNodeEnabledChange" type="checkbox" class="w-4 h-4 border border-gray-300 dark:border-zinc-600 rounded bg-gray-50 dark:bg-zinc-700 focus:ring-3 focus:ring-blue-300 dark:focus:ring-blue-600"> <span class="setting-toggle__hint monospace-field">{{ config.lxmf_local_propagation_node_address_hash || '—' }}</span>
</div> </span>
<label class="ml-2 text-sm font-medium text-gray-900 dark:text-gray-100">Local Propagation Node</label> </label>
<div class="space-y-2">
<div class="text-sm font-medium text-gray-900 dark:text-gray-100">Preferred Propagation Node</div>
<input v-model="config.lxmf_preferred_propagation_node_destination_hash" @input="onLxmfPreferredPropagationNodeDestinationHashChange" type="text" placeholder="Destination hash, e.g. a39610c89d18bb48c73e429582423c24" class="input-field monospace-field">
<div class="text-xs text-gray-600 dark:text-gray-400">Messages fallback to this node whenever direct delivery fails.</div>
</div> </div>
<div class="text-sm text-gray-700 dark:text-gray-300">When enabled, MeshChat will run a Propagation Node and announce it with the following address for other clients to use.</div> <div class="space-y-2">
<div class="flex"> <div class="text-sm font-medium text-gray-900 dark:text-gray-100">Auto Sync Interval</div>
<input disabled v-model="config.lxmf_local_propagation_node_address_hash" type="text" class="bg-gray-200 dark:bg-zinc-800 border border-gray-300 dark:border-zinc-600 text-gray-900 dark:text-gray-100 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 dark:focus:ring-blue-600 dark:focus:border-blue-600 block w-full p-2.5"> <select v-model="config.lxmf_preferred_propagation_node_auto_sync_interval_seconds" @change="onLxmfPreferredPropagationNodeAutoSyncIntervalSecondsChange" class="input-field">
</div>
</div>
<div class="p-2">
<div class="text-sm font-medium text-gray-900 dark:text-gray-100">Preferred Propagation Node</div>
<div class="flex">
<input v-model="config.lxmf_preferred_propagation_node_destination_hash" @input="onLxmfPreferredPropagationNodeDestinationHashChange" type="text" placeholder="Destination Hash. e.g: a39610c89d18bb48c73e429582423c24" class="bg-gray-50 dark:bg-zinc-700 border border-gray-300 dark:border-zinc-600 text-gray-900 dark:text-gray-100 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 dark:focus:ring-blue-600 dark:focus:border-blue-600 block w-full p-2.5">
</div>
<div class="text-sm text-gray-700 dark:text-gray-300">This is the propagation node your messages will be sent to and retrieved from.</div>
</div>
<div class="p-2">
<div class="text-sm font-medium text-gray-900 dark:text-gray-100">Auto Sync Interval</div>
<div class="flex">
<select v-model="config.lxmf_preferred_propagation_node_auto_sync_interval_seconds" @change="onLxmfPreferredPropagationNodeAutoSyncIntervalSecondsChange" class="bg-gray-50 dark:bg-zinc-700 border border-gray-300 dark:border-zinc-600 text-gray-900 dark:text-gray-100 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 dark:focus:ring-blue-600 dark:focus:border-blue-600 block w-full p-2.5">
<option value="0">Disabled</option> <option value="0">Disabled</option>
<option value="900">Every 15 Minutes</option> <option value="900">Every 15 Minutes</option>
<option value="1800">Every 30 Minutes</option> <option value="1800">Every 30 Minutes</option>
@@ -152,16 +216,23 @@
<option value="43200">Every 12 Hours</option> <option value="43200">Every 12 Hours</option>
<option value="86400">Every 24 Hours</option> <option value="86400">Every 24 Hours</option>
</select> </select>
<div class="text-xs text-gray-600 dark:text-gray-400">
<span v-if="config.lxmf_preferred_propagation_node_last_synced_at">Last synced {{ formatSecondsAgo(config.lxmf_preferred_propagation_node_last_synced_at) }} ago.</span>
<span v-else>Last synced: never.</span>
</div>
</div> </div>
<div class="text-sm text-gray-700 dark:text-gray-300"> <div v-if="config.lxmf_local_propagation_node_enabled" class="space-y-2">
<span v-if="config.lxmf_preferred_propagation_node_last_synced_at">Last Synced: {{ formatSecondsAgo(config.lxmf_preferred_propagation_node_last_synced_at) }}</span> <div class="text-sm font-medium text-gray-900 dark:text-gray-100">Propagation Node Stamp Cost</div>
<span v-else>Last Synced: Never</span> <input v-model.number="config.lxmf_propagation_node_stamp_cost" @input="onLxmfPropagationNodeStampCostChange" type="number" min="13" max="254" placeholder="16" class="input-field">
<div class="text-xs text-gray-600 dark:text-gray-400">
Require proof-of-work stamps for messages propagated through your node. Higher values require more computational work. Range: 13-254. Default: 16. <strong>Note:</strong> Changing this requires restarting the app.
</div>
</div> </div>
</div> </div>
</section>
</div>
</div> </div>
</div>
</div> </div>
</div> </div>
</template> </template>
@@ -170,9 +241,13 @@
import Utils from "../../js/Utils"; import Utils from "../../js/Utils";
import WebSocketConnection from "../../js/WebSocketConnection"; import WebSocketConnection from "../../js/WebSocketConnection";
import DialogUtils from "../../js/DialogUtils"; import DialogUtils from "../../js/DialogUtils";
import MaterialDesignIcon from "../MaterialDesignIcon.vue";
export default { export default {
name: 'SettingsPage', name: 'SettingsPage',
components: {
MaterialDesignIcon,
},
data() { data() {
return { return {
config: { config: {
@@ -183,12 +258,15 @@ export default {
lxmf_local_propagation_node_enabled: null, lxmf_local_propagation_node_enabled: null,
lxmf_preferred_propagation_node_destination_hash: null, lxmf_preferred_propagation_node_destination_hash: null,
}, },
copyToast: null,
copyToastTimeout: null,
}; };
}, },
beforeUnmount() { beforeUnmount() {
// stop listening for websocket messages // stop listening for websocket messages
WebSocketConnection.off("message", this.onWebsocketMessage); WebSocketConnection.off("message", this.onWebsocketMessage);
clearTimeout(this.copyToastTimeout);
}, },
mounted() { mounted() {
@@ -227,6 +305,25 @@ export default {
console.log(e); console.log(e);
} }
}, },
async copyValue(value, label) {
if(!value){
DialogUtils.alert(`Nothing to copy for ${label}`);
return;
}
try {
await navigator.clipboard.writeText(value);
this.showCopyToast(`${label} copied to clipboard`);
} catch(e) {
DialogUtils.alert(`${label}: ${value}`);
}
},
showCopyToast(message) {
this.copyToast = message;
clearTimeout(this.copyToastTimeout);
this.copyToastTimeout = setTimeout(() => {
this.copyToast = null;
}, 2500);
},
async onThemeChange() { async onThemeChange() {
await this.updateConfig({ await this.updateConfig({
"theme": this.config.theme, "theme": this.config.theme,
@@ -267,6 +364,16 @@ export default {
"lxmf_preferred_propagation_node_auto_sync_interval_seconds": this.config.lxmf_preferred_propagation_node_auto_sync_interval_seconds, "lxmf_preferred_propagation_node_auto_sync_interval_seconds": this.config.lxmf_preferred_propagation_node_auto_sync_interval_seconds,
}); });
}, },
async onLxmfInboundStampCostChange() {
await this.updateConfig({
"lxmf_inbound_stamp_cost": this.config.lxmf_inbound_stamp_cost,
});
},
async onLxmfPropagationNodeStampCostChange() {
await this.updateConfig({
"lxmf_propagation_node_stamp_cost": this.config.lxmf_propagation_node_stamp_cost,
});
},
async onIsTransportEnabledChange() { async onIsTransportEnabledChange() {
if(this.config.is_transport_enabled){ if(this.config.is_transport_enabled){
try { try {
@@ -292,3 +399,74 @@ export default {
}, },
} }
</script> </script>
<style scoped>
.glass-card {
@apply bg-white/90 dark:bg-zinc-900/80 backdrop-blur border border-gray-200 dark:border-zinc-800 rounded-3xl shadow-lg flex flex-col;
}
.glass-card__header {
@apply flex items-center justify-between gap-3 px-4 py-4 border-b border-gray-100/70 dark:border-zinc-800/80;
}
.glass-card__header h2 {
@apply text-lg font-semibold text-gray-900 dark:text-white;
}
.glass-card__header p {
@apply text-sm text-gray-600 dark:text-gray-400;
}
.glass-card__eyebrow {
@apply text-xs uppercase tracking-wide text-gray-500 dark:text-gray-400;
}
.glass-card__body {
@apply px-4 py-4 text-gray-900 dark:text-gray-100;
}
.input-field {
@apply bg-gray-50/90 dark:bg-zinc-800/80 border border-gray-200 dark:border-zinc-700 text-sm rounded-2xl focus:ring-2 focus:ring-blue-400 focus:border-blue-400 dark:focus:ring-blue-500 dark:focus:border-blue-500 block w-full p-2.5 text-gray-900 dark:text-gray-100 transition;
}
.setting-toggle {
@apply flex items-start gap-3 rounded-2xl border border-gray-200 dark:border-zinc-800 bg-white/70 dark:bg-zinc-900/70 px-3 py-3;
}
.setting-toggle input[type="checkbox"] {
@apply w-4 h-4 mt-1 rounded border-gray-300 dark:border-zinc-600 text-blue-600 focus:ring-blue-500;
}
.setting-toggle__label {
@apply flex-1 flex flex-col gap-0.5;
}
.setting-toggle__title {
@apply text-sm font-semibold text-gray-900 dark:text-white;
}
.setting-toggle__description {
@apply text-sm text-gray-600 dark:text-gray-300;
}
.setting-toggle__hint {
@apply text-xs text-gray-500 dark:text-gray-400;
}
.primary-chip {
@apply inline-flex items-center gap-x-1 rounded-full bg-blue-600/90 px-4 py-1.5 text-xs font-semibold text-white shadow hover:bg-blue-500 transition;
}
.info-callout {
@apply rounded-2xl border border-blue-100 dark:border-blue-900/40 bg-blue-50/60 dark:bg-blue-900/20 px-3 py-3 text-blue-900 dark:text-blue-100;
}
.monospace-field {
font-family: "Roboto Mono", monospace;
}
.address-card {
@apply relative border border-gray-200 dark:border-zinc-800 rounded-2xl bg-white/80 dark:bg-zinc-900/70 p-4 space-y-2;
}
.address-card__label {
@apply text-xs uppercase tracking-wide text-gray-500 dark:text-gray-400;
}
.address-card__value {
@apply text-sm text-gray-900 dark:text-white break-words pr-16;
}
.address-card__action {
@apply absolute top-3 right-3 inline-flex items-center gap-1 rounded-full border border-gray-200 dark:border-zinc-700 px-3 py-1 text-xs font-semibold text-gray-700 dark:text-gray-100 bg-white/70 dark:bg-zinc-900/60 hover:border-blue-400 dark:hover:border-blue-500 transition;
}
.fade-enter-active,
.fade-leave-active {
transition: opacity 0.2s ease;
}
.fade-enter-from,
.fade-leave-to {
opacity: 0;
}
</style>

View File

@@ -1,60 +1,67 @@
<template> <template>
<div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] dark:bg-zinc-950"> <div class="flex flex-col flex-1 overflow-hidden min-w-full sm:min-w-[500px] bg-gradient-to-br from-slate-50 via-slate-100 to-white dark:from-zinc-950 dark:via-zinc-900 dark:to-zinc-900">
<div class="overflow-y-auto space-y-2 p-2"> <div class="overflow-y-auto space-y-4 p-4 md:p-6 max-w-5xl mx-auto w-full">
<!-- appearance --> <div class="glass-card space-y-3">
<div class="bg-white dark:bg-zinc-800 rounded shadow"> <div class="text-xs uppercase tracking-wide text-gray-500 dark:text-gray-400">Utilities</div>
<div class="flex border-b border-gray-300 dark:border-zinc-700 text-gray-700 dark:text-gray-200 p-2 font-semibold">Tools</div> <div class="text-2xl font-semibold text-gray-900 dark:text-white">Power tools for operators</div>
<div class="dark:divide-zinc-700 text-gray-900 dark:text-gray-100 p-2"> <div class="text-sm text-gray-600 dark:text-gray-300">
A collection of useful tools bundled with MeshChat Diagnostics and firmware helpers ship with MeshChat so you can troubleshoot peers without leaving the console.
</div> </div>
</div> </div>
<!-- ping --> <div class="grid gap-4 md:grid-cols-2">
<RouterLink :to="{ name: 'ping' }" class="group flex bg-white dark:bg-zinc-800 p-2 rounded shadow hover:bg-gray-50 dark:hover:bg-zinc-700"> <RouterLink :to="{ name: 'ping' }" class="tool-card glass-card">
<div class="mr-2"> <div class="tool-card__icon bg-blue-50 text-blue-500 dark:bg-blue-900/30 dark:text-blue-200">
<div class="flex bg-gray-300 text-gray-500 rounded shadow p-2"> <MaterialDesignIcon icon-name="radar" class="w-6 h-6"/>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" class="size-10">
<path fill-rule="evenodd" d="M14.615 1.595a.75.75 0 0 1 .359.852L12.982 9.75h7.268a.75.75 0 0 1 .548 1.262l-10.5 11.25a.75.75 0 0 1-1.272-.71l1.992-7.302H3.75a.75.75 0 0 1-.548-1.262l10.5-11.25a.75.75 0 0 1 .913-.143Z" clip-rule="evenodd" />
</svg>
</div> </div>
</div> <div class="flex-1">
<div class="my-auto mr-auto dark:text-gray-200"> <div class="tool-card__title">Ping</div>
<div class="font-bold">Ping</div> <div class="tool-card__description">Latency test for any LXMF destination hash with live status.</div>
<div class="text-sm">Allows you to ping a destination hash.</div> </div>
</div> <MaterialDesignIcon icon-name="chevron-right" class="tool-card__chevron"/>
<div class="my-auto text-gray-400 group-hover:text-gray-500"> </RouterLink>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
<path stroke-linecap="round" stroke-linejoin="round" d="m8.25 4.5 7.5 7.5-7.5 7.5"></path>
</svg>
</div>
</RouterLink>
<!-- rnode flasher --> <a target="_blank" href="/rnode-flasher/index.html" class="tool-card glass-card">
<a target="_blank" href="/rnode-flasher/index.html" class="group flex bg-white dark:bg-zinc-800 p-2 rounded shadow hover:bg-gray-50 dark:hover:bg-zinc-700"> <div class="tool-card__icon bg-purple-50 text-purple-500 dark:bg-purple-900/30 dark:text-purple-200">
<div class="mr-2"> <img src="/rnode-flasher/reticulum_logo_512.png" class="w-8 h-8 rounded-full" alt="RNode"/>
<div class="flex bg-gray-300 text-white rounded shadow">
<img src="/rnode-flasher/reticulum_logo_512.png" class="size-14"/>
</div> </div>
</div> <div class="flex-1">
<div class="my-auto mr-auto dark:text-gray-200"> <div class="tool-card__title">RNode Flasher</div>
<div class="font-bold">RNode Flasher</div> <div class="tool-card__description">Flash and update RNode adapters without touching the command line.</div>
<div class="text-sm">Flash RNode firmware to supported devices.</div> </div>
</div> <MaterialDesignIcon icon-name="open-in-new" class="tool-card__chevron"/>
<div class="my-auto text-gray-400 group-hover:text-gray-500"> </a>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6"> </div>
<path stroke-linecap="round" stroke-linejoin="round" d="m8.25 4.5 7.5 7.5-7.5 7.5"></path>
</svg>
</div>
</a>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import MaterialDesignIcon from "../MaterialDesignIcon.vue";
export default { export default {
name: 'ToolsPage', name: 'ToolsPage',
components: {
MaterialDesignIcon,
},
} }
</script> </script>
<style scoped>
.tool-card {
@apply flex items-center gap-4 hover:border-blue-400 dark:hover:border-blue-500 transition cursor-pointer;
}
.tool-card__icon {
@apply w-12 h-12 rounded-2xl flex items-center justify-center;
}
.tool-card__title {
@apply text-lg font-semibold text-gray-900 dark:text-white;
}
.tool-card__description {
@apply text-sm text-gray-600 dark:text-gray-300;
}
.tool-card__chevron {
@apply w-5 h-5 text-gray-400;
}
</style>

View File

@@ -9,14 +9,6 @@
<link rel="icon" type="image/png" href="favicons/favicon-512x512.png"/> <link rel="icon" type="image/png" href="favicons/favicon-512x512.png"/>
<title>Reticulum MeshChat</title> <title>Reticulum MeshChat</title>
<!-- codec2 -->
<script src="assets/js/codec2-emscripten/c2enc.js"></script>
<script src="assets/js/codec2-emscripten/c2dec.js"></script>
<script src="assets/js/codec2-emscripten/sox.js"></script>
<script src="assets/js/codec2-emscripten/codec2-lib.js"></script>
<script src="assets/js/codec2-emscripten/wav-encoder.js"></script>
<script src="assets/js/codec2-emscripten/codec2-microphone-recorder.js"></script>
</head> </head>
<body class="bg-gray-100"> <body class="bg-gray-100">
<div id="app"></div> <div id="app"></div>

View File

@@ -0,0 +1,62 @@
const codec2ScriptPaths = [
'/assets/js/codec2-emscripten/c2enc.js',
'/assets/js/codec2-emscripten/c2dec.js',
'/assets/js/codec2-emscripten/sox.js',
'/assets/js/codec2-emscripten/codec2-lib.js',
'/assets/js/codec2-emscripten/wav-encoder.js',
'/assets/js/codec2-emscripten/codec2-microphone-recorder.js',
];
let loadPromise = null;
function injectScript(src) {
if (typeof document === 'undefined') {
return Promise.resolve();
}
const attrName = 'data-codec2-src';
const loadedAttr = 'data-codec2-loaded';
const existing = document.querySelector(`script[${attrName}="${src}"]`);
if (existing) {
if (existing.getAttribute(loadedAttr) === 'true') {
return Promise.resolve();
}
return new Promise((resolve, reject) => {
existing.addEventListener('load', () => resolve(), { once: true });
existing.addEventListener('error', () => reject(new Error(`Failed to load ${src}`)), { once: true });
});
}
return new Promise((resolve, reject) => {
const script = document.createElement('script');
script.src = src;
script.async = false;
script.setAttribute(attrName, src);
script.addEventListener('load', () => {
script.setAttribute(loadedAttr, 'true');
resolve();
});
script.addEventListener('error', () => {
script.remove();
reject(new Error(`Failed to load ${src}`));
});
document.head.appendChild(script);
});
}
export function ensureCodec2ScriptsLoaded() {
if (typeof window === 'undefined') {
return Promise.resolve();
}
if (!loadPromise) {
loadPromise = codec2ScriptPaths.reduce(
(chain, src) => chain.then(() => injectScript(src)),
Promise.resolve(),
);
}
return loadPromise;
}

View File

@@ -4,6 +4,7 @@ import { createRouter, createWebHashHistory } from 'vue-router';
import vClickOutside from "click-outside-vue3"; import vClickOutside from "click-outside-vue3";
import "./style.css"; import "./style.css";
import "./fonts/RobotoMonoNerdFont/font.css"; import "./fonts/RobotoMonoNerdFont/font.css";
import { ensureCodec2ScriptsLoaded } from "./js/Codec2Loader";
import App from './components/App.vue'; import App from './components/App.vue';
@@ -50,6 +51,13 @@ const router = createRouter({
props: true, props: true,
component: defineAsyncComponent(() => import("./components/messages/MessagesPage.vue")), component: defineAsyncComponent(() => import("./components/messages/MessagesPage.vue")),
}, },
{
name: "messages-popout",
path: '/popout/messages/:destinationHash?',
props: true,
meta: { popoutType: "conversation", isPopout: true },
component: defineAsyncComponent(() => import("./components/messages/MessagesPage.vue")),
},
{ {
name: "network-visualiser", name: "network-visualiser",
path: '/network-visualiser', path: '/network-visualiser',
@@ -61,6 +69,13 @@ const router = createRouter({
props: true, props: true,
component: defineAsyncComponent(() => import("./components/nomadnetwork/NomadNetworkPage.vue")), component: defineAsyncComponent(() => import("./components/nomadnetwork/NomadNetworkPage.vue")),
}, },
{
name: "nomadnetwork-popout",
path: '/popout/nomadnetwork/:destinationHash?',
props: true,
meta: { popoutType: "nomad", isPopout: true },
component: defineAsyncComponent(() => import("./components/nomadnetwork/NomadNetworkPage.vue")),
},
{ {
name: "propagation-nodes", name: "propagation-nodes",
path: '/propagation-nodes', path: '/propagation-nodes',
@@ -86,11 +101,21 @@ const router = createRouter({
path: '/tools', path: '/tools',
component: defineAsyncComponent(() => import("./components/tools/ToolsPage.vue")), component: defineAsyncComponent(() => import("./components/tools/ToolsPage.vue")),
}, },
{
name: "call",
path: '/call',
component: defineAsyncComponent(() => import("./components/call/CallPage.vue")),
},
], ],
}) })
createApp(App) async function bootstrap() {
.use(router) await ensureCodec2ScriptsLoaded();
.use(vuetify) createApp(App)
.use(vClickOutside) .use(router)
.mount('#app'); .use(vuetify)
.use(vClickOutside)
.mount('#app');
}
bootstrap();

View File

File diff suppressed because it is too large Load Diff

View File

@@ -1,3 +1,81 @@
@tailwind base; @tailwind base;
@tailwind components; @tailwind components;
@tailwind utilities; @tailwind utilities;
* {
scrollbar-width: thin;
scrollbar-color: #94a3b8 #e2e8f0;
}
*::-webkit-scrollbar {
width: 10px;
height: 10px;
}
*::-webkit-scrollbar-track {
background: #e2e8f0;
}
*::-webkit-scrollbar-thumb {
background-color: #94a3b8;
border-radius: 999px;
border: 2px solid #e2e8f0;
}
.dark * {
scrollbar-color: #52525b #18181b;
}
.dark *::-webkit-scrollbar-track {
background: #18181b;
}
.dark *::-webkit-scrollbar-thumb {
background-color: #52525b;
border-color: #18181b;
}
.glass-card {
@apply bg-white/95 dark:bg-zinc-900/85 backdrop-blur border border-gray-200 dark:border-zinc-800 rounded-3xl shadow-xl px-4 py-4;
}
.input-field {
@apply bg-gray-50/90 dark:bg-zinc-900/80 border border-gray-200 dark:border-zinc-700 text-sm rounded-2xl focus:ring-2 focus:ring-blue-400 focus:border-blue-400 dark:focus:ring-blue-500 dark:focus:border-blue-500 block w-full p-2.5 text-gray-900 dark:text-gray-100 transition;
}
.primary-chip {
@apply inline-flex items-center gap-x-2 rounded-full bg-blue-600/90 px-3 py-1.5 text-xs font-semibold text-white shadow hover:bg-blue-500 transition;
}
.secondary-chip {
@apply inline-flex items-center gap-x-2 rounded-full border border-gray-300 dark:border-zinc-700 px-3 py-1.5 text-xs font-semibold text-gray-700 dark:text-gray-100 bg-white/80 dark:bg-zinc-900/70 hover:border-blue-400 dark:hover:border-blue-500 transition;
}
.glass-label {
@apply mb-1 text-sm font-semibold text-gray-800 dark:text-gray-200;
}
.monospace-field {
@apply font-mono tracking-tight text-gray-900 dark:text-white;
}
.metric-row {
@apply grid gap-3 sm:grid-cols-2 text-gray-800 dark:text-gray-100;
}
.metric-value {
@apply text-lg font-semibold text-gray-900 dark:text-white;
}
.address-card {
@apply relative border border-gray-200 dark:border-zinc-800 rounded-2xl bg-white/80 dark:bg-zinc-900/70 p-4 space-y-2;
}
.address-card__label {
@apply text-xs uppercase tracking-wide text-gray-500 dark:text-gray-400;
}
.address-card__value {
@apply text-sm text-gray-900 dark:text-white break-words pr-16;
}
.address-card__action {
@apply absolute top-3 right-3 inline-flex items-center gap-1 rounded-full border border-gray-200 dark:border-zinc-700 px-3 py-1 text-xs font-semibold text-gray-700 dark:text-gray-100 bg-white/70 dark:bg-zinc-900/60 hover:border-blue-400 dark:hover:border-blue-500 transition;
}

View File

@@ -28,6 +28,52 @@ export default {
call: path.join(__dirname, "src", "frontend", "call.html"), call: path.join(__dirname, "src", "frontend", "call.html"),
}, },
output: {
manualChunks(id) {
if (id.includes('node_modules')) {
if (id.includes('vuetify')) {
return 'vendor-vuetify';
}
if (id.includes('vis-network') || id.includes('vis-data')) {
return 'vendor-vis';
}
if (id.includes('vue-router')) {
return 'vendor-vue-router';
}
if (id.includes('vue')) {
return 'vendor-vue';
}
if (id.includes('protobufjs') || id.includes('@protobufjs')) {
return 'vendor-protobuf';
}
if (id.includes('moment')) {
return 'vendor-moment';
}
if (id.includes('axios')) {
return 'vendor-axios';
}
if (id.includes('@mdi/js')) {
return 'vendor-mdi';
}
if (id.includes('compressorjs')) {
return 'vendor-compressor';
}
if (id.includes('click-outside-vue3')) {
return 'vendor-click-outside';
}
if (id.includes('mitt')) {
return 'vendor-mitt';
}
if (id.includes('micron-parser')) {
return 'vendor-micron';
}
if (id.includes('electron-prompt')) {
return 'vendor-electron-prompt';
}
return 'vendor-other';
}
},
},
}, },
}, },