Skip to content
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

Add stop command for reliable systemd shutdown #626

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

Add stop command for reliable systemd shutdown #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
876a47a
Add stop command
rtimmons Jun 23, 2018
ce7ba80
Merge remote-tracking branch 'jishi/master'
rtimmons Jul 13, 2019
aea4927
Merge remote-tracking branch 'jishi/master'
rtimmons Dec 21, 2019
acd93f6
npm audit and upgrade (seems to work)
rtimmons Dec 21, 2019
4da1468
allow player/zones to be undefined
rtimmons Dec 21, 2019
097c60f
hopefully fix barf when sonos is reconfiguring
rtimmons Dec 21, 2019
aa77fa6
try/catch around api requestHandler
rtimmons Jan 11, 2020
4f4baa9
use pkill -f
rtimmons May 19, 2021
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
8 changes: 7 additions & 1 deletion lib/actions/zones.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
'use strict';

function simplifyPlayer(player) {
if (typeof player === 'undefined') {
return {};
}
return {
uuid: player.uuid,
state: player.state,
Expand All @@ -13,6 +16,9 @@ function simplifyPlayer(player) {

function simplifyZones(zones) {
return zones.map((zone) => {
if (typeof zone === 'undefined') {
return {};
}
return {
uuid: zone.uuid,
coordinator: simplifyPlayer(zone.coordinator),
Expand All @@ -27,4 +33,4 @@ function zones(player) {

module.exports = function (api) {
api.registerAction('zones', zones);
}
}
7 changes: 6 additions & 1 deletion lib/sonos-http-api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function HttpAPI(discovery, settings) {
}

const params = req.url.substring(1).split('/');

// parse decode player name considering decode errors
let player;
try {
Expand All @@ -81,6 +81,11 @@ function HttpAPI(discovery, settings) {
opt.values = params.splice(1);
}

if (!player) {
return sendResponse(500, { status: 'error', error: 'Sonos system is busy.' });
}


function sendResponse(code, body) {
var jsonResponse = JSON.stringify(body);
res.statusCode = code;
Expand Down
Loading