gio-miniprogram-sdk 4.4.0 → 4.4.2

package/src/plugins/gioEventAutoTracking.ts

@@ -5,9 +5,10 @@
 import { ID_REG, SWAN_XID_REG, TARO_XID_REG } from '@@/constants/regex';
 import { EventTarget } from '@@/types/eventHooks';
 import { GrowingIOType } from '@@/types/growingIO';
-import { consoleText, getExtraData, isTaro3 } from '@@/utils/tools';
+import { consoleText, getExtraData, isTaro3, niceTry } from '@@/utils/tools';
 import EMIT_MSG from '@@/constants/emitMsg';
 import { isEmpty } from '@@/utils/glodash';
+import qs from 'querystringify';
 
 let ut;
 class GioEventAutoTracking {
@@ -200,15 +201,37 @@ class GioEventAutoTracking {
     });
   };
 
+  // 抖音小程序获取圈选地址
+  getCircleUrlByTT = ({ query }: any) => {
+    if (query.q && query.url) {
+      const urlFromQ = niceTry(
+        () => JSON.parse(query.q)?.gdpCircleRoomCollectUrl
+      );
+      if (urlFromQ) {
+        return urlFromQ;
+      } else {
+        return (
+          niceTry(
+            () => qs.parse(query.url.split('?')[1])?.gdpCircleRoomCollectUrl
+          ) ?? ''
+        );
+      }
+    }
+  };
+
   // 初始化圈选
   circleInit = (params: any) => {
     const { emitter } = this.growingIO;
-    const extraData = getExtraData(params.referrerInfo?.extraData);
+    const extraData = getExtraData(
+      params.referrerInfo?.extraData || params.query || {}
+    );
     // 额外参数中存在gdpCircleRoomCollectUrl，则表示是圈选的跳转，进入圈选状态
-    if (extraData?.gdpCircleRoomCollectUrl) {
+    const gdpCircleRoomCollectUrl =
+      extraData?.gdpCircleRoomCollectUrl || this.getCircleUrlByTT(params);
+    if (gdpCircleRoomCollectUrl) {
       // 圈选初始化
-      if (this.circleServerUrl !== extraData?.gdpCircleRoomCollectUrl) {
-        this.circleServerUrl = extraData?.gdpCircleRoomCollectUrl;
+      if (this.circleServerUrl !== gdpCircleRoomCollectUrl) {
+        this.circleServerUrl = gdpCircleRoomCollectUrl;
         // 提前移除一次事件发送监听，防止重复监听
         emitter.off(EMIT_MSG.ON_SEND_AFTER, this.collectorSendFn);
         // 添加事件发送监听，用于发送圈选事件
@@ -280,6 +303,7 @@ class GioEventAutoTracking {
         }
       }
     });
+    console.log(requestData, '----->circleRequest');
   };
 }
 

package/src/plugins/gioImpressionTracking.ts

@@ -108,7 +108,9 @@ class GioImpressionTracking {
           ? toString(hashCode(collectTarget.route)) // swan page
           : collectTarget.__nodeId__; // swan component
       case 'xhs':
-        return collectTarget.pageId;
+        return collectTarget.route
+          ? collectTarget.pageId // xhs page
+          : collectTarget.componentId; // xhs component
       default:
         break;
     }
