607 Commits

Author SHA1 Message Date
Mark Nadal
34eb293a63 be brave, clean up 2016-12-06 23:48:10 -08:00
Mark Nadal
92103e0767 Merge branch '0.5' of https://github.com/amark/gun into 0.5 2016-11-16 21:22:58 -08:00
Mark Nadal
bfd1107e61 merge again 2016-11-16 21:22:55 -08:00
Mark Nadal
bb2a49c088 Merge pull request #272 from colealbon/0.5
#271 one liner fix to console assign error
2016-11-16 19:52:56 -07:00
Cole Albon
1960d44598 Merge pull request #1 from colealbon/colealbon-patch-1
#271 one liner fix error while assigning console
2016-11-16 19:15:07 -07:00
Cole Albon
86a5abd550 #271 one liner fix error while assigning console 2016-11-16 19:14:31 -07:00
Jesse Gibson
2317a54d45 Merge pull request #270 from PsychoLlama/allow-file-json-opt-out
Reliably check file.js options
2016-11-15 17:24:34 -07:00
Jesse Gibson
f999e5f2ea Fix chain option search
If you're reading this commit history, please avert your eyes. 3
commits to fix this admittedly simple problem is more than my pride can handle.
The `gun.Back()` function was only searching for `opt`, not
`opt.file`. It would stop at the first mention of `opt` even if it
didn't have settings for `file`. Now it won't.
2016-11-15 16:20:18 -07:00
Mark Nadal
7c2c52d235 Merge branch '0.5' of https://github.com/amark/gun into 0.5 2016-11-15 14:40:30 -08:00
Mark Nadal
914cce726b merge again 2016-11-15 14:40:27 -08:00
Mark Nadal
126a668bf3 Update gun.js 2016-11-15 14:39:24 -08:00
Jesse Gibson
e7162aa098 Reliably check file.js options
The FileJS module can be passed options in two ways, and this commit
ensures they're treated in the right way.
Previously, options passed as .put or .get parameters would be favored
over those used on the chain, even if `file` wasn't specified. Now, the
module will only use the method options if `file` is mentioned, falling
back to the chain options.
This was a mistake on my part with the first PR (#268), I failed to notice notice that edge case.
2016-11-15 13:10:00 -07:00
Mark Nadal
6b054146c8 attempted merge with @alancnet 's awesomeness! 2016-11-14 16:53:33 -08:00
Mark Nadal
1966a09ac2 mid conflict merge 2016-11-14 16:44:00 -08:00
Mark Nadal
8bb003e311 getting back from Italy... 2016-11-14 16:34:28 -08:00
Jesse Gibson
a4b64feef0 Merge pull request #269 from PsychoLlama/0.5
Allow greeting messages to be opt-out
2016-11-14 17:01:49 -07:00
Jesse Gibson
ddf272bbb0 Allow greeting messages to be opt-out
If you use gun a bunch, you've probably noticed the messages like "Hello
wonderful person :)" and "WARNING: This file.js module...".
This PR allows you to silence them.
Use `Gun.log.off = true` to bring peace back to your workflow.
> **Note:** great when used with file watchers like nodemon."
2016-11-14 17:00:06 -07:00
Jesse Gibson
406276739a Merge pull request #268 from PsychoLlama/allow-file-json-opt-out
Allow opting out of file.json
2016-11-14 16:39:24 -07:00
Jesse Gibson
3e66aff985 Allow opting out of file.json
If the most recent gun options disable the file module, then it
won't try to read/write from the json. Previously it would. Also, now
you can override the behavior by passing `{ file: false }` as the
options in `gun.put`.
2016-11-14 16:31:45 -07:00
Mark Nadal
14482abf0c Merge pull request #267 from PsychoLlama/s2s-sync
Add server-to-server sync
2016-11-14 15:45:13 -07:00
Jesse Gibson
ba43dcac17 Add server push
Pushes graph updates to connected clients, listening for
acknowledgements.
2016-11-14 13:40:55 -07:00
Mark Nadal
e39eda74f4 Merge pull request #262 from hillct/feature/onboarding
Examples Cleanup & Quick deployments with Heroku, Docker etc.
2016-11-13 10:58:51 -08:00
hillct
d1e5f93239 Added documentation for Now.sh deployment 2016-11-12 19:03:16 -05:00
hillct
d47f47baec Add Deployment documentation for Heroku & Docker 2016-11-12 17:59:15 -05:00
hillct
ded9a468c4 * Sanitized /examples dependency management
* Added Docker deployment support files
2016-11-12 16:43:47 -05:00
Jesse Gibson
e8194887e0 Add basic server get handling
Servers now dispatch requests to clients and listen for responses,
plugging them into gun.
2016-11-11 17:48:56 -07:00
Mark Nadal
24a6c858a2 Merge pull request #254 from alancnet/off-0.5
.off for .on, and .map. (0.5)
2016-11-10 16:39:45 -08:00
Mark Nadal
6e8f1e0028 Merge pull request #255 from alancnet/set-usability-0.5
Enable .set with node, or new soul. (0.5)
2016-11-10 16:30:24 -08:00
Jesse Gibson
4cd2d434d1 Add websocket backoff/retry logic
New library handles websocket reconnection logic and queues messages
that were sent while offline.
2016-11-10 10:11:01 -07:00
Jesse Gibson
e36e78f532 Isolate websocket logic
WebSocket logic has it's own folder now, `wsp`.
2016-11-10 10:09:18 -07:00
Jesse Gibson
adbea08120 Add basic websocket logic
Servers will now try to initiate a connection using websockets if the
`peers` option is set. Currently, it'll either start throwing errors,
or generate a broadcasting storm. Still work to be done...
This marks a milestone of getting the servers to connect to each
other. Now to have those messages make sense. Committing so I
have an easy rollback point.
2016-10-26 14:52:28 -06:00
Alan Colon
281a56292e .off for .on, and .map. (0.5) 2016-10-23 20:02:28 -06:00
Alan Colon
74b0242682 Enable .set with node, or new soul. (0.5) 2016-10-23 16:45:39 -06:00
Mark Nadal
e509912fa2 Merge pull request #248 from PsychoLlama/0.5
Fix /gun.js route
2016-10-18 14:32:56 -06:00
Jesse Gibson
6f8c99ccf1 Fix /gun.js route
The `wsp.server` logic was never making it to the /gun.js route. If the
browser is just sending a GET request for a the js file, it won't set
the upgrade property, and the server logic wouldn't let the request pass
if it didn't have that header.
I've simply moved the check below the file serving logic.
2016-10-18 13:54:59 -06:00
Mark Nadal
0aef927eec Update gun.js 2016-10-18 12:11:02 -07:00
Mark Nadal
23f126f219 Update gun.js 2016-10-18 12:05:14 -07:00
Mark Nadal
de216349be Merge pull request #245 from noderaider/0.5
added yarn.lock to gitignore and fixed npm start
2016-10-17 23:46:32 -06:00
Cole Chamberlain
1c25b51e41 added yarn.lock to gitignore and fixed npm start 2016-10-17 15:11:17 -07:00
Mark Nadal
53e171310d experimental approach works! 2016-10-13 00:48:36 -07:00
Mark Nadal
58753e0f9e Update gun.js 2016-10-12 01:35:20 -07:00
Mark Nadal
9355a36a54 Update gun.js 2016-10-12 01:00:42 -07:00
Mark Nadal
d1c4df7688 Merge pull request #238 from d3x0r/patch-4
Update gun.js
2016-10-10 21:15:00 -06:00
d3x0r
c5c2d190e5 Update gun.js
Fix localStorage to pull and cache options from parent.
2016-10-10 20:11:56 -07:00
Mark Nadal
2a6858388e Merge pull request #233 from d3x0r/patch-3
Update package.json
2016-10-10 12:54:04 -06:00
Mark Nadal
df4d87eb3e Update gun.js 2016-10-10 02:03:25 -07:00
d3x0r
98f5b7ecd1 Update package.json 2016-10-09 13:13:20 -07:00
Mark Nadal
da3e644c70 try to simplify? 2016-10-08 02:33:22 -07:00
Mark Nadal
4facd22aec 75 tests passing even complex plural! 2016-10-07 15:09:29 -07:00
Mark Nadal
80e2fa9e6f tests passign without duplication but need to fix on pause/resume 2016-10-07 14:03:44 -07:00