[harmony] add Client.getName() instead of combineName()

HuolalaTech · Aug 28, 2024 · e18819b · e18819b
1 parent 49b1599
commit e18819b
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 52 deletions.
diff --git a/packages/page-spy-harmony/library/src/main/ets/api/index.ts b/packages/page-spy-harmony/library/src/main/ets/api/index.ts
@@ -2,7 +2,7 @@ import url from '@ohos.url';
 import http from '@ohos.net.http';
 import { InitConfig } from '../types';
 import { getRandomId } from '../utils';
-import Client, { combineName } from '../utils/client';
+import Client from '../utils/client';
 
 interface TResponse<T> {
   code: string;
@@ -50,7 +50,7 @@ export default class Request {
     const scheme = this.getScheme();
     const query = joinQuery({
       // TODO
-      name: combineName(Client.info),
+      name: Client.getName(),
       group: project,
       title,
     });

diff --git a/packages/page-spy-harmony/library/src/main/ets/helpers/socket.ts b/packages/page-spy-harmony/library/src/main/ets/helpers/socket.ts
@@ -1,8 +1,5 @@
 import webSocket from '@ohos.net.webSocket';
-import { InitConfig } from '../types';
 import { psLog, stringifyData } from '../utils';
-import Client, { combineName } from '../utils/client';
-import { UPDATE_ROOM_INFO } from '../utils/message/server-type';
 import {
   SocketStoreBase,
   SocketState,
@@ -59,37 +56,6 @@ export class OHSocketWrapper extends SocketWrapper {
 export class OHSocketStore extends SocketStoreBase {
   protected socketWrapper: OHSocketWrapper = new OHSocketWrapper();
 
-  public getPageSpyConfig: (() => Required<InitConfig>) | null = null;
-
-  updateRoomInfo() {
-    if (this.getPageSpyConfig) {
-      const { project, title } = this.getPageSpyConfig();
-      const name = combineName(Client.info);
-
-      this.send(
-        {
-          type: UPDATE_ROOM_INFO,
-          content: {
-            info: {
-              name,
-              group: project,
-              tags: {
-                title,
-                name,
-                group: project,
-              },
-            },
-          },
-        },
-        true,
-      );
-    }
-  }
-
-  public getSocket() {
-    return this.socketWrapper;
-  }
-
   onOffline(): void {
     // AppStorage.delete(ROOM_SESSION_KEY);
   }

diff --git a/packages/page-spy-harmony/library/src/main/ets/plugins/system.ts b/packages/page-spy-harmony/library/src/main/ets/plugins/system.ts
@@ -1,6 +1,6 @@
 import socketStore from '../helpers/socket';
 import { InitConfig, OnInitParams, PageSpyPlugin, SpySystem } from '../types';
-import Client, { combineName } from '../utils/client';
+import Client from '../utils/client';
 import { makeMessage } from '../utils/message';
 
 export default class SystemPlugin implements PageSpyPlugin {
@@ -38,7 +38,7 @@ export default class SystemPlugin implements PageSpyPlugin {
   public static getSystemInfo() {
     return {
       system: {
-        ua: combineName(Client.info),
+        ua: Client.getName(),
       },
       features: {},
     };

diff --git a/packages/page-spy-harmony/library/src/main/ets/utils/client.ts b/packages/page-spy-harmony/library/src/main/ets/utils/client.ts
@@ -2,18 +2,10 @@ import { SpyClient } from '../types';
 import deviceInfo from '@ohos.deviceInfo';
 import { DEVICE_INFO } from './constants';
 
-export const combineName = ({
-  osType,
-  osVersion,
-  browserType,
-  browserVersion,
-}: SpyClient.ClientInfo) => {
-  // return `${osType}/${osVersion} ${browserType}/${browserVersion}`;
-  return DEVICE_INFO;
-};
-
 export default class Client {
   static info: SpyClient.ClientInfo = {
+    // 硬编码 ua
+    ua: DEVICE_INFO,
     osType: 'harmony',
     osVersion: deviceInfo.osFullName,
     browserType: 'harmony',
@@ -26,13 +18,24 @@ export default class Client {
   static plugins: string[] = [];
 
   static makeClientInfoMsg() {
-    const ua = Client.info.ua || combineName(Client.info);
     const msg: SpyClient.DataItem = {
       sdk: Client.info.sdk,
       isDevTools: Client.info.isDevTools,
-      ua,
+      ua: Client.getName(),
       plugins: Client.plugins,
     };
     return msg;
   }
+
+  private static _name: string;
+
+  static getName() {
+    if (!Client._name) {
+      const { ua, osType, osVersion, browserType, browserVersion } =
+        Client.info;
+      Client._name =
+        ua || `${osType}/${osVersion} ${browserType}/${browserVersion}`;
+    }
+    return Client._name;
+  }
 }
diff --git a/packages/page-spy-harmony/library/src/main/ets/utils/socket-base.ts b/packages/page-spy-harmony/library/src/main/ets/utils/socket-base.ts
@@ -11,7 +11,7 @@ import {
 } from './message';
 import * as SERVER_MESSAGE_TYPE from './message/server-type';
 import atom from './atom';
-import { SpyBase, SpyMessage, SpySocket } from '../types';
+import { InitConfig, SpyBase, SpyMessage, SpySocket } from '../types';
 import { PackedEvent } from '../types/lib/socket-event';
 import Client from './client';
 
@@ -109,7 +109,9 @@ export abstract class SocketWrapper {
 export abstract class SocketStoreBase {
   protected abstract socketWrapper: SocketWrapper;
 
-  protected abstract updateRoomInfo(): void;
+  public getSocket() {
+    return this.socketWrapper;
+  }
 
   public socketUrl: string = '';
 
@@ -155,6 +157,33 @@ export abstract class SocketStoreBase {
 
   connectable = true;
 
+  public getPageSpyConfig: (() => Required<InitConfig>) | null = null;
+
+  updateRoomInfo() {
+    if (this.getPageSpyConfig) {
+      const { project, title } = this.getPageSpyConfig();
+      const name = Client.getName();
+
+      this.send(
+        {
+          type: SERVER_MESSAGE_TYPE.UPDATE_ROOM_INFO,
+          content: {
+            info: {
+              name,
+              group: project,
+              tags: {
+                title,
+                name,
+                group: project,
+              },
+            },
+          },
+        },
+        true,
+      );
+    }
+  }
+
   // response message filters, to handle some wired messages
   public static messageFilters: ((data: any) => any)[] = [];