buttplug 3.2.0 → 3.2.1

package/dist/web/core/MessageUtils.d.ts

@@ -6,4 +6,5 @@
  * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
  */
 import * as Messages from './Messages';
+export declare function getMessageClassFromMessage(msg: Messages.ButtplugMessage): (new (...args: unknown[]) => Messages.ButtplugMessage) | null;
 export declare function fromJSON(str: any): Messages.ButtplugMessage[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "buttplug",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Buttplug Client Implementation for Typescript/Javascript",
   "homepage": "https://github.com/buttplugio/buttplug-js/",
   "repository": {

package/src/client/ButtplugClientDevice.ts

@@ -14,6 +14,7 @@ import {
   ButtplugMessageError,
 } from '../core/Exceptions';
 import { EventEmitter } from 'eventemitter3';
+import { getMessageClassFromMessage } from '../core/MessageUtils';
 
 /**
  * Represents an abstract device, capable of taking certain kinds of messages.
@@ -98,7 +99,7 @@ export class ButtplugClientDevice extends EventEmitter {
     msg: Messages.ButtplugDeviceMessage
   ): Promise<void> {
     const response = await this.send(msg);
-    switch (response.constructor) {
+    switch (getMessageClassFromMessage(response)) {
       case Messages.Ok:
         return;
       case Messages.Error:
@@ -245,7 +246,7 @@ export class ButtplugClientDevice extends EventEmitter {
     const response = await this.send(
       new Messages.SensorReadCmd(this.index, sensorIndex, sensorType)
     );
-    switch (response.constructor) {
+    switch (getMessageClassFromMessage(response)) {
       case Messages.SensorReading:
         return (response as Messages.SensorReading).Data;
       case Messages.Error:
@@ -323,7 +324,7 @@ export class ButtplugClientDevice extends EventEmitter {
     const response = await this.send(
       new Messages.RawReadCmd(this.index, endpoint, expectedLength, timeout)
     );
-    switch (response.constructor) {
+    switch (getMessageClassFromMessage(response)) {
       case Messages.RawReading:
         return new Uint8Array((response as Messages.RawReading).Data);
       case Messages.Error:

package/src/client/Client.ts

@@ -22,6 +22,7 @@ import {
   ButtplugMessageError,
 } from '../core/Exceptions';
 import { ButtplugClientConnectorException } from './ButtplugClientConnectorException';
+import { getMessageClassFromMessage } from '../core/MessageUtils';
 
 export class ButtplugClient extends EventEmitter {
   protected _pingTimer: NodeJS.Timeout | null = null;
@@ -117,7 +118,7 @@ export class ButtplugClient extends EventEmitter {
   protected parseMessages = (msgs: Messages.ButtplugMessage[]) => {
     const leftoverMsgs = this._sorter.ParseIncomingMessages(msgs);
     for (const x of leftoverMsgs) {
-      switch (x.constructor) {
+      switch (getMessageClassFromMessage(x)) {
         case Messages.DeviceAdded: {
           const addedMsg = x as Messages.DeviceAdded;
           const addedDevice = ButtplugClientDevice.fromMsg(
@@ -154,7 +155,7 @@ export class ButtplugClient extends EventEmitter {
         Messages.MESSAGE_SPEC_VERSION
       )
     );
-    switch (msg.constructor) {
+    switch (getMessageClassFromMessage(msg)) {
       case Messages.ServerInfo: {
         const serverinfo = msg as Messages.ServerInfo;
         this._logger.Info(
@@ -252,7 +253,7 @@ export class ButtplugClient extends EventEmitter {
     msg: Messages.ButtplugMessage
   ): Promise<void> => {
     const response = await this.sendMessage(msg);
-    switch (response.constructor) {
+    switch (getMessageClassFromMessage(response)) {
       case Messages.Ok:
         return;
       case Messages.Error:
@@ -261,7 +262,7 @@ export class ButtplugClient extends EventEmitter {
         throw ButtplugError.LogAndError(
           ButtplugMessageError,
           this._logger,
-          `Message type ${response.constructor} not handled by SendMsgExpectOk`
+          `Message type ${getMessageClassFromMessage(response)!.constructor} not handled by SendMsgExpectOk`
         );
     }
   };

package/src/core/MessageUtils.ts

@@ -21,6 +21,14 @@ function getMessageClass(
   return null;
 }
 
+export function getMessageClassFromMessage(
+  msg: Messages.ButtplugMessage
+): (new (...args: unknown[]) => Messages.ButtplugMessage) | null {
+  // Making the bold assumption all message classes have the Name static. Should define a
+  // requirement for this in the abstract class.
+  return getMessageClass(Object.getPrototypeOf(msg).constructor.Name);
+}
+
 export function fromJSON(str): Messages.ButtplugMessage[] {
   const msgarray: object[] = JSON.parse(str);
   const msgs: Messages.ButtplugMessage[] = [];

package/util/convert_device_config.js

@@ -1,6 +0,0 @@
-var inputfile = './dependencies/buttplug-device-config/buttplug-device-config.yml',
-    outputfile = './dependencies/buttplug-device-config/buttplug-device-config.json',
-    yaml = require('js-yaml'),
-    fs = require('fs'),
-    obj = yaml.load(fs.readFileSync(inputfile, {encoding: 'utf-8'}));
-fs.writeFileSync(outputfile, JSON.stringify(obj, null, 2));