fix: correct exit from docker after exit signals

.eslintrc.yaml

@@ -130,6 +130,7 @@ rules:
     - {blankLine: always, prev: '*', next: return}
     - {blankLine: always, prev: throw, next: '*'}
     - {blankLine: always, prev: '*', next: throw}
+  prefer-destructuring: off
   simple-import-sort/exports: error
   simple-import-sort/imports:
     - error
@@ -206,7 +207,13 @@ rules:
   '@typescript-eslint/no-unused-expressions': error
   '@typescript-eslint/no-useless-empty-export': error
   '@typescript-eslint/parameter-properties': error
+  '@typescript-eslint/prefer-destructuring':
+    [error, {VariableDeclarator: {array: false, object: true}}]
+  '@typescript-eslint/prefer-enum-initializers': error
+  '@typescript-eslint/prefer-find': error
+  '@typescript-eslint/prefer-for-of': error
   '@typescript-eslint/quotes': [error, single, {avoidEscape: true}]
+  '@typescript-eslint/prefer-function-type': error
   '@typescript-eslint/sort-type-constituents': [error, {checkIntersections: false}]
 settings:
   import/extensions: [.ts]

autotests/bin/runDocker.sh

@@ -26,6 +26,8 @@ onExit() {
     then
         echo "Docker container from image $E2ED_DOCKER_IMAGE:$VERSION already stopped"
     else
+        sleep 18
+
         echo "Stop docker container from image $E2ED_DOCKER_IMAGE:$VERSION"
         docker stop --time=60 $CONTAINER_ID
     fi

bin/dockerEntrypoint.sh

@@ -14,7 +14,9 @@ onExit() {
     if [[ $PID ]] && ps -p $PID > /dev/null
     then
         echo "$PID is running"
-        kill $PID
+        kill -USR1 $PID
+
+        sleep 16
     fi
 
     restoreE2edPackage;

package.json

@@ -32,12 +32,12 @@
     "testcafe-without-typecheck": "3.5.0-rc.2"
   },
   "devDependencies": {
-    "@types/node": "20.11.21",
-    "@typescript-eslint/eslint-plugin": "7.1.0",
-    "@typescript-eslint/parser": "7.1.0",
+    "@types/node": "20.11.25",
+    "@typescript-eslint/eslint-plugin": "7.1.1",
+    "@typescript-eslint/parser": "7.1.1",
     "assert-modules-support-case-insensitive-fs": "1.0.1",
     "assert-package-lock-is-consistent": "1.0.0",
-    "devtools-protocol": "0.0.1266247",
+    "devtools-protocol": "0.0.1269399",
     "eslint": "8.57.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "9.1.0",
@@ -47,7 +47,7 @@
     "husky": "9.0.11",
     "prettier": "3.2.5",
     "testcafe": "3.5.0",
-    "typescript": "5.3.3"
+    "typescript": "5.4.2"
   },
   "peerDependencies": {
     "@types/node": ">=16.11.1",

src/constants/log.ts

@@ -13,15 +13,15 @@ export const enum LogEventStatus {
  * Type of `LogEvent`.
  */
 export const enum LogEventType {
-  Action,
-  Assert,
-  Entity,
-  Util,
-  InternalAction,
-  InternalAssert,
-  InternalCore,
-  InternalUtil,
-  Unspecified,
+  Action = 1,
+  Assert = 2,
+  Entity = 3,
+  Util = 4,
+  InternalAction = 5,
+  InternalAssert = 6,
+  InternalCore = 7,
+  InternalUtil = 8,
+  Unspecified = 9,
 }
 
 /**

src/types/global.d.ts

@@ -6,6 +6,7 @@
  */
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 interface NodeRequire {
+  // eslint-disable-next-line @typescript-eslint/prefer-function-type
   <ModuleExports = import('./utils').Any>(modulePath: string): ModuleExports;
 }
 
@@ -21,7 +22,7 @@ declare module 'bin-v8-flags-filter' {
   }>;
 
   /**
-   * Filters out nodejs cli options and runs node module on cliPath.
+   * Filters out `nodejs` cli options and runs node module on `cliPath`.
    */
   const v8FlagsFilter: (cliPath: string, options: Options) => void;
 

src/types/selectors.ts

@@ -38,12 +38,8 @@ type ReplaceObjectSelectors<Obj extends object> = Readonly<{
             (...args: A2): ReplaceSelector<R2>;
             (...args: A1): ReplaceSelector<R1>;
           }
-        : Obj[Key] extends {
-              (...args: infer A1): infer R1;
-            }
-          ? {
-              (...args: A1): ReplaceSelector<R1>;
-            }
+        : Obj[Key] extends (...args: infer A1) => infer R1
+          ? (...args: A1) => ReplaceSelector<R1>
           : Obj[Key];
 }>;
 

src/utils/end/setProcessEndHandlers.ts

@@ -5,7 +5,7 @@ import {generalLog} from '../generalLog';
 import {endE2ed} from './endE2ed';
 
 /**
- * nodejs e2ed process end hanlder.
+ * `nodejs` e2ed process end hanlder.
  * @internal
  */
 const endHandler = (signal: NodeJS.Signals): void => {
@@ -15,10 +15,12 @@ const endHandler = (signal: NodeJS.Signals): void => {
 };
 
 /**
- * Set nodejs e2ed process end hanlders (SIGINT, SIGTERM).
+ * Set `nodejs` e2ed process end hanlders (`SIGHUP`, `SIGINT`, `SIGTERM`, `SIGUSR1`).
  * @internal
  */
 export const setProcessEndHandlers = (): void => {
+  process.on('SIGHUP', endHandler);
   process.on('SIGINT', endHandler);
   process.on('SIGTERM', endHandler);
+  process.on('SIGUSR1', endHandler);
 };

src/utils/error/E2edError.ts

@@ -85,7 +85,7 @@ export class E2edError extends Error {
   }
 
   /**
-   * Custom presentation of error for nodejs `inspect`.
+   * Custom presentation of error for `nodejs` `inspect`.
    */
   [inspect.custom](): string {
     return this.toString();

src/utils/events/registerEndE2edRunEvent.ts

@@ -10,11 +10,19 @@ import {runAfterPackFunctions} from './runAfterPackFunctions';
 
 import type {ReportData} from '../../types/internal';
 
+let isEndAlreadyCalled = false;
+
 /**
  * Registers end e2ed run event (for report) after closing of all tests.
  * @internal
  */
 export const registerEndE2edRunEvent = async (): Promise<void> => {
+  if (isEndAlreadyCalled) {
+    return;
+  }
+
+  isEndAlreadyCalled = true;
+
   generalLog('Starting to close e2ed...');
 
   let reportData: ReportData | undefined;