buttplug 3.0.0-alpha.1 → 3.0.0-alpha.3

package/.eslintrc.js

@@ -0,0 +1,20 @@
+module.exports = {
+  env: {
+    browser: true,
+    es2021: true,
+    node: true,
+  },
+  extends: [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "./node_modules/gts",
+  ],
+  overrides: [],
+  parser: "@typescript-eslint/parser",
+  parserOptions: {
+    ecmaVersion: "latest",
+    sourceType: "module",
+  },
+  plugins: ["@typescript-eslint"],
+  rules: {},
+};

package/.prettierrc.json

@@ -0,0 +1,4 @@
+{
+  "endOfLine": "auto",
+  "singleQuote": true
+}

package/dist/main/src/client/ButtplugBrowserWebsocketClientConnector.d.ts

@@ -5,9 +5,9 @@
  *
  * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
  */
-import { IButtplugClientConnector } from "./IButtplugClientConnector";
-import { ButtplugMessage } from "../core/Messages";
-import { ButtplugBrowserWebsocketConnector } from "../utils/ButtplugBrowserWebsocketConnector";
+import { IButtplugClientConnector } from './IButtplugClientConnector';
+import { ButtplugMessage } from '../core/Messages';
+import { ButtplugBrowserWebsocketConnector } from '../utils/ButtplugBrowserWebsocketConnector';
 export declare class ButtplugBrowserWebsocketClientConnector extends ButtplugBrowserWebsocketConnector implements IButtplugClientConnector {
     private _sorter;
     protected _ws: WebSocket | undefined;

package/dist/main/src/client/ButtplugBrowserWebsocketClientConnector.js

@@ -5,7 +5,7 @@
  *
  * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
  */
-"use strict";
+'use strict';
 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) {
@@ -26,21 +26,23 @@ class ButtplugBrowserWebsocketClientConnector extends ButtplugBrowserWebsocketCo
         this._sorter = new ButtplugMessageSorter_1.ButtplugMessageSorter(true);
         this.Send = (msg) => __awaiter(this, void 0, void 0, function* () {
             if (!this.Connected) {
-                throw new Error("ButtplugClient not connected");
+                throw new Error('ButtplugClient not connected');
             }
             const p = this._sorter.PrepareOutgoingMessage(msg);
             this.SendMessage(msg);
             return yield p;
         });
         this.ParseIncomingMessage = (event) => {
-            if (typeof (event.data) === "string") {
+            if (typeof event.data === 'string') {
                 const msgs = (0, MessageUtils_1.FromJSON)(event.data);
                 const emitMsgs = this._sorter.ParseIncomingMessages(msgs);
-                this.emit("message", emitMsgs);
+                this.emit('message', emitMsgs);
             }
             else if (event.data instanceof Blob) {
                 const reader = new FileReader();
-                reader.addEventListener("load", (ev) => { this.OnReaderLoad(ev); });
+                reader.addEventListener('load', (ev) => {
+                    this.OnReaderLoad(ev);
+                });
                 reader.readAsText(event.data);
             }
         };
@@ -51,7 +53,7 @@ class ButtplugBrowserWebsocketClientConnector extends ButtplugBrowserWebsocketCo
     OnReaderLoad(event) {
         const msgs = (0, MessageUtils_1.FromJSON)(event.target.result);
         const emitMsgs = this._sorter.ParseIncomingMessages(msgs);
-        this.emit("message", emitMsgs);
+        this.emit('message', emitMsgs);
     }
 }
 exports.ButtplugBrowserWebsocketClientConnector = ButtplugBrowserWebsocketClientConnector;

package/dist/main/src/client/ButtplugBrowserWebsocketClientConnector.js.map

@@ -1 +1 @@
-{"version":3,"file":"ButtplugBrowserWebsocketClientConnector.js","sourceRoot":"","sources":["../../../../src/client/ButtplugBrowserWebsocketClientConnector.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;;;;;;;;;;;;AAIb,uDAAgD;AAChD,0EAAuE;AACvE,kGAA+F;AAE/F,MAAa,uCAAwC,SAAQ,qEAAiC;IAK5F,YAAmB,IAAY;QAC7B,KAAK,CAAC,IAAI,CAAC,CAAC;QAJN,YAAO,GAA0B,IAAI,6CAAqB,CAAC,IAAI,CAAC,CAAC;QAWlE,SAAI,GAAG,CAAO,GAAoB,EAA4B,EAAE;YACrE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACnB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACjD;YACD,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;YACnD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,MAAM,CAAC,CAAC;QACjB,CAAC,CAAA,CAAA;QAES,yBAAoB,GAAG,CAAC,KAAmB,EAAE,EAAE;YACvD,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,QAAQ,EAAE;gBACpC,MAAM,IAAI,GAAG,IAAA,uBAAQ,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;gBAC1D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;aAChC;iBAAM,IAAI,KAAK,CAAC,IAAI,YAAY,IAAI,EAAE;gBACrC,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;gBAChC,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACpE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC/B;QACH,CAAC,CAAA;IAzBD,CAAC;IAED,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC;IAChC,CAAC;IAuBS,YAAY,CAAC,KAAY;QACjC,MAAM,IAAI,GAAG,IAAA,uBAAQ,EAAE,KAAK,CAAC,MAAqB,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACjC,CAAC;CACF;AAvCD,0FAuCC"}
+{"version":3,"file":"ButtplugBrowserWebsocketClientConnector.js","sourceRoot":"","sources":["../../../../src/client/ButtplugBrowserWebsocketClientConnector.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;;;;;;;;;;;;AAIb,uDAAgD;AAChD,0EAAuE;AACvE,kGAA+F;AAE/F,MAAa,uCACX,SAAQ,qEAAiC;IAMzC,YAAmB,IAAY;QAC7B,KAAK,CAAC,IAAI,CAAC,CAAC;QAJN,YAAO,GAA0B,IAAI,6CAAqB,CAAC,IAAI,CAAC,CAAC;QAWlE,SAAI,GAAG,CAAO,GAAoB,EAA4B,EAAE;YACrE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACnB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACjD;YACD,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;YACnD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,MAAM,CAAC,CAAC;QACjB,CAAC,CAAA,CAAC;QAEQ,yBAAoB,GAAG,CAAC,KAAmB,EAAE,EAAE;YACvD,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAClC,MAAM,IAAI,GAAG,IAAA,uBAAQ,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;gBAC1D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;aAChC;iBAAM,IAAI,KAAK,CAAC,IAAI,YAAY,IAAI,EAAE;gBACrC,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;gBAChC,MAAM,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE;oBACrC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;gBACxB,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAC/B;QACH,CAAC,CAAC;IA3BF,CAAC;IAED,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC;IAChC,CAAC;IAyBS,YAAY,CAAC,KAAY;QACjC,MAAM,IAAI,GAAG,IAAA,uBAAQ,EAAE,KAAK,CAAC,MAAqB,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACjC,CAAC;CACF;AA3CD,0FA2CC"}

package/dist/main/src/client/ButtplugClientConnectorException.d.ts

@@ -5,7 +5,7 @@
  *
  * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
  */
-import { ButtplugException } from "../core/Exceptions";
+import { ButtplugException } from '../core/Exceptions';
 export declare class ButtplugClientConnectorException extends ButtplugException {
     constructor(message: string);
 }

package/dist/main/src/client/ButtplugClientDevice.d.ts

@@ -6,8 +6,8 @@
  * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
  */
 /// <reference types="node" />
-import * as Messages from "../core/Messages";
-import { EventEmitter } from "events";
+import * as Messages from '../core/Messages';
+import { EventEmitter } from 'events';
 /**
  * Represents an abstract device, capable of taking certain kinds of messages.
  */
@@ -17,23 +17,23 @@ export declare class ButtplugClientDevice extends EventEmitter {
     /**
      * Return the name of the device.
      */
-    get Name(): string;
+    get name(): string;
     /**
      * Return the user set name of the device.
      */
-    get DisplayName(): string | undefined;
+    get displayName(): string | undefined;
     /**
      * Return the index of the device.
      */
-    get Index(): number;
+    get index(): number;
     /**
      * Return the index of the device.
      */
-    get MessageTimingGap(): number | undefined;
+    get messageTimingGap(): number | undefined;
     /**
      * Return a list of message types the device accepts.
      */
-    get AllowedMessages(): Messages.MessageAttributes;
+    get messageAttributes(): Messages.MessageAttributes;
     static fromMsg(msg: Messages.DeviceInfo, sendClosure: (device: ButtplugClientDevice, msg: Messages.ButtplugDeviceMessage) => Promise<Messages.ButtplugMessage>): ButtplugClientDevice;
     private allowedMsgs;
     /**
@@ -46,9 +46,13 @@ export declare class ButtplugClientDevice extends EventEmitter {
     sendExpectOk(msg: Messages.ButtplugDeviceMessage): Promise<void>;
     scalar(scalar: Messages.ScalarSubcommand | Messages.ScalarSubcommand[]): Promise<void>;
     private scalarCommandBuilder;
+    get vibrateAttributes(): Messages.GenericDeviceMessageAttributes[];
     vibrate(speed: number | number[]): Promise<void>;
+    get oscillateAttributes(): Messages.GenericDeviceMessageAttributes[];
     oscillate(speed: number | number[]): Promise<void>;
+    get rotateAttributes(): Messages.GenericDeviceMessageAttributes[];
     rotate(values: number | [number, boolean][], clockwise?: boolean): Promise<void>;
+    get linearAttributes(): Messages.GenericDeviceMessageAttributes[];
     linear(values: number | [number, number][], duration?: number): Promise<void>;
     sensorRead(sensorIndex: number, sensorType: Messages.SensorType): Promise<number[]>;
     battery(): Promise<number>;
@@ -58,5 +62,5 @@ export declare class ButtplugClientDevice extends EventEmitter {
     rawSubscribe(endpoint: string): Promise<void>;
     rawUnsubscribe(endpoint: string): Promise<void>;
     stop(): Promise<void>;
-    EmitDisconnected(): void;
+    emitDisconnected(): void;
 }

package/dist/main/src/client/ButtplugClientDevice.js

@@ -5,7 +5,7 @@
  *
  * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
  */
-"use strict";
+'use strict';
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -50,31 +50,31 @@ class ButtplugClientDevice extends events_1.EventEmitter {
     /**
      * Return the name of the device.
      */
-    get Name() {
+    get name() {
         return this._deviceInfo.DeviceName;
     }
     /**
      * Return the user set name of the device.
      */
-    get DisplayName() {
+    get displayName() {
         return this._deviceInfo.DeviceDisplayName;
     }
     /**
      * Return the index of the device.
      */
-    get Index() {
+    get index() {
         return this._deviceInfo.DeviceIndex;
     }
     /**
      * Return the index of the device.
      */
-    get MessageTimingGap() {
+    get messageTimingGap() {
         return this._deviceInfo.DeviceMessageTimingGap;
     }
     /**
      * Return a list of message types the device accepts.
      */
-    get AllowedMessages() {
+    get messageAttributes() {
         return this._deviceInfo.DeviceMessages;
     }
     static fromMsg(msg, sendClosure) {
@@ -116,22 +116,22 @@ class ButtplugClientDevice extends events_1.EventEmitter {
     scalar(scalar) {
         return __awaiter(this, void 0, void 0, function* () {
             if (Array.isArray(scalar)) {
-                yield this.sendExpectOk(new Messages.ScalarCmd(scalar, this.Index));
+                yield this.sendExpectOk(new Messages.ScalarCmd(scalar, this.index));
             }
             else {
-                yield this.sendExpectOk(new Messages.ScalarCmd([scalar], this.Index));
+                yield this.sendExpectOk(new Messages.ScalarCmd([scalar], this.index));
             }
         });
     }
     scalarCommandBuilder(speed, actuator) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            let scalarAttrs = (_a = this.AllowedMessages.ScalarCmd) === null || _a === void 0 ? void 0 : _a.filter((x) => x.ActuatorType == actuator);
-            if (!scalarAttrs || scalarAttrs.length == 0) {
-                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.Name} has no ${actuator} capabilities`);
+            const scalarAttrs = (_a = this.messageAttributes.ScalarCmd) === null || _a === void 0 ? void 0 : _a.filter((x) => x.ActuatorType === actuator);
+            if (!scalarAttrs || scalarAttrs.length === 0) {
+                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.name} has no ${actuator} capabilities`);
             }
-            let cmds = [];
-            if (typeof (speed) === "number") {
+            const cmds = [];
+            if (typeof speed === 'number') {
                 scalarAttrs.forEach((x) => cmds.push(new Messages.ScalarSubcommand(x.Index, speed, actuator)));
             }
             else if (Array.isArray(speed)) {
@@ -148,57 +148,73 @@ class ButtplugClientDevice extends events_1.EventEmitter {
             yield this.scalar(cmds);
         });
     }
+    get vibrateAttributes() {
+        var _a, _b;
+        return ((_b = (_a = this.messageAttributes.ScalarCmd) === null || _a === void 0 ? void 0 : _a.filter((x) => x.ActuatorType === Messages.ActuatorType.Vibrate)) !== null && _b !== void 0 ? _b : []);
+    }
     vibrate(speed) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.scalarCommandBuilder(speed, Messages.ActuatorType.Vibrate);
         });
     }
+    get oscillateAttributes() {
+        var _a, _b;
+        return ((_b = (_a = this.messageAttributes.ScalarCmd) === null || _a === void 0 ? void 0 : _a.filter((x) => x.ActuatorType === Messages.ActuatorType.Oscillate)) !== null && _b !== void 0 ? _b : []);
+    }
     oscillate(speed) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.scalarCommandBuilder(speed, Messages.ActuatorType.Oscillate);
         });
     }
+    get rotateAttributes() {
+        var _a;
+        return (_a = this.messageAttributes.RotateCmd) !== null && _a !== void 0 ? _a : [];
+    }
     rotate(values, clockwise) {
         return __awaiter(this, void 0, void 0, function* () {
-            let rotateAttrs = this.AllowedMessages.RotateCmd;
-            if (!rotateAttrs || rotateAttrs.length == 0) {
-                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.Name} has no Rotate capabilities`);
+            const rotateAttrs = this.messageAttributes.RotateCmd;
+            if (!rotateAttrs || rotateAttrs.length === 0) {
+                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.name} has no Rotate capabilities`);
             }
             let msg;
-            if (typeof (values) === "number") {
-                msg = Messages.RotateCmd.Create(this.Index, new Array(rotateAttrs.length).fill([values, clockwise]));
+            if (typeof values === 'number') {
+                msg = Messages.RotateCmd.Create(this.index, new Array(rotateAttrs.length).fill([values, clockwise]));
             }
             else if (Array.isArray(values)) {
-                msg = Messages.RotateCmd.Create(this.Index, values);
+                msg = Messages.RotateCmd.Create(this.index, values);
             }
             else {
-                throw new Exceptions_1.ButtplugDeviceException("SendRotateCmd can only take a number and boolean, or an array of number/boolean tuples");
+                throw new Exceptions_1.ButtplugDeviceException('SendRotateCmd can only take a number and boolean, or an array of number/boolean tuples');
             }
             yield this.sendExpectOk(msg);
         });
     }
+    get linearAttributes() {
+        var _a;
+        return (_a = this.messageAttributes.RotateCmd) !== null && _a !== void 0 ? _a : [];
+    }
     linear(values, duration) {
         return __awaiter(this, void 0, void 0, function* () {
-            let linearAttrs = this.AllowedMessages.LinearCmd;
-            if (!linearAttrs || linearAttrs.length == 0) {
-                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.Name} has no Linear capabilities`);
+            const linearAttrs = this.messageAttributes.LinearCmd;
+            if (!linearAttrs || linearAttrs.length === 0) {
+                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.name} has no Linear capabilities`);
             }
             let msg;
-            if (typeof (values) === "number") {
-                msg = Messages.LinearCmd.Create(this.Index, new Array(linearAttrs.length).fill([values, duration]));
+            if (typeof values === 'number') {
+                msg = Messages.LinearCmd.Create(this.index, new Array(linearAttrs.length).fill([values, duration]));
             }
             else if (Array.isArray(values)) {
-                msg = Messages.LinearCmd.Create(this.Index, values);
+                msg = Messages.LinearCmd.Create(this.index, values);
             }
             else {
-                throw new Exceptions_1.ButtplugDeviceException("SendLinearCmd can only take a number and number, or an array of number/number tuples");
+                throw new Exceptions_1.ButtplugDeviceException('SendLinearCmd can only take a number and number, or an array of number/number tuples');
             }
             yield this.sendExpectOk(msg);
         });
     }
     sensorRead(sensorIndex, sensorType) {
         return __awaiter(this, void 0, void 0, function* () {
-            let response = yield this.send(new Messages.SensorReadCmd(this.Index, sensorIndex, sensorType));
+            const response = yield this.send(new Messages.SensorReadCmd(this.index, sensorIndex, sensorType));
             switch (response.constructor) {
                 case Messages.SensorReading:
                     return response.Data;
@@ -212,36 +228,36 @@ class ButtplugClientDevice extends events_1.EventEmitter {
     battery() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            let batteryAttrs = (_a = this.AllowedMessages.SensorReadCmd) === null || _a === void 0 ? void 0 : _a.filter((x) => x.SensorType == Messages.SensorType.Battery);
-            if (!batteryAttrs || batteryAttrs.length == 0) {
-                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.Name} has no Battery capabilities`);
+            const batteryAttrs = (_a = this.messageAttributes.SensorReadCmd) === null || _a === void 0 ? void 0 : _a.filter((x) => x.SensorType === Messages.SensorType.Battery);
+            if (!batteryAttrs || batteryAttrs.length === 0) {
+                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.name} has no Battery capabilities`);
             }
             // Find the battery sensor, we'll need its index.
-            let result = yield this.sensorRead(batteryAttrs[0].Index, Messages.SensorType.Battery);
+            const result = yield this.sensorRead(batteryAttrs[0].Index, Messages.SensorType.Battery);
             return result[0] / 100.0;
         });
     }
     rssi() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            let rssiAttrs = (_a = this.AllowedMessages.SensorReadCmd) === null || _a === void 0 ? void 0 : _a.filter((x) => x.SensorType == Messages.SensorType.RSSI);
-            if (!rssiAttrs || rssiAttrs.length == 0) {
-                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.Name} has no RSSI capabilities`);
+            const rssiAttrs = (_a = this.messageAttributes.SensorReadCmd) === null || _a === void 0 ? void 0 : _a.filter((x) => x.SensorType === Messages.SensorType.RSSI);
+            if (!rssiAttrs || rssiAttrs.length === 0) {
+                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.name} has no RSSI capabilities`);
             }
             // Find the battery sensor, we'll need its index.
