@arms/rum-core 0.0.25-beta.19 → 0.0.25-beta.21

package/lib/index.d.ts

@@ -14,4 +14,5 @@ export * from './utils/is';
 export * from './utils/number';
 export * from './utils/match';
 export * from './utils/trace';
+export * from './utils/verify';
 export { Client, Context, Reporter, Shell };

package/lib/index.js

@@ -99,4 +99,11 @@ Object.keys(_trace).forEach(function (key) {
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
   if (key in exports && exports[key] === _trace[key]) return;
   exports[key] = _trace[key];
+});
+var _verify = require("./utils/verify");
+Object.keys(_verify).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _verify[key]) return;
+  exports[key] = _verify[key];
 });

package/lib/model/context.js

@@ -10,7 +10,7 @@ var Context = /*#__PURE__*/function () {
     this.session = void 0;
     if (rumSession) {
       this.session = rumSession;
-      this.session.init(config);
+      this.session.init(this);
     }
   }
   var _proto = Context.prototype;

package/lib/model/reporter.d.ts

@@ -1,5 +1,5 @@
 import { IContext } from '../types/client';
-import { RumEvent, IViewData } from '../types/rum-event';
+import { RumEvent, IViewData, RumEventBundle } from '../types/rum-event';
 export default abstract class Reporter {
     name: string;
     /**
@@ -19,10 +19,11 @@ export default abstract class Reporter {
      * eventQueue 提取最新 View 作为公共 View，event 中不同 View Event 保留 View id
      */
     protected flushEventQueue(): void;
+    mergeEvent(ctx: IContext, events: RumEvent[], view: IViewData): void;
     /**
      * 接口请求由各平台 sdk reporter 实现
      */
-    abstract request(ctx: IContext, events: RumEvent[], view: IViewData): void;
+    abstract request(ctx: IContext, bundle: RumEventBundle): void;
     /**
      * 初始化时
      */

package/lib/model/reporter.js

@@ -5,8 +5,10 @@ exports["default"] = void 0;
 var _rumEvent = require("../types/rum-event");
 var _exception = require("../utils/exception");
 var _is = require("../utils/is");
+var _verify = require("../utils/verify");
 var FLUSH_TIME = 3000;
 var MAX_EVENT_COUNT = 20;
+var attrs = ['app', 'user', 'device', 'os', 'geo', 'isp', 'net', 'attributes'];
 var Reporter = exports["default"] = /*#__PURE__*/function () {
   function Reporter() {
     this.name = 'reporter';
@@ -108,21 +110,77 @@ var Reporter = exports["default"] = /*#__PURE__*/function () {
     var curView = views[views.length - 1];
     views.forEach(function (view) {
       if (view.id === curView.id) {
-        var _events = eventQueue.filter(function (event) {
+        var events = eventQueue.filter(function (event) {
           var _event$view;
           return ((_event$view = event.view) === null || _event$view === void 0 ? void 0 : _event$view.id) === view.id;
         });
-        _events.forEach(function (event) {
+        events.forEach(function (event) {
           delete event.view;
         });
       }
     });
     var session = ctx.session;
     var sampled = session ? session.getSampled() : true;
-    sampled && this.request(ctx, eventQueue, curView);
+    sampled && this.mergeEvent(ctx, eventQueue, curView);
     this.eventQueue = [];
+  };
+  _proto.mergeEvent = function mergeEvent(ctx, events, view) {
+    var _config$net;
+    var config = ctx.getConfig();
+    var session = ctx.session;
+    var sessionId = session.getSessionId();
+    events.forEach(function (event) {
+      if (event.session_id === sessionId) {
+        delete event.session_id;
+      }
+    });
+    var bundle = {
+      app: {
+        id: config.pid,
+        env: config.env || 'prod',
+        version: config.version,
+        type: ''
+      },
+      user: {
+        id: session.getUserId()
+      },
+      session: {
+        id: sessionId
+      },
+      net: {
+        model: (_config$net = config.net) === null || _config$net === void 0 ? void 0 : _config$net.model
+      },
+      view: view,
+      events: events
+    };
+    attrs.forEach(function (key) {
+      var obj = config[key];
+      (0, _is.isObject)(obj) && Object.keys(obj).forEach(function (k) {
+        var val = obj[k];
+        // user 的 id 不能被覆盖
+        if (key === 'user' && k === 'id') return;
+        if (key === 'attributes') {
+          bundle[key] = (0, _verify.verifyAttributes)(obj);
+        } else if ((0, _is.isString)(val) || (0, _is.isNumber)(val)) {
+          if (!(key in bundle)) {
+            bundle[key] = {};
+          }
+          bundle[key][k] = val;
+        }
+      });
+    });
+    if (typeof config.beforeReport === 'function') {
+      bundle = config.beforeReport(bundle);
+      if (!bundle) return;
+    }
+    this.request(ctx, bundle);
   }
 
+  // /**
+  //  * 接口请求由各平台 sdk reporter 实现
+  //  */
+  // abstract request(ctx: IContext, events: RumEvent[], view: IViewData): void;
+
   /**
    * 接口请求由各平台 sdk reporter 实现
    */;

package/lib/types/client.d.ts

@@ -36,7 +36,7 @@ export interface SessionConfig {
     storage?: string;
 }
 export interface IRumSession {
-    init(config: IConfiguration): void;
+    init(ctx: IContext): void;
     sessionConfig: SessionConfig;
     getSessionId: () => string;
     getSampled: () => boolean;
@@ -44,6 +44,7 @@ export interface IRumSession {
     getEventId: () => string;
     getViewId: () => string;
     getUserId: () => string;
+    getBaseEvent: () => any;
 }
 export interface IClient {
     /**

package/lib/types/reporter.d.ts

@@ -1,8 +1,8 @@
 import { IContext } from './client';
-import { RumEvent, IViewData } from './rum-event';
+import { RumEventBundle } from './rum-event';
 export interface IReporter {
     name: string;
     init(ctx: IContext): void;
-    request(ctx: IContext, events: RumEvent[], view: IViewData): void;
+    request(ctx: IContext, bundle: RumEventBundle): void;
     report(ctx: IContext): void;
 }

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

@@ -16,7 +16,7 @@ export interface IViewData {
 }
 export type BaseObjectPrimitiveValue = string | number | boolean | null | undefined;
 export type BaseObjectValue = BaseObjectPrimitiveValue | BaseObject | BaseObjectPrimitiveValue[] | IViewData;
-export interface RumBaseEvent {
+export interface RumBaseEvent extends BaseObject {
     event_type?: RumEventType;
     event_id?: string;
     session_id?: string;
@@ -24,7 +24,7 @@ export interface RumBaseEvent {
     times?: number;
     view?: IViewData;
     snapshots?: string;
-    [key: string]: BaseObjectValue;
+    attributes?: BaseObject;
 }
 export interface RumViewEvent extends RumBaseEvent {
     loading_type?: 'initial_load' | 'route_change';
@@ -117,7 +117,7 @@ export declare enum AppType {
 export interface RumEventBundle {
     app: {
         id: string;
-        type: AppType;
+        type: AppType | string;
         name?: string;
         version?: string;
         channel?: string;
@@ -166,5 +166,6 @@ export interface RumEventBundle {
         name?: string;
     };
     events: Array<RumEvent>;
-    _v: string;
+    attributes?: BaseObject;
+    _v?: string;
 }

package/lib/utils/match.d.ts

@@ -4,4 +4,4 @@ export declare function isMatchOption(item: unknown): item is MatchOption;
  * 如果值有一个选项匹配，则返回true。在比较字符串时，useStartsWith: true时将把值与选项的开始进行比较，而不是要求精确匹配。
  */
 export declare function matchList(list: MatchOption[], value: string, useStartsWith?: boolean): boolean;
-export declare function urlMatch(url: string, list?: MatchOption[]): boolean;
+export declare function urlMatch(url: string, list?: MatchOption | MatchOption[]): boolean;

package/lib/utils/match.js

@@ -35,7 +35,10 @@ function urlMatch(url, list) {
     list = [];
   }
   try {
-    var rules = [/https?:\/\/.*rum|retcode\.aliyuncs\.com/, /https?:\/\/.*log-global\.aliyuncs\.com/, /https?:\/\/.*\.mmstat\.com/].concat(list);
+    if (!(0, _is.isArray)(list)) {
+      list = [list];
+    }
+    var rules = [/https?:\/\/.*rum|retcode\.aliyuncs\.com/, /https?:\/\/.*log-global\.aliyuncs\.com/, /https?:\/\/.*\.mmstat\.com/, /data:(.+?)(;base64)?,(.+)$/].concat(list);
     return matchList(rules, url);
   } catch (e) {
     return false;

package/lib/utils/verify.d.ts

@@ -0,0 +1,2 @@
+import { BaseObject } from "../types/rum-event";
+export declare function verifyAttributes(attrs: BaseObject): BaseObject;

package/lib/utils/verify.js

@@ -0,0 +1,39 @@
+"use strict";
+
+exports.__esModule = true;
+exports.verifyAttributes = verifyAttributes;
+var _is = require("./is");
+function verifyAttributes(attrs) {
+  if (!(0, _is.isObject)(attrs)) {
+    return;
+  }
+  var copyAttrs = Object.assign({}, attrs);
+  Object.keys(copyAttrs).forEach(function (key) {
+    var val = copyAttrs[key];
+    // 验证 key 长度
+    if (key.length > 50) {
+      var shortKey = key.substring(0, 50);
+      copyAttrs[shortKey] = val;
+      delete copyAttrs[key];
+      key = shortKey;
+    }
+    // 验证 value 类型和长度
+    if (!(0, _is.isString)(val) && !(0, _is.isNumber)(val)) {
+      delete copyAttrs[key];
+    } else if ((0, _is.isString)(val) && val.length > 2e3) {
+      copyAttrs[key] = val.substring(0, 2e3);
+    }
+  });
+  var keys = Object.keys(copyAttrs);
+  if (!keys.length) {
+    return;
+  }
+  if (keys.length > 20) {
+    keys.forEach(function (key, index) {
+      if (index > 19) {
+        delete copyAttrs[key];
+      }
+    });
+  }
+  return copyAttrs;
+}

package/package.json

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