add necessary worker ternminate and more logs

Kong · May 13, 2024 · a0d2f5e · a0d2f5e
1 parent df2cb91
commit a0d2f5e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/packages/insomnia/src/ui/routes/actions.tsx b/packages/insomnia/src/ui/routes/actions.tsx
@@ -779,6 +779,7 @@ export const generateCollectionAndTestsAction: ActionFunction = async ({ params
   const spectralRunner = new SpectralRunner();
 
   const results = (await spectralRunner.runDiagnostics({ contents: apiSpec.contents, rulesetPath })).filter(isLintError);
+  spectralRunner.terminate();
   if (apiSpec.contents && results && results.length) {
     throw new Error('Error Generating Configuration');
   }

diff --git a/packages/insomnia/src/ui/worker/spectral.ts b/packages/insomnia/src/ui/worker/spectral.ts
@@ -19,7 +19,7 @@ const cachedRuleset: {
   ruleset: oas as RulesetDefinition,
 };
 
-const loadRuleset = async (rulesetPath: string,) => {
+const loadRuleset = async (rulesetPath: string) => {
   if (cachedRuleset.path === rulesetPath) {
     return cachedRuleset.ruleset;
   }

diff --git a/packages/insomnia/src/ui/worker/spetral-run.ts b/packages/insomnia/src/ui/worker/spetral-run.ts
@@ -24,6 +24,10 @@ export class SpectralRunner {
         // onmessage callback will be called several times in one promise, and promise can be resolved or rejected only once, so we cant reject it here
         if (id === this.taskId && diagnostics) {
           resolve(diagnostics);
+        } else if (diagnostics) {
+          console.log('Received diagnostics for old task, ignoring');
+        } else {
+          console.error('Error while running diagnostics:', e.data);
         }
       };