@atxp/base 0.2.17 → 0.2.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +6 -0
- package/dist/baseAppAccount.d.ts +3 -1
- package/dist/baseAppAccount.d.ts.map +1 -1
- package/dist/baseAppAccount.ephemeral.test.d.ts +2 -0
- package/dist/baseAppAccount.ephemeral.test.d.ts.map +1 -0
- package/dist/baseAppAccount.ephemeral.test.js +420 -0
- package/dist/baseAppAccount.ephemeral.test.js.map +1 -0
- package/dist/baseAppAccount.js +43 -16
- package/dist/baseAppAccount.js.map +1 -1
- package/dist/baseAppAccount.mainWallet.test.d.ts +2 -0
- package/dist/baseAppAccount.mainWallet.test.d.ts.map +1 -0
- package/dist/baseAppAccount.mainWallet.test.js +259 -0
- package/dist/baseAppAccount.mainWallet.test.js.map +1 -0
- package/dist/baseAppPaymentMaker.d.ts.map +1 -1
- package/dist/baseAppPaymentMaker.js +4 -3
- package/dist/baseAppPaymentMaker.js.map +1 -1
- package/dist/baseAppPaymentMaker.test.js +81 -69
- package/dist/baseAppPaymentMaker.test.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/mainWalletPaymentMaker.d.ts +22 -0
- package/dist/mainWalletPaymentMaker.d.ts.map +1 -0
- package/dist/mainWalletPaymentMaker.js +156 -0
- package/dist/mainWalletPaymentMaker.js.map +1 -0
- package/dist/mainWalletPaymentMaker.test.d.ts +2 -0
- package/dist/mainWalletPaymentMaker.test.d.ts.map +1 -0
- package/dist/mainWalletPaymentMaker.test.js +340 -0
- package/dist/mainWalletPaymentMaker.test.js.map +1 -0
- package/dist/storage.d.ts +1 -0
- package/dist/storage.d.ts.map +1 -1
- package/dist/storage.js +9 -0
- package/dist/storage.js.map +1 -1
- package/dist/testHelpers.d.ts +88 -0
- package/dist/testHelpers.d.ts.map +1 -0
- package/dist/testHelpers.js +202 -0
- package/dist/testHelpers.js.map +1 -0
- package/package.json +3 -3
|
@@ -0,0 +1,156 @@
|
|
|
1
|
+
import { encodeFunctionData, toHex } from 'viem';
|
|
2
|
+
import { USDC_CONTRACT_ADDRESS_BASE } from '@atxp/client';
|
|
3
|
+
import { ConsoleLogger } from '@atxp/common';
|
|
4
|
+
const USDC_DECIMALS = 6;
|
|
5
|
+
// Helper function to convert to base64url that works in both Node.js and browsers
|
|
6
|
+
function toBase64Url(data) {
|
|
7
|
+
// Convert string to base64
|
|
8
|
+
const base64 = typeof Buffer !== 'undefined'
|
|
9
|
+
? Buffer.from(data).toString('base64')
|
|
10
|
+
: btoa(data);
|
|
11
|
+
// Convert base64 to base64url
|
|
12
|
+
return base64
|
|
13
|
+
.replace(/\+/g, '-')
|
|
14
|
+
.replace(/\//g, '_')
|
|
15
|
+
.replace(/=/g, '');
|
|
16
|
+
}
|
|
17
|
+
export class MainWalletPaymentMaker {
|
|
18
|
+
constructor(walletAddress, provider, logger) {
|
|
19
|
+
this.walletAddress = walletAddress;
|
|
20
|
+
this.provider = provider;
|
|
21
|
+
this.logger = logger || new ConsoleLogger();
|
|
22
|
+
}
|
|
23
|
+
async generateJWT(payload) {
|
|
24
|
+
this.logger.info(`codeChallenge: ${payload.codeChallenge}`);
|
|
25
|
+
this.logger.info(`paymentRequestId: ${payload.paymentRequestId}`);
|
|
26
|
+
this.logger.info(`walletAddress: ${this.walletAddress}`);
|
|
27
|
+
// Generate EIP-1271 auth data for main wallet authentication
|
|
28
|
+
const timestamp = Math.floor(Date.now() / 1000);
|
|
29
|
+
const nonce = Math.random().toString(36).substring(2, 15);
|
|
30
|
+
// Construct the message in the required format - must match BaseAppPaymentMaker exactly
|
|
31
|
+
const messageParts = [
|
|
32
|
+
`PayMCP Authorization Request`,
|
|
33
|
+
``,
|
|
34
|
+
`Wallet: ${this.walletAddress}`,
|
|
35
|
+
`Timestamp: ${timestamp}`,
|
|
36
|
+
`Nonce: ${nonce}`
|
|
37
|
+
];
|
|
38
|
+
if (payload.codeChallenge) {
|
|
39
|
+
messageParts.push(`Code Challenge: ${payload.codeChallenge}`);
|
|
40
|
+
}
|
|
41
|
+
if (payload.paymentRequestId) {
|
|
42
|
+
messageParts.push(`Payment Request ID: ${payload.paymentRequestId}`);
|
|
43
|
+
}
|
|
44
|
+
messageParts.push('', '', 'Sign this message to prove you control this wallet.');
|
|
45
|
+
const message = messageParts.join('\n');
|
|
46
|
+
// Sign with the main wallet
|
|
47
|
+
// Coinbase Wallet requires hex-encoded messages, while other wallets may accept plain strings
|
|
48
|
+
let messageToSign;
|
|
49
|
+
// Check if this is Coinbase Wallet by looking for provider properties
|
|
50
|
+
const isCoinbaseWallet = this.provider.isCoinbaseWallet ||
|
|
51
|
+
this.provider.isCoinbaseBrowser;
|
|
52
|
+
if (isCoinbaseWallet) {
|
|
53
|
+
// Coinbase Wallet requires hex-encoded messages
|
|
54
|
+
messageToSign = toHex(message);
|
|
55
|
+
this.logger.info('Using hex-encoded message for Coinbase Wallet');
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
// Other wallets (MetaMask, etc.) typically accept plain strings
|
|
59
|
+
messageToSign = message;
|
|
60
|
+
this.logger.info('Using plain string message for wallet');
|
|
61
|
+
}
|
|
62
|
+
const signature = await this.provider.request({
|
|
63
|
+
method: 'personal_sign',
|
|
64
|
+
params: [messageToSign, this.walletAddress]
|
|
65
|
+
});
|
|
66
|
+
// Create EIP-1271 auth data
|
|
67
|
+
const authData = {
|
|
68
|
+
type: 'EIP1271_AUTH',
|
|
69
|
+
walletAddress: this.walletAddress,
|
|
70
|
+
message: message,
|
|
71
|
+
signature: signature,
|
|
72
|
+
timestamp: timestamp,
|
|
73
|
+
nonce: nonce,
|
|
74
|
+
...(payload.codeChallenge && { code_challenge: payload.codeChallenge }),
|
|
75
|
+
...(payload.paymentRequestId && { payment_request_id: payload.paymentRequestId })
|
|
76
|
+
};
|
|
77
|
+
// Encode as base64url
|
|
78
|
+
const encodedAuth = toBase64Url(JSON.stringify(authData));
|
|
79
|
+
this.logger.info(`Generated EIP-1271 auth data: ${encodedAuth}`);
|
|
80
|
+
return encodedAuth;
|
|
81
|
+
}
|
|
82
|
+
async makePayment(amount, currency, receiver, _reason) {
|
|
83
|
+
if (currency !== 'USDC') {
|
|
84
|
+
throw new Error('Only usdc currency is supported');
|
|
85
|
+
}
|
|
86
|
+
this.logger.info(`Making direct payment of ${amount} ${currency} to ${receiver} on Base`);
|
|
87
|
+
// Convert amount to USDC units (6 decimals)
|
|
88
|
+
const amountInUSDCUnits = BigInt(amount.multipliedBy(10 ** USDC_DECIMALS).toFixed(0));
|
|
89
|
+
// Encode the transfer function data
|
|
90
|
+
const transferData = encodeFunctionData({
|
|
91
|
+
abi: [{
|
|
92
|
+
name: 'transfer',
|
|
93
|
+
type: 'function',
|
|
94
|
+
inputs: [
|
|
95
|
+
{ name: 'to', type: 'address' },
|
|
96
|
+
{ name: 'amount', type: 'uint256' }
|
|
97
|
+
],
|
|
98
|
+
outputs: [{ name: '', type: 'bool' }]
|
|
99
|
+
}],
|
|
100
|
+
functionName: 'transfer',
|
|
101
|
+
args: [receiver, amountInUSDCUnits]
|
|
102
|
+
});
|
|
103
|
+
// Send the transaction through the user's wallet
|
|
104
|
+
const txHash = await this.provider.request({
|
|
105
|
+
method: 'eth_sendTransaction',
|
|
106
|
+
params: [{
|
|
107
|
+
from: this.walletAddress,
|
|
108
|
+
to: USDC_CONTRACT_ADDRESS_BASE,
|
|
109
|
+
data: transferData,
|
|
110
|
+
value: '0x0'
|
|
111
|
+
}]
|
|
112
|
+
});
|
|
113
|
+
this.logger.info(`Transaction submitted. TxHash: ${txHash}`);
|
|
114
|
+
// Wait for confirmations
|
|
115
|
+
const CONFIRMATIONS = 2;
|
|
116
|
+
await this.waitForTransactionConfirmations(txHash, CONFIRMATIONS);
|
|
117
|
+
return txHash;
|
|
118
|
+
}
|
|
119
|
+
async waitForTransactionConfirmations(txHash, confirmations) {
|
|
120
|
+
this.logger.info(`Waiting for ${confirmations} confirmations...`);
|
|
121
|
+
// Poll for transaction receipt
|
|
122
|
+
let receipt = null;
|
|
123
|
+
while (!receipt) {
|
|
124
|
+
try {
|
|
125
|
+
receipt = await this.provider.request({
|
|
126
|
+
method: 'eth_getTransactionReceipt',
|
|
127
|
+
params: [txHash]
|
|
128
|
+
});
|
|
129
|
+
if (!receipt) {
|
|
130
|
+
await new Promise(resolve => setTimeout(resolve, 1000));
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
catch (error) {
|
|
134
|
+
this.logger.warn(`Error getting receipt: ${error}`);
|
|
135
|
+
await new Promise(resolve => setTimeout(resolve, 1000));
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
// Check if transaction was successful
|
|
139
|
+
if (receipt.status === '0x0') {
|
|
140
|
+
throw new Error(`Transaction failed. TxHash: ${txHash}`);
|
|
141
|
+
}
|
|
142
|
+
// Wait for confirmations
|
|
143
|
+
const startBlock = parseInt(receipt.blockNumber, 16);
|
|
144
|
+
let currentBlock = startBlock;
|
|
145
|
+
while (currentBlock - startBlock < confirmations - 1) {
|
|
146
|
+
await new Promise(resolve => setTimeout(resolve, 1000));
|
|
147
|
+
const blockNumber = await this.provider.request({
|
|
148
|
+
method: 'eth_blockNumber',
|
|
149
|
+
params: []
|
|
150
|
+
});
|
|
151
|
+
currentBlock = parseInt(blockNumber, 16);
|
|
152
|
+
}
|
|
153
|
+
this.logger.info(`Transaction confirmed with ${confirmations} confirmations`);
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
//# sourceMappingURL=mainWalletPaymentMaker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mainWalletPaymentMaker.js","sourceRoot":"","sources":["../src/mainWalletPaymentMaker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AACjD,OAAO,EAAE,0BAA0B,EAAY,MAAM,cAAc,CAAC;AAEpE,OAAO,EAAE,aAAa,EAAoB,MAAM,cAAc,CAAC;AAE/D,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB,kFAAkF;AAClF,SAAS,WAAW,CAAC,IAAY;IAC/B,2BAA2B;IAC3B,MAAM,MAAM,GAAG,OAAO,MAAM,KAAK,WAAW;QAC1C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACtC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,8BAA8B;IAC9B,OAAO,MAAM;SACV,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;SACnB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;SACnB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AACvB,CAAC;AASD,MAAM,OAAO,sBAAsB;IAGjC,YACU,aAAqB,EACrB,QAA4B,EACpC,MAAe;QAFP,kBAAa,GAAb,aAAa,CAAQ;QACrB,aAAQ,GAAR,QAAQ,CAAoB;QAGpC,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAGjB;QACC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QAEzD,6DAA6D;QAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAE1D,wFAAwF;QACxF,MAAM,YAAY,GAAG;YACnB,8BAA8B;YAC9B,EAAE;YACF,WAAW,IAAI,CAAC,aAAa,EAAE;YAC/B,cAAc,SAAS,EAAE;YACzB,UAAU,KAAK,EAAE;SAClB,CAAC;QAEF,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAC1B,YAAY,CAAC,IAAI,CAAC,mBAAmB,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;QAChE,CAAC;QAED,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAC7B,YAAY,CAAC,IAAI,CAAC,uBAAuB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACvE,CAAC;QAED,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,EAAE,qDAAqD,CAAC,CAAC;QACjF,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAExC,4BAA4B;QAC5B,8FAA8F;QAC9F,IAAI,aAAqB,CAAC;QAE1B,sEAAsE;QACtE,MAAM,gBAAgB,GAAI,IAAI,CAAC,QAAgB,CAAC,gBAAgB;YACvC,IAAI,CAAC,QAAgB,CAAC,iBAAiB,CAAC;QAEjE,IAAI,gBAAgB,EAAE,CAAC;YACrB,gDAAgD;YAChD,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;YAC/B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;QACpE,CAAC;aAAM,CAAC;YACN,gEAAgE;YAChE,aAAa,GAAG,OAAO,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC5C,MAAM,EAAE,eAAe;YACvB,MAAM,EAAE,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC;SAC5C,CAAC,CAAC;QAEH,4BAA4B;QAC5B,MAAM,QAAQ,GAAG;YACf,IAAI,EAAE,cAAc;YACpB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,OAAO,EAAE,OAAO;YAChB,SAAS,EAAE,SAAS;YACpB,SAAS,EAAE,SAAS;YACpB,KAAK,EAAE,KAAK;YACZ,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,cAAc,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC;YACvE,GAAG,CAAC,OAAO,CAAC,gBAAgB,IAAI,EAAE,kBAAkB,EAAE,OAAO,CAAC,gBAAgB,EAAE,CAAC;SAClF,CAAC;QAEF,sBAAsB;QACtB,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,WAAW,EAAE,CAAC,CAAC;QAEjE,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,WAAW,CACf,MAAiB,EACjB,QAAkB,EAClB,QAAgB,EAChB,OAAe;QAEf,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YACxB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,MAAM,IAAI,QAAQ,OAAO,QAAQ,UAAU,CAAC,CAAC;QAE1F,4CAA4C;QAC5C,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,IAAI,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAEtF,oCAAoC;QACpC,MAAM,YAAY,GAAG,kBAAkB,CAAC;YACtC,GAAG,EAAE,CAAC;oBACJ,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,UAAU;oBAChB,MAAM,EAAE;wBACN,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE;wBAC/B,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE;qBACpC;oBACD,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;iBACtC,CAAC;YACF,YAAY,EAAE,UAAU;YACxB,IAAI,EAAE,CAAC,QAAe,EAAE,iBAAiB,CAAC;SAC3C,CAAC,CAAC;QAEH,iDAAiD;QACjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;YACzC,MAAM,EAAE,qBAAqB;YAC7B,MAAM,EAAE,CAAC;oBACP,IAAI,EAAE,IAAI,CAAC,aAAa;oBACxB,EAAE,EAAE,0BAA0B;oBAC9B,IAAI,EAAE,YAAY;oBAClB,KAAK,EAAE,KAAK;iBACb,CAAC;SACH,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,MAAM,EAAE,CAAC,CAAC;QAE7D,yBAAyB;QACzB,MAAM,aAAa,GAAG,CAAC,CAAC;QACxB,MAAM,IAAI,CAAC,+BAA+B,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAElE,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,KAAK,CAAC,+BAA+B,CAAC,MAAc,EAAE,aAAqB;QACjF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,aAAa,mBAAmB,CAAC,CAAC;QAElE,+BAA+B;QAC/B,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,OAAO,CAAC,OAAO,EAAE,CAAC;YAChB,IAAI,CAAC;gBACH,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;oBACpC,MAAM,EAAE,2BAA2B;oBACnC,MAAM,EAAE,CAAC,MAAM,CAAC;iBACjB,CAAC,CAAC;gBAEH,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;gBAC1D,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,KAAK,EAAE,CAAC,CAAC;gBACpD,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;QAED,sCAAsC;QACtC,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,+BAA+B,MAAM,EAAE,CAAC,CAAC;QAC3D,CAAC;QAED,yBAAyB;QACzB,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACrD,IAAI,YAAY,GAAG,UAAU,CAAC;QAE9B,OAAO,YAAY,GAAG,UAAU,GAAG,aAAa,GAAG,CAAC,EAAE,CAAC;YACrD,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;YAExD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAC9C,MAAM,EAAE,iBAAiB;gBACzB,MAAM,EAAE,EAAE;aACX,CAAC,CAAC;YAEH,YAAY,GAAG,QAAQ,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAC3C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8BAA8B,aAAa,gBAAgB,CAAC,CAAC;IAChF,CAAC;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mainWalletPaymentMaker.test.d.ts","sourceRoot":"","sources":["../src/mainWalletPaymentMaker.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,340 @@
|
|
|
1
|
+
// Mock viem before imports
|
|
2
|
+
vi.mock('viem', () => ({
|
|
3
|
+
encodeFunctionData: vi.fn(() => '0xmocktransferdata'),
|
|
4
|
+
toHex: vi.fn((str) => '0x' + Buffer.from(str).toString('hex')),
|
|
5
|
+
fromHex: vi.fn((hex) => Buffer.from(hex.slice(2), 'hex').toString())
|
|
6
|
+
}));
|
|
7
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
8
|
+
import { MainWalletPaymentMaker } from './mainWalletPaymentMaker.js';
|
|
9
|
+
import BigNumber from 'bignumber.js';
|
|
10
|
+
import { TEST_WALLET_ADDRESS, TEST_RECEIVER_ADDRESS, mockProvider } from './testHelpers.js';
|
|
11
|
+
import { USDC_CONTRACT_ADDRESS_BASE } from '@atxp/client';
|
|
12
|
+
const { encodeFunctionData, fromHex } = await import('viem');
|
|
13
|
+
describe('MainWalletPaymentMaker', () => {
|
|
14
|
+
let provider;
|
|
15
|
+
let paymentMaker;
|
|
16
|
+
beforeEach(() => {
|
|
17
|
+
vi.clearAllMocks();
|
|
18
|
+
provider = mockProvider();
|
|
19
|
+
paymentMaker = new MainWalletPaymentMaker(TEST_WALLET_ADDRESS, provider);
|
|
20
|
+
});
|
|
21
|
+
afterEach(() => {
|
|
22
|
+
vi.restoreAllMocks();
|
|
23
|
+
});
|
|
24
|
+
describe('generateJWT', () => {
|
|
25
|
+
it('should generate JWT with wallet signature', async () => {
|
|
26
|
+
const mockSignature = '0xmocksignature';
|
|
27
|
+
provider.request.mockResolvedValueOnce(mockSignature);
|
|
28
|
+
const jwt = await paymentMaker.generateJWT({
|
|
29
|
+
paymentRequestId: 'test-payment-id',
|
|
30
|
+
codeChallenge: 'test-challenge'
|
|
31
|
+
});
|
|
32
|
+
// Should request personal_sign
|
|
33
|
+
expect(provider.request).toHaveBeenCalledWith({
|
|
34
|
+
method: 'personal_sign',
|
|
35
|
+
params: [
|
|
36
|
+
expect.stringContaining('PayMCP Authorization Request'),
|
|
37
|
+
TEST_WALLET_ADDRESS
|
|
38
|
+
]
|
|
39
|
+
});
|
|
40
|
+
// Should return base64url encoded JWT
|
|
41
|
+
// Decode base64url
|
|
42
|
+
const base64 = jwt.replace(/-/g, '+').replace(/_/g, '/');
|
|
43
|
+
const padding = '='.repeat((4 - base64.length % 4) % 4);
|
|
44
|
+
const decodedJwt = JSON.parse(Buffer.from(base64 + padding, 'base64').toString());
|
|
45
|
+
expect(decodedJwt).toMatchObject({
|
|
46
|
+
type: 'EIP1271_AUTH',
|
|
47
|
+
walletAddress: TEST_WALLET_ADDRESS,
|
|
48
|
+
signature: mockSignature,
|
|
49
|
+
payment_request_id: 'test-payment-id',
|
|
50
|
+
code_challenge: 'test-challenge'
|
|
51
|
+
});
|
|
52
|
+
expect(decodedJwt.timestamp).toBeDefined();
|
|
53
|
+
expect(decodedJwt.nonce).toBeDefined();
|
|
54
|
+
expect(decodedJwt.message).toContain('PayMCP Authorization Request');
|
|
55
|
+
});
|
|
56
|
+
it('should generate JWT without optional fields', async () => {
|
|
57
|
+
const mockSignature = '0xmocksignature';
|
|
58
|
+
provider.request.mockResolvedValueOnce(mockSignature);
|
|
59
|
+
const jwt = await paymentMaker.generateJWT({
|
|
60
|
+
paymentRequestId: '',
|
|
61
|
+
codeChallenge: ''
|
|
62
|
+
});
|
|
63
|
+
// Decode base64url
|
|
64
|
+
const base64 = jwt.replace(/-/g, '+').replace(/_/g, '/');
|
|
65
|
+
const padding = '='.repeat((4 - base64.length % 4) % 4);
|
|
66
|
+
const decodedJwt = JSON.parse(Buffer.from(base64 + padding, 'base64').toString());
|
|
67
|
+
expect(decodedJwt.type).toBe('EIP1271_AUTH');
|
|
68
|
+
expect(decodedJwt.payment_request_id).toBeUndefined();
|
|
69
|
+
expect(decodedJwt.code_challenge).toBeUndefined();
|
|
70
|
+
});
|
|
71
|
+
it('should construct message in correct format', async () => {
|
|
72
|
+
const mockSignature = '0xmocksignature';
|
|
73
|
+
let capturedMessage = '';
|
|
74
|
+
provider.request.mockImplementation(async ({ method, params }) => {
|
|
75
|
+
if (method === 'personal_sign' && params) {
|
|
76
|
+
capturedMessage = params[0];
|
|
77
|
+
return mockSignature;
|
|
78
|
+
}
|
|
79
|
+
throw new Error(`Unexpected method: ${method}`);
|
|
80
|
+
});
|
|
81
|
+
await paymentMaker.generateJWT({
|
|
82
|
+
paymentRequestId: 'test-payment-id',
|
|
83
|
+
codeChallenge: 'test-challenge'
|
|
84
|
+
});
|
|
85
|
+
// Since mock provider doesn't have isCoinbaseWallet, it should pass plain string
|
|
86
|
+
// Verify exact message format
|
|
87
|
+
expect(capturedMessage).toContain('PayMCP Authorization Request\n\n');
|
|
88
|
+
expect(capturedMessage).toContain(`Wallet: ${TEST_WALLET_ADDRESS}`);
|
|
89
|
+
expect(capturedMessage).toContain('Timestamp: ');
|
|
90
|
+
expect(capturedMessage).toContain('Nonce: ');
|
|
91
|
+
expect(capturedMessage).toContain('Code Challenge: test-challenge');
|
|
92
|
+
expect(capturedMessage).toContain('Payment Request ID: test-payment-id');
|
|
93
|
+
expect(capturedMessage).toContain('\n\n\nSign this message to prove you control this wallet.');
|
|
94
|
+
});
|
|
95
|
+
it('should handle signature errors', async () => {
|
|
96
|
+
provider.request.mockRejectedValueOnce(new Error('User rejected signature'));
|
|
97
|
+
await expect(paymentMaker.generateJWT({
|
|
98
|
+
paymentRequestId: 'test',
|
|
99
|
+
codeChallenge: 'test'
|
|
100
|
+
})).rejects.toThrow('User rejected signature');
|
|
101
|
+
});
|
|
102
|
+
it('should use hex encoding for Coinbase Wallet', async () => {
|
|
103
|
+
const mockSignature = '0xmocksignature';
|
|
104
|
+
let capturedMessage = '';
|
|
105
|
+
// Create a provider that identifies as Coinbase Wallet
|
|
106
|
+
const coinbaseProvider = {
|
|
107
|
+
...provider,
|
|
108
|
+
isCoinbaseWallet: true,
|
|
109
|
+
request: vi.fn(async ({ method, params }) => {
|
|
110
|
+
if (method === 'personal_sign' && params) {
|
|
111
|
+
capturedMessage = params[0];
|
|
112
|
+
return mockSignature;
|
|
113
|
+
}
|
|
114
|
+
throw new Error(`Unexpected method: ${method}`);
|
|
115
|
+
})
|
|
116
|
+
};
|
|
117
|
+
const coinbasePaymentMaker = new MainWalletPaymentMaker(TEST_WALLET_ADDRESS, coinbaseProvider);
|
|
118
|
+
await coinbasePaymentMaker.generateJWT({
|
|
119
|
+
paymentRequestId: 'test-payment-id',
|
|
120
|
+
codeChallenge: 'test-challenge'
|
|
121
|
+
});
|
|
122
|
+
// Should pass hex-encoded message for Coinbase Wallet
|
|
123
|
+
expect(capturedMessage).toMatch(/^0x[0-9a-fA-F]+$/);
|
|
124
|
+
// Decode and verify content
|
|
125
|
+
const decodedMessage = fromHex(capturedMessage, 'string');
|
|
126
|
+
expect(decodedMessage).toContain('PayMCP Authorization Request');
|
|
127
|
+
expect(decodedMessage).toContain(`Wallet: ${TEST_WALLET_ADDRESS}`);
|
|
128
|
+
});
|
|
129
|
+
});
|
|
130
|
+
describe('makePayment', () => {
|
|
131
|
+
it('should make USDC payment through main wallet', async () => {
|
|
132
|
+
const txHash = '0xtxhash';
|
|
133
|
+
const receipt = {
|
|
134
|
+
status: '0x1',
|
|
135
|
+
blockNumber: '0x100'
|
|
136
|
+
};
|
|
137
|
+
// Mock transaction submission
|
|
138
|
+
provider.request.mockImplementation(async ({ method }) => {
|
|
139
|
+
if (method === 'eth_sendTransaction')
|
|
140
|
+
return txHash;
|
|
141
|
+
if (method === 'eth_getTransactionReceipt')
|
|
142
|
+
return receipt;
|
|
143
|
+
if (method === 'eth_blockNumber')
|
|
144
|
+
return '0x102'; // 2 blocks after receipt
|
|
145
|
+
throw new Error(`Unexpected method: ${method}`);
|
|
146
|
+
});
|
|
147
|
+
const result = await paymentMaker.makePayment(new BigNumber(1.5), 'USDC', TEST_RECEIVER_ADDRESS, 'Test payment');
|
|
148
|
+
// Should encode transfer function
|
|
149
|
+
expect(encodeFunctionData).toHaveBeenCalledWith({
|
|
150
|
+
abi: expect.any(Array),
|
|
151
|
+
functionName: 'transfer',
|
|
152
|
+
args: [TEST_RECEIVER_ADDRESS, 1500000n] // 1.5 USDC = 1,500,000 units
|
|
153
|
+
});
|
|
154
|
+
// Should send transaction
|
|
155
|
+
expect(provider.request).toHaveBeenCalledWith({
|
|
156
|
+
method: 'eth_sendTransaction',
|
|
157
|
+
params: [{
|
|
158
|
+
from: TEST_WALLET_ADDRESS,
|
|
159
|
+
to: USDC_CONTRACT_ADDRESS_BASE,
|
|
160
|
+
data: '0xmocktransferdata',
|
|
161
|
+
value: '0x0'
|
|
162
|
+
}]
|
|
163
|
+
});
|
|
164
|
+
expect(result).toBe(txHash);
|
|
165
|
+
});
|
|
166
|
+
it('should throw error for non-USDC currency', async () => {
|
|
167
|
+
await expect(paymentMaker.makePayment(new BigNumber(1), 'ETH', TEST_RECEIVER_ADDRESS, 'Test payment')).rejects.toThrow('Only usdc currency is supported');
|
|
168
|
+
});
|
|
169
|
+
it('should throw error if transaction fails', async () => {
|
|
170
|
+
const txHash = '0xtxhash';
|
|
171
|
+
const receipt = {
|
|
172
|
+
status: '0x0', // Failed transaction
|
|
173
|
+
blockNumber: '0x100'
|
|
174
|
+
};
|
|
175
|
+
provider.request.mockImplementation(async ({ method }) => {
|
|
176
|
+
if (method === 'eth_sendTransaction')
|
|
177
|
+
return txHash;
|
|
178
|
+
if (method === 'eth_getTransactionReceipt')
|
|
179
|
+
return receipt;
|
|
180
|
+
throw new Error(`Unexpected method: ${method}`);
|
|
181
|
+
});
|
|
182
|
+
await expect(paymentMaker.makePayment(new BigNumber(1), 'USDC', TEST_RECEIVER_ADDRESS, 'Test payment')).rejects.toThrow(`Transaction failed. TxHash: ${txHash}`);
|
|
183
|
+
});
|
|
184
|
+
it('should handle decimal amounts correctly', async () => {
|
|
185
|
+
const txHash = '0xtxhash';
|
|
186
|
+
const receipt = {
|
|
187
|
+
status: '0x1',
|
|
188
|
+
blockNumber: '0x100'
|
|
189
|
+
};
|
|
190
|
+
provider.request.mockImplementation(async ({ method }) => {
|
|
191
|
+
if (method === 'eth_sendTransaction')
|
|
192
|
+
return txHash;
|
|
193
|
+
if (method === 'eth_getTransactionReceipt')
|
|
194
|
+
return receipt;
|
|
195
|
+
if (method === 'eth_blockNumber')
|
|
196
|
+
return '0x102';
|
|
197
|
+
throw new Error(`Unexpected method: ${method}`);
|
|
198
|
+
});
|
|
199
|
+
await paymentMaker.makePayment(new BigNumber(0.123456), 'USDC', TEST_RECEIVER_ADDRESS, 'Test payment');
|
|
200
|
+
// Should round to 6 decimals for USDC
|
|
201
|
+
expect(encodeFunctionData).toHaveBeenCalledWith({
|
|
202
|
+
abi: expect.any(Array),
|
|
203
|
+
functionName: 'transfer',
|
|
204
|
+
args: [TEST_RECEIVER_ADDRESS, 123456n] // 0.123456 USDC = 123,456 units
|
|
205
|
+
});
|
|
206
|
+
});
|
|
207
|
+
it('should wait for confirmations', async () => {
|
|
208
|
+
const txHash = '0xtxhash';
|
|
209
|
+
const receipt = {
|
|
210
|
+
status: '0x1',
|
|
211
|
+
blockNumber: '0x100' // Block 256
|
|
212
|
+
};
|
|
213
|
+
let blockNumberCalls = 0;
|
|
214
|
+
provider.request.mockImplementation(async ({ method }) => {
|
|
215
|
+
if (method === 'eth_sendTransaction')
|
|
216
|
+
return txHash;
|
|
217
|
+
if (method === 'eth_getTransactionReceipt')
|
|
218
|
+
return receipt;
|
|
219
|
+
if (method === 'eth_blockNumber') {
|
|
220
|
+
blockNumberCalls++;
|
|
221
|
+
// Return increasing block numbers
|
|
222
|
+
return blockNumberCalls === 1 ? '0x100' : '0x101'; // Need 2 confirmations
|
|
223
|
+
}
|
|
224
|
+
throw new Error(`Unexpected method: ${method}`);
|
|
225
|
+
});
|
|
226
|
+
await paymentMaker.makePayment(new BigNumber(1), 'USDC', TEST_RECEIVER_ADDRESS, 'Test payment');
|
|
227
|
+
// Should poll for block number until we have 2 confirmations
|
|
228
|
+
expect(provider.request).toHaveBeenCalledWith({
|
|
229
|
+
method: 'eth_blockNumber',
|
|
230
|
+
params: []
|
|
231
|
+
});
|
|
232
|
+
});
|
|
233
|
+
it('should verify all blockchain calls are made in correct order', async () => {
|
|
234
|
+
const txHash = '0xtxhash';
|
|
235
|
+
const receipt = {
|
|
236
|
+
status: '0x1',
|
|
237
|
+
blockNumber: '0x100'
|
|
238
|
+
};
|
|
239
|
+
const callOrder = [];
|
|
240
|
+
provider.request.mockImplementation(async ({ method }) => {
|
|
241
|
+
callOrder.push(method);
|
|
242
|
+
if (method === 'eth_sendTransaction')
|
|
243
|
+
return txHash;
|
|
244
|
+
if (method === 'eth_getTransactionReceipt')
|
|
245
|
+
return receipt;
|
|
246
|
+
if (method === 'eth_blockNumber')
|
|
247
|
+
return '0x102';
|
|
248
|
+
throw new Error(`Unexpected method: ${method}`);
|
|
249
|
+
});
|
|
250
|
+
await paymentMaker.makePayment(new BigNumber(1), 'USDC', TEST_RECEIVER_ADDRESS, 'Test payment');
|
|
251
|
+
// Verify correct order of calls
|
|
252
|
+
expect(callOrder).toEqual([
|
|
253
|
+
'eth_sendTransaction',
|
|
254
|
+
'eth_getTransactionReceipt',
|
|
255
|
+
'eth_blockNumber'
|
|
256
|
+
]);
|
|
257
|
+
// Verify encode function data was called before send
|
|
258
|
+
expect(encodeFunctionData).toHaveBeenCalledBefore(provider.request);
|
|
259
|
+
});
|
|
260
|
+
it('should handle receipt polling timeout', async () => {
|
|
261
|
+
const txHash = '0xtxhash';
|
|
262
|
+
provider.request.mockImplementation(async ({ method }) => {
|
|
263
|
+
if (method === 'eth_sendTransaction')
|
|
264
|
+
return txHash;
|
|
265
|
+
if (method === 'eth_getTransactionReceipt')
|
|
266
|
+
return null; // Transaction not mined yet
|
|
267
|
+
throw new Error(`Unexpected method: ${method}`);
|
|
268
|
+
});
|
|
269
|
+
// This should eventually timeout (in real implementation)
|
|
270
|
+
// For now, it will keep polling - we should add a timeout mechanism
|
|
271
|
+
const promise = paymentMaker.makePayment(new BigNumber(1), 'USDC', TEST_RECEIVER_ADDRESS, 'Test payment');
|
|
272
|
+
// Wait a bit and then provide a receipt
|
|
273
|
+
setTimeout(() => {
|
|
274
|
+
provider.request.mockImplementation(async ({ method }) => {
|
|
275
|
+
if (method === 'eth_getTransactionReceipt') {
|
|
276
|
+
return { status: '0x1', blockNumber: '0x100' };
|
|
277
|
+
}
|
|
278
|
+
if (method === 'eth_blockNumber')
|
|
279
|
+
return '0x102';
|
|
280
|
+
throw new Error(`Unexpected method: ${method}`);
|
|
281
|
+
});
|
|
282
|
+
}, 100);
|
|
283
|
+
const result = await promise;
|
|
284
|
+
expect(result).toBe(txHash);
|
|
285
|
+
});
|
|
286
|
+
it('should handle transaction submission errors', async () => {
|
|
287
|
+
provider.request.mockRejectedValueOnce(new Error('insufficient funds'));
|
|
288
|
+
await expect(paymentMaker.makePayment(new BigNumber(1), 'USDC', TEST_RECEIVER_ADDRESS, 'Test payment')).rejects.toThrow('insufficient funds');
|
|
289
|
+
// Should have attempted to send transaction
|
|
290
|
+
expect(provider.request).toHaveBeenCalledWith({
|
|
291
|
+
method: 'eth_sendTransaction',
|
|
292
|
+
params: expect.any(Array)
|
|
293
|
+
});
|
|
294
|
+
});
|
|
295
|
+
it('should handle large amounts correctly', async () => {
|
|
296
|
+
const txHash = '0xtxhash';
|
|
297
|
+
const receipt = {
|
|
298
|
+
status: '0x1',
|
|
299
|
+
blockNumber: '0x100'
|
|
300
|
+
};
|
|
301
|
+
provider.request.mockImplementation(async ({ method }) => {
|
|
302
|
+
if (method === 'eth_sendTransaction')
|
|
303
|
+
return txHash;
|
|
304
|
+
if (method === 'eth_getTransactionReceipt')
|
|
305
|
+
return receipt;
|
|
306
|
+
if (method === 'eth_blockNumber')
|
|
307
|
+
return '0x102';
|
|
308
|
+
throw new Error(`Unexpected method: ${method}`);
|
|
309
|
+
});
|
|
310
|
+
await paymentMaker.makePayment(new BigNumber(1000000), // 1 million USDC
|
|
311
|
+
'USDC', TEST_RECEIVER_ADDRESS, 'Test payment');
|
|
312
|
+
// Should handle large amounts correctly
|
|
313
|
+
expect(encodeFunctionData).toHaveBeenCalledWith({
|
|
314
|
+
abi: expect.any(Array),
|
|
315
|
+
functionName: 'transfer',
|
|
316
|
+
args: [TEST_RECEIVER_ADDRESS, 1000000000000n] // 1M USDC = 1,000,000,000,000 units
|
|
317
|
+
});
|
|
318
|
+
});
|
|
319
|
+
});
|
|
320
|
+
describe('error handling', () => {
|
|
321
|
+
it('should handle provider errors gracefully', async () => {
|
|
322
|
+
provider.request.mockRejectedValue(new Error('Provider disconnected'));
|
|
323
|
+
await expect(paymentMaker.generateJWT({
|
|
324
|
+
paymentRequestId: 'test',
|
|
325
|
+
codeChallenge: 'test'
|
|
326
|
+
})).rejects.toThrow('Provider disconnected');
|
|
327
|
+
});
|
|
328
|
+
it('should handle invalid addresses', async () => {
|
|
329
|
+
const invalidAddress = '0xinvalid';
|
|
330
|
+
provider.request.mockImplementation(async ({ method, params }) => {
|
|
331
|
+
if (method === 'eth_sendTransaction' && params?.[0]?.to === USDC_CONTRACT_ADDRESS_BASE) {
|
|
332
|
+
throw new Error('invalid address');
|
|
333
|
+
}
|
|
334
|
+
throw new Error(`Unexpected method: ${method}`);
|
|
335
|
+
});
|
|
336
|
+
await expect(paymentMaker.makePayment(new BigNumber(1), 'USDC', invalidAddress, 'Test payment')).rejects.toThrow();
|
|
337
|
+
});
|
|
338
|
+
});
|
|
339
|
+
});
|
|
340
|
+
//# sourceMappingURL=mainWalletPaymentMaker.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mainWalletPaymentMaker.test.js","sourceRoot":"","sources":["../src/mainWalletPaymentMaker.test.ts"],"names":[],"mappings":"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"}
|
package/dist/storage.d.ts
CHANGED
|
@@ -33,6 +33,7 @@ export declare class IntermediaryStorage {
|
|
|
33
33
|
* Browser localStorage implementation
|
|
34
34
|
*/
|
|
35
35
|
export declare class BrowserStorage implements IStorage<string> {
|
|
36
|
+
private isAvailable;
|
|
36
37
|
get(key: string): string | null;
|
|
37
38
|
set(key: string, value: string): void;
|
|
38
39
|
delete(key: string): void;
|
package/dist/storage.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,mCAAmC;IACnC,UAAU,EAAE,GAAG,CAAC;IAChB,iCAAiC;IACjC,UAAU,EAAE,eAAe,CAAC;CAC7B;AAED;;;;GAIG;AACH,MAAM,WAAW,QAAQ,CAAC,CAAC,GAAG,MAAM;IAClC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC;IAC3B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;IACjC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED;;GAEG;AACH,qBAAa,mBAAmB;IAClB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC;IAE7C,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI;IAYrC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI;IAI1C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;CAG1B;AAED;;GAEG;AACH,qBAAa,cAAe,YAAW,QAAQ,CAAC,MAAM,CAAC;IACrD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,mCAAmC;IACnC,UAAU,EAAE,GAAG,CAAC;IAChB,iCAAiC;IACjC,UAAU,EAAE,eAAe,CAAC;CAC7B;AAED;;;;GAIG;AACH,MAAM,WAAW,QAAQ,CAAC,CAAC,GAAG,MAAM;IAClC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC;IAC3B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;IACjC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED;;GAEG;AACH,qBAAa,mBAAmB;IAClB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC;IAE7C,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI;IAYrC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI;IAI1C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;CAG1B;AAED;;GAEG;AACH,qBAAa,cAAe,YAAW,QAAQ,CAAC,MAAM,CAAC;IACrD,OAAO,CAAC,WAAW;IAInB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAK/B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAKrC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;CAI1B;AAED;;GAEG;AACH,qBAAa,aAAc,YAAW,QAAQ,CAAC,MAAM,CAAC;IACpD,OAAO,CAAC,KAAK,CAAkC;IAE/C,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAI/B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAIrC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIzB,KAAK,IAAI,IAAI;CAGd"}
|
package/dist/storage.js
CHANGED
|
@@ -28,13 +28,22 @@ export class IntermediaryStorage {
|
|
|
28
28
|
* Browser localStorage implementation
|
|
29
29
|
*/
|
|
30
30
|
export class BrowserStorage {
|
|
31
|
+
isAvailable() {
|
|
32
|
+
return typeof window !== 'undefined' && typeof window.localStorage !== 'undefined';
|
|
33
|
+
}
|
|
31
34
|
get(key) {
|
|
35
|
+
if (!this.isAvailable())
|
|
36
|
+
return null;
|
|
32
37
|
return localStorage.getItem(key);
|
|
33
38
|
}
|
|
34
39
|
set(key, value) {
|
|
40
|
+
if (!this.isAvailable())
|
|
41
|
+
return;
|
|
35
42
|
localStorage.setItem(key, value);
|
|
36
43
|
}
|
|
37
44
|
delete(key) {
|
|
45
|
+
if (!this.isAvailable())
|
|
46
|
+
return;
|
|
38
47
|
localStorage.removeItem(key);
|
|
39
48
|
}
|
|
40
49
|
}
|
package/dist/storage.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"AAwBA;;GAEG;AACH,MAAM,OAAO,mBAAmB;IAC9B,YAAoB,OAAyB;QAAzB,YAAO,GAAP,OAAO,CAAkB;IAAG,CAAC;IAEjD,GAAG,CAAC,GAAW;QACb,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC;QAEvB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAChC,OAAO,MAAsB,CAAC;QAChC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,IAAkB;QACjC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,cAAc;
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"AAwBA;;GAEG;AACH,MAAM,OAAO,mBAAmB;IAC9B,YAAoB,OAAyB;QAAzB,YAAO,GAAP,OAAO,CAAkB;IAAG,CAAC;IAEjD,GAAG,CAAC,GAAW;QACb,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC;QAEvB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAChC,OAAO,MAAsB,CAAC;QAChC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,IAAkB;QACjC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,cAAc;IACjB,WAAW;QACjB,OAAO,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,MAAM,CAAC,YAAY,KAAK,WAAW,CAAC;IACrF,CAAC;IAED,GAAG,CAAC,GAAW;QACb,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YAAE,OAAO,IAAI,CAAC;QACrC,OAAO,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,KAAa;QAC5B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YAAE,OAAO;QAChC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YAAE,OAAO;QAChC,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,aAAa;IAA1B;QACU,UAAK,GAAwB,IAAI,GAAG,EAAE,CAAC;IAiBjD,CAAC;IAfC,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC;IACrC,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,KAAa;QAC5B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;CACF"}
|