fostrom 0.0.19 → 0.1.0

package/dl-agent.sh

@@ -4,7 +4,7 @@
 #
 # Usage: ./dl-agent.sh <directory>
 
-VERSION="v0.0.17"
+VERSION="v0.1.0"
 
 # CDN URLs in order of preference
 CDN_PRIMARY="https://cdn.fostrom.dev/fostrom-device-agent/$VERSION"
@@ -135,6 +135,14 @@ install_binary() {
     ln -sf "$FILENAME" "$INSTALL_DIR/fostrom-device-agent"
 }
 
+read_installed_version() {
+    BIN="$1"
+    [ ! -x "$BIN" ] && return 1
+    RAW_VERSION="$("$BIN" version 2>/dev/null || true)"
+    [ -z "$RAW_VERSION" ] && return 1
+    printf "%s\n" "$RAW_VERSION" | tr -d '[:space:]'
+}
+
 main() {
     # Detect OS and architecture
     OS="$(uname -s)"
@@ -165,9 +173,16 @@ main() {
 
     FILENAME="fostrom-device-agent-${OS}-${ARCH}"
 
-    # Check if binary already exists
+    # Check if binary already exists and the version matches.
     if [ -f "$LOCATION/$FILENAME" ]; then
-        exit 0
+        INSTALLED_VERSION="$(read_installed_version "$LOCATION/$FILENAME" || true)"
+        if [ "$INSTALLED_VERSION" = "$VERSION" ]; then
+            # Ensure symlink exists even when reusing.
+            ln -sf "$FILENAME" "$LOCATION/fostrom-device-agent"
+            exit 0
+        fi
+
+        printf "Updating Fostrom Device Agent to %s...\n" "$VERSION"
     fi
 
     printf "Downloading Fostrom Device Agent...\n"
@@ -179,6 +194,10 @@ main() {
         xattr -r -d com.apple.quarantine "$LOCATION/$FILENAME" 2>/dev/null || true
     fi
 
+    INSTALLED_VERSION="$(read_installed_version "$LOCATION/$FILENAME" || true)"
+    [ "$INSTALLED_VERSION" = "$VERSION" ] || die \
+      "Fatal: Installed Version Mismatch (expected $VERSION, got ${INSTALLED_VERSION:-unknown})"
+
     printf "Fostrom Device Agent downloaded successfully\n"
 }
 

package/index.js

@@ -1,4 +1,4 @@
-import { execSync } from "child_process"
+import { execFileSync } from "child_process"
 import { fileURLToPath } from "url"
 import path from "path"
 import http from "node:http"
@@ -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()
   }
@@ -108,18 +109,18 @@ export default class Fostrom {
       env["FOSTROM_RUNTIME_ENV"] = String(this.#runtimeEnv)
     }
 
-    const args = ["start"]
-
     try {
-      const output = execSync(`${agent_path()} ${args.join(" ")}`, { encoding: "utf8", env })
+      const output = execFileSync(agent_path(), ["start"], { encoding: "utf8", env })
       const out = output.trim()
       if (out.startsWith("started:")) return
       if (out.startsWith("already_started:")) return
       return
     } catch (error) {
       const out = (error.stdout || "").toString().trim()
-      if (out) {
-        const [atom, rest] = out.split(":", 2)
+      const err = (error.stderr || "").toString().trim()
+      const text = out || err
+      if (text) {
+        const [atom, rest] = text.split(":", 2)
         throw new FostromError(atom || "failed", (rest || "Failed to start Device Agent").trim())
       }
       throw new FostromError("failed", "Failed to start Device Agent")
@@ -166,7 +167,7 @@ export default class Fostrom {
 
   static stopAgent() {
     try {
-      execSync(`${agent_path()} stop`, { encoding: "utf8" })
+      execFileSync(agent_path(), ["stop"], { encoding: "utf8" })
     } catch (e) {
       console.error("[Fostrom] Failed to stop the Fostrom Device Agent")
     }
@@ -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()
   }
@@ -282,6 +285,7 @@ export default class Fostrom {
     if (this.#stopped) return
     if (this.#sseReq) return
     this.#sseBuffer = ""
+    this.#sseEvent = {}
     const { fleet_id, device_id } = this.#creds
     const options = {
       socketPath: Fostrom.#SOCK,
@@ -298,6 +302,7 @@ 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)
       }
@@ -306,7 +311,14 @@ export default class Fostrom {
     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))
+        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))
@@ -376,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 === '') {
@@ -400,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.19",
+  "version": "0.1.0",
   "description": "Fostrom's Official Device SDK for JS. Fostrom (https://fostrom.io) is an IoT Cloud Platform.",
   "keywords": [
     "fostrom",