brilliantsole 0.0.16 → 0.0.18

package/README.md

@@ -19,3 +19,15 @@ if it doesn't work, try turning the firewall off
 
 if you have issues saving or running stuff on mac, try:  
 `sudo chown -R username directory_name`
+
+## Running the Node.js server for WebSocket/UDP stuff
+
+__To insall via npm:__
+```javascript
+npm install brilliantsole
+```
+
+__to add in a webpage:__
+```html
+<script src="https://unpkg.com/brilliantsole@latest/build/brilliantsole.js"></script>
+```

package/build/brilliantsole.cjs

@@ -779,7 +779,9 @@ _a$6 = FileTransferManager, _FileTransferManager_maxLength = new WeakMap(), _Fil
         return;
     }
     if (!__classPrivateFieldGet(this, _FileTransferManager_buffer, "f")) {
-        _console$x.error("no buffer defined");
+        if (!this.isServerSide) {
+            _console$x.error("no buffer defined");
+        }
         return;
     }
     const buffer = __classPrivateFieldGet(this, _FileTransferManager_buffer, "f");
@@ -840,19 +842,36 @@ function parseTimestamp(dataView, byteOffset) {
     return timestamp;
 }
 
-var _RangeHelper_range;
+var _RangeHelper_instances, _RangeHelper_range, _RangeHelper_updateSpan;
 const initialRange = { min: Infinity, max: -Infinity, span: 0 };
 class RangeHelper {
     constructor() {
+        _RangeHelper_instances.add(this);
         _RangeHelper_range.set(this, Object.assign({}, initialRange));
     }
+    get min() {
+        return __classPrivateFieldGet(this, _RangeHelper_range, "f").min;
+    }
+    get max() {
+        return __classPrivateFieldGet(this, _RangeHelper_range, "f").max;
+    }
+    set min(newMin) {
+        __classPrivateFieldGet(this, _RangeHelper_range, "f").min = newMin;
+        __classPrivateFieldGet(this, _RangeHelper_range, "f").max = Math.max(newMin, __classPrivateFieldGet(this, _RangeHelper_range, "f").max);
+        __classPrivateFieldGet(this, _RangeHelper_instances, "m", _RangeHelper_updateSpan).call(this);
+    }
+    set max(newMax) {
+        __classPrivateFieldGet(this, _RangeHelper_range, "f").max = newMax;
+        __classPrivateFieldGet(this, _RangeHelper_range, "f").min = Math.min(newMax, __classPrivateFieldGet(this, _RangeHelper_range, "f").min);
+        __classPrivateFieldGet(this, _RangeHelper_instances, "m", _RangeHelper_updateSpan).call(this);
+    }
     reset() {
         Object.assign(__classPrivateFieldGet(this, _RangeHelper_range, "f"), initialRange);
     }
     update(value) {
         __classPrivateFieldGet(this, _RangeHelper_range, "f").min = Math.min(value, __classPrivateFieldGet(this, _RangeHelper_range, "f").min);
         __classPrivateFieldGet(this, _RangeHelper_range, "f").max = Math.max(value, __classPrivateFieldGet(this, _RangeHelper_range, "f").max);
-        __classPrivateFieldGet(this, _RangeHelper_range, "f").span = __classPrivateFieldGet(this, _RangeHelper_range, "f").max - __classPrivateFieldGet(this, _RangeHelper_range, "f").min;
+        __classPrivateFieldGet(this, _RangeHelper_instances, "m", _RangeHelper_updateSpan).call(this);
     }
     getNormalization(value, weightByRange) {
         let normalization = getInterpolation(value, __classPrivateFieldGet(this, _RangeHelper_range, "f").min, __classPrivateFieldGet(this, _RangeHelper_range, "f").max, __classPrivateFieldGet(this, _RangeHelper_range, "f").span);
@@ -866,7 +885,9 @@ class RangeHelper {
         return this.getNormalization(value, weightByRange);
     }
 }
-_RangeHelper_range = new WeakMap();
+_RangeHelper_range = new WeakMap(), _RangeHelper_instances = new WeakSet(), _RangeHelper_updateSpan = function _RangeHelper_updateSpan() {
+    __classPrivateFieldGet(this, _RangeHelper_range, "f").span = __classPrivateFieldGet(this, _RangeHelper_range, "f").max - __classPrivateFieldGet(this, _RangeHelper_range, "f").min;
+};
 
 var _CenterOfPressureHelper_range;
 class CenterOfPressureHelper {
@@ -2017,14 +2038,14 @@ _InformationManager_isCharging = new WeakMap(), _InformationManager_batteryCurre
     _console$n.log({ currentTime });
     __classPrivateFieldSet(this, _InformationManager_isCurrentTimeSet, currentTime != 0 || Math.abs(Date.now() - currentTime) < Uint16Max, "f");
     if (!__classPrivateFieldGet(this, _InformationManager_isCurrentTimeSet, "f")) {
-        __classPrivateFieldGet(this, _InformationManager_instances, "m", _InformationManager_setCurrentTime).call(this);
+        __classPrivateFieldGet(this, _InformationManager_instances, "m", _InformationManager_setCurrentTime).call(this, false);
     }
-}, _InformationManager_setCurrentTime = async function _InformationManager_setCurrentTime() {
+}, _InformationManager_setCurrentTime = async function _InformationManager_setCurrentTime(sendImmediately) {
     _console$n.log("setting current time...");
     const dataView = new DataView(new ArrayBuffer(8));
     dataView.setBigUint64(0, BigInt(Date.now()), true);
     const promise = this.waitForEvent("getCurrentTime");
-    this.sendMessage([{ type: "setCurrentTime", data: dataView.buffer }]);
+    this.sendMessage([{ type: "setCurrentTime", data: dataView.buffer }], sendImmediately);
     await promise;
 };
 
@@ -2334,7 +2355,7 @@ _VibrationManager_instances = new WeakSet(), _VibrationManager_verifyLocation =
     return data;
 };
 
