mirror of
https://github.com/thomasnordquist/MQTT-Explorer.git
synced 2026-09-11 17:13:53 +00:00
Compare commits
@@ -0,0 +1,46 @@
|
||||
{
|
||||
"name": "MQTT Explorer Development",
|
||||
"dockerComposeFile": "docker-compose.yml",
|
||||
"service": "app",
|
||||
"workspaceFolder": "/workspace",
|
||||
|
||||
"customizations": {
|
||||
"vscode": {
|
||||
"extensions": [
|
||||
"dbaeumer.vscode-eslint",
|
||||
"esbenp.prettier-vscode",
|
||||
"ms-vscode.vscode-typescript-next",
|
||||
"ms-azuretools.vscode-docker",
|
||||
"eamodio.gitlens"
|
||||
],
|
||||
"settings": {
|
||||
"editor.formatOnSave": true,
|
||||
"editor.defaultFormatter": "esbenp.prettier-vscode",
|
||||
"typescript.tsdk": "node_modules/typescript/lib",
|
||||
"editor.codeActionsOnSave": {
|
||||
"source.fixAll.eslint": "explicit"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
"forwardPorts": [3000, 8080, 1883],
|
||||
"portsAttributes": {
|
||||
"3000": {
|
||||
"label": "MQTT Explorer Server",
|
||||
"onAutoForward": "notify"
|
||||
},
|
||||
"8080": {
|
||||
"label": "Webpack Dev Server",
|
||||
"onAutoForward": "notify"
|
||||
},
|
||||
"1883": {
|
||||
"label": "MQTT Broker",
|
||||
"onAutoForward": "ignore"
|
||||
}
|
||||
},
|
||||
|
||||
"postCreateCommand": "yarn install",
|
||||
|
||||
"remoteUser": "node"
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
app:
|
||||
image: mcr.microsoft.com/devcontainers/javascript-node:20
|
||||
volumes:
|
||||
- ../..:/workspace:cached
|
||||
command: sleep infinity
|
||||
network_mode: service:mosquitto
|
||||
environment:
|
||||
- MQTT_EXPLORER_USERNAME=dev
|
||||
- MQTT_EXPLORER_PASSWORD=dev123
|
||||
|
||||
mosquitto:
|
||||
image: eclipse-mosquitto:2
|
||||
ports:
|
||||
- "1883:1883"
|
||||
- "3000:3000"
|
||||
- "8080:8080"
|
||||
volumes:
|
||||
- ./mosquitto.conf:/mosquitto/config/mosquitto.conf:ro
|
||||
@@ -0,0 +1,4 @@
|
||||
# Mosquitto configuration for development
|
||||
listener 1883
|
||||
allow_anonymous true
|
||||
persistence false
|
||||
@@ -0,0 +1,383 @@
|
||||
# GitHub Copilot Agent Instructions for MQTT Explorer
|
||||
|
||||
## Overview
|
||||
|
||||
MQTT Explorer is an Electron-based desktop application for exploring MQTT brokers. It provides a comprehensive UI for connecting to MQTT brokers, browsing topics, and analyzing message flows.
|
||||
|
||||
## Technology Stack
|
||||
|
||||
- **Frontend**: React 16.x with Material-UI
|
||||
- **Backend**: Node.js with TypeScript
|
||||
- **Desktop Framework**: Electron 29.x
|
||||
- **MQTT Client**: [mqttjs](https://github.com/mqttjs/MQTT.js) v4.x
|
||||
- **State Management**: Redux with redux-thunk
|
||||
- **Build Tools**: webpack, TypeScript compiler
|
||||
- **Testing**: Mocha + Chai for unit tests, Playwright for MCP introspection tests
|
||||
|
||||
## Project Setup
|
||||
|
||||
### Building and Running
|
||||
|
||||
```bash
|
||||
# Install dependencies
|
||||
yarn install
|
||||
|
||||
# Build the project
|
||||
yarn build
|
||||
|
||||
# Set password for browser testing
|
||||
export MQTT_EXPLORER_USERNAME=admin
|
||||
export MQTT_EXPLORER_PASSWORD=secretpassword
|
||||
|
||||
# Start the application
|
||||
yarn start
|
||||
|
||||
# Start in development mode
|
||||
yarn dev
|
||||
```
|
||||
|
||||
### Running with MCP Introspection (for testing)
|
||||
|
||||
```bash
|
||||
# Build first
|
||||
yarn build
|
||||
|
||||
# Start with MCP introspection enabled
|
||||
electron . --enable-mcp-introspection
|
||||
|
||||
# Or with custom port
|
||||
electron . --enable-mcp-introspection --remote-debugging-port=9223
|
||||
```
|
||||
|
||||
## Writing Tests
|
||||
|
||||
### Requirements for All Tests
|
||||
|
||||
1. **Tests MUST be deterministic** - They should produce the same results every time they run
|
||||
2. **Tests MUST be independent** - Each test should be able to run in isolation without depending on other tests
|
||||
3. **Include screenshots** - Visual verification is required for UI changes
|
||||
4. **Handle asynchronous operations properly** - This is an MQTT message queue tool
|
||||
|
||||
### Best Practices for UI Tests
|
||||
|
||||
#### 1. Use Given-When-Then Pattern
|
||||
Structure tests with clear Given-When-Then comments to make them readable:
|
||||
|
||||
```typescript
|
||||
it('Given a JSON message sent to topic foo/bar/baz, the tree should display nested topics', async function () {
|
||||
// Given: Mock MQTT publishes JSON to foo/bar/baz
|
||||
// When: We wait for the topic to appear in the tree
|
||||
// Then: Topic hierarchy should be visible (foo -> bar -> baz)
|
||||
})
|
||||
```
|
||||
|
||||
#### 2. Wait for Elements, Don't Use Fixed Delays
|
||||
Prefer `waitFor` over `sleep` whenever possible:
|
||||
|
||||
```typescript
|
||||
// ✓ Good: Wait for specific element
|
||||
const topic = await page.locator('span[data-test-topic="kitchen"]')
|
||||
await topic.waitFor({ state: 'visible', timeout: 5000 })
|
||||
|
||||
// ✗ Bad: Fixed delay without verification
|
||||
await sleep(5000)
|
||||
```
|
||||
|
||||
#### 3. Use Meaningful Assertions
|
||||
Every test should have explicit assertions that verify the expected state:
|
||||
|
||||
```typescript
|
||||
// ✓ Good: Explicit assertion with meaningful message
|
||||
const treeNodes = await page.locator('[class*="TreeNode"]')
|
||||
const count = await treeNodes.count()
|
||||
expect(count).to.be.greaterThan(0, 'Topic tree should contain nodes')
|
||||
|
||||
// ✗ Bad: No assertion, only screenshot
|
||||
await page.screenshot({ path: 'test.png' })
|
||||
```
|
||||
|
||||
#### 4. Test Data-Driven Scenarios
|
||||
Write tests that describe the data flow:
|
||||
|
||||
```typescript
|
||||
it('Given messages sent to livingroom/lamp/state and livingroom/lamp/brightness, both should appear under livingroom/lamp', async function () {
|
||||
// Test implementation verifies the specific data flow
|
||||
})
|
||||
```
|
||||
|
||||
#### 5. Use Data Test Attributes
|
||||
Leverage `data-test-*` attributes for reliable selectors:
|
||||
|
||||
```typescript
|
||||
// ✓ Good: Use data-test attributes
|
||||
const topic = await page.locator('span[data-test-topic="kitchen"]')
|
||||
|
||||
// ⚠ Acceptable: Use role/text when data attributes aren't available
|
||||
const button = await page.locator('//button/span[contains(text(),"Connect")]')
|
||||
|
||||
// ✗ Bad: Rely on CSS classes that may change
|
||||
const topic = await page.locator('.MuiTreeItem-label')
|
||||
```
|
||||
|
||||
#### 6. Verify Multiple Aspects
|
||||
Test should verify both state and UI:
|
||||
|
||||
```typescript
|
||||
// Verify the action completed
|
||||
const isVisible = await disconnectButton.isVisible()
|
||||
expect(isVisible).to.be.true
|
||||
|
||||
// Capture screenshot for visual verification
|
||||
await page.screenshot({ path: 'test-screenshot-connection.png' })
|
||||
```
|
||||
|
||||
#### 7. Handle MQTT Asynchronous Nature
|
||||
Account for message propagation time:
|
||||
|
||||
```typescript
|
||||
// Publish message
|
||||
await mockClient.publish('topic/name', 'value')
|
||||
|
||||
// Wait for UI to update
|
||||
await page.locator(`text="value"`).waitFor({ timeout: 5000 })
|
||||
|
||||
// Verify state
|
||||
const value = await page.textContent('.message-value')
|
||||
expect(value).toBe('value')
|
||||
```
|
||||
|
||||
### Handling MQTT Asynchronous Operations
|
||||
|
||||
MQTT is inherently asynchronous. When writing tests:
|
||||
|
||||
- **Wait for message propagation**: Use proper wait strategies (e.g., `await page.waitForSelector()`, `await sleep()`)
|
||||
- **Don't assume immediate updates**: Messages take time to send, receive, and update the UI
|
||||
- **Use event-based waiting**: Wait for specific UI elements or state changes rather than fixed timeouts when possible
|
||||
- **Account for network latency**: MQTT broker communication involves network round trips
|
||||
|
||||
### Example Test Pattern
|
||||
|
||||
```typescript
|
||||
// 1. Perform action (e.g., publish message)
|
||||
await publishMessage(topic, payload)
|
||||
|
||||
// 2. Wait for UI to update (not just arbitrary sleep)
|
||||
await page.waitForSelector(`text="${expectedValue}"`, { timeout: 5000 })
|
||||
|
||||
// 3. Verify state
|
||||
const value = await page.textContent('.message-value')
|
||||
expect(value).toBe(expectedValue)
|
||||
|
||||
// 4. Take screenshot for verification
|
||||
await page.screenshot({ path: 'test-result.png' })
|
||||
```
|
||||
|
||||
### Running Tests
|
||||
|
||||
```bash
|
||||
# Run all tests
|
||||
yarn test
|
||||
|
||||
# Run specific test suites
|
||||
yarn test:app
|
||||
yarn test:backend
|
||||
yarn test:mcp
|
||||
|
||||
# Run linters
|
||||
yarn lint
|
||||
yarn lint:fix
|
||||
```
|
||||
|
||||
### Running UI Tests (yarn test:ui)
|
||||
|
||||
The UI tests require specific setup in the test environment:
|
||||
|
||||
**Prerequisites:**
|
||||
1. **Xvfb (X Virtual Framebuffer)** - Required for headless Electron testing
|
||||
```bash
|
||||
# Start Xvfb on display :99
|
||||
Xvfb :99 -screen 0 1024x720x24 -ac &
|
||||
export DISPLAY=:99
|
||||
```
|
||||
|
||||
2. **Mosquitto MQTT Broker** - Required for MQTT message testing
|
||||
```bash
|
||||
# Install mosquitto
|
||||
sudo apt-get install -y mosquitto mosquitto-clients
|
||||
|
||||
# Start mosquitto service
|
||||
sudo systemctl start mosquitto
|
||||
|
||||
# Verify it's running on port 1883
|
||||
sudo systemctl status mosquitto
|
||||
```
|
||||
|
||||
3. **@types/node** - Required for TypeScript compilation
|
||||
```bash
|
||||
yarn add -D @types/node
|
||||
```
|
||||
|
||||
**Running UI Tests:**
|
||||
```bash
|
||||
# Build the application first
|
||||
yarn build
|
||||
|
||||
# Run UI tests with proper display
|
||||
DISPLAY=:99 yarn test:ui
|
||||
```
|
||||
|
||||
**Common Issues:**
|
||||
- **"Timeout exceeded" in before hook**: Mosquitto is not running or not accessible on port 1883
|
||||
- **"Cannot find type definition file for 'node'"**: Run `yarn add -D @types/node`
|
||||
- **Electron fails to launch**: Xvfb is not running or DISPLAY variable not set
|
||||
- **Tests hang**: Check if old Electron/mosquitto processes are still running and kill them
|
||||
|
||||
**Environment Cleanup:**
|
||||
```bash
|
||||
# Kill old Electron processes
|
||||
ps aux | grep electron | grep -v grep | awk '{print $2}' | xargs kill -9 2>/dev/null
|
||||
|
||||
# Kill old mosquitto processes (if running custom instance)
|
||||
ps aux | grep mosquitto | grep -v grep | awk '{print $2}' | xargs kill -9 2>/dev/null
|
||||
```
|
||||
|
||||
## MCP Introspection Testing
|
||||
|
||||
The project supports MCP (Model Context Protocol) for automated testing with Playwright:
|
||||
|
||||
- Use `yarn test:mcp` to run automated UI tests
|
||||
- Tests launch the app with remote debugging enabled on port 9222
|
||||
- Connect to `http://localhost:9222` via Chrome DevTools Protocol
|
||||
|
||||
## Project Structure
|
||||
|
||||
- `app/` - Frontend React application
|
||||
- `backend/` - Backend models, tests, and connection management
|
||||
- `src/` - Electron main process and bindings
|
||||
- `src/spec/` - Test specifications including MCP introspection tests
|
||||
|
||||
## Code Style and Formatting
|
||||
|
||||
### Linting
|
||||
|
||||
The project uses TSLint with Airbnb config and Prettier for code formatting:
|
||||
|
||||
```bash
|
||||
# Run all linters
|
||||
yarn lint
|
||||
|
||||
# Run linters individually
|
||||
yarn lint:prettier # Check Prettier formatting
|
||||
yarn lint:tslint # Check TSLint rules
|
||||
yarn lint:spellcheck # Check spelling in code
|
||||
|
||||
# Auto-fix issues
|
||||
yarn lint:fix # Fix TSLint and Prettier issues
|
||||
yarn lint:tslint:fix # Fix TSLint issues only
|
||||
yarn lint:prettier:fix # Fix Prettier issues only
|
||||
```
|
||||
|
||||
### Code Style Rules
|
||||
|
||||
- **Semicolons**: Never use semicolons (enforced by TSLint and Prettier)
|
||||
- **Quotes**: Single quotes for strings
|
||||
- **Indentation**: 2 spaces
|
||||
- **Line length**: Maximum 120 characters (Prettier) / 200 characters (TSLint)
|
||||
- **Arrow functions**: No parentheses for single parameters (`x => x + 1`)
|
||||
- **Trailing commas**: Required for multiline objects and arrays (ES5 compatible)
|
||||
|
||||
### TypeScript Guidelines
|
||||
|
||||
- Enable strict null checks and no implicit any
|
||||
- Use TypeScript interfaces for data structures
|
||||
- Prefer `const` over `let`, avoid `var`
|
||||
- Use type inference when possible, explicit types when clarity is needed
|
||||
|
||||
## Dependency Management
|
||||
|
||||
### Adding Dependencies
|
||||
|
||||
```bash
|
||||
# Add to root project
|
||||
yarn add <package-name>
|
||||
|
||||
# Add to app (frontend)
|
||||
cd app && yarn add <package-name>
|
||||
|
||||
# Add to backend
|
||||
cd backend && yarn add <package-name>
|
||||
|
||||
# Add dev dependencies
|
||||
yarn add -D <package-name>
|
||||
```
|
||||
|
||||
### Important Dependency Notes
|
||||
|
||||
- Main dependencies are in the root `package.json`
|
||||
- Frontend React app has its own dependencies in `app/package.json`
|
||||
- Backend models and logic have dependencies in `backend/package.json`
|
||||
- Always use `--frozen-lockfile` in CI to ensure reproducible builds
|
||||
- Run `yarn install` after pulling changes that modify `yarn.lock`
|
||||
|
||||
## Debugging
|
||||
|
||||
### Development Mode
|
||||
|
||||
```bash
|
||||
# Start with hot reload for frontend
|
||||
yarn dev
|
||||
|
||||
# This runs two processes in parallel:
|
||||
# 1. webpack-dev-server for the React app (port varies)
|
||||
# 2. Electron in development mode with the --development flag
|
||||
```
|
||||
|
||||
### Debugging TypeScript
|
||||
|
||||
- Source maps are enabled in `tsconfig.json`
|
||||
- Use `ts-node` for running TypeScript files directly
|
||||
- Backend tests can be debugged with: `cd backend && yarn test-inspect`
|
||||
|
||||
### Common Issues
|
||||
|
||||
- **Build fails**: Clear `dist/` and `app/build/` directories, then rebuild
|
||||
- **Electron won't start**: Ensure `yarn build` completed successfully
|
||||
- **Tests fail**: Check if MQTT broker (mosquitto) is running for integration tests
|
||||
- **UI not updating**: In dev mode, ensure webpack-dev-server is running
|
||||
|
||||
## Deployment and Packaging
|
||||
|
||||
### Creating Releases
|
||||
|
||||
```bash
|
||||
# Prepare release (updates version, changelog)
|
||||
yarn prepare-release
|
||||
|
||||
# Package the application for distribution
|
||||
yarn package
|
||||
|
||||
# Package with Docker (for consistent builds)
|
||||
yarn package-with-docker
|
||||
```
|
||||
|
||||
### Release Workflow
|
||||
|
||||
- **Beta releases**: Create PR to `beta` branch with "feat:" or "fix:" commits
|
||||
- **Production releases**: Create PR to `release` branch with "feat:" or "fix:" commits
|
||||
- Semantic release automatically handles versioning and changelog
|
||||
- Builds are created for Windows, macOS, and Linux
|
||||
|
||||
### Build Artifacts
|
||||
|
||||
- Output directory: `build/`
|
||||
- Supported formats: DMG (macOS), EXE/NSIS (Windows), AppImage/Snap (Linux), AppX (Windows Store)
|
||||
- Code signing is configured via `res/` directory certificates and provisioning profiles
|
||||
|
||||
## Important Notes
|
||||
|
||||
- Always run `yarn build` before starting the application
|
||||
- The app uses Electron (see `package.json` for version)
|
||||
- MQTT communication is handled via [mqttjs](https://github.com/mqttjs/MQTT.js)
|
||||
- All code changes should pass linting (`yarn lint`)
|
||||
- Node.js version requirement: >= 20
|
||||
- The project uses workspace-like structure with separate package.json files for app and backend
|
||||
@@ -0,0 +1,39 @@
|
||||
name: Copilot Agent Setup
|
||||
|
||||
on:
|
||||
workflow_call:
|
||||
|
||||
jobs:
|
||||
setup:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '20'
|
||||
|
||||
- name: Get yarn cache directory path
|
||||
id: yarn-cache-dir-path
|
||||
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Cache yarn dependencies
|
||||
uses: actions/cache@v4
|
||||
id: yarn-cache
|
||||
with:
|
||||
path: |
|
||||
${{ steps.yarn-cache-dir-path.outputs.dir }}
|
||||
node_modules
|
||||
app/node_modules
|
||||
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-yarn-
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn install --frozen-lockfile
|
||||
|
||||
- name: Build project
|
||||
run: yarn build
|
||||
@@ -18,7 +18,46 @@ jobs:
|
||||
run: yarn build
|
||||
- name: Test
|
||||
run: yarn test
|
||||
- name: UI-Test
|
||||
|
||||
ui-tests:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: ghcr.io/thomasnordquist/mqtt-explorer-ui-tests:latest
|
||||
volumes:
|
||||
- ./:/app
|
||||
options: --user root
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install Packages
|
||||
run: yarn install --frozen-lockfile
|
||||
- name: Build
|
||||
run: yarn build
|
||||
- name: Run UI Tests
|
||||
timeout-minutes: 10
|
||||
run: ./scripts/runUiTests.sh
|
||||
- name: Upload Test Screenshots
|
||||
if: always()
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ui-test-screenshots
|
||||
path: |
|
||||
test-screenshot-*.png
|
||||
retention-days: 30
|
||||
|
||||
demo-video:
|
||||
runs-on: ubuntu-latest
|
||||
container:
|
||||
image: ghcr.io/thomasnordquist/mqtt-explorer-ui-tests:latest
|
||||
volumes:
|
||||
- ./:/app
|
||||
options: --user root
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Install Packages
|
||||
run: yarn install --frozen-lockfile
|
||||
- name: Build
|
||||
run: yarn build
|
||||
- name: Generate Demo Video
|
||||
run: yarn ui-test
|
||||
- name: Post-processing
|
||||
run: ./scripts/prepareVideo.sh
|
||||
@@ -35,4 +74,54 @@ jobs:
|
||||
- name: Show URL
|
||||
run: echo '${{ steps.upload.outputs.file-url }}'
|
||||
id: artifact-upload-step
|
||||
- run: echo '' >> $GITHUB_STEP_SUMMARY
|
||||
- run: echo '<picture><img src="${{ steps.upload.outputs.file-url }}"></picture>' >> $GITHUB_STEP_SUMMARY
|
||||
|
||||
test-browser:
|
||||
runs-on: ubuntu-latest
|
||||
services:
|
||||
mosquitto:
|
||||
image: eclipse-mosquitto:2
|
||||
ports:
|
||||
- 1883:1883
|
||||
options: >-
|
||||
--health-cmd "mosquitto_sub -t '$SYS/#' -C 1"
|
||||
--health-interval 10s
|
||||
--health-timeout 5s
|
||||
--health-retries 5
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '20'
|
||||
- name: Install Dependencies
|
||||
run: yarn install --frozen-lockfile
|
||||
- name: Build Browser Mode
|
||||
run: yarn build:server
|
||||
- name: Test App
|
||||
run: yarn test:app
|
||||
- name: Test Backend
|
||||
run: yarn test:backend
|
||||
- name: Start Server in Background
|
||||
run: |
|
||||
yarn start:server &
|
||||
echo $! > server.pid
|
||||
env:
|
||||
MQTT_EXPLORER_USERNAME: test
|
||||
MQTT_EXPLORER_PASSWORD: test123
|
||||
PORT: 3000
|
||||
- name: Wait for Server
|
||||
run: |
|
||||
timeout 30 bash -c 'until curl -f http://localhost:3000; do sleep 1; done'
|
||||
- name: Browser Smoke Test
|
||||
run: |
|
||||
# Test server is running
|
||||
curl -f http://localhost:3000 || exit 1
|
||||
echo "Browser mode server is running successfully"
|
||||
- name: Stop Server
|
||||
if: always()
|
||||
run: |
|
||||
if [ -f server.pid ]; then
|
||||
kill $(cat server.pid) || true
|
||||
rm server.pid
|
||||
fi
|
||||
|
||||
@@ -9,3 +9,11 @@ test.png
|
||||
.awcache
|
||||
.scannerwork
|
||||
screen*.png
|
||||
|
||||
# MCP introspection artifacts
|
||||
mqtt-explorer-mcp-screenshot.png
|
||||
screenshot-mcp-*.png
|
||||
test-mcp-introspection.js
|
||||
|
||||
/data
|
||||
test-screenshot-*.png
|
||||
|
||||
+193
@@ -0,0 +1,193 @@
|
||||
# Browser Mode Documentation
|
||||
|
||||
MQTT Explorer now supports running as a web application served by a Node.js server, in addition to the existing Electron desktop app.
|
||||
|
||||
## Running in Browser Mode
|
||||
|
||||
### Quick Start
|
||||
|
||||
1. Build the application for browser mode:
|
||||
```bash
|
||||
yarn build:server
|
||||
```
|
||||
|
||||
2. Start the server:
|
||||
```bash
|
||||
yarn start:server
|
||||
```
|
||||
|
||||
3. Open your browser and navigate to `http://localhost:3000`
|
||||
|
||||
4. You'll be prompted to log in with credentials that were generated on server startup.
|
||||
|
||||
### Development Mode
|
||||
|
||||
To run in development mode with hot reload:
|
||||
|
||||
```bash
|
||||
yarn dev:server
|
||||
```
|
||||
|
||||
This starts both the webpack dev server and the backend server.
|
||||
|
||||
## Authentication
|
||||
|
||||
### Environment Variables
|
||||
|
||||
You can set custom authentication credentials using environment variables:
|
||||
|
||||
```bash
|
||||
export MQTT_EXPLORER_USERNAME=admin
|
||||
export MQTT_EXPLORER_PASSWORD=secretpassword
|
||||
yarn start:server
|
||||
```
|
||||
|
||||
### Generated Credentials
|
||||
|
||||
If no environment variables are set, the server will generate credentials on first startup and save them to `data/credentials.json`. The generated credentials will be printed to the console:
|
||||
|
||||
```
|
||||
============================================================
|
||||
Generated new credentials:
|
||||
Username: user-abc123
|
||||
Password: 123e4567-e89b-12d3-a456-426614174000
|
||||
============================================================
|
||||
Please save these credentials. They will be persisted to:
|
||||
/path/to/data/credentials.json
|
||||
============================================================
|
||||
```
|
||||
|
||||
## Features
|
||||
|
||||
### Certificate Upload
|
||||
|
||||
In browser mode, certificate files are uploaded directly through the browser using the HTML5 File API. The certificates are:
|
||||
- Read client-side as base64
|
||||
- Stored in the connection configuration
|
||||
- Used when establishing MQTT connections
|
||||
|
||||
### Data Storage
|
||||
|
||||
In browser mode, all data is stored on the server:
|
||||
- Credentials: `data/credentials.json`
|
||||
- Uploaded certificates: `data/certificates/`
|
||||
- File uploads: `data/uploads/`
|
||||
|
||||
### Port Configuration
|
||||
|
||||
The default port is 3000. You can change it using the `PORT` environment variable:
|
||||
|
||||
```bash
|
||||
PORT=8080 yarn start:server
|
||||
```
|
||||
|
||||
## Architecture
|
||||
|
||||
### Client-Server Communication
|
||||
|
||||
- **Electron Mode**: Uses Electron IPC for communication between renderer and main process
|
||||
- **Browser Mode**: Uses Socket.io WebSockets for real-time communication between browser and server
|
||||
|
||||
The application automatically detects the environment and uses the appropriate transport layer.
|
||||
|
||||
### Event Bus Abstraction
|
||||
|
||||
Both Electron IPC and Socket.io implement the same `EventBusInterface`, allowing the application code to work seamlessly in both modes without modification.
|
||||
|
||||
## Differences from Electron Mode
|
||||
|
||||
### Browser Mode Limitations
|
||||
|
||||
1. **File System Access**: Limited to server-side operations
|
||||
2. **Native Dialogs**: File selection uses browser file input instead of native dialogs
|
||||
3. **Auto-Updates**: Not available in browser mode
|
||||
4. **Tray Icon**: Not available in browser mode
|
||||
|
||||
### Browser Mode Advantages
|
||||
|
||||
1. **No Installation**: Access from any browser
|
||||
2. **Cross-Platform**: Works on any device with a modern browser
|
||||
3. **Remote Access**: Can be deployed on a server for remote access
|
||||
4. **Multi-User**: Can support authentication for multiple users
|
||||
|
||||
## Security Considerations
|
||||
|
||||
1. **HTTPS**: For production, always use HTTPS to encrypt credentials and MQTT data
|
||||
2. **Authentication**: Keep credentials secure and rotate them regularly
|
||||
3. **Network**: Ensure the server is on a trusted network or behind a firewall
|
||||
4. **Environment Variables**: Use environment variables for production credentials, not the generated ones
|
||||
|
||||
## Deployment
|
||||
|
||||
For production deployment:
|
||||
|
||||
1. Build the application:
|
||||
```bash
|
||||
yarn build:server
|
||||
```
|
||||
|
||||
2. Set environment variables:
|
||||
```bash
|
||||
export MQTT_EXPLORER_USERNAME=your_username
|
||||
export MQTT_EXPLORER_PASSWORD=your_secure_password
|
||||
export PORT=3000
|
||||
```
|
||||
|
||||
3. Start the server:
|
||||
```bash
|
||||
yarn start:server
|
||||
```
|
||||
|
||||
4. Use a reverse proxy (nginx, Apache) to add HTTPS and additional security features
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### Debugging
|
||||
|
||||
Enable detailed Socket.IO connection and lifecycle debugging:
|
||||
|
||||
```bash
|
||||
DEBUG=mqtt-explorer:socketio* yarn start:server
|
||||
```
|
||||
|
||||
Available debug namespaces:
|
||||
- `mqtt-explorer:socketio` - General Socket.IO events and metrics
|
||||
- `mqtt-explorer:socketio:connect` - Client connection events
|
||||
- `mqtt-explorer:socketio:disconnect` - Client disconnection and cleanup
|
||||
- `mqtt-explorer:socketio:subscriptions` - Subscription lifecycle tracking
|
||||
- `mqtt-explorer:socketio:connections` - MQTT connection ownership
|
||||
|
||||
This will log:
|
||||
- Client connect/disconnect events
|
||||
- Subscription counts per socket
|
||||
- MQTT connection ownership tracking
|
||||
- Memory leak detection metrics (subscriptions, handlers, connections)
|
||||
|
||||
Example output:
|
||||
```
|
||||
mqtt-explorer:socketio:connect Client connected: abc123de
|
||||
mqtt-explorer:socketio [connect] clients=1 subscriptions=8 mqttConns=0 | socket[abc123de]: subs=8 conns=0
|
||||
mqtt-explorer:socketio:connections Connection my-mqtt owned by socket abc123de (total: 1)
|
||||
mqtt-explorer:socketio:disconnect Client disconnected: abc123de
|
||||
mqtt-explorer:socketio:subscriptions Removed 8 subscriptions for socket abc123de
|
||||
mqtt-explorer:socketio [disconnect] clients=0 subscriptions=0 mqttConns=0 | socket[abc123de]: subs=0 conns=0
|
||||
```
|
||||
|
||||
### Authentication Fails
|
||||
|
||||
1. Check the console output for the generated credentials
|
||||
2. Clear browser session storage: `sessionStorage.clear()` in browser console
|
||||
3. Restart the server to regenerate credentials
|
||||
|
||||
### Connection Issues
|
||||
|
||||
1. Check that the server is running: `http://localhost:3000`
|
||||
2. Check browser console for Socket.io connection errors
|
||||
3. Verify firewall rules allow the port
|
||||
|
||||
### Certificate Upload Issues
|
||||
|
||||
In browser mode, certificates are handled differently:
|
||||
- Use the file upload button to select certificate files
|
||||
- Files are read and encoded client-side
|
||||
- Large certificate files (>16KB) will be rejected
|
||||
@@ -0,0 +1,149 @@
|
||||
# CI/CD Pipeline Documentation
|
||||
|
||||
## Overview
|
||||
|
||||
MQTT Explorer uses GitHub Actions for continuous integration and testing. The pipeline tests both Electron (desktop) and browser modes.
|
||||
|
||||
## Workflows
|
||||
|
||||
### Test Workflow (`.github/workflows/tests.yml`)
|
||||
|
||||
This workflow runs on pull requests to `master`, `beta`, and `release` branches.
|
||||
|
||||
#### Jobs
|
||||
|
||||
##### 1. `test` - Electron Mode Tests
|
||||
|
||||
Tests the traditional Electron desktop application:
|
||||
|
||||
- **Environment**: Custom Docker container (`ghcr.io/thomasnordquist/mqtt-explorer-ui-tests:latest`)
|
||||
- **Steps**:
|
||||
1. Install dependencies with frozen lockfile
|
||||
2. Build the Electron application
|
||||
3. Run unit tests (app + backend)
|
||||
4. Run UI tests with video recording
|
||||
5. Upload test video to S3
|
||||
6. Display test results in GitHub summary
|
||||
|
||||
**Artifacts**: UI test video (GIF format) uploaded to S3
|
||||
|
||||
##### 2. `test-browser` - Browser Mode Tests
|
||||
|
||||
Tests the new browser/server mode:
|
||||
|
||||
- **Environment**: Ubuntu latest with Node.js 20
|
||||
- **Services**:
|
||||
- **Mosquitto MQTT Broker**: Eclipse Mosquitto v2 on port 1883
|
||||
- Health checks enabled
|
||||
- Anonymous connections allowed
|
||||
- **Steps**:
|
||||
1. Setup Node.js 20
|
||||
2. Install dependencies
|
||||
3. Build browser mode (`yarn build:server`)
|
||||
4. Run unit tests (app + backend)
|
||||
5. Start server in background with test credentials
|
||||
6. Wait for server to be ready
|
||||
7. Run browser smoke tests
|
||||
8. Clean up server process
|
||||
|
||||
**Environment Variables**:
|
||||
- `MQTT_EXPLORER_USERNAME=test`
|
||||
- `MQTT_EXPLORER_PASSWORD=test123`
|
||||
- `PORT=3000`
|
||||
|
||||
## Test Commands
|
||||
|
||||
The following npm scripts are used in CI/CD:
|
||||
|
||||
```bash
|
||||
# Unit tests
|
||||
yarn test # Run all tests (app + backend)
|
||||
yarn test:app # Frontend tests only
|
||||
yarn test:backend # Backend tests only
|
||||
|
||||
# Build
|
||||
yarn build # Build Electron mode
|
||||
yarn build:server # Build browser mode
|
||||
|
||||
# UI Tests (Electron only)
|
||||
yarn ui-test # Run UI tests with video recording
|
||||
```
|
||||
|
||||
## Adding New Tests
|
||||
|
||||
### For Electron Mode
|
||||
|
||||
Add tests to the `test` job. UI tests should be added to the test suite that `yarn ui-test` runs.
|
||||
|
||||
### For Browser Mode
|
||||
|
||||
Browser-specific tests should:
|
||||
1. Use the pre-configured Mosquitto service
|
||||
2. Connect to `mqtt://mosquitto:1883`
|
||||
3. Test server endpoints at `http://localhost:3000`
|
||||
|
||||
Example:
|
||||
```yaml
|
||||
- name: Browser Integration Test
|
||||
run: |
|
||||
# Test MQTT connection through server
|
||||
curl -X POST http://localhost:3000/api/test
|
||||
```
|
||||
|
||||
## Local Testing
|
||||
|
||||
### Electron Mode
|
||||
|
||||
```bash
|
||||
yarn build
|
||||
yarn test
|
||||
yarn ui-test
|
||||
```
|
||||
|
||||
### Browser Mode
|
||||
|
||||
```bash
|
||||
# Start Mosquitto in Docker
|
||||
docker run -d -p 1883:1883 eclipse-mosquitto:2
|
||||
|
||||
# Build and test
|
||||
yarn build:server
|
||||
yarn test
|
||||
|
||||
# Start server
|
||||
MQTT_EXPLORER_USERNAME=test MQTT_EXPLORER_PASSWORD=test123 yarn start:server
|
||||
|
||||
# Run manual tests
|
||||
curl http://localhost:3000
|
||||
```
|
||||
|
||||
## GitHub Codespaces / Devcontainer
|
||||
|
||||
The repository includes a devcontainer configuration that automatically sets up:
|
||||
- Node.js 20
|
||||
- MQTT broker (Mosquitto)
|
||||
- All development dependencies
|
||||
- Port forwarding for development
|
||||
|
||||
See [.devcontainer/README.md](.devcontainer/README.md) for details.
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### Browser Tests Failing
|
||||
|
||||
1. **Server won't start**: Check if port 3000 is already in use
|
||||
2. **MQTT connection fails**: Ensure Mosquitto service is healthy
|
||||
3. **Timeout errors**: Increase timeout in "Wait for Server" step
|
||||
|
||||
### Electron Tests Failing
|
||||
|
||||
1. **UI tests timeout**: Check if the Docker container has display access
|
||||
2. **Build fails**: Verify all dependencies are in yarn.lock
|
||||
|
||||
## Future Improvements
|
||||
|
||||
- [ ] Add E2E browser tests with Playwright
|
||||
- [ ] Test WebSocket connections in browser mode
|
||||
- [ ] Add performance benchmarks
|
||||
- [ ] Test with different MQTT broker versions
|
||||
- [ ] Add security scanning for browser mode
|
||||
+39
-24
@@ -1,10 +1,10 @@
|
||||
## creative commons
|
||||
When redistributing, the attribution page may not be altered or made less accessible without explicit approval.
|
||||
|
||||
# Attribution-NoDerivatives 4.0 International
|
||||
# Creative Commons Attribution-ShareAlike 4.0 International
|
||||
|
||||
Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
|
||||
|
||||
### Using Creative Commons Public Licenses
|
||||
**Using Creative Commons Public Licenses**
|
||||
|
||||
Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
|
||||
|
||||
@@ -12,31 +12,37 @@ Creative Commons public licenses provide a standard set of terms and conditions
|
||||
|
||||
* __Considerations for the public:__ By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. [More considerations for the public](http://wiki.creativecommons.org/Considerations_for_licensors_and_licensees#Considerations_for_licensees).
|
||||
|
||||
## Creative Commons Attribution-NoDerivatives 4.0 International Public License
|
||||
## Creative Commons Attribution-ShareAlike 4.0 International Public License
|
||||
|
||||
By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NoDerivatives 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
|
||||
By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
|
||||
|
||||
### Section 1 – Definitions.
|
||||
|
||||
a. __Adapted Material__ means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
|
||||
|
||||
b. __Copyright and Similar Rights__ means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
|
||||
b. __Adapter's License__ means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
|
||||
|
||||
c. __Effective Technological Measures__ means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
|
||||
c. __BY-SA Compatible License__ means a license listed at [creativecommons.org/compatiblelicenses](http://creativecommons.org/compatiblelicenses), approved by Creative Commons as essentially the equivalent of this Public License.
|
||||
|
||||
d. __Exceptions and Limitations__ means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
|
||||
d. __Copyright and Similar Rights__ means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
|
||||
|
||||
e. __Licensed Material__ means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
|
||||
e. __Effective Technological Measures__ means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
|
||||
|
||||
f. __Licensed Rights__ means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
|
||||
f. __Exceptions and Limitations__ means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
|
||||
|
||||
g. __Licensor__ means the individual(s) or entity(ies) granting rights under this Public License.
|
||||
g. __License Elements__ means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.
|
||||
|
||||
h. __Share__ means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
|
||||
h. __Licensed Material__ means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
|
||||
|
||||
i. __Sui Generis Database Rights__ means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
|
||||
i. __Licensed Rights__ means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
|
||||
|
||||
j. __You__ means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
|
||||
j. __Licensor__ means the individual(s) or entity(ies) granting rights under this Public License.
|
||||
|
||||
k. __Share__ means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
|
||||
|
||||
l. __Sui Generis Database Rights__ means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
|
||||
|
||||
m. __You__ means the individual or entity exercising the Licensed Rights under this Public License. __Your__ has a corresponding meaning.
|
||||
|
||||
### Section 2 – Scope.
|
||||
|
||||
@@ -46,7 +52,7 @@ a. ___License grant.___
|
||||
|
||||
A. reproduce and Share the Licensed Material, in whole or in part; and
|
||||
|
||||
B. produce and reproduce, but not Share, Adapted Material.
|
||||
B. produce, reproduce, and Share Adapted Material.
|
||||
|
||||
2. __Exceptions and Limitations.__ For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
|
||||
|
||||
@@ -58,7 +64,9 @@ a. ___License grant.___
|
||||
|
||||
A. __Offer from the Licensor – Licensed Material.__ Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
|
||||
|
||||
B. __No downstream restrictions.__ You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
|
||||
B. __Additional offer from the Licensor – Adapted Material.__ Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.
|
||||
|
||||
C. __No downstream restrictions.__ You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
|
||||
|
||||
6. __No endorsement.__ Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
|
||||
|
||||
@@ -76,7 +84,7 @@ Your exercise of the Licensed Rights is expressly made subject to the following
|
||||
|
||||
a. ___Attribution.___
|
||||
|
||||
1. If You Share the Licensed Material, You must:
|
||||
1. If You Share the Licensed Material (including in modified form), You must:
|
||||
|
||||
A. retain the following if it is supplied by the Licensor with the Licensed Material:
|
||||
|
||||
@@ -94,19 +102,27 @@ a. ___Attribution.___
|
||||
|
||||
C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
|
||||
|
||||
For the avoidance of doubt, You do not have permission under this Public License to Share Adapted Material.
|
||||
|
||||
2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
|
||||
|
||||
3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
|
||||
|
||||
b. ___ShareAlike.___
|
||||
|
||||
In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
|
||||
|
||||
1. The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.
|
||||
|
||||
2. You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
|
||||
|
||||
3. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
|
||||
|
||||
### Section 4 – Sui Generis Database Rights.
|
||||
|
||||
Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
|
||||
|
||||
a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database, provided You do not Share Adapted Material;
|
||||
a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;
|
||||
|
||||
b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and
|
||||
b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and
|
||||
|
||||
c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
|
||||
|
||||
@@ -152,7 +168,6 @@ c. No term or condition of this Public License will be waived and no failure to
|
||||
|
||||
d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
|
||||
|
||||
> Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at [creativecommons.org/policies](http://creativecommons.org/policies), Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
|
||||
> Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” The text of the Creative Commons public licenses is dedicated to the public domain under the [CC0 Public Domain Dedication](https://creativecommons.org/publicdomain/zero/1.0/legalcode). Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at [creativecommons.org/policies](http://creativecommons.org/policies), Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
|
||||
>
|
||||
> Creative Commons may be contacted at creativecommons.org
|
||||
|
||||
> Creative Commons may be contacted at creativecommons.org.
|
||||
|
||||
@@ -18,8 +18,22 @@ Downloads can be found at the link above.
|
||||
This page is dedicated to its development.
|
||||
Pull-Requests and error reports are welcome.
|
||||
|
||||
## Quick Start with GitHub Codespaces
|
||||
|
||||
The fastest way to start developing is with GitHub Codespaces:
|
||||
|
||||
1. Click the green "Code" button above
|
||||
2. Select "Codespaces" tab
|
||||
3. Click "Create codespace on [branch]"
|
||||
4. Wait for the environment to set up (includes Node.js and MQTT broker)
|
||||
5. Run `yarn dev:server` to start development
|
||||
|
||||
The devcontainer includes a pre-configured MQTT broker and all development tools. See [.devcontainer/README.md](.devcontainer/README.md) for details.
|
||||
|
||||
## Run from sources
|
||||
|
||||
### Desktop Application (Electron)
|
||||
|
||||
```bash
|
||||
npm install -g yarn
|
||||
yarn
|
||||
@@ -27,8 +41,23 @@ yarn build
|
||||
yarn start
|
||||
```
|
||||
|
||||
### Browser Mode (Web Application)
|
||||
|
||||
MQTT Explorer can also run as a web application served by a Node.js server:
|
||||
|
||||
```bash
|
||||
npm install -g yarn
|
||||
yarn
|
||||
yarn build:server
|
||||
yarn start:server
|
||||
```
|
||||
|
||||
Then open your browser to `http://localhost:3000`. For more details, see [BROWSER_MODE.md](BROWSER_MODE.md).
|
||||
|
||||
## Develop
|
||||
|
||||
### Desktop Application
|
||||
|
||||
Launch Application
|
||||
|
||||
```bash
|
||||
@@ -37,32 +66,49 @@ yarn
|
||||
yarn dev
|
||||
```
|
||||
|
||||
### Browser Mode
|
||||
|
||||
Launch in development mode with hot reload:
|
||||
|
||||
```bash
|
||||
npm install -g yarn
|
||||
yarn
|
||||
yarn dev:server
|
||||
```
|
||||
|
||||
The `app` directory contains all the rendering logic, the `backend` directory currently contains the models, tests, connection management, `src` contains all the electron bindings. [mqttjs](https://github.com/mqttjs/MQTT.js) is used to facilitate communication to MQTT brokers.
|
||||
|
||||
## Automated Tests
|
||||
|
||||
To achieve a reliable product automated tests run regularly on travis.
|
||||
To achieve a reliable product automated tests run regularly on CI.
|
||||
|
||||
- Data model
|
||||
- MQTT integration
|
||||
- UI-Tests (The demo is a recorded ui test)
|
||||
- **Data model tests**: `yarn test:backend`
|
||||
- **App tests**: `yarn test:app`
|
||||
- **UI test suite**: `yarn test:ui` (independent, deterministic tests)
|
||||
- **Demo video**: `yarn ui-test` (UI test recording for documentation)
|
||||
|
||||
## Run UI-tests
|
||||
### Run UI Test Suite
|
||||
|
||||
A [mosquitto](https://mosquitto.org/) MQTT broker is required to run the ui-tests.
|
||||
|
||||
Run tests with
|
||||
The UI test suite validates core functionality through automated browser tests. Each test is independent and deterministic.
|
||||
|
||||
```bash
|
||||
# Run chromedriver in a separate terminal session
|
||||
./node_modules/.bin/chromedriver --url-base=wd/hub --port=9515 --verbose
|
||||
# Run with automated setup (recommended)
|
||||
./scripts/runUiTests.sh
|
||||
|
||||
# Or run directly (requires manual MQTT broker setup)
|
||||
yarn build
|
||||
yarn test:ui
|
||||
```
|
||||
|
||||
Compile and execute tests
|
||||
See [docs/UI-TEST-SUITE.md](docs/UI-TEST-SUITE.md) for more details.
|
||||
|
||||
### Run Demo Video Generation
|
||||
|
||||
A [mosquitto](https://mosquitto.org/) MQTT broker is required to generate the demo video.
|
||||
|
||||
```bash
|
||||
npm run build
|
||||
node dist/src/spec/webdriverio.js
|
||||
yarn build
|
||||
yarn ui-test
|
||||
```
|
||||
|
||||
## Create a release
|
||||
@@ -99,7 +145,7 @@ The readme will be generated from the docs.
|
||||
|
||||
## License
|
||||
|
||||

|
||||
[CC-BY-ND 4.0](https://creativecommons.org/licenses/by-nd/4.0/)
|
||||

|
||||
[CC-BY-Nc 4.0](https://creativecommons.org/licenses/by-nC/4.0/)
|
||||
|
||||
The license is a little restrictive to distributing derived work, this may change in the future if the interest arises or more people work on this project.
|
||||
The license allows for anyone to adapt, share, and redistribute the material, as long as it is non-commercial.
|
||||
|
||||
+8
-7
@@ -10,7 +10,7 @@
|
||||
"mochatest": "mocha --require ts-node/register --require source-map-support/register --recursive src/*/**/*.spec.ts"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
"node": ">=20"
|
||||
},
|
||||
"author": "",
|
||||
"license": "CC-BY-ND-4.0",
|
||||
@@ -28,6 +28,7 @@
|
||||
"d3-shape": "^1.3.5",
|
||||
"diff": "^4.0.1",
|
||||
"dot-prop": "^5.0.0",
|
||||
"events": "^3.3.0",
|
||||
"get-value": "^3.0.1",
|
||||
"immutable": "^4.0.0-rc.12",
|
||||
"in-viewport": "^3.6.0",
|
||||
@@ -37,7 +38,9 @@
|
||||
"lodash.throttle": "^4.1.1",
|
||||
"moving-average": "^1.0.0",
|
||||
"number-abbreviate": "^2.0.0",
|
||||
"os-browserify": "^0.3.0",
|
||||
"parse-duration": "^0.1.1",
|
||||
"path-browserify": "^1.0.1",
|
||||
"prismjs": "^1.15.0",
|
||||
"react": "^16.11",
|
||||
"react-ace": "^8",
|
||||
@@ -47,12 +50,12 @@
|
||||
"react-split-pane": "^0.1.85",
|
||||
"react-transition-group": "^4",
|
||||
"react-vis": "^1.11.6",
|
||||
"react-window": "^1.8.10",
|
||||
"redux": "^4.0.1",
|
||||
"redux-batched-actions": "0.5",
|
||||
"redux-thunk": "^2.3.0",
|
||||
"sha1": "^1.1.1",
|
||||
"socket.io-client": "^2.2.0",
|
||||
"socket.io-client": "^4.8.1",
|
||||
"url": "^0.11.4",
|
||||
"uuid": "7"
|
||||
},
|
||||
"devDependencies": {
|
||||
@@ -66,10 +69,8 @@
|
||||
"@types/react-dom": "^16.0.11",
|
||||
"@types/react-redux": "^7.0.9",
|
||||
"@types/react-resize-detector": "^4.0.1",
|
||||
"@types/react-virtualized": "^9.21.30",
|
||||
"@types/react-window": "^1.8.8",
|
||||
"@types/sha1": "^1.1.1",
|
||||
"@types/socket.io-client": "^1.4.32",
|
||||
"@types/socket.io-client": "^3.0.0",
|
||||
"@types/uuid": "^7.0.2",
|
||||
"@types/vis": "^4.21.9",
|
||||
"chai": "^4.2.0",
|
||||
@@ -83,7 +84,7 @@
|
||||
"node-loader": "^0.6.0",
|
||||
"source-map-loader": "^0.2.4",
|
||||
"style-loader": "^1",
|
||||
"ts-loader": "^9.2.6",
|
||||
"ts-loader": "^9.5.1",
|
||||
"typescript": "^4.5.5",
|
||||
"webpack": "^5.91.0",
|
||||
"webpack-bundle-analyzer": "^4.5.0",
|
||||
|
||||
@@ -9,12 +9,11 @@ import {
|
||||
import { default as persistentStorage, StorageIdentifier } from '../utils/PersistentStorage'
|
||||
import { Dispatch } from 'redux'
|
||||
import { showError } from './Global'
|
||||
import { promises as fsPromise } from 'fs'
|
||||
import * as path from 'path'
|
||||
import { ActionTypes, Action } from '../reducers/ConnectionManager'
|
||||
import { Subscription } from '../../../backend/src/DataSource/MqttSource'
|
||||
import { connectionsMigrator } from './migrations/Connection'
|
||||
import { rendererRpc } from '../../../events'
|
||||
import { rendererRpc, readFromFile } from '../../../events'
|
||||
import { makeOpenDialogRpc } from '../../../events/OpenDialogRequest'
|
||||
|
||||
export interface ConnectionDictionary {
|
||||
@@ -81,7 +80,7 @@ async function openCertificate(): Promise<CertificateParameters> {
|
||||
throw rejectReasons.noCertificateSelected
|
||||
}
|
||||
|
||||
const data = await fsPromise.readFile(selectedFile)
|
||||
const data = await rendererRpc.call(readFromFile, { filePath: selectedFile })
|
||||
if (data.length > 16_384 || data.length < 64) {
|
||||
throw rejectReasons.certificateSizeDoesNotMatch
|
||||
}
|
||||
|
||||
@@ -2,7 +2,10 @@ import { Action, ActionTypes } from '../reducers/Publish'
|
||||
import { AppState } from '../reducers'
|
||||
import { Base64Message } from '../../../backend/src/Model/Base64Message'
|
||||
import { Dispatch } from 'redux'
|
||||
import { MqttMessage, makePublishEvent, rendererEvents } from '../../../events'
|
||||
import { MqttMessage, makePublishEvent, rendererEvents, rendererRpc, readFromFile } from '../../../events'
|
||||
import { makeOpenDialogRpc } from '../../../events/OpenDialogRequest'
|
||||
import { showError } from './Global'
|
||||
import { Base64 } from 'js-base64'
|
||||
|
||||
export const setTopic = (topic?: string): Action => {
|
||||
return {
|
||||
@@ -11,6 +14,50 @@ export const setTopic = (topic?: string): Action => {
|
||||
}
|
||||
}
|
||||
|
||||
export const openFile =
|
||||
(encoding: 'utf8' = 'utf8') =>
|
||||
async (dispatch: Dispatch<any>, getState: () => AppState) => {
|
||||
try {
|
||||
const file = await getFileContent(encoding)
|
||||
if (file) {
|
||||
dispatch(setPayload(file.data))
|
||||
}
|
||||
} catch (error) {
|
||||
dispatch(showError(error))
|
||||
}
|
||||
}
|
||||
|
||||
type FileParameters = {
|
||||
name: string
|
||||
data: string
|
||||
}
|
||||
async function getFileContent(encoding: string): Promise<FileParameters | undefined> {
|
||||
const rejectReasons = {
|
||||
noFileSelected: 'No file selected',
|
||||
errorReadingFile: 'Error reading file',
|
||||
}
|
||||
|
||||
const { canceled, filePaths } = await rendererRpc.call(makeOpenDialogRpc(), {
|
||||
properties: ['openFile'],
|
||||
securityScopedBookmarks: true,
|
||||
})
|
||||
|
||||
if (canceled) {
|
||||
return
|
||||
}
|
||||
|
||||
const selectedFile = filePaths[0]
|
||||
if (!selectedFile) {
|
||||
throw rejectReasons.noFileSelected
|
||||
}
|
||||
try {
|
||||
const data = await rendererRpc.call(readFromFile, { filePath: selectedFile, encoding })
|
||||
return { name: selectedFile, data: data.toString(encoding) }
|
||||
} catch (error) {
|
||||
throw rejectReasons.errorReadingFile
|
||||
}
|
||||
}
|
||||
|
||||
export const setPayload = (payload?: string): Action => {
|
||||
return {
|
||||
payload,
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
import * as React from 'react'
|
||||
import { LoginDialog } from './LoginDialog'
|
||||
|
||||
interface BrowserAuthWrapperProps {
|
||||
children: React.ReactNode
|
||||
}
|
||||
|
||||
const isBrowserMode =
|
||||
typeof window !== 'undefined' && (typeof process === 'undefined' || process.env?.BROWSER_MODE === 'true')
|
||||
|
||||
export function BrowserAuthWrapper(props: BrowserAuthWrapperProps) {
|
||||
const [isAuthenticated, setIsAuthenticated] = React.useState(false)
|
||||
const [loginError, setLoginError] = React.useState<string | undefined>()
|
||||
const [showLogin, setShowLogin] = React.useState(false)
|
||||
|
||||
React.useEffect(() => {
|
||||
if (!isBrowserMode) {
|
||||
// Not in browser mode, skip authentication
|
||||
setIsAuthenticated(true)
|
||||
return
|
||||
}
|
||||
|
||||
// Check if already authenticated
|
||||
const username = sessionStorage.getItem('mqtt-explorer-username')
|
||||
const password = sessionStorage.getItem('mqtt-explorer-password')
|
||||
|
||||
if (username && password) {
|
||||
// Try to use stored credentials
|
||||
setIsAuthenticated(true)
|
||||
} else {
|
||||
// Show login dialog
|
||||
setShowLogin(true)
|
||||
}
|
||||
}, [])
|
||||
|
||||
const handleLogin = async (username: string, password: string) => {
|
||||
try {
|
||||
// Store credentials in session storage
|
||||
sessionStorage.setItem('mqtt-explorer-username', username)
|
||||
sessionStorage.setItem('mqtt-explorer-password', password)
|
||||
|
||||
// The socket will use these credentials on next connection
|
||||
setIsAuthenticated(true)
|
||||
setShowLogin(false)
|
||||
setLoginError(undefined)
|
||||
|
||||
// Reload to reinitialize socket with new auth
|
||||
window.location.reload()
|
||||
} catch (error) {
|
||||
setLoginError('Login failed. Please check your credentials.')
|
||||
}
|
||||
}
|
||||
|
||||
if (!isBrowserMode) {
|
||||
// Not in browser mode, render children directly
|
||||
return <>{props.children}</>
|
||||
}
|
||||
|
||||
if (!isAuthenticated) {
|
||||
return <LoginDialog open={showLogin} onLogin={handleLogin} error={loginError} />
|
||||
}
|
||||
|
||||
return <>{props.children}</>
|
||||
}
|
||||
@@ -0,0 +1,140 @@
|
||||
import * as React from 'react'
|
||||
import ClearAdornment from '../helper/ClearAdornment'
|
||||
import Lock from '@material-ui/icons/Lock'
|
||||
import { bindActionCreators } from 'redux'
|
||||
import { Button, Theme, Tooltip, Typography } from '@material-ui/core'
|
||||
import { CertificateParameters, ConnectionOptions } from '../../model/ConnectionOptions'
|
||||
import { CertificateTypes } from '../../actions/ConnectionManager'
|
||||
import { connect } from 'react-redux'
|
||||
import { connectionManagerActions } from '../../actions'
|
||||
import { withStyles } from '@material-ui/styles'
|
||||
import { rendererRpc } from '../../../../events'
|
||||
import { RpcEvents } from '../../../../events/EventsV2'
|
||||
|
||||
function BrowserCertificateFileSelection(props: {
|
||||
certificateType: CertificateTypes
|
||||
title: string
|
||||
certificate?: CertificateParameters
|
||||
classes: any
|
||||
actions: {
|
||||
connectionManager: typeof connectionManagerActions
|
||||
}
|
||||
connection: ConnectionOptions
|
||||
}) {
|
||||
const fileInputRef = React.useRef<HTMLInputElement>(null)
|
||||
|
||||
const clearCertificate = React.useCallback(() => {
|
||||
props.actions.connectionManager.updateConnection(props.connection.id, {
|
||||
[props.certificateType]: undefined,
|
||||
})
|
||||
}, [props.connection, props.certificateType])
|
||||
|
||||
const handleFileSelect = React.useCallback(
|
||||
async (event: React.ChangeEvent<HTMLInputElement>) => {
|
||||
const file = event.target.files?.[0]
|
||||
if (!file) {
|
||||
return
|
||||
}
|
||||
|
||||
try {
|
||||
// Read file content
|
||||
const reader = new FileReader()
|
||||
reader.onload = async e => {
|
||||
const content = e.target?.result
|
||||
if (typeof content === 'string') {
|
||||
// Convert to base64
|
||||
const base64Data = content.split(',')[1] || content
|
||||
|
||||
// Upload via IPC instead of HTTP POST
|
||||
const result = await rendererRpc.call(RpcEvents.uploadCertificate, {
|
||||
filename: file.name,
|
||||
data: base64Data,
|
||||
})
|
||||
|
||||
// Create certificate parameters
|
||||
const certificate: CertificateParameters = {
|
||||
name: result.name,
|
||||
data: result.data,
|
||||
}
|
||||
|
||||
// Update connection
|
||||
props.actions.connectionManager.updateConnection(props.connection.id, {
|
||||
[props.certificateType]: certificate,
|
||||
})
|
||||
}
|
||||
}
|
||||
reader.readAsDataURL(file)
|
||||
} catch (error) {
|
||||
console.error('Error uploading certificate:', error)
|
||||
}
|
||||
|
||||
// Reset input
|
||||
if (fileInputRef.current) {
|
||||
fileInputRef.current.value = ''
|
||||
}
|
||||
},
|
||||
[props.connection.id, props.certificateType, props.actions.connectionManager]
|
||||
)
|
||||
|
||||
const handleButtonClick = () => {
|
||||
fileInputRef.current?.click()
|
||||
}
|
||||
|
||||
return (
|
||||
<span>
|
||||
<input
|
||||
ref={fileInputRef}
|
||||
type="file"
|
||||
accept=".pem,.crt,.cer,.key"
|
||||
style={{ display: 'none' }}
|
||||
onChange={handleFileSelect}
|
||||
/>
|
||||
<Tooltip title="Select certificate" placement="top">
|
||||
<Button variant="contained" className={props.classes.button} onClick={handleButtonClick}>
|
||||
<Lock /> {props.title}
|
||||
</Button>
|
||||
</Tooltip>
|
||||
<ClearCertificate classes={props.classes} certificate={props.certificate} action={clearCertificate} />
|
||||
</span>
|
||||
)
|
||||
}
|
||||
|
||||
function ClearCertificate(props: { classes: any; certificate?: CertificateParameters; action: () => void }) {
|
||||
if (!props.certificate) {
|
||||
return null
|
||||
}
|
||||
|
||||
return (
|
||||
<Tooltip title={props.certificate.name}>
|
||||
<Typography className={props.classes.certificateName}>
|
||||
<ClearAdornment action={props.action} value={props.certificate.name} />
|
||||
{props.certificate.name}
|
||||
</Typography>
|
||||
</Tooltip>
|
||||
)
|
||||
}
|
||||
|
||||
const mapDispatchToProps = (dispatch: any) => {
|
||||
return {
|
||||
actions: {
|
||||
connectionManager: bindActionCreators(connectionManagerActions, dispatch),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
const styles = (theme: Theme) => ({
|
||||
certificateName: {
|
||||
width: '100%',
|
||||
height: 'calc(1em + 4px)',
|
||||
overflow: 'hidden' as 'hidden',
|
||||
whiteSpace: 'nowrap' as 'nowrap',
|
||||
textOverflow: 'ellipsis' as 'ellipsis',
|
||||
color: theme.palette.text.hint,
|
||||
},
|
||||
button: {
|
||||
marginTop: theme.spacing(3),
|
||||
marginRight: theme.spacing(2),
|
||||
},
|
||||
})
|
||||
|
||||
export default connect(undefined, mapDispatchToProps)(withStyles(styles)(BrowserCertificateFileSelection))
|
||||
@@ -1,5 +1,6 @@
|
||||
import * as React from 'react'
|
||||
import CertificateFileSelection from './CertificateFileSelection'
|
||||
import BrowserCertificateFileSelection from './BrowserCertificateFileSelection'
|
||||
import Undo from '@material-ui/icons/Undo'
|
||||
import { bindActionCreators } from 'redux'
|
||||
import { Button, Grid } from '@material-ui/core'
|
||||
@@ -8,6 +9,11 @@ import { connectionManagerActions } from '../../actions'
|
||||
import { ConnectionOptions } from '../../model/ConnectionOptions'
|
||||
import { Theme, withStyles } from '@material-ui/core/styles'
|
||||
|
||||
// Check if we're in browser mode
|
||||
const isBrowserMode =
|
||||
typeof window !== 'undefined' && (typeof process === 'undefined' || process.env?.BROWSER_MODE === 'true')
|
||||
const CertSelector = isBrowserMode ? BrowserCertificateFileSelection : CertificateFileSelection
|
||||
|
||||
interface Props {
|
||||
connection: ConnectionOptions
|
||||
classes: any
|
||||
@@ -45,7 +51,7 @@ class Certificates extends React.PureComponent<Props, State> {
|
||||
<form noValidate={true} autoComplete="off">
|
||||
<Grid container={true} spacing={3}>
|
||||
<Grid item={true} xs={12} className={classes.gridPadding}>
|
||||
<CertificateFileSelection
|
||||
<CertSelector
|
||||
connection={this.props.connection}
|
||||
certificate={this.props.connection.selfSignedCertificate}
|
||||
title="Server Certificate (CA)"
|
||||
@@ -53,7 +59,7 @@ class Certificates extends React.PureComponent<Props, State> {
|
||||
/>
|
||||
</Grid>
|
||||
<Grid item={true} xs={12} className={classes.gridPadding}>
|
||||
<CertificateFileSelection
|
||||
<CertSelector
|
||||
connection={this.props.connection}
|
||||
certificate={this.props.connection.clientCertificate}
|
||||
title="Client Certificate"
|
||||
@@ -61,7 +67,7 @@ class Certificates extends React.PureComponent<Props, State> {
|
||||
/>
|
||||
</Grid>
|
||||
<Grid item={true} xs={12} className={classes.gridPadding}>
|
||||
<CertificateFileSelection
|
||||
<CertSelector
|
||||
connection={this.props.connection}
|
||||
certificate={this.props.connection.clientKey}
|
||||
title="Client Key"
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
import * as React from 'react'
|
||||
import { Dialog, DialogTitle, DialogContent, DialogActions, TextField, Button, Typography } from '@material-ui/core'
|
||||
|
||||
interface LoginDialogProps {
|
||||
open: boolean
|
||||
onLogin: (username: string, password: string) => void
|
||||
error?: string
|
||||
}
|
||||
|
||||
export function LoginDialog(props: LoginDialogProps) {
|
||||
const [username, setUsername] = React.useState('')
|
||||
const [password, setPassword] = React.useState('')
|
||||
|
||||
const handleSubmit = (e: React.FormEvent) => {
|
||||
e.preventDefault()
|
||||
props.onLogin(username, password)
|
||||
}
|
||||
|
||||
return (
|
||||
<Dialog open={props.open} disableEscapeKeyDown disableBackdropClick>
|
||||
<form onSubmit={handleSubmit}>
|
||||
<DialogTitle>Login to MQTT Explorer</DialogTitle>
|
||||
<DialogContent>
|
||||
{props.error && (
|
||||
<Typography color="error" style={{ marginBottom: 16 }}>
|
||||
{props.error}
|
||||
</Typography>
|
||||
)}
|
||||
<TextField
|
||||
autoFocus
|
||||
margin="dense"
|
||||
label="Username"
|
||||
type="text"
|
||||
fullWidth
|
||||
value={username}
|
||||
onChange={e => setUsername(e.target.value)}
|
||||
required
|
||||
/>
|
||||
<TextField
|
||||
margin="dense"
|
||||
label="Password"
|
||||
type="password"
|
||||
fullWidth
|
||||
value={password}
|
||||
onChange={e => setPassword(e.target.value)}
|
||||
required
|
||||
/>
|
||||
</DialogContent>
|
||||
<DialogActions>
|
||||
<Button type="submit" color="primary" variant="contained">
|
||||
Login
|
||||
</Button>
|
||||
</DialogActions>
|
||||
</form>
|
||||
</Dialog>
|
||||
)
|
||||
}
|
||||
@@ -52,16 +52,16 @@ function ChartPreview(props: Props) {
|
||||
/>
|
||||
</Tooltip>
|
||||
) : (
|
||||
<Tooltip title="Add to chart panel, not enough data for preview">
|
||||
<ShowChart
|
||||
onClick={onClick}
|
||||
className={props.classes.icon}
|
||||
style={{ color: '#aaa' }}
|
||||
data-test-type="ShowChart"
|
||||
data-test={props.literal.path}
|
||||
/>
|
||||
</Tooltip>
|
||||
)
|
||||
<Tooltip title="Add to chart panel, not enough data for preview">
|
||||
<ShowChart
|
||||
onClick={onClick}
|
||||
className={props.classes.icon}
|
||||
style={{ color: '#aaa' }}
|
||||
data-test-type="ShowChart"
|
||||
data-test={props.literal.path}
|
||||
/>
|
||||
</Tooltip>
|
||||
)
|
||||
|
||||
return (
|
||||
<span>
|
||||
@@ -69,7 +69,11 @@ function ChartPreview(props: Props) {
|
||||
<Popper open={open} anchorEl={chartIconRef.current} placement="left-end">
|
||||
<Fade in={open} timeout={300}>
|
||||
<Paper style={{ width: '300px' }}>
|
||||
{open ? <TopicPlot node={props.treeNode} history={props.treeNode.messageHistory} dotPath={props.literal.path} /> : <span />}
|
||||
{open ? (
|
||||
<TopicPlot node={props.treeNode} history={props.treeNode.messageHistory} dotPath={props.literal.path} />
|
||||
) : (
|
||||
<span />
|
||||
)}
|
||||
</Paper>
|
||||
</Fade>
|
||||
</Popper>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import Editor from './Editor'
|
||||
import FormatAlignLeft from '@material-ui/icons/FormatAlignLeft'
|
||||
import { AttachFileOutlined, FormatAlignLeft } from '@material-ui/icons'
|
||||
import Message from './Model/Message'
|
||||
import Navigation from '@material-ui/icons/Navigation'
|
||||
import PublishHistory from './PublishHistory'
|
||||
@@ -116,6 +116,10 @@ const EditorMode = memo(function EditorMode(props: {
|
||||
props.actions.setEditorMode(value)
|
||||
}, [])
|
||||
|
||||
const openFile = useCallback(() => {
|
||||
props.actions.openFile()
|
||||
}, [])
|
||||
|
||||
const formatJson = useCallback(() => {
|
||||
if (props.payload) {
|
||||
try {
|
||||
@@ -132,6 +136,7 @@ const EditorMode = memo(function EditorMode(props: {
|
||||
<div style={{ width: '100%', lineHeight: '64px', textAlign: 'center' }}>
|
||||
<EditorModeSelect value={props.editorMode} onChange={updateMode} focusEditor={props.focusEditor} />
|
||||
<FormatJsonButton editorMode={props.editorMode} focusEditor={props.focusEditor} formatJson={formatJson} />
|
||||
<OpenFileButton editorMode={props.editorMode} openFile={openFile} />
|
||||
<div style={{ float: 'right' }}>
|
||||
<PublishButton publish={props.publish} focusEditor={props.focusEditor} />
|
||||
</div>
|
||||
@@ -163,6 +168,20 @@ const FormatJsonButton = React.memo(function FormatJsonButton(props: {
|
||||
)
|
||||
})
|
||||
|
||||
const OpenFileButton = React.memo(function OpenFileButton(props: { editorMode: string; openFile: () => void }) {
|
||||
return (
|
||||
<Tooltip title="Open file">
|
||||
<Fab
|
||||
style={{ width: '36px', height: '36px', margin: '0 8px' }}
|
||||
onClick={props.openFile}
|
||||
id="sidebar-publish-open-file"
|
||||
>
|
||||
<AttachFileOutlined style={{ fontSize: '20px' }} />
|
||||
</Fab>
|
||||
</Tooltip>
|
||||
)
|
||||
})
|
||||
|
||||
const PublishButton = memo(function PublishButton(props: { publish: () => void; focusEditor: () => void }) {
|
||||
const handleClickPublish = useCallback(
|
||||
(e: React.MouseEvent) => {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import * as q from '../../../../../backend/src/Model'
|
||||
import ActionButtons from './ActionButtons'
|
||||
import Copy from '../../helper/Copy'
|
||||
import Save from '../../helper/Save'
|
||||
import DateFormatter from '../../helper/DateFormatter'
|
||||
import MessageHistory from './MessageHistory'
|
||||
import Panel from '../Panel'
|
||||
@@ -59,6 +60,12 @@ function ValuePanel(props: Props) {
|
||||
return node?.message && decodeMessage(node.message)?.message?.toUnicodeString()
|
||||
}, [node, decodeMessage])
|
||||
|
||||
const getData = () => {
|
||||
if (node?.message && node.message.payload) {
|
||||
return node.message.payload.base64Message
|
||||
}
|
||||
}
|
||||
|
||||
function messageMetaInfo() {
|
||||
if (!props.node || !props.node.message) {
|
||||
return null
|
||||
@@ -93,10 +100,13 @@ function ValuePanel(props: Props) {
|
||||
const [value] =
|
||||
node && node.message && node.message.payload ? node.message.payload?.format(node.type) : [null, undefined]
|
||||
const copyValue = value ? <Copy getValue={getDecodedValue} /> : null
|
||||
const saveValue = value ? <Save getData={getData} /> : null
|
||||
|
||||
return (
|
||||
<Panel>
|
||||
<span>Value {copyValue}</span>
|
||||
<span>
|
||||
Value {copyValue} {saveValue}
|
||||
</span>
|
||||
<span style={{ width: '100%' }}>
|
||||
{renderViewOptions()}
|
||||
<div style={{ marginBottom: '-8px', marginTop: '8px' }}>
|
||||
|
||||
@@ -1,117 +0,0 @@
|
||||
import * as q from '../../../../backend/src/Model'
|
||||
import React, { MutableRefObject, RefObject, useCallback, useMemo, useRef } from 'react'
|
||||
import { FixedSizeList as List, ListOnItemsRenderedProps, ListOnScrollProps } from 'react-window'
|
||||
import { AutoSizer } from 'react-virtualized'
|
||||
import TreeNode from './TreeNode'
|
||||
import { TopicViewModel } from '../../model/TopicViewModel'
|
||||
|
||||
class TreeList {
|
||||
tree: q.TreeNode<TopicViewModel>
|
||||
|
||||
constructor(tree: q.TreeNode<TopicViewModel>) {
|
||||
this.tree = tree
|
||||
}
|
||||
|
||||
getVisibleChildAt(index: number): [q.TreeNode<TopicViewModel>, number] | undefined {
|
||||
return this.tree.viewModel?.visibleChildAt(index, 1)
|
||||
}
|
||||
|
||||
get length(): number {
|
||||
return this.tree.viewModel?.visibleChildren() ?? 0
|
||||
}
|
||||
}
|
||||
|
||||
const InfinitreeComponent: React.FC<{
|
||||
tree: q.TreeNode<TopicViewModel>
|
||||
actions: any
|
||||
selectTopicAction: any
|
||||
settings: any
|
||||
listRef: RefObject<List>
|
||||
lastUpdate: number
|
||||
name: string
|
||||
fixedOnTreeNodeRef: MutableRefObject<q.TreeNode<TopicViewModel> | null>
|
||||
}> = ({ tree, actions, settings, listRef, fixedOnTreeNodeRef, name }) => {
|
||||
const list = useMemo(() => new TreeList(tree), [tree])
|
||||
const lastIndex = useRef<number | undefined>(0)
|
||||
const lastScroll = useRef<number>(Date.now())
|
||||
const getKey = useCallback(
|
||||
(index: number) => {
|
||||
let [treeNode] = list.getVisibleChildAt(index) ?? []
|
||||
|
||||
return treeNode?.hash() ?? index.toString()
|
||||
},
|
||||
[list]
|
||||
)
|
||||
|
||||
const afterRender = useCallback(
|
||||
({ visibleStartIndex }: ListOnItemsRenderedProps) => {
|
||||
if (!visibleStartIndex) {
|
||||
return
|
||||
}
|
||||
|
||||
let [treeNode] = list.getVisibleChildAt(visibleStartIndex) ?? []
|
||||
|
||||
if (treeNode) {
|
||||
fixedOnTreeNodeRef.current = treeNode
|
||||
}
|
||||
},
|
||||
[list]
|
||||
)
|
||||
|
||||
const indexOfItem = fixedOnTreeNodeRef.current?.viewModel?.getIndex()
|
||||
|
||||
if (indexOfItem && lastIndex.current !== indexOfItem && Date.now() - lastScroll.current > 300) {
|
||||
// Kind of dangerous to mutate scroll state directly, useEffect causes glitches
|
||||
indexOfItem && listRef.current?.scrollToItem(indexOfItem, 'start')
|
||||
}
|
||||
lastIndex.current = indexOfItem
|
||||
|
||||
const disableScroll = useCallback((args: ListOnScrollProps) => {
|
||||
if (!args.scrollUpdateWasRequested) {
|
||||
lastScroll.current = Date.now()
|
||||
}
|
||||
}, [])
|
||||
|
||||
return (
|
||||
<AutoSizer>
|
||||
{({ width, height }) => (
|
||||
<List
|
||||
ref={listRef}
|
||||
width={width}
|
||||
height={height}
|
||||
itemSize={20}
|
||||
itemCount={list.length}
|
||||
itemKey={getKey}
|
||||
onItemsRendered={afterRender}
|
||||
onScroll={disableScroll}
|
||||
overscanCount={3}
|
||||
>
|
||||
{({ index, style }) => {
|
||||
let [treeNode, depth = 0] = list.getVisibleChildAt(index) ?? []
|
||||
if (!treeNode) {
|
||||
return null
|
||||
}
|
||||
|
||||
return (
|
||||
<div style={{ ...style, paddingLeft: 12 * (depth - 1) }}>
|
||||
<TreeNode
|
||||
treeNode={treeNode}
|
||||
isRoot={index === 0}
|
||||
doNotRenderSubnodes={true}
|
||||
name={index === 0 ? name : undefined}
|
||||
collapsed={false}
|
||||
settings={settings}
|
||||
lastUpdate={treeNode.lastUpdate}
|
||||
actions={actions}
|
||||
selectTopicAction={actions.selectTopic}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}}
|
||||
</List>
|
||||
)}
|
||||
</AutoSizer>
|
||||
)
|
||||
}
|
||||
|
||||
export const Infinitree = InfinitreeComponent
|
||||
@@ -4,9 +4,9 @@ import { TopicViewModel } from '../../../../model/TopicViewModel'
|
||||
|
||||
export function useViewModel(treeNode: q.TreeNode<TopicViewModel> | undefined) {
|
||||
useEffect(() => {
|
||||
// if (treeNode && !treeNode?.viewModel) {
|
||||
// treeNode.viewModel = new TopicViewModel(treeNode)
|
||||
// }
|
||||
if (treeNode && !treeNode?.viewModel) {
|
||||
treeNode.viewModel = new TopicViewModel(treeNode)
|
||||
}
|
||||
treeNode?.viewModel?.retain()
|
||||
|
||||
return function cleanup() {
|
||||
|
||||
@@ -18,7 +18,6 @@ export interface Props {
|
||||
treeNode: q.TreeNode<TopicViewModel>
|
||||
name?: string | undefined
|
||||
collapsed?: boolean | undefined
|
||||
doNotRenderSubnodes?: boolean
|
||||
classes: any
|
||||
lastUpdate: number
|
||||
actions: typeof treeActions
|
||||
@@ -28,8 +27,8 @@ export interface Props {
|
||||
}
|
||||
|
||||
function TreeNodeComponent(props: Props) {
|
||||
const { actions, classes, settings, theme, treeNode, lastUpdate, name, doNotRenderSubnodes } = props
|
||||
const [collapsedOverride, setCollapsedOverride] = useState<boolean | undefined>(!treeNode.viewModel?.isExpanded())
|
||||
const { actions, classes, settings, theme, treeNode, lastUpdate, name } = props
|
||||
const [collapsedOverride, setCollapsedOverride] = useState<boolean | undefined>(undefined)
|
||||
const [selected, selectionLastUpdate, setSelected] = useSelectionState(false)
|
||||
const nodeRef = useRef<HTMLDivElement>()
|
||||
const isAllowedToAutoExpand = useIsAllowedToAutoExpandState(props)
|
||||
@@ -95,7 +94,7 @@ function TreeNodeComponent(props: Props) {
|
||||
|
||||
return useMemo(() => {
|
||||
function renderNodes() {
|
||||
if (isCollapsed || doNotRenderSubnodes) {
|
||||
if (isCollapsed) {
|
||||
return null
|
||||
}
|
||||
|
||||
@@ -135,7 +134,7 @@ function TreeNodeComponent(props: Props) {
|
||||
{renderNodes()}
|
||||
</div>
|
||||
)
|
||||
}, [treeNode.lastUpdate, treeNode, name, isCollapsed, selected, theme, mouseOver, settings, doNotRenderSubnodes])
|
||||
}, [treeNode.lastUpdate, treeNode, name, isCollapsed, selected, theme, mouseOver, settings])
|
||||
}
|
||||
|
||||
export default withStyles(styles, { withTheme: true })(React.memo(TreeNodeComponent))
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import * as q from '../../../../backend/src/Model'
|
||||
import React, { useCallback, useMemo, useRef } from 'react'
|
||||
import { Infinitree } from './Infinitree'
|
||||
import React from 'react'
|
||||
import TreeNode from './TreeNode'
|
||||
import { AppState } from '../../reducers'
|
||||
import { bindActionCreators } from 'redux'
|
||||
import { connect } from 'react-redux'
|
||||
@@ -8,8 +8,6 @@ import { KeyCodes } from '../../utils/KeyCodes'
|
||||
import { SettingsState } from '../../reducers/Settings'
|
||||
import { TopicViewModel } from '../../model/TopicViewModel'
|
||||
import { treeActions } from '../../actions'
|
||||
import { FixedSizeList as List } from 'react-window'
|
||||
import { useSubscription } from '../hooks/useSubscription'
|
||||
const MovingAverage = require('moving-average')
|
||||
|
||||
const averagingTimeInterval = 10 * 1000
|
||||
@@ -26,64 +24,84 @@ interface Props {
|
||||
settings: SettingsState
|
||||
}
|
||||
|
||||
function useArrowKeyEventHandler(actions: typeof treeActions) {
|
||||
return useCallback(
|
||||
(event: React.KeyboardEvent) => {
|
||||
switch (event.keyCode) {
|
||||
case KeyCodes.arrow_down:
|
||||
actions.moveSelectionUpOrDownwards('next')
|
||||
event.preventDefault()
|
||||
break
|
||||
case KeyCodes.arrow_up:
|
||||
actions.moveSelectionUpOrDownwards('previous')
|
||||
event.preventDefault()
|
||||
break
|
||||
case KeyCodes.arrow_left:
|
||||
actions.moveOutward()
|
||||
event.preventDefault()
|
||||
break
|
||||
case KeyCodes.arrow_right:
|
||||
actions.moveInward()
|
||||
event.preventDefault()
|
||||
break
|
||||
}
|
||||
},
|
||||
[actions]
|
||||
)
|
||||
interface State {
|
||||
lastUpdate: number
|
||||
}
|
||||
|
||||
const TreeComponent: React.FC<Props> = props => {
|
||||
const keyEventHandler = useArrowKeyEventHandler(props.actions)
|
||||
const performanceCallback = useCallback((ms: number) => {
|
||||
function useArrowKeyEventHandler(actions: typeof treeActions) {
|
||||
return (event: React.KeyboardEvent) => {
|
||||
switch (event.keyCode) {
|
||||
case KeyCodes.arrow_down:
|
||||
actions.moveSelectionUpOrDownwards('next')
|
||||
event.preventDefault()
|
||||
break
|
||||
case KeyCodes.arrow_up:
|
||||
actions.moveSelectionUpOrDownwards('previous')
|
||||
event.preventDefault()
|
||||
break
|
||||
case KeyCodes.arrow_left:
|
||||
actions.moveOutward()
|
||||
event.preventDefault()
|
||||
break
|
||||
case KeyCodes.arrow_right:
|
||||
actions.moveInward()
|
||||
event.preventDefault()
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class TreeComponent extends React.PureComponent<Props, State> {
|
||||
private updateTimer?: any
|
||||
private perf: number = 0
|
||||
private renderTime = 0
|
||||
|
||||
constructor(props: any) {
|
||||
super(props)
|
||||
this.state = { lastUpdate: 0 }
|
||||
}
|
||||
|
||||
private keyEventHandler = useArrowKeyEventHandler(this.props.actions)
|
||||
private performanceCallback = (ms: number) => {
|
||||
average.push(Date.now(), ms)
|
||||
}, [])
|
||||
}
|
||||
|
||||
const updateTimer = useRef<NodeJS.Timeout | number>()
|
||||
const perf = useRef<number>(performance.now())
|
||||
const renderTime = useRef<number>(0)
|
||||
const listRef = useRef<List>(null)
|
||||
const [lastUpdate, triggerUpdate] = React.useState(0)
|
||||
public componentWillReceiveProps(nextProps: Props) {
|
||||
if (this.props.tree !== nextProps.tree) {
|
||||
if (this.props.tree) {
|
||||
this.props.tree.didUpdate.unsubscribe(this.throttledTreeUpdate)
|
||||
}
|
||||
if (nextProps.tree) {
|
||||
nextProps.tree.didUpdate.subscribe(this.throttledTreeUpdate)
|
||||
}
|
||||
this.setState(this.state)
|
||||
}
|
||||
}
|
||||
|
||||
const throttledTreeUpdate = useCallback(() => {
|
||||
if (updateTimer.current) {
|
||||
public componentWillUnmount() {
|
||||
this.props.tree && this.props.tree.didUpdate.unsubscribe(this.throttledTreeUpdate)
|
||||
}
|
||||
|
||||
public throttledTreeUpdate = () => {
|
||||
if (this.updateTimer) {
|
||||
return
|
||||
}
|
||||
|
||||
const expectedRenderTime = average.forecast()
|
||||
const updateInterval = Math.max(expectedRenderTime * 7, 500)
|
||||
const timeUntilNextUpdate = updateInterval - (performance.now() - renderTime.current)
|
||||
const updateInterval = Math.max(expectedRenderTime * 7, 300)
|
||||
const timeUntilNextUpdate = updateInterval - (performance.now() - this.renderTime)
|
||||
|
||||
updateTimer.current = setTimeout(
|
||||
this.updateTimer = setTimeout(
|
||||
() => {
|
||||
window.requestIdleCallback(
|
||||
() => {
|
||||
updateTimer.current && clearTimeout(updateTimer.current)
|
||||
updateTimer.current = undefined
|
||||
renderTime.current = performance.now()
|
||||
this.updateTimer && clearTimeout(this.updateTimer)
|
||||
this.updateTimer = undefined
|
||||
this.renderTime = performance.now()
|
||||
|
||||
window.requestIdleCallback(
|
||||
() => {
|
||||
triggerUpdate(renderTime.current)
|
||||
this.setState({ lastUpdate: this.renderTime })
|
||||
},
|
||||
{ timeout: 100 }
|
||||
)
|
||||
@@ -93,52 +111,49 @@ const TreeComponent: React.FC<Props> = props => {
|
||||
},
|
||||
Math.max(0, timeUntilNextUpdate)
|
||||
)
|
||||
}, [])
|
||||
}
|
||||
|
||||
perf.current = performance.now()
|
||||
window.requestIdleCallback(() => {
|
||||
performanceCallback(performance.now() - perf.current)
|
||||
})
|
||||
const fixedOnTreeNodeRef = useRef<q.TreeNode<TopicViewModel> | null>(null)
|
||||
public componentWillUpdate() {
|
||||
this.perf = performance.now()
|
||||
}
|
||||
|
||||
useSubscription(props.tree?.didUpdate, throttledTreeUpdate)
|
||||
public componentDidUpdate() {
|
||||
this.performanceCallback(performance.now() - this.perf)
|
||||
}
|
||||
|
||||
const style: React.CSSProperties = useMemo(
|
||||
() => ({
|
||||
public render() {
|
||||
const { tree } = this.props
|
||||
if (!tree) {
|
||||
return null
|
||||
}
|
||||
|
||||
const style: React.CSSProperties = {
|
||||
lineHeight: '1.1',
|
||||
cursor: 'default',
|
||||
// overflowY: 'scroll',
|
||||
// overflowX: 'hidden',
|
||||
overflowY: 'scroll',
|
||||
overflowX: 'hidden',
|
||||
height: '100%',
|
||||
width: '100%',
|
||||
outline: '24px black !important',
|
||||
paddingBottom: '16px', // avoid conflict with chart panel Resizer
|
||||
}),
|
||||
[]
|
||||
)
|
||||
}
|
||||
|
||||
const { tree } = props
|
||||
if (!tree) {
|
||||
return null
|
||||
return (
|
||||
<div style={style} tabIndex={0} onKeyDown={this.keyEventHandler}>
|
||||
<TreeNode
|
||||
key={tree.hash()}
|
||||
isRoot={true}
|
||||
treeNode={tree}
|
||||
name={this.props.host}
|
||||
collapsed={false}
|
||||
settings={this.props.settings}
|
||||
lastUpdate={tree.lastUpdate}
|
||||
actions={this.props.actions}
|
||||
selectTopicAction={this.props.actions.selectTopic}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
const rendered = (
|
||||
<div style={style} tabIndex={0} onKeyDown={keyEventHandler}>
|
||||
<Infinitree
|
||||
lastUpdate={lastUpdate}
|
||||
listRef={listRef}
|
||||
key={tree.hash()}
|
||||
fixedOnTreeNodeRef={fixedOnTreeNodeRef}
|
||||
tree={tree}
|
||||
name={props.host ?? ''}
|
||||
actions={props.actions}
|
||||
selectTopicAction={props.actions.selectTopic}
|
||||
settings={props.settings}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
|
||||
return rendered
|
||||
}
|
||||
|
||||
const mapStateToProps = (state: AppState) => {
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import compareVersions from 'compare-versions'
|
||||
import electron from 'electron'
|
||||
import os from 'os'
|
||||
import React from 'react'
|
||||
import axios from 'axios'
|
||||
import Close from '@material-ui/icons/Close'
|
||||
@@ -182,9 +181,10 @@ class UpdateNotifier extends React.PureComponent<Props, State> {
|
||||
|
||||
private assetForCurrentPlatform(asset: GithubAsset) {
|
||||
let regex: RegExp
|
||||
if (os.platform() === 'darwin') {
|
||||
const platform = this.getPlatform()
|
||||
if (platform === 'darwin') {
|
||||
regex = /\.dmg$/
|
||||
} else if (os.platform() === 'win32') {
|
||||
} else if (platform === 'win32') {
|
||||
regex = /\.exe$/
|
||||
} else {
|
||||
regex = /\.AppImage$/
|
||||
@@ -193,6 +193,14 @@ class UpdateNotifier extends React.PureComponent<Props, State> {
|
||||
return regex.test(asset.name)
|
||||
}
|
||||
|
||||
private getPlatform(): string {
|
||||
if (typeof window === 'undefined') return 'linux'
|
||||
const userAgent = window.navigator.userAgent.toLowerCase()
|
||||
if (userAgent.includes('mac')) return 'darwin'
|
||||
if (userAgent.includes('win')) return 'win32'
|
||||
return 'linux'
|
||||
}
|
||||
|
||||
private renderDownloads() {
|
||||
const latestUpdate = this.state.newerVersions[0]
|
||||
if (!latestUpdate || !latestUpdate.assets) {
|
||||
|
||||
@@ -0,0 +1,85 @@
|
||||
import * as React from 'react'
|
||||
import { connect } from 'react-redux'
|
||||
import Check from '@material-ui/icons/Check'
|
||||
import CustomIconButton from './CustomIconButton'
|
||||
|
||||
import { SaveAlt } from '@material-ui/icons'
|
||||
import { bindActionCreators } from 'redux'
|
||||
import { rendererRpc, writeToFile } from '../../../../events'
|
||||
import { makeSaveDialogRpc } from '../../../../events/OpenDialogRequest'
|
||||
|
||||
import { globalActions } from '../../actions'
|
||||
|
||||
export async function saveToFile(data: string): Promise<string | undefined> {
|
||||
const rejectReasons = {
|
||||
errorWritingFile: 'Error writing file',
|
||||
}
|
||||
|
||||
const { canceled, filePath } = await rendererRpc.call(makeSaveDialogRpc(), {
|
||||
securityScopedBookmarks: true,
|
||||
})
|
||||
|
||||
if (!canceled && filePath !== undefined) {
|
||||
try {
|
||||
const filename = await rendererRpc.call(writeToFile, { filePath, data })
|
||||
return filePath
|
||||
} catch (error) {
|
||||
throw rejectReasons.errorWritingFile
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
interface Props {
|
||||
getData: () => string | undefined
|
||||
actions: {
|
||||
global: typeof globalActions
|
||||
}
|
||||
}
|
||||
|
||||
interface State {
|
||||
didSave: boolean
|
||||
}
|
||||
|
||||
class Save extends React.PureComponent<Props, State> {
|
||||
constructor(props: Props) {
|
||||
super(props)
|
||||
this.state = { didSave: false }
|
||||
}
|
||||
|
||||
private handleClick = async (event: React.MouseEvent) => {
|
||||
event.stopPropagation()
|
||||
const data = this.props.getData()
|
||||
if (data != undefined) {
|
||||
const filename = await saveToFile(data)
|
||||
this.props.actions.global.showNotification(`Saved to ${filename}`)
|
||||
this.setState({ didSave: true })
|
||||
setTimeout(() => {
|
||||
this.setState({ didSave: false })
|
||||
}, 1500)
|
||||
}
|
||||
}
|
||||
|
||||
public render() {
|
||||
const icon = !this.state.didSave ? (
|
||||
<SaveAlt fontSize="inherit" />
|
||||
) : (
|
||||
<Check fontSize="inherit" style={{ cursor: 'default' }} />
|
||||
)
|
||||
|
||||
return (
|
||||
<CustomIconButton onClick={this.handleClick} tooltip="Save to file">
|
||||
<div style={{ marginTop: '2px' }}>{icon}</div>
|
||||
</CustomIconButton>
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
const mapDispatchToProps = (dispatch: any) => {
|
||||
return {
|
||||
actions: {
|
||||
global: bindActionCreators(globalActions, dispatch),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
export default connect(undefined, mapDispatchToProps)(Save)
|
||||
+4
-1
@@ -10,6 +10,7 @@ import { connect, Provider } from 'react-redux'
|
||||
import { ThemeProvider } from '@material-ui/styles'
|
||||
import './utils/tracking'
|
||||
import { themes } from './theme'
|
||||
import { BrowserAuthWrapper } from './components/BrowserAuthWrapper'
|
||||
|
||||
const composeEnhancers = (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose
|
||||
const store = createStore(reducers, composeEnhancers(applyMiddleware(reduxThunk, batchDispatchMiddleware)))
|
||||
@@ -33,7 +34,9 @@ const Application = connect(mapStateToProps)(ApplicationRenderer)
|
||||
|
||||
ReactDOM.render(
|
||||
<Provider store={store}>
|
||||
<Application />
|
||||
<BrowserAuthWrapper>
|
||||
<Application />
|
||||
</BrowserAuthWrapper>
|
||||
</Provider>,
|
||||
document.getElementById('app')
|
||||
)
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
// Mock electron module for browser environment
|
||||
export const shell = {
|
||||
openExternal: (url: string) => {
|
||||
if (typeof window !== 'undefined') {
|
||||
window.open(url, '_blank')
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
export default {
|
||||
shell,
|
||||
}
|
||||
@@ -1,9 +1,9 @@
|
||||
import * as q from '../../../backend/src/Model'
|
||||
import { Destroyable, MemoryLifecycle } from '../../../backend/src/Model/Destroyable'
|
||||
import { Destroyable } from '../../../backend/src/Model/Destroyable'
|
||||
import { MessageDecoder, decoders } from '../decoders'
|
||||
import { EventDispatcher } from '../../../events'
|
||||
|
||||
function findDecoder<T extends Destroyable & MemoryLifecycle>(node: q.TreeNode<T>): TopicDecoder | undefined {
|
||||
function findDecoder<T extends Destroyable>(node: q.TreeNode<T>): TopicDecoder | undefined {
|
||||
const decoder = decoders.find(
|
||||
decoder =>
|
||||
decoder.canDecodeTopic?.(node.path()) || (node.message?.payload && decoder.canDecodeData?.(node.message?.payload))
|
||||
@@ -19,7 +19,7 @@ function findDecoder<T extends Destroyable & MemoryLifecycle>(node: q.TreeNode<T
|
||||
|
||||
type TopicDecoder = { decoder: MessageDecoder; format: string | undefined }
|
||||
|
||||
export class TopicViewModel implements Destroyable, MemoryLifecycle {
|
||||
export class TopicViewModel implements Destroyable {
|
||||
private selected: boolean
|
||||
private expanded: boolean
|
||||
private owner: q.TreeNode<TopicViewModel> | undefined
|
||||
@@ -46,89 +46,10 @@ export class TopicViewModel implements Destroyable, MemoryLifecycle {
|
||||
this.onDecoderChange.dispatch(override)
|
||||
}
|
||||
|
||||
private clearCache = () => {
|
||||
if (this._cachedChildTopicCount) {
|
||||
this._cachedChildTopicCount = undefined
|
||||
// when child changes, parents are affected as well
|
||||
this.owner?.sourceEdge?.source?.viewModel?.clearCache()
|
||||
}
|
||||
}
|
||||
|
||||
public constructor(treeNode: q.TreeNode<TopicViewModel>) {
|
||||
this.owner = treeNode
|
||||
this.selected = false
|
||||
this.expanded = true
|
||||
treeNode.onMerge.subscribe(this.clearCache)
|
||||
}
|
||||
|
||||
private _cachedChildTopicCount: number | undefined = undefined
|
||||
|
||||
/**
|
||||
* This function only returns valid values if parents are expanded
|
||||
* @returns
|
||||
*/
|
||||
public getIndex(): number {
|
||||
if (!this.owner) {
|
||||
throw new Error('integrity error')
|
||||
}
|
||||
|
||||
const source = this.owner.sourceEdge?.source
|
||||
|
||||
const parentIndex = source?.viewModel?.getIndex()
|
||||
// If we have a parent, we have its index + 1 (at least)
|
||||
const parentIndexWithDepth = parentIndex !== undefined ? parentIndex + 1 : 0
|
||||
let position = 0
|
||||
const edgeToMatch = this.owner.sourceEdge
|
||||
for (const edge of source?.edgeArray ?? []) {
|
||||
if (edge === edgeToMatch) {
|
||||
break
|
||||
}
|
||||
position += edge.target.viewModel?.visibleChildren() ?? 1
|
||||
}
|
||||
|
||||
return parentIndexWithDepth + position
|
||||
}
|
||||
|
||||
public visibleChildAt(
|
||||
index: number,
|
||||
depth: number = 0,
|
||||
parentOffset: number = 0
|
||||
): [q.TreeNode<TopicViewModel>, number] | undefined {
|
||||
if (!this.owner) {
|
||||
throw new Error('integrity error')
|
||||
}
|
||||
const node = this.owner
|
||||
|
||||
if (parentOffset === index) {
|
||||
return [node, depth]
|
||||
}
|
||||
|
||||
let position = parentOffset + 1
|
||||
for (const edge of node.edgeArray) {
|
||||
let viewModel = edge.target.viewModel
|
||||
const nextPosition = position + (viewModel?.visibleChildren() ?? 0)
|
||||
if (nextPosition > index) {
|
||||
return viewModel?.visibleChildAt(index, depth + 1, position)
|
||||
}
|
||||
position = nextPosition
|
||||
}
|
||||
}
|
||||
|
||||
public visibleChildren(): number {
|
||||
if (!this.owner) {
|
||||
throw new Error('integrity error')
|
||||
}
|
||||
|
||||
if (this._cachedChildTopicCount === undefined) {
|
||||
if (!this.expanded) {
|
||||
return 1
|
||||
}
|
||||
|
||||
this._cachedChildTopicCount =
|
||||
1 + this.owner.edgeArray.map(e => e.target.viewModel?.visibleChildren() ?? 1).reduce((a, b) => a + b, 0)
|
||||
}
|
||||
|
||||
return this._cachedChildTopicCount as number
|
||||
this.expanded = false
|
||||
}
|
||||
|
||||
public retain() {
|
||||
@@ -143,8 +64,7 @@ export class TopicViewModel implements Destroyable, MemoryLifecycle {
|
||||
}
|
||||
|
||||
public destroy() {
|
||||
// console.log('destroy', this.owner?.path(), this.referenceCounter)
|
||||
this.owner?.onMerge.unsubscribe(this.clearCache)
|
||||
console.log('destroy', this.referenceCounter)
|
||||
if (this.owner) {
|
||||
this.owner.viewModel = undefined
|
||||
this.owner = undefined
|
||||
@@ -170,8 +90,6 @@ export class TopicViewModel implements Destroyable, MemoryLifecycle {
|
||||
public setExpanded(expanded: boolean, fireEvent: boolean) {
|
||||
const didChange = this.expanded !== expanded
|
||||
this.expanded = expanded
|
||||
this.clearCache()
|
||||
|
||||
if (didChange && fireEvent) {
|
||||
this.expandedChange.dispatch()
|
||||
}
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
// Browser-specific webpack configuration
|
||||
const HtmlWebpackPlugin = require('html-webpack-plugin')
|
||||
const webpack = require('webpack')
|
||||
const path = require('path')
|
||||
|
||||
module.exports = {
|
||||
entry: {
|
||||
app: './src/index.tsx',
|
||||
bugtracking: './src/utils/bugtracking.ts',
|
||||
},
|
||||
output: {
|
||||
chunkFilename: '[name].bundle.js',
|
||||
filename: '[name].bundle.js',
|
||||
path: `${__dirname}/build`,
|
||||
},
|
||||
optimization: {
|
||||
minimize: false,
|
||||
splitChunks: {
|
||||
chunks: 'all',
|
||||
minSize: 30000,
|
||||
minChunks: 1,
|
||||
maxAsyncRequests: 5,
|
||||
maxInitialRequests: 3,
|
||||
automaticNameDelimiter: '~',
|
||||
cacheGroups: {
|
||||
vendors: {
|
||||
test: /[\\/]node_modules[\\/](react|react-dom|@material-ui|popper\.js|react|react-redux|prop-types|jss|redux|scheduler|react-transition-group)[\\/]/,
|
||||
name: 'vendors',
|
||||
chunks: 'all',
|
||||
priority: -10,
|
||||
},
|
||||
default: {
|
||||
name: 'default',
|
||||
minChunks: 2,
|
||||
priority: -20,
|
||||
reuseExistingChunk: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
runtimeChunk: 'single',
|
||||
},
|
||||
devServer: {
|
||||
hot: true,
|
||||
liveReload: true,
|
||||
},
|
||||
target: 'web', // Changed from 'electron-renderer' to 'web'
|
||||
mode: 'production',
|
||||
devtool: 'source-map',
|
||||
resolve: {
|
||||
extensions: ['.ts', '.mjs', '.m.js', '.tsx', '.js', '.json'],
|
||||
modules: ['node_modules', path.resolve(__dirname, 'node_modules')],
|
||||
alias: {
|
||||
electron: require.resolve('./src/mocks/electron.ts'),
|
||||
},
|
||||
fallback: {
|
||||
// Browser fallbacks for Node.js modules
|
||||
path: require.resolve('path-browserify'),
|
||||
fs: false,
|
||||
crypto: false,
|
||||
url: require.resolve('url/'),
|
||||
os: require.resolve('os-browserify/browser'),
|
||||
events: require.resolve('events/'),
|
||||
},
|
||||
},
|
||||
module: {
|
||||
rules: [
|
||||
{
|
||||
test: /\.tsx?$/,
|
||||
use: [
|
||||
{
|
||||
loader: 'ts-loader',
|
||||
options: {
|
||||
transpileOnly: true, // Skip type checking, we already did it with tsc
|
||||
},
|
||||
},
|
||||
],
|
||||
exclude: /node_modules/,
|
||||
},
|
||||
{ enforce: 'pre', test: /\.js$/, loader: 'source-map-loader' },
|
||||
{
|
||||
test: /\.css$/,
|
||||
use: ['style-loader', 'css-loader'],
|
||||
},
|
||||
{
|
||||
test: /\.(png|jpg|gif)$/i,
|
||||
type: 'asset/resource',
|
||||
},
|
||||
],
|
||||
},
|
||||
plugins: [
|
||||
new HtmlWebpackPlugin({ template: './index.html', file: './build/index.html', inject: false }),
|
||||
new webpack.DefinePlugin({
|
||||
'process.env.BROWSER_MODE': JSON.stringify('true'),
|
||||
}),
|
||||
new webpack.NormalModuleReplacementPlugin(/EventSystem[\\/]EventBus$/, resource => {
|
||||
console.log('Replacing EventBus:', resource.request);
|
||||
resource.request = resource.request.replace(/EventBus$/, 'BrowserEventBus');
|
||||
}),
|
||||
],
|
||||
externals: {},
|
||||
cache: false,
|
||||
}
|
||||
@@ -41,6 +41,7 @@ module.exports = {
|
||||
devServer: {
|
||||
// contentBase: './dist', // content not from webpack
|
||||
hot: true,
|
||||
liveReload: true,
|
||||
},
|
||||
target: 'electron-renderer',
|
||||
mode: 'production',
|
||||
@@ -89,7 +90,6 @@ module.exports = {
|
||||
plugins: [
|
||||
new HtmlWebpackPlugin({ template: './index.html', file: './build/index.html', inject: false }),
|
||||
// new BundleAnalyzerPlugin(),
|
||||
new webpack.HotModuleReplacementPlugin(),
|
||||
// new webpack.IgnorePlugin({
|
||||
// resourceRegExp: /\.\/build\/Debug\/addon/,
|
||||
// contextRegExp: /heapdump$/
|
||||
@@ -107,4 +107,7 @@ module.exports = {
|
||||
cache: {
|
||||
type: 'filesystem',
|
||||
},
|
||||
optimization: {
|
||||
runtimeChunk: 'single',
|
||||
},
|
||||
}
|
||||
|
||||
+212
-184
@@ -2,13 +2,6 @@
|
||||
# yarn lockfile v1
|
||||
|
||||
|
||||
"@babel/runtime@^7.0.0":
|
||||
version "7.24.5"
|
||||
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.5.tgz#230946857c053a36ccc66e1dd03b17dd0c4ed02c"
|
||||
integrity sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==
|
||||
dependencies:
|
||||
regenerator-runtime "^0.14.0"
|
||||
|
||||
"@babel/runtime@^7.15.4", "@babel/runtime@^7.17.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
|
||||
version "7.24.0"
|
||||
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e"
|
||||
@@ -195,6 +188,11 @@
|
||||
resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.25.tgz#f077fdc0b5d0078d30893396ff4827a13f99e817"
|
||||
integrity sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==
|
||||
|
||||
"@socket.io/component-emitter@~3.1.0":
|
||||
version "3.1.2"
|
||||
resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz#821f8442f4175d8f0467b9daf26e3a18e2d02af2"
|
||||
integrity sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==
|
||||
|
||||
"@types/body-parser@*":
|
||||
version "1.19.5"
|
||||
resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.5.tgz#04ce9a3b677dc8bd681a17da1ab9835dc9d3ede4"
|
||||
@@ -607,21 +605,6 @@
|
||||
dependencies:
|
||||
"@types/react" "*"
|
||||
|
||||
"@types/react-virtualized@^9.21.30":
|
||||
version "9.21.30"
|
||||
resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.21.30.tgz#ba39821bcb2487512a8a2cdd9fbdb5e6fc87fedb"
|
||||
integrity sha512-4l2TFLQ8BCjNDQlvH85tU6gctuZoEdgYzENQyZHpgTHU7hoLzYgPSOALMAeA58LOWua8AzC6wBivPj1lfl6JgQ==
|
||||
dependencies:
|
||||
"@types/prop-types" "*"
|
||||
"@types/react" "*"
|
||||
|
||||
"@types/react-window@^1.8.8":
|
||||
version "1.8.8"
|
||||
resolved "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.8.tgz#c20645414d142364fbe735818e1c1e0a145696e3"
|
||||
integrity sha512-8Ls660bHR1AUA2kuRvVG9D/4XpRC6wjAaPT9dil7Ckc76eP9TKWZwwmgfq8Q1LANX3QNDnoU4Zp48A3w+zK69Q==
|
||||
dependencies:
|
||||
"@types/react" "*"
|
||||
|
||||
"@types/react@*":
|
||||
version "18.2.64"
|
||||
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.64.tgz#3700fbb6b2fa60a6868ec1323ae4cbd446a2197d"
|
||||
@@ -690,10 +673,12 @@
|
||||
dependencies:
|
||||
"@types/node" "*"
|
||||
|
||||
"@types/socket.io-client@^1.4.32":
|
||||
version "1.4.36"
|
||||
resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-1.4.36.tgz#e4f1ca065f84c20939e9850e70222202bd76ff3f"
|
||||
integrity sha512-ZJWjtFBeBy1kRSYpVbeGYTElf6BqPQUkXDlHHD4k/42byCN5Rh027f4yARHCink9sKAkbtGZXEAmR0ZCnc2/Ag==
|
||||
"@types/socket.io-client@^3.0.0":
|
||||
version "3.0.0"
|
||||
resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-3.0.0.tgz#d0b8ea22121b7c1df68b6a923002f9c8e3cefb42"
|
||||
integrity sha512-s+IPvFoEIjKA3RdJz/Z2dGR4gLgysKi8owcnrVwNjgvc01Lk68LJDDsG2GRqegFITcxmvCMYM7bhMpwEMlHmDg==
|
||||
dependencies:
|
||||
socket.io-client "*"
|
||||
|
||||
"@types/sockjs@^0.3.36":
|
||||
version "0.3.36"
|
||||
@@ -895,11 +880,6 @@ acorn@^8.0.4, acorn@^8.7.1, acorn@^8.8.2:
|
||||
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
|
||||
integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
|
||||
|
||||
after@0.8.2:
|
||||
version "0.8.2"
|
||||
resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
|
||||
integrity sha512-QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA==
|
||||
|
||||
ajv-formats@^2.1.1:
|
||||
version "2.1.1"
|
||||
resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
|
||||
@@ -989,11 +969,6 @@ array-flatten@1.1.1:
|
||||
resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
|
||||
integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
|
||||
|
||||
arraybuffer.slice@~0.0.7:
|
||||
version "0.0.7"
|
||||
resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
|
||||
integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
|
||||
|
||||
assertion-error@^1.1.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
|
||||
@@ -1020,21 +995,11 @@ axios@^0.28.0:
|
||||
form-data "^4.0.0"
|
||||
proxy-from-env "^1.1.0"
|
||||
|
||||
backo2@1.0.2:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
|
||||
integrity sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA==
|
||||
|
||||
balanced-match@^1.0.0:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
|
||||
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
|
||||
|
||||
base64-arraybuffer@0.1.4:
|
||||
version "0.1.4"
|
||||
resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
|
||||
integrity sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg==
|
||||
|
||||
batch@0.6.1:
|
||||
version "0.6.1"
|
||||
resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
|
||||
@@ -1050,11 +1015,6 @@ binary-extensions@^2.0.0:
|
||||
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
|
||||
integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
|
||||
|
||||
blob@0.0.5:
|
||||
version "0.0.5"
|
||||
resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
|
||||
integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
|
||||
|
||||
body-parser@1.20.2:
|
||||
version "1.20.2"
|
||||
resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
|
||||
@@ -1137,6 +1097,14 @@ bytes@3.1.2:
|
||||
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
|
||||
integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
|
||||
|
||||
call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
|
||||
integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
|
||||
dependencies:
|
||||
es-errors "^1.3.0"
|
||||
function-bind "^1.1.2"
|
||||
|
||||
call-bind@^1.0.2, call-bind@^1.0.6, call-bind@^1.0.7:
|
||||
version "1.0.7"
|
||||
resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
|
||||
@@ -1148,6 +1116,14 @@ call-bind@^1.0.2, call-bind@^1.0.6, call-bind@^1.0.7:
|
||||
get-intrinsic "^1.2.4"
|
||||
set-function-length "^1.2.1"
|
||||
|
||||
call-bound@^1.0.2:
|
||||
version "1.0.4"
|
||||
resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a"
|
||||
integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
|
||||
dependencies:
|
||||
call-bind-apply-helpers "^1.0.2"
|
||||
get-intrinsic "^1.3.0"
|
||||
|
||||
camel-case@^4.1.2:
|
||||
version "4.1.2"
|
||||
resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
|
||||
@@ -1323,21 +1299,6 @@ compare-versions@^3.5.0:
|
||||
resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62"
|
||||
integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==
|
||||
|
||||
component-bind@1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
|
||||
integrity sha512-WZveuKPeKAG9qY+FkYDeADzdHyTYdIboXS59ixDeRJL5ZhxpqUnxSOwop4FQjMsiYm3/Or8cegVbpAHNA7pHxw==
|
||||
|
||||
component-emitter@~1.3.0:
|
||||
version "1.3.1"
|
||||
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.1.tgz#ef1d5796f7d93f135ee6fb684340b26403c97d17"
|
||||
integrity sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==
|
||||
|
||||
component-inherit@0.0.3:
|
||||
version "0.0.3"
|
||||
resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
|
||||
integrity sha512-w+LhYREhatpVqTESyGFg3NlP6Iu0kEKUHETY9GoZP/pQyW4mHFZuFWRUCIqVPZ36ueVLtoOEZaAqbCF2RDndaA==
|
||||
|
||||
compressible@~2.0.16:
|
||||
version "2.0.18"
|
||||
resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
|
||||
@@ -1841,12 +1802,12 @@ debug@4.3.4, debug@^4.1.0:
|
||||
dependencies:
|
||||
ms "2.1.2"
|
||||
|
||||
debug@~3.1.0:
|
||||
version "3.1.0"
|
||||
resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
|
||||
integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
|
||||
debug@~4.3.1, debug@~4.3.2:
|
||||
version "4.3.7"
|
||||
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
|
||||
integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
|
||||
dependencies:
|
||||
ms "2.0.0"
|
||||
ms "^2.1.3"
|
||||
|
||||
decamelize@^4.0.0:
|
||||
version "4.0.0"
|
||||
@@ -2027,6 +1988,15 @@ dot-prop@^5.0.0:
|
||||
dependencies:
|
||||
is-obj "^2.0.0"
|
||||
|
||||
dunder-proto@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
|
||||
integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
|
||||
dependencies:
|
||||
call-bind-apply-helpers "^1.0.1"
|
||||
es-errors "^1.3.0"
|
||||
gopd "^1.2.0"
|
||||
|
||||
duplexer@^0.1.2:
|
||||
version "0.1.2"
|
||||
resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
|
||||
@@ -2067,33 +2037,21 @@ encodeurl@~1.0.2:
|
||||
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
|
||||
integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
|
||||
|
||||
engine.io-client@~3.5.0:
|
||||
version "3.5.3"
|
||||
resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.3.tgz#3254f61fdbd53503dc9a6f9d46a52528871ca0d7"
|
||||
integrity sha512-qsgyc/CEhJ6cgMUwxRRtOndGVhIu5hpL5tR4umSpmX/MvkFoIxUTM7oFMDQumHNzlNLwSVy6qhstFPoWTf7dOw==
|
||||
engine.io-client@~6.6.1:
|
||||
version "6.6.3"
|
||||
resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.6.3.tgz#815393fa24f30b8e6afa8f77ccca2f28146be6de"
|
||||
integrity sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w==
|
||||
dependencies:
|
||||
component-emitter "~1.3.0"
|
||||
component-inherit "0.0.3"
|
||||
debug "~3.1.0"
|
||||
engine.io-parser "~2.2.0"
|
||||
has-cors "1.1.0"
|
||||
indexof "0.0.1"
|
||||
parseqs "0.0.6"
|
||||
parseuri "0.0.6"
|
||||
ws "~7.4.2"
|
||||
xmlhttprequest-ssl "~1.6.2"
|
||||
yeast "0.1.2"
|
||||
"@socket.io/component-emitter" "~3.1.0"
|
||||
debug "~4.3.1"
|
||||
engine.io-parser "~5.2.1"
|
||||
ws "~8.17.1"
|
||||
xmlhttprequest-ssl "~2.1.1"
|
||||
|
||||
engine.io-parser@~2.2.0:
|
||||
version "2.2.1"
|
||||
resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7"
|
||||
integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==
|
||||
dependencies:
|
||||
after "0.8.2"
|
||||
arraybuffer.slice "~0.0.7"
|
||||
base64-arraybuffer "0.1.4"
|
||||
blob "0.0.5"
|
||||
has-binary2 "~1.0.2"
|
||||
engine.io-parser@~5.2.1:
|
||||
version "5.2.3"
|
||||
resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.3.tgz#00dc5b97b1f233a23c9398d0209504cf5f94d92f"
|
||||
integrity sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==
|
||||
|
||||
enhanced-resolve@^5.0.0:
|
||||
version "5.15.1"
|
||||
@@ -2128,6 +2086,11 @@ es-define-property@^1.0.0:
|
||||
dependencies:
|
||||
get-intrinsic "^1.2.4"
|
||||
|
||||
es-define-property@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
|
||||
integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
|
||||
|
||||
es-errors@^1.3.0:
|
||||
version "1.3.0"
|
||||
resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
|
||||
@@ -2138,6 +2101,13 @@ es-module-lexer@^1.2.1:
|
||||
resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5"
|
||||
integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==
|
||||
|
||||
es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
|
||||
version "1.1.1"
|
||||
resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
|
||||
integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
|
||||
dependencies:
|
||||
es-errors "^1.3.0"
|
||||
|
||||
escalade@^3.1.1:
|
||||
version "3.1.2"
|
||||
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
|
||||
@@ -2188,7 +2158,7 @@ eventemitter3@^4.0.0:
|
||||
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
|
||||
integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
|
||||
|
||||
events@^3.2.0:
|
||||
events@^3.2.0, events@^3.3.0:
|
||||
version "3.3.0"
|
||||
resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
|
||||
integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
|
||||
@@ -2389,6 +2359,30 @@ get-intrinsic@^1.1.3, get-intrinsic@^1.2.4:
|
||||
has-symbols "^1.0.3"
|
||||
hasown "^2.0.0"
|
||||
|
||||
get-intrinsic@^1.2.5, get-intrinsic@^1.3.0:
|
||||
version "1.3.0"
|
||||
resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
|
||||
integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
|
||||
dependencies:
|
||||
call-bind-apply-helpers "^1.0.2"
|
||||
es-define-property "^1.0.1"
|
||||
es-errors "^1.3.0"
|
||||
es-object-atoms "^1.1.1"
|
||||
function-bind "^1.1.2"
|
||||
get-proto "^1.0.1"
|
||||
gopd "^1.2.0"
|
||||
has-symbols "^1.1.0"
|
||||
hasown "^2.0.2"
|
||||
math-intrinsics "^1.1.0"
|
||||
|
||||
get-proto@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
|
||||
integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
|
||||
dependencies:
|
||||
dunder-proto "^1.0.1"
|
||||
es-object-atoms "^1.0.0"
|
||||
|
||||
get-stream@^6.0.0:
|
||||
version "6.0.1"
|
||||
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
|
||||
@@ -2450,6 +2444,11 @@ gopd@^1.0.1:
|
||||
dependencies:
|
||||
get-intrinsic "^1.1.3"
|
||||
|
||||
gopd@^1.2.0:
|
||||
version "1.2.0"
|
||||
resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
|
||||
integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
|
||||
|
||||
graceful-fs@^4.1.2, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
|
||||
version "4.2.11"
|
||||
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
|
||||
@@ -2472,18 +2471,6 @@ handle-thing@^2.0.0:
|
||||
resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
|
||||
integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
|
||||
|
||||
has-binary2@~1.0.2:
|
||||
version "1.0.3"
|
||||
resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
|
||||
integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
|
||||
dependencies:
|
||||
isarray "2.0.1"
|
||||
|
||||
has-cors@1.1.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
|
||||
integrity sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA==
|
||||
|
||||
has-flag@^4.0.0:
|
||||
version "4.0.0"
|
||||
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
|
||||
@@ -2506,6 +2493,11 @@ has-symbols@^1.0.3:
|
||||
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
|
||||
integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
|
||||
|
||||
has-symbols@^1.1.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
|
||||
integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
|
||||
|
||||
has-tostringtag@^1.0.0:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc"
|
||||
@@ -2520,6 +2512,13 @@ hasown@^2.0.0:
|
||||
dependencies:
|
||||
function-bind "^1.1.2"
|
||||
|
||||
hasown@^2.0.2:
|
||||
version "2.0.2"
|
||||
resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
|
||||
integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
|
||||
dependencies:
|
||||
function-bind "^1.1.2"
|
||||
|
||||
he@1.2.0, he@^1.2.0:
|
||||
version "1.2.0"
|
||||
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
|
||||
@@ -2684,11 +2683,6 @@ in-viewport@^3.6.0:
|
||||
resolved "https://registry.yarnpkg.com/in-viewport/-/in-viewport-3.6.0.tgz#c59b4cdcaa41adb5bf5b8fe390c7d34259891f4a"
|
||||
integrity sha512-MhaJ7Pr3NhUyAfpULysTZZBUAYfJAX1O8PccW2gvXlbQduMrJz7qQQ5yzC7SAr/0g5LbeRk432yNjsLMCnYzJg==
|
||||
|
||||
indexof@0.0.1:
|
||||
version "0.0.1"
|
||||
resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
|
||||
integrity sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==
|
||||
|
||||
inflight@^1.0.4:
|
||||
version "1.0.6"
|
||||
resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
|
||||
@@ -2857,11 +2851,6 @@ is-wsl@^3.1.0:
|
||||
dependencies:
|
||||
is-inside-container "^1.0.0"
|
||||
|
||||
isarray@2.0.1:
|
||||
version "2.0.1"
|
||||
resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
|
||||
integrity sha512-c2cu3UxbI+b6kR3fy0nRnAhodsvR9dx7U5+znCOzdj6IfP3upFURTr0Xl5BlQZNKZjEtxrmVyfSdeE3O57smoQ==
|
||||
|
||||
isarray@~1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
|
||||
@@ -3138,6 +3127,11 @@ lru-cache@^6.0.0:
|
||||
dependencies:
|
||||
yallist "^4.0.0"
|
||||
|
||||
math-intrinsics@^1.1.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
|
||||
integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
|
||||
|
||||
media-typer@0.3.0:
|
||||
version "0.3.0"
|
||||
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
|
||||
@@ -3153,11 +3147,6 @@ memfs@^4.6.0:
|
||||
sonic-forest "^1.0.0"
|
||||
tslib "^2.0.0"
|
||||
|
||||
"memoize-one@>=3.1.1 <6":
|
||||
version "5.2.1"
|
||||
resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
|
||||
integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
|
||||
|
||||
merge-descriptors@1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
|
||||
@@ -3297,7 +3286,7 @@ ms@2.1.2:
|
||||
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
|
||||
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
|
||||
|
||||
ms@2.1.3:
|
||||
ms@2.1.3, ms@^2.1.3:
|
||||
version "2.1.3"
|
||||
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
|
||||
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
|
||||
@@ -3377,6 +3366,11 @@ object-inspect@^1.13.1:
|
||||
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
|
||||
integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
|
||||
|
||||
object-inspect@^1.13.3:
|
||||
version "1.13.4"
|
||||
resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
|
||||
integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
|
||||
|
||||
object-is@^1.1.5:
|
||||
version "1.1.6"
|
||||
resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.6.tgz#1a6a53aed2dd8f7e6775ff870bea58545956ab07"
|
||||
@@ -3436,6 +3430,11 @@ opener@^1.5.2:
|
||||
resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
|
||||
integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
|
||||
|
||||
os-browserify@^0.3.0:
|
||||
version "0.3.0"
|
||||
resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
|
||||
integrity sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==
|
||||
|
||||
p-limit@^2.2.0:
|
||||
version "2.3.0"
|
||||
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
|
||||
@@ -3491,16 +3490,6 @@ parse-duration@^0.1.1:
|
||||
resolved "https://registry.yarnpkg.com/parse-duration/-/parse-duration-0.1.3.tgz#c2c4d45d49513d544e129b2a5a07b9473545d19a"
|
||||
integrity sha512-hMOZHfUmjxO5hMKn7Eft+ckP2M4nV4yzauLXiw3PndpkASnx5r8pDAMcOAiqxoemqWjMWmz4fOHQM6n6WwETXw==
|
||||
|
||||
parseqs@0.0.6:
|
||||
version "0.0.6"
|
||||
resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
|
||||
integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
|
||||
|
||||
parseuri@0.0.6:
|
||||
version "0.0.6"
|
||||
resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
|
||||
integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
|
||||
|
||||
parseurl@~1.3.2, parseurl@~1.3.3:
|
||||
version "1.3.3"
|
||||
resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
|
||||
@@ -3514,6 +3503,11 @@ pascal-case@^3.1.2:
|
||||
no-case "^3.0.4"
|
||||
tslib "^2.0.3"
|
||||
|
||||
path-browserify@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
|
||||
integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
|
||||
|
||||
path-exists@^4.0.0:
|
||||
version "4.0.0"
|
||||
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
|
||||
@@ -3683,6 +3677,11 @@ proxy-from-env@^1.1.0:
|
||||
resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
|
||||
integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
|
||||
|
||||
punycode@^1.4.1:
|
||||
version "1.4.1"
|
||||
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
|
||||
integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
|
||||
|
||||
punycode@^2.1.0:
|
||||
version "2.3.1"
|
||||
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
|
||||
@@ -3695,6 +3694,13 @@ qs@6.11.0:
|
||||
dependencies:
|
||||
side-channel "^1.0.4"
|
||||
|
||||
qs@^6.12.3:
|
||||
version "6.14.0"
|
||||
resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.0.tgz#c63fa40680d2c5c941412a0e899c89af60c0a930"
|
||||
integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==
|
||||
dependencies:
|
||||
side-channel "^1.1.0"
|
||||
|
||||
raf-schd@^4.0.2:
|
||||
version "4.0.3"
|
||||
resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.3.tgz#5d6c34ef46f8b2a0e880a8fcdb743efc5bfdbc1a"
|
||||
@@ -3846,14 +3852,6 @@ react-vis@^1.11.6:
|
||||
prop-types "^15.5.8"
|
||||
react-motion "^0.5.2"
|
||||
|
||||
react-window@^1.8.10:
|
||||
version "1.8.10"
|
||||
resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.10.tgz#9e6b08548316814b443f7002b1cf8fd3a1bdde03"
|
||||
integrity sha512-Y0Cx+dnU6NLa5/EvoHukUD0BklJ8qITCtVEPY1C/nL8wwoZ0b5aEw8Ff1dOVHw7fCzMt55XfJDd8S8W8LCaUCg==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.0.0"
|
||||
memoize-one ">=3.1.1 <6"
|
||||
|
||||
react@^16.11:
|
||||
version "16.14.0"
|
||||
resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
|
||||
@@ -4206,6 +4204,35 @@ shell-quote@^1.8.1:
|
||||
resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
|
||||
integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
|
||||
|
||||
side-channel-list@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
|
||||
integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
|
||||
dependencies:
|
||||
es-errors "^1.3.0"
|
||||
object-inspect "^1.13.3"
|
||||
|
||||
side-channel-map@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42"
|
||||
integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==
|
||||
dependencies:
|
||||
call-bound "^1.0.2"
|
||||
es-errors "^1.3.0"
|
||||
get-intrinsic "^1.2.5"
|
||||
object-inspect "^1.13.3"
|
||||
|
||||
side-channel-weakmap@^1.0.2:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea"
|
||||
integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==
|
||||
dependencies:
|
||||
call-bound "^1.0.2"
|
||||
es-errors "^1.3.0"
|
||||
get-intrinsic "^1.2.5"
|
||||
object-inspect "^1.13.3"
|
||||
side-channel-map "^1.0.1"
|
||||
|
||||
side-channel@^1.0.4:
|
||||
version "1.0.6"
|
||||
resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
|
||||
@@ -4216,6 +4243,17 @@ side-channel@^1.0.4:
|
||||
get-intrinsic "^1.2.4"
|
||||
object-inspect "^1.13.1"
|
||||
|
||||
side-channel@^1.1.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
|
||||
integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
|
||||
dependencies:
|
||||
es-errors "^1.3.0"
|
||||
object-inspect "^1.13.3"
|
||||
side-channel-list "^1.0.0"
|
||||
side-channel-map "^1.0.1"
|
||||
side-channel-weakmap "^1.0.2"
|
||||
|
||||
signal-exit@^3.0.3:
|
||||
version "3.0.7"
|
||||
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
|
||||
@@ -4235,31 +4273,23 @@ sirv@^2.0.3:
|
||||
mrmime "^2.0.0"
|
||||
totalist "^3.0.0"
|
||||
|
||||
socket.io-client@^2.2.0:
|
||||
version "2.5.0"
|
||||
resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.5.0.tgz#34f486f3640dde9c2211fce885ac2746f9baf5cb"
|
||||
integrity sha512-lOO9clmdgssDykiOmVQQitwBAF3I6mYcQAo7hQ7AM6Ny5X7fp8hIJ3HcQs3Rjz4SoggoxA1OgrQyY8EgTbcPYw==
|
||||
socket.io-client@*, socket.io-client@^4.8.1:
|
||||
version "4.8.1"
|
||||
resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.8.1.tgz#1941eca135a5490b94281d0323fe2a35f6f291cb"
|
||||
integrity sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==
|
||||
dependencies:
|
||||
backo2 "1.0.2"
|
||||
component-bind "1.0.0"
|
||||
component-emitter "~1.3.0"
|
||||
debug "~3.1.0"
|
||||
engine.io-client "~3.5.0"
|
||||
has-binary2 "~1.0.2"
|
||||
indexof "0.0.1"
|
||||
parseqs "0.0.6"
|
||||
parseuri "0.0.6"
|
||||
socket.io-parser "~3.3.0"
|
||||
to-array "0.1.4"
|
||||
"@socket.io/component-emitter" "~3.1.0"
|
||||
debug "~4.3.2"
|
||||
engine.io-client "~6.6.1"
|
||||
socket.io-parser "~4.2.4"
|
||||
|
||||
socket.io-parser@~3.3.0:
|
||||
version "3.3.3"
|
||||
resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.3.tgz#3a8b84823eba87f3f7624e64a8aaab6d6318a72f"
|
||||
integrity sha512-qOg87q1PMWWTeO01768Yh9ogn7chB9zkKtQnya41Y355S0UmpXgpcrFwAgjYJxu9BdKug5r5e9YtVSeWhKBUZg==
|
||||
socket.io-parser@~4.2.4:
|
||||
version "4.2.4"
|
||||
resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz#c806966cf7270601e47469ddeec30fbdfda44c83"
|
||||
integrity sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==
|
||||
dependencies:
|
||||
component-emitter "~1.3.0"
|
||||
debug "~3.1.0"
|
||||
isarray "2.0.1"
|
||||
"@socket.io/component-emitter" "~3.1.0"
|
||||
debug "~4.3.1"
|
||||
|
||||
sockjs@^0.3.24:
|
||||
version "0.3.24"
|
||||
@@ -4476,11 +4506,6 @@ tiny-warning@^1.0.2:
|
||||
resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
|
||||
integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
|
||||
|
||||
to-array@0.1.4:
|
||||
version "0.1.4"
|
||||
resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
|
||||
integrity sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A==
|
||||
|
||||
to-regex-range@^5.0.1:
|
||||
version "5.0.1"
|
||||
resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
|
||||
@@ -4503,7 +4528,7 @@ tree-dump@^1.0.0:
|
||||
resolved "https://registry.yarnpkg.com/tree-dump/-/tree-dump-1.0.1.tgz#b448758da7495580e6b7830d6b7834fca4c45b96"
|
||||
integrity sha512-WCkcRBVPSlHHq1dc/px9iOfqklvzCbdRwvlNfxGZsrHqf6aZttfPrd7DJTt6oR10dwUfpFFQeVTkPbBIZxX/YA==
|
||||
|
||||
ts-loader@^9.2.6:
|
||||
ts-loader@^9.5.1:
|
||||
version "9.5.1"
|
||||
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.5.1.tgz#63d5912a86312f1fbe32cef0859fb8b2193d9b89"
|
||||
integrity sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==
|
||||
@@ -4562,6 +4587,14 @@ uri-js@^4.2.2:
|
||||
dependencies:
|
||||
punycode "^2.1.0"
|
||||
|
||||
url@^0.11.4:
|
||||
version "0.11.4"
|
||||
resolved "https://registry.yarnpkg.com/url/-/url-0.11.4.tgz#adca77b3562d56b72746e76b330b7f27b6721f3c"
|
||||
integrity sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==
|
||||
dependencies:
|
||||
punycode "^1.4.1"
|
||||
qs "^6.12.3"
|
||||
|
||||
util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
|
||||
@@ -4810,15 +4843,15 @@ ws@^8.16.0:
|
||||
resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.0.tgz#d145d18eca2ed25aaf791a183903f7be5e295fea"
|
||||
integrity sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==
|
||||
|
||||
ws@~7.4.2:
|
||||
version "7.4.6"
|
||||
resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
|
||||
integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
|
||||
ws@~8.17.1:
|
||||
version "8.17.1"
|
||||
resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
|
||||
integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
|
||||
|
||||
xmlhttprequest-ssl@~1.6.2:
|
||||
version "1.6.3"
|
||||
resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz#03b713873b01659dfa2c1c5d056065b27ddc2de6"
|
||||
integrity sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==
|
||||
xmlhttprequest-ssl@~2.1.1:
|
||||
version "2.1.2"
|
||||
resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz#e9e8023b3f29ef34b97a859f584c5e6c61418e23"
|
||||
integrity sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==
|
||||
|
||||
y18n@^5.0.5:
|
||||
version "5.0.8"
|
||||
@@ -4863,11 +4896,6 @@ yargs@16.2.0:
|
||||
y18n "^5.0.5"
|
||||
yargs-parser "^20.2.2"
|
||||
|
||||
yeast@0.1.2:
|
||||
version "0.1.2"
|
||||
resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
|
||||
integrity sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg==
|
||||
|
||||
yocto-queue@^0.1.0:
|
||||
version "0.1.0"
|
||||
resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
|
||||
|
||||
+31
-13
@@ -4,15 +4,14 @@
|
||||
"description": "",
|
||||
"main": "build/index.js",
|
||||
"scripts": {
|
||||
"test": "mocha --require ts-node/register --require source-map-support/register --recursive ./src/*/**/*.spec.ts",
|
||||
"test": "NODE_PATH=../node_modules TS_NODE_PROJECT=./tsconfig.json mocha --require ts-node/register --require source-map-support/register --recursive ./src/*/**/*.spec.ts",
|
||||
"build": "tsc",
|
||||
"test-inspect": "mocha --inspect-brk --require ts-node/register --require source-map-support/register --recursive ./src/*/**/*.spec.ts",
|
||||
"coverage": "nyc mocha --require ts-node/register --require source-map-support/register --recursive ./src/*/**/*.spec.ts",
|
||||
"debug": "ts-node --inspect ./src/index.ts",
|
||||
"postinstall": "yarn build"
|
||||
"test-inspect": "NODE_PATH=../node_modules TS_NODE_PROJECT=./tsconfig.json mocha --inspect-brk --require ts-node/register --require source-map-support/register --recursive ./src/*/**/*.spec.ts",
|
||||
"coverage": "NODE_PATH=../node_modules TS_NODE_PROJECT=./tsconfig.json nyc mocha --require ts-node/register --require source-map-support/register --recursive ./src/*/**/*.spec.ts",
|
||||
"debug": "ts-node --inspect ./src/index.ts"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
"node": ">=20"
|
||||
},
|
||||
"author": "",
|
||||
"license": "CC-BY-ND-4.0",
|
||||
@@ -38,12 +37,31 @@
|
||||
"sourceMap": true,
|
||||
"instrument": true
|
||||
},
|
||||
"peerDependencies": {
|
||||
"fs-extra": "^8.0.1",
|
||||
"js-base64": "^2.5.1",
|
||||
"long": "^4.0.0",
|
||||
"dependencies": {
|
||||
"@types/sha1": "^1.1.5",
|
||||
"builder-util-runtime": "^9",
|
||||
"fs-extra": "9",
|
||||
"js-base64": "^3.7.2",
|
||||
"lowdb": "^1.0.0",
|
||||
"mqtt": "^3.0.0",
|
||||
"protobufjs": "^6.11.4"
|
||||
"mqtt": "^4.3.6",
|
||||
"protobufjs": "^8.0.0",
|
||||
"sha1": "^1.1.1",
|
||||
"uuid": "^8.3.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/chai": "^4.1.7",
|
||||
"@types/fs-extra": "8",
|
||||
"@types/lowdb": "^1.0.6",
|
||||
"@types/mocha": "^7.0.2",
|
||||
"@types/node": "^25.0.3",
|
||||
"@types/sha1": "^1.1.1",
|
||||
"@types/uuid": "^8.3.4",
|
||||
"chai": "^4.2.0",
|
||||
"electron": "29.2.0",
|
||||
"mocha": "^10.4.0",
|
||||
"nyc": "15",
|
||||
"source-map-support": "^0.5.9",
|
||||
"ts-node": "^10.9.2",
|
||||
"typescript": "^4.5.5"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,14 +2,17 @@ import FileAsync from 'lowdb/adapters/FileAsync'
|
||||
import fs from 'fs-extra'
|
||||
import lowdb from 'lowdb'
|
||||
import path from 'path'
|
||||
import { backendRpc } from '../../events'
|
||||
import { Rpc } from '../../events/EventSystem/Rpc'
|
||||
import { storageClearEvent, storageLoadEvent, storageStoreEvent } from '../../events/StorageEvents'
|
||||
|
||||
export default class ConfigStorage {
|
||||
private file: string
|
||||
private database: any
|
||||
constructor(file: string) {
|
||||
private rpc: Rpc
|
||||
|
||||
constructor(file: string, rpc: Rpc) {
|
||||
this.file = file
|
||||
this.rpc = rpc
|
||||
}
|
||||
|
||||
private async getDb() {
|
||||
@@ -26,13 +29,13 @@ export default class ConfigStorage {
|
||||
}
|
||||
|
||||
public async init() {
|
||||
backendRpc.on(storageStoreEvent, async event => {
|
||||
this.rpc.on(storageStoreEvent, async event => {
|
||||
const db = await this.getDb()
|
||||
await db.set(event.store, event.data).write()
|
||||
return
|
||||
})
|
||||
|
||||
backendRpc.on(storageLoadEvent, async event => {
|
||||
this.rpc.on(storageLoadEvent, async event => {
|
||||
const db = await this.getDb()
|
||||
const data = await db.get(event.store).value()
|
||||
return {
|
||||
@@ -41,7 +44,7 @@ export default class ConfigStorage {
|
||||
}
|
||||
})
|
||||
|
||||
backendRpc.on(storageClearEvent, async event => {
|
||||
this.rpc.on(storageClearEvent, async event => {
|
||||
const db = await this.getDb()
|
||||
const keys = await db.keys().value()
|
||||
for (const key of keys) {
|
||||
|
||||
@@ -1,8 +1,3 @@
|
||||
export interface Destroyable {
|
||||
destroy(): void
|
||||
}
|
||||
|
||||
export interface MemoryLifecycle {
|
||||
retain(): void
|
||||
release(): void
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import { Destroyable, MemoryLifecycle } from './Destroyable'
|
||||
import { Destroyable } from './Destroyable'
|
||||
import { Hashable, TreeNode } from './'
|
||||
const sha1 = require('sha1')
|
||||
|
||||
export class Edge<ViewModel extends Destroyable & MemoryLifecycle> implements Hashable {
|
||||
export class Edge<ViewModel extends Destroyable> implements Hashable {
|
||||
public name: string
|
||||
|
||||
public target!: TreeNode<ViewModel>
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import { ChangeBuffer } from './ChangeBuffer'
|
||||
import { Destroyable, MemoryLifecycle } from './Destroyable'
|
||||
import { Destroyable } from './Destroyable'
|
||||
import { EventDispatcher, makeConnectionMessageEvent, MqttMessage, EventBusInterface } from '../../../events'
|
||||
import { TreeNode } from './'
|
||||
import { TreeNodeFactory } from './TreeNodeFactory'
|
||||
|
||||
export class Tree<ViewModel extends Destroyable & MemoryLifecycle> extends TreeNode<ViewModel> {
|
||||
export class Tree<ViewModel extends Destroyable> extends TreeNode<ViewModel> {
|
||||
public connectionId?: string
|
||||
public updateSource?: EventBusInterface
|
||||
public nodeFilter?: (node: TreeNode<ViewModel>) => boolean
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
import { Destroyable, MemoryLifecycle } from './Destroyable'
|
||||
import { Destroyable } from './Destroyable'
|
||||
import { Edge, Message, RingBuffer, MessageHistory } from './'
|
||||
import { EventDispatcher } from '../../../events'
|
||||
import { TopicViewModel } from '../../../app/src/model/TopicViewModel'
|
||||
|
||||
export type TopicDataType = 'string' | 'json' | 'hex'
|
||||
|
||||
export class TreeNode<ViewModel extends Destroyable & MemoryLifecycle> {
|
||||
export class TreeNode<ViewModel extends Destroyable> {
|
||||
public sourceEdge?: Edge<ViewModel>
|
||||
public message?: Message
|
||||
public messageHistory: MessageHistory = new RingBuffer<Message>(20000, 100)
|
||||
@@ -49,8 +48,6 @@ export class TreeNode<ViewModel extends Destroyable & MemoryLifecycle> {
|
||||
this.onMessage.subscribe(() => {
|
||||
this.lastUpdate = Date.now()
|
||||
})
|
||||
this.viewModel = new TopicViewModel(this as any) as any
|
||||
this.viewModel?.retain()
|
||||
}
|
||||
|
||||
private previous(): TreeNode<ViewModel> | undefined {
|
||||
@@ -120,7 +117,7 @@ export class TreeNode<ViewModel extends Destroyable & MemoryLifecycle> {
|
||||
for (const edge of this.edgeArray) {
|
||||
edge.target.destroy()
|
||||
}
|
||||
this.viewModel?.release()
|
||||
this.viewModel && this.viewModel.destroy()
|
||||
this.viewModel = undefined
|
||||
this.edgeArray = []
|
||||
this.edges = {}
|
||||
@@ -150,7 +147,7 @@ export class TreeNode<ViewModel extends Destroyable & MemoryLifecycle> {
|
||||
}
|
||||
|
||||
public hash(): string {
|
||||
return `N${this.sourceEdge?.hash() ?? ''}`
|
||||
return `N${this.sourceEdge ? this.sourceEdge.hash() : ''}`
|
||||
}
|
||||
|
||||
public firstNode(): TreeNode<ViewModel> {
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import { Destroyable, MemoryLifecycle } from './Destroyable'
|
||||
import { Destroyable } from './Destroyable'
|
||||
import { Edge, Tree, TreeNode } from './'
|
||||
import { MqttMessage } from '../../../events'
|
||||
import { Base64Message } from './Base64Message'
|
||||
|
||||
export abstract class TreeNodeFactory {
|
||||
private static messageCounter = 0
|
||||
public static insertNodeAtPosition<ViewModel extends Destroyable & MemoryLifecycle>(
|
||||
public static insertNodeAtPosition<ViewModel extends Destroyable>(
|
||||
edgeNames: Array<string>,
|
||||
node: TreeNode<ViewModel>
|
||||
) {
|
||||
@@ -21,7 +21,7 @@ export abstract class TreeNodeFactory {
|
||||
node.sourceEdge!.target = node
|
||||
}
|
||||
|
||||
public static fromMessage<ViewModel extends Destroyable & MemoryLifecycle>(
|
||||
public static fromMessage<ViewModel extends Destroyable>(
|
||||
mqttMessage: MqttMessage,
|
||||
receiveDate: Date = new Date()
|
||||
): TreeNode<ViewModel> {
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
import 'mocha'
|
||||
|
||||
import { expect } from 'chai'
|
||||
import { makeTreeNode } from './makeTreeNode'
|
||||
|
||||
describe('TreeNode', () => {
|
||||
const leaf1 = makeTreeNode('foo/bar', 'foo')
|
||||
const leaf2 = makeTreeNode('foo/bar/baz', 'bar')
|
||||
const leaf3 = makeTreeNode('foo/biz/baz', 'bar')
|
||||
const leaf4 = makeTreeNode('bar/biz', 'bar')
|
||||
const root = leaf1.firstNode()
|
||||
|
||||
root.updateWithNode(leaf2.firstNode())
|
||||
root.updateWithNode(leaf3.firstNode())
|
||||
root.updateWithNode(leaf4.firstNode())
|
||||
|
||||
describe('expanding the root should count the children', () => {
|
||||
it('nothing expanded', () => {
|
||||
expect(root?.viewModel?.visibleChildren()).to.eq(1)
|
||||
})
|
||||
|
||||
it('root expanded', () => {
|
||||
root.viewModel?.setExpanded(true)
|
||||
expect(root?.viewModel?.visibleChildren()).to.eq(3)
|
||||
})
|
||||
|
||||
it('root and "foo" expanded', () => {
|
||||
root.viewModel?.setExpanded(true)
|
||||
root.findNode('foo')!.viewModel!.setExpanded(true)
|
||||
expect(root?.viewModel?.visibleChildren()).to.eq(5)
|
||||
})
|
||||
})
|
||||
|
||||
describe('visibleChildAt', () => {
|
||||
it('nothing expanded', () => {
|
||||
expect(root?.viewModel?.visibleChildAt(0)?.[0].path()).to.eq('')
|
||||
})
|
||||
|
||||
it('root expanded', () => {
|
||||
root.viewModel?.setExpanded(true)
|
||||
expect(root?.viewModel?.visibleChildAt(1)?.[0].path()).to.eq('foo')
|
||||
})
|
||||
|
||||
it('root and "foo" expanded', () => {
|
||||
root.viewModel?.setExpanded(true)
|
||||
root.findNode('foo')!.viewModel!.setExpanded(true)
|
||||
expect(root?.viewModel?.visibleChildAt(4)?.[0].path()).to.eq('bar')
|
||||
})
|
||||
})
|
||||
|
||||
describe('getIndex', () => {
|
||||
it('nothing expanded', () => {
|
||||
expect(root?.viewModel?.getIndex()).to.eq(0)
|
||||
})
|
||||
|
||||
it('root expanded', () => {
|
||||
root.viewModel?.setExpanded(true)
|
||||
expect(root?.viewModel?.visibleChildAt(1)?.[0].viewModel?.getIndex()).to.eq(1)
|
||||
})
|
||||
|
||||
it('root and "foo" expanded', () => {
|
||||
root.viewModel?.setExpanded(true)
|
||||
root.findNode('foo')!.viewModel!.setExpanded(true)
|
||||
expect(root?.viewModel?.visibleChildAt(4)?.[0].viewModel?.getIndex()).to.eq(4)
|
||||
})
|
||||
})
|
||||
})
|
||||
+12
-7
@@ -4,15 +4,20 @@ import {
|
||||
AddMqttConnection,
|
||||
MqttMessage,
|
||||
addMqttConnectionEvent,
|
||||
backendEvents,
|
||||
makeConnectionMessageEvent,
|
||||
makeConnectionStateEvent,
|
||||
makePublishEvent,
|
||||
removeConnection,
|
||||
} from '../../events'
|
||||
import { EventBusInterface } from '../../events/EventSystem/EventBusInterface'
|
||||
|
||||
export class ConnectionManager {
|
||||
private connections: { [s: string]: DataSource<any> } = {}
|
||||
private backendEvents: EventBusInterface
|
||||
|
||||
constructor(backendEvents: EventBusInterface) {
|
||||
this.backendEvents = backendEvents
|
||||
}
|
||||
|
||||
private handleConnectionRequest = (event: AddMqttConnection) => {
|
||||
const connectionId = event.id
|
||||
@@ -28,12 +33,12 @@ export class ConnectionManager {
|
||||
|
||||
const connectionStateEvent = makeConnectionStateEvent(connectionId)
|
||||
connection.stateMachine.onUpdate.subscribe(state => {
|
||||
backendEvents.emit(connectionStateEvent, state)
|
||||
this.backendEvents.emit(connectionStateEvent, state)
|
||||
})
|
||||
|
||||
connection.connect(options)
|
||||
this.handleNewMessagesForConnection(connectionId, connection)
|
||||
backendEvents.subscribe(makePublishEvent(connectionId), (msg: MqttMessage) => {
|
||||
this.backendEvents.subscribe(makePublishEvent(connectionId), (msg: MqttMessage) => {
|
||||
this.connections[connectionId].publish(msg)
|
||||
})
|
||||
}
|
||||
@@ -49,7 +54,7 @@ export class ConnectionManager {
|
||||
let decoded_payload = null
|
||||
decoded_payload = Base64Message.fromBuffer(buffer)
|
||||
|
||||
backendEvents.emit(messageEvent, {
|
||||
this.backendEvents.emit(messageEvent, {
|
||||
topic,
|
||||
payload: decoded_payload,
|
||||
qos: packet.qos,
|
||||
@@ -60,8 +65,8 @@ export class ConnectionManager {
|
||||
}
|
||||
|
||||
public manageConnections() {
|
||||
backendEvents.subscribe(addMqttConnectionEvent, this.handleConnectionRequest)
|
||||
backendEvents.subscribe(removeConnection, (connectionId: string) => {
|
||||
this.backendEvents.subscribe(addMqttConnectionEvent, this.handleConnectionRequest)
|
||||
this.backendEvents.subscribe(removeConnection, (connectionId: string) => {
|
||||
this.removeConnection(connectionId)
|
||||
})
|
||||
}
|
||||
@@ -69,7 +74,7 @@ export class ConnectionManager {
|
||||
public removeConnection(connectionId: string) {
|
||||
const connection = this.connections[connectionId]
|
||||
if (connection) {
|
||||
backendEvents.unsubscribeAll(makePublishEvent(connectionId))
|
||||
this.backendEvents.unsubscribeAll(makePublishEvent(connectionId))
|
||||
connection.disconnect()
|
||||
delete this.connections[connectionId]
|
||||
connection.stateMachine.onUpdate.removeAllListeners()
|
||||
|
||||
+14
-2
@@ -6,11 +6,21 @@
|
||||
"strictNullChecks": true,
|
||||
"outDir": "./build",
|
||||
"strict": true,
|
||||
"module": "commonjs",
|
||||
"moduleResolution": "node",
|
||||
"target": "ES2017",
|
||||
"lib": [
|
||||
"es2017",
|
||||
"dom"
|
||||
],
|
||||
"sourceMap": true
|
||||
"sourceMap": true,
|
||||
"esModuleInterop": true
|
||||
},
|
||||
"ts-node": {
|
||||
"compilerOptions": {
|
||||
"module": "commonjs"
|
||||
},
|
||||
"transpileOnly": true
|
||||
},
|
||||
"includes": [
|
||||
"src/**/*.ts"
|
||||
@@ -20,6 +30,8 @@
|
||||
"node_modules",
|
||||
"src/**/*.spec.ts",
|
||||
"**/*.d.ts",
|
||||
"typings"
|
||||
"typings",
|
||||
"../events",
|
||||
"../app"
|
||||
]
|
||||
}
|
||||
+2265
-22
File diff suppressed because it is too large
Load Diff
@@ -1,15 +0,0 @@
|
||||
const eslint = require('@eslint/js')
|
||||
const hooksPlugin = require('eslint-plugin-react-hooks')
|
||||
|
||||
module.export = [
|
||||
// eslint.configs.recommended,
|
||||
{
|
||||
// files: ['app/src/**/*'],
|
||||
plugins: {
|
||||
'react-hooks': hooksPlugin,
|
||||
},
|
||||
ignores: ['build/**/*', 'dist/**/*', 'node_modules/**/*', 'app/build/**/*'],
|
||||
ignorePatterns: ['build/**/*', 'dist/**/*', 'node_modules/**/*', 'app/build/**/*'],
|
||||
rules: hooksPlugin.configs.recommended.rules,
|
||||
},
|
||||
]
|
||||
@@ -0,0 +1,29 @@
|
||||
// Browser-specific EventBus implementation using Socket.io
|
||||
import io from 'socket.io-client'
|
||||
import { SocketIOClientEventBus } from './SocketIOClientEventBus'
|
||||
import { Rpc } from './Rpc'
|
||||
|
||||
// Get auth from sessionStorage or use empty (will show login dialog)
|
||||
const username = typeof sessionStorage !== 'undefined' ? sessionStorage.getItem('mqtt-explorer-username') || '' : ''
|
||||
const password = typeof sessionStorage !== 'undefined' ? sessionStorage.getItem('mqtt-explorer-password') || '' : ''
|
||||
|
||||
// Connect to the server (same origin in browser mode)
|
||||
const socket = io({
|
||||
auth: {
|
||||
username,
|
||||
password,
|
||||
},
|
||||
reconnection: true,
|
||||
reconnectionDelay: 1000,
|
||||
reconnectionDelayMax: 5000,
|
||||
reconnectionAttempts: Infinity,
|
||||
transports: ['websocket', 'polling'],
|
||||
})
|
||||
|
||||
export const rendererEvents = new SocketIOClientEventBus(socket)
|
||||
export const rendererRpc = new Rpc(rendererEvents)
|
||||
|
||||
// In browser mode, the backend is on the server
|
||||
// For compatibility, export same instances (renderer communicates with server backend via socket)
|
||||
export const backendEvents = rendererEvents
|
||||
export const backendRpc = rendererRpc
|
||||
@@ -1,24 +1,54 @@
|
||||
import { IpcMain } from 'electron'
|
||||
import { IpcMain, WebContents } from 'electron'
|
||||
import { Event } from '../Events'
|
||||
import { EventBusInterface } from './EventBusInterface'
|
||||
|
||||
export class IpcMainEventBus implements EventBusInterface {
|
||||
private ipc: IpcMain
|
||||
private client: any
|
||||
private clients: Map<number, WebContents> = new Map() // webContentsId -> WebContents
|
||||
private connectionOwners: Map<string, number> = new Map() // connectionId -> webContentsId
|
||||
private currentClient: WebContents | undefined
|
||||
|
||||
constructor(ipc: IpcMain) {
|
||||
this.ipc = ipc
|
||||
}
|
||||
|
||||
public subscribe<MessageType>(subscribeEvent: Event<MessageType>, callback: (msg: MessageType) => void) {
|
||||
console.log('subscribing', subscribeEvent.topic)
|
||||
this.ipc.on(subscribeEvent.topic, (event: any, arg: any) => {
|
||||
this.client = event.sender
|
||||
const sender = event.sender as WebContents
|
||||
this.currentClient = sender
|
||||
|
||||
// Track the client (O(1) operation)
|
||||
if (!this.clients.has(sender.id)) {
|
||||
this.clients.set(sender.id, sender)
|
||||
|
||||
// Clean up when window is closed
|
||||
sender.once('destroyed', () => {
|
||||
this.clients.delete(sender.id)
|
||||
|
||||
// Clean up owned connections
|
||||
for (const [connectionId, webContentsId] of this.connectionOwners.entries()) {
|
||||
if (webContentsId === sender.id) {
|
||||
this.connectionOwners.delete(connectionId)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// Track connection ownership
|
||||
if (subscribeEvent.topic === 'connection/add/mqtt' && arg?.id) {
|
||||
this.connectionOwners.set(arg.id, sender.id)
|
||||
}
|
||||
|
||||
// Remove connection ownership
|
||||
if (subscribeEvent.topic === 'connection/remove' && typeof arg === 'string') {
|
||||
this.connectionOwners.delete(arg)
|
||||
}
|
||||
|
||||
callback(arg)
|
||||
})
|
||||
}
|
||||
|
||||
public unsubscribeAll<MessageType>(event: Event<MessageType>) {
|
||||
console.log('unsubscribeAll', event.topic)
|
||||
this.ipc.removeAllListeners(event.topic)
|
||||
}
|
||||
|
||||
@@ -27,8 +57,44 @@ export class IpcMainEventBus implements EventBusInterface {
|
||||
}
|
||||
|
||||
public emit<MessageType>(event: Event<MessageType>, msg: MessageType) {
|
||||
if (!this.client.isDestroyed()) {
|
||||
this.client.send(event.topic, msg)
|
||||
const topic = event.topic
|
||||
|
||||
// RPC responses go only to the requesting client
|
||||
if (topic.includes('/response/')) {
|
||||
if (this.currentClient && !this.currentClient.isDestroyed()) {
|
||||
this.currentClient.send(topic, msg)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// Connection-specific events - optimized with early pattern match
|
||||
if (topic.startsWith('conn/')) {
|
||||
const parts = topic.split('/')
|
||||
let connectionId: string | undefined
|
||||
|
||||
if (parts.length === 2) {
|
||||
connectionId = parts[1]
|
||||
} else if (parts.length === 3 && (parts[1] === 'state' || parts[1] === 'publish')) {
|
||||
connectionId = parts[2]
|
||||
}
|
||||
|
||||
if (connectionId) {
|
||||
const ownerWebContentsId = this.connectionOwners.get(connectionId)
|
||||
if (ownerWebContentsId !== undefined) {
|
||||
const ownerClient = this.clients.get(ownerWebContentsId)
|
||||
if (ownerClient && !ownerClient.isDestroyed()) {
|
||||
ownerClient.send(topic, msg)
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// All other events go to all clients
|
||||
this.clients.forEach(client => {
|
||||
if (!client.isDestroyed()) {
|
||||
client.send(topic, msg)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
import { IpcMain } from 'electron'
|
||||
import { Event } from '../Events'
|
||||
import { EventBusInterface } from './EventBusInterface'
|
||||
import { MessageCodec } from './MessageCodec'
|
||||
|
||||
/**
|
||||
* Enhanced IPC Main Event Bus with Protobuf support
|
||||
*
|
||||
* This version uses binary serialization for better performance
|
||||
* while maintaining backward compatibility with the old JSON-based system.
|
||||
*/
|
||||
export class IpcMainEventBusV2 implements EventBusInterface {
|
||||
private ipc: IpcMain
|
||||
private client: any
|
||||
private useBinary: boolean
|
||||
|
||||
constructor(ipc: IpcMain, useBinary: boolean = true) {
|
||||
this.ipc = ipc
|
||||
this.useBinary = useBinary
|
||||
}
|
||||
|
||||
public subscribe<MessageType>(subscribeEvent: Event<MessageType>, callback: (msg: MessageType) => void) {
|
||||
console.log('subscribing', subscribeEvent.topic, this.useBinary ? '(binary)' : '(json)')
|
||||
this.ipc.on(subscribeEvent.topic, (event: any, arg: any) => {
|
||||
this.client = event.sender
|
||||
|
||||
if (this.useBinary && arg instanceof Uint8Array) {
|
||||
// Binary message - decode it
|
||||
const { data } = MessageCodec.decodeWithPayload<MessageType>(arg)
|
||||
callback(data)
|
||||
} else {
|
||||
// Regular JSON message
|
||||
callback(arg)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
public unsubscribeAll<MessageType>(event: Event<MessageType>) {
|
||||
console.log('unsubscribeAll', event.topic)
|
||||
this.ipc.removeAllListeners(event.topic)
|
||||
}
|
||||
|
||||
public unsubscribe<MessageType>(event: Event<MessageType>, callback: any) {
|
||||
throw new Error('Not implemented') // Todo: implement
|
||||
}
|
||||
|
||||
public emit<MessageType>(event: Event<MessageType>, msg: MessageType) {
|
||||
if (!this.client || this.client.isDestroyed()) {
|
||||
return
|
||||
}
|
||||
|
||||
if (this.useBinary) {
|
||||
// Encode as binary
|
||||
const binary = MessageCodec.encode(event.topic, msg)
|
||||
this.client.send(event.topic, binary)
|
||||
} else {
|
||||
// Send as JSON (legacy)
|
||||
this.client.send(event.topic, msg)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
import { CallbackStore } from './CallbackStore'
|
||||
import { EventBusInterface } from './EventBusInterface'
|
||||
import { Event } from '../Events'
|
||||
import { IpcRenderer } from 'electron'
|
||||
import { MessageCodec } from './MessageCodec'
|
||||
|
||||
/**
|
||||
* Enhanced IPC Renderer Event Bus with Protobuf support
|
||||
*
|
||||
* This version uses binary serialization for better performance
|
||||
* while maintaining backward compatibility with the old JSON-based system.
|
||||
*/
|
||||
export class IpcRendererEventBusV2 implements EventBusInterface {
|
||||
private ipc: IpcRenderer
|
||||
private callbacks: Array<CallbackStore> = []
|
||||
private useBinary: boolean
|
||||
|
||||
constructor(ipc: IpcRenderer, useBinary: boolean = true) {
|
||||
this.ipc = ipc
|
||||
this.useBinary = useBinary
|
||||
}
|
||||
|
||||
public subscribe<MessageType>(event: Event<MessageType>, callback: (msg: MessageType) => void) {
|
||||
const wrappedCallback = (_: any, arg: any) => {
|
||||
if (this.useBinary && arg instanceof Uint8Array) {
|
||||
// Binary message - decode it
|
||||
const { data } = MessageCodec.decodeWithPayload<MessageType>(arg)
|
||||
callback(data)
|
||||
} else {
|
||||
// Regular JSON message
|
||||
callback(arg)
|
||||
}
|
||||
}
|
||||
console.log('subscribing', event.topic, this.useBinary ? '(binary)' : '(json)')
|
||||
this.ipc.on(event.topic, wrappedCallback)
|
||||
this.callbacks.push({
|
||||
callback,
|
||||
wrappedCallback,
|
||||
})
|
||||
}
|
||||
|
||||
public unsubscribeAll<MessageType>(event: Event<MessageType>) {
|
||||
this.ipc.removeAllListeners(event.topic)
|
||||
}
|
||||
|
||||
public unsubscribe<MessageType>(event: Event<MessageType>, callback: any) {
|
||||
const item = this.callbacks.find(store => store.callback === callback)
|
||||
if (!item) {
|
||||
return
|
||||
}
|
||||
this.ipc.removeListener(event.topic, item.wrappedCallback)
|
||||
this.callbacks = this.callbacks.filter(a => a !== item)
|
||||
}
|
||||
|
||||
public emit<MessageType>(event: Event<MessageType>, msg: MessageType) {
|
||||
if (this.useBinary) {
|
||||
// Encode as binary
|
||||
const binary = MessageCodec.encode(event.topic, msg)
|
||||
this.ipc.send(event.topic, binary)
|
||||
} else {
|
||||
// Send as JSON (legacy)
|
||||
this.ipc.send(event.topic, msg)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
/**
|
||||
* Binary Message Codec using Protobuf
|
||||
*
|
||||
* This provides efficient binary serialization for IPC messages,
|
||||
* avoiding JSON stringify/parse overhead.
|
||||
*/
|
||||
|
||||
import * as protobuf from 'protobufjs'
|
||||
|
||||
// Define message schema
|
||||
const messageSchema = {
|
||||
nested: {
|
||||
mqtt: {
|
||||
nested: {
|
||||
Envelope: {
|
||||
fields: {
|
||||
topic: { type: 'string', id: 1 },
|
||||
payload: { type: 'bytes', id: 2 },
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
// Create root from JSON schema
|
||||
const root = protobuf.Root.fromJSON(messageSchema)
|
||||
const Envelope = root.lookupType('mqtt.Envelope')
|
||||
|
||||
export interface BinaryMessage {
|
||||
topic: string
|
||||
payload: Uint8Array
|
||||
}
|
||||
|
||||
export class MessageCodec {
|
||||
/**
|
||||
* Encode a message to binary format
|
||||
*/
|
||||
public static encode(topic: string, data: any): Uint8Array {
|
||||
// Serialize the payload to JSON, then to bytes
|
||||
const jsonString = JSON.stringify(data)
|
||||
const payloadBytes = new TextEncoder().encode(jsonString)
|
||||
|
||||
// Create protobuf envelope
|
||||
const message = Envelope.create({
|
||||
topic,
|
||||
payload: payloadBytes,
|
||||
})
|
||||
|
||||
// Encode to binary
|
||||
return Envelope.encode(message).finish()
|
||||
}
|
||||
|
||||
/**
|
||||
* Decode a binary message
|
||||
*/
|
||||
public static decode(binary: Uint8Array): BinaryMessage {
|
||||
const message = Envelope.decode(binary) as any
|
||||
return {
|
||||
topic: message.topic,
|
||||
payload: message.payload,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Decode and parse payload as JSON
|
||||
*/
|
||||
public static decodeWithPayload<T>(binary: Uint8Array): { topic: string; data: T } {
|
||||
const { topic, payload } = this.decode(binary)
|
||||
const jsonString = new TextDecoder().decode(payload)
|
||||
const data = JSON.parse(jsonString)
|
||||
return { topic, data }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
import { Socket } from 'socket.io-client'
|
||||
import { CallbackStore } from './CallbackStore'
|
||||
import { EventBusInterface } from './EventBusInterface'
|
||||
import { Event } from '../Events'
|
||||
|
||||
export class SocketIOClientEventBus implements EventBusInterface {
|
||||
private socket: Socket
|
||||
private callbacks: Array<CallbackStore> = []
|
||||
|
||||
constructor(socket: Socket) {
|
||||
this.socket = socket
|
||||
}
|
||||
|
||||
public subscribe<MessageType>(event: Event<MessageType>, callback: (msg: MessageType) => void) {
|
||||
const wrappedCallback = (arg: any) => {
|
||||
callback(arg)
|
||||
}
|
||||
console.log('subscribing', event.topic)
|
||||
this.socket.on(event.topic, wrappedCallback)
|
||||
this.callbacks.push({
|
||||
callback,
|
||||
wrappedCallback,
|
||||
})
|
||||
}
|
||||
|
||||
public unsubscribeAll<MessageType>(event: Event<MessageType>) {
|
||||
this.socket.removeAllListeners(event.topic)
|
||||
}
|
||||
|
||||
public unsubscribe<MessageType>(event: Event<MessageType>, callback: any) {
|
||||
const item = this.callbacks.find(store => store.callback === callback)
|
||||
if (!item) {
|
||||
return
|
||||
}
|
||||
this.socket.off(event.topic, item.wrappedCallback)
|
||||
this.callbacks = this.callbacks.filter(a => a !== item)
|
||||
}
|
||||
|
||||
public emit<MessageType>(event: Event<MessageType>, msg: MessageType) {
|
||||
this.socket.emit(event.topic, msg)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,274 @@
|
||||
import { Server as SocketIOServer, Socket } from 'socket.io'
|
||||
import { Event } from '../Events'
|
||||
import { EventBusInterface } from './EventBusInterface'
|
||||
import Debug from 'debug'
|
||||
|
||||
const debug = Debug('mqtt-explorer:socketio')
|
||||
const debugConnect = Debug('mqtt-explorer:socketio:connect')
|
||||
const debugDisconnect = Debug('mqtt-explorer:socketio:disconnect')
|
||||
const debugSubscriptions = Debug('mqtt-explorer:socketio:subscriptions')
|
||||
const debugConnections = Debug('mqtt-explorer:socketio:connections')
|
||||
const debugEmit = Debug('mqtt-explorer:socketio:emit')
|
||||
|
||||
interface SocketSubscription {
|
||||
topic: string
|
||||
handler: (arg: any) => void
|
||||
}
|
||||
|
||||
export class SocketIOServerEventBus implements EventBusInterface {
|
||||
private io: SocketIOServer
|
||||
private clients: Map<string, Socket> = new Map() // socketId -> Socket
|
||||
|
||||
// Global handlers that apply to ALL sockets (like RPC endpoints)
|
||||
private globalHandlers: Map<string, (socket: Socket, arg: any) => void> = new Map()
|
||||
|
||||
// Per-socket subscriptions for cleanup
|
||||
private socketSubscriptions: Map<string, SocketSubscription[]> = new Map()
|
||||
|
||||
// Track which socket is currently processing a request
|
||||
private currentSocket: Socket | undefined
|
||||
|
||||
// Map connectionId -> socketId to route messages to correct client
|
||||
private connectionOwners: Map<string, string> = new Map()
|
||||
|
||||
// Track which connections to close when a socket disconnects
|
||||
private socketConnections: Map<string, Set<string>> = new Map()
|
||||
|
||||
constructor(io: SocketIOServer) {
|
||||
this.io = io
|
||||
|
||||
// Register connection handler once
|
||||
this.io.on('connection', socket => {
|
||||
debugConnect('Client connected: %s', socket.id)
|
||||
this.clients.set(socket.id, socket)
|
||||
this.socketSubscriptions.set(socket.id, [])
|
||||
this.socketConnections.set(socket.id, new Set())
|
||||
|
||||
// Register all global handlers on this socket
|
||||
this.globalHandlers.forEach((handler, topic) => {
|
||||
this.registerHandlerOnSocket(socket, topic, handler)
|
||||
})
|
||||
|
||||
// Log connection metrics
|
||||
this.logConnectionMetrics('connect', socket.id)
|
||||
|
||||
socket.on('disconnect', () => {
|
||||
debugDisconnect('Client disconnected: %s', socket.id)
|
||||
this.cleanupSocket(socket)
|
||||
this.clients.delete(socket.id)
|
||||
this.logConnectionMetrics('disconnect', socket.id)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
private logConnectionMetrics(event: 'connect' | 'disconnect', socketId: string) {
|
||||
const totalClients = this.clients.size
|
||||
const totalSubscriptions = Array.from(this.socketSubscriptions.values()).reduce((sum, subs) => sum + subs.length, 0)
|
||||
const totalConnections = this.connectionOwners.size
|
||||
const socketSubs = this.socketSubscriptions.get(socketId)?.length || 0
|
||||
const socketConns = this.socketConnections.get(socketId)?.size || 0
|
||||
|
||||
debug(
|
||||
'[%s] clients=%d subscriptions=%d mqttConns=%d | socket[%s]: subs=%d conns=%d',
|
||||
event,
|
||||
totalClients,
|
||||
totalSubscriptions,
|
||||
|
||||
totalConnections,
|
||||
socketId.substring(0, 8),
|
||||
socketSubs,
|
||||
socketConns
|
||||
)
|
||||
|
||||
debugSubscriptions(
|
||||
'Total subscriptions: %d across %d sockets (avg: %d per socket)',
|
||||
totalSubscriptions,
|
||||
totalClients,
|
||||
totalClients > 0 ? Math.round(totalSubscriptions / totalClients) : 0
|
||||
)
|
||||
|
||||
debugConnections(
|
||||
'MQTT connections: %d total, %d owned by socket %s',
|
||||
totalConnections,
|
||||
socketConns,
|
||||
socketId.substring(0, 8)
|
||||
)
|
||||
}
|
||||
|
||||
private registerHandlerOnSocket(socket: Socket, topic: string, handler: (socket: Socket, arg: any) => void) {
|
||||
const wrappedHandler = (arg: any) => {
|
||||
this.currentSocket = socket
|
||||
|
||||
// Track connection ownership when a connection is added
|
||||
if (topic === 'connection/add/mqtt' && arg?.id) {
|
||||
this.connectionOwners.set(arg.id, socket.id)
|
||||
const socketConns = this.socketConnections.get(socket.id)
|
||||
if (socketConns) {
|
||||
socketConns.add(arg.id)
|
||||
}
|
||||
debugConnections(
|
||||
'Connection %s owned by socket %s (total: %d)',
|
||||
arg.id,
|
||||
socket.id.substring(0, 8),
|
||||
socketConns?.size || 0
|
||||
)
|
||||
}
|
||||
|
||||
// Remove connection ownership when a connection is removed
|
||||
if (topic === 'connection/remove' && typeof arg === 'string') {
|
||||
this.connectionOwners.delete(arg)
|
||||
const socketConns = this.socketConnections.get(socket.id)
|
||||
if (socketConns) {
|
||||
socketConns.delete(arg)
|
||||
}
|
||||
debugConnections(
|
||||
'Connection %s removed (socket %s remaining: %d)',
|
||||
arg,
|
||||
socket.id.substring(0, 8),
|
||||
socketConns?.size || 0
|
||||
)
|
||||
}
|
||||
|
||||
handler(socket, arg)
|
||||
}
|
||||
|
||||
socket.on(topic, wrappedHandler)
|
||||
|
||||
// Track subscription for cleanup
|
||||
const subscriptions = this.socketSubscriptions.get(socket.id)
|
||||
if (subscriptions) {
|
||||
subscriptions.push({ topic, handler: wrappedHandler })
|
||||
}
|
||||
}
|
||||
|
||||
private cleanupSocket(socket: Socket) {
|
||||
debugDisconnect('Cleaning up socket %s', socket.id)
|
||||
|
||||
// Remove all event listeners for this socket
|
||||
const subscriptions = this.socketSubscriptions.get(socket.id)
|
||||
if (subscriptions) {
|
||||
subscriptions.forEach(({ topic, handler }) => {
|
||||
socket.off(topic, handler)
|
||||
})
|
||||
this.socketSubscriptions.delete(socket.id)
|
||||
debugSubscriptions('Removed %d subscriptions for socket %s', subscriptions.length, socket.id.substring(0, 8))
|
||||
}
|
||||
|
||||
// Close all MQTT connections owned by this socket
|
||||
const ownedConnections = this.socketConnections.get(socket.id)
|
||||
if (ownedConnections && ownedConnections.size > 0) {
|
||||
debugConnections(
|
||||
'Socket %s owned %d connections, requesting cleanup',
|
||||
socket.id.substring(0, 8),
|
||||
ownedConnections.size
|
||||
)
|
||||
|
||||
// Emit connection/remove for each owned connection
|
||||
// This will be handled by ConnectionManager to actually close the MQTT connection
|
||||
ownedConnections.forEach(connectionId => {
|
||||
debugConnections('Auto-closing connection %s (owner disconnected)', connectionId)
|
||||
// Simulate a remove request from this socket
|
||||
const removeHandler = this.globalHandlers.get('connection/remove')
|
||||
if (removeHandler) {
|
||||
this.currentSocket = socket
|
||||
removeHandler(socket, connectionId)
|
||||
}
|
||||
this.connectionOwners.delete(connectionId)
|
||||
})
|
||||
|
||||
this.socketConnections.delete(socket.id)
|
||||
}
|
||||
|
||||
// Remove from clients set
|
||||
this.clients.delete(socket.id)
|
||||
|
||||
// Clear current socket if it was this one
|
||||
if (this.currentSocket === socket) {
|
||||
this.currentSocket = undefined
|
||||
}
|
||||
|
||||
debugDisconnect('Cleanup complete for socket %s', socket.id.substring(0, 8))
|
||||
}
|
||||
|
||||
public subscribe<MessageType>(subscribeEvent: Event<MessageType>, callback: (msg: MessageType) => void) {
|
||||
const handler = (socket: Socket, arg: any) => {
|
||||
this.currentSocket = socket
|
||||
callback(arg)
|
||||
}
|
||||
|
||||
// Store as global handler
|
||||
this.globalHandlers.set(subscribeEvent.topic, handler)
|
||||
|
||||
// Register on all currently connected clients
|
||||
this.clients.forEach(client => {
|
||||
this.registerHandlerOnSocket(client, subscribeEvent.topic, handler)
|
||||
})
|
||||
}
|
||||
|
||||
public unsubscribeAll<MessageType>(event: Event<MessageType>) {
|
||||
// Remove from global handlers
|
||||
this.globalHandlers.delete(event.topic)
|
||||
|
||||
// Remove from all sockets
|
||||
this.clients.forEach(client => {
|
||||
const subscriptions = this.socketSubscriptions.get(client.id)
|
||||
if (subscriptions) {
|
||||
const toRemove = subscriptions.filter(s => s.topic === event.topic)
|
||||
toRemove.forEach(({ handler }) => {
|
||||
client.off(event.topic, handler)
|
||||
})
|
||||
|
||||
// Update subscriptions list
|
||||
this.socketSubscriptions.set(
|
||||
client.id,
|
||||
subscriptions.filter(s => s.topic !== event.topic)
|
||||
)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
public unsubscribe<MessageType>(event: Event<MessageType>, callback: any) {
|
||||
throw new Error('Not implemented - use unsubscribeAll instead')
|
||||
}
|
||||
|
||||
public emit<MessageType>(event: Event<MessageType>, msg: MessageType) {
|
||||
const topic = event.topic
|
||||
|
||||
// Check if this is an RPC response (contains /response/ in topic)
|
||||
if (topic.includes('/response/')) {
|
||||
if (this.currentSocket && this.currentSocket.connected) {
|
||||
this.currentSocket.emit(topic, msg)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// Check if this is a connection-specific event - optimized with early pattern match
|
||||
// Patterns: conn/${connectionId}, conn/state/${connectionId}, conn/publish/${connectionId}
|
||||
if (topic.startsWith('conn/')) {
|
||||
const parts = topic.split('/')
|
||||
let connectionId: string | undefined
|
||||
|
||||
if (parts.length === 2) {
|
||||
// conn/${connectionId}
|
||||
connectionId = parts[1]
|
||||
} else if (parts.length === 3 && (parts[1] === 'state' || parts[1] === 'publish')) {
|
||||
// conn/state/${connectionId} or conn/publish/${connectionId}
|
||||
connectionId = parts[2]
|
||||
}
|
||||
|
||||
if (connectionId) {
|
||||
const ownerSocketId = this.connectionOwners.get(connectionId)
|
||||
if (ownerSocketId) {
|
||||
const ownerSocket = this.clients.get(ownerSocketId)
|
||||
if (ownerSocket && ownerSocket.connected) {
|
||||
ownerSocket.emit(topic, msg)
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// All other events go to all clients
|
||||
this.io.emit(topic, msg)
|
||||
}
|
||||
}
|
||||
@@ -54,3 +54,11 @@ export function makeConnectionMessageEvent(connectionId: string): Event<MqttMess
|
||||
export const getAppVersion: RpcEvent<void, string> = {
|
||||
topic: 'getAppVersion',
|
||||
}
|
||||
|
||||
export const writeToFile: RpcEvent<{ filePath: string; data: string; encoding?: string }, void> = {
|
||||
topic: 'writeFile',
|
||||
}
|
||||
|
||||
export const readFromFile: RpcEvent<{ filePath: string; encoding?: string }, Buffer> = {
|
||||
topic: 'readFromFile',
|
||||
}
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
/**
|
||||
* Simplified Event System V2
|
||||
*
|
||||
* This provides a simpler, more type-safe way to define and use events.
|
||||
* Instead of factory functions like makeConnectionStateEvent(id),
|
||||
* you can now use: Events.connectionState(id)
|
||||
*/
|
||||
|
||||
import { Base64MessageDTO } from '../backend/src/Model/Base64Message'
|
||||
import { DataSourceState, MqttOptions } from '../backend/src/DataSource'
|
||||
import { UpdateInfo } from 'builder-util-runtime'
|
||||
import { RpcEvent } from './EventSystem/Rpc'
|
||||
|
||||
export type EventV2<MessageType> = {
|
||||
topic: string
|
||||
}
|
||||
|
||||
// Simple event definitions (no parameters)
|
||||
export const Events = {
|
||||
// Connection management
|
||||
addMqttConnection: { topic: 'connection/add/mqtt' } as EventV2<AddMqttConnectionV2>,
|
||||
removeConnection: { topic: 'connection/remove' } as EventV2<string>,
|
||||
updateAvailable: { topic: 'app/update/available' } as EventV2<UpdateInfo>,
|
||||
|
||||
// Parameterized events (for connection-specific events)
|
||||
connectionState: (connectionId: string) => ({ topic: `conn/state/${connectionId}` }) as EventV2<DataSourceState>,
|
||||
connectionMessage: (connectionId: string) => ({ topic: `conn/${connectionId}` }) as EventV2<MqttMessageV2>,
|
||||
publish: (connectionId: string) => ({ topic: `conn/publish/${connectionId}` }) as EventV2<MqttMessageV2>,
|
||||
}
|
||||
|
||||
// RPC Events - type-safe request/response patterns
|
||||
export const RpcEvents = {
|
||||
getAppVersion: { topic: 'getAppVersion' } as RpcEvent<void, string>,
|
||||
writeToFile: { topic: 'writeFile' } as RpcEvent<{ filePath: string; data: string; encoding?: string }, void>,
|
||||
readFromFile: { topic: 'readFromFile' } as RpcEvent<{ filePath: string; encoding?: string }, Buffer>,
|
||||
openDialog: { topic: 'openDialog' } as RpcEvent<OpenDialogOptionsV2, OpenDialogReturnValueV2>,
|
||||
saveDialog: { topic: 'saveDialog' } as RpcEvent<SaveDialogOptionsV2, SaveDialogReturnValueV2>,
|
||||
uploadCertificate: { topic: 'uploadCertificate' } as RpcEvent<CertificateUploadRequest, CertificateUploadResponse>,
|
||||
}
|
||||
|
||||
// Type definitions
|
||||
export interface AddMqttConnectionV2 {
|
||||
id: string
|
||||
options: MqttOptions
|
||||
}
|
||||
|
||||
export interface MqttMessageV2 {
|
||||
topic: string
|
||||
payload: Base64MessageDTO | null
|
||||
qos: 0 | 1 | 2
|
||||
retain: boolean
|
||||
messageId: number | undefined
|
||||
}
|
||||
|
||||
export interface CertificateUploadRequest {
|
||||
filename: string
|
||||
data: string // base64 encoded
|
||||
}
|
||||
|
||||
export interface CertificateUploadResponse {
|
||||
name: string
|
||||
data: string // base64 encoded
|
||||
}
|
||||
|
||||
// Electron dialog types (re-exported for convenience)
|
||||
import { OpenDialogOptions, OpenDialogReturnValue, SaveDialogOptions, SaveDialogReturnValue } from 'electron'
|
||||
|
||||
export type OpenDialogOptionsV2 = OpenDialogOptions
|
||||
export type OpenDialogReturnValueV2 = OpenDialogReturnValue
|
||||
export type SaveDialogOptionsV2 = SaveDialogOptions
|
||||
export type SaveDialogReturnValueV2 = SaveDialogReturnValue
|
||||
@@ -1,8 +1,15 @@
|
||||
import { OpenDialogOptions, OpenDialogReturnValue } from 'electron'
|
||||
import { OpenDialogOptions, OpenDialogReturnValue, SaveDialogOptions, SaveDialogReturnValue } from 'electron'
|
||||
import { RpcEvent } from './EventSystem/Rpc'
|
||||
|
||||
// Legacy functions - use RpcEvents from EventsV2.ts for new code
|
||||
export function makeOpenDialogRpc(): RpcEvent<OpenDialogOptions, OpenDialogReturnValue> {
|
||||
return {
|
||||
topic: 'openDialog',
|
||||
}
|
||||
}
|
||||
|
||||
export function makeSaveDialogRpc(): RpcEvent<SaveDialogOptions, SaveDialogReturnValue> {
|
||||
return {
|
||||
topic: 'saveDialog',
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
export * from './Events'
|
||||
export * from './EventsV2'
|
||||
export * from './EventSystem/EventDispatcher'
|
||||
export * from './EventSystem/EventBus'
|
||||
export * from './EventSystem/EventBusInterface'
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"mcpServers": {
|
||||
"playwright": {
|
||||
"command": "npx",
|
||||
"args": [
|
||||
"-y",
|
||||
"@modelcontextprotocol/server-playwright"
|
||||
],
|
||||
"env": {
|
||||
"PLAYWRIGHT_BROWSERS_PATH": "0"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+17
-2
@@ -4,18 +4,24 @@
|
||||
"description": "Explore your message queues",
|
||||
"main": "dist/src/electron.js",
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
"node": ">=20"
|
||||
},
|
||||
"private": "true",
|
||||
"scripts": {
|
||||
"start": "electron .",
|
||||
"start:server": "npx tsc && node dist/src/server.js",
|
||||
"test": "yarn test:app && yarn test:backend",
|
||||
"test:app": "cd app && yarn test",
|
||||
"test:backend": "cd backend && yarn test",
|
||||
"test:ui": "tsc && mocha --require source-map-support/register dist/src/spec/ui-tests.spec.js",
|
||||
"test:mcp": "tsc && node dist/src/spec/testMcpIntrospection.js",
|
||||
"install": "cd app && yarn && cd ..",
|
||||
"dev": "npm-run-all --parallel dev:*",
|
||||
"dev:app": "cd app && npm run dev",
|
||||
"dev:electron": "tsc && electron . --development",
|
||||
"dev:server": "npm-run-all --parallel dev:server:*",
|
||||
"dev:server:app": "cd app && npx webpack-dev-server --config webpack.browser.config.js --mode development --progress",
|
||||
"dev:server:backend": "tsc && node dist/src/server.js",
|
||||
"lint": "npm-run-all --parallel lint:prettier lint:tslint lint:spellcheck",
|
||||
"lint:fix": "npm-run-all lint:tslint:fix lint:prettier:fix",
|
||||
"lint:prettier": "prettier --check \"**/*.ts{x,}\"",
|
||||
@@ -24,6 +30,7 @@
|
||||
"lint:tslint:fix": "tslint -p ./ --fix",
|
||||
"lint:spellcheck": "cspell -e ./build -e \"node_modules\" \"**/*.ts{x,}\"",
|
||||
"build": "tsc && cd app && yarn run build && cd ..",
|
||||
"build:server": "npx tsc && cd app && npx webpack --config webpack.browser.config.js --mode production && cd ..",
|
||||
"prepare-release": "ts-node scripts/prepare-release.ts",
|
||||
"package": "ts-node package.ts",
|
||||
"ui-test": "./scripts/uiTests.sh",
|
||||
@@ -82,15 +89,18 @@
|
||||
"@semantic-release/changelog": "^6.0.3",
|
||||
"@semantic-release/commit-analyzer": "^12.0.0",
|
||||
"@semantic-release/git": "^10.0.1",
|
||||
"@types/bcryptjs": "^3.0.0",
|
||||
"@types/chai": "^4.1.7",
|
||||
"@types/express": "^5.0.6",
|
||||
"@types/fs-extra": "8",
|
||||
"@types/lowdb": "^1.0.6",
|
||||
"@types/mime": "^2.0.0",
|
||||
"@types/mocha": "^7.0.2",
|
||||
"@types/mustache": "4",
|
||||
"@types/node": "^12.6.8",
|
||||
"@types/node": "^25.0.3",
|
||||
"@types/semver": "7",
|
||||
"@types/sha1": "^1.1.1",
|
||||
"@types/socket.io": "^3.0.2",
|
||||
"@types/uuid": "^8.3.4",
|
||||
"builder-util-runtime": "^9",
|
||||
"chai": "^4.2.0",
|
||||
@@ -118,16 +128,21 @@
|
||||
"dependencies": {
|
||||
"about-window": "^1.12.1",
|
||||
"axios": "^0.28.0",
|
||||
"bcryptjs": "^3.0.3",
|
||||
"debug": "^4.3.4",
|
||||
"dot-prop": "^5.0.0",
|
||||
"electron-log": "4.4.6",
|
||||
"electron-updater": "^4.6",
|
||||
"express": "^5.2.1",
|
||||
"fs-extra": "9",
|
||||
"js-base64": "^3.7.2",
|
||||
"json-to-ast": "^2.1.0",
|
||||
"lowdb": "^1.0.0",
|
||||
"mime": "^2.4.4",
|
||||
"mqtt": "^4.3.6",
|
||||
"protobufjs": "^8.0.0",
|
||||
"sha1": "^1.1.1",
|
||||
"socket.io": "^4.8.1",
|
||||
"sparkplug-payload": "^1.0.3",
|
||||
"uuid": "^8.3.2",
|
||||
"yarn-run-all": "^3.1.1"
|
||||
|
||||
Executable
+39
@@ -0,0 +1,39 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
function finish {
|
||||
set +e
|
||||
echo "Exiting, cleaning up.."
|
||||
|
||||
if [[ ! -z "$PID_MOSQUITTO" ]]; then
|
||||
echo "Stopping mosquitto ($PID_MOSQUITTO).."
|
||||
kill "$PID_MOSQUITTO" || echo "Already stopped"
|
||||
fi
|
||||
|
||||
if [[ ! -z "$PID_XVFB" ]]; then
|
||||
echo "Stopping XVFB ($PID_XVFB).."
|
||||
kill "$PID_XVFB" || echo "Already stopped"
|
||||
fi
|
||||
}
|
||||
|
||||
trap finish EXIT
|
||||
|
||||
DIMENSIONS="1024x720"
|
||||
SCR=99
|
||||
|
||||
# Start new window manager
|
||||
Xvfb :$SCR -screen 0 "$DIMENSIONS"x24 -ac &
|
||||
export PID_XVFB=$!
|
||||
sleep 2
|
||||
|
||||
# Start mqtt broker
|
||||
mosquitto &
|
||||
export PID_MOSQUITTO=$!
|
||||
sleep 1
|
||||
|
||||
# Run UI tests
|
||||
DISPLAY=:$SCR yarn test:ui
|
||||
TEST_EXIT_CODE=$?
|
||||
|
||||
echo "UI tests exited with $TEST_EXIT_CODE"
|
||||
exit $TEST_EXIT_CODE
|
||||
@@ -0,0 +1,94 @@
|
||||
import * as fs from 'fs'
|
||||
import * as path from 'path'
|
||||
import * as bcrypt from 'bcryptjs'
|
||||
import { v4 as uuidv4 } from 'uuid'
|
||||
|
||||
export interface Credentials {
|
||||
username: string
|
||||
passwordHash: string
|
||||
}
|
||||
|
||||
export class AuthManager {
|
||||
private credentialsPath: string
|
||||
private credentials: Credentials | undefined
|
||||
|
||||
constructor(credentialsPath: string) {
|
||||
this.credentialsPath = credentialsPath
|
||||
}
|
||||
|
||||
public async initialize(): Promise<void> {
|
||||
// Try to get credentials from environment variables
|
||||
const envUsername = process.env.MQTT_EXPLORER_USERNAME
|
||||
const envPassword = process.env.MQTT_EXPLORER_PASSWORD
|
||||
|
||||
if (envUsername && envPassword) {
|
||||
// Use environment credentials
|
||||
console.log('Using credentials from environment variables')
|
||||
console.log('Username:', envUsername)
|
||||
this.credentials = {
|
||||
username: envUsername,
|
||||
passwordHash: await bcrypt.hash(envPassword, 10),
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// Try to load from file
|
||||
if (fs.existsSync(this.credentialsPath)) {
|
||||
try {
|
||||
const data = fs.readFileSync(this.credentialsPath, 'utf8')
|
||||
this.credentials = JSON.parse(data)
|
||||
console.log('Loaded credentials from', this.credentialsPath)
|
||||
console.log('Username:', this.credentials!.username)
|
||||
return
|
||||
} catch (error) {
|
||||
console.error('Failed to load credentials from file:', error)
|
||||
}
|
||||
}
|
||||
|
||||
// Generate new credentials
|
||||
const username = `user-${uuidv4().substring(0, 8)}`
|
||||
const password = uuidv4()
|
||||
|
||||
console.log('='.repeat(60))
|
||||
console.log('Generated new credentials:')
|
||||
console.log('Username:', username)
|
||||
console.log('Password:', password)
|
||||
console.log('='.repeat(60))
|
||||
console.log('Please save these credentials. They will be persisted to:')
|
||||
console.log(this.credentialsPath)
|
||||
console.log('='.repeat(60))
|
||||
|
||||
this.credentials = {
|
||||
username,
|
||||
passwordHash: await bcrypt.hash(password, 10),
|
||||
}
|
||||
|
||||
// Save to file
|
||||
try {
|
||||
const dir = path.dirname(this.credentialsPath)
|
||||
if (!fs.existsSync(dir)) {
|
||||
fs.mkdirSync(dir, { recursive: true })
|
||||
}
|
||||
fs.writeFileSync(this.credentialsPath, JSON.stringify(this.credentials, null, 2))
|
||||
console.log('Credentials saved successfully')
|
||||
} catch (error) {
|
||||
console.error('Failed to save credentials:', error)
|
||||
}
|
||||
}
|
||||
|
||||
public async verifyCredentials(username: string, password: string): Promise<boolean> {
|
||||
if (!this.credentials) {
|
||||
return false
|
||||
}
|
||||
|
||||
if (username !== this.credentials.username) {
|
||||
return false
|
||||
}
|
||||
|
||||
return bcrypt.compare(password, this.credentials.passwordHash)
|
||||
}
|
||||
|
||||
public getUsername(): string | undefined {
|
||||
return this.credentials?.username
|
||||
}
|
||||
}
|
||||
@@ -32,3 +32,22 @@ export function isDev() {
|
||||
export function runningUiTestOnCi() {
|
||||
return Boolean(process.argv.find(arg => arg === '--runningUiTestOnCi'))
|
||||
}
|
||||
|
||||
export function enableMcpIntrospection() {
|
||||
return Boolean(process.argv.find(arg => arg === '--enable-mcp-introspection'))
|
||||
}
|
||||
|
||||
export function getRemoteDebuggingPort() {
|
||||
const portArg = process.argv.find(arg => arg.startsWith('--remote-debugging-port='))
|
||||
if (portArg) {
|
||||
const parts = portArg.split('=')
|
||||
if (parts.length === 2 && parts[1]) {
|
||||
const port = parseInt(parts[1], 10)
|
||||
// Return the port only if it's a valid number between 1 and 65535
|
||||
if (!isNaN(port) && port > 0 && port <= 65535) {
|
||||
return port
|
||||
}
|
||||
}
|
||||
}
|
||||
return enableMcpIntrospection() ? 9222 : undefined
|
||||
}
|
||||
|
||||
+49
-5
@@ -4,14 +4,23 @@ import ConfigStorage from '../backend/src/ConfigStorage'
|
||||
import { app, BrowserWindow, Menu, dialog } from 'electron'
|
||||
import { autoUpdater } from 'electron-updater'
|
||||
import { ConnectionManager } from '../backend/src/index'
|
||||
import { promises as fsPromise } from 'fs'
|
||||
// import { electronTelemetryFactory } from 'electron-telemetry'
|
||||
import { menuTemplate } from './MenuTemplate'
|
||||
import buildOptions from './buildOptions'
|
||||
import { waitForDevServer, isDev, runningUiTestOnCi, loadDevTools } from './development'
|
||||
import {
|
||||
waitForDevServer,
|
||||
isDev,
|
||||
runningUiTestOnCi,
|
||||
loadDevTools,
|
||||
enableMcpIntrospection,
|
||||
getRemoteDebuggingPort,
|
||||
} from './development'
|
||||
import { shouldAutoUpdate, handleAutoUpdate } from './autoUpdater'
|
||||
import { registerCrashReporter } from './registerCrashReporter'
|
||||
import { makeOpenDialogRpc } from '../events/OpenDialogRequest'
|
||||
import { backendRpc, getAppVersion } from '../events'
|
||||
import { makeOpenDialogRpc, makeSaveDialogRpc } from '../events/OpenDialogRequest'
|
||||
import { backendRpc, backendEvents, getAppVersion, writeToFile, readFromFile } from '../events'
|
||||
import { RpcEvents } from '../events/EventsV2'
|
||||
|
||||
registerCrashReporter()
|
||||
|
||||
@@ -21,20 +30,55 @@ registerCrashReporter()
|
||||
|
||||
// disable-dev-shm-usage is required to run the debug console
|
||||
app.commandLine.appendSwitch('--no-sandbox --disable-dev-shm-usage')
|
||||
|
||||
// Enable remote debugging for MCP introspection
|
||||
const remoteDebuggingPort = getRemoteDebuggingPort()
|
||||
if (remoteDebuggingPort) {
|
||||
app.commandLine.appendSwitch('--remote-debugging-port', remoteDebuggingPort.toString())
|
||||
log.info(`Remote debugging enabled on port ${remoteDebuggingPort}`)
|
||||
}
|
||||
|
||||
app.whenReady().then(() => {
|
||||
backendRpc.on(makeOpenDialogRpc(), async request => {
|
||||
return dialog.showOpenDialog(BrowserWindow.getFocusedWindow() ?? BrowserWindow.getAllWindows()[0], request)
|
||||
})
|
||||
|
||||
backendRpc.on(makeSaveDialogRpc(), async request => {
|
||||
return dialog.showSaveDialog(BrowserWindow.getFocusedWindow() ?? BrowserWindow.getAllWindows()[0], request)
|
||||
})
|
||||
|
||||
backendRpc.on(getAppVersion, async () => app.getVersion())
|
||||
|
||||
backendRpc.on(writeToFile, async ({ filePath, data, encoding }) => {
|
||||
await fsPromise.writeFile(filePath, Buffer.from(data, 'base64'), { encoding: encoding as BufferEncoding })
|
||||
})
|
||||
|
||||
backendRpc.on(readFromFile, async ({ filePath, encoding }) => {
|
||||
if (encoding) {
|
||||
const content = await fsPromise.readFile(filePath, { encoding: encoding as BufferEncoding })
|
||||
return Buffer.from(content)
|
||||
}
|
||||
return fsPromise.readFile(filePath)
|
||||
})
|
||||
|
||||
// Certificate upload handler - works for both Electron and browser mode via IPC
|
||||
backendRpc.on(RpcEvents.uploadCertificate, async ({ filename, data }) => {
|
||||
// In Electron, we just return the data as-is since it's already read
|
||||
// The client will use it directly
|
||||
return {
|
||||
name: filename,
|
||||
data,
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
autoUpdater.logger = log
|
||||
log.info('App starting...')
|
||||
|
||||
const connectionManager = new ConnectionManager()
|
||||
const connectionManager = new ConnectionManager(backendEvents)
|
||||
connectionManager.manageConnections()
|
||||
|
||||
const configStorage = new ConfigStorage(path.join(app.getPath('userData'), 'settings.json'))
|
||||
const configStorage = new ConfigStorage(path.join(app.getPath('userData'), 'settings.json'), backendRpc)
|
||||
configStorage.init()
|
||||
|
||||
// Keep a global reference of the window object, if you don't, the window will
|
||||
|
||||
+177
@@ -0,0 +1,177 @@
|
||||
import express from 'express'
|
||||
import * as http from 'http'
|
||||
import * as path from 'path'
|
||||
import { Server } from 'socket.io'
|
||||
import { promises as fsPromise } from 'fs'
|
||||
import { Request, Response } from 'express'
|
||||
import { AuthManager } from './AuthManager'
|
||||
import { ConnectionManager } from '../backend/src/index'
|
||||
import ConfigStorage from '../backend/src/ConfigStorage'
|
||||
import { SocketIOServerEventBus } from '../events/EventSystem/SocketIOServerEventBus'
|
||||
import { Rpc } from '../events/EventSystem/Rpc'
|
||||
import { makeOpenDialogRpc, makeSaveDialogRpc } from '../events/OpenDialogRequest'
|
||||
import { getAppVersion, writeToFile, readFromFile } from '../events'
|
||||
import { RpcEvents } from '../events/EventsV2'
|
||||
|
||||
const PORT = process.env.PORT || 3000
|
||||
const CREDENTIALS_PATH = path.join(process.cwd(), 'data', 'credentials.json')
|
||||
|
||||
async function startServer() {
|
||||
// Initialize authentication
|
||||
const authManager = new AuthManager(CREDENTIALS_PATH)
|
||||
await authManager.initialize()
|
||||
|
||||
// Create Express app
|
||||
const app = express()
|
||||
const server = http.createServer(app)
|
||||
const io = new Server(server, {
|
||||
cors: {
|
||||
origin: '*',
|
||||
methods: ['GET', 'POST'],
|
||||
},
|
||||
allowEIO3: true, // Allow Engine.IO v3 clients (backwards compatibility)
|
||||
transports: ['websocket', 'polling'], // Support both transports
|
||||
pingTimeout: 60000, // Increase ping timeout
|
||||
pingInterval: 25000, // Ping interval
|
||||
})
|
||||
|
||||
// Authentication middleware for Socket.io
|
||||
io.use(async (socket, next) => {
|
||||
const { username, password } = socket.handshake.auth
|
||||
|
||||
if (!username || !password) {
|
||||
return next(new Error('Authentication required'))
|
||||
}
|
||||
|
||||
const isValid = await authManager.verifyCredentials(username, password)
|
||||
if (!isValid) {
|
||||
return next(new Error('Invalid credentials'))
|
||||
}
|
||||
|
||||
console.log('Client authenticated:', username)
|
||||
next()
|
||||
})
|
||||
|
||||
// Initialize backend event bus with Socket.io
|
||||
const backendEvents = new SocketIOServerEventBus(io)
|
||||
const backendRpc = new Rpc(backendEvents)
|
||||
|
||||
// Initialize connection manager
|
||||
const connectionManager = new ConnectionManager(backendEvents)
|
||||
connectionManager.manageConnections()
|
||||
|
||||
// Initialize config storage
|
||||
const configStorage = new ConfigStorage(path.join(process.cwd(), 'data', 'settings.json'), backendRpc)
|
||||
configStorage.init()
|
||||
|
||||
// Setup RPC handlers for file operations
|
||||
backendRpc.on(makeOpenDialogRpc(), async request => {
|
||||
// In browser mode, file selection is handled client-side via upload
|
||||
// Return empty result as this will be handled differently
|
||||
return { canceled: true, filePaths: [] }
|
||||
})
|
||||
|
||||
backendRpc.on(makeSaveDialogRpc(), async request => {
|
||||
// In browser mode, file saving is handled client-side via download
|
||||
return { canceled: true, filePath: undefined }
|
||||
})
|
||||
|
||||
backendRpc.on(getAppVersion, async () => {
|
||||
// Return version from package.json
|
||||
try {
|
||||
const packageJsonPath = path.join(__dirname, '..', '..', 'package.json')
|
||||
const packageJsonData = await fsPromise.readFile(packageJsonPath, 'utf8')
|
||||
const packageJson = JSON.parse(packageJsonData)
|
||||
return packageJson.version
|
||||
} catch (e) {
|
||||
return '0.0.0'
|
||||
}
|
||||
})
|
||||
|
||||
backendRpc.on(writeToFile, async ({ filePath, data, encoding }) => {
|
||||
// In browser mode, we store files in the server's data directory
|
||||
const dataDir = path.join(process.cwd(), 'data', 'uploads')
|
||||
const safePath = path.join(dataDir, path.basename(filePath))
|
||||
|
||||
try {
|
||||
await fsPromise.mkdir(dataDir, { recursive: true })
|
||||
if (encoding) {
|
||||
await fsPromise.writeFile(safePath, Buffer.from(data, 'base64'), { encoding: encoding as BufferEncoding })
|
||||
} else {
|
||||
await fsPromise.writeFile(safePath, Buffer.from(data, 'base64'))
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error writing file:', error)
|
||||
throw error
|
||||
}
|
||||
})
|
||||
|
||||
backendRpc.on(readFromFile, async ({ filePath, encoding }) => {
|
||||
// In browser mode, files are read from the server's data directory
|
||||
const dataDir = path.join(process.cwd(), 'data', 'uploads')
|
||||
const safePath = path.join(dataDir, path.basename(filePath))
|
||||
|
||||
try {
|
||||
if (encoding) {
|
||||
const content = await fsPromise.readFile(safePath, { encoding: encoding as BufferEncoding })
|
||||
return Buffer.from(content)
|
||||
}
|
||||
return await fsPromise.readFile(safePath)
|
||||
} catch (error) {
|
||||
console.error('Error reading file:', error)
|
||||
throw error
|
||||
}
|
||||
})
|
||||
|
||||
// Certificate upload handler - via IPC for consistency
|
||||
backendRpc.on(RpcEvents.uploadCertificate, async ({ filename, data }) => {
|
||||
// Store certificate on server for browser mode
|
||||
const dataDir = path.join(process.cwd(), 'data', 'certificates')
|
||||
await fsPromise.mkdir(dataDir, { recursive: true })
|
||||
|
||||
const safePath = path.join(dataDir, path.basename(filename))
|
||||
await fsPromise.writeFile(safePath, Buffer.from(data, 'base64'))
|
||||
|
||||
console.log('Certificate uploaded:', filename)
|
||||
|
||||
// Return the certificate data for client to use
|
||||
return {
|
||||
name: filename,
|
||||
data,
|
||||
}
|
||||
})
|
||||
|
||||
// Serve static files
|
||||
app.use(express.static(path.join(__dirname, '..', '..', 'app', 'build')))
|
||||
|
||||
// Serve index.html for all other routes (SPA)
|
||||
app.use((req: Request, res: Response) => {
|
||||
res.sendFile(path.join(__dirname, '..', '..', 'app', 'index.html'))
|
||||
})
|
||||
|
||||
// Start server
|
||||
server.listen(PORT, () => {
|
||||
console.log('='.repeat(60))
|
||||
console.log(`MQTT Explorer server running on http://localhost:${PORT}`)
|
||||
console.log('='.repeat(60))
|
||||
})
|
||||
|
||||
// Handle graceful shutdown
|
||||
process.on('SIGTERM' as any, () => {
|
||||
console.log('SIGTERM received, closing connections...')
|
||||
connectionManager.closeAllConnections()
|
||||
server.close()
|
||||
})
|
||||
|
||||
process.on('SIGINT' as any, () => {
|
||||
console.log('SIGINT received, closing connections...')
|
||||
connectionManager.closeAllConnections()
|
||||
server.close()
|
||||
process.exit(0)
|
||||
})
|
||||
}
|
||||
|
||||
startServer().catch(error => {
|
||||
console.error('Failed to start server:', error)
|
||||
process.exit(1)
|
||||
})
|
||||
@@ -19,6 +19,7 @@ export type SceneNames =
|
||||
| 'settings'
|
||||
| 'customize_subscriptions'
|
||||
| 'keyboard_shortcuts'
|
||||
| 'sparkplugb-decoding'
|
||||
| 'end'
|
||||
|
||||
export class SceneBuilder {
|
||||
|
||||
@@ -21,6 +21,7 @@ import { showMenu } from './scenarios/showMenu'
|
||||
import { showNumericPlot } from './scenarios/showNumericPlot'
|
||||
import { showOffDiffCapability } from './scenarios/showOffDiffCapability'
|
||||
import { showZoomLevel } from './scenarios/showZoomLevel'
|
||||
import { showSparkPlugDecoding } from './scenarios/showSparkplugDecoding'
|
||||
|
||||
/**
|
||||
* A convenience method that handles gracefully cleaning up the test run.
|
||||
@@ -31,7 +32,7 @@ const cleanUp = async (scenes: SceneBuilder, electronApp: ElectronApplication) =
|
||||
await electronApp.close()
|
||||
}
|
||||
|
||||
process.on('unhandledRejection', (error: Error | any) => {
|
||||
process.on('unhandledRejection' as any, (error: Error | any) => {
|
||||
console.error('unhandledRejection', error.message, error.stack)
|
||||
process.exit(1)
|
||||
})
|
||||
@@ -120,6 +121,11 @@ async function doStuff() {
|
||||
await sleep(1000)
|
||||
})
|
||||
|
||||
await scenes.record('sparkplugb-decoding', async () => {
|
||||
await showText('SparkplugB Decoding', 2000, page, 'top')
|
||||
await showSparkPlugDecoding(page)
|
||||
})
|
||||
|
||||
// disable this scenario for now until expandTopic is sorted out
|
||||
// await scenes.record('delete_retained_topics', async () => {
|
||||
// await hideText(page)
|
||||
|
||||
@@ -7,7 +7,7 @@ import { clearSearch, searchTree } from './scenarios/searchTree'
|
||||
import { connectTo } from './scenarios/connect'
|
||||
import { reconnect } from './scenarios/reconnect'
|
||||
|
||||
process.on('unhandledRejection', (error: Error | any) => {
|
||||
process.on('unhandledRejection' as any, (error: Error | any) => {
|
||||
console.error('unhandledRejection', error.message, error.stack)
|
||||
process.exit(1)
|
||||
})
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
import * as mqtt from 'mqtt'
|
||||
|
||||
/**
|
||||
* Test-specific MQTT mock (no timers)
|
||||
*
|
||||
* This mock connects to the broker but doesn't publish any messages automatically.
|
||||
* Each test should publish only the messages it needs via the returned client.
|
||||
*
|
||||
* This is different from the demo video mock which uses timers.
|
||||
*/
|
||||
|
||||
let mqttClient: mqtt.MqttClient | null = null
|
||||
|
||||
export async function createTestMock(): Promise<mqtt.MqttClient> {
|
||||
if (mqttClient) {
|
||||
return mqttClient
|
||||
}
|
||||
|
||||
return new Promise(resolve => {
|
||||
const client = mqtt.connect('mqtt://127.0.0.1:1883', {
|
||||
username: '',
|
||||
password: '',
|
||||
})
|
||||
client.once('connect', () => {
|
||||
mqttClient = client
|
||||
resolve(client)
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
export function stopTestMock() {
|
||||
if (mqttClient) {
|
||||
try {
|
||||
mqttClient.end()
|
||||
mqttClient = null
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
}
|
||||
+214
-218
@@ -18,232 +18,228 @@ import type { UMetric } from 'sparkplug-payload/lib/sparkplugbpayload'
|
||||
* Main sample function which includes the run() function for running the sample
|
||||
*/
|
||||
|
||||
|
||||
export interface MockSparkplugClient {
|
||||
stop: () => void
|
||||
stop: () => void
|
||||
}
|
||||
|
||||
var sample = (function () {
|
||||
var config = {
|
||||
serverUrl: 'tcp://127.0.0.1:1883',
|
||||
username: '',
|
||||
password: '',
|
||||
groupId: 'Sparkplug Devices',
|
||||
edgeNode: 'JavaScript Edge Node',
|
||||
clientId: 'JavaScriptSimpleEdgeNode',
|
||||
version: 'spBv1.0',
|
||||
var config = {
|
||||
serverUrl: 'tcp://127.0.0.1:1883',
|
||||
username: '',
|
||||
password: '',
|
||||
groupId: 'Sparkplug Devices',
|
||||
edgeNode: 'JavaScript Edge Node',
|
||||
clientId: 'JavaScriptSimpleEdgeNode',
|
||||
version: 'spBv1.0',
|
||||
},
|
||||
hwVersion = 'Emulated Hardware',
|
||||
swVersion = 'v1.0.0',
|
||||
deviceId = 'Emulated Device',
|
||||
sparkPlugClient,
|
||||
publishPeriod = 5000,
|
||||
// Generates a random integer
|
||||
randomInt = function () {
|
||||
return 1 + Math.floor(Math.random() * 10)
|
||||
},
|
||||
// Get BIRTH payload for the edge node
|
||||
getNodeBirthPayload = function (): UPayload {
|
||||
return {
|
||||
timestamp: new Date().getTime(),
|
||||
metrics: [
|
||||
{
|
||||
name: 'Node Control/Rebirth',
|
||||
type: 'Boolean',
|
||||
value: false,
|
||||
},
|
||||
{
|
||||
name: 'Template1',
|
||||
type: 'Template',
|
||||
value: {
|
||||
isDefinition: true,
|
||||
metrics: [
|
||||
{ name: 'myBool', value: false, type: 'Boolean' },
|
||||
{ name: 'myInt', value: 0, type: 'UInt32' },
|
||||
],
|
||||
parameters: [
|
||||
{
|
||||
name: 'param1',
|
||||
type: 'String',
|
||||
value: 'value1',
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
],
|
||||
hwVersion = 'Emulated Hardware',
|
||||
swVersion = 'v1.0.0',
|
||||
deviceId = 'Emulated Device',
|
||||
sparkPlugClient,
|
||||
publishPeriod = 5000,
|
||||
// Generates a random integer
|
||||
randomInt = function () {
|
||||
return 1 + Math.floor(Math.random() * 10)
|
||||
},
|
||||
// Get BIRTH payload for the edge node
|
||||
getNodeBirthPayload = function (): UPayload {
|
||||
return {
|
||||
timestamp: new Date().getTime(),
|
||||
metrics: [
|
||||
{
|
||||
name: 'Node Control/Rebirth',
|
||||
type: 'Boolean',
|
||||
value: false,
|
||||
},
|
||||
{
|
||||
name: 'Template1',
|
||||
type: 'Template',
|
||||
value: {
|
||||
isDefinition: true,
|
||||
metrics: [
|
||||
{ name: 'myBool', value: false, type: 'Boolean' },
|
||||
{ name: 'myInt', value: 0, type: 'UInt32' },
|
||||
],
|
||||
parameters: [
|
||||
{
|
||||
name: 'param1',
|
||||
type: 'String',
|
||||
value: 'value1',
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
],
|
||||
}
|
||||
},
|
||||
// Get BIRTH payload for the device
|
||||
getDeviceBirthPayload = function (): UPayload {
|
||||
return {
|
||||
timestamp: new Date().getTime(),
|
||||
metrics: [
|
||||
{ name: 'my_boolean', value: Math.random() > 0.5, type: 'Boolean' },
|
||||
{ name: 'my_double', value: Math.random() * 0.123456789, type: 'Double' },
|
||||
{ name: 'my_float', value: Math.random() * 0.123, type: 'Float' },
|
||||
{ name: 'my_int', value: randomInt(), type: 'Int8' },
|
||||
{ name: 'my_long', value: randomInt() * 214748364700, type: 'Int64' },
|
||||
{ name: 'Inputs/0', value: true, type: 'Boolean' },
|
||||
{ name: 'Inputs/1', value: 0, type: 'Int8' },
|
||||
{ name: 'Inputs/2', value: 1.23, type: 'UInt64' },
|
||||
{ name: 'Outputs/0', value: true, type: 'Boolean' },
|
||||
{ name: 'Outputs/1', value: 0, type: 'Int16' },
|
||||
{ name: 'Outputs/2', value: 1.23, type: 'UInt64' },
|
||||
{ name: 'Properties/hw_version', value: hwVersion, type: 'String' },
|
||||
{ name: 'Properties/sw_version', value: swVersion, type: 'String' },
|
||||
{
|
||||
name: 'my_dataset',
|
||||
type: 'DataSet',
|
||||
value: {
|
||||
numOfColumns: 2,
|
||||
types: ['String', 'String'],
|
||||
columns: ['str1', 'str2'],
|
||||
rows: [
|
||||
['x', 'a'],
|
||||
['y', 'b'],
|
||||
],
|
||||
},
|
||||
},
|
||||
{
|
||||
name: 'TemplateInstance1',
|
||||
type: 'Template',
|
||||
value: {
|
||||
templateRef: 'Template1',
|
||||
isDefinition: false,
|
||||
metrics: [
|
||||
{ name: 'myBool', value: true, type: 'Boolean' },
|
||||
{ name: 'myInt', value: 100, type: 'Int8' },
|
||||
],
|
||||
parameters: [
|
||||
{
|
||||
name: 'param1',
|
||||
type: 'String',
|
||||
value: 'value2',
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
],
|
||||
}
|
||||
},
|
||||
// Get data payload for the device
|
||||
getDataPayload = function (): UPayload {
|
||||
return {
|
||||
timestamp: new Date().getTime(),
|
||||
metrics: [
|
||||
{ name: 'my_boolean', value: Math.random() > 0.5, type: 'Boolean' },
|
||||
{ name: 'my_double', value: Math.random() * 0.123456789, type: 'Double' },
|
||||
{ name: 'my_float', value: Math.random() * 0.123, type: 'UInt64' },
|
||||
{ name: 'my_int', value: randomInt(), type: 'Int16' },
|
||||
{ name: 'my_long', value: randomInt() * 214748364700, type: 'UInt64' },
|
||||
],
|
||||
}
|
||||
},
|
||||
// Runs the sample
|
||||
run = async function (): Promise<MockSparkplugClient> {
|
||||
// Create the SparkplugClient
|
||||
const sparkplugClient = SparkplugClient.newClient(config)
|
||||
let updateInterval: NodeJS.Timeout | null = null
|
||||
const connected = new Promise<MockSparkplugClient>(resolve => {
|
||||
// Create 'birth' handler
|
||||
sparkplugClient.on('birth', () => {
|
||||
// Publish Node BIRTH certificate
|
||||
sparkplugClient.publishNodeBirth(getNodeBirthPayload())
|
||||
// Publish Device BIRTH certificate
|
||||
sparkplugClient.publishDeviceBirth(deviceId, getDeviceBirthPayload())
|
||||
resolve({
|
||||
stop: () => {
|
||||
if (updateInterval) {
|
||||
clearInterval(updateInterval)
|
||||
}
|
||||
sparkplugClient.stop()
|
||||
},
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
// Create Incoming Message Handler
|
||||
sparkplugClient.on('message', function (topic: string, payload: UPayload) {
|
||||
console.log(topic, payload)
|
||||
})
|
||||
|
||||
// Create node command handler
|
||||
// spell-checker: disable-next-line
|
||||
sparkplugClient.on('ncmd', function (payload: UPayload) {
|
||||
var timestamp = payload.timestamp,
|
||||
metrics = payload.metrics
|
||||
|
||||
if (metrics !== undefined && metrics !== null) {
|
||||
for (var i = 0; i < metrics.length; i++) {
|
||||
var metric = metrics[i]
|
||||
if (metric.name == 'Node Control/Rebirth' && metric.value) {
|
||||
console.log("Received 'Rebirth' command")
|
||||
// Publish Node BIRTH certificate
|
||||
sparkplugClient.publishNodeBirth(getNodeBirthPayload())
|
||||
// Publish Device BIRTH certificate
|
||||
sparkplugClient.publishDeviceBirth(deviceId, getDeviceBirthPayload())
|
||||
}
|
||||
},
|
||||
// Get BIRTH payload for the device
|
||||
getDeviceBirthPayload = function (): UPayload {
|
||||
return {
|
||||
timestamp: new Date().getTime(),
|
||||
metrics: [
|
||||
{ name: 'my_boolean', value: Math.random() > 0.5, type: 'Boolean' },
|
||||
{ name: 'my_double', value: Math.random() * 0.123456789, type: 'Double' },
|
||||
{ name: 'my_float', value: Math.random() * 0.123, type: 'Float' },
|
||||
{ name: 'my_int', value: randomInt(), type: 'Int8' },
|
||||
{ name: 'my_long', value: randomInt() * 214748364700, type: 'Int64' },
|
||||
{ name: 'Inputs/0', value: true, type: 'Boolean' },
|
||||
{ name: 'Inputs/1', value: 0, type: 'Int8' },
|
||||
{ name: 'Inputs/2', value: 1.23, type: 'UInt64' },
|
||||
{ name: 'Outputs/0', value: true, type: 'Boolean' },
|
||||
{ name: 'Outputs/1', value: 0, type: 'Int16' },
|
||||
{ name: 'Outputs/2', value: 1.23, type: 'UInt64' },
|
||||
{ name: 'Properties/hw_version', value: hwVersion, type: 'String' },
|
||||
{ name: 'Properties/sw_version', value: swVersion, type: 'String' },
|
||||
{
|
||||
name: 'my_dataset',
|
||||
type: 'DataSet',
|
||||
value: {
|
||||
numOfColumns: 2,
|
||||
types: ['String', 'String'],
|
||||
columns: ['str1', 'str2'],
|
||||
rows: [
|
||||
['x', 'a'],
|
||||
['y', 'b'],
|
||||
],
|
||||
},
|
||||
},
|
||||
{
|
||||
name: 'TemplateInstance1',
|
||||
type: 'Template',
|
||||
value: {
|
||||
templateRef: 'Template1',
|
||||
isDefinition: false,
|
||||
metrics: [
|
||||
{ name: 'myBool', value: true, type: 'Boolean' },
|
||||
{ name: 'myInt', value: 100, type: 'Int8' },
|
||||
],
|
||||
parameters: [
|
||||
{
|
||||
name: 'param1',
|
||||
type: 'String',
|
||||
value: 'value2',
|
||||
},
|
||||
],
|
||||
},
|
||||
},
|
||||
],
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Create device command handler
|
||||
// spell-checker: disable-next-line
|
||||
sparkplugClient.on('dcmd', function (deviceId: string, payload: UPayload) {
|
||||
var timestamp = payload.timestamp,
|
||||
metrics = payload.metrics,
|
||||
inboundMetricMap: { [name: string]: any } = {},
|
||||
outboundMetric: Array<UMetric> = [],
|
||||
outboundPayload: UPayload
|
||||
|
||||
console.log('Command received for device ' + deviceId)
|
||||
|
||||
// Loop over the metrics and store them in a map
|
||||
if (metrics !== undefined && metrics !== null) {
|
||||
for (var i = 0; i < metrics.length; i++) {
|
||||
var metric = metrics[i]
|
||||
if (metric.name !== undefined && metric.name !== null) {
|
||||
inboundMetricMap[metric.name] = metric.value
|
||||
}
|
||||
},
|
||||
// Get data payload for the device
|
||||
getDataPayload = function (): UPayload {
|
||||
return {
|
||||
timestamp: new Date().getTime(),
|
||||
metrics: [
|
||||
{ name: 'my_boolean', value: Math.random() > 0.5, type: 'Boolean' },
|
||||
{ name: 'my_double', value: Math.random() * 0.123456789, type: 'Double' },
|
||||
{ name: 'my_float', value: Math.random() * 0.123, type: 'UInt64' },
|
||||
{ name: 'my_int', value: randomInt(), type: 'Int16' },
|
||||
{ name: 'my_long', value: randomInt() * 214748364700, type: 'UInt64' },
|
||||
],
|
||||
}
|
||||
},
|
||||
// Runs the sample
|
||||
run = async function (): Promise<MockSparkplugClient> {
|
||||
// Create the SparkplugClient
|
||||
const sparkplugClient = SparkplugClient.newClient(config)
|
||||
let updateInterval: NodeJS.Timeout | null = null
|
||||
const connected = new Promise<MockSparkplugClient>((resolve) => {
|
||||
|
||||
// Create 'birth' handler
|
||||
sparkplugClient.on('birth', () => {
|
||||
// Publish Node BIRTH certificate
|
||||
sparkplugClient.publishNodeBirth(getNodeBirthPayload())
|
||||
// Publish Device BIRTH certificate
|
||||
sparkplugClient.publishDeviceBirth(deviceId, getDeviceBirthPayload())
|
||||
resolve({
|
||||
stop: () => {
|
||||
if (updateInterval) {
|
||||
clearInterval(updateInterval)
|
||||
}
|
||||
sparkplugClient.stop()
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
// Create Incoming Message Handler
|
||||
sparkplugClient.on('message', function (topic: string, payload: UPayload) {
|
||||
console.log(topic, payload)
|
||||
})
|
||||
|
||||
// Create node command handler
|
||||
// spell-checker: disable-next-line
|
||||
sparkplugClient.on('ncmd', function (payload: UPayload) {
|
||||
var timestamp = payload.timestamp,
|
||||
metrics = payload.metrics
|
||||
|
||||
if (metrics !== undefined && metrics !== null) {
|
||||
for (var i = 0; i < metrics.length; i++) {
|
||||
var metric = metrics[i]
|
||||
if (metric.name == 'Node Control/Rebirth' && metric.value) {
|
||||
console.log("Received 'Rebirth' command")
|
||||
// Publish Node BIRTH certificate
|
||||
sparkplugClient.publishNodeBirth(getNodeBirthPayload())
|
||||
// Publish Device BIRTH certificate
|
||||
sparkplugClient.publishDeviceBirth(deviceId, getDeviceBirthPayload())
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// Create device command handler
|
||||
// spell-checker: disable-next-line
|
||||
sparkplugClient.on('dcmd', function (deviceId: string, payload: UPayload) {
|
||||
var timestamp = payload.timestamp,
|
||||
metrics = payload.metrics,
|
||||
inboundMetricMap: { [name: string]: any } = {},
|
||||
outboundMetric: Array<UMetric> = [],
|
||||
outboundPayload: UPayload
|
||||
|
||||
console.log('Command received for device ' + deviceId)
|
||||
|
||||
// Loop over the metrics and store them in a map
|
||||
if (metrics !== undefined && metrics !== null) {
|
||||
for (var i = 0; i < metrics.length; i++) {
|
||||
var metric = metrics[i]
|
||||
if (metric.name !== undefined && metric.name !== null) {
|
||||
inboundMetricMap[metric.name] = metric.value
|
||||
}
|
||||
}
|
||||
}
|
||||
if (inboundMetricMap['Outputs/0'] !== undefined && inboundMetricMap['Outputs/0'] !== null) {
|
||||
console.log('Outputs/0: ' + inboundMetricMap['Outputs/0'])
|
||||
outboundMetric.push({ name: 'Inputs/0', value: inboundMetricMap['Outputs/0'], type: 'Boolean' })
|
||||
outboundMetric.push({ name: 'Outputs/0', value: inboundMetricMap['Outputs/0'], type: 'Boolean' })
|
||||
console.log('Updated value for Inputs/0 ' + inboundMetricMap['Outputs/0'])
|
||||
} else if (inboundMetricMap['Outputs/1'] !== undefined && inboundMetricMap['Outputs/1'] !== null) {
|
||||
console.log('Outputs/1: ' + inboundMetricMap['Outputs/1'])
|
||||
outboundMetric.push({ name: 'Inputs/1', value: inboundMetricMap['Outputs/1'], type: 'Int32' })
|
||||
outboundMetric.push({ name: 'Outputs/1', value: inboundMetricMap['Outputs/1'], type: 'Int32' })
|
||||
console.log('Updated value for Inputs/1 ' + inboundMetricMap['Outputs/1'])
|
||||
} else if (inboundMetricMap['Outputs/2'] !== undefined && inboundMetricMap['Outputs/2'] !== null) {
|
||||
console.log('Outputs/2: ' + inboundMetricMap['Outputs/2'])
|
||||
outboundMetric.push({ name: 'Inputs/2', value: inboundMetricMap['Outputs/2'], type: 'UInt64' })
|
||||
outboundMetric.push({ name: 'Outputs/2', value: inboundMetricMap['Outputs/2'], type: 'UInt64' })
|
||||
console.log('Updated value for Inputs/2 ' + inboundMetricMap['Outputs/2'])
|
||||
}
|
||||
|
||||
outboundPayload = {
|
||||
timestamp: new Date().getTime(),
|
||||
metrics: outboundMetric,
|
||||
}
|
||||
|
||||
// Publish device data
|
||||
sparkplugClient.publishDeviceData(deviceId, outboundPayload)
|
||||
})
|
||||
|
||||
updateInterval = setInterval(function () {
|
||||
// Publish device data
|
||||
sparkplugClient.publishDeviceData(deviceId, getDataPayload())
|
||||
|
||||
|
||||
}, 2000)
|
||||
return connected
|
||||
}
|
||||
}
|
||||
if (inboundMetricMap['Outputs/0'] !== undefined && inboundMetricMap['Outputs/0'] !== null) {
|
||||
console.log('Outputs/0: ' + inboundMetricMap['Outputs/0'])
|
||||
outboundMetric.push({ name: 'Inputs/0', value: inboundMetricMap['Outputs/0'], type: 'Boolean' })
|
||||
outboundMetric.push({ name: 'Outputs/0', value: inboundMetricMap['Outputs/0'], type: 'Boolean' })
|
||||
console.log('Updated value for Inputs/0 ' + inboundMetricMap['Outputs/0'])
|
||||
} else if (inboundMetricMap['Outputs/1'] !== undefined && inboundMetricMap['Outputs/1'] !== null) {
|
||||
console.log('Outputs/1: ' + inboundMetricMap['Outputs/1'])
|
||||
outboundMetric.push({ name: 'Inputs/1', value: inboundMetricMap['Outputs/1'], type: 'Int32' })
|
||||
outboundMetric.push({ name: 'Outputs/1', value: inboundMetricMap['Outputs/1'], type: 'Int32' })
|
||||
console.log('Updated value for Inputs/1 ' + inboundMetricMap['Outputs/1'])
|
||||
} else if (inboundMetricMap['Outputs/2'] !== undefined && inboundMetricMap['Outputs/2'] !== null) {
|
||||
console.log('Outputs/2: ' + inboundMetricMap['Outputs/2'])
|
||||
outboundMetric.push({ name: 'Inputs/2', value: inboundMetricMap['Outputs/2'], type: 'UInt64' })
|
||||
outboundMetric.push({ name: 'Outputs/2', value: inboundMetricMap['Outputs/2'], type: 'UInt64' })
|
||||
console.log('Updated value for Inputs/2 ' + inboundMetricMap['Outputs/2'])
|
||||
}
|
||||
|
||||
return { run: run }
|
||||
outboundPayload = {
|
||||
timestamp: new Date().getTime(),
|
||||
metrics: outboundMetric,
|
||||
}
|
||||
|
||||
// Publish device data
|
||||
sparkplugClient.publishDeviceData(deviceId, outboundPayload)
|
||||
})
|
||||
|
||||
updateInterval = setInterval(function () {
|
||||
// Publish device data
|
||||
sparkplugClient.publishDeviceData(deviceId, getDataPayload())
|
||||
}, 2000)
|
||||
return connected
|
||||
}
|
||||
|
||||
return { run: run }
|
||||
})()
|
||||
|
||||
export default sample
|
||||
export default sample
|
||||
|
||||
@@ -2,6 +2,6 @@ import { Page } from 'playwright'
|
||||
import { clickOn } from '../util'
|
||||
|
||||
export async function copyValueToClipboard(browser: Page) {
|
||||
const copyButton = await browser.locator('//span[contains(text(), "Value")]//button')
|
||||
const copyButton = await browser.getByRole('button', { name: 'Value' }).getByRole('button').first()
|
||||
await clickOn(copyButton, 1)
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ export async function publishTopic(browser: Page) {
|
||||
const topicInput = await browser.locator('//input[contains(@value,"kitchen/lamp/state")][1]')
|
||||
await clickOn(topicInput)
|
||||
await deleteTextWithBackspaces(topicInput, 120, 5)
|
||||
await writeText('set', topicInput, 300)
|
||||
await writeText('set', topicInput)
|
||||
|
||||
const payloadInput = await browser.locator('//*[contains(@class, "ace_text-input")]')
|
||||
await writeTextPayload(payloadInput, 'off')
|
||||
@@ -34,5 +34,6 @@ export async function publishTopic(browser: Page) {
|
||||
}
|
||||
|
||||
async function writeTextPayload(payloadInput: Locator, text: string) {
|
||||
await payloadInput.fill(text)
|
||||
await clickOn(payloadInput)
|
||||
await writeText(text, payloadInput)
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ import { clickOn, deleteTextWithBackspaces, showText, sleep, writeText } from '.
|
||||
export async function searchTree(text: string, browser: Page) {
|
||||
const searchField = await browser.locator('//input[contains(@placeholder, "Search")]')
|
||||
await clickOn(searchField, 1)
|
||||
await writeText(text, searchField, 100)
|
||||
await writeText(text, searchField)
|
||||
await sleep(1500)
|
||||
}
|
||||
|
||||
@@ -12,4 +12,5 @@ export async function clearSearch(browser: Page) {
|
||||
const searchField = await browser.locator('//input[contains(@placeholder, "Search")]')
|
||||
await clickOn(searchField, 1)
|
||||
await deleteTextWithBackspaces(searchField, 100)
|
||||
await sleep(300) // Give time for search to clear and tree to rerender
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Page } from 'playwright'
|
||||
import { moveToCenterOfElement, clickOn, clickOnHistory, expandTopic, sleep, writeText } from '../util'
|
||||
import { moveToCenterOfElement, clickOn, clickOnHistory, expandTopic, sleep } from '../util'
|
||||
|
||||
export async function showNumericPlot(browser: Page) {
|
||||
await expandTopic('kitchen/coffee_maker', browser)
|
||||
@@ -45,12 +45,14 @@ export async function showNumericPlot(browser: Page) {
|
||||
async function valuePreviewGuttersShowChartIcon(name: string, browser: Page) {
|
||||
for (let retries = 0; retries < 2; retries += 1) {
|
||||
try {
|
||||
return await browser.locator(`//*[contains(@data-test-type, "ShowChart")][contains(@data-test, "${name}")]`)
|
||||
return await browser
|
||||
.locator(`//*[contains(@data-test-type, "ShowChart")][contains(@data-test, "${name}")]`)
|
||||
.first()
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
return browser.locator(`//*[contains(@data-test-type, "ShowChart")][contains(@data-test, "${name}")]`)
|
||||
return browser.locator(`//*[contains(@data-test-type, "ShowChart")][contains(@data-test, "${name}")]`).first()
|
||||
}
|
||||
|
||||
async function chartSettings(name: string, browser: Page) {
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
import { Page } from 'playwright'
|
||||
import { expandTopic, sleep } from '../util'
|
||||
|
||||
export async function showSparkPlugDecoding(browser: Page) {
|
||||
// spell-checker: disable-next-line
|
||||
await expandTopic('spBv1.0/Sparkplug Devices/DDATA/JavaScript Edge Node/Emulated Device', browser)
|
||||
await browser.screenshot({ path: 'screen_sparkplugb_decoding.png' })
|
||||
await sleep(1000)
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
import * as fs from 'fs'
|
||||
import * as path from 'path'
|
||||
import { ElectronApplication, _electron as electron } from 'playwright'
|
||||
|
||||
// Constants
|
||||
const DEFAULT_REMOTE_DEBUGGING_PORT = 9222
|
||||
const PROJECT_ROOT = path.join(__dirname, '../../..')
|
||||
|
||||
async function sleep(ms: number) {
|
||||
return new Promise(resolve => setTimeout(resolve, ms))
|
||||
}
|
||||
|
||||
async function main() {
|
||||
console.log('=== MCP Introspection Demo ===')
|
||||
console.log('Starting MQTT Explorer with MCP introspection flags...')
|
||||
|
||||
// Launch Electron app with MCP introspection enabled
|
||||
const electronApp: ElectronApplication = await electron.launch({
|
||||
args: [
|
||||
PROJECT_ROOT,
|
||||
'--enable-mcp-introspection',
|
||||
`--remote-debugging-port=${DEFAULT_REMOTE_DEBUGGING_PORT}`,
|
||||
'--no-sandbox',
|
||||
],
|
||||
timeout: 30000,
|
||||
})
|
||||
|
||||
console.log('✓ App launched with MCP introspection')
|
||||
console.log(`✓ Remote debugging enabled on port ${DEFAULT_REMOTE_DEBUGGING_PORT}`)
|
||||
|
||||
// Get the first window
|
||||
const page = await electronApp.firstWindow({ timeout: 10000 })
|
||||
|
||||
const title = await page.title()
|
||||
console.log(`✓ Window ready, title: ${title}`)
|
||||
|
||||
// Check console logs for remote debugging message
|
||||
const logs: string[] = []
|
||||
page.on('console', msg => {
|
||||
const text = msg.text()
|
||||
logs.push(text)
|
||||
if (text.includes('Remote debugging enabled')) {
|
||||
console.log(`✓ ${text}`)
|
||||
}
|
||||
})
|
||||
|
||||
// Wait for app to load
|
||||
await sleep(3000)
|
||||
|
||||
// Take screenshot 1: Main app window showing MCP introspection is working
|
||||
console.log('\nTaking screenshots...')
|
||||
const screenshot1Path = path.join(PROJECT_ROOT, 'screenshot-mcp-app-running.png')
|
||||
await page.screenshot({
|
||||
path: screenshot1Path,
|
||||
fullPage: false,
|
||||
})
|
||||
console.log(`✓ Screenshot 1 saved: ${screenshot1Path}`)
|
||||
|
||||
// Take screenshot 2: Connection form (showing the app is interactive)
|
||||
await sleep(1000)
|
||||
const screenshot2Path = path.join(PROJECT_ROOT, 'screenshot-mcp-connection-form.png')
|
||||
await page.screenshot({
|
||||
path: screenshot2Path,
|
||||
fullPage: true,
|
||||
})
|
||||
console.log(`✓ Screenshot 2 saved: ${screenshot2Path}`)
|
||||
|
||||
console.log('\n=== MCP Introspection Test Results ===')
|
||||
console.log('✓ Application started successfully with MCP introspection')
|
||||
console.log(`✓ Remote debugging port: ${DEFAULT_REMOTE_DEBUGGING_PORT}`)
|
||||
console.log(`✓ Chrome DevTools Protocol is accessible at: http://localhost:${DEFAULT_REMOTE_DEBUGGING_PORT}`)
|
||||
console.log('✓ Screenshots captured successfully')
|
||||
console.log('\nThe MCP introspection implementation is working correctly!')
|
||||
console.log('External tools can now connect to the app via CDP for automated testing.')
|
||||
|
||||
// Close the app
|
||||
await electronApp.close()
|
||||
|
||||
process.exit(0)
|
||||
}
|
||||
|
||||
main().catch(error => {
|
||||
console.error('Error during MCP introspection test:', error)
|
||||
process.exit(1)
|
||||
})
|
||||
@@ -0,0 +1,503 @@
|
||||
import 'mocha'
|
||||
import { expect } from 'chai'
|
||||
import { ElectronApplication, Page, _electron as electron } from 'playwright'
|
||||
import mockMqtt, { stop as stopMqtt } from './mock-mqtt'
|
||||
import { default as MockSparkplug } from './mock-sparkplugb'
|
||||
import { sleep, expandTopic } from './util'
|
||||
import { connectTo } from './scenarios/connect'
|
||||
import { searchTree, clearSearch } from './scenarios/searchTree'
|
||||
import { showNumericPlot } from './scenarios/showNumericPlot'
|
||||
import { showJsonPreview } from './scenarios/showJsonPreview'
|
||||
import { showOffDiffCapability } from './scenarios/showOffDiffCapability'
|
||||
import { copyTopicToClipboard } from './scenarios/copyTopicToClipboard'
|
||||
import { copyValueToClipboard } from './scenarios/copyValueToClipboard'
|
||||
import { showMenu } from './scenarios/showMenu'
|
||||
import { showAdvancedConnectionSettings } from './scenarios/showAdvancedConnectionSettings'
|
||||
import { showSparkPlugDecoding } from './scenarios/showSparkplugDecoding'
|
||||
import { disconnect } from './scenarios/disconnect'
|
||||
|
||||
/**
|
||||
* UI Test Suite for MQTT Explorer
|
||||
*
|
||||
* These tests validate the core UI functionality of MQTT Explorer.
|
||||
* Each test is independent and deterministic.
|
||||
*
|
||||
* Best Practices Applied:
|
||||
* - Wait for specific UI elements rather than fixed timeouts
|
||||
* - Use meaningful assertions that verify actual state
|
||||
* - Test data-driven scenarios (Given-When-Then pattern)
|
||||
* - Capture screenshots for visual verification
|
||||
* - Handle MQTT asynchronous operations properly
|
||||
*
|
||||
* Prerequisites:
|
||||
* - MQTT broker running on localhost:1883
|
||||
* - Application built with `yarn build`
|
||||
*/
|
||||
// tslint:disable:only-arrow-functions ter-prefer-arrow-callback no-unused-expression
|
||||
describe('MQTT Explorer UI Tests', function () {
|
||||
// Increase timeout for UI tests
|
||||
this.timeout(60000)
|
||||
|
||||
let electronApp: ElectronApplication
|
||||
let page: Page
|
||||
let mqttClientStarted = false
|
||||
|
||||
/**
|
||||
* Setup: Start MQTT broker mock and launch Electron app
|
||||
*/
|
||||
before(async function () {
|
||||
this.timeout(90000) // Increased timeout for slow CI environments
|
||||
|
||||
console.log('Starting MQTT mock broker...')
|
||||
await mockMqtt()
|
||||
mqttClientStarted = true
|
||||
|
||||
console.log('Launching Electron application...')
|
||||
electronApp = await electron.launch({
|
||||
args: [`${__dirname}/../../..`, '--runningUiTestOnCi', '--no-sandbox', '--disable-dev-shm-usage'],
|
||||
timeout: 60000, // Give Electron more time to launch
|
||||
})
|
||||
|
||||
console.log('Waiting for application window...')
|
||||
page = await electronApp.firstWindow({ timeout: 30000 })
|
||||
|
||||
// Wait for the connection form to be ready (Host field exists in Electron, Username only in browser)
|
||||
await page.locator('//label[contains(text(), "Host")]/..//input').waitFor({ timeout: 10000 })
|
||||
|
||||
console.log('Application ready for testing')
|
||||
})
|
||||
|
||||
/**
|
||||
* Teardown: Close app and stop MQTT mock
|
||||
*/
|
||||
after(async function () {
|
||||
this.timeout(10000)
|
||||
|
||||
if (electronApp) {
|
||||
await electronApp.close()
|
||||
}
|
||||
|
||||
if (mqttClientStarted) {
|
||||
stopMqtt()
|
||||
}
|
||||
})
|
||||
|
||||
describe('Connection Management', () => {
|
||||
it('should connect to MQTT broker successfully', async function () {
|
||||
// Given: Application is on connection page
|
||||
// When: User connects to MQTT broker
|
||||
await connectTo('127.0.0.1', page)
|
||||
await sleep(1000)
|
||||
|
||||
// Start Sparkplug client after connection
|
||||
await MockSparkplug.run()
|
||||
await sleep(1000)
|
||||
|
||||
// Then: Disconnect button should be visible (indicating connected state)
|
||||
const disconnectButton = await page.locator('//button/span[contains(text(),"Disconnect")]')
|
||||
await disconnectButton.waitFor({ state: 'visible', timeout: 5000 })
|
||||
const isVisible = await disconnectButton.isVisible()
|
||||
expect(isVisible).to.be.true
|
||||
|
||||
// And: Connection indicator should show connected state
|
||||
await page.screenshot({ path: 'test-screenshot-connection.png' })
|
||||
})
|
||||
})
|
||||
|
||||
describe('Topic Tree Structure', () => {
|
||||
it('Given a JSON message sent to topic kitchen/coffee_maker, the tree should display nested topics', async function () {
|
||||
// Given: Mock MQTT broker publishes JSON to kitchen/coffee_maker
|
||||
// (This is done by mock-mqtt.ts)
|
||||
|
||||
// When: We wait for the topic to appear in the tree
|
||||
await sleep(2000) // Allow time for MQTT messages to arrive
|
||||
|
||||
// Then: Topic hierarchy should be visible (kitchen -> coffee_maker)
|
||||
const kitchenTopic = await page.locator('span[data-test-topic="kitchen"]')
|
||||
await kitchenTopic.waitFor({ state: 'visible', timeout: 5000 })
|
||||
expect(await kitchenTopic.isVisible()).to.be.true
|
||||
|
||||
// And: Clicking on kitchen should expand to show coffee_maker
|
||||
await kitchenTopic.click()
|
||||
await sleep(500)
|
||||
|
||||
const coffeeMakerTopic = await page.locator('span[data-test-topic="coffee_maker"]')
|
||||
await coffeeMakerTopic.waitFor({ state: 'visible', timeout: 5000 })
|
||||
expect(await coffeeMakerTopic.isVisible()).to.be.true
|
||||
|
||||
await page.screenshot({ path: 'test-screenshot-tree-hierarchy.png' })
|
||||
})
|
||||
|
||||
it('Given messages sent to livingroom/lamp/state and livingroom/lamp/brightness, both should appear under livingroom/lamp', async function () {
|
||||
// Given: Mock MQTT publishes to livingroom/lamp/state and livingroom/lamp/brightness
|
||||
await sleep(1000)
|
||||
|
||||
// When: We navigate to livingroom topic
|
||||
const livingroomTopic = await page.locator('span[data-test-topic="livingroom"]').first()
|
||||
await livingroomTopic.waitFor({ state: 'visible', timeout: 5000 })
|
||||
await livingroomTopic.click()
|
||||
await sleep(500)
|
||||
|
||||
// Then: lamp subtopic should be visible (use .first() as there might be lamp-1, lamp-2 etc)
|
||||
const lampTopic = await page.locator('span[data-test-topic="lamp"]').first()
|
||||
await lampTopic.waitFor({ state: 'visible', timeout: 5000 })
|
||||
expect(await lampTopic.isVisible()).to.be.true
|
||||
|
||||
// When: Clicking on lamp to expand it
|
||||
await lampTopic.click()
|
||||
await sleep(1000) // Give more time for expansion
|
||||
|
||||
// Then: Both state and brightness topics should be visible
|
||||
const stateTopic = await page.locator('span[data-test-topic="state"]').first()
|
||||
const brightnessTopic = await page.locator('span[data-test-topic="brightness"]').first()
|
||||
|
||||
await stateTopic.waitFor({ state: 'visible', timeout: 10000 })
|
||||
await brightnessTopic.waitFor({ state: 'visible', timeout: 10000 })
|
||||
|
||||
expect(await stateTopic.isVisible()).to.be.true
|
||||
expect(await brightnessTopic.isVisible()).to.be.true
|
||||
|
||||
await page.screenshot({ path: 'test-screenshot-tree-structure.png' })
|
||||
})
|
||||
|
||||
it('should display the correct number of root topics from mock data', async function () {
|
||||
// Given: Mock MQTT publishes to multiple root topics
|
||||
await sleep(1000)
|
||||
|
||||
// Then: We should see expected root topics (livingroom, kitchen, garden, etc.)
|
||||
const rootTopics = ['livingroom', 'kitchen', 'garden']
|
||||
for (const topicName of rootTopics) {
|
||||
const topic = await page.locator(`span[data-test-topic="${topicName}"]`)
|
||||
await topic.waitFor({ state: 'visible', timeout: 5000 })
|
||||
const visible = await topic.isVisible()
|
||||
expect(visible).to.be.true
|
||||
}
|
||||
|
||||
await page.screenshot({ path: 'test-screenshot-root-topics.png' })
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
describe('Topic Navigation and Search', () => {
|
||||
it('should search and filter topics containing "temp"', async function () {
|
||||
// Given: Multiple topics with "temp" in their path (kitchen/temperature, livingroom/temperature)
|
||||
// When: User searches for "temp"
|
||||
await searchTree('temp', page)
|
||||
await sleep(1000)
|
||||
|
||||
// Then: Search field should contain the search term
|
||||
const searchField = await page.locator('//input[contains(@placeholder, "Search")]')
|
||||
const searchValue = await searchField.inputValue()
|
||||
expect(searchValue).to.equal('temp')
|
||||
|
||||
// And: Only matching topics should be visible
|
||||
// We can verify this by checking that temperature topics are still visible
|
||||
const tempTopic = await page.locator('span[data-test-topic="temperature"]').first()
|
||||
await tempTopic.waitFor({ state: 'visible', timeout: 5000 })
|
||||
expect(await tempTopic.isVisible()).to.be.true
|
||||
|
||||
await page.screenshot({ path: 'test-screenshot-search.png' })
|
||||
|
||||
// When: User clears the search
|
||||
await clearSearch(page)
|
||||
await sleep(500)
|
||||
|
||||
// Then: Search field should be empty
|
||||
const clearedValue = await searchField.inputValue()
|
||||
expect(clearedValue).to.equal('')
|
||||
|
||||
// And: All topics should be visible again
|
||||
const kitchenTopic = await page.locator('span[data-test-topic="kitchen"]')
|
||||
expect(await kitchenTopic.isVisible()).to.be.true
|
||||
})
|
||||
|
||||
it('should search for specific topic path like "kitchen/lamp"', async function () {
|
||||
// When: User searches for kitchen/lamp
|
||||
await searchTree('kitchen/lamp', page)
|
||||
await sleep(1000)
|
||||
|
||||
// Then: Kitchen and lamp topics should be visible
|
||||
const kitchenTopic = await page.locator('span[data-test-topic="kitchen"]')
|
||||
expect(await kitchenTopic.isVisible()).to.be.true
|
||||
|
||||
await page.screenshot({ path: 'test-screenshot-search-path.png' })
|
||||
|
||||
await clearSearch(page)
|
||||
await sleep(500)
|
||||
})
|
||||
})
|
||||
|
||||
describe('Message Visualization', () => {
|
||||
it('Given a JSON message on topic actuality/showcase, should display formatted JSON', async function () {
|
||||
// Given: Mock publishes JSON to actuality/showcase
|
||||
// When: User navigates to the topic
|
||||
await showJsonPreview(page)
|
||||
await sleep(1500)
|
||||
|
||||
// Then: The message should be visible
|
||||
await page.screenshot({ path: 'test-screenshot-json-preview.png' })
|
||||
|
||||
// And: We should see formatted JSON content (verified via screenshot)
|
||||
})
|
||||
|
||||
it('should show numeric plots for topics with numeric values', async function () {
|
||||
// Given: Topics with numeric values (kitchen/coffee_maker/temperature)
|
||||
// Ensure no search filter is active
|
||||
await clearSearch(page)
|
||||
await sleep(500)
|
||||
|
||||
// When: Navigate to topic and create a chart
|
||||
await expandTopic('kitchen/coffee_maker', page)
|
||||
await sleep(1000)
|
||||
|
||||
// Look for chart icon and click it
|
||||
const chartIcon = await page.locator('//*[contains(@data-test-type, "ShowChart")]').first()
|
||||
try {
|
||||
await chartIcon.waitFor({ state: 'visible', timeout: 5000 })
|
||||
await chartIcon.click()
|
||||
await sleep(1000)
|
||||
|
||||
// Then: Chart panel should be visible
|
||||
const chartPanel = await page.locator('[class*="ChartPanel"]')
|
||||
const chartExists = (await chartPanel.count()) > 0
|
||||
expect(chartExists).to.be.true
|
||||
|
||||
await page.screenshot({ path: 'test-screenshot-numeric-plots.png' })
|
||||
|
||||
// Cleanup: Remove the chart
|
||||
const removeButton = await page.locator('//*[contains(@data-test-type, "RemoveChart")]').first()
|
||||
try {
|
||||
await removeButton.click({ timeout: 2000 })
|
||||
await sleep(500)
|
||||
} catch {
|
||||
// Ignore if remove fails
|
||||
}
|
||||
} catch {
|
||||
// If chart icon not found, just verify we navigated to the topic
|
||||
await page.screenshot({ path: 'test-screenshot-numeric-plots.png' })
|
||||
}
|
||||
|
||||
// Cleanup: Ensure we're not stuck in History view
|
||||
const valueTab = await page.locator('//span[contains(text(), "Value")]').first()
|
||||
try {
|
||||
await valueTab.click({ timeout: 2000 })
|
||||
await sleep(300)
|
||||
} catch {
|
||||
// Ignore if clicking fails
|
||||
}
|
||||
await clearSearch(page)
|
||||
await sleep(500)
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
describe('Clipboard Operations', () => {
|
||||
it('should copy message value to clipboard', async function () {
|
||||
// Given: A topic with a value is selected
|
||||
// Ensure no search filter is active and select a topic
|
||||
await clearSearch(page)
|
||||
await sleep(500)
|
||||
await expandTopic('livingroom/lamp/state', page)
|
||||
await sleep(500)
|
||||
|
||||
// When: User clicks copy value button
|
||||
await copyValueToClipboard(page)
|
||||
await sleep(500)
|
||||
|
||||
// Then: Copy action completes without error
|
||||
await page.screenshot({ path: 'test-screenshot-copy-value.png' })
|
||||
})
|
||||
})
|
||||
|
||||
describe('SparkplugB Support', () => {
|
||||
it('Given SparkplugB messages, should decode and display the payload', async function () {
|
||||
// Given: Mock SparkplugB client publishes messages
|
||||
// When: User navigates to SparkplugB topics
|
||||
await showSparkPlugDecoding(page)
|
||||
await sleep(2000)
|
||||
|
||||
// Then: Decoded SparkplugB data should be visible
|
||||
await page.screenshot({ path: 'test-screenshot-sparkplugb.png' })
|
||||
})
|
||||
})
|
||||
|
||||
describe('Settings and Configuration', () => {
|
||||
it('should show advanced connection settings with subscription options', async function () {
|
||||
// Given: User is on connection page
|
||||
// First disconnect
|
||||
await disconnect(page)
|
||||
await sleep(1000)
|
||||
|
||||
// When: User opens advanced connection settings
|
||||
await showAdvancedConnectionSettings(page)
|
||||
await sleep(1500)
|
||||
|
||||
// Then: Advanced settings should be visible
|
||||
const advancedPanel = await page.locator('[class*="advanced"]')
|
||||
const hasAdvanced = (await advancedPanel.count()) > 0
|
||||
|
||||
// Take screenshot showing advanced settings
|
||||
await page.screenshot({ path: 'test-screenshot-advanced-settings.png' })
|
||||
})
|
||||
})
|
||||
|
||||
describe('Retained Messages', () => {
|
||||
it('Given retained messages on multiple topics, should display retained indicator', async function () {
|
||||
// Given: Mock publishes retained messages (e.g., livingroom/lamp/state)
|
||||
await sleep(1000)
|
||||
|
||||
// When: Navigate to a topic with retained message
|
||||
await expandTopic('livingroom/lamp', page)
|
||||
await sleep(1000)
|
||||
|
||||
// Then: The UI should show message details
|
||||
// (Retained flag visible in message details panel)
|
||||
await page.screenshot({ path: 'test-screenshot-retained.png' })
|
||||
})
|
||||
})
|
||||
|
||||
describe('Reconnection and Connection State', () => {
|
||||
it('Given a connected client, should successfully disconnect and reconnect', async function () {
|
||||
// Given: Application is connected
|
||||
await sleep(1000)
|
||||
|
||||
// When: User disconnects
|
||||
const disconnectButton = await page.locator('//button/span[contains(text(),"Disconnect")]')
|
||||
await disconnectButton.waitFor({ state: 'visible', timeout: 5000 })
|
||||
await disconnectButton.click()
|
||||
await sleep(1000)
|
||||
|
||||
// Then: Connect button should be visible
|
||||
const connectButton = await page.locator('//button/span[contains(text(),"Connect")]')
|
||||
await connectButton.waitFor({ state: 'visible', timeout: 5000 })
|
||||
expect(await connectButton.isVisible()).to.be.true
|
||||
|
||||
await page.screenshot({ path: 'test-screenshot-disconnected.png' })
|
||||
|
||||
// When: User reconnects
|
||||
await connectButton.click()
|
||||
await sleep(2000)
|
||||
|
||||
// Then: Disconnect button should be visible again
|
||||
await disconnectButton.waitFor({ state: 'visible', timeout: 5000 })
|
||||
expect(await disconnectButton.isVisible()).to.be.true
|
||||
|
||||
await page.screenshot({ path: 'test-screenshot-reconnected.png' })
|
||||
})
|
||||
})
|
||||
|
||||
describe('Special Topic Names and Characters', () => {
|
||||
it('Given topic with MAC address format (01-80-C2-00-00-0F/LWT), should display correctly', async function () {
|
||||
// Given: Mock publishes to MAC address topic
|
||||
await sleep(1000)
|
||||
|
||||
// When: Search for MAC address topic
|
||||
await searchTree('01-80-C2', page)
|
||||
await sleep(1000)
|
||||
|
||||
// Then: Topic should be found
|
||||
const macTopic = await page.locator('span[data-test-topic="01-80-C2-00-00-0F"]')
|
||||
const macVisible = (await macTopic.count()) > 0
|
||||
|
||||
await page.screenshot({ path: 'test-screenshot-mac-address.png' })
|
||||
|
||||
await clearSearch(page)
|
||||
await sleep(500)
|
||||
})
|
||||
})
|
||||
|
||||
describe('Garden/IoT Device Topics', () => {
|
||||
it('Given garden device topics (pump, water level, lamps), should display all device states', async function () {
|
||||
// Given: Mock publishes garden device topics
|
||||
await sleep(1000)
|
||||
|
||||
// When: Navigate to garden
|
||||
const gardenTopic = await page.locator('span[data-test-topic="garden"]')
|
||||
await gardenTopic.waitFor({ state: 'visible', timeout: 5000 })
|
||||
expect(await gardenTopic.isVisible()).to.be.true
|
||||
|
||||
await gardenTopic.click()
|
||||
await sleep(500)
|
||||
|
||||
// Then: Pump, water, and lamps topics should be visible
|
||||
const pumpTopic = await page.locator('span[data-test-topic="pump"]')
|
||||
const waterTopic = await page.locator('span[data-test-topic="water"]')
|
||||
const lampsTopic = await page.locator('span[data-test-topic="lamps"]')
|
||||
|
||||
await pumpTopic.waitFor({ state: 'visible', timeout: 5000 })
|
||||
expect(await pumpTopic.isVisible()).to.be.true
|
||||
expect(await waterTopic.isVisible()).to.be.true
|
||||
expect(await lampsTopic.isVisible()).to.be.true
|
||||
|
||||
await page.screenshot({ path: 'test-screenshot-garden-devices.png' })
|
||||
})
|
||||
})
|
||||
|
||||
describe('Multiple Lamp Devices', () => {
|
||||
it('Given multiple lamp devices (lamp-1, lamp-2) with same properties, should distinguish them', async function () {
|
||||
// Given: Mock publishes to livingroom/lamp-1 and lamp-2
|
||||
await sleep(1000)
|
||||
|
||||
// When: Navigate to livingroom
|
||||
const livingroomTopic = await page.locator('span[data-test-topic="livingroom"]')
|
||||
await livingroomTopic.click()
|
||||
await sleep(500)
|
||||
|
||||
// Then: Both lamp-1 and lamp-2 should be visible
|
||||
const lamp1Topic = await page.locator('span[data-test-topic="lamp-1"]')
|
||||
const lamp2Topic = await page.locator('span[data-test-topic="lamp-2"]')
|
||||
|
||||
await lamp1Topic.waitFor({ state: 'visible', timeout: 5000 })
|
||||
await lamp2Topic.waitFor({ state: 'visible', timeout: 5000 })
|
||||
|
||||
expect(await lamp1Topic.isVisible()).to.be.true
|
||||
expect(await lamp2Topic.isVisible()).to.be.true
|
||||
|
||||
// When: Expand lamp-1
|
||||
await lamp1Topic.click()
|
||||
await sleep(500)
|
||||
|
||||
// Then: lamp-1 state and brightness should be visible
|
||||
const stateTopic = await page.locator('span[data-test-topic="state"]')
|
||||
const brightnessTopic = await page.locator('span[data-test-topic="brightness"]')
|
||||
|
||||
expect(await stateTopic.isVisible()).to.be.true
|
||||
expect(await brightnessTopic.isVisible()).to.be.true
|
||||
|
||||
await page.screenshot({ path: 'test-screenshot-multiple-lamps.png' })
|
||||
})
|
||||
})
|
||||
|
||||
describe('Search Functionality Edge Cases', () => {
|
||||
it('Given a search term that matches multiple topics at different levels, should show all matches', async function () {
|
||||
// Given: Multiple topics contain "state" (lamp/state, pump/state, etc.)
|
||||
await sleep(1000)
|
||||
|
||||
// When: Search for "state"
|
||||
await searchTree('state', page)
|
||||
await sleep(1000)
|
||||
|
||||
// Then: Multiple state topics should be visible
|
||||
const stateTopics = await page.locator('span[data-test-topic="state"]')
|
||||
const count = await stateTopics.count()
|
||||
expect(count).to.be.greaterThan(1, 'Should find multiple state topics')
|
||||
|
||||
await page.screenshot({ path: 'test-screenshot-search-multiple.png' })
|
||||
|
||||
await clearSearch(page)
|
||||
await sleep(500)
|
||||
})
|
||||
|
||||
it('Given a search term with no matches, should display empty tree', async function () {
|
||||
// When: Search for non-existent topic
|
||||
await searchTree('nonexistenttopic12345', page)
|
||||
await sleep(1000)
|
||||
|
||||
// Then: No topics should be visible (or a message)
|
||||
await page.screenshot({ path: 'test-screenshot-search-no-results.png' })
|
||||
|
||||
await clearSearch(page)
|
||||
await sleep(500)
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -0,0 +1,191 @@
|
||||
import 'mocha'
|
||||
import { expect } from 'chai'
|
||||
import { ElectronApplication, Page, _electron as electron } from 'playwright'
|
||||
import { createTestMock, stopTestMock } from './mock-mqtt-test'
|
||||
import { default as MockSparkplug } from './mock-sparkplugb'
|
||||
import { sleep } from './util'
|
||||
import { connectTo } from './scenarios/connect'
|
||||
import { searchTree, clearSearch } from './scenarios/searchTree'
|
||||
import { expandTopic } from './util/expandTopic'
|
||||
import type { MqttClient } from 'mqtt'
|
||||
|
||||
/**
|
||||
* MQTT Explorer UI Tests - Fully Isolated Test Suite
|
||||
*
|
||||
* Each test:
|
||||
* 1. Gets fresh page
|
||||
* 2. Mocks only the MQTT messages it needs (no timers)
|
||||
* 3. Connects to broker
|
||||
* 4. Tests functionality using expandTopic
|
||||
* 5. Reloads page for next test
|
||||
*
|
||||
* This ensures complete test isolation with no state carryover.
|
||||
*/
|
||||
// tslint:disable:only-arrow-functions ter-prefer-arrow-callback no-unused-expression
|
||||
describe('MQTT Explorer UI Tests', function () {
|
||||
this.timeout(60000)
|
||||
|
||||
let electronApp: ElectronApplication
|
||||
let testMock: MqttClient
|
||||
|
||||
before(async function () {
|
||||
this.timeout(90000)
|
||||
|
||||
console.log('Creating test-specific MQTT mock (no timers)...')
|
||||
testMock = await createTestMock()
|
||||
|
||||
console.log('Launching Electron application...')
|
||||
electronApp = await electron.launch({
|
||||
args: [`${__dirname}/../../..`, '--runningUiTestOnCi', '--no-sandbox', '--disable-dev-shm-usage'],
|
||||
timeout: 60000,
|
||||
})
|
||||
})
|
||||
|
||||
after(async function () {
|
||||
this.timeout(10000)
|
||||
|
||||
if (electronApp) {
|
||||
await electronApp.close()
|
||||
}
|
||||
|
||||
stopTestMock()
|
||||
})
|
||||
|
||||
// Helper function to get a fresh page
|
||||
async function getFreshPage(): Promise<Page> {
|
||||
const page = await electronApp.firstWindow({ timeout: 30000 })
|
||||
await page.locator('//label[contains(text(), "Host")]/..//input').waitFor({ timeout: 10000 })
|
||||
return page
|
||||
}
|
||||
|
||||
describe('Connection Management', () => {
|
||||
it('should connect and expand livingroom/lamp topic', async function () {
|
||||
// Given: Fresh page and mocked topic
|
||||
const page = await getFreshPage()
|
||||
testMock.publish('livingroom/lamp/state', 'on', { retain: true, qos: 0 })
|
||||
await sleep(500) // Let MQTT message propagate
|
||||
|
||||
// When: Connect and expand topic
|
||||
await connectTo('127.0.0.1', page)
|
||||
await sleep(2000)
|
||||
await expandTopic(page, 'livingroom/lamp')
|
||||
|
||||
// Then: Should see lamp state
|
||||
const stateTopic = await page.locator('span[data-test-topic="state"]')
|
||||
await stateTopic.waitFor({ state: 'visible', timeout: 5000 })
|
||||
expect(await stateTopic.isVisible()).to.be.true
|
||||
|
||||
await page.screenshot({ path: 'test-screenshot-connection.png' })
|
||||
|
||||
// Clean up: Reload page
|
||||
await page.reload()
|
||||
})
|
||||
})
|
||||
|
||||
describe('Topic Tree Structure', () => {
|
||||
it('should expand and display kitchen/coffee_maker with JSON payload', async function () {
|
||||
// Given: Fresh page and mocked JSON message
|
||||
const page = await getFreshPage()
|
||||
const coffeeData = {
|
||||
heater: 'on',
|
||||
temperature: 92.5,
|
||||
waterLevel: 0.5,
|
||||
}
|
||||
testMock.publish('kitchen/coffee_maker', JSON.stringify(coffeeData), { retain: true, qos: 2 })
|
||||
await sleep(500)
|
||||
|
||||
// When: Connect and expand topic
|
||||
await connectTo('127.0.0.1', page)
|
||||
await sleep(2000)
|
||||
await expandTopic(page, 'kitchen/coffee_maker')
|
||||
|
||||
// Then: JSON content should be visible (check for heater key)
|
||||
const valueDisplay = await page.locator('text="heater"')
|
||||
await valueDisplay.waitFor({ state: 'visible', timeout: 5000 })
|
||||
expect(await valueDisplay.isVisible()).to.be.true
|
||||
|
||||
await page.screenshot({ path: 'test-screenshot-kitchen-json.png' })
|
||||
|
||||
// Clean up: Reload page
|
||||
await page.reload()
|
||||
})
|
||||
|
||||
it('should expand nested topic livingroom/lamp/brightness', async function () {
|
||||
// Given: Fresh page and nested mocked topic
|
||||
const page = await getFreshPage()
|
||||
testMock.publish('livingroom/lamp/brightness', '128', { retain: true, qos: 0 })
|
||||
await sleep(500)
|
||||
|
||||
// When: Connect and expand to nested topic
|
||||
await connectTo('127.0.0.1', page)
|
||||
await sleep(2000)
|
||||
await expandTopic(page, 'livingroom/lamp/brightness')
|
||||
|
||||
// Then: Brightness topic should be visible and selected
|
||||
const brightnessTopic = await page.locator('span[data-test-topic="brightness"]')
|
||||
await brightnessTopic.waitFor({ state: 'visible', timeout: 5000 })
|
||||
expect(await brightnessTopic.isVisible()).to.be.true
|
||||
|
||||
await page.screenshot({ path: 'test-screenshot-nested-topic.png' })
|
||||
|
||||
// Clean up: Reload page
|
||||
await page.reload()
|
||||
})
|
||||
})
|
||||
|
||||
describe('Search Functionality', () => {
|
||||
it('should search for temperature and expand kitchen/temperature', async function () {
|
||||
// Given: Fresh page and mocked temperature topics
|
||||
const page = await getFreshPage()
|
||||
testMock.publish('kitchen/temperature', '22.5', { retain: true, qos: 0 })
|
||||
testMock.publish('livingroom/temperature', '21.0', { retain: true, qos: 0 })
|
||||
await sleep(500)
|
||||
|
||||
// When: Connect, search, and expand
|
||||
await connectTo('127.0.0.1', page)
|
||||
await sleep(2000)
|
||||
await searchTree('temp', page)
|
||||
await sleep(1000)
|
||||
await clearSearch(page)
|
||||
await sleep(500)
|
||||
await expandTopic(page, 'kitchen/temperature')
|
||||
|
||||
// Then: Temperature topic should be visible
|
||||
const tempTopic = await page.locator('span[data-test-topic="temperature"]')
|
||||
await tempTopic.waitFor({ state: 'visible', timeout: 5000 })
|
||||
expect(await tempTopic.isVisible()).to.be.true
|
||||
|
||||
await page.screenshot({ path: 'test-screenshot-search-temp.png' })
|
||||
|
||||
// Clean up: Reload page
|
||||
await page.reload()
|
||||
})
|
||||
|
||||
it('should search for lamp and expand kitchen/lamp', async function () {
|
||||
// Given: Fresh page and mocked lamp topics
|
||||
const page = await getFreshPage()
|
||||
testMock.publish('kitchen/lamp/state', 'off', { retain: true, qos: 0 })
|
||||
testMock.publish('livingroom/lamp/state', 'on', { retain: true, qos: 0 })
|
||||
await sleep(500)
|
||||
|
||||
// When: Connect, search, and expand
|
||||
await connectTo('127.0.0.1', page)
|
||||
await sleep(2000)
|
||||
await searchTree('kitchen/lamp', page)
|
||||
await sleep(1000)
|
||||
await clearSearch(page)
|
||||
await sleep(500)
|
||||
await expandTopic(page, 'kitchen/lamp')
|
||||
|
||||
// Then: Lamp topic should be visible
|
||||
const lampTopic = await page.locator('span[data-test-topic="lamp"]')
|
||||
await lampTopic.waitFor({ state: 'visible', timeout: 5000 })
|
||||
expect(await lampTopic.isVisible()).to.be.true
|
||||
|
||||
await page.screenshot({ path: 'test-screenshot-search-lamp.png' })
|
||||
|
||||
// Clean up: Reload page
|
||||
await page.reload()
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -2,37 +2,34 @@ import { clickOn } from './'
|
||||
import { Page } from 'playwright'
|
||||
|
||||
export async function expandTopic(path: string, browser: Page) {
|
||||
const originalTopics = path.split('/')
|
||||
const topics = path.split('/')
|
||||
console.log('expandTopic', path)
|
||||
let topics = path.split('/')
|
||||
while (topics.length > 0 && !(await topicMatches(topics, browser))) {
|
||||
topics = topics.slice(0, topics.length - 1)
|
||||
|
||||
// Build hierarchical selector and expand one level at a time
|
||||
for (let i = 0; i < topics.length; i++) {
|
||||
// Build a hierarchical selector for the current level
|
||||
// e.g., "kitchen" then "kitchen coffee_maker"
|
||||
const currentPath = topics.slice(0, i + 1)
|
||||
const selectors = currentPath.map(v => `span[data-test-topic='${v}']`)
|
||||
const hierarchicalSelector = selectors.join(' ')
|
||||
|
||||
console.log(`topic matches`, currentPath, `locator('${hierarchicalSelector}')`)
|
||||
|
||||
const locator = browser.locator(hierarchicalSelector).first()
|
||||
|
||||
// Wait for the topic to be visible with a reasonable timeout
|
||||
try {
|
||||
await locator.waitFor({ state: 'visible', timeout: 30000 })
|
||||
console.log(`found topics`, currentPath, topics)
|
||||
|
||||
// Click to expand this level
|
||||
await clickOn(locator)
|
||||
|
||||
// Reduced delay for UI to expand - 200ms is sufficient for most cases
|
||||
await new Promise(resolve => setTimeout(resolve, 200))
|
||||
} catch (error) {
|
||||
console.error(`Failed to find topic path: ${currentPath.join('/')}`, error)
|
||||
throw new Error(`Could not find topic "${currentPath.join('/')}" in path "${path}"`)
|
||||
}
|
||||
}
|
||||
if (topics.length === 0) {
|
||||
throw Error('could not expand topics, no match found')
|
||||
}
|
||||
|
||||
console.log('found topics', topics, originalTopics)
|
||||
|
||||
for (const topic of topics) {
|
||||
const match = await browser.locator(topicSelector([topic]))
|
||||
await clickOn(match.first())
|
||||
}
|
||||
// while (topics.length <= originalTopics.length) {
|
||||
// const match = await browser.locator(topicSelector(topics))
|
||||
// console.log('click', match)
|
||||
// await clickOn(match)
|
||||
// topics.push(originalTopics[topics.length])
|
||||
// }
|
||||
}
|
||||
|
||||
async function topicMatches(topics: Array<string>, browser: Page) {
|
||||
const result = await browser.locator(topicSelector(topics))
|
||||
console.log('topic matches', topics, result)
|
||||
return true
|
||||
}
|
||||
|
||||
function topicSelector(topics: Array<string>) {
|
||||
const selectors = topics.map(v => `span[data-test-topic='${v}']`)
|
||||
return selectors.join(' ')
|
||||
}
|
||||
|
||||
+18
-8
@@ -19,15 +19,14 @@ export function sleep(ms: number, required = false) {
|
||||
})
|
||||
}
|
||||
|
||||
export async function writeText(text: string, element: Locator, delay = 0) {
|
||||
return element.fill(text)
|
||||
export async function writeText(text: string, element: Locator, delay = 30) {
|
||||
element.pressSequentially(text, { delay })
|
||||
}
|
||||
|
||||
export async function deleteTextWithBackspaces(element: Locator, delay = 0, count = 0) {
|
||||
// @ts-ignore
|
||||
const length = count > 0 ? count : (await element.textContent()).length
|
||||
export async function deleteTextWithBackspaces(element: Locator, delay = 30, count = 0) {
|
||||
const length = count > 0 ? count : (await element.inputValue()).length
|
||||
for (let i = 0; i < length; i += 1) {
|
||||
await element.press('Backspace')
|
||||
await element.press('Backspace', { delay: 30 })
|
||||
await sleep(delay)
|
||||
}
|
||||
}
|
||||
@@ -48,8 +47,16 @@ export async function setTextInInput(name: string, text: string, browser: Page)
|
||||
}
|
||||
|
||||
export async function moveToCenterOfElement(element: Locator) {
|
||||
// @ts-ignore
|
||||
const { x, y, width, height } = await element.boundingBox()
|
||||
// Wait for element to be visible and attached before getting bounding box
|
||||
await element.waitFor({ state: 'visible', timeout: 30000 })
|
||||
|
||||
const boundingBox = await element.boundingBox()
|
||||
|
||||
if (!boundingBox) {
|
||||
throw new Error('Could not get bounding box for element')
|
||||
}
|
||||
|
||||
const { x, y, width, height } = boundingBox
|
||||
|
||||
const targetX = x + width / 2
|
||||
const targetY = y + height / 2
|
||||
@@ -80,6 +87,9 @@ export async function clickOn(
|
||||
button: 'left' | 'right' | 'middle' = 'left',
|
||||
force = false
|
||||
) {
|
||||
// Ensure element is visible before trying to interact
|
||||
await element.waitFor({ state: 'visible', timeout: 30000 })
|
||||
|
||||
await moveToCenterOfElement(element)
|
||||
await element.hover()
|
||||
await element.click({ delay, button, force, clickCount: clicks })
|
||||
|
||||
+6
-1
@@ -13,13 +13,18 @@
|
||||
"sourceMap": true,
|
||||
"types": ["node"],
|
||||
"skipLibCheck": true,
|
||||
"esModuleInterop": true
|
||||
"esModuleInterop": true,
|
||||
"downlevelIteration": true
|
||||
},
|
||||
"include": [
|
||||
"src/electron.ts",
|
||||
"src/server.ts",
|
||||
"src/AuthManager.ts",
|
||||
"src/spec/electron.ts",
|
||||
"src/spec/demoVideo.ts",
|
||||
"src/spec/leakTest.ts",
|
||||
"src/spec/testMcpIntrospection.ts",
|
||||
"src/spec/ui-tests.spec.ts",
|
||||
"scripts/*.ts"
|
||||
],
|
||||
"exclude": ["node_modules"]
|
||||
|
||||
Reference in New Issue
Block a user