UI: Allow to set default discovery timeout via configuration (#211)

* allow to set default discovery timeout via configuration --------- Co-authored-by: Patrik Matiaško <patrik.matiasko@gmail.com>
plgd-dev · Feb 8, 2024 · 8cd9d6d · 8cd9d6d
1 parent 2386cbb
commit 8cd9d6d
Show file tree

Hide file tree

Showing 29 changed files with 1,292 additions and 177 deletions.
diff --git a/.github/workflows/staticAnalysis.yml b/.github/workflows/staticAnalysis.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "^1.20" # The Go version to download (if necessary) and use.
+          go-version: "1.21" # The Go version to download (if necessary) and use.
           check-latest: true
       - run: go version
 

diff --git a/config.yaml b/config.yaml
@@ -44,6 +44,7 @@ apis:
       allowCredentials: false
     ui:
       enabled: false
+      defaultDiscoveryTimeout: 2s
       directory: ""
   grpc:
     enabled: true

diff --git a/pb/clear_cache.pb.go b/pb/clear_cache.pb.go
diff --git a/pb/create_resource.pb.go b/pb/create_resource.pb.go
diff --git a/pb/delete_resource.pb.go b/pb/delete_resource.pb.go
diff --git a/pb/disown_device.pb.go b/pb/disown_device.pb.go
diff --git a/pb/get_configuration.go b/pb/get_configuration.go
@@ -71,14 +71,24 @@ func (c *BuildInfo) Clone() *BuildInfo {
 	}
 }
 
-func NewGetConfigurationResponse(info *BuildInfo) *GetConfigurationResponse {
+func NewGetConfigurationResponse(info *BuildInfo, ui *UIConfiguration) *GetConfigurationResponse {
 	return &GetConfigurationResponse{
 		BuildInfo:  info,
 		Version:    info.GetVersion(),
 		BuildDate:  info.GetBuildDate(),
 		CommitHash: info.GetCommitHash(),
 		CommitDate: info.GetCommitDate(),
 		ReleaseUrl: info.GetReleaseUrl(),
+		Ui:         ui,
+	}
+}
+
+func (r *UIConfiguration) Clone() *UIConfiguration {
+	if r == nil {
+		return nil
+	}
+	return &UIConfiguration{
+		DefaultDiscoveryTimeout: r.GetDefaultDiscoveryTimeout(),
 	}
 }
 
@@ -94,6 +104,7 @@ func (r *GetConfigurationResponse) Clone() *GetConfigurationResponse {
 		ReleaseUrl:         r.GetBuildInfo().GetReleaseUrl(),
 		RemoteProvisioning: r.RemoteProvisioning.Clone(),
 		BuildInfo:          r.GetBuildInfo().Clone(),
+		Ui:                 r.GetUi().Clone(),
 	}
 }
 

diff --git a/pb/get_configuration.pb.go b/pb/get_configuration.pb.go
diff --git a/pb/get_configuration.proto b/pb/get_configuration.proto
@@ -74,6 +74,13 @@ message BuildInfo {
     string release_url = 5;
 }
 
+// UI configuration
+message UIConfiguration {
+    // similar to https://github.com/plgd-dev/hub/blob/4c4861a4bc483ba4080a1d448063da392eff4026/grpc-gateway/pb/hubConfiguration.proto#L61
+
+    int64 default_discovery_timeout = 100; // default discovery timeout in nanoseconds
+}
+
 message GetConfigurationResponse {
     enum DeviceAuthenticationMode {
         PRE_SHARED_KEY = 0;
@@ -91,4 +98,5 @@ message GetConfigurationResponse {
     RemoteProvisioning remote_provisioning = 8;
     string owner = 9;
     BuildInfo build_info = 10;
+    UIConfiguration ui = 11;
 }
diff --git a/pb/get_device.pb.go b/pb/get_device.pb.go
diff --git a/pb/get_device_resource_links.pb.go b/pb/get_device_resource_links.pb.go
diff --git a/pb/get_devices.pb.go b/pb/get_devices.pb.go
diff --git a/pb/get_identity_certificate.pb.go b/pb/get_identity_certificate.pb.go
diff --git a/pb/get_json_web_keys.pb.go b/pb/get_json_web_keys.pb.go
diff --git a/pb/get_resource.pb.go b/pb/get_resource.pb.go
diff --git a/pb/initialize.pb.go b/pb/initialize.pb.go
diff --git a/pb/offboard_device.pb.go b/pb/offboard_device.pb.go
diff --git a/pb/onboard_device.pb.go b/pb/onboard_device.pb.go
diff --git a/pb/own_device.pb.go b/pb/own_device.pb.go
diff --git a/pb/reset.pb.go b/pb/reset.pb.go