@magpie-community/opencode-workbuddy-auth 0.1.3 → 0.1.5

package/index.mjs

@@ -86,10 +86,11 @@ const api = (site) => site.endpoint + "/v2"
 // ---- WorkBuddy's API ------------------------------------------------------
 
 class WBError extends Error {
-  constructor(message, code, status) {
+  constructor(message, code, status, said) {
     super(message)
     this.code = code
     this.status = status
+    this.said = said // as magpie's built-in (wbCall) worded it
   }
 }
 
@@ -112,11 +113,13 @@ async function call(site, method, path, headers = {}, body) {
   try {
     env = JSON.parse(text)
   } catch {}
+  const code = Number.parseInt(env.code, 10) || 0
   if (!res.ok) {
     const why = env.msg || env.message || env.error?.message || text.slice(0, 200) || res.statusText
-    throw new WBError(`${site.name}: ${why} (HTTP ${res.status}${env.code ? ", code " + env.code : ""})`, env.code, res.status)
+    const said = code ? env.msg || `error ${code}` : env.msg || statusText(res.status)
+    throw new WBError(`${site.name}: ${why} (HTTP ${res.status}${env.code ? ", code " + env.code : ""})`, env.code, res.status, said)
   }
-  if (env.code) throw new WBError(`${site.name}: ${env.msg || "error"} (${env.code})`, env.code, res.status)
+  if (env.code) throw new WBError(`${site.name}: ${env.msg || "error"} (${env.code})`, env.code, res.status, env.msg || `error ${code}`)
   return env.data
 }
 
@@ -145,13 +148,14 @@ function stale(a) {
 
 // fresh is the sign-in with an access token that isn't about to end:
 // refreshed (and saved) when it is. A refresh that fails, or a refresh
-// token that has ended, leaves the access token there is.
+// token that has ended, leaves the access token there is. Its failures
+// are worded as the built-in's (wbFresh), "WorkBuddy" on both sites.
 async function fresh(site, client, a) {
   if (!stale(a)) return a
   const refreshable = a.refresh && !(a.refreshExpiresAt && Date.now() >= a.refreshExpiresAt)
   if (!refreshable) {
     if (a.access) return a
-    throw new Error(`this ${site.name} account is signed out; sign in again`)
+    throw new Error("this WorkBuddy account is signed out; sign in again")
   }
   try {
     const got = await call(site, "POST", "/v2/plugin/auth/token/refresh", {
@@ -159,13 +163,14 @@ async function fresh(site, client, a) {
       "X-Auth-Refresh-Source": "plugin",
       "X-Domain": domainOf(site, a),
     }, {})
-    if (!got?.accessToken) throw new Error(`${site.name} gave no refreshed token`)
+    if (!got?.accessToken) throw Object.assign(new Error("WorkBuddy gave no refreshed token"), { bare: true })
     const next = merge(a, got)
     await client?.auth?.set?.({ path: { id: site.id }, body: next })
     return next
   } catch (e) {
     if (a.access) return a
-    throw new Error(`${site.name} token refresh: ${e?.message ?? e}`)
+    if (e?.bare) throw e
+    throw new Error(`WorkBuddy token refresh: ${e?.said ?? e?.message ?? e}`)
   }
 }
 
@@ -194,6 +199,8 @@ function sign(site, a, headers) {
 // withSystem gives a chat that doesn't open with a system message
 // WorkBuddy's default one, as its app does.
 function withSystem(body) {
+  // a body magpie or OpenCode hands over as bytes is read as the text it is
+  if (body instanceof ArrayBuffer || ArrayBuffer.isView(body)) body = new TextDecoder().decode(body)
   if (typeof body !== "string") return body
   try {
     const b = JSON.parse(body)
@@ -344,10 +351,27 @@ async function current(site, client, auth) {
 
 // ---- allowance ----------------------------------------------------------------
 
-// STATUS_TEXT is Go's http.StatusText for the answers WorkBuddy gives.
-const STATUS_TEXT = { 400: "Bad Request", 401: "Unauthorized", 403: "Forbidden", 404: "Not Found", 405: "Method Not Allowed",
-  408: "Request Timeout", 429: "Too Many Requests", 500: "Internal Server Error", 502: "Bad Gateway", 503: "Service Unavailable",
-  504: "Gateway Timeout" }
+// STATUS_TEXT is Go's http.StatusText, which magpie's built-in said a
+// refused meter call with; a status Go has no words for is "HTTP <n>", so
+// the card always has an error.
+const STATUS_TEXT = {
+  100: "Continue", 101: "Switching Protocols", 102: "Processing", 103: "Early Hints",
+  200: "OK", 201: "Created", 202: "Accepted", 203: "Non-Authoritative Information", 204: "No Content", 205: "Reset Content",
+  206: "Partial Content", 207: "Multi-Status", 208: "Already Reported", 226: "IM Used",
+  300: "Multiple Choices", 301: "Moved Permanently", 302: "Found", 303: "See Other", 304: "Not Modified", 305: "Use Proxy",
+  307: "Temporary Redirect", 308: "Permanent Redirect",
+  400: "Bad Request", 401: "Unauthorized", 402: "Payment Required", 403: "Forbidden", 404: "Not Found", 405: "Method Not Allowed",
+  406: "Not Acceptable", 407: "Proxy Authentication Required", 408: "Request Timeout", 409: "Conflict", 410: "Gone",
+  411: "Length Required", 412: "Precondition Failed", 413: "Request Entity Too Large", 414: "Request URI Too Long",
+  415: "Unsupported Media Type", 416: "Requested Range Not Satisfiable", 417: "Expectation Failed", 418: "I'm a teapot",
+  421: "Misdirected Request", 422: "Unprocessable Entity", 423: "Locked", 424: "Failed Dependency", 425: "Too Early",
+  426: "Upgrade Required", 428: "Precondition Required", 429: "Too Many Requests", 431: "Request Header Fields Too Large",
+  451: "Unavailable For Legal Reasons",
+  500: "Internal Server Error", 501: "Not Implemented", 502: "Bad Gateway", 503: "Service Unavailable", 504: "Gateway Timeout",
+  505: "HTTP Version Not Supported", 506: "Variant Also Negotiates", 507: "Insufficient Storage", 508: "Loop Detected",
+  510: "Not Extended", 511: "Network Authentication Required",
+}
+const statusText = (n) => STATUS_TEXT[n] || `HTTP ${n}`
 
 // meter asks the billing API as magpie's built-in did, its errors said
 // the same: WorkBuddy's message, else its code, else the HTTP status.
@@ -368,7 +392,7 @@ async function meter(site, a, path) {
   if (!res.ok) {
     if (code) throw new Error(env.msg || `error ${code}`)
     if (env.msg) throw new Error(env.msg)
-    throw new Error(STATUS_TEXT[res.status] ?? "")
+    throw new Error(statusText(res.status))
   }
   if (code) throw new Error(env.msg || `error ${code}`)
   return env.data ?? null
@@ -551,20 +575,22 @@ function makePlugin(site) {
             let body = init?.body
             if (body === undefined && req) body = await req.clone().text()
             const res = await fetch(req ? req.url : input, { ...init, method: init?.method ?? req?.method, headers, body: withSystem(body) })
-            return res.status >= 400 ? explained(res) : res
+            return res.status >= 400 ? explained(res) : kept(res)
           },
         }
       },
-      // the account's credits, as magpie's built-in showed them
+      // the account's credits, as magpie's built-in showed them; each
+      // read keeps the sign-in (signIn), as the built-in's neither marked
+      // an account lapsed nor cleared it
       async usage(getAuth) {
         const auth = await getAuth()
-        if (auth?.type !== "oauth" || !(auth.access || auth.source)) return { error: "not signed in" }
+        if (auth?.type !== "oauth" || !(auth.access || auth.source)) return { error: "not signed in", signIn: "kept" }
         try {
           const a = await current(site, client, auth)
           // the meter has no /v2 prefix, on either site
-          return usageOf(await meter(site, a, "/billing/meter/get-user-resource-summary"), auth.plan)
+          return { ...usageOf(await meter(site, a, "/billing/meter/get-user-resource-summary"), auth.plan), signIn: "kept" }
         } catch (e) {
-          return { error: e?.message ?? String(e) }
+          return { error: e?.message ?? String(e), signIn: "kept" }
         }
       },
       methods: [
@@ -592,13 +618,24 @@ const REFUSED_HINT =
   "WorkBuddy refuses chats from Codex and Claude Code (their system prompt); use it from Hermes, OpenCode or Pi, or add another provider to this group"
 const REFUSED = /unapproved channel|illegal api invocation/i
 
+// kept is an answer that went through, saying the sign-in is kept: the
+// built-in never cleared a WorkBuddy account's mark, as it never set one.
+function kept(res) {
+  const headers = new Headers(res.headers)
+  headers.set("X-Magpie-Sign-In", "kept")
+  return new Response(res.body, { status: res.status, statusText: res.statusText, headers })
+}
+
 // explained is res with REFUSED_HINT added to that refusal's message.
+// Each refusal says the sign-in is kept: the built-in passed WorkBuddy's
+// 401 on and never marked a WorkBuddy account lapsed.
 async function explained(res) {
   const text = await res.text()
   const again = (b) => {
     const headers = new Headers(res.headers)
     headers.delete("content-length")
     headers.delete("content-encoding")
+    headers.set("X-Magpie-Sign-In", "kept")
     return new Response(b, { status: res.status, statusText: res.statusText, headers })
   }
   if (!REFUSED.test(text)) return again(text)
@@ -610,11 +647,13 @@ async function explained(res) {
   const at = v?.error && typeof v.error === "object" ? v.error : v && typeof v === "object" ? v : null
   if (at && typeof at.message === "string") msg = at.message
   else if (typeof v?.error === "string") msg = v.error
+  else if (typeof v?.msg === "string" && v.msg) msg = v.msg // WorkBuddy's own {"code", "msg"}
   msg = `${msg} — ${REFUSED_HINT}`
   const headers = new Headers(res.headers)
   headers.set("content-type", "application/json")
   headers.delete("content-length")
   headers.delete("content-encoding")
+  headers.set("X-Magpie-Sign-In", "kept")
   return new Response(JSON.stringify({ error: { message: msg, type: "permission_error", code: null } }), { status: res.status, statusText: res.statusText, headers })
 }
 
@@ -622,4 +661,4 @@ export const WorkBuddyAuthPlugin = makePlugin(SITES.workbuddy)
 export const WorkBuddyAIAuthPlugin = makePlugin(SITES["workbuddy-ai"])
 
 // for tests
-export const _internal = { usageOf, desktopHeld, explained, REFUSED_HINT, freeCredits }
+export const _internal = { withSystem, usageOf, desktopHeld, explained, REFUSED_HINT, freeCredits, fresh, SITES }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpie-community/opencode-workbuddy-auth",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "OpenCode provider plugins for WorkBuddy's plans: WorkBuddy (CodeBuddy, copilot.tencent.com) and WorkBuddy AI (www.workbuddy.ai)",
   "type": "module",
   "main": "./index.mjs",