Merge pull request #44 from unistack-org/drpc

fix drpc method name in generator

.github/workflows/autoapprove.yml

@@ -0,0 +1,20 @@
+name: "autoapprove"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  autoapprove:
+    runs-on: ubuntu-latest
+    steps:
+      - name: approve
+        uses: hmarr/auto-approve-action@v2
+        if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
+        id: approve
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/automerge.yml

@@ -0,0 +1,21 @@
+name: "automerge"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    if: github.actor == 'vtolstov'
+    steps:
+      - name: merge
+        id: merge
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/build.yml

@@ -3,6 +3,7 @@ on:
  push:
     branches:
     - master
+    - v3
 jobs:
   test:
     name: test
@@ -11,9 +12,9 @@ jobs:
     - name: setup
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.17
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: cache
       uses: actions/cache@v2
       with:
@@ -31,9 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v3.1.0
         continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.

.github/workflows/codeql-analysis.yml

@@ -9,7 +9,7 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: "CodeQL"
+name: "codeql"
 
 on:
   workflow_run:
@@ -17,16 +17,16 @@ on:
     types:
       - completed
   push:
-    branches: [ master ]
+    branches: [ master, v3 ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ master, v3 ]
   schedule:
     - cron: '34 1 * * 0'
 
 jobs:
   analyze:
-    name: Analyze
+    name: analyze
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -42,11 +42,14 @@ jobs:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
-    - name: Checkout repository
+    - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
-
+    - name: setup
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.17
     # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
+    - name: init
       uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
@@ -57,7 +60,7 @@ jobs:
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
+    - name: autobuild
       uses: github/codeql-action/autobuild@v1
 
     # ℹ️ Command-line programs to run using the OS shell.
@@ -71,5 +74,5 @@ jobs:
     #   make bootstrap
     #   make release
 
-    - name: Perform CodeQL Analysis
+    - name: analyze
       uses: github/codeql-action/analyze@v1

.github/workflows/dependabot-automerge.yml

@@ -1,66 +1,27 @@
-name: "prautomerge"
+name: "dependabot-automerge"
 
 on:
-  workflow_run:
+  pull_request_target:
-    workflows: ["prbuild"]
+    types: [assigned, opened, synchronize, reopened]
-    types:
-      - completed
 
 permissions:
-  contents: write
   pull-requests: write
+  contents: write
 
 jobs:
-  Dependabot-Automerge:
+  automerge:
     runs-on: ubuntu-latest
-    # Contains workaround to execute if dependabot updates the PR by checking for the base branch in the linked PR
+    if: github.actor == 'dependabot[bot]'
-    # The the github.event.workflow_run.event value is 'push' and not 'pull_request'
-    # dont work with multiple workflows when last returns success
-    if: >-
-      github.event.workflow_run.conclusion == 'success'
-      && github.actor == 'dependabot[bot]'
-      && github.event.sender.login == 'dependabot[bot]'
-      && github.event.sender.type == 'Bot'
-      && (github.event.workflow_run.event == 'pull_request'
-          || (github.event.workflow_run.event == 'push' && github.event.workflow_run.pull_requests[0].base.ref == github.event.repository.default_branch ))
     steps:
-      - name: Approve Changes and Merge changes if label 'dependencies' is set
+      - name: metadata
-        uses: actions/github-script@v6
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.0
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-token: "${{ secrets.TOKEN }}"
-          script: |
+      - name: merge
-            console.log(context.payload.workflow_run);
+        id: merge
-            
+        if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
-            var labelNames = await github.paginate(
+        run: gh pr merge --auto --merge "$PR_URL"
-              github.issues.listLabelsOnIssue,
+        env:
-              {
+          PR_URL: ${{github.event.pull_request.html_url}}
-                repo: context.repo.repo,
+          GITHUB_TOKEN: ${{secrets.TOKEN}}
-                owner: context.repo.owner,
-                issue_number: context.payload.workflow_run.pull_requests[0].number,
-              },
-              (response) => response.data.map(
-                (label) => label.name
-              )
-            );
-
-            console.log(labelNames);
-
-            if (labelNames.includes('dependencies')) {
-              console.log('Found label');
-
-              await github.pulls.createReview({
-                repo: context.repo.repo,
-                owner: context.repo.owner,
-                pull_number: context.payload.workflow_run.pull_requests[0].number,
-                event: 'APPROVE'
-              });
-              console.log('Approved PR');
-
-              await github.pulls.merge({
-                repo: context.repo.repo,
-                owner: context.repo.owner,
-                pull_number: context.payload.workflow_run.pull_requests[0].number,
-              });
-
-              console.log('Merged PR');
-            }

