buttplug 3.2.2 → 4.0.1

package/dist/web/client/ButtplugBrowserWebsocketClientConnector.d.ts

@@ -1,10 +1,3 @@
-/*!
- * Buttplug JS Source Code File - Visit https://buttplug.io for more info about
- * the project. Licensed under the BSD 3-Clause license. See LICENSE file in the
- * project root for full license information.
- *
- * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
- */
 import { IButtplugClientConnector } from './IButtplugClientConnector';
 import { ButtplugMessage } from '../core/Messages';
 import { ButtplugBrowserWebsocketConnector } from '../utils/ButtplugBrowserWebsocketConnector';

package/dist/web/client/{Client.d.ts → ButtplugClient.d.ts}

@@ -1,11 +1,3 @@
-/*!
- * Buttplug JS Source Code File - Visit https://buttplug.io for more info about
- * the project. Licensed under the BSD 3-Clause license. See LICENSE file in the
- * project root for full license information.
- *
- * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
- */
-/// <reference types="node" />
 import { ButtplugLogger } from '../core/Logging';
 import { EventEmitter } from 'eventemitter3';
 import { ButtplugClientDevice } from './ButtplugClientDevice';
@@ -21,21 +13,21 @@ export declare class ButtplugClient extends EventEmitter {
     private _sorter;
     constructor(clientName?: string);
     get connected(): boolean;
-    get devices(): ButtplugClientDevice[];
+    get devices(): Map<number, ButtplugClientDevice>;
     get isScanning(): boolean;
     connect: (connector: IButtplugClientConnector) => Promise<void>;
     disconnect: () => Promise<void>;
     startScanning: () => Promise<void>;
     stopScanning: () => Promise<void>;
     stopAllDevices: () => Promise<void>;
-    private sendDeviceMessage;
     protected disconnectHandler: () => void;
     protected parseMessages: (msgs: Messages.ButtplugMessage[]) => void;
     protected initializeConnection: () => Promise<boolean>;
+    private parseDeviceList;
     protected requestDeviceList: () => Promise<void>;
     protected shutdownConnection: () => Promise<void>;
     protected sendMessage(msg: Messages.ButtplugMessage): Promise<Messages.ButtplugMessage>;
     protected checkConnector(): void;
     protected sendMsgExpectOk: (msg: Messages.ButtplugMessage) => Promise<void>;
-    protected sendDeviceMessageClosure: (device: ButtplugClientDevice, msg: Messages.ButtplugDeviceMessage) => Promise<Messages.ButtplugMessage>;
+    protected sendMessageClosure: (msg: Messages.ButtplugMessage) => Promise<Messages.ButtplugMessage>;
 }

package/dist/web/client/ButtplugClientConnectorException.d.ts

