buttplug 3.1.0 → 3.1.1

package/node-test.ts

@@ -0,0 +1,5 @@
+import { ButtplugClient, ButtplugNodeWebsocketClientConnector } from '.';
+
+const client = new ButtplugClient('Test Client');
+client.connect(new ButtplugNodeWebsocketClientConnector('ws://127.0.0.1:12345'));
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "buttplug",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Buttplug Client Implementation for Typescript/Javascript",
   "homepage": "https://github.com/buttplugio/buttplug-js/",
   "repository": {
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "class-transformer": "^0.5.1",
-    "filereader": "^0.10.3",
+    "eventemitter3": "^5.0.0",
     "reflect-metadata": "^0.1.13",
     "ws": "^8.12.0"
   },

package/src/client/ButtplugBrowserWebsocketClientConnector.ts

@@ -35,11 +35,7 @@ export class ButtplugBrowserWebsocketClientConnector
       const emitMsgs = this._sorter.ParseIncomingMessages(msgs);
       this.emit('message', emitMsgs);
     } else if (event.data instanceof Blob) {
-      const reader = new (this._filereaderConstructor ?? FileReader)();
-      reader.addEventListener('load', (ev) => {
-        this.OnReaderLoad(ev);
-      });
-      reader.readAsText(event.data);
+      // No-op, buttplug only uses text formatting.
     }
   };
 

package/src/client/ButtplugClientDevice.ts

@@ -13,7 +13,7 @@ import {
   ButtplugError,
   ButtplugMessageError,
 } from '../core/Exceptions';
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'eventemitter3';
 
 /**
  * Represents an abstract device, capable of taking certain kinds of messages.

package/src/client/ButtplugNodeWebsocketClientConnector.ts

@@ -10,10 +10,8 @@
 
 import { ButtplugBrowserWebsocketClientConnector } from './ButtplugBrowserWebsocketClientConnector';
 import { WebSocket as NodeWebSocket } from 'ws';
-import { FileReader } from 'filereader';
 
 export class ButtplugNodeWebsocketClientConnector extends ButtplugBrowserWebsocketClientConnector {
   protected _websocketConstructor =
     NodeWebSocket as unknown as typeof WebSocket;
-  protected _filereaderConstructor = FileReader;
 }

package/src/client/Client.ts

@@ -9,7 +9,7 @@
 'use strict';
 
 import { ButtplugLogger } from '../core/Logging';
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'eventemitter3';
 import { ButtplugClientDevice } from './ButtplugClientDevice';
 import { IButtplugClientConnector } from './IButtplugClientConnector';
 import * as Messages from '../core/Messages';

package/src/client/IButtplugClientConnector.ts

@@ -7,7 +7,7 @@
  */
 
 import { ButtplugMessage } from '../core/Messages';
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'eventemitter3';
 
 export interface IButtplugClientConnector extends EventEmitter {
   Connect: () => Promise<void>;

package/src/core/Logging.ts

@@ -6,7 +6,7 @@
  * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
  */
 
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'eventemitter3';
 
 export enum ButtplugLogLevel {
   Off,

package/src/utils/ButtplugBrowserWebsocketConnector.ts

@@ -8,14 +8,13 @@
 
 'use strict';
 
-import { EventEmitter } from 'events';
+import { EventEmitter } from 'eventemitter3';
 import { ButtplugMessage } from '../core/Messages';
 import { FromJSON } from '../core/MessageUtils';
 
 export class ButtplugBrowserWebsocketConnector extends EventEmitter {
   protected _ws: WebSocket | undefined;
   protected _websocketConstructor: typeof WebSocket | null = null;
-  protected _filereaderConstructor: typeof FileReader | null = null;
 
   public constructor(private _url: string) {
     super();
@@ -78,16 +77,11 @@ export class ButtplugBrowserWebsocketConnector extends EventEmitter {
   };
 
   protected ParseIncomingMessage(event: MessageEvent) {
-    console.log('Calling parent parse incoming');
     if (typeof event.data === 'string') {
       const msgs = FromJSON(event.data);
       this.emit('message', msgs);
     } else if (event.data instanceof Blob) {
-      const reader = new (this._filereaderConstructor ?? FileReader)();
-      reader.addEventListener('load', (ev) => {
-        this.OnReaderLoad(ev);
-      });
-      reader.readAsText(event.data);
+      // No-op, we only use text message types.
     }
   }