@chainflip/rpc 1.6.9 → 1.6.10

package/dist/Client.cjs

@@ -1,12 +1,13 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});// src/Client.ts
-var _crypto = require('crypto');
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); var _class;// src/Client.ts
+var _assertion = require('@chainflip/utils/assertion');
 var _commoncjs = require('./common.cjs');
-var Client = class {
-  constructor(url) {
+var Client = (_class = class {
+  constructor(url) {;_class.prototype.__init.call(this);
     this.url = url;
   }
+  __init() {this.lastRequestId = 0}
   getRequestId() {
-    return _crypto.randomUUID.call(void 0, );
+    return String(++this.lastRequestId);
   }
   formatRequest(method, params) {
     return { jsonrpc: "2.0", id: this.getRequestId(), method, params };
@@ -24,22 +25,19 @@ var Client = class {
         `RPC error [${parseResult.data.error.code}]: ${parseResult.data.error.message}`
       );
     }
-    if (parseResult.data.result) {
-      return parseResult.data;
-    }
-    throw new Error("Malformed RPC response received");
+    _assertion.assert.call(void 0, "result" in parseResult.data);
+    return parseResult.data;
   }
   async sendRequest(method, ...params) {
     const [response] = await this.send([this.formatRequest(method, params)]);
-    if (!response.success)
-      throw response.error;
+    if (!response.success) throw response.error;
     const parseResult = this.parseSingleResponse(response);
     return _commoncjs.rpcResult[method].parse(parseResult.result);
   }
   methods() {
     return Object.keys(_commoncjs.rpcResult).sort();
   }
-};
+}, _class);
 
 
 exports.default = Client;

package/dist/Client.d.cts

@@ -14,9 +14,10 @@ type Response = {
 };
 declare abstract class Client {
     protected readonly url: string;
+    private lastRequestId;
     constructor(url: string);
     protected abstract send<const T extends RpcMethod>(data: JsonRpcRequest<T>[]): Promise<Response[]>;
-    protected getRequestId(): `${string}-${string}-${string}-${string}-${string}`;
+    protected getRequestId(): string;
     protected formatRequest<T extends RpcMethod>(method: T, params: RpcRequest[T]): JsonRpcRequest<T>;
     protected parseSingleResponse(response: Response): {
         id: string | number;

package/dist/Client.d.ts

@@ -14,9 +14,10 @@ type Response = {
 };
 declare abstract class Client {
     protected readonly url: string;
+    private lastRequestId;
     constructor(url: string);
     protected abstract send<const T extends RpcMethod>(data: JsonRpcRequest<T>[]): Promise<Response[]>;
-    protected getRequestId(): `${string}-${string}-${string}-${string}-${string}`;
+    protected getRequestId(): string;
     protected formatRequest<T extends RpcMethod>(method: T, params: RpcRequest[T]): JsonRpcRequest<T>;
     protected parseSingleResponse(response: Response): {
         id: string | number;

package/dist/Client.mjs

@@ -1,12 +1,13 @@
 // src/Client.ts
-import { randomUUID } from "crypto";
+import { assert } from "@chainflip/utils/assertion";
 import { rpcResult, rpcResponse } from "./common.mjs";
 var Client = class {
   constructor(url) {
     this.url = url;
   }
+  lastRequestId = 0;
   getRequestId() {
-    return randomUUID();
+    return String(++this.lastRequestId);
   }
   formatRequest(method, params) {
     return { jsonrpc: "2.0", id: this.getRequestId(), method, params };
@@ -24,15 +25,12 @@ var Client = class {
         `RPC error [${parseResult.data.error.code}]: ${parseResult.data.error.message}`
       );
     }
-    if (parseResult.data.result) {
-      return parseResult.data;
-    }
-    throw new Error("Malformed RPC response received");
+    assert("result" in parseResult.data);
+    return parseResult.data;
   }
   async sendRequest(method, ...params) {
     const [response] = await this.send([this.formatRequest(method, params)]);
-    if (!response.success)
-      throw response.error;
+    if (!response.success) throw response.error;
     const parseResult = this.parseSingleResponse(response);
     return rpcResult[method].parse(parseResult.result);
   }

package/dist/HttpClient.cjs

@@ -38,8 +38,7 @@ var HttpClient = (_class = class extends _Clientcjs2.default {constructor(...arg
     const deferred = _async.deferredPromise.call(void 0, );
     const body = this.formatRequest(method, params);
     this.requestMap.set(body.id, { deferred, body, method });
-    if (this.timer)
-      clearTimeout(this.timer);
+    if (this.timer) clearTimeout(this.timer);
     this.timer = setTimeout(() => this.sendBatch(), this.batchDuration);
     return deferred.promise;
   }

package/dist/HttpClient.mjs

@@ -38,8 +38,7 @@ var HttpClient = class extends Client {
     const deferred = deferredPromise();
     const body = this.formatRequest(method, params);
     this.requestMap.set(body.id, { deferred, body, method });
-    if (this.timer)
-      clearTimeout(this.timer);
+    if (this.timer) clearTimeout(this.timer);
     this.timer = setTimeout(() => this.sendBatch(), this.batchDuration);
     return deferred.promise;
   }

package/dist/WsClient.cjs

@@ -17,8 +17,7 @@ var WsClient = (_class = class extends _Clientcjs2.default {
     await this.handleClose();
   }
   async handleClose() {
-    if (!this.ws)
-      return;
+    if (!this.ws) return;
     this.ws.removeEventListener("close", this.handleDisconnect);
     this.ws.close();
     if (this.ws.readyState !== this.WebSocket.CLOSED) {
@@ -49,8 +48,7 @@ var WsClient = (_class = class extends _Clientcjs2.default {
   __init5() {this.handleMessage = (data) => {
     const parsedData = JSON.parse(data.data);
     const response = _commoncjs.rpcResponse.safeParse(parsedData);
-    if (!response.success)
-      return;
+    if (!response.success) return;
     const { id } = response.data;
     _optionalChain([this, 'access', _6 => _6.requestMap, 'access', _7 => _7.get, 'call', _8 => _8(id), 'optionalAccess', _9 => _9.resolve, 'call', _10 => _10(response.data)]);
   }}

package/dist/WsClient.mjs

@@ -17,8 +17,7 @@ var WsClient = class extends Client {
     await this.handleClose();
   }
   async handleClose() {
-    if (!this.ws)
-      return;
+    if (!this.ws) return;
     this.ws.removeEventListener("close", this.handleDisconnect);
     this.ws.close();
     if (this.ws.readyState !== this.WebSocket.CLOSED) {
@@ -49,8 +48,7 @@ var WsClient = class extends Client {
   handleMessage = (data) => {
     const parsedData = JSON.parse(data.data);
     const response = rpcResponse.safeParse(parsedData);
-    if (!response.success)
-      return;
+    if (!response.success) return;
     const { id } = response.data;
     this.requestMap.get(id)?.resolve(response.data);
   };