@waterplus-ai/waterbuddy 0.1.9 → 0.1.12

package/lib/host/index.js

@@ -1,4 +1,7 @@
 import https from 'node:https'
+import fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
 import { WATERPLUS_PERSONA } from '../shared/persona.js'
 
 const WATERPLUS_ICON = Buffer.from('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII=', 'base64')
@@ -6,8 +9,55 @@ const CLIENT_ID = '2CC7F925-07AE-4AB9-9F17-75B7378D5890'
 const PLATFORM_URL = 'https://web.shuiwujia.com'
 const AI_URL = 'https://ai.shuiwujia.com'
 const sessions = new Map()
+const authFile = path.join(process.env.DSH_HOME || path.join(os.homedir(), '.dsh'), 'waterbuddy-auth.json')
+let persistedAuth
 let currentUser
 
+function readPersistedAuth() {
+  try {
+    const value = JSON.parse(fs.readFileSync(authFile, 'utf8'))
+    if (value?.token && value?.user) {
+      persistedAuth = value
+      currentUser = value.user
+    }
+  } catch {}
+}
+
+function savePersistedAuth(auth) {
+  try {
+    fs.mkdirSync(path.dirname(authFile), { recursive: true })
+    fs.writeFileSync(authFile, JSON.stringify(auth), { mode: 0o600 })
+    try { fs.chmodSync(authFile, 0o600) } catch {}
+  } catch (error) {
+    console.warn('[WaterBuddy] failed to persist login:', error.message)
+  }
+}
+
+function clearPersistedAuth() {
+  persistedAuth = undefined
+  try { fs.rmSync(authFile, { force: true }) } catch {}
+}
+
+function isSupportedAvatarUrl(url) {
+  return (url.protocol === 'http:' || url.protocol === 'https:') && !url.username && !url.password
+}
+
+function normalizeAvatar(value) {
+  if (typeof value !== 'string' || !value) return undefined
+  if (value.startsWith('data:')) return value
+  try {
+    const url = new URL(value, AI_URL)
+    if (!isSupportedAvatarUrl(url)) return undefined
+    return url.href
+  } catch { return undefined }
+}
+
+function normalizeUser(profile) {
+  const user = { ...(profile || {}), provider: '水务之窗' }
+  user.avatar = normalizeAvatar(user.avatar || user.avatarUrl || user.headImg || user.headImgUrl)
+  return user
+}
+
 const MANIFEST = JSON.stringify({ id: '/', name: 'WaterBuddy', short_name: 'WaterBuddy', start_url: '/', scope: '/', display: 'fullscreen', icons: [{ src: '/waterplus-mark.png', sizes: '84x84', type: 'image/png', purpose: 'any' }] })
 
 function json(res, status, body) {
@@ -71,15 +121,17 @@ async function pollLogin(session) {
   const token = validated.body.result
   const profile = await requestJson(`${AI_URL}/swj-waterplusai-api/client/user/info`, { headers: { Authorization: `Bearer ${token}` } })
   session.token = token
-  session.user = { ...(profile.body.result || {}), provider: '水务之窗' }
+  session.user = normalizeUser(profile.body.result)
   currentUser = session.user
+  persistedAuth = { token, user: currentUser }
+  savePersistedAuth(persistedAuth)
   return { status: 'SUCCESS', user: currentUser }
 }
 
 async function proxyMcp(req, res) {
   const headers = {}
   for (const name of ['accept', 'content-type', 'mcp-session-id', 'last-event-id']) if (req.headers[name]) headers[name] = req.headers[name]
-  const token = [...sessions.values()].find(session => session.token)?.token
+  const token = [...sessions.values()].find(session => session.token)?.token || persistedAuth?.token
   if (token) headers.authorization = `Bearer ${token}`
   const chunks = []
   for await (const chunk of req) chunks.push(chunk)
@@ -91,9 +143,20 @@ async function proxyMcp(req, res) {
   res.end()
 }
 
+async function proxyAvatar(req, res) {
+  const value = new URL(req.url, 'http://127.0.0.1').searchParams.get('url')
+  let target
+  try { target = new URL(value) } catch { return json(res, 400, { error: 'invalid-avatar-url' }) }
+  if (!isSupportedAvatarUrl(target)) return json(res, 400, { error: 'avatar-url-not-supported' })
+  res.writeHead(302, { location: target.href, 'cache-control': 'private, max-age=3600' })
+  res.end()
+}
+
 export const inject = ['webServer', 'systemPrompt']
+export { normalizeAvatar }
 
 export function apply(ctx) {
+  readPersistedAuth()
   ctx.effect(() => {
     const routes = [
       { kind: 'exact', path: '/waterplus-mark.png', handler: (_req, res) => { res.writeHead(200, { 'content-type': 'image/png', 'cache-control': 'public, max-age=3600' }); res.end(WATERPLUS_ICON) } },
@@ -101,12 +164,13 @@ export function apply(ctx) {
       { kind: 'exact', path: '/api/waterbuddy/auth/qr', handler: async (req, res) => { if (req.method !== 'POST') return json(res, 405, { error: 'method-not-allowed' }); try { json(res, 200, await createLogin()) } catch (error) { json(res, 502, { error: error.message }) } } },
       { kind: 'exact', path: '/api/waterbuddy/auth/status', handler: async (req, res) => { if (req.method !== 'GET') return json(res, 405, { error: 'method-not-allowed' }); const sessionId = new URL(req.url, 'http://127.0.0.1').searchParams.get('sessionId'); const session = sessionId && sessions.get(sessionId); if (!session) return json(res, 404, { error: 'session-not-found' }); try { json(res, 200, await pollLogin(session)) } catch (error) { json(res, 502, { error: error.message }) } } },
       { kind: 'exact', path: '/api/waterbuddy/user', handler: (_req, res) => json(res, 200, { user: currentUser || null }) },
-      { kind: 'exact', path: '/api/waterbuddy/logout', handler: (_req, res) => { currentUser = undefined; for (const session of sessions.values()) delete session.token; json(res, 200, { ok: true }) } },
+      { kind: 'exact', path: '/api/waterbuddy/avatar', handler: async (req, res) => { try { await proxyAvatar(req, res) } catch (error) { json(res, 502, { error: error.message }) } } },
+      { kind: 'exact', path: '/api/waterbuddy/logout', handler: (_req, res) => { currentUser = undefined; for (const session of sessions.values()) delete session.token; clearPersistedAuth(); json(res, 200, { ok: true }) } },
       { kind: 'prefix', path: '/api/waterbuddy/mcp', handler: async (req, res) => { try { await proxyMcp(req, res) } catch (error) { json(res, 502, { error: error.message }) } } },
     ]
     const disposers = routes.map(route => ctx.webServer.register(route))
     const disposeTitle = ctx.webServer.tapIndex(html => html.replace(/<title>[^<]*<\/title>/i, '<title>WaterBuddy</title>').replace(/<link[^>]+rel=["']icon["'][^>]*>/i, '<link rel="icon" type="image/png" href="/waterplus-mark.png" />'))
     const disposePersona = ctx.systemPrompt.section({ name: 'waterplus:persona', order: 100, text: WATERPLUS_PERSONA })
-    return () => { for (const dispose of disposers) dispose(); disposeTitle(); disposePersona(); sessions.clear(); currentUser = undefined }
+    return () => { for (const dispose of disposers) dispose(); disposeTitle(); disposePersona(); sessions.clear(); currentUser = undefined; persistedAuth = undefined }
   }, 'waterbuddy: identity and auth')
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waterplus-ai/waterbuddy",
-  "version": "0.1.9",
+  "version": "0.1.12",
   "description": "WaterBuddy branding and Web profile bundle for DeepSeek Harness",
   "license": "UNLICENSED",
   "type": "module",