agl 21.0.2 → 22.0.0
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/changelog.md +9 -0
- package/dist_serve/bundle.js +1 -1
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.aglhome.d.ts +25 -0
- package/dist_ts/classes.aglhome.js +65 -0
- package/dist_ts/classes.authmodels.js +7 -12
- package/dist_ts/classes.authstore.js +2 -29
- package/dist_ts/classes.cli.js +93 -35
- package/dist_ts/classes.config.d.ts +2 -11
- package/dist_ts/classes.config.js +14 -80
- package/dist_ts/classes.controller.d.ts +4 -1
- package/dist_ts/classes.controller.js +64 -26
- package/dist_ts/classes.embeddeddb.js +6 -5
- package/dist_ts/classes.gitreversion.js +3 -2
- package/dist_ts/classes.upgradecoordinator.d.ts +6 -1
- package/dist_ts/classes.upgradecoordinator.js +588 -177
- package/dist_ts/classes.upgradetransaction.js +46 -12
- package/dist_ts/classes.uploadmanager.d.ts +12 -0
- package/dist_ts/classes.uploadmanager.js +204 -2
- package/dist_ts/constants.upgradeenvironment.d.ts +2 -0
- package/dist_ts/constants.upgradeenvironment.js +3 -0
- package/dist_ts/functions.controllerdataroot.d.ts +4 -5
- package/dist_ts/functions.controllerdataroot.js +4 -29
- package/dist_ts/functions.embeddeddb.d.ts +1 -1
- package/dist_ts/functions.embeddeddb.js +8 -3
- package/dist_ts/functions.runtimeenvironment.js +2 -1
- package/dist_ts/index.d.ts +1 -0
- package/dist_ts/index.js +2 -1
- package/dist_ts/interfaces.config.d.ts +5 -7
- package/dist_ts_migration/classes.documentmigrationrunner.js +3 -1
- package/dist_ts_migration/index.d.ts +2 -0
- package/dist_ts_migration/index.js +3 -1
- package/dist_ts_migration/v23_aglhome.d.ts +91 -0
- package/dist_ts_migration/v23_aglhome.js +1775 -0
- package/dist_ts_migration/v23_runtimeconfig.d.ts +11 -0
- package/dist_ts_migration/v23_runtimeconfig.js +87 -0
- package/dist_ts_migration/v2_controllerdataroot.d.ts +5 -0
- package/dist_ts_migration/v2_controllerdataroot.js +176 -15
- package/package.json +1 -1
- package/readme.md +116 -35
- package/readme.plan.md +24 -9
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.aglhome.ts +116 -0
- package/ts/classes.authmodels.ts +5 -13
- package/ts/classes.authstore.ts +1 -39
- package/ts/classes.cli.ts +92 -34
- package/ts/classes.config.ts +20 -117
- package/ts/classes.controller.ts +92 -26
- package/ts/classes.embeddeddb.ts +5 -4
- package/ts/classes.gitreversion.ts +3 -2
- package/ts/classes.upgradecoordinator.ts +668 -191
- package/ts/classes.upgradetransaction.ts +46 -11
- package/ts/classes.uploadmanager.ts +231 -1
- package/ts/constants.upgradeenvironment.ts +2 -0
- package/ts/functions.controllerdataroot.ts +11 -47
- package/ts/functions.embeddeddb.ts +13 -2
- package/ts/functions.runtimeenvironment.ts +1 -0
- package/ts/index.ts +1 -0
- package/ts/interfaces.config.ts +5 -7
- package/ts_migration/classes.documentmigrationrunner.ts +2 -0
- package/ts_migration/index.ts +2 -0
- package/ts_migration/v23_aglhome.ts +2101 -0
- package/ts_migration/v23_runtimeconfig.ts +112 -0
- package/ts_migration/v2_controllerdataroot.ts +174 -16
- package/ts_web/00_commitinfo_data.ts +1 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { readControllerProcessIdentity } from './classes.processinspection.js';
|
|
1
2
|
import { type IControllerDraftAttachment } from '../dist_ts_interfaces/interfaces.js';
|
|
2
3
|
export interface IControllerUploadHandle {
|
|
3
4
|
id: string;
|
|
@@ -7,7 +8,13 @@ export interface IControllerUploadHandle {
|
|
|
7
8
|
bytes: number;
|
|
8
9
|
cleanup(): Promise<void>;
|
|
9
10
|
}
|
|
11
|
+
export interface IControllerUploadManagerOptions {
|
|
12
|
+
rootDirectory?: string;
|
|
13
|
+
readProcessIdentity?: typeof readControllerProcessIdentity;
|
|
14
|
+
}
|
|
10
15
|
export declare class ControllerUploadManager {
|
|
16
|
+
private readonly options;
|
|
17
|
+
private readonly readProcessIdentity;
|
|
11
18
|
private rootPromise?;
|
|
12
19
|
private readonly activeUploads;
|
|
13
20
|
private readonly pendingCreates;
|
|
@@ -15,10 +22,15 @@ export declare class ControllerUploadManager {
|
|
|
15
22
|
private activeBytes;
|
|
16
23
|
private closed;
|
|
17
24
|
private closePromise?;
|
|
25
|
+
constructor(options?: IControllerUploadManagerOptions);
|
|
18
26
|
create(attachmentsArg: readonly IControllerDraftAttachment[]): Promise<IControllerUploadHandle | undefined>;
|
|
19
27
|
close(): Promise<void>;
|
|
20
28
|
private createReserved;
|
|
21
29
|
private closeInternal;
|
|
22
30
|
private ensureRoot;
|
|
31
|
+
private writeOwnerMarker;
|
|
32
|
+
private cleanupStaleRoots;
|
|
33
|
+
private removeStaleRoot;
|
|
34
|
+
private validateStaleTree;
|
|
23
35
|
private cleanup;
|
|
24
36
|
}
|
|
@@ -1,8 +1,36 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
|
+
import { resolveAGLHomePaths } from './classes.aglhome.js';
|
|
3
|
+
import { readControllerProcessIdentity } from './classes.processinspection.js';
|
|
2
4
|
import { controllerMaxAttachmentPromptSuffixBytes, controllerMaxDraftAttachmentBytes, controllerMaxDraftAttachmentTotalBytes, controllerMaxDraftAttachments, } from '../dist_ts_interfaces/interfaces.js';
|
|
3
5
|
const maximumActiveUploads = 64;
|
|
4
6
|
const maximumActiveUploadBytes = 64 * 1024 * 1024;
|
|
7
|
+
const uploadOwnerFileName = '.controller-upload-owner.json';
|
|
8
|
+
const uploadOwnerMaximumBytes = 8 * 1024;
|
|
9
|
+
const uploadOrphanRetentionMs = 24 * 60 * 60 * 1000;
|
|
10
|
+
const maximumStaleUploadNodes = 8_192;
|
|
11
|
+
const maximumStaleUploadDepth = 32;
|
|
12
|
+
const parseUploadOwner = (valueArg) => {
|
|
13
|
+
if (!valueArg || typeof valueArg !== 'object' || Array.isArray(valueArg)) {
|
|
14
|
+
throw new Error('Controller upload owner metadata is malformed.');
|
|
15
|
+
}
|
|
16
|
+
const value = valueArg;
|
|
17
|
+
if (Object.keys(value).sort().join('\0')
|
|
18
|
+
!== ['createdAt', 'fingerprint', 'nonce', 'pid', 'version'].sort().join('\0')
|
|
19
|
+
|| value.version !== 1
|
|
20
|
+
|| !Number.isSafeInteger(value.pid)
|
|
21
|
+
|| value.pid < 2
|
|
22
|
+
|| typeof value.fingerprint !== 'string'
|
|
23
|
+
|| value.fingerprint.length === 0
|
|
24
|
+
|| value.fingerprint.length > 512
|
|
25
|
+
|| typeof value.nonce !== 'string'
|
|
26
|
+
|| !/^[a-f0-9]{32}$/.test(value.nonce)
|
|
27
|
+
|| !Number.isSafeInteger(value.createdAt))
|
|
28
|
+
throw new Error('Controller upload owner metadata is invalid.');
|
|
29
|
+
return value;
|
|
30
|
+
};
|
|
5
31
|
export class ControllerUploadManager {
|
|
32
|
+
options;
|
|
33
|
+
readProcessIdentity;
|
|
6
34
|
rootPromise;
|
|
7
35
|
activeUploads = new Map();
|
|
8
36
|
pendingCreates = new Set();
|
|
@@ -10,6 +38,10 @@ export class ControllerUploadManager {
|
|
|
10
38
|
activeBytes = 0;
|
|
11
39
|
closed = false;
|
|
12
40
|
closePromise;
|
|
41
|
+
constructor(options = {}) {
|
|
42
|
+
this.options = options;
|
|
43
|
+
this.readProcessIdentity = options.readProcessIdentity ?? readControllerProcessIdentity;
|
|
44
|
+
}
|
|
13
45
|
create(attachmentsArg) {
|
|
14
46
|
if (attachmentsArg.length === 0)
|
|
15
47
|
return Promise.resolve(undefined);
|
|
@@ -159,8 +191,22 @@ export class ControllerUploadManager {
|
|
|
159
191
|
this.rootPromise = (async () => {
|
|
160
192
|
let root;
|
|
161
193
|
try {
|
|
162
|
-
|
|
194
|
+
const baseRoot = this.options.rootDirectory ?? resolveAGLHomePaths().uploads;
|
|
195
|
+
await plugins.fs.promises.mkdir(baseRoot, { recursive: true, mode: 0o700 });
|
|
196
|
+
await plugins.fs.promises.chmod(baseRoot, 0o700);
|
|
197
|
+
await this.cleanupStaleRoots(baseRoot);
|
|
198
|
+
root = await plugins.fs.promises.mkdtemp(plugins.path.join(baseRoot, 'controller-'));
|
|
163
199
|
await plugins.fs.promises.chmod(root, 0o700);
|
|
200
|
+
const identity = await readControllerProcessIdentity(process.pid);
|
|
201
|
+
if (!identity)
|
|
202
|
+
throw new Error('Unable to establish controller upload ownership.');
|
|
203
|
+
await this.writeOwnerMarker(root, {
|
|
204
|
+
version: 1,
|
|
205
|
+
pid: identity.pid,
|
|
206
|
+
fingerprint: identity.fingerprint,
|
|
207
|
+
nonce: plugins.crypto.randomBytes(16).toString('hex'),
|
|
208
|
+
createdAt: Date.now(),
|
|
209
|
+
});
|
|
164
210
|
return await plugins.fs.promises.realpath(root);
|
|
165
211
|
}
|
|
166
212
|
catch (errorArg) {
|
|
@@ -182,6 +228,162 @@ export class ControllerUploadManager {
|
|
|
182
228
|
throw errorArg;
|
|
183
229
|
}
|
|
184
230
|
}
|
|
231
|
+
async writeOwnerMarker(rootArg, ownerArg) {
|
|
232
|
+
const markerPath = plugins.path.join(rootArg, uploadOwnerFileName);
|
|
233
|
+
const temporaryPath = `${markerPath}.tmp-${ownerArg.pid}-${ownerArg.nonce.slice(0, 16)}`;
|
|
234
|
+
let handle;
|
|
235
|
+
let temporaryCreated = false;
|
|
236
|
+
try {
|
|
237
|
+
handle = await plugins.fs.promises.open(temporaryPath, plugins.fs.constants.O_WRONLY
|
|
238
|
+
| plugins.fs.constants.O_CREAT
|
|
239
|
+
| plugins.fs.constants.O_EXCL
|
|
240
|
+
| (plugins.fs.constants.O_NOFOLLOW ?? 0), 0o600);
|
|
241
|
+
temporaryCreated = true;
|
|
242
|
+
await handle.writeFile(`${JSON.stringify(ownerArg)}\n`, 'utf8');
|
|
243
|
+
await handle.chmod(0o600);
|
|
244
|
+
await handle.sync();
|
|
245
|
+
await handle.close();
|
|
246
|
+
handle = undefined;
|
|
247
|
+
await plugins.fs.promises.rename(temporaryPath, markerPath);
|
|
248
|
+
await plugins.fs.promises.open(rootArg, plugins.fs.constants.O_RDONLY)
|
|
249
|
+
.then(async (directoryHandle) => {
|
|
250
|
+
try {
|
|
251
|
+
await directoryHandle.sync();
|
|
252
|
+
}
|
|
253
|
+
finally {
|
|
254
|
+
await directoryHandle.close();
|
|
255
|
+
}
|
|
256
|
+
});
|
|
257
|
+
temporaryCreated = false;
|
|
258
|
+
}
|
|
259
|
+
catch (errorArg) {
|
|
260
|
+
const cleanupErrors = [];
|
|
261
|
+
if (handle) {
|
|
262
|
+
try {
|
|
263
|
+
await handle.close();
|
|
264
|
+
}
|
|
265
|
+
catch (cleanupErrorArg) {
|
|
266
|
+
cleanupErrors.push(cleanupErrorArg);
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
if (temporaryCreated) {
|
|
270
|
+
try {
|
|
271
|
+
await plugins.fs.promises.unlink(temporaryPath);
|
|
272
|
+
}
|
|
273
|
+
catch (cleanupErrorArg) {
|
|
274
|
+
if (cleanupErrorArg.code !== 'ENOENT') {
|
|
275
|
+
cleanupErrors.push(cleanupErrorArg);
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
if (cleanupErrors.length > 0) {
|
|
280
|
+
throw new AggregateError([errorArg, ...cleanupErrors], 'Controller upload owner publication failed and cleanup was incomplete.', { cause: errorArg });
|
|
281
|
+
}
|
|
282
|
+
throw errorArg;
|
|
283
|
+
}
|
|
284
|
+
}
|
|
285
|
+
async cleanupStaleRoots(baseRootArg) {
|
|
286
|
+
const entries = await plugins.fs.promises.readdir(baseRootArg, { withFileTypes: true });
|
|
287
|
+
if (entries.length > 256)
|
|
288
|
+
throw new Error('The controller upload root contains too many entries.');
|
|
289
|
+
for (const entry of entries) {
|
|
290
|
+
if (!entry.name.startsWith('controller-')) {
|
|
291
|
+
throw new Error(`Unexpected controller upload root entry: ${entry.name}`);
|
|
292
|
+
}
|
|
293
|
+
const root = plugins.path.join(baseRootArg, entry.name);
|
|
294
|
+
const stats = await plugins.fs.promises.lstat(root);
|
|
295
|
+
if (!stats.isDirectory()
|
|
296
|
+
|| stats.isSymbolicLink()
|
|
297
|
+
|| (typeof process.getuid === 'function' && stats.uid !== process.getuid())
|
|
298
|
+
|| (stats.mode & 0o077) !== 0)
|
|
299
|
+
throw new Error(`Controller upload root is unsafe: ${root}`);
|
|
300
|
+
const markerPath = plugins.path.join(root, uploadOwnerFileName);
|
|
301
|
+
const markerStats = await plugins.fs.promises.lstat(markerPath).catch((errorArg) => {
|
|
302
|
+
if (errorArg.code === 'ENOENT')
|
|
303
|
+
return undefined;
|
|
304
|
+
throw errorArg;
|
|
305
|
+
});
|
|
306
|
+
let stale = false;
|
|
307
|
+
if (!markerStats) {
|
|
308
|
+
stale = Date.now() - stats.mtimeMs > uploadOrphanRetentionMs;
|
|
309
|
+
}
|
|
310
|
+
else {
|
|
311
|
+
if (!markerStats.isFile()
|
|
312
|
+
|| markerStats.isSymbolicLink()
|
|
313
|
+
|| (typeof process.getuid === 'function' && markerStats.uid !== process.getuid())
|
|
314
|
+
|| markerStats.nlink !== 1
|
|
315
|
+
|| (markerStats.mode & 0o077) !== 0
|
|
316
|
+
|| markerStats.size > uploadOwnerMaximumBytes)
|
|
317
|
+
throw new Error(`Controller upload owner marker is unsafe: ${markerPath}`);
|
|
318
|
+
const owner = parseUploadOwner(JSON.parse(await plugins.fs.promises.readFile(markerPath, 'utf8')));
|
|
319
|
+
let identity;
|
|
320
|
+
try {
|
|
321
|
+
identity = await this.readProcessIdentity(owner.pid);
|
|
322
|
+
}
|
|
323
|
+
catch (errorArg) {
|
|
324
|
+
throw new Error(`Controller upload owner cannot be verified safely: ${root}`, {
|
|
325
|
+
cause: errorArg,
|
|
326
|
+
});
|
|
327
|
+
}
|
|
328
|
+
stale = !identity || identity.fingerprint !== owner.fingerprint;
|
|
329
|
+
}
|
|
330
|
+
if (!stale)
|
|
331
|
+
continue;
|
|
332
|
+
await this.removeStaleRoot(root, stats);
|
|
333
|
+
}
|
|
334
|
+
}
|
|
335
|
+
async removeStaleRoot(rootArg, identityArg) {
|
|
336
|
+
const current = await plugins.fs.promises.lstat(rootArg);
|
|
337
|
+
if (!current.isDirectory()
|
|
338
|
+
|| current.isSymbolicLink()
|
|
339
|
+
|| current.dev !== identityArg.dev
|
|
340
|
+
|| current.ino !== identityArg.ino)
|
|
341
|
+
throw new Error(`Controller upload root changed before stale cleanup: ${rootArg}`);
|
|
342
|
+
const tombstone = `${rootArg}.stale-${process.pid}-${plugins.crypto.randomBytes(8).toString('hex')}`;
|
|
343
|
+
await plugins.fs.promises.rename(rootArg, tombstone);
|
|
344
|
+
try {
|
|
345
|
+
const moved = await plugins.fs.promises.lstat(tombstone);
|
|
346
|
+
if (moved.dev !== identityArg.dev || moved.ino !== identityArg.ino) {
|
|
347
|
+
throw new Error(`Controller upload stale root identity changed: ${rootArg}`);
|
|
348
|
+
}
|
|
349
|
+
await this.validateStaleTree(tombstone, identityArg.dev);
|
|
350
|
+
await plugins.fs.promises.rm(tombstone, { recursive: true, force: true });
|
|
351
|
+
}
|
|
352
|
+
finally {
|
|
353
|
+
const parentHandle = await plugins.fs.promises.open(plugins.path.dirname(rootArg), plugins.fs.constants.O_RDONLY);
|
|
354
|
+
try {
|
|
355
|
+
await parentHandle.sync();
|
|
356
|
+
}
|
|
357
|
+
finally {
|
|
358
|
+
await parentHandle.close();
|
|
359
|
+
}
|
|
360
|
+
}
|
|
361
|
+
}
|
|
362
|
+
async validateStaleTree(rootArg, deviceArg) {
|
|
363
|
+
const pending = [{ path: rootArg, depth: 0 }];
|
|
364
|
+
let inspected = 0;
|
|
365
|
+
while (pending.length > 0) {
|
|
366
|
+
const current = pending.pop();
|
|
367
|
+
const entries = await plugins.fs.promises.readdir(current.path, { withFileTypes: true });
|
|
368
|
+
inspected += entries.length;
|
|
369
|
+
if (inspected > maximumStaleUploadNodes) {
|
|
370
|
+
throw new Error(`Controller upload stale tree contains too many entries: ${rootArg}`);
|
|
371
|
+
}
|
|
372
|
+
for (const entry of entries) {
|
|
373
|
+
const path = plugins.path.join(current.path, entry.name);
|
|
374
|
+
const stats = await plugins.fs.promises.lstat(path);
|
|
375
|
+
if (stats.dev !== deviceArg
|
|
376
|
+
|| (typeof process.getuid === 'function' && stats.uid !== process.getuid()))
|
|
377
|
+
throw new Error(`Controller upload stale tree contains a foreign node: ${path}`);
|
|
378
|
+
if (!stats.isDirectory() || stats.isSymbolicLink())
|
|
379
|
+
continue;
|
|
380
|
+
if (current.depth >= maximumStaleUploadDepth) {
|
|
381
|
+
throw new Error(`Controller upload stale tree is too deep: ${path}`);
|
|
382
|
+
}
|
|
383
|
+
pending.push({ path, depth: current.depth + 1 });
|
|
384
|
+
}
|
|
385
|
+
}
|
|
386
|
+
}
|
|
185
387
|
async cleanup(idArg) {
|
|
186
388
|
const active = this.activeUploads.get(idArg);
|
|
187
389
|
if (!active)
|
|
@@ -207,4 +409,4 @@ export class ControllerUploadManager {
|
|
|
207
409
|
}
|
|
208
410
|
}
|
|
209
411
|
}
|
|
210
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.uploadmanager.js","sourceRoot":"","sources":["../../ts/classes.uploadmanager.ts"],"names":[],"mappings":"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"}
|
|
412
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.uploadmanager.js","sourceRoot":"","sources":["../../ts/classes.uploadmanager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
export const upgradeTokenEnvironmentVariable = 'HARNESS_CONTROLLER_UPGRADE_TOKEN';
|
|
2
|
+
export const upgradeCoordinationRootEnvironmentVariable = 'AGL_UPGRADE_COORDINATION_ROOT';
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLnVwZ3JhZGVlbnZpcm9ubWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2NvbnN0YW50cy51cGdyYWRlZW52aXJvbm1lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxDQUFDLE1BQU0sK0JBQStCLEdBQUcsa0NBQWtDLENBQUM7QUFDbEYsTUFBTSxDQUFDLE1BQU0sMENBQTBDLEdBQUcsK0JBQStCLENBQUMifQ==
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
import {
|
|
3
|
-
export interface IEnsureControllerDataRootOptions extends
|
|
4
|
-
listDataWriterProcesses?: () => Promise<readonly IControllerDataWriterProcessRecord[]>;
|
|
5
|
-
signal?: AbortSignal;
|
|
1
|
+
import { type IAGLHomeDataRootMigrationOptions } from '../dist_ts_migration/v23_aglhome.js';
|
|
2
|
+
import type { IControllerDataRootMigrationResult } from '../dist_ts_migration/v2_controllerdataroot.js';
|
|
3
|
+
export interface IEnsureControllerDataRootOptions extends IAGLHomeDataRootMigrationOptions {
|
|
6
4
|
}
|
|
5
|
+
export declare const preflightAGLHomeMigration: (optionsArg?: IEnsureControllerDataRootOptions) => Promise<void>;
|
|
7
6
|
export declare const ensureControllerDataRoot: (optionsArg?: IEnsureControllerDataRootOptions) => Promise<IControllerDataRootMigrationResult>;
|
|
8
7
|
export interface IEnsureControllerDataRootForStartupOptions extends IEnsureControllerDataRootOptions {
|
|
9
8
|
retainOnFailure: boolean;
|
|
@@ -1,31 +1,6 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
import { embeddedDatabaseSocketPath } from './functions.embeddeddb.js';
|
|
5
|
-
import { ControllerDataRootMigrationRunner, } from '../dist_ts_migration/v2_controllerdataroot.js';
|
|
6
|
-
export const ensureControllerDataRoot = async (optionsArg = {}) => {
|
|
7
|
-
const roots = controllerDataRootPaths(optionsArg);
|
|
8
|
-
const databaseConfig = readDatabaseConfig(optionsArg);
|
|
9
|
-
if (!roots.migrationRequired) {
|
|
10
|
-
return { directoryPath: roots.targetRoot, databaseConfig };
|
|
11
|
-
}
|
|
12
|
-
const listDataWriterProcesses = optionsArg.listDataWriterProcesses ?? (async () => {
|
|
13
|
-
const cliPath = await plugins.fs.promises.realpath(plugins.url.fileURLToPath(new URL('../cli.js', import.meta.url)));
|
|
14
|
-
return await listControllerDataWriterProcessesForCliPaths([cliPath], {
|
|
15
|
-
includeInstalledPackagePaths: true,
|
|
16
|
-
});
|
|
17
|
-
});
|
|
18
|
-
return await new ControllerDataRootMigrationRunner({
|
|
19
|
-
oldRoot: roots.legacyRoot,
|
|
20
|
-
newRoot: roots.targetRoot,
|
|
21
|
-
databaseConfig,
|
|
22
|
-
oldEmbeddedSocketPath: embeddedDatabaseSocketPath(plugins.path.join(roots.legacyRoot, 'smartdb')),
|
|
23
|
-
newEmbeddedSocketPath: embeddedDatabaseSocketPath(plugins.path.join(roots.targetRoot, 'smartdb')),
|
|
24
|
-
invokerPid: process.pid,
|
|
25
|
-
listDataWriterProcesses,
|
|
26
|
-
...(optionsArg.signal ? { signal: optionsArg.signal } : {}),
|
|
27
|
-
}).run();
|
|
28
|
-
};
|
|
1
|
+
import { ensureAGLHomeDataRoot, preflightAGLHomeDataRootMigration, } from '../dist_ts_migration/v23_aglhome.js';
|
|
2
|
+
export const preflightAGLHomeMigration = async (optionsArg = {}) => await preflightAGLHomeDataRootMigration(optionsArg);
|
|
3
|
+
export const ensureControllerDataRoot = async (optionsArg = {}) => await ensureAGLHomeDataRoot(optionsArg);
|
|
29
4
|
export const ensureControllerDataRootForStartup = async (optionsArg) => {
|
|
30
5
|
const ensureDataRoot = optionsArg.ensureDataRoot ?? ensureControllerDataRoot;
|
|
31
6
|
let lastFailureLogAt = 0;
|
|
@@ -73,4 +48,4 @@ export const ensureControllerDataRootForStartup = async (optionsArg) => {
|
|
|
73
48
|
}
|
|
74
49
|
}
|
|
75
50
|
};
|
|
76
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25zLmNvbnRyb2xsZXJkYXRhcm9vdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2Z1bmN0aW9ucy5jb250cm9sbGVyZGF0YXJvb3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLHFCQUFxQixFQUNyQixpQ0FBaUMsR0FFbEMsTUFBTSxnQ0FBZ0MsQ0FBQztBQUt4QyxNQUFNLENBQUMsTUFBTSx5QkFBeUIsR0FBRyxLQUFLLEVBQzVDLGFBQStDLEVBQUUsRUFDbEMsRUFBRSxDQUFDLE1BQU0saUNBQWlDLENBQUMsVUFBVSxDQUFDLENBQUM7QUFFeEUsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQUcsS0FBSyxFQUMzQyxhQUErQyxFQUFFLEVBQ0osRUFBRSxDQUFDLE1BQU0scUJBQXFCLENBQUMsVUFBVSxDQUFDLENBQUM7QUFXMUYsTUFBTSxDQUFDLE1BQU0sa0NBQWtDLEdBQUcsS0FBSyxFQUNyRCxVQUFzRCxFQUNULEVBQUU7SUFDL0MsTUFBTSxjQUFjLEdBQUcsVUFBVSxDQUFDLGNBQWMsSUFBSSx3QkFBd0IsQ0FBQztJQUM3RSxJQUFJLGdCQUFnQixHQUFHLENBQUMsQ0FBQztJQUN6QixPQUFPLElBQUksRUFBRSxDQUFDO1FBQ1osSUFBSSxDQUFDO1lBQ0gsT0FBTyxNQUFNLGNBQWMsQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUMxQyxDQUFDO1FBQUMsT0FBTyxRQUFRLEVBQUUsQ0FBQztZQUNsQixJQUFJLENBQUMsVUFBVSxDQUFDLGVBQWU7Z0JBQUUsTUFBTSxRQUFRLENBQUM7WUFDaEQsTUFBTSxLQUFLLEdBQUcsUUFBUSxZQUFZLEtBQUssQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQztZQUNqRixJQUFJLElBQUksQ0FBQyxHQUFHLEVBQUUsR0FBRyxnQkFBZ0IsSUFBSSxNQUFNLEVBQUUsQ0FBQztnQkFDNUMsZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDO2dCQUM5QixJQUFJLENBQUM7b0JBQ0gsQ0FBQyxVQUFVLENBQUMsYUFBYSxJQUFJLENBQUMsQ0FBQyxnQkFBZ0IsRUFBRSxFQUFFLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FDL0QseUVBQXlFLEVBQ3pFLGdCQUFnQixDQUNqQixDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQztnQkFDYixDQUFDO2dCQUFDLE9BQU8sY0FBYyxFQUFFLENBQUM7b0JBQ3hCLE9BQU8sQ0FBQyxLQUFLLENBQUMsa0RBQWtELEVBQUUsY0FBYyxDQUFDLENBQUM7Z0JBQ3BGLENBQUM7WUFDSCxDQUFDO1lBQ0QsSUFBSSxDQUFDO2dCQUNILE1BQU0sVUFBVSxDQUFDLFNBQVMsRUFBRSxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ3RDLENBQUM7WUFBQyxPQUFPLGNBQWMsRUFBRSxDQUFDO2dCQUN4QixPQUFPLENBQUMsS0FBSyxDQUFDLHlEQUF5RCxFQUFFLGNBQWMsQ0FBQyxDQUFDO1lBQzNGLENBQUM7WUFDRCxNQUFNLElBQUksT0FBTyxDQUFPLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUFFO2dCQUMxQyxNQUFNLE1BQU0sR0FBRyxVQUFVLENBQUMsTUFBTSxDQUFDO2dCQUNqQyxNQUFNLE9BQU8sR0FBRyxVQUFVLENBQUMsTUFBTSxFQUFFLFVBQVUsQ0FBQyxZQUFZLElBQUksS0FBSyxDQUFDLENBQUM7Z0JBQ3JFLE1BQU0sT0FBTyxHQUFHLEdBQUcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsTUFBTSxZQUFZLEtBQUs7b0JBQzFELENBQUMsQ0FBQyxNQUFNLENBQUMsTUFBTTtvQkFDZixDQUFDLENBQUMsSUFBSSxLQUFLLENBQUMsK0NBQStDLENBQUMsQ0FBQyxDQUFDO2dCQUNoRSxTQUFTLE1BQU0sQ0FBQyxRQUFnQjtvQkFDOUIsWUFBWSxDQUFDLE9BQU8sQ0FBQyxDQUFDO29CQUN0QixNQUFNLEVBQUUsbUJBQW1CLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFDO29CQUM5QyxJQUFJLFFBQVE7d0JBQUUsTUFBTSxDQUFDLFFBQVEsQ0FBQyxDQUFDOzt3QkFDMUIsT0FBTyxFQUFFLENBQUM7Z0JBQ2pCLENBQUM7Z0JBQ0QsTUFBTSxFQUFFLGdCQUFnQixDQUFDLE9BQU8sRUFBRSxPQUFPLEVBQUUsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztnQkFDM0QsSUFBSSxNQUFNLEVBQUUsT0FBTztvQkFBRSxPQUFPLEVBQUUsQ0FBQztZQUNqQyxDQUFDLENBQUMsQ0FBQztRQUNMLENBQUM7SUFDSCxDQUFDO0FBQ0gsQ0FBQyxDQUFDIn0=
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const embeddedDatabaseSocketPath: (dataDirectoryArg: string) => string;
|
|
1
|
+
export declare const embeddedDatabaseSocketPath: (dataDirectoryArg: string, socketDirectoryArg?: string) => string;
|
|
2
2
|
export declare const isSocketListening: (socketPathArg: string) => Promise<boolean>;
|
|
@@ -1,11 +1,16 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
|
-
|
|
2
|
+
import { resolveAGLHomePaths } from './classes.aglhome.js';
|
|
3
|
+
export const embeddedDatabaseSocketPath = (dataDirectoryArg, socketDirectoryArg = resolveAGLHomePaths().sockets) => {
|
|
3
4
|
const directoryHash = plugins.crypto
|
|
4
5
|
.createHash('sha256')
|
|
5
6
|
.update(dataDirectoryArg)
|
|
6
7
|
.digest('hex')
|
|
7
8
|
.slice(0, 16);
|
|
8
|
-
|
|
9
|
+
const socketPath = plugins.path.join(socketDirectoryArg, `smartdb-${directoryHash}.sock`);
|
|
10
|
+
if (Buffer.byteLength(socketPath, 'utf8') > 100) {
|
|
11
|
+
throw new Error('AGL_HOME is too long for the embedded database Unix socket path.');
|
|
12
|
+
}
|
|
13
|
+
return socketPath;
|
|
9
14
|
};
|
|
10
15
|
export const isSocketListening = (socketPathArg) => new Promise((resolve) => {
|
|
11
16
|
const probe = plugins.net.createConnection({ path: socketPathArg }, () => {
|
|
@@ -18,4 +23,4 @@ export const isSocketListening = (socketPathArg) => new Promise((resolve) => {
|
|
|
18
23
|
resolve(false);
|
|
19
24
|
});
|
|
20
25
|
});
|
|
21
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25zLmVtYmVkZGVkZGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9mdW5jdGlvbnMuZW1iZWRkZWRkYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUUzRCxNQUFNLENBQUMsTUFBTSwwQkFBMEIsR0FBRyxDQUN4QyxnQkFBd0IsRUFDeEIsa0JBQWtCLEdBQUcsbUJBQW1CLEVBQUUsQ0FBQyxPQUFPLEVBQzFDLEVBQUU7SUFDVixNQUFNLGFBQWEsR0FBRyxPQUFPLENBQUMsTUFBTTtTQUNqQyxVQUFVLENBQUMsUUFBUSxDQUFDO1NBQ3BCLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQztTQUN4QixNQUFNLENBQUMsS0FBSyxDQUFDO1NBQ2IsS0FBSyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNoQixNQUFNLFVBQVUsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FDbEMsa0JBQWtCLEVBQ2xCLFdBQVcsYUFBYSxPQUFPLENBQ2hDLENBQUM7SUFDRixJQUFJLE1BQU0sQ0FBQyxVQUFVLENBQUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxHQUFHLEdBQUcsRUFBRSxDQUFDO1FBQ2hELE1BQU0sSUFBSSxLQUFLLENBQUMsa0VBQWtFLENBQUMsQ0FBQztJQUN0RixDQUFDO0lBQ0QsT0FBTyxVQUFVLENBQUM7QUFDcEIsQ0FBQyxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0saUJBQWlCLEdBQUcsQ0FBQyxhQUFxQixFQUFvQixFQUFFLENBQUMsSUFBSSxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRTtJQUNwRyxNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBRSxFQUFFLEdBQUcsRUFBRTtRQUN2RSxLQUFLLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDaEIsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ2hCLENBQUMsQ0FBQyxDQUFDO0lBQ0gsS0FBSyxDQUFDLEVBQUUsQ0FBQyxPQUFPLEVBQUUsR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7SUFDeEMsS0FBSyxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsR0FBRyxFQUFFO1FBQ3pCLEtBQUssQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNoQixPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDakIsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUMsQ0FBQyJ9
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
const controllerEnvironmentPrefix = 'HARNESS_CONTROLLER_';
|
|
2
2
|
const forwardedEnvironmentVariable = 'HARNESS_CONTROLLER_FORWARD_ENV';
|
|
3
3
|
const runtimeEnvironmentAllowlist = new Set([
|
|
4
|
+
'AGL_HOME',
|
|
4
5
|
'APPDATA', 'COLORTERM', 'COMSPEC', 'FORCE_COLOR', 'HOME', 'HOMEDRIVE',
|
|
5
6
|
'HOMEPATH', 'HTTP_PROXY', 'HTTPS_PROXY', 'LANG', 'LOCALAPPDATA', 'LOGNAME',
|
|
6
7
|
'NODE_EXTRA_CA_CERTS', 'NO_PROXY', 'PATH', 'PATHEXT', 'SHELL', 'SSL_CERT_DIR',
|
|
@@ -76,4 +77,4 @@ export const createSanitizedRuntimeEnvironment = (environmentArg = process.env)
|
|
|
76
77
|
}
|
|
77
78
|
return environment;
|
|
78
79
|
};
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnVuY3Rpb25zLnJ1bnRpbWVlbnZpcm9ubWVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzL2Z1bmN0aW9ucy5ydW50aW1lZW52aXJvbm1lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSwyQkFBMkIsR0FBRyxxQkFBcUIsQ0FBQztBQUMxRCxNQUFNLDRCQUE0QixHQUFHLGdDQUFnQyxDQUFDO0FBQ3RFLE1BQU0sMkJBQTJCLEdBQUcsSUFBSSxHQUFHLENBQUM7SUFDMUMsVUFBVTtJQUNWLFNBQVMsRUFBRSxXQUFXLEVBQUUsU0FBUyxFQUFFLGFBQWEsRUFBRSxNQUFNLEVBQUUsV0FBVztJQUNyRSxVQUFVLEVBQUUsWUFBWSxFQUFFLGFBQWEsRUFBRSxNQUFNLEVBQUUsY0FBYyxFQUFFLFNBQVM7SUFDMUUscUJBQXFCLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxTQUFTLEVBQUUsT0FBTyxFQUFFLGNBQWM7SUFDN0UsZUFBZSxFQUFFLFlBQVksRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLE1BQU07SUFDNUUsYUFBYSxFQUFFLFFBQVEsRUFBRSxnQkFBZ0IsRUFBRSxpQkFBaUIsRUFBRSxlQUFlO0lBQzdFLGlCQUFpQixFQUFFLGdCQUFnQjtDQUNwQyxDQUFDLENBQUM7QUFDSCxNQUFNLDBCQUEwQixHQUFHLDJCQUEyQixDQUFDO0FBQy9ELE1BQU0seUJBQXlCLEdBQUcsSUFBSSxHQUFHLENBQUMsQ0FBQyxZQUFZLEVBQUUsYUFBYSxDQUFDLENBQUMsQ0FBQztBQUN6RSxNQUFNLGdDQUFnQyxHQUFHLEVBQUUsQ0FBQztBQUM1QyxNQUFNLDJCQUEyQixHQUFHLElBQUksQ0FBQztBQUV6QyxNQUFNLHVDQUF1QyxHQUFHLENBQUMsY0FBaUMsRUFBWSxFQUFFO0lBQzlGLE1BQU0sbUJBQW1CLEdBQUcsY0FBYyxDQUFDLDRCQUE0QixDQUFDLENBQUM7SUFDekUs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
|
package/dist_ts/index.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ export * from './00_commitinfo_data.js';
|
|
|
3
3
|
export * from './interfaces.auth.js';
|
|
4
4
|
export * from './interfaces.config.js';
|
|
5
5
|
export * from './interfaces.lifecycle.js';
|
|
6
|
+
export * from './classes.aglhome.js';
|
|
6
7
|
export { openCodeExpectedVersion, openCodeUsername, type IOpenCodeClientOptions, type IOpenCodeConnectionConfig, type IOpenCodeEventStreamOptions, type IOpenCodeHealth, type IOpenCodeLogEntry, type IOpenCodeProcessGroupController, type IOpenCodeSupervisorOptions, type IOpenCodeSupervisorStatus, type TOpenCodeSdkClient, } from './interfaces.opencode.js';
|
|
7
8
|
export * from './interfaces.projects.js';
|
|
8
9
|
export * from './interfaces.gitreversion.js';
|
package/dist_ts/index.js
CHANGED
|
@@ -3,6 +3,7 @@ export * from './00_commitinfo_data.js';
|
|
|
3
3
|
export * from './interfaces.auth.js';
|
|
4
4
|
export * from './interfaces.config.js';
|
|
5
5
|
export * from './interfaces.lifecycle.js';
|
|
6
|
+
export * from './classes.aglhome.js';
|
|
6
7
|
export { openCodeExpectedVersion, openCodeUsername, } from './interfaces.opencode.js';
|
|
7
8
|
export * from './interfaces.projects.js';
|
|
8
9
|
export * from './interfaces.gitreversion.js';
|
|
@@ -22,4 +23,4 @@ export * from './classes.processinspection.js';
|
|
|
22
23
|
export * from './classes.upgradecoordinator.js';
|
|
23
24
|
export * from './classes.upgradetransaction.js';
|
|
24
25
|
export * from './classes.validation.js';
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLDJCQUEyQixDQUFDO0FBRTFDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsMkJBQTJCLENBQUM7QUFDMUMsY0FBYyxzQkFBc0IsQ0FBQztBQUNyQyxPQUFPLEVBQ0wsdUJBQXVCLEVBQ3ZCLGdCQUFnQixHQVVqQixNQUFNLDBCQUEwQixDQUFDO0FBQ2xDLGNBQWMsMEJBQTBCLENBQUM7QUFDekMsY0FBYyw4QkFBOEIsQ0FBQztBQUU3QyxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyxrQ0FBa0MsQ0FBQztBQUNqRCxjQUFjLG1DQUFtQyxDQUFDO0FBQ2xELGNBQWMsa0NBQWtDLENBQUM7QUFDakQsY0FBYywyQkFBMkIsQ0FBQztBQUMxQyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsaUNBQWlDLENBQUM7QUFDaEQsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLGdDQUFnQyxDQUFDO0FBQy9DLGNBQWMsaUNBQWlDLENBQUM7QUFDaEQsY0FBYyxpQ0FBaUMsQ0FBQztBQUNoRCxjQUFjLHlCQUF5QixDQUFDIn0=
|
|
@@ -3,14 +3,11 @@ export interface IControllerRuntimeConfig {
|
|
|
3
3
|
controllerPort: number;
|
|
4
4
|
publicOrigin: string;
|
|
5
5
|
rpId: string;
|
|
6
|
-
workspaceDirectory: string;
|
|
7
6
|
/**
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
* once (from --projects-root, else the workspace directory), after which it
|
|
11
|
-
* is immutable like every other boundary.
|
|
7
|
+
* Default base for relative project paths and suggestions. Absolute projects
|
|
8
|
+
* remain independently identity-bound and may live outside this directory.
|
|
12
9
|
*/
|
|
13
|
-
projectsRoot
|
|
10
|
+
projectsRoot: string;
|
|
14
11
|
opencodePort: number;
|
|
15
12
|
tlsMode: TControllerTlsMode;
|
|
16
13
|
}
|
|
@@ -18,7 +15,8 @@ export interface IControllerRuntimeOverrides {
|
|
|
18
15
|
controllerPort: number;
|
|
19
16
|
publicOrigin?: string;
|
|
20
17
|
rpId?: string;
|
|
21
|
-
|
|
18
|
+
/** Explicit one-time project registration; never persisted as runtime config. */
|
|
19
|
+
initialProjectDirectory?: string;
|
|
22
20
|
projectsRoot?: string;
|
|
23
21
|
opencodePort?: number;
|
|
24
22
|
behindTlsProxy?: boolean;
|
|
@@ -2,12 +2,14 @@ import * as plugins from '../dist_ts/plugins.js';
|
|
|
2
2
|
import { ProtocolV6DocumentMigration } from './v6_protocoldocumentmigration.js';
|
|
3
3
|
import { ProtocolV18ResourceLayoutMigration } from './v18_resourcelayoutmigration.js';
|
|
4
4
|
import { ProtocolV22ProjectFilesystemIdentityMigration } from './v22_projectfilesystemidentitymigration.js';
|
|
5
|
+
import { RuntimeConfigV23Migration } from './v23_runtimeconfig.js';
|
|
5
6
|
export class PostDatabaseDocumentMigrationRunner {
|
|
6
7
|
database;
|
|
7
8
|
migrations;
|
|
8
9
|
constructor(database) {
|
|
9
10
|
this.database = database;
|
|
10
11
|
this.migrations = [
|
|
12
|
+
new RuntimeConfigV23Migration(this.database),
|
|
11
13
|
new ProtocolV6DocumentMigration(this.database),
|
|
12
14
|
new ProtocolV18ResourceLayoutMigration(this.database),
|
|
13
15
|
];
|
|
@@ -21,4 +23,4 @@ export class PostDatabaseDocumentMigrationRunner {
|
|
|
21
23
|
await new ProtocolV22ProjectFilesystemIdentityMigration(this.database, controllerIdArg).run();
|
|
22
24
|
}
|
|
23
25
|
}
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5kb2N1bWVudG1pZ3JhdGlvbnJ1bm5lci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3RzX21pZ3JhdGlvbi9jbGFzc2VzLmRvY3VtZW50bWlncmF0aW9ucnVubmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sbUNBQW1DLENBQUM7QUFDaEYsT0FBTyxFQUFFLGtDQUFrQyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDdEYsT0FBTyxFQUFFLDZDQUE2QyxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFDNUcsT0FBTyxFQUFFLHlCQUF5QixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFNbkUsTUFBTSxPQUFPLG1DQUFtQztJQUdqQjtJQUZaLFVBQVUsQ0FBdUI7SUFFbEQsWUFBNkIsUUFBbUQ7UUFBbkQsYUFBUSxHQUFSLFFBQVEsQ0FBMkM7UUFDOUUsSUFBSSxDQUFDLFVBQVUsR0FBRztZQUNoQixJQUFJLHlCQUF5QixDQUFDLElBQUksQ0FBQyxRQUFRLENBQUM7WUFDNUMsSUFBSSwyQkFBMkIsQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDO1lBQzlDLElBQUksa0NBQWtDLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQztTQUN0RCxDQUFDO0lBQ0osQ0FBQztJQUVNLEtBQUssQ0FBQyxHQUFHO1FBQ2QsS0FBSyxNQUFNLFNBQVMsSUFBSSxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7WUFDeEMsTUFBTSxTQUFTLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDeEIsQ0FBQztJQUNILENBQUM7SUFFTSxLQUFLLENBQUMsNEJBQTRCLENBQUMsZUFBdUI7UUFDL0QsTUFBTSxJQUFJLDZDQUE2QyxDQUNyRCxJQUFJLENBQUMsUUFBUSxFQUNiLGVBQWUsQ0FDaEIsQ0FBQyxHQUFHLEVBQUUsQ0FBQztJQUNWLENBQUM7Q0FDRiJ9
|
|
@@ -10,3 +10,5 @@ export * from './v18_resourcelayoutmigration.js';
|
|
|
10
10
|
export * from './classes.flexpostharnessmigrationrunner.js';
|
|
11
11
|
export * from './v19_flexprojectmanagement.js';
|
|
12
12
|
export * from './v22_projectfilesystemidentitymigration.js';
|
|
13
|
+
export * from './v23_runtimeconfig.js';
|
|
14
|
+
export * from './v23_aglhome.js';
|
|
@@ -10,4 +10,6 @@ export * from './v18_resourcelayoutmigration.js';
|
|
|
10
10
|
export * from './classes.flexpostharnessmigrationrunner.js';
|
|
11
11
|
export * from './v19_flexprojectmanagement.js';
|
|
12
12
|
export * from './v22_projectfilesystemidentitymigration.js';
|
|
13
|
-
|
|
13
|
+
export * from './v23_runtimeconfig.js';
|
|
14
|
+
export * from './v23_aglhome.js';
|
|
15
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90c19taWdyYXRpb24vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyw4QkFBOEIsQ0FBQztBQUM3QyxjQUFjLGtDQUFrQyxDQUFDO0FBQ2pELGNBQWMsa0NBQWtDLENBQUM7QUFDakQsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLGlDQUFpQyxDQUFDO0FBQ2hELGNBQWMsOEJBQThCLENBQUM7QUFDN0MsY0FBYyxrQ0FBa0MsQ0FBQztBQUNqRCxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMsa0NBQWtDLENBQUM7QUFDakQsY0FBYyw2Q0FBNkMsQ0FBQztBQUM1RCxjQUFjLGdDQUFnQyxDQUFDO0FBQy9DLGNBQWMsNkNBQTZDLENBQUM7QUFDNUQsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLGtCQUFrQixDQUFDIn0=
|