@libp2p/plaintext 2.0.29 → 3.0.0-049bfa0fa

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.
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAQH,OAAO,KAAK,EAAE,eAAe,EAA+B,mBAAmB,EAAqB,UAAU,EAA4C,MAAM,mBAAmB,CAAA;AAInL,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,eAAe,CAAA;CACxB;AA0FD,wBAAgB,SAAS,IAAK,CAAC,UAAU,EAAE,mBAAmB,KAAK,mBAAmB,CAErF"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAQH,OAAO,KAAK,EAAE,eAAe,EAAU,mBAAmB,EAAqB,UAAU,EAA0C,MAAM,mBAAmB,CAAA;AAI5J,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,eAAe,CAAA;CACxB;AAuFD,wBAAgB,SAAS,IAAK,CAAC,UAAU,EAAE,mBAAmB,KAAK,mBAAmB,CAErF"}
package/dist/src/index.js CHANGED
@@ -23,7 +23,7 @@
23
23
  import { publicKeyFromRaw } from '@libp2p/crypto/keys';
24
24
  import { UnexpectedPeerError, InvalidCryptoExchangeError, serviceCapabilities, ProtocolError } from '@libp2p/interface';
25
25
  import { peerIdFromPublicKey } from '@libp2p/peer-id';
26
- import { pbStream } from 'it-protobuf-stream';
26
+ import { pbStream } from '@libp2p/utils';
27
27
  import { equals as uint8ArrayEquals } from 'uint8arrays/equals';
28
28
  import { Exchange, KeyType } from './pb/proto.js';
29
29
  const PROTOCOL = '/plaintext/2.0.0';
