velocious 1.0.728 → 1.0.730
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/build/background-jobs/adapter.js +13 -1
- package/build/background-jobs/local-store.js +10 -16
- package/build/background-jobs/main.js +65 -2
- package/build/background-jobs/queue-priority-order.js +96 -0
- package/build/background-jobs/store.js +138 -29
- package/build/background-jobs/types.js +10 -0
- package/build/configuration-types.js +9 -0
- package/build/configuration.js +7 -1
- package/build/database/database-name.js +25 -0
- package/build/database/drivers/base.js +26 -0
- package/build/database/drivers/mssql/index.js +10 -0
- package/build/database/drivers/mysql/index.js +10 -0
- package/build/database/drivers/pgsql/index.js +10 -0
- package/build/database/drivers/sqlite/base.js +13 -0
- package/build/database/query/model-class-query.js +85 -0
- package/build/database/record/index.js +33 -0
- package/build/src/background-jobs/adapter.d.ts +17 -1
- package/build/src/background-jobs/adapter.d.ts.map +1 -1
- package/build/src/background-jobs/adapter.js +13 -2
- package/build/src/background-jobs/local-store.d.ts +5 -2
- package/build/src/background-jobs/local-store.d.ts.map +1 -1
- package/build/src/background-jobs/local-store.js +11 -15
- package/build/src/background-jobs/main.d.ts +16 -0
- package/build/src/background-jobs/main.d.ts.map +1 -1
- package/build/src/background-jobs/main.js +58 -3
- package/build/src/background-jobs/queue-priority-order.d.ts +55 -0
- package/build/src/background-jobs/queue-priority-order.d.ts.map +1 -0
- package/build/src/background-jobs/queue-priority-order.js +89 -0
- package/build/src/background-jobs/store.d.ts +71 -14
- package/build/src/background-jobs/store.d.ts.map +1 -1
- package/build/src/background-jobs/store.js +129 -34
- package/build/src/background-jobs/types.d.ts +32 -0
- package/build/src/background-jobs/types.d.ts.map +1 -1
- package/build/src/background-jobs/types.js +11 -1
- package/build/src/configuration-types.d.ts +21 -0
- package/build/src/configuration-types.d.ts.map +1 -1
- package/build/src/configuration-types.js +10 -1
- package/build/src/configuration.d.ts.map +1 -1
- package/build/src/configuration.js +8 -2
- 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 +16 -0
- package/build/src/database/drivers/base.d.ts.map +1 -1
- package/build/src/database/drivers/base.js +24 -1
- package/build/src/database/drivers/mssql/index.d.ts +5 -0
- package/build/src/database/drivers/mssql/index.d.ts.map +1 -1
- package/build/src/database/drivers/mssql/index.js +9 -1
- package/build/src/database/drivers/mysql/index.d.ts +5 -0
- package/build/src/database/drivers/mysql/index.d.ts.map +1 -1
- package/build/src/database/drivers/mysql/index.js +9 -1
- package/build/src/database/drivers/pgsql/index.d.ts +5 -0
- package/build/src/database/drivers/pgsql/index.d.ts.map +1 -1
- package/build/src/database/drivers/pgsql/index.js +9 -1
- 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 +12 -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/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 +25 -17
- package/build/tenants/default-tenant-database-provisioning.js +26 -20
- package/package.json +3 -2
- package/scripts/verify-dependency-refs.js +14 -0
- package/src/background-jobs/adapter.js +13 -1
- package/src/background-jobs/local-store.js +10 -16
- package/src/background-jobs/main.js +65 -2
- package/src/background-jobs/queue-priority-order.js +96 -0
- package/src/background-jobs/store.js +138 -29
- package/src/background-jobs/types.js +10 -0
- package/src/configuration-types.js +9 -0
- package/src/configuration.js +7 -1
- package/src/database/database-name.js +25 -0
- package/src/database/drivers/base.js +26 -0
- package/src/database/drivers/mssql/index.js +10 -0
- package/src/database/drivers/mysql/index.js +10 -0
- package/src/database/drivers/pgsql/index.js +10 -0
- package/src/database/drivers/sqlite/base.js +13 -0
- package/src/database/query/model-class-query.js +85 -0
- package/src/database/record/index.js +33 -0
- package/src/tenants/default-tenant-database-provisioning.js +26 -20
|
@@ -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,8 +12,8 @@
|
|
|
12
12
|
* connect to the configured maintenance database (`useDatabase`) and run the
|
|
13
13
|
* driver's own `createDatabaseSql`/`dropDatabaseSql`.
|
|
14
14
|
*/
|
|
15
|
+
import { safeDatabaseName } from "../database/database-name.js";
|
|
15
16
|
import PoolBase from "../database/pool/base.js";
|
|
16
|
-
const SAFE_TENANT_DATABASE_NAME = /^[a-z0-9_]+$/;
|
|
17
17
|
/**
|
|
18
18
|
* Whether the driver stores each database as a local file instead of on a server.
|
|
19
19
|
* @param {import("../configuration-types.js").DatabaseConfigurationType} databaseConfiguration - Resolved tenant database configuration.
|
|
@@ -29,11 +29,7 @@ function fileBackedDriver(databaseConfiguration) {
|
|
|
29
29
|
* @returns {string} - The validated tenant database name.
|
|
30
30
|
*/
|
|
31
31
|
function guardedDatabaseName(databaseConfiguration) {
|
|
32
|
-
|
|
33
|
-
if (!databaseName || !SAFE_TENANT_DATABASE_NAME.test(databaseName)) {
|
|
34
|
-
throw new Error(`Unsafe tenant database name: ${databaseName}`);
|
|
35
|
-
}
|
|
36
|
-
return databaseName;
|
|
32
|
+
return safeDatabaseName(databaseConfiguration.database, "tenant database provisioning");
|
|
37
33
|
}
|
|
38
34
|
/**
|
|
39
35
|
* Opens a driver connected to the server's maintenance database (`useDatabase`),
|
|
@@ -82,20 +78,20 @@ export async function createTenantDatabase({ configuration, databaseConfiguratio
|
|
|
82
78
|
}
|
|
83
79
|
}
|
|
84
80
|
/**
|
|
85
|
-
* Drops
|
|
86
|
-
*
|
|
87
|
-
*
|
|
88
|
-
*
|
|
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.
|
|
89
88
|
*/
|
|
90
|
-
export async function
|
|
91
|
-
|
|
92
|
-
return;
|
|
93
|
-
}
|
|
94
|
-
const databaseName = guardedDatabaseName(databaseConfiguration);
|
|
89
|
+
export async function dropDatabaseByName({ configuration, databaseConfiguration, databaseName }) {
|
|
90
|
+
const guardedName = safeDatabaseName(databaseName, "dropDatabase");
|
|
95
91
|
const connection = maintenanceConnection(databaseConfiguration, configuration);
|
|
96
92
|
await connection.connect();
|
|
97
93
|
try {
|
|
98
|
-
const sqls = connection.dropDatabaseSql(
|
|
94
|
+
const sqls = connection.dropDatabaseSql(guardedName, { ifExists: true });
|
|
99
95
|
for (const sql of sqls) {
|
|
100
96
|
await connection.query(sql);
|
|
101
97
|
}
|
|
@@ -103,10 +99,22 @@ export async function dropTenantDatabase({ configuration, databaseConfiguration
|
|
|
103
99
|
finally {
|
|
104
100
|
await connection.close();
|
|
105
101
|
}
|
|
102
|
+
}
|
|
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 });
|
|
106
114
|
// The DROP DATABASE ran on the maintenance connection, so the dropped tenant's
|
|
107
115
|
// own shared schema-metadata cache was never invalidated by the DDL path. Clear
|
|
108
116
|
// it explicitly: recreating the tenant database later must re-introspect, not
|
|
109
117
|
// serve the dropped schema from the shared cache.
|
|
110
118
|
configuration.clearSchemaCachesForReuseKey(PoolBase.configurationReuseKey(databaseConfiguration));
|
|
111
119
|
}
|
|
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"]}
|
|
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,10 +14,9 @@
|
|
|
14
14
|
* driver's own `createDatabaseSql`/`dropDatabaseSql`.
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
|
+
import {safeDatabaseName} from "../database/database-name.js"
|
|
17
18
|
import PoolBase from "../database/pool/base.js"
|
|
18
19
|
|
|
19
|
-
const SAFE_TENANT_DATABASE_NAME = /^[a-z0-9_]+$/
|
|
20
|
-
|
|
21
20
|
/**
|
|
22
21
|
* Whether the driver stores each database as a local file instead of on a server.
|
|
23
22
|
* @param {import("../configuration-types.js").DatabaseConfigurationType} databaseConfiguration - Resolved tenant database configuration.
|
|
@@ -34,13 +33,7 @@ function fileBackedDriver(databaseConfiguration) {
|
|
|
34
33
|
* @returns {string} - The validated tenant database name.
|
|
35
34
|
*/
|
|
36
35
|
function guardedDatabaseName(databaseConfiguration) {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
if (!databaseName || !SAFE_TENANT_DATABASE_NAME.test(databaseName)) {
|
|
40
|
-
throw new Error(`Unsafe tenant database name: ${databaseName}`)
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
return databaseName
|
|
36
|
+
return safeDatabaseName(databaseConfiguration.database, "tenant database provisioning")
|
|
44
37
|
}
|
|
45
38
|
|
|
46
39
|
/**
|
|
@@ -99,23 +92,22 @@ export async function createTenantDatabase({configuration, databaseConfiguration
|
|
|
99
92
|
}
|
|
100
93
|
|
|
101
94
|
/**
|
|
102
|
-
* Drops
|
|
103
|
-
*
|
|
104
|
-
*
|
|
105
|
-
*
|
|
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.
|
|
106
102
|
*/
|
|
107
|
-
export async function
|
|
108
|
-
|
|
109
|
-
return
|
|
110
|
-
}
|
|
111
|
-
|
|
112
|
-
const databaseName = guardedDatabaseName(databaseConfiguration)
|
|
103
|
+
export async function dropDatabaseByName({configuration, databaseConfiguration, databaseName}) {
|
|
104
|
+
const guardedName = safeDatabaseName(databaseName, "dropDatabase")
|
|
113
105
|
const connection = maintenanceConnection(databaseConfiguration, configuration)
|
|
114
106
|
|
|
115
107
|
await connection.connect()
|
|
116
108
|
|
|
117
109
|
try {
|
|
118
|
-
const sqls = connection.dropDatabaseSql(
|
|
110
|
+
const sqls = connection.dropDatabaseSql(guardedName, {ifExists: true})
|
|
119
111
|
|
|
120
112
|
for (const sql of sqls) {
|
|
121
113
|
await connection.query(sql)
|
|
@@ -123,6 +115,20 @@ export async function dropTenantDatabase({configuration, databaseConfiguration})
|
|
|
123
115
|
} finally {
|
|
124
116
|
await connection.close()
|
|
125
117
|
}
|
|
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})
|
|
126
132
|
|
|
127
133
|
// The DROP DATABASE ran on the maintenance connection, so the dropped tenant's
|
|
128
134
|
// own shared schema-metadata cache was never invalidated by the DDL path. Clear
|
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.730",
|
|
7
7
|
"main": "build/index.js",
|
|
8
8
|
"types": "build/index.d.ts",
|
|
9
9
|
"files": [
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"fallow": "fallow dead-code --baseline fallow-baselines/dead-code.json --fail-on-issues --quiet && fallow dupes --baseline fallow-baselines/dupes.json --fail-on-issues --quiet && fallow health --baseline fallow-baselines/health.json --report-only --quiet",
|
|
39
39
|
"fallow:baseline": "fallow dead-code --save-baseline fallow-baselines/dead-code.json && fallow dupes --save-baseline fallow-baselines/dupes.json && fallow health --save-baseline fallow-baselines/health.json",
|
|
40
40
|
"eslint": "eslint --max-warnings 0",
|
|
41
|
-
"lint": "npm run eslint && npm run typecheck && npm run fallow",
|
|
41
|
+
"lint": "npm run verify:dependency-refs && npm run eslint && npm run typecheck && npm run fallow",
|
|
42
42
|
"prepack": "npm run build",
|
|
43
43
|
"release:patch": "release-patch",
|
|
44
44
|
"test": "node scripts/run-tests.js",
|
|
@@ -46,6 +46,7 @@
|
|
|
46
46
|
"test:expo": "npm run build && npm ci --prefix examples/expo && npm run export --prefix examples/expo && npm run test:dist --prefix examples/expo",
|
|
47
47
|
"typecheck": "tsc --noEmit",
|
|
48
48
|
"velocious": "asd",
|
|
49
|
+
"verify:dependency-refs": "node scripts/verify-dependency-refs.js",
|
|
49
50
|
"verify:docker-dev-environment": "node scripts/verify-docker-dev-environment.js",
|
|
50
51
|
"watch": "tsc -w",
|
|
51
52
|
"watch:ejs": "chokidar \"src/**/*.ejs\" -c \"npm run copy:ejs\""
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import {readFile} from "node:fs/promises";
|
|
2
|
+
|
|
3
|
+
const files = ["package.json", "package-lock.json"];
|
|
4
|
+
const floatingArchivePattern = /archive\/refs\/heads\//;
|
|
5
|
+
|
|
6
|
+
for (const file of files) {
|
|
7
|
+
const contents = await readFile(file, "utf8");
|
|
8
|
+
|
|
9
|
+
if (floatingArchivePattern.test(contents)) {
|
|
10
|
+
throw new Error(`${file} contains a floating branch archive dependency reference`);
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
console.log("Dependency archive references are immutable.");
|
|
@@ -65,6 +65,18 @@ export default class BackgroundJobsAdapter {
|
|
|
65
65
|
return {candidateCount: 0, checkedCount: 0, repairedCount: 0, repairs: [], repairsTruncatedCount: 0}
|
|
66
66
|
}
|
|
67
67
|
|
|
68
|
+
/**
|
|
69
|
+
* Reports dispatch state per queue: eligible backlog depth, the oldest eligible
|
|
70
|
+
* schedule, and claims observed in the window. Adapters that cannot observe the
|
|
71
|
+
* claim loop keep this empty result.
|
|
72
|
+
* @param {object} [_args] - Options.
|
|
73
|
+
* @param {number} [_args.nowMs] - Observation instant.
|
|
74
|
+
* @param {number} [_args.starvationThresholdMs] - Age past which an unclaimed backlog is starved.
|
|
75
|
+
* @param {number} [_args.windowMs] - Claim observation window.
|
|
76
|
+
* @returns {Promise<import("./types.js").BackgroundJobLaneDiagnostics[]>} - One row per observed queue.
|
|
77
|
+
*/
|
|
78
|
+
async readQueueDispatchDiagnostics(_args = {}) { return [] }
|
|
79
|
+
|
|
68
80
|
/**
|
|
69
81
|
* Enqueues a job.
|
|
70
82
|
* @param {{jobName: string, args: Array<ReturnType<typeof JSON.parse>>, options?: import("./types.js").BackgroundJobOptions}} _args - Job request.
|
|
@@ -208,7 +220,7 @@ export default class BackgroundJobsAdapter {
|
|
|
208
220
|
|
|
209
221
|
/**
|
|
210
222
|
* Marks a handed-off job failed or retryable.
|
|
211
|
-
* @param {{jobId: string, error: ReturnType<typeof JSON.parse>, handoffId?: string, workerId?: string, handedOffAtMs?: number}} _args - Failure report.
|
|
223
|
+
* @param {{jobId: string, error: ReturnType<typeof JSON.parse>, handoffId?: string, workerId?: string, handedOffAtMs?: number, runnerFailure?: import("./types.js").PooledRunnerFailure}} _args - Failure report.
|
|
212
224
|
* @returns {Promise<import("./types.js").BackgroundJobRow | null>} - Updated job when accepted.
|
|
213
225
|
*/
|
|
214
226
|
async markFailed(_args) { throw new Error("BackgroundJobsAdapter#markFailed is not implemented") }
|
|
@@ -21,6 +21,7 @@ import {
|
|
|
21
21
|
rescheduledBackgroundJobAtMs,
|
|
22
22
|
retryDelayMs
|
|
23
23
|
} from "./job-semantics.js"
|
|
24
|
+
import {buildQueuePriorityOrderSql} from "./queue-priority-order.js"
|
|
24
25
|
|
|
25
26
|
export const LOCAL_BACKGROUND_JOBS_TABLE = "velocious_local_background_jobs"
|
|
26
27
|
export const LOCAL_BACKGROUND_JOB_CONCURRENCY_TABLE = "velocious_local_background_job_concurrency"
|
|
@@ -896,14 +897,15 @@ export default class LocalBackgroundJobsStore {
|
|
|
896
897
|
await this.ensureReady()
|
|
897
898
|
|
|
898
899
|
return await this._withDb(async (db) => {
|
|
900
|
+
const nowMs = this.clock.now()
|
|
899
901
|
const jobsTable = db.quoteTable(LOCAL_BACKGROUND_JOBS_TABLE)
|
|
900
902
|
const concurrencyTable = db.quoteTable(LOCAL_BACKGROUND_JOB_CONCURRENCY_TABLE)
|
|
901
|
-
const priorityOrder = this._queuePriorityOrderSql(db)
|
|
903
|
+
const priorityOrder = this._queuePriorityOrderSql(db, nowMs)
|
|
902
904
|
let query = db
|
|
903
905
|
.newQuery()
|
|
904
906
|
.from(LOCAL_BACKGROUND_JOBS_TABLE)
|
|
905
907
|
.where({status: "queued"})
|
|
906
|
-
.where(`scheduled_at_ms <= ${db.quote(
|
|
908
|
+
.where(`scheduled_at_ms <= ${db.quote(nowMs)}`)
|
|
907
909
|
.where(
|
|
908
910
|
`(${jobsTable}.${db.quoteColumn("concurrency_key")} IS NULL OR EXISTS (` +
|
|
909
911
|
`SELECT 1 FROM ${concurrencyTable} WHERE ` +
|
|
@@ -1399,23 +1401,15 @@ export default class LocalBackgroundJobsStore {
|
|
|
1399
1401
|
}
|
|
1400
1402
|
|
|
1401
1403
|
/**
|
|
1402
|
-
* Builds the configured queue-priority ordering expression
|
|
1404
|
+
* Builds the configured queue-priority ordering expression, including the eligible-wait
|
|
1405
|
+
* aging term that keeps a low-priority lane reachable. See
|
|
1406
|
+
* {@link buildQueuePriorityOrderSql} for the ranking contract.
|
|
1403
1407
|
* @param {import("../database/drivers/base.js").default} db - Connection.
|
|
1408
|
+
* @param {number} nowMs - Dispatch instant.
|
|
1404
1409
|
* @returns {string | null} - Queue priority expression.
|
|
1405
1410
|
*/
|
|
1406
|
-
_queuePriorityOrderSql(db) {
|
|
1407
|
-
|
|
1408
|
-
const prioritized = Object.entries(queues)
|
|
1409
|
-
.filter(([, queue]) => Number.isFinite(queue?.priority) && Number(queue.priority) !== 0)
|
|
1410
|
-
.map(([queueName, queue]) => [queueName, Number(queue.priority)])
|
|
1411
|
-
|
|
1412
|
-
if (prioritized.length === 0) return null
|
|
1413
|
-
|
|
1414
|
-
const whens = prioritized
|
|
1415
|
-
.map(([queue, priority]) => `WHEN ${db.quote(queue)} THEN ${priority}`)
|
|
1416
|
-
.join(" ")
|
|
1417
|
-
|
|
1418
|
-
return `CASE COALESCE(${db.quoteColumn("queue")}, ${db.quote(DEFAULT_BACKGROUND_JOB_QUEUE)}) ${whens} ELSE 0 END`
|
|
1411
|
+
_queuePriorityOrderSql(db, nowMs) {
|
|
1412
|
+
return buildQueuePriorityOrderSql({configuration: this.configuration, db, nowMs})
|
|
1419
1413
|
}
|
|
1420
1414
|
|
|
1421
1415
|
/**
|
|
@@ -173,6 +173,11 @@ export default class BackgroundJobsMain {
|
|
|
173
173
|
* Active durable handoffs keyed by the exact worker socket that received them.
|
|
174
174
|
* @type {Map<JsonSocket, Map<string, string>>} */
|
|
175
175
|
this.workerHandoffs = new Map()
|
|
176
|
+
/**
|
|
177
|
+
* Lane names already reported as queued-but-unclaimed, so an ongoing starvation is
|
|
178
|
+
* named once per lane rather than on every maintenance pass.
|
|
179
|
+
* @type {Set<string>} */
|
|
180
|
+
this._reportedStarvedLanes = new Set()
|
|
176
181
|
/**
|
|
177
182
|
* Exact caller-generated leases whose claim outcome was ambiguous or whose
|
|
178
183
|
* pre-dispatch release has not yet been acknowledged. Retained until a
|
|
@@ -2006,7 +2011,8 @@ export default class BackgroundJobsMain {
|
|
|
2006
2011
|
error: message.error,
|
|
2007
2012
|
handoffId: message.handoffId,
|
|
2008
2013
|
workerId: message.workerId,
|
|
2009
|
-
handedOffAtMs: message.handedOffAtMs
|
|
2014
|
+
handedOffAtMs: message.handedOffAtMs,
|
|
2015
|
+
runnerFailure: message.runnerFailure
|
|
2010
2016
|
})
|
|
2011
2017
|
|
|
2012
2018
|
if (failedJob) {
|
|
@@ -2748,7 +2754,64 @@ export default class BackgroundJobsMain {
|
|
|
2748
2754
|
errorEvents.emit("all-error", {...payload, errorType: "framework-error"})
|
|
2749
2755
|
}
|
|
2750
2756
|
|
|
2751
|
-
if (this.lifecycleState === "active")
|
|
2757
|
+
if (this.lifecycleState === "active") {
|
|
2758
|
+
await this._reconcileActiveConcurrency()
|
|
2759
|
+
await this._reportStarvedLanes()
|
|
2760
|
+
}
|
|
2761
|
+
}
|
|
2762
|
+
|
|
2763
|
+
/**
|
|
2764
|
+
* Names a lane that has eligible queued work but is not being claimed for it, on the
|
|
2765
|
+
* active main's existing maintenance cadence. A lane whose oldest eligible row waits past
|
|
2766
|
+
* the starvation threshold while claiming nothing in the observation window is not merely
|
|
2767
|
+
* deep — it is not being reached, and until now the only evidence was a backlog that kept
|
|
2768
|
+
* growing. Reports are edge-triggered per lane: one report when a lane enters the state,
|
|
2769
|
+
* none while it stays in it, and the lane is eligible to report again once it recovers.
|
|
2770
|
+
* This reads and reports only; it never dispatches, re-enqueues, or drains anything.
|
|
2771
|
+
* @returns {Promise<void>} - Resolves after the observation and any new report.
|
|
2772
|
+
*/
|
|
2773
|
+
async _reportStarvedLanes() {
|
|
2774
|
+
try {
|
|
2775
|
+
const lanes = await this.store.readQueueDispatchDiagnostics()
|
|
2776
|
+
const starvedLanes = lanes.filter((lane) => lane.starved)
|
|
2777
|
+
const reportedLanes = this._reportedStarvedLanes
|
|
2778
|
+
const newlyStarvedLanes = starvedLanes.filter((lane) => !reportedLanes.has(lane.queue))
|
|
2779
|
+
|
|
2780
|
+
for (const lane of starvedLanes) reportedLanes.add(lane.queue)
|
|
2781
|
+
|
|
2782
|
+
const currentLaneNames = new Set(starvedLanes.map((lane) => lane.queue))
|
|
2783
|
+
|
|
2784
|
+
for (const laneName of [...reportedLanes]) {
|
|
2785
|
+
if (!currentLaneNames.has(laneName)) reportedLanes.delete(laneName)
|
|
2786
|
+
}
|
|
2787
|
+
|
|
2788
|
+
if (newlyStarvedLanes.length === 0) return
|
|
2789
|
+
|
|
2790
|
+
const summary = newlyStarvedLanes.map((lane) => {
|
|
2791
|
+
const oldestIso = lane.oldestScheduledAtMs === null ? "unknown" : new Date(lane.oldestScheduledAtMs).toISOString()
|
|
2792
|
+
|
|
2793
|
+
return `${lane.queue}: ${lane.backlogDepth} queued, oldest eligible ${oldestIso}, 0 claims`
|
|
2794
|
+
})
|
|
2795
|
+
|
|
2796
|
+
this.logger.warn(() => ["Background-jobs lanes queued but unclaimed:", summary.join("; ")])
|
|
2797
|
+
|
|
2798
|
+
const payload = {
|
|
2799
|
+
context: {generationId: this.generationId, stage: "background-jobs-lane-starvation", starvedLanes: newlyStarvedLanes},
|
|
2800
|
+
error: new Error(`Background-jobs lane starvation: ${summary.join("; ")}`)
|
|
2801
|
+
}
|
|
2802
|
+
const errorEvents = this.configuration.getErrorEvents()
|
|
2803
|
+
|
|
2804
|
+
errorEvents.emit("framework-error", payload)
|
|
2805
|
+
errorEvents.emit("all-error", {...payload, errorType: "framework-error"})
|
|
2806
|
+
} catch (error) {
|
|
2807
|
+
const normalizedError = error instanceof Error ? error : new Error(String(error))
|
|
2808
|
+
const payload = {context: {generationId: this.generationId, stage: "background-jobs-lane-starvation-read"}, error: normalizedError}
|
|
2809
|
+
const errorEvents = this.configuration.getErrorEvents()
|
|
2810
|
+
|
|
2811
|
+
this.logger.error(() => ["Failed to read background job lane diagnostics:", normalizedError])
|
|
2812
|
+
errorEvents.emit("framework-error", payload)
|
|
2813
|
+
errorEvents.emit("all-error", {...payload, errorType: "framework-error"})
|
|
2814
|
+
}
|
|
2752
2815
|
}
|
|
2753
2816
|
|
|
2754
2817
|
/**
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
// @ts-check
|
|
2
|
+
|
|
3
|
+
import {DEFAULT_BACKGROUND_JOB_QUEUE} from "./job-semantics.js"
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* How many milliseconds of eligible waiting cancel one unit of `queues[name].priority`.
|
|
7
|
+
* `1` priority unit buys this much queue-jumping: with the default, a lane ranked 10 points
|
|
8
|
+
* below another is overtaken once the lower lane has an eligible job that has been waiting
|
|
9
|
+
* 10 minutes. Time is the only condition — nothing here runs on a cadence, and a lane that
|
|
10
|
+
* is dispatched normally never ages far enough for the term to matter.
|
|
11
|
+
*/
|
|
12
|
+
export const DEFAULT_QUEUE_PRIORITY_AGING_UNIT_MS = 60000
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* Normalizes `backgroundJobs.queuePriorityAgingUnitMs`. Invalid values fall back to the
|
|
16
|
+
* default; `null` opts out and restores the strict queue-priority ordering.
|
|
17
|
+
* @param {unknown} value - Configured value.
|
|
18
|
+
* @returns {number | null} - Milliseconds per priority unit, or null when aging is disabled.
|
|
19
|
+
*/
|
|
20
|
+
export function normalizeQueuePriorityAgingUnitMs(value) {
|
|
21
|
+
if (value === null) return null
|
|
22
|
+
if (value === undefined) return DEFAULT_QUEUE_PRIORITY_AGING_UNIT_MS
|
|
23
|
+
if (!Number.isFinite(value) || Number(value) <= 0) return DEFAULT_QUEUE_PRIORITY_AGING_UNIT_MS
|
|
24
|
+
|
|
25
|
+
return Number(value)
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* Reads the configured aging unit.
|
|
30
|
+
* @param {import("../configuration.js").default} configuration - Active configuration.
|
|
31
|
+
* @returns {number | null} - Milliseconds per priority unit, or null when aging is disabled.
|
|
32
|
+
*/
|
|
33
|
+
export function queuePriorityAgingUnitMs(configuration) {
|
|
34
|
+
return normalizeQueuePriorityAgingUnitMs(configuration.getBackgroundJobsConfig().queuePriorityAgingUnitMs)
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
/**
|
|
38
|
+
* Builds the dispatch ranking expression for the queued-job claim.
|
|
39
|
+
*
|
|
40
|
+
* `queues[name].priority` alone is a strict global order: the claim takes one job per cycle,
|
|
41
|
+
* so a lane only gets dispatched when every higher-priority lane is empty or already at its
|
|
42
|
+
* own `maxConcurrent` cap. A lane whose cap is far above what the fleet can actually run —
|
|
43
|
+
* a `builds` lane capped at 200 that never holds more than a dozen runners — is therefore
|
|
44
|
+
* never skipped, and every lane below it receives zero claims for as long as it stays
|
|
45
|
+
* non-empty.
|
|
46
|
+
*
|
|
47
|
+
* Aging adds the row's own eligible wait, scaled by the priority unit, and caps that wait per
|
|
48
|
+
* lane at the gap between the lane and the highest configured priority plus one unit. The cap
|
|
49
|
+
* is per lane so every lane converges on the same ceiling — `(highest priority + 1) × unitMs`
|
|
50
|
+
* — which is strictly above every row that has not aged to the ceiling. Below the ceiling the
|
|
51
|
+
* configured priority order is unchanged: a lane cancels exactly its own priority gap by
|
|
52
|
+
* waiting, and a lane can never outrank a lane that is itself still below the ceiling. At the
|
|
53
|
+
* ceiling all lanes are equal, so the claim falls back to `scheduled_at_ms` and the oldest
|
|
54
|
+
* overdue row is taken first.
|
|
55
|
+
*
|
|
56
|
+
* Starvation bound for a lane: it reaches the ceiling after
|
|
57
|
+
* `(highest configured priority - its own priority + 1) × unitMs` of eligible waiting, and at
|
|
58
|
+
* the ceiling it competes for the claim position on age alone.
|
|
59
|
+
* @param {object} args - Options.
|
|
60
|
+
* @param {import("../configuration.js").default} args.configuration - Active configuration.
|
|
61
|
+
* @param {import("../database/drivers/base.js").default} args.db - Connection.
|
|
62
|
+
* @param {number} args.nowMs - Dispatch instant.
|
|
63
|
+
* @returns {string | null} - Raw SQL rank expression, or null when no queue is prioritized.
|
|
64
|
+
*/
|
|
65
|
+
export function buildQueuePriorityOrderSql({configuration, db, nowMs}) {
|
|
66
|
+
const queues = configuration.getBackgroundJobsConfig().queues || {}
|
|
67
|
+
/** @type {Array<[string, number]>} */
|
|
68
|
+
const prioritized = []
|
|
69
|
+
let highestPriority = 0
|
|
70
|
+
|
|
71
|
+
for (const [queue, queueConfig] of Object.entries(queues)) {
|
|
72
|
+
const priority = queueConfig?.priority
|
|
73
|
+
|
|
74
|
+
if (!Number.isFinite(priority)) continue
|
|
75
|
+
|
|
76
|
+
if (Number(priority) !== 0) prioritized.push([queue, Number(priority)])
|
|
77
|
+
|
|
78
|
+
highestPriority = Math.max(highestPriority, Number(priority))
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
if (prioritized.length === 0) return null
|
|
82
|
+
|
|
83
|
+
const queueExpression = `COALESCE(${db.quoteColumn("queue")}, ${db.quote(DEFAULT_BACKGROUND_JOB_QUEUE)})`
|
|
84
|
+
const priorityRank = `CASE ${queueExpression} ${prioritized.map(([queue, priority]) => `WHEN ${db.quote(queue)} THEN ${priority}`).join(" ")} ELSE 0 END`
|
|
85
|
+
const unitMs = queuePriorityAgingUnitMs(configuration)
|
|
86
|
+
|
|
87
|
+
if (unitMs === null) return priorityRank
|
|
88
|
+
|
|
89
|
+
const highestCeilingMs = (highestPriority + 1) * unitMs
|
|
90
|
+
const agingCap = `CASE ${queueExpression} ${prioritized.map(([queue, priority]) => `WHEN ${db.quote(queue)} THEN ${(highestPriority - priority + 1) * unitMs}`).join(" ")} ELSE ${highestCeilingMs} END`
|
|
91
|
+
const scheduledAtColumn = db.quoteColumn("scheduled_at_ms")
|
|
92
|
+
|
|
93
|
+
return `(${priorityRank} * ${unitMs} + ` +
|
|
94
|
+
`CASE WHEN ${scheduledAtColumn} <= (${db.quote(nowMs)} - ${agingCap}) THEN ${agingCap} ` +
|
|
95
|
+
`ELSE (${db.quote(nowMs)} - ${scheduledAtColumn}) END)`
|
|
96
|
+
}
|