node-poweredup 9.0.0 → 10.1.0

package/src/hubs/technicsmallhub.ts

@@ -1,13 +1,13 @@
-import { Peripheral } from "@abandonware/noble";
+import { Peripheral } from "@stoprocent/noble";
 import compareVersion from "compare-versions";
 
-import { IBLEAbstraction } from "../interfaces";
+import { IBLEAbstraction } from "../interfaces.js";
 
-import { LPF2Hub } from "./lpf2hub";
+import { LPF2Hub } from "./lpf2hub.js";
 
-import * as Consts from "../consts";
+import * as Consts from "../consts.js";
 
-import Debug = require("debug");
+import Debug from "debug";
 const debug = Debug("hub");
 
 

package/src/hubs/wedo2smarthub.ts

@@ -1,15 +1,15 @@
-import { Peripheral } from "@abandonware/noble";
+import { Peripheral } from "@stoprocent/noble";
 
-import { IBLEAbstraction } from "../interfaces";
+import { IBLEAbstraction } from "../interfaces.js";
 
-import { BaseHub } from "./basehub";
+import { BaseHub } from "./basehub.js";
 
-import * as Consts from "../consts";
+import * as Consts from "../consts.js";
 
-import { isWebBluetooth } from "../utils";
+import { isWebBluetooth } from "../utils.js";
 
-import Debug = require("debug");
-import { HubLED } from "../devices/hubled";
+import Debug from "debug";
+import { HubLED } from "../devices/hubled.js";
 const debug = Debug("wedo2smarthub");
 
 
