Merge pull request #398 from ml054/v5.4

ml054 · web-flow · commit 70138e43d1c0 · 2023-10-20T21:37:12.000+02:00
bumped npm packages
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ravendb",
-  "version": "5.4.1",
+  "version": "5.4.2",
   "description": "RavenDB client for Node.js",
   "files": [
     "dist/"
@@ -88,7 +88,6 @@
     "@types/uuid": "^8.3.4",
     "@types/verror": "^1.10.6",
     "@types/ws": "^7.4.7",
-    "abort-controller": "^3.0.0",
     "bluebird": "^3.7.2",
     "change-case": "^3.1.0",
     "deprecate": "^1.1.1",
diff --git a/src/Http/RequestExecutor.ts b/src/Http/RequestExecutor.ts
@@ -38,7 +38,6 @@ import type * as https from "https";
 import { IBroadcast } from "./IBroadcast";
 import { StringUtil } from "../Utility/StringUtil";
 import { IRaftCommand } from "./IRaftCommand";
-import AbortController from "abort-controller";
 import { EventEmitter } from "events";
 import {
     BeforeRequestEventArgs,
diff --git a/src/Primitives/Timer.ts b/src/Primitives/Timer.ts
@@ -10,10 +10,10 @@ export class Timer implements IDisposable {
 
     private _scheduledActionPromise: Promise<any>;
 
-    private _firstTimeDelayId: NodeJS.Timer;
-    private _intervalId: NodeJS.Timer;
+    private _firstTimeDelayId: ReturnType<typeof setInterval>;
+    private _intervalId: ReturnType<typeof setInterval>;
 
-    private _intervalTimerId: NodeJS.Timer;
+    private _intervalTimerId: ReturnType<typeof setInterval>;
 
     /** period in milliseconds */
     private _periodInMs: number;
diff --git a/src/Utility/PromiseUtil.ts b/src/Utility/PromiseUtil.ts
@@ -50,8 +50,8 @@ export async function delay(ms: number) {
 
 export async function timeout(ms: number) {
     return new Promise(
-        reject => 
-            setTimeout(() => 
+        reject =>
+            setTimeout(() =>
                 reject(getError("TimeoutException", `Timeout after ${ms} ms.`)), ms));
 }
 
@@ -66,7 +66,7 @@ export class AsyncTimeout {
 
     private _timedOut: boolean = false;
 
-    private _timer: NodeJS.Timer;
+    private _timer: ReturnType<typeof setInterval>;
 
     private _promise: Promise<void>;
 
diff --git a/test/Ported/Documents/CanQueryAndIncludeRevisions.ts b/test/Ported/Documents/CanQueryAndIncludeRevisions.ts
@@ -1,9 +1,9 @@
 import { AbstractJavaScriptIndexCreationTask, IDocumentStore } from "../../../src";
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil";
 import { assertThat } from "../../Utils/AssertExtensions";
 import { delay } from "bluebird";
 
-describe("CanQueryAndIncludeRevisionsTest", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("CanQueryAndIncludeRevisionsTest", function () {
 
     let store: IDocumentStore;
 
diff --git a/test/Ported/ForceRevisionCreation.ts b/test/Ported/ForceRevisionCreation.ts
@@ -1,12 +1,12 @@
 import { IDocumentStore } from "../../src/Documents/IDocumentStore";
-import { disposeTestDocumentStore, testContext } from "../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../Utils/TestUtil";
 import { Company } from "../Assets/Entities";
 import { assertThat, assertThrows } from "../Utils/AssertExtensions";
 import { RevisionsConfiguration } from "../../src/Documents/Operations/RevisionsConfiguration";
 import { RevisionsCollectionConfiguration } from "../../src/Documents/Operations/RevisionsCollectionConfiguration";
 import { ConfigureRevisionsOperation } from "../../src/Documents/Operations/Revisions/ConfigureRevisionsOperation";
 
-describe("ForceRevisionCreation", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("ForceRevisionCreation", function () {
 
     let store: IDocumentStore;
 
diff --git a/test/Ported/Issues/RavenDB_13456.ts b/test/Ported/Issues/RavenDB_13456.ts
@@ -5,11 +5,11 @@ import {
     PutClientConfigurationOperation,
     SessionOptions
 } from "../../../src";
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil";
 import { Company } from "../../Assets/Entities";
 import { assertThat, assertThrows } from "../../Utils/AssertExtensions";
 
-describe("RavenDB_13456", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("RavenDB_13456", function () {
 
     let store: IDocumentStore;
 
diff --git a/test/Ported/Issues/RavenDB_13735.ts b/test/Ported/Issues/RavenDB_13735.ts
@@ -1,5 +1,5 @@
 import { IDocumentStore } from "../../../src/Documents/IDocumentStore";
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil";
 import { RefreshConfiguration } from "../../../src/Documents/Operations/Refresh/RefreshConfiguration";
 import { ConfigureRefreshOperation } from "../../../src/Documents/Operations/Refresh/ConfigureRefreshOperation";
 import { User } from "../../Assets/Entities";
@@ -10,7 +10,7 @@ import { assertThat } from "../../Utils/AssertExtensions";
 import { delay } from "../../../src/Utility/PromiseUtil";
 import { DateUtil } from "../../../src/Utility/DateUtil";
 
-describe("RavenDB_13735", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("RavenDB_13735", function () {
 
     let store: IDocumentStore;
 
diff --git a/test/Ported/Issues/RavenDB_13762.ts b/test/Ported/Issues/RavenDB_13762.ts
@@ -1,12 +1,12 @@
 import { IDocumentStore } from "../../../src/Documents/IDocumentStore";
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil";
 import { User } from "../../Assets/Entities";
 import { RevisionsConfiguration } from "../../../src/Documents/Operations/RevisionsConfiguration";
 import { RevisionsCollectionConfiguration } from "../../../src/Documents/Operations/RevisionsCollectionConfiguration";
 import { ConfigureRevisionsOperation } from "../../../src/Documents/Operations/Revisions/ConfigureRevisionsOperation";
 import { assertThat } from "../../Utils/AssertExtensions";
 
-describe("RavenDB_13762", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("RavenDB_13762", function () {
 
     let store: IDocumentStore;
 
diff --git a/test/Ported/Issues/RavenDB_14724.ts b/test/Ported/Issues/RavenDB_14724.ts
@@ -1,9 +1,9 @@
 import { ConfigureRevisionsOperation, IDocumentStore, RevisionsConfiguration } from "../../../src";
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil";
 import { User } from "../../Assets/Entities";
 import { assertThat } from "../../Utils/AssertExtensions";
 
-describe("RavenDB_14724", function () {
+(RavenTestContext.isPullRequest ? describe.skip : describe)("RavenDB_14724", function () {
 
     let store: IDocumentStore;
 
diff --git a/test/Ported/Issues/RavenDB_16328.ts b/test/Ported/Issues/RavenDB_16328.ts
@@ -1,12 +1,12 @@
 import { IDocumentStore, SorterDefinition } from "../../../src";
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil";
 import { Company } from "../../Assets/Entities";
 import { PutServerWideSortersOperation } from "../../../src/ServerWide/Operations/Sorters/PutServerWideSortersOperation";
 import { assertThat, assertThrows } from "../../Utils/AssertExtensions";
 import { DeleteServerWideSorterOperation } from "../../../src/ServerWide/Operations/Sorters/DeleteServerWideSorterOperation";
 import { sorterCode } from "./RavenDB_8355";
 
-describe("RavenDB_16328", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("RavenDB_16328", function () {
 
     let store: IDocumentStore;
 
@@ -73,4 +73,4 @@ describe("RavenDB_16328", function () {
 
 function getSorter(sorterName: string) {
     return sorterCode.replace(/MySorter/g, sorterName);
-}
+}
diff --git a/test/Ported/Issues/RavenDB_16328_Analyzers.ts b/test/Ported/Issues/RavenDB_16328_Analyzers.ts
@@ -1,11 +1,11 @@
 import { AbstractJavaScriptIndexCreationTask, IDocumentStore, ResetIndexOperation } from "../../../src";
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil";
 import { assertThat, assertThrows } from "../../Utils/AssertExtensions";
 import { AnalyzerDefinition } from "../../../src/Documents/Indexes/Analysis/AnalyzerDefinition";
 import { DeleteServerWideAnalyzerOperation } from "../../../src/ServerWide/Operations/Analyzers/DeleteServerWideAnalyzerOperation";
 import { PutServerWideAnalyzersOperation } from "../../../src/ServerWide/Operations/Analyzers/PutServerWideAnalyzersOperation";
 
-describe("RavenDB_16328_AnalyzersTest", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("RavenDB_16328_AnalyzersTest", function () {
 
     let store: IDocumentStore;
 
diff --git a/test/Ported/Server/ExpirationConfigurationTest.ts b/test/Ported/Server/ExpirationConfigurationTest.ts
@@ -1,10 +1,10 @@
-import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { disposeTestDocumentStore, RavenTestContext, testContext } from "../../Utils/TestUtil";
 import { assertThat } from "../../Utils/AssertExtensions";
 import { ConfigureExpirationOperation } from "../../../src/Documents/Operations/Expiration/ConfigureExpirationOperation";
 import { IDocumentStore } from "../../../src/Documents/IDocumentStore";
 import { ExpirationConfiguration } from "../../../src/Documents/Operations/Expiration/ExpirationConfiguration";
 
-describe("ExpirationConfigurationTest", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("ExpirationConfigurationTest", function () {
 
     let store: IDocumentStore;
 
@@ -27,4 +27,4 @@ describe("ExpirationConfigurationTest", function () {
         assertThat(expirationOperationResult.raftCommandIndex)
             .isNotNull();
     });
-});
+});
diff --git a/test/Ported/Server/Replication/PullReplicationPreventDeletionsTest.ts b/test/Ported/Server/Replication/PullReplicationPreventDeletionsTest.ts
@@ -24,6 +24,8 @@ import { assertThat } from "../../../Utils/AssertExtensions";
     let store: IDocumentStore;
     let replication: ReplicationTestContext;
 
+    this.timeout(60_000);
+
     beforeEach(async function () {
         store = await testContext.getDocumentStore();
         replication = new ReplicationTestContext();
diff --git a/test/Ported/Subscriptions/RevisionsSubscriptionsTest.ts b/test/Ported/Subscriptions/RevisionsSubscriptionsTest.ts
@@ -1,5 +1,5 @@
 import { Company, User } from "../../Assets/Entities";
-import { testContext, disposeTestDocumentStore } from "../../Utils/TestUtil";
+import { testContext, disposeTestDocumentStore, RavenTestContext } from "../../Utils/TestUtil";
 
 import DocumentStore, {
     IDocumentStore,
@@ -12,7 +12,7 @@ import * as assert from "assert";
 // skipped for the time being
 // subscriptions are not working with server version 4.1
 // due to RavenDB-12127
-describe("RevisionsSubscriptionsTest", function () {
+(RavenTestContext.is60Server ? describe.skip : describe)("RevisionsSubscriptionsTest", function () {
     this.timeout(5 * 10 * 1000);
 
     let store: IDocumentStore;
@@ -238,11 +238,11 @@ describe("RevisionsSubscriptionsTest", function () {
             const actualPreviousNames = items
                 .filter(x => x.rawResult.previous)
                 .map(x => x.rawResult.previous.name);
-            
+
             actualPreviousNames.sort();
             assert.strictEqual(actualPreviousNames.length, 9);
             assert.strictEqual(
-                JSON.stringify(actualPreviousNames), 
+                JSON.stringify(actualPreviousNames),
                 JSON.stringify(expectedNames.filter(x => x !== "users1 ver 9")));
 
         } finally {
