@zukhruf/mutex 0.6.14 → 0.6.15
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.
- package/README.md +1 -1
- package/dist/lock-stores/docker/docker-engine-store.d.ts +3 -0
- package/dist/lock-stores/docker/docker-engine-store.d.ts.map +1 -1
- package/dist/lock-stores/docker/docker-engine-store.js +12 -7
- package/dist/lock-stores/docker/docker-engine-store.js.map +1 -1
- package/dist/lock-stores/file-system/file-lock-store.d.ts +3 -1
- package/dist/lock-stores/file-system/file-lock-store.d.ts.map +1 -1
- package/dist/lock-stores/file-system/file-lock-store.js +5 -4
- package/dist/lock-stores/file-system/file-lock-store.js.map +1 -1
- package/dist/lock-stores/file-system/lock-file-store.d.ts.map +1 -1
- package/dist/lock-stores/file-system/lock-file-store.js +13 -13
- package/dist/lock-stores/file-system/lock-file-store.js.map +1 -1
- package/dist/lock-stores/file-system/presence.d.ts +3 -2
- package/dist/lock-stores/file-system/presence.d.ts.map +1 -1
- package/dist/lock-stores/file-system/presence.js +9 -7
- package/dist/lock-stores/file-system/presence.js.map +1 -1
- package/dist/lock-stores/file-system/record-file.d.ts +2 -1
- package/dist/lock-stores/file-system/record-file.d.ts.map +1 -1
- package/dist/lock-stores/file-system/record-file.js +2 -2
- package/dist/lock-stores/file-system/record-file.js.map +1 -1
- package/dist/lock-stores/file-system/ticket-queue-file-store.d.ts.map +1 -1
- package/dist/lock-stores/file-system/ticket-queue-file-store.js +38 -36
- package/dist/lock-stores/file-system/ticket-queue-file-store.js.map +1 -1
- package/dist/lock-stores/mariadb/mariadb-store.d.ts +4 -1
- package/dist/lock-stores/mariadb/mariadb-store.d.ts.map +1 -1
- package/dist/lock-stores/mariadb/mariadb-store.js +2 -2
- package/dist/lock-stores/mariadb/mariadb-store.js.map +1 -1
- package/dist/lock-stores/mysql/mysql-store.d.ts +4 -1
- package/dist/lock-stores/mysql/mysql-store.d.ts.map +1 -1
- package/dist/lock-stores/mysql/mysql-store.js +2 -2
- package/dist/lock-stores/mysql/mysql-store.js.map +1 -1
- package/dist/lock-stores/postgres/postgres-store.d.ts +3 -0
- package/dist/lock-stores/postgres/postgres-store.d.ts.map +1 -1
- package/dist/lock-stores/postgres/postgres-store.js.map +1 -1
- package/dist/lock-stores/session/session-lock-store.d.ts +3 -0
- package/dist/lock-stores/session/session-lock-store.d.ts.map +1 -1
- package/dist/lock-stores/session/session-lock-store.js +8 -6
- package/dist/lock-stores/session/session-lock-store.js.map +1 -1
- package/dist/lock-stores/sqlite/holder-record.d.ts +2 -1
- package/dist/lock-stores/sqlite/holder-record.d.ts.map +1 -1
- package/dist/lock-stores/sqlite/holder-record.js +7 -5
- package/dist/lock-stores/sqlite/holder-record.js.map +1 -1
- package/dist/lock-stores/sqlite/sqlite-store.js +3 -3
- package/dist/lock-stores/sqlite/sqlite-store.js.map +1 -1
- package/dist/lock-stores/sqlserver/sqlserver-store.d.ts +3 -0
- package/dist/lock-stores/sqlserver/sqlserver-store.d.ts.map +1 -1
- package/dist/lock-stores/sqlserver/sqlserver-store.js.map +1 -1
- package/dist/mutex/acquire-modes/skip-if-busy-mode.d.ts +6 -3
- package/dist/mutex/acquire-modes/skip-if-busy-mode.d.ts.map +1 -1
- package/dist/mutex/acquire-modes/skip-if-busy-mode.js +11 -9
- package/dist/mutex/acquire-modes/skip-if-busy-mode.js.map +1 -1
- package/package.json +10 -9
package/README.md
CHANGED
|
@@ -77,7 +77,7 @@ if (!tick.acquired) return;
|
|
|
77
77
|
|
|
78
78
|
const fresh = await report.run(buildReport, { mode: Modes.wait() }); // an admin waits, then runs
|
|
79
79
|
await mutex.acquire('product:42', reserve, {
|
|
80
|
-
mode: Modes.skipIfBusy({ waitAtMost: 500 }),
|
|
80
|
+
mode: Modes.skipIfBusy({ waitAtMost: 500, clock: globalThis }),
|
|
81
81
|
});
|
|
82
82
|
```
|
|
83
83
|
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type Clock } from '@zukhruf/async';
|
|
1
2
|
import { type Docker } from '@zukhruf/docker';
|
|
2
3
|
import type { LockHandle } from '../../mutex/lease.ts';
|
|
3
4
|
import type { AcquireOptions, LockStore } from '../../mutex/lock-store.ts';
|
|
@@ -18,6 +19,8 @@ export interface DockerEngineStoreOptions {
|
|
|
18
19
|
heartbeatInterval: number;
|
|
19
20
|
/** Labels on each claim and each rung, so that a cleanup can find them. The labels `zukhruf.mutex.*` of the store replace labels with the same names. */
|
|
20
21
|
labels?: Readonly<Record<string, string>>;
|
|
22
|
+
/** The clock of the heartbeat and of each wait for the removal of a claim: `globalThis` in production, a fake clock in a test. */
|
|
23
|
+
clock: Clock;
|
|
21
24
|
}
|
|
22
25
|
/**
|
|
23
26
|
* Holds a key as a named container on one Docker engine: the claim. The claim
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-engine-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/docker/docker-engine-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"docker-engine-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/docker/docker-engine-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAkB,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAML,KAAK,MAAM,EAEZ,MAAM,iBAAiB,CAAC;AAIzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAI3E,MAAM,WAAW,wBAAwB;IACvC,6GAA6G;IAC7G,MAAM,EAAE,MAAM,CAAC;IACf,gHAAgH;IAChH,KAAK,EAAE,MAAM,CAAC;IACd,mJAAmJ;IACnJ,SAAS,EAAE,MAAM,CAAC;IAClB;;;;;;OAMG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAC1B,yJAAyJ;IACzJ,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1C,kIAAkI;IAClI,KAAK,EAAE,KAAK,CAAC;CACd;AAYD;;;;;;;;GAQG;AACH,qBAAa,iBAAkB,YAAW,SAAS;;gBAIrC,OAAO,EAAE,wBAAwB;IAI7C,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC;IAkBnE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAOxD,oFAAoF;IAC9E,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAO5C"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { delay, timeout } from '@zukhruf/async';
|
|
2
2
|
import { ContainerNotFoundError, ContainerRunningError, NameConflictError, } from '@zukhruf/docker';
|
|
3
3
|
import { FencingToken } from '@zukhruf/fencing';
|
|
4
4
|
import { LeaseController } from '@zukhruf/lease';
|
|
@@ -166,18 +166,22 @@ class Claims {
|
|
|
166
166
|
}
|
|
167
167
|
/** True when the claim is gone within `heartbeatInterval`, false when it is still there. */
|
|
168
168
|
async #removedWithin(claim, { signal }) {
|
|
169
|
-
|
|
169
|
+
using patience = timeout(this.#options.heartbeatInterval, {
|
|
170
|
+
clock: this.#options.clock,
|
|
171
|
+
});
|
|
170
172
|
try {
|
|
171
173
|
await claim.wait({
|
|
172
174
|
condition: 'removed',
|
|
173
|
-
signal: signal === undefined
|
|
175
|
+
signal: signal === undefined
|
|
176
|
+
? patience.signal
|
|
177
|
+
: AbortSignal.any([signal, patience.signal]),
|
|
174
178
|
});
|
|
175
179
|
return true;
|
|
176
180
|
}
|
|
177
181
|
catch (error) {
|
|
178
182
|
if (error instanceof ContainerNotFoundError)
|
|
179
183
|
return true;
|
|
180
|
-
if (signal?.aborted || !patience.aborted)
|
|
184
|
+
if (signal?.aborted || !patience.signal.aborted)
|
|
181
185
|
throw error;
|
|
182
186
|
return false;
|
|
183
187
|
}
|
|
@@ -292,13 +296,14 @@ class Claim {
|
|
|
292
296
|
}
|
|
293
297
|
/** Inspects the claim each interval. A claim that is gone or does not run, or a failed or late answer, loses the lease. */
|
|
294
298
|
async #beat() {
|
|
295
|
-
const interval = this.#options
|
|
299
|
+
const { heartbeatInterval: interval, clock } = this.#options;
|
|
296
300
|
const done = this.#done.signal;
|
|
297
301
|
try {
|
|
298
302
|
for (;;) {
|
|
299
|
-
await delay(interval,
|
|
303
|
+
await delay(interval, { clock, signal: done });
|
|
304
|
+
using limit = timeout(interval, { clock });
|
|
300
305
|
const state = await stateOf(this.#container, {
|
|
301
|
-
signal: AbortSignal.any([done,
|
|
306
|
+
signal: AbortSignal.any([done, limit.signal]),
|
|
302
307
|
});
|
|
303
308
|
if (state !== 'running') {
|
|
304
309
|
throw new Error(state === undefined
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-engine-store.js","sourceRoot":"","sources":["../../../src/lock-stores/docker/docker-engine-store.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"docker-engine-store.js","sourceRoot":"","sources":["../../../src/lock-stores/docker/docker-engine-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,9 @@ export interface FileLockStoreOptions {
|
|
|
13
13
|
/** Shares one lock directory between processes: each key maps to `<directory>/<key>.lock`. */
|
|
14
14
|
export declare abstract class FileLockStore implements LockStore {
|
|
15
15
|
#private;
|
|
16
|
-
|
|
16
|
+
/** The clock of every wait of the store: `globalThis` in production, a fake clock in a test. */
|
|
17
|
+
protected readonly clock: Clock;
|
|
18
|
+
constructor(directory: string, { clock, pollInterval, tokens, }: FileLockStoreOptions);
|
|
17
19
|
acquire(key: string, { signal }?: AcquireOptions): Promise<LockHandle>;
|
|
18
20
|
tryAcquire(key: string): Promise<LockHandle | undefined>;
|
|
19
21
|
/** Makes no directory: a key in a directory that does not exist has no holder. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-lock-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/file-system/file-lock-store.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,KAAK,EAAQ,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGrE,OAAO,EAAE,KAAK,UAAU,EAAY,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAE3E,MAAM,WAAW,oBAAoB;IACnC,qDAAqD;IACrD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kEAAkE;IAClE,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,6FAA6F;IAC7F,KAAK,EAAE,KAAK,CAAC;CACd;AAED,8FAA8F;AAC9F,8BAAsB,aAAc,YAAW,SAAS;;
|
|
1
|
+
{"version":3,"file":"file-lock-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/file-system/file-lock-store.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,KAAK,EAAQ,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGrE,OAAO,EAAE,KAAK,UAAU,EAAY,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAE3E,MAAM,WAAW,oBAAoB;IACnC,qDAAqD;IACrD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kEAAkE;IAClE,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,6FAA6F;IAC7F,KAAK,EAAE,KAAK,CAAC;CACd;AAED,8FAA8F;AAC9F,8BAAsB,aAAc,YAAW,SAAS;;IAItD,gGAAgG;IAChG,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;gBAG9B,SAAS,EAAE,MAAM,EACjB,EACE,KAAK,EACL,YAAiB,EACjB,MAAkD,GACnD,EAAE,oBAAoB;IAQnB,OAAO,CACX,GAAG,EAAE,MAAM,EACX,EAAE,MAAM,EAAE,GAAE,cAAmB,GAC9B,OAAO,CAAC,UAAU,CAAC;IAMhB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAK9D,kFAAkF;IAC5E,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK3C;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAElD,kFAAkF;IAClF,SAAS,CAAC,QAAQ,CAAC,IAAI,CACrB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,GAAG,SAAS,GAC9B,OAAO,CAAC,eAAe,CAAC;IAE3B,mEAAmE;IACnE,SAAS,CAAC,QAAQ,CAAC,OAAO,CACxB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAEvC,sHAAsH;IACtH,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAE3D,0FAA0F;IAC1F,SAAS,CAAC,IAAI,CAAC,CAAC,EACd,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,EACrC,MAAM,EAAE,WAAW,GAAG,SAAS,GAC9B,OAAO,CAAC,CAAC,CAAC;IAQb;;;;;;OAMG;cACa,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;CAiBxE"}
|
|
@@ -9,12 +9,13 @@ export class FileLockStore {
|
|
|
9
9
|
#directory;
|
|
10
10
|
#pollInterval;
|
|
11
11
|
#tokens;
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
/** The clock of every wait of the store: `globalThis` in production, a fake clock in a test. */
|
|
13
|
+
clock;
|
|
14
|
+
constructor(directory, { clock, pollInterval = 10, tokens = new FileTokenSource(directory, { clock }), }) {
|
|
14
15
|
this.#directory = directory;
|
|
15
16
|
this.#pollInterval = pollInterval;
|
|
16
17
|
this.#tokens = tokens;
|
|
17
|
-
this
|
|
18
|
+
this.clock = clock;
|
|
18
19
|
}
|
|
19
20
|
async acquire(key, { signal } = {}) {
|
|
20
21
|
signal?.throwIfAborted();
|
|
@@ -35,7 +36,7 @@ export class FileLockStore {
|
|
|
35
36
|
return poll(attempt, {
|
|
36
37
|
interval: this.#pollInterval,
|
|
37
38
|
signal,
|
|
38
|
-
clock: this
|
|
39
|
+
clock: this.clock,
|
|
39
40
|
});
|
|
40
41
|
}
|
|
41
42
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-lock-store.js","sourceRoot":"","sources":["../../../src/lock-stores/file-system/file-lock-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAc,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAoB,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3E,OAAO,EAAmB,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAYjE,8FAA8F;AAC9F,MAAM,OAAgB,aAAa;IACxB,UAAU,CAAS;IACnB,aAAa,CAAS;IACtB,OAAO,CAAc;
|
|
1
|
+
{"version":3,"file":"file-lock-store.js","sourceRoot":"","sources":["../../../src/lock-stores/file-system/file-lock-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock-file-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/file-system/lock-file-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lock-file-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/file-system/lock-file-store.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAIrD;;;GAGG;AACH,qBAAa,aAAc,SAAQ,aAAa;;IAC9C,mGAAmG;IACnG,SAAS,CAAC,QAAQ,CAAC,aAAa,SAG9B;IAEF,SAAS,CAAC,IAAI,CACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,GAAG,SAAS,GAC9B,OAAO,CAAC,eAAe,CAAC;cAKX,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IA+B3E,kEAAkE;IAClE,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAiBnD"}
|
|
@@ -22,41 +22,41 @@ export class LockFileStore extends FileLockStore {
|
|
|
22
22
|
}
|
|
23
23
|
/** A waiter is present only while it tries to create the file, so giving up leaves nothing behind. */
|
|
24
24
|
async #attempt(path, me) {
|
|
25
|
-
const holder = await readHolder(path);
|
|
25
|
+
const holder = await readHolder(path, this.clock);
|
|
26
26
|
if (holder) {
|
|
27
27
|
await this.#evictIfGone(path, holder);
|
|
28
28
|
return undefined;
|
|
29
29
|
}
|
|
30
30
|
await using claiming = new AsyncDisposableStack();
|
|
31
|
-
const presence = claiming.adopt(Presence.claim(path, me), (claimed) => claimed.withdraw());
|
|
32
|
-
if (!(await createExclusive(path, me.serialize())))
|
|
31
|
+
const presence = claiming.adopt(Presence.claim(path, me, this.clock), (claimed) => claimed.withdraw());
|
|
32
|
+
if (!(await createExclusive(path, me.serialize(), { clock: this.clock })))
|
|
33
33
|
return undefined;
|
|
34
34
|
claiming.move();
|
|
35
35
|
return {
|
|
36
|
-
[Symbol.asyncDispose]: () => presence.releaseAfter(() => removeLockFile(path)),
|
|
36
|
+
[Symbol.asyncDispose]: () => presence.releaseAfter(() => removeLockFile(path, this.clock)),
|
|
37
37
|
};
|
|
38
38
|
}
|
|
39
39
|
/** A gone holder stays: only a caller that acquires evicts it. */
|
|
40
40
|
isHeldAt(path) {
|
|
41
|
-
return Presence.isNamedCallerPresent(path, () => readHolder(path));
|
|
41
|
+
return Presence.isNamedCallerPresent(path, () => readHolder(path, this.clock));
|
|
42
42
|
}
|
|
43
43
|
async #evictIfGone(path, holder) {
|
|
44
|
-
const state = await Presence.judge(path, holder, () => readHolder(path));
|
|
44
|
+
const state = await Presence.judge(path, holder, () => readHolder(path, this.clock));
|
|
45
45
|
if (state !== 'gone')
|
|
46
46
|
return;
|
|
47
47
|
await this.withReclaimLock(path, async () => {
|
|
48
|
-
if ((await readHolder(path))?.id !== holder.id)
|
|
48
|
+
if ((await readHolder(path, this.clock))?.id !== holder.id)
|
|
49
49
|
return;
|
|
50
|
-
await removeLockFile(path);
|
|
51
|
-
await Presence.delete(Presence.pathOf(path, holder));
|
|
50
|
+
await removeLockFile(path, this.clock);
|
|
51
|
+
await Presence.delete(Presence.pathOf(path, holder), this.clock);
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
|
-
function removeLockFile(path) {
|
|
56
|
-
return patiently(() => unlink(path));
|
|
55
|
+
function removeLockFile(path, clock) {
|
|
56
|
+
return patiently(() => unlink(path), { clock });
|
|
57
57
|
}
|
|
58
|
-
async function readHolder(path) {
|
|
59
|
-
const content = await readRecord(path);
|
|
58
|
+
async function readHolder(path, clock) {
|
|
59
|
+
const content = await readRecord(path, clock);
|
|
60
60
|
if (content === undefined)
|
|
61
61
|
return undefined;
|
|
62
62
|
return Caller.parse(content);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lock-file-store.js","sourceRoot":"","sources":["../../../src/lock-stores/file-system/lock-file-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"lock-file-store.js","sourceRoot":"","sources":["../../../src/lock-stores/file-system/lock-file-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Clock } from '@zukhruf/async';
|
|
1
2
|
import { Caller } from './caller.ts';
|
|
2
3
|
/**
|
|
3
4
|
* A caller's presence: the file lock of a file of its own, held from before
|
|
@@ -14,7 +15,7 @@ export declare class Presence {
|
|
|
14
15
|
/** The presence file of `caller`, whose record is at `record`. */
|
|
15
16
|
static pathOf(record: string, caller: Caller): string;
|
|
16
17
|
/** Claims the presence of `caller`, whose record is at `record`. */
|
|
17
|
-
static claim(record: string, caller: Caller): Presence;
|
|
18
|
+
static claim(record: string, caller: Caller, clock: Clock): Presence;
|
|
18
19
|
/**
|
|
19
20
|
* Whether `caller`, whom the record at `record` named, still runs. A caller's
|
|
20
21
|
* record goes before its presence file, so a missing presence file is a
|
|
@@ -25,7 +26,7 @@ export declare class Presence {
|
|
|
25
26
|
/** Whether the caller that `readNamed` reads from the record at `record` still runs. Writes nothing. */
|
|
26
27
|
static isNamedCallerPresent(record: string, readNamed: () => Promise<Caller | undefined>): Promise<boolean>;
|
|
27
28
|
/** Deletes the file of a presence that has ended. */
|
|
28
|
-
static delete(path: string): Promise<void>;
|
|
29
|
+
static delete(path: string, clock: Clock): Promise<void>;
|
|
29
30
|
/** A record names a caller whose presence file does not exist, so nobody can tell whether it runs. */
|
|
30
31
|
static missing(record: string, path: string): Error;
|
|
31
32
|
/** Lets the kernel lock go. The file stays for whoever removes the caller's record. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presence.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/file-system/presence.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"presence.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/file-system/presence.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAG5C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC;;;;;;GAMG;AACH,qBAAa,QAAQ;;IAKnB,OAAO;IAMP,2DAA2D;IAC3D,MAAM,CAAC,QAAQ,CAAC,YAAY,SAAgD;IAE5E,kEAAkE;IAClE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAIrD,oEAAoE;IACpE,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,QAAQ;IAapE;;;;;OAKG;WACU,KAAK,CAChB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,GAC3C,OAAO,CAAC,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;IAWxC,wGAAwG;WAC3F,oBAAoB,CAC/B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,GAC3C,OAAO,CAAC,OAAO,CAAC;IASnB,qDAAqD;WACxC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAW9D,sGAAsG;IACtG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK;IAMnD,uFAAuF;IACvF,GAAG,IAAI,IAAI;IAIX;;;;OAIG;IACG,YAAY,CAAC,YAAY,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAWpE,uEAAuE;IACjE,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAIhC"}
|
|
@@ -11,9 +11,11 @@ import { Caller } from "./caller.js";
|
|
|
11
11
|
export class Presence {
|
|
12
12
|
#path;
|
|
13
13
|
#lock;
|
|
14
|
-
|
|
14
|
+
#clock;
|
|
15
|
+
constructor(path, lock, clock) {
|
|
15
16
|
this.#path = path;
|
|
16
17
|
this.#lock = lock;
|
|
18
|
+
this.#clock = clock;
|
|
17
19
|
}
|
|
18
20
|
/** The length of what `pathOf` adds to a record's path. */
|
|
19
21
|
static suffixLength = Presence.pathOf('', Caller.current()).length;
|
|
@@ -22,7 +24,7 @@ export class Presence {
|
|
|
22
24
|
return `${record}.${caller.id}.presence`;
|
|
23
25
|
}
|
|
24
26
|
/** Claims the presence of `caller`, whose record is at `record`. */
|
|
25
|
-
static claim(record, caller) {
|
|
27
|
+
static claim(record, caller, clock) {
|
|
26
28
|
const path = Presence.pathOf(record, caller);
|
|
27
29
|
using opened = new DisposableStack();
|
|
28
30
|
const lock = opened.use(FileLock.open(path));
|
|
@@ -30,7 +32,7 @@ export class Presence {
|
|
|
30
32
|
throw new Error(`The presence file ${JSON.stringify(path)} is locked already, but it belongs to one caller only. Another program opened it.`);
|
|
31
33
|
}
|
|
32
34
|
opened.move();
|
|
33
|
-
return new Presence(path, lock);
|
|
35
|
+
return new Presence(path, lock, clock);
|
|
34
36
|
}
|
|
35
37
|
/**
|
|
36
38
|
* Whether `caller`, whom the record at `record` named, still runs. A caller's
|
|
@@ -62,9 +64,9 @@ export class Presence {
|
|
|
62
64
|
}
|
|
63
65
|
}
|
|
64
66
|
/** Deletes the file of a presence that has ended. */
|
|
65
|
-
static async delete(path) {
|
|
67
|
+
static async delete(path, clock) {
|
|
66
68
|
try {
|
|
67
|
-
await patiently(() => unlink(path));
|
|
69
|
+
await patiently(() => unlink(path), { clock });
|
|
68
70
|
}
|
|
69
71
|
catch (error) {
|
|
70
72
|
throw new Error(`The presence ${JSON.stringify(path)} has ended, but its file could not be deleted. The file locks nothing; delete it by hand.`, { cause: error });
|
|
@@ -92,12 +94,12 @@ export class Presence {
|
|
|
92
94
|
throw error;
|
|
93
95
|
}
|
|
94
96
|
this.end();
|
|
95
|
-
await Presence.delete(this.#path);
|
|
97
|
+
await Presence.delete(this.#path, this.#clock);
|
|
96
98
|
}
|
|
97
99
|
/** Ends a presence whose record never appeared, or is gone already. */
|
|
98
100
|
async withdraw() {
|
|
99
101
|
this.end();
|
|
100
|
-
await Presence.delete(this.#path);
|
|
102
|
+
await Presence.delete(this.#path, this.#clock);
|
|
101
103
|
}
|
|
102
104
|
}
|
|
103
105
|
//# sourceMappingURL=presence.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presence.js","sourceRoot":"","sources":["../../../src/lock-stores/file-system/presence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"presence.js","sourceRoot":"","sources":["../../../src/lock-stores/file-system/presence.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Clock } from '@zukhruf/async';
|
|
1
2
|
/**
|
|
2
3
|
* The text of the caller record at `path`, or `undefined` when there is none.
|
|
3
4
|
*
|
|
@@ -6,5 +7,5 @@
|
|
|
6
7
|
* read opens and closes the file in one call; the asynchronous read of
|
|
7
8
|
* Node.js 24 keeps it open across several turns of the event loop.
|
|
8
9
|
*/
|
|
9
|
-
export declare function readRecord(path: string): Promise<string | undefined>;
|
|
10
|
+
export declare function readRecord(path: string, clock: Clock): Promise<string | undefined>;
|
|
10
11
|
//# sourceMappingURL=record-file.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record-file.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/file-system/record-file.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"record-file.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/file-system/record-file.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAG5C;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAO7B"}
|
|
@@ -8,9 +8,9 @@ import { isErrno, patiently } from '@zukhruf/fs';
|
|
|
8
8
|
* read opens and closes the file in one call; the asynchronous read of
|
|
9
9
|
* Node.js 24 keeps it open across several turns of the event loop.
|
|
10
10
|
*/
|
|
11
|
-
export async function readRecord(path) {
|
|
11
|
+
export async function readRecord(path, clock) {
|
|
12
12
|
try {
|
|
13
|
-
return await patiently(async () => readFileSync(path, 'utf8'));
|
|
13
|
+
return await patiently(async () => readFileSync(path, 'utf8'), { clock });
|
|
14
14
|
}
|
|
15
15
|
catch (error) {
|
|
16
16
|
if (isErrno(error, 'ENOENT'))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record-file.js","sourceRoot":"","sources":["../../../src/lock-stores/file-system/record-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"record-file.js","sourceRoot":"","sources":["../../../src/lock-stores/file-system/record-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAGvC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAEjD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAAY,EACZ,KAAY;IAEZ,IAAI,CAAC;QACH,OAAO,MAAM,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC;YAAE,OAAO,SAAS,CAAC;QAC/C,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ticket-queue-file-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/file-system/ticket-queue-file-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ticket-queue-file-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/file-system/ticket-queue-file-store.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAIrD;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,aAAa;;IACrD,+FAA+F;IAC/F,SAAS,CAAC,QAAQ,CAAC,aAAa,SAG9B;cAEc,IAAI,CAClB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,GAAG,SAAS,GAC9B,OAAO,CAAC,eAAe,CAAC;cAWX,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAgB3E,8GAA8G;IAC9G,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAyCnD"}
|
|
@@ -19,38 +19,38 @@ export class TicketQueueFileStore extends FileLockStore {
|
|
|
19
19
|
async lock(path, signal) {
|
|
20
20
|
const me = Caller.current();
|
|
21
21
|
await using leaving = new AsyncDisposableStack();
|
|
22
|
-
const presence = Presence.claim(path, me);
|
|
23
|
-
leaving.defer(() => leave(path, me, presence));
|
|
24
|
-
await enqueue(path, me);
|
|
22
|
+
const presence = Presence.claim(path, me, this.clock);
|
|
23
|
+
leaving.defer(() => leave(path, me, presence, this.clock));
|
|
24
|
+
await enqueue(path, me, this.clock);
|
|
25
25
|
await this.poll(() => this.#attempt(path, me), signal);
|
|
26
26
|
leaving.move();
|
|
27
|
-
return holding(path, me, presence);
|
|
27
|
+
return holding(path, me, presence, this.clock);
|
|
28
28
|
}
|
|
29
29
|
async tryLock(path) {
|
|
30
|
-
const head = await readHead(path);
|
|
30
|
+
const head = await readHead(path, this.clock);
|
|
31
31
|
if (head)
|
|
32
32
|
await this.#evictGoneHeads(path, head);
|
|
33
|
-
if ((await readTickets(path)).length > 0)
|
|
33
|
+
if ((await readTickets(path, this.clock)).length > 0)
|
|
34
34
|
return undefined;
|
|
35
35
|
const me = Caller.current();
|
|
36
36
|
await using leaving = new AsyncDisposableStack();
|
|
37
|
-
const presence = Presence.claim(path, me);
|
|
38
|
-
leaving.defer(() => leave(path, me, presence));
|
|
39
|
-
await enqueue(path, me);
|
|
37
|
+
const presence = Presence.claim(path, me, this.clock);
|
|
38
|
+
leaving.defer(() => leave(path, me, presence, this.clock));
|
|
39
|
+
await enqueue(path, me, this.clock);
|
|
40
40
|
// Another waiter appended at the same moment and is first.
|
|
41
|
-
if ((await readHead(path))?.id !== me.id)
|
|
41
|
+
if ((await readHead(path, this.clock))?.id !== me.id)
|
|
42
42
|
return undefined;
|
|
43
43
|
leaving.move();
|
|
44
|
-
return holding(path, me, presence);
|
|
44
|
+
return holding(path, me, presence, this.clock);
|
|
45
45
|
}
|
|
46
46
|
/** The first ticket's caller holds the key. A gone one does not, and a waiter behind it holds nothing yet. */
|
|
47
47
|
isHeldAt(path) {
|
|
48
|
-
return Presence.isNamedCallerPresent(path, () => readHead(path));
|
|
48
|
+
return Presence.isNamedCallerPresent(path, () => readHead(path, this.clock));
|
|
49
49
|
}
|
|
50
50
|
async #attempt(path, me) {
|
|
51
|
-
const tickets = await readTickets(path);
|
|
51
|
+
const tickets = await readTickets(path, this.clock);
|
|
52
52
|
if (!tickets.some((ticket) => ticket.id === me.id)) {
|
|
53
|
-
await enqueue(path, me);
|
|
53
|
+
await enqueue(path, me, this.clock);
|
|
54
54
|
return undefined;
|
|
55
55
|
}
|
|
56
56
|
const [head] = tickets;
|
|
@@ -67,19 +67,19 @@ export class TicketQueueFileStore extends FileLockStore {
|
|
|
67
67
|
* drop a later holder's ticket.
|
|
68
68
|
*/
|
|
69
69
|
async #evictGoneHeads(path, head) {
|
|
70
|
-
if (!(await isGone(path, head)))
|
|
70
|
+
if (!(await isGone(path, head, this.clock)))
|
|
71
71
|
return;
|
|
72
72
|
await this.withReclaimLock(path, async () => {
|
|
73
73
|
let gone = head;
|
|
74
74
|
for (;;) {
|
|
75
|
-
const tickets = await readTickets(path);
|
|
75
|
+
const tickets = await readTickets(path, this.clock);
|
|
76
76
|
if (tickets[0]?.id !== gone.id)
|
|
77
77
|
return;
|
|
78
78
|
const rest = tickets.filter((ticket) => ticket.id !== gone.id);
|
|
79
|
-
await replace(path, rest);
|
|
80
|
-
await Presence.delete(Presence.pathOf(path, gone));
|
|
79
|
+
await replace(path, rest, this.clock);
|
|
80
|
+
await Presence.delete(Presence.pathOf(path, gone), this.clock);
|
|
81
81
|
const [next] = rest;
|
|
82
|
-
if (!next || !(await isGone(path, next)))
|
|
82
|
+
if (!next || !(await isGone(path, next, this.clock)))
|
|
83
83
|
return;
|
|
84
84
|
gone = next;
|
|
85
85
|
}
|
|
@@ -87,8 +87,8 @@ export class TicketQueueFileStore extends FileLockStore {
|
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
/** Whether the caller at the head of the queue at `path` no longer runs. */
|
|
90
|
-
async function isGone(path, head) {
|
|
91
|
-
const state = await Presence.judge(path, head, () => readHead(path));
|
|
90
|
+
async function isGone(path, head, clock) {
|
|
91
|
+
const state = await Presence.judge(path, head, () => readHead(path, clock));
|
|
92
92
|
return state === 'gone';
|
|
93
93
|
}
|
|
94
94
|
/**
|
|
@@ -96,41 +96,43 @@ async function isGone(path, head) {
|
|
|
96
96
|
* the queue. Its presence ends, so the ticket reads as gone and whoever finds
|
|
97
97
|
* it first evicts it, together with the presence file.
|
|
98
98
|
*/
|
|
99
|
-
async function leave(path, me, presence) {
|
|
99
|
+
async function leave(path, me, presence, clock) {
|
|
100
100
|
using reading = new DisposableStack();
|
|
101
101
|
reading.defer(() => presence.end());
|
|
102
|
-
const tickets = await readTickets(path);
|
|
102
|
+
const tickets = await readTickets(path, clock);
|
|
103
103
|
reading.move();
|
|
104
104
|
if (tickets.some((ticket) => ticket.id === me.id))
|
|
105
105
|
presence.end();
|
|
106
106
|
else
|
|
107
107
|
await presence.withdraw();
|
|
108
108
|
}
|
|
109
|
-
function holding(path, me, presence) {
|
|
109
|
+
function holding(path, me, presence, clock) {
|
|
110
110
|
return {
|
|
111
|
-
[Symbol.asyncDispose]: () => presence.releaseAfter(() => removeTicket(path, me)),
|
|
111
|
+
[Symbol.asyncDispose]: () => presence.releaseAfter(() => removeTicket(path, me, clock)),
|
|
112
112
|
};
|
|
113
113
|
}
|
|
114
|
-
async function removeTicket(path, me) {
|
|
115
|
-
const remaining = await readTickets(path);
|
|
116
|
-
await replace(path, remaining.filter((ticket) => ticket.id !== me.id));
|
|
114
|
+
async function removeTicket(path, me, clock) {
|
|
115
|
+
const remaining = await readTickets(path, clock);
|
|
116
|
+
await replace(path, remaining.filter((ticket) => ticket.id !== me.id), clock);
|
|
117
117
|
}
|
|
118
|
-
async function enqueue(path, caller) {
|
|
119
|
-
await patiently(() => appendFile(path, `${caller.serialize()}\n`)
|
|
118
|
+
async function enqueue(path, caller, clock) {
|
|
119
|
+
await patiently(() => appendFile(path, `${caller.serialize()}\n`), {
|
|
120
|
+
clock,
|
|
121
|
+
});
|
|
120
122
|
}
|
|
121
123
|
/** The caller of the first ticket, which holds the key while it runs. */
|
|
122
|
-
async function readHead(path) {
|
|
123
|
-
const [head] = await readTickets(path);
|
|
124
|
+
async function readHead(path, clock) {
|
|
125
|
+
const [head] = await readTickets(path, clock);
|
|
124
126
|
return head;
|
|
125
127
|
}
|
|
126
|
-
async function readTickets(path) {
|
|
127
|
-
const content = await readRecord(path);
|
|
128
|
+
async function readTickets(path, clock) {
|
|
129
|
+
const content = await readRecord(path, clock);
|
|
128
130
|
if (content === undefined)
|
|
129
131
|
return [];
|
|
130
132
|
// The last segment is empty or a ticket still being appended.
|
|
131
133
|
return content.split('\n').slice(0, -1).map(Caller.parse);
|
|
132
134
|
}
|
|
133
|
-
async function replace(path, tickets) {
|
|
134
|
-
await atomicWrite(path, tickets.map((ticket) => `${ticket.serialize()}\n`).join(''));
|
|
135
|
+
async function replace(path, tickets, clock) {
|
|
136
|
+
await atomicWrite(path, tickets.map((ticket) => `${ticket.serialize()}\n`).join(''), { clock });
|
|
135
137
|
}
|
|
136
138
|
//# sourceMappingURL=ticket-queue-file-store.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ticket-queue-file-store.js","sourceRoot":"","sources":["../../../src/lock-stores/file-system/ticket-queue-file-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"ticket-queue-file-store.js","sourceRoot":"","sources":["../../../src/lock-stores/file-system/ticket-queue-file-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Clock } from '@zukhruf/async';
|
|
1
2
|
import { type GetLockSession } from '../mysql/get-lock-dialect.ts';
|
|
2
3
|
import { SessionLockStore } from '../session/session-lock-store.ts';
|
|
3
4
|
/**
|
|
@@ -20,6 +21,8 @@ export interface MariadbStoreOptions {
|
|
|
20
21
|
* ended, before its signal aborts.
|
|
21
22
|
*/
|
|
22
23
|
heartbeatInterval: number;
|
|
24
|
+
/** The clock of the heartbeat: `globalThis` in production, a fake clock in a test. */
|
|
25
|
+
clock: Clock;
|
|
23
26
|
}
|
|
24
27
|
/**
|
|
25
28
|
* Holds a MariaDB user lock (`GET_LOCK`) for each key, on a session of its
|
|
@@ -28,6 +31,6 @@ export interface MariadbStoreOptions {
|
|
|
28
31
|
* reaches one MariaDB database shares the locks.
|
|
29
32
|
*/
|
|
30
33
|
export declare class MariadbStore extends SessionLockStore<MariadbSession> {
|
|
31
|
-
constructor({ connect, sequence, heartbeatInterval }: MariadbStoreOptions);
|
|
34
|
+
constructor({ connect, sequence, heartbeatInterval, clock, }: MariadbStoreOptions);
|
|
32
35
|
}
|
|
33
36
|
//# sourceMappingURL=mariadb-store.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mariadb-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/mariadb/mariadb-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EAIpB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE;;;GAGG;AACH,MAAM,WAAW,cAAe,SAAQ,cAAc;IACpD,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACxD,4DAA4D;IAC5D,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAmB;IAClC,qEAAqE;IACrE,OAAO,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;IACnC,sHAAsH;IACtH,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"mariadb-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/mariadb/mariadb-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAEL,KAAK,cAAc,EAIpB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE;;;GAGG;AACH,MAAM,WAAW,cAAe,SAAQ,cAAc;IACpD,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACxD,4DAA4D;IAC5D,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAmB;IAClC,qEAAqE;IACrE,OAAO,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;IACnC,sHAAsH;IACtH,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAC1B,sFAAsF;IACtF,KAAK,EAAE,KAAK,CAAC;CACd;AASD;;;;;GAKG;AACH,qBAAa,YAAa,SAAQ,gBAAgB,CAAC,cAAc,CAAC;gBACpD,EACV,OAAO,EACP,QAAQ,EACR,iBAAiB,EACjB,KAAK,GACN,EAAE,mBAAmB;CAMvB"}
|
|
@@ -13,8 +13,8 @@ const oneYear = 31_536_000;
|
|
|
13
13
|
* reaches one MariaDB database shares the locks.
|
|
14
14
|
*/
|
|
15
15
|
export class MariadbStore extends SessionLockStore {
|
|
16
|
-
constructor({ connect, sequence, heartbeatInterval }) {
|
|
17
|
-
super({ connect, heartbeatInterval }, getLockDialect(mariadbServer(quoteName(sequence))));
|
|
16
|
+
constructor({ connect, sequence, heartbeatInterval, clock, }) {
|
|
17
|
+
super({ connect, heartbeatInterval, clock }, getLockDialect(mariadbServer(quoteName(sequence))));
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
20
|
function mariadbServer(sequence) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mariadb-store.js","sourceRoot":"","sources":["../../../src/lock-stores/mariadb/mariadb-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mariadb-store.js","sourceRoot":"","sources":["../../../src/lock-stores/mariadb/mariadb-store.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,cAAc,EACd,QAAQ,EACR,SAAS,GACV,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AA2BpE;;;;GAIG;AACH,MAAM,OAAO,GAAG,UAAU,CAAC;AAE3B;;;;;GAKG;AACH,MAAM,OAAO,YAAa,SAAQ,gBAAgC;IAChE,YAAY,EACV,OAAO,EACP,QAAQ,EACR,iBAAiB,EACjB,KAAK,GACe;QACpB,KAAK,CACH,EAAE,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,EACrC,cAAc,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CACnD,CAAC;IACJ,CAAC;CACF;AAED,SAAS,aAAa,CAAC,QAAgB;IACrC,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,uEAAuE;QACvE,aAAa,EAAE,4DAA4D,QAAQ,KAAK,OAAO,aAAa;QAC5G,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;QACzD,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,OAAO,CAAC,OAAO,EAAE;QAC7C,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAClB,MAAM,GAAG,GAAG,MAAM,GAAG,CACnB,uBAAuB,QAAQ,qBAAqB,EACpD,EAAE,CACH,CAAC;YACF,IAAI,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACvC,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,kBAAkB,CAAC,CAAC;YACrE,CAAC;YACD,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9B,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Clock } from '@zukhruf/async';
|
|
1
2
|
import { SessionLockStore } from '../session/session-lock-store.ts';
|
|
2
3
|
import { type GetLockSession } from './get-lock-dialect.ts';
|
|
3
4
|
/**
|
|
@@ -24,6 +25,8 @@ export interface MysqlStoreOptions {
|
|
|
24
25
|
* ended, before its signal aborts.
|
|
25
26
|
*/
|
|
26
27
|
heartbeatInterval: number;
|
|
28
|
+
/** The clock of the heartbeat: `globalThis` in production, a fake clock in a test. */
|
|
29
|
+
clock: Clock;
|
|
27
30
|
}
|
|
28
31
|
/**
|
|
29
32
|
* Holds a MySQL user lock (`GET_LOCK`) for each key, on a session of its own.
|
|
@@ -32,6 +35,6 @@ export interface MysqlStoreOptions {
|
|
|
32
35
|
* MySQL database shares the locks.
|
|
33
36
|
*/
|
|
34
37
|
export declare class MysqlStore extends SessionLockStore<MysqlSession> {
|
|
35
|
-
constructor({ connect, table, heartbeatInterval }: MysqlStoreOptions);
|
|
38
|
+
constructor({ connect, table, heartbeatInterval, clock }: MysqlStoreOptions);
|
|
36
39
|
}
|
|
37
40
|
//# sourceMappingURL=mysql-store.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/mysql/mysql-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAEL,KAAK,cAAc,EAIpB,MAAM,uBAAuB,CAAC;AAE/B;;;GAGG;AACH,MAAM,WAAW,YAAa,SAAQ,cAAc;IAClD,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IACnE,0CAA0C;IAC1C,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,qEAAqE;IACrE,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;IACjC;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"mysql-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/mysql/mysql-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAEL,KAAK,cAAc,EAIpB,MAAM,uBAAuB,CAAC;AAE/B;;;GAGG;AACH,MAAM,WAAW,YAAa,SAAQ,cAAc;IAClD,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IACnE,0CAA0C;IAC1C,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,qEAAqE;IACrE,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;IACjC;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAC1B,sFAAsF;IACtF,KAAK,EAAE,KAAK,CAAC;CACd;AAED;;;;;GAKG;AACH,qBAAa,UAAW,SAAQ,gBAAgB,CAAC,YAAY,CAAC;gBAChD,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,KAAK,EAAE,EAAE,iBAAiB;CAM5E"}
|
|
@@ -7,8 +7,8 @@ import { getLockDialect, lockName, quoteName, } from "./get-lock-dialect.js";
|
|
|
7
7
|
* MySQL database shares the locks.
|
|
8
8
|
*/
|
|
9
9
|
export class MysqlStore extends SessionLockStore {
|
|
10
|
-
constructor({ connect, table, heartbeatInterval }) {
|
|
11
|
-
super({ connect, heartbeatInterval }, getLockDialect(mysqlServer(quoteName(table))));
|
|
10
|
+
constructor({ connect, table, heartbeatInterval, clock }) {
|
|
11
|
+
super({ connect, heartbeatInterval, clock }, getLockDialect(mysqlServer(quoteName(table))));
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
function mysqlServer(table) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mysql-store.js","sourceRoot":"","sources":["../../../src/lock-stores/mysql/mysql-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mysql-store.js","sourceRoot":"","sources":["../../../src/lock-stores/mysql/mysql-store.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAGL,cAAc,EACd,QAAQ,EACR,SAAS,GACV,MAAM,uBAAuB,CAAC;AA+B/B;;;;;GAKG;AACH,MAAM,OAAO,UAAW,SAAQ,gBAA8B;IAC5D,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,KAAK,EAAqB;QACzE,KAAK,CACH,EAAE,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,EACrC,cAAc,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAC9C,CAAC;IACJ,CAAC;CACF;AAED,SAAS,WAAW,CAAC,KAAa;IAChC,OAAO;QACL,MAAM,EAAE,OAAO;QACf,uEAAuE;QACvE,2DAA2D;QAC3D,aAAa,EAAE,0DAA0D,QAAQ,iBAAiB;QAClG,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1E,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;QACxC,0EAA0E;QAC1E,sEAAsE;QACtE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAClB,MAAM,GAAG,CAAC,UAAU,KAAK,kCAAkC,EAAE,EAAE,CAAC,CAAC;YACjE,MAAM,GAAG,GAAG,MAAM,GAAG,CACnB,wEAAwE,EACxE,EAAE,CACH,CAAC;YACF,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;YACzC,IAAI,OAAO,KAAK,CAAC,IAAI,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACxD,MAAM,IAAI,KAAK,CACb,mBAAmB,KAAK,kDAAkD,OAAO,GAAG,CACrF,CAAC;YACJ,CAAC;YACD,OAAO,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9B,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type Clock } from '@zukhruf/async';
|
|
1
2
|
import { SessionLockStore } from '../session/session-lock-store.ts';
|
|
2
3
|
/**
|
|
3
4
|
* One connection to the Postgres server: only the methods that the store
|
|
@@ -24,6 +25,8 @@ export interface PostgresStoreOptions {
|
|
|
24
25
|
* ended, before its signal aborts.
|
|
25
26
|
*/
|
|
26
27
|
heartbeatInterval: number;
|
|
28
|
+
/** The clock of the heartbeat: `globalThis` in production, a fake clock in a test. */
|
|
29
|
+
clock: Clock;
|
|
27
30
|
}
|
|
28
31
|
/**
|
|
29
32
|
* Holds a session-level advisory lock of Postgres for each key, on a session
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/postgres/postgres-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"postgres-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/postgres/postgres-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,gBAAgB,CAAC;AAG1D,OAAO,EAEL,gBAAgB,EACjB,MAAM,kCAAkC,CAAC;AAE1C;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,KAAK,CACH,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,OAAO,EAAE,GAChB,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;KAAE,CAAC,CAAC;IAChD,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO,CAAC;IAC9D,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;IAChD,GAAG,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO,CAAC;IACvE,sEAAsE;IACtE,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,oBAAoB;IACnC,qEAAqE;IACrE,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;IACpC,sFAAsF;IACtF,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAC1B,sFAAsF;IACtF,KAAK,EAAE,KAAK,CAAC;CACd;AAeD;;;;;;;;;GASG;AACH,qBAAa,aAAc,SAAQ,gBAAgB,CAAC,eAAe,CAAC;gBACtD,OAAO,EAAE,oBAAoB;CAG1C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgres-store.js","sourceRoot":"","sources":["../../../src/lock-stores/postgres/postgres-store.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"postgres-store.js","sourceRoot":"","sources":["../../../src/lock-stores/postgres/postgres-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type Clock } from '@zukhruf/async';
|
|
1
2
|
import type { LockHandle } from '../../mutex/lease.ts';
|
|
2
3
|
import type { AcquireOptions, LockStore } from '../../mutex/lock-store.ts';
|
|
3
4
|
/** The events of a session that tell the store that the session ended. */
|
|
@@ -50,6 +51,8 @@ export interface SessionLockStoreOptions<Session extends SessionEvents> {
|
|
|
50
51
|
* ended, before its signal aborts.
|
|
51
52
|
*/
|
|
52
53
|
heartbeatInterval: number;
|
|
54
|
+
/** The clock of the heartbeat: `globalThis` in production, a fake clock in a test. */
|
|
55
|
+
clock: Clock;
|
|
53
56
|
}
|
|
54
57
|
/**
|
|
55
58
|
* Holds a session-level lock of a SQL server for each key, on a session of
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-lock-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/session/session-lock-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session-lock-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/session/session-lock-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { untilAborted } from '@zukhruf/async';
|
|
1
|
+
import { delay, timeout, untilAborted } from '@zukhruf/async';
|
|
3
2
|
import { FencingToken } from '@zukhruf/fencing';
|
|
4
3
|
import { LeaseController } from '@zukhruf/lease';
|
|
5
4
|
import { InProcessTurns } from "../../shared/in-process-turns.js";
|
|
@@ -59,7 +58,7 @@ export class SessionLockStore {
|
|
|
59
58
|
const dialect = this.#dialect;
|
|
60
59
|
const connecting = this.#options.connect();
|
|
61
60
|
try {
|
|
62
|
-
return new KeySession(new OwnedSession(await untilAborted(connecting, signal), dialect), key, this.#options.heartbeatInterval, dialect);
|
|
61
|
+
return new KeySession(new OwnedSession(await untilAborted(connecting, signal), dialect), key, this.#options.heartbeatInterval, this.#options.clock, dialect);
|
|
63
62
|
}
|
|
64
63
|
catch (error) {
|
|
65
64
|
if (signal?.aborted && error === signal.reason) {
|
|
@@ -114,14 +113,16 @@ class KeySession {
|
|
|
114
113
|
#owned;
|
|
115
114
|
#lock;
|
|
116
115
|
#heartbeatInterval;
|
|
116
|
+
#clock;
|
|
117
117
|
#dialect;
|
|
118
118
|
#lease;
|
|
119
119
|
/** Aborts when the store stops holding: a release, or a lost session. */
|
|
120
120
|
#done = new AbortController();
|
|
121
|
-
constructor(owned, key, heartbeatInterval, dialect) {
|
|
121
|
+
constructor(owned, key, heartbeatInterval, clock, dialect) {
|
|
122
122
|
this.#owned = owned;
|
|
123
123
|
this.#lock = { key, name: dialect.lockName(key) };
|
|
124
124
|
this.#heartbeatInterval = heartbeatInterval;
|
|
125
|
+
this.#clock = clock;
|
|
125
126
|
this.#dialect = dialect;
|
|
126
127
|
this.#lease = new LeaseController(key);
|
|
127
128
|
}
|
|
@@ -179,8 +180,9 @@ class KeySession {
|
|
|
179
180
|
const done = this.#done.signal;
|
|
180
181
|
try {
|
|
181
182
|
for (;;) {
|
|
182
|
-
await delay(interval,
|
|
183
|
-
|
|
183
|
+
await delay(interval, { clock: this.#clock, signal: done });
|
|
184
|
+
using limit = timeout(interval, { clock: this.#clock });
|
|
185
|
+
const holds = await untilAborted(this.#dialect.holds(this.#owned.session, this.#lock), AbortSignal.any([done, limit.signal]));
|
|
184
186
|
if (!holds) {
|
|
185
187
|
throw new Error(`The session no longer holds the lock of ${JSON.stringify(this.#lock.key)}.`);
|
|
186
188
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-lock-store.js","sourceRoot":"","sources":["../../../src/lock-stores/session/session-lock-store.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"session-lock-store.js","sourceRoot":"","sources":["../../../src/lock-stores/session/session-lock-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Clock } from '@zukhruf/async';
|
|
1
2
|
/**
|
|
2
3
|
* Names the holder of a SQLite lock in `<lock>.holder/caller`, beside the
|
|
3
4
|
* holder's presence. A look reads these two files and never the lock that
|
|
@@ -6,7 +7,7 @@
|
|
|
6
7
|
*/
|
|
7
8
|
export declare class HolderRecord {
|
|
8
9
|
#private;
|
|
9
|
-
constructor(lockPath: string);
|
|
10
|
+
constructor(lockPath: string, clock: Clock);
|
|
10
11
|
/**
|
|
11
12
|
* Names this caller as the holder: its presence first, then the record that
|
|
12
13
|
* names it, so a look never finds a record whose presence is still to come.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"holder-record.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/sqlite/holder-record.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"holder-record.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/sqlite/holder-record.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAO5C;;;;;GAKG;AACH,qBAAa,YAAY;;gBAKX,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK;IAM1C;;;OAGG;IACG,QAAQ,IAAI,OAAO,CAAC,eAAe,CAAC;IAmB1C,2EAA2E;IAC3E,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;CAkC9B"}
|
|
@@ -13,9 +13,11 @@ import { readRecord } from "../file-system/record-file.js";
|
|
|
13
13
|
export class HolderRecord {
|
|
14
14
|
#folder;
|
|
15
15
|
#path;
|
|
16
|
-
|
|
16
|
+
#clock;
|
|
17
|
+
constructor(lockPath, clock) {
|
|
17
18
|
this.#folder = `${lockPath}.holder`;
|
|
18
19
|
this.#path = join(this.#folder, 'caller');
|
|
20
|
+
this.#clock = clock;
|
|
19
21
|
}
|
|
20
22
|
/**
|
|
21
23
|
* Names this caller as the holder: its presence first, then the record that
|
|
@@ -25,12 +27,12 @@ export class HolderRecord {
|
|
|
25
27
|
const me = Caller.current();
|
|
26
28
|
await mkdir(this.#folder, { recursive: true });
|
|
27
29
|
await using announcing = new AsyncDisposableStack();
|
|
28
|
-
const presence = announcing.adopt(Presence.claim(this.#path, me), (claimed) => claimed.withdraw());
|
|
29
|
-
await atomicWrite(this.#path, me.serialize());
|
|
30
|
+
const presence = announcing.adopt(Presence.claim(this.#path, me, this.#clock), (claimed) => claimed.withdraw());
|
|
31
|
+
await atomicWrite(this.#path, me.serialize(), { clock: this.#clock });
|
|
30
32
|
announcing.move();
|
|
31
33
|
await this.#clearEarlierHolders(me);
|
|
32
34
|
return {
|
|
33
|
-
[Symbol.asyncDispose]: () => presence.releaseAfter(() => patiently(() => unlink(this.#path))),
|
|
35
|
+
[Symbol.asyncDispose]: () => presence.releaseAfter(() => patiently(() => unlink(this.#path), { clock: this.#clock })),
|
|
34
36
|
};
|
|
35
37
|
}
|
|
36
38
|
/** Whether the holder that the record names still runs. Writes nothing. */
|
|
@@ -53,7 +55,7 @@ export class HolderRecord {
|
|
|
53
55
|
.map((name) => unlink(join(this.#folder, name)).catch(() => { })));
|
|
54
56
|
}
|
|
55
57
|
async #read() {
|
|
56
|
-
const content = await readRecord(this.#path);
|
|
58
|
+
const content = await readRecord(this.#path, this.#clock);
|
|
57
59
|
if (content === undefined)
|
|
58
60
|
return undefined;
|
|
59
61
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"holder-record.js","sourceRoot":"","sources":["../../../src/lock-stores/sqlite/holder-record.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"holder-record.js","sourceRoot":"","sources":["../../../src/lock-stores/sqlite/holder-record.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,7 @@ export class SqliteStore extends FileLockStore {
|
|
|
34
34
|
const lock = held.use(FileLock.open(path));
|
|
35
35
|
await this.poll(async () => (lock.tryLock() ? true : undefined), signal);
|
|
36
36
|
// The release removes the record, then lets the lock go even when the record stays.
|
|
37
|
-
held.use(await new HolderRecord(path).announce());
|
|
37
|
+
held.use(await new HolderRecord(path, this.clock).announce());
|
|
38
38
|
return held.move();
|
|
39
39
|
}
|
|
40
40
|
async tryLock(path) {
|
|
@@ -42,11 +42,11 @@ export class SqliteStore extends FileLockStore {
|
|
|
42
42
|
const lock = held.use(FileLock.open(path));
|
|
43
43
|
if (!lock.tryLock())
|
|
44
44
|
return undefined;
|
|
45
|
-
held.use(await new HolderRecord(path).announce());
|
|
45
|
+
held.use(await new HolderRecord(path, this.clock).announce());
|
|
46
46
|
return held.move();
|
|
47
47
|
}
|
|
48
48
|
isHeldAt(path) {
|
|
49
|
-
return new HolderRecord(path).isPresent();
|
|
49
|
+
return new HolderRecord(path, this.clock).isPresent();
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
//# sourceMappingURL=sqlite-store.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlite-store.js","sourceRoot":"","sources":["../../../src/lock-stores/sqlite/sqlite-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIvC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;;;;;;GAWG;AACH,MAAM,OAAO,WAAY,SAAQ,aAAa;IAC5C;;;;;OAKG;IACgB,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC;IAC5C,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;IAE9B,OAAO,CAAC,GAAW,EAAE,OAAwB;QACpD,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IAC9E,CAAC;IAEQ,UAAU,CAAC,GAAW;QAC7B,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAClE,CAAC;IAES,KAAK,CAAC,IAAI,CAClB,IAAY,EACZ,MAA+B;QAE/B,YAAY,IAAI,GAAG,IAAI,oBAAoB,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3C,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;QACzE,oFAAoF;QACpF,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"sqlite-store.js","sourceRoot":"","sources":["../../../src/lock-stores/sqlite/sqlite-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIvC,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;;;;;;GAWG;AACH,MAAM,OAAO,WAAY,SAAQ,aAAa;IAC5C;;;;;OAKG;IACgB,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC;IAC5C,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;IAE9B,OAAO,CAAC,GAAW,EAAE,OAAwB;QACpD,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;IAC9E,CAAC;IAEQ,UAAU,CAAC,GAAW;QAC7B,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAClE,CAAC;IAES,KAAK,CAAC,IAAI,CAClB,IAAY,EACZ,MAA+B;QAE/B,YAAY,IAAI,GAAG,IAAI,oBAAoB,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3C,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;QACzE,oFAAoF;QACpF,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9D,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,IAAY;QAClC,YAAY,IAAI,GAAG,IAAI,oBAAoB,EAAE,CAAC;QAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YAAE,OAAO,SAAS,CAAC;QACtC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9D,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC;IAES,QAAQ,CAAC,IAAY;QAC7B,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,CAAC;IACxD,CAAC;CACF"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type Clock } from '@zukhruf/async';
|
|
1
2
|
import { SessionLockStore } from '../session/session-lock-store.ts';
|
|
2
3
|
/**
|
|
3
4
|
* One connection to SQL Server: only the methods that the store calls. No
|
|
@@ -23,6 +24,8 @@ export interface SqlServerStoreOptions {
|
|
|
23
24
|
* ended, before its signal aborts.
|
|
24
25
|
*/
|
|
25
26
|
heartbeatInterval: number;
|
|
27
|
+
/** The clock of the heartbeat: `globalThis` in production, a fake clock in a test. */
|
|
28
|
+
clock: Clock;
|
|
26
29
|
}
|
|
27
30
|
/**
|
|
28
31
|
* Holds a session-owned application lock of SQL Server (`sp_getapplock`) for
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlserver-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/sqlserver/sqlserver-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sqlserver-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/sqlserver/sqlserver-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,gBAAgB,CAAC;AAG1D,OAAO,EAEL,gBAAgB,EACjB,MAAM,kCAAkC,CAAC;AAE1C;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B,0FAA0F;IAC1F,KAAK,CACH,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACjC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IACtC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO,CAAC;IAC9D,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;IAChD,8EAA8E;IAC9E,KAAK,IAAI,IAAI,CAAC;CACf;AAED,MAAM,WAAW,qBAAqB;IACpC,oFAAoF;IACpF,OAAO,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACrC,sFAAsF;IACtF,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;OAIG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAC1B,sFAAsF;IACtF,KAAK,EAAE,KAAK,CAAC;CACd;AAoCD;;;;;;;;;GASG;AACH,qBAAa,cAAe,SAAQ,gBAAgB,CAAC,gBAAgB,CAAC;gBACxD,OAAO,EAAE,qBAAqB;CAG3C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlserver-store.js","sourceRoot":"","sources":["../../../src/lock-stores/sqlserver/sqlserver-store.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"sqlserver-store.js","sourceRoot":"","sources":["../../../src/lock-stores/sqlserver/sqlserver-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type Clock } from '@zukhruf/async';
|
|
1
2
|
import type { AcquireMode } from '../acquire-mode.ts';
|
|
2
3
|
import type { LockHandle } from '../lease.ts';
|
|
3
4
|
import type { AcquireOptions, LockStore } from '../lock-store.ts';
|
|
@@ -5,15 +6,17 @@ export interface SkipIfBusyOptions {
|
|
|
5
6
|
/**
|
|
6
7
|
* Milliseconds to wait for another holder before giving up. The limit
|
|
7
8
|
* starts when the lock store answers that the key is busy: a slow answer
|
|
8
|
-
* does not show a busy key.
|
|
9
|
+
* does not show a busy key. Without options, the mode makes one attempt only.
|
|
9
10
|
*/
|
|
10
|
-
waitAtMost
|
|
11
|
+
waitAtMost: number;
|
|
12
|
+
/** The clock that `waitAtMost` runs on: `globalThis` in production, a fake clock in a test. */
|
|
13
|
+
clock: Clock;
|
|
11
14
|
}
|
|
12
15
|
/** Gives up when the key stays busy, at once or after `waitAtMost`, so the task may not run. */
|
|
13
16
|
export declare class SkipIfBusyMode implements AcquireMode<'maybe'> {
|
|
14
17
|
#private;
|
|
15
18
|
readonly outcome: "maybe";
|
|
16
|
-
constructor(
|
|
19
|
+
constructor(options?: SkipIfBusyOptions);
|
|
17
20
|
acquire(store: LockStore, key: string, { signal }: AcquireOptions): Promise<LockHandle | undefined>;
|
|
18
21
|
}
|
|
19
22
|
//# sourceMappingURL=skip-if-busy-mode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skip-if-busy-mode.d.ts","sourceRoot":"","sources":["../../../src/mutex/acquire-modes/skip-if-busy-mode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElE,MAAM,WAAW,iBAAiB;IAChC;;;;OAIG;IACH,UAAU,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"skip-if-busy-mode.d.ts","sourceRoot":"","sources":["../../../src/mutex/acquire-modes/skip-if-busy-mode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAW,MAAM,gBAAgB,CAAC;AAErD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAElE,MAAM,WAAW,iBAAiB;IAChC;;;;OAIG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,+FAA+F;IAC/F,KAAK,EAAE,KAAK,CAAC;CACd;AAED,gGAAgG;AAChG,qBAAa,cAAe,YAAW,WAAW,CAAC,OAAO,CAAC;;IACzD,QAAQ,CAAC,OAAO,EAAG,OAAO,CAAU;gBAGxB,OAAO,CAAC,EAAE,iBAAiB;IAYjC,OAAO,CACX,KAAK,EAAE,SAAS,EAChB,GAAG,EAAE,MAAM,EACX,EAAE,MAAM,EAAE,EAAE,cAAc,GACzB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;CAiBnC"}
|
|
@@ -1,27 +1,29 @@
|
|
|
1
|
+
import { timeout } from '@zukhruf/async';
|
|
1
2
|
/** Gives up when the key stays busy, at once or after `waitAtMost`, so the task may not run. */
|
|
2
3
|
export class SkipIfBusyMode {
|
|
3
4
|
outcome = 'maybe';
|
|
4
|
-
#
|
|
5
|
-
constructor(
|
|
6
|
-
if (
|
|
7
|
-
|
|
5
|
+
#wait;
|
|
6
|
+
constructor(options) {
|
|
7
|
+
if (options &&
|
|
8
|
+
(!(options.waitAtMost >= 0) || !Number.isFinite(options.waitAtMost))) {
|
|
9
|
+
throw new RangeError(`waitAtMost must be a finite number of milliseconds >= 0, got ${options.waitAtMost}.`);
|
|
8
10
|
}
|
|
9
|
-
this.#
|
|
11
|
+
this.#wait = options;
|
|
10
12
|
}
|
|
11
13
|
async acquire(store, key, { signal }) {
|
|
12
14
|
// Always one attempt first: a time limit must never skip a key that is free.
|
|
13
15
|
const lease = await store.tryAcquire(key);
|
|
14
|
-
if (lease || this.#waitAtMost === 0)
|
|
16
|
+
if (lease || !this.#wait || this.#wait.waitAtMost === 0)
|
|
15
17
|
return lease;
|
|
16
18
|
// The caller comes first, so a caller that already cancelled is not read as giving up.
|
|
17
|
-
|
|
19
|
+
using limit = timeout(this.#wait.waitAtMost, { clock: this.#wait.clock });
|
|
18
20
|
try {
|
|
19
21
|
return await store.acquire(key, {
|
|
20
|
-
signal: signal ? AbortSignal.any([signal,
|
|
22
|
+
signal: signal ? AbortSignal.any([signal, limit.signal]) : limit.signal,
|
|
21
23
|
});
|
|
22
24
|
}
|
|
23
25
|
catch (error) {
|
|
24
|
-
if (
|
|
26
|
+
if (limit.signal.aborted && error === limit.signal.reason)
|
|
25
27
|
return undefined;
|
|
26
28
|
throw error;
|
|
27
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skip-if-busy-mode.js","sourceRoot":"","sources":["../../../src/mutex/acquire-modes/skip-if-busy-mode.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"skip-if-busy-mode.js","sourceRoot":"","sources":["../../../src/mutex/acquire-modes/skip-if-busy-mode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAiBrD,gGAAgG;AAChG,MAAM,OAAO,cAAc;IAChB,OAAO,GAAG,OAAgB,CAAC;IAC3B,KAAK,CAAgC;IAE9C,YAAY,OAA2B;QACrC,IACE,OAAO;YACP,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EACpE,CAAC;YACD,MAAM,IAAI,UAAU,CAClB,gEAAgE,OAAO,CAAC,UAAU,GAAG,CACtF,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,OAAO,CACX,KAAgB,EAChB,GAAW,EACX,EAAE,MAAM,EAAkB;QAE1B,6EAA6E;QAC7E,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAEtE,uFAAuF;QACvF,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1E,IAAI,CAAC;YACH,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;gBAC9B,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM;aACxE,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,IAAI,KAAK,KAAK,KAAK,CAAC,MAAM,CAAC,MAAM;gBACvD,OAAO,SAAS,CAAC;YACnB,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zukhruf/mutex",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.15",
|
|
4
4
|
"description": "A mutex with interchangeable lock stores, from one object to every process on a host, with fencing tokens on every lease.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -46,14 +46,14 @@
|
|
|
46
46
|
"access": "public"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@zukhruf/async": "^0.6.
|
|
50
|
-
"@zukhruf/election": "^0.6.
|
|
51
|
-
"@zukhruf/fencing": "^0.6.
|
|
52
|
-
"@zukhruf/fs": "^0.6.
|
|
53
|
-
"@zukhruf/lease": "^0.6.
|
|
49
|
+
"@zukhruf/async": "^0.6.15",
|
|
50
|
+
"@zukhruf/election": "^0.6.15",
|
|
51
|
+
"@zukhruf/fencing": "^0.6.15",
|
|
52
|
+
"@zukhruf/fs": "^0.6.15",
|
|
53
|
+
"@zukhruf/lease": "^0.6.15"
|
|
54
54
|
},
|
|
55
55
|
"peerDependencies": {
|
|
56
|
-
"@zukhruf/docker": "^0.6.
|
|
56
|
+
"@zukhruf/docker": "^0.6.15"
|
|
57
57
|
},
|
|
58
58
|
"peerDependenciesMeta": {
|
|
59
59
|
"@zukhruf/docker": {
|
|
@@ -61,9 +61,10 @@
|
|
|
61
61
|
}
|
|
62
62
|
},
|
|
63
63
|
"devDependencies": {
|
|
64
|
+
"@sinonjs/fake-timers": "15.4.0",
|
|
64
65
|
"@types/pg": "^8.23.1",
|
|
65
|
-
"@zukhruf/docker": "^0.6.
|
|
66
|
-
"@zukhruf/testing": "^0.6.
|
|
66
|
+
"@zukhruf/docker": "^0.6.15",
|
|
67
|
+
"@zukhruf/testing": "^0.6.15",
|
|
67
68
|
"hono": "^4.13.13",
|
|
68
69
|
"mariadb": "^3.5.4",
|
|
69
70
|
"mysql2": "^3.24.5",
|