@lightsparkdev/core 1.0.9 → 1.0.11

package/dist/utils/index.d.ts

@@ -7,26 +7,53 @@ declare function createSha256Hash(data: SourceData): Promise<Uint8Array>;
 declare function createSha256Hash(data: SourceData, asHex: true): Promise<string>;
 
 declare const defaultCurrencyCode = "USD";
-/** This enum identifies the unit of currency associated with a CurrencyAmount. **/
+/**
+ * This enum identifies the unit of currency associated with a CurrencyAmount.
+ * *
+ */
 declare enum CurrencyUnit {
     /**
-     * This is an enum value that represents values that could be added in the future.
-     * Clients should support unknown values as more of them could be added without notice.
+     * This is an enum value that represents values that could be added in the
+     * future. Clients should support unknown values as more of them could be
+     * added without notice.
      */
     FUTURE_VALUE = "FUTURE_VALUE",
-    /** Bitcoin is the cryptocurrency native to the Bitcoin network. It is used as the native medium for value transfer for the Lightning Network. **/
+    /**
+     * Bitcoin is the cryptocurrency native to the Bitcoin network.
+     * It is used as the native medium for value transfer for the Lightning
+     * Network. *
+     */
     BITCOIN = "BITCOIN",
-    /** 0.00000001 (10e-8) Bitcoin or one hundred millionth of a Bitcoin. This is the unit most commonly used in Lightning transactions. **/
+    /**
+     * 0.00000001 (10e-8) Bitcoin or one hundred millionth of a Bitcoin.
+     * This is the unit most commonly used in Lightning transactions.
+     * *
+     */
     SATOSHI = "SATOSHI",
-    /** 0.001 Satoshi, or 10e-11 Bitcoin. We recommend using the Satoshi unit instead when possible. **/
+    /**
+     * 0.001 Satoshi, or 10e-11 Bitcoin. We recommend using the Satoshi unit
+     * instead when possible. *
+     */
     MILLISATOSHI = "MILLISATOSHI",
     /** United States Dollar. **/
     USD = "USD",
-    /** 0.000000001 (10e-9) Bitcoin or a billionth of a Bitcoin. We recommend using the Satoshi unit instead when possible. **/
+    /**
+     * 0.000000001 (10e-9) Bitcoin or a billionth of a Bitcoin.
+     * We recommend using the Satoshi unit instead when possible.
+     * *
+     */
     NANOBITCOIN = "NANOBITCOIN",
-    /** 0.000001 (10e-6) Bitcoin or a millionth of a Bitcoin. We recommend using the Satoshi unit instead when possible. **/
+    /**
+     * 0.000001 (10e-6) Bitcoin or a millionth of a Bitcoin.
+     * We recommend using the Satoshi unit instead when possible.
+     * *
+     */
     MICROBITCOIN = "MICROBITCOIN",
-    /** 0.001 (10e-3) Bitcoin or a thousandth of a Bitcoin. We recommend using the Satoshi unit instead when possible. **/
+    /**
+     * 0.001 (10e-3) Bitcoin or a thousandth of a Bitcoin.
+     * We recommend using the Satoshi unit instead when possible.
+     * *
+     */
     MILLIBITCOIN = "MILLIBITCOIN"
 }
 /** This object represents the value and unit for an amount of currency. **/
@@ -38,13 +65,15 @@ type CurrencyAmountType = {
     /** The unit of user's preferred currency. **/
     preferredCurrencyUnit: CurrencyUnit;
     /**
-     * The rounded numeric value for this CurrencyAmount in the very base level of user's preferred
-     * currency. For example, for USD, the value will be in cents.
+     * The rounded numeric value for this CurrencyAmount in the very base level
+     * of user's preferred currency. For example, for USD, the value will be in
+     * cents.
      **/
     preferredCurrencyValueRounded: number;
     /**
-     * The approximate float value for this CurrencyAmount in the very base level of user's preferred
-     * currency. For example, for USD, the value will be in cents.
+     * The approximate float value for this CurrencyAmount in the very base level
+     * of user's preferred currency. For example, for USD, the value will be in
+     * cents.
      **/
     preferredCurrencyValueApprox: number;
 };
