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

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,
@@ -1090,140 +1107,68 @@
             }
         }
     }
-    function wrapMiniProgramRouteApi(report, reportType, apiName, options) {
-        const wxAny = globalThis.wx;
-        if (!wxAny || typeof wxAny[apiName] !== 'function')
-            return;
-        const flagKey = `__beLinkClsLoggerMpRouteWrapped__${apiName}`;
-        if (wxAny[flagKey])
-            return;
-        wxAny[flagKey] = true;
-        const raw = wxAny[apiName].bind(wxAny);
-        wxAny[apiName] = (opts) => {
-            const start = Date.now();
-            const url = opts?.url ? String(opts.url) : '';
-            const wrapCb = (cb, success) => {
-                return (...args) => {
-                    try {
-                        if (sampleHit(options.sampleRate)) {
-                            report(reportType, {
-                                metric: 'route',
-                                api: apiName,
-                                url,
-                                duration: Date.now() - start,
-                                success: success ? 1 : 0,
-                                error: success ? '' : truncate$1(stringifyLogValue(args?.[0]), options.maxTextLength),
-                                unit: 'ms',
-                            });
-                        }
-                    }
-                    catch {
-                        // ignore
-                    }
-                    if (typeof cb === 'function')
-                        return cb(...args);
-                    return undefined;
-                };
-            };
-            const next = { ...(opts ?? {}) };
-            next.success = wrapCb(next.success, true);
-            next.fail = wrapCb(next.fail, false);
-            return raw(next);
-        };
-    }
-    function installMiniProgramPageRenderMonitor(report, reportType, options) {
-        const g = globalThis;
-        if (typeof g.Page !== 'function')
-            return;
-        if (g.__beLinkClsLoggerPageWrapped__)
-            return;
-        g.__beLinkClsLoggerPageWrapped__ = true;
-        const rawPage = g.Page;
-        g.Page = (pageOptions) => {
-            const next = { ...(pageOptions ?? {}) };
-            const rawOnLoad = next.onLoad;
-            const rawOnReady = next.onReady;
-            next.onLoad = function (...args) {
-                try {
-                    this.__beLinkClsLoggerPageLoadTs__ = Date.now();
-                }
-                catch {
-                    // ignore
-                }
-                if (typeof rawOnLoad === 'function')
-                    return rawOnLoad.apply(this, args);
-                return undefined;
-            };
-            next.onReady = function (...args) {
-                try {
-                    const start = this.__beLinkClsLoggerPageLoadTs__;
-                    if (typeof start === 'number' && sampleHit(options.sampleRate)) {
-                        report(reportType, {
-                            metric: 'page-render',
-                            route: this?.route ? String(this.route) : '',
-                            duration: Date.now() - start,
-                            unit: 'ms',
-                        });
-                    }
-                }
-                catch {
-                    // ignore
-                }
-                if (typeof rawOnReady === 'function')
-                    return rawOnReady.apply(this, args);
-                return undefined;
-            };
-            return rawPage(next);
-        };
-    }
     function installMiniProgramPerformanceMonitor(report, options) {
         const g = globalThis;
+        const ctx = g.wx || g.Taro;
+        if (!ctx || typeof ctx.getPerformance !== 'function')
+            return;
         if (g.__beLinkClsLoggerMpPerfInstalled__)
             return;
         g.__beLinkClsLoggerMpPerfInstalled__ = true;
-        // 路由切换耗时（用 API 回调近似）
-        for (const apiName of ['navigateTo', 'redirectTo', 'switchTab', 'reLaunch']) {
-            try {
-                wrapMiniProgramRouteApi(report, options.reportType, apiName, options);
-            }
-            catch {
-                // ignore
-            }
-        }
-        // 页面渲染耗时（onLoad -> onReady）
         try {
-            installMiniProgramPageRenderMonitor(report, options.reportType, options);
-        }
-        catch {
-            // ignore
-        }
-        // wx.getPerformance()（若可用，尝试读取已有 entries）
-        try {
-            const wxAny = globalThis.wx;
-            if (wxAny && typeof wxAny.getPerformance === 'function') {
-                const perf = wxAny.getPerformance();
-                if (perf && isPlainObject(perf)) {
-                    // 不同基础库实现差异较大：尽量容错
-                    setTimeout(() => {
-                        try {
-                            if (!sampleHit(options.sampleRate))
-                                return;
-                            const entries = typeof perf.getEntries === 'function'
-                                ? perf.getEntries()
-                                : typeof perf.getEntriesByType === 'function'
-                                    ? perf.getEntriesByType('navigation')
-                                    : [];
+            const perf = ctx.getPerformance();
+            if (!perf || typeof perf.createObserver !== 'function')
+                return;
+            const observer = perf.createObserver((entryList) => {
+                try {
+                    const entries = entryList.getEntries();
+                    for (const entry of entries) {
+                        if (!sampleHit(options.sampleRate))
+                            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: 'mp-performance',
-                                entries: truncate$1(stringifyLogValue(entries), options.maxTextLength),
+                                metric: 'page-render',
+                                duration,
+                                pagePath: entry.path || '',
+                                unit: 'ms',
                             });
                         }
-                        catch {
-                            // ignore
+                        // 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,
+                                pagePath: entry.path || '',
+                                unit: 'ms',
+                            });
                         }
-                    }, 0);
+                        // App Launch: appLaunch (Cold)
+                        else if (entry.entryType === 'navigation' && entry.name === 'appLaunch') {
+                            report(options.reportType, {
+                                metric: 'app-launch',
+                                duration: entry.duration,
+                                launchType: 'cold',
+                                unit: 'ms',
+                            });
+                        }
+                    }
                 }
-            }
+                catch {
+                    // ignore
+                }
+            });
+            observer.observe({ entryTypes: ['navigation', 'render'] });
         }
         catch {
             // ignore
@@ -1547,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)
@@ -1588,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）
@@ -1973,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) {
@@ -2348,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 = {}) {
@@ -2578,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;
         }
     }