Skip to content

Commit

Permalink
fix: v2.18.1 (#379)
Browse files Browse the repository at this point in the history
* fix: avoid 3s delay when shutting down mqtt thread, chore: cleanup deserialize-backup code, delete stale code

* chore: cleanup directory structure

* fix: avoid unnecessary panics when shutting down

* fix: make sure shutdown endpoint works as expected

* chore: bump version

* chore: cancellation related cleanup

* fix: make send_script easier to user

* remove unused stuff

* fix: response sequence in script runner, better logs

* fix: deserialize-backup bugfix, config tweaks, cleanup

* lippy
  • Loading branch information
amokfa authored Feb 15, 2025
1 parent a0ce985 commit 4a8a9ee
Show file tree
Hide file tree
Showing 93 changed files with 4,035 additions and 4,254 deletions.
148 changes: 62 additions & 86 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ serial = { git = "https://github.com/bytebeamio/serial-rs", branch = "android_fi

[workspace]
resolver = "2"
members = ["uplink", "storage", "tools/utils", "tools/system-stats"]
exclude = ["tools/deserialize-backup", "tools/simulator", "tools/tunshell"]
members = ["uplink", "tools/deserialize-backup", "tools/utils", "tools/system-stats"]
exclude = ["tools/simulator"]

[workspace.dependencies]
bytes = "1"
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ COPY runit/ /etc/runit

CMD ["/usr/bin/runsvdir", "/etc/runit"]

COPY paths/ paths
COPY scripts/paths/ paths
COPY simulator.sh .

31 changes: 0 additions & 31 deletions docs/configs/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -203,34 +203,3 @@ port = 3333
[device_shadow]
interval = 30

# The on-device service bus exposes an MQTT interface for inter-process communication
# Required Parameters
# - port: the port on which the broker/server is listening for incoming service connections
# - joins: description of how uplink will join incoming data and push outgoing data streams
# - console_port: port on which the rumqttd console API is exposed
[bus]
port = 1883
console_port = 3030
joins = { output_streams = [
{ name = "location", construct_from = [
{ input_stream = "gps", select_fields = [
"latitude",
"longitude",
] },
{ input_stream = "altimeter", select_fields = [
"altitude",
] },
], push_interval_s = 60, no_data_action = "null", publish_on_service_bus = true },
{ name = "device_shadow", construct_from = [
{ input_stream = "device_shadow", select_fields = "all" },
], push_interval_s = "on_new_data", no_data_action = "previous_value", publish_on_service_bus = true },
{ name = "example", construct_from = [
{ input_stream = "stream_one", select_fields = [
"field_x",
"field_y",
] },
{ input_stream = "stream_two", select_fields = [
{ "field_z" = "field_x" },
] },
], push_interval_s = 120, no_data_action = "previous_value", publish_on_service_bus = false },
] }
6 changes: 0 additions & 6 deletions docs/configs/noauth.json

This file was deleted.

6 changes: 0 additions & 6 deletions docs/configs/simulator.json

This file was deleted.

9 changes: 0 additions & 9 deletions docs/configs/simulator.toml

This file was deleted.

6 changes: 0 additions & 6 deletions docs/configs/stress.json

This file was deleted.

23 changes: 0 additions & 23 deletions docs/configs/stress.toml

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
11 changes: 0 additions & 11 deletions docs/security.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,6 @@ uplink communicates with the Bytebeam platform over MQTT+TLS, ensuring applicati
}
```

## Using uplink without TLS
One could use uplink with a broker of their choice, without having to configure TLS. This can be achieved by simply omitting the authentication field in the above JSON and customizing it for use with their setup, MQTT brokers usually listen to port 1883 instead of 8883, which is used in case of MQTT over TLS. i.e:
```js
{
"project_id": "xxxx",
"device_id": "1234",
"broker": "example.com",
"port": 1883
}
```

## Configuring uplink for use with TLS
- To use uplink, you need to provide it with an authenication file, let us first source it from the Bytebeam platform.
1. Login to your account on [demo.bytebeam.io](https://demo.bytebeam.io) and ensure that you are in the right organization.
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
15 changes: 0 additions & 15 deletions storage/Cargo.toml

This file was deleted.

Loading

0 comments on commit 4a8a9ee

Please sign in to comment.