chore: CR issues

Author: JanCizmar

src/client/WebsocketClient.ts

@@ -172,7 +172,7 @@ function getAuthentication(options: WebsocketClientOptions) {
     return { 'x-api-key': options.authentication.apiKey };
   }
 
-  return null;
+  return {};
 }
 
 export type EventTypeProject =

src/utils/pullWatch/watchHandler.ts

@@ -27,12 +27,21 @@ export async function startWatching(
   info('Watching for translation changes... Press Ctrl+C to stop.');
 
   let pulling = false;
+
+  /**
+   * Pending handles the situation when changes are detected while the pull is
+   * already in progress.
+   */
+  let pending = false;
   let debounceTimer: NodeJS.Timeout | undefined;
   let pollingTimer: NodeJS.Timeout | undefined;
   let lastExecutionTime = 0;
 
   const executePull = async (lastModified?: string) => {
-    if (pulling) return;
+    if (pulling) {
+      pending = true;
+      return;
+    }
     pulling = true;
     lastExecutionTime = Date.now();
     try {
@@ -45,6 +54,11 @@ export async function startWatching(
       error('Error during pull: ' + e.message);
       debug(e);
     } finally {
+      // If there was a pending pull (data changed when pulling), execute it now
+      if (pending) {
+        pending = false;
+        void executePull();
+      }
       pulling = false;
     }
   };
@@ -68,7 +82,9 @@ export async function startWatching(
 
   // Polling mechanism as backup
   const startPolling = () => {
-    clearInterval(pollingTimer);
+    if (pollingTimer) {
+      clearInterval(pollingTimer);
+    }
     const poll = async () => {
       if (pulling) return;
       debug('Polling for changes...');
@@ -83,7 +99,6 @@ export async function startWatching(
     serverUrl: new URL(apiUrl).origin,
     authentication: { apiKey: apiKey },
     onError: (error) => {
-      console.error('Error: handling auth error');
       AuthErrorHandler(client)
         .handleAuthErrors(error, shutdown)
         .catch((err: any) => {
@@ -99,7 +114,7 @@ export async function startWatching(
 
   const channel = `/projects/${projectId}/translation-data-modified` as const;
 
-  let unsubscribe: () => void | undefined;
+  let unsubscribe: (() => void) | undefined;
 
   function subscribe() {
     unsubscribe = wsClient.subscribe(channel, () => {

test/e2e/pullWatch.test.ts

@@ -1,5 +1,5 @@
 import { setupTemporaryFolder, TMP_FOLDER } from './utils/tmp.js';
-import { run } from './utils/run.js';
+import { run, runWithKill } from './utils/run.js';
 import './utils/toMatchContentsOf.js';
 import {
   createPak,
@@ -31,7 +31,7 @@ describe('Pull watch', () => {
   it('pulls strings from Tolgee with watch', async () => {
     await util.changeLocalizationData('A key');
 
-    run(
+    const { kill } = runWithKill(
       ['pull', '--api-key', pak, '--path', TMP_FOLDER, '--watch', '--verbose'],
       undefined,
       300000
@@ -46,5 +46,6 @@ describe('Pull watch', () => {
     // Tests that it pulls after change...
     await util.changeLocalizationData('Another key');
     await util.waitFilesystemDataUpdated('Another key');
+    kill('SIGTERM');
   });
 });

test/e2e/utils/run.ts

@@ -103,3 +103,15 @@ export async function run(
   const cliProcess = spawn(args, false, env);
   return runProcess(cliProcess, timeout);
 }
+
+export function runWithKill(
+  args: string[],
+  env?: Record<string, string>,
+  timeout = 10e3
+) {
+  const cliProcess = spawn(args, false, env);
+  return {
+    promise: runProcess(cliProcess, timeout),
+    kill: (signal: NodeJS.Signals) => cliProcess.kill(signal),
+  };
+}