@@ -119,9 +121,10 @@ class GioImpressionTracking {
     const { gioPlatform } = this.growingIO;
     if (
       (gioPlatform === 'tt' && collectTarget.__nodeId__) ||
-      (gioPlatform === 'ks' && collectTarget.is)
+      (gioPlatform === 'ks' && collectTarget.is) ||
+      (gioPlatform === 'xhs' && collectTarget.componentId)
     ) {
-      // 字节和快手小程序页面监听时可以拿到自定义组件一次性完成监听，所以组件的节点实例不再处理
+      // 字节/快手/小红书小程序页面监听时可以拿到自定义组件一次性完成监听，所以组件的节点实例不再处理
       return false;
     }
     const nodeId = this.getNodeId(collectTarget);

package/src/types/eventHooks.ts

@@ -76,7 +76,7 @@ export interface PageShareResult {
 }
 
 export interface MinipPageType {
-  queryOption: any;
+  queryOptions: any;
   configuredTitle: any;
   pageProps: any;
   lastLifecycle: string;
@@ -85,12 +85,12 @@ export interface MinipPageType {
   getPagePath: () => string;
   getPageQuery: () => string;
   getPageTitle: (trackingId?: string) => string;
-  qsQuery: (query: any) => string;
   getReferralPage: (trackingId: string) => string;
   buildShareQuery: (result: PageShareResult) => [string, string];
-  updateAppMessageResult: (result: PageShareResult) => PageShareResult;
-  updateTimelineResult: (result: PageShareResult) => PageShareResult;
-  updateAddFavoritesResult: (result: PageShareResult) => PageShareResult;
+  updateShareResult: (
+    result: PageShareResult,
+    fillParams?: boolean
+  ) => PageShareResult;
   eventSetPageProps: (trackingId: string, event: EVENT) => any;
 }
 

package/src/types/minipInstance.ts

@@ -125,4 +125,9 @@ export interface MinipInstanceType {
   getSetting?: () => any;
   // 监听网络变更
   setNetworkStatusListener?: () => any;
+  // 执行特有的分享promise
+  handleSharePromise?: (
+    originResult: any,
+    handlePromiseResult: () => void
+  ) => any;
 }

package/src/utils/tools.ts

@@ -4,6 +4,7 @@ import {
   find,
   forEach,
   formatDate,
+  has,
   head,
   isArray,
   isDate,
@@ -16,7 +17,6 @@ import {
   split,
   startsWith,
   toString,
-  typeOf,
   unset
 } from '@@/utils/glodash';
 
@@ -454,18 +454,58 @@ export const getExtraData = (data: any) => {
   }
 };
 
-// 获取额外的启动参数并合并进query
-export const getLaunchQuery = (originQuery: any = {}, data: any = {}) => {
-  const validData = {};
-  const extraData = getExtraData(data);
-  keys(extraData).forEach((k: string) => {
-    // 排除掉新版圈选用的标记字段
-    if (
-      k !== 'gdpCircleRoomCollectUrl' &&
-      ['string', 'number', 'boolean'].includes(typeOf(extraData[k]))
-    ) {
-      validData[k] = extraData[k];
+/**
+ * 清理参数中的非法字段
+ * @param originQuery 原始查询参数，可以是对象或参数字符串
+ * @param extraData 额外数据，可以是对象或参数字符串
+ * @returns 清理后的纯净参数对象
+ */
+const dirtyKey = [
+  'wxShoppingListScene',
+  '$taroTimestamp',
+  'gdpCircleRoomCollectUrl'
+];
+export const getPureParams = (originQuery: any = {}, extraData: any = {}) => {
+  // 处理originQuery可能是字符串的情况
+  const parsedOriginQuery =
+    typeof originQuery === 'string' ? qsParse(originQuery) : originQuery || {};
+
+  // 递归清理函数
+  function cleanObject(obj, needCompare) {
+    if (typeof obj !== 'object' || obj === null || Array.isArray(obj)) {
+      return obj;
     }
-  });
-  return Object.assign({}, validData, originQuery);
+
+    const result = {};
+
+    keys(obj).forEach((key) => {
+      // 检查key是否包含dirtyKey中的任何字符串
+      const isKeyDirty = dirtyKey.some((dirty) => key.includes(dirty));
+      const isKeyExist = has(parsedOriginQuery, key);
+
+      if (!isKeyDirty && (needCompare ? !isKeyExist : true)) {
+        const value = obj[key];
+
+        // 检查value是否是字符串且包含dirtyKey中的任何字符串
+        if (typeof value === 'string') {
+          const isValueDirty = dirtyKey.some((dirty) => value.includes(dirty));
+          if (!isValueDirty) {
+            result[key] = value;
+          }
+        }
+        // 如果是数字和布尔值，直接保留，其他类型丢弃
+        else if (typeof value === 'number' || typeof value === 'boolean') {
+          result[key] = value;
+        }
+      }
+    });
+
+    return result;
+  }
+
+  return Object.assign(
+    {},
+    cleanObject(parsedOriginQuery, false),
+    cleanObject(extraData, true)
+  );
 };

package/src/utils/verifiers.ts

@@ -27,7 +27,7 @@ export const initialCheck = (growingIO: GrowingIOType, args: any) => {
   const userOptions = (args.length === 4 ? args[3] : args[2]) || {};
   if (!projectId || !dataSourceId) {
     consoleText(
-      'SDK初始化失败，请使用 gdp("init", "您的GrowingIO项目 accountId", "您项目的 dataSourceId", "您的小程序 AppId（可选）", options: { host: "您的数据上报地址host" }); 进行初始化!',
+      'SDK初始化失败，请使用 gdp("init", "您的GrowingIO项目 accountId", "您项目的 dataSourceId", "您的小程序 AppId（可选）", options: { serverUrl: "您的数据上报地址" }); 进行初始化!',
       'error'
     );
     return false;