copy improvements from fork dabe/incyclist-ant-plus

src/bindings/ant-server-binding.ts

@@ -102,6 +102,9 @@ export default class AntServerBinding extends AntDevice implements IAntDevice{
 
         if (!this.server)
             return;
+
+        this.server.removeAllListeners()
+        this.server.kill()
         this.logEvent({message:'stopping ANT+ Server'})
     }
 

src/sensors/base-sensor.ts

@@ -2,15 +2,50 @@ import { ChannelConfiguration, IChannel, ISensor, Profile } from '../types';
 
 const SEND_TIMEOUT = 10000;
 
+export abstract class SensorState {
+    public constructor(deviceID: number) {
+        this.DeviceID = deviceID;
+    }
+
+    DeviceID: number;
+
+    // Common page - Manufacturer's Identification
+    ManId?: number = undefined;
+    SerialNumber?: number = undefined;
+
+    // Common page - Product Information
+    HwVersion?: number = undefined;
+    SwVersion?: number = undefined;
+    ModelNum?: number = undefined;
+
+    // Common page - Battery status
+    BatteryLevel?: number = undefined;
+    BatteryVoltage?: number = undefined;
+    BatteryStatus?: 'New' | 'Good' | 'Ok' | 'Low' | 'Critical' | 'Invalid' = 'Invalid';
+
+    // Debugging
+    _RawData?: Buffer;
+    Channel?: number;
+
+    // Scanner
+    Rssi?: number;
+    Threshold?: number;
+}
+
 export default abstract class Sensor implements ISensor {
     protected deviceID: number;
     protected channel: IChannel;
-    protected sendTimeout: number;
+    protected sendTimeout: number;    
 
     constructor(deviceID:number=0, channel?:IChannel) {
 		this.deviceID = Number(deviceID)
         this.channel = channel
         this.sendTimeout = SEND_TIMEOUT
+
+        // Bind 'this' to callbacks, so that it has the proper context
+        // when called as a callback in the channel
+        this.onMessage = this.onMessage.bind(this); 
+        this.onEvent = this.onEvent.bind(this);
 	}
 
     getChannel(): IChannel {

src/sensors/bicycle-power-sensor.test.ts

@@ -48,6 +48,7 @@ describe( 'BicyclePowerSensor',()=> {
             sensor.onMessage(data);
 
             expect((sensor as any).states[60916].ManId).toEqual(130);
+            expect((sensor as any).states[60916].Channel).toEqual(0);
         })
     })    
 })