-            let result = yield this.sensorRead(rssiAttrs[0].Index, Messages.SensorType.RSSI);
+            const result = yield this.sensorRead(rssiAttrs[0].Index, Messages.SensorType.RSSI);
             return result[0];
         });
     }
     rawRead(endpoint, expectedLength, timeout) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.AllowedMessages.RawReadCmd) {
-                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.Name} has no raw read capabilities`);
+            if (!this.messageAttributes.RawReadCmd) {
+                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.name} has no raw read capabilities`);
             }
-            if (this.AllowedMessages.RawReadCmd.Endpoints.indexOf(endpoint) == -1) {
-                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.Name} has no raw readable endpoint ${endpoint}`);
+            if (this.messageAttributes.RawReadCmd.Endpoints.indexOf(endpoint) === -1) {
+                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.name} has no raw readable endpoint ${endpoint}`);
             }
-            let response = yield this.send(new Messages.RawReadCmd(this.Index, endpoint, expectedLength, timeout));
+            const response = yield this.send(new Messages.RawReadCmd(this.index, endpoint, expectedLength, timeout));
             switch (response.constructor) {
                 case Messages.RawReading:
                     return new Uint8Array(response.Data);
@@ -254,45 +270,45 @@ class ButtplugClientDevice extends events_1.EventEmitter {
     }
     rawWrite(endpoint, data, writeWithResponse) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.AllowedMessages.RawWriteCmd) {
-                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.Name} has no raw write capabilities`);
+            if (!this.messageAttributes.RawWriteCmd) {
+                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.name} has no raw write capabilities`);
             }
