buttplug 1.0.13 → 1.0.17
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 +29 -0
- package/dist/module/buttplug-rs-ffi/buttplug_rs_ffi.d.ts +9 -4
- package/dist/module/buttplug-rs-ffi/buttplug_rs_ffi.js +2 -2
- package/dist/module/buttplug-rs-ffi/buttplug_rs_ffi_bg.js +6 -630
- package/dist/module/buttplug-rs-ffi/buttplug_rs_ffi_bg.wasm +0 -0
- package/dist/module/buttplug-rs-ffi/buttplug_rs_ffi_bg.wasm.d.ts +6 -6
- package/dist/module/buttplug-rs-ffi/buttplug_rs_ffi_bg_node.js +799 -0
- package/dist/module/buttplug-rs-ffi/buttplug_rs_ffi_bg_web.js +788 -0
- package/dist/module/buttplug_ffi.d.ts +2 -1
- package/dist/module/buttplug_ffi.js +2747 -2105
- package/dist/module/client.d.ts +2 -2
- package/dist/module/client.js +13 -13
- package/dist/module/client.js.map +1 -1
- package/dist/module/connectors.d.ts +2 -2
- package/dist/module/connectors.js +19 -14
- package/dist/module/connectors.js.map +1 -1
- package/dist/module/device.d.ts +4 -3
- package/dist/module/device.js +15 -14
- package/dist/module/device.js.map +1 -1
- package/dist/module/errors.d.ts +1 -1
- package/dist/module/errors.js +1 -1
- package/dist/module/errors.js.map +1 -1
- package/dist/module/ffi.d.ts +19 -19
- package/dist/module/ffi.js +52 -47
- package/dist/module/ffi.js.map +1 -1
- package/dist/module/index.d.ts +8 -8
- package/dist/module/index.js +8 -6
- package/dist/module/index.js.map +1 -1
- package/dist/module/sorter.d.ts +1 -1
- package/dist/module/sorter.js +1 -1
- package/dist/module/sorter.js.map +1 -1
- package/dist/module/web_index.d.ts +1 -1
- package/dist/module/web_index.js +1 -1
- package/dist/module/web_index.js.map +1 -1
- package/dist/web/0.buttplug.js +663 -384
- package/dist/web/1.buttplug.min.js +1 -1
- package/dist/web/1.buttplug.min.js.map +1 -1
- package/dist/web/b0219b34bc18e1ad0240.module.wasm +0 -0
- package/dist/web/buttplug.js +825 -740
- package/dist/web/buttplug.min.js +8 -8
- package/dist/web/buttplug.min.js.map +1 -1
- package/dist/web/e5566a8b6a3fda978549.module.wasm +0 -0
- package/index.html +6 -10
- package/package.json +28 -17
- package/tsconfig.json +0 -1
- package/{webpack.base.js → webpack.base.cjs} +30 -6
- package/dist/module/buttplug-rs-ffi/buttplug_rs_ffi.js.map +0 -1
- package/dist/module/buttplug-rs-ffi/buttplug_rs_ffi_bg.d.ts +0 -117
- package/dist/module/buttplug-rs-ffi/buttplug_rs_ffi_bg.js.map +0 -1
- package/dist/module/buttplug_ffi.js.map +0 -1
- package/dist/web/17a5dc1db11d74b795d7.module.wasm +0 -0
- package/dist/web/7cd0851698bfb0cd22ea.module.wasm +0 -0
package/dist/module/client.d.ts
CHANGED
|
@@ -7,8 +7,8 @@
|
|
|
7
7
|
*/
|
|
8
8
|
/// <reference types="node" />
|
|
9
9
|
import { EventEmitter } from "events";
|
|
10
|
-
import { ButtplugEmbeddedConnectorOptions, ButtplugWebsocketConnectorOptions } from "./connectors";
|
|
11
|
-
import { ButtplugClientDevice } from "./device";
|
|
10
|
+
import { ButtplugEmbeddedConnectorOptions, ButtplugWebsocketConnectorOptions } from "./connectors.js";
|
|
11
|
+
import { ButtplugClientDevice } from "./device.js";
|
|
12
12
|
export declare class ButtplugClient extends EventEmitter {
|
|
13
13
|
protected _devices: Map<number, ButtplugClientDevice>;
|
|
14
14
|
protected _clientName: string;
|
package/dist/module/client.js
CHANGED
|
@@ -7,12 +7,12 @@
|
|
|
7
7
|
*/
|
|
8
8
|
"use strict";
|
|
9
9
|
import { EventEmitter } from "events";
|
|
10
|
-
import { Buttplug } from "./buttplug_ffi";
|
|
11
|
-
import { ButtplugClientConnectorError } from "./errors";
|
|
12
|
-
import { createClientPtr, createDevicePtr, connectEmbedded, connectWebsocket, startScanning, stopScanning, stopAllDevices, disconnect } from "./ffi";
|
|
13
|
-
import { ButtplugEmbeddedConnectorOptions, ButtplugWebsocketConnectorOptions } from "./connectors";
|
|
14
|
-
import { ButtplugMessageSorter } from "./sorter";
|
|
15
|
-
import { ButtplugClientDevice } from "./device";
|
|
10
|
+
import { Buttplug } from "./buttplug_ffi.js";
|
|
11
|
+
import { ButtplugClientConnectorError } from "./errors.js";
|
|
12
|
+
import { createClientPtr, createDevicePtr, connectEmbedded, connectWebsocket, startScanning, stopScanning, stopAllDevices, disconnect } from "./ffi.js";
|
|
13
|
+
import { ButtplugEmbeddedConnectorOptions, ButtplugWebsocketConnectorOptions } from "./connectors.js";
|
|
14
|
+
import { ButtplugMessageSorter } from "./sorter.js";
|
|
15
|
+
import { ButtplugClientDevice } from "./device.js";
|
|
16
16
|
export class ButtplugClient extends EventEmitter {
|
|
17
17
|
constructor(clientName = "Generic Buttplug Client") {
|
|
18
18
|
super();
|
|
@@ -27,10 +27,10 @@ export class ButtplugClient extends EventEmitter {
|
|
|
27
27
|
throw new ButtplugClientConnectorError("Client already connected.");
|
|
28
28
|
}
|
|
29
29
|
if (options instanceof ButtplugEmbeddedConnectorOptions) {
|
|
30
|
-
await connectEmbedded(this._sorter, this._clientPtr, options);
|
|
30
|
+
await connectEmbedded(this._sorter, this._clientPtr, options, this.sorterCallback);
|
|
31
31
|
}
|
|
32
32
|
else if (options instanceof ButtplugWebsocketConnectorOptions) {
|
|
33
|
-
await connectWebsocket(this._sorter, this._clientPtr, options);
|
|
33
|
+
await connectWebsocket(this._sorter, this._clientPtr, options, this.sorterCallback);
|
|
34
34
|
}
|
|
35
35
|
else {
|
|
36
36
|
throw new ButtplugClientConnectorError("Invalid connector type.");
|
|
@@ -41,27 +41,27 @@ export class ButtplugClient extends EventEmitter {
|
|
|
41
41
|
if (!this._clientPtr) {
|
|
42
42
|
throw new ButtplugClientConnectorError("Not connected.");
|
|
43
43
|
}
|
|
44
|
-
await disconnect(this._sorter, this._clientPtr);
|
|
44
|
+
await disconnect(this._sorter, this._clientPtr, this.sorterCallback);
|
|
45
45
|
};
|
|
46
46
|
this.startScanning = async () => {
|
|
47
47
|
if (!this._connected) {
|
|
48
48
|
throw new ButtplugClientConnectorError("Not connected.");
|
|
49
49
|
}
|
|
50
|
-
await startScanning(this._sorter, this._clientPtr);
|
|
51
50
|
this._isScanning = true;
|
|
51
|
+
await startScanning(this._sorter, this._clientPtr, this.sorterCallback);
|
|
52
52
|
};
|
|
53
53
|
this.stopScanning = async () => {
|
|
54
54
|
if (!this._connected) {
|
|
55
55
|
throw new ButtplugClientConnectorError("Not connected.");
|
|
56
56
|
}
|
|
57
|
-
await stopScanning(this._sorter, this._clientPtr);
|
|
58
57
|
this._isScanning = false;
|
|
58
|
+
await stopScanning(this._sorter, this._clientPtr, this.sorterCallback);
|
|
59
59
|
};
|
|
60
60
|
this.stopAllDevices = async () => {
|
|
61
61
|
if (!this._connected) {
|
|
62
62
|
throw new ButtplugClientConnectorError("Not connected.");
|
|
63
63
|
}
|
|
64
|
-
await stopAllDevices(this._sorter, this._clientPtr);
|
|
64
|
+
await stopAllDevices(this._sorter, this._clientPtr, this.sorterCallback);
|
|
65
65
|
};
|
|
66
66
|
this.sorterCallback = (buf) => {
|
|
67
67
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
@@ -73,7 +73,7 @@ export class ButtplugClient extends EventEmitter {
|
|
|
73
73
|
if ((_b = (_a = msg.message) === null || _a === void 0 ? void 0 : _a.serverMessage) === null || _b === void 0 ? void 0 : _b.deviceAdded) {
|
|
74
74
|
const addedMsg = (_d = (_c = msg.message) === null || _c === void 0 ? void 0 : _c.serverMessage) === null || _d === void 0 ? void 0 : _d.deviceAdded;
|
|
75
75
|
const devicePtr = createDevicePtr(this._clientPtr, addedMsg.index);
|
|
76
|
-
const device = new ButtplugClientDevice(devicePtr, this._sorter, addedMsg.index, addedMsg.name, addedMsg.messageAttributes);
|
|
76
|
+
const device = new ButtplugClientDevice(devicePtr, this._sorter, this.sorterCallback, addedMsg.index, addedMsg.name, addedMsg.messageAttributes);
|
|
77
77
|
this._devices.set(addedMsg.index, device);
|
|
78
78
|
this.emit("deviceadded", device);
|
|
79
79
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;AAEb,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,9 @@ export declare class ButtplugEmbeddedConnectorOptions {
|
|
|
5
5
|
DeviceCommunicationManagerTypes: number;
|
|
6
6
|
AllowRawMessages: boolean;
|
|
7
7
|
MaxPingTime: number;
|
|
8
|
-
constructor();
|
|
8
|
+
constructor(ServerName?: string, DeviceConfigJSON?: string, UserDeviceConfigJSON?: string, DeviceCommunicationManagerTypes?: number, AllowRawMessages?: boolean, MaxPingTime?: number);
|
|
9
9
|
}
|
|
10
10
|
export declare class ButtplugWebsocketConnectorOptions {
|
|
11
11
|
Address: string;
|
|
12
|
-
constructor();
|
|
12
|
+
constructor(Address?: string);
|
|
13
13
|
}
|
|
@@ -1,21 +1,26 @@
|
|
|
1
1
|
export class ButtplugEmbeddedConnectorOptions {
|
|
2
|
-
constructor(
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
this.
|
|
12
|
-
this.
|
|
2
|
+
constructor(ServerName = "Buttplug WASM Embedded Server",
|
|
3
|
+
// Empty string means ignore.
|
|
4
|
+
DeviceConfigJSON = "",
|
|
5
|
+
// Empty string means ignore.
|
|
6
|
+
UserDeviceConfigJSON = "",
|
|
7
|
+
// 0 here means all device.
|
|
8
|
+
DeviceCommunicationManagerTypes = 0,
|
|
9
|
+
// Require opt-in on raw messages.
|
|
10
|
+
AllowRawMessages = false, MaxPingTime = 0) {
|
|
11
|
+
this.ServerName = ServerName;
|
|
12
|
+
this.DeviceConfigJSON = DeviceConfigJSON;
|
|
13
|
+
this.UserDeviceConfigJSON = UserDeviceConfigJSON;
|
|
14
|
+
this.DeviceCommunicationManagerTypes = DeviceCommunicationManagerTypes;
|
|
15
|
+
this.AllowRawMessages = AllowRawMessages;
|
|
16
|
+
this.MaxPingTime = MaxPingTime;
|
|
13
17
|
}
|
|
14
18
|
}
|
|
15
19
|
export class ButtplugWebsocketConnectorOptions {
|
|
16
|
-
constructor(
|
|
17
|
-
|
|
18
|
-
|
|
20
|
+
constructor(
|
|
21
|
+
// Default to the insecure port.
|
|
22
|
+
Address = "ws://127.0.0.1:12345") {
|
|
23
|
+
this.Address = Address;
|
|
19
24
|
}
|
|
20
25
|
}
|
|
21
26
|
//# sourceMappingURL=connectors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connectors.js","sourceRoot":"","sources":["../../src/connectors.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,gCAAgC;
|
|
1
|
+
{"version":3,"file":"connectors.js","sourceRoot":"","sources":["../../src/connectors.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,gCAAgC;IAC3C,YACS,aAAqB,+BAA+B;IAC3D,6BAA6B;IACtB,mBAA2B,EAAE;IACpC,6BAA6B;IACtB,uBAA+B,EAAE;IACxC,2BAA2B;IACpB,kCAA0C,CAAC;IAClD,kCAAkC;IAC3B,mBAA4B,KAAK,EACjC,cAAsB,CAAC;QATvB,eAAU,GAAV,UAAU,CAA0C;QAEpD,qBAAgB,GAAhB,gBAAgB,CAAa;QAE7B,yBAAoB,GAApB,oBAAoB,CAAa;QAEjC,oCAA+B,GAA/B,+BAA+B,CAAY;QAE3C,qBAAgB,GAAhB,gBAAgB,CAAiB;QACjC,gBAAW,GAAX,WAAW,CAAY;IAC7B,CAAC;CACL;AAED,MAAM,OAAO,iCAAiC;IAC5C;IACE,gCAAgC;IACzB,UAAkB,sBAAsB;QAAxC,YAAO,GAAP,OAAO,CAAiC;IAC9C,CAAC;CACL"}
|
package/dist/module/device.d.ts
CHANGED
|
@@ -6,9 +6,9 @@
|
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
8
|
/// <reference types="node" />
|
|
9
|
-
import { Buttplug } from "./buttplug_ffi";
|
|
9
|
+
import { Buttplug } from "./buttplug_ffi.js";
|
|
10
10
|
import { EventEmitter } from "events";
|
|
11
|
-
import { ButtplugMessageSorter } from "./sorter";
|
|
11
|
+
import { ButtplugMessageSorter } from "./sorter.js";
|
|
12
12
|
export import ButtplugDeviceMessageType = Buttplug.ServerMessage.MessageAttributeType;
|
|
13
13
|
export declare class MessageAttributes {
|
|
14
14
|
/** MessageAttributes featureCount */
|
|
@@ -47,6 +47,7 @@ export declare class ButtplugClientDevice extends EventEmitter {
|
|
|
47
47
|
private _devicePtr;
|
|
48
48
|
private _messageAttributes;
|
|
49
49
|
private _sorter;
|
|
50
|
+
private _sorterCallback;
|
|
50
51
|
/**
|
|
51
52
|
* Return the name of the device.
|
|
52
53
|
*/
|
|
@@ -64,7 +65,7 @@ export declare class ButtplugClientDevice extends EventEmitter {
|
|
|
64
65
|
* @param _name Name of the device.
|
|
65
66
|
* @param allowedMsgs Buttplug messages the device can receive.
|
|
66
67
|
*/
|
|
67
|
-
constructor(devicePtr: number, sorter: ButtplugMessageSorter, index: number, name: string, allowedMsgsObj: Buttplug.ServerMessage.IMessageAttributes[]);
|
|
68
|
+
constructor(devicePtr: number, sorter: ButtplugMessageSorter, sorter_callback: Function, index: number, name: string, allowedMsgsObj: Buttplug.ServerMessage.IMessageAttributes[]);
|
|
68
69
|
/**
|
|
69
70
|
* Return the message attributes related to the given message
|
|
70
71
|
*/
|
package/dist/module/device.js
CHANGED
|
@@ -6,10 +6,10 @@
|
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
8
|
"use strict";
|
|
9
|
-
import { Buttplug } from "./buttplug_ffi";
|
|
10
|
-
import { ButtplugDeviceError } from "./errors";
|
|
9
|
+
import { Buttplug } from "./buttplug_ffi.js";
|
|
10
|
+
import { ButtplugDeviceError } from "./errors.js";
|
|
11
11
|
import { EventEmitter } from "events";
|
|
12
|
-
import { vibrate, rotate, stopDevice, linear, batteryLevel, rssiLevel, rawRead, rawWrite, rawSubscribe, rawUnsubscribe } from "./ffi";
|
|
12
|
+
import { vibrate, rotate, stopDevice, linear, batteryLevel, rssiLevel, rawRead, rawWrite, rawSubscribe, rawUnsubscribe } from "./ffi.js";
|
|
13
13
|
// Re-export the protobuf enum, so we don't require users to have to know the
|
|
14
14
|
// full resolution path.
|
|
15
15
|
export var ButtplugDeviceMessageType = Buttplug.ServerMessage.MessageAttributeType;
|
|
@@ -50,13 +50,14 @@ export class ButtplugClientDevice extends EventEmitter {
|
|
|
50
50
|
* @param _name Name of the device.
|
|
51
51
|
* @param allowedMsgs Buttplug messages the device can receive.
|
|
52
52
|
*/
|
|
53
|
-
constructor(devicePtr, sorter, index, name, allowedMsgsObj) {
|
|
53
|
+
constructor(devicePtr, sorter, sorter_callback, index, name, allowedMsgsObj) {
|
|
54
54
|
super();
|
|
55
55
|
this._messageAttributes = new Map();
|
|
56
56
|
this._devicePtr = devicePtr;
|
|
57
57
|
this._sorter = sorter;
|
|
58
58
|
this._index = index;
|
|
59
59
|
this._name = name;
|
|
60
|
+
this._sorterCallback = sorter_callback;
|
|
60
61
|
for (let attributes of allowedMsgsObj) {
|
|
61
62
|
this._messageAttributes.set(attributes.messageType, new MessageAttributes(attributes));
|
|
62
63
|
}
|
|
@@ -116,7 +117,7 @@ export class ButtplugClientDevice extends EventEmitter {
|
|
|
116
117
|
else {
|
|
117
118
|
throw new ButtplugDeviceError("vibrate can only take numbers or arrays of numbers or VibrationCmds.");
|
|
118
119
|
}
|
|
119
|
-
await vibrate(this._sorter, this._devicePtr, msgSpeeds);
|
|
120
|
+
await vibrate(this._sorter, this._devicePtr, msgSpeeds, this._sorterCallback);
|
|
120
121
|
}
|
|
121
122
|
async rotate(speeds, clockwise) {
|
|
122
123
|
this.checkAllowedMessageType(ButtplugDeviceMessageType.RotateCmd);
|
|
@@ -140,7 +141,7 @@ export class ButtplugClientDevice extends EventEmitter {
|
|
|
140
141
|
else {
|
|
141
142
|
throw new ButtplugDeviceError("rotate can only take number/boolean or arrays of RotateCmds.");
|
|
142
143
|
}
|
|
143
|
-
await rotate(this._sorter, this._devicePtr, msgRotations);
|
|
144
|
+
await rotate(this._sorter, this._devicePtr, msgRotations, this._sorterCallback);
|
|
144
145
|
}
|
|
145
146
|
async linear(position, duration) {
|
|
146
147
|
this.checkAllowedMessageType(ButtplugDeviceMessageType.LinearCmd);
|
|
@@ -164,12 +165,12 @@ export class ButtplugClientDevice extends EventEmitter {
|
|
|
164
165
|
else {
|
|
165
166
|
throw new ButtplugDeviceError("linear can only take number/number or arrays of VectorCmds.");
|
|
166
167
|
}
|
|
167
|
-
await linear(this._sorter, this._devicePtr, msgVectors);
|
|
168
|
+
await linear(this._sorter, this._devicePtr, msgVectors, this._sorterCallback);
|
|
168
169
|
}
|
|
169
170
|
async batteryLevel() {
|
|
170
171
|
var _a, _b, _c, _d;
|
|
171
172
|
this.checkAllowedMessageType(ButtplugDeviceMessageType.BatteryLevelCmd);
|
|
172
|
-
let batteryMsg = await batteryLevel(this._sorter, this._devicePtr);
|
|
173
|
+
let batteryMsg = await batteryLevel(this._sorter, this._devicePtr, this._sorterCallback);
|
|
173
174
|
if ((_b = (_a = batteryMsg.message) === null || _a === void 0 ? void 0 : _a.deviceEvent) === null || _b === void 0 ? void 0 : _b.batteryLevelReading) {
|
|
174
175
|
let reading = (_d = (_c = batteryMsg.message) === null || _c === void 0 ? void 0 : _c.deviceEvent) === null || _d === void 0 ? void 0 : _d.batteryLevelReading;
|
|
175
176
|
return reading.reading;
|
|
@@ -179,7 +180,7 @@ export class ButtplugClientDevice extends EventEmitter {
|
|
|
179
180
|
async rssiLevel() {
|
|
180
181
|
var _a, _b, _c, _d;
|
|
181
182
|
this.checkAllowedMessageType(ButtplugDeviceMessageType.RSSILevelCmd);
|
|
182
|
-
let rssiMsg = await rssiLevel(this._sorter, this._devicePtr);
|
|
183
|
+
let rssiMsg = await rssiLevel(this._sorter, this._devicePtr, this._sorterCallback);
|
|
183
184
|
if ((_b = (_a = rssiMsg.message) === null || _a === void 0 ? void 0 : _a.deviceEvent) === null || _b === void 0 ? void 0 : _b.rssiLevelReading) {
|
|
184
185
|
return (_d = (_c = rssiMsg.message) === null || _c === void 0 ? void 0 : _c.deviceEvent) === null || _d === void 0 ? void 0 : _d.rssiLevelReading.reading;
|
|
185
186
|
}
|
|
@@ -188,7 +189,7 @@ export class ButtplugClientDevice extends EventEmitter {
|
|
|
188
189
|
async rawRead(endpoint, expectedLength, timeout) {
|
|
189
190
|
var _a, _b;
|
|
190
191
|
this.checkAllowedMessageType(ButtplugDeviceMessageType.RawReadCmd);
|
|
191
|
-
let readingMsg = await rawRead(this._sorter, this._devicePtr, endpoint, expectedLength, timeout);
|
|
192
|
+
let readingMsg = await rawRead(this._sorter, this._devicePtr, endpoint, expectedLength, timeout, this._sorterCallback);
|
|
192
193
|
if ((_b = (_a = readingMsg.message) === null || _a === void 0 ? void 0 : _a.deviceEvent) === null || _b === void 0 ? void 0 : _b.rawReading) {
|
|
193
194
|
return readingMsg.message.deviceEvent.rawReading.data;
|
|
194
195
|
}
|
|
@@ -196,18 +197,18 @@ export class ButtplugClientDevice extends EventEmitter {
|
|
|
196
197
|
}
|
|
197
198
|
async rawWrite(endpoint, data, writeWithResponse) {
|
|
198
199
|
this.checkAllowedMessageType(ButtplugDeviceMessageType.RawWriteCmd);
|
|
199
|
-
await rawWrite(this._sorter, this._devicePtr, endpoint, data, writeWithResponse);
|
|
200
|
+
await rawWrite(this._sorter, this._devicePtr, endpoint, data, writeWithResponse, this._sorterCallback);
|
|
200
201
|
}
|
|
201
202
|
async rawSubscribe(endpoint) {
|
|
202
203
|
this.checkAllowedMessageType(ButtplugDeviceMessageType.RawSubscribeCmd);
|
|
203
|
-
await rawSubscribe(this._sorter, this._devicePtr, endpoint);
|
|
204
|
+
await rawSubscribe(this._sorter, this._devicePtr, endpoint, this._sorterCallback);
|
|
204
205
|
}
|
|
205
206
|
async rawUnsubscribe(endpoint) {
|
|
206
207
|
this.checkAllowedMessageType(ButtplugDeviceMessageType.RawUnsubscribeCmd);
|
|
207
|
-
await rawUnsubscribe(this._sorter, this._devicePtr, endpoint);
|
|
208
|
+
await rawUnsubscribe(this._sorter, this._devicePtr, endpoint, this._sorterCallback);
|
|
208
209
|
}
|
|
209
210
|
async stop() {
|
|
210
|
-
await stopDevice(this._sorter, this._devicePtr);
|
|
211
|
+
await stopDevice(this._sorter, this._devicePtr, this._sorterCallback);
|
|
211
212
|
}
|
|
212
213
|
emitDisconnected() {
|
|
213
214
|
this.emit("deviceremoved");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"device.js","sourceRoot":"","sources":["../../src/device.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;AACb,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"device.js","sourceRoot":"","sources":["../../src/device.ts"],"names":[],"mappings":"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"}
|
package/dist/module/errors.d.ts
CHANGED
package/dist/module/errors.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,MAAM,OAAO,aAAc,SAAQ,KAAK;IAuCtC,YAAsB,QAAgB,EAChB,MAAc,CAAC,EACf,MAAc;QAClC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QACzB,IAAI,CAAC,SAAS,GAAG,GAAG,CAAC;IACvB,CAAC;CACF;AAED,MAAM,OAAO,sBAAuB,SAAQ,aAAa;IACvD,YAAmB,QAAgB,EAAE,MAAc,CAAC;QAClD,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACvB,CAAC;CACF;AAED,MAAM,OAAO,mBAAoB,SAAQ,aAAa;IACpD,YAAmB,QAAgB,EAAE,MAAc,CAAC;QAClD,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACvB,CAAC;CACF;AAED,MAAM,OAAO,oBAAqB,SAAQ,aAAa;IACrD,YAAmB,QAAgB,EAAE,MAAc,CAAC;QAClD,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACvB,CAAC;CACF;AAED,MAAM,OAAO,iBAAkB,SAAQ,aAAa;IAClD,YAAmB,QAAgB,EAAE,MAAc,CAAC;QAClD,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACvB,CAAC;CACF;AAED,MAAM,OAAO,oBAAqB,SAAQ,aAAa;IACrD,YAAmB,QAAgB,EAAE,MAAc,CAAC;QAClD,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACvB,CAAC;CACF;AAED,MAAM,OAAO,4BAA6B,SAAQ,aAAa;IAC7D,YAAmB,QAAgB,EAAE,MAAc,CAAC;QAClD,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IACvB,CAAC;CACF;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAkC,EAAE,EAAU;IAC7E,IAAI,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAC,sBAAsB,EAAE;QACrF,OAAO,IAAI,4BAA4B,CAAC,GAAG,CAAC,OAAQ,EAAE,EAAE,CAAC,CAAC;KAC3D;IACD,IAAI,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAC,mBAAmB,EAAE;QAClF,OAAO,IAAI,mBAAmB,CAAC,GAAG,CAAC,OAAQ,EAAE,EAAE,CAAC,CAAC;KAClD;IACD,IAAI,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAC,sBAAsB,EAAE;QACrF,OAAO,IAAI,sBAAsB,CAAC,GAAG,CAAC,OAAQ,EAAE,EAAE,CAAC,CAAC;KACrD;IACD,IAAI,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAC,oBAAoB,EAAE;QACnF,OAAO,IAAI,oBAAoB,CAAC,GAAG,CAAC,OAAQ,EAAE,EAAE,CAAC,CAAC;KACnD;IACD,IAAI,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAC,iBAAiB,EAAE;QAChF,OAAO,IAAI,iBAAiB,CAAC,GAAG,CAAC,OAAQ,EAAE,EAAE,CAAC,CAAC;KAChD;IACD,IAAI,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAC,oBAAoB,EAAE;QACnF,OAAO,IAAI,oBAAoB,CAAC,GAAG,CAAC,OAAQ,EAAE,EAAE,CAAC,CAAC;KACnD;IACD,MAAM,IAAI,oBAAoB,CAAC,wBAAwB,GAAG,GAAG,CAAC,CAAC;AACjE,CAAC"}
|
package/dist/module/ffi.d.ts
CHANGED
|
@@ -1,23 +1,23 @@
|
|
|
1
|
-
import { ButtplugEmbeddedConnectorOptions, ButtplugWebsocketConnectorOptions } from "./connectors";
|
|
2
|
-
import { ButtplugMessageSorter } from "./sorter";
|
|
3
|
-
import { Buttplug } from "./buttplug_ffi";
|
|
1
|
+
import { ButtplugEmbeddedConnectorOptions, ButtplugWebsocketConnectorOptions } from "./connectors.js";
|
|
2
|
+
import { ButtplugMessageSorter } from "./sorter.js";
|
|
3
|
+
import { Buttplug } from "./buttplug_ffi.js";
|
|
4
4
|
export declare function buttplugInit(): Promise<void>;
|
|
5
|
-
export declare function connectEmbedded(sorter: ButtplugMessageSorter, clientPtr: number, options: ButtplugEmbeddedConnectorOptions): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
6
|
-
export declare function connectWebsocket(sorter: ButtplugMessageSorter, clientPtr: number, options: ButtplugWebsocketConnectorOptions): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
7
|
-
export declare function disconnect(sorter: ButtplugMessageSorter, clientPtr: number): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
8
|
-
export declare function startScanning(sorter: ButtplugMessageSorter, clientPtr: number): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
9
|
-
export declare function stopScanning(sorter: ButtplugMessageSorter, clientPtr: number): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
10
|
-
export declare function stopAllDevices(sorter: ButtplugMessageSorter, clientPtr: number): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
11
|
-
export declare function vibrate(sorter: ButtplugMessageSorter, devicePtr: number, speeds: Buttplug.DeviceMessage.VibrateComponent[]): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
12
|
-
export declare function rotate(sorter: ButtplugMessageSorter, devicePtr: number, rotations: Buttplug.DeviceMessage.RotateComponent[]): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
13
|
-
export declare function linear(sorter: ButtplugMessageSorter, devicePtr: number, vectors: Buttplug.DeviceMessage.LinearComponent[]): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
14
|
-
export declare function stopDevice(sorter: ButtplugMessageSorter, devicePtr: number): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
15
|
-
export declare function batteryLevel(sorter: ButtplugMessageSorter, devicePtr: number): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
16
|
-
export declare function rssiLevel(sorter: ButtplugMessageSorter, devicePtr: number): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
17
|
-
export declare function rawRead(sorter: ButtplugMessageSorter, devicePtr: number, endpoint: Buttplug.Endpoint, expectedLength: number, timeout: number): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
18
|
-
export declare function rawWrite(sorter: ButtplugMessageSorter, devicePtr: number, endpoint: Buttplug.Endpoint, data: Uint8Array, writeWithResponse: boolean): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
19
|
-
export declare function rawSubscribe(sorter: ButtplugMessageSorter, devicePtr: number, endpoint: Buttplug.Endpoint): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
20
|
-
export declare function rawUnsubscribe(sorter: ButtplugMessageSorter, devicePtr: number, endpoint: Buttplug.Endpoint): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
5
|
+
export declare function connectEmbedded(sorter: ButtplugMessageSorter, clientPtr: number, options: ButtplugEmbeddedConnectorOptions, callback: Function): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
6
|
+
export declare function connectWebsocket(sorter: ButtplugMessageSorter, clientPtr: number, options: ButtplugWebsocketConnectorOptions, callback: Function): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
7
|
+
export declare function disconnect(sorter: ButtplugMessageSorter, clientPtr: number, callback: Function): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
8
|
+
export declare function startScanning(sorter: ButtplugMessageSorter, clientPtr: number, callback: Function): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
9
|
+
export declare function stopScanning(sorter: ButtplugMessageSorter, clientPtr: number, callback: Function): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
10
|
+
export declare function stopAllDevices(sorter: ButtplugMessageSorter, clientPtr: number, callback: Function): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
11
|
+
export declare function vibrate(sorter: ButtplugMessageSorter, devicePtr: number, speeds: Buttplug.DeviceMessage.VibrateComponent[], callback: Function): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
12
|
+
export declare function rotate(sorter: ButtplugMessageSorter, devicePtr: number, rotations: Buttplug.DeviceMessage.RotateComponent[], callback: Function): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
13
|
+
export declare function linear(sorter: ButtplugMessageSorter, devicePtr: number, vectors: Buttplug.DeviceMessage.LinearComponent[], callback: Function): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
14
|
+
export declare function stopDevice(sorter: ButtplugMessageSorter, devicePtr: number, callback: Function): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
15
|
+
export declare function batteryLevel(sorter: ButtplugMessageSorter, devicePtr: number, callback: Function): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
16
|
+
export declare function rssiLevel(sorter: ButtplugMessageSorter, devicePtr: number, callback: Function): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
17
|
+
export declare function rawRead(sorter: ButtplugMessageSorter, devicePtr: number, endpoint: Buttplug.Endpoint, expectedLength: number, timeout: number, callback: Function): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
18
|
+
export declare function rawWrite(sorter: ButtplugMessageSorter, devicePtr: number, endpoint: Buttplug.Endpoint, data: Uint8Array, writeWithResponse: boolean, callback: Function): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
19
|
+
export declare function rawSubscribe(sorter: ButtplugMessageSorter, devicePtr: number, endpoint: Buttplug.Endpoint, callback: Function): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
20
|
+
export declare function rawUnsubscribe(sorter: ButtplugMessageSorter, devicePtr: number, endpoint: Buttplug.Endpoint, callback: Function): Promise<Buttplug.ButtplugFFIServerMessage>;
|
|
21
21
|
export declare function createClientPtr(eventCallback: Function, clientName: string): number;
|
|
22
22
|
export declare function createDevicePtr(clientPtr: number, deviceIndex: number): number | null;
|
|
23
23
|
export declare function freeClientPtr(clientPtr: number): void;
|