package.json

@@ -39,7 +39,6 @@
         "libkmodule": "^0.2.53",
         "libp2p": "^0.42.2",
         "multiformats": "^11.0.2",
-        "p-defer": "^4.0.0",
         "p-queue": "^7.3.4",
         "private-ip": "^3.0.0",
         "rewire": "^6.0.0",

src/index.ts

@@ -38,7 +38,6 @@ import { peerIdFromCID } from "@libp2p/peer-id";
 import { bootstrap } from "@libp2p/bootstrap";
 import { IDBBlockstore } from "blockstore-idb";
 import { IDBDatastore } from "datastore-idb";
-import defer from "p-defer";
 
 const basesByPrefix: { [prefix: string]: MultibaseDecoder<any> } = Object.keys(
   bases
@@ -50,8 +49,10 @@ const basesByPrefix: { [prefix: string]: MultibaseDecoder<any> } = Object.keys(
 
 onmessage = handleMessage;
 
-const moduleDefer = defer();
-let activePeersDefer = defer();
+let moduleLoadedResolve: Function;
+let moduleLoaded: Promise<void> = new Promise((resolve) => {
+  moduleLoadedResolve = resolve;
+});
 
 let swarm;
 let proxy: Proxy;
@@ -68,7 +69,6 @@ addHandler("stat", handleStat);
 addHandler("ls", handleLs, { receiveUpdates: true });
 addHandler("cat", handleCat, { receiveUpdates: true });
 addHandler("ipnsResolve", handleIpnsResolve);
-addHandler("getActivePeers", handleGetActivePeers);
 
 async function handlePresentSeed() {
   swarm = createClient();
@@ -168,7 +168,7 @@ async function handlePresentSeed() {
   await blockstore.open();
   await datastore.open();
 
-  const ipfs = await createHelia({
+  PeerManager.instance.ipfs = await createHelia({
     // @ts-ignore
     blockstore,
     // @ts-ignore
@@ -176,8 +176,6 @@ async function handlePresentSeed() {
     libp2p,
   });
 
-  PeerManager.instance.ipfs = ipfs;
-
   proxy = new Proxy({
     swarm,
     listen: true,
@@ -202,22 +200,12 @@ async function handlePresentSeed() {
   await swarm.start();
   await swarm.ready();
   // @ts-ignore
-  fs = unixfs(ipfs);
-  IPNS = ipns(ipfs as any, [dht(ipfs), pubsub(ipfs as any)]);
-
-  ipfs.libp2p.addEventListener("peer:connect", () => {
-    if (ipfs.libp2p.getPeers().length > 0) {
-      activePeersDefer.resolve();
-    }
-  });
-
-  ipfs.libp2p.addEventListener("peer:disconnect", () => {
-    if (ipfs.libp2p.getPeers().length === 0) {
-      activePeersDefer = defer();
-    }
-  });
-
-  moduleDefer.resolve();
+  fs = unixfs(PeerManager.instance.ipfs);
+  IPNS = ipns(PeerManager.instance.ipfs as any, [
+    dht(PeerManager.instance.ipfs),
+    pubsub(PeerManager.instance.ipfs as any),
+  ]);
+  moduleLoadedResolve();
 }
 
 async function handleStat(aq: ActiveQuery) {
@@ -301,9 +289,6 @@ async function handleCat(aq: ActiveQuery) {
 
 async function handleIpnsResolve(aq: ActiveQuery) {
   await ready();
-
-  await activePeersDefer.promise;
-
   if (!aq.callerInput || !("cid" in aq.callerInput)) {
     aq.reject("cid required");
     return;
@@ -330,14 +315,8 @@ async function handleIpnsResolve(aq: ActiveQuery) {
   }
 }
 
-async function handleGetActivePeers(aq: ActiveQuery) {
-  await ready();
-
-  aq.respond(PeerManager.instance.ipfs.libp2p.getPeers());
-}
-
 async function ready() {
-  await moduleDefer.promise;
+  await moduleLoaded;
   await PeerManager.instance.ipfsReady;
 }
 

src/peerManager.ts

@@ -5,7 +5,6 @@ import { fixed32, json, raw, uint } from "compact-encoding";
 import { TcpSocketConnectOpts } from "net";
 import { Helia } from "@helia/interface";
 import { deserializeError } from "serialize-error";
-import defer from "p-defer";
 import {
   CloseSocketRequest,
   ErrorSocketRequest,
@@ -128,14 +127,14 @@ export default class PeerManager {
     this._ipfs = value as Helia;
   }
 
-  private _ipfsReady?: Promise<unknown>;
+  private _ipfsReady?: Promise<void>;
   private _ipfsResolve?: () => void;
 
   get ipfsReady(): Promise<void> {
     if (!this._ipfsReady) {
-      let ipfsDefer = defer();
-      this._ipfsReady = ipfsDefer.promise;
-      this._ipfsResolve = ipfsDefer.resolve;
+      this._ipfsReady = new Promise((resolve) => {
+        this._ipfsResolve = resolve;
+      });
     }
 
     return this._ipfsReady as Promise<any>;