web: minor Timer/Timeout change for CW (aws#5258)

* web: change timeout for web compatiblility

Problem:

Timer in this class does not work in web mode since it only
works with the Node timeout class.

Solution:

Use the generalized Timeout class.

Signed-off-by: Nikolas Komonen <[email protected]>

* test: copy timeout tests to web tests

This is copying the node timeout tests to web mode. Since they behave the same,
no modifications needed to be done to the tests.

- Also fix an issue where some code was not being run in web mode during refresh.

Signed-off-by: Nikolas Komonen <[email protected]>

---------

Signed-off-by: Nikolas Komonen <[email protected]>

Author: nkomonen-amazon

packages/core/src/codewhisperer/tracker/codewhispererTracker.ts

@@ -14,14 +14,15 @@ import { AuthUtil } from '../util/authUtil'
 import { InsertedCode } from '../../codewhispererChat/controllers/chat/model'
 import { codeWhispererClient } from '../client/codewhisperer'
 import { logSendTelemetryEventFailure } from '../../codewhispererChat/controllers/chat/telemetryHelper'
+import { Timeout } from '../../shared/utilities/timeoutUtils'
 
 /**
  * This singleton class is mainly used for calculating the percentage of user modification.
  * The current calculation method is (Levenshtein edit distance / acceptedSuggestion.length).
  */
 export class CodeWhispererTracker {
     private _eventQueue: (AcceptedSuggestionEntry | InsertedCode)[]
-    private _timer?: NodeJS.Timer
+    private _timer?: Timeout
     private static instance: CodeWhispererTracker
 
     /**
@@ -158,21 +159,22 @@ export class CodeWhispererTracker {
 
     public async startTimer() {
         if (!this._timer) {
-            this._timer = setTimeout(async () => {
+            this._timer = new Timeout(CodeWhispererTracker.defaultCheckPeriodMillis)
+            this._timer.onCompletion(async () => {
                 try {
                     await this.flush()
                 } finally {
                     if (this._timer !== undefined) {
                         this._timer!.refresh()
                     }
                 }
-            }, CodeWhispererTracker.defaultCheckPeriodMillis)
+            })
         }
     }
 
     public closeTimer() {
         if (this._timer !== undefined) {
-            clearTimeout(this._timer)
+            this._timer.cancel()
             this._timer = undefined
         }
     }

packages/core/src/shared/utilities/timeoutUtils.ts

@@ -101,12 +101,14 @@ export class Timeout {
             globals.clock.clearTimeout(this._timerTimeout)
             this._timerTimeout = this.createTimeout()
         } else {
-            // These will not align, but we don't have visibility into a NodeJS.Timeout
-            // so remainingtime will be approximate. Timers are approximate anyway and are
-            // not highly accurate in when they fire.
-            this._endTime = globals.clock.Date.now() + this._timeoutLength
+            // This is a node timeout instance, which has refresh built in
             this._timerTimeout = this._timerTimeout.refresh()
         }
+
+        // These will not align, but we don't have visibility into a NodeJS.Timeout
+        // so remainingtime will be approximate. Timers are approximate anyway and are
+        // not highly accurate in when they fire.
+        this._endTime = globals.clock.Date.now() + this._timeoutLength
     }
 
     /**

packages/core/src/test/shared/utilities/timeoutUtils.test.ts

@@ -9,7 +9,8 @@ import * as timeoutUtils from '../../../shared/utilities/timeoutUtils'
 import { installFakeClock, tickPromise } from '../../../test/testUtil'
 import { sleep } from '../../../shared/utilities/timeoutUtils'
 
-describe('timeoutUtils', async function () {
+// We export this describe() so it can be used in the web tests as well
+export const timeoutUtilsDescribe = describe('timeoutUtils', async function () {
     let clock: FakeTimers.InstalledClock
 
     before(function () {

packages/core/src/testWeb/shared/utilities/timeoutUtils.test.ts

@@ -0,0 +1,13 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * IMPORTANT: We are importing the same test from the node timeoutUtils
+ * since the behavior should be the exact same.
+ *
+ * Any web specific tests should be made within their own `describe()`.
+ */
+import { timeoutUtilsDescribe } from '../../../test/shared/utilities/timeoutUtils.test'
+timeoutUtilsDescribe