@constl/utils-tests 2.2.0 → 2.2.1

package/src/h/303/251lia.ts

@@ -1,15 +1,17 @@
+import { join } from "path";
+import { MemoryBlockstore } from "blockstore-core";
 import { createHelia } from "helia";
+import { IDBBlockstore } from "blockstore-idb";
+import { isBrowser, isElectronMain, isNode } from "wherearewe";
+import { type HeliaWithLibp2p } from "@helia/libp2p";
+import { sousDossier } from "./utils.js";
 import {
   OptionsDéfautLibp2pNavigateur,
   OptionsDéfautLibp2pNode,
+  toutesConnectées,
   type ServicesLibp2pTest,
 } from "./libp2p/index.js";
-import { MemoryBlockstore } from "blockstore-core";
-import { join } from "path";
-import { sousDossier } from "./utils.js";
-import { IDBBlockstore } from "blockstore-idb";
-import { isBrowser, isElectronMain, isNode } from "wherearewe";
-import { type HeliaWithLibp2p } from "@helia/libp2p";
+import { obtenirAdresseRelai } from "./relai/index.ts";
 
 export const créerHéliasTest = async ({
   n,
@@ -42,6 +44,12 @@ export const créerHéliasTest = async ({
     };
     const hélia = await createHelia(optionsHélia).start();
     hélias.push(hélia);
+    await toutesConnectées(
+      hélias.map((h) => h.libp2p),
+      {
+        adresseRelai: obtenirAdresseRelai(),
+      },
+    );
   }
 
   const fermer = async () => {

package/src/index.ts

@@ -26,4 +26,4 @@ export { obtConfigEsbuild, générerConfigÆgir } from "./config.js";
 export { créerConstellationsTest } from "./constellation.js";
 export { dossierTempo } from "./dossiers.js";
 export { créerHéliasTest } from "./hélia.js";
-export { créerOrbitesTest } from "./orbite.js";
+export { créerOrbitesTest, attendreSync } from "./orbite.js";

package/src/libp2p/libp2p.ts

@@ -1,13 +1,13 @@
-import type { Libp2p } from "@libp2p/interface";
 import { createLibp2p } from "libp2p";
+import { isBrowser } from "wherearewe";
+import { obtenirAdresseRelai } from "../relai/index.js";
 import {
   OptionsDéfautLibp2pNavigateur,
   OptionsDéfautLibp2pNode,
   type ServicesLibp2pTest,
 } from "./config.js";
-import { isBrowser } from "wherearewe";
 import { connecterPairs } from "./utils.js";
-import { obtenirAdresseRelai } from "../relai/index.js";
+import type { Libp2p } from "@libp2p/interface";
 
 export const créerLibp2psTest = async ({
   n,

package/src/libp2p/utils.ts

@@ -1,7 +1,8 @@
-import type { Libp2p } from "@libp2p/interface";
 import { WebRTC } from "@multiformats/multiaddr-matcher";
 import { multiaddr, type Multiaddr } from "@multiformats/multiaddr";
 import { isBrowser, isElectronRenderer } from "wherearewe";
+import { que } from "../attente.ts";
+import type { Libp2p } from "@libp2p/interface";
 import type { ServicesLibp2pTest } from "./config.js";
 
 const filtreParDéfaut = () => true;
@@ -22,7 +23,7 @@ export const connecterPairs = async <
   if (isBrowser || isElectronRenderer) {
     await libp2p1.dial(multiaddr(options.adresseRelai));
 
-    const adresse1 = await new Promise<Multiaddr>((resolve) => {
+    const adresse1 = await new Promise<Multiaddr>((résoudre) => {
       const testConnecté = () => {
         const adresse = libp2p1
           .getMultiaddrs()
@@ -30,14 +31,15 @@ export const connecterPairs = async <
           .pop();
         if (adresse != null) {
           clearInterval(interval);
-          resolve(adresse);
+          résoudre(adresse);
         }
       };
       const interval = setInterval(testConnecté, 100);
       testConnecté();
     });
     libp2p2.dial(adresse1);
-    await new Promise((resolve) => {
+
+    await new Promise((résoudre) => {
       const testConnecté = () => {
         const adresse = libp2p1
           .getConnections()
@@ -45,7 +47,7 @@ export const connecterPairs = async <
           .pop();
         if (adresse != null) {
           clearInterval(interval);
-          resolve(adresse);
+          résoudre(adresse);
         }
       };
       const interval = setInterval(testConnecté, 100);
@@ -56,6 +58,7 @@ export const connecterPairs = async <
       multiaddrs: libp2p1.getMultiaddrs().filter(filtre),
     });
     await libp2p2.dial(libp2p1.peerId);
+    await que(() => !!libp2p1.getPeers().find((p) => p.equals(libp2p2.peerId)));
   }
 };
 

package/src/orbite.ts

@@ -1,8 +1,8 @@
-import { type OrbitDB, createOrbitDB } from "@orbitdb/core";
+import { join } from "path";
+import { type BaseDatabase, type OrbitDB, createOrbitDB } from "@orbitdb/core";
 import { dossierTempo } from "./dossiers.js";
 import { type ServicesLibp2pTest } from "./libp2p/index.js";
 import { créerHéliasTest } from "./hélia.js";
-import { join } from "path";
 import { sousDossier } from "./utils.js";
 
 export const créerOrbitesTest = async ({
@@ -48,3 +48,9 @@ export const créerOrbitesTest = async ({
     fermer,
   };
 };
+
+export const attendreSync = async (bd: BaseDatabase): Promise<void> => {
+  return new Promise<void>((résoudre) => {
+    bd.events.once("update", () => résoudre());
+  });
+};

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '2.2.0';
+export const version = '2.2.1';