archives/snowflake
2
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake.git synced 2025-10-14 23:11:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix jasmine spec for broker async request

Browse source
This commit is contained in:
Serene Han 2016-02-09 18:13:54 -08:00
parent 548c100160
commit bb9eb721e2
2 changed files with 50 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

35
proxy/broker.coffee
View file

@ -32,23 +32,13 @@ class Broker
# Snowflake registers with the broker using an HTTP POST request, and expects
# a response from the broker containing some client offer.
# TODO: Actually support multiple clients.
getClientOffer: ->
getClientOffer: =>
new Promise (fulfill, reject) =>
xhr = new XMLHttpRequest()
@request = xhr
try
xhr.open 'POST', @url + 'proxy'
xhr.setRequestHeader('X-Session-ID', @id)
catch err
###
An exception happens here when, for example, NoScript allows the domain
on which the proxy badge runs, but not the domain to which it's trying
to make the HTTP request. The exception message is like "Component
returned failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox.
###
log 'Broker: exception while connecting: ' + err.message
return
xhr.onreadystatechange = ->
@fulfill = fulfill
# @request.onreadystatechange = @processOffer
xhr.onreadystatechange = =>
return if xhr.DONE != xhr.readyState
switch xhr.status
when STATUS_OK
@ -59,7 +49,22 @@ class Broker
log 'Broker ERROR: Unexpected ' + xhr.status +
' - ' + xhr.statusText
Status.set ' failure. Please refresh.'
xhr.send @id
@sendRequest()
sendRequest: =>
try
@request.open 'POST', @url + 'proxy'
@request.setRequestHeader('X-Session-ID', @id)
catch err
###
An exception happens here when, for example, NoScript allows the domain
on which the proxy badge runs, but not the domain to which it's trying
to make the HTTP request. The exception message is like "Component
returned failure code: 0x805e0006 [nsIXMLHttpRequest.open]" on Firefox.
###
log 'Broker: exception while connecting: ' + err.message
return
@request.send @id
sendAnswer: (answer) ->
dbg @id + ' - Sending answer back to broker...\n'