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

Merging in story 00 changes #123

merged 151 commits into from Sep 14, 2015


None yet
4 participants

yaronyg commented Sep 14, 2015

Just bringing story 001 up to date

Review on Reviewable

Tobe and others added some commits Jul 24, 2015

Add in p2p bridge
Tidy up after intergrating async bridge

Split the descriptor out from networking impl.

Ditch a load of unused event code

Refactor Peer networking into manageable chunks

Checkpoint: Solve problem of atomic update of peers

Fix function I missed

Complete the refactor of PeerNetworking

Block scope doesn't work like thats

Deal with server/client being different kinds of peer

Fix up logging, invite timeout to 60 secs

Improved logging, fixed relays

Add protected mutable dict

Fix parms mismatch

Correct protected dict implementation

Add stop method to relays

Attempt to get server to notice client has gone

yaronyg and others added some commits Aug 28, 2015

Updating package.json version to 1.0.21
This primarily covers changes made to the muxer
Previous cordova fix was broken
It would only work for new cordova, not old cordova because we overwrote
the same file twice.
Fixed test to work as advertised
The new version of the first test in thaliscenarios assumes that we should
get a networkChanged event when stopBroadcasting is called but that isn't
how the API is supposed to work. The code also depended on a race condition
where the call to startBroadcasting/stopBroadcasting and all their callbacks
where in a tight loop that would effectively allow them to run serially
even though they really should be in parallel.
Merge remote-tracking branch 'origin' into story_00
# Conflicts:
#	thali/install/install.js
#	thali/install/

@yaronyg yaronyg added the in progress label Sep 14, 2015

yaronyg added a commit that referenced this pull request Sep 14, 2015

@yaronyg yaronyg merged commit e0dbbe6 into story_001 Sep 14, 2015

@yaronyg yaronyg removed the in progress label Sep 14, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment