Merge pull request #490 from danditomaso/issue-489-bluetooth-uuid-not-set

fix: restored correct BLE service uuid to BLE devices filter
This commit is contained in:
Dan Ditomaso
2025-03-08 21:01:22 -05:00
committed by GitHub
3 changed files with 25 additions and 4 deletions
@@ -5,7 +5,7 @@ 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, Constants } from "@meshtastic/js"; import { BleConnection, ServiceUuid } from "@meshtastic/js";
import { useCallback, useEffect, useState } from "react"; import { useCallback, useEffect, useState } from "react";
export const BLE = ({ closeDialog }: TabElementProps) => { export const BLE = ({ closeDialog }: TabElementProps) => {
@@ -58,7 +58,7 @@ export const BLE = ({ closeDialog }: TabElementProps) => {
onClick={async () => { onClick={async () => {
await navigator.bluetooth await navigator.bluetooth
.requestDevice({ .requestDevice({
filters: [{ services: [Constants.ServiceUuid] }], filters: [{ services: [ServiceUuid] }],
}) })
.then((device) => { .then((device) => {
const exists = bleDevices.findIndex((d) => d.id === device.id); const exists = bleDevices.findIndex((d) => d.id === device.id);
+18 -1
View File
@@ -1 +1,18 @@
{ "github": { "silent": true } } {
"github": { "silent": true },
"headers": [
{
"source": "/",
"headers": [
{
"key": "Cross-Origin-Embedder-Policy",
"value": "require-corp"
},
{
"key": "Cross-Origin-Opener-Policy",
"value": "same-origin"
}
]
}
]
}
+5 -1
View File
@@ -41,7 +41,11 @@ export default defineConfig({
}, },
}, },
server: { server: {
port: 3000 port: 3000,
headers: {
'Cross-Origin-Opener-Policy': 'same-origin',
'Cross-Origin-Embedder-Policy': 'require-corp',
}
}, },
optimizeDeps: { optimizeDeps: {
exclude: ['react-scan'] exclude: ['react-scan']