2019-08-13 19:58:35 +03:00
|
|
|
|
///
|
2021-01-11 13:42:16 +02:00
|
|
|
|
/// Copyright © 2016-2021 The Thingsboard Authors
|
2019-08-13 19:58:35 +03:00
|
|
|
|
///
|
|
|
|
|
|
/// 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.
|
|
|
|
|
|
///
|
|
|
|
|
|
|
2020-04-27 09:27:14 +03:00
|
|
|
|
import { BaseData } from '@shared/models/base-data';
|
|
|
|
|
|
import { DeviceId } from './id/device-id';
|
|
|
|
|
|
import { TenantId } from '@shared/models/id/tenant-id';
|
|
|
|
|
|
import { CustomerId } from '@shared/models/id/customer-id';
|
|
|
|
|
|
import { DeviceCredentialsId } from '@shared/models/id/device-credentials-id';
|
2019-10-10 13:00:29 +03:00
|
|
|
|
import { EntitySearchQuery } from '@shared/models/relation.models';
|
2020-08-26 15:00:11 +03:00
|
|
|
|
import { DeviceProfileId } from '@shared/models/id/device-profile-id';
|
|
|
|
|
|
import { RuleChainId } from '@shared/models/id/rule-chain-id';
|
|
|
|
|
|
import { EntityInfoData } from '@shared/models/entity.models';
|
2020-09-09 18:27:28 +03:00
|
|
|
|
import { KeyFilter } from '@shared/models/query/query.models';
|
|
|
|
|
|
import { TimeUnit } from '@shared/models/time/time.models';
|
2021-01-05 11:37:05 +02:00
|
|
|
|
import * as _moment from 'moment';
|
2020-10-29 14:10:05 -04:00
|
|
|
|
import { AbstractControl, ValidationErrors } from '@angular/forms';
|
2020-08-26 15:00:11 +03:00
|
|
|
|
|
|
|
|
|
|
export enum DeviceProfileType {
|
2020-09-02 18:32:57 +03:00
|
|
|
|
DEFAULT = 'DEFAULT'
|
2020-08-26 15:00:11 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-03 12:51:54 +03:00
|
|
|
|
export enum DeviceTransportType {
|
|
|
|
|
|
DEFAULT = 'DEFAULT',
|
|
|
|
|
|
MQTT = 'MQTT',
|
2021-03-19 12:16:43 +02:00
|
|
|
|
COAP = 'COAP',
|
Develop/lwm2m (#3826)
* LwM2M - Start transport
* LwM2M - Test endpoint
* LwM2M - Test endpoint
* LwM2M - Test add xml
* LwM2M device registration
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M implementation
* LwM2M - add to service telemetry and attribute
* LwM2M add to service attribute and telemetry
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add transport.process
* LwM2M - delete from yml tenantid, PSK -ok
* LwM2M - yml del tenantId
* LwM2M - add RPK
* LwM2M - add connect only x509 certificate. Crate certificates in serverKeyStore.jks and clientKeyStore.jks
* LwM2M - add no_sec
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add read JKS from file
* LwM2M - add read JKS from file
* LwM2M - add bootstrap cert
* LwM2M - add bootstrap RPK
* LwM2M - add bootstrap No_sec
* LwM2M - cleaned the code
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - fix bug CoAP transport
* LwM2M: UI - add Json to credentials
* LwM2M: Back - add command "/3/0/5" - trigger client
* LwM2M: fix bug Json edit dialog
* LwM2M: fix bug Json edit dialog
* lwm2m: fix bug Json edit dialog: add validate
* lwm2m: UI add tabs
* lwm2m: UI add tabs (cleaner)
* lwm2m: add interface SecurityConfigModels
* lwm2m: add interface SecurityConfigModels2
* lwm2m: change html
* lwm2m: UI add bootstrap component
* lwm2m: UI add bootstrap component with FormControl
* lwm2m: UI add start Observe
* lwm2m: UI - correct
* lwm2m: UI - correct
* lwm2m: UI - add Validator: BS RPK, X509
* lwm2m: UI - add Observe
* lwm2m: UI - finish Observe
* lwm2m: UI - fix bug config-service update identity
* lwm2m: Bootstarp&Sewrver All config secure
* lwm2m: Bootstarp&Sewrver All config secure for new Front format
* lwm2m: Bootstarp&Sewrver Different config secure for new Front format
* lwm2m: Add attributes Gui and Backend
* lwm2m: Add attributes Gui and Backend final
* lwm2m: Add telemetrys to Gui
* lwm2m: Add Attribute & telemetry in Gui to instance
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry for mobile
* lwm2m: Model folder
* lwm2m: Ok on AWS: NoSec, PSK, X509
bad registration - RPK
* lwm2m: KeyStore start only one
* lwm2m: Server observe ok
* lwm2m: Server fix bug finish session without remove
* lwm2m: Server add function installValue
* lwm2m: Server add function getAttrTelemetry to tingsboard
* lwm2m: Server add function installValue
* lwm2m: Server add function update Telemetry, Attr from observe
* lwm2m: Server add comments
* lwm2m: Server add session listener
* lwm2m: Server add onGetChangeCredentials with analyze
* lwm2m: Server add onGetChangeCredentials with analyze Onserve add
* lwm2m: Server: updated algorithm for analyzing dynamic changes in attributes / telemetry / observation
* lwm2m: fix bug: "ngx-flowchart" compile
* lwm2m: get value resource OPAQUE - byte [] to HexString
* lwm2m: change path to base
* lwm2m: fix bug COAP & lwm2m
* Lwm2m_3_2: back: cleaner, test bootstrap-ok front: restore
* Lwm2m_3_2: back: del SynchronousRegistrationListener.java
* Lwm2m_3_2: front: start profile lwm2m UI
* Lwm2m_3_2: front&back: add to profile lwm2m (api, getModels...)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (2)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (3)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (4)
* Lwm2m_3_2: front: add update change bootstrapConfig and save to config json
* Lwm2m_3_2: update after merge master
* lwm2m: fix bug proto
* lwm2m: fix bug in yml keyStore.jks
* lwm2m: fix bug tests
* lwm2m: front: add nameThingsboard
* lwm2m: fix bug Autowired lwm2mContext, caseCamel
* lwm2m: back-end^ start api /lwm2m/deviceProfile/bootstrap
* lwm2m: back-end: add method read models from resources
* lwm2m: back-end/front: add and finish api bootstrapConfig
* lwm2m: back-end: add decode profile
* lwm2m: back-end: add new bin in transport api
* lwm2m: add microservice lwm2m and docker lwm2m.
* lwm2m: add microservice lwm2m and docker lwm2m (fix bug)
* lwm2m: front: start fix bug disabled resources
* lwm2m: master to lwm2m merge, front add change attribute, telemetry
* lwm2m: front PR
* lwm2m: front add sort keyName to Json on the start
* lwm2m: front add instances
* lwm2m: front add/del instances FormGrp Value
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
# Conflicts:
# common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
# common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
# ui-ngx/src/app/modules/home/components/home-components.module.ts
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
* lwm2m: Front: del sort after add/del instance
* lwm2m: Front: fix bug reindex FormArray after update
* Lwm2m: Front fix bug add/del instans
* Lwm2m: Front finish1 profile
* Lwm2m: Back add profile to ModelClient
* Lwm2m: Back add form profile sent thingsboard: attr/tel/observe
* Lwm2m: Back -> fix bug: serverKeyStore.jks] Unable to load KeyStore files server
* Lwm2m: Back -> fix bug: onRegistered an unReg
* Lwm2m: Back -> add updateProfiles
* Lwm2m: Back -> add updateDevice and updateProfile dynamic
* Lwm2m: Back -> error if CoapCode not access
* Lwm2m: Front -> clear credential
* Lwm2m: Front -> credential fix bug button "save"
* Lwm2m: Back -> add telemetry logLwm2m
Co-authored-by: nickAS21 <nick@avalr.com.ua>
2020-12-09 17:13:11 +02:00
|
|
|
|
LWM2M = 'LWM2M'
|
2020-09-03 12:51:54 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
2021-03-15 18:18:45 +02:00
|
|
|
|
export enum TransportPayloadType {
|
2020-10-02 11:31:27 +03:00
|
|
|
|
JSON = 'JSON',
|
|
|
|
|
|
PROTOBUF = 'PROTOBUF'
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2021-03-15 18:18:45 +02:00
|
|
|
|
export enum CoapTransportDeviceType {
|
|
|
|
|
|
DEFAULT = 'DEFAULT',
|
|
|
|
|
|
EFENTO = 'EFENTO'
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-10-04 00:05:52 +03:00
|
|
|
|
export enum DeviceProvisionType {
|
|
|
|
|
|
DISABLED = 'DISABLED',
|
|
|
|
|
|
ALLOW_CREATE_NEW_DEVICES = 'ALLOW_CREATE_NEW_DEVICES',
|
|
|
|
|
|
CHECK_PRE_PROVISIONED_DEVICES = 'CHECK_PRE_PROVISIONED_DEVICES'
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-03 17:43:53 +03:00
|
|
|
|
export interface DeviceConfigurationFormInfo {
|
|
|
|
|
|
hasProfileConfiguration: boolean;
|
|
|
|
|
|
hasDeviceConfiguration: boolean;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-02 18:32:57 +03:00
|
|
|
|
export const deviceProfileTypeTranslationMap = new Map<DeviceProfileType, string>(
|
|
|
|
|
|
[
|
|
|
|
|
|
[DeviceProfileType.DEFAULT, 'device-profile.type-default']
|
|
|
|
|
|
]
|
|
|
|
|
|
);
|
|
|
|
|
|
|
2020-09-03 17:43:53 +03:00
|
|
|
|
export const deviceProfileTypeConfigurationInfoMap = new Map<DeviceProfileType, DeviceConfigurationFormInfo>(
|
|
|
|
|
|
[
|
|
|
|
|
|
[
|
|
|
|
|
|
DeviceProfileType.DEFAULT,
|
|
|
|
|
|
{
|
|
|
|
|
|
hasProfileConfiguration: false,
|
|
|
|
|
|
hasDeviceConfiguration: false,
|
|
|
|
|
|
}
|
|
|
|
|
|
]
|
|
|
|
|
|
]
|
|
|
|
|
|
);
|
|
|
|
|
|
|
2020-09-03 12:51:54 +03:00
|
|
|
|
export const deviceTransportTypeTranslationMap = new Map<DeviceTransportType, string>(
|
|
|
|
|
|
[
|
|
|
|
|
|
[DeviceTransportType.DEFAULT, 'device-profile.transport-type-default'],
|
|
|
|
|
|
[DeviceTransportType.MQTT, 'device-profile.transport-type-mqtt'],
|
2021-03-19 12:16:43 +02:00
|
|
|
|
[DeviceTransportType.COAP, 'device-profile.transport-type-coap'],
|
Develop/lwm2m (#3826)
* LwM2M - Start transport
* LwM2M - Test endpoint
* LwM2M - Test endpoint
* LwM2M - Test add xml
* LwM2M device registration
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M implementation
* LwM2M - add to service telemetry and attribute
* LwM2M add to service attribute and telemetry
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add transport.process
* LwM2M - delete from yml tenantid, PSK -ok
* LwM2M - yml del tenantId
* LwM2M - add RPK
* LwM2M - add connect only x509 certificate. Crate certificates in serverKeyStore.jks and clientKeyStore.jks
* LwM2M - add no_sec
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add read JKS from file
* LwM2M - add read JKS from file
* LwM2M - add bootstrap cert
* LwM2M - add bootstrap RPK
* LwM2M - add bootstrap No_sec
* LwM2M - cleaned the code
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - fix bug CoAP transport
* LwM2M: UI - add Json to credentials
* LwM2M: Back - add command "/3/0/5" - trigger client
* LwM2M: fix bug Json edit dialog
* LwM2M: fix bug Json edit dialog
* lwm2m: fix bug Json edit dialog: add validate
* lwm2m: UI add tabs
* lwm2m: UI add tabs (cleaner)
* lwm2m: add interface SecurityConfigModels
* lwm2m: add interface SecurityConfigModels2
* lwm2m: change html
* lwm2m: UI add bootstrap component
* lwm2m: UI add bootstrap component with FormControl
* lwm2m: UI add start Observe
* lwm2m: UI - correct
* lwm2m: UI - correct
* lwm2m: UI - add Validator: BS RPK, X509
* lwm2m: UI - add Observe
* lwm2m: UI - finish Observe
* lwm2m: UI - fix bug config-service update identity
* lwm2m: Bootstarp&Sewrver All config secure
* lwm2m: Bootstarp&Sewrver All config secure for new Front format
* lwm2m: Bootstarp&Sewrver Different config secure for new Front format
* lwm2m: Add attributes Gui and Backend
* lwm2m: Add attributes Gui and Backend final
* lwm2m: Add telemetrys to Gui
* lwm2m: Add Attribute & telemetry in Gui to instance
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry for mobile
* lwm2m: Model folder
* lwm2m: Ok on AWS: NoSec, PSK, X509
bad registration - RPK
* lwm2m: KeyStore start only one
* lwm2m: Server observe ok
* lwm2m: Server fix bug finish session without remove
* lwm2m: Server add function installValue
* lwm2m: Server add function getAttrTelemetry to tingsboard
* lwm2m: Server add function installValue
* lwm2m: Server add function update Telemetry, Attr from observe
* lwm2m: Server add comments
* lwm2m: Server add session listener
* lwm2m: Server add onGetChangeCredentials with analyze
* lwm2m: Server add onGetChangeCredentials with analyze Onserve add
* lwm2m: Server: updated algorithm for analyzing dynamic changes in attributes / telemetry / observation
* lwm2m: fix bug: "ngx-flowchart" compile
* lwm2m: get value resource OPAQUE - byte [] to HexString
* lwm2m: change path to base
* lwm2m: fix bug COAP & lwm2m
* Lwm2m_3_2: back: cleaner, test bootstrap-ok front: restore
* Lwm2m_3_2: back: del SynchronousRegistrationListener.java
* Lwm2m_3_2: front: start profile lwm2m UI
* Lwm2m_3_2: front&back: add to profile lwm2m (api, getModels...)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (2)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (3)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (4)
* Lwm2m_3_2: front: add update change bootstrapConfig and save to config json
* Lwm2m_3_2: update after merge master
* lwm2m: fix bug proto
* lwm2m: fix bug in yml keyStore.jks
* lwm2m: fix bug tests
* lwm2m: front: add nameThingsboard
* lwm2m: fix bug Autowired lwm2mContext, caseCamel
* lwm2m: back-end^ start api /lwm2m/deviceProfile/bootstrap
* lwm2m: back-end: add method read models from resources
* lwm2m: back-end/front: add and finish api bootstrapConfig
* lwm2m: back-end: add decode profile
* lwm2m: back-end: add new bin in transport api
* lwm2m: add microservice lwm2m and docker lwm2m.
* lwm2m: add microservice lwm2m and docker lwm2m (fix bug)
* lwm2m: front: start fix bug disabled resources
* lwm2m: master to lwm2m merge, front add change attribute, telemetry
* lwm2m: front PR
* lwm2m: front add sort keyName to Json on the start
* lwm2m: front add instances
* lwm2m: front add/del instances FormGrp Value
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
# Conflicts:
# common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
# common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
# ui-ngx/src/app/modules/home/components/home-components.module.ts
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
* lwm2m: Front: del sort after add/del instance
* lwm2m: Front: fix bug reindex FormArray after update
* Lwm2m: Front fix bug add/del instans
* Lwm2m: Front finish1 profile
* Lwm2m: Back add profile to ModelClient
* Lwm2m: Back add form profile sent thingsboard: attr/tel/observe
* Lwm2m: Back -> fix bug: serverKeyStore.jks] Unable to load KeyStore files server
* Lwm2m: Back -> fix bug: onRegistered an unReg
* Lwm2m: Back -> add updateProfiles
* Lwm2m: Back -> add updateDevice and updateProfile dynamic
* Lwm2m: Back -> error if CoapCode not access
* Lwm2m: Front -> clear credential
* Lwm2m: Front -> credential fix bug button "save"
* Lwm2m: Back -> add telemetry logLwm2m
Co-authored-by: nickAS21 <nick@avalr.com.ua>
2020-12-09 17:13:11 +02:00
|
|
|
|
[DeviceTransportType.LWM2M, 'device-profile.transport-type-lwm2m']
|
2020-09-03 12:51:54 +03:00
|
|
|
|
]
|
|
|
|
|
|
);
|
|
|
|
|
|
|
2020-10-04 00:05:52 +03:00
|
|
|
|
|
|
|
|
|
|
export const deviceProvisionTypeTranslationMap = new Map<DeviceProvisionType, string>(
|
|
|
|
|
|
[
|
|
|
|
|
|
[DeviceProvisionType.DISABLED, 'device-profile.provision-strategy-disabled'],
|
|
|
|
|
|
[DeviceProvisionType.ALLOW_CREATE_NEW_DEVICES, 'device-profile.provision-strategy-created-new'],
|
|
|
|
|
|
[DeviceProvisionType.CHECK_PRE_PROVISIONED_DEVICES, 'device-profile.provision-strategy-check-pre-provisioned']
|
|
|
|
|
|
]
|
2020-10-14 12:32:07 +03:00
|
|
|
|
);
|
2020-10-04 00:05:52 +03:00
|
|
|
|
|
2020-10-09 17:19:51 +03:00
|
|
|
|
export const deviceTransportTypeHintMap = new Map<DeviceTransportType, string>(
|
|
|
|
|
|
[
|
|
|
|
|
|
[DeviceTransportType.DEFAULT, 'device-profile.transport-type-default-hint'],
|
|
|
|
|
|
[DeviceTransportType.MQTT, 'device-profile.transport-type-mqtt-hint'],
|
2021-03-19 12:16:43 +02:00
|
|
|
|
[DeviceTransportType.COAP, 'device-profile.transport-type-coap-hint'],
|
Develop/lwm2m (#3826)
* LwM2M - Start transport
* LwM2M - Test endpoint
* LwM2M - Test endpoint
* LwM2M - Test add xml
* LwM2M device registration
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M implementation
* LwM2M - add to service telemetry and attribute
* LwM2M add to service attribute and telemetry
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add transport.process
* LwM2M - delete from yml tenantid, PSK -ok
* LwM2M - yml del tenantId
* LwM2M - add RPK
* LwM2M - add connect only x509 certificate. Crate certificates in serverKeyStore.jks and clientKeyStore.jks
* LwM2M - add no_sec
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add read JKS from file
* LwM2M - add read JKS from file
* LwM2M - add bootstrap cert
* LwM2M - add bootstrap RPK
* LwM2M - add bootstrap No_sec
* LwM2M - cleaned the code
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - fix bug CoAP transport
* LwM2M: UI - add Json to credentials
* LwM2M: Back - add command "/3/0/5" - trigger client
* LwM2M: fix bug Json edit dialog
* LwM2M: fix bug Json edit dialog
* lwm2m: fix bug Json edit dialog: add validate
* lwm2m: UI add tabs
* lwm2m: UI add tabs (cleaner)
* lwm2m: add interface SecurityConfigModels
* lwm2m: add interface SecurityConfigModels2
* lwm2m: change html
* lwm2m: UI add bootstrap component
* lwm2m: UI add bootstrap component with FormControl
* lwm2m: UI add start Observe
* lwm2m: UI - correct
* lwm2m: UI - correct
* lwm2m: UI - add Validator: BS RPK, X509
* lwm2m: UI - add Observe
* lwm2m: UI - finish Observe
* lwm2m: UI - fix bug config-service update identity
* lwm2m: Bootstarp&Sewrver All config secure
* lwm2m: Bootstarp&Sewrver All config secure for new Front format
* lwm2m: Bootstarp&Sewrver Different config secure for new Front format
* lwm2m: Add attributes Gui and Backend
* lwm2m: Add attributes Gui and Backend final
* lwm2m: Add telemetrys to Gui
* lwm2m: Add Attribute & telemetry in Gui to instance
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry for mobile
* lwm2m: Model folder
* lwm2m: Ok on AWS: NoSec, PSK, X509
bad registration - RPK
* lwm2m: KeyStore start only one
* lwm2m: Server observe ok
* lwm2m: Server fix bug finish session without remove
* lwm2m: Server add function installValue
* lwm2m: Server add function getAttrTelemetry to tingsboard
* lwm2m: Server add function installValue
* lwm2m: Server add function update Telemetry, Attr from observe
* lwm2m: Server add comments
* lwm2m: Server add session listener
* lwm2m: Server add onGetChangeCredentials with analyze
* lwm2m: Server add onGetChangeCredentials with analyze Onserve add
* lwm2m: Server: updated algorithm for analyzing dynamic changes in attributes / telemetry / observation
* lwm2m: fix bug: "ngx-flowchart" compile
* lwm2m: get value resource OPAQUE - byte [] to HexString
* lwm2m: change path to base
* lwm2m: fix bug COAP & lwm2m
* Lwm2m_3_2: back: cleaner, test bootstrap-ok front: restore
* Lwm2m_3_2: back: del SynchronousRegistrationListener.java
* Lwm2m_3_2: front: start profile lwm2m UI
* Lwm2m_3_2: front&back: add to profile lwm2m (api, getModels...)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (2)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (3)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (4)
* Lwm2m_3_2: front: add update change bootstrapConfig and save to config json
* Lwm2m_3_2: update after merge master
* lwm2m: fix bug proto
* lwm2m: fix bug in yml keyStore.jks
* lwm2m: fix bug tests
* lwm2m: front: add nameThingsboard
* lwm2m: fix bug Autowired lwm2mContext, caseCamel
* lwm2m: back-end^ start api /lwm2m/deviceProfile/bootstrap
* lwm2m: back-end: add method read models from resources
* lwm2m: back-end/front: add and finish api bootstrapConfig
* lwm2m: back-end: add decode profile
* lwm2m: back-end: add new bin in transport api
* lwm2m: add microservice lwm2m and docker lwm2m.
* lwm2m: add microservice lwm2m and docker lwm2m (fix bug)
* lwm2m: front: start fix bug disabled resources
* lwm2m: master to lwm2m merge, front add change attribute, telemetry
* lwm2m: front PR
* lwm2m: front add sort keyName to Json on the start
* lwm2m: front add instances
* lwm2m: front add/del instances FormGrp Value
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
# Conflicts:
# common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
# common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
# ui-ngx/src/app/modules/home/components/home-components.module.ts
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
* lwm2m: Front: del sort after add/del instance
* lwm2m: Front: fix bug reindex FormArray after update
* Lwm2m: Front fix bug add/del instans
* Lwm2m: Front finish1 profile
* Lwm2m: Back add profile to ModelClient
* Lwm2m: Back add form profile sent thingsboard: attr/tel/observe
* Lwm2m: Back -> fix bug: serverKeyStore.jks] Unable to load KeyStore files server
* Lwm2m: Back -> fix bug: onRegistered an unReg
* Lwm2m: Back -> add updateProfiles
* Lwm2m: Back -> add updateDevice and updateProfile dynamic
* Lwm2m: Back -> error if CoapCode not access
* Lwm2m: Front -> clear credential
* Lwm2m: Front -> credential fix bug button "save"
* Lwm2m: Back -> add telemetry logLwm2m
Co-authored-by: nickAS21 <nick@avalr.com.ua>
2020-12-09 17:13:11 +02:00
|
|
|
|
[DeviceTransportType.LWM2M, 'device-profile.transport-type-lwm2m-hint']
|
2020-10-09 17:19:51 +03:00
|
|
|
|
]
|
|
|
|
|
|
);
|
|
|
|
|
|
|
2021-03-15 18:18:45 +02:00
|
|
|
|
export const transportPayloadTypeTranslationMap = new Map<TransportPayloadType, string>(
|
2020-10-02 11:31:27 +03:00
|
|
|
|
[
|
2021-03-15 18:18:45 +02:00
|
|
|
|
[TransportPayloadType.JSON, 'device-profile.transport-device-payload-type-json'],
|
|
|
|
|
|
[TransportPayloadType.PROTOBUF, 'device-profile.transport-device-payload-type-proto']
|
|
|
|
|
|
]
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
export const defaultTelemetrySchema =
|
|
|
|
|
|
'syntax ="proto3";\n' +
|
|
|
|
|
|
'package telemetry;\n' +
|
|
|
|
|
|
'\n' +
|
|
|
|
|
|
'message SensorDataReading {\n' +
|
|
|
|
|
|
'\n' +
|
|
|
|
|
|
' double temperature = 1;\n' +
|
|
|
|
|
|
' double humidity = 2;\n' +
|
|
|
|
|
|
' InnerObject innerObject = 3;\n' +
|
|
|
|
|
|
'\n' +
|
|
|
|
|
|
' message InnerObject {\n' +
|
|
|
|
|
|
' string key1 = 1;\n' +
|
|
|
|
|
|
' bool key2 = 2;\n' +
|
|
|
|
|
|
' double key3 = 3;\n' +
|
|
|
|
|
|
' int32 key4 = 4;\n' +
|
|
|
|
|
|
' string key5 = 5;\n' +
|
|
|
|
|
|
' }\n' +
|
|
|
|
|
|
'}\n';
|
|
|
|
|
|
|
|
|
|
|
|
export const defaultAttributesSchema =
|
|
|
|
|
|
'syntax ="proto3";\n' +
|
|
|
|
|
|
'package attributes;\n' +
|
|
|
|
|
|
'\n' +
|
|
|
|
|
|
'message SensorConfiguration {\n' +
|
|
|
|
|
|
' string firmwareVersion = 1;\n' +
|
|
|
|
|
|
' string serialNumber = 2;\n' +
|
|
|
|
|
|
'}';
|
|
|
|
|
|
|
|
|
|
|
|
export const coapDeviceTypeTranslationMap = new Map<CoapTransportDeviceType, string>(
|
|
|
|
|
|
[
|
|
|
|
|
|
[CoapTransportDeviceType.DEFAULT, 'device-profile.coap-device-type-default'],
|
|
|
|
|
|
[CoapTransportDeviceType.EFENTO, 'device-profile.coap-device-type-efento']
|
2020-10-02 11:31:27 +03:00
|
|
|
|
]
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-09-03 17:43:53 +03:00
|
|
|
|
export const deviceTransportTypeConfigurationInfoMap = new Map<DeviceTransportType, DeviceConfigurationFormInfo>(
|
|
|
|
|
|
[
|
|
|
|
|
|
[
|
|
|
|
|
|
DeviceTransportType.DEFAULT,
|
|
|
|
|
|
{
|
|
|
|
|
|
hasProfileConfiguration: false,
|
|
|
|
|
|
hasDeviceConfiguration: false,
|
|
|
|
|
|
}
|
|
|
|
|
|
],
|
|
|
|
|
|
[
|
|
|
|
|
|
DeviceTransportType.MQTT,
|
|
|
|
|
|
{
|
|
|
|
|
|
hasProfileConfiguration: true,
|
2020-10-12 10:12:42 +03:00
|
|
|
|
hasDeviceConfiguration: false,
|
2020-09-03 17:43:53 +03:00
|
|
|
|
}
|
|
|
|
|
|
],
|
2021-03-19 12:16:43 +02:00
|
|
|
|
[
|
|
|
|
|
|
DeviceTransportType.COAP,
|
2020-09-03 17:43:53 +03:00
|
|
|
|
{
|
|
|
|
|
|
hasProfileConfiguration: true,
|
2020-10-12 10:12:42 +03:00
|
|
|
|
hasDeviceConfiguration: false,
|
2020-09-03 17:43:53 +03:00
|
|
|
|
}
|
2021-03-19 12:16:43 +02:00
|
|
|
|
],
|
Develop/lwm2m (#3826)
* LwM2M - Start transport
* LwM2M - Test endpoint
* LwM2M - Test endpoint
* LwM2M - Test add xml
* LwM2M device registration
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M implementation
* LwM2M - add to service telemetry and attribute
* LwM2M add to service attribute and telemetry
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add transport.process
* LwM2M - delete from yml tenantid, PSK -ok
* LwM2M - yml del tenantId
* LwM2M - add RPK
* LwM2M - add connect only x509 certificate. Crate certificates in serverKeyStore.jks and clientKeyStore.jks
* LwM2M - add no_sec
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add read JKS from file
* LwM2M - add read JKS from file
* LwM2M - add bootstrap cert
* LwM2M - add bootstrap RPK
* LwM2M - add bootstrap No_sec
* LwM2M - cleaned the code
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - fix bug CoAP transport
* LwM2M: UI - add Json to credentials
* LwM2M: Back - add command "/3/0/5" - trigger client
* LwM2M: fix bug Json edit dialog
* LwM2M: fix bug Json edit dialog
* lwm2m: fix bug Json edit dialog: add validate
* lwm2m: UI add tabs
* lwm2m: UI add tabs (cleaner)
* lwm2m: add interface SecurityConfigModels
* lwm2m: add interface SecurityConfigModels2
* lwm2m: change html
* lwm2m: UI add bootstrap component
* lwm2m: UI add bootstrap component with FormControl
* lwm2m: UI add start Observe
* lwm2m: UI - correct
* lwm2m: UI - correct
* lwm2m: UI - add Validator: BS RPK, X509
* lwm2m: UI - add Observe
* lwm2m: UI - finish Observe
* lwm2m: UI - fix bug config-service update identity
* lwm2m: Bootstarp&Sewrver All config secure
* lwm2m: Bootstarp&Sewrver All config secure for new Front format
* lwm2m: Bootstarp&Sewrver Different config secure for new Front format
* lwm2m: Add attributes Gui and Backend
* lwm2m: Add attributes Gui and Backend final
* lwm2m: Add telemetrys to Gui
* lwm2m: Add Attribute & telemetry in Gui to instance
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry for mobile
* lwm2m: Model folder
* lwm2m: Ok on AWS: NoSec, PSK, X509
bad registration - RPK
* lwm2m: KeyStore start only one
* lwm2m: Server observe ok
* lwm2m: Server fix bug finish session without remove
* lwm2m: Server add function installValue
* lwm2m: Server add function getAttrTelemetry to tingsboard
* lwm2m: Server add function installValue
* lwm2m: Server add function update Telemetry, Attr from observe
* lwm2m: Server add comments
* lwm2m: Server add session listener
* lwm2m: Server add onGetChangeCredentials with analyze
* lwm2m: Server add onGetChangeCredentials with analyze Onserve add
* lwm2m: Server: updated algorithm for analyzing dynamic changes in attributes / telemetry / observation
* lwm2m: fix bug: "ngx-flowchart" compile
* lwm2m: get value resource OPAQUE - byte [] to HexString
* lwm2m: change path to base
* lwm2m: fix bug COAP & lwm2m
* Lwm2m_3_2: back: cleaner, test bootstrap-ok front: restore
* Lwm2m_3_2: back: del SynchronousRegistrationListener.java
* Lwm2m_3_2: front: start profile lwm2m UI
* Lwm2m_3_2: front&back: add to profile lwm2m (api, getModels...)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (2)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (3)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (4)
* Lwm2m_3_2: front: add update change bootstrapConfig and save to config json
* Lwm2m_3_2: update after merge master
* lwm2m: fix bug proto
* lwm2m: fix bug in yml keyStore.jks
* lwm2m: fix bug tests
* lwm2m: front: add nameThingsboard
* lwm2m: fix bug Autowired lwm2mContext, caseCamel
* lwm2m: back-end^ start api /lwm2m/deviceProfile/bootstrap
* lwm2m: back-end: add method read models from resources
* lwm2m: back-end/front: add and finish api bootstrapConfig
* lwm2m: back-end: add decode profile
* lwm2m: back-end: add new bin in transport api
* lwm2m: add microservice lwm2m and docker lwm2m.
* lwm2m: add microservice lwm2m and docker lwm2m (fix bug)
* lwm2m: front: start fix bug disabled resources
* lwm2m: master to lwm2m merge, front add change attribute, telemetry
* lwm2m: front PR
* lwm2m: front add sort keyName to Json on the start
* lwm2m: front add instances
* lwm2m: front add/del instances FormGrp Value
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
# Conflicts:
# common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
# common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
# ui-ngx/src/app/modules/home/components/home-components.module.ts
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
* lwm2m: Front: del sort after add/del instance
* lwm2m: Front: fix bug reindex FormArray after update
* Lwm2m: Front fix bug add/del instans
* Lwm2m: Front finish1 profile
* Lwm2m: Back add profile to ModelClient
* Lwm2m: Back add form profile sent thingsboard: attr/tel/observe
* Lwm2m: Back -> fix bug: serverKeyStore.jks] Unable to load KeyStore files server
* Lwm2m: Back -> fix bug: onRegistered an unReg
* Lwm2m: Back -> add updateProfiles
* Lwm2m: Back -> add updateDevice and updateProfile dynamic
* Lwm2m: Back -> error if CoapCode not access
* Lwm2m: Front -> clear credential
* Lwm2m: Front -> credential fix bug button "save"
* Lwm2m: Back -> add telemetry logLwm2m
Co-authored-by: nickAS21 <nick@avalr.com.ua>
2020-12-09 17:13:11 +02:00
|
|
|
|
[
|
2020-09-03 17:43:53 +03:00
|
|
|
|
DeviceTransportType.LWM2M,
|
|
|
|
|
|
{
|
|
|
|
|
|
hasProfileConfiguration: true,
|
2020-10-12 10:12:42 +03:00
|
|
|
|
hasDeviceConfiguration: false,
|
2020-09-03 17:43:53 +03:00
|
|
|
|
}
|
Develop/lwm2m (#3826)
* LwM2M - Start transport
* LwM2M - Test endpoint
* LwM2M - Test endpoint
* LwM2M - Test add xml
* LwM2M device registration
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M implementation
* LwM2M - add to service telemetry and attribute
* LwM2M add to service attribute and telemetry
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add transport.process
* LwM2M - delete from yml tenantid, PSK -ok
* LwM2M - yml del tenantId
* LwM2M - add RPK
* LwM2M - add connect only x509 certificate. Crate certificates in serverKeyStore.jks and clientKeyStore.jks
* LwM2M - add no_sec
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add read JKS from file
* LwM2M - add read JKS from file
* LwM2M - add bootstrap cert
* LwM2M - add bootstrap RPK
* LwM2M - add bootstrap No_sec
* LwM2M - cleaned the code
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - fix bug CoAP transport
* LwM2M: UI - add Json to credentials
* LwM2M: Back - add command "/3/0/5" - trigger client
* LwM2M: fix bug Json edit dialog
* LwM2M: fix bug Json edit dialog
* lwm2m: fix bug Json edit dialog: add validate
* lwm2m: UI add tabs
* lwm2m: UI add tabs (cleaner)
* lwm2m: add interface SecurityConfigModels
* lwm2m: add interface SecurityConfigModels2
* lwm2m: change html
* lwm2m: UI add bootstrap component
* lwm2m: UI add bootstrap component with FormControl
* lwm2m: UI add start Observe
* lwm2m: UI - correct
* lwm2m: UI - correct
* lwm2m: UI - add Validator: BS RPK, X509
* lwm2m: UI - add Observe
* lwm2m: UI - finish Observe
* lwm2m: UI - fix bug config-service update identity
* lwm2m: Bootstarp&Sewrver All config secure
* lwm2m: Bootstarp&Sewrver All config secure for new Front format
* lwm2m: Bootstarp&Sewrver Different config secure for new Front format
* lwm2m: Add attributes Gui and Backend
* lwm2m: Add attributes Gui and Backend final
* lwm2m: Add telemetrys to Gui
* lwm2m: Add Attribute & telemetry in Gui to instance
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry for mobile
* lwm2m: Model folder
* lwm2m: Ok on AWS: NoSec, PSK, X509
bad registration - RPK
* lwm2m: KeyStore start only one
* lwm2m: Server observe ok
* lwm2m: Server fix bug finish session without remove
* lwm2m: Server add function installValue
* lwm2m: Server add function getAttrTelemetry to tingsboard
* lwm2m: Server add function installValue
* lwm2m: Server add function update Telemetry, Attr from observe
* lwm2m: Server add comments
* lwm2m: Server add session listener
* lwm2m: Server add onGetChangeCredentials with analyze
* lwm2m: Server add onGetChangeCredentials with analyze Onserve add
* lwm2m: Server: updated algorithm for analyzing dynamic changes in attributes / telemetry / observation
* lwm2m: fix bug: "ngx-flowchart" compile
* lwm2m: get value resource OPAQUE - byte [] to HexString
* lwm2m: change path to base
* lwm2m: fix bug COAP & lwm2m
* Lwm2m_3_2: back: cleaner, test bootstrap-ok front: restore
* Lwm2m_3_2: back: del SynchronousRegistrationListener.java
* Lwm2m_3_2: front: start profile lwm2m UI
* Lwm2m_3_2: front&back: add to profile lwm2m (api, getModels...)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (2)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (3)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (4)
* Lwm2m_3_2: front: add update change bootstrapConfig and save to config json
* Lwm2m_3_2: update after merge master
* lwm2m: fix bug proto
* lwm2m: fix bug in yml keyStore.jks
* lwm2m: fix bug tests
* lwm2m: front: add nameThingsboard
* lwm2m: fix bug Autowired lwm2mContext, caseCamel
* lwm2m: back-end^ start api /lwm2m/deviceProfile/bootstrap
* lwm2m: back-end: add method read models from resources
* lwm2m: back-end/front: add and finish api bootstrapConfig
* lwm2m: back-end: add decode profile
* lwm2m: back-end: add new bin in transport api
* lwm2m: add microservice lwm2m and docker lwm2m.
* lwm2m: add microservice lwm2m and docker lwm2m (fix bug)
* lwm2m: front: start fix bug disabled resources
* lwm2m: master to lwm2m merge, front add change attribute, telemetry
* lwm2m: front PR
* lwm2m: front add sort keyName to Json on the start
* lwm2m: front add instances
* lwm2m: front add/del instances FormGrp Value
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
# Conflicts:
# common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
# common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
# ui-ngx/src/app/modules/home/components/home-components.module.ts
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
* lwm2m: Front: del sort after add/del instance
* lwm2m: Front: fix bug reindex FormArray after update
* Lwm2m: Front fix bug add/del instans
* Lwm2m: Front finish1 profile
* Lwm2m: Back add profile to ModelClient
* Lwm2m: Back add form profile sent thingsboard: attr/tel/observe
* Lwm2m: Back -> fix bug: serverKeyStore.jks] Unable to load KeyStore files server
* Lwm2m: Back -> fix bug: onRegistered an unReg
* Lwm2m: Back -> add updateProfiles
* Lwm2m: Back -> add updateDevice and updateProfile dynamic
* Lwm2m: Back -> error if CoapCode not access
* Lwm2m: Front -> clear credential
* Lwm2m: Front -> credential fix bug button "save"
* Lwm2m: Back -> add telemetry logLwm2m
Co-authored-by: nickAS21 <nick@avalr.com.ua>
2020-12-09 17:13:11 +02:00
|
|
|
|
]
|
2020-09-03 17:43:53 +03:00
|
|
|
|
]
|
|
|
|
|
|
);
|
|
|
|
|
|
|
2020-08-26 15:00:11 +03:00
|
|
|
|
export interface DefaultDeviceProfileConfiguration {
|
|
|
|
|
|
[key: string]: any;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-02 18:32:57 +03:00
|
|
|
|
export type DeviceProfileConfigurations = DefaultDeviceProfileConfiguration;
|
2020-08-26 15:00:11 +03:00
|
|
|
|
|
|
|
|
|
|
export interface DeviceProfileConfiguration extends DeviceProfileConfigurations {
|
|
|
|
|
|
type: DeviceProfileType;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-03 12:51:54 +03:00
|
|
|
|
export interface DefaultDeviceProfileTransportConfiguration {
|
|
|
|
|
|
[key: string]: any;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export interface MqttDeviceProfileTransportConfiguration {
|
2020-09-04 15:15:09 +03:00
|
|
|
|
deviceTelemetryTopic?: string;
|
|
|
|
|
|
deviceAttributesTopic?: string;
|
2020-11-13 16:19:40 +02:00
|
|
|
|
transportPayloadTypeConfiguration?: {
|
2021-03-15 18:18:45 +02:00
|
|
|
|
transportPayloadType?: TransportPayloadType;
|
2020-11-13 16:19:40 +02:00
|
|
|
|
};
|
2020-09-03 12:51:54 +03:00
|
|
|
|
[key: string]: any;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2021-03-15 18:18:45 +02:00
|
|
|
|
export interface CoapDeviceProfileTransportConfiguration {
|
|
|
|
|
|
coapDeviceTypeConfiguration?: {
|
|
|
|
|
|
coapDeviceType?: CoapTransportDeviceType;
|
|
|
|
|
|
transportPayloadTypeConfiguration?: {
|
|
|
|
|
|
transportPayloadType?: TransportPayloadType;
|
|
|
|
|
|
[key: string]: any;
|
|
|
|
|
|
};
|
|
|
|
|
|
};
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-03 12:51:54 +03:00
|
|
|
|
export interface Lwm2mDeviceProfileTransportConfiguration {
|
|
|
|
|
|
[key: string]: any;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export type DeviceProfileTransportConfigurations = DefaultDeviceProfileTransportConfiguration &
|
|
|
|
|
|
MqttDeviceProfileTransportConfiguration &
|
2021-03-15 18:18:45 +02:00
|
|
|
|
CoapDeviceProfileTransportConfiguration &
|
2020-09-03 12:51:54 +03:00
|
|
|
|
Lwm2mDeviceProfileTransportConfiguration;
|
|
|
|
|
|
|
|
|
|
|
|
export interface DeviceProfileTransportConfiguration extends DeviceProfileTransportConfigurations {
|
|
|
|
|
|
type: DeviceTransportType;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-10-04 00:05:52 +03:00
|
|
|
|
export interface DeviceProvisionConfiguration {
|
|
|
|
|
|
type: DeviceProvisionType;
|
|
|
|
|
|
provisionDeviceSecret?: string;
|
|
|
|
|
|
provisionDeviceKey?: string;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-02 18:32:57 +03:00
|
|
|
|
export function createDeviceProfileConfiguration(type: DeviceProfileType): DeviceProfileConfiguration {
|
|
|
|
|
|
let configuration: DeviceProfileConfiguration = null;
|
|
|
|
|
|
if (type) {
|
|
|
|
|
|
switch (type) {
|
|
|
|
|
|
case DeviceProfileType.DEFAULT:
|
|
|
|
|
|
const defaultConfiguration: DefaultDeviceProfileConfiguration = {};
|
|
|
|
|
|
configuration = {...defaultConfiguration, type: DeviceProfileType.DEFAULT};
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
return configuration;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-03 14:14:46 +03:00
|
|
|
|
export function createDeviceConfiguration(type: DeviceProfileType): DeviceConfiguration {
|
|
|
|
|
|
let configuration: DeviceConfiguration = null;
|
|
|
|
|
|
if (type) {
|
|
|
|
|
|
switch (type) {
|
|
|
|
|
|
case DeviceProfileType.DEFAULT:
|
|
|
|
|
|
const defaultConfiguration: DefaultDeviceConfiguration = {};
|
|
|
|
|
|
configuration = {...defaultConfiguration, type: DeviceProfileType.DEFAULT};
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
return configuration;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-03 12:51:54 +03:00
|
|
|
|
export function createDeviceProfileTransportConfiguration(type: DeviceTransportType): DeviceProfileTransportConfiguration {
|
|
|
|
|
|
let transportConfiguration: DeviceProfileTransportConfiguration = null;
|
|
|
|
|
|
if (type) {
|
|
|
|
|
|
switch (type) {
|
|
|
|
|
|
case DeviceTransportType.DEFAULT:
|
|
|
|
|
|
const defaultTransportConfiguration: DefaultDeviceProfileTransportConfiguration = {};
|
|
|
|
|
|
transportConfiguration = {...defaultTransportConfiguration, type: DeviceTransportType.DEFAULT};
|
|
|
|
|
|
break;
|
|
|
|
|
|
case DeviceTransportType.MQTT:
|
2020-09-04 15:15:09 +03:00
|
|
|
|
const mqttTransportConfiguration: MqttDeviceProfileTransportConfiguration = {
|
|
|
|
|
|
deviceTelemetryTopic: 'v1/devices/me/telemetry',
|
2020-10-02 11:31:27 +03:00
|
|
|
|
deviceAttributesTopic: 'v1/devices/me/attributes',
|
2021-03-15 18:18:45 +02:00
|
|
|
|
transportPayloadTypeConfiguration: {transportPayloadType: TransportPayloadType.JSON}
|
2020-09-04 15:15:09 +03:00
|
|
|
|
};
|
2020-09-03 12:51:54 +03:00
|
|
|
|
transportConfiguration = {...mqttTransportConfiguration, type: DeviceTransportType.MQTT};
|
|
|
|
|
|
break;
|
2021-03-15 18:18:45 +02:00
|
|
|
|
case DeviceTransportType.COAP:
|
|
|
|
|
|
const coapTransportConfiguration: CoapDeviceProfileTransportConfiguration = {
|
2021-03-19 12:16:43 +02:00
|
|
|
|
coapDeviceTypeConfiguration: {coapDeviceType: CoapTransportDeviceType.DEFAULT,
|
|
|
|
|
|
transportPayloadTypeConfiguration: {transportPayloadType: TransportPayloadType.JSON}}
|
2021-03-15 18:18:45 +02:00
|
|
|
|
};
|
|
|
|
|
|
transportConfiguration = {...coapTransportConfiguration, type: DeviceTransportType.COAP};
|
|
|
|
|
|
break;
|
Develop/lwm2m (#3826)
* LwM2M - Start transport
* LwM2M - Test endpoint
* LwM2M - Test endpoint
* LwM2M - Test add xml
* LwM2M device registration
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M implementation
* LwM2M - add to service telemetry and attribute
* LwM2M add to service attribute and telemetry
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add transport.process
* LwM2M - delete from yml tenantid, PSK -ok
* LwM2M - yml del tenantId
* LwM2M - add RPK
* LwM2M - add connect only x509 certificate. Crate certificates in serverKeyStore.jks and clientKeyStore.jks
* LwM2M - add no_sec
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add read JKS from file
* LwM2M - add read JKS from file
* LwM2M - add bootstrap cert
* LwM2M - add bootstrap RPK
* LwM2M - add bootstrap No_sec
* LwM2M - cleaned the code
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - fix bug CoAP transport
* LwM2M: UI - add Json to credentials
* LwM2M: Back - add command "/3/0/5" - trigger client
* LwM2M: fix bug Json edit dialog
* LwM2M: fix bug Json edit dialog
* lwm2m: fix bug Json edit dialog: add validate
* lwm2m: UI add tabs
* lwm2m: UI add tabs (cleaner)
* lwm2m: add interface SecurityConfigModels
* lwm2m: add interface SecurityConfigModels2
* lwm2m: change html
* lwm2m: UI add bootstrap component
* lwm2m: UI add bootstrap component with FormControl
* lwm2m: UI add start Observe
* lwm2m: UI - correct
* lwm2m: UI - correct
* lwm2m: UI - add Validator: BS RPK, X509
* lwm2m: UI - add Observe
* lwm2m: UI - finish Observe
* lwm2m: UI - fix bug config-service update identity
* lwm2m: Bootstarp&Sewrver All config secure
* lwm2m: Bootstarp&Sewrver All config secure for new Front format
* lwm2m: Bootstarp&Sewrver Different config secure for new Front format
* lwm2m: Add attributes Gui and Backend
* lwm2m: Add attributes Gui and Backend final
* lwm2m: Add telemetrys to Gui
* lwm2m: Add Attribute & telemetry in Gui to instance
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry for mobile
* lwm2m: Model folder
* lwm2m: Ok on AWS: NoSec, PSK, X509
bad registration - RPK
* lwm2m: KeyStore start only one
* lwm2m: Server observe ok
* lwm2m: Server fix bug finish session without remove
* lwm2m: Server add function installValue
* lwm2m: Server add function getAttrTelemetry to tingsboard
* lwm2m: Server add function installValue
* lwm2m: Server add function update Telemetry, Attr from observe
* lwm2m: Server add comments
* lwm2m: Server add session listener
* lwm2m: Server add onGetChangeCredentials with analyze
* lwm2m: Server add onGetChangeCredentials with analyze Onserve add
* lwm2m: Server: updated algorithm for analyzing dynamic changes in attributes / telemetry / observation
* lwm2m: fix bug: "ngx-flowchart" compile
* lwm2m: get value resource OPAQUE - byte [] to HexString
* lwm2m: change path to base
* lwm2m: fix bug COAP & lwm2m
* Lwm2m_3_2: back: cleaner, test bootstrap-ok front: restore
* Lwm2m_3_2: back: del SynchronousRegistrationListener.java
* Lwm2m_3_2: front: start profile lwm2m UI
* Lwm2m_3_2: front&back: add to profile lwm2m (api, getModels...)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (2)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (3)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (4)
* Lwm2m_3_2: front: add update change bootstrapConfig and save to config json
* Lwm2m_3_2: update after merge master
* lwm2m: fix bug proto
* lwm2m: fix bug in yml keyStore.jks
* lwm2m: fix bug tests
* lwm2m: front: add nameThingsboard
* lwm2m: fix bug Autowired lwm2mContext, caseCamel
* lwm2m: back-end^ start api /lwm2m/deviceProfile/bootstrap
* lwm2m: back-end: add method read models from resources
* lwm2m: back-end/front: add and finish api bootstrapConfig
* lwm2m: back-end: add decode profile
* lwm2m: back-end: add new bin in transport api
* lwm2m: add microservice lwm2m and docker lwm2m.
* lwm2m: add microservice lwm2m and docker lwm2m (fix bug)
* lwm2m: front: start fix bug disabled resources
* lwm2m: master to lwm2m merge, front add change attribute, telemetry
* lwm2m: front PR
* lwm2m: front add sort keyName to Json on the start
* lwm2m: front add instances
* lwm2m: front add/del instances FormGrp Value
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
# Conflicts:
# common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
# common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
# ui-ngx/src/app/modules/home/components/home-components.module.ts
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
* lwm2m: Front: del sort after add/del instance
* lwm2m: Front: fix bug reindex FormArray after update
* Lwm2m: Front fix bug add/del instans
* Lwm2m: Front finish1 profile
* Lwm2m: Back add profile to ModelClient
* Lwm2m: Back add form profile sent thingsboard: attr/tel/observe
* Lwm2m: Back -> fix bug: serverKeyStore.jks] Unable to load KeyStore files server
* Lwm2m: Back -> fix bug: onRegistered an unReg
* Lwm2m: Back -> add updateProfiles
* Lwm2m: Back -> add updateDevice and updateProfile dynamic
* Lwm2m: Back -> error if CoapCode not access
* Lwm2m: Front -> clear credential
* Lwm2m: Front -> credential fix bug button "save"
* Lwm2m: Back -> add telemetry logLwm2m
Co-authored-by: nickAS21 <nick@avalr.com.ua>
2020-12-09 17:13:11 +02:00
|
|
|
|
case DeviceTransportType.LWM2M:
|
2020-09-03 12:51:54 +03:00
|
|
|
|
const lwm2mTransportConfiguration: Lwm2mDeviceProfileTransportConfiguration = {};
|
|
|
|
|
|
transportConfiguration = {...lwm2mTransportConfiguration, type: DeviceTransportType.LWM2M};
|
Develop/lwm2m (#3826)
* LwM2M - Start transport
* LwM2M - Test endpoint
* LwM2M - Test endpoint
* LwM2M - Test add xml
* LwM2M device registration
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M implementation
* LwM2M - add to service telemetry and attribute
* LwM2M add to service attribute and telemetry
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add transport.process
* LwM2M - delete from yml tenantid, PSK -ok
* LwM2M - yml del tenantId
* LwM2M - add RPK
* LwM2M - add connect only x509 certificate. Crate certificates in serverKeyStore.jks and clientKeyStore.jks
* LwM2M - add no_sec
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add read JKS from file
* LwM2M - add read JKS from file
* LwM2M - add bootstrap cert
* LwM2M - add bootstrap RPK
* LwM2M - add bootstrap No_sec
* LwM2M - cleaned the code
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - fix bug CoAP transport
* LwM2M: UI - add Json to credentials
* LwM2M: Back - add command "/3/0/5" - trigger client
* LwM2M: fix bug Json edit dialog
* LwM2M: fix bug Json edit dialog
* lwm2m: fix bug Json edit dialog: add validate
* lwm2m: UI add tabs
* lwm2m: UI add tabs (cleaner)
* lwm2m: add interface SecurityConfigModels
* lwm2m: add interface SecurityConfigModels2
* lwm2m: change html
* lwm2m: UI add bootstrap component
* lwm2m: UI add bootstrap component with FormControl
* lwm2m: UI add start Observe
* lwm2m: UI - correct
* lwm2m: UI - correct
* lwm2m: UI - add Validator: BS RPK, X509
* lwm2m: UI - add Observe
* lwm2m: UI - finish Observe
* lwm2m: UI - fix bug config-service update identity
* lwm2m: Bootstarp&Sewrver All config secure
* lwm2m: Bootstarp&Sewrver All config secure for new Front format
* lwm2m: Bootstarp&Sewrver Different config secure for new Front format
* lwm2m: Add attributes Gui and Backend
* lwm2m: Add attributes Gui and Backend final
* lwm2m: Add telemetrys to Gui
* lwm2m: Add Attribute & telemetry in Gui to instance
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry for mobile
* lwm2m: Model folder
* lwm2m: Ok on AWS: NoSec, PSK, X509
bad registration - RPK
* lwm2m: KeyStore start only one
* lwm2m: Server observe ok
* lwm2m: Server fix bug finish session without remove
* lwm2m: Server add function installValue
* lwm2m: Server add function getAttrTelemetry to tingsboard
* lwm2m: Server add function installValue
* lwm2m: Server add function update Telemetry, Attr from observe
* lwm2m: Server add comments
* lwm2m: Server add session listener
* lwm2m: Server add onGetChangeCredentials with analyze
* lwm2m: Server add onGetChangeCredentials with analyze Onserve add
* lwm2m: Server: updated algorithm for analyzing dynamic changes in attributes / telemetry / observation
* lwm2m: fix bug: "ngx-flowchart" compile
* lwm2m: get value resource OPAQUE - byte [] to HexString
* lwm2m: change path to base
* lwm2m: fix bug COAP & lwm2m
* Lwm2m_3_2: back: cleaner, test bootstrap-ok front: restore
* Lwm2m_3_2: back: del SynchronousRegistrationListener.java
* Lwm2m_3_2: front: start profile lwm2m UI
* Lwm2m_3_2: front&back: add to profile lwm2m (api, getModels...)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (2)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (3)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (4)
* Lwm2m_3_2: front: add update change bootstrapConfig and save to config json
* Lwm2m_3_2: update after merge master
* lwm2m: fix bug proto
* lwm2m: fix bug in yml keyStore.jks
* lwm2m: fix bug tests
* lwm2m: front: add nameThingsboard
* lwm2m: fix bug Autowired lwm2mContext, caseCamel
* lwm2m: back-end^ start api /lwm2m/deviceProfile/bootstrap
* lwm2m: back-end: add method read models from resources
* lwm2m: back-end/front: add and finish api bootstrapConfig
* lwm2m: back-end: add decode profile
* lwm2m: back-end: add new bin in transport api
* lwm2m: add microservice lwm2m and docker lwm2m.
* lwm2m: add microservice lwm2m and docker lwm2m (fix bug)
* lwm2m: front: start fix bug disabled resources
* lwm2m: master to lwm2m merge, front add change attribute, telemetry
* lwm2m: front PR
* lwm2m: front add sort keyName to Json on the start
* lwm2m: front add instances
* lwm2m: front add/del instances FormGrp Value
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
# Conflicts:
# common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
# common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
# ui-ngx/src/app/modules/home/components/home-components.module.ts
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
* lwm2m: Front: del sort after add/del instance
* lwm2m: Front: fix bug reindex FormArray after update
* Lwm2m: Front fix bug add/del instans
* Lwm2m: Front finish1 profile
* Lwm2m: Back add profile to ModelClient
* Lwm2m: Back add form profile sent thingsboard: attr/tel/observe
* Lwm2m: Back -> fix bug: serverKeyStore.jks] Unable to load KeyStore files server
* Lwm2m: Back -> fix bug: onRegistered an unReg
* Lwm2m: Back -> add updateProfiles
* Lwm2m: Back -> add updateDevice and updateProfile dynamic
* Lwm2m: Back -> error if CoapCode not access
* Lwm2m: Front -> clear credential
* Lwm2m: Front -> credential fix bug button "save"
* Lwm2m: Back -> add telemetry logLwm2m
Co-authored-by: nickAS21 <nick@avalr.com.ua>
2020-12-09 17:13:11 +02:00
|
|
|
|
break;
|
2020-09-03 12:51:54 +03:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
return transportConfiguration;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-03 14:14:46 +03:00
|
|
|
|
export function createDeviceTransportConfiguration(type: DeviceTransportType): DeviceTransportConfiguration {
|
|
|
|
|
|
let transportConfiguration: DeviceTransportConfiguration = null;
|
|
|
|
|
|
if (type) {
|
|
|
|
|
|
switch (type) {
|
|
|
|
|
|
case DeviceTransportType.DEFAULT:
|
|
|
|
|
|
const defaultTransportConfiguration: DefaultDeviceTransportConfiguration = {};
|
|
|
|
|
|
transportConfiguration = {...defaultTransportConfiguration, type: DeviceTransportType.DEFAULT};
|
|
|
|
|
|
break;
|
|
|
|
|
|
case DeviceTransportType.MQTT:
|
|
|
|
|
|
const mqttTransportConfiguration: MqttDeviceTransportConfiguration = {};
|
|
|
|
|
|
transportConfiguration = {...mqttTransportConfiguration, type: DeviceTransportType.MQTT};
|
|
|
|
|
|
break;
|
2021-03-15 18:18:45 +02:00
|
|
|
|
case DeviceTransportType.COAP:
|
|
|
|
|
|
const coapTransportConfiguration: CoapDeviceTransportConfiguration = {};
|
|
|
|
|
|
transportConfiguration = {...coapTransportConfiguration, type: DeviceTransportType.COAP};
|
|
|
|
|
|
break;
|
Develop/lwm2m (#3826)
* LwM2M - Start transport
* LwM2M - Test endpoint
* LwM2M - Test endpoint
* LwM2M - Test add xml
* LwM2M device registration
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M implementation
* LwM2M - add to service telemetry and attribute
* LwM2M add to service attribute and telemetry
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add transport.process
* LwM2M - delete from yml tenantid, PSK -ok
* LwM2M - yml del tenantId
* LwM2M - add RPK
* LwM2M - add connect only x509 certificate. Crate certificates in serverKeyStore.jks and clientKeyStore.jks
* LwM2M - add no_sec
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add read JKS from file
* LwM2M - add read JKS from file
* LwM2M - add bootstrap cert
* LwM2M - add bootstrap RPK
* LwM2M - add bootstrap No_sec
* LwM2M - cleaned the code
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - fix bug CoAP transport
* LwM2M: UI - add Json to credentials
* LwM2M: Back - add command "/3/0/5" - trigger client
* LwM2M: fix bug Json edit dialog
* LwM2M: fix bug Json edit dialog
* lwm2m: fix bug Json edit dialog: add validate
* lwm2m: UI add tabs
* lwm2m: UI add tabs (cleaner)
* lwm2m: add interface SecurityConfigModels
* lwm2m: add interface SecurityConfigModels2
* lwm2m: change html
* lwm2m: UI add bootstrap component
* lwm2m: UI add bootstrap component with FormControl
* lwm2m: UI add start Observe
* lwm2m: UI - correct
* lwm2m: UI - correct
* lwm2m: UI - add Validator: BS RPK, X509
* lwm2m: UI - add Observe
* lwm2m: UI - finish Observe
* lwm2m: UI - fix bug config-service update identity
* lwm2m: Bootstarp&Sewrver All config secure
* lwm2m: Bootstarp&Sewrver All config secure for new Front format
* lwm2m: Bootstarp&Sewrver Different config secure for new Front format
* lwm2m: Add attributes Gui and Backend
* lwm2m: Add attributes Gui and Backend final
* lwm2m: Add telemetrys to Gui
* lwm2m: Add Attribute & telemetry in Gui to instance
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry for mobile
* lwm2m: Model folder
* lwm2m: Ok on AWS: NoSec, PSK, X509
bad registration - RPK
* lwm2m: KeyStore start only one
* lwm2m: Server observe ok
* lwm2m: Server fix bug finish session without remove
* lwm2m: Server add function installValue
* lwm2m: Server add function getAttrTelemetry to tingsboard
* lwm2m: Server add function installValue
* lwm2m: Server add function update Telemetry, Attr from observe
* lwm2m: Server add comments
* lwm2m: Server add session listener
* lwm2m: Server add onGetChangeCredentials with analyze
* lwm2m: Server add onGetChangeCredentials with analyze Onserve add
* lwm2m: Server: updated algorithm for analyzing dynamic changes in attributes / telemetry / observation
* lwm2m: fix bug: "ngx-flowchart" compile
* lwm2m: get value resource OPAQUE - byte [] to HexString
* lwm2m: change path to base
* lwm2m: fix bug COAP & lwm2m
* Lwm2m_3_2: back: cleaner, test bootstrap-ok front: restore
* Lwm2m_3_2: back: del SynchronousRegistrationListener.java
* Lwm2m_3_2: front: start profile lwm2m UI
* Lwm2m_3_2: front&back: add to profile lwm2m (api, getModels...)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (2)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (3)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (4)
* Lwm2m_3_2: front: add update change bootstrapConfig and save to config json
* Lwm2m_3_2: update after merge master
* lwm2m: fix bug proto
* lwm2m: fix bug in yml keyStore.jks
* lwm2m: fix bug tests
* lwm2m: front: add nameThingsboard
* lwm2m: fix bug Autowired lwm2mContext, caseCamel
* lwm2m: back-end^ start api /lwm2m/deviceProfile/bootstrap
* lwm2m: back-end: add method read models from resources
* lwm2m: back-end/front: add and finish api bootstrapConfig
* lwm2m: back-end: add decode profile
* lwm2m: back-end: add new bin in transport api
* lwm2m: add microservice lwm2m and docker lwm2m.
* lwm2m: add microservice lwm2m and docker lwm2m (fix bug)
* lwm2m: front: start fix bug disabled resources
* lwm2m: master to lwm2m merge, front add change attribute, telemetry
* lwm2m: front PR
* lwm2m: front add sort keyName to Json on the start
* lwm2m: front add instances
* lwm2m: front add/del instances FormGrp Value
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
# Conflicts:
# common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
# common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
# ui-ngx/src/app/modules/home/components/home-components.module.ts
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
* lwm2m: Front: del sort after add/del instance
* lwm2m: Front: fix bug reindex FormArray after update
* Lwm2m: Front fix bug add/del instans
* Lwm2m: Front finish1 profile
* Lwm2m: Back add profile to ModelClient
* Lwm2m: Back add form profile sent thingsboard: attr/tel/observe
* Lwm2m: Back -> fix bug: serverKeyStore.jks] Unable to load KeyStore files server
* Lwm2m: Back -> fix bug: onRegistered an unReg
* Lwm2m: Back -> add updateProfiles
* Lwm2m: Back -> add updateDevice and updateProfile dynamic
* Lwm2m: Back -> error if CoapCode not access
* Lwm2m: Front -> clear credential
* Lwm2m: Front -> credential fix bug button "save"
* Lwm2m: Back -> add telemetry logLwm2m
Co-authored-by: nickAS21 <nick@avalr.com.ua>
2020-12-09 17:13:11 +02:00
|
|
|
|
case DeviceTransportType.LWM2M:
|
2020-09-03 14:14:46 +03:00
|
|
|
|
const lwm2mTransportConfiguration: Lwm2mDeviceTransportConfiguration = {};
|
|
|
|
|
|
transportConfiguration = {...lwm2mTransportConfiguration, type: DeviceTransportType.LWM2M};
|
Develop/lwm2m (#3826)
* LwM2M - Start transport
* LwM2M - Test endpoint
* LwM2M - Test endpoint
* LwM2M - Test add xml
* LwM2M device registration
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M implementation
* LwM2M - add to service telemetry and attribute
* LwM2M add to service attribute and telemetry
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add transport.process
* LwM2M - delete from yml tenantid, PSK -ok
* LwM2M - yml del tenantId
* LwM2M - add RPK
* LwM2M - add connect only x509 certificate. Crate certificates in serverKeyStore.jks and clientKeyStore.jks
* LwM2M - add no_sec
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add read JKS from file
* LwM2M - add read JKS from file
* LwM2M - add bootstrap cert
* LwM2M - add bootstrap RPK
* LwM2M - add bootstrap No_sec
* LwM2M - cleaned the code
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - fix bug CoAP transport
* LwM2M: UI - add Json to credentials
* LwM2M: Back - add command "/3/0/5" - trigger client
* LwM2M: fix bug Json edit dialog
* LwM2M: fix bug Json edit dialog
* lwm2m: fix bug Json edit dialog: add validate
* lwm2m: UI add tabs
* lwm2m: UI add tabs (cleaner)
* lwm2m: add interface SecurityConfigModels
* lwm2m: add interface SecurityConfigModels2
* lwm2m: change html
* lwm2m: UI add bootstrap component
* lwm2m: UI add bootstrap component with FormControl
* lwm2m: UI add start Observe
* lwm2m: UI - correct
* lwm2m: UI - correct
* lwm2m: UI - add Validator: BS RPK, X509
* lwm2m: UI - add Observe
* lwm2m: UI - finish Observe
* lwm2m: UI - fix bug config-service update identity
* lwm2m: Bootstarp&Sewrver All config secure
* lwm2m: Bootstarp&Sewrver All config secure for new Front format
* lwm2m: Bootstarp&Sewrver Different config secure for new Front format
* lwm2m: Add attributes Gui and Backend
* lwm2m: Add attributes Gui and Backend final
* lwm2m: Add telemetrys to Gui
* lwm2m: Add Attribute & telemetry in Gui to instance
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry for mobile
* lwm2m: Model folder
* lwm2m: Ok on AWS: NoSec, PSK, X509
bad registration - RPK
* lwm2m: KeyStore start only one
* lwm2m: Server observe ok
* lwm2m: Server fix bug finish session without remove
* lwm2m: Server add function installValue
* lwm2m: Server add function getAttrTelemetry to tingsboard
* lwm2m: Server add function installValue
* lwm2m: Server add function update Telemetry, Attr from observe
* lwm2m: Server add comments
* lwm2m: Server add session listener
* lwm2m: Server add onGetChangeCredentials with analyze
* lwm2m: Server add onGetChangeCredentials with analyze Onserve add
* lwm2m: Server: updated algorithm for analyzing dynamic changes in attributes / telemetry / observation
* lwm2m: fix bug: "ngx-flowchart" compile
* lwm2m: get value resource OPAQUE - byte [] to HexString
* lwm2m: change path to base
* lwm2m: fix bug COAP & lwm2m
* Lwm2m_3_2: back: cleaner, test bootstrap-ok front: restore
* Lwm2m_3_2: back: del SynchronousRegistrationListener.java
* Lwm2m_3_2: front: start profile lwm2m UI
* Lwm2m_3_2: front&back: add to profile lwm2m (api, getModels...)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (2)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (3)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (4)
* Lwm2m_3_2: front: add update change bootstrapConfig and save to config json
* Lwm2m_3_2: update after merge master
* lwm2m: fix bug proto
* lwm2m: fix bug in yml keyStore.jks
* lwm2m: fix bug tests
* lwm2m: front: add nameThingsboard
* lwm2m: fix bug Autowired lwm2mContext, caseCamel
* lwm2m: back-end^ start api /lwm2m/deviceProfile/bootstrap
* lwm2m: back-end: add method read models from resources
* lwm2m: back-end/front: add and finish api bootstrapConfig
* lwm2m: back-end: add decode profile
* lwm2m: back-end: add new bin in transport api
* lwm2m: add microservice lwm2m and docker lwm2m.
* lwm2m: add microservice lwm2m and docker lwm2m (fix bug)
* lwm2m: front: start fix bug disabled resources
* lwm2m: master to lwm2m merge, front add change attribute, telemetry
* lwm2m: front PR
* lwm2m: front add sort keyName to Json on the start
* lwm2m: front add instances
* lwm2m: front add/del instances FormGrp Value
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
# Conflicts:
# common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
# common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
# ui-ngx/src/app/modules/home/components/home-components.module.ts
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
* lwm2m: Front: del sort after add/del instance
* lwm2m: Front: fix bug reindex FormArray after update
* Lwm2m: Front fix bug add/del instans
* Lwm2m: Front finish1 profile
* Lwm2m: Back add profile to ModelClient
* Lwm2m: Back add form profile sent thingsboard: attr/tel/observe
* Lwm2m: Back -> fix bug: serverKeyStore.jks] Unable to load KeyStore files server
* Lwm2m: Back -> fix bug: onRegistered an unReg
* Lwm2m: Back -> add updateProfiles
* Lwm2m: Back -> add updateDevice and updateProfile dynamic
* Lwm2m: Back -> error if CoapCode not access
* Lwm2m: Front -> clear credential
* Lwm2m: Front -> credential fix bug button "save"
* Lwm2m: Back -> add telemetry logLwm2m
Co-authored-by: nickAS21 <nick@avalr.com.ua>
2020-12-09 17:13:11 +02:00
|
|
|
|
break;
|
2020-09-03 14:14:46 +03:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
return transportConfiguration;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-10-05 18:18:46 +03:00
|
|
|
|
export enum AlarmConditionType {
|
|
|
|
|
|
SIMPLE = 'SIMPLE',
|
|
|
|
|
|
DURATION = 'DURATION',
|
|
|
|
|
|
REPEATING = 'REPEATING'
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export const AlarmConditionTypeTranslationMap = new Map<AlarmConditionType, string>(
|
|
|
|
|
|
[
|
|
|
|
|
|
[AlarmConditionType.SIMPLE, 'device-profile.condition-type-simple'],
|
|
|
|
|
|
[AlarmConditionType.DURATION, 'device-profile.condition-type-duration'],
|
|
|
|
|
|
[AlarmConditionType.REPEATING, 'device-profile.condition-type-repeating']
|
|
|
|
|
|
]
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
export interface AlarmConditionSpec{
|
|
|
|
|
|
type?: AlarmConditionType;
|
|
|
|
|
|
unit?: TimeUnit;
|
|
|
|
|
|
value?: number;
|
|
|
|
|
|
count?: number;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-09 18:27:28 +03:00
|
|
|
|
export interface AlarmCondition {
|
|
|
|
|
|
condition: Array<KeyFilter>;
|
2020-10-05 18:18:46 +03:00
|
|
|
|
spec?: AlarmConditionSpec;
|
2020-09-09 18:27:28 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
2020-10-06 19:22:40 +03:00
|
|
|
|
export enum AlarmScheduleType {
|
|
|
|
|
|
ANY_TIME = 'ANY_TIME',
|
|
|
|
|
|
SPECIFIC_TIME = 'SPECIFIC_TIME',
|
|
|
|
|
|
CUSTOM = 'CUSTOM'
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export const AlarmScheduleTypeTranslationMap = new Map<AlarmScheduleType, string>(
|
|
|
|
|
|
[
|
|
|
|
|
|
[AlarmScheduleType.ANY_TIME, 'device-profile.schedule-any-time'],
|
|
|
|
|
|
[AlarmScheduleType.SPECIFIC_TIME, 'device-profile.schedule-specific-time'],
|
|
|
|
|
|
[AlarmScheduleType.CUSTOM, 'device-profile.schedule-custom']
|
|
|
|
|
|
]
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
export interface AlarmSchedule{
|
|
|
|
|
|
type: AlarmScheduleType;
|
|
|
|
|
|
timezone?: string;
|
|
|
|
|
|
daysOfWeek?: number[];
|
|
|
|
|
|
startsOn?: number;
|
|
|
|
|
|
endsOn?: number;
|
|
|
|
|
|
items?: CustomTimeSchedulerItem[];
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export interface CustomTimeSchedulerItem{
|
|
|
|
|
|
enabled: boolean;
|
|
|
|
|
|
dayOfWeek: number;
|
|
|
|
|
|
startsOn: number;
|
|
|
|
|
|
endsOn: number;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-09 18:27:28 +03:00
|
|
|
|
export interface AlarmRule {
|
|
|
|
|
|
condition: AlarmCondition;
|
|
|
|
|
|
alarmDetails?: string;
|
2020-10-06 19:22:40 +03:00
|
|
|
|
schedule?: AlarmSchedule;
|
2020-09-09 18:27:28 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
2020-10-14 12:32:07 +03:00
|
|
|
|
export function alarmRuleValidator(control: AbstractControl): ValidationErrors | null {
|
|
|
|
|
|
const alarmRule: AlarmRule = control.value;
|
|
|
|
|
|
return alarmRuleValid(alarmRule) ? null : {alarmRule: true};
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
function alarmRuleValid(alarmRule: AlarmRule): boolean {
|
|
|
|
|
|
if (!alarmRule || !alarmRule.condition || !alarmRule.condition.condition || !alarmRule.condition.condition.length) {
|
|
|
|
|
|
return false;
|
|
|
|
|
|
}
|
|
|
|
|
|
return true;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-09 18:27:28 +03:00
|
|
|
|
export interface DeviceProfileAlarm {
|
|
|
|
|
|
id: string;
|
|
|
|
|
|
alarmType: string;
|
|
|
|
|
|
createRules: {[severity: string]: AlarmRule};
|
|
|
|
|
|
clearRule?: AlarmRule;
|
|
|
|
|
|
propagate?: boolean;
|
|
|
|
|
|
propagateRelationTypes?: Array<string>;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-10-14 12:32:07 +03:00
|
|
|
|
export function deviceProfileAlarmValidator(control: AbstractControl): ValidationErrors | null {
|
|
|
|
|
|
const deviceProfileAlarm: DeviceProfileAlarm = control.value;
|
|
|
|
|
|
if (deviceProfileAlarm && deviceProfileAlarm.id && deviceProfileAlarm.alarmType &&
|
|
|
|
|
|
deviceProfileAlarm.createRules) {
|
|
|
|
|
|
const severities = Object.keys(deviceProfileAlarm.createRules);
|
|
|
|
|
|
if (severities.length) {
|
|
|
|
|
|
let alarmRulesValid = true;
|
|
|
|
|
|
for (const severity of severities) {
|
|
|
|
|
|
const alarmRule = deviceProfileAlarm.createRules[severity];
|
|
|
|
|
|
if (!alarmRuleValid(alarmRule)) {
|
|
|
|
|
|
alarmRulesValid = false;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
if (alarmRulesValid) {
|
|
|
|
|
|
if (deviceProfileAlarm.clearRule && !alarmRuleValid(deviceProfileAlarm.clearRule)) {
|
|
|
|
|
|
alarmRulesValid = false;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
if (alarmRulesValid) {
|
|
|
|
|
|
return null;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
return {deviceProfileAlarm: true};
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-08-26 15:00:11 +03:00
|
|
|
|
export interface DeviceProfileData {
|
|
|
|
|
|
configuration: DeviceProfileConfiguration;
|
2020-09-03 12:51:54 +03:00
|
|
|
|
transportConfiguration: DeviceProfileTransportConfiguration;
|
2020-09-09 18:27:28 +03:00
|
|
|
|
alarms?: Array<DeviceProfileAlarm>;
|
2020-10-04 00:05:52 +03:00
|
|
|
|
provisionConfiguration?: DeviceProvisionConfiguration;
|
2020-08-26 15:00:11 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export interface DeviceProfile extends BaseData<DeviceProfileId> {
|
|
|
|
|
|
tenantId?: TenantId;
|
|
|
|
|
|
name: string;
|
|
|
|
|
|
description?: string;
|
2020-09-03 14:14:46 +03:00
|
|
|
|
default?: boolean;
|
2020-08-26 15:00:11 +03:00
|
|
|
|
type: DeviceProfileType;
|
2020-09-03 12:51:54 +03:00
|
|
|
|
transportType: DeviceTransportType;
|
2020-10-04 00:05:52 +03:00
|
|
|
|
provisionType: DeviceProvisionType;
|
|
|
|
|
|
provisionDeviceKey?: string;
|
2020-08-26 15:00:11 +03:00
|
|
|
|
defaultRuleChainId?: RuleChainId;
|
2020-10-28 14:48:00 +02:00
|
|
|
|
defaultQueueName?: string;
|
2020-08-26 15:00:11 +03:00
|
|
|
|
profileData: DeviceProfileData;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export interface DeviceProfileInfo extends EntityInfoData {
|
|
|
|
|
|
type: DeviceProfileType;
|
2020-09-03 12:51:54 +03:00
|
|
|
|
transportType: DeviceTransportType;
|
2020-08-26 15:00:11 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export interface DefaultDeviceConfiguration {
|
|
|
|
|
|
[key: string]: any;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-03 12:51:54 +03:00
|
|
|
|
export type DeviceConfigurations = DefaultDeviceConfiguration;
|
2020-08-26 15:00:11 +03:00
|
|
|
|
|
|
|
|
|
|
export interface DeviceConfiguration extends DeviceConfigurations {
|
|
|
|
|
|
type: DeviceProfileType;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-03 12:51:54 +03:00
|
|
|
|
export interface DefaultDeviceTransportConfiguration {
|
|
|
|
|
|
[key: string]: any;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export interface MqttDeviceTransportConfiguration {
|
|
|
|
|
|
[key: string]: any;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2021-03-15 18:18:45 +02:00
|
|
|
|
export interface CoapDeviceTransportConfiguration {
|
|
|
|
|
|
[key: string]: any;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-03 12:51:54 +03:00
|
|
|
|
export interface Lwm2mDeviceTransportConfiguration {
|
|
|
|
|
|
[key: string]: any;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export type DeviceTransportConfigurations = DefaultDeviceTransportConfiguration &
|
|
|
|
|
|
MqttDeviceTransportConfiguration &
|
2021-03-15 18:18:45 +02:00
|
|
|
|
CoapDeviceTransportConfiguration &
|
2020-09-03 12:51:54 +03:00
|
|
|
|
Lwm2mDeviceTransportConfiguration;
|
|
|
|
|
|
|
|
|
|
|
|
export interface DeviceTransportConfiguration extends DeviceTransportConfigurations {
|
|
|
|
|
|
type: DeviceTransportType;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-08-26 15:00:11 +03:00
|
|
|
|
export interface DeviceData {
|
|
|
|
|
|
configuration: DeviceConfiguration;
|
2020-09-03 12:51:54 +03:00
|
|
|
|
transportConfiguration: DeviceTransportConfiguration;
|
2020-08-26 15:00:11 +03:00
|
|
|
|
}
|
2019-08-13 19:58:35 +03:00
|
|
|
|
|
|
|
|
|
|
export interface Device extends BaseData<DeviceId> {
|
2019-11-15 12:22:14 +02:00
|
|
|
|
tenantId?: TenantId;
|
|
|
|
|
|
customerId?: CustomerId;
|
2019-08-13 19:58:35 +03:00
|
|
|
|
name: string;
|
|
|
|
|
|
type: string;
|
2020-02-20 16:35:11 +02:00
|
|
|
|
label: string;
|
2020-08-26 19:20:58 +03:00
|
|
|
|
deviceProfileId?: DeviceProfileId;
|
|
|
|
|
|
deviceData?: DeviceData;
|
2019-08-13 19:58:35 +03:00
|
|
|
|
additionalInfo?: any;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export interface DeviceInfo extends Device {
|
|
|
|
|
|
customerTitle: string;
|
|
|
|
|
|
customerIsPublic: boolean;
|
2020-08-26 15:00:11 +03:00
|
|
|
|
deviceProfileName: string;
|
2019-08-13 19:58:35 +03:00
|
|
|
|
}
|
2019-08-14 19:55:24 +03:00
|
|
|
|
|
|
|
|
|
|
export enum DeviceCredentialsType {
|
|
|
|
|
|
ACCESS_TOKEN = 'ACCESS_TOKEN',
|
2020-09-10 15:14:37 +03:00
|
|
|
|
X509_CERTIFICATE = 'X509_CERTIFICATE',
|
Develop/lwm2m (#3826)
* LwM2M - Start transport
* LwM2M - Test endpoint
* LwM2M - Test endpoint
* LwM2M - Test add xml
* LwM2M device registration
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M implementation
* LwM2M - add to service telemetry and attribute
* LwM2M add to service attribute and telemetry
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add transport.process
* LwM2M - delete from yml tenantid, PSK -ok
* LwM2M - yml del tenantId
* LwM2M - add RPK
* LwM2M - add connect only x509 certificate. Crate certificates in serverKeyStore.jks and clientKeyStore.jks
* LwM2M - add no_sec
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add read JKS from file
* LwM2M - add read JKS from file
* LwM2M - add bootstrap cert
* LwM2M - add bootstrap RPK
* LwM2M - add bootstrap No_sec
* LwM2M - cleaned the code
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - fix bug CoAP transport
* LwM2M: UI - add Json to credentials
* LwM2M: Back - add command "/3/0/5" - trigger client
* LwM2M: fix bug Json edit dialog
* LwM2M: fix bug Json edit dialog
* lwm2m: fix bug Json edit dialog: add validate
* lwm2m: UI add tabs
* lwm2m: UI add tabs (cleaner)
* lwm2m: add interface SecurityConfigModels
* lwm2m: add interface SecurityConfigModels2
* lwm2m: change html
* lwm2m: UI add bootstrap component
* lwm2m: UI add bootstrap component with FormControl
* lwm2m: UI add start Observe
* lwm2m: UI - correct
* lwm2m: UI - correct
* lwm2m: UI - add Validator: BS RPK, X509
* lwm2m: UI - add Observe
* lwm2m: UI - finish Observe
* lwm2m: UI - fix bug config-service update identity
* lwm2m: Bootstarp&Sewrver All config secure
* lwm2m: Bootstarp&Sewrver All config secure for new Front format
* lwm2m: Bootstarp&Sewrver Different config secure for new Front format
* lwm2m: Add attributes Gui and Backend
* lwm2m: Add attributes Gui and Backend final
* lwm2m: Add telemetrys to Gui
* lwm2m: Add Attribute & telemetry in Gui to instance
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry for mobile
* lwm2m: Model folder
* lwm2m: Ok on AWS: NoSec, PSK, X509
bad registration - RPK
* lwm2m: KeyStore start only one
* lwm2m: Server observe ok
* lwm2m: Server fix bug finish session without remove
* lwm2m: Server add function installValue
* lwm2m: Server add function getAttrTelemetry to tingsboard
* lwm2m: Server add function installValue
* lwm2m: Server add function update Telemetry, Attr from observe
* lwm2m: Server add comments
* lwm2m: Server add session listener
* lwm2m: Server add onGetChangeCredentials with analyze
* lwm2m: Server add onGetChangeCredentials with analyze Onserve add
* lwm2m: Server: updated algorithm for analyzing dynamic changes in attributes / telemetry / observation
* lwm2m: fix bug: "ngx-flowchart" compile
* lwm2m: get value resource OPAQUE - byte [] to HexString
* lwm2m: change path to base
* lwm2m: fix bug COAP & lwm2m
* Lwm2m_3_2: back: cleaner, test bootstrap-ok front: restore
* Lwm2m_3_2: back: del SynchronousRegistrationListener.java
* Lwm2m_3_2: front: start profile lwm2m UI
* Lwm2m_3_2: front&back: add to profile lwm2m (api, getModels...)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (2)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (3)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (4)
* Lwm2m_3_2: front: add update change bootstrapConfig and save to config json
* Lwm2m_3_2: update after merge master
* lwm2m: fix bug proto
* lwm2m: fix bug in yml keyStore.jks
* lwm2m: fix bug tests
* lwm2m: front: add nameThingsboard
* lwm2m: fix bug Autowired lwm2mContext, caseCamel
* lwm2m: back-end^ start api /lwm2m/deviceProfile/bootstrap
* lwm2m: back-end: add method read models from resources
* lwm2m: back-end/front: add and finish api bootstrapConfig
* lwm2m: back-end: add decode profile
* lwm2m: back-end: add new bin in transport api
* lwm2m: add microservice lwm2m and docker lwm2m.
* lwm2m: add microservice lwm2m and docker lwm2m (fix bug)
* lwm2m: front: start fix bug disabled resources
* lwm2m: master to lwm2m merge, front add change attribute, telemetry
* lwm2m: front PR
* lwm2m: front add sort keyName to Json on the start
* lwm2m: front add instances
* lwm2m: front add/del instances FormGrp Value
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
# Conflicts:
# common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
# common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
# ui-ngx/src/app/modules/home/components/home-components.module.ts
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
* lwm2m: Front: del sort after add/del instance
* lwm2m: Front: fix bug reindex FormArray after update
* Lwm2m: Front fix bug add/del instans
* Lwm2m: Front finish1 profile
* Lwm2m: Back add profile to ModelClient
* Lwm2m: Back add form profile sent thingsboard: attr/tel/observe
* Lwm2m: Back -> fix bug: serverKeyStore.jks] Unable to load KeyStore files server
* Lwm2m: Back -> fix bug: onRegistered an unReg
* Lwm2m: Back -> add updateProfiles
* Lwm2m: Back -> add updateDevice and updateProfile dynamic
* Lwm2m: Back -> error if CoapCode not access
* Lwm2m: Front -> clear credential
* Lwm2m: Front -> credential fix bug button "save"
* Lwm2m: Back -> add telemetry logLwm2m
Co-authored-by: nickAS21 <nick@avalr.com.ua>
2020-12-09 17:13:11 +02:00
|
|
|
|
MQTT_BASIC = 'MQTT_BASIC',
|
|
|
|
|
|
LWM2M_CREDENTIALS = 'LWM2M_CREDENTIALS'
|
2019-08-14 19:55:24 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export const credentialTypeNames = new Map<DeviceCredentialsType, string>(
|
|
|
|
|
|
[
|
|
|
|
|
|
[DeviceCredentialsType.ACCESS_TOKEN, 'Access token'],
|
2020-09-10 15:14:37 +03:00
|
|
|
|
[DeviceCredentialsType.X509_CERTIFICATE, 'MQTT X.509'],
|
Develop/lwm2m (#3826)
* LwM2M - Start transport
* LwM2M - Test endpoint
* LwM2M - Test endpoint
* LwM2M - Test add xml
* LwM2M device registration
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M - add get from client, add attributes and telemetry upgrade from registration client
* LwM2M implementation
* LwM2M - add to service telemetry and attribute
* LwM2M add to service attribute and telemetry
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType
* LwM2M - add transport.process
* LwM2M - delete from yml tenantid, PSK -ok
* LwM2M - yml del tenantId
* LwM2M - add RPK
* LwM2M - add connect only x509 certificate. Crate certificates in serverKeyStore.jks and clientKeyStore.jks
* LwM2M - add no_sec
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add RPK & PSK integration test with app Client
* LwM2M - add read JKS from file
* LwM2M - add read JKS from file
* LwM2M - add bootstrap cert
* LwM2M - add bootstrap RPK
* LwM2M - add bootstrap No_sec
* LwM2M - cleaned the code
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - add to 3.0 in UI credentials lwm2m
* LwM2M - fix bug CoAP transport
* LwM2M: UI - add Json to credentials
* LwM2M: Back - add command "/3/0/5" - trigger client
* LwM2M: fix bug Json edit dialog
* LwM2M: fix bug Json edit dialog
* lwm2m: fix bug Json edit dialog: add validate
* lwm2m: UI add tabs
* lwm2m: UI add tabs (cleaner)
* lwm2m: add interface SecurityConfigModels
* lwm2m: add interface SecurityConfigModels2
* lwm2m: change html
* lwm2m: UI add bootstrap component
* lwm2m: UI add bootstrap component with FormControl
* lwm2m: UI add start Observe
* lwm2m: UI - correct
* lwm2m: UI - correct
* lwm2m: UI - add Validator: BS RPK, X509
* lwm2m: UI - add Observe
* lwm2m: UI - finish Observe
* lwm2m: UI - fix bug config-service update identity
* lwm2m: Bootstarp&Sewrver All config secure
* lwm2m: Bootstarp&Sewrver All config secure for new Front format
* lwm2m: Bootstarp&Sewrver Different config secure for new Front format
* lwm2m: Add attributes Gui and Backend
* lwm2m: Add attributes Gui and Backend final
* lwm2m: Add telemetrys to Gui
* lwm2m: Add Attribute & telemetry in Gui to instance
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry
* lwm2m: Optimize Attr/Telemetry for mobile
* lwm2m: Model folder
* lwm2m: Ok on AWS: NoSec, PSK, X509
bad registration - RPK
* lwm2m: KeyStore start only one
* lwm2m: Server observe ok
* lwm2m: Server fix bug finish session without remove
* lwm2m: Server add function installValue
* lwm2m: Server add function getAttrTelemetry to tingsboard
* lwm2m: Server add function installValue
* lwm2m: Server add function update Telemetry, Attr from observe
* lwm2m: Server add comments
* lwm2m: Server add session listener
* lwm2m: Server add onGetChangeCredentials with analyze
* lwm2m: Server add onGetChangeCredentials with analyze Onserve add
* lwm2m: Server: updated algorithm for analyzing dynamic changes in attributes / telemetry / observation
* lwm2m: fix bug: "ngx-flowchart" compile
* lwm2m: get value resource OPAQUE - byte [] to HexString
* lwm2m: change path to base
* lwm2m: fix bug COAP & lwm2m
* Lwm2m_3_2: back: cleaner, test bootstrap-ok front: restore
* Lwm2m_3_2: back: del SynchronousRegistrationListener.java
* Lwm2m_3_2: front: start profile lwm2m UI
* Lwm2m_3_2: front&back: add to profile lwm2m (api, getModels...)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (2)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (3)
* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (4)
* Lwm2m_3_2: front: add update change bootstrapConfig and save to config json
* Lwm2m_3_2: update after merge master
* lwm2m: fix bug proto
* lwm2m: fix bug in yml keyStore.jks
* lwm2m: fix bug tests
* lwm2m: front: add nameThingsboard
* lwm2m: fix bug Autowired lwm2mContext, caseCamel
* lwm2m: back-end^ start api /lwm2m/deviceProfile/bootstrap
* lwm2m: back-end: add method read models from resources
* lwm2m: back-end/front: add and finish api bootstrapConfig
* lwm2m: back-end: add decode profile
* lwm2m: back-end: add new bin in transport api
* lwm2m: add microservice lwm2m and docker lwm2m.
* lwm2m: add microservice lwm2m and docker lwm2m (fix bug)
* lwm2m: front: start fix bug disabled resources
* lwm2m: master to lwm2m merge, front add change attribute, telemetry
* lwm2m: front PR
* lwm2m: front add sort keyName to Json on the start
* lwm2m: front add instances
* lwm2m: front add/del instances FormGrp Value
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
# Conflicts:
# common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
# common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
# ui-ngx/src/app/modules/home/components/home-components.module.ts
* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
* lwm2m: Front: del sort after add/del instance
* lwm2m: Front: fix bug reindex FormArray after update
* Lwm2m: Front fix bug add/del instans
* Lwm2m: Front finish1 profile
* Lwm2m: Back add profile to ModelClient
* Lwm2m: Back add form profile sent thingsboard: attr/tel/observe
* Lwm2m: Back -> fix bug: serverKeyStore.jks] Unable to load KeyStore files server
* Lwm2m: Back -> fix bug: onRegistered an unReg
* Lwm2m: Back -> add updateProfiles
* Lwm2m: Back -> add updateDevice and updateProfile dynamic
* Lwm2m: Back -> error if CoapCode not access
* Lwm2m: Front -> clear credential
* Lwm2m: Front -> credential fix bug button "save"
* Lwm2m: Back -> add telemetry logLwm2m
Co-authored-by: nickAS21 <nick@avalr.com.ua>
2020-12-09 17:13:11 +02:00
|
|
|
|
[DeviceCredentialsType.MQTT_BASIC, 'MQTT Basic'],
|
|
|
|
|
|
[DeviceCredentialsType.LWM2M_CREDENTIALS, 'LwM2M Credentials']
|
2019-08-14 19:55:24 +03:00
|
|
|
|
]
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
export interface DeviceCredentials extends BaseData<DeviceCredentialsId> {
|
|
|
|
|
|
deviceId: DeviceId;
|
|
|
|
|
|
credentialsType: DeviceCredentialsType;
|
|
|
|
|
|
credentialsId: string;
|
2020-09-10 15:37:25 +03:00
|
|
|
|
credentialsValue: string;
|
2020-09-10 15:14:37 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export interface DeviceCredentialMQTTBasic {
|
|
|
|
|
|
clientId: string;
|
|
|
|
|
|
userName: string;
|
|
|
|
|
|
password: string;
|
2019-08-14 19:55:24 +03:00
|
|
|
|
}
|
2019-10-10 13:00:29 +03:00
|
|
|
|
|
|
|
|
|
|
export interface DeviceSearchQuery extends EntitySearchQuery {
|
|
|
|
|
|
deviceTypes: Array<string>;
|
|
|
|
|
|
}
|
2020-02-21 19:04:49 +02:00
|
|
|
|
|
|
|
|
|
|
export interface ClaimRequest {
|
|
|
|
|
|
secretKey: string;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export enum ClaimResponse {
|
|
|
|
|
|
SUCCESS = 'SUCCESS',
|
|
|
|
|
|
FAILURE = 'FAILURE',
|
|
|
|
|
|
CLAIMED = 'CLAIMED'
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export interface ClaimResult {
|
2020-08-26 15:00:11 +03:00
|
|
|
|
device: Device;
|
|
|
|
|
|
response: ClaimResponse;
|
2020-02-21 19:04:49 +02:00
|
|
|
|
}
|
2020-10-12 17:29:27 +03:00
|
|
|
|
|
|
|
|
|
|
export const dayOfWeekTranslations = new Array<string>(
|
|
|
|
|
|
'device-profile.schedule-day.monday',
|
|
|
|
|
|
'device-profile.schedule-day.tuesday',
|
|
|
|
|
|
'device-profile.schedule-day.wednesday',
|
|
|
|
|
|
'device-profile.schedule-day.thursday',
|
|
|
|
|
|
'device-profile.schedule-day.friday',
|
|
|
|
|
|
'device-profile.schedule-day.saturday',
|
|
|
|
|
|
'device-profile.schedule-day.sunday'
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
export function getDayString(day: number): string {
|
|
|
|
|
|
switch (day) {
|
|
|
|
|
|
case 0:
|
|
|
|
|
|
return 'device-profile.schedule-day.monday';
|
|
|
|
|
|
case 1:
|
|
|
|
|
|
return this.translate.instant('device-profile.schedule-day.tuesday');
|
|
|
|
|
|
case 2:
|
|
|
|
|
|
return this.translate.instant('device-profile.schedule-day.wednesday');
|
|
|
|
|
|
case 3:
|
|
|
|
|
|
return this.translate.instant('device-profile.schedule-day.thursday');
|
|
|
|
|
|
case 4:
|
|
|
|
|
|
return this.translate.instant('device-profile.schedule-day.friday');
|
|
|
|
|
|
case 5:
|
|
|
|
|
|
return this.translate.instant('device-profile.schedule-day.saturday');
|
|
|
|
|
|
case 6:
|
|
|
|
|
|
return this.translate.instant('device-profile.schedule-day.sunday');
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export function timeOfDayToUTCTimestamp(date: Date | number): number {
|
|
|
|
|
|
if (typeof date === 'number' || date === null) {
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
return _moment.utc([1970, 0, 1, date.getHours(), date.getMinutes(), date.getSeconds(), 0]).valueOf();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export function utcTimestampToTimeOfDay(time = 0): Date {
|
2020-10-29 14:10:05 -04:00
|
|
|
|
return new Date(time + new Date(time).getTimezoneOffset() * 60 * 1000);
|
2020-10-12 17:29:27 +03:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
function timeOfDayToMoment(date: Date | number): _moment.Moment {
|
|
|
|
|
|
if (typeof date === 'number' || date === null) {
|
|
|
|
|
|
return _moment([1970, 0, 1, 0, 0, 0, 0]);
|
|
|
|
|
|
}
|
|
|
|
|
|
return _moment([1970, 0, 1, date.getHours(), date.getMinutes(), 0, 0]);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
export function getAlarmScheduleRangeText(startsOn: Date | number, endsOn: Date | number): string {
|
|
|
|
|
|
const start = timeOfDayToMoment(startsOn);
|
|
|
|
|
|
const end = timeOfDayToMoment(endsOn);
|
|
|
|
|
|
if (start < end) {
|
|
|
|
|
|
return `<span><span class="nowrap">${start.format('hh:mm A')}</span> – <span class="nowrap">${end.format('hh:mm A')}</span></span>`;
|
|
|
|
|
|
} else if (start.valueOf() === 0 && end.valueOf() === 0 || start.isSame(_moment([1970, 0])) && end.isSame(_moment([1970, 0]))) {
|
|
|
|
|
|
return '<span><span class="nowrap">12:00 AM</span> – <span class="nowrap">12:00 PM</span></span>';
|
|
|
|
|
|
}
|
|
|
|
|
|
return `<span><span class="nowrap">12:00 AM</span> – <span class="nowrap">${end.format('hh:mm A')}</span>` +
|
|
|
|
|
|
` and <span class="nowrap">${start.format('hh:mm A')}</span> – <span class="nowrap">12:00 PM</span></span>`;
|
|
|
|
|
|
}
|