@solana/rpc-transport - npm Package Compare versions

Comparing version 2.0.0-experimental.044c967 to 2.0.0-experimental.09348ce

dist/index.browser.js

@@ -1,40 +0,5 @@
-import 'node-fetch';
+// ../build-scripts/env-shim.ts
+var __DEV__ = /* @__PURE__ */ (() => process["env"].NODE_ENV === "development")();
 
-// ../fetch-impl-browser/dist/index.browser.js
-var { fetch } = globalThis;
-var src_default = fetch;
-
-// src/http-request-errors.ts
-var SolanaHttpError = class extends Error {
-  constructor(details) {
-    super(`HTTP error (${details.statusCode}): ${details.message}`);
-    Error.captureStackTrace(this, this.constructor);
-    this.statusCode = details.statusCode;
-  }
-  get name() {
-    return "SolanaHttpError";
-  }
-};
-async function makeHttpRequest({ payload, url }) {
-  const requestInfo = {
-    body: JSON.stringify(payload),
-    headers: {
-      "Content-type": "application/json"
-    },
-    method: "POST"
-  };
-  let response;
-  {
-    response = await src_default(url, requestInfo);
-  }
-  if (!response.ok) {
-    throw new SolanaHttpError({
-      message: response.statusText,
-      statusCode: response.status
-    });
-  }
-  return await response.json();
-}
-
-// src/json-rpc-transport/json-rpc-errors.ts
+// src/json-rpc-errors.ts
 var SolanaJsonRpcError = class extends Error {
@@ -52,3 +17,3 @@ constructor(details) {
 
-// src/json-rpc-transport/json-rpc-message-id.ts
+// src/json-rpc-message-id.ts
 var _nextMessageId = 0;
@@ -61,3 +26,3 @@ function getNextMessageId() {
 
-// src/json-rpc-transport/json-rpc-message.ts
+// src/json-rpc-message.ts
 function createJsonRpcMessage(method, params) {
@@ -72,90 +37,22 @@ return {
 
-// src/params-patcher.ts
-function visitNode(value, keyPath, onIntegerOverflow) {
-  if (Array.isArray(value)) {
-    return value.map(
-      (element, ii) => visitNode(element, [...keyPath, ii], onIntegerOverflow)
-    );
-  } else if (typeof value === "object" && value !== null) {
-    const out = {};
-    for (const propName in value) {
-      if (Object.prototype.hasOwnProperty.call(value, propName)) {
-        out[propName] = visitNode(value[propName], [...keyPath, propName], onIntegerOverflow);
+// src/json-rpc.ts
+function createPendingRpcRequest(rpcConfig, pendingRequest) {
+  return {
+    async send(options) {
+      const { methodName, params, responseProcessor } = pendingRequest;
+      const payload = createJsonRpcMessage(methodName, params);
+      const response = await rpcConfig.transport({
+        payload,
+        signal: options?.abortSignal
+      });
+      if ("error" in response) {
+        throw new SolanaJsonRpcError(response.error);
+      } else {
+        return responseProcessor ? responseProcessor(response.result) : response.result;
       }
     }
-    return out;
-  } else if (typeof value === "bigint") {
-    if (onIntegerOverflow && (value > Number.MAX_SAFE_INTEGER || value < -Number.MAX_SAFE_INTEGER)) {
-      onIntegerOverflow(keyPath, value);
-    }
-    return Number(value);
-  } else {
-    return value;
-  }
-}
-function patchParamsForSolanaLabsRpc(params, onIntegerOverflow) {
-  return visitNode(params, [], onIntegerOverflow);
-}
-
-// src/response-patcher-types.ts
-var KEYPATH_WILDCARD = {};
-
-// src/response-patcher-allowed-numeric-values.ts
-var ALLOWED_NUMERIC_KEYPATHS = {
-  getInflationReward: [[KEYPATH_WILDCARD, "commission"]]
-};
-
-// src/response-patcher.ts
-function getNextAllowedKeypaths(keyPaths, property) {
-  return keyPaths.filter((keyPath) => keyPath[0] === KEYPATH_WILDCARD && typeof property === "number" || keyPath[0] === property).map((keyPath) => keyPath.slice(1));
-}
-function visitNode2(value, allowedKeypaths) {
-  if (Array.isArray(value)) {
-    return value.map((element, ii) => {
-      const nextAllowedKeypaths = getNextAllowedKeypaths(allowedKeypaths, ii);
-      return visitNode2(element, nextAllowedKeypaths);
-    });
-  } else if (typeof value === "object" && value !== null) {
-    const out = {};
-    for (const propName in value) {
-      if (Object.prototype.hasOwnProperty.call(value, propName)) {
-        const nextAllowedKeypaths = getNextAllowedKeypaths(allowedKeypaths, propName);
-        out[propName] = visitNode2(value[propName], nextAllowedKeypaths);
-      }
-    }
-    return out;
-  } else if (typeof value === "number" && // The presence of an allowed keypath on the route to this value implies it's allowlisted;
-  // Upcast the value to `bigint` unless an allowed keypath is present.
-  allowedKeypaths.length === 0) {
-    return BigInt(value);
-  } else {
-    return value;
-  }
-}
-function patchResponseForSolanaLabsRpc(response, methodName) {
-  return visitNode2(response, (methodName && ALLOWED_NUMERIC_KEYPATHS[methodName]) ?? []);
-}
-
-// src/json-rpc-transport/index.ts
-function createArmedJsonRpcTransport(transportConfig, pendingMessage) {
-  const { url } = transportConfig;
-  const transport = {
-    async send() {
-      return await sendPayload(pendingMessage, url);
-    }
   };
-  return makeProxy(transport, transportConfig, pendingMessage);
 }
-function createArmedBatchJsonRpcTransport(transportConfig, pendingMessages) {
-  const { url } = transportConfig;
-  const transport = {
-    async sendBatch() {
-      return await sendPayload(pendingMessages, url);
-    }
-  };
-  return makeProxy(transport, transportConfig, pendingMessages);
-}
-function makeProxy(transport, transportConfig, pendingRequestOrRequests) {
-  const { onIntegerOverflow } = transportConfig;
-  return new Proxy(transport, {
+function makeProxy(rpcConfig) {
+  return new Proxy(rpcConfig.api, {
     defineProperty() {
@@ -167,19 +64,8 @@ return false;
     },
-    get(...args) {
-      const [target, p] = args;
-      return p in target ? Reflect.get(...args) : function(...params) {
+    get(target, p, receiver) {
+      return function(...rawParams) {
         const methodName = p.toString();
-        const patchedParams = patchParamsForSolanaLabsRpc(
-          params,
-          onIntegerOverflow ? (keyPath, value) => {
-            onIntegerOverflow(methodName, keyPath, value);
-          } : void 0
-        );
-        const newMessage = createJsonRpcMessage(methodName, patchedParams);
-        if (pendingRequestOrRequests == null) {
-          return createArmedJsonRpcTransport(transportConfig, newMessage);
-        } else {
-          const nextPendingMessages = Array.isArray(pendingRequestOrRequests) ? [...pendingRequestOrRequests, newMessage] : [pendingRequestOrRequests, newMessage];
-          return createArmedBatchJsonRpcTransport(transportConfig, nextPendingMessages);
-        }
+        const createRpcRequest = Reflect.get(target, methodName, receiver);
+        const newRequest = createRpcRequest ? createRpcRequest(...rawParams) : { methodName, params: rawParams };
+        return createPendingRpcRequest(rpcConfig, newRequest);
       };
@@ -189,33 +75,114 @@ }
 }
-function processResponse(response, methodName) {
-  if ("error" in response) {
-    throw new SolanaJsonRpcError(response.error);
-  } else {
-    const patchedResponse = patchResponseForSolanaLabsRpc(
-      response.result,
-      methodName
-      // FIXME: Untangle these types by moving the patcher into `rpc-core`
+function createJsonRpc(rpcConfig) {
+  return makeProxy(rpcConfig);
+}
+
+// ../fetch-impl/dist/index.browser.js
+var e = globalThis.fetch;
+
+// src/transports/http/http-transport-errors.ts
+var SolanaHttpError = class extends Error {
+  constructor(details) {
+    super(`HTTP error (${details.statusCode}): ${details.message}`);
+    Error.captureStackTrace(this, this.constructor);
+    this.statusCode = details.statusCode;
+  }
+  get name() {
+    return "SolanaHttpError";
+  }
+};
+
+// src/transports/http/http-transport-headers.ts
+var DISALLOWED_HEADERS = {
+  accept: true,
+  "content-length": true,
+  "content-type": true
+};
+var FORBIDDEN_HEADERS = {
+  "accept-charset": true,
+  "accept-encoding": true,
+  "access-control-request-headers": true,
+  "access-control-request-method": true,
+  connection: true,
+  "content-length": true,
+  cookie: true,
+  date: true,
+  dnt: true,
+  expect: true,
+  host: true,
+  "keep-alive": true,
+  origin: true,
+  "permissions-policy": true,
+  // No currently available Typescript technique allows you to match on a prefix.
+  // 'proxy-':true,
+  // 'sec-':true,
+  referer: true,
+  te: true,
+  trailer: true,
+  "transfer-encoding": true,
+  upgrade: true,
+  via: true
+};
+function assertIsAllowedHttpRequestHeaders(headers) {
+  const badHeaders = Object.keys(headers).filter((headerName) => {
+    const lowercaseHeaderName = headerName.toLowerCase();
+    return DISALLOWED_HEADERS[headerName.toLowerCase()] === true || FORBIDDEN_HEADERS[headerName.toLowerCase()] === true || lowercaseHeaderName.startsWith("proxy-") || lowercaseHeaderName.startsWith("sec-");
+  });
+  if (badHeaders.length > 0) {
+    throw new Error(
+      `${badHeaders.length > 1 ? "These headers are" : "This header is"} forbidden: \`${badHeaders.join("`, `")}\`. Learn more at https://developer.mozilla.org/en-US/docs/Glossary/Forbidden_header_name.`
     );
-    return patchedResponse;
   }
 }
-async function sendPayload(payload, url) {
-  const responseOrResponses = await makeHttpRequest({
-    payload,
-    url
-  });
-  if (Array.isArray(responseOrResponses)) {
-    const requestOrder = payload.map((p) => p.id);
-    return responseOrResponses.sort((a, b) => requestOrder.indexOf(a.id) - requestOrder.indexOf(b.id)).map((response, ii) => processResponse(response, payload[ii].method));
-  } else {
-    return processResponse(responseOrResponses, payload.method);
+function normalizeHeaders(headers) {
+  const out = {};
+  for (const headerName in headers) {
+    out[headerName.toLowerCase()] = headers[headerName];
   }
+  return out;
 }
-function createJsonRpcTransport(transportConfig) {
-  const transport = {};
-  return makeProxy(transport, transportConfig);
+
+// src/transports/http/http-transport.ts
+function createHttpTransport({ httpAgentNodeOnly, headers, url }) {
+  if (__DEV__ && headers) {
+    assertIsAllowedHttpRequestHeaders(headers);
+  }
+  const agent = void 0;
+  if (__DEV__ && httpAgentNodeOnly != null) {
+    console.warn(
+      "createHttpTransport(): The `httpAgentNodeOnly` config you supplied has been ignored; HTTP agents are only usable in Node environments."
+    );
+  }
+  const customHeaders = headers && normalizeHeaders(headers);
+  return async function makeHttpRequest({
+    payload,
+    signal
+  }) {
+    const body = JSON.stringify(payload);
+    const requestInfo = {
+      agent,
+      body,
+      headers: {
+        ...customHeaders,
+        // Keep these headers lowercase so they will override any user-supplied headers above.
+        accept: "application/json",
+        "content-length": body.length.toString(),
+        "content-type": "application/json; charset=utf-8"
+      },
+      method: "POST",
+      signal
+    };
+    const response = await e(url, requestInfo);
+    if (!response.ok) {
+      throw new SolanaHttpError({
+        message: response.statusText,
+        statusCode: response.status
+      });
+    }
+    return await response.json();
+  };
 }
 
-export { createJsonRpcTransport };
+export { createHttpTransport, createJsonRpc };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.browser.js.map

dist/index.native.js

@@ -1,40 +0,5 @@
-import 'node-fetch';
+// ../build-scripts/env-shim.ts
+var __DEV__ = /* @__PURE__ */ (() => process["env"].NODE_ENV === "development")();
 
-// ../fetch-impl-browser/dist/index.browser.js
-var { fetch } = globalThis;
-var src_default = fetch;
-
-// src/http-request-errors.ts
-var SolanaHttpError = class extends Error {
-  constructor(details) {
-    super(`HTTP error (${details.statusCode}): ${details.message}`);
-    Error.captureStackTrace(this, this.constructor);
-    this.statusCode = details.statusCode;
-  }
-  get name() {
-    return "SolanaHttpError";
-  }
-};
-async function makeHttpRequest({ payload, url }) {
-  const requestInfo = {
-    body: JSON.stringify(payload),
-    headers: {
-      "Content-type": "application/json"
-    },
-    method: "POST"
-  };
-  let response;
-  {
-    response = await src_default(url, requestInfo);
-  }
-  if (!response.ok) {
-    throw new SolanaHttpError({
-      message: response.statusText,
-      statusCode: response.status
-    });
-  }
-  return await response.json();
-}
-
-// src/json-rpc-transport/json-rpc-errors.ts
+// src/json-rpc-errors.ts
 var SolanaJsonRpcError = class extends Error {
@@ -52,3 +17,3 @@ constructor(details) {
 
-// src/json-rpc-transport/json-rpc-message-id.ts
+// src/json-rpc-message-id.ts
 var _nextMessageId = 0;
@@ -61,3 +26,3 @@ function getNextMessageId() {
 
-// src/json-rpc-transport/json-rpc-message.ts
+// src/json-rpc-message.ts
 function createJsonRpcMessage(method, params) {
@@ -72,90 +37,22 @@ return {
 
-// src/params-patcher.ts
-function visitNode(value, keyPath, onIntegerOverflow) {
-  if (Array.isArray(value)) {
-    return value.map(
-      (element, ii) => visitNode(element, [...keyPath, ii], onIntegerOverflow)
-    );
-  } else if (typeof value === "object" && value !== null) {
-    const out = {};
-    for (const propName in value) {
-      if (Object.prototype.hasOwnProperty.call(value, propName)) {
-        out[propName] = visitNode(value[propName], [...keyPath, propName], onIntegerOverflow);
+// src/json-rpc.ts
+function createPendingRpcRequest(rpcConfig, pendingRequest) {
+  return {
+    async send(options) {
+      const { methodName, params, responseProcessor } = pendingRequest;
+      const payload = createJsonRpcMessage(methodName, params);
+      const response = await rpcConfig.transport({
+        payload,
+        signal: options?.abortSignal
+      });
+      if ("error" in response) {
+        throw new SolanaJsonRpcError(response.error);
+      } else {
+        return responseProcessor ? responseProcessor(response.result) : response.result;
       }
     }
-    return out;
-  } else if (typeof value === "bigint") {
-    if (onIntegerOverflow && (value > Number.MAX_SAFE_INTEGER || value < -Number.MAX_SAFE_INTEGER)) {
-      onIntegerOverflow(keyPath, value);
-    }
-    return Number(value);
-  } else {
-    return value;
-  }
-}
-function patchParamsForSolanaLabsRpc(params, onIntegerOverflow) {
-  return visitNode(params, [], onIntegerOverflow);
-}
-
-// src/response-patcher-types.ts
-var KEYPATH_WILDCARD = {};
-
-// src/response-patcher-allowed-numeric-values.ts
-var ALLOWED_NUMERIC_KEYPATHS = {
-  getInflationReward: [[KEYPATH_WILDCARD, "commission"]]
-};
-
-// src/response-patcher.ts
-function getNextAllowedKeypaths(keyPaths, property) {
-  return keyPaths.filter((keyPath) => keyPath[0] === KEYPATH_WILDCARD && typeof property === "number" || keyPath[0] === property).map((keyPath) => keyPath.slice(1));
-}
-function visitNode2(value, allowedKeypaths) {
-  if (Array.isArray(value)) {
-    return value.map((element, ii) => {
-      const nextAllowedKeypaths = getNextAllowedKeypaths(allowedKeypaths, ii);
-      return visitNode2(element, nextAllowedKeypaths);
-    });
-  } else if (typeof value === "object" && value !== null) {
-    const out = {};
-    for (const propName in value) {
-      if (Object.prototype.hasOwnProperty.call(value, propName)) {
-        const nextAllowedKeypaths = getNextAllowedKeypaths(allowedKeypaths, propName);
-        out[propName] = visitNode2(value[propName], nextAllowedKeypaths);
-      }
-    }
-    return out;
-  } else if (typeof value === "number" && // The presence of an allowed keypath on the route to this value implies it's allowlisted;
-  // Upcast the value to `bigint` unless an allowed keypath is present.
-  allowedKeypaths.length === 0) {
-    return BigInt(value);
-  } else {
-    return value;
-  }
-}
-function patchResponseForSolanaLabsRpc(response, methodName) {
-  return visitNode2(response, (methodName && ALLOWED_NUMERIC_KEYPATHS[methodName]) ?? []);
-}
-
-// src/json-rpc-transport/index.ts
-function createArmedJsonRpcTransport(transportConfig, pendingMessage) {
-  const { url } = transportConfig;
-  const transport = {
-    async send() {
-      return await sendPayload(pendingMessage, url);
-    }
   };
-  return makeProxy(transport, transportConfig, pendingMessage);
 }
-function createArmedBatchJsonRpcTransport(transportConfig, pendingMessages) {
-  const { url } = transportConfig;
-  const transport = {
-    async sendBatch() {
-      return await sendPayload(pendingMessages, url);
-    }
-  };
-  return makeProxy(transport, transportConfig, pendingMessages);
-}
-function makeProxy(transport, transportConfig, pendingRequestOrRequests) {
-  const { onIntegerOverflow } = transportConfig;
-  return new Proxy(transport, {
+function makeProxy(rpcConfig) {
+  return new Proxy(rpcConfig.api, {
     defineProperty() {
@@ -167,19 +64,8 @@ return false;
     },
-    get(...args) {
-      const [target, p] = args;
-      return p in target ? Reflect.get(...args) : function(...params) {
+    get(target, p, receiver) {
+      return function(...rawParams) {
         const methodName = p.toString();
-        const patchedParams = patchParamsForSolanaLabsRpc(
-          params,
-          onIntegerOverflow ? (keyPath, value) => {
-            onIntegerOverflow(methodName, keyPath, value);
-          } : void 0
-        );
-        const newMessage = createJsonRpcMessage(methodName, patchedParams);
-        if (pendingRequestOrRequests == null) {
-          return createArmedJsonRpcTransport(transportConfig, newMessage);
-        } else {
-          const nextPendingMessages = Array.isArray(pendingRequestOrRequests) ? [...pendingRequestOrRequests, newMessage] : [pendingRequestOrRequests, newMessage];
-          return createArmedBatchJsonRpcTransport(transportConfig, nextPendingMessages);
-        }
+        const createRpcRequest = Reflect.get(target, methodName, receiver);
+        const newRequest = createRpcRequest ? createRpcRequest(...rawParams) : { methodName, params: rawParams };
+        return createPendingRpcRequest(rpcConfig, newRequest);
       };
@@ -189,33 +75,114 @@ }
 }
-function processResponse(response, methodName) {
-  if ("error" in response) {
-    throw new SolanaJsonRpcError(response.error);
-  } else {
-    const patchedResponse = patchResponseForSolanaLabsRpc(
-      response.result,
-      methodName
-      // FIXME: Untangle these types by moving the patcher into `rpc-core`
+function createJsonRpc(rpcConfig) {
+  return makeProxy(rpcConfig);
+}
+
+// ../fetch-impl/dist/index.browser.js
+var e = globalThis.fetch;
+
+// src/transports/http/http-transport-errors.ts
+var SolanaHttpError = class extends Error {
+  constructor(details) {
+    super(`HTTP error (${details.statusCode}): ${details.message}`);
+    Error.captureStackTrace(this, this.constructor);
+    this.statusCode = details.statusCode;
+  }
+  get name() {
+    return "SolanaHttpError";
+  }
+};
+
+// src/transports/http/http-transport-headers.ts
+var DISALLOWED_HEADERS = {
+  accept: true,
+  "content-length": true,
+  "content-type": true
+};
+var FORBIDDEN_HEADERS = {
+  "accept-charset": true,
+  "accept-encoding": true,
+  "access-control-request-headers": true,
+  "access-control-request-method": true,
+  connection: true,
+  "content-length": true,
+  cookie: true,
+  date: true,
+  dnt: true,
+  expect: true,
+  host: true,
+  "keep-alive": true,
+  origin: true,
+  "permissions-policy": true,
+  // No currently available Typescript technique allows you to match on a prefix.
+  // 'proxy-':true,
+  // 'sec-':true,
+  referer: true,
+  te: true,
+  trailer: true,
+  "transfer-encoding": true,
+  upgrade: true,
+  via: true
+};
+function assertIsAllowedHttpRequestHeaders(headers) {
+  const badHeaders = Object.keys(headers).filter((headerName) => {
+    const lowercaseHeaderName = headerName.toLowerCase();
+    return DISALLOWED_HEADERS[headerName.toLowerCase()] === true || FORBIDDEN_HEADERS[headerName.toLowerCase()] === true || lowercaseHeaderName.startsWith("proxy-") || lowercaseHeaderName.startsWith("sec-");
+  });
+  if (badHeaders.length > 0) {
+    throw new Error(
+      `${badHeaders.length > 1 ? "These headers are" : "This header is"} forbidden: \`${badHeaders.join("`, `")}\`. Learn more at https://developer.mozilla.org/en-US/docs/Glossary/Forbidden_header_name.`
     );
-    return patchedResponse;
   }
 }
-async function sendPayload(payload, url) {
-  const responseOrResponses = await makeHttpRequest({
-    payload,
-    url
-  });
-  if (Array.isArray(responseOrResponses)) {
-    const requestOrder = payload.map((p) => p.id);
-    return responseOrResponses.sort((a, b) => requestOrder.indexOf(a.id) - requestOrder.indexOf(b.id)).map((response, ii) => processResponse(response, payload[ii].method));
-  } else {
-    return processResponse(responseOrResponses, payload.method);
+function normalizeHeaders(headers) {
+  const out = {};
+  for (const headerName in headers) {
+    out[headerName.toLowerCase()] = headers[headerName];
   }
+  return out;
 }
-function createJsonRpcTransport(transportConfig) {
-  const transport = {};
-  return makeProxy(transport, transportConfig);
+
+// src/transports/http/http-transport.ts
+function createHttpTransport({ httpAgentNodeOnly, headers, url }) {
+  if (__DEV__ && headers) {
+    assertIsAllowedHttpRequestHeaders(headers);
+  }
+  const agent = void 0;
+  if (__DEV__ && httpAgentNodeOnly != null) {
+    console.warn(
+      "createHttpTransport(): The `httpAgentNodeOnly` config you supplied has been ignored; HTTP agents are only usable in Node environments."
+    );
+  }
+  const customHeaders = headers && normalizeHeaders(headers);
+  return async function makeHttpRequest({
+    payload,
+    signal
+  }) {
+    const body = JSON.stringify(payload);
+    const requestInfo = {
+      agent,
+      body,
+      headers: {
+        ...customHeaders,
+        // Keep these headers lowercase so they will override any user-supplied headers above.
+        accept: "application/json",
+        "content-length": body.length.toString(),
+        "content-type": "application/json; charset=utf-8"
+      },
+      method: "POST",
+      signal
+    };
+    const response = await e(url, requestInfo);
+    if (!response.ok) {
+      throw new SolanaHttpError({
+        message: response.statusText,
+        statusCode: response.status
+      });
+    }
+    return await response.json();
+  };
 }
 
-export { createJsonRpcTransport };
+export { createHttpTransport, createJsonRpc };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.native.js.map

dist/index.node.js

@@ -1,36 +0,7 @@
-import fetchImplNode from 'node-fetch';
+import t from 'node-fetch';
 
-// src/http-request-errors.ts
-var SolanaHttpError = class extends Error {
-  constructor(details) {
-    super(`HTTP error (${details.statusCode}): ${details.message}`);
-    Error.captureStackTrace(this, this.constructor);
-    this.statusCode = details.statusCode;
-  }
-  get name() {
-    return "SolanaHttpError";
-  }
-};
-async function makeHttpRequest({ payload, url }) {
-  const requestInfo = {
-    body: JSON.stringify(payload),
-    headers: {
-      "Content-type": "application/json"
-    },
-    method: "POST"
-  };
-  let response;
-  {
-    response = await fetchImplNode(url, requestInfo);
-  }
-  if (!response.ok) {
-    throw new SolanaHttpError({
-      message: response.statusText,
-      statusCode: response.status
-    });
-  }
-  return await response.json();
-}
+// ../build-scripts/env-shim.ts
+var __DEV__ = /* @__PURE__ */ (() => process["env"].NODE_ENV === "development")();
 
-// src/json-rpc-transport/json-rpc-errors.ts
+// src/json-rpc-errors.ts
 var SolanaJsonRpcError = class extends Error {
@@ -48,3 +19,3 @@ constructor(details) {
 
-// src/json-rpc-transport/json-rpc-message-id.ts
+// src/json-rpc-message-id.ts
 var _nextMessageId = 0;
@@ -57,3 +28,3 @@ function getNextMessageId() {
 
-// src/json-rpc-transport/json-rpc-message.ts
+// src/json-rpc-message.ts
 function createJsonRpcMessage(method, params) {
@@ -68,90 +39,22 @@ return {
 
-// src/params-patcher.ts
-function visitNode(value, keyPath, onIntegerOverflow) {
-  if (Array.isArray(value)) {
-    return value.map(
-      (element, ii) => visitNode(element, [...keyPath, ii], onIntegerOverflow)
-    );
-  } else if (typeof value === "object" && value !== null) {
-    const out = {};
-    for (const propName in value) {
-      if (Object.prototype.hasOwnProperty.call(value, propName)) {
-        out[propName] = visitNode(value[propName], [...keyPath, propName], onIntegerOverflow);
+// src/json-rpc.ts
+function createPendingRpcRequest(rpcConfig, pendingRequest) {
+  return {
+    async send(options) {
+      const { methodName, params, responseProcessor } = pendingRequest;
+      const payload = createJsonRpcMessage(methodName, params);
+      const response = await rpcConfig.transport({
+        payload,
+        signal: options?.abortSignal
+      });
+      if ("error" in response) {
+        throw new SolanaJsonRpcError(response.error);
+      } else {
+        return responseProcessor ? responseProcessor(response.result) : response.result;
       }
     }
-    return out;
-  } else if (typeof value === "bigint") {
-    if (onIntegerOverflow && (value > Number.MAX_SAFE_INTEGER || value < -Number.MAX_SAFE_INTEGER)) {
-      onIntegerOverflow(keyPath, value);
-    }
-    return Number(value);
-  } else {
-    return value;
-  }
-}
-function patchParamsForSolanaLabsRpc(params, onIntegerOverflow) {
-  return visitNode(params, [], onIntegerOverflow);
-}
-
-// src/response-patcher-types.ts
-var KEYPATH_WILDCARD = {};
-
-// src/response-patcher-allowed-numeric-values.ts
-var ALLOWED_NUMERIC_KEYPATHS = {
-  getInflationReward: [[KEYPATH_WILDCARD, "commission"]]
-};
-
-// src/response-patcher.ts
-function getNextAllowedKeypaths(keyPaths, property) {
-  return keyPaths.filter((keyPath) => keyPath[0] === KEYPATH_WILDCARD && typeof property === "number" || keyPath[0] === property).map((keyPath) => keyPath.slice(1));
-}
-function visitNode2(value, allowedKeypaths) {
-  if (Array.isArray(value)) {
-    return value.map((element, ii) => {
-      const nextAllowedKeypaths = getNextAllowedKeypaths(allowedKeypaths, ii);
-      return visitNode2(element, nextAllowedKeypaths);
-    });
-  } else if (typeof value === "object" && value !== null) {
-    const out = {};
-    for (const propName in value) {
-      if (Object.prototype.hasOwnProperty.call(value, propName)) {
-        const nextAllowedKeypaths = getNextAllowedKeypaths(allowedKeypaths, propName);
-        out[propName] = visitNode2(value[propName], nextAllowedKeypaths);
-      }
-    }
-    return out;
-  } else if (typeof value === "number" && // The presence of an allowed keypath on the route to this value implies it's allowlisted;
-  // Upcast the value to `bigint` unless an allowed keypath is present.
-  allowedKeypaths.length === 0) {
-    return BigInt(value);
-  } else {
-    return value;
-  }
-}
-function patchResponseForSolanaLabsRpc(response, methodName) {
-  return visitNode2(response, (methodName && ALLOWED_NUMERIC_KEYPATHS[methodName]) ?? []);
-}
-
-// src/json-rpc-transport/index.ts
-function createArmedJsonRpcTransport(transportConfig, pendingMessage) {
-  const { url } = transportConfig;
-  const transport = {
-    async send() {
-      return await sendPayload(pendingMessage, url);
-    }
   };
-  return makeProxy(transport, transportConfig, pendingMessage);
 }
-function createArmedBatchJsonRpcTransport(transportConfig, pendingMessages) {
-  const { url } = transportConfig;
-  const transport = {
-    async sendBatch() {
-      return await sendPayload(pendingMessages, url);
-    }
-  };
-  return makeProxy(transport, transportConfig, pendingMessages);
-}
-function makeProxy(transport, transportConfig, pendingRequestOrRequests) {
-  const { onIntegerOverflow } = transportConfig;
-  return new Proxy(transport, {
+function makeProxy(rpcConfig) {
+  return new Proxy(rpcConfig.api, {
     defineProperty() {
@@ -163,19 +66,8 @@ return false;
     },
-    get(...args) {
-      const [target, p] = args;
-      return p in target ? Reflect.get(...args) : function(...params) {
+    get(target, p, receiver) {
+      return function(...rawParams) {
         const methodName = p.toString();
-        const patchedParams = patchParamsForSolanaLabsRpc(
-          params,
-          onIntegerOverflow ? (keyPath, value) => {
-            onIntegerOverflow(methodName, keyPath, value);
-          } : void 0
-        );
-        const newMessage = createJsonRpcMessage(methodName, patchedParams);
-        if (pendingRequestOrRequests == null) {
-          return createArmedJsonRpcTransport(transportConfig, newMessage);
-        } else {
-          const nextPendingMessages = Array.isArray(pendingRequestOrRequests) ? [...pendingRequestOrRequests, newMessage] : [pendingRequestOrRequests, newMessage];
-          return createArmedBatchJsonRpcTransport(transportConfig, nextPendingMessages);
-        }
+        const createRpcRequest = Reflect.get(target, methodName, receiver);
+        const newRequest = createRpcRequest ? createRpcRequest(...rawParams) : { methodName, params: rawParams };
+        return createPendingRpcRequest(rpcConfig, newRequest);
       };
@@ -185,33 +77,112 @@ }
 }
-function processResponse(response, methodName) {
-  if ("error" in response) {
-    throw new SolanaJsonRpcError(response.error);
-  } else {
-    const patchedResponse = patchResponseForSolanaLabsRpc(
-      response.result,
-      methodName
-      // FIXME: Untangle these types by moving the patcher into `rpc-core`
+function createJsonRpc(rpcConfig) {
+  return makeProxy(rpcConfig);
+}
+var f = t;
+
+// src/transports/http/http-transport-errors.ts
+var SolanaHttpError = class extends Error {
+  constructor(details) {
+    super(`HTTP error (${details.statusCode}): ${details.message}`);
+    Error.captureStackTrace(this, this.constructor);
+    this.statusCode = details.statusCode;
+  }
+  get name() {
+    return "SolanaHttpError";
+  }
+};
+
+// src/transports/http/http-transport-headers.ts
+var DISALLOWED_HEADERS = {
+  accept: true,
+  "content-length": true,
+  "content-type": true
+};
+var FORBIDDEN_HEADERS = {
+  "accept-charset": true,
+  "accept-encoding": true,
+  "access-control-request-headers": true,
+  "access-control-request-method": true,
+  connection: true,
+  "content-length": true,
+  cookie: true,
+  date: true,
+  dnt: true,
+  expect: true,
+  host: true,
+  "keep-alive": true,
+  origin: true,
+  "permissions-policy": true,
+  // No currently available Typescript technique allows you to match on a prefix.
+  // 'proxy-':true,
+  // 'sec-':true,
+  referer: true,
+  te: true,
+  trailer: true,
+  "transfer-encoding": true,
+  upgrade: true,
+  via: true
+};
+function assertIsAllowedHttpRequestHeaders(headers) {
+  const badHeaders = Object.keys(headers).filter((headerName) => {
+    const lowercaseHeaderName = headerName.toLowerCase();
+    return DISALLOWED_HEADERS[headerName.toLowerCase()] === true || FORBIDDEN_HEADERS[headerName.toLowerCase()] === true || lowercaseHeaderName.startsWith("proxy-") || lowercaseHeaderName.startsWith("sec-");
+  });
+  if (badHeaders.length > 0) {
+    throw new Error(
+      `${badHeaders.length > 1 ? "These headers are" : "This header is"} forbidden: \`${badHeaders.join("`, `")}\`. Learn more at https://developer.mozilla.org/en-US/docs/Glossary/Forbidden_header_name.`
     );
-    return patchedResponse;
   }
 }
-async function sendPayload(payload, url) {
-  const responseOrResponses = await makeHttpRequest({
-    payload,
-    url
-  });
-  if (Array.isArray(responseOrResponses)) {
-    const requestOrder = payload.map((p) => p.id);
-    return responseOrResponses.sort((a, b) => requestOrder.indexOf(a.id) - requestOrder.indexOf(b.id)).map((response, ii) => processResponse(response, payload[ii].method));
-  } else {
-    return processResponse(responseOrResponses, payload.method);
+function normalizeHeaders(headers) {
+  const out = {};
+  for (const headerName in headers) {
+    out[headerName.toLowerCase()] = headers[headerName];
   }
+  return out;
 }
-function createJsonRpcTransport(transportConfig) {
-  const transport = {};
-  return makeProxy(transport, transportConfig);
+
+// src/transports/http/http-transport.ts
+function createHttpTransport({ httpAgentNodeOnly, headers, url }) {
+  if (__DEV__ && headers) {
+    assertIsAllowedHttpRequestHeaders(headers);
+  }
+  const agent = httpAgentNodeOnly ;
+  if (__DEV__ && httpAgentNodeOnly != null) {
+    console.warn(
+      "createHttpTransport(): The `httpAgentNodeOnly` config you supplied has been ignored; HTTP agents are only usable in Node environments."
+    );
+  }
+  const customHeaders = headers && normalizeHeaders(headers);
+  return async function makeHttpRequest({
+    payload,
+    signal
+  }) {
+    const body = JSON.stringify(payload);
+    const requestInfo = {
+      agent,
+      body,
+      headers: {
+        ...customHeaders,
+        // Keep these headers lowercase so they will override any user-supplied headers above.
+        accept: "application/json",
+        "content-length": body.length.toString(),
+        "content-type": "application/json; charset=utf-8"
+      },
+      method: "POST",
+      signal
+    };
+    const response = await f(url, requestInfo);
+    if (!response.ok) {
+      throw new SolanaHttpError({
+        message: response.statusText,
+        statusCode: response.status
+      });
+    }
+    return await response.json();
+  };
 }
 
-export { createJsonRpcTransport };
+export { createHttpTransport, createJsonRpc };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.node.js.map

dist/types/index.d.ts

@@ -1,2 +0,3 @@
-export * from './json-rpc-transport';
+export * from './json-rpc';
+export * from './transports/http/http-transport';
 //# sourceMappingURL=index.d.ts.map

package.json

 {
   "name": "@solana/rpc-transport",
-  "version": "2.0.0-experimental.044c967",
+  "version": "2.0.0-experimental.09348ce",
   "description": "Network transports for accessing the Solana JSON RPC API",
@@ -49,11 +49,11 @@ "exports": {
   "devDependencies": {
-    "@solana/eslint-config-solana": "^0.0.4",
+    "@solana/eslint-config-solana": "^1.0.1",
     "@swc/core": "^1.3.18",
     "@swc/jest": "^0.2.23",
-    "@types/jest": "^29.5.0",
-    "@types/node-fetch": "2",
-    "@typescript-eslint/eslint-plugin": "^5.43.0",
-    "@typescript-eslint/parser": "^5.43.0",
-    "agadoo": "^2.0.0",
-    "eslint": "^8.27.0",
+    "@types/jest": "^29.5.1",
+    "@types/node": "^16",
+    "@typescript-eslint/eslint-plugin": "^5.57.1",
+    "@typescript-eslint/parser": "^5.57.1",
+    "agadoo": "^3.0.0",
+    "eslint": "^8.37.0",
     "eslint-plugin-jest": "^27.1.5",
@@ -64,14 +64,13 @@ "eslint-plugin-react-hooks": "^4.6.0",
     "jest-environment-jsdom": "^29.5.0",
-    "jest-fetch-mock": "^3.0.3",
+    "jest-fetch-mock-fork": "^3.0.4",
     "jest-runner-eslint": "^2.0.0",
     "jest-runner-prettier": "^1.0.0",
     "postcss": "^8.4.12",
-    "prettier": "^2.7.1",
+    "prettier": "^2.8.8",
     "ts-node": "^10.9.1",
     "tsup": "6.7.0",
-    "turbo": "^1.6.3",
-    "typescript": "^4.9",
+    "typescript": "^5.0.4",
     "version-from-git": "^1.1.1",
-    "@solana/fetch-impl-browser": "0.0.0-development",
     "build-scripts": "0.0.0",
+    "fetch-impl": "0.0.0",
     "test-config": "0.0.0",
@@ -88,11 +87,6 @@ "tsconfig": "0.0.0"
   },
-  "dependencies": {
-    "node-fetch": "^2.6.7",
-    "@solana/keys": "2.0.0-experimental.044c967",
-    "@solana/rpc-core": "2.0.0-experimental.044c967"
-  },
   "scripts": {
     "compile:js": "tsup --config build-scripts/tsup.config.package.ts",
     "compile:typedefs": "tsc -p ./tsconfig.declarations.json",
-    "dev": "jest -c node_modules/test-config/jest-dev.config.ts --globalSetup test-config/test-validator-setup.js --globalTeardown test-config/test-validator-teardown.js --rootDir . --watch",
+    "dev": "jest -c node_modules/test-config/jest-dev.config.ts --rootDir . --watch",
     "publish-packages": "pnpm publish --tag experimental --access public --no-git-checks",
@@ -105,5 +99,5 @@ "test:lint": "jest -c node_modules/test-config/jest-lint.config.ts --rootDir . --silent",
     "test:typecheck": "tsc --noEmit",
-    "test:unit:browser": "jest -c node_modules/test-config/jest-unit.config.browser.ts --globalSetup test-config/test-validator-setup.js --globalTeardown test-config/test-validator-teardown.js --rootDir . --silent",
-    "test:unit:node": "jest -c node_modules/test-config/jest-unit.config.node.ts --globalSetup test-config/test-validator-setup.js --globalTeardown test-config/test-validator-teardown.js --rootDir . --silent"
+    "test:unit:browser": "jest -c node_modules/test-config/jest-unit.config.browser.ts --rootDir . --silent",
+    "test:unit:node": "jest -c node_modules/test-config/jest-unit.config.node.ts --rootDir . --silent"
   }
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Network access

Supply chain risk

This module accesses the network.

Found 1 instance in 1 package

No README

Quality

Package does not have a README. This may indicate a failed publish or a low quality package.

Found 1 instance in 1 package

Improved metrics

Dependency count

0

decreased by-100%

Dev dependency count

27

decreased by-3.57%

Number of medium quality alerts

1

decreased by-50%

Number of lines in readme file

83

increased byInfinity%

Number of medium supply chain risk alerts

1

decreased by-66.67%

Worsened metrics

Total package byte prevSize

129511

decreased by-29.6%

Number of package files

34

decreased by-8.11%

Lines of code

1203

decreased by-27.49%

Dependency changes

• - Removed@solana/keys@2.0.0-experimental.044c967

• - Removed@solana/rpc-core@2.0.0-experimental.044c967

• - Removednode-fetch@^2.6.7

• - Removed@solana/keys@2.0.0-experimental.044c967(transitive)

• - Removed@solana/rpc-core@2.0.0-experimental.044c967(transitive)

• - Removedbase-x@4.0.0(transitive)

• - Removedbs58@5.0.0(transitive)

• - Removednode-fetch@2.7.0(transitive)

• - Removedtr46@0.0.3(transitive)

• - Removedwebidl-conversions@3.0.1(transitive)

• - Removedwhatwg-url@5.0.0(transitive)