@constl/utils-tests 1.1.1-f631113.0 → 1.2.0

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.1-f631113.0",
+  "version": "1.2.0",
   "license": "AGPL-3.0-or-later",
   "name": "@constl/utils-tests",
   "author": "Julien Jean Malard-Adam",
@@ -9,19 +9,6 @@
   "engines": {
     "node": ">=20"
   },
-  "scripts": {
-    "nettoyer": "rimraf dist",
-    "compiler": "pnpm versioner && pnpm formatter && pnpm nettoyer && pnpm tspc -p tsconfig.build.json",
-    "test:node": "pnpm compiler && pnpm aegir test -t node --cov -- --exit",
-    "test:navig": "pnpm compiler && pnpm webrtc && pnpm aegir test -t browser --cov",
-    "test:électron-principal": "pnpm compiler && pnpm aegir test -t electron-main --cov",
-    "test:électron-rendu": "pnpm compiler && pnpm webrtc && 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",
-    "publier": "pnpm versioner && pnpm compiler && (git commit -a -m 'version' || true) && pnpm publish",
-    "versioner": "pnpm genversion  --es6 --semi src/version.ts",
-    "webrtc": "node ./test/utils/relai.js &"
-  },
   "watch": {
     "build": {
       "patterns": "./src/**/*",
@@ -33,30 +20,31 @@
     "postbuild": "./dist/**/*"
   },
   "devDependencies": {
-    "@chainsafe/libp2p-gossipsub": "^11.2.0",
+    "@chainsafe/libp2p-gossipsub": "^12.0.0",
     "@chainsafe/libp2p-noise": "^15.0.0",
-    "@chainsafe/libp2p-yamux": "^6.0.1",
-    "@constl/ipa": "1.0.1-76af3ada9.0",
-    "@libp2p/circuit-relay-v2": "^1.0.13",
-    "@libp2p/crypto": "^4.0.1",
-    "@libp2p/identify": "^1.0.12",
-    "@libp2p/peer-id-factory": "^4.0.5",
-    "@libp2p/websockets": "^8.0.13",
+    "@chainsafe/libp2p-yamux": "^6.0.2",
+    "@constl/ipa": "1.0.0",
+    "@libp2p/circuit-relay-v2": "^1.0.15",
+    "@libp2p/crypto": "^4.0.2",
+    "@libp2p/identify": "^1.0.14",
+    "@libp2p/peer-id-factory": "^4.0.6",
+    "@libp2p/websockets": "^8.0.15",
     "@multiformats/multiaddr": "^12.1.14",
     "@multiformats/multiaddr-matcher": "^1.1.2",
     "@orbitdb/feed-db": "^1.0.0",
     "@types/crypto-js": "^4.2.2",
     "@types/file-saver": "^2.0.7",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^20.11.16",
+    "@types/node": "^20.11.19",
     "@types/uuid": "^9.0.8",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
-    "aegir": "^42.2.3",
+    "aegir": "^42.2.4",
     "browserify-fs": "^1.0.0",
     "buffer": "^6.0.3",
-    "core-js": "^3.35.1",
+    "core-js": "^3.36.0",
     "crypto-browserify": "^3.12.0",
+    "esbuild": "^0.20.1",
     "eslint": "^8.56.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^9.1.0",
@@ -67,7 +55,7 @@
     "execa": "^8.0.1",
     "file-saver": "^2.0.5",
     "keys": "link:@libp2p/crypto/keys",
-    "mocha": "^10.2.0",
+    "mocha": "^10.3.0",
     "os-browserify": "^0.3.0",
     "playwright": "^1.41.2",
     "prettier": "^3.2.5",
@@ -78,21 +66,34 @@
     "tsconfig-paths": "^4.2.0",
     "tscpaths": "^0.0.9",
     "typescript": "5.3.3",
-    "typescript-transform-paths": "^3.4.6"
+    "typescript-transform-paths": "^3.4.7"
   },
   "dependencies": {
     "@helia/block-brokers": "^2.0.1",
     "@orbitdb/quickstart": "^1.0.0",
-    "blockstore-core": "^4.3.10",
-    "blockstore-level": "^1.1.7",
-    "chokidar": "^3.5.3",
+    "blockstore-core": "^4.4.0",
+    "blockstore-level": "^1.1.8",
+    "chokidar": "^3.6.0",
     "events": "^3.3.0",
     "genversion": "^3.2.0",
     "helia": "^3.0.1",
-    "libp2p": "^1.2.1",
+    "libp2p": "^1.2.3",
+    "read-package-up": "^11.0.0",
     "rimraf": "^5.0.5",
-    "uint8arrays": "^5.0.1",
+    "uint8arrays": "^5.0.2",
     "uuid": "^9.0.1",
     "wherearewe": "^2.0.1"
+  },
+  "scripts": {
+    "nettoyer": "rimraf dist",
+    "compiler": "pnpm versioner && pnpm formatter && pnpm nettoyer && pnpm tspc -p tsconfig.build.json",
+    "test:node": "pnpm compiler && pnpm aegir test -t node --cov -- --exit",
+    "test:navig": "pnpm compiler && pnpm aegir test -t browser --cov",
+    "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",
+    "publier": "pnpm versioner && pnpm compiler && (git commit -a -m 'version' || true) && pnpm publish",
+    "versioner": "pnpm genversion  --es6 --semi src/version.ts"
   }
-}
+}

package/src/config.ts

@@ -0,0 +1,81 @@
+import type { PartialOptions } from "aegir";
+import type { BuildOptions } from "esbuild";
+
+import { createRequire } from "module";
+import path, { dirname } from "path";
+import { fileURLToPath } from "url";
+
+import { lancerRelai } from "./sfip.js";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const require = createRequire(import.meta.url);
+
+const esbuild: BuildOptions = {
+  // this will inject all the named exports from 'node-globals.js' as globals
+  inject: [path.join(__dirname, "./scripts/node-globals.js")],
+  plugins: [
+    {
+      name: "node built ins",
+      setup(build) {
+        build.onResolve({ filter: /^crypto$/ }, () => {
+          return { path: require.resolve("crypto-browserify") };
+        });
+        build.onResolve({ filter: /^fs/ }, () => {
+          return { path: require.resolve("browserify-fs") };
+        });
+        build.onResolve({ filter: /^stream$/ }, () => {
+          return { path: require.resolve("stream-browserify") };
+        });
+        build.onResolve({ filter: /^os$/ }, () => {
+          return { path: require.resolve("os-browserify") };
+        });
+        build.onResolve({ filter: /^node:process$/ }, () => {
+          return { path: require.resolve("process/browser") };
+        });
+      },
+    },
+  ],
+  external: [
+    "fs",
+    "path",
+    "os",
+    "chokidar",
+    "url",
+    "execa",
+    "zlib",
+    "rimraf",
+    "stream",
+    "electron",
+    "env-paths",
+    "@libp2p/tcp",
+    "@libp2p/mdns",
+  ],
+};
+type RetourAvant = {
+  relai?: () => void;
+};
+export const configÆgir: PartialOptions = {
+  test: {
+    // @ts-expect-error Erreur types Ægir
+    before: async (opts): Promise<RetourAvant> => {
+      let relai = undefined;
+      if (opts.target.includes("browser")) {
+        relai = await lancerRelai();
+      }
+
+      return { relai };
+    },
+    // @ts-expect-error Erreur types Ægir
+    after: async (_opts, avant: RetourAvant) => {
+      avant.relai?.();
+    },
+    browser: {
+      config: {
+        buildConfig: esbuild,
+      },
+    },
+  },
+  build: {
+    config: esbuild,
+  },
+};

package/src/index.ts

@@ -3,5 +3,6 @@ export * as constellation from "@/constellation.js";
 export * as dossiers from "@/dossiers.js";
 export * as orbite from "@/orbite.js";
 export * as sfip from "@/sfip.js";
+export * as config from "@/config.js";
 
 export { version } from "@/version.js";

package/src/orbite.ts

@@ -36,8 +36,7 @@ import { once } from "events";
 
 import { dossierTempo } from "@/dossiers.js";
 import { connecterPairs } from "@/sfip.js";
-import { isNode } from "wherearewe/dist/src";
-import { isElectronMain } from "wherearewe/dist/src";
+import { isNode, isElectronMain } from "wherearewe";
 
 const OrbitDBQuickstart = await import("@orbitdb/quickstart");
 const { startOrbitDB, stopOrbitDB } = OrbitDBQuickstart;
@@ -77,8 +76,11 @@ export const créerOrbiteTest = async ({
       fEffacerRacineDossierOrbite();
     } catch (e) {
       // Sur Windows, parfois les fichiers de Hélia sont encore en utilisation
-      if (!(isNode || isElectronMain && process.platform === "win32")) {
-        throw e
+      if ((isNode || isElectronMain) && process.platform === "win32") {
+        console.log("On ignore ça sur Windows\n", e);
+        return;
+      } else {
+        throw e;
       }
     }
   };

package/src/scripts/node-globals.ts

@@ -0,0 +1,3 @@
+export { Buffer } from "buffer";
+// @ts-expect-error Mystère
+export * as process from "process/browser";

package/src/scripts/relai.ts

@@ -0,0 +1,86 @@
+/*
+La majorité de ce fichier provient d'OrbitDB
+
+MIT License
+
+Copyright (c) 2019 Haja Networks Oy
+
+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 { yamux } from "@chainsafe/libp2p-yamux";
+import { createLibp2p } from "libp2p";
+import { noise } from "@chainsafe/libp2p-noise";
+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 { unmarshalPrivateKey } from "@libp2p/crypto/keys";
+import { fromString as uint8ArrayFromString } from "uint8arrays/from-string";
+
+// output of: console.log(server.peerId.privateKey.toString('hex'))
+const relayPrivKey =
+  "08011240821cb6bc3d4547fcccb513e82e4d718089f8a166b23ffcd4a436754b6b0774cf07447d1693cd10ce11ef950d7517bad6e9472b41a927cd17fc3fb23f8c70cd99";
+// the peer id of the above key
+// const relayId = '12D3KooWAJjbRkp8FPF5MKgMU53aUTxWkqvDrs4zc1VMbwRwfsbE'
+
+const encoded = uint8ArrayFromString(relayPrivKey, "hex");
+const privateKey = await unmarshalPrivateKey(encoded);
+const peerId = await createFromPrivKey(privateKey);
+
+const relai = await createLibp2p({
+  peerId,
+  addresses: {
+    listen: ["/ip4/0.0.0.0/tcp/12345/ws"],
+  },
+  transports: [
+    webSockets({
+      filter: filters.all,
+    }),
+  ],
+  connectionEncryption: [noise()],
+  streamMuxers: [yamux()],
+  services: {
+    identify: identify(),
+    relay: circuitRelayServer({
+      reservations: {
+        maxReservations: 5000,
+        reservationTtl: 1000,
+        defaultDataLimit: BigInt(1024 * 1024 * 1024),
+      },
+    }),
+  },
+});
+
+relai.addEventListener("peer:connect", async (event) => {
+  console.log("peer:connect", event.detail);
+});
+
+relai.addEventListener("peer:disconnect", async (event) => {
+  console.log("peer:disconnect", event.detail);
+  relai.peerStore.delete(event.detail);
+});
+
+console.log(relai.peerId.toString());
+console.log(
+  "p2p addr: ",
+  relai.getMultiaddrs().map((ma) => ma.toString()),
+);
+// generates a deterministic address: /ip4/127.0.0.1/tcp/12345/ws/p2p/12D3KooWAJjbRkp8FPF5MKgMU53aUTxWkqvDrs4zc1VMbwRwfsbE

package/src/sfip.ts

@@ -1,4 +1,5 @@
 import type { GossipSub } from "@chainsafe/libp2p-gossipsub";
+import type { Multiaddr } from "@multiformats/multiaddr";
 
 import { createHelia, type Helia } from "helia";
 import { bitswap } from "@helia/block-brokers";
@@ -7,7 +8,6 @@ import { MemoryBlockstore } from "blockstore-core";
 import { LevelBlockstore } from "blockstore-level";
 import { multiaddr } from "@multiformats/multiaddr";
 import { WebRTC } from "@multiformats/multiaddr-matcher";
-import type { Multiaddr } from "@multiformats/multiaddr";
 
 import { isBrowser, isElectronRenderer } from "wherearewe";
 
@@ -91,3 +91,23 @@ export const toutesConnectées = async (sfips: Helia[]) => {
     connectés.push(sfip);
   }
 };
+
+export const constObtFichierRelai = async (): Promise<string> => {
+  const path = await import("path");
+  const url = await import("url");
+  const __dirname = path.dirname(url.fileURLToPath(import.meta.url));
+
+  const fichierRelai = path.join(__dirname, "./scripts/relai.js");
+  return fichierRelai;
+};
+
+export const lancerRelai = async () => {
+  const { $ } = await import("execa");
+  const fichierRelai = await constObtFichierRelai();
+
+  const relai = $`node ${fichierRelai} &`;
+  return () => relai.kill();
+};
+
+export const adresseRelai =
+  "/ip4/127.0.0.1/tcp/12345/ws/p2p/12D3KooWAJjbRkp8FPF5MKgMU53aUTxWkqvDrs4zc1VMbwRwfsbE";

package/src/version.ts

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

package/scripts/node-globals.js

@@ -1,3 +0,0 @@
-// file: node-globals.js
-export const { Buffer } = require("buffer");
-export const process = require("process/browser");