Lightly massage some of the generated JavaScript

proxy/Cakefile.js

@@ -1,26 +1,44 @@
-// Generated by CoffeeScript 2.4.1
-var FILES, FILES_SPEC, INITS, OUTFILE, STATIC, compileCoffee, copyStaticFiles, exec, execSync, fs, spawn;
 
-fs = require('fs');
+var fs = require('fs');
-
+var { exec, spawn, execSync } = require('child_process');
-({exec, spawn, execSync} = require('child_process'));
 
 // All coffeescript files required.
-FILES = ['broker.coffee', 'config.coffee', 'proxypair.coffee', 'snowflake.coffee', 'ui.coffee', 'util.coffee', 'websocket.coffee', 'shims.coffee'];
+var FILES = [
+  'broker.coffee',
+  'config.coffee',
+  'proxypair.coffee',
+  'snowflake.coffee',
+  'ui.coffee',
+  'util.coffee',
+  'websocket.coffee',
+  'shims.coffee'
+];
 
-INITS = ['init-badge.coffee', 'init-node.coffee', 'init-webext.coffee'];
+var INITS = [
+  'init-badge.coffee',
+  'init-node.coffee',
+  'init-webext.coffee'
+];
 
-FILES_SPEC = ['spec/broker.spec.coffee', 'spec/init.spec.coffee', 'spec/proxypair.spec.coffee', 'spec/snowflake.spec.coffee', 'spec/ui.spec.coffee', 'spec/util.spec.coffee', 'spec/websocket.spec.coffee'];
+var FILES_SPEC = [
+  'spec/broker.spec.coffee',
+  'spec/init.spec.coffee',
+  'spec/proxypair.spec.coffee',
+  'spec/snowflake.spec.coffee',
+  'spec/ui.spec.coffee',
+  'spec/util.spec.coffee',
+  'spec/websocket.spec.coffee'
+];
 
-OUTFILE = 'snowflake.js';
+var OUTFILE = 'snowflake.js';
 
-STATIC = 'static';
+var STATIC = 'static';
 
