@arms/rum-core 0.0.39 → 0.0.40

package/es/model/reporter.js

@@ -1,7 +1,9 @@
+import _extends from "@babel/runtime/helpers/extends";
 import { RumEventType } from '../types/rum-event';
 import { getErrorID } from '../utils/exception';
 import { isNumber, isObject, isString } from "../utils/is";
 import { verifyProperties } from "../utils/verify";
+import { getUrlParams } from "../utils/url";
 var FLUSH_TIME = 3000;
 var MAX_EVENT_COUNT = 20;
 var attrs = ['app', 'user', 'device', 'os', 'geo', 'isp', 'net', 'properties'];
@@ -143,7 +145,8 @@ var Reporter = /*#__PURE__*/function () {
       }
     }
     if (events.length === 0) return;
-    var bundle = {
+    var extend = getUrlParams(config.endpoint);
+    var bundle = _extends({
       app: {
         id: config.pid,
         env: config.env || 'prod',
@@ -159,7 +162,7 @@ var Reporter = /*#__PURE__*/function () {
       net: {},
       view: view,
       events: events
-    };
+    }, extend);
     attrs.forEach(function (key) {
       var obj = config[key];
       isObject(obj) && Object.keys(obj).forEach(function (k) {

package/es/types/client.d.ts

@@ -83,8 +83,9 @@ export interface IClient {
 export interface IConfiguration {
     /**
      * 项目 id
+     * v0.0.40开始，不强依赖该参数，通过Endpoint获取 service_id 确定应用
      */
-    pid: string;
+    pid?: string;
     /**
      * 应用环境
      */

package/es/types/rum-event.d.ts

@@ -176,4 +176,5 @@ export interface RumEventBundle {
     events: Array<RumEvent>;
     properties?: BaseObject;
     _v?: string;
+    [key: string]: unknown;
 }

package/es/utils/base.js

@@ -1,7 +1,5 @@
 import { isFunction } from "./is";
 
-// 插值前缀
-var PRE_SUF_FIX = '__';
 // 类型匹配正则
 var TYPE_REG = /^\[object ([a-z]*)\]$/;
 
@@ -13,8 +11,7 @@ export function interceptFunction(target, name, callback, isPrototype) {
     isPrototype = false;
   }
   var registeredMethod = target[name];
-  target["" + PRE_SUF_FIX + name + PRE_SUF_FIX] = registeredMethod;
-  target[name] = function () {
+  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];
@@ -24,17 +21,19 @@ export function interceptFunction(target, name, callback, isPrototype) {
       return registeredMethod.apply(ctx, args);
     }
   };
+  proxyMethod._rum_intercepted = registeredMethod;
+  target[name] = proxyMethod;
 }
 
 /**
  * 还原函数
  */
 export function restoreFunction(target, name) {
-  var key = "" + PRE_SUF_FIX + name + PRE_SUF_FIX;
-  if (typeof target[key] == 'function') {
-    target[name] = target[key];
-    delete target[key];
-  }
+  var proxyMethod = target[name];
+  if (isFunction(proxyMethod)) return;
+  var originalMethod = proxyMethod._rum_intercepted;
+  if (isFunction(originalMethod)) return;
+  target[name] = originalMethod;
 }
 
 /**

package/es/utils/url.d.ts

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

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/model/reporter.js

@@ -1,11 +1,14 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 exports.__esModule = true;
 exports["default"] = void 0;
+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 +150,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 +167,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) {

package/lib/types/client.d.ts

@@ -83,8 +83,9 @@ export interface IClient {
 export interface IConfiguration {
     /**
      * 项目 id
+     * v0.0.40开始，不强依赖该参数，通过Endpoint获取 service_id 确定应用
      */
-    pid: string;
+    pid?: string;
     /**
      * 应用环境
      */

package/lib/types/rum-event.d.ts

@@ -176,4 +176,5 @@ export interface RumEventBundle {
     events: Array<RumEvent>;
     properties?: BaseObject;
     _v?: string;
+    [key: string]: unknown;
 }

package/lib/utils/base.js

@@ -13,8 +13,6 @@ exports.restoreFunction = restoreFunction;
 exports.toRegFormat = toRegFormat;
 exports.transStrToReg = transStrToReg;
 var _is = require("./is");
-// 插值前缀
-var PRE_SUF_FIX = '__';
 // 类型匹配正则
 var TYPE_REG = /^\[object ([a-z]*)\]$/;
 
@@ -26,8 +24,7 @@ function interceptFunction(target, name, callback, isPrototype) {
     isPrototype = false;
   }
   var registeredMethod = target[name];
-  target["" + PRE_SUF_FIX + name + PRE_SUF_FIX] = registeredMethod;
-  target[name] = function () {
+  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];
@@ -37,17 +34,19 @@ function interceptFunction(target, name, callback, isPrototype) {
       return registeredMethod.apply(ctx, args);
     }
   };
+  proxyMethod._rum_intercepted = registeredMethod;
+  target[name] = proxyMethod;
 }
 
 /**
  * 还原函数
  */
 function restoreFunction(target, name) {
-  var key = "" + PRE_SUF_FIX + name + PRE_SUF_FIX;
-  if (typeof target[key] == 'function') {
-    target[name] = target[key];
-    delete target[key];
-  }
+  var proxyMethod = target[name];
+  if ((0, _is.isFunction)(proxyMethod)) return;
+  var originalMethod = proxyMethod._rum_intercepted;
+  if ((0, _is.isFunction)(originalMethod)) return;
+  target[name] = originalMethod;
 }
 
 /**

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.0.40",
   "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"