@arms/rum-core 0.1.7 → 0.1.9

package/es/utils/base.js

@@ -1,4 +1,5 @@
-import { isFunction } from "./is";
+import { isFunction } from './is';
+import { logger } from '../monitor/logger';
 
 /**
  * 劫持函数或原型
@@ -7,19 +8,74 @@ export function interceptFunction(target, name, callback, isPrototype) {
   if (isPrototype === void 0) {
     isPrototype = false;
   }
-  var registeredMethod = target[name];
-  var proxyMethod = function proxyMethod() {
-    var ctx = isPrototype ? this : target;
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+  try {
+    var registeredMethod = target[name];
+    var proxyMethod = function proxyMethod() {
+      var ctx = isPrototype ? this : target;
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      try {
+        // callback 异常隔离：SDK 采集逻辑出错不能中断客户原函数执行
+        callback.apply(ctx, args);
+      } catch (e) {
+        logger.warn('interceptFunction', "callback error in \"" + name + "\"", e);
+      }
+      if (isFunction(registeredMethod)) {
+        return registeredMethod.apply(ctx, args);
+      }
+    };
+    disguiseProxy(proxyMethod, registeredMethod);
+    target[name] = proxyMethod;
+  } catch (e) {
+    // 劫持安装保护：target 属性只读 accessor 或被 freeze 时（strict mode 下抛 TypeError），
+    // 上报后静默返回，不中断 SDK 初始化
+    logger.warn('interceptFunction', "install proxy failed for \"" + name + "\"", e);
+  }
+}
+
+/**
+ * 伪装代理函数，降低劫持对客户代码的感知：
+ * 1. toString 返回原函数源码（String()、模板字符串、console.log、日志序列化等路径可见原函数）
+ * 2. name/length 与原函数对齐
+ * 3. _rum_intercepted 不可枚举，避免污染 Object.keys / for...in
+ * 注意：defineProperty 在部分小程序运行时可能失败，需降级为直接挂载，不能中断劫持主流程
+ *
+ */
+function disguiseProxy(proxyMethod, originalMethod) {
+  try {
+    if (isFunction(originalMethod)) {
+      Object.defineProperty(proxyMethod, 'toString', {
+        value: function value() {
+          return originalMethod.toString();
+        },
+        writable: true,
+        configurable: true
+      });
+      Object.defineProperty(proxyMethod, 'name', {
+        value: originalMethod.name,
+        configurable: true
+      });
+      Object.defineProperty(proxyMethod, 'length', {
+        value: originalMethod.length,
+        configurable: true
+      });
     }
-    callback.apply(ctx, args);
-    if (isFunction(registeredMethod)) {
-      return registeredMethod.apply(ctx, args);
+    Object.defineProperty(proxyMethod, '_rum_intercepted', {
+      value: originalMethod,
+      enumerable: false,
+      writable: true,
+      configurable: true
+    });
+  } catch (e) {
+    // 降级：defineProperty 不可用时直接挂载，保证 restoreFunction 仍可用
+    try {
+      proxyMethod._rum_intercepted = originalMethod;
+    } catch (err) {
+      // 二层保护：strict mode 下对不可扩展对象直接赋值也会抛 TypeError，上报后放弃挂载
+      logger.warn('interceptFunction', 'disguiseProxy fallback failed', err);
     }
-  };
-  proxyMethod._rum_intercepted = registeredMethod;
-  target[name] = proxyMethod;
+  }
 }
 
 /**
@@ -147,72 +203,6 @@ export function delay(func, wait) {
   return setTimeout.apply(void 0, [func, +wait || 0].concat(args));
 }
 
-// // 类型匹配正则
-// const TYPE_REG = /^\[object ([a-z]*)\]$/;
-// /**
-//  * @desc 需要严格区分object和array
-//  * @param obj 任意对象
-//  */
-// export function getType(obj: any) {
-//   let type = Object.prototype.toString.call(obj);
-//   type = type.toLowerCase() || '';
-//   const arr = type.match(TYPE_REG);
-//   return arr?.[1];
-// }
-//
-// /**
-//  * @desc 将字符串转换成正则表达式
-//  * @param str 任意字符串
-//  * 注意，这里只支持 /xxx/ 这种格式，不支持修饰符，例如 /xxx/ig
-//  */
-// export function transStrToReg(str: string) {
-//   if (getType(str) !== 'string') return str;
-//   if (str.length > 2 && str[0] === '/' && str[str.length - 1] === '/') {
-//     return new RegExp(str.substr(1, str.length - 2));
-//   }
-//   return str;
-// }
-//
-// /**
-//  *
-//  * @param config 配置
-//  * @param keys 需要转换的字段
-//  */
-// export function toRegFormat(config: any, keys: any[]) {
-//   if (getType(keys) === 'string') {
-//     keys = [keys];
-//   }
-//   for (let i = 0, len = keys.length; i < len; i++) {
-//     const paths = keys[i].split('.');
-//     const lastIndex = paths.length - 1;
-//     if (!config) break;
-//     let tmp = config;
-//     for (let j = 0, jlen = paths.length; j < jlen; j++) {
-//       if (paths[j] === '[]') {
-//         if (getType(tmp) === 'array') {
-//           let lastPath = paths.splice(j + 1);
-//           lastPath = lastPath.join('.');
-//           for (let x = 0, xlen = tmp.length; x < xlen; x++) {
-//             toRegFormat(tmp[x], lastPath);
-//           }
-//         }
-//         break;
-//       }
-//       // 最后一层了，需要往前一层才能修改对象
-//       if (lastIndex === j && getType(tmp[paths[j]]) === 'string') {
-//         tmp[paths[j]] = transStrToReg(tmp[paths[j]]);
-//         break;
-//       }
-//       tmp = tmp[paths[j]];
-//       if (!tmp) break;
-//     }
-//     if (!tmp || getType(tmp) !== 'array') continue;
-//     for (let j = 0, jlen = tmp.length; j < jlen; j++) {
-//       tmp[j] = transStrToReg(tmp[j]);
-//     }
-//   }
-// }
-
 /**
  * 解析正则表达式字符串，支持 /pattern/flags 格式
  * @param str 正则表达式字符串，如 "/a/ig" 或 "a"

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+function _interopRequireDefault(e){return e&&e.__esModule?e:{"default":e}}
 exports.__esModule = true;
 var _exportNames = {
   Client: true,

package/lib/model/client.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+function _interopRequireDefault(e){return e&&e.__esModule?e:{"default":e}}
 exports.__esModule = true;
 exports["default"] = void 0;
 var _client = require("../types/client");
@@ -73,14 +73,16 @@ var Client = /*#__PURE__*/function () {
         }
         if (processor.match(ctx)) {
           var res = processor.process(ctx);
-          if (res) {
-            ctx.setRumEvent(res);
-          }
+          // 无论返回值是否为 falsy 都写回 context，
+          // 确保 processor 返回 null/undefined（丢弃事件）时能正确生效
+          ctx.setRumEvent(res);
         }
       }
       reporter.report(ctx, options);
     });
