@whaletech/pet 0.2.0 → 0.2.2

package/README.md

@@ -22,7 +22,7 @@ pet
 
 **Server** (self-hosted): Bun + SQLite backend handling state, AI chat, and payments. Deploy separately.
 
-The client connects to `https://pet.whaletech.ai` by default. Override with:
+The client connects to `https://api.pet.whaletech.app` by default, with a fallback to `https://pet-api.whaletech.app`. Override with:
 
 ```
 WHALE_API_URL=http://localhost:3001 pet

package/dist/main.js

@@ -409,35 +409,142 @@ function getCompanionFromStored(userId, stored) {
 }
 
 // src/api.ts
-var API_URL = process.env["WHALE_API_URL"] ?? "https://api.pet.whaletech.app";
+import { spawn } from "node:child_process";
+var PRIMARY_API_URL = "https://api.pet.whaletech.app";
+var FALLBACK_API_URL = "https://pet-api.whaletech.app";
+var API_URLS = [
+  process.env["WHALE_API_URL"],
+  PRIMARY_API_URL,
+  FALLBACK_API_URL
+].filter((url, index, urls) => Boolean(url) && urls.indexOf(url) === index);
+var CURL = process.platform === "win32" ? "curl.exe" : "curl";
 var _token = null;
 function setToken(token) {
   _token = token;
 }
-async function post(path2, body) {
-  try {
-    if (_token)
-      body.token = _token;
-    const res = await fetch(`${API_URL}${path2}`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(body)
+function isRetryableNetworkError(err) {
+  if (!(err instanceof Error))
+    return false;
+  const text = [err.message, err.cause instanceof Error ? err.cause.message : "", String(err.cause?.code ?? "")].join(" ").toUpperCase();
+  return ["FETCH FAILED", "ENOTFOUND", "EAI_AGAIN", "ECONNREFUSED", "ECONNRESET", "ETIMEDOUT"].some((token) => text.includes(token));
+}
+function runCurl(args, input) {
+  return new Promise((resolve, reject) => {
+    const child = spawn(CURL, args, { stdio: ["pipe", "pipe", "pipe"] });
+    let stdout = "";
+    let stderr = "";
+    child.stdout.on("data", (chunk) => {
+      stdout += String(chunk);
     });
-    const data = await res.json();
-    if (!res.ok) {
-      const isQuotaExceeded = data.error === "quota_exceeded";
-      return {
-        ok: false,
-        error: String(data.error ?? `HTTP ${res.status}`),
-        quotaExceeded: isQuotaExceeded,
-        paymentType: isQuotaExceeded ? String(data.paymentType) : undefined
-      };
+    child.stderr.on("data", (chunk) => {
+      stderr += String(chunk);
+    });
+    child.on("error", reject);
+    child.on("close", (code) => {
+      if (code !== 0) {
+        reject(new Error(stderr.trim() || `${CURL} exited with code ${code}`));
+        return;
+      }
+      const marker = `
+__CURL_STATUS__:`;
+      const index = stdout.lastIndexOf(marker);
+      if (index === -1) {
+        reject(new Error("curl response missing status marker"));
+        return;
+      }
+      const body = stdout.slice(0, index);
+      const status = Number(stdout.slice(index + marker.length).trim());
+      resolve({ status, body });
+    });
+    child.stdin.end(input);
+  });
+}
+async function postWithCurl(apiUrl, path2, body) {
+  const requestBody = _token ? { ...body, token: _token } : body;
+  const response = await runCurl(["-sS", "-X", "POST", `${apiUrl}${path2}`, "-H", "Content-Type: application/json", "--data-binary", "@-", "-w", `
+__CURL_STATUS__:%{http_code}`], JSON.stringify(requestBody));
+  const data = JSON.parse(response.body);
+  if (response.status < 200 || response.status >= 300) {
+    const isQuotaExceeded = data.error === "quota_exceeded";
+    return {
+      ok: false,
+      error: String(data.error ?? `HTTP ${response.status}`),
+      quotaExceeded: isQuotaExceeded,
+      paymentType: isQuotaExceeded ? String(data.paymentType) : undefined
+    };
+  }
+  return { ok: true, data };
+}
+async function sendChatStreamWithCurl(apiUrl, body, onToken) {
+  const requestBody = _token ? { ...body, token: _token } : body;
+  const response = await runCurl(["-sS", "-N", "-X", "POST", `${apiUrl}/api/chat`, "-H", "Content-Type: application/json", "--data-binary", "@-", "-w", `
+__CURL_STATUS__:%{http_code}`], JSON.stringify(requestBody));
+  if (response.status < 200 || response.status >= 300) {
+    const data = JSON.parse(response.body);
+    const isQuotaExceeded = data.error === "quota_exceeded";
+    return {
+      ok: false,
+      error: String(data.error ?? `HTTP ${response.status}`),
+      quotaExceeded: isQuotaExceeded,
+      paymentType: isQuotaExceeded ? String(data.paymentType) : undefined
+    };
+  }
+  let finalState = null;
+  let finalQuota = null;
+  for (const line of response.body.split(`
+`)) {
+    const trimmed = line.trim();
+    if (!trimmed || !trimmed.startsWith("data: "))
+      continue;
+    try {
+      const data = JSON.parse(trimmed.slice(6));
+      if (data.token)
+        onToken(data.token);
+      if (data.done && data.state && data.quota) {
+        finalState = data.state;
+        finalQuota = data.quota;
+      }
+    } catch {}
+  }
+  if (finalState && finalQuota) {
+    return { ok: true, state: finalState, quota: finalQuota };
+  }
+  return { ok: false, error: "stream ended without state" };
+}
+async function post(path2, body) {
+  let lastError = "unknown error";
+  for (const apiUrl of API_URLS) {
+    try {
+      const requestBody = _token ? { ...body, token: _token } : body;
+      const res = await fetch(`${apiUrl}${path2}`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(requestBody)
+      });
+      const data = await res.json();
+      if (!res.ok) {
+        const isQuotaExceeded = data.error === "quota_exceeded";
+        return {
+          ok: false,
+          error: String(data.error ?? `HTTP ${res.status}`),
+          quotaExceeded: isQuotaExceeded,
+          paymentType: isQuotaExceeded ? String(data.paymentType) : undefined
+        };
+      }
+      return { ok: true, data };
+    } catch (err) {
+      if (isRetryableNetworkError(err)) {
+        try {
+          return await postWithCurl(apiUrl, path2, body);
+        } catch (curlErr) {
+          lastError = curlErr instanceof Error ? curlErr.message : "unknown error";
+          continue;
+        }
+      }
+      lastError = err instanceof Error ? err.message : "unknown error";
     }
-    return { ok: true, data };
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : "unknown error";
-    return { ok: false, error: msg };
   }
+  return { ok: false, error: lastError };
 }
 function syncState(userId, localState) {
   return post("/api/sync", { userId, localState });
@@ -452,69 +559,88 @@ async function persistState(userId, state, quota) {
   return result;
 }
 async function sendChatStream(userId, companion, state, message, onToken) {
-  try {
-    const body = {
-      userId,
-      name: companion.name,
-      personality: companion.personality,
-      species: companion.species,
-      mood: deriveMood(state),
-      needs: state.needs,
-      message
-    };
-    if (_token)
-      body.token = _token;
-    const res = await fetch(`${API_URL}/api/chat`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(body)
-    });
-    if (!res.ok) {
-      const data = await res.json();
-      const isQuotaExceeded = data.error === "quota_exceeded";
-      return {
-        ok: false,
-        error: String(data.error ?? `HTTP ${res.status}`),
-        quotaExceeded: isQuotaExceeded,
-        paymentType: isQuotaExceeded ? String(data.paymentType) : undefined
+  let lastError = "unknown error";
+  for (const apiUrl of API_URLS) {
+    try {
+      const body = {
+        userId,
+        name: companion.name,
+        personality: companion.personality,
+        species: companion.species,
+        mood: deriveMood(state),
+        needs: state.needs,
+        message
       };
-    }
-    const reader = res.body.getReader();
-    const decoder = new TextDecoder;
-    let buffer = "";
-    let finalState = null;
-    let finalQuota = null;
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done)
-        break;
-      buffer += decoder.decode(value, { stream: true });
-      const lines = buffer.split(`
+      if (_token)
+        body.token = _token;
+      const res = await fetch(`${apiUrl}/api/chat`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(body)
+      });
+      if (!res.ok) {
+        const data = await res.json();
+        const isQuotaExceeded = data.error === "quota_exceeded";
+        return {
+          ok: false,
+          error: String(data.error ?? `HTTP ${res.status}`),
+          quotaExceeded: isQuotaExceeded,
+          paymentType: isQuotaExceeded ? String(data.paymentType) : undefined
+        };
+      }
+      const reader = res.body.getReader();
+      const decoder = new TextDecoder;
+      let buffer = "";
+      let finalState = null;
+      let finalQuota = null;
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done)
+          break;
+        buffer += decoder.decode(value, { stream: true });
+        const lines = buffer.split(`
 `);
