velocious 1.0.727 → 1.0.729
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.js +26 -0
- package/build/database/database-name.js +25 -0
- package/build/database/drivers/base.js +60 -12
- package/build/database/drivers/mssql/index.js +27 -18
- package/build/database/drivers/mssql/table.js +28 -25
- package/build/database/drivers/mysql/index.js +25 -18
- package/build/database/drivers/mysql/table.js +31 -23
- package/build/database/drivers/pgsql/index.js +25 -18
- package/build/database/drivers/pgsql/table.js +28 -26
- package/build/database/drivers/sqlite/base.js +20 -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/query/model-class-query.js +85 -0
- package/build/database/record/index.js +33 -0
- package/build/environment-handlers/node/cli/commands/server.js +1 -0
- package/build/http-server/server-lock.js +28 -4
- 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.d.ts +13 -0
- package/build/src/configuration.d.ts.map +1 -1
- package/build/src/configuration.js +22 -1
- package/build/src/database/database-name.d.ts +9 -0
- package/build/src/database/database-name.d.ts.map +1 -0
- package/build/src/database/database-name.js +23 -0
- package/build/src/database/drivers/base.d.ts +31 -2
- package/build/src/database/drivers/base.d.ts.map +1 -1
- package/build/src/database/drivers/base.js +56 -13
- package/build/src/database/drivers/mssql/index.d.ts +7 -2
- package/build/src/database/drivers/mssql/index.d.ts.map +1 -1
- package/build/src/database/drivers/mssql/index.js +25 -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 +7 -2
- package/build/src/database/drivers/mysql/index.d.ts.map +1 -1
- package/build/src/database/drivers/mysql/index.js +24 -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 +7 -2
- package/build/src/database/drivers/pgsql/index.d.ts.map +1 -1
- package/build/src/database/drivers/pgsql/index.js +24 -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 +8 -0
- package/build/src/database/drivers/sqlite/base.d.ts.map +1 -1
- package/build/src/database/drivers/sqlite/base.js +19 -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/query/model-class-query.d.ts +20 -0
- package/build/src/database/query/model-class-query.d.ts.map +1 -1
- package/build/src/database/query/model-class-query.js +75 -1
- package/build/src/database/record/index.d.ts +46 -0
- package/build/src/database/record/index.d.ts.map +1 -1
- package/build/src/database/record/index.js +30 -1
- 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/http-server/server-lock.d.ts +23 -5
- package/build/src/http-server/server-lock.d.ts.map +1 -1
- package/build/src/http-server/server-lock.js +27 -5
- package/build/src/tenants/default-tenant-database-provisioning.d.ts +14 -0
- package/build/src/tenants/default-tenant-database-provisioning.d.ts.map +1 -1
- package/build/src/tenants/default-tenant-database-provisioning.js +31 -17
- package/build/tenants/default-tenant-database-provisioning.js +33 -19
- 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.js +26 -0
- package/src/database/database-name.js +25 -0
- package/src/database/drivers/base.js +60 -12
- package/src/database/drivers/mssql/index.js +27 -18
- package/src/database/drivers/mssql/table.js +28 -25
- package/src/database/drivers/mysql/index.js +25 -18
- package/src/database/drivers/mysql/table.js +31 -23
- package/src/database/drivers/pgsql/index.js +25 -18
- package/src/database/drivers/pgsql/table.js +28 -26
- package/src/database/drivers/sqlite/base.js +20 -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/query/model-class-query.js +85 -0
- package/src/database/record/index.js +33 -0
- package/src/environment-handlers/node/cli/commands/server.js +1 -0
- package/src/http-server/server-lock.js +28 -4
- package/src/tenants/default-tenant-database-provisioning.js +33 -19
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../../../src/environment-handlers/node/cli/commands/server.js"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,iCAAiC,CAAA;AAItD,YAAkB,aAAa,GAC/B;;;;IAAiF,IAAI,EAA1E,CAAC,KAAK,EAAE,QAAQ,GAAG,SAAS,EAAE,QAAQ,EAAE,MAAM,IAAI,KAAK,aAAa,CAC/E;;;;IAAiF,cAAc,EAApF,CAAC,KAAK,EAAE,QAAQ,GAAG,SAAS,EAAE,QAAQ,EAAE,MAAM,IAAI,KAAK,aAAa,CACjF;CAAA,CAAA;AAIE,YAAkB,yBAAyB,GAC3C;;;;IAAgC,IAAI,EAAzB,MAAM,OAAO,CAAC,IAAI,CAAC,CAC9B;;;;IAAgC,IAAI,EAAzB,MAAM,OAAO,CAAC,IAAI,CAAC,CAChC;CAAA,CAAA;AAZD;;;;;GAKG;AAEH;;;;;GAKG;AAEH;;;;;;;GAOG;AACH,wBAAgB,oCAAoC,CAAC,EAAC,WAAW,EAAE,aAAuB,EAAC,EAJxF;IAAwC,WAAW,EAA3C,yBAAyB,CACjC;IAA6B,aAAa,AAA1C,CACA,EADQ,aAAa,CACrB;CAEwF,GAF9E,OAAO,CAAC,IAAI,CAAC,CAkEzB;AA4BD;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAAC,iBAAiB,GAJrD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAIM,EAAE,QAAQ,AAH5E,CACA,EADQ,OAAO,oCAAoC,EAAE,uBAG4B,GAFvE;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAC,CAS1D;AAED,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,WAAW;IACjE;;;OAGG;IACG,OAAO,IAFA,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../../../src/environment-handlers/node/cli/commands/server.js"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,iCAAiC,CAAA;AAItD,YAAkB,aAAa,GAC/B;;;;IAAiF,IAAI,EAA1E,CAAC,KAAK,EAAE,QAAQ,GAAG,SAAS,EAAE,QAAQ,EAAE,MAAM,IAAI,KAAK,aAAa,CAC/E;;;;IAAiF,cAAc,EAApF,CAAC,KAAK,EAAE,QAAQ,GAAG,SAAS,EAAE,QAAQ,EAAE,MAAM,IAAI,KAAK,aAAa,CACjF;CAAA,CAAA;AAIE,YAAkB,yBAAyB,GAC3C;;;;IAAgC,IAAI,EAAzB,MAAM,OAAO,CAAC,IAAI,CAAC,CAC9B;;;;IAAgC,IAAI,EAAzB,MAAM,OAAO,CAAC,IAAI,CAAC,CAChC;CAAA,CAAA;AAZD;;;;;GAKG;AAEH;;;;;GAKG;AAEH;;;;;;;GAOG;AACH,wBAAgB,oCAAoC,CAAC,EAAC,WAAW,EAAE,aAAuB,EAAC,EAJxF;IAAwC,WAAW,EAA3C,yBAAyB,CACjC;IAA6B,aAAa,AAA1C,CACA,EADQ,aAAa,CACrB;CAEwF,GAF9E,OAAO,CAAC,IAAI,CAAC,CAkEzB;AA4BD;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAAC,iBAAiB,GAJrD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAIM,EAAE,QAAQ,AAH5E,CACA,EADQ,OAAO,oCAAoC,EAAE,uBAG4B,GAFvE;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAC,CAS1D;AAED,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,WAAW;IACjE;;;OAGG;IACG,OAAO,IAFA,OAAO,CAAC,IAAI,CAAC,CAuBzB;CACF"}
|
|
@@ -132,6 +132,7 @@ export default class VelociousCliCommandsServer extends BaseCommand {
|
|
|
132
132
|
const application = new Application({
|
|
133
133
|
configuration,
|
|
134
134
|
httpServer,
|
|
135
|
+
httpServerLockOptOut: parsedProcessArgs["no-server-lock"] === true,
|
|
135
136
|
type: "server"
|
|
136
137
|
});
|
|
137
138
|
const environment = configuration.getEnvironment();
|
|
@@ -142,4 +143,4 @@ export default class VelociousCliCommandsServer extends BaseCommand {
|
|
|
142
143
|
await waitPromise;
|
|
143
144
|
}
|
|
144
145
|
}
|
|
145
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../src/environment-handlers/node/cli/commands/server.js"],"names":[],"mappings":"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","sourcesContent":["import Application from \"../../../../application.js\"\nimport BaseCommand from \"../../../../cli/base-command.js\"\n\n/**\n * SignalProcess type.\n * @typedef {object} SignalProcess\n * @property {(event: \"SIGINT\" | \"SIGTERM\", listener: () => void) => SignalProcess} once - Register one signal listener.\n * @property {(event: \"SIGINT\" | \"SIGTERM\", listener: () => void) => SignalProcess} removeListener - Remove one signal listener.\n */\n\n/**\n * SignalShutdownApplication type.\n * @typedef {object} SignalShutdownApplication\n * @property {() => Promise<void>} stop - Stop the application gracefully.\n * @property {() => Promise<void>} wait - Wait until the application closes.\n */\n\n/**\n * Waits for the HTTP application to close, stopping it gracefully when the\n * process receives SIGINT or SIGTERM.\n * @param {object} args - Wait options.\n * @param {SignalShutdownApplication} args.application - Running application.\n * @param {SignalProcess} [args.processObject] - Process-like signal emitter.\n * @returns {Promise<void>} - Resolves when the application has stopped.\n */\nexport function waitForApplicationWithSignalShutdown({application, processObject = process}) {\n  return new Promise((resolve, reject) => {\n    let finished = false\n    let stopping = false\n\n    /**\n     * Cleanup.\n     * @returns {void} - Remove installed signal handlers.\n     */\n    const cleanup = () => {\n      processObject.removeListener(\"SIGINT\", onSignal)\n      processObject.removeListener(\"SIGTERM\", onSignal)\n    }\n\n    /**\n     * Completes the wait promise once.\n     * @param {ReturnType<typeof JSON.parse>} [error] - Optional rejection reason.\n     * @returns {void}\n     */\n    const finish = (error) => {\n      if (finished) return\n\n      finished = true\n      cleanup()\n\n      if (error) {\n        reject(error)\n      } else {\n        resolve(undefined)\n      }\n    }\n\n    /**\n     * Stop application.\n     * @returns {Promise<void>} - Stops the application once.\n     */\n    const stopApplication = async () => {\n      if (stopping || finished) return\n\n      stopping = true\n\n      try {\n        await application.stop()\n        finish()\n      } catch (error) {\n        finish(error)\n      }\n    }\n\n    /**\n     * On signal.\n     * @returns {void} - Handles one shutdown signal.\n     */\n    const onSignal = () => {\n      void stopApplication()\n    }\n\n    processObject.once(\"SIGINT\", onSignal)\n    processObject.once(\"SIGTERM\", onSignal)\n\n    application.wait().then(() => {\n      if (!stopping) finish()\n    }).catch((error) => finish(error))\n  })\n}\n\n/**\n * Runs first configured value.\n * @template T\n * @param {...(T | undefined)} values - Candidate values in priority order.\n * @returns {T | undefined} - First configured value.\n */\nfunction firstConfiguredValue(...values) {\n  return values.find((value) => value !== undefined)\n}\n\n/**\n * Runs http server workers from arg.\n * @param {string | number | boolean | undefined} workersArg - Worker count argument.\n * @returns {number | undefined} - Normalized worker count.\n */\nfunction httpServerWorkersFromArg(workersArg) {\n  if (workersArg === undefined) return undefined\n  if (typeof workersArg === \"boolean\") throw new Error(\"--workers must be a positive integer\")\n\n  const workers = Number(workersArg)\n\n  if (!Number.isInteger(workers) || workers < 1) throw new Error(\"--workers must be a positive integer\")\n\n  return workers\n}\n\n/**\n * Runs the httpServerConfigFromParsedArgs helper.\n * @param {Record<string, string | number | boolean | undefined>} parsedProcessArgs - Parsed CLI args.\n * @param {import(\"../../../../configuration-types.js\").HttpServerConfiguration} [defaults] - Default HTTP server config.\n * @returns {{host: string, port: number, workers?: number}} - HTTP server config.\n */\nexport function httpServerConfigFromParsedArgs(parsedProcessArgs = {}, defaults = {}) {\n  const host = String(firstConfiguredValue(parsedProcessArgs.h, parsedProcessArgs.host, defaults.host, \"127.0.0.1\"))\n  const port = Number(firstConfiguredValue(parsedProcessArgs.p, parsedProcessArgs.port, defaults.port, 3006))\n  const workers = httpServerWorkersFromArg(firstConfiguredValue(parsedProcessArgs.workers, defaults.workers))\n\n  if (workers === undefined) return {host, port}\n  return {host, port, workers}\n}\n\nexport default class VelociousCliCommandsServer extends BaseCommand{\n  /**\n   * Runs execute.\n   * @returns {Promise<void>} - Starts the HTTP server and waits until it stops.\n   */\n  async execute() {\n    // Identify this process in `ps`/`top` instead of a generic \"node\" entry.\n    process.title = \"velocious server\"\n\n    const parsedProcessArgs = this.args?.parsedProcessArgs || {}\n    const configuration = this.getConfiguration()\n    const httpServer = httpServerConfigFromParsedArgs(parsedProcessArgs, configuration.httpServer)\n    const application = new Application({\n      configuration,\n      httpServer,\n      type: \"server\"\n    })\n    const environment = configuration.getEnvironment()\n\n    await application.initialize()\n    await application.startHttpServer()\n    const waitPromise = waitForApplicationWithSignalShutdown({application})\n\n    console.log(`Started Velocious HTTP server on ${httpServer.host}:${httpServer.port} in ${environment} environment`)\n    await waitPromise\n  }\n}\n"]}
|
|
146
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../../../src/environment-handlers/node/cli/commands/server.js"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,4BAA4B,CAAA;AACpD,OAAO,WAAW,MAAM,iCAAiC,CAAA;AAEzD;;;;;GAKG;AAEH;;;;;GAKG;AAEH;;;;;;;GAOG;AACH,MAAM,UAAU,oCAAoC,CAAC,EAAC,WAAW,EAAE,aAAa,GAAG,OAAO,EAAC;IACzF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,QAAQ,GAAG,KAAK,CAAA;QACpB,IAAI,QAAQ,GAAG,KAAK,CAAA;QAEpB;;;WAGG;QACH,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,aAAa,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;YAChD,aAAa,CAAC,cAAc,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;QACnD,CAAC,CAAA;QAED;;;;WAIG;QACH,MAAM,MAAM,GAAG,CAAC,KAAK,EAAE,EAAE;YACvB,IAAI,QAAQ;gBAAE,OAAM;YAEpB,QAAQ,GAAG,IAAI,CAAA;YACf,OAAO,EAAE,CAAA;YAET,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,CAAC,KAAK,CAAC,CAAA;YACf,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,SAAS,CAAC,CAAA;YACpB,CAAC;QACH,CAAC,CAAA;QAED;;;WAGG;QACH,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE;YACjC,IAAI,QAAQ,IAAI,QAAQ;gBAAE,OAAM;YAEhC,QAAQ,GAAG,IAAI,CAAA;YAEf,IAAI,CAAC;gBACH,MAAM,WAAW,CAAC,IAAI,EAAE,CAAA;gBACxB,MAAM,EAAE,CAAA;YACV,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,KAAK,CAAC,CAAA;YACf,CAAC;QACH,CAAC,CAAA;QAED;;;WAGG;QACH,MAAM,QAAQ,GAAG,GAAG,EAAE;YACpB,KAAK,eAAe,EAAE,CAAA;QACxB,CAAC,CAAA;QAED,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAA;QACtC,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;QAEvC,WAAW,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YAC3B,IAAI,CAAC,QAAQ;gBAAE,MAAM,EAAE,CAAA;QACzB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IACpC,CAAC,CAAC,CAAA;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,oBAAoB,CAAC,GAAG,MAAM;IACrC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC,CAAA;AACpD,CAAC;AAED;;;;GAIG;AACH,SAAS,wBAAwB,CAAC,UAAU;IAC1C,IAAI,UAAU,KAAK,SAAS;QAAE,OAAO,SAAS,CAAA;IAC9C,IAAI,OAAO,UAAU,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;IAE5F,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,CAAA;IAElC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,OAAO,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;IAEtG,OAAO,OAAO,CAAA;AAChB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,8BAA8B,CAAC,iBAAiB,GAAG,EAAE,EAAE,QAAQ,GAAG,EAAE;IAClF,MAAM,IAAI,GAAG,MAAM,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,EAAE,iBAAiB,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAA;IAClH,MAAM,IAAI,GAAG,MAAM,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,EAAE,iBAAiB,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IAC3G,MAAM,OAAO,GAAG,wBAAwB,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA;IAE3G,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,EAAC,IAAI,EAAE,IAAI,EAAC,CAAA;IAC9C,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAC,CAAA;AAC9B,CAAC;AAED,MAAM,CAAC,OAAO,OAAO,0BAA2B,SAAQ,WAAW;IACjE;;;OAGG;IACH,KAAK,CAAC,OAAO;QACX,yEAAyE;QACzE,OAAO,CAAC,KAAK,GAAG,kBAAkB,CAAA;QAElC,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,EAAE,iBAAiB,IAAI,EAAE,CAAA;QAC5D,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;QAC7C,MAAM,UAAU,GAAG,8BAA8B,CAAC,iBAAiB,EAAE,aAAa,CAAC,UAAU,CAAC,CAAA;QAC9F,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC;YAClC,aAAa;YACb,UAAU;YACV,oBAAoB,EAAE,iBAAiB,CAAC,gBAAgB,CAAC,KAAK,IAAI;YAClE,IAAI,EAAE,QAAQ;SACf,CAAC,CAAA;QACF,MAAM,WAAW,GAAG,aAAa,CAAC,cAAc,EAAE,CAAA;QAElD,MAAM,WAAW,CAAC,UAAU,EAAE,CAAA;QAC9B,MAAM,WAAW,CAAC,eAAe,EAAE,CAAA;QACnC,MAAM,WAAW,GAAG,oCAAoC,CAAC,EAAC,WAAW,EAAC,CAAC,CAAA;QAEvE,OAAO,CAAC,GAAG,CAAC,oCAAoC,UAAU,CAAC,IAAI,IAAI,UAAU,CAAC,IAAI,OAAO,WAAW,cAAc,CAAC,CAAA;QACnH,MAAM,WAAW,CAAA;IACnB,CAAC;CACF","sourcesContent":["import Application from \"../../../../application.js\"\nimport BaseCommand from \"../../../../cli/base-command.js\"\n\n/**\n * SignalProcess type.\n * @typedef {object} SignalProcess\n * @property {(event: \"SIGINT\" | \"SIGTERM\", listener: () => void) => SignalProcess} once - Register one signal listener.\n * @property {(event: \"SIGINT\" | \"SIGTERM\", listener: () => void) => SignalProcess} removeListener - Remove one signal listener.\n */\n\n/**\n * SignalShutdownApplication type.\n * @typedef {object} SignalShutdownApplication\n * @property {() => Promise<void>} stop - Stop the application gracefully.\n * @property {() => Promise<void>} wait - Wait until the application closes.\n */\n\n/**\n * Waits for the HTTP application to close, stopping it gracefully when the\n * process receives SIGINT or SIGTERM.\n * @param {object} args - Wait options.\n * @param {SignalShutdownApplication} args.application - Running application.\n * @param {SignalProcess} [args.processObject] - Process-like signal emitter.\n * @returns {Promise<void>} - Resolves when the application has stopped.\n */\nexport function waitForApplicationWithSignalShutdown({application, processObject = process}) {\n  return new Promise((resolve, reject) => {\n    let finished = false\n    let stopping = false\n\n    /**\n     * Cleanup.\n     * @returns {void} - Remove installed signal handlers.\n     */\n    const cleanup = () => {\n      processObject.removeListener(\"SIGINT\", onSignal)\n      processObject.removeListener(\"SIGTERM\", onSignal)\n    }\n\n    /**\n     * Completes the wait promise once.\n     * @param {ReturnType<typeof JSON.parse>} [error] - Optional rejection reason.\n     * @returns {void}\n     */\n    const finish = (error) => {\n      if (finished) return\n\n      finished = true\n      cleanup()\n\n      if (error) {\n        reject(error)\n      } else {\n        resolve(undefined)\n      }\n    }\n\n    /**\n     * Stop application.\n     * @returns {Promise<void>} - Stops the application once.\n     */\n    const stopApplication = async () => {\n      if (stopping || finished) return\n\n      stopping = true\n\n      try {\n        await application.stop()\n        finish()\n      } catch (error) {\n        finish(error)\n      }\n    }\n\n    /**\n     * On signal.\n     * @returns {void} - Handles one shutdown signal.\n     */\n    const onSignal = () => {\n      void stopApplication()\n    }\n\n    processObject.once(\"SIGINT\", onSignal)\n    processObject.once(\"SIGTERM\", onSignal)\n\n    application.wait().then(() => {\n      if (!stopping) finish()\n    }).catch((error) => finish(error))\n  })\n}\n\n/**\n * Runs first configured value.\n * @template T\n * @param {...(T | undefined)} values - Candidate values in priority order.\n * @returns {T | undefined} - First configured value.\n */\nfunction firstConfiguredValue(...values) {\n  return values.find((value) => value !== undefined)\n}\n\n/**\n * Runs http server workers from arg.\n * @param {string | number | boolean | undefined} workersArg - Worker count argument.\n * @returns {number | undefined} - Normalized worker count.\n */\nfunction httpServerWorkersFromArg(workersArg) {\n  if (workersArg === undefined) return undefined\n  if (typeof workersArg === \"boolean\") throw new Error(\"--workers must be a positive integer\")\n\n  const workers = Number(workersArg)\n\n  if (!Number.isInteger(workers) || workers < 1) throw new Error(\"--workers must be a positive integer\")\n\n  return workers\n}\n\n/**\n * Runs the httpServerConfigFromParsedArgs helper.\n * @param {Record<string, string | number | boolean | undefined>} parsedProcessArgs - Parsed CLI args.\n * @param {import(\"../../../../configuration-types.js\").HttpServerConfiguration} [defaults] - Default HTTP server config.\n * @returns {{host: string, port: number, workers?: number}} - HTTP server config.\n */\nexport function httpServerConfigFromParsedArgs(parsedProcessArgs = {}, defaults = {}) {\n  const host = String(firstConfiguredValue(parsedProcessArgs.h, parsedProcessArgs.host, defaults.host, \"127.0.0.1\"))\n  const port = Number(firstConfiguredValue(parsedProcessArgs.p, parsedProcessArgs.port, defaults.port, 3006))\n  const workers = httpServerWorkersFromArg(firstConfiguredValue(parsedProcessArgs.workers, defaults.workers))\n\n  if (workers === undefined) return {host, port}\n  return {host, port, workers}\n}\n\nexport default class VelociousCliCommandsServer extends BaseCommand{\n  /**\n   * Runs execute.\n   * @returns {Promise<void>} - Starts the HTTP server and waits until it stops.\n   */\n  async execute() {\n    // Identify this process in `ps`/`top` instead of a generic \"node\" entry.\n    process.title = \"velocious server\"\n\n    const parsedProcessArgs = this.args?.parsedProcessArgs || {}\n    const configuration = this.getConfiguration()\n    const httpServer = httpServerConfigFromParsedArgs(parsedProcessArgs, configuration.httpServer)\n    const application = new Application({\n      configuration,\n      httpServer,\n      httpServerLockOptOut: parsedProcessArgs[\"no-server-lock\"] === true,\n      type: \"server\"\n    })\n    const environment = configuration.getEnvironment()\n\n    await application.initialize()\n    await application.startHttpServer()\n    const waitPromise = waitForApplicationWithSignalShutdown({application})\n\n    console.log(`Started Velocious HTTP server on ${httpServer.host}:${httpServer.port} in ${environment} environment`)\n    await waitPromise\n  }\n}\n"]}
|
|
@@ -13,11 +13,17 @@ import AdvisoryLockFileBackend from "../database/advisory-lock-file-backend.js";
|
|
|
13
13
|
* server and a test-spawned backend in the same app directory coexist, while
|
|
14
14
|
* the single-server-per-(directory, environment) invariant still fails loudly
|
|
15
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.
|
|
16
21
|
*/
|
|
17
22
|
export default class VelociousHttpServerLock {
|
|
18
23
|
configuration: import("../configuration.js").default;
|
|
19
24
|
host: string;
|
|
20
25
|
port: number;
|
|
26
|
+
optOut: boolean;
|
|
21
27
|
environment: string;
|
|
22
28
|
lockName: string;
|
|
23
29
|
lockPath: string;
|
|
@@ -30,22 +36,27 @@ export default class VelociousHttpServerLock {
|
|
|
30
36
|
* @param {import("../configuration.js").default} args.configuration - Configuration that owns the application directory.
|
|
31
37
|
* @param {string} args.host - Configured HTTP host.
|
|
32
38
|
* @param {number} args.port - Configured HTTP port.
|
|
39
|
+
* @param {boolean} [args.optOut] - Skip acquisition for this caller instead of contending for the lock.
|
|
33
40
|
*/
|
|
34
|
-
constructor({ configuration, host, port }: {
|
|
41
|
+
constructor({ configuration, host, port, optOut }: {
|
|
35
42
|
configuration: import("../configuration.js").default;
|
|
36
43
|
host: string;
|
|
37
44
|
port: number;
|
|
45
|
+
optOut?: boolean;
|
|
38
46
|
});
|
|
39
47
|
/**
|
|
40
48
|
* Acquires the app-directory + environment HTTP server lock before startup
|
|
41
|
-
* side effects run.
|
|
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
|
|
42
51
|
* reclaimed by the backend; a live foreign owner in the same environment
|
|
43
52
|
* fails loudly with the owner details.
|
|
44
|
-
* @returns {Promise<
|
|
53
|
+
* @returns {Promise<boolean>} - Whether this caller holds the lock.
|
|
45
54
|
*/
|
|
46
|
-
acquire(): Promise<
|
|
55
|
+
acquire(): Promise<boolean>;
|
|
47
56
|
/**
|
|
48
|
-
* Releases the held environment-scoped 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.
|
|
49
60
|
* @returns {Promise<void>} - Resolves after best-effort lock release.
|
|
50
61
|
*/
|
|
51
62
|
release(): Promise<void>;
|
|
@@ -59,5 +70,12 @@ export default class VelociousHttpServerLock {
|
|
|
59
70
|
* @returns {Promise<string>} - Error message explaining which server owns the lock.
|
|
60
71
|
*/
|
|
61
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;
|
|
62
80
|
}
|
|
63
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"}
|
|
@@ -15,6 +15,11 @@ import path from "node:path";
|
|
|
15
15
|
* server and a test-spawned backend in the same app directory coexist, while
|
|
16
16
|
* the single-server-per-(directory, environment) invariant still fails loudly
|
|
17
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.
|
|
18
23
|
*/
|
|
19
24
|
export default class VelociousHttpServerLock {
|
|
20
25
|
/**
|
|
@@ -24,11 +29,13 @@ export default class VelociousHttpServerLock {
|
|
|
24
29
|
* @param {import("../configuration.js").default} args.configuration - Configuration that owns the application directory.
|
|
25
30
|
* @param {string} args.host - Configured HTTP host.
|
|
26
31
|
* @param {number} args.port - Configured HTTP port.
|
|
32
|
+
* @param {boolean} [args.optOut] - Skip acquisition for this caller instead of contending for the lock.
|
|
27
33
|
*/
|
|
28
|
-
constructor({ configuration, host, port }) {
|
|
34
|
+
constructor({ configuration, host, port, optOut = false }) {
|
|
29
35
|
this.configuration = configuration;
|
|
30
36
|
this.host = host;
|
|
31
37
|
this.port = port;
|
|
38
|
+
this.optOut = optOut;
|
|
32
39
|
this.environment = String(configuration.getEnvironment());
|
|
33
40
|
// Scope the lock name by environment and keep the segment filesystem-safe,
|
|
34
41
|
// so odd environment names can never escape tmp/ or collide with each other.
|
|
@@ -43,19 +50,25 @@ export default class VelociousHttpServerLock {
|
|
|
43
50
|
}
|
|
44
51
|
/**
|
|
45
52
|
* Acquires the app-directory + environment HTTP server lock before startup
|
|
46
|
-
* side effects run.
|
|
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
|
|
47
55
|
* reclaimed by the backend; a live foreign owner in the same environment
|
|
48
56
|
* fails loudly with the owner details.
|
|
49
|
-
* @returns {Promise<
|
|
57
|
+
* @returns {Promise<boolean>} - Whether this caller holds the lock.
|
|
50
58
|
*/
|
|
51
59
|
async acquire() {
|
|
60
|
+
if (this.optOut)
|
|
61
|
+
return false;
|
|
52
62
|
const acquired = await this.backend.acquire(this.lockName, { timeoutMs: 0 });
|
|
53
63
|
if (!acquired)
|
|
54
64
|
throw new Error(await this.lockHeldMessage());
|
|
55
65
|
this.acquired = true;
|
|
66
|
+
return true;
|
|
56
67
|
}
|
|
57
68
|
/**
|
|
58
|
-
* Releases the held environment-scoped 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.
|
|
59
72
|
* @returns {Promise<void>} - Resolves after best-effort lock release.
|
|
60
73
|
*/
|
|
61
74
|
async release() {
|
|
@@ -82,5 +95,14 @@ export default class VelociousHttpServerLock {
|
|
|
82
95
|
: `lock directory ${this.lockPath}`;
|
|
83
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.`;
|
|
84
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.`;
|
|
106
|
+
}
|
|
85
107
|
}
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server-lock.js","sourceRoot":"","sources":["../../../src/http-server/server-lock.js"],"names":[],"mappings":"AAAA,YAAY;AAEZ,OAAO,uBAAuB,MAAM,2CAA2C,CAAA;AAC/E,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAC1C;;;;;;;OAOG;IACH,YAAY,EAAC,aAAa,EAAE,IAAI,EAAE,IAAI,EAAC;QACrC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC,CAAA;QACzD,2EAA2E;QAC3E,6EAA6E;QAC7E,IAAI,CAAC,QAAQ,GAAG,UAAU,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,EAAE,CAAA;QAC7E,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,QAAQ,OAAO,CAAC,CAAA;QACvF,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAuB,CAAC;YACzC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,EAAE,KAAK,CAAC;YACzD,gBAAgB,EAAE,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAC;YACpD,SAAS,EAAE,OAAO;SACnB,CAAC,CAAA;QACF,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAA;IACvB,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,OAAO;QACX,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAC,SAAS,EAAE,CAAC,EAAC,CAAC,CAAA;QAE1E,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC,CAAA;QAE5D,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;IACtB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAM;QAE1B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAA;QACrB,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC3C,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,iBAAiB;QACrB,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IACrD,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,eAAe;QACnB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAA;QAC5C,MAAM,OAAO,GAAG,KAAK;YACnB,CAAC,CAAC,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG;YACvG,CAAC,CAAC,kBAAkB,IAAI,CAAC,QAAQ,EAAE,CAAA;QAErC,OAAO,0EAA0E,IAAI,CAAC,WAAW,iBAAiB,OAAO,aAAa,IAAI,CAAC,QAAQ,sCAAsC,CAAA;IAC3L,CAAC;CACF","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 */\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   */\n  constructor({configuration, host, port}) {\n    this.configuration = configuration\n    this.host = host\n    this.port = port\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. 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<void>} - Resolves after the lock has been acquired.\n   */\n  async acquire() {\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\n  /**\n   * Releases the held environment-scoped HTTP server lock directory.\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"]}
|
|
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"]}
|
|
@@ -9,6 +9,20 @@ export declare function createTenantDatabase({ configuration, databaseConfigurat
|
|
|
9
9
|
identifier?: string;
|
|
10
10
|
tenant: ReturnType<typeof JSON.parse>;
|
|
11
11
|
}): Promise<void>;
|
|
12
|
+
/**
|
|
13
|
+
* Drops one exact database through the maintenance connection (`useDatabase`) and the
|
|
14
|
+
* driver's own `dropDatabaseSql`. The name is validated against the strict allowlist
|
|
15
|
+
* first, so the helper can only ever drop a single explicitly named database — never a
|
|
16
|
+
* name-pattern sweep. Uses `DROP DATABASE IF EXISTS`, so it is a safe no-op for a
|
|
17
|
+
* database that never existed.
|
|
18
|
+
* @param {{configuration: import("../configuration.js").default, databaseConfiguration: import("../configuration-types.js").DatabaseConfigurationType, databaseName: string | undefined}} args - Database configuration and the exact database name to drop.
|
|
19
|
+
* @returns {Promise<void>} - Resolves once the database is gone.
|
|
20
|
+
*/
|
|
21
|
+
export declare function dropDatabaseByName({ configuration, databaseConfiguration, databaseName }: {
|
|
22
|
+
configuration: import("../configuration.js").default;
|
|
23
|
+
databaseConfiguration: import("../configuration-types.js").DatabaseConfigurationType;
|
|
24
|
+
databaseName: string | undefined;
|
|
25
|
+
}): Promise<void>;
|
|
12
26
|
/**
|
|
13
27
|
* Drops the tenant database for one tenant. Uses `DROP DATABASE IF EXISTS`, so it
|
|
14
28
|
* is a safe no-op for a tenant that was never fully provisioned.
|
|
@@ -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":"AA2DA;;;;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;;;;;;;;GAQG;AACH,wBAAsB,kBAAkB,CAAC,EAAC,aAAa,EAAE,qBAAqB,EAAE,YAAY,EAAC,EAHlF;IAAC,aAAa,EAAE,OAAO,qBAAqB,EAAE,OAAO,CAAC;IAAC,qBAAqB,EAAE,OAAO,2BAA2B,EAAE,yBAAyB,CAAC;IAAC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAA;CAG3F,GAFhF,OAAO,CAAC,IAAI,CAAC,CAiBzB;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,CAczB"}
|
|
@@ -12,7 +12,8 @@
|
|
|
12
12
|
* connect to the configured maintenance database (`useDatabase`) and run the
|
|
13
13
|
* driver's own `createDatabaseSql`/`dropDatabaseSql`.
|
|
14
14
|
*/
|
|
15
|
-
|
|
15
|
+
import { safeDatabaseName } from "../database/database-name.js";
|
|
16
|
+
import PoolBase from "../database/pool/base.js";
|
|
16
17
|
/**
|
|
17
18
|
* Whether the driver stores each database as a local file instead of on a server.
|
|
18
19
|
* @param {import("../configuration-types.js").DatabaseConfigurationType} databaseConfiguration - Resolved tenant database configuration.
|
|
@@ -28,11 +29,7 @@ function fileBackedDriver(databaseConfiguration) {
|
|
|
28
29
|
* @returns {string} - The validated tenant database name.
|
|
29
30
|
*/
|
|
30
31
|
function guardedDatabaseName(databaseConfiguration) {
|
|
31
|
-
|
|
32
|
-
if (!databaseName || !SAFE_TENANT_DATABASE_NAME.test(databaseName)) {
|
|
33
|
-
throw new Error(`Unsafe tenant database name: ${databaseName}`);
|
|
34
|
-
}
|
|
35
|
-
return databaseName;
|
|
32
|
+
return safeDatabaseName(databaseConfiguration.database, "tenant database provisioning");
|
|
36
33
|
}
|
|
37
34
|
/**
|
|
38
35
|
* Opens a driver connected to the server's maintenance database (`useDatabase`),
|
|
@@ -81,20 +78,20 @@ export async function createTenantDatabase({ configuration, databaseConfiguratio
|
|
|
81
78
|
}
|
|
82
79
|
}
|
|
83
80
|
/**
|
|
84
|
-
* Drops
|
|
85
|
-
*
|
|
86
|
-
*
|
|
87
|
-
*
|
|
81
|
+
* Drops one exact database through the maintenance connection (`useDatabase`) and the
|
|
82
|
+
* driver's own `dropDatabaseSql`. The name is validated against the strict allowlist
|
|
83
|
+
* first, so the helper can only ever drop a single explicitly named database — never a
|
|
84
|
+
* name-pattern sweep. Uses `DROP DATABASE IF EXISTS`, so it is a safe no-op for a
|
|
85
|
+
* database that never existed.
|
|
86
|
+
* @param {{configuration: import("../configuration.js").default, databaseConfiguration: import("../configuration-types.js").DatabaseConfigurationType, databaseName: string | undefined}} args - Database configuration and the exact database name to drop.
|
|
87
|
+
* @returns {Promise<void>} - Resolves once the database is gone.
|
|
88
88
|
*/
|
|
89
|
-
export async function
|
|
90
|
-
|
|
91
|
-
return;
|
|
92
|
-
}
|
|
93
|
-
const databaseName = guardedDatabaseName(databaseConfiguration);
|
|
89
|
+
export async function dropDatabaseByName({ configuration, databaseConfiguration, databaseName }) {
|
|
90
|
+
const guardedName = safeDatabaseName(databaseName, "dropDatabase");
|
|
94
91
|
const connection = maintenanceConnection(databaseConfiguration, configuration);
|
|
95
92
|
await connection.connect();
|
|
96
93
|
try {
|
|
97
|
-
const sqls = connection.dropDatabaseSql(
|
|
94
|
+
const sqls = connection.dropDatabaseSql(guardedName, { ifExists: true });
|
|
98
95
|
for (const sql of sqls) {
|
|
99
96
|
await connection.query(sql);
|
|
100
97
|
}
|
|
@@ -103,4 +100,21 @@ export async function dropTenantDatabase({ configuration, databaseConfiguration
|
|
|
103
100
|
await connection.close();
|
|
104
101
|
}
|
|
105
102
|
}
|
|
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"]}
|
|
103
|
+
/**
|
|
104
|
+
* Drops the tenant database for one tenant. Uses `DROP DATABASE IF EXISTS`, so it
|
|
105
|
+
* is a safe no-op for a tenant that was never fully provisioned.
|
|
106
|
+
* @param {{configuration: import("../configuration.js").default, databaseConfiguration: import("../configuration-types.js").DatabaseConfigurationType}} args - Provisioning arguments.
|
|
107
|
+
* @returns {Promise<void>} - Resolves once the tenant database is gone.
|
|
108
|
+
*/
|
|
109
|
+
export async function dropTenantDatabase({ configuration, databaseConfiguration }) {
|
|
110
|
+
if (fileBackedDriver(databaseConfiguration)) {
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
await dropDatabaseByName({ configuration, databaseConfiguration, databaseName: databaseConfiguration.database });
|
|
114
|
+
// The DROP DATABASE ran on the maintenance connection, so the dropped tenant's
|
|
115
|
+
// own shared schema-metadata cache was never invalidated by the DDL path. Clear
|
|
116
|
+
// it explicitly: recreating the tenant database later must re-introspect, not
|
|
117
|
+
// serve the dropped schema from the shared cache.
|
|
118
|
+
configuration.clearSchemaCachesForReuseKey(PoolBase.configurationReuseKey(databaseConfiguration));
|
|
119
|
+
}
|
|
120
|
+
//# 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 {safeDatabaseName} from \"../database/database-name.js\"\nimport PoolBase from \"../database/pool/base.js\"\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  return safeDatabaseName(databaseConfiguration.database, \"tenant database provisioning\")\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 one exact database through the maintenance connection (`useDatabase`) and the\n * driver's own `dropDatabaseSql`. The name is validated against the strict allowlist\n * first, so the helper can only ever drop a single explicitly named database — never a\n * name-pattern sweep. Uses `DROP DATABASE IF EXISTS`, so it is a safe no-op for a\n * database that never existed.\n * @param {{configuration: import(\"../configuration.js\").default, databaseConfiguration: import(\"../configuration-types.js\").DatabaseConfigurationType, databaseName: string | undefined}} args - Database configuration and the exact database name to drop.\n * @returns {Promise<void>} - Resolves once the database is gone.\n */\nexport async function dropDatabaseByName({configuration, databaseConfiguration, databaseName}) {\n  const guardedName = safeDatabaseName(databaseName, \"dropDatabase\")\n  const connection = maintenanceConnection(databaseConfiguration, configuration)\n\n  await connection.connect()\n\n  try {\n    const sqls = connection.dropDatabaseSql(guardedName, {ifExists: true})\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  await dropDatabaseByName({configuration, databaseConfiguration, databaseName: databaseConfiguration.database})\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,7 +14,8 @@
|
|
|
14
14
|
* driver's own `createDatabaseSql`/`dropDatabaseSql`.
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
|
-
|
|
17
|
+
import {safeDatabaseName} from "../database/database-name.js"
|
|
18
|
+
import PoolBase from "../database/pool/base.js"
|
|
18
19
|
|
|
19
20
|
/**
|
|
20
21
|
* Whether the driver stores each database as a local file instead of on a server.
|
|
@@ -32,13 +33,7 @@ function fileBackedDriver(databaseConfiguration) {
|
|
|
32
33
|
* @returns {string} - The validated tenant database name.
|
|
33
34
|
*/
|
|
34
35
|
function guardedDatabaseName(databaseConfiguration) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
if (!databaseName || !SAFE_TENANT_DATABASE_NAME.test(databaseName)) {
|
|
38
|
-
throw new Error(`Unsafe tenant database name: ${databaseName}`)
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
return databaseName
|
|
36
|
+
return safeDatabaseName(databaseConfiguration.database, "tenant database provisioning")
|
|
42
37
|
}
|
|
43
38
|
|
|
44
39
|
/**
|
|
@@ -97,23 +92,22 @@ export async function createTenantDatabase({configuration, databaseConfiguration
|
|
|
97
92
|
}
|
|
98
93
|
|
|
99
94
|
/**
|
|
100
|
-
* Drops
|
|
101
|
-
*
|
|
102
|
-
*
|
|
103
|
-
*
|
|
95
|
+
* Drops one exact database through the maintenance connection (`useDatabase`) and the
|
|
96
|
+
* driver's own `dropDatabaseSql`. The name is validated against the strict allowlist
|
|
97
|
+
* first, so the helper can only ever drop a single explicitly named database — never a
|
|
98
|
+
* name-pattern sweep. Uses `DROP DATABASE IF EXISTS`, so it is a safe no-op for a
|
|
99
|
+
* database that never existed.
|
|
100
|
+
* @param {{configuration: import("../configuration.js").default, databaseConfiguration: import("../configuration-types.js").DatabaseConfigurationType, databaseName: string | undefined}} args - Database configuration and the exact database name to drop.
|
|
101
|
+
* @returns {Promise<void>} - Resolves once the database is gone.
|
|
104
102
|
*/
|
|
105
|
-
export async function
|
|
106
|
-
|
|
107
|
-
return
|
|
108
|
-
}
|
|
109
|
-
|
|
110
|
-
const databaseName = guardedDatabaseName(databaseConfiguration)
|
|
103
|
+
export async function dropDatabaseByName({configuration, databaseConfiguration, databaseName}) {
|
|
104
|
+
const guardedName = safeDatabaseName(databaseName, "dropDatabase")
|
|
111
105
|
const connection = maintenanceConnection(databaseConfiguration, configuration)
|
|
112
106
|
|
|
113
107
|
await connection.connect()
|
|
114
108
|
|
|
115
109
|
try {
|
|
116
|
-
const sqls = connection.dropDatabaseSql(
|
|
110
|
+
const sqls = connection.dropDatabaseSql(guardedName, {ifExists: true})
|
|
117
111
|
|
|
118
112
|
for (const sql of sqls) {
|
|
119
113
|
await connection.query(sql)
|
|
@@ -122,3 +116,23 @@ export async function dropTenantDatabase({configuration, databaseConfiguration})
|
|
|
122
116
|
await connection.close()
|
|
123
117
|
}
|
|
124
118
|
}
|
|
119
|
+
|
|
120
|
+
/**
|
|
121
|
+
* Drops the tenant database for one tenant. Uses `DROP DATABASE IF EXISTS`, so it
|
|
122
|
+
* is a safe no-op for a tenant that was never fully provisioned.
|
|
123
|
+
* @param {{configuration: import("../configuration.js").default, databaseConfiguration: import("../configuration-types.js").DatabaseConfigurationType}} args - Provisioning arguments.
|
|
124
|
+
* @returns {Promise<void>} - Resolves once the tenant database is gone.
|
|
125
|
+
*/
|
|
126
|
+
export async function dropTenantDatabase({configuration, databaseConfiguration}) {
|
|
127
|
+
if (fileBackedDriver(databaseConfiguration)) {
|
|
128
|
+
return
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
await dropDatabaseByName({configuration, databaseConfiguration, databaseName: databaseConfiguration.database})
|
|
132
|
+
|
|
133
|
+
// The DROP DATABASE ran on the maintenance connection, so the dropped tenant's
|
|
134
|
+
// own shared schema-metadata cache was never invalidated by the DDL path. Clear
|
|
135
|
+
// it explicitly: recreating the tenant database later must re-introspect, not
|
|
136
|
+
// serve the dropped schema from the shared cache.
|
|
137
|
+
configuration.clearSchemaCachesForReuseKey(PoolBase.configurationReuseKey(databaseConfiguration))
|
|
138
|
+
}
|
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.729",
|
|
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) {
|