@arms/rum-core 0.1.7 → 0.1.9

package/lib/model/shell.js

@@ -1,45 +1,94 @@
 "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 _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _rumEvent = require("../types/rum-event");
 var _client = _interopRequireDefault(require("../model/client"));
 var _is = require("../utils/is");
+var _Shell;
 var Shell = exports["default"] = /*#__PURE__*/function () {
   function Shell(config) {
-    // private callbacks: Function[] = [];
-    // private initialized = false;
+    var _this = this;
     this.client = void 0;
+    this.initialized = false;
+    this.extensionCollectors = [];
     this.client = new _client["default"]();
+
+    // 拦截 client.init，自动在其后挂载扩展采集器
+    var originalInit = this.client.init.bind(this.client);
+    this.client.init = function () {
+      originalInit.apply(void 0, arguments);
+      _this.initClient();
+    };
     if (config && this.init) {
       this.init(config);
-      // const p = this.init(config) as Promise<Shell>;
-      // if(isFunction(p?.then)){
-      //   p.then(this.shellReady);
-      // } else {
-      //   this.shellReady()
-      // }
     }
   }
 
-  // private shellReady = () => {
-  //   this.initialized = true;
-  //   this.callbacks.forEach(cb => cb());
-  // }
-  //
-  // onReady(callback: Function) {
-  //   if (this.initialized) {
-  //     callback();
-  //   }
-  //   this.callbacks.push(callback);
-  // }
-
   /**
-   * 初始化
+   * 注册扩展采集器（实例方法，支持 per-instance 隔离）
+   * 支持在 init 之前或之后调用；若已初始化则立即 setup
    */
   var _proto = Shell.prototype;
+  _proto.useCollectors = function useCollectors() {
+    var _this$extensionCollec,
+      _this2 = this;
+    for (var _len = arguments.length, collectors = new Array(_len), _key = 0; _key < _len; _key++) {
+      collectors[_key] = arguments[_key];
+    }
+    (_this$extensionCollec = this.extensionCollectors).push.apply(_this$extensionCollec, collectors);
+    if (this.initialized && this.client) {
+      var ctx = this.client.getContext();
+      if (ctx) {
+        collectors.forEach(function (collector) {
+          collector.setup(ctx, _this2.client.sendEvent);
+        });
+      }
+    }
+  }
+
+  /**
+   * 返回当前实例装载的全部采集器（client 内置通道 + 实例扩展通道）
+   */;
+  _proto.getCollectors = function getCollectors() {
+    var clientCollectors = this.client && this.client.getCollectors() || [];
+    // 用 concat 替代数组 spread，避免依赖 babel 降级注入 helper（项目去 @babel/runtime 规范）
+    return clientCollectors.concat(this.extensionCollectors);
+  }
+
+  /**
+   * 向所有已初始化的实例广播事件
+   */;
+  Shell.broadcastEvent = function broadcastEvent(event, options) {
+    Shell.instances.forEach(function (instance) {
+      if (instance.initialized && instance.client) {
+        instance.client.sendEvent(event, options);
+      }
+    });
+  }
+
+  /**
+   * 统一初始化 Client，并在 init 完成后自动挂载扩展采集器。
+   * 由 client.init 拦截器自动调用，子包无需手动调用。
+   */;
+  _proto.initClient = function initClient() {
+    var _this3 = this;
+    if (this.extensionCollectors.length > 0) {
+      var ctx = this.client.getContext();
+      if (ctx) {
+        this.extensionCollectors.forEach(function (collector) {
+          collector.setup(ctx, _this3.client.sendEvent);
+        });
+      }
+    }
+    this.initialized = true;
+    Shell.instances.push(this);
+  }
+
+  /**
+   * 初始化
+   */;
   _proto.sendEvent = function sendEvent(payload, options) {
     if (this.client) {
       this.client.sendEvent(payload, options);
@@ -65,7 +114,7 @@ var Shell = exports["default"] = /*#__PURE__*/function () {
     if (!payload.name || !payload.type) {
       return;
     }
-    var data = (0, _extends2["default"])({}, payload, {
+    var data = Object.assign({}, payload, {
       event_type: _rumEvent.RumEventType.CUSTOM
     });
     this.sendEvent(data);
@@ -91,7 +140,7 @@ var Shell = exports["default"] = /*#__PURE__*/function () {
       });
       if (n === 0) return;
     }
-    var data = (0, _extends2["default"])({}, payload, {
+    var data = Object.assign({}, payload, {
       event_type: _rumEvent.RumEventType.VIEW
     });
     this.sendEvent(data);
@@ -107,7 +156,7 @@ var Shell = exports["default"] = /*#__PURE__*/function () {
     var name = payload.name,
       message = payload.message,
       stack = payload.stack;
-    var data = (0, _extends2["default"])({
+    var data = Object.assign({
       times: 1,
       name: name,
       message: message,
@@ -127,7 +176,7 @@ var Shell = exports["default"] = /*#__PURE__*/function () {
     if (!payload.name || !payload.type || !(0, _is.isNumber)(payload.duration)) {
       return;
     }
-    var data = (0, _extends2["default"])({
+    var data = Object.assign({
       times: 1
     }, payload, {
       event_type: _rumEvent.RumEventType.RESOURCE
@@ -135,4 +184,6 @@ var Shell = exports["default"] = /*#__PURE__*/function () {
     this.sendEvent(data);
   };
   return Shell;
-}();
+}();
+_Shell = Shell;
+Shell.instances = [];

package/lib/monitor/logger.d.ts

@@ -1,5 +1,10 @@
 import { MonitorLogEvent, MonitorLogLevel } from './types';
-type LogArgs = [module: string, message: string, error?: unknown, context?: Record<string, unknown>];
+type LogArgs = [
+    module: string,
+    message: string,
+    error?: unknown,
+    context?: Record<string, unknown>
+];
 export interface ILogger {
     debug(...args: LogArgs): void;
     info(...args: LogArgs): void;

package/lib/monitor/logger.js

@@ -62,7 +62,7 @@ var Logger = /*#__PURE__*/function () {
     }
 
     // 仅上报配置中指定的级别
-    if (!this.reportLevels.includes(level)) return;
+    if (this.reportLevels.indexOf(level) === -1) return;
     var stack;
     if (error instanceof Error) {
       stack = error.stack;

package/lib/monitor/telemetry.js

@@ -1,10 +1,8 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports.Telemetry = void 0;
 exports.convertBundlesToLogGroup = convertBundlesToLogGroup;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _logger = require("./logger");
 var _url = require("../utils/url");
 var _protobuf = require("../utils/protobuf");
@@ -80,12 +78,12 @@ var Telemetry = exports.Telemetry = /*#__PURE__*/function () {
     var _this$context$getSess, _this$context, _this$context$getView, _this$context2;
     if (!this.enabled || !event) return;
     if (event.content && event.content.length > LOG_CONTENT_MAX_SIZE) {
-      event = (0, _extends2["default"])({}, event, {
+      event = Object.assign({}, event, {
         content: event.content.slice(0, LOG_CONTENT_MAX_SIZE)
       });
     }
     if (event.stack && event.stack.length > LOG_CONTENT_MAX_SIZE) {
-      event = (0, _extends2["default"])({}, event, {
+      event = Object.assign({}, event, {
         stack: event.stack.slice(0, LOG_CONTENT_MAX_SIZE)
       });
     }
@@ -154,7 +152,7 @@ var Telemetry = exports.Telemetry = /*#__PURE__*/function () {
       appType = _this$context3.appType,
       sdkVersion = _this$context3.sdkVersion,
       endpoint = _this$context3.endpoint;
-    return (0, _extends2["default"])({
+    return Object.assign({
       'app.type': appType,
       _v: sdkVersion,
       endpoint: endpoint,
@@ -193,11 +191,11 @@ function convertBundlesToLogGroup(data) {
     var contents = [];
 
     // 遍历 bundle 顶层字段，跳过 timestamp（映射到 time），对象类型整体序列化
-    for (var _i = 0, _Object$entries = Object.entries(bundle); _i < _Object$entries.length; _i++) {
-      var _Object$entries$_i = _Object$entries[_i],
-        _key = _Object$entries$_i[0],
-        val = _Object$entries$_i[1];
+    var bundleKeys = Object.keys(bundle);
+    for (var i = 0; i < bundleKeys.length; i++) {
+      var _key = bundleKeys[i];
       if (_key === 'timestamp') continue;
+      var val = bundle[_key];
       if (val !== undefined && val !== null) {
         contents.push({
           key: _key,

package/lib/types/shell.d.ts

@@ -1,4 +1,5 @@
 import { IConfiguration } from './client';
+import { ICollector } from './collector';
 import { RumEvent, SendEventOptions } from './rum-event';
 /**
  * 每个 sdk shell 导出固定需要实现的基础 api
@@ -8,6 +9,14 @@ import { RumEvent, SendEventOptions } from './rum-event';
  * 3. 基于 Disposable 模式，对于事件的绑定、快捷键的绑定函数，返回值则是解绑函数
  */
 export interface IShell {
+    /**
+     * 注册扩展采集器（per-instance 隔离）
+     */
+    useCollectors(...collectors: ICollector[]): void;
+    /**
+     * 返回当前实例装载的全部采集器
+     */
+    getCollectors(): ICollector[];
     /**
      * 初始化
      */

package/lib/utils/base.js

@@ -11,6 +11,7 @@ exports.interceptFunction = interceptFunction;
 exports.parseRegExpString = parseRegExpString;
 exports.restoreFunction = restoreFunction;
 var _is = require("./is");
+var _logger = require("../monitor/logger");
 /**
  * 劫持函数或原型
  */
@@ -18,19 +19,74 @@ 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.logger.warn('interceptFunction', "callback error in \"" + name + "\"", e);
+      }
+      if ((0, _is.isFunction)(registeredMethod)) {
+        return registeredMethod.apply(ctx, args);
+      }
+    };
+    disguiseProxy(proxyMethod, registeredMethod);
+    target[name] = proxyMethod;
+  } catch (e) {
+    // 劫持安装保护：target 属性只读 accessor 或被 freeze 时（strict mode 下抛 TypeError），
+    // 上报后静默返回，不中断 SDK 初始化
+    _logger.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 ((0, _is.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 ((0, _is.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.logger.warn('interceptFunction', 'disguiseProxy fallback failed', err);
     }
-  };
-  proxyMethod._rum_intercepted = registeredMethod;
-  target[name] = proxyMethod;
+  }
 }
 
 /**
@@ -158,72 +214,6 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arms/rum-core",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "arms rum javascript sdk core",
   "author": "guangli.fj <guangli.fj@alibaba-inc.com>",
   "license": "ISC",
@@ -34,9 +34,6 @@
     "prepublishOnly": "npm run build",
     "test": "npm run build && jest ./__tests__"
   },
-  "peerDependencies": {
-    "@babel/runtime": "^7.24.5"
-  },
   "devDependencies": {
     "typescript": "^4.9.4"
   }