GGLinnk/foris-js
1
0
Fork 0
mirror of https://gitlab.nic.cz/turris/reforis/foris-js.git synced 2024-12-25 00:11:36 +01:00
Code Issues Releases Activity

Merge branch 'controller-id-in-hook' into 'dev'

Browse Source 
Added controller ID filter to WebSocket hook.

See merge request turris/reforis/foris-js!79
This commit is contained in:
Maciej Lenartowicz 2020-01-16 10:27:30 +01:00
commit 8679749e0f
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "foris", "name": "foris",
"version": "3.1.2", "version": "3.2.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "foris", "name": "foris",
"version": "3.1.2", "version": "3.2.0",
"description": "Set of components and utils for Foris and its plugins.", "description": "Set of components and utils for Foris and its plugins.",
"author": "CZ.NIC, z.s.p.o.", "author": "CZ.NIC, z.s.p.o.",
"repository": { "repository": {

12
src/webSockets/hooks.js
View File

@ -7,7 +7,7 @@
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
export function useWSForisModule(ws, module, action = "update_settings") { export function useWSForisModule(ws, module, action = "update_settings", controllerID) {
const [data, setData] = useState(null); const [data, setData] = useState(null);
useEffect(() => { useEffect(() => {
@ -16,8 +16,12 @@ export function useWSForisModule(ws, module, action = "update_settings") {
// doesn't present any WS endpoint. // doesn't present any WS endpoint.
if (!ws) return; if (!ws) return;
function callback(msg) { function callback(message) {
setData(msg.data); // Accept only messages addressed to device with passed controller ID.
if (controllerID !== undefined && controllerID !== message.controller_id) {
return;
}
setData(message.data);
} }
ws.subscribe(module) ws.subscribe(module)
@ -26,7 +30,7 @@ export function useWSForisModule(ws, module, action = "update_settings") {
return () => { return () => {
ws.unbind(module, action, callback); ws.unbind(module, action, callback);
}; };
}, [action, module, ws]); }, [action, module, ws, controllerID]);
return [data]; return [data];
} }