-copyStaticFiles = function() {
+var copyStaticFiles = function() {
   return exec('cp ' + STATIC + '/* build/');
 };
 
-compileCoffee = function(outDir, init) {
+var compileCoffee = function(outDir, init) {
   var files;
   files = FILES.concat('init-' + init + '.coffee');
   return exec('cat ' + files.join(' ') + ' | coffee -cs > ' + outDir + '/' + OUTFILE, function(err, stdout, stderr) {

proxy/broker.js

@@ -1,15 +1,13 @@
-// Generated by CoffeeScript 2.4.1
 /*
 Communication with the snowflake broker.
 
 Browser snowflakes must register with the broker in order
 to get assigned to clients.
 */
-var Broker;
 
-Broker = (function() {
 // Represents a broker running remotely.
 class Broker {
+
   // When interacting with the Broker, snowflake must generate a unique session
   // ID so the Broker can keep track of each proxy's signalling channels.
   // On construction, this Broker object does not do anything until
@@ -120,7 +118,3 @@ Broker = (function() {
 };
 
 Broker.prototype.clients = 0;
-
-  return Broker;
-
-}).call(this);

proxy/config.js

@@ -1,7 +1,4 @@
-// Generated by CoffeeScript 2.4.1
-var Config;
 
-Config = (function() {
 class Config {};
 
 Config.prototype.brokerUrl = 'snowflake-broker.bamsoftware.com';
@@ -37,7 +34,3 @@ Config = (function() {
     }
   ]
 };
-
-  return Config;
-
-}).call(this);

proxy/init-badge.js

@@ -1,37 +1,35 @@
-// Generated by CoffeeScript 2.4.1
 /*
 Entry point.
 */
-var dbg, debug, init, log, query, silenceNotifications, snowflake;
 
 if (((typeof TESTING === "undefined" || TESTING === null) || !TESTING) && !Util.featureDetect()) {
   console.log('webrtc feature not detected. shutting down');
   return;
 }
 
-snowflake = null;
+var snowflake = null;
 
-query = Query.parse(location);
+var query = Query.parse(location);
 
-debug = Params.getBool(query, 'debug', false);
+var debug = Params.getBool(query, 'debug', false);
 
-silenceNotifications = Params.getBool(query, 'silent', false);
+var silenceNotifications = Params.getBool(query, 'silent', false);
 
 // Log to both console and UI if applicable.
 // Requires that the snowflake and UI objects are hooked up in order to
 // log to console.
-log = function(msg) {
+var log = function(msg) {
   console.log('Snowflake: ' + msg);
   return snowflake != null ? snowflake.ui.log(msg) : void 0;
 };
 
-dbg = function(msg) {
+var dbg = function(msg) {
   if (debug || ((snowflake != null ? snowflake.ui : void 0) instanceof DebugUI)) {
     return log(msg);
   }
 };
 
-init = function() {
+var init = function() {
   var broker, config, ui;
   config = new Config;
   if ('off' !== query['ratelimit']) {

proxy/init-node.js

@@ -1,22 +1,20 @@
-// Generated by CoffeeScript 2.4.1
 /*
 Entry point.
 */
-var broker, config, dbg, log, snowflake, ui;
 
-config = new Config;
+var config = new Config;
 
-ui = new UI();
+var ui = new UI();
 
-broker = new Broker(config.brokerUrl);
+var broker = new Broker(config.brokerUrl);
 
-snowflake = new Snowflake(config, ui, broker);
+var snowflake = new Snowflake(config, ui, broker);
 
-log = function(msg) {
+var log = function(msg) {
   return console.log('Snowflake: ' + msg);
 };
 
-dbg = log;
+var dbg = log;
 
 log('== snowflake proxy ==');
 

proxy/init-webext.js

@@ -1,28 +1,26 @@
-// Generated by CoffeeScript 2.4.1
 /*
 Entry point.
 */
-var broker, config, dbg, debug, init, log, snowflake, ui, update;
 
-debug = false;
+var debug = false;
 
-snowflake = null;
+var snowflake = null;
 
-config = null;
+var config = null;
 
-broker = null;
+var broker = null;
 
-ui = null;
+var ui = null;
 
 // Log to both console and UI if applicable.
 // Requires that the snowflake and UI objects are hooked up in order to
 // log to console.
-log = function(msg) {
+var log = function(msg) {
   console.log('Snowflake: ' + msg);
   return snowflake != null ? snowflake.ui.log(msg) : void 0;
 };
 
-dbg = function(msg) {
+var dbg = function(msg) {
   if (debug) {
     return log(msg);
   }
@@ -37,7 +35,7 @@ if (!Util.featureDetect()) {
   return;
 }
 
-init = function() {
+var init = function() {
   config = new Config;
   ui = new WebExtUI();
   broker = new Broker(config.brokerUrl);
@@ -46,7 +44,7 @@ init = function() {
   return ui.initToggle();
 };
 
-update = function() {
+var update = function() {
   if (!ui.enabled) {
     // Do not activate the proxy if any number of conditions are true.
     snowflake.disable();

proxy/proxypair.js

@@ -1,4 +1,3 @@
-// Generated by CoffeeScript 2.4.1
 /*
 Represents a single:
 
@@ -7,10 +6,9 @@ Represents a single:
 Every ProxyPair has a Snowflake ID, which is necessary when responding to the
 Broker with an WebRTC answer.
 */
-var ProxyPair;
 
-ProxyPair = (function() {
 class ProxyPair {
+
   /*
   Constructs a ProxyPair where:
   - @relayAddr is the destination relay
@@ -256,7 +254,3 @@ ProxyPair = (function() {
 ProxyPair.prototype.onCleanup = null;
 
 ProxyPair.prototype.id = null;
-
-  return ProxyPair;
-
-}).call(this);

proxy/shims.js

@@ -1,8 +1,6 @@
-// Generated by CoffeeScript 2.4.1
 /*
 WebRTC shims for multiple browsers.
 */
-var IceCandidate, PeerConnection, SessionDescription, WebSocket, XMLHttpRequest, chrome, document, location, webrtc, window;
 
 if (typeof module !== "undefined" && module !== null ? module.exports : void 0) {
   window = {};
@@ -22,7 +20,6 @@ if (typeof module !== "undefined" && module !== null ? module.exports : void 0)
     ({ XMLHttpRequest } = require('xmlhttprequest'));
   }
 } else {
-  window = this;
   document = window.document;
   chrome = window.chrome;
   location = window.location.search.substr(1);

proxy/snowflake.js

@@ -1,4 +1,3 @@
-// Generated by CoffeeScript 2.4.1
 /*
 A Coffeescript WebRTC snowflake proxy
 
@@ -9,11 +8,10 @@ this proxy must always act as the answerer.
 
 TODO: More documentation
 */
-var Snowflake;
 
-Snowflake = (function() {
 // Minimum viable snowflake for now - just 1 client.
 class Snowflake {
+
   // Prepare the Snowflake with a Broker (to find clients) and optional UI.
   constructor(config, ui, broker) {
     // Receive an SDP offer from some client assigned by the Broker,
@@ -176,7 +174,3 @@ Snowflake = (function() {
 Snowflake.MESSAGE = {
   CONFIRMATION: 'You\'re currently serving a Tor user via Snowflake.'
 };
-
-  return Snowflake;
-
-}).call(this);

proxy/spec/broker.spec.js

@@ -1,39 +1,32 @@
-// Generated by CoffeeScript 2.4.1
 /*
 jasmine tests for Snowflake broker
 */
-var XMLHttpRequest;
 
-XMLHttpRequest = (function() {
 // fake xhr
 // class XMLHttpRequest
 class XMLHttpRequest {
   constructor() {
     this.onreadystatechange = null;
   }
-
   open() {}
-
   setRequestHeader() {}
-
   send() {}
-
 };
 
 XMLHttpRequest.prototype.DONE = 1;
 
-  return XMLHttpRequest;
-
-}).call(this);
 
 describe('Broker', function() {
+
   it('can be created', function() {
     var b;
     b = new Broker('fake');
     expect(b.url).toEqual('https://fake/');
-    return expect(b.id).not.toBeNull();
+    expect(b.id).not.toBeNull();
   });
+
   describe('getClientOffer', function() {
+
     it('polls and promises a client offer', function(done) {
       var b, poll;
       b = new Broker('fake');
@@ -55,6 +48,7 @@ describe('Broker', function() {
         return done();
       });
     });
+
     it('rejects if the broker timed-out', function(done) {
       var b, poll;
       b = new Broker('fake');
@@ -75,7 +69,8 @@ describe('Broker', function() {
         return done();
       });
     });
-    return it('rejects on any other status', function(done) {
+
+    it('rejects on any other status', function(done) {
       var b, poll;
       b = new Broker('fake');
       // fake timed-out request from broker
@@ -95,18 +90,20 @@ describe('Broker', function() {
         expect(b._xhr.status).toBe(1337);
         return done();
       });
+
     });
+
   });
+
   it('responds to the broker with answer', function() {
-    var b;
+    var b = new Broker('fake');
-    b = new Broker('fake');
     spyOn(b, '_postRequest');
     b.sendAnswer('fake id', 123);
-    return expect(b._postRequest).toHaveBeenCalledWith('fake id', jasmine.any(Object), 'answer', '123');
+    expect(b._postRequest).toHaveBeenCalledWith('fake id', jasmine.any(Object), 'answer', '123');
   });
-  return it('POST XMLHttpRequests to the broker', function() {
+
-    var b;
+  it('POST XMLHttpRequests to the broker', function() {
-    b = new Broker('fake');
+    var b = new Broker('fake');
     b._xhr = new XMLHttpRequest();
     spyOn(b._xhr, 'open');
     spyOn(b._xhr, 'setRequestHeader');
@@ -114,6 +111,7 @@ describe('Broker', function() {
     b._postRequest(0, b._xhr, 'test', 'data');
     expect(b._xhr.open).toHaveBeenCalled();
     expect(b._xhr.setRequestHeader).toHaveBeenCalled();
-    return expect(b._xhr.send).toHaveBeenCalled();
+    expect(b._xhr.send).toHaveBeenCalled();
   });
+
 });

proxy/spec/init.spec.js

@@ -1,8 +1,6 @@
-// Generated by CoffeeScript 2.4.1
 // Fake snowflake to interact with
-var snowflake;
 
-snowflake = {
+var snowflake = {
   ui: new UI,
   broker: {
     sendAnswer: function() {}
@@ -11,24 +9,25 @@ snowflake = {
 };
 
 describe('Init', function() {
+
   it('gives a dialog when closing, only while active', function() {
-    var msg, silenceNotifications;
     silenceNotifications = false;
     snowflake.state = Snowflake.MODE.WEBRTC_READY;
-    msg = window.onbeforeunload();
+    var msg = window.onbeforeunload();
     expect(snowflake.state).toBe(Snowflake.MODE.WEBRTC_READY);
     expect(msg).toBe(Snowflake.MESSAGE.CONFIRMATION);
     snowflake.state = Snowflake.MODE.INIT;
     msg = window.onbeforeunload();
     expect(snowflake.state).toBe(Snowflake.MODE.INIT);
-    return expect(msg).toBe(null);
+    expect(msg).toBe(null);
   });
-  return it('does not give a dialog when silent flag is on', function() {
+
-    var msg, silenceNotifications;
+  it('does not give a dialog when silent flag is on', function() {
     silenceNotifications = true;
     snowflake.state = Snowflake.MODE.WEBRTC_READY;
-    msg = window.onbeforeunload();
+    var msg = window.onbeforeunload();
     expect(snowflake.state).toBe(Snowflake.MODE.WEBRTC_READY);
-    return expect(msg).toBe(null);
+    expect(msg).toBe(null);
   });
+
 });

proxy/spec/proxypair.spec.js

@@ -1,17 +1,15 @@
-// Generated by CoffeeScript 2.4.1
 /*
 jasmine tests for Snowflake proxypair
 */
-var MessageEvent, arrayMatching;
 
 // Replacement for MessageEvent constructor.
 // https://developer.mozilla.org/en-US/docs/Web/API/MessageEvent/MessageEvent
-MessageEvent = function(type, init) {
+var MessageEvent = function(type, init) {
   return init;
 };
 
 // Asymmetic matcher that checks that two arrays have the same contents.
-arrayMatching = function(sample) {
+var arrayMatching = function(sample) {
   return {
     asymmetricMatch: function(other) {
       var _, a, b, i, j, len;
@@ -35,46 +33,57 @@ arrayMatching = function(sample) {
 };
 
 describe('ProxyPair', function() {
+
   var config, destination, fakeRelay, pp, rateLimit;
   fakeRelay = Parse.address('0.0.0.0:12345');
   rateLimit = new DummyRateLimit;
   config = new Config;
   destination = [];
+
   // Using the mock PeerConnection definition from spec/snowflake.spec.coffee.
-  pp = new ProxyPair(fakeRelay, rateLimit, config.pcConfig);
+  var pp = new ProxyPair(fakeRelay, rateLimit, config.pcConfig);
+
   beforeEach(function() {
     return pp.begin();
   });
+
   it('begins webrtc connection', function() {
     return expect(pp.pc).not.toBeNull();
   });
+
   describe('accepts WebRTC offer from some client', function() {
+
     beforeEach(function() {
       return pp.begin();
     });
+
     it('rejects invalid offers', function() {
       expect(typeof pp.pc.setRemoteDescription).toBe("function");
       expect(pp.pc).not.toBeNull();
       expect(pp.receiveWebRTCOffer({})).toBe(false);
-      return expect(pp.receiveWebRTCOffer({
+      expect(pp.receiveWebRTCOffer({
         type: 'answer'
       })).toBe(false);
     });
-    return it('accepts valid offers', function() {
+
+    it('accepts valid offers', function() {
       expect(pp.pc).not.toBeNull();
-      return expect(pp.receiveWebRTCOffer({
+      expect(pp.receiveWebRTCOffer({
         type: 'offer',
         sdp: 'foo'
       })).toBe(true);
     });
+
   });
+
   it('responds with a WebRTC answer correctly', function() {
     spyOn(snowflake.broker, 'sendAnswer');
     pp.pc.onicecandidate({
       candidate: null
     });
-    return expect(snowflake.broker.sendAnswer).toHaveBeenCalled();
+    expect(snowflake.broker.sendAnswer).toHaveBeenCalled();
   });
+
   it('handles a new data channel correctly', function() {
     expect(pp.client).toBeNull();
     pp.pc.ondatachannel({
@@ -84,21 +93,25 @@ describe('ProxyPair', function() {
     expect(pp.client.onopen).not.toBeNull();
     expect(pp.client.onclose).not.toBeNull();
     expect(pp.client.onerror).not.toBeNull();
-    return expect(pp.client.onmessage).not.toBeNull();
+    expect(pp.client.onmessage).not.toBeNull();
   });
+
   it('connects to the relay once datachannel opens', function() {
     spyOn(pp, 'connectRelay');
     pp.client.onopen();
-    return expect(pp.connectRelay).toHaveBeenCalled();
+    expect(pp.connectRelay).toHaveBeenCalled();
   });
+
   it('connects to a relay', function() {
     pp.connectRelay();
     expect(pp.relay.onopen).not.toBeNull();
     expect(pp.relay.onclose).not.toBeNull();
     expect(pp.relay.onerror).not.toBeNull();
-    return expect(pp.relay.onmessage).not.toBeNull();
+    expect(pp.relay.onmessage).not.toBeNull();
   });
-  return describe('flushes data between client and relay', function() {
+
+  describe('flushes data between client and relay', function() {
+
     it('proxies data from client to relay', function() {
       var msg;
       pp.pc.ondatachannel({
@@ -116,8 +129,9 @@ describe('ProxyPair', function() {
       pp.onClientToRelayMessage(msg);
       pp.flush();
       expect(pp.client.send).not.toHaveBeenCalled();
-      return expect(pp.relay.send).toHaveBeenCalledWith(arrayMatching([1, 2, 3]));
+      expect(pp.relay.send).toHaveBeenCalledWith(arrayMatching([1, 2, 3]));
     });
+
     it('proxies data from relay to client', function() {
       var msg;
       spyOn(pp.client, 'send');
@@ -128,16 +142,19 @@ describe('ProxyPair', function() {
       pp.onRelayToClientMessage(msg);
       pp.flush();
       expect(pp.client.send).toHaveBeenCalledWith(arrayMatching([4, 5, 6]));
-      return expect(pp.relay.send).not.toHaveBeenCalled();
+      expect(pp.relay.send).not.toHaveBeenCalled();
     });
-    return it('sends nothing with nothing to flush', function() {
+
+    it('sends nothing with nothing to flush', function() {
       spyOn(pp.client, 'send');
       spyOn(pp.relay, 'send');
       pp.flush();
       expect(pp.client.send).not.toHaveBeenCalled();
-      return expect(pp.relay.send).not.toHaveBeenCalled();
+      expect(pp.relay.send).not.toHaveBeenCalled();
     });
+
   });
+
 });
 
 // TODO: rate limit tests

proxy/spec/snowflake.spec.js

@@ -1,62 +1,43 @@
-// Generated by CoffeeScript 2.4.1
 /*
 jasmine tests for Snowflake
 */
-var FakeBroker, PeerConnection, SessionDescription, WebSocket, config, log, ui;
 
 // Fake browser functionality:
-PeerConnection = class PeerConnection {
+class PeerConnection {
   setRemoteDescription() {
     return true;
   }
-
   send(data) {}
-
 };
 
-SessionDescription = (function() {
 class SessionDescription {};
-
 SessionDescription.prototype.type = 'offer';
 
-  return SessionDescription;
-
-}).call(this);
-
-WebSocket = (function() {
 class WebSocket {
   constructor() {
     this.bufferedAmount = 0;
   }
-
   send(data) {}
-
 };
-
 WebSocket.prototype.OPEN = 1;
-
 WebSocket.prototype.CLOSED = 0;
 
-  return WebSocket;
+var log = function() {};
 
-}).call(this);
+var config = new Config;
 
-log = function() {};
+var ui = new UI;
 
-config = new Config;
+class FakeBroker {
-
-ui = new UI;
-
-FakeBroker = class FakeBroker {
   getClientOffer() {
     return new Promise(function(F, R) {
       return {};
     });
   }
-
 };
 
 describe('Snowflake', function() {
+
   it('constructs correctly', function() {
     var s;
     s = new Snowflake(config, ui, {
@@ -67,22 +48,25 @@ describe('Snowflake', function() {
       fake: 'broker'
     });
     expect(s.ui).not.toBeNull();
-    return expect(s.retries).toBe(0);
+    expect(s.retries).toBe(0);
   });
+
   it('sets relay address correctly', function() {
     var s;
     s = new Snowflake(config, ui, null);
     s.setRelayAddr('foo');
-    return expect(s.relayAddr).toEqual('foo');
+    expect(s.relayAddr).toEqual('foo');
   });
+
   it('initalizes WebRTC connection', function() {
     var s;
     s = new Snowflake(config, ui, new FakeBroker());
     spyOn(s.broker, 'getClientOffer').and.callThrough();
     s.beginWebRTC();
     expect(s.retries).toBe(1);
-    return expect(s.broker.getClientOffer).toHaveBeenCalled();
+    expect(s.broker.getClientOffer).toHaveBeenCalled();
   });
+
   it('receives SDP offer and sends answer', function() {
     var pair, s;
     s = new Snowflake(config, ui, new FakeBroker());
@@ -92,8 +76,9 @@ describe('Snowflake', function() {
     spyOn(pair, 'receiveWebRTCOffer').and.returnValue(true);
     spyOn(s, 'sendAnswer');
     s.receiveOffer(pair, '{"type":"offer","sdp":"foo"}');
-    return expect(s.sendAnswer).toHaveBeenCalled();
+    expect(s.sendAnswer).toHaveBeenCalled();
   });
+
   it('does not send answer when receiving invalid offer', function() {
     var pair, s;
     s = new Snowflake(config, ui, new FakeBroker());
@@ -103,12 +88,14 @@ describe('Snowflake', function() {
     spyOn(pair, 'receiveWebRTCOffer').and.returnValue(false);
     spyOn(s, 'sendAnswer');
     s.receiveOffer(pair, '{"type":"not a good offer","sdp":"foo"}');
-    return expect(s.sendAnswer).not.toHaveBeenCalled();
+    expect(s.sendAnswer).not.toHaveBeenCalled();
   });
-  return it('can make a proxypair', function() {
+
+  it('can make a proxypair', function() {
     var s;
     s = new Snowflake(config, ui, new FakeBroker());
     s.makeProxyPair();
-    return expect(s.proxyPairs.length).toBe(1);
+    expect(s.proxyPairs.length).toBe(1);
   });
+
 });

proxy/spec/ui.spec.js

@@ -1,10 +1,7 @@
-// Generated by CoffeeScript 2.4.1
 /*
 jasmine tests for Snowflake UI
 */
-var document;
+var document = {
-
-document = {
   getElementById: function(id) {
     return {};
   },
@@ -14,6 +11,7 @@ document = {
 };
 
 describe('UI', function() {
+
   it('activates debug mode when badge does not exist', function() {
     var u;
     spyOn(document, 'getElementById').and.callFake(function(id) {
@@ -25,8 +23,9 @@ describe('UI', function() {
     u = new DebugUI();
     expect(document.getElementById.calls.count()).toEqual(2);
     expect(u.$status).not.toBeNull();
-    return expect(u.$msglog).not.toBeNull();
+    expect(u.$msglog).not.toBeNull();
   });
+
   it('is not debug mode when badge exists', function() {
     var u;
     spyOn(document, 'getElementById').and.callFake(function(id) {
@@ -38,8 +37,9 @@ describe('UI', function() {
     u = new BadgeUI();
     expect(document.getElementById).toHaveBeenCalled();
     expect(document.getElementById.calls.count()).toEqual(1);
-    return expect(u.$badge).not.toBeNull();
+    expect(u.$badge).not.toBeNull();
   });
+
   it('sets status message when in debug mode', function() {
     var u;
     u = new DebugUI();
@@ -50,16 +50,18 @@ describe('UI', function() {
       }
     };
     u.setStatus('test');
-    return expect(u.$status.innerHTML).toEqual('Status: test');
+    expect(u.$status.innerHTML).toEqual('Status: test');
   });
+
   it('sets message log css correctly for debug mode', function() {
     var u;
     u = new DebugUI();
     u.setActive(true);
     expect(u.$msglog.className).toEqual('active');
     u.setActive(false);
-    return expect(u.$msglog.className).toEqual('');
+    expect(u.$msglog.className).toEqual('');
   });
+
   it('sets badge css correctly for non-debug mode', function() {
     var u;
     u = new BadgeUI();
@@ -67,9 +69,10 @@ describe('UI', function() {
     u.setActive(true);
     expect(u.$badge.className).toEqual('active');
     u.setActive(false);
-    return expect(u.$badge.className).toEqual('');
+    expect(u.$badge.className).toEqual('');
   });
-  return it('logs to the textarea correctly when debug mode', function() {
+
+  it('logs to the textarea correctly when debug mode', function() {
     var u;
     u = new DebugUI();
     u.$msglog = {
@@ -79,6 +82,7 @@ describe('UI', function() {
     };
     u.log('test');
     expect(u.$msglog.value).toEqual('test\n');
-    return expect(u.$msglog.scrollTop).toEqual(1337);
+    expect(u.$msglog.scrollTop).toEqual(1337);
   });
+
 });

proxy/spec/util.spec.js

@@ -1,10 +1,12 @@
-// Generated by CoffeeScript 2.4.1
 /*
 jasmine tests for Snowflake utils
 */
+
 describe('Parse', function() {
+
   describe('cookie', function() {
-    return it('parses correctly', function() {
+
+    it('parses correctly', function() {
       expect(Parse.cookie('')).toEqual({});
       expect(Parse.cookie('a=b')).toEqual({
         a: 'b'
@@ -30,12 +32,15 @@ describe('Parse', function() {
       expect(Parse.cookie('key=%26%20')).toEqual({
         key: '& '
       });
-      return expect(Parse.cookie('a=\'\'')).toEqual({
+      expect(Parse.cookie('a=\'\'')).toEqual({
         a: '\'\''
       });
     });
+
   });
+
   describe('address', function() {
+
     it('parses IPv4', function() {
       expect(Parse.address('')).toBeNull();
       expect(Parse.address('3.3.3.3:4444')).toEqual({
@@ -45,9 +50,10 @@ describe('Parse', function() {
       expect(Parse.address('3.3.3.3')).toBeNull();
       expect(Parse.address('3.3.3.3:0x1111')).toBeNull();
       expect(Parse.address('3.3.3.3:-4444')).toBeNull();
-      return expect(Parse.address('3.3.3.3:65536')).toBeNull();
+      expect(Parse.address('3.3.3.3:65536')).toBeNull();
     });
-    return it('parses IPv6', function() {
+
+    it('parses IPv6', function() {
       expect(Parse.address('[1:2::a:f]:4444')).toEqual({
         host: '1:2::a:f',
         port: 4444
@@ -56,15 +62,17 @@ describe('Parse', function() {
       expect(Parse.address('[1:2::a:f]:0x1111')).toBeNull();
       expect(Parse.address('[1:2::a:f]:-4444')).toBeNull();
       expect(Parse.address('[1:2::a:f]:65536')).toBeNull();
-      return expect(Parse.address('[1:2::ffff:1.2.3.4]:4444')).toEqual({
+      expect(Parse.address('[1:2::ffff:1.2.3.4]:4444')).toEqual({
         host: '1:2::ffff:1.2.3.4',
         port: 4444
       });
     });
+
   });
-  return describe('ipFromSDP', function() {
+
-    var testCases;
+  describe('ipFromSDP', function() {
-    testCases = [
+
+    var testCases = [
       {
         // https://tools.ietf.org/html/rfc4566#section-5
         sdp: "v=0\no=jdoe 2890844526 2890842807 IN IP4 10.47.16.5\ns=SDP Seminar\ni=A Seminar on the session description protocol\nu=http://www.example.com/seminars/sdp.pdf\ne=j.doe@example.com (Jane Doe)\nc=IN IP4 224.2.17.12/127\nt=2873397496 2873404696\na=recvonly\nm=audio 49170 RTP/AVP 0\nm=video 51372 RTP/AVP 99\na=rtpmap:99 h263-1998/90000",
@@ -128,7 +136,8 @@ describe('Parse', function() {
         expected: void 0
       }
     ];
-    return it('parses SDP', function() {
+
+    it('parses SDP', function() {
       var i, len, ref, ref1, results, test;
       results = [];
       for (i = 0, len = testCases.length; i < len; i++) {
@@ -143,10 +152,13 @@ describe('Parse', function() {
       }
       return results;
     });
+
   });
+
 });
 
 describe('query string', function() {
+
   it('should parse correctly', function() {
     expect(Query.parse('')).toEqual({});
     expect(Query.parse('a=b')).toEqual({
@@ -178,11 +190,12 @@ describe('query string', function() {
     expect(Query.parse('a+b=c')).toEqual({
       'a b': 'c'
     });
-    return expect(Query.parse('a=b+c+d')).toEqual({
+    expect(Query.parse('a=b+c+d')).toEqual({
       a: 'b c d'
     });
   });
-  return it('uses the first appearance of duplicate key', function() {
+
+  it('uses the first appearance of duplicate key', function() {
     expect(Query.parse('a=b&c=d&a=e')).toEqual({
       a: 'b',
       c: 'd'
@@ -201,21 +214,24 @@ describe('query string', function() {
       a: 'b',
       '': ''
     });
-    return expect(Query.parse('a=b&&c=d')).toEqual({
+    expect(Query.parse('a=b&&c=d')).toEqual({
       a: 'b',
       '': '',
       c: 'd'
     });
   });
+
 });
 
 describe('Params', function() {
+
   describe('bool', function() {
-    var getBool;
+
-    getBool = function(query) {
+    var getBool = function(query) {
       return Params.getBool(Query.parse(query), 'param', false);
     };
-    return it('parses correctly', function() {
+
+    it('parses correctly', function() {
       expect(getBool('param=true')).toBe(true);
       expect(getBool('param')).toBe(true);
       expect(getBool('param=')).toBe(true);
@@ -223,19 +239,23 @@ describe('Params', function() {
       expect(getBool('param=0')).toBe(false);
       expect(getBool('param=false')).toBe(false);
       expect(getBool('param=unexpected')).toBeNull();
-      return expect(getBool('pram=true')).toBe(false);
+      expect(getBool('pram=true')).toBe(false);
     });
+
   });
-  return describe('address', function() {
+
-    var DEFAULT, getAddress;
+  describe('address', function() {
-    DEFAULT = {
+
+    var DEFAULT = {
       host: '1.1.1.1',
       port: 2222
     };
-    getAddress = function(query) {
+
+    var getAddress = function(query) {
       return Params.getAddress(query, 'addr', DEFAULT);
     };
-    return it('parses correctly', function() {
+
+    it('parses correctly', function() {
       expect(getAddress({})).toEqual(DEFAULT);
       expect(getAddress({
         addr: '3.3.3.3:4444'
@@ -246,9 +266,11 @@ describe('Params', function() {
       expect(getAddress({
         x: '3.3.3.3:4444'
       })).toEqual(DEFAULT);
-      return expect(getAddress({
+      expect(getAddress({
         addr: '---'
       })).toBeNull();
     });
+
   });
+
 });

proxy/spec/websocket.spec.js

@@ -1,32 +1,39 @@
-// Generated by CoffeeScript 2.4.1
 /*
 jasmine tests for Snowflake websocket
 */
+
 describe('BuildUrl', function() {
+
   it('should parse just protocol and host', function() {
-    return expect(WS.buildUrl('http', 'example.com')).toBe('http://example.com');
+    expect(WS.buildUrl('http', 'example.com')).toBe('http://example.com');
   });
+
   it('should handle different ports', function() {
     expect(WS.buildUrl('http', 'example.com', 80)).toBe('http://example.com');
     expect(WS.buildUrl('http', 'example.com', 81)).toBe('http://example.com:81');
     expect(WS.buildUrl('http', 'example.com', 443)).toBe('http://example.com:443');
-    return expect(WS.buildUrl('http', 'example.com', 444)).toBe('http://example.com:444');
+    expect(WS.buildUrl('http', 'example.com', 444)).toBe('http://example.com:444');
   });
+
   it('should handle paths', function() {
     expect(WS.buildUrl('http', 'example.com', 80, '/')).toBe('http://example.com/');
     expect(WS.buildUrl('http', 'example.com', 80, '/test?k=%#v')).toBe('http://example.com/test%3Fk%3D%25%23v');
-    return expect(WS.buildUrl('http', 'example.com', 80, '/test')).toBe('http://example.com/test');
+    expect(WS.buildUrl('http', 'example.com', 80, '/test')).toBe('http://example.com/test');
   });
+
   it('should handle params', function() {
     expect(WS.buildUrl('http', 'example.com', 80, '/test', [['k', '%#v']])).toBe('http://example.com/test?k=%25%23v');
-    return expect(WS.buildUrl('http', 'example.com', 80, '/test', [['a', 'b'], ['c', 'd']])).toBe('http://example.com/test?a=b&c=d');
+    expect(WS.buildUrl('http', 'example.com', 80, '/test', [['a', 'b'], ['c', 'd']])).toBe('http://example.com/test?a=b&c=d');
   });
+
   it('should handle ips', function() {
     expect(WS.buildUrl('http', '1.2.3.4')).toBe('http://1.2.3.4');
-    return expect(WS.buildUrl('http', '1:2::3:4')).toBe('http://[1:2::3:4]');
+    expect(WS.buildUrl('http', '1:2::3:4')).toBe('http://[1:2::3:4]');
   });
-  return it('should handle bogus', function() {
+
+  it('should handle bogus', function() {
     expect(WS.buildUrl('http', 'bog][us')).toBe('http://bog%5D%5Bus');
-    return expect(WS.buildUrl('http', 'bog:u]s')).toBe('http://bog%3Au%5Ds');
+    expect(WS.buildUrl('http', 'bog:u]s')).toBe('http://bog%3Au%5Ds');
   });
+
 });

proxy/ui.js

@@ -1,12 +1,9 @@
-// Generated by CoffeeScript 2.4.1
 /*
 All of Snowflake's DOM manipulation and inputs.
 */
-var BadgeUI, DebugUI, UI, WebExtUI,
-  boundMethodCheck = function(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new Error('Bound instance method accessed before binding'); } };
 
-UI = (function() {
 class UI {
+
   setStatus(msg) {}
 
   setActive(connected) {
@@ -21,12 +18,9 @@ UI = (function() {
 
 UI.prototype.enabled = true;
 
-  return UI;
 
-}).call(this);
-
-BadgeUI = (function() {
 class BadgeUI extends UI {
+
   constructor() {
     super();
     this.$badge = document.getElementById('badge');
@@ -41,12 +35,9 @@ BadgeUI = (function() {
 
 BadgeUI.prototype.$badge = null;
 
-  return BadgeUI;
 
-}).call(this);
-
-DebugUI = (function() {
 class DebugUI extends UI {
+
   constructor() {
     super();
     // Setup other DOM handlers if it's debug mode.
@@ -83,12 +74,9 @@ DebugUI = (function() {
 
 DebugUI.prototype.$status = null;
 
-  return DebugUI;
 
-}).call(this);
-
-WebExtUI = (function() {
 class WebExtUI extends UI {
+
   constructor() {
     super();
     this.onConnect = this.onConnect.bind(this);
@@ -131,7 +119,6 @@ WebExtUI = (function() {
   }
 
   onConnect(port) {
-      boundMethodCheck(this, WebExtUI);
     this.port = port;
     port.onDisconnect.addListener(this.onDisconnect);
     port.onMessage.addListener(this.onMessage);
@@ -140,7 +127,6 @@ WebExtUI = (function() {
 
   onMessage(m) {
     var storing;
-      boundMethodCheck(this, WebExtUI);
     this.enabled = m.enabled;
     this.setEnabled(this.enabled);
     this.postActive();
@@ -152,7 +138,6 @@ WebExtUI = (function() {
   }
 
   onDisconnect(port) {
-      boundMethodCheck(this, WebExtUI);
     return this.port = null;
   }
 
@@ -191,7 +176,3 @@ WebExtUI = (function() {
 WebExtUI.prototype.port = null;
 
 WebExtUI.prototype.stats = null;
-
-  return WebExtUI;
-
-}).call(this);

proxy/util.js

@@ -1,13 +1,11 @@
-// Generated by CoffeeScript 2.4.1
 /*
 A Coffeescript WebRTC snowflake proxy
 
 Contains helpers for parsing query strings and other utilities.
 */
-var BucketRateLimit, DummyRateLimit, Params, Parse, Query, Util;
 
-Util = (function() {
 class Util {
+
   static mightBeTBB() {
     return Util.TBB_UAS.indexOf(window.navigator.userAgent) > -1 && (window.navigator.mimeTypes && window.navigator.mimeTypes.length === 0);
   }
@@ -41,13 +39,16 @@ Util = (function() {
 // It would not be effective for Tor Browser users to run the proxy.
 // Do we seem to be running in Tor Browser? Check the user-agent string and for
 // no listing of supported MIME types.
-  Util.TBB_UAS = ['Mozilla/5.0 (Windows NT 6.1; rv:10.0) Gecko/20100101 Firefox/10.0', 'Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0', 'Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0', 'Mozilla/5.0 (Windows NT 6.1; rv:31.0) Gecko/20100101 Firefox/31.0'];
+Util.TBB_UAS = [
+  'Mozilla/5.0 (Windows NT 6.1; rv:10.0) Gecko/20100101 Firefox/10.0',
+  'Mozilla/5.0 (Windows NT 6.1; rv:17.0) Gecko/20100101 Firefox/17.0',
+  'Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0',
+  'Mozilla/5.0 (Windows NT 6.1; rv:31.0) Gecko/20100101 Firefox/31.0'
+];
 
-  return Util;
 
-}).call(this);
+class Query {
 
-Query = class Query {
   /*
   Parse a URL query string or application/x-www-form-urlencoded body. The
   return type is an object mapping string keys to string values. By design,
@@ -100,7 +101,9 @@ Query = class Query {
 
 };
 
-Parse = class Parse {
+
+class Parse {
+
   // Parse a cookie data string (usually document.cookie). The return type is an
   // object mapping cookies names to values. Returns null on error.
   // http://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-8747038
@@ -202,7 +205,9 @@ Parse = class Parse {
 
 };
 
-Params = class Params {
+
+class Params {
+
   static getBool(query, param, defaultValue) {
     var val;
     val = query[param];
@@ -254,8 +259,9 @@ Params = class Params {
 
 };
 
-BucketRateLimit = (function() {
+
 class BucketRateLimit {
+
   constructor(capacity, time) {
     this.capacity = capacity;
     this.time = time;
@@ -295,12 +301,10 @@ BucketRateLimit = (function() {
 
 BucketRateLimit.prototype.lastUpdate = new Date();
 
-  return BucketRateLimit;
-
-}).call(this);
 
 // A rate limiter that never limits.
-DummyRateLimit = class DummyRateLimit {
+class DummyRateLimit {
+
   constructor(capacity, time) {
     this.capacity = capacity;
     this.time = time;

proxy/websocket.js

@@ -1,11 +1,9 @@
-// Generated by CoffeeScript 2.4.1
 /*
 Only websocket-specific stuff.
 */
-var WS;
 
-WS = (function() {
 class WS {
+
   // Build an escaped URL string from unescaped components. Only scheme and host
   // are required. See RFC 3986, section 3.
   static buildUrl(scheme, host, port, path, params) {
@@ -64,7 +62,3 @@ WS = (function() {
   http: 80,
   https: 443
 };
-
-  return WS;
-
-}).call(this);