@robdobsn/raftjs 1.5.9 → 1.6.1

package/src/RaftChannelWebSerial.ts

@@ -13,7 +13,6 @@ import RaftMsgHandler from "./RaftMsgHandler";
 import RaftLog from "./RaftLog";
 import { RaftConnEvent, RaftConnEventFn } from "./RaftConnEvents";
 import { ConnectorOptions } from "./RaftSystemType";
-import { TextDecoder } from 'text-encoding';
 
 type TWebParityType = 'none' | 'even' | 'odd';
 type TWebFlowControlType = 'none' | 'hardware';

package/src/RaftConnector.ts

@@ -318,10 +318,12 @@ export default class RaftConnector {
     if (this._raftChannel) {
       // Check if there is a RICREST command to send before disconnecting
       const ricRestCommand = this._raftChannel.ricRestCmdBeforeDisconnect();
-      console.log(`sending RICREST command before disconnect: ${ricRestCommand}`);
       if (ricRestCommand) {
+        console.log(`sending RICREST command before disconnect: ${ricRestCommand}`);
         await this.sendRICRESTMsg(ricRestCommand, {});
       }
+      // Pause a little before disconnecting
+      await new Promise(resolve => setTimeout(resolve, 1000));
       // await this.sendRICRESTMsg("bledisc", {});
       await this._raftChannel.disconnect();
       this._raftChannel = null;
@@ -653,7 +655,7 @@ export default class RaftConnector {
     // Connect
     try {
       if (this._raftChannel) {
-        const connected = await this._raftChannel.connect(this._channelConnLocator, this._systemType ? this._systemType.connectorOptions : {});
+        const connected = await this._raftChannel.connect(this._channelConnLocator, this._systemType ? this._systemType.connectorOptions : { });
         if (connected) {
           this._retryIfLostIsConnected = true;
           return true;

package/src/RaftTypes.ts

@@ -245,11 +245,13 @@ export class DiscoveredDevice {
   _name = '';
   _id = '';
   _rssi = -150;
-  constructor(localName: string, name: string, id: string, rssi: number) {
+  _serviceUUIDs: string[] | null = [];
+  constructor(localName: string, name: string, id: string, rssi: number, serviceUUIDs: string[] | null) {
     this._localName = localName;
     this._name = name;
     this._id = id;
     this._rssi = rssi;
+    this._serviceUUIDs = serviceUUIDs;
   }
   get name(): string {
     if (this._localName !== null && this._localName.length > 0) {
@@ -268,6 +270,9 @@ export class DiscoveredDevice {
     if (this._rssi !== null) return this._rssi;
     return -100;
   }
+  get serviceUUIDs(): string[] | null {
+    return this._serviceUUIDs;
+  }
 }
 
 export type DiscoveredDevicesCB = (discoveredDevicess: DiscoveredDevice[]) => void;

package/src/main.ts

@@ -24,6 +24,7 @@ export { default as RaftStreamHandler } from './RaftStreamHandler';
 export { default as RaftSystemUtils } from './RaftSystemUtils';
 export { default as RaftUtils } from './RaftUtils';
 export { default as RaftSysTypeManager } from './RaftSysTypeManager';
+export { default as RaftDeviceMgrIF } from './RaftDeviceMgrIF';
 export { DeviceManager as RaftDeviceManager } from './RaftDeviceManager';
 
 export * from './RaftTypes';