@arms/rum-core 0.1.7 → 0.1.9

package/es/model/client.js

@@ -68,14 +68,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/es/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/es/model/configManager.js

@@ -1,6 +1,3 @@
-import _extends from "@babel/runtime/helpers/extends";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 function parseRemoteConfig(config) {
   var remoteConfig = config.remoteConfig || {};
   var enable = false;
@@ -33,75 +30,46 @@ export var ConfigManager = /*#__PURE__*/function () {
    * 初始化配置管理器
    * @param config 初始配置
    */
-  _proto.init =
-  /*#__PURE__*/
-  function () {
-    var _init = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(config) {
-      var _this = this;
-      var remoteConfig, cacheConfig, asyncConfigPromise;
-      return _regeneratorRuntime.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 = _extends({}, 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');
@@ -113,37 +81,16 @@ export var ConfigManager = /*#__PURE__*/function () {
    * 更新配置
    * @param config 新配置
    */;
-  _proto.setConfig =
-  /*#__PURE__*/
-  function () {
-    var _setConfig = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(config) {
-      return _regeneratorRuntime.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 = _extends({}, 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;
@@ -165,7 +112,7 @@ export var ConfigManager = /*#__PURE__*/function () {
       remoteConfig = _this$currentConfig.remoteConfig,
       beforeReport = _this$currentConfig.beforeReport,
       properties = _this$currentConfig.properties;
-    return _extends({}, this.currentConfig, remoteCfg, {
+    return Object.assign({}, this.currentConfig, remoteCfg, {
       pid: pid,
       app: app,
       endpoint: endpoint,

package/es/model/reporter.js

@@ -1,6 +1,3 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _extends from "@babel/runtime/helpers/extends";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { logger } from '../monitor/logger';
 import { RumEventType } from '../types/rum-event';
 import { getErrorID } from '../utils/exception';
@@ -82,6 +79,7 @@ var Reporter = /*#__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) {
@@ -93,6 +91,8 @@ var Reporter = /*#__PURE__*/function () {
     var ctx = this.ctx,
       eventQueue = this.eventQueue;
     var event = ctx.getRumEvent();
+    // processor 返回 null/undefined 表示丢弃事件，直接跳过
+    if (!event) return;
 
     // 针对相同 event，做 times 合并
     // todo，支持其他类型 event 合并
@@ -204,7 +204,7 @@ var Reporter = /*#__PURE__*/function () {
    */;
   _proto.buildAndSend = function buildAndSend(ctx, config, session, sessionId, events, view) {
     var extend = getUrlParams(config.endpoint);
-    var bundle = _extends({
+    var bundle = Object.assign({
       app: {
         id: config.pid,
         env: config.env || 'prod',
@@ -243,54 +243,32 @@ var Reporter = /*#__PURE__*/function () {
     }
     this.tryRequest(bundle);
   };
-  _proto.tryRequest = /*#__PURE__*/function () {
-    var _tryRequest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(bundle, retry) {
-      var _this$ctx$getConfig,
-        _reportConfig$maxRetr,
-        _reportConfig$retryDe,
-        _this2 = this;
-      var reportConfig, maxRetryCount, retryDelay, _t;
-      return _regeneratorRuntime.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.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.error('reporter', "Request failed after " + (retry + 1) + " attempts", e);
+      }
+    });
+  }
+
   /**
    * 接口请求由各平台 sdk reporter 实现
-   */
-;
+   */;
   /**
    * 初始化时
    */

package/es/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;
     /**
      * 初始化
      */

package/es/model/shell.js

@@ -1,40 +1,89 @@
-import _extends from "@babel/runtime/helpers/extends";
+var _Shell;
 import { RumEventType } from '../types/rum-event';
 import Client from '../model/client';
 import { isNumber, isObject } from '../utils/is';
 var Shell = /*#__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();
+
+    // 拦截 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);
@@ -60,7 +109,7 @@ var Shell = /*#__PURE__*/function () {
     if (!payload.name || !payload.type) {
       return;
     }
-    var data = _extends({}, payload, {
+    var data = Object.assign({}, payload, {
       event_type: RumEventType.CUSTOM
     });
     this.sendEvent(data);
@@ -86,7 +135,7 @@ var Shell = /*#__PURE__*/function () {
       });
       if (n === 0) return;
     }
-    var data = _extends({}, payload, {
+    var data = Object.assign({}, payload, {
       event_type: RumEventType.VIEW
     });
     this.sendEvent(data);
@@ -102,7 +151,7 @@ var Shell = /*#__PURE__*/function () {
     var name = payload.name,
       message = payload.message,
       stack = payload.stack;
-    var data = _extends({
+    var data = Object.assign({
       times: 1,
       name: name,
       message: message,
@@ -122,7 +171,7 @@ var Shell = /*#__PURE__*/function () {
     if (!payload.name || !payload.type || !isNumber(payload.duration)) {
       return;
     }
-    var data = _extends({
+    var data = Object.assign({
       times: 1
     }, payload, {
       event_type: RumEventType.RESOURCE
@@ -131,4 +180,6 @@ var Shell = /*#__PURE__*/function () {
   };
   return Shell;
 }();
+_Shell = Shell;
+Shell.instances = [];
 export { Shell as default };

package/es/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/es/monitor/logger.js

@@ -57,7 +57,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/es/monitor/telemetry.js

@@ -1,4 +1,3 @@
-import _extends from "@babel/runtime/helpers/extends";
 var _Telemetry;
 import { logger } from './logger';
 import { getUrlParams } from '../utils/url';
@@ -75,12 +74,12 @@ export var 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 = _extends({}, 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 = _extends({}, event, {
+      event = Object.assign({}, event, {
         stack: event.stack.slice(0, LOG_CONTENT_MAX_SIZE)
       });
     }
@@ -149,7 +148,7 @@ export var Telemetry = /*#__PURE__*/function () {
       appType = _this$context3.appType,
       sdkVersion = _this$context3.sdkVersion,
       endpoint = _this$context3.endpoint;
-    return _extends({
+    return Object.assign({
       'app.type': appType,
       _v: sdkVersion,
       endpoint: endpoint,
@@ -189,11 +188,11 @@ export 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/es/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[];
     /**
      * 初始化
      */