helia 2.0.2 → 2.0.3-0749cbf

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.
Files changed (62) hide show
  1. package/dist/index.min.js +38 -59
  2. package/dist/src/block-brokers/bitswap-block-broker.d.ts +20 -0
  3. package/dist/src/block-brokers/bitswap-block-broker.d.ts.map +1 -0
  4. package/dist/src/block-brokers/bitswap-block-broker.js +39 -0
  5. package/dist/src/block-brokers/bitswap-block-broker.js.map +1 -0
  6. package/dist/src/block-brokers/index.d.ts +3 -0
  7. package/dist/src/block-brokers/index.d.ts.map +1 -0
  8. package/dist/src/block-brokers/index.js +3 -0
  9. package/dist/src/block-brokers/index.js.map +1 -0
  10. package/dist/src/block-brokers/trustless-gateway-block-broker.d.ts +15 -0
  11. package/dist/src/block-brokers/trustless-gateway-block-broker.d.ts.map +1 -0
  12. package/dist/src/block-brokers/trustless-gateway-block-broker.js +60 -0
  13. package/dist/src/block-brokers/trustless-gateway-block-broker.js.map +1 -0
  14. package/dist/src/helia.d.ts +0 -1
  15. package/dist/src/helia.d.ts.map +1 -1
  16. package/dist/src/helia.js +5 -26
  17. package/dist/src/helia.js.map +1 -1
  18. package/dist/src/index.d.ts +9 -10
  19. package/dist/src/index.d.ts.map +1 -1
  20. package/dist/src/index.js +33 -35
  21. package/dist/src/index.js.map +1 -1
  22. package/dist/src/storage.d.ts +7 -2
  23. package/dist/src/storage.d.ts.map +1 -1
  24. package/dist/src/storage.js +14 -0
  25. package/dist/src/storage.js.map +1 -1
  26. package/dist/src/utils/default-hashers.d.ts +3 -0
  27. package/dist/src/utils/default-hashers.d.ts.map +1 -0
  28. package/dist/src/utils/default-hashers.js +11 -0
  29. package/dist/src/utils/default-hashers.js.map +1 -0
  30. package/dist/src/utils/libp2p-defaults.browser.d.ts +7 -3
  31. package/dist/src/utils/libp2p-defaults.browser.d.ts.map +1 -1
  32. package/dist/src/utils/libp2p-defaults.browser.js +7 -5
  33. package/dist/src/utils/libp2p-defaults.browser.js.map +1 -1
  34. package/dist/src/utils/libp2p-defaults.d.ts +7 -3
  35. package/dist/src/utils/libp2p-defaults.d.ts.map +1 -1
  36. package/dist/src/utils/libp2p-defaults.js +11 -5
  37. package/dist/src/utils/libp2p-defaults.js.map +1 -1
  38. package/dist/src/utils/libp2p.d.ts +2 -8
  39. package/dist/src/utils/libp2p.d.ts.map +1 -1
  40. package/dist/src/utils/libp2p.js.map +1 -1
  41. package/dist/src/utils/networked-storage.d.ts +16 -9
  42. package/dist/src/utils/networked-storage.d.ts.map +1 -1
  43. package/dist/src/utils/networked-storage.js +93 -15
  44. package/dist/src/utils/networked-storage.js.map +1 -1
  45. package/dist/src/version.d.ts +1 -1
  46. package/dist/src/version.d.ts.map +1 -1
  47. package/dist/src/version.js +1 -1
  48. package/dist/src/version.js.map +1 -1
  49. package/package.json +30 -4
  50. package/src/block-brokers/bitswap-block-broker.ts +58 -0
  51. package/src/block-brokers/index.ts +2 -0
  52. package/src/block-brokers/trustless-gateway-block-broker.ts +78 -0
  53. package/src/helia.ts +5 -33
  54. package/src/index.ts +50 -41
  55. package/src/storage.ts +19 -2
  56. package/src/utils/default-hashers.ts +12 -0
  57. package/src/utils/libp2p-defaults.browser.ts +18 -7
  58. package/src/utils/libp2p-defaults.ts +24 -7
  59. package/src/utils/libp2p.ts +2 -5
  60. package/src/utils/networked-storage.ts +116 -23
  61. package/src/version.ts +1 -1
  62. package/dist/typedoc-urls.json +0 -8
@@ -14,6 +14,7 @@ import { autoNATService } from 'libp2p/autonat';
14
14
  import { circuitRelayTransport } from 'libp2p/circuit-relay';
15
15
  import { dcutrService } from 'libp2p/dcutr';
16
16
  import { identifyService } from 'libp2p/identify';
17
+ import { pingService } from 'libp2p/ping';
17
18
  import { bootstrapConfig } from './bootstrappers.js';
18
19
  export function libp2pDefaults() {
19
20
  return {
@@ -23,13 +24,13 @@ export function libp2pDefaults() {
23
24
  ]
24
25
  },
25
26
  transports: [
27
+ circuitRelayTransport({
28
+ discoverRelays: 1
29
+ }),
26
30
  webRTC(),
27
31
  webRTCDirect(),
28
32
  webTransport(),
29
- webSockets(),
30
- circuitRelayTransport({
31
- discoverRelays: 1
32
- })
33
+ webSockets()
33
34
  ],
34
35
  connectionEncryption: [
35
36
  noise()
@@ -57,7 +58,8 @@ export function libp2pDefaults() {
57
58
  selectors: {
58
59
  ipns: ipnsSelector
59
60
  }
60
- })
61
+ }),
62
+ ping: pingService()
61
63
  }
