Skip to content
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 a fork #4

Merged
merged 2 commits into from
Jan 30, 2018
Merged

Merging a fork #4

merged 2 commits into from
Jan 30, 2018

Conversation

garbados
Copy link
Contributor

@garbados garbados commented Jan 30, 2018

This PR merges my fork into your repo. I refactored the code, added testing, dat-dns resolution, and a cache for archives. You can see a demo here: https://dat.bovid.space/garbados.hashbase.io/icons/favicon.ico

I recognize this PR represents considerable changes so I intend it as a WIP branch with the goal of being merged.

@garbados garbados changed the title Merging a divergent fork Merging a fork Jan 30, 2018
@pfrazee
Copy link
Owner

pfrazee commented Jan 30, 2018

Very solid rewrite. 👍 merging.

@pfrazee pfrazee merged commit f5d5d83 into pfrazee:master Jan 30, 2018
sammacbeth pushed a commit to sammacbeth/dat-gateway that referenced this pull request Apr 9, 2018
sammacbeth pushed a commit to sammacbeth/dat-gateway that referenced this pull request Sep 1, 2018
* added websocket peers test

* added axios to tests (supports promises)

* removed setTimeout

* commented out console.log

* removed the new Promise, since axios supports Promises

* added socket.end inside the socket.on

* added Promise and delay to 'feed' test

* added error handler for getWebsocketHandler stream

issue pfrazee#4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants