waku-org
/
js-waku
mirror of https://github.com/waku-org/js-waku.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge #44 

44: Upgrade ts-proto to fix long dependency warning/error r=D4nte a=D4nte

Fixes issue when using yarn.

Co-authored-by: Franck Royer <franck@status.im>
This commit is contained in:
bors[bot] 2021-04-20 06:15:29 +00:00 committed by GitHub
parent 16251f6979 dd0a843770
commit f85078ea96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
package-lock.json generated
View File

@ -21,7 +21,7 @@
"libp2p-websockets": "^0.15.5", "libp2p-websockets": "^0.15.5",
"multiaddr": "^8.1.2", "multiaddr": "^8.1.2",
"prompt-sync": "^4.2.0", "prompt-sync": "^4.2.0",
"ts-proto": "^1.74.0", "ts-proto": "^1.79.3",
"uuid": "^3.4.0", "uuid": "^3.4.0",
"yarg": "^1.0.8" "yarg": "^1.0.8"
}, },
@ -12866,26 +12866,27 @@
} }
}, },
"node_modules/ts-proto": { "node_modules/ts-proto": {
"version": "1.74.0", "version": "1.79.3",
"resolved": "https://registry.npmjs.org/ts-proto/-/ts-proto-1.74.0.tgz", "resolved": "https://registry.npmjs.org/ts-proto/-/ts-proto-1.79.3.tgz",
"integrity": "sha512-FxxJu6ucs/wxMCx5uNd9XzpJw1YykygZy/Z9WFDRHK5w1ao1LExzbOzaHqJS56reyBKhsxl480M865a1ZgAJBA==", "integrity": "sha512-zAZ3PE+CHdyNzK7oxjRtEvzFFfKOI293xXA8ukxZXUKJXrKLfbvsVwM4kLMx5tMSJEBm/PQq/iOzh+muKbUEhw==",
"dependencies": { "dependencies": {
"@types/object-hash": "^1.3.0", "@types/object-hash": "^1.3.0",
"dataloader": "^1.4.0", "dataloader": "^1.4.0",
"object-hash": "^1.3.1", "object-hash": "^1.3.1",
"protobufjs": "^6.8.8", "protobufjs": "^6.8.8",
"ts-poet": "^4.5.0", "ts-poet": "^4.5.0",
"ts-proto-descriptors": "^1.2.0" "ts-proto-descriptors": "^1.2.1"
}, },
"bin": { "bin": {
"protoc-gen-ts_proto": "protoc-gen-ts_proto" "protoc-gen-ts_proto": "protoc-gen-ts_proto"
} }
}, },
"node_modules/ts-proto-descriptors": { "node_modules/ts-proto-descriptors": {
"version": "1.2.0", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/ts-proto-descriptors/-/ts-proto-descriptors-1.2.0.tgz", "resolved": "https://registry.npmjs.org/ts-proto-descriptors/-/ts-proto-descriptors-1.2.1.tgz",
"integrity": "sha512-0t2WITzCiQ/3H6zPuFrFFOj2jhH6xZNu7agS7aKecKrz7tjRMW9VrmlBlJXslTTC3K7/4phV4qlsP5fOfLxuDg==", "integrity": "sha512-iSHiQAaovi9sBwjiSCca/E089uv0IMt9Cfe0wV5AJwZppGa47yfih97Q+1006bdSLWkxf5Pk3VDQnt1yRTMV8w==",
"dependencies": { "dependencies": {
"long": "^4.0.0",
"protobufjs": "^6.8.8" "protobufjs": "^6.8.8"
} }
}, },
@ -24120,23 +24121,24 @@
} }
}, },
"ts-proto": { "ts-proto": {
"version": "1.74.0", "version": "1.79.3",
"resolved": "https://registry.npmjs.org/ts-proto/-/ts-proto-1.74.0.tgz", "resolved": "https://registry.npmjs.org/ts-proto/-/ts-proto-1.79.3.tgz",
"integrity": "sha512-FxxJu6ucs/wxMCx5uNd9XzpJw1YykygZy/Z9WFDRHK5w1ao1LExzbOzaHqJS56reyBKhsxl480M865a1ZgAJBA==", "integrity": "sha512-zAZ3PE+CHdyNzK7oxjRtEvzFFfKOI293xXA8ukxZXUKJXrKLfbvsVwM4kLMx5tMSJEBm/PQq/iOzh+muKbUEhw==",
"requires": { "requires": {
"@types/object-hash": "^1.3.0", "@types/object-hash": "^1.3.0",
"dataloader": "^1.4.0", "dataloader": "^1.4.0",
"object-hash": "^1.3.1", "object-hash": "^1.3.1",
"protobufjs": "^6.8.8", "protobufjs": "^6.8.8",
"ts-poet": "^4.5.0", "ts-poet": "^4.5.0",
"ts-proto-descriptors": "^1.2.0" "ts-proto-descriptors": "^1.2.1"
} }
}, },
"ts-proto-descriptors": { "ts-proto-descriptors": {
"version": "1.2.0", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/ts-proto-descriptors/-/ts-proto-descriptors-1.2.0.tgz", "resolved": "https://registry.npmjs.org/ts-proto-descriptors/-/ts-proto-descriptors-1.2.1.tgz",
"integrity": "sha512-0t2WITzCiQ/3H6zPuFrFFOj2jhH6xZNu7agS7aKecKrz7tjRMW9VrmlBlJXslTTC3K7/4phV4qlsP5fOfLxuDg==", "integrity": "sha512-iSHiQAaovi9sBwjiSCca/E089uv0IMt9Cfe0wV5AJwZppGa47yfih97Q+1006bdSLWkxf5Pk3VDQnt1yRTMV8w==",
"requires": { "requires": {
"long": "^4.0.0",
"protobufjs": "^6.8.8" "protobufjs": "^6.8.8"
} }
}, },

2
package.json
View File

@ -63,7 +63,7 @@
"libp2p-websockets": "^0.15.5", "libp2p-websockets": "^0.15.5",
"multiaddr": "^8.1.2", "multiaddr": "^8.1.2",
"prompt-sync": "^4.2.0", "prompt-sync": "^4.2.0",
"ts-proto": "^1.74.0", "ts-proto": "^1.79.3",
"uuid": "^3.4.0", "uuid": "^3.4.0",
"yarg": "^1.0.8" "yarg": "^1.0.8"
}, },

4
src/proto/chat/v2/chat_message.ts
View File

@ -30,9 +30,10 @@ export const ChatMessageProto = {
}, },
decode(input: _m0.Reader | Uint8Array, length?: number): ChatMessageProto { decode(input: _m0.Reader | Uint8Array, length?: number): ChatMessageProto {
const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input; const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
let end = length === undefined ? reader.len : reader.pos + length; let end = length === undefined ? reader.len : reader.pos + length;
const message = { ...baseChatMessageProto } as ChatMessageProto; const message = { ...baseChatMessageProto } as ChatMessageProto;
message.payload = new Uint8Array();
while (reader.pos < end) { while (reader.pos < end) {
const tag = reader.uint32(); const tag = reader.uint32();
switch (tag >>> 3) { switch (tag >>> 3) {
@ -55,6 +56,7 @@ export const ChatMessageProto = {
fromJSON(object: any): ChatMessageProto { fromJSON(object: any): ChatMessageProto {
const message = { ...baseChatMessageProto } as ChatMessageProto; const message = { ...baseChatMessageProto } as ChatMessageProto;
message.payload = new Uint8Array();
if (object.timestamp !== undefined && object.timestamp !== null) { if (object.timestamp !== undefined && object.timestamp !== null) {
message.timestamp = Number(object.timestamp); message.timestamp = Number(object.timestamp);
} else { } else {

8
src/proto/waku/v2/message.ts
View File

@ -1,4 +1,5 @@
/* eslint-disable */ /* eslint-disable */
import Long from 'long';
import _m0 from 'protobufjs/minimal'; import _m0 from 'protobufjs/minimal';
export const protobufPackage = 'waku.v2'; export const protobufPackage = 'waku.v2';
@ -33,7 +34,7 @@ export const WakuMessageProto = {
}, },
decode(input: _m0.Reader | Uint8Array, length?: number): WakuMessageProto { decode(input: _m0.Reader | Uint8Array, length?: number): WakuMessageProto {
const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input; const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
let end = length === undefined ? reader.len : reader.pos + length; let end = length === undefined ? reader.len : reader.pos + length;
const message = { ...baseWakuMessageProto } as WakuMessageProto; const message = { ...baseWakuMessageProto } as WakuMessageProto;
while (reader.pos < end) { while (reader.pos < end) {
@ -165,3 +166,8 @@ export type DeepPartial<T> = T extends Builtin
: T extends {} : T extends {}
? { [K in keyof T]?: DeepPartial<T[K]> } ? { [K in keyof T]?: DeepPartial<T[K]> }
: Partial<T>; : Partial<T>;
if (_m0.util.Long !== Long) {
_m0.util.Long = Long as any;
_m0.configure();
}

16
src/proto/waku/v2/store.ts
View File

@ -1,7 +1,7 @@
/* eslint-disable */ /* eslint-disable */
import Long from 'long'; import Long from 'long';
import { WakuMessageProto } from '../../waku/v2/message';
import _m0 from 'protobufjs/minimal'; import _m0 from 'protobufjs/minimal';
import { WakuMessageProto } from '../../waku/v2/message';
export const protobufPackage = 'waku.v2'; export const protobufPackage = 'waku.v2';
@ -88,9 +88,10 @@ export const Index = {
}, },
decode(input: _m0.Reader | Uint8Array, length?: number): Index { decode(input: _m0.Reader | Uint8Array, length?: number): Index {
const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input; const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
let end = length === undefined ? reader.len : reader.pos + length; let end = length === undefined ? reader.len : reader.pos + length;
const message = { ...baseIndex } as Index; const message = { ...baseIndex } as Index;
message.digest = new Uint8Array();
while (reader.pos < end) { while (reader.pos < end) {
const tag = reader.uint32(); const tag = reader.uint32();
switch (tag >>> 3) { switch (tag >>> 3) {
@ -110,6 +111,7 @@ export const Index = {
fromJSON(object: any): Index { fromJSON(object: any): Index {
const message = { ...baseIndex } as Index; const message = { ...baseIndex } as Index;
message.digest = new Uint8Array();
if (object.digest !== undefined && object.digest !== null) { if (object.digest !== undefined && object.digest !== null) {
message.digest = bytesFromBase64(object.digest); message.digest = bytesFromBase64(object.digest);
} }
@ -168,7 +170,7 @@ export const PagingInfo = {
}, },
decode(input: _m0.Reader | Uint8Array, length?: number): PagingInfo { decode(input: _m0.Reader | Uint8Array, length?: number): PagingInfo {
const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input; const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
let end = length === undefined ? reader.len : reader.pos + length; let end = length === undefined ? reader.len : reader.pos + length;
const message = { ...basePagingInfo } as PagingInfo; const message = { ...basePagingInfo } as PagingInfo;
while (reader.pos < end) { while (reader.pos < end) {
@ -256,7 +258,7 @@ export const ContentFilter = {
}, },
decode(input: _m0.Reader | Uint8Array, length?: number): ContentFilter { decode(input: _m0.Reader | Uint8Array, length?: number): ContentFilter {
const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input; const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
let end = length === undefined ? reader.len : reader.pos + length; let end = length === undefined ? reader.len : reader.pos + length;
const message = { ...baseContentFilter } as ContentFilter; const message = { ...baseContentFilter } as ContentFilter;
while (reader.pos < end) { while (reader.pos < end) {
@ -324,7 +326,7 @@ export const HistoryQuery = {
}, },
decode(input: _m0.Reader | Uint8Array, length?: number): HistoryQuery { decode(input: _m0.Reader | Uint8Array, length?: number): HistoryQuery {
const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input; const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
let end = length === undefined ? reader.len : reader.pos + length; let end = length === undefined ? reader.len : reader.pos + length;
const message = { ...baseHistoryQuery } as HistoryQuery; const message = { ...baseHistoryQuery } as HistoryQuery;
message.contentFilters = []; message.contentFilters = [];
@ -441,7 +443,7 @@ export const HistoryResponse = {
}, },
decode(input: _m0.Reader | Uint8Array, length?: number): HistoryResponse { decode(input: _m0.Reader | Uint8Array, length?: number): HistoryResponse {
const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input; const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
let end = length === undefined ? reader.len : reader.pos + length; let end = length === undefined ? reader.len : reader.pos + length;
const message = { ...baseHistoryResponse } as HistoryResponse; const message = { ...baseHistoryResponse } as HistoryResponse;
message.messages = []; message.messages = [];
@ -536,7 +538,7 @@ export const HistoryRPC = {
}, },
decode(input: _m0.Reader | Uint8Array, length?: number): HistoryRPC { decode(input: _m0.Reader | Uint8Array, length?: number): HistoryRPC {
const reader = input instanceof Uint8Array ? new _m0.Reader(input) : input; const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
let end = length === undefined ? reader.len : reader.pos + length; let end = length === undefined ? reader.len : reader.pos + length;
const message = { ...baseHistoryRPC } as HistoryRPC; const message = { ...baseHistoryRPC } as HistoryRPC;
while (reader.pos < end) { while (reader.pos < end) {