soroban-events 2.0.0 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "soroban-events",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Resilient, windowed event streamer and XDR decoder for Soroban RPC",
   "type": "module",
   "main": "./src/index.js",

package/src/cli-command.js

@@ -85,8 +85,12 @@ export class Command {
     const args =
       argv.slice(2);
 
+    if (args.length === 0) {
+      this.printHelp();
+      return;
+    }
+
     if (
-      args.length === 0 ||
       args[0] === '--help' ||
       args[0] === '-h'
     ) {
@@ -121,6 +125,24 @@ export class Command {
   }
 
   async #run(args) {
+    if (
+      args[0] === '--help' ||
+      args[0] === '-h'
+    ) {
+      this.printHelp();
+      return;
+    }
+
+    if (
+      args[0] === '--version' ||
+      args[0] === '-v'
+    ) {
+      process.stdout.write(
+        `${this.#version}\n`
+      );
+      return;
+    }
+
     const values = {};
 
     for (const option of this.#options) {
@@ -178,24 +200,46 @@ export class Command {
   }
 
   printHelp() {
-    const root =
-      this.#parent ?? this;
+    const command =
+      this;
 
-    const commands =
-      [...root.#commands.keys()];
+    const lines = [
+      command.#name,
+      command.#description,
+      ''
+    ];
 
-    process.stdout.write(
-      [
-        root.#name,
-        root.#description,
-        '',
+    if (command.#commands.size > 0) {
+      lines.push(
         'Commands:',
-        ...commands.map(
+        ...[...command.#commands.keys()].map(
           name =>
             `  ${name}`
         ),
         ''
-      ].join('\n')
+      );
+    }
+
+    if (command.#options.length > 0) {
+      lines.push(
+        'Options:',
+        ...command.#options.map(
+          option =>
+            `  ${option.flag}  ${option.description}`
+        ),
+        ''
+      );
+    }
+
+    if (command.#version) {
+      lines.push(
+        '  -v, --version  Show version',
+        ''
+      );
+    }
+
+    process.stdout.write(
+      lines.join('\n')
     );
   }
 }

package/src/cli.js

@@ -56,7 +56,17 @@ program
         await fetch(
           rpc,
           {
-            method: 'GET'
+            method: 'POST',
+            headers: {
+              'content-type':
+                'application/json'
+            },
+            body: JSON.stringify({
+              jsonrpc: '2.0',
+              id: 1,
+              method: 'getHealth',
+              params: {}
+            })
           }
         );
 
@@ -131,23 +141,43 @@ program
         );
       }
 
-      process.stdout.write(
-        JSON.stringify(
-          parsed,
-          null,
-          2
-        ) + '\n'
-      );
-
-      if (!response.ok) {
-        process.exitCode = 1;
-      }
+      const rpcError =
+        parsed &&
+        parsed.error;
 
       if (
-        parsed &&
-        parsed.error
+        response.ok === false ||
+        rpcError
       ) {
+        process.stdout.write(
+          JSON.stringify(
+            rpcError ?? {
+              status: response.status,
+              statusText: response.statusText
+            },
+            null,
+            2
+          ) + '\n'
+        );
+
         process.exitCode = 1;
+      } else {
+        const sequence =
+          parsed &&
+          parsed.result &&
+          parsed.result.sequence;
+
+        if (
+          sequence === undefined
+        ) {
+          throw new Error(
+            'RPC response did not contain result.sequence'
+          );
+        }
+
+        process.stdout.write(
+          `${sequence}\n`
+        );
       }
     }
   );

package/src/engine.js

@@ -370,7 +370,7 @@ export class EventEngine {
       checkpoint,
       checkpointKey,
       signal,
-      handler: async (
+      onEvent: async (
         event,
         context
       ) => {
@@ -384,10 +384,10 @@ export class EventEngine {
         }
 
         if (
-          typeof options.handler ===
+          typeof options.onEvent ===
           'function'
         ) {
-          await options.handler(
+          await options.onEvent(
             event,
             context
           );
@@ -506,7 +506,7 @@ export class EventEngine {
         await this.consume({
           filters,
           signal: effectiveSignal,
-          handler: onEvent
+          onEvent
         });
 
       return {