@@ -39,32 +39,30 @@ class Plaintext {
39
39
  [serviceCapabilities] = [
40
40
  '@libp2p/connection-encryption'
41
41
  ];
42
- async secureInbound(conn, options) {
43
- return this._encrypt(conn, options);
42
+ async secureInbound(connection, options) {
43
+ return this._encrypt(connection, options);
44
44
  }
45
- async secureOutbound(conn, options) {
46
- return this._encrypt(conn, options);
45
+ async secureOutbound(connection, options) {
46
+ return this._encrypt(connection, options);
47
47
  }
48
48
  /**
49
49
  * Encrypt connection
50
50
  */
51
- async _encrypt(conn, options) {
52
- const log = conn.log?.newScope('plaintext') ?? this.log;
53
- const pb = pbStream(conn).pb(Exchange);
51
+ async _encrypt(connection, options) {
52
+ const log = connection.log?.newScope('plaintext') ?? this.log;
53
+ const pb = pbStream(connection).pb(Exchange);
54
54
  log('write pubkey exchange to peer %p', options?.remotePeer);
55
55
  const publicKey = this.privateKey.publicKey;
56
- const [, response] = await Promise.all([
57
- // Encode the public key and write it to the remote peer
58
- pb.write({
59
- id: publicKey.toMultihash().bytes,
60
- pubkey: {
61
- Type: KeyType[publicKey.type],
62
- Data: publicKey.raw
63
- }
64
- }, options),
65
- // Get the Exchange message
66
- pb.read(options)
67
- ]);
56
+ // Encode the public key and write it to the remote peer
57
+ await pb.write({
58
+ id: publicKey.toMultihash().bytes,
59
+ pubkey: {
60
+ Type: KeyType[publicKey.type],
61
+ Data: publicKey.raw
62
+ }
63
+ }, options);
64
+ // Get the Exchange message
65
+ const response = await pb.read(options);
68
66
  let peerId;
69
67
  try {
70
68
  if (response.pubkey == null) {
@@ -91,7 +89,7 @@ class Plaintext {
91
89
  }
92
90
  log('plaintext key exchange completed successfully with peer %p', peerId);
93
91
  return {
94
- conn: pb.unwrap().unwrap(),
92
+ connection: pb.unwrap().unwrap(),
95
93
  remotePeer: peerId
96
94
  };
97
95
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACvH,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC7C,OAAO,EAAE,MAAM,IAAI,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAC/D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAGjD,MAAM,QAAQ,GAAG,kBAAkB,CAAA;AAOnC,MAAM,SAAS;IACN,QAAQ,GAAW,QAAQ,CAAA;IACjB,UAAU,CAAY;IACtB,GAAG,CAAQ;IAE5B,YAAa,UAA+B;QAC1C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,CAAA;QACvC,IAAI,CAAC,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAA;IAC/D,CAAC;IAEQ,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,mBAAmB,CAAA;IAE1C,CAAC,mBAAmB,CAAC,GAAa;QACzC,+BAA+B;KAChC,CAAA;IAED,KAAK,CAAC,aAAa,CAAuD,IAAY,EAAE,OAAiC;QACvH,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IACrC,CAAC;IAED,KAAK,CAAC,cAAc,CAAuD,IAAY,EAAE,OAAiC;QACxH,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;IACrC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,QAAQ,CAAuD,IAAY,EAAE,OAAiC;QAClH,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,GAAG,CAAA;QACvD,MAAM,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAA;QAEtC,GAAG,CAAC,kCAAkC,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;QAE5D,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAA;QAE3C,MAAM,CACJ,AADK,EACH,QAAQ,CACX,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpB,wDAAwD;YACxD,EAAE,CAAC,KAAK,CAAC;gBACP,EAAE,EAAE,SAAS,CAAC,WAAW,EAAE,CAAC,KAAK;gBACjC,MAAM,EAAE;oBACN,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;oBAC7B,IAAI,EAAE,SAAS,CAAC,GAAG;iBACpB;aACF,EAAE,OAAO,CAAC;YACX,2BAA2B;YAC3B,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC;SACjB,CAAC,CAAA;QAEF,IAAI,MAAM,CAAA;QACV,IAAI,CAAC;YACH,IAAI,QAAQ,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;gBAC5B,MAAM,IAAI,aAAa,CAAC,oBAAoB,CAAC,CAAA;YAC/C,CAAC;YAED,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;gBAC1C,MAAM,IAAI,aAAa,CAAC,2BAA2B,CAAC,CAAA;YACtD,CAAC;YAED,IAAI,QAAQ,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC;gBACxB,MAAM,IAAI,aAAa,CAAC,mBAAmB,CAAC,CAAA;YAC9C,CAAC;YAED,MAAM,MAAM,GAAG,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YACrD,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAA;YAEpC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;gBAC/D,MAAM,IAAI,0BAA0B,CAAC,6BAA6B,CAAC,CAAA;YACrE,CAAC;QACH,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACd,MAAM,IAAI,0BAA0B,CAAC,uBAAuB,GAAG,GAAG,CAAC,OAAO,CAAC,CAAA;QAC7E,CAAC;QAED,IAAI,OAAO,EAAE,UAAU,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,CAAC;YACvE,MAAM,IAAI,mBAAmB,EAAE,CAAA;QACjC,CAAC;QAED,GAAG,CAAC,4DAA4D,EAAE,MAAM,CAAC,CAAA;QAEzE,OAAO;YACL,IAAI,EAAE,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE;YAC1B,UAAU,EAAE,MAAM;SACnB,CAAA;IACH,CAAC;CACF;AAED,MAAM,UAAU,SAAS;IACvB,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,CAAA;AAClD,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@libp2p/plaintext",
3
- "version": "2.0.29",
3
+ "version": "3.0.0-049bfa0fa",
4
4
  "description": "An insecure connection encrypter",
5
5
  "license": "Apache-2.0 OR MIT",
6
6
  "homepage": "https://github.com/libp2p/js-libp2p/tree/main/packages/connection-encrypter-plaintext#readme",
@@ -45,21 +45,20 @@
45
45
  "doc-check": "aegir doc-check"
46
46
  },
47
47
  "dependencies": {
48
- "@libp2p/crypto": "^5.1.8",
49
- "@libp2p/interface": "^2.11.0",
50
- "@libp2p/peer-id": "^5.1.9",
51
- "it-protobuf-stream": "^2.0.2",
52
- "protons-runtime": "^5.5.0",
48
+ "@libp2p/crypto": "5.1.9-049bfa0fa",
49
+ "@libp2p/interface": "3.0.0-049bfa0fa",
50
+ "@libp2p/peer-id": "6.0.0-049bfa0fa",
51
+ "@libp2p/utils": "7.0.0-049bfa0fa",
52
+ "protons-runtime": "^5.6.0",
53
53
  "uint8arraylist": "^2.4.8",
54
54
  "uint8arrays": "^5.1.0"
55
55
  },
56
56
  "devDependencies": {
57
- "@libp2p/crypto": "^5.1.8",
58
- "@libp2p/logger": "^5.2.0",
59
- "aegir": "^47.0.14",
60
- "it-pair": "^2.0.6",
61
- "protons": "^7.6.1",
62
- "sinon": "^20.0.0"
57
+ "@libp2p/crypto": "5.1.9-049bfa0fa",
58
+ "@libp2p/logger": "6.0.0-049bfa0fa",
59
+ "aegir": "^47.0.22",
60
+ "protons": "^7.7.0",
61
+ "sinon": "^21.0.0"
63
62
  },
64
63
  "sideEffects": false
65
64
  }
package/src/index.ts CHANGED
@@ -24,10 +24,10 @@
24
24
  import { publicKeyFromRaw } from '@libp2p/crypto/keys'
25
25
  import { UnexpectedPeerError, InvalidCryptoExchangeError, serviceCapabilities, ProtocolError } from '@libp2p/interface'
26
26
  import { peerIdFromPublicKey } from '@libp2p/peer-id'
27
- import { pbStream } from 'it-protobuf-stream'
27
+ import { pbStream } from '@libp2p/utils'
28
28
  import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
29
29
  import { Exchange, KeyType } from './pb/proto.js'
30
- import type { ComponentLogger, Logger, MultiaddrConnection, ConnectionEncrypter, SecuredConnection, PrivateKey, SecureConnectionOptions, SecurableStream } from '@libp2p/interface'
30
+ import type { ComponentLogger, Logger, ConnectionEncrypter, SecuredConnection, PrivateKey, SecureConnectionOptions, MessageStream } from '@libp2p/interface'
31
31
 
32
32
  const PROTOCOL = '/plaintext/2.0.0'
33
33
 
@@ -52,39 +52,36 @@ class Plaintext implements ConnectionEncrypter {
52
52
  '@libp2p/connection-encryption'
53
53
  ]
54
54
 
55
- async secureInbound<Stream extends SecurableStream = MultiaddrConnection>(conn: Stream, options?: SecureConnectionOptions): Promise<SecuredConnection<Stream>> {
56
- return this._encrypt(conn, options)
55
+ async secureInbound (connection: MessageStream, options?: SecureConnectionOptions): Promise<SecuredConnection> {
56
+ return this._encrypt(connection, options)
57
57
  }
58
58
 
59
- async secureOutbound<Stream extends SecurableStream = MultiaddrConnection>(conn: Stream, options?: SecureConnectionOptions): Promise<SecuredConnection<Stream>> {
60
- return this._encrypt(conn, options)
59
+ async secureOutbound (connection: MessageStream, options?: SecureConnectionOptions): Promise<SecuredConnection> {
60
+ return this._encrypt(connection, options)
61
61
  }
62
62
 
63
63
  /**
64
64
  * Encrypt connection
65
65
  */
66
- async _encrypt<Stream extends SecurableStream = MultiaddrConnection>(conn: Stream, options?: SecureConnectionOptions): Promise<SecuredConnection<Stream>> {
67
- const log = conn.log?.newScope('plaintext') ?? this.log
68
- const pb = pbStream(conn).pb(Exchange)
66
+ async _encrypt (connection: MessageStream, options?: SecureConnectionOptions): Promise<SecuredConnection> {
67
+ const log = connection.log?.newScope('plaintext') ?? this.log
68
+ const pb = pbStream(connection).pb(Exchange)
69
69
 
70
70
  log('write pubkey exchange to peer %p', options?.remotePeer)
71
71
 
72
72
  const publicKey = this.privateKey.publicKey
73
73
 
74
- const [
75
- , response
76
- ] = await Promise.all([
77
- // Encode the public key and write it to the remote peer
78
- pb.write({
79
- id: publicKey.toMultihash().bytes,
80
- pubkey: {
81
- Type: KeyType[publicKey.type],
82
- Data: publicKey.raw
83
- }
84
- }, options),
85
- // Get the Exchange message
86
- pb.read(options)
87
- ])
74
+ // Encode the public key and write it to the remote peer
75
+ await pb.write({
76
+ id: publicKey.toMultihash().bytes,
77
+ pubkey: {
78
+ Type: KeyType[publicKey.type],
79
+ Data: publicKey.raw
80
+ }
81
+ }, options)
82
+
83
+ // Get the Exchange message
84
+ const response = await pb.read(options)
88
85
 
89
86
  let peerId
90
87
  try {
@@ -118,7 +115,7 @@ class Plaintext implements ConnectionEncrypter {
118
115
  log('plaintext key exchange completed successfully with peer %p', peerId)
119
116
 
120
117
  return {
121
- conn: pb.unwrap().unwrap(),
118
+ connection: pb.unwrap().unwrap(),
122
119
  remotePeer: peerId
123
120
  }
124
121
  }
@@ -1,6 +0,0 @@
1
- {
2
- "PlaintextComponents": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_plaintext.PlaintextComponents.html",
3
- ".:PlaintextComponents": "https://libp2p.github.io/js-libp2p/interfaces/_libp2p_plaintext.PlaintextComponents.html",
4
- "plaintext": "https://libp2p.github.io/js-libp2p/functions/_libp2p_plaintext.plaintext.html",
5
- ".:plaintext": "https://libp2p.github.io/js-libp2p/functions/_libp2p_plaintext.plaintext.html"
6
- }