@arms/rum-core 0.0.25-beta.11 → 0.0.25-beta.14

package/lib/model/client.d.ts

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

package/lib/model/client.js

@@ -6,6 +6,7 @@ exports["default"] = void 0;
 var _client = require("../types/client");
 var _events = require("events");
 var _context = _interopRequireDefault(require("./context"));
+var _is = require("../utils/is");
 function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -22,13 +23,16 @@ var Client = /*#__PURE__*/function () {
     };
   }
   var _proto = Client.prototype;
-  _proto.init = function init(config) {
+  _proto.init = function init(config, rumSession) {
     var _this2 = this;
-    this.ctx = new _context["default"](config);
+    this.ctx = new _context["default"](config, rumSession);
     var ctx = this.ctx,
       collectors = this.collectors,
       processors = this.processors,
       reporter = this.reporter;
+    processors.forEach(function (processor) {
+      (0, _is.isFunction)(processor.setup) && processor.setup(ctx);
+    });
 
     // collector 收集数据统一 push 到各匹配 processor
     this.emitter.on(_client.EventType.collect, function (payload) {

package/lib/model/context.d.ts

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

package/lib/model/context.js

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

package/lib/model/reporter.js

@@ -117,7 +117,9 @@ var Reporter = exports["default"] = /*#__PURE__*/function () {
         });
       }
     });
-    this.request(ctx, eventQueue, curView);
+    var session = ctx.session;
+    var sampled = session ? session.getSampled() : true;
+    sampled && this.request(ctx, eventQueue, curView);
     this.eventQueue = [];
   }
 

package/lib/types/client.d.ts

