@chainlesschain/personal-data-hub 0.4.3 → 0.4.5

package/lib/adapters/social-toutiao-adb/collector.js

@@ -72,26 +72,57 @@ async function collect(bridge, opts = {}) {
 
   try {
     // fetchProfile — passport endpoint, no _signature required.
-    const profile = await client.fetchProfile(cookie);
-    if (!profile) {
-      // Cookie expired or sessionid missing — emit empty snapshot using
-      // best-effort cookie-derived uid (or sentinel if also absent).
-      const uid = cookieUid || "unknown-user";
+    let profile = await client.fetchProfile(cookie);
+    const profileFailed = !profile;
+    // Capture the profile error BEFORE the signed fetches overwrite lastError —
+    // when profile is permission-denied (real-device 2026-06-11: passport
+    // error_code 16 该应用无权限) it's the headline diagnostic, more useful than
+    // a downstream -99 short-circuit.
+    const profileErrCode = profileFailed ? client.lastErrorCode : null;
+    const profileErrMsg = profileFailed ? client.lastErrorMessage : null;
+
+    // Local account_db fallback: the web profile endpoint is often
+    // permission-denied (error_code 16) AND the WebView cookie jar carries no
+    // numeric uid — but the app's local account_db has uid+nickname in
+    // plaintext. Recover it so the signed collection/search endpoints (which
+    // need a uid) can still run. Best-effort: the bridge may not expose
+    // "toutiao.account" (older wiring) — that's fine, we fall through.
+    let profileSource = profile ? "web" : null;
+    if (profileFailed && bridge && typeof bridge.invoke === "function") {
+      try {
+        const acct = await bridge.invoke("toutiao.account");
+        if (acct && acct.uid && /^\d+$/.test(String(acct.uid))) {
+          profile = { uid: String(acct.uid), nickname: acct.nickname || null };
+          profileSource = "local-account-db";
+        }
+      } catch (_e) {
+        // account extension unavailable / logged out — keep web error.
+      }
+    }
+
+    // The signed feed endpoint is cookie-identified and collection/search can
+    // use a cookie-derived uid, so a profile failure should NOT abort the whole
+    // sync when we still have a usable uid — only bail when there is no uid at
+    // all. (Previously any profile failure returned an empty snapshot, so the
+    // SignBridge feed/collection/search were never even attempted.)
+    const effectiveUid = (profile && profile.uid) || cookieUid || null;
+    if (!effectiveUid) {
       const snapshot = buildSnapshot({
-        uid,
+        uid: "unknown-user",
         displayName: opts.displayName,
         snapshottedAt: now(),
       });
       const snapshotPath = writeSnapshotJson(snapshot, { dir: opts.stagingDir });
       return {
         snapshotPath,
-        uid: cookieUid,
+        uid: null,
         nickname: null,
         eventCounts: { profile: 0, feed: 0, collection: 0, search: 0, total: 0 },
-        lastErrorCode: client.lastErrorCode,
-        lastErrorMessage: client.lastErrorMessage,
+        lastErrorCode: profileErrCode,
+        lastErrorMessage: profileErrMsg,
         cookieDiagnostic: cookieDiagnostic || null,
         profileFetchFailed: true,
+        profileSource,
         signProviderUsed: signProvider
           ? signProvider.constructor.name
           : "none",
@@ -100,7 +131,9 @@ async function collect(bridge, opts = {}) {
       };
     }
 
-    // Parallel 3 signed endpoints — partial failure tolerated.
+    // Parallel 3 signed endpoints — partial failure tolerated. Attempted even
+    // when profile failed (as long as we have a uid), so feed can still flow
+    // through a SignBridge despite a permission-denied profile endpoint.
     const [feed, collection, search] = await Promise.all([
       client.fetchFeed(cookie, {
         limit: Number.isInteger(limits.feed) ? limits.feed : undefined,
@@ -116,9 +149,9 @@ async function collect(bridge, opts = {}) {
     ]);
 
     const snapshot = buildSnapshot({
-      uid: profile.uid,
-      displayName: opts.displayName || profile.nickname,
-      profile,
+      uid: effectiveUid,
+      displayName: opts.displayName || (profile && profile.nickname),
+      profile: profile || undefined,
       feed,
       collection,
       search,
@@ -128,19 +161,22 @@ async function collect(bridge, opts = {}) {
 
     return {
       snapshotPath,
-      uid: profile.uid,
-      nickname: profile.nickname,
+      uid: effectiveUid,
+      nickname: profile ? profile.nickname : null,
       eventCounts: {
-        profile: 1,
+        profile: profile ? 1 : 0,
         feed: feed.length,
         collection: collection.length,
         search: search.length,
         total: snapshot.events.length,
       },
-      lastErrorCode: client.lastErrorCode,
-      lastErrorMessage: client.lastErrorMessage,
+      // On profile failure surface the profile error (the headline issue), not
+      // the last signed-endpoint status.
+      lastErrorCode: profileFailed ? profileErrCode : client.lastErrorCode,
+      lastErrorMessage: profileFailed ? profileErrMsg : client.lastErrorMessage,
       cookieDiagnostic: cookieDiagnostic || null,
-      profileFetchFailed: false,
+      profileFetchFailed: profileFailed,
+      profileSource,
       signProviderUsed: signProvider ? signProvider.constructor.name : "none",
       signProviderHits: client._bridgeHits,
       signProviderFallbacks: client._fallbackHits,

package/lib/adapters/social-toutiao-adb/cookies-extension.js

@@ -41,6 +41,7 @@ const {
   readChromiumCookies,
 } = require("../social-bilibili-adb/chromium-cookies-reader");
 
+const TOUTIAO_PACKAGE = "com.ss.android.article.news";
 const TOUTIAO_COOKIES_REMOTE_PATH =
   "/data/data/com.ss.android.article.news/app_webview/Default/Cookies";
 
@@ -72,10 +73,29 @@ async function pullCookiesViaSu(adb, serial, opts) {
   );
   const lsLine = lsOut.replace(/\r+$/gm, "").trim();
   if (lsLine === "NOT_FOUND" || lsLine === "") {
+    // Distinguish "app not installed" from "installed but no webview cookie
+    // store yet" (logged out / never opened an in-app WebView). Both leave the
+    // Cookies file absent, but the user action differs — so probe pm.
+    const pmOut = await adb(
+      ["shell", "su", "-c", `pm list packages ${TOUTIAO_PACKAGE}`],
+      adbOpts,
+    );
+    const installed = pmOut
+      .replace(/\r/g, "")
+      .includes(`package:${TOUTIAO_PACKAGE}`);
+    if (installed) {
+      throw new Error(
+        "TOUTIAO_NO_WEBVIEW_COOKIES: 今日头条 App 已安装但无 WebView cookie 库 (" +
+          TOUTIAO_COOKIES_REMOTE_PATH +
+          " 不存在)。请在 App 内登录，并打开任意文章/网页（触发内置 WebView 写 cookie）后重试。注意：极速版 (.lite) 是另一个包，不支持。",
+      );
+    }
     throw new Error(
       "TOUTIAO_NOT_INSTALLED: " +
         TOUTIAO_COOKIES_REMOTE_PATH +
-        " not found. Install Toutiao App (今日头条 com.ss.android.article.news) + log in once, then retry. Note: 极速版 (.lite) uses a different package — only the standard app is supported.",
+        " not found and package " +
+        TOUTIAO_PACKAGE +
+        " is not installed. Install Toutiao App (今日头条 com.ss.android.article.news) + log in once, then retry. Note: 极速版 (.lite) uses a different package — only the standard app is supported.",
     );
   }
   const idOut = await adb(["shell", "su", "-c", "id -u"], adbOpts);

package/lib/adapters/social-toutiao-adb/index.js

@@ -34,9 +34,15 @@ const {
   SNAPSHOT_SCHEMA_VERSION,
 } = require("./snapshot-builder");
 const { collect, collectAndSync } = require("./collector");
+const {
+  createToutiaoAccountExtension,
+  ACCOUNT_DB_REMOTE_PATH,
+} = require("./account-reader");
 
 module.exports = {
   createToutiaoCookiesExtension,
+  createToutiaoAccountExtension,
+  ACCOUNT_DB_REMOTE_PATH,
   TOUTIAO_COOKIES_REMOTE_PATH,
   TOUTIAO_COOKIE_HOST_DOMAIN,
   TOUTIAO_SESSION_COOKIES,

package/lib/adapters/social-xiaohongshu-adb/cookies-extension.js

@@ -36,6 +36,7 @@ const {
   readChromiumCookies,
 } = require("../social-bilibili-adb/chromium-cookies-reader");
 
+const XHS_PACKAGE = "com.xingin.xhs";
 const XHS_COOKIES_REMOTE_PATH =
   "/data/data/com.xingin.xhs/app_webview/Default/Cookies";
 
@@ -56,10 +57,27 @@ async function pullCookiesViaSu(adb, serial, opts) {
   );
   const lsLine = lsOut.replace(/\r+$/gm, "").trim();
   if (lsLine === "NOT_FOUND" || lsLine === "") {
+    // Distinguish "app not installed" from "installed but no webview cookie
+    // store yet" (logged out / never opened an in-app WebView). Both leave the
+    // Cookies file absent, but the user action differs — so probe pm.
+    const pmOut = await adb(
+      ["shell", "su", "-c", `pm list packages ${XHS_PACKAGE}`],
+      adbOpts,
+    );
+    const installed = pmOut.replace(/\r/g, "").includes(`package:${XHS_PACKAGE}`);
+    if (installed) {
+      throw new Error(
+        "XHS_NO_WEBVIEW_COOKIES: Xiaohongshu App 已安装但无 WebView cookie 库 (" +
+          XHS_COOKIES_REMOTE_PATH +
+          " 不存在)。请在 App 内登录，并打开任意笔记/网页（触发内置 WebView 写 cookie）后重试。",
+      );
+    }
     throw new Error(
       "XHS_NOT_INSTALLED: " +
         XHS_COOKIES_REMOTE_PATH +
-        " not found. Install Xiaohongshu App + log in once on the phone, then retry.",
+        " not found and package " +
+        XHS_PACKAGE +
+        " is not installed. Install Xiaohongshu App + log in once on the phone, then retry.",
     );
   }
   const idOut = await adb(["shell", "su", "-c", "id -u"], adbOpts);

package/lib/adapters/travel-base/index.js

@@ -150,8 +150,15 @@ function normalizeTravelRecord(rec, ctx = {}) {
 
 function buildTitle(rec) {
   const vt = rec.vehicleType || "trip";
-  const from = rec.from ? (rec.from.station || rec.from.city || "?") : "";
-  const to = rec.to ? (rec.to.station || rec.to.city || "?") : "";
+  // station > city > name — name matters for Amap route/search records,
+  // which carry ONLY p.name (no station/city); without it every Amap trip
+  // event was titled "car: ? → ?".
+  const from = rec.from
+    ? (rec.from.station || rec.from.city || rec.from.name || "?")
+    : "";
+  const to = rec.to
+    ? (rec.to.station || rec.to.city || rec.to.name || "?")
+    : "";
   if (from && to) return `${vt}: ${from} → ${to}`;
   if (to) return `${vt}: → ${to}`;
   return `${vt}: ${rec.carrier || rec.recordId}`;

package/lib/index.js

@@ -53,7 +53,7 @@ const { DouyinAdapter } = require("./adapters/social-douyin");
 const { XiaohongshuAdapter } = require("./adapters/social-xiaohongshu");
 const { ToutiaoAdapter } = require("./adapters/social-toutiao");
 const { KuaishouAdapter } = require("./adapters/social-kuaishou");
-// FAMILY-23 v0.1 — 家庭守护 telemetry collectors (cookie-scrape placeholder).
+// FAMILY-23 v0.2 — 家庭守护 telemetry collectors (snapshot + live fetcher 双路).
 const { GenshinAdapter } = require("./adapters/game-genshin");
 const { HonorOfKingsAdapter } = require("./adapters/game-honor-of-kings");
 const { ZuoyebangAdapter } = require("./adapters/edu-zuoyebang");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainlesschain/personal-data-hub",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "Personal Data Hub — UnifiedSchema + validators + KG ingest helpers for the data-back-to-the-individual middleware",
   "type": "commonjs",
   "main": "lib/index.js",