@lynn123411/dsh-a6api 1.0.1 → 1.2.0

package/lib/index.js

@@ -892,6 +892,66 @@ async function fetchChannelDetails(channelId, userId, sessionCookie, targetModel
   }
   return null;
 }
+async function fetchPriceFluctuation(userId, sessionCookie, accessToken) {
+  const token = (accessToken || sessionCookie || "").trim();
+  const uid = (userId || "").trim();
+  if (!uid && !token) {
+    return { pendingCount: 0, unseenCount: 0, totalCount: 0, authError: false };
+  }
+  const headers = buildWebHeaders(uid || void 0, token || void 0);
+  const url = "https://a6api.com/api/marketplace/price-notices";
+  try {
+    const res = await fetch(url, { headers, signal: AbortSignal.timeout(8e3) });
+    if (res.status === 401 || res.status === 403) {
+      console.warn("[dsh-a6api] fetchPriceFluctuation auth failed", res.status);
+      return { pendingCount: 0, unseenCount: 0, totalCount: 0, authError: true };
+    }
+    if (!res.ok) {
+      console.warn("[dsh-a6api] fetchPriceFluctuation HTTP", res.status);
+      return { pendingCount: 0, unseenCount: 0, totalCount: 0 };
+    }
+    const json = await res.json().catch(() => null);
+    if (!json) return { pendingCount: 0, unseenCount: 0, totalCount: 0 };
+    if (json.success === false) return { pendingCount: 0, unseenCount: 0, totalCount: 0 };
+    let arr = [];
+    if (Array.isArray(json)) arr = json;
+    else if (Array.isArray(json.data)) arr = json.data;
+    else if (Array.isArray(json.data?.notices)) arr = json.data.notices;
+    else if (Array.isArray(json.data?.items)) arr = json.data.items;
+    else if (Array.isArray(json.notices)) arr = json.notices;
+    else if (Array.isArray(json.items)) arr = json.items;
+    const pickWithPresent = (keys) => {
+      for (const k of keys) {
+        const v = json?.data?.[k] ?? json?.[k];
+        if (v !== void 0 && v !== null) {
+          const n = Number(v);
+          if (!Number.isNaN(n)) return { value: n, present: true };
+        }
+      }
+      return { value: 0, present: false };
+    };
+    const pendingPick = pickWithPresent(["pendingCount", "pending_count", "pending", "openCount"]);
+    const unseenPick = pickWithPresent(["unseenCount", "unseen_count", "unseen", "has_unseen_count"]);
+    let pending = pendingPick.value;
+    let unseen = unseenPick.value;
+    const total = arr.length;
+    if (!pendingPick.present && arr.length > 0) {
+      const counted = arr.filter((n) => {
+        const s = String(n.state || n.status || "").toLowerCase();
+        return s === "open" || s === "pending" || n.pending === true;
+      }).length;
+      const hasState = arr.some((n) => n.state !== void 0 || n.status !== void 0);
+      if (hasState) pending = counted;
+    }
+    if (!unseenPick.present && arr.length > 0) {
+      unseen = arr.filter((n) => n.has_unseen === true || n.hasUnseen === true || n.unseen === true || n.is_unread === true).length;
+    }
+    return { pendingCount: pending, unseenCount: unseen, totalCount: total, notices: arr };
+  } catch (err) {
+    console.warn("[dsh-a6api] fetchPriceFluctuation error", err);
+    return { pendingCount: 0, unseenCount: 0, totalCount: 0 };
+  }
+}
 
 // src/server/probe.ts
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -972,13 +1032,14 @@ async function probeSingleModel(baseURL, apiKey, userId, accessToken, modelName)
     error: requestOk ? void 0 : requestError
   };
 }
