@lightsparkdev/lightspark-sdk 0.3.2 → 0.3.4

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @lightsparkdev/lightspark-sdk
 
+## 0.3.4
+
+### Patch Changes
+
+- 55f31db: Add walletID to relevant webhook events.
+
+## 0.3.3
+
+### Patch Changes
+
+- cf73a38: Upgrade yarn to latest
+- 9c0a2fe: Move typedoc into dev deps for sdks
+- 9c0a2fe: Declare shared deps in workspaces that require them
+- 9c0a2fe: Fix importing TextDecoder when not available
+- 9c0a2fe: Fix webhook JS docs and function names
+- Updated dependencies [cf73a38]
+- Updated dependencies [9c0a2fe]
+  - @lightsparkdev/core@0.3.2
+
 ## 0.3.2
 
 ### Patch Changes

package/README.md

@@ -123,15 +123,14 @@ $ ts-node createInvoice.ts -a "100" -m "Whasssupppp"
 
 ### Streaming Wallet Extension
 
-This example is meant to be used in conjunction with the [Lightspark streaming sats demo](https://app.lightspark.com/demos/streaming). It can be built and installed as a Chrome extension by running:
+This example is meant to be used in conjunction with the [Lightspark streaming sats demo](https://app.lightspark.com/demos/streaming). It can be built and installed as a Chrome extension by running (from root js-sdk directory):
 
 ```bash
-$ cd examples/streaming-wallet-extension
-$ npm install
-$ npm run build
+$ yarn
+$ yarn build
 ```
 
-Then, go to `chrome://extensions` and click "Load unpacked" and select the `streaming-wallet-extension/build` directory.
+Then, go to `chrome://extensions` and click "Load unpacked" and select the `apps/examples/streaming-wallet-extension/build` directory.
 
 When the extension is installed, it will automatically open the streaming sats demo page. You can then click extension icon to open the extension popup, which will give you the ability to create a test account with 2 nodes - a viewer node (which acts as your wallet for the demo), and a creator node, which simulates the wallet of the creator of the streaming content. The page will reload and you'll be able to start streaming sats as the video plays!
 

package/dist/index.cjs

@@ -35,7 +35,7 @@ var require_package = __commonJS({
   "package.json"(exports, module2) {
     module2.exports = {
       name: "@lightsparkdev/lightspark-sdk",
-      version: "0.3.2",
+      version: "0.3.4",
       description: "Lightspark JS SDK",
       author: "Lightspark Inc.",
       keywords: [
@@ -92,25 +92,25 @@ var require_package = __commonJS({
       ],
       scripts: {
         build: "tsup --entry src/index.ts --entry src/objects/index.ts --format cjs,esm --dts",
-        clean: "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
+        clean: "rm -rf .turbo && rm -rf dist",
         dev: "yarn build -- --watch",
         docs: "typedoc src",
-        format: "npx prettier --write ./src",
-        lint: "npx prettier --check ./src",
+        format: "prettier src --check",
+        "format:fix": "prettier src --write",
+        lint: "prettier --check ./src",
         postversion: "yarn build",
         test: "jest --no-cache --runInBand --bail",
-        "type-check": "tsc --noEmit"
+        types: "tsc"
       },
       license: "Apache-2.0",
       dependencies: {
-        "@lightsparkdev/core": "0.3.1",
+        "@lightsparkdev/core": "0.3.2",
         "auto-bind": "^5.0.1",
         crypto: "^1.0.1",
         "crypto-browserify": "^3.12.0",
         dayjs: "^1.11.7",
         graphql: "^16.6.0",
         "graphql-ws": "^5.11.3",
-        typedoc: "^0.24.7",
         ws: "^8.12.1",
         "zen-observable-ts": "^1.1.0"
       },
@@ -118,12 +118,13 @@ var require_package = __commonJS({
         "@types/crypto-js": "^4.1.1",
         "@types/jest": "^29.5.2",
         "@types/ws": "^8.5.4",
-        jest: "^29.5.0",
-        prettier: "^2.8.4",
-        "prettier-plugin-organize-imports": "^3.2.2",
-        "ts-jest": "^29.1.0",
+        jest: "^29.4.1",
+        prettier: "2.8.7",
+        "ts-jest": "^29.0.5",
         "ts-node": "^10.9.1",
         tsconfig: "*",
+        tsup: "^6.7.0",
+        typedoc: "^0.24.7",
         typescript: "^4.9.5"
       }
     };
@@ -1983,8 +1984,7 @@ __export(src_exports, {
   getRoutingTransactionQuery: () => getRoutingTransactionQuery,
   getTransactionQuery: () => getTransactionQuery,
   getWithdrawalQuery: () => getWithdrawalQuery,
-  parse_webhook: () => parse_webhook,
-  verify_and_parse_webhook: () => verify_and_parse_webhook
+  verifyAndParseWebhook: () => verifyAndParseWebhook
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -8855,24 +8855,27 @@ ${FRAGMENT28}
 // src/webhooks.ts
 var import_crypto = require("crypto");
 var WEBHOOKS_SIGNATURE_HEADER = "lightspark-signature";
-var verify_and_parse_webhook = (data, hexdigest, webhook_secret) => {
+var verifyAndParseWebhook = (data, hexdigest, webhook_secret) => {
   const sig = (0, import_crypto.createHmac)("sha256", webhook_secret).update(data).digest("hex");
   if (sig.toLowerCase() !== hexdigest.toLowerCase()) {
     throw new Error("Webhook message hash does not match signature");
   }
-  return parse_webhook(data);
+  return parseWebhook(data);
 };
-var parse_webhook = async (data) => {
-  if (typeof TextDecoder === "undefined") {
-    const TextDecoder2 = (await Promise.resolve().then(() => __toESM(require_text_encoding(), 1))).TextDecoder;
+var parseWebhook = async (data) => {
+  let td = TextDecoder;
+  if (typeof td === "undefined") {
+    const tdModule = await Promise.resolve().then(() => __toESM(require_text_encoding(), 1));
+    td = tdModule.TextDecoder;
   }
-  const dataStr = new TextDecoder().decode(data);
+  const dataStr = new td().decode(data);
   const event = JSON.parse(dataStr);
   return {
     event_type: WebhookEventType[event.event_type],
     event_id: event.event_id,
     timestamp: new Date(event.timestamp),
-    entity_id: event.entity_id
+    entity_id: event.entity_id,
+    wallet_id: event.wallet_id
   };
 };
 // Annotate the CommonJS export names for ESM import in node:
@@ -8923,6 +8926,5 @@ var parse_webhook = async (data) => {
   getRoutingTransactionQuery,
   getTransactionQuery,
   getWithdrawalQuery,
-  parse_webhook,
-  verify_and_parse_webhook
+  verifyAndParseWebhook
 });

package/dist/index.d.ts

@@ -19,8 +19,8 @@ interface WebhookEvent {
     event_id: string;
     timestamp: Date;
     entity_id: string;
+    wallet_id?: string;
 }
-declare const verify_and_parse_webhook: (data: Uint8Array, hexdigest: string, webhook_secret: string) => Promise<WebhookEvent>;
-declare const parse_webhook: (data: Uint8Array) => Promise<WebhookEvent>;
+declare const verifyAndParseWebhook: (data: Uint8Array, hexdigest: string, webhook_secret: string) => Promise<WebhookEvent>;
 
-export { AccountTokenAuthProvider, WEBHOOKS_SIGNATURE_HEADER, WebhookEvent, WebhookEventType, parse_webhook, verify_and_parse_webhook };
+export { AccountTokenAuthProvider, WEBHOOKS_SIGNATURE_HEADER, WebhookEvent, WebhookEventType, verifyAndParseWebhook };

package/dist/index.js

@@ -70,7 +70,7 @@ var require_package = __commonJS({
   "package.json"(exports, module) {
     module.exports = {
       name: "@lightsparkdev/lightspark-sdk",
-      version: "0.3.2",
+      version: "0.3.4",
       description: "Lightspark JS SDK",
       author: "Lightspark Inc.",
       keywords: [
@@ -127,25 +127,25 @@ var require_package = __commonJS({
       ],
       scripts: {
         build: "tsup --entry src/index.ts --entry src/objects/index.ts --format cjs,esm --dts",
-        clean: "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
+        clean: "rm -rf .turbo && rm -rf dist",
         dev: "yarn build -- --watch",
         docs: "typedoc src",
-        format: "npx prettier --write ./src",
-        lint: "npx prettier --check ./src",
+        format: "prettier src --check",
+        "format:fix": "prettier src --write",
+        lint: "prettier --check ./src",
         postversion: "yarn build",
         test: "jest --no-cache --runInBand --bail",
-        "type-check": "tsc --noEmit"
+        types: "tsc"
       },
       license: "Apache-2.0",
       dependencies: {
-        "@lightsparkdev/core": "0.3.1",
+        "@lightsparkdev/core": "0.3.2",
         "auto-bind": "^5.0.1",
         crypto: "^1.0.1",
         "crypto-browserify": "^3.12.0",
         dayjs: "^1.11.7",
         graphql: "^16.6.0",
         "graphql-ws": "^5.11.3",
-        typedoc: "^0.24.7",
         ws: "^8.12.1",
         "zen-observable-ts": "^1.1.0"
       },
@@ -153,12 +153,13 @@ var require_package = __commonJS({
         "@types/crypto-js": "^4.1.1",
         "@types/jest": "^29.5.2",
         "@types/ws": "^8.5.4",
-        jest: "^29.5.0",
-        prettier: "^2.8.4",
-        "prettier-plugin-organize-imports": "^3.2.2",
-        "ts-jest": "^29.1.0",
+        jest: "^29.4.1",
+        prettier: "2.8.7",
+        "ts-jest": "^29.0.5",
         "ts-node": "^10.9.1",
         tsconfig: "*",
+        tsup: "^6.7.0",
+        typedoc: "^0.24.7",
         typescript: "^4.9.5"
       }
     };
@@ -1352,24 +1353,27 @@ var client_default = LightsparkClient;
 // src/webhooks.ts
 import { createHmac } from "crypto";
 var WEBHOOKS_SIGNATURE_HEADER = "lightspark-signature";
-var verify_and_parse_webhook = (data, hexdigest, webhook_secret) => {
+var verifyAndParseWebhook = (data, hexdigest, webhook_secret) => {
   const sig = createHmac("sha256", webhook_secret).update(data).digest("hex");
   if (sig.toLowerCase() !== hexdigest.toLowerCase()) {
     throw new Error("Webhook message hash does not match signature");
   }
-  return parse_webhook(data);
+  return parseWebhook(data);
 };
-var parse_webhook = async (data) => {
-  if (typeof TextDecoder === "undefined") {
-    const TextDecoder2 = (await import("./text-encoding-MDIPJAHL.js")).TextDecoder;
+var parseWebhook = async (data) => {
+  let td = TextDecoder;
+  if (typeof td === "undefined") {
+    const tdModule = await import("./text-encoding-MDIPJAHL.js");
+    td = tdModule.TextDecoder;
   }
-  const dataStr = new TextDecoder().decode(data);
+  const dataStr = new td().decode(data);
   const event = JSON.parse(dataStr);
   return {
     event_type: WebhookEventType[event.event_type],
     event_id: event.event_id,
     timestamp: new Date(event.timestamp),
-    entity_id: event.entity_id
+    entity_id: event.entity_id,
+    wallet_id: event.wallet_id
   };
 };
 export {
@@ -1419,6 +1423,5 @@ export {
   getRoutingTransactionQuery,
   getTransactionQuery,
   getWithdrawalQuery,
-  parse_webhook,
-  verify_and_parse_webhook
+  verifyAndParseWebhook
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightsparkdev/lightspark-sdk",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Lightspark JS SDK",
   "author": "Lightspark Inc.",
   "keywords": [
@@ -57,25 +57,25 @@
   ],
   "scripts": {
     "build": "tsup --entry src/index.ts --entry src/objects/index.ts --format cjs,esm --dts",
-    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
+    "clean": "rm -rf .turbo && rm -rf dist",
     "dev": "yarn build -- --watch",
     "docs": "typedoc src",
-    "format": "npx prettier --write ./src",
-    "lint": "npx prettier --check ./src",
+    "format": "prettier src --check",
+    "format:fix": "prettier src --write",
+    "lint": "prettier --check ./src",
     "postversion": "yarn build",
     "test": "jest --no-cache --runInBand --bail",
-    "type-check": "tsc --noEmit"
+    "types": "tsc"
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@lightsparkdev/core": "0.3.1",
+    "@lightsparkdev/core": "0.3.2",
     "auto-bind": "^5.0.1",
     "crypto": "^1.0.1",
     "crypto-browserify": "^3.12.0",
     "dayjs": "^1.11.7",
     "graphql": "^16.6.0",
     "graphql-ws": "^5.11.3",
-    "typedoc": "^0.24.7",
     "ws": "^8.12.1",
     "zen-observable-ts": "^1.1.0"
   },
@@ -83,12 +83,13 @@
     "@types/crypto-js": "^4.1.1",
     "@types/jest": "^29.5.2",
     "@types/ws": "^8.5.4",
-    "jest": "^29.5.0",
-    "prettier": "^2.8.4",
-    "prettier-plugin-organize-imports": "^3.2.2",
-    "ts-jest": "^29.1.0",
+    "jest": "^29.4.1",
+    "prettier": "2.8.7",
+    "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
     "tsconfig": "*",
+    "tsup": "^6.7.0",
+    "typedoc": "^0.24.7",
     "typescript": "^4.9.5"
   }
 }

package/src/__tests__/webhooks.test.ts

@@ -1,5 +1,5 @@
 import WebhookEventType from "../objects/WebhookEventType.js";
-import { verify_and_parse_webhook } from "../webhooks.js";
+import { verifyAndParseWebhook } from "../webhooks.js";
 
 describe("Webhooks", () => {
   test("should verify and parse webhook data", async () => {
@@ -12,8 +12,8 @@ describe("Webhooks", () => {
       "62a8829aeb48b4142533520b1f7f86cdb1ee7d718bf3ea15bc1c662d4c453b74";
     const webhookSecret = "3gZ5oQQUASYmqQNuEk0KambNMVkOADDItIJjzUlAWjX";
 
-    const webhook = await verify_and_parse_webhook(
-      new TextEncoder().encode(data),
+    const webhook = await verifyAndParseWebhook(
+      Buffer.from(data, "utf-8"),
       hexdigest,
       webhookSecret
     );

package/src/webhooks.ts

@@ -8,9 +8,10 @@ export interface WebhookEvent {
   event_id: string;
   timestamp: Date;
   entity_id: string;
+  wallet_id?: string;
 }
 
-export const verify_and_parse_webhook = (
+export const verifyAndParseWebhook = (
   data: Uint8Array,
   hexdigest: string,
   webhook_secret: string
@@ -21,16 +22,16 @@ export const verify_and_parse_webhook = (
     throw new Error("Webhook message hash does not match signature");
   }
 
-  return parse_webhook(data);
+  return parseWebhook(data);
 };
 
-export const parse_webhook = async (
-  data: Uint8Array
-): Promise<WebhookEvent> => {
-  if (typeof TextDecoder === "undefined") {
-    const TextDecoder = (await import("text-encoding")).TextDecoder;
+const parseWebhook = async (data: Uint8Array): Promise<WebhookEvent> => {
+  let td = TextDecoder;
+  if (typeof td === "undefined") {
+    const tdModule = await import("text-encoding");
+    td = tdModule.TextDecoder;
   }
-  const dataStr = new TextDecoder().decode(data);
+  const dataStr = new td().decode(data);
   const event = JSON.parse(dataStr);
 
   return {
@@ -38,5 +39,6 @@ export const parse_webhook = async (
     event_id: event.event_id,
     timestamp: new Date(event.timestamp),
     entity_id: event.entity_id,
+    wallet_id: event.wallet_id,
   };
 };