buttplug 3.2.1 → 4.0.0

package/LICENSE

@@ -1,27 +1,27 @@
-Copyright (c) 2017-2018, Nonpolynomial Labs 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-js 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.
+Copyright (c) 2017-2018, Nonpolynomial Labs 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-js 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/README.md

@@ -1,98 +1,98 @@
-# Buttplug Typescript/JS Client Implementation
-
-[![Patreon donate button](https://img.shields.io/badge/patreon-donate-yellow.svg)](https://www.patreon.com/qdot)
-[![Github donate button](https://img.shields.io/badge/github-donate-ff69b4.svg)](https://www.github.com/sponsors/qdot)
-
-[![Discourse Forum](https://img.shields.io/badge/discourse-forum-blue.svg)](https://discuss.buttplug.io)
-[![Discord](https://img.shields.io/discord/353303527587708932.svg?logo=discord)](https://discord.buttplug.io)
-[![Twitter](https://img.shields.io/twitter/follow/buttplugio.svg?style=social&logo=twitter)](https://twitter.com/buttplugio)
-
-A implementation of the Buttplug Client in Typescript/Javascript, implementing the Version 3
-Buttplug Spec. It is expected to run from a browser against either [Intiface Central
-(GUI)](https://intiface.com/central), [Initface Engine
-(CLI)](https://github.com/intiface/intiface-engine), or [the Buttplug WASM Server](https://github.com/buttplugio/buttplug-js).
-
-## Compilation information
-
-buttplug-js builds to 3 different types of library:
-
-- CommonJS for node
-- UMD and ES Modules for the web
-
-For node, simply include the package as you would any other package.
-
-For inclusion in web projects, the UMD project can be found at `dist/web/buttplug.js` (Note that the namespace is `buttplug`, so you'll access types like `buttplug.ButtplugClient`, etc...), and the es6 module at `dist/web/buttplug.mjs`.
-
-## 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.
-
-(The WASM Server *does not work* with pure node applications. It requires a browser environment in order to run. See the WASM project README for more info.)
-
-## Documentation and Examples
-
-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.
-
-If you would like to see a demo of using Buttplug in a pure web context, check out the following glitch project, which shows how to pull the Buttplug libraries from a CDN and use them in a pure HTML/JS context without node:
-
-https://glitch.com/edit/#!/how-to-buttplug
-
-## 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 Labs, 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.
+# Buttplug Typescript/JS Client Implementation
+
+[![Patreon donate button](https://img.shields.io/badge/patreon-donate-yellow.svg)](https://www.patreon.com/qdot)
+[![Github donate button](https://img.shields.io/badge/github-donate-ff69b4.svg)](https://www.github.com/sponsors/qdot)
+
+[![Discourse Forum](https://img.shields.io/badge/discourse-forum-blue.svg)](https://discuss.buttplug.io)
+[![Discord](https://img.shields.io/discord/353303527587708932.svg?logo=discord)](https://discord.buttplug.io)
+[![Twitter](https://img.shields.io/twitter/follow/buttplugio.svg?style=social&logo=twitter)](https://twitter.com/buttplugio)
+
+A implementation of the Buttplug Client in Typescript/Javascript, implementing the Version 3
+Buttplug Spec. It is expected to run from a browser against either [Intiface Central
+(GUI)](https://intiface.com/central), [Initface Engine
+(CLI)](https://github.com/intiface/intiface-engine), or [the Buttplug WASM Server](https://github.com/buttplugio/buttplug-js).
+
+## Compilation information
+
+buttplug-js builds to 3 different types of library:
+
+- CommonJS for node
+- UMD and ES Modules for the web
+
+For node, simply include the package as you would any other package.
+
+For inclusion in web projects, the UMD project can be found at `dist/web/buttplug.js` (Note that the namespace is `buttplug`, so you'll access types like `buttplug.ButtplugClient`, etc...), and the es6 module at `dist/web/buttplug.mjs`.
+
+## 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.
+
+(The WASM Server *does not work* with pure node applications. It requires a browser environment in order to run. See the WASM project README for more info.)
+
+## Documentation and Examples
+
+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.
+
+If you would like to see a demo of using Buttplug in a pure web context, check out the following glitch project, which shows how to pull the Buttplug libraries from a CDN and use them in a pure HTML/JS context without node:
+
+https://glitch.com/edit/#!/how-to-buttplug
+
+## 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 Labs, 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.js

@@ -10,15 +10,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ButtplugBrowserWebsocketClientConnector = void 0;
 const ButtplugBrowserWebsocketConnector_1 = require("../utils/ButtplugBrowserWebsocketConnector");
 class ButtplugBrowserWebsocketClientConnector extends ButtplugBrowserWebsocketConnector_1.ButtplugBrowserWebsocketConnector {
-    constructor() {
-        super(...arguments);
-        this.send = (msg) => {
-            if (!this.Connected) {
-                throw new Error('ButtplugClient not connected');
-            }
-            this.sendMessage(msg);
-        };
-    }
+    send = (msg) => {
+        if (!this.Connected) {
+            throw new Error('ButtplugClient not connected');
+        }
+        this.sendMessage(msg);
+    };
 }
 exports.ButtplugBrowserWebsocketClientConnector = ButtplugBrowserWebsocketClientConnector;
 //# sourceMappingURL=ButtplugBrowserWebsocketClientConnector.js.map

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,kGAA+F;AAE/F,MAAa,uCACX,SAAQ,qEAAiC;IAD3C;;QAIS,SAAI,GAAG,CAAC,GAAoB,EAAQ,EAAE;YAC3C,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACnB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACjD;YACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC,CAAC;IACJ,CAAC;CAAA;AAVD,0FAUC"}
+{"version":3,"file":"ButtplugBrowserWebsocketClientConnector.js","sourceRoot":"","sources":["../../../../src/client/ButtplugBrowserWebsocketClientConnector.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;;;AAIb,kGAA+F;AAE/F,MAAa,uCACX,SAAQ,qEAAiC;IAGlC,IAAI,GAAG,CAAC,GAAoB,EAAQ,EAAE;QAC3C,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC;QACD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC,CAAC;CACH;AAVD,0FAUC"}

package/dist/main/src/client/{Client.d.ts → ButtplugClient.d.ts}

@@ -5,7 +5,6 @@
  *
  * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
  */
-/// <reference types="node" />
 import { ButtplugLogger } from '../core/Logging';
 import { EventEmitter } from 'eventemitter3';
 import { ButtplugClientDevice } from './ButtplugClientDevice';
@@ -21,21 +20,21 @@ export declare class ButtplugClient extends EventEmitter {
     private _sorter;
     constructor(clientName?: string);
     get connected(): boolean;
-    get devices(): ButtplugClientDevice[];
+    get devices(): Map<number, ButtplugClientDevice>;
     get isScanning(): boolean;
     connect: (connector: IButtplugClientConnector) => Promise<void>;
     disconnect: () => Promise<void>;
     startScanning: () => Promise<void>;
     stopScanning: () => Promise<void>;
     stopAllDevices: () => Promise<void>;
-    private sendDeviceMessage;
     protected disconnectHandler: () => void;
     protected parseMessages: (msgs: Messages.ButtplugMessage[]) => void;
     protected initializeConnection: () => Promise<boolean>;
+    private parseDeviceList;
     protected requestDeviceList: () => Promise<void>;
     protected shutdownConnection: () => Promise<void>;
     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>;
+    protected sendMessageClosure: (msg: Messages.ButtplugMessage) => Promise<Messages.ButtplugMessage>;
 }

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

@@ -0,0 +1,227 @@
+/*!
+ * 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';
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (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 () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ButtplugClient = void 0;
+const Logging_1 = require("../core/Logging");
+const eventemitter3_1 = require("eventemitter3");
+const ButtplugClientDevice_1 = require("./ButtplugClientDevice");
+const ButtplugMessageSorter_1 = require("../utils/ButtplugMessageSorter");
+const Messages = __importStar(require("../core/Messages"));
+const Exceptions_1 = require("../core/Exceptions");
+const ButtplugClientConnectorException_1 = require("./ButtplugClientConnectorException");
+class ButtplugClient extends eventemitter3_1.EventEmitter {
+    _pingTimer = null;
+    _connector = null;
+    _devices = new Map();
+    _clientName;
+    _logger = Logging_1.ButtplugLogger.Logger;
+    _isScanning = false;
+    _sorter = new ButtplugMessageSorter_1.ButtplugMessageSorter(true);
+    constructor(clientName = 'Generic Buttplug Client') {
+        super();
+        this._clientName = clientName;
+        this._logger.Debug(`ButtplugClient: Client ${clientName} created.`);
+    }
+    get connected() {
+        return this._connector !== null && this._connector.Connected;
+    }
+    get devices() {
+        // While this function doesn't actually send a message, if we don't have a
+        // connector, we shouldn't have devices.
+        this.checkConnector();
+        return this._devices;
+    }
+    get isScanning() {
+        return this._isScanning;
+    }
+    connect = async (connector) => {
+        this._logger.Info(`ButtplugClient: Connecting using ${connector.constructor.name}`);
+        await connector.connect();
+        this._connector = connector;
+        this._connector.addListener('message', this.parseMessages);
+        this._connector.addListener('disconnect', this.disconnectHandler);
+        await this.initializeConnection();
+    };
+    disconnect = async () => {
+        this._logger.Debug('ButtplugClient: Disconnect called');
+        this.checkConnector();
+        await this.shutdownConnection();
+        await this._connector.disconnect();
+    };
+    startScanning = async () => {
+        this._logger.Debug('ButtplugClient: StartScanning called');
+        this._isScanning = true;
+        await this.sendMsgExpectOk({ StartScanning: { Id: 1 } });
+    };
+    stopScanning = async () => {
+        this._logger.Debug('ButtplugClient: StopScanning called');
+        this._isScanning = false;
+        await this.sendMsgExpectOk({ StopScanning: { Id: 1 } });
+    };
+    stopAllDevices = async () => {
+        this._logger.Debug('ButtplugClient: StopAllDevices');
+        await this.sendMsgExpectOk({ StopAllDevices: { Id: 1 } });
+    };
+    disconnectHandler = () => {
+        this._logger.Info('ButtplugClient: Disconnect event receieved.');
+        this.emit('disconnect');
+    };
+    parseMessages = (msgs) => {
+        const leftoverMsgs = this._sorter.ParseIncomingMessages(msgs);
+        for (const x of leftoverMsgs) {
+            if (x.DeviceList !== undefined) {
+                this.parseDeviceList(x);
+                break;
+            }
+            else if (x.ScanningFinished !== undefined) {
+                this._isScanning = false;
+                this.emit('scanningfinished', x);
+            }
+            else {
+                console.log(JSON.stringify(msgs));
+            }
+        }
+    };
+    initializeConnection = async () => {
+        this.checkConnector();
+        const msg = await this.sendMessage({
+            RequestServerInfo: {
+                ClientName: this._clientName,
+                Id: 1,
+                ProtocolVersionMajor: Messages.MESSAGE_SPEC_VERSION_MAJOR,
+                ProtocolVersionMinor: Messages.MESSAGE_SPEC_VERSION_MINOR
+            }
+        });
+        if (msg.ServerInfo !== undefined) {
+            const serverinfo = msg;
+            this._logger.Info(`ButtplugClient: Connected to Server ${serverinfo.ServerName}`);
+            // TODO: maybe store server name, do something with message template version?
+            const ping = serverinfo.MaxPingTime;
+            // If the server version is lower than the client version, the server will disconnect here.
+            if (ping > 0) {
+                /*
+                this._pingTimer = setInterval(async () => {
+                  // If we've disconnected, stop trying to ping the server.
+                  if (!this.Connected) {
+                    await this.ShutdownConnection();
+                    return;
+                  }
+                  await this.SendMessage(new Messages.Ping());
+                } , Math.round(ping / 2));
+                */
+            }
+            await this.requestDeviceList();
+            return true;
+        }
+        else if (msg.Error !== undefined) {
+            // Disconnect and throw an exception with the error message we got back.
+            // This will usually only error out if we have a version mismatch that the
+            // server has detected.
+            await this._connector.disconnect();
+            const err = msg.Error;
+            throw Exceptions_1.ButtplugError.LogAndError(Exceptions_1.ButtplugInitError, this._logger, `Cannot connect to server. ${err.ErrorMessage}`);
+        }
+        return false;
+    };
+    parseDeviceList = (list) => {
+        for (let [_, d] of Object.entries(list.Devices)) {
+            if (!this._devices.has(d.DeviceIndex)) {
+                const device = ButtplugClientDevice_1.ButtplugClientDevice.fromMsg(d, this.sendMessageClosure);
+                this._logger.Debug(`ButtplugClient: Adding Device: ${device}`);
+                this._devices.set(d.DeviceIndex, device);
+                this.emit('deviceadded', device);
+            }
+            else {
+                this._logger.Debug(`ButtplugClient: Device already added: ${d}`);
+            }
+        }
+        for (let [index, device] of this._devices.entries()) {
+            if (!list.Devices.hasOwnProperty(index.toString())) {
+                this._devices.delete(index);
+                this.emit('deviceremoved', device);
+            }
+        }
+    };
+    requestDeviceList = async () => {
+        this.checkConnector();
+        this._logger.Debug('ButtplugClient: ReceiveDeviceList called');
+        const response = (await this.sendMessage({
+            RequestDeviceList: { Id: 1 }
+        }));
+        this.parseDeviceList(response.DeviceList);
+    };
+    shutdownConnection = async () => {
+        await this.stopAllDevices();
+        if (this._pingTimer !== null) {
+            clearInterval(this._pingTimer);
+            this._pingTimer = null;
+        }
+    };
+    async sendMessage(msg) {
+        this.checkConnector();
+        const p = this._sorter.PrepareOutgoingMessage(msg);
+        await this._connector.send(msg);
+        return await p;
+    }
+    checkConnector() {
+        if (!this.connected) {
+            throw new ButtplugClientConnectorException_1.ButtplugClientConnectorException('ButtplugClient not connected');
+        }
+    }
+    sendMsgExpectOk = async (msg) => {
+        const response = await this.sendMessage(msg);
+        if (response.Ok !== undefined) {
+            return;
+        }
+        else if (response.Error !== undefined) {
+            throw Exceptions_1.ButtplugError.FromError(response);
+        }
+        else {
+            throw Exceptions_1.ButtplugError.LogAndError(Exceptions_1.ButtplugMessageError, this._logger, `Message ${response} not handled by SendMsgExpectOk`);
+        }
+    };
+    sendMessageClosure = async (msg) => {
+        return await this.sendMessage(msg);
+    };
+}
+exports.ButtplugClient = ButtplugClient;
+//# sourceMappingURL=ButtplugClient.js.map

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

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

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

@@ -22,13 +22,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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 (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ButtplugClientConnectorException = void 0;
 const Exceptions_1 = require("../core/Exceptions");

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

@@ -1 +1 @@
-{"version":3,"file":"ButtplugClientConnectorException.js","sourceRoot":"","sources":["../../../../src/client/ButtplugClientConnectorException.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,mDAAmD;AACnD,2DAA6C;AAE7C,MAAa,gCAAiC,SAAQ,0BAAa;IACjE,YAAmB,OAAe;QAChC,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACpD,CAAC;CACF;AAJD,4EAIC"}
+{"version":3,"file":"ButtplugClientConnectorException.js","sourceRoot":"","sources":["../../../../src/client/ButtplugClientConnectorException.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,mDAAmD;AACnD,2DAA6C;AAE7C,MAAa,gCAAiC,SAAQ,0BAAa;IACjE,YAAmB,OAAe;QAChC,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACpD,CAAC;CACF;AAJD,4EAIC"}