buttplug 3.0.0-alpha.4 → 3.0.0
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/CHANGELOG.md +6 -2
- package/dist/main/src/client/ButtplugClientConnectorException.d.ts +2 -2
- package/dist/main/src/client/ButtplugClientConnectorException.js +1 -1
- package/dist/main/src/client/ButtplugClientConnectorException.js.map +1 -1
- package/dist/main/src/client/ButtplugClientDevice.js +23 -23
- package/dist/main/src/client/ButtplugClientDevice.js.map +1 -1
- package/dist/main/src/client/Client.js +5 -5
- package/dist/main/src/client/Client.js.map +1 -1
- package/dist/main/src/core/Exceptions.d.ts +9 -9
- package/dist/main/src/core/Exceptions.js +19 -19
- package/dist/main/src/core/Exceptions.js.map +1 -1
- package/dist/main/src/utils/ButtplugMessageSorter.js +1 -1
- package/dist/main/src/utils/ButtplugMessageSorter.js.map +1 -1
- package/dist/web/buttplug.js +50 -50
- package/dist/web/buttplug.min.js +1 -1
- package/dist/web/buttplug.min.js.map +1 -1
- package/package.json +1 -1
- package/src/client/ButtplugClientConnectorException.ts +2 -2
- package/src/client/ButtplugClientDevice.ts +26 -26
- package/src/client/Client.ts +13 -13
- package/src/core/Exceptions.ts +13 -13
- package/src/utils/ButtplugMessageSorter.ts +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,16 @@
|
|
|
1
|
-
# v3.0.0 (2022/12/
|
|
1
|
+
# v3.0.0 (2022/12/30)
|
|
2
2
|
|
|
3
3
|
- Back to pure Typescript. Back to the good shit.
|
|
4
|
+
- Removed server
|
|
5
|
+
- Brought implementation in line with the FFI Client API, so minimal changes should be needed for
|
|
6
|
+
porting from v1.
|
|
4
7
|
|
|
5
8
|
# v2.0.0
|
|
6
9
|
|
|
7
10
|
- There is no buttplug-js v2
|
|
8
11
|
- There is no Miss Zarves
|
|
9
|
-
- (Version skipped to align JS and C# implementation versions
|
|
12
|
+
- (Version skipped to align JS and C# implementation versions, which will probably fall out of
|
|
13
|
+
alignment again very quickly)
|
|
10
14
|
|
|
11
15
|
# v1.0.16 (2021/10/16) (FFI Impl)
|
|
12
16
|
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
|
-
import {
|
|
9
|
-
export declare class ButtplugClientConnectorException extends
|
|
8
|
+
import { ButtplugError } from '../core/Exceptions';
|
|
9
|
+
export declare class ButtplugClientConnectorException extends ButtplugError {
|
|
10
10
|
constructor(message: string);
|
|
11
11
|
}
|
|
@@ -33,7 +33,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
33
33
|
exports.ButtplugClientConnectorException = void 0;
|
|
34
34
|
const Exceptions_1 = require("../core/Exceptions");
|
|
35
35
|
const Messages = __importStar(require("../core/Messages"));
|
|
36
|
-
class ButtplugClientConnectorException extends Exceptions_1.
|
|
36
|
+
class ButtplugClientConnectorException extends Exceptions_1.ButtplugError {
|
|
37
37
|
constructor(message) {
|
|
38
38
|
super(message, Messages.ErrorClass.ERROR_UNKNOWN);
|
|
39
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ButtplugClientConnectorException.js","sourceRoot":"","sources":["../../../../src/client/ButtplugClientConnectorException.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,
|
|
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"}
|
|
@@ -107,9 +107,9 @@ class ButtplugClientDevice extends events_1.EventEmitter {
|
|
|
107
107
|
case Messages.Ok:
|
|
108
108
|
return;
|
|
109
109
|
case Messages.Error:
|
|
110
|
-
throw Exceptions_1.
|
|
110
|
+
throw Exceptions_1.ButtplugError.FromError(response);
|
|
111
111
|
default:
|
|
112
|
-
throw new Exceptions_1.
|
|
112
|
+
throw new Exceptions_1.ButtplugMessageError(`Message type ${response.constructor} not handled by SendMsgExpectOk`);
|
|
113
113
|
}
|
|
114
114
|
});
|
|
115
115
|
}
|
|
@@ -128,7 +128,7 @@ class ButtplugClientDevice extends events_1.EventEmitter {
|
|
|
128
128
|
return __awaiter(this, void 0, void 0, function* () {
|
|
129
129
|
const scalarAttrs = (_a = this.messageAttributes.ScalarCmd) === null || _a === void 0 ? void 0 : _a.filter((x) => x.ActuatorType === actuator);
|
|
130
130
|
if (!scalarAttrs || scalarAttrs.length === 0) {
|
|
131
|
-
throw new Exceptions_1.
|
|
131
|
+
throw new Exceptions_1.ButtplugDeviceError(`Device ${this.name} has no ${actuator} capabilities`);
|
|
132
132
|
}
|
|
133
133
|
const cmds = [];
|
|
134
134
|
if (typeof speed === 'number') {
|
|
@@ -136,14 +136,14 @@ class ButtplugClientDevice extends events_1.EventEmitter {
|
|
|
136
136
|
}
|
|
137
137
|
else if (Array.isArray(speed)) {
|
|
138
138
|
if (speed.length > scalarAttrs.length) {
|
|
139
|
-
throw new Exceptions_1.
|
|
139
|
+
throw new Exceptions_1.ButtplugDeviceError(`${speed.length} commands send to a device with ${scalarAttrs.length} vibrators`);
|
|
140
140
|
}
|
|
141
141
|
scalarAttrs.forEach((x, i) => {
|
|
142
142
|
cmds.push(new Messages.ScalarSubcommand(x.Index, speed[i], actuator));
|
|
143
143
|
});
|
|
144
144
|
}
|
|
145
145
|
else {
|
|
146
|
-
throw new Exceptions_1.
|
|
146
|
+
throw new Exceptions_1.ButtplugDeviceError(`${actuator} can only take numbers or arrays of numbers.`);
|
|
147
147
|
}
|
|
148
148
|
yield this.scalar(cmds);
|
|
149
149
|
});
|
|
@@ -174,7 +174,7 @@ class ButtplugClientDevice extends events_1.EventEmitter {
|
|
|
174
174
|
return __awaiter(this, void 0, void 0, function* () {
|
|
175
175
|
const rotateAttrs = this.messageAttributes.RotateCmd;
|
|
176
176
|
if (!rotateAttrs || rotateAttrs.length === 0) {
|
|
177
|
-
throw new Exceptions_1.
|
|
177
|
+
throw new Exceptions_1.ButtplugDeviceError(`Device ${this.name} has no Rotate capabilities`);
|
|
178
178
|
}
|
|
179
179
|
let msg;
|
|
180
180
|
if (typeof values === 'number') {
|
|
@@ -184,7 +184,7 @@ class ButtplugClientDevice extends events_1.EventEmitter {
|
|
|
184
184
|
msg = Messages.RotateCmd.Create(this.index, values);
|
|
185
185
|
}
|
|
186
186
|
else {
|
|
187
|
-
throw new Exceptions_1.
|
|
187
|
+
throw new Exceptions_1.ButtplugDeviceError('SendRotateCmd can only take a number and boolean, or an array of number/boolean tuples');
|
|
188
188
|
}
|
|
189
189
|
yield this.sendExpectOk(msg);
|
|
190
190
|
});
|
|
@@ -197,7 +197,7 @@ class ButtplugClientDevice extends events_1.EventEmitter {
|
|
|
197
197
|
return __awaiter(this, void 0, void 0, function* () {
|
|
198
198
|
const linearAttrs = this.messageAttributes.LinearCmd;
|
|
199
199
|
if (!linearAttrs || linearAttrs.length === 0) {
|
|
200
|
-
throw new Exceptions_1.
|
|
200
|
+
throw new Exceptions_1.ButtplugDeviceError(`Device ${this.name} has no Linear capabilities`);
|
|
201
201
|
}
|
|
202
202
|
let msg;
|
|
203
203
|
if (typeof values === 'number') {
|
|
@@ -207,7 +207,7 @@ class ButtplugClientDevice extends events_1.EventEmitter {
|
|
|
207
207
|
msg = Messages.LinearCmd.Create(this.index, values);
|
|
208
208
|
}
|
|
209
209
|
else {
|
|
210
|
-
throw new Exceptions_1.
|
|
210
|
+
throw new Exceptions_1.ButtplugDeviceError('SendLinearCmd can only take a number and number, or an array of number/number tuples');
|
|
211
211
|
}
|
|
212
212
|
yield this.sendExpectOk(msg);
|
|
213
213
|
});
|
|
@@ -219,9 +219,9 @@ class ButtplugClientDevice extends events_1.EventEmitter {
|
|
|
219
219
|
case Messages.SensorReading:
|
|
220
220
|
return response.Data;
|
|
221
221
|
case Messages.Error:
|
|
222
|
-
throw Exceptions_1.
|
|
222
|
+
throw Exceptions_1.ButtplugError.FromError(response);
|
|
223
223
|
default:
|
|
224
|
-
throw new Exceptions_1.
|
|
224
|
+
throw new Exceptions_1.ButtplugMessageError(`Message type ${response.constructor} not handled by sensorRead`);
|
|
225
225
|
}
|
|
226
226
|
});
|
|
227
227
|
}
|
|
@@ -234,7 +234,7 @@ class ButtplugClientDevice extends events_1.EventEmitter {
|
|
|
234
234
|
var _a;
|
|
235
235
|
return __awaiter(this, void 0, void 0, function* () {
|
|
236
236
|
if (!this.hasBattery) {
|
|
237
|
-
throw new Exceptions_1.
|
|
237
|
+
throw new Exceptions_1.ButtplugDeviceError(`Device ${this.name} has no Battery capabilities`);
|
|
238
238
|
}
|
|
239
239
|
const batteryAttrs = (_a = this.messageAttributes.SensorReadCmd) === null || _a === void 0 ? void 0 : _a.filter((x) => x.SensorType === Messages.SensorType.Battery);
|
|
240
240
|
// Find the battery sensor, we'll need its index.
|
|
@@ -251,7 +251,7 @@ class ButtplugClientDevice extends events_1.EventEmitter {
|
|
|
251
251
|
var _a;
|
|
252
252
|
return __awaiter(this, void 0, void 0, function* () {
|
|
253
253
|
if (!this.hasRssi) {
|
|
254
|
-
throw new Exceptions_1.
|
|
254
|
+
throw new Exceptions_1.ButtplugDeviceError(`Device ${this.name} has no RSSI capabilities`);
|
|
255
255
|
}
|
|
256
256
|
const rssiAttrs = (_a = this.messageAttributes.SensorReadCmd) === null || _a === void 0 ? void 0 : _a.filter((x) => x.SensorType === Messages.SensorType.RSSI);
|
|
257
257
|
// Find the battery sensor, we'll need its index.
|
|
@@ -262,29 +262,29 @@ class ButtplugClientDevice extends events_1.EventEmitter {
|
|
|
262
262
|
rawRead(endpoint, expectedLength, timeout) {
|
|
263
263
|
return __awaiter(this, void 0, void 0, function* () {
|
|
264
264
|
if (!this.messageAttributes.RawReadCmd) {
|
|
265
|
-
throw new Exceptions_1.
|
|
265
|
+
throw new Exceptions_1.ButtplugDeviceError(`Device ${this.name} has no raw read capabilities`);
|
|
266
266
|
}
|
|
267
267
|
if (this.messageAttributes.RawReadCmd.Endpoints.indexOf(endpoint) === -1) {
|
|
268
|
-
throw new Exceptions_1.
|
|
268
|
+
throw new Exceptions_1.ButtplugDeviceError(`Device ${this.name} has no raw readable endpoint ${endpoint}`);
|
|
269
269
|
}
|
|
270
270
|
const response = yield this.send(new Messages.RawReadCmd(this.index, endpoint, expectedLength, timeout));
|
|
271
271
|
switch (response.constructor) {
|
|
272
272
|
case Messages.RawReading:
|
|
273
273
|
return new Uint8Array(response.Data);
|
|
274
274
|
case Messages.Error:
|
|
275
|
-
throw Exceptions_1.
|
|
275
|
+
throw Exceptions_1.ButtplugError.FromError(response);
|
|
276
276
|
default:
|
|
277
|
-
throw new Exceptions_1.
|
|
277
|
+
throw new Exceptions_1.ButtplugMessageError(`Message type ${response.constructor} not handled by rawRead`);
|
|
278
278
|
}
|
|
279
279
|
});
|
|
280
280
|
}
|
|
281
281
|
rawWrite(endpoint, data, writeWithResponse) {
|
|
282
282
|
return __awaiter(this, void 0, void 0, function* () {
|
|
283
283
|
if (!this.messageAttributes.RawWriteCmd) {
|
|
284
|
-
throw new Exceptions_1.
|
|
284
|
+
throw new Exceptions_1.ButtplugDeviceError(`Device ${this.name} has no raw write capabilities`);
|
|
285
285
|
}
|
|
286
286
|
if (this.messageAttributes.RawWriteCmd.Endpoints.indexOf(endpoint) === -1) {
|
|
287
|
-
throw new Exceptions_1.
|
|
287
|
+
throw new Exceptions_1.ButtplugDeviceError(`Device ${this.name} has no raw writable endpoint ${endpoint}`);
|
|
288
288
|
}
|
|
289
289
|
yield this.sendExpectOk(new Messages.RawWriteCmd(this.index, endpoint, data, writeWithResponse));
|
|
290
290
|
});
|
|
@@ -292,10 +292,10 @@ class ButtplugClientDevice extends events_1.EventEmitter {
|
|
|
292
292
|
rawSubscribe(endpoint) {
|
|
293
293
|
return __awaiter(this, void 0, void 0, function* () {
|
|
294
294
|
if (!this.messageAttributes.RawSubscribeCmd) {
|
|
295
|
-
throw new Exceptions_1.
|
|
295
|
+
throw new Exceptions_1.ButtplugDeviceError(`Device ${this.name} has no raw subscribe capabilities`);
|
|
296
296
|
}
|
|
297
297
|
if (this.messageAttributes.RawSubscribeCmd.Endpoints.indexOf(endpoint) === -1) {
|
|
298
|
-
throw new Exceptions_1.
|
|
298
|
+
throw new Exceptions_1.ButtplugDeviceError(`Device ${this.name} has no raw subscribable endpoint ${endpoint}`);
|
|
299
299
|
}
|
|
300
300
|
yield this.sendExpectOk(new Messages.RawSubscribeCmd(this.index, endpoint));
|
|
301
301
|
});
|
|
@@ -304,10 +304,10 @@ class ButtplugClientDevice extends events_1.EventEmitter {
|
|
|
304
304
|
return __awaiter(this, void 0, void 0, function* () {
|
|
305
305
|
// This reuses raw subscribe's info.
|
|
306
306
|
if (!this.messageAttributes.RawSubscribeCmd) {
|
|
307
|
-
throw new Exceptions_1.
|
|
307
|
+
throw new Exceptions_1.ButtplugDeviceError(`Device ${this.name} has no raw unsubscribe capabilities`);
|
|
308
308
|
}
|
|
309
309
|
if (this.messageAttributes.RawSubscribeCmd.Endpoints.indexOf(endpoint) === -1) {
|
|
310
|
-
throw new Exceptions_1.
|
|
310
|
+
throw new Exceptions_1.ButtplugDeviceError(`Device ${this.name} has no raw unsubscribable endpoint ${endpoint}`);
|
|
311
311
|
}
|
|
312
312
|
yield this.sendExpectOk(new Messages.RawUnsubscribeCmd(this.index, endpoint));
|
|
313
313
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ButtplugClientDevice.js","sourceRoot":"","sources":["../../../../src/client/ButtplugClientDevice.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACb,2DAA6C;AAC7C,mDAI4B;AAC5B,mCAAsC;AAEtC;;GAEG;AACH,MAAa,oBAAqB,SAAQ,qBAAY;IACpD;;OAEG;IACH,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC;IACrC,CAAC;IAED;;OAEG;IACH,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC;IAC5C,CAAC;IAED;;OAEG;IACH,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC;IACtC,CAAC;IAED;;OAEG;IACH,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC;IACjD,CAAC;IAED;;OAEG;IACH,IAAW,iBAAiB;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC;IACzC,CAAC;IAEM,MAAM,CAAC,OAAO,CACnB,GAAwB,EACxB,WAGsC;QAEtC,OAAO,IAAI,oBAAoB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IACpD,CAAC;IAQD;;;;OAIG;IACH,YACU,WAAgC,EAChC,YAG8B;QAEtC,KAAK,EAAE,CAAC;QANA,gBAAW,GAAX,WAAW,CAAqB;QAChC,iBAAY,GAAZ,YAAY,CAGkB;QAhBxC,+DAA+D;QACvD,gBAAW,GAA4C,IAAI,GAAG,EAGnE,CAAC;QAeF,WAAW,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;IACtC,CAAC;IAEY,IAAI,CACf,GAAmC;;YAEnC,0EAA0E;YAC1E,wDAAwD;YACxD,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC5C,CAAC;KAAA;IAEY,YAAY,CACvB,GAAmC;;YAEnC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACtC,QAAQ,QAAQ,CAAC,WAAW,EAAE;gBAC5B,KAAK,QAAQ,CAAC,EAAE;oBACd,OAAO;gBACT,KAAK,QAAQ,CAAC,KAAK;oBACjB,MAAM,
|
|
1
|
+
{"version":3,"file":"ButtplugClientDevice.js","sourceRoot":"","sources":["../../../../src/client/ButtplugClientDevice.ts"],"names":[],"mappings":"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"}
|
|
@@ -125,7 +125,7 @@ class ButtplugClient extends events_1.EventEmitter {
|
|
|
125
125
|
if (serverinfo.MessageVersion < Messages.MESSAGE_SPEC_VERSION) {
|
|
126
126
|
// Disconnect and throw an exception explaining the version mismatch problem.
|
|
127
127
|
yield this._connector.Disconnect();
|
|
128
|
-
throw Exceptions_1.
|
|
128
|
+
throw Exceptions_1.ButtplugError.LogAndError(Exceptions_1.ButtplugInitError, this._logger, `Server protocol version ${serverinfo.MessageVersion} is older than client protocol version ${Messages.MESSAGE_SPEC_VERSION}. Please update server.`);
|
|
129
129
|
}
|
|
130
130
|
if (ping > 0) {
|
|
131
131
|
/*
|
|
@@ -148,7 +148,7 @@ class ButtplugClient extends events_1.EventEmitter {
|
|
|
148
148
|
// server has detected.
|
|
149
149
|
yield this._connector.Disconnect();
|
|
150
150
|
const err = msg;
|
|
151
|
-
throw Exceptions_1.
|
|
151
|
+
throw Exceptions_1.ButtplugError.LogAndError(Exceptions_1.ButtplugInitError, this._logger, `Cannot connect to server. ${err.ErrorMessage}`);
|
|
152
152
|
}
|
|
153
153
|
}
|
|
154
154
|
return false;
|
|
@@ -182,9 +182,9 @@ class ButtplugClient extends events_1.EventEmitter {
|
|
|
182
182
|
case Messages.Ok:
|
|
183
183
|
return;
|
|
184
184
|
case Messages.Error:
|
|
185
|
-
throw Exceptions_1.
|
|
185
|
+
throw Exceptions_1.ButtplugError.FromError(response);
|
|
186
186
|
default:
|
|
187
|
-
throw Exceptions_1.
|
|
187
|
+
throw Exceptions_1.ButtplugError.LogAndError(Exceptions_1.ButtplugMessageError, this._logger, `Message type ${response.constructor} not handled by SendMsgExpectOk`);
|
|
188
188
|
}
|
|
189
189
|
});
|
|
190
190
|
this.sendDeviceMessageClosure = (device, msg) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -214,7 +214,7 @@ class ButtplugClient extends events_1.EventEmitter {
|
|
|
214
214
|
this.checkConnector();
|
|
215
215
|
const dev = this._devices.get(device.index);
|
|
216
216
|
if (dev === undefined) {
|
|
217
|
-
throw Exceptions_1.
|
|
217
|
+
throw Exceptions_1.ButtplugError.LogAndError(Exceptions_1.ButtplugDeviceError, this._logger, `Device ${device.index} not available.`);
|
|
218
218
|
}
|
|
219
219
|
deviceMsg.DeviceIndex = device.index;
|
|
220
220
|
return yield this.sendMessage(deviceMsg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../../../src/client/Client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../../../src/client/Client.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,30 +7,30 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import * as Messages from './Messages';
|
|
9
9
|
import { ButtplugLogger } from './Logging';
|
|
10
|
-
export declare class
|
|
10
|
+
export declare class ButtplugError extends Error {
|
|
11
11
|
get ErrorClass(): Messages.ErrorClass;
|
|
12
|
-
get
|
|
12
|
+
get InnerError(): Error | undefined;
|
|
13
13
|
get Id(): number | undefined;
|
|
14
14
|
get ErrorMessage(): Messages.ButtplugMessage;
|
|
15
|
-
static LogAndError<T extends
|
|
16
|
-
static FromError(error: Messages.Error):
|
|
15
|
+
static LogAndError<T extends ButtplugError>(constructor: new (str: string, num: number) => T, logger: ButtplugLogger, message: string, id?: number): T;
|
|
16
|
+
static FromError(error: Messages.Error): ButtplugDeviceError | ButtplugInitError | ButtplugUnknownError | ButtplugPingError | ButtplugMessageError;
|
|
17
17
|
errorClass: Messages.ErrorClass;
|
|
18
18
|
innerError: Error | undefined;
|
|
19
19
|
messageId: number | undefined;
|
|
20
20
|
protected constructor(message: string, errorClass: Messages.ErrorClass, id?: number, inner?: Error);
|
|
21
21
|
}
|
|
22
|
-
export declare class
|
|
22
|
+
export declare class ButtplugInitError extends ButtplugError {
|
|
23
23
|
constructor(message: string, id?: number);
|
|
24
24
|
}
|
|
25
|
-
export declare class
|
|
25
|
+
export declare class ButtplugDeviceError extends ButtplugError {
|
|
26
26
|
constructor(message: string, id?: number);
|
|
27
27
|
}
|
|
28
|
-
export declare class
|
|
28
|
+
export declare class ButtplugMessageError extends ButtplugError {
|
|
29
29
|
constructor(message: string, id?: number);
|
|
30
30
|
}
|
|
31
|
-
export declare class
|
|
31
|
+
export declare class ButtplugPingError extends ButtplugError {
|
|
32
32
|
constructor(message: string, id?: number);
|
|
33
33
|
}
|
|
34
|
-
export declare class
|
|
34
|
+
export declare class ButtplugUnknownError extends ButtplugError {
|
|
35
35
|
constructor(message: string, id?: number);
|
|
36
36
|
}
|
|
@@ -30,13 +30,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
30
30
|
return result;
|
|
31
31
|
};
|
|
32
32
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
33
|
-
exports.
|
|
33
|
+
exports.ButtplugUnknownError = exports.ButtplugPingError = exports.ButtplugMessageError = exports.ButtplugDeviceError = exports.ButtplugInitError = exports.ButtplugError = void 0;
|
|
34
34
|
const Messages = __importStar(require("./Messages"));
|
|
35
|
-
class
|
|
35
|
+
class ButtplugError extends Error {
|
|
36
36
|
get ErrorClass() {
|
|
37
37
|
return this.errorClass;
|
|
38
38
|
}
|
|
39
|
-
get
|
|
39
|
+
get InnerError() {
|
|
40
40
|
return this.innerError;
|
|
41
41
|
}
|
|
42
42
|
get Id() {
|
|
@@ -52,15 +52,15 @@ class ButtplugException extends Error {
|
|
|
52
52
|
static FromError(error) {
|
|
53
53
|
switch (error.ErrorCode) {
|
|
54
54
|
case Messages.ErrorClass.ERROR_DEVICE:
|
|
55
|
-
return new
|
|
55
|
+
return new ButtplugDeviceError(error.ErrorMessage, error.Id);
|
|
56
56
|
case Messages.ErrorClass.ERROR_INIT:
|
|
57
|
-
return new
|
|
57
|
+
return new ButtplugInitError(error.ErrorMessage, error.Id);
|
|
58
58
|
case Messages.ErrorClass.ERROR_UNKNOWN:
|
|
59
|
-
return new
|
|
59
|
+
return new ButtplugUnknownError(error.ErrorMessage, error.Id);
|
|
60
60
|
case Messages.ErrorClass.ERROR_PING:
|
|
61
|
-
return new
|
|
61
|
+
return new ButtplugPingError(error.ErrorMessage, error.Id);
|
|
62
62
|
case Messages.ErrorClass.ERROR_MSG:
|
|
63
|
-
return new
|
|
63
|
+
return new ButtplugMessageError(error.ErrorMessage, error.Id);
|
|
64
64
|
default:
|
|
65
65
|
throw new Error(`Message type ${error.ErrorCode} not handled`);
|
|
66
66
|
}
|
|
@@ -73,35 +73,35 @@ class ButtplugException extends Error {
|
|
|
73
73
|
this.messageId = id;
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
|
-
exports.
|
|
77
|
-
class
|
|
76
|
+
exports.ButtplugError = ButtplugError;
|
|
77
|
+
class ButtplugInitError extends ButtplugError {
|
|
78
78
|
constructor(message, id = Messages.SYSTEM_MESSAGE_ID) {
|
|
79
79
|
super(message, Messages.ErrorClass.ERROR_INIT, id);
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
|
-
exports.
|
|
83
|
-
class
|
|
82
|
+
exports.ButtplugInitError = ButtplugInitError;
|
|
83
|
+
class ButtplugDeviceError extends ButtplugError {
|
|
84
84
|
constructor(message, id = Messages.SYSTEM_MESSAGE_ID) {
|
|
85
85
|
super(message, Messages.ErrorClass.ERROR_DEVICE, id);
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
|
-
exports.
|
|
89
|
-
class
|
|
88
|
+
exports.ButtplugDeviceError = ButtplugDeviceError;
|
|
89
|
+
class ButtplugMessageError extends ButtplugError {
|
|
90
90
|
constructor(message, id = Messages.SYSTEM_MESSAGE_ID) {
|
|
91
91
|
super(message, Messages.ErrorClass.ERROR_MSG, id);
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
|
-
exports.
|
|
95
|
-
class
|
|
94
|
+
exports.ButtplugMessageError = ButtplugMessageError;
|
|
95
|
+
class ButtplugPingError extends ButtplugError {
|
|
96
96
|
constructor(message, id = Messages.SYSTEM_MESSAGE_ID) {
|
|
97
97
|
super(message, Messages.ErrorClass.ERROR_PING, id);
|
|
98
98
|
}
|
|
99
99
|
}
|
|
100
|
-
exports.
|
|
101
|
-
class
|
|
100
|
+
exports.ButtplugPingError = ButtplugPingError;
|
|
101
|
+
class ButtplugUnknownError extends ButtplugError {
|
|
102
102
|
constructor(message, id = Messages.SYSTEM_MESSAGE_ID) {
|
|
103
103
|
super(message, Messages.ErrorClass.ERROR_UNKNOWN, id);
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
|
-
exports.
|
|
106
|
+
exports.ButtplugUnknownError = ButtplugUnknownError;
|
|
107
107
|
//# sourceMappingURL=Exceptions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Exceptions.js","sourceRoot":"","sources":["../../../../src/core/Exceptions.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,qDAAuC;AAGvC,MAAa,
|
|
1
|
+
{"version":3,"file":"Exceptions.js","sourceRoot":"","sources":["../../../../src/core/Exceptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,7 +65,7 @@ class ButtplugMessageSorter {
|
|
|
65
65
|
// If we've gotten back an error, reject the related promise using a
|
|
66
66
|
// ButtplugException derived type.
|
|
67
67
|
if (x.Type === Messages.Error) {
|
|
68
|
-
rej(Exceptions_1.
|
|
68
|
+
rej(Exceptions_1.ButtplugError.FromError(x));
|
|
69
69
|
continue;
|
|
70
70
|
}
|
|
71
71
|
res(x);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ButtplugMessageSorter.js","sourceRoot":"","sources":["../../../../src/utils/ButtplugMessageSorter.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,2DAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"ButtplugMessageSorter.js","sourceRoot":"","sources":["../../../../src/utils/ButtplugMessageSorter.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,2DAA6C;AAC7C,mDAAmD;AAEnD,MAAa,qBAAqB;IAOhC,YAA2B,WAAoB;QAApB,gBAAW,GAAX,WAAW,CAAS;QANrC,aAAQ,GAAG,CAAC,CAAC;QACb,iBAAY,GAGlB,IAAI,GAAG,EAAE,CAAC;IAEoC,CAAC;IAEnD,6EAA6E;IAC7E,yDAAyD;IACzD,wCAAwC;IACjC,sBAAsB,CAC3B,GAA6B;QAE7B,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC;YACvB,sDAAsD;YACtD,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC;SACpB;QACD,IAAI,GAAG,CAAC;QACR,IAAI,GAAG,CAAC;QACR,MAAM,UAAU,GAAG,IAAI,OAAO,CAC5B,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAClB,GAAG,GAAG,OAAO,CAAC;YACd,GAAG,GAAG,MAAM,CAAC;QACf,CAAC,CACF,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QAC1C,OAAO,UAAU,CAAC;IACpB,CAAC;IAEM,qBAAqB,CAC1B,IAAgC;QAEhC,MAAM,OAAO,GAA+B,EAAE,CAAC;QAC/C,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;YACpB,IAAI,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,iBAAiB,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE;gBACtE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAE,CAAC;gBAChD,oEAAoE;gBACpE,kCAAkC;gBAClC,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,KAAK,EAAE;oBAC7B,GAAG,CAAC,0BAAa,CAAC,SAAS,CAAC,CAAmB,CAAC,CAAC,CAAC;oBAClD,SAAS;iBACV;gBACD,GAAG,CAAC,CAAC,CAAC,CAAC;gBACP,SAAS;aACV;iBAAM;gBACL,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;SACF;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AArDD,sDAqDC"}
|