-async function getKnownMerchantsFromLogs(userId, accessToken, modelNames = []) {
+async function getKnownMerchantsFromLogs(userId, accessToken, modelNames = [], logs) {
   if (!userId && !accessToken || modelNames.length === 0) return {};
   const result = {};
   try {
-    const logs = await fetchRecentLogs(userId, accessToken, 50);
+    const items = logs !== void 0 ? logs : await fetchRecentLogs(userId, accessToken, 50);
+    const sorted = items.slice().sort((a, b) => (Number(b.created_at) || 0) - (Number(a.created_at) || 0));
     const modelToLog = /* @__PURE__ */ new Map();
-    for (const log of logs) {
+    for (const log of sorted) {
       const mName = log.model_name;
       const chId = Number(log.channel);
       if (mName && chId && !modelToLog.has(mName.toLowerCase())) {
@@ -1377,23 +1438,43 @@ function apply(ctx) {
                   ])
                 ];
               }
+              const allLogs = await fetchRecentLogs(config.userId, token, 100);
+              allLogs.sort((a, b) => (Number(b.created_at) || 0) - (Number(a.created_at) || 0));
               if (config.userId || token) {
                 const missing = modelIds.filter((m) => {
                   const entry = merchantCardCache.get(m.toLowerCase());
                   return !entry || Date.now() - entry.at >= MERCHANT_CARD_TTL_MS;
                 });
                 if (missing.length > 0) {
-                  const found = await getKnownMerchantsFromLogs(config.userId, token, missing);
+                  let found = {};
+                  try {
+                    found = await Promise.race([
+                      getKnownMerchantsFromLogs(config.userId, token, missing, allLogs),
+                      new Promise((resolve) => setTimeout(() => resolve({}), 1e4))
+                    ]);
+                  } catch {
+                    found = {};
+                  }
                   for (const [mName, card] of Object.entries(found)) {
                     merchantCardCache.set(mName.toLowerCase(), { card, at: Date.now() });
                   }
                 }
               }
+              const lastRoutedMap = /* @__PURE__ */ new Map();
+              for (const log of allLogs) {
+                const mName = log.model_name;
+                const chId = Number(log.channel);
+                const ts = Number(log.created_at) || 0;
+                if (mName && chId > 0 && ts > 0 && !lastRoutedMap.has(mName.toLowerCase())) {
+                  lastRoutedMap.set(mName.toLowerCase(), ts);
+                }
+              }
               const dshSet = new Set(dshConfiguredModels);
               const models = modelIds.map((mId) => {
                 const meta = resolveModelMeta(mId);
                 const cacheEntry = merchantCardCache.get(mId.toLowerCase());
                 const cachedCard = cacheEntry && Date.now() - cacheEntry.at < MERCHANT_CARD_TTL_MS ? cacheEntry.card : void 0;
+                const routedAt = lastRoutedMap.get(mId.toLowerCase());
                 return {
                   model_name: mId,
                   brand: meta.brand,
@@ -1403,10 +1484,12 @@ function apply(ctx) {
                   hasReasoning: Boolean(meta.reasoningEfforts || meta.thinkingFormat),
                   inDsh: dshSet.has(mId),
                   merchant: cachedCard,
-                  probeStatus: cachedCard ? "success" : "idle"
+                  probeStatus: cachedCard ? "success" : "idle",
+                  lastRoutedAt: routedAt,
+                  lastRoutedText: routedAt ? formatRelativeTime(routedAt) : void 0
                 };
               });
-              const recentLogs = await fetchRecentLogs(config.userId, token, 20);
+              const recentLogs = allLogs.slice(0, 20);
               const response = {
                 config: maskConfig(config),
                 balance,
@@ -1494,6 +1577,17 @@ function apply(ctx) {
               const dshConfiguredModels = await getDshConfiguredModels();
               return sendJson(res, 200, { ok: true, dshConfiguredModels });
             }
+            if (pathname === "/price-fluctuation" && (req.method === "GET" || req.method === "HEAD")) {
+              const config = await readPluginConfig();
+              const token = config.accessToken || config.sessionCookie || "";
+              if (!token || !config.userId) {
+                return sendJson(res, 200, { ok: true, data: { pendingCount: 0, unseenCount: 0, totalCount: 0, hasAuth: false, authError: false, updatedAt: Date.now() } });
+              }
+              const result = await fetchPriceFluctuation(config.userId, token, token);
+              const { notices, ...counts } = result;
+              const hasAuth = !counts.authError;
+              return sendJson(res, 200, { ok: true, data: { pendingCount: counts.pendingCount, unseenCount: counts.unseenCount, totalCount: counts.totalCount, hasAuth, authError: Boolean(counts.authError), updatedAt: Date.now() } });
+            }
             return sendJson(res, 404, { ok: false, error: "Not found" });
           } catch (err) {
             console.error("[dsh-a6api] API error:", err);