qb-pc-sdk 1.0.5 → 1.0.7

package/index.js

@@ -14,6 +14,11 @@ if (isBrowser && typeof window !== 'undefined' && window.console && !window.cons
     // 过滤函数，检查是否应该过滤
     const shouldFilter = function(...args) {
         const errorText = args.join(' ').toLowerCase();
+        // 检查是否包含 localhost.weixin.qq.com（各种格式）
+        const hasWeixinLocalhost = /https?:\/\/localhost\.weixin\.qq\.com/i.test(errorText) ||
+                                   /localhost\.weixin\.qq\.com/i.test(errorText) ||
+                                   errorText.includes('localhost.weixin.qq.com');
+        
         return (
             errorText.includes('微信') || 
             errorText.includes('wechat') || 
@@ -22,7 +27,7 @@ if (isBrowser && typeof window !== 'undefined' && window.console && !window.cons
             errorText.includes('微信游戏') ||
             errorText.includes('微信小游戏') ||
             errorText.includes('wxgamesdkframe') ||
-            errorText.includes('localhost.weixin.qq.com') ||
+            hasWeixinLocalhost ||
             errorText.includes('wx_game_base') ||
             errorText.includes('getgamesession') ||
             errorText.includes('xmlhttprequest') ||
@@ -31,7 +36,14 @@ if (isBrowser && typeof window !== 'undefined' && window.console && !window.cons
             errorText.includes('cors policy') ||
             errorText.includes('secure context') ||
             errorText.includes('loopback') ||
-            errorText.includes('more-private address space')
+            errorText.includes('more-private address space') ||
+            errorText.includes('net::') ||
+            errorText.includes('timeout') ||
+            errorText.includes('frame on invoke') ||
+            errorText.includes('/wx_game_base/api/business') ||
+            /localhost\.weixin\.qq\.com:\d+/.test(errorText) ||
+            /:\d{5}\/wx_game_base/.test(errorText) ||
+            /:\d{5}\/wx_game_base/.test(errorText)
         );
     };
     
@@ -87,10 +99,101 @@ if (isBrowser && typeof window !== 'undefined' && window.console && !window.cons
             }
         });
         
+        // 拦截 XMLHttpRequest 的错误事件，只隐藏错误日志，不阻止请求
+        if (window.XMLHttpRequest) {
+            const OriginalXHR = window.XMLHttpRequest;
+            window.XMLHttpRequest = function() {
+                const xhr = new OriginalXHR();
+                const originalAddEventListener = xhr.addEventListener;
+                
+                // 拦截 addEventListener，过滤错误事件
+                xhr.addEventListener = function(type, listener, options) {
+                    if (type === 'error' || type === 'loadend' || type === 'abort') {
+                        const wrappedListener = function(event) {
+                            const url = (xhr.responseURL || xhr._requestURL || '').toLowerCase();
+                            // 如果请求被标记为需要过滤，或者 URL 匹配过滤规则，则静默处理
+                            if (xhr._qbsdkFiltered || shouldFilter(url)) {
+                                return; // 静默处理错误事件
+                            }
+                            if (listener) {
+                                listener.apply(this, arguments);
+                            }
+                        };
+                        return originalAddEventListener.call(this, type, wrappedListener, options);
+                    }
+                    return originalAddEventListener.apply(this, arguments);
+                };
+                
+                // 保存请求 URL 以便后续判断
+                const originalOpen = xhr.open;
+                xhr.open = function(method, url, async, user, password) {
+                    xhr._requestURL = url;
+                    // 如果是 localhost.weixin.qq.com 的请求，标记为需要过滤
+                    if (url && /localhost\.weixin\.qq\.com/i.test(url)) {
+                        xhr._qbsdkFiltered = true;
+                    }
+                    return originalOpen.apply(this, arguments);
+                };
+                
+                // 拦截 onerror 属性
+                Object.defineProperty(xhr, 'onerror', {
+                    set: function(handler) {
+                        const wrappedHandler = function(event) {
+                            const url = (xhr.responseURL || xhr._requestURL || '').toLowerCase();
+                            // 如果请求被标记为需要过滤，或者 URL 匹配过滤规则，则静默处理
+                            if (!xhr._qbsdkFiltered && !shouldFilter(url) && handler) {
+                                handler.apply(this, arguments);
+                            }
+                        };
+                        originalAddEventListener.call(this, 'error', wrappedHandler);
+                    },
+                    get: function() {
+                        return this._onerror;
+                    },
+                    configurable: true
+                });
+                
+                return xhr;
+            };
+        }
+        
         window._qbsdkErrorHandlerAdded = true;
     }
 }
 
