@caspay/sdk 1.1.4 → 1.1.6

package/dist/index.esm.js

@@ -1,6 +1,6 @@
 import { PublicKey, ExecutableDeployItem, TransferDeployItem, DeployHeader, Deploy } from 'casper-js-sdk';
 
-const SDK_VERSION = '1.1.4';
+const SDK_VERSION = '1.1.6';
 
 class HttpClient {
     constructor(config) {
@@ -320,8 +320,9 @@ class Payments {
 }
 
 class Subscriptions {
-    constructor(client) {
+    constructor(client, config) {
         this.client = client;
+        this.config = config;
     }
     async checkStatus(params) {
         if (!params.subscriberAddress) {
@@ -332,7 +333,8 @@ class Subscriptions {
             };
         }
         const merchantId = this.client.getMerchantId();
-        let url = `/v1/subscriptions/check?merchant_id=${merchantId}&subscriber=${params.subscriberAddress}`;
+        const network = params.network || this.config.network || 'testnet';
+        let url = `/v1/subscriptions/check?merchant_id=${merchantId}&subscriber=${params.subscriberAddress}&network=${network}`;
         if (params.planId) {
             url += `&plan_id=${params.planId}`;
         }
@@ -346,6 +348,7 @@ class Wallet {
         this.provider = null;
         this.connected = false;
         this.activeAddress = null;
+        this.activeNetwork = null;
         this.config = config;
         this.initProvider();
     }
@@ -366,6 +369,9 @@ class Wallet {
                 const state = JSON.parse(event.detail);
                 this.connected = true;
                 this.activeAddress = state.activeKey || null;
+                if (state.activeNetwork) {
+                    this.activeNetwork = state.activeNetwork;
+                }
             }
             catch (e) {
             }
@@ -373,6 +379,7 @@ class Wallet {
         window.addEventListener('casper-wallet:disconnected', () => {
             this.connected = false;
             this.activeAddress = null;
+            this.activeNetwork = null;
         });
         window.addEventListener('casper-wallet:activeKeyChanged', (event) => {
             try {
@@ -382,6 +389,14 @@ class Wallet {
             catch (e) {
             }
         });
+        window.addEventListener('casper-wallet:activeNetworkChanged', (event) => {
+            try {
+                const state = JSON.parse(event.detail);
+                this.activeNetwork = state.activeNetwork || state;
+            }
+            catch (e) {
+            }
+        });
         window.addEventListener('casper-wallet:locked', () => {
             this.connected = false;
         });
@@ -530,14 +545,20 @@ class Wallet {
         return this.config.network === 'mainnet' ? 'casper' : 'casper-test';
     }
     async getActiveNetwork() {
+        if (this.activeNetwork) {
+            return this.activeNetwork;
+        }
         if (!this.provider) {
             return this.getNetwork();
         }
         try {
-            const network = await this.provider.getActiveNetwork?.();
-            if (network) {
-                // 'casper' or 'casper-test'
-                return network;
+            const state = await this.provider.getActivePublicKey();
+            if (state) {
+                const providerState = window.CasperWalletState;
+                if (providerState?.activeNetwork) {
+                    this.activeNetwork = providerState.activeNetwork;
+                    return providerState.activeNetwork;
+                }
             }
         }
         catch (error) {
@@ -591,7 +612,7 @@ class CasPay {
         this.transfer = new Transfer(this.wallet, apiBaseUrl);
         this.payments = new Payments(this.client);
         this.payments.setWallet(this.wallet, this.transfer);
-        this.subscriptions = new Subscriptions(this.client);
+        this.subscriptions = new Subscriptions(this.client, config);
     }
     static get version() {
         return SDK_VERSION;

package/dist/index.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var casperJsSdk = require('casper-js-sdk');
 
-const SDK_VERSION = '1.1.4';
+const SDK_VERSION = '1.1.6';
 
 class HttpClient {
     constructor(config) {
@@ -324,8 +324,9 @@ class Payments {
 }
 
 class Subscriptions {
-    constructor(client) {
+    constructor(client, config) {
         this.client = client;
+        this.config = config;
     }
     async checkStatus(params) {
         if (!params.subscriberAddress) {
@@ -336,7 +337,8 @@ class Subscriptions {
             };
         }
         const merchantId = this.client.getMerchantId();
-        let url = `/v1/subscriptions/check?merchant_id=${merchantId}&subscriber=${params.subscriberAddress}`;
+        const network = params.network || this.config.network || 'testnet';
+        let url = `/v1/subscriptions/check?merchant_id=${merchantId}&subscriber=${params.subscriberAddress}&network=${network}`;
         if (params.planId) {
             url += `&plan_id=${params.planId}`;
         }
@@ -350,6 +352,7 @@ class Wallet {
         this.provider = null;
         this.connected = false;
         this.activeAddress = null;
+        this.activeNetwork = null;
         this.config = config;
         this.initProvider();
     }
@@ -370,6 +373,9 @@ class Wallet {
                 const state = JSON.parse(event.detail);
                 this.connected = true;
                 this.activeAddress = state.activeKey || null;
+                if (state.activeNetwork) {
+                    this.activeNetwork = state.activeNetwork;
+                }
             }
             catch (e) {
             }
@@ -377,6 +383,7 @@ class Wallet {
         window.addEventListener('casper-wallet:disconnected', () => {
             this.connected = false;
             this.activeAddress = null;
+            this.activeNetwork = null;
         });
         window.addEventListener('casper-wallet:activeKeyChanged', (event) => {
             try {
@@ -386,6 +393,14 @@ class Wallet {
             catch (e) {
             }
         });
+        window.addEventListener('casper-wallet:activeNetworkChanged', (event) => {
+            try {
+                const state = JSON.parse(event.detail);
+                this.activeNetwork = state.activeNetwork || state;
+            }
+            catch (e) {
+            }
+        });
         window.addEventListener('casper-wallet:locked', () => {
             this.connected = false;
         });
@@ -534,14 +549,20 @@ class Wallet {
         return this.config.network === 'mainnet' ? 'casper' : 'casper-test';
     }
     async getActiveNetwork() {
+        if (this.activeNetwork) {
+            return this.activeNetwork;
+        }
         if (!this.provider) {
             return this.getNetwork();
         }
         try {
-            const network = await this.provider.getActiveNetwork?.();
-            if (network) {
-                // 'casper' or 'casper-test'
-                return network;
+            const state = await this.provider.getActivePublicKey();
+            if (state) {
+                const providerState = window.CasperWalletState;
+                if (providerState?.activeNetwork) {
+                    this.activeNetwork = providerState.activeNetwork;
+                    return providerState.activeNetwork;
+                }
             }
         }
         catch (error) {
@@ -595,7 +616,7 @@ class CasPay {
         this.transfer = new Transfer(this.wallet, apiBaseUrl);
         this.payments = new Payments(this.client);
         this.payments.setWallet(this.wallet, this.transfer);
-        this.subscriptions = new Subscriptions(this.client);
+        this.subscriptions = new Subscriptions(this.client, config);
     }
     static get version() {
         return SDK_VERSION;

package/dist/resources/subscriptions.d.ts

@@ -1,7 +1,8 @@
 import type { HttpClient } from '../core/client';
-import type { SubscriptionCheckParams, SubscriptionCheckResponse } from '../types';
+import type { SubscriptionCheckParams, SubscriptionCheckResponse, CasPayConfig } from '../types';
 export declare class Subscriptions {
     private client;
-    constructor(client: HttpClient);
+    private config;
+    constructor(client: HttpClient, config: CasPayConfig);
     checkStatus(params: SubscriptionCheckParams): Promise<SubscriptionCheckResponse>;
 }

package/dist/resources/wallet.d.ts

@@ -4,6 +4,7 @@ export declare class Wallet {
     private config;
     private connected;
     private activeAddress;
+    private activeNetwork;
     constructor(config: CasPayConfig);
     private initProvider;
     private setupEventListeners;

package/dist/types/index.d.ts

@@ -93,6 +93,7 @@ export interface TransferResult {
 export interface SubscriptionCheckParams {
     subscriberAddress: string;
     planId?: string;
+    network?: 'testnet' | 'mainnet';
 }
 export interface SubscriptionCheckResponse {
     success: boolean;

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const SDK_VERSION = "1.1.4";
+export declare const SDK_VERSION = "1.1.6";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caspay/sdk",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "Official CasPay JavaScript/TypeScript SDK - Accept crypto payments with Casper blockchain",
   "type": "module",
   "main": "dist/index.js",