blossom-client-sdk 5.0.0-2 → 5.1.0
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/lib/actions/delete.d.ts +3 -0
- package/lib/actions/delete.js +11 -7
- package/lib/actions/download.d.ts +3 -0
- package/lib/actions/download.js +11 -7
- package/lib/actions/list.d.ts +3 -0
- package/lib/actions/list.js +11 -7
- package/lib/actions/media.js +11 -7
- package/lib/actions/mirror.d.ts +3 -0
- package/lib/actions/mirror.js +11 -7
- package/lib/actions/multi-server.js +14 -0
- package/lib/actions/upload.d.ts +3 -0
- package/lib/actions/upload.js +11 -7
- package/lib/helpers/cashu.d.ts +3 -1
- package/lib/helpers/cashu.js +185 -4
- package/lib/helpers/headers.d.ts +1 -0
- package/lib/helpers/headers.js +5 -0
- package/lib/helpers/index.d.ts +1 -1
- package/lib/helpers/index.js +1 -1
- package/package.json +1 -5
- package/src/actions/delete.ts +12 -8
- package/src/actions/download.ts +12 -8
- package/src/actions/list.ts +12 -8
- package/src/actions/media.ts +10 -8
- package/src/actions/mirror.ts +13 -8
- package/src/actions/multi-server.ts +12 -0
- package/src/actions/upload.ts +13 -8
- package/src/helpers/cashu.ts +184 -7
- package/src/helpers/headers.ts +5 -0
- package/src/helpers/index.ts +1 -1
- package/src/types.ts +1 -2
- package/lib/helpers/cachu.d.ts +0 -5
- package/lib/helpers/cachu.js +0 -14
- package/lib/helpers.d.ts +0 -20
- package/lib/helpers.js +0 -73
- package/lib/upload.d.ts +0 -13
- package/lib/upload.js +0 -37
package/lib/actions/delete.d.ts
CHANGED
|
@@ -9,12 +9,15 @@ export type DeleteOptions<S extends ServerType> = {
|
|
|
9
9
|
authEvents?: Set<SignedEvent>;
|
|
10
10
|
/** Request timeout */
|
|
11
11
|
timeout?: number;
|
|
12
|
+
/** Return headers to retry a request rejected with HTTP 402. */
|
|
13
|
+
onPaymentRequired?: (server: S, sha256: string, headers: Headers) => Promise<HeadersInit>;
|
|
12
14
|
/**
|
|
13
15
|
* A method used to request payment when deleting
|
|
14
16
|
* @param server the server requiring payment
|
|
15
17
|
* @param sha256 the sha256 of the blob being uploaded or mirrored
|
|
16
18
|
* @param request the payment request
|
|
17
19
|
*/
|
|
20
|
+
/** @deprecated Use onPaymentRequired to handle payment schemes generically. */
|
|
18
21
|
onPayment?: (server: S, sha256: string, request: PaymentRequest) => Promise<PaymentToken>;
|
|
19
22
|
/**
|
|
20
23
|
* A method used to request a signed auth event for a server and sha256
|
package/lib/actions/delete.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { encodeAuthorizationHeader, getReusableAuthEvent, storeAuthEvent } from "../auth.js";
|
|
2
2
|
import HTTPError from "../error.js";
|
|
3
3
|
import { fetchWithTimeout } from "../helpers/fetch.js";
|
|
4
|
+
import { mergeHeaders } from "../helpers/headers.js";
|
|
4
5
|
/** Deletes a blob to a server */
|
|
5
6
|
export async function deleteBlob(server, hash, opts) {
|
|
6
7
|
const url = new URL("/" + hash, server);
|
|
@@ -51,18 +52,21 @@ export async function deleteBlob(server, hash, opts) {
|
|
|
51
52
|
break;
|
|
52
53
|
}
|
|
53
54
|
case 402: {
|
|
54
|
-
|
|
55
|
+
let paymentHeaders;
|
|
56
|
+
if (opts?.onPaymentRequired)
|
|
57
|
+
paymentHeaders = await opts.onPaymentRequired(server, hash, res.headers);
|
|
58
|
+
else if (opts?.onPayment) {
|
|
59
|
+
const { encodePaymentToken, getPaymentRequestFromHeaders } = await import("../helpers/cashu.js");
|
|
60
|
+
const request = await getPaymentRequestFromHeaders(res.headers);
|
|
61
|
+
paymentHeaders = { "X-Cashu": encodePaymentToken(await opts.onPayment(server, hash, request)) };
|
|
62
|
+
}
|
|
63
|
+
else
|
|
55
64
|
throw new Error("Missing payment handler");
|
|
56
|
-
const { getEncodedToken } = await import("@cashu/cashu-ts");
|
|
57
|
-
const { getPaymentRequestFromHeaders } = await import("../helpers/cashu.js");
|
|
58
|
-
const request = await getPaymentRequestFromHeaders(res.headers);
|
|
59
|
-
const token = await opts.onPayment(server, hash, request);
|
|
60
|
-
const payment = getEncodedToken(token);
|
|
61
65
|
// Try delete with payment
|
|
62
66
|
res = await fetchWithTimeout(url, {
|
|
63
67
|
signal: opts?.signal,
|
|
64
68
|
method: "DELETE",
|
|
65
|
-
headers:
|
|
69
|
+
headers: mergeHeaders(headers, paymentHeaders),
|
|
66
70
|
timeout: opts?.timeout,
|
|
67
71
|
});
|
|
68
72
|
break;
|
|
@@ -9,12 +9,15 @@ export type DownloadOptions<S extends ServerType> = {
|
|
|
9
9
|
authEvents?: Set<SignedEvent>;
|
|
10
10
|
/** Request timeout */
|
|
11
11
|
timeout?: number;
|
|
12
|
+
/** Return headers to retry a request rejected with HTTP 402. */
|
|
13
|
+
onPaymentRequired?: (server: S, sha256: string, headers: Headers) => Promise<HeadersInit>;
|
|
12
14
|
/**
|
|
13
15
|
* A method used to request payment when downloading
|
|
14
16
|
* @param server the server requiring payment
|
|
15
17
|
* @param sha256 the sha256 of the blob being uploaded or mirrored
|
|
16
18
|
* @param request the payment request
|
|
17
19
|
*/
|
|
20
|
+
/** @deprecated Use onPaymentRequired to handle payment schemes generically. */
|
|
18
21
|
onPayment?: (server: S, sha256: string, request: PaymentRequest) => Promise<PaymentToken>;
|
|
19
22
|
/**
|
|
20
23
|
* A method used to request a signed auth event for a server and sha256
|
package/lib/actions/download.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import HTTPError from "../error.js";
|
|
2
2
|
import { encodeAuthorizationHeader, getReusableAuthEvent, storeAuthEvent } from "../auth.js";
|
|
3
3
|
import { fetchWithTimeout } from "../helpers/index.js";
|
|
4
|
+
import { mergeHeaders } from "../helpers/headers.js";
|
|
4
5
|
/** Downloads a blob from a server and returns the Response */
|
|
5
6
|
export async function downloadBlob(server, hash, opts) {
|
|
6
7
|
const url = new URL("/" + hash, server);
|
|
@@ -49,16 +50,19 @@ export async function downloadBlob(server, hash, opts) {
|
|
|
49
50
|
break;
|
|
50
51
|
}
|
|
51
52
|
case 402: {
|
|
52
|
-
|
|
53
|
+
let paymentHeaders;
|
|
54
|
+
if (opts?.onPaymentRequired)
|
|
55
|
+
paymentHeaders = await opts.onPaymentRequired(server, hash, download.headers);
|
|
56
|
+
else if (opts?.onPayment) {
|
|
57
|
+
const { encodePaymentToken, getPaymentRequestFromHeaders } = await import("../helpers/cashu.js");
|
|
58
|
+
const request = await getPaymentRequestFromHeaders(download.headers);
|
|
59
|
+
paymentHeaders = { "X-Cashu": encodePaymentToken(await opts.onPayment(server, hash, request)) };
|
|
60
|
+
}
|
|
61
|
+
else
|
|
53
62
|
throw new Error("Missing payment handler");
|
|
54
|
-
const { getEncodedToken } = await import("@cashu/cashu-ts");
|
|
55
|
-
const { getPaymentRequestFromHeaders } = await import("../helpers/cashu.js");
|
|
56
|
-
const request = await getPaymentRequestFromHeaders(download.headers);
|
|
57
|
-
const token = await opts.onPayment(server, hash, request);
|
|
58
|
-
const payment = getEncodedToken(token);
|
|
59
63
|
// Try download with payment
|
|
60
64
|
download = await fetchWithTimeout(url, {
|
|
61
|
-
headers:
|
|
65
|
+
headers: mergeHeaders(headers, paymentHeaders),
|
|
62
66
|
signal: opts?.signal,
|
|
63
67
|
timeout: opts?.timeout,
|
|
64
68
|
});
|
package/lib/actions/list.d.ts
CHANGED
|
@@ -13,11 +13,14 @@ export type ListOptions<S extends ServerType> = {
|
|
|
13
13
|
limit?: number;
|
|
14
14
|
since?: number;
|
|
15
15
|
until?: number;
|
|
16
|
+
/** Return headers to retry a request rejected with HTTP 402. */
|
|
17
|
+
onPaymentRequired?: (server: S, headers: Headers) => Promise<HeadersInit>;
|
|
16
18
|
/**
|
|
17
19
|
* A method used to request payment
|
|
18
20
|
* @param server the server requiring payment
|
|
19
21
|
* @param request the payment request
|
|
20
22
|
*/
|
|
23
|
+
/** @deprecated Use onPaymentRequired to handle payment schemes generically. */
|
|
21
24
|
onPayment?: (server: S, request: PaymentRequest) => Promise<PaymentToken>;
|
|
22
25
|
/**
|
|
23
26
|
* A method used to request a signed auth event for a server
|
package/lib/actions/list.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import HTTPError from "../error.js";
|
|
2
2
|
import { encodeAuthorizationHeader, getReusableAuthEvent, storeAuthEvent } from "../auth.js";
|
|
3
3
|
import { fetchWithTimeout } from "../helpers/index.js";
|
|
4
|
+
import { mergeHeaders } from "../helpers/headers.js";
|
|
4
5
|
/** Lists a page of blobs from a server */
|
|
5
6
|
export async function listBlobs(server, pubkey, opts) {
|
|
6
7
|
const url = new URL(`/list/` + pubkey, server);
|
|
@@ -51,16 +52,19 @@ export async function listBlobs(server, pubkey, opts) {
|
|
|
51
52
|
break;
|
|
52
53
|
}
|
|
53
54
|
case 402: {
|
|
54
|
-
|
|
55
|
+
let paymentHeaders;
|
|
56
|
+
if (opts?.onPaymentRequired)
|
|
57
|
+
paymentHeaders = await opts.onPaymentRequired(server, list.headers);
|
|
58
|
+
else if (opts?.onPayment) {
|
|
59
|
+
const { encodePaymentToken, getPaymentRequestFromHeaders } = await import("../helpers/cashu.js");
|
|
60
|
+
const request = await getPaymentRequestFromHeaders(list.headers);
|
|
61
|
+
paymentHeaders = { "X-Cashu": encodePaymentToken(await opts.onPayment(server, request)) };
|
|
62
|
+
}
|
|
63
|
+
else
|
|
55
64
|
throw new Error("Missing payment handler");
|
|
56
|
-
const { getEncodedToken } = await import("@cashu/cashu-ts");
|
|
57
|
-
const { getPaymentRequestFromHeaders } = await import("../helpers/cashu.js");
|
|
58
|
-
const request = await getPaymentRequestFromHeaders(list.headers);
|
|
59
|
-
const token = await opts.onPayment(server, request);
|
|
60
|
-
const payment = getEncodedToken(token);
|
|
61
65
|
// Try list with payment
|
|
62
66
|
list = await fetchWithTimeout(url, {
|
|
63
|
-
headers:
|
|
67
|
+
headers: mergeHeaders(headers, paymentHeaders),
|
|
64
68
|
signal: opts?.signal,
|
|
65
69
|
timeout: opts?.timeout,
|
|
66
70
|
});
|
package/lib/actions/media.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { getBlobSha256, getBlobSize, getBlobType } from "../helpers/index.js";
|
|
2
|
+
import { mergeHeaders } from "../helpers/headers.js";
|
|
2
3
|
import HTTPError from "../error.js";
|
|
3
4
|
import { encodeAuthorizationHeader, getReusableAuthEvent, storeAuthEvent } from "../auth.js";
|
|
4
5
|
/** Error thrown when /media endpoint is not present on a server */
|
|
@@ -71,19 +72,22 @@ export async function uploadMedia(server, blob, opts) {
|
|
|
71
72
|
break;
|
|
72
73
|
}
|
|
73
74
|
case 402: {
|
|
74
|
-
|
|
75
|
+
let paymentHeaders;
|
|
76
|
+
if (opts?.onPaymentRequired)
|
|
77
|
+
paymentHeaders = await opts.onPaymentRequired(server, sha256, blob, firstTry.headers);
|
|
78
|
+
else if (opts?.onPayment) {
|
|
79
|
+
const { encodePaymentToken, getPaymentRequestFromHeaders } = await import("../helpers/cashu.js");
|
|
80
|
+
const request = await getPaymentRequestFromHeaders(firstTry.headers);
|
|
81
|
+
paymentHeaders = { "X-Cashu": encodePaymentToken(await opts.onPayment(server, sha256, blob, request)) };
|
|
82
|
+
}
|
|
83
|
+
else
|
|
75
84
|
throw new Error("Missing payment handler");
|
|
76
|
-
const { getEncodedToken } = await import("@cashu/cashu-ts");
|
|
77
|
-
const { getPaymentRequestFromHeaders } = await import("../helpers/cashu.js");
|
|
78
|
-
const request = await getPaymentRequestFromHeaders(firstTry.headers);
|
|
79
|
-
const token = await opts.onPayment(server, sha256, blob, request);
|
|
80
|
-
const payment = getEncodedToken(token);
|
|
81
85
|
// Try upload with payment
|
|
82
86
|
upload = await fetch(url, {
|
|
83
87
|
signal: opts?.signal,
|
|
84
88
|
method: "PUT",
|
|
85
89
|
body: blob,
|
|
86
|
-
headers:
|
|
90
|
+
headers: mergeHeaders(headers, paymentHeaders),
|
|
87
91
|
});
|
|
88
92
|
break;
|
|
89
93
|
}
|
package/lib/actions/mirror.d.ts
CHANGED
|
@@ -9,6 +9,8 @@ export type MirrorOptions<S extends ServerType> = {
|
|
|
9
9
|
authEvents?: Set<SignedEvent>;
|
|
10
10
|
/** Request timeout */
|
|
11
11
|
timeout?: number;
|
|
12
|
+
/** Return headers to retry a request rejected with HTTP 402. */
|
|
13
|
+
onPaymentRequired?: (server: S, sha256: string, blob: BlobDescriptor, headers: Headers) => Promise<HeadersInit>;
|
|
12
14
|
/**
|
|
13
15
|
* A method used to request payment when uploading or mirroring a blob
|
|
14
16
|
* @param server the server requiring payment
|
|
@@ -16,6 +18,7 @@ export type MirrorOptions<S extends ServerType> = {
|
|
|
16
18
|
* @param blob the original blob
|
|
17
19
|
* @param request the payment request
|
|
18
20
|
*/
|
|
21
|
+
/** @deprecated Use onPaymentRequired to handle payment schemes generically. */
|
|
19
22
|
onPayment?: (server: S, sha256: string, blob: BlobDescriptor, request: PaymentRequest) => Promise<PaymentToken>;
|
|
20
23
|
/**
|
|
21
24
|
* A method used to request a signed auth event for a server and sha256
|
package/lib/actions/mirror.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { encodeAuthorizationHeader, getReusableAuthEvent, storeAuthEvent } from "../auth.js";
|
|
2
2
|
import HTTPError from "../error.js";
|
|
3
3
|
import { fetchWithTimeout } from "../helpers/index.js";
|
|
4
|
+
import { mergeHeaders } from "../helpers/headers.js";
|
|
4
5
|
/** Mirrors a blob to a server */
|
|
5
6
|
export async function mirrorBlob(server, blob, opts) {
|
|
6
7
|
const url = new URL("/mirror", server);
|
|
@@ -59,19 +60,22 @@ export async function mirrorBlob(server, blob, opts) {
|
|
|
59
60
|
break;
|
|
60
61
|
}
|
|
61
62
|
case 402: {
|
|
62
|
-
|
|
63
|
+
let paymentHeaders;
|
|
64
|
+
if (opts?.onPaymentRequired)
|
|
65
|
+
paymentHeaders = await opts.onPaymentRequired(server, blob.sha256, blob, mirror.headers);
|
|
66
|
+
else if (opts?.onPayment) {
|
|
67
|
+
const { encodePaymentToken, getPaymentRequestFromHeaders } = await import("../helpers/cashu.js");
|
|
68
|
+
const request = await getPaymentRequestFromHeaders(mirror.headers);
|
|
69
|
+
paymentHeaders = { "X-Cashu": encodePaymentToken(await opts.onPayment(server, blob.sha256, blob, request)) };
|
|
70
|
+
}
|
|
71
|
+
else
|
|
63
72
|
throw new Error("Missing payment handler");
|
|
64
|
-
const { getEncodedToken } = await import("@cashu/cashu-ts");
|
|
65
|
-
const { getPaymentRequestFromHeaders } = await import("../helpers/cashu.js");
|
|
66
|
-
const request = await getPaymentRequestFromHeaders(mirror.headers);
|
|
67
|
-
const token = await opts.onPayment(server, blob.sha256, blob, request);
|
|
68
|
-
const payment = getEncodedToken(token);
|
|
69
73
|
// Try mirror with payment
|
|
70
74
|
mirror = await fetchWithTimeout(url, {
|
|
71
75
|
signal: opts?.signal,
|
|
72
76
|
method: "PUT",
|
|
73
77
|
body,
|
|
74
|
-
headers:
|
|
78
|
+
headers: mergeHeaders(headers, paymentHeaders),
|
|
75
79
|
timeout: opts?.timeout,
|
|
76
80
|
});
|
|
77
81
|
break;
|
|
@@ -56,6 +56,11 @@ export async function multiServerUpload(servers, blob, opts) {
|
|
|
56
56
|
throw new Error("Missing payment handler");
|
|
57
57
|
return options.onPayment(server, sha256, blob, request);
|
|
58
58
|
};
|
|
59
|
+
const handlePaymentRequired = (server, sha256, _blob, headers) => {
|
|
60
|
+
if (!options.onPaymentRequired)
|
|
61
|
+
throw new Error("Missing payment handler");
|
|
62
|
+
return options.onPaymentRequired(server, sha256, blob, headers);
|
|
63
|
+
};
|
|
59
64
|
const handleRejection = async (server, sha256, error) => {
|
|
60
65
|
if (!HTTPError.isRejection(error))
|
|
61
66
|
return false;
|
|
@@ -102,6 +107,7 @@ export async function multiServerUpload(servers, blob, opts) {
|
|
|
102
107
|
auth: typeof options.auth === "boolean" ? options.auth : undefined,
|
|
103
108
|
onAuth: (server, sha256) => handleAuthRequest(server, sha256, "upload"),
|
|
104
109
|
onPayment: handlePaymentRequest,
|
|
110
|
+
onPaymentRequired: options.onPaymentRequired ? handlePaymentRequired : undefined,
|
|
105
111
|
timeout: options.mirrorTimeout,
|
|
106
112
|
});
|
|
107
113
|
}
|
|
@@ -119,6 +125,7 @@ export async function multiServerUpload(servers, blob, opts) {
|
|
|
119
125
|
auth: typeof options.auth === "boolean" ? options.auth : undefined,
|
|
120
126
|
onAuth: handleAuthRequest,
|
|
121
127
|
onPayment: handlePaymentRequest,
|
|
128
|
+
onPaymentRequired: options.onPaymentRequired ? handlePaymentRequired : undefined,
|
|
122
129
|
timeout: options.mirrorTimeout,
|
|
123
130
|
});
|
|
124
131
|
if (!initialUpload)
|
|
@@ -179,6 +186,11 @@ export async function multiServerMediaUpload(servers, blob, opts) {
|
|
|
179
186
|
throw new Error("Missing payment handler");
|
|
180
187
|
return options.onPayment(server, sha256, blob, request);
|
|
181
188
|
};
|
|
189
|
+
const handlePaymentRequired = (server, sha256, _blob, headers) => {
|
|
190
|
+
if (!options.onPaymentRequired)
|
|
191
|
+
throw new Error("Missing payment handler");
|
|
192
|
+
return options.onPaymentRequired(server, sha256, blob, headers);
|
|
193
|
+
};
|
|
182
194
|
const handleRejection = async (server, sha256, error) => {
|
|
183
195
|
if (!HTTPError.isRejection(error))
|
|
184
196
|
return false;
|
|
@@ -200,6 +212,7 @@ export async function multiServerMediaUpload(servers, blob, opts) {
|
|
|
200
212
|
auth: typeof options.auth === "boolean" ? options.auth : undefined,
|
|
201
213
|
onAuth: handleAuthRequest,
|
|
202
214
|
onPayment: handlePaymentRequest,
|
|
215
|
+
onPaymentRequired: options.onPaymentRequired ? handlePaymentRequired : undefined,
|
|
203
216
|
});
|
|
204
217
|
results.set(server, initialUpload);
|
|
205
218
|
mediaUploadServer = server;
|
|
@@ -256,6 +269,7 @@ export async function multiServerMediaUpload(servers, blob, opts) {
|
|
|
256
269
|
auth: typeof options.auth === "boolean" ? options.auth : undefined,
|
|
257
270
|
onAuth: (server, sha256) => handleAuthRequest(server, sha256, "upload"),
|
|
258
271
|
onPayment: handlePaymentRequest,
|
|
272
|
+
onPaymentRequired: options.onPaymentRequired ? handlePaymentRequired : undefined,
|
|
259
273
|
timeout: options.mirrorTimeout,
|
|
260
274
|
});
|
|
261
275
|
results.set(server, metadata);
|
package/lib/actions/upload.d.ts
CHANGED
|
@@ -9,6 +9,8 @@ export type UploadOptions<S extends ServerType, B extends UploadType> = {
|
|
|
9
9
|
authEvents?: Set<SignedEvent>;
|
|
10
10
|
/** Request timeout */
|
|
11
11
|
timeout?: number;
|
|
12
|
+
/** Return headers to retry a request rejected with HTTP 402. */
|
|
13
|
+
onPaymentRequired?: (server: S, sha256: string, blob: B, headers: Headers) => Promise<HeadersInit>;
|
|
12
14
|
/**
|
|
13
15
|
* A method used to request payment when uploading or mirroring a blob
|
|
14
16
|
* @param server the server requiring payment
|
|
@@ -16,6 +18,7 @@ export type UploadOptions<S extends ServerType, B extends UploadType> = {
|
|
|
16
18
|
* @param blob the original blob
|
|
17
19
|
* @param request the payment request
|
|
18
20
|
*/
|
|
21
|
+
/** @deprecated Use onPaymentRequired to handle payment schemes generically. */
|
|
19
22
|
onPayment?: (server: S, sha256: string, blob: B, request: PaymentRequest) => Promise<PaymentToken>;
|
|
20
23
|
/**
|
|
21
24
|
* A method used to request a signed auth event for a server and sha256
|
package/lib/actions/upload.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { encodeAuthorizationHeader, getReusableAuthEvent, storeAuthEvent } from "../auth.js";
|
|
2
2
|
import HTTPError from "../error.js";
|
|
3
3
|
import { fetchWithTimeout, getBlobSha256, getBlobSize, getBlobType } from "../helpers/index.js";
|
|
4
|
+
import { mergeHeaders } from "../helpers/headers.js";
|
|
4
5
|
/** Upload a blob to a server, handles payment and auth */
|
|
5
6
|
export async function uploadBlob(server, blob, opts) {
|
|
6
7
|
const url = new URL("/upload", server);
|
|
@@ -74,18 +75,21 @@ export async function uploadBlob(server, blob, opts) {
|
|
|
74
75
|
break;
|
|
75
76
|
}
|
|
76
77
|
case 402: {
|
|
77
|
-
|
|
78
|
+
let paymentHeaders;
|
|
79
|
+
if (opts?.onPaymentRequired)
|
|
80
|
+
paymentHeaders = await opts.onPaymentRequired(server, sha256, blob, firstTry.headers);
|
|
81
|
+
else if (opts?.onPayment) {
|
|
82
|
+
const { encodePaymentToken, getPaymentRequestFromHeaders } = await import("../helpers/cashu.js");
|
|
83
|
+
const request = await getPaymentRequestFromHeaders(firstTry.headers);
|
|
84
|
+
paymentHeaders = { "X-Cashu": encodePaymentToken(await opts.onPayment(server, sha256, blob, request)) };
|
|
85
|
+
}
|
|
86
|
+
else
|
|
78
87
|
throw new Error("Missing payment handler");
|
|
79
|
-
const { getEncodedToken } = await import("@cashu/cashu-ts");
|
|
80
|
-
const { getPaymentRequestFromHeaders } = await import("../helpers/cashu.js");
|
|
81
|
-
const request = await getPaymentRequestFromHeaders(firstTry.headers);
|
|
82
|
-
const token = await opts.onPayment(server, sha256, blob, request);
|
|
83
|
-
const payment = getEncodedToken(token);
|
|
84
88
|
// Try upload with payment
|
|
85
89
|
upload = await fetchWithTimeout(url, {
|
|
86
90
|
method: "PUT",
|
|
87
91
|
body: blob,
|
|
88
|
-
headers:
|
|
92
|
+
headers: mergeHeaders(headers, paymentHeaders),
|
|
89
93
|
signal: opts?.signal,
|
|
90
94
|
timeout: opts?.timeout,
|
|
91
95
|
});
|
package/lib/helpers/cashu.d.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { PaymentRequest } from "../types.js";
|
|
2
|
-
/** Extracts a
|
|
2
|
+
/** Extracts a Cashu PaymentRequest-compatible object from Headers. */
|
|
3
3
|
export declare function getPaymentRequestFromHeaders(headers: Headers): Promise<PaymentRequest>;
|
|
4
4
|
export declare function getPaymentRequestFromHeaders(headers: Headers, quite: false): Promise<PaymentRequest>;
|
|
5
5
|
export declare function getPaymentRequestFromHeaders(headers: Headers, quite: true): Promise<PaymentRequest | undefined>;
|
|
6
|
+
/** Encodes the legacy Cashu token shape used by the deprecated onPayment callback. */
|
|
7
|
+
export declare function encodePaymentToken(token: unknown): string;
|
package/lib/helpers/cashu.js
CHANGED
|
@@ -1,3 +1,142 @@
|
|
|
1
|
+
const decodeBase64 = (value) => {
|
|
2
|
+
const base64 = value
|
|
3
|
+
.replace(/-/g, "+")
|
|
4
|
+
.replace(/_/g, "/")
|
|
5
|
+
.padEnd(Math.ceil(value.length / 4) * 4, "=");
|
|
6
|
+
return Uint8Array.from(atob(base64), (character) => character.charCodeAt(0));
|
|
7
|
+
};
|
|
8
|
+
const encodedRequests = new WeakMap();
|
|
9
|
+
class PaymentRequestCompatibility {
|
|
10
|
+
transport;
|
|
11
|
+
id;
|
|
12
|
+
amount;
|
|
13
|
+
unit;
|
|
14
|
+
mints;
|
|
15
|
+
description;
|
|
16
|
+
singleUse;
|
|
17
|
+
constructor(transport, id, amount, unit, mints, description, singleUse = false) {
|
|
18
|
+
this.transport = transport;
|
|
19
|
+
this.id = id;
|
|
20
|
+
this.amount = amount;
|
|
21
|
+
this.unit = unit;
|
|
22
|
+
this.mints = mints;
|
|
23
|
+
this.description = description;
|
|
24
|
+
this.singleUse = singleUse;
|
|
25
|
+
}
|
|
26
|
+
toRawRequest() {
|
|
27
|
+
return {
|
|
28
|
+
t: this.transport.map((item) => ({ t: item.type, a: item.target, g: item.tags })),
|
|
29
|
+
...(this.id ? { i: this.id } : {}),
|
|
30
|
+
...(this.amount ? { a: this.amount } : {}),
|
|
31
|
+
...(this.unit ? { u: this.unit } : {}),
|
|
32
|
+
...(this.mints ? { m: this.mints } : {}),
|
|
33
|
+
...(this.description ? { d: this.description } : {}),
|
|
34
|
+
...(this.singleUse ? { s: true } : {}),
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
toEncodedRequest() {
|
|
38
|
+
return encodedRequests.get(this);
|
|
39
|
+
}
|
|
40
|
+
getTransport(type) {
|
|
41
|
+
return this.transport.find((item) => item.type === type);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
function decodeCbor(data) {
|
|
45
|
+
const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
|
|
46
|
+
const decodeLength = (offset, info) => {
|
|
47
|
+
if (info < 24)
|
|
48
|
+
return [info, offset];
|
|
49
|
+
if (info === 24)
|
|
50
|
+
return [view.getUint8(offset), offset + 1];
|
|
51
|
+
if (info === 25)
|
|
52
|
+
return [view.getUint16(offset), offset + 2];
|
|
53
|
+
if (info === 26)
|
|
54
|
+
return [view.getUint32(offset), offset + 4];
|
|
55
|
+
throw new Error("Unsupported CBOR length");
|
|
56
|
+
};
|
|
57
|
+
const decode = (offset) => {
|
|
58
|
+
const byte = view.getUint8(offset++);
|
|
59
|
+
const type = byte >> 5;
|
|
60
|
+
const info = byte & 0x1f;
|
|
61
|
+
const [length, next] = decodeLength(offset, info);
|
|
62
|
+
if (type === 0)
|
|
63
|
+
return [length, next];
|
|
64
|
+
if (type === 2)
|
|
65
|
+
return [data.slice(next, next + length), next + length];
|
|
66
|
+
if (type === 3)
|
|
67
|
+
return [new TextDecoder().decode(data.slice(next, next + length)), next + length];
|
|
68
|
+
if (type === 4) {
|
|
69
|
+
const values = [];
|
|
70
|
+
let cursor = next;
|
|
71
|
+
for (let index = 0; index < length; index++) {
|
|
72
|
+
const [value, end] = decode(cursor);
|
|
73
|
+
values.push(value);
|
|
74
|
+
cursor = end;
|
|
75
|
+
}
|
|
76
|
+
return [values, cursor];
|
|
77
|
+
}
|
|
78
|
+
if (type === 5) {
|
|
79
|
+
const value = {};
|
|
80
|
+
let cursor = next;
|
|
81
|
+
for (let index = 0; index < length; index++) {
|
|
82
|
+
const [key, keyEnd] = decode(cursor);
|
|
83
|
+
const [item, itemEnd] = decode(keyEnd);
|
|
84
|
+
value[String(key)] = item;
|
|
85
|
+
cursor = itemEnd;
|
|
86
|
+
}
|
|
87
|
+
return [value, cursor];
|
|
88
|
+
}
|
|
89
|
+
if (type === 7 && info >= 20 && info <= 23)
|
|
90
|
+
return [[false, true, null, undefined][info - 20], offset];
|
|
91
|
+
throw new Error("Unsupported CBOR value");
|
|
92
|
+
};
|
|
93
|
+
return decode(0)[0];
|
|
94
|
+
}
|
|
95
|
+
function encodeCbor(value) {
|
|
96
|
+
const output = [];
|
|
97
|
+
const length = (major, value) => {
|
|
98
|
+
if (value < 24)
|
|
99
|
+
output.push((major << 5) | value);
|
|
100
|
+
else if (value < 256)
|
|
101
|
+
output.push((major << 5) | 24, value);
|
|
102
|
+
else if (value < 65536)
|
|
103
|
+
output.push((major << 5) | 25, value >> 8, value & 0xff);
|
|
104
|
+
else
|
|
105
|
+
output.push((major << 5) | 26, value >> 24, (value >> 16) & 0xff, (value >> 8) & 0xff, value & 0xff);
|
|
106
|
+
};
|
|
107
|
+
const encode = (item) => {
|
|
108
|
+
if (typeof item === "number")
|
|
109
|
+
length(0, item);
|
|
110
|
+
else if (typeof item === "string") {
|
|
111
|
+
const bytes = new TextEncoder().encode(item);
|
|
112
|
+
length(3, bytes.length);
|
|
113
|
+
output.push(...bytes);
|
|
114
|
+
}
|
|
115
|
+
else if (item instanceof Uint8Array) {
|
|
116
|
+
length(2, item.length);
|
|
117
|
+
output.push(...item);
|
|
118
|
+
}
|
|
119
|
+
else if (Array.isArray(item)) {
|
|
120
|
+
length(4, item.length);
|
|
121
|
+
item.forEach(encode);
|
|
122
|
+
}
|
|
123
|
+
else if (item && typeof item === "object") {
|
|
124
|
+
const entries = Object.entries(item);
|
|
125
|
+
length(5, entries.length);
|
|
126
|
+
entries.forEach(([key, entry]) => {
|
|
127
|
+
encode(key);
|
|
128
|
+
encode(entry);
|
|
129
|
+
});
|
|
130
|
+
}
|
|
131
|
+
else if (typeof item === "boolean")
|
|
132
|
+
output.push(item ? 0xf5 : 0xf4);
|
|
133
|
+
else
|
|
134
|
+
throw new Error("Unsupported CBOR value");
|
|
135
|
+
};
|
|
136
|
+
encode(value);
|
|
137
|
+
return Uint8Array.from(output);
|
|
138
|
+
}
|
|
139
|
+
const hexToBytes = (hex) => Uint8Array.from(hex.match(/.{1,2}/g) ?? [], (value) => Number.parseInt(value, 16));
|
|
1
140
|
export async function getPaymentRequestFromHeaders(headers, quite = false) {
|
|
2
141
|
const header = headers.get("X-Cashu");
|
|
3
142
|
if (!header) {
|
|
@@ -6,9 +145,51 @@ export async function getPaymentRequestFromHeaders(headers, quite = false) {
|
|
|
6
145
|
else
|
|
7
146
|
return undefined;
|
|
8
147
|
}
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
request
|
|
148
|
+
if (!header.startsWith("creqA"))
|
|
149
|
+
throw new Error("Unsupported cashu payment request");
|
|
150
|
+
const raw = decodeCbor(decodeBase64(header.slice(5)));
|
|
151
|
+
const request = new PaymentRequestCompatibility([], raw.i, raw.a, raw.u, raw.m, raw.d, raw.s);
|
|
152
|
+
encodedRequests.set(request, header);
|
|
13
153
|
return request;
|
|
14
154
|
}
|
|
155
|
+
/** Encodes the legacy Cashu token shape used by the deprecated onPayment callback. */
|
|
156
|
+
export function encodePaymentToken(token) {
|
|
157
|
+
const value = token;
|
|
158
|
+
const nonHex = value.proofs.some((proof) => !/^[0-9a-fA-F]+$/.test(proof.id));
|
|
159
|
+
if (nonHex) {
|
|
160
|
+
const json = JSON.stringify({
|
|
161
|
+
token: [{ mint: value.mint, proofs: value.proofs }],
|
|
162
|
+
unit: value.unit,
|
|
163
|
+
memo: value.memo,
|
|
164
|
+
});
|
|
165
|
+
const bytes = new TextEncoder().encode(json);
|
|
166
|
+
let binary = "";
|
|
167
|
+
for (const byte of bytes)
|
|
168
|
+
binary += String.fromCharCode(byte);
|
|
169
|
+
return "cashuA" + btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
|
|
170
|
+
}
|
|
171
|
+
const groups = new Map();
|
|
172
|
+
for (const proof of value.proofs)
|
|
173
|
+
groups.set(proof.id, [...(groups.get(proof.id) ?? []), proof]);
|
|
174
|
+
const template = {
|
|
175
|
+
m: value.mint,
|
|
176
|
+
u: value.unit || "sat",
|
|
177
|
+
t: [...groups].map(([id, proofs]) => ({
|
|
178
|
+
i: hexToBytes(id),
|
|
179
|
+
p: proofs.map((proof) => ({
|
|
180
|
+
a: proof.amount,
|
|
181
|
+
s: proof.secret,
|
|
182
|
+
c: hexToBytes(proof.C),
|
|
183
|
+
...(proof.dleq
|
|
184
|
+
? { d: { e: hexToBytes(proof.dleq.e), s: hexToBytes(proof.dleq.s), r: hexToBytes(proof.dleq.r ?? "00") } }
|
|
185
|
+
: {}),
|
|
186
|
+
})),
|
|
187
|
+
})),
|
|
188
|
+
...(value.memo ? { d: value.memo } : {}),
|
|
189
|
+
};
|
|
190
|
+
const bytes = encodeCbor(template);
|
|
191
|
+
let binary = "";
|
|
192
|
+
for (const byte of bytes)
|
|
193
|
+
binary += String.fromCharCode(byte);
|
|
194
|
+
return "cashuB" + btoa(binary).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
|
|
195
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function mergeHeaders(base: HeadersInit, extra: HeadersInit): Headers;
|
package/lib/helpers/index.d.ts
CHANGED
package/lib/helpers/index.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "blossom-client-sdk",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.1.0",
|
|
4
4
|
"description": "Client SDK for talking to blossom servers",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -57,13 +57,9 @@
|
|
|
57
57
|
"@noble/hashes": "^1.8.0"
|
|
58
58
|
},
|
|
59
59
|
"peerDependencies": {
|
|
60
|
-
"@cashu/cashu-ts": "^2.4.3",
|
|
61
60
|
"hls.js": "^1.6.16"
|
|
62
61
|
},
|
|
63
62
|
"peerDependenciesMeta": {
|
|
64
|
-
"@cashu/cashu-ts": {
|
|
65
|
-
"optional": true
|
|
66
|
-
},
|
|
67
63
|
"hls.js": {
|
|
68
64
|
"optional": true
|
|
69
65
|
}
|