@arms/rum-core 0.0.39 → 0.1.1

package/lib/utils/combineConfig.js

@@ -1,107 +1,90 @@
-"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;
+// import{ getType, toRegFormat} from './base';
+//
+//
+// // 需要检查是否需要字符串格式化为正则的配置路径
+// const REG_FORMAT_PATHS = [
+//   'filters.exception',
+//   'filters.resource',
+//   'tracing.allowedUrls.[].match'
+// ];
+//
+// export function isRemoteConfigEnable(config: any) {
+//   return config.remoteConfig === true ||
+//   (config.remoteConfig && config.remoteConfig.enable !== false);
+// }
+//
+// /**
+//  *
+//  * @param config
+//  * @returns
+//  */
+// export function getRemoteConfigUrl(config: any){
+//   if(config.remoteConfig && config.remoteConfig.url) {
+//     return config.remoteConfig.url;
+//   }
+//   const sereis = config.pid.split('@');
+//   if(!sereis || sereis.length<2) return;
+//   const 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: any ={}, remoteConfig: any ={}){
+//   for(const key in oldConfig) {
+//     if(key === 'pid' || key === 'endpoint') continue;
+//     if(remoteConfig?.[key] === undefined) continue;
+//     const oldV = oldConfig[key];
+//     const newV = remoteConfig?.[key];
+//     if(getType(oldV) === 'object' && getType(newV) === 'object') {
+//       doCover(oldV, newV);
+//     } else {
+//       oldConfig[key] = newV;
+//     }
+//   }
+// }
+//
+// /**
+//  *
+//  * @param oldConfig
+//  * @param remoteConfig
+//  */
+// function doSupplement(oldConfig: any ={}, remoteConfig: any ={}) {
+//   for(const key in remoteConfig) {
+//     if(oldConfig?.[key] === undefined) {
+//       oldConfig[key] = remoteConfig[key];
+//     } else {
+//       const oldV = oldConfig[key];
+//       const newV = remoteConfig[key];
+//       if(getType(oldV) === 'object' && getType(newV) === 'object') {
+//         doSupplement(oldV, newV);
+//       }
+//     }
+//   }
+// }
+//
+// /**
+//  *
+//  * @param oldConfig
+//  * @param remoteConfig
+//  * @returns config
+//  */
+// function combineConfig(oldConfig={}, remoteConfig=null) {
+//   if(!remoteConfig) return null;
+//   if(getType(oldConfig) !== 'object' || getType(remoteConfig) !== 'object') return null;
+//   const config = {...oldConfig};
+//   // 先检查远程配置的，是否有需要将字符串格式化为正则的
+//   toRegFormat(remoteConfig, REG_FORMAT_PATHS);
+//   // 执行覆盖
+//   doCover(config, remoteConfig);
+//   // 执行补充
+//   doSupplement(config, remoteConfig);
+//   return config;
+// }
+//
+//
+// export default combineConfig;
+"use strict";

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/lib/utils/url.d.ts

@@ -0,0 +1,2 @@
+export type UrlParams = Record<string, string | string[]>;
+export declare function getUrlParams(input: string): UrlParams;

package/lib/utils/url.js

@@ -0,0 +1,65 @@
+"use strict";
+
+exports.__esModule = true;
+exports.getUrlParams = getUrlParams;
+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);
+};
+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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arms/rum-core",
-  "version": "0.0.39",
+  "version": "0.1.1",
   "description": "arms rum javascript sdk core",
   "author": "guangli.fj <guangli.fj@alibaba-inc.com>",
   "license": "ISC",
@@ -23,7 +23,7 @@
     "start": "build-scripts build --watch",
     "build": "build-scripts build --skip-demo",
     "prepublishOnly": "npm run build",
-    "test": "node ./__tests__/@arms/core.test.js"
+    "test": "npm run build && jest ./__tests__"
   },
   "peerDependencies": {
     "@babel/runtime": "^7.24.5"

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/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;