velocious 1.0.726 → 1.0.728
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 +2 -2
- package/bin/velocious.js +2 -19
- package/build/application.js +32 -3
- package/build/background-jobs/main.js +9 -1
- package/build/background-jobs/worker.js +69 -6
- package/build/bin/velocious.js +2 -19
- package/build/cli/process-args.js +34 -0
- package/build/configuration-types.js +1 -1
- package/build/configuration.js +43 -2
- package/build/database/advisory-lock-lock-server-backend.js +30 -24
- package/build/database/advisory-lock-lock-server-embedded-client.js +74 -0
- package/build/database/advisory-lock-lock-server-engine.js +544 -0
- package/build/database/advisory-lock-lock-server-local-client.js +260 -0
- package/build/database/advisory-lock-lock-server-socket-path.js +17 -0
- package/build/database/advisory-lock-lock-server-transport.js +30 -0
- package/build/database/drivers/base.js +34 -12
- package/build/database/drivers/mssql/index.js +17 -18
- package/build/database/drivers/mssql/table.js +28 -25
- package/build/database/drivers/mysql/index.js +15 -18
- package/build/database/drivers/mysql/table.js +31 -23
- package/build/database/drivers/pgsql/index.js +15 -18
- package/build/database/drivers/pgsql/table.js +28 -26
- package/build/database/drivers/sqlite/base.js +7 -9
- package/build/database/drivers/sqlite/table.js +32 -26
- package/build/database/pool/async-tracked-multi-connection.js +1 -0
- package/build/database/pool/base.js +14 -4
- package/build/database/pool/single-multi-use.js +1 -0
- package/build/database/record/auditing.js +89 -11
- package/build/database/record/index.js +1 -1
- package/build/environment-handlers/base.js +50 -9
- package/build/environment-handlers/node/advisory-lock-lock-server-local-server.js +206 -0
- package/build/environment-handlers/node/cli/commands/server.js +1 -0
- package/build/environment-handlers/node.js +30 -3
- package/build/http-server/server-lock.js +55 -18
- package/build/src/application.d.ts +7 -4
- package/build/src/application.d.ts.map +1 -1
- package/build/src/application.js +27 -4
- package/build/src/background-jobs/main.d.ts +2 -1
- package/build/src/background-jobs/main.d.ts.map +1 -1
- package/build/src/background-jobs/main.js +10 -2
- package/build/src/background-jobs/worker.d.ts +42 -0
- package/build/src/background-jobs/worker.d.ts.map +1 -1
- package/build/src/background-jobs/worker.js +61 -5
- package/build/src/cli/process-args.d.ts +11 -0
- package/build/src/cli/process-args.d.ts.map +1 -0
- package/build/src/cli/process-args.js +34 -0
- package/build/src/configuration-types.d.ts +3 -1
- package/build/src/configuration-types.d.ts.map +1 -1
- package/build/src/configuration-types.js +2 -2
- package/build/src/configuration.d.ts +16 -1
- package/build/src/configuration.d.ts.map +1 -1
- package/build/src/configuration.js +39 -3
- package/build/src/database/advisory-lock-lock-server-backend.d.ts +10 -3
- package/build/src/database/advisory-lock-lock-server-backend.d.ts.map +1 -1
- package/build/src/database/advisory-lock-lock-server-backend.js +25 -22
- package/build/src/database/advisory-lock-lock-server-embedded-client.d.ts +24 -0
- package/build/src/database/advisory-lock-lock-server-embedded-client.d.ts.map +1 -0
- package/build/src/database/advisory-lock-lock-server-embedded-client.js +64 -0
- package/build/src/database/advisory-lock-lock-server-engine.d.ts +285 -0
- package/build/src/database/advisory-lock-lock-server-engine.d.ts.map +1 -0
- package/build/src/database/advisory-lock-lock-server-engine.js +460 -0
- package/build/src/database/advisory-lock-lock-server-local-client.d.ts +114 -0
- package/build/src/database/advisory-lock-lock-server-local-client.d.ts.map +1 -0
- package/build/src/database/advisory-lock-lock-server-local-client.js +227 -0
- package/build/src/database/advisory-lock-lock-server-socket-path.d.ts +9 -0
- package/build/src/database/advisory-lock-lock-server-socket-path.d.ts.map +1 -0
- package/build/src/database/advisory-lock-lock-server-socket-path.js +16 -0
- package/build/src/database/advisory-lock-lock-server-transport.d.ts +18 -0
- package/build/src/database/advisory-lock-lock-server-transport.d.ts.map +1 -0
- package/build/src/database/advisory-lock-lock-server-transport.js +27 -0
- package/build/src/database/drivers/base.d.ts +15 -2
- package/build/src/database/drivers/base.d.ts.map +1 -1
- package/build/src/database/drivers/base.js +33 -13
- package/build/src/database/drivers/mssql/index.d.ts +2 -2
- package/build/src/database/drivers/mssql/index.d.ts.map +1 -1
- package/build/src/database/drivers/mssql/index.js +17 -18
- package/build/src/database/drivers/mssql/table.d.ts.map +1 -1
- package/build/src/database/drivers/mssql/table.js +25 -23
- package/build/src/database/drivers/mysql/index.d.ts +2 -2
- package/build/src/database/drivers/mysql/index.d.ts.map +1 -1
- package/build/src/database/drivers/mysql/index.js +16 -19
- package/build/src/database/drivers/mysql/table.d.ts.map +1 -1
- package/build/src/database/drivers/mysql/table.js +27 -22
- package/build/src/database/drivers/pgsql/index.d.ts +2 -2
- package/build/src/database/drivers/pgsql/index.d.ts.map +1 -1
- package/build/src/database/drivers/pgsql/index.js +16 -19
- package/build/src/database/drivers/pgsql/table.d.ts.map +1 -1
- package/build/src/database/drivers/pgsql/table.js +25 -23
- package/build/src/database/drivers/sqlite/base.d.ts.map +1 -1
- package/build/src/database/drivers/sqlite/base.js +8 -10
- package/build/src/database/drivers/sqlite/table.d.ts.map +1 -1
- package/build/src/database/drivers/sqlite/table.js +29 -25
- package/build/src/database/pool/async-tracked-multi-connection.d.ts.map +1 -1
- package/build/src/database/pool/async-tracked-multi-connection.js +2 -1
- package/build/src/database/pool/base.d.ts +6 -0
- package/build/src/database/pool/base.d.ts.map +1 -1
- package/build/src/database/pool/base.js +14 -5
- package/build/src/database/pool/single-multi-use.d.ts.map +1 -1
- package/build/src/database/pool/single-multi-use.js +2 -1
- package/build/src/database/record/auditing.d.ts +14 -4
- package/build/src/database/record/auditing.d.ts.map +1 -1
- package/build/src/database/record/auditing.js +77 -12
- package/build/src/database/record/index.d.ts +4 -2
- package/build/src/database/record/index.d.ts.map +1 -1
- package/build/src/database/record/index.js +2 -2
- package/build/src/environment-handlers/base.d.ts +86 -7
- package/build/src/environment-handlers/base.d.ts.map +1 -1
- package/build/src/environment-handlers/base.js +48 -9
- package/build/src/environment-handlers/node/advisory-lock-lock-server-local-server.d.ts +2 -0
- package/build/src/environment-handlers/node/advisory-lock-lock-server-local-server.d.ts.map +1 -0
- package/build/src/environment-handlers/node/advisory-lock-lock-server-local-server.js +179 -0
- package/build/src/environment-handlers/node/cli/commands/server.d.ts.map +1 -1
- package/build/src/environment-handlers/node/cli/commands/server.js +2 -1
- package/build/src/environment-handlers/node.d.ts +10 -4
- package/build/src/environment-handlers/node.d.ts.map +1 -1
- package/build/src/environment-handlers/node.js +30 -4
- package/build/src/http-server/server-lock.d.ts +43 -14
- package/build/src/http-server/server-lock.d.ts.map +1 -1
- package/build/src/http-server/server-lock.js +54 -19
- package/build/src/tenants/default-tenant-database-provisioning.d.ts.map +1 -1
- package/build/src/tenants/default-tenant-database-provisioning.js +7 -1
- package/build/tenants/default-tenant-database-provisioning.js +8 -0
- package/package.json +2 -2
- package/src/application.js +32 -3
- package/src/background-jobs/main.js +9 -1
- package/src/background-jobs/worker.js +69 -6
- package/src/cli/process-args.js +34 -0
- package/src/configuration-types.js +1 -1
- package/src/configuration.js +43 -2
- package/src/database/advisory-lock-lock-server-backend.js +30 -24
- package/src/database/advisory-lock-lock-server-embedded-client.js +74 -0
- package/src/database/advisory-lock-lock-server-engine.js +544 -0
- package/src/database/advisory-lock-lock-server-local-client.js +260 -0
- package/src/database/advisory-lock-lock-server-socket-path.js +17 -0
- package/src/database/advisory-lock-lock-server-transport.js +30 -0
- package/src/database/drivers/base.js +34 -12
- package/src/database/drivers/mssql/index.js +17 -18
- package/src/database/drivers/mssql/table.js +28 -25
- package/src/database/drivers/mysql/index.js +15 -18
- package/src/database/drivers/mysql/table.js +31 -23
- package/src/database/drivers/pgsql/index.js +15 -18
- package/src/database/drivers/pgsql/table.js +28 -26
- package/src/database/drivers/sqlite/base.js +7 -9
- package/src/database/drivers/sqlite/table.js +32 -26
- package/src/database/pool/async-tracked-multi-connection.js +1 -0
- package/src/database/pool/base.js +14 -4
- package/src/database/pool/single-multi-use.js +1 -0
- package/src/database/record/auditing.js +89 -11
- package/src/database/record/index.js +1 -1
- package/src/environment-handlers/base.js +50 -9
- package/src/environment-handlers/node/advisory-lock-lock-server-local-server.js +206 -0
- package/src/environment-handlers/node/cli/commands/server.js +1 -0
- package/src/environment-handlers/node.js +30 -3
- package/src/http-server/server-lock.js +55 -18
- package/src/tenants/default-tenant-database-provisioning.js +8 -0
|
@@ -1,40 +1,62 @@
|
|
|
1
1
|
import AdvisoryLockFileBackend from "../database/advisory-lock-file-backend.js";
|
|
2
2
|
/**
|
|
3
|
-
* Directory-based lock that allows only one HTTP server process
|
|
4
|
-
* directory. Thin wrapper over the shared
|
|
5
|
-
* (`src/database/advisory-lock-file-backend.js` — the
|
|
6
|
-
* primitive generalized from this lock's original
|
|
7
|
-
* protocol), so the server lock and the advisory-lock
|
|
8
|
-
* acquisition, owner-metadata, lease-renewal, and
|
|
3
|
+
* Directory + environment-based lock that allows only one HTTP server process
|
|
4
|
+
* per (app directory, environment) pair. Thin wrapper over the shared
|
|
5
|
+
* file-lock backend (`src/database/advisory-lock-file-backend.js` — the
|
|
6
|
+
* STC-210 `file` tier primitive generalized from this lock's original
|
|
7
|
+
* hand-rolled directory protocol), so the server lock and the advisory-lock
|
|
8
|
+
* file tier share one acquisition, owner-metadata, lease-renewal, and
|
|
9
|
+
* staleness implementation.
|
|
10
|
+
*
|
|
11
|
+
* The lock name is scoped by the configuration's environment
|
|
12
|
+
* (`server.<environment>` → `tmp/server.<environment>.lock`) so a development
|
|
13
|
+
* server and a test-spawned backend in the same app directory coexist, while
|
|
14
|
+
* the single-server-per-(directory, environment) invariant still fails loudly
|
|
15
|
+
* for a duplicate within one environment (STC-697).
|
|
16
|
+
*
|
|
17
|
+
* A caller that knowingly wants a second server in the same
|
|
18
|
+
* (directory, environment) pair can opt out of this lock (STC-698). The lock
|
|
19
|
+
* itself is unchanged for every other caller: an opted-out lock never acquires
|
|
20
|
+
* and therefore never releases, so it can never remove a live owner's lock.
|
|
9
21
|
*/
|
|
10
22
|
export default class VelociousHttpServerLock {
|
|
11
23
|
configuration: import("../configuration.js").default;
|
|
12
24
|
host: string;
|
|
13
25
|
port: number;
|
|
26
|
+
optOut: boolean;
|
|
27
|
+
environment: string;
|
|
28
|
+
lockName: string;
|
|
14
29
|
lockPath: string;
|
|
15
30
|
backend: AdvisoryLockFileBackend;
|
|
16
31
|
acquired: boolean;
|
|
17
32
|
/**
|
|
18
|
-
* Build a lock for the configured application directory and
|
|
33
|
+
* Build a lock for the configured application directory, environment and
|
|
34
|
+
* server endpoint.
|
|
19
35
|
* @param {object} args - Options object.
|
|
20
36
|
* @param {import("../configuration.js").default} args.configuration - Configuration that owns the application directory.
|
|
21
37
|
* @param {string} args.host - Configured HTTP host.
|
|
22
38
|
* @param {number} args.port - Configured HTTP port.
|
|
39
|
+
* @param {boolean} [args.optOut] - Skip acquisition for this caller instead of contending for the lock.
|
|
23
40
|
*/
|
|
24
|
-
constructor({ configuration, host, port }: {
|
|
41
|
+
constructor({ configuration, host, port, optOut }: {
|
|
25
42
|
configuration: import("../configuration.js").default;
|
|
26
43
|
host: string;
|
|
27
44
|
port: number;
|
|
45
|
+
optOut?: boolean;
|
|
28
46
|
});
|
|
29
47
|
/**
|
|
30
|
-
* Acquires the app-directory HTTP server lock before startup
|
|
31
|
-
* run.
|
|
32
|
-
*
|
|
33
|
-
*
|
|
48
|
+
* Acquires the app-directory + environment HTTP server lock before startup
|
|
49
|
+
* side effects run. An opted-out caller never touches the lock, so the live
|
|
50
|
+
* owner keeps it. A stale lock (dead local owner or expired lease) is
|
|
51
|
+
* reclaimed by the backend; a live foreign owner in the same environment
|
|
52
|
+
* fails loudly with the owner details.
|
|
53
|
+
* @returns {Promise<boolean>} - Whether this caller holds the lock.
|
|
34
54
|
*/
|
|
35
|
-
acquire(): Promise<
|
|
55
|
+
acquire(): Promise<boolean>;
|
|
36
56
|
/**
|
|
37
|
-
* Releases the held HTTP server lock directory.
|
|
57
|
+
* Releases the held environment-scoped HTTP server lock directory. A lock
|
|
58
|
+
* that was never acquired (an opted-out caller) is a no-op, so it can never
|
|
59
|
+
* remove the live owner's lock on shutdown.
|
|
38
60
|
* @returns {Promise<void>} - Resolves after best-effort lock release.
|
|
39
61
|
*/
|
|
40
62
|
release(): Promise<void>;
|
|
@@ -48,5 +70,12 @@ export default class VelociousHttpServerLock {
|
|
|
48
70
|
* @returns {Promise<string>} - Error message explaining which server owns the lock.
|
|
49
71
|
*/
|
|
50
72
|
lockHeldMessage(): Promise<string>;
|
|
73
|
+
/**
|
|
74
|
+
* Builds the warning emitted when a caller knowingly starts a server without
|
|
75
|
+
* the lock, so an unprotected production process is visible in the log rather
|
|
76
|
+
* than silently running without duplicate-server protection.
|
|
77
|
+
* @returns {string} - Warning message naming the application directory and port.
|
|
78
|
+
*/
|
|
79
|
+
lockSkippedMessage(): string;
|
|
51
80
|
}
|
|
52
81
|
//# sourceMappingURL=server-lock.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-lock.d.ts","sourceRoot":"","sources":["../../../src/http-server/server-lock.js"],"names":[],"mappings":"AAEA,OAAO,uBAAuB,MAAM,2CAA2C,CAAA;AAG/E
|
|
1
|
+
{"version":3,"file":"server-lock.d.ts","sourceRoot":"","sources":["../../../src/http-server/server-lock.js"],"names":[],"mappings":"AAEA,OAAO,uBAAuB,MAAM,2CAA2C,CAAA;AAG/E;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAWnC,aAAa;IACb,IAAI;IACJ,IAAI;IACJ,MAAM;IACN,WAAW;IAGX,QAAQ;IACR,QAAQ;IACR,OAAO;IAKP,QAAQ;IAxBf;;;;;;;;OAQG;IACH,YAAY,EAAC,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,MAAc,EAAC,EALpD;QAAoD,aAAa,EAAzD,OAAO,qBAAqB,EAAE,OAAO,CAC7C;QAAqB,IAAI,EAAjB,MAAM,CACd;QAAqB,IAAI,EAAjB,MAAM,CACd;QAAuB,MAAM,AAA7B,CACF,EADU,OAAO,CACjB;KACsD,EAgBtD;IAED;;;;;;;OAOG;IACG,OAAO,IAFA,OAAO,CAAC,OAAO,CAAC,CAY5B;IAED;;;;;OAKG;IACG,OAAO,IAFA,OAAO,CAAC,IAAI,CAAC,CAOzB;IAED;;;OAGG;IACG,iBAAiB,IAFV,OAAO,CAAC,OAAO,2CAA2C,EAAE,qBAAqB,GAAG,IAAI,CAAC,CAIrG;IAED;;;OAGG;IACG,eAAe,IAFR,OAAO,CAAC,MAAM,CAAC,CAS3B;IAED;;;;;OAKG;IACH,kBAAkB,IAFL,MAAM,CAIlB;CACF"}
|
|
@@ -2,26 +2,45 @@
|
|
|
2
2
|
import AdvisoryLockFileBackend from "../database/advisory-lock-file-backend.js";
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
/**
|
|
5
|
-
* Directory-based lock that allows only one HTTP server process
|
|
6
|
-
* directory. Thin wrapper over the shared
|
|
7
|
-
* (`src/database/advisory-lock-file-backend.js` — the
|
|
8
|
-
* primitive generalized from this lock's original
|
|
9
|
-
* protocol), so the server lock and the advisory-lock
|
|
10
|
-
* acquisition, owner-metadata, lease-renewal, and
|
|
5
|
+
* Directory + environment-based lock that allows only one HTTP server process
|
|
6
|
+
* per (app directory, environment) pair. Thin wrapper over the shared
|
|
7
|
+
* file-lock backend (`src/database/advisory-lock-file-backend.js` — the
|
|
8
|
+
* STC-210 `file` tier primitive generalized from this lock's original
|
|
9
|
+
* hand-rolled directory protocol), so the server lock and the advisory-lock
|
|
10
|
+
* file tier share one acquisition, owner-metadata, lease-renewal, and
|
|
11
|
+
* staleness implementation.
|
|
12
|
+
*
|
|
13
|
+
* The lock name is scoped by the configuration's environment
|
|
14
|
+
* (`server.<environment>` → `tmp/server.<environment>.lock`) so a development
|
|
15
|
+
* server and a test-spawned backend in the same app directory coexist, while
|
|
16
|
+
* the single-server-per-(directory, environment) invariant still fails loudly
|
|
17
|
+
* for a duplicate within one environment (STC-697).
|
|
18
|
+
*
|
|
19
|
+
* A caller that knowingly wants a second server in the same
|
|
20
|
+
* (directory, environment) pair can opt out of this lock (STC-698). The lock
|
|
21
|
+
* itself is unchanged for every other caller: an opted-out lock never acquires
|
|
22
|
+
* and therefore never releases, so it can never remove a live owner's lock.
|
|
11
23
|
*/
|
|
12
24
|
export default class VelociousHttpServerLock {
|
|
13
25
|
/**
|
|
14
|
-
* Build a lock for the configured application directory and
|
|
26
|
+
* Build a lock for the configured application directory, environment and
|
|
27
|
+
* server endpoint.
|
|
15
28
|
* @param {object} args - Options object.
|
|
16
29
|
* @param {import("../configuration.js").default} args.configuration - Configuration that owns the application directory.
|
|
17
30
|
* @param {string} args.host - Configured HTTP host.
|
|
18
31
|
* @param {number} args.port - Configured HTTP port.
|
|
32
|
+
* @param {boolean} [args.optOut] - Skip acquisition for this caller instead of contending for the lock.
|
|
19
33
|
*/
|
|
20
|
-
constructor({ configuration, host, port }) {
|
|
34
|
+
constructor({ configuration, host, port, optOut = false }) {
|
|
21
35
|
this.configuration = configuration;
|
|
22
36
|
this.host = host;
|
|
23
37
|
this.port = port;
|
|
24
|
-
this.
|
|
38
|
+
this.optOut = optOut;
|
|
39
|
+
this.environment = String(configuration.getEnvironment());
|
|
40
|
+
// Scope the lock name by environment and keep the segment filesystem-safe,
|
|
41
|
+
// so odd environment names can never escape tmp/ or collide with each other.
|
|
42
|
+
this.lockName = `server.${this.environment.replace(/[^a-zA-Z0-9._-]/g, "_")}`;
|
|
43
|
+
this.lockPath = path.join(configuration.getDirectory(), "tmp", `${this.lockName}.lock`);
|
|
25
44
|
this.backend = new AdvisoryLockFileBackend({
|
|
26
45
|
directory: path.join(configuration.getDirectory(), "tmp"),
|
|
27
46
|
extraOwnerFields: { host: this.host, port: this.port },
|
|
@@ -30,33 +49,40 @@ export default class VelociousHttpServerLock {
|
|
|
30
49
|
this.acquired = false;
|
|
31
50
|
}
|
|
32
51
|
/**
|
|
33
|
-
* Acquires the app-directory HTTP server lock before startup
|
|
34
|
-
* run.
|
|
35
|
-
*
|
|
36
|
-
*
|
|
52
|
+
* Acquires the app-directory + environment HTTP server lock before startup
|
|
53
|
+
* side effects run. An opted-out caller never touches the lock, so the live
|
|
54
|
+
* owner keeps it. A stale lock (dead local owner or expired lease) is
|
|
55
|
+
* reclaimed by the backend; a live foreign owner in the same environment
|
|
56
|
+
* fails loudly with the owner details.
|
|
57
|
+
* @returns {Promise<boolean>} - Whether this caller holds the lock.
|
|
37
58
|
*/
|
|
38
59
|
async acquire() {
|
|
39
|
-
|
|
60
|
+
if (this.optOut)
|
|
61
|
+
return false;
|
|
62
|
+
const acquired = await this.backend.acquire(this.lockName, { timeoutMs: 0 });
|
|
40
63
|
if (!acquired)
|
|
41
64
|
throw new Error(await this.lockHeldMessage());
|
|
42
65
|
this.acquired = true;
|
|
66
|
+
return true;
|
|
43
67
|
}
|
|
44
68
|
/**
|
|
45
|
-
* Releases the held HTTP server lock directory.
|
|
69
|
+
* Releases the held environment-scoped HTTP server lock directory. A lock
|
|
70
|
+
* that was never acquired (an opted-out caller) is a no-op, so it can never
|
|
71
|
+
* remove the live owner's lock on shutdown.
|
|
46
72
|
* @returns {Promise<void>} - Resolves after best-effort lock release.
|
|
47
73
|
*/
|
|
48
74
|
async release() {
|
|
49
75
|
if (!this.acquired)
|
|
50
76
|
return;
|
|
51
77
|
this.acquired = false;
|
|
52
|
-
await this.backend.release(
|
|
78
|
+
await this.backend.release(this.lockName);
|
|
53
79
|
}
|
|
54
80
|
/**
|
|
55
81
|
* Reads owner metadata from an existing server lock directory.
|
|
56
82
|
* @returns {Promise<import("../database/advisory-lock-file-backend.js").AdvisoryLockFileOwner | null>} - Parsed owner metadata, when readable.
|
|
57
83
|
*/
|
|
58
84
|
async readOwnerMetadata() {
|
|
59
|
-
return await this.backend.holderInfo(
|
|
85
|
+
return await this.backend.holderInfo(this.lockName);
|
|
60
86
|
}
|
|
61
87
|
/**
|
|
62
88
|
* Builds a duplicate-server error message with owner details when available.
|
|
@@ -67,7 +93,16 @@ export default class VelociousHttpServerLock {
|
|
|
67
93
|
const details = owner
|
|
68
94
|
? `PID ${String(owner.pid)} on ${String(owner.hostname)} (${String(owner.host)}:${String(owner.port)})`
|
|
69
95
|
: `lock directory ${this.lockPath}`;
|
|
70
|
-
return `A Velocious HTTP server is already running for this application (${details}). Remove ${this.lockPath} if the server is no longer running.`;
|
|
96
|
+
return `A Velocious HTTP server is already running for this application in the ${this.environment} environment (${details}). Remove ${this.lockPath} if the server is no longer running.`;
|
|
97
|
+
}
|
|
98
|
+
/**
|
|
99
|
+
* Builds the warning emitted when a caller knowingly starts a server without
|
|
100
|
+
* the lock, so an unprotected production process is visible in the log rather
|
|
101
|
+
* than silently running without duplicate-server protection.
|
|
102
|
+
* @returns {string} - Warning message naming the application directory and port.
|
|
103
|
+
*/
|
|
104
|
+
lockSkippedMessage() {
|
|
105
|
+
return `Skipping the HTTP server lock for ${this.configuration.getDirectory()} on ${this.host}:${String(this.port)} because the caller opted out. This server runs without duplicate-server protection for the ${this.environment} environment.`;
|
|
71
106
|
}
|
|
72
107
|
}
|
|
73
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmVyLWxvY2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvaHR0cC1zZXJ2ZXIvc2VydmVyLWxvY2suanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsWUFBWTtBQUVaLE9BQU8sdUJBQXVCLE1BQU0sMkNBQTJDLENBQUE7QUFDL0UsT0FBTyxJQUFJLE1BQU0sV0FBVyxDQUFBO0FBRTVCOzs7Ozs7O0dBT0c7QUFDSCxNQUFNLENBQUMsT0FBTyxPQUFPLHVCQUF1QjtJQUMxQzs7Ozs7O09BTUc7SUFDSCxZQUFZLEVBQUMsYUFBYSxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUM7UUFDckMsSUFBSSxDQUFDLGFBQWEsR0FBRyxhQUFhLENBQUE7UUFDbEMsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUE7UUFDaEIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUE7UUFDaEIsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxZQUFZLEVBQUUsRUFBRSxLQUFLLEVBQUUsYUFBYSxDQUFDLENBQUE7UUFDN0UsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLHVCQUF1QixDQUFDO1lBQ3pDLFNBQVMsRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxZQUFZLEVBQUUsRUFBRSxLQUFLLENBQUM7WUFDekQsZ0JBQWdCLEVBQUUsRUFBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksRUFBQztZQUNwRCxTQUFTLEVBQUUsT0FBTztTQUNuQixDQUFDLENBQUE7UUFDRixJQUFJLENBQUMsUUFBUSxHQUFHLEtBQUssQ0FBQTtJQUN2QixDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSCxLQUFLLENBQUMsT0FBTztRQUNYLE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLEVBQUMsU0FBUyxFQUFFLENBQUMsRUFBQyxDQUFDLENBQUE7UUFFckUsSUFBSSxDQUFDLFFBQVE7WUFBRSxNQUFNLElBQUksS0FBSyxDQUFDLE1BQU0sSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDLENBQUE7UUFFNUQsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUE7SUFDdEIsQ0FBQztJQUVEOzs7T0FHRztJQUNILEtBQUssQ0FBQyxPQUFPO1FBQ1gsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRO1lBQUUsT0FBTTtRQUUxQixJQUFJLENBQUMsUUFBUSxHQUFHLEtBQUssQ0FBQTtRQUNyQixNQUFNLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQ3RDLENBQUM7SUFFRDs7O09BR0c7SUFDSCxLQUFLLENBQUMsaUJBQWlCO1FBQ3JCLE9BQU8sTUFBTSxJQUFJLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUNoRCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsS0FBSyxDQUFDLGVBQWU7UUFDbkIsTUFBTSxLQUFLLEdBQUcsTUFBTSxJQUFJLENBQUMsaUJBQWlCLEVBQUUsQ0FBQTtRQUM1QyxNQUFNLE9BQU8sR0FBRyxLQUFLO1lBQ25CLENBQUMsQ0FBQyxPQUFPLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLE9BQU8sTUFBTSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsS0FBSyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLE1BQU0sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUc7WUFDdkcsQ0FBQyxDQUFDLGtCQUFrQixJQUFJLENBQUMsUUFBUSxFQUFFLENBQUE7UUFFckMsT0FBTyxvRUFBb0UsT0FBTyxhQUFhLElBQUksQ0FBQyxRQUFRLHNDQUFzQyxDQUFBO0lBQ3BKLENBQUM7Q0FDRiIsInNvdXJjZXNDb250ZW50IjpbIi8vIEB0cy1jaGVja1xuXG5pbXBvcnQgQWR2aXNvcnlMb2NrRmlsZUJhY2tlbmQgZnJvbSBcIi4uL2RhdGFiYXNlL2Fkdmlzb3J5LWxvY2stZmlsZS1iYWNrZW5kLmpzXCJcbmltcG9ydCBwYXRoIGZyb20gXCJub2RlOnBhdGhcIlxuXG4vKipcbiAqIERpcmVjdG9yeS1iYXNlZCBsb2NrIHRoYXQgYWxsb3dzIG9ubHkgb25lIEhUVFAgc2VydmVyIHByb2Nlc3MgcGVyIGFwcFxuICogZGlyZWN0b3J5LiBUaGluIHdyYXBwZXIgb3ZlciB0aGUgc2hhcmVkIGZpbGUtbG9jayBiYWNrZW5kXG4gKiAoYHNyYy9kYXRhYmFzZS9hZHZpc29yeS1sb2NrLWZpbGUtYmFja2VuZC5qc2Ag4oCUIHRoZSBTVEMtMjEwIGBmaWxlYCB0aWVyXG4gKiBwcmltaXRpdmUgZ2VuZXJhbGl6ZWQgZnJvbSB0aGlzIGxvY2sncyBvcmlnaW5hbCBoYW5kLXJvbGxlZCBkaXJlY3RvcnlcbiAqIHByb3RvY29sKSwgc28gdGhlIHNlcnZlciBsb2NrIGFuZCB0aGUgYWR2aXNvcnktbG9jayBmaWxlIHRpZXIgc2hhcmUgb25lXG4gKiBhY3F1aXNpdGlvbiwgb3duZXItbWV0YWRhdGEsIGxlYXNlLXJlbmV3YWwsIGFuZCBzdGFsZW5lc3MgaW1wbGVtZW50YXRpb24uXG4gKi9cbmV4cG9ydCBkZWZhdWx0IGNsYXNzIFZlbG9jaW91c0h0dHBTZXJ2ZXJMb2NrIHtcbiAgLyoqXG4gICAqIEJ1aWxkIGEgbG9jayBmb3IgdGhlIGNvbmZpZ3VyZWQgYXBwbGljYXRpb24gZGlyZWN0b3J5IGFuZCBzZXJ2ZXIgZW5kcG9pbnQuXG4gICAqIEBwYXJhbSB7b2JqZWN0fSBhcmdzIC0gT3B0aW9ucyBvYmplY3QuXG4gICAqIEBwYXJhbSB7aW1wb3J0KFwiLi4vY29uZmlndXJhdGlvbi5qc1wiKS5kZWZhdWx0fSBhcmdzLmNvbmZpZ3VyYXRpb24gLSBDb25maWd1cmF0aW9uIHRoYXQgb3ducyB0aGUgYXBwbGljYXRpb24gZGlyZWN0b3J5LlxuICAgKiBAcGFyYW0ge3N0cmluZ30gYXJncy5ob3N0IC0gQ29uZmlndXJlZCBIVFRQIGhvc3QuXG4gICAqIEBwYXJhbSB7bnVtYmVyfSBhcmdzLnBvcnQgLSBDb25maWd1cmVkIEhUVFAgcG9ydC5cbiAgICovXG4gIGNvbnN0cnVjdG9yKHtjb25maWd1cmF0aW9uLCBob3N0LCBwb3J0fSkge1xuICAgIHRoaXMuY29uZmlndXJhdGlvbiA9IGNvbmZpZ3VyYXRpb25cbiAgICB0aGlzLmhvc3QgPSBob3N0XG4gICAgdGhpcy5wb3J0ID0gcG9ydFxuICAgIHRoaXMubG9ja1BhdGggPSBwYXRoLmpvaW4oY29uZmlndXJhdGlvbi5nZXREaXJlY3RvcnkoKSwgXCJ0bXBcIiwgXCJzZXJ2ZXIubG9ja1wiKVxuICAgIHRoaXMuYmFja2VuZCA9IG5ldyBBZHZpc29yeUxvY2tGaWxlQmFja2VuZCh7XG4gICAgICBkaXJlY3Rvcnk6IHBhdGguam9pbihjb25maWd1cmF0aW9uLmdldERpcmVjdG9yeSgpLCBcInRtcFwiKSxcbiAgICAgIGV4dHJhT3duZXJGaWVsZHM6IHtob3N0OiB0aGlzLmhvc3QsIHBvcnQ6IHRoaXMucG9ydH0sXG4gICAgICBwYXRoU3R5bGU6IFwicGxhaW5cIlxuICAgIH0pXG4gICAgdGhpcy5hY3F1aXJlZCA9IGZhbHNlXG4gIH1cblxuICAvKipcbiAgICogQWNxdWlyZXMgdGhlIGFwcC1kaXJlY3RvcnkgSFRUUCBzZXJ2ZXIgbG9jayBiZWZvcmUgc3RhcnR1cCBzaWRlIGVmZmVjdHNcbiAgICogcnVuLiBBIHN0YWxlIGxvY2sgKGRlYWQgbG9jYWwgb3duZXIgb3IgZXhwaXJlZCBsZWFzZSkgaXMgcmVjbGFpbWVkIGJ5IHRoZVxuICAgKiBiYWNrZW5kOyBhIGxpdmUgZm9yZWlnbiBvd25lciBmYWlscyBsb3VkbHkgd2l0aCB0aGUgb3duZXIgZGV0YWlscy5cbiAgICogQHJldHVybnMge1Byb21pc2U8dm9pZD59IC0gUmVzb2x2ZXMgYWZ0ZXIgdGhlIGxvY2sgaGFzIGJlZW4gYWNxdWlyZWQuXG4gICAqL1xuICBhc3luYyBhY3F1aXJlKCkge1xuICAgIGNvbnN0IGFjcXVpcmVkID0gYXdhaXQgdGhpcy5iYWNrZW5kLmFjcXVpcmUoXCJzZXJ2ZXJcIiwge3RpbWVvdXRNczogMH0pXG5cbiAgICBpZiAoIWFjcXVpcmVkKSB0aHJvdyBuZXcgRXJyb3IoYXdhaXQgdGhpcy5sb2NrSGVsZE1lc3NhZ2UoKSlcblxuICAgIHRoaXMuYWNxdWlyZWQgPSB0cnVlXG4gIH1cblxuICAvKipcbiAgICogUmVsZWFzZXMgdGhlIGhlbGQgSFRUUCBzZXJ2ZXIgbG9jayBkaXJlY3RvcnkuXG4gICAqIEByZXR1cm5zIHtQcm9taXNlPHZvaWQ+fSAtIFJlc29sdmVzIGFmdGVyIGJlc3QtZWZmb3J0IGxvY2sgcmVsZWFzZS5cbiAgICovXG4gIGFzeW5jIHJlbGVhc2UoKSB7XG4gICAgaWYgKCF0aGlzLmFjcXVpcmVkKSByZXR1cm5cblxuICAgIHRoaXMuYWNxdWlyZWQgPSBmYWxzZVxuICAgIGF3YWl0IHRoaXMuYmFja2VuZC5yZWxlYXNlKFwic2VydmVyXCIpXG4gIH1cblxuICAvKipcbiAgICogUmVhZHMgb3duZXIgbWV0YWRhdGEgZnJvbSBhbiBleGlzdGluZyBzZXJ2ZXIgbG9jayBkaXJlY3RvcnkuXG4gICAqIEByZXR1cm5zIHtQcm9taXNlPGltcG9ydChcIi4uL2RhdGFiYXNlL2Fkdmlzb3J5LWxvY2stZmlsZS1iYWNrZW5kLmpzXCIpLkFkdmlzb3J5TG9ja0ZpbGVPd25lciB8IG51bGw+fSAtIFBhcnNlZCBvd25lciBtZXRhZGF0YSwgd2hlbiByZWFkYWJsZS5cbiAgICovXG4gIGFzeW5jIHJlYWRPd25lck1ldGFkYXRhKCkge1xuICAgIHJldHVybiBhd2FpdCB0aGlzLmJhY2tlbmQuaG9sZGVySW5mbyhcInNlcnZlclwiKVxuICB9XG5cbiAgLyoqXG4gICAqIEJ1aWxkcyBhIGR1cGxpY2F0ZS1zZXJ2ZXIgZXJyb3IgbWVzc2FnZSB3aXRoIG93bmVyIGRldGFpbHMgd2hlbiBhdmFpbGFibGUuXG4gICAqIEByZXR1cm5zIHtQcm9taXNlPHN0cmluZz59IC0gRXJyb3IgbWVzc2FnZSBleHBsYWluaW5nIHdoaWNoIHNlcnZlciBvd25zIHRoZSBsb2NrLlxuICAgKi9cbiAgYXN5bmMgbG9ja0hlbGRNZXNzYWdlKCkge1xuICAgIGNvbnN0IG93bmVyID0gYXdhaXQgdGhpcy5yZWFkT3duZXJNZXRhZGF0YSgpXG4gICAgY29uc3QgZGV0YWlscyA9IG93bmVyXG4gICAgICA/IGBQSUQgJHtTdHJpbmcob3duZXIucGlkKX0gb24gJHtTdHJpbmcob3duZXIuaG9zdG5hbWUpfSAoJHtTdHJpbmcob3duZXIuaG9zdCl9OiR7U3RyaW5nKG93bmVyLnBvcnQpfSlgXG4gICAgICA6IGBsb2NrIGRpcmVjdG9yeSAke3RoaXMubG9ja1BhdGh9YFxuXG4gICAgcmV0dXJuIGBBIFZlbG9jaW91cyBIVFRQIHNlcnZlciBpcyBhbHJlYWR5IHJ1bm5pbmcgZm9yIHRoaXMgYXBwbGljYXRpb24gKCR7ZGV0YWlsc30pLiBSZW1vdmUgJHt0aGlzLmxvY2tQYXRofSBpZiB0aGUgc2VydmVyIGlzIG5vIGxvbmdlciBydW5uaW5nLmBcbiAgfVxufVxuIl19
|
|
108
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server-lock.js","sourceRoot":"","sources":["../../../src/http-server/server-lock.js"],"names":[],"mappings":"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","sourcesContent":["// @ts-check\n\nimport AdvisoryLockFileBackend from \"../database/advisory-lock-file-backend.js\"\nimport path from \"node:path\"\n\n/**\n * Directory + environment-based lock that allows only one HTTP server process\n * per (app directory, environment) pair. Thin wrapper over the shared\n * file-lock backend (`src/database/advisory-lock-file-backend.js` — the\n * STC-210 `file` tier primitive generalized from this lock's original\n * hand-rolled directory protocol), so the server lock and the advisory-lock\n * file tier share one acquisition, owner-metadata, lease-renewal, and\n * staleness implementation.\n *\n * The lock name is scoped by the configuration's environment\n * (`server.<environment>` → `tmp/server.<environment>.lock`) so a development\n * server and a test-spawned backend in the same app directory coexist, while\n * the single-server-per-(directory, environment) invariant still fails loudly\n * for a duplicate within one environment (STC-697).\n *\n * A caller that knowingly wants a second server in the same\n * (directory, environment) pair can opt out of this lock (STC-698). The lock\n * itself is unchanged for every other caller: an opted-out lock never acquires\n * and therefore never releases, so it can never remove a live owner's lock.\n */\nexport default class VelociousHttpServerLock {\n  /**\n   * Build a lock for the configured application directory, environment and\n   * server endpoint.\n   * @param {object} args - Options object.\n   * @param {import(\"../configuration.js\").default} args.configuration - Configuration that owns the application directory.\n   * @param {string} args.host - Configured HTTP host.\n   * @param {number} args.port - Configured HTTP port.\n   * @param {boolean} [args.optOut] - Skip acquisition for this caller instead of contending for the lock.\n   */\n  constructor({configuration, host, port, optOut = false}) {\n    this.configuration = configuration\n    this.host = host\n    this.port = port\n    this.optOut = optOut\n    this.environment = String(configuration.getEnvironment())\n    // Scope the lock name by environment and keep the segment filesystem-safe,\n    // so odd environment names can never escape tmp/ or collide with each other.\n    this.lockName = `server.${this.environment.replace(/[^a-zA-Z0-9._-]/g, \"_\")}`\n    this.lockPath = path.join(configuration.getDirectory(), \"tmp\", `${this.lockName}.lock`)\n    this.backend = new AdvisoryLockFileBackend({\n      directory: path.join(configuration.getDirectory(), \"tmp\"),\n      extraOwnerFields: {host: this.host, port: this.port},\n      pathStyle: \"plain\"\n    })\n    this.acquired = false\n  }\n\n  /**\n   * Acquires the app-directory + environment HTTP server lock before startup\n   * side effects run. An opted-out caller never touches the lock, so the live\n   * owner keeps it. A stale lock (dead local owner or expired lease) is\n   * reclaimed by the backend; a live foreign owner in the same environment\n   * fails loudly with the owner details.\n   * @returns {Promise<boolean>} - Whether this caller holds the lock.\n   */\n  async acquire() {\n    if (this.optOut) return false\n\n    const acquired = await this.backend.acquire(this.lockName, {timeoutMs: 0})\n\n    if (!acquired) throw new Error(await this.lockHeldMessage())\n\n    this.acquired = true\n\n    return true\n  }\n\n  /**\n   * Releases the held environment-scoped HTTP server lock directory. A lock\n   * that was never acquired (an opted-out caller) is a no-op, so it can never\n   * remove the live owner's lock on shutdown.\n   * @returns {Promise<void>} - Resolves after best-effort lock release.\n   */\n  async release() {\n    if (!this.acquired) return\n\n    this.acquired = false\n    await this.backend.release(this.lockName)\n  }\n\n  /**\n   * Reads owner metadata from an existing server lock directory.\n   * @returns {Promise<import(\"../database/advisory-lock-file-backend.js\").AdvisoryLockFileOwner | null>} - Parsed owner metadata, when readable.\n   */\n  async readOwnerMetadata() {\n    return await this.backend.holderInfo(this.lockName)\n  }\n\n  /**\n   * Builds a duplicate-server error message with owner details when available.\n   * @returns {Promise<string>} - Error message explaining which server owns the lock.\n   */\n  async lockHeldMessage() {\n    const owner = await this.readOwnerMetadata()\n    const details = owner\n      ? `PID ${String(owner.pid)} on ${String(owner.hostname)} (${String(owner.host)}:${String(owner.port)})`\n      : `lock directory ${this.lockPath}`\n\n    return `A Velocious HTTP server is already running for this application in the ${this.environment} environment (${details}). Remove ${this.lockPath} if the server is no longer running.`\n  }\n\n  /**\n   * Builds the warning emitted when a caller knowingly starts a server without\n   * the lock, so an unprotected production process is visible in the log rather\n   * than silently running without duplicate-server protection.\n   * @returns {string} - Warning message naming the application directory and port.\n   */\n  lockSkippedMessage() {\n    return `Skipping the HTTP server lock for ${this.configuration.getDirectory()} on ${this.host}:${String(this.port)} because the caller opted out. This server runs without duplicate-server protection for the ${this.environment} environment.`\n  }\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-tenant-database-provisioning.d.ts","sourceRoot":"","sources":["../../../src/tenants/default-tenant-database-provisioning.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"default-tenant-database-provisioning.d.ts","sourceRoot":"","sources":["../../../src/tenants/default-tenant-database-provisioning.js"],"names":[],"mappings":"AAkEA;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,EAAC,aAAa,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,EAAC,EAH1F;IAAC,aAAa,EAAE,OAAO,qBAAqB,EAAE,OAAO,CAAC;IAAC,qBAAqB,EAAE,OAAO,2BAA2B,EAAE,yBAAyB,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAA;CAG7G,GAFxF,OAAO,CAAC,IAAI,CAAC,CA6BzB;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,EAAC,aAAa,EAAE,qBAAqB,EAAC,EAHpE;IAAC,aAAa,EAAE,OAAO,qBAAqB,EAAE,OAAO,CAAC;IAAC,qBAAqB,EAAE,OAAO,2BAA2B,EAAE,yBAAyB,CAAA;CAGvE,GAFlE,OAAO,CAAC,IAAI,CAAC,CA2BzB"}
|
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
* connect to the configured maintenance database (`useDatabase`) and run the
|
|
13
13
|
* driver's own `createDatabaseSql`/`dropDatabaseSql`.
|
|
14
14
|
*/
|
|
15
|
+
import PoolBase from "../database/pool/base.js";
|
|
15
16
|
const SAFE_TENANT_DATABASE_NAME = /^[a-z0-9_]+$/;
|
|
16
17
|
/**
|
|
17
18
|
* Whether the driver stores each database as a local file instead of on a server.
|
|
@@ -102,5 +103,10 @@ export async function dropTenantDatabase({ configuration, databaseConfiguration
|
|
|
102
103
|
finally {
|
|
103
104
|
await connection.close();
|
|
104
105
|
}
|
|
106
|
+
// The DROP DATABASE ran on the maintenance connection, so the dropped tenant's
|
|
107
|
+
// own shared schema-metadata cache was never invalidated by the DDL path. Clear
|
|
108
|
+
// it explicitly: recreating the tenant database later must re-introspect, not
|
|
109
|
+
// serve the dropped schema from the shared cache.
|
|
110
|
+
configuration.clearSchemaCachesForReuseKey(PoolBase.configurationReuseKey(databaseConfiguration));
|
|
105
111
|
}
|
|
106
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"default-tenant-database-provisioning.js","sourceRoot":"","sources":["../../../src/tenants/default-tenant-database-provisioning.js"],"names":[],"mappings":"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","sourcesContent":["// @ts-check\n\n/**\n * Default tenant-database provisioning used by `db:tenants:create`,\n * `db:tenants:drop`, and `Tenant.drop` when a tenant-database provider does not\n * define its own `createDatabase`/`dropDatabase`. This is the generic,\n * driver-agnostic lifecycle every app on the tenant framework needs, so it lives\n * in the framework instead of being reimplemented in each consuming project.\n *\n * File-backed drivers (sqlite) have no server-side CREATE/DROP DATABASE — the file\n * is created on connect and left in place on drop — so creating just ensures the\n * tenant's connection and dropping is a no-op. Server drivers (mysql, pgsql, …)\n * connect to the configured maintenance database (`useDatabase`) and run the\n * driver's own `createDatabaseSql`/`dropDatabaseSql`.\n */\n\nconst SAFE_TENANT_DATABASE_NAME = /^[a-z0-9_]+$/\n\n/**\n * Whether the driver stores each database as a local file instead of on a server.\n * @param {import(\"../configuration-types.js\").DatabaseConfigurationType} databaseConfiguration - Resolved tenant database configuration.\n * @returns {boolean} - True for file-backed drivers such as sqlite.\n */\nfunction fileBackedDriver(databaseConfiguration) {\n  return databaseConfiguration.type === \"sqlite\"\n}\n\n/**\n * Validates the tenant database name against a strict allowlist before it is\n * interpolated into DDL.\n * @param {import(\"../configuration-types.js\").DatabaseConfigurationType} databaseConfiguration - Resolved tenant database configuration.\n * @returns {string} - The validated tenant database name.\n */\nfunction guardedDatabaseName(databaseConfiguration) {\n  const databaseName = databaseConfiguration.database\n\n  if (!databaseName || !SAFE_TENANT_DATABASE_NAME.test(databaseName)) {\n    throw new Error(`Unsafe tenant database name: ${databaseName}`)\n  }\n\n  return databaseName\n}\n\n/**\n * Opens a driver connected to the server's maintenance database (`useDatabase`),\n * from which `CREATE DATABASE` / `DROP DATABASE` for the tenant can be issued.\n * @param {import(\"../configuration-types.js\").DatabaseConfigurationType} databaseConfiguration - Resolved tenant database configuration.\n * @param {import(\"../configuration.js\").default} configuration - The Velocious configuration.\n * @returns {import(\"../database/drivers/base.js\").default} - A driver bound to the maintenance database.\n */\nfunction maintenanceConnection(databaseConfiguration, configuration) {\n  const DriverClass = databaseConfiguration.driver\n\n  if (!DriverClass) {\n    throw new Error(\"Tenant database configuration is missing a driver.\")\n  }\n\n  if (!databaseConfiguration.useDatabase) {\n    throw new Error(\"Tenant database configuration is missing a maintenance database in useDatabase.\")\n  }\n\n  return new DriverClass({...databaseConfiguration, database: databaseConfiguration.useDatabase}, configuration)\n}\n\n/**\n * Creates the tenant database for one tenant.\n * @param {{configuration: import(\"../configuration.js\").default, databaseConfiguration: import(\"../configuration-types.js\").DatabaseConfigurationType, identifier?: string, tenant: ReturnType<typeof JSON.parse>}} args - Provisioning arguments.\n * @returns {Promise<void>} - Resolves once the tenant database exists.\n */\nexport async function createTenantDatabase({configuration, databaseConfiguration, identifier, tenant}) {\n  if (fileBackedDriver(databaseConfiguration)) {\n    await configuration.runWithTenant(tenant, async () => {\n      await configuration.ensureConnections({databaseIdentifiers: identifier ? [identifier] : undefined, name: \"Create file-backed tenant database\"}, async () => {})\n    })\n\n    return\n  }\n\n  const databaseName = guardedDatabaseName(databaseConfiguration)\n  const connection = maintenanceConnection(databaseConfiguration, configuration)\n\n  await connection.connect()\n\n  try {\n    const sqls = connection.createDatabaseSql(databaseName, {\n      databaseCharset: databaseConfiguration.databaseCharset,\n      databaseCollation: databaseConfiguration.databaseCollation,\n      ifNotExists: true\n    })\n\n    for (const sql of sqls) {\n      await connection.query(sql)\n    }\n  } finally {\n    await connection.close()\n  }\n}\n\n/**\n * Drops the tenant database for one tenant. Uses `DROP DATABASE IF EXISTS`, so it\n * is a safe no-op for a tenant that was never fully provisioned.\n * @param {{configuration: import(\"../configuration.js\").default, databaseConfiguration: import(\"../configuration-types.js\").DatabaseConfigurationType}} args - Provisioning arguments.\n * @returns {Promise<void>} - Resolves once the tenant database is gone.\n */\nexport async function dropTenantDatabase({configuration, databaseConfiguration}) {\n  if (fileBackedDriver(databaseConfiguration)) {\n    return\n  }\n\n  const databaseName = guardedDatabaseName(databaseConfiguration)\n  const connection = maintenanceConnection(databaseConfiguration, configuration)\n\n  await connection.connect()\n\n  try {\n    const sqls = connection.dropDatabaseSql(databaseName, {ifExists: true})\n\n    for (const sql of sqls) {\n      await connection.query(sql)\n    }\n  } finally {\n    await connection.close()\n  }\n}\n"]}
|
|
112
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"default-tenant-database-provisioning.js","sourceRoot":"","sources":["../../../src/tenants/default-tenant-database-provisioning.js"],"names":[],"mappings":"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","sourcesContent":["// @ts-check\n\n/**\n * Default tenant-database provisioning used by `db:tenants:create`,\n * `db:tenants:drop`, and `Tenant.drop` when a tenant-database provider does not\n * define its own `createDatabase`/`dropDatabase`. This is the generic,\n * driver-agnostic lifecycle every app on the tenant framework needs, so it lives\n * in the framework instead of being reimplemented in each consuming project.\n *\n * File-backed drivers (sqlite) have no server-side CREATE/DROP DATABASE — the file\n * is created on connect and left in place on drop — so creating just ensures the\n * tenant's connection and dropping is a no-op. Server drivers (mysql, pgsql, …)\n * connect to the configured maintenance database (`useDatabase`) and run the\n * driver's own `createDatabaseSql`/`dropDatabaseSql`.\n */\n\nimport PoolBase from \"../database/pool/base.js\"\n\nconst SAFE_TENANT_DATABASE_NAME = /^[a-z0-9_]+$/\n\n/**\n * Whether the driver stores each database as a local file instead of on a server.\n * @param {import(\"../configuration-types.js\").DatabaseConfigurationType} databaseConfiguration - Resolved tenant database configuration.\n * @returns {boolean} - True for file-backed drivers such as sqlite.\n */\nfunction fileBackedDriver(databaseConfiguration) {\n  return databaseConfiguration.type === \"sqlite\"\n}\n\n/**\n * Validates the tenant database name against a strict allowlist before it is\n * interpolated into DDL.\n * @param {import(\"../configuration-types.js\").DatabaseConfigurationType} databaseConfiguration - Resolved tenant database configuration.\n * @returns {string} - The validated tenant database name.\n */\nfunction guardedDatabaseName(databaseConfiguration) {\n  const databaseName = databaseConfiguration.database\n\n  if (!databaseName || !SAFE_TENANT_DATABASE_NAME.test(databaseName)) {\n    throw new Error(`Unsafe tenant database name: ${databaseName}`)\n  }\n\n  return databaseName\n}\n\n/**\n * Opens a driver connected to the server's maintenance database (`useDatabase`),\n * from which `CREATE DATABASE` / `DROP DATABASE` for the tenant can be issued.\n * @param {import(\"../configuration-types.js\").DatabaseConfigurationType} databaseConfiguration - Resolved tenant database configuration.\n * @param {import(\"../configuration.js\").default} configuration - The Velocious configuration.\n * @returns {import(\"../database/drivers/base.js\").default} - A driver bound to the maintenance database.\n */\nfunction maintenanceConnection(databaseConfiguration, configuration) {\n  const DriverClass = databaseConfiguration.driver\n\n  if (!DriverClass) {\n    throw new Error(\"Tenant database configuration is missing a driver.\")\n  }\n\n  if (!databaseConfiguration.useDatabase) {\n    throw new Error(\"Tenant database configuration is missing a maintenance database in useDatabase.\")\n  }\n\n  return new DriverClass({...databaseConfiguration, database: databaseConfiguration.useDatabase}, configuration)\n}\n\n/**\n * Creates the tenant database for one tenant.\n * @param {{configuration: import(\"../configuration.js\").default, databaseConfiguration: import(\"../configuration-types.js\").DatabaseConfigurationType, identifier?: string, tenant: ReturnType<typeof JSON.parse>}} args - Provisioning arguments.\n * @returns {Promise<void>} - Resolves once the tenant database exists.\n */\nexport async function createTenantDatabase({configuration, databaseConfiguration, identifier, tenant}) {\n  if (fileBackedDriver(databaseConfiguration)) {\n    await configuration.runWithTenant(tenant, async () => {\n      await configuration.ensureConnections({databaseIdentifiers: identifier ? [identifier] : undefined, name: \"Create file-backed tenant database\"}, async () => {})\n    })\n\n    return\n  }\n\n  const databaseName = guardedDatabaseName(databaseConfiguration)\n  const connection = maintenanceConnection(databaseConfiguration, configuration)\n\n  await connection.connect()\n\n  try {\n    const sqls = connection.createDatabaseSql(databaseName, {\n      databaseCharset: databaseConfiguration.databaseCharset,\n      databaseCollation: databaseConfiguration.databaseCollation,\n      ifNotExists: true\n    })\n\n    for (const sql of sqls) {\n      await connection.query(sql)\n    }\n  } finally {\n    await connection.close()\n  }\n}\n\n/**\n * Drops the tenant database for one tenant. Uses `DROP DATABASE IF EXISTS`, so it\n * is a safe no-op for a tenant that was never fully provisioned.\n * @param {{configuration: import(\"../configuration.js\").default, databaseConfiguration: import(\"../configuration-types.js\").DatabaseConfigurationType}} args - Provisioning arguments.\n * @returns {Promise<void>} - Resolves once the tenant database is gone.\n */\nexport async function dropTenantDatabase({configuration, databaseConfiguration}) {\n  if (fileBackedDriver(databaseConfiguration)) {\n    return\n  }\n\n  const databaseName = guardedDatabaseName(databaseConfiguration)\n  const connection = maintenanceConnection(databaseConfiguration, configuration)\n\n  await connection.connect()\n\n  try {\n    const sqls = connection.dropDatabaseSql(databaseName, {ifExists: true})\n\n    for (const sql of sqls) {\n      await connection.query(sql)\n    }\n  } finally {\n    await connection.close()\n  }\n\n  // The DROP DATABASE ran on the maintenance connection, so the dropped tenant's\n  // own shared schema-metadata cache was never invalidated by the DDL path. Clear\n  // it explicitly: recreating the tenant database later must re-introspect, not\n  // serve the dropped schema from the shared cache.\n  configuration.clearSchemaCachesForReuseKey(PoolBase.configurationReuseKey(databaseConfiguration))\n}\n"]}
|
|
@@ -14,6 +14,8 @@
|
|
|
14
14
|
* driver's own `createDatabaseSql`/`dropDatabaseSql`.
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
|
+
import PoolBase from "../database/pool/base.js"
|
|
18
|
+
|
|
17
19
|
const SAFE_TENANT_DATABASE_NAME = /^[a-z0-9_]+$/
|
|
18
20
|
|
|
19
21
|
/**
|
|
@@ -121,4 +123,10 @@ export async function dropTenantDatabase({configuration, databaseConfiguration})
|
|
|
121
123
|
} finally {
|
|
122
124
|
await connection.close()
|
|
123
125
|
}
|
|
126
|
+
|
|
127
|
+
// The DROP DATABASE ran on the maintenance connection, so the dropped tenant's
|
|
128
|
+
// own shared schema-metadata cache was never invalidated by the DDL path. Clear
|
|
129
|
+
// it explicitly: recreating the tenant database later must re-introspect, not
|
|
130
|
+
// serve the dropped schema from the shared cache.
|
|
131
|
+
configuration.clearSchemaCachesForReuseKey(PoolBase.configurationReuseKey(databaseConfiguration))
|
|
124
132
|
}
|
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.
|
|
6
|
+
"version": "1.0.728",
|
|
7
7
|
"main": "build/index.js",
|
|
8
8
|
"types": "build/index.d.ts",
|
|
9
9
|
"files": [
|
|
@@ -126,7 +126,7 @@
|
|
|
126
126
|
"esbuild": "^0.28.0",
|
|
127
127
|
"eslint": "^10.0.1",
|
|
128
128
|
"eslint-plugin-jsdoc": "^65.1.0",
|
|
129
|
-
"eslint-plugin-jsdoc-inline-type-casts": "https://github.com/kaspernj/eslint-plugin-jsdoc-inline-type-casts/archive/
|
|
129
|
+
"eslint-plugin-jsdoc-inline-type-casts": "https://github.com/kaspernj/eslint-plugin-jsdoc-inline-type-casts/archive/3225fa42b9cad6156c8906c82acefc356c6ca3e0.tar.gz",
|
|
130
130
|
"eslint-plugin-jsdoc-tag-lines": "^1.0.1",
|
|
131
131
|
"fallow": "3.31.0",
|
|
132
132
|
"globals": "^17.0.0",
|
package/src/application.js
CHANGED
|
@@ -15,15 +15,27 @@ import { runShutdownSteps } from "./utils/shutdown-lifecycle.js"
|
|
|
15
15
|
* HttpServerConfiguration type.
|
|
16
16
|
* @typedef {import("./configuration-types.js").HttpServerConfiguration} HttpServerConfiguration */
|
|
17
17
|
|
|
18
|
+
/**
|
|
19
|
+
* Reads the lock opt-out requested through the environment. Only an explicit
|
|
20
|
+
* off value opts out; anything else keeps the default protected behaviour.
|
|
21
|
+
* @returns {boolean} - Whether the environment asks for the HTTP server lock opt-out.
|
|
22
|
+
*/
|
|
23
|
+
function environmentHttpServerLockOptOut() {
|
|
24
|
+
const value = (process.env.VELOCIOUS_HTTP_SERVER_LOCK || "").trim().toLowerCase()
|
|
25
|
+
|
|
26
|
+
return value === "off" || value === "false" || value === "0"
|
|
27
|
+
}
|
|
28
|
+
|
|
18
29
|
export default class VelociousApplication {
|
|
19
30
|
/**
|
|
20
31
|
* Runs constructor.
|
|
21
32
|
* @param {object} args - Options object.
|
|
22
33
|
* @param {import("./configuration.js").default} args.configuration - Configuration instance.
|
|
23
34
|
* @param {HttpServerConfiguration} [args.httpServer] - Http server.
|
|
35
|
+
* @param {boolean} [args.httpServerLockOptOut] - Start this server without the HTTP server lock, knowingly running unprotected against a duplicate server in the same application directory and environment.
|
|
24
36
|
* @param {string} args.type - Type identifier.
|
|
25
37
|
*/
|
|
26
|
-
constructor({configuration, httpServer, type, ...restArgs}) {
|
|
38
|
+
constructor({configuration, httpServer, httpServerLockOptOut, type, ...restArgs}) {
|
|
27
39
|
restArgsError(restArgs)
|
|
28
40
|
|
|
29
41
|
if (!configuration) throw new Error("configuration is required")
|
|
@@ -35,6 +47,11 @@ export default class VelociousApplication {
|
|
|
35
47
|
* @type {HttpServerConfiguration} */
|
|
36
48
|
this.httpServerConfiguration = httpServer ?? {}
|
|
37
49
|
|
|
50
|
+
/**
|
|
51
|
+
* Stores the explicit HTTP server lock opt-out for this application.
|
|
52
|
+
* @type {boolean} */
|
|
53
|
+
this.httpServerLockOptOut = httpServerLockOptOut === true
|
|
54
|
+
|
|
38
55
|
this.logger = new Logger(this)
|
|
39
56
|
this._type = type
|
|
40
57
|
/**
|
|
@@ -165,8 +182,20 @@ export default class VelociousApplication {
|
|
|
165
182
|
async acquireHttpServerLock({configuration, host, port}) {
|
|
166
183
|
if (this.getType() === "test-runner") return
|
|
167
184
|
|
|
168
|
-
const httpServerLock = new HttpServerLock({
|
|
169
|
-
|
|
185
|
+
const httpServerLock = new HttpServerLock({
|
|
186
|
+
configuration,
|
|
187
|
+
host,
|
|
188
|
+
port,
|
|
189
|
+
optOut: this.httpServerLockOptOut || environmentHttpServerLockOptOut()
|
|
190
|
+
})
|
|
191
|
+
|
|
192
|
+
const acquired = await httpServerLock.acquire()
|
|
193
|
+
|
|
194
|
+
if (!acquired) {
|
|
195
|
+
await this.logger.warn(httpServerLock.lockSkippedMessage())
|
|
196
|
+
return
|
|
197
|
+
}
|
|
198
|
+
|
|
170
199
|
this.httpServerLock = httpServerLock
|
|
171
200
|
}
|
|
172
201
|
|
|
@@ -1660,7 +1660,8 @@ export default class BackgroundJobsMain {
|
|
|
1660
1660
|
}
|
|
1661
1661
|
|
|
1662
1662
|
/**
|
|
1663
|
-
* Forgets
|
|
1663
|
+
* Forgets an in-memory lease that no longer exists durably — a reported lease or
|
|
1664
|
+
* one settled as orphaned — without relying on worker ids.
|
|
1664
1665
|
* @param {object} args - Options.
|
|
1665
1666
|
* @param {string} args.handoffId - Handoff lease id.
|
|
1666
1667
|
* @param {string} args.jobId - Job id.
|
|
@@ -2793,6 +2794,13 @@ export default class BackgroundJobsMain {
|
|
|
2793
2794
|
// Emit before awaiting the drain so a blocked dispatcher cannot delay
|
|
2794
2795
|
// application recovery. Isolate handlers so one cannot suppress the rest.
|
|
2795
2796
|
for (const job of jobs) {
|
|
2797
|
+
// The durable lease is gone, so the in-memory mirror must stop counting it.
|
|
2798
|
+
// A retired generation is pinned by `workerHandoffs`, and a row settled here
|
|
2799
|
+
// is no longer a live claim while its mirror still says it is — that is what
|
|
2800
|
+
// kept a retired main open after its worker's runner was proven gone
|
|
2801
|
+
// (STOE-1663), because the stop fence could never be reached.
|
|
2802
|
+
if (job.handoffId) this._forgetHandoff({handoffId: job.handoffId, jobId: job.id})
|
|
2803
|
+
|
|
2796
2804
|
try {
|
|
2797
2805
|
this._emitBackgroundJobOrphaned({job})
|
|
2798
2806
|
} catch (error) {
|
|
@@ -13,6 +13,7 @@ import BackgroundJobRescheduleSignal from "./reschedule-signal.js"
|
|
|
13
13
|
import performBackgroundJob from "./perform-job.js"
|
|
14
14
|
import { runWithBackgroundJobPayload } from "./execution-context.js"
|
|
15
15
|
import { createGenerationWorkerId } from "./generation-identity.js"
|
|
16
|
+
import { isProcessAlive } from "./owner-liveness.js"
|
|
16
17
|
import BackgroundJobsGenerationHandshakeTimeoutError, { DEFAULT_GENERATION_HANDSHAKE_TIMEOUT_MS, validateGenerationHandshakeTimeoutMs } from "./generation-handshake-timeout-error.js"
|
|
17
18
|
import { POOLED_RUNNER_INFLIGHT_JOB_ID_LIMIT, boundedPooledRunnerInflightJobIds, isPooledChildShutdownReason, isPooledChildShutdownSignal } from "./pooled-runner-shutdown.js"
|
|
18
19
|
|
|
@@ -33,7 +34,9 @@ import { POOLED_RUNNER_INFLIGHT_JOB_ID_LIMIT, boundedPooledRunnerInflightJobIds,
|
|
|
33
34
|
* One live runner child, kept so a shutdown that runs out of drain time can name
|
|
34
35
|
* the exact process it is still waiting on instead of a bare count.
|
|
35
36
|
* @typedef {object} ProcessJobHolder
|
|
37
|
+
* @property {number | null} childPid - OS pid recorded for the runner, or null when the fork gave none.
|
|
36
38
|
* @property {string} jobId - Job the child was handed.
|
|
39
|
+
* @property {(() => void)} settle - Frees the worker's in-flight entry for this job.
|
|
37
40
|
* @property {number} startedAtMs - When the worker handed it that job.
|
|
38
41
|
*/
|
|
39
42
|
/**
|
|
@@ -590,6 +593,7 @@ export default class BackgroundJobsWorker {
|
|
|
590
593
|
|
|
591
594
|
await this._drainInflight(this.inflightInlineJobs, timeoutMs, {phase: "inline-jobs"})
|
|
592
595
|
await this._drainInflight(this.inflightPooledJobs, timeoutMs, {phase: "pooled-jobs"})
|
|
596
|
+
this._releaseProcessJobHoldersWithGoneChildren()
|
|
593
597
|
await this._drainInflight(this.inflightProcessJobs, timeoutMs, {phase: "process-jobs", describeHolders: () => this._describeProcessJobHolders()})
|
|
594
598
|
await this._terminateProcessChildren()
|
|
595
599
|
// Give in-flight result reports (now decoupled from job slots) a bounded
|
|
@@ -635,6 +639,7 @@ export default class BackgroundJobsWorker {
|
|
|
635
639
|
|
|
636
640
|
await this._drainInflight(this.inflightInlineJobs)
|
|
637
641
|
await this._drainInflight(this.inflightPooledJobs)
|
|
642
|
+
this._releaseProcessJobHoldersWithGoneChildren()
|
|
638
643
|
await this._drainInflight(this.inflightProcessJobs)
|
|
639
644
|
await this._drainInflight(this.inflightReports)
|
|
640
645
|
|
|
@@ -722,6 +727,48 @@ export default class BackgroundJobsWorker {
|
|
|
722
727
|
return [...this.processChildJobs.values()].sort((left, right) => left.startedAtMs - right.startedAtMs)
|
|
723
728
|
}
|
|
724
729
|
|
|
730
|
+
/**
|
|
731
|
+
* Frees in-flight process-job entries whose recorded runner pid no longer
|
|
732
|
+
* exists, so an unbounded drain can reach child termination.
|
|
733
|
+
*
|
|
734
|
+
* A drain that has no bound can only be pinned by work that is still able to
|
|
735
|
+
* report its outcome. A holder whose recorded pid has no process cannot report
|
|
736
|
+
* and cannot produce the exit observation that would have freed the entry, so
|
|
737
|
+
* the drain waits on it forever and never reaches `_terminateProcessChildren()`
|
|
738
|
+
* — the shape that kept a retired generation alive across four deploys on
|
|
739
|
+
* 2026-11-12 (STOE-1663). This is one proof-of-absence check at the point the
|
|
740
|
+
* drain begins, not a polling layer: a child that is still alive keeps the
|
|
741
|
+
* indefinite wait it was designed to have, because a live runner with a live
|
|
742
|
+
* job must never be cut off by this path (STOE-1077), and its exit observation
|
|
743
|
+
* is the event that frees its entry when it does go.
|
|
744
|
+
* @returns {ProcessJobHolder[]} - Holders freed, in recording order.
|
|
745
|
+
*/
|
|
746
|
+
_releaseProcessJobHoldersWithGoneChildren() {
|
|
747
|
+
const released = []
|
|
748
|
+
|
|
749
|
+
for (const holder of [...this.processChildJobs.values()]) {
|
|
750
|
+
if (holder.childPid === null || isProcessAlive(holder.childPid)) continue
|
|
751
|
+
|
|
752
|
+
released.push(holder)
|
|
753
|
+
holder.settle()
|
|
754
|
+
}
|
|
755
|
+
|
|
756
|
+
if (released.length > 0) {
|
|
757
|
+
const nowMs = Date.now()
|
|
758
|
+
|
|
759
|
+
console.error(JSON.stringify({
|
|
760
|
+
event: "worker-shutdown-gone-runner-released",
|
|
761
|
+
runners: released.map((holder) => ({
|
|
762
|
+
childPid: holder.childPid,
|
|
763
|
+
heldMs: nowMs - holder.startedAtMs,
|
|
764
|
+
jobId: holder.jobId
|
|
765
|
+
}))
|
|
766
|
+
}))
|
|
767
|
+
}
|
|
768
|
+
|
|
769
|
+
return released
|
|
770
|
+
}
|
|
771
|
+
|
|
725
772
|
/**
|
|
726
773
|
* Logs one compact drain-timeout event to the worker's own stderr (the surface
|
|
727
774
|
* that reaches the production log), naming the held processes and how long each
|
|
@@ -2234,9 +2281,6 @@ export default class BackgroundJobsWorker {
|
|
|
2234
2281
|
_forkJob(payload) {
|
|
2235
2282
|
const child = this._createForkedChild()
|
|
2236
2283
|
|
|
2237
|
-
this.inflightProcessChildren.add(child)
|
|
2238
|
-
this.processChildJobs.set(child, {jobId: payload.id, startedAtMs: Date.now()})
|
|
2239
|
-
|
|
2240
2284
|
const finished = this._waitForForkedChild({child, payload})
|
|
2241
2285
|
|
|
2242
2286
|
this._sendForkedPayload({child, payload})
|
|
@@ -2244,6 +2288,25 @@ export default class BackgroundJobsWorker {
|
|
|
2244
2288
|
return finished
|
|
2245
2289
|
}
|
|
2246
2290
|
|
|
2291
|
+
/**
|
|
2292
|
+
* Records the live runner child this worker handed a job to, with the resolver
|
|
2293
|
+
* that frees the worker's in-flight entry for it, so a drain can name the exact
|
|
2294
|
+
* process it is waiting on and can prove which of them is no longer there.
|
|
2295
|
+
* @param {object} args - Holder fields.
|
|
2296
|
+
* @param {import("node:child_process").ChildProcess} args.child - Runner child.
|
|
2297
|
+
* @param {import("./types.js").BackgroundJobPayload & {id: string}} args.payload - Job payload.
|
|
2298
|
+
* @param {(() => void)} args.settle - Frees the worker's in-flight entry for this job.
|
|
2299
|
+
* @returns {ProcessJobHolder} - Recorded holder.
|
|
2300
|
+
*/
|
|
2301
|
+
_registerProcessJobHolder({child, payload, settle}) {
|
|
2302
|
+
const holder = {childPid: child.pid ?? null, jobId: payload.id, settle, startedAtMs: Date.now()}
|
|
2303
|
+
|
|
2304
|
+
this.inflightProcessChildren.add(child)
|
|
2305
|
+
this.processChildJobs.set(child, holder)
|
|
2306
|
+
|
|
2307
|
+
return holder
|
|
2308
|
+
}
|
|
2309
|
+
|
|
2247
2310
|
/**
|
|
2248
2311
|
* Runs create forked child.
|
|
2249
2312
|
* @returns {import("node:child_process").ChildProcess} - Forked child process.
|
|
@@ -2283,6 +2346,7 @@ export default class BackgroundJobsWorker {
|
|
|
2283
2346
|
|
|
2284
2347
|
return new Promise((resolve) => {
|
|
2285
2348
|
state.resolve = resolve
|
|
2349
|
+
this._registerProcessJobHolder({child, payload, settle: () => this._settleForkedJob({child, state})})
|
|
2286
2350
|
this._armForkedJobTimeout({child, payload, state})
|
|
2287
2351
|
|
|
2288
2352
|
child.once("message", (message) => {
|
|
@@ -2557,10 +2621,9 @@ export default class BackgroundJobsWorker {
|
|
|
2557
2621
|
env: Object.assign({}, process.env, this._childBackgroundJobsEnvironment(), {VELOCIOUS_JOB_PAYLOAD: encodedPayload})
|
|
2558
2622
|
})
|
|
2559
2623
|
|
|
2560
|
-
this.inflightProcessChildren.add(child)
|
|
2561
|
-
this.processChildJobs.set(child, {jobId: payload.id, startedAtMs: Date.now()})
|
|
2562
|
-
|
|
2563
2624
|
const finished = new Promise((resolve) => {
|
|
2625
|
+
this._registerProcessJobHolder({child, payload, settle: () => resolve(undefined)})
|
|
2626
|
+
|
|
2564
2627
|
child.once("exit", () => {
|
|
2565
2628
|
this.inflightProcessChildren.delete(child)
|
|
2566
2629
|
this.processChildJobs.delete(child)
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
// @ts-check
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Parses CLI flags into values keyed by long option name without `--`.
|
|
5
|
+
*
|
|
6
|
+
* Hyphenated long flags are parsed as one option name (`--no-server-lock` →
|
|
7
|
+
* `no-server-lock`), so a boolean flag can carry its own words instead of
|
|
8
|
+
* being silently dropped by a single-word pattern.
|
|
9
|
+
* @param {string[]} processArgs - Raw CLI arguments.
|
|
10
|
+
* @returns {Record<string, string | boolean | undefined>} - Values keyed by option name.
|
|
11
|
+
*/
|
|
12
|
+
export default function parseProcessArgs(processArgs) {
|
|
13
|
+
/** @type {Record<string, string | boolean | undefined>} */
|
|
14
|
+
const parsedProcessArgs = {}
|
|
15
|
+
|
|
16
|
+
for (let i = 0; i < processArgs.length; i++) {
|
|
17
|
+
const processArg = processArgs[i]
|
|
18
|
+
const singleLetterArgMatch = processArg.match(/^-([a-z])$/)
|
|
19
|
+
const multiLetterArgMatch = processArg.match(/^--([a-z][a-z-]*)$/)
|
|
20
|
+
const nextArg = processArgs[i + 1]
|
|
21
|
+
const hasValue = typeof nextArg === "string" && !nextArg.startsWith("-")
|
|
22
|
+
const parsedValue = hasValue ? nextArg : true
|
|
23
|
+
|
|
24
|
+
if (singleLetterArgMatch) {
|
|
25
|
+
parsedProcessArgs[singleLetterArgMatch[1]] = parsedValue
|
|
26
|
+
if (hasValue) i++
|
|
27
|
+
} else if (multiLetterArgMatch) {
|
|
28
|
+
parsedProcessArgs[multiLetterArgMatch[1]] = parsedValue
|
|
29
|
+
if (hasValue) i++
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
return parsedProcessArgs
|
|
34
|
+
}
|