rename to WebRpc

webrpc · Oct 7, 2024 · 5eeffb4 · 5eeffb4
1 parent 10705b1
commit 5eeffb4
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 54 deletions.
diff --git a/_examples/golang-basics/example.gen.go b/_examples/golang-basics/example.gen.go
diff --git a/_examples/golang-basics/example.ridl b/_examples/golang-basics/example.ridl
@@ -83,7 +83,7 @@ struct ComplexType
   - user: User
 
 struct GenVersions
-  - WebRPCGenVersion: string
+  - WebRpcGenVersion: string
   - TmplTarget: string
   - TmplVersion: string
   - SchemaVersion: string

diff --git a/_examples/golang-basics/main.go b/_examples/golang-basics/main.go
@@ -65,13 +65,13 @@ func (rpc *ExampleServiceRPC) Version(ctx context.Context) (*Version, error) {
 		SchemaVersion: WebRPCSchemaVersion(),
 		SchemaHash:    WebRPCSchemaHash(),
 		ClientGenVersion: &GenVersions{
-			WebRPCGenVersion: clientVersions.WebRPCGenVersion,
+			WebRpcGenVersion: clientVersions.WebRpcGenVersion,
 			TmplTarget:       clientVersions.CodeGenName,
 			TmplVersion:      clientVersions.CodeGenVersion,
 			SchemaVersion:    clientVersions.CodeGenVersion,
 		},
 		ServerGenVersion: &GenVersions{
-			WebRPCGenVersion: serverVersions.WebRPCGenVersion,
+			WebRpcGenVersion: serverVersions.WebRpcGenVersion,
 			TmplTarget:       serverVersions.CodeGenName,
 			TmplVersion:      serverVersions.CodeGenVersion,
 			SchemaVersion:    serverVersions.CodeGenVersion,

diff --git a/_examples/golang-imports/api.gen.go b/_examples/golang-imports/api.gen.go
diff --git a/client.go.tmpl b/client.go.tmpl
@@ -208,7 +208,7 @@ func newRequest(ctx context.Context, url string, reqBody io.Reader, contentType
 	}
 	req.Header.Set("Accept", contentType)
 	req.Header.Set("Content-Type", contentType)
-	req.Header.Set(WebRPCHeaderName, WebRPCHeader)
+	req.Header.Set(WebRpcHeaderName, WebRpcHeader)
 	if headers, ok := HTTPRequestHeaders(ctx); ok {
 		for k := range headers {
 			for _, v := range headers[k] {

diff --git a/main.go.tmpl b/main.go.tmpl
@@ -81,9 +81,9 @@ package {{get $opts "pkg"}}
 
 {{template "imports" dict "Types" .Types "Opts" $opts }}
 
-const WebRPCHeader = "{{ .WebrpcHeader }}"
+const WebRpcHeader = "{{ .WebrpcHeader }}"
 
-const WebRPCHeaderName = "Webrpc"
+const WebRpcHeaderName = "Webrpc"
 
 // WebRPC description and code-gen version
 func WebRPCVersion() string {
@@ -100,37 +100,37 @@ func WebRPCSchemaHash() string {
 	return "{{.SchemaHash}}"
 }
 
-type WebRPCGenVersions struct {
-    WebRPCGenVersion string
+type WebRpcGenVersions struct {
+    WebRpcGenVersion string
     CodeGenName string
     CodeGenVersion string
     SchemaName string
     SchemaVersion string
 }
 
-func ServerVersion() (*WebRPCGenVersions, error)  {
-    versions, err := parseWebRPCGenVersions(WebRPCHeader)
+func ServerVersion() (*WebRpcGenVersions, error)  {
+    versions, err := parseWebRpcGenVersions(WebRpcHeader)
     if err != nil {
         return nil, fmt.Errorf("webrpc header is invalid: %w", err)
     }
 
     return versions, nil
 }
 
-func VersionFromHeader(h http.Header) (*WebRPCGenVersions, error) {
-    if h.Get(WebRPCHeaderName) == "" {
+func VersionFromHeader(h http.Header) (*WebRpcGenVersions, error) {
+    if h.Get(WebRpcHeaderName) == "" {
         return nil, fmt.Errorf("header is empty or missing")
     }
 
-    versions, err := parseWebRPCGenVersions(h.Get(WebRPCHeaderName))
+    versions, err := parseWebRpcGenVersions(h.Get(WebRpcHeaderName))
     if err != nil {
         return nil, fmt.Errorf("webrpc header is invalid: %w", err)
     }
 
     return versions, nil
 }
 
-func parseWebRPCGenVersions(header string) (*WebRPCGenVersions, error) {
+func parseWebRpcGenVersions(header string) (*WebRpcGenVersions, error) {
     versions := strings.Split(header, ";")
     if len(versions) < 3 {
         return nil, fmt.Errorf("expected at least 3 parts while parsing webrpc header: %v", header)
@@ -148,11 +148,11 @@ func parseWebRPCGenVersions(header string) (*WebRPCGenVersions, error) {
 
     schemaName, schemaVersion, ok := strings.Cut(versions[2], "@")
     if !ok {
-		return nil, fmt.Errorf("schema name and schema version could not be parsed from: %s", versions[2])
-	}
+        return nil, fmt.Errorf("schema name and schema version could not be parsed from: %s", versions[2])
+    }
 
-    return &WebRPCGenVersions{
-        WebRPCGenVersion: webrpcGenVersion,
+    return &WebRpcGenVersions{
+        WebRpcGenVersion: webrpcGenVersion,
         CodeGenName: tmplTarget,
         CodeGenVersion: tmplVersion,
         SchemaName: schemaName,

diff --git a/server.go.tmpl b/server.go.tmpl
@@ -38,7 +38,7 @@ func (s *{{$serviceName}}) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}()
 
-	w.Header().Set(WebRPCHeaderName, WebRPCHeader)
+	w.Header().Set(WebRpcHeaderName, WebRpcHeader)
 
 	ctx := r.Context()
 	ctx = context.WithValue(ctx, HTTPResponseWriterCtxKey, w)