@@ -1,10 +1,3 @@
-/*!
- * Buttplug JS Source Code File - Visit https://buttplug.io for more info about
- * the project. Licensed under the BSD 3-Clause license. See LICENSE file in the
- * project root for full license information.
- *
- * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
- */
 import { ButtplugError } from '../core/Exceptions';
 export declare class ButtplugClientConnectorException extends ButtplugError {
     constructor(message: string);

package/dist/web/client/ButtplugClientDevice.d.ts

@@ -1,3 +1,6 @@
+import { EventEmitter } from 'eventemitter3';
+import { ButtplugClientDeviceFeature } from './ButtplugClientDeviceFeature';
+import { DeviceOutputCommand } from './ButtplugClientDeviceCommand';
 /*!
  * Buttplug JS Source Code File - Visit https://buttplug.io for more info about
  * the project. Licensed under the BSD 3-Clause license. See LICENSE file in the
@@ -6,13 +9,13 @@
  * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
  */
 import * as Messages from '../core/Messages';
-import { EventEmitter } from 'eventemitter3';
 /**
  * Represents an abstract device, capable of taking certain kinds of messages.
  */
 export declare class ButtplugClientDevice extends EventEmitter {
     private _deviceInfo;
     private _sendClosure;
+    private _features;
     /**
      * Return the name of the device.
      */
@@ -29,39 +32,21 @@ export declare class ButtplugClientDevice extends EventEmitter {
      * Return the index of the device.
      */
     get messageTimingGap(): number | undefined;
-    /**
-     * Return a list of message types the device accepts.
-     */
-    get messageAttributes(): Messages.MessageAttributes;
-    static fromMsg(msg: Messages.DeviceInfo, sendClosure: (device: ButtplugClientDevice, msg: Messages.ButtplugDeviceMessage) => Promise<Messages.ButtplugMessage>): ButtplugClientDevice;
-    private allowedMsgs;
+    get features(): Map<number, ButtplugClientDeviceFeature>;
+    static fromMsg(msg: Messages.DeviceInfo, sendClosure: (msg: Messages.ButtplugMessage) => Promise<Messages.ButtplugMessage>): ButtplugClientDevice;
     /**
      * @param _index Index of the device, as created by the device manager.
      * @param _name Name of the device.
      * @param allowedMsgs Buttplug messages the device can receive.
      */
-    constructor(_deviceInfo: Messages.DeviceInfo, _sendClosure: (device: ButtplugClientDevice, msg: Messages.ButtplugDeviceMessage) => Promise<Messages.ButtplugMessage>);
-    send(msg: Messages.ButtplugDeviceMessage): Promise<Messages.ButtplugMessage>;
-    sendExpectOk(msg: Messages.ButtplugDeviceMessage): Promise<void>;
-    scalar(scalar: Messages.ScalarSubcommand | Messages.ScalarSubcommand[]): Promise<void>;
-    private scalarCommandBuilder;
-    get vibrateAttributes(): Messages.GenericDeviceMessageAttributes[];
-    vibrate(speed: number | number[]): Promise<void>;
-    get oscillateAttributes(): Messages.GenericDeviceMessageAttributes[];
-    oscillate(speed: number | number[]): Promise<void>;
-    get rotateAttributes(): Messages.GenericDeviceMessageAttributes[];
-    rotate(values: number | [number, boolean][], clockwise?: boolean): Promise<void>;
-    get linearAttributes(): Messages.GenericDeviceMessageAttributes[];
-    linear(values: number | [number, number][], duration?: number): Promise<void>;
-    sensorRead(sensorIndex: number, sensorType: Messages.SensorType): Promise<number[]>;
-    get hasBattery(): boolean;
-    battery(): Promise<number>;
-    get hasRssi(): boolean;
-    rssi(): Promise<number>;
-    rawRead(endpoint: string, expectedLength: number, timeout: number): Promise<Uint8Array>;
-    rawWrite(endpoint: string, data: Uint8Array, writeWithResponse: boolean): Promise<void>;
-    rawSubscribe(endpoint: string): Promise<void>;
-    rawUnsubscribe(endpoint: string): Promise<void>;
+    private constructor();
+    send(msg: Messages.ButtplugMessage): Promise<Messages.ButtplugMessage>;
+    protected sendMsgExpectOk: (msg: Messages.ButtplugMessage) => Promise<void>;
+    protected isOutputValid(featureIndex: number, type: Messages.OutputType): void;
+    hasOutput(type: Messages.OutputType): boolean;
+    hasInput(type: Messages.InputType): boolean;
+    runOutput(cmd: DeviceOutputCommand): Promise<void>;
     stop(): Promise<void>;
+    battery(): Promise<number>;
     emitDisconnected(): void;
 }

package/dist/web/client/ButtplugClientDeviceCommand.d.ts

@@ -0,0 +1,42 @@
+import { OutputType } from '../core/Messages';
+declare class PercentOrSteps {
+    private _percent;
+    private _steps;
+    get percent(): number | undefined;
+    get steps(): number | undefined;
+    static createSteps(s: number): PercentOrSteps;
+    static createPercent(p: number): PercentOrSteps;
+}
+export declare class DeviceOutputCommand {
+    private _outputType;
+    private _value;
+    private _duration?;
+    constructor(_outputType: OutputType, _value: PercentOrSteps, _duration?: number | undefined);
+    get outputType(): OutputType;
+    get value(): PercentOrSteps;
+    get duration(): number | undefined;
+}
+export declare class DeviceOutputValueConstructor {
+    private _outputType;
+    constructor(_outputType: OutputType);
+    steps(steps: number): DeviceOutputCommand;
+    percent(percent: number): DeviceOutputCommand;
+}
+export declare class DeviceOutputPositionWithDurationConstructor {
+    steps(steps: number, duration: number): DeviceOutputCommand;
+    percent(percent: number, duration: number): DeviceOutputCommand;
+}
+export declare class DeviceOutput {
+    private constructor();
+    static get Vibrate(): DeviceOutputValueConstructor;
+    static get Rotate(): DeviceOutputValueConstructor;
+    static get Oscillate(): DeviceOutputValueConstructor;
+    static get Constrict(): DeviceOutputValueConstructor;
+    static get Inflate(): DeviceOutputValueConstructor;
+    static get Temperature(): DeviceOutputValueConstructor;
+    static get Led(): DeviceOutputValueConstructor;
+    static get Spray(): DeviceOutputValueConstructor;
+    static get Position(): DeviceOutputValueConstructor;
+    static get PositionWithDuration(): DeviceOutputPositionWithDurationConstructor;
+}
+export {};

package/dist/web/client/ButtplugClientDeviceFeature.d.ts

@@ -0,0 +1,18 @@
+import { DeviceOutputCommand } from './ButtplugClientDeviceCommand';
+import * as Messages from "../core/Messages";
+export declare class ButtplugClientDeviceFeature {
+    private _deviceIndex;
+    private _deviceName;
+    private _feature;
+    private _sendClosure;
+    constructor(_deviceIndex: number, _deviceName: string, _feature: Messages.DeviceFeature, _sendClosure: (msg: Messages.ButtplugMessage) => Promise<Messages.ButtplugMessage>);
+    protected send: (msg: Messages.ButtplugMessage) => Promise<Messages.ButtplugMessage>;
+    protected sendMsgExpectOk: (msg: Messages.ButtplugMessage) => Promise<void>;
+    protected isOutputValid(type: Messages.OutputType): void;
+    protected isInputValid(type: Messages.InputType): void;
+    protected sendOutputCmd(command: DeviceOutputCommand): Promise<void>;
+    hasOutput(type: Messages.OutputType): boolean;
+    hasInput(type: Messages.InputType): boolean;
+    runOutput(cmd: DeviceOutputCommand): Promise<void>;
+    runInput(inputType: Messages.InputType, inputCommand: Messages.InputCommandType): Promise<Messages.InputReading | undefined>;
+}

package/dist/web/client/ButtplugNodeWebsocketClientConnector.d.ts

@@ -1,18 +1,4 @@
-/*!
- * Buttplug JS Source Code File - Visit https://buttplug.io for more info about
- * the project. Licensed under the BSD 3-Clause license. See LICENSE file in the
- * project root for full license information.
- *
- * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
- */
 import { ButtplugBrowserWebsocketClientConnector } from './ButtplugBrowserWebsocketClientConnector';
 export declare class ButtplugNodeWebsocketClientConnector extends ButtplugBrowserWebsocketClientConnector {
-    protected _websocketConstructor: {
-        new (url: string | URL, protocols?: string | string[] | undefined): WebSocket;
-        prototype: WebSocket;
-        readonly CONNECTING: 0;
-        readonly OPEN: 1;
-        readonly CLOSING: 2;
-        readonly CLOSED: 3;
-    };
+    protected _websocketConstructor: typeof WebSocket;
 }

package/dist/web/client/IButtplugClientConnector.d.ts

@@ -1,10 +1,3 @@
-/*!
- * Buttplug JS Source Code File - Visit https://buttplug.io for more info about
- * the project. Licensed under the BSD 3-Clause license. See LICENSE file in the
- * project root for full license information.
- *
- * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
- */
 import { ButtplugMessage } from '../core/Messages';
 import { EventEmitter } from 'eventemitter3';
 export interface IButtplugClientConnector extends EventEmitter {

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

@@ -1,3 +1,4 @@
+import { ButtplugLogger } from './Logging';
 /*!
  * Buttplug JS Source Code File - Visit https://buttplug.io for more info about
  * the project. Licensed under the BSD 3-Clause license. See LICENSE file in the
@@ -6,7 +7,6 @@
  * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
  */
 import * as Messages from './Messages';
-import { ButtplugLogger } from './Logging';
 export declare class ButtplugError extends Error {
     get ErrorClass(): Messages.ErrorClass;
     get InnerError(): Error | undefined;

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

@@ -1,10 +1,3 @@
-/*!
- * Buttplug JS Source Code File - Visit https://buttplug.io for more info about
- * the project. Licensed under the BSD 3-Clause license. See LICENSE file in the
- * project root for full license information.
- *
- * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
- */
 import { EventEmitter } from 'eventemitter3';
 export declare enum ButtplugLogLevel {
     Off = 0,

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

@@ -8,80 +8,31 @@
 export declare const SYSTEM_MESSAGE_ID = 0;
 export declare const DEFAULT_MESSAGE_ID = 1;
 export declare const MAX_ID = 4294967295;
-export declare const MESSAGE_SPEC_VERSION = 3;
-export declare class MessageAttributes {
-    ScalarCmd?: Array<GenericDeviceMessageAttributes>;
-    RotateCmd?: Array<GenericDeviceMessageAttributes>;
-    LinearCmd?: Array<GenericDeviceMessageAttributes>;
-    RawReadCmd?: RawDeviceMessageAttributes;
-    RawWriteCmd?: RawDeviceMessageAttributes;
-    RawSubscribeCmd?: RawDeviceMessageAttributes;
-    SensorReadCmd?: Array<SensorDeviceMessageAttributes>;
-    SensorSubscribeCmd?: Array<SensorDeviceMessageAttributes>;
-    StopDeviceCmd: {};
-    constructor(data: Partial<MessageAttributes>);
-    update(): void;
-}
-export declare enum ActuatorType {
-    Unknown = "Unknown",
-    Vibrate = "Vibrate",
-    Rotate = "Rotate",
-    Oscillate = "Oscillate",
-    Constrict = "Constrict",
-    Inflate = "Inflate",
-    Position = "Position"
-}
-export declare enum SensorType {
-    Unknown = "Unknown",
-    Battery = "Battery",
-    RSSI = "RSSI",
-    Button = "Button",
-    Pressure = "Pressure"
-}
-export declare class GenericDeviceMessageAttributes {
-    FeatureDescriptor: string;
-    ActuatorType: ActuatorType;
-    StepCount: number;
-    Index: number;
-    constructor(data: Partial<GenericDeviceMessageAttributes>);
-}
-export declare class RawDeviceMessageAttributes {
-    Endpoints: Array<string>;
-    constructor(Endpoints: Array<string>);
-}
-export declare class SensorDeviceMessageAttributes {
-    FeatureDescriptor: string;
-    SensorType: SensorType;
-    StepRange: Array<number>;
-    Index: number;
-    constructor(data: Partial<GenericDeviceMessageAttributes>);
-}
-export declare abstract class ButtplugMessage {
-    Id: number;
-    constructor(Id: number);
-    get Type(): Function;
-    toJSON(): string;
-    toProtocolFormat(): object;
-    update(): void;
-}
-export declare abstract class ButtplugDeviceMessage extends ButtplugMessage {
-    DeviceIndex: number;
-    Id: number;
-    constructor(DeviceIndex: number, Id: number);
-}
-export declare abstract class ButtplugSystemMessage extends ButtplugMessage {
-    Id: number;
-    constructor(Id?: number);
-}
-export declare class Ok extends ButtplugSystemMessage {
-    Id: number;
-    static Name: string;
-    constructor(Id?: number);
-}
-export declare class Ping extends ButtplugMessage {
-    Id: number;
-    static Name: string;
-    constructor(Id?: number);
+export declare const MESSAGE_SPEC_VERSION_MAJOR = 4;
+export declare const MESSAGE_SPEC_VERSION_MINOR = 0;
+export interface ButtplugMessage {
+    Ok?: Ok;
+    Ping?: Ping;
+    Error?: Error;
+    RequestServerInfo?: RequestServerInfo;
+    ServerInfo?: ServerInfo;
+    RequestDeviceList?: RequestDeviceList;
+    StartScanning?: StartScanning;
+    StopScanning?: StopScanning;
+    ScanningFinished?: ScanningFinished;
+    StopCmd?: StopCmd;
+    InputCmd?: InputCmd;
+    InputReading?: InputReading;
+    OutputCmd?: OutputCmd;
+    DeviceList?: DeviceList;
+}
+export declare function msgId(msg: ButtplugMessage): number;
+export declare function setMsgId(msg: ButtplugMessage, id: number): void;
+export interface Ok {
+    Id: number | undefined;
+}
+export interface Ping {
+    Id: number | undefined;
 }
 export declare enum ErrorClass {
     ERROR_UNKNOWN = 0,
@@ -90,185 +41,124 @@ export declare enum ErrorClass {
     ERROR_MSG = 3,
     ERROR_DEVICE = 4
 }
-export declare class Error extends ButtplugMessage {
+export interface Error {
     ErrorMessage: string;
     ErrorCode: ErrorClass;
-    Id: number;
-    static Name: string;
-    constructor(ErrorMessage: string, ErrorCode?: ErrorClass, Id?: number);
-    get Schemversion(): number;
-}
-export declare class DeviceInfo {
-    DeviceIndex: number;
-    DeviceName: string;
-    DeviceMessages: MessageAttributes;
-    DeviceDisplayName?: string;
-    DeviceMessageTimingGap?: number;
-    constructor(data: Partial<DeviceInfo>);
-}
-export declare class DeviceList extends ButtplugMessage {
-    static Name: string;
-    Devices: DeviceInfo[];
-    Id: number;
-    constructor(devices: DeviceInfo[], id?: number);
-    update(): void;
-}
-export declare class DeviceAdded extends ButtplugSystemMessage {
-    static Name: string;
-    DeviceIndex: number;
-    DeviceName: string;
-    DeviceMessages: MessageAttributes;
-    DeviceDisplayName?: string;
-    DeviceMessageTimingGap?: number;
-    constructor(data: Partial<DeviceAdded>);
-    update(): void;
-}
-export declare class DeviceRemoved extends ButtplugSystemMessage {
-    DeviceIndex: number;
-    static Name: string;
-    constructor(DeviceIndex: number);
+    Id: number | undefined;
 }
-export declare class RequestDeviceList extends ButtplugMessage {
-    Id: number;
-    static Name: string;
-    constructor(Id?: number);
+export interface RequestDeviceList {
+    Id: number | undefined;
 }
-export declare class StartScanning extends ButtplugMessage {
-    Id: number;
-    static Name: string;
-    constructor(Id?: number);
+export interface StartScanning {
+    Id: number | undefined;
 }
-export declare class StopScanning extends ButtplugMessage {
-    Id: number;
-    static Name: string;
-    constructor(Id?: number);
+export interface StopScanning {
+    Id: number | undefined;
 }
-export declare class ScanningFinished extends ButtplugSystemMessage {
-    static Name: string;
-    constructor();
+export interface ScanningFinished {
+    Id: number | undefined;
 }
-export declare class RequestServerInfo extends ButtplugMessage {
+export interface RequestServerInfo {
     ClientName: string;
-    MessageVersion: number;
-    Id: number;
-    static Name: string;
-    constructor(ClientName: string, MessageVersion?: number, Id?: number);
+    ProtocolVersionMajor: number;
+    ProtocolVersionMinor: number;
+    Id: number | undefined;
 }
-export declare class ServerInfo extends ButtplugSystemMessage {
-    MessageVersion: number;
+export interface ServerInfo {
     MaxPingTime: number;
     ServerName: string;
-    Id: number;
-    static Name: string;
-    constructor(MessageVersion: number, MaxPingTime: number, ServerName: string, Id?: number);
-}
-export declare class StopDeviceCmd extends ButtplugDeviceMessage {
-    DeviceIndex: number;
-    Id: number;
-    static Name: string;
-    constructor(DeviceIndex?: number, Id?: number);
-}
-export declare class StopAllDevices extends ButtplugMessage {
-    Id: number;
-    static Name: string;
-    constructor(Id?: number);
+    ProtocolVersionMajor: number;
+    ProtocolVersionMinor: number;
+    Id: number | undefined;
 }
-export declare class GenericMessageSubcommand {
-    Index: number;
-    protected constructor(Index: number);
-}
-export declare class ScalarSubcommand extends GenericMessageSubcommand {
-    Scalar: number;
-    ActuatorType: ActuatorType;
-    constructor(Index: number, Scalar: number, ActuatorType: ActuatorType);
-}
-export declare class ScalarCmd extends ButtplugDeviceMessage {
-    Scalars: ScalarSubcommand[];
+export interface DeviceFeature {
+    FeatureDescriptor: string;
+    Output: {
+        [key: string]: DeviceFeatureOutput;
+    };
+    Input: {
+        [key: string]: DeviceFeatureInput;
+    };
+    FeatureIndex: number;
+}
+export interface DeviceInfo {
     DeviceIndex: number;
-    Id: number;
-    static Name: string;
-    constructor(Scalars: ScalarSubcommand[], DeviceIndex?: number, Id?: number);
-}
-export declare class RotateSubcommand extends GenericMessageSubcommand {
-    Speed: number;
-    Clockwise: boolean;
-    constructor(Index: number, Speed: number, Clockwise: boolean);
+    DeviceName: string;
+    DeviceFeatures: {
+        [key: number]: DeviceFeature;
+    };
+    DeviceDisplayName?: string;
+    DeviceMessageTimingGap?: number;
 }
-export declare class RotateCmd extends ButtplugDeviceMessage {
-    Rotations: RotateSubcommand[];
-    DeviceIndex: number;
-    Id: number;
-    static Name: string;
-    static Create(deviceIndex: number, commands: [number, boolean][]): RotateCmd;
-    constructor(Rotations: RotateSubcommand[], DeviceIndex?: number, Id?: number);
+export interface DeviceList {
+    Devices: {
+        [key: number]: DeviceInfo;
+    };
+    Id: number | undefined;
 }
-export declare class VectorSubcommand extends GenericMessageSubcommand {
-    Position: number;
-    Duration: number;
-    constructor(Index: number, Position: number, Duration: number);
+export declare enum OutputType {
+    Unknown = "Unknown",
+    Vibrate = "Vibrate",
+    Rotate = "Rotate",
+    Oscillate = "Oscillate",
+    Constrict = "Constrict",
+    Inflate = "Inflate",
+    Position = "Position",
+    HwPositionWithDuration = "HwPositionWithDuration",
+    Temperature = "Temperature",
+    Spray = "Spray",
+    Led = "Led"
 }
-export declare class LinearCmd extends ButtplugDeviceMessage {
-    Vectors: VectorSubcommand[];
-    DeviceIndex: number;
-    Id: number;
-    static Name: string;
-    static Create(deviceIndex: number, commands: [number, number][]): LinearCmd;
-    constructor(Vectors: VectorSubcommand[], DeviceIndex?: number, Id?: number);
+export declare enum InputType {
+    Unknown = "Unknown",
+    Battery = "Battery",
+    RSSI = "RSSI",
+    Button = "Button",
+    Pressure = "Pressure"
 }
-export declare class SensorReadCmd extends ButtplugDeviceMessage {
-    DeviceIndex: number;
-    SensorIndex: number;
-    SensorType: SensorType;
-    Id: number;
-    static Name: string;
-    constructor(DeviceIndex: number, SensorIndex: number, SensorType: SensorType, Id?: number);
+export declare enum InputCommandType {
+    Read = "Read",
+    Subscribe = "Subscribe",
+    Unsubscribe = "Unsubscribe"
 }
-export declare class SensorReading extends ButtplugDeviceMessage {
-    DeviceIndex: number;
-    SensorIndex: number;
-    SensorType: SensorType;
-    Data: number[];
-    Id: number;
-    static Name: string;
-    constructor(DeviceIndex: number, SensorIndex: number, SensorType: SensorType, Data: number[], Id?: number);
+export interface DeviceFeatureInput {
+    Value: number[];
+    Command: InputCommandType[];
 }
-export declare class RawReadCmd extends ButtplugDeviceMessage {
-    DeviceIndex: number;
-    Endpoint: string;
-    ExpectedLength: number;
-    Timeout: number;
-    Id: number;
-    static Name: string;
-    constructor(DeviceIndex: number, Endpoint: string, ExpectedLength: number, Timeout: number, Id?: number);
+export interface DeviceFeatureOutput {
+    Value: number;
+    Duration?: number;
 }
-export declare class RawWriteCmd extends ButtplugDeviceMessage {
+export interface OutputCmd {
     DeviceIndex: number;
-    Endpoint: string;
-    Data: Uint8Array;
-    WriteWithResponse: boolean;
-    Id: number;
-    static Name: string;
-    constructor(DeviceIndex: number, Endpoint: string, Data: Uint8Array, WriteWithResponse: boolean, Id?: number);
+    FeatureIndex: number;
+    Command: {
+        [key: string]: DeviceFeatureOutput;
+    };
+    Id: number | undefined;
 }
-export declare class RawSubscribeCmd extends ButtplugDeviceMessage {
+export interface InputCmd {
     DeviceIndex: number;
-    Endpoint: string;
-    Id: number;
-    static Name: string;
-    constructor(DeviceIndex: number, Endpoint: string, Id?: number);
+    FeatureIndex: number;
+    Type: InputType;
+    Command: InputCommandType;
+    Id: number | undefined;
 }
-export declare class RawUnsubscribeCmd extends ButtplugDeviceMessage {
-    DeviceIndex: number;
-    Endpoint: string;
-    Id: number;
-    static Name: string;
-    constructor(DeviceIndex: number, Endpoint: string, Id?: number);
+export interface InputValue {
+    Value: number;
 }
-export declare class RawReading extends ButtplugDeviceMessage {
+export interface InputReading {
     DeviceIndex: number;
-    Endpoint: string;
-    Data: number[];
-    Id: number;
-    static Name: string;
-    constructor(DeviceIndex: number, Endpoint: string, Data: number[], Id?: number);
+    FeatureIndex: number;
+    Reading: {
+        [key: string]: InputValue;
+    };
+    Id: number | undefined;
+}
+export interface StopCmd {
+    Id: number | undefined;
+    DeviceIndex: number | undefined;
+    FeatureIndex: number | undefined;
+    Inputs: boolean | undefined;
+    Outputs: boolean | undefined;
 }

package/dist/web/index.d.ts

@@ -5,14 +5,14 @@
  *
  * @copyright Copyright (c) Nonpolynomial Labs LLC. All rights reserved.
  */
-export * from './client/Client';
+export * from './client/ButtplugClient';
 export * from './client/ButtplugClientDevice';
 export * from './client/ButtplugBrowserWebsocketClientConnector';
 export * from './client/ButtplugNodeWebsocketClientConnector';
 export * from './client/ButtplugClientConnectorException';
 export * from './utils/ButtplugMessageSorter';
+export * from './client/ButtplugClientDeviceCommand';
 export * from './client/IButtplugClientConnector';
 export * from './core/Messages';
-export * from './core/MessageUtils';
 export * from './core/Logging';
 export * from './core/Exceptions';