Browse Source

Update meshtastic.js version

pull/39/head
Sacha Weatherstone 4 years ago
parent
commit
09a8675958
No known key found for this signature in database GPG Key ID: 7AB2D7E206124B31
  1. 2
      package.json
  2. 161
      pnpm-lock.yaml
  3. 2
      src/components/PageComponents/Connect/BLE.tsx
  4. 3
      src/components/PageComponents/Messages/ChannelChat.tsx
  5. 6
      src/core/stores/deviceStore.ts
  6. 12
      src/core/subscriptions.ts

2
package.json

@ -24,7 +24,7 @@
"@heroicons/react": "^2.0.11",
"@hookform/resolvers": "^2.9.8",
"@meshtastic/eslint-config": "^1.0.8",
"@meshtastic/meshtasticjs": "^0.6.101",
"@meshtastic/meshtasticjs": "^0.6.102",
"@tailwindcss/line-clamp": "^0.4.2",
"@tailwindcss/typography": "^0.5.7",
"base64-js": "^1.5.1",

161
pnpm-lock.yaml

@ -6,7 +6,7 @@ specifiers:
'@heroicons/react': ^2.0.11
'@hookform/resolvers': ^2.9.8
'@meshtastic/eslint-config': ^1.0.8
'@meshtastic/meshtasticjs': ^0.6.101
'@meshtastic/meshtasticjs': ^0.6.102
'@tailwindcss/line-clamp': ^0.4.2
'@tailwindcss/typography': ^0.5.7
'@types/chrome': ^0.0.197
@ -52,7 +52,7 @@ dependencies:
'@heroicons/react': 2.0[email protected]
'@hookform/resolvers': 2.9[email protected]
'@meshtastic/eslint-config': 1.0.8
'@meshtastic/meshtasticjs': 0.6.101
'@meshtastic/meshtasticjs': 0.6.102
'@tailwindcss/line-clamp': 0.4[email protected]
'@tailwindcss/typography': 0.5[email protected]
base64-js: 1.5.1
@ -379,8 +379,8 @@ packages:
js-sha3: 0.8.0
dev: false
/@esbuild/android-arm/0.15.9:
resolution: {integrity: sha512-VZPy/ETF3fBG5PiinIkA0W/tlsvlEgJccyN2DzWZEl0DlVKRbu91PvY2D6Lxgluj4w9QtYHjOWjAT44C+oQ+EQ==}
/@esbuild/android-arm/0.15.10:
resolution: {integrity: sha512-FNONeQPy/ox+5NBkcSbYJxoXj9GWu8gVGJTVmUyoOCKQFDTrHVKgNSzChdNt0I8Aj/iKcsDf2r9BFwv+FSNUXg==}
engines: {node: '>=12'}
cpu: [arm]
os: [android]
@ -388,8 +388,8 @@ packages:
dev: true
optional: true
/@esbuild/linux-loong64/0.15.9:
resolution: {integrity: sha512-O+NfmkfRrb3uSsTa4jE3WApidSe3N5++fyOVGP1SmMZi4A3BZELkhUUvj5hwmMuNdlpzAZ8iAPz2vmcR7DCFQA==}
/@esbuild/linux-loong64/0.15.10:
resolution: {integrity: sha512-w0Ou3Z83LOYEkwaui2M8VwIp+nLi/NA60lBLMvaJ+vXVMcsARYdEzLNE7RSm4+lSg4zq4d7fAVuzk7PNQ5JFgg==}
engines: {node: '>=12'}
cpu: [loong64]
os: [linux]
@ -448,8 +448,8 @@ packages:
react-hook-form: 7.36[email protected]
dev: false
/@humanwhocodes/config-array/0.10.6:
resolution: {integrity: sha512-U/piU+VwXZsIgwnl+N+nRK12jCpHdc3s0UAc6zc1+HUgiESJxClpvYao/x9JwaN7onNeVb7kTlxlAvuEoaJ3ig==}
/@humanwhocodes/config-array/0.10.7:
resolution: {integrity: sha512-MDl6D6sBsaV452/QSdX+4CXIjZhIcI0PELsxUjk4U828yd58vk3bTIvk/6w5FY+4hIy9sLW0sfrV7K7Kc++j/w==}
engines: {node: '>=10.10.0'}
dependencies:
'@humanwhocodes/object-schema': 1.2.1
@ -570,17 +570,14 @@ packages:
- supports-color
dev: false
/@meshtastic/meshtasticjs/0.6.101:
resolution: {integrity: sha512-PNnLZsmYoNdwf5pWYxQZm21wUgQYndSrLZSG0duE47ug6LNdTP5XptX1eJYcnOSNMbBM8oIzjRuX4yPaf/Jm5Q==}
/@meshtastic/meshtasticjs/0.6.102:
resolution: {integrity: sha512-mX4VhTxlyZ2T8Y15AWv59a7dkBxVMurPmeTflPd9gJKTfF8gpq8BKl/mmn3R0MhPdfpblGN1UkUlNx+GaCTQyw==}
dependencies:
'@meshtastic/eslint-config': 1.0.8
'@protobuf-ts/runtime': 2.8.1
'@serialport/stream': 10.3.0
prettier: 2.7.1
serialport: 10.4.0
sub-events: 1.9.0
transitivePeerDependencies:
- eslint-import-resolver-webpack
- supports-color
dev: false
@ -1142,7 +1139,7 @@ packages:
hasBin: true
dependencies:
caniuse-lite: 1.0.30001414
electron-to-chromium: 1.4.268
electron-to-chromium: 1.4.269
node-releases: 2.0.6
update-browserslist-db: 1.0[email protected]
dev: true
@ -1410,8 +1407,8 @@ packages:
resolution: {integrity: sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==}
dev: false
/electron-to-chromium/1.4.268:
resolution: {integrity: sha512-PO90Bv++vEzdln+eA9qLg1IRnh0rKETus6QkTzcFm5P3Wg3EQBZud5dcnzkpYXuIKWBjKe5CO8zjz02cicvn1g==}
/electron-to-chromium/1.4.269:
resolution: {integrity: sha512-7mHFONwp7MNvdyto1v70fCwk28NJMFgsK79op+iYHzz1BLE8T66a1B2qW5alb8XgE0yi3FL3ZQjSYZpJpF6snw==}
dev: true
/emoji-regex/8.0.0:
@ -1484,8 +1481,8 @@ packages:
is-date-object: 1.0.5
is-symbol: 1.0.4
/esbuild-android-64/0.15.9:
resolution: {integrity: sha512-HQCX7FJn9T4kxZQkhPjNZC7tBWZqJvhlLHPU2SFzrQB/7nDXjmTIFpFTjt7Bd1uFpeXmuwf5h5fZm+x/hLnhbw==}
/esbuild-android-64/0.15.10:
resolution: {integrity: sha512-UI7krF8OYO1N7JYTgLT9ML5j4+45ra3amLZKx7LO3lmLt1Ibn8t3aZbX5Pu4BjWiqDuJ3m/hsvhPhK/5Y/YpnA==}
engines: {node: '>=12'}
cpu: [x64]
os: [android]
@ -1493,8 +1490,8 @@ packages:
dev: true
optional: true
/esbuild-android-arm64/0.15.9:
resolution: {integrity: sha512-E6zbLfqbFVCNEKircSHnPiSTsm3fCRxeIMPfrkS33tFjIAoXtwegQfVZqMGR0FlsvVxp2NEDOUz+WW48COCjSg==}
/esbuild-android-arm64/0.15.10:
resolution: {integrity: sha512-EOt55D6xBk5O05AK8brXUbZmoFj4chM8u3riGflLa6ziEoVvNjRdD7Cnp82NHQGfSHgYR06XsPI8/sMuA/cUwg==}
engines: {node: '>=12'}
cpu: [arm64]
os: [android]
@ -1502,8 +1499,8 @@ packages:
dev: true
optional: true
/esbuild-darwin-64/0.15.9:
resolution: {integrity: sha512-gI7dClcDN/HHVacZhTmGjl0/TWZcGuKJ0I7/xDGJwRQQn7aafZGtvagOFNmuOq+OBFPhlPv1T6JElOXb0unkSQ==}
/esbuild-darwin-64/0.15.10:
resolution: {integrity: sha512-hbDJugTicqIm+WKZgp208d7FcXcaK8j2c0l+fqSJ3d2AzQAfjEYDRM3Z2oMeqSJ9uFxyj/muSACLdix7oTstRA==}
engines: {node: '>=12'}
cpu: [x64]
os: [darwin]
@ -1511,8 +1508,8 @@ packages:
dev: true
optional: true
/esbuild-darwin-arm64/0.15.9:
resolution: {integrity: sha512-VZIMlcRN29yg/sv7DsDwN+OeufCcoTNaTl3Vnav7dL/nvsApD7uvhVRbgyMzv0zU/PP0xRhhIpTyc7lxEzHGSw==}
/esbuild-darwin-arm64/0.15.10:
resolution: {integrity: sha512-M1t5+Kj4IgSbYmunf2BB6EKLkWUq+XlqaFRiGOk8bmBapu9bCDrxjf4kUnWn59Dka3I27EiuHBKd1rSO4osLFQ==}
engines: {node: '>=12'}
cpu: [arm64]
os: [darwin]
@ -1520,8 +1517,8 @@ packages:
dev: true
optional: true
/esbuild-freebsd-64/0.15.9:
resolution: {integrity: sha512-uM4z5bTvuAXqPxrI204txhlsPIolQPWRMLenvGuCPZTnnGlCMF2QLs0Plcm26gcskhxewYo9LkkmYSS5Czrb5A==}
/esbuild-freebsd-64/0.15.10:
resolution: {integrity: sha512-KMBFMa7C8oc97nqDdoZwtDBX7gfpolkk6Bcmj6YFMrtCMVgoU/x2DI1p74DmYl7CSS6Ppa3xgemrLrr5IjIn0w==}
engines: {node: '>=12'}
cpu: [x64]
os: [freebsd]
@ -1529,8 +1526,8 @@ packages:
dev: true
optional: true
/esbuild-freebsd-arm64/0.15.9:
resolution: {integrity: sha512-HHDjT3O5gWzicGdgJ5yokZVN9K9KG05SnERwl9nBYZaCjcCgj/sX8Ps1jvoFSfNCO04JSsHSOWo4qvxFuj8FoA==}
/esbuild-freebsd-arm64/0.15.10:
resolution: {integrity: sha512-m2KNbuCX13yQqLlbSojFMHpewbn8wW5uDS6DxRpmaZKzyq8Dbsku6hHvh2U+BcLwWY4mpgXzFUoENEf7IcioGg==}
engines: {node: '>=12'}
cpu: [arm64]
os: [freebsd]
@ -1538,8 +1535,8 @@ packages:
dev: true
optional: true
/esbuild-linux-32/0.15.9:
resolution: {integrity: sha512-AQIdE8FugGt1DkcekKi5ycI46QZpGJ/wqcMr7w6YUmOmp2ohQ8eO4sKUsOxNOvYL7hGEVwkndSyszR6HpVHLFg==}
/esbuild-linux-32/0.15.10:
resolution: {integrity: sha512-guXrwSYFAvNkuQ39FNeV4sNkNms1bLlA5vF1H0cazZBOLdLFIny6BhT+TUbK/hdByMQhtWQ5jI9VAmPKbVPu1w==}
engines: {node: '>=12'}
cpu: [ia32]
os: [linux]
@ -1547,8 +1544,8 @@ packages:
dev: true
optional: true
/esbuild-linux-64/0.15.9:
resolution: {integrity: sha512-4RXjae7g6Qs7StZyiYyXTZXBlfODhb1aBVAjd+ANuPmMhWthQilWo7rFHwJwL7DQu1Fjej2sODAVwLbcIVsAYQ==}
/esbuild-linux-64/0.15.10:
resolution: {integrity: sha512-jd8XfaSJeucMpD63YNMO1JCrdJhckHWcMv6O233bL4l6ogQKQOxBYSRP/XLWP+6kVTu0obXovuckJDcA0DKtQA==}
engines: {node: '>=12'}
cpu: [x64]
os: [linux]
@ -1556,8 +1553,8 @@ packages:
dev: true
optional: true
/esbuild-linux-arm/0.15.9:
resolution: {integrity: sha512-3Zf2GVGUOI7XwChH3qrnTOSqfV1V4CAc/7zLVm4lO6JT6wbJrTgEYCCiNSzziSju+J9Jhf9YGWk/26quWPC6yQ==}
/esbuild-linux-arm/0.15.10:
resolution: {integrity: sha512-6N8vThLL/Lysy9y4Ex8XoLQAlbZKUyExCWyayGi2KgTBelKpPgj6RZnUaKri0dHNPGgReJriKVU6+KDGQwn10A==}
engines: {node: '>=12'}
cpu: [arm]
os: [linux]
@ -1565,8 +1562,8 @@ packages:
dev: true
optional: true
/esbuild-linux-arm64/0.15.9:
resolution: {integrity: sha512-a+bTtxJmYmk9d+s2W4/R1SYKDDAldOKmWjWP0BnrWtDbvUBNOm++du0ysPju4mZVoEFgS1yLNW+VXnG/4FNwdQ==}
/esbuild-linux-arm64/0.15.10:
resolution: {integrity: sha512-GByBi4fgkvZFTHFDYNftu1DQ1GzR23jws0oWyCfhnI7eMOe+wgwWrc78dbNk709Ivdr/evefm2PJiUBMiusS1A==}
engines: {node: '>=12'}
cpu: [arm64]
os: [linux]
@ -1574,8 +1571,8 @@ packages:
dev: true
optional: true
/esbuild-linux-mips64le/0.15.9:
resolution: {integrity: sha512-Zn9HSylDp89y+TRREMDoGrc3Z4Hs5u56ozZLQCiZAUx2+HdbbXbWdjmw3FdTJ/i7t5Cew6/Q+6kfO3KCcFGlyw==}
/esbuild-linux-mips64le/0.15.10:
resolution: {integrity: sha512-BxP+LbaGVGIdQNJUNF7qpYjEGWb0YyHVSKqYKrn+pTwH/SiHUxFyJYSP3pqkku61olQiSBnSmWZ+YUpj78Tw7Q==}
engines: {node: '>=12'}
cpu: [mips64el]
os: [linux]
@ -1583,8 +1580,8 @@ packages:
dev: true
optional: true
/esbuild-linux-ppc64le/0.15.9:
resolution: {integrity: sha512-OEiOxNAMH9ENFYqRsWUj3CWyN3V8P3ZXyfNAtX5rlCEC/ERXrCEFCJji/1F6POzsXAzxvUJrTSTCy7G6BhA6Fw==}
/esbuild-linux-ppc64le/0.15.10:
resolution: {integrity: sha512-LoSQCd6498PmninNgqd/BR7z3Bsk/mabImBWuQ4wQgmQEeanzWd5BQU2aNi9mBURCLgyheuZS6Xhrw5luw3OkQ==}
engines: {node: '>=12'}
cpu: [ppc64]
os: [linux]
@ -1592,8 +1589,8 @@ packages:
dev: true
optional: true
/esbuild-linux-riscv64/0.15.9:
resolution: {integrity: sha512-ukm4KsC3QRausEFjzTsOZ/qqazw0YvJsKmfoZZm9QW27OHjk2XKSQGGvx8gIEswft/Sadp03/VZvAaqv5AIwNA==}
/esbuild-linux-riscv64/0.15.10:
resolution: {integrity: sha512-Lrl9Cr2YROvPV4wmZ1/g48httE8z/5SCiXIyebiB5N8VT7pX3t6meI7TQVHw/wQpqP/AF4SksDuFImPTM7Z32Q==}
engines: {node: '>=12'}
cpu: [riscv64]
os: [linux]
@ -1601,8 +1598,8 @@ packages:
dev: true
optional: true
/esbuild-linux-s390x/0.15.9:
resolution: {integrity: sha512-uDOQEH55wQ6ahcIKzQr3VyjGc6Po/xblLGLoUk3fVL1qjlZAibtQr6XRfy5wPJLu/M2o0vQKLq4lyJ2r1tWKcw==}
/esbuild-linux-s390x/0.15.10:
resolution: {integrity: sha512-ReP+6q3eLVVP2lpRrvl5EodKX7EZ1bS1/z5j6hsluAlZP5aHhk6ghT6Cq3IANvvDdscMMCB4QEbI+AjtvoOFpA==}
engines: {node: '>=12'}
cpu: [s390x]
os: [linux]
@ -1610,8 +1607,8 @@ packages:
dev: true
optional: true
/esbuild-netbsd-64/0.15.9:
resolution: {integrity: sha512-yWgxaYTQz+TqX80wXRq6xAtb7GSBAp6gqLKfOdANg9qEmAI1Bxn04IrQr0Mzm4AhxvGKoHzjHjMgXbCCSSDxcw==}
/esbuild-netbsd-64/0.15.10:
resolution: {integrity: sha512-iGDYtJCMCqldMskQ4eIV+QSS/CuT7xyy9i2/FjpKvxAuCzrESZXiA1L64YNj6/afuzfBe9i8m/uDkFHy257hTw==}
engines: {node: '>=12'}
cpu: [x64]
os: [netbsd]
@ -1619,8 +1616,8 @@ packages:
dev: true
optional: true
/esbuild-openbsd-64/0.15.9:
resolution: {integrity: sha512-JmS18acQl4iSAjrEha1MfEmUMN4FcnnrtTaJ7Qg0tDCOcgpPPQRLGsZqhes0vmx8VA6IqRyScqXvaL7+Q0Uf3A==}
/esbuild-openbsd-64/0.15.10:
resolution: {integrity: sha512-ftMMIwHWrnrYnvuJQRJs/Smlcb28F9ICGde/P3FUTCgDDM0N7WA0o9uOR38f5Xe2/OhNCgkjNeb7QeaE3cyWkQ==}
engines: {node: '>=12'}
cpu: [x64]
os: [openbsd]
@ -1628,8 +1625,8 @@ packages:
dev: true
optional: true
/esbuild-sunos-64/0.15.9:
resolution: {integrity: sha512-UKynGSWpzkPmXW3D2UMOD9BZPIuRaSqphxSCwScfEE05Be3KAmvjsBhht1fLzKpiFVJb0BYMd4jEbWMyJ/z1hQ==}
/esbuild-sunos-64/0.15.10:
resolution: {integrity: sha512-mf7hBL9Uo2gcy2r3rUFMjVpTaGpFJJE5QTDDqUFf1632FxteYANffDZmKbqX0PfeQ2XjUDE604IcE7OJeoHiyg==}
engines: {node: '>=12'}
cpu: [x64]
os: [sunos]
@ -1637,8 +1634,8 @@ packages:
dev: true
optional: true
/esbuild-windows-32/0.15.9:
resolution: {integrity: sha512-aqXvu4/W9XyTVqO/hw3rNxKE1TcZiEYHPsXM9LwYmKSX9/hjvfIJzXwQBlPcJ/QOxedfoMVH0YnhhQ9Ffb0RGA==}
/esbuild-windows-32/0.15.10:
resolution: {integrity: sha512-ttFVo+Cg8b5+qHmZHbEc8Vl17kCleHhLzgT8X04y8zudEApo0PxPg9Mz8Z2cKH1bCYlve1XL8LkyXGFjtUYeGg==}
engines: {node: '>=12'}
cpu: [ia32]
os: [win32]
@ -1646,8 +1643,8 @@ packages:
dev: true
optional: true
/esbuild-windows-64/0.15.9:
resolution: {integrity: sha512-zm7h91WUmlS4idMtjvCrEeNhlH7+TNOmqw5dJPJZrgFaxoFyqYG6CKDpdFCQXdyKpD5yvzaQBOMVTCBVKGZDEg==}
/esbuild-windows-64/0.15.10:
resolution: {integrity: sha512-2H0gdsyHi5x+8lbng3hLbxDWR7mKHWh5BXZGKVG830KUmXOOWFE2YKJ4tHRkejRduOGDrBvHBriYsGtmTv3ntA==}
engines: {node: '>=12'}
cpu: [x64]
os: [win32]
@ -1655,8 +1652,8 @@ packages:
dev: true
optional: true
/esbuild-windows-arm64/0.15.9:
resolution: {integrity: sha512-yQEVIv27oauAtvtuhJVfSNMztJJX47ismRS6Sv2QMVV9RM+6xjbMWuuwM2nxr5A2/gj/mu2z9YlQxiwoFRCfZA==}
/esbuild-windows-arm64/0.15.10:
resolution: {integrity: sha512-S+th4F+F8VLsHLR0zrUcG+Et4hx0RKgK1eyHc08kztmLOES8BWwMiaGdoW9hiXuzznXQ0I/Fg904MNbr11Nktw==}
engines: {node: '>=12'}
cpu: [arm64]
os: [win32]
@ -1664,34 +1661,34 @@ packages:
dev: true
optional: true
/esbuild/0.15.9:
resolution: {integrity: sha512-OnYr1rkMVxtmMHIAKZLMcEUlJmqcbxBz9QoBU8G9v455na0fuzlT/GLu6l+SRghrk0Mm2fSSciMmzV43Q8e0Gg==}
/esbuild/0.15.10:
resolution: {integrity: sha512-N7wBhfJ/E5fzn/SpNgX+oW2RLRjwaL8Y0ezqNqhjD6w0H2p0rDuEz2FKZqpqLnO8DCaWumKe8dsC/ljvVSSxng==}
engines: {node: '>=12'}
hasBin: true
requiresBuild: true
optionalDependencies:
'@esbuild/android-arm': 0.15.9
'@esbuild/linux-loong64': 0.15.9
esbuild-android-64: 0.15.9
esbuild-android-arm64: 0.15.9
esbuild-darwin-64: 0.15.9
esbuild-darwin-arm64: 0.15.9
esbuild-freebsd-64: 0.15.9
esbuild-freebsd-arm64: 0.15.9
esbuild-linux-32: 0.15.9
esbuild-linux-64: 0.15.9
esbuild-linux-arm: 0.15.9
esbuild-linux-arm64: 0.15.9
esbuild-linux-mips64le: 0.15.9
esbuild-linux-ppc64le: 0.15.9
esbuild-linux-riscv64: 0.15.9
esbuild-linux-s390x: 0.15.9
esbuild-netbsd-64: 0.15.9
esbuild-openbsd-64: 0.15.9
esbuild-sunos-64: 0.15.9
esbuild-windows-32: 0.15.9
esbuild-windows-64: 0.15.9
esbuild-windows-arm64: 0.15.9
'@esbuild/android-arm': 0.15.10
'@esbuild/linux-loong64': 0.15.10
esbuild-android-64: 0.15.10
esbuild-android-arm64: 0.15.10
esbuild-darwin-64: 0.15.10
esbuild-darwin-arm64: 0.15.10
esbuild-freebsd-64: 0.15.10
esbuild-freebsd-arm64: 0.15.10
esbuild-linux-32: 0.15.10
esbuild-linux-64: 0.15.10
esbuild-linux-arm: 0.15.10
esbuild-linux-arm64: 0.15.10
esbuild-linux-mips64le: 0.15.10
esbuild-linux-ppc64le: 0.15.10
esbuild-linux-riscv64: 0.15.10
esbuild-linux-s390x: 0.15.10
esbuild-netbsd-64: 0.15.10
esbuild-openbsd-64: 0.15.10
esbuild-sunos-64: 0.15.10
esbuild-windows-32: 0.15.10
esbuild-windows-64: 0.15.10
esbuild-windows-arm64: 0.15.10
dev: true
/escalade/3.1.1:
@ -1890,7 +1887,7 @@ packages:
hasBin: true
dependencies:
'@eslint/eslintrc': 1.3.2
'@humanwhocodes/config-array': 0.10.6
'@humanwhocodes/config-array': 0.10.7
'@humanwhocodes/gitignore-to-minimatch': 1.0.2
'@humanwhocodes/module-importer': 1.0.1
ajv: 6.12.6
@ -3579,7 +3576,7 @@ packages:
terser:
optional: true
dependencies:
esbuild: 0.15.9
esbuild: 0.15.10
postcss: 8.4.16
resolve: 1.22.1
rollup: 2.78.1

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

