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

package/es/utils/trace.js

@@ -0,0 +1,101 @@
+import { isMatchOption } from "./match";
+import { isArray, isBoolean, isNumber } from "./is";
+import { encode } from "js-base64";
+export function isTraceOption(option) {
+  return option && isMatchOption(option.match) && isArray(option.propagatorTypes);
+}
+export function makeTracingHeaders(traceId, spanId, sampled, propagatorTypes, subOption) {
+  if (subOption === void 0) {
+    subOption = {};
+  }
+  var tracingHeaders = {};
+  var sample = sampled ? '1' : '0';
+  // skywalking 标准具备排他性，如果包含sw8，则只使用sw8
+  if (propagatorTypes.includes('sw8')) {
+    propagatorTypes = ['sw8'];
+  }
+  propagatorTypes.forEach(function (propagatorType) {
+    switch (propagatorType) {
+      case 'jaeger':
+        tracingHeaders['uber-trace-id'] = traceId + ":" + spanId + ":0:" + sample;
+        break;
+      case 'b3':
+        // https://github.com/openzipkin/b3-propagation
+        tracingHeaders['b3'] = traceId + "-" + spanId + "-" + sample;
+        break;
+      case 'b3multi':
+        tracingHeaders['X-B3-TraceId'] = traceId;
+        tracingHeaders['X-B3-SpanId'] = spanId;
+        tracingHeaders['X-B3-Sampled'] = sample;
+        break;
+      case 'sw8':
+        // https://github.com/apache/skywalking-client-js
+        var traceIdStr = String(encode(traceId));
+        var segmentId = String(encode(spanId));
+        var service = String(encode(subOption.appId));
+        var instance = String(encode(subOption.appVersion));
+        var endpoint = String(encode(subOption.viewName));
+        var peer = String(encode(subOption.host));
+        tracingHeaders['sw8'] = sample + "-" + traceIdStr + "-" + segmentId + "-" + 0 + "-" + service + "-" + instance + "-" + endpoint + "-" + peer;
+        break;
+      case 'tracecontext':
+      default:
+        // https://www.w3.org/TR/trace-context/
+        tracingHeaders['traceparent'] = "00-" + traceId + "-" + spanId + "-0" + sample;
+        if (subOption.tracestate) {
+          tracingHeaders['tracestate'] = subOption.tracestate;
+        }
+        break;
+    }
+  });
+  if (subOption.baggage) {
+    tracingHeaders['baggage'] = subOption.baggage;
+  }
+  return tracingHeaders;
+}
+export function parseTracingOptions(tracingOption) {
+  var defPropagatorTypes = ['tracecontext'];
+  if (isBoolean(tracingOption) || !tracingOption) {
+    return {
+      enable: !!tracingOption,
+      sample: 100,
+      propagatorTypes: defPropagatorTypes,
+      allowedUrls: [],
+      tracestate: true,
+      baggage: false
+    };
+  }
+  var _tracingOption$enable = tracingOption.enable,
+    enable = _tracingOption$enable === void 0 ? true : _tracingOption$enable,
+    _tracingOption$sample = tracingOption.sample,
+    sample = _tracingOption$sample === void 0 ? 100 : _tracingOption$sample,
+    _tracingOption$propag = tracingOption.propagatorTypes,
+    propagatorTypes = _tracingOption$propag === void 0 ? defPropagatorTypes : _tracingOption$propag,
+    _tracingOption$allowe = tracingOption.allowedUrls,
+    allowedUrls = _tracingOption$allowe === void 0 ? [] : _tracingOption$allowe,
+    _tracingOption$traces = tracingOption.tracestate,
+    tracestate = _tracingOption$traces === void 0 ? true : _tracingOption$traces,
+    _tracingOption$baggag = tracingOption.baggage,
+    baggage = _tracingOption$baggag === void 0 ? false : _tracingOption$baggag;
+  var traceOptions = [];
+  if (isArray(allowedUrls) && allowedUrls.length) {
+    allowedUrls.forEach(function (item) {
+      if (isMatchOption(item)) {
+        traceOptions.push({
+          match: item,
+          propagatorTypes: propagatorTypes
+        });
+      } else if (isTraceOption(item)) {
+        traceOptions.push(item);
+      }
+    });
+  }
+  return {
+    enable: isBoolean(enable) ? enable : true,
+    sample: isNumber(sample) ? sample : 100,
+    propagatorTypes: propagatorTypes,
+    allowedUrls: traceOptions,
+    tracestate: tracestate,
+    baggage: baggage
+  };
+}

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

