Skip to content

Allow sending multiple digit channel numbers in a single request #95

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
misku wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow sending multiple digit channel numbers in a single request #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 28 additions & 11 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,12 @@ mqttClient.on('message', function (topic, message) {
var command = messageComponents[0]
var repeat = messageComponents[1]

command = commandBySlugs(hubSlug, deviceSlug, command)
if (!command) { return }
commands = commandBySlugs(hubSlug, deviceSlug, command)
if (commands.length == 0) { return }

sendAction(hubSlug, command.action, repeat)
for (var i = 0; i < commands.length; i += 1) {
sendAction(hubSlug, commands[i].action, repeat)
}
} else if (currentActivityCommandMatches) {
var hubSlug = currentActivityCommandMatches[1]
var messageComponents = message.toString().split(':')
Expand Down Expand Up @@ -342,16 +344,30 @@ function deviceBySlugs(hubSlug, deviceSlug){
return device
}

// always returns an Array
function commandBySlugs(hubSlug, deviceSlug, commandSlug){
var command
var commands = []
var raw_commands = []
device = deviceBySlugs(hubSlug, deviceSlug)
if (device){
if (commandSlug in device.commands){
command = device.commands[commandSlug]
if (+commandSlug === Number.parseInt(commandSlug, 10)) {
// channel number was sent
// split digits into separate commands
for (var i = 0; i < commandSlug.length; i += 1) {
raw_commands.push(commandSlug.charAt(i))
}
} else if (commandSlug) {
raw_commands.push(commandSlug)
}

for (var i = 0; i < raw_commands.length; i += 1) {
if (raw_commands[i] in device.commands){
commands.push(device.commands[raw_commands[i]])
}
}
}

return command
return commands
}

function off(hubSlug){
Expand Down Expand Up @@ -529,11 +545,12 @@ app.post('/hubs/:hubSlug/activities/:activitySlug', function(req, res){
})

app.post('/hubs/:hubSlug/devices/:deviceSlug/commands/:commandSlug', function(req, res){
command = commandBySlugs(req.params.hubSlug, req.params.deviceSlug, req.params.commandSlug)

if (command) {
sendAction(req.params.hubSlug, command.action, req.query.repeat)
commands = commandBySlugs(req.params.hubSlug, req.params.deviceSlug, req.params.commandSlug)

if (commands.length > 0) {
for (var i = 0; i < commands.length; i += 1) {
sendAction(req.params.hubSlug, commands[i].action, req.query.repeat)
}
res.json({message: "ok"})
}else{
res.status(404).json({message: "Not Found"})
Expand Down