-      buffer = lines.pop();
-      for (const line of lines) {
-        const trimmed = line.trim();
-        if (!trimmed || !trimmed.startsWith("data: "))
-          continue;
+        buffer = lines.pop();
+        for (const line of lines) {
+          const trimmed = line.trim();
+          if (!trimmed || !trimmed.startsWith("data: "))
+            continue;
+          try {
+            const data = JSON.parse(trimmed.slice(6));
+            if (data.token)
+              onToken(data.token);
+            if (data.done && data.state && data.quota) {
+              finalState = data.state;
+              finalQuota = data.quota;
+            }
+          } catch {}
+        }
+      }
+      if (finalState && finalQuota) {
+        return { ok: true, state: finalState, quota: finalQuota };
+      }
+      return { ok: false, error: "stream ended without state" };
+    } catch (err) {
+      if (isRetryableNetworkError(err)) {
         try {
-          const data = JSON.parse(trimmed.slice(6));
-          if (data.token)
-            onToken(data.token);
-          if (data.done && data.state && data.quota) {
-            finalState = data.state;
-            finalQuota = data.quota;
-          }
-        } catch {}
+          return await sendChatStreamWithCurl(apiUrl, {
+            userId,
+            name: companion.name,
+            personality: companion.personality,
+            species: companion.species,
+            mood: deriveMood(state),
+            needs: state.needs,
+            message
+          }, onToken);
+        } catch (curlErr) {
+          lastError = curlErr instanceof Error ? curlErr.message : "unknown error";
+          continue;
+        }
       }
