src/services/core/network.service.ts

@@ -1,33 +1,38 @@
-import * as Comlink from "comlink";
+import * as Comlink from 'comlink';
-import type { NetworkBackend } from "../../workers/network.worker";
+import type { NetworkBackend } from '../../workers/network.worker';
-import Services from "../service";
+import Services from '../service'; // Attention à la dépendance circulaire, on va gérer ça
 
 export class NetworkService {
   private worker: Comlink.Remote<NetworkBackend>;
   private workerInstance: Worker;
 
-  // Cache local
+  // Cache local pour répondre instantanément aux demandes synchrones de l'UI
   private localRelays: Record<string, string> = {};
 
   constructor(private bootstrapUrls: string[]) {
     this.workerInstance = new Worker(
-      new URL("../../workers/network.worker.ts", import.meta.url),
+      new URL('../../workers/network.worker.ts', import.meta.url),
-      { type: "module" }
+      { type: 'module' }
     );
     this.worker = Comlink.wrap<NetworkBackend>(this.workerInstance);
   }
 
+  // Initialisation appelée par Services.ts
   public async initRelays() {
+    // 1. Setup des callbacks : Quand le worker reçoit un message, il appelle ici
     await this.worker.setCallbacks(
       Comlink.proxy(this.onMessageReceived.bind(this)),
       Comlink.proxy(this.onStatusChange.bind(this))
     );
 
+    // 2. Lancer les connexions
     for (const url of this.bootstrapUrls) {
       this.addWebsocketConnection(url);
     }
   }
 
+  // --- MÉTHODES PUBLIQUES (API inchangée) ---
+
   public async addWebsocketConnection(url: string) {
     await this.worker.connect(url);
   }
@@ -39,10 +44,14 @@ export class NetworkService {
   }
 
   public async sendMessage(flag: string, content: string) {
+    // On transmet au worker
+    // Note: Le type 'any' est utilisé pour simplifier la compatibilité avec AnkFlag
     await this.worker.sendMessage(flag as any, content);
   }
 
   public updateRelay(url: string, spAddress: string) {
+    // Cette méthode était utilisée pour update l'état local.
+    // Maintenant c'est le worker qui gère la vérité, mais on garde le cache local.
     this.localRelays[url] = spAddress;
   }
 
@@ -50,46 +59,30 @@ export class NetworkService {
     return this.localRelays;
   }
 
-  // 🔥 CORRECTION ICI : Ajout d'une boucle d'attente (Polling)
   public async getAvailableRelayAddress(): Promise<string> {
-    const maxRetries = 20; // 20 tentatives
+    // On demande au worker qui a la "vraie" info temps réel
-    const interval = 500; // toutes les 500ms = 10 secondes max
+    const addr = await this.worker.getAvailableRelay();
+    if (addr) return addr;
 
-    for (let i = 0; i < maxRetries; i++) {
+    // Fallback ou attente...
-      // On demande au worker
+    throw new Error('Aucun relais disponible (NetworkWorker)');
-      const addr = await this.worker.getAvailableRelay();
-
-      if (addr && addr !== "") {
-        return addr; // Trouvé !
-      }
-
-      // Pas encore là ? On attend un peu...
-      if (i === 0)
-        console.log("[NetworkService] ⏳ Attente du Handshake relais...");
-      await new Promise((r) => setTimeout(r, interval));
-    }
-
-    throw new Error(
-      "Timeout: Aucun relais disponible après 10s (Handshake non reçu ?)"
-    );
   }
 
-  // --- INTERNES ---
+  // --- INTERNES (CALLBACKS) ---
 
   private async onMessageReceived(flag: string, content: string, url: string) {
+    // C'est ici qu'on fait le pont : NetworkWorker -> Main -> CoreWorker
+    // On passe par l'instance Singleton de Services pour atteindre le CoreWorker
     const services = await Services.getInstance();
     await services.dispatchToWorker(flag, content, url);
   }
 
-  private onStatusChange(
+  private onStatusChange(url: string, status: 'OPEN' | 'CLOSED', spAddress?: string) {
-    url: string,
+    if (status === 'OPEN' && spAddress) {
-    status: "OPEN" | "CLOSED",
-    spAddress?: string
-  ) {
-    if (status === "OPEN" && spAddress) {
       this.localRelays[url] = spAddress;
-    } else if (status === "CLOSED") {
+    } else if (status === 'CLOSED') {
-      this.localRelays[url] = "";
+      this.localRelays[url] = '';
     }
+    // On pourrait notifier l'UI ici de l'état de la connexion
   }
 }

src/utils/sp-address.utils.ts

@@ -1,6 +1,6 @@
-import Services from "../services/service";
+import Services from '../services/service';
-import { getCorrectDOM } from "./html.utils";
+import { getCorrectDOM } from './html.utils';
-import { addSubscription } from "./subscription.utils";
+import { addSubscription } from './subscription.utils';
 
 //Generate emojis list
 export function generateEmojiList(): string[] {
@@ -30,7 +30,7 @@ export async function addressToEmoji(text: string): Promise<string> {
   //Adress to Hash
   const encoder = new TextEncoder();
   const data = encoder.encode(text);
-  const hashBuffer = await crypto.subtle.digest("SHA-256", data);
+  const hashBuffer = await crypto.subtle.digest('SHA-256', data);
 
   const hash = new Uint8Array(hashBuffer);
   const bytes = hash.slice(-4);
@@ -39,19 +39,17 @@ export async function addressToEmoji(text: string): Promise<string> {
   const emojiList = generateEmojiList();
   const emojis = Array.from(bytes)
     .map((byte) => emojiList[byte])
-    .join("");
+    .join('');
   return emojis;
 }
 
 //Get emojis from other device
 async function emojisPairingRequest() {
   try {
-    const container = getCorrectDOM("login-4nk-component") as HTMLElement;
+    const container = getCorrectDOM('login-4nk-component') as HTMLElement;
 
-    const urlParams: URLSearchParams = new URLSearchParams(
+    const urlParams: URLSearchParams = new URLSearchParams(window.location.search);
-      window.location.search
+    const sp_adress: string | null = urlParams.get('sp_address');
-    );
-    const sp_adress: string | null = urlParams.get("sp_address");
 
     if (!sp_adress) {
       // console.error("No 'sp_adress' parameter found in the URL.");
@@ -59,10 +57,10 @@ async function emojisPairingRequest() {
     }
 
     const emojis = await addressToEmoji(sp_adress);
-    const emojiDisplay = container?.querySelector(".pairing-request");
+    const emojiDisplay = container?.querySelector('.pairing-request');
 
     if (emojiDisplay) {
-      emojiDisplay.textContent = "(Request from: " + emojis + ")";
+      emojiDisplay.textContent = '(Request from: ' + emojis + ')';
     }
   } catch (err) {
     console.error(err);
@@ -71,11 +69,11 @@ async function emojisPairingRequest() {
 
 // Display address emojis and other device emojis
 export async function displayEmojis(text: string) {
-  console.log("🚀 ~ Services ~ adressToEmoji");
+  console.log('🚀 ~ Services ~ adressToEmoji');
   try {
-    const container = getCorrectDOM("login-4nk-component") as HTMLElement;
+    const container = getCorrectDOM('login-4nk-component') as HTMLElement;
     const emojis = await addressToEmoji(text);
-    const emojiDisplay = container?.querySelector(".emoji-display");
+    const emojiDisplay = container?.querySelector('.emoji-display');
 
     if (emojiDisplay) {
       emojiDisplay.textContent = emojis;
@@ -91,19 +89,13 @@ export async function displayEmojis(text: string) {
 
 // Verify Other address
 export function initAddressInput() {
-  const container = getCorrectDOM("login-4nk-component") as HTMLElement;
+  const container = getCorrectDOM('login-4nk-component') as HTMLElement;
-  const addressInput = container.querySelector(
+  const addressInput = container.querySelector('#addressInput') as HTMLInputElement;
-    "#addressInput"
+  const emojiDisplay = container.querySelector('#emoji-display-2');
-  ) as HTMLInputElement;
+  const okButton = container.querySelector('#okButton') as HTMLButtonElement;
-  const emojiDisplay = container.querySelector("#emoji-display-2");
+  const createButton = container.querySelector('#createButton') as HTMLButtonElement;
-  const okButton = container.querySelector("#okButton") as HTMLButtonElement;
+  const actionButton = container.querySelector('#actionButton') as HTMLButtonElement;
-  const createButton = container.querySelector(
+  addSubscription(addressInput, 'input', async () => {
-    "#createButton"
-  ) as HTMLButtonElement;
-  const actionButton = container.querySelector(
-    "#actionButton"
-  ) as HTMLButtonElement;
-  addSubscription(addressInput, "input", async () => {
     let address = addressInput.value;
 
     // Vérifie si l'adresse est une URL
@@ -111,7 +103,7 @@ export function initAddressInput() {
       const url = new URL(address);
       // Si c'est une URL valide, extraire le paramètre sp_address
       const urlParams = new URLSearchParams(url.search);
-      const extractedAddress = urlParams.get("sp_address") || ""; // Prend sp_address ou une chaîne vide
+      const extractedAddress = urlParams.get('sp_address') || ''; // Prend sp_address ou une chaîne vide
 
       if (extractedAddress) {
         address = extractedAddress;
@@ -127,20 +119,20 @@ export function initAddressInput() {
         emojiDisplay.textContent = emojis;
       }
       if (okButton) {
-        okButton.style.display = "inline-block";
+        okButton.style.display = 'inline-block';
       }
     } else {
       if (emojiDisplay) {
-        emojiDisplay.textContent = "";
+        emojiDisplay.textContent = '';
       }
       if (okButton) {
-        okButton.style.display = "none";
+        okButton.style.display = 'none';
       }
     }
   });
 
   if (createButton) {
-    addSubscription(createButton, "click", () => {
+    addSubscription(createButton, 'click', () => {
       onCreateButtonClick();
     });
   }
@@ -150,14 +142,14 @@ async function onCreateButtonClick() {
   try {
     await prepareAndSendPairingTx();
     // Don't call confirmPairing immediately - it will be called when the pairing process is complete
-    console.log("Pairing process initiated. Waiting for completion...");
+    console.log('Pairing process initiated. Waiting for completion...');
   } catch (e) {
     console.error(`onCreateButtonClick error: ${e}`);
   }
 }
 
 // Une constante est plus claire qu'une 'magic string' ("")
-const DEFAULT_PAIRING_PAYLOAD = "";
+const DEFAULT_PAIRING_PAYLOAD = '';
 
 export async function prepareAndSendPairingTx(): Promise<void> {
   const service = await Services.getInstance();
@@ -165,22 +157,18 @@ export async function prepareAndSendPairingTx(): Promise<void> {
   try {
     // 1. Création du processus d'appairage
     // const relayAddress = service.getAllRelays(); // <-- Cette variable n'était pas utilisée
-    const createPairingProcessReturn = await service.createPairingProcess(
+    const createPairingProcessReturn = await service.createPairingProcess(DEFAULT_PAIRING_PAYLOAD, []);
-      DEFAULT_PAIRING_PAYLOAD,
-      []
-    );
 
     if (!createPairingProcessReturn.updated_process) {
-      throw new Error("createPairingProcess returned an empty new process");
+      throw new Error('createPairingProcess returned an empty new process');
     }
 
     // Utilisation du "destructuring" pour assigner les variables
-    const { process_id: pairingId, current_process: process } =
+    const { process_id: pairingId, current_process: process } = createPairingProcessReturn.updated_process;
-      createPairingProcessReturn.updated_process;
 
     // Ajout d'une vérification pour éviter les erreurs si states est vide
     if (!process.states || process.states.length === 0) {
-      throw new Error("Le processus reçu ne contient aucun état (state)");
+      throw new Error('Le processus reçu ne contient aucun état (state)');
     }
     const stateId = process.states[0].state_id;
 
@@ -188,12 +176,11 @@ export async function prepareAndSendPairingTx(): Promise<void> {
     await service.ensureConnections(process, stateId);
 
     // 3. Mettre à jour l'état du service
-    await service.setProcessId(pairingId);
+    service.setProcessId(pairingId);
-    await service.setStateId(stateId);
+    service.setStateId(stateId);
 
     // 4. Appairer le 'device'
-    const myAddress = await service.getDeviceAddress();
+    service.pairDevice(pairingId, [service.getDeviceAddress()]);
-    await service.pairDevice(pairingId, [myAddress]);
 
     // 5. Mettre à jour la BDD
     try {
@@ -203,19 +190,13 @@ export async function prepareAndSendPairingTx(): Promise<void> {
         await service.saveDeviceInDatabase(currentDevice);
       }
     } catch (err) {
-      console.error(
+      console.error('Échec non-critique de la mise à jour BDD (pairing_process_commitment):', err);
-        "Échec non-critique de la mise à jour BDD (pairing_process_commitment):",
-        err
-      );
     }
 
     // 6. Gérer les étapes suivantes du processus
     await service.handleApiReturn(createPairingProcessReturn);
 
-    const createPrdUpdateReturn = await service.createPrdUpdate(
+    const createPrdUpdateReturn = await service.createPrdUpdate(pairingId, stateId);
-      pairingId,
-      stateId
-    );
     await service.handleApiReturn(createPrdUpdateReturn);
 
     const approveChangeReturn = await service.approveChange(pairingId, stateId);
@@ -231,12 +212,13 @@ export async function prepareAndSendPairingTx(): Promise<void> {
 export async function generateCreateBtn() {
   try {
     // Generate CreateBtn
-    const container = getCorrectDOM("login-4nk-component") as HTMLElement;
+    const container = getCorrectDOM('login-4nk-component') as HTMLElement;
-    const createBtn = container?.querySelector(".create-btn");
+    const createBtn = container?.querySelector('.create-btn');
     if (createBtn) {
-      createBtn.textContent = "CREATE";
+      createBtn.textContent = 'CREATE';
     }
   } catch (err) {
     console.error(err);
   }
 }
+