.github/workflows/pr.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
     - master
+    - v3
 jobs:
   test:
     name: test
@@ -11,9 +12,9 @@ jobs:
     - name: setup
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16
+        go-version: 1.17
     - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
     - name: cache
       uses: actions/cache@v2
       with:
@@ -31,9 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v3.1.0
         continue-on-error: true
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.

go.mod

@@ -4,7 +4,7 @@ go 1.16
 
 require (
 	github.com/fatih/structtag v1.2.0
-	go.unistack.org/micro-proto/v3 v3.2.5
+	go.unistack.org/micro-proto/v3 v3.2.7
-	golang.org/x/tools v0.1.9
+	golang.org/x/tools v0.1.10
 	google.golang.org/protobuf v1.27.1
 )

go.sum

@@ -68,17 +68,17 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.unistack.org/micro-proto/v3 v3.2.5 h1:qaMr9oaO8J2X9nvcZfQ+JriuEFfoMzRvFfQdKoVlWgU=
+go.unistack.org/micro-proto/v3 v3.2.7 h1:zG6d69kHc+oij2lwQ3AfrCgdjiEVRG2A7TlsxjusWs4=
-go.unistack.org/micro-proto/v3 v3.2.5/go.mod h1:ZltVWNECD5yK+40+OCONzGw4OtmSdTpVi8/KFgo9dqM=
+go.unistack.org/micro-proto/v3 v3.2.7/go.mod h1:ZltVWNECD5yK+40+OCONzGw4OtmSdTpVi8/KFgo9dqM=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
+golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
-golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
+golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -87,6 +87,7 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
@@ -105,6 +106,7 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -119,8 +121,8 @@ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8=
+golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
-golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
+golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

http.go

@@ -40,13 +40,13 @@ func (g *Generator) httpGenerate(component string, plugin *protogen.Plugin, genC
 
 		for _, service := range file.Services {
 			if genClient {
-				generateServiceClient(gfile, service)
+				g.generateServiceClient(gfile, service)
-				generateServiceClientMethods(gfile, service, true)
+				g.generateServiceClientMethods(gfile, service, component)
 			}
 			if genServer {
 				generateServiceServer(gfile, service)
-				generateServiceServerMethods(gfile, service)
+				g.generateServiceServerMethods(gfile, service)
-				generateServiceRegister(gfile, service)
+				g.generateServiceRegister(gfile, service)
 			}
 		}
 	}

main.go

