mirror
/
meshastic.web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

feat: add disconnect method

pull/711/head
Dan Ditomaso 1 year ago
parent
5efa1d1795
commit
d104b136d0
7 changed files with 25 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 61
      deno.lock
  2. 2
      packages/core/deno.json
  3. 7
      packages/core/src/meshDevice.ts
  4. 1
      packages/core/src/types.ts
  5. 10
      packages/web/package.json
  6. 1
      packages/web/public/i18n/locales/en/commandPalette.json
  7. 10
      packages/web/src/components/CommandPalette/index.tsx

61
deno.lock
View File

@ -23,11 +23,6 @@
"npm:@bufbuild/protobuf@^2.2.3": "2.6.0",
"npm:@bufbuild/protobuf@^2.6.0": "2.6.0",
"npm:@hookform/resolvers@^5.1.1": "[email protected][email protected][email protected]",
"npm:@jsr/[email protected]": "2.6.4",
"npm:@jsr/[email protected]": "2.6.0-0",
"npm:@jsr/meshtastic__transport-http@*": "0.2.1",
"npm:@jsr/meshtastic__transport-web-bluetooth@*": "0.1.2",
"npm:@jsr/meshtastic__transport-web-serial@*": "0.2.1",
"npm:@noble/curves@^1.9.2": "1.9.2",
"npm:@radix-ui/react-accordion@^1.2.11": "1.2.11_@[email protected]_@[email protected]__@[email protected][email protected][email protected][email protected]",
"npm:@radix-ui/react-checkbox@^1.3.2": "1.3.2_@[email protected]_@[email protected]__@[email protected][email protected][email protected][email protected]",
@ -104,6 +99,7 @@
"npm:testing-library@^0.0.2": "0.0.2_@[email protected]__@[email protected][email protected][email protected][email protected]_@[email protected][email protected][email protected]",
"npm:tslog@^4.9.3": "4.9.3",
"npm:typescript@^5.8.3": "5.8.3",
"npm:vite@*": "7.0.2_@[email protected][email protected]",
"npm:vite@7": "7.0.2_@[email protected][email protected]",
"npm:vitest@^3.2.4": "3.2.4_@[email protected][email protected][email protected]__@[email protected][email protected]",
"npm:zod@^3.25.75": "3.25.75",
@ -662,56 +658,6 @@
"@jridgewell/sourcemap-codec"
]
},
"@jsr/[email protected]": {
"integrity": "sha512-1Kz5DK6peFxluHOJR38vFwfgeJzMXTz+3p6TvibjILVhSQC2U1nu8aJbn6w5zhRqS+j79OmtrRvdzL6VNsTkkQ==",
"dependencies": [
"@bufbuild/protobuf",
"@jsr/meshtastic__protobufs",
"crc",
"ste-simple-events",
"tslog"
],
"tarball": "https://npm.jsr.io/~/11/@jsr/meshtastic__core/2.6.4.tgz"
},
"@jsr/[email protected]": {
"integrity": "sha512-+xpZpxK6oUIVOuEs7C+LyxRr2druvc7UNNNTK9Rl8ioXj63Jz1uQXlYe2Gj0xjnRAiSQLR7QVaPef21BR/YTxA==",
"dependencies": [
"@bufbuild/protobuf",
"@jsr/meshtastic__protobufs",
"crc",
"ste-simple-events",
"tslog"
],
"tarball": "https://npm.jsr.io/~/11/@jsr/meshtastic__js/2.6.0-0.tgz"
},
"@jsr/[email protected]": {
"integrity": "sha512-ndZhUyB/ADSyjJI+iSeSOoIKqNGZ2+ERVjfY0qnh4jgF740tFTwefC5mzZhOqDLbreGFYS79+429NtH5Ujdzdg==",
"dependencies": [
"@bufbuild/protobuf"
],
"tarball": "https://npm.jsr.io/~/11/@jsr/meshtastic__protobufs/2.7.0.tgz"
},
"@jsr/[email protected]": {
"integrity": "sha512-lmQKr3aIINKvtGROU4HchmSVqbZSbkIHqajowRRC8IAjsnR0zNTyxz210QyY4pFUF9hpcW3GRjwq5h/VO2JuGg==",
"dependencies": [
"@jsr/meshtastic__core"
],
"tarball": "https://npm.jsr.io/~/11/@jsr/meshtastic__transport-http/0.2.1.tgz"
},
"@jsr/[email protected]": {
"integrity": "sha512-Z+5pv9RXNgY0/crKExOH3pZ6LT0HIXFmnBL7NX5AO2knOFRn+4lmxQEhhmiTTlkUfqyEfAvbjuY5u4mq9TPTdQ==",
"dependencies": [
"@jsr/meshtastic__core"
],
"tarball": "https://npm.jsr.io/~/11/@jsr/meshtastic__transport-web-bluetooth/0.1.2.tgz"
},
"@jsr/[email protected]": {
"integrity": "sha512-yumjEGLkAuJYOC3aWKvZzbQqi/LnqaKfNpVCY7Ki7oLtAshNiZrBLiwiFhN7+ZR9FfMdJThyBMqREBDRRWTO1Q==",
"dependencies": [
"@jsr/meshtastic__core"
],
"tarball": "https://npm.jsr.io/~/11/@jsr/meshtastic__transport-web-serial/0.2.1.tgz"
},
"@mapbox/[email protected]": {
"integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==",
"dependencies": [
@ -5213,11 +5159,6 @@
"dependencies": [
"npm:@bufbuild/protobuf@^2.6.0",
"npm:@hookform/resolvers@^5.1.1",
"npm:@jsr/[email protected]",
"npm:@jsr/[email protected]",
"npm:@jsr/meshtastic__transport-http@*",
"npm:@jsr/meshtastic__transport-web-bluetooth@*",
"npm:@jsr/meshtastic__transport-web-serial@*",
"npm:@noble/curves@^1.9.2",
"npm:@radix-ui/react-accordion@^1.2.11",
"npm:@radix-ui/react-checkbox@^1.3.2",

2
packages/core/deno.json
View File

@ -1,6 +1,6 @@
{
"name": "@meshtastic/core",
"version": "2.6.4",
"version": "2.6.5",
"description": "Core functionalities for Meshtastic web applications.",
"exports": {
".": "./mod.ts"

7
packages/core/src/meshDevice.ts
View File

@ -818,6 +818,13 @@ export class MeshDevice {
this.queue.clear();
}
/** Disconnects from the device **/
public async disconnect(): Promise<void> {
this.log.debug(Emitter[Emitter.Disconnect], "🔌 Disconnecting from device");
this.complete();
await this.transport.toDevice.close();
}
/**
* Gets called when a MeshPacket is received from device
*/

1
packages/core/src/types.ts
View File

@ -99,6 +99,7 @@ export enum Emitter {
EnterDfuMode = 31,
RemoveNodeByNum = 32,
SetCannedMessages = 33,
Disconnect = 34,
}
export interface LogEvent {

10
packages/web/package.json
View File

@ -4,7 +4,6 @@
"type": "module",
"description": "Meshtastic web client",
"license": "GPL-3.0-only",
"repository": {
"type": "git",
"url": "git+https://github.com/meshtastic/web.git"
@ -19,11 +18,10 @@
"dependencies": {
"@bufbuild/protobuf": "^2.6.0",
"@hookform/resolvers": "^5.1.1",
"@meshtastic/core": "npm:@jsr/[email protected]",
"@meshtastic/js": "npm:@jsr/[email protected]",
"@meshtastic/transport-http": "npm:@jsr/meshtastic__transport-http",
"@meshtastic/transport-web-bluetooth": "npm:@jsr/meshtastic__transport-web-bluetooth",
"@meshtastic/transport-web-serial": "npm:@jsr/meshtastic__transport-web-serial",
"@meshtastic/core": "workspace:*",
"@meshtastic/transport-http": "workspace:*",
"@meshtastic/transport-web-bluetooth": "workspace:*",
"@meshtastic/transport-web-serial": "workspace:*",
"@noble/curves": "^1.9.2",
"@radix-ui/react-accordion": "^1.2.11",
"@radix-ui/react-checkbox": "^1.3.2",

1
packages/web/public/i18n/locales/en/commandPalette.json
View File

@ -35,6 +35,7 @@
"scheduleShutdown": "Schedule Shutdown",
"scheduleReboot": "Schedule Reboot",
"rebootToOtaMode": "Reboot To OTA Mode",
"disconnect": "Disconnect",
"resetNodeDb": "Reset Node DB",
"factoryResetDevice": "Factory Reset Device",
"factoryResetConfig": "Factory Reset Config"

10
packages/web/src/components/CommandPalette/index.tsx
View File

@ -13,6 +13,7 @@ import {
ArrowLeftRightIcon,
BoxSelectIcon,
BugIcon,
CloudOff,
EraserIcon,
FactoryIcon,
LayersIcon,
@ -199,6 +200,15 @@ export const CommandPalette = () => {
connection?.resetNodes();
},
},
{
label: t("contextual.command.disconnect"),
icon: CloudOff,
action() {
connection?.disconnect().catch((error) => {
console.error("Failed to disconnect:", error);
});
},
},
{
label: t("contextual.command.factoryResetDevice"),
icon: FactoryIcon,

Write Preview
Loading…
Cancel
Save