velocious 1.0.675 → 1.0.677
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 +4 -4
- package/build/background-jobs/pooled-runner-child.js +87 -5
- package/build/background-jobs/pooled-runner-shutdown.js +55 -0
- package/build/background-jobs/types.js +24 -2
- package/build/background-jobs/worker.js +182 -36
- package/build/src/background-jobs/pooled-runner-child.js +87 -7
- package/build/src/background-jobs/pooled-runner-shutdown.d.ts +26 -0
- package/build/src/background-jobs/pooled-runner-shutdown.d.ts.map +1 -0
- package/build/src/background-jobs/pooled-runner-shutdown.js +49 -0
- package/build/src/background-jobs/types.d.ts +84 -3
- package/build/src/background-jobs/types.d.ts.map +1 -1
- package/build/src/background-jobs/types.js +25 -3
- package/build/src/background-jobs/worker.d.ts +54 -4
- package/build/src/background-jobs/worker.d.ts.map +1 -1
- package/build/src/background-jobs/worker.js +191 -39
- package/build/src/testing/browser-frontend-tenant-database-scenarios.d.ts +11 -0
- package/build/src/testing/browser-frontend-tenant-database-scenarios.d.ts.map +1 -0
- package/build/src/testing/browser-frontend-tenant-database-scenarios.js +147 -0
- package/build/src/testing/browser-test-app.js +3 -1
- package/build/testing/browser-frontend-tenant-database-scenarios.js +158 -0
- package/build/testing/browser-test-app.js +2 -0
- package/package.json +1 -1
- package/scripts/test-browser.js +5 -0
- package/src/background-jobs/pooled-runner-child.js +87 -5
- package/src/background-jobs/pooled-runner-shutdown.js +55 -0
- package/src/background-jobs/types.js +24 -2
- package/src/background-jobs/worker.js +182 -36
- package/src/testing/browser-frontend-tenant-database-scenarios.js +158 -0
- package/src/testing/browser-test-app.js +2 -0
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Exercises two durable physical tenant databases inside the real browser.
|
|
3
|
+
* @returns {Promise<{alphaNames: ReturnType<typeof JSON.parse>[], betaNames: ReturnType<typeof JSON.parse>[], identitiesAreDistinct: boolean, openCount: number}>} Serializable proof result.
|
|
4
|
+
*/
|
|
5
|
+
export default function runFrontendTenantDatabasePersistenceScenario(): Promise<{
|
|
6
|
+
alphaNames: ReturnType<typeof JSON.parse>[];
|
|
7
|
+
betaNames: ReturnType<typeof JSON.parse>[];
|
|
8
|
+
identitiesAreDistinct: boolean;
|
|
9
|
+
openCount: number;
|
|
10
|
+
}>;
|
|
11
|
+
//# sourceMappingURL=browser-frontend-tenant-database-scenarios.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browser-frontend-tenant-database-scenarios.d.ts","sourceRoot":"","sources":["../../../src/testing/browser-frontend-tenant-database-scenarios.js"],"names":[],"mappings":"AAiEA;;;GAGG;AACH,wBAA8B,4CAA4C,IAF7D,OAAO,CAAC;IAAC,UAAU,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IAAC,SAAS,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IAAC,qBAAqB,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,CAAC,CA0FjK"}
|
|
@@ -0,0 +1,147 @@
|
|
|
1
|
+
// @ts-check
|
|
2
|
+
import Configuration, { CurrentConfigurationNotSetError } from "../configuration.js";
|
|
3
|
+
import DatabaseRecord from "../database/record/index.js";
|
|
4
|
+
import BrowserEnvironmentHandler from "../environment-handlers/browser.js";
|
|
5
|
+
import Migration from "../database/migration/index.js";
|
|
6
|
+
import SingleMultiUsePool from "../database/pool/single-multi-use.js";
|
|
7
|
+
import SqliteWebDriver from "../database/drivers/sqlite/index.web.js";
|
|
8
|
+
import Tenant from "../tenants/tenant.js";
|
|
9
|
+
const DATABASE_IDENTIFIER = "projectTenant";
|
|
10
|
+
const SCHEMA_GENERATION = "frontend-tenant-browser-persistence-1";
|
|
11
|
+
/**
|
|
12
|
+
* Returns the current configuration without requiring one to exist.
|
|
13
|
+
* @returns {Configuration | undefined} Current configuration when installed.
|
|
14
|
+
*/
|
|
15
|
+
function currentConfigurationOrUndefined() {
|
|
16
|
+
try {
|
|
17
|
+
return Configuration.current();
|
|
18
|
+
}
|
|
19
|
+
catch (error) {
|
|
20
|
+
if (!(error instanceof CurrentConfigurationNotSetError))
|
|
21
|
+
throw error;
|
|
22
|
+
return undefined;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* Builds the real browser-backed two-project configuration.
|
|
27
|
+
* @returns {Configuration} Browser tenant configuration.
|
|
28
|
+
*/
|
|
29
|
+
function buildConfiguration() {
|
|
30
|
+
return new Configuration({
|
|
31
|
+
database: {
|
|
32
|
+
test: {
|
|
33
|
+
projectTenant: {
|
|
34
|
+
driver: SqliteWebDriver,
|
|
35
|
+
locateFile: () => "/sql-wasm.wasm",
|
|
36
|
+
migrations: true,
|
|
37
|
+
name: "velocious-browser-project-proof-template",
|
|
38
|
+
poolType: SingleMultiUsePool,
|
|
39
|
+
tenantOnly: true,
|
|
40
|
+
type: "sqlite"
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
},
|
|
44
|
+
directory: "/frontend-tenant-browser-persistence-scenario",
|
|
45
|
+
environment: "test",
|
|
46
|
+
environmentHandler: new BrowserEnvironmentHandler(),
|
|
47
|
+
frontendTenantSqlite: { maxOpenHandles: 2 },
|
|
48
|
+
initializeModels: async () => { },
|
|
49
|
+
locale: "en",
|
|
50
|
+
localeFallbacks: { en: ["en"] },
|
|
51
|
+
locales: ["en"],
|
|
52
|
+
tenantDatabaseResolver: ({ identifier, tenant }) => {
|
|
53
|
+
if (identifier !== DATABASE_IDENTIFIER || !tenant || typeof tenant !== "object")
|
|
54
|
+
return;
|
|
55
|
+
const projectSlug = /** @type {{projectSlug?: string}} */ (tenant).projectSlug;
|
|
56
|
+
if (projectSlug !== "alpha" && projectSlug !== "beta")
|
|
57
|
+
return;
|
|
58
|
+
return { name: `velocious-browser-project-proof-${projectSlug}` };
|
|
59
|
+
}
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* Exercises two durable physical tenant databases inside the real browser.
|
|
64
|
+
* @returns {Promise<{alphaNames: ReturnType<typeof JSON.parse>[], betaNames: ReturnType<typeof JSON.parse>[], identitiesAreDistinct: boolean, openCount: number}>} Serializable proof result.
|
|
65
|
+
*/
|
|
66
|
+
export default async function runFrontendTenantDatabasePersistenceScenario() {
|
|
67
|
+
const previousConfiguration = currentConfigurationOrUndefined();
|
|
68
|
+
const configuration = buildConfiguration();
|
|
69
|
+
class BrowserProjectRecord extends DatabaseRecord {
|
|
70
|
+
}
|
|
71
|
+
class CreateBrowserProjectRecords extends Migration {
|
|
72
|
+
async up() {
|
|
73
|
+
await this.execute("CREATE TABLE browser_project_records(id integer PRIMARY KEY AUTOINCREMENT, name varchar(255) NOT NULL)");
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
BrowserProjectRecord.setTableName("browser_project_records");
|
|
77
|
+
BrowserProjectRecord.switchesTenantDatabase(DATABASE_IDENTIFIER);
|
|
78
|
+
BrowserProjectRecord.registerRecordClass({ configuration });
|
|
79
|
+
CreateBrowserProjectRecords.onDatabases([DATABASE_IDENTIFIER]);
|
|
80
|
+
const migrationFile = "20260919090000-create-browser-project-records.js";
|
|
81
|
+
/**
|
|
82
|
+
* Loads the one migration bundled into this browser proof.
|
|
83
|
+
* @type {import("../database/migrator/types.js").RequireMigrationContextType}
|
|
84
|
+
*/
|
|
85
|
+
const migrations = (fileName) => {
|
|
86
|
+
if (fileName !== migrationFile)
|
|
87
|
+
throw new Error(`Unknown browser tenant proof migration: ${fileName}`);
|
|
88
|
+
return { default: CreateBrowserProjectRecords };
|
|
89
|
+
};
|
|
90
|
+
migrations.keys = () => [migrationFile];
|
|
91
|
+
migrations.id = "frontend-tenant-browser-persistence-scenario";
|
|
92
|
+
const alpha = Tenant.handle({ projectSlug: "alpha" }, configuration);
|
|
93
|
+
const beta = Tenant.handle({ projectSlug: "beta" }, configuration);
|
|
94
|
+
configuration.setCurrent();
|
|
95
|
+
try {
|
|
96
|
+
await Promise.all([
|
|
97
|
+
alpha.delete({ databaseIdentifier: DATABASE_IDENTIFIER }),
|
|
98
|
+
beta.delete({ databaseIdentifier: DATABASE_IDENTIFIER })
|
|
99
|
+
]);
|
|
100
|
+
await Promise.all([
|
|
101
|
+
alpha.initialize({ databaseIdentifier: DATABASE_IDENTIFIER, migrations, schemaGeneration: SCHEMA_GENERATION }),
|
|
102
|
+
beta.initialize({ databaseIdentifier: DATABASE_IDENTIFIER, migrations, schemaGeneration: SCHEMA_GENERATION })
|
|
103
|
+
]);
|
|
104
|
+
for (let index = 0; index < 12; index++) {
|
|
105
|
+
await Promise.all([
|
|
106
|
+
alpha.databaseOperation({ databaseIdentifier: DATABASE_IDENTIFIER }, async (operation) => {
|
|
107
|
+
await operation.forModel(BrowserProjectRecord).create({ name: `alpha-${index}` });
|
|
108
|
+
}),
|
|
109
|
+
beta.databaseOperation({ databaseIdentifier: DATABASE_IDENTIFIER }, async (operation) => {
|
|
110
|
+
await operation.forModel(BrowserProjectRecord).create({ name: `beta-${index}` });
|
|
111
|
+
})
|
|
112
|
+
]);
|
|
113
|
+
}
|
|
114
|
+
await Promise.all([
|
|
115
|
+
alpha.close({ databaseIdentifier: DATABASE_IDENTIFIER, flush: true }),
|
|
116
|
+
beta.close({ databaseIdentifier: DATABASE_IDENTIFIER, flush: true })
|
|
117
|
+
]);
|
|
118
|
+
await Promise.all([
|
|
119
|
+
alpha.initialize({ databaseIdentifier: DATABASE_IDENTIFIER, migrations, schemaGeneration: SCHEMA_GENERATION }),
|
|
120
|
+
beta.initialize({ databaseIdentifier: DATABASE_IDENTIFIER, migrations, schemaGeneration: SCHEMA_GENERATION })
|
|
121
|
+
]);
|
|
122
|
+
const [alphaNames, betaNames] = await Promise.all([
|
|
123
|
+
alpha.databaseOperation({ databaseIdentifier: DATABASE_IDENTIFIER }, async (operation) => {
|
|
124
|
+
return await operation.forModel(BrowserProjectRecord).order("id").pluck("name");
|
|
125
|
+
}),
|
|
126
|
+
beta.databaseOperation({ databaseIdentifier: DATABASE_IDENTIFIER }, async (operation) => {
|
|
127
|
+
return await operation.forModel(BrowserProjectRecord).order("id").pluck("name");
|
|
128
|
+
})
|
|
129
|
+
]);
|
|
130
|
+
return {
|
|
131
|
+
alphaNames,
|
|
132
|
+
betaNames,
|
|
133
|
+
identitiesAreDistinct: alpha.databaseIdentity(DATABASE_IDENTIFIER) !== beta.databaseIdentity(DATABASE_IDENTIFIER),
|
|
134
|
+
openCount: configuration.inspectFrontendTenantSqliteHandles().openCount
|
|
135
|
+
};
|
|
136
|
+
}
|
|
137
|
+
finally {
|
|
138
|
+
await Promise.all([
|
|
139
|
+
alpha.delete({ databaseIdentifier: DATABASE_IDENTIFIER }),
|
|
140
|
+
beta.delete({ databaseIdentifier: DATABASE_IDENTIFIER })
|
|
141
|
+
]);
|
|
142
|
+
if (previousConfiguration)
|
|
143
|
+
previousConfiguration.setCurrent();
|
|
144
|
+
await configuration.closeDatabaseConnections();
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"browser-frontend-tenant-database-scenarios.js","sourceRoot":"","sources":["../../../src/testing/browser-frontend-tenant-database-scenarios.js"],"names":[],"mappings":"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","sourcesContent":["// @ts-check\n\nimport Configuration, { CurrentConfigurationNotSetError } from \"../configuration.js\"\nimport DatabaseRecord from \"../database/record/index.js\"\nimport BrowserEnvironmentHandler from \"../environment-handlers/browser.js\"\nimport Migration from \"../database/migration/index.js\"\nimport SingleMultiUsePool from \"../database/pool/single-multi-use.js\"\nimport SqliteWebDriver from \"../database/drivers/sqlite/index.web.js\"\nimport Tenant from \"../tenants/tenant.js\"\n\nconst DATABASE_IDENTIFIER = \"projectTenant\"\nconst SCHEMA_GENERATION = \"frontend-tenant-browser-persistence-1\"\n\n/**\n * Returns the current configuration without requiring one to exist.\n * @returns {Configuration | undefined} Current configuration when installed.\n */\nfunction currentConfigurationOrUndefined() {\n  try {\n    return Configuration.current()\n  } catch (error) {\n    if (!(error instanceof CurrentConfigurationNotSetError)) throw error\n\n    return undefined\n  }\n}\n\n/**\n * Builds the real browser-backed two-project configuration.\n * @returns {Configuration} Browser tenant configuration.\n */\nfunction buildConfiguration() {\n  return new Configuration({\n    database: {\n      test: {\n        projectTenant: {\n          driver: SqliteWebDriver,\n          locateFile: () => \"/sql-wasm.wasm\",\n          migrations: true,\n          name: \"velocious-browser-project-proof-template\",\n          poolType: SingleMultiUsePool,\n          tenantOnly: true,\n          type: \"sqlite\"\n        }\n      }\n    },\n    directory: \"/frontend-tenant-browser-persistence-scenario\",\n    environment: \"test\",\n    environmentHandler: new BrowserEnvironmentHandler(),\n    frontendTenantSqlite: {maxOpenHandles: 2},\n    initializeModels: async () => {},\n    locale: \"en\",\n    localeFallbacks: {en: [\"en\"]},\n    locales: [\"en\"],\n    tenantDatabaseResolver: ({identifier, tenant}) => {\n      if (identifier !== DATABASE_IDENTIFIER || !tenant || typeof tenant !== \"object\") return\n      const projectSlug = /** @type {{projectSlug?: string}} */ (tenant).projectSlug\n\n      if (projectSlug !== \"alpha\" && projectSlug !== \"beta\") return\n\n      return {name: `velocious-browser-project-proof-${projectSlug}`}\n    }\n  })\n}\n\n/**\n * Exercises two durable physical tenant databases inside the real browser.\n * @returns {Promise<{alphaNames: ReturnType<typeof JSON.parse>[], betaNames: ReturnType<typeof JSON.parse>[], identitiesAreDistinct: boolean, openCount: number}>} Serializable proof result.\n */\nexport default async function runFrontendTenantDatabasePersistenceScenario() {\n  const previousConfiguration = currentConfigurationOrUndefined()\n  const configuration = buildConfiguration()\n\n  class BrowserProjectRecord extends DatabaseRecord {}\n  class CreateBrowserProjectRecords extends Migration {\n    async up() {\n      await this.execute(\"CREATE TABLE browser_project_records(id integer PRIMARY KEY AUTOINCREMENT, name varchar(255) NOT NULL)\")\n    }\n  }\n\n  BrowserProjectRecord.setTableName(\"browser_project_records\")\n  BrowserProjectRecord.switchesTenantDatabase(DATABASE_IDENTIFIER)\n  BrowserProjectRecord.registerRecordClass({configuration})\n  CreateBrowserProjectRecords.onDatabases([DATABASE_IDENTIFIER])\n\n  const migrationFile = \"20260919090000-create-browser-project-records.js\"\n  /**\n   * Loads the one migration bundled into this browser proof.\n   * @type {import(\"../database/migrator/types.js\").RequireMigrationContextType}\n   */\n  const migrations = (fileName) => {\n    if (fileName !== migrationFile) throw new Error(`Unknown browser tenant proof migration: ${fileName}`)\n\n    return {default: CreateBrowserProjectRecords}\n  }\n\n  migrations.keys = () => [migrationFile]\n  migrations.id = \"frontend-tenant-browser-persistence-scenario\"\n\n  const alpha = Tenant.handle({projectSlug: \"alpha\"}, configuration)\n  const beta = Tenant.handle({projectSlug: \"beta\"}, configuration)\n\n  configuration.setCurrent()\n\n  try {\n    await Promise.all([\n      alpha.delete({databaseIdentifier: DATABASE_IDENTIFIER}),\n      beta.delete({databaseIdentifier: DATABASE_IDENTIFIER})\n    ])\n    await Promise.all([\n      alpha.initialize({databaseIdentifier: DATABASE_IDENTIFIER, migrations, schemaGeneration: SCHEMA_GENERATION}),\n      beta.initialize({databaseIdentifier: DATABASE_IDENTIFIER, migrations, schemaGeneration: SCHEMA_GENERATION})\n    ])\n\n    for (let index = 0; index < 12; index++) {\n      await Promise.all([\n        alpha.databaseOperation({databaseIdentifier: DATABASE_IDENTIFIER}, async (operation) => {\n          await operation.forModel(BrowserProjectRecord).create({name: `alpha-${index}`})\n        }),\n        beta.databaseOperation({databaseIdentifier: DATABASE_IDENTIFIER}, async (operation) => {\n          await operation.forModel(BrowserProjectRecord).create({name: `beta-${index}`})\n        })\n      ])\n    }\n\n    await Promise.all([\n      alpha.close({databaseIdentifier: DATABASE_IDENTIFIER, flush: true}),\n      beta.close({databaseIdentifier: DATABASE_IDENTIFIER, flush: true})\n    ])\n    await Promise.all([\n      alpha.initialize({databaseIdentifier: DATABASE_IDENTIFIER, migrations, schemaGeneration: SCHEMA_GENERATION}),\n      beta.initialize({databaseIdentifier: DATABASE_IDENTIFIER, migrations, schemaGeneration: SCHEMA_GENERATION})\n    ])\n\n    const [alphaNames, betaNames] = await Promise.all([\n      alpha.databaseOperation({databaseIdentifier: DATABASE_IDENTIFIER}, async (operation) => {\n        return await operation.forModel(BrowserProjectRecord).order(\"id\").pluck(\"name\")\n      }),\n      beta.databaseOperation({databaseIdentifier: DATABASE_IDENTIFIER}, async (operation) => {\n        return await operation.forModel(BrowserProjectRecord).order(\"id\").pluck(\"name\")\n      })\n    ])\n\n    return {\n      alphaNames,\n      betaNames,\n      identitiesAreDistinct: alpha.databaseIdentity(DATABASE_IDENTIFIER) !== beta.databaseIdentity(DATABASE_IDENTIFIER),\n      openCount: configuration.inspectFrontendTenantSqliteHandles().openCount\n    }\n  } finally {\n    await Promise.all([\n      alpha.delete({databaseIdentifier: DATABASE_IDENTIFIER}),\n      beta.delete({databaseIdentifier: DATABASE_IDENTIFIER})\n    ])\n    if (previousConfiguration) previousConfiguration.setCurrent()\n    await configuration.closeDatabaseConnections()\n  }\n}\n"]}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import SystemTestBrowserHelper from "system-testing/build/system-test-browser-helper.js";
|
|
3
3
|
import BrowserEnvironmentHandler from "../environment-handlers/browser.js";
|
|
4
4
|
import runFrontendModelEventHookScenario from "./browser-frontend-model-event-hook-scenarios.js";
|
|
5
|
+
import runFrontendTenantDatabasePersistenceScenario from "./browser-frontend-tenant-database-scenarios.js";
|
|
5
6
|
import runUseDatabaseSelectionTransitionScenario from "./browser-use-database-hook-scenarios.js";
|
|
6
7
|
const root = document.getElementById("root") || (() => {
|
|
7
8
|
const element = document.createElement("div");
|
|
@@ -22,7 +23,8 @@ systemTestBrowserHelper.enableOnBrowser();
|
|
|
22
23
|
Object.assign(globalThis, { velociousBrowserTest: {
|
|
23
24
|
BrowserEnvironmentHandler,
|
|
24
25
|
runFrontendModelEventHookScenario,
|
|
26
|
+
runFrontendTenantDatabasePersistenceScenario,
|
|
25
27
|
runUseDatabaseSelectionTransitionScenario,
|
|
26
28
|
systemTestBrowserHelper
|
|
27
29
|
} });
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
30
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnJvd3Nlci10ZXN0LWFwcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy90ZXN0aW5nL2Jyb3dzZXItdGVzdC1hcHAuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsWUFBWTtBQUVaLE9BQU8sdUJBQXVCLE1BQU0sb0RBQW9ELENBQUE7QUFDeEYsT0FBTyx5QkFBeUIsTUFBTSxvQ0FBb0MsQ0FBQTtBQUMxRSxPQUFPLGlDQUFpQyxNQUFNLGtEQUFrRCxDQUFBO0FBQ2hHLE9BQU8sNENBQTRDLE1BQU0saURBQWlELENBQUE7QUFDMUcsT0FBTyx5Q0FBeUMsTUFBTSwwQ0FBMEMsQ0FBQTtBQUVoRyxNQUFNLElBQUksR0FBRyxRQUFRLENBQUMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFO0lBQ3BELE1BQU0sT0FBTyxHQUFHLFFBQVEsQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDN0MsT0FBTyxDQUFDLEVBQUUsR0FBRyxNQUFNLENBQUE7SUFDbkIsUUFBUSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDbEMsT0FBTyxPQUFPLENBQUE7QUFDaEIsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtBQUVKLE1BQU0sc0JBQXNCLEdBQUcsUUFBUSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsQ0FBQTtBQUM1RCxzQkFBc0IsQ0FBQyxZQUFZLENBQUMsYUFBYSxFQUFFLHdCQUF3QixDQUFDLENBQUE7QUFDNUUsc0JBQXNCLENBQUMsWUFBWSxDQUFDLGVBQWUsRUFBRSxNQUFNLENBQUMsQ0FBQTtBQUU1RCxNQUFNLFNBQVMsR0FBRyxRQUFRLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxDQUFBO0FBQy9DLFNBQVMsQ0FBQyxZQUFZLENBQUMsYUFBYSxFQUFFLFdBQVcsQ0FBQyxDQUFBO0FBQ2xELFNBQVMsQ0FBQyxXQUFXLEdBQUcsT0FBTyxDQUFBO0FBRS9CLHNCQUFzQixDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUM3QyxJQUFJLENBQUMsV0FBVyxDQUFDLHNCQUFzQixDQUFDLENBQUE7QUFFeEMsTUFBTSx1QkFBdUIsR0FBRyxJQUFJLHVCQUF1QixFQUFFLENBQUE7QUFDN0QsdUJBQXVCLENBQUMsZUFBZSxFQUFFLENBQUE7QUFFekMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUUsRUFBQyxvQkFBb0IsRUFBRTtRQUMvQyx5QkFBeUI7UUFDekIsaUNBQWlDO1FBQ2pDLDRDQUE0QztRQUM1Qyx5Q0FBeUM7UUFDekMsdUJBQXVCO0tBQ3hCLEVBQUMsQ0FBQyxDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiLy8gQHRzLWNoZWNrXG5cbmltcG9ydCBTeXN0ZW1UZXN0QnJvd3NlckhlbHBlciBmcm9tIFwic3lzdGVtLXRlc3RpbmcvYnVpbGQvc3lzdGVtLXRlc3QtYnJvd3Nlci1oZWxwZXIuanNcIlxuaW1wb3J0IEJyb3dzZXJFbnZpcm9ubWVudEhhbmRsZXIgZnJvbSBcIi4uL2Vudmlyb25tZW50LWhhbmRsZXJzL2Jyb3dzZXIuanNcIlxuaW1wb3J0IHJ1bkZyb250ZW5kTW9kZWxFdmVudEhvb2tTY2VuYXJpbyBmcm9tIFwiLi9icm93c2VyLWZyb250ZW5kLW1vZGVsLWV2ZW50LWhvb2stc2NlbmFyaW9zLmpzXCJcbmltcG9ydCBydW5Gcm9udGVuZFRlbmFudERhdGFiYXNlUGVyc2lzdGVuY2VTY2VuYXJpbyBmcm9tIFwiLi9icm93c2VyLWZyb250ZW5kLXRlbmFudC1kYXRhYmFzZS1zY2VuYXJpb3MuanNcIlxuaW1wb3J0IHJ1blVzZURhdGFiYXNlU2VsZWN0aW9uVHJhbnNpdGlvblNjZW5hcmlvIGZyb20gXCIuL2Jyb3dzZXItdXNlLWRhdGFiYXNlLWhvb2stc2NlbmFyaW9zLmpzXCJcblxuY29uc3Qgcm9vdCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKFwicm9vdFwiKSB8fCAoKCkgPT4ge1xuICBjb25zdCBlbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudChcImRpdlwiKVxuICBlbGVtZW50LmlkID0gXCJyb290XCJcbiAgZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChlbGVtZW50KVxuICByZXR1cm4gZWxlbWVudFxufSkoKVxuXG5jb25zdCBzeXN0ZW1UZXN0aW5nQ29tcG9uZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudChcImRpdlwiKVxuc3lzdGVtVGVzdGluZ0NvbXBvbmVudC5zZXRBdHRyaWJ1dGUoXCJkYXRhLXRlc3RpZFwiLCBcInN5c3RlbVRlc3RpbmdDb21wb25lbnRcIilcbnN5c3RlbVRlc3RpbmdDb21wb25lbnQuc2V0QXR0cmlidXRlKFwiZGF0YS1mb2N1c3NlZFwiLCBcInRydWVcIilcblxuY29uc3QgYmxhbmtUZXh0ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudChcImRpdlwiKVxuYmxhbmtUZXh0LnNldEF0dHJpYnV0ZShcImRhdGEtdGVzdGlkXCIsIFwiYmxhbmtUZXh0XCIpXG5ibGFua1RleHQudGV4dENvbnRlbnQgPSBcImJsYW5rXCJcblxuc3lzdGVtVGVzdGluZ0NvbXBvbmVudC5hcHBlbmRDaGlsZChibGFua1RleHQpXG5yb290LmFwcGVuZENoaWxkKHN5c3RlbVRlc3RpbmdDb21wb25lbnQpXG5cbmNvbnN0IHN5c3RlbVRlc3RCcm93c2VySGVscGVyID0gbmV3IFN5c3RlbVRlc3RCcm93c2VySGVscGVyKClcbnN5c3RlbVRlc3RCcm93c2VySGVscGVyLmVuYWJsZU9uQnJvd3NlcigpXG5cbk9iamVjdC5hc3NpZ24oZ2xvYmFsVGhpcywge3ZlbG9jaW91c0Jyb3dzZXJUZXN0OiB7XG4gIEJyb3dzZXJFbnZpcm9ubWVudEhhbmRsZXIsXG4gIHJ1bkZyb250ZW5kTW9kZWxFdmVudEhvb2tTY2VuYXJpbyxcbiAgcnVuRnJvbnRlbmRUZW5hbnREYXRhYmFzZVBlcnNpc3RlbmNlU2NlbmFyaW8sXG4gIHJ1blVzZURhdGFiYXNlU2VsZWN0aW9uVHJhbnNpdGlvblNjZW5hcmlvLFxuICBzeXN0ZW1UZXN0QnJvd3NlckhlbHBlclxufX0pXG4iXX0=
|
|
@@ -0,0 +1,158 @@
|
|
|
1
|
+
// @ts-check
|
|
2
|
+
|
|
3
|
+
import Configuration, { CurrentConfigurationNotSetError } from "../configuration.js"
|
|
4
|
+
import DatabaseRecord from "../database/record/index.js"
|
|
5
|
+
import BrowserEnvironmentHandler from "../environment-handlers/browser.js"
|
|
6
|
+
import Migration from "../database/migration/index.js"
|
|
7
|
+
import SingleMultiUsePool from "../database/pool/single-multi-use.js"
|
|
8
|
+
import SqliteWebDriver from "../database/drivers/sqlite/index.web.js"
|
|
9
|
+
import Tenant from "../tenants/tenant.js"
|
|
10
|
+
|
|
11
|
+
const DATABASE_IDENTIFIER = "projectTenant"
|
|
12
|
+
const SCHEMA_GENERATION = "frontend-tenant-browser-persistence-1"
|
|
13
|
+
|
|
14
|
+
/**
|
|
15
|
+
* Returns the current configuration without requiring one to exist.
|
|
16
|
+
* @returns {Configuration | undefined} Current configuration when installed.
|
|
17
|
+
*/
|
|
18
|
+
function currentConfigurationOrUndefined() {
|
|
19
|
+
try {
|
|
20
|
+
return Configuration.current()
|
|
21
|
+
} catch (error) {
|
|
22
|
+
if (!(error instanceof CurrentConfigurationNotSetError)) throw error
|
|
23
|
+
|
|
24
|
+
return undefined
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
/**
|
|
29
|
+
* Builds the real browser-backed two-project configuration.
|
|
30
|
+
* @returns {Configuration} Browser tenant configuration.
|
|
31
|
+
*/
|
|
32
|
+
function buildConfiguration() {
|
|
33
|
+
return new Configuration({
|
|
34
|
+
database: {
|
|
35
|
+
test: {
|
|
36
|
+
projectTenant: {
|
|
37
|
+
driver: SqliteWebDriver,
|
|
38
|
+
locateFile: () => "/sql-wasm.wasm",
|
|
39
|
+
migrations: true,
|
|
40
|
+
name: "velocious-browser-project-proof-template",
|
|
41
|
+
poolType: SingleMultiUsePool,
|
|
42
|
+
tenantOnly: true,
|
|
43
|
+
type: "sqlite"
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
},
|
|
47
|
+
directory: "/frontend-tenant-browser-persistence-scenario",
|
|
48
|
+
environment: "test",
|
|
49
|
+
environmentHandler: new BrowserEnvironmentHandler(),
|
|
50
|
+
frontendTenantSqlite: {maxOpenHandles: 2},
|
|
51
|
+
initializeModels: async () => {},
|
|
52
|
+
locale: "en",
|
|
53
|
+
localeFallbacks: {en: ["en"]},
|
|
54
|
+
locales: ["en"],
|
|
55
|
+
tenantDatabaseResolver: ({identifier, tenant}) => {
|
|
56
|
+
if (identifier !== DATABASE_IDENTIFIER || !tenant || typeof tenant !== "object") return
|
|
57
|
+
const projectSlug = /** @type {{projectSlug?: string}} */ (tenant).projectSlug
|
|
58
|
+
|
|
59
|
+
if (projectSlug !== "alpha" && projectSlug !== "beta") return
|
|
60
|
+
|
|
61
|
+
return {name: `velocious-browser-project-proof-${projectSlug}`}
|
|
62
|
+
}
|
|
63
|
+
})
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* Exercises two durable physical tenant databases inside the real browser.
|
|
68
|
+
* @returns {Promise<{alphaNames: ReturnType<typeof JSON.parse>[], betaNames: ReturnType<typeof JSON.parse>[], identitiesAreDistinct: boolean, openCount: number}>} Serializable proof result.
|
|
69
|
+
*/
|
|
70
|
+
export default async function runFrontendTenantDatabasePersistenceScenario() {
|
|
71
|
+
const previousConfiguration = currentConfigurationOrUndefined()
|
|
72
|
+
const configuration = buildConfiguration()
|
|
73
|
+
|
|
74
|
+
class BrowserProjectRecord extends DatabaseRecord {}
|
|
75
|
+
class CreateBrowserProjectRecords extends Migration {
|
|
76
|
+
async up() {
|
|
77
|
+
await this.execute("CREATE TABLE browser_project_records(id integer PRIMARY KEY AUTOINCREMENT, name varchar(255) NOT NULL)")
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
BrowserProjectRecord.setTableName("browser_project_records")
|
|
82
|
+
BrowserProjectRecord.switchesTenantDatabase(DATABASE_IDENTIFIER)
|
|
83
|
+
BrowserProjectRecord.registerRecordClass({configuration})
|
|
84
|
+
CreateBrowserProjectRecords.onDatabases([DATABASE_IDENTIFIER])
|
|
85
|
+
|
|
86
|
+
const migrationFile = "20260919090000-create-browser-project-records.js"
|
|
87
|
+
/**
|
|
88
|
+
* Loads the one migration bundled into this browser proof.
|
|
89
|
+
* @type {import("../database/migrator/types.js").RequireMigrationContextType}
|
|
90
|
+
*/
|
|
91
|
+
const migrations = (fileName) => {
|
|
92
|
+
if (fileName !== migrationFile) throw new Error(`Unknown browser tenant proof migration: ${fileName}`)
|
|
93
|
+
|
|
94
|
+
return {default: CreateBrowserProjectRecords}
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
migrations.keys = () => [migrationFile]
|
|
98
|
+
migrations.id = "frontend-tenant-browser-persistence-scenario"
|
|
99
|
+
|
|
100
|
+
const alpha = Tenant.handle({projectSlug: "alpha"}, configuration)
|
|
101
|
+
const beta = Tenant.handle({projectSlug: "beta"}, configuration)
|
|
102
|
+
|
|
103
|
+
configuration.setCurrent()
|
|
104
|
+
|
|
105
|
+
try {
|
|
106
|
+
await Promise.all([
|
|
107
|
+
alpha.delete({databaseIdentifier: DATABASE_IDENTIFIER}),
|
|
108
|
+
beta.delete({databaseIdentifier: DATABASE_IDENTIFIER})
|
|
109
|
+
])
|
|
110
|
+
await Promise.all([
|
|
111
|
+
alpha.initialize({databaseIdentifier: DATABASE_IDENTIFIER, migrations, schemaGeneration: SCHEMA_GENERATION}),
|
|
112
|
+
beta.initialize({databaseIdentifier: DATABASE_IDENTIFIER, migrations, schemaGeneration: SCHEMA_GENERATION})
|
|
113
|
+
])
|
|
114
|
+
|
|
115
|
+
for (let index = 0; index < 12; index++) {
|
|
116
|
+
await Promise.all([
|
|
117
|
+
alpha.databaseOperation({databaseIdentifier: DATABASE_IDENTIFIER}, async (operation) => {
|
|
118
|
+
await operation.forModel(BrowserProjectRecord).create({name: `alpha-${index}`})
|
|
119
|
+
}),
|
|
120
|
+
beta.databaseOperation({databaseIdentifier: DATABASE_IDENTIFIER}, async (operation) => {
|
|
121
|
+
await operation.forModel(BrowserProjectRecord).create({name: `beta-${index}`})
|
|
122
|
+
})
|
|
123
|
+
])
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
await Promise.all([
|
|
127
|
+
alpha.close({databaseIdentifier: DATABASE_IDENTIFIER, flush: true}),
|
|
128
|
+
beta.close({databaseIdentifier: DATABASE_IDENTIFIER, flush: true})
|
|
129
|
+
])
|
|
130
|
+
await Promise.all([
|
|
131
|
+
alpha.initialize({databaseIdentifier: DATABASE_IDENTIFIER, migrations, schemaGeneration: SCHEMA_GENERATION}),
|
|
132
|
+
beta.initialize({databaseIdentifier: DATABASE_IDENTIFIER, migrations, schemaGeneration: SCHEMA_GENERATION})
|
|
133
|
+
])
|
|
134
|
+
|
|
135
|
+
const [alphaNames, betaNames] = await Promise.all([
|
|
136
|
+
alpha.databaseOperation({databaseIdentifier: DATABASE_IDENTIFIER}, async (operation) => {
|
|
137
|
+
return await operation.forModel(BrowserProjectRecord).order("id").pluck("name")
|
|
138
|
+
}),
|
|
139
|
+
beta.databaseOperation({databaseIdentifier: DATABASE_IDENTIFIER}, async (operation) => {
|
|
140
|
+
return await operation.forModel(BrowserProjectRecord).order("id").pluck("name")
|
|
141
|
+
})
|
|
142
|
+
])
|
|
143
|
+
|
|
144
|
+
return {
|
|
145
|
+
alphaNames,
|
|
146
|
+
betaNames,
|
|
147
|
+
identitiesAreDistinct: alpha.databaseIdentity(DATABASE_IDENTIFIER) !== beta.databaseIdentity(DATABASE_IDENTIFIER),
|
|
148
|
+
openCount: configuration.inspectFrontendTenantSqliteHandles().openCount
|
|
149
|
+
}
|
|
150
|
+
} finally {
|
|
151
|
+
await Promise.all([
|
|
152
|
+
alpha.delete({databaseIdentifier: DATABASE_IDENTIFIER}),
|
|
153
|
+
beta.delete({databaseIdentifier: DATABASE_IDENTIFIER})
|
|
154
|
+
])
|
|
155
|
+
if (previousConfiguration) previousConfiguration.setCurrent()
|
|
156
|
+
await configuration.closeDatabaseConnections()
|
|
157
|
+
}
|
|
158
|
+
}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
import SystemTestBrowserHelper from "system-testing/build/system-test-browser-helper.js"
|
|
4
4
|
import BrowserEnvironmentHandler from "../environment-handlers/browser.js"
|
|
5
5
|
import runFrontendModelEventHookScenario from "./browser-frontend-model-event-hook-scenarios.js"
|
|
6
|
+
import runFrontendTenantDatabasePersistenceScenario from "./browser-frontend-tenant-database-scenarios.js"
|
|
6
7
|
import runUseDatabaseSelectionTransitionScenario from "./browser-use-database-hook-scenarios.js"
|
|
7
8
|
|
|
8
9
|
const root = document.getElementById("root") || (() => {
|
|
@@ -29,6 +30,7 @@ systemTestBrowserHelper.enableOnBrowser()
|
|
|
29
30
|
Object.assign(globalThis, {velociousBrowserTest: {
|
|
30
31
|
BrowserEnvironmentHandler,
|
|
31
32
|
runFrontendModelEventHookScenario,
|
|
33
|
+
runFrontendTenantDatabasePersistenceScenario,
|
|
32
34
|
runUseDatabaseSelectionTransitionScenario,
|
|
33
35
|
systemTestBrowserHelper
|
|
34
36
|
}})
|
package/package.json
CHANGED
package/scripts/test-browser.js
CHANGED
|
@@ -95,6 +95,11 @@ async function buildBrowserTestApp() {
|
|
|
95
95
|
sourcemap: true
|
|
96
96
|
})
|
|
97
97
|
|
|
98
|
+
await fs.copyFile(
|
|
99
|
+
path.join(rootDir, "node_modules", "sql.js", "dist", "sql-wasm.wasm"),
|
|
100
|
+
path.join(distDir, "sql-wasm.wasm")
|
|
101
|
+
)
|
|
102
|
+
|
|
98
103
|
const html = `<!doctype html>
|
|
99
104
|
<html lang="en">
|
|
100
105
|
<head>
|
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
// @ts-check
|
|
2
2
|
|
|
3
3
|
import { randomUUID } from "node:crypto"
|
|
4
|
+
import timeout from "awaitery/build/timeout.js"
|
|
4
5
|
import runJobPayload, { BackgroundJobPerformedFailure } from "./job-runner.js"
|
|
6
|
+
import { boundedPooledRunnerInflightJobIds, isPooledChildShutdownReason, isPooledChildShutdownSignal } from "./pooled-runner-shutdown.js"
|
|
5
7
|
import { closeRunnerConnections, closeRunnerFrameworkConnections, currentConfigurationOrNull } from "./runner-graceful-shutdown.js"
|
|
6
8
|
import setRunnerProcessTitle from "./runner-process-title.js"
|
|
7
9
|
import PooledRunnerBrokerIdentity from "./pooled-runner-broker-identity.js"
|
|
8
10
|
import { runWithSharedTransactionBrokerConfig } from "../testing/shared-transaction-proxy-driver.js"
|
|
9
11
|
|
|
10
12
|
const BASE_PROCESS_TITLE = "velocious background-jobs-runner"
|
|
13
|
+
/** A shutdown observation may delay resource teardown only for this bounded IPC send. */
|
|
14
|
+
const SHUTDOWN_OBSERVATION_SEND_TIMEOUT_MS = 100
|
|
11
15
|
/** Stable identity of this pooled child process for the life of the process. */
|
|
12
16
|
const childInstanceId = randomUUID()
|
|
13
17
|
|
|
@@ -20,13 +24,18 @@ let shutdownPromise
|
|
|
20
24
|
* Closes the runner's connections — releasing any advisory lock a killed-mid-pass
|
|
21
25
|
* job still holds — before exiting, instead of leaving a half-open session that
|
|
22
26
|
* keeps the lock until the DB server's `wait_timeout`.
|
|
23
|
-
* @param {
|
|
27
|
+
* @param {object} args - Shutdown observation.
|
|
28
|
+
* @param {number} args.exitCode - Process exit code.
|
|
29
|
+
* @param {import("./types.js").PooledChildShutdownReason} args.reason - Exact shutdown reason observed by the child.
|
|
30
|
+
* @param {number | null} [args.shutdownRequestedAtMs] - Parent request timestamp when supplied over IPC.
|
|
31
|
+
* @param {import("node:child_process").ChildProcess["signalCode"]} [args.signal] - Requested or observed signal.
|
|
24
32
|
* @returns {Promise<void>}
|
|
25
33
|
*/
|
|
26
|
-
function shutdownRunner(exitCode) {
|
|
34
|
+
function shutdownRunner({exitCode, reason, shutdownRequestedAtMs = null, signal = null}) {
|
|
27
35
|
if (shutdownPromise) return shutdownPromise
|
|
28
36
|
|
|
29
37
|
shutdownPromise = (async () => {
|
|
38
|
+
await sendShutdownObservation({reason, shutdownRequestedAtMs, signal})
|
|
30
39
|
await closeRunnerConnections(currentConfigurationOrNull())
|
|
31
40
|
process.exit(exitCode)
|
|
32
41
|
})()
|
|
@@ -60,6 +69,52 @@ function updateProcessTitle() {
|
|
|
60
69
|
process.title = count > 0 ? `${BASE_PROCESS_TITLE}: ${count} ${count === 1 ? "job" : "jobs"}` : BASE_PROCESS_TITLE
|
|
61
70
|
}
|
|
62
71
|
|
|
72
|
+
/**
|
|
73
|
+
* Sends one bounded lifecycle observation before application/framework teardown.
|
|
74
|
+
* A closed IPC channel is expected for `ipc_disconnect`; other send failures are
|
|
75
|
+
* surfaced on stderr but never hold connection cleanup past the fixed bound.
|
|
76
|
+
* @param {object} args - Shutdown observation.
|
|
77
|
+
* @param {import("./types.js").PooledChildShutdownReason} args.reason - Shutdown reason.
|
|
78
|
+
* @param {number | null} args.shutdownRequestedAtMs - Parent request timestamp.
|
|
79
|
+
* @param {import("node:child_process").ChildProcess["signalCode"]} args.signal - Requested or observed signal.
|
|
80
|
+
* @returns {Promise<void>} - Resolves after IPC accepts the observation or the bound expires.
|
|
81
|
+
*/
|
|
82
|
+
async function sendShutdownObservation({reason, shutdownRequestedAtMs, signal}) {
|
|
83
|
+
if (!process.send || !process.connected) return
|
|
84
|
+
|
|
85
|
+
const boundedInflight = boundedPooledRunnerInflightJobIds(runningJobIds)
|
|
86
|
+
/** @type {import("./types.js").PooledChildShutdownObservation & {type: "shutdown-observation"}} */
|
|
87
|
+
const message = {
|
|
88
|
+
childInstanceId,
|
|
89
|
+
...boundedInflight,
|
|
90
|
+
reason,
|
|
91
|
+
shutdownObservedAtMs: Date.now(),
|
|
92
|
+
shutdownRequestedAtMs,
|
|
93
|
+
signal,
|
|
94
|
+
type: "shutdown-observation"
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
try {
|
|
98
|
+
await timeout({timeout: SHUTDOWN_OBSERVATION_SEND_TIMEOUT_MS}, async () => {
|
|
99
|
+
await new Promise((resolve, reject) => {
|
|
100
|
+
try {
|
|
101
|
+
process.send?.(message, (error) => {
|
|
102
|
+
if (error) {
|
|
103
|
+
reject(error)
|
|
104
|
+
} else {
|
|
105
|
+
resolve(undefined)
|
|
106
|
+
}
|
|
107
|
+
})
|
|
108
|
+
} catch (error) {
|
|
109
|
+
reject(error)
|
|
110
|
+
}
|
|
111
|
+
})
|
|
112
|
+
})
|
|
113
|
+
} catch (error) {
|
|
114
|
+
console.error("Pooled background job runner could not send its shutdown observation:", error)
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
|
|
63
118
|
/**
|
|
64
119
|
* Reports one acceptance observation (job received / perform started) to the
|
|
65
120
|
* worker over IPC. The message carries the job's exact handoff lease so the
|
|
@@ -105,6 +160,22 @@ function isJobMessage(message) {
|
|
|
105
160
|
return record.type === "job" && !!record.payload && typeof record.payload === "object" && typeof record.payload.id === "string"
|
|
106
161
|
}
|
|
107
162
|
|
|
163
|
+
/**
|
|
164
|
+
* Checks whether an IPC value requests a typed pooled-child shutdown.
|
|
165
|
+
* @param {ReturnType<typeof JSON.parse>} message - IPC message.
|
|
166
|
+
* @returns {message is {type: "shutdown-request", reason: import("./types.js").PooledChildShutdownReason, shutdownRequestedAtMs: number, signal: import("node:child_process").ChildProcess["signalCode"]}} - Whether this is a valid parent shutdown request.
|
|
167
|
+
*/
|
|
168
|
+
function isShutdownRequestMessage(message) {
|
|
169
|
+
if (!message || typeof message !== "object") return false
|
|
170
|
+
const record = /** @type {{type?: ReturnType<typeof JSON.parse>, reason?: ReturnType<typeof JSON.parse>, shutdownRequestedAtMs?: ReturnType<typeof JSON.parse>, signal?: ReturnType<typeof JSON.parse>}} */ (message)
|
|
171
|
+
|
|
172
|
+
return record.type === "shutdown-request"
|
|
173
|
+
&& isPooledChildShutdownReason(record.reason)
|
|
174
|
+
&& typeof record.shutdownRequestedAtMs === "number"
|
|
175
|
+
&& Number.isFinite(record.shutdownRequestedAtMs)
|
|
176
|
+
&& isPooledChildShutdownSignal(record.signal)
|
|
177
|
+
}
|
|
178
|
+
|
|
108
179
|
/**
|
|
109
180
|
* Sends the terminal outcome after the main/DB report has been acknowledged or rejected.
|
|
110
181
|
* @param {object} args - Outcome.
|
|
@@ -176,6 +247,16 @@ async function runJob(payload, sharedTransactionBroker) {
|
|
|
176
247
|
* @returns {void}
|
|
177
248
|
*/
|
|
178
249
|
function handleMessage(message) {
|
|
250
|
+
if (isShutdownRequestMessage(message)) {
|
|
251
|
+
void shutdownRunner({
|
|
252
|
+
exitCode: message.reason === "parent_retire_drained" ? 0 : 1,
|
|
253
|
+
reason: message.reason,
|
|
254
|
+
shutdownRequestedAtMs: message.shutdownRequestedAtMs,
|
|
255
|
+
signal: message.signal
|
|
256
|
+
})
|
|
257
|
+
return
|
|
258
|
+
}
|
|
259
|
+
|
|
179
260
|
if (!isJobMessage(message) || runningJobIds.has(message.payload.id)) return
|
|
180
261
|
|
|
181
262
|
runningJobIds.add(message.payload.id)
|
|
@@ -185,6 +266,7 @@ function handleMessage(message) {
|
|
|
185
266
|
}
|
|
186
267
|
|
|
187
268
|
process.on("message", (message) => handleMessage(message))
|
|
188
|
-
process.once("disconnect", () => void shutdownRunner(0))
|
|
189
|
-
|
|
190
|
-
|
|
269
|
+
process.once("disconnect", () => void shutdownRunner({exitCode: 0, reason: "ipc_disconnect"}))
|
|
270
|
+
process.once("SIGTERM", () => void shutdownRunner({exitCode: 1, reason: "signal_sigterm", signal: "SIGTERM"}))
|
|
271
|
+
process.once("SIGINT", () => void shutdownRunner({exitCode: 1, reason: "signal_sigint", signal: "SIGINT"}))
|
|
272
|
+
if (process.send) process.send({childInstanceId, childPid: process.pid, type: "ready"})
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
// @ts-check
|
|
2
|
+
|
|
3
|
+
import { constants } from "node:os"
|
|
4
|
+
|
|
5
|
+
/** Maximum job ids copied into a pooled-child shutdown observation or failure snapshot. */
|
|
6
|
+
export const POOLED_RUNNER_INFLIGHT_JOB_ID_LIMIT = 100
|
|
7
|
+
|
|
8
|
+
/** @type {readonly import("./types.js").PooledChildShutdownReason[]} */
|
|
9
|
+
export const POOLED_CHILD_SHUTDOWN_REASONS = Object.freeze([
|
|
10
|
+
"parent_retire_drained",
|
|
11
|
+
"job_timeout",
|
|
12
|
+
"worker_stop",
|
|
13
|
+
"signal_sigterm",
|
|
14
|
+
"signal_sigint",
|
|
15
|
+
"signal_sigkill",
|
|
16
|
+
"signal_other",
|
|
17
|
+
"ipc_disconnect",
|
|
18
|
+
"process_error",
|
|
19
|
+
"unexpected_exit"
|
|
20
|
+
])
|
|
21
|
+
|
|
22
|
+
/**
|
|
23
|
+
* Checks one dynamic IPC reason against the complete shutdown contract.
|
|
24
|
+
* @param {ReturnType<typeof JSON.parse>} value - Candidate shutdown reason.
|
|
25
|
+
* @returns {value is import("./types.js").PooledChildShutdownReason} - Whether the value is a known reason.
|
|
26
|
+
*/
|
|
27
|
+
export function isPooledChildShutdownReason(value) {
|
|
28
|
+
if (typeof value !== "string") return false
|
|
29
|
+
|
|
30
|
+
return POOLED_CHILD_SHUTDOWN_REASONS.some((reason) => reason === value)
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* Checks one dynamic IPC value against Node's named process signals.
|
|
35
|
+
* @param {ReturnType<typeof JSON.parse>} value - Candidate signal.
|
|
36
|
+
* @returns {value is import("node:child_process").ChildProcess["signalCode"]} - Whether the value is null or a named signal.
|
|
37
|
+
*/
|
|
38
|
+
export function isPooledChildShutdownSignal(value) {
|
|
39
|
+
return value === null || (typeof value === "string" && Object.hasOwn(constants.signals, value))
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* Sorts, deduplicates, and bounds job ids before they cross IPC/report boundaries.
|
|
44
|
+
* @param {Iterable<string>} jobIds - In-flight durable job ids.
|
|
45
|
+
* @returns {{inflightJobIds: string[], inflightJobIdsTruncatedCount: number}} - Bounded snapshot.
|
|
46
|
+
*/
|
|
47
|
+
export function boundedPooledRunnerInflightJobIds(jobIds) {
|
|
48
|
+
const sortedJobIds = [...new Set(jobIds)].sort((left, right) => left.localeCompare(right))
|
|
49
|
+
const inflightJobIds = sortedJobIds.slice(0, POOLED_RUNNER_INFLIGHT_JOB_ID_LIMIT)
|
|
50
|
+
|
|
51
|
+
return {
|
|
52
|
+
inflightJobIds,
|
|
53
|
+
inflightJobIdsTruncatedCount: sortedJobIds.length - inflightJobIds.length
|
|
54
|
+
}
|
|
55
|
+
}
|