univo 0.4.3 → 0.4.4

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-export { A as Action, B as Block, E as Event, F as Filter, H as Head, e as Indexer, f as PrivateMetadata, P as PublicMetadata, g as Result, c as defineAction, a as defineEvent, d as defineIndexer } from './shared/univo.Ckj3I8tQ.mjs';
+export { A as Action, B as Block, E as Event, F as Filter, H as Head, e as Indexer, f as PrivateMetadata, P as PublicMetadata, g as Result, c as defineAction, a as defineEvent, d as defineIndexer } from './shared/univo.Cwz0D-bk.mjs';
 import 'viem';
 import './metadata.mjs';
 import './metadata/adapters.mjs';

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { A as Action, B as Block, E as Event, F as Filter, H as Head, e as Indexer, f as PrivateMetadata, P as PublicMetadata, g as Result, c as defineAction, a as defineEvent, d as defineIndexer } from './shared/univo.7S1OTdpc.js';
+export { A as Action, B as Block, E as Event, F as Filter, H as Head, e as Indexer, f as PrivateMetadata, P as PublicMetadata, g as Result, c as defineAction, a as defineEvent, d as defineIndexer } from './shared/univo.BL1Gu6sU.js';
 import 'viem';
 import './metadata.js';
 import './metadata/adapters.js';

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { hexToNumber, numberToHex, hexToBytes, keccak256, toRlp, hexToBigInt, numberToBytes, isHex, concatBytes, concatHex, formatTransaction, serializeTransaction } from 'viem';
 import { local } from './transport.mjs';
-import { c as createLogger, r as retry, v as version, d as normalizeHex, e as decompress, a as isHexEqual, b as compress, i as iife, f as decoder } from './shared/univo.DEUuEEoe.mjs';
+import { c as createLogger, r as retry, v as version, n as normalizeHex, d as decompress, b as isHexEqual, a as compress, i as iife, e as decoder } from './shared/univo.DAgQmcSe.mjs';
 import { AdapterError } from './metadata/adapters.mjs';
 import 'ws';
 import 'partysocket';
@@ -1084,30 +1084,37 @@ function defineIndexer(opts) {
   const IncompleteBlockError = createException("Received block with missing required property");
   const private_writeEvents = async (params) => {
     if (allEvents.length === 0) {
-      return { failures: [] };
+      return { results: [] };
     }
     const relevantEvents = allEvents.filter((event) => params.events.includes(event.id));
     if (relevantEvents.length === 0) {
-      return { failures: [] };
+      return { results: [] };
     }
     if (params.events.length === 0) {
-      return { failures: [] };
+      return { results: [] };
     }
-    const failures = {};
+    const results = {};
     let accessedUndefinedKey = false;
     const proxiedBlocks = getWriteEventsProxy(params.blocks, () => {
       accessedUndefinedKey = true;
       throw new Error(IncompleteBlockError);
     });
-    const promises = eventsGroupedByStorageMap.entries().map(async ([storage, grouped_events]) => {
+    const promises = eventsGroupedByStorageMap.entries().map(async ([storage, groupedEvents]) => {
+      const requestedEvents = groupedEvents.filter((event) => params.events.includes(event.id));
       const batch = [];
-      for (const event of grouped_events) {
-        if (!params.events.includes(event.id)) {
-          continue;
-        }
+      for (const event of requestedEvents) {
         for (const block of proxiedBlocks) {
           try {
             if (!event.filters.some((filter) => matchFilter(block, filter))) {
+              results[event.id + block.eth_getBlockByNumber.number] ??= {
+                status: "ignored",
+                event_id: event.id,
+                chain: block.eth_chainId,
+                hash: block.eth_getBlockByNumber.hash,
+                number: block.eth_getBlockByNumber.number,
+                parent_hash: block.eth_getBlockByNumber.parentHash,
+                created_at: Date.now()
+              };
               continue;
             }
             const events = event.handler(block);
@@ -1124,7 +1131,7 @@ function defineIndexer(opts) {
                 log.error(error.message);
               }
             }
-            failures[event.id + block.eth_getBlockByNumber.number] ??= {
+            results[event.id + block.eth_getBlockByNumber.number] ??= {
               status,
               event_id: event.id,
               chain: block.eth_chainId,
@@ -1136,47 +1143,51 @@ function defineIndexer(opts) {
           }
         }
       }
-      if (batch.length === 0) {
-        return;
-      }
-      const start = Date.now();
-      try {
-        await retry(() => storage.upsert(batch), 2);
-        if (accessedUndefinedKey) {
-          throw new Error(IncompleteBlockError);
-        }
-      } catch (error) {
-        const status = catchException(error, IncompleteBlockError) ? "incomplete_error" : "upsert_error";
-        if (status === "upsert_error") {
-          if (error instanceof Error) {
-            log.error(error.message);
+      if (batch.length > 0) {
+        try {
+          await retry(() => storage.upsert(batch), 2);
+          if (accessedUndefinedKey) {
+            throw new Error(IncompleteBlockError);
           }
-        }
-        for (const event of relevantEvents) {
-          for (const block of proxiedBlocks) {
-            if (!event.filters.some((filter) => matchFilter(block, filter))) {
-              continue;
+        } catch (error) {
+          const status = catchException(error, IncompleteBlockError) ? "incomplete_error" : "upsert_error";
+          if (status === "upsert_error") {
+            if (error instanceof Error) {
+              log.error(error.message);
+            }
+          }
+          for (const event of requestedEvents) {
+            for (const block of proxiedBlocks) {
+              results[event.id + block.eth_getBlockByNumber.number] ??= {
+                status,
+                event_id: event.id,
+                chain: block.eth_chainId,
+                hash: block.eth_getBlockByNumber.hash,
+                number: block.eth_getBlockByNumber.number,
+                parent_hash: block.eth_getBlockByNumber.parentHash,
+                created_at: Date.now()
+              };
             }
-            failures[event.id + block.eth_getBlockByNumber.number] ??= {
-              status,
-              event_id: event.id,
-              chain: block.eth_chainId,
-              hash: block.eth_getBlockByNumber.hash,
-              number: block.eth_getBlockByNumber.number,
-              parent_hash: block.eth_getBlockByNumber.parentHash,
-              created_at: Date.now()
-            };
           }
         }
       }
-      const stop = Date.now() - start;
-      for (const event of relevantEvents) {
-        log.debug(`Recorded ${batch.length} ${event.id} in ${stop}ms`);
+      for (const event of requestedEvents) {
+        for (const block of proxiedBlocks) {
+          results[event.id + block.eth_getBlockByNumber.number] ??= {
+            status: "ok",
+            event_id: event.id,
+            chain: block.eth_chainId,
+            hash: block.eth_getBlockByNumber.hash,
+            number: block.eth_getBlockByNumber.number,
+            parent_hash: block.eth_getBlockByNumber.parentHash,
+            created_at: Date.now()
+          };
+        }
       }
     });
     await Promise.all(promises);
-    const failuresArray = Object.values(failures);
-    return { failures: failuresArray };
+    const resultsArray = Object.values(results);
+    return { results: resultsArray };
   };
   const private_writeEventsAndGetKeys = async (params) => {
     if (allEvents.length === 0) {

package/dist/proxy.d.mts

@@ -1,4 +1,4 @@
-import { T as Transport, I as IndexerRpc } from './shared/univo.Ckj3I8tQ.mjs';
+import { T as Transport, I as IndexerRpc } from './shared/univo.Cwz0D-bk.mjs';
 import 'viem';
 import './metadata.mjs';
 import './metadata/adapters.mjs';

package/dist/proxy.d.ts

@@ -1,4 +1,4 @@
-import { T as Transport, I as IndexerRpc } from './shared/univo.7S1OTdpc.js';
+import { T as Transport, I as IndexerRpc } from './shared/univo.BL1Gu6sU.js';
 import 'viem';
 import './metadata.js';
 import './metadata/adapters.js';

package/dist/proxy.mjs

@@ -1,4 +1,4 @@
-import { c as createLogger } from './shared/univo.DEUuEEoe.mjs';
+import { c as createLogger } from './shared/univo.DAgQmcSe.mjs';
 
 function http(opts) {
   const log = createLogger({ quiet: opts.quiet, prefix: "[proxy]" });

package/dist/realtime.d.mts

@@ -1,4 +1,4 @@
-import { T as Transport, R as Rpc, I as IndexerRpc } from './shared/univo.Ckj3I8tQ.mjs';
+import { T as Transport, R as Rpc, I as IndexerRpc } from './shared/univo.Cwz0D-bk.mjs';
 import 'viem';
 import './metadata.mjs';
 import './metadata/adapters.mjs';

package/dist/realtime.d.ts

@@ -1,4 +1,4 @@
-import { T as Transport, R as Rpc, I as IndexerRpc } from './shared/univo.7S1OTdpc.js';
+import { T as Transport, R as Rpc, I as IndexerRpc } from './shared/univo.BL1Gu6sU.js';
 import 'viem';
 import './metadata.js';
 import './metadata/adapters.js';

package/dist/realtime.mjs

@@ -1,5 +1,5 @@
 import { hexToNumber } from 'viem';
-import { c as createLogger, i as iife, m as mutex, l as lifecycle, q as queue, r as retry, a as isHexEqual } from './shared/univo.DEUuEEoe.mjs';
+import { c as createLogger, i as iife, m as mutex, l as lifecycle, q as queue, r as retry, b as isHexEqual } from './shared/univo.DAgQmcSe.mjs';
 
 function defineBlockchain(opts) {
   const log = createLogger({ quiet: opts.quiet });

package/dist/rpc.d.mts

@@ -1,4 +1,4 @@
-export { I as IndexerRpc, R as Rpc } from './shared/univo.Ckj3I8tQ.mjs';
+export { I as IndexerRpc, R as Rpc } from './shared/univo.Cwz0D-bk.mjs';
 import 'viem';
 import './metadata.mjs';
 import './metadata/adapters.mjs';

package/dist/rpc.d.ts

@@ -1,4 +1,4 @@
-export { I as IndexerRpc, R as Rpc } from './shared/univo.7S1OTdpc.js';
+export { I as IndexerRpc, R as Rpc } from './shared/univo.BL1Gu6sU.js';
 import 'viem';
 import './metadata.js';
 import './metadata/adapters.js';

package/dist/shared/{univo.7S1OTdpc.d.ts → univo.BL1Gu6sU.d.ts}

@@ -51,13 +51,13 @@ type IndexerRpc = {
         private_getMetadata: () => Promise<PrivateMetadata>;
         /**
          * Accepts a list of events and a batch of minified block data and writes to storage
-         * @returns A list of failures that occured for each event and block pair
+         * @returns A list of results indicating the status of each processed block
          */
         private_writeEvents: (params: {
             events: string[];
             blocks: Block[];
         }) => Promise<{
-            failures: Result[];
+            results: Result[];
         }>;
         /**
          * Accepts a block head and writes events to storage

package/dist/shared/{univo.Ckj3I8tQ.d.mts → univo.Cwz0D-bk.d.mts}

@@ -51,13 +51,13 @@ type IndexerRpc = {
         private_getMetadata: () => Promise<PrivateMetadata>;
         /**
          * Accepts a list of events and a batch of minified block data and writes to storage
-         * @returns A list of failures that occured for each event and block pair
+         * @returns A list of results indicating the status of each processed block
          */
         private_writeEvents: (params: {
             events: string[];
             blocks: Block[];
         }) => Promise<{
-            failures: Result[];
+            results: Result[];
         }>;
         /**
          * Accepts a block head and writes events to storage

package/dist/shared/{univo.DEUuEEoe.mjs → univo.DAgQmcSe.mjs}

@@ -1,5 +1,5 @@
 const name = "univo";
-const version = "0.4.3";
+const version = "0.4.4";
 
 function createLogger(opts) {
   const noop = (..._) => {
@@ -159,4 +159,4 @@ const normalizeHex = (hex, length) => {
   return `0x${hex.slice(2).toLowerCase().padStart(length, "0")}`;
 };
 
-export { isHexEqual as a, compress as b, createLogger as c, normalizeHex as d, decompress as e, decoder as f, iife as i, lifecycle as l, mutex as m, name as n, queue as q, retry as r, version as v };
+export { compress as a, isHexEqual as b, createLogger as c, decompress as d, decoder as e, iife as i, lifecycle as l, mutex as m, normalizeHex as n, queue as q, retry as r, version as v };

package/dist/transport.d.mts

@@ -1,4 +1,4 @@
-export { T as Transport, b as browser, h as http, l as local, w as wss } from './shared/univo.Ckj3I8tQ.mjs';
+export { T as Transport, b as browser, h as http, l as local, w as wss } from './shared/univo.Cwz0D-bk.mjs';
 import 'viem';
 import './metadata.mjs';
 import './metadata/adapters.mjs';

package/dist/transport.d.ts

@@ -1,4 +1,4 @@
-export { T as Transport, b as browser, h as http, l as local, w as wss } from './shared/univo.7S1OTdpc.js';
+export { T as Transport, b as browser, h as http, l as local, w as wss } from './shared/univo.BL1Gu6sU.js';
 import 'viem';
 import './metadata.js';
 import './metadata/adapters.js';

package/dist/transport.mjs

@@ -1,6 +1,6 @@
 import ws from 'ws';
 import { WebSocket } from 'partysocket';
-import { b as compress, c as createLogger, m as mutex } from './shared/univo.DEUuEEoe.mjs';
+import { c as createLogger, m as mutex, a as compress } from './shared/univo.DAgQmcSe.mjs';
 
 const DEFAULT_TIMEOUT_MS = 60 * 1e3;
 function local(rpc) {

package/package.json

@@ -2,13 +2,10 @@
 	"name": "univo",
 	"license": "MIT",
 	"type": "module",
-	"version": "0.4.3",
+	"version": "0.4.4",
 	"sideEffects": false,
 	"module": "./dist/index.mjs",
 	"types": "./dist/index.d.ts",
-	"bin": {
-		"univo": "dist/cli.mjs"
-	},
 	"exports": {
 		".": {
 			"types": "./dist/index.d.ts",
@@ -60,15 +57,11 @@
 	],
 	"scripts": {
 		"test": "vitest",
-		"build": "unbuild",
-		"univo": "NODE_ENV=production LOG_LEVEL=DEBUG jiti ./src/cli"
+		"build": "unbuild"
 	},
 	"dependencies": {
 		"aws4fetch": "1.0.20",
-		"citty": "^0.1.6",
-		"dotenv": "^17.2.2",
 		"fast-xml-parser": "5.11.1",
-		"open": "^10.2.0",
 		"partysocket": "^1.1.3",
 		"ws": "^8.18.1"
 	},
@@ -77,7 +70,7 @@
 		"@types/node": "^20.11.27",
 		"@types/ws": "^8.18.1",
 		"changelogen": "^0.6.1",
-		"jiti": "^2.4.2",
+		"dotenv": "^17.2.2",
 		"msw": "^2.10.2",
 		"typescript": "^5.8.2",
 		"unbuild": "^3.5.0",

package/dist/cli.d.mts

@@ -1 +0,0 @@
-

package/dist/cli.d.ts

@@ -1 +0,0 @@
-

package/dist/cli.mjs

@@ -1,79 +0,0 @@
-#!/usr/bin/env node
-import ws from 'ws';
-import open from 'open';
-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, n as name } from './shared/univo.DEUuEEoe.mjs';
-
-const log = createLogger({ quiet: false });
-const dev = defineCommand({
-  args: {
-    url: {
-      required: true,
-      type: "positional",
-      description: "Endpoint url like http://localhost:3000"
-    }
-  },
-  async run(ctx) {
-    try {
-      if (!ctx.args.url.startsWith("http://")) {
-        throw new Error("`url` must start with http://");
-      }
-      config({ quiet: true });
-      const localSigningKey = process.env.UNIVO_SIGNING_KEY;
-      if (localSigningKey === void 0) {
-        throw new Error("Please provide a UNIVO_SIGNING_KEY environment variable");
-      }
-      const client = http(ctx.args.url, { signingKey: localSigningKey });
-      await client.request({ method: "private_getMetadata", params: [] }).catch(() => {
-        throw new Error(`Failed to connect to ${ctx.args.url}. Check that your server is running on the correct port.`);
-      });
-      const remoteSigningKey = crypto.randomUUID();
-      const url = `https://tunnel-univo.app/v1/${crypto.randomUUID()}`;
-      const endpoint = {
-        url,
-        signing_key: remoteSigningKey
-      };
-      const encoder = new TextEncoder();
-      const data = encoder.encode(JSON.stringify(endpoint));
-      const encoded = data.toBase64({ alphabet: "base64url", omitPadding: true });
-      await open(`https://univo.app/dev/${encoded}`);
-      const ws$1 = new WebSocket(url, [], { WebSocket: ws });
-      ws$1.binaryType = "arraybuffer";
-      ws$1.onerror = (event) => {
-        log.error(event.message);
-      };
-      ws$1.onopen = () => {
-        log.info(`Dev server started for ${ctx.args.url}`);
-      };
-      ws$1.onclose = () => {
-        log.info(`Dev server closed for ${ctx.args.url}`);
-      };
-      ws$1.onmessage = async (event) => {
-        try {
-          const json = JSON.parse(event.data);
-          log.debug(`Received request (${json.id}) for method '${json.method}'`);
-          const result = await client.request({ method: json.method, params: json.params });
-          ws$1.send(JSON.stringify({ jsonrpc: "2.0", id: json.id, result }));
-        } catch {
-          ws$1.send(JSON.stringify({ jsonrpc: "2.0", id: null, error: { code: 0, message: "Invalid request" } }));
-        }
-      };
-    } catch (error) {
-      if (error instanceof Error) {
-        return log.error(error.message);
-      }
-      throw error;
-    }
-  }
-});
-const main = defineCommand({
-  subCommands: { dev },
-  meta: { name, version }
-});
-runMain(main).catch((error) => {
-  if (error instanceof Error) log.error(error.message);
-  process.exit(1);
-});