+// 在加载底层SDK之前，拦截并阻止所有对 localhost.weixin.qq.com 的请求
+if (isBrowser && window.XMLHttpRequest && !window._qbsdkXHRBlocked) {
+    const OriginalXHR = window.XMLHttpRequest;
+    window.XMLHttpRequest = function() {
+        const xhr = new OriginalXHR();
+        const originalOpen = xhr.open;
+        const originalSend = xhr.send;
+        
+        // 拦截 open 方法，阻止对 localhost.weixin.qq.com 的请求
+        xhr.open = function(method, url, async, user, password) {
+            // 如果是微信游戏SDK的请求，直接阻止
+            if (url && /localhost\.weixin\.qq\.com/i.test(url)) {
+                xhr._qbsdkBlocked = true;
+                // 不调用原始 open，直接返回，阻止请求
+                return;
+            }
+            return originalOpen.apply(this, arguments);
+        };
+        
+        // 拦截 send 方法，如果请求被阻止则不发送
+        xhr.send = function(data) {
+            if (xhr._qbsdkBlocked) {
+                // 请求已被阻止，不发送
+                return;
+            }
+            return originalSend.apply(this, arguments);
+        };
+        
+        return xhr;
+    };
+    window._qbsdkXHRBlocked = true;
+}
+
 // 浏览器中预加载底层 SDK（仅 side-effect，挂载 window.GDTAdSDK）
 if (isBrowser) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qb-pc-sdk",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "趣变广告 SDK 封装器 - PC端广告接入工具，自动处理多级接口映射与原生渲染逻辑",
   "main": "index.js",
   "files": [

package/src/ad-sdk-wrapper.js

@@ -7,91 +7,136 @@
     
     // 兼容浏览器和 Node.js 环境
     const window = typeof global !== 'undefined' && global.window ? global.window : (typeof window !== 'undefined' ? window : global);
+    const isBrowser = typeof window !== 'undefined' && typeof window.document !== 'undefined';
 
-    // 拦截并过滤微信游戏SDK相关的错误日志（仅拦截一次）
-    if (typeof window !== 'undefined' && window.console && !window.console.error._qbsdkFiltered) {
-        const originalError = window.console.error;
-        const originalWarn = window.console.warn;
-        
-        // 过滤函数，检查是否应该过滤
-        const shouldFilter = function(...args) {
-            const errorText = args.join(' ').toLowerCase();
-            return (
-                errorText.includes('微信') || 
-                errorText.includes('wechat') || 
-                errorText.includes('weixin') ||
-                errorText.includes('wxgame') ||
-                errorText.includes('微信游戏') ||
-                errorText.includes('微信小游戏') ||
-                errorText.includes('wxgamesdkframe') ||
-                errorText.includes('localhost.weixin.qq.com') ||
-                errorText.includes('wx_game_base') ||
-                errorText.includes('getgamesession') ||
-                errorText.includes('xmlhttprequest') ||
-                errorText.includes('err_failed') ||
-                errorText.includes('err_connection_refused') ||
-                errorText.includes('cors policy') ||
-                errorText.includes('secure context') ||
-                errorText.includes('loopback') ||
-                errorText.includes('more-private address space')
-            );
-        };
-        
-        const filteredError = function(...args) {
-            // 如果不是微信相关的错误，正常输出
-            if (!shouldFilter(...args)) {
-                originalError.apply(window.console, args);
-            }
-        };
-        
-        const filteredWarn = function(...args) {
-            // 如果不是微信相关的警告，正常输出
-            if (!shouldFilter(...args)) {
-                originalWarn.apply(window.console, args);
+    // ============================================================
+    // 核心拦截逻辑：在 SDK 加载前彻底屏蔽 WeChat Localhost 请求
+    // ============================================================
+    if (isBrowser) {
+        // 1. 拦截 XMLHttpRequest
+        if (window.XMLHttpRequest && !window._qbsdkXHRBlocked) {
+            const OriginalXHR = window.XMLHttpRequest;
+            
+            // 定义一个安全的 XHR 代理类
+            window.XMLHttpRequest = function() {
+                const xhr = new OriginalXHR();
+                const originalOpen = xhr.open;
+                const originalSend = xhr.send;
+                
+                // 标记此实例是否被阻断
+                xhr._qbsdkBlocked = false;
+                
+                xhr.open = function(method, url, async, user, password) {
+                    const targetUrl = (url || '').toString().toLowerCase();
+                    
+                    // 严格匹配 localhost.weixin.qq.com 及其变体
+                    if (targetUrl.includes('localhost.weixin.qq.com') || 
+                        targetUrl.includes('wx_game_base') ||
+                        /127\.0\.0\.1:\d+\/wx_game_base/.test(targetUrl)) {
+                        
+                        xhr._qbsdkBlocked = true;
+                        
+                        // 伪造一个成功的状态，防止 SDK 内部抛出未捕获异常导致重试
+                        // 我们不调用 originalOpen，而是让它"空转"
+                        return; 
+                    }
+                    
+                    return originalOpen.apply(this, arguments);
+                };
+                
+                xhr.send = function(data) {
+                    if (xhr._qbsdkBlocked) {
+                        // 模拟异步响应，防止同步阻塞
+                        setTimeout(() => {
+                            // 如果 SDK 监听了 error 或 loadend，我们需要伪造一个响应
+                            // 但为了静默，通常什么都不做最好，或者触发一个假的 load 事件
+                            // 这里选择静默失败，不触发网络层面的报错
+                            if (xhr.readyState !== 4) {
+                                Object.defineProperty(xhr, 'readyState', { value: 4, writable: true });
+                                Object.defineProperty(xhr, 'status', { value: 0, writable: true }); // 0 status usually implies network error but internally handled
+                                Object.defineProperty(xhr, 'statusText', { value: 'Blocked by AdSDKWrapper', writable: true });
+                            }
+                            
+                            // 触发 fake error 事件以满足某些 SDK 的超时逻辑，但不会在 Console 报 net::ERR
+                            if (xhr.onerror) xhr.onerror(new ProgressEvent('error'));
+                        }, 0);
+                        return;
+                    }
+                    return originalSend.apply(this, arguments);
+                };
+                
+                return xhr;
+            };
+            
+            // 复制静态属性 (如 UNSENT, OPENED 等)
+            for (let key in OriginalXHR) {
+                if (Object.prototype.hasOwnProperty.call(OriginalXHR, key)) {
+                    window.XMLHttpRequest[key] = OriginalXHR[key];
+                }
             }
-        };
-        
-        // 标记已过滤，避免重复拦截
-        filteredError._qbsdkFiltered = true;
-        filteredWarn._qbsdkFiltered = true;
-        window.console.error = filteredError;
-        window.console.warn = filteredWarn;
-        
-        // 拦截全局错误事件，过滤微信游戏SDK相关的错误
-        if (!window._qbsdkErrorHandlerAdded) {
-            const originalOnError = window.onerror;
-            window.onerror = function(message, source, lineno, colno, error) {
-                const errorText = (message || '').toLowerCase() + (source || '').toLowerCase();
-                if (shouldFilter(errorText)) {
-                    // 静默处理，不输出
-                    return true; // 阻止默认错误处理
+            
+            window._qbsdkXHRBlocked = true;
+        }
+
+        // 2. 拦截 Fetch API (很多现代 SDK 混用 XHR 和 Fetch)
+        if (window.fetch && !window._qbsdkFetchBlocked) {
+            const originalFetch = window.fetch;
+            window.fetch = function(input, init) {
+                let url = '';
+                if (typeof input === 'string') {
+                    url = input;
+                } else if (input instanceof Request) {
+                    url = input.url;
                 }
-                // 其他错误正常处理
-                if (originalOnError) {
-                    return originalOnError.call(this, message, source, lineno, colno, error);
+                
+                url = url.toLowerCase();
+                
+                if (url.includes('localhost.weixin.qq.com') || url.includes('wx_game_base')) {
+                    // 返回一个永远 pending 或者 立即 reject 的 Promise
+                    // 为了不报错，返回一个伪造的 Response
+                    return Promise.resolve(new Response(JSON.stringify({ code: -1, msg: 'Blocked' }), {
+                        status: 200,
+                        statusText: 'OK',
+                        headers: { 'Content-Type': 'application/json' }
+                    }));
                 }
-                return false;
+                
+                return originalFetch.apply(this, arguments);
             };
+            window._qbsdkFetchBlocked = true;
+        }
+
+        // 3. 拦截 Console (保留原有的日志过滤逻辑作为第二道防线)
+        if (window.console && !window.console.error._qbsdkFiltered) {
+            const originalError = window.console.error;
+            const originalWarn = window.console.warn;
             
-            // 拦截未捕获的 Promise rejection
-            const originalUnhandledRejection = window.onunhandledrejection;
-            window.addEventListener('unhandledrejection', function(event) {
-                const reason = event.reason || {};
-                const errorText = (reason.message || reason || '').toString().toLowerCase();
-                if (shouldFilter(errorText)) {
-                    // 阻止默认行为，静默处理
-                    event.preventDefault();
-                    return;
-                }
-                // 其他错误正常处理
-                if (originalUnhandledRejection) {
-                    originalUnhandledRejection.call(window, event);
-                }
-            });
+            const shouldFilter = (args) => {
+                const text = args.map(String).join(' ').toLowerCase();
+                return (
+                    text.includes('localhost.weixin.qq.com') ||
+                    text.includes('wx_game_base') ||
+                    text.includes('err_connection_refused') ||
+                    text.includes('err_failed') ||
+                    text.includes('cors policy') ||
+                    text.includes('wxgamesdkframe')
+                );
+            };
+
+            window.console.error = function(...args) {
+                if (!shouldFilter(args)) originalError.apply(console, args);
+            };
             
-            window._qbsdkErrorHandlerAdded = true;
+            window.console.warn = function(...args) {
+                if (!shouldFilter(args)) originalWarn.apply(console, args);
+            };
+            
+            window.console.error._qbsdkFiltered = true;
         }
     }
+    // ============================================================
+    // 拦截逻辑结束
+    // ============================================================
 
     // 内部常量配置
     const API_CONFIG = {
@@ -316,6 +361,11 @@
         }
 
         _handleError(error, message) {
+            // 内部错误也进行过滤，防止将过滤掉的错误再次打印
+            const errStr = String(error).toLowerCase();
+            if (errStr.includes('localhost.weixin.qq.com') || errStr.includes('blocked by adsdkwrapper')) {
+                return;
+            }
             console.error(`[AdSDK Error] ${message}:`, error);
             if (this.config.onAdError) {
                 this.config.onAdError(error, message);
@@ -344,4 +394,4 @@
     
     // 返回类供直接使用
     return AdSDKWrapper;
-})(typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : this);
+})(typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : this);