From d5032ce99abcd84ea6cfcb81c66ca6583936344b Mon Sep 17 00:00:00 2001 From: Richard Park Date: Sun, 12 May 2019 15:03:01 +0900 Subject: [PATCH] bug fix --- .../cdp.service.proto} | 2 +- api/proto/v1/odds-crawler.proto | 5 + pkg/api/v1/cdp-service_grpc_pb.d.ts | 41 ------ pkg/api/v1/cdp-service_grpc_pb.js | 45 ------- .../cdp.service.pb.go} | 83 ++++++------ pkg/api/v1/cdp/cdp.service_grpc_pb.d.ts | 41 ++++++ pkg/api/v1/cdp/cdp.service_grpc_pb.js | 45 +++++++ .../cdp.service_pb.d.ts} | 4 +- .../cdp.service_pb.js} | 126 +++++++++--------- pkg/api/v1/package.json | 18 +++ third_party/protoc-gen-go.sh | 5 +- third_party/protoc-gen-ts.sh | 17 +-- 12 files changed, 230 insertions(+), 202 deletions(-) rename api/proto/v1/{cdp-service.proto => cdp/cdp.service.proto} (95%) create mode 100644 api/proto/v1/odds-crawler.proto delete mode 100644 pkg/api/v1/cdp-service_grpc_pb.d.ts delete mode 100644 pkg/api/v1/cdp-service_grpc_pb.js rename pkg/api/v1/{cdp-service.pb.go => cdp/cdp.service.pb.go} (71%) create mode 100644 pkg/api/v1/cdp/cdp.service_grpc_pb.d.ts create mode 100644 pkg/api/v1/cdp/cdp.service_grpc_pb.js rename pkg/api/v1/{cdp-service_pb.d.ts => cdp/cdp.service_pb.d.ts} (97%) rename pkg/api/v1/{cdp-service_pb.js => cdp/cdp.service_pb.js} (67%) create mode 100644 pkg/api/v1/package.json diff --git a/api/proto/v1/cdp-service.proto b/api/proto/v1/cdp/cdp.service.proto similarity index 95% rename from api/proto/v1/cdp-service.proto rename to api/proto/v1/cdp/cdp.service.proto index 443a975..bfacd86 100644 --- a/api/proto/v1/cdp-service.proto +++ b/api/proto/v1/cdp/cdp.service.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package v1; +package oddscrawler.v1.cdp; import "google/protobuf/timestamp.proto"; diff --git a/api/proto/v1/odds-crawler.proto b/api/proto/v1/odds-crawler.proto new file mode 100644 index 0000000..c068efe --- /dev/null +++ b/api/proto/v1/odds-crawler.proto @@ -0,0 +1,5 @@ +syntax = "proto3"; + +package oddscrawler.v1; + +import public "cdp/cdp.service.proto"; diff --git a/pkg/api/v1/cdp-service_grpc_pb.d.ts b/pkg/api/v1/cdp-service_grpc_pb.d.ts deleted file mode 100644 index f3dfa81..0000000 --- a/pkg/api/v1/cdp-service_grpc_pb.d.ts +++ /dev/null @@ -1,41 +0,0 @@ -// package: v1 -// file: cdp-service.proto - -/* tslint:disable */ - -import * as grpc from "grpc"; -import * as cdp_service_pb from "./cdp-service_pb"; -import * as google_protobuf_timestamp_pb from "google-protobuf/google/protobuf/timestamp_pb"; - -interface ICDPServiceService extends grpc.ServiceDefinition { - navigate: ICDPServiceService_INavigate; -} - -interface ICDPServiceService_INavigate extends grpc.MethodDefinition { - path: string; // "/v1.CDPService/Navigate" - requestStream: boolean; // false - responseStream: boolean; // false - requestSerialize: grpc.serialize; - requestDeserialize: grpc.deserialize; - responseSerialize: grpc.serialize; - responseDeserialize: grpc.deserialize; -} - -export const CDPServiceService: ICDPServiceService; - -export interface ICDPServiceServer { - navigate: grpc.handleUnaryCall; -} - -export interface ICDPServiceClient { - navigate(request: cdp_service_pb.NavigateRequest, callback: (error: grpc.ServiceError | null, response: cdp_service_pb.NavigateReply) => void): grpc.ClientUnaryCall; - navigate(request: cdp_service_pb.NavigateRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: cdp_service_pb.NavigateReply) => void): grpc.ClientUnaryCall; - navigate(request: cdp_service_pb.NavigateRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: cdp_service_pb.NavigateReply) => void): grpc.ClientUnaryCall; -} - -export class CDPServiceClient extends grpc.Client implements ICDPServiceClient { - constructor(address: string, credentials: grpc.ChannelCredentials, options?: object); - public navigate(request: cdp_service_pb.NavigateRequest, callback: (error: grpc.ServiceError | null, response: cdp_service_pb.NavigateReply) => void): grpc.ClientUnaryCall; - public navigate(request: cdp_service_pb.NavigateRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: cdp_service_pb.NavigateReply) => void): grpc.ClientUnaryCall; - public navigate(request: cdp_service_pb.NavigateRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: cdp_service_pb.NavigateReply) => void): grpc.ClientUnaryCall; -} diff --git a/pkg/api/v1/cdp-service_grpc_pb.js b/pkg/api/v1/cdp-service_grpc_pb.js deleted file mode 100644 index 17adf4e..0000000 --- a/pkg/api/v1/cdp-service_grpc_pb.js +++ /dev/null @@ -1,45 +0,0 @@ -// GENERATED CODE -- DO NOT EDIT! - -'use strict'; -var grpc = require('grpc'); -var cdp$service_pb = require('./cdp-service_pb.js'); -var google_protobuf_timestamp_pb = require('google-protobuf/google/protobuf/timestamp_pb.js'); - -function serialize_v1_NavigateReply(arg) { - if (!(arg instanceof cdp$service_pb.NavigateReply)) { - throw new Error('Expected argument of type v1.NavigateReply'); - } - return Buffer.from(arg.serializeBinary()); -} - -function deserialize_v1_NavigateReply(buffer_arg) { - return cdp$service_pb.NavigateReply.deserializeBinary(new Uint8Array(buffer_arg)); -} - -function serialize_v1_NavigateRequest(arg) { - if (!(arg instanceof cdp$service_pb.NavigateRequest)) { - throw new Error('Expected argument of type v1.NavigateRequest'); - } - return Buffer.from(arg.serializeBinary()); -} - -function deserialize_v1_NavigateRequest(buffer_arg) { - return cdp$service_pb.NavigateRequest.deserializeBinary(new Uint8Array(buffer_arg)); -} - - -var CDPServiceService = exports.CDPServiceService = { - navigate: { - path: '/v1.CDPService/Navigate', - requestStream: false, - responseStream: false, - requestType: cdp$service_pb.NavigateRequest, - responseType: cdp$service_pb.NavigateReply, - requestSerialize: serialize_v1_NavigateRequest, - requestDeserialize: deserialize_v1_NavigateRequest, - responseSerialize: serialize_v1_NavigateReply, - responseDeserialize: deserialize_v1_NavigateReply, - }, -}; - -exports.CDPServiceClient = grpc.makeGenericClientConstructor(CDPServiceService); diff --git a/pkg/api/v1/cdp-service.pb.go b/pkg/api/v1/cdp/cdp.service.pb.go similarity index 71% rename from pkg/api/v1/cdp-service.pb.go rename to pkg/api/v1/cdp/cdp.service.pb.go index 2e65daf..019d52c 100644 --- a/pkg/api/v1/cdp-service.pb.go +++ b/pkg/api/v1/cdp/cdp.service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. -// source: cdp-service.proto +// source: cdp/cdp.service.proto -package v1 +package oddscrawler_v1_cdp import ( context "context" @@ -80,14 +80,14 @@ func (x TransitionType) String() string { } func (TransitionType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_2d5fb18e228de6bf, []int{0} + return fileDescriptor_46e2aae835bf0b06, []int{0} } type NavigateRequest struct { Api string `protobuf:"bytes,1,opt,name=api,proto3" json:"api,omitempty"` Url string `protobuf:"bytes,2,opt,name=url,proto3" json:"url,omitempty"` Referrer string `protobuf:"bytes,3,opt,name=referrer,proto3" json:"referrer,omitempty"` - TransitionType TransitionType `protobuf:"varint,4,opt,name=transitionType,proto3,enum=v1.TransitionType" json:"transitionType,omitempty"` + TransitionType TransitionType `protobuf:"varint,4,opt,name=transitionType,proto3,enum=oddscrawler.v1.cdp.TransitionType" json:"transitionType,omitempty"` FrameID string `protobuf:"bytes,5,opt,name=frameID,proto3" json:"frameID,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -98,7 +98,7 @@ func (m *NavigateRequest) Reset() { *m = NavigateRequest{} } func (m *NavigateRequest) String() string { return proto.CompactTextString(m) } func (*NavigateRequest) ProtoMessage() {} func (*NavigateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_2d5fb18e228de6bf, []int{0} + return fileDescriptor_46e2aae835bf0b06, []int{0} } func (m *NavigateRequest) XXX_Unmarshal(b []byte) error { @@ -168,7 +168,7 @@ func (m *NavigateReply) Reset() { *m = NavigateReply{} } func (m *NavigateReply) String() string { return proto.CompactTextString(m) } func (*NavigateReply) ProtoMessage() {} func (*NavigateReply) Descriptor() ([]byte, []int) { - return fileDescriptor_2d5fb18e228de6bf, []int{1} + return fileDescriptor_46e2aae835bf0b06, []int{1} } func (m *NavigateReply) XXX_Unmarshal(b []byte) error { @@ -218,40 +218,41 @@ func (m *NavigateReply) GetErrorText() string { } func init() { - proto.RegisterEnum("v1.TransitionType", TransitionType_name, TransitionType_value) - proto.RegisterType((*NavigateRequest)(nil), "v1.NavigateRequest") - proto.RegisterType((*NavigateReply)(nil), "v1.NavigateReply") + proto.RegisterEnum("oddscrawler.v1.cdp.TransitionType", TransitionType_name, TransitionType_value) + proto.RegisterType((*NavigateRequest)(nil), "oddscrawler.v1.cdp.NavigateRequest") + proto.RegisterType((*NavigateReply)(nil), "oddscrawler.v1.cdp.NavigateReply") } -func init() { proto.RegisterFile("cdp-service.proto", fileDescriptor_2d5fb18e228de6bf) } +func init() { proto.RegisterFile("cdp/cdp.service.proto", fileDescriptor_46e2aae835bf0b06) } -var fileDescriptor_2d5fb18e228de6bf = []byte{ - // 400 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0xcf, 0x8e, 0xd3, 0x30, - 0x10, 0xc6, 0x49, 0xff, 0x67, 0x4a, 0x5b, 0x77, 0x56, 0x48, 0x51, 0x85, 0xc4, 0x6a, 0x4f, 0x2b, - 0x24, 0xba, 0xda, 0x72, 0xe3, 0x84, 0x44, 0x2f, 0x7b, 0x41, 0xa8, 0xf4, 0x5e, 0x39, 0x9b, 0x69, - 0xb1, 0xea, 0xc4, 0x66, 0x62, 0x07, 0xf2, 0x44, 0x3c, 0x16, 0xaf, 0x82, 0x9c, 0xd2, 0x96, 0x56, - 0xdc, 0xf2, 0xfd, 0xe2, 0x6f, 0xf2, 0x4b, 0x32, 0x30, 0x7d, 0xce, 0xec, 0xbb, 0x92, 0xb8, 0x52, - 0xcf, 0x34, 0xb7, 0x6c, 0x9c, 0xc1, 0x56, 0xf5, 0x38, 0x7b, 0xb3, 0x33, 0x66, 0xa7, 0xe9, 0xa1, - 0x21, 0xa9, 0xdf, 0x3e, 0x38, 0x95, 0x53, 0xe9, 0x64, 0x6e, 0x0f, 0x87, 0xee, 0x7e, 0x45, 0x30, - 0xf9, 0x2c, 0x2b, 0xb5, 0x93, 0x8e, 0x56, 0xf4, 0xdd, 0x53, 0xe9, 0x50, 0x40, 0x5b, 0x5a, 0x95, - 0x44, 0xb7, 0xd1, 0x7d, 0xbc, 0x0a, 0x97, 0x81, 0x78, 0xd6, 0x49, 0xeb, 0x40, 0x3c, 0x6b, 0x9c, - 0xc1, 0x80, 0x69, 0x4b, 0xcc, 0xc4, 0x49, 0xbb, 0xc1, 0xa7, 0x8c, 0x1f, 0x60, 0xec, 0x58, 0x16, - 0xa5, 0x72, 0xca, 0x14, 0xeb, 0xda, 0x52, 0xd2, 0xb9, 0x8d, 0xee, 0xc7, 0x0b, 0x9c, 0x57, 0x8f, - 0xf3, 0xf5, 0xc5, 0x9d, 0xd5, 0xd5, 0x49, 0x4c, 0xa0, 0xbf, 0x65, 0x99, 0xd3, 0xd3, 0x32, 0xe9, - 0x36, 0x63, 0x8f, 0xf1, 0xce, 0xc3, 0xe8, 0x2c, 0x6a, 0x75, 0xfd, 0x1f, 0xcd, 0x7f, 0xca, 0xad, - 0x8b, 0x72, 0xd0, 0xd5, 0x46, 0x66, 0xc4, 0x4f, 0xcb, 0xa3, 0xee, 0x31, 0xe3, 0x6b, 0x88, 0x89, - 0xd9, 0xf0, 0x9a, 0x7e, 0xba, 0xc6, 0x34, 0x5e, 0x9d, 0xc1, 0xdb, 0xdf, 0x11, 0x8c, 0x2f, 0x9d, - 0x71, 0x00, 0x1d, 0xad, 0x8a, 0xbd, 0x78, 0x81, 0x31, 0x74, 0x5d, 0x6d, 0x29, 0x13, 0x11, 0x4e, - 0x60, 0x28, 0xb3, 0x8c, 0xa9, 0x2c, 0x37, 0xa9, 0x64, 0xd1, 0xc2, 0x29, 0x8c, 0xa4, 0x77, 0x66, - 0x93, 0x1a, 0xb3, 0xcf, 0x25, 0xef, 0x45, 0xfb, 0x84, 0x4a, 0x9f, 0x36, 0x62, 0xa2, 0x83, 0x37, - 0x30, 0xc9, 0x65, 0xe1, 0xa5, 0x3e, 0xc3, 0x2e, 0x8e, 0x20, 0xde, 0x51, 0x41, 0x2c, 0x1d, 0x65, - 0xa2, 0x77, 0xaa, 0x39, 0x63, 0x35, 0x55, 0xa4, 0x45, 0x3f, 0x3c, 0x6d, 0x6b, 0x38, 0x0f, 0xa5, - 0x5c, 0x39, 0x31, 0x40, 0x80, 0x1e, 0x53, 0x78, 0x25, 0x11, 0xe3, 0x10, 0xfa, 0x7b, 0xaa, 0x7f, - 0x18, 0xce, 0x04, 0xe0, 0x2b, 0x98, 0xfe, 0x0d, 0x9b, 0xf3, 0xcc, 0x61, 0x30, 0x37, 0xee, 0x1b, - 0xb1, 0x78, 0xb9, 0xf8, 0x08, 0xf0, 0x69, 0xf9, 0xe5, 0xeb, 0x61, 0x77, 0x70, 0x01, 0x83, 0xe3, - 0x67, 0xc6, 0x9b, 0xf0, 0xc3, 0xae, 0xb6, 0x63, 0x36, 0xbd, 0x84, 0x56, 0xd7, 0x69, 0xaf, 0xd9, - 0xa5, 0xf7, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x45, 0x6a, 0x51, 0xf4, 0x85, 0x02, 0x00, 0x00, +var fileDescriptor_46e2aae835bf0b06 = []byte{ + // 415 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xcf, 0x8e, 0xd3, 0x30, + 0x10, 0xc6, 0x49, 0xff, 0x67, 0x4a, 0x5b, 0xef, 0xa0, 0x95, 0xa2, 0x0a, 0x89, 0xa5, 0x5c, 0x56, + 0x1c, 0x52, 0xb1, 0x3c, 0x02, 0xbd, 0x2c, 0x07, 0x84, 0x42, 0xef, 0xc5, 0x89, 0xa7, 0x25, 0xaa, + 0x13, 0x9b, 0x89, 0xd3, 0x25, 0x4f, 0xc6, 0xe3, 0xf0, 0x2a, 0x28, 0x29, 0x6d, 0xe8, 0xb2, 0xe2, + 0x96, 0xef, 0xd3, 0x7c, 0x99, 0x9f, 0xed, 0x0f, 0xae, 0x13, 0x65, 0x97, 0x89, 0xb2, 0x61, 0x41, + 0x7c, 0x48, 0x13, 0x0a, 0x2d, 0x1b, 0x67, 0x10, 0x8d, 0x52, 0x45, 0xc2, 0xf2, 0x41, 0x13, 0x87, + 0x87, 0x77, 0x61, 0xa2, 0xec, 0xfc, 0xd5, 0xce, 0x98, 0x9d, 0xa6, 0x65, 0x33, 0x11, 0x97, 0xdb, + 0xa5, 0x4b, 0x33, 0x2a, 0x9c, 0xcc, 0xec, 0x31, 0xb4, 0xf8, 0xe9, 0xc1, 0xec, 0x93, 0x3c, 0xa4, + 0x3b, 0xe9, 0x28, 0xa2, 0xef, 0x25, 0x15, 0x0e, 0x05, 0x74, 0xa5, 0x4d, 0x03, 0xef, 0xc6, 0xbb, + 0xf5, 0xa3, 0xfa, 0xb3, 0x76, 0x4a, 0xd6, 0x41, 0xe7, 0xe8, 0x94, 0xac, 0x71, 0x0e, 0x23, 0xa6, + 0x2d, 0x31, 0x13, 0x07, 0xdd, 0xc6, 0x3e, 0x6b, 0xfc, 0x08, 0x53, 0xc7, 0x32, 0x2f, 0x52, 0x97, + 0x9a, 0x7c, 0x5d, 0x59, 0x0a, 0x7a, 0x37, 0xde, 0xed, 0xf4, 0x6e, 0x11, 0xfe, 0x4b, 0x18, 0xae, + 0x2f, 0x26, 0xa3, 0x47, 0x49, 0x0c, 0x60, 0xb8, 0x65, 0x99, 0xd1, 0xfd, 0x2a, 0xe8, 0x37, 0x6b, + 0x4e, 0x72, 0x51, 0xc2, 0xa4, 0x05, 0xb7, 0xba, 0x7a, 0x02, 0xfb, 0xaf, 0x70, 0xe7, 0x22, 0x5c, + 0xe3, 0x6b, 0x23, 0x15, 0xf1, 0xfd, 0xea, 0x84, 0x7f, 0xd2, 0xf8, 0x12, 0x7c, 0x62, 0x36, 0xbc, + 0xa6, 0x1f, 0xae, 0x21, 0xf7, 0xa3, 0xd6, 0x78, 0xfb, 0xcb, 0x83, 0xe9, 0x25, 0x33, 0x8e, 0xa0, + 0xa7, 0xd3, 0x7c, 0x2f, 0x9e, 0xa1, 0x0f, 0x7d, 0x57, 0x59, 0x52, 0xc2, 0xc3, 0x19, 0x8c, 0xa5, + 0x52, 0x4c, 0x45, 0xb1, 0x89, 0x25, 0x8b, 0x0e, 0x5e, 0xc1, 0x44, 0x96, 0xce, 0x6c, 0x62, 0x63, + 0xf6, 0x99, 0xe4, 0xbd, 0xe8, 0x9e, 0xad, 0xa2, 0x8c, 0x1b, 0x30, 0xd1, 0xc3, 0x17, 0x30, 0xcb, + 0x64, 0x5e, 0x4a, 0xdd, 0x9a, 0x7d, 0x9c, 0x80, 0xbf, 0xa3, 0x9c, 0x58, 0x3a, 0x52, 0x62, 0x70, + 0x8e, 0x39, 0x63, 0x35, 0x1d, 0x48, 0x8b, 0x61, 0xbd, 0x6d, 0x6b, 0x38, 0xab, 0x43, 0x59, 0xea, + 0xc4, 0x08, 0x01, 0x06, 0x4c, 0xf5, 0x91, 0x84, 0x8f, 0x63, 0x18, 0xee, 0xa9, 0x7a, 0x30, 0xac, + 0x04, 0xe0, 0x35, 0x5c, 0xfd, 0x11, 0x9b, 0xf6, 0x9f, 0xe3, 0x9a, 0xdc, 0xb8, 0x6f, 0xc4, 0xe2, + 0xf9, 0xdd, 0x57, 0x80, 0x0f, 0xab, 0xcf, 0x5f, 0x8e, 0xdd, 0xc2, 0x08, 0x46, 0xa7, 0x6b, 0xc6, + 0x37, 0x4f, 0x3d, 0xe0, 0xa3, 0xf6, 0xcc, 0x5f, 0xff, 0x7f, 0xc8, 0xea, 0x2a, 0x1e, 0x34, 0xdd, + 0x7b, 0xff, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x99, 0x19, 0x59, 0xea, 0xc9, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -279,7 +280,7 @@ func NewCDPServiceClient(cc *grpc.ClientConn) CDPServiceClient { func (c *cDPServiceClient) Navigate(ctx context.Context, in *NavigateRequest, opts ...grpc.CallOption) (*NavigateReply, error) { out := new(NavigateReply) - err := c.cc.Invoke(ctx, "/v1.CDPService/Navigate", in, out, opts...) + err := c.cc.Invoke(ctx, "/oddscrawler.v1.cdp.CDPService/Navigate", in, out, opts...) if err != nil { return nil, err } @@ -313,7 +314,7 @@ func _CDPService_Navigate_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/v1.CDPService/Navigate", + FullMethod: "/oddscrawler.v1.cdp.CDPService/Navigate", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(CDPServiceServer).Navigate(ctx, req.(*NavigateRequest)) @@ -322,7 +323,7 @@ func _CDPService_Navigate_Handler(srv interface{}, ctx context.Context, dec func } var _CDPService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "v1.CDPService", + ServiceName: "oddscrawler.v1.cdp.CDPService", HandlerType: (*CDPServiceServer)(nil), Methods: []grpc.MethodDesc{ { @@ -331,5 +332,5 @@ var _CDPService_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "cdp-service.proto", + Metadata: "cdp/cdp.service.proto", } diff --git a/pkg/api/v1/cdp/cdp.service_grpc_pb.d.ts b/pkg/api/v1/cdp/cdp.service_grpc_pb.d.ts new file mode 100644 index 0000000..6e54606 --- /dev/null +++ b/pkg/api/v1/cdp/cdp.service_grpc_pb.d.ts @@ -0,0 +1,41 @@ +// package: oddscrawler.v1.cdp +// file: cdp/cdp.service.proto + +/* tslint:disable */ + +import * as grpc from "grpc"; +import * as cdp_cdp_service_pb from "../cdp/cdp.service_pb"; +import * as google_protobuf_timestamp_pb from "google-protobuf/google/protobuf/timestamp_pb"; + +interface ICDPServiceService extends grpc.ServiceDefinition { + navigate: ICDPServiceService_INavigate; +} + +interface ICDPServiceService_INavigate extends grpc.MethodDefinition { + path: string; // "/oddscrawler.v1.cdp.CDPService/Navigate" + requestStream: boolean; // false + responseStream: boolean; // false + requestSerialize: grpc.serialize; + requestDeserialize: grpc.deserialize; + responseSerialize: grpc.serialize; + responseDeserialize: grpc.deserialize; +} + +export const CDPServiceService: ICDPServiceService; + +export interface ICDPServiceServer { + navigate: grpc.handleUnaryCall; +} + +export interface ICDPServiceClient { + navigate(request: cdp_cdp_service_pb.NavigateRequest, callback: (error: grpc.ServiceError | null, response: cdp_cdp_service_pb.NavigateReply) => void): grpc.ClientUnaryCall; + navigate(request: cdp_cdp_service_pb.NavigateRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: cdp_cdp_service_pb.NavigateReply) => void): grpc.ClientUnaryCall; + navigate(request: cdp_cdp_service_pb.NavigateRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: cdp_cdp_service_pb.NavigateReply) => void): grpc.ClientUnaryCall; +} + +export class CDPServiceClient extends grpc.Client implements ICDPServiceClient { + constructor(address: string, credentials: grpc.ChannelCredentials, options?: object); + public navigate(request: cdp_cdp_service_pb.NavigateRequest, callback: (error: grpc.ServiceError | null, response: cdp_cdp_service_pb.NavigateReply) => void): grpc.ClientUnaryCall; + public navigate(request: cdp_cdp_service_pb.NavigateRequest, metadata: grpc.Metadata, callback: (error: grpc.ServiceError | null, response: cdp_cdp_service_pb.NavigateReply) => void): grpc.ClientUnaryCall; + public navigate(request: cdp_cdp_service_pb.NavigateRequest, metadata: grpc.Metadata, options: Partial, callback: (error: grpc.ServiceError | null, response: cdp_cdp_service_pb.NavigateReply) => void): grpc.ClientUnaryCall; +} diff --git a/pkg/api/v1/cdp/cdp.service_grpc_pb.js b/pkg/api/v1/cdp/cdp.service_grpc_pb.js new file mode 100644 index 0000000..4c38d5b --- /dev/null +++ b/pkg/api/v1/cdp/cdp.service_grpc_pb.js @@ -0,0 +1,45 @@ +// GENERATED CODE -- DO NOT EDIT! + +'use strict'; +var grpc = require('grpc'); +var cdp_cdp_service_pb = require('../cdp/cdp.service_pb.js'); +var google_protobuf_timestamp_pb = require('google-protobuf/google/protobuf/timestamp_pb.js'); + +function serialize_oddscrawler_v1_cdp_NavigateReply(arg) { + if (!(arg instanceof cdp_cdp_service_pb.NavigateReply)) { + throw new Error('Expected argument of type oddscrawler.v1.cdp.NavigateReply'); + } + return Buffer.from(arg.serializeBinary()); +} + +function deserialize_oddscrawler_v1_cdp_NavigateReply(buffer_arg) { + return cdp_cdp_service_pb.NavigateReply.deserializeBinary(new Uint8Array(buffer_arg)); +} + +function serialize_oddscrawler_v1_cdp_NavigateRequest(arg) { + if (!(arg instanceof cdp_cdp_service_pb.NavigateRequest)) { + throw new Error('Expected argument of type oddscrawler.v1.cdp.NavigateRequest'); + } + return Buffer.from(arg.serializeBinary()); +} + +function deserialize_oddscrawler_v1_cdp_NavigateRequest(buffer_arg) { + return cdp_cdp_service_pb.NavigateRequest.deserializeBinary(new Uint8Array(buffer_arg)); +} + + +var CDPServiceService = exports.CDPServiceService = { + navigate: { + path: '/oddscrawler.v1.cdp.CDPService/Navigate', + requestStream: false, + responseStream: false, + requestType: cdp_cdp_service_pb.NavigateRequest, + responseType: cdp_cdp_service_pb.NavigateReply, + requestSerialize: serialize_oddscrawler_v1_cdp_NavigateRequest, + requestDeserialize: deserialize_oddscrawler_v1_cdp_NavigateRequest, + responseSerialize: serialize_oddscrawler_v1_cdp_NavigateReply, + responseDeserialize: deserialize_oddscrawler_v1_cdp_NavigateReply, + }, +}; + +exports.CDPServiceClient = grpc.makeGenericClientConstructor(CDPServiceService); diff --git a/pkg/api/v1/cdp-service_pb.d.ts b/pkg/api/v1/cdp/cdp.service_pb.d.ts similarity index 97% rename from pkg/api/v1/cdp-service_pb.d.ts rename to pkg/api/v1/cdp/cdp.service_pb.d.ts index bf9edc2..bc22094 100644 --- a/pkg/api/v1/cdp-service_pb.d.ts +++ b/pkg/api/v1/cdp/cdp.service_pb.d.ts @@ -1,5 +1,5 @@ -// package: v1 -// file: cdp-service.proto +// package: oddscrawler.v1.cdp +// file: cdp/cdp.service.proto /* tslint:disable */ diff --git a/pkg/api/v1/cdp-service_pb.js b/pkg/api/v1/cdp/cdp.service_pb.js similarity index 67% rename from pkg/api/v1/cdp-service_pb.js rename to pkg/api/v1/cdp/cdp.service_pb.js index 8b50400..3f0aa83 100644 --- a/pkg/api/v1/cdp-service_pb.js +++ b/pkg/api/v1/cdp/cdp.service_pb.js @@ -13,9 +13,9 @@ var global = Function('return this')(); var google_protobuf_timestamp_pb = require('google-protobuf/google/protobuf/timestamp_pb.js'); goog.object.extend(proto, google_protobuf_timestamp_pb); -goog.exportSymbol('proto.v1.NavigateReply', null, global); -goog.exportSymbol('proto.v1.NavigateRequest', null, global); -goog.exportSymbol('proto.v1.TransitionType', null, global); +goog.exportSymbol('proto.oddscrawler.v1.cdp.NavigateReply', null, global); +goog.exportSymbol('proto.oddscrawler.v1.cdp.NavigateRequest', null, global); +goog.exportSymbol('proto.oddscrawler.v1.cdp.TransitionType', null, global); /** * Generated by JsPbCodeGenerator. * @param {Array=} opt_data Optional initial data array, typically from a @@ -26,16 +26,16 @@ goog.exportSymbol('proto.v1.TransitionType', null, global); * @extends {jspb.Message} * @constructor */ -proto.v1.NavigateRequest = function(opt_data) { +proto.oddscrawler.v1.cdp.NavigateRequest = function(opt_data) { jspb.Message.initialize(this, opt_data, 0, -1, null, null); }; -goog.inherits(proto.v1.NavigateRequest, jspb.Message); +goog.inherits(proto.oddscrawler.v1.cdp.NavigateRequest, jspb.Message); if (goog.DEBUG && !COMPILED) { /** * @public * @override */ - proto.v1.NavigateRequest.displayName = 'proto.v1.NavigateRequest'; + proto.oddscrawler.v1.cdp.NavigateRequest.displayName = 'proto.oddscrawler.v1.cdp.NavigateRequest'; } /** * Generated by JsPbCodeGenerator. @@ -47,16 +47,16 @@ if (goog.DEBUG && !COMPILED) { * @extends {jspb.Message} * @constructor */ -proto.v1.NavigateReply = function(opt_data) { +proto.oddscrawler.v1.cdp.NavigateReply = function(opt_data) { jspb.Message.initialize(this, opt_data, 0, -1, null, null); }; -goog.inherits(proto.v1.NavigateReply, jspb.Message); +goog.inherits(proto.oddscrawler.v1.cdp.NavigateReply, jspb.Message); if (goog.DEBUG && !COMPILED) { /** * @public * @override */ - proto.v1.NavigateReply.displayName = 'proto.v1.NavigateReply'; + proto.oddscrawler.v1.cdp.NavigateReply.displayName = 'proto.oddscrawler.v1.cdp.NavigateReply'; } @@ -72,8 +72,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) { * for transitional soy proto support: http://goto/soy-param-migration * @return {!Object} */ -proto.v1.NavigateRequest.prototype.toObject = function(opt_includeInstance) { - return proto.v1.NavigateRequest.toObject(opt_includeInstance, this); +proto.oddscrawler.v1.cdp.NavigateRequest.prototype.toObject = function(opt_includeInstance) { + return proto.oddscrawler.v1.cdp.NavigateRequest.toObject(opt_includeInstance, this); }; @@ -82,11 +82,11 @@ proto.v1.NavigateRequest.prototype.toObject = function(opt_includeInstance) { * @param {boolean|undefined} includeInstance Whether to include the JSPB * instance for transitional soy proto support: * http://goto/soy-param-migration - * @param {!proto.v1.NavigateRequest} msg The msg instance to transform. + * @param {!proto.oddscrawler.v1.cdp.NavigateRequest} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ -proto.v1.NavigateRequest.toObject = function(includeInstance, msg) { +proto.oddscrawler.v1.cdp.NavigateRequest.toObject = function(includeInstance, msg) { var f, obj = { api: jspb.Message.getFieldWithDefault(msg, 1, ""), url: jspb.Message.getFieldWithDefault(msg, 2, ""), @@ -106,23 +106,23 @@ proto.v1.NavigateRequest.toObject = function(includeInstance, msg) { /** * Deserializes binary data (in protobuf wire format). * @param {jspb.ByteSource} bytes The bytes to deserialize. - * @return {!proto.v1.NavigateRequest} + * @return {!proto.oddscrawler.v1.cdp.NavigateRequest} */ -proto.v1.NavigateRequest.deserializeBinary = function(bytes) { +proto.oddscrawler.v1.cdp.NavigateRequest.deserializeBinary = function(bytes) { var reader = new jspb.BinaryReader(bytes); - var msg = new proto.v1.NavigateRequest; - return proto.v1.NavigateRequest.deserializeBinaryFromReader(msg, reader); + var msg = new proto.oddscrawler.v1.cdp.NavigateRequest; + return proto.oddscrawler.v1.cdp.NavigateRequest.deserializeBinaryFromReader(msg, reader); }; /** * Deserializes binary data (in protobuf wire format) from the * given reader into the given message object. - * @param {!proto.v1.NavigateRequest} msg The message object to deserialize into. + * @param {!proto.oddscrawler.v1.cdp.NavigateRequest} msg The message object to deserialize into. * @param {!jspb.BinaryReader} reader The BinaryReader to use. - * @return {!proto.v1.NavigateRequest} + * @return {!proto.oddscrawler.v1.cdp.NavigateRequest} */ -proto.v1.NavigateRequest.deserializeBinaryFromReader = function(msg, reader) { +proto.oddscrawler.v1.cdp.NavigateRequest.deserializeBinaryFromReader = function(msg, reader) { while (reader.nextField()) { if (reader.isEndGroup()) { break; @@ -142,7 +142,7 @@ proto.v1.NavigateRequest.deserializeBinaryFromReader = function(msg, reader) { msg.setReferrer(value); break; case 4: - var value = /** @type {!proto.v1.TransitionType} */ (reader.readEnum()); + var value = /** @type {!proto.oddscrawler.v1.cdp.TransitionType} */ (reader.readEnum()); msg.setTransitiontype(value); break; case 5: @@ -162,9 +162,9 @@ proto.v1.NavigateRequest.deserializeBinaryFromReader = function(msg, reader) { * Serializes the message to binary data (in protobuf wire format). * @return {!Uint8Array} */ -proto.v1.NavigateRequest.prototype.serializeBinary = function() { +proto.oddscrawler.v1.cdp.NavigateRequest.prototype.serializeBinary = function() { var writer = new jspb.BinaryWriter(); - proto.v1.NavigateRequest.serializeBinaryToWriter(this, writer); + proto.oddscrawler.v1.cdp.NavigateRequest.serializeBinaryToWriter(this, writer); return writer.getResultBuffer(); }; @@ -172,11 +172,11 @@ proto.v1.NavigateRequest.prototype.serializeBinary = function() { /** * Serializes the given message to binary data (in protobuf wire * format), writing to the given BinaryWriter. - * @param {!proto.v1.NavigateRequest} message + * @param {!proto.oddscrawler.v1.cdp.NavigateRequest} message * @param {!jspb.BinaryWriter} writer * @suppress {unusedLocalVariables} f is only used for nested messages */ -proto.v1.NavigateRequest.serializeBinaryToWriter = function(message, writer) { +proto.oddscrawler.v1.cdp.NavigateRequest.serializeBinaryToWriter = function(message, writer) { var f = undefined; f = message.getApi(); if (f.length > 0) { @@ -220,13 +220,13 @@ proto.v1.NavigateRequest.serializeBinaryToWriter = function(message, writer) { * optional string api = 1; * @return {string} */ -proto.v1.NavigateRequest.prototype.getApi = function() { +proto.oddscrawler.v1.cdp.NavigateRequest.prototype.getApi = function() { return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, "")); }; /** @param {string} value */ -proto.v1.NavigateRequest.prototype.setApi = function(value) { +proto.oddscrawler.v1.cdp.NavigateRequest.prototype.setApi = function(value) { jspb.Message.setProto3StringField(this, 1, value); }; @@ -235,13 +235,13 @@ proto.v1.NavigateRequest.prototype.setApi = function(value) { * optional string url = 2; * @return {string} */ -proto.v1.NavigateRequest.prototype.getUrl = function() { +proto.oddscrawler.v1.cdp.NavigateRequest.prototype.getUrl = function() { return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, "")); }; /** @param {string} value */ -proto.v1.NavigateRequest.prototype.setUrl = function(value) { +proto.oddscrawler.v1.cdp.NavigateRequest.prototype.setUrl = function(value) { jspb.Message.setProto3StringField(this, 2, value); }; @@ -250,28 +250,28 @@ proto.v1.NavigateRequest.prototype.setUrl = function(value) { * optional string referrer = 3; * @return {string} */ -proto.v1.NavigateRequest.prototype.getReferrer = function() { +proto.oddscrawler.v1.cdp.NavigateRequest.prototype.getReferrer = function() { return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, "")); }; /** @param {string} value */ -proto.v1.NavigateRequest.prototype.setReferrer = function(value) { +proto.oddscrawler.v1.cdp.NavigateRequest.prototype.setReferrer = function(value) { jspb.Message.setProto3StringField(this, 3, value); }; /** * optional TransitionType transitionType = 4; - * @return {!proto.v1.TransitionType} + * @return {!proto.oddscrawler.v1.cdp.TransitionType} */ -proto.v1.NavigateRequest.prototype.getTransitiontype = function() { - return /** @type {!proto.v1.TransitionType} */ (jspb.Message.getFieldWithDefault(this, 4, 0)); +proto.oddscrawler.v1.cdp.NavigateRequest.prototype.getTransitiontype = function() { + return /** @type {!proto.oddscrawler.v1.cdp.TransitionType} */ (jspb.Message.getFieldWithDefault(this, 4, 0)); }; -/** @param {!proto.v1.TransitionType} value */ -proto.v1.NavigateRequest.prototype.setTransitiontype = function(value) { +/** @param {!proto.oddscrawler.v1.cdp.TransitionType} value */ +proto.oddscrawler.v1.cdp.NavigateRequest.prototype.setTransitiontype = function(value) { jspb.Message.setProto3EnumField(this, 4, value); }; @@ -280,13 +280,13 @@ proto.v1.NavigateRequest.prototype.setTransitiontype = function(value) { * optional string frameID = 5; * @return {string} */ -proto.v1.NavigateRequest.prototype.getFrameid = function() { +proto.oddscrawler.v1.cdp.NavigateRequest.prototype.getFrameid = function() { return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, "")); }; /** @param {string} value */ -proto.v1.NavigateRequest.prototype.setFrameid = function(value) { +proto.oddscrawler.v1.cdp.NavigateRequest.prototype.setFrameid = function(value) { jspb.Message.setProto3StringField(this, 5, value); }; @@ -305,8 +305,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) { * for transitional soy proto support: http://goto/soy-param-migration * @return {!Object} */ -proto.v1.NavigateReply.prototype.toObject = function(opt_includeInstance) { - return proto.v1.NavigateReply.toObject(opt_includeInstance, this); +proto.oddscrawler.v1.cdp.NavigateReply.prototype.toObject = function(opt_includeInstance) { + return proto.oddscrawler.v1.cdp.NavigateReply.toObject(opt_includeInstance, this); }; @@ -315,11 +315,11 @@ proto.v1.NavigateReply.prototype.toObject = function(opt_includeInstance) { * @param {boolean|undefined} includeInstance Whether to include the JSPB * instance for transitional soy proto support: * http://goto/soy-param-migration - * @param {!proto.v1.NavigateReply} msg The msg instance to transform. + * @param {!proto.oddscrawler.v1.cdp.NavigateReply} msg The msg instance to transform. * @return {!Object} * @suppress {unusedLocalVariables} f is only used for nested messages */ -proto.v1.NavigateReply.toObject = function(includeInstance, msg) { +proto.oddscrawler.v1.cdp.NavigateReply.toObject = function(includeInstance, msg) { var f, obj = { api: jspb.Message.getFieldWithDefault(msg, 1, ""), frameid: jspb.Message.getFieldWithDefault(msg, 2, ""), @@ -338,23 +338,23 @@ proto.v1.NavigateReply.toObject = function(includeInstance, msg) { /** * Deserializes binary data (in protobuf wire format). * @param {jspb.ByteSource} bytes The bytes to deserialize. - * @return {!proto.v1.NavigateReply} + * @return {!proto.oddscrawler.v1.cdp.NavigateReply} */ -proto.v1.NavigateReply.deserializeBinary = function(bytes) { +proto.oddscrawler.v1.cdp.NavigateReply.deserializeBinary = function(bytes) { var reader = new jspb.BinaryReader(bytes); - var msg = new proto.v1.NavigateReply; - return proto.v1.NavigateReply.deserializeBinaryFromReader(msg, reader); + var msg = new proto.oddscrawler.v1.cdp.NavigateReply; + return proto.oddscrawler.v1.cdp.NavigateReply.deserializeBinaryFromReader(msg, reader); }; /** * Deserializes binary data (in protobuf wire format) from the * given reader into the given message object. - * @param {!proto.v1.NavigateReply} msg The message object to deserialize into. + * @param {!proto.oddscrawler.v1.cdp.NavigateReply} msg The message object to deserialize into. * @param {!jspb.BinaryReader} reader The BinaryReader to use. - * @return {!proto.v1.NavigateReply} + * @return {!proto.oddscrawler.v1.cdp.NavigateReply} */ -proto.v1.NavigateReply.deserializeBinaryFromReader = function(msg, reader) { +proto.oddscrawler.v1.cdp.NavigateReply.deserializeBinaryFromReader = function(msg, reader) { while (reader.nextField()) { if (reader.isEndGroup()) { break; @@ -390,9 +390,9 @@ proto.v1.NavigateReply.deserializeBinaryFromReader = function(msg, reader) { * Serializes the message to binary data (in protobuf wire format). * @return {!Uint8Array} */ -proto.v1.NavigateReply.prototype.serializeBinary = function() { +proto.oddscrawler.v1.cdp.NavigateReply.prototype.serializeBinary = function() { var writer = new jspb.BinaryWriter(); - proto.v1.NavigateReply.serializeBinaryToWriter(this, writer); + proto.oddscrawler.v1.cdp.NavigateReply.serializeBinaryToWriter(this, writer); return writer.getResultBuffer(); }; @@ -400,11 +400,11 @@ proto.v1.NavigateReply.prototype.serializeBinary = function() { /** * Serializes the given message to binary data (in protobuf wire * format), writing to the given BinaryWriter. - * @param {!proto.v1.NavigateReply} message + * @param {!proto.oddscrawler.v1.cdp.NavigateReply} message * @param {!jspb.BinaryWriter} writer * @suppress {unusedLocalVariables} f is only used for nested messages */ -proto.v1.NavigateReply.serializeBinaryToWriter = function(message, writer) { +proto.oddscrawler.v1.cdp.NavigateReply.serializeBinaryToWriter = function(message, writer) { var f = undefined; f = message.getApi(); if (f.length > 0) { @@ -441,13 +441,13 @@ proto.v1.NavigateReply.serializeBinaryToWriter = function(message, writer) { * optional string api = 1; * @return {string} */ -proto.v1.NavigateReply.prototype.getApi = function() { +proto.oddscrawler.v1.cdp.NavigateReply.prototype.getApi = function() { return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, "")); }; /** @param {string} value */ -proto.v1.NavigateReply.prototype.setApi = function(value) { +proto.oddscrawler.v1.cdp.NavigateReply.prototype.setApi = function(value) { jspb.Message.setProto3StringField(this, 1, value); }; @@ -456,13 +456,13 @@ proto.v1.NavigateReply.prototype.setApi = function(value) { * optional string frameID = 2; * @return {string} */ -proto.v1.NavigateReply.prototype.getFrameid = function() { +proto.oddscrawler.v1.cdp.NavigateReply.prototype.getFrameid = function() { return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, "")); }; /** @param {string} value */ -proto.v1.NavigateReply.prototype.setFrameid = function(value) { +proto.oddscrawler.v1.cdp.NavigateReply.prototype.setFrameid = function(value) { jspb.Message.setProto3StringField(this, 2, value); }; @@ -471,13 +471,13 @@ proto.v1.NavigateReply.prototype.setFrameid = function(value) { * optional string loaderID = 3; * @return {string} */ -proto.v1.NavigateReply.prototype.getLoaderid = function() { +proto.oddscrawler.v1.cdp.NavigateReply.prototype.getLoaderid = function() { return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, "")); }; /** @param {string} value */ -proto.v1.NavigateReply.prototype.setLoaderid = function(value) { +proto.oddscrawler.v1.cdp.NavigateReply.prototype.setLoaderid = function(value) { jspb.Message.setProto3StringField(this, 3, value); }; @@ -486,13 +486,13 @@ proto.v1.NavigateReply.prototype.setLoaderid = function(value) { * optional string errorText = 4; * @return {string} */ -proto.v1.NavigateReply.prototype.getErrortext = function() { +proto.oddscrawler.v1.cdp.NavigateReply.prototype.getErrortext = function() { return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, "")); }; /** @param {string} value */ -proto.v1.NavigateReply.prototype.setErrortext = function(value) { +proto.oddscrawler.v1.cdp.NavigateReply.prototype.setErrortext = function(value) { jspb.Message.setProto3StringField(this, 4, value); }; @@ -500,7 +500,7 @@ proto.v1.NavigateReply.prototype.setErrortext = function(value) { /** * @enum {number} */ -proto.v1.TransitionType = { +proto.oddscrawler.v1.cdp.TransitionType = { LINK: 0, TYPED: 1, ADDRESS_BAR: 2, @@ -516,4 +516,4 @@ proto.v1.TransitionType = { OTHER: 12 }; -goog.object.extend(exports, proto.v1); +goog.object.extend(exports, proto.oddscrawler.v1.cdp); diff --git a/pkg/api/v1/package.json b/pkg/api/v1/package.json new file mode 100644 index 0000000..a4f3f55 --- /dev/null +++ b/pkg/api/v1/package.json @@ -0,0 +1,18 @@ +{ + "name": "@odds-crawler/proto", + "author": "Loafle ", + "description": "Proto module of Odds Crawler", + "version": "0.0.4", + "license": "COMMERCIAL", + "private": false, + "repository": { + "type": "git", + "url": "https://git.loafle.net/overflow/commons-typescript.git" + }, + "publishConfig": { + "registry": "https://nexus.loafle.net/repository/npm-loafle/" + }, + "dependencies": {}, + "devDependencies": {}, + "peerDependencies": {} +} diff --git a/third_party/protoc-gen-go.sh b/third_party/protoc-gen-go.sh index 42dfd9d..b42e4af 100755 --- a/third_party/protoc-gen-go.sh +++ b/third_party/protoc-gen-go.sh @@ -2,4 +2,7 @@ set -eu -protoc --proto_path=api/proto/v1 --proto_path=third_party --go_out=plugins=grpc:pkg/api/v1 -I api/proto/v1 api/proto/v1/*.proto +PROTO_DIR="./api/proto/v1" +PKG_DIR="./pkg/api/v1" + +protoc --proto_path=${PROTO_DIR} --proto_path=third_party --go_out=plugins=grpc:${PKG_DIR} -I ${PROTO_DIR} ${PROTO_DIR}/**/*.proto diff --git a/third_party/protoc-gen-ts.sh b/third_party/protoc-gen-ts.sh index 9a34dd9..5428e1b 100755 --- a/third_party/protoc-gen-ts.sh +++ b/third_party/protoc-gen-ts.sh @@ -19,16 +19,17 @@ set -eu PLUGIN_TS=./node_modules/.bin/protoc-gen-ts PLUGIN_GRPC=./node_modules/.bin/grpc_tools_node_protoc_plugin -SRC_DIR=./api/proto/v1 -DIST_DIR=./pkg/api/v1 + +PROTO_DIR="./api/proto/v1" +PKG_DIR="./pkg/api/v1" protoc \ ---js_out=import_style=commonjs,binary:"${DIST_DIR}"/ \ ---ts_out=import_style=commonjs,binary:"${DIST_DIR}"/ \ ---grpc_out="${DIST_DIR}"/ \ +--js_out=import_style=commonjs,binary:"${PKG_DIR}"/ \ +--ts_out=import_style=commonjs,binary:"${PKG_DIR}"/ \ +--grpc_out="${PKG_DIR}"/ \ --plugin=protoc-gen-grpc="${PLUGIN_GRPC}" \ --plugin=protoc-gen-ts="${PLUGIN_TS}" \ ---proto_path=${SRC_DIR} \ +--proto_path=${PROTO_DIR} \ --proto_path=third_party \ --I ${DIST_DIR} \ -${SRC_DIR}/*.proto \ No newline at end of file +-I ${PKG_DIR} \ +${PROTO_DIR}/**/*.proto \ No newline at end of file