@robotical/raftjs 1.4.7 → 2.0.4

package/src/RaftSystemType.ts

@@ -15,18 +15,20 @@ export interface ConnectorOptions {
 
 export interface RaftSystemType {
   nameForDialogs: string;
-  defaultWiFiHostname: string;
-  BLEServiceUUIDs: string[];
-  BLECmdUUID: string;
-  BLERespUUID: string;
-  firmwareDestName: string;
-  normalFileDestName: string;
+  defaultWiFiHostname?: string;
+  BLEServiceUUIDs?: string[];
+  BLECmdUUID?: string;
+  BLERespUUID?: string;
+  BLEDeviceNames?: string[];
+  firmwareDestName?: string;
+  normalFileDestName?: string;
   connectorOptions: ConnectorOptions;
   setup: (systemUtils: RaftSystemUtils, onEvent: RaftEventFn | null) => void;
   subscribeForUpdates: RaftSubscribeForUpdatesCBType | null;
   stateIsInvalid: RaftStateIsInvalidCBType | null;
   rxOtherMsgType: RaftRxOtherMsgType | null;
-  deviceMgrIF: RaftDeviceMgrIF;
+  deviceMgrIF?: RaftDeviceMgrIF;
+  nonRaftTypeCode?: string;
 }
 
 export type RaftGetSystemTypeCBType = (systemUtils: RaftSystemUtils) => Promise<RaftSystemType | null>;

package/src/RaftSystemUtils.ts

@@ -61,7 +61,9 @@ export default class RaftSystemUtils {
    * @param defaultWiFiHostname
    */
   setDefaultWiFiHostname(defaultWiFiHostname: string) {
-    this._defaultWiFiHostname = defaultWiFiHostname;
+    if (defaultWiFiHostname) {
+      this._defaultWiFiHostname = defaultWiFiHostname;
+    }
   }
   
   /**

package/src/RaftUpdateManager.ts

@@ -762,9 +762,9 @@ export default class RICUpdateManager {
   ): Promise<boolean> {
 
     // Get the destination
-    let fileDest = this._systemType ? this._systemType.normalFileDestName : "fs";
+    let fileDest = this._systemType && this._systemType.normalFileDestName ? this._systemType.normalFileDestName : "fs";
     if (fileType === RaftFileSendType.FIRMWARE_UPDATE) {
-      fileDest = this._systemType ? this._systemType.firmwareDestName : "fw";
+      fileDest = this._systemType && this._systemType.firmwareDestName ? this._systemType.firmwareDestName : "fw";
     }
     return await this._raftFileHandler.fileSend(
       fileName,

package/src/RaftUtils.ts

@@ -29,7 +29,7 @@ export default class RaftUtils {
   ): void {
     // Check valid
     if (buffer.length < startPos + strToAdd.length + 1) {
-      RaftLog.error("addStringToBuffer buffer too short");
+      RaftLog.warn("addStringToBuffer buffer too short");
       return;
     }
     let curPos = startPos;
@@ -471,7 +471,7 @@ export default class RaftUtils {
       return v1 === v2;
     } catch (e) {
       // one of the two versions is invalid, return false
-      RaftLog.error(`isVersionEqual - invalid version ${v1} or ${v2} ${e}`);
+      RaftLog.warn(`isVersionEqual - invalid version ${v1} or ${v2} ${e}`);
       return false;
     }
   }
@@ -481,14 +481,34 @@ export default class RaftUtils {
     const timeout = new Promise((_, reject) => {
       id = setTimeout(() => {
         clearTimeout(id);
-        reject('Timed out in '+ ms + 'ms.')
+        reject('Timed out in ' + ms + 'ms.')
       }, ms)
     })
-  
+
     return Promise.race([
       promise,
       timeout
     ])
   }
-  
+
+  static toBufferSource(u8: Uint8Array<ArrayBufferLike>): BufferSource {
+    if (u8.buffer instanceof ArrayBuffer) {
+      // Respect byteOffset/byteLength
+      return u8.buffer.slice(u8.byteOffset, u8.byteOffset + u8.byteLength);
+    }
+    // e.g., SharedArrayBuffer -> copy into a real ArrayBuffer
+    const ab = new ArrayBuffer(u8.byteLength);
+    new Uint8Array(ab).set(u8);
+    return ab;
+  }
+  static toArrayBufferView(u8: Uint8Array<ArrayBufferLike>): Uint8Array<ArrayBuffer> {
+    if (u8.buffer instanceof ArrayBuffer) {
+      // keep the same bytes/offset/length, but the return type is now locked to ArrayBuffer
+      return new Uint8Array(u8.buffer, u8.byteOffset, u8.byteLength);
+    }
+    // e.g., SharedArrayBuffer → copy into a real ArrayBuffer
+    const ab = new ArrayBuffer(u8.byteLength);
+    new Uint8Array(ab).set(u8);
+    return new Uint8Array(ab);
+  }
 }

package/src/main.ts

@@ -16,6 +16,7 @@ export { default as RaftCommsStats } from './RaftCommsStats';
 export { default as RaftConnector } from './RaftConnector';
 export { default as RaftChannel } from './RaftChannel';
 export { default as RaftChannelWebSocket } from './RaftChannelWebSocket';
+export { default as RaftChannelSimulated } from './RaftChannelSimulated';
 export { default as RaftFileHandler } from './RaftFileHandler';
 export { default as RaftLog } from './RaftLog';
 export { default as RaftMiniHDLC } from './RaftMiniHDLC';
@@ -34,3 +35,4 @@ export * from './RaftConnEvents';
 export * from './RaftUpdateEvents';
 export * from "./RaftProtocolDefs";
 export * from "./RaftDeviceStates";
+export * from "./RaftDeviceInfo";