@be-link/cls-logger 1.0.1-beta.9 → 1.0.3

package/dist/index.js

@@ -562,6 +562,19 @@ function getPagePath$1() {
         return '';
     }
 }
+function getMpPagePath() {
+    try {
+        const pages = globalThis.getCurrentPages?.();
+        if (Array.isArray(pages) && pages.length > 0) {
+            const page = pages[pages.length - 1];
+            return page.route || page.__route__ || '';
+        }
+        return '';
+    }
+    catch {
+        return '';
+    }
+}
 function normalizeErrorLike(err, maxTextLength) {
     if (err && typeof err === 'object') {
         const anyErr = err;
@@ -721,6 +734,7 @@ function installMiniProgramErrorMonitor(report, options) {
                         return;
                     const e = normalizeErrorLike(msg, options.maxTextLength);
                     const payload = {
+                        pagePath: getMpPagePath(),
                         source: 'wx.onError',
                         message: e.message,
                         errorName: e.name,
@@ -747,6 +761,7 @@ function installMiniProgramErrorMonitor(report, options) {
                         return;
                     const e = normalizeErrorLike(res?.reason, options.maxTextLength);
                     const payload = {
+                        pagePath: getMpPagePath(),
                         source: 'wx.onUnhandledRejection',
                         message: e.message,
                         errorName: e.name,
@@ -778,6 +793,7 @@ function installMiniProgramErrorMonitor(report, options) {
                         if (sampleHit$1(options.sampleRate)) {
                             const e = normalizeErrorLike(args?.[0], options.maxTextLength);
                             const payload = {
+                                pagePath: getMpPagePath(),
                                 source: 'App.onError',
                                 message: e.message,
                                 errorName: e.name,
@@ -801,6 +817,7 @@ function installMiniProgramErrorMonitor(report, options) {
                             const reason = args?.[0]?.reason ?? args?.[0];
                             const e = normalizeErrorLike(reason, options.maxTextLength);
                             const payload = {
+                                pagePath: getMpPagePath(),
                                 source: 'App.onUnhandledRejection',
                                 message: e.message,
                                 errorName: e.name,
@@ -1108,18 +1125,28 @@ function installMiniProgramPerformanceMonitor(report, options) {
                         continue;
                     // Page Render: firstRender
                     if (entry.entryType === 'render' && entry.name === 'firstRender') {
+                        const duration = typeof entry.duration === 'number'
+                            ? entry.duration
+                            : typeof entry.startTime === 'number' && typeof entry.endTime === 'number'
+                                ? entry.endTime - entry.startTime
+                                : 0;
                         report(options.reportType, {
                             metric: 'page-render',
-                            duration: entry.duration,
+                            duration,
                             pagePath: entry.path || '',
                             unit: 'ms',
                         });
                     }
                     // Route Switch: route
                     else if (entry.entryType === 'navigation' && entry.name === 'route') {
+                        const duration = typeof entry.duration === 'number'
+                            ? entry.duration
+                            : typeof entry.startTime === 'number' && typeof entry.endTime === 'number'
+                                ? entry.endTime - entry.startTime
+                                : 0;
                         report(options.reportType, {
                             metric: 'route',
-                            duration: entry.duration,
+                            duration,
                             pagePath: entry.path || '',
                             unit: 'ms',
                         });
@@ -1463,7 +1490,7 @@ function installBehaviorMonitor(report, envType, options = {}) {
             const tag = (el.tagName || '').toLowerCase();
             const trackId = getAttr(el, clickTrackIdAttr);
             // 过滤无效点击：白名单 tag + 没有 trackId
-            if (clickWhiteList.includes(tag) && !trackId)
+            if (clickWhiteList.includes(tag) || !trackId)
                 return;
             void uvStatePromise.then(({ uvId, meta }) => {
                 if (destroyed)
@@ -1504,8 +1531,12 @@ function installBehaviorMonitor(report, envType, options = {}) {
                 g.Page = function patchedPage(conf) {
                     const originalOnShow = conf?.onShow;
                     conf.onShow = function (...args) {
-                        if (pvEnabled)
-                            reportPv(getPagePath());
+                        if (pvEnabled) {
+                            const pagePath = getPagePath();
+                            if (pagePath?.length > 0) {
+                                reportPv(pagePath);
+                            }
+                        }
                         return typeof originalOnShow === 'function' ? originalOnShow.apply(this, args) : undefined;
                     };
                     // 点击：wrap 页面 methods（bindtap 等会调用到这里的 handler）
@@ -1889,9 +1920,14 @@ class ClsLoggerCore {
      * 子类可按需重写（默认检测 wx）
      */
     detectEnvType() {
-        const wxAny = globalThis.wx;
-        if (wxAny && typeof wxAny.getSystemInfoSync === 'function')
+        const g = globalThis;
+        // 微信、支付宝、字节跳动、UniApp 等小程序环境通常都有特定全局变量
+        if ((g.wx && typeof g.wx.getSystemInfoSync === 'function') ||
+            (g.my && typeof g.my.getSystemInfoSync === 'function') ||
+            (g.tt && typeof g.tt.getSystemInfoSync === 'function') ||
+            (g.uni && typeof g.uni.getSystemInfoSync === 'function')) {
             return 'miniprogram';
+        }
         return 'browser';
     }
     init(options) {
@@ -2264,15 +2300,57 @@ class ClsLoggerCore {
         return nowTs + this.batchIntervalMs;
     }
     info(message, data = {}) {
-        const payload = normalizeFlatFields({ message, ...data }, 'info');
+        let msg = '';
+        let extra = {};
+        if (message instanceof Error) {
+            msg = message.message;
+            extra = {
+                stack: message.stack,
+                name: message.name,
+                ...data,
+            };
+        }
+        else {
+            msg = String(message);
+            extra = data;
+        }
+        const payload = normalizeFlatFields({ message: msg, ...extra }, 'info');
         this.report({ type: 'info', data: payload, timestamp: Date.now() });
     }
     warn(message, data = {}) {
-        const payload = normalizeFlatFields({ message, ...data }, 'warn');
+        let msg = '';
+        let extra = {};
+        if (message instanceof Error) {
+            msg = message.message;
+            extra = {
+                stack: message.stack,
+                name: message.name,
+                ...data,
+            };
+        }
+        else {
+            msg = String(message);
+            extra = data;
+        }
+        const payload = normalizeFlatFields({ message: msg, ...extra }, 'warn');
         this.report({ type: 'warn', data: payload, timestamp: Date.now() });
     }
     error(message, data = {}) {
-        const payload = normalizeFlatFields({ message, ...data }, 'error');
+        let msg = '';
+        let extra = {};
+        if (message instanceof Error) {
+            msg = message.message;
+            extra = {
+                stack: message.stack,
+                name: message.name,
+                ...data,
+            };
+        }
+        else {
+            msg = String(message);
+            extra = data;
+        }
+        const payload = normalizeFlatFields({ message: msg, ...extra }, 'error');
         this.report({ type: 'error', data: payload, timestamp: Date.now() });
     }
     track(trackType, data = {}) {
@@ -2494,38 +2572,78 @@ class ClsLogger extends ClsLoggerCore {
             }
         }
         const isMini = this.envType === 'miniprogram';
-        // 静态字面量，方便打包器识别（但在此兼容入口里，仍然可能被一起分析）
-        const WEB_SDK = 'tencentcloud-cls-sdk-js-web';
-        const MINI_SDK = 'tencentcloud-cls-sdk-js-mini';
-        // UMD（浏览器脚本）优先读全局变量
-        if (!isMini) {
+        // 3) 尝试 require / 全局变量
+        // Mini Program: 尝试直接 require
+        if (isMini) {
+            // 显式使用字面量 require，帮助打包工具识别依赖（尤其是 CJS 构建模式下）
+            try {
+                // eslint-disable-next-line @typescript-eslint/no-var-requires
+                const req = typeof require === 'function' ? require('tencentcloud-cls-sdk-js-mini') : null;
+                const reqSdk = normalizeSdk(req);
+                if (reqSdk) {
+                    this.sdk = reqSdk;
+                    return reqSdk;
+                }
+            }
+            catch {
+                // ignore
+            }
+            // 尝试使用 tryRequire（作为补充）
+            const reqMod = tryRequire('tencentcloud-cls-sdk-js-mini');
+            const reqSdk = normalizeSdk(reqMod);
+            if (reqSdk) {
+                this.sdk = reqSdk;
+                return reqSdk;
+            }
+        }
+        else {
+            // Web: 优先读全局变量 (UMD)
             const g = readGlobal('tencentcloudClsSdkJsWeb');
             const sdk = normalizeSdk(g);
             if (sdk) {
                 this.sdk = sdk;
                 return sdk;
             }
+            // Web: 尝试 require
+            const reqMod = tryRequire('tencentcloud-cls-sdk-js-web');
+            const reqSdk = normalizeSdk(reqMod);
+            if (reqSdk) {
+                this.sdk = reqSdk;
+                return reqSdk;
+            }
+        }
+        // 4) 动态 import
+        // 使用字符串字面量，确保 Bundler 能正确识别并进行 Code Splitting
+        if (isMini) {
+            this.sdkPromise = import('tencentcloud-cls-sdk-js-mini')
+                .then((m) => {
+                const sdk = normalizeSdk(m);
+                if (!sdk)
+                    throw new Error(`ClsLogger.loadSdk: invalid sdk module for mini`);
+                this.sdk = sdk;
+                return sdk;
+            })
+                .catch((err) => {
+                this.sdkPromise = null;
+                console.error('[ClsLogger] Failed to load mini sdk:', err);
+                throw err;
+            });
+        }
+        else {
+            this.sdkPromise = import('tencentcloud-cls-sdk-js-web')
+                .then((m) => {
+                const sdk = normalizeSdk(m);
+                if (!sdk)
+                    throw new Error(`ClsLogger.loadSdk: invalid sdk module for web`);
+                this.sdk = sdk;
+                return sdk;
+            })
+                .catch((err) => {
+                this.sdkPromise = null;
+                console.error('[ClsLogger] Failed to load web sdk:', err);
+                throw err;
+            });
         }
-        // 尽量同步 require
-        const reqMod = tryRequire(isMini ? MINI_SDK : WEB_SDK);
-        const reqSdk = normalizeSdk(reqMod);
-        if (reqSdk) {
-            this.sdk = reqSdk;
-            return reqSdk;
-        }
-        // 动态 import
-        this.sdkPromise = (isMini ? import(MINI_SDK) : import(WEB_SDK))
-            .then((m) => {
-            const sdk = normalizeSdk(m);
-            if (!sdk)
-                throw new Error(`ClsLogger.loadSdk: invalid sdk module for ${isMini ? MINI_SDK : WEB_SDK}`);
-            this.sdk = sdk;
-            return sdk;
-        })
-            .catch((err) => {
-            this.sdkPromise = null;
-            throw err;
-        });
         return this.sdkPromise;
     }
 }

package/dist/index.umd.js

@@ -564,6 +564,19 @@
             return '';
         }
     }
+    function getMpPagePath() {
+        try {
+            const pages = globalThis.getCurrentPages?.();
+            if (Array.isArray(pages) && pages.length > 0) {
+                const page = pages[pages.length - 1];
+                return page.route || page.__route__ || '';
+            }
+            return '';
+        }
+        catch {
+            return '';
+        }
+    }
     function normalizeErrorLike(err, maxTextLength) {
         if (err && typeof err === 'object') {
             const anyErr = err;
@@ -723,6 +736,7 @@
                             return;
                         const e = normalizeErrorLike(msg, options.maxTextLength);
                         const payload = {
+                            pagePath: getMpPagePath(),
                             source: 'wx.onError',
                             message: e.message,
                             errorName: e.name,
@@ -749,6 +763,7 @@
                             return;
                         const e = normalizeErrorLike(res?.reason, options.maxTextLength);
                         const payload = {
+                            pagePath: getMpPagePath(),
                             source: 'wx.onUnhandledRejection',
                             message: e.message,
                             errorName: e.name,
@@ -780,6 +795,7 @@
                             if (sampleHit$1(options.sampleRate)) {
                                 const e = normalizeErrorLike(args?.[0], options.maxTextLength);
                                 const payload = {
+                                    pagePath: getMpPagePath(),
                                     source: 'App.onError',
                                     message: e.message,
                                     errorName: e.name,
@@ -803,6 +819,7 @@
                                 const reason = args?.[0]?.reason ?? args?.[0];
                                 const e = normalizeErrorLike(reason, options.maxTextLength);
                                 const payload = {
+                                    pagePath: getMpPagePath(),
                                     source: 'App.onUnhandledRejection',
                                     message: e.message,
                                     errorName: e.name,
@@ -1110,18 +1127,28 @@
                             continue;
                         // Page Render: firstRender
                         if (entry.entryType === 'render' && entry.name === 'firstRender') {
+                            const duration = typeof entry.duration === 'number'
+                                ? entry.duration
+                                : typeof entry.startTime === 'number' && typeof entry.endTime === 'number'
+                                    ? entry.endTime - entry.startTime
+                                    : 0;
                             report(options.reportType, {
                                 metric: 'page-render',
-                                duration: entry.duration,
+                                duration,
                                 pagePath: entry.path || '',
                                 unit: 'ms',
                             });
                         }
                         // Route Switch: route
                         else if (entry.entryType === 'navigation' && entry.name === 'route') {
+                            const duration = typeof entry.duration === 'number'
+                                ? entry.duration
+                                : typeof entry.startTime === 'number' && typeof entry.endTime === 'number'
+                                    ? entry.endTime - entry.startTime
+                                    : 0;
                             report(options.reportType, {
                                 metric: 'route',
-                                duration: entry.duration,
+                                duration,
                                 pagePath: entry.path || '',
                                 unit: 'ms',
                             });
@@ -1465,7 +1492,7 @@
                 const tag = (el.tagName || '').toLowerCase();
                 const trackId = getAttr(el, clickTrackIdAttr);
                 // 过滤无效点击：白名单 tag + 没有 trackId
-                if (clickWhiteList.includes(tag) && !trackId)
+                if (clickWhiteList.includes(tag) || !trackId)
                     return;
                 void uvStatePromise.then(({ uvId, meta }) => {
                     if (destroyed)
@@ -1506,8 +1533,12 @@
                     g.Page = function patchedPage(conf) {
                         const originalOnShow = conf?.onShow;
                         conf.onShow = function (...args) {
-                            if (pvEnabled)
-                                reportPv(getPagePath());
+                            if (pvEnabled) {
+                                const pagePath = getPagePath();
+                                if (pagePath?.length > 0) {
+                                    reportPv(pagePath);
+                                }
+                            }
                             return typeof originalOnShow === 'function' ? originalOnShow.apply(this, args) : undefined;
                         };
                         // 点击：wrap 页面 methods（bindtap 等会调用到这里的 handler）
@@ -1891,9 +1922,14 @@
          * 子类可按需重写（默认检测 wx）
          */
         detectEnvType() {
-            const wxAny = globalThis.wx;
-            if (wxAny && typeof wxAny.getSystemInfoSync === 'function')
+            const g = globalThis;
+            // 微信、支付宝、字节跳动、UniApp 等小程序环境通常都有特定全局变量
+            if ((g.wx && typeof g.wx.getSystemInfoSync === 'function') ||
+                (g.my && typeof g.my.getSystemInfoSync === 'function') ||
+                (g.tt && typeof g.tt.getSystemInfoSync === 'function') ||
+                (g.uni && typeof g.uni.getSystemInfoSync === 'function')) {
                 return 'miniprogram';
+            }
             return 'browser';
         }
         init(options) {
@@ -2266,15 +2302,57 @@
             return nowTs + this.batchIntervalMs;
         }
         info(message, data = {}) {
-            const payload = normalizeFlatFields({ message, ...data }, 'info');
+            let msg = '';
+            let extra = {};
+            if (message instanceof Error) {
+                msg = message.message;
+                extra = {
+                    stack: message.stack,
+                    name: message.name,
+                    ...data,
+                };
+            }
+            else {
+                msg = String(message);
+                extra = data;
+            }
+            const payload = normalizeFlatFields({ message: msg, ...extra }, 'info');
             this.report({ type: 'info', data: payload, timestamp: Date.now() });
         }
         warn(message, data = {}) {
-            const payload = normalizeFlatFields({ message, ...data }, 'warn');
+            let msg = '';
+            let extra = {};
+            if (message instanceof Error) {
+                msg = message.message;
+                extra = {
+                    stack: message.stack,
+                    name: message.name,
+                    ...data,
+                };
+            }
+            else {
+                msg = String(message);
+                extra = data;
+            }
+            const payload = normalizeFlatFields({ message: msg, ...extra }, 'warn');
             this.report({ type: 'warn', data: payload, timestamp: Date.now() });
         }
         error(message, data = {}) {
-            const payload = normalizeFlatFields({ message, ...data }, 'error');
+            let msg = '';
+            let extra = {};
+            if (message instanceof Error) {
+                msg = message.message;
+                extra = {
+                    stack: message.stack,
+                    name: message.name,
+                    ...data,
+                };
+            }
+            else {
+                msg = String(message);
+                extra = data;
+            }
+            const payload = normalizeFlatFields({ message: msg, ...extra }, 'error');
             this.report({ type: 'error', data: payload, timestamp: Date.now() });
         }
         track(trackType, data = {}) {
@@ -2496,38 +2574,78 @@
                 }
             }
             const isMini = this.envType === 'miniprogram';
-            // 静态字面量，方便打包器识别（但在此兼容入口里，仍然可能被一起分析）
-            const WEB_SDK = 'tencentcloud-cls-sdk-js-web';
-            const MINI_SDK = 'tencentcloud-cls-sdk-js-mini';
-            // UMD（浏览器脚本）优先读全局变量
-            if (!isMini) {
+            // 3) 尝试 require / 全局变量
+            // Mini Program: 尝试直接 require
+            if (isMini) {
+                // 显式使用字面量 require，帮助打包工具识别依赖（尤其是 CJS 构建模式下）
+                try {
+                    // eslint-disable-next-line @typescript-eslint/no-var-requires
+                    const req = typeof require === 'function' ? require('tencentcloud-cls-sdk-js-mini') : null;
+                    const reqSdk = normalizeSdk(req);
+                    if (reqSdk) {
+                        this.sdk = reqSdk;
+                        return reqSdk;
+                    }
+                }
+                catch {
+                    // ignore
+                }
+                // 尝试使用 tryRequire（作为补充）
+                const reqMod = tryRequire('tencentcloud-cls-sdk-js-mini');
+                const reqSdk = normalizeSdk(reqMod);
+                if (reqSdk) {
+                    this.sdk = reqSdk;
+                    return reqSdk;
+                }
+            }
+            else {
+                // Web: 优先读全局变量 (UMD)
                 const g = readGlobal('tencentcloudClsSdkJsWeb');
                 const sdk = normalizeSdk(g);
                 if (sdk) {
                     this.sdk = sdk;
                     return sdk;
                 }
+                // Web: 尝试 require
+                const reqMod = tryRequire('tencentcloud-cls-sdk-js-web');
+                const reqSdk = normalizeSdk(reqMod);
+                if (reqSdk) {
+                    this.sdk = reqSdk;
+                    return reqSdk;
+                }
+            }
+            // 4) 动态 import
+            // 使用字符串字面量，确保 Bundler 能正确识别并进行 Code Splitting
+            if (isMini) {
+                this.sdkPromise = import('tencentcloud-cls-sdk-js-mini')
+                    .then((m) => {
+                    const sdk = normalizeSdk(m);
+                    if (!sdk)
+                        throw new Error(`ClsLogger.loadSdk: invalid sdk module for mini`);
+                    this.sdk = sdk;
+                    return sdk;
+                })
+                    .catch((err) => {
+                    this.sdkPromise = null;
+                    console.error('[ClsLogger] Failed to load mini sdk:', err);
+                    throw err;
+                });
+            }
+            else {
+                this.sdkPromise = import('tencentcloud-cls-sdk-js-web')
+                    .then((m) => {
+                    const sdk = normalizeSdk(m);
+                    if (!sdk)
+                        throw new Error(`ClsLogger.loadSdk: invalid sdk module for web`);
+                    this.sdk = sdk;
+                    return sdk;
+                })
+                    .catch((err) => {
+                    this.sdkPromise = null;
+                    console.error('[ClsLogger] Failed to load web sdk:', err);
+                    throw err;
+                });
             }
-            // 尽量同步 require
-            const reqMod = tryRequire(isMini ? MINI_SDK : WEB_SDK);
-            const reqSdk = normalizeSdk(reqMod);
-            if (reqSdk) {
-                this.sdk = reqSdk;
-                return reqSdk;
-            }
-            // 动态 import
-            this.sdkPromise = (isMini ? import(MINI_SDK) : import(WEB_SDK))
-                .then((m) => {
-                const sdk = normalizeSdk(m);
-                if (!sdk)
-                    throw new Error(`ClsLogger.loadSdk: invalid sdk module for ${isMini ? MINI_SDK : WEB_SDK}`);
-                this.sdk = sdk;
-                return sdk;
-            })
-                .catch((err) => {
-                this.sdkPromise = null;
-                throw err;
-            });
             return this.sdkPromise;
         }
     }