Skip to content

allow limiting scalar commands to a control index #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RubberyFun wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow limiting scalar commands to a control index #285

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 24 additions & 14 deletions js/src/client/ButtplugClientDevice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,9 @@ export class ButtplugClientDevice extends EventEmitter {
}

private async scalarCommandBuilder(
speed: number | number[],
actuator: Messages.ActuatorType
value: number | number[],
actuator: Messages.ActuatorType,
index?: number
) {
const scalarAttrs = this.messageAttributes.ScalarCmd?.filter(
(x) => x.ActuatorType === actuator
Expand All @@ -134,18 +135,27 @@ export class ButtplugClientDevice extends EventEmitter {
);
}
const cmds: Messages.ScalarSubcommand[] = [];
if (typeof speed === 'number') {
scalarAttrs.forEach((x) =>
cmds.push(new Messages.ScalarSubcommand(x.Index, speed, actuator))
);
} else if (Array.isArray(speed)) {
if (speed.length > scalarAttrs.length) {
if (typeof value === 'number') {
if (index !== undefined) {
if (index >= scalarAttrs.length) {
throw new ButtplugDeviceError(
`Index ${index} out of range for device ${this.name} with ${scalarAttrs.length} ${actuator} actuators`
);
}
scalarAttrs.forEach((x) => //push to all actuators when a single unindexed value is sent
cmds.push(new Messages.ScalarSubcommand(x.Index, value, actuator))
);
} else {
cmds.push(new Messages.ScalarSubcommand(index ?? 0, value, actuator))
}
} else if (Array.isArray(value)) {
if (value.length > scalarAttrs.length) {
throw new ButtplugDeviceError(
`${speed.length} commands send to a device with ${scalarAttrs.length} vibrators`
`${value.length} commands send to a device with ${scalarAttrs.length} vibrators`
);
}
scalarAttrs.forEach((x, i) => {
cmds.push(new Messages.ScalarSubcommand(x.Index, speed[i], actuator));
cmds.push(new Messages.ScalarSubcommand(x.Index, value[i], actuator));
});
} else {
throw new ButtplugDeviceError(
Expand All @@ -163,8 +173,8 @@ export class ButtplugClientDevice extends EventEmitter {
);
}

public async vibrate(speed: number | number[]): Promise<void> {
await this.scalarCommandBuilder(speed, Messages.ActuatorType.Vibrate);
public async vibrate(speed: number | number[], index?: number): Promise<void> {
await this.scalarCommandBuilder(speed, Messages.ActuatorType.Vibrate, index);
}

public get oscillateAttributes(): Messages.GenericDeviceMessageAttributes[] {
Expand All @@ -175,8 +185,8 @@ export class ButtplugClientDevice extends EventEmitter {
);
}

public async oscillate(speed: number | number[]): Promise<void> {
await this.scalarCommandBuilder(speed, Messages.ActuatorType.Oscillate);
public async oscillate(speed: number | number[], index?: number): Promise<void> {
await this.scalarCommandBuilder(speed, Messages.ActuatorType.Oscillate, index);
}

public get rotateAttributes(): Messages.GenericDeviceMessageAttributes[] {
Expand Down