|
|
@ -99,6 +99,9 @@ export function terminate() { |
|
|
|
|
|
|
|
|
|
|
|
async function runTask(task: AnalyticsTask): Promise<TaskResult> { |
|
|
|
async function runTask(task: AnalyticsTask): Promise<TaskResult> { |
|
|
|
return new Promise<TaskResult>((resolver: TaskResolver) => { |
|
|
|
return new Promise<TaskResult>((resolver: TaskResolver) => { |
|
|
|
|
|
|
|
if(!analyticsService.ready) { |
|
|
|
|
|
|
|
throw new Error(`Can't send task, analytics is not ready`); |
|
|
|
|
|
|
|
} |
|
|
|
taskResolvers.set(task.id, resolver); // it will be resolved in onTaskResult()
|
|
|
|
taskResolvers.set(task.id, resolver); // it will be resolved in onTaskResult()
|
|
|
|
analyticsService.sendTask(task); // we dont wait for result here
|
|
|
|
analyticsService.sendTask(task); // we dont wait for result here
|
|
|
|
}); |
|
|
|
}); |
|
|
@ -291,15 +294,23 @@ export async function runDetect(id: AnalyticUnit.AnalyticUnitId) { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
export async function remove(id: AnalyticUnit.AnalyticUnitId) { |
|
|
|
export async function remove(analyticUnitId: AnalyticUnit.AnalyticUnitId) { |
|
|
|
let task = new AnalyticsTask(id, AnalyticsTaskType.CANCEL); |
|
|
|
await cancelAnalyticsTask(analyticUnitId); |
|
|
|
await runTask(task); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(dataPuller !== undefined) { |
|
|
|
if(dataPuller !== undefined) { |
|
|
|
dataPuller.deleteUnit(id); |
|
|
|
dataPuller.deleteUnit(analyticUnitId); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
await AnalyticUnit.remove(analyticUnitId); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
await AnalyticUnit.remove(id); |
|
|
|
async function cancelAnalyticsTask(analyticUnitId: AnalyticUnit.AnalyticUnitId) { |
|
|
|
|
|
|
|
try { |
|
|
|
|
|
|
|
let task = new AnalyticsTask(analyticUnitId, AnalyticsTaskType.CANCEL); |
|
|
|
|
|
|
|
await runTask(task); |
|
|
|
|
|
|
|
} catch(e) { |
|
|
|
|
|
|
|
console.log(`Can't cancel analytics task for "${analyticUnitId}": ${e.message}`); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
export async function deleteNonDetectedSegments(id, payload) { |
|
|
|
export async function deleteNonDetectedSegments(id, payload) { |
|
|
|