@constl/utils-tests 2.1.5 → 2.2.1

package/package.json

@@ -1,11 +1,15 @@
 {
-  "version": "2.1.5",
+  "version": "2.2.1",
   "license": "AGPL-3.0-or-later",
   "name": "@constl/utils-tests",
   "author": "Julien Jean Malard-Adam",
   "type": "module",
   "types": "./dist/index.d.ts",
   "exports": "./dist/index.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/reseau-constellation/utils-tests.git"
+  },
   "engines": {
     "node": ">=20"
   },
@@ -22,7 +26,6 @@
   "devDependencies": {
     "@chainsafe/libp2p-noise": "^17.0.0",
     "@chainsafe/libp2p-yamux": "^8.0.1",
-    "@constl/bohr-db": "^2.2.10",
     "@eslint/js": "^10.0.1",
     "@libp2p/circuit-relay-v2": "^4.2.13",
     "@libp2p/crypto": "^5.1.23",
@@ -31,42 +34,39 @@
     "@libp2p/websockets": "^10.1.21",
     "@multiformats/multiaddr": "^13.0.3",
     "@multiformats/multiaddr-matcher": "^3.0.2",
-    "@orbitdb/core-types": "^1.2.5",
-    "@orbitdb/feed-db": "^1.4.2",
+    "@orbitdb/core-types": "^2.0.0",
     "@types/crypto-js": "^4.2.2",
     "@types/file-saver": "^2.0.7",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^26.6.2",
-    "@typescript-eslint/eslint-plugin": "^8.70.1",
-    "@typescript-eslint/parser": "^8.70.1",
+    "@types/node": "^26.6.4",
+    "@typescript-eslint/eslint-plugin": "^8.71.0",
+    "@typescript-eslint/parser": "^8.71.0",
     "aegir": "^48.1.6",
-    "ajv": "^8.20.0",
     "buffer": "^6.0.3",
     "core-js": "^3.50.0",
-    "electron": "^44.4.5",
+    "electron": "^44.5.1",
     "esbuild": "^0.28.2",
-    "eslint": "^10.11.0",
+    "eslint": "^9.39.5",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-config-standard": "^17.1.0",
+    "eslint-import-resolver-typescript": "^4.4.5",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-n": "^18.3.0",
+    "eslint-plugin-n": "^18.4.1",
     "eslint-plugin-promise": "^7.3.0",
     "execa": "^10.0.1",
-    "mocha": "^12.0.2",
+    "mocha": "^11.8.0",
     "playwright": "^1.63.0",
     "prettier": "^3.9.9",
     "progress-events": "^1.1.0",
     "source-map-support": "^0.5.21",
-    "ts-patch": "^4.0.1",
     "tsconfig-paths": "^4.2.0",
     "tscpaths": "^0.0.9",
     "typescript": "^6.0.3",
-    "typescript-eslint": "^8.70.1",
-    "typescript-transform-paths": "^4.0.0"
+    "typescript-eslint": "^8.71.0"
   },
   "dependencies": {
-    "@helia/block-brokers": "^5.2.4",
+    "@helia/libp2p": "^2.1.5",
     "@libp2p/gossipsub": "^17.1.2",
     "@libp2p/peer-id": "^6.0.15",
     "@libp2p/ping": "^3.1.13",
@@ -80,7 +80,7 @@
     "crypto-browserify": "^3.12.1",
     "events": "^3.3.0",
     "genversion": "^3.2.0",
-    "helia": "6.1.4",
+    "helia": "7.1.16",
     "libp2p": "^3.3.11",
     "os-browserify": "^0.3.0",
     "process": "^0.11.10",
@@ -91,20 +91,17 @@
     "uuid": "^14.0.2",
     "wherearewe": "^2.0.1"
   },
-  "publishConfig": {
-    "@reseau-constellation:registry": "https://npm.pkg.github.com"
-  },
   "scripts": {
     "nettoyer": "rimraf dist",
-    "compiler": "pnpm versioner && pnpm formatter && pnpm nettoyer && pnpm tspc -p tsconfig.json",
-    "compiler:prod": "pnpm versioner && pnpm formatter && pnpm nettoyer && pnpm tspc -p tsconfig.build.json",
+    "compiler": "rimraf tsconfig.build.tsbuildinfo && pnpm versioner && pnpm nettoyer && pnpm tsc -p tsconfig.json",
+    "compiler:prod": "rimraf tsconfig.build.tsbuildinfo && pnpm versioner && pnpm nettoyer && pnpm tsc -p tsconfig.build.json",
     "test:node": "pnpm compiler && pnpm aegir test -t node -f \"dist/test/**/*.spec.js\" --cov -- --exit",
     "test:navig": "pnpm compiler && pnpm aegir test -t browser -f \"dist/test/**/*.spec.js\" --cov",
     "test:électron-principal": "pnpm compiler && pnpm aegir test -t electron-main -f \"dist/test/**/*.spec.js\" --cov",
     "test:électron-rendu": "pnpm compiler && pnpm aegir test -t electron-renderer -f \"dist/test/**/*.spec.js\" --cov",
     "test": "pnpm test:node && pnpm test:navig",
-    "formatter": "pnpm prettier --ignore-path .gitignore --write \"**/*.+(js|ts|json)\" && pnpm eslint src",
-    "publier": "pnpm compiler:prod && (git commit -a -m 'version' || true) && pnpm stage publish",
+    "formatter": "pnpm prettier --ignore-path .gitignore --write \"**/*.+(js|ts|json)\" && pnpm eslint . --fix",
+    "publier": "pnpm test && pnpm compiler:prod && (git commit -a -m 'version' || true) && pnpm stage publish",
     "versioner": "pnpm genversion  --es6 --semi src/version.ts"
   }
 }