62
64
  };
63
65
  }
@@ -1 +1 @@
1
- {"version":3,"file":"libp2p-defaults.browser.js","sourceRoot":"","sources":["../../../src/utils/libp2p-defaults.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACjE,OAAO,EAAmB,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAIpD,MAAM,UAAU,cAAc;IAC5B,OAAO;QACL,SAAS,EAAE;YACT,MAAM,EAAE;gBACN,SAAS;aACV;SACF;QACD,UAAU,EAAE;YACV,MAAM,EAAE;YACR,YAAY,EAAE;YACd,YAAY,EAAE;YACd,UAAU,EAAE;YACZ,qBAAqB,CAAC;gBACpB,cAAc,EAAE,CAAC;aAClB,CAAC;SACH;QACD,oBAAoB,EAAE;YACpB,KAAK,EAAE;SACR;QACD,YAAY,EAAE;YACZ,KAAK,EAAE;YACP,KAAK,EAAE;SACR;QACD,aAAa,EAAE;YACb,SAAS,CAAC,eAAe,CAAC;SAC3B;QACD,cAAc,EAAE;YACd,kBAAkB,CAAC,qBAAqB,CAAC;SAC1C;QACD,QAAQ,EAAE;YACR,QAAQ,EAAE,eAAe,EAAE;YAC3B,OAAO,EAAE,cAAc,EAAE;YACzB,MAAM,EAAE,SAAS,EAAE;YACnB,KAAK,EAAE,YAAY,EAAE;YACrB,GAAG,EAAE,MAAM,CAAC;gBACV,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE;oBACV,IAAI,EAAE,aAAa;iBACpB;gBACD,SAAS,EAAE;oBACT,IAAI,EAAE,YAAY;iBACnB;aACF,CAAC;SACH;KACF,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"libp2p-defaults.browser.js","sourceRoot":"","sources":["../../../src/utils/libp2p-defaults.browser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACjE,OAAO,EAAmB,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACzD,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAwB,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACvE,OAAO,EAAE,WAAW,EAAoB,MAAM,aAAa,CAAA;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAapD,MAAM,UAAU,cAAc;IAC5B,OAAO;QACL,SAAS,EAAE;YACT,MAAM,EAAE;gBACN,SAAS;aACV;SACF;QACD,UAAU,EAAE;YACV,qBAAqB,CAAC;gBACpB,cAAc,EAAE,CAAC;aAClB,CAAC;YACF,MAAM,EAAE;YACR,YAAY,EAAE;YACd,YAAY,EAAE;YACd,UAAU,EAAE;SACb;QACD,oBAAoB,EAAE;YACpB,KAAK,EAAE;SACR;QACD,YAAY,EAAE;YACZ,KAAK,EAAE;YACP,KAAK,EAAE;SACR;QACD,aAAa,EAAE;YACb,SAAS,CAAC,eAAe,CAAC;SAC3B;QACD,cAAc,EAAE;YACd,kBAAkB,CAAC,qBAAqB,CAAC;SAC1C;QACD,QAAQ,EAAE;YACR,QAAQ,EAAE,eAAe,EAAE;YAC3B,OAAO,EAAE,cAAc,EAAE;YACzB,MAAM,EAAE,SAAS,EAAE;YACnB,KAAK,EAAE,YAAY,EAAE;YACrB,GAAG,EAAE,MAAM,CAAC;gBACV,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE;oBACV,IAAI,EAAE,aAAa;iBACpB;gBACD,SAAS,EAAE;oBACT,IAAI,EAAE,YAAY;iBACnB;aACF,CAAC;YACF,IAAI,EAAE,WAAW,EAAE;SACpB;KACF,CAAA;AACH,CAAC"}
@@ -1,14 +1,18 @@
1
1
  import { type DualKadDHT } from '@libp2p/kad-dht';
2
2
  import { type CircuitRelayService } from 'libp2p/circuit-relay';
3
+ import { type IdentifyService } from 'libp2p/identify';
4
+ import { type PingService } from 'libp2p/ping';
3
5
  import type { PubSub } from '@libp2p/interface/pubsub';
4
6
  import type { Libp2pOptions } from 'libp2p';
5
- export declare function libp2pDefaults(): Libp2pOptions<{
7
+ export interface DefaultLibp2pServices extends Record<string, unknown> {
6
8
  dht: DualKadDHT;
7
9
  pubsub: PubSub;
8
10
  relay: CircuitRelayService;
9
- identify: unknown;
11
+ identify: IdentifyService;
10
12
  autoNAT: unknown;
11
13
  upnp: unknown;
12
14
  dcutr: unknown;
13
- }>;
15
+ ping: PingService;
16
+ }
17
+ export declare function libp2pDefaults(): Libp2pOptions<DefaultLibp2pServices>;
14
18
  //# sourceMappingURL=libp2p-defaults.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"libp2p-defaults.d.ts","sourceRoot":"","sources":["../../../src/utils/libp2p-defaults.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,UAAU,EAAU,MAAM,iBAAiB,CAAA;AAQzD,OAAO,EAA6C,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAK1G,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AAE3C,wBAAgB,cAAc,IAAK,aAAa,CAAC;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,mBAAmB,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CA+CpL"}
1
+ {"version":3,"file":"libp2p-defaults.d.ts","sourceRoot":"","sources":["../../../src/utils/libp2p-defaults.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,UAAU,EAAU,MAAM,iBAAiB,CAAA;AASzD,OAAO,EAA6C,KAAK,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAE1G,OAAO,EAAE,KAAK,eAAe,EAAmB,MAAM,iBAAiB,CAAA;AACvE,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,aAAa,CAAA;AAG3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAA;AAE3C,MAAM,WAAW,qBAAsB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IACpE,GAAG,EAAE,UAAU,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,mBAAmB,CAAA;IAC1B,QAAQ,EAAE,eAAe,CAAA;IACzB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,OAAO,CAAA;IACb,KAAK,EAAE,OAAO,CAAA;IACd,IAAI,EAAE,WAAW,CAAA;CAClB;AAED,wBAAgB,cAAc,IAAK,aAAa,CAAC,qBAAqB,CAAC,CAmDtE"}
@@ -7,6 +7,7 @@ import { kadDHT } from '@libp2p/kad-dht';
7
7
  import { mdns } from '@libp2p/mdns';
8
8
  import { mplex } from '@libp2p/mplex';
9
9
  import { tcp } from '@libp2p/tcp';
10
+ import { webRTC, webRTCDirect } from '@libp2p/webrtc';
10
11
  import { webSockets } from '@libp2p/websockets';
11
12
  import { ipnsSelector } from 'ipns/selector';
12
13
  import { ipnsValidator } from 'ipns/validator';
@@ -14,21 +15,25 @@ import { autoNATService } from 'libp2p/autonat';
14
15
  import { circuitRelayTransport, circuitRelayServer } from 'libp2p/circuit-relay';
15
16
  import { dcutrService } from 'libp2p/dcutr';
16
17
  import { identifyService } from 'libp2p/identify';
18
+ import { pingService } from 'libp2p/ping';
17
19
  import { uPnPNATService } from 'libp2p/upnp-nat';
18
20
  import { bootstrapConfig } from './bootstrappers.js';
19
21
  export function libp2pDefaults() {
20
22
  return {
21
23
  addresses: {
22
24
  listen: [
23
- '/ip4/0.0.0.0/tcp/0'
25
+ '/ip4/0.0.0.0/tcp/0',
26
+ '/webrtc'
24
27
  ]
25
28
  },
26
29
  transports: [
27
- tcp(),
28
- webSockets(),
29
30
  circuitRelayTransport({
30
31
  discoverRelays: 1
31
- })
32
+ }),
33
+ tcp(),
34
+ webRTC(),
35
+ webRTCDirect(),
36
+ webSockets()
32
37
  ],
33
38
  connectionEncryption: [
34
39
  noise()
@@ -60,7 +65,8 @@ export function libp2pDefaults() {
60
65
  }),
61
66
  relay: circuitRelayServer({
62
67
  advertise: true
63
- })
68
+ }),
69
+ ping: pingService()
64
70
  }