@@ -42,13 +42,21 @@ export interface RumViewEvent extends RumBaseEvent {
     url?: string;
     timing_data?: string;
 }
+/**
+ * 枚举值，表示资源是否加载成功
+ */
+export declare enum ResourceStatus {
+    Unknown = -1,
+    Failed = 0,
+    Success = 1
+}
 export interface RumResourceEvent extends RumBaseEvent {
     name?: string;
     type?: string;
     method?: string;
     status_code?: number | string;
     message?: string;
-    success?: -1 | 0 | 1;
+    success?: -1 | 0 | 1 | ResourceStatus;
     trace_id?: string;
     duration?: number;
     size?: number;
@@ -96,7 +104,8 @@ export interface RumCustomEvent extends RumBaseEvent {
 export type RumEvent = RumViewEvent | RumResourceEvent | RumExceptionEvent | RumActionEvent | RumCustomEvent;
 export declare enum AppType {
     browser = "browser",
-    miniapp = "miniapp"
+    miniapp = "miniapp",
+    uniapp = "uniapp"
 }
 export interface RumEventBundle {
     app: {

package/lib/types/rum-event.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.RumEventType = exports.AppType = void 0;
+exports.RumEventType = exports.ResourceStatus = exports.AppType = void 0;
 var RumEventType = exports.RumEventType = /*#__PURE__*/function (RumEventType) {
   RumEventType["VIEW"] = "view";
   RumEventType["RESOURCE"] = "resource";
@@ -11,8 +11,18 @@ var RumEventType = exports.RumEventType = /*#__PURE__*/function (RumEventType) {
   RumEventType["CUSTOM"] = "custom";
   return RumEventType;
 }({});
+/**
+ * 枚举值，表示资源是否加载成功
+ */
+var ResourceStatus = exports.ResourceStatus = /*#__PURE__*/function (ResourceStatus) {
+  ResourceStatus[ResourceStatus["Unknown"] = -1] = "Unknown";
+  ResourceStatus[ResourceStatus["Failed"] = 0] = "Failed";
+  ResourceStatus[ResourceStatus["Success"] = 1] = "Success";
+  return ResourceStatus;
+}({});
 var AppType = exports.AppType = /*#__PURE__*/function (AppType) {
   AppType["browser"] = "browser";
   AppType["miniapp"] = "miniapp";
+  AppType["uniapp"] = "uniapp";
   return AppType;
 }({});

package/package.json

@@ -1,16 +1,18 @@
 {
   "name": "@arms/rum-core",
-  "version": "0.0.25-beta.14",
+  "version": "0.0.25-beta.15",
   "description": "arms rum javascript sdk core",
   "author": "guangli.fj <guangli.fj@alibaba-inc.com>",
   "license": "ISC",
   "main": "lib/index.js",
+  "module": "es/index.js",
   "directories": {
     "lib": "lib",
     "test": "__tests__"
   },
   "files": [
-    "lib"
+    "lib",
+    "es"
   ],
   "publishConfig": {
     "access": "public"
@@ -18,7 +20,6 @@
   "scripts": {
     "start": "build-scripts build --watch",
     "build": "build-scripts build --skip-demo",
-    "prepublishOnly": "npm run build",
     "test": "node ./__tests__/@arms/core.test.js"
   },
   "dependencies": {