package/pnpm-workspace.yaml

@@ -1,19 +1,11 @@
 allowBuilds:
-  '@ipshipyard/node-datachannel': true
-  aws-sdk: false
   bun: true
   classic-level: true
   core-js: true
   deno: true
   electron: true
   esbuild: true
-  iso-constants@https://codeload.github.com/inverted-capital/iso-constants/tar.gz/2af6fdfb2cacaa03ebd58543703918783e62649f: true
   node-datachannel: true
   unrs-resolver: true
 
-overrides:
-  xlsx: "@e965/xlsx"
-
-blockExoticSubdeps: false
-
 packages: []

package/src/@types.ts

@@ -1,4 +1,4 @@
-import { Browser, Page } from "playwright";
+import type { Browser, Page } from "playwright";
 
 declare global {
   const page: Page;

package/src/config.ts

@@ -1,8 +1,7 @@
+import { lancerRelai } from "./relai/index.js";
 import type { PartialOptions } from "aegir";
 import type { BuildOptions } from "esbuild";
 
-import { lancerRelai } from "./relai/index.js";
-
 export const obtConfigEsbuild = async (): Promise<BuildOptions> => {
   const { createRequire } = (await import("module")).default;
   const path = await import("path");

package/src/constellation.ts

@@ -1,7 +1,7 @@
 import { isBrowser } from "wherearewe";
 import { créerOrbitesTest } from "./orbite.js";
 import { dossierTempo } from "./dossiers.js";
-import { OrbitDB } from "@orbitdb/core";
+import type { OrbitDB } from "@orbitdb/core";
 
 interface InterfaceConstellation {
   fermer: () => Promise<void>;

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

@@ -1,55 +1,56 @@
-import { Helia, createHelia } from "helia";
-import { ServicesLibp2pTest, créerLibp2psTest } from "./libp2p/index.js";
-import { Libp2p } from "@libp2p/interface";
-import { bitswap } from "@helia/block-brokers";
-import { MemoryBlockstore } from "blockstore-core";
 import { join } from "path";
-import { sousDossier } from "./utils.js";
+import { MemoryBlockstore } from "blockstore-core";
+import { createHelia } from "helia";
 import { IDBBlockstore } from "blockstore-idb";
-import { obtenirAdresseRelai } from "./relai/index.js";
-import { isElectronMain, isNode } from "wherearewe";
+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 { obtenirAdresseRelai } from "./relai/index.ts";
 
 export const créerHéliasTest = async ({
   n,
   dossier,
-  adresseRelai,
 }: {
   n: number;
   dossier?: string;
-  adresseRelai?: string;
 }): Promise<{
-  hélias: Helia<Libp2p<ServicesLibp2pTest>>[];
+  hélias: HeliaWithLibp2p<ServicesLibp2pTest>[];
   fermer: () => Promise<void>;
 }> => {
-  adresseRelai = adresseRelai ?? obtenirAdresseRelai();
+  const optionsLibp2p = isBrowser
+    ? OptionsDéfautLibp2pNavigateur()
+    : OptionsDéfautLibp2pNode();
 
-  const { libp2ps, fermer: fermerLibsp2p } = await créerLibp2psTest({
-    n,
-    adresseRelai,
-  });
-
-  let i = 0;
-  const hélias = await Promise.all(
-    libp2ps.map(async (libp2p) => {
-      const dossierBlocs = dossier
-        ? join(sousDossier({ dossier, i }), "hélia", "blocks")
-        : undefined;
-      const stockageBlocs = dossierBlocs
-        ? isNode || isElectronMain
-          ? new (await import("blockstore-fs")).FsBlockstore(dossierBlocs)
-          : new IDBBlockstore(dossierBlocs)
-        : new MemoryBlockstore();
-      (stockageBlocs as IDBBlockstore).open?.();
-      i++;
-
-      const optionsHélia = {
-        blockstore: stockageBlocs,
-        libp2p,
-        blockBrokers: [bitswap()],
-      };
-      return await createHelia(optionsHélia);
-    }),
-  );
+  const hélias: HeliaWithLibp2p<ServicesLibp2pTest>[] = [];
+  for (const i of Array(n).keys()) {
+    const dossierBlocs = dossier
+      ? join(sousDossier({ dossier, i }), "hélia", "blocks")
+      : undefined;
+    const stockageBlocs = dossierBlocs
+      ? isNode || isElectronMain
+        ? new (await import("blockstore-fs")).FsBlockstore(dossierBlocs)
+        : new IDBBlockstore(dossierBlocs)
+      : new MemoryBlockstore();
+    (stockageBlocs as IDBBlockstore).open?.();
+    const optionsHélia = {
+      blockstore: stockageBlocs,
+      libp2p: optionsLibp2p,
+    };
+    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 () => {
     await Promise.all(
@@ -59,7 +60,6 @@ export const créerHéliasTest = async ({
         await h.blockstore.unwrap()?.unwrap()?.child?.db?.close();
       }),
     );
-    await fermerLibsp2p();
   };
 
   return { hélias, fermer };

package/src/index.ts

@@ -1,6 +1,6 @@
 export {
-  ServicesLibp2pTest,
-  ComposantesServiceClefPrivée,
+  type ServicesLibp2pTest,
+  type ComposantesServiceClefPrivée,
   ServiceClefPrivée,
   OptionsDéfautLibp2pNode,
   OptionsDéfautLibp2pNavigateur,
@@ -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/config.ts

@@ -24,18 +24,22 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-import { gossipsub, GossipSubComponents, GossipSub } from "@libp2p/gossipsub";
+import {
+  gossipsub,
+  type GossipSubComponents,
+  type GossipSub,
+} from "@libp2p/gossipsub";
 import { noise } from "@chainsafe/libp2p-noise";
 import { yamux } from "@chainsafe/libp2p-yamux";
 import { circuitRelayTransport } from "@libp2p/circuit-relay-v2";
-import { Identify, identify } from "@libp2p/identify";
+import { type Identify, identify } from "@libp2p/identify";
 import { webRTC } from "@libp2p/webrtc";
 import { webSockets } from "@libp2p/websockets";
 
-import { Libp2pOptions } from "libp2p";
+import { type Libp2pOptions } from "libp2p";
 
-import { PrivateKey } from "@libp2p/interface";
-import { ping, Ping } from "@libp2p/ping";
+import { type PrivateKey } from "@libp2p/interface";
+import { ping, type Ping } from "@libp2p/ping";
 
 export type ServicesLibp2pTest = {
   ping: Ping;

package/src/libp2p/index.ts

@@ -1,6 +1,6 @@
 export {
-  ServicesLibp2pTest,
-  ComposantesServiceClefPrivée,
+  type ServicesLibp2pTest,
+  type ComposantesServiceClefPrivée,
   ServiceClefPrivée,
   OptionsDéfautLibp2pNode,
   OptionsDéfautLibp2pNavigateur,

package/src/libp2p/libp2p.ts

@@ -1,13 +1,13 @@
-import { Libp2p } from "@libp2p/interface";
 import { createLibp2p } from "libp2p";
+import { isBrowser } from "wherearewe";
+import { obtenirAdresseRelai } from "../relai/index.js";
 import {
   OptionsDéfautLibp2pNavigateur,
   OptionsDéfautLibp2pNode,
-  ServicesLibp2pTest,
+  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,8 +1,9 @@
-import { Libp2p } from "@libp2p/interface";
 import { WebRTC } from "@multiformats/multiaddr-matcher";
-import { multiaddr, Multiaddr } from "@multiformats/multiaddr";
+import { multiaddr, type Multiaddr } from "@multiformats/multiaddr";
 import { isBrowser, isElectronRenderer } from "wherearewe";
-import { ServicesLibp2pTest } from "./config.js";
+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,25 +1,20 @@
-import { OrbitDB, createOrbitDB } from "@orbitdb/core";
+import { join } from "path";
+import { type BaseDatabase, type OrbitDB, createOrbitDB } from "@orbitdb/core";
 import { dossierTempo } from "./dossiers.js";
-import { ServicesLibp2pTest } from "./libp2p/index.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";
-import { obtenirAdresseRelai } from "./relai/utils.js";
 
 export const créerOrbitesTest = async ({
   n,
   dossier,
-  adresseRelai,
 }: {
   n: number;
   dossier?: string;
-  adresseRelai?: string;
 }): Promise<{
   orbites: OrbitDB<ServicesLibp2pTest>[];
   fermer: () => Promise<void>;
 }> => {
-  adresseRelai = adresseRelai ?? obtenirAdresseRelai();
-
   let effacerDossier: () => void = () => {};
   if (!dossier) {
     ({ dossier, effacer: effacerDossier } = await dossierTempo());
@@ -29,7 +24,6 @@ export const créerOrbitesTest = async ({
   const { hélias, fermer: fermerHélias } = await créerHéliasTest({
     n,
     dossier,
-    adresseRelai,
   });
 
   let i = 0;
@@ -54,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.1.5";
+export const version = '2.2.1';