@@ -192,13 +221,14 @@ declare function linearInterpolate(value: number, fromRangeStart: number, fromRa
 declare function round(num: number, decimalPlaces?: number): number;
 declare function isNumber(value: unknown): value is number;
 
-declare function pollUntil<D extends () => Promise<unknown>, T>(asyncFn: D, getValue: (data: Awaited<ReturnType<D>>, response: {
+type GetValueResult<T> = {
     stopPolling: boolean;
     value: null | T;
-}) => {
+};
+declare function pollUntil<D extends () => Promise<unknown>, T>(asyncFn: D, getValue: (data: Awaited<ReturnType<D>>, response: {
     stopPolling: boolean;
     value: null | T;
-}, maxPolls?: number, pollIntervalMs?: number, ignoreErrors?: boolean | ((e: unknown) => boolean), getMaxPollsError?: (maxPolls: number) => Error): Promise<T>;
+}) => GetValueResult<T>, maxPolls?: number, pollIntervalMs?: number, ignoreErrors?: boolean | ((e: unknown) => boolean), getMaxPollsError?: (maxPolls: number) => Error): Promise<T>;
 
 declare function sleep(ms: number): Promise<unknown>;
 
@@ -215,5 +245,8 @@ declare const isType: <T extends string>(typename: T) => <N extends {
 }>(node: N | null | undefined) => node is Extract<N, {
     __typename: T;
 }>;
+type DeepPartial<T> = T extends object ? {
+    [P in keyof T]?: DeepPartial<T[P]>;
+} : T;
 
-export { ById, CurrencyAmountArg, CurrencyAmountObj, CurrencyAmountType, CurrencyCodes, CurrencyLocales, CurrencyMap, CurrencyUnit, ExpandRecursively, Maybe, OmitTypename, abbrCurrencyUnit, b64decode, b64encode, bytesToHex, clamp, convertCurrencyAmount, convertCurrencyAmountValue, countryCodesToCurrencyCodes, createSha256Hash, defaultCurrencyCode, formatCurrencyStr, getCurrentLocale, getErrorMsg, hexToBytes, isBrowser, isCurrencyAmount, isCurrencyAmountObj, isCurrencyMap, isError, isErrorMsg, isErrorWithMessage, isNode, isNumber, isTest, isType, linearInterpolate, localeToCurrencyCode, localeToCurrencySymbol, mapCurrencyAmount, pollUntil, round, separateCurrencyStrParts, sleep, urlsafe_b64decode };
+export { ById, CurrencyAmountArg, CurrencyAmountObj, CurrencyAmountType, CurrencyCodes, CurrencyLocales, CurrencyMap, CurrencyUnit, DeepPartial, ExpandRecursively, Maybe, OmitTypename, abbrCurrencyUnit, b64decode, b64encode, bytesToHex, clamp, convertCurrencyAmount, convertCurrencyAmountValue, countryCodesToCurrencyCodes, createSha256Hash, defaultCurrencyCode, formatCurrencyStr, getCurrentLocale, getErrorMsg, hexToBytes, isBrowser, isCurrencyAmount, isCurrencyAmountObj, isCurrencyMap, isError, isErrorMsg, isErrorWithMessage, isNode, isNumber, isTest, isType, linearInterpolate, localeToCurrencyCode, localeToCurrencySymbol, mapCurrencyAmount, pollUntil, round, separateCurrencyStrParts, sleep, urlsafe_b64decode };

package/dist/utils/index.js

@@ -34,7 +34,7 @@ import {
   separateCurrencyStrParts,
   sleep,
   urlsafe_b64decode
-} from "../chunk-UU6SHVGX.js";
+} from "../chunk-F3XHLUGC.js";
 export {
   CurrencyUnit,
   abbrCurrencyUnit,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightsparkdev/core",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Lightspark JS SDK",
   "author": "Lightspark Inc.",
   "keywords": [
@@ -61,7 +61,7 @@
   ],
   "scripts": {
     "build": "yarn tsc && tsup",
-    "build:watch": "yarn build --watch",
+    "build:watch": "yarn build --watch --clean=false",
     "clean": "rm -rf .turbo && rm -rf dist",
     "dev": "yarn build -- --watch",
     "format:fix": "prettier src --write",
@@ -96,11 +96,11 @@
     "eslint": "^8.3.0",
     "eslint-watch": "^8.0.0",
     "jest": "^29.6.2",
-    "prettier": "3.0.2",
-    "prettier-plugin-organize-imports": "^3.2.2",
+    "prettier": "3.0.3",
+    "prettier-plugin-organize-imports": "^3.2.4",
     "ts-jest": "^29.1.1",
     "tsc-absolute": "^1.0.1",
-    "tsup": "^6.7.0",
-    "typescript": "^4.9.5"
+    "tsup": "^7.2.0",
+    "typescript": "^5.0.0"
   }
 }

