Skip to content
This repository was archived by the owner on Nov 8, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
node_modules
/lib
2 changes: 0 additions & 2 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
src/
.git*

1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
language: node_js
node_js:
- 4
- 6
- 8
- 'stable'
Expand Down
123 changes: 123 additions & 0 deletions lib/parser.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
function dir(ident) {
if (ident === '=>') {
return 'request';
}
if (ident === '<=') {
return 'response';
}
}

function parse(trace) {
// better regex, please, start here:
// http://scriptular.com/#%5E(%3F%3A%5Ba-z0-9%5D%7B4%7D%3A)%20((%3F%3A%5Ba-z0-9%5D%7B2%7D%20)%7B1%2C16%7D)%7C%7C%7C%7C%7C%7C%7C%7C%5B%2200a0%3A%2011%2022%2033%2044%2055%2066%2077%2088%2099%2010%2011%2012%2013%2014%2015%2016%2017%20%20%7B.%20%20%5C%22headers%5C%22%3A%20%7B%22%5D
const traceLines = trace.split('\n');
const dataPattern = /^(?:[a-z0-9]{4}:) ((?:[a-z0-9]{2} ){1,16})/;
const dirPattern = /^(=>|<=)/;

// find ASCI bytes in raw lines

// will contain array of arrays with direction and data
// e.g [['<=', "47 45 54 20 2f 73 68 6f 70 70 69 6e 67 2d 63 61"]]
const asciiHexSets = [];
let lastDir = '';

for (const line of traceLines) {
const dirMatch = dirPattern.exec(line);
if (dirMatch !== null) {
lastDir = dirMatch[0].trim();
}

const dataMatch = dataPattern.exec(line);
if (dataMatch !== null) {
const data = dataMatch[1].trim();
asciiHexSets.push([lastDir, data]);
}
}

// split lines by spaces and make array of ASCII hex bytes
const asciiHexBuffer = { request: [], response: [] };
for (const [direction, data] of asciiHexSets) {
for (const byte of data.split(' ')) {
asciiHexBuffer[dir(direction)].push(byte);
}
}

// convert ASCII hex to ASCII integers codes
const asciiIntBuffer = { request: [], response: [] };
for (const key of Object.keys(asciiHexBuffer)) {
const hexs = asciiHexBuffer[key];
for (const hex of hexs) {
asciiIntBuffer[key].push(parseInt(hex, 16));
}
}

// convert ACII codes to charactes
const stringBuffer = { request: [], response: [] };
for (const key of Object.keys(asciiIntBuffer)) {
const codes = asciiIntBuffer[key];
for (const code of codes) {
stringBuffer[key].push(String.fromCharCode(code));
}
}

return {
request: stringBuffer.request.join(''),
response: stringBuffer.response.join('')
};
}

function parseToString(trace) {
const message = parse(trace);
let output = '';

const request = [];
const requestLines = message.request.split('\r\n');
for (const line of requestLines) {
request.push(`> ${line}`);
}
output += request.join('\r\n');
output += '\n';
output += '\r\n';
const response = [];
const responseLines = message.response.split('\r\n');
for (const line of responseLines) {
response.push(`< ${line}`);
}
output += response.join('\r\n');
output += '\n';
return output;
}

function parseBackRequestAndResponseFromString(string) {
const output = {request: '', response: ''};

const request = [];
const stringLines = string.split('\r\n');
for (const line of stringLines) {
if (line.startsWith('> ')) {
request.push(line.replace(/^> /, ''));
}
}

// removing trailing LF
output.request = request.join('\r\n').replace(/\n$/, '');

const response = [];
for (const line of stringLines) {
if (line.startsWith('< ')) {
response.push(line.replace(/^< /, ''));
}
}

// removing trailing LF
output.response = response.join('\r\n').replace(/\n$/, '');

return output;
}

module.exports = {
parseBackRequestAndResponseFromString,
parseBack: parseBackRequestAndResponseFromString,
parseToString,
parse
};
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Parse curl --trace option output to raw HTTP message",
"main": "lib/parser.js",
"engines": {
"node": ">= 4"
"node": ">= 6"
},
"scripts": {
"test": "scripts/test",
Expand Down
9 changes: 0 additions & 9 deletions scripts/build

This file was deleted.

3 changes: 1 addition & 2 deletions scripts/prepublish
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
#!/bin/sh
./scripts/test &&
./scripts/build
./scripts/test
1 change: 0 additions & 1 deletion scripts/test
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
#!/bin/sh
./scripts/build
./node_modules/mocha/bin/mocha --reporter spec --compilers=coffee:coffeescript/register ./test/**/*-test.coffee
106 changes: 0 additions & 106 deletions src/parser.coffee

This file was deleted.

8 changes: 0 additions & 8 deletions test/integration/cli-test.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,6 @@ fs = require('fs')
cmdPrefix = ''

describe "Command line", () ->
before (done) ->
#CLI is linked with native JS in /lib so re-compile Coffee /src to /lib
cmd = './scripts/build'
cli = exec cmdPrefix + cmd, (error, out, err) ->
if error
done error
done()

describe "parsing from standard input with --raw", () ->
stdout = ""
stderr = ""
Expand Down
2 changes: 1 addition & 1 deletion test/integration/js-api-test.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ fs = require 'fs'

{assert} = require('chai')
{exec} = require('child_process')
parser = require('../../src/parser')
parser = require('../../lib/parser')

describe "Javascript API", () ->
describe "parsing from file", () ->
Expand Down
2 changes: 1 addition & 1 deletion test/unit/parser-test.coffee
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
fs = require 'fs'
assert = require('chai').assert
parser = require '../../src/parser'
parser = require '../../lib/parser'

describe 'parser module', () ->
output = ""
Expand Down