-var _BaseConnectionManager_instances, _a$4, _BaseConnectionManager_AssertValidTxRxMessageType, _BaseConnectionManager_assertIsSupported, _BaseConnectionManager_status, _BaseConnectionManager_assertIsNotConnected, _BaseConnectionManager_assertIsNotConnecting, _BaseConnectionManager_assertIsConnected, _BaseConnectionManager_assertIsNotDisconnecting, _BaseConnectionManager_assertIsConnectedAndNotDisconnecting, _BaseConnectionManager_pendingMessages, _BaseConnectionManager_onRxMessage, _BaseConnectionManager_timer, _BaseConnectionManager_checkConnection;
+var _BaseConnectionManager_instances, _a$4, _BaseConnectionManager_AssertValidTxRxMessageType, _BaseConnectionManager_assertIsSupported, _BaseConnectionManager_status, _BaseConnectionManager_assertIsNotConnected, _BaseConnectionManager_assertIsNotConnecting, _BaseConnectionManager_assertIsConnected, _BaseConnectionManager_assertIsNotDisconnecting, _BaseConnectionManager_assertIsConnectedAndNotDisconnecting, _BaseConnectionManager_pendingMessages, _BaseConnectionManager_isSendingMessages, _BaseConnectionManager_onRxMessage, _BaseConnectionManager_timer, _BaseConnectionManager_checkConnection;
 const _console$l = createConsole("BaseConnectionManager", { log: true });
 const ConnectionStatuses = ["notConnected", "connecting", "connected", "disconnecting"];
 const ConnectionEventTypes = [...ConnectionStatuses, "connectionStatus", "isConnected"];
@@ -2373,6 +2394,7 @@ class BaseConnectionManager {
         _BaseConnectionManager_instances.add(this);
         _BaseConnectionManager_status.set(this, "notConnected");
         _BaseConnectionManager_pendingMessages.set(this, []);
+        _BaseConnectionManager_isSendingMessages.set(this, false);
         _BaseConnectionManager_timer.set(this, new Timer(__classPrivateFieldGet(this, _BaseConnectionManager_instances, "m", _BaseConnectionManager_checkConnection).bind(this), 5000));
         __classPrivateFieldGet(this, _BaseConnectionManager_instances, "m", _BaseConnectionManager_assertIsSupported).call(this);
     }
