@pluve/logger-sdk 0.0.22 → 0.0.24

package/dist/esm/capture/jsError.js

@@ -11,7 +11,7 @@ function registerJsErrorCapture(debug, callback) {
     const stack = await parseStack(e.error);
     callback({
       type: "js",
-      message: e.error.message,
+      message: JSON.stringify(e),
       stack,
       throwable: e.error.stack || ""
     });

package/dist/esm/capture/promiseError.js

@@ -11,9 +11,9 @@ function registerPromiseErrorCapture(debug, callback) {
       const stack = await parseStack(reason);
       callback({
         type: "promise",
-        message: reason.message,
+        message: JSON.stringify(e),
         stack,
-        throwable: reason.stack || ""
+        throwable: ""
       });
     }
   };

package/dist/esm/compress/compression.js

@@ -43,6 +43,14 @@ async function gzipCompress(data) {
   throw new Error("gzipCompress 不支持压缩");
 }
 function convert2Base64FromArray(data) {
+  if (typeof Buffer !== "undefined") {
+    if (data instanceof Uint8Array) {
+      return Buffer.from(data).toString("base64");
+    }
+    if (Array.isArray(data)) {
+      return Buffer.from(Uint8Array.from(data)).toString("base64");
+    }
+  }
   let binary = "";
   for (let i = 0; i < data.length; i += 1) {
     binary += String.fromCharCode(data[i]);
@@ -50,20 +58,16 @@ function convert2Base64FromArray(data) {
   if (typeof btoa !== "undefined") {
     return btoa(binary);
   }
-  if (typeof Buffer !== "undefined") {
-    return Buffer.from(binary, "base64").toString("base64");
-  }
+  if (typeof Buffer !== "undefined")
+    return Buffer.from(binary, "binary").toString("base64");
   throw new Error("convert2Base64FromArray 不支持转换");
 }
 async function convert2Base64(data) {
-  if (typeof btoa !== "undefined") {
-    try {
-      return btoa(data);
-    } catch {
-    }
-  }
-  if (typeof Buffer !== "undefined") {
-    return Buffer.from(data, "base64").toString("base64");
+  try {
+    const bytes = toUtf8Bytes(data);
+    return convert2Base64FromArray(bytes);
+  } catch (e) {
+    console.log("convert2Base64 UTF-8 转换失败", e);
   }
   try {
     const mod = await import("js-base64");

package/dist/esm/core/loggerSDK.js

@@ -136,10 +136,16 @@ var LoggerSDK = class {
         this.offJs = registerJsErrorCapture(!!((_d = this.opts) == null ? void 0 : _d.debug), this.trackInner.bind(this));
       }
       if (enableAuto && ac.promise !== false) {
-        this.offPromise = registerPromiseErrorCapture(!!((_e = this.opts) == null ? void 0 : _e.debug), this.trackInner.bind(this));
+        this.offPromise = registerPromiseErrorCapture(
+          !!((_e = this.opts) == null ? void 0 : _e.debug),
+          this.trackInner.bind(this)
+        );
       }
       if (enableAuto && ac.resource !== false) {
-        this.offResource = registerResourceErrorCapture(!!((_f = this.opts) == null ? void 0 : _f.debug), this.trackInner.bind(this));
+        this.offResource = registerResourceErrorCapture(
+          !!((_f = this.opts) == null ? void 0 : _f.debug),
+          this.trackInner.bind(this)
+        );
       }
     });
   }
@@ -154,9 +160,9 @@ var LoggerSDK = class {
     }
   }
   /**
-  * 设置 token 信息
-  * @param token token
-  */
+   * 设置 token 信息
+   * @param token token
+   */
   setToken(token, securityType) {
     var _a;
     logDebug(!!((_a = this.opts) == null ? void 0 : _a.debug), "setToken", token, securityType);
@@ -427,9 +433,9 @@ var LoggerSDK = class {
     LoggerSDK.instance = void 0;
   }
   generateToken() {
-    var _a;
+    var _a, _b, _c;
     const logTime = Date.now();
-    const token = ((_a = this.opts) == null ? void 0 : _a.token) || md5(`${this.opts.appId}${this.opts.logStage}${logTime}`);
+    const token = ((_a = this.opts) == null ? void 0 : _a.token) || md5(`${(_b = this.opts) == null ? void 0 : _b.appId}${(_c = this.opts) == null ? void 0 : _c.logStage}${logTime}`);
     return {
       token,
       logTime

package/dist/esm/core/queueManager.js

@@ -27,7 +27,11 @@ var QueueManager = class {
         this.localforage = mod;
         return this.localforage;
       } catch (e) {
-        logDebug(!!this.opts.debug, "localforage dynamic import failed, fallback to localStorage", e);
+        logDebug(
+          !!this.opts.debug,
+          "localforage dynamic import failed, fallback to localStorage",
+          e
+        );
         this.localforage = null;
         return null;
       }
@@ -142,21 +146,33 @@ var QueueManager = class {
               return this.localforage.setItem(this.storageKey, this.queue).then(() => {
                 logDebug(!!this.opts.debug, `Saved ${this.queue.length} events to IndexedDB`);
               }).catch((err) => {
-                logDebug(!!this.opts.debug, "IndexedDB save error, falling back to localStorage", err);
+                logDebug(
+                  !!this.opts.debug,
+                  "IndexedDB save error, falling back to localStorage",
+                  err
+                );
                 saveToLocalStorage();
               });
             }
             saveToLocalStorage();
             return null;
           }).catch((err) => {
-            logDebug(!!this.opts.debug, "IndexedDB save error, falling back to localStorage", err);
+            logDebug(
+              !!this.opts.debug,
+              "IndexedDB save error, falling back to localStorage",
+              err
+            );
             saveToLocalStorage();
           });
         } else {
           this.localforage.setItem(this.storageKey, this.queue).then(() => {
             logDebug(!!this.opts.debug, `Saved ${this.queue.length} events to IndexedDB`);
           }).catch((err) => {
-            logDebug(!!this.opts.debug, "IndexedDB save error, falling back to localStorage", err);
+            logDebug(
+              !!this.opts.debug,
+              "IndexedDB save error, falling back to localStorage",
+              err
+            );
             saveToLocalStorage();
           });
         }
@@ -183,21 +199,33 @@ var QueueManager = class {
               return this.localforage.removeItem(this.storageKey).then(() => {
                 logDebug(!!this.opts.debug, "Removed queue from IndexedDB");
               }).catch((err) => {
-                logDebug(!!this.opts.debug, "IndexedDB remove error, falling back to localStorage", err);
+                logDebug(
+                  !!this.opts.debug,
+                  "IndexedDB remove error, falling back to localStorage",
+                  err
+                );
                 removeFromLocalStorage();
               });
             }
             removeFromLocalStorage();
             return null;
           }).catch((err) => {
-            logDebug(!!this.opts.debug, "IndexedDB remove error, falling back to localStorage", err);
+            logDebug(
+              !!this.opts.debug,
+              "IndexedDB remove error, falling back to localStorage",
+              err
+            );
             removeFromLocalStorage();
           });
         } else {
           this.localforage.removeItem(this.storageKey).then(() => {
             logDebug(!!this.opts.debug, "Removed queue from IndexedDB");
           }).catch((err) => {
-            logDebug(!!this.opts.debug, "IndexedDB remove error, falling back to localStorage", err);
+            logDebug(
+              !!this.opts.debug,
+              "IndexedDB remove error, falling back to localStorage",
+              err
+            );
             removeFromLocalStorage();
           });
         }

