univo 0.2.16 → 0.2.18

package/dist/cli.mjs

@@ -4,8 +4,8 @@ import open from 'open';
 import { config } from 'dotenv';
 import { WebSocket } from 'partysocket';
 import { defineCommand, runMain } from 'citty';
-import { h as http } from './shared/univo.CkhykU8v.mjs';
-import { c as createLogger, v as version, b as name } from './shared/univo.BVikUbk_.mjs';
+import { h as http } from './shared/univo.GuW0GiSl.mjs';
+import { c as createLogger, v as version, b as name } from './shared/univo.TYA11b8i.mjs';
 
 const log = createLogger({ quiet: false });
 const dev = defineCommand({

package/dist/index.d.mts

@@ -1,2 +1,2 @@
-export { B as Block, E as Event, a as Filter, H as Head, I as Indexer, M as Metadata, R as Result, i as indexer } from './shared/univo.DdHfpTWq.mjs';
+export { B as Block, E as Event, a as Filter, H as Head, I as Indexer, M as Metadata, R as Result, i as indexer } from './shared/univo.BNqa7KED.mjs';
 import '@storagesdk/core';

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export { B as Block, E as Event, a as Filter, H as Head, I as Indexer, M as Metadata, R as Result, i as indexer } from './shared/univo.DdHfpTWq.js';
+export { B as Block, E as Event, a as Filter, H as Head, I as Indexer, M as Metadata, R as Result, i as indexer } from './shared/univo.BNqa7KED.js';
 import '@storagesdk/core';

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { StorageError } from '@storagesdk/core';
-import { g as getException, c as createException, a as catchException, l as local } from './shared/univo.CkhykU8v.mjs';
-import { c as createLogger, d as decompress, e as decoder, r as retry, v as version, h as hexToNumber, a as isHexEqual, f as normalizeHex, g as compress } from './shared/univo.BVikUbk_.mjs';
+import { g as getException, c as createException, a as catchException, l as local } from './shared/univo.GuW0GiSl.mjs';
+import { c as createLogger, d as decompress, e as decoder, r as retry, v as version, h as hexToNumber, a as isHexEqual, f as normalizeHex, g as compress } from './shared/univo.TYA11b8i.mjs';
 import 'ws';
 import 'partysocket';
 
@@ -309,86 +309,6 @@ function indexer(opts) {
     await Promise.all(promises);
     log.debug(`Wrote head in ${Date.now() - events_start}ms`);
   };
-  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("Received heads from separate chains");
-      }
-    }
-    if (chain === void 0) {
-      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 [finalizedBlock, ...blocks_nullable] = await Promise.all([
-      getBlock({ chain, number: "finalized" }),
-      ...heads.map(async (head) => {
-        return await getBlock({ chain, number: head.number, hash: head.hash });
-      })
-    ]);
-    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...");
-    }
-    log.debug(`Loaded ${blocks.length} block(s) in ${Date.now() - blocks_start}ms`);
-    await metadata.blocks.upsert(blocks);
-    log.debug(`Recorded ${blocks.length} block(s) to metadata storage`);
-    const events_start = Date.now();
-    const promises = events_grouped_by_storage_map.entries().map(async ([storage, grouped_events]) => {
-      const batch = [];
-      for (const block of blocks) {
-        for (const event2 of grouped_events) {
-          try {
-            if (!event2.filters.some((filter) => matchFilter(block, filter))) {
-              log.debug(`Block matches no filters for event ${event2.id}`);
-              continue;
-            }
-            const events = event2.handler(block);
-            for (const event3 of events) {
-              batch.push(event3);
-            }
-          } catch (error) {
-            log.error(`Failed to run your 'handler' for event ${event2.id}`);
-            throw error;
-          }
-        }
-      }
-      if (batch.length > 0) {
-        const start = Date.now();
-        await retry(() => storage.upsert(batch), 2).catch((error) => {
-          for (const event2 of grouped_events) {
-            log.error(`Failed to run your 'upsert' handler for event ${event2.id}`);
-          }
-          throw error;
-        });
-        for (const event2 of grouped_events) {
-          log.debug(`Recorded ${batch.length} ${event2.id} in ${Date.now() - start}ms`);
-        }
-      }
-    });
-    await Promise.all(promises);
-    log.debug(`Wrote ${heads.length} heads in ${Date.now() - events_start}ms`);
-  };
   const public_deleteReorganisedHead = async (head) => {
     log.debug(`Received reorganised head ${hexToNumber(head.number)}`);
     const [canonical_block, stored_block] = await Promise.all([
@@ -404,10 +324,7 @@ function indexer(opts) {
     if (isHexEqual(head.hash, canonical_block.eth_getBlockByNumber.hash)) {
       throw new Error("Attempted to delete canonical block");
     }
-    const promises = all_events.map(async (event2) => {
-      if (event2.storage.delete === void 0) {
-        return;
-      }
+    const deletes = all_events.map(async (event2) => {
       const batch = [];
       try {
         const events = event2.handler(stored_block);
@@ -426,7 +343,33 @@ function indexer(opts) {
         throw error;
       });
     });
-    await Promise.all(promises);
+    await Promise.all(deletes);
+    const upserts = events_grouped_by_storage_map.entries().map(async ([storage, grouped_events]) => {
+      const batch = [];
+      for (const event2 of grouped_events) {
+        try {
+          if (!event2.filters.some((filter) => matchFilter(canonical_block, filter))) {
+            continue;
+          }
+          const events = event2.handler(canonical_block);
+          for (const event3 of events) {
+            batch.push(event3);
+          }
+        } catch (error) {
+          log.error(`Failed to run your 'handler' for event ${event2.id}`);
+          throw error;
+        }
+      }
+      if (batch.length > 0) {
+        await retry(() => storage.upsert(batch), 2).catch((error) => {
+          for (const event2 of grouped_events) {
+            log.error(`Failed to run your 'upsert' handler for event ${event2.id}`);
+          }
+          throw error;
+        });
+      }
+    });
+    await Promise.all(upserts);
   };
   const public_writeFinalizedHeads = async (heads) => {
     if (heads.length === 0) {
@@ -558,9 +501,6 @@ function indexer(opts) {
       return;
     }
     const promises = all_events.map(async (event2) => {
-      if (event2.storage.delete === void 0) {
-        return;
-      }
       const batch = [];
       try {
         for (const block of blocks) {
@@ -860,7 +800,6 @@ function indexer(opts) {
       public_getFinalizedHeight,
       public_writeFinalizedHeads,
       public_writeUnfinalizedHead,
-      public_writeUnfinalizedHeads,
       public_deleteReorganisedHead,
       private_getEvents,
       private_getMetadata,

package/dist/realtime.d.mts

@@ -1,6 +1,6 @@
 import { NodeRpc, IndexerRpc } from './rpc.mjs';
 import { Transport } from './transport.mjs';
-import './shared/univo.DdHfpTWq.mjs';
+import './shared/univo.BNqa7KED.mjs';
 import '@storagesdk/core';
 
 type RealtimeOptions = {

package/dist/realtime.d.ts

@@ -1,6 +1,6 @@
 import { NodeRpc, IndexerRpc } from './rpc.js';
 import { Transport } from './transport.js';
-import './shared/univo.DdHfpTWq.js';
+import './shared/univo.BNqa7KED.js';
 import '@storagesdk/core';
 
 type RealtimeOptions = {

package/dist/realtime.mjs

@@ -1,4 +1,4 @@
-import { c as createLogger, i as iife, h as hexToNumber, n as numberToHex, m as mutex, r as retry, a as isHexEqual } from './shared/univo.BVikUbk_.mjs';
+import { c as createLogger, i as iife, h as hexToNumber, n as numberToHex, m as mutex, r as retry, a as isHexEqual } from './shared/univo.TYA11b8i.mjs';
 
 function defineBlockchain(opts) {
   const log = createLogger({ quiet: opts.quiet });
@@ -97,31 +97,25 @@ function realtime(opts) {
       opts.node.request({ method: "eth_getBlockByNumber", params: ["latest", false] }),
       opts.indexer.request({ method: "public_getFinalizedHeight", params: [chain] })
     ]);
-    let pending = [];
     const latest = defineBlockchain({
       getBlockByHash,
       quiet: opts.quiet ?? false,
       onBlockAdded: async (head) => {
         try {
           log.debug("Received unfinalized head");
-          pending.push(head);
-          const heads = pending.map((head2) => ({ chain, ...head2 }));
-          await opts.indexer.request({ method: "public_writeUnfinalizedHeads", params: [heads] });
-          log.debug(`Delivered ${heads.length} unfinalized head(s)`);
-          pending = pending.filter((head2) => {
-            return !heads.some((_head) => {
-              return isHexEqual(head2.hash, _head.hash);
-            });
-          });
+          await retry(() => opts.indexer.request({ method: "public_writeUnfinalizedHead", params: [{ chain, ...head }] }), 2);
+          log.debug("Delivered unfinalized head");
         } catch (error) {
           if (error instanceof Error) {
-            log.warn(`Failed to write heads: ${error.message}`);
+            log.warn(`Failed to write unfinalized head: ${error.message}`);
           }
         }
       },
       onBlockReorganised: async (head) => {
         try {
+          log.debug("Received reorganised head");
           await retry(() => opts.indexer.request({ method: "public_deleteReorganisedHead", params: [{ chain, ...head }] }), 2);
+          log.debug("Delivered reorganised head");
         } catch (error) {
           if (error instanceof Error) {
             log.warn(`Failed to write reorganised head: ${error.message}`);

package/dist/rpc.d.mts

@@ -1,4 +1,4 @@
-import { H as Head, M as Metadata, F as Flatten, a as Filter, B as Block, R as Result } from './shared/univo.DdHfpTWq.mjs';
+import { H as Head, M as Metadata, F as Flatten, a as Filter, B as Block, R as Result } from './shared/univo.BNqa7KED.mjs';
 import '@storagesdk/core';
 
 type Rpc = {
@@ -58,10 +58,6 @@ type IndexerRpc = {
          * Accepts an unfinalized head and writes all events to storage
          */
         public_writeUnfinalizedHead: (head: Head) => Promise<void>;
-        /**
-         * Accepts a list of the latest block heads and writes all events to storage
-         */
-        public_writeUnfinalizedHeads: (heads: Head[]) => Promise<void>;
         /**
          * Accepts a chain of finalized heads and upserts canonical events and deletes reorganised events
          */

package/dist/rpc.d.ts

@@ -1,4 +1,4 @@
-import { H as Head, M as Metadata, F as Flatten, a as Filter, B as Block, R as Result } from './shared/univo.DdHfpTWq.js';
+import { H as Head, M as Metadata, F as Flatten, a as Filter, B as Block, R as Result } from './shared/univo.BNqa7KED.js';
 import '@storagesdk/core';
 
 type Rpc = {
@@ -58,10 +58,6 @@ type IndexerRpc = {
          * Accepts an unfinalized head and writes all events to storage
          */
         public_writeUnfinalizedHead: (head: Head) => Promise<void>;
-        /**
-         * Accepts a list of the latest block heads and writes all events to storage
-         */
-        public_writeUnfinalizedHeads: (heads: Head[]) => Promise<void>;
         /**
          * Accepts a chain of finalized heads and upserts canonical events and deletes reorganised events
          */

package/dist/shared/{univo.DdHfpTWq.d.mts → univo.BNqa7KED.d.mts}

@@ -106,7 +106,7 @@ type Event<TBlock, TEvent> = {
          * same batch of events created by that reorganised block. This ensures that any events that were previously
          * upserted into your storage system that are no longer part of the canonical chain are safely removed.
          */
-        delete?: (events: TEvent[]) => Promise<void>;
+        delete: (events: TEvent[]) => Promise<void>;
     };
 };
 /**
@@ -192,7 +192,6 @@ declare function indexer<TBlock extends Block>(opts: IndexerOptions<TBlock>): {
         public_getFinalizedHeight: (chain: `0x${string}`) => Promise<number>;
         public_deleteReorganisedHead: (head: Head) => Promise<void>;
         public_writeUnfinalizedHead: (head: Head) => Promise<void>;
-        public_writeUnfinalizedHeads: (heads: Head[]) => Promise<void>;
         public_writeFinalizedHeads: (heads: Head[]) => Promise<void>;
         private_getMetadata: () => Promise<Metadata>;
         private_getEvents: () => Promise<{

package/dist/shared/{univo.DdHfpTWq.d.ts → univo.BNqa7KED.d.ts}

@@ -106,7 +106,7 @@ type Event<TBlock, TEvent> = {
          * same batch of events created by that reorganised block. This ensures that any events that were previously
          * upserted into your storage system that are no longer part of the canonical chain are safely removed.
          */
-        delete?: (events: TEvent[]) => Promise<void>;
+        delete: (events: TEvent[]) => Promise<void>;
     };
 };
 /**
@@ -192,7 +192,6 @@ declare function indexer<TBlock extends Block>(opts: IndexerOptions<TBlock>): {
         public_getFinalizedHeight: (chain: `0x${string}`) => Promise<number>;
         public_deleteReorganisedHead: (head: Head) => Promise<void>;
         public_writeUnfinalizedHead: (head: Head) => Promise<void>;
-        public_writeUnfinalizedHeads: (heads: Head[]) => Promise<void>;
         public_writeFinalizedHeads: (heads: Head[]) => Promise<void>;
         private_getMetadata: () => Promise<Metadata>;
         private_getEvents: () => Promise<{

package/dist/shared/{univo.CkhykU8v.mjs → univo.GuW0GiSl.mjs}

@@ -1,6 +1,6 @@
 import ws from 'ws';
 import { WebSocket } from 'partysocket';
-import { g as compress, j as raise, c as createLogger } from './univo.BVikUbk_.mjs';
+import { g as compress, j as raise, c as createLogger } from './univo.TYA11b8i.mjs';
 
 function createException(message) {
   return `univo:${message}`;
@@ -22,6 +22,7 @@ function getException(unknown) {
   }
 }
 
+const DEFAULT_TIMEOUT = 60 * 1e3;
 const UnknownMethodError = createException("The requested RPC method does not exist on the provided implementation");
 function local(rpc) {
   const request = async (opts) => {
@@ -114,7 +115,7 @@ function wss(url, opts = {}) {
       const timeout = setTimeout(() => {
         requests.delete(body.id);
         reject(new Error("wss request timed out after 30 seconds"));
-      }, 30 * 1e3);
+      }, DEFAULT_TIMEOUT);
       requests.set(body.id, (data) => {
         clearTimeout(timeout);
         requests.delete(body.id);
@@ -194,7 +195,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", signal: AbortSignal.timeout(30 * 1e3) }).catch((cause) => {
+    const res = await fetch(url, { headers, body, method: "POST", signal: AbortSignal.timeout(DEFAULT_TIMEOUT) }).catch((cause) => {
       throw new Error(ClientConnectionError, { cause });
     });
     if (!res.ok || res.status < 200 || res.status >= 300) {

package/dist/shared/{univo.BVikUbk_.mjs → univo.TYA11b8i.mjs}

@@ -1,5 +1,5 @@
 const name = "univo";
-const version = "0.2.16";
+const version = "0.2.18";
 
 function createLogger(opts) {
   let prefix = `[${name}@${version}]`;

package/dist/transport.d.mts

@@ -1,5 +1,5 @@
 import { Rpc } from './rpc.mjs';
-import './shared/univo.DdHfpTWq.mjs';
+import './shared/univo.BNqa7KED.mjs';
 import '@storagesdk/core';
 
 type Protocol = "http" | "wss" | "local";

package/dist/transport.d.ts

@@ -1,5 +1,5 @@
 import { Rpc } from './rpc.js';
-import './shared/univo.DdHfpTWq.js';
+import './shared/univo.BNqa7KED.js';
 import '@storagesdk/core';
 
 type Protocol = "http" | "wss" | "local";

package/dist/transport.mjs

@@ -1,4 +1,4 @@
 import 'ws';
 import 'partysocket';
-export { h as http, l as local, w as wss } from './shared/univo.CkhykU8v.mjs';
-import './shared/univo.BVikUbk_.mjs';
+export { h as http, l as local, w as wss } from './shared/univo.GuW0GiSl.mjs';
+import './shared/univo.TYA11b8i.mjs';

package/package.json

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