api: Misc fixes after cleanup.

All these files can be generated using the `make api` command and there
is no real need to commit these into the repo. Only the api/go files
need to be comitted of how the Go import system works.

Cargo.toml

@@ -20,3 +20,5 @@ diesel = { git = "https://github.com/diesel-rs/diesel.git", rev = "566dcccc6df6a
 
 # Remove if diesel-async > 0.4.1
 diesel-async = { git = "https://github.com/weiznich/diesel_async.git", rev = "017ebe2fb7a2709ab5db92148dea5ce812a35e09" }
+
+deadpool-redis = { git = "http://github.com/brocaar/deadpool.git", branch = "update_redis" }

api/go/Makefile

@@ -4,6 +4,11 @@ PROTOC_ARGS := -I=../proto --go_out=. --go_opt=paths=source_relative --go-grpc_o
 
 all: requirements common gw api integration stream
 
+requirements:
+	go mod download
+	go install google.golang.org/protobuf/cmd/protoc-gen-go
+	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc
+
 common:
 	protoc ${PROTOC_ARGS} common/common.proto
 

api/go/api/application.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.24.4
 // source: api/application.proto
 

api/go/api/device.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.24.4
 // source: api/device.proto
 

api/go/api/device_profile.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.24.4
 // source: api/device_profile.proto
 

api/go/api/device_profile_template.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.24.4
 // source: api/device_profile_template.proto
 

api/go/api/gateway.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.24.4
 // source: api/gateway.proto
 

api/go/api/internal.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.24.4
 // source: api/internal.proto
 

api/go/api/multicast_group.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.24.4
 // source: api/multicast_group.proto
 

api/go/api/relay.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.24.4
 // source: api/relay.proto
 

api/go/api/tenant.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.24.4
 // source: api/tenant.proto
 

api/go/api/user.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.24.4
 // source: api/user.proto
 

api/go/common/common.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.24.4
 // source: common/common.proto
 
@@ -530,54 +530,6 @@ func (MetricKind) EnumDescriptor() ([]byte, []int) {
 	return file_common_common_proto_rawDescGZIP(), []int{7}
 }
 
-type Regulation int32
-
-const (
-	// Unknown.
-	Regulation_REGULATION_UNKNOWN Regulation = 0
-	// ETSI EN 300 220.
-	Regulation_ETSI_EN_300_220 Regulation = 1
-)
-
-// Enum value maps for Regulation.
-var (
-	Regulation_name = map[int32]string{
-		0: "REGULATION_UNKNOWN",
-		1: "ETSI_EN_300_220",
-	}
-	Regulation_value = map[string]int32{
-		"REGULATION_UNKNOWN": 0,
-		"ETSI_EN_300_220":    1,
-	}
-)
-
-func (x Regulation) Enum() *Regulation {
-	p := new(Regulation)
-	*p = x
-	return p
-}
-
-func (x Regulation) String() string {
-	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
-}
-
-func (Regulation) Descriptor() protoreflect.EnumDescriptor {
-	return file_common_common_proto_enumTypes[8].Descriptor()
-}
-
-func (Regulation) Type() protoreflect.EnumType {
-	return &file_common_common_proto_enumTypes[8]
-}
-
-func (x Regulation) Number() protoreflect.EnumNumber {
-	return protoreflect.EnumNumber(x)
-}
-
-// Deprecated: Use Regulation.Descriptor instead.
-func (Regulation) EnumDescriptor() ([]byte, []int) {
-	return file_common_common_proto_rawDescGZIP(), []int{8}
-}
-
 type DeviceClass int32
 
 const (
@@ -614,11 +566,11 @@ func (x DeviceClass) String() string {
 }
 
 func (DeviceClass) Descriptor() protoreflect.EnumDescriptor {
-	return file_common_common_proto_enumTypes[9].Descriptor()
+	return file_common_common_proto_enumTypes[8].Descriptor()
 }
 
 func (DeviceClass) Type() protoreflect.EnumType {
-	return &file_common_common_proto_enumTypes[9]
+	return &file_common_common_proto_enumTypes[8]
 }
 
 func (x DeviceClass) Number() protoreflect.EnumNumber {
@@ -627,7 +579,7 @@ func (x DeviceClass) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use DeviceClass.Descriptor instead.
 func (DeviceClass) EnumDescriptor() ([]byte, []int) {
-	return file_common_common_proto_rawDescGZIP(), []int{9}
+	return file_common_common_proto_rawDescGZIP(), []int{8}
 }
 
 type Location struct {
@@ -1060,21 +1012,18 @@ var file_common_common_proto_rawDesc = []byte{
 	0x4e, 0x54, 0x48, 0x10, 0x02, 0x2a, 0x32, 0x0a, 0x0a, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x4b,
 	0x69, 0x6e, 0x64, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x45, 0x52, 0x10, 0x00,
 	0x12, 0x0c, 0x0a, 0x08, 0x41, 0x42, 0x53, 0x4f, 0x4c, 0x55, 0x54, 0x45, 0x10, 0x01, 0x12, 0x09,
-	0x0a, 0x05, 0x47, 0x41, 0x55, 0x47, 0x45, 0x10, 0x02, 0x2a, 0x39, 0x0a, 0x0a, 0x52, 0x65, 0x67,
-	0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x12, 0x52, 0x45, 0x47, 0x55, 0x4c,
-	0x41, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12,
-	0x13, 0x0a, 0x0f, 0x45, 0x54, 0x53, 0x49, 0x5f, 0x45, 0x4e, 0x5f, 0x33, 0x30, 0x30, 0x5f, 0x32,
-	0x32, 0x30, 0x10, 0x01, 0x2a, 0x34, 0x0a, 0x0b, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6c,
-	0x61, 0x73, 0x73, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x4c, 0x41, 0x53, 0x53, 0x5f, 0x41, 0x10, 0x00,
-	0x12, 0x0b, 0x0a, 0x07, 0x43, 0x4c, 0x41, 0x53, 0x53, 0x5f, 0x42, 0x10, 0x01, 0x12, 0x0b, 0x0a,
-	0x07, 0x43, 0x4c, 0x41, 0x53, 0x53, 0x5f, 0x43, 0x10, 0x02, 0x42, 0x69, 0x0a, 0x11, 0x69, 0x6f,
-	0x2e, 0x63, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x61, 0x70, 0x69, 0x42,
-	0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x68, 0x69, 0x72, 0x70,
-	0x73, 0x74, 0x61, 0x63, 0x6b, 0x2f, 0x63, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b,
-	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x34, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0xaa, 0x02, 0x11, 0x43, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x43,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x0a, 0x05, 0x47, 0x41, 0x55, 0x47, 0x45, 0x10, 0x02, 0x2a, 0x34, 0x0a, 0x0b, 0x44, 0x65, 0x76,
+	0x69, 0x63, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x4c, 0x41, 0x53,
+	0x53, 0x5f, 0x41, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x4c, 0x41, 0x53, 0x53, 0x5f, 0x42,
+	0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x4c, 0x41, 0x53, 0x53, 0x5f, 0x43, 0x10, 0x02, 0x42,
+	0x69, 0x0a, 0x11, 0x69, 0x6f, 0x2e, 0x63, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b,
+	0x2e, 0x61, 0x70, 0x69, 0x42, 0x0b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x50, 0x01, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x63, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2f, 0x63, 0x68, 0x69, 0x72, 0x70,
+	0x73, 0x74, 0x61, 0x63, 0x6b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x76, 0x34, 0x2f,
+	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0xaa, 0x02, 0x11, 0x43, 0x68, 0x69, 0x72, 0x70, 0x73, 0x74,
+	0x61, 0x63, 0x6b, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
@@ -1089,7 +1038,7 @@ func file_common_common_proto_rawDescGZIP() []byte {
 	return file_common_common_proto_rawDescData
 }
 
-var file_common_common_proto_enumTypes = make([]protoimpl.EnumInfo, 10)
+var file_common_common_proto_enumTypes = make([]protoimpl.EnumInfo, 9)
 var file_common_common_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
 var file_common_common_proto_goTypes = []interface{}{
 	(Modulation)(0),               // 0: common.Modulation
@@ -1100,21 +1049,20 @@ var file_common_common_proto_goTypes = []interface{}{
 	(LocationSource)(0),           // 5: common.LocationSource
 	(Aggregation)(0),              // 6: common.Aggregation
 	(MetricKind)(0),               // 7: common.MetricKind
-	(Regulation)(0),               // 8: common.Regulation
-	(DeviceClass)(0),              // 9: common.DeviceClass
-	(*Location)(nil),              // 10: common.Location
-	(*KeyEnvelope)(nil),           // 11: common.KeyEnvelope
-	(*Metric)(nil),                // 12: common.Metric
-	(*MetricDataset)(nil),         // 13: common.MetricDataset
-	(*JoinServerContext)(nil),     // 14: common.JoinServerContext
-	(*timestamppb.Timestamp)(nil), // 15: google.protobuf.Timestamp
+	(DeviceClass)(0),              // 8: common.DeviceClass
+	(*Location)(nil),              // 9: common.Location
+	(*KeyEnvelope)(nil),           // 10: common.KeyEnvelope
+	(*Metric)(nil),                // 11: common.Metric
+	(*MetricDataset)(nil),         // 12: common.MetricDataset
+	(*JoinServerContext)(nil),     // 13: common.JoinServerContext
+	(*timestamppb.Timestamp)(nil), // 14: google.protobuf.Timestamp
 }
 var file_common_common_proto_depIdxs = []int32{
 	5,  // 0: common.Location.source:type_name -> common.LocationSource
-	15, // 1: common.Metric.timestamps:type_name -> google.protobuf.Timestamp
-	13, // 2: common.Metric.datasets:type_name -> common.MetricDataset
+	14, // 1: common.Metric.timestamps:type_name -> google.protobuf.Timestamp
+	12, // 2: common.Metric.datasets:type_name -> common.MetricDataset
 	7,  // 3: common.Metric.kind:type_name -> common.MetricKind
-	11, // 4: common.JoinServerContext.app_s_key:type_name -> common.KeyEnvelope
+	10, // 4: common.JoinServerContext.app_s_key:type_name -> common.KeyEnvelope
 	5,  // [5:5] is the sub-list for method output_type
 	5,  // [5:5] is the sub-list for method input_type
 	5,  // [5:5] is the sub-list for extension type_name
@@ -1194,7 +1142,7 @@ func file_common_common_proto_init() {
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_common_common_proto_rawDesc,
-			NumEnums:      10,
+			NumEnums:      9,
 			NumMessages:   5,
 			NumExtensions: 0,
 			NumServices:   0,

api/go/go.mod

@@ -1,6 +1,6 @@
 module github.com/chirpstack/chirpstack/api/go/v4
 
-go 1.21
+go 1.18
 
 require (
 	google.golang.org/genproto/googleapis/api v0.0.0-20240325203815-454cdb8f5daa
@@ -14,4 +14,5 @@ require (
 	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa // indirect
+	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 // indirect
 )

api/go/go.sum

@@ -13,5 +13,7 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa h1:
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
 google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk=
 google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 h1:rNBFJjBCOgVr9pWD7rs/knKL4FRTKgpZmsRfV214zcA=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0/go.mod h1:Dk1tviKTvMCz5tvh7t+fh94dhmQVHuCt2OzJB3CTW9Y=
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=

api/go/integration/integration.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.24.4
 // source: integration/integration.proto
 

api/go/stream/api_request.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.24.4
 // source: stream/api_request.proto
 

api/go/stream/backend_interfaces.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.24.4
 // source: stream/backend_interfaces.proto
 

api/go/stream/frame.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.24.4
 // source: stream/frame.proto
 

api/go/stream/meta.pb.go

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.33.0
 // 	protoc        v4.24.4
 // source: stream/meta.proto
 

api/grpc-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chirpstack/chirpstack-api-grpc-web",
-  "version": "4.8.0-test.2",
+  "version": "4.7.0",
   "description": "Chirpstack gRPC-web API",
   "license": "MIT",
   "devDependencies": {

api/java/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "io.chirpstack"
-version = "4.8.0-test.2"
+version = "4.7.0"
 
 repositories {
     mavenCentral()

api/js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chirpstack/chirpstack-api",
-  "version": "4.8.0-test.2",
+  "version": "4.7.0",
   "description": "Chirpstack JS and TS API",
   "license": "MIT",
   "devDependencies": {

api/kotlin/build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "io.chirpstack"
-version = "4.8.0-test.2"
+version = "4.7.0"
 
 repositories {
     mavenCentral()

api/proto/common/common.proto

@@ -155,14 +155,6 @@ enum MetricKind {
   GAUGE = 2;
 }
 
-enum Regulation {
-  // Unknown.
-  REGULATION_UNKNOWN = 0;
-
-  // ETSI EN 300 220.
-  ETSI_EN_300_220 = 1;
-}
-
 message Location {
   // Latitude.
   double latitude = 1;
@@ -229,4 +221,4 @@ message JoinServerContext {
 
   // AppSKey envelope.
   KeyEnvelope app_s_key = 2;
-}
+}

api/proto/gw/gw.proto

@@ -97,9 +97,6 @@ enum TxAckStatus {
 
   // Internal error.
   INTERNAL_ERROR = 10;
-
-  // Duty-cycle overflow.
-  DUTY_CYCLE_OVERFLOW = 11;
 }
 
 message Modulation {
@@ -252,9 +249,6 @@ message GatewayStats {
 
   // Tx packets per status.
   map<string, uint32> tx_packets_per_status = 16;
-
-  // Duty-cycle statistics (Concentratord only).
-  DutyCycleStats duty_cycle_stats = 18;
 }
 
 message PerModulationCount {
@@ -265,34 +259,6 @@ message PerModulationCount {
   uint32 count = 2;
 }
 
-message DutyCycleStats {
-  // Implemented regulation.
-  common.Regulation regulation = 1;
-
-  // Tracking window.
-  google.protobuf.Duration window = 2;
-
-  // Bands.
-  repeated DutyCycleBand bands = 3;
-}
-
-message DutyCycleBand {
-  // Band name.
-  string name = 1;
-
-  // Min frequency for this band.
-  uint32 frequency_min = 2;
-
-  // Max frequency for this band.
-  uint32 frequency_max = 3;
-
-  // Max. allowed load.
-  google.protobuf.Duration load_max = 4;
-
-  // Tracked load (within the window of the regionlation).
-  google.protobuf.Duration load_tracked = 5;
-}
-
 message UplinkRxInfoLegacy {
   // Gateway ID.
   bytes gateway_id = 1;

api/python/proto/chirpstack-api/api/device.proto

@@ -8,7 +8,7 @@ option java_multiple_files = true;
 option java_outer_classname = "DeviceProto";
 option csharp_namespace = "Chirpstack.Api";
 
-import "common/common.proto";
+import "chirpstack-api/common/common.proto";
 import "google/api/annotations.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/struct.proto";

api/python/proto/chirpstack-api/api/device_profile.proto

@@ -11,7 +11,7 @@ option csharp_namespace = "Chirpstack.Api";
 import "google/api/annotations.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/empty.proto";
-import "common/common.proto";
+import "chirpstack-api/common/common.proto";
 
 enum CodecRuntime {
   // None.

api/python/proto/chirpstack-api/api/device_profile_template.proto

@@ -11,8 +11,8 @@ option csharp_namespace = "Chirpstack.Api";
 import "google/api/annotations.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/empty.proto";
-import "common/common.proto";
-import "api/device_profile.proto";
+import "chirpstack-api/common/common.proto";
+import "chirpstack-api/api/device_profile.proto";
 
 // DeviceProfileTemplateService is the service providing API methods for managing device-profile templates.
 service DeviceProfileTemplateService {

api/python/proto/chirpstack-api/api/gateway.proto

@@ -11,7 +11,7 @@ option csharp_namespace = "Chirpstack.Api";
 import "google/api/annotations.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/empty.proto";
-import "common/common.proto";
+import "chirpstack-api/common/common.proto";
 
 // GatewayService is the service providing API methods for managing gateways.
 service GatewayService {

api/python/proto/chirpstack-api/api/internal.proto

@@ -10,8 +10,8 @@ option csharp_namespace = "Chirpstack.Api";
 
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/empty.proto";
-import "common/common.proto";
-import "api/user.proto";
+import "chirpstack-api/common/common.proto";
+import "chirpstack-api/api/user.proto";
 
 // InternalService is the service providing API endpoints for internal usage.
 service InternalService {

api/python/proto/chirpstack-api/api/multicast_group.proto

@@ -11,7 +11,7 @@ option csharp_namespace = "Chirpstack.Api";
 import "google/api/annotations.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/empty.proto";
-import "common/common.proto";
+import "chirpstack-api/common/common.proto";
 
 
 // MulticastGroupService is the service managing multicast-groups.

api/python/proto/chirpstack-api/common/common.proto

@@ -155,14 +155,6 @@ enum MetricKind {
   GAUGE = 2;
 }
 
-enum Regulation {
-  // Unknown.
-  REGULATION_UNKNOWN = 0;
-
-  // ETSI EN 300 220.
-  ETSI_EN_300_220 = 1;
-}
-
 message Location {
   // Latitude.
   double latitude = 1;
@@ -229,4 +221,4 @@ message JoinServerContext {
 
   // AppSKey envelope.
   KeyEnvelope app_s_key = 2;
-}
+}

api/python/proto/chirpstack-api/gw/gw.proto

@@ -8,7 +8,7 @@ option java_multiple_files = true;
 option java_outer_classname = "GatewayProto";
 option csharp_namespace = "Chirpstack.Gateway";
 
-import "common/common.proto";
+import "chirpstack-api/common/common.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/struct.proto";
@@ -97,9 +97,6 @@ enum TxAckStatus {
 
   // Internal error.
   INTERNAL_ERROR = 10;
-
-  // Duty-cycle overflow.
-  DUTY_CYCLE_OVERFLOW = 11;
 }
 
 message Modulation {
@@ -252,9 +249,6 @@ message GatewayStats {
 
   // Tx packets per status.
   map<string, uint32> tx_packets_per_status = 16;
-
-  // Duty-cycle statistics (Concentratord only).
-  DutyCycleStats duty_cycle_stats = 18;
 }
 
 message PerModulationCount {
@@ -265,34 +259,6 @@ message PerModulationCount {
   uint32 count = 2;
 }
 
-message DutyCycleStats {
-  // Implemented regulation.
-  common.Regulation regulation = 1;
-
-  // Tracking window.
-  google.protobuf.Duration window = 2;
-
-  // Bands.
-  repeated DutyCycleBand bands = 3;
-}
-
-message DutyCycleBand {
-  // Band name.
-  string name = 1;
-
-  // Min frequency for this band.
-  uint32 frequency_min = 2;
-
-  // Max frequency for this band.
-  uint32 frequency_max = 3;
-
-  // Max. allowed load.
-  google.protobuf.Duration load_max = 4;
-
-  // Tracked load (within the window of the regionlation).
-  google.protobuf.Duration load_tracked = 5;
-}
-
 message UplinkRxInfoLegacy {
   // Gateway ID.
   bytes gateway_id = 1;

api/python/proto/chirpstack-api/integration/integration.proto

@@ -8,8 +8,8 @@ option java_multiple_files = true;
 option java_outer_classname = "IntegrationProto";
 option csharp_namespace = "Chirpstack.Integration";
 
-import "common/common.proto";
-import "gw/gw.proto";
+import "chirpstack-api/common/common.proto";
+import "chirpstack-api/gw/gw.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/struct.proto";
 

api/python/proto/chirpstack-api/internal/internal.proto

@@ -2,8 +2,8 @@ syntax = "proto3";
 
 package internal;
 
-import "common/common.proto";
-import "gw/gw.proto";
+import "chirpstack-api/common/common.proto";
+import "chirpstack-api/gw/gw.proto";
 import "google/protobuf/timestamp.proto";
 
 message DeviceSession {

api/python/proto/chirpstack-api/stream/api_request.proto

@@ -9,8 +9,8 @@ option java_outer_classname = "ApiRequestProto";
 option csharp_namespace = "Chirpstack.Stream";
 
 import "google/protobuf/timestamp.proto";
-import "common/common.proto";
-import "gw/gw.proto";
+import "chirpstack-api/common/common.proto";
+import "chirpstack-api/gw/gw.proto";
 
 message ApiRequestLog {
   // API service name.

api/python/proto/chirpstack-api/stream/frame.proto

@@ -9,8 +9,8 @@ option java_outer_classname = "FrameProto";
 option csharp_namespace = "Chirpstack.Stream";
 
 import "google/protobuf/timestamp.proto";
-import "common/common.proto";
-import "gw/gw.proto";
+import "chirpstack-api/common/common.proto";
+import "chirpstack-api/gw/gw.proto";
 
 message UplinkFrameLog {
   // PHYPayload.

api/python/proto/chirpstack-api/stream/meta.proto

@@ -8,8 +8,8 @@ option java_multiple_files = true;
 option java_outer_classname = "MetaProto";
 option csharp_namespace = "Chirpstack.Stream";
 
-import "common/common.proto";
-import "gw/gw.proto";
+import "chirpstack-api/common/common.proto";
+import "chirpstack-api/gw/gw.proto";
 
 message UplinkMeta {
   // Device EUI (EUI64).

api/python/src/setup.py

@@ -18,7 +18,7 @@ CLASSIFIERS = [
 
 setup(
     name='chirpstack-api',
-    version = "4.8.0-test.2",
+    version = "4.7.0",
     url='https://github.com/brocaar/chirpstack-api',
     author='Orne Brocaar',
     author_email='info@brocaar.com',

api/rust/.gitignore

@@ -0,0 +1 @@
+/proto

api/rust/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "chirpstack_api"
 description = "ChirpStack Protobuf / gRPC API definitions."
-version = "4.8.0-test.2"
+version = "4.7.0"
 authors = ["Orne Brocaar <info@brocaar.com>"]
 license = "MIT"
 homepage = "https://www.chirpstack.io"

api/rust/build.rs

@@ -74,7 +74,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     // internal
     {
-        #[allow(unused_mut)]
         let mut builder = tonic_build::configure()
             .out_dir(out_dir.join("internal"))
             .file_descriptor_set_path(out_dir.join("internal").join("proto_descriptor.bin"))

api/rust/proto/google/google/api/annotations.proto

@@ -1,31 +0,0 @@
-// Copyright 2015 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package google.api;
-
-import "google/api/http.proto";
-import "google/protobuf/descriptor.proto";
-
-option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations";
-option java_multiple_files = true;
-option java_outer_classname = "AnnotationsProto";
-option java_package = "com.google.api";
-option objc_class_prefix = "GAPI";
-
-extend google.protobuf.MethodOptions {
-  // See `HttpRule`.
-  HttpRule http = 72295728;
-}

api/rust/proto/google/google/api/http.proto

@@ -1,379 +0,0 @@
-// Copyright 2023 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package google.api;
-
-option cc_enable_arenas = true;
-option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations";
-option java_multiple_files = true;
-option java_outer_classname = "HttpProto";
-option java_package = "com.google.api";
-option objc_class_prefix = "GAPI";
-
-// Defines the HTTP configuration for an API service. It contains a list of
-// [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method
-// to one or more HTTP REST API methods.
-message Http {
-  // A list of HTTP configuration rules that apply to individual API methods.
-  //
-  // **NOTE:** All service configuration rules follow "last one wins" order.
-  repeated HttpRule rules = 1;
-
-  // When set to true, URL path parameters will be fully URI-decoded except in
-  // cases of single segment matches in reserved expansion, where "%2F" will be
-  // left encoded.
-  //
-  // The default behavior is to not decode RFC 6570 reserved characters in multi
-  // segment matches.
-  bool fully_decode_reserved_expansion = 2;
-}
-
-// # gRPC Transcoding
-//
-// gRPC Transcoding is a feature for mapping between a gRPC method and one or
-// more HTTP REST endpoints. It allows developers to build a single API service
-// that supports both gRPC APIs and REST APIs. Many systems, including [Google
-// APIs](https://github.com/googleapis/googleapis),
-// [Cloud Endpoints](https://cloud.google.com/endpoints), [gRPC
-// Gateway](https://github.com/grpc-ecosystem/grpc-gateway),
-// and [Envoy](https://github.com/envoyproxy/envoy) proxy support this feature
-// and use it for large scale production services.
-//
-// `HttpRule` defines the schema of the gRPC/REST mapping. The mapping specifies
-// how different portions of the gRPC request message are mapped to the URL
-// path, URL query parameters, and HTTP request body. It also controls how the
-// gRPC response message is mapped to the HTTP response body. `HttpRule` is
-// typically specified as an `google.api.http` annotation on the gRPC method.
-//
-// Each mapping specifies a URL path template and an HTTP method. The path
-// template may refer to one or more fields in the gRPC request message, as long
-// as each field is a non-repeated field with a primitive (non-message) type.
-// The path template controls how fields of the request message are mapped to
-// the URL path.
-//
-// Example:
-//
-//     service Messaging {
-//       rpc GetMessage(GetMessageRequest) returns (Message) {
-//         option (google.api.http) = {
-//             get: "/v1/{name=messages/*}"
-//         };
-//       }
-//     }
-//     message GetMessageRequest {
-//       string name = 1; // Mapped to URL path.
-//     }
-//     message Message {
-//       string text = 1; // The resource content.
-//     }
-//
-// This enables an HTTP REST to gRPC mapping as below:
-//
-// HTTP | gRPC
-// -----|-----
-// `GET /v1/messages/123456`  | `GetMessage(name: "messages/123456")`
-//
-// Any fields in the request message which are not bound by the path template
-// automatically become HTTP query parameters if there is no HTTP request body.
-// For example:
-//
-//     service Messaging {
-//       rpc GetMessage(GetMessageRequest) returns (Message) {
-//         option (google.api.http) = {
-//             get:"/v1/messages/{message_id}"
-//         };
-//       }
-//     }
-//     message GetMessageRequest {
-//       message SubMessage {
-//         string subfield = 1;
-//       }
-//       string message_id = 1; // Mapped to URL path.
-//       int64 revision = 2;    // Mapped to URL query parameter `revision`.
-//       SubMessage sub = 3;    // Mapped to URL query parameter `sub.subfield`.
-//     }
-//
-// This enables a HTTP JSON to RPC mapping as below:
-//
-// HTTP | gRPC
-// -----|-----
-// `GET /v1/messages/123456?revision=2&sub.subfield=foo` |
-// `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield:
-// "foo"))`
-//
-// Note that fields which are mapped to URL query parameters must have a
-// primitive type or a repeated primitive type or a non-repeated message type.
-// In the case of a repeated type, the parameter can be repeated in the URL
-// as `...?param=A&param=B`. In the case of a message type, each field of the
-// message is mapped to a separate parameter, such as
-// `...?foo.a=A&foo.b=B&foo.c=C`.
-//
-// For HTTP methods that allow a request body, the `body` field
-// specifies the mapping. Consider a REST update method on the
-// message resource collection:
-//
-//     service Messaging {
-//       rpc UpdateMessage(UpdateMessageRequest) returns (Message) {
-//         option (google.api.http) = {
-//           patch: "/v1/messages/{message_id}"
-//           body: "message"
-//         };
-//       }
-//     }
-//     message UpdateMessageRequest {
-//       string message_id = 1; // mapped to the URL
-//       Message message = 2;   // mapped to the body
-//     }
-//
-// The following HTTP JSON to RPC mapping is enabled, where the
-// representation of the JSON in the request body is determined by
-// protos JSON encoding:
-//
-// HTTP | gRPC
-// -----|-----
-// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id:
-// "123456" message { text: "Hi!" })`
-//
-// The special name `*` can be used in the body mapping to define that
-// every field not bound by the path template should be mapped to the
-// request body.  This enables the following alternative definition of
-// the update method:
-//
-//     service Messaging {
-//       rpc UpdateMessage(Message) returns (Message) {
-//         option (google.api.http) = {
-//           patch: "/v1/messages/{message_id}"
-//           body: "*"
-//         };
-//       }
-//     }
-//     message Message {
-//       string message_id = 1;
-//       string text = 2;
-//     }
-//
-//
-// The following HTTP JSON to RPC mapping is enabled:
-//
-// HTTP | gRPC
-// -----|-----
-// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id:
-// "123456" text: "Hi!")`
-//
-// Note that when using `*` in the body mapping, it is not possible to
-// have HTTP parameters, as all fields not bound by the path end in
-// the body. This makes this option more rarely used in practice when
-// defining REST APIs. The common usage of `*` is in custom methods
-// which don't use the URL at all for transferring data.
-//
-// It is possible to define multiple HTTP methods for one RPC by using
-// the `additional_bindings` option. Example:
-//
-//     service Messaging {
-//       rpc GetMessage(GetMessageRequest) returns (Message) {
-//         option (google.api.http) = {
-//           get: "/v1/messages/{message_id}"
-//           additional_bindings {
-//             get: "/v1/users/{user_id}/messages/{message_id}"
-//           }
-//         };
-//       }
-//     }
-//     message GetMessageRequest {
-//       string message_id = 1;
-//       string user_id = 2;
-//     }
-//
-// This enables the following two alternative HTTP JSON to RPC mappings:
-//
-// HTTP | gRPC
-// -----|-----
-// `GET /v1/messages/123456` | `GetMessage(message_id: "123456")`
-// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id:
-// "123456")`
-//
-// ## Rules for HTTP mapping
-//
-// 1. Leaf request fields (recursive expansion nested messages in the request
-//    message) are classified into three categories:
-//    - Fields referred by the path template. They are passed via the URL path.
-//    - Fields referred by the [HttpRule.body][google.api.HttpRule.body]. They
-//    are passed via the HTTP
-//      request body.
-//    - All other fields are passed via the URL query parameters, and the
-//      parameter name is the field path in the request message. A repeated
-//      field can be represented as multiple query parameters under the same
-//      name.
-//  2. If [HttpRule.body][google.api.HttpRule.body] is "*", there is no URL
-//  query parameter, all fields
-//     are passed via URL path and HTTP request body.
-//  3. If [HttpRule.body][google.api.HttpRule.body] is omitted, there is no HTTP
-//  request body, all
-//     fields are passed via URL path and URL query parameters.
-//
-// ### Path template syntax
-//
-//     Template = "/" Segments [ Verb ] ;
-//     Segments = Segment { "/" Segment } ;
-//     Segment  = "*" | "**" | LITERAL | Variable ;
-//     Variable = "{" FieldPath [ "=" Segments ] "}" ;
-//     FieldPath = IDENT { "." IDENT } ;
-//     Verb     = ":" LITERAL ;
-//
-// The syntax `*` matches a single URL path segment. The syntax `**` matches
-// zero or more URL path segments, which must be the last part of the URL path
-// except the `Verb`.
-//
-// The syntax `Variable` matches part of the URL path as specified by its
-// template. A variable template must not contain other variables. If a variable
-// matches a single path segment, its template may be omitted, e.g. `{var}`
-// is equivalent to `{var=*}`.
-//
-// The syntax `LITERAL` matches literal text in the URL path. If the `LITERAL`
-// contains any reserved character, such characters should be percent-encoded
-// before the matching.
-//
-// If a variable contains exactly one path segment, such as `"{var}"` or
-// `"{var=*}"`, when such a variable is expanded into a URL path on the client
-// side, all characters except `[-_.~0-9a-zA-Z]` are percent-encoded. The
-// server side does the reverse decoding. Such variables show up in the
-// [Discovery
-// Document](https://developers.google.com/discovery/v1/reference/apis) as
-// `{var}`.
-//
-// If a variable contains multiple path segments, such as `"{var=foo/*}"`
-// or `"{var=**}"`, when such a variable is expanded into a URL path on the
-// client side, all characters except `[-_.~/0-9a-zA-Z]` are percent-encoded.
-// The server side does the reverse decoding, except "%2F" and "%2f" are left
-// unchanged. Such variables show up in the
-// [Discovery
-// Document](https://developers.google.com/discovery/v1/reference/apis) as
-// `{+var}`.
-//
-// ## Using gRPC API Service Configuration
-//
-// gRPC API Service Configuration (service config) is a configuration language
-// for configuring a gRPC service to become a user-facing product. The
-// service config is simply the YAML representation of the `google.api.Service`
-// proto message.
-//
-// As an alternative to annotating your proto file, you can configure gRPC
-// transcoding in your service config YAML files. You do this by specifying a
-// `HttpRule` that maps the gRPC method to a REST endpoint, achieving the same
-// effect as the proto annotation. This can be particularly useful if you
-// have a proto that is reused in multiple services. Note that any transcoding
-// specified in the service config will override any matching transcoding
-// configuration in the proto.
-//
-// Example:
-//
-//     http:
-//       rules:
-//         # Selects a gRPC method and applies HttpRule to it.
-//         - selector: example.v1.Messaging.GetMessage
-//           get: /v1/messages/{message_id}/{sub.subfield}
-//
-// ## Special notes
-//
-// When gRPC Transcoding is used to map a gRPC to JSON REST endpoints, the
-// proto to JSON conversion must follow the [proto3
-// specification](https://developers.google.com/protocol-buffers/docs/proto3#json).
-//
-// While the single segment variable follows the semantics of
-// [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2 Simple String
-// Expansion, the multi segment variable **does not** follow RFC 6570 Section
-// 3.2.3 Reserved Expansion. The reason is that the Reserved Expansion
-// does not expand special characters like `?` and `#`, which would lead
-// to invalid URLs. As the result, gRPC Transcoding uses a custom encoding
-// for multi segment variables.
-//
-// The path variables **must not** refer to any repeated or mapped field,
-// because client libraries are not capable of handling such variable expansion.
-//
-// The path variables **must not** capture the leading "/" character. The reason
-// is that the most common use case "{var}" does not capture the leading "/"
-// character. For consistency, all path variables must share the same behavior.
-//
-// Repeated message fields must not be mapped to URL query parameters, because
-// no client library can support such complicated mapping.
-//
-// If an API needs to use a JSON array for request or response body, it can map
-// the request or response body to a repeated field. However, some gRPC
-// Transcoding implementations may not support this feature.
-message HttpRule {
-  // Selects a method to which this rule applies.
-  //
-  // Refer to [selector][google.api.DocumentationRule.selector] for syntax
-  // details.
-  string selector = 1;
-
-  // Determines the URL pattern is matched by this rules. This pattern can be
-  // used with any of the {get|put|post|delete|patch} methods. A custom method
-  // can be defined using the 'custom' field.
-  oneof pattern {
-    // Maps to HTTP GET. Used for listing and getting information about
-    // resources.
-    string get = 2;
-
-    // Maps to HTTP PUT. Used for replacing a resource.
-    string put = 3;
-
-    // Maps to HTTP POST. Used for creating a resource or performing an action.
-    string post = 4;
-
-    // Maps to HTTP DELETE. Used for deleting a resource.
-    string delete = 5;
-
-    // Maps to HTTP PATCH. Used for updating a resource.
-    string patch = 6;
-
-    // The custom pattern is used for specifying an HTTP method that is not
-    // included in the `pattern` field, such as HEAD, or "*" to leave the
-    // HTTP method unspecified for this rule. The wild-card rule is useful
-    // for services that provide content to Web (HTML) clients.
-    CustomHttpPattern custom = 8;
-  }
-
-  // The name of the request field whose value is mapped to the HTTP request
-  // body, or `*` for mapping all request fields not captured by the path
-  // pattern to the HTTP body, or omitted for not having any HTTP request body.
-  //
-  // NOTE: the referred field must be present at the top-level of the request
-  // message type.
-  string body = 7;
-
-  // Optional. The name of the response field whose value is mapped to the HTTP
-  // response body. When omitted, the entire response message will be used
-  // as the HTTP response body.
-  //
-  // NOTE: The referred field must be present at the top-level of the response
-  // message type.
-  string response_body = 12;
-
-  // Additional HTTP bindings for the selector. Nested bindings must
-  // not contain an `additional_bindings` field themselves (that is,
-  // the nesting may only be one level deep).
-  repeated HttpRule additional_bindings = 11;
-}
-
-// A custom pattern is used for defining custom HTTP verb.
-message CustomHttpPattern {
-  // The name of this custom HTTP verb.
-  string kind = 1;
-
-  // The path matched by this custom verb.
-  string path = 2;
-}

api/rust/src/gw.rs

@@ -67,7 +67,6 @@ impl Into<String> for TxAckStatus {
             TxAckStatus::GpsUnlocked => "GPS_UNLOCKED",
             TxAckStatus::QueueFull => "QUEUE_FULL",
             TxAckStatus::InternalError => "INTERNAL_ERROR",
-            TxAckStatus::DutyCycleOverflow => "DUTY_CYCLE_OVERFLOW",
         }
         .to_string()
     }

backend/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "backend"
-version = "4.8.0-test.2"
+version = "4.7.0"
 authors = ["Orne Brocaar <info@brocaar.com>"]
 edition = "2018"
 publish = false
@@ -14,7 +14,7 @@ tracing = "0.1"
 hex = "0.4"
 rand = "0.8"
 aes-kw = "0.2"
-reqwest = { version = "0.12", features = ["json", "rustls-tls"], default-features = false }
+reqwest = { version = "0.11", features = ["json", "rustls-tls"], default-features = false }
 chrono = { version = "0.4", features = ["serde"] }
 tokio = { version = "1.36", features = ["macros" ] }
 chirpstack_api = { path = "../api/rust", default-features = false, features = ["json"] }

chirpstack-integration/Cargo.toml

@@ -9,7 +9,7 @@
   repository = "https://github.com/chirpstack/chirpstack"
 
 [dependencies]
-  chirpstack_api = { path = "../api/rust", version = "4.8.0-test.1" }
+  chirpstack_api = { path = "../api/rust", version = "4.7.0-test.3" }
   redis = { version = "0.25", features = [
     "cluster-async",
     "tokio-rustls-comp",

chirpstack/Cargo.toml

@@ -3,7 +3,7 @@ name = "chirpstack"
 description = "ChirpStack is an open-source LoRaWAN(TM) Network Server"
 repository = "https://github.com/chirpstack/chirpstack"
 homepage = "https://www.chirpstack.io/"
-version = "4.8.0-test.2"
+version = "4.7.0"
 authors = ["Orne Brocaar <info@brocaar.com>"]
 edition = "2021"
 publish = false
@@ -38,7 +38,7 @@ tokio-postgres = "0.7"
 tokio-postgres-rustls = "0.11"
 bigdecimal = "0.4"
 redis = { version = "0.25.2", features = [ "tls-rustls", "tokio-rustls-comp"] }
-deadpool-redis = { version = "0.15", features = ["cluster"] }
+deadpool-redis = { version = "0.14", features = ["cluster"] }
 
 # Logging
 tracing = "0.1"
@@ -54,13 +54,13 @@ lrwn = { path = "../lrwn", features = ["serde", "diesel", "regions", "crypto"] }
 backend = { path = "../backend" }
 
 # HTTP
-reqwest = { version = "0.12", features = [
+reqwest = { version = "0.11", features = [
 	"json",
 	"rustls-tls-native-roots",
 ], default-features = false }
 
 # Integrations
-aws-sign-v4 = "0.3"
+aws-sign-v4 = "0.2"
 hmac = "0.12"
 sha2 = "0.10"
 urlencoding = "2.1"

chirpstack/migrations/2024-03-26-134652_align_multicast_ping_slot_config/down.sql

@@ -1,7 +1,7 @@
 alter table multicast_group
   alter column class_b_ping_slot_nb_k type integer;
 
-update multicast_group set class_b_ping_slot_nb_k = coalesce(pow(2, nullif(class_b_ping_slot_nb_k, 0)) * 32, 0);
+update multicast_group set class_b_ping_slot_nb_k = pow(2, class_b_ping_slot_nb_k) * 32;
 
 alter table multicast_group
   rename column class_b_ping_slot_nb_k to class_b_ping_slot_period;

chirpstack/migrations/2024-03-26-134652_align_multicast_ping_slot_config/up.sql

@@ -1,7 +1,7 @@
 alter table multicast_group
   rename column class_b_ping_slot_period to class_b_ping_slot_nb_k;
 
-update multicast_group set class_b_ping_slot_nb_k = coalesce(log(2, nullif(class_b_ping_slot_nb_k, 0) / 32), 0);
+update multicast_group set class_b_ping_slot_nb_k = log(2, class_b_ping_slot_nb_k / 32);
 
 alter table multicast_group
   alter column class_b_ping_slot_nb_k type smallint;

lrwn-filters/Cargo.toml

@@ -3,7 +3,7 @@ name = "lrwn_filters"
 description = "Library for filtering LoRaWAN payloads on DevAddr and JoinEUIs prefixes"
 homepage = "https://www.chirpstack.io/"
 license = "MIT"
-version = "4.8.0-test.2"
+version = "4.7.0"
 authors = ["Orne Brocaar <info@brocaar.com>"]
 edition = "2021"
 repository = "https://github.com/chirpstack/chirpstack"

lrwn/Cargo.toml

@@ -3,7 +3,7 @@ name = "lrwn"
 description = "Library for encoding / decoding LoRaWAN frames."
 homepage = "https://www.chirpstack.io"
 license = "MIT"
-version = "4.8.0-test.2"
+version = "4.7.0"
 authors = ["Orne Brocaar <info@brocaar.com>"]
 edition = "2018"
 repository = "https://github.com/chirpstack/chirpstack"

shell.nix

@@ -16,8 +16,6 @@ pkgs.mkShell {
     pkgs.nodejs                 # js api + ui
     pkgs.yarn
     pkgs.protoc-gen-grpc-web    # grpc-web api
-    pkgs.protoc-gen-go          # go api
-    pkgs.protoc-gen-go-grpc
   ];
   LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib";
   BINDGEN_EXTRA_CLANG_ARGS = "-I${pkgs.llvmPackages.libclang.lib}/lib/clang/${pkgs.llvmPackages.libclang.version}/include";

ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chirpstack-ui",
-  "version": "4.8.0-test.2",
+  "version": "4.7.0",
   "private": true,
   "dependencies": {
     "@ant-design/colors": "^7.0.0",