default timeout in tl clients

VKCOM · Aug 22, 2024 · d073a3d · d073a3d
1 parent 42ce2c1
commit d073a3d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 25 deletions.
diff --git a/internal/tlcodegen/qt_namespace.qtpl b/internal/tlcodegen/qt_namespace.qtpl
@@ -10,6 +10,7 @@ package {%s= gen.GlobalPackageName + name %}
 import (
     {%- if gen.options.GenerateRPCCode && anyFunctions -%}
     "context"
+    "time"
 
     {%q= gen.options.BasicRPCPath %}
     {%q= gen.BasicPackageNameFull %}
@@ -34,7 +35,8 @@ type Client struct {
     Client  *rpc.Client
     Network string // should be either "tcp4" or "unix"
     Address string
-    ActorID int64 // should be non-zero when using rpc-proxy
+    ActorID int64     // should be >0 for routing via rpc-proxy
+    Timeout time.Time // used if not set in extra or ctx
 }
 
 {%= writeClientsCode(gen.GlobalPackageName, namespace.types, directImports, ourTypes) %}
@@ -122,6 +124,9 @@ func (c *Client) {%s= typeString %}(ctx context.Context, args {%s= typeString %}
     if extra != nil {
         req.Extra = *extra
     }
+	if _, ok := ctx.Deadline(); !ok {
+		rpc.UpdateExtraTimeout(&req.Extra, c.Timeout)
+	}
     req.Body, err = args.WriteBoxedGeneral(req.Body)
     if err != nil {
         return internal.ErrorClientWrite("{%s= tlName %}", err)

diff --git a/internal/tlcodegen/qt_namespace.qtpl.go b/internal/tlcodegen/qt_namespace.qtpl.go
diff --git a/internal/tlcodegen/test/gen/schema/meta/meta.go b/internal/tlcodegen/test/gen/schema/meta/meta.go