Compare commits

...

6 Commits

Author SHA1 Message Date
2fc762d932 Bump version to 4.11.1 2025-02-10 11:41:05 +00:00
24333f8b5d Bump version to 4.11.1-test.2 2025-02-10 11:10:11 +00:00
99239a82d4 Revert from sqlite-interactive to sqlite. 2025-02-10 10:56:48 +00:00
317c1cb14d Update dev-dependencies to shell.nix. 2025-02-10 10:27:22 +00:00
2e0d034a6b Bump version to 4.11.1 2025-02-07 15:56:39 +00:00
fb59f541b1 Fix ns_time + setting of JSON flag.
These lines were accidentally removed by 922a83597f8aaed089f5c6ed610d20c5aaa91102
when removing the metadata keys as part of the region refactor.
2025-02-03 12:46:04 +00:00
17 changed files with 38 additions and 31 deletions

12
Cargo.lock generated
View File

@ -611,7 +611,7 @@ dependencies = [
[[package]]
name = "backend"
version = "4.11.1-test.1"
version = "4.11.1"
dependencies = [
"aes-kw",
"anyhow",
@ -813,7 +813,7 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
[[package]]
name = "chirpstack"
version = "4.11.1-test.1"
version = "4.11.1"
dependencies = [
"aes",
"anyhow",
@ -907,7 +907,7 @@ dependencies = [
[[package]]
name = "chirpstack_api"
version = "4.11.1-test.1"
version = "4.11.1"
dependencies = [
"hex",
"pbjson",
@ -924,7 +924,7 @@ dependencies = [
[[package]]
name = "chirpstack_integration"
version = "4.11.1-test.1"
version = "4.11.1"
dependencies = [
"anyhow",
"async-trait",
@ -2668,7 +2668,7 @@ dependencies = [
[[package]]
name = "lrwn"
version = "4.11.1-test.1"
version = "4.11.1"
dependencies = [
"aes",
"anyhow",
@ -2682,7 +2682,7 @@ dependencies = [
[[package]]
name = "lrwn_filters"
version = "4.11.1-test.1"
version = "4.11.1"
dependencies = [
"hex",
"lrwn",

View File

@ -6,11 +6,10 @@ dist:
cd chirpstack && make dist
# Install dev dependencies
# TODO: test latest cargo-deb and move it to shell.nix.
dev-dependencies:
cargo install cross --version 0.2.5
cargo install diesel_cli --version 2.2.1 --no-default-features --features postgres,sqlite
cargo install cargo-deb --version 1.43.1
cargo install cargo-generate-rpm --version 0.12.1
cargo install cargo-deb --version 1.43.1 --locked
cargo install cargo-generate-rpm --version 0.12.1 --locked
# Set the versions
version:

View File

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

View File

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

2
api/js/package.json vendored
View File

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

View File

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

View File

@ -3,7 +3,7 @@
"description": "Chirpstack PHP API",
"license": "MIT",
"type": "library",
"version": "4.11.1-test.1",
"version": "4.11.1",
"require": {
"php": ">=7.0.0",
"grpc/grpc": "^v1.57.0",

View File

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

2
api/rust/Cargo.toml vendored
View File

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

View File

@ -1,6 +1,6 @@
[package]
name = "backend"
version = "4.11.1-test.1"
version = "4.11.1"
authors = ["Orne Brocaar <info@brocaar.com>"]
edition = "2018"
publish = false

View File

@ -3,13 +3,13 @@
description = "Library for building external ChirpStack integrations"
homepage = "https://www.chirpstack.io/"
license = "MIT"
version = "4.11.1-test.1"
version = "4.11.1"
authors = ["Orne Brocaar <info@brocaar.com>"]
edition = "2021"
repository = "https://github.com/chirpstack/chirpstack"
[dependencies]
chirpstack_api = { path = "../api/rust", version = "4.11.1-test.1" }
chirpstack_api = { path = "../api/rust", version = "4.11.1" }
redis = { version = "0.27", features = [
"cluster-async",
"tokio-rustls-comp",

View File

@ -3,7 +3,7 @@
description = "ChirpStack is an open-source LoRaWAN(TM) Network Server"
repository = "https://github.com/chirpstack/chirpstack"
homepage = "https://www.chirpstack.io/"
version = "4.11.1-test.1"
version = "4.11.1"
authors = ["Orne Brocaar <info@brocaar.com>"]
edition = "2021"
publish = false

View File

@ -5,6 +5,7 @@ use std::time::Duration;
use anyhow::Result;
use async_trait::async_trait;
use chrono::Utc;
use handlebars::Handlebars;
use prometheus_client::encoding::EncodeLabelSet;
use prometheus_client::metrics::counter::Counter;
@ -359,6 +360,11 @@ async fn message_callback(
event.v4_migrate();
}
if let Some(rx_info) = &mut event.rx_info {
set_gateway_json(&rx_info.gateway_id, json);
rx_info.ns_time = Some(Utc::now().into());
}
tokio::spawn(uplink::deduplicate_uplink(
region_common_name,
region_config_id.to_string(),

View File

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

View File

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

View File

@ -7,19 +7,21 @@ pkgs.mkShell {
buildInputs = [
pkgs.cacert
pkgs.rustup
pkgs.protobuf
pkgs.perl
pkgs.cmake
pkgs.clang
pkgs.postgresql # needed to build the diesel cli utility
pkgs.protobuf # api
pkgs.go # go api
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
pkgs.protoc-gen-go-grpc # go api
pkgs.protoc-gen-grpc-web # grpc-web api
pkgs.nodejs # js api + ui
pkgs.yarn # ui
pkgs.openssl
pkgs.sqlite
pkgs.sqlite # sqlite binary + library for diesel
pkgs.postgresql # psql binary + library for diesel
pkgs.cargo-cross # cross-compiling
pkgs.diesel-cli # diesel cli
];
LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib";
BINDGEN_EXTRA_CLANG_ARGS = "-I${pkgs.llvmPackages.libclang.lib}/lib/clang/${pkgs.llvmPackages.libclang.version}/include";

View File

@ -1,6 +1,6 @@
{
"name": "chirpstack-ui",
"version": "4.11.1-test.1",
"version": "4.11.1",
"private": true,
"type": "module",
"scripts": {