@lightsparkdev/core 1.3.0 → 1.4.0

package/dist/index.js

@@ -51,7 +51,7 @@ import {
   setLocalStorageBoolean,
   sleep,
   urlsafe_b64decode
-} from "./chunk-23SS5EX2.js";
+} from "./chunk-NV53XYAS.js";
 
 // src/auth/LightsparkAuthException.ts
 var LightsparkAuthException = class extends LightsparkException_default {
@@ -488,7 +488,6 @@ var logger = new Logger("@lightsparkdev/core");
 import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc.js";
 import { createClient } from "graphql-ws";
-import NodeWebSocket from "ws";
 import { Observable } from "zen-observable-ts";
 var DEFAULT_BASE_URL = "api.lightspark.com";
 dayjs.extend(utc);
@@ -502,22 +501,38 @@ var Requester = class {
     this.cryptoImpl = cryptoImpl;
     this.signingKey = signingKey;
     this.fetchImpl = fetchImpl;
+    this.wsClient = new Promise((resolve) => {
+      this.resolveWsClient = resolve;
+    });
+    void this.initWsClient(baseUrl, authProvider);
+    autoBind(this);
+  }
+  wsClient;
+  resolveWsClient = null;
+  async initWsClient(baseUrl, authProvider) {
+    if (!this.resolveWsClient) {
+      return this.wsClient;
+    }
     let websocketImpl;
-    if (typeof WebSocket === "undefined" && typeof window === "undefined") {
-      websocketImpl = NodeWebSocket;
+    if (isNode && typeof WebSocket === "undefined") {
+      const wsModule = await import("ws");
+      websocketImpl = wsModule.default;
     }
     let websocketProtocol = "wss";
     if (baseUrl.startsWith("http://")) {
       websocketProtocol = "ws";
     }
-    this.wsClient = createClient({
+    const wsClient = createClient({
       url: `${websocketProtocol}://${this.stripProtocol(this.baseUrl)}/${this.schemaEndpoint}`,
       connectionParams: () => authProvider.addWsConnectionParams({}),
       webSocketImpl: websocketImpl
     });
-    autoBind(this);
+    if (this.resolveWsClient) {
+      this.resolveWsClient(wsClient);
+      this.resolveWsClient = null;
+    }
+    return wsClient;
   }
-  wsClient;
   async executeQuery(query) {
     const data = await this.makeRawRequest(
       query.queryPayload,
@@ -555,11 +570,28 @@ var Requester = class {
     };
     return new Observable((observer) => {
       logger.trace(`Requester.subscribe observer`, observer);
-      return this.wsClient.subscribe(bodyData, {
-        next: (data) => observer.next(data),
-        error: (err) => observer.error(err),
-        complete: () => observer.complete()
-      });
+      let cleanup = null;
+      let canceled = false;
+      void (async () => {
+        try {
+          const wsClient = await this.wsClient;
+          if (!canceled) {
+            cleanup = wsClient.subscribe(bodyData, {
+              next: (data) => observer.next(data),
+              error: (err) => observer.error(err),
+              complete: () => observer.complete()
+            });
+          }
+        } catch (err) {
+          observer.error(err);
+        }
+      })();
+      return () => {
+        canceled = true;
+        if (cleanup) {
+          cleanup();
+        }
+      };
     });
   }
   async makeRawRequest(queryPayload, variables = {}, signingNodeId = void 0, skipAuth = false) {
@@ -635,9 +667,15 @@ var Requester = class {
     const responseJson = await response.json();
     const data = responseJson.data;
     if (!data) {
+      let firstErrorName = void 0;
+      if (Array.isArray(responseJson.errors) && responseJson.errors.length > 0) {
+        const firstError = responseJson.errors[0];
+        firstErrorName = firstError["extensions"]?.["error_name"];
+      }
       throw new LightsparkException_default(
         "RequestFailed",
-        `Request ${operation} failed. ${JSON.stringify(responseJson.errors)}`
+        `Request ${operation} failed. ${JSON.stringify(responseJson.errors)}`,
+        { errorName: firstErrorName }
       );
     }
     return data;

package/dist/utils/index.cjs

@@ -62,7 +62,7 @@ __export(utils_exports, {
   isErrorWithMessage: () => isErrorWithMessage,
   isNode: () => isNode,
   isNumber: () => isNumber,
-  isObject: () => isObject2,
+  isObject: () => isObject,
   isRecord: () => isRecord,
   isSDKCurrencyAmount: () => isSDKCurrencyAmount,
   isTest: () => isTest,
@@ -974,6 +974,18 @@ function localeToCurrencySymbol(locale) {
   return symbol;
 }
 
+// src/utils/typeGuards.ts
+function isUint8Array(value) {
+  return value instanceof Uint8Array;
+}
+function isObject(value) {
+  const type = typeof value;
+  return value != null && (type == "object" || type == "function");
+}
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) && Object.prototype.toString.call(value) === "[object Object]";
+}
+
 // src/utils/errors.ts
 var isError = (e) => {
   return Boolean(
@@ -994,31 +1006,71 @@ var isErrorMsg = (e, msg) => {
   }
   return false;
 };
-function errorToJSON(err) {
+function normalizeObject(obj) {
+  const normalized = {};
+  if (isObject(obj)) {
+    const props = Object.getOwnPropertyNames(obj);
+    for (const prop of props) {
+      const objRecord = obj;
+      normalized[prop] = objRecord[prop];
+    }
+  }
+  return normalized;
+}
+function errorToJSON(err, stringifyObjects = false) {
   if (!err) {
     return null;
   }
-  if (typeof err === "object" && "toJSON" in err && typeof err.toJSON === "function") {
+  if (isObject(err) && "toJSON" in err && typeof err.toJSON === "function") {
+    if (stringifyObjects === true) {
+      return objectToJSON(err.toJSON());
+    }
     return err.toJSON();
   }
   if (typeof err === "object" && /* This happens for certain errors like DOMException: */
   Object.getOwnPropertyNames(err).length === 0 && "message" in err && typeof err.message === "string") {
     return { message: err.message };
   }
+  return objectToJSON(err);
+}
+function objectToJSON(obj) {
+  const normalizedObj = normalizeObject(obj);
   return JSON.parse(
-    JSON.stringify(err, Object.getOwnPropertyNames(err))
+    JSON.stringify(normalizedObj, (key, value) => {
+      if (key === "") {
+        return value;
+      }
+      const objProps = Object.getOwnPropertyNames(normalizedObj);
+      if (!objProps.includes(key)) {
+        return void 0;
+      }
+      if (isObject(value)) {
+        return JSON.stringify(value);
+      }
+      return value;
+    })
   );
 }
 
 // src/utils/localStorage.ts
 function getLocalStorageConfigItem(key) {
-  return getLocalStorageBoolean(key);
+  const localStorageBoolean = getLocalStorageBoolean(key);
+  if (localStorageBoolean == null) {
+    return false;
+  }
+  return localStorageBoolean;
 }
 function getLocalStorageBoolean(key) {
   try {
-    return localStorage.getItem(key) === "1";
+    if (localStorage.getItem(key) === "1") {
+      return true;
+    } else if (localStorage.getItem(key) == null) {
+      return null;
+    } else {
+      return false;
+    }
   } catch (e) {
-    return false;
+    return null;
   }
 }
 function setLocalStorageBoolean(key, value) {
@@ -1092,11 +1144,11 @@ function baseGetTag(value) {
 var baseGetTag_default = baseGetTag;
 
 // ../../node_modules/lodash-es/isObject.js
-function isObject(value) {
+function isObject2(value) {
   var type = typeof value;
   return value != null && (type == "object" || type == "function");
 }
-var isObject_default = isObject;
+var isObject_default = isObject2;
 
 // ../../node_modules/lodash-es/isFunction.js
 var asyncTag = "[object AsyncFunction]";
@@ -1160,15 +1212,6 @@ function lsidToUUID(lsid) {
   return lsid.replace(/^[^:]+:(.*)$/, "$1");
 }
 
-// src/utils/typeGuards.ts
-function isUint8Array(value) {
-  return value instanceof Uint8Array;
-}
-function isObject2(value) {
-  const type = typeof value;
-  return value != null && (type == "object" || type == "function");
-}
-
 // src/utils/types.ts
 var isType = (typename) => (node) => {
   return node?.__typename === typename;
@@ -1176,9 +1219,6 @@ var isType = (typename) => (node) => {
 function notNullUndefined(value) {
   return value !== null && value !== void 0;
 }
-function isRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   CurrencyUnit,

package/dist/utils/index.d.cts

@@ -1 +1 @@
-export { A as AppendUnitsOptions, aa as ById, al 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, ae as DeepPartial, D as DeprecatedCurrencyAmountObj, a9 as ExpandRecursively, ad as ExtractByTypename, af as JSONLiteral, ah as JSONObject, ag as JSONType, a8 as Maybe, ai as NN, ab as OmitTypename, ak as PartialBy, am as RequiredKeys, S as SDKCurrencyAmountType, 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, an as isRecord, v as isSDKCurrencyAmount, I as isTest, ac as isType, a6 as isUint8Array, q as isUmaCurrencyAmount, a0 as linearInterpolate, W as localeToCurrencyCode, F as localeToCurrencySymbol, a5 as lsidToUUID, x as mapCurrencyAmount, aj as notNullUndefined, a3 as pollUntil, a1 as round, E as separateCurrencyStrParts, Z as setLocalStorageBoolean, a4 as sleep, u as urlsafe_b64decode } from '../index-C7dqDM91.cjs';
+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, 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 } from '../index-DZbfPQqd.cjs';

package/dist/utils/index.d.ts

@@ -1 +1 @@
-export { A as AppendUnitsOptions, aa as ById, al 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, ae as DeepPartial, D as DeprecatedCurrencyAmountObj, a9 as ExpandRecursively, ad as ExtractByTypename, af as JSONLiteral, ah as JSONObject, ag as JSONType, a8 as Maybe, ai as NN, ab as OmitTypename, ak as PartialBy, am as RequiredKeys, S as SDKCurrencyAmountType, 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, an as isRecord, v as isSDKCurrencyAmount, I as isTest, ac as isType, a6 as isUint8Array, q as isUmaCurrencyAmount, a0 as linearInterpolate, W as localeToCurrencyCode, F as localeToCurrencySymbol, a5 as lsidToUUID, x as mapCurrencyAmount, aj as notNullUndefined, a3 as pollUntil, a1 as round, E as separateCurrencyStrParts, Z as setLocalStorageBoolean, a4 as sleep, u as urlsafe_b64decode } from '../index-C7dqDM91.js';
+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, 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 } from '../index-DZbfPQqd.js';

package/dist/utils/index.js

@@ -50,7 +50,7 @@ import {
   setLocalStorageBoolean,
   sleep,
   urlsafe_b64decode
-} from "../chunk-23SS5EX2.js";
+} from "../chunk-NV53XYAS.js";
 export {
   CurrencyUnit,
   abbrCurrencyUnit,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightsparkdev/core",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Lightspark JS SDK",
   "author": "Lightspark Inc.",
   "keywords": [
@@ -13,7 +13,7 @@
   "homepage": "https://github.com/lightsparkdev/js-sdk",
   "repository": {
     "type": "git",
-    "url": "https://github.com/lightsparkdev/js-sdk.git"
+    "url": "git+https://github.com/lightsparkdev/js-sdk.git"
   },
   "bugs": {
     "url": "https://github.com/lightsparkdev/js-sdk/issues"
@@ -38,6 +38,7 @@
   "files": [
     "src/*",
     "dist/*",
+    "dist/utils/*",
     "CHANGELOG.md"
   ],
   "scripts": {
@@ -50,9 +51,10 @@
     "lint:fix": "eslint --fix .",
     "lint:watch": "esw ./src -w --ext .ts,.tsx,.js --color",
     "lint": "eslint .",
-    "package-types": "yarn attw --pack .",
+    "package:checks": "yarn publint && yarn attw --pack .",
     "postversion": "yarn build",
-    "test": "node --experimental-vm-modules $(yarn bin jest) --no-cache --runInBand --bail src/**/tests/**/*.test.ts",
+    "test-cmd": "node --experimental-vm-modules $(yarn bin jest) --no-cache --runInBand --bail",
+    "test": "yarn test-cmd -- src/**/tests/**/*.test.ts",
     "types:watch": "tsc-absolute --watch",
     "types": "tsc"
   },
@@ -82,6 +84,7 @@
     "lodash-es": "^4.17.21",
     "prettier": "3.0.3",
     "prettier-plugin-organize-imports": "^3.2.4",
+    "publint": "^0.3.9",
     "ts-jest": "^29.1.1",
     "tsc-absolute": "^1.0.1",
     "tsup": "^8.2.4",

package/src/requester/Requester.ts

@@ -5,7 +5,6 @@ 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 NodeWebSocket from "ws";
 import { Observable } from "zen-observable-ts";
 
 import type Query from "./Query.js";
@@ -33,7 +32,8 @@ type BodyData = {
 };
 
 class Requester {
-  private readonly wsClient: WsClient;
+  private wsClient: Promise<WsClient>;
+  private resolveWsClient: ((value: WsClient) => void) | null = null;
   constructor(
     private readonly nodeKeyCache: NodeKeyCache,
     private readonly schemaEndpoint: string,
@@ -44,22 +44,43 @@ class Requester {
     private readonly signingKey?: SigningKey,
     private readonly fetchImpl: typeof fetch = fetch,
   ) {
+    this.wsClient = new Promise<WsClient>((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 (typeof WebSocket === "undefined" && typeof window === "undefined") {
-      websocketImpl = NodeWebSocket;
+    if (isNode && typeof WebSocket === "undefined") {
+      const wsModule = await import("ws");
+      websocketImpl = wsModule.default;
     }
     let websocketProtocol = "wss";
     if (baseUrl.startsWith("http://")) {
       websocketProtocol = "ws";
     }
-    this.wsClient = createClient({
+
+    const wsClient = createClient({
       url: `${websocketProtocol}://${this.stripProtocol(this.baseUrl)}/${
         this.schemaEndpoint
       }`,
       connectionParams: () => authProvider.addWsConnectionParams({}),
       webSocketImpl: websocketImpl,
     });
-    autoBind(this);
+
+    if (this.resolveWsClient) {
+      this.resolveWsClient(wsClient);
+      this.resolveWsClient = null;
+    }
+
+    return wsClient;
   }
 
   public async executeQuery<T>(query: Query<T>): Promise<T | null> {
@@ -106,11 +127,31 @@ class Requester {
 
     return new Observable<{ data: T }>((observer) => {
       logger.trace(`Requester.subscribe observer`, observer);
-      return this.wsClient.subscribe(bodyData, {
-        next: (data) => observer.next(data as { data: T }),
-        error: (err) => observer.error(err),
-        complete: () => observer.complete(),
-      });
+
+      let cleanup: (() => void) | null = null;
+      let canceled = false;
+
+      void (async () => {
+        try {
+          const wsClient = await this.wsClient;
+          if (!canceled) {
+            cleanup = wsClient.subscribe(bodyData, {
+              next: (data) => observer.next(data as { data: T }),
+              error: (err) => observer.error(err),
+              complete: () => observer.complete(),
+            });
+          }
+        } catch (err) {
+          observer.error(err);
+        }
+      })();
+
+      return () => {
+        canceled = true;
+        if (cleanup) {
+          cleanup();
+        }
+      };
     });
   }
 
@@ -208,9 +249,22 @@ class Requester {
     };
     const data = responseJson.data;
     if (!data) {
+      let firstErrorName: string | undefined = undefined;
+      if (
+        Array.isArray(responseJson.errors) &&
+        responseJson.errors.length > 0
+      ) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        const firstError = responseJson.errors[0];
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        firstErrorName = firstError["extensions"]?.["error_name"] as
+          | string
+          | undefined;
+      }
       throw new LightsparkException(
         "RequestFailed",
         `Request ${operation} failed. ${JSON.stringify(responseJson.errors)}`,
+        { errorName: firstErrorName },
       );
     }
     return data;