@arms/rum-core 0.0.9 → 0.0.18

package/lib/model/reporter.d.ts

@@ -9,8 +9,10 @@ export default abstract class Reporter {
     protected eventQueue: RumEvent[];
     protected ctx: IContext;
     private timer;
-    private FLUSH_TIME;
-    private MAX_EVENT_COUNT;
+    getReportCfg(): {
+        flushTime?: number;
+        maxEventCount?: number;
+    };
     report(ctx: IContext): void;
     private pushToQueue;
     /**

package/lib/model/reporter.js

@@ -4,6 +4,9 @@ exports.__esModule = true;
 exports["default"] = void 0;
 var _rumEvent = require("../types/rum-event");
 var _exception = require("../utils/exception");
+var _is = require("../utils/is");
+var FLUSH_TIME = 3000;
+var MAX_EVENT_COUNT = 50;
 var Reporter = exports["default"] = /*#__PURE__*/function () {
   function Reporter() {
     this.name = 'reporter';
@@ -14,24 +17,35 @@ var Reporter = exports["default"] = /*#__PURE__*/function () {
     this.eventQueue = [];
     this.ctx = void 0;
     this.timer = void 0;
-    this.FLUSH_TIME = 3000;
-    this.MAX_EVENT_COUNT = 50;
   }
   var _proto = Reporter.prototype;
+  _proto.getReportCfg = function getReportCfg() {
+    var cfg = this.ctx.getConfig().reportConfig;
+    if (!(0, _is.isObject)(cfg)) {
+      cfg = {};
+    }
+    if (!cfg.flushTime || cfg.flushTime < 0 || cfg.flushTime > 10000) {
+      cfg.flushTime = FLUSH_TIME;
+    }
+    if (!cfg.maxEventCount || cfg.maxEventCount < 0 || cfg.maxEventCount > 100) {
+      cfg.maxEventCount = MAX_EVENT_COUNT;
+    }
+    return cfg;
+  };
   _proto.report = function report(ctx) {
     var _this = this;
     this.ctx = ctx;
     this.init(ctx);
     clearTimeout(this.timer);
     this.pushToQueue();
-
+    var reportConfig = this.getReportCfg();
     // 超过 MaxCount 直接 flush，否则延迟发送
-    if (this.eventQueue.length >= this.MAX_EVENT_COUNT) {
+    if (this.eventQueue.length >= reportConfig.maxEventCount) {
       this.flushEventQueue();
     } else {
       this.timer = setTimeout(function () {
         _this.flushEventQueue();
-      }, this.FLUSH_TIME);
+      }, reportConfig.flushTime);
     }
   };
   _proto.pushToQueue = function pushToQueue() {

package/lib/types/client.d.ts

@@ -87,6 +87,13 @@ export interface IConfiguration {
      * reporter 发送事件之前
      */
     beforeReport?(bundle: RumEventBundle): any;
+    /**
+     * reporter 发送节奏配置
+     */
+    reportConfig?: {
+        flushTime?: number;
+        maxEventCount?: number;
+    };
     /**
      * 各个 collector config
      */

package/lib/utils/base.d.ts

@@ -4,11 +4,9 @@
 export declare function interceptFunction(options: any, name: string, callback: Function): void;
 /**
  * @description: GUID v4
- * @from https://gist.github.com/jed/982883
- * @param placeholder {String}
  * @return {String}
  */
-export declare function generateGUID(placeholder?: string): string;
+export declare function generateGUID(): string;
 /**
  * @description: 唯一的字符串 universe unique id
  * @param len {String}

package/lib/utils/base.js

@@ -22,14 +22,20 @@ function interceptFunction(options, name, callback) {
 
 /**
  * @description: GUID v4
- * @from https://gist.github.com/jed/982883
- * @param placeholder {String}
  * @return {String}
  */
-function generateGUID(placeholder) {
-  return placeholder ?
-  // eslint-disable-next-line  no-bitwise
-  (parseInt(placeholder, 10) ^ Math.random() * 16 >> parseInt(placeholder, 10) / 4).toString(16) : (1e7 + "-" + 1e3 + "-" + 4e3 + "-" + 8e3 + "-" + 1e11).replace(/[018]/g, generateGUID);
+function generateGUID() {
+  try {
+    if (crypto && crypto.randomUUID) {
+      return crypto.randomUUID();
+    }
+  } catch (e) {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+      var r = Math.random() * 16 | 0,
+        v = c == 'x' ? r : r & 0x3 | 0x8;
+      return v.toString(16);
+    });
+  }
 }
 
 /**

package/lib/utils/is.d.ts

@@ -8,3 +8,5 @@ export declare const isArray: IsFnHelper<unknown[]>;
 export declare const isRegExp: IsFnHelper<string>;
 export declare const isBoolean: IsFnHelper<boolean>;
 export declare const isNumber: IsFnHelper<number | bigint>;
+export declare const isNull: IsFnHelper<null>;
+export declare const isObject: IsFnHelper<object>;

package/lib/utils/is.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.isString = exports.isRegExp = exports.isNumber = exports.isFunction = exports.isBoolean = exports.isArray = void 0;
+exports.isString = exports.isRegExp = exports.isObject = exports.isNumber = exports.isNull = exports.isFunction = exports.isBoolean = exports.isArray = void 0;
 exports.isToString = isToString;
 exports.isTypeof = isTypeof;
 exports.isUndefined = void 0;
@@ -31,4 +31,10 @@ var isBoolean = exports.isBoolean = function isBoolean(value) {
 };
 var isNumber = exports.isNumber = function isNumber(value) {
   return isTypeof(value, 'number') && !isNaN(value) || isTypeof(value, 'bigint');
+};
+var isNull = exports.isNull = function isNull(value) {
+  return isTypeof(value, 'null');
+};
+var isObject = exports.isObject = function isObject(value) {
+  return !isNull(value) && isTypeof(value, 'object');
 };

package/lib/utils/match.js

@@ -15,7 +15,7 @@ function isMatchOption(item) {
  */
 function matchList(list, value, useStartsWith) {
   if (useStartsWith === void 0) {
-    useStartsWith = false;
+    useStartsWith = true;
   }
   return list.some(function (item) {
     try {

package/lib/utils/trace.d.ts

@@ -1,5 +1,5 @@
 import { MatchOption } from "./match";
-export type PropagatorType = 'tracecontext' | 'b3' | 'b3multi' | 'jaeger';
+export type PropagatorType = 'tracecontext' | 'b3' | 'b3multi' | 'jaeger' | 'sw8';
 export type TraceOption = {
     match: MatchOption;
     propagatorTypes: PropagatorType[];
@@ -12,10 +12,11 @@ export interface ITracingOption {
     tracestate?: boolean;
     baggage?: boolean;
 }
-export declare function generateTraceId(): any;
-export declare function generateSpanId(): any;
+export declare function generateTraceId(): string;
+export declare function generateSpanId(): string;
 export interface ITracingHeaders {
     [key: string]: string;
 }
+export declare function generateTraceIdForSW8(pid: string): void;
 export declare function makeTracingHeaders(traceId: string, spanId: string, sampled: boolean, propagatorTypes: PropagatorType[], tracestate?: string, baggage?: string): ITracingHeaders;
 export declare function parseTracingOptions(tracingOption: boolean | ITracingOption): ITracingOption;

package/lib/utils/trace.js

@@ -3,29 +3,21 @@
 exports.__esModule = true;
 exports.generateSpanId = generateSpanId;
 exports.generateTraceId = generateTraceId;
+exports.generateTraceIdForSW8 = generateTraceIdForSW8;
 exports.isTraceOption = isTraceOption;
 exports.makeTracingHeaders = makeTracingHeaders;
 exports.parseTracingOptions = parseTracingOptions;
 var _match = require("./match");
 var _is = require("./is");
-var SPAN_ID_BYTES = 8;
-var TRACE_ID_BYTES = 16;
-var SHARED_CHAR_CODES_ARRAY = Array(32);
+var _base = require("./base");
 function isTraceOption(option) {
   return option && (0, _match.isMatchOption)(option.match) && (0, _is.isArray)(option.propagatorTypes);
 }
-function generateId(bytes) {
-  for (var i = 0; i < bytes * 2; i++) {
-    SHARED_CHAR_CODES_ARRAY[i] = Math.floor(Math.random() * 16) + 48;
-    // valid hex characters in the range 48-57 and 97-102
-    if (SHARED_CHAR_CODES_ARRAY[i] >= 58) {
-      SHARED_CHAR_CODES_ARRAY[i] += 39;
-    }
-  }
-  return String.fromCharCode.apply(null, SHARED_CHAR_CODES_ARRAY.slice(0, bytes * 2));
+function generateId() {
+  return (0, _base.generateGUID)().replace(/-/g, '');
 }
 function generateTraceId() {
-  var traceId = generateId(TRACE_ID_BYTES);
+  var traceId = generateId();
   // 适配OpenTracing 实现（long long转成16进制最高位不能为0）
   if (traceId[0] === '0') {
     traceId = '1' + traceId.substring(1);
@@ -36,8 +28,10 @@ function generateTraceId() {
   return traceId;
 }
 function generateSpanId() {
-  return generateId(SPAN_ID_BYTES);
+  return (0, _base.generateUUID)(8);
 }
+//skywalking TraceId https://github.com/apache/skywalking-client-js
+function generateTraceIdForSW8(pid) {}
 function makeTracingHeaders(traceId, spanId, sampled, propagatorTypes, tracestate, baggage) {
   var tracingHeaders = {};
   var sample = sampled ? '1' : '0';
@@ -55,6 +49,9 @@ function makeTracingHeaders(traceId, spanId, sampled, propagatorTypes, tracestat
         tracingHeaders['X-B3-SpanId'] = spanId;
         tracingHeaders['X-B3-Sampled'] = sample;
         break;
+      case 'sw8':
+        // tracingHeaders['sw8'] =  `${sample}-${traceIdStr}-${segmentId}-${0}-${pid}-${app.version}-${href}-${host}`;;
+        break;
       case 'tracecontext': // https://www.w3.org/TR/trace-context/
       default:
         tracingHeaders['traceparent'] = "00-" + traceId + "-" + spanId + "-0" + sample;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arms/rum-core",
-  "version": "0.0.9",
+  "version": "0.0.18",
   "description": "arms rum javascript sdk core",
   "author": "guangli.fj <guangli.fj@alibaba-inc.com>",
   "license": "ISC",
@@ -18,6 +18,7 @@
   "scripts": {
     "start": "build-scripts build --watch",
     "build": "build-scripts build --skip-demo",
+    "prepublishOnly": "npm run build",
     "test": "node ./__tests__/@arms/core.test.js"
   },
   "dependencies": {