secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Adding advanced server controls

Browse Source
This commit is contained in:
James Barnsley
2018-04-29 21:10:57 +12:00
parent 562004153c
commit 4b5d7d6237
13 changed files with 769 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/js/services/pusher/actions.js
View File

@ -203,6 +203,13 @@ export function getSnapcast(){
}
}
export function snapcastServerLoaded(server){
return {
type: 'PUSHER_SNAPCAST_SERVER_LOADED',
server: server
}
}
export function setSnapcastClientName(id, name){
return {
type: 'PUSHER_SET_SNAPCAST_CLIENT_NAME',
@ -235,6 +242,15 @@ export function setSnapcastClientLatency(id, latency){
}
}
export function setSnapcastClientGroup(id, group_id){
console.log(id,group_id);
return {
type: 'PUSHER_SET_SNAPCAST_CLIENT_GROUP',
id: id,
group_id: group_id
}
}
export function deleteSnapcastClient(id){
return {
type: 'PUSHER_DELETE_SNAPCAST_CLIENT',
@ -242,3 +258,11 @@ export function deleteSnapcastClient(id){
}
}
export function setSnapcastGroupStream(id, stream_id){
return {
type: 'PUSHER_SET_SNAPCAST_GROUP_STREAM',
id: id,
stream_id: stream_id
}
}

136
src/js/services/pusher/middleware.js
View File

@ -586,43 +586,7 @@ const PusherMiddleware = (function(){
request(store, 'snapcast_instruct', action.data)
.then(
response => {
var groups = {};
var clients = {};
var streams = {};
// Loop all the groups
for (var i = 0; i < response.server.groups.length; i++){
var group = response.server.groups[i];
var clients_ids = [];
// And now this groups' clients
for (var j = 0; j < group.clients.length; j++){
var client = group.clients[j];
clients[client.id] = client;
clients_ids.push(client.id);
}
groups[group.id] = {
id: group.id,
muted: group.muted,
name: group.name,
stream_id: group.stream_id,
clients_ids: clients_ids
}
}
// Loop all the streams
for (var i = 0; i < response.server.streams.length; i++){
var stream = response.server.streams[i];
streams[stream.id] = stream;
}
store.dispatch({
type: 'PUSHER_SNAPCAST',
snapcast_clients: clients,
snapcast_groups: groups,
snapcast_streams: streams
});
store.dispatch(pusherActions.snapcastServerLoaded(response.server));
},
error => {
store.dispatch(coreActions.handleException(
@ -634,6 +598,47 @@ const PusherMiddleware = (function(){
);
break
case 'PUSHER_SNAPCAST_SERVER_LOADED':
console.log(action);
var groups = {};
var clients = {};
var streams = {};
// Loop all the groups
for (var i = 0; i < action.server.groups.length; i++){
var group = action.server.groups[i];
var clients_ids = [];
// And now this groups' clients
for (var j = 0; j < group.clients.length; j++){
var client = group.clients[j];
clients[client.id] = client;
clients_ids.push(client.id);
}
groups[group.id] = {
id: group.id,
muted: group.muted,
name: group.name,
stream_id: group.stream_id,
clients_ids: clients_ids
}
}
// Loop all the streams
for (var i = 0; i < action.server.streams.length; i++){
var stream = action.server.streams[i];
streams[stream.id] = stream;
}
store.dispatch({
type: 'PUSHER_SNAPCAST',
snapcast_clients: clients,
snapcast_groups: groups,
snapcast_streams: streams
});
break
case 'PUSHER_SET_SNAPCAST_CLIENT_NAME':
var client = store.getState().pusher.snapcast_clients[action.id];
var data = {
@ -772,6 +777,32 @@ const PusherMiddleware = (function(){
);
break
case 'PUSHER_SET_SNAPCAST_CLIENT_GROUP':
var group = store.getState().pusher.snapcast_groups[action.group_id];
var clients_ids = Object.assign([], group.clients_ids, [action.id]);
var data = {
method: 'Group.SetClients',
params: {
id: action.group_id,
clients: clients_ids
}
}
request(store, 'snapcast_instruct', data)
.then(
response => {
store.dispatch(pusherActions.snapcastServerLoaded(response.server));
},
error => {
store.dispatch(coreActions.handleException(
'Error',
error,
error.message
));
}
);
break
case 'PUSHER_DELETE_SNAPCAST_CLIENT':
var data = {
method: 'Server.DeleteClient',
@ -798,6 +829,37 @@ const PusherMiddleware = (function(){
);
break
case 'PUSHER_SET_SNAPCAST_GROUP_STREAM':
var group = store.getState().pusher.snapcast_groups[action.id];
var data = {
method: 'Group.SetStream',
params: {
id: action.id,
stream_id: action.stream_id
}
}
request(store, 'snapcast_instruct', data)
.then(
response => {
store.dispatch({
type: 'PUSHER_SNAPCAST_GROUP_UPDATED',
key: action.id,
group: {
stream_id: action.stream_id
}
})
},
error => {
store.dispatch(coreActions.handleException(
'Error',
error,
error.message
));
}
);
break
// This action is irrelevant to us, pass it on to the next middleware
default:
return next(action);

12
src/js/services/pusher/reducer.js
View File

@ -55,7 +55,17 @@ export default function reducer(pusher = {}, action){
return Object.assign({}, pusher, { config: action.config });
case 'PUSHER_SNAPCAST':
return Object.assign({}, pusher, { snapcast_clients: action.snapcast_clients, snapcast_groups: action.snapcast_groups });
return Object.assign({}, pusher, {
snapcast_streams: action.snapcast_streams,
snapcast_groups: action.snapcast_groups,
snapcast_clients: action.snapcast_clients
});
case 'PUSHER_SNAPCAST_GROUP_UPDATED':
var snapcast_groups = Object.assign({}, pusher.snapcast_groups);
var group = snapcast_groups[action.key];
snapcast_groups[action.key] = Object.assign({}, group, action.group);
return Object.assign({}, pusher, { snapcast_groups: snapcast_groups });
case 'PUSHER_SNAPCAST_CLIENT_UPDATED':
var snapcast_clients = Object.assign({}, pusher.snapcast_clients);