@@ -10,6 +10,7 @@ export declare enum EventType {
     collect = "collect"
 }
 export interface IContext {
+    session: IRumSession;
     /**
      * user config
      */
@@ -28,11 +29,26 @@ export interface IContext {
     setRumEvent(rumEvent: RumEvent): void;
     [key: string]: any;
 }
+export interface SessionConfig {
+    sampleRate?: number;
+    maxDuration?: number;
+    overtime?: number;
+}
+export interface IRumSession {
+    init(config: IConfiguration): void;
+    sessionConfig: SessionConfig;
+    getSessionId: () => string;
+    getSampled: () => boolean;
+    updateSession: () => void;
+    getEventId: () => string;
+    getViewId: () => string;
+    getUserId: () => string;
+}
 export interface IClient {
     /**
      * 初始化
      */
-    init: (configuration: IConfiguration) => void;
+    init: (configuration: IConfiguration, rumSession?: IRumSession) => void;
     /**
      * 业务自定义上传数据
      */
@@ -95,6 +111,10 @@ export interface IConfiguration {
         flushTime?: number;
         maxEventCount?: number;
     };
+    /**
+     * session config
+     */
+    sessionConfig?: SessionConfig;
     /**
      * 各个 collector config
      */

package/lib/types/processor.d.ts

@@ -2,6 +2,7 @@ import { IContext } from './client';
 import { RumEvent } from './rum-event';
 export interface IProcessor {
     name: string;
+    setup?(ctx: IContext): void;
     process(ctx: IContext): RumEvent;
     match?(ctx: IContext): boolean;
 }

package/lib/utils/base.d.ts

@@ -15,17 +15,16 @@ export declare function generateTraceId(): string;
 /**
  * @description: 随机生成 spanId
  * @param len {number}
+ * @param radix {number}
  * @return {String}
  */
-export declare function generateSpanId(len?: number): string;
+export declare function generateSpanId(len?: number, radix?: number): string;
 /**
  * @description: 随机生成 eventId
  * @param sessionId {string} sessionId
- * @param sampled {boolean} 是否命中采样
- * @param samplingType {string} 采样类型
  * @return {String}
  */
-export declare function generateEventId(sessionId: string, sampled?: boolean, samplingType?: string): string;
+export declare function generateEventId(sessionId: string): string;
 /**
  * @desc 函数防抖
  * @param func 回调函数

package/lib/utils/base.js

@@ -34,8 +34,18 @@ function generateGUID() {
   try {
     if (crypto && crypto.randomUUID) {
       guid = crypto.randomUUID();
+    } else if (crypto && crypto.getRandomValues) {
+      var buf = new Uint8Array(16);
+      crypto.getRandomValues(buf);
+      buf[6] = buf[6] & 0x0f | 0x40; // version 4 UUID
+      buf[8] = buf[8] & 0x3f | 0x80; // variant 10xxxxxx
+      guid = buf.reduce(function (str, _byte) {
+        return str + _byte.toString(16).padStart(2, '0');
+      }, '').replace(/^(.{8})(.{4})(.{4})(.{4})(.{12})$/, '\$1-\$2-\$3-\$4-\$5');
     }
-  } catch (e) {}
+  } catch (e) {
+    //
+  }
   if (!guid) {
     guid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
       var r = Math.random() * 16 | 0,
@@ -65,39 +75,31 @@ function generateTraceId() {
 /**
  * @description: 随机生成 spanId
  * @param len {number}
+ * @param radix {number}
  * @return {String}
  */
-function generateSpanId(len) {
+function generateSpanId(len, radix) {
   if (len === void 0) {
     len = 16;
   }
-  var list = Array(len);
+  if (radix === void 0) {
+    radix = 16;
+  }
+  var result = '';
   for (var i = 0; i < len; i++) {
-    list[i] = Math.floor(Math.random() * 16) + 48;
-    // valid hex characters in the range 48-57 and 97-102
-    if (list[i] >= 58) {
-      list[i] += 39;
-    }
+    result += Math.floor(Math.random() * radix).toString(radix);
   }
-  return String.fromCharCode.apply(null, list);
+  return result;
 }
 
 /**
  * @description: 随机生成 eventId
  * @param sessionId {string} sessionId
- * @param sampled {boolean} 是否命中采样
- * @param samplingType {string} 采样类型
  * @return {String}
  */
-function generateEventId(sessionId, sampled, samplingType) {
-  if (sampled === void 0) {
-    sampled = true;
-  }
-  if (samplingType === void 0) {
-    samplingType = '0';
-  }
+function generateEventId(sessionId) {
   var spanId = generateSpanId();
-  return "00-" + sessionId + "-" + spanId + "-" + samplingType + (sampled ? '1' : '0');
+  return "00-" + sessionId + "-" + spanId;
 }
 
 /**

package/lib/utils/number.d.ts

@@ -1,9 +1,12 @@
+export declare const ONE_SECOND = 1000;
+export declare const ONE_MINUTE: number;
+export declare const ONE_HOUR: number;
+export declare const ONE_DAY: number;
 /**
  * Return true if the draw is successful
  * @param threshold between 0 and 100
  */
 export declare function performDraw(threshold: number): boolean;
-export declare function round(num: number, decimals: 0 | 1 | 2 | 3 | 4): number;
 /**
  * 保留指定位数的小数
  * @param num 原数据

package/lib/utils/number.js

@@ -1,9 +1,14 @@
 "use strict";
 
 exports.__esModule = true;
+exports.ONE_SECOND = exports.ONE_MINUTE = exports.ONE_HOUR = exports.ONE_DAY = void 0;
 exports.formatNumber = formatNumber;
 exports.performDraw = performDraw;
-exports.round = round;
+var ONE_SECOND = exports.ONE_SECOND = 1e3;
+var ONE_MINUTE = exports.ONE_MINUTE = 60 * ONE_SECOND;
+var ONE_HOUR = exports.ONE_HOUR = 60 * ONE_MINUTE;
+var ONE_DAY = exports.ONE_DAY = 24 * ONE_HOUR;
+
 /**
  * Return true if the draw is successful
  * @param threshold between 0 and 100
@@ -11,9 +16,6 @@ exports.round = round;
 function performDraw(threshold) {
   return threshold !== 0 && Math.random() * 100 <= threshold;
 }
-function round(num, decimals) {
-  return +num.toFixed(decimals);
-}
 
 /**
  * 保留指定位数的小数

package/package.json

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