buttplug 3.0.0-alpha.1 → 3.0.0-alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintrc.js +20 -0
- package/.prettierrc.json +4 -0
- package/dist/main/src/client/ButtplugBrowserWebsocketClientConnector.d.ts +3 -3
- package/dist/main/src/client/ButtplugBrowserWebsocketClientConnector.js +8 -6
- package/dist/main/src/client/ButtplugBrowserWebsocketClientConnector.js.map +1 -1
- package/dist/main/src/client/ButtplugClientConnectorException.d.ts +1 -1
- package/dist/main/src/client/ButtplugClientDevice.d.ts +12 -8
- package/dist/main/src/client/ButtplugClientDevice.js +75 -59
- package/dist/main/src/client/ButtplugClientDevice.js.map +1 -1
- package/dist/main/src/client/Client.d.ts +9 -10
- package/dist/main/src/client/Client.js +34 -35
- package/dist/main/src/client/Client.js.map +1 -1
- package/dist/main/src/client/IButtplugClientConnector.d.ts +2 -2
- package/dist/main/src/core/Exceptions.d.ts +2 -2
- package/dist/main/src/core/Exceptions.js.map +1 -1
- package/dist/main/src/core/Logging.d.ts +1 -1
- package/dist/main/src/core/Logging.js +3 -2
- package/dist/main/src/core/Logging.js.map +1 -1
- package/dist/main/src/core/MessageUtils.d.ts +1 -1
- package/dist/main/src/core/MessageUtils.js +3 -3
- package/dist/main/src/core/MessageUtils.js.map +1 -1
- package/dist/main/src/core/Messages.d.ts +1 -1
- package/dist/main/src/core/Messages.js +10 -8
- package/dist/main/src/core/Messages.js.map +1 -1
- package/dist/main/src/index.d.ts +10 -10
- package/dist/main/src/utils/ButtplugBrowserWebsocketConnector.d.ts +2 -2
- package/dist/main/src/utils/ButtplugBrowserWebsocketConnector.js +23 -16
- package/dist/main/src/utils/ButtplugBrowserWebsocketConnector.js.map +1 -1
- package/dist/main/src/utils/ButtplugMessageSorter.d.ts +5 -2
- package/dist/main/src/utils/ButtplugMessageSorter.js +4 -1
- package/dist/main/src/utils/ButtplugMessageSorter.js.map +1 -1
- package/dist/web/buttplug.js +155 -125
- package/dist/web/buttplug.min.js +1 -1
- package/dist/web/buttplug.min.js.map +1 -1
- package/package.json +7 -1
- package/src/client/ButtplugBrowserWebsocketClientConnector.ts +21 -17
- package/src/client/ButtplugClientConnectorException.ts +2 -2
- package/src/client/ButtplugClientDevice.ts +224 -93
- package/src/client/Client.ts +110 -74
- package/src/client/IButtplugClientConnector.ts +2 -2
- package/src/core/Exceptions.ts +14 -11
- package/src/core/Logging.ts +10 -7
- package/src/core/MessageUtils.ts +9 -5
- package/src/core/Messages.ts +112 -94
- package/src/core/index.d.ts +3 -3
- package/src/index.ts +10 -10
- package/src/utils/ButtplugBrowserWebsocketConnector.ts +29 -23
- package/src/utils/ButtplugMessageSorter.ts +20 -9
- package/.eslintrc +0 -13
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
|
-
|
|
8
|
+
'use strict';
|
|
9
9
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
10
10
|
if (k2 === undefined) k2 = k;
|
|
11
11
|
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
@@ -47,7 +47,7 @@ const Messages = __importStar(require("../core/Messages"));
|
|
|
47
47
|
const Exceptions_1 = require("../core/Exceptions");
|
|
48
48
|
const ButtplugClientConnectorException_1 = require("./ButtplugClientConnectorException");
|
|
49
49
|
class ButtplugClient extends events_1.EventEmitter {
|
|
50
|
-
constructor(clientName =
|
|
50
|
+
constructor(clientName = 'Generic Buttplug Client') {
|
|
51
51
|
super();
|
|
52
52
|
this._pingTimer = null;
|
|
53
53
|
this._connector = null;
|
|
@@ -58,62 +58,64 @@ class ButtplugClient extends events_1.EventEmitter {
|
|
|
58
58
|
this._logger.Info(`ButtplugClient: Connecting using ${connector.constructor.name}`);
|
|
59
59
|
yield connector.Connect();
|
|
60
60
|
this._connector = connector;
|
|
61
|
-
this._connector.addListener(
|
|
62
|
-
this._connector.addListener(
|
|
61
|
+
this._connector.addListener('message', this.parseMessages);
|
|
62
|
+
this._connector.addListener('disconnect', this.disconnectHandler);
|
|
63
63
|
yield this.initializeConnection();
|
|
64
64
|
});
|
|
65
65
|
this.disconnect = () => __awaiter(this, void 0, void 0, function* () {
|
|
66
|
-
this._logger.Debug(
|
|
66
|
+
this._logger.Debug('ButtplugClient: Disconnect called');
|
|
67
67
|
this.checkConnector();
|
|
68
68
|
yield this.shutdownConnection();
|
|
69
69
|
yield this._connector.Disconnect();
|
|
70
70
|
});
|
|
71
71
|
this.startScanning = () => __awaiter(this, void 0, void 0, function* () {
|
|
72
|
-
this._logger.Debug(
|
|
72
|
+
this._logger.Debug('ButtplugClient: StartScanning called');
|
|
73
73
|
this._isScanning = true;
|
|
74
74
|
yield this.sendMsgExpectOk(new Messages.StartScanning());
|
|
75
75
|
});
|
|
76
76
|
this.stopScanning = () => __awaiter(this, void 0, void 0, function* () {
|
|
77
|
-
this._logger.Debug(
|
|
77
|
+
this._logger.Debug('ButtplugClient: StopScanning called');
|
|
78
78
|
this._isScanning = false;
|
|
79
79
|
yield this.sendMsgExpectOk(new Messages.StopScanning());
|
|
80
80
|
});
|
|
81
81
|
this.stopAllDevices = () => __awaiter(this, void 0, void 0, function* () {
|
|
82
|
-
this._logger.Debug(
|
|
82
|
+
this._logger.Debug('ButtplugClient: StopAllDevices');
|
|
83
83
|
yield this.sendMsgExpectOk(new Messages.StopAllDevices());
|
|
84
84
|
});
|
|
85
85
|
this.disconnectHandler = () => {
|
|
86
|
-
this._logger.Info(
|
|
87
|
-
this.emit(
|
|
86
|
+
this._logger.Info('ButtplugClient: Disconnect event receieved.');
|
|
87
|
+
this.emit('disconnect');
|
|
88
88
|
};
|
|
89
89
|
this.parseMessages = (msgs) => {
|
|
90
90
|
for (const x of msgs) {
|
|
91
91
|
switch (x.constructor) {
|
|
92
|
-
case Messages.DeviceAdded:
|
|
92
|
+
case Messages.DeviceAdded: {
|
|
93
93
|
const addedMsg = x;
|
|
94
94
|
const addedDevice = ButtplugClientDevice_1.ButtplugClientDevice.fromMsg(addedMsg, this.sendDeviceMessageClosure);
|
|
95
95
|
this._devices.set(addedMsg.DeviceIndex, addedDevice);
|
|
96
|
-
this.emit(
|
|
96
|
+
this.emit('deviceadded', addedDevice);
|
|
97
97
|
break;
|
|
98
|
-
|
|
98
|
+
}
|
|
99
|
+
case Messages.DeviceRemoved: {
|
|
99
100
|
const removedMsg = x;
|
|
100
101
|
if (this._devices.has(removedMsg.DeviceIndex)) {
|
|
101
102
|
const removedDevice = this._devices.get(removedMsg.DeviceIndex);
|
|
102
|
-
removedDevice === null || removedDevice === void 0 ? void 0 : removedDevice.
|
|
103
|
+
removedDevice === null || removedDevice === void 0 ? void 0 : removedDevice.emitDisconnected();
|
|
103
104
|
this._devices.delete(removedMsg.DeviceIndex);
|
|
104
|
-
this.emit(
|
|
105
|
+
this.emit('deviceremoved', removedDevice);
|
|
105
106
|
}
|
|
106
107
|
break;
|
|
108
|
+
}
|
|
107
109
|
case Messages.ScanningFinished:
|
|
108
110
|
this._isScanning = false;
|
|
109
|
-
this.emit(
|
|
111
|
+
this.emit('scanningfinished', x);
|
|
110
112
|
break;
|
|
111
113
|
}
|
|
112
114
|
}
|
|
113
115
|
};
|
|
114
116
|
this.initializeConnection = () => __awaiter(this, void 0, void 0, function* () {
|
|
115
117
|
this.checkConnector();
|
|
116
|
-
const msg = yield this.
|
|
118
|
+
const msg = yield this.sendMessage(new Messages.RequestServerInfo(this._clientName, Messages.MESSAGE_SPEC_VERSION));
|
|
117
119
|
switch (msg.constructor) {
|
|
118
120
|
case Messages.ServerInfo: {
|
|
119
121
|
const serverinfo = msg;
|
|
@@ -153,14 +155,14 @@ class ButtplugClient extends events_1.EventEmitter {
|
|
|
153
155
|
});
|
|
154
156
|
this.requestDeviceList = () => __awaiter(this, void 0, void 0, function* () {
|
|
155
157
|
this.checkConnector();
|
|
156
|
-
this._logger.Debug(
|
|
157
|
-
const deviceList = (yield this.
|
|
158
|
+
this._logger.Debug('ButtplugClient: ReceiveDeviceList called');
|
|
159
|
+
const deviceList = (yield this.sendMessage(new Messages.RequestDeviceList()));
|
|
158
160
|
deviceList.Devices.forEach((d) => {
|
|
159
161
|
if (!this._devices.has(d.DeviceIndex)) {
|
|
160
162
|
const device = ButtplugClientDevice_1.ButtplugClientDevice.fromMsg(d, this.sendDeviceMessageClosure);
|
|
161
163
|
this._logger.Debug(`ButtplugClient: Adding Device: ${device}`);
|
|
162
164
|
this._devices.set(d.DeviceIndex, device);
|
|
163
|
-
this.emit(
|
|
165
|
+
this.emit('deviceadded', device);
|
|
164
166
|
}
|
|
165
167
|
else {
|
|
166
168
|
this._logger.Debug(`ButtplugClient: Device already added: ${d}`);
|
|
@@ -175,7 +177,7 @@ class ButtplugClient extends events_1.EventEmitter {
|
|
|
175
177
|
}
|
|
176
178
|
});
|
|
177
179
|
this.sendMsgExpectOk = (msg) => __awaiter(this, void 0, void 0, function* () {
|
|
178
|
-
const response = yield this.
|
|
180
|
+
const response = yield this.sendMessage(msg);
|
|
179
181
|
switch (response.constructor) {
|
|
180
182
|
case Messages.Ok:
|
|
181
183
|
return;
|
|
@@ -191,45 +193,42 @@ class ButtplugClient extends events_1.EventEmitter {
|
|
|
191
193
|
this._clientName = clientName;
|
|
192
194
|
this._logger.Debug(`ButtplugClient: Client ${clientName} created.`);
|
|
193
195
|
}
|
|
194
|
-
get
|
|
195
|
-
return this._connector;
|
|
196
|
-
}
|
|
197
|
-
get Connected() {
|
|
196
|
+
get connected() {
|
|
198
197
|
return this._connector !== null && this._connector.Connected;
|
|
199
198
|
}
|
|
200
|
-
get
|
|
199
|
+
get devices() {
|
|
201
200
|
// While this function doesn't actually send a message, if we don't have a
|
|
202
201
|
// connector, we shouldn't have devices.
|
|
203
202
|
this.checkConnector();
|
|
204
203
|
const devices = [];
|
|
205
|
-
this._devices.forEach((d
|
|
204
|
+
this._devices.forEach((d) => {
|
|
206
205
|
devices.push(d);
|
|
207
206
|
});
|
|
208
207
|
return devices;
|
|
209
208
|
}
|
|
210
|
-
get
|
|
209
|
+
get isScanning() {
|
|
211
210
|
return this._isScanning;
|
|
212
211
|
}
|
|
213
212
|
sendDeviceMessage(device, deviceMsg) {
|
|
214
213
|
return __awaiter(this, void 0, void 0, function* () {
|
|
215
214
|
this.checkConnector();
|
|
216
|
-
const dev = this._devices.get(device.
|
|
215
|
+
const dev = this._devices.get(device.index);
|
|
217
216
|
if (dev === undefined) {
|
|
218
|
-
throw Exceptions_1.ButtplugException.LogAndError(Exceptions_1.ButtplugDeviceException, this._logger, `Device ${device.
|
|
217
|
+
throw Exceptions_1.ButtplugException.LogAndError(Exceptions_1.ButtplugDeviceException, this._logger, `Device ${device.index} not available.`);
|
|
219
218
|
}
|
|
220
|
-
deviceMsg.DeviceIndex = device.
|
|
221
|
-
return yield this.
|
|
219
|
+
deviceMsg.DeviceIndex = device.index;
|
|
220
|
+
return yield this.sendMessage(deviceMsg);
|
|
222
221
|
});
|
|
223
222
|
}
|
|
224
|
-
|
|
223
|
+
sendMessage(msg) {
|
|
225
224
|
return __awaiter(this, void 0, void 0, function* () {
|
|
226
225
|
this.checkConnector();
|
|
227
226
|
return yield this._connector.Send(msg);
|
|
228
227
|
});
|
|
229
228
|
}
|
|
230
229
|
checkConnector() {
|
|
231
|
-
if (!this.
|
|
232
|
-
throw new ButtplugClientConnectorException_1.ButtplugClientConnectorException(
|
|
230
|
+
if (!this.connected) {
|
|
231
|
+
throw new ButtplugClientConnectorException_1.ButtplugClientConnectorException('ButtplugClient not connected');
|
|
233
232
|
}
|
|
234
233
|
}
|
|
235
234
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../../../src/client/Client.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,6CAAiD;AACjD,mCAAsC;AACtC,iEAA8D;AAE9D,2DAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../../../src/client/Client.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,8 @@
|
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
8
|
/// <reference types="node" />
|
|
9
|
-
import { ButtplugMessage } from
|
|
10
|
-
import { EventEmitter } from
|
|
9
|
+
import { ButtplugMessage } from '../core/Messages';
|
|
10
|
+
import { EventEmitter } from 'events';
|
|
11
11
|
export interface IButtplugClientConnector extends EventEmitter {
|
|
12
12
|
Connect: () => Promise<void>;
|
|
13
13
|
Disconnect: () => Promise<void>;
|
|
@@ -5,8 +5,8 @@
|
|
|
5
5
|
*
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
|
-
import * as Messages from
|
|
9
|
-
import { ButtplugLogger } from
|
|
8
|
+
import * as Messages from './Messages';
|
|
9
|
+
import { ButtplugLogger } from './Logging';
|
|
10
10
|
export declare class ButtplugException extends Error {
|
|
11
11
|
get ErrorClass(): Messages.ErrorClass;
|
|
12
12
|
get InnerException(): Error | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Exceptions.js","sourceRoot":"","sources":["../../../../src/core/Exceptions.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,qDAAuC;AAGvC,MAAa,iBAAkB,SAAQ,KAAK;
|
|
1
|
+
{"version":3,"file":"Exceptions.js","sourceRoot":"","sources":["../../../../src/core/Exceptions.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,qDAAuC;AAGvC,MAAa,iBAAkB,SAAQ,KAAK;IAC1C,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAW,cAAc;QACvB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAW,EAAE;QACX,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAW,YAAY;QACrB,OAAO,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACpE,CAAC;IAEM,MAAM,CAAC,WAAW,CACvB,WAAgD,EAChD,MAAsB,EACtB,OAAe,EACf,KAAa,QAAQ,CAAC,iBAAiB;QAEvC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACtB,OAAO,IAAI,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACtC,CAAC;IAEM,MAAM,CAAC,SAAS,CAAC,KAAqB;QAC3C,QAAQ,KAAK,CAAC,SAAS,EAAE;YACvB,KAAK,QAAQ,CAAC,UAAU,CAAC,YAAY;gBACnC,OAAO,IAAI,uBAAuB,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YACnE,KAAK,QAAQ,CAAC,UAAU,CAAC,UAAU;gBACjC,OAAO,IAAI,qBAAqB,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YACjE,KAAK,QAAQ,CAAC,UAAU,CAAC,aAAa;gBACpC,OAAO,IAAI,wBAAwB,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YACpE,KAAK,QAAQ,CAAC,UAAU,CAAC,UAAU;gBACjC,OAAO,IAAI,qBAAqB,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YACjE,KAAK,QAAQ,CAAC,UAAU,CAAC,SAAS;gBAChC,OAAO,IAAI,wBAAwB,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YACpE;gBACE,MAAM,IAAI,KAAK,CAAC,gBAAgB,KAAK,CAAC,SAAS,cAAc,CAAC,CAAC;SAClE;IACH,CAAC;IAMD,YACE,OAAe,EACf,UAA+B,EAC/B,KAAa,QAAQ,CAAC,iBAAiB,EACvC,KAAa;QAEb,KAAK,CAAC,OAAO,CAAC,CAAC;QAVV,eAAU,GAAwB,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC;QAWzE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;IACtB,CAAC;CACF;AA3DD,8CA2DC;AAED,MAAa,qBAAsB,SAAQ,iBAAiB;IAC1D,YAAmB,OAAe,EAAE,KAAa,QAAQ,CAAC,iBAAiB;QACzE,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACrD,CAAC;CACF;AAJD,sDAIC;AAED,MAAa,uBAAwB,SAAQ,iBAAiB;IAC5D,YAAmB,OAAe,EAAE,KAAa,QAAQ,CAAC,iBAAiB;QACzE,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IACvD,CAAC;CACF;AAJD,0DAIC;AAED,MAAa,wBAAyB,SAAQ,iBAAiB;IAC7D,YAAmB,OAAe,EAAE,KAAa,QAAQ,CAAC,iBAAiB;QACzE,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACpD,CAAC;CACF;AAJD,4DAIC;AAED,MAAa,qBAAsB,SAAQ,iBAAiB;IAC1D,YAAmB,OAAe,EAAE,KAAa,QAAQ,CAAC,iBAAiB;QACzE,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACrD,CAAC;CACF;AAJD,sDAIC;AAED,MAAa,wBAAyB,SAAQ,iBAAiB;IAC7D,YAAmB,OAAe,EAAE,KAAa,QAAQ,CAAC,iBAAiB;QACzE,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;IACxD,CAAC;CACF;AAJD,4DAIC"}
|
|
@@ -148,7 +148,8 @@ class ButtplugLogger extends events_1.EventEmitter {
|
|
|
148
148
|
*/
|
|
149
149
|
AddLogMessage(msg, level) {
|
|
150
150
|
// If nothing wants the log message we have, ignore it.
|
|
151
|
-
if (level > this.maximumEventLogLevel &&
|
|
151
|
+
if (level > this.maximumEventLogLevel &&
|
|
152
|
+
level > this.maximumConsoleLogLevel) {
|
|
152
153
|
return;
|
|
153
154
|
}
|
|
154
155
|
const logMsg = new LogMessage(msg, level);
|
|
@@ -160,7 +161,7 @@ class ButtplugLogger extends events_1.EventEmitter {
|
|
|
160
161
|
console.log(logMsg.FormattedMessage);
|
|
161
162
|
}
|
|
162
163
|
if (level <= this.maximumEventLogLevel) {
|
|
163
|
-
this.emit(
|
|
164
|
+
this.emit('log', logMsg);
|
|
164
165
|
}
|
|
165
166
|
}
|
|
166
167
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logging.js","sourceRoot":"","sources":["../../../../src/core/Logging.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,mCAAsC;
|
|
1
|
+
{"version":3,"file":"Logging.js","sourceRoot":"","sources":["../../../../src/core/Logging.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,mCAAsC;AAEtC,IAAY,gBAOX;AAPD,WAAY,gBAAgB;IAC1B,qDAAG,CAAA;IACH,yDAAK,CAAA;IACL,uDAAI,CAAA;IACJ,uDAAI,CAAA;IACJ,yDAAK,CAAA;IACL,yDAAK,CAAA;AACP,CAAC,EAPW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAO3B;AAED;;GAEG;AACH,MAAa,UAAU;IAUrB;;;OAGG;IACH,YAAmB,UAAkB,EAAE,QAA0B;QAC/D,MAAM,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;QACrB,MAAM,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC1B,MAAM,GAAG,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAC3B,MAAM,GAAG,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,GAAG,IAAI,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,IAAW,QAAQ;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED;;OAEG;IACH,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED;;OAEG;IACH,IAAW,gBAAgB;QACzB,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,SAAS,MAC3D,IAAI,CAAC,UACP,EAAE,CAAC;IACL,CAAC;CACF;AArDD,gCAqDC;AAED;;;;GAIG;AACH,MAAa,cAAe,SAAQ,qBAAY;IAQ9C;;;OAGG;IACI,MAAM,KAAK,MAAM;QACtB,IAAI,cAAc,CAAC,OAAO,KAAK,SAAS,EAAE;YACxC,cAAc,CAAC,OAAO,GAAG,IAAI,cAAc,EAAE,CAAC;SAC/C;QACD,OAAO,IAAI,CAAC,OAAQ,CAAC;IACvB,CAAC;IAED;;;OAGG;IACH;QACE,KAAK,EAAE,CAAC;QArBV,+CAA+C;QACrC,2BAAsB,GAAqB,gBAAgB,CAAC,GAAG,CAAC;QAC1E,kDAAkD;QACxC,yBAAoB,GAAqB,gBAAgB,CAAC,GAAG,CAAC;IAmBxE,CAAC;IAED;;OAEG;IACH,IAAW,sBAAsB;QAC/B,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACrC,CAAC;IAED;;OAEG;IACH,IAAW,sBAAsB,CAAC,gBAAkC;QAClE,IAAI,CAAC,sBAAsB,GAAG,gBAAgB,CAAC;IACjD,CAAC;IAED;;OAEG;IACH,IAAW,oBAAoB;QAC7B,OAAO,IAAI,CAAC,oBAAoB,CAAC;IACnC,CAAC;IAED;;OAEG;IACH,IAAW,oBAAoB,CAAC,QAA0B;QACxD,IAAI,CAAC,oBAAoB,GAAG,QAAQ,CAAC;IACvC,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,GAAW;QACtB,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IACI,IAAI,CAAC,GAAW;QACrB,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IAED;;OAEG;IACI,IAAI,CAAC,GAAW;QACrB,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,GAAW;QACtB,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,GAAW;QACtB,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;IAED;;;OAGG;IACO,aAAa,CAAC,GAAW,EAAE,KAAuB;QAC1D,uDAAuD;QACvD,IACE,KAAK,GAAG,IAAI,CAAC,oBAAoB;YACjC,KAAK,GAAG,IAAI,CAAC,sBAAsB,EACnC;YACA,OAAO;SACR;QACD,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC1C,yEAAyE;QACzE,0EAA0E;QAC1E,wEAAwE;QACxE,WAAW;QACX,IAAI,KAAK,IAAI,IAAI,CAAC,sBAAsB,EAAE;YACxC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;SACtC;QACD,IAAI,KAAK,IAAI,IAAI,CAAC,oBAAoB,EAAE;YACtC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;SAC1B;IACH,CAAC;;AAjHH,wCAkHC;AAjHC,wCAAwC;AACvB,sBAAO,GAA+B,SAAS,CAAC"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
|
-
|
|
8
|
+
'use strict';
|
|
9
9
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
10
10
|
if (k2 === undefined) k2 = k;
|
|
11
11
|
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
@@ -34,14 +34,14 @@ exports.FromJSON = void 0;
|
|
|
34
34
|
const class_transformer_1 = require("class-transformer");
|
|
35
35
|
const Messages = __importStar(require("./Messages"));
|
|
36
36
|
function FromJSON(str) {
|
|
37
|
-
console.log(str);
|
|
38
37
|
const msgarray = JSON.parse(str);
|
|
39
38
|
const msgs = [];
|
|
40
39
|
for (const x of Array.from(msgarray)) {
|
|
41
|
-
console.log(x);
|
|
42
40
|
// Can't get this to resolve nicely as a type, so just start from any and cast
|
|
43
41
|
// after. Not sure how to resolve plainToClass to a type since this is
|
|
44
42
|
// dynamic.
|
|
43
|
+
//
|
|
44
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
45
45
|
const msg = (0, class_transformer_1.plainToInstance)(Messages[Object.getOwnPropertyNames(x)[0]], x[Object.getOwnPropertyNames(x)[0]]);
|
|
46
46
|
msg.update();
|
|
47
47
|
msgs.push(msg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MessageUtils.js","sourceRoot":"","sources":["../../../../src/core/MessageUtils.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;AACb,
|
|
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"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
|
-
import
|
|
8
|
+
import 'reflect-metadata';
|
|
9
9
|
export declare const SYSTEM_MESSAGE_ID = 0;
|
|
10
10
|
export declare const DEFAULT_MESSAGE_ID = 1;
|
|
11
11
|
export declare const MAX_ID = 4294967295;
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
8
|
// tslint:disable:max-classes-per-file
|
|
9
|
-
|
|
9
|
+
'use strict';
|
|
10
10
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
11
11
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
12
12
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -30,11 +30,11 @@ class MessageAttributes {
|
|
|
30
30
|
}
|
|
31
31
|
update() {
|
|
32
32
|
var _a, _b, _c, _d, _e;
|
|
33
|
-
(_a = this.ScalarCmd) === null || _a === void 0 ? void 0 : _a.forEach((x, i) => x.Index = i);
|
|
34
|
-
(_b = this.RotateCmd) === null || _b === void 0 ? void 0 : _b.forEach((x, i) => x.Index = i);
|
|
35
|
-
(_c = this.LinearCmd) === null || _c === void 0 ? void 0 : _c.forEach((x, i) => x.Index = i);
|
|
36
|
-
(_d = this.SensorReadCmd) === null || _d === void 0 ? void 0 : _d.forEach((x, i) => x.Index = i);
|
|
37
|
-
(_e = this.SensorSubscribeCmd) === null || _e === void 0 ? void 0 : _e.forEach((x, i) => x.Index = i);
|
|
33
|
+
(_a = this.ScalarCmd) === null || _a === void 0 ? void 0 : _a.forEach((x, i) => (x.Index = i));
|
|
34
|
+
(_b = this.RotateCmd) === null || _b === void 0 ? void 0 : _b.forEach((x, i) => (x.Index = i));
|
|
35
|
+
(_c = this.LinearCmd) === null || _c === void 0 ? void 0 : _c.forEach((x, i) => (x.Index = i));
|
|
36
|
+
(_d = this.SensorReadCmd) === null || _d === void 0 ? void 0 : _d.forEach((x, i) => (x.Index = i));
|
|
37
|
+
(_e = this.SensorSubscribeCmd) === null || _e === void 0 ? void 0 : _e.forEach((x, i) => (x.Index = i));
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
exports.MessageAttributes = MessageAttributes;
|
|
@@ -151,7 +151,9 @@ class Error extends ButtplugMessage {
|
|
|
151
151
|
this.ErrorCode = ErrorCode;
|
|
152
152
|
this.Id = Id;
|
|
153
153
|
}
|
|
154
|
-
get Schemversion() {
|
|
154
|
+
get Schemversion() {
|
|
155
|
+
return 0;
|
|
156
|
+
}
|
|
155
157
|
}
|
|
156
158
|
exports.Error = Error;
|
|
157
159
|
class DeviceInfo {
|
|
@@ -171,7 +173,7 @@ class DeviceList extends ButtplugMessage {
|
|
|
171
173
|
this.Id = id;
|
|
172
174
|
}
|
|
173
175
|
update() {
|
|
174
|
-
for (
|
|
176
|
+
for (const device of this.Devices) {
|
|
175
177
|
device.DeviceMessages.update();
|
|
176
178
|
}
|
|
177
179
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Messages.js","sourceRoot":"","sources":["../../../../src/core/Messages.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,sCAAsC;AACtC,YAAY,CAAC;;;;;;;;;;;;AAEb,yDAA0D;AAC1D,4BAA0B;AAEb,QAAA,iBAAiB,GAAG,CAAC,CAAC;AACtB,QAAA,kBAAkB,GAAG,CAAC,CAAC;AACvB,QAAA,MAAM,GAAG,UAAU,CAAC;AACpB,QAAA,oBAAoB,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Messages.js","sourceRoot":"","sources":["../../../../src/core/Messages.ts"],"names":[],"mappings":"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"}
|
package/dist/main/src/index.d.ts
CHANGED
|
@@ -5,13 +5,13 @@
|
|
|
5
5
|
*
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
|
-
export * from
|
|
9
|
-
export * from
|
|
10
|
-
export * from
|
|
11
|
-
export * from
|
|
12
|
-
export * from
|
|
13
|
-
export * from
|
|
14
|
-
export * from
|
|
15
|
-
export * from
|
|
16
|
-
export * from
|
|
17
|
-
export * from
|
|
8
|
+
export * from './client/Client';
|
|
9
|
+
export * from './client/ButtplugClientDevice';
|
|
10
|
+
export * from './client/ButtplugBrowserWebsocketClientConnector';
|
|
11
|
+
export * from './client/ButtplugClientConnectorException';
|
|
12
|
+
export * from './utils/ButtplugMessageSorter';
|
|
13
|
+
export * from './client/IButtplugClientConnector';
|
|
14
|
+
export * from './core/Messages';
|
|
15
|
+
export * from './core/MessageUtils';
|
|
16
|
+
export * from './core/Logging';
|
|
17
|
+
export * from './core/Exceptions';
|
|
@@ -6,8 +6,8 @@
|
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
8
|
/// <reference types="node" />
|
|
9
|
-
import { EventEmitter } from
|
|
10
|
-
import { ButtplugMessage } from
|
|
9
|
+
import { EventEmitter } from 'events';
|
|
10
|
+
import { ButtplugMessage } from '../core/Messages';
|
|
11
11
|
export declare class ButtplugBrowserWebsocketConnector extends EventEmitter {
|
|
12
12
|
private _url;
|
|
13
13
|
protected _ws: WebSocket | undefined;
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
|
-
|
|
8
|
+
'use strict';
|
|
9
9
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
10
10
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
11
11
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -27,18 +27,23 @@ class ButtplugBrowserWebsocketConnector extends events_1.EventEmitter {
|
|
|
27
27
|
const ws = new WebSocket(this._url);
|
|
28
28
|
let res;
|
|
29
29
|
let rej;
|
|
30
|
-
const p = new Promise((resolve, reject) => {
|
|
30
|
+
const p = new Promise((resolve, reject) => {
|
|
31
|
+
res = resolve;
|
|
32
|
+
rej = reject;
|
|
33
|
+
});
|
|
31
34
|
// In websockets, our error rarely tells us much, as for security reasons
|
|
32
35
|
// browsers usually only throw Error Code 1006. It's up to those using this
|
|
33
36
|
// library to state what the problem might be.
|
|
34
|
-
const conErrorCallback = (
|
|
35
|
-
ws.addEventListener(
|
|
37
|
+
const conErrorCallback = () => rej();
|
|
38
|
+
ws.addEventListener('open', () => __awaiter(this, void 0, void 0, function* () {
|
|
36
39
|
this._ws = ws;
|
|
37
40
|
try {
|
|
38
41
|
yield this.Initialize();
|
|
39
|
-
this._ws.addEventListener(
|
|
40
|
-
|
|
41
|
-
|
|
42
|
+
this._ws.addEventListener('message', (msg) => {
|
|
43
|
+
this.ParseIncomingMessage(msg);
|
|
44
|
+
});
|
|
45
|
+
this._ws.removeEventListener('close', conErrorCallback);
|
|
46
|
+
this._ws.addEventListener('close', this.Disconnect);
|
|
42
47
|
// TODO This doesn't really communicate the chain why our initializer failed
|
|
43
48
|
res();
|
|
44
49
|
}
|
|
@@ -47,7 +52,7 @@ class ButtplugBrowserWebsocketConnector extends events_1.EventEmitter {
|
|
|
47
52
|
rej();
|
|
48
53
|
}
|
|
49
54
|
}));
|
|
50
|
-
ws.addEventListener(
|
|
55
|
+
ws.addEventListener('close', conErrorCallback);
|
|
51
56
|
return p;
|
|
52
57
|
});
|
|
53
58
|
this.Disconnect = () => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -56,7 +61,7 @@ class ButtplugBrowserWebsocketConnector extends events_1.EventEmitter {
|
|
|
56
61
|
}
|
|
57
62
|
this._ws.close();
|
|
58
63
|
this._ws = undefined;
|
|
59
|
-
this.emit(
|
|
64
|
+
this.emit('disconnect');
|
|
60
65
|
});
|
|
61
66
|
this.Initialize = () => __awaiter(this, void 0, void 0, function* () {
|
|
62
67
|
return Promise.resolve();
|
|
@@ -67,25 +72,27 @@ class ButtplugBrowserWebsocketConnector extends events_1.EventEmitter {
|
|
|
67
72
|
}
|
|
68
73
|
SendMessage(msg) {
|
|
69
74
|
if (!this.Connected) {
|
|
70
|
-
throw new Error(
|
|
75
|
+
throw new Error('ButtplugBrowserWebsocketConnector not connected');
|
|
71
76
|
}
|
|
72
|
-
this._ws.send(
|
|
77
|
+
this._ws.send('[' + msg.toJSON() + ']');
|
|
73
78
|
}
|
|
74
79
|
ParseIncomingMessage(event) {
|
|
75
|
-
console.log(
|
|
76
|
-
if (typeof
|
|
80
|
+
console.log('Calling parent parse incoming');
|
|
81
|
+
if (typeof event.data === 'string') {
|
|
77
82
|
const msgs = (0, MessageUtils_1.FromJSON)(event.data);
|
|
78
|
-
this.emit(
|
|
83
|
+
this.emit('message', msgs);
|
|
79
84
|
}
|
|
80
85
|
else if (event.data instanceof Blob) {
|
|
81
86
|
const reader = new FileReader();
|
|
82
|
-
reader.addEventListener(
|
|
87
|
+
reader.addEventListener('load', (ev) => {
|
|
88
|
+
this.OnReaderLoad(ev);
|
|
89
|
+
});
|
|
83
90
|
reader.readAsText(event.data);
|
|
84
91
|
}
|
|
85
92
|
}
|
|
86
93
|
OnReaderLoad(event) {
|
|
87
94
|
const msgs = (0, MessageUtils_1.FromJSON)(event.target.result);
|
|
88
|
-
this.emit(
|
|
95
|
+
this.emit('message', msgs);
|
|
89
96
|
}
|
|
90
97
|
}
|
|
91
98
|
exports.ButtplugBrowserWebsocketConnector = ButtplugBrowserWebsocketConnector;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ButtplugBrowserWebsocketConnector.js","sourceRoot":"","sources":["../../../../src/utils/ButtplugBrowserWebsocketConnector.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;;;;;;;;;;;;AAEb,mCAAsC;AAEtC,uDAAgD;AAEhD,MAAa,iCAAkC,SAAQ,qBAAY;
|
|
1
|
+
{"version":3,"file":"ButtplugBrowserWebsocketConnector.js","sourceRoot":"","sources":["../../../../src/utils/ButtplugBrowserWebsocketConnector.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,11 +5,14 @@
|
|
|
5
5
|
*
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
|
-
import * as Messages from
|
|
8
|
+
import * as Messages from '../core/Messages';
|
|
9
9
|
export declare class ButtplugMessageSorter {
|
|
10
10
|
private _useCounter;
|
|
11
11
|
protected _counter: number;
|
|
12
|
-
protected _waitingMsgs: Map<number, [
|
|
12
|
+
protected _waitingMsgs: Map<number, [
|
|
13
|
+
(val: Messages.ButtplugMessage) => void,
|
|
14
|
+
(err: Error) => void
|
|
15
|
+
]>;
|
|
13
16
|
constructor(_useCounter: boolean);
|
|
14
17
|
PrepareOutgoingMessage(msg: Messages.ButtplugMessage): Promise<Messages.ButtplugMessage>;
|
|
15
18
|
ParseIncomingMessages(msgs: Messages.ButtplugMessage[]): Messages.ButtplugMessage[];
|