@arms/rum-core 0.0.39 → 0.1.1

package/es/utils/url.js

@@ -0,0 +1,61 @@
+var safeDecode = function safeDecode(str) {
+  // 添加空值检查
+  if (str.length === 0) return "";
+  try {
+    // 先处理加号，然后进行 URL 解码
+    return decodeURIComponent(str.replace(/\+/g, ' '));
+  } catch (_unused) {
+    // 解码失败时的降级处理：处理常见的 URL 编码字符
+    return str.replace(/\+/g, ' ').replace(/%20/g, ' ').replace(/%2F/g, '/').replace(/%3D/g, '=').replace(/%26/g, '&').replace(/%3F/g, '?');
+  }
+};
+var getQueryString = function getQueryString(input) {
+  // 添加空值检查
+  if (input.length === 0) return "";
+
+  // 移除 hash 部分，然后提取查询字符串
+  var hashIndex = input.indexOf('#');
+  var withoutHash = hashIndex >= 0 ? input.slice(0, hashIndex) : input;
+  var queryStart = withoutHash.indexOf('?');
+  if (queryStart === -1) return "";
+  return withoutHash.slice(queryStart + 1);
+};
+export function getUrlParams(input) {
+  // 输入验证：检查是否为有效字符串
+  if (typeof input !== 'string' || !input.trim()) return {};
+  var params = {};
+  var query = getQueryString(input);
+
+  // 提前检查空查询
+  if (!query) return params;
+
+  // 使用 for 循环提高性能
+  var pairs = query.split('&');
+  for (var i = 0; i < pairs.length; i++) {
+    var pair = pairs[i];
+
+    // 跳过空键值对
+    if (!pair) continue;
+
+    // 查找第一个等号作为分隔符
+    var separatorIndex = pair.indexOf('=');
+    // 检查键是否存在且不为空
+    if (separatorIndex <= 0) continue;
+    var key = safeDecode(pair.slice(0, separatorIndex));
+    // 处理值为空的情况（如 key=）
+    var value = separatorIndex < pair.length - 1 ? safeDecode(pair.slice(separatorIndex + 1)) : "";
+
+    // 处理重复键：将单个值转换为数组
+    var existing = params[key];
+    if (existing !== undefined) {
+      if (Array.isArray(existing)) {
+        existing.push(value);
+      } else {
+        params[key] = [existing, value];
+      }
+    } else {
+      params[key] = value;
+    }
+  }
+  return params;
+}

package/lib/index.d.ts

@@ -2,12 +2,14 @@ import Client from './model/client';
 import Context from './model/context';
 import Reporter from './model/reporter';
 import Shell from './model/shell';
+export * from './model/configManager';
 export * from './types/client';
 export * from './types/collector';
 export * from './types/processor';
 export * from './types/reporter';
 export * from './types/rum-event';
 export * from './types/shell';
+export * from './types/config';
 export * from './utils/base';
 export * from './utils/polyfills';
 export * from './utils/is';
@@ -15,4 +17,5 @@ export * from './utils/number';
 export * from './utils/match';
 export * from './utils/trace';
 export * from './utils/verify';
+export * from './utils/url';
 export { Client, Context, Reporter, Shell };

package/lib/index.js

@@ -16,6 +16,13 @@ var _reporter = _interopRequireDefault(require("./model/reporter"));
 exports.Reporter = _reporter["default"];
 var _shell = _interopRequireDefault(require("./model/shell"));
 exports.Shell = _shell["default"];
+var _configManager = require("./model/configManager");
+Object.keys(_configManager).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _configManager[key]) return;
+  exports[key] = _configManager[key];
+});
 var _client2 = require("./types/client");
 Object.keys(_client2).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -58,6 +65,13 @@ Object.keys(_shell2).forEach(function (key) {
   if (key in exports && exports[key] === _shell2[key]) return;
   exports[key] = _shell2[key];
 });
+var _config = require("./types/config");
+Object.keys(_config).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _config[key]) return;
+  exports[key] = _config[key];
+});
 var _base = require("./utils/base");
 Object.keys(_base).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -106,4 +120,11 @@ Object.keys(_verify).forEach(function (key) {
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _verify[key]) return;
   exports[key] = _verify[key];
+});
+var _url = require("./utils/url");
+Object.keys(_url).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _url[key]) return;
+  exports[key] = _url[key];
 });

package/lib/model/client.d.ts

@@ -1,4 +1,5 @@
 import { IClient, IConfiguration, IContext, IRumSession } from '../types/client';
