@zukhruf/mutex 0.6.13 → 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 +6 -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 +9 -2
- 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/remote/lock-coordinator.d.ts +9 -5
- package/dist/lock-stores/remote/lock-coordinator.d.ts.map +1 -1
- package/dist/lock-stores/remote/lock-coordinator.js +9 -5
- package/dist/lock-stores/remote/lock-coordinator.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/socket/electing-connector.d.ts +3 -0
- package/dist/lock-stores/socket/electing-connector.d.ts.map +1 -1
- package/dist/lock-stores/socket/electing-connector.js +5 -6
- package/dist/lock-stores/socket/electing-connector.js.map +1 -1
- package/dist/lock-stores/socket/lock-server.d.ts +11 -3
- package/dist/lock-stores/socket/lock-server.d.ts.map +1 -1
- package/dist/lock-stores/socket/lock-server.js +2 -2
- package/dist/lock-stores/socket/lock-server.js.map +1 -1
- package/dist/lock-stores/socket/socket-election.d.ts +2 -1
- package/dist/lock-stores/socket/socket-election.d.ts.map +1 -1
- package/dist/lock-stores/socket/socket-election.js +2 -1
- package/dist/lock-stores/socket/socket-election.js.map +1 -1
- package/dist/lock-stores/socket/socket-store.d.ts +4 -1
- package/dist/lock-stores/socket/socket-store.d.ts.map +1 -1
- package/dist/lock-stores/socket/socket-store.js +6 -5
- package/dist/lock-stores/socket/socket-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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-election.js","sourceRoot":"","sources":["../../../src/lock-stores/socket/socket-election.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"socket-election.js","sourceRoot":"","sources":["../../../src/lock-stores/socket/socket-election.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAC5B,SAAiB,EACjB,YAAoB,EACpB,KAAY;IAEZ,OAAO,IAAI,cAAc,CAAC;QACxB,SAAS;QACT,SAAS,EAAE,aAAa;QACxB,SAAS,EAAE,cAAc;QACzB,YAAY;QACZ,KAAK;KACN,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { EventEmitter } from 'node:events';
|
|
2
|
+
import type { Clock } from '@zukhruf/async';
|
|
2
3
|
import type { LockHandle } from '../../mutex/lease.ts';
|
|
3
4
|
import type { AcquireOptions, LockStore } from '../../mutex/lock-store.ts';
|
|
4
5
|
export type SocketRole = 'leader' | 'follower';
|
|
@@ -10,6 +11,8 @@ export interface SocketStoreOptions {
|
|
|
10
11
|
* term can reassert first. Must exceed how long a holder takes to reconnect.
|
|
11
12
|
*/
|
|
12
13
|
graceWindow?: number;
|
|
14
|
+
/** The clock of every wait of the store: `globalThis` in production, a fake clock in a test. */
|
|
15
|
+
clock: Clock;
|
|
13
16
|
}
|
|
14
17
|
/**
|
|
15
18
|
* Host-wide locks granted by one elected process over a Unix socket in
|
|
@@ -25,7 +28,7 @@ export declare class SocketStore extends EventEmitter<{
|
|
|
25
28
|
role: [SocketRole];
|
|
26
29
|
}> implements LockStore, AsyncDisposable {
|
|
27
30
|
#private;
|
|
28
|
-
constructor(directory: string, { pollInterval, graceWindow }
|
|
31
|
+
constructor(directory: string, { pollInterval, graceWindow, clock }: SocketStoreOptions);
|
|
29
32
|
acquire(key: string, options?: AcquireOptions): Promise<LockHandle>;
|
|
30
33
|
tryAcquire(key: string): Promise<LockHandle | undefined>;
|
|
31
34
|
isHeld(key: string): Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/socket/socket-store.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAW3E,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,UAAU,CAAC;AAE/C,MAAM,WAAW,kBAAkB;IACjC,6DAA6D;IAC7D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"socket-store.d.ts","sourceRoot":"","sources":["../../../src/lock-stores/socket/socket-store.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAW3E,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,UAAU,CAAC;AAE/C,MAAM,WAAW,kBAAkB;IACjC,6DAA6D;IAC7D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gGAAgG;IAChG,KAAK,EAAE,KAAK,CAAC;CACd;AAED;;;;;;;;;GASG;AACH,qBAAa,WACX,SAAQ,YAAY,CAAC;IAAE,IAAI,EAAE,CAAC,UAAU,CAAC,CAAA;CAAE,CAC3C,YAAW,SAAS,EAAE,eAAe;;gBAOnC,SAAS,EAAE,MAAM,EACjB,EAAE,YAAiB,EAAE,WAAiB,EAAE,KAAK,EAAE,EAAE,kBAAkB;IAqCrE,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC;IAInE,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAIxD,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIrC,yFAAyF;IACnF,CAAC,MAAM,CAAC,YAAY,CAAC;CAI5B"}
|
|
@@ -23,22 +23,23 @@ export class SocketStore extends EventEmitter {
|
|
|
23
23
|
#client;
|
|
24
24
|
/** The lock servers this process started; disposing the store closes them. */
|
|
25
25
|
#servers = new AsyncDisposableStack();
|
|
26
|
-
constructor(directory, { pollInterval = 10, graceWindow = 500
|
|
26
|
+
constructor(directory, { pollInterval = 10, graceWindow = 500, clock }) {
|
|
27
27
|
super();
|
|
28
28
|
const socketPath = socketPathFor(directory);
|
|
29
29
|
this.#client = new RemoteLockClient(new ConnectionSupervisor(new LocalDirectoryConnector(directory, new ElectingConnector({
|
|
30
30
|
socketPath,
|
|
31
|
-
election: socketElection(directory, pollInterval),
|
|
31
|
+
election: socketElection(directory, pollInterval, clock),
|
|
32
32
|
pollInterval,
|
|
33
|
+
clock,
|
|
33
34
|
serve: async (term) => {
|
|
34
35
|
// Until serving has fully started, a failure closes the new server, so no server outlives its term.
|
|
35
36
|
await using starting = new AsyncDisposableStack();
|
|
36
37
|
starting.adopt(await LockServer.start(socketPath, term, {
|
|
37
38
|
// The first term of a directory has no predecessor to wait for,
|
|
38
39
|
// and a term after a clean shutdown has no holder to wait for.
|
|
39
|
-
|
|
40
|
-
? graceWindow
|
|
41
|
-
:
|
|
40
|
+
grace: term.epoch > 1n && !term.afterCleanShutdown
|
|
41
|
+
? { window: graceWindow, clock }
|
|
42
|
+
: undefined,
|
|
42
43
|
}), (started) => started.close());
|
|
43
44
|
this.emit('role', 'leader');
|
|
44
45
|
this.#servers.use(starting.move());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"socket-store.js","sourceRoot":"","sources":["../../../src/lock-stores/socket/socket-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"socket-store.js","sourceRoot":"","sources":["../../../src/lock-stores/socket/socket-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",
|