Merge pull request #186 from caorushizi/dev-ap

feat: ✨  ap

.cspell/custom-words.txt

@@ -2,6 +2,7 @@ acodec
 adblocker
 ahooks
 antd
+aplus
 behaviour
 bili
 bilibili
@@ -15,6 +16,7 @@ conventionalcommits
 datetime
 DDTHH
 execa
+idtype
 immer
 inversify
 KHTML

.env.development

@@ -1,5 +1,4 @@
 APP_TD_APPID=
-APP_CLARITY_APPID=
 
 GH_TOKEN=
 LOAD_DEVTOOLS=

.env.production

@@ -1,5 +1,4 @@
 APP_TD_APPID=
-APP_CLARITY_APPID=
 
 GH_TOKEN=
 DEBUG_PLUGINS=false

packages/main/package.json

@@ -66,7 +66,9 @@
     "lint-staged": "^15.2.5",
     "lodash": "^4.17.21",
     "mime-types": "^2.1.35",
+    "nanoid": "^5.0.7",
     "node-fetch": "^3.3.2",
+    "node-machine-id": "^1.1.12",
     "node-pty": "^1.0.0",
     "reflect-metadata": "^0.2.2",
     "strip-ansi": "^7.1.0",

packages/main/src/controller/HomeController.ts

@@ -24,6 +24,8 @@ import WebviewService from "../services/WebviewService.ts";
 import FavoriteRepository from "../repository/FavoriteRepository.ts";
 import VideoRepository from "../repository/VideoRepository.ts";
 import ConversionRepository from "../repository/ConversionRepository.ts";
+import { machineId } from "node-machine-id";
+import { nanoid } from "nanoid";
 
 @injectable()
 export default class HomeController implements Controller {
@@ -271,4 +273,21 @@ export default class HomeController implements Controller {
     }
     return "";
   }
+
+  @handle("get-machine-id")
+  async getMachineId() {
+    try {
+      const id = this.store.get("machineId");
+      if (id) return id;
+      const newId = await machineId();
+      this.store.set("machineId", newId);
+      return newId;
+    } catch (e) {
+      const id = this.store.get("machineId");
+      if (id) return id;
+      const newId = nanoid();
+      this.store.set("machineId", newId);
+      return newId;
+    }
+  }
 }

packages/main/src/main.d.ts

@@ -52,6 +52,8 @@ declare interface AppStore {
   showTerminal: boolean;
   // 隐私模式
   privacy: boolean;
+  // 机器id
+  machineId: string;
 }
 
 declare interface BrowserStore {

packages/main/src/preload.ts

@@ -169,6 +169,9 @@ const electronApi = {
   deleteConversion(id: number): Promise<void> {
     return ipcRenderer.invoke("delete-conversion", id);
   },
+  getMachineId(): Promise<string> {
+    return ipcRenderer.invoke("get-machine-id");
+  },
 };
 
 contextBridge.exposeInMainWorld(apiKey, electronApi);

packages/main/src/vendor/ElectronStore.ts

@@ -28,6 +28,7 @@ export default class StoreService extends Store<AppStore> implements Vendor {
         language: AppLanguage.System,
         showTerminal: false,
         privacy: false,
+        machineId: "",
       },
     });
   }

packages/renderer/src/App.tsx

@@ -9,6 +9,8 @@ import "./App.scss";
 import useElectron from "./hooks/electron";
 import Loading from "./components/Loading";
 import { DownloadFilter } from "./types";
+import { tdApp } from "./utils";
+import { useAsyncEffect } from "ahooks";
 
 const AppLayout = lazy(() => import("./layout/App"));
 const HomePage = lazy(() => import("./pages/HomePage"));
@@ -23,7 +25,7 @@ function getAlgorithm(appTheme: "dark" | "light") {
 const App: FC = () => {
   const dispatch = useDispatch();
   const [appTheme, setAppTheme] = React.useState<"dark" | "light">("light");
-  const { addIpcListener, removeIpcListener } = useElectron();
+  const { addIpcListener, removeIpcListener, getMachineId } = useElectron();
 
   const themeChange = (event: MediaQueryListEvent) => {
     if (event.matches) {
@@ -52,6 +54,11 @@ const App: FC = () => {
     };
   }, []);
 
+  useAsyncEffect(async () => {
+    const deviceId = await getMachineId();
+    tdApp.onEvent("页面加载", { deviceId });
+  }, []);
+
   useEffect(() => {
     const isDarkTheme = matchMedia("(prefers-color-scheme: dark)");
     isDarkTheme.addEventListener("change", themeChange);

packages/renderer/src/main.tsx

@@ -5,18 +5,17 @@ import { Provider } from "react-redux";
 import store from "./store";
 import dayjs from "dayjs";
 import "dayjs/locale/zh-cn";
-import { tdApp, initClarity } from "./utils";
+import { tdApp } from "./utils";
 import App from "./App";
 import "./i18n";
 
 dayjs.locale("zh-cn");
 tdApp.init();
-initClarity();
 
 createRoot(document.getElementById("root") as HTMLElement).render(
   <StrictMode>
     <Provider store={store}>
       <App />
     </Provider>
-  </StrictMode>,
+  </StrictMode>
 );

packages/renderer/src/utils/index.ts

@@ -3,7 +3,6 @@ import { isUrl } from "./url";
 
 export { http } from "./http";
 export { tdApp } from "./tdapp";
-export { initClarity } from "./clarity";
 
 export const requestImage = (url: string, timeout = 1000): Promise<void> => {
   return new Promise((resolve, reject) => {

packages/renderer/src/utils/tdapp.ts

@@ -17,7 +17,7 @@ class TDEvent {
     headElement.appendChild(script);
   }
 
-  private onEvent(eventId: string, mapKv: Record<string, string> = {}) {
+  onEvent(eventId: string, mapKv: Record<string, string> = {}) {
     try {
       window.TDAPP?.onEvent(eventId, "", mapKv);
     } catch (e) {

packages/renderer/src/vite-env.d.ts

@@ -8,10 +8,9 @@ declare global {
       onEvent: (
         eventId: string,
         label: "",
-        mapKv: Record<string, string>,
+        mapKv: Record<string, string>
       ) => void;
     };
-    clarity?: any;
   }
 }