+import { IConfigManager } from "../types/config";
 import { RumEvent } from '../types/rum-event';
 import { IProcessor } from '../types/processor';
 import { ICollector } from '../types/collector';
@@ -9,7 +10,7 @@ declare class Client implements IClient {
     private processors;
     private reporter;
     private ctx;
-    init(config: IConfiguration, rumSession?: IRumSession): void;
+    init(config: IConfiguration, rumSession?: IRumSession, configManager?: IConfigManager): void;
     sendEvent: (payload: RumEvent) => void;
     setContext(ctx: IContext): void;
     getContext(): IContext;

package/lib/model/client.js

@@ -23,9 +23,9 @@ var Client = /*#__PURE__*/function () {
     };
   }
   var _proto = Client.prototype;
-  _proto.init = function init(config, rumSession) {
+  _proto.init = function init(config, rumSession, configManager) {
     var _this2 = this;
-    this.ctx = new _context["default"](config, rumSession);
+    this.ctx = new _context["default"](config, rumSession, configManager);
     var ctx = this.ctx,
       collectors = this.collectors,
       processors = this.processors,

package/lib/model/configManager.d.ts

@@ -0,0 +1,58 @@
+import { ICacheConfiguration, IConfigManager } from '../types/config';
+import { IConfiguration } from '../types/client';
+/**
+ * 配置管理器
+ * 提供配置管理的通用实现，各平台可以继承并实现特定方法
+ */
+export declare abstract class ConfigManager implements IConfigManager {
+    protected currentConfig: IConfiguration | null;
+    protected initialized: boolean;
+    /**
+     * 初始化配置管理器
+     * @param config 初始配置
+     */
+    init(config: IConfiguration): Promise<void>;
+    /**
+     * 获取配置
+     * @returns 配置数据
+     */
+    getConfig(): IConfiguration;
+    /**
+     * 更新配置
+     * @param config 新配置
+     */
+    setConfig(config: Partial<IConfiguration>): Promise<void>;
+    /**
+     * 检查缓存是否有效
+     * @param cachedData 缓存数据
+     * @param cacheTimeout 缓存超时时间
+     */
+    protected isCacheValid(cachedData: any, cacheTimeout?: number): boolean;
+    /**
+     * 合并配置
+     * @param remoteCfg 远程配置
+     * @returns 合并后的配置
+     */
+    mergeRemoteCfg(remoteCfg: any): IConfiguration | null;
+    abstract fetchRemoteCfg(config: IConfiguration): Promise<any>;
+    /**
+     * 抽象方法：获取本地存储的配置
+     * 各平台需要实现此方法来适配不同的本地存储方式
+     */
+    abstract getCacheConfig(): Promise<ICacheConfiguration> | ICacheConfiguration | void;
+    /**
+     * 抽象方法：存储配置到本地
+     * 各平台需要实现此方法来适配不同的本地存储方式
+     * @param config 配置数据
+     */
+    abstract setCacheConfig(config: ICacheConfiguration): void;
+    /**
+     * 抽象方法：解析远端配置为本地配置
+     * @param json 远端下发的配置数据
+     */
+    abstract parseConfig(json: any): unknown;
+    /**
+     * 销毁配置管理器
+     */
+    destroy(): void;
+}

package/lib/model/configManager.js

@@ -0,0 +1,182 @@
+"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 || {};
+  return {
+    enable: remoteConfig.enable !== false && !!(remoteConfig.url || remoteConfig.region),
+    url: remoteConfig.url || '',
+    mode: remoteConfig.mode || 'launch-first',
+    cacheTimeout: remoteConfig.cacheTimeout || 3600000
+  };
+}
+
+/**
+ * 配置管理器
+ * 提供配置管理的通用实现，各平台可以继承并实现特定方法
+ */
+var ConfigManager = exports.ConfigManager = /*#__PURE__*/function () {
+  function ConfigManager() {
+    this.currentConfig = null;
+    this.initialized = false;
+  }
+  var _proto = ConfigManager.prototype;
+  /**
+   * 初始化配置管理器
+   * @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 _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!this.initialized) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return");
+          case 2:
+            this.currentConfig = (0, _extends2["default"])({}, config);
+            this.initialized = true;
+            remoteConfig = parseRemoteConfig(config);
+            this.currentConfig.remoteConfig = remoteConfig;
+            if (remoteConfig.enable) {
+              _context.next = 8;
+              break;
+            }
+            return _context.abrupt("return");
+          case 8:
+            _context.next = 10;
+            return this.getCacheConfig();
+          case 10:
+            cacheConfig = _context.sent;
+            if (cacheConfig && cacheConfig.content) {
+              this.currentConfig = this.mergeRemoteCfg(cacheConfig.content);
+            }
+            if (!this.isCacheValid(cacheConfig, remoteConfig.cacheTimeout)) {
+              _context.next = 14;
+              break;
+            }
+            return _context.abrupt("return");
+          case 14:
+            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 = 18;
+              break;
+            }
+            _context.next = 18;
+            return asyncConfigPromise;
+          case 18:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, this);
+    }));
+    function init(_x) {
+      return _init.apply(this, arguments);
+    }
+    return init;
+  }()
+  /**
+   * 获取配置
+   * @returns 配置数据
+   */
+  ;
+  _proto.getConfig = function getConfig() {
+    if (!this.currentConfig) {
+      throw new Error('Config not initialized');
+    }
+    return this.currentConfig;
+  }
+
+  /**
+   * 更新配置
+   * @param config 新配置
+   */;
+  _proto.setConfig =
+  /*#__PURE__*/
+  function () {
+    var _setConfig = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(config) {
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (this.currentConfig) {
+              _context2.next = 2;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 2:
+            this.currentConfig = (0, _extends2["default"])({}, this.currentConfig, config);
+          case 3:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, this);
+    }));
+    function setConfig(_x2) {
+      return _setConfig.apply(this, arguments);
+    }
+    return setConfig;
+  }()
+  /**
+   * 检查缓存是否有效
+   * @param cachedData 缓存数据
+   * @param cacheTimeout 缓存超时时间
+   */
+  ;
+  _proto.isCacheValid = function isCacheValid(cachedData, cacheTimeout) {
+    if (!cachedData || !cachedData.timestamp) {
+      return false;
+    }
+    var timeout = cacheTimeout || 3600000; // 默认1小时
+    return Date.now() - cachedData.timestamp < timeout;
+  }
+
+  /**
+   * 合并配置
+   * @param remoteCfg 远程配置
+   * @returns 合并后的配置
+   */;
+  _proto.mergeRemoteCfg = function mergeRemoteCfg(remoteCfg) {
+    var _this$currentConfig = this.currentConfig,
+      pid = _this$currentConfig.pid,
+      app = _this$currentConfig.app,
+      endpoint = _this$currentConfig.endpoint,
+      remoteConfig = _this$currentConfig.remoteConfig,
+      beforeReport = _this$currentConfig.beforeReport,
+      properties = _this$currentConfig.properties;
+    return (0, _extends2["default"])({}, this.currentConfig, remoteCfg, {
+      pid: pid,
+      app: app,
+      endpoint: endpoint,
+      remoteConfig: remoteConfig,
+      beforeReport: beforeReport,
+      properties: properties
+    });
+  };
+  /**
+   * 销毁配置管理器
+   */
+  _proto.destroy = function destroy() {
+    this.currentConfig = null;
+    this.initialized = false;
+  };
+  return ConfigManager;
+}();

