univo 0.2.8 → 0.2.10

package/dist/cli.mjs

@@ -5,7 +5,7 @@ import { config } from 'dotenv';
 import { WebSocket } from 'partysocket';
 import { defineCommand, runMain } from 'citty';
 import { http } from './transport.mjs';
-import { c as createLogger, v as version, g as name } from './shared/univo.Br975GsZ.mjs';
+import { c as createLogger, v as version, f as name } from './shared/univo.DfCC9G2B.mjs';
 import './shared/univo.C0flyVee.mjs';
 
 const log = createLogger({ quiet: false });

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { c as createLogger, d as decompress, a as decoder, h as hexToNumber, i as isHexEqual, r as retry, v as version, n as nonNullable, b as normalizeHex } from './shared/univo.Br975GsZ.mjs';
+import { c as createLogger, d as decompress, a as decoder, h as hexToNumber, i as isHexEqual, r as retry, v as version, n as normalizeHex } from './shared/univo.DfCC9G2B.mjs';
 import { c as createException, g as getException, a as catchException } from './shared/univo.C0flyVee.mjs';
 
 function matchFilter(block, filter) {
@@ -129,6 +129,7 @@ function indexer(opts) {
     }
     return block;
   }
+  const GetBlockError = createException("Failed to load block from the provided `getBlock` function");
   const public_getFinalizedHeight = async (chain) => {
     const [[stored], finalizedBlock] = await Promise.all([
       metadata.blocks.list({ chain }),
@@ -147,26 +148,43 @@ function indexer(opts) {
     return Math.min(indexerHeight, finalizedHeight);
   };
   const public_writeUnfinalizedHeads = async (heads) => {
+    if (heads.length === 0) {
+      return log.debug("No heads received, returning...");
+    }
     let chain = void 0;
     for (const head of heads) {
       if (chain === void 0) {
         chain = head.chain;
       }
       if (!isHexEqual(chain, head.chain)) {
-        throw new Error(MultipleChainsError);
+        throw new Error("Received heads from separate chains");
       }
     }
     if (chain === void 0) {
-      return;
+      throw new Error("Internal error. Expected chain to be defined after checking heads length");
     }
     log.debug(`Received ${heads.length} unfinalized heads...`);
     const blocks_start = Date.now();
-    const blocks_nullable = await Promise.all(
-      heads.map(async (head) => {
+    const [finalizedBlock, ...blocks_nullable] = await Promise.all([
+      getBlock({ chain, number: "finalized" }),
+      ...heads.map(async (head) => {
         return await getBlock({ chain, number: head.number, hash: head.hash });
       })
-    );
-    const blocks = blocks_nullable.filter(nonNullable);
+    ]);
+    if (finalizedBlock === null) {
+      log.debug("Failed to determine finalized height when processing unfinalized heads");
+      throw new Error(GetBlockError);
+    }
+    const finalizedHeight = hexToNumber(finalizedBlock.eth_getBlockByNumber.number);
+    const blocks = blocks_nullable.flatMap((block) => {
+      if (block === null) {
+        return [];
+      }
+      if (hexToNumber(block.eth_getBlockByNumber.number) <= finalizedHeight) {
+        return [];
+      }
+      return block;
+    });
     if (blocks.length === 0) {
       return log.debug("All blocks failed to load, aborting early...");
     }
@@ -259,7 +277,7 @@ function indexer(opts) {
         chain = head.chain;
       }
       if (!isHexEqual(chain, head.chain)) {
-        throw new Error(MultipleChainsError);
+        throw new Error("Received heads from separate chains");
       }
     }
     if (chain === void 0) {
@@ -272,17 +290,15 @@ function indexer(opts) {
     let previousHead = firstHead;
     for (const head of remainingHeads) {
       if (hexToNumber(head.number) !== hexToNumber(previousHead.number) + 1) {
-        log.debug("Found invalid block number in received heads, aborting...");
-        throw new Error(InvalidHeadsError);
+        throw new Error("Found invalid block number in received heads, aborting...");
       }
       if (!isHexEqual(head.parentHash, previousHead.hash)) {
-        log.debug("Found invalid block hash in received heads, aborting...");
-        throw new Error(InvalidHeadsError);
+        throw new Error("Found invalid block hash in received heads, aborting...");
       }
       previousHead = head;
     }
-    const [indexerHeight, finalizedBlock] = await Promise.all([
-      public_getFinalizedHeight(chain),
+    const [[unfinalizedMetadataBlock], finalizedBlock] = await Promise.all([
+      metadata.blocks.list({ chain }),
       //
       getBlock({ chain, number: "finalized" })
     ]);
@@ -293,16 +309,27 @@ function indexer(opts) {
     const finalizedHeight = hexToNumber(finalizedBlock.eth_getBlockByNumber.number);
     for (const head of heads) {
       if (hexToNumber(head.number) > finalizedHeight) {
-        throw new Error(InvalidHeadsError);
+        throw new Error("Received head greater than chain finalized height");
       }
     }
+    if (unfinalizedMetadataBlock === void 0) {
+      return log.debug("No heads to finalize, returning...");
+    }
+    const indexerHeight = hexToNumber(unfinalizedMetadataBlock.number) - 1;
     log.debug(`Indexer height ${indexerHeight}, finalized height ${finalizedHeight}`);
+    if (indexerHeight === finalizedHeight) {
+      return log.debug("No heads to finalize, returning...");
+    }
     const newHeads = heads.filter((head) => {
       return hexToNumber(head.number) > indexerHeight;
     });
-    if (newHeads.length === 0) {
+    const [firstNewHead] = newHeads;
+    if (firstNewHead === void 0) {
       return log.debug("No new heads received, returning...");
     }
+    if (hexToNumber(firstNewHead.number) !== indexerHeight + 1) {
+      throw new Error("Client advanced too far. Heads received are greater than the indexer height");
+    }
     for (const head of newHeads) {
       const processed = await metadata.blocks.get({ chain: head.chain, number: head.number });
       if (processed.length === 0) {
@@ -328,7 +355,7 @@ function indexer(opts) {
       block = await getBlock({ chain: head.chain, number: head.number, hash: head.hash });
     }
     if (block === null) {
-      throw new Error(InvalidHeadsError);
+      throw new Error("Received unknown head that wasn't canonical");
     }
     const promises = events_grouped_by_storage_map.entries().map(async ([storage, grouped_events]) => {
       const batch = [];
@@ -453,6 +480,7 @@ function indexer(opts) {
     };
     return new Proxy(value, createProxyHandler());
   };
+  const IncompleteBlockError = createException("Received block with missing required property");
   const private_writeEvents = async (params) => {
     if (all_events.length === 0) return { failures: [] };
     const relevant_events = all_events.filter((event2) => params.events.includes(event2.id));
@@ -644,6 +672,7 @@ function indexer(opts) {
     events_grouped_by_storage_map.set(event2.storage, group);
     return event2;
   };
+  const UnknownMethodError = createException("The requested method does not exist");
   const handler = async (req) => {
     let body_buffer;
     try {
@@ -710,6 +739,7 @@ function indexer(opts) {
     } catch (error) {
       const message = getException(error);
       if (message) {
+        log.error(message);
         return Response.json(
           { jsonrpc: "2.0", id: json.id, error: { code: 0, message } },
           //
@@ -728,10 +758,5 @@ function indexer(opts) {
   };
   return { fetch: handler, event };
 }
-const InvalidHeadsError = createException("Received invalid finalized heads");
-const UnknownMethodError = createException("The requested method does not exist");
-const MultipleChainsError = createException("Received heads from separate chains");
-const IncompleteBlockError = createException("Received block with missing required property");
-const GetBlockError = createException("Failed to load block from the provided `getBlock` function");
 
 export { indexer, matchFilter };

package/dist/realtime.mjs

@@ -1,4 +1,4 @@
-import { c as createLogger, e as iife, h as hexToNumber, f as numberToHex, m as mutex, r as retry, i as isHexEqual } from './shared/univo.Br975GsZ.mjs';
+import { c as createLogger, b as iife, h as hexToNumber, e as numberToHex, m as mutex, r as retry, i as isHexEqual } from './shared/univo.DfCC9G2B.mjs';
 
 const MAX_LENGTH = 1e4;
 function defineBlockchain(opts) {
@@ -160,6 +160,7 @@ function realtime(opts) {
     let indexerHeight = initialIndexerHeight;
     const poll = async () => {
       try {
+        log.debug("Polling for finalized height...");
         const finalizedBlock = await opts.node.request({
           method: "eth_getBlockByNumber",
           params: ["finalized", false]

package/dist/shared/{univo.Br975GsZ.mjs → univo.DfCC9G2B.mjs}

@@ -1,5 +1,5 @@
 const name = "univo";
-const version = "0.2.8";
+const version = "0.2.10";
 
 function createLogger(opts) {
   let prefix = `[${name}@${version}]`;
@@ -73,9 +73,6 @@ function raise(...args) {
   if (args[0] instanceof Error) throw args[0];
   throw new Error(...args);
 }
-function nonNullable(value) {
-  return value !== null && value !== void 0;
-}
 async function compress(input) {
   const compressed = new Blob([input]).stream().pipeThrough(new CompressionStream("gzip"));
   return new Response(compressed).arrayBuffer();
@@ -92,4 +89,4 @@ const normalizeHex = (hex, length) => {
   return `0x${hex.slice(2).toLowerCase().padStart(length, "0")}`;
 };
 
-export { decoder as a, normalizeHex as b, createLogger as c, decompress as d, iife as e, numberToHex as f, name as g, hexToNumber as h, isHexEqual as i, compress as j, raise as k, mutex as m, nonNullable as n, retry as r, version as v };
+export { decoder as a, iife as b, createLogger as c, decompress as d, numberToHex as e, name as f, compress as g, hexToNumber as h, isHexEqual as i, raise as j, mutex as m, normalizeHex as n, retry as r, version as v };

package/dist/transport.d.mts

@@ -2,8 +2,8 @@ import { Rpc } from './rpc.mjs';
 import './index.mjs';
 import 'unstorage';
 
-type Protcol = "http" | "wss";
-type Transport<R extends Rpc, P extends Protcol = Protcol> = {
+type Protocol = "http" | "wss";
+type Transport<R extends Rpc, P extends Protocol = Protocol> = {
     /**
      * The underlying transport protocol.
      */

package/dist/transport.d.ts

@@ -2,8 +2,8 @@ import { Rpc } from './rpc.js';
 import './index.js';
 import 'unstorage';
 
-type Protcol = "http" | "wss";
-type Transport<R extends Rpc, P extends Protcol = Protcol> = {
+type Protocol = "http" | "wss";
+type Transport<R extends Rpc, P extends Protocol = Protocol> = {
     /**
      * The underlying transport protocol.
      */

package/dist/transport.mjs

@@ -1,7 +1,7 @@
 import ws from 'ws';
 import { WebSocket } from 'partysocket';
 import { c as createException } from './shared/univo.C0flyVee.mjs';
-import { j as compress, k as raise, c as createLogger } from './shared/univo.Br975GsZ.mjs';
+import { g as compress, j as raise, c as createLogger } from './shared/univo.DfCC9G2B.mjs';
 
 function createSocket(url, opts) {
   const socket = new WebSocket(url, [], { WebSocket: ws });
@@ -26,7 +26,9 @@ function wss(url, opts = {}) {
       logger.error(new Error("Socket error", { cause }));
     },
     async onOpen() {
-      if (subscriptions.size === 0) return;
+      if (subscriptions.size === 0) {
+        return;
+      }
       const params2 = [];
       for (const [id2, subscription] of subscriptions) {
         params2.push(subscription.param);
@@ -74,13 +76,24 @@ function wss(url, opts = {}) {
     }
   });
   const request = async (opts2) => {
-    return await new Promise((resolve) => {
+    return await new Promise((resolve, reject) => {
       const body = Object.assign({ id: id++ }, opts2);
+      const timeout = setTimeout(() => {
+        requests.delete(body.id);
+        reject(new Error("wss request timed out after 30 seconds"));
+      }, 30 * 1e3);
       requests.set(body.id, (data) => {
+        clearTimeout(timeout);
         requests.delete(body.id);
         resolve(data);
       });
-      socket.send(JSON.stringify(body));
+      try {
+        socket.send(JSON.stringify(body));
+      } catch (cause) {
+        clearTimeout(timeout);
+        requests.delete(body.id);
+        reject(new Error(ClientConnectionError, { cause }));
+      }
     });
   };
   const subscribe = async (param, handler) => {
@@ -148,7 +161,7 @@ function http(url, opts = {}) {
       headers.set("Content-Encoding", "gzip");
       headers.set("Authorization", `Bearer ${opts.signingKey}`);
     }
-    const res = await fetch(url, { headers, body, method: "POST" }).catch((cause) => {
+    const res = await fetch(url, { headers, body, method: "POST", signal: AbortSignal.timeout(30 * 1e3) }).catch((cause) => {
       throw new Error(ClientConnectionError, { cause });
     });
     const json = await res.json().catch((cause) => {

package/package.json

@@ -2,7 +2,7 @@
 	"name": "univo",
 	"license": "MIT",
 	"type": "module",
-	"version": "0.2.8",
+	"version": "0.2.10",
 	"sideEffects": false,
 	"module": "./dist/index.mjs",
 	"types": "./dist/index.d.ts",