From 46615f03fcfa1de7b6a9aa084ef213c143733e38 Mon Sep 17 00:00:00 2001 From: Markus Tacker Date: Wed, 28 Feb 2024 11:10:40 +0100 Subject: [PATCH] fix: update dependencies --- lwm2m/fetchLwM2MShadows.ts | 6 ++++-- lwm2m/instanceTs.spec.ts | 19 ------------------- lwm2m/instanceTs.ts | 18 ------------------ package-lock.json | 8 ++++---- package.json | 2 +- 5 files changed, 9 insertions(+), 44 deletions(-) delete mode 100644 lwm2m/instanceTs.spec.ts delete mode 100644 lwm2m/instanceTs.ts diff --git a/lwm2m/fetchLwM2MShadows.ts b/lwm2m/fetchLwM2MShadows.ts index 433e954..59b37b9 100644 --- a/lwm2m/fetchLwM2MShadows.ts +++ b/lwm2m/fetchLwM2MShadows.ts @@ -1,8 +1,10 @@ import { IoTClient, SearchIndexCommand } from '@aws-sdk/client-iot' -import type { LwM2MObjectInstance } from '@hello.nrfcloud.com/proto-lwm2m' +import { + instanceTs, + type LwM2MObjectInstance, +} from '@hello.nrfcloud.com/proto-lwm2m' import { shadowToObjects } from './shadowToObjects.js' import { getDeviceInfo } from '../lambda/withDeviceAlias.js' -import { instanceTs } from './instanceTs.js' type LwM2MShadow = { deviceId: string diff --git a/lwm2m/instanceTs.spec.ts b/lwm2m/instanceTs.spec.ts deleted file mode 100644 index e61073e..0000000 --- a/lwm2m/instanceTs.spec.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { describe, it } from 'node:test' -import assert from 'node:assert/strict' -import { instanceTs } from './instanceTs.js' - -void describe('instanceTs()', () => { - void it('should return the timestamp of the instance', () => - assert.equal( - instanceTs({ - ObjectID: 14210, - ObjectVersion: '1.0', - Resources: { - '0': 3.5399999618530273, - '1': 4.168000221252441, - '99': '2024-02-23T10:18:20.474Z', - }, - }).getTime(), - new Date('2024-02-23T10:18:20.474Z').getTime(), - )) -}) diff --git a/lwm2m/instanceTs.ts b/lwm2m/instanceTs.ts deleted file mode 100644 index eea05d4..0000000 --- a/lwm2m/instanceTs.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { - type LwM2MObjectInstance, - definitions, - LwM2MObjectID, - timestampResources, -} from '@hello.nrfcloud.com/proto-lwm2m' - -export const instanceTs = (instance: LwM2MObjectInstance): Date => { - const definition = definitions[instance.ObjectID as LwM2MObjectID] - const tsResourceId = timestampResources[definition.ObjectID] as number - const ts = instance.Resources[tsResourceId] as string - return new Date(ts) -} - -export const newestInstanceFirst = ( - i1: LwM2MObjectInstance, - i2: LwM2MObjectInstance, -): number => instanceTs(i2).getTime() - instanceTs(i1).getTime() diff --git a/package-lock.json b/package-lock.json index d7102ce..623d646 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.0-development", "license": "BSD-3-Clause", "dependencies": { - "@hello.nrfcloud.com/proto-lwm2m": "2.5.2", + "@hello.nrfcloud.com/proto-lwm2m": "2.7.0", "@nordicsemiconductor/from-env": "3.0.1", "@nordicsemiconductor/timestream-helpers": "6.0.2", "@protobuf-ts/runtime": "2.9.3", @@ -3501,9 +3501,9 @@ } }, "node_modules/@hello.nrfcloud.com/proto-lwm2m": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/@hello.nrfcloud.com/proto-lwm2m/-/proto-lwm2m-2.5.2.tgz", - "integrity": "sha512-bh9eFW2nbPd4towySJ31nulLQkHsVF1t0+iWpy0nRkz6mE5vBgAeoQOnVs1jaYTL9TpcdRldB/mW6BUdM370HQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/@hello.nrfcloud.com/proto-lwm2m/-/proto-lwm2m-2.7.0.tgz", + "integrity": "sha512-RRm/MTAUsDNntVTSDR8NAJAITdA0vqpV5dOmcfTAnw6Xm9Yh5C7iEcnjEmhJeBxwP6NaqTuvCG8fiaJNj6a4FA==", "dependencies": { "@sinclair/typebox": "0.32.14", "ajv": "8.12.0", diff --git a/package.json b/package.json index 69a9019..7258c6f 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ }, "prettier": "@bifravst/prettier-config", "dependencies": { - "@hello.nrfcloud.com/proto-lwm2m": "2.5.2", + "@hello.nrfcloud.com/proto-lwm2m": "2.7.0", "@nordicsemiconductor/from-env": "3.0.1", "@nordicsemiconductor/timestream-helpers": "6.0.2", "@protobuf-ts/runtime": "2.9.3",