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

package/dist/index.umd.js

@@ -567,7 +567,17 @@
     function normalizeErrorLike(err, maxTextLength) {
         if (err && typeof err === 'object') {
             const anyErr = err;
-            const message = truncate$2(String(anyErr.message ?? anyErr.toString?.() ?? ''), maxTextLength);
+            let rawMsg = anyErr.message;
+            if (!rawMsg) {
+                const str = anyErr.toString?.();
+                if (!str || str === '[object Object]') {
+                    rawMsg = stringifyLogValue(anyErr);
+                }
+                else {
+                    rawMsg = str;
+                }
+            }
+            const message = truncate$2(String(rawMsg ?? ''), maxTextLength);
             const name = truncate$2(String(anyErr.name ?? ''), 200);
             const stack = truncate$2(String(anyErr.stack ?? ''), maxTextLength);
             return { message, name, stack };
@@ -711,9 +721,12 @@
                     try {
                         if (!sampleHit$1(options.sampleRate))
                             return;
+                        const e = normalizeErrorLike(msg, options.maxTextLength);
                         const payload = {
                             source: 'wx.onError',
-                            message: truncate$2(String(msg ?? ''), options.maxTextLength),
+                            message: e.message,
+                            errorName: e.name,
+                            stack: e.stack,
                         };
                         if (!shouldReport(buildErrorKey(options.reportType, payload)))
                             return;
@@ -765,9 +778,12 @@
                     next.onError = function (...args) {
                         try {
                             if (sampleHit$1(options.sampleRate)) {
+                                const e = normalizeErrorLike(args?.[0], options.maxTextLength);
                                 const payload = {
                                     source: 'App.onError',
-                                    message: truncate$2(String(args?.[0] ?? ''), options.maxTextLength),
+                                    message: e.message,
+                                    errorName: e.name,
+                                    stack: e.stack,
                                 };
                                 if (shouldReport(buildErrorKey(options.reportType, payload)))
                                     report(options.reportType, payload);
@@ -1074,140 +1090,58 @@
             }
         }
     }
-    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') {
                             report(options.reportType, {
-                                metric: 'mp-performance',
-                                entries: truncate$1(stringifyLogValue(entries), options.maxTextLength),
+                                metric: 'page-render',
+                                duration: entry.duration,
+                                pagePath: entry.path || '',
+                                unit: 'ms',
                             });
                         }
-                        catch {
-                            // ignore
+                        // Route Switch: route
+                        else if (entry.entryType === 'navigation' && entry.name === 'route') {
+                            report(options.reportType, {
+                                metric: 'route',
+                                duration: entry.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
@@ -2037,7 +1971,7 @@
             try {
                 const userRaw = this.userGenerateBaseFields ? this.userGenerateBaseFields() : undefined;
                 if (userRaw && isPlainObject(userRaw))
-                    user = normalizeFlatFields({ ...userRaw, userId: this.userId, userName: this.userName }, 'generateBaseFields');
+                    user = normalizeFlatFields({ ...userRaw }, 'generateBaseFields');
             }
             catch {
                 user = undefined;

package/dist/mini.esm.js

@@ -563,7 +563,17 @@ function getPagePath$1() {
 function normalizeErrorLike(err, maxTextLength) {
     if (err && typeof err === 'object') {
         const anyErr = err;
-        const message = truncate$2(String(anyErr.message ?? anyErr.toString?.() ?? ''), maxTextLength);
+        let rawMsg = anyErr.message;
+        if (!rawMsg) {
+            const str = anyErr.toString?.();
+            if (!str || str === '[object Object]') {
+                rawMsg = stringifyLogValue(anyErr);
+            }
+            else {
+                rawMsg = str;
+            }
+        }
+        const message = truncate$2(String(rawMsg ?? ''), maxTextLength);
         const name = truncate$2(String(anyErr.name ?? ''), 200);
         const stack = truncate$2(String(anyErr.stack ?? ''), maxTextLength);
         return { message, name, stack };
@@ -707,9 +717,12 @@ function installMiniProgramErrorMonitor(report, options) {
                 try {
                     if (!sampleHit$1(options.sampleRate))
                         return;
+                    const e = normalizeErrorLike(msg, options.maxTextLength);
                     const payload = {
                         source: 'wx.onError',
-                        message: truncate$2(String(msg ?? ''), options.maxTextLength),
+                        message: e.message,
+                        errorName: e.name,
+                        stack: e.stack,
                     };
                     if (!shouldReport(buildErrorKey(options.reportType, payload)))
                         return;
@@ -761,9 +774,12 @@ function installMiniProgramErrorMonitor(report, options) {
                 next.onError = function (...args) {
                     try {
                         if (sampleHit$1(options.sampleRate)) {
+                            const e = normalizeErrorLike(args?.[0], options.maxTextLength);
                             const payload = {
                                 source: 'App.onError',
-                                message: truncate$2(String(args?.[0] ?? ''), options.maxTextLength),
+                                message: e.message,
+                                errorName: e.name,
+                                stack: e.stack,
                             };
                             if (shouldReport(buildErrorKey(options.reportType, payload)))
                                 report(options.reportType, payload);
@@ -1070,140 +1086,58 @@ function installBrowserPerformanceMonitor(report, options) {
         }
     }
 }
-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') {
                         report(options.reportType, {
-                            metric: 'mp-performance',
-                            entries: truncate$1(stringifyLogValue(entries), options.maxTextLength),
+                            metric: 'page-render',
+                            duration: entry.duration,
+                            pagePath: entry.path || '',
+                            unit: 'ms',
                         });
                     }
-                    catch {
-                        // ignore
+                    // Route Switch: route
+                    else if (entry.entryType === 'navigation' && entry.name === 'route') {
+                        report(options.reportType, {
+                            metric: 'route',
+                            duration: entry.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
@@ -2033,7 +1967,7 @@ class ClsLoggerCore {
         try {
             const userRaw = this.userGenerateBaseFields ? this.userGenerateBaseFields() : undefined;
             if (userRaw && isPlainObject(userRaw))
-                user = normalizeFlatFields({ ...userRaw, userId: this.userId, userName: this.userName }, 'generateBaseFields');
+                user = normalizeFlatFields({ ...userRaw }, 'generateBaseFields');
         }
         catch {
             user = undefined;