package/src/Logger.ts

@@ -9,7 +9,7 @@ export class Logger {
 
   constructor(loggerContext: string, getLoggingEnabled?: GetLoggingEnabled) {
     this.context = loggerContext;
-    this.updateLoggingEnabled(getLoggingEnabled);
+    void this.updateLoggingEnabled(getLoggingEnabled);
   }
 
   async updateLoggingEnabled(getLoggingEnabled: GetLoggingEnabled) {

package/src/auth/StubAuthProvider.ts

@@ -4,14 +4,13 @@ import type AuthProvider from "./AuthProvider.js";
 import { type Headers, type WsConnectionParams } from "./AuthProvider.js";
 
 export default class StubAuthProvider implements AuthProvider {
-  async addAuthHeaders(headers: Headers) {
-    return headers;
+  addAuthHeaders(headers: Headers) {
+    return Promise.resolve(headers);
   }
-  async isAuthorized(): Promise<boolean> {
-    return false;
+  isAuthorized(): Promise<boolean> {
+    return Promise.resolve(false);
   }
-
-  async addWsConnectionParams(params: WsConnectionParams) {
-    return params;
+  addWsConnectionParams(params: WsConnectionParams) {
+    return Promise.resolve(params);
   }
 }

package/src/crypto/crypto.ts

@@ -117,6 +117,8 @@ const deriveKey = async (
   return [key, iv];
 };
 
+type Header = { v: number; i: number; lsv?: number };
+
 const decrypt = async (
   header_json: string,
   ciphertext: string,
@@ -124,7 +126,7 @@ const decrypt = async (
 ): Promise<ArrayBuffer> => {
   let decoded = b64decode(ciphertext);
 
-  let header;
+  let header: Header;
   if (header_json === "AES_256_CBC_PBKDF2_5000_SHA256") {
     header = {
       v: 0,
@@ -133,13 +135,13 @@ const decrypt = async (
     // Strip "Salted__" prefix
     decoded = decoded.slice(8);
   } else {
-    header = JSON.parse(header_json);
+    header = JSON.parse(header_json) as Header;
   }
 
   if (header.v < 0 || header.v > 4) {
     throw new LightsparkException(
       "DecryptionError",
-      "Unknown version ".concat(header.v),
+      `Unknown version ${header.v}`,
     );
   }
 
@@ -152,8 +154,7 @@ const decrypt = async (
     const salt = decoded.slice(decoded.length - 8, decoded.length);
     const nonce = decoded.slice(0, 12);
     const cipherText = decoded.slice(12, decoded.length - 8);
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const [key, _iv] = await deriveKey(
+    const [key /* , _iv */] = await deriveKey(
       password,
       salt,
       header.i,
@@ -244,7 +245,7 @@ const sign = async (
       name: "RSA-PSS",
       saltLength: 32,
     },
-    keyOrAlias as CryptoKey,
+    keyOrAlias,
     data,
   );
 };

package/src/crypto/index.ts

@@ -1,8 +1,8 @@
 // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
 
-export * from "./crypto.js";
 export * from "./KeyOrAlias.js";
 export { default as LightsparkSigningException } from "./LightsparkSigningException.js";
 export { default as NodeKeyCache } from "./NodeKeyCache.js";
 export * from "./SigningKey.js";
+export * from "./crypto.js";
 export * from "./types.js";

package/src/crypto/tests/crypto.test.ts

@@ -0,0 +1,21 @@
+import { describe, expect, test } from "@jest/globals";
+import { DefaultCrypto, b64encode } from "../../index.js";
+
+describe("Crypto tests", () => {
+  test("should generate a key", async () => {
+    const { privateKey, publicKey } =
+      await DefaultCrypto.generateSigningKeyPair();
+
+    const serializedKeypair = {
+      privateKey: b64encode(
+        await DefaultCrypto.serializeSigningKey(privateKey, "pkcs8"),
+      ),
+      publicKey: b64encode(
+        await DefaultCrypto.serializeSigningKey(publicKey, "spki"),
+      ),
+    };
+
+    expect(serializedKeypair.privateKey).not.toBeNull();
+    expect(serializedKeypair.publicKey).not.toBeNull();
+  }, 60_000);
+});

package/src/index.ts

@@ -1,13 +1,13 @@
 // Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
 
-export * from "./auth/index.js";
-export * from "./constants/index.js";
-export * from "./crypto/index.js";
 export { default as LightsparkException } from "./LightsparkException.js";
 export { Logger } from "./Logger.js";
-export * from "./requester/index.js";
 export {
-  apiDomainForEnvironment,
   default as ServerEnvironment,
+  apiDomainForEnvironment,
 } from "./ServerEnvironment.js";
+export * from "./auth/index.js";
+export * from "./constants/index.js";
+export * from "./crypto/index.js";
+export * from "./requester/index.js";
 export * from "./utils/index.js";

package/src/requester/Query.ts

@@ -7,7 +7,10 @@ type Query<T> = {
   /** The variables that will be passed to the query. **/
   variables?: { [key: string]: unknown };
 
-  /** The function that will be called to construct the object from the response. **/
+  /**
+   * The function that will be called to construct the object from the
+   * response. *
+   */
   constructObject: (rawData: any) => T; // eslint-disable-line @typescript-eslint/no-explicit-any -- LIG-3400
 
   /** The id of the node that will be used to sign the query. **/

package/src/requester/Requester.ts

@@ -26,6 +26,14 @@ export const LIGHTSPARK_BETA_HEADER_VALUE =
   "z2h0BBYxTA83cjW7fi8QwWtBPCzkQKiemcuhKY08LOo";
 dayjs.extend(utc);
 
+type BodyData = {
+  query: string;
+  variables: { [key: string]: unknown };
+  operationName: string;
+  nonce?: number;
+  expires_at?: string;
+};
+
 class Requester {
   private readonly wsClient: WsClient;
   constructor(
@@ -55,6 +63,7 @@ class Requester {
   }
 
   public async executeQuery<T>(query: Query<T>): Promise<T | null> {
+    /* eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- LIG-3400 */
     const data = await this.makeRawRequest(
       query.queryPayload,
       query.variables || {},
@@ -89,7 +98,7 @@ class Requester {
       }
     }
     const operation = operationMatch[2];
-    const bodyData = {
+    const bodyData: BodyData = {
       query: queryPayload,
       variables,
       operationName: operation,
@@ -111,7 +120,7 @@ class Requester {
     signingNodeId: string | undefined = undefined,
     skipAuth: boolean = false,
     /* eslint-disable-next-line @typescript-eslint/no-explicit-any -- LIG-3400 */
-  ): Promise<any | null> {
+  ): Promise<any> {
     const operationNameRegex = /^\s*(query|mutation|subscription)\s+(\w+)/i;
     const operationMatch = queryPayload.match(operationNameRegex);
     if (!operationMatch || operationMatch.length < 3) {
@@ -131,7 +140,7 @@ class Requester {
       }
     }
     const operation = operationMatch[2];
-    let bodyData = {
+    let bodyData: BodyData = {
       query: queryPayload,
       variables,
       operationName: operation,
@@ -166,6 +175,7 @@ class Requester {
 
     logger.info(`Requester.makeRawRequest`, {
       url,
+      operationName: operation,
       variables,
     });
     const response = await fetch(url, {
@@ -179,7 +189,10 @@ class Requester {
         `Request ${operation} failed. ${response.statusText}`,
       );
     }
-    const responseJson = await response.json();
+    const responseJson = (await response.json()) as {
+      data: unknown;
+      errors: unknown;
+    };
     const data = responseJson.data;
     if (!data) {
       throw new LightsparkException(
@@ -201,11 +214,11 @@ class Requester {
   }
 
   private async addSigningDataIfNeeded(
-    queryPayload: { query: string; variables: unknown; operationName: string },
+    queryPayload: BodyData,
     headers: { [key: string]: string },
     signingNodeId: string | undefined,
     /* eslint-disable-next-line @typescript-eslint/no-explicit-any -- LIG-3400 */
-  ): Promise<any> {
+  ): Promise<BodyData> {
     if (!signingNodeId) {
       return queryPayload;
     }
@@ -225,7 +238,7 @@ class Requester {
       expires_at: expiration,
     };
 
-    const key = await this.nodeKeyCache.getKey(signingNodeId);
+    const key = this.nodeKeyCache.getKey(signingNodeId);
     if (!key) {
       throw new LightsparkSigningException(
         "Missing node of encrypted_signing_private_key",

package/src/utils/currency.ts

@@ -7,26 +7,53 @@ import { isNumber, round } from "./numbers.js";
 
 export const defaultCurrencyCode = "USD";
 
-/** This enum identifies the unit of currency associated with a CurrencyAmount. **/
+/**
+ * This enum identifies the unit of currency associated with a CurrencyAmount.
+ * *
+ */
 export enum CurrencyUnit {
   /**
-   * This is an enum value that represents values that could be added in the future.
-   * Clients should support unknown values as more of them could be added without notice.
+   * This is an enum value that represents values that could be added in the
+   * future. Clients should support unknown values as more of them could be
+   * added without notice.
    */
   FUTURE_VALUE = "FUTURE_VALUE",
-  /** Bitcoin is the cryptocurrency native to the Bitcoin network. It is used as the native medium for value transfer for the Lightning Network. **/
+  /**
+   * Bitcoin is the cryptocurrency native to the Bitcoin network.
+   * It is used as the native medium for value transfer for the Lightning
+   * Network. *
+   */
   BITCOIN = "BITCOIN",
-  /** 0.00000001 (10e-8) Bitcoin or one hundred millionth of a Bitcoin. This is the unit most commonly used in Lightning transactions. **/
+  /**
+   * 0.00000001 (10e-8) Bitcoin or one hundred millionth of a Bitcoin.
+   * This is the unit most commonly used in Lightning transactions.
+   * *
+   */
   SATOSHI = "SATOSHI",
-  /** 0.001 Satoshi, or 10e-11 Bitcoin. We recommend using the Satoshi unit instead when possible. **/
+  /**
+   * 0.001 Satoshi, or 10e-11 Bitcoin. We recommend using the Satoshi unit
+   * instead when possible. *
+   */
   MILLISATOSHI = "MILLISATOSHI",
   /** United States Dollar. **/
   USD = "USD",
-  /** 0.000000001 (10e-9) Bitcoin or a billionth of a Bitcoin. We recommend using the Satoshi unit instead when possible. **/
+  /**
+   * 0.000000001 (10e-9) Bitcoin or a billionth of a Bitcoin.
+   * We recommend using the Satoshi unit instead when possible.
+   * *
+   */
   NANOBITCOIN = "NANOBITCOIN",
-  /** 0.000001 (10e-6) Bitcoin or a millionth of a Bitcoin. We recommend using the Satoshi unit instead when possible. **/
+  /**
+   * 0.000001 (10e-6) Bitcoin or a millionth of a Bitcoin.
+   * We recommend using the Satoshi unit instead when possible.
+   * *
+   */
   MICROBITCOIN = "MICROBITCOIN",
-  /** 0.001 (10e-3) Bitcoin or a thousandth of a Bitcoin. We recommend using the Satoshi unit instead when possible. **/
+  /**
+   * 0.001 (10e-3) Bitcoin or a thousandth of a Bitcoin.
+   * We recommend using the Satoshi unit instead when possible.
+   * *
+   */
   MILLIBITCOIN = "MILLIBITCOIN",
 }
 
@@ -39,13 +66,15 @@ export type CurrencyAmountType = {
   /** The unit of user's preferred currency. **/
   preferredCurrencyUnit: CurrencyUnit;
   /**
-   * The rounded numeric value for this CurrencyAmount in the very base level of user's preferred
-   * currency. For example, for USD, the value will be in cents.
+   * The rounded numeric value for this CurrencyAmount in the very base level
+   * of user's preferred currency. For example, for USD, the value will be in
+   * cents.
    **/
   preferredCurrencyValueRounded: number;
   /**
-   * The approximate float value for this CurrencyAmount in the very base level of user's preferred
-   * currency. For example, for USD, the value will be in cents.
+   * The approximate float value for this CurrencyAmount in the very base level
+   * of user's preferred currency. For example, for USD, the value will be in
+   * cents.
    **/
   preferredCurrencyValueApprox: number;
 };
@@ -211,8 +240,12 @@ export type CurrencyMap = {
 };
 
 export type CurrencyAmountObj = {
-  /* Technically the generated graphql schema has value as `any` but it's always a number.
-     We are intentionally widening the type here to allow for more forgiving input: */
+  /*
+   * Technically the generated graphql schema has value as `any` but it's
+   * always a number.
+   * We are intentionally widening the type here to allow for more forgiving
+   * input:
+   */
   value?: number | string | null;
   /* assume satoshi if not provided */
   unit?: CurrencyUnit;
@@ -402,7 +435,10 @@ export function formatCurrencyStr(
   let { value: num } = currencyAmount;
   const { unit } = currencyAmount;
 
-  /* Currencies should always be represented in the smallest unit, e.g. cents for USD: */
+  /**
+   * Currencies should always be represented in the smallest unit, e.g.
+   * cents for USD:
+   */
   if (unit === CurrencyUnit.USD) {
     num = num / 100;
   }
@@ -415,7 +451,8 @@ export function formatCurrencyStr(
       : maxFractionDigits;
   }
 
-  // Symbol handled by toLocaleString for USD. These rely on the LightsparkIcons font
+  // Symbol handled by toLocaleString for USD.
+  // These rely on the LightsparkIcons font
   const symbol = !showBtcSymbol
     ? ""
     : unit === CurrencyUnit.BITCOIN
@@ -472,7 +509,8 @@ export function localeToCurrencySymbol(locale: string) {
     maximumFractionDigits: 0,
   }).format(0);
 
-  // Remove numeric and non-breaking space characters to extract the currency symbol
+  // Remove numeric and non-breaking space characters to extract the currency
+  // symbol
   const { symbol } = separateCurrencyStrParts(formatted);
   return symbol;
 }

package/src/utils/localeToCurrencyCodes.ts

@@ -1,5 +1,7 @@
 /* From https://github.com/tadeegan/locale-currency. For now only USD conversion from
-   BTC is supported by sparkcore, strip additional currency codes from the bundle: */
+ * BTC is supported by sparkcore, strip additional currency codes from the
+ * bundle:
+ */
 export const countryCodesToCurrencyCodes = {
   AD: "EUR",
   // AE: "AED",

package/src/utils/pollUntil.ts

@@ -5,50 +5,51 @@ function getDefaultMaxPollsError() {
   return new Error("pollUntil: Max polls reached");
 }
 
-export function pollUntil<D extends () => Promise<unknown>, T>(
+type GetValueResult<T> = {
+  stopPolling: boolean;
+  value: null | T;
+};
+
+export async function pollUntil<D extends () => Promise<unknown>, T>(
   asyncFn: D,
   getValue: (
     data: Awaited<ReturnType<D>>,
     response: { stopPolling: boolean; value: null | T },
-  ) => {
-    stopPolling: boolean;
-    value: null | T;
-  },
+  ) => GetValueResult<T>,
   maxPolls = 60,
   pollIntervalMs = 500,
   ignoreErrors: boolean | ((e: unknown) => boolean) = false,
   getMaxPollsError: (maxPolls: number) => Error = getDefaultMaxPollsError,
 ): Promise<T> {
-  return new Promise((resolve, reject) => {
-    let polls = 0;
-    let stopPolling = false;
-    (async function () {
-      while (!stopPolling) {
-        polls += 1;
-        if (polls > maxPolls) {
-          stopPolling = true;
-          const maxPollsError = getMaxPollsError(maxPolls);
-          reject(maxPollsError);
-          break;
-        }
-        try {
-          const asyncResult = await asyncFn();
-          const result = getValue(asyncResult as Awaited<ReturnType<D>>, {
-            stopPolling: false,
-            value: null,
-          });
-          if (result.stopPolling) {
-            stopPolling = true;
-            resolve(result.value as T);
-          }
-        } catch (e) {
-          if (!ignoreErrors || (isFunction(ignoreErrors) && !ignoreErrors(e))) {
-            stopPolling = true;
-            reject(e);
-          }
-        }
-        await sleep(pollIntervalMs);
+  let polls = 0;
+  let stopPolling = false;
+  let result: GetValueResult<T> = {
+    stopPolling: false,
+    value: null,
+  };
+  while (!stopPolling) {
+    polls += 1;
+    if (polls > maxPolls) {
+      stopPolling = true;
+      const maxPollsError = getMaxPollsError(maxPolls);
+      throw maxPollsError;
+    }
+    try {
+      const asyncResult = await asyncFn();
+      result = getValue(asyncResult as Awaited<ReturnType<D>>, {
+        stopPolling: false,
+        value: null,
+      });
+      if (result.stopPolling) {
+        stopPolling = true;
+      }
+    } catch (e) {
+      if (!ignoreErrors || (isFunction(ignoreErrors) && !ignoreErrors(e))) {
+        stopPolling = true;
+        throw e;
       }
-    })();
-  });
+    }
+    await sleep(pollIntervalMs);
+  }
+  return result.value as T;
 }

package/src/utils/types.ts

@@ -4,7 +4,7 @@ export type Maybe<T> = T | null | undefined;
 
 export type ExpandRecursively<T> = T extends object
   ? T extends infer O
-    ? { [K in keyof O]: ExpandRecursively<O[K]> } // eslint-disable-line @typescript-eslint/no-unused-vars
+    ? { [K in keyof O]: ExpandRecursively<O[K]> }
     : never
   : T;
 
@@ -21,3 +21,9 @@ export const isType =
   ): node is Extract<N, { __typename: T }> => {
     return node?.__typename === typename;
   };
+
+export type DeepPartial<T> = T extends object
+  ? {
+      [P in keyof T]?: DeepPartial<T[P]>;
+    }
+  : T;