incyclist-devices 1.4.19 → 1.4.22

package/lib/simulator/Simulator.js

@@ -1,22 +1,45 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Simulator = void 0;
 const DeviceProtocol_1 = __importStar(require("../DeviceProtocol"));
 const DeviceRegistry_1 = __importDefault(require("../DeviceRegistry"));
 const Device_1 = __importDefault(require("../Device"));
 const gd_eventlog_1 = require("gd-eventlog");
-const calculations_1 = __importDefault(require("../calculations"));
+const simulator_mode_1 = __importDefault(require("./simulator-mode"));
+const DEFAULT_SETTINGS = { name: 'Simulator', port: '', isBot: false };
 class Simulator extends Device_1.default {
-    constructor(protocol) {
+    constructor(protocol, props = DEFAULT_SETTINGS) {
         const proto = protocol || DeviceRegistry_1.default.findByName('Simulator');
         super(proto);
         this.logger = new gd_eventlog_1.EventLogger(Simulator.NAME);
@@ -27,8 +50,16 @@ class Simulator extends Device_1.default {
         this.time = undefined;
         this.iv = undefined;
         this.started = false;
+        this.paused = false;
         this.slope = 0;
         this.limit = {};
+        this.startTS = undefined;
+        this.data = { isPedalling: false, power: 0, pedalRpm: 0, speed: 0, heartrate: 0, distanceInternal: 0 };
+        this.isBot = props.isBot || false;
+        this.ignoreHrm = false;
+        const name = this.getCyclingMode().getName();
+        const modeSettings = this.isBot ? props.settings || {} : this.getCyclingMode().getSettings();
+        this.setCyclingMode(name, modeSettings);
     }
     isBike() { return true; }
     isHrm() { return false; }
@@ -36,28 +67,66 @@ class Simulator extends Device_1.default {
     getID() { return Simulator.NAME; }
     getName() { return Simulator.NAME; }
     getPort() { return 'local'; }
-    start(props) {
-        this.startProps = props;
-        return new Promise((resolve) => {
-            this.logger.logEvent({ message: 'start', iv: this.iv });
-            if (this.started) {
-                return resolve({ started: true, error: undefined });
+    setIgnoreHrm(ignore) {
+        this.ignoreHrm = ignore;
+    }
+    getSupportedCyclingModes() {
+        const supported = [];
+        supported.push(simulator_mode_1.default);
+        return supported;
+    }
+    getDefaultCyclingMode() {
+        return new simulator_mode_1.default(this);
+    }
+    getCyclingMode() {
+        if (!this.cyclingMode)
+            this.setCyclingMode(this.getDefaultCyclingMode());
+        return this.cyclingMode;
+    }
+    setCyclingMode(mode, settings) {
+        let selectedMode;
+        if (typeof mode === 'string') {
+            const supported = this.getSupportedCyclingModes();
+            const CyclingModeClass = supported.find(M => { const m = new M(this); return m.getName() === mode; });
+            if (CyclingModeClass) {
+                this.cyclingMode = new CyclingModeClass(this, settings);
+                return;
             }
-            this.paused = (this.speed === 0);
-            this.started = true;
-            this.time = Date.now();
-            if (this.iv !== undefined) {
-                clearInterval(this.iv);
-                this.iv = undefined;
-            }
-            this.speed = 30;
-            this.iv = setInterval(() => this.update(), 1000);
-            resolve({ started: true, error: undefined });
+            selectedMode = this.getDefaultCyclingMode();
+        }
+        else {
+            selectedMode = mode;
+        }
+        this.cyclingMode = selectedMode;
+        this.cyclingMode.setSettings(settings);
+    }
+    start(props) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.startProps = props;
+            return new Promise((resolve) => {
+                if (!this.isBot)
+                    this.logger.logEvent({ message: 'start', iv: this.iv });
+                if (this.started) {
+                    return resolve({ started: true, error: undefined });
+                }
+                this.started = true;
+                this.time = Date.now();
+                this.startTS = this.time;
+                if (this.iv !== undefined) {
+                    clearInterval(this.iv);
+                    this.iv = undefined;
+                }
+                this.iv = setInterval(() => this.update(), 1000);
+                if (!this.isBot)
+                    this.logger.logEvent({ message: 'started' });
+                resolve({ started: true, error: undefined });
+            });
         });
     }
     stop() {
         return new Promise((resolve, reject) => {
-            this.logger.logEvent({ message: 'stop', iv: this.iv });
+            if (!this.isBot)
+                this.logger.logEvent({ message: 'stop', iv: this.iv });
             this.started = false;
             clearInterval(this.iv);
             this.iv = undefined;
@@ -69,7 +138,8 @@ class Simulator extends Device_1.default {
         return new Promise((resolve, reject) => {
             if (!this.started)
                 return reject(new Error('illegal state - pause() has been called before start()'));
-            this.logger.logEvent({ message: 'pause', iv: this.iv });
+            if (!this.isBot)
+                this.logger.logEvent({ message: 'pause', iv: this.iv });
             this.paused = true;
             resolve(true);
         });
@@ -78,7 +148,8 @@ class Simulator extends Device_1.default {
         return new Promise((resolve, reject) => {
             if (!this.started)
                 reject(new Error('illegal state - resume() has been called before start()'));
-            this.logger.logEvent({ message: 'resume', iv: this.iv });
+            if (!this.isBot)
+                this.logger.logEvent({ message: 'resume', iv: this.iv });
             this.paused = false;
             resolve(true);
         });
@@ -114,29 +185,26 @@ class Simulator extends Device_1.default {
         }
     }
     update() {
-        let prevTime = this.time;
-        this.time = Date.now();
-        let timespan = this.time - prevTime;
-        if (this.limit.slope) {
-            this.slope = this.limit.slope;
-        }
-        if (this.speed === undefined)
-            this.speed = 30;
-        this.power = calculations_1.default.calculatePower(75, this.speed / 3.6, this.slope);
-        if (this.limit.targetPower) {
-            this.power = this.limit.targetPower;
-            this.speed = calculations_1.default.calculateSpeed(75, this.power, this.slope);
-        }
-        if (this.limit.maxPower && this.power > this.limit.maxPower) {
-            this.power = this.limit.maxPower;
-            this.speed = calculations_1.default.calculateSpeed(75, this.power, this.slope);
-        }
-        else if (this.limit.minPower && this.power < this.limit.minPower) {
-            this.power = this.limit.minPower;
-            this.speed = calculations_1.default.calculateSpeed(75, this.power, this.slope);
-        }
-        let distance = this.calculateDistance(this.speed, timespan / 1000);
-        let data = { speed: this.speed, cadence: Math.round(this.cadence), power: Math.round(this.power), timespan, distance };
+        const startDelay = this.getCyclingMode().getSetting('delay');
+        const timeSinceStart = Date.now() - this.startTS;
+        if (startDelay && timeSinceStart < startDelay * 1000)
+            return;
+        const prevDist = this.data.distanceInternal;
+        this.data = this.getCyclingMode().updateData(this.data);
+        let data = {
+            speed: this.data.speed,
+            slope: this.data.slope,
+            power: this.data.power,
+            cadence: this.data.pedalRpm,
+            distance: this.data.distanceInternal - prevDist,
+            heartrate: Math.round(this.data.power - 10 + Math.random() * 20),
+            timestamp: Date.now(),
+            deviceTime: Math.round((Date.now() - this.startTS) / 1000),
+            deviceDistanceCounter: this.data.distanceInternal
+        };
+        this.paused = (this.data.speed === 0);
+        if (this.ignoreHrm)
+            delete data.heartrate;
         if (this.onDataFn) {
             this.onDataFn(data);
         }
@@ -145,15 +213,9 @@ class Simulator extends Device_1.default {
         return timeS * speedKps / 3.6;
     }
     sendUpdate(request) {
-        this.logger.logEvent({ message: 'bike update request', request });
-        const r = request || { refresh: true };
-        if (r.refresh) {
-            if (Object.keys(r).length === 1)
-                return this.limit;
-            delete r.refresh;
-        }
-        this.limit = r;
-        return this.limit;
+        if (this.paused)
+            return;
+        return this.getCyclingMode().sendBikeUpdate(request);
     }
 }
 exports.Simulator = Simulator;
@@ -161,9 +223,12 @@ Simulator.NAME = 'Simulator';
 class SimulatorProtocol extends DeviceProtocol_1.default {
     constructor() {
         super();
-        this.devices.push(new Simulator(this));
+        this.devices = [];
     }
     add(settings) {
+        let device = new Simulator(this, settings);
+        this.devices.push(device);
+        return device;
     }
     getName() {
         return SimulatorProtocol.NAME;

package/lib/simulator/simulator-mode.d.ts

@@ -0,0 +1,28 @@
+import { EventLogger } from "gd-eventlog";
+import CyclingMode, { CyclingModeBase, CyclingModeProperty, IncyclistBikeData, UpdateRequest } from "../CyclingMode";
+import { Simulator } from "./Simulator";
+export declare type ERGEvent = {
+    rpmUpdated?: boolean;
+    gearUpdated?: boolean;
+    starting?: boolean;
+    tsStart?: number;
+};
+export default class SimulatorCyclingMode extends CyclingModeBase implements CyclingMode {
+    logger: EventLogger;
+    data: IncyclistBikeData;
+    prevRequest: UpdateRequest;
+    prevUpdateTS: number;
+    hasBikeUpdate: boolean;
+    chain: number[];
+    cassette: number[];
+    event: ERGEvent;
+    constructor(adapter: Simulator, props?: any);
+    getName(): string;
+    getDescription(): string;
+    getProperties(): CyclingModeProperty[];
+    getProperty(name: string): CyclingModeProperty;
+    getBikeInitRequest(): UpdateRequest;
+    sendBikeUpdate(request: UpdateRequest): UpdateRequest;
+    updateData(bikeData: IncyclistBikeData): IncyclistBikeData;
+    calculateTargetPower(request: any, updateMode?: boolean): void;
+}

package/lib/simulator/simulator-mode.js

@@ -0,0 +1,120 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const gd_eventlog_1 = require("gd-eventlog");
+const CyclingMode_1 = require("../CyclingMode");
+const calculations_1 = __importDefault(require("../calculations"));
+const config = {
+    name: "Simulator",
+    description: "Simulates a ride with constant speed or power output",
+    properties: [
+        { key: 'mode', name: 'Simulation Type', description: '', type: CyclingMode_1.CyclingModeProperyType.SingleSelect, options: ['Speed', 'Power'], default: 'Power' },
+        { key: 'delay', name: 'Start Delay', description: 'Delay (in s) at start of training', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 2, min: 0, max: 30 },
+        { key: 'power', name: 'Power', description: 'Power (in W) at start of training', condition: (s) => !s.simType || s.simType === 'Power', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 150, min: 25, max: 800 },
+        { key: 'speed', name: 'Speed', description: 'Speed (in km/h) at start of training', condition: (s) => s.simType === 'Speed', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 30, min: 5, max: 50 },
+    ]
+};
+class SimulatorCyclingMode extends CyclingMode_1.CyclingModeBase {
+    constructor(adapter, props) {
+        super(adapter, props);
+        this.prevUpdateTS = 0;
+        this.hasBikeUpdate = false;
+        this.event = {};
+        this.logger = adapter.logger || new gd_eventlog_1.EventLogger('SIMMode');
+        this.data = {};
+        this.logger.logEvent({ message: 'constructor', props });
+    }
+    getName() {
+        return config.name;
+    }
+    getDescription() {
+        return config.description;
+    }
+    getProperties() {
+        return config.properties;
+    }
+    getProperty(name) {
+        return config.properties.find(p => p.name === name);
+    }
+    getBikeInitRequest() {
+        return {};
+    }
+    sendBikeUpdate(request) {
+        this.logger.logEvent({ message: 'bike update request', request });
+        const r = request || { refresh: true };
+        if (r.refresh) {
+            if (Object.keys(r).length === 1)
+                return this.prevRequest || {};
+            delete r.refresh;
+        }
+        if (request.slope !== undefined) {
+            if (!this.data)
+                this.data = {};
+            this.data.slope = request.slope;
+        }
+        this.prevRequest = request ? JSON.parse(JSON.stringify(request)) : {};
+        return r;
+    }
+    updateData(bikeData) {
+        const prevData = JSON.parse(JSON.stringify(this.data || {}));
+        const prevSpeed = prevData.speed;
+        const prevRequest = this.prevRequest || {};
+        const data = this.data || {};
+        const mode = this.getSetting('mode');
+        delete this.event.gearUpdated;
+        delete this.event.rpmUpdated;
+        try {
+            let rpm = 90;
+            let power = (mode === 'Power' || !mode) ? this.getSetting('power') : bikeData.power || 0;
+            let slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
+            let speed = mode === 'Speed' ? this.getSetting('speed') : bikeData.speed || 0;
+            let m = 75;
+            let distanceInternal = prevData.distanceInternal || 0;
+            let ts = Date.now();
+            let duration = this.prevUpdateTS === 0 ? 0 : ((ts - this.prevUpdateTS) / 1000);
+            if (mode === 'Power' || !mode) {
+                speed = calculations_1.default.calculateSpeed(m, power, slope, { bikeType: 'race' });
+            }
+            else if (mode === 'Speed') {
+                power = calculations_1.default.calculatePower(m, speed / 3.6, slope, { bikeType: 'race' });
+            }
+            if (prevRequest.targetPower) {
+                power = prevRequest.targetPower;
+                speed = calculations_1.default.calculateSpeed(m, power, slope, { bikeType: 'race' });
+            }
+            if (prevRequest.maxPower && power > prevRequest.maxPower) {
+                power = prevRequest.maxPower;
+                speed = calculations_1.default.calculateSpeed(m, power, slope, { bikeType: 'race' });
+            }
+            else if (prevRequest.minPower && power < prevRequest.minPower) {
+                power = prevRequest.minPower;
+                speed = calculations_1.default.calculateSpeed(m, power, slope, { bikeType: 'race' });
+            }
+            let v = speed / 3.6;
+            distanceInternal += Math.round(v * duration);
+            data.speed = parseFloat(speed.toFixed(1));
+            data.power = Math.round(power);
+            data.distanceInternal = distanceInternal;
+            data.slope = slope;
+            data.pedalRpm = rpm;
+            if (data.time !== undefined)
+                data.time += duration;
+            else
+                data.time = 0;
+            data.heartrate = bikeData.heartrate;
+            data.isPedalling = true;
+            this.prevUpdateTS = ts;
+        }
+        catch (err) {
+            this.logger.logEvent({ message: 'error', fn: 'updateData()', error: err.message || err });
+        }
+        this.logger.logEvent({ message: "updateData result", data, bikeData, prevRequest, prevSpeed });
+        this.data = data;
+        return data;
+    }
+    calculateTargetPower(request, updateMode = true) {
+    }
+}
+exports.default = SimulatorCyclingMode;

package/lib/types/route.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RouteType = void 0;
 var RouteType;
 (function (RouteType) {
     RouteType["FREE_RIDE"] = "free ride";

package/lib/types/user.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Gender = void 0;
 var Gender;
 (function (Gender) {
     Gender["MALE"] = "M";

package/lib/utils.js

@@ -9,24 +9,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sleep = (ms) => {
+exports.Queue = exports.hexstr = exports.intVal = exports.floatVal = exports.runWithRetries = exports.sleep = void 0;
+const sleep = (ms) => {
     return new Promise(resolve => setTimeout(resolve, ms));
 };
+exports.sleep = sleep;
 function runWithRetries(fn, maxRetries, timeBetween) {
     return new Promise((resolve, reject) => {
         let retries = 0;
         let tLastFailure = undefined;
         let busy = false;
-        const iv = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+        let iv = setInterval(() => __awaiter(this, void 0, void 0, function* () {
             const tNow = Date.now();
-            if (busy)
+            if (busy) {
                 return;
+            }
             if (tLastFailure === undefined || tNow - tLastFailure > timeBetween) {
                 try {
                     busy = true;
                     const data = yield fn();
-                    busy = false;
                     clearInterval(iv);
+                    iv = undefined;
+                    busy = false;
                     return resolve(data);
                 }
                 catch (err) {
@@ -34,6 +38,7 @@ function runWithRetries(fn, maxRetries, timeBetween) {
                     retries++;
                     if (retries >= maxRetries) {
                         clearInterval(iv);
+                        iv = undefined;
                         busy = false;
                         return reject(err);
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "1.4.19",
+  "version": "1.4.22",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",