buttplug 3.1.0 → 3.1.1
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 +8 -0
- package/dist/main/src/client/ButtplugBrowserWebsocketClientConnector.js +1 -6
- package/dist/main/src/client/ButtplugBrowserWebsocketClientConnector.js.map +1 -1
- package/dist/main/src/client/ButtplugClientDevice.d.ts +1 -2
- package/dist/main/src/client/ButtplugClientDevice.js +2 -2
- package/dist/main/src/client/ButtplugClientDevice.js.map +1 -1
- package/dist/main/src/client/ButtplugNodeWebsocketClientConnector.d.ts +0 -1
- package/dist/main/src/client/ButtplugNodeWebsocketClientConnector.js +0 -2
- package/dist/main/src/client/ButtplugNodeWebsocketClientConnector.js.map +1 -1
- package/dist/main/src/client/Client.d.ts +1 -2
- package/dist/main/src/client/Client.js +2 -2
- package/dist/main/src/client/Client.js.map +1 -1
- package/dist/main/src/client/IButtplugClientConnector.d.ts +1 -2
- package/dist/main/src/core/Logging.d.ts +1 -2
- package/dist/main/src/core/Logging.js +2 -2
- package/dist/main/src/core/Logging.js.map +1 -1
- package/dist/main/src/utils/ButtplugBrowserWebsocketConnector.d.ts +1 -3
- package/dist/main/src/utils/ButtplugBrowserWebsocketConnector.js +3 -10
- package/dist/main/src/utils/ButtplugBrowserWebsocketConnector.js.map +1 -1
- package/dist/web/buttplug.js +285 -775
- package/dist/web/buttplug.min.js +1 -1
- package/dist/web/buttplug.min.js.map +1 -1
- package/node-test.ts +5 -0
- package/package.json +2 -2
- package/src/client/ButtplugBrowserWebsocketClientConnector.ts +1 -5
- package/src/client/ButtplugClientDevice.ts +1 -1
- package/src/client/ButtplugNodeWebsocketClientConnector.ts +0 -2
- package/src/client/Client.ts +1 -1
- package/src/client/IButtplugClientConnector.ts +1 -1
- package/src/core/Logging.ts +1 -1
- package/src/utils/ButtplugBrowserWebsocketConnector.ts +2 -8
package/CHANGELOG.md
CHANGED
|
@@ -33,18 +33,13 @@ class ButtplugBrowserWebsocketClientConnector extends ButtplugBrowserWebsocketCo
|
|
|
33
33
|
return yield p;
|
|
34
34
|
});
|
|
35
35
|
this.ParseIncomingMessage = (event) => {
|
|
36
|
-
var _a;
|
|
37
36
|
if (typeof event.data === 'string') {
|
|
38
37
|
const msgs = (0, MessageUtils_1.FromJSON)(event.data);
|
|
39
38
|
const emitMsgs = this._sorter.ParseIncomingMessages(msgs);
|
|
40
39
|
this.emit('message', emitMsgs);
|
|
41
40
|
}
|
|
42
41
|
else if (event.data instanceof Blob) {
|
|
43
|
-
|
|
44
|
-
reader.addEventListener('load', (ev) => {
|
|
45
|
-
this.OnReaderLoad(ev);
|
|
46
|
-
});
|
|
47
|
-
reader.readAsText(event.data);
|
|
42
|
+
// No-op, buttplug only uses text formatting.
|
|
48
43
|
}
|
|
49
44
|
};
|
|
50
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ButtplugBrowserWebsocketClientConnector.js","sourceRoot":"","sources":["../../../../src/client/ButtplugBrowserWebsocketClientConnector.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;;;;;;;;;;;;AAIb,uDAAgD;AAChD,0EAAuE;AACvE,kGAA+F;AAE/F,MAAa,uCACX,SAAQ,qEAAiC;IAD3C;;QAIU,YAAO,GAA0B,IAAI,6CAAqB,CAAC,IAAI,CAAC,CAAC;QAElE,SAAI,GAAG,CAAO,GAAoB,EAA4B,EAAE;YACrE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACnB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACjD;YACD,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;YACnD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,MAAM,CAAC,CAAC;QACjB,CAAC,CAAA,CAAC;QAEQ,yBAAoB,GAAG,CAAC,KAAmB,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"ButtplugBrowserWebsocketClientConnector.js","sourceRoot":"","sources":["../../../../src/client/ButtplugBrowserWebsocketClientConnector.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;;;;;;;;;;;;AAIb,uDAAgD;AAChD,0EAAuE;AACvE,kGAA+F;AAE/F,MAAa,uCACX,SAAQ,qEAAiC;IAD3C;;QAIU,YAAO,GAA0B,IAAI,6CAAqB,CAAC,IAAI,CAAC,CAAC;QAElE,SAAI,GAAG,CAAO,GAAoB,EAA4B,EAAE;YACrE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACnB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACjD;YACD,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;YACnD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACtB,OAAO,MAAM,CAAC,CAAC;QACjB,CAAC,CAAA,CAAC;QAEQ,yBAAoB,GAAG,CAAC,KAAmB,EAAE,EAAE;YACvD,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAClC,MAAM,IAAI,GAAG,IAAA,uBAAQ,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;gBAC1D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;aAChC;iBAAM,IAAI,KAAK,CAAC,IAAI,YAAY,IAAI,EAAE;gBACrC,6CAA6C;aAC9C;QACH,CAAC,CAAC;IAOJ,CAAC;IALW,YAAY,CAAC,KAAY;QACjC,MAAM,IAAI,GAAG,IAAA,uBAAQ,EAAE,KAAK,CAAC,MAAqB,CAAC,MAAM,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACjC,CAAC;CACF;AA9BD,0FA8BC"}
|
|
@@ -5,9 +5,8 @@
|
|
|
5
5
|
*
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
|
-
/// <reference types="node" />
|
|
9
8
|
import * as Messages from '../core/Messages';
|
|
10
|
-
import { EventEmitter } from '
|
|
9
|
+
import { EventEmitter } from 'eventemitter3';
|
|
11
10
|
/**
|
|
12
11
|
* Represents an abstract device, capable of taking certain kinds of messages.
|
|
13
12
|
*/
|
|
@@ -42,11 +42,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
42
42
|
exports.ButtplugClientDevice = void 0;
|
|
43
43
|
const Messages = __importStar(require("../core/Messages"));
|
|
44
44
|
const Exceptions_1 = require("../core/Exceptions");
|
|
45
|
-
const
|
|
45
|
+
const eventemitter3_1 = require("eventemitter3");
|
|
46
46
|
/**
|
|
47
47
|
* Represents an abstract device, capable of taking certain kinds of messages.
|
|
48
48
|
*/
|
|
49
|
-
class ButtplugClientDevice extends
|
|
49
|
+
class ButtplugClientDevice extends eventemitter3_1.EventEmitter {
|
|
50
50
|
/**
|
|
51
51
|
* Return the name of the device.
|
|
52
52
|
*/
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"ButtplugClientDevice.js","sourceRoot":"","sources":["../../../../src/client/ButtplugClientDevice.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,12 +10,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
10
10
|
exports.ButtplugNodeWebsocketClientConnector = void 0;
|
|
11
11
|
const ButtplugBrowserWebsocketClientConnector_1 = require("./ButtplugBrowserWebsocketClientConnector");
|
|
12
12
|
const ws_1 = require("ws");
|
|
13
|
-
const filereader_1 = require("filereader");
|
|
14
13
|
class ButtplugNodeWebsocketClientConnector extends ButtplugBrowserWebsocketClientConnector_1.ButtplugBrowserWebsocketClientConnector {
|
|
15
14
|
constructor() {
|
|
16
15
|
super(...arguments);
|
|
17
16
|
this._websocketConstructor = ws_1.WebSocket;
|
|
18
|
-
this._filereaderConstructor = filereader_1.FileReader;
|
|
19
17
|
}
|
|
20
18
|
}
|
|
21
19
|
exports.ButtplugNodeWebsocketClientConnector = ButtplugNodeWebsocketClientConnector;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ButtplugNodeWebsocketClientConnector.js","sourceRoot":"","sources":["../../../../src/client/ButtplugNodeWebsocketClientConnector.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;;;AAEb,uGAAoG;AACpG,2BAAgD;
|
|
1
|
+
{"version":3,"file":"ButtplugNodeWebsocketClientConnector.js","sourceRoot":"","sources":["../../../../src/client/ButtplugNodeWebsocketClientConnector.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;;;AAEb,uGAAoG;AACpG,2BAAgD;AAEhD,MAAa,oCAAqC,SAAQ,iFAAuC;IAAjG;;QACY,0BAAqB,GAC7B,cAA4C,CAAC;IACjD,CAAC;CAAA;AAHD,oFAGC"}
|
|
@@ -6,9 +6,8 @@
|
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
8
|
/// <reference types="node" />
|
|
9
|
-
/// <reference types="node" />
|
|
10
9
|
import { ButtplugLogger } from '../core/Logging';
|
|
11
|
-
import { EventEmitter } from '
|
|
10
|
+
import { EventEmitter } from 'eventemitter3';
|
|
12
11
|
import { ButtplugClientDevice } from './ButtplugClientDevice';
|
|
13
12
|
import { IButtplugClientConnector } from './IButtplugClientConnector';
|
|
14
13
|
import * as Messages from '../core/Messages';
|
|
@@ -41,12 +41,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
41
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
42
|
exports.ButtplugClient = void 0;
|
|
43
43
|
const Logging_1 = require("../core/Logging");
|
|
44
|
-
const
|
|
44
|
+
const eventemitter3_1 = require("eventemitter3");
|
|
45
45
|
const ButtplugClientDevice_1 = require("./ButtplugClientDevice");
|
|
46
46
|
const Messages = __importStar(require("../core/Messages"));
|
|
47
47
|
const Exceptions_1 = require("../core/Exceptions");
|
|
48
48
|
const ButtplugClientConnectorException_1 = require("./ButtplugClientConnectorException");
|
|
49
|
-
class ButtplugClient extends
|
|
49
|
+
class ButtplugClient extends eventemitter3_1.EventEmitter {
|
|
50
50
|
constructor(clientName = 'Generic Buttplug Client') {
|
|
51
51
|
super();
|
|
52
52
|
this._pingTimer = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../../../src/client/Client.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEb,6CAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../../../src/client/Client.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,8 @@
|
|
|
5
5
|
*
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
|
-
/// <reference types="node" />
|
|
9
8
|
import { ButtplugMessage } from '../core/Messages';
|
|
10
|
-
import { EventEmitter } from '
|
|
9
|
+
import { EventEmitter } from 'eventemitter3';
|
|
11
10
|
export interface IButtplugClientConnector extends EventEmitter {
|
|
12
11
|
Connect: () => Promise<void>;
|
|
13
12
|
Disconnect: () => Promise<void>;
|
|
@@ -5,8 +5,7 @@
|
|
|
5
5
|
*
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
|
-
|
|
9
|
-
import { EventEmitter } from 'events';
|
|
8
|
+
import { EventEmitter } from 'eventemitter3';
|
|
10
9
|
export declare enum ButtplugLogLevel {
|
|
11
10
|
Off = 0,
|
|
12
11
|
Error = 1,
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
*/
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
10
|
exports.ButtplugLogger = exports.LogMessage = exports.ButtplugLogLevel = void 0;
|
|
11
|
-
const
|
|
11
|
+
const eventemitter3_1 = require("eventemitter3");
|
|
12
12
|
var ButtplugLogLevel;
|
|
13
13
|
(function (ButtplugLogLevel) {
|
|
14
14
|
ButtplugLogLevel[ButtplugLogLevel["Off"] = 0] = "Off";
|
|
@@ -66,7 +66,7 @@ exports.LogMessage = LogMessage;
|
|
|
66
66
|
* internal static reference to an instance of itself (singleton pattern,
|
|
67
67
|
* basically), and allows message logging throughout the module.
|
|
68
68
|
*/
|
|
69
|
-
class ButtplugLogger extends
|
|
69
|
+
class ButtplugLogger extends eventemitter3_1.EventEmitter {
|
|
70
70
|
/**
|
|
71
71
|
* Returns the stored static instance of the logger, creating one if it
|
|
72
72
|
* doesn't currently exist.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logging.js","sourceRoot":"","sources":["../../../../src/core/Logging.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,
|
|
1
|
+
{"version":3,"file":"Logging.js","sourceRoot":"","sources":["../../../../src/core/Logging.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,14 +5,12 @@
|
|
|
5
5
|
*
|
|
6
6
|
* @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
|
|
7
7
|
*/
|
|
8
|
-
|
|
9
|
-
import { EventEmitter } from 'events';
|
|
8
|
+
import { EventEmitter } from 'eventemitter3';
|
|
10
9
|
import { ButtplugMessage } from '../core/Messages';
|
|
11
10
|
export declare class ButtplugBrowserWebsocketConnector extends EventEmitter {
|
|
12
11
|
private _url;
|
|
13
12
|
protected _ws: WebSocket | undefined;
|
|
14
13
|
protected _websocketConstructor: typeof WebSocket | null;
|
|
15
|
-
protected _filereaderConstructor: typeof FileReader | null;
|
|
16
14
|
constructor(_url: string);
|
|
17
15
|
get Connected(): boolean;
|
|
18
16
|
Connect: () => Promise<void>;
|
|
@@ -17,14 +17,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
17
17
|
};
|
|
18
18
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
19
|
exports.ButtplugBrowserWebsocketConnector = void 0;
|
|
20
|
-
const
|
|
20
|
+
const eventemitter3_1 = require("eventemitter3");
|
|
21
21
|
const MessageUtils_1 = require("../core/MessageUtils");
|
|
22
|
-
class ButtplugBrowserWebsocketConnector extends
|
|
22
|
+
class ButtplugBrowserWebsocketConnector extends eventemitter3_1.EventEmitter {
|
|
23
23
|
constructor(_url) {
|
|
24
24
|
super();
|
|
25
25
|
this._url = _url;
|
|
26
26
|
this._websocketConstructor = null;
|
|
27
|
-
this._filereaderConstructor = null;
|
|
28
27
|
this.Connect = () => __awaiter(this, void 0, void 0, function* () {
|
|
29
28
|
var _a;
|
|
30
29
|
const ws = new ((_a = this._websocketConstructor) !== null && _a !== void 0 ? _a : WebSocket)(this._url);
|
|
@@ -80,18 +79,12 @@ class ButtplugBrowserWebsocketConnector extends events_1.EventEmitter {
|
|
|
80
79
|
this._ws.send('[' + msg.toJSON() + ']');
|
|
81
80
|
}
|
|
82
81
|
ParseIncomingMessage(event) {
|
|
83
|
-
var _a;
|
|
84
|
-
console.log('Calling parent parse incoming');
|
|
85
82
|
if (typeof event.data === 'string') {
|
|
86
83
|
const msgs = (0, MessageUtils_1.FromJSON)(event.data);
|
|
87
84
|
this.emit('message', msgs);
|
|
88
85
|
}
|
|
89
86
|
else if (event.data instanceof Blob) {
|
|
90
|
-
|
|
91
|
-
reader.addEventListener('load', (ev) => {
|
|
92
|
-
this.OnReaderLoad(ev);
|
|
93
|
-
});
|
|
94
|
-
reader.readAsText(event.data);
|
|
87
|
+
// No-op, we only use text message types.
|
|
95
88
|
}
|
|
96
89
|
}
|
|
97
90
|
OnReaderLoad(event) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ButtplugBrowserWebsocketConnector.js","sourceRoot":"","sources":["../../../../src/utils/ButtplugBrowserWebsocketConnector.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,CAAC;;;;;;;;;;;;AAEb,
|
|
1
|
+
{"version":3,"file":"ButtplugBrowserWebsocketConnector.js","sourceRoot":"","sources":["../../../../src/utils/ButtplugBrowserWebsocketConnector.ts"],"names":[],"mappings":"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"}
|