From 969f386e5e24eedfe1ebdf77ec7501412e258d44 Mon Sep 17 00:00:00 2001 From: Alex Trottier Date: Sun, 29 Dec 2019 17:00:41 -0800 Subject: [PATCH] re-enable streamer --- doc/PROTO.md | 1 + go/node.pb.go | 242 +++++++++++++++++++++++++-------------- java/pb/NodeAPIGrpc.java | 65 +++++++++++ js/node_grpc_pb.js | 12 ++ pb/node.proto | 2 + py/node_pb2.py | 13 ++- py/node_pb2_grpc.py | 17 +++ ts/node_pb_service.d.ts | 11 ++ ts/node_pb_service.js | 54 +++++++++ 9 files changed, 330 insertions(+), 87 deletions(-) diff --git a/doc/PROTO.md b/doc/PROTO.md index 1a8d01e..9515eda 100644 --- a/doc/PROTO.md +++ b/doc/PROTO.md @@ -955,6 +955,7 @@ NodeAPI provide an API to control the underlying custom ipfs node | P2P | [P2PRequest](#pb.P2PRequest) | [P2PResponse](#pb.P2PResponse) | P2P allows control of generalized p2p streams for tcp/udp based protocol. By using this RPC, we can tunnel traffic similar to ssh tunneling except using libp2p as the transport layer, and and tcp/udp port. | | Blockstore | [BlockstoreRequest](#pb.BlockstoreRequest) | [BlockstoreResponse](#pb.BlockstoreResponse) | Blockstore allows low-level management of the underlying blockstore | | Dag | [DagRequest](#pb.DagRequest) | [DagResponse](#pb.DagResponse) | Dag is a unidirectional rpc allowing manipulation of low-level ipld objects | +| DagStream | [DagRequest](#pb.DagRequest) stream | [DagResponse](#pb.DagResponse) stream | DagStream is like Dag but with bidirectional streams | diff --git a/go/node.pb.go b/go/node.pb.go index d90c232..56edac0 100644 --- a/go/node.pb.go +++ b/go/node.pb.go @@ -1333,91 +1333,92 @@ func init() { func init() { proto.RegisterFile("node.proto", fileDescriptor_0c843d59d2d938e7) } var fileDescriptor_0c843d59d2d938e7 = []byte{ - // 1342 bytes of a gzipped FileDescriptorProto + // 1357 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcd, 0x6e, 0xdb, 0x46, - 0x10, 0x16, 0x29, 0x59, 0x96, 0x46, 0x96, 0xcd, 0x6c, 0xdc, 0x40, 0xd5, 0x41, 0x50, 0xd9, 0x22, - 0x15, 0x8c, 0xd6, 0x09, 0x94, 0x16, 0x31, 0x8a, 0x16, 0x85, 0x24, 0x52, 0x86, 0x50, 0xfd, 0xb0, - 0x24, 0x9d, 0x9f, 0x4b, 0x05, 0x5a, 0xdc, 0x3a, 0x6c, 0x28, 0x52, 0xe1, 0x52, 0x49, 0x9d, 0x63, - 0x9f, 0xa0, 0x3d, 0xf4, 0x1d, 0xfa, 0x28, 0x3d, 0xe6, 0x98, 0x63, 0x91, 0x1c, 0x7a, 0xea, 0x33, - 0xb4, 0x98, 0x5d, 0x52, 0xa2, 0x5c, 0x05, 0x09, 0x72, 0xdb, 0xf9, 0x76, 0x76, 0xe6, 0xdb, 0x99, - 0xd9, 0x99, 0x05, 0x08, 0x42, 0x97, 0x1e, 0x2f, 0xa2, 0x30, 0x0e, 0x89, 0xbc, 0x38, 0xaf, 0xc3, - 0x32, 0xf6, 0x7c, 0x21, 0xab, 0x2f, 0x65, 0x00, 0xa3, 0x6d, 0x98, 0xf4, 0xc9, 0x92, 0xb2, 0x98, - 0xdc, 0x86, 0x4a, 0x24, 0x96, 0xf6, 0xe5, 0x82, 0xd6, 0xa4, 0xa6, 0xd4, 0xda, 0x6f, 0xef, 0x1f, - 0x2f, 0xce, 0x8f, 0x51, 0x49, 0xff, 0xde, 0x7e, 0x68, 0xe8, 0x66, 0x56, 0x85, 0x28, 0x90, 0x77, - 0x7c, 0xbf, 0x26, 0x37, 0xa5, 0x56, 0xc9, 0xc4, 0x25, 0xa9, 0xc1, 0xee, 0x53, 0x1a, 0x9d, 0x87, - 0x8c, 0xd6, 0xf2, 0x1c, 0x4d, 0x45, 0xa2, 0xc2, 0x1e, 0xf7, 0x3a, 0x0b, 0xfd, 0xb1, 0x33, 0xa7, - 0xb5, 0x42, 0x53, 0x6a, 0x95, 0xcd, 0x0d, 0x8c, 0x7c, 0x02, 0x55, 0xdf, 0x63, 0x31, 0x0d, 0x3a, - 0xae, 0x1b, 0x51, 0xc6, 0x6a, 0x3b, 0x5c, 0x69, 0x13, 0x44, 0xad, 0xd8, 0x89, 0x2e, 0x68, 0x9c, - 0x6a, 0x15, 0x85, 0xd6, 0x06, 0x88, 0x5a, 0x11, 0x9d, 0x87, 0x31, 0x4d, 0xb5, 0x76, 0x85, 0xd6, - 0x06, 0x48, 0xda, 0x70, 0xe8, 0xf8, 0x7e, 0xf8, 0xac, 0xb7, 0x64, 0x71, 0x38, 0x37, 0x12, 0x32, - 0xac, 0x56, 0xe2, 0xe4, 0xb7, 0xee, 0xe1, 0x4d, 0x22, 0xba, 0x08, 0xa3, 0xd8, 0xa0, 0x34, 0x1a, - 0x68, 0xb5, 0x32, 0xd7, 0xdd, 0xc0, 0xd4, 0x3f, 0x24, 0xa8, 0xf0, 0xd0, 0xb2, 0x45, 0x18, 0x30, - 0xfa, 0x1e, 0xb1, 0x3d, 0x84, 0x9d, 0xc0, 0x99, 0x53, 0x56, 0x93, 0x9b, 0xf9, 0x56, 0xd9, 0x14, - 0x02, 0x69, 0x42, 0x65, 0x16, 0x06, 0x01, 0xeb, 0xf9, 0x21, 0xa3, 0x2e, 0x8f, 0xf1, 0x8e, 0x99, - 0x85, 0xc8, 0x2d, 0xa8, 0xb0, 0x38, 0xa2, 0xce, 0x7c, 0x10, 0xfc, 0x18, 0xb2, 0x5a, 0xa1, 0x99, - 0x6f, 0x55, 0xda, 0xd5, 0xc4, 0xd3, 0x90, 0x21, 0x6a, 0x66, 0x35, 0xd4, 0xdf, 0x24, 0x28, 0xaf, - 0xb6, 0xfe, 0x97, 0x26, 0xe9, 0x5d, 0xd2, 0x24, 0xbf, 0x53, 0x9a, 0xf2, 0xdb, 0xd2, 0x74, 0x08, - 0x3b, 0x7e, 0x38, 0x73, 0x7c, 0x5e, 0x0f, 0x25, 0x53, 0x08, 0xea, 0x67, 0xa0, 0x9c, 0x52, 0x1e, - 0x4b, 0xb6, 0x0a, 0x61, 0x0d, 0x76, 0x17, 0x3c, 0xb8, 0xac, 0x26, 0xf1, 0x90, 0xa4, 0xa2, 0xfa, - 0x8b, 0x04, 0x07, 0xbd, 0x30, 0x08, 0x46, 0x17, 0xf3, 0x38, 0x2d, 0xe6, 0x2f, 0xb7, 0x05, 0xfc, - 0x3a, 0x86, 0xa1, 0x37, 0x19, 0x8f, 0x47, 0xa7, 0x23, 0x7b, 0x6b, 0xd4, 0x1b, 0x00, 0xf3, 0xa5, - 0x1f, 0x7b, 0x48, 0x2f, 0x0d, 0x7d, 0x06, 0xc9, 0x92, 0xc8, 0x6f, 0x92, 0xf8, 0x47, 0x06, 0x65, - 0x4d, 0x22, 0xe1, 0xfc, 0x9e, 0x2c, 0x3a, 0x50, 0xc6, 0x94, 0xd2, 0x59, 0x4c, 0x5d, 0x4e, 0xa2, - 0xd2, 0xfe, 0x98, 0x1f, 0xba, 0x62, 0x9f, 0x03, 0x5c, 0x4b, 0x0f, 0xe2, 0xe8, 0xd2, 0x5c, 0x9f, - 0x22, 0x27, 0x50, 0x64, 0xb1, 0x13, 0x2f, 0x05, 0xcf, 0x4a, 0xbb, 0xb9, 0xf5, 0xbc, 0xc5, 0x55, - 0xc4, 0xe1, 0x44, 0x3f, 0x7b, 0xc5, 0xc2, 0xc6, 0x15, 0xeb, 0x5f, 0xc3, 0xfe, 0xa6, 0x43, 0x6c, - 0x00, 0x8f, 0xe9, 0x65, 0x52, 0x24, 0xb8, 0xc4, 0x7c, 0x3e, 0x75, 0xfc, 0x25, 0x4d, 0x9a, 0x82, - 0x10, 0xbe, 0x92, 0x4f, 0xa4, 0xfa, 0x08, 0x2a, 0x19, 0x77, 0x5b, 0x8e, 0xb6, 0xb2, 0x47, 0x2b, - 0x6d, 0x92, 0x65, 0x2c, 0x4e, 0x66, 0xcc, 0xa9, 0x43, 0x41, 0x66, 0xbd, 0x89, 0xa5, 0xeb, 0x7a, - 0x6c, 0x1d, 0x38, 0x49, 0xbc, 0xcb, 0x2c, 0x46, 0x6e, 0x40, 0x31, 0xa2, 0x0e, 0x0b, 0x83, 0xa4, - 0x66, 0x13, 0x49, 0x7d, 0x0e, 0x55, 0xfd, 0xe7, 0x38, 0x72, 0x58, 0x5a, 0x3f, 0x77, 0xb6, 0x65, - 0xee, 0x1a, 0x52, 0xd2, 0x1f, 0xd8, 0x66, 0xc7, 0xda, 0x9a, 0xb7, 0x2f, 0xa0, 0x4a, 0xb9, 0x95, - 0x3e, 0x75, 0xe2, 0x65, 0x24, 0x6e, 0x92, 0xbc, 0x73, 0x71, 0x8c, 0x9f, 0xd9, 0x54, 0x52, 0x2f, - 0xe1, 0x5a, 0xd7, 0x0f, 0x67, 0x8f, 0x59, 0x1c, 0x46, 0x34, 0xf5, 0x4f, 0xa0, 0x30, 0xf3, 0xdc, - 0xb4, 0xd4, 0xf9, 0x9a, 0x7c, 0x0a, 0xbb, 0x11, 0x7d, 0xc2, 0xf9, 0x08, 0xc3, 0xfc, 0x59, 0x77, - 0x57, 0x5c, 0xd2, 0xdd, 0x44, 0x71, 0xb2, 0x88, 0xc5, 0xa3, 0xcb, 0x2a, 0x4e, 0x0c, 0xdb, 0x32, - 0xd3, 0x5d, 0xf5, 0x2e, 0x90, 0xac, 0xeb, 0xa4, 0x6a, 0x3f, 0x82, 0xe2, 0x39, 0x47, 0xb9, 0xf7, - 0x4a, 0xbb, 0xcc, 0x4f, 0x23, 0x62, 0x26, 0x1b, 0xea, 0xe7, 0xb0, 0xc3, 0x01, 0x4c, 0xe3, 0xcc, - 0x73, 0xd3, 0x34, 0xce, 0x3c, 0x17, 0x99, 0xbb, 0x4e, 0xec, 0x70, 0x8a, 0x7b, 0x26, 0x5f, 0xab, - 0x7f, 0xcb, 0x00, 0x9a, 0x73, 0xf1, 0xf6, 0x49, 0xa3, 0x75, 0x4e, 0xb7, 0x46, 0x76, 0x8b, 0x51, - 0x72, 0x13, 0xf6, 0xc3, 0xf3, 0x9f, 0xe8, 0x2c, 0xd6, 0x83, 0x59, 0xe8, 0x7a, 0xc1, 0x45, 0xd2, - 0x61, 0xae, 0xa0, 0xe4, 0x36, 0x5c, 0x67, 0x34, 0xf2, 0x1c, 0xdf, 0x7b, 0xee, 0xc4, 0x5e, 0x18, - 0xf4, 0xc3, 0x68, 0xee, 0xc4, 0xc9, 0x00, 0xda, 0xb6, 0x45, 0xea, 0x50, 0x7a, 0xe4, 0xb0, 0x47, - 0xfd, 0x65, 0x30, 0x4b, 0x46, 0xd0, 0x4a, 0xc6, 0x0e, 0x31, 0xf3, 0xdc, 0x7b, 0x34, 0x62, 0x5e, - 0x18, 0xf0, 0xd1, 0x93, 0x37, 0x33, 0x08, 0x32, 0x45, 0xdd, 0x64, 0xdc, 0xf0, 0x35, 0xb9, 0x05, - 0x3b, 0xbe, 0x17, 0x3c, 0xc6, 0xb1, 0x82, 0xf1, 0xfc, 0x90, 0xdf, 0x74, 0x15, 0x8e, 0xe3, 0x21, - 0xee, 0x89, 0x47, 0x28, 0xf4, 0xea, 0x27, 0x00, 0x6b, 0xf0, 0x6d, 0xaf, 0xac, 0x9c, 0x7d, 0x16, - 0xbf, 0x4b, 0x50, 0xe1, 0xa6, 0xdf, 0x3a, 0x78, 0xde, 0x14, 0xea, 0x1b, 0x50, 0x44, 0xd2, 0xab, - 0xc9, 0x93, 0x48, 0xd8, 0x17, 0x22, 0xe7, 0x99, 0x86, 0x59, 0xc8, 0xf3, 0x2c, 0xa4, 0x22, 0x51, - 0xd3, 0xeb, 0x89, 0x61, 0xb3, 0x87, 0xd6, 0x07, 0xc6, 0x50, 0xc3, 0x2b, 0x24, 0x37, 0x52, 0xfb, - 0x50, 0x4a, 0xa1, 0x55, 0x88, 0x24, 0x91, 0x4c, 0x1e, 0x22, 0x02, 0x05, 0x9c, 0x70, 0xc9, 0x85, - 0xf8, 0x1a, 0x31, 0xe6, 0x3d, 0x17, 0x3f, 0x89, 0x82, 0xc9, 0xd7, 0x6a, 0x57, 0xd8, 0x19, 0x87, - 0x2e, 0x5d, 0xfb, 0x95, 0xdf, 0xe8, 0x77, 0x55, 0x38, 0xd2, 0xba, 0x70, 0x8e, 0x4e, 0xc4, 0xb7, - 0x47, 0x5c, 0x9e, 0x94, 0x61, 0xa7, 0x37, 0x9c, 0x58, 0xba, 0x92, 0x23, 0x15, 0xd8, 0xed, 0x4f, - 0xcc, 0xfb, 0x1d, 0x53, 0x53, 0x24, 0x02, 0x50, 0x1c, 0x0e, 0x2c, 0x5b, 0x1f, 0x2b, 0x32, 0x29, - 0x82, 0x3c, 0xb4, 0x94, 0xfc, 0xd1, 0x19, 0x1c, 0x5c, 0x69, 0xdc, 0x64, 0x1f, 0xa0, 0x37, 0x9a, - 0x22, 0xaa, 0xf7, 0x6c, 0x25, 0x47, 0xae, 0x41, 0xb5, 0x37, 0x9a, 0x6a, 0x03, 0x2b, 0x85, 0x24, - 0x52, 0x85, 0x72, 0x6f, 0x34, 0xb5, 0xec, 0x8e, 0x7d, 0x66, 0x29, 0x32, 0x51, 0x60, 0xaf, 0x37, - 0x9a, 0x9e, 0xea, 0xf6, 0xd4, 0xd0, 0x75, 0x13, 0xcd, 0x1e, 0x43, 0x75, 0xa3, 0xab, 0xe0, 0x09, - 0xfd, 0xc1, 0x54, 0x1f, 0x77, 0xba, 0x43, 0xe4, 0xb5, 0x0f, 0xa0, 0x3f, 0x40, 0x9b, 0x5c, 0x96, - 0x8e, 0xbe, 0x45, 0x39, 0x6d, 0x27, 0x64, 0x0f, 0x4a, 0x03, 0x4d, 0x1f, 0xdb, 0x83, 0xfe, 0x43, - 0x25, 0x87, 0xb4, 0x8d, 0xb3, 0xae, 0x75, 0xd6, 0x15, 0x8e, 0x39, 0x91, 0x7b, 0xba, 0xf9, 0x50, - 0x91, 0x49, 0x09, 0x0a, 0x23, 0x6d, 0x8c, 0x0e, 0x6d, 0x28, 0x77, 0xb3, 0xce, 0xba, 0xd6, 0x54, - 0xd3, 0x87, 0xba, 0xad, 0x0b, 0x03, 0x5d, 0x6b, 0x6a, 0x9c, 0x21, 0xf3, 0x03, 0xa8, 0x88, 0xf5, - 0x74, 0xd4, 0x19, 0xa3, 0x09, 0xb1, 0x79, 0xaa, 0xdb, 0x4a, 0x3e, 0xd9, 0xc4, 0x7b, 0xf0, 0xcd, - 0xc2, 0xd1, 0xcd, 0xc4, 0x2a, 0xf6, 0x18, 0x8c, 0xa5, 0xa6, 0xf7, 0x3b, 0x67, 0x43, 0x0c, 0xca, - 0x1e, 0x94, 0xba, 0xd6, 0xb4, 0x3f, 0x31, 0x7b, 0x48, 0xff, 0x07, 0x80, 0x75, 0xf1, 0x71, 0xc5, - 0xce, 0x29, 0x77, 0x98, 0x4b, 0x05, 0x74, 0x20, 0x61, 0xa0, 0x50, 0x18, 0xeb, 0xf7, 0xa7, 0xe3, - 0x89, 0xa6, 0x2b, 0x32, 0x06, 0x17, 0x91, 0x8e, 0xa6, 0x4d, 0x87, 0x83, 0xf1, 0x77, 0x96, 0x92, - 0x4f, 0x21, 0xa4, 0x21, 0xa0, 0x42, 0xfb, 0x5f, 0x09, 0x76, 0xb1, 0x40, 0x3a, 0xc6, 0x80, 0xdc, - 0x85, 0x52, 0x3a, 0x26, 0xc8, 0xf5, 0xcd, 0x19, 0xc8, 0x4b, 0xbe, 0x7e, 0xb8, 0x6d, 0x30, 0xaa, - 0x39, 0xd2, 0x82, 0xa2, 0x98, 0x08, 0x44, 0x74, 0xfd, 0xec, 0x74, 0xa8, 0xf3, 0x8e, 0xa8, 0xcf, - 0x17, 0xf1, 0x25, 0xd7, 0xcc, 0x1b, 0x6d, 0x83, 0xac, 0x7e, 0x73, 0x89, 0xce, 0xc1, 0x4a, 0x5e, - 0xd9, 0xfc, 0x06, 0x60, 0xdd, 0x6e, 0xc9, 0x07, 0xab, 0xb6, 0x9a, 0xed, 0xfc, 0xf5, 0x1b, 0x57, - 0xe1, 0x0c, 0xa5, 0xbc, 0xe6, 0x5c, 0x08, 0x47, 0xeb, 0xf6, 0x21, 0x1c, 0x65, 0xde, 0xbc, 0x9a, - 0xeb, 0xd6, 0xfe, 0x7c, 0xd5, 0x90, 0x5e, 0xbc, 0x6a, 0x48, 0x7f, 0xbd, 0x6a, 0x48, 0xbf, 0xbe, - 0x6e, 0xe4, 0x5e, 0xbc, 0x6e, 0xe4, 0x5e, 0xbe, 0x6e, 0xe4, 0xce, 0x8b, 0xfc, 0x27, 0x77, 0xe7, - 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2a, 0x6e, 0x47, 0x99, 0x18, 0x0c, 0x00, 0x00, + 0x10, 0x16, 0xa9, 0x1f, 0x4b, 0x23, 0xcb, 0x66, 0x36, 0x6e, 0xa0, 0xea, 0x20, 0xa8, 0x6c, 0x91, + 0x0a, 0x46, 0xeb, 0x18, 0x4a, 0x8b, 0x18, 0x45, 0x8b, 0x42, 0x12, 0x29, 0x43, 0xa8, 0xfe, 0x4a, + 0xd2, 0xf9, 0xb9, 0x54, 0xa0, 0xc5, 0xad, 0xc3, 0x86, 0x22, 0x15, 0x2e, 0x95, 0xd4, 0x39, 0xf6, + 0x09, 0xda, 0x43, 0xdf, 0xa1, 0xd7, 0xbe, 0x45, 0x8f, 0x39, 0xe6, 0x58, 0x24, 0x87, 0x9e, 0xfa, + 0x0e, 0xc5, 0xec, 0x92, 0x12, 0xe5, 0x2a, 0x70, 0x90, 0xdb, 0xce, 0xb7, 0xb3, 0x33, 0xdf, 0xce, + 0xcc, 0xce, 0x2c, 0x80, 0x1f, 0x38, 0xf4, 0x68, 0x11, 0x06, 0x51, 0x40, 0xe4, 0xc5, 0x79, 0x0d, + 0x96, 0x91, 0xeb, 0x09, 0x59, 0x7d, 0x25, 0x03, 0x4c, 0x5a, 0x13, 0x83, 0x3e, 0x5d, 0x52, 0x16, + 0x91, 0x63, 0x28, 0x87, 0x62, 0x69, 0x5d, 0x2e, 0x68, 0x55, 0x6a, 0x48, 0xcd, 0xbd, 0xd6, 0xde, + 0xd1, 0xe2, 0xfc, 0x08, 0x95, 0xf4, 0xef, 0xad, 0x47, 0x13, 0xdd, 0x48, 0xab, 0x10, 0x05, 0xb2, + 0xb6, 0xe7, 0x55, 0xe5, 0x86, 0xd4, 0x2c, 0x1a, 0xb8, 0x24, 0x55, 0xd8, 0x79, 0x46, 0xc3, 0xf3, + 0x80, 0xd1, 0x6a, 0x96, 0xa3, 0x89, 0x48, 0x54, 0xd8, 0xe5, 0x5e, 0x67, 0x81, 0x37, 0xb2, 0xe7, + 0xb4, 0x9a, 0x6b, 0x48, 0xcd, 0x92, 0xb1, 0x81, 0x91, 0x4f, 0xa0, 0xe2, 0xb9, 0x2c, 0xa2, 0x7e, + 0xdb, 0x71, 0x42, 0xca, 0x58, 0x35, 0xcf, 0x95, 0x36, 0x41, 0xd4, 0x8a, 0xec, 0xf0, 0x82, 0x46, + 0x89, 0x56, 0x41, 0x68, 0x6d, 0x80, 0xa8, 0x15, 0xd2, 0x79, 0x10, 0xd1, 0x44, 0x6b, 0x47, 0x68, + 0x6d, 0x80, 0xa4, 0x05, 0x07, 0xb6, 0xe7, 0x05, 0xcf, 0xbb, 0x4b, 0x16, 0x05, 0xf3, 0x49, 0x4c, + 0x86, 0x55, 0x8b, 0x9c, 0xfc, 0xd6, 0x3d, 0xbc, 0x49, 0x48, 0x17, 0x41, 0x18, 0x4d, 0x28, 0x0d, + 0xfb, 0x5a, 0xb5, 0xc4, 0x75, 0x37, 0x30, 0xf5, 0x0f, 0x09, 0xca, 0x3c, 0xb4, 0x6c, 0x11, 0xf8, + 0x8c, 0xbe, 0x47, 0x6c, 0x0f, 0x20, 0xef, 0xdb, 0x73, 0xca, 0xaa, 0x72, 0x23, 0xdb, 0x2c, 0x19, + 0x42, 0x20, 0x0d, 0x28, 0xcf, 0x02, 0xdf, 0x67, 0x5d, 0x2f, 0x60, 0xd4, 0xe1, 0x31, 0xce, 0x1b, + 0x69, 0x88, 0xdc, 0x81, 0x32, 0x8b, 0x42, 0x6a, 0xcf, 0xfb, 0xfe, 0x8f, 0x01, 0xab, 0xe6, 0x1a, + 0xd9, 0x66, 0xb9, 0x55, 0x89, 0x3d, 0x0d, 0x18, 0xa2, 0x46, 0x5a, 0x43, 0xfd, 0x4d, 0x82, 0xd2, + 0x6a, 0xeb, 0x7f, 0x69, 0x92, 0xde, 0x25, 0x4d, 0xf2, 0x3b, 0xa5, 0x29, 0xbb, 0x2d, 0x4d, 0x07, + 0x90, 0xf7, 0x82, 0x99, 0xed, 0xf1, 0x7a, 0x28, 0x1a, 0x42, 0x50, 0x3f, 0x03, 0xe5, 0x94, 0xf2, + 0x58, 0xb2, 0x55, 0x08, 0xab, 0xb0, 0xb3, 0xe0, 0xc1, 0x65, 0x55, 0x89, 0x87, 0x24, 0x11, 0xd5, + 0x5f, 0x24, 0xd8, 0xef, 0x06, 0xbe, 0x3f, 0xbc, 0x98, 0x47, 0x49, 0x31, 0x7f, 0xb9, 0x2d, 0xe0, + 0x37, 0x31, 0x0c, 0xdd, 0xf1, 0x68, 0x34, 0x3c, 0x1d, 0x5a, 0x5b, 0xa3, 0x5e, 0x07, 0x98, 0x2f, + 0xbd, 0xc8, 0x45, 0x7a, 0x49, 0xe8, 0x53, 0x48, 0x9a, 0x44, 0x76, 0x93, 0xc4, 0xbf, 0x32, 0x28, + 0x6b, 0x12, 0x31, 0xe7, 0xf7, 0x64, 0xd1, 0x86, 0x12, 0xa6, 0x94, 0xce, 0x22, 0xea, 0x70, 0x12, + 0xe5, 0xd6, 0xc7, 0xfc, 0xd0, 0x15, 0xfb, 0x1c, 0xe0, 0x5a, 0xba, 0x1f, 0x85, 0x97, 0xc6, 0xfa, + 0x14, 0x39, 0x81, 0x02, 0x8b, 0xec, 0x68, 0x29, 0x78, 0x96, 0x5b, 0x8d, 0xad, 0xe7, 0x4d, 0xae, + 0x22, 0x0e, 0xc7, 0xfa, 0xe9, 0x2b, 0xe6, 0x36, 0xae, 0x58, 0xfb, 0x1a, 0xf6, 0x36, 0x1d, 0x62, + 0x03, 0x78, 0x42, 0x2f, 0xe3, 0x22, 0xc1, 0x25, 0xe6, 0xf3, 0x99, 0xed, 0x2d, 0x69, 0xdc, 0x14, + 0x84, 0xf0, 0x95, 0x7c, 0x22, 0xd5, 0x86, 0x50, 0x4e, 0xb9, 0xdb, 0x72, 0xb4, 0x99, 0x3e, 0x5a, + 0x6e, 0x91, 0x34, 0x63, 0x71, 0x32, 0x65, 0x4e, 0x1d, 0x08, 0x32, 0xeb, 0x4d, 0x2c, 0x5d, 0xc7, + 0x65, 0xeb, 0xc0, 0x49, 0xe2, 0x5d, 0xa6, 0x31, 0x72, 0x0b, 0x0a, 0x21, 0xb5, 0x59, 0xe0, 0xc7, + 0x35, 0x1b, 0x4b, 0xea, 0x0b, 0xa8, 0xe8, 0x3f, 0x47, 0xa1, 0xcd, 0x92, 0xfa, 0xb9, 0xbb, 0x2d, + 0x73, 0x37, 0x90, 0x92, 0xfe, 0xd0, 0x32, 0xda, 0xe6, 0xd6, 0xbc, 0x7d, 0x01, 0x15, 0xca, 0xad, + 0xf4, 0xa8, 0x1d, 0x2d, 0x43, 0x71, 0x93, 0xf8, 0x9d, 0x8b, 0x63, 0xfc, 0xcc, 0xa6, 0x92, 0x7a, + 0x09, 0x37, 0x3a, 0x5e, 0x30, 0x7b, 0xc2, 0xa2, 0x20, 0xa4, 0x89, 0x7f, 0x02, 0xb9, 0x99, 0xeb, + 0x24, 0xa5, 0xce, 0xd7, 0xe4, 0x53, 0xd8, 0x09, 0xe9, 0x53, 0xce, 0x47, 0x18, 0xe6, 0xcf, 0xba, + 0xb3, 0xe2, 0x92, 0xec, 0xc6, 0x8a, 0xe3, 0x45, 0x24, 0x1e, 0x5d, 0x5a, 0x71, 0x3c, 0xb1, 0x4c, + 0x23, 0xd9, 0x55, 0xef, 0x01, 0x49, 0xbb, 0x8e, 0xab, 0xf6, 0x23, 0x28, 0x9c, 0x73, 0x94, 0x7b, + 0x2f, 0xb7, 0x4a, 0xfc, 0x34, 0x22, 0x46, 0xbc, 0xa1, 0x7e, 0x0e, 0x79, 0x0e, 0x60, 0x1a, 0x67, + 0xae, 0x93, 0xa4, 0x71, 0xe6, 0x3a, 0xc8, 0xdc, 0xb1, 0x23, 0x9b, 0x53, 0xdc, 0x35, 0xf8, 0x5a, + 0xfd, 0x47, 0x06, 0xd0, 0xec, 0x8b, 0xeb, 0x27, 0x8d, 0xd6, 0x3e, 0xdd, 0x1a, 0xd9, 0x2d, 0x46, + 0xc9, 0x6d, 0xd8, 0x0b, 0xce, 0x7f, 0xa2, 0xb3, 0x48, 0xf7, 0x67, 0x81, 0xe3, 0xfa, 0x17, 0x71, + 0x87, 0xb9, 0x82, 0x92, 0x63, 0xb8, 0xc9, 0x68, 0xe8, 0xda, 0x9e, 0xfb, 0xc2, 0x8e, 0xdc, 0xc0, + 0xef, 0x05, 0xe1, 0xdc, 0x8e, 0xe2, 0x01, 0xb4, 0x6d, 0x8b, 0xd4, 0xa0, 0xf8, 0xd8, 0x66, 0x8f, + 0x7b, 0x4b, 0x7f, 0x16, 0x8f, 0xa0, 0x95, 0x8c, 0x1d, 0x62, 0xe6, 0x3a, 0xf7, 0x69, 0xc8, 0xdc, + 0xc0, 0xe7, 0xa3, 0x27, 0x6b, 0xa4, 0x10, 0x64, 0x8a, 0xba, 0xf1, 0xb8, 0xe1, 0x6b, 0x72, 0x07, + 0xf2, 0x9e, 0xeb, 0x3f, 0xc1, 0xb1, 0x82, 0xf1, 0xfc, 0x90, 0xdf, 0x74, 0x15, 0x8e, 0xa3, 0x01, + 0xee, 0x89, 0x47, 0x28, 0xf4, 0x6a, 0x27, 0x00, 0x6b, 0xf0, 0xba, 0x57, 0x56, 0x4a, 0x3f, 0x8b, + 0xdf, 0x25, 0x28, 0x73, 0xd3, 0xd7, 0x0e, 0x9e, 0xb7, 0x85, 0xfa, 0x16, 0x14, 0x90, 0xf4, 0x6a, + 0xf2, 0xc4, 0x12, 0xf6, 0x85, 0xd0, 0x7e, 0xae, 0x61, 0x16, 0xb2, 0x3c, 0x0b, 0x89, 0x48, 0xd4, + 0xe4, 0x7a, 0x62, 0xd8, 0xec, 0xa2, 0xf5, 0xfe, 0x64, 0xa0, 0xe1, 0x15, 0xe2, 0x1b, 0xa9, 0x3d, + 0x28, 0x26, 0xd0, 0x2a, 0x44, 0x92, 0x48, 0x26, 0x0f, 0x11, 0x81, 0x1c, 0x4e, 0xb8, 0xf8, 0x42, + 0x7c, 0x8d, 0x18, 0x73, 0x5f, 0x88, 0x9f, 0x44, 0xce, 0xe0, 0x6b, 0xb5, 0x23, 0xec, 0x8c, 0x02, + 0x87, 0xae, 0xfd, 0xca, 0x6f, 0xf5, 0xbb, 0x2a, 0x1c, 0x69, 0x5d, 0x38, 0x87, 0x27, 0xe2, 0xdb, + 0x23, 0x2e, 0x4f, 0x4a, 0x90, 0xef, 0x0e, 0xc6, 0xa6, 0xae, 0x64, 0x48, 0x19, 0x76, 0x7a, 0x63, + 0xe3, 0x41, 0xdb, 0xd0, 0x14, 0x89, 0x00, 0x14, 0x06, 0x7d, 0xd3, 0xd2, 0x47, 0x8a, 0x4c, 0x0a, + 0x20, 0x0f, 0x4c, 0x25, 0x7b, 0x78, 0x06, 0xfb, 0x57, 0x1a, 0x37, 0xd9, 0x03, 0xe8, 0x0e, 0xa7, + 0x88, 0xea, 0x5d, 0x4b, 0xc9, 0x90, 0x1b, 0x50, 0xe9, 0x0e, 0xa7, 0x5a, 0xdf, 0x4c, 0x20, 0x89, + 0x54, 0xa0, 0xd4, 0x1d, 0x4e, 0x4d, 0xab, 0x6d, 0x9d, 0x99, 0x8a, 0x4c, 0x14, 0xd8, 0xed, 0x0e, + 0xa7, 0xa7, 0xba, 0x35, 0x9d, 0xe8, 0xba, 0x81, 0x66, 0x8f, 0xa0, 0xb2, 0xd1, 0x55, 0xf0, 0x84, + 0xfe, 0x70, 0xaa, 0x8f, 0xda, 0x9d, 0x01, 0xf2, 0xda, 0x03, 0xd0, 0x1f, 0xa2, 0x4d, 0x2e, 0x4b, + 0x87, 0xdf, 0xa2, 0x9c, 0xb4, 0x13, 0xb2, 0x0b, 0xc5, 0xbe, 0xa6, 0x8f, 0xac, 0x7e, 0xef, 0x91, + 0x92, 0x41, 0xda, 0x93, 0xb3, 0x8e, 0x79, 0xd6, 0x11, 0x8e, 0x39, 0x91, 0xfb, 0xba, 0xf1, 0x48, + 0x91, 0x49, 0x11, 0x72, 0x43, 0x6d, 0x84, 0x0e, 0x2d, 0x28, 0x75, 0xd2, 0xce, 0x3a, 0xe6, 0x54, + 0xd3, 0x07, 0xba, 0xa5, 0x0b, 0x03, 0x1d, 0x73, 0x3a, 0x39, 0x43, 0xe6, 0xfb, 0x50, 0x16, 0xeb, + 0xe9, 0xb0, 0x3d, 0x42, 0x13, 0x62, 0xf3, 0x54, 0xb7, 0x94, 0x6c, 0xbc, 0x89, 0xf7, 0xe0, 0x9b, + 0xb9, 0xc3, 0xdb, 0xb1, 0x55, 0xec, 0x31, 0x18, 0x4b, 0x4d, 0xef, 0xb5, 0xcf, 0x06, 0x18, 0x94, + 0x5d, 0x28, 0x76, 0xcc, 0x69, 0x6f, 0x6c, 0x74, 0x91, 0xfe, 0x0f, 0x00, 0xeb, 0xe2, 0xe3, 0x8a, + 0xed, 0x53, 0xee, 0x30, 0x93, 0x08, 0xe8, 0x40, 0xc2, 0x40, 0xa1, 0x30, 0xd2, 0x1f, 0x4c, 0x47, + 0x63, 0x4d, 0x57, 0x64, 0x0c, 0x2e, 0x22, 0x6d, 0x4d, 0x9b, 0x0e, 0xfa, 0xa3, 0xef, 0x4c, 0x25, + 0x9b, 0x40, 0x48, 0x43, 0x40, 0xb9, 0xd6, 0x9f, 0x32, 0xec, 0x60, 0x81, 0xb4, 0x27, 0x7d, 0x72, + 0x0f, 0x8a, 0xc9, 0x98, 0x20, 0x37, 0x37, 0x67, 0x20, 0x2f, 0xf9, 0xda, 0xc1, 0xb6, 0xc1, 0xa8, + 0x66, 0x48, 0x13, 0x0a, 0x62, 0x22, 0x10, 0xd1, 0xf5, 0xd3, 0xd3, 0xa1, 0xc6, 0x3b, 0xa2, 0x3e, + 0x5f, 0x44, 0x97, 0x5c, 0x33, 0x3b, 0x69, 0x4d, 0xc8, 0xea, 0x37, 0x17, 0xeb, 0xec, 0xaf, 0xe4, + 0x95, 0xcd, 0x6f, 0x00, 0xd6, 0xed, 0x96, 0x7c, 0xb0, 0x6a, 0xab, 0xe9, 0xce, 0x5f, 0xbb, 0x75, + 0x15, 0x4e, 0x51, 0xca, 0x6a, 0xf6, 0x85, 0x70, 0xb4, 0x6e, 0x1f, 0xc2, 0x51, 0xea, 0xcd, 0xab, + 0x19, 0x72, 0x0c, 0x25, 0xcd, 0xbe, 0x30, 0xf9, 0x2f, 0xef, 0x5a, 0xfd, 0xa6, 0x74, 0x2c, 0x75, + 0xaa, 0x7f, 0xbd, 0xae, 0x4b, 0x2f, 0x5f, 0xd7, 0xa5, 0xbf, 0x5f, 0xd7, 0xa5, 0x5f, 0xdf, 0xd4, + 0x33, 0x2f, 0xdf, 0xd4, 0x33, 0xaf, 0xde, 0xd4, 0x33, 0xe7, 0x05, 0xfe, 0xf7, 0xbb, 0xfb, 0x5f, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xaf, 0x5c, 0xed, 0x69, 0x4a, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1444,6 +1445,8 @@ type NodeAPIClient interface { Blockstore(ctx context.Context, in *BlockstoreRequest, opts ...grpc.CallOption) (*BlockstoreResponse, error) // Dag is a unidirectional rpc allowing manipulation of low-level ipld objects Dag(ctx context.Context, in *DagRequest, opts ...grpc.CallOption) (*DagResponse, error) + // DagStream is like Dag but with bidirectional streams + DagStream(ctx context.Context, opts ...grpc.CallOption) (NodeAPI_DagStreamClient, error) } type nodeAPIClient struct { @@ -1499,6 +1502,37 @@ func (c *nodeAPIClient) Dag(ctx context.Context, in *DagRequest, opts ...grpc.Ca return out, nil } +func (c *nodeAPIClient) DagStream(ctx context.Context, opts ...grpc.CallOption) (NodeAPI_DagStreamClient, error) { + stream, err := c.cc.NewStream(ctx, &_NodeAPI_serviceDesc.Streams[0], "/pb.NodeAPI/DagStream", opts...) + if err != nil { + return nil, err + } + x := &nodeAPIDagStreamClient{stream} + return x, nil +} + +type NodeAPI_DagStreamClient interface { + Send(*DagRequest) error + Recv() (*DagResponse, error) + grpc.ClientStream +} + +type nodeAPIDagStreamClient struct { + grpc.ClientStream +} + +func (x *nodeAPIDagStreamClient) Send(m *DagRequest) error { + return x.ClientStream.SendMsg(m) +} + +func (x *nodeAPIDagStreamClient) Recv() (*DagResponse, error) { + m := new(DagResponse) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + // NodeAPIServer is the server API for NodeAPI service. type NodeAPIServer interface { // ConnMgmt provides control over libp2p connections @@ -1513,6 +1547,8 @@ type NodeAPIServer interface { Blockstore(context.Context, *BlockstoreRequest) (*BlockstoreResponse, error) // Dag is a unidirectional rpc allowing manipulation of low-level ipld objects Dag(context.Context, *DagRequest) (*DagResponse, error) + // DagStream is like Dag but with bidirectional streams + DagStream(NodeAPI_DagStreamServer) error } // UnimplementedNodeAPIServer can be embedded to have forward compatible implementations. @@ -1534,6 +1570,9 @@ func (*UnimplementedNodeAPIServer) Blockstore(ctx context.Context, req *Blocksto func (*UnimplementedNodeAPIServer) Dag(ctx context.Context, req *DagRequest) (*DagResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Dag not implemented") } +func (*UnimplementedNodeAPIServer) DagStream(srv NodeAPI_DagStreamServer) error { + return status.Errorf(codes.Unimplemented, "method DagStream not implemented") +} func RegisterNodeAPIServer(s *grpc.Server, srv NodeAPIServer) { s.RegisterService(&_NodeAPI_serviceDesc, srv) @@ -1629,6 +1668,32 @@ func _NodeAPI_Dag_Handler(srv interface{}, ctx context.Context, dec func(interfa return interceptor(ctx, in, info, handler) } +func _NodeAPI_DagStream_Handler(srv interface{}, stream grpc.ServerStream) error { + return srv.(NodeAPIServer).DagStream(&nodeAPIDagStreamServer{stream}) +} + +type NodeAPI_DagStreamServer interface { + Send(*DagResponse) error + Recv() (*DagRequest, error) + grpc.ServerStream +} + +type nodeAPIDagStreamServer struct { + grpc.ServerStream +} + +func (x *nodeAPIDagStreamServer) Send(m *DagResponse) error { + return x.ServerStream.SendMsg(m) +} + +func (x *nodeAPIDagStreamServer) Recv() (*DagRequest, error) { + m := new(DagRequest) + if err := x.ServerStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} + var _NodeAPI_serviceDesc = grpc.ServiceDesc{ ServiceName: "pb.NodeAPI", HandlerType: (*NodeAPIServer)(nil), @@ -1654,7 +1719,14 @@ var _NodeAPI_serviceDesc = grpc.ServiceDesc{ Handler: _NodeAPI_Dag_Handler, }, }, - Streams: []grpc.StreamDesc{}, + Streams: []grpc.StreamDesc{ + { + StreamName: "DagStream", + Handler: _NodeAPI_DagStream_Handler, + ServerStreams: true, + ClientStreams: true, + }, + }, Metadata: "node.proto", } diff --git a/java/pb/NodeAPIGrpc.java b/java/pb/NodeAPIGrpc.java index 3e51960..f3c41a4 100644 --- a/java/pb/NodeAPIGrpc.java +++ b/java/pb/NodeAPIGrpc.java @@ -190,6 +190,38 @@ pb.Node.DagResponse> getDagMethod() { return getDagMethod; } + private static volatile io.grpc.MethodDescriptor getDagStreamMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "DagStream", + requestType = pb.Node.DagRequest.class, + responseType = pb.Node.DagResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) + public static io.grpc.MethodDescriptor getDagStreamMethod() { + io.grpc.MethodDescriptor getDagStreamMethod; + if ((getDagStreamMethod = NodeAPIGrpc.getDagStreamMethod) == null) { + synchronized (NodeAPIGrpc.class) { + if ((getDagStreamMethod = NodeAPIGrpc.getDagStreamMethod) == null) { + NodeAPIGrpc.getDagStreamMethod = getDagStreamMethod = + io.grpc.MethodDescriptor.newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.BIDI_STREAMING) + .setFullMethodName(generateFullMethodName( + "pb.NodeAPI", "DagStream")) + .setSampledToLocalTracing(true) + .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + pb.Node.DagRequest.getDefaultInstance())) + .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + pb.Node.DagResponse.getDefaultInstance())) + .setSchemaDescriptor(new NodeAPIMethodDescriptorSupplier("DagStream")) + .build(); + } + } + } + return getDagStreamMethod; + } + /** * Creates a new async stub that supports all call types for the service */ @@ -272,6 +304,16 @@ public void dag(pb.Node.DagRequest request, asyncUnimplementedUnaryCall(getDagMethod(), responseObserver); } + /** + * 
+     * DagStream is like Dag but with bidirectional streams
+     *
+ */ + public io.grpc.stub.StreamObserver dagStream( + io.grpc.stub.StreamObserver responseObserver) { + return asyncUnimplementedStreamingCall(getDagStreamMethod(), responseObserver); + } + @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() { return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor()) .addMethod( @@ -309,6 +351,13 @@ public void dag(pb.Node.DagRequest request, pb.Node.DagRequest, pb.Node.DagResponse>( this, METHODID_DAG))) + .addMethod( + getDagStreamMethod(), + asyncBidiStreamingCall( + new MethodHandlers< + pb.Node.DagRequest, + pb.Node.DagResponse>( + this, METHODID_DAG_STREAM))) .build(); } } @@ -390,6 +439,17 @@ public void dag(pb.Node.DagRequest request, asyncUnaryCall( getChannel().newCall(getDagMethod(), getCallOptions()), request, responseObserver); } + + /** + * 
+     * DagStream is like Dag but with bidirectional streams
+     *
+ */ + public io.grpc.stub.StreamObserver dagStream( + io.grpc.stub.StreamObserver responseObserver) { + return asyncBidiStreamingCall( + getChannel().newCall(getDagStreamMethod(), getCallOptions()), responseObserver); + } } /** @@ -550,6 +610,7 @@ public com.google.common.util.concurrent.ListenableFuture d private static final int METHODID_P2P = 2; private static final int METHODID_BLOCKSTORE = 3; private static final int METHODID_DAG = 4; + private static final int METHODID_DAG_STREAM = 5; private static final class MethodHandlers implements io.grpc.stub.ServerCalls.UnaryMethod, @@ -598,6 +659,9 @@ public void invoke(Req request, io.grpc.stub.StreamObserver responseObserv public io.grpc.stub.StreamObserver invoke( io.grpc.stub.StreamObserver responseObserver) { switch (methodId) { + case METHODID_DAG_STREAM: + return (io.grpc.stub.StreamObserver) serviceImpl.dagStream( + (io.grpc.stub.StreamObserver) responseObserver); default: throw new AssertionError(); } @@ -654,6 +718,7 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() { .addMethod(getP2PMethod()) .addMethod(getBlockstoreMethod()) .addMethod(getDagMethod()) + .addMethod(getDagStreamMethod()) .build(); } } diff --git a/js/node_grpc_pb.js b/js/node_grpc_pb.js index 52acefb..00e5e54 100644 --- a/js/node_grpc_pb.js +++ b/js/node_grpc_pb.js @@ -180,6 +180,18 @@ var NodeAPIService = exports.NodeAPIService = { responseSerialize: serialize_pb_DagResponse, responseDeserialize: deserialize_pb_DagResponse, }, + // DagStream is like Dag but with bidirectional streams + dagStream: { + path: '/pb.NodeAPI/DagStream', + requestStream: true, + responseStream: true, + requestType: node_pb.DagRequest, + responseType: node_pb.DagResponse, + requestSerialize: serialize_pb_DagRequest, + requestDeserialize: deserialize_pb_DagRequest, + responseSerialize: serialize_pb_DagResponse, + responseDeserialize: deserialize_pb_DagResponse, + }, }; exports.NodeAPIClient = grpc.makeGenericClientConstructor(NodeAPIService); diff --git a/pb/node.proto b/pb/node.proto index 3b533c6..12365c5 100644 --- a/pb/node.proto +++ b/pb/node.proto @@ -16,6 +16,8 @@ service NodeAPI { rpc Blockstore(BlockstoreRequest) returns (BlockstoreResponse) { }; // Dag is a unidirectional rpc allowing manipulation of low-level ipld objects rpc Dag(DagRequest) returns (DagResponse) { }; + // DagStream is like Dag but with bidirectional streams + rpc DagStream(stream DagRequest) returns (stream DagResponse); } // P2PREQTYPE denotes the particular type of request being used in the p2p rpc diff --git a/py/node_pb2.py b/py/node_pb2.py index 964cdfb..bae85fa 100644 --- a/py/node_pb2.py +++ b/py/node_pb2.py @@ -22,7 +22,7 @@ package='pb', syntax='proto3', serialized_options=None, - serialized_pb=_b('\n\nnode.proto\x12\x02pb\x1a\nutil.proto\"\xde\x01\n\nP2PRequest\x12#\n\x0brequestType\x18\x01 \x01(\x0e\x32\x0e.pb.P2PREQTYPE\x12\x0b\n\x03\x61ll\x18\x02 \x01(\x08\x12\x0f\n\x07verbose\x18\x03 \x01(\x08\x12\x14\n\x0cprotocolName\x18\x04 \x01(\t\x12\x15\n\rlistenAddress\x18\x05 \x01(\t\x12\x15\n\rtargetAddress\x18\x06 \x01(\t\x12\x15\n\rremoteAddress\x18\x07 \x01(\t\x12\x1c\n\x14\x61llowCustomProtocols\x18\x08 \x01(\x08\x12\x14\n\x0creportPeerID\x18\t \x01(\x08\"z\n\x0bP2PResponse\x12#\n\x0brequestType\x18\x01 \x01(\x0e\x32\x0e.pb.P2PREQTYPE\x12\r\n\x05names\x18\x02 \x03(\t\x12\x13\n\x0b\x63onnsClosed\x18\x03 \x01(\x05\x12\"\n\x0bstreamInfos\x18\x04 \x03(\x0b\x32\r.pb.P2PLsInfo\"^\n\tP2PLsInfo\x12\x14\n\x0cprotocolName\x18\x01 \x01(\t\x12\x15\n\rlistenAddress\x18\x02 \x01(\t\x12\x15\n\rtargetAddress\x18\x03 \x01(\t\x12\r\n\x05local\x18\x04 \x01(\x08\"#\n\x10GetPeersResponse\x12\x0f\n\x07peerIDs\x18\x01 \x03(\t\"`\n\x0f\x43onnMgmtRequest\x12(\n\x0brequestType\x18\x01 \x01(\x0e\x32\x13.pb.CONNMGMTREQTYPE\x12\x12\n\nmultiAddrs\x18\x02 \x03(\t\x12\x0f\n\x07peerIDs\x18\x03 \x03(\t\"\xac\x02\n\x10\x43onnMgmtResponse\x12(\n\x0brequestType\x18\x01 \x01(\x0e\x32\x13.pb.CONNMGMTREQTYPE\x12\x36\n\tconnected\x18\x02 \x03(\x0b\x32#.pb.ConnMgmtResponse.ConnectedEntry\x12\x30\n\x06status\x18\x03 \x03(\x0b\x32 .pb.ConnMgmtResponse.StatusEntry\x12\x0f\n\x07peerIDs\x18\x04 \x03(\t\x1a\x30\n\x0e\x43onnectedEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x08:\x02\x38\x01\x1a\x41\n\x0bStatusEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.pb.ConnMgmtStatus:\x02\x38\x01\"6\n\x0e\x43onnMgmtStatus\x12\x14\n\x0c\x64isconnected\x18\x01 \x01(\x08\x12\x0e\n\x06reason\x18\x02 \x01(\t\"^\n\rExtrasRequest\x12&\n\x0brequestType\x18\x01 \x01(\x0e\x32\x11.pb.EXTRASREQTYPE\x12%\n\rextrasFeature\x18\x02 \x01(\x0e\x32\x0e.pb.EXTRASTYPE\"a\n\x11\x42lockstoreRequest\x12\x0c\n\x04\x63ids\x18\x01 \x03(\t\x12\x1e\n\x07reqType\x18\x02 \x01(\x0e\x32\r.pb.BSREQTYPE\x12\x1e\n\x07reqOpts\x18\x03 \x01(\x0e\x32\r.pb.BSREQOPTS\"/\n\x12\x42lockstoreResponse\x12\x19\n\x06\x62locks\x18\x01 \x03(\x0b\x32\t.pb.Block\"\"\n\x05\x42lock\x12\x0b\n\x03\x63id\x18\x01 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\"\x80\x02\n\nDagRequest\x12#\n\x0brequestType\x18\x01 \x01(\x0e\x32\x0e.pb.DAGREQTYPE\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\x12\x16\n\x0eobjectEncoding\x18\x03 \x01(\t\x12\x1b\n\x13serializationFormat\x18\x04 \x01(\t\x12\x10\n\x08hashFunc\x18\x05 \x01(\t\x12\x12\n\ncidVersion\x18\x06 \x01(\x03\x12\x0c\n\x04hash\x18\x07 \x01(\t\x12(\n\x05links\x18\x08 \x03(\x0b\x32\x19.pb.DagRequest.LinksEntry\x1a,\n\nLinksEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"p\n\x0b\x44\x61gResponse\x12#\n\x0brequestType\x18\x01 \x01(\x0e\x32\x0e.pb.DAGREQTYPE\x12\x0e\n\x06hashes\x18\x02 \x03(\t\x12\x0f\n\x07rawData\x18\x03 \x01(\x0c\x12\x1b\n\x05links\x18\x04 \x03(\x0b\x32\x0c.pb.IPLDLink\"4\n\x08IPLDLink\x12\x0c\n\x04hash\x18\x01 \x01(\x0c\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04size\x18\x03 \x01(\x04\"5\n\x08IPLDNode\x12\x1b\n\x05links\x18\x02 \x03(\x0b\x32\x0c.pb.IPLDLink\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c*8\n\nP2PREQTYPE\x12\t\n\x05\x43LOSE\x10\x00\x12\x0b\n\x07\x46ORWARD\x10\x01\x12\n\n\x06LISTEN\x10\x02\x12\x06\n\x02LS\x10\x03*U\n\x0f\x43ONNMGMTREQTYPE\x12\x0e\n\nCM_CONNECT\x10\x00\x12\x11\n\rCM_DISCONNECT\x10\x01\x12\r\n\tCM_STATUS\x10\x02\x12\x10\n\x0c\x43M_GET_PEERS\x10\x03*.\n\rEXTRASREQTYPE\x12\r\n\tEX_ENABLE\x10\x00\x12\x0e\n\nEX_DISABLE\x10\x01*?\n\nEXTRASTYPE\x12\x0c\n\x08IDENTIFY\x10\x00\x12\n\n\x06PUBSUB\x10\x01\x12\r\n\tDISCOVERY\x10\x02\x12\x08\n\x04MDNS\x10\x03*T\n\tBSREQTYPE\x12\r\n\tBS_DELETE\x10\x00\x12\n\n\x06\x42S_PUT\x10\x01\x12\x0f\n\x0b\x42S_PUT_MANY\x10\x02\x12\n\n\x06\x42S_GET\x10\x03\x12\x0f\n\x0b\x42S_GET_MANY\x10\x04*&\n\tBSREQOPTS\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\x0c\n\x08\x42S_FORCE\x10\x01*^\n\nDAGREQTYPE\x12\x0b\n\x07\x44\x41G_PUT\x10\x00\x12\x0b\n\x07\x44\x41G_GET\x10\x01\x12\x10\n\x0c\x44\x41G_NEW_NODE\x10\x02\x12\x11\n\rDAG_ADD_LINKS\x10\x03\x12\x11\n\rDAG_GET_LINKS\x10\x04\x32\xff\x01\n\x07NodeAPI\x12\x37\n\x08\x43onnMgmt\x12\x13.pb.ConnMgmtRequest\x1a\x14.pb.ConnMgmtResponse\"\x00\x12(\n\x06\x45xtras\x12\x11.pb.ExtrasRequest\x1a\t.pb.Empty\"\x00\x12(\n\x03P2P\x12\x0e.pb.P2PRequest\x1a\x0f.pb.P2PResponse\"\x00\x12=\n\nBlockstore\x12\x15.pb.BlockstoreRequest\x1a\x16.pb.BlockstoreResponse\"\x00\x12(\n\x03\x44\x61g\x12\x0e.pb.DagRequest\x1a\x0f.pb.DagResponse\"\x00\x62\x06proto3') + serialized_pb=_b('\n\nnode.proto\x12\x02pb\x1a\nutil.proto\"\xde\x01\n\nP2PRequest\x12#\n\x0brequestType\x18\x01 \x01(\x0e\x32\x0e.pb.P2PREQTYPE\x12\x0b\n\x03\x61ll\x18\x02 \x01(\x08\x12\x0f\n\x07verbose\x18\x03 \x01(\x08\x12\x14\n\x0cprotocolName\x18\x04 \x01(\t\x12\x15\n\rlistenAddress\x18\x05 \x01(\t\x12\x15\n\rtargetAddress\x18\x06 \x01(\t\x12\x15\n\rremoteAddress\x18\x07 \x01(\t\x12\x1c\n\x14\x61llowCustomProtocols\x18\x08 \x01(\x08\x12\x14\n\x0creportPeerID\x18\t \x01(\x08\"z\n\x0bP2PResponse\x12#\n\x0brequestType\x18\x01 \x01(\x0e\x32\x0e.pb.P2PREQTYPE\x12\r\n\x05names\x18\x02 \x03(\t\x12\x13\n\x0b\x63onnsClosed\x18\x03 \x01(\x05\x12\"\n\x0bstreamInfos\x18\x04 \x03(\x0b\x32\r.pb.P2PLsInfo\"^\n\tP2PLsInfo\x12\x14\n\x0cprotocolName\x18\x01 \x01(\t\x12\x15\n\rlistenAddress\x18\x02 \x01(\t\x12\x15\n\rtargetAddress\x18\x03 \x01(\t\x12\r\n\x05local\x18\x04 \x01(\x08\"#\n\x10GetPeersResponse\x12\x0f\n\x07peerIDs\x18\x01 \x03(\t\"`\n\x0f\x43onnMgmtRequest\x12(\n\x0brequestType\x18\x01 \x01(\x0e\x32\x13.pb.CONNMGMTREQTYPE\x12\x12\n\nmultiAddrs\x18\x02 \x03(\t\x12\x0f\n\x07peerIDs\x18\x03 \x03(\t\"\xac\x02\n\x10\x43onnMgmtResponse\x12(\n\x0brequestType\x18\x01 \x01(\x0e\x32\x13.pb.CONNMGMTREQTYPE\x12\x36\n\tconnected\x18\x02 \x03(\x0b\x32#.pb.ConnMgmtResponse.ConnectedEntry\x12\x30\n\x06status\x18\x03 \x03(\x0b\x32 .pb.ConnMgmtResponse.StatusEntry\x12\x0f\n\x07peerIDs\x18\x04 \x03(\t\x1a\x30\n\x0e\x43onnectedEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\x08:\x02\x38\x01\x1a\x41\n\x0bStatusEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12!\n\x05value\x18\x02 \x01(\x0b\x32\x12.pb.ConnMgmtStatus:\x02\x38\x01\"6\n\x0e\x43onnMgmtStatus\x12\x14\n\x0c\x64isconnected\x18\x01 \x01(\x08\x12\x0e\n\x06reason\x18\x02 \x01(\t\"^\n\rExtrasRequest\x12&\n\x0brequestType\x18\x01 \x01(\x0e\x32\x11.pb.EXTRASREQTYPE\x12%\n\rextrasFeature\x18\x02 \x01(\x0e\x32\x0e.pb.EXTRASTYPE\"a\n\x11\x42lockstoreRequest\x12\x0c\n\x04\x63ids\x18\x01 \x03(\t\x12\x1e\n\x07reqType\x18\x02 \x01(\x0e\x32\r.pb.BSREQTYPE\x12\x1e\n\x07reqOpts\x18\x03 \x01(\x0e\x32\r.pb.BSREQOPTS\"/\n\x12\x42lockstoreResponse\x12\x19\n\x06\x62locks\x18\x01 \x03(\x0b\x32\t.pb.Block\"\"\n\x05\x42lock\x12\x0b\n\x03\x63id\x18\x01 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\"\x80\x02\n\nDagRequest\x12#\n\x0brequestType\x18\x01 \x01(\x0e\x32\x0e.pb.DAGREQTYPE\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\x12\x16\n\x0eobjectEncoding\x18\x03 \x01(\t\x12\x1b\n\x13serializationFormat\x18\x04 \x01(\t\x12\x10\n\x08hashFunc\x18\x05 \x01(\t\x12\x12\n\ncidVersion\x18\x06 \x01(\x03\x12\x0c\n\x04hash\x18\x07 \x01(\t\x12(\n\x05links\x18\x08 \x03(\x0b\x32\x19.pb.DagRequest.LinksEntry\x1a,\n\nLinksEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t:\x02\x38\x01\"p\n\x0b\x44\x61gResponse\x12#\n\x0brequestType\x18\x01 \x01(\x0e\x32\x0e.pb.DAGREQTYPE\x12\x0e\n\x06hashes\x18\x02 \x03(\t\x12\x0f\n\x07rawData\x18\x03 \x01(\x0c\x12\x1b\n\x05links\x18\x04 \x03(\x0b\x32\x0c.pb.IPLDLink\"4\n\x08IPLDLink\x12\x0c\n\x04hash\x18\x01 \x01(\x0c\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x0c\n\x04size\x18\x03 \x01(\x04\"5\n\x08IPLDNode\x12\x1b\n\x05links\x18\x02 \x03(\x0b\x32\x0c.pb.IPLDLink\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c*8\n\nP2PREQTYPE\x12\t\n\x05\x43LOSE\x10\x00\x12\x0b\n\x07\x46ORWARD\x10\x01\x12\n\n\x06LISTEN\x10\x02\x12\x06\n\x02LS\x10\x03*U\n\x0f\x43ONNMGMTREQTYPE\x12\x0e\n\nCM_CONNECT\x10\x00\x12\x11\n\rCM_DISCONNECT\x10\x01\x12\r\n\tCM_STATUS\x10\x02\x12\x10\n\x0c\x43M_GET_PEERS\x10\x03*.\n\rEXTRASREQTYPE\x12\r\n\tEX_ENABLE\x10\x00\x12\x0e\n\nEX_DISABLE\x10\x01*?\n\nEXTRASTYPE\x12\x0c\n\x08IDENTIFY\x10\x00\x12\n\n\x06PUBSUB\x10\x01\x12\r\n\tDISCOVERY\x10\x02\x12\x08\n\x04MDNS\x10\x03*T\n\tBSREQTYPE\x12\r\n\tBS_DELETE\x10\x00\x12\n\n\x06\x42S_PUT\x10\x01\x12\x0f\n\x0b\x42S_PUT_MANY\x10\x02\x12\n\n\x06\x42S_GET\x10\x03\x12\x0f\n\x0b\x42S_GET_MANY\x10\x04*&\n\tBSREQOPTS\x12\x0b\n\x07\x44\x45\x46\x41ULT\x10\x00\x12\x0c\n\x08\x42S_FORCE\x10\x01*^\n\nDAGREQTYPE\x12\x0b\n\x07\x44\x41G_PUT\x10\x00\x12\x0b\n\x07\x44\x41G_GET\x10\x01\x12\x10\n\x0c\x44\x41G_NEW_NODE\x10\x02\x12\x11\n\rDAG_ADD_LINKS\x10\x03\x12\x11\n\rDAG_GET_LINKS\x10\x04\x32\xb1\x02\n\x07NodeAPI\x12\x37\n\x08\x43onnMgmt\x12\x13.pb.ConnMgmtRequest\x1a\x14.pb.ConnMgmtResponse\"\x00\x12(\n\x06\x45xtras\x12\x11.pb.ExtrasRequest\x1a\t.pb.Empty\"\x00\x12(\n\x03P2P\x12\x0e.pb.P2PRequest\x1a\x0f.pb.P2PResponse\"\x00\x12=\n\nBlockstore\x12\x15.pb.BlockstoreRequest\x1a\x16.pb.BlockstoreResponse\"\x00\x12(\n\x03\x44\x61g\x12\x0e.pb.DagRequest\x1a\x0f.pb.DagResponse\"\x00\x12\x30\n\tDagStream\x12\x0e.pb.DagRequest\x1a\x0f.pb.DagResponse(\x01\x30\x01\x62\x06proto3') , dependencies=[util__pb2.DESCRIPTOR,]) @@ -1284,7 +1284,7 @@ index=0, serialized_options=None, serialized_start=2212, - serialized_end=2467, + serialized_end=2517, methods=[ _descriptor.MethodDescriptor( name='ConnMgmt', @@ -1331,6 +1331,15 @@ output_type=_DAGRESPONSE, serialized_options=None, ), + _descriptor.MethodDescriptor( + name='DagStream', + full_name='pb.NodeAPI.DagStream', + index=5, + containing_service=None, + input_type=_DAGREQUEST, + output_type=_DAGRESPONSE, + serialized_options=None, + ), ]) _sym_db.RegisterServiceDescriptor(_NODEAPI) diff --git a/py/node_pb2_grpc.py b/py/node_pb2_grpc.py index 3f6bb5f..5c34c2c 100644 --- a/py/node_pb2_grpc.py +++ b/py/node_pb2_grpc.py @@ -40,6 +40,11 @@ def __init__(self, channel): request_serializer=node__pb2.DagRequest.SerializeToString, response_deserializer=node__pb2.DagResponse.FromString, ) + self.DagStream = channel.stream_stream( + '/pb.NodeAPI/DagStream', + request_serializer=node__pb2.DagRequest.SerializeToString, + response_deserializer=node__pb2.DagResponse.FromString, + ) class NodeAPIServicer(object): @@ -83,6 +88,13 @@ def Dag(self, request, context): context.set_details('Method not implemented!') raise NotImplementedError('Method not implemented!') + def DagStream(self, request_iterator, context): + """DagStream is like Dag but with bidirectional streams + """ + context.set_code(grpc.StatusCode.UNIMPLEMENTED) + context.set_details('Method not implemented!') + raise NotImplementedError('Method not implemented!') + def add_NodeAPIServicer_to_server(servicer, server): rpc_method_handlers = { @@ -111,6 +123,11 @@ def add_NodeAPIServicer_to_server(servicer, server): request_deserializer=node__pb2.DagRequest.FromString, response_serializer=node__pb2.DagResponse.SerializeToString, ), + 'DagStream': grpc.stream_stream_rpc_method_handler( + servicer.DagStream, + request_deserializer=node__pb2.DagRequest.FromString, + response_serializer=node__pb2.DagResponse.SerializeToString, + ), } generic_handler = grpc.method_handlers_generic_handler( 'pb.NodeAPI', rpc_method_handlers) diff --git a/ts/node_pb_service.d.ts b/ts/node_pb_service.d.ts index 287dc0f..fc2bb99 100644 --- a/ts/node_pb_service.d.ts +++ b/ts/node_pb_service.d.ts @@ -50,6 +50,15 @@ type NodeAPIDag = { readonly responseType: typeof node_pb.DagResponse; }; +type NodeAPIDagStream = { + readonly methodName: string; + readonly service: typeof NodeAPI; + readonly requestStream: true; + readonly responseStream: true; + readonly requestType: typeof node_pb.DagRequest; + readonly responseType: typeof node_pb.DagResponse; +}; + export class NodeAPI { static readonly serviceName: string; static readonly ConnMgmt: NodeAPIConnMgmt; @@ -57,6 +66,7 @@ export class NodeAPI { static readonly P2P: NodeAPIP2P; static readonly Blockstore: NodeAPIBlockstore; static readonly Dag: NodeAPIDag; + static readonly DagStream: NodeAPIDagStream; } export type ServiceError = { message: string, code: number; metadata: grpc.Metadata } @@ -136,5 +146,6 @@ export class NodeAPIClient { requestMessage: node_pb.DagRequest, callback: (error: ServiceError|null, responseMessage: node_pb.DagResponse|null) => void ): UnaryResponse; + dagStream(metadata?: grpc.Metadata): BidirectionalStream; } diff --git a/ts/node_pb_service.js b/ts/node_pb_service.js index d95b318..11ca9c1 100644 --- a/ts/node_pb_service.js +++ b/ts/node_pb_service.js @@ -56,6 +56,15 @@ NodeAPI.Dag = { responseType: node_pb.DagResponse }; +NodeAPI.DagStream = { + methodName: "DagStream", + service: NodeAPI, + requestStream: true, + responseStream: true, + requestType: node_pb.DagRequest, + responseType: node_pb.DagResponse +}; + exports.NodeAPI = NodeAPI; function NodeAPIClient(serviceHost, options) { @@ -218,5 +227,50 @@ NodeAPIClient.prototype.dag = function dag(requestMessage, metadata, callback) { }; }; +NodeAPIClient.prototype.dagStream = function dagStream(metadata) { + var listeners = { + data: [], + end: [], + status: [] + }; + var client = grpc.client(NodeAPI.DagStream, { + host: this.serviceHost, + metadata: metadata, + transport: this.options.transport + }); + client.onEnd(function (status, statusMessage, trailers) { + listeners.status.forEach(function (handler) { + handler({ code: status, details: statusMessage, metadata: trailers }); + }); + listeners.end.forEach(function (handler) { + handler({ code: status, details: statusMessage, metadata: trailers }); + }); + listeners = null; + }); + client.onMessage(function (message) { + listeners.data.forEach(function (handler) { + handler(message); + }) + }); + client.start(metadata); + return { + on: function (type, handler) { + listeners[type].push(handler); + return this; + }, + write: function (requestMessage) { + client.send(requestMessage); + return this; + }, + end: function () { + client.finishSend(); + }, + cancel: function () { + listeners = null; + client.close(); + } + }; +}; + exports.NodeAPIClient = NodeAPIClient;