package/dist/esm/transport/beaconTransport.js

@@ -27,7 +27,7 @@ var BeaconTransport = class {
       contentType = "application/json; charset=utf-8";
     } else {
       logDebug(!!((_c = this.opts) == null ? void 0 : _c.debug), "WeChat request no gzip mode: ");
-      const compressedItems = convert2Base64(safeStringify(payload.items));
+      const compressedItems = await convert2Base64(safeStringify(payload.items));
       sendBody = safeStringify({
         ...payload,
         items: compressedItems

package/dist/esm/transport/pixelImageTransport.js

@@ -3,6 +3,7 @@ import { isBrowser } from "../utils/environment";
 import { logDebug, now, safeStringify } from "../utils/tools";
 import { getPixelBatchApi } from "../config";
 import { convert2Base64, gzipCompress } from "../compress/compression";
+import { SecurityType } from "../types/securityType";
 var PixelImageTransport = class {
   constructor(opts) {
     /** 传输器名称 */
@@ -14,7 +15,7 @@ var PixelImageTransport = class {
     return isBrowser() && typeof Image !== "undefined";
   }
   async send(token, payload) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
     const body = safeStringify(payload.items);
     const endpoint = `${getPixelBatchApi(((_a = this.opts) == null ? void 0 : _a.env) || "develop")}?token=${token}`;
     const param = "items";
@@ -31,10 +32,10 @@ var PixelImageTransport = class {
       compressedBody = await convert2Base64(body);
     }
     const cacheBuster = `_=${Date.now()}`;
-    const qs = `appId=${((_h = this.opts) == null ? void 0 : _h.appId) || ""}&appStage=${((_i = this.opts) == null ? void 0 : _i.logStage) || ""}&${param}=${encodeURIComponent(compressedBody)}&gzip=${((_j = this.opts) == null ? void 0 : _j.enableGzip) ? 1 : 0}&${cacheBuster}`;
+    const qs = `appId=${((_h = this.opts) == null ? void 0 : _h.appId) || ""}&appStage=${((_i = this.opts) == null ? void 0 : _i.logStage) || ""}&${param}=${encodeURIComponent(compressedBody)}&securityType=${((_j = this.opts) == null ? void 0 : _j.securityType) || SecurityType.BASE}&logTime=${payload.logTime}&gzip=${((_k = this.opts) == null ? void 0 : _k.enableGzip) ? 1 : 0}&${cacheBuster}`;
     const url = endpoint.includes("?") ? `${endpoint}&${qs}` : `${endpoint}?${qs}`;
     if (url.length > maxLen) {
-      logDebug(!!((_k = this.opts) == null ? void 0 : _k.debug), `URL too long (${url.length} > ${maxLen})`);
+      logDebug(!!((_l = this.opts) == null ? void 0 : _l.debug), `URL too long (${url.length} > ${maxLen})`);
     }
     return new Promise((resolve, reject) => {
       const img = new Image();

package/dist/types/capture/jsError.d.ts

@@ -1,2 +1,2 @@
-import { BaseErrorInfo } from '../types/logEvent';
+import type { BaseErrorInfo } from '../types/logEvent';
 export declare function registerJsErrorCapture(debug: boolean, callback: (error: BaseErrorInfo) => void): (() => void) | undefined;

package/dist/types/capture/promiseError.d.ts

@@ -1,2 +1,2 @@
-import { BaseErrorInfo } from '../types/logEvent';
+import type { BaseErrorInfo } from '../types/logEvent';
 export declare function registerPromiseErrorCapture(debug: boolean, callback: (error: BaseErrorInfo) => void): (() => void) | undefined;

package/dist/types/capture/resourceError.d.ts

@@ -1,2 +1,2 @@
-import { BaseErrorInfo } from '../types/logEvent';
+import type { BaseErrorInfo } from '../types/logEvent';
 export declare function registerResourceErrorCapture(debug: boolean, callback: (error: BaseErrorInfo) => void): (() => void) | undefined;

package/dist/types/config/index.d.ts

@@ -1,4 +1,4 @@
-import { Env } from '../types/env';
+import type { Env } from '../types/env';
 /** 获取 SDK 基础 API */
 export declare const getSDKBaseApi: (env: Env) => "https://apm.pharmacyyf.com" | "https://apm-te.pharmacyyf.com" | "https://chief-dev.yifengx.com";
 /** 获取 SDK 注册 API */

package/dist/types/core/loggerSDK.d.ts

@@ -1,6 +1,6 @@
-import { Env } from '../types/env';
-import { SDKOptions } from '../types/sdkOptions';
-import { TrackOptions } from '../types/trackOptions';
+import type { Env } from '../types/env';
+import type { SDKOptions } from '../types/sdkOptions';
+import type { TrackOptions } from '../types/trackOptions';
 import { SecurityType } from '../types/securityType';
 export declare class LoggerSDK {
     private static instance;
@@ -41,9 +41,9 @@ export declare class LoggerSDK {
      */
     identify(userId: string): void;
     /**
-   * 设置 token 信息
-   * @param token token
-   */
+     * 设置 token 信息
+     * @param token token
+     */
     setToken(token: string, securityType: SecurityType): void;
     /** 设置店铺编码 */
     setStoreCode(storeCode: string): void;

package/dist/types/core/queueManager.d.ts

@@ -1,4 +1,4 @@
-import { LogEvent } from '../types/logEvent';
+import type { LogEvent } from '../types/logEvent';
 type LocalForageLike = {
     getItem: (key: string) => Promise<any>;
     setItem: (key: string, value: any) => Promise<any>;

package/dist/types/stack/stacktrace.d.ts

@@ -1,2 +1,2 @@
-import { StackFrame } from '../types/logEvent';
+import type { StackFrame } from '../types/logEvent';
 export declare function parseStack(error: Error): Promise<StackFrame[]>;

package/dist/types/transport/beaconTransport.d.ts

@@ -1,5 +1,5 @@
-import { ReportData } from '../types/logEvent';
-import { Transporter, TransportOptions } from './transport';
+import type { ReportData } from '../types/logEvent';
+import type { Transporter, TransportOptions } from './transport';
 export declare class BeaconTransport implements Transporter {
     /** 传输器名称 */
     name: string;

package/dist/types/transport/pixelImageTransport.d.ts

@@ -1,5 +1,5 @@
-import { Transporter, TransportOptions } from './transport';
-import { ReportData } from '../types/logEvent';
+import type { Transporter, TransportOptions } from './transport';
+import type { ReportData } from '../types/logEvent';
 export declare class PixelImageTransport implements Transporter {
     /** 传输器名称 */
     name: string;

package/dist/types/transport/transport.d.ts

@@ -1,5 +1,5 @@
-import { ReportData } from '../types/logEvent';
-import { SDKOptions } from '../types/sdkOptions';
+import type { ReportData } from '../types/logEvent';
+import type { SDKOptions } from '../types/sdkOptions';
 /** 传输选项接口 */
 export interface TransportOptions extends SDKOptions {
 }

package/dist/types/types/logEvent.d.ts

@@ -1,6 +1,6 @@
-import { Stage } from './env';
-import { LogEventLevel } from './logEventLevel';
-import { SecurityType } from './securityType';
+import type { Stage } from './env';
+import type { LogEventLevel } from './logEventLevel';
+import type { SecurityType } from './securityType';
 /** 标准化日志上报格式 */
 export interface LogEvent {
     /** 日志 ID */

package/dist/types/types/sdkOptions.d.ts

@@ -1,6 +1,6 @@
-import { Env, Stage } from './env';
-import { LogEventLevel } from './logEventLevel';
-import { SecurityType } from './securityType';
+import type { Env, Stage } from './env';
+import type { LogEventLevel } from './logEventLevel';
+import type { SecurityType } from './securityType';
 /** SDK 配置选项 */
 export interface SDKOptions {
     /** 上报端点 URL */

package/dist/types/types/trackOptions.d.ts

@@ -1,4 +1,4 @@
-import { LogEventLevel } from './logEventLevel';
+import type { LogEventLevel } from './logEventLevel';
 export type TrackOptions = {
     message: string;
     error?: Error | unknown;

package/dist/types/utils/environment.d.ts

@@ -1,4 +1,4 @@
-import { EnvironmentInfo } from '../types/env';
+import type { EnvironmentInfo } from '../types/env';
 export declare function isBrowser(): boolean;
 export declare function getCurrentUrl(): string;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluve/logger-sdk",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "logger sdk",
   "keywords": [
     "logger"