@@ -95,7 +95,6 @@ export class WeDo2SmartHub extends BaseHub {
 
     /**
      * Shutdown the Hub.
-     * @method WeDo2SmartHub#shutdown
      * @returns {Promise} Resolved upon successful disconnect.
      */
     public shutdown () {
@@ -105,7 +104,6 @@ export class WeDo2SmartHub extends BaseHub {
 
     /**
      * Set the name of the Hub.
-     * @method WeDo2SmartHub#setName
      * @param {string} name New name of the hub (14 characters or less, ASCII only).
      * @returns {Promise} Resolved upon successful issuance of command.
      */

package/src/index-browser.ts

@@ -1,53 +1,53 @@
-import * as Consts from "./consts";
+import * as Consts from "./consts.js";
 
-import { PoweredUP } from "./poweredup-browser";
-import { Color } from "./color";
+import { PoweredUP } from "./poweredup-browser.js";
+import { Color } from "./color.js";
 
-import { BaseHub } from "./hubs/basehub";
-import { DuploTrainBase } from "./hubs/duplotrainbase";
-import { Hub } from "./hubs/hub";
-import { Mario } from "./hubs/mario";
-import { MoveHub } from "./hubs/movehub";
-import { RemoteControl } from "./hubs/remotecontrol";
-import { TechnicMediumHub } from "./hubs/technicmediumhub";
-import { WeDo2SmartHub } from "./hubs/wedo2smarthub";
+import { BaseHub } from "./hubs/basehub.js";
+import { DuploTrainBase } from "./hubs/duplotrainbase.js";
+import { Hub } from "./hubs/hub.js";
+import { Mario } from "./hubs/mario.js";
+import { MoveHub } from "./hubs/movehub.js";
+import { RemoteControl } from "./hubs/remotecontrol.js";
+import { TechnicMediumHub } from "./hubs/technicmediumhub.js";
+import { WeDo2SmartHub } from "./hubs/wedo2smarthub.js";
 
-import { ColorDistanceSensor } from "./devices/colordistancesensor";
-import { CurrentSensor } from "./devices/currentsensor";
-import { Device } from "./devices/device";
-import { DuploTrainBaseColorSensor } from "./devices/duplotrainbasecolorsensor";
-import { DuploTrainBaseMotor } from "./devices/duplotrainbasemotor";
-import { DuploTrainBaseSpeaker } from "./devices/duplotrainbasespeaker";
-import { DuploTrainBaseSpeedometer } from "./devices/duplotrainbasespeedometer";
-import { HubLED } from "./devices/hubled";
-import { Light } from "./devices/light";
-import { MediumLinearMotor } from "./devices/mediumlinearmotor";
-import { MotionSensor } from "./devices/motionsensor";
-import { MoveHubMediumLinearMotor } from "./devices/movehubmediumlinearmotor";
-import { MoveHubTiltSensor } from "./devices/movehubtiltsensor";
-import { PiezoBuzzer } from "./devices/piezobuzzer";
-import { RemoteControlButton } from "./devices/remotecontrolbutton";
-import { SimpleMediumLinearMotor } from "./devices/simplemediumlinearmotor";
-import { TechnicColorSensor } from "./devices/techniccolorsensor";
-import { TechnicDistanceSensor } from "./devices/technicdistancesensor";
-import { TechnicForceSensor } from "./devices/technicforcesensor";
-import { TechnicLargeAngularMotor } from "./devices/techniclargeangularmotor";
-import { TechnicLargeLinearMotor } from "./devices/techniclargelinearmotor";
-import { TechnicSmallAngularMotor } from "./devices/technicsmallangularmotor";
-import { TechnicMediumAngularMotor } from "./devices/technicmediumangularmotor";
-import { TechnicMediumHubAccelerometerSensor } from "./devices/technicmediumhubaccelerometersensor";
-import { TechnicMediumHubGyroSensor } from "./devices/technicmediumhubgyrosensor";
-import { TechnicMediumHubTiltSensor } from "./devices/technicmediumhubtiltsensor";
-import { TechnicXLargeLinearMotor } from "./devices/technicxlargelinearmotor";
-import { Technic3x3ColorLightMatrix } from "./devices/technic3x3colorlightmatrix";
-import { TiltSensor } from "./devices/tiltsensor";
-import { TrainMotor } from "./devices/trainmotor";
-import { VoltageSensor } from "./devices/voltagesensor";
-import { TachoMotor } from "./devices/tachomotor";
-import { AbsoluteMotor } from "./devices/absolutemotor";
-import { BasicMotor } from "./devices/basicmotor";
+import { ColorDistanceSensor } from "./devices/colordistancesensor.js";
+import { CurrentSensor } from "./devices/currentsensor.js";
+import { Device } from "./devices/device.js";
+import { DuploTrainBaseColorSensor } from "./devices/duplotrainbasecolorsensor.js";
+import { DuploTrainBaseMotor } from "./devices/duplotrainbasemotor.js";
+import { DuploTrainBaseSpeaker } from "./devices/duplotrainbasespeaker.js";
+import { DuploTrainBaseSpeedometer } from "./devices/duplotrainbasespeedometer.js";
+import { HubLED } from "./devices/hubled.js";
+import { Light } from "./devices/light.js";
+import { MediumLinearMotor } from "./devices/mediumlinearmotor.js";
+import { MotionSensor } from "./devices/motionsensor.js";
+import { MoveHubMediumLinearMotor } from "./devices/movehubmediumlinearmotor.js";
+import { MoveHubTiltSensor } from "./devices/movehubtiltsensor.js";
+import { PiezoBuzzer } from "./devices/piezobuzzer.js";
+import { RemoteControlButton } from "./devices/remotecontrolbutton.js";
+import { SimpleMediumLinearMotor } from "./devices/simplemediumlinearmotor.js";
+import { TechnicColorSensor } from "./devices/techniccolorsensor.js";
+import { TechnicDistanceSensor } from "./devices/technicdistancesensor.js";
+import { TechnicForceSensor } from "./devices/technicforcesensor.js";
+import { TechnicLargeAngularMotor } from "./devices/techniclargeangularmotor.js";
+import { TechnicLargeLinearMotor } from "./devices/techniclargelinearmotor.js";
+import { TechnicSmallAngularMotor } from "./devices/technicsmallangularmotor.js";
+import { TechnicMediumAngularMotor } from "./devices/technicmediumangularmotor.js";
+import { TechnicMediumHubAccelerometerSensor } from "./devices/technicmediumhubaccelerometersensor.js";
+import { TechnicMediumHubGyroSensor } from "./devices/technicmediumhubgyrosensor.js";
+import { TechnicMediumHubTiltSensor } from "./devices/technicmediumhubtiltsensor.js";
+import { TechnicXLargeLinearMotor } from "./devices/technicxlargelinearmotor.js";
+import { Technic3x3ColorLightMatrix } from "./devices/technic3x3colorlightmatrix.js";
+import { TiltSensor } from "./devices/tiltsensor.js";
+import { TrainMotor } from "./devices/trainmotor.js";
+import { VoltageSensor } from "./devices/voltagesensor.js";
+import { TachoMotor } from "./devices/tachomotor.js";
+import { AbsoluteMotor } from "./devices/absolutemotor.js";
+import { BasicMotor } from "./devices/basicmotor.js";
 
-import { isWebBluetooth } from "./utils";
+import { isWebBluetooth } from "./utils.js";
 
 // @ts-ignore
 window.PoweredUP = {

package/src/index-node.ts

@@ -1,53 +1,54 @@
-import * as Consts from "./consts";
+import * as Consts from "./consts.js";
+export * from "./consts.js";
 
-import { PoweredUP } from "./poweredup-node";
-import { Color } from "./color";
+import { PoweredUP } from "./poweredup-node.js";
+import { Color } from "./color.js";
 
-import { BaseHub } from "./hubs/basehub";
-import { DuploTrainBase } from "./hubs/duplotrainbase";
-import { Hub } from "./hubs/hub";
-import { Mario } from "./hubs/mario";
-import { MoveHub } from "./hubs/movehub";
-import { RemoteControl } from "./hubs/remotecontrol";
-import { TechnicMediumHub } from "./hubs/technicmediumhub";
-import { WeDo2SmartHub } from "./hubs/wedo2smarthub";
+import { BaseHub } from "./hubs/basehub.js";
+import { DuploTrainBase } from "./hubs/duplotrainbase.js";
+import { Hub } from "./hubs/hub.js";
+import { Mario } from "./hubs/mario.js";
+import { MoveHub } from "./hubs/movehub.js";
+import { RemoteControl } from "./hubs/remotecontrol.js";
+import { TechnicMediumHub } from "./hubs/technicmediumhub.js";
+import { WeDo2SmartHub } from "./hubs/wedo2smarthub.js";
 
-import { ColorDistanceSensor } from "./devices/colordistancesensor";
-import { CurrentSensor } from "./devices/currentsensor";
-import { Device } from "./devices/device";
-import { DuploTrainBaseColorSensor } from "./devices/duplotrainbasecolorsensor";
-import { DuploTrainBaseMotor } from "./devices/duplotrainbasemotor";
-import { DuploTrainBaseSpeaker } from "./devices/duplotrainbasespeaker";
-import { DuploTrainBaseSpeedometer } from "./devices/duplotrainbasespeedometer";
-import { HubLED } from "./devices/hubled";
-import { Light } from "./devices/light";
-import { MediumLinearMotor } from "./devices/mediumlinearmotor";
-import { MotionSensor } from "./devices/motionsensor";
-import { MoveHubMediumLinearMotor } from "./devices/movehubmediumlinearmotor";
-import { MoveHubTiltSensor } from "./devices/movehubtiltsensor";
-import { PiezoBuzzer } from "./devices/piezobuzzer";
-import { RemoteControlButton } from "./devices/remotecontrolbutton";
-import { SimpleMediumLinearMotor } from "./devices/simplemediumlinearmotor";
-import { TechnicColorSensor } from "./devices/techniccolorsensor";
-import { TechnicDistanceSensor } from "./devices/technicdistancesensor";
-import { TechnicForceSensor } from "./devices/technicforcesensor";
-import { TechnicLargeAngularMotor } from "./devices/techniclargeangularmotor";
-import { TechnicLargeLinearMotor } from "./devices/techniclargelinearmotor";
-import { TechnicSmallAngularMotor } from "./devices/technicsmallangularmotor";
-import { TechnicMediumAngularMotor } from "./devices/technicmediumangularmotor";
-import { TechnicMediumHubAccelerometerSensor } from "./devices/technicmediumhubaccelerometersensor";
-import { TechnicMediumHubGyroSensor } from "./devices/technicmediumhubgyrosensor";
-import { TechnicMediumHubTiltSensor } from "./devices/technicmediumhubtiltsensor";
-import { TechnicXLargeLinearMotor } from "./devices/technicxlargelinearmotor";
-import { Technic3x3ColorLightMatrix } from "./devices/technic3x3colorlightmatrix";
-import { TiltSensor } from "./devices/tiltsensor";
-import { TrainMotor } from "./devices/trainmotor";
-import { VoltageSensor } from "./devices/voltagesensor";
-import { TachoMotor } from "./devices/tachomotor";
-import { AbsoluteMotor } from "./devices/absolutemotor";
-import { BasicMotor } from "./devices/basicmotor";
+import { ColorDistanceSensor } from "./devices/colordistancesensor.js";
+import { CurrentSensor } from "./devices/currentsensor.js";
+import { Device } from "./devices/device.js";
+import { DuploTrainBaseColorSensor } from "./devices/duplotrainbasecolorsensor.js";
+import { DuploTrainBaseMotor } from "./devices/duplotrainbasemotor.js";
+import { DuploTrainBaseSpeaker } from "./devices/duplotrainbasespeaker.js";
+import { DuploTrainBaseSpeedometer } from "./devices/duplotrainbasespeedometer.js";
+import { HubLED } from "./devices/hubled.js";
+import { Light } from "./devices/light.js";
+import { MediumLinearMotor } from "./devices/mediumlinearmotor.js";
+import { MotionSensor } from "./devices/motionsensor.js";
+import { MoveHubMediumLinearMotor } from "./devices/movehubmediumlinearmotor.js";
+import { MoveHubTiltSensor } from "./devices/movehubtiltsensor.js";
+import { PiezoBuzzer } from "./devices/piezobuzzer.js";
+import { RemoteControlButton } from "./devices/remotecontrolbutton.js";
+import { SimpleMediumLinearMotor } from "./devices/simplemediumlinearmotor.js";
+import { TechnicColorSensor } from "./devices/techniccolorsensor.js";
+import { TechnicDistanceSensor } from "./devices/technicdistancesensor.js";
+import { TechnicForceSensor } from "./devices/technicforcesensor.js";
+import { TechnicLargeAngularMotor } from "./devices/techniclargeangularmotor.js";
+import { TechnicLargeLinearMotor } from "./devices/techniclargelinearmotor.js";
+import { TechnicSmallAngularMotor } from "./devices/technicsmallangularmotor.js";
+import { TechnicMediumAngularMotor } from "./devices/technicmediumangularmotor.js";
+import { TechnicMediumHubAccelerometerSensor } from "./devices/technicmediumhubaccelerometersensor.js";
+import { TechnicMediumHubGyroSensor } from "./devices/technicmediumhubgyrosensor.js";
+import { TechnicMediumHubTiltSensor } from "./devices/technicmediumhubtiltsensor.js";
+import { TechnicXLargeLinearMotor } from "./devices/technicxlargelinearmotor.js";
+import { Technic3x3ColorLightMatrix } from "./devices/technic3x3colorlightmatrix.js";
+import { TiltSensor } from "./devices/tiltsensor.js";
+import { TrainMotor } from "./devices/trainmotor.js";
+import { VoltageSensor } from "./devices/voltagesensor.js";
+import { TachoMotor } from "./devices/tachomotor.js";
+import { AbsoluteMotor } from "./devices/absolutemotor.js";
+import { BasicMotor } from "./devices/basicmotor.js";
 
-import { isWebBluetooth } from "./utils";
+import { isWebBluetooth } from "./utils.js";
 
 export default PoweredUP;
 export {

package/src/interfaces.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from "events";
 
-import * as Consts from "./consts";
+import * as Consts from "./consts.js";
 
 export interface IBLEAbstraction extends EventEmitter {
     uuid: string;
@@ -12,7 +12,7 @@ export interface IBLEAbstraction extends EventEmitter {
     discoverCharacteristicsForService: (uuid: string) => Promise<void>;
     subscribeToCharacteristic: (uuid: string, callback: (data: Buffer) => void) => void;
     addToCharacteristicMailbox: (uuid: string, data: Buffer) => void;
-    readFromCharacteristic: (uuid: string, callback: (err: string | null, data: Buffer | null) => void) => void;
+    readFromCharacteristic: (uuid: string, callback: (err: Error | null, data: Buffer | null) => void) => void;
     writeToCharacteristic: (uuid: string, data: Buffer) => Promise<void>;
 }
 

package/src/nobleabstraction.ts

@@ -1,8 +1,8 @@
-import { Characteristic, Peripheral, Service } from "@abandonware/noble";
+import { Characteristic, Peripheral, Service } from "@stoprocent/noble";
 
-import Debug = require("debug");
+import Debug from "debug";
 import { EventEmitter } from "events";
-import { IBLEAbstraction } from "./interfaces";
+import { IBLEAbstraction } from "./interfaces.js";
 const debug = Debug("bledevice");
 
 
@@ -63,7 +63,7 @@ export class NobleDevice extends EventEmitter implements IBLEAbstraction {
     public connect () {
         return new Promise<void>((resolve, reject) => {
             this._connecting = true;
-            this._noblePeripheral.connect((err: string) => {
+            this._noblePeripheral.connect((err: Error | undefined) => {
                 if(err) {
                     return reject(err);
                 }
@@ -89,7 +89,7 @@ export class NobleDevice extends EventEmitter implements IBLEAbstraction {
     public discoverCharacteristicsForService (uuid: string) {
         return new Promise<void>(async (discoverResolve, discoverReject) => {
             uuid = this._sanitizeUUID(uuid);
-            this._noblePeripheral.discoverServices([uuid], (err: string, services: Service[]) => {
+            this._noblePeripheral.discoverServices([uuid], (err: Error | undefined, services: Service[]) => {
                 if (err) {
                     return discoverReject(err);
                 }
@@ -120,9 +120,9 @@ export class NobleDevice extends EventEmitter implements IBLEAbstraction {
         this._characteristics[uuid].on("data", (data: Buffer) => {
             return callback(data);
         });
-        this._characteristics[uuid].subscribe((err) => {
+        this._characteristics[uuid].subscribe((err: Error | undefined) => {
             if (err) {
-                throw new Error(err);
+                throw err;
             }
         });
     }
@@ -133,10 +133,10 @@ export class NobleDevice extends EventEmitter implements IBLEAbstraction {
     }
 
 
-    public readFromCharacteristic (uuid: string, callback: (err: string | null, data: Buffer | null) => void) {
+    public readFromCharacteristic (uuid: string, callback: (err: Error | null, data: Buffer | null) => void) {
         uuid = this._sanitizeUUID(uuid);
-        this._characteristics[uuid].read((err: string, data: Buffer) => {
-            return callback(err, data);
+        this._characteristics[uuid].read((err: Error | undefined, data: Buffer) => {
+            return callback(err ?? null, data);
         });
     }
 

package/src/portoutputcommand.ts

@@ -0,0 +1,37 @@
+import { CommandFeedback } from "./consts.js";
+import Debug = require("debug");
+const debug = Debug("device");
+
+export class PortOutputCommand {
+
+    public data: Buffer;
+    public interrupt: boolean;
+    public state: CommandFeedback;
+    private _promise: Promise<CommandFeedback>;
+    private _resolveCallback: any;
+
+    constructor (data: Buffer, interrupt: boolean) {
+        this.data = data;
+        this.interrupt = interrupt;
+        this.state = CommandFeedback.TRANSMISSION_PENDING;
+        this._promise = new Promise<CommandFeedback>((resolve) => {
+            this._resolveCallback = () => resolve(this.state);
+        });
+    }
+
+    public get startupAndCompletion () {
+        let val = 0x01; // request feedback
+        if(this.interrupt) val |= 0x10;
+        return val;
+    }
+
+    public get promise () {
+        return this._promise;
+    }
+
+    public resolve(feedback: CommandFeedback) {
+        debug("complete command ", this.startupAndCompletion, this.data, " result: ", feedback);
+        this.state = feedback;
+        this._resolveCallback();
+    }
+}

package/src/portoutputsleep.ts

@@ -0,0 +1,11 @@
+import { CommandFeedback } from "./consts.js";
+import { PortOutputCommand } from "./portoutputcommand.js";
+
+export class PortOutputSleep extends PortOutputCommand {
+    public duration: number;
+    constructor (duration: number) {
+        super(Buffer.alloc(0), false);
+        this.duration = duration;
+        this.state = CommandFeedback.EXECUTION_PENDING;
+    }
+}

package/src/poweredup-browser.ts

@@ -1,21 +1,23 @@
-import { WebBLEDevice } from "./webbleabstraction";
+/// <reference types="web-bluetooth" />
 
-import { BaseHub } from "./hubs/basehub";
-import { DuploTrainBase } from "./hubs/duplotrainbase";
-import { Hub } from "./hubs/hub";
-import { Mario } from "./hubs/mario";
-import { MoveHub } from "./hubs/movehub";
-import { RemoteControl } from "./hubs/remotecontrol";
-import { TechnicMediumHub } from "./hubs/technicmediumhub";
-import { WeDo2SmartHub } from "./hubs/wedo2smarthub";
+import { WebBLEDevice } from "./webbleabstraction.js";
 
-import * as Consts from "./consts";
+import { BaseHub } from "./hubs/basehub.js";
+import { DuploTrainBase } from "./hubs/duplotrainbase.js";
+import { Hub } from "./hubs/hub.js";
+import { Mario } from "./hubs/mario.js";
+import { MoveHub } from "./hubs/movehub.js";
+import { RemoteControl } from "./hubs/remotecontrol.js";
+import { TechnicMediumHub } from "./hubs/technicmediumhub.js";
+import { WeDo2SmartHub } from "./hubs/wedo2smarthub.js";
+
+import * as Consts from "./consts.js";
 
 import { EventEmitter } from "events";
 
-import Debug = require("debug");
-import { IBLEAbstraction } from "./interfaces";
-import { TechnicSmallHub } from "./hubs/technicsmallhub";
+import Debug from "debug";
+import { IBLEAbstraction } from "./interfaces.js";
+import { TechnicSmallHub } from "./hubs/technicsmallhub.js";
 const debug = Debug("poweredup");
 
 
@@ -37,7 +39,6 @@ export class PoweredUP extends EventEmitter {
 
     /**
      * Begin scanning for Powered UP Hub devices.
-     * @method PoweredUP#scan
      */
     public async scan () {
 
@@ -77,7 +78,6 @@ export class PoweredUP extends EventEmitter {
 
     /**
      * Retrieve a list of Powered UP Hubs.
-     * @method PoweredUP#getHubs
      * @returns {BaseHub[]}
      */
     public getHubs () {
@@ -87,7 +87,6 @@ export class PoweredUP extends EventEmitter {
 
     /**
      * Retrieve a Powered UP Hub by UUID.
-     * @method PoweredUP#getHubByUUID
      * @param {string} uuid
      * @returns {BaseHub | null}
      */
@@ -98,7 +97,6 @@ export class PoweredUP extends EventEmitter {
 
     /**
      * Retrieve a Powered UP Hub by primary MAC address.
-     * @method PoweredUP#getHubByPrimaryMACAddress
      * @param {string} address
      * @returns {BaseHub}
      */
@@ -109,7 +107,6 @@ export class PoweredUP extends EventEmitter {
 
     /**
      * Retrieve a list of Powered UP Hub by name.
-     * @method PoweredUP#getHubsByName
      * @param {string} name
      * @returns {BaseHub[]}
      */
@@ -120,7 +117,6 @@ export class PoweredUP extends EventEmitter {
 
     /**
      * Retrieve a list of Powered UP Hub by type.
-     * @method PoweredUP#getHubsByType
      * @param {string} name
      * @returns {BaseHub[]}
      */

package/src/poweredup-node.ts

@@ -1,24 +1,24 @@
-import { Peripheral } from "@abandonware/noble";
+import { Peripheral } from "@stoprocent/noble";
 
-import { NobleDevice } from "./nobleabstraction";
+import { NobleDevice } from "./nobleabstraction.js";
 
-import { BaseHub } from "./hubs/basehub";
-import { DuploTrainBase } from "./hubs/duplotrainbase";
-import { Hub } from "./hubs/hub";
-import { Mario } from "./hubs/mario";
-import { MoveHub } from "./hubs/movehub";
-import { RemoteControl } from "./hubs/remotecontrol";
-import { TechnicMediumHub } from "./hubs/technicmediumhub";
-import { WeDo2SmartHub } from "./hubs/wedo2smarthub";
+import { BaseHub } from "./hubs/basehub.js";
+import { DuploTrainBase } from "./hubs/duplotrainbase.js";
+import { Hub } from "./hubs/hub.js";
+import { Mario } from "./hubs/mario.js";
+import { MoveHub } from "./hubs/movehub.js";
+import { RemoteControl } from "./hubs/remotecontrol.js";
+import { TechnicMediumHub } from "./hubs/technicmediumhub.js";
+import { WeDo2SmartHub } from "./hubs/wedo2smarthub.js";
 
-import * as Consts from "./consts";
+import * as Consts from "./consts.js";
 
 import { EventEmitter } from "events";
 
-import Debug = require("debug");
+import Debug from "debug";
 const debug = Debug("poweredup");
-import noble = require("@abandonware/noble");
-import { TechnicSmallHub } from "./hubs/technicsmallhub";
+import noble from "@stoprocent/noble";
+import { TechnicSmallHub } from "./hubs/technicsmallhub.js";
 
 let ready = false;
 let wantScan = false;
@@ -67,7 +67,6 @@ export class PoweredUP extends EventEmitter {
 
     /**
      * Begin scanning for Powered UP Hub devices.
-     * @method PoweredUP#scan
      */
     public async scan () {
         wantScan = true;
@@ -85,7 +84,6 @@ export class PoweredUP extends EventEmitter {
 
     /**
      * Stop scanning for Powered UP Hub devices.
-     * @method PoweredUP#stop
      */
     public stop () {
         wantScan = false;
@@ -97,7 +95,6 @@ export class PoweredUP extends EventEmitter {
 
     /**
      * Retrieve a list of Powered UP Hubs.
-     * @method PoweredUP#getHubs
      * @returns {BaseHub[]}
      */
     public getHubs () {
@@ -107,7 +104,6 @@ export class PoweredUP extends EventEmitter {
 
     /**
      * Retrieve a Powered UP Hub by UUID.
-     * @method PoweredUP#getHubByUUID
      * @param {string} uuid
      * @returns {BaseHub | null}
      */
@@ -118,7 +114,6 @@ export class PoweredUP extends EventEmitter {
 
     /**
      * Retrieve a Powered UP Hub by primary MAC address.
-     * @method PoweredUP#getHubByPrimaryMACAddress
      * @param {string} address
      * @returns {BaseHub}
      */
@@ -129,7 +124,6 @@ export class PoweredUP extends EventEmitter {
 
     /**
      * Retrieve a list of Powered UP Hub by name.
-     * @method PoweredUP#getHubsByName
      * @param {string} name
      * @returns {BaseHub[]}
      */
@@ -140,8 +134,7 @@ export class PoweredUP extends EventEmitter {
 
     /**
      * Retrieve a list of Powered UP Hub by type.
-     * @method PoweredUP#getHubsByType
-     * @param {string} name
+     * @param {number} hubType
      * @returns {BaseHub[]}
      */
     public getHubsByType (hubType: number) {

package/src/utils.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from "events";
-import { Device } from "./devices/device";
+import { Device } from "./devices/device.js";
 
 // @ts-ignore
 export const isWebBluetooth = !!(typeof navigator !== "undefined" && navigator && navigator.bluetooth);
@@ -59,34 +59,29 @@ export const roundAngleToNearest90 = (angle: number) => {
     return -180;
 };
 
-export const calculateRamp = (device: Device, fromPower: number, toPower: number, time: number) => {
-    const emitter = new EventEmitter();
+export const calculateRamp = (fromPower: number, toPower: number, time: number) => {
     const steps = Math.abs(toPower - fromPower);
+    if (steps === 0 || time <= 0) {
+        return [toPower];
+    }
     let delay = time / steps;
     let increment = 1;
-    if (delay < 50 && steps > 0) {
+    if (delay < 50) {
         increment = 50 / delay;
         delay = 50;
     }
     if (fromPower > toPower) {
         increment = -increment;
     }
-    let i = 0;
-    const interval = setInterval(() => {
-        let power = Math.round(fromPower + (++i * increment));
-        if (toPower > fromPower && power > toPower) {
-            power = toPower;
-        } else if (fromPower > toPower && power < toPower) {
-            power = toPower;
-        }
-        emitter.emit("changePower", power);
-        if (power === toPower) {
-            clearInterval(interval);
-            emitter.emit("finished");
+    return Array(Math.round(time / delay)).fill(0).map((element, index) => {
+        let value = Math.round(fromPower + (index + 1) * increment);
+        if (toPower > fromPower && value > toPower) {
+            value = toPower;
+        } else if (fromPower > toPower && value < toPower) {
+            value = toPower;
         }
-    }, delay);
-    device.setEventTimer(interval);
-    return emitter;
+        return value;
+    });
 };
 
 export const parseColor = (color: number) => {
@@ -94,4 +89,4 @@ export const parseColor = (color: number) => {
         color = color + 1;
     }
     return color;
-}
+}

package/src/webbleabstraction.ts

@@ -1,6 +1,6 @@
-import Debug = require("debug");
+import Debug from "debug";
 import { EventEmitter } from "events";
-import { IBLEAbstraction } from "./interfaces";
+import { IBLEAbstraction } from "./interfaces.js";
 const debug = Debug("bledevice");
 
 
@@ -117,7 +117,7 @@ export class WebBLEDevice extends EventEmitter implements IBLEAbstraction {
     }
 
 
-    public readFromCharacteristic (uuid: string, callback: (err: string | null, data: Buffer | null) => void) {
+    public readFromCharacteristic (uuid: string, callback: (err: Error | null, data: Buffer | null) => void) {
         // @ts-ignore
         this._characteristics[uuid].readValue().then((data) => {
             const buf = Buffer.alloc(data.buffer.byteLength);