+      lastError = err instanceof Error ? err.message : "unknown error";
     }
-    if (finalState && finalQuota) {
-      return { ok: true, state: finalState, quota: finalQuota };
-    }
-    return { ok: false, error: "stream ended without state" };
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : "unknown error";
-    return { ok: false, error: msg };
   }
+  return { ok: false, error: lastError };
 }
 function sendInteraction(userId, type) {
   return post("/api/interaction", { userId, type });
@@ -1797,8 +1923,8 @@ import { jsxDEV as jsxDEV3, Fragment as Fragment3 } from "react/jsx-dev-runtime"
 var POLL_INTERVAL3 = 3000;
 var MAX_POLL_TIME3 = 5 * 60000;
 var LABELS = {
-  conversation: { title: "购买对话次数", desc: "20次对话 ¥0.50", amount: "¥0.50" },
-  interaction: { title: "购买互动次数", desc: "10次互动 ¥0.50", amount: "¥0.50" }
+  conversation: { title: "购买对话次数", count: "20次", desc: "20次对话 ¥0.50", amount: "¥0.50" },
+  interaction: { title: "购买互动次数", count: "10次", desc: "10次互动 ¥0.50", amount: "¥0.50" }
 };
 function QuotaPayment({ userId, paymentType, onComplete, onCancel }) {
   const [phase, setPhase] = useState3("qr");
@@ -1907,7 +2033,9 @@ function QuotaPayment({ userId, paymentType, onComplete, onCancel }) {
           color: "yellow",
           children: [
             labels.title,
-            " — 微信支付 ",
+            "（",
+            labels.count,
+            "） — 微信支付 ",
             labels.amount
           ]
         }, undefined, true, undefined, this),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whaletech/pet",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Terminal pet companion — hatch, feed, and chat with your ASCII whale",
   "type": "module",
   "license": "MIT",