package/lib/model/context.d.ts

@@ -1,11 +1,13 @@
 import { IConfiguration, IContext, IRumSession } from "../types/client";
 import { RumEvent, IViewData } from "../types/rum-event";
+import { IConfigManager } from "../types/config";
 declare class Context implements IContext {
     private config;
     private rumEvent;
     private views;
     session: IRumSession;
-    constructor(config: IConfiguration, rumSession?: IRumSession);
+    configManager: IConfigManager;
+    constructor(config: IConfiguration, rumSession?: IRumSession, configManager?: IConfigManager);
     getConfig(): IConfiguration;
     setConfig(config: IConfiguration): void;
     getViews(): IViewData[];

package/lib/model/context.js

@@ -3,22 +3,33 @@
 exports.__esModule = true;
 exports["default"] = void 0;
 var Context = /*#__PURE__*/function () {
-  function Context(config, rumSession) {
+  function Context(config, rumSession, configManager) {
     this.config = config;
     this.rumEvent = void 0;
     this.views = [];
     this.session = void 0;
+    this.configManager = void 0;
     if (rumSession) {
       this.session = rumSession;
       this.session.init(this);
     }
+    if (configManager) {
+      this.configManager = configManager;
+    }
   }
   var _proto = Context.prototype;
   _proto.getConfig = function getConfig() {
+    if (this.configManager) {
+      return this.configManager.getConfig();
+    }
     return this.config;
   };
   _proto.setConfig = function setConfig(config) {
-    this.config = config;
+    if (this.configManager) {
+      this.configManager.setConfig(config);
+    } else {
+      this.config = config;
+    }
   };
   _proto.getViews = function getViews() {
     return this.views;

package/lib/model/reporter.d.ts

@@ -10,10 +10,7 @@ export default abstract class Reporter {
     protected ctx: IContext;
     private timer;
     private _init;
-    getReportCfg(): {
-        flushTime?: number;
-        maxEventCount?: number;
-    };
+    getReportCfg(): import("../types/client").IReportConfig;
     report(ctx: IContext): void;
     private pushToQueue;
     /**
@@ -21,6 +18,7 @@ export default abstract class Reporter {
      */
     protected flushEventQueue(): void;
     mergeEvent(ctx: IContext, events: RumEvent[], view: IViewData): void;
+    private tryRequest;
     /**
      * 接口请求由各平台 sdk reporter 实现
      */

package/lib/model/reporter.js

@@ -1,11 +1,16 @@
 "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 _rumEvent = require("../types/rum-event");
 var _exception = require("../utils/exception");
 var _is = require("../utils/is");
 var _verify = require("../utils/verify");
+var _url = require("../utils/url");
 var FLUSH_TIME = 3000;
 var MAX_EVENT_COUNT = 20;
 var attrs = ['app', 'user', 'device', 'os', 'geo', 'isp', 'net', 'properties'];
@@ -147,7 +152,8 @@ var Reporter = exports["default"] = /*#__PURE__*/function () {
       }
     }
     if (events.length === 0) return;
-    var bundle = {
+    var extend = (0, _url.getUrlParams)(config.endpoint);
+    var bundle = (0, _extends2["default"])({
       app: {
         id: config.pid,
         env: config.env || 'prod',
@@ -163,7 +169,7 @@ var Reporter = exports["default"] = /*#__PURE__*/function () {
       net: {},
       view: view,
       events: events
-    };
+    }, extend);
     attrs.forEach(function (key) {
       var obj = config[key];
       (0, _is.isObject)(obj) && Object.keys(obj).forEach(function (k) {
@@ -184,17 +190,54 @@ var Reporter = exports["default"] = /*#__PURE__*/function () {
       bundle = config.beforeReport(bundle);
       if (!bundle) return;
     }
-    this.request(ctx, bundle);
-  }
-
-  // /**
-  //  * 接口请求由各平台 sdk reporter 实现
-  //  */
-  // abstract request(ctx: IContext, events: RumEvent[], view: IViewData): void;
-
+    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;
+      return _regenerator["default"].wrap(function _callee$(_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 = 4;
+            bundle._retry = retry;
+            _context.next = 8;
+            return this.request(this.ctx, bundle);
+          case 8:
+            _context.next = 13;
+            break;
+          case 10:
+            _context.prev = 10;
+            _context.t0 = _context["catch"](4);
+            if (retry < maxRetryCount - 1) {
+              setTimeout(function () {
+                return _this2.tryRequest(bundle, retry + 1);
+              }, retryDelay);
+            }
+          case 13:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, this, [[4, 10]]);
+    }));
+    function tryRequest(_x, _x2) {
+      return _tryRequest.apply(this, arguments);
+    }
+    return tryRequest;
+  }()
   /**
    * 接口请求由各平台 sdk reporter 实现
-   */;
+   */
+  ;
   /**
    * 初始化时
    */

package/lib/model/shell.d.ts

@@ -4,29 +4,15 @@ import { IShell } from "../types/shell";
 export default abstract class Shell implements IShell {
     client: IClient;
     constructor(config?: IConfiguration);
-    getCombinedConfig(config?: IConfiguration): any;
-    updateFromRemoteConfig(config: any, reSetup?: boolean): void;
     /**
      * 初始化
      */
-    abstract init(configuration: IConfiguration): void;
+    abstract init(configuration: IConfiguration): Promise<Shell> | Shell;
     sendEvent(payload: RumEvent): void;
     /**
      * get config
      */
     getConfig(): IConfiguration;
-    /**
-     * 获取远程配置
-     */
-    abstract getRemoteConfig(url: string, config: any): object;
-    /**
-     * 存储远程配置到本地
-     */
-    abstract storeRemoteConfig(config: any, pid: string): boolean;
-    /**
-     * 提取本地存储的配置
-     */
-    abstract getLocalConfig(duration: number, pid: string): any;
     /**
      * set config
      */