-    collectors.forEach(function (collector) {
+
+    // 采集器可全部经 Shell 扩展通道注册，此处允许为空
+    (collectors || []).forEach(function (collector) {
       collector.setup(ctx, _this2.sendEvent);
     });
   };

package/lib/model/configManager.d.ts

@@ -21,7 +21,7 @@ export declare abstract class ConfigManager implements IConfigManager {
      * 更新配置
      * @param config 新配置
      */
-    setConfig(config: Partial<IConfiguration>): Promise<void>;
+    setConfig(config: Partial<IConfiguration>): void;
     /**
      * 检查缓存是否有效
      * @param cachedData 缓存数据

package/lib/model/configManager.js

@@ -1,11 +1,7 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.ConfigManager = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 function parseRemoteConfig(config) {
   var remoteConfig = config.remoteConfig || {};
   var enable = false;
@@ -38,75 +34,46 @@ var ConfigManager = exports.ConfigManager = /*#__PURE__*/function () {
    * 初始化配置管理器
    * @param config 初始配置
    */
-  _proto.init =
-  /*#__PURE__*/
-  function () {
-    var _init = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(config) {
-      var _this = this;
-      var remoteConfig, cacheConfig, asyncConfigPromise;
-      return _regenerator["default"].wrap(function (_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (!this.initialized) {
-              _context.next = 1;
-              break;
-            }
-            return _context.abrupt("return");
-          case 1:
-            this.currentConfig = (0, _extends2["default"])({}, config);
-            this.initialized = true;
-            remoteConfig = parseRemoteConfig(config);
-            this.currentConfig.remoteConfig = remoteConfig;
-            if (remoteConfig.enable) {
-              _context.next = 2;
-              break;
-            }
-            return _context.abrupt("return");
-          case 2:
-            _context.next = 3;
-            return this.getCacheConfig();
-          case 3:
-            cacheConfig = _context.sent;
-            if (cacheConfig && cacheConfig.content) {
-              this.currentConfig = this.mergeRemoteCfg(cacheConfig.content);
-            }
-            if (!this.isCacheValid(cacheConfig, remoteConfig.cacheTimeout)) {
-              _context.next = 4;
-              break;
-            }
-            return _context.abrupt("return");
-          case 4:
-            asyncConfigPromise = this.fetchRemoteCfg(this.currentConfig).then(function (resp) {
-              if (!resp) return;
-              var asyncRemoteConfig = _this.parseConfig(resp);
-              _this.currentConfig = _this.mergeRemoteCfg(asyncRemoteConfig);
-              _this.setCacheConfig({
-                timestamp: Date.now(),
-                content: resp
-              });
-            });
-            if (!(remoteConfig.mode === 'remote-first')) {
-              _context.next = 5;
-              break;
-            }
-            _context.next = 5;
-            return asyncConfigPromise;
-          case 5:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, this);
-    }));
-    function init(_x) {
-      return _init.apply(this, arguments);
+  _proto.init = function init(config) {
+    var _this = this;
+    if (this.initialized) {
+      return Promise.resolve();
     }
-    return init;
-  }()
+    this.currentConfig = Object.assign({}, config);
+    this.initialized = true;
+    var remoteConfig = parseRemoteConfig(config);
+    this.currentConfig.remoteConfig = remoteConfig;
+    if (!remoteConfig.enable) {
+      return Promise.resolve();
+    }
+    return Promise.resolve(this.getCacheConfig()).then(function (cacheConfig) {
+      if (cacheConfig && cacheConfig.content) {
+        _this.currentConfig = _this.mergeRemoteCfg(cacheConfig.content);
+      }
+      if (_this.isCacheValid(cacheConfig, remoteConfig.cacheTimeout)) {
+        // 配置有效期内直接返回，不抓取远端配置
+        return;
+      }
+      var asyncConfigPromise = _this.fetchRemoteCfg(_this.currentConfig).then(function (resp) {
+        if (!resp) return;
+        var asyncRemoteConfig = _this.parseConfig(resp);
+        _this.currentConfig = _this.mergeRemoteCfg(asyncRemoteConfig);
+        _this.setCacheConfig({
+          timestamp: Date.now(),
+          content: resp
+        });
+      });
+      if (remoteConfig.mode === 'remote-first') {
+        // 远端配置优先情况下，要等待获取完成后返回
+        return asyncConfigPromise;
+      }
+    });
+  }
+
   /**
    * 获取配置
    * @returns 配置数据
-   */
-;
+   */;
   _proto.getConfig = function getConfig() {
     if (!this.currentConfig) {
       throw new Error('Config not initialized');
@@ -118,37 +85,16 @@ var ConfigManager = exports.ConfigManager = /*#__PURE__*/function () {
    * 更新配置
    * @param config 新配置
    */;
-  _proto.setConfig =
-  /*#__PURE__*/
-  function () {
-    var _setConfig = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(config) {
-      return _regenerator["default"].wrap(function (_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            if (this.currentConfig) {
-              _context2.next = 1;
-              break;
-            }
-            return _context2.abrupt("return");
-          case 1:
-            this.currentConfig = (0, _extends2["default"])({}, this.currentConfig, config);
-          case 2:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2, this);
-    }));
-    function setConfig(_x2) {
-      return _setConfig.apply(this, arguments);
-    }
-    return setConfig;
-  }()
+  _proto.setConfig = function setConfig(config) {
+    if (!this.currentConfig) return;
+    this.currentConfig = Object.assign({}, this.currentConfig, config);
+  }
+
   /**
    * 检查缓存是否有效
    * @param cachedData 缓存数据
    * @param cacheTimeout 缓存超时时间
-   */
-;
+   */;
   _proto.isCacheValid = function isCacheValid(cachedData, cacheTimeout) {
     if (!cachedData || !cachedData.timestamp) {
       return false;
@@ -170,7 +116,7 @@ var ConfigManager = exports.ConfigManager = /*#__PURE__*/function () {
       remoteConfig = _this$currentConfig.remoteConfig,
       beforeReport = _this$currentConfig.beforeReport,
       properties = _this$currentConfig.properties;
-    return (0, _extends2["default"])({}, this.currentConfig, remoteCfg, {
+    return Object.assign({}, this.currentConfig, remoteCfg, {
       pid: pid,
       app: app,
       endpoint: endpoint,

package/lib/model/reporter.js

@@ -1,11 +1,7 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports["default"] = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _logger = require("../monitor/logger");
 var _rumEvent = require("../types/rum-event");
 var _exception = require("../utils/exception");
@@ -87,6 +83,7 @@ var Reporter = exports["default"] = /*#__PURE__*/function () {
     var sampled = session ? session.getSampled() : true;
     if (!sampled) return;
     var event = ctx.getRumEvent();
+    if (!event) return;
     var views = ctx.getViews();
     var curView = views[views.length - 1];
     if (((_event$view = event.view) === null || _event$view === void 0 ? void 0 : _event$view.id) === curView.id) {
@@ -98,6 +95,8 @@ var Reporter = exports["default"] = /*#__PURE__*/function () {
     var ctx = this.ctx,
       eventQueue = this.eventQueue;
     var event = ctx.getRumEvent();
+    // processor 返回 null/undefined 表示丢弃事件，直接跳过
+    if (!event) return;
 
     // 针对相同 event，做 times 合并
     // todo，支持其他类型 event 合并
@@ -209,7 +208,7 @@ var Reporter = exports["default"] = /*#__PURE__*/function () {
    */;
   _proto.buildAndSend = function buildAndSend(ctx, config, session, sessionId, events, view) {
     var extend = (0, _url.getUrlParams)(config.endpoint);
-    var bundle = (0, _extends2["default"])({
+    var bundle = Object.assign({
       app: {
         id: config.pid,
         env: config.env || 'prod',
@@ -248,54 +247,32 @@ var Reporter = exports["default"] = /*#__PURE__*/function () {
     }
     this.tryRequest(bundle);
   };
-  _proto.tryRequest = /*#__PURE__*/function () {
-    var _tryRequest = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(bundle, retry) {
-      var _this$ctx$getConfig,
-        _reportConfig$maxRetr,
-        _reportConfig$retryDe,
-        _this2 = this;
-      var reportConfig, maxRetryCount, retryDelay, _t;
-      return _regenerator["default"].wrap(function (_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (retry === void 0) {
-              retry = 0;
-            }
-            reportConfig = (_this$ctx$getConfig = this.ctx.getConfig()) === null || _this$ctx$getConfig === void 0 ? void 0 : _this$ctx$getConfig.reportConfig;
-            maxRetryCount = (_reportConfig$maxRetr = reportConfig === null || reportConfig === void 0 ? void 0 : reportConfig.maxRetryCount) !== null && _reportConfig$maxRetr !== void 0 ? _reportConfig$maxRetr : 0;
-            retryDelay = (_reportConfig$retryDe = reportConfig === null || reportConfig === void 0 ? void 0 : reportConfig.retryDelay) !== null && _reportConfig$retryDe !== void 0 ? _reportConfig$retryDe : 3000;
-            _context.prev = 1;
-            bundle._retry = retry;
-            _context.next = 2;
-            return this.request(this.ctx, bundle);
-          case 2:
-            _context.next = 4;
-            break;
-          case 3:
-            _context.prev = 3;
-            _t = _context["catch"](1);
-            if (retry < maxRetryCount - 1) {
-              setTimeout(function () {
-                return _this2.tryRequest(bundle, retry + 1);
-              }, retryDelay);
-            } else {
-              _logger.logger.error('reporter', "Request failed after " + (retry + 1) + " attempts", _t);
-            }
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, this, [[1, 3]]);
-    }));
-    function tryRequest(_x, _x2) {
-      return _tryRequest.apply(this, arguments);
+  _proto.tryRequest = function tryRequest(bundle, retry) {
+    var _this$ctx$getConfig,
+      _reportConfig$maxRetr,
+      _reportConfig$retryDe,
+      _this2 = this;
+    if (retry === void 0) {
+      retry = 0;
     }
-    return tryRequest;
-  }()
+    var reportConfig = (_this$ctx$getConfig = this.ctx.getConfig()) === null || _this$ctx$getConfig === void 0 ? void 0 : _this$ctx$getConfig.reportConfig;
+    var maxRetryCount = (_reportConfig$maxRetr = reportConfig === null || reportConfig === void 0 ? void 0 : reportConfig.maxRetryCount) !== null && _reportConfig$maxRetr !== void 0 ? _reportConfig$maxRetr : 0;
+    var retryDelay = (_reportConfig$retryDe = reportConfig === null || reportConfig === void 0 ? void 0 : reportConfig.retryDelay) !== null && _reportConfig$retryDe !== void 0 ? _reportConfig$retryDe : 3000;
+    bundle._retry = retry;
+    Promise.resolve(this.request(this.ctx, bundle))["catch"](function (e) {
+      if (retry < maxRetryCount - 1) {
+        setTimeout(function () {
+          return _this2.tryRequest(bundle, retry + 1);
+        }, retryDelay);
+      } else {
+        _logger.logger.error('reporter', "Request failed after " + (retry + 1) + " attempts", e);
+      }
+    });
+  }
+
   /**
    * 接口请求由各平台 sdk reporter 实现
-   */
-;
+   */;
   /**
    * 初始化时
    */

package/lib/model/shell.d.ts

@@ -1,9 +1,31 @@
 import { IClient, IConfiguration } from '../types/client';
+import { ICollector } from '../types/collector';
 import { RumCustomEvent, RumEvent, RumExceptionEvent, RumResourceEvent, RumViewEvent, SendEventOptions } from '../types/rum-event';
 import { IShell } from '../types/shell';
 export default abstract class Shell implements IShell {
     client: IClient;
+    protected initialized: boolean;
+    private extensionCollectors;
+    private static instances;
     constructor(config?: IConfiguration);
+    /**
+     * 注册扩展采集器（实例方法，支持 per-instance 隔离）
+     * 支持在 init 之前或之后调用；若已初始化则立即 setup
+     */
+    useCollectors(...collectors: ICollector[]): void;
+    /**
+     * 返回当前实例装载的全部采集器（client 内置通道 + 实例扩展通道）
+     */
+    getCollectors(): ICollector[];
+    /**
+     * 向所有已初始化的实例广播事件
+     */
+    static broadcastEvent(event: RumEvent, options?: SendEventOptions): void;
+    /**
+     * 统一初始化 Client，并在 init 完成后自动挂载扩展采集器。
+     * 由 client.init 拦截器自动调用，子包无需手动调用。
+     */
+    protected initClient(): void;
     /**
      * 初始化
      */