@arms/rum-core 0.0.40 → 0.1.2

package/lib/utils/base.js

@@ -9,8 +9,8 @@ exports.generateSpanId = generateSpanId;
 exports.generateTraceId = generateTraceId;
 exports.getType = getType;
 exports.interceptFunction = interceptFunction;
+exports.parseRegExpString = parseRegExpString;
 exports.restoreFunction = restoreFunction;
-exports.toRegFormat = toRegFormat;
 exports.transStrToReg = transStrToReg;
 var _is = require("./is");
 // 类型匹配正则
@@ -187,42 +187,71 @@ function transStrToReg(str) {
   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]);
+//     }
+//   }
+// }
+
 /**
- *
- * @param config 配置
- * @param keys 需要转换的字段
+ * 解析正则表达式字符串，支持 /pattern/flags 格式
+ * @param str 正则表达式字符串，如 "/a/ig" 或 "a"
+ * @returns RegExp 对象
  */
-function toRegFormat(config, keys) {
-  if (getType(keys) === 'string') {
-    keys = [keys];
+function parseRegExpString(str) {
+  if (typeof str !== 'string') {
+    throw new TypeError('input must be a string');
   }
-  for (var i = 0, len = keys.length; i < len; i++) {
-    var paths = keys[i].split('.');
-    var lastIndex = paths.length - 1;
-    if (!config) break;
-    var tmp = config;
-    for (var j = 0, jlen = paths.length; j < jlen; j++) {
-      if (paths[j] === '[]') {
-        if (getType(tmp) === 'array') {
-          var lastPath = paths.splice(j + 1);
-          lastPath = lastPath.join('.');
-          for (var 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 (var _j = 0, _jlen = tmp.length; _j < _jlen; _j++) {
-      tmp[_j] = transStrToReg(tmp[_j]);
+
+  // 检查是否是 /pattern/flags 格式
+  if (str.length > 2 && str[0] === '/') {
+    // 从后往前找最后一个 /，作为分隔符
+    var lastSlashIndex = str.lastIndexOf('/');
+    if (lastSlashIndex > 0) {
+      // 提取 pattern（第一个 / 和最后一个 / 之间的内容）
+      var pattern = str.substring(1, lastSlashIndex);
+      // 提取 flags（最后一个 / 之后的内容）
+      var flags = str.substring(lastSlashIndex + 1);
+      return new RegExp(pattern, flags);
     }
+    // 如果只有一个 /，当作 /pattern/ 格式处理（无 flags）
+    return new RegExp(str.substring(1, str.length - 1));
   }
+
+  // 如果不是 /pattern/flags 格式，直接作为 pattern 使用
+  return new RegExp(str);
 }

package/lib/utils/match.d.ts

@@ -5,3 +5,9 @@ export declare function isMatchOption(item: unknown): item is MatchOption;
  */
 export declare function matchList(list: MatchOption[], value: string, useStartsWith?: boolean, options?: unknown): boolean;
 export declare function urlMatch(url: string, list?: MatchOption | MatchOption[]): boolean;
+export interface IRule {
+    match: string;
+    match_exp: string;
+    [key: string]: unknown;
+}
+export declare function parseRule2Match(rule: IRule | MatchOption): MatchOption;

package/lib/utils/match.js

@@ -3,9 +3,11 @@
 exports.__esModule = true;
 exports.isMatchOption = isMatchOption;
 exports.matchList = matchList;
+exports.parseRule2Match = parseRule2Match;
 exports.urlMatch = urlMatch;
 var _is = require("./is");
 var _polyfills = require("./polyfills");
+var _base = require("./base");
 function isMatchOption(item) {
   return (0, _is.isString)(item) || (0, _is.isFunction)(item) || (0, _is.isRegExp)(item);
 }
@@ -43,4 +45,37 @@ function urlMatch(url, list) {
   } catch (e) {
     return false;
   }
+}
+function parseRule2Match(rule) {
+  if (isMatchOption(rule)) {
+    return rule;
+  }
+  var match;
+  switch (rule.match_exp) {
+    case 'equals':
+      match = function match(value) {
+        return value === rule.match;
+      };
+      break;
+    case 'not_equals':
+      match = function match(value) {
+        return value !== rule.match;
+      };
+      break;
+    case 'regex':
+      match = (0, _base.parseRegExpString)(rule.match);
+      break;
+    case 'includes':
+      match = function match(value) {
+        return value.includes(rule.match);
+      };
+      break;
+    case 'starts_with':
+    default:
+      match = function match(value) {
+        return (0, _polyfills.startsWith)(value, rule.match);
+      };
+      break;
+  }
+  return match;
 }

package/lib/utils/trace.d.ts

@@ -1,8 +1,12 @@
 import { MatchOption } from "./match";
 export type PropagatorType = 'tracecontext' | 'b3' | 'b3multi' | 'jaeger' | 'sw8';
 export type TraceOption = {
+    enable?: boolean;
+    sampling?: number;
     match: MatchOption;
-    propagatorTypes: PropagatorType[];
+    propagatorTypes?: PropagatorType[];
+    baggage?: boolean;
+    tracestate?: boolean;
 };
 export declare function isTraceOption(option: any): option is TraceOption;
 export interface ITracingOption {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arms/rum-core",
-  "version": "0.0.40",
+  "version": "0.1.2",
   "description": "arms rum javascript sdk core",
   "author": "guangli.fj <guangli.fj@alibaba-inc.com>",
   "license": "ISC",

package/es/utils/combineConfig.d.ts

@@ -1,15 +0,0 @@
-export declare function isRemoteConfigEnable(config: any): boolean;
-/**
- *
- * @param config
- * @returns
- */
-export declare function getRemoteConfigUrl(config: any): any;
-/**
- *
- * @param oldConfig
- * @param remoteConfig
- * @returns config
- */
-declare function combineConfig(oldConfig?: {}, remoteConfig?: any): {};
-export default combineConfig;

package/es/utils/combineConfig.js

@@ -1,101 +0,0 @@
-import _extends from "@babel/runtime/helpers/extends";
-import { getType, toRegFormat } from './base';
-
-// 需要检查是否需要字符串格式化为正则的配置路径
-var REG_FORMAT_PATHS = ['filters.exception', 'filters.resource', 'tracing.allowedUrls.[].match'];
-export function isRemoteConfigEnable(config) {
-  return config.remoteConfig === true || config.remoteConfig && config.remoteConfig.enable !== false;
-}
-
-/**
- * 
- * @param config 
- * @returns 
- */
-export function getRemoteConfigUrl(config) {
-  if (config.remoteConfig && config.remoteConfig.url) {
-    return config.remoteConfig.url;
-  }
-  var sereis = config.pid.split('@');
-  if (!sereis || sereis.length < 2) return;
-  var timestamp = Date.now();
-  return "//" + sereis[0] + "-sdk.rum.aliyuncs.com/config/" + (config.remoteConfig.region || 'cn-hangzhou') + "/" + sereis[1] + "?t=" + timestamp;
-}
-
-/**
- * 
- * @param oldConfig 
- * @param remoteConfig 
- */
-function doCover(oldConfig, remoteConfig) {
-  if (oldConfig === void 0) {
-    oldConfig = {};
-  }
-  if (remoteConfig === void 0) {
-    remoteConfig = {};
-  }
-  for (var key in oldConfig) {
-    var _remoteConfig, _remoteConfig2;
-    if (key === 'pid' || key === 'endpoint') continue;
-    if (((_remoteConfig = remoteConfig) === null || _remoteConfig === void 0 ? void 0 : _remoteConfig[key]) === undefined) continue;
-    var oldV = oldConfig[key];
-    var newV = (_remoteConfig2 = remoteConfig) === null || _remoteConfig2 === void 0 ? void 0 : _remoteConfig2[key];
-    if (getType(oldV) === 'object' && getType(newV) === 'object') {
-      doCover(oldV, newV);
-    } else {
-      oldConfig[key] = newV;
-    }
-  }
-}
-
-/**
- * 
- * @param oldConfig 
- * @param remoteConfig 
- */
-function doSupplement(oldConfig, remoteConfig) {
-  if (oldConfig === void 0) {
-    oldConfig = {};
-  }
-  if (remoteConfig === void 0) {
-    remoteConfig = {};
-  }
-  for (var key in remoteConfig) {
-    var _oldConfig;
-    if (((_oldConfig = oldConfig) === null || _oldConfig === void 0 ? void 0 : _oldConfig[key]) === undefined) {
-      oldConfig[key] = remoteConfig[key];
-    } else {
-      var oldV = oldConfig[key];
-      var newV = remoteConfig[key];
-      if (getType(oldV) === 'object' && getType(newV) === 'object') {
-        doSupplement(oldV, newV);
-      }
-    }
-  }
-}
-
-/**
- * 
- * @param oldConfig 
- * @param remoteConfig 
- * @returns config
- */
-function combineConfig(oldConfig, remoteConfig) {
-  if (oldConfig === void 0) {
-    oldConfig = {};
-  }
-  if (remoteConfig === void 0) {
-    remoteConfig = null;
-  }
-  if (!remoteConfig) return null;
-  if (getType(oldConfig) !== 'object' || getType(remoteConfig) !== 'object') return null;
-  var config = _extends({}, oldConfig);
-  // 先检查远程配置的，是否有需要将字符串格式化为正则的
-  toRegFormat(remoteConfig, REG_FORMAT_PATHS);
-  // 执行覆盖
-  doCover(config, remoteConfig);
-  // 执行补充
-  doSupplement(config, remoteConfig);
-  return config;
-}
-export default combineConfig;

package/lib/utils/combineConfig.d.ts

@@ -1,15 +0,0 @@
-export declare function isRemoteConfigEnable(config: any): boolean;
-/**
- *
- * @param config
- * @returns
- */
-export declare function getRemoteConfigUrl(config: any): any;
-/**
- *
- * @param oldConfig
- * @param remoteConfig
- * @returns config
- */
-declare function combineConfig(oldConfig?: {}, remoteConfig?: any): {};
-export default combineConfig;

package/lib/utils/combineConfig.js

@@ -1,107 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-exports.__esModule = true;
-exports["default"] = void 0;
-exports.getRemoteConfigUrl = getRemoteConfigUrl;
-exports.isRemoteConfigEnable = isRemoteConfigEnable;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _base = require("./base");
-// 需要检查是否需要字符串格式化为正则的配置路径
-var REG_FORMAT_PATHS = ['filters.exception', 'filters.resource', 'tracing.allowedUrls.[].match'];
-function isRemoteConfigEnable(config) {
-  return config.remoteConfig === true || config.remoteConfig && config.remoteConfig.enable !== false;
-}
-
-/**
- * 
- * @param config 
- * @returns 
- */
-function getRemoteConfigUrl(config) {
-  if (config.remoteConfig && config.remoteConfig.url) {
-    return config.remoteConfig.url;
-  }
-  var sereis = config.pid.split('@');
-  if (!sereis || sereis.length < 2) return;
-  var timestamp = Date.now();
-  return "//" + sereis[0] + "-sdk.rum.aliyuncs.com/config/" + (config.remoteConfig.region || 'cn-hangzhou') + "/" + sereis[1] + "?t=" + timestamp;
-}
-
-/**
- * 
- * @param oldConfig 
- * @param remoteConfig 
- */
-function doCover(oldConfig, remoteConfig) {
-  if (oldConfig === void 0) {
-    oldConfig = {};
-  }
-  if (remoteConfig === void 0) {
-    remoteConfig = {};
-  }
-  for (var key in oldConfig) {
-    var _remoteConfig, _remoteConfig2;
-    if (key === 'pid' || key === 'endpoint') continue;
-    if (((_remoteConfig = remoteConfig) === null || _remoteConfig === void 0 ? void 0 : _remoteConfig[key]) === undefined) continue;
-    var oldV = oldConfig[key];
-    var newV = (_remoteConfig2 = remoteConfig) === null || _remoteConfig2 === void 0 ? void 0 : _remoteConfig2[key];
-    if ((0, _base.getType)(oldV) === 'object' && (0, _base.getType)(newV) === 'object') {
-      doCover(oldV, newV);
-    } else {
-      oldConfig[key] = newV;
-    }
-  }
-}
-
-/**
- * 
- * @param oldConfig 
- * @param remoteConfig 
- */
-function doSupplement(oldConfig, remoteConfig) {
-  if (oldConfig === void 0) {
-    oldConfig = {};
-  }
-  if (remoteConfig === void 0) {
-    remoteConfig = {};
-  }
-  for (var key in remoteConfig) {
-    var _oldConfig;
-    if (((_oldConfig = oldConfig) === null || _oldConfig === void 0 ? void 0 : _oldConfig[key]) === undefined) {
-      oldConfig[key] = remoteConfig[key];
-    } else {
-      var oldV = oldConfig[key];
-      var newV = remoteConfig[key];
-      if ((0, _base.getType)(oldV) === 'object' && (0, _base.getType)(newV) === 'object') {
-        doSupplement(oldV, newV);
-      }
-    }
-  }
-}
-
-/**
- * 
- * @param oldConfig 
- * @param remoteConfig 
- * @returns config
- */
-function combineConfig(oldConfig, remoteConfig) {
-  if (oldConfig === void 0) {
-    oldConfig = {};
-  }
-  if (remoteConfig === void 0) {
-    remoteConfig = null;
-  }
-  if (!remoteConfig) return null;
-  if ((0, _base.getType)(oldConfig) !== 'object' || (0, _base.getType)(remoteConfig) !== 'object') return null;
-  var config = (0, _extends2["default"])({}, oldConfig);
-  // 先检查远程配置的，是否有需要将字符串格式化为正则的
-  (0, _base.toRegFormat)(remoteConfig, REG_FORMAT_PATHS);
-  // 执行覆盖
-  doCover(config, remoteConfig);
-  // 执行补充
-  doSupplement(config, remoteConfig);
-  return config;
-}
-var _default = exports["default"] = combineConfig;