fix: bring back schedule request cancelling, refactor it to clarify

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>

Author: julien-nc

src/assistant.js

@@ -16,6 +16,7 @@ window.assistantPollTaskId = null
 window.assistantPollPositionTimerId = null
 window.assistantPollPositionTaskId = null
 window.assistantPollPositionAbortController = null
+window.assistantSchedulingAbortController = null
 
 listen('taskprocessing:task_update', (type, body) => {
 	console.debug('[assistant] received task update push notification', type, body)
@@ -172,6 +173,7 @@ export async function openAssistantForm({
 		}
 
 		modalMountPoint.addEventListener('cancel', () => {
+			cancelScheduling()
 			cancelTaskPolling()
 			cancelTaskPositionPolling()
 			app.unmount()
@@ -191,15 +193,16 @@ export async function openAssistantForm({
 			view.outputs = null
 			view.selectedTaskTypeId = taskTypeId
 
-			scheduleTask(appId, newTaskCustomId, taskTypeId, inputs)
+			window.assistantSchedulingAbortController = new AbortController()
+			scheduleTask(appId, newTaskCustomId, taskTypeId, inputs, window.assistantSchedulingAbortController.signal)
 				.then((response) => {
+					cancelScheduling()
 					const task = response.data?.ocs?.data?.task
 					lastTask = task
 					view.selectedTaskId = lastTask?.id
 					view.expectedRuntime = (lastTask?.completionExpectedAt - lastTask?.scheduledAt) || null
 					view.startedAt = lastTask?.startedAt || null
 					view.completionExpectedAt = lastTask?.completionExpectedAt || null
-
 					const hasPush = listenToTaskNotifications(task.id)
 					console.debug('[assistant] HAS PUSH', hasPush)
 
@@ -255,6 +258,7 @@ export async function openAssistantForm({
 					})
 				})
 				.catch(error => {
+					cancelScheduling()
 					view.loading = false
 					view.showSyncTaskRunning = false
 					view.taskPosition = null
@@ -267,13 +271,15 @@ export async function openAssistantForm({
 			syncSubmit(data.detail.inputs, data.detail.selectedTaskTypeId, customId || identifier)
 		})
 		modalMountPoint.addEventListener('try-again', (data) => {
+			cancelScheduling()
 			const task = data.detail
 			console.debug('[assistant] try again', task)
 			syncSubmit(task.input, task.type)
 		})
 		modalMountPoint.addEventListener('load-task', (data) => {
 			const task = data.detail
 			console.debug('[assistant] loading task', task)
+			cancelScheduling()
 			cancelTaskPolling()
 			cancelTaskPositionPolling()
 			view.showSyncTaskRunning = false
@@ -378,6 +384,7 @@ export async function openAssistantForm({
 		})
 		modalMountPoint.addEventListener('new-task', () => {
 			console.debug('[assistant] new task')
+			cancelScheduling()
 			cancelTaskPolling()
 			cancelTaskPositionPolling()
 			view.loading = false
@@ -395,6 +402,7 @@ export async function openAssistantForm({
 			})
 		})
 		modalMountPoint.addEventListener('cancel-task', () => {
+			cancelScheduling()
 			cancelTaskPolling()
 			cancelTaskPositionPolling()
 			setNotifyReady(lastTask.id, false)
@@ -558,6 +566,11 @@ export async function cancelTaskPositionPolling() {
 	window.assistantPollPositionTaskId = null
 }
 
+export async function cancelScheduling() {
+	window.assistantSchedulingAbortController?.abort()
+	window.assistantSchedulingAbortController = null
+}
+
 export async function getTask(taskId, signal = null) {
 	const { default: axios } = await import('@nextcloud/axios')
 	const { generateOcsUrl } = await import('@nextcloud/router')
@@ -604,9 +617,10 @@ export async function cancelTask(taskId) {
  * @param {string} customId the task custom ID
  * @param {string} taskType the task type class
  * @param {Array} inputs the task input texts as an array
+ * @param {AbortSignal} signal optional abort signal for cancellation
  * @return {Promise<object>}
  */
-export async function scheduleTask(appId, customId, taskType, inputs) {
+export async function scheduleTask(appId, customId, taskType, inputs, signal = null) {
 	const { default: axios } = await import('@nextcloud/axios')
 	const { generateOcsUrl } = await import('@nextcloud/router')
 	if (taskType === 'core:text2text:translate') {
@@ -620,7 +634,8 @@ export async function scheduleTask(appId, customId, taskType, inputs) {
 		customId,
 		preferStreaming: true,
 	}
-	return axios.post(url, params)
+	const config = signal ? { signal } : {}
+	return axios.post(url, params, config)
 }
 
 export async function saveLastSelectedTaskType(taskType) {
@@ -809,17 +824,21 @@ export async function openAssistantTask(
 	}
 
 	modalMountPoint.addEventListener('cancel', () => {
+		cancelScheduling()
 		cancelTaskPolling()
 		cancelTaskPositionPolling()
 		app.unmount()
 		OCA.Assistant.isAssistantDialogOpen = false
 	})
 	modalMountPoint.addEventListener('submit', (data) => {
-		scheduleTask(task.appId, task.identifier ?? '', data.detail.selectedTaskTypeId, data.detail.inputs)
+		window.assistantSchedulingAbortController = new AbortController()
+		scheduleTask(task.appId, task.identifier ?? '', data.detail.selectedTaskTypeId, data.detail.inputs, window.assistantSchedulingAbortController.signal)
 			.then((response) => {
+				cancelScheduling()
 				console.debug('scheduled task', response.data?.ocs?.data?.task)
 			})
 			.catch(error => {
+				cancelScheduling()
 				app.unmount()
 				OCA.Assistant.isAssistantDialogOpen = false
 				console.error('Assistant scheduling error', error)
@@ -841,8 +860,10 @@ export async function openAssistantTask(
 		view.outputs = null
 		view.selectedTaskTypeId = taskTypeId
 
-		scheduleTask('assistant', newTaskCustomId, taskTypeId, inputs)
+		window.assistantSchedulingAbortController = new AbortController()
+		scheduleTask('assistant', newTaskCustomId, taskTypeId, inputs, window.assistantSchedulingAbortController.signal)
 			.then((response) => {
+				cancelScheduling()
 				const task = response.data?.ocs?.data?.task
 				lastTask = task
 				view.selectedTaskId = lastTask?.id
@@ -897,6 +918,7 @@ export async function openAssistantTask(
 				})
 			})
 			.catch(error => {
+				cancelScheduling()
 				view.loading = false
 				view.showSyncTaskRunning = false
 				view.taskPosition = null
@@ -908,11 +930,13 @@ export async function openAssistantTask(
 		syncSubmit(data.detail.inputs, data.detail.selectedTaskTypeId, task.identifier ?? '')
 	})
 	modalMountPoint.addEventListener('try-again', (data) => {
+		cancelScheduling()
 		const task = data.detail
 		syncSubmit(task.input, task.type)
 	})
 	modalMountPoint.addEventListener('load-task', (data) => {
 		const task = data.detail
+		cancelScheduling()
 		cancelTaskPolling()
 		cancelTaskPositionPolling()
 		view.showSyncTaskRunning = false
@@ -1016,6 +1040,7 @@ export async function openAssistantTask(
 	})
 	modalMountPoint.addEventListener('new-task', () => {
 		console.debug('[assistant] new task')
+		cancelScheduling()
 		cancelTaskPolling()
 		cancelTaskPositionPolling()
 		view.loading = false
@@ -1033,6 +1058,7 @@ export async function openAssistantTask(
 		})
 	})
 	modalMountPoint.addEventListener('cancel-task', () => {
+		cancelScheduling()
 		cancelTaskPolling()
 		cancelTaskPositionPolling()
 		setNotifyReady(lastTask.id, false)