@robdobsn/raftjs 1.5.0 → 1.5.9

package/src/RaftDeviceMgrIF.ts

@@ -16,10 +16,16 @@ export default interface RaftDeviceMgrIF {
     getDevicesState(): DevicesState;
     getDeviceState(deviceKey: string): DeviceState;
 
+    // Settings
+    setMaxDataPointsToStore(maxDataPointsToStore: number): void;
+
     // Callbacks
-    onNewDevice(callback: (deviceKey: string, state: DeviceState) => void): void;
-    onNewDeviceAttribute(callback: (deviceKey: string, attrState: DeviceAttributeState) => void): void;
-    onNewAttributeData(callback: (deviceKey: string, attrState: DeviceAttributeState) => void): void;
+    addNewDeviceCallback(callback: (deviceKey: string, state: DeviceState) => void): void;
+    removeNewDeviceCallback(callback: (deviceKey: string, state: DeviceState) => void): void;
+    addNewAttributeCallback(callback: (deviceKey: string, attrState: DeviceAttributeState) => void): void;
+    removeNewAttributeCallback(callback: (deviceKey: string, attrState: DeviceAttributeState) => void): void;
+    addAttributeDataCallback(callback: (deviceKey: string, attrState: DeviceAttributeState) => void): void;
+    removeAttributeDataCallback(callback: (deviceKey: string, attrState: DeviceAttributeState) => void): void;
 
     // Send action to device
     sendAction(deviceKey: string, action: DeviceTypeAction, data: number[]): void;

package/src/RaftDeviceStates.ts

@@ -51,6 +51,7 @@ export interface DeviceAttributeState {
     name: string;
     newAttribute: boolean;
     newData: boolean;
+    numNewValues: number;
     values: number[];
     units: string;
     range: number[];
@@ -76,6 +77,9 @@ export interface DeviceState {
     deviceIsNew: boolean;
     stateChanged: boolean;
     isOnline: boolean;
+    deviceAddress: string;
+    deviceType: string;
+    busName: string;
 }
 
 export class DevicesState {
@@ -83,6 +87,6 @@ export class DevicesState {
 }
 
 // Add the getDeviceKey method to generate a composite key
-export function getDeviceKey(busName: string, devAddr: string): string {
-    return `${busName}_${devAddr}`;
+export function getDeviceKey(busName: string, devAddr: string, devType: string): string {
+    return `${busName}_${devAddr}_${devType}`;
 }

package/src/RaftStruct.ts

@@ -134,9 +134,10 @@ export function structPack(format: string, values: number[]): Uint8Array {
     let offset = 0;
     let littleEndian = false;
 
+    let valIdx = 0;
     for (let i = 0; i < format.length; i++) {
         const char = format[i];
-        const value = values[i];
+        const value = values[valIdx];
         switch (char) {
             case "<":
                 littleEndian = true;

package/src/RaftTypes.ts

@@ -32,7 +32,7 @@ export type RaftEventFn = (
   eventType: string,
   eventEnum: RaftConnEvent | RaftUpdateEvent | RaftPublishEvent,
   eventName: string,
-  data?: object | string | null,
+  data?: object | string | null
 ) => void;
 
 export interface RaftSubscription {
@@ -59,30 +59,22 @@ export class RaftSystemInfo {
   Friendly? = "";
 }
 
-export class RaftCalibInfo {
-  rslt = '';
-  calDone = 0;
-  validMs? = 0;
+export type RaftCalibInfo = {
+  rslt: string;
+  calDone: number;
+  validMs? : number;
 }
 
+// NOTE: Do not put any methods in any of the response classes as they 
+// are simply wrappers around JSON and will not necessarily be constructed
+// as objects
 export class RaftOKFail {
-  RAFT_OK = 'ok';
-  set(rsltFlag: boolean) {
-    if (rsltFlag) {
-      this.rslt = this.RAFT_OK;
-    } else {
-      this.rslt = 'fail';
-    }
-  }
-  rslt = 'commsFail';
-  isOk() {
-    return this.rslt === this.RAFT_OK;
-  }
+  rslt = 'failComms';
 }
 
-export class RaftReportMsg {
+export type RaftReportMsg = {
   msgType?: string;
-  rslt = '';
+  rslt: string;
   timeReceived?: number;
   hexRd?: string;
   elemName?: string;
@@ -92,19 +84,19 @@ export class RaftReportMsg {
   msgBody?: string;
 }
 
-export class RaftHWFWStat {
-  s = '';
-  m = '';
-  v = '';
-  n = '';
-  p = 0;
-  i = 0;
+export type RaftHWFWStat = {
+  s: string;
+  m: string;
+  v: string;
+  n: string;
+  p: number;
+  i: number;
 }
 
-export class RaftHWFWUpdRslt {
-  req = '';
-  rslt = 'commsFail';
-  st: RaftHWFWStat = new RaftHWFWStat();
+export type RaftHWFWUpdRslt = {
+  req: string;
+  rslt: string;
+  st: RaftHWFWStat;
 }
 
 export type RaftFWInfo = {