From a42a580e5211f89d5cc605a869a48425fccbd880 Mon Sep 17 00:00:00 2001 From: Marie Hoeger Date: Thu, 7 Jun 2018 16:20:08 -0500 Subject: [PATCH] Fix package name to not conflict with service name (#17) * update package nameto not conflict with service name * Updating namespaces * updates to readme --- README.md | 15 ++++++++++++--- src/proto/FunctionRpc.proto | 3 +-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 356e521..f7fd6fa 100644 --- a/README.md +++ b/README.md @@ -52,10 +52,19 @@ set OUTDIR=%MSGDIR%\DotNet mkdir %OUTDIR% %GRPC_TOOLS_PATH%\protoc.exe %PROTO% --csharp_out %OUTDIR% --grpc_out=%OUTDIR% --plugin=protoc-gen-grpc=%GRPC_TOOLS_PATH%\grpc_csharp_plugin.exe --proto_path=%PROTO_PATH% --proto_path=%PROTOBUF_TOOLS% ``` -## Java ---TODO-- - ## JavaScript +In package.json, add to the build script the following commands to build .js files and to build .ts files. Use and install npm package `protobufjs`. + +Generate JavaScript files: +``` +pbjs -t json-module -w commonjs -o azure-functions-language-worker-protobuf/src/rpc.js azure-functions-language-worker-protobuf/src/proto/FunctionRpc.proto +``` +Generate TypeScript files: +``` +pbjs -t static-module azure-functions-language-worker-protobuf/src/proto/FunctionRpc.proto -o azure-functions-language-worker-protobuf/src/rpc_static.js && pbts -o azure-functions-language-worker-protobuf/src/rpc.d.ts azure-functions-language-worker-protobuf/src/rpc_static.js +``` + +## Java Maven plugin : [protobuf-maven-plugin](https://www.xolstice.org/protobuf-maven-plugin/) In pom.xml add following under configuration for this plugin ${basedir}//azure-functions-language-worker-protobuf/src/proto diff --git a/src/proto/FunctionRpc.proto b/src/proto/FunctionRpc.proto index c7731cf..7994b90 100644 --- a/src/proto/FunctionRpc.proto +++ b/src/proto/FunctionRpc.proto @@ -4,10 +4,9 @@ syntax = "proto3"; option java_multiple_files = true; option java_package = "com.microsoft.azure.functions.rpc.messages"; option java_outer_classname = "FunctionProto"; -option objc_class_prefix = "FunctionRpc"; option csharp_namespace = "Microsoft.Azure.WebJobs.Script.Grpc.Messages"; -package FunctionRpc; +package AzureFunctionsRpcMessages; import "google/protobuf/duration.proto";