@constl/utils-tests 1.4.3 → 1.6.0

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.4.3";
+export declare const version = "1.6.0";

package/dist/version.js

@@ -1,3 +1,3 @@
 // Generated by genversion.
-export const version = "1.4.3";
+export const version = "1.6.0";
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.4.3",
+  "version": "1.6.0",
   "license": "AGPL-3.0-or-later",
   "name": "@constl/utils-tests",
   "author": "Julien Jean Malard-Adam",
@@ -20,63 +20,67 @@
     "postbuild": "./dist/**/*"
   },
   "devDependencies": {
-    "@chainsafe/libp2p-gossipsub": "^13.1.0",
-    "@chainsafe/libp2p-noise": "^15.1.0",
-    "@chainsafe/libp2p-yamux": "^6.0.2",
-    "@constl/ipa": "1.2.1",
-    "@eslint/js": "^9.7.0",
-    "@libp2p/circuit-relay-v2": "^1.1.2",
-    "@libp2p/crypto": "^4.1.6",
-    "@libp2p/identify": "^2.1.2",
-    "@libp2p/interface": "^1.6.1",
-    "@libp2p/peer-id-factory": "^4.2.1",
-    "@libp2p/websockets": "^8.1.2",
-    "@multiformats/multiaddr": "^12.3.0",
-    "@multiformats/multiaddr-matcher": "^1.2.4",
-    "@orbitdb/feed-db": "^1.0.1",
+    "@chainsafe/libp2p-gossipsub": "14.1.0",
+    "@chainsafe/libp2p-noise": "^16.0.0",
+    "@chainsafe/libp2p-yamux": "^7.0.1",
+    "@constl/bohr-db": "^1.2.0",
+    "@constl/ipa": "1.2.7",
+    "@constl/orbit-db-types": "^2.0.5",
+    "@eslint/js": "^9.13.0",
+    "@libp2p/circuit-relay-v2": "^3.0.0",
+    "@libp2p/crypto": "^5.0.5",
+    "@libp2p/identify": "^3.0.9",
+    "@libp2p/interface": "^2.1.3",
+    "@libp2p/websockets": "^9.0.9",
+    "@multiformats/multiaddr": "^12.3.1",
+    "@multiformats/multiaddr-matcher": "^1.3.0",
+    "@orbitdb/feed-db": "^1.1.0",
     "@types/crypto-js": "^4.2.2",
     "@types/file-saver": "^2.0.7",
-    "@types/mocha": "^10.0.7",
-    "@types/node": "^20.14.11",
+    "@types/mocha": "^10.0.9",
+    "@types/node": "^22.8.1",
     "@types/uuid": "^10.0.0",
-    "@typescript-eslint/eslint-plugin": "^7.16.1",
-    "@typescript-eslint/parser": "^7.16.1",
-    "aegir": "^44.0.1",
+    "@typescript-eslint/eslint-plugin": "^8.11.0",
+    "@typescript-eslint/parser": "^8.11.0",
+    "aegir": "^44.1.4",
+    "ajv": "^8.17.1",
     "buffer": "^6.0.3",
-    "core-js": "^3.37.1",
-    "electron": "^31.4.0",
-    "esbuild": "^0.23.0",
-    "eslint": "^9.7.0",
+    "core-js": "^3.38.1",
+    "electron": "^33.0.2",
+    "esbuild": "^0.24.0",
+    "eslint": "^9.13.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-n": "^17.9.0",
-    "eslint-plugin-promise": "^7.0.0",
-    "execa": "^9.3.0",
-    "mocha": "^10.6.0",
-    "playwright": "^1.45.2",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-n": "^17.11.1",
+    "eslint-plugin-promise": "^7.1.0",
+    "execa": "^9.5.0",
+    "mocha": "^10.7.3",
+    "playwright": "^1.48.2",
     "prettier": "^3.3.3",
     "source-map-support": "^0.5.21",
     "ts-patch": "^3.2.1",
     "tsconfig-paths": "^4.2.0",
     "tscpaths": "^0.0.9",
     "typescript": "5.5.4",
-    "typescript-eslint": "^7.16.1",
-    "typescript-transform-paths": "^3.4.7"
+    "typescript-eslint": "^8.11.0",
+    "typescript-transform-paths": "^3.5.1"
   },
   "dependencies": {
-    "@helia/block-brokers": "^3.0.2",
-    "@orbitdb/quickstart": "git+https://github.com/orbitdb/quickstart.git#1557ffe",
-    "blockstore-core": "^5.0.0",
-    "blockstore-level": "^1.1.8",
+    "@helia/block-brokers": "^4.0.1",
+    "@libp2p/peer-id": "^5.0.6",
+    "@libp2p/webrtc": "^5.0.14",
+    "@orbitdb/core": "^2.3.0",
+    "blockstore-core": "^5.0.2",
+    "blockstore-level": "^2.0.1",
     "browserify-fs": "^1.0.0",
-    "chokidar": "^3.6.0",
-    "crypto-browserify": "^3.12.0",
+    "chokidar": "^4.0.1",
+    "crypto-browserify": "^3.12.1",
     "events": "^3.3.0",
     "genversion": "^3.2.0",
-    "helia": "^4.2.4",
-    "libp2p": "^1.8.1",
+    "helia": "5.1.0",
+    "libp2p": "^2.1.10",
     "os-browserify": "^0.3.0",
     "process": "^0.11.10",
     "read-package-up": "^11.0.0",
@@ -84,7 +88,7 @@
     "stream-browserify": "^3.0.0",
     "uint8arrays": "^5.1.0",
     "url-polyfill": "^1.1.12",
-    "uuid": "^10.0.0",
+    "uuid": "^11.0.1",
     "wherearewe": "^2.0.1"
   },
   "scripts": {

package/src/@types/shims-orbitdb-quickstart.d.ts

@@ -1,15 +1 @@
-declare module "@orbitdb/quickstart" {
-  import { Identities, Identity, OrbitDB } from "@orbitdb/core";
-  import { Libp2pOptions as Libp2pOptionsType } from "libp2p";
-
-  export function startOrbitDB(args: {
-    id?: string;
-    identity?: Identity;
-    identities?: Identities;
-    directory?: string;
-  }): Promise<OrbitDB>;
-  export function stopOrbitDB(orbitdb: OrbitDB): Promise<void>;
-
-  export const DefaultLibp2pOptions: Libp2pOptionsType;
-  export const DefaultLibp2pBrowserOptions: Libp2pOptionsType;
-}
+export * from "@constl/orbit-db-types";

package/src/attente.ts

@@ -88,7 +88,7 @@ export class AttendreFichierExiste extends EventEmitter {
   }
 
   annuler() {
-    this.fOublier && this.fOublier();
+    this.fOublier?.();
   }
 }
 

