braid-http 1.0.2 → 1.0.4

package/README.md

@@ -63,62 +63,59 @@ fetch('https://braid.org/chat', {subscribe: true}).then(
 )
 ```
 
-If you want automatic reconnections, add two error handlers like this:
+If you want automatic reconnections, this library add a `{retry: true}` option to `fetch()`.
 
 ```javascript
-function connect() {
-    fetch('https://braid.org/chat', {subscribe: true}).then(
-        res => res.subscribe(
-            (update) => {
-                console.log('We got a new update!', update)
-                // Do something with the update
-            },
-            e => setTimeout(connect, 1000)
-        )
-    ).catch(e => setTimeout(connect, 1000))
-}
-connect()
+fetch('https://braid.org/chat', {subscribe: true, retry: true}).then(
+    res => res.subscribe(
+        (update) => {
+            console.log('We got a new update!', update)
+            // Do something with the update
+        }
+    )
+)
+```
+
+For use in conjunction with `{retry: true}`, it's possible to make the `parents` param equal to a function, which will be called to get the current parents each time the fetch establishes a new connection.
+
+```javascript
+fetch('https://braid.org/chat', {subscribe: true, retry: true, parents: () => {
+        return current_parents
+    }}).then(
+    res => res.subscribe(
+        (update) => {
+            console.log('We got a new update!', update)
+            // Do something with the update
+        }
+    )
+)
 ```
 
 ### Example Subscription with Async/Await
 
 ```javascript
-async function connect () {
-    try {
-        (await fetch('/chat', {subscribe: true})).subscribe(
-            (update) => {
-                // We got a new update!
-            },
-            () => setTimeout(connect, 1000)
-        )
-    } catch (e) {
-        setTimeout(connect, 1000)
-    }
-}
+(await fetch('/chat', {subscribe: true, retry: true})).subscribe(
+    (update) => {
+        // We got a new update!
+    })
 ```
 
 ### Example Subscription with `for await`
 
 ```javascript
-async function connect () {
-    try {
-        var subscription_iterator = fetch('/chat', {subscribe: true}).subscription
-        for await (var update of subscription_iterator) {
-            // Updates might come in the form of patches:
-            if (update.patches)
-                chat = apply_patches(update.patches, chat)
-
-            // Or complete snapshots:
-            else
-                // Beware the server doesn't send these yet.
-                chat = JSON.parse(update.body)
-
-            render_stuff()
-        }
-    } catch (e) {
-        console.log('Reconnecting...')
-        setTimeout(connect, 4000)
-    }
+var subscription_iterator = (await fetch('/chat',
+    {subscribe: true, retry: true})).subscription
+for await (var update of subscription_iterator) {
+    // Updates might come in the form of patches:
+    if (update.patches)
+        chat = apply_patches(update.patches, chat)
+
+    // Or complete snapshots:
+    else
+        // Beware the server doesn't send these yet.
+        chat = JSON.parse(update.body)
+
+    render_stuff()
 }
 ```
 

package/braid-http-client.js

@@ -350,7 +350,11 @@ async function braid_fetch (url, params = {}) {
                         case 504: // Gateway Timeout
                             give_up = false;
                     }
-                    if (give_up) return fail(new Error(`giving up because of http status: ${res.status}${(res.status === 401 || res.status === 403) ? ` (access denied)` : ''}`))
+                    if (give_up) {
+                        let e = new Error(`giving up because of http status: ${res.status}${(res.status === 401 || res.status === 403) ? ` (access denied)` : ''}`)
+                        subscription_error?.(e)
+                        return fail(e)
+                    }
                     if (!res.ok) throw new Error(`status not ok: ${res.status}`)
                 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "braid-http",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "An implementation of Braid-HTTP for Node.js and Browsers",
   "scripts": {
     "test": "node test/server.js"