@ -54,7 +54,7 @@ export const BLE = (): JSX.Element => {
onClick={() => {
void navigator.bluetooth
.requestDevice({
filters: [{ services: [Constants.SERVICE_UUID] }],
filters: [{ services: [Constants.serviceUUID] }],
})
.then((device) => {
const exists = bleDevices.findIndex((d) => d.id === device.id);

3
src/components/PageComponents/Messages/ChannelChat.tsx

@ -7,6 +7,7 @@ import { Message } from "@components/PageComponents/Messages/Message.js";
import { useDevice } from "@core/providers/useDevice.js";
import type { Channel } from "@core/stores/deviceStore.js";
import { MapPinIcon, PaperAirplaneIcon } from "@heroicons/react/24/outline";
import type { Types } from "@meshtastic/meshtasticjs";
export interface ChannelChatProps {
channel: Channel;
@ -21,7 +22,7 @@ export const ChannelChat = ({ channel }: ChannelChatProps): JSX.Element => {
currentMessage,
undefined,
true,
channel.config.index,
channel.config.index as Types.ChannelNumber,
(id) => {
ackMessage(channel.config.index, id);
return Promise.resolve();

6
src/core/stores/deviceStore.ts

@ -3,7 +3,7 @@ import { createContext } from "react";
import { produce } from "immer";
import create from "zustand";
import { IConnection, Protobuf, Types } from "@meshtastic/meshtasticjs";
import { Protobuf, Types } from "@meshtastic/meshtasticjs";
export type Page =
| "messages"
@ -45,7 +45,7 @@ export interface Device {
moduleConfig: Protobuf.LocalModuleConfig;
hardware: Protobuf.MyNodeInfo;
nodes: Node[];
connection?: IConnection;
connection?: Types.ConnectionType;
activePage: Page;
peerInfoOpen: boolean;
activePeer: number;
@ -67,7 +67,7 @@ export interface Device {
addNodeInfo: (nodeInfo: Types.NodeInfoPacket) => void;
addUser: (user: Types.UserPacket) => void;
addPosition: (position: Types.PositionPacket) => void;
addConnection: (connection: IConnection) => void;
addConnection: (connection: Types.ConnectionType) => void;
addMessage: (message: MessageWithAck) => void;
addWaypointMessage: (message: WaypointIDWithAck) => void;
ackMessage: (channelIndex: number, messageId: number) => void;

12
src/core/subscriptions.ts

@ -1,12 +1,10 @@
import type { Device } from "@core/stores/deviceStore.js";
import {
IConnection,
Protobuf,
SettingsManager,
Types,
} from "@meshtastic/meshtasticjs";
import { Protobuf, SettingsManager, Types } from "@meshtastic/meshtasticjs";
export const subscribeAll = (device: Device, connection: IConnection) => {
export const subscribeAll = (
device: Device,
connection: Types.ConnectionType
) => {
SettingsManager.debugMode = Protobuf.LogRecord_Level.TRACE;
// onLogEvent

Loading…
Cancel
Save