@rk911/tracker-sdk 1.7.2 → 1.7.3

package/core/tracker.js

@@ -96,6 +96,17 @@ export class Tracker {
         this._referrer = this._currentPage
       }
       this._currentPage = declaredPage
+
+      // 跨端信息携带：当在 Android/iOS 原生容器内运行时，将 H5 页面路由与标题同步给端上
+      if (typeof window !== 'undefined' && window.NativeBridge && window.NativeBridge.postMessage) {
+        try {
+          window.NativeBridge.postMessage('tracker.syncPageState', JSON.stringify({
+            pageRoute: declaredPage,
+            pageTitle: eventData.pageTitle || '',
+            timestamp: Date.now()
+          }), '')
+        } catch (e) {}
+      }
     }
 
     if (!this._currentPage) {
@@ -202,6 +213,14 @@ export class Tracker {
 
   setUser(userId, isNative = false) {
     this.session.setUser(userId, isNative)
+    // 跨端信息携带：当在原生 WebView 登录或切换用户时，将身份变更同步到 Native 端
+    if (!isNative && typeof window !== 'undefined' && window.NativeBridge && window.NativeBridge.postMessage) {
+      try {
+        window.NativeBridge.postMessage('tracker.syncUserIdentity', JSON.stringify({
+          userId: userId
+        }), '')
+      } catch (e) {}
+    }
   }
 
   setDeviceId(deviceId, isNative = false) {

package/native/android/AndroidTracker.java

@@ -43,7 +43,9 @@ import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 行业级 Native Android Tracker SDK
@@ -84,6 +86,39 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
     private String lastClickKey = "";
     private long lastClickTime = 0;
 
+    private static final Map<String, String> NATIVE_TITLE_MAP = new HashMap<>();
+    static {
+        NATIVE_TITLE_MAP.put("com.renrui.main.activity.MainActivity", "APP主页");
+        NATIVE_TITLE_MAP.put("com.renrui.main.fragment.MainTabFragment", "首页Tab");
+        NATIVE_TITLE_MAP.put("com.renrui.main.fragment.MainRecommentFragment", "推荐精选/视频");
+        NATIVE_TITLE_MAP.put("com.renrui.main.fragment.MainWebFragment", "首页Web容器");
+        NATIVE_TITLE_MAP.put("com.renrui.mine.fragment.MineFragment", "个人中心/我的");
+        NATIVE_TITLE_MAP.put("com.renrui.mine.activity.MineWebActivity", "我的Web容器");
+        NATIVE_TITLE_MAP.put("com.renrui.mine.fragment.MineWebFragment", "我的Web页面");
+        NATIVE_TITLE_MAP.put("com.renrui.wz.activity.SplashActivity", "启动闪屏页");
+        NATIVE_TITLE_MAP.put("com.renrui.web.CommonWebActivity", "通用H5容器");
+        NATIVE_TITLE_MAP.put("com.renrui.web.CommonWebFragment", "通用H5页面");
+    }
+
+    public static String getFriendlyPageTitle(String className) {
+        if (TextUtils.isEmpty(className)) return "";
+        if (NATIVE_TITLE_MAP.containsKey(className)) {
+            return NATIVE_TITLE_MAP.get(className);
+        }
+        int lastDot = className.lastIndexOf('.');
+        if (lastDot >= 0 && lastDot < className.length() - 1) {
+            String simple = className.substring(lastDot + 1);
+            if (simple.contains("MainTab")) return "首页/主Tab";
+            if (simple.contains("Recomment")) return "推荐精选";
+            if (simple.contains("Mine")) return "个人中心";
+            if (simple.contains("Splash")) return "启动闪屏页";
+            if (simple.contains("Login")) return "登录页";
+            if (simple.contains("Web")) return "Web视图";
+            return simple;
+        }
+        return className;
+    }
+
     private static class EventRecord {
         final long id;
         final JSONObject json;
@@ -193,6 +228,31 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         return deviceId;
     }
 
+    public void setUserId(String userId) {
+        updateUser(userId, null, null);
+    }
+
+    /**
+     * H5 路由状态同步 (由 CommonWebPresenter 通过 NativeBridge 触发)
+     */
+    public void updateH5PageState(final String h5Route, final String h5Title) {
+        postBgTask(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    if (TextUtils.isEmpty(h5Route)) return;
+                    String referrer = currentPageRoute;
+                    currentPageRoute = h5Route;
+                    referrerPageRoute = referrer;
+                    lastPageStartTime = System.currentTimeMillis();
+                    Log.i(TAG, "===> [H5 Page State Synced to Native] Route: " + currentPageRoute + ", Title: " + h5Title + ", Referrer: " + referrerPageRoute);
+                } catch (Exception e) {
+                    Log.e(TAG, "===> [updateH5PageState Error]", e);
+                }
+            }
+        });
+    }
+
     public void resetSession() {
         this.sessionId = "android_" + System.currentTimeMillis() + "_" + (int) (Math.random() * 10000);
         Log.i(TAG, "===> [Native Tracker Session Reset] New SessionId: " + this.sessionId);
@@ -270,6 +330,80 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         });
     }
 
