diff --git a/packages/api/src/controllers/runners.js b/packages/api/src/controllers/runners.js index 7908f9052..f1de4247d 100644 --- a/packages/api/src/controllers/runners.js +++ b/packages/api/src/controllers/runners.js @@ -136,7 +136,7 @@ module.exports = { if (handleProcessCommunication(message, subprocess)) return; this[`handle_${msgtype}`](runid, message); }); - return newOpened; + return _.pick(newOpened, ['runid']); }, start_meta: true, diff --git a/packages/api/src/controllers/sessions.js b/packages/api/src/controllers/sessions.js index b3ed69f3c..a866abcba 100644 --- a/packages/api/src/controllers/sessions.js +++ b/packages/api/src/controllers/sessions.js @@ -86,7 +86,7 @@ module.exports = { this[`handle_${msgtype}`](sesid, message); }); subprocess.send({ msgtype: 'connect', ...connection, database }); - return newOpened; + return _.pick(newOpened, ['conid', 'database', 'sesid']); }, executeQuery_meta: true, diff --git a/packages/api/src/utility/useController.js b/packages/api/src/utility/useController.js index 400db650b..877b8a334 100644 --- a/packages/api/src/utility/useController.js +++ b/packages/api/src/utility/useController.js @@ -31,6 +31,7 @@ module.exports = function useController(app, electron, route, controller) { // console.log('REGISTERING HANDLER', handler); electron.ipcMain.handle(handler, async (event, args) => { const data = await controller[key](args); + // console.log('HANDLED API', handler, data); return data; }); } diff --git a/packages/web/src/query/RunnerOutputFiles.svelte b/packages/web/src/query/RunnerOutputFiles.svelte index c8435b6be..aae7301dd 100644 --- a/packages/web/src/query/RunnerOutputFiles.svelte +++ b/packages/web/src/query/RunnerOutputFiles.svelte @@ -33,7 +33,7 @@ $: $effect; const handleRunnerDone = async () => { - const resp = await apiCall(`runners/files?runid=${runnerId}`); + const resp = await apiCall('runners/files', { runid: runnerId }); files = resp; }; diff --git a/packages/web/src/utility/api.ts b/packages/web/src/utility/api.ts index 8c1d6cb04..f1fabec18 100644 --- a/packages/web/src/utility/api.ts +++ b/packages/web/src/utility/api.ts @@ -17,6 +17,7 @@ function wantEventSource() { export async function apiCall(route: string, args: {} = undefined) { const electron = getElectron(); if (electron) { + // console.log('CALLING API', route.replace('/', '-'), JSON.stringify(args == null ? null : args)); const resp = await electron.invoke(route.replace('/', '-'), args); return resp; } else {