@constl/utils-tests 1.2.7 → 1.4.1

package/eslint.config.js

@@ -0,0 +1,27 @@
+import eslint from "@eslint/js";
+import tseslint from "typescript-eslint";
+
+export default [
+  eslint.configs.recommended,
+  ...tseslint.configs.recommended,
+  {
+    files: ["**/*.js", "**/*.ts"],
+    languageOptions: {
+      parserOptions: {
+        ecmaVersion: 12,
+        sourceType: "module",
+      },
+    },
+    rules: {
+      "@typescript-eslint/no-non-null-assertion": "off",
+      "@typescript-eslint/no-unused-vars": [
+        "warn",
+        {
+          argsIgnorePattern: "^_",
+          varsIgnorePattern: "^_",
+          caughtErrorsIgnorePattern: "^_",
+        },
+      ],
+    },
+  },
+];

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.7",
+  "version": "1.4.1",
   "license": "AGPL-3.0-or-later",
   "name": "@constl/utils-tests",
   "author": "Julien Jean Malard-Adam",
@@ -20,52 +20,54 @@
     "postbuild": "./dist/**/*"
   },
   "devDependencies": {
-    "@chainsafe/libp2p-gossipsub": "^11.2.1",
-    "@chainsafe/libp2p-noise": "^15.0.0",
+    "@chainsafe/libp2p-gossipsub": "^13.1.0",
+    "@chainsafe/libp2p-noise": "^15.1.0",
     "@chainsafe/libp2p-yamux": "^6.0.2",
-    "@constl/ipa": "1.0.21",
-    "@libp2p/circuit-relay-v2": "^1.0.24",
-    "@libp2p/crypto": "^4.1.2",
-    "@libp2p/identify": "^1.0.21",
-    "@libp2p/peer-id-factory": "^4.1.2",
-    "@libp2p/websockets": "^8.0.24",
-    "@multiformats/multiaddr": "^12.2.3",
-    "@multiformats/multiaddr-matcher": "^1.2.3",
-    "@orbitdb/feed-db": "^1.0.0",
+    "@constl/ipa": "1.1.2",
+    "@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",
     "@types/crypto-js": "^4.2.2",
     "@types/file-saver": "^2.0.7",
-    "@types/mocha": "^10.0.6",
-    "@types/node": "^20.14.1",
-    "@types/uuid": "^9.0.8",
-    "@typescript-eslint/eslint-plugin": "^7.12.0",
-    "@typescript-eslint/parser": "^7.12.0",
-    "aegir": "^42.2.11",
+    "@types/mocha": "^10.0.7",
+    "@types/node": "^20.14.11",
+    "@types/uuid": "^10.0.0",
+    "@typescript-eslint/eslint-plugin": "^7.16.1",
+    "@typescript-eslint/parser": "^7.16.1",
+    "aegir": "^44.0.1",
     "buffer": "^6.0.3",
     "core-js": "^3.37.1",
-    "electron": "^30.0.9",
-    "esbuild": "^0.20.2",
-    "eslint": "^8.57.0",
+    "electron": "^31.2.1",
+    "esbuild": "^0.23.0",
+    "eslint": "^9.7.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-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.2.0",
-    "execa": "^8.0.1",
-    "keys": "link:@libp2p/crypto/keys",
-    "mocha": "^10.4.0",
-    "playwright": "^1.44.1",
-    "prettier": "^3.3.0",
+    "eslint-plugin-n": "^17.9.0",
+    "eslint-plugin-promise": "^6.4.0",
+    "execa": "^9.3.0",
+    "mocha": "^10.6.0",
+    "playwright": "^1.45.2",
+    "prettier": "^3.3.3",
     "source-map-support": "^0.5.21",
-    "ts-patch": "^3.2.0",
+    "ts-patch": "^3.2.1",
     "tsconfig-paths": "^4.2.0",
     "tscpaths": "^0.0.9",
-    "typescript": "5.3.3",
+    "typescript": "5.4.5",
+    "typescript-eslint": "^7.16.1",
     "typescript-transform-paths": "^3.4.7"
   },
   "dependencies": {
-    "@helia/block-brokers": "^1.0.0",
-    "@orbitdb/quickstart": "^1.0.0",
+    "@helia/block-brokers": "^3.0.2",
+    "@orbitdb/quickstart": "git+https://github.com/orbitdb/quickstart.git#1557ffe",
     "blockstore-core": "^4.4.1",
     "blockstore-level": "^1.1.8",
     "browserify-fs": "^1.0.0",
@@ -73,16 +75,16 @@
     "crypto-browserify": "^3.12.0",
     "events": "^3.3.0",
     "genversion": "^3.2.0",
-    "helia": "^3.0.1",
-    "libp2p": "^1.6.0",
+    "helia": "^4.2.4",
+    "libp2p": "^1.8.1",
     "os-browserify": "^0.3.0",
     "process": "^0.11.10",
     "read-package-up": "^11.0.0",
-    "rimraf": "^5.0.7",
+    "rimraf": "^6.0.1",
     "stream-browserify": "^3.0.0",
     "uint8arrays": "^5.1.0",
     "url-polyfill": "^1.1.12",
-    "uuid": "^9.0.1",
+    "uuid": "^10.0.0",
     "wherearewe": "^2.0.1"
   },
   "scripts": {
@@ -93,7 +95,7 @@
     "test:électron-principal": "pnpm compiler && pnpm aegir test -t electron-main --cov",
     "test:électron-rendu": "pnpm compiler && pnpm aegir test -t electron-renderer --cov",
     "test": "pnpm test:node && pnpm test:navig",
-    "formatter": "pnpm prettier --ignore-path .gitignore --write \"**/*.+(js|ts|json)\" && pnpm eslint --ext .js,.ts src",
+    "formatter": "pnpm prettier --ignore-path .gitignore --write \"**/*.+(js|ts|json)\" && pnpm eslint src",
     "publier": "pnpm test && (git commit -a -m 'version' || true) && pnpm publish",
     "versioner": "pnpm genversion  --es6 --semi src/version.ts"
   }

