@bsv/overlay-express 2.6.1 → 2.7.3
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 +78 -12
- package/dist/cjs/package.json +1 -1
- package/dist/cjs/src/ArcadeProvider.d.ts +5 -1
- package/dist/cjs/src/ArcadeProvider.d.ts.map +1 -1
- package/dist/cjs/src/ArcadeProvider.js +159 -18
- package/dist/cjs/src/ArcadeProvider.js.map +1 -1
- package/dist/cjs/src/BanAwareDiscoveryStorage.d.ts +1 -4
- package/dist/cjs/src/BanAwareDiscoveryStorage.d.ts.map +1 -1
- package/dist/cjs/src/BanAwareDiscoveryStorage.js.map +1 -1
- package/dist/cjs/src/BanAwareLookupWrapper.d.ts.map +1 -1
- package/dist/cjs/src/BanAwareLookupWrapper.js +2 -1
- package/dist/cjs/src/BanAwareLookupWrapper.js.map +1 -1
- package/dist/cjs/src/BanAwareTopicManager.d.ts.map +1 -1
- package/dist/cjs/src/BanAwareTopicManager.js +3 -2
- package/dist/cjs/src/BanAwareTopicManager.js.map +1 -1
- package/dist/cjs/src/BanService.d.ts +2 -0
- package/dist/cjs/src/BanService.d.ts.map +1 -1
- package/dist/cjs/src/BanService.js +52 -9
- package/dist/cjs/src/BanService.js.map +1 -1
- package/dist/cjs/src/ChaintracksProvider.d.ts +4 -0
- package/dist/cjs/src/ChaintracksProvider.d.ts.map +1 -1
- package/dist/cjs/src/ChaintracksProvider.js +64 -9
- package/dist/cjs/src/ChaintracksProvider.js.map +1 -1
- package/dist/cjs/src/JanitorService.d.ts +3 -0
- package/dist/cjs/src/JanitorService.d.ts.map +1 -1
- package/dist/cjs/src/JanitorService.js +80 -33
- package/dist/cjs/src/JanitorService.js.map +1 -1
- package/dist/cjs/src/OutboundSecurity.d.ts +19 -0
- package/dist/cjs/src/OutboundSecurity.d.ts.map +1 -0
- package/dist/cjs/src/OutboundSecurity.js +199 -0
- package/dist/cjs/src/OutboundSecurity.js.map +1 -0
- package/dist/cjs/src/OverlayExpress.d.ts +9 -1
- package/dist/cjs/src/OverlayExpress.d.ts.map +1 -1
- package/dist/cjs/src/OverlayExpress.js +717 -153
- package/dist/cjs/src/OverlayExpress.js.map +1 -1
- package/dist/cjs/src/OverlayMonitor.d.ts +10 -1
- package/dist/cjs/src/OverlayMonitor.d.ts.map +1 -1
- package/dist/cjs/src/OverlayMonitor.js +173 -72
- package/dist/cjs/src/OverlayMonitor.js.map +1 -1
- package/dist/cjs/src/ProviderChainBroadcaster.d.ts.map +1 -1
- package/dist/cjs/src/ProviderChainBroadcaster.js +28 -1
- package/dist/cjs/src/ProviderChainBroadcaster.js.map +1 -1
- package/dist/cjs/src/ReorgStream.d.ts +13 -9
- package/dist/cjs/src/ReorgStream.d.ts.map +1 -1
- package/dist/cjs/src/ReorgStream.js +193 -73
- package/dist/cjs/src/ReorgStream.js.map +1 -1
- package/dist/cjs/src/ResourceBoundedLookupWrapper.d.ts.map +1 -1
- package/dist/cjs/src/ResourceBoundedLookupWrapper.js +30 -1
- package/dist/cjs/src/ResourceBoundedLookupWrapper.js.map +1 -1
- package/dist/cjs/src/makeUserInterface.d.ts +2 -0
- package/dist/cjs/src/makeUserInterface.d.ts.map +1 -1
- package/dist/cjs/src/makeUserInterface.js +316 -118
- package/dist/cjs/src/makeUserInterface.js.map +1 -1
- package/dist/esm/src/ArcadeProvider.js +164 -19
- package/dist/esm/src/ArcadeProvider.js.map +1 -1
- package/dist/esm/src/BanAwareDiscoveryStorage.js.map +1 -1
- package/dist/esm/src/BanAwareLookupWrapper.js +3 -2
- package/dist/esm/src/BanAwareLookupWrapper.js.map +1 -1
- package/dist/esm/src/BanAwareTopicManager.js +4 -3
- package/dist/esm/src/BanAwareTopicManager.js.map +1 -1
- package/dist/esm/src/BanService.js +51 -9
- package/dist/esm/src/BanService.js.map +1 -1
- package/dist/esm/src/ChaintracksProvider.js +63 -9
- package/dist/esm/src/ChaintracksProvider.js.map +1 -1
- package/dist/esm/src/JanitorService.js +78 -29
- package/dist/esm/src/JanitorService.js.map +1 -1
- package/dist/esm/src/OutboundSecurity.js +183 -0
- package/dist/esm/src/OutboundSecurity.js.map +1 -0
- package/dist/esm/src/OverlayExpress.js +708 -121
- package/dist/esm/src/OverlayExpress.js.map +1 -1
- package/dist/esm/src/OverlayMonitor.js +166 -67
- package/dist/esm/src/OverlayMonitor.js.map +1 -1
- package/dist/esm/src/ProviderChainBroadcaster.js +28 -1
- package/dist/esm/src/ProviderChainBroadcaster.js.map +1 -1
- package/dist/esm/src/ReorgStream.js +189 -66
- package/dist/esm/src/ReorgStream.js.map +1 -1
- package/dist/esm/src/ResourceBoundedLookupWrapper.js +29 -1
- package/dist/esm/src/ResourceBoundedLookupWrapper.js.map +1 -1
- package/dist/esm/src/makeUserInterface.js +316 -118
- package/dist/esm/src/makeUserInterface.js.map +1 -1
- package/dist/types/src/ArcadeProvider.d.ts +5 -1
- package/dist/types/src/ArcadeProvider.d.ts.map +1 -1
- package/dist/types/src/BanAwareDiscoveryStorage.d.ts +1 -4
- package/dist/types/src/BanAwareDiscoveryStorage.d.ts.map +1 -1
- package/dist/types/src/BanAwareLookupWrapper.d.ts.map +1 -1
- package/dist/types/src/BanAwareTopicManager.d.ts.map +1 -1
- package/dist/types/src/BanService.d.ts +2 -0
- package/dist/types/src/BanService.d.ts.map +1 -1
- package/dist/types/src/ChaintracksProvider.d.ts +4 -0
- package/dist/types/src/ChaintracksProvider.d.ts.map +1 -1
- package/dist/types/src/JanitorService.d.ts +3 -0
- package/dist/types/src/JanitorService.d.ts.map +1 -1
- package/dist/types/src/OutboundSecurity.d.ts +19 -0
- package/dist/types/src/OutboundSecurity.d.ts.map +1 -0
- package/dist/types/src/OverlayExpress.d.ts +9 -1
- package/dist/types/src/OverlayExpress.d.ts.map +1 -1
- package/dist/types/src/OverlayMonitor.d.ts +10 -1
- package/dist/types/src/OverlayMonitor.d.ts.map +1 -1
- package/dist/types/src/ProviderChainBroadcaster.d.ts.map +1 -1
- package/dist/types/src/ReorgStream.d.ts +13 -9
- package/dist/types/src/ReorgStream.d.ts.map +1 -1
- package/dist/types/src/ResourceBoundedLookupWrapper.d.ts.map +1 -1
- package/dist/types/src/makeUserInterface.d.ts +2 -0
- package/dist/types/src/makeUserInterface.d.ts.map +1 -1
- package/package.json +6 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeUserInterface.js","sourceRoot":"","sources":["../../../src/makeUserInterface.ts"],"names":[],"mappings":";;;;;;AAAA,8EAA+C;
|
|
1
|
+
{"version":3,"file":"makeUserInterface.js","sourceRoot":"","sources":["../../../src/makeUserInterface.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { MerklePath } from '@bsv/sdk';
|
|
2
|
+
import { MAX_PROVIDER_ERROR_BYTES, MAX_PROVIDER_JSON_BYTES, assertBoundedHex, assertBoundedString, assertHash, assertNonnegativeSafeInteger, fetchWithDeadline, hasControlCharacters, isRecord, readBoundedText, secureServiceFetch, snapshotOwnDataRecord } from './OutboundSecurity.js';
|
|
2
3
|
const TERMINAL_STATUSES = new Set([
|
|
3
4
|
'DOUBLE_SPEND_ATTEMPTED',
|
|
4
5
|
'REJECTED',
|
|
@@ -19,7 +20,9 @@ const SUCCESS_STATUSES = new Set([
|
|
|
19
20
|
export function isTerminalArcStatus(status, extraInfo) {
|
|
20
21
|
const statusText = typeof status === 'string' ? status.toUpperCase() : '';
|
|
21
22
|
const extraText = typeof extraInfo === 'string' ? extraInfo.toUpperCase() : '';
|
|
22
|
-
return TERMINAL_STATUSES.has(statusText) ||
|
|
23
|
+
return (TERMINAL_STATUSES.has(statusText) ||
|
|
24
|
+
statusText.includes('ORPHAN') ||
|
|
25
|
+
extraText.includes('ORPHAN'));
|
|
23
26
|
}
|
|
24
27
|
function trimBaseUrl(url) {
|
|
25
28
|
let base = url;
|
|
@@ -27,15 +30,133 @@ function trimBaseUrl(url) {
|
|
|
27
30
|
base = base.slice(0, -1);
|
|
28
31
|
return base;
|
|
29
32
|
}
|
|
33
|
+
function optionalHeaderValue(value, label, maxBytes) {
|
|
34
|
+
if (value === undefined || value === '')
|
|
35
|
+
return undefined;
|
|
36
|
+
assertBoundedString(value, label, maxBytes, false);
|
|
37
|
+
if (hasControlCharacters(value)) {
|
|
38
|
+
throw new TypeError(`${label} must not contain control characters`);
|
|
39
|
+
}
|
|
40
|
+
return value;
|
|
41
|
+
}
|
|
42
|
+
function snapshotArcadeConfig(config) {
|
|
43
|
+
const value = snapshotOwnDataRecord(config, 'Arcade config');
|
|
44
|
+
if (value.allowPrivateHosts !== undefined && typeof value.allowPrivateHosts !== 'boolean') {
|
|
45
|
+
throw new TypeError('Arcade allowPrivateHosts must be a boolean');
|
|
46
|
+
}
|
|
47
|
+
if (value.fetch !== undefined && typeof value.fetch !== 'function') {
|
|
48
|
+
throw new TypeError('Arcade fetch must be a function');
|
|
49
|
+
}
|
|
50
|
+
const apiKey = optionalHeaderValue(value.apiKey, 'Arcade API key', 16 * 1024);
|
|
51
|
+
const callbackToken = optionalHeaderValue(value.callbackToken, 'Arcade callback token', 16 * 1024);
|
|
52
|
+
const deploymentId = optionalHeaderValue(value.deploymentId, 'Arcade deployment ID', 256);
|
|
53
|
+
let callbackUrl = optionalHeaderValue(value.callbackUrl, 'Arcade callback URL', 2048);
|
|
54
|
+
if (callbackUrl !== undefined) {
|
|
55
|
+
const parsed = new URL(callbackUrl);
|
|
56
|
+
const allowPrivate = value.allowPrivateHosts ?? false;
|
|
57
|
+
if ((parsed.protocol !== 'https:' && !(allowPrivate && parsed.protocol === 'http:')) ||
|
|
58
|
+
parsed.username !== '' ||
|
|
59
|
+
parsed.password !== '' ||
|
|
60
|
+
parsed.hash !== '') {
|
|
61
|
+
throw new TypeError('Arcade callback URL must be credential-free HTTPS');
|
|
62
|
+
}
|
|
63
|
+
callbackUrl = parsed.toString();
|
|
64
|
+
}
|
|
65
|
+
let headers;
|
|
66
|
+
if (value.headers !== undefined) {
|
|
67
|
+
const supplied = snapshotOwnDataRecord(value.headers, 'Arcade headers');
|
|
68
|
+
headers = Object.create(null);
|
|
69
|
+
const reserved = new Set([
|
|
70
|
+
'accept',
|
|
71
|
+
'authorization',
|
|
72
|
+
'content-type',
|
|
73
|
+
'x-callbacktoken',
|
|
74
|
+
'x-callbackurl',
|
|
75
|
+
'xdeployment-id'
|
|
76
|
+
]);
|
|
77
|
+
for (const [name, headerValue] of Object.entries(supplied)) {
|
|
78
|
+
if (!/^[!#$%&'*+.^_`|~0-9A-Za-z-]{1,128}$/.test(name) || reserved.has(name.toLowerCase())) {
|
|
79
|
+
throw new TypeError(`Arcade custom header name is invalid or reserved: ${name}`);
|
|
80
|
+
}
|
|
81
|
+
assertBoundedString(headerValue, `Arcade header ${name}`, 8192, true);
|
|
82
|
+
if (hasControlCharacters(headerValue)) {
|
|
83
|
+
throw new TypeError(`Arcade header ${name} must not contain control characters`);
|
|
84
|
+
}
|
|
85
|
+
headers[name] = headerValue;
|
|
86
|
+
}
|
|
87
|
+
headers = Object.freeze(headers);
|
|
88
|
+
}
|
|
89
|
+
return Object.freeze({
|
|
90
|
+
apiKey,
|
|
91
|
+
callbackUrl,
|
|
92
|
+
callbackToken,
|
|
93
|
+
deploymentId,
|
|
94
|
+
headers,
|
|
95
|
+
fetch: value.fetch,
|
|
96
|
+
allowPrivateHosts: value.allowPrivateHosts,
|
|
97
|
+
requestTimeoutMs: value.requestTimeoutMs
|
|
98
|
+
});
|
|
99
|
+
}
|
|
30
100
|
function parseDescription(data, fallback) {
|
|
31
101
|
if (typeof data === 'string')
|
|
32
102
|
return data;
|
|
33
103
|
if (typeof data === 'object' && data !== null) {
|
|
34
104
|
const d = data;
|
|
35
|
-
return d.detail ??
|
|
105
|
+
return (d.detail ??
|
|
106
|
+
d.reason ??
|
|
107
|
+
d.error ??
|
|
108
|
+
`${d.txStatus ?? ''} ${d.extraInfo ?? ''}`.trim() ??
|
|
109
|
+
fallback);
|
|
36
110
|
}
|
|
37
111
|
return fallback;
|
|
38
112
|
}
|
|
113
|
+
function validateArcadeResponse(value, expectedTxid) {
|
|
114
|
+
if (!isRecord(value))
|
|
115
|
+
throw new TypeError('Arcade returned an invalid response object');
|
|
116
|
+
const response = value;
|
|
117
|
+
if (response.txid !== undefined) {
|
|
118
|
+
assertHash(response.txid, 'Arcade response txid');
|
|
119
|
+
if (expectedTxid !== undefined && response.txid.toLowerCase() !== expectedTxid.toLowerCase()) {
|
|
120
|
+
throw new TypeError('Arcade response txid does not match the request');
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
for (const field of ['txStatus', 'extraInfo', 'detail', 'error', 'reason']) {
|
|
124
|
+
if (response[field] !== undefined) {
|
|
125
|
+
assertBoundedString(response[field], `Arcade response ${field}`, 4096);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
if (response.status !== undefined &&
|
|
129
|
+
!(typeof response.status === 'number' && Number.isSafeInteger(response.status)) &&
|
|
130
|
+
typeof response.status !== 'string') {
|
|
131
|
+
throw new TypeError('Arcade response status is invalid');
|
|
132
|
+
}
|
|
133
|
+
if (typeof response.status === 'string') {
|
|
134
|
+
assertBoundedString(response.status, 'Arcade response status', 128);
|
|
135
|
+
}
|
|
136
|
+
if (response.competingTxs !== undefined) {
|
|
137
|
+
if (!Array.isArray(response.competingTxs) || response.competingTxs.length > 100) {
|
|
138
|
+
throw new TypeError('Arcade response competingTxs is invalid');
|
|
139
|
+
}
|
|
140
|
+
const seen = new Set();
|
|
141
|
+
for (const [index, txid] of response.competingTxs.entries()) {
|
|
142
|
+
assertHash(txid, `Arcade response competingTxs[${index}]`);
|
|
143
|
+
const canonical = txid.toLowerCase();
|
|
144
|
+
if (seen.has(canonical))
|
|
145
|
+
throw new TypeError('Arcade response contains duplicate competing txids');
|
|
146
|
+
seen.add(canonical);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
if (response.merklePath !== undefined) {
|
|
150
|
+
assertBoundedHex(response.merklePath, 'Arcade response merklePath', 16 * 1024 * 1024);
|
|
151
|
+
}
|
|
152
|
+
if (response.blockHeight !== undefined) {
|
|
153
|
+
assertNonnegativeSafeInteger(response.blockHeight, 'Arcade response blockHeight');
|
|
154
|
+
}
|
|
155
|
+
if (response.blockHash !== undefined) {
|
|
156
|
+
assertHash(response.blockHash, 'Arcade response blockHash');
|
|
157
|
+
}
|
|
158
|
+
return response;
|
|
159
|
+
}
|
|
39
160
|
function rawTxForArcade(tx) {
|
|
40
161
|
try {
|
|
41
162
|
return tx.toHexEF();
|
|
@@ -57,24 +178,33 @@ function rawTxForArcade(tx) {
|
|
|
57
178
|
* accepted the request.
|
|
58
179
|
*/
|
|
59
180
|
export class ArcadeProvider {
|
|
60
|
-
config;
|
|
61
181
|
name = 'Arcade';
|
|
62
182
|
baseUrl;
|
|
63
183
|
fetcher;
|
|
184
|
+
requestTimeoutMs;
|
|
185
|
+
config;
|
|
64
186
|
constructor(url, config = {}) {
|
|
65
|
-
this.config = config;
|
|
66
|
-
|
|
67
|
-
this.
|
|
187
|
+
this.config = snapshotArcadeConfig(config);
|
|
188
|
+
const transport = secureServiceFetch(url, this.config.fetch, this.config.allowPrivateHosts);
|
|
189
|
+
this.baseUrl = trimBaseUrl(transport.baseUrl);
|
|
190
|
+
this.fetcher = transport.fetchImpl;
|
|
191
|
+
this.requestTimeoutMs = this.config.requestTimeoutMs ?? 30_000;
|
|
192
|
+
if (!Number.isSafeInteger(this.requestTimeoutMs) ||
|
|
193
|
+
this.requestTimeoutMs < 1 ||
|
|
194
|
+
this.requestTimeoutMs > 300_000) {
|
|
195
|
+
throw new TypeError('Arcade requestTimeoutMs must be an integer between 1 and 300000');
|
|
196
|
+
}
|
|
68
197
|
}
|
|
69
198
|
async broadcast(tx) {
|
|
70
199
|
const rawTx = rawTxForArcade(tx);
|
|
200
|
+
const expectedTxid = tx.id('hex');
|
|
71
201
|
try {
|
|
72
|
-
const response = await this.fetcher
|
|
202
|
+
const response = await fetchWithDeadline(this.fetcher, `${this.baseUrl}/tx`, {
|
|
73
203
|
method: 'POST',
|
|
74
204
|
headers: this.requestHeaders(),
|
|
75
205
|
body: JSON.stringify({ rawTx })
|
|
76
|
-
});
|
|
77
|
-
const data = await this.readResponse(response);
|
|
206
|
+
}, this.requestTimeoutMs);
|
|
207
|
+
const data = await this.readResponse(response, expectedTxid);
|
|
78
208
|
if (!response.ok) {
|
|
79
209
|
const failure = {
|
|
80
210
|
status: 'error',
|
|
@@ -102,7 +232,11 @@ export class ArcadeProvider {
|
|
|
102
232
|
txid: data?.txid,
|
|
103
233
|
description: `${txStatus ?? ''} ${data?.extraInfo ?? ''}`.trim()
|
|
104
234
|
};
|
|
105
|
-
const more = {
|
|
235
|
+
const more = {
|
|
236
|
+
provider: this.name,
|
|
237
|
+
terminal: true,
|
|
238
|
+
response: data
|
|
239
|
+
};
|
|
106
240
|
if (data?.competingTxs !== undefined) {
|
|
107
241
|
more.competingTxs = data.competingTxs;
|
|
108
242
|
}
|
|
@@ -110,10 +244,13 @@ export class ArcadeProvider {
|
|
|
110
244
|
return failure;
|
|
111
245
|
}
|
|
112
246
|
const statusText = typeof txStatus === 'string' ? txStatus.toUpperCase() : undefined;
|
|
247
|
+
if (statusText === undefined || !SUCCESS_STATUSES.has(statusText)) {
|
|
248
|
+
throw new TypeError('Arcade returned an unknown success status');
|
|
249
|
+
}
|
|
113
250
|
return {
|
|
114
251
|
status: 'success',
|
|
115
|
-
txid: data?.txid ??
|
|
116
|
-
message: `${txStatus
|
|
252
|
+
txid: data?.txid ?? expectedTxid,
|
|
253
|
+
message: `${txStatus} ${data?.extraInfo ?? ''}`.trim(),
|
|
117
254
|
competingTxs: data?.competingTxs
|
|
118
255
|
};
|
|
119
256
|
}
|
|
@@ -127,13 +264,14 @@ export class ArcadeProvider {
|
|
|
127
264
|
}
|
|
128
265
|
}
|
|
129
266
|
async fetchMerkleProof(txid) {
|
|
130
|
-
|
|
267
|
+
assertHash(txid, 'Arcade proof txid');
|
|
268
|
+
const response = await fetchWithDeadline(this.fetcher, `${this.baseUrl}/tx/${txid}`, {
|
|
131
269
|
method: 'GET',
|
|
132
270
|
headers: this.requestHeaders({ accept: 'application/json' })
|
|
133
|
-
});
|
|
271
|
+
}, this.requestTimeoutMs);
|
|
134
272
|
if (response.status === 404)
|
|
135
273
|
return undefined;
|
|
136
|
-
const data = await this.readResponse(response);
|
|
274
|
+
const data = await this.readResponse(response, txid);
|
|
137
275
|
if (!response.ok) {
|
|
138
276
|
throw new Error(`Arcade proof lookup failed for ${txid}: ${response.status} ${parseDescription(data, response.statusText)}`);
|
|
139
277
|
}
|
|
@@ -142,6 +280,9 @@ export class ArcadeProvider {
|
|
|
142
280
|
return undefined;
|
|
143
281
|
}
|
|
144
282
|
const merklePath = MerklePath.fromHex(data.merklePath);
|
|
283
|
+
if (data.blockHeight !== undefined && data.blockHeight !== merklePath.blockHeight) {
|
|
284
|
+
throw new TypeError('Arcade proof block height does not match its Merkle path');
|
|
285
|
+
}
|
|
145
286
|
return {
|
|
146
287
|
txid,
|
|
147
288
|
merklePath,
|
|
@@ -174,15 +315,19 @@ export class ArcadeProvider {
|
|
|
174
315
|
}
|
|
175
316
|
return headers;
|
|
176
317
|
}
|
|
177
|
-
async readResponse(response) {
|
|
178
|
-
const text = await response.
|
|
318
|
+
async readResponse(response, expectedTxid) {
|
|
319
|
+
const text = await readBoundedText(response, response.ok ? MAX_PROVIDER_JSON_BYTES : MAX_PROVIDER_ERROR_BYTES, 'Arcade response body');
|
|
179
320
|
if (text === '')
|
|
180
321
|
return undefined;
|
|
181
322
|
try {
|
|
182
|
-
return JSON.parse(text);
|
|
323
|
+
return validateArcadeResponse(JSON.parse(text), expectedTxid);
|
|
183
324
|
}
|
|
184
325
|
catch {
|
|
185
|
-
|
|
326
|
+
if (!response.ok) {
|
|
327
|
+
assertBoundedString(text, 'Arcade error response', MAX_PROVIDER_ERROR_BYTES);
|
|
328
|
+
return { error: text };
|
|
329
|
+
}
|
|
330
|
+
throw new TypeError('Arcade returned malformed JSON');
|
|
186
331
|
}
|
|
187
332
|
}
|
|
188
333
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArcadeProvider.js","sourceRoot":"","sources":["../../../src/ArcadeProvider.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ArcadeProvider.js","sourceRoot":"","sources":["../../../src/ArcadeProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BanAwareDiscoveryStorage.js","sourceRoot":"","sources":["../../../src/BanAwareDiscoveryStorage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"BanAwareDiscoveryStorage.js","sourceRoot":"","sources":["../../../src/BanAwareDiscoveryStorage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAGhD;;GAEG;AACH,MAAM,OAAO,mBAAmB;IAEX,OAAO;IACP,UAAU;IACV,MAAM;IAHzB,YACmB,OAAoB,EACpB,UAAsB,EACtB,MAAM,GAAmB,OAAO;uBAFhC,OAAO;0BACP,UAAU;sBACV,MAAM;IACtB,CAAC;IAEJ,KAAK,CAAC,aAAa;QACjB,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAA;IAC3C,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,WAAmB,EAAE,MAAc,EAAE,KAAa;QACzE,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;IAC1E,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,IAAY,EACZ,WAAmB,EACnB,WAAmB,EACnB,MAAc,EACd,KAAa;QAEb,IAAI,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,CAAC;YAC9D,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,yDAAyD,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,iBAAiB,CAAC,WAAW,CAAC,EAAE,CACjI,CAAA;YACD,OAAM;QACR,CAAC;QACD,IAAI,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;YACjD,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,yDAAyD,iBAAiB,CAAC,MAAM,CAAC,SAAS,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,iBAAiB,CAAC,WAAW,CAAC,EAAE,CACnK,CAAA;YACD,OAAM;QACR,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;IAC1F,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAAY,EAAE,WAAmB;QACtD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;IAC/D,CAAC;IAED,KAAK,CAAC,UAAU,CACd,GAAG,IAA2C;QAE9C,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,CAAA;IAC/C,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAG,IAAwC;QACvD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAA;IAC5C,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,mBAAmB;IAEX,OAAO;IACP,UAAU;IACV,MAAM;IAHzB,YACmB,OAAoB,EACpB,UAAsB,EACtB,MAAM,GAAmB,OAAO;uBAFhC,OAAO;0BACP,UAAU;sBACV,MAAM;IACtB,CAAC;IAEJ,KAAK,CAAC,aAAa;QACjB,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAA;IAC3C,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,WAAmB,EAAE,MAAc,EAAE,OAAe;QAC3E,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5E,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,IAAY,EACZ,WAAmB,EACnB,WAAmB,EACnB,MAAc,EACd,OAAe;QAEf,IAAI,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,CAAC;YAC9D,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,yDAAyD,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,iBAAiB,CAAC,WAAW,CAAC,EAAE,CACjI,CAAA;YACD,OAAM;QACR,CAAC;QACD,IAAI,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;YACjD,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,yDAAyD,iBAAiB,CAAC,MAAM,CAAC,SAAS,iBAAiB,CAAC,IAAI,CAAC,gBAAgB,iBAAiB,CAAC,WAAW,CAAC,EAAE,CACnK,CAAA;YACD,OAAM;QACR,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;IAC5F,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAAY,EAAE,WAAmB;QACtD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;IAC/D,CAAC;IAED,KAAK,CAAC,UAAU,CACd,GAAG,IAA2C;QAE9C,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,CAAA;IAC/C,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAG,IAAwC;QACvD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAA;IAC5C,CAAC;CACF"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import { toUTF8 } from '@bsv/sdk/primitives/utils';
|
|
1
2
|
import { serializeLogValue } from '@bsv/overlay';
|
|
2
|
-
import { PushDrop
|
|
3
|
+
import { PushDrop } from '@bsv/sdk';
|
|
3
4
|
/**
|
|
4
5
|
* Wraps a SHIP or SLAP LookupService to intercept outputAdmittedByTopic calls
|
|
5
6
|
* and block outputs whose domain or outpoint appears in the persistent ban list.
|
|
@@ -38,7 +39,7 @@ export class BanAwareLookupWrapper {
|
|
|
38
39
|
try {
|
|
39
40
|
const result = PushDrop.decode(lockingScript);
|
|
40
41
|
if (result.fields.length >= 3) {
|
|
41
|
-
const domain =
|
|
42
|
+
const domain = toUTF8(result.fields[2]);
|
|
42
43
|
if (await this.banService.isDomainBanned(domain)) {
|
|
43
44
|
this.logger.log(`[BAN] Blocked banned domain from lookup admission: domain=${serializeLogValue(domain)} protocol=${serializeLogValue(this.protocol)} txid=${serializeLogValue(txid)} outputIndex=${serializeLogValue(outputIndex)}`);
|
|
44
45
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BanAwareLookupWrapper.js","sourceRoot":"","sources":["../../../src/BanAwareLookupWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,iBAAiB,EAClB,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"BanAwareLookupWrapper.js","sourceRoot":"","sources":["../../../src/BanAwareLookupWrapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
import { toUTF8 } from '@bsv/sdk/primitives/utils';
|
|
1
2
|
import { serializeLogValue } from '@bsv/overlay';
|
|
2
|
-
import { PushDrop, Transaction
|
|
3
|
+
import { PushDrop, Transaction } from '@bsv/sdk';
|
|
3
4
|
/**
|
|
4
5
|
* Filters banned SHIP or SLAP advertisement outputs before the overlay engine
|
|
5
6
|
* admits them into topic storage.
|
|
@@ -38,8 +39,8 @@ export class BanAwareTopicManager {
|
|
|
38
39
|
continue;
|
|
39
40
|
try {
|
|
40
41
|
const result = PushDrop.decode(output.lockingScript);
|
|
41
|
-
if (result.fields.length >= 3 &&
|
|
42
|
-
const domain =
|
|
42
|
+
if (result.fields.length >= 3 && toUTF8(result.fields[0]) === this.protocol) {
|
|
43
|
+
const domain = toUTF8(result.fields[2]);
|
|
43
44
|
if (await this.banService.isDomainBanned(domain)) {
|
|
44
45
|
this.logger.log(`[BAN] Blocked banned domain from topic admittance: domain=${serializeLogValue(domain)} protocol=${serializeLogValue(this.protocol)} txid=${serializeLogValue(txid)} outputIndex=${serializeLogValue(outputIndex)}`);
|
|
45
46
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BanAwareTopicManager.js","sourceRoot":"","sources":["../../../src/BanAwareTopicManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAC9D,OAAO,EAA0B,QAAQ,EAAE,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"BanAwareTopicManager.js","sourceRoot":"","sources":["../../../src/BanAwareTopicManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,8 +20,35 @@ export class BanService {
|
|
|
20
20
|
if (typeof value !== 'string') {
|
|
21
21
|
throw new TypeError('Invalid input: expected a string value');
|
|
22
22
|
}
|
|
23
|
+
if (value.length === 0 ||
|
|
24
|
+
new TextEncoder().encode(value).byteLength > 4096 ||
|
|
25
|
+
Array.from(value).some(character => {
|
|
26
|
+
const codePoint = character.codePointAt(0) ?? 0;
|
|
27
|
+
return codePoint <= 0x1f || codePoint === 0x7f;
|
|
28
|
+
})) {
|
|
29
|
+
throw new TypeError('Invalid input: expected a non-empty bounded string');
|
|
30
|
+
}
|
|
23
31
|
return value;
|
|
24
32
|
}
|
|
33
|
+
outpointValue(txid, outputIndex) {
|
|
34
|
+
const safeTxid = this.sanitize(txid);
|
|
35
|
+
if (!/^[0-9a-fA-F]{64}$/.test(safeTxid)) {
|
|
36
|
+
throw new TypeError('txid must be 32 bytes of hexadecimal data');
|
|
37
|
+
}
|
|
38
|
+
if (!Number.isSafeInteger(outputIndex) || outputIndex < 0 || outputIndex > 0xffffffff) {
|
|
39
|
+
throw new TypeError('outputIndex must be an unsigned 32-bit integer');
|
|
40
|
+
}
|
|
41
|
+
return `${safeTxid.toLowerCase()}.${String(outputIndex)}`;
|
|
42
|
+
}
|
|
43
|
+
validateOptionalText(value, label) {
|
|
44
|
+
if (value === undefined)
|
|
45
|
+
return undefined;
|
|
46
|
+
const text = this.sanitize(value);
|
|
47
|
+
if (new TextEncoder().encode(text).byteLength > 1024) {
|
|
48
|
+
throw new TypeError(`${label} must not exceed 1024 bytes`);
|
|
49
|
+
}
|
|
50
|
+
return text;
|
|
51
|
+
}
|
|
25
52
|
/**
|
|
26
53
|
* Creates indexes for efficient ban lookups.
|
|
27
54
|
*/
|
|
@@ -34,13 +61,15 @@ export class BanService {
|
|
|
34
61
|
*/
|
|
35
62
|
async banDomain(domain, reason, bannedBy) {
|
|
36
63
|
const safeDomain = this.sanitize(domain);
|
|
64
|
+
const safeReason = this.validateOptionalText(reason, 'reason');
|
|
65
|
+
const safeBannedBy = this.validateOptionalText(bannedBy, 'bannedBy');
|
|
37
66
|
await this.bans.updateOne({ type: 'domain', value: safeDomain }, {
|
|
38
67
|
$set: {
|
|
39
68
|
type: 'domain',
|
|
40
69
|
value: safeDomain,
|
|
41
|
-
reason:
|
|
70
|
+
reason: safeReason ?? 'Manually banned',
|
|
42
71
|
bannedAt: new Date(),
|
|
43
|
-
bannedBy
|
|
72
|
+
bannedBy: safeBannedBy
|
|
44
73
|
}
|
|
45
74
|
}, { upsert: true });
|
|
46
75
|
}
|
|
@@ -61,15 +90,18 @@ export class BanService {
|
|
|
61
90
|
* Bans a specific outpoint (txid.outputIndex), preventing it from being re-admitted.
|
|
62
91
|
*/
|
|
63
92
|
async banOutpoint(txid, outputIndex, reason, domain, bannedBy) {
|
|
64
|
-
const value =
|
|
93
|
+
const value = this.outpointValue(txid, outputIndex);
|
|
94
|
+
const safeDomain = domain === undefined ? undefined : this.sanitize(domain);
|
|
95
|
+
const safeReason = this.validateOptionalText(reason, 'reason');
|
|
96
|
+
const safeBannedBy = this.validateOptionalText(bannedBy, 'bannedBy');
|
|
65
97
|
await this.bans.updateOne({ type: 'outpoint', value }, {
|
|
66
98
|
$set: {
|
|
67
99
|
type: 'outpoint',
|
|
68
100
|
value,
|
|
69
|
-
domain:
|
|
70
|
-
reason:
|
|
101
|
+
domain: safeDomain,
|
|
102
|
+
reason: safeReason ?? 'Manually banned',
|
|
71
103
|
bannedAt: new Date(),
|
|
72
|
-
bannedBy
|
|
104
|
+
bannedBy: safeBannedBy
|
|
73
105
|
}
|
|
74
106
|
}, { upsert: true });
|
|
75
107
|
}
|
|
@@ -77,14 +109,14 @@ export class BanService {
|
|
|
77
109
|
* Removes an outpoint ban.
|
|
78
110
|
*/
|
|
79
111
|
async unbanOutpoint(txid, outputIndex) {
|
|
80
|
-
const value =
|
|
112
|
+
const value = this.outpointValue(txid, outputIndex);
|
|
81
113
|
await this.bans.deleteOne({ type: 'outpoint', value });
|
|
82
114
|
}
|
|
83
115
|
/**
|
|
84
116
|
* Checks if a specific outpoint is banned.
|
|
85
117
|
*/
|
|
86
118
|
async isOutpointBanned(txid, outputIndex) {
|
|
87
|
-
const value =
|
|
119
|
+
const value = this.outpointValue(txid, outputIndex);
|
|
88
120
|
const record = await this.bans.findOne({ type: 'outpoint', value });
|
|
89
121
|
return record !== null;
|
|
90
122
|
}
|
|
@@ -112,7 +144,17 @@ export class BanService {
|
|
|
112
144
|
* Removes a ban by type and value.
|
|
113
145
|
*/
|
|
114
146
|
async removeBan(type, value) {
|
|
115
|
-
|
|
147
|
+
if (type !== 'domain' && type !== 'outpoint')
|
|
148
|
+
throw new TypeError('Invalid ban type');
|
|
149
|
+
const safeValue = this.sanitize(value);
|
|
150
|
+
if (type === 'outpoint') {
|
|
151
|
+
const separator = safeValue.lastIndexOf('.');
|
|
152
|
+
if (separator !== 64 || !/^(0|[1-9]\d*)$/.test(safeValue.slice(separator + 1))) {
|
|
153
|
+
throw new TypeError('Invalid outpoint value');
|
|
154
|
+
}
|
|
155
|
+
this.outpointValue(safeValue.slice(0, separator), Number(safeValue.slice(separator + 1)));
|
|
156
|
+
}
|
|
157
|
+
await this.bans.deleteOne({ type, value: type === 'outpoint' ? safeValue.toLowerCase() : safeValue });
|
|
116
158
|
}
|
|
117
159
|
/**
|
|
118
160
|
* Returns ban statistics.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BanService.js","sourceRoot":"","sources":["../../../src/BanService.ts"],"names":[],"mappings":"AAoBA;;;;;;;GAOG;AACH,MAAM,OAAO,UAAU;IACJ,IAAI,CAA0B;IAE/C,YAAa,EAAM;QACjB,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC,UAAU,CAAe,eAAe,CAAC,CAAA;IAC1D,CAAC;IAED;;;;OAIG;IACK,QAAQ,CAAE,KAAc;QAC9B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,IAAI,SAAS,CAAC,wCAAwC,CAAC,CAAA;QAC/D,CAAC;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,aAAa;QACjB,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;QACpE,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;IAC/C,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,SAAS,CAAE,MAAc,EAAE,MAAe,EAAE,QAAiB;QACjE,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QACxC,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CACvB,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,EACrC;YACE,IAAI,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,UAAU;gBACjB,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"BanService.js","sourceRoot":"","sources":["../../../src/BanService.ts"],"names":[],"mappings":"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"}
|