Skip to content

Commit

Permalink
[major] Rename modules files
Browse files Browse the repository at this point in the history
  • Loading branch information
@lpinca
lpinca committed Jan 5, 2018
1 parent 63ce954 commit 3936f3a
Show file tree
Hide file tree
Showing 19 changed files with 86 additions and 87 deletions.
8 changes: 4 additions & 4 deletions index.js
View file
Expand Up @@ -6,10 +6,10 @@

'use strict';

const WebSocket = require('./lib/WebSocket');
const WebSocket = require('./lib/websocket');

WebSocket.Server = require('./lib/WebSocketServer');
WebSocket.Receiver = require('./lib/Receiver');
WebSocket.Sender = require('./lib/Sender');
WebSocket.Server = require('./lib/websocket-server');
WebSocket.Receiver = require('./lib/receiver');
WebSocket.Sender = require('./lib/sender');

module.exports = WebSocket;
0 lib/BufferUtil.js → lib/buffer-util.js
View file
File renamed without changes.
0 lib/Constants.js → lib/constants.js
View file
File renamed without changes.
0 lib/EventTarget.js → lib/event-target.js
View file
File renamed without changes.
0 lib/Extensions.js → lib/extension.js
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/PerMessageDeflate.js → lib/permessage-deflate.js
View file
Expand Up @@ -4,7 +4,7 @@ const safeBuffer = require('safe-buffer');
const Limiter = require('async-limiter');
const zlib = require('zlib');

const bufferUtil = require('./BufferUtil');
const bufferUtil = require('./buffer-util');

const Buffer = safeBuffer.Buffer;

Expand Down
8 changes: 4 additions & 4 deletions lib/Receiver.js → lib/receiver.js
View file
Expand Up @@ -8,10 +8,10 @@

const safeBuffer = require('safe-buffer');

const PerMessageDeflate = require('./PerMessageDeflate');
const validation = require('./Validation');
const bufferUtil = require('./BufferUtil');
const constants = require('./Constants');
const PerMessageDeflate = require('./permessage-deflate');
const bufferUtil = require('./buffer-util');
const validation = require('./validation');
const constants = require('./constants');

const Buffer = safeBuffer.Buffer;

Expand Down
8 changes: 4 additions & 4 deletions lib/Sender.js → lib/sender.js
View file
Expand Up @@ -9,10 +9,10 @@
const safeBuffer = require('safe-buffer');
const crypto = require('crypto');

const PerMessageDeflate = require('./PerMessageDeflate');
const bufferUtil = require('./BufferUtil');
const validation = require('./Validation');
const constants = require('./Constants');
const PerMessageDeflate = require('./permessage-deflate');
const bufferUtil = require('./buffer-util');
const validation = require('./validation');
const constants = require('./constants');

const Buffer = safeBuffer.Buffer;

Expand Down
0 lib/Validation.js → lib/validation.js
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions lib/WebSocketServer.js → lib/websocket-server.js
View file
Expand Up @@ -13,10 +13,10 @@ const Ultron = require('ultron');
const http = require('http');
const url = require('url');

const PerMessageDeflate = require('./PerMessageDeflate');
const Extensions = require('./Extensions');
const constants = require('./Constants');
const WebSocket = require('./WebSocket');
const PerMessageDeflate = require('./permessage-deflate');
const extension = require('./extension');
const constants = require('./constants');
const WebSocket = require('./websocket');

const Buffer = safeBuffer.Buffer;

Expand Down Expand Up @@ -171,7 +171,7 @@ class WebSocketServer extends EventEmitter {
);