package/src/config.ts

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

package/src/constellation.ts

@@ -1,11 +1,12 @@
-import type { réseau, client, ClientConstellation } from "@constl/ipa";
+import type { réseau, client, Constellation } from "@constl/ipa";
+import type { OrbitDB } from "@orbitdb/core";
 import { isBrowser } from "wherearewe";
 
 import { créerOrbiteTest } from "@/orbite.js";
 import { AttendreRésultat } from "@/attente.js";
 
 export const créerConstellationsTest = async <
-  T = ClientConstellation,
+  T = Constellation,
   U = client.optsConstellation,
 >({
   n = 1,
@@ -15,6 +16,7 @@ export const créerConstellationsTest = async <
   créerConstellation: (opts: U) => T;
 }): Promise<{
   clients: ReturnType<typeof créerConstellation>[];
+  orbites: OrbitDB[];
   fOublier: () => Promise<void>;
 }> => {
   const clients: ReturnType<typeof créerConstellation>[] = [];
@@ -36,23 +38,23 @@ export const créerConstellationsTest = async <
 
   const fOublier = async () => {
     await Promise.all(
-      clients.map((client) => (client as ClientConstellation).fermer()),
+      clients.map((client) => (client as Constellation).fermer()),
     );
     await Promise.all(fsOublier.map((f) => f()));
   };
-  return { fOublier, clients };
+  return { fOublier, clients, orbites };
 };
 
 export const constellationConnectéeÀ = async (
-  constellation: client.ClientConstellation,
-  connectéeÀ: client.ClientConstellation,
+  constellation: client.Constellation,
+  connectéeÀ: client.Constellation,
 ): Promise<void> => {
   const dispositifsConnectés = new AttendreRésultat<
     réseau.statutDispositif[]
   >();
   const idCompte2 = await connectéeÀ.obtIdCompte();
 
-  const fOublier = await constellation.réseau!.suivreConnexionsDispositifs({
+  const fOublier = await constellation.réseau.suivreConnexionsDispositifs({
     f: (dispositifs) => dispositifsConnectés.mettreÀJour(dispositifs),
   });
   await dispositifsConnectés.attendreQue((dispositifs) => {
@@ -63,7 +65,7 @@ export const constellationConnectéeÀ = async (
 };
 
 export const constellationsConnectées = async (
-  ...clients: client.ClientConstellation[]
+  ...clients: client.Constellation[]
 ): Promise<void> => {
   if (clients.length < 2) return;
   const promesses: Promise<void>[] = [];
@@ -74,5 +76,4 @@ export const constellationsConnectées = async (
     }
   }
   await Promise.all(promesses);
-  return;
 };

package/src/orbite.ts

@@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-import type { Helia } from "helia";
+import type { HeliaLibp2p } from "helia";
 import type {
   FeedStoreTypé,
   KeyValueStoreTypé,
@@ -46,7 +46,7 @@ export const créerOrbiteTest = async ({
 }: {
   n: number;
 }): Promise<{ orbites: OrbitDB[]; fOublier: () => Promise<void> }> => {
-  const sfips: Helia[] = [];
+  const sfips: HeliaLibp2p[] = [];
   const orbites: OrbitDB[] = [];
 
   const {

package/src/scripts/relai.ts

@@ -32,7 +32,7 @@ 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 { unmarshalPrivateKey } from "@libp2p/crypto/keys";
+import { keys } from "@libp2p/crypto";
 import { fromString as uint8ArrayFromString } from "uint8arrays/from-string";
 
 // output of: console.log(server.peerId.privateKey.toString('hex'))
@@ -42,7 +42,7 @@ const relayPrivKey =
 // const relayId = '12D3KooWAJjbRkp8FPF5MKgMU53aUTxWkqvDrs4zc1VMbwRwfsbE'
 
 const encoded = uint8ArrayFromString(relayPrivKey, "hex");
-const privateKey = await unmarshalPrivateKey(encoded);
+const privateKey = await keys.unmarshalPrivateKey(encoded);
 const peerId = await createFromPrivKey(privateKey);
 
 const relai = await createLibp2p({

package/src/sfip.ts

@@ -1,13 +1,14 @@
 import type { GossipSub } from "@chainsafe/libp2p-gossipsub";
 import type { Multiaddr } from "@multiformats/multiaddr";
 
-import { createHelia, type Helia } from "helia";
+import { DefaultLibp2pServices, createHelia, type HeliaLibp2p } from "helia";
 import { bitswap } from "@helia/block-brokers";
 import { createLibp2p, Libp2p } from "libp2p";
 import { MemoryBlockstore } from "blockstore-core";
 import { LevelBlockstore } from "blockstore-level";
 import { multiaddr } from "@multiformats/multiaddr";
 import { WebRTC } from "@multiformats/multiaddr-matcher";
+import {} from "@libp2p/interface";
 
 import { isBrowser, isElectronRenderer } from "wherearewe";
 
@@ -20,7 +21,7 @@ export const créerHéliaTest = async ({
   dossier,
 }: {
   dossier?: string;
-} = {}): Promise<Helia<Libp2p<{ pubsub: GossipSub }>>> => {
+} = {}): Promise<HeliaLibp2p<Libp2p<{ pubsub: GossipSub }>>> => {
   const options =
     isBrowser || isElectronRenderer
       ? DefaultLibp2pBrowserOptions
@@ -40,14 +41,16 @@ export const créerHéliaTest = async ({
     blockBrokers: [bitswap()],
   };
 
-  return createHelia<Libp2p<{ pubsub: GossipSub }>>({ ...heliaOptions });
+  return createHelia({ ...heliaOptions });
 };
 
 const filtreParDéfaut = () => true;
 
-export const connecterPairs = async (
-  sfip1: Helia,
-  sfip2: Helia,
+export const connecterPairs = async <
+  T extends Libp2p = Libp2p<DefaultLibp2pServices>,
+>(
+  sfip1: HeliaLibp2p<T>,
+  sfip2: HeliaLibp2p<T>,
   options = {
     filtre: filtreParDéfaut,
   },
@@ -82,8 +85,10 @@ export const connecterPairs = async (
   }
 };
 
-export const toutesConnectées = async (sfips: Helia[]) => {
-  const connectés: Helia[] = [];
+export const toutesConnectées = async (
+  sfips: HeliaLibp2p<Libp2p<{ pubsub: GossipSub }>>[],
+) => {
+  const connectés: HeliaLibp2p<Libp2p<{ pubsub: GossipSub }>>[] = [];
   for (const sfip of sfips) {
     for (const autre of connectés) {
       await connecterPairs(sfip, autre);
@@ -103,9 +108,16 @@ export const constObtFichierRelai = async (): Promise<string> => {
 
 export const lancerRelai = async () => {
   const { $ } = await import("execa");
+
   const fichierRelai = await constObtFichierRelai();
 
   const relai = $`node ${fichierRelai} &`;
+
+  relai.catch((e) => {
+    // Ignorer l'erreur causée par la termination du processus par notre code
+    if (e.signal !== "SIGTERM") throw new Error(e);
+  });
+
   return () => relai.kill();
 };
 

package/src/version.ts

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

package/.eslintignore

@@ -1,3 +0,0 @@
-node_modules
-lib
-docu

package/.eslintrc.cjs

@@ -1,30 +0,0 @@
-module.exports = {
-  env: {
-    browser: true,
-    es2021: true,
-    node: true,
-  },
-  extends: [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended",
-    "prettier",
-  ],
-  parser: "@typescript-eslint/parser",
-  parserOptions: {
-    ecmaVersion: 12,
-    sourceType: "module",
-  },
-  plugins: ["@typescript-eslint"],
-  rules: {
-    "@typescript-eslint/no-non-null-assertion": "off",
-    "@typescript-eslint/no-unused-vars": [
-      "warn",
-      { 
-        "argsIgnorePattern": "^_",
-        "varsIgnorePattern": "^_",
-        "caughtErrorsIgnorePattern": "^_"
-      }
-    ]
-  },
-};