package/src/config.ts

@@ -86,7 +86,6 @@ export const générerConfigÆgir = async (): Promise<PartialOptions> => {
       },
     },
     build: {
-      // @ts-expect-error Erreur différentes versions esbuild et Ægir
       config: esbuild,
     },
   };

package/src/libp2p.ts

@@ -0,0 +1,84 @@
+/*
+Certaines parties de ce fichier proviennent de @orbitdb/quickstart
+
+MIT License
+
+Copyright (c) 2024 OrbitDB Community
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+import { identify } from "@libp2p/identify";
+import { webSockets } from "@libp2p/websockets";
+import { webRTC } from "@libp2p/webrtc";
+import { all } from "@libp2p/websockets/filters";
+import { noise } from "@chainsafe/libp2p-noise";
+import { yamux } from "@chainsafe/libp2p-yamux";
+import { gossipsub } from "@chainsafe/libp2p-gossipsub";
+import { circuitRelayTransport } from "@libp2p/circuit-relay-v2";
+
+/**
+ * A basic Libp2p configuration for Node.js nodes.
+ */
+export const DefaultLibp2pOptions = {
+  addresses: {
+    listen: ["/ip4/0.0.0.0/tcp/0/ws", "/p2p-circuit"],
+  },
+  transports: [
+    webSockets({
+      filter: all,
+    }),
+    webRTC(),
+    circuitRelayTransport(),
+  ],
+  connectionEncrypters: [noise()],
+  streamMuxers: [yamux()],
+  connectionGater: {
+    denyDialMultiaddr: () => false,
+  },
+  services: {
+    identify: identify(),
+    pubsub: gossipsub({ allowPublishToZeroTopicPeers: true }),
+  },
+};
+
+/**
+ * A basic Libp2p configuration for browser nodes.
+ */
+export const DefaultLibp2pBrowserOptions = {
+  addresses: {
+    listen: ["/webrtc", "/p2p-circuit"],
+  },
+  transports: [
+    webSockets({
+      filter: all,
+    }),
+    webRTC(),
+    circuitRelayTransport(),
+  ],
+  connectionEncrypters: [noise()],
+  streamMuxers: [yamux()],
+  connectionGater: {
+    denyDialMultiaddr: () => false,
+  },
+  services: {
+    identify: identify(),
+    pubsub: gossipsub({ allowPublishToZeroTopicPeers: true }),
+  },
+};

