@robdobsn/raftjs 1.10.7 → 1.11.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/react-native/RaftChannelSimulated.js +4 -3
- package/dist/react-native/RaftChannelSimulated.js.map +1 -1
- package/dist/react-native/RaftConnector.d.ts +10 -1
- package/dist/react-native/RaftConnector.js +23 -10
- package/dist/react-native/RaftConnector.js.map +1 -1
- package/dist/react-native/RaftDeviceManager.d.ts +13 -1
- package/dist/react-native/RaftDeviceManager.js +224 -77
- package/dist/react-native/RaftDeviceManager.js.map +1 -1
- package/dist/react-native/RaftDeviceMgrIF.d.ts +5 -1
- package/dist/react-native/RaftDeviceStates.d.ts +20 -2
- package/dist/react-native/RaftDeviceStates.js +25 -4
- package/dist/react-native/RaftDeviceStates.js.map +1 -1
- package/dist/react-native/RaftPublish.d.ts +2 -0
- package/dist/react-native/RaftPublish.js +81 -0
- package/dist/react-native/RaftPublish.js.map +1 -0
- package/dist/react-native/RaftStreamHandler.d.ts +11 -0
- package/dist/react-native/RaftStreamHandler.js +66 -0
- package/dist/react-native/RaftStreamHandler.js.map +1 -1
- package/dist/react-native/RaftSystemUtils.d.ts +17 -1
- package/dist/react-native/RaftSystemUtils.js +51 -0
- package/dist/react-native/RaftSystemUtils.js.map +1 -1
- package/dist/react-native/RaftTypes.d.ts +21 -0
- package/dist/react-native/RaftTypes.js.map +1 -1
- package/dist/react-native/main.d.ts +1 -0
- package/dist/react-native/main.js +1 -0
- package/dist/react-native/main.js.map +1 -1
- package/dist/web/RaftChannelSimulated.js +4 -3
- package/dist/web/RaftChannelSimulated.js.map +1 -1
- package/dist/web/RaftConnector.d.ts +10 -1
- package/dist/web/RaftConnector.js +23 -10
- package/dist/web/RaftConnector.js.map +1 -1
- package/dist/web/RaftDeviceManager.d.ts +13 -1
- package/dist/web/RaftDeviceManager.js +224 -77
- package/dist/web/RaftDeviceManager.js.map +1 -1
- package/dist/web/RaftDeviceMgrIF.d.ts +5 -1
- package/dist/web/RaftDeviceStates.d.ts +20 -2
- package/dist/web/RaftDeviceStates.js +25 -4
- package/dist/web/RaftDeviceStates.js.map +1 -1
- package/dist/web/RaftPublish.d.ts +2 -0
- package/dist/web/RaftPublish.js +81 -0
- package/dist/web/RaftPublish.js.map +1 -0
- package/dist/web/RaftStreamHandler.d.ts +11 -0
- package/dist/web/RaftStreamHandler.js +66 -0
- package/dist/web/RaftStreamHandler.js.map +1 -1
- package/dist/web/RaftSystemUtils.d.ts +17 -1
- package/dist/web/RaftSystemUtils.js +51 -0
- package/dist/web/RaftSystemUtils.js.map +1 -1
- package/dist/web/RaftTypes.d.ts +21 -0
- package/dist/web/RaftTypes.js.map +1 -1
- package/dist/web/main.d.ts +1 -0
- package/dist/web/main.js +1 -0
- package/dist/web/main.js.map +1 -1
- package/examples/dashboard/package.json +1 -1
- package/examples/dashboard/src/DeviceActionsForm.tsx +2 -2
- package/examples/dashboard/src/DevicePanel.tsx +79 -3
- package/examples/dashboard/src/DeviceStatsPanel.tsx +65 -0
- package/examples/dashboard/src/DevicesPanel.tsx +11 -0
- package/examples/dashboard/src/SettingsScreen.tsx +9 -4
- package/examples/dashboard/src/SystemTypeCog/CogStateInfo.ts +10 -2
- package/examples/dashboard/src/SystemTypeCog/SystemTypeCog.ts +37 -3
- package/examples/dashboard/src/SystemTypeGeneric/StateInfoGeneric.ts +10 -2
- package/examples/dashboard/src/SystemTypeGeneric/SystemTypeGeneric.ts +38 -4
- package/examples/dashboard/src/SystemTypeMarty/RICStateInfo.ts +10 -2
- package/examples/dashboard/src/styles.css +162 -0
- package/package.json +49 -49
- package/src/RaftChannelSimulated.ts +4 -3
- package/src/RaftConnector.ts +34 -13
- package/src/RaftDeviceManager.ts +251 -81
- package/src/RaftDeviceMgrIF.ts +5 -1
- package/src/RaftDeviceStates.ts +35 -5
- package/src/RaftPublish.ts +92 -0
- package/src/RaftStreamHandler.ts +84 -1
- package/src/RaftSystemUtils.ts +59 -0
- package/src/RaftTypes.ts +27 -0
- package/src/main.ts +1 -0
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { DeviceTypeAction } from "./RaftDeviceInfo";
|
|
2
|
-
import { DeviceAttributeState, DevicesState, DeviceState } from "./RaftDeviceStates";
|
|
2
|
+
import { DeviceAttributeState, DevicesState, DeviceState, DeviceStats } from "./RaftDeviceStates";
|
|
3
3
|
export default interface RaftDeviceMgrIF {
|
|
4
4
|
getDevicesState(): DevicesState;
|
|
5
5
|
getDeviceState(deviceKey: string): DeviceState;
|
|
6
|
+
getDeviceStats(deviceKey: string): DeviceStats;
|
|
7
|
+
resetDeviceStats(deviceKey: string): void;
|
|
6
8
|
setMaxDataPointsToStore(maxDataPointsToStore: number): void;
|
|
7
9
|
addNewDeviceCallback(callback: (deviceKey: string, state: DeviceState) => void): void;
|
|
8
10
|
removeNewDeviceCallback(callback: (deviceKey: string, state: DeviceState) => void): void;
|
|
@@ -10,6 +12,8 @@ export default interface RaftDeviceMgrIF {
|
|
|
10
12
|
removeNewAttributeCallback(callback: (deviceKey: string, attrState: DeviceAttributeState) => void): void;
|
|
11
13
|
addAttributeDataCallback(callback: (deviceKey: string, attrState: DeviceAttributeState) => void): void;
|
|
12
14
|
removeAttributeDataCallback(callback: (deviceKey: string, attrState: DeviceAttributeState) => void): void;
|
|
15
|
+
addDeviceRemovedCallback(callback: (deviceKey: string, state: DeviceState) => void): void;
|
|
16
|
+
removeDeviceRemovedCallback(callback: (deviceKey: string, state: DeviceState) => void): void;
|
|
13
17
|
sendAction(deviceKey: string, action: DeviceTypeAction, data: number[]): void;
|
|
14
18
|
sendCompoundAction(deviceKey: string, action: DeviceTypeAction, data: number[][]): void;
|
|
15
19
|
}
|
|
@@ -20,13 +20,26 @@ export interface DeviceTimeline {
|
|
|
20
20
|
lastReportTimestampUs: number;
|
|
21
21
|
reportTimestampOffsetUs: number;
|
|
22
22
|
}
|
|
23
|
+
export interface DeviceStats {
|
|
24
|
+
totalSamples: number;
|
|
25
|
+
windowMs: number;
|
|
26
|
+
windowSamples: number;
|
|
27
|
+
sampleRateHz: number;
|
|
28
|
+
lastSampleTimeMs: number | null;
|
|
29
|
+
lastUpdateTimeMs: number | null;
|
|
30
|
+
}
|
|
31
|
+
export declare enum DeviceOnlineState {
|
|
32
|
+
Offline = 0,
|
|
33
|
+
Online = 1,
|
|
34
|
+
PendingDeletion = 2
|
|
35
|
+
}
|
|
23
36
|
export interface DeviceState {
|
|
24
37
|
deviceTypeInfo: DeviceTypeInfo | undefined;
|
|
25
38
|
deviceTimeline: DeviceTimeline;
|
|
26
39
|
deviceAttributes: DeviceAttributesState;
|
|
27
40
|
deviceIsNew: boolean;
|
|
28
41
|
stateChanged: boolean;
|
|
29
|
-
|
|
42
|
+
onlineState: DeviceOnlineState;
|
|
30
43
|
deviceAddress: string;
|
|
31
44
|
deviceType: string;
|
|
32
45
|
busName: string;
|
|
@@ -34,4 +47,9 @@ export interface DeviceState {
|
|
|
34
47
|
export declare class DevicesState {
|
|
35
48
|
[deviceKey: string]: DeviceState;
|
|
36
49
|
}
|
|
37
|
-
export declare function
|
|
50
|
+
export declare function formatDeviceAddrHex(addr: number): string;
|
|
51
|
+
export declare function getDeviceKey(busNumberAsString: string, devAddrHexStr: string): string;
|
|
52
|
+
export declare function parseDeviceKey(deviceKey: string): {
|
|
53
|
+
bus: string;
|
|
54
|
+
addr: string;
|
|
55
|
+
};
|
|
@@ -8,9 +8,11 @@
|
|
|
8
8
|
//
|
|
9
9
|
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
10
10
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
11
|
-
exports.DevicesState = void 0;
|
|
11
|
+
exports.DevicesState = exports.DeviceOnlineState = void 0;
|
|
12
12
|
exports.deviceAttrGetLatestFormatted = deviceAttrGetLatestFormatted;
|
|
13
|
+
exports.formatDeviceAddrHex = formatDeviceAddrHex;
|
|
13
14
|
exports.getDeviceKey = getDeviceKey;
|
|
15
|
+
exports.parseDeviceKey = parseDeviceKey;
|
|
14
16
|
function deviceAttrGetLatestFormatted(attrState) {
|
|
15
17
|
if (attrState.values.length === 0) {
|
|
16
18
|
return 'N/A';
|
|
@@ -50,11 +52,30 @@ function deviceAttrGetLatestFormatted(attrState) {
|
|
|
50
52
|
}
|
|
51
53
|
return value.toString();
|
|
52
54
|
}
|
|
55
|
+
var DeviceOnlineState;
|
|
56
|
+
(function (DeviceOnlineState) {
|
|
57
|
+
DeviceOnlineState[DeviceOnlineState["Offline"] = 0] = "Offline";
|
|
58
|
+
DeviceOnlineState[DeviceOnlineState["Online"] = 1] = "Online";
|
|
59
|
+
DeviceOnlineState[DeviceOnlineState["PendingDeletion"] = 2] = "PendingDeletion";
|
|
60
|
+
})(DeviceOnlineState || (exports.DeviceOnlineState = DeviceOnlineState = {}));
|
|
53
61
|
class DevicesState {
|
|
54
62
|
}
|
|
55
63
|
exports.DevicesState = DevicesState;
|
|
56
|
-
//
|
|
57
|
-
|
|
58
|
-
|
|
64
|
+
// Format a numeric device address as canonical hex string:
|
|
65
|
+
// lowercase, no "0x" prefix, no leading zeros
|
|
66
|
+
function formatDeviceAddrHex(addr) {
|
|
67
|
+
return addr.toString(16);
|
|
68
|
+
}
|
|
69
|
+
// Generate a composite device key from bus number and hex address
|
|
70
|
+
function getDeviceKey(busNumberAsString, devAddrHexStr) {
|
|
71
|
+
return `${busNumberAsString}_${devAddrHexStr}`;
|
|
72
|
+
}
|
|
73
|
+
// Parse a device key into its bus and address components
|
|
74
|
+
function parseDeviceKey(deviceKey) {
|
|
75
|
+
const sep = deviceKey.indexOf('_');
|
|
76
|
+
if (sep < 0) {
|
|
77
|
+
return { bus: deviceKey, addr: '' };
|
|
78
|
+
}
|
|
79
|
+
return { bus: deviceKey.substring(0, sep), addr: deviceKey.substring(sep + 1) };
|
|
59
80
|
}
|
|
60
81
|
//# sourceMappingURL=RaftDeviceStates.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RaftDeviceStates.js","sourceRoot":"","sources":["../../src/RaftDeviceStates.ts"],"names":[],"mappings":";AAAA,iHAAiH;AACjH,EAAE;AACF,mBAAmB;AACnB,iCAAiC;AACjC,EAAE;AACF,sBAAsB;AACtB,EAAE;AACF,iHAAiH;;;AAIjH,oEAoCC;
|
|
1
|
+
{"version":3,"file":"RaftDeviceStates.js","sourceRoot":"","sources":["../../src/RaftDeviceStates.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
3
|
+
//
|
|
4
|
+
// RaftSystem
|
|
5
|
+
// Part of RaftJS
|
|
6
|
+
//
|
|
7
|
+
// Rob Dobson 2025
|
|
8
|
+
// (C) 2020-2025 All rights reserved
|
|
9
|
+
//
|
|
10
|
+
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.inspectPublishFrame = inspectPublishFrame;
|
|
13
|
+
const RAFT_PUBLISH_PREFIX_LEN = 2;
|
|
14
|
+
const DEVBIN_MAGIC_MIN = 0xDB;
|
|
15
|
+
const DEVBIN_MAGIC_MAX = 0xDF;
|
|
16
|
+
const DEVBIN_VERSION_BASE = 0xDA;
|
|
17
|
+
function inspectPublishFrame(payload, topicLookup) {
|
|
18
|
+
if (payload.length < RAFT_PUBLISH_PREFIX_LEN) {
|
|
19
|
+
return { frameType: "unknown" };
|
|
20
|
+
}
|
|
21
|
+
const payloadStartPos = RAFT_PUBLISH_PREFIX_LEN;
|
|
22
|
+
if (payload.length <= payloadStartPos) {
|
|
23
|
+
return { frameType: "unknown" };
|
|
24
|
+
}
|
|
25
|
+
// Try JSON first
|
|
26
|
+
if (payload[payloadStartPos] === 0x7B) {
|
|
27
|
+
try {
|
|
28
|
+
const jsonString = new TextDecoder("utf-8").decode(payload.slice(payloadStartPos));
|
|
29
|
+
const jsonObj = JSON.parse(jsonString);
|
|
30
|
+
let topicIndex = undefined;
|
|
31
|
+
let topicName = undefined;
|
|
32
|
+
if (typeof jsonObj._t === "number") {
|
|
33
|
+
topicIndex = jsonObj._t;
|
|
34
|
+
topicName = topicLookup ? topicLookup(topicIndex) : undefined;
|
|
35
|
+
}
|
|
36
|
+
else if (typeof jsonObj._t === "string") {
|
|
37
|
+
topicName = jsonObj._t;
|
|
38
|
+
}
|
|
39
|
+
const version = typeof jsonObj._v === "number" ? jsonObj._v : undefined;
|
|
40
|
+
return {
|
|
41
|
+
frameType: "json",
|
|
42
|
+
topicIndex,
|
|
43
|
+
topicName,
|
|
44
|
+
version,
|
|
45
|
+
jsonString,
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
catch (_a) {
|
|
49
|
+
return { frameType: "unknown" };
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
// Binary (devbin legacy or enveloped)
|
|
53
|
+
const firstBinaryByte = payload[payloadStartPos];
|
|
54
|
+
if ((firstBinaryByte & 0xF0) === 0xD0) {
|
|
55
|
+
if (firstBinaryByte < DEVBIN_MAGIC_MIN || firstBinaryByte > DEVBIN_MAGIC_MAX) {
|
|
56
|
+
return {
|
|
57
|
+
frameType: "binary",
|
|
58
|
+
binaryHasEnvelope: true,
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
const topicIndex = payload.length > payloadStartPos + 1 ? payload[payloadStartPos + 1] : undefined;
|
|
62
|
+
const topicName = (topicIndex !== undefined && topicIndex !== 0xFF && topicLookup)
|
|
63
|
+
? topicLookup(topicIndex)
|
|
64
|
+
: undefined;
|
|
65
|
+
return {
|
|
66
|
+
frameType: "binary",
|
|
67
|
+
topicIndex,
|
|
68
|
+
topicName,
|
|
69
|
+
version: firstBinaryByte - DEVBIN_VERSION_BASE,
|
|
70
|
+
binaryHasEnvelope: true,
|
|
71
|
+
binaryPayloadOffset: payloadStartPos + 2,
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
// Legacy binary format (no envelope)
|
|
75
|
+
return {
|
|
76
|
+
frameType: "binary",
|
|
77
|
+
binaryHasEnvelope: false,
|
|
78
|
+
binaryPayloadOffset: payloadStartPos,
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
//# sourceMappingURL=RaftPublish.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RaftPublish.js","sourceRoot":"","sources":["../../src/RaftPublish.ts"],"names":[],"mappings":";AAAA,iHAAiH;AACjH,EAAE;AACF,aAAa;AACb,iBAAiB;AACjB,EAAE;AACF,kBAAkB;AAClB,oCAAoC;AACpC,EAAE;AACF,iHAAiH;;AASjH,kDA0EC;AA/ED,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAClC,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAC9B,MAAM,gBAAgB,GAAG,IAAI,CAAC;AAC9B,MAAM,mBAAmB,GAAG,IAAI,CAAC;AAEjC,SAAgB,mBAAmB,CACjC,OAAmB,EACnB,WAAwD;IAGxD,IAAI,OAAO,CAAC,MAAM,GAAG,uBAAuB,EAAE,CAAC;QAC7C,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;IAClC,CAAC;IAED,MAAM,eAAe,GAAG,uBAAuB,CAAC;IAChD,IAAI,OAAO,CAAC,MAAM,IAAI,eAAe,EAAE,CAAC;QACtC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;IAClC,CAAC;IAED,iBAAiB;IACjB,IAAI,OAAO,CAAC,eAAe,CAAC,KAAK,IAAI,EAAE,CAAC;QACtC,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;YACnF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAA4B,CAAC;YAElE,IAAI,UAAU,GAAuB,SAAS,CAAC;YAC/C,IAAI,SAAS,GAAuB,SAAS,CAAC;YAC9C,IAAI,OAAO,OAAO,CAAC,EAAE,KAAK,QAAQ,EAAE,CAAC;gBACnC,UAAU,GAAG,OAAO,CAAC,EAAE,CAAC;gBACxB,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAChE,CAAC;iBAAM,IAAI,OAAO,OAAO,CAAC,EAAE,KAAK,QAAQ,EAAE,CAAC;gBAC1C,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC;YACzB,CAAC;YAED,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAExE,OAAO;gBACL,SAAS,EAAE,MAAM;gBACjB,UAAU;gBACV,SAAS;gBACT,OAAO;gBACP,UAAU;aACX,CAAC;QACJ,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;QAClC,CAAC;IACH,CAAC;IAED,sCAAsC;IACtC,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;IACjD,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QACtC,IAAI,eAAe,GAAG,gBAAgB,IAAI,eAAe,GAAG,gBAAgB,EAAE,CAAC;YAC7E,OAAO;gBACL,SAAS,EAAE,QAAQ;gBACnB,iBAAiB,EAAE,IAAI;aACxB,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,GAAG,eAAe,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnG,MAAM,SAAS,GAAG,CAAC,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,IAAI,IAAI,WAAW,CAAC;YAChF,CAAC,CAAC,WAAW,CAAC,UAAU,CAAC;YACzB,CAAC,CAAC,SAAS,CAAC;QAEd,OAAO;YACL,SAAS,EAAE,QAAQ;YACnB,UAAU;YACV,SAAS;YACT,OAAO,EAAE,eAAe,GAAG,mBAAmB;YAC9C,iBAAiB,EAAE,IAAI;YACvB,mBAAmB,EAAE,eAAe,GAAG,CAAC;SACzC,CAAC;IACJ,CAAC;IAED,qCAAqC;IACrC,OAAO;QACL,SAAS,EAAE,QAAQ;QACnB,iBAAiB,EAAE,KAAK;QACxB,mBAAmB,EAAE,eAAe;KACrC,CAAC;AACJ,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import RaftMsgHandler from './RaftMsgHandler';
|
|
2
2
|
import RaftCommsStats from './RaftCommsStats';
|
|
3
|
+
import { RaftStreamDataProgressCBType } from './RaftTypes';
|
|
3
4
|
import RaftConnector from './RaftConnector';
|
|
4
5
|
export default class RaftStreamHandler {
|
|
5
6
|
private _streamID;
|
|
@@ -24,6 +25,16 @@ export default class RaftStreamHandler {
|
|
|
24
25
|
constructor(msgHandler: RaftMsgHandler, commsStats: RaftCommsStats, raftConnector: RaftConnector);
|
|
25
26
|
setNumBlocksWithoutPause(numBlocks: number): void;
|
|
26
27
|
setLegacySoktoMode(legacyMode: boolean): void;
|
|
28
|
+
/**
|
|
29
|
+
* streamData - stream arbitrary data to a named firmware endpoint using the RT_STREAM protocol.
|
|
30
|
+
* Returns a promise that resolves when the stream is complete or rejects on failure.
|
|
31
|
+
* @param streamContents data to stream
|
|
32
|
+
* @param fileName logical filename sent in ufStart (used by firmware to detect format, e.g. "pattern.thr")
|
|
33
|
+
* @param targetEndpoint REST API endpoint name registered on the firmware (e.g. "streampattern")
|
|
34
|
+
* @param progressCallback optional callback reporting (bytesSent, totalBytes, progressFraction)
|
|
35
|
+
* @returns Promise<boolean> true if stream completed successfully
|
|
36
|
+
*/
|
|
37
|
+
streamData(streamContents: Uint8Array, fileName: string, targetEndpoint: string, progressCallback?: RaftStreamDataProgressCBType): Promise<boolean>;
|
|
27
38
|
streamAudio(streamContents: Uint8Array, clearExisting: boolean, audioDuration: number): void;
|
|
28
39
|
streamCancel(): Promise<void>;
|
|
29
40
|
isStreamStarting(): boolean;
|
|
@@ -55,6 +55,72 @@ class RaftStreamHandler {
|
|
|
55
55
|
RaftLog_1.default.debug(`Setting legacy sokto mode to ${legacyMode}`);
|
|
56
56
|
this._legacySoktoMode = legacyMode;
|
|
57
57
|
}
|
|
58
|
+
/**
|
|
59
|
+
* streamData - stream arbitrary data to a named firmware endpoint using the RT_STREAM protocol.
|
|
60
|
+
* Returns a promise that resolves when the stream is complete or rejects on failure.
|
|
61
|
+
* @param streamContents data to stream
|
|
62
|
+
* @param fileName logical filename sent in ufStart (used by firmware to detect format, e.g. "pattern.thr")
|
|
63
|
+
* @param targetEndpoint REST API endpoint name registered on the firmware (e.g. "streampattern")
|
|
64
|
+
* @param progressCallback optional callback reporting (bytesSent, totalBytes, progressFraction)
|
|
65
|
+
* @returns Promise<boolean> true if stream completed successfully
|
|
66
|
+
*/
|
|
67
|
+
async streamData(streamContents, fileName, targetEndpoint, progressCallback) {
|
|
68
|
+
// Reject if another stream is starting
|
|
69
|
+
if (this._streamIsStarting || this._lastStreamStartTime > (Date.now() - 500)) {
|
|
70
|
+
RaftLog_1.default.warn(`streamData: unable to start, too soon since last request`);
|
|
71
|
+
return false;
|
|
72
|
+
}
|
|
73
|
+
this._streamIsStarting = true;
|
|
74
|
+
this._lastStreamStartTime = Date.now();
|
|
75
|
+
this._soktoReceived = false;
|
|
76
|
+
this._soktoPos = 0;
|
|
77
|
+
this._streamPos = 0;
|
|
78
|
+
this._streamBuffer = RaftUtils_1.default.toArrayBufferView(streamContents);
|
|
79
|
+
// Send ufStart
|
|
80
|
+
const startOk = await this._sendStreamStartMsg(fileName, targetEndpoint, RaftTypes_1.RaftStreamType.REAL_TIME_STREAM, streamContents);
|
|
81
|
+
this._streamIsStarting = false;
|
|
82
|
+
if (!startOk) {
|
|
83
|
+
RaftLog_1.default.warn(`streamData: ufStart failed`);
|
|
84
|
+
return false;
|
|
85
|
+
}
|
|
86
|
+
// Send blocks
|
|
87
|
+
if (this._streamID === null) {
|
|
88
|
+
return false;
|
|
89
|
+
}
|
|
90
|
+
let pos = 0;
|
|
91
|
+
while (pos < this._streamBuffer.length) {
|
|
92
|
+
// Respect SOKTO feedback — if firmware reported a position mismatch, rewind
|
|
93
|
+
if (this._soktoReceived) {
|
|
94
|
+
RaftLog_1.default.verbose(`streamData: sokto received, pos was ${pos}, soktoPos ${this._soktoPos}`);
|
|
95
|
+
this._soktoReceived = false;
|
|
96
|
+
// Slow down on backpressure
|
|
97
|
+
await new Promise(r => setTimeout(r, 50));
|
|
98
|
+
}
|
|
99
|
+
const blockSize = Math.min(this._streamBuffer.length - pos, this._maxBlockSize);
|
|
100
|
+
const block = this._streamBuffer.slice(pos, pos + blockSize);
|
|
101
|
+
if (block.length > 0) {
|
|
102
|
+
const sentOk = await this._msgHandler.sendStreamBlock(block, pos, this._streamID);
|
|
103
|
+
this._commsStats.recordStreamBytes(block.length);
|
|
104
|
+
if (!sentOk) {
|
|
105
|
+
RaftLog_1.default.warn(`streamData: sendStreamBlock failed at pos ${pos}`);
|
|
106
|
+
return false;
|
|
107
|
+
}
|
|
108
|
+
pos += blockSize;
|
|
109
|
+
this._streamPos = pos;
|
|
110
|
+
// Progress callback
|
|
111
|
+
if (progressCallback) {
|
|
112
|
+
const progress = this._streamBuffer.length > 0 ? pos / this._streamBuffer.length : 1;
|
|
113
|
+
progressCallback(pos, this._streamBuffer.length, progress);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
// Yield to avoid hogging the event loop
|
|
117
|
+
await new Promise(r => setTimeout(r, 1));
|
|
118
|
+
}
|
|
119
|
+
// Send ufEnd
|
|
120
|
+
const endOk = await this._sendStreamEndMsg(this._streamID);
|
|
121
|
+
RaftLog_1.default.debug(`streamData: complete, endOk=${endOk}`);
|
|
122
|
+
return endOk;
|
|
123
|
+
}
|
|
58
124
|
// Start streaming audio
|
|
59
125
|
streamAudio(streamContents, clearExisting, audioDuration) {
|
|
60
126
|
if (!clearExisting)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RaftStreamHandler.js","sourceRoot":"","sources":["../../src/RaftStreamHandler.ts"],"names":[],"mappings":";AAAA,iHAAiH;AACjH,EAAE;AACF,mBAAmB;AACnB,iBAAiB;AACjB,EAAE;AACF,wCAAwC;AACxC,oCAAoC;AACpC,EAAE;AACF,iHAAiH;;;AAEjH,gEAA+B;AAG/B,
|
|
1
|
+
{"version":3,"file":"RaftStreamHandler.js","sourceRoot":"","sources":["../../src/RaftStreamHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { RaftWifiConnStatus } from "./RaftWifiTypes";
|
|
2
2
|
import RaftMsgHandler from "./RaftMsgHandler";
|
|
3
|
-
import { RaftFileList, RaftFriendlyName, RaftOKFail, RaftSysModInfoBLEMan, RaftSystemInfo, RaftWifiScanResults } from "./RaftTypes";
|
|
3
|
+
import { RaftFileList, RaftFriendlyName, RaftOKFail, RaftPubTopicRec, RaftSubscriptionUpdateResponse, RaftSysModInfoBLEMan, RaftSystemInfo, RaftWifiScanResults } from "./RaftTypes";
|
|
4
4
|
export default class RaftSystemUtils {
|
|
5
5
|
private _msgHandler;
|
|
6
6
|
private _systemInfo;
|
|
@@ -8,6 +8,8 @@ export default class RaftSystemUtils {
|
|
|
8
8
|
private _wifiConnStatus;
|
|
9
9
|
private _defaultWiFiHostname;
|
|
10
10
|
private _maxSecsToWaitForWiFiConn;
|
|
11
|
+
private _pubTopicIdxToName;
|
|
12
|
+
private _pubTopicNameToIdx;
|
|
11
13
|
/**
|
|
12
14
|
* constructor
|
|
13
15
|
* @param raftMsgHandler
|
|
@@ -18,6 +20,20 @@ export default class RaftSystemUtils {
|
|
|
18
20
|
* @returns RaftMsgHandler
|
|
19
21
|
*/
|
|
20
22
|
getMsgHandler(): RaftMsgHandler;
|
|
23
|
+
/**
|
|
24
|
+
* Update publish topic maps from topic records.
|
|
25
|
+
*/
|
|
26
|
+
updatePublishTopicMap(topicRecs: Array<RaftPubTopicRec> | undefined): void;
|
|
27
|
+
/**
|
|
28
|
+
* Update publish topic maps from subscription response.
|
|
29
|
+
*/
|
|
30
|
+
updatePublishTopicMapFromSubscriptionResponse(resp: RaftSubscriptionUpdateResponse | RaftOKFail | null | undefined): void;
|
|
31
|
+
/**
|
|
32
|
+
* Fetch publish topic map from firmware endpoint.
|
|
33
|
+
*/
|
|
34
|
+
refreshPublishTopicMap(): Promise<boolean>;
|
|
35
|
+
getPublishTopicName(topicIndex: number): string | undefined;
|
|
36
|
+
getPublishTopicIndex(topicName: string): number | undefined;
|
|
21
37
|
/**
|
|
22
38
|
* setDefaultWiFiHostname
|
|
23
39
|
* @param defaultWiFiHostname
|
|
@@ -27,6 +27,9 @@ class RaftSystemUtils {
|
|
|
27
27
|
this._wifiConnStatus = new RaftWifiTypes_1.RaftWifiConnStatus();
|
|
28
28
|
this._defaultWiFiHostname = "Raft";
|
|
29
29
|
this._maxSecsToWaitForWiFiConn = 20;
|
|
30
|
+
// Publish topic index/name lookup tables (session scoped)
|
|
31
|
+
this._pubTopicIdxToName = {};
|
|
32
|
+
this._pubTopicNameToIdx = {};
|
|
30
33
|
this._msgHandler = raftMsgHandler;
|
|
31
34
|
}
|
|
32
35
|
/**
|
|
@@ -36,6 +39,54 @@ class RaftSystemUtils {
|
|
|
36
39
|
getMsgHandler() {
|
|
37
40
|
return this._msgHandler;
|
|
38
41
|
}
|
|
42
|
+
/**
|
|
43
|
+
* Update publish topic maps from topic records.
|
|
44
|
+
*/
|
|
45
|
+
updatePublishTopicMap(topicRecs) {
|
|
46
|
+
if (!topicRecs || !Array.isArray(topicRecs)) {
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
for (const topicRec of topicRecs) {
|
|
50
|
+
if (!topicRec || typeof topicRec.name !== "string" || typeof topicRec.idx !== "number") {
|
|
51
|
+
continue;
|
|
52
|
+
}
|
|
53
|
+
this._pubTopicIdxToName[topicRec.idx] = topicRec.name;
|
|
54
|
+
this._pubTopicNameToIdx[topicRec.name] = topicRec.idx;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* Update publish topic maps from subscription response.
|
|
59
|
+
*/
|
|
60
|
+
updatePublishTopicMapFromSubscriptionResponse(resp) {
|
|
61
|
+
if (!resp || typeof resp !== "object") {
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
if ("topics" in resp) {
|
|
65
|
+
this.updatePublishTopicMap(resp.topics);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
* Fetch publish topic map from firmware endpoint.
|
|
70
|
+
*/
|
|
71
|
+
async refreshPublishTopicMap() {
|
|
72
|
+
try {
|
|
73
|
+
const pubTopicsResp = await this._msgHandler.sendRICRESTURL("pubtopics");
|
|
74
|
+
if (pubTopicsResp && pubTopicsResp.rslt === "ok") {
|
|
75
|
+
this.updatePublishTopicMap(pubTopicsResp.topics);
|
|
76
|
+
return true;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
catch (error) {
|
|
80
|
+
RaftLog_1.default.debug(`refreshPublishTopicMap failed ${error}`);
|
|
81
|
+
}
|
|
82
|
+
return false;
|
|
83
|
+
}
|
|
84
|
+
getPublishTopicName(topicIndex) {
|
|
85
|
+
return this._pubTopicIdxToName[topicIndex];
|
|
86
|
+
}
|
|
87
|
+
getPublishTopicIndex(topicName) {
|
|
88
|
+
return this._pubTopicNameToIdx[topicName];
|
|
89
|
+
}
|
|
39
90
|
/**
|
|
40
91
|
* setDefaultWiFiHostname
|
|
41
92
|
* @param defaultWiFiHostname
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RaftSystemUtils.js","sourceRoot":"","sources":["../../src/RaftSystemUtils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"RaftSystemUtils.js","sourceRoot":"","sources":["../../src/RaftSystemUtils.ts"],"names":[],"mappings":";AAAA,iHAAiH;AACjH,EAAE;AACF,aAAa;AACb,iBAAiB;AACjB,EAAE;AACF,wCAAwC;AACxC,oCAAoC;AACpC,EAAE;AACF,iHAAiH;;;AAEjH,mDAIyB;AACzB,gEAAgC;AAGhC,2CAUqB;AAErB,MAAqB,eAAe;IAmBlC;;;OAGG;IACH,YAAY,cAA8B;QAnB1C,cAAc;QACN,gBAAW,GAA0B,IAAI,CAAC;QAElD,cAAc;QACN,kBAAa,GAA4B,IAAI,CAAC;QAEtD,uBAAuB;QACf,oBAAe,GAAuB,IAAI,kCAAkB,EAAE,CAAC;QAC/D,yBAAoB,GAAG,MAAM,CAAC;QAC9B,8BAAyB,GAAG,EAAE,CAAC;QAEvC,0DAA0D;QAClD,uBAAkB,GAA8B,EAAE,CAAC;QACnD,uBAAkB,GAA+B,EAAE,CAAC;QAO1D,IAAI,CAAC,WAAW,GAAG,cAAc,CAAC;IACpC,CAAC;IAED;;;OAGG;IACH,aAAa;QACX,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,qBAAqB,CAAC,SAA6C;QACjE,IAAI,CAAC,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5C,OAAO;QACT,CAAC;QACD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YACjC,IAAI,CAAC,QAAQ,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,QAAQ,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;gBACvF,SAAS;YACX,CAAC;YACD,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtD,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC;QACxD,CAAC;IACH,CAAC;IAED;;OAEG;IACH,6CAA6C,CAAC,IAAoE;QAChH,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtC,OAAO;QACT,CAAC;QACD,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,IAAI,CAAC,qBAAqB,CAAE,IAAuC,CAAC,MAAM,CAAC,CAAC;QAC9E,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,sBAAsB;QAC1B,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAwB,WAAW,CAAC,CAAC;YAChG,IAAI,aAAa,IAAI,aAAa,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;gBACjD,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;gBACjD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iBAAO,CAAC,KAAK,CAAC,iCAAiC,KAAK,EAAE,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,mBAAmB,CAAC,UAAkB;QACpC,OAAO,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAC7C,CAAC;IAED,oBAAoB,CAAC,SAAiB;QACpC,OAAO,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAED;;;OAGG;IACH,sBAAsB,CAAC,mBAA2B;QAChD,IAAI,mBAAmB,EAAE,CAAC;YACxB,IAAI,CAAC,oBAAoB,GAAG,mBAAmB,CAAC;QAClD,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,eAAe;QACb,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED;;OAEG;IACH,UAAU;QACR,yBAAyB;QACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,iBAAO,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC3D,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,YAAY;;QAEhB,kBAAkB;QAClB,iBAAO,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;QAClE,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAC/B,iBAAO,CAAC,KAAK,CACX,+BAA+B,MAAA,IAAI,CAAC,WAAW,0CAAE,aAAa,EAAE,CACjE,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iBAAO,CAAC,IAAI,CAAC,wDAAwD,GAAG,KAAK,CAAC,CAAC;YAC/E,OAAO,KAAK,CAAC;QACf,CAAC;QAED,eAAe;QACf,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iBAAO,CAAC,IAAI,CAAC,yCAAyC,GAAG,KAAK,CAAC,CAAC;YAChE,OAAO,KAAK,CAAC;QACf,CAAC;QAED,0BAA0B;QAC1B,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iBAAO,CAAC,IAAI,CAAC,2DAA2D,GAAG,KAAK,CAAC,CAAC;YAClF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,aAAa,CAAC,QAAQ,GAAG,KAAK;QAClC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC,WAAW,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC;YACH,IAAI,CAAC,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAEtD,GAAG,CAAC,CAAC;YACP,iBAAO,CAAC,KAAK,CACX,6BAA6B,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CACjE,CAAC;YACF,IAAI,CAAC,WAAW,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACtC,oDAAoD;YACpD,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC;gBACxE,IAAI,CAAC,aAAa,GAAG,EAAC,cAAc,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAC,CAAC;YACnI,CAAC;YACD,qCAAqC;YACrC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,KAAK,SAAS,CAAC,EAAE,CAAC;gBAC1F,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC;YACvD,CAAC;iBAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,KAAK,SAAS,CAAC,EAAE,CAAC;gBACjG,IAAI,CAAC,WAAW,CAAC,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;YACvD,CAAC;YAED,qBAAqB;YACrB,OAAO,IAAI,CAAC,WAAW,CAAC;QAC1B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iBAAO,CAAC,KAAK,CAAC,2DAA2D,KAAK,EAAE,CAAC,CAAC;YAClF,OAAO,IAAI,0BAAc,EAAE,CAAC;QAC9B,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,WAAW,CAAC,OAAe;QAC/B,IAAI,CAAC;YACH,IAAI,CAAC,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAExD,gBAAgB,OAAO,EAAE,CAAC,CAAC;YAC7B,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBACvB,IAAI,CAAC,aAAa,CAAC,iBAAiB,GAAG,KAAK,CAAC;gBAC7C,IAAI,CAAC,aAAa,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACxC,IACE,IAAI,CAAC,aAAa;oBAClB,IAAI,CAAC,aAAa,CAAC,IAAI;oBACvB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,EAC9C,CAAC;oBACD,IAAI,CAAC,aAAa,CAAC,iBAAiB,GAAG,IAAI,CAAC;gBAC9C,CAAC;gBACD,iBAAO,CAAC,KAAK,CACX,uCAAuC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAC7E,CAAC;gBACF,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iBAAO,CAAC,KAAK,CAAC,kDAAkD,KAAK,EAAE,CAAC,CAAC;YACzE,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAC1B,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,WAAW,CAAC,QAAQ,GAAG,KAAK;QAChC,kCAAkC;QAClC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;YAClE,OAAO,IAAI,CAAC,aAAa,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC;YACH,IAAI,CAAC,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAExD,cAAc,CAAC,CAAC;YAClB,IACE,IAAI,CAAC,aAAa;gBAClB,IAAI,CAAC,aAAa,CAAC,IAAI;gBACvB,IAAI,CAAC,aAAa,CAAC,IAAI,KAAK,IAAI,EAChC,CAAC;gBACD,IAAI,CAAC,aAAa,CAAC,iBAAiB,GAAG,IAAI,CAAC,aAAa;qBACtD,iBAAiB;oBAClB,CAAC,CAAC,IAAI;oBACN,CAAC,CAAC,KAAK,CAAC;YACZ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,aAAa,CAAC,iBAAiB,GAAG,KAAK,CAAC;YAC/C,CAAC;YACD,IAAI,CAAC,aAAa,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACxC,iBAAO,CAAC,KAAK,CACX,wCAAwC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAC9E,CAAC;YACF,OAAO,IAAI,CAAC,aAAa,CAAC;QAC5B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iBAAO,CAAC,KAAK,CAAC,kDAAkD,KAAK,EAAE,CAAC,CAAC;YACzE,OAAO,IAAI,4BAAgB,EAAE,CAAC;QAChC,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,WAAW;QACf,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CACvD,UAAU,CACX,CAAC;YACF,iBAAO,CAAC,KAAK,CAAC,uCAAuC,GAAG,WAAW,CAAC,CAAC;YACrE,OAAO,WAAW,CAAC;QACrB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iBAAO,CAAC,KAAK,CAAC,uDAAuD,KAAK,EAAE,CAAC,CAAC;YAC9E,OAAO,IAAI,wBAAY,EAAE,CAAC;QAC5B,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,mBAAmB;QACvB,IAAI,CAAC;YACH,kBAAkB;YAClB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAEnD,mBAAmB,CAAC,CAAC;YAEvB,QAAQ;YACR,iBAAO,CAAC,KAAK,CACX,4BAA4B,OAAO,CAAC,IAAI,WAAW,OAAO,CAAC,MAAM,WAAW,OAAO,CAAC,KAAK,UAAU,OAAO,CAAC,KAAK,UAAU,OAAO,CAAC,KAAK,EAAE,CAC1I,CAAC;YAEF,sBAAsB;YACtB,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;gBACtB,iBAAO,CAAC,KAAK,CACX,gCAAgC,OAAO,CAAC,EAAE,cAAc,OAAO,CAAC,EAAE,oBAAoB,OAAO,CAAC,IAAI,EAAE,CACrG,CAAC;YACJ,CAAC;YAED,OAAO,OAAO,CAAC;QACjB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iBAAO,CAAC,KAAK,CAAC,gDAAgD,KAAK,EAAE,CAAC,CAAC;QACzE,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACH,4BAA4B;QAC1B,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAC5C,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC,oBAAoB,CAAC;QACnC,CAAC;QACD,IAAI,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC;QACzC,QAAQ,GAAG,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACxC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACxC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,iBAAiB;QACrB,IAAI,CAAC;YACH,aAAa;YACb,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAE7D,mBAAmB,CAAC,CAAC;YAEvB,iBAAO,CAAC,KAAK,CACX,uBAAuB,iBAAiB,CAAC,IAAI,WAAW,iBAAiB,CAAC,MAAM,WAAW,iBAAiB,CAAC,QAAQ,EAAE,CACxH,CAAC;YAEF,wCAAwC;YACxC,IAAI,iBAAiB,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;gBACpC,IAAI,CAAC,eAAe,CAAC,SAAS;oBAC5B,iBAAiB,CAAC,MAAM,KAAK,CAAC;wBAC5B,CAAC,CAAC,iCAAiB,CAAC,mBAAmB;wBACvC,CAAC,CAAC,iCAAiB,CAAC,cAAc,CAAC;gBACvC,IAAI,CAAC,eAAe,CAAC,QAAQ,GAAG,iBAAiB,CAAC,QAAQ,KAAK,CAAC,CAAC;gBACjE,IAAI,CAAC,eAAe,CAAC,SAAS,GAAG,iBAAiB,CAAC,EAAE,CAAC;gBACtD,IAAI,CAAC,eAAe,CAAC,QAAQ,GAAG,iBAAiB,CAAC,QAAQ,CAAC;gBAC3D,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC;gBACnD,IAAI,CAAC,eAAe,CAAC,KAAK,GAAG,iBAAiB,CAAC,OAAO,CAAC;gBACvD,IAAI,CAAC,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAC1C,OAAO,CACL,iBAAiB,CAAC,MAAM,KAAK,CAAC,IAAI,iBAAiB,CAAC,QAAQ,KAAK,CAAC,CACnE,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iBAAO,CAAC,KAAK,CAAC,6CAA6C,KAAK,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC,eAAe,CAAC,OAAO,GAAG,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,SAAS,GAAG,iCAAiB,CAAC,cAAc,CAAC;QAClE,IAAI,CAAC,eAAe,CAAC,QAAQ,GAAG,KAAK,CAAC;QACtC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,6GAA6G;IAE7G;;;;;;OAMG;IACH,KAAK,CAAC,mBAAmB,CAAC,KAAc;QACtC,IAAI,CAAC;YACH,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAa,iBAAiB,CAAC,CAAC;YACvE,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAa,kBAAkB,CAAC,CAAC;YACxE,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iBAAO,CAAC,KAAK,CAAC,0CAA0C,KAAK,EAAE,CAAC,CAAC;YACjE,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,WAAW,CAAC,IAAY,EAAE,QAAgB;QAC9C,iBAAO,CAAC,KAAK,CAAC,mCAAmC,IAAI,aAAa,QAAQ,EAAE,CAAC,CAAC;QAE9E,oCAAoC;QACpC,IAAI,CAAC;YACH,MAAM,2BAA2B,GAC/B,IAAI;gBACJ,IAAI;gBACJ,GAAG;gBACH,QAAQ;gBACR,GAAG;gBACH,IAAI,CAAC,4BAA4B,EAAE,CAAC;YACtC,iBAAO,CAAC,KAAK,CACX,6CAA6C,2BAA2B,EAAE,CAC3E,CAAC;YAEF,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CACnC,2BAA2B,CAC5B,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iBAAO,CAAC,KAAK,CAAC,sCAAsC,KAAK,EAAE,CAAC,CAAC;YAC7D,OAAO,KAAK,CAAC;QACf,CAAC;QAED,4CAA4C;QAC5C,KACE,IAAI,YAAY,GAAG,CAAC,EACpB,YAAY,GAAG,IAAI,CAAC,yBAAyB,EAC7C,YAAY,EAAE,EACd,CAAC;YACD,gCAAgC;YAChC,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;YAE1D,kBAAkB;YAClB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAChD,iBAAO,CAAC,KAAK,CAAC,wCAAwC,QAAQ,EAAE,CAAC,CAAC;YAClE,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,cAAc;QAClB,IAAI,CAAC;YACH,iBAAO,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;YAEnE,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAa,IAAI,CAAC,CAAC;YACxD,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iBAAO,CAAC,KAAK,CAAC,wDAAwD,KAAK,EAAE,CAAC,CAAC;QACjF,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,uGAAuG;IAEvG;;;;;OAKG;IACH,KAAK,CAAC,aAAa;QACjB,IAAI,CAAC;YACH,iBAAO,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;YAC/C,MAAM,IAAI,CAAC,WAAW,CAAC,cAAc,CAAa,gBAAgB,CAAC,CAAC;YACpE,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iBAAO,CAAC,KAAK,CAAC,8CAA8C,KAAK,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD;;;;;OAKG;IACH,KAAK,CAAC,eAAe;QACnB,IAAI,CAAC;YACH,iBAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;YACjD,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CACpC,kBAAkB,CACnB,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iBAAO,CAAC,KAAK,CAAC,gDAAgD,KAAK,EAAE,CAAC,CAAC;QACzE,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,mBAAmB;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,mBAAmB;QACjB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;CACF;AArgBD,kCAqgBC"}
|
package/dist/web/RaftTypes.d.ts
CHANGED
|
@@ -43,6 +43,26 @@ export type RaftCalibInfo = {
|
|
|
43
43
|
export declare class RaftOKFail {
|
|
44
44
|
rslt: string;
|
|
45
45
|
}
|
|
46
|
+
export type RaftPubTopicRec = {
|
|
47
|
+
name: string;
|
|
48
|
+
idx: number;
|
|
49
|
+
};
|
|
50
|
+
export type RaftSubscriptionUpdateResponse = RaftOKFail & {
|
|
51
|
+
topics?: Array<RaftPubTopicRec>;
|
|
52
|
+
};
|
|
53
|
+
export type RaftPubTopicsResponse = RaftOKFail & {
|
|
54
|
+
topics?: Array<RaftPubTopicRec>;
|
|
55
|
+
};
|
|
56
|
+
export type RaftPublishFrameType = 'json' | 'binary' | 'unknown';
|
|
57
|
+
export type RaftPublishFrameMeta = {
|
|
58
|
+
frameType: RaftPublishFrameType;
|
|
59
|
+
topicIndex?: number;
|
|
60
|
+
topicName?: string;
|
|
61
|
+
version?: number;
|
|
62
|
+
binaryHasEnvelope?: boolean;
|
|
63
|
+
binaryPayloadOffset?: number;
|
|
64
|
+
jsonString?: string;
|
|
65
|
+
};
|
|
46
66
|
export type RaftReportMsg = {
|
|
47
67
|
msgType?: string;
|
|
48
68
|
rslt?: string;
|
|
@@ -138,6 +158,7 @@ export declare class RaftSysModInfoBLEMan {
|
|
|
138
158
|
tDatErrs?: number | undefined;
|
|
139
159
|
}
|
|
140
160
|
export type RaftProgressCBType = (received: number, total: number) => void;
|
|
161
|
+
export type RaftStreamDataProgressCBType = (sent: number, total: number, progress: number) => void;
|
|
141
162
|
export declare class RaftFileDownloadResult {
|
|
142
163
|
fileData: Uint8Array | null;
|
|
143
164
|
downloadedOk: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RaftTypes.js","sourceRoot":"","sources":["../../src/RaftTypes.ts"],"names":[],"mappings":";AAAA,iHAAiH;AACjH,EAAE;AACF,YAAY;AACZ,iBAAiB;AACjB,EAAE;AACF,wCAAwC;AACxC,oCAAoC;AACpC,EAAE;AACF,iHAAiH;;;AAKjH,IAAY,gBAEX;AAFD,WAAY,gBAAgB;IAC1B,mFAAkB,CAAA;AACpB,CAAC,EAFW,gBAAgB,gCAAhB,gBAAgB,QAE3B;AAEY,QAAA,qBAAqB,GAAG;IACnC,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,EAAE,oBAAoB;CAC5D,CAAC;AAEF,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,qEAAW,CAAA;IACX,6EAAe,CAAA;AACjB,CAAC,EAHW,gBAAgB,gCAAhB,gBAAgB,QAG3B;AAED,IAAY,cAEX;AAFD,WAAY,cAAc;IACxB,2EAAgB,CAAA;AAClB,CAAC,EAFW,cAAc,8BAAd,cAAc,QAEzB;AAaD,MAAa,gBAAgB;IAA7B;QACE,iBAAY,GAAG,EAAE,CAAC;QAClB,sBAAiB,GAAI,KAAK,CAAC;QAC3B,QAAG,GAAI,EAAE,CAAC;QACV,SAAI,GAAI,WAAW,CAAC;QACpB,YAAO,GAAI,CAAC,CAAC;IACf,CAAC;CAAA;AAND,4CAMC;AAED,MAAa,cAAc;IAA3B;QACE,SAAI,GAAG,EAAE,CAAC;QACV,eAAU,GAAG,SAAS,CAAC;QACvB,kBAAa,GAAG,OAAO,CAAC;QACxB,eAAU,GAAqB,CAAC,CAAC;QACjC,UAAK,GAAqB,EAAE,CAAC;QAC7B,QAAG,GAAI,EAAE,CAAC;QACV,aAAQ,GAAI,EAAE,CAAC;QACf,YAAO,GAAI,CAAC,CAAC;QACb,aAAQ,GAAI,EAAE,CAAC;IACjB,CAAC;CAAA;AAVD,wCAUC;AAQD,uEAAuE;AACvE,0EAA0E;AAC1E,aAAa;AACb,MAAa,UAAU;IAAvB;QACE,SAAI,GAAG,WAAW,CAAC;IACrB,CAAC;CAAA;AAFD,gCAEC;
|
|
1
|
+
{"version":3,"file":"RaftTypes.js","sourceRoot":"","sources":["../../src/RaftTypes.ts"],"names":[],"mappings":"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"}
|
package/dist/web/main.d.ts
CHANGED
|
@@ -16,6 +16,7 @@ export { default as RaftSysTypeManager } from './RaftSysTypeManager';
|
|
|
16
16
|
export { default as RaftDeviceMgrIF } from './RaftDeviceMgrIF';
|
|
17
17
|
export { DeviceManager as RaftDeviceManager } from './RaftDeviceManager';
|
|
18
18
|
export type { DeviceDecodedData } from './RaftDeviceManager';
|
|
19
|
+
export * from './RaftPublish';
|
|
19
20
|
export * from './RaftTypes';
|
|
20
21
|
export * from './RaftSystemType';
|
|
21
22
|
export * from './RaftWifiTypes';
|
package/dist/web/main.js
CHANGED
|
@@ -40,6 +40,7 @@ var RaftSysTypeManager_1 = require("./RaftSysTypeManager");
|
|
|
40
40
|
Object.defineProperty(exports, "RaftSysTypeManager", { enumerable: true, get: function () { return tslib_1.__importDefault(RaftSysTypeManager_1).default; } });
|
|
41
41
|
var RaftDeviceManager_1 = require("./RaftDeviceManager");
|
|
42
42
|
Object.defineProperty(exports, "RaftDeviceManager", { enumerable: true, get: function () { return RaftDeviceManager_1.DeviceManager; } });
|
|
43
|
+
tslib_1.__exportStar(require("./RaftPublish"), exports);
|
|
43
44
|
tslib_1.__exportStar(require("./RaftTypes"), exports);
|
|
44
45
|
tslib_1.__exportStar(require("./RaftSystemType"), exports);
|
|
45
46
|
tslib_1.__exportStar(require("./RaftWifiTypes"), exports);
|
package/dist/web/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";AAAA,iHAAiH;AACjH,EAAE;AACF,SAAS;AACT,gGAAgG;AAChG,EAAE;AACF,wCAAwC;AACxC,oCAAoC;AACpC,EAAE;AACF,iHAAiH;;;;AAEjH,mEAA2D;AAC3D,MAAM,WAAW,GAAG,IAAA,wCAAgB,GAAE,CAAC;AACf,qCAAc;AAEtC,mDAA6D;AAApD,yIAAA,OAAO,OAAkB;AAClC,iDAA2D;AAAlD,uIAAA,OAAO,OAAiB;AAEjC,+DAAyE;AAAhE,qJAAA,OAAO,OAAwB;AACxC,+DAAyE;AAAhE,qJAAA,OAAO,OAAwB;AACxC,qDAA+D;AAAtD,2IAAA,OAAO,OAAmB;AACnC,qCAA+C;AAAtC,2HAAA,OAAO,OAAW;AAC3B,+CAAyD;AAAhD,qIAAA,OAAO,OAAgB;AAChC,mDAA4D;AAAnD,yIAAA,OAAO,OAAkB;AAClC,yDAAmE;AAA1D,+IAAA,OAAO,OAAqB;AACrC,qDAA+D;AAAtD,2IAAA,OAAO,OAAmB;AACnC,yCAAmD;AAA1C,+HAAA,OAAO,OAAa;AAC7B,2DAAqE;AAA5D,iJAAA,OAAO,OAAsB;AAEtC,yDAAyE;AAAhE,sHAAA,aAAa,OAAqB;AAG3C,sDAA4B;AAC5B,2DAAiC;AACjC,0DAAgC;AAChC,2DAAiC;AACjC,6DAAmC;AACnC,6DAAmC;AACnC,6DAAmC;AACnC,2DAAiC"}
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":";AAAA,iHAAiH;AACjH,EAAE;AACF,SAAS;AACT,gGAAgG;AAChG,EAAE;AACF,wCAAwC;AACxC,oCAAoC;AACpC,EAAE;AACF,iHAAiH;;;;AAEjH,mEAA2D;AAC3D,MAAM,WAAW,GAAG,IAAA,wCAAgB,GAAE,CAAC;AACf,qCAAc;AAEtC,mDAA6D;AAApD,yIAAA,OAAO,OAAkB;AAClC,iDAA2D;AAAlD,uIAAA,OAAO,OAAiB;AAEjC,+DAAyE;AAAhE,qJAAA,OAAO,OAAwB;AACxC,+DAAyE;AAAhE,qJAAA,OAAO,OAAwB;AACxC,qDAA+D;AAAtD,2IAAA,OAAO,OAAmB;AACnC,qCAA+C;AAAtC,2HAAA,OAAO,OAAW;AAC3B,+CAAyD;AAAhD,qIAAA,OAAO,OAAgB;AAChC,mDAA4D;AAAnD,yIAAA,OAAO,OAAkB;AAClC,yDAAmE;AAA1D,+IAAA,OAAO,OAAqB;AACrC,qDAA+D;AAAtD,2IAAA,OAAO,OAAmB;AACnC,yCAAmD;AAA1C,+HAAA,OAAO,OAAa;AAC7B,2DAAqE;AAA5D,iJAAA,OAAO,OAAsB;AAEtC,yDAAyE;AAAhE,sHAAA,aAAa,OAAqB;AAG3C,wDAA8B;AAC9B,sDAA4B;AAC5B,2DAAiC;AACjC,0DAAgC;AAChC,2DAAiC;AACjC,6DAAmC;AACnC,6DAAmC;AACnC,6DAAmC;AACnC,2DAAiC"}
|
|
@@ -80,8 +80,8 @@ const DeviceActionsForm: React.FC<DeviceActionsTableProps> = ({ deviceKey }: Dev
|
|
|
80
80
|
<td>{action.n}</td>
|
|
81
81
|
<td colSpan={2}>
|
|
82
82
|
<DispLEDGrid
|
|
83
|
-
rows={action.NY
|
|
84
|
-
cols={action.NX
|
|
83
|
+
rows={action.NY ?? 1}
|
|
84
|
+
cols={action.NX ?? 1}
|
|
85
85
|
deviceKey={deviceKey}
|
|
86
86
|
deviceAction={action}
|
|
87
87
|
/>
|