@helia/block-brokers 4.1.0-daaa511 → 4.2.0-d43efc7
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/dist/index.min.js +2 -1
- package/dist/index.min.js.map +7 -0
- package/dist/src/trustless-gateway/session.d.ts +4 -2
- package/dist/src/trustless-gateway/session.d.ts.map +1 -1
- package/dist/src/trustless-gateway/session.js +22 -1
- package/dist/src/trustless-gateway/session.js.map +1 -1
- package/dist/src/trustless-gateway/utils.d.ts +2 -1
- package/dist/src/trustless-gateway/utils.d.ts.map +1 -1
- package/dist/src/trustless-gateway/utils.js.map +1 -1
- package/package.json +7 -7
- package/src/trustless-gateway/session.ts +30 -3
- package/src/trustless-gateway/utils.ts +2 -1
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { AbstractSession } from '@helia/utils';
|
|
2
|
+
import { TrustlessGateway } from './trustless-gateway.js';
|
|
2
3
|
import type { CreateTrustlessGatewaySessionOptions } from './broker.js';
|
|
3
4
|
import type { TrustlessGatewayGetBlockProgressEvents } from './index.js';
|
|
4
|
-
import type { TrustlessGateway } from './trustless-gateway.js';
|
|
5
5
|
import type { BlockRetrievalOptions, Routing } from '@helia/interface';
|
|
6
|
-
import type { ComponentLogger } from '@libp2p/interface';
|
|
6
|
+
import type { ComponentLogger, PeerId } from '@libp2p/interface';
|
|
7
|
+
import type { Multiaddr } from '@multiformats/multiaddr';
|
|
7
8
|
import type { AbortOptions } from 'interface-store';
|
|
8
9
|
import type { CID } from 'multiformats/cid';
|
|
9
10
|
export interface TrustlessGatewaySessionComponents {
|
|
@@ -20,6 +21,7 @@ declare class TrustlessGatewaySession extends AbstractSession<TrustlessGateway,
|
|
|
20
21
|
findNewProviders(cid: CID, options?: AbortOptions): AsyncGenerator<TrustlessGateway>;
|
|
21
22
|
toEvictionKey(provider: TrustlessGateway): Uint8Array | string;
|
|
22
23
|
equals(providerA: TrustlessGateway, providerB: TrustlessGateway): boolean;
|
|
24
|
+
convertToProvider(provider: PeerId | Multiaddr | Multiaddr[], options?: AbortOptions): Promise<TrustlessGateway | undefined>;
|
|
23
25
|
}
|
|
24
26
|
export declare function createTrustlessGatewaySession(components: TrustlessGatewaySessionComponents, init: CreateTrustlessGatewaySessionOptions): TrustlessGatewaySession;
|
|
25
27
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/trustless-gateway/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAG9C,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,aAAa,CAAA;AACvE,OAAO,KAAK,EAAE,sCAAsC,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/trustless-gateway/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAG9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAGzD,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,aAAa,CAAA;AACvE,OAAO,KAAK,EAAE,sCAAsC,EAAE,MAAM,YAAY,CAAA;AAExE,OAAO,KAAK,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAE3C,MAAM,WAAW,iCAAiC;IAChD,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,EAAE,OAAO,CAAA;CACjB;AAED,cAAM,uBAAwB,SAAQ,eAAe,CAAC,gBAAgB,EAAE,sCAAsC,CAAC;IAC7G,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAsB;gBAE/C,UAAU,EAAE,iCAAiC,EAAE,IAAI,EAAE,oCAAoC;IAYhG,aAAa,CAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,UAAU,CAAC;IAWvG,gBAAgB,CAAE,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,YAAiB,GAAG,cAAc,CAAC,gBAAgB,CAAC;IAIjG,aAAa,CAAE,QAAQ,EAAE,gBAAgB,GAAG,UAAU,GAAG,MAAM;IAI/D,MAAM,CAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,GAAG,OAAO;IAIpE,iBAAiB,CAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,EAAE,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;CAsBpI;AAED,wBAAgB,6BAA6B,CAAE,UAAU,EAAE,iCAAiC,EAAE,IAAI,EAAE,oCAAoC,GAAG,uBAAuB,CAEjK"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { AbstractSession } from '@helia/utils';
|
|
2
|
-
import {
|
|
2
|
+
import { isPeerId } from '@libp2p/interface';
|
|
3
|
+
import { multiaddrToUri } from '@multiformats/multiaddr-to-uri';
|
|
4
|
+
import { TrustlessGateway } from './trustless-gateway.js';
|
|
5
|
+
import { filterNonHTTPMultiaddrs, findHttpGatewayProviders } from './utils.js';
|
|
3
6
|
import { DEFAULT_ALLOW_INSECURE, DEFAULT_ALLOW_LOCAL } from './index.js';
|
|
4
7
|
class TrustlessGatewaySession extends AbstractSession {
|
|
5
8
|
routing;
|
|
@@ -32,6 +35,24 @@ class TrustlessGatewaySession extends AbstractSession {
|
|
|
32
35
|
equals(providerA, providerB) {
|
|
33
36
|
return providerA.url.toString() === providerB.url.toString();
|
|
34
37
|
}
|
|
38
|
+
async convertToProvider(provider, options) {
|
|
39
|
+
if (isPeerId(provider)) {
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
42
|
+
const httpAddresses = filterNonHTTPMultiaddrs(Array.isArray(provider) ? provider : [provider], this.allowInsecure, this.allowLocal);
|
|
43
|
+
if (httpAddresses.length === 0) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
// take first address?
|
|
47
|
+
// /ip4/x.x.x.x/tcp/31337/http
|
|
48
|
+
// /ip4/x.x.x.x/tcp/31337/https
|
|
49
|
+
// etc
|
|
50
|
+
const uri = multiaddrToUri(httpAddresses[0]);
|
|
51
|
+
return new TrustlessGateway(uri, {
|
|
52
|
+
logger: this.logger,
|
|
53
|
+
transformRequestInit: this.transformRequestInit
|
|
54
|
+
});
|
|
55
|
+
}
|
|
35
56
|
}
|
|
36
57
|
export function createTrustlessGatewaySession(components, init) {
|
|
37
58
|
return new TrustlessGatewaySession(components, init);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/trustless-gateway/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/trustless-gateway/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { TrustlessGateway
|
|
1
|
+
import { TrustlessGateway } from './trustless-gateway.js';
|
|
2
|
+
import type { TransformRequestInit } from './trustless-gateway.js';
|
|
2
3
|
import type { Routing } from '@helia/interface';
|
|
3
4
|
import type { ComponentLogger } from '@libp2p/interface';
|
|
4
5
|
import type { AbortOptions, Multiaddr } from '@multiformats/multiaddr';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/trustless-gateway/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,KAAK,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/trustless-gateway/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAClE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACtE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAE3C,wBAAgB,uBAAuB,CAAE,UAAU,EAAE,SAAS,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,GAAG,SAAS,EAAE,CAwB1H;AAED,MAAM,WAAW,+BAAgC,SAAQ,YAAY;IACnE,oBAAoB,CAAC,EAAE,oBAAoB,CAAA;CAC5C;AAED,wBAAwB,wBAAwB,CAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,GAAE,+BAAoC,GAAG,cAAc,CAAC,gBAAgB,CAAC,CAiBnO"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/trustless-gateway/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAA;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AAC/D,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/trustless-gateway/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAA;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAA;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAOzD,MAAM,UAAU,uBAAuB,CAAE,UAAuB,EAAE,aAAsB,EAAE,UAAmB;IAC3G,OAAO,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;QAC5B,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YAC7D,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,IAAI,CAAA;YACb,CAAC;YAED,IAAI,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC;gBACpB,OAAO,IAAI,CAAA;YACb,CAAC;YAED,OAAO,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,CAAA;QACnD,CAAC;QAED,gJAAgJ;QAChJ,IAAI,CAAC,aAAa,IAAI,UAAU,EAAE,CAAC;YACjC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,CAAA;YAC/B,IAAI,IAAI,KAAK,WAAW,IAAI,IAAI,KAAK,WAAW,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;gBAChF,OAAO,IAAI,CAAA;YACb,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC,CAAC,CAAA;AACJ,CAAC;AAMD,MAAM,CAAC,KAAK,SAAU,CAAC,CAAC,wBAAwB,CAAE,GAAQ,EAAE,OAAgB,EAAE,MAAuB,EAAE,aAAsB,EAAE,UAAmB,EAAE,UAA2C,EAAE;IAC/L,IAAI,KAAK,EAAE,MAAM,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC;QACjE,4BAA4B;QAC5B,MAAM,aAAa,GAAG,uBAAuB,CAAC,QAAQ,CAAC,UAAU,EAAE,aAAa,EAAE,UAAU,CAAC,CAAA;QAE7F,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,SAAQ;QACV,CAAC;QAED,sBAAsB;QACtB,8BAA8B;QAC9B,+BAA+B;QAC/B,MAAM;QACN,MAAM,GAAG,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;QAE5C,MAAM,IAAI,gBAAgB,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,oBAAoB,EAAE,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAA;IACjG,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@helia/block-brokers",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.2.0-d43efc7",
|
|
4
4
|
"description": "Block brokers for Helia",
|
|
5
5
|
"license": "Apache-2.0 OR MIT",
|
|
6
6
|
"homepage": "https://github.com/ipfs/helia/tree/main/packages/block-brokers#readme",
|
|
@@ -54,9 +54,9 @@
|
|
|
54
54
|
"test:electron-main": "aegir test -t electron-main"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@helia/bitswap": "2.0
|
|
58
|
-
"@helia/interface": "5.
|
|
59
|
-
"@helia/utils": "1.
|
|
57
|
+
"@helia/bitswap": "2.1.0-d43efc7",
|
|
58
|
+
"@helia/interface": "5.3.0-d43efc7",
|
|
59
|
+
"@helia/utils": "1.3.0-d43efc7",
|
|
60
60
|
"@libp2p/interface": "^2.2.1",
|
|
61
61
|
"@libp2p/utils": "^6.2.1",
|
|
62
62
|
"@multiformats/multiaddr": "^12.3.3",
|
|
@@ -71,13 +71,13 @@
|
|
|
71
71
|
"@libp2p/crypto": "^5.0.7",
|
|
72
72
|
"@libp2p/logger": "^5.1.4",
|
|
73
73
|
"@libp2p/peer-id": "^5.0.8",
|
|
74
|
-
"@multiformats/uri-to-multiaddr": "^
|
|
74
|
+
"@multiformats/uri-to-multiaddr": "^9.0.1",
|
|
75
75
|
"@types/polka": "^0.5.7",
|
|
76
76
|
"@types/sinon": "^17.0.3",
|
|
77
|
-
"aegir": "^
|
|
77
|
+
"aegir": "^46.0.1",
|
|
78
78
|
"cors": "^2.8.5",
|
|
79
79
|
"polka": "^0.5.2",
|
|
80
|
-
"sinon": "^
|
|
80
|
+
"sinon": "^20.0.0",
|
|
81
81
|
"sinon-ts": "^2.0.0",
|
|
82
82
|
"uint8arrays": "^5.1.0"
|
|
83
83
|
}
|
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
import { AbstractSession } from '@helia/utils'
|
|
2
|
-
import {
|
|
2
|
+
import { isPeerId } from '@libp2p/interface'
|
|
3
|
+
import { multiaddrToUri } from '@multiformats/multiaddr-to-uri'
|
|
4
|
+
import { TrustlessGateway } from './trustless-gateway.js'
|
|
5
|
+
import { filterNonHTTPMultiaddrs, findHttpGatewayProviders } from './utils.js'
|
|
3
6
|
import { DEFAULT_ALLOW_INSECURE, DEFAULT_ALLOW_LOCAL } from './index.js'
|
|
4
7
|
import type { CreateTrustlessGatewaySessionOptions } from './broker.js'
|
|
5
8
|
import type { TrustlessGatewayGetBlockProgressEvents } from './index.js'
|
|
6
|
-
import type { TransformRequestInit
|
|
9
|
+
import type { TransformRequestInit } from './trustless-gateway.js'
|
|
7
10
|
import type { BlockRetrievalOptions, Routing } from '@helia/interface'
|
|
8
|
-
import type { ComponentLogger } from '@libp2p/interface'
|
|
11
|
+
import type { ComponentLogger, PeerId } from '@libp2p/interface'
|
|
12
|
+
import type { Multiaddr } from '@multiformats/multiaddr'
|
|
9
13
|
import type { AbortOptions } from 'interface-store'
|
|
10
14
|
import type { CID } from 'multiformats/cid'
|
|
11
15
|
|
|
@@ -54,6 +58,29 @@ class TrustlessGatewaySession extends AbstractSession<TrustlessGateway, Trustles
|
|
|
54
58
|
equals (providerA: TrustlessGateway, providerB: TrustlessGateway): boolean {
|
|
55
59
|
return providerA.url.toString() === providerB.url.toString()
|
|
56
60
|
}
|
|
61
|
+
|
|
62
|
+
async convertToProvider (provider: PeerId | Multiaddr | Multiaddr[], options?: AbortOptions): Promise<TrustlessGateway | undefined> {
|
|
63
|
+
if (isPeerId(provider)) {
|
|
64
|
+
return
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
const httpAddresses = filterNonHTTPMultiaddrs(Array.isArray(provider) ? provider : [provider], this.allowInsecure, this.allowLocal)
|
|
68
|
+
|
|
69
|
+
if (httpAddresses.length === 0) {
|
|
70
|
+
return
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
// take first address?
|
|
74
|
+
// /ip4/x.x.x.x/tcp/31337/http
|
|
75
|
+
// /ip4/x.x.x.x/tcp/31337/https
|
|
76
|
+
// etc
|
|
77
|
+
const uri = multiaddrToUri(httpAddresses[0])
|
|
78
|
+
|
|
79
|
+
return new TrustlessGateway(uri, {
|
|
80
|
+
logger: this.logger,
|
|
81
|
+
transformRequestInit: this.transformRequestInit
|
|
82
|
+
})
|
|
83
|
+
}
|
|
57
84
|
}
|
|
58
85
|
|
|
59
86
|
export function createTrustlessGatewaySession (components: TrustlessGatewaySessionComponents, init: CreateTrustlessGatewaySessionOptions): TrustlessGatewaySession {
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { isPrivateIp } from '@libp2p/utils/private-ip'
|
|
2
2
|
import { DNS, HTTP, HTTPS } from '@multiformats/multiaddr-matcher'
|
|
3
3
|
import { multiaddrToUri } from '@multiformats/multiaddr-to-uri'
|
|
4
|
-
import { TrustlessGateway
|
|
4
|
+
import { TrustlessGateway } from './trustless-gateway.js'
|
|
5
|
+
import type { TransformRequestInit } from './trustless-gateway.js'
|
|
5
6
|
import type { Routing } from '@helia/interface'
|
|
6
7
|
import type { ComponentLogger } from '@libp2p/interface'
|
|
7
8
|
import type { AbortOptions, Multiaddr } from '@multiformats/multiaddr'
|