Browse Source

Remove deprecated meshtastic/js dependency

pull/638/head
philon- 1 year ago
parent
commit
95ec1d8032
  1. 1
      package.json
  2. 15
      src/components/PageComponents/Connect/BLE.tsx
  3. 2
      src/components/PageComponents/Messages/MessageItem.tsx
  4. 10
      src/core/dto/PacketToMessageDTO.ts

1
package.json

@ -36,7 +36,6 @@
"dependencies": { "dependencies": {
"@bufbuild/protobuf": "^2.2.5", "@bufbuild/protobuf": "^2.2.5",
"@meshtastic/core": "npm:@jsr/[email protected]", "@meshtastic/core": "npm:@jsr/[email protected]",
"@meshtastic/js": "npm:@jsr/[email protected]",
"@meshtastic/transport-http": "npm:@jsr/meshtastic__transport-http", "@meshtastic/transport-http": "npm:@jsr/meshtastic__transport-http",
"@meshtastic/transport-web-bluetooth": "npm:@jsr/meshtastic__transport-web-bluetooth", "@meshtastic/transport-web-bluetooth": "npm:@jsr/meshtastic__transport-web-bluetooth",
"@meshtastic/transport-web-serial": "npm:@jsr/meshtastic__transport-web-serial", "@meshtastic/transport-web-serial": "npm:@jsr/meshtastic__transport-web-serial",

15
src/components/PageComponents/Connect/BLE.tsx

@ -5,9 +5,10 @@ import { useAppStore } from "@core/stores/appStore.ts";
import { useDeviceStore } from "@core/stores/deviceStore.ts"; import { useDeviceStore } from "@core/stores/deviceStore.ts";
import { subscribeAll } from "@core/subscriptions.ts"; import { subscribeAll } from "@core/subscriptions.ts";
import { randId } from "@core/utils/randId.ts"; import { randId } from "@core/utils/randId.ts";
import { BleConnection, ServiceUuid } from "@meshtastic/js"; import { TransportWebBluetooth } from "@meshtastic/transport-web-bluetooth";
import { MeshDevice } from "@meshtastic/core";
import { useCallback, useEffect, useState } from "react"; import { useCallback, useEffect, useState } from "react";
import { useMessageStore } from "../../../core/stores/messageStore/index.ts"; import { useMessageStore } from "@core/stores/messageStore/index.ts";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
export const BLE = ( export const BLE = (
@ -30,15 +31,13 @@ export const BLE = (
const onConnect = async (bleDevice: BluetoothDevice) => { const onConnect = async (bleDevice: BluetoothDevice) => {
const id = randId(); const id = randId();
const transport = await TransportWebBluetooth.createFromDevice(bleDevice);
const device = addDevice(id); const device = addDevice(id);
const connection = new MeshDevice(transport, id);
connection.configure();
setSelectedDevice(id); setSelectedDevice(id);
const connection = new BleConnection(id);
await connection.connect({
device: bleDevice,
});
device.addConnection(connection); device.addConnection(connection);
subscribeAll(device, connection, messageStore); subscribeAll(device, connection, messageStore);
closeDialog(); closeDialog();
}; };
@ -71,7 +70,7 @@ export const BLE = (
onClick={async () => { onClick={async () => {
await navigator.bluetooth await navigator.bluetooth
.requestDevice({ .requestDevice({
filters: [{ services: [ServiceUuid] }], filters: [{ services: [TransportWebBluetooth.ServiceUuid] }],
}) })
.then((device) => { .then((device) => {
const exists = bleDevices.findIndex((d) => d.id === device.id); const exists = bleDevices.findIndex((d) => d.id === device.id);

2
src/components/PageComponents/Messages/MessageItem.tsx

@ -15,7 +15,7 @@ import {
MessageState, MessageState,
useMessageStore, useMessageStore,
} from "@core/stores/messageStore/index.ts"; } from "@core/stores/messageStore/index.ts";
import { Protobuf, Types } from "@meshtastic/js"; import { Protobuf, Types } from "@meshtastic/core";
import { Message } from "@core/stores/messageStore/types.ts"; import { Message } from "@core/stores/messageStore/types.ts";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
// import { MessageActionsMenu } from "@components/PageComponents/Messages/MessageActionsMenu.tsx"; // Uncomment if needed later // import { MessageActionsMenu } from "@components/PageComponents/Messages/MessageActionsMenu.tsx"; // Uncomment if needed later

10
src/core/dto/PacketToMessageDTO.ts

@ -1,10 +1,6 @@
import type { Types } from "@meshtastic/js"; import type { Types } from "@meshtastic/core";
import { import { MessageState, MessageType } from "@core/stores/messageStore/index.ts";
Message, import { Message } from "@core/stores/messageStore/types.ts";
MessageState,
MessageType,
} from "../stores/messageStore/index.ts";
class PacketToMessageDTO { class PacketToMessageDTO {
channel: Types.ChannelNumber; channel: Types.ChannelNumber;
to: number; to: number;

Loading…
Cancel
Save