@lark-apaas/observable-web 1.0.0-alpha.4 → 1.0.0-alpha.6

package/dist/lib/core/instrumentation/PvInstrumentation.js

@@ -21,7 +21,6 @@ __export(PvInstrumentation_exports, {
   PvInstrumentation: () => PvInstrumentation
 });
 module.exports = __toCommonJS(PvInstrumentation_exports);
-var import_getDeviceID = require("../../utils/getDeviceID");
 class PvInstrumentation {
   constructor(meter) {
     this.meter = meter;
@@ -38,14 +37,9 @@ class PvInstrumentation {
       if (this.lastUrl === currentUrl) return;
       this.lastUrl = currentUrl;
       pvCounter.add(1, {
-        "page_url": window.location.href,
-        "page_path": window.location.pathname,
-        "page_title": document.title,
-        "page_referrer": document.referrer,
-        "device_id": (0, import_getDeviceID.getDeviceId)(),
-        "user_id": window.userId || "",
-        "tenant_id": window.tenantID || "",
-        "app_id": window.appId || ""
+        url: window.location.href,
+        path: window.location.pathname,
+        referrer: document.referrer
       });
     };
     window.addEventListener("load", reportPv);

package/dist/lib/core/metric-exporter.js

@@ -60,6 +60,7 @@ var import_core = require("@opentelemetry/core");
 var import_types = require("../types");
 var import_convertAllAttrIntoString = require("../utils/convertAllAttrIntoString");
 var import_hrTimeToNanoNumber = require("../utils/hrTimeToNanoNumber");
+var import_getDefaultAttr = require("../utils/getDefaultAttr");
 class CustomWebMetricExporter {
   constructor(config) {
     this._shutdown = false;
@@ -133,7 +134,7 @@ class CustomWebMetricExporter {
    */
   transformNumberDataPoints(dataPoints) {
     return dataPoints.map((dp) => ({
-      attributes: (0, import_convertAllAttrIntoString.convertAttributesToString)(dp.attributes),
+      attributes: __spreadValues(__spreadValues({}, (0, import_convertAllAttrIntoString.convertAttributesToString)(dp.attributes)), (0, import_getDefaultAttr.getDefaultAttr)()),
       startTimeUnixNano: (0, import_hrTimeToNanoNumber.hrTimeToNanosNumber)(dp.startTime),
       timeUnixNano: (0, import_hrTimeToNanoNumber.hrTimeToNanosNumber)(dp.endTime),
       // JS 中所有数字都是双精度浮点数，默认映射到 asDouble
@@ -147,7 +148,7 @@ class CustomWebMetricExporter {
   transformHistogramDataPoints(dataPoints) {
     return dataPoints.map((dp) => {
       return {
-        attributes: (0, import_convertAllAttrIntoString.convertAttributesToString)(dp.attributes),
+        attributes: __spreadValues(__spreadValues({}, (0, import_convertAllAttrIntoString.convertAttributesToString)(dp.attributes)), (0, import_getDefaultAttr.getDefaultAttr)()),
         startTimeUnixNano: (0, import_hrTimeToNanoNumber.hrTimeToNanosNumber)(dp.startTime),
         timeUnixNano: (0, import_hrTimeToNanoNumber.hrTimeToNanosNumber)(dp.endTime),
         count: dp.value.count,

package/dist/lib/core/resource-detector.d.ts

@@ -3,7 +3,7 @@ import { ResourceDetector, ResourceDetectionConfig, DetectedResource } from '@op
 declare global {
     interface Window {
         appId: string;
-        tenantID: string;
+        tenantId: string;
         userId: string;
     }
 }

package/dist/lib/core/resource-detector.js

@@ -42,12 +42,11 @@ class CustomWebDetector {
    */
   detect(config) {
     const browserAttributes = {
-      "browser_language": navigator.language,
-      "page_url": window.location.href,
-      "page_referrer": document.referrer
+      "url": window.location.href,
+      "referrer": document.referrer
     };
     const appId = window.appId || "";
-    const tenantId = window.tenantID || "";
+    const tenantId = window.tenantId || "";
     const userId = window.userId || "";
     const appAttributes = {
       app_id: appId,

package/dist/lib/core/sdk.js

@@ -47,6 +47,7 @@ var import_sdk_logs = require("@opentelemetry/sdk-logs");
 var import_exporter_logs_otlp_http = require("@opentelemetry/exporter-logs-otlp-http");
 var import_sdk_metrics = require("@opentelemetry/sdk-metrics");
 var import_resource_detector = require("./resource-detector");
+var import_const = require("../const");
 var import_metric_exporter = require("./metric-exporter");
 var import_PvInstrumentation = require("./instrumentation/PvInstrumentation");
 class WebObservableSdk {
@@ -60,7 +61,7 @@ class WebObservableSdk {
     return this._instance;
   }
   start(config) {
-    if (this.isStarted) return;
+    if (this.isStarted || config.env === import_const.AppEnv.Dev) return;
     this.config = config;
     try {
       this.resource = (0, import_resources.detectResources)({

package/dist/lib/utils/getDefaultAttr.d.ts

@@ -0,0 +1,13 @@
+import { DeviceType } from './getDeviceTypeByAgent.js';
+import { AppEnv } from '../const.js';
+
+declare const getDefaultAttr: () => {
+    app_id: string;
+    tenant_id: string;
+    user_id: string;
+    did: string;
+    app_env: AppEnv;
+    device_type: DeviceType;
+};
+
+export { getDefaultAttr };

package/dist/lib/utils/getDefaultAttr.js

@@ -0,0 +1,35 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var getDefaultAttr_exports = {};
+__export(getDefaultAttr_exports, {
+  getDefaultAttr: () => getDefaultAttr
+});
+module.exports = __toCommonJS(getDefaultAttr_exports);
+var import_const = require("../const");
+var import_getDeviceID = require("./getDeviceID");
+var import_getDeviceTypeByAgent = require("./getDeviceTypeByAgent");
+const getDefaultAttr = () => ({
+  app_id: window.appId || "",
+  tenant_id: window.tenantId || "",
+  user_id: window.userId || "",
+  did: (0, import_getDeviceID.getDeviceId)(),
+  // 默认为 Prod 环境，preview 环境不上报
+  app_env: import_const.AppEnv.Prod,
+  device_type: (0, import_getDeviceTypeByAgent.getDeviceTypeByAgent)(navigator.userAgent)
+});

package/dist/lib/utils/getDeviceTypeByAgent.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 设备类型定义：只有 Mobile 和 PC (平板归为 PC)
+ */
+type DeviceType = 'desktop' | 'mobile';
+/**
+ * 根据 UserAgent 判断设备类型
+ * 策略：只识别手机，其余全算 PC
+ */
+declare function getDeviceTypeByAgent(customAgent?: string): DeviceType;
+
+export { type DeviceType, getDeviceTypeByAgent };

package/dist/lib/utils/getDeviceTypeByAgent.js

@@ -0,0 +1,36 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var getDeviceTypeByAgent_exports = {};
+__export(getDeviceTypeByAgent_exports, {
+  getDeviceTypeByAgent: () => getDeviceTypeByAgent
+});
+module.exports = __toCommonJS(getDeviceTypeByAgent_exports);
+function getDeviceTypeByAgent(customAgent) {
+  const ua = customAgent || (typeof navigator !== "undefined" ? navigator.userAgent : "");
+  if (!ua) {
+    return "desktop";
+  }
+  const isAndroidPhone = /Android/i.test(ua) && /Mobile/i.test(ua);
+  const isIosPhone = /iPhone|iPod/i.test(ua);
+  const isOtherMobile = /BlackBerry|IEMobile|Opera Mini/i.test(ua);
+  if (isAndroidPhone || isIosPhone || isOtherMobile) {
+    return "mobile";
+  }
+  return "desktop";
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/observable-web",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-alpha.6",
   "description": "Observable SDK For Web",
   "main": "./dist/lib/index.js",
   "files": [