mirror/api
1
0
Fork 0
mirror of https://github.com/unraid/api.git synced 2026-01-18 22:49:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove websocket from clients when socket closes and switch info subscription to basic handler for now

Browse Source 
Signed-off-by: Alexis Tyler <xo@wvvw.me>
This commit is contained in:
Alexis Tyler
2019-08-31 13:51:29 +09:30
parent 532464eaae
commit 012ea1a730
2 changed files with 63 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/graphql/index.js
View File

@@ -302,6 +302,11 @@ module.exports = function (
onDisconnect: webSocket => {
const user = clients.get(webSocket);
log.debug(`<ws> ${user.name} disconnected.`);
// If we don't wait a tick `user` becomes undefined.
process.nextTick(() => {
clients.delete(webSocket);
});
}
},
context: ({ req, connection }) => {

65
app/graphql/schema/resolvers.js
View File

@@ -3,7 +3,7 @@
* Written by: Alexis Tyler
*/
module.exports = function ($injector, GraphQLJSON, GraphQLLong, GraphQLUUID, pubsub, setIntervalAsync, PluginManager, log) {
module.exports = function ($injector, GraphQLJSON, GraphQLLong, GraphQLUUID, pubsub, setIntervalAsync, PluginManager, log, fromEntries, asyncMap, delay) {
const publish = (channel, mutation, {
node = undefined,
moduleToRun = undefined,
@@ -137,12 +137,63 @@ module.exports = function ($injector, GraphQLJSON, GraphQLLong, GraphQLUUID, pub
...createBasicSubscription('docker/networks', 'docker/get-networks')
},
info: {
apps: createBasicSubscription('info/apps', 'info/get-apps'),
cpu: createBasicSubscription('info/cpu', 'info/get-cpu'),
devices: createBasicSubscription('info/devices', 'info/get-devices'),
display: createBasicSubscription('info/display', 'info/get-display'),
os: createBasicSubscription('info/os', 'info/get-os'),
versions: createBasicSubscription('info/versions', 'info/get-versions')
subscribe: () => pubsub.asyncIterator('info'),
close() {
console.debug('Clearing info subscription timers');
// Clear all info subscription timers
Object.entries($injector._graph).filter(([ name ]) => {
return name.startsWith('timer:info');
}).map(([name, timer]) => {
console.debug(`Clearing ${name} subscription timer`);
clearInterval(timer);
});
}
// subscribe: async () => {
// const infoFields = [
// 'apps',
// 'cpu',
// 'devices',
// 'display',
// 'os',
// 'versions'
// ];
// const infoModules = infoFields.map(field => [field, $injector.resolveModule(`module:info/get-${field}`)]);
// let run = 0;
// return {
// async next() {
// // Await each field to get new value
// const values = fromEntries(await asyncMap(infoModules, async ([field, _module]) => {
// return [field, await _module.then(result => result.json)];
// }));
// const result = {
// value: {
// info: {
// mutation: 'UPDATED',
// node: {
// ...values
// }
// }
// },
// done: false
// };
// run = run + 1;
// console.log(`Run ${run}, ${Object.keys(values)}`);
// // Kill after 10
// if (run >= 10) {
// return { value: null, done: true };
// }
// return result;
// },
// [Symbol.asyncIterator]() {
// return this;
// }
// };
// }
},
me: {
subscribe: withFilter(() => pubsub.asyncIterator('user'), (payload, _, context) => payload.user.node.id === context.user.id),