-            if (this.AllowedMessages.RawWriteCmd.Endpoints.indexOf(endpoint) == -1) {
-                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.Name} has no raw writable endpoint ${endpoint}`);
+            if (this.messageAttributes.RawWriteCmd.Endpoints.indexOf(endpoint) === -1) {
+                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.name} has no raw writable endpoint ${endpoint}`);
             }
-            yield this.sendExpectOk(new Messages.RawWriteCmd(this.Index, endpoint, data, writeWithResponse));
+            yield this.sendExpectOk(new Messages.RawWriteCmd(this.index, endpoint, data, writeWithResponse));
         });
     }
     rawSubscribe(endpoint) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.AllowedMessages.RawSubscribeCmd) {
-                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.Name} has no raw subscribe capabilities`);
+            if (!this.messageAttributes.RawSubscribeCmd) {
+                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.name} has no raw subscribe capabilities`);
             }
-            if (this.AllowedMessages.RawSubscribeCmd.Endpoints.indexOf(endpoint) == -1) {
-                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.Name} has no raw subscribable endpoint ${endpoint}`);
+            if (this.messageAttributes.RawSubscribeCmd.Endpoints.indexOf(endpoint) === -1) {
+                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.name} has no raw subscribable endpoint ${endpoint}`);
             }
-            yield this.sendExpectOk(new Messages.RawSubscribeCmd(this.Index, endpoint));
+            yield this.sendExpectOk(new Messages.RawSubscribeCmd(this.index, endpoint));
         });
     }
     rawUnsubscribe(endpoint) {
         return __awaiter(this, void 0, void 0, function* () {
             // This reuses raw subscribe's info.
-            if (!this.AllowedMessages.RawSubscribeCmd) {
-                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.Name} has no raw unsubscribe capabilities`);
+            if (!this.messageAttributes.RawSubscribeCmd) {
+                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.name} has no raw unsubscribe capabilities`);
             }
-            if (this.AllowedMessages.RawSubscribeCmd.Endpoints.indexOf(endpoint) == -1) {
-                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.Name} has no raw unsubscribable endpoint ${endpoint}`);
+            if (this.messageAttributes.RawSubscribeCmd.Endpoints.indexOf(endpoint) === -1) {
+                throw new Exceptions_1.ButtplugDeviceException(`Device ${this.name} has no raw unsubscribable endpoint ${endpoint}`);
             }
-            yield this.sendExpectOk(new Messages.RawUnsubscribeCmd(this.Index, endpoint));
+            yield this.sendExpectOk(new Messages.RawUnsubscribeCmd(this.index, endpoint));
         });
     }
     stop() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.sendExpectOk(new Messages.StopDeviceCmd(this.Index));
+            yield this.sendExpectOk(new Messages.StopDeviceCmd(this.index));
         });
     }
-    EmitDisconnected() {
-        this.emit("deviceremoved");
+    emitDisconnected() {
+        this.emit('deviceremoved');
     }
 }
 exports.ButtplugClientDevice = ButtplugClientDevice;

package/dist/main/src/client/ButtplugClientDevice.js.map

@@ -1 +1 @@
-{"version":3,"file":"ButtplugClientDevice.js","sourceRoot":"","sources":["../../../../src/client/ButtplugClientDevice.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ButtplugClientDevice.js","sourceRoot":"","sources":["../../../../src/client/ButtplugClientDevice.ts"],"names":[],"mappings":"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"}

package/dist/main/src/client/Client.d.ts

@@ -7,11 +7,11 @@
  */
 /// <reference types="node" />
 /// <reference types="node" />
-import { ButtplugLogger } from "../core/Logging";
-import { EventEmitter } from "events";
-import { ButtplugClientDevice } from "./ButtplugClientDevice";
-import { IButtplugClientConnector } from "./IButtplugClientConnector";
-import * as Messages from "../core/Messages";
+import { ButtplugLogger } from '../core/Logging';
+import { EventEmitter } from 'events';
+import { ButtplugClientDevice } from './ButtplugClientDevice';
+import { IButtplugClientConnector } from './IButtplugClientConnector';
+import * as Messages from '../core/Messages';
 export declare class ButtplugClient extends EventEmitter {
     protected _pingTimer: NodeJS.Timeout | null;
     protected _connector: IButtplugClientConnector | null;
@@ -20,10 +20,9 @@ export declare class ButtplugClient extends EventEmitter {
     protected _logger: ButtplugLogger;
     protected _isScanning: boolean;
     constructor(clientName?: string);
-    get Connector(): IButtplugClientConnector | null;
-    get Connected(): boolean;
-    get Devices(): ButtplugClientDevice[];
-    get IsScanning(): boolean;
+    get connected(): boolean;
+    get devices(): ButtplugClientDevice[];
+    get isScanning(): boolean;
     connect: (connector: IButtplugClientConnector) => Promise<void>;
     disconnect: () => Promise<void>;
     startScanning: () => Promise<void>;
@@ -35,7 +34,7 @@ export declare class ButtplugClient extends EventEmitter {
     protected initializeConnection: () => Promise<boolean>;
     protected requestDeviceList: () => Promise<void>;
     protected shutdownConnection: () => Promise<void>;
-    protected SendMessage(msg: Messages.ButtplugMessage): Promise<Messages.ButtplugMessage>;
+    protected sendMessage(msg: Messages.ButtplugMessage): Promise<Messages.ButtplugMessage>;
     protected checkConnector(): void;
     protected sendMsgExpectOk: (msg: Messages.ButtplugMessage) => Promise<void>;
     protected sendDeviceMessageClosure: (device: ButtplugClientDevice, msg: Messages.ButtplugDeviceMessage) => Promise<Messages.ButtplugMessage>;