Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev: bump the safe group across 1 directory with 42 updates #227

Closed
wants to merge 2 commits into from
Closed

dev: bump the safe group across 1 directory with 42 updates #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29150bc
ns: Skip downlink for data upload (#226)
onizmx Jan 12, 2025
08d1b88
dev: bump the safe group across 1 directory with 42 updates
dependabot[bot] Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 41 additions & 41 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,28 @@
"repository": "https://github.com/TheThingsNetwork/lorawan-stack.git",
"license": "Apache-2.0",
"devDependencies": {
"@babel/cli": "^7.25.9",
"@babel/cli": "^7.26.4",
"@babel/core": "^7.26.0",
"@babel/eslint-parser": "^7.25.9",
"@babel/eslint-parser": "^7.26.5",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.25.9",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-transform-runtime": "^7.25.9",
"@babel/plugin-transform-spread": "^7.25.9",
"@babel/plugin-transform-strict-mode": "^7.25.9",
"@babel/preset-env": "^7.26.0",
"@babel/preset-react": "^7.25.9",
"@babel/preset-react": "^7.26.3",
"@babel/register": "^7.25.9",
"@babel/runtime-corejs2": "^7.26.0",
"@inquirer/prompts": "^7.1.0",
"@inquirer/prompts": "^7.2.3",
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.15",
"@storybook/addon-designs": "8.0.4",
"@storybook/addon-essentials": "8.4.5",
"@storybook/addon-mdx-gfm": "8.4.5",
"@storybook/addon-actions": "8.4.5",
"@storybook/cli": "8.4.5",
"@storybook/react": "8.4.5",
"@storybook/react-webpack5": "8.4.5",
"@storybook/addon-essentials": "8.4.7",
"@storybook/addon-mdx-gfm": "8.4.7",
"@storybook/addon-actions": "8.4.7",
"@storybook/cli": "8.4.7",
"@storybook/react": "8.4.7",
"@storybook/react-webpack5": "8.4.7",
"@testing-library/cypress": "^10.0.2",
"add-asset-html-webpack-plugin": "^6.0.0",
"babel-jest": "^29.7.0",
Expand All @@ -38,22 +38,22 @@
"clean-webpack-plugin": "^4.0.0",
"copy-webpack-plugin": "^12.0.2",
"css-loader": "^6.10.0",
"cypress": "13.16.0",
"cypress": "13.17.0",
"cypress-browser-permissions": "^1.1.0",
"cypress-file-upload": "^5.0.8",
"cypress-log-to-output": "^1.1.2",
"eslint": "^8.44.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-ttn": "git+https://github.com/TheThingsNetwork/eslint-config-ttn.git#v1.4.0",
"eslint-import-resolver-webpack": "^0.13.9",
"eslint-import-resolver-webpack": "^0.13.10",
"eslint-plugin-babel": "^5.3.1",
"eslint-plugin-cypress": "^3.6.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jest": "^28.9.0",
"eslint-plugin-jsdoc": "^50.5.0",
"eslint-plugin-jest": "^28.10.0",
"eslint-plugin-jsdoc": "^50.6.1",
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react": "^7.37.4",
"file-loader": "^6.2.0",
"html-webpack-plugin": "^5.6.3",
"http-proxy-middleware": "^3.0.3",
Expand All @@ -67,32 +67,32 @@
"mkdirp": "^3.0.1",
"nib": "^1.2.0",
"pg": "^8.13.1",
"prettier": "3.3.3",
"react-refresh": "^0.14.2",
"stylelint": "^16.10.0",
"prettier": "3.4.2",
"react-refresh": "^0.16.0",
"stylelint": "^16.13.1",
"stylelint-stylus": "^1.0.0",
"storybook": "^8.1.8",
"stylus": "^0.64.0",
"stylus-loader": "^8.1.1",
"wait-on": "^8.0.1",
"webpack": "^5.96.1",
"wait-on": "^8.0.2",
"webpack": "^5.97.1",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^5.1.0",
"webpack-dev-server": "^5.2.0",
"webpack-shell-plugin": "https://github.com/cdeutsch/webpack-shell-plugin.git#bee537d",
"yargs": "^17.7.2"
},
"dependencies": {
"@tabler/icons-react": "^3.22.0",
"@formatjs/intl-datetimeformat": "^6.16.5",
"@formatjs/intl-displaynames": "^6.8.5",
"@formatjs/intl-listformat": "^7.7.5",
"@formatjs/intl-locale": "^4.2.5",
"@formatjs/intl-numberformat": "^8.14.5",
"@formatjs/intl-pluralrules": "^5.3.5",
"@formatjs/intl-relativetimeformat": "^11.4.5",
"@reduxjs/toolkit": "^2.3.0",
"@tabler/icons-react": "^3.28.1",
"@formatjs/intl-datetimeformat": "^6.17.2",
"@formatjs/intl-displaynames": "^6.8.9",
"@formatjs/intl-listformat": "^7.7.9",
"@formatjs/intl-locale": "^4.2.9",
"@formatjs/intl-numberformat": "^8.15.2",
"@formatjs/intl-pluralrules": "^5.4.2",
"@formatjs/intl-relativetimeformat": "^11.4.9",
"@reduxjs/toolkit": "^2.5.0",
"@sentry/integrations": "^7.114.0",
"@sentry/react": "^8.40.0",
"@sentry/react": "^8.48.0",
"@tippyjs/react": "^4.2.6",
"apexcharts": "^3.54.1",
"autobind-decorator": "^2.4.0",
Expand All @@ -113,34 +113,34 @@
"query-string": "^9.1.1",
"react": "^17.0.1",
"react-ace": "^6.6.0",
"react-apexcharts": "^1.6.0",
"react-apexcharts": "^1.7.0",
"react-display-name": "^0.2.5",
"react-dom": "^17.0.1",
"react-focus-lock": "^2.13.2",
"react-focus-lock": "^2.13.5",
"react-helmet": "^6.1.0",
"react-intl": "^7.0.1",
"react-intl": "^7.1.0",
"react-leaflet": "^4.2.1",
"react-paginate": "^8.2.0",
"react-redux": "^8.1.2",
"react-remove-scroll": "^2.6.0",
"react-remove-scroll": "^2.6.2",
"react-router-dom": "^6.14.1",
"react-select": "^5.8.3",
"react-select": "^5.9.0",
"react-string-replace": "^1.1.1",
"react-switch": "^7.0.0",
"react-switch": "^7.1.0",
"react-text-mask": "^5.5.0",
"react-toastify": "^9.1.3",
"react-virtualized-auto-sizer": "^1.0.24",
"react-window": "^1.8.10",
"react-virtualized-auto-sizer": "^1.0.25",
"react-window": "^1.8.11",
"react-window-infinite-loader": "^1.0.9",
"redux": "^5.0.1",
"redux-actions": "^2.6.5",
"redux-logic": "^5.0.1",
"redux-logic": "^5.0.2",
"reselect": "^5.1.1",
"scroll-into-view-if-needed": "^3.1.0",
"ttn-lw": "file:sdk/js",
"unicode-properties": "^1.4.1",
"url-template": "^3.1.1",
"yup": "^1.4.0"
"yup": "^1.6.1"
},
"resolutions": {
"cli-truncate": "2.1.0",
Expand Down
15 changes: 13 additions & 2 deletions pkg/networkserver/grpc_gsns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ const (

// DeduplicationLimit is the number of metadata to deduplicate for a single transmission.
deduplicationLimit = 50

// If end device sends data upload packet using this special fport, do not attempt to schedule downlink since end device is not going to open rx windows
dataUploadFPort = 222
)

// UplinkDeduplicator represents an entity, that deduplicates uplinks and accumulates metadata.
Expand Down Expand Up @@ -1110,9 +1113,17 @@ func (ns *NetworkServer) handleDataUplink(ctx context.Context, up *ttnpb.UplinkM
matched.Device = stored
ctx = matched.Context

if err := ns.updateDataDownlinkTask(ctx, stored, time.Time{}); err != nil {
log.FromContext(ctx).WithError(err).Error("Failed to update downlink task queue after data uplink")
macPayload := up.Payload.GetMacPayload()
isDataUpload := false
if macPayload != nil && macPayload.GetFPort() == dataUploadFPort {
isDataUpload = true
}
if !isDataUpload {
if err := ns.updateDataDownlinkTask(ctx, stored, time.Time{}); err != nil {
log.FromContext(ctx).WithError(err).Error("Failed to update downlink task queue after data uplink")
}
}

if !matched.IsRetransmission {
var frmPayload []byte
switch pld.FPort {
Expand Down
Loading
Loading