Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[lint] enable no-var rule
  • Loading branch information
lpinca committed Apr 25, 2019
1 parent 01bb91d commit 379def6
Show file tree
Hide file tree
Showing 14 changed files with 107 additions and 99 deletions.
1 change: 1 addition & 0 deletions .eslintrc.yaml
Expand Up @@ -12,5 +12,6 @@ plugins:
- prettier
rules:
no-console: off
no-var: error
prefer-const: error
prettier/prettier: error
10 changes: 5 additions & 5 deletions bench/speed.js
Expand Up @@ -60,7 +60,7 @@ if (cluster.isMaster) {
console.log('Generating %s of test data...', humanSize(largest));
const randomBytes = Buffer.allocUnsafe(largest);

for (var i = 0; i < largest; ++i) {
for (let i = 0; i < largest; ++i) {
randomBytes[i] = ~~(Math.random() * 127);
}

Expand All @@ -72,8 +72,8 @@ if (cluster.isMaster) {
const ws = new WebSocket(url, {
maxPayload: 600 * 1024 * 1024
});
var roundtrip = 0;
var time;
let roundtrip = 0;
let time;

ws.on('error', (err) => {
console.error(err.stack);
Expand All @@ -87,7 +87,7 @@ if (cluster.isMaster) {
if (++roundtrip !== roundtrips)
return ws.send(data, { binary: useBinary });

var elapsed = process.hrtime(time);
let elapsed = process.hrtime(time);
elapsed = elapsed[0] * 1e9 + elapsed[1];

console.log(
Expand All @@ -106,7 +106,7 @@ if (cluster.isMaster) {

(function run() {
if (configs.length === 0) return cluster.worker.disconnect();
var config = configs.shift();
const config = configs.shift();
config.push(run);
runConfig.apply(null, config);
})();
Expand Down
47 changes: 26 additions & 21 deletions examples/fileapi/public/app.js
@@ -1,39 +1,44 @@
/* global Uploader */
function onFilesSelected(e) {
var button = e.srcElement;
const files = e.target.files;
let totalFiles = files.length;

if (!totalFiles) return;

const button = e.srcElement;
button.disabled = true;
var progress = document.querySelector('div#progress');

const progress = document.querySelector('div#progress');
progress.innerHTML = '0%';
var files = e.target.files;
var totalFiles = files.length;
var filesSent = 0;
if (totalFiles) {
var uploader = new Uploader('ws://localhost:8080', function() {
Array.prototype.slice.call(files, 0).forEach(function(file) {
if (file.name === '.') {
--totalFiles;

let filesSent = 0;

const uploader = new Uploader('ws://localhost:8080', function() {
Array.prototype.slice.call(files, 0).forEach(function(file) {
if (file.name === '.') {
--totalFiles;
return;
}
uploader.sendFile(file, function(error) {
if (error) {
console.log(error);
return;
}
uploader.sendFile(file, function(error) {
if (error) {
console.log(error);
return;
}
++filesSent;
progress.innerHTML = ~~((filesSent / totalFiles) * 100) + '%';
console.log('Sent: ' + file.name);
});
++filesSent;
progress.innerHTML = ~~((filesSent / totalFiles) * 100) + '%';
console.log('Sent: ' + file.name);
});
});
}
});

uploader.ondone = function() {
uploader.close();
progress.innerHTML = '100% done, ' + totalFiles + ' files sent.';
};
}

window.onload = function() {
var importButtons = document.querySelectorAll('[type="file"]');
const importButtons = document.querySelectorAll('[type="file"]');
Array.prototype.slice.call(importButtons, 0).forEach(function(importButton) {
importButton.addEventListener('change', onFilesSelected, false);
});
Expand Down
15 changes: 8 additions & 7 deletions examples/fileapi/public/uploader.js
@@ -1,15 +1,14 @@
/* global WebSocket */
function Uploader(url, cb) {
this.ws = new WebSocket(url);
if (cb) this.ws.onopen = cb;
this.sendQueue = [];
this.sending = null;
this.sendCallback = null;
this.ondone = null;
var self = this;
const self = this;
this.ws.onmessage = function(event) {
var data = JSON.parse(event.data);
var callback;
const data = JSON.parse(event.data);
let callback;
if (data.event === 'complete') {
if (data.path !== self.sending.path) {
self.sendQueue = [];
Expand All @@ -23,7 +22,7 @@ function Uploader(url, cb) {
if (callback) callback();
if (self.sendQueue.length === 0 && self.ondone) self.ondone(null);
if (self.sendQueue.length > 0) {
var args = self.sendQueue.pop();
const args = self.sendQueue.pop();
setTimeout(function() {
self.sendFile.apply(self, args);
}, 0);
Expand All @@ -33,7 +32,9 @@ function Uploader(url, cb) {
self.sending = null;
callback = self.sendCallback;
self.sendCallback = null;
var error = new Error('Server reported send error for file ' + data.path);
const error = new Error(
'Server reported send error for file ' + data.path
);
if (callback) callback(error);
if (self.ondone) self.ondone(error);
}
Expand All @@ -46,7 +47,7 @@ Uploader.prototype.sendFile = function(file, cb) {
this.sendQueue.push(arguments);
return;
}
var fileData = { name: file.name, path: file.webkitRelativePath };
const fileData = { name: file.name, path: file.webkitRelativePath };
this.sending = fileData;
this.sendCallback = cb;
this.ws.send(JSON.stringify(fileData));
Expand Down
46 changes: 23 additions & 23 deletions examples/fileapi/server.js
@@ -1,21 +1,21 @@
var WebSocketServer = require('../../').Server;
var express = require('express');
var fs = require('fs');
var util = require('util');
var path = require('path');
var app = express();
var server = require('http').Server(app);
var events = require('events');
var ansi = require('ansi');
var cursor = ansi(process.stdout);
const WebSocketServer = require('../../').Server;
const express = require('express');
const fs = require('fs');
const util = require('util');
const path = require('path');
const app = express();
const server = require('http').Server(app);
const events = require('events');
const ansi = require('ansi');
const cursor = ansi(process.stdout);

function BandwidthSampler(ws, interval) {
interval = interval || 2000;
var previousByteCount = 0;
var self = this;
var intervalId = setInterval(function() {
var byteCount = ws.bytesReceived;
var bytesPerSec = (byteCount - previousByteCount) / (interval / 1000);
let previousByteCount = 0;
const self = this;
const intervalId = setInterval(function() {
const byteCount = ws.bytesReceived;
const bytesPerSec = (byteCount - previousByteCount) / (interval / 1000);
previousByteCount = byteCount;
self.emit('sample', bytesPerSec);
}, interval);
Expand All @@ -28,8 +28,8 @@ util.inherits(BandwidthSampler, events.EventEmitter);
function makePathForFile(filePath, prefix, cb) {
if (typeof cb !== 'function') throw new Error('callback is required');
filePath = path.dirname(path.normalize(filePath)).replace(/^(\/|\\)+/, '');
var pieces = filePath.split(/(\\|\/)/);
var incrementalPath = prefix;
const pieces = filePath.split(/(\\|\/)/);
let incrementalPath = prefix;
function step(error) {
if (error) return cb(error);
if (pieces.length === 0) return cb(null, incrementalPath);
Expand All @@ -45,14 +45,14 @@ function makePathForFile(filePath, prefix, cb) {
cursor.eraseData(2).goto(1, 1);
app.use(express.static(path.join(__dirname, '/public')));

var clientId = 0;
var wss = new WebSocketServer({ server: server });
let clientId = 0;
const wss = new WebSocketServer({ server: server });
wss.on('connection', function(ws) {
var thisId = ++clientId;
const thisId = ++clientId;
cursor.goto(1, 4 + thisId).eraseLine();
console.log('Client #%d connected', thisId);

var sampler = new BandwidthSampler(ws);
const sampler = new BandwidthSampler(ws);
sampler.on('sample', function(bps) {
cursor.goto(1, 4 + thisId).eraseLine();
console.log(
Expand All @@ -62,8 +62,8 @@ wss.on('connection', function(ws) {
);
});

var filesReceived = 0;
var currentFile = null;
let filesReceived = 0;
let currentFile = null;
ws.on('message', function(data) {
if (typeof data === 'string') {
currentFile = JSON.parse(data);
Expand Down
14 changes: 7 additions & 7 deletions examples/serverstats/server.js
@@ -1,14 +1,14 @@
var WebSocketServer = require('../../').Server;
var express = require('express');
var path = require('path');
var app = express();
var server = require('http').createServer();
const WebSocketServer = require('../../').Server;
const express = require('express');
const path = require('path');
const app = express();
const server = require('http').createServer();

app.use(express.static(path.join(__dirname, '/public')));

var wss = new WebSocketServer({ server: server });
const wss = new WebSocketServer({ server: server });
wss.on('connection', function(ws) {
var id = setInterval(function() {
const id = setInterval(function() {
ws.send(JSON.stringify(process.memoryUsage()), function() {
/* ignore errors */
});
Expand Down
10 changes: 5 additions & 5 deletions lib/buffer-util.js
Expand Up @@ -15,9 +15,9 @@ function concat(list, totalLength) {
if (list.length === 1) return list[0];

const target = Buffer.allocUnsafe(totalLength);
var offset = 0;
let offset = 0;

for (var i = 0; i < list.length; i++) {
for (let i = 0; i < list.length; i++) {
const buf = list[i];
buf.copy(target, offset);
offset += buf.length;
Expand All @@ -37,7 +37,7 @@ function concat(list, totalLength) {
* @public
*/
function _mask(source, mask, output, offset, length) {
for (var i = 0; i < length; i++) {
for (let i = 0; i < length; i++) {
output[offset + i] = source[i] ^ mask[i & 3];
}
}
Expand All @@ -52,7 +52,7 @@ function _mask(source, mask, output, offset, length) {
function _unmask(buffer, mask) {
// Required until https://github.com/nodejs/node/issues/9006 is resolved.
const length = buffer.length;
for (var i = 0; i < length; i++) {
for (let i = 0; i < length; i++) {
buffer[i] ^= mask[i & 3];
}
}
Expand Down Expand Up @@ -85,7 +85,7 @@ function toBuffer(data) {

if (Buffer.isBuffer(data)) return data;

var buf;
let buf;

if (data instanceof ArrayBuffer) {
buf = Buffer.from(data);
Expand Down
2 changes: 1 addition & 1 deletion lib/event-target.js
Expand Up @@ -159,7 +159,7 @@ const EventTarget = {
removeEventListener(method, listener) {
const listeners = this.listeners(method);

for (var i = 0; i < listeners.length; i++) {
for (let i = 0; i < listeners.length; i++) {
if (listeners[i] === listener || listeners[i]._listener === listener) {
this.removeListener(method, listeners[i]);
}
Expand Down
27 changes: 14 additions & 13 deletions lib/extension.js
Expand Up @@ -50,16 +50,17 @@ function parse(header) {

if (header === undefined || header === '') return offers;

var params = {};
var mustUnescape = false;
var isEscaping = false;
var inQuotes = false;
var extensionName;
var paramName;
var start = -1;
var end = -1;

for (var i = 0; i < header.length; i++) {
let params = {};
let mustUnescape = false;
let isEscaping = false;
let inQuotes = false;
let extensionName;
let paramName;
let start = -1;
let end = -1;
let i = 0;

for (; i < header.length; i++) {
const code = header.charCodeAt(i);

if (extensionName === undefined) {
Expand Down Expand Up @@ -146,7 +147,7 @@ function parse(header) {
}

if (end === -1) end = i;
var value = header.slice(start, end);
let value = header.slice(start, end);
if (mustUnescape) {
value = value.replace(/\\/g, '');
mustUnescape = false;
Expand Down Expand Up @@ -198,14 +199,14 @@ function parse(header) {
function format(extensions) {
return Object.keys(extensions)
.map((extension) => {
var configurations = extensions[extension];
let configurations = extensions[extension];
if (!Array.isArray(configurations)) configurations = [configurations];
return configurations
.map((params) => {
return [extension]
.concat(
Object.keys(params).map((k) => {
var values = params[k];
let values = params[k];
if (!Array.isArray(values)) values = [values];
return values
.map((v) => (v === true ? k : `${k}=${v}`))
Expand Down
4 changes: 2 additions & 2 deletions lib/permessage-deflate.js
Expand Up @@ -233,7 +233,7 @@ class PerMessageDeflate {
normalizeParams(configurations) {
configurations.forEach((params) => {
Object.keys(params).forEach((key) => {
var value = params[key];
let value = params[key];

if (value.length > 1) {
throw new Error(`Parameter "${key}" must have only a single value`);
Expand Down Expand Up @@ -431,7 +431,7 @@ class PerMessageDeflate {
return;
}

var data = bufferUtil.concat(
let data = bufferUtil.concat(
this._deflate[kBuffers],
this._deflate[kTotalLength]
);
Expand Down

0 comments on commit 379def6

Please sign in to comment.