65
71
  };
66
72
  }
@@ -1 +1 @@
1
- {"version":3,"file":"libp2p-defaults.js","sourceRoot":"","sources":["../../../src/utils/libp2p-defaults.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACjE,OAAO,EAAmB,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAA4B,MAAM,sBAAsB,CAAA;AAC1G,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAIpD,MAAM,UAAU,cAAc;IAC5B,OAAO;QACL,SAAS,EAAE;YACT,MAAM,EAAE;gBACN,oBAAoB;aACrB;SACF;QACD,UAAU,EAAE;YACV,GAAG,EAAE;YACL,UAAU,EAAE;YACZ,qBAAqB,CAAC;gBACpB,cAAc,EAAE,CAAC;aAClB,CAAC;SACH;QACD,oBAAoB,EAAE;YACpB,KAAK,EAAE;SACR;QACD,YAAY,EAAE;YACZ,KAAK,EAAE;YACP,KAAK,EAAE;SACR;QACD,aAAa,EAAE;YACb,IAAI,EAAE;YACN,SAAS,CAAC,eAAe,CAAC;SAC3B;QACD,cAAc,EAAE;YACd,kBAAkB,CAAC,qBAAqB,CAAC;SAC1C;QACD,QAAQ,EAAE;YACR,QAAQ,EAAE,eAAe,EAAE;YAC3B,OAAO,EAAE,cAAc,EAAE;YACzB,IAAI,EAAE,cAAc,EAAE;YACtB,MAAM,EAAE,SAAS,EAAE;YACnB,KAAK,EAAE,YAAY,EAAE;YACrB,GAAG,EAAE,MAAM,CAAC;gBACV,UAAU,EAAE;oBACV,IAAI,EAAE,aAAa;iBACpB;gBACD,SAAS,EAAE;oBACT,IAAI,EAAE,YAAY;iBACnB;aACF,CAAC;YACF,KAAK,EAAE,kBAAkB,CAAC;gBACxB,SAAS,EAAE,IAAI;aAChB,CAAC;SACH;KACF,CAAA;AACH,CAAC"}
1
+ {"version":3,"file":"libp2p-defaults.js","sourceRoot":"","sources":["../../../src/utils/libp2p-defaults.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAA;AACjE,OAAO,EAAmB,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AACjC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAA4B,MAAM,sBAAsB,CAAA;AAC1G,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAwB,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACvE,OAAO,EAAE,WAAW,EAAoB,MAAM,aAAa,CAAA;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAepD,MAAM,UAAU,cAAc;IAC5B,OAAO;QACL,SAAS,EAAE;YACT,MAAM,EAAE;gBACN,oBAAoB;gBACpB,SAAS;aACV;SACF;QACD,UAAU,EAAE;YACV,qBAAqB,CAAC;gBACpB,cAAc,EAAE,CAAC;aAClB,CAAC;YACF,GAAG,EAAE;YACL,MAAM,EAAE;YACR,YAAY,EAAE;YACd,UAAU,EAAE;SACb;QACD,oBAAoB,EAAE;YACpB,KAAK,EAAE;SACR;QACD,YAAY,EAAE;YACZ,KAAK,EAAE;YACP,KAAK,EAAE;SACR;QACD,aAAa,EAAE;YACb,IAAI,EAAE;YACN,SAAS,CAAC,eAAe,CAAC;SAC3B;QACD,cAAc,EAAE;YACd,kBAAkB,CAAC,qBAAqB,CAAC;SAC1C;QACD,QAAQ,EAAE;YACR,QAAQ,EAAE,eAAe,EAAE;YAC3B,OAAO,EAAE,cAAc,EAAE;YACzB,IAAI,EAAE,cAAc,EAAE;YACtB,MAAM,EAAE,SAAS,EAAE;YACnB,KAAK,EAAE,YAAY,EAAE;YACrB,GAAG,EAAE,MAAM,CAAC;gBACV,UAAU,EAAE;oBACV,IAAI,EAAE,aAAa;iBACpB;gBACD,SAAS,EAAE;oBACT,IAAI,EAAE,YAAY;iBACnB;aACF,CAAC;YACF,KAAK,EAAE,kBAAkB,CAAC;gBACxB,SAAS,EAAE,IAAI;aAChB,CAAC;YACF,IAAI,EAAE,WAAW,EAAE;SACpB;KACF,CAAA;AACH,CAAC"}
@@ -1,16 +1,10 @@
1
1
  import { type Libp2pOptions } from 'libp2p';
2
+ import { type DefaultLibp2pServices } from './libp2p-defaults.js';
2
3
  import type { Libp2p } from '@libp2p/interface';
3
- import type { PubSub } from '@libp2p/interface/pubsub';
4
- import type { DualKadDHT } from '@libp2p/kad-dht';
5
4
  import type { Datastore } from 'interface-datastore';
6
- import type { CircuitRelayService } from 'libp2p/circuit-relay';
7
5
  export interface CreateLibp2pOptions {
8
6
  datastore: Datastore;
9
7
  start?: boolean;
10
8
  }
11
- export declare function createLibp2p(datastore: Datastore, options?: Libp2pOptions<any>): Promise<Libp2p<{
12
- dht: DualKadDHT;
13
- pubsub: PubSub;
14
- relay: CircuitRelayService;
15
- }>>;
9
+ export declare function createLibp2p(datastore: Datastore, options?: Libp2pOptions<any>): Promise<Libp2p<DefaultLibp2pServices>>;
16
10
  //# sourceMappingURL=libp2p.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"libp2p.d.ts","sourceRoot":"","sources":["../../../src/utils/libp2p.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,aAAa,EAAE,MAAM,QAAQ,CAAA;AAEnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAE/D,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,SAAS,CAAA;IACpB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAED,wBAAsB,YAAY,CAAE,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,mBAAmB,CAAA;CAAE,CAAC,CAAC,CAUxK"}
1
+ {"version":3,"file":"libp2p.d.ts","sourceRoot":"","sources":["../../../src/utils/libp2p.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,aAAa,EAAE,MAAM,QAAQ,CAAA;AACnE,OAAO,EAAE,KAAK,qBAAqB,EAAkB,MAAM,sBAAsB,CAAA;AACjF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAEpD,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,SAAS,CAAA;IACpB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAED,wBAAsB,YAAY,CAAE,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAU9H"}
@@ -1 +1 @@
1
- {"version":3,"file":"libp2p.js","sourceRoot":"","sources":["../../../src/utils/libp2p.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,IAAI,MAAM,EAAsB,MAAM,QAAQ,CAAA;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAYrD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAE,SAAoB,EAAE,OAA4B;IACpF,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAA;IACjC,OAAO,GAAG,OAAO,IAAI,EAAE,CAAA;IAEvB,OAAO,MAAM,CAAC;QACZ,SAAS;QACT,GAAG,QAAQ;QACX,GAAG,OAAO;QACV,KAAK,EAAE,KAAK;KACb,CAAC,CAAA;AACJ,CAAC"}
1
+ {"version":3,"file":"libp2p.js","sourceRoot":"","sources":["../../../src/utils/libp2p.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,IAAI,MAAM,EAAsB,MAAM,QAAQ,CAAA;AACnE,OAAO,EAA8B,cAAc,EAAE,MAAM,sBAAsB,CAAA;AASjF,MAAM,CAAC,KAAK,UAAU,YAAY,CAAE,SAAoB,EAAE,OAA4B;IACpF,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAA;IACjC,OAAO,GAAG,OAAO,IAAI,EAAE,CAAA;IAEvB,OAAO,MAAM,CAAC;QACZ,SAAS;QACT,GAAG,QAAQ;QACX,GAAG,OAAO;QACV,KAAK,EAAE,KAAK;KACb,CAAC,CAAA;AACJ,CAAC"}
@@ -1,28 +1,35 @@
1
+ import { type Startable } from '@libp2p/interface/startable';
1
2
  import { type ProgressOptions } from 'progress-events';
2
- import type { Blocks, Pair, DeleteManyBlocksProgressEvents, DeleteBlockProgressEvents, GetBlockProgressEvents, GetManyBlocksProgressEvents, PutManyBlocksProgressEvents, PutBlockProgressEvents, GetAllBlocksProgressEvents, GetOfflineOptions } from '@helia/interface/blocks';
3
+ import type { BlockBroker, Blocks, Pair, DeleteManyBlocksProgressEvents, DeleteBlockProgressEvents, GetBlockProgressEvents, GetManyBlocksProgressEvents, PutManyBlocksProgressEvents, PutBlockProgressEvents, GetAllBlocksProgressEvents, GetOfflineOptions } from '@helia/interface/blocks';
3
4
  import type { AbortOptions } from '@libp2p/interface';
4
5
  import type { Blockstore } from 'interface-blockstore';
5
6
  import type { AwaitIterable } from 'interface-store';
6
- import type { Bitswap } from 'ipfs-bitswap';
7
7
  import type { CID } from 'multiformats/cid';
8
- export interface BlockStorageInit {
9
- holdGcLock?: boolean;
10
- bitswap?: Bitswap;
8
+ import type { MultihashHasher } from 'multiformats/hashes/interface';
9
+ export interface NetworkedStorageStorageInit {
10
+ blockBrokers?: BlockBroker[];
11
+ hashers?: MultihashHasher[];
11
12
  }
12
13
  export interface GetOptions extends AbortOptions {
13
- progress?: (evt: Event) => void;
14
+ progress?(evt: Event): void;
14
15
  }
15
16
  /**
16
17
  * Networked storage wraps a regular blockstore - when getting blocks if the
17
18
  * blocks are not present Bitswap will be used to fetch them from network peers.
18
19
  */
19
- export declare class NetworkedStorage implements Blocks {
20
+ export declare class NetworkedStorage implements Blocks, Startable {
20
21
  private readonly child;
21
- private readonly bitswap?;
22
+ private readonly blockRetrievers;
23
+ private readonly blockAnnouncers;
24
+ private readonly hashers;
25
+ private started;
22
26
  /**
23
27
  * Create a new BlockStorage
24
28
  */
25
- constructor(blockstore: Blockstore, options?: BlockStorageInit);
29
+ constructor(blockstore: Blockstore, init: NetworkedStorageStorageInit);
30
+ isStarted(): boolean;
31
+ start(): Promise<void>;
32
+ stop(): Promise<void>;
26
33
  unwrap(): Blockstore;
27
34
  /**
28
35
  * Put a block to the underlying datastore
@@ -1 +1 @@
1
- {"version":3,"file":"networked-storage.d.ts","sourceRoot":"","sources":["../../../src/utils/networked-storage.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAC3E,OAAO,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,8BAA8B,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,2BAA2B,EAAE,2BAA2B,EAAE,sBAAsB,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAC/Q,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAE3C,MAAM,WAAW,gBAAgB;IAC/B,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,UAAW,SAAQ,YAAY;IAC9C,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,CAAA;CAChC;AAED;;;GAGG;AACH,qBAAa,gBAAiB,YAAW,MAAM;IAC7C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAY;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAS;IAElC;;OAEG;gBACU,UAAU,EAAE,UAAU,EAAE,OAAO,GAAE,gBAAqB;IAKnE,MAAM,IAAK,UAAU;IAIrB;;OAEG;IACG,GAAG,CAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,GAAE,YAAY,GAAG,eAAe,CAAC,sBAAsB,CAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAgB3H;;OAEG;IACK,OAAO,CAAE,MAAM,EAAE,aAAa,CAAC;QAAE,GAAG,EAAE,GAAG,CAAC;QAAC,KAAK,EAAE,UAAU,CAAA;KAAE,CAAC,EAAE,OAAO,GAAE,YAAY,GAAG,eAAe,CAAC,2BAA2B,CAAM,GAAG,aAAa,CAAC,GAAG,CAAC;IAoBvK;;OAEG;IACG,GAAG,CAAE,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,iBAAiB,GAAG,YAAY,GAAG,eAAe,CAAC,sBAAsB,CAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAgBnI;;OAEG;IACK,OAAO,CAAE,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,OAAO,GAAE,iBAAiB,GAAG,YAAY,GAAG,eAAe,CAAC,2BAA2B,CAAM,GAAG,aAAa,CAAC,IAAI,CAAC;IAa9J;;OAEG;IACG,MAAM,CAAE,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,YAAY,GAAG,eAAe,CAAC,yBAAyB,CAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/G;;OAEG;IACK,UAAU,CAAE,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,OAAO,GAAE,YAAY,GAAG,eAAe,CAAC,8BAA8B,CAAM,GAAG,aAAa,CAAC,GAAG,CAAC;IASzI,GAAG,CAAE,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;IAI1D,MAAM,CAAE,OAAO,GAAE,YAAY,GAAG,eAAe,CAAC,0BAA0B,CAAM,GAAG,aAAa,CAAC,IAAI,CAAC;CAI/G"}
1
+ {"version":3,"file":"networked-storage.d.ts","sourceRoot":"","sources":["../../../src/utils/networked-storage.ts"],"names":[],"mappings":"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"}
@@ -1,19 +1,48 @@
1
+ import { CodeError } from '@libp2p/interface/errors';
2
+ import { start, stop } from '@libp2p/interface/startable';
3
+ import { logger } from '@libp2p/logger';
4
+ import { anySignal } from 'any-signal';
1
5
  import filter from 'it-filter';
2
6
  import forEach from 'it-foreach';
3
7
  import { CustomProgressEvent } from 'progress-events';
8
+ import { equals as uint8ArrayEquals } from 'uint8arrays/equals';
9
+ const log = logger('helia:networked-storage');
10
+ function isBlockRetriever(b) {
11
+ return typeof b.retrieve === 'function';
12
+ }
13
+ function isBlockAnnouncer(b) {
14
+ return typeof b.announce === 'function';
15
+ }
4
16
  /**
5
17
  * Networked storage wraps a regular blockstore - when getting blocks if the
6
18
  * blocks are not present Bitswap will be used to fetch them from network peers.
7
19
  */
8
20
  export class NetworkedStorage {
9
21
  child;
10
- bitswap;
22
+ blockRetrievers;
23
+ blockAnnouncers;
24
+ hashers;
25
+ started;
11
26
  /**
12
27
  * Create a new BlockStorage
13
28
  */
14
- constructor(blockstore, options = {}) {
29
+ constructor(blockstore, init) {
15
30
  this.child = blockstore;
16
- this.bitswap = options.bitswap;
31
+ this.blockRetrievers = (init.blockBrokers ?? []).filter(isBlockRetriever);
32
+ this.blockAnnouncers = (init.blockBrokers ?? []).filter(isBlockAnnouncer);
33
+ this.hashers = init.hashers ?? [];
34
+ this.started = false;
35
+ }
36
+ isStarted() {
37
+ return this.started;
38
+ }
39
+ async start() {
40
+ await start(this.child, ...new Set([...this.blockRetrievers, ...this.blockAnnouncers]));
41
+ this.started = true;
42
+ }
43
+ async stop() {
44
+ await stop(this.child, ...new Set([...this.blockRetrievers, ...this.blockAnnouncers]));
45
+ this.started = false;
17
46
  }
18
47
  unwrap() {
19
48
  return this.child;
@@ -26,10 +55,10 @@ export class NetworkedStorage {
26
55
  options.onProgress?.(new CustomProgressEvent('blocks:put:duplicate', cid));
27
56
  return cid;
28
57
  }
29
- if (this.bitswap?.isStarted() === true) {
30
- options.onProgress?.(new CustomProgressEvent('blocks:put:bitswap:notify', cid));
31
- this.bitswap.notify(cid, block, options);
32
- }
58
+ options.onProgress?.(new CustomProgressEvent('blocks:put:providers:notify', cid));
59
+ this.blockAnnouncers.forEach(provider => {
60
+ provider.announce(cid, block, options);
61
+ });
33
62
  options.onProgress?.(new CustomProgressEvent('blocks:put:blockstore:put', cid));
34
63
  return this.child.put(cid, block, options);
35
64
  }
@@ -45,8 +74,10 @@ export class NetworkedStorage {
45
74
  return !has;
46
75
  });
47
76
  const notifyEach = forEach(missingBlocks, ({ cid, block }) => {
48
- options.onProgress?.(new CustomProgressEvent('blocks:put-many:bitswap:notify', cid));
49
- this.bitswap?.notify(cid, block, options);
77
+ options.onProgress?.(new CustomProgressEvent('blocks:put-many:providers:notify', cid));
78
+ this.blockAnnouncers.forEach(provider => {
79
+ provider.announce(cid, block, options);
80
+ });
50
81
  });
51
82
  options.onProgress?.(new CustomProgressEvent('blocks:put-many:blockstore:put-many'));
52
83
  yield* this.child.putMany(notifyEach, options);
@@ -55,11 +86,17 @@ export class NetworkedStorage {
55
86
  * Get a block by cid
56
87
  */
57
88
  async get(cid, options = {}) {
58
- if (options.offline !== true && this.bitswap?.isStarted() != null && !(await this.child.has(cid))) {
59
- options.onProgress?.(new CustomProgressEvent('blocks:get:bitswap:get', cid));
60
- const block = await this.bitswap.want(cid, options);
89
+ if (options.offline !== true && !(await this.child.has(cid))) {
90
+ // we do not have the block locally, get it from a block provider
91
+ options.onProgress?.(new CustomProgressEvent('blocks:get:providers:get', cid));
92
+ const block = await raceBlockRetrievers(cid, this.blockRetrievers, this.hashers, options);
61
93
  options.onProgress?.(new CustomProgressEvent('blocks:get:blockstore:put', cid));
62
94
  await this.child.put(cid, block, options);
95
+ // notify other block providers of the new block
96
+ options.onProgress?.(new CustomProgressEvent('blocks:get:providers:notify', cid));
97
+ this.blockAnnouncers.forEach(provider => {
98
+ provider.announce(cid, block, options);
99
+ });
63
100
  return block;
64
101
  }
65
102
  options.onProgress?.(new CustomProgressEvent('blocks:get:blockstore:get', cid));
@@ -71,11 +108,17 @@ export class NetworkedStorage {
71
108
  async *getMany(cids, options = {}) {
72
109
  options.onProgress?.(new CustomProgressEvent('blocks:get-many:blockstore:get-many'));
73
110
  yield* this.child.getMany(forEach(cids, async (cid) => {
74
- if (options.offline !== true && this.bitswap?.isStarted() === true && !(await this.child.has(cid))) {
75
- options.onProgress?.(new CustomProgressEvent('blocks:get-many:bitswap:get', cid));
76
- const block = await this.bitswap.want(cid, options);
111
+ if (options.offline !== true && !(await this.child.has(cid))) {
112
+ // we do not have the block locally, get it from a block provider
113
+ options.onProgress?.(new CustomProgressEvent('blocks:get-many:providers:get', cid));
114
+ const block = await raceBlockRetrievers(cid, this.blockRetrievers, this.hashers, options);
77
115
  options.onProgress?.(new CustomProgressEvent('blocks:get-many:blockstore:put', cid));
78
116
  await this.child.put(cid, block, options);
117
+ // notify other block providers of the new block
118
+ options.onProgress?.(new CustomProgressEvent('blocks:get-many:providers:notify', cid));
119
+ this.blockAnnouncers.forEach(provider => {
120
+ provider.announce(cid, block, options);
121
+ });
79
122
  }
80
123
  }));
81
124
  }
@@ -105,4 +148,39 @@ export class NetworkedStorage {
105
148
  yield* this.child.getAll(options);
106
149
  }
107
150
  }
151
+ /**
152
+ * Race block providers cancelling any pending requests once the block has been
153
+ * found.
154
+ */
155
+ async function raceBlockRetrievers(cid, providers, hashers, options) {
156
+ const hasher = hashers.find(hasher => hasher.code === cid.multihash.code);
157
+ if (hasher == null) {
158
+ throw new CodeError(`No hasher configured for multihash code 0x${cid.multihash.code.toString(16)}, please configure one. You can look up which hash this is at https://github.com/multiformats/multicodec/blob/master/table.csv`, 'ERR_UNKNOWN_HASH_ALG');
159
+ }
160
+ const controller = new AbortController();
161
+ const signal = anySignal([controller.signal, options.signal]);
162
+ try {
163
+ return await Promise.any(providers.map(async (provider) => {
164
+ try {
165
+ const block = await provider.retrieve(cid, {
166
+ ...options,
167
+ signal
168
+ });
169
+ // verify block
170
+ const hash = await hasher.digest(block);
171
+ if (!uint8ArrayEquals(hash.digest, cid.multihash.digest)) {
172
+ throw new CodeError('Hash of downloaded block did not match multihash from passed CID', 'ERR_HASH_MISMATCH');
173
+ }
174
+ return block;
175
+ }
176
+ catch (err) {
177
+ log.error('could not retrieve block for %c', cid, err);
178
+ throw err;
179
+ }
180
+ }));
181
+ }
182
+ finally {
183
+ signal.clear();
184
+ }
185
+ }
108
186
  //# sourceMappingURL=networked-storage.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"networked-storage.js","sourceRoot":"","sources":["../../../src/utils/networked-storage.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"networked-storage.js","sourceRoot":"","sources":["../../../src/utils/networked-storage.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
- export declare const version = "2.0.2";
1
+ export declare const version = "2.0.3-0749cbf";
2
2
  export declare const name = "helia";
3
3
  //# sourceMappingURL=version.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,UAAU,CAAA;AAC9B,eAAO,MAAM,IAAI,UAAU,CAAA"}
1
+ {"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,kBAAkB,CAAA;AACtC,eAAO,MAAM,IAAI,UAAU,CAAA"}
@@ -1,3 +1,3 @@
1
- export const version = '2.0.2';
1
+ export const version = '2.0.3-0749cbf';
2
2
  export const name = 'helia';
3
3
  //# sourceMappingURL=version.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAA;AAC9B,MAAM,CAAC,MAAM,IAAI,GAAG,OAAO,CAAA"}
1
+ {"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,eAAe,CAAA;AACtC,MAAM,CAAC,MAAM,IAAI,GAAG,OAAO,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "helia",
3
- "version": "2.0.2",
3
+ "version": "2.0.3-0749cbf",
4
4
  "description": "An implementation of IPFS in JavaScript",
5
5
  "license": "Apache-2.0 OR MIT",
6
6
  "homepage": "https://github.com/ipfs/helia/tree/master/packages/helia#readme",
@@ -16,6 +16,22 @@
16
16
  ],
17
17
  "type": "module",
18
18
  "types": "./dist/src/index.d.ts",
19
+ "typesVersions": {
20
+ "*": {
21
+ "*": [
22
+ "*",
23
+ "dist/*",
24
+ "dist/src/*",
25
+ "dist/src/*/index"
26
+ ],
27
+ "src/*": [
28
+ "*",
29
+ "dist/*",
30
+ "dist/src/*",
31
+ "dist/src/*/index"
32
+ ]
33
+ }
34
+ },
19
35
  "files": [
20
36
  "src",
21
37
  "dist",
@@ -26,11 +42,20 @@
26
42
  ".": {
27
43
  "types": "./dist/src/index.d.ts",
28
44
  "import": "./dist/src/index.js"
45
+ },
46
+ "./block-brokers": {
47
+ "types": "./dist/src/block-brokers/index.d.ts",
48
+ "import": "./dist/src/block-brokers/index.js"
49
+ },
50
+ "./hashers": {
51
+ "types": "./dist/src/utils/default-hashers.d.ts",
52
+ "import": "./dist/src/utils/default-hashers.js"
29
53
  }
30
54
  },
31
55
  "eslintConfig": {
32
56
  "extends": "ipfs",
33
57
  "parserOptions": {
58
+ "project": true,
34
59
  "sourceType": "module"
35
60
  }
36
61
  },
@@ -52,7 +77,7 @@
52
77
  "@chainsafe/libp2p-gossipsub": "^10.0.0",
53
78
  "@chainsafe/libp2p-noise": "^13.0.0",
54
79
  "@chainsafe/libp2p-yamux": "^5.0.0",
55
- "@helia/interface": "^2.0.0",
80
+ "@helia/interface": "2.0.0-0749cbf",
56
81
  "@ipld/dag-cbor": "^9.0.0",
57
82
  "@ipld/dag-json": "^10.0.1",
58
83
  "@ipld/dag-pb": "^4.0.3",
@@ -67,6 +92,7 @@
67
92
  "@libp2p/webrtc": "^3.1.3",
68
93
  "@libp2p/websockets": "^7.0.2",
69
94
  "@libp2p/webtransport": "^3.0.3",
95
+ "any-signal": "^4.1.1",
70
96
  "blockstore-core": "^4.0.0",
71
97
  "cborg": "^4.0.1",
72
98
  "datastore-core": "^9.0.0",
@@ -74,7 +100,7 @@
74
100
  "interface-datastore": "^8.0.0",
75
101
  "interface-store": "^5.0.1",
76
102
  "ipfs-bitswap": "^19.0.0",
77
- "ipns": "^6.0.0",
103
+ "ipns": "^7.0.1",
78
104
  "it-all": "^3.0.2",
79
105
  "it-drain": "^3.0.1",
80
106
  "it-filter": "^3.0.1",
@@ -91,7 +117,7 @@
91
117
  "@multiformats/mafmt": "^12.1.5",
92
118
  "@multiformats/multiaddr": "^12.1.7",
93
119
  "@types/sinon": "^10.0.14",
94
- "aegir": "^40.0.8",
120
+ "aegir": "^41.0.0",
95
121
  "delay": "^6.0.0",
96
122
  "sinon": "^16.0.0",
97
123
  "sinon-ts": "^1.0.0"
@@ -0,0 +1,58 @@
1
+ import { createBitswap } from 'ipfs-bitswap'
2
+ import type { BlockAnnouncer, BlockRetriever } from '@helia/interface/blocks'
3
+ import type { Libp2p } from '@libp2p/interface'
4
+ import type { Startable } from '@libp2p/interface/startable'
5
+ import type { Blockstore } from 'interface-blockstore'
6
+ import type { AbortOptions } from 'interface-store'
7
+ import type { Bitswap, BitswapNotifyProgressEvents, BitswapWantBlockProgressEvents } from 'ipfs-bitswap'
8
+ import type { CID } from 'multiformats/cid'
9
+ import type { MultihashHasher } from 'multiformats/hashes/interface'
10
+ import type { ProgressOptions } from 'progress-events'
11
+
12
+ export class BitswapBlockBroker implements BlockAnnouncer<ProgressOptions<BitswapNotifyProgressEvents>>, BlockRetriever<
13
+ ProgressOptions<BitswapWantBlockProgressEvents>
14
+ >, Startable {
15
+ private readonly bitswap: Bitswap
16
+ private started: boolean
17
+
18
+ constructor (libp2p: Libp2p, blockstore: Blockstore, hashers: MultihashHasher[]) {
19
+ this.bitswap = createBitswap(libp2p, blockstore, {
20
+ hashLoader: {
21
+ getHasher: async (codecOrName: string | number): Promise<MultihashHasher<number>> => {
22
+ const hasher = hashers.find(hasher => {
23
+ return hasher.code === codecOrName || hasher.name === codecOrName
24
+ })
25
+
26
+ if (hasher != null) {
27
+ return hasher
28
+ }
29
+
30
+ throw new Error(`Could not load hasher for code/name "${codecOrName}"`)
31
+ }
32
+ }
33
+ })
34
+ this.started = false
35
+ }
36
+
37
+ isStarted (): boolean {
38
+ return this.started
39
+ }
40
+
41
+ async start (): Promise<void> {
42
+ await this.bitswap.start()
43
+ this.started = true
44
+ }
45
+
46
+ async stop (): Promise<void> {
47
+ await this.bitswap.stop()
48
+ this.started = false
49
+ }
50
+
51
+ announce (cid: CID, block: Uint8Array, options?: ProgressOptions<BitswapNotifyProgressEvents>): void {
52
+ this.bitswap.notify(cid, block, options)
53
+ }
54
+
55
+ async retrieve (cid: CID, options?: AbortOptions & ProgressOptions<BitswapWantBlockProgressEvents>): Promise<Uint8Array> {
56
+ return this.bitswap.want(cid, options)
57
+ }
58
+ }
@@ -0,0 +1,2 @@
1
+ export { BitswapBlockBroker } from './bitswap-block-broker.js'
2
+ export { TrustedGatewayBlockBroker } from './trustless-gateway-block-broker.js'