@solana/web3.js 1.73.1 → 1.73.2

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@solana/web3.js",
-  "version": "1.73.1",
+  "version": "1.73.2",
   "description": "Solana Javascript API",
   "keywords": [
     "api",
     "blockchain"
   ],
   "license": "MIT",
-  "author": "Solana Maintainers <maintainers@solana.com>",
+  "author": "Solana Labs Maintainers <maintainers@solanalabs.com>",
   "homepage": "https://solana.com/",
   "repository": {
     "type": "git",
@@ -81,9 +81,9 @@
     "@babel/preset-env": "^7.12.11",
     "@babel/preset-typescript": "^7.12.16",
     "@commitlint/config-conventional": "^17.0.2",
-    "@rollup/plugin-alias": "^3.1.9",
+    "@rollup/plugin-alias": "^4.0.3",
     "@rollup/plugin-babel": "^5.2.3",
-    "@rollup/plugin-commonjs": "^22.0.0",
+    "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-multi-entry": "^4.0.0",
     "@rollup/plugin-node-resolve": "^13.0.0",
@@ -120,7 +120,7 @@
     "nyc": "^15.1.0",
     "prettier": "^2.3.0",
     "rimraf": "3.0.2",
-    "rollup": "2.70.2",
+    "rollup": "2.79.1",
     "rollup-plugin-dts": "^4.0.0",
     "rollup-plugin-node-polyfills": "^0.2.1",
     "rollup-plugin-terser": "^7.0.2",

package/src/__forks__/browser/rpc-websocket-factory.ts

@@ -0,0 +1 @@
+export {default} from 'rpc-websockets/dist/lib/client/websocket.browser';

package/src/__forks__/react-native/rpc-websocket-factory.ts

@@ -0,0 +1 @@
+export {default} from 'rpc-websockets/dist/lib/client/websocket.browser';

package/src/connection.ts

@@ -26,7 +26,6 @@ import {
   any,
 } from 'superstruct';
 import type {Struct} from 'superstruct';
-import {Client as RpcWebSocketClient} from 'rpc-websockets';
 import RpcClient from 'jayson/lib/client/browser';
 import {JSONRPCError} from 'jayson';
 
@@ -36,6 +35,7 @@ import fetchImpl, {Response} from './fetch-impl';
 import {DurableNonce, NonceAccount} from './nonce-account';
 import {PublicKey} from './publickey';
 import {Signer} from './keypair';
+import RpcWebSocketClient from './rpc-websocket';
 import {MS_PER_SLOT} from './timing';
 import {
   Transaction,
@@ -5803,7 +5803,12 @@ export class Connection {
     this._rpcWebSocketConnected = true;
     this._rpcWebSocketHeartbeat = setInterval(() => {
       // Ping server every 5s to prevent idle timeouts
-      this._rpcWebSocket.notify('ping').catch(() => {});
+      (async () => {
+        try {
+          await this._rpcWebSocket.notify('ping');
+          // eslint-disable-next-line no-empty
+        } catch {}
+      })();
     }, 5000);
     this._updateSubscriptions();
   }

package/src/rpc-websocket-factory.ts

@@ -0,0 +1,4 @@
+import {ICommonWebSocketFactory} from 'rpc-websockets/dist/lib/client/client.types';
+import WebsocketFactory from 'rpc-websockets/dist/lib/client/websocket';
+
+export default WebsocketFactory as ICommonWebSocketFactory;

package/src/rpc-websocket.ts

@@ -0,0 +1,79 @@
+import RpcWebSocketCommonClient from 'rpc-websockets/dist/lib/client';
+import RpcWebSocketBrowserFactory from 'rpc-websockets/dist/lib/client/websocket.browser';
+import {
+  ICommonWebSocket,
+  IWSClientAdditionalOptions,
+  NodeWebSocketType,
+  NodeWebSocketTypeOptions,
+} from 'rpc-websockets/dist/lib/client/client.types';
+
+import createRpc from './rpc-websocket-factory';
+
+interface IHasReadyState {
+  readyState: WebSocket['readyState'];
+}
+
+export default class RpcWebSocketClient extends RpcWebSocketCommonClient {
+  private underlyingSocket: IHasReadyState | undefined;
+  constructor(
+    address?: string,
+    options?: IWSClientAdditionalOptions & NodeWebSocketTypeOptions,
+    generate_request_id?: (
+      method: string,
+      params: object | Array<any>,
+    ) => number,
+  ) {
+    const webSocketFactory = (url: string) => {
+      const rpc = createRpc(url, {
+        autoconnect: true,
+        max_reconnects: 5,
+        reconnect: true,
+        reconnect_interval: 1000,
+        ...options,
+      });
+      if ('socket' in rpc) {
+        this.underlyingSocket = (
+          rpc as ReturnType<typeof RpcWebSocketBrowserFactory>
+        ).socket;
+      } else {
+        this.underlyingSocket = rpc as NodeWebSocketType;
+      }
+      return rpc as ICommonWebSocket;
+    };
+    super(webSocketFactory, address, options, generate_request_id);
+  }
+  call(
+    ...args: Parameters<RpcWebSocketCommonClient['call']>
+  ): ReturnType<RpcWebSocketCommonClient['call']> {
+    const readyState = this.underlyingSocket?.readyState;
+    if (readyState === 1 /* WebSocket.OPEN */) {
+      return super.call(...args);
+    }
+    return Promise.reject(
+      new Error(
+        'Tried to call a JSON-RPC method `' +
+          args[0] +
+          '` but the socket was not `CONNECTING` or `OPEN` (`readyState` was ' +
+          readyState +
+          ')',
+      ),
+    );
+  }
+  notify(
+    ...args: Parameters<RpcWebSocketCommonClient['notify']>
+  ): ReturnType<RpcWebSocketCommonClient['notify']> {
+    const readyState = this.underlyingSocket?.readyState;
+    if (readyState === 1 /* WebSocket.OPEN */) {
+      return super.notify(...args);
+    }
+    return Promise.reject(
+      new Error(
+        'Tried to send a JSON-RPC notification `' +
+          args[0] +
+          '` but the socket was not `CONNECTING` or `OPEN` (`readyState` was ' +
+          readyState +
+          ')',
+      ),
+    );
+  }
+}