@be-link/cls-logger 1.0.1-beta.5 → 1.0.1-beta.6

package/dist/index.js

@@ -1898,27 +1898,6 @@ function createAutoDeviceInfoBaseFields(envType, opts) {
     };
 }
 
-function readGlobal(key) {
-    try {
-        const g = globalThis;
-        return g[key] ?? null;
-    }
-    catch {
-        return null;
-    }
-}
-function tryRequire(moduleName) {
-    try {
-        // eslint-disable-next-line @typescript-eslint/no-implied-eval
-        const req = (typeof require === 'function' ? require : null);
-        if (!req)
-            return null;
-        return req(moduleName);
-    }
-    catch {
-        return null;
-    }
-}
 function enterClsSendingGuard() {
     const g = globalThis;
     const next = (g.__beLinkClsLoggerSendingCount__ ?? 0) + 1;
@@ -1928,10 +1907,18 @@ function enterClsSendingGuard() {
         g.__beLinkClsLoggerSendingCount__ = cur > 0 ? cur - 1 : 0;
     };
 }
-class ClsLogger {
+/**
+ * CLS Logger 核心基类
+ * - 负责所有上报、队列、监控逻辑
+ * - 不包含具体的 SDK 加载实现（由子类负责）
+ * - 这样可以把 web/mini 的 SDK 依赖彻底解耦到子入口
+ */
+class ClsLoggerCore {
     constructor() {
         this.sdk = null;
         this.sdkPromise = null;
+        this.sdkOverride = null;
+        this.sdkLoaderOverride = null;
         this.client = null;
         this.clientPromise = null;
         this.topicId = null;
@@ -1964,6 +1951,15 @@ class ClsLogger {
         this.behaviorMonitorStarted = false;
         this.behaviorMonitorCleanup = null;
     }
+    /**
+     * 子类可按需重写（默认检测 wx）
+     */
+    detectEnvType() {
+        const wxAny = globalThis.wx;
+        if (wxAny && typeof wxAny.getSystemInfoSync === 'function')
+            return 'miniprogram';
+        return 'browser';
+    }
     init(options) {
         this.initTs = Date.now();
         const topicId = options?.tencentCloud?.topicID ?? options?.topic_id ?? options?.topicID ?? this.topicId ?? null;
@@ -1999,6 +1995,9 @@ class ClsLogger {
         this.appId = options.appId ?? this.appId;
         this.appVersion = options.appVersion ?? this.appVersion;
         this.envType = nextEnvType;
+        // 可选：外部注入 SDK（优先级：sdkLoader > sdk）
+        this.sdkLoaderOverride = options.sdkLoader ?? this.sdkLoaderOverride;
+        this.sdkOverride = options.sdk ?? this.sdkOverride;
         this.userGenerateBaseFields = options.generateBaseFields ?? this.userGenerateBaseFields;
         this.autoGenerateBaseFields = createAutoDeviceInfoBaseFields(this.envType, options.deviceInfo);
         this.storageKey = options.storageKey ?? this.storageKey;
@@ -2117,8 +2116,6 @@ class ClsLogger {
     }
     /**
      * 获取 CLS client（按环境懒加载 SDK）
-     * - browser: 优先走 UMD 全局变量 `tencentcloudClsSdkJsWeb`
-     * - miniprogram: 优先走 require（webpack/taro 可解析），否则 fallback import()
      */
     async getInstance() {
         if (this.client)
@@ -2141,51 +2138,6 @@ class ClsLogger {
         });
         return this.clientPromise;
     }
-    async loadSdk() {
-        if (this.sdk)
-            return this.sdk;
-        if (this.sdkPromise)
-            return this.sdkPromise;
-        const isMini = this.envType === 'miniprogram';
-        const moduleName = isMini ? 'tencentcloud-cls-sdk-js-mini' : 'tencentcloud-cls-sdk-js-web';
-        // UMD（浏览器脚本）优先读全局变量
-        if (!isMini) {
-            const g = readGlobal('tencentcloudClsSdkJsWeb');
-            if (g?.AsyncClient && g?.Log && g?.LogGroup && g?.PutLogsRequest) {
-                this.sdk = g;
-                return this.sdk;
-            }
-        }
-        // 尽量同步 require（小程序/webpack 里最稳），失败再走 import()
-        const reqMod = tryRequire(moduleName);
-        if (reqMod?.AsyncClient && reqMod?.Log && reqMod?.LogGroup && reqMod?.PutLogsRequest) {
-            this.sdk = reqMod;
-            return this.sdk;
-        }
-        this.sdkPromise = import(moduleName)
-            .then((m) => {
-            const mod = (m?.default && m.default.AsyncClient ? m.default : m);
-            const sdk = {
-                AsyncClient: mod.AsyncClient,
-                Log: mod.Log,
-                LogGroup: mod.LogGroup,
-                PutLogsRequest: mod.PutLogsRequest,
-            };
-            this.sdk = sdk;
-            return sdk;
-        })
-            .catch((err) => {
-            this.sdkPromise = null;
-            throw err;
-        });
-        return this.sdkPromise;
-    }
-    detectEnvType() {
-        const wxAny = globalThis.wx;
-        if (wxAny && typeof wxAny.getSystemInfoSync === 'function')
-            return 'miniprogram';
-        return 'browser';
-    }
     /**
      * 直接上报：埋点入参必须是一维（扁平）Object
      * - 非原始值（对象/数组等）会被自动 stringify 成 string
@@ -2528,6 +2480,122 @@ class ClsLogger {
     }
 }
 
+function readGlobal(key) {
+    try {
+        const g = globalThis;
+        return g[key] ?? null;
+    }
+    catch {
+        return null;
+    }
+}
+function tryRequire(moduleName) {
+    try {
+        // 说明：
+        // - ESM 构建（exports.import/module）里通常不存在模块作用域的 require
+        // - 一些小程序运行时/构建链路会把 require 挂到 globalThis 上
+        // 因此这里同时探测“模块作用域 require”与 “globalThis.require”
+        // eslint-disable-next-line @typescript-eslint/no-implied-eval
+        const localReq = (typeof require === 'function' ? require : null);
+        const globalReq = readGlobal('require');
+        const candidates = [localReq, globalReq].filter((fn) => typeof fn === 'function');
+        for (const fn of candidates) {
+            try {
+                return fn(moduleName);
+            }
+            catch {
+                // continue
+            }
+        }
+        return null;
+    }
+    catch {
+        return null;
+    }
+}
+
+/**
+ * 兼容版 ClsLogger（默认入口）
+ * - 保留了自动识别环境 + 动态 import 的逻辑
+ * - 如果业务想瘦身，建议改用 @be-link/cls-logger/web 或 /mini
+ */
+class ClsLogger extends ClsLoggerCore {
+    async loadSdk() {
+        if (this.sdk)
+            return this.sdk;
+        if (this.sdkPromise)
+            return this.sdkPromise;
+        const normalizeSdk = (m) => {
+            const mod = (m?.default && m.default.AsyncClient ? m.default : m);
+            if (mod?.AsyncClient && mod?.Log && mod?.LogGroup && mod?.PutLogsRequest) {
+                return {
+                    AsyncClient: mod.AsyncClient,
+                    Log: mod.Log,
+                    LogGroup: mod.LogGroup,
+                    PutLogsRequest: mod.PutLogsRequest,
+                };
+            }
+            return null;
+        };
+        // 1) 外部注入的 loader（最高优先级）
+        if (this.sdkLoaderOverride) {
+            try {
+                const loaded = await this.sdkLoaderOverride();
+                const sdk = normalizeSdk(loaded);
+                if (sdk) {
+                    this.sdk = sdk;
+                    return sdk;
+                }
+            }
+            catch {
+                // ignore and fallback
+            }
+        }
+        // 2) 外部直接注入的 sdk
+        if (this.sdkOverride) {
+            const sdk = normalizeSdk(this.sdkOverride);
+            if (sdk) {
+                this.sdk = sdk;
+                return sdk;
+            }
+        }
+        const isMini = this.envType === 'miniprogram';
+        // 静态字面量，方便打包器识别（但在此兼容入口里，仍然可能被一起分析）
+        const WEB_SDK = 'tencentcloud-cls-sdk-js-web';
+        const MINI_SDK = 'tencentcloud-cls-sdk-js-mini';
+        // UMD（浏览器脚本）优先读全局变量
+        if (!isMini) {
+            const g = readGlobal('tencentcloudClsSdkJsWeb');
+            const sdk = normalizeSdk(g);
+            if (sdk) {
+                this.sdk = sdk;
+                return sdk;
+            }
+        }
+        // 尽量同步 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;
+    }
+}
+
 const clsLogger = new ClsLogger();
 
 exports.ClsLogger = ClsLogger;

package/dist/index.umd.js

@@ -1900,27 +1900,6 @@
         };
     }
 
-    function readGlobal(key) {
-        try {
-            const g = globalThis;
-            return g[key] ?? null;
-        }
-        catch {
-            return null;
-        }
-    }
-    function tryRequire(moduleName) {
-        try {
-            // eslint-disable-next-line @typescript-eslint/no-implied-eval
-            const req = (typeof require === 'function' ? require : null);
-            if (!req)
-                return null;
-            return req(moduleName);
-        }
-        catch {
-            return null;
-        }
-    }
     function enterClsSendingGuard() {
         const g = globalThis;
         const next = (g.__beLinkClsLoggerSendingCount__ ?? 0) + 1;
@@ -1930,10 +1909,18 @@
             g.__beLinkClsLoggerSendingCount__ = cur > 0 ? cur - 1 : 0;
         };
     }
-    class ClsLogger {
+    /**
+     * CLS Logger 核心基类
+     * - 负责所有上报、队列、监控逻辑
+     * - 不包含具体的 SDK 加载实现（由子类负责）
+     * - 这样可以把 web/mini 的 SDK 依赖彻底解耦到子入口
+     */
+    class ClsLoggerCore {
         constructor() {
             this.sdk = null;
             this.sdkPromise = null;
+            this.sdkOverride = null;
+            this.sdkLoaderOverride = null;
             this.client = null;
             this.clientPromise = null;
             this.topicId = null;
@@ -1966,6 +1953,15 @@
             this.behaviorMonitorStarted = false;
             this.behaviorMonitorCleanup = null;
         }
+        /**
+         * 子类可按需重写（默认检测 wx）
+         */
+        detectEnvType() {
+            const wxAny = globalThis.wx;
+            if (wxAny && typeof wxAny.getSystemInfoSync === 'function')
+                return 'miniprogram';
+            return 'browser';
+        }
         init(options) {
             this.initTs = Date.now();
             const topicId = options?.tencentCloud?.topicID ?? options?.topic_id ?? options?.topicID ?? this.topicId ?? null;
@@ -2001,6 +1997,9 @@
             this.appId = options.appId ?? this.appId;
             this.appVersion = options.appVersion ?? this.appVersion;
             this.envType = nextEnvType;
+            // 可选：外部注入 SDK（优先级：sdkLoader > sdk）
+            this.sdkLoaderOverride = options.sdkLoader ?? this.sdkLoaderOverride;
+            this.sdkOverride = options.sdk ?? this.sdkOverride;
             this.userGenerateBaseFields = options.generateBaseFields ?? this.userGenerateBaseFields;
             this.autoGenerateBaseFields = createAutoDeviceInfoBaseFields(this.envType, options.deviceInfo);
             this.storageKey = options.storageKey ?? this.storageKey;
@@ -2119,8 +2118,6 @@
         }
         /**
          * 获取 CLS client（按环境懒加载 SDK）
-         * - browser: 优先走 UMD 全局变量 `tencentcloudClsSdkJsWeb`
-         * - miniprogram: 优先走 require（webpack/taro 可解析），否则 fallback import()
          */
         async getInstance() {
             if (this.client)
@@ -2143,51 +2140,6 @@
             });
             return this.clientPromise;
         }
-        async loadSdk() {
-            if (this.sdk)
-                return this.sdk;
-            if (this.sdkPromise)
-                return this.sdkPromise;
-            const isMini = this.envType === 'miniprogram';
-            const moduleName = isMini ? 'tencentcloud-cls-sdk-js-mini' : 'tencentcloud-cls-sdk-js-web';
-            // UMD（浏览器脚本）优先读全局变量
-            if (!isMini) {
-                const g = readGlobal('tencentcloudClsSdkJsWeb');
-                if (g?.AsyncClient && g?.Log && g?.LogGroup && g?.PutLogsRequest) {
-                    this.sdk = g;
-                    return this.sdk;
-                }
-            }
-            // 尽量同步 require（小程序/webpack 里最稳），失败再走 import()
-            const reqMod = tryRequire(moduleName);
-            if (reqMod?.AsyncClient && reqMod?.Log && reqMod?.LogGroup && reqMod?.PutLogsRequest) {
-                this.sdk = reqMod;
-                return this.sdk;
-            }
-            this.sdkPromise = import(moduleName)
-                .then((m) => {
-                const mod = (m?.default && m.default.AsyncClient ? m.default : m);
-                const sdk = {
-                    AsyncClient: mod.AsyncClient,
-                    Log: mod.Log,
-                    LogGroup: mod.LogGroup,
-                    PutLogsRequest: mod.PutLogsRequest,
-                };
-                this.sdk = sdk;
-                return sdk;
-            })
-                .catch((err) => {
-                this.sdkPromise = null;
-                throw err;
-            });
-            return this.sdkPromise;
-        }
-        detectEnvType() {
-            const wxAny = globalThis.wx;
-            if (wxAny && typeof wxAny.getSystemInfoSync === 'function')
-                return 'miniprogram';
-            return 'browser';
-        }
         /**
          * 直接上报：埋点入参必须是一维（扁平）Object
          * - 非原始值（对象/数组等）会被自动 stringify 成 string
@@ -2530,6 +2482,122 @@
         }
     }
 
+    function readGlobal(key) {
+        try {
+            const g = globalThis;
+            return g[key] ?? null;
+        }
+        catch {
+            return null;
+        }
+    }
+    function tryRequire(moduleName) {
+        try {
+            // 说明：
+            // - ESM 构建（exports.import/module）里通常不存在模块作用域的 require
+            // - 一些小程序运行时/构建链路会把 require 挂到 globalThis 上
+            // 因此这里同时探测“模块作用域 require”与 “globalThis.require”
+            // eslint-disable-next-line @typescript-eslint/no-implied-eval
+            const localReq = (typeof require === 'function' ? require : null);
+            const globalReq = readGlobal('require');
+            const candidates = [localReq, globalReq].filter((fn) => typeof fn === 'function');
+            for (const fn of candidates) {
+                try {
+                    return fn(moduleName);
+                }
+                catch {
+                    // continue
+                }
+            }
+            return null;
+        }
+        catch {
+            return null;
+        }
+    }
+
+    /**
+     * 兼容版 ClsLogger（默认入口）
+     * - 保留了自动识别环境 + 动态 import 的逻辑
+     * - 如果业务想瘦身，建议改用 @be-link/cls-logger/web 或 /mini
+     */
+    class ClsLogger extends ClsLoggerCore {
+        async loadSdk() {
+            if (this.sdk)
+                return this.sdk;
+            if (this.sdkPromise)
+                return this.sdkPromise;
+            const normalizeSdk = (m) => {
+                const mod = (m?.default && m.default.AsyncClient ? m.default : m);
+                if (mod?.AsyncClient && mod?.Log && mod?.LogGroup && mod?.PutLogsRequest) {
+                    return {
+                        AsyncClient: mod.AsyncClient,
+                        Log: mod.Log,
+                        LogGroup: mod.LogGroup,
+                        PutLogsRequest: mod.PutLogsRequest,
+                    };
+                }
+                return null;
+            };
+            // 1) 外部注入的 loader（最高优先级）
+            if (this.sdkLoaderOverride) {
+                try {
+                    const loaded = await this.sdkLoaderOverride();
+                    const sdk = normalizeSdk(loaded);
+                    if (sdk) {
+                        this.sdk = sdk;
+                        return sdk;
+                    }
+                }
+                catch {
+                    // ignore and fallback
+                }
+            }
+            // 2) 外部直接注入的 sdk
+            if (this.sdkOverride) {
+                const sdk = normalizeSdk(this.sdkOverride);
+                if (sdk) {
+                    this.sdk = sdk;
+                    return sdk;
+                }
+            }
+            const isMini = this.envType === 'miniprogram';
+            // 静态字面量，方便打包器识别（但在此兼容入口里，仍然可能被一起分析）
+            const WEB_SDK = 'tencentcloud-cls-sdk-js-web';
+            const MINI_SDK = 'tencentcloud-cls-sdk-js-mini';
+            // UMD（浏览器脚本）优先读全局变量
+            if (!isMini) {
+                const g = readGlobal('tencentcloudClsSdkJsWeb');
+                const sdk = normalizeSdk(g);
+                if (sdk) {
+                    this.sdk = sdk;
+                    return sdk;
+                }
+            }
+            // 尽量同步 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;
+        }
+    }
+
     const clsLogger = new ClsLogger();
 
     exports.ClsLogger = ClsLogger;

package/dist/mini.d.ts

@@ -0,0 +1,6 @@
+import { ClsLoggerMini } from './ClsLoggerMini';
+export * from './types';
+export { ClsLoggerMini as ClsLogger };
+export declare const clsLogger: ClsLoggerMini;
+export default clsLogger;
+//# sourceMappingURL=mini.d.ts.map

package/dist/mini.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mini.d.ts","sourceRoot":"","sources":["../src/mini.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,aAAa,IAAI,SAAS,EAAE,CAAC;AACtC,eAAO,MAAM,SAAS,eAAsB,CAAC;AAC7C,eAAe,SAAS,CAAC"}