Skip to content

Commit 019d5e7

Browse files
achingbrainachingbrain
authoredAug 11, 2022
deps: update protobufs, it-pipe, etc (#465)
·
v20.0.2v12.0.2
1 parent 799e6b0 commit 019d5e7

File tree

4 files changed

+198
-71
lines changed

4 files changed

+198
-71
lines changed
 

‎package.json

+8-7
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
"generate:proto-types": "pbts -o src/message/message.d.ts src/message/message.js"
166166
},
167167
"dependencies": {
168-
"@libp2p/interface-connection": "^2.1.1",
168+
"@libp2p/interface-connection": "^3.0.1",
169169
"@libp2p/interface-peer-id": "^1.0.4",
170170
"@libp2p/interface-peer-store": "^1.2.0",
171171
"@libp2p/topology": "^3.0.0",
@@ -178,21 +178,21 @@
178178
"debug": "^4.2.0",
179179
"err-code": "^3.0.1",
180180
"interface-blockstore": "^2.0.2",
181-
"it-length-prefixed": "^7.0.1",
182-
"it-pipe": "^2.0.3",
181+
"it-length-prefixed": "^8.0.2",
182+
"it-pipe": "^2.0.4",
183183
"just-debounce-it": "^3.0.1",
184184
"multiformats": "^9.0.4",
185-
"protobufjs": "^6.10.2",
185+
"protobufjs": "^7.0.0",
186186
"readable-stream": "^4.0.0",
187187
"timeout-abort-controller": "^3.0.0",
188188
"uint8arrays": "^3.0.0",
189189
"varint": "^6.0.0",
190190
"varint-decoder": "^1.0.0"
191191
},
192192
"devDependencies": {
193-
"@chainsafe/libp2p-noise": "^7.0.1",
193+
"@chainsafe/libp2p-noise": "^8.0.0",
194194
"@libp2p/kad-dht": "^3.0.0",
195-
"@libp2p/mplex": "^4.0.0",
195+
"@libp2p/mplex": "^5.0.0",
196196
"@libp2p/peer-id": "^1.1.8",
197197
"@libp2p/peer-id-factory": "^1.0.8",
198198
"@libp2p/tcp": "^3.0.1",
@@ -216,9 +216,10 @@
216216
"npm-run-all": "^4.1.5",
217217
"p-defer": "^4.0.0",
218218
"p-event": "^5.0.1",
219-
"p-wait-for": "^4.1.0",
219+
"p-wait-for": "^5.0.0",
220220
"process": "^0.11.10",
221221
"promisify-es6": "^1.0.3",
222+
"protobufjs-cli": "^1.0.0",
222223
"rimraf": "^3.0.2",
223224
"sinon": "^14.0.0",
224225
"stats-lite": "^2.2.0",

‎src/message/message.d.ts

+36-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import $protobuf from "protobufjs/minimal.js";
1+
import * as $protobuf from "protobufjs";
22
/** Properties of a Message. */
33
export interface IMessage {
44

@@ -80,6 +80,13 @@ export class Message implements IMessage {
8080
* @returns JSON object
8181
*/
8282
public toJSON(): { [k: string]: any };
83+
84+
/**
85+
* Gets the default type url for Message
86+
* @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
87+
* @returns The default type url
88+
*/
89+
public static getTypeUrl(typeUrlPrefix?: string): string;
8390
}
8491

8592
export namespace Message {
@@ -147,6 +154,13 @@ export namespace Message {
147154
* @returns JSON object
148155
*/
149156
public toJSON(): { [k: string]: any };
157+
158+
/**
159+
* Gets the default type url for Wantlist
160+
* @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
161+
* @returns The default type url
162+
*/
163+
public static getTypeUrl(typeUrlPrefix?: string): string;
150164
}
151165

152166
namespace Wantlist {
@@ -238,6 +252,13 @@ export namespace Message {
238252
* @returns JSON object
239253
*/
240254
public toJSON(): { [k: string]: any };
255+
256+
/**
257+
* Gets the default type url for Entry
258+
* @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
259+
* @returns The default type url
260+
*/
261+
public static getTypeUrl(typeUrlPrefix?: string): string;
241262
}
242263
}
243264

@@ -304,6 +325,13 @@ export namespace Message {
304325
* @returns JSON object
305326
*/
306327
public toJSON(): { [k: string]: any };
328+
329+
/**
330+
* Gets the default type url for Block
331+
* @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
332+
* @returns The default type url
333+
*/
334+
public static getTypeUrl(typeUrlPrefix?: string): string;
307335
}
308336

309337
/** BlockPresenceType enum. */
@@ -375,5 +403,12 @@ export namespace Message {
375403
* @returns JSON object
376404
*/
377405
public toJSON(): { [k: string]: any };
406+
407+
/**
408+
* Gets the default type url for BlockPresence
409+
* @param [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
410+
* @returns The default type url
411+
*/
412+
public static getTypeUrl(typeUrlPrefix?: string): string;
378413
}
379414
}

‎src/message/message.js

+152-61
Original file line numberDiff line numberDiff line change
@@ -127,27 +127,32 @@ export const Message = $root.Message = (() => {
127127
while (r.pos < c) {
128128
var t = r.uint32();
129129
switch (t >>> 3) {
130-
case 1:
131-
m.wantlist = $root.Message.Wantlist.decode(r, r.uint32());
132-
break;
133-
case 2:
134-
if (!(m.blocks && m.blocks.length))
135-
m.blocks = [];
136-
m.blocks.push(r.bytes());
137-
break;
138-
case 3:
139-
if (!(m.payload && m.payload.length))
140-
m.payload = [];
141-
m.payload.push($root.Message.Block.decode(r, r.uint32()));
142-
break;
143-
case 4:
144-
if (!(m.blockPresences && m.blockPresences.length))
145-
m.blockPresences = [];
146-
m.blockPresences.push($root.Message.BlockPresence.decode(r, r.uint32()));
147-
break;
148-
case 5:
149-
m.pendingBytes = r.int32();
150-
break;
130+
case 1: {
131+
m.wantlist = $root.Message.Wantlist.decode(r, r.uint32());
132+
break;
133+
}
134+
case 2: {
135+
if (!(m.blocks && m.blocks.length))
136+
m.blocks = [];
137+
m.blocks.push(r.bytes());
138+
break;
139+
}
140+
case 3: {
141+
if (!(m.payload && m.payload.length))
142+
m.payload = [];
143+
m.payload.push($root.Message.Block.decode(r, r.uint32()));
144+
break;
145+
}
146+
case 4: {
147+
if (!(m.blockPresences && m.blockPresences.length))
148+
m.blockPresences = [];
149+
m.blockPresences.push($root.Message.BlockPresence.decode(r, r.uint32()));
150+
break;
151+
}
152+
case 5: {
153+
m.pendingBytes = r.int32();
154+
break;
155+
}
151156
default:
152157
r.skipType(t & 7);
153158
break;
@@ -180,7 +185,7 @@ export const Message = $root.Message = (() => {
180185
for (var i = 0; i < d.blocks.length; ++i) {
181186
if (typeof d.blocks[i] === "string")
182187
$util.base64.decode(d.blocks[i], m.blocks[i] = $util.newBuffer($util.base64.length(d.blocks[i])), 0);
183-
else if (d.blocks[i].length)
188+
else if (d.blocks[i].length >= 0)
184189
m.blocks[i] = d.blocks[i];
185190
}
186191
}
@@ -270,6 +275,21 @@ export const Message = $root.Message = (() => {
270275
return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
271276
};
272277

278+
/**
279+
* Gets the default type url for Message
280+
* @function getTypeUrl
281+
* @memberof Message
282+
* @static
283+
* @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
284+
* @returns {string} The default type url
285+
*/
286+
Message.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
287+
if (typeUrlPrefix === undefined) {
288+
typeUrlPrefix = "type.googleapis.com";
289+
}
290+
return typeUrlPrefix + "/Message";
291+
};
292+
273293
Message.Wantlist = (function() {
274294

275295
/**
@@ -351,14 +371,16 @@ export const Message = $root.Message = (() => {
351371
while (r.pos < c) {
352372
var t = r.uint32();
353373
switch (t >>> 3) {
354-
case 1:
355-
if (!(m.entries && m.entries.length))
356-
m.entries = [];
357-
m.entries.push($root.Message.Wantlist.Entry.decode(r, r.uint32()));
358-
break;
359-
case 2:
360-
m.full = r.bool();
361-
break;
374+
case 1: {
375+
if (!(m.entries && m.entries.length))
376+
m.entries = [];
377+
m.entries.push($root.Message.Wantlist.Entry.decode(r, r.uint32()));
378+
break;
379+
}
380+
case 2: {
381+
m.full = r.bool();
382+
break;
383+
}
362384
default:
363385
r.skipType(t & 7);
364386
break;
@@ -437,6 +459,21 @@ export const Message = $root.Message = (() => {
437459
return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
438460
};
439461

462+
/**
463+
* Gets the default type url for Wantlist
464+
* @function getTypeUrl
465+
* @memberof Message.Wantlist
466+
* @static
467+
* @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
468+
* @returns {string} The default type url
469+
*/
470+
Wantlist.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
471+
if (typeUrlPrefix === undefined) {
472+
typeUrlPrefix = "type.googleapis.com";
473+
}
474+
return typeUrlPrefix + "/Message.Wantlist";
475+
};
476+
440477
/**
441478
* WantType enum.
442479
* @name Message.Wantlist.WantType
@@ -562,21 +599,26 @@ export const Message = $root.Message = (() => {
562599
while (r.pos < c) {
563600
var t = r.uint32();
564601
switch (t >>> 3) {
565-
case 1:
566-
m.block = r.bytes();
567-
break;
568-
case 2:
569-
m.priority = r.int32();
570-
break;
571-
case 3:
572-
m.cancel = r.bool();
573-
break;
574-
case 4:
575-
m.wantType = r.int32();
576-
break;
577-
case 5:
578-
m.sendDontHave = r.bool();
579-
break;
602+
case 1: {
603+
m.block = r.bytes();
604+
break;
605+
}
606+
case 2: {
607+
m.priority = r.int32();
608+
break;
609+
}
610+
case 3: {
611+
m.cancel = r.bool();
612+
break;
613+
}
614+
case 4: {
615+
m.wantType = r.int32();
616+
break;
617+
}
618+
case 5: {
619+
m.sendDontHave = r.bool();
620+
break;
621+
}
580622
default:
581623
r.skipType(t & 7);
582624
break;
@@ -600,7 +642,7 @@ export const Message = $root.Message = (() => {
600642
if (d.block != null) {
601643
if (typeof d.block === "string")
602644
$util.base64.decode(d.block, m.block = $util.newBuffer($util.base64.length(d.block)), 0);
603-
else if (d.block.length)
645+
else if (d.block.length >= 0)
604646
m.block = d.block;
605647
}
606648
if (d.priority != null) {
@@ -680,6 +722,21 @@ export const Message = $root.Message = (() => {
680722
return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
681723
};
682724

725+
/**
726+
* Gets the default type url for Entry
727+
* @function getTypeUrl
728+
* @memberof Message.Wantlist.Entry
729+
* @static
730+
* @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
731+
* @returns {string} The default type url
732+
*/
733+
Entry.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
734+
if (typeUrlPrefix === undefined) {
735+
typeUrlPrefix = "type.googleapis.com";
736+
}
737+
return typeUrlPrefix + "/Message.Wantlist.Entry";
738+
};
739+
683740
return Entry;
684741
})();
685742

@@ -764,12 +821,14 @@ export const Message = $root.Message = (() => {
764821
while (r.pos < c) {
765822
var t = r.uint32();
766823
switch (t >>> 3) {
767-
case 1:
768-
m.prefix = r.bytes();
769-
break;
770-
case 2:
771-
m.data = r.bytes();
772-
break;
824+
case 1: {
825+
m.prefix = r.bytes();
826+
break;
827+
}
828+
case 2: {
829+
m.data = r.bytes();
830+
break;
831+
}
773832
default:
774833
r.skipType(t & 7);
775834
break;
@@ -793,13 +852,13 @@ export const Message = $root.Message = (() => {
793852
if (d.prefix != null) {
794853
if (typeof d.prefix === "string")
795854
$util.base64.decode(d.prefix, m.prefix = $util.newBuffer($util.base64.length(d.prefix)), 0);
796-
else if (d.prefix.length)
855+
else if (d.prefix.length >= 0)
797856
m.prefix = d.prefix;
798857
}
799858
if (d.data != null) {
800859
if (typeof d.data === "string")
801860
$util.base64.decode(d.data, m.data = $util.newBuffer($util.base64.length(d.data)), 0);
802-
else if (d.data.length)
861+
else if (d.data.length >= 0)
803862
m.data = d.data;
804863
}
805864
return m;
@@ -854,6 +913,21 @@ export const Message = $root.Message = (() => {
854913
return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
855914
};
856915

916+
/**
917+
* Gets the default type url for Block
918+
* @function getTypeUrl
919+
* @memberof Message.Block
920+
* @static
921+
* @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
922+
* @returns {string} The default type url
923+
*/
924+
Block.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
925+
if (typeUrlPrefix === undefined) {
926+
typeUrlPrefix = "type.googleapis.com";
927+
}
928+
return typeUrlPrefix + "/Message.Block";
929+
};
930+
857931
return Block;
858932
})();
859933

@@ -949,12 +1023,14 @@ export const Message = $root.Message = (() => {
9491023
while (r.pos < c) {
9501024
var t = r.uint32();
9511025
switch (t >>> 3) {
952-
case 1:
953-
m.cid = r.bytes();
954-
break;
955-
case 2:
956-
m.type = r.int32();
957-
break;
1026+
case 1: {
1027+
m.cid = r.bytes();
1028+
break;
1029+
}
1030+
case 2: {
1031+
m.type = r.int32();
1032+
break;
1033+
}
9581034
default:
9591035
r.skipType(t & 7);
9601036
break;
@@ -978,7 +1054,7 @@ export const Message = $root.Message = (() => {
9781054
if (d.cid != null) {
9791055
if (typeof d.cid === "string")
9801056
$util.base64.decode(d.cid, m.cid = $util.newBuffer($util.base64.length(d.cid)), 0);
981-
else if (d.cid.length)
1057+
else if (d.cid.length >= 0)
9821058
m.cid = d.cid;
9831059
}
9841060
switch (d.type) {
@@ -1037,6 +1113,21 @@ export const Message = $root.Message = (() => {
10371113
return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
10381114
};
10391115

1116+
/**
1117+
* Gets the default type url for BlockPresence
1118+
* @function getTypeUrl
1119+
* @memberof Message.BlockPresence
1120+
* @static
1121+
* @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
1122+
* @returns {string} The default type url
1123+
*/
1124+
BlockPresence.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
1125+
if (typeUrlPrefix === undefined) {
1126+
typeUrlPrefix = "type.googleapis.com";
1127+
}
1128+
return typeUrlPrefix + "/Message.BlockPresence";
1129+
};
1130+
10401131
return BlockPresence;
10411132
})();
10421133

‎test/utils/create-libp2p-node.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
import { TCP } from '@libp2p/tcp'
33
import { Mplex } from '@libp2p/mplex'
4-
import { NOISE } from '@chainsafe/libp2p-noise'
4+
import { Noise } from '@chainsafe/libp2p-noise'
55
import { createLibp2p } from 'libp2p'
66
import { KadDHT } from '@libp2p/kad-dht'
77
import { createEd25519PeerId } from '@libp2p/peer-id-factory'
@@ -34,7 +34,7 @@ export async function createLibp2pNode (options) {
3434
new Mplex()
3535
],
3636
connectionEncryption: [
37-
NOISE
37+
new Noise()
3838
],
3939
dht: options.DHT
4040
? new KadDHT({

0 commit comments

Comments
 (0)
Please sign in to comment.