@oneuptime/common 7.0.3350 → 7.0.3353
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import Redis, { ClientType } from "./Redis";
|
|
2
|
-
import { Mutex } from "redis-semaphore";
|
|
2
|
+
import { Mutex, LockOptions } from "redis-semaphore";
|
|
3
3
|
|
|
4
4
|
export type SemaphoreMutex = Mutex;
|
|
5
5
|
|
|
@@ -8,7 +8,8 @@ export default class Semaphore {
|
|
|
8
8
|
public static async lock(data: {
|
|
9
9
|
key: string;
|
|
10
10
|
namespace: string;
|
|
11
|
-
lockTimeout?: number;
|
|
11
|
+
lockTimeout?: number | undefined;
|
|
12
|
+
acquireTimeout?: number | undefined;
|
|
12
13
|
}): Promise<SemaphoreMutex> {
|
|
13
14
|
if (!data.lockTimeout) {
|
|
14
15
|
data.lockTimeout = 5000;
|
|
@@ -22,12 +23,20 @@ export default class Semaphore {
|
|
|
22
23
|
throw new Error("Redis client is not connected");
|
|
23
24
|
}
|
|
24
25
|
|
|
26
|
+
const lockOptions: LockOptions = {};
|
|
27
|
+
|
|
28
|
+
if (data.lockTimeout) {
|
|
29
|
+
lockOptions.lockTimeout = data.lockTimeout;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
if (data.acquireTimeout) {
|
|
33
|
+
lockOptions.acquireTimeout = data.acquireTimeout;
|
|
34
|
+
}
|
|
35
|
+
|
|
25
36
|
const mutex: SemaphoreMutex = new Mutex(
|
|
26
37
|
client,
|
|
27
38
|
data.namespace + "-" + key,
|
|
28
|
-
|
|
29
|
-
lockTimeout: data.lockTimeout,
|
|
30
|
-
},
|
|
39
|
+
lockOptions,
|
|
31
40
|
);
|
|
32
41
|
|
|
33
42
|
await mutex.acquire();
|
|
@@ -11,9 +11,14 @@ export default class Semaphore {
|
|
|
11
11
|
if (!client) {
|
|
12
12
|
throw new Error("Redis client is not connected");
|
|
13
13
|
}
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
const lockOptions = {};
|
|
15
|
+
if (data.lockTimeout) {
|
|
16
|
+
lockOptions.lockTimeout = data.lockTimeout;
|
|
17
|
+
}
|
|
18
|
+
if (data.acquireTimeout) {
|
|
19
|
+
lockOptions.acquireTimeout = data.acquireTimeout;
|
|
20
|
+
}
|
|
21
|
+
const mutex = new Mutex(client, data.namespace + "-" + key, lockOptions);
|
|
17
22
|
await mutex.acquire();
|
|
18
23
|
return mutex;
|
|
19
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Semaphore.js","sourceRoot":"","sources":["../../../../Server/Infrastructure/Semaphore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"Semaphore.js","sourceRoot":"","sources":["../../../../Server/Infrastructure/Semaphore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,KAAK,EAAe,MAAM,iBAAiB,CAAC;AAIrD,MAAM,CAAC,OAAO,OAAO,SAAS;IAC5B,uBAAuB;IAChB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAKxB;QACC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QAC1B,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAErB,MAAM,MAAM,GAAsB,KAAK,CAAC,SAAS,EAAE,CAAC;QAEpD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;QACnD,CAAC;QAED,MAAM,WAAW,GAAgB,EAAE,CAAC;QAEpC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,WAAW,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QAC7C,CAAC;QAED,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACxB,WAAW,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QACnD,CAAC;QAED,MAAM,KAAK,GAAmB,IAAI,KAAK,CACrC,MAAM,EACN,IAAI,CAAC,SAAS,GAAG,GAAG,GAAG,GAAG,EAC1B,WAAW,CACZ,CAAC;QAEF,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QAEtB,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,KAAqB;QAC/C,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oneuptime/common",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.3353",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
"airtable": "^0.12.2",
|
|
78
78
|
"axios": "^1.7.2",
|
|
79
79
|
"bullmq": "^5.3.3",
|
|
80
|
-
"Common": "npm:@oneuptime/common@7.0.
|
|
80
|
+
"Common": "npm:@oneuptime/common@7.0.3353",
|
|
81
81
|
"cookie-parser": "^1.4.7",
|
|
82
82
|
"cors": "^2.8.5",
|
|
83
83
|
"cron-parser": "^4.8.1",
|