try {
const offers = Extensions.parse(
const offers = extension.parse(
req.headers['sec-websocket-extensions']
);

Expand Down Expand Up @@ -261,7 +261,7 @@ class WebSocketServer extends EventEmitter {
if (protocol) headers.push(`Sec-WebSocket-Protocol: ${protocol}`);
if (extensions[PerMessageDeflate.extensionName]) {
const params = extensions[PerMessageDeflate.extensionName].params;
const value = Extensions.format({
const value = extension.format({
[PerMessageDeflate.extensionName]: [params]
});
headers.push(`Sec-WebSocket-Extensions: ${value}`);
Expand Down
20 changes: 10 additions & 10 deletions lib/WebSocket.js → lib/websocket.js
View file
Expand Up @@ -13,12 +13,12 @@ const https = require('https');
const http = require('http');
const url = require('url');

const PerMessageDeflate = require('./PerMessageDeflate');
const EventTarget = require('./EventTarget');
const Extensions = require('./Extensions');
const constants = require('./Constants');
const Receiver = require('./Receiver');
const Sender = require('./Sender');
const PerMessageDeflate = require('./permessage-deflate');
const EventTarget = require('./event-target');
const extension = require('./extension');
const constants = require('./constants');
const Receiver = require('./receiver');
const Sender = require('./sender');

const readyStates = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED'];
const protocolVersions = [8, 13];
Expand Down Expand Up @@ -589,7 +589,7 @@ function initAsClient (address, protocols, options) {
options.perMessageDeflate !== true ? options.perMessageDeflate : {},
false
);
requestOptions.headers['Sec-WebSocket-Extensions'] = Extensions.format({
requestOptions.headers['Sec-WebSocket-Extensions'] = extension.format({
[PerMessageDeflate.extensionName]: perMessageDeflate.offer()
});
}
Expand Down Expand Up @@ -724,13 +724,13 @@ function initAsClient (address, protocols, options) {

if (perMessageDeflate) {
try {
const serverExtensions = Extensions.parse(
const extensions = extension.parse(
res.headers['sec-websocket-extensions']
);

if (serverExtensions[PerMessageDeflate.extensionName]) {
if (extensions[PerMessageDeflate.extensionName]) {
perMessageDeflate.accept(
serverExtensions[PerMessageDeflate.extensionName]
extensions[PerMessageDeflate.extensionName]
);
this.extensions[PerMessageDeflate.extensionName] = perMessageDeflate;
}
Expand Down
44 changes: 22 additions & 22 deletions test/Extensions.test.js → test/extension.test.js
View file
Expand Up @@ -2,31 +2,31 @@

const assert = require('assert');

const Extensions = require('../lib/Extensions');
const extension = require('../lib/extension');

describe('Extensions', function () {
describe('extension', function () {
describe('parse', function () {
it('returns an empty object if the argument is undefined', function () {
assert.deepStrictEqual(Extensions.parse(), {});
assert.deepStrictEqual(Extensions.parse(''), {});
assert.deepStrictEqual(extension.parse(), {});
assert.deepStrictEqual(extension.parse(''), {});
});

it('parses a single extension', function () {
const extensions = Extensions.parse('foo');
const extensions = extension.parse('foo');

assert.deepStrictEqual(extensions, { foo: [{}] });
});

it('parses params', function () {
const extensions = Extensions.parse('foo;bar;baz=1;bar=2');
const extensions = extension.parse('foo;bar;baz=1;bar=2');

assert.deepStrictEqual(extensions, {
foo: [{ bar: [true, '2'], baz: ['1'] }]
});
});

it('parses multiple extensions', function () {
const extensions = Extensions.parse('foo,bar;baz,foo;baz');
const extensions = extension.parse('foo,bar;baz,foo;baz');

assert.deepStrictEqual(extensions, {
foo: [{}, { baz: [true] }],
Expand All @@ -35,30 +35,30 @@ describe('Extensions', function () {
});

it('parses quoted params', function () {
assert.deepStrictEqual(Extensions.parse('foo;bar="hi"'), {
assert.deepStrictEqual(extension.parse('foo;bar="hi"'), {
foo: [{ bar: ['hi'] }]
});
assert.deepStrictEqual(Extensions.parse('foo;bar="\\0"'), {
assert.deepStrictEqual(extension.parse('foo;bar="\\0"'), {
foo: [{ bar: ['0'] }]
});
assert.deepStrictEqual(Extensions.parse('foo;bar="b\\a\\z"'), {
assert.deepStrictEqual(extension.parse('foo;bar="b\\a\\z"'), {
foo: [{ bar: ['baz'] }]
});
assert.deepStrictEqual(Extensions.parse('foo;bar="b\\az";bar'), {
assert.deepStrictEqual(extension.parse('foo;bar="b\\az";bar'), {
foo: [{ bar: ['baz', true] }]
});
assert.throws(
() => Extensions.parse('foo;bar="baz"qux'),
() => extension.parse('foo;bar="baz"qux'),
/^SyntaxError: Unexpected character at index 13$/
);
assert.throws(
() => Extensions.parse('foo;bar="baz" qux'),
() => extension.parse('foo;bar="baz" qux'),
/^SyntaxError: Unexpected character at index 14$/
);
});

it('works with names that match Object.prototype property names', function () {
const parse = Extensions.parse;
const parse = extension.parse;

assert.deepStrictEqual(parse('hasOwnProperty, toString'), {
hasOwnProperty: [{}],
Expand All @@ -72,7 +72,7 @@ describe('Extensions', function () {
it('ignores the optional white spaces', function () {
const header = 'foo; bar\t; \tbaz=1\t ; bar="1"\t\t, \tqux\t ;norf ';

assert.deepStrictEqual(Extensions.parse(header), {
assert.deepStrictEqual(extension.parse(header), {
foo: [{ bar: [true, '1'], baz: ['1'] }],
qux: [{ norf: [true] }]
});
Expand All @@ -91,7 +91,7 @@ describe('Extensions', function () {
['foo;bar=""', 9]
].forEach((element) => {
assert.throws(
() => Extensions.parse(element[0]),
() => extension.parse(element[0]),
new RegExp(`^SyntaxError: Unexpected character at index ${element[1]}$`)
);
});
Expand All @@ -105,7 +105,7 @@ describe('Extensions', function () {
['foo;bar= ', 8]
].forEach((element) => {
assert.throws(
() => Extensions.parse(element[0]),
() => extension.parse(element[0]),
new RegExp(`^SyntaxError: Unexpected character at index ${element[1]}$`)
);
});
Expand All @@ -129,7 +129,7 @@ describe('Extensions', function () {
['foo;bar="\\\\"', 10]
].forEach((element) => {
assert.throws(
() => Extensions.parse(element[0]),
() => extension.parse(element[0]),
new RegExp(`^SyntaxError: Unexpected character at index ${element[1]}$`)
);
});
Expand All @@ -146,7 +146,7 @@ describe('Extensions', function () {
'foo;bar="1\\'
].forEach((header) => {
assert.throws(
() => Extensions.parse(header),
() => extension.parse(header),
/^SyntaxError: Unexpected end of input$/
);
});
Expand All @@ -155,19 +155,19 @@ describe('Extensions', function () {

describe('format', function () {
it('formats a single extension', function () {
const extensions = Extensions.format({ foo: {} });
const extensions = extension.format({ foo: {} });

assert.strictEqual(extensions, 'foo');
});

it('formats params', function () {
const extensions = Extensions.format({ foo: { bar: [true, 2], baz: 1 } });
const extensions = extension.format({ foo: { bar: [true, 2], baz: 1 } });

assert.strictEqual(extensions, 'foo; bar; bar=2; baz=1');
});

it('formats multiple extensions', function () {
const extensions = Extensions.format({
const extensions = extension.format({
foo: [{}, { baz: true }],
bar: { baz: true }
});
Expand Down

0 comments on commit 3936f3a

Please sign in to comment.