buttplug 3.0.0-alpha.5 → 3.1.0

package/.eslintrc.js

@@ -1,20 +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: {},
-};
+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/.github/workflows/docs.yaml

@@ -0,0 +1,29 @@
+name: Doc Build
+
+on: 
+  push:
+    branches:
+      - master
+
+jobs:
+  publish-docs:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set Node.js 18.x
+      uses: actions/setup-node@v3
+      with:
+        node-version: 18.x
+    - name: Run install
+      uses: borales/actions-yarn@v4
+      with:
+        cmd: install # will run `yarn install` command
+    - name: Build production bundle
+      uses: borales/actions-yarn@v4
+      with:
+        cmd: build:doc
+    - name: Deploy
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_dir: doc/

package/CHANGELOG.md

@@ -1,12 +1,32 @@
-# v3.0.0 (2022/12/28)
+# v3.1.0 (2023/02/11)
+
+## Features
+
+- Added support for Node Websockets via new connector class (#244)
+
+## Bugfixes
+
+- Fixed issues with using buttplug-js in minified projects (#246)
+  - Changed from type-based class resolution to static naming, class name mangling should no longer
+    be an issue.
+
+# v3.0.0 (2022/12/30)
+
+## Features
 
 - Back to pure Typescript. Back to the good shit.
+- Removed server
+- Brought implementation in line with the FFI Client API, so minimal changes should be needed for
+  porting from v1.
 
 # v2.0.0
 
+## Whatever
+
 - There is no buttplug-js v2
 - There is no Miss Zarves
-- (Version skipped to align JS and C# implementation versions)
+- (Version skipped to align JS and C# implementation versions, which will probably fall out of
+  alignment again very quickly)
 
 # v1.0.16 (2021/10/16) (FFI Impl)
 

package/README.md

@@ -12,7 +12,18 @@ the Version 3 Buttplug Spec. It is expected to run from a browser against either
 (GUI)](https://intiface.com/central) or [Initface Engine
 (CLI)](https://github.com/intiface/intiface-engine). No Rust FFI bindings are required.
 
-## What happened? Why is buttplug-csharp back?
+
+## Using buttplug-js with Node
+
+buttplug-js works with both pure web builds, as well as node applications. To use buttplug-js with node, use the `ButtplugNodeWebsocketClientConnector` class instead of the `ButtplugBrowserWebsocketClientConnector` class. That should be the only change needed, all of the API stays the same. See the Documentation section for more info.
+
+## Documentation
+
+Documentation on how to use Buttplug in general, as well as examples for buttplug-js, can be found in the [Buttplug Developer Guide](https://docs.buttplug.io/docs/dev-guide).
+
+API documentation for buttplug-js can be found at https://buttplugio.github.io/buttplug-js.
+
+## What happened? Why is buttplug-js back?
 
 For those of you that have been around a while, you may remember that this used to be the main
 Typescript/Javascript implementation. From 2017 to 2020, it was a reference version of the Buttplug
@@ -31,3 +42,58 @@ and server to use the FFI was overkill, and caused many extremely difficult-to-d
 that in mind, the Typescript implementation in this repo is being turned into a Client only. The
 WASM server and Embedded Connector will stay in the FFI repo, but will be another NPM package that
 will be optional.
+
+## Contributing
+
+If you have issues or feature requests, [please feel free to file an issue on this repo](issues/).
+
+We are not looking for code contributions or pull requests at this time, and will not accept pull
+requests that do not have a matching issue where the matter was previously discussed. Pull requests
+should only be submitted after talking to [qdot](https://github.com/qdot) via issues on this repo
+(or on [discourse](https://discuss.buttplug.io) or [discord](https://discord.buttplug.io) if you
+would like to stay anonymous and out of recorded info on the repo) before submitting PRs. Random PRs
+without matching issues and discussion are likely to be closed without merging. and receiving
+approval to develop code based on an issue. Any random or non-issue pull requests will most likely
+be closed without merging.
+
+If you'd like to contribute in a non-technical way, we need money to keep up with supporting the
+latest and greatest hardware. We have multiple ways to donate!
+
+- [Patreon](https://patreon.com/qdot)
+- [Github Sponsors](https://github.com/sponsors/qdot)
+- [Ko-Fi](https://ko-fi.com/qdot76367)
+
+## License
+
+This project is BSD 3-Clause licensed.
+
+```text
+
+Copyright (c) 2016-2023, Nonpolynomial, LLC
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of buttplug nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+```

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

@@ -10,9 +10,6 @@ import { ButtplugMessage } from '../core/Messages';
 import { ButtplugBrowserWebsocketConnector } from '../utils/ButtplugBrowserWebsocketConnector';
 export declare class ButtplugBrowserWebsocketClientConnector extends ButtplugBrowserWebsocketConnector implements IButtplugClientConnector {
     private _sorter;
-    protected _ws: WebSocket | undefined;
-    constructor(_url: string);
-    get Connected(): boolean;
     Send: (msg: ButtplugMessage) => Promise<ButtplugMessage>;
     protected ParseIncomingMessage: (event: MessageEvent) => void;
     protected OnReaderLoad(event: Event): void;

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

@@ -21,8 +21,8 @@ const MessageUtils_1 = require("../core/MessageUtils");
 const ButtplugMessageSorter_1 = require("../utils/ButtplugMessageSorter");
 const ButtplugBrowserWebsocketConnector_1 = require("../utils/ButtplugBrowserWebsocketConnector");
 class ButtplugBrowserWebsocketClientConnector extends ButtplugBrowserWebsocketConnector_1.ButtplugBrowserWebsocketConnector {
-    constructor(_url) {
-        super(_url);
+    constructor() {
+        super(...arguments);
         this._sorter = new ButtplugMessageSorter_1.ButtplugMessageSorter(true);
         this.Send = (msg) => __awaiter(this, void 0, void 0, function* () {
             if (!this.Connected) {
@@ -33,13 +33,14 @@ class ButtplugBrowserWebsocketClientConnector extends ButtplugBrowserWebsocketCo
             return yield p;
         });
         this.ParseIncomingMessage = (event) => {
+            var _a;
             if (typeof event.data === 'string') {
                 const msgs = (0, MessageUtils_1.FromJSON)(event.data);
                 const emitMsgs = this._sorter.ParseIncomingMessages(msgs);
                 this.emit('message', emitMsgs);
             }
             else if (event.data instanceof Blob) {
-                const reader = new FileReader();
+                const reader = new ((_a = this._filereaderConstructor) !== null && _a !== void 0 ? _a : FileReader)();
                 reader.addEventListener('load', (ev) => {
                     this.OnReaderLoad(ev);
                 });
@@ -47,9 +48,6 @@ class ButtplugBrowserWebsocketClientConnector extends ButtplugBrowserWebsocketCo
             }
         };
     }
-    get Connected() {
-        return this._ws !== undefined;
-    }
     OnReaderLoad(event) {
         const msgs = (0, MessageUtils_1.FromJSON)(event.target.result);
         const emitMsgs = this._sorter.ParseIncomingMessages(msgs);

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,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"}
+{"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;IAD3C;;QAIU,YAAO,GAA0B,IAAI,6CAAqB,CAAC,IAAI,CAAC,CAAC;QAElE,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,CAAC,MAAA,IAAI,CAAC,sBAAsB,mCAAI,UAAU,CAAC,EAAE,CAAC;gBACjE,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;IAOJ,CAAC;IALW,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;AAlCD,0FAkCC"}

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

@@ -0,0 +1,19 @@
+/*!
+ * Buttplug JS Source Code File - Visit https://buttplug.io for more info about
+ * the project. Licensed under the BSD 3-Clause license. See LICENSE file in the
+ * project root for full license information.
+ *
+ * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
+ */
+import { ButtplugBrowserWebsocketClientConnector } from './ButtplugBrowserWebsocketClientConnector';
+export declare class ButtplugNodeWebsocketClientConnector extends ButtplugBrowserWebsocketClientConnector {
+    protected _websocketConstructor: {
+        new (url: string | URL, protocols?: string | string[] | undefined): WebSocket;
+        prototype: WebSocket;
+        readonly CLOSED: number;
+        readonly CLOSING: number;
+        readonly CONNECTING: number;
+        readonly OPEN: number;
+    };
+    protected _filereaderConstructor: any;
+}

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

@@ -0,0 +1,22 @@
+/*!
+ * Buttplug JS Source Code File - Visit https://buttplug.io for more info about
+ * the project. Licensed under the BSD 3-Clause license. See LICENSE file in the
+ * project root for full license information.
+ *
+ * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
+ */
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ButtplugNodeWebsocketClientConnector = void 0;
+const ButtplugBrowserWebsocketClientConnector_1 = require("./ButtplugBrowserWebsocketClientConnector");
+const ws_1 = require("ws");
+const filereader_1 = require("filereader");
+class ButtplugNodeWebsocketClientConnector extends ButtplugBrowserWebsocketClientConnector_1.ButtplugBrowserWebsocketClientConnector {
+    constructor() {
+        super(...arguments);
+        this._websocketConstructor = ws_1.WebSocket;
+        this._filereaderConstructor = filereader_1.FileReader;
+    }
+}
+exports.ButtplugNodeWebsocketClientConnector = ButtplugNodeWebsocketClientConnector;
+//# sourceMappingURL=ButtplugNodeWebsocketClientConnector.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"ButtplugNodeWebsocketClientConnector.js","sourceRoot":"","sources":["../../../../src/client/ButtplugNodeWebsocketClientConnector.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;;;AAEb,uGAAoG;AACpG,2BAAgD;AAChD,2CAAwC;AAExC,MAAa,oCAAqC,SAAQ,iFAAuC;IAAjG;;QACY,0BAAqB,GAC7B,cAA4C,CAAC;QACrC,2BAAsB,GAAG,uBAAU,CAAC;IAChD,CAAC;CAAA;AAJD,oFAIC"}

package/dist/main/src/core/MessageUtils.js

@@ -33,18 +33,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FromJSON = void 0;
 const class_transformer_1 = require("class-transformer");
 const Messages = __importStar(require("./Messages"));
+function getMessageClass(type) {
+    for (const value of Object.values(Messages)) {
+        if (typeof value === 'function' && 'Name' in value && value.Name === type) {
+            return value;
+        }
+    }
+    return null;
+}
 function FromJSON(str) {
     const msgarray = JSON.parse(str);
     const msgs = [];
     for (const x of Array.from(msgarray)) {
-        // Can't get this to resolve nicely as a type, so just start from any and cast
-        // after. Not sure how to resolve plainToClass to a type since this is
-        // dynamic.
-        //
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const msg = (0, class_transformer_1.plainToInstance)(Messages[Object.getOwnPropertyNames(x)[0]], x[Object.getOwnPropertyNames(x)[0]]);
-        msg.update();
-        msgs.push(msg);
+        const type = Object.getOwnPropertyNames(x)[0];
+        const cls = getMessageClass(type);
+        if (cls) {
+            const msg = (0, class_transformer_1.plainToInstance)(cls, x[type]);
+            msg.update();
+            msgs.push(msg);
+        }
     }
     return msgs;
 }

package/dist/main/src/core/MessageUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"MessageUtils.js","sourceRoot":"","sources":["../../../../src/core/MessageUtils.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;AACb,yDAAoD;AACpD,qDAAuC;AAEvC,SAAgB,QAAQ,CAAC,GAAG;IAC1B,MAAM,QAAQ,GAAa,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,IAAI,GAA+B,EAAE,CAAC;IAC5C,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QACpC,8EAA8E;QAC9E,sEAAsE;QACtE,WAAW;QACX,EAAE;QACF,8DAA8D;QAC9D,MAAM,GAAG,GAAQ,IAAA,mCAAe,EAC9B,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC1C,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACpC,CAAC;QACD,GAAgC,CAAC,MAAM,EAAE,CAAC;QAC3C,IAAI,CAAC,IAAI,CAAC,GAA+B,CAAC,CAAC;KAC5C;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAjBD,4BAiBC"}
+{"version":3,"file":"MessageUtils.js","sourceRoot":"","sources":["../../../../src/core/MessageUtils.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;AACb,yDAAoD;AACpD,qDAAuC;AAEvC,SAAS,eAAe,CACtB,IAAY;IAEZ,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QAC3C,IAAI,OAAO,KAAK,KAAK,UAAU,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE;YACzE,OAAO,KAAK,CAAC;SACd;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,QAAQ,CAAC,GAAG;IAC1B,MAAM,QAAQ,GAAa,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,IAAI,GAA+B,EAAE,CAAC;IAC5C,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QACpC,MAAM,IAAI,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,MAAM,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,GAAG,IAAA,mCAAe,EACzB,GAAG,EACH,CAAC,CAAC,IAAI,CAAC,CACR,CAAC;YACF,GAAG,CAAC,MAAM,EAAE,CAAC;YACb,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAChB;KACF;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAhBD,4BAgBC"}

package/dist/main/src/core/Messages.d.ts

@@ -60,15 +60,6 @@ export declare class SensorDeviceMessageAttributes {
 export declare abstract class ButtplugMessage {
     Id: number;
     constructor(Id: number);
-    /***
-     * Returns the message type name
-     *
-     * Usually, the message type name will be the same as the message class
-     * constructor, so the constructor name is used by default. However, in
-     * instances where a message has different versions (i.e. DeviceAddedVersion0
-     * and DeviceAddedVersion1), we will need to override this to set the message
-     * name.
-     */
     get Type(): Function;
     toJSON(): string;
     toProtocolFormat(): object;
@@ -85,10 +76,12 @@ export declare abstract class ButtplugSystemMessage extends ButtplugMessage {
 }
 export declare class Ok extends ButtplugSystemMessage {
     Id: number;
+    static Name: string;
     constructor(Id?: number);
 }
 export declare class Ping extends ButtplugMessage {
     Id: number;
+    static Name: string;
     constructor(Id?: number);
 }
 export declare enum ErrorClass {
@@ -102,6 +95,7 @@ export declare class Error extends ButtplugMessage {
     ErrorMessage: string;
     ErrorCode: ErrorClass;
     Id: number;
+    static Name: string;
     constructor(ErrorMessage: string, ErrorCode?: ErrorClass, Id?: number);
     get Schemversion(): number;
 }
@@ -114,12 +108,14 @@ export declare class DeviceInfo {
     constructor(data: Partial<DeviceInfo>);
 }
 export declare class DeviceList extends ButtplugMessage {
+    static Name: string;
     Devices: DeviceInfo[];
     Id: number;
     constructor(devices: DeviceInfo[], id?: number);
     update(): void;
 }
 export declare class DeviceAdded extends ButtplugSystemMessage {
+    static Name: string;
     DeviceIndex: number;
     DeviceName: string;
     DeviceMessages: MessageAttributes;
@@ -130,27 +126,33 @@ export declare class DeviceAdded extends ButtplugSystemMessage {
 }
 export declare class DeviceRemoved extends ButtplugSystemMessage {
     DeviceIndex: number;
+    static Name: string;
     constructor(DeviceIndex: number);
 }
 export declare class RequestDeviceList extends ButtplugMessage {
     Id: number;
+    static Name: string;
     constructor(Id?: number);
 }
 export declare class StartScanning extends ButtplugMessage {
     Id: number;
+    static Name: string;
     constructor(Id?: number);
 }
 export declare class StopScanning extends ButtplugMessage {
     Id: number;
+    static Name: string;
     constructor(Id?: number);
 }
 export declare class ScanningFinished extends ButtplugSystemMessage {
+    static Name: string;
     constructor();
 }
 export declare class RequestServerInfo extends ButtplugMessage {
     ClientName: string;
     MessageVersion: number;
     Id: number;
+    static Name: string;
     constructor(ClientName: string, MessageVersion?: number, Id?: number);
 }
 export declare class ServerInfo extends ButtplugSystemMessage {
@@ -158,15 +160,18 @@ export declare class ServerInfo extends ButtplugSystemMessage {
     MaxPingTime: number;
     ServerName: string;
     Id: number;
+    static Name: string;
     constructor(MessageVersion: number, MaxPingTime: number, ServerName: string, Id?: number);
 }
 export declare class StopDeviceCmd extends ButtplugDeviceMessage {
     DeviceIndex: number;
     Id: number;
+    static Name: string;
     constructor(DeviceIndex?: number, Id?: number);
 }
 export declare class StopAllDevices extends ButtplugMessage {
     Id: number;
+    static Name: string;
     constructor(Id?: number);
 }
 export declare class GenericMessageSubcommand {
@@ -182,6 +187,7 @@ export declare class ScalarCmd extends ButtplugDeviceMessage {
     Scalars: ScalarSubcommand[];
     DeviceIndex: number;
     Id: number;
+    static Name: string;
     constructor(Scalars: ScalarSubcommand[], DeviceIndex?: number, Id?: number);
 }
 export declare class RotateSubcommand extends GenericMessageSubcommand {
@@ -193,6 +199,7 @@ export declare class RotateCmd extends ButtplugDeviceMessage {
     Rotations: RotateSubcommand[];
     DeviceIndex: number;
     Id: number;
+    static Name: string;
     static Create(deviceIndex: number, commands: [number, boolean][]): RotateCmd;
     constructor(Rotations: RotateSubcommand[], DeviceIndex?: number, Id?: number);
 }
@@ -205,6 +212,7 @@ export declare class LinearCmd extends ButtplugDeviceMessage {
     Vectors: VectorSubcommand[];
     DeviceIndex: number;
     Id: number;
+    static Name: string;
     static Create(deviceIndex: number, commands: [number, number][]): LinearCmd;
     constructor(Vectors: VectorSubcommand[], DeviceIndex?: number, Id?: number);
 }
@@ -213,6 +221,7 @@ export declare class SensorReadCmd extends ButtplugDeviceMessage {
     SensorIndex: number;
     SensorType: SensorType;
     Id: number;
+    static Name: string;
     constructor(DeviceIndex: number, SensorIndex: number, SensorType: SensorType, Id?: number);
 }
 export declare class SensorReading extends ButtplugDeviceMessage {
@@ -221,6 +230,7 @@ export declare class SensorReading extends ButtplugDeviceMessage {
     SensorType: SensorType;
     Data: number[];
     Id: number;
+    static Name: string;
     constructor(DeviceIndex: number, SensorIndex: number, SensorType: SensorType, Data: number[], Id?: number);
 }
 export declare class RawReadCmd extends ButtplugDeviceMessage {
@@ -229,6 +239,7 @@ export declare class RawReadCmd extends ButtplugDeviceMessage {
     ExpectedLength: number;
     Timeout: number;
     Id: number;
+    static Name: string;
     constructor(DeviceIndex: number, Endpoint: string, ExpectedLength: number, Timeout: number, Id?: number);
 }
 export declare class RawWriteCmd extends ButtplugDeviceMessage {
@@ -237,18 +248,21 @@ export declare class RawWriteCmd extends ButtplugDeviceMessage {
     Data: Uint8Array;
     WriteWithResponse: boolean;
     Id: number;
+    static Name: string;
     constructor(DeviceIndex: number, Endpoint: string, Data: Uint8Array, WriteWithResponse: boolean, Id?: number);
 }
 export declare class RawSubscribeCmd extends ButtplugDeviceMessage {
     DeviceIndex: number;
     Endpoint: string;
     Id: number;
+    static Name: string;
     constructor(DeviceIndex: number, Endpoint: string, Id?: number);
 }
 export declare class RawUnsubscribeCmd extends ButtplugDeviceMessage {
     DeviceIndex: number;
     Endpoint: string;
     Id: number;
+    static Name: string;
     constructor(DeviceIndex: number, Endpoint: string, Id?: number);
 }
 export declare class RawReading extends ButtplugDeviceMessage {
@@ -256,5 +270,6 @@ export declare class RawReading extends ButtplugDeviceMessage {
     Endpoint: string;
     Data: number[];
     Id: number;
+    static Name: string;
     constructor(DeviceIndex: number, Endpoint: string, Data: number[], Id?: number);
 }