@@ -2432,6 +2454,10 @@ class BaseConnectionManager {
         if (!sendImmediately) {
             return;
         }
+        if (__classPrivateFieldGet(this, _BaseConnectionManager_isSendingMessages, "f")) {
+            return;
+        }
+        __classPrivateFieldSet(this, _BaseConnectionManager_isSendingMessages, true, "f");
         _console$l.log("sendTxMessages", __classPrivateFieldGet(this, _BaseConnectionManager_pendingMessages, "f").slice());
         const arrayBuffers = __classPrivateFieldGet(this, _BaseConnectionManager_pendingMessages, "f").map((message) => {
             __classPrivateFieldGet(_a$4, _a$4, "m", _BaseConnectionManager_AssertValidTxRxMessageType).call(_a$4, message.type);
@@ -2464,15 +2490,17 @@ class BaseConnectionManager {
             await this.sendTxData(arrayBuffer);
         }
         __classPrivateFieldGet(this, _BaseConnectionManager_pendingMessages, "f").length = 0;
+        __classPrivateFieldSet(this, _BaseConnectionManager_isSendingMessages, false, "f");
     }
     async sendTxData(data) {
         _console$l.log("sendTxData", data);
     }
     parseRxMessage(dataView) {
         parseMessage(dataView, TxRxMessageTypes, __classPrivateFieldGet(this, _BaseConnectionManager_instances, "m", _BaseConnectionManager_onRxMessage).bind(this), null, true);
+        this.onMessagesReceived();
     }
 }
-_a$4 = BaseConnectionManager, _BaseConnectionManager_status = new WeakMap(), _BaseConnectionManager_pendingMessages = new WeakMap(), _BaseConnectionManager_timer = new WeakMap(), _BaseConnectionManager_instances = new WeakSet(), _BaseConnectionManager_AssertValidTxRxMessageType = function _BaseConnectionManager_AssertValidTxRxMessageType(messageType) {
+_a$4 = BaseConnectionManager, _BaseConnectionManager_status = new WeakMap(), _BaseConnectionManager_pendingMessages = new WeakMap(), _BaseConnectionManager_isSendingMessages = new WeakMap(), _BaseConnectionManager_timer = new WeakMap(), _BaseConnectionManager_instances = new WeakSet(), _BaseConnectionManager_AssertValidTxRxMessageType = function _BaseConnectionManager_AssertValidTxRxMessageType(messageType) {
     _console$l.assertEnumWithError(messageType, TxRxMessageTypes);
 }, _BaseConnectionManager_assertIsSupported = function _BaseConnectionManager_assertIsSupported() {
     _console$l.assertWithError(this.isSupported, `${this.constructor.name} is not supported`);
@@ -2706,6 +2734,9 @@ class BluetoothConnectionManager extends BaseConnectionManager {
     }
     async sendTxData(data) {
         super.sendTxData(data);
+        if (data.byteLength == 0) {
+            return;
+        }
         await this.writeCharacteristic("tx", data);
     }
 }
@@ -2843,7 +2874,6 @@ _WebBluetoothConnectionManager_boundBluetoothCharacteristicEventListeners = new
     _console$h.log("getting services...");
     const services = await this.server.getPrimaryServices();
     _console$h.log("got services", services.length);
-    await this.server.getPrimaryService("8d53dc1d-1db7-4cd3-868b-8a527460aa84");
     _console$h.log("getting characteristics...");
     for (const serviceIndex in services) {
         const service = services[serviceIndex];
@@ -4126,7 +4156,7 @@ _DeviceManager_boundDeviceEventListeners = new WeakMap(), _DeviceManager_Connect
 DeviceManager.shared = new DeviceManager();
 var DeviceManager$1 = DeviceManager.shared;
 
-var _Device_instances, _a$3, _Device_DefaultConnectionManager, _Device_eventDispatcher, _Device_dispatchEvent_get, _Device_connectionManager, _Device_sendTxMessages, _Device_isConnected, _Device_assertIsConnected, _Device_hasRequiredInformation_get, _Device_requestRequiredInformation, _Device_assertCanReconnect, _Device_ReconnectOnDisconnection, _Device_reconnectOnDisconnection, _Device_reconnectIntervalId, _Device_onConnectionStatusUpdated, _Device_dispatchConnectionEvents, _Device_checkConnection, _Device_clear, _Device_onConnectionMessageReceived, _Device_deviceInformationManager, _Device_batteryLevel, _Device_updateBatteryLevel, _Device_sensorConfigurationManager, _Device_ClearSensorConfigurationOnLeave, _Device_clearSensorConfigurationOnLeave, _Device_sensorDataManager, _Device_vibrationManager, _Device_fileTransferManager, _Device_tfliteManager, _Device_firmwareManager, _Device_sendSmpMessage, _Device_isServerSide;
+var _Device_instances, _a$3, _Device_DefaultConnectionManager, _Device_eventDispatcher, _Device_dispatchEvent_get, _Device_connectionManager, _Device_sendTxMessages, _Device_isConnected, _Device_assertIsConnected, _Device_hasRequiredInformation_get, _Device_requestRequiredInformation, _Device_assertCanReconnect, _Device_ReconnectOnDisconnection, _Device_reconnectOnDisconnection, _Device_reconnectIntervalId, _Device_onConnectionStatusUpdated, _Device_dispatchConnectionEvents, _Device_checkConnection, _Device_clear, _Device_onConnectionMessageReceived, _Device_onConnectionMessagesReceived, _Device_deviceInformationManager, _Device_batteryLevel, _Device_updateBatteryLevel, _Device_sensorConfigurationManager, _Device_ClearSensorConfigurationOnLeave, _Device_clearSensorConfigurationOnLeave, _Device_sensorDataManager, _Device_vibrationManager, _Device_fileTransferManager, _Device_tfliteManager, _Device_firmwareManager, _Device_sendSmpMessage, _Device_isServerSide;
 const _console$d = createConsole("Device", { log: true });
 const DeviceEventTypes = [
     "connectionMessage",
@@ -4251,10 +4281,12 @@ class Device {
         if (this.connectionManager) {
             this.connectionManager.onStatusUpdated = undefined;
             this.connectionManager.onMessageReceived = undefined;
+            this.connectionManager.onMessagesReceived = undefined;
         }
         if (newConnectionManager) {
             newConnectionManager.onStatusUpdated = __classPrivateFieldGet(this, _Device_instances, "m", _Device_onConnectionStatusUpdated).bind(this);
             newConnectionManager.onMessageReceived = __classPrivateFieldGet(this, _Device_instances, "m", _Device_onConnectionMessageReceived).bind(this);
+            newConnectionManager.onMessagesReceived = __classPrivateFieldGet(this, _Device_instances, "m", _Device_onConnectionMessagesReceived).bind(this);
         }
         __classPrivateFieldSet(this, _Device_connectionManager, newConnectionManager, "f");
         _console$d.log("assigned new connectionManager", __classPrivateFieldGet(this, _Device_connectionManager, "f"));
@@ -4631,9 +4663,14 @@ _a$3 = Device, _Device_eventDispatcher = new WeakMap(), _Device_connectionManage
     }
     this.latestConnectionMessage.set(messageType, dataView);
     __classPrivateFieldGet(this, _Device_instances, "a", _Device_dispatchEvent_get).call(this, "connectionMessage", { messageType, dataView });
+}, _Device_onConnectionMessagesReceived = function _Device_onConnectionMessagesReceived() {
     if (!this.isConnected && __classPrivateFieldGet(this, _Device_instances, "a", _Device_hasRequiredInformation_get)) {
         __classPrivateFieldGet(this, _Device_instances, "m", _Device_checkConnection).call(this);
     }
+    if (this.connectionStatus == "notConnected") {
+        return;
+    }
+    __classPrivateFieldGet(this, _Device_instances, "m", _Device_sendTxMessages).call(this);
 }, _Device_updateBatteryLevel = function _Device_updateBatteryLevel(updatedBatteryLevel) {
     _console$d.assertTypeWithError(updatedBatteryLevel, "number");
     if (__classPrivateFieldGet(this, _Device_batteryLevel, "f") == updatedBatteryLevel) {
@@ -5159,6 +5196,7 @@ class NobleConnectionManager extends BluetoothConnectionManager {
             __classPrivateFieldGet(this, _NobleConnectionManager_characteristics, "f").set(characteristicName, characteristic);
             characteristic.name = characteristicName;
             characteristic.connectionManager = this;
+            _console$8.log(`adding listeners to characteristic "${characteristic.name}" (currently has ${characteristic.listeners.length} listeners)`);
             addEventListeners(characteristic, __classPrivateFieldGet(this, _NobleConnectionManager_unboundNobleCharacteristicListeners, "f"));
             if (characteristic.properties.includes("read")) {
                 await characteristic.readAsync();
@@ -5217,6 +5255,7 @@ _NobleConnectionManager_noblePeripheral = new WeakMap(), _NobleConnectionManager
     });
     __classPrivateFieldGet(this, _NobleConnectionManager_services, "f").clear();
     __classPrivateFieldGet(this, _NobleConnectionManager_characteristics, "f").forEach((characteristic) => {
+        _console$8.log(`removing listeners from characteristic "${characteristic.name}" has ${characteristic.listeners.length} listeners`);
         removeEventListeners(characteristic, __classPrivateFieldGet(this, _NobleConnectionManager_unboundNobleCharacteristicListeners, "f"));
     });
     __classPrivateFieldGet(this, _NobleConnectionManager_characteristics, "f").clear();
@@ -5987,6 +6026,7 @@ exports.MaxVibrationWaveformEffectSegmentLoopCount = MaxVibrationWaveformEffectS
 exports.MaxVibrationWaveformEffectSequenceLoopCount = MaxVibrationWaveformEffectSequenceLoopCount;
 exports.MaxVibrationWaveformSegmentDuration = MaxVibrationWaveformSegmentDuration;
 exports.MinNameLength = MinNameLength;
+exports.RangeHelper = RangeHelper;
 exports.Scanner = scanner$1;
 exports.SensorRateStep = SensorRateStep;
 exports.SensorTypes = SensorTypes;