fix alipay mp api & optimize offline log upload behavior

HuolalaTech · Nov 28, 2024 · 4b05167 · 4b05167
1 parent f4f6574
commit 4b05167
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 27 deletions.
diff --git a/packages/page-spy-mp-base/src/index.ts b/packages/page-spy-mp-base/src/index.ts
@@ -270,15 +270,17 @@ class PageSpy {
       {
         text: 'PageSpy 房间号：' + this.address.slice(0, 4),
         action() {
-          mp.setClipboardData({
-            data: that.getDebugLink(),
-            success() {
-              mp.showToast({
-                title: '复制成功',
-                icon: 'success',
-              });
-            },
-          });
+          if (mp.setClipboardData) {
+            mp.setClipboardData({
+              data: that.getDebugLink(),
+              success() {
+                mp.showToast({
+                  title: '复制成功',
+                  icon: 'success',
+                });
+              },
+            });
+          }
         },
       },
     ];

diff --git a/packages/page-spy-plugin-mp-data-harbor/src/harbor/base.ts b/packages/page-spy-plugin-mp-data-harbor/src/harbor/base.ts
@@ -8,3 +8,8 @@ export type CacheMessageItem = Pick<
 > & {
   timestamp: number;
 };
+
+export interface WholeActionParams {
+  clearCache?: boolean;
+  remark?: string;
+}
diff --git a/packages/page-spy-plugin-mp-data-harbor/src/index.ts b/packages/page-spy-plugin-mp-data-harbor/src/index.ts
@@ -10,7 +10,7 @@ import { removeEndSlash } from '@huolala-tech/page-spy-base/dist/utils';
 import { MemoryHarbor } from './harbor/memoryHarbor';
 import { startUpload } from './utils/upload';
 import { buildSearchParams, getDeviceId, makeData, makeFile } from './utils';
-import { DataType } from './harbor/base';
+import { DataType, WholeActionParams } from './harbor/base';
 import {
   getMPSDK,
   type Client,
@@ -114,17 +114,50 @@ export default class MPDataHarborPlugin implements PageSpyPlugin {
       {
         text: '上传离线日志',
         action: async () => {
-          const result = await this.upload();
+          const mp = getMPSDK();
+          mp.showLoading({ title: '正在上传离线日志...' });
+          try {
+            const result = await this.upload();
+            mp.hideLoading();
+            if (result) {
+              if (mp.setClipboardData) {
+                mp.showModal({
+                  title: '上传成功',
+                  confirmText: '复制链接',
+                  showCancel: false,
+                  success(res) {
+                    if (res.confirm) {
+                      mp.setClipboardData({
+                        data: result,
+                      });
+                    }
+                  },
+                });
+              } else {
+                mp.showModal({
+                  title: '上传成功',
+                  content: result,
+                  showCancel: false,
+                });
+              }
+            } else {
+              mp.showToast({
+                title: '上传失败',
+              });
+            }
+          } catch (e) {
+            mp.hideLoading();
+            mp.showToast({
+              title: '上传失败',
+            });
+          }
         },
       },
     ];
   }
 
-  async upload(clearCache = true) {
+  async upload(params?: WholeActionParams) {
     const mp = getMPSDK();
-    mp.showLoading({
-      title: '正在上传离线日志...',
-    });
     const { filename } = this.$harborConfig;
     const { project = '', title = '' } = this.$pageSpyConfig || {};
     const tags = {
@@ -133,8 +166,8 @@ export default class MPDataHarborPlugin implements PageSpyPlugin {
       deviceId: getDeviceId(),
       // userAgent: navigator.userAgent,
       userAgent: this.client?.getName(),
+      remark: params?.remark || '',
     };
-
     const data = [...this.harbor.container];
     data.push(this.makeMetaInfo());
 
@@ -146,26 +179,18 @@ export default class MPDataHarborPlugin implements PageSpyPlugin {
         url,
       });
 
-      if (clearCache) {
+      if (params?.clearCache !== false) {
         this.harbor.clear();
         this.$socketStore?.dispatchEvent('harbor-clear', null);
       }
-      mp.hideLoading();
-      mp.showToast({
-        title: '离线日志上传成功',
-        icon: 'success',
-      });
     } catch (e: any) {
       psLog.error(e);
-      mp.hideLoading();
-      mp.showToast({
-        icon: 'error',
-        title: '离线日志上传失败',
-      });
+      return '';
     }
     // remove the local file
     const fs = mp.getFileSystemManager();
     fs.unlinkSync(path);
+    return url;
   }
 
   onReset() {