fostrom 0.0.18 → 0.0.20

package/dl-agent.sh

@@ -4,7 +4,7 @@
 #
 # Usage: ./dl-agent.sh <directory>
 
-VERSION="v0.0.16"
+VERSION="v0.0.18"
 
 # CDN URLs in order of preference
 CDN_PRIMARY="https://cdn.fostrom.dev/fostrom-device-agent/$VERSION"

package/index.js

@@ -40,6 +40,7 @@ export default class Fostrom {
   #log = true
   #creds = {}
   #sseBuffer = ""
+  #sseEvent = {}
   #sseReq = null
   #reconnectTimer = null
   #stopped = true
@@ -52,7 +53,7 @@ export default class Fostrom {
   onMail = async mail => {
     if (this.#log) {
       console.warn(`[Fostrom] Received Mail (Mailbox Size: ${mail.mailbox_size}): ${mail.name} -> ID ${mail.id}`)
-      console.warn("              Auto-Acknowledging Mail. Define Mail Handler to handle incoming mail.\n              `fostrom.on_mail = async (mail) => { ...; await mail.ack(); }`\n")
+      console.warn("              Auto-Acknowledging Mail. Define Mail Handler to handle incoming mail.\n              `fostrom.onMail = async (mail) => { ...; await mail.ack(); }`\n")
     }
     await mail.ack()
   }
@@ -192,6 +193,8 @@ export default class Fostrom {
       }
     } catch { }
     this.#sseReq = null
+    this.#sseBuffer = ""
+    this.#sseEvent = {}
     const doStop = (stopAgent === null) ? this.#stopAgentOnExit : Boolean(stopAgent)
     if (doStop) Fostrom.stopAgent()
   }
@@ -281,6 +284,8 @@ export default class Fostrom {
   async #open_event_stream() {
     if (this.#stopped) return
     if (this.#sseReq) return
+    this.#sseBuffer = ""
+    this.#sseEvent = {}
     const { fleet_id, device_id } = this.#creds
     const options = {
       socketPath: Fostrom.#SOCK,
@@ -294,38 +299,34 @@ export default class Fostrom {
       }
     }
 
+    const scheduleReconnect = (delay) => {
+      this.#sseReq = null
+      this.#sseBuffer = ""
+      this.#sseEvent = {}
+      if (!this.#stopped) {
+        this.#reconnectTimer = setTimeout(() => this.#open_event_stream(), delay)
+      }
+    }
+
     const req = http.request(options, (res) => {
       res.setEncoding('utf8')
       res.on('data', (chunk) => {
-        this.#sseBuffer = Fostrom.#parse_events(this.#sseBuffer, chunk, this.#event_handler.bind(this))
-      })
-      res.on('error', () => {
-        this.#sseReq = null
-        if (!this.#stopped) {
-          this.#reconnectTimer = setTimeout(() => this.#open_event_stream(), 500)
-        }
-      })
-      res.on('aborted', () => {
-        this.#sseReq = null
-        if (!this.#stopped) {
-          this.#reconnectTimer = setTimeout(() => this.#open_event_stream(), 500)
-        }
-      })
-      res.on('end', () => {
-        this.#sseReq = null
-        if (!this.#stopped) {
-          this.#reconnectTimer = setTimeout(() => this.#open_event_stream(), 250)
-        }
+        const parsed = Fostrom.#parse_events(
+          this.#sseBuffer,
+          chunk,
+          this.#sseEvent,
+          this.#event_handler.bind(this)
+        )
+        this.#sseBuffer = parsed.buffer
+        this.#sseEvent = parsed.event
       })
+      res.on('error', () => scheduleReconnect(500))
+      res.on('aborted', () => scheduleReconnect(500))
+      res.on('close', () => scheduleReconnect(500))
+      res.on('end', () => scheduleReconnect(250))
     })
 
-    req.on('error', (_err) => {
-      this.#sseReq = null
-      if (!this.#stopped) {
-        this.#reconnectTimer = setTimeout(() => this.#open_event_stream(), 500)
-      }
-    })
-
+    req.on('error', (_err) => scheduleReconnect(500))
     req.end()
     this.#sseReq = req
   }
@@ -387,12 +388,12 @@ export default class Fostrom {
     })
   }
 
-  static #parse_events(buffer, chunk, event_handler) {
+  static #parse_events(buffer, chunk, currentEvent, event_handler) {
     buffer += chunk
     const lines = buffer.split('\n')
     buffer = lines.pop() || ''
 
-    let event = {}
+    let event = currentEvent || {}
     for (const raw of lines) {
       const line = raw.replace(/\r$/, '')
       if (line === '') {
@@ -411,7 +412,7 @@ export default class Fostrom {
       }
     }
 
-    return buffer
+    return { buffer, event }
   }
 
   async #deliverMail(mail) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fostrom",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "Fostrom's Official Device SDK for JS. Fostrom (https://fostrom.io) is an IoT Cloud Platform.",
   "keywords": [
     "fostrom",