package/src/orbite.ts

@@ -1,9 +1,10 @@
 /*
-Certaines parties de ce fichier proviennent d'OrbitDB
+Certaines parties de ce fichier proviennent d'OrbitDB et de @orbitdb/quickstart
 
 MIT License
 
 Copyright (c) 2019 Haja Networks Oy
+Copyright (c) 2024 OrbitDB Community
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -25,21 +26,61 @@ SOFTWARE.
 */
 
 import type { HeliaLibp2p } from "helia";
-import type {
-  FeedStoreTypé,
-  KeyValueStoreTypé,
-  OrbitDB,
-  Store,
-} from "@orbitdb/core";
-
+import type { Identities, Identity, OrbitDB, Database } from "@orbitdb/core";
+import type { TypedKeyValue, TypedFeed, TypedSet } from "@constl/bohr-db";
 import { once } from "events";
 
 import { dossierTempo } from "@/dossiers.js";
 import { connecterPairs } from "@/sfip.js";
 import { isNode, isElectronMain } from "wherearewe";
 
-const OrbitDBQuickstart = await import("@orbitdb/quickstart");
-const { startOrbitDB, stopOrbitDB } = OrbitDBQuickstart;
+import { createHelia } from "helia";
+import { createLibp2p } from "libp2p";
+import { createOrbitDB } from "@orbitdb/core";
+import { LevelBlockstore } from "blockstore-level";
+import { bitswap } from "@helia/block-brokers";
+import { DefaultLibp2pOptions, DefaultLibp2pBrowserOptions } from "./libp2p.js";
+import { PeerId } from "@libp2p/interface";
+
+const isBrowser = () => typeof window !== "undefined";
+
+const startOrbitDB = async ({
+  id,
+  identity,
+  identities,
+  directory,
+}: {
+  id?: PeerId;
+  identity?: Identity;
+  identities?: typeof Identities;
+  directory?: string;
+} = {}) => {
+  const options = isBrowser()
+    ? DefaultLibp2pBrowserOptions
+    : DefaultLibp2pOptions;
+  const libp2p = await createLibp2p({ ...options });
+  directory = directory || ".";
+  const blockstore = new LevelBlockstore(`${directory}/ipfs/blocks`);
+  const ipfs = await createHelia({
+    libp2p,
+    blockstore,
+    blockBrokers: [bitswap()],
+  });
+  const orbitdb = await createOrbitDB({
+    ipfs,
+    id,
+    identity,
+    identities,
+    directory,
+  });
+  return orbitdb;
+};
+
+const stopOrbitDB = async (orbitdb: OrbitDB) => {
+  await orbitdb.stop();
+  await orbitdb.ipfs.stop();
+  await orbitdb.ipfs.blockstore.unwrap().unwrap().child.db.close();
+};
 
 export const créerOrbiteTest = async ({
   n = 1,
@@ -87,7 +128,9 @@ export const créerOrbiteTest = async ({
   return { orbites, fOublier };
 };
 
-export const attendreSync = async (bd: Store): Promise<void> => {
+export const attendreSync = async (
+  bd: Awaited<ReturnType<typeof Database>>,
+): Promise<void> => {
   await once(bd.events, "update");
 };
 
@@ -99,7 +142,7 @@ export type ContrôleurConstellation = {
   estAutorisé: (id: string) => Promise<boolean>;
   grant: (rôle: "MODÉRATEUR" | "MEMBRE", id: string) => Promise<void>;
   revoke: (_rôle: "MODÉRATEUR" | "MEMBRE", _id: string) => Promise<void>;
-  bd: Store;
+  bd: Awaited<ReturnType<typeof Database>>;
 };
 
 const attendreInvité = (
@@ -119,7 +162,10 @@ const attendreInvité = (
   });
 
 export const peutÉcrire = async (
-  bd: KeyValueStoreTypé<{ [clef: string]: number }> | FeedStoreTypé<string>,
+  bd:
+    | TypedKeyValue<{ [clef: string]: number }>
+    | TypedFeed<string>
+    | TypedSet<string>,
   attendre?: OrbitDB,
 ): Promise<boolean> => {
   if (attendre) {
@@ -131,7 +177,7 @@ export const peutÉcrire = async (
 
   try {
     if (bd.type === "keyvalue") {
-      const bdKV = bd as KeyValueStoreTypé<{ [clef: string]: number }>;
+      const bdKV = bd as TypedKeyValue<{ [clef: string]: number }>;
 
       // Important d'avoir une clef unique pour éviter l'interférence entre les tests
       const CLEF = "test" + Math.random().toString();
@@ -145,26 +191,27 @@ export const peutÉcrire = async (
     } else if (bd.type === "feed") {
       const VAL = "test";
 
-      await (bd as FeedStoreTypé<string>).add(VAL);
-      const éléments = await (bd as FeedStoreTypé<string>).all();
+      await (bd as TypedFeed<string>).add(VAL);
+      const éléments = await (bd as TypedFeed<string>).all();
 
       const autorisé = éléments.length === 1 && éléments[0].value === VAL;
       if (éléments.length === 1) {
-        await (bd as FeedStoreTypé<string>).remove(éléments[0].hash);
+        await (bd as TypedFeed<string>).remove(éléments[0].hash);
       }
       return autorisé;
     } else if (bd.type === "set") {
       const VAL = "test";
 
-      await (bd as FeedStoreTypé<string>).add(VAL);
-      const éléments = await (bd as FeedStoreTypé<string>).all();
+      await bd.add(VAL);
+      const éléments = await bd.all();
 
       const autorisé = éléments.length === 1 && éléments[0].value === VAL;
       if (éléments.length === 1) {
-        await (bd as FeedStoreTypé<string>).remove(éléments[0].hash);
+        await bd.del(éléments[0].hash);
       }
       return autorisé;
     } else {
+      // @ts-expect-error bd.type n'a plus d'options
       throw new Error(`Type de BD ${bd.type} non supporté par ce test.`);
     }
   } catch (e) {

package/src/scripts/relai.ts

@@ -31,22 +31,21 @@ import { circuitRelayServer } from "@libp2p/circuit-relay-v2";
 import { webSockets } from "@libp2p/websockets";
 import * as filters from "@libp2p/websockets/filters";
 import { identify } from "@libp2p/identify";
-import { createFromPrivKey } from "@libp2p/peer-id-factory";
 import { keys } from "@libp2p/crypto";
 import { fromString as uint8ArrayFromString } from "uint8arrays/from-string";
+import { FaultTolerance } from "@libp2p/interface";
 
 // output of: console.log(server.peerId.privateKey.toString('hex'))
-const relayPrivKey =
+const privateKeyString =
   "08011240821cb6bc3d4547fcccb513e82e4d718089f8a166b23ffcd4a436754b6b0774cf07447d1693cd10ce11ef950d7517bad6e9472b41a927cd17fc3fb23f8c70cd99";
-// the peer id of the above key
+// L'identité de pair qui correspond à la clef privée ci-dessus
 // const relayId = '12D3KooWAJjbRkp8FPF5MKgMU53aUTxWkqvDrs4zc1VMbwRwfsbE'
 
-const encoded = uint8ArrayFromString(relayPrivKey, "hex");
-const privateKey = await keys.unmarshalPrivateKey(encoded);
-const peerId = await createFromPrivKey(privateKey);
+const encoded = uint8ArrayFromString(privateKeyString, "hex");
+const privateKey = keys.privateKeyFromProtobuf(encoded);
 
 const relai = await createLibp2p({
-  peerId,
+  privateKey,
   addresses: {
     listen: ["/ip4/0.0.0.0/tcp/54321/ws"],
   },
@@ -55,7 +54,10 @@ const relai = await createLibp2p({
       filter: filters.all,
     }),
   ],
-  connectionEncryption: [noise()],
+  transportManager: {
+    faultTolerance: FaultTolerance.NO_FATAL,
+  },
+  connectionEncrypters: [noise()],
   streamMuxers: [yamux()],
   services: {
     identify: identify(),
@@ -73,6 +75,10 @@ relai.addEventListener("peer:connect", async (event) => {
   console.log("peer:connect", event.detail);
 });
 
+relai.addEventListener("peer:discovery", async (event) => {
+  console.log("peer:discovery", event.detail);
+});
+
 relai.addEventListener("peer:disconnect", async (event) => {
   console.log("peer:disconnect", event.detail);
   relai.peerStore.delete(event.detail);

package/src/sfip.ts

@@ -12,10 +12,7 @@ import {} from "@libp2p/interface";
 
 import { isBrowser, isElectronRenderer } from "wherearewe";
 
-import {
-  DefaultLibp2pBrowserOptions,
-  DefaultLibp2pOptions,
-} from "@orbitdb/quickstart";
+import { DefaultLibp2pBrowserOptions, DefaultLibp2pOptions } from "./libp2p.js";
 
 export const créerHéliaTest = async ({
   dossier,

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = "1.4.3";
+export const version = "1.6.0";