@lightsparkdev/core 1.4.2 → 1.4.4

package/dist/utils/index.cjs

@@ -45,12 +45,14 @@ __export(utils_exports, {
   ensureArray: () => ensureArray,
   errorToJSON: () => errorToJSON,
   formatCurrencyStr: () => formatCurrencyStr,
+  formatInviteAmount: () => formatInviteAmount,
   getCurrencyAmount: () => getCurrencyAmount,
   getCurrentLocale: () => getCurrentLocale,
   getErrorMsg: () => getErrorMsg,
   getLocalStorageBoolean: () => getLocalStorageBoolean,
   getLocalStorageConfigItem: () => getLocalStorageConfigItem,
   hexToBytes: () => hexToBytes,
+  isBare: () => isBare,
   isBrowser: () => isBrowser,
   isCurrencyAmountInputObj: () => isCurrencyAmountInputObj,
   isCurrencyAmountObj: () => isCurrencyAmountObj,
@@ -63,6 +65,7 @@ __export(utils_exports, {
   isNode: () => isNode,
   isNumber: () => isNumber,
   isObject: () => isObject,
+  isReactNative: () => isReactNative,
   isRecord: () => isRecord,
   isSDKCurrencyAmount: () => isSDKCurrencyAmount,
   isTest: () => isTest,
@@ -138,6 +141,8 @@ var b64encode = (data) => {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined";
 var isNode = typeof process !== "undefined" && process.versions != null && process.versions.node != null;
 var isTest = isNode && process.env.NODE_ENV === "test";
+var isBare = typeof Bare !== "undefined";
+var isReactNative = typeof navigator !== "undefined" && navigator.product === "ReactNative";
 
 // src/utils/hex.ts
 var bytesToHex = (bytes) => {
@@ -498,6 +503,7 @@ var CurrencyUnit = {
   PHP: "PHP",
   EUR: "EUR",
   GBP: "GBP",
+  INR: "INR",
   Bitcoin: "BITCOIN",
   Microbitcoin: "MICROBITCOIN",
   Millibitcoin: "MILLIBITCOIN",
@@ -507,7 +513,8 @@ var CurrencyUnit = {
   Usd: "USD",
   Mxn: "MXN",
   Php: "PHP",
-  Gbp: "GBP"
+  Gbp: "GBP",
+  Inr: "INR"
 };
 var standardUnitConversionObj = {
   [CurrencyUnit.BITCOIN]: (v, unitsPerBtc = 1) => v / unitsPerBtc,
@@ -521,7 +528,8 @@ var standardUnitConversionObj = {
   [CurrencyUnit.MXN]: (v) => v,
   [CurrencyUnit.PHP]: (v) => v,
   [CurrencyUnit.EUR]: (v) => v,
-  [CurrencyUnit.GBP]: (v) => v
+  [CurrencyUnit.GBP]: (v) => v,
+  [CurrencyUnit.INR]: (v) => v
 };
 var toBitcoinConversion = (v, unitsPerBtc = 1) => round(v * unitsPerBtc);
 var toMicrobitcoinConversion = (v, unitsPerBtc = 1) => round(v / 1e6 * unitsPerBtc);
@@ -541,7 +549,8 @@ var CONVERSION_MAP = {
     [CurrencyUnit.MXN]: toBitcoinConversion,
     [CurrencyUnit.PHP]: toBitcoinConversion,
     [CurrencyUnit.EUR]: toBitcoinConversion,
-    [CurrencyUnit.GBP]: toBitcoinConversion
+    [CurrencyUnit.GBP]: toBitcoinConversion,
+    [CurrencyUnit.INR]: toBitcoinConversion
   },
   [CurrencyUnit.MICROBITCOIN]: {
     [CurrencyUnit.BITCOIN]: (v) => v / 1e6,
@@ -554,7 +563,8 @@ var CONVERSION_MAP = {
     [CurrencyUnit.MXN]: toMicrobitcoinConversion,
     [CurrencyUnit.PHP]: toMicrobitcoinConversion,
     [CurrencyUnit.EUR]: toMicrobitcoinConversion,
-    [CurrencyUnit.GBP]: toMicrobitcoinConversion
+    [CurrencyUnit.GBP]: toMicrobitcoinConversion,
+    [CurrencyUnit.INR]: toMicrobitcoinConversion
   },
   [CurrencyUnit.MILLIBITCOIN]: {
     [CurrencyUnit.BITCOIN]: (v) => v / 1e3,
@@ -567,7 +577,8 @@ var CONVERSION_MAP = {
     [CurrencyUnit.MXN]: toMillibitcoinConversion,
     [CurrencyUnit.PHP]: toMillibitcoinConversion,
     [CurrencyUnit.EUR]: toMillibitcoinConversion,
-    [CurrencyUnit.GBP]: toMillibitcoinConversion
+    [CurrencyUnit.GBP]: toMillibitcoinConversion,
+    [CurrencyUnit.INR]: toMillibitcoinConversion
   },
   [CurrencyUnit.MILLISATOSHI]: {
     [CurrencyUnit.BITCOIN]: (v) => v / 1e11,
@@ -580,7 +591,8 @@ var CONVERSION_MAP = {
     [CurrencyUnit.MXN]: toMillisatoshiConversion,
     [CurrencyUnit.PHP]: toMillisatoshiConversion,
     [CurrencyUnit.EUR]: toMillisatoshiConversion,
-    [CurrencyUnit.GBP]: toMillisatoshiConversion
+    [CurrencyUnit.GBP]: toMillisatoshiConversion,
+    [CurrencyUnit.INR]: toMillisatoshiConversion
   },
   [CurrencyUnit.NANOBITCOIN]: {
     [CurrencyUnit.BITCOIN]: (v) => v / 1e9,
@@ -593,7 +605,8 @@ var CONVERSION_MAP = {
     [CurrencyUnit.MXN]: toNanobitcoinConversion,
     [CurrencyUnit.PHP]: toNanobitcoinConversion,
     [CurrencyUnit.EUR]: toNanobitcoinConversion,
-    [CurrencyUnit.GBP]: toNanobitcoinConversion
+    [CurrencyUnit.GBP]: toNanobitcoinConversion,
+    [CurrencyUnit.INR]: toNanobitcoinConversion
   },
   [CurrencyUnit.SATOSHI]: {
     [CurrencyUnit.BITCOIN]: (v) => v / 1e8,
@@ -606,13 +619,15 @@ var CONVERSION_MAP = {
     [CurrencyUnit.MXN]: toSatoshiConversion,
     [CurrencyUnit.PHP]: toSatoshiConversion,
     [CurrencyUnit.EUR]: toSatoshiConversion,
-    [CurrencyUnit.GBP]: toSatoshiConversion
+    [CurrencyUnit.GBP]: toSatoshiConversion,
+    [CurrencyUnit.INR]: toSatoshiConversion
   },
   [CurrencyUnit.USD]: standardUnitConversionObj,
   [CurrencyUnit.MXN]: standardUnitConversionObj,
   [CurrencyUnit.PHP]: standardUnitConversionObj,
   [CurrencyUnit.EUR]: standardUnitConversionObj,
-  [CurrencyUnit.GBP]: standardUnitConversionObj
+  [CurrencyUnit.GBP]: standardUnitConversionObj,
+  [CurrencyUnit.INR]: standardUnitConversionObj
 };
 function convertCurrencyAmountValue(fromUnit, toUnit, amount, unitsPerBtc = 1) {
   if (fromUnit === CurrencyUnit.FUTURE_VALUE || toUnit === CurrencyUnit.FUTURE_VALUE) {
@@ -697,6 +712,7 @@ function convertCurrencyAmountValues(fromUnit, amount, unitsPerBtc = 1, conversi
     php: CurrencyUnit.PHP,
     eur: CurrencyUnit.EUR,
     gbp: CurrencyUnit.GBP,
+    inr: CurrencyUnit.INR,
     mibtc: CurrencyUnit.MICROBITCOIN,
     mlbtc: CurrencyUnit.MILLIBITCOIN,
     nbtc: CurrencyUnit.NANOBITCOIN
@@ -735,7 +751,7 @@ function getPreferredConversionOverride(currencyAmountArg) {
 function mapCurrencyAmount(currencyAmountArg, unitsPerBtc = 1) {
   const { value, unit } = getCurrencyAmount(currencyAmountArg);
   const conversionOverride = getPreferredConversionOverride(currencyAmountArg);
-  const { sats, msats, btc, usd, mxn, php, mibtc, mlbtc, nbtc, eur, gbp } = convertCurrencyAmountValues(unit, value, unitsPerBtc, conversionOverride);
+  const { sats, msats, btc, usd, mxn, php, mibtc, mlbtc, nbtc, eur, gbp, inr } = convertCurrencyAmountValues(unit, value, unitsPerBtc, conversionOverride);
   const mapWithCurrencyUnits = {
     [CurrencyUnit.BITCOIN]: btc,
     [CurrencyUnit.SATOSHI]: sats,
@@ -745,6 +761,7 @@ function mapCurrencyAmount(currencyAmountArg, unitsPerBtc = 1) {
     [CurrencyUnit.PHP]: php,
     [CurrencyUnit.EUR]: eur,
     [CurrencyUnit.GBP]: gbp,
+    [CurrencyUnit.INR]: inr,
     [CurrencyUnit.MICROBITCOIN]: mibtc,
     [CurrencyUnit.MILLIBITCOIN]: mlbtc,
     [CurrencyUnit.NANOBITCOIN]: nbtc,
@@ -794,6 +811,10 @@ function mapCurrencyAmount(currencyAmountArg, unitsPerBtc = 1) {
         value: gbp,
         unit: CurrencyUnit.GBP
       }),
+      [CurrencyUnit.INR]: formatCurrencyStr({
+        value: inr,
+        unit: CurrencyUnit.INR
+      }),
       [CurrencyUnit.FUTURE_VALUE]: "-"
     }
   };
@@ -862,6 +883,8 @@ var abbrCurrencyUnit = (unit) => {
       return "EUR";
     case CurrencyUnit.GBP:
       return "GBP";
+    case CurrencyUnit.INR:
+      return "INR";
   }
   return "Unsupported CurrencyUnit";
 };
@@ -994,6 +1017,15 @@ function localeToCurrencySymbol(locale) {
   const { symbol } = separateCurrencyStrParts(formatted);
   return symbol;
 }
+function formatInviteAmount(amount, currency) {
+  if (!amount || !currency) {
+    return "";
+  }
+  const displayAmount = (amount / Math.pow(10, currency.decimals)).toFixed(
+    currency.decimals
+  );
+  return `${displayAmount} ${currency.code}`;
+}
 
 // src/utils/typeGuards.ts
 function isUint8Array(value) {
@@ -2300,12 +2332,14 @@ function zipcodeToState(zipcode) {
   ensureArray,
   errorToJSON,
   formatCurrencyStr,
+  formatInviteAmount,
   getCurrencyAmount,
   getCurrentLocale,
   getErrorMsg,
   getLocalStorageBoolean,
   getLocalStorageConfigItem,
   hexToBytes,
+  isBare,
   isBrowser,
   isCurrencyAmountInputObj,
   isCurrencyAmountObj,
@@ -2318,6 +2352,7 @@ function zipcodeToState(zipcode) {
   isNode,
   isNumber,
   isObject,
+  isReactNative,
   isRecord,
   isSDKCurrencyAmount,
   isTest,

package/dist/utils/index.d.cts

@@ -1 +1 @@
-export { A as AppendUnitsOptions, ab as ById, am as Complete, o as CurrencyAmountArg, k as CurrencyAmountInputObj, m as CurrencyAmountObj, n as CurrencyAmountPreferenceObj, V as CurrencyCodes, T as CurrencyLocales, j as CurrencyMap, f as CurrencyUnit, g as CurrencyUnitType, af as DeepPartial, D as DeprecatedCurrencyAmountObj, aa as ExpandRecursively, ae as ExtractByTypename, ag as JSONLiteral, ai as JSONObject, ah as JSONType, a9 as Maybe, aj as NN, ac as OmitTypename, al as PartialBy, an as RequiredKeys, S as SDKCurrencyAmountType, ao as StateCode, U as UmaCurrency, l as UmaCurrencyAmount, z as abbrCurrencyUnit, b as b64decode, a as b64encode, O as bytesToHex, $ as clamp, i as convertCurrencyAmount, h as convertCurrencyAmountValue, R as countryCodesToCurrencyCodes, c as createSha256Hash, d as defaultCurrencyCode, _ as deleteLocalStorageItem, e as ensureArray, N as errorToJSON, B as formatCurrencyStr, w as getCurrencyAmount, Q as getCurrentLocale, L as getErrorMsg, Y as getLocalStorageBoolean, X as getLocalStorageConfigItem, P as hexToBytes, G as isBrowser, p as isCurrencyAmountInputObj, s as isCurrencyAmountObj, t as isCurrencyAmountPreferenceObj, y as isCurrencyMap, r as isDeprecatedCurrencyAmountObj, J as isError, M as isErrorMsg, K as isErrorWithMessage, H as isNode, a2 as isNumber, a7 as isObject, a8 as isRecord, v as isSDKCurrencyAmount, I as isTest, ad as isType, a6 as isUint8Array, q as isUmaCurrencyAmount, a0 as linearInterpolate, W as localeToCurrencyCode, F as localeToCurrencySymbol, a5 as lsidToUUID, x as mapCurrencyAmount, ak as notNullUndefined, a3 as pollUntil, a1 as round, E as separateCurrencyStrParts, Z as setLocalStorageBoolean, a4 as sleep, u as urlsafe_b64decode, aq as zipcodeToState, ap as zipcodeToStateCode } from '../index-BCTAeaWD.cjs';
+export { A as AppendUnitsOptions, ae as ById, ap as Complete, o as CurrencyAmountArg, k as CurrencyAmountInputObj, m as CurrencyAmountObj, n as CurrencyAmountPreferenceObj, Y as CurrencyCodes, X as CurrencyLocales, j as CurrencyMap, f as CurrencyUnit, g as CurrencyUnitType, ai as DeepPartial, D as DeprecatedCurrencyAmountObj, ad as ExpandRecursively, ah as ExtractByTypename, aj as JSONLiteral, al as JSONObject, ak as JSONType, ac as Maybe, am as NN, af as OmitTypename, ao as PartialBy, aq as RequiredKeys, S as SDKCurrencyAmountType, ar as StateCode, U as UmaCurrency, l as UmaCurrencyAmount, z as abbrCurrencyUnit, b as b64decode, a as b64encode, R as bytesToHex, a2 as clamp, i as convertCurrencyAmount, h as convertCurrencyAmountValue, W as countryCodesToCurrencyCodes, c as createSha256Hash, d as defaultCurrencyCode, a1 as deleteLocalStorageItem, e as ensureArray, Q as errorToJSON, B as formatCurrencyStr, G as formatInviteAmount, w as getCurrencyAmount, V as getCurrentLocale, O as getErrorMsg, $ as getLocalStorageBoolean, _ as getLocalStorageConfigItem, T as hexToBytes, K as isBare, H as isBrowser, p as isCurrencyAmountInputObj, s as isCurrencyAmountObj, t as isCurrencyAmountPreferenceObj, y as isCurrencyMap, r as isDeprecatedCurrencyAmountObj, M as isError, P as isErrorMsg, N as isErrorWithMessage, I as isNode, a5 as isNumber, aa as isObject, L as isReactNative, ab as isRecord, v as isSDKCurrencyAmount, J as isTest, ag as isType, a9 as isUint8Array, q as isUmaCurrencyAmount, a3 as linearInterpolate, Z as localeToCurrencyCode, F as localeToCurrencySymbol, a8 as lsidToUUID, x as mapCurrencyAmount, an as notNullUndefined, a6 as pollUntil, a4 as round, E as separateCurrencyStrParts, a0 as setLocalStorageBoolean, a7 as sleep, u as urlsafe_b64decode, at as zipcodeToState, as as zipcodeToStateCode } from '../index-CFQtMxrx.cjs';

package/dist/utils/index.d.ts

@@ -1 +1 @@
-export { A as AppendUnitsOptions, ab as ById, am as Complete, o as CurrencyAmountArg, k as CurrencyAmountInputObj, m as CurrencyAmountObj, n as CurrencyAmountPreferenceObj, V as CurrencyCodes, T as CurrencyLocales, j as CurrencyMap, f as CurrencyUnit, g as CurrencyUnitType, af as DeepPartial, D as DeprecatedCurrencyAmountObj, aa as ExpandRecursively, ae as ExtractByTypename, ag as JSONLiteral, ai as JSONObject, ah as JSONType, a9 as Maybe, aj as NN, ac as OmitTypename, al as PartialBy, an as RequiredKeys, S as SDKCurrencyAmountType, ao as StateCode, U as UmaCurrency, l as UmaCurrencyAmount, z as abbrCurrencyUnit, b as b64decode, a as b64encode, O as bytesToHex, $ as clamp, i as convertCurrencyAmount, h as convertCurrencyAmountValue, R as countryCodesToCurrencyCodes, c as createSha256Hash, d as defaultCurrencyCode, _ as deleteLocalStorageItem, e as ensureArray, N as errorToJSON, B as formatCurrencyStr, w as getCurrencyAmount, Q as getCurrentLocale, L as getErrorMsg, Y as getLocalStorageBoolean, X as getLocalStorageConfigItem, P as hexToBytes, G as isBrowser, p as isCurrencyAmountInputObj, s as isCurrencyAmountObj, t as isCurrencyAmountPreferenceObj, y as isCurrencyMap, r as isDeprecatedCurrencyAmountObj, J as isError, M as isErrorMsg, K as isErrorWithMessage, H as isNode, a2 as isNumber, a7 as isObject, a8 as isRecord, v as isSDKCurrencyAmount, I as isTest, ad as isType, a6 as isUint8Array, q as isUmaCurrencyAmount, a0 as linearInterpolate, W as localeToCurrencyCode, F as localeToCurrencySymbol, a5 as lsidToUUID, x as mapCurrencyAmount, ak as notNullUndefined, a3 as pollUntil, a1 as round, E as separateCurrencyStrParts, Z as setLocalStorageBoolean, a4 as sleep, u as urlsafe_b64decode, aq as zipcodeToState, ap as zipcodeToStateCode } from '../index-BCTAeaWD.js';
+export { A as AppendUnitsOptions, ae as ById, ap as Complete, o as CurrencyAmountArg, k as CurrencyAmountInputObj, m as CurrencyAmountObj, n as CurrencyAmountPreferenceObj, Y as CurrencyCodes, X as CurrencyLocales, j as CurrencyMap, f as CurrencyUnit, g as CurrencyUnitType, ai as DeepPartial, D as DeprecatedCurrencyAmountObj, ad as ExpandRecursively, ah as ExtractByTypename, aj as JSONLiteral, al as JSONObject, ak as JSONType, ac as Maybe, am as NN, af as OmitTypename, ao as PartialBy, aq as RequiredKeys, S as SDKCurrencyAmountType, ar as StateCode, U as UmaCurrency, l as UmaCurrencyAmount, z as abbrCurrencyUnit, b as b64decode, a as b64encode, R as bytesToHex, a2 as clamp, i as convertCurrencyAmount, h as convertCurrencyAmountValue, W as countryCodesToCurrencyCodes, c as createSha256Hash, d as defaultCurrencyCode, a1 as deleteLocalStorageItem, e as ensureArray, Q as errorToJSON, B as formatCurrencyStr, G as formatInviteAmount, w as getCurrencyAmount, V as getCurrentLocale, O as getErrorMsg, $ as getLocalStorageBoolean, _ as getLocalStorageConfigItem, T as hexToBytes, K as isBare, H as isBrowser, p as isCurrencyAmountInputObj, s as isCurrencyAmountObj, t as isCurrencyAmountPreferenceObj, y as isCurrencyMap, r as isDeprecatedCurrencyAmountObj, M as isError, P as isErrorMsg, N as isErrorWithMessage, I as isNode, a5 as isNumber, aa as isObject, L as isReactNative, ab as isRecord, v as isSDKCurrencyAmount, J as isTest, ag as isType, a9 as isUint8Array, q as isUmaCurrencyAmount, a3 as linearInterpolate, Z as localeToCurrencyCode, F as localeToCurrencySymbol, a8 as lsidToUUID, x as mapCurrencyAmount, an as notNullUndefined, a6 as pollUntil, a4 as round, E as separateCurrencyStrParts, a0 as setLocalStorageBoolean, a7 as sleep, u as urlsafe_b64decode, at as zipcodeToState, as as zipcodeToStateCode } from '../index-CFQtMxrx.js';

package/dist/utils/index.js

@@ -14,12 +14,14 @@ import {
   ensureArray,
   errorToJSON,
   formatCurrencyStr,
+  formatInviteAmount,
   getCurrencyAmount,
   getCurrentLocale,
   getErrorMsg,
   getLocalStorageBoolean,
   getLocalStorageConfigItem,
   hexToBytes,
+  isBare,
   isBrowser,
   isCurrencyAmountInputObj,
   isCurrencyAmountObj,
@@ -32,6 +34,7 @@ import {
   isNode,
   isNumber,
   isObject,
+  isReactNative,
   isRecord,
   isSDKCurrencyAmount,
   isTest,
@@ -52,7 +55,7 @@ import {
   urlsafe_b64decode,
   zipcodeToState,
   zipcodeToStateCode
-} from "../chunk-CP4LQTTD.js";
+} from "../chunk-ADHQHZNM.js";
 export {
   CurrencyUnit,
   abbrCurrencyUnit,
@@ -69,12 +72,14 @@ export {
   ensureArray,
   errorToJSON,
   formatCurrencyStr,
+  formatInviteAmount,
   getCurrencyAmount,
   getCurrentLocale,
   getErrorMsg,
   getLocalStorageBoolean,
   getLocalStorageConfigItem,
   hexToBytes,
+  isBare,
   isBrowser,
   isCurrencyAmountInputObj,
   isCurrencyAmountObj,
@@ -87,6 +92,7 @@ export {
   isNode,
   isNumber,
   isObject,
+  isReactNative,
   isRecord,
   isSDKCurrencyAmount,
   isTest,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightsparkdev/core",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "description": "Lightspark JS SDK",
   "author": "Lightspark Inc.",
   "keywords": [
@@ -24,6 +24,7 @@
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
+      "react-native": "./dist/react-native/index.js",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
     },
@@ -39,6 +40,7 @@
     "src/*",
     "dist/*",
     "dist/utils/*",
+    "dist/react-native/*",
     "CHANGELOG.md"
   ],
   "scripts": {
@@ -51,6 +53,7 @@
     "lint:fix": "eslint --fix .",
     "lint:watch": "esw ./src -w --ext .ts,.tsx,.js --color",
     "lint": "eslint .",
+    "circular-deps": "madge --circular --extensions ts,tsx src",
     "package:checks": "yarn publint && yarn attw --pack .",
     "postversion": "yarn build",
     "test-cmd": "node --experimental-vm-modules $(yarn bin jest) --no-cache --runInBand --bail",
@@ -81,6 +84,7 @@
     "eslint-watch": "^8.0.0",
     "jest": "^29.6.2",
     "lodash-es": "^4.17.21",
+    "madge": "^6.1.0",
     "prettier": "3.0.3",
     "prettier-plugin-organize-imports": "^3.2.4",
     "publint": "^0.3.9",
@@ -89,6 +93,16 @@
     "tsup": "^8.2.4",
     "typescript": "^5.6.2"
   },
+  "madge": {
+    "detectiveOptions": {
+      "ts": {
+        "skipTypeImports": true
+      },
+      "tsx": {
+        "skipTypeImports": true
+      }
+    }
+  },
   "engines": {
     "node": ">=18"
   }

package/src/Logger.ts

@@ -1,5 +1,6 @@
-import { ConfigKeys, getLocalStorageConfigItem } from "./index.js";
+import { ConfigKeys } from "./constants/index.js";
 import { isBrowser, isTest } from "./utils/environment.js";
+import { getLocalStorageConfigItem } from "./utils/localStorage.js";
 
 type GetLoggingEnabled = (() => Promise<boolean> | boolean) | undefined;
 

package/src/crypto/SigningKey.ts

@@ -1,6 +1,8 @@
 import secp256k1 from "secp256k1";
-import { SigningKeyType, type CryptoInterface } from "../index.js";
-import { createSha256Hash, hexToBytes } from "../utils/index.js";
+import { createSha256Hash } from "../utils/createHash.js";
+import { hexToBytes } from "../utils/hex.js";
+import type { CryptoInterface } from "./crypto.js";
+import { SigningKeyType } from "./types.js";
 
 interface Alias {
   alias: string;

package/src/index.ts

@@ -1,13 +1,5 @@
 // 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, LoggingLevel, logger } from "./Logger.js";
-export * from "./requester/index.js";
-export {
-  default as ServerEnvironment,
-  apiDomainForEnvironment,
-} from "./ServerEnvironment.js";
-export * from "./utils/index.js";
+export { DefaultRequester as Requester } from "./requester/DefaultRequester.js";
+export { default as Query } from "./requester/Query.js";
+export * from "./shared.js";

package/src/react-native/index.ts

@@ -0,0 +1,2 @@
+export * from "../requester/index.js";
+export * from "../shared.js";

package/src/requester/DefaultRequester.ts

@@ -0,0 +1,46 @@
+import type AuthProvider from "../auth/AuthProvider.js";
+import { isBare, isNode } from "../utils/environment.js";
+import Requester from "./Requester.js";
+
+export class DefaultRequester extends Requester {
+  protected async initWsClient(baseUrl: string, authProvider: AuthProvider) {
+    if (!this.resolveWsClient) {
+      /* If resolveWsClient is null assume already initialized: */
+      return this.wsClient;
+    }
+
+    if (isBare) {
+      /* graphql-ws library is currently not supported in Bare environment, see LIG-7942 */
+      return null;
+    }
+
+    let websocketImpl;
+    if (isNode && typeof WebSocket === "undefined") {
+      const wsModule = await import("ws");
+      websocketImpl = wsModule.default;
+    }
+    let websocketProtocol = "wss";
+    if (baseUrl.startsWith("http://")) {
+      websocketProtocol = "ws";
+    }
+
+    const graphqlWsModule = await import("graphql-ws");
+    const { createClient } = graphqlWsModule;
+
+    const wsClient = createClient({
+      url: `${websocketProtocol}://${this.stripProtocol(this.baseUrl)}/${
+        this.schemaEndpoint
+      }`,
+      connectionParams: () => authProvider.addWsConnectionParams({}),
+      webSocketImpl: websocketImpl,
+    });
+
+    if (this.resolveWsClient) {
+      this.resolveWsClient(wsClient);
+      this.resolveWsClient = null;
+    }
+
+    return wsClient;
+  }
+}
+export default DefaultRequester;

package/src/requester/Requester.ts

@@ -4,7 +4,6 @@ import autoBind from "auto-bind";
 import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc.js";
 import type { Client as WsClient } from "graphql-ws";
-import { createClient } from "graphql-ws";
 import { Observable } from "zen-observable-ts";
 
 import type Query from "./Query.js";
@@ -32,55 +31,30 @@ type BodyData = {
 };
 
 class Requester {
-  private wsClient: Promise<WsClient>;
-  private resolveWsClient: ((value: WsClient) => void) | null = null;
+  protected wsClient: Promise<WsClient | null>;
+  protected resolveWsClient: ((value: WsClient | null) => void) | null = null;
   constructor(
     private readonly nodeKeyCache: NodeKeyCache,
-    private readonly schemaEndpoint: string,
+    protected readonly schemaEndpoint: string,
     private readonly sdkUserAgent: string,
     private readonly authProvider: AuthProvider = new StubAuthProvider(),
-    private readonly baseUrl: string = DEFAULT_BASE_URL,
+    protected readonly baseUrl: string = DEFAULT_BASE_URL,
     private readonly cryptoImpl: CryptoInterface = DefaultCrypto,
     private readonly signingKey?: SigningKey,
     private readonly fetchImpl: typeof fetch = fetch,
   ) {
-    this.wsClient = new Promise<WsClient>((resolve) => {
+    this.wsClient = new Promise<WsClient | null>((resolve) => {
       this.resolveWsClient = resolve;
     });
     void this.initWsClient(baseUrl, authProvider);
     autoBind(this);
   }
 
-  private async initWsClient(baseUrl: string, authProvider: AuthProvider) {
-    if (!this.resolveWsClient) {
-      /* If resolveWsClient is null assume already initialized: */
-      return this.wsClient;
-    }
-
-    let websocketImpl;
-    if (isNode && typeof WebSocket === "undefined") {
-      const wsModule = await import("ws");
-      websocketImpl = wsModule.default;
-    }
-    let websocketProtocol = "wss";
-    if (baseUrl.startsWith("http://")) {
-      websocketProtocol = "ws";
-    }
-
-    const wsClient = createClient({
-      url: `${websocketProtocol}://${this.stripProtocol(this.baseUrl)}/${
-        this.schemaEndpoint
-      }`,
-      connectionParams: () => authProvider.addWsConnectionParams({}),
-      webSocketImpl: websocketImpl,
-    });
-
-    if (this.resolveWsClient) {
-      this.resolveWsClient(wsClient);
-      this.resolveWsClient = null;
-    }
-
-    return wsClient;
+  protected initWsClient(
+    baseUrl: string,
+    authProvider: AuthProvider,
+  ): Promise<WsClient | null> {
+    return Promise.resolve(null);
   }
 
   public async executeQuery<T>(query: Query<T>): Promise<T | null> {
@@ -99,6 +73,7 @@ class Requester {
     variables: { [key: string]: unknown } = {},
   ) {
     logger.trace(`Requester.subscribe variables`, variables);
+
     const operationNameRegex = /^\s*(query|mutation|subscription)\s+(\w+)/i;
     const operationMatch = queryPayload.match(operationNameRegex);
     if (!operationMatch || operationMatch.length < 3) {
@@ -134,6 +109,15 @@ class Requester {
       void (async () => {
         try {
           const wsClient = await this.wsClient;
+
+          if (!wsClient) {
+            /* graphql-ws library is currently not supported in Bare environment, see LIG-7942 */
+            throw new LightsparkException(
+              "WebSocketNotInitialized",
+              "WebSocket client is not initialized or is not available in the current environment.",
+            );
+          }
+
           if (!canceled) {
             cleanup = wsClient.subscribe(bodyData, {
               next: (data) => observer.next(data as { data: T }),
@@ -276,7 +260,7 @@ class Requester {
     return `${this.sdkUserAgent} ${platform}/${platformVersion}`;
   }
 
-  private stripProtocol(url: string): string {
+  protected stripProtocol(url: string): string {
     return url.replace(/.*?:\/\//g, "");
   }
 

package/src/requester/tests/DefaultRequester.test.ts

@@ -0,0 +1,129 @@
+import { beforeEach, jest } from "@jest/globals";
+
+import type { Client as WsClient } from "graphql-ws";
+import type AuthProvider from "../../auth/AuthProvider.js";
+import type { CryptoInterface } from "../../crypto/crypto.js";
+import type NodeKeyCache from "../../crypto/NodeKeyCache.js";
+import type { SigningKey } from "../../crypto/SigningKey.js";
+import { SigningKeyType } from "../../crypto/types.js";
+
+/* Mocking ESM modules (when running node with --experimental-vm-modules)
+   requires unstable_mockModule, see https://bit.ly/433nRV1 */
+await jest.unstable_mockModule("graphql-ws", () => ({
+  __esModule: true,
+  createClient: jest.fn(),
+}));
+/* Since Requester uses graphql-ws we need a dynamic import after the above mock */
+const { DefaultRequester } = await import("../DefaultRequester.js");
+
+describe("DefaultRequester", () => {
+  const schemaEndpoint = "graphql";
+  const sdkUserAgent = "test-agent";
+  const baseUrl = "https://api.example.com";
+
+  let nodeKeyCache: NodeKeyCache;
+  let authProvider: AuthProvider;
+  let signingKey: SigningKey;
+  let cryptoImpl: CryptoInterface;
+  let fetchImpl: typeof fetch;
+
+  beforeEach(() => {
+    nodeKeyCache = {
+      getKey: jest.fn(),
+      hasKey: jest.fn(),
+    } as unknown as NodeKeyCache;
+
+    authProvider = {
+      addAuthHeaders: jest.fn(async (headers: Record<string, string>) => ({
+        ...headers,
+        "X-Test": "1",
+      })),
+      isAuthorized: jest.fn(async () => true),
+      addWsConnectionParams: jest.fn(
+        async (params: Record<string, unknown>) => ({
+          ...params,
+          ws: true,
+        }),
+      ),
+    } satisfies AuthProvider;
+
+    signingKey = {
+      type: SigningKeyType.RSASigningKey,
+      sign: jest.fn(async (data: Uint8Array) => new Uint8Array([1, 2, 3])),
+    } satisfies SigningKey;
+
+    cryptoImpl = {
+      decryptSecretWithNodePassword: jest.fn(async () => new ArrayBuffer(0)),
+      generateSigningKeyPair: jest.fn(async () => ({
+        publicKey: "",
+        privateKey: "",
+      })),
+      serializeSigningKey: jest.fn(async () => new ArrayBuffer(0)),
+      getNonce: jest.fn(async () => 123),
+      sign: jest.fn(async () => new ArrayBuffer(0)),
+      importPrivateSigningKey: jest.fn(async () => ""),
+    } satisfies CryptoInterface;
+
+    fetchImpl = jest.fn(
+      async () =>
+        ({
+          ok: true,
+          json: async () => ({ data: { foo: "bar" }, errors: undefined }),
+          statusText: "OK",
+        }) as Response,
+    );
+  });
+
+  describe("subscribe", () => {
+    it("returns an Observable for a valid subscription", async () => {
+      // Mock wsClient and its subscribe method
+      const wsClient = {
+        subscribe: jest.fn(
+          (
+            _body,
+            handlers: { next?: (data: unknown) => void; complete?: () => void },
+          ) => {
+            setTimeout(() => {
+              handlers.next?.({ data: { foo: "bar" } });
+              handlers.complete?.();
+            }, 10);
+            return jest.fn();
+          },
+        ),
+      } as unknown as WsClient;
+
+      const { createClient } = await import("graphql-ws");
+      (createClient as jest.Mock).mockReturnValue(wsClient);
+
+      const requester = new DefaultRequester(
+        nodeKeyCache,
+        schemaEndpoint,
+        sdkUserAgent,
+        authProvider,
+        baseUrl,
+        cryptoImpl,
+        signingKey,
+        fetchImpl,
+      );
+
+      const observable = requester.subscribe<{ foo: string }>(
+        "subscription TestSub { foo }",
+      );
+
+      const results: { foo: string }[] = [];
+      await new Promise<void>((resolve) => {
+        observable.subscribe({
+          next: (data: { data: { foo: string } }) => {
+            results.push(data.data);
+          },
+          complete: () => {
+            expect(results).toEqual([{ foo: "bar" }]);
+            resolve();
+          },
+        });
+      });
+
+      expect(wsClient.subscribe).toHaveBeenCalled();
+    });
+  });
+});