aamp-openclaw-plugin 0.1.14 → 0.1.15

package/bin/aamp-openclaw-plugin.mjs

@@ -175,6 +175,28 @@ function restartGateway() {
   }
 }
 
+async function fetchJson(url, init, stepLabel) {
+  let res
+  try {
+    res = await fetch(url, init)
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error)
+    throw new Error(`${stepLabel} failed for ${url}: ${message}`)
+  }
+
+  if (!res.ok) {
+    const text = await res.text().catch(() => '')
+    throw new Error(`${stepLabel} failed (${res.status}) for ${url}: ${text || res.statusText}`)
+  }
+
+  try {
+    return await res.json()
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error)
+    throw new Error(`${stepLabel} returned invalid JSON for ${url}: ${message}`)
+  }
+}
+
 async function ensureMailboxIdentity({ aampHost, slug, credentialsFile }) {
   const resolvedCreds = expandHome(credentialsFile)
   if (existsSync(resolvedCreds)) {
@@ -182,33 +204,30 @@ async function ensureMailboxIdentity({ aampHost, slug, credentialsFile }) {
   }
 
   const base = normalizeBaseUrl(aampHost)
-  const registerRes = await fetch(`${base}/api/nodes/self-register`, {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({
-      slug,
-      description: 'OpenClaw AAMP agent node',
-    }),
-  })
-
-  if (!registerRes.ok) {
-    const text = await registerRes.text().catch(() => '')
-    throw new Error(`AAMP self-register failed (${registerRes.status}): ${text || registerRes.statusText}`)
-  }
-
-  const registerData = await registerRes.json()
+  const registerUrl = `${base}/api/nodes/self-register`
+  const registerData = await fetchJson(
+    registerUrl,
+    {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        slug,
+        description: 'OpenClaw AAMP agent node',
+      }),
+    },
+    'AAMP self-register',
+  )
   const code = registerData?.registrationCode
   if (!code) {
     throw new Error('AAMP self-register succeeded but no registrationCode was returned')
   }
 
-  const credRes = await fetch(`${base}/api/nodes/credentials?code=${encodeURIComponent(code)}`)
-  if (!credRes.ok) {
-    const text = await credRes.text().catch(() => '')
-    throw new Error(`AAMP credential exchange failed (${credRes.status}): ${text || credRes.statusText}`)
-  }
-
-  const credData = await credRes.json()
+  const credUrl = `${base}/api/nodes/credentials?code=${encodeURIComponent(code)}`
+  const credData = await fetchJson(
+    credUrl,
+    undefined,
+    'AAMP credential exchange',
+  )
   const identity = {
     email: credData?.email,
     jmapToken: credData?.jmap?.token,

package/package.json

@@ -7,7 +7,7 @@
     "skills"
   ],
   "license": "MIT",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "description": "AAMP Agent Mail Protocol — OpenClaw plugin. Gives OpenClaw an AAMP mailbox identity and lets it receive, process and reply to AAMP tasks.",
   "type": "module",
   "main": "dist/index.js",