aegis-mp-rum-wrapper 0.1.3 → 0.1.4

package/dist/index.d.ts

@@ -46,9 +46,4 @@ export declare function getInstances(): {
     defaultAegis: any;
     serviceAegis: any;
 };
-export interface AegisWrapperFacade {
-    user: AegisUserInfo;
-    rumID: string;
-    reportEvent: (params: string | ReportParams) => void;
-}
-export declare const AegisW: AegisWrapperFacade;
+export declare const AegisW: any;

package/dist/index.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -20,10 +9,10 @@ exports.setUser = setUser;
 exports.setRumID = setRumID;
 exports.reportEvent = reportEvent;
 exports.getInstances = getInstances;
-var aegis_mp_sdk_1 = __importDefault(require("aegis-mp-sdk"));
+const aegis_mp_sdk_1 = __importDefault(require("aegis-mp-sdk"));
 // RUM 上报 ID（默认使用国服服务）
 exports.GPPRumID = 'zYpo1fz400Vk86JR5Z';
-var logItemTemplate = {
+const logItemTemplate = {
     report_type: 11,
     event_id: '',
     service_type: '',
@@ -67,9 +56,9 @@ var logItemTemplate = {
     source: 'fe_rum',
 };
 // 内部状态
-var defaultAegis;
-var serviceAegis;
-var internalState = {
+let defaultAegis;
+let serviceAegis;
+const internalState = {
     id: exports.GPPRumID,
     uin: '',
     reportApiSpeed: false,
@@ -84,11 +73,11 @@ var internalState = {
 // 构建一条上报日志 JSON 字符串（写入 ext1）
 function buildReportStr(params, isPV) {
     var _a, _b, _c, _d, _e;
-    var logItem = __assign({}, logItemTemplate);
+    const logItem = Object.assign({}, logItemTemplate);
     if (isPV) {
         logItem.report_type = 1;
     }
-    var user = internalState.user;
+    const user = internalState.user;
     logItem.openid = ((_a = user.openid) !== null && _a !== void 0 ? _a : '') + '';
     logItem.role_id = user.roleID ? user.roleID + '' : '';
     logItem.area_id = user.area ? parseInt(String(user.area), 10) : 0;
@@ -99,7 +88,7 @@ function buildReportStr(params, isPV) {
     logItem.event_id = ((_c = user.eventID) !== null && _c !== void 0 ? _c : '') + '';
     logItem.country = user.country ? user.country + '' : '';
     logItem.content_id = user.contentID ? user.contentID + '' : '';
-    var lang = (_e = (_d = user.language) !== null && _d !== void 0 ? _d : user.locale) !== null && _e !== void 0 ? _e : '';
+    const lang = (_e = (_d = user.language) !== null && _d !== void 0 ? _d : user.locale) !== null && _e !== void 0 ? _e : '';
     logItem.language = lang ? lang + '' : '';
     logItem.in_game = user.in_game ? parseInt(String(user.in_game), 10) : logItem.in_game;
     logItem.env = user.env ? user.env + '' : logItem.env;
@@ -127,13 +116,14 @@ function buildReportStr(params, isPV) {
 }
 // 初始化 Aegis 实例（isDefault=true 为默认实例，false 为服务实例）
 function initAegis(isDefault) {
-    var id = internalState.id;
-    var apiSpeed = internalState.reportApiSpeed;
-    var assetSpeed = internalState.reportAssetSpeed;
-    var pagePerformance = internalState.pagePerformance;
-    var webVitals = internalState.webVitals;
-    var delay = internalState.delay;
-    var ext1;
+    console.log('initAegis205', isDefault, internalState);
+    let id = internalState.id;
+    let apiSpeed = internalState.reportApiSpeed;
+    let assetSpeed = internalState.reportAssetSpeed;
+    let pagePerformance = internalState.pagePerformance;
+    let webVitals = internalState.webVitals;
+    let delay = internalState.delay;
+    let ext1;
     if (!isDefault) {
         id = internalState.rumID || internalState.id;
         apiSpeed = true;
@@ -142,32 +132,30 @@ function initAegis(isDefault) {
         webVitals = true;
         delay = 1000;
     }
-    // 关键修改：默认实例总是生成PV数据，用于统计浏览量
-    // 无论是否有用户信息，都会上报PV
-    if (isDefault) {
-        var pvName = internalState.ready ? '@@init_with_user' : '@@init_no_user';
-        console.log('pvName', pvName);
+    if (internalState.ready) {
         ext1 = buildReportStr({
-            name: pvName,
+            name: '@@init',
             ext1: internalState.user.ext1,
             ext2: internalState.user.ext2,
             ext3: internalState.user.ext3,
         }, true);
-        console.log('[Aegis Wrapper] PV数据已构建，report_type=1');
     }
+    console.log('AegisCtor235', aegis_mp_sdk_1.default);
     // 小程序环境直接使用构造函数
     if (typeof aegis_mp_sdk_1.default === 'function') {
+        console.log('return new AegisCtor');
         return new aegis_mp_sdk_1.default({
-            id: id,
+            id,
             uin: internalState.uin,
             reportApiSpeed: apiSpeed,
             reportAssetSpeed: assetSpeed,
-            pagePerformance: pagePerformance,
-            webVitals: webVitals,
-            delay: delay,
+            pagePerformance,
+            webVitals,
+            delay,
             spa: true,
-            ext1: ext1,
-            beforeRequest: function (data) {
+            ext1,
+            beforeRequest(data) {
+                console.log('beforeRequest', data);
                 if (!isDefault) {
                     return data;
                 }
@@ -178,7 +166,7 @@ function initAegis(isDefault) {
             },
         });
     }
-    console.error('[Aegis Wrapper] 找不到 aegis-mp-sdk 构造函数，请确认依赖是否正确安装和引用');
+    console.error('[Aegis Wrapper] 找不到 aegis-mp-sdk 构造函数，请确认依赖是否正确安装和引用265');
     return undefined;
 }
 // 对外暴露的配置 API
@@ -199,8 +187,8 @@ function configureWrapper(config) {
         internalState.delay = config.delay;
 }
 function setUser(user) {
-    var incoming = user;
-    var nextUser = __assign(__assign({}, internalState.user), user);
+    const incoming = user;
+    const nextUser = Object.assign(Object.assign({}, internalState.user), user);
     // 兼容 channeldID（文档示例里的字段名）到 channelID
     if (incoming.channeldID != null && nextUser.channelID == null) {
         nextUser.channelID = incoming.channeldID;
@@ -210,18 +198,13 @@ function setUser(user) {
         nextUser.language = incoming.locale;
     }
     internalState.user = nextUser;
-    var u = internalState.user;
+    const u = internalState.user;
     if (u.openid && u.serviceType && u.eventID) {
-        console.log('300行', internalState, defaultAegis);
+        console.log('294', internalState, defaultAegis);
         if (!internalState.ready) {
             internalState.ready = true;
-            console.log('[Aegis Wrapper] default aegis 已就绪');
-            defaultAegis = initAegis(true);
-        }
-        else if (!defaultAegis) {
-            // ready为true但defaultAegis丢失，重新初始化
-            console.log('[Aegis Wrapper] 重新初始化default aegis');
             defaultAegis = initAegis(true);
+            console.log('[Aegis Wrapper] default aegis 已就绪298');
         }
     }
     else {
@@ -239,8 +222,8 @@ function reportEvent(params) {
     if (serviceAegis && typeof serviceAegis.reportEvent === 'function') {
         serviceAegis.reportEvent(params);
     }
-    if (!defaultAegis) {
-        console.error('[Aegis Wrapper] default aegis 未初始化，请先调用 setUser');
+    if (!defaultAegis || typeof defaultAegis.reportEvent !== 'function') {
+        console.error('[Aegis Wrapper] default aegis 尚未准备就绪，请先调用 setUser 并补全必要字段');
         return;
     }
     if (typeof params !== 'string' && typeof params !== 'object') {
@@ -251,30 +234,90 @@ function reportEvent(params) {
         console.error('[Aegis Wrapper] reportEvent 缺少 name 字段');
         return;
     }
-    var payload = typeof params === 'string' ? { name: params } : __assign({}, params);
+    const payload = typeof params === 'string' ? { name: params } : Object.assign({}, params);
     payload.ext1 = buildReportStr(payload, false);
     defaultAegis.reportEvent(payload);
 }
 // 方便调试或高级用户直接访问底层实例
 function getInstances() {
     return {
-        defaultAegis: defaultAegis,
-        serviceAegis: serviceAegis,
+        defaultAegis,
+        serviceAegis,
     };
 }
-exports.AegisW = {
-    get user() {
-        return internalState.user;
-    },
-    set user(v) {
-        console.log('371设置用户信息', v);
-        setUser(v);
-    },
-    get rumID() {
-        return internalState.rumID;
-    },
-    set rumID(v) {
-        setRumID(v);
+// 面向业务侧的简单封装对象，支持示例中的两种用法：
+// 1）AegisW.user = {...}
+// 2）AegisW.reportEvent({...})
+const handler = {
+    set(target, prop, value) {
+        console.log('user change351', target, prop, value);
+        // console.log(`changed ${prop} from ${target[prop]} to ${value}`); // debug info
+        target[prop] = value;
+        if (prop === "user" && typeof value === "object") {
+            console.log('user change368');
+            if (value.openid != undefined &&
+                value.openid != "" &&
+                value.serviceType != undefined &&
+                value.serviceType != "" &&
+                value.eventID != undefined &&
+                value.eventID != "") {
+                target.ready = true; // set ready
+                console.log("[Aegis Wrapper]Ready367");
+                // init default aegis
+                defaultAegis = initAegis(true);
+            }
+            else {
+                console.log("[Aegis Wrapper]Init Failed384: ", value);
+            }
+        }
+        if (prop == "rumID") {
+            // init service aegis instance
+            serviceAegis = initAegis(false);
+            console.log("[Aegis Wrapper]rum id is set378");
+        }
     },
-    reportEvent: reportEvent,
 };
+exports.AegisW = new Proxy(internalState, handler);
+// init
+function init() {
+    console.log("initing...385");
+    // set report func
+    exports.AegisW.reportEvent = function () {
+        console.log("args", arguments);
+        // normal report
+        if (serviceAegis !== undefined) {
+            serviceAegis.reportEvent(arguments[0]);
+        }
+        // proxy report
+        if (defaultAegis !== undefined) {
+            if (!internalState.ready) {
+                console.error("aegis is not ready!");
+                return;
+            }
+            // check params
+            if (typeof arguments[0] !== "object" &&
+                typeof arguments[0] !== "string") {
+                console.error("invalid params!");
+                return;
+            }
+            if (typeof arguments[0] === "object" && arguments[0].name === undefined) {
+                console.error("invalid name field!");
+                return;
+            }
+            // build params string and report
+            arguments[0].ext1 = buildReportStr(arguments[0], false);
+            defaultAegis.reportEvent(arguments[0]);
+        }
+    };
+}
+// init report wrapper
+if ((document === null || document === void 0 ? void 0 : document.readyState) === "loading") {
+    console.log('document.readyState === "loading"431');
+    // add event listener for report wrapper
+    document.addEventListener("DOMContentLoaded", init);
+}
+else {
+    console.log('init()434');
+    // init report wrapper
+    init();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aegis-mp-rum-wrapper",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "基于 aegis-mp-sdk 的小程序上报封装 SDK，支持双实例与自定义 RUM 日志构造。",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -202,6 +202,7 @@ function buildReportStr(params: string | ReportParams, isPV: boolean): string {
 
 // 初始化 Aegis 实例（isDefault=true 为默认实例，false 为服务实例）
 function initAegis(isDefault: boolean): any | undefined {
+  console.log('initAegis205',isDefault,internalState);
   let id = internalState.id;
   let apiSpeed = internalState.reportApiSpeed;
   let assetSpeed = internalState.reportAssetSpeed;
@@ -219,26 +220,22 @@ function initAegis(isDefault: boolean): any | undefined {
     delay = 1000;
   }
 
-  // 关键修改：默认实例总是生成PV数据，用于统计浏览量
-  // 无论是否有用户信息，都会上报PV
-  if (isDefault) {
-    const pvName = internalState.ready ? '@@init_with_user' : '@@init_no_user';
-    console.log('pvName',pvName);
-    
+  if (internalState.ready) {
     ext1 = buildReportStr(
       {
-        name: pvName,
+        name: '@@init',
         ext1: internalState.user.ext1,
         ext2: internalState.user.ext2,
         ext3: internalState.user.ext3,
       },
-      true, // 第二个参数为true表示是PV上报
+      true,
     );
-    console.log('[Aegis Wrapper] PV数据已构建，report_type=1');
   }
+console.log('AegisCtor235',AegisCtor);
 
   // 小程序环境直接使用构造函数
   if (typeof AegisCtor === 'function') {
+    console.log('return new AegisCtor');
     return new (AegisCtor as any)({
       id,
       uin: internalState.uin,
@@ -250,6 +247,7 @@ function initAegis(isDefault: boolean): any | undefined {
       spa: true,
       ext1,
       beforeRequest(data: any) {
+        console.log('beforeRequest',data);
         if (!isDefault) {
           return data;
         }
@@ -261,7 +259,7 @@ function initAegis(isDefault: boolean): any | undefined {
     });
   }
 
-  console.error('[Aegis Wrapper] 找不到 aegis-mp-sdk 构造函数，请确认依赖是否正确安装和引用');
+  console.error('[Aegis Wrapper] 找不到 aegis-mp-sdk 构造函数，请确认依赖是否正确安装和引用265');
   return undefined;
 }
 
@@ -297,16 +295,11 @@ export function setUser(user: Partial<AegisUserInfo>): void {
 
   const u = internalState.user;
   if (u.openid && u.serviceType && u.eventID) {
-    console.log('300行',internalState,defaultAegis);
-    
-    if (!internalState.ready) {
+    console.log('294',internalState,defaultAegis); 
+       if (!internalState.ready) {
       internalState.ready = true;
-      console.log('[Aegis Wrapper] default aegis 已就绪');
-      defaultAegis = initAegis(true);
-    } else if (!defaultAegis) {
-      // ready为true但defaultAegis丢失，重新初始化
-      console.log('[Aegis Wrapper] 重新初始化default aegis');
       defaultAegis = initAegis(true);
+      console.log('[Aegis Wrapper] default aegis 已就绪298');
     }
   } else {
     console.log('[Aegis Wrapper] 初始化条件不足：需要 openid / serviceType / eventID', u);
@@ -326,8 +319,8 @@ export function reportEvent(params: string | ReportParams): void {
     (serviceAegis as any).reportEvent(params as any);
   }
 
-  if (!defaultAegis) {
-    console.error('[Aegis Wrapper] default aegis 未初始化，请先调用 setUser');
+  if (!defaultAegis || typeof (defaultAegis as any).reportEvent !== 'function') {
+    console.error('[Aegis Wrapper] default aegis 尚未准备就绪，请先调用 setUser 并补全必要字段');
     return;
   }
 
@@ -357,25 +350,85 @@ export function getInstances() {
 // 面向业务侧的简单封装对象，支持示例中的两种用法：
 // 1）AegisW.user = {...}
 // 2）AegisW.reportEvent({...})
-export interface AegisWrapperFacade {
-  user: AegisUserInfo;
-  rumID: string;
-  reportEvent: (params: string | ReportParams) => void;
-}
-
-export const AegisW: AegisWrapperFacade = {
-  get user() {
-    return internalState.user;
-  },
-  set user(v: AegisUserInfo) {
-    console.log('371设置用户信息',v);
-    setUser(v);
-  },
-  get rumID() {
-    return internalState.rumID;
-  },
-  set rumID(v: string) {
-    setRumID(v);
+const handler:any = {
+  set(target:any, prop:any, value:any) {
+    console.log('user change351',target, prop, value);
+    
+    // console.log(`changed ${prop} from ${target[prop]} to ${value}`); // debug info
+    target[prop] = value;
+    if (prop === "user" && typeof value === "object") {
+    console.log('user change368');
+      
+      if (
+        value.openid != undefined &&
+        value.openid != "" &&
+        value.serviceType != undefined &&
+        value.serviceType != "" &&
+        value.eventID != undefined &&
+        value.eventID != ""
+      ) {
+        target.ready = true; // set ready
+        console.log("[Aegis Wrapper]Ready367");
+
+        // init default aegis
+        defaultAegis = initAegis(true);
+      } else {
+        console.log("[Aegis Wrapper]Init Failed384: ", value);
+      }
+    }
+    if (prop == "rumID") {
+      // init service aegis instance
+      serviceAegis = initAegis(false);
+      console.log("[Aegis Wrapper]rum id is set378");
+    }
   },
-  reportEvent,
-};
+};
+export const AegisW:any = new Proxy(internalState, handler);
+// init
+function init() {
+  console.log("initing...385");
+
+  // set report func
+  AegisW.reportEvent = function () {
+    console.log("args", arguments);
+
+    // normal report
+    if (serviceAegis !== undefined) {
+      serviceAegis.reportEvent(arguments[0]);
+    }
+
+    // proxy report
+    if (defaultAegis !== undefined) {
+      if (!internalState.ready) {
+        console.error("aegis is not ready!");
+        return;
+      }
+      // check params
+      if (
+        typeof arguments[0] !== "object" &&
+        typeof arguments[0] !== "string"
+      ) {
+        console.error("invalid params!");
+        return;
+      }
+      if (typeof arguments[0] === "object" && arguments[0].name === undefined) {
+        console.error("invalid name field!");
+        return;
+      }
+
+      // build params string and report
+      arguments[0].ext1 = buildReportStr(arguments[0], false);
+      defaultAegis.reportEvent(arguments[0]);
+    }
+  };
+}
+// init report wrapper
+if (document?.readyState === "loading") {
+  console.log('document.readyState === "loading"431');
+  // add event listener for report wrapper
+  document.addEventListener("DOMContentLoaded", init);
+} else {
+  console.log('init()434');
+  // init report wrapper
+  init();
+}