+    /**
+     * 接口请求与异常自动化上报 (S6 API Tracking - 0 阻塞、异步持久化)
+     */
+    public void trackApi(final String url, final String method, final int statusCode,
+                         final long duration, final String reqParam, final String respData, final String error) {
+        if (TextUtils.isEmpty(url)) return;
+        // 严格防递归：SDK 自身上报地址直接跳过
+        if (url.contains("/api/point/task/trackBatch") || (serverUrl != null && url.contains(serverUrl))) {
+            return;
+        }
+
+        postBgTask(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    String eventType = (statusCode >= 400 || !TextUtils.isEmpty(error)) ? "api_error" : "api_request";
+                    // 聚合优化：提取纯净的 API 路由路径作为 eventName（例如 /app/user/getUserInfo），方便在报表按接口聚合
+                    String apiPath = extractApiPath(url);
+                    JSONObject event = createBaseEvent(eventType, apiPath);
+
+                    JSONObject extra = new JSONObject();
+                    extra.put("url", url);
+                    extra.put("apiPath", apiPath);
+                    extra.put("method", method != null ? method.toUpperCase() : "GET");
+                    extra.put("statusCode", statusCode);
+                    extra.put("duration", duration);
+
+                    // 字段容量防膨胀安全截断：防止过大 JSON 导致 SQLite CursorWindow 溢出或 HTTP 413
+                    if (!TextUtils.isEmpty(reqParam)) {
+                        extra.put("requestParams", reqParam.length() > 2048 ? reqParam.substring(0, 2048) : reqParam);
+                    }
+                    if (!TextUtils.isEmpty(respData)) {
+                        extra.put("responseData", respData.length() > 2048 ? respData.substring(0, 2048) : respData);
+                    }
+                    if (!TextUtils.isEmpty(error)) {
+                        extra.put("error", error.length() > 512 ? error.substring(0, 512) : error);
+                    }
+                    if (!TextUtils.isEmpty(phone)) extra.put("phone", phone);
+                    if (!TextUtils.isEmpty(storeName)) extra.put("storeName", storeName);
+                    if (!TextUtils.isEmpty(userId)) extra.put("userId", userId);
+                    extra.put("platform", "android");
+
+                    event.put("extraData", extra.toString());
+                    enqueueEvent(event);
+
+                    // 接口异常立即上报排查；正常接口由 3s 定时器批量聚合上报
+                    if ("api_error".equals(eventType)) {
+                        flushAsync();
+                    }
+                } catch (Exception e) {
+                    Log.e(TAG, "===> [Native Tracker trackApi Failed]", e);
+                }
+            }
+        });
+    }
+
+    private static String extractApiPath(String url) {
+        if (TextUtils.isEmpty(url)) return "";
+        try {
+            int qIdx = url.indexOf('?');
+            String clean = qIdx >= 0 ? url.substring(0, qIdx) : url;
+            int schemeIdx = clean.indexOf("://");
+            if (schemeIdx >= 0) {
+                int pathIdx = clean.indexOf('/', schemeIdx + 3);
+                if (pathIdx >= 0) {
+                    return clean.substring(pathIdx);
+                }
+            }
+            return clean;
+        } catch (Exception e) {
+            return url;
+        }
+    }
+
     private JSONObject createBaseEvent(String eventType, String eventName) throws Exception {
         sequence++;
         JSONObject event = new JSONObject();
@@ -283,6 +417,9 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
             event.put("referrer", referrerPageRoute);
         }
         event.put("os", "Android");
+        event.put("deviceBrand", android.os.Build.BRAND != null ? android.os.Build.BRAND : "");
+        event.put("deviceModel", android.os.Build.MODEL != null ? android.os.Build.MODEL : "");
+        event.put("osVersion", android.os.Build.VERSION.RELEASE != null ? android.os.Build.VERSION.RELEASE : "");
 
         JSONObject extra = new JSONObject();
         if (!TextUtils.isEmpty(phone)) extra.put("phone", phone);
@@ -340,12 +477,24 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
     }
 
     public void flushSync() {
+        if (bgThread != null && Thread.currentThread() == bgThread) {
+            flushInternal();
+            return;
+        }
+        final java.util.concurrent.CountDownLatch latch = new java.util.concurrent.CountDownLatch(1);
         postBgTask(new Runnable() {
             @Override
             public void run() {
-                flushInternal();
+                try {
+                    flushInternal();
+                } finally {
+                    latch.countDown();
+                }
             }
         });
+        try {
+            latch.await(1500, java.util.concurrent.TimeUnit.MILLISECONDS);
+        } catch (InterruptedException ignored) {}
     }
 
     private void flushInternal() {
@@ -493,13 +642,16 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                                 @Override
                                 public void run() {
                                     try {
+                                        if (fragmentRoute.equals(currentPageRoute) && (System.currentTimeMillis() - lastPageStartTime < 500)) {
+                                            return;
+                                        }
                                         String referrer = currentPageRoute;
                                         currentPageRoute = fragmentRoute;
                                         referrerPageRoute = referrer;
                                         lastPageStartTime = System.currentTimeMillis();
                                         Log.i(TAG, "===> [Native Fragment Resumed] Page: " + currentPageRoute + ", Referrer: " + referrerPageRoute);
                                         JSONObject event = createBaseEvent("page_view", "page_view");
-                                        event.put("pageTitle", currentPageRoute);
+                                        event.put("pageTitle", getFriendlyPageTitle(fragmentRoute));
                                         enqueueEvent(event);
                                         flushAsync();
                                     } catch (Exception e) {
@@ -516,7 +668,9 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
             Window window = activity.getWindow();
             if (window != null) {
                 final Window.Callback origCb = window.getCallback();
-                window.setCallback(new WindowCallbackWrapper(origCb, activity));
+                if (origCb != null && !(origCb instanceof WindowCallbackWrapper)) {
+                    window.setCallback(new WindowCallbackWrapper(origCb, activity));
+                }
             }
         } catch (Exception e) {
             Log.w(TAG, "===> [Native Window Callback Install Failed]", e);
@@ -558,13 +712,45 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
         return root;
     }
 
+    private String extractViewText(View view) {
+        if (view == null) return "";
+        try {
+            // 1. 优先读取 contentDescription
+            CharSequence desc = view.getContentDescription();
+            if (!TextUtils.isEmpty(desc)) {
+                return desc.toString().trim();
+            }
+            // 2. 本身是 TextView / Button
+            if (view instanceof TextView) {
+                CharSequence text = ((TextView) view).getText();
+                if (!TextUtils.isEmpty(text)) {
+                    return text.toString().trim();
+                }
+            }
+            // 3. ViewGroup 穿透提取子 View 文本
+            if (view instanceof ViewGroup) {
+                ViewGroup group = (ViewGroup) view;
+                int count = group.getChildCount();
+                for (int i = 0; i < count; i++) {
+                    View child = group.getChildAt(i);
+                    if (child != null && child.getVisibility() == View.VISIBLE) {
+                        String childText = extractViewText(child);
+                        if (!TextUtils.isEmpty(childText)) {
+                            return childText;
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {}
+        return "";
+    }
+
     private void handleNativeViewClick(final Activity activity, final View target, final float rawX, final float rawY) {
-        final String elementText;
-        if (target instanceof TextView) {
-            elementText = ((TextView) target).getText().toString().trim();
-        } else {
-            elementText = "";
+        String extracted = extractViewText(target);
+        if (TextUtils.isEmpty(extracted) && target.getParent() instanceof View) {
+            extracted = extractViewText((View) target.getParent());
         }
+        final String elementText = extracted;
 
         final String elementId;
         if (target.getId() != View.NO_ID) {
@@ -617,13 +803,18 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
             @Override
             public void run() {
                 try {
+                    final String route = activity.getClass().getName();
+                    if (route.equals(currentPageRoute) && (System.currentTimeMillis() - lastPageStartTime < 500)) {
+                        return;
+                    }
                     String referrer = currentPageRoute;
-                    currentPageRoute = activity.getClass().getName();
+                    currentPageRoute = route;
                     referrerPageRoute = referrer;
                     lastPageStartTime = System.currentTimeMillis();
                     Log.i(TAG, "===> [Native Activity Resumed] Page: " + currentPageRoute + ", Referrer: " + referrerPageRoute);
                     JSONObject event = createBaseEvent("page_view", "page_view");
-                    event.put("pageTitle", activity.getTitle() != null ? activity.getTitle().toString() : currentPageRoute);
+                    String activityTitle = activity.getTitle() != null ? activity.getTitle().toString() : "";
+                    event.put("pageTitle", !TextUtils.isEmpty(activityTitle) ? activityTitle : getFriendlyPageTitle(route));
                     enqueueEvent(event);
                     flushAsync();
                 } catch (Exception e) {
@@ -641,11 +832,13 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                 try {
                     if (lastPageStartTime > 0) {
                         long duration = System.currentTimeMillis() - lastPageStartTime;
-                        JSONObject event = createBaseEvent("page_stay", "page_stay");
-                        event.put("duration", duration);
-                        enqueueEvent(event);
+                        if (duration >= 500) {
+                            JSONObject event = createBaseEvent("page_stay", "page_stay");
+                            event.put("duration", duration);
+                            enqueueEvent(event);
+                            flushAsync();
+                        }
                         lastPageStartTime = 0;
-                        flushAsync();
                     }
                 } catch (Exception e) {
                     Log.e(TAG, "===> [Native Tracker onActivityPaused Error]", e);
@@ -662,14 +855,14 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
     // --- Window.Callback 代理包装器 (带 S3 滑动防误触过滤) ---
     private class WindowCallbackWrapper implements Window.Callback {
         private final Window.Callback mWrapped;
-        private final Activity mActivity;
+        private final java.lang.ref.WeakReference<Activity> mActivityRef;
         private float downX, downY;
         private long downTime;
         private int touchSlop = -1;
 
         public WindowCallbackWrapper(Window.Callback wrapped, Activity activity) {
             this.mWrapped = wrapped;
-            this.mActivity = activity;
+            this.mActivityRef = new java.lang.ref.WeakReference<>(activity);
             if (activity != null) {
                 try {
                     this.touchSlop = ViewConfiguration.get(activity).getScaledTouchSlop();
@@ -693,8 +886,9 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                 int slopThreshold = touchSlop > 0 ? touchSlop : 24;
                 if (distance <= slopThreshold && duration < 1500) {
                     try {
-                        if (mActivity != null && mActivity.getWindow() != null) {
-                            View decorView = mActivity.getWindow().getDecorView();
+                        Activity act = mActivityRef != null ? mActivityRef.get() : null;
+                        if (act != null && act.getWindow() != null) {
+                            View decorView = act.getWindow().getDecorView();
                             View leaf = findTouchedLeafView(decorView, (int) event.getRawX(), (int) event.getRawY());
                             View clickableTarget = null;
                             View curr = leaf;
@@ -707,7 +901,7 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                                 curr = (View) curr.getParent();
                             }
                             if (clickableTarget != null) {
-                                handleNativeViewClick(mActivity, clickableTarget, event.getRawX(), event.getRawY());
+                                handleNativeViewClick(act, clickableTarget, event.getRawX(), event.getRawY());
                             }
                         }
                     } catch (Exception e) {
@@ -715,30 +909,30 @@ public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
                     }
                 }
             }
-            return mWrapped.dispatchTouchEvent(event);
+            return mWrapped != null ? mWrapped.dispatchTouchEvent(event) : false;
         }
 
-        @Override public boolean dispatchKeyEvent(KeyEvent event) { return mWrapped.dispatchKeyEvent(event); }
-        @Override public boolean dispatchKeyShortcutEvent(KeyEvent event) { return mWrapped.dispatchKeyShortcutEvent(event); }
-        @Override public boolean dispatchTrackballEvent(MotionEvent event) { return mWrapped.dispatchTrackballEvent(event); }
-        @Override public boolean dispatchGenericMotionEvent(MotionEvent event) { return mWrapped.dispatchGenericMotionEvent(event); }
-        @Override public boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent event) { return mWrapped.dispatchPopulateAccessibilityEvent(event); }
-        @Nullable @Override public View onCreatePanelView(int featureId) { return mWrapped.onCreatePanelView(featureId); }
-        @Override public boolean onCreatePanelMenu(int featureId, @NonNull Menu menu) { return mWrapped.onCreatePanelMenu(featureId, menu); }
-        @Override public boolean onPreparePanel(int featureId, @Nullable View view, @NonNull Menu menu) { return mWrapped.onPreparePanel(featureId, view, menu); }
-        @Override public boolean onMenuOpened(int featureId, @NonNull Menu menu) { return mWrapped.onMenuOpened(featureId, menu); }
-        @Override public boolean onMenuItemSelected(int featureId, @NonNull MenuItem item) { return mWrapped.onMenuItemSelected(featureId, item); }
-        @Override public void onWindowAttributesChanged(WindowManager.LayoutParams attrs) { mWrapped.onWindowAttributesChanged(attrs); }
-        @Override public void onContentChanged() { mWrapped.onContentChanged(); }
-        @Override public void onWindowFocusChanged(boolean hasFocus) { mWrapped.onWindowFocusChanged(hasFocus); }
-        @Override public void onAttachedToWindow() { mWrapped.onAttachedToWindow(); }
-        @Override public void onDetachedFromWindow() { mWrapped.onDetachedFromWindow(); }
-        @Override public void onPanelClosed(int featureId, @NonNull Menu menu) { mWrapped.onPanelClosed(featureId, menu); }
-        @Override public boolean onSearchRequested() { return mWrapped.onSearchRequested(); }
-        @Override public boolean onSearchRequested(SearchEvent searchEvent) { return mWrapped.onSearchRequested(searchEvent); }
-        @Nullable @Override public ActionMode onWindowStartingActionMode(ActionMode.Callback callback) { return mWrapped.onWindowStartingActionMode(callback); }
-        @Nullable @Override public ActionMode onWindowStartingActionMode(ActionMode.Callback callback, int type) { return mWrapped.onWindowStartingActionMode(callback, type); }
-        @Override public void onActionModeStarted(ActionMode mode) { mWrapped.onActionModeStarted(mode); }
-        @Override public void onActionModeFinished(ActionMode mode) { mWrapped.onActionModeFinished(mode); }
+        @Override public boolean dispatchKeyEvent(KeyEvent event) { return mWrapped != null && mWrapped.dispatchKeyEvent(event); }
+        @Override public boolean dispatchKeyShortcutEvent(KeyEvent event) { return mWrapped != null && mWrapped.dispatchKeyShortcutEvent(event); }
+        @Override public boolean dispatchTrackballEvent(MotionEvent event) { return mWrapped != null && mWrapped.dispatchTrackballEvent(event); }
+        @Override public boolean dispatchGenericMotionEvent(MotionEvent event) { return mWrapped != null && mWrapped.dispatchGenericMotionEvent(event); }
+        @Override public boolean dispatchPopulateAccessibilityEvent(android.view.accessibility.AccessibilityEvent event) { return mWrapped != null && mWrapped.dispatchPopulateAccessibilityEvent(event); }
+        @Nullable @Override public View onCreatePanelView(int featureId) { return mWrapped != null ? mWrapped.onCreatePanelView(featureId) : null; }
+        @Override public boolean onCreatePanelMenu(int featureId, @NonNull Menu menu) { return mWrapped != null && mWrapped.onCreatePanelMenu(featureId, menu); }
+        @Override public boolean onPreparePanel(int featureId, @Nullable View view, @NonNull Menu menu) { return mWrapped != null && mWrapped.onPreparePanel(featureId, view, menu); }
+        @Override public boolean onMenuOpened(int featureId, @NonNull Menu menu) { return mWrapped != null && mWrapped.onMenuOpened(featureId, menu); }
+        @Override public boolean onMenuItemSelected(int featureId, @NonNull MenuItem item) { return mWrapped != null && mWrapped.onMenuItemSelected(featureId, item); }
+        @Override public void onWindowAttributesChanged(WindowManager.LayoutParams attrs) { if (mWrapped != null) mWrapped.onWindowAttributesChanged(attrs); }
+        @Override public void onContentChanged() { if (mWrapped != null) mWrapped.onContentChanged(); }
+        @Override public void onWindowFocusChanged(boolean hasFocus) { if (mWrapped != null) mWrapped.onWindowFocusChanged(hasFocus); }
+        @Override public void onAttachedToWindow() { if (mWrapped != null) mWrapped.onAttachedToWindow(); }
+        @Override public void onDetachedFromWindow() { if (mWrapped != null) mWrapped.onDetachedFromWindow(); }
+        @Override public void onPanelClosed(int featureId, @NonNull Menu menu) { if (mWrapped != null) mWrapped.onPanelClosed(featureId, menu); }
+        @Override public boolean onSearchRequested() { return mWrapped != null && mWrapped.onSearchRequested(); }
+        @Override public boolean onSearchRequested(SearchEvent searchEvent) { return mWrapped != null && mWrapped.onSearchRequested(searchEvent); }
+        @Nullable @Override public ActionMode onWindowStartingActionMode(ActionMode.Callback callback) { return mWrapped != null ? mWrapped.onWindowStartingActionMode(callback) : null; }
+        @Nullable @Override public ActionMode onWindowStartingActionMode(ActionMode.Callback callback, int type) { return mWrapped != null ? mWrapped.onWindowStartingActionMode(callback, type) : null; }
+        @Override public void onActionModeStarted(ActionMode mode) { if (mWrapped != null) mWrapped.onActionModeStarted(mode); }
+        @Override public void onActionModeFinished(ActionMode mode) { if (mWrapped != null) mWrapped.onActionModeFinished(mode); }
     }
 }

package/native/android/TrackerInterceptor.java

@@ -0,0 +1,134 @@
+package com.renrui.tracker;
+
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+import okhttp3.Interceptor;
+import okhttp3.MediaType;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import okio.Buffer;
+
+/**
+ * 行业级 Native OkHttp 埋点无侵入网络拦截器
+ * 1. 0 侵入：仅安全只读提取（peekBody），绝对不消耗或关闭原始 Stream
+ * 2. 0 阻塞：主线程 0ms 开销，数据采集后直接抛给 HandlerThread 异步队列
+ * 3. 严格防递归：过滤 SDK 自身上报 URL，杜绝死循环
+ * 4. 异常原样抛出：记录超时/断网 api_error 后原样 throw e，不破坏原有业务逻辑
+ */
+public class TrackerInterceptor implements Interceptor {
+
+    private static final String TAG = "TrackerInterceptor";
+    private static final int MAX_PARAM_LENGTH = 4096;
+    private static final int MAX_RESP_PREVIEW_LENGTH = 2048;
+
+    @Override
+    public Response intercept(Chain chain) throws IOException {
+        Request request = chain.request();
+        String url = request.url() != null ? request.url().toString() : "";
+
+        // 1. 过滤自身打点接口，防止递归死循环
+        if (isTrackerInternalUrl(url)) {
+            return chain.proceed(request);
+        }
+
+        String reqParam = extractRequestParams(request);
+        long startTime = System.currentTimeMillis();
+        Response response;
+
+        try {
+            response = chain.proceed(request);
+        } catch (IOException e) {
+            // 网络异常（如超时、无法连接），采集并原样抛出；过滤客户端主动 cancel 引起的异常
+            long duration = System.currentTimeMillis() - startTime;
+            boolean isCanceled = "Canceled".equalsIgnoreCase(e.getMessage());
+            if (!isCanceled) {
+                try {
+                    AndroidTracker.getInstance().trackApi(url, request.method(), 0, duration, reqParam, null, e.getMessage());
+                } catch (Exception ex) {
+                    Log.e(TAG, "trackApi error", ex);
+                }
+            }
+            throw e;
+        }
+
+        long duration = System.currentTimeMillis() - startTime;
+        String respData = null;
+
+        // 2. 使用 OkHttp 官方推荐的 peekBody 做安全无损预览（不破坏业务层 response.body() 流）
+        try {
+            if (response.body() != null) {
+                MediaType mediaType = response.body().contentType();
+                if (mediaType != null) {
+                    String sub = mediaType.subtype();
+                    if (sub != null && (sub.contains("json") || sub.contains("text") || sub.contains("xml") || sub.contains("html"))) {
+                        ResponseBody peek = response.peekBody(MAX_RESP_PREVIEW_LENGTH);
+                        respData = peek.string();
+                    }
+                }
+            }
+        } catch (Throwable ignored) {}
+
+        // 3. 异步送入 AndroidTracker，后台 HandlerThread 处理，0 阻塞当前网络线程
+        try {
+            AndroidTracker.getInstance().trackApi(url, request.method(), response.code(), duration, reqParam, respData, null);
+        } catch (Exception e) {
+            Log.e(TAG, "trackApi error", e);
+        }
+
+        return response;
+    }
+
+    private boolean isTrackerInternalUrl(String url) {
+        if (TextUtils.isEmpty(url)) return true;
+        String lower = url.toLowerCase();
+        return lower.contains("/api/point/task/trackBatch")
+                || lower.contains("/point/task/trackBatch")
+                || lower.contains("/point/task/activeReport")
+                || lower.contains("/api/point/task/activeReport")
+                || lower.contains("/api/track/collect")
+                || lower.contains(".png")
+                || lower.contains(".jpg")
+                || lower.contains(".jpeg")
+                || lower.contains(".webp")
+                || lower.contains(".gif")
+                || lower.contains(".mp4")
+                || lower.contains(".svg");
+    }
+
+    private String extractRequestParams(Request request) {
+        try {
+            if ("GET".equalsIgnoreCase(request.method())) {
+                String query = request.url().query();
+                return !TextUtils.isEmpty(query) ? query : "";
+            }
+            RequestBody body = request.body();
+            if (body != null && body.contentLength() > 0 && body.contentLength() <= MAX_PARAM_LENGTH) {
+                MediaType contentType = body.contentType();
+                if (contentType != null) {
+                    String type = contentType.type();
+                    String sub = contentType.subtype();
+                    if ("multipart".equalsIgnoreCase(type) || "image".equalsIgnoreCase(type)
+                            || "video".equalsIgnoreCase(type) || "audio".equalsIgnoreCase(type)
+                            || (sub != null && sub.contains("octet-stream"))) {
+                        return "[binary/multipart: " + body.contentLength() + " bytes]";
+                    }
+                }
+                Buffer buffer = new Buffer();
+                body.writeTo(buffer);
+                Charset charset = StandardCharsets.UTF_8;
+                if (contentType != null) {
+                    charset = contentType.charset(StandardCharsets.UTF_8);
+                }
+                return buffer.readString(charset != null ? charset : StandardCharsets.UTF_8);
+            }
+        } catch (Throwable ignored) {}
+        return "";
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rk911/tracker-sdk",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": "人康多端埋点 SDK — 跨端自动化采集 + 手动埋点双写兼容",
   "main": "index.js",
   "module": "index.js",

package/plugins/api-watch.js

@@ -50,44 +50,149 @@ export class ApiWatchPlugin {
     var self = this
     var config = this.tracker.getConfig()
 
-    try {
-      uni.addInterceptor('request', {
-        invoke: function (args) {
-          // 给请求打上开始时间标记
-          args._trackStartTime = Date.now()
-          args._trackBgCount = self._bgCount
-          args._trackHiddenTimeStart = self._totalHiddenTime + (self._lastHideTime ? Date.now() - self._lastHideTime : 0)
-          return args
-        },
-        success: function (res, args) {
-          self._reportApi(args, res, null)
-        },
-        fail: function (err, args) {
-          self._reportApi(args, null, err)
-        },
-      })
-      this._interceptorAdded = true
-    } catch (e) {
-      if (config.debug) {
-        console.warn('[TrackerSDK] api-watch: failed to add interceptor', e)
+    // 1. uni-app 运行时环境：优先使用官方 uni.addInterceptor
+    if (typeof uni !== 'undefined' && typeof uni.addInterceptor === 'function') {
+      try {
+        uni.addInterceptor('request', {
+          invoke: function (args) {
+            args._trackStartTime = Date.now()
+            args._trackBgCount = self._bgCount
+            args._trackHiddenTimeStart = self._totalHiddenTime + (self._lastHideTime ? Date.now() - self._lastHideTime : 0)
+            return args
+          },
+          success: function (res, args) {
+            self._reportApi(args, res, null)
+          },
+          fail: function (err, args) {
+            self._reportApi(args, null, err)
+          },
+        })
+        this._interceptorAdded = true
+        return
+      } catch (e) {
+        if (config.debug) {
+          console.warn('[TrackerSDK] api-watch: failed to add uni interceptor', e)
+        }
       }
     }
+
+    // 2. 标准浏览器/WebView 环境：拦截 window.fetch 与 XMLHttpRequest
+    if (typeof window !== 'undefined') {
+      this._setupWebInterceptors()
+    }
   }
 
-  _reportApi(args, res, err) {
-    if (!args || !args.url) return
+  _isInternalUrl(url) {
+    if (!url || typeof url !== 'string') return true
+    var config = this.tracker ? this.tracker.getConfig() : {}
+    return (
+      url.indexOf('trackBatch') >= 0 ||
+      url.indexOf('activeReport') >= 0 ||
+      url.indexOf('/api/track/collect') >= 0 ||
+      url.indexOf('/api/point/device/add') >= 0 ||
+      (config && config.batchReportUrl && url.indexOf(config.batchReportUrl) >= 0)
+    )
+  }
 
-    var config = this.tracker.getConfig()
+  _setupWebInterceptors() {
+    var self = this
+
+    // 2.1 拦截 window.fetch
+    if (typeof window.fetch === 'function') {
+      var origFetch = window.fetch
+      this._origFetch = origFetch
+      window.fetch = function (input, init) {
+        var url = typeof input === 'string' ? input : (input && input.url ? input.url : '')
+        if (self._isInternalUrl(url)) {
+          return origFetch.apply(this, arguments)
+        }
+
+        var startTime = Date.now()
+        var method = (init && init.method) || (input && input.method) || 'GET'
+        var requestParams = (init && init.body) || null
 
-    // [PROJECT-ADAPT] 自身请求过滤列表
-    if (
-      args.url.indexOf('/api/point/task/activeReport') >= 0 ||
-      args.url.indexOf(config.batchReportUrl) >= 0 ||
-      args.url.indexOf('/api/track/collect') >= 0
-    ) {
-      return
+        var args = {
+          url: url,
+          method: method,
+          data: requestParams,
+          _trackStartTime: startTime
+        }
+
+        return origFetch.apply(this, arguments).then(function (res) {
+          try {
+            var clone = res.clone()
+            clone.text().then(function (text) {
+              self._reportApi(args, {
+                statusCode: res.status,
+                data: text,
+                header: {}
+              }, null)
+            }).catch(function () {
+              self._reportApi(args, {
+                statusCode: res.status,
+                data: null,
+                header: {}
+              }, null)
+            })
+          } catch (e) {
+            self._reportApi(args, { statusCode: res.status }, null)
+          }
+          return res
+        }, function (err) {
+          self._reportApi(args, null, err)
+          throw err
+        })
+      }
     }
 
+    // 2.2 拦截 XMLHttpRequest
+    if (typeof window.XMLHttpRequest === 'function') {
+      var origOpen = window.XMLHttpRequest.prototype.open
+      var origSend = window.XMLHttpRequest.prototype.send
+      this._origXhrOpen = origOpen
+      this._origXhrSend = origSend
+
+      window.XMLHttpRequest.prototype.open = function (method, url) {
+        this._trackMethod = method
+        this._trackUrl = url
+        return origOpen.apply(this, arguments)
+      }
+
+      window.XMLHttpRequest.prototype.send = function (data) {
+        var xhr = this
+        var url = xhr._trackUrl || ''
+        if (self._isInternalUrl(url)) {
+          return origSend.apply(this, arguments)
+        }
+
+        var startTime = Date.now()
+        var method = xhr._trackMethod || 'GET'
+
+        var args = {
+          url: url,
+          method: method,
+          data: data,
+          _trackStartTime: startTime
+        }
+
+        xhr.addEventListener('loadend', function () {
+          try {
+            self._reportApi(args, {
+              statusCode: xhr.status,
+              data: xhr.responseType === '' || xhr.responseType === 'text' ? xhr.responseText : null
+            }, xhr.status === 0 ? 'Network Error' : null)
+          } catch (e) {}
+        })
+
+        return origSend.apply(this, arguments)
+      }
+    }
+    this._interceptorAdded = true
+  }
+
+  _reportApi(args, res, err) {
+    if (!args || !args.url || this._isInternalUrl(args.url)) return
+
     var duration = args._trackStartTime
       ? Date.now() - args._trackStartTime
       : 0
@@ -210,8 +315,17 @@ export class ApiWatchPlugin {
     }
     if (this._interceptorAdded) {
       try {
-        uni.removeInterceptor('request')
+        if (typeof uni !== 'undefined' && uni.removeInterceptor) {
+          uni.removeInterceptor('request')
+        }
       } catch (e) {}
+      if (this._origFetch && typeof window !== 'undefined') {
+        window.fetch = this._origFetch
+      }
+      if (this._origXhrOpen && typeof window !== 'undefined') {
+        window.XMLHttpRequest.prototype.open = this._origXhrOpen
+        window.XMLHttpRequest.prototype.send = this._origXhrSend
+      }
     }
     if (this._visibilityHandler && typeof document !== 'undefined') {
       document.removeEventListener('visibilitychange', this._visibilityHandler)