Skip to content
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.

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

Rename MessageWriter to MessagePacker. #12

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion src/client/Transaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2015,2016 The Measurement Factory.
* Licensed under the Apache License, Version 2.0. */

import { requestPrefix } from "../http/one/MessageWriter";
import { requestPrefix } from "../http/one/MessagePacker";
import ResponseParser from "../http/one/ResponseParser";
import Request from "../http/Request";
import { Must, SendBytes } from "../misc/Gadgets";
Expand Down
18 changes: 9 additions & 9 deletions src/http/one/MessageWriter.js → src/http/one/MessagePacker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function rawStatusLine(statusLine) {
function packStatusLine(statusLine) {
return [
statusLine.protocol,
statusLine.protocolDelimiter,
Expand All @@ -9,7 +9,7 @@ function rawStatusLine(statusLine) {
].filter(item => item !== null).join("");
}

function rawRequestLine(requestLine) {
function packRequestLine(requestLine) {
return [
requestLine.method,
requestLine.methodDelimiter,
Expand All @@ -20,32 +20,32 @@ function rawRequestLine(requestLine) {
].filter(item => item !== null).join("");
}

function rawHeader(header) {
function packHeader(header) {
if (header._raw !== null)
return header._raw;

function rawField(field) {
function packField(field) {
return field.name + field.separator +
field.value + field.terminator;
}

return header.fields.map(rawField).join("");
return header.fields.map(packField).join("");
}

export function requestPrefix(message) {
if (message.startLine.protocol === "HTTP/0.9")
return "";

return rawRequestLine(message.startLine) +
rawHeader(message.header) +
return packRequestLine(message.startLine) +
packHeader(message.header) +
message.headerDelimiter;
}

export function responsePrefix(message) {
if (message.startLine.protocol === "HTTP/0.9")
return "";

return rawStatusLine(message.startLine) +
rawHeader(message.header) +
return packStatusLine(message.startLine) +
packHeader(message.header) +
message.headerDelimiter;
}
2 changes: 1 addition & 1 deletion src/proxy/Transaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import net from "net";
import RequestParser from "../http/one/RequestParser";
import ResponseParser from "../http/one/ResponseParser";
import { requestPrefix, responsePrefix } from "../http/one/MessageWriter";
import { requestPrefix, responsePrefix } from "../http/one/MessagePacker";
import * as Config from "../misc/Config";
import { Must, SendBytes } from "../misc/Gadgets";
import * as Gadgets from "../misc/Gadgets";
Expand Down
2 changes: 1 addition & 1 deletion src/server/Transaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2015,2016 The Measurement Factory.
* Licensed under the Apache License, Version 2.0. */

import { responsePrefix } from "../http/one/MessageWriter";
import { responsePrefix } from "../http/one/MessagePacker";
import RequestParser from "../http/one/RequestParser";
import Response from "../http/Response";
import Body from "../http/Body";
Expand Down