:recycle: fix some imports and destructured calls for tests

src/api.js

@@ -1,8 +1,8 @@
 import { fromLiquid } from './core/utils.js'
 
 import { Container } from './core/container.js'
-import { Reading, Channel } from './core/channel'
-import { Controller } from './core/controller'
+import { Reading, Channel } from './core/channel.js'
+import { Controller } from './controller.js'
 import { InputConf } from './input.js'
 
 /**

src/controller.js

@@ -1,3 +1,5 @@
+import { updateChannel } from "./core/channel.js"
+
 let allWarnings = []
 
 // const _makeWarning = (msg, channelOrSensor) => ({

src/core/channel.js

@@ -17,7 +17,7 @@ class Reading {
      * @param {*} param0.min
      * @param {*} param0.max
      */
-    constructor({ onRead, unit, min, max }) {
+    constructor({ onRead=() => "err", unit, min, max }) {
         this._readVal = onRead
         this.unit = unit
         this.max = max
@@ -81,14 +81,24 @@ class Channel {
     get val() {
         return this._reader.val
     }
+    // Just used to simplify updateChannel()
+    get onRead() {
+        return this._reader._readVal
+    }
+    get min() {
+        return this._reader.min
+    }
+    get max() {
+        return this._reader.max
+    }
     get unit() {
         return this._reader.unit
     }
     get aboveRange() {
-        return this._reader.val > this._reader.max
+        return this.val > this.max
     }
     get belowRange() {
-        return this._reader.val < this._reader.min
+        return this.val < this.min
     }
     get inRange() {
         return this._reader.val && !this.aboveRange && !this.belowRange

test/channel.spec.js

@@ -13,7 +13,7 @@ test('channel - instantiate channel with readers correctly', () => {
     let testChan = new Channel({ interval: 1, reader: testReader })
 
     // Test that the channel and channel.reader are working
-    expect(testChan.lastUpdate == now).toStrictEqual(true)
+    expect(testChan.lastUpdate - now < 10).toStrictEqual(true)
     expect(testChan.val).toStrictEqual(70)
     expect(testChan.unit).toStrictEqual('F')