|
|
@ -20,11 +20,20 @@ import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR, Valida |
|
|
import { coerceBooleanProperty } from '@angular/cdk/coercion'; |
|
|
import { coerceBooleanProperty } from '@angular/cdk/coercion'; |
|
|
import { |
|
|
import { |
|
|
ATTRIBUTE, |
|
|
ATTRIBUTE, |
|
|
BINDING_MODE, |
|
|
BingingMode, |
|
|
BINDING_MODE_NAMES, |
|
|
BingingModeTranslationsMap, |
|
|
|
|
|
DEFAULT_BINDING, |
|
|
DEFAULT_FW_UPDATE_RESOURCE, |
|
|
DEFAULT_FW_UPDATE_RESOURCE, |
|
|
|
|
|
DEFAULT_ID_SERVER, |
|
|
|
|
|
DEFAULT_LIFE_TIME, |
|
|
|
|
|
DEFAULT_MIN_PERIOD, |
|
|
|
|
|
DEFAULT_NOTIF_IF_DESIBLED, |
|
|
DEFAULT_SW_UPDATE_RESOURCE, |
|
|
DEFAULT_SW_UPDATE_RESOURCE, |
|
|
getDefaultProfileConfig, |
|
|
getDefaultBootstrapServerSecurityConfig, |
|
|
|
|
|
getDefaultBootstrapServersSecurityConfig, |
|
|
|
|
|
getDefaultLwM2MServerSecurityConfig, |
|
|
|
|
|
getDefaultProfileClientLwM2mSettingsConfig, |
|
|
|
|
|
getDefaultProfileObserveAttrConfig, |
|
|
Instance, |
|
|
Instance, |
|
|
INSTANCES, |
|
|
INSTANCES, |
|
|
KEY_NAME, |
|
|
KEY_NAME, |
|
|
@ -32,8 +41,11 @@ import { |
|
|
ModelValue, |
|
|
ModelValue, |
|
|
ObjectLwM2M, |
|
|
ObjectLwM2M, |
|
|
OBSERVE, |
|
|
OBSERVE, |
|
|
OBSERVE_ATTR_TELEMETRY, PowerMode, PowerModeTranslationMap, |
|
|
OBSERVE_ATTR_TELEMETRY, |
|
|
|
|
|
PowerMode, |
|
|
|
|
|
PowerModeTranslationMap, |
|
|
RESOURCES, |
|
|
RESOURCES, |
|
|
|
|
|
ServerSecurityConfig, |
|
|
TELEMETRY |
|
|
TELEMETRY |
|
|
} from './lwm2m-profile-config.models'; |
|
|
} from './lwm2m-profile-config.models'; |
|
|
import { DeviceProfileService } from '@core/http/device-profile.service'; |
|
|
import { DeviceProfileService } from '@core/http/device-profile.service'; |
|
|
@ -61,14 +73,10 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro |
|
|
private disabled = false; |
|
|
private disabled = false; |
|
|
private destroy$ = new Subject(); |
|
|
private destroy$ = new Subject(); |
|
|
|
|
|
|
|
|
bindingModeType = BINDING_MODE; |
|
|
bindingModeTypes = Object.values(BingingMode); |
|
|
bindingModeTypes = Object.keys(BINDING_MODE); |
|
|
bindingModeTypeNamesMap = BingingModeTranslationsMap; |
|
|
bindingModeTypeNamesMap = BINDING_MODE_NAMES; |
|
|
|
|
|
lwm2mDeviceProfileFormGroup: FormGroup; |
|
|
lwm2mDeviceProfileFormGroup: FormGroup; |
|
|
lwm2mDeviceConfigFormGroup: FormGroup; |
|
|
lwm2mDeviceConfigFormGroup: FormGroup; |
|
|
bootstrapServers: string; |
|
|
|
|
|
bootstrapServer: string; |
|
|
|
|
|
lwm2mServer: string; |
|
|
|
|
|
sortFunction: (key: string, value: object) => object; |
|
|
sortFunction: (key: string, value: object) => object; |
|
|
isFwUpdateStrategy: boolean; |
|
|
isFwUpdateStrategy: boolean; |
|
|
isSwUpdateStrategy: boolean; |
|
|
isSwUpdateStrategy: boolean; |
|
|
@ -92,46 +100,54 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro |
|
|
this.lwm2mDeviceProfileFormGroup = this.fb.group({ |
|
|
this.lwm2mDeviceProfileFormGroup = this.fb.group({ |
|
|
objectIds: [null, Validators.required], |
|
|
objectIds: [null, Validators.required], |
|
|
observeAttrTelemetry: [null, Validators.required], |
|
|
observeAttrTelemetry: [null, Validators.required], |
|
|
shortId: [null, Validators.required], |
|
|
bootstrap: this.fb.group({ |
|
|
lifetime: [null, Validators.required], |
|
|
servers: this.fb.group({ |
|
|
defaultMinPeriod: [null, Validators.required], |
|
|
binding: [DEFAULT_BINDING], |
|
|
notifIfDisabled: [true, []], |
|
|
shortId: [DEFAULT_ID_SERVER, [Validators.required, Validators.min(1), Validators.max(65534), Validators.pattern('[0-9]*')]], |
|
|
binding: [], |
|
|
lifetime: [DEFAULT_LIFE_TIME, [Validators.required, Validators.min(0), Validators.pattern('[0-9]*')]], |
|
|
bootstrapServer: [null, Validators.required], |
|
|
notifIfDisabled: [DEFAULT_NOTIF_IF_DESIBLED, []], |
|
|
lwm2mServer: [null, Validators.required], |
|
|
defaultMinPeriod: [DEFAULT_MIN_PERIOD, [Validators.required, Validators.min(0), Validators.pattern('[0-9]*')]], |
|
|
clientOnlyObserveAfterConnect: [1, []], |
|
|
}), |
|
|
fwUpdateStrategy: [1, []], |
|
|
bootstrapServer: [null, Validators.required], |
|
|
swUpdateStrategy: [1, []], |
|
|
lwm2mServer: [null, Validators.required] |
|
|
fwUpdateResource: [{value: '', disabled: true}, []], |
|
|
}), |
|
|
swUpdateResource: [{value: '', disabled: true}, []], |
|
|
clientLwM2mSettings: this.fb.group({ |
|
|
powerMode: [null, Validators.required] |
|
|
clientOnlyObserveAfterConnect: [1, []], |
|
|
|
|
|
fwUpdateStrategy: [1, []], |
|
|
|
|
|
swUpdateStrategy: [1, []], |
|
|
|
|
|
fwUpdateResource: [{value: '', disabled: true}, []], |
|
|
|
|
|
swUpdateResource: [{value: '', disabled: true}, []], |
|
|
|
|
|
powerMode: [null, Validators.required] |
|
|
|
|
|
}) |
|
|
}); |
|
|
}); |
|
|
this.lwm2mDeviceConfigFormGroup = this.fb.group({ |
|
|
this.lwm2mDeviceConfigFormGroup = this.fb.group({ |
|
|
configurationJson: [null, Validators.required] |
|
|
configurationJson: [null, Validators.required] |
|
|
}); |
|
|
}); |
|
|
this.lwm2mDeviceProfileFormGroup.get('fwUpdateStrategy').valueChanges.pipe( |
|
|
this.lwm2mDeviceProfileFormGroup.get('clientLwM2mSettings.fwUpdateStrategy').valueChanges.pipe( |
|
|
takeUntil(this.destroy$) |
|
|
takeUntil(this.destroy$) |
|
|
).subscribe((fwStrategy) => { |
|
|
).subscribe((fwStrategy) => { |
|
|
if (fwStrategy === 2) { |
|
|
if (fwStrategy === 2) { |
|
|
this.lwm2mDeviceProfileFormGroup.get('fwUpdateResource').enable({emitEvent: false}); |
|
|
this.lwm2mDeviceProfileFormGroup.get('clientLwM2mSettings.fwUpdateResource').enable({emitEvent: false}); |
|
|
this.lwm2mDeviceProfileFormGroup.get('fwUpdateResource').patchValue(DEFAULT_FW_UPDATE_RESOURCE, {emitEvent: false}); |
|
|
this.lwm2mDeviceProfileFormGroup.get('clientLwM2mSettings.fwUpdateResource') |
|
|
|
|
|
.patchValue(DEFAULT_FW_UPDATE_RESOURCE, {emitEvent: false}); |
|
|
this.isFwUpdateStrategy = true; |
|
|
this.isFwUpdateStrategy = true; |
|
|
} else { |
|
|
} else { |
|
|
this.lwm2mDeviceProfileFormGroup.get('fwUpdateResource').disable({emitEvent: false}); |
|
|
this.lwm2mDeviceProfileFormGroup.get('clientLwM2mSettings.fwUpdateResource').disable({emitEvent: false}); |
|
|
this.isFwUpdateStrategy = false; |
|
|
this.isFwUpdateStrategy = false; |
|
|
} |
|
|
} |
|
|
this.otaUpdateFwStrategyValidate(true); |
|
|
this.otaUpdateFwStrategyValidate(true); |
|
|
}); |
|
|
}); |
|
|
this.lwm2mDeviceProfileFormGroup.get('swUpdateStrategy').valueChanges.pipe( |
|
|
this.lwm2mDeviceProfileFormGroup.get('clientLwM2mSettings.swUpdateStrategy').valueChanges.pipe( |
|
|
takeUntil(this.destroy$) |
|
|
takeUntil(this.destroy$) |
|
|
).subscribe((swStrategy) => { |
|
|
).subscribe((swStrategy) => { |
|
|
if (swStrategy === 2) { |
|
|
if (swStrategy === 2) { |
|
|
this.lwm2mDeviceProfileFormGroup.get('swUpdateResource').enable({emitEvent: false}); |
|
|
this.lwm2mDeviceProfileFormGroup.get('clientLwM2mSettings.swUpdateResource').enable({emitEvent: false}); |
|
|
this.lwm2mDeviceProfileFormGroup.get('swUpdateResource').patchValue(DEFAULT_SW_UPDATE_RESOURCE, {emitEvent: false}); |
|
|
this.lwm2mDeviceProfileFormGroup.get('clientLwM2mSettings.swUpdateResource') |
|
|
|
|
|
.patchValue(DEFAULT_SW_UPDATE_RESOURCE, {emitEvent: false}); |
|
|
this.isSwUpdateStrategy = true; |
|
|
this.isSwUpdateStrategy = true; |
|
|
} else { |
|
|
} else { |
|
|
this.isSwUpdateStrategy = false; |
|
|
this.isSwUpdateStrategy = false; |
|
|
this.lwm2mDeviceProfileFormGroup.get('swUpdateResource').disable({emitEvent: false}); |
|
|
this.lwm2mDeviceProfileFormGroup.get('clientLwM2mSettings.swUpdateResource').disable({emitEvent: false}); |
|
|
} |
|
|
} |
|
|
this.otaUpdateSwStrategyValidate(true); |
|
|
this.otaUpdateSwStrategyValidate(true); |
|
|
}); |
|
|
}); |
|
|
@ -171,12 +187,12 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
writeValue(value: Lwm2mProfileConfigModels | null): void { |
|
|
async writeValue(value: Lwm2mProfileConfigModels | null) { |
|
|
if (isDefinedAndNotNull(value)) { |
|
|
if (isDefinedAndNotNull(value)) { |
|
|
if (Object.keys(value).length !== 0 && (value?.clientLwM2mSettings || value?.observeAttr || value?.bootstrap)) { |
|
|
if (value?.clientLwM2mSettings || value?.observeAttr || value?.bootstrap) { |
|
|
this.configurationValue = value; |
|
|
this.configurationValue = value; |
|
|
} else { |
|
|
} else { |
|
|
this.configurationValue = getDefaultProfileConfig(); |
|
|
this.configurationValue = await this.defaultProfileConfig(); |
|
|
} |
|
|
} |
|
|
this.lwm2mDeviceConfigFormGroup.patchValue({ |
|
|
this.lwm2mDeviceConfigFormGroup.patchValue({ |
|
|
configurationJson: this.configurationValue |
|
|
configurationJson: this.configurationValue |
|
|
@ -185,6 +201,29 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private async defaultProfileConfig(): Promise<Lwm2mProfileConfigModels> { |
|
|
|
|
|
let bootstrap: ServerSecurityConfig; |
|
|
|
|
|
let lwm2m: ServerSecurityConfig; |
|
|
|
|
|
try { |
|
|
|
|
|
[bootstrap, lwm2m] = await Promise.all([ |
|
|
|
|
|
this.deviceProfileService.getLwm2mBootstrapSecurityInfoBySecurityType(true).toPromise(), |
|
|
|
|
|
this.deviceProfileService.getLwm2mBootstrapSecurityInfoBySecurityType(false).toPromise() |
|
|
|
|
|
]); |
|
|
|
|
|
} catch (e) { |
|
|
|
|
|
bootstrap = getDefaultBootstrapServerSecurityConfig(); |
|
|
|
|
|
lwm2m = getDefaultLwM2MServerSecurityConfig(); |
|
|
|
|
|
} |
|
|
|
|
|
return { |
|
|
|
|
|
observeAttr: getDefaultProfileObserveAttrConfig(), |
|
|
|
|
|
bootstrap: { |
|
|
|
|
|
servers: getDefaultBootstrapServersSecurityConfig(), |
|
|
|
|
|
bootstrapServer: bootstrap, |
|
|
|
|
|
lwm2mServer: lwm2m |
|
|
|
|
|
}, |
|
|
|
|
|
clientLwM2mSettings: getDefaultProfileClientLwM2mSettingsConfig() |
|
|
|
|
|
}; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
private initWriteValue = (): void => { |
|
|
private initWriteValue = (): void => { |
|
|
const modelValue = {objectIds: [], objectsList: []} as ModelValue; |
|
|
const modelValue = {objectIds: [], objectsList: []} as ModelValue; |
|
|
modelValue.objectIds = this.getObjectsFromJsonAllConfig(); |
|
|
modelValue.objectIds = this.getObjectsFromJsonAllConfig(); |
|
|
@ -212,19 +251,15 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro |
|
|
this.lwm2mDeviceProfileFormGroup.patchValue({ |
|
|
this.lwm2mDeviceProfileFormGroup.patchValue({ |
|
|
objectIds: value, |
|
|
objectIds: value, |
|
|
observeAttrTelemetry: this.getObserveAttrTelemetryObjects(value.objectsList), |
|
|
observeAttrTelemetry: this.getObserveAttrTelemetryObjects(value.objectsList), |
|
|
shortId: this.configurationValue.bootstrap.servers.shortId, |
|
|
bootstrap: this.configurationValue.bootstrap, |
|
|
lifetime: this.configurationValue.bootstrap.servers.lifetime, |
|
|
clientLwM2mSettings: { |
|
|
defaultMinPeriod: this.configurationValue.bootstrap.servers.defaultMinPeriod, |
|
|
clientOnlyObserveAfterConnect: this.configurationValue.clientLwM2mSettings.clientOnlyObserveAfterConnect, |
|
|
notifIfDisabled: this.configurationValue.bootstrap.servers.notifIfDisabled, |
|
|
fwUpdateStrategy: this.configurationValue.clientLwM2mSettings.fwUpdateStrategy || 1, |
|
|
binding: this.configurationValue.bootstrap.servers.binding, |
|
|
swUpdateStrategy: this.configurationValue.clientLwM2mSettings.swUpdateStrategy || 1, |
|
|
bootstrapServer: this.configurationValue.bootstrap.bootstrapServer, |
|
|
fwUpdateResource: fwResource, |
|
|
lwm2mServer: this.configurationValue.bootstrap.lwm2mServer, |
|
|
swUpdateResource: swResource, |
|
|
clientOnlyObserveAfterConnect: this.configurationValue.clientLwM2mSettings.clientOnlyObserveAfterConnect, |
|
|
powerMode: this.configurationValue.clientLwM2mSettings.powerMode |
|
|
fwUpdateStrategy: this.configurationValue.clientLwM2mSettings.fwUpdateStrategy || 1, |
|
|
} |
|
|
swUpdateStrategy: this.configurationValue.clientLwM2mSettings.swUpdateStrategy || 1, |
|
|
|
|
|
fwUpdateResource: fwResource, |
|
|
|
|
|
swUpdateResource: swResource, |
|
|
|
|
|
powerMode: this.configurationValue.clientLwM2mSettings.powerMode |
|
|
|
|
|
}, |
|
|
}, |
|
|
{emitEvent: false}); |
|
|
{emitEvent: false}); |
|
|
this.configurationValue.clientLwM2mSettings.fwUpdateResource = fwResource; |
|
|
this.configurationValue.clientLwM2mSettings.fwUpdateResource = fwResource; |
|
|
@ -253,22 +288,12 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro |
|
|
private updateDeviceProfileValue(config): void { |
|
|
private updateDeviceProfileValue(config): void { |
|
|
if (this.lwm2mDeviceProfileFormGroup.valid) { |
|
|
if (this.lwm2mDeviceProfileFormGroup.valid) { |
|
|
this.updateObserveAttrTelemetryFromGroupToJson(config.observeAttrTelemetry.clientLwM2M); |
|
|
this.updateObserveAttrTelemetryFromGroupToJson(config.observeAttrTelemetry.clientLwM2M); |
|
|
this.configurationValue.bootstrap.bootstrapServer = config.bootstrapServer; |
|
|
|
|
|
this.configurationValue.bootstrap.lwm2mServer = config.lwm2mServer; |
|
|
|
|
|
const bootstrapServers = this.configurationValue.bootstrap.servers; |
|
|
|
|
|
bootstrapServers.shortId = config.shortId; |
|
|
|
|
|
bootstrapServers.lifetime = config.lifetime; |
|
|
|
|
|
bootstrapServers.defaultMinPeriod = config.defaultMinPeriod; |
|
|
|
|
|
bootstrapServers.notifIfDisabled = config.notifIfDisabled; |
|
|
|
|
|
bootstrapServers.binding = config.binding; |
|
|
|
|
|
this.configurationValue.clientLwM2mSettings.clientOnlyObserveAfterConnect = config.clientOnlyObserveAfterConnect; |
|
|
|
|
|
this.configurationValue.clientLwM2mSettings.fwUpdateStrategy = config.fwUpdateStrategy; |
|
|
|
|
|
this.configurationValue.clientLwM2mSettings.swUpdateStrategy = config.swUpdateStrategy; |
|
|
|
|
|
this.configurationValue.clientLwM2mSettings.fwUpdateResource = config.fwUpdateResource; |
|
|
|
|
|
this.configurationValue.clientLwM2mSettings.swUpdateResource = config.swUpdateResource; |
|
|
|
|
|
this.configurationValue.clientLwM2mSettings.powerMode = config.powerMode; |
|
|
|
|
|
this.upDateJsonAllConfig(); |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
this.configurationValue.bootstrap.bootstrapServer = config.bootstrap.bootstrapServer; |
|
|
|
|
|
this.configurationValue.bootstrap.lwm2mServer = config.bootstrap.lwm2mServer; |
|
|
|
|
|
this.configurationValue.bootstrap.servers = config.bootstrap.servers; |
|
|
|
|
|
this.configurationValue.clientLwM2mSettings = config.clientLwM2mSettings; |
|
|
|
|
|
this.upDateJsonAllConfig(); |
|
|
this.updateModel(); |
|
|
this.updateModel(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -544,20 +569,20 @@ export class Lwm2mDeviceProfileTransportConfigurationComponent implements Contro |
|
|
|
|
|
|
|
|
private otaUpdateFwStrategyValidate(updated = false): void { |
|
|
private otaUpdateFwStrategyValidate(updated = false): void { |
|
|
if (this.isFwUpdateStrategy) { |
|
|
if (this.isFwUpdateStrategy) { |
|
|
this.lwm2mDeviceProfileFormGroup.get('fwUpdateResource').setValidators([Validators.required]); |
|
|
this.lwm2mDeviceProfileFormGroup.get('clientLwM2mSettings.fwUpdateResource').setValidators([Validators.required]); |
|
|
} else { |
|
|
} else { |
|
|
this.lwm2mDeviceProfileFormGroup.get('fwUpdateResource').clearValidators(); |
|
|
this.lwm2mDeviceProfileFormGroup.get('clientLwM2mSettings.fwUpdateResource').clearValidators(); |
|
|
} |
|
|
} |
|
|
this.lwm2mDeviceProfileFormGroup.get('fwUpdateResource').updateValueAndValidity({emitEvent: updated}); |
|
|
this.lwm2mDeviceProfileFormGroup.get('clientLwM2mSettings.fwUpdateResource').updateValueAndValidity({emitEvent: updated}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private otaUpdateSwStrategyValidate(updated = false): void { |
|
|
private otaUpdateSwStrategyValidate(updated = false): void { |
|
|
if (this.isSwUpdateStrategy) { |
|
|
if (this.isSwUpdateStrategy) { |
|
|
this.lwm2mDeviceProfileFormGroup.get('swUpdateResource').setValidators([Validators.required]); |
|
|
this.lwm2mDeviceProfileFormGroup.get('clientLwM2mSettings.swUpdateResource').setValidators([Validators.required]); |
|
|
} else { |
|
|
} else { |
|
|
this.lwm2mDeviceProfileFormGroup.get('swUpdateResource').clearValidators(); |
|
|
this.lwm2mDeviceProfileFormGroup.get('clientLwM2mSettings.swUpdateResource').clearValidators(); |
|
|
} |
|
|
} |
|
|
this.lwm2mDeviceProfileFormGroup.get('swUpdateResource').updateValueAndValidity({emitEvent: updated}); |
|
|
this.lwm2mDeviceProfileFormGroup.get('clientLwM2mSettings.swUpdateResource').updateValueAndValidity({emitEvent: updated}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
YevhenBondarenko
5 years ago