Skip to content

Fixed up request #5

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
jbarabander wants to merge 1 commit into
base: as_duplex_stream
Choose a base branch
from
Open

Fixed up request #5

Show file tree
Hide file tree
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
33 changes: 28 additions & 5 deletions src/attacker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@ const Reporter = require('./reporter');

const convertToDuration = (value) => typeof value === 'number' ? `${value}ms` : value;

const availableMethods = [
'GET',
'HEAD',
'POST',
'PUT',
'DELETE',
'CONNECT',
'OPTIONS',
'TRACE',
];

class Attacker extends Command {
constructor(priorCommands, options) {
super('attack', priorCommands, options);
Expand Down Expand Up @@ -120,11 +131,23 @@ class Attacker extends Command {
return this.addFlag('workers', value);
}
request(method, url) {
const command = createCommand(this.currentCmd.name, this.currentCmd.flags, this.currentCmd.globalFlags);
command.stdin.setEncoding('utf-8');
command.stdin.write(`${method.toUpperCase()} ${url}\n`);
command.std.end();
return command;
if (typeof method !== 'string') {
throw Error('method must be a string');
}
if (typeof url !== 'string') {
throw Error('url must be a string');
}
const newCopy = this.generateCopy();
const upperCasedMethod = method.toUpperCase();
if (!availableMethods.includes(upperCasedMethod)) {
throw Error('invalid method supplied');
}
newCopy.commands.splice(
newCopy.commands.length - 1,
0,
{name: `${upperCasedMethod} ${url}`, command: 'echo', flags: [], globalFlags: []}
);
return newCopy;
}
dump() {
return new Dumper(this.commands);
Expand Down
34 changes: 15 additions & 19 deletions src/command.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,22 @@ const GLOBAL_FLAGS = {

class Command {
constructor(name = null, priorCommands = [], options = {flags: [], globalFlags: []}) {
this.commands = priorCommands.slice().map((command) => ({
name: command.name,
flags: command.flags.slice(),
globalFlags: command.globalFlags.slice(),
}));
this.commands = priorCommands.slice().map((command) => {
const newCommand = {
name: command.name,
flags: command.flags.slice(),
globalFlags: command.globalFlags.slice(),
}
if (command.command) {
newCommand.command = command.command;
}
return newCommand;
});
const flags = options.flags || [];
this.currentCmd = {
name,
flags,
globalFlags: options.globalFlags || []
globalFlags: options.globalFlags || [],
};
this.flagsHash = flags.reduce((prev, curr) => {
if(curr.name) {
Expand All @@ -32,7 +38,7 @@ class Command {
const CurrentCommand = this.constructor;
const args = [
this.commands.slice(0, this.commands.length - 1),
{flags: this.currentCmd.flags, globalFlags: this.currentCmd.globalFlags}
{flags: this.currentCmd.flags, globalFlags: this.currentCmd.globalFlags, command: this.currentCmd.command}
];
if (CurrentCommand === Command) {
args.unshift(this.currentCmd.name);
Expand Down Expand Up @@ -68,9 +74,7 @@ class Command {
}
process() {
return this.commands.reduce((prev, command, i) => {
const flags = command.flags;
const globalFlags = command.globalFlags;
let commandToGiveBack = createCommand(command.name, flags, globalFlags);
let commandToGiveBack = createCommand(command);
if (prev) {
prev.stdout.pipe(commandToGiveBack.stdin);
}
Expand All @@ -79,9 +83,7 @@ class Command {
}
stream() {
return this.commands.reduce((prev, command, i) => {
const flags = command.flags;
const globalFlags = command.globalFlags;
let commandToGiveBack = createStream(command.name, flags, globalFlags);
let commandToGiveBack = createStream(command);
if (prev) {
prev.pipe(commandToGiveBack);
}
Expand All @@ -101,12 +103,6 @@ class Command {
const currentCommand = this.stream();
return currentCommand.on(event, cb);
}
out() {
return this.process().stdout;
}
in() {
return this.process().stdin;
}
}

module.exports = Command;
21 changes: 13 additions & 8 deletions src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,23 @@ const transformFlags = (flags) => {
return flags.map((flag) => transformFlag(flag.name, flag.value));
}

const createCommand = (command, flags, globalFlags) => {
const createCommandObj = (config) => {
const {name, flags, globalFlags} = config;
const command = config.command ? config.command : 'vegeta';
const parsedGlobalFlags = transformFlags(globalFlags);
const parsedCommandFlags = transformFlags(flags);
const allOptions = parsedGlobalFlags.concat([command], parsedCommandFlags);
return spawn('vegeta', allOptions);
const allOptions = parsedGlobalFlags.concat([name], parsedCommandFlags);
return { command, options: allOptions};
}

const createStream = (command, flags, globalFlags) => {
const parsedGlobalFlags = transformFlags(globalFlags);
const parsedCommandFlags = transformFlags(flags);
const allOptions = parsedGlobalFlags.concat([command], parsedCommandFlags);
return duplexSpawn('vegeta', allOptions);
const createCommand = (config) => {
const { command, options } = createCommandObj(config);
return spawn(command, options);
}

const createStream = (config) => {
const { command, options } = createCommandObj(config);
return duplexSpawn(command, options);
}

module.exports = {
Expand Down