@rk911/tracker-sdk 1.6.8 → 1.7.0

package/core/session.js

@@ -10,6 +10,9 @@ export class SessionManager {
     this.sequence = 0
     this.userId = null
     this.deviceId = null
+    this.isNativeSessionId = false
+    this.isNativeDeviceId = false
+    this.isNativeUserId = false
     this._storageKey = config.session.storageKey || '_tracker_session'
     this._renewListeners = []
 
@@ -32,6 +35,7 @@ export class SessionManager {
   getSessionId() {
     if (!this.sessionId || this._isExpired()) {
       var wasRenew = !!this.sessionId
+      this.isNativeSessionId = false
       this._createNew()
       if (wasRenew) this._notifyRenew()
     }
@@ -56,15 +60,34 @@ export class SessionManager {
     this._save()
   }
 
-  setUser(userId) {
+  setUser(userId, isNative = false) {
     this.userId = userId
+    this.isNativeUserId = !!isNative
+    if (userId && !isNative) {
+      this.adapter.setStorage('userId', userId)
+    }
     this._save()
   }
 
-  setDeviceId(deviceId) {
-    this.deviceId = deviceId
-    this.adapter.setStorage(DEVICE_ID_KEY, deviceId)
-    this._save()
+  setDeviceId(deviceId, isNative = false) {
+    if (deviceId) {
+      this.deviceId = deviceId
+      this.isNativeDeviceId = !!isNative
+      if (!isNative) {
+        this.adapter.setStorage(DEVICE_ID_KEY, deviceId)
+        this.adapter.setStorage('deviceId', deviceId)
+      }
+      this._save()
+    }
+  }
+
+  setSessionId(sessionId, isNative = false) {
+    if (sessionId) {
+      this.sessionId = sessionId
+      this.isNativeSessionId = !!isNative
+      this.lastActivityTime = this.adapter.getTimestamp()
+      this._save()
+    }
   }
 
   getUserId() {
@@ -95,13 +118,14 @@ export class SessionManager {
       startTime: this.startTime,
       lastActivityTime: this.lastActivityTime,
       sequence: this.sequence,
+      isNativeSessionId: !!this.isNativeSessionId,
     }
     this.adapter.setSessionStorage(this._storageKey, data)
   }
 
   _restore() {
     var data = this.adapter.getSessionStorage(this._storageKey)
-    if (data && data.sessionId) {
+    if (data && data.sessionId && !data.isNativeSessionId) {
       this.sessionId = data.sessionId
       this.startTime = data.startTime
       this.lastActivityTime = data.lastActivityTime

package/core/tracker.js

@@ -200,12 +200,24 @@ export class Tracker {
 
   // ---- 用户标识 ----
 
-  setUser(userId) {
-    this.session.setUser(userId)
+  setUser(userId, isNative = false) {
+    this.session.setUser(userId, isNative)
   }
 
-  setDeviceId(deviceId) {
-    this.session.setDeviceId(deviceId)
+  setDeviceId(deviceId, isNative = false) {
+    this.session.setDeviceId(deviceId, isNative)
+  }
+
+  setSessionId(sessionId, isNative = false) {
+    this.session.setSessionId(sessionId, isNative)
+  }
+
+  getDeviceId() {
+    return this.session.getDeviceId()
+  }
+
+  getSessionId() {
+    return this.session.getSessionId()
   }
 
   setUserProperties(properties) {

package/index.js

@@ -89,6 +89,15 @@ export function createTracker(config) {
   var adapter = createAdapter(platform, config)
   trackerInstance = new Tracker(config, adapter)
 
+  // 触发 onBeforeInit 钩子（必须在插件注册与首屏事件触发前执行，以便同步/异步注入 Native 上下文）
+  if (typeof config.onBeforeInit === 'function') {
+    try {
+      config.onBeforeInit(trackerInstance)
+    } catch (e) {
+      console.warn('[TrackerSDK] onBeforeInit error:', e)
+    }
+  }
+
   // 注册插件
   var pluginNames = config.plugins || []
   pluginNames.forEach(function (pluginName) {
@@ -125,7 +134,14 @@ export function getTracker() {
 function registerDeviceIfNeeded(tracker) {
   var adapter = tracker.getAdapter()
   var config = tracker.getConfig()
-  var existingId = adapter.getStorage('deviceId')
+  var session = tracker.getSession()
+
+  // 如果是由 App/Native 动态注入的临时 DeviceID，跳过 H5 本地注册逻辑
+  if (session.isNativeDeviceId && session.getDeviceId()) {
+    return
+  }
+
+  var existingId = session.getDeviceId() || adapter.getStorage('deviceId') || adapter.getStorage('_tracker_device_id')
   if (existingId) {
     tracker.setDeviceId(existingId)
     return
@@ -188,6 +204,12 @@ function registerDeviceIfNeeded(tracker) {
  * 不依赖内存缓存，确保清除存储后不会残留旧用户、切换账号后能及时更新
  */
 function _ensureUserId(tracker) {
+  var session = tracker.getSession()
+  // 如果当前 userId 是由 Native 拼接注入的临时账号，不被 H5 本地 Cookie/Storage 覆写
+  if (session.isNativeUserId && session.getUserId()) {
+    return
+  }
+
   var adapter = tracker.getAdapter()
   // 从源头实时读取（登录页写入了 uni.setStorageSync('userId', ...)）
   var uid = adapter.getStorage('userId')

package/native/android/AndroidTracker.java

@@ -0,0 +1,277 @@
+package com.renrui.tracker;
+
+import android.app.Activity;
+import android.app.Application;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.text.TextUtils;
+import android.util.Log;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * 行业级 Native Android Tracker SDK
+ * 独立后台 HandlerThread 处理打点，主线程耗时 0ms
+ */
+public class AndroidTracker implements Application.ActivityLifecycleCallbacks {
+
+    private static final String TAG = "AndroidTracker";
+    private static final int BATCH_SIZE = 20;
+    private static final long FLUSH_INTERVAL_MS = 5000;
+
+    private static volatile AndroidTracker instance;
+    private Application application;
+    private String serverUrl;
+    private String appId = "12"; // 12: Android App
+    private String sessionId;
+    private String deviceId;
+    private String userId;
+    private String phone;
+    private String storeName;
+    private int sequence = 0;
+
+    private HandlerThread bgThread;
+    private Handler bgHandler;
+    private final List<JSONObject> eventQueue = new ArrayList<>();
+    private long lastPageStartTime = 0;
+    private String currentPageRoute = "";
+
+    private AndroidTracker() {}
+
+    public static AndroidTracker getInstance() {
+        if (instance == null) {
+            synchronized (AndroidTracker.class) {
+                if (instance == null) {
+                    instance = new AndroidTracker();
+                }
+            }
+        }
+        return instance;
+    }
+
+    /**
+     * 初始化 SDK
+     */
+    public void init(Application app, String serverUrl, String deviceId, String userId, String phone, String storeName) {
+        this.application = app;
+        this.serverUrl = serverUrl;
+        this.deviceId = deviceId;
+        this.userId = userId;
+        this.phone = phone;
+        this.storeName = storeName;
+        this.sessionId = "android_" + System.currentTimeMillis() + "_" + (int)(Math.random() * 10000);
+
+        // 创建独立后台线程处理队列与网络请求，保障 UI 0 卡顿
+        bgThread = new HandlerThread("TrackerBgThread");
+        bgThread.start();
+        bgHandler = new Handler(bgThread.getLooper());
+
+        // 注册 Activity 生命周期自动采集
+        app.registerActivityLifecycleCallbacks(this);
+
+        // 启动定时 Flush 任务
+        scheduleTimerFlush();
+        Log.d(TAG, "AndroidTracker initialized with sessionId: " + sessionId);
+    }
+
+    public void updateUser(String userId, String phone, String storeName) {
+        if (!TextUtils.isEmpty(userId)) this.userId = userId;
+        if (!TextUtils.isEmpty(phone)) this.phone = phone;
+        if (!TextUtils.isEmpty(storeName)) this.storeName = storeName;
+    }
+
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    /**
+     * 手动自定义埋点 (Custom Tracking)
+     */
+    public void track(final String eventName, final JSONObject customProperties) {
+        postBgTask(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    JSONObject event = createBaseEvent("custom", eventName);
+                    if (customProperties != null) {
+                        event.put("extraData", customProperties.toString());
+                    }
+                    enqueueEvent(event);
+                } catch (Exception e) {
+                    Log.e(TAG, "track custom event failed", e);
+                }
+            }
+        });
+    }
+
+    /**
+     * 旧 $dadian 点位兼容方法 (自动匹配后端双写 point.log)
+     */
+    public void trackFrontUrl(final String frontUrl, final String elementId, final String postParam) {
+        postBgTask(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    JSONObject event = createBaseEvent("click", "legacy_dadian");
+                    event.put("frontUrl", frontUrl);
+                    event.put("elementId", elementId);
+                    if (postParam != null) event.put("postParam", postParam);
+                    enqueueEvent(event);
+                } catch (Exception e) {
+                    Log.e(TAG, "trackFrontUrl failed", e);
+                }
+            }
+        });
+    }
+
+    private JSONObject createBaseEvent(String eventType, String eventName) throws Exception {
+        sequence++;
+        JSONObject event = new JSONObject();
+        event.put("eventId", "e_" + System.currentTimeMillis() + "_" + (int)(Math.random() * 1000));
+        event.put("eventType", eventType);
+        event.put("eventName", eventName);
+        event.put("timestamp", System.currentTimeMillis());
+        event.put("sequence", sequence);
+        event.put("pageRoute", currentPageRoute);
+        event.put("os", "Android");
+        return event;
+    }
+
+    private void enqueueEvent(JSONObject event) {
+        synchronized (eventQueue) {
+            eventQueue.add(event);
+            if (eventQueue.size() >= BATCH_SIZE) {
+                flushAsync();
+            }
+        }
+    }
+
+    private void scheduleTimerFlush() {
+        if (bgHandler == null) return;
+        bgHandler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                flushAsync();
+                scheduleTimerFlush();
+            }
+        }, FLUSH_INTERVAL_MS);
+    }
+
+    public void flushAsync() {
+        postBgTask(new Runnable() {
+            @Override
+            public void run() {
+                List<JSONObject> toSend;
+                synchronized (eventQueue) {
+                    if (eventQueue.isEmpty()) return;
+                    toSend = new ArrayList<>(eventQueue);
+                    eventQueue.clear();
+                }
+                sendBatch(toSend);
+            }
+        });
+    }
+
+    private void sendBatch(List<JSONObject> events) {
+        if (TextUtils.isEmpty(serverUrl) || events.isEmpty()) return;
+        HttpURLConnection conn = null;
+        try {
+            JSONObject body = new JSONObject();
+            body.put("appId", Integer.parseInt(appId));
+            body.put("sessionId", sessionId);
+            body.put("deviceId", deviceId);
+            body.put("userId", userId);
+            body.put("phone", phone);
+            body.put("storeName", storeName);
+            body.put("platform", "android");
+
+            JSONArray eventsArr = new JSONArray();
+            for (JSONObject e : events) {
+                eventsArr.put(e);
+            }
+            body.put("events", eventsArr);
+
+            URL url = new URL(serverUrl);
+            conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("POST");
+            conn.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
+            conn.setDoOutput(true);
+            conn.setConnectTimeout(5000);
+            conn.setReadTimeout(5000);
+
+            byte[] bytes = body.toString().getBytes("UTF-8");
+            OutputStream os = conn.getOutputStream();
+            os.write(bytes);
+            os.flush();
+            os.close();
+
+            int code = conn.getResponseCode();
+            Log.d(TAG, "sendBatch response code: " + code + ", count: " + events.size());
+        } catch (Exception e) {
+            Log.e(TAG, "sendBatch failed", e);
+        } finally {
+            if (conn != null) conn.disconnect();
+        }
+    }
+
+    private void postBgTask(Runnable runnable) {
+        if (bgHandler != null) {
+            bgHandler.post(runnable);
+        }
+    }
+
+    // --- Activity Lifecycle Auto-Tracking ---
+
+    @Override
+    public void onActivityResumed(final Activity activity) {
+        postBgTask(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    currentPageRoute = activity.getClass().getName();
+                    lastPageStartTime = System.currentTimeMillis();
+                    JSONObject event = createBaseEvent("page_view", "page_view");
+                    event.put("pageTitle", activity.getTitle() != null ? activity.getTitle().toString() : currentPageRoute);
+                    enqueueEvent(event);
+                } catch (Exception e) {
+                    Log.e(TAG, "onActivityResumed failed", e);
+                }
+            }
+        });
+    }
+
+    @Override
+    public void onActivityPaused(final Activity activity) {
+        postBgTask(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    if (lastPageStartTime > 0) {
+                        long duration = System.currentTimeMillis() - lastPageStartTime;
+                        JSONObject event = createBaseEvent("page_stay", "page_stay");
+                        event.put("duration", duration);
+                        enqueueEvent(event);
+                        lastPageStartTime = 0;
+                    }
+                } catch (Exception e) {
+                    Log.e(TAG, "onActivityPaused failed", e);
+                }
+            }
+        });
+    }
+
+    @Override public void onActivityCreated(Activity activity, Bundle savedInstanceState) {}
+    @Override public void onActivityStarted(Activity activity) {}
+    @Override public void onActivityStopped(Activity activity) { flushAsync(); }
+    @Override public void onActivitySaveInstanceState(Activity activity, Bundle outState) {}
+    @Override public void onActivityDestroyed(Activity activity) {}
+}

package/native/ios/RKTrackerSDK.swift

@@ -0,0 +1,148 @@
+//
+//  RKTrackerSDK.swift
+//  RKTrackerSDK
+//  iOS Native Tracker SDK for tracker-sdk repo
+//
+
+import UIKit
+
+@objc public class RKTrackerSDK: NSObject {
+    @objc public static let shared = RKTrackerSDK()
+
+    private var serverUrl: String = ""
+    private var appId: String = "13" // 13: iOS App
+    private var sessionId: String = ""
+    private var deviceId: String = ""
+    private var userId: String = ""
+    private var phone: String = ""
+    private var storeName: String = ""
+    private var sequence: Int = 0
+
+    private let bgQueue = DispatchQueue(label: "cn.renruikeji.tracker.bgQueue", qos: .utility)
+    private var eventQueue: [[String: Any]] = []
+    private var flushTimer: Timer?
+
+    private override init() {
+        super.init()
+        self.sessionId = "ios_\(Int(Date().timeIntervalSince1970))_\(Int.random(in: 1000...9999))"
+    }
+
+    @objc public func initSDK(serverUrl: String, deviceId: String, userId: String, phone: String, storeName: String) {
+        self.serverUrl = serverUrl
+        self.deviceId = deviceId.isEmpty ? (UIDevice.current.identifierForVendor?.uuidString ?? "") : deviceId
+        self.userId = userId
+        self.phone = phone
+        self.storeName = storeName
+
+        swizzleUIViewController()
+        startTimer()
+    }
+
+    @objc public func getSessionId() -> String {
+        return sessionId
+    }
+
+    @objc public func track(eventName: String, properties: [String: Any]?) {
+        bgQueue.async { [weak self] in
+            guard let self = self else { return }
+            var event = self.createBaseEvent(eventType: "custom", eventName: eventName)
+            if let props = properties, let jsonData = try? JSONSerialization.data(withJSONObject: props), let str = String(data: jsonData, encoding: .utf8) {
+                event["extraData"] = str
+            }
+            self.enqueueEvent(event)
+        }
+    }
+
+    @objc public func trackFrontUrl(frontUrl: String, elementId: String?, postParam: String?) {
+        bgQueue.async { [weak self] in
+            guard let self = self else { return }
+            var event = self.createBaseEvent(eventType: "click", eventName: "legacy_dadian")
+            event["frontUrl"] = frontUrl
+            if let elem = elementId { event["elementId"] = elem }
+            if let post = postParam { event["postParam"] = post }
+            self.enqueueEvent(event)
+        }
+    }
+
+    private func createBaseEvent(eventType: String, eventName: String) -> [String: Any] {
+        sequence += 1
+        var event: [String: Any] = [
+            "eventId": "e_\(Int(Date().timeIntervalSince1970 * 1000))_\(Int.random(in: 1000...9999))",
+            "eventType": eventType,
+            "eventName": eventName,
+            "timestamp": Int(Date().timeIntervalSince1970 * 1000),
+            "sequence": sequence,
+            "os": "iOS"
+        ]
+        return event
+    }
+
+    private func enqueueEvent(_ event: [String: Any]) {
+        eventQueue.append(event)
+        if eventQueue.count >= 20 {
+            flushAsync()
+        }
+    }
+
+    private func startTimer() {
+        DispatchQueue.main.async {
+            self.flushTimer = Timer.scheduledTimer(withTimeInterval: 5.0, repeats: true) { [weak self] _ in
+                self?.flushAsync()
+            }
+        }
+    }
+
+    @objc public func flushAsync() {
+        bgQueue.async { [weak self] in
+            guard let self = self, !self.eventQueue.isEmpty, !self.serverUrl.isEmpty else { return }
+            let batchEvents = self.eventQueue
+            self.eventQueue.removeAll()
+            self.sendBatch(events: batchEvents)
+        }
+    }
+
+    private func sendBatch(events: [[String: Any]]) {
+        guard let url = URL(string: serverUrl) else { return }
+        var request = URLRequest(url: url)
+        request.httpMethod = "POST"
+        request.setValue("application/json; charset=UTF-8", forHTTPHeaderField: "Content-Type")
+
+        let body: [String: Any] = [
+            "appId": Int(appId) ?? 13,
+            "sessionId": sessionId,
+            "deviceId": deviceId,
+            "userId": userId,
+            "phone": phone,
+            "storeName": storeName,
+            "platform": "ios",
+            "events": events
+        ]
+
+        guard let jsonData = try? JSONSerialization.data(withJSONObject: body) else { return }
+        request.httpBody = jsonData
+
+        let task = URLSession.shared.dataTask(with: request) { _, _, _ in }
+        task.resume()
+    }
+
+    // --- Swizzling for UIViewController Auto-Tracking ---
+    private func swizzleUIViewController() {
+        let originalSelector = #selector(UIViewController.viewDidAppear(_:))
+        let swizzledSelector = #selector(UIViewController.rk_viewDidAppear(_:))
+
+        guard let originalMethod = class_getInstanceMethod(UIViewController.self, originalSelector),
+              let swizzledMethod = class_getInstanceMethod(UIViewController.self, swizzledSelector) else { return }
+
+        method_exchangeImplementations(originalMethod, swizzledMethod)
+    }
+}
+
+extension UIViewController {
+    @objc func rk_viewDidAppear(_ animated: Bool) {
+        self.rk_viewDidAppear(animated)
+        let pageRoute = String(describing: type(of: self))
+        if !pageRoute.hasPrefix("UI") {
+            RKTrackerSDK.shared.track(eventName: "page_view", properties: ["pageRoute": pageRoute])
+        }
+    }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rk911/tracker-sdk",
-  "version": "1.6.8",
-  "description": "人康多端埋点 SDK — 自动化采集 + 手动埋点兼容",
+  "version": "1.7.0",
+  "description": "人康多端埋点 SDK — 跨端自动化采集 + 手动埋点双写兼容",
   "main": "index.js",
   "module": "index.js",
   "type": "module",
@@ -10,7 +10,8 @@
     "core/",
     "platforms/",
     "plugins/",
-    "customize/"
+    "customize/",
+    "native/"
   ],
   "keywords": [
     "tracker",