@@ -45,11 +45,13 @@ type Generator struct {
 	fieldaligment bool
 	tagPath       string
 	openapiFile   string
+	plugin        *protogen.Plugin
 }
 
 func (g *Generator) Generate(plugin *protogen.Plugin) error {
 	var err error
 
+	g.plugin = plugin
 	g.standalone = *flagStandalone
 	g.debug = *flagDebug
 	g.components = *flagComponents
@@ -87,8 +89,8 @@ func (g *Generator) Generate(plugin *protogen.Plugin) error {
 			err = g.microGenerate(component, plugin, genClient, genServer)
 		case "http":
 			err = g.httpGenerate(component, plugin, genClient, genServer)
-		case "grpc", "rpc":
+		case "grpc", "drpc", "rpc":
-			err = g.rpcGenerate("rpc", plugin, genClient, genServer)
+			err = g.rpcGenerate(component, plugin, genClient, genServer)
 		case "gorilla":
 			err = g.gorillaGenerate(component, plugin)
 		case "chi":

micro.go

@@ -35,14 +35,14 @@ func (g *Generator) microGenerate(component string, plugin *protogen.Plugin, gen
 		}
 		// generate services
 		for _, service := range file.Services {
-			generateServiceEndpoints(gfile, service)
+			g.generateServiceEndpoints(gfile, service)
 			if genClient {
-				generateServiceClientInterface(gfile, service)
+				g.generateServiceClientInterface(gfile, service)
-				generateServiceClientStreamInterface(gfile, service)
+				g.generateServiceClientStreamInterface(gfile, service)
 			}
 			if genServer {
-				generateServiceServerInterface(gfile, service)
+				g.generateServiceServerInterface(gfile, service)
-				generateServiceServerStreamInterface(gfile, service)
+				g.generateServiceServerStreamInterface(gfile, service)
 			}
 		}
 

openapiv3.go

@@ -653,49 +653,54 @@ func (g *openapiv3Generator) buildOperationV3(
 		opt := eopt.(*v3.Operation)
 		if r := opt.Responses; r != nil {
 			responses = r
-		}
 
-		if ref := responses.Default.GetReference(); ref != nil && ref.GetXRef() != "" {
+			rd := responses.Default
-			xref := strings.TrimPrefix(ref.GetXRef(), ".")
+			if rd != nil {
-			description := "Default"
+				if ref := rd.GetReference(); ref != nil && ref.GetXRef() != "" {
-			if strings.Contains(xref, "micro.errors.Error") {
+					xref := strings.TrimPrefix(ref.GetXRef(), ".")
-				description += " Error"
+					description := "Default"
-			}
+					if strings.Contains(xref, "micro.errors.Error") {
-			desc, err := protofiles.FindDescriptorByName(protoreflect.FullName(xref))
+						description += " Error"
-			if err != nil {
+					}
-				log.Printf("unknown ref type %s err %v", xref, err)
+					desc, err := protofiles.FindDescriptorByName(protoreflect.FullName(xref))
-			} else {
+					if err != nil {
-				responses.Default.Oneof = &v3.ResponseOrReference_Response{
+						log.Printf("unknown ref type %s err %v", xref, err)
-					Response: &v3.Response{
+					} else {
-						Description: description,
+						responses.Default.Oneof = &v3.ResponseOrReference_Response{
-						Content: g.responseContentForMessage(&protogen.Message{
+							Response: &v3.Response{
-							Desc: desc.(protoreflect.MessageDescriptor),
+								Description: description,
-						}),
+								Content: g.responseContentForMessage(&protogen.Message{
-					},
+									Desc: desc.(protoreflect.MessageDescriptor),
-				}
+								}),
-			}
+							},
-		}
+						}
-		for _, rref := range responses.GetResponseOrReference() {
-			if ref := rref.Value.GetReference(); ref != nil && ref.GetXRef() != "" {
-				xref := strings.TrimPrefix(ref.GetXRef(), ".")
-				description := "Default"
-				if strings.Contains(xref, "micro.errors.Error") {
-					description += " Error"
-				}
-				desc, err := protofiles.FindDescriptorByName(protoreflect.FullName(xref))
-				if err != nil {
-					log.Printf("unknown ref type %s err %v", xref, err)
-				} else {
-					responses.Default.Oneof = &v3.ResponseOrReference_Response{
-						Response: &v3.Response{
-							Description: description,
-							Content: g.responseContentForMessage(&protogen.Message{
-								Desc: desc.(protoreflect.MessageDescriptor),
-							}),
-						},
 					}
 				}
 			}
+			for _, rref := range responses.GetResponseOrReference() {
+				if ref := rref.Value.GetReference(); ref != nil && ref.GetXRef() != "" {
+					xref := strings.TrimPrefix(ref.GetXRef(), ".")
+					description := "Default"
+					if strings.Contains(xref, "micro.errors.Error") {
+						description += " Error"
+					}
+					desc, err := protofiles.FindDescriptorByName(protoreflect.FullName(xref))
+					if err != nil {
+						log.Printf("unknown ref type %s err %v", xref, err)
+					} else {
+						responses.Default.Oneof = &v3.ResponseOrReference_Response{
+							Response: &v3.Response{
+								Description: description,
+								Content: g.responseContentForMessage(&protogen.Message{
+									Desc: desc.(protoreflect.MessageDescriptor),
+								}),
+							},
+						}
+					}
+				}
+			}
+		} else {
+			responses = &v3.Responses{}
 		}
 	} else {
 		responses = &v3.Responses{}

rpc.go

@@ -37,13 +37,13 @@ func (g *Generator) rpcGenerate(component string, plugin *protogen.Plugin, genCl
 		}
 		for _, service := range file.Services {
 			if genClient {
-				generateServiceClient(gfile, service)
+				g.generateServiceClient(gfile, service)
-				generateServiceClientMethods(gfile, service, false)
+				g.generateServiceClientMethods(gfile, service, component)
 			}
 			if genServer {
 				generateServiceServer(gfile, service)
-				generateServiceServerMethods(gfile, service)
+				g.generateServiceServerMethods(gfile, service)
-				generateServiceRegister(gfile, service)
+				g.generateServiceRegister(gfile, service)
 			}
 		}
 	}

util.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"log"
 	"net/http"
 	"strings"
 
@@ -28,7 +29,7 @@ func unexport(s string) string {
 	return strings.ToLower(s[:1]) + s[1:]
 }
 
-func generateServiceClient(gfile *protogen.GeneratedFile, service *protogen.Service) {
+func (g *Generator) generateServiceClient(gfile *protogen.GeneratedFile, service *protogen.Service) {
 	serviceName := service.GoName
 	// if rule, ok := getMicroApiService(service); ok {
 	//		gfile.P("// client wrappers ", strings.Join(rule.ClientWrappers, ", "))
@@ -44,13 +45,16 @@ func generateServiceClient(gfile *protogen.GeneratedFile, service *protogen.Serv
 	gfile.P()
 }
 
-func generateServiceClientMethods(gfile *protogen.GeneratedFile, service *protogen.Service, http bool) {
+func (g *Generator) generateServiceClientMethods(gfile *protogen.GeneratedFile, service *protogen.Service, component string) {
 	serviceName := service.GoName
 	for _, method := range service.Methods {
 		methodName := fmt.Sprintf("%s.%s", serviceName, method.GoName)
-		generateClientFuncSignature(gfile, serviceName, method)
+		if component == "drpc" {
+			methodName = fmt.Sprintf("%s.%s", method.Parent.Desc.FullName(), method.Desc.Name())
+		}
+		g.generateClientFuncSignature(gfile, serviceName, method)
 
-		if http && method.Desc.Options() != nil {
+		if component == "http" && method.Desc.Options() != nil {
 			if proto.HasExtension(method.Desc.Options(), v2.E_Openapiv2Operation) {
 				opts := proto.GetExtension(method.Desc.Options(), v2.E_Openapiv2Operation)
 				if opts != nil {
@@ -61,20 +65,25 @@ func generateServiceClientMethods(gfile *protogen.GeneratedFile, service *protog
 					gfile.P("errmap := make(map[string]interface{}, ", len(r.Responses.ResponseCode), ")")
 					for _, rsp := range r.Responses.ResponseCode {
 						if schema := rsp.Value.GetJsonReference(); schema != nil {
-							ref := schema.XRef
+							xref := schema.XRef
-							if strings.HasPrefix(ref, "."+string(service.Desc.ParentFile().Package())+".") {
+							if strings.HasPrefix(xref, "."+string(service.Desc.ParentFile().Package())+".") {
-								ref = strings.TrimPrefix(ref, "."+string(service.Desc.ParentFile().Package())+".")
+								xref = strings.TrimPrefix(xref, "."+string(service.Desc.ParentFile().Package())+".")
 							}
-							if ref[0] == '.' {
+							if xref[0] == '.' {
-								ref = ref[1:]
+								xref = xref[1:]
 							}
-							switch ref {
+							switch xref {
 							case "micro.codec.Frame":
 								gfile.P(`errmap["`, rsp.Name, `"] = &`, microCodecPackage.Ident("Frame"), "{}")
 							case "micro.errors.Error":
 								gfile.P(`errmap["`, rsp.Name, `"] = &`, microErrorsPackage.Ident("Error"), "{}")
 							default:
-								gfile.P(`errmap["`, rsp.Name, `"] = &`, ref, "{}")
+								ident, err := g.getGoIdentByXref(strings.TrimPrefix(schema.XRef, "."))
+								if err != nil {
+									log.Printf("cant find message by ref %s\n", schema.XRef)
+									continue
+								}
+								gfile.P(`errmap["`, rsp.Name, `"] = &`, gfile.QualifiedGoIdent(ident), "{}")
 							}
 						}
 					}
@@ -97,20 +106,25 @@ func generateServiceClientMethods(gfile *protogen.GeneratedFile, service *protog
 					gfile.P("errmap := make(map[string]interface{}, ", len(resps), ")")
 					for _, rsp := range resps {
 						if schema := rsp.Value.GetReference(); schema != nil {
-							ref := schema.XRef
+							xref := schema.XRef
-							if strings.HasPrefix(ref, "."+string(service.Desc.ParentFile().Package())+".") {
+							if strings.HasPrefix(xref, "."+string(service.Desc.ParentFile().Package())+".") {
-								ref = strings.TrimPrefix(ref, "."+string(service.Desc.ParentFile().Package())+".")
+								xref = strings.TrimPrefix(xref, "."+string(service.Desc.ParentFile().Package())+".")
 							}
-							if ref[0] == '.' {
+							if xref[0] == '.' {
-								ref = ref[1:]
+								xref = xref[1:]
 							}
-							switch ref {
+							switch xref {
 							case "micro.codec.Frame":
 								gfile.P(`errmap["`, rsp.Name, `"] = &`, microCodecPackage.Ident("Frame"), "{}")
 							case "micro.errors.Error":
 								gfile.P(`errmap["`, rsp.Name, `"] = &`, microErrorsPackage.Ident("Error"), "{}")
 							default:
-								gfile.P(`errmap["`, rsp.Name, `"] = &`, ref, "{}")
+								ident, err := g.getGoIdentByXref(strings.TrimPrefix(schema.XRef, "."))
+								if err != nil {
+									log.Printf("cant find message by ref %s\n", schema.XRef)
+									continue
+								}
+								gfile.P(`errmap["`, rsp.Name, `"] = &`, gfile.QualifiedGoIdent(ident), "{}")
 							}
 						}
 					}
@@ -300,7 +314,7 @@ func generateServiceServer(gfile *protogen.GeneratedFile, service *protogen.Serv
 	gfile.P()
 }
 
-func generateServiceServerMethods(gfile *protogen.GeneratedFile, service *protogen.Service) {
+func (g *Generator) generateServiceServerMethods(gfile *protogen.GeneratedFile, service *protogen.Service) {
 	serviceName := service.GoName
 	for _, method := range service.Methods {
 		generateServerFuncSignature(gfile, serviceName, method, true)
@@ -444,7 +458,7 @@ func generateServiceServerMethods(gfile *protogen.GeneratedFile, service *protog
 	}
 }
 
-func generateServiceRegister(gfile *protogen.GeneratedFile, service *protogen.Service) {
+func (g *Generator) generateServiceRegister(gfile *protogen.GeneratedFile, service *protogen.Service) {
 	serviceName := service.GoName
 	gfile.P("func Register", serviceName, "Server(s ", microServerPackage.Ident("Server"), ", sh ", serviceName, "Server, opts ...", microServerPackage.Ident("HandlerOption"), ") error {")
 	gfile.P("type ", unexport(serviceName), " interface {")
@@ -508,7 +522,7 @@ func generateServerSignature(gfile *protogen.GeneratedFile, serviceName string,
 	gfile.P(args...)
 }
 
-func generateClientFuncSignature(gfile *protogen.GeneratedFile, serviceName string, method *protogen.Method) {
+func (g *Generator) generateClientFuncSignature(gfile *protogen.GeneratedFile, serviceName string, method *protogen.Method) {
 	args := append([]interface{}{},
 		"func (c *",
 		unexport(serviceName),
@@ -547,7 +561,7 @@ func generateClientSignature(gfile *protogen.GeneratedFile, serviceName string,
 	gfile.P(args...)
 }
 
-func generateServiceClientInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
+func (g *Generator) generateServiceClientInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
 	serviceName := service.GoName
 	gfile.P("type ", serviceName, "Client interface {")
 	for _, method := range service.Methods {
@@ -557,7 +571,7 @@ func generateServiceClientInterface(gfile *protogen.GeneratedFile, service *prot
 	gfile.P()
 }
 
-func generateServiceServerInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
+func (g *Generator) generateServiceServerInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
 	serviceName := service.GoName
 	gfile.P("type ", serviceName, "Server interface {")
 	for _, method := range service.Methods {
@@ -567,7 +581,7 @@ func generateServiceServerInterface(gfile *protogen.GeneratedFile, service *prot
 	gfile.P()
 }
 
-func generateServiceClientStreamInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
+func (g *Generator) generateServiceClientStreamInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
 	serviceName := service.GoName
 	for _, method := range service.Methods {
 		if !method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
@@ -594,7 +608,7 @@ func generateServiceClientStreamInterface(gfile *protogen.GeneratedFile, service
 	}
 }
 
-func generateServiceServerStreamInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
+func (g *Generator) generateServiceServerStreamInterface(gfile *protogen.GeneratedFile, service *protogen.Service) {
 	serviceName := service.GoName
 	for _, method := range service.Methods {
 		if !method.Desc.IsStreamingClient() && !method.Desc.IsStreamingServer() {
@@ -621,7 +635,7 @@ func generateServiceServerStreamInterface(gfile *protogen.GeneratedFile, service
 	}
 }
 
-func generateServiceEndpoints(gfile *protogen.GeneratedFile, service *protogen.Service) {
+func (g *Generator) generateServiceEndpoints(gfile *protogen.GeneratedFile, service *protogen.Service) {
 	serviceName := service.GoName
 	gfile.P("var (")
 	gfile.P(serviceName, "Name", "=", `"`, serviceName, `"`)
@@ -755,3 +769,32 @@ func generateEndpoint(gfile *protogen.GeneratedFile, serviceName string, methodN
 	}
 	gfile.P(`Handler: "rpc",`)
 }
+
+func (g *Generator) getGoIdentByXref(xref string) (protogen.GoIdent, error) {
+	idx := strings.LastIndex(xref, ".")
+	pkg := xref[:idx]
+	msg := xref[idx+1:]
+	for _, file := range g.plugin.Files {
+		if strings.Compare(pkg, *(file.Proto.Package)) != 0 {
+			continue
+		}
+		if ident, err := getGoIdentByMessage(file.Messages, msg); err == nil {
+			return ident, nil
+		}
+	}
+	return protogen.GoIdent{}, fmt.Errorf("not found")
+}
+
+func getGoIdentByMessage(messages []*protogen.Message, msg string) (protogen.GoIdent, error) {
+	for _, message := range messages {
+		if strings.Compare(msg, message.GoIdent.GoName) == 0 {
+			return message.GoIdent, nil
+		}
+		if len(message.Messages) > 0 {
+			if ident, err := getGoIdentByMessage(message.Messages, msg); err == nil {
+				return ident, nil
+			}
+		}
+	}
+	return protogen.GoIdent{}, fmt.Errorf("not found")
+}

variables.go

@@ -16,8 +16,8 @@ var (
 	microServerPackage     = protogen.GoImportPath("go.unistack.org/micro/v3/server")
 	microClientHttpPackage = protogen.GoImportPath("go.unistack.org/micro-client-http/v3")
 	microServerHttpPackage = protogen.GoImportPath("go.unistack.org/micro-server-http/v3")
-	microCodecPackage      = protogen.GoImportPath("go.unistack.org/micro-proto/v3/codec")
+	microCodecPackage      = protogen.GoImportPath("go.unistack.org/micro/v3/codec")
-	microErrorsPackage     = protogen.GoImportPath("go.unistack.org/micro-proto/v3/errors")
+	microErrorsPackage     = protogen.GoImportPath("go.unistack.org/micro/v3/errors")
 	timePackage            = protogen.GoImportPath("time")
 	deprecationComment     = "// Deprecated: Do not use."
 	versionComment         = "v3.5.3"