@arms/rum-core 0.0.29 → 0.0.31

package/lib/model/reporter.js

@@ -129,11 +129,21 @@ var Reporter = exports["default"] = /*#__PURE__*/function () {
     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;
+    // events.forEach(event => {
+    //   if (event.session_id === sessionId) {
+    //     delete event.session_id;
+    //   }
+    // });
+    for (var i = 0; i < events.length; i++) {
+      var e = events[i];
+      if (e.session_id === sessionId) {
+        delete e.session_id;
+      } else {
+        events.splice(i, 1);
+        i--;
       }
-    });
+    }
+    if (events.length === 0) return;
     var bundle = {
       app: {
         id: config.pid,

package/lib/model/shell.d.ts

@@ -1,5 +1,5 @@
 import { IClient, IConfiguration } from "../types/client";
-import { RumCustomEvent, RumEvent, RumExceptionEvent, RumResourceEvent } from "../types/rum-event";
+import { RumCustomEvent, RumEvent, RumExceptionEvent, RumResourceEvent, RumViewEvent } from "../types/rum-event";
 import { IShell } from "../types/shell";
 export default abstract class Shell implements IShell {
     client: IClient;
@@ -22,10 +22,14 @@ export default abstract class Shell implements IShell {
      * 自定义事件上报
      */
     sendCustom(payload: RumCustomEvent): void;
+    /**
+     * 自定义视图上报
+     */
+    sendView(payload: RumViewEvent): void;
     /**
      * 自定义异常上报
      */
-    sendException(payload: RumExceptionEvent): void;
+    sendException(payload: RumExceptionEvent | Error): void;
     /**
      * 自定义资源上报
      */

package/lib/model/shell.js

@@ -50,6 +50,31 @@ var Shell = exports["default"] = /*#__PURE__*/function () {
     });
     this.sendEvent(data);
   };
+  /**
+   * 自定义视图上报
+   */
+  _proto.sendView = function sendView(payload) {
+    if (!(0, _is.isObject)(payload)) {
+      return;
+    }
+    if (!payload.type) {
+      payload.type = 'custom';
+    }
+    if (payload.type === 'custom') {
+      var n = 0;
+      ['t1', 't2', 't3'].forEach(function (key) {
+        if (!(0, _is.isNumber)(payload[key])) {
+          delete payload[key];
+        }
+        key in payload && n++;
+      });
+      if (n === 0) return;
+    }
+    var data = (0, _extends2["default"])({}, payload, {
+      event_type: _rumEvent.RumEventType.VIEW
+    });
+    this.sendEvent(data);
+  };
   /**
    * 自定义异常上报
    */
@@ -57,8 +82,14 @@ var Shell = exports["default"] = /*#__PURE__*/function () {
     if (!payload.name || !payload.message) {
       return;
     }
+    var name = payload.name,
+      message = payload.message,
+      stack = payload.stack;
     var data = (0, _extends2["default"])({
-      times: 1
+      times: 1,
+      name: name,
+      message: message,
+      stack: stack
     }, payload, {
       event_type: _rumEvent.RumEventType.EXCEPTION,
       type: 'custom',

package/lib/types/client.d.ts

@@ -113,6 +113,14 @@ export interface IConfiguration {
         flushTime?: number;
         maxEventCount?: number;
     };
+    /**
+     *  配置下发
+     *  - 运行时动态配置更新，根据端侧特点来做定制化配置
+     */
+    remoteConfig?: Boolean | {
+        enable?: boolean;
+        url?: string;
+    };
     /**
      * session config
      */

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

@@ -28,7 +28,7 @@ export interface RumBaseEvent extends BaseObject {
 }
 export interface RumViewEvent extends RumBaseEvent {
     loading_type?: 'initial_load' | 'route_change';
-    type: 'pv' | 'perf' | 'webvitals';
+    type: 'pv' | 'perf' | 'webvitals' | 'custom';
     largest_contentful_paint?: number;
     first_input_delay?: number;
     cumulative_layout_shift?: number;
@@ -40,6 +40,9 @@ export interface RumViewEvent extends RumBaseEvent {
     dom_content_loaded?: number;
     dom_complete?: number;
     load_event?: number;
+    t1?: number;
+    t2?: number;
+    t3?: number;
     referrer?: string;
     url?: string;
     timing_data?: string;
@@ -83,13 +86,14 @@ export interface RumExceptionEvent extends RumBaseEvent {
     column?: number;
 }
 export interface RumLongTaskEvent extends RumBaseEvent {
-    view_name: string;
     source?: string;
     type?: string;
     message?: string;
-    count: number;
+    duration?: number;
+    fps?: number;
     stack?: string;
     caused_by?: string;
+    snapshots: string;
 }
 export interface RumActionEvent extends RumBaseEvent {
     type?: string;
@@ -104,15 +108,16 @@ export interface RumCustomEvent extends RumBaseEvent {
     value: number;
 }
 export interface RumApplicationEvent extends RumBaseEvent {
-    type: string;
-    name: string;
+    state: string;
+    scene: string;
     duration: number;
 }
 export type RumEvent = RumViewEvent | RumResourceEvent | RumExceptionEvent | RumActionEvent | RumCustomEvent | RumApplicationEvent;
 export declare enum AppType {
     browser = "browser",
     miniapp = "miniapp",
-    uniapp = "uniapp"
+    uniapp = "uniapp",
+    minigame = "minigame"
 }
 export interface RumEventBundle {
     app: {
@@ -123,6 +128,7 @@ export interface RumEventBundle {
         channel?: string;
         env?: string;
         package?: string;
+        framework?: string;
     };
     user: {
         id: string;

package/lib/types/rum-event.js

@@ -25,5 +25,6 @@ var AppType = exports.AppType = /*#__PURE__*/function (AppType) {
   AppType["browser"] = "browser";
   AppType["miniapp"] = "miniapp";
   AppType["uniapp"] = "uniapp";
+  AppType["minigame"] = "minigame";
   return AppType;
 }({});

package/lib/utils/trace.js

@@ -6,7 +6,6 @@ exports.makeTracingHeaders = makeTracingHeaders;
 exports.parseTracingOptions = parseTracingOptions;
 var _match = require("./match");
 var _is = require("./is");
-var _jsBase = require("js-base64");
 function isTraceOption(option) {
   return option && (0, _match.isMatchOption)(option.match) && (0, _is.isArray)(option.propagatorTypes);
 }
@@ -35,14 +34,16 @@ function makeTracingHeaders(traceId, spanId, sampled, propagatorTypes, subOption
         tracingHeaders['X-B3-Sampled'] = sample;
         break;
       case 'sw8':
-        // https://github.com/apache/skywalking-client-js
-        var traceIdStr = String((0, _jsBase.encode)(traceId));
-        var segmentId = String((0, _jsBase.encode)(spanId));
-        var service = String((0, _jsBase.encode)(subOption.appId));
-        var instance = String((0, _jsBase.encode)(subOption.appVersion));
-        var endpoint = String((0, _jsBase.encode)(subOption.viewName));
-        var peer = String((0, _jsBase.encode)(subOption.host));
-        tracingHeaders['sw8'] = sample + "-" + traceIdStr + "-" + segmentId + "-" + 0 + "-" + service + "-" + instance + "-" + endpoint + "-" + peer;
+        if ((0, _is.isFunction)(btoa)) {
+          // https://github.com/apache/skywalking-client-js
+          var traceIdStr = btoa(traceId);
+          var segmentId = btoa(spanId);
+          var service = btoa(subOption.appId);
+          var instance = btoa(subOption.appVersion);
+          var endpoint = btoa(subOption.viewName);
+          var peer = btoa(subOption.host);
+          tracingHeaders['sw8'] = sample + "-" + traceIdStr + "-" + segmentId + "-" + 0 + "-" + service + "-" + instance + "-" + endpoint + "-" + peer;
+        }
         break;
       case 'tracecontext':
       default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arms/rum-core",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "description": "arms rum javascript sdk core",
   "author": "guangli.fj <guangli.fj@alibaba-inc.com>",
   "license": "ISC",
@@ -22,8 +22,7 @@
     "test": "node ./__tests__/@arms/core.test.js"
   },
   "dependencies": {
-    "events": "^3.3.0",
-    "js-base64": "^3.7.7"
+    "events": "^3.3.0"
   },
   "devDependencies": {
     "@babel/runtime": "^7.24.5",