@rk911/tracker-sdk 1.6.8 → 1.6.9

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/package.json

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