velocious 1.0.620 → 1.0.621

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,9 +1,11 @@
1
+ export type CoordinatorOwnerScope = {
2
+ ownedQueue: Promise<void>;
3
+ };
1
4
  export type CoordinatorRegistration = {
5
+ connectionScope: CoordinatorOwnerScope;
2
6
  coordinator: (callback: () => Promise<unknown>) => Promise<unknown>;
3
- ownedQueue: Promise<void>;
4
7
  owner: symbol;
5
- reentrantOwners: Set<symbol>;
6
- rootOwners: Set<symbol>;
8
+ ownerScopes: Map<symbol, CoordinatorOwnerScope>;
7
9
  };
8
10
  /**
9
11
  * Registers test-only serialization owned by the active broker.
@@ -1 +1 @@
1
- {"version":3,"file":"shared-transaction-connection-coordinator.d.ts","sourceRoot":"","sources":["../../../src/testing/shared-transaction-connection-coordinator.js"],"names":[],"mappings":"AAEI,YAAkL,uBAAuB,GAA/L;IAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAAC,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAAC,CAAyB;AAkF7M;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,UAAU,EAJ/C,MAI+C,EAAE,WAAW,EAH5D,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAGO,GAF1D,MAAM,CAgBlB;AAED;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAAC,UAAU,EAJjD,MAIiD,EAAE,WAAW,EAH9D,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAGS,GAF5D,IAAI,CAShB;AAED;;;;;;;GAOG;AACH,wBAAsB,qCAAqC,CAN9C,CAAC,EAM8C,UAAU,EAL3D,OAAO,6BAA6B,EAAE,OAKqB,EAAE,QAAQ,EAJrE,MAAM,OAAO,CAAC,CAAC,CAIsD,EAAE,cAAc,AAH7F,CACA,EADQ,MAGqF,GAFnF,OAAO,CAAC,CAAC,CAAC,CAuBtB"}
1
+ {"version":3,"file":"shared-transaction-connection-coordinator.d.ts","sourceRoot":"","sources":["../../../src/testing/shared-transaction-connection-coordinator.js"],"names":[],"mappings":"AAEI,YAAuC,qBAAqB,GAAlD;IAAC,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;CAAC,CAAuB;AAC5D,YAAyL,uBAAuB,GAAtM;IAAC,eAAe,EAAE,qBAAqB,CAAC;IAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAA;CAAC,CAAyB;AAkFpN;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,UAAU,EAJ/C,MAI+C,EAAE,WAAW,EAH5D,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAGO,GAF1D,MAAM,CAqBlB;AAED;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAAC,UAAU,EAJjD,MAIiD,EAAE,WAAW,EAH9D,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAGS,GAF5D,IAAI,CAShB;AAED;;;;;;;GAOG;AACH,wBAAsB,qCAAqC,CAN9C,CAAC,EAM8C,UAAU,EAL3D,OAAO,6BAA6B,EAAE,OAKqB,EAAE,QAAQ,EAJrE,MAAM,OAAO,CAAC,CAAC,CAIsD,EAAE,cAAc,AAH7F,CACA,EADQ,MAGqF,GAFnF,OAAO,CAAC,CAAC,CAAC,CAyBtB"}
@@ -1,5 +1,6 @@
1
1
  // @ts-check
2
- /** @typedef {{coordinator: (callback: () => Promise<unknown>) => Promise<unknown>, ownedQueue: Promise<void>, owner: symbol, reentrantOwners: Set<symbol>, rootOwners: Set<symbol>}} CoordinatorRegistration */
2
+ /** @typedef {{ownedQueue: Promise<void>}} CoordinatorOwnerScope */
3
+ /** @typedef {{connectionScope: CoordinatorOwnerScope, coordinator: (callback: () => Promise<unknown>) => Promise<unknown>, owner: symbol, ownerScopes: Map<symbol, CoordinatorOwnerScope>}} CoordinatorRegistration */
3
4
  /** @type {WeakMap<object, CoordinatorRegistration>} */
4
5
  const coordinators = new WeakMap();
5
6
  /** @type {WeakMap<object, CoordinatorRegistration>} */
@@ -17,40 +18,44 @@ async function inactiveCoordinator(callback) {
17
18
  * @template T
18
19
  * @param {import("../database/drivers/base.js").default} connection - Parent physical connection.
19
20
  * @param {CoordinatorRegistration} registration - Physical connection registration.
21
+ * @param {CoordinatorOwnerScope} ownerScope - Queue inherited from the current owner.
20
22
  * @param {() => Promise<T>} callback - Owned operation.
23
+ * @param {string} [ownerDescription] - Async owner description.
21
24
  * @returns {Promise<T>} - Operation result.
22
25
  */
23
- async function coordinateOwnedSharedTransactionConnection(connection, registration, callback) {
24
- const previous = registration.ownedQueue;
26
+ async function coordinateOwnedSharedTransactionConnection(connection, registration, ownerScope, callback, ownerDescription = "shared-transaction-owned-operation") {
27
+ const previous = ownerScope.ownedQueue;
25
28
  /**
26
29
  * Releases the next owned sibling operation.
27
30
  * @type {() => void}
28
31
  */
29
32
  let release = () => { };
30
- registration.ownedQueue = new Promise((resolve) => { release = resolve; });
33
+ ownerScope.ownedQueue = new Promise((resolve) => { release = resolve; });
31
34
  await previous;
32
- const operationOwner = Symbol("shared-transaction-owned-operation");
35
+ const operationOwner = Symbol(ownerDescription);
33
36
  const environmentHandler = connection.configuration.getEnvironmentHandler();
34
- registration.reentrantOwners.add(operationOwner);
37
+ const operationScope = { ownedQueue: Promise.resolve() };
38
+ registration.ownerScopes.set(operationOwner, operationScope);
35
39
  try {
36
40
  return await environmentHandler.runWithSharedTransactionCoordinatorOwner(connection, operationOwner, callback);
37
41
  }
38
42
  finally {
39
- registration.reentrantOwners.delete(operationOwner);
43
+ await drainOwnedSharedTransactionConnections(operationScope);
44
+ registration.ownerScopes.delete(operationOwner);
40
45
  release();
41
46
  }
42
47
  }
43
48
  /**
44
49
  * Drains all inherited operations admitted before the root owner is revoked.
45
- * @param {CoordinatorRegistration} registration - Physical connection registration.
50
+ * @param {CoordinatorOwnerScope} ownerScope - Owner scope to drain.
46
51
  * @returns {Promise<void>} - Resolves when the owned queue stops advancing.
47
52
  */
48
- async function drainOwnedSharedTransactionConnections(registration) {
53
+ async function drainOwnedSharedTransactionConnections(ownerScope) {
49
54
  let tail;
50
55
  do {
51
- tail = registration.ownedQueue;
56
+ tail = ownerScope.ownedQueue;
52
57
  await tail;
53
- } while (tail !== registration.ownedQueue);
58
+ } while (tail !== ownerScope.ownedQueue);
54
59
  }
55
60
  /**
56
61
  * Runs one broker-serialized root while tracking and draining its inherited work.
@@ -61,17 +66,7 @@ async function drainOwnedSharedTransactionConnections(registration) {
61
66
  * @returns {Promise<T>} - Operation result.
62
67
  */
63
68
  async function coordinateRootSharedTransactionConnection(connection, registration, callback) {
64
- await drainOwnedSharedTransactionConnections(registration);
65
- const rootOwner = Symbol("shared-transaction-root-operation");
66
- const environmentHandler = connection.configuration.getEnvironmentHandler();
67
- registration.rootOwners.add(rootOwner);
68
- try {
69
- return await environmentHandler.runWithSharedTransactionCoordinatorOwner(connection, rootOwner, callback);
70
- }
71
- finally {
72
- await drainOwnedSharedTransactionConnections(registration);
73
- registration.rootOwners.delete(rootOwner);
74
- }
69
+ return await coordinateOwnedSharedTransactionConnection(connection, registration, registration.connectionScope, callback, "shared-transaction-root-operation");
75
70
  }
76
71
  /**
77
72
  * Registers test-only serialization owned by the active broker.
@@ -87,7 +82,12 @@ export function setSharedTransactionCoordinator(connection, coordinator) {
87
82
  registration.owner = owner;
88
83
  }
89
84
  else {
90
- registration = { coordinator, ownedQueue: Promise.resolve(), owner, reentrantOwners: new Set(), rootOwners: new Set() };
85
+ registration = {
86
+ connectionScope: { ownedQueue: Promise.resolve() },
87
+ coordinator,
88
+ owner,
89
+ ownerScopes: new Map()
90
+ };
91
91
  connectionRegistrations.set(connection, registration);
92
92
  }
93
93
  coordinators.set(connection, registration);
@@ -121,13 +121,13 @@ export async function coordinateSharedTransactionConnection(connection, callback
121
121
  return await callback();
122
122
  const environmentHandler = connection.configuration.getEnvironmentHandler();
123
123
  const currentOwner = environmentHandler.getSharedTransactionCoordinatorOwner(connection);
124
- if (currentOwner && registration.reentrantOwners.has(currentOwner))
125
- return await callback();
126
- if (currentOwner && registration.rootOwners.has(currentOwner)) {
127
- return await coordinateOwnedSharedTransactionConnection(connection, registration, callback);
124
+ const currentOwnerScope = currentOwner ? registration.ownerScopes.get(currentOwner) : undefined;
125
+ if (currentOwnerScope) {
126
+ return await coordinateOwnedSharedTransactionConnection(connection, registration, currentOwnerScope, callback);
127
+ }
128
+ if (!activeRegistration) {
129
+ return await coordinateOwnedSharedTransactionConnection(connection, registration, registration.connectionScope, callback);
128
130
  }
129
- if (!activeRegistration)
130
- return await coordinateOwnedSharedTransactionConnection(connection, registration, callback);
131
131
  if (operationOwner === registration.owner) {
132
132
  return await coordinateRootSharedTransactionConnection(connection, registration, callback);
133
133
  }
@@ -135,4 +135,4 @@ export async function coordinateSharedTransactionConnection(connection, callback
135
135
  return await coordinateRootSharedTransactionConnection(connection, registration, callback);
136
136
  }));
137
137
  }
138
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"shared-transaction-connection-coordinator.js","sourceRoot":"","sources":["../../../src/testing/shared-transaction-connection-coordinator.js"],"names":[],"mappings":"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","sourcesContent":["// @ts-check\n\n/** @typedef {{coordinator: (callback: () => Promise<unknown>) => Promise<unknown>, ownedQueue: Promise<void>, owner: symbol, reentrantOwners: Set<symbol>, rootOwners: Set<symbol>}} CoordinatorRegistration */\n\n/** @type {WeakMap<object, CoordinatorRegistration>} */\nconst coordinators = new WeakMap()\n/** @type {WeakMap<object, CoordinatorRegistration>} */\nconst connectionRegistrations = new WeakMap()\n\n/**\n * Runs work directly when only the connection-local queue remains registered.\n * @param {() => Promise<unknown>} callback - Serialized operation.\n * @returns {Promise<unknown>} - Operation result.\n */\nasync function inactiveCoordinator(callback) {\n  return await callback()\n}\n\n/**\n * Serializes sibling work that inherited one coordinator owner without re-entering the broker queue.\n * @template T\n * @param {import(\"../database/drivers/base.js\").default} connection - Parent physical connection.\n * @param {CoordinatorRegistration} registration - Physical connection registration.\n * @param {() => Promise<T>} callback - Owned operation.\n * @returns {Promise<T>} - Operation result.\n */\nasync function coordinateOwnedSharedTransactionConnection(connection, registration, callback) {\n  const previous = registration.ownedQueue\n  /**\n   * Releases the next owned sibling operation.\n   * @type {() => void}\n   */\n  let release = () => {}\n\n  registration.ownedQueue = new Promise((resolve) => { release = resolve })\n  await previous\n  const operationOwner = Symbol(\"shared-transaction-owned-operation\")\n  const environmentHandler = connection.configuration.getEnvironmentHandler()\n\n  registration.reentrantOwners.add(operationOwner)\n  try {\n    return await environmentHandler.runWithSharedTransactionCoordinatorOwner(connection, operationOwner, callback)\n  } finally {\n    registration.reentrantOwners.delete(operationOwner)\n    release()\n  }\n}\n\n/**\n * Drains all inherited operations admitted before the root owner is revoked.\n * @param {CoordinatorRegistration} registration - Physical connection registration.\n * @returns {Promise<void>} - Resolves when the owned queue stops advancing.\n */\nasync function drainOwnedSharedTransactionConnections(registration) {\n  let tail\n\n  do {\n    tail = registration.ownedQueue\n    await tail\n  } while (tail !== registration.ownedQueue)\n}\n\n/**\n * Runs one broker-serialized root while tracking and draining its inherited work.\n * @template T\n * @param {import(\"../database/drivers/base.js\").default} connection - Parent physical connection.\n * @param {CoordinatorRegistration} registration - Physical connection registration.\n * @param {() => Promise<T>} callback - Root operation.\n * @returns {Promise<T>} - Operation result.\n */\nasync function coordinateRootSharedTransactionConnection(connection, registration, callback) {\n  await drainOwnedSharedTransactionConnections(registration)\n  const rootOwner = Symbol(\"shared-transaction-root-operation\")\n  const environmentHandler = connection.configuration.getEnvironmentHandler()\n\n  registration.rootOwners.add(rootOwner)\n  try {\n    return await environmentHandler.runWithSharedTransactionCoordinatorOwner(connection, rootOwner, callback)\n  } finally {\n    await drainOwnedSharedTransactionConnections(registration)\n    registration.rootOwners.delete(rootOwner)\n  }\n}\n\n/**\n * Registers test-only serialization owned by the active broker.\n * @param {object} connection - Parent physical connection.\n * @param {(callback: () => Promise<unknown>) => Promise<unknown>} coordinator - Serializer.\n * @returns {symbol} - Opaque owner for broker-internal connection calls.\n */\nexport function setSharedTransactionCoordinator(connection, coordinator) {\n  const owner = Symbol(\"shared-transaction-coordinator\")\n  let registration = connectionRegistrations.get(connection)\n\n  if (registration) {\n    registration.coordinator = coordinator\n    registration.owner = owner\n  } else {\n    registration = {coordinator, ownedQueue: Promise.resolve(), owner, reentrantOwners: new Set(), rootOwners: new Set()}\n    connectionRegistrations.set(connection, registration)\n  }\n\n  coordinators.set(connection, registration)\n  return owner\n}\n\n/**\n * Removes a broker-owned coordinator without disturbing a replacement.\n * @param {object} connection - Parent physical connection.\n * @param {(callback: () => Promise<unknown>) => Promise<unknown>} coordinator - Expected serializer.\n * @returns {void}\n */\nexport function clearSharedTransactionCoordinator(connection, coordinator) {\n  const registration = coordinators.get(connection)\n\n  if (registration?.coordinator === coordinator) {\n    coordinators.delete(connection)\n    registration.coordinator = inactiveCoordinator\n  }\n}\n\n/**\n * Runs parent work through broker serialization when registered.\n * @template T\n * @param {import(\"../database/drivers/base.js\").default} connection - Parent physical connection.\n * @param {() => Promise<T>} callback - Parent operation.\n * @param {symbol} [operationOwner] - Broker owner for an already-coordinated operation.\n * @returns {Promise<T>} - Operation result.\n */\nexport async function coordinateSharedTransactionConnection(connection, callback, operationOwner) {\n  const activeRegistration = coordinators.get(connection)\n  const registration = activeRegistration || connectionRegistrations.get(connection)\n\n  if (!registration) return await callback()\n\n  const environmentHandler = connection.configuration.getEnvironmentHandler()\n  const currentOwner = environmentHandler.getSharedTransactionCoordinatorOwner(connection)\n\n  if (currentOwner && registration.reentrantOwners.has(currentOwner)) return await callback()\n  if (currentOwner && registration.rootOwners.has(currentOwner)) {\n    return await coordinateOwnedSharedTransactionConnection(connection, registration, callback)\n  }\n  if (!activeRegistration) return await coordinateOwnedSharedTransactionConnection(connection, registration, callback)\n  if (operationOwner === registration.owner) {\n    return await coordinateRootSharedTransactionConnection(connection, registration, callback)\n  }\n\n  return /** @type {T} */ (await registration.coordinator(async () => {\n    return await coordinateRootSharedTransactionConnection(connection, registration, callback)\n  }))\n}\n"]}
138
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"shared-transaction-connection-coordinator.js","sourceRoot":"","sources":["../../../src/testing/shared-transaction-connection-coordinator.js"],"names":[],"mappings":"AAAA,YAAY;AAEZ,mEAAmE;AACnE,uNAAuN;AAEvN,uDAAuD;AACvD,MAAM,YAAY,GAAG,IAAI,OAAO,EAAE,CAAA;AAClC,uDAAuD;AACvD,MAAM,uBAAuB,GAAG,IAAI,OAAO,EAAE,CAAA;AAE7C;;;;GAIG;AACH,KAAK,UAAU,mBAAmB,CAAC,QAAQ;IACzC,OAAO,MAAM,QAAQ,EAAE,CAAA;AACzB,CAAC;AAED;;;;;;;;;GASG;AACH,KAAK,UAAU,0CAA0C,CAAC,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,gBAAgB,GAAG,oCAAoC;IAC/J,MAAM,QAAQ,GAAG,UAAU,CAAC,UAAU,CAAA;IACtC;;;OAGG;IACH,IAAI,OAAO,GAAG,GAAG,EAAE,GAAE,CAAC,CAAA;IAEtB,UAAU,CAAC,UAAU,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,GAAG,OAAO,GAAG,OAAO,CAAA,CAAC,CAAC,CAAC,CAAA;IACvE,MAAM,QAAQ,CAAA;IACd,MAAM,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAA;IAC/C,MAAM,kBAAkB,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAqB,EAAE,CAAA;IAC3E,MAAM,cAAc,GAAG,EAAC,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,EAAC,CAAA;IAEtD,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;IAC5D,IAAI,CAAC;QACH,OAAO,MAAM,kBAAkB,CAAC,wCAAwC,CAAC,UAAU,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAA;IAChH,CAAC;YAAS,CAAC;QACT,MAAM,sCAAsC,CAAC,cAAc,CAAC,CAAA;QAC5D,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;QAC/C,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,sCAAsC,CAAC,UAAU;IAC9D,IAAI,IAAI,CAAA;IAER,GAAG,CAAC;QACF,IAAI,GAAG,UAAU,CAAC,UAAU,CAAA;QAC5B,MAAM,IAAI,CAAA;IACZ,CAAC,QAAQ,IAAI,KAAK,UAAU,CAAC,UAAU,EAAC;AAC1C,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,yCAAyC,CAAC,UAAU,EAAE,YAAY,EAAE,QAAQ;IACzF,OAAO,MAAM,0CAA0C,CACrD,UAAU,EACV,YAAY,EACZ,YAAY,CAAC,eAAe,EAC5B,QAAQ,EACR,mCAAmC,CACpC,CAAA;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,+BAA+B,CAAC,UAAU,EAAE,WAAW;IACrE,MAAM,KAAK,GAAG,MAAM,CAAC,gCAAgC,CAAC,CAAA;IACtD,IAAI,YAAY,GAAG,uBAAuB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAE1D,IAAI,YAAY,EAAE,CAAC;QACjB,YAAY,CAAC,WAAW,GAAG,WAAW,CAAA;QACtC,YAAY,CAAC,KAAK,GAAG,KAAK,CAAA;IAC5B,CAAC;SAAM,CAAC;QACN,YAAY,GAAG;YACb,eAAe,EAAE,EAAC,UAAU,EAAE,OAAO,CAAC,OAAO,EAAE,EAAC;YAChD,WAAW;YACX,KAAK;YACL,WAAW,EAAE,IAAI,GAAG,EAAE;SACvB,CAAA;QACD,uBAAuB,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;IACvD,CAAC;IAED,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,CAAA;IAC1C,OAAO,KAAK,CAAA;AACd,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,iCAAiC,CAAC,UAAU,EAAE,WAAW;IACvE,MAAM,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAEjD,IAAI,YAAY,EAAE,WAAW,KAAK,WAAW,EAAE,CAAC;QAC9C,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAC/B,YAAY,CAAC,WAAW,GAAG,mBAAmB,CAAA;IAChD,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,qCAAqC,CAAC,UAAU,EAAE,QAAQ,EAAE,cAAc;IAC9F,MAAM,kBAAkB,GAAG,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IACvD,MAAM,YAAY,GAAG,kBAAkB,IAAI,uBAAuB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAElF,IAAI,CAAC,YAAY;QAAE,OAAO,MAAM,QAAQ,EAAE,CAAA;IAE1C,MAAM,kBAAkB,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAqB,EAAE,CAAA;IAC3E,MAAM,YAAY,GAAG,kBAAkB,CAAC,oCAAoC,CAAC,UAAU,CAAC,CAAA;IACxF,MAAM,iBAAiB,GAAG,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IAE/F,IAAI,iBAAiB,EAAE,CAAC;QACtB,OAAO,MAAM,0CAA0C,CAAC,UAAU,EAAE,YAAY,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAA;IAChH,CAAC;IACD,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACxB,OAAO,MAAM,0CAA0C,CAAC,UAAU,EAAE,YAAY,EAAE,YAAY,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAA;IAC3H,CAAC;IACD,IAAI,cAAc,KAAK,YAAY,CAAC,KAAK,EAAE,CAAC;QAC1C,OAAO,MAAM,yCAAyC,CAAC,UAAU,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAA;IAC5F,CAAC;IAED,OAAO,gBAAgB,CAAC,CAAC,MAAM,YAAY,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE;QACjE,OAAO,MAAM,yCAAyC,CAAC,UAAU,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAA;IAC5F,CAAC,CAAC,CAAC,CAAA;AACL,CAAC","sourcesContent":["// @ts-check\n\n/** @typedef {{ownedQueue: Promise<void>}} CoordinatorOwnerScope */\n/** @typedef {{connectionScope: CoordinatorOwnerScope, coordinator: (callback: () => Promise<unknown>) => Promise<unknown>, owner: symbol, ownerScopes: Map<symbol, CoordinatorOwnerScope>}} CoordinatorRegistration */\n\n/** @type {WeakMap<object, CoordinatorRegistration>} */\nconst coordinators = new WeakMap()\n/** @type {WeakMap<object, CoordinatorRegistration>} */\nconst connectionRegistrations = new WeakMap()\n\n/**\n * Runs work directly when only the connection-local queue remains registered.\n * @param {() => Promise<unknown>} callback - Serialized operation.\n * @returns {Promise<unknown>} - Operation result.\n */\nasync function inactiveCoordinator(callback) {\n  return await callback()\n}\n\n/**\n * Serializes sibling work that inherited one coordinator owner without re-entering the broker queue.\n * @template T\n * @param {import(\"../database/drivers/base.js\").default} connection - Parent physical connection.\n * @param {CoordinatorRegistration} registration - Physical connection registration.\n * @param {CoordinatorOwnerScope} ownerScope - Queue inherited from the current owner.\n * @param {() => Promise<T>} callback - Owned operation.\n * @param {string} [ownerDescription] - Async owner description.\n * @returns {Promise<T>} - Operation result.\n */\nasync function coordinateOwnedSharedTransactionConnection(connection, registration, ownerScope, callback, ownerDescription = \"shared-transaction-owned-operation\") {\n  const previous = ownerScope.ownedQueue\n  /**\n   * Releases the next owned sibling operation.\n   * @type {() => void}\n   */\n  let release = () => {}\n\n  ownerScope.ownedQueue = new Promise((resolve) => { release = resolve })\n  await previous\n  const operationOwner = Symbol(ownerDescription)\n  const environmentHandler = connection.configuration.getEnvironmentHandler()\n  const operationScope = {ownedQueue: Promise.resolve()}\n\n  registration.ownerScopes.set(operationOwner, operationScope)\n  try {\n    return await environmentHandler.runWithSharedTransactionCoordinatorOwner(connection, operationOwner, callback)\n  } finally {\n    await drainOwnedSharedTransactionConnections(operationScope)\n    registration.ownerScopes.delete(operationOwner)\n    release()\n  }\n}\n\n/**\n * Drains all inherited operations admitted before the root owner is revoked.\n * @param {CoordinatorOwnerScope} ownerScope - Owner scope to drain.\n * @returns {Promise<void>} - Resolves when the owned queue stops advancing.\n */\nasync function drainOwnedSharedTransactionConnections(ownerScope) {\n  let tail\n\n  do {\n    tail = ownerScope.ownedQueue\n    await tail\n  } while (tail !== ownerScope.ownedQueue)\n}\n\n/**\n * Runs one broker-serialized root while tracking and draining its inherited work.\n * @template T\n * @param {import(\"../database/drivers/base.js\").default} connection - Parent physical connection.\n * @param {CoordinatorRegistration} registration - Physical connection registration.\n * @param {() => Promise<T>} callback - Root operation.\n * @returns {Promise<T>} - Operation result.\n */\nasync function coordinateRootSharedTransactionConnection(connection, registration, callback) {\n  return await coordinateOwnedSharedTransactionConnection(\n    connection,\n    registration,\n    registration.connectionScope,\n    callback,\n    \"shared-transaction-root-operation\"\n  )\n}\n\n/**\n * Registers test-only serialization owned by the active broker.\n * @param {object} connection - Parent physical connection.\n * @param {(callback: () => Promise<unknown>) => Promise<unknown>} coordinator - Serializer.\n * @returns {symbol} - Opaque owner for broker-internal connection calls.\n */\nexport function setSharedTransactionCoordinator(connection, coordinator) {\n  const owner = Symbol(\"shared-transaction-coordinator\")\n  let registration = connectionRegistrations.get(connection)\n\n  if (registration) {\n    registration.coordinator = coordinator\n    registration.owner = owner\n  } else {\n    registration = {\n      connectionScope: {ownedQueue: Promise.resolve()},\n      coordinator,\n      owner,\n      ownerScopes: new Map()\n    }\n    connectionRegistrations.set(connection, registration)\n  }\n\n  coordinators.set(connection, registration)\n  return owner\n}\n\n/**\n * Removes a broker-owned coordinator without disturbing a replacement.\n * @param {object} connection - Parent physical connection.\n * @param {(callback: () => Promise<unknown>) => Promise<unknown>} coordinator - Expected serializer.\n * @returns {void}\n */\nexport function clearSharedTransactionCoordinator(connection, coordinator) {\n  const registration = coordinators.get(connection)\n\n  if (registration?.coordinator === coordinator) {\n    coordinators.delete(connection)\n    registration.coordinator = inactiveCoordinator\n  }\n}\n\n/**\n * Runs parent work through broker serialization when registered.\n * @template T\n * @param {import(\"../database/drivers/base.js\").default} connection - Parent physical connection.\n * @param {() => Promise<T>} callback - Parent operation.\n * @param {symbol} [operationOwner] - Broker owner for an already-coordinated operation.\n * @returns {Promise<T>} - Operation result.\n */\nexport async function coordinateSharedTransactionConnection(connection, callback, operationOwner) {\n  const activeRegistration = coordinators.get(connection)\n  const registration = activeRegistration || connectionRegistrations.get(connection)\n\n  if (!registration) return await callback()\n\n  const environmentHandler = connection.configuration.getEnvironmentHandler()\n  const currentOwner = environmentHandler.getSharedTransactionCoordinatorOwner(connection)\n  const currentOwnerScope = currentOwner ? registration.ownerScopes.get(currentOwner) : undefined\n\n  if (currentOwnerScope) {\n    return await coordinateOwnedSharedTransactionConnection(connection, registration, currentOwnerScope, callback)\n  }\n  if (!activeRegistration) {\n    return await coordinateOwnedSharedTransactionConnection(connection, registration, registration.connectionScope, callback)\n  }\n  if (operationOwner === registration.owner) {\n    return await coordinateRootSharedTransactionConnection(connection, registration, callback)\n  }\n\n  return /** @type {T} */ (await registration.coordinator(async () => {\n    return await coordinateRootSharedTransactionConnection(connection, registration, callback)\n  }))\n}\n"]}
@@ -1,6 +1,7 @@
1
1
  // @ts-check
2
2
 
3
- /** @typedef {{coordinator: (callback: () => Promise<unknown>) => Promise<unknown>, ownedQueue: Promise<void>, owner: symbol, reentrantOwners: Set<symbol>, rootOwners: Set<symbol>}} CoordinatorRegistration */
3
+ /** @typedef {{ownedQueue: Promise<void>}} CoordinatorOwnerScope */
4
+ /** @typedef {{connectionScope: CoordinatorOwnerScope, coordinator: (callback: () => Promise<unknown>) => Promise<unknown>, owner: symbol, ownerScopes: Map<symbol, CoordinatorOwnerScope>}} CoordinatorRegistration */
4
5
 
5
6
  /** @type {WeakMap<object, CoordinatorRegistration>} */
6
7
  const coordinators = new WeakMap()
@@ -21,43 +22,47 @@ async function inactiveCoordinator(callback) {
21
22
  * @template T
22
23
  * @param {import("../database/drivers/base.js").default} connection - Parent physical connection.
23
24
  * @param {CoordinatorRegistration} registration - Physical connection registration.
25
+ * @param {CoordinatorOwnerScope} ownerScope - Queue inherited from the current owner.
24
26
  * @param {() => Promise<T>} callback - Owned operation.
27
+ * @param {string} [ownerDescription] - Async owner description.
25
28
  * @returns {Promise<T>} - Operation result.
26
29
  */
27
- async function coordinateOwnedSharedTransactionConnection(connection, registration, callback) {
28
- const previous = registration.ownedQueue
30
+ async function coordinateOwnedSharedTransactionConnection(connection, registration, ownerScope, callback, ownerDescription = "shared-transaction-owned-operation") {
31
+ const previous = ownerScope.ownedQueue
29
32
  /**
30
33
  * Releases the next owned sibling operation.
31
34
  * @type {() => void}
32
35
  */
33
36
  let release = () => {}
34
37
 
35
- registration.ownedQueue = new Promise((resolve) => { release = resolve })
38
+ ownerScope.ownedQueue = new Promise((resolve) => { release = resolve })
36
39
  await previous
37
- const operationOwner = Symbol("shared-transaction-owned-operation")
40
+ const operationOwner = Symbol(ownerDescription)
38
41
  const environmentHandler = connection.configuration.getEnvironmentHandler()
42
+ const operationScope = {ownedQueue: Promise.resolve()}
39
43
 
40
- registration.reentrantOwners.add(operationOwner)
44
+ registration.ownerScopes.set(operationOwner, operationScope)
41
45
  try {
42
46
  return await environmentHandler.runWithSharedTransactionCoordinatorOwner(connection, operationOwner, callback)
43
47
  } finally {
44
- registration.reentrantOwners.delete(operationOwner)
48
+ await drainOwnedSharedTransactionConnections(operationScope)
49
+ registration.ownerScopes.delete(operationOwner)
45
50
  release()
46
51
  }
47
52
  }
48
53
 
49
54
  /**
50
55
  * Drains all inherited operations admitted before the root owner is revoked.
51
- * @param {CoordinatorRegistration} registration - Physical connection registration.
56
+ * @param {CoordinatorOwnerScope} ownerScope - Owner scope to drain.
52
57
  * @returns {Promise<void>} - Resolves when the owned queue stops advancing.
53
58
  */
54
- async function drainOwnedSharedTransactionConnections(registration) {
59
+ async function drainOwnedSharedTransactionConnections(ownerScope) {
55
60
  let tail
56
61
 
57
62
  do {
58
- tail = registration.ownedQueue
63
+ tail = ownerScope.ownedQueue
59
64
  await tail
60
- } while (tail !== registration.ownedQueue)
65
+ } while (tail !== ownerScope.ownedQueue)
61
66
  }
62
67
 
63
68
  /**
@@ -69,17 +74,13 @@ async function drainOwnedSharedTransactionConnections(registration) {
69
74
  * @returns {Promise<T>} - Operation result.
70
75
  */
71
76
  async function coordinateRootSharedTransactionConnection(connection, registration, callback) {
72
- await drainOwnedSharedTransactionConnections(registration)
73
- const rootOwner = Symbol("shared-transaction-root-operation")
74
- const environmentHandler = connection.configuration.getEnvironmentHandler()
75
-
76
- registration.rootOwners.add(rootOwner)
77
- try {
78
- return await environmentHandler.runWithSharedTransactionCoordinatorOwner(connection, rootOwner, callback)
79
- } finally {
80
- await drainOwnedSharedTransactionConnections(registration)
81
- registration.rootOwners.delete(rootOwner)
82
- }
77
+ return await coordinateOwnedSharedTransactionConnection(
78
+ connection,
79
+ registration,
80
+ registration.connectionScope,
81
+ callback,
82
+ "shared-transaction-root-operation"
83
+ )
83
84
  }
84
85
 
85
86
  /**
@@ -96,7 +97,12 @@ export function setSharedTransactionCoordinator(connection, coordinator) {
96
97
  registration.coordinator = coordinator
97
98
  registration.owner = owner
98
99
  } else {
99
- registration = {coordinator, ownedQueue: Promise.resolve(), owner, reentrantOwners: new Set(), rootOwners: new Set()}
100
+ registration = {
101
+ connectionScope: {ownedQueue: Promise.resolve()},
102
+ coordinator,
103
+ owner,
104
+ ownerScopes: new Map()
105
+ }
100
106
  connectionRegistrations.set(connection, registration)
101
107
  }
102
108
 
@@ -135,12 +141,14 @@ export async function coordinateSharedTransactionConnection(connection, callback
135
141
 
136
142
  const environmentHandler = connection.configuration.getEnvironmentHandler()
137
143
  const currentOwner = environmentHandler.getSharedTransactionCoordinatorOwner(connection)
144
+ const currentOwnerScope = currentOwner ? registration.ownerScopes.get(currentOwner) : undefined
138
145
 
139
- if (currentOwner && registration.reentrantOwners.has(currentOwner)) return await callback()
140
- if (currentOwner && registration.rootOwners.has(currentOwner)) {
141
- return await coordinateOwnedSharedTransactionConnection(connection, registration, callback)
146
+ if (currentOwnerScope) {
147
+ return await coordinateOwnedSharedTransactionConnection(connection, registration, currentOwnerScope, callback)
148
+ }
149
+ if (!activeRegistration) {
150
+ return await coordinateOwnedSharedTransactionConnection(connection, registration, registration.connectionScope, callback)
142
151
  }
143
- if (!activeRegistration) return await coordinateOwnedSharedTransactionConnection(connection, registration, callback)
144
152
  if (operationOwner === registration.owner) {
145
153
  return await coordinateRootSharedTransactionConnection(connection, registration, callback)
146
154
  }
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "velocious": "build/bin/velocious.js"
4
4
  },
5
5
  "name": "velocious",
6
- "version": "1.0.620",
6
+ "version": "1.0.621",
7
7
  "main": "build/index.js",
8
8
  "types": "build/index.d.ts",
9
9
  "files": [
@@ -7,7 +7,7 @@ import TableData from "../database/table-data/index.js"
7
7
  import VelociousError from "../velocious-error.js"
8
8
  import BackgroundJobRecord from "./job-record.js"
9
9
  import normalizeBackgroundJobError from "./normalize-error.js"
10
- import {coordinateSharedTransactionConnection} from "../testing/shared-transaction-connection-coordinator.js"
10
+ import { coordinateSharedTransactionConnection } from "../testing/shared-transaction-connection-coordinator.js"
11
11
  import stableJsonStringify from "../utils/stable-json.js"
12
12
  import {
13
13
  BACKGROUND_JOB_EXECUTION_MODES,
@@ -1,6 +1,7 @@
1
1
  // @ts-check
2
2
 
3
- /** @typedef {{coordinator: (callback: () => Promise<unknown>) => Promise<unknown>, ownedQueue: Promise<void>, owner: symbol, reentrantOwners: Set<symbol>, rootOwners: Set<symbol>}} CoordinatorRegistration */
3
+ /** @typedef {{ownedQueue: Promise<void>}} CoordinatorOwnerScope */
4
+ /** @typedef {{connectionScope: CoordinatorOwnerScope, coordinator: (callback: () => Promise<unknown>) => Promise<unknown>, owner: symbol, ownerScopes: Map<symbol, CoordinatorOwnerScope>}} CoordinatorRegistration */
4
5
 
5
6
  /** @type {WeakMap<object, CoordinatorRegistration>} */
6
7
  const coordinators = new WeakMap()
@@ -21,43 +22,47 @@ async function inactiveCoordinator(callback) {
21
22
  * @template T
22
23
  * @param {import("../database/drivers/base.js").default} connection - Parent physical connection.
23
24
  * @param {CoordinatorRegistration} registration - Physical connection registration.
25
+ * @param {CoordinatorOwnerScope} ownerScope - Queue inherited from the current owner.
24
26
  * @param {() => Promise<T>} callback - Owned operation.
27
+ * @param {string} [ownerDescription] - Async owner description.
25
28
  * @returns {Promise<T>} - Operation result.
26
29
  */
27
- async function coordinateOwnedSharedTransactionConnection(connection, registration, callback) {
28
- const previous = registration.ownedQueue
30
+ async function coordinateOwnedSharedTransactionConnection(connection, registration, ownerScope, callback, ownerDescription = "shared-transaction-owned-operation") {
31
+ const previous = ownerScope.ownedQueue
29
32
  /**
30
33
  * Releases the next owned sibling operation.
31
34
  * @type {() => void}
32
35
  */
33
36
  let release = () => {}
34
37
 
35
- registration.ownedQueue = new Promise((resolve) => { release = resolve })
38
+ ownerScope.ownedQueue = new Promise((resolve) => { release = resolve })
36
39
  await previous
37
- const operationOwner = Symbol("shared-transaction-owned-operation")
40
+ const operationOwner = Symbol(ownerDescription)
38
41
  const environmentHandler = connection.configuration.getEnvironmentHandler()
42
+ const operationScope = {ownedQueue: Promise.resolve()}
39
43
 
40
- registration.reentrantOwners.add(operationOwner)
44
+ registration.ownerScopes.set(operationOwner, operationScope)
41
45
  try {
42
46
  return await environmentHandler.runWithSharedTransactionCoordinatorOwner(connection, operationOwner, callback)
43
47
  } finally {
44
- registration.reentrantOwners.delete(operationOwner)
48
+ await drainOwnedSharedTransactionConnections(operationScope)
49
+ registration.ownerScopes.delete(operationOwner)
45
50
  release()
46
51
  }
47
52
  }
48
53
 
49
54
  /**
50
55
  * Drains all inherited operations admitted before the root owner is revoked.
51
- * @param {CoordinatorRegistration} registration - Physical connection registration.
56
+ * @param {CoordinatorOwnerScope} ownerScope - Owner scope to drain.
52
57
  * @returns {Promise<void>} - Resolves when the owned queue stops advancing.
53
58
  */
54
- async function drainOwnedSharedTransactionConnections(registration) {
59
+ async function drainOwnedSharedTransactionConnections(ownerScope) {
55
60
  let tail
56
61
 
57
62
  do {
58
- tail = registration.ownedQueue
63
+ tail = ownerScope.ownedQueue
59
64
  await tail
60
- } while (tail !== registration.ownedQueue)
65
+ } while (tail !== ownerScope.ownedQueue)
61
66
  }
62
67
 
63
68
  /**
@@ -69,17 +74,13 @@ async function drainOwnedSharedTransactionConnections(registration) {
69
74
  * @returns {Promise<T>} - Operation result.
70
75
  */
71
76
  async function coordinateRootSharedTransactionConnection(connection, registration, callback) {
72
- await drainOwnedSharedTransactionConnections(registration)
73
- const rootOwner = Symbol("shared-transaction-root-operation")
74
- const environmentHandler = connection.configuration.getEnvironmentHandler()
75
-
76
- registration.rootOwners.add(rootOwner)
77
- try {
78
- return await environmentHandler.runWithSharedTransactionCoordinatorOwner(connection, rootOwner, callback)
79
- } finally {
80
- await drainOwnedSharedTransactionConnections(registration)
81
- registration.rootOwners.delete(rootOwner)
82
- }
77
+ return await coordinateOwnedSharedTransactionConnection(
78
+ connection,
79
+ registration,
80
+ registration.connectionScope,
81
+ callback,
82
+ "shared-transaction-root-operation"
83
+ )
83
84
  }
84
85
 
85
86
  /**
@@ -96,7 +97,12 @@ export function setSharedTransactionCoordinator(connection, coordinator) {
96
97
  registration.coordinator = coordinator
97
98
  registration.owner = owner
98
99
  } else {
99
- registration = {coordinator, ownedQueue: Promise.resolve(), owner, reentrantOwners: new Set(), rootOwners: new Set()}
100
+ registration = {
101
+ connectionScope: {ownedQueue: Promise.resolve()},
102
+ coordinator,
103
+ owner,
104
+ ownerScopes: new Map()
105
+ }
100
106
  connectionRegistrations.set(connection, registration)
101
107
  }
102
108
 
@@ -135,12 +141,14 @@ export async function coordinateSharedTransactionConnection(connection, callback
135
141
 
136
142
  const environmentHandler = connection.configuration.getEnvironmentHandler()
137
143
  const currentOwner = environmentHandler.getSharedTransactionCoordinatorOwner(connection)
144
+ const currentOwnerScope = currentOwner ? registration.ownerScopes.get(currentOwner) : undefined
138
145
 
139
- if (currentOwner && registration.reentrantOwners.has(currentOwner)) return await callback()
140
- if (currentOwner && registration.rootOwners.has(currentOwner)) {
141
- return await coordinateOwnedSharedTransactionConnection(connection, registration, callback)
146
+ if (currentOwnerScope) {
147
+ return await coordinateOwnedSharedTransactionConnection(connection, registration, currentOwnerScope, callback)
148
+ }
149
+ if (!activeRegistration) {
150
+ return await coordinateOwnedSharedTransactionConnection(connection, registration, registration.connectionScope, callback)
142
151
  }
143
- if (!activeRegistration) return await coordinateOwnedSharedTransactionConnection(connection, registration, callback)
144
152
  if (operationOwner === registration.owner) {
145
153
  return await coordinateRootSharedTransactionConnection(connection, registration, callback)
146
154
  }