Skip to content

Add dtls compatibility for client nodes #65

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
taubel wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Add dtls compatibility for client nodes #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
66472b0
Changed coap agent, API and coap package
taubel Jan 18, 2019
b19d971
Add support for secure client node creation
taubel Jan 18, 2019
d814829
Emit asynchronous event on dtls handshake finish
taubel Jan 18, 2019
aed8516
Use new version for coap package
taubel Feb 20, 2019
42448d2
Fix after API changes
taubel Feb 20, 2019
4da0d5c
Add PSK based DTLS support
taubel Feb 25, 2019
c704f0f
Merge branch 'master' into dev-client-tests-secure
taubel Feb 25, 2019
7e5f256
Remove leftover merge conflict output
taubel Feb 25, 2019
2fcafde
Move DTLS initialization to user scripts
taubel Feb 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions 8dev_emulate/nodes/clientNodeInstance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ function putObjectInstance(objectInstance, description) {
}

class ClientNodeInstance extends EventEmitter {
constructor(lifetime, manufacturer, model, queueMode, endpointClientName, serverURI, clientPort) {
constructor(options) {
super();

this._state = 'stopped'; // eslint-disable-line no-underscore-dangle
Expand All @@ -112,32 +112,40 @@ class ClientNodeInstance extends EventEmitter {
this.updatesIterator = {};
this.observedResources = {};
this.registrationPath = '/rd';
this.listeningPort = clientPort;
this.listeningPort = options.clientPort;
this.updatesInterval = 10; // updates interval in seconds
this.endpointClientName = endpointClientName;
this.endpointClientName = options.endpointClientName;

this.coapServer = coap.createServer({ type: 'udp6' }, (req, res) => {
this.requestListener(req, res);
});
this.coapServer.listen(clientPort);
this.coapServer.listen(options.clientPort);
this.coapAgent = new coap.Agent({
type: 'udp6',
socket: this.coapServer._sock, // eslint-disable-line no-underscore-dangle
});

this.coapAgent.on('error', (error) => {
this.emit('error', error);
});
this.coapServer.on('error', (error) => {
this.emit('error', error);
});

this.requestOptions = {
host: serverURI,
port: 5555,
host: options.serverURI,
port: options.serverPort,
method: 'POST',
confirmable: 'true',
agent: this.coapAgent,
};

this.stateListener();

this.initiateSecurityObject(serverURI);
this.initiateServerObject(lifetime, queueMode);
this.initiateSecurityObject(options.serverURI);
this.initiateServerObject(options.lifetime, options.queueMode);
this.initiateAccessControlObject();
this.initiateDeviceObject(manufacturer, model, queueMode);
this.initiateDeviceObject(options.manufacturer, options.model, options.queueMode);
this.initiateConnectivityMonitoringObject();
this.initiateFirmwareObject();
this.initiateLocationObject();
Expand Down Expand Up @@ -787,6 +795,7 @@ class ClientNodeInstance extends EventEmitter {
break;
}
case 'registered': {
this.emit('registered');
break;
}
default: {
Expand Down
16 changes: 8 additions & 8 deletions 8dev_emulate/nodes/sensorInstances.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ function humiditySensorHandle(averageHumidity = 70, fluctuation = 0.05) {
}

class Sensor3700 extends ClientNode {
constructor(lifetime, UUID, serverIP, clientPort) {
super(lifetime, '8devices', '8dev_3700', true, UUID, serverIP, clientPort);
constructor(options) {
super(options);

this.initialisePowerSourceVoltageResource();
this.initialisePowerMeasurementObject();
Expand Down Expand Up @@ -138,8 +138,8 @@ class Sensor3700 extends ClientNode {
}

class Sensor3800 extends ClientNode {
constructor(lifetime, UUID, serverIP, clientPort) {
super(lifetime, '8devices', '8dev_3800', true, UUID, serverIP, clientPort);
constructor(options) {
super(options);

this.initialisePowerSourceVoltageResource();
this.initialiseTemperatureSensorObject();
Expand Down Expand Up @@ -184,8 +184,8 @@ class Sensor3800 extends ClientNode {
}

class Sensor4400 extends ClientNode {
constructor(lifetime, UUID, serverIP, clientPort) {
super(lifetime, '8devices', '8dev_4400', true, UUID, serverIP, clientPort);
constructor(options) {
super(options);

this.initialisePowerSourceVoltageResource();
this.initialiseDigitalInputObject();
Expand Down Expand Up @@ -251,8 +251,8 @@ class Sensor4400 extends ClientNode {
}

class Sensor4500 extends ClientNode {
constructor(lifetime, UUID, serverIP, clientPort) {
super(lifetime, '8devices', '8dev_4500', true, UUID, serverIP, clientPort);
constructor(options) {
super(options);

this.initialisePowerSourceVoltageResource();
this.initialiseAnalogueInputOjbect();
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
},
"homepage": "https://github.com/8devices/restserver-api#readme",
"dependencies": {
"coap": "git+https://github.com/mcollina/node-coap.git#v0.23.0",
"body-parser": "^1.18.2",
"coap": "^0.21.0",
"express": "^4.16.3",
"ip": "^1.1.5",
"node-rest-client": "^3.1.0"
Expand Down