@apibara/protocol 2.1.0-beta.5 → 2.1.0-beta.50

package/dist/testing/index.mjs

@@ -1,7 +1,6 @@
-import { Schema } from '@effect/schema';
-import { M as MockFilter$1, u as MockBlock$1, r as StreamConfig, S as StreamDataResponse } from '../shared/protocol.991ff9ad.mjs';
+import { MessageCodec, OptionalCodec, StringCodec } from '../codec.mjs';
+import { l as StreamConfig, M as MockFilter$1, m as MockBlock, S as StreamDataResponse } from '../shared/protocol.68fdd897.mjs';
 import 'protobufjs/minimal.js';
-import 'effect';
 import 'viem';
 import 'long';
 
@@ -39,44 +38,31 @@ class StreamDataIterable {
   }
 }
 
-const MockFilter = Schema.Struct({
-  filter: Schema.optional(Schema.String)
+const MockFilter = MessageCodec({
+  filter: OptionalCodec(StringCodec)
 });
-const MockFilterFromBytes = Schema.transform(
-  Schema.Uint8ArrayFromSelf,
-  MockFilter,
-  {
-    strict: false,
-    decode(value) {
-      return MockFilter$1.decode(value);
-    },
-    encode(value) {
-      return MockFilter$1.encode(value).finish();
-    }
+const MockFilterFromBytes = {
+  decode(value) {
+    return MockFilter$1.decode(value);
+  },
+  encode(value) {
+    return MockFilter$1.encode(value).finish();
   }
-);
-const MockBlock = Schema.Struct({
-  data: Schema.optional(Schema.String)
-});
-const MockBlockFromBytes = Schema.transform(
-  Schema.Uint8ArrayFromSelf,
-  Schema.NullOr(MockBlock),
-  {
-    strict: false,
-    decode(value) {
-      if (value.length === 0) {
-        return null;
-      }
-      return MockBlock$1.decode(value);
-    },
-    encode(value) {
-      if (value === null) {
-        return new Uint8Array();
-      }
-      return MockBlock$1.encode(value).finish();
+};
+const MockBlockFromBytes = {
+  decode(value) {
+    if (value.length === 0) {
+      return null;
+    }
+    return MockBlock.decode(value);
+  },
+  encode(value) {
+    if (value === null) {
+      return new Uint8Array();
     }
+    return MockBlock.encode(value).finish();
   }
-);
+};
 function mergeMockFilter(a, b) {
   let filter = "";
   if (a.filter) {
@@ -90,8 +76,10 @@ function mergeMockFilter(a, b) {
 const MockStream = new StreamConfig(
   MockFilterFromBytes,
   MockBlockFromBytes,
-  mergeMockFilter
+  mergeMockFilter,
+  "mock"
 );
 const MockStreamResponse = StreamDataResponse(MockBlockFromBytes);
 
 export { MockBlockFromBytes, MockClient, MockFilter, MockFilterFromBytes, MockStream, MockStreamResponse, StreamDataIterable };
+//# sourceMappingURL=index.mjs.map

package/dist/testing/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.mjs","sources":["../../src/testing/client.ts","../../src/testing/mock.ts"],"sourcesContent":["import type { Client, ClientCallOptions, StreamDataOptions } from \"../client\";\nimport type { StatusRequest, StatusResponse } from \"../status\";\nimport type { StreamDataRequest, StreamDataResponse } from \"../stream\";\n\nexport class MockClient<TFilter, TBlock> implements Client<TFilter, TBlock> {\n  constructor(\n    private messageFactory: (\n      request: StreamDataRequest<TFilter>,\n      options?: StreamDataOptions,\n    ) => (StreamDataResponse<TBlock> | Error)[],\n  ) {}\n\n  async status(\n    request?: StatusRequest,\n    options?: ClientCallOptions,\n  ): Promise<StatusResponse> {\n    throw new Error(\"Client.status is not implemented for VcrClient\");\n  }\n\n  streamData(request: StreamDataRequest<TFilter>, options?: StreamDataOptions) {\n    const messages = this.messageFactory(request, options);\n\n    return new StreamDataIterable(messages);\n  }\n}\n\nexport class StreamDataIterable<TBlock> {\n  constructor(private messages: (StreamDataResponse<TBlock> | Error)[]) {}\n\n  [Symbol.asyncIterator](): AsyncIterator<StreamDataResponse<TBlock>> {\n    let index = 0;\n    const messages = this.messages;\n\n    return {\n      async next() {\n        if (index >= messages.length) {\n          return { done: true, value: undefined };\n        }\n\n        const message = messages[index++];\n        if (message instanceof Error) {\n          throw message;\n        }\n\n        return { done: false, value: message };\n      },\n    };\n  }\n}\n","import {\n  type Codec,\n  type CodecType,\n  MessageCodec,\n  OptionalCodec,\n  StringCodec,\n} from \"../codec\";\nimport { StreamConfig } from \"../config\";\nimport * as proto from \"../proto\";\nimport { StreamDataResponse } from \"../stream\";\n\nexport const MockFilter = MessageCodec({\n  filter: OptionalCodec(StringCodec),\n});\n\nexport type MockFilter = CodecType<typeof MockFilter>;\n\nexport const MockFilterFromBytes: Codec<MockFilter, Uint8Array> = {\n  decode(value) {\n    return proto.testing.MockFilter.decode(value);\n  },\n  encode(value) {\n    return proto.testing.MockFilter.encode(value).finish();\n  },\n};\n\nconst MockBlock = MessageCodec({\n  data: OptionalCodec(StringCodec),\n});\n\nexport type MockBlock = CodecType<typeof MockBlock>;\n\nexport const MockBlockFromBytes: Codec<MockBlock | null, Uint8Array> = {\n  decode(value) {\n    if (value.length === 0) {\n      return null;\n    }\n    return proto.testing.MockBlock.decode(value);\n  },\n  encode(value) {\n    if (value === null) {\n      return new Uint8Array();\n    }\n    return proto.testing.MockBlock.encode(value).finish();\n  },\n};\n\n/** For testing, simply concatenate the values of `.filter` */\nfunction mergeMockFilter(a: MockFilter, b: MockFilter): MockFilter {\n  let filter = \"\";\n  if (a.filter) {\n    filter += a.filter;\n  }\n  if (b.filter) {\n    filter += b.filter;\n  }\n  return { filter };\n}\n\nexport const MockStream = new StreamConfig(\n  MockFilterFromBytes,\n  MockBlockFromBytes,\n  mergeMockFilter,\n  \"mock\",\n);\n\nexport const MockStreamResponse = StreamDataResponse(MockBlockFromBytes);\n\nexport type MockStreamResponse = CodecType<typeof MockStreamResponse>;\n"],"names":["proto.testing.MockFilter","proto.testing.MockBlock"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apibara/protocol",
-  "version": "2.1.0-beta.5",
+  "version": "2.1.0-beta.50",
   "type": "module",
   "files": [
     "dist",
@@ -21,6 +21,18 @@
       "import": "./dist/testing/index.mjs",
       "require": "./dist/testing/index.cjs",
       "default": "./dist/testing/index.mjs"
+    },
+    "./codec": {
+      "types": "./dist/codec.d.ts",
+      "import": "./dist/codec.mjs",
+      "require": "./dist/codec.cjs",
+      "default": "./dist/codec.mjs"
+    },
+    "./rpc": {
+      "types": "./dist/rpc/index.d.ts",
+      "import": "./dist/rpc/index.mjs",
+      "require": "./dist/rpc/index.cjs",
+      "default": "./dist/rpc/index.mjs"
     }
   },
   "scripts": {
@@ -41,8 +53,7 @@
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@effect/schema": "^0.67.15",
-    "effect": "^3.2.6",
+    "consola": "^3.4.2",
     "long": "^5.2.3",
     "nice-grpc": "^2.1.8",
     "nice-grpc-common": "^2.0.2",

package/src/client.ts

@@ -1,8 +1,11 @@
-import { Schema } from "@effect/schema";
+import assert from "node:assert";
+
+import consola from "consola";
 import {
   type ChannelCredentials,
   type ChannelOptions,
   type DefaultCallOptions,
+  Metadata,
   type NormalizedServiceDefinition,
   createChannel,
   createClient as grpcCreateClient,
@@ -10,18 +13,13 @@ import {
 
 import * as proto from "./proto";
 
-import assert from "node:assert";
+import type { Codec } from "./codec";
 import type { Cursor } from "./common";
 import type { StreamConfig } from "./config";
-import {
-  type StatusRequest,
-  type StatusResponse,
-  statusRequestToProto,
-  statusResponseFromProto,
-} from "./status";
+import { StatusRequest, StatusResponse } from "./status";
 import { type StreamDataRequest, StreamDataResponse } from "./stream";
 
-export { ClientError, Status } from "nice-grpc";
+export { ClientError, ServerError, Status, Metadata } from "nice-grpc";
 
 const DEFAULT_TIMEOUT_MS = 45_000;
 
@@ -88,6 +86,33 @@ export function createClient<TFilter, TBlock>(
   return new GrpcClient(config, client);
 }
 
+export function createAuthenticatedClient<TFilter, TBlock>(
+  config: StreamConfig<TFilter, TBlock>,
+  streamUrl: string,
+  options?: CreateClientOptions,
+) {
+  const dnaToken = process.env.DNA_TOKEN;
+  if (!dnaToken) {
+    consola.warn(
+      "DNA_TOKEN environment variable is not set. Trying to connect without authentication.",
+    );
+  }
+
+  return createClient(config, streamUrl, {
+    ...options,
+    defaultCallOptions: {
+      ...(options?.defaultCallOptions ?? {}),
+      "*": {
+        metadata: Metadata({
+          Authorization: `Bearer ${dnaToken}`,
+        }),
+        // metadata cant be overrided with spread as its a class so we override it fully if user provided it.
+        ...(options?.defaultCallOptions?.["*"] ?? {}),
+      },
+    },
+  });
+}
+
 export class GrpcClient<TFilter, TBlock> implements Client<TFilter, TBlock> {
   private encodeRequest;
 
@@ -95,15 +120,15 @@ export class GrpcClient<TFilter, TBlock> implements Client<TFilter, TBlock> {
     private config: StreamConfig<TFilter, TBlock>,
     private client: proto.stream.DnaStreamClient,
   ) {
-    this.encodeRequest = Schema.encodeSync(config.Request);
+    this.encodeRequest = config.Request.encode;
   }
 
   async status(request?: StatusRequest, options?: ClientCallOptions) {
     const response = await this.client.status(
-      statusRequestToProto(request ?? {}),
+      StatusRequest.encode(request ?? {}),
       options,
     );
-    return statusResponseFromProto(response);
+    return StatusResponse.decode(response);
   }
 
   streamData(request: StreamDataRequest<TFilter>, options?: StreamDataOptions) {
@@ -115,14 +140,14 @@ export class GrpcClient<TFilter, TBlock> implements Client<TFilter, TBlock> {
 export class StreamDataIterable<TBlock> {
   constructor(
     private it: AsyncIterable<proto.stream.StreamDataResponse>,
-    private schema: Schema.Schema<TBlock | null, Uint8Array, never>,
+    private schema: Codec<TBlock, Uint8Array>,
     private options?: StreamDataOptions,
   ) {}
 
   [Symbol.asyncIterator](): AsyncIterator<StreamDataResponse<TBlock>> {
     const inner = this.it[Symbol.asyncIterator]();
     const schema = StreamDataResponse(this.schema);
-    const decoder = Schema.decodeSync(schema);
+    const decoder = schema.decode;
     const { endingCursor, timeout = DEFAULT_TIMEOUT_MS } = this.options ?? {};
     let shouldStop = false;