univo 0.2.14 → 0.2.15

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.CzTm3CDN.mjs';
-import { c as createLogger, v as version, f as name } from './shared/univo.sqV2c2Yj.mjs';
+import { h as http } from './shared/univo.O0SoVQWh.mjs';
+import { c as createLogger, v as version, g as name } from './shared/univo.BgwFxZpJ.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, m as matchFilter } from './shared/univo.DcmLb3Hn.mjs';
-import 'unstorage';
+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, m as matchFilter } from './shared/univo.CjvLVVxo.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, m as matchFilter } from './shared/univo.DcmLb3Hn.js';
-import 'unstorage';
+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, m as matchFilter } from './shared/univo.CjvLVVxo.js';
+import '@storagesdk/core';

package/dist/index.mjs

@@ -1,5 +1,6 @@
-import { c as createException, a as catchException, l as local, g as getException } from './shared/univo.CzTm3CDN.mjs';
-import { c as createLogger, r as retry, v as version, h as hexToNumber, i as isHexEqual, d as decompress, a as decoder, n as normalizeHex } from './shared/univo.sqV2c2Yj.mjs';
+import { StorageError } from '@storagesdk/core';
+import { c as createException, a as catchException, l as local, g as getException } from './shared/univo.O0SoVQWh.mjs';
+import { c as createLogger, r as retry, v as version, h as hexToNumber, i as isHexEqual, d as decompress, a as decoder, n as normalizeHex, b as compress } from './shared/univo.BgwFxZpJ.mjs';
 import 'ws';
 import 'partysocket';
 
@@ -48,48 +49,61 @@ function indexer(opts) {
   const events_grouped_by_storage_map = /* @__PURE__ */ new Map();
   const metadata = {
     blocks: {
-      async list(head) {
-        let prefix = `/blocks/v1/${normalizeHex(head.chain)}`;
-        if (typeof head.number === "string") {
-          prefix += `/${normalizeHex(head.number, 16)}`;
+      async getNextUnfinalizedBlock(chain) {
+        const prefix = `blocks/v1/${normalizeHex(chain)}`;
+        const keys = await opts.metadataStorage.list({ prefix, limit: 1 });
+        const [key] = keys.items;
+        if (key === void 0) {
+          return null;
         }
-        const keys = await opts.metadataStorage.getKeys(prefix);
-        return keys.map((key) => {
-          const [__, ___, chain, number, hash] = key.split(":");
-          return { chain, number, hash };
-        });
+        const [_, __, ___, number, hash] = key.path.split("/");
+        return { chain, number, hash };
       },
-      async get(head) {
-        let prefix = `/blocks/v1/${head.chain.toLowerCase()}`;
-        if (typeof head.number === "string") {
-          prefix += `/${normalizeHex(head.number, 16)}`;
+      async getBlocksByNumber(chain, number) {
+        const prefix = `blocks/v1/${normalizeHex(chain)}/${normalizeHex(number, 16)}`;
+        const keys = await opts.metadataStorage.list({ prefix });
+        if (keys.items.length === 0) {
+          return [];
         }
-        if (typeof head.hash === "string") {
-          if (head.number === void 0) {
-            throw new Error("Requested block by hash without specifying a block number");
-          }
-          prefix += `/${head.hash.toLowerCase()}`;
-          const block = await opts.metadataStorage.getItem(prefix);
-          if (block === null) {
-            return [];
+        const blocks = await Promise.all(
+          keys.items.map(async (item) => {
+            const blob = await opts.metadataStorage.download(item.path, { as: "blob" });
+            const block = await decompress(blob);
+            const parsed = JSON.parse(block);
+            return parsed;
+          })
+        );
+        return blocks;
+      },
+      async getBlockByNumberAndHash(chain, number, hash) {
+        const prefix = `blocks/v1/${normalizeHex(chain)}/${normalizeHex(number, 16)}/${normalizeHex(hash)}`;
+        const blob = await opts.metadataStorage.download(prefix, { as: "blob" }).catch((error) => {
+          if (error instanceof StorageError) {
+            if (error.code === "NotFound") {
+              return null;
+            }
           }
-          return [block];
+          throw error;
+        });
+        if (blob === null) {
+          return null;
         }
-        const keys = await opts.metadataStorage.getKeys(prefix);
-        const results = await opts.metadataStorage.getItems(keys);
-        return results.map((result) => result.value);
+        const block = await decompress(blob);
+        const parsed = JSON.parse(block);
+        return parsed;
       },
       async upsert(blocks) {
         if (blocks.length === 0) {
           return;
         }
-        await opts.metadataStorage.setItems(
-          blocks.map((block) => {
+        await Promise.all(
+          blocks.map(async (block) => {
             const chain = normalizeHex(block.eth_chainId);
             const hash = normalizeHex(block.eth_getBlockByNumber.hash);
             const number = normalizeHex(block.eth_getBlockByNumber.number, 16);
-            const key = `/blocks/v1/${chain}/${number}/${hash}`;
-            return { key, value: block };
+            const prefix = `blocks/v1/${chain}/${number}/${hash}`;
+            const compressed = await compress(JSON.stringify(block));
+            await opts.metadataStorage.upload(prefix, compressed);
           })
         );
       },
@@ -102,7 +116,8 @@ function indexer(opts) {
             const chain = normalizeHex(block.eth_chainId);
             const hash = normalizeHex(block.eth_getBlockByNumber.hash);
             const number = normalizeHex(block.eth_getBlockByNumber.number, 16);
-            await opts.metadataStorage.del(`/blocks/v1/${chain}/${number}/${hash}`);
+            const prefix = `blocks/v1/${chain}/${number}/${hash}`;
+            await opts.metadataStorage.delete(prefix);
           })
         );
       }
@@ -133,8 +148,8 @@ function indexer(opts) {
   }
   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 }),
+    const [stored, finalizedBlock] = await Promise.all([
+      metadata.blocks.getNextUnfinalizedBlock(chain),
       //
       getBlock({ chain, number: "finalized" })
     ]);
@@ -143,7 +158,7 @@ function indexer(opts) {
       throw new Error(GetBlockError);
     }
     const finalizedHeight = hexToNumber(finalizedBlock.eth_getBlockByNumber.number);
-    if (stored === void 0) {
+    if (stored === null) {
       return finalizedHeight;
     }
     const indexerHeight = hexToNumber(stored.number) - 1;
@@ -231,11 +246,11 @@ function indexer(opts) {
   };
   const public_deleteReorganisedHead = async (head) => {
     log.debug(`Received reorganised head ${hexToNumber(head.number)}`);
-    const [canonical_block, [stored_block]] = await Promise.all([
+    const [canonical_block, stored_block] = await Promise.all([
       getBlock({ chain: head.chain, number: head.number }),
-      metadata.blocks.get({ chain: head.chain, number: head.number, hash: head.hash })
+      metadata.blocks.getBlockByNumberAndHash(head.chain, head.number, head.hash)
     ]);
-    if (stored_block === void 0) {
+    if (stored_block === null) {
       return log.debug("Reorganised block never/already processed");
     }
     if (canonical_block === null) {
@@ -299,8 +314,8 @@ function indexer(opts) {
       }
       previousHead = head;
     }
-    const [[unfinalizedMetadataBlock], finalizedBlock] = await Promise.all([
-      metadata.blocks.list({ chain }),
+    const [unfinalizedMetadataBlock, finalizedBlock] = await Promise.all([
+      metadata.blocks.getNextUnfinalizedBlock(chain),
       //
       getBlock({ chain, number: "finalized" })
     ]);
@@ -314,7 +329,7 @@ function indexer(opts) {
         throw new Error("Received head greater than chain finalized height");
       }
     }
-    if (unfinalizedMetadataBlock === void 0) {
+    if (unfinalizedMetadataBlock === null) {
       return log.debug("No heads to finalize, returning...");
     }
     const indexerHeight = hexToNumber(unfinalizedMetadataBlock.number) - 1;
@@ -333,7 +348,7 @@ function indexer(opts) {
       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 });
+      const processed = await metadata.blocks.getBlocksByNumber(head.chain, head.number);
       if (processed.length === 0) {
         await writeFinalizedHead(head, null);
         continue;

package/dist/realtime.d.mts

@@ -1,7 +1,7 @@
 import { NodeRpc, IndexerRpc } from './rpc.mjs';
 import { Transport } from './transport.mjs';
-import './shared/univo.DcmLb3Hn.mjs';
-import 'unstorage';
+import './shared/univo.CjvLVVxo.mjs';
+import '@storagesdk/core';
 
 type RealtimeOptions = {
     /**

package/dist/realtime.d.ts

@@ -1,7 +1,7 @@
 import { NodeRpc, IndexerRpc } from './rpc.js';
 import { Transport } from './transport.js';
-import './shared/univo.DcmLb3Hn.js';
-import 'unstorage';
+import './shared/univo.CjvLVVxo.js';
+import '@storagesdk/core';
 
 type RealtimeOptions = {
     /**

package/dist/realtime.mjs

@@ -1,4 +1,4 @@
-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.sqV2c2Yj.mjs';
+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.BgwFxZpJ.mjs';
 
 const MAX_LENGTH = 1e4;
 function defineBlockchain(opts) {

package/dist/rpc.d.mts

@@ -1,5 +1,5 @@
-import { H as Head, M as Metadata, F as Flatten, a as Filter, B as Block, R as Result } from './shared/univo.DcmLb3Hn.mjs';
-import 'unstorage';
+import { H as Head, M as Metadata, F as Flatten, a as Filter, B as Block, R as Result } from './shared/univo.CjvLVVxo.mjs';
+import '@storagesdk/core';
 
 type Rpc = {
     /**

package/dist/rpc.d.ts

@@ -1,5 +1,5 @@
-import { H as Head, M as Metadata, F as Flatten, a as Filter, B as Block, R as Result } from './shared/univo.DcmLb3Hn.js';
-import 'unstorage';
+import { H as Head, M as Metadata, F as Flatten, a as Filter, B as Block, R as Result } from './shared/univo.CjvLVVxo.js';
+import '@storagesdk/core';
 
 type Rpc = {
     /**

package/dist/shared/{univo.sqV2c2Yj.mjs → univo.BgwFxZpJ.mjs}

@@ -1,5 +1,5 @@
 const name = "univo";
-const version = "0.2.14";
+const version = "0.2.15";
 
 function createLogger(opts) {
   let prefix = `[${name}@${version}]`;
@@ -78,6 +78,10 @@ async function compress(input) {
   return new Response(compressed).arrayBuffer();
 }
 async function decompress(input) {
+  if (input instanceof Blob) {
+    const decompressed2 = input.stream().pipeThrough(new DecompressionStream("gzip"));
+    return new Response(decompressed2).text();
+  }
   const decompressed = new Blob([input]).stream().pipeThrough(new DecompressionStream("gzip"));
   return new Response(decompressed).text();
 }
@@ -89,4 +93,4 @@ const normalizeHex = (hex, length) => {
   return `0x${hex.slice(2).toLowerCase().padStart(length, "0")}`;
 };
 
-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 };
+export { decoder as a, compress as b, createLogger as c, decompress as d, iife as e, numberToHex as f, name 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/shared/{univo.DcmLb3Hn.d.mts → univo.CjvLVVxo.d.mts}

@@ -1,4 +1,4 @@
-import { Storage } from 'unstorage';
+import { Storage } from '@storagesdk/core';
 
 type CamelToSnake<T extends string, P extends string = ""> = string extends T ? string : T extends `${infer C0}${infer R}` ? CamelToSnake<R, `${P}${C0 extends Lowercase<C0> ? "" : "_"}${Lowercase<C0>}`> : P;
 type Flatten<T> = {

package/dist/shared/{univo.DcmLb3Hn.d.ts → univo.CjvLVVxo.d.ts}

@@ -1,4 +1,4 @@
-import { Storage } from 'unstorage';
+import { Storage } from '@storagesdk/core';
 
 type CamelToSnake<T extends string, P extends string = ""> = string extends T ? string : T extends `${infer C0}${infer R}` ? CamelToSnake<R, `${P}${C0 extends Lowercase<C0> ? "" : "_"}${Lowercase<C0>}`> : P;
 type Flatten<T> = {

package/dist/shared/{univo.CzTm3CDN.mjs → univo.O0SoVQWh.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.sqV2c2Yj.mjs';
+import { b as compress, j as raise, c as createLogger } from './univo.BgwFxZpJ.mjs';
 
 function createException(message) {
   return `univo:${message}`;

package/dist/transport.d.mts

@@ -1,6 +1,6 @@
 import { Rpc } from './rpc.mjs';
-import './shared/univo.DcmLb3Hn.mjs';
-import 'unstorage';
+import './shared/univo.CjvLVVxo.mjs';
+import '@storagesdk/core';
 
 type Protocol = "http" | "wss" | "local";
 type Transport<R extends Rpc, P extends Protocol = Protocol> = {

package/dist/transport.d.ts

@@ -1,6 +1,6 @@
 import { Rpc } from './rpc.js';
-import './shared/univo.DcmLb3Hn.js';
-import 'unstorage';
+import './shared/univo.CjvLVVxo.js';
+import '@storagesdk/core';
 
 type Protocol = "http" | "wss" | "local";
 type Transport<R extends Rpc, P extends Protocol = Protocol> = {

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.CzTm3CDN.mjs';
-import './shared/univo.sqV2c2Yj.mjs';
+export { h as http, l as local, w as wss } from './shared/univo.O0SoVQWh.mjs';
+import './shared/univo.BgwFxZpJ.mjs';

package/package.json

@@ -2,7 +2,7 @@
 	"name": "univo",
 	"license": "MIT",
 	"type": "module",
-	"version": "0.2.14",
+	"version": "0.2.15",
 	"sideEffects": false,
 	"module": "./dist/index.mjs",
 	"types": "./dist/index.d.ts",
@@ -54,6 +54,7 @@
 		"vitest": "^3.1.3"
 	},
 	"peerDependencies": {
-		"unstorage": ">=1"
+		"@storagesdk/core": ">=0.4.2",
+		"@storagesdk/adapters": ">=0.6.0"
 	}
 }