@pkcprotocol/pkc-js 0.0.80 → 0.0.82

package/dist/node/runtime/node/community/local-community/reprovide-on-address-change.js

@@ -1,19 +1,28 @@
 import Logger from "../../../../logger.js";
 import { flat, isDeepEqual, unique } from "remeda";
 import { CID } from "multiformats/cid";
-import { normalizeSelfAddrsForProvider } from "../../addresses-rewriter-proxy-server.js";
-// How often LocalCommunity polls its own node for browser-dialable address changes.
-// Matches the address-rewriter proxy's own 60s refresh so a rotation is noticed within one cycle.
+// How often LocalCommunity polls its own node for browser-dialable address changes. One minute is
+// short enough that a rotated WebRTC certhash or a re-issued AutoTLS name is noticed while the old
+// provider record is still fresh at the routers.
 export const ADDRESS_REPROVIDE_POLL_INTERVAL_MS = 60 * 1000;
+// `ipfs id` returns self-addresses with a trailing `/p2p/<peerId>` while `swarm addrs`
+// returns the same transports without it, so unioning them yields each address twice plus
+// non-standard `/p2p`-suffixed entries. The `/routing/v1` provider schema carries the peer id
+// in the separate `ID` field and expects transport-only `Addrs`, so strip the trailing
+// `/p2p/<peerId>` and dedupe before comparing or announcing.
+export function normalizeSelfAddrsForProvider(addrs, peerId) {
+    const suffix = `/p2p/${peerId}`;
+    return unique(addrs.map((addr) => (addr.endsWith(suffix) ? addr.slice(0, -suffix.length) : addr)));
+}
 // Transports a browser can actually dial. These are exactly the addresses that rotate/expire frequently
-// (WebRTC-direct certhash rotation, AutoTLS WSS) and that kubo prunes from HTTP-router announces, so they
-// are the ones whose change must trigger a fresh provide. Plain TCP/QUIC changes are irrelevant to browsers.
+// (WebRTC-direct certhash rotation, AutoTLS WSS), so they are the ones whose change must trigger a fresh
+// provide. Plain TCP/QUIC changes are irrelevant to browsers.
 export function isBrowserDialableAddr(addr) {
     return addr.includes("/webrtc") || addr.includes("/ws");
 }
-// Fetch the node's current browser-dialable self-addresses, normalized the same way the address-rewriter
-// proxy normalizes them before announcing (strip the trailing /p2p/<peerId>, dedupe), then sorted so the
-// result can be compared by value across calls.
+// Fetch the node's current browser-dialable self-addresses, normalized the way a provider record carries
+// them (strip the trailing /p2p/<peerId>, dedupe), then sorted so the result can be compared by value
+// across calls.
 export async function getBrowserDialableSelfAddrs(client) {
     const idRes = await client.id();
     const peerId = idRes.id.toString();
@@ -35,8 +44,8 @@ function connectionCriticalCids(community) {
 }
 /**
  * Re-provide the connection-critical CIDs when the node's browser-dialable (WSS/WebRTC) self-addresses
- * have changed since the last provide. This pushes the current addresses to the HTTP routers (via the
- * address-rewriter proxy) so browsers don't get NoValidAddressesError against stale/dead addresses.
+ * have changed since the last provide. This pushes the current addresses to the HTTP routers so browsers
+ * don't get NoValidAddressesError against stale/dead addresses.
  *
  * The first observation only establishes a baseline (start() already force-provides these CIDs with fresh
  * addresses via providePubsubTopicRoutingCidsIfNeeded); subsequent changes trigger a re-provide.

package/dist/node/runtime/node/community/local-community/reprovide-on-address-change.js.map

@@ -1 +1 @@
-{"version":3,"file":"reprovide-on-address-change.js","sourceRoot":"","sources":["../../../../../../src/runtime/node/community/local-community/reprovide-on-address-change.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,6BAA6B,EAAE,MAAM,0CAA0C,CAAC;AAEzF,oFAAoF;AACpF,kGAAkG;AAClG,MAAM,CAAC,MAAM,kCAAkC,GAAG,EAAE,GAAG,IAAI,CAAC;AAsB5D,wGAAwG;AACxG,0GAA0G;AAC1G,6GAA6G;AAC7G,MAAM,UAAU,qBAAqB,CAAC,IAAY;IAC9C,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC5D,CAAC;AAED,yGAAyG;AACzG,yGAAyG;AACzG,gDAAgD;AAChD,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAAC,MAA8B;IAC5E,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,EAAE,EAAE,CAAC;IAChC,MAAM,MAAM,GAAG,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;IACnC,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACjD,MAAM,uBAAuB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,MAAM,CAAC,CAAC;IAExG,MAAM,UAAU,GAAG,6BAA6B,CAC5C;QACI,GAAG,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACjD,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;KACtG,EACD,MAAM,CACT,CAAC;IAEF,OAAO,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AACnE,CAAC;AAED,4GAA4G;AAC5G,qGAAqG;AACrG,0GAA0G;AAC1G,0GAA0G;AAC1G,oFAAoF;AACpF,SAAS,sBAAsB,CAAC,SAAoC;IAChE,OAAO,MAAM,CACT,CAAC,SAAS,CAAC,qBAAqB,EAAE,SAAS,CAAC,yBAAyB,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAiB,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC,CACjI,CAAC;AACN,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,4CAA4C,CAC9D,SAAoC;IAEpC,MAAM,GAAG,GAAG,MAAM,CAAC,sEAAsE,CAAC,CAAC;IAC3F,MAAM,MAAM,GAAG,SAAS,CAAC,eAAe,CAAC,uBAAuB,EAAE,CAAC,OAAO,CAAC;IAC3E,MAAM,OAAO,GAAG,MAAM,2BAA2B,CAAC,MAAM,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,SAAS,CAAC,qCAAqC,CAAC;IAEjE,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QACzB,4GAA4G;QAC5G,SAAS,CAAC,qCAAqC,GAAG,OAAO,CAAC;QAC1D,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC;IAC1E,CAAC;IAED,IAAI,WAAW,CAAC,QAAQ,EAAE,OAAO,CAAC;QAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC;IAE1G,yGAAyG;IACzG,SAAS,CAAC,qCAAqC,GAAG,OAAO,CAAC;IAE1D,MAAM,UAAU,GAAG,sBAAsB,CAAC,SAAS,CAAC,CAAC;IACrD,MAAM,YAAY,GAAa,EAAE,CAAC;IAClC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACjC,IAAI,GAAQ,CAAC;QACb,IAAI,CAAC;YACD,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,GAAG,CAAC,KAAK,CAAC,4CAA4C,SAAS,oBAAoB,SAAS,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC;YAC5G,SAAS;QACb,CAAC;QACD,IAAI,CAAC;YACD,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACvE,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,aAAa;gBAAE,GAAG,CAAC,KAAK,CAAC,qBAAqB,SAAS,GAAG,EAAE,KAAK,CAAC,CAAC;YAC7F,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,GAAG,CAAC,KAAK,CAAC,iDAAiD,SAAS,oBAAoB,SAAS,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC;QACrH,CAAC;IACL,CAAC;IAED,GAAG,CACC,4CAA4C,SAAS,CAAC,OAAO,0BAA0B,YAAY,CAAC,MAAM,IAAI,UAAU,CAAC,MAAM,2BAA2B,EAC1J,EAAE,YAAY,EAAE,OAAO,EAAE,CAC5B,CAAC;IAEF,OAAO,EAAE,UAAU,EAAE,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,OAAO,EAAE,CAAC;AACxF,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,SAAoC;IACpF,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,IACI,OAAO,SAAS,CAAC,4BAA4B,KAAK,QAAQ;QAC1D,GAAG,GAAG,SAAS,CAAC,4BAA4B,GAAG,kCAAkC;QAEjF,OAAO;IACX,SAAS,CAAC,4BAA4B,GAAG,GAAG,CAAC;IAC7C,MAAM,4CAA4C,CAAC,SAAS,CAAC,CAAC;AAClE,CAAC"}
+{"version":3,"file":"reprovide-on-address-change.js","sourceRoot":"","sources":["../../../../../../src/runtime/node/community/local-community/reprovide-on-address-change.ts"],"names":[],"mappings":"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"}

package/dist/node/runtime/node/community/page-generator.d.ts

@@ -78,6 +78,7 @@ export declare class PageGenerator {
                     parentCid?: string | undefined;
                     postCid?: string | undefined;
                     quotedCids?: string[] | undefined;
+                    crosspost?: import("../../../publications/comment/schema.js").Crosspost | undefined;
                     author?: {
                         [x: string]: unknown;
                         name?: string | undefined;
@@ -269,6 +270,7 @@ export declare class PageGenerator {
                         parentCid?: string | undefined;
                         postCid?: string | undefined;
                         quotedCids?: string[] | undefined;
+                        crosspost?: import("../../../publications/comment/schema.js").Crosspost | undefined;
                         author?: {
                             [x: string]: unknown;
                             name?: string | undefined;

package/dist/node/runtime/node/setup-kubo-http-routers.d.ts

@@ -0,0 +1,2 @@
+import { PKC } from "../../pkc/pkc.js";
+export declare function setupKuboHttpRouters(pkc: PKC): Promise<void>;

package/dist/node/runtime/node/{setup-kubo-address-rewriter-and-http-router.js → setup-kubo-http-routers.js}

@@ -1,10 +1,7 @@
 import retry from "retry";
-import { AddressesRewriterProxyServer } from "./addresses-rewriter-proxy-server.js";
 import Logger from "../../logger.js";
 import { PKCError } from "../../pkc-error.js";
 import { isDeepEqual } from "remeda";
-import tcpPortUsed from "tcp-port-used";
-const MAX_TCP_PORT = 65535;
 function _mergeRouterConfigs(existingConfig, newConfig) {
     if (!existingConfig?.Routers)
         return newConfig;
@@ -32,12 +29,12 @@ function _mergeRouterConfigs(existingConfig, newConfig) {
         Routers: mergedRouters
     };
 }
-async function _setProvideDhtSweepEnabledOnKuboNode(kuboClient, sweepEnabled) {
+async function _setProvideDhtSweepEnabledOnKuboNode(kuboClient, sweepEnabled, signal) {
     const log = Logger("pkc-js:pkc:_init:retrySettingHttpRoutersOnIpfsNodes:setProvideDhtSweepEnabledOnIpfsNode");
     const configKey = "Provide.DHT.SweepEnabled";
     const url = `${kuboClient._clientOptions.url}/config?arg=${configKey}&arg=${JSON.stringify(sweepEnabled)}&json=true`;
     try {
-        await fetch(url, { method: "POST", headers: kuboClient._clientOptions.headers });
+        await fetch(url, { method: "POST", headers: kuboClient._clientOptions.headers, signal });
     }
     catch (e) {
         const error = new PKCError("ERR_FAILED_TO_SET_CONFIG_ON_KUBO_NODE", {
@@ -52,12 +49,12 @@ async function _setProvideDhtSweepEnabledOnKuboNode(kuboClient, sweepEnabled) {
     }
     log.trace("Succeeded in setting config key", configKey, "on node", kuboClient._clientOptions.url, "to be", sweepEnabled);
 }
-async function _setHttpRouterOptionsOnKuboNode(kuboClient, routingValue) {
+async function _setHttpRouterOptionsOnKuboNode(kuboClient, routingValue, signal) {
     const log = Logger("pkc-js:pkc:_init:retrySettingHttpRoutersOnIpfsNodes:setHttpRouterOptionsOnIpfsNode");
     const routingKey = "Routing";
     let routingConfigBeforeChanging;
     try {
-        routingConfigBeforeChanging = await kuboClient._client.config.get(routingKey);
+        routingConfigBeforeChanging = await kuboClient._client.config.get(routingKey, { signal });
     }
     catch (e) {
         const error = new PKCError("ERR_FAILED_TO_GET_CONFIG_ON_KUBO_NODE", {
@@ -71,7 +68,7 @@ async function _setHttpRouterOptionsOnKuboNode(kuboClient, routingValue) {
     const mergedRoutingValue = _mergeRouterConfigs(routingConfigBeforeChanging, routingValue);
     const url = `${kuboClient._clientOptions.url}/config?arg=${routingKey}&arg=${JSON.stringify(mergedRoutingValue)}&json=true`;
     try {
-        await fetch(url, { method: "POST", headers: kuboClient._clientOptions.headers });
+        await fetch(url, { method: "POST", headers: kuboClient._clientOptions.headers, signal });
     }
     catch (e) {
         const error = new PKCError("ERR_FAILED_TO_SET_CONFIG_ON_KUBO_NODE", {
@@ -85,7 +82,7 @@ async function _setHttpRouterOptionsOnKuboNode(kuboClient, routingValue) {
         throw error;
     }
     log.trace("Succeeded in setting config key", routingKey, "on node", kuboClient._clientOptions.url, "to be", mergedRoutingValue);
-    await _setProvideDhtSweepEnabledOnKuboNode(kuboClient, false);
+    await _setProvideDhtSweepEnabledOnKuboNode(kuboClient, false, signal);
     const endpointsBefore = Object.values(routingConfigBeforeChanging?.Routers || {})
         .map((router) => router.Parameters?.Endpoint)
         .filter((endpoint) => endpoint !== undefined);
@@ -96,7 +93,7 @@ async function _setHttpRouterOptionsOnKuboNode(kuboClient, routingValue) {
         log("Config on kubo node has been changed. PKC-js will send shutdown command to node", kuboClient._clientOptions.url, "Clients of pkc-js should restart ipfs node");
         const shutdownUrl = `${kuboClient._clientOptions.url}/shutdown`;
         try {
-            await fetch(shutdownUrl, { method: "POST", headers: kuboClient._clientOptions.headers });
+            await fetch(shutdownUrl, { method: "POST", headers: kuboClient._clientOptions.headers, signal });
         }
         catch (e) {
             const error = new PKCError("ERR_FAILED_TO_SHUTDOWN_KUBO_NODE", {
@@ -109,108 +106,29 @@ async function _setHttpRouterOptionsOnKuboNode(kuboClient, routingValue) {
         }
     }
 }
-async function _getStartedProxyUrl(pkc, httpRouterUrl) {
+// Kubo publishes the provider records to these routers itself. It used to drop the browser-dialable
+// transports (AutoTLS /tls/ws and webrtc-direct) from anything it PUT to a delegated HTTP router,
+// which is why every router URL below used to be a loopback AddressesRewriterProxyServer that
+// rewrote `Addrs` on the way through. Kubo 0.43.0 fixed that (ipfs/kubo#11394, closing the
+// ipfs/kubo#11369 we filed), so Kubo now points straight at the real routers. Do not reintroduce a
+// rewriting proxy: the addrs it could reconstruct (kubo id + swarm addrs) carry no certhash, so a
+// rewritten webrtc-direct/webtransport addr is one no browser can dial.
+export async function setupKuboHttpRouters(pkc) {
     if (pkc.destroyed)
-        return undefined;
-    const mappingKeyName = `httprouter_proxy_${httpRouterUrl}`;
-    try {
-        const urlOfProxyOfHttpRouter = await pkc._storage.getItem(mappingKeyName);
-        if (pkc.destroyed)
-            return undefined;
-        if (urlOfProxyOfHttpRouter) {
-            const proxyHttpUrl = new URL(urlOfProxyOfHttpRouter);
-            if (await tcpPortUsed.check(Number(proxyHttpUrl.port), "127.0.0.1"))
-                return urlOfProxyOfHttpRouter;
-            if (pkc.destroyed)
-                return undefined;
-            await pkc._storage.removeItem(mappingKeyName);
-        }
-        return undefined;
-    }
-    catch (error) {
-        if (pkc.destroyed && error instanceof Error && error.message.includes("database connection is not open")) {
-            return undefined;
-        }
-        throw error;
-    }
-}
-export async function setupKuboAddressesRewriterAndHttpRouters(pkc) {
-    if (pkc.destroyed) {
-        return {
-            destroy: async () => { }
-        };
-    }
+        return;
     if (!Array.isArray(pkc.kuboRpcClientsOptions) || pkc.kuboRpcClientsOptions.length <= 0)
         throw Error("need ipfs http client to be defined");
     if (!Array.isArray(pkc.httpRoutersOptions) || pkc.httpRoutersOptions.length <= 0)
         throw Error("Need http router options to defined");
-    const log = Logger("pkc-js:node:setupKuboAddressesRewriterAndHttpRouters");
-    // Set up http proxies first to rewrite addresses
-    const httpRouterProxyUrls = [];
-    const proxyServers = [];
-    // Port 19575 looks like IPRTR (IPFS ROUTER). The loop below walks upward from here to the first
-    // free port, so a busy 19575 is not fatal.
-    //
-    // PKC_ADDRESSES_REWRITER_START_PORT moves that base. It exists for tests: the port is process-wide
-    // and shared by every PKC instance, so two test files that both assume 19575 — one starting a
-    // proxy on it, one asserting it is free — collide whenever vitest's --parallel scheduling puts
-    // them in flight together. Each file can now claim its own base instead. Left unset in
-    // production on purpose: the chosen port is written into Kubo's Routing config, and a changed
-    // endpoint set bounces the daemon, so the base has to stay stable across restarts.
-    const parsedStartPortOverride = Number(process.env.PKC_ADDRESSES_REWRITER_START_PORT);
-    let addressesRewriterStartPort = Number.isInteger(parsedStartPortOverride) && parsedStartPortOverride > 0 && parsedStartPortOverride <= MAX_TCP_PORT
-        ? parsedStartPortOverride
-        : 19575;
-    for (const httpRouter of pkc.httpRoutersOptions) {
-        if (pkc.destroyed)
-            break;
-        const startedProxyUrl = await _getStartedProxyUrl(pkc, httpRouter);
-        if (startedProxyUrl) {
-            // Intentionally not tracked in proxyServers: this proxy was started by a previous PKC
-            // instance in the same process and persisted via storage. We have no server handle to it
-            // and must not destroy() it on teardown, since another instance may still rely on it. It
-            // is bounded (one proxy per httpRouter, reusing the same stored URL) and lives until the
-            // process exits, so this is reuse by design, not a leak.
-            httpRouterProxyUrls.push(startedProxyUrl);
-            continue;
-        }
-        // launch the proxy server
-        let port = addressesRewriterStartPort;
-        const hostname = "127.0.0.1";
-        // keep increasing port till we find an empty port. Bounded at the top of the TCP range:
-        // tcpPortUsed.check rejects anything above it with "invalid port", so an unbounded walk would
-        // surface exhaustion as that opaque error instead of saying what actually went wrong.
-        while (await tcpPortUsed.check(port, hostname)) {
-            port++;
-            if (port > MAX_TCP_PORT)
-                throw Error(`No free loopback port for the addresses rewriter proxy between ${addressesRewriterStartPort} and ${MAX_TCP_PORT}`);
-        }
-        const addressesRewriterProxyServer = new AddressesRewriterProxyServer({
-            kuboClients: Object.values(pkc.clients.kuboRpcClients).map((kubo) => kubo._client),
-            port,
-            hostname,
-            proxyTargetUrl: httpRouter,
-            pkc
-        });
-        await addressesRewriterProxyServer.listen();
-        if (pkc.destroyed) {
-            await addressesRewriterProxyServer.destroy();
-            break;
-        }
-        proxyServers.push(addressesRewriterProxyServer);
-        // save the proxy urls to use them later
-        const httpRouterProxyUrl = `http://${hostname}:${port}`;
-        httpRouterProxyUrls.push(httpRouterProxyUrl);
-    }
-    httpRouterProxyUrls.sort(); // make sure it's always the same order
-    // Set up http routers to use proxies
+    const log = Logger("pkc-js:node:setupKuboHttpRouters");
+    const httpRouterUrls = [...pkc.httpRoutersOptions].sort(); // make sure it's always the same order
     const kuboClients = pkc.clients.kuboRpcClients;
     const parallelRouters = [];
     const httpRoutersConfig = {
         HttpRoutersParallel: { Type: "parallel", Parameters: { Routers: parallelRouters } },
         HttpRouterNotSupported: { Type: "http", Parameters: { Endpoint: "http://kubohttprouternotsupported" } }
     };
-    for (const [i, httpRouterUrl] of httpRouterProxyUrls.entries()) {
+    for (const [i, httpRouterUrl] of httpRouterUrls.entries()) {
         const RouterName = `HttpRouter${i + 1}`;
         httpRoutersConfig[RouterName] = {
             Type: "http",
@@ -240,28 +158,52 @@ export async function setupKuboAddressesRewriterAndHttpRouters(pkc) {
     // Cap the backoff: with forever:true and no maxTimeout the exponential delay grows unbounded
     // (hours between attempts after enough failures), which would stall router setup indefinitely.
     const settingOptionRetryOption = retry.operation({ forever: true, factor: 2, maxTimeout: 60 * 1000 });
+    // destroy() aborts this signal before it awaits the setup promise, so it doubles as the cancel
+    // signal for both the in-flight requests below and the retry schedule.
+    const destroySignal = pkc._getDestroyAbortSignal();
+    let removeDestroyListener;
     const setHttpRouterOnAllNodes = new Promise((resolve) => {
-        settingOptionRetryOption.attempt(async (curAttempt) => {
+        // The `pkc.destroyed` check below only runs at the top of an attempt, so a destroy landing
+        // inside a backoff window would otherwise make destroy() wait out the remaining delay (up to
+        // maxTimeout). stop() drops the scheduled attempt (it clears the timer and empties both the
+        // pending and cached timeouts, so a racing retry() schedules nothing) and resolving lets
+        // destroy() move on immediately.
+        const onDestroy = () => {
+            settingOptionRetryOption.stop();
+            resolve();
+        };
+        if (destroySignal.aborted) {
+            onDestroy();
+            return;
+        }
+        destroySignal.addEventListener("abort", onDestroy, { once: true });
+        removeDestroyListener = () => destroySignal.removeEventListener("abort", onDestroy);
+        settingOptionRetryOption.attempt(async () => {
+            // A destroyed PKC has nothing left to configure, and `forever: true` would otherwise keep
+            // retrying against a torn-down instance for the life of the process.
+            if (pkc.destroyed) {
+                resolve();
+                return;
+            }
             for (const kuboClient of Object.values(kuboClients)) {
                 try {
-                    await _setHttpRouterOptionsOnKuboNode(kuboClient, routingValue);
+                    await _setHttpRouterOptionsOnKuboNode(kuboClient, routingValue, destroySignal);
                 }
                 catch (e) {
                     settingOptionRetryOption.retry(e);
                     return;
                 }
             }
-            resolve(1);
+            resolve();
         });
     });
     await setHttpRouterOnAllNodes;
+    // Detach before returning: the destroy signal outlives this call, and leaving the listener on it
+    // would accumulate one per setup for the life of the instance.
+    removeDestroyListener?.();
     settingOptionRetryOption.stop();
-    return {
-        destroy: async () => {
-            for (const proxyServer of proxyServers) {
-                await proxyServer.destroy();
-            }
-        }
-    };
+    if (pkc.destroyed)
+        return;
+    log.trace("Set http router config on all kubo nodes", Object.keys(kuboClients), "to", httpRouterUrls);
 }
-//# sourceMappingURL=setup-kubo-address-rewriter-and-http-router.js.map
+//# sourceMappingURL=setup-kubo-http-routers.js.map

package/dist/node/runtime/node/setup-kubo-http-routers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"setup-kubo-http-routers.js","sourceRoot":"","sources":["../../../../src/runtime/node/setup-kubo-http-routers.ts"],"names":[],"mappings":"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"}

package/dist/node/schema/schema-util.d.ts

@@ -58,6 +58,7 @@ export declare function parseModQueuePageIpfsSchemaWithPKCErrorIfItFails(modQueu
             parentCid?: string | undefined;
             postCid?: string | undefined;
             quotedCids?: string[] | undefined;
+            crosspost?: import("../publications/comment/schema.js").Crosspost | undefined;
             author?: {
                 [x: string]: unknown;
                 name?: string | undefined;
@@ -230,6 +231,7 @@ export declare function parseRpcRemoteCommunityUpdateEventWithPKCErrorIfItFails(
                         parentCid?: string | undefined;
                         postCid?: string | undefined;
                         quotedCids?: string[] | undefined;
+                        crosspost?: import("../publications/comment/schema.js").Crosspost | undefined;
                         author?: {
                             [x: string]: unknown;
                             name?: string | undefined;
@@ -417,6 +419,7 @@ export declare function parseRpcRemoteCommunityUpdateEventWithPKCErrorIfItFails(
             noReplyLinks?: boolean | undefined;
             noPolls?: boolean | undefined;
             noCrossposts?: boolean | undefined;
+            maxCrosspostDepth?: number | undefined;
             noNestedReplies?: boolean | undefined;
             safeForWork?: boolean | undefined;
             authorFlairs?: boolean | undefined;
@@ -497,6 +500,7 @@ export declare function parseCommunityEditPubsubMessagePublicationSchemaWithPKCE
             noReplyLinks?: boolean | undefined;
             noPolls?: boolean | undefined;
             noCrossposts?: boolean | undefined;
+            maxCrosspostDepth?: number | undefined;
             noNestedReplies?: boolean | undefined;
             safeForWork?: boolean | undefined;
             authorFlairs?: boolean | undefined;
@@ -644,6 +648,7 @@ export declare function parseCreateCommunityEditPublicationOptionsSchemaWithPKCE
             noReplyLinks?: boolean | undefined;
             noPolls?: boolean | undefined;
             noCrossposts?: boolean | undefined;
+            maxCrosspostDepth?: number | undefined;
             noNestedReplies?: boolean | undefined;
             safeForWork?: boolean | undefined;
             authorFlairs?: boolean | undefined;
@@ -1232,6 +1237,7 @@ export declare function parseCreateCommunityFunctionArgumentsSchemaWithPKCErrorI
                     parentCid?: string | undefined;
                     postCid?: string | undefined;
                     quotedCids?: string[] | undefined;
+                    crosspost?: import("../publications/comment/schema.js").Crosspost | undefined;
                     author?: {
                         [x: string]: unknown;
                         name?: string | undefined;
@@ -1419,6 +1425,7 @@ export declare function parseCreateCommunityFunctionArgumentsSchemaWithPKCErrorI
         noReplyLinks?: boolean | undefined;
         noPolls?: boolean | undefined;
         noCrossposts?: boolean | undefined;
+        maxCrosspostDepth?: number | undefined;
         noNestedReplies?: boolean | undefined;
         safeForWork?: boolean | undefined;
         authorFlairs?: boolean | undefined;
@@ -1484,6 +1491,7 @@ export declare function parseCreateCommunityFunctionArgumentsSchemaWithPKCErrorI
         noReplyLinks?: boolean | undefined;
         noPolls?: boolean | undefined;
         noCrossposts?: boolean | undefined;
+        maxCrosspostDepth?: number | undefined;
         noNestedReplies?: boolean | undefined;
         safeForWork?: boolean | undefined;
         authorFlairs?: boolean | undefined;
@@ -1654,6 +1662,7 @@ export declare function parseCreateCommunityFunctionArgumentsSchemaWithPKCErrorI
         noReplyLinks?: boolean | undefined;
         noPolls?: boolean | undefined;
         noCrossposts?: boolean | undefined;
+        maxCrosspostDepth?: number | undefined;
         noNestedReplies?: boolean | undefined;
         safeForWork?: boolean | undefined;
         authorFlairs?: boolean | undefined;
@@ -1731,6 +1740,7 @@ export declare function parseCreateCommunityFunctionArgumentsSchemaWithPKCErrorI
                     parentCid?: string | undefined;
                     postCid?: string | undefined;
                     quotedCids?: string[] | undefined;
+                    crosspost?: import("../publications/comment/schema.js").Crosspost | undefined;
                     author?: {
                         [x: string]: unknown;
                         name?: string | undefined;
@@ -1982,6 +1992,7 @@ export declare function parseCreateRpcCommunityFunctionArgumentSchemaWithPKCErro
                     parentCid?: string | undefined;
                     postCid?: string | undefined;
                     quotedCids?: string[] | undefined;
+                    crosspost?: import("../publications/comment/schema.js").Crosspost | undefined;
                     author?: {
                         [x: string]: unknown;
                         name?: string | undefined;
@@ -2169,6 +2180,7 @@ export declare function parseCreateRpcCommunityFunctionArgumentSchemaWithPKCErro
         noReplyLinks?: boolean | undefined;
         noPolls?: boolean | undefined;
         noCrossposts?: boolean | undefined;
+        maxCrosspostDepth?: number | undefined;
         noNestedReplies?: boolean | undefined;
         safeForWork?: boolean | undefined;
         authorFlairs?: boolean | undefined;
@@ -2234,6 +2246,7 @@ export declare function parseCreateRpcCommunityFunctionArgumentSchemaWithPKCErro
         noReplyLinks?: boolean | undefined;
         noPolls?: boolean | undefined;
         noCrossposts?: boolean | undefined;
+        maxCrosspostDepth?: number | undefined;
         noNestedReplies?: boolean | undefined;
         safeForWork?: boolean | undefined;
         authorFlairs?: boolean | undefined;
@@ -2404,6 +2417,7 @@ export declare function parseCreateRpcCommunityFunctionArgumentSchemaWithPKCErro
         noReplyLinks?: boolean | undefined;
         noPolls?: boolean | undefined;
         noCrossposts?: boolean | undefined;
+        maxCrosspostDepth?: number | undefined;
         noNestedReplies?: boolean | undefined;
         safeForWork?: boolean | undefined;
         authorFlairs?: boolean | undefined;
@@ -2481,6 +2495,7 @@ export declare function parseCreateRpcCommunityFunctionArgumentSchemaWithPKCErro
                     parentCid?: string | undefined;
                     postCid?: string | undefined;
                     quotedCids?: string[] | undefined;
+                    crosspost?: import("../publications/comment/schema.js").Crosspost | undefined;
                     author?: {
                         [x: string]: unknown;
                         name?: string | undefined;
@@ -2703,6 +2718,7 @@ export declare function parseCommentPubsubMessagePublicationWithPKCErrorIfItFail
     parentCid?: string | undefined;
     postCid?: string | undefined;
     quotedCids?: string[] | undefined;
+    crosspost?: import("../publications/comment/schema.js").Crosspost | undefined;
 };
 export declare function parseCreateCommentOptionsSchemaWithPKCErrorIfItFails(args: z.infer<typeof CreateCommentOptionsSchema>): {
     signer: {
@@ -2727,6 +2743,7 @@ export declare function parseCreateCommentOptionsSchemaWithPKCErrorIfItFails(arg
     parentCid?: string | undefined;
     postCid?: string | undefined;
     quotedCids?: string[] | undefined;
+    crosspost?: import("../publications/comment/schema.js").Crosspost | undefined;
     author?: {
         [x: string]: unknown;
         name?: string | undefined;

package/dist/node/schema/schema-util.js

@@ -1,6 +1,7 @@
 import { ModQueuePageIpfsSchema, PageIpfsSchema } from "../pages/schema.js";
 import { PKCError } from "../pkc-error.js";
 import { CommentChallengeRequestToEncryptSchema, CommentIpfsSchema, CommentPubsubMessageWithFlexibleAuthorRefinementSchema, CommentUpdateSchema, CreateCommentOptionsWithRefinementSchema } from "../publications/comment/schema.js";
+import { crosspostChainDepthUpTo, deepestCrosspostChainInCommentUpdateUpTo, deepestCrosspostChainInPageUpTo, MAX_CROSSPOST_DEPTH } from "../publications/comment/crosspost-depth.js";
 import { DecryptedChallengeAnswerSchema, DecryptedChallengeSchema, DecryptedChallengeVerificationSchema } from "../pubsub-messages/schema.js";
 import { CreateNewLocalCommunityUserOptionsSchema, CreateRemoteCommunityFunctionArgumentSchema, CreateRpcCommunityFunctionArgumentSchema, CreateCommunityFunctionArgumentsSchema, RpcRemoteCommunityUpdateEventResultSchema, CommunityEditOptionsSchema, CommunityIpfsSchema } from "../community/schema.js";
 import { CidStringSchema, CommunityAddressSchema } from "./schema.js";
@@ -11,6 +12,31 @@ import { CreateVoteUserOptionsWithRefinementSchema, VoteChallengeRequestToEncryp
 import { CommentEditChallengeRequestToEncryptSchema, CommentEditPubsubMessagePublicationWithFlexibleAuthorSchema, CreateCommentEditOptionsWithRefinementSchema } from "../publications/comment-edit/schema.js";
 import { PKCUserOptionsSchema } from "../schema.js";
 import { CreateCommunityEditPublicationOptionsWithRefinementSchema, CommunityEditPublicationChallengeRequestToEncryptSchema, CommunityEditPubsubMessagePublicationSchema } from "../publications/community-edit/schema.js";
+// A crosspost chain must be rejected *before* the record reaches a recursive zod parse, not after.
+// At roughly 1000 levels the parse overflows the stack and throws a RangeError, which safeParse does
+// not convert into a ZodError, so a check placed after it would never run and the RangeError would
+// escape as itself. The walk below adds no stack frame per level and stops at the cap. Issue #250.
+function _throwIfCrosspostChainExceedsMaxDepth(record, details) {
+    if (crosspostChainDepthUpTo(record) > MAX_CROSSPOST_DEPTH)
+        throw new PKCError("ERR_CROSSPOST_CHAIN_EXCEEDS_MAX_DEPTH", { ...details, maxCrosspostDepth: MAX_CROSSPOST_DEPTH });
+}
+function _throwIfPageCrosspostChainsExceedMaxDepth(pageJson, details) {
+    if (deepestCrosspostChainInPageUpTo(pageJson) > MAX_CROSSPOST_DEPTH)
+        throw new PKCError("ERR_CROSSPOST_CHAIN_EXCEEDS_MAX_DEPTH", { ...details, maxCrosspostDepth: MAX_CROSSPOST_DEPTH });
+}
+// safeParse turns a ZodError into a PKCError, but zod's parse is itself recursive, and a record
+// nested deeply enough makes it throw a RangeError instead — which escapes safeParse as itself.
+// The depth guards above close the crosspost route into that, but reply pages nest too, so the
+// helpers below report any non-Zod throw as the schema error they already document rather than
+// letting it propagate raw out of getComment, Comment.update and page parsing. Issue #250.
+function _safeParseWithoutLettingNonZodThrowsEscape(schema, json, code, details) {
+    try {
+        return schema.safeParse(json);
+    }
+    catch (e) {
+        throw new PKCError(code, { ...details, error: e });
+    }
+}
 export function parseJsonWithPKCErrorIfFails(x) {
     try {
         return JSON.parse(x);
@@ -31,28 +57,39 @@ export function parseCommunityIpfsSchemaPassthroughWithPKCErrorIfItFails(communi
         return communityIpfs;
 }
 export function parseCommentIpfsSchemaWithPKCErrorIfItFails(commentIpfsJson) {
-    const parseRes = CommentIpfsSchema.loose().safeParse(commentIpfsJson);
+    _throwIfCrosspostChainExceedsMaxDepth(commentIpfsJson, { commentIpfsJson });
+    const parseRes = _safeParseWithoutLettingNonZodThrowsEscape(CommentIpfsSchema.loose(), commentIpfsJson, "ERR_INVALID_COMMENT_IPFS_SCHEMA", {
+        commentIpfsJson
+    });
     if (!parseRes.success)
         throw new PKCError("ERR_INVALID_COMMENT_IPFS_SCHEMA", { zodError: parseRes.error, commentIpfsJson });
     else
         return commentIpfsJson;
 }
 export function parseCommentUpdateSchemaWithPKCErrorIfItFails(commentUpdateJson) {
-    const parseRes = CommentUpdateSchema.loose().safeParse(commentUpdateJson);
+    // A CommentUpdate carries reply pages, so a chain can arrive nested inside one rather than on
+    // the comment itself, under the same 1MB fetch cap.
+    if (deepestCrosspostChainInCommentUpdateUpTo(commentUpdateJson) > MAX_CROSSPOST_DEPTH)
+        throw new PKCError("ERR_CROSSPOST_CHAIN_EXCEEDS_MAX_DEPTH", { commentUpdateJson, maxCrosspostDepth: MAX_CROSSPOST_DEPTH });
+    const parseRes = _safeParseWithoutLettingNonZodThrowsEscape(CommentUpdateSchema.loose(), commentUpdateJson, "ERR_INVALID_COMMENT_UPDATE_SCHEMA", { commentUpdateJson });
     if (!parseRes.success)
         throw new PKCError("ERR_INVALID_COMMENT_UPDATE_SCHEMA", { zodError: parseRes.error, commentUpdateJson });
     else
         return commentUpdateJson;
 }
 export function parsePageIpfsSchemaWithPKCErrorIfItFails(pageIpfsJson) {
-    const parseRes = PageIpfsSchema.safeParse(pageIpfsJson);
+    _throwIfPageCrosspostChainsExceedMaxDepth(pageIpfsJson, { pageIpfsJson });
+    const parseRes = _safeParseWithoutLettingNonZodThrowsEscape(PageIpfsSchema, pageIpfsJson, "ERR_INVALID_PAGE_IPFS_SCHEMA", {
+        pageIpfsJson
+    });
     if (!parseRes.success)
         throw new PKCError("ERR_INVALID_PAGE_IPFS_SCHEMA", { zodError: parseRes.error, pageIpfsJson });
     else
         return pageIpfsJson;
 }
 export function parseModQueuePageIpfsSchemaWithPKCErrorIfItFails(modQueuePageIpfsJson) {
-    const parseRes = ModQueuePageIpfsSchema.safeParse(modQueuePageIpfsJson);
+    _throwIfPageCrosspostChainsExceedMaxDepth(modQueuePageIpfsJson, { modQueuePageIpfsJson });
+    const parseRes = _safeParseWithoutLettingNonZodThrowsEscape(ModQueuePageIpfsSchema, modQueuePageIpfsJson, "ERR_INVALID_MODQUEUE_PAGE_IPFS_SCHEMA", { modQueuePageIpfsJson });
     if (!parseRes.success)
         throw new PKCError("ERR_INVALID_MODQUEUE_PAGE_IPFS_SCHEMA", { zodError: parseRes.error, modQueuePageIpfsJson });
     else
@@ -107,6 +144,9 @@ export function parseRpcCommentUpdateEventWithPKCErrorIfItFails(updateResult) {
         return updateResult;
 }
 export function parseRpcCommentEventWithPKCErrorIfItFails(updateResult) {
+    // The RPC server has already refused an over-deep chain on the way in, so this is defense in
+    // depth rather than the primary gate — but the client is the one that would blow its stack.
+    _throwIfCrosspostChainExceedsMaxDepth(updateResult?.comment, { updateResult });
     const parseRes = RpcCommentEventResultSchema.safeParse(updateResult);
     if (!parseRes.success)
         throw new PKCError("ERR_INVALID_RPC_COMMENT_SCHEMA", {
@@ -346,7 +386,8 @@ export function parseCreateRpcCommunityFunctionArgumentSchemaWithPKCErrorIfItFai
         return args;
 }
 export function parseCommentPubsubMessagePublicationWithPKCErrorIfItFails(args) {
-    const parseRes = CommentPubsubMessageWithFlexibleAuthorRefinementSchema.safeParse(args);
+    _throwIfCrosspostChainExceedsMaxDepth(args, { args, type: "CommentPubsubMessagePublication" });
+    const parseRes = _safeParseWithoutLettingNonZodThrowsEscape(CommentPubsubMessageWithFlexibleAuthorRefinementSchema, args, "ERR_INVALID_CREATE_COMMENT_ARGS_SCHEMA", { args, type: "CommentPubsubMessagePublication" });
     if (!parseRes.success)
         throw new PKCError("ERR_INVALID_CREATE_COMMENT_ARGS_SCHEMA", {
             zodError: parseRes.error,
@@ -357,6 +398,9 @@ export function parseCommentPubsubMessagePublicationWithPKCErrorIfItFails(args)
         return args;
 }
 export function parseCreateCommentOptionsSchemaWithPKCErrorIfItFails(args) {
+    // On the publish side too, so an author building a chain too deep for any client to load finds
+    // out locally instead of after burning a challenge.
+    _throwIfCrosspostChainExceedsMaxDepth(args, { args, type: "CreateCommentOptions" });
     const parseRes = CreateCommentOptionsWithRefinementSchema.safeParse(args);
     if (!parseRes.success)
         throw new PKCError("ERR_INVALID_CREATE_COMMENT_ARGS_SCHEMA", {