From d78628b66a56e852847cd407f0c45c2ccd3bc658 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Wed, 15 May 2024 10:49:50 +0530
Subject: [PATCH] Move

---
 .../src/services/machineLearning/mlWorkManager.ts   |  9 ++++-----
 web/apps/photos/src/services/ml/face.ts             |  8 ++++++++
 .../ml.worker.ts => services/ml/face.worker.ts}     |  0
 .../photos/src/utils/comlink/ComlinkMLWorker.ts     | 13 -------------
 4 files changed, 12 insertions(+), 18 deletions(-)
 create mode 100644 web/apps/photos/src/services/ml/face.ts
 rename web/apps/photos/src/{worker/ml.worker.ts => services/ml/face.worker.ts} (100%)
 delete mode 100644 web/apps/photos/src/utils/comlink/ComlinkMLWorker.ts

diff --git a/web/apps/photos/src/services/machineLearning/mlWorkManager.ts b/web/apps/photos/src/services/machineLearning/mlWorkManager.ts
index baefd893b..371204279 100644
--- a/web/apps/photos/src/services/machineLearning/mlWorkManager.ts
+++ b/web/apps/photos/src/services/machineLearning/mlWorkManager.ts
@@ -6,12 +6,11 @@ import { getToken, getUserID } from "@ente/shared/storage/localStorage/helpers";
 import debounce from "debounce";
 import PQueue from "p-queue";
 import mlIDbStorage from "services/ml/db";
+import { createFaceComlinkWorker } from "services/ml/face";
+import type { DedicatedMLWorker } from "services/ml/face.worker";
 import { MLSyncResult } from "services/ml/types";
 import { EnteFile } from "types/file";
-import { getDedicatedMLWorker } from "utils/comlink/ComlinkMLWorker";
-import { DedicatedMLWorker } from "worker/ml.worker";
 import { logQueueStats } from "./machineLearningService";
-
 const LIVE_SYNC_IDLE_DEBOUNCE_SEC = 30;
 const LIVE_SYNC_QUEUE_TIMEOUT_SEC = 300;
 const LOCAL_FILES_UPDATED_DEBOUNCE_SEC = 30;
@@ -226,7 +225,7 @@ class MLWorkManager {
     // Live Sync
     private async getLiveSyncWorker() {
         if (!this.liveSyncWorker) {
-            this.liveSyncWorker = getDedicatedMLWorker("ml-sync-live");
+            this.liveSyncWorker = createFaceComlinkWorker("ml-sync-live");
         }
 
         return await this.liveSyncWorker.remote;
@@ -274,7 +273,7 @@ class MLWorkManager {
     // Sync Job
     private async getSyncJobWorker() {
         if (!this.syncJobWorker) {
-            this.syncJobWorker = getDedicatedMLWorker("ml-sync-job");
+            this.syncJobWorker = createFaceComlinkWorker("ml-sync-job");
         }
 
         return await this.syncJobWorker.remote;
diff --git a/web/apps/photos/src/services/ml/face.ts b/web/apps/photos/src/services/ml/face.ts
new file mode 100644
index 000000000..7eb6980e0
--- /dev/null
+++ b/web/apps/photos/src/services/ml/face.ts
@@ -0,0 +1,8 @@
+import { ComlinkWorker } from "@/next/worker/comlink-worker";
+import type { DedicatedMLWorker } from "services/ml/face.worker";
+
+const createFaceWebWorker = () =>
+    new Worker(new URL("face.worker.ts", import.meta.url));
+
+export const createFaceComlinkWorker = (name: string) =>
+    new ComlinkWorker<typeof DedicatedMLWorker>(name, createFaceWebWorker());
diff --git a/web/apps/photos/src/worker/ml.worker.ts b/web/apps/photos/src/services/ml/face.worker.ts
similarity index 100%
rename from web/apps/photos/src/worker/ml.worker.ts
rename to web/apps/photos/src/services/ml/face.worker.ts
diff --git a/web/apps/photos/src/utils/comlink/ComlinkMLWorker.ts b/web/apps/photos/src/utils/comlink/ComlinkMLWorker.ts
deleted file mode 100644
index f312a2c5c..000000000
--- a/web/apps/photos/src/utils/comlink/ComlinkMLWorker.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { haveWindow } from "@/next/env";
-import { ComlinkWorker } from "@/next/worker/comlink-worker";
-import { type DedicatedMLWorker } from "worker/ml.worker";
-
-export const getDedicatedMLWorker = (name: string) => {
-    if (haveWindow()) {
-        const cryptoComlinkWorker = new ComlinkWorker<typeof DedicatedMLWorker>(
-            name ?? "ente-ml-worker",
-            new Worker(new URL("worker/ml.worker.ts", import.meta.url)),
-        );
-        return cryptoComlinkWorker;
-    }
-};