@push.rocks/smartdb 3.0.0 → 3.0.2
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/dist_rust/rustdb_linux_amd64 +0 -0
- package/dist_rust/rustdb_linux_arm64 +0 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/ts_migration/classes.authmetadatamigrationrunner.d.ts +2 -1
- package/dist_ts/ts_migration/classes.authmetadatamigrationrunner.js +3 -3
- package/dist_ts/ts_migration/classes.storagemigrator.d.ts +2 -1
- package/dist_ts/ts_migration/classes.storagemigrator.js +36 -20
- package/dist_ts/ts_migration/index.d.ts +1 -0
- package/dist_ts/ts_migration/index.js +2 -1
- package/dist_ts/ts_migration/migrators/v0_to_v1.d.ts +7 -1
- package/dist_ts/ts_migration/migrators/v0_to_v1.js +162 -47
- package/dist_ts/ts_migration/migrators/v1_auth_metadata_permissions.d.ts +3 -2
- package/dist_ts/ts_migration/migrators/v1_auth_metadata_permissions.js +3 -3
- package/dist_ts/ts_smartdb/rust-db-bridge.d.ts +2 -2
- package/dist_ts/ts_smartdb/rust-db-bridge.js +24 -10
- package/dist_ts/ts_smartdb/server/SmartdbServer.d.ts +1 -1
- package/dist_ts/ts_smartdb/server/SmartdbServer.js +76 -9
- package/package.json +1 -1
- package/readme.md +16 -3
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/ts_migration/classes.authmetadatamigrationrunner.ts +3 -1
- package/ts/ts_migration/classes.storagemigrator.ts +38 -19
- package/ts/ts_migration/index.ts +1 -0
- package/ts/ts_migration/migrators/v0_to_v1.ts +224 -44
- package/ts/ts_migration/migrators/v1_auth_metadata_permissions.ts +4 -0
- package/ts/ts_smartdb/rust-db-bridge.ts +32 -11
- package/ts/ts_smartdb/server/SmartdbServer.ts +89 -9
|
Binary file
|
|
Binary file
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartdb',
|
|
6
|
-
version: '3.0.
|
|
6
|
+
version: '3.0.2',
|
|
7
7
|
description: 'A MongoDB-compatible embedded database server with wire protocol support, backed by a high-performance Rust engine.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxxQkFBcUI7SUFDM0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHFIQUFxSDtDQUNuSSxDQUFBIn0=
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { type IAuthMetadataPermissionMigrationBridge, type TAuthMetadataPermissionMigrationStatus } from './migrators/v1_auth_metadata_permissions.js';
|
|
2
|
+
import type { ISmartDbManagementOperationOptions } from '../ts_smartdb/service-types.js';
|
|
2
3
|
export type TAuthMetadataMigrationRunnerStatus = TAuthMetadataPermissionMigrationStatus | 'not-applicable';
|
|
3
4
|
export declare class AuthMetadataMigrationRunner {
|
|
4
5
|
private readonly usersPath;
|
|
5
6
|
constructor(usersPath: string);
|
|
6
|
-
run(bridgeArg: IAuthMetadataPermissionMigrationBridge): Promise<TAuthMetadataMigrationRunnerStatus>;
|
|
7
|
+
run(bridgeArg: IAuthMetadataPermissionMigrationBridge, optionsArg?: ISmartDbManagementOperationOptions): Promise<TAuthMetadataMigrationRunnerStatus>;
|
|
7
8
|
}
|
|
8
9
|
export type { IAuthMetadataPermissionMigrationBridge };
|
|
@@ -4,14 +4,14 @@ export class AuthMetadataMigrationRunner {
|
|
|
4
4
|
constructor(usersPath) {
|
|
5
5
|
this.usersPath = usersPath;
|
|
6
6
|
}
|
|
7
|
-
async run(bridgeArg) {
|
|
7
|
+
async run(bridgeArg, optionsArg) {
|
|
8
8
|
if (process.platform !== 'linux')
|
|
9
9
|
return 'not-applicable';
|
|
10
10
|
let status = 'not-present';
|
|
11
11
|
for (const migration of authMetadataMigrations) {
|
|
12
|
-
status = await migration(bridgeArg, this.usersPath);
|
|
12
|
+
status = await migration(bridgeArg, this.usersPath, optionsArg);
|
|
13
13
|
}
|
|
14
14
|
return status;
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5hdXRobWV0YWRhdGFtaWdyYXRpb25ydW5uZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy90c19taWdyYXRpb24vY2xhc3Nlcy5hdXRobWV0YWRhdGFtaWdyYXRpb25ydW5uZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUNMLGdDQUFnQyxHQUdqQyxNQUFNLDZDQUE2QyxDQUFDO0FBR3JELE1BQU0sc0JBQXNCLEdBQUcsQ0FBQyxnQ0FBZ0MsQ0FBVSxDQUFDO0FBTTNFLE1BQU0sT0FBTywyQkFBMkI7SUFDdEMsWUFBNkIsU0FBaUI7UUFBakIsY0FBUyxHQUFULFNBQVMsQ0FBUTtJQUFHLENBQUM7SUFFM0MsS0FBSyxDQUFDLEdBQUcsQ0FDZCxTQUFpRCxFQUNqRCxVQUErQztRQUUvQyxJQUFJLE9BQU8sQ0FBQyxRQUFRLEtBQUssT0FBTztZQUFFLE9BQU8sZ0JBQWdCLENBQUM7UUFDMUQsSUFBSSxNQUFNLEdBQTJDLGFBQWEsQ0FBQztRQUNuRSxLQUFLLE1BQU0sU0FBUyxJQUFJLHNCQUFzQixFQUFFLENBQUM7WUFDL0MsTUFBTSxHQUFHLE1BQU0sU0FBUyxDQUFDLFNBQVMsRUFBRSxJQUFJLENBQUMsU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBQ2xFLENBQUM7UUFDRCxPQUFPLE1BQU0sQ0FBQztJQUNoQixDQUFDO0NBQ0YifQ==
|
|
@@ -13,7 +13,7 @@ export declare class StorageMigrator {
|
|
|
13
13
|
/**
|
|
14
14
|
* Run any needed migrations. Safe to call even if storage is already current.
|
|
15
15
|
*/
|
|
16
|
-
run(): Promise<void>;
|
|
16
|
+
run(signalArg?: AbortSignal): Promise<void>;
|
|
17
17
|
/**
|
|
18
18
|
* Detect the storage format version by inspecting the directory structure.
|
|
19
19
|
*
|
|
@@ -21,4 +21,5 @@ export declare class StorageMigrator {
|
|
|
21
21
|
* v1: {db}/{coll}/data.rdb directories exist
|
|
22
22
|
*/
|
|
23
23
|
private detectVersion;
|
|
24
|
+
private pathExists;
|
|
24
25
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import * as fs from 'fs';
|
|
2
|
-
import * as path from 'path';
|
|
1
|
+
import * as fs from 'node:fs/promises';
|
|
2
|
+
import * as path from 'node:path';
|
|
3
3
|
import { migrateV0ToV1 } from './migrators/v0_to_v1.js';
|
|
4
4
|
/**
|
|
5
5
|
* StorageMigrator — runs before the Rust engine starts.
|
|
@@ -17,18 +17,21 @@ export class StorageMigrator {
|
|
|
17
17
|
/**
|
|
18
18
|
* Run any needed migrations. Safe to call even if storage is already current.
|
|
19
19
|
*/
|
|
20
|
-
async run() {
|
|
21
|
-
|
|
20
|
+
async run(signalArg) {
|
|
21
|
+
signalArg?.throwIfAborted();
|
|
22
|
+
if (!await this.pathExists(this.storagePath)) {
|
|
22
23
|
return; // No data yet — nothing to migrate
|
|
23
24
|
}
|
|
24
|
-
const version = this.detectVersion();
|
|
25
|
+
const version = await this.detectVersion(signalArg);
|
|
26
|
+
signalArg?.throwIfAborted();
|
|
25
27
|
if (version === 1) {
|
|
26
28
|
return; // Already current
|
|
27
29
|
}
|
|
28
30
|
if (version === 0) {
|
|
29
31
|
console.log(`[smartdb] Detected v0 (JSON) storage format at ${this.storagePath}`);
|
|
30
32
|
console.log(`[smartdb] Running migration v0 → v1 (Bitcask binary format)...`);
|
|
31
|
-
const deletableFiles = await migrateV0ToV1(this.storagePath);
|
|
33
|
+
const deletableFiles = await migrateV0ToV1(this.storagePath, signalArg);
|
|
34
|
+
signalArg?.throwIfAborted();
|
|
32
35
|
if (deletableFiles.length > 0) {
|
|
33
36
|
console.log(`[smartdb] Migration v0 → v1 complete.`);
|
|
34
37
|
console.log(`[smartdb] The following old files can be safely deleted:`);
|
|
@@ -47,33 +50,46 @@ export class StorageMigrator {
|
|
|
47
50
|
* v0: {db}/{coll}.json files exist
|
|
48
51
|
* v1: {db}/{coll}/data.rdb directories exist
|
|
49
52
|
*/
|
|
50
|
-
detectVersion() {
|
|
51
|
-
|
|
53
|
+
async detectVersion(signalArg) {
|
|
54
|
+
signalArg?.throwIfAborted();
|
|
55
|
+
const entries = await fs.readdir(this.storagePath, { withFileTypes: true });
|
|
56
|
+
let hasLegacyCollections = false;
|
|
52
57
|
for (const entry of entries) {
|
|
58
|
+
signalArg?.throwIfAborted();
|
|
53
59
|
if (!entry.isDirectory())
|
|
54
60
|
continue;
|
|
55
61
|
if (entry.name.startsWith('.__rustdb_'))
|
|
56
62
|
continue;
|
|
57
63
|
const dbDir = path.join(this.storagePath, entry.name);
|
|
58
|
-
const dbEntries = fs.
|
|
64
|
+
const dbEntries = await fs.readdir(dbDir, { withFileTypes: true });
|
|
59
65
|
for (const dbEntry of dbEntries) {
|
|
66
|
+
signalArg?.throwIfAborted();
|
|
67
|
+
if (dbEntry.isDirectory()
|
|
68
|
+
&& dbEntry.name.startsWith('.__rustdb_migration_')) {
|
|
69
|
+
throw new Error(`SmartDB legacy migration staging is orphaned: ${path.join(dbDir, dbEntry.name)}`);
|
|
70
|
+
}
|
|
60
71
|
if (dbEntry.name.startsWith('.__rustdb_'))
|
|
61
72
|
continue;
|
|
62
|
-
// v1: subdirectory with data.rdb
|
|
63
|
-
if (dbEntry.isDirectory()) {
|
|
64
|
-
const dataRdb = path.join(dbDir, dbEntry.name, 'data.rdb');
|
|
65
|
-
if (fs.existsSync(dataRdb)) {
|
|
66
|
-
return 1;
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
73
|
// v0: .json file (not .indexes.json)
|
|
70
74
|
if (dbEntry.isFile() && dbEntry.name.endsWith('.json') && !dbEntry.name.endsWith('.indexes.json')) {
|
|
71
|
-
|
|
75
|
+
hasLegacyCollections = true;
|
|
72
76
|
}
|
|
73
77
|
}
|
|
74
78
|
}
|
|
75
|
-
//
|
|
76
|
-
|
|
79
|
+
// A mixed layout is an interrupted/resumable migration, not proof that the
|
|
80
|
+
// complete storage root is already current.
|
|
81
|
+
return hasLegacyCollections ? 0 : 1;
|
|
82
|
+
}
|
|
83
|
+
async pathExists(pathArg) {
|
|
84
|
+
try {
|
|
85
|
+
await fs.stat(pathArg);
|
|
86
|
+
return true;
|
|
87
|
+
}
|
|
88
|
+
catch (error) {
|
|
89
|
+
if (error.code === 'ENOENT')
|
|
90
|
+
return false;
|
|
91
|
+
throw error;
|
|
92
|
+
}
|
|
77
93
|
}
|
|
78
94
|
}
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
95
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5zdG9yYWdlbWlncmF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy90c19taWdyYXRpb24vY2xhc3Nlcy5zdG9yYWdlbWlncmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUN2QyxPQUFPLEtBQUssSUFBSSxNQUFNLFdBQVcsQ0FBQztBQUNsQyxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFTeEQ7Ozs7Ozs7O0dBUUc7QUFDSCxNQUFNLE9BQU8sZUFBZTtJQUcxQixZQUFZLFdBQW1CO1FBQzdCLElBQUksQ0FBQyxXQUFXLEdBQUcsV0FBVyxDQUFDO0lBQ2pDLENBQUM7SUFFRDs7T0FFRztJQUNILEtBQUssQ0FBQyxHQUFHLENBQUMsU0FBdUI7UUFDL0IsU0FBUyxFQUFFLGNBQWMsRUFBRSxDQUFDO1FBQzVCLElBQUksQ0FBQyxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUM7WUFDN0MsT0FBTyxDQUFDLG1DQUFtQztRQUM3QyxDQUFDO1FBRUQsTUFBTSxPQUFPLEdBQUcsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3BELFNBQVMsRUFBRSxjQUFjLEVBQUUsQ0FBQztRQUU1QixJQUFJLE9BQU8sS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUNsQixPQUFPLENBQUMsa0JBQWtCO1FBQzVCLENBQUM7UUFFRCxJQUFJLE9BQU8sS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUNsQixPQUFPLENBQUMsR0FBRyxDQUFDLGtEQUFrRCxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQztZQUNsRixPQUFPLENBQUMsR0FBRyxDQUFDLGdFQUFnRSxDQUFDLENBQUM7WUFFOUUsTUFBTSxjQUFjLEdBQUcsTUFBTSxhQUFhLENBQUMsSUFBSSxDQUFDLFdBQVcs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
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
export { StorageMigrator } from './classes.storagemigrator.js';
|
|
2
|
+
export { SmartDbStorageMigrationCleanupError } from './migrators/v0_to_v1.js';
|
|
2
3
|
export { AuthMetadataMigrationRunner, type IAuthMetadataPermissionMigrationBridge, type TAuthMetadataMigrationRunnerStatus, } from './classes.authmetadatamigrationrunner.js';
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export { StorageMigrator } from './classes.storagemigrator.js';
|
|
2
|
+
export { SmartDbStorageMigrationCleanupError } from './migrators/v0_to_v1.js';
|
|
2
3
|
export { AuthMetadataMigrationRunner, } from './classes.authmetadatamigrationrunner.js';
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy90c19taWdyYXRpb24vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQy9ELE9BQU8sRUFBRSxtQ0FBbUMsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQzlFLE9BQU8sRUFDTCwyQkFBMkIsR0FHNUIsTUFBTSwwQ0FBMEMsQ0FBQyJ9
|
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
export declare class SmartDbStorageMigrationCleanupError extends AggregateError {
|
|
2
|
+
constructor(operationErrorArg: unknown, cleanupErrorsArg: unknown[]);
|
|
3
|
+
}
|
|
4
|
+
export declare const runWithOwnedMigrationFileHandle: <TResult, TFileHandle extends {
|
|
5
|
+
close(): Promise<void>;
|
|
6
|
+
}>(fileHandleArg: TFileHandle, operationArg: (fileHandleArg: TFileHandle) => Promise<TResult>, signalArg?: AbortSignal) => Promise<TResult>;
|
|
1
7
|
/**
|
|
2
8
|
* Migrate a storage directory from v0 (JSON-per-collection) to v1 (Bitcask binary).
|
|
3
9
|
*
|
|
@@ -6,4 +12,4 @@
|
|
|
6
12
|
* - Returns a list of old files that can be safely deleted.
|
|
7
13
|
* - On failure, cleans up any partial new files and throws.
|
|
8
14
|
*/
|
|
9
|
-
export declare function migrateV0ToV1(storagePath: string): Promise<string[]>;
|
|
15
|
+
export declare function migrateV0ToV1(storagePath: string, signalArg?: AbortSignal): Promise<string[]>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import * as fs from 'fs';
|
|
2
|
-
import * as path from 'path';
|
|
3
|
-
import * as crypto from 'crypto';
|
|
1
|
+
import * as fs from 'node:fs/promises';
|
|
2
|
+
import * as path from 'node:path';
|
|
3
|
+
import * as crypto from 'node:crypto';
|
|
4
4
|
import { BSON } from 'bson';
|
|
5
5
|
// ---------------------------------------------------------------------------
|
|
6
6
|
// Binary format constants (must match Rust: record.rs)
|
|
@@ -92,6 +92,97 @@ function crc32(data) {
|
|
|
92
92
|
}
|
|
93
93
|
return (crc ^ 0xFFFFFFFF) >>> 0;
|
|
94
94
|
}
|
|
95
|
+
const pathExists = async (pathArg) => {
|
|
96
|
+
try {
|
|
97
|
+
await fs.stat(pathArg);
|
|
98
|
+
return true;
|
|
99
|
+
}
|
|
100
|
+
catch (error) {
|
|
101
|
+
if (error.code === 'ENOENT')
|
|
102
|
+
return false;
|
|
103
|
+
throw error;
|
|
104
|
+
}
|
|
105
|
+
};
|
|
106
|
+
export class SmartDbStorageMigrationCleanupError extends AggregateError {
|
|
107
|
+
constructor(operationErrorArg, cleanupErrorsArg) {
|
|
108
|
+
super([operationErrorArg, ...cleanupErrorsArg], 'SmartDB legacy storage migration failed and staging cleanup was incomplete', { cause: operationErrorArg });
|
|
109
|
+
this.name = 'SmartDbStorageMigrationCleanupError';
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
export const runWithOwnedMigrationFileHandle = async (fileHandleArg, operationArg, signalArg) => {
|
|
113
|
+
let operationResult;
|
|
114
|
+
let operationError;
|
|
115
|
+
let operationCompleted = false;
|
|
116
|
+
try {
|
|
117
|
+
operationResult = await operationArg(fileHandleArg);
|
|
118
|
+
operationCompleted = true;
|
|
119
|
+
}
|
|
120
|
+
catch (error) {
|
|
121
|
+
operationError = error;
|
|
122
|
+
}
|
|
123
|
+
try {
|
|
124
|
+
await fileHandleArg.close();
|
|
125
|
+
}
|
|
126
|
+
catch (closeError) {
|
|
127
|
+
if (operationError !== undefined) {
|
|
128
|
+
throw new SmartDbStorageMigrationCleanupError(operationError, [closeError]);
|
|
129
|
+
}
|
|
130
|
+
if (signalArg?.aborted) {
|
|
131
|
+
throw new SmartDbStorageMigrationCleanupError(signalArg.reason, [closeError]);
|
|
132
|
+
}
|
|
133
|
+
throw closeError;
|
|
134
|
+
}
|
|
135
|
+
if (!operationCompleted)
|
|
136
|
+
throw operationError;
|
|
137
|
+
return operationResult;
|
|
138
|
+
};
|
|
139
|
+
const withFileHandle = async (filePathArg, flagsArg, operationArg, signalArg) => runWithOwnedMigrationFileHandle(await fs.open(filePathArg, flagsArg), operationArg, signalArg);
|
|
140
|
+
const writeBuffer = async (fileHandleArg, bufferArg, signalArg) => {
|
|
141
|
+
let offset = 0;
|
|
142
|
+
while (offset < bufferArg.length) {
|
|
143
|
+
signalArg?.throwIfAborted();
|
|
144
|
+
const { bytesWritten } = await fileHandleArg.write(bufferArg, offset, bufferArg.length - offset, null);
|
|
145
|
+
if (bytesWritten <= 0) {
|
|
146
|
+
throw new Error('SmartDB storage migration write made no progress');
|
|
147
|
+
}
|
|
148
|
+
offset += bytesWritten;
|
|
149
|
+
}
|
|
150
|
+
signalArg?.throwIfAborted();
|
|
151
|
+
};
|
|
152
|
+
const syncDirectory = async (directoryPathArg, signalArg) => {
|
|
153
|
+
try {
|
|
154
|
+
await withFileHandle(directoryPathArg, 'r', async (directoryHandleArg) => {
|
|
155
|
+
await directoryHandleArg.sync();
|
|
156
|
+
}, signalArg);
|
|
157
|
+
}
|
|
158
|
+
catch (error) {
|
|
159
|
+
if (!['EINVAL', 'ENOTSUP'].includes(error.code || '')) {
|
|
160
|
+
throw error;
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
};
|
|
164
|
+
const syncFile = async (filePathArg, signalArg) => {
|
|
165
|
+
await withFileHandle(filePathArg, 'r', async (fileHandleArg) => {
|
|
166
|
+
await fileHandleArg.sync();
|
|
167
|
+
}, signalArg);
|
|
168
|
+
};
|
|
169
|
+
const assertPublishedMigrationComplete = async (collectionDirectoryArg) => {
|
|
170
|
+
for (const fileName of ['data.rdb', 'keydir.hint', 'indexes.json']) {
|
|
171
|
+
let fileStat;
|
|
172
|
+
try {
|
|
173
|
+
fileStat = await fs.lstat(path.join(collectionDirectoryArg, fileName));
|
|
174
|
+
}
|
|
175
|
+
catch (error) {
|
|
176
|
+
if (error.code === 'ENOENT') {
|
|
177
|
+
throw new Error(`SmartDB legacy migration target is incomplete: ${collectionDirectoryArg}`, { cause: error });
|
|
178
|
+
}
|
|
179
|
+
throw error;
|
|
180
|
+
}
|
|
181
|
+
if (!fileStat.isFile() || fileStat.isSymbolicLink()) {
|
|
182
|
+
throw new Error(`SmartDB legacy migration target is incomplete: ${collectionDirectoryArg}`);
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
};
|
|
95
186
|
/**
|
|
96
187
|
* Migrate a storage directory from v0 (JSON-per-collection) to v1 (Bitcask binary).
|
|
97
188
|
*
|
|
@@ -100,19 +191,22 @@ function crc32(data) {
|
|
|
100
191
|
* - Returns a list of old files that can be safely deleted.
|
|
101
192
|
* - On failure, cleans up any partial new files and throws.
|
|
102
193
|
*/
|
|
103
|
-
export async function migrateV0ToV1(storagePath) {
|
|
194
|
+
export async function migrateV0ToV1(storagePath, signalArg) {
|
|
104
195
|
const deletableFiles = [];
|
|
105
|
-
const
|
|
196
|
+
const stagingDirectories = new Set();
|
|
106
197
|
try {
|
|
107
|
-
|
|
198
|
+
signalArg?.throwIfAborted();
|
|
199
|
+
const dbEntries = await fs.readdir(storagePath, { withFileTypes: true });
|
|
108
200
|
for (const dbEntry of dbEntries) {
|
|
201
|
+
signalArg?.throwIfAborted();
|
|
109
202
|
if (!dbEntry.isDirectory())
|
|
110
203
|
continue;
|
|
111
204
|
if (dbEntry.name.startsWith('.__rustdb_'))
|
|
112
205
|
continue;
|
|
113
206
|
const dbDir = path.join(storagePath, dbEntry.name);
|
|
114
|
-
const collFiles = fs.
|
|
207
|
+
const collFiles = await fs.readdir(dbDir, { withFileTypes: true });
|
|
115
208
|
for (const collFile of collFiles) {
|
|
209
|
+
signalArg?.throwIfAborted();
|
|
116
210
|
if (!collFile.isFile())
|
|
117
211
|
continue;
|
|
118
212
|
if (collFile.name.startsWith('.__rustdb_'))
|
|
@@ -126,28 +220,38 @@ export async function migrateV0ToV1(storagePath) {
|
|
|
126
220
|
const indexJsonPath = path.join(dbDir, `${collName}.indexes.json`);
|
|
127
221
|
// Target directory
|
|
128
222
|
const collDir = path.join(dbDir, collName);
|
|
129
|
-
if (
|
|
130
|
-
|
|
223
|
+
if (await pathExists(collDir)) {
|
|
224
|
+
await assertPublishedMigrationComplete(collDir);
|
|
225
|
+
if (await pathExists(indexJsonPath))
|
|
226
|
+
deletableFiles.push(indexJsonPath);
|
|
227
|
+
deletableFiles.push(jsonPath);
|
|
131
228
|
continue;
|
|
132
229
|
}
|
|
133
230
|
console.log(`[smartdb] Migrating ${dbEntry.name}.${collName}...`);
|
|
134
231
|
// Read the JSON collection
|
|
135
|
-
const jsonData = fs.
|
|
232
|
+
const jsonData = await fs.readFile(jsonPath, {
|
|
233
|
+
encoding: 'utf8',
|
|
234
|
+
signal: signalArg,
|
|
235
|
+
});
|
|
236
|
+
signalArg?.throwIfAborted();
|
|
136
237
|
const docs = JSON.parse(jsonData);
|
|
137
|
-
//
|
|
138
|
-
|
|
139
|
-
|
|
238
|
+
// Build the complete collection in a hidden sibling and publish it
|
|
239
|
+
// atomically so cancellation can never expose partial v1 state.
|
|
240
|
+
const stagingDir = path.join(dbDir, `.__rustdb_migration_${collName}_${process.pid}_${crypto.randomBytes(8).toString('hex')}`);
|
|
241
|
+
await fs.mkdir(stagingDir);
|
|
242
|
+
stagingDirectories.add(stagingDir);
|
|
243
|
+
signalArg?.throwIfAborted();
|
|
140
244
|
// Write data.rdb
|
|
141
|
-
const dataPath = path.join(
|
|
142
|
-
|
|
143
|
-
try {
|
|
245
|
+
const dataPath = path.join(stagingDir, 'data.rdb');
|
|
246
|
+
await withFileHandle(dataPath, 'wx', async (dataFileHandle) => {
|
|
144
247
|
// File header
|
|
145
248
|
const headerBuf = writeFileHeader(FILE_TYPE_DATA);
|
|
146
|
-
|
|
249
|
+
await writeBuffer(dataFileHandle, headerBuf, signalArg);
|
|
147
250
|
let currentOffset = BigInt(FILE_HEADER_SIZE);
|
|
148
251
|
const keydir = new Map();
|
|
149
252
|
const ts = BigInt(Date.now());
|
|
150
253
|
for (const doc of docs) {
|
|
254
|
+
signalArg?.throwIfAborted();
|
|
151
255
|
// Extract _id
|
|
152
256
|
let idHex;
|
|
153
257
|
if (doc._id && doc._id.$oid) {
|
|
@@ -169,7 +273,7 @@ export async function migrateV0ToV1(storagePath) {
|
|
|
169
273
|
const keyBuf = Buffer.from(idHex, 'utf-8');
|
|
170
274
|
const valueBuf = Buffer.from(bsonBytes);
|
|
171
275
|
const record = encodeDataRecord(ts, keyBuf, valueBuf);
|
|
172
|
-
|
|
276
|
+
await writeBuffer(dataFileHandle, record, signalArg);
|
|
173
277
|
keydir.set(idHex, {
|
|
174
278
|
offset: currentOffset,
|
|
175
279
|
recordLen: record.length,
|
|
@@ -178,52 +282,63 @@ export async function migrateV0ToV1(storagePath) {
|
|
|
178
282
|
});
|
|
179
283
|
currentOffset += BigInt(record.length);
|
|
180
284
|
}
|
|
181
|
-
|
|
182
|
-
|
|
285
|
+
await dataFileHandle.sync();
|
|
286
|
+
signalArg?.throwIfAborted();
|
|
183
287
|
// Write keydir.hint
|
|
184
|
-
const hintPath = path.join(
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
try {
|
|
196
|
-
fs.closeSync(fd);
|
|
197
|
-
}
|
|
198
|
-
catch { }
|
|
199
|
-
throw writeErr;
|
|
200
|
-
}
|
|
288
|
+
const hintPath = path.join(stagingDir, 'keydir.hint');
|
|
289
|
+
await withFileHandle(hintPath, 'wx', async (hintFileHandle) => {
|
|
290
|
+
await writeBuffer(hintFileHandle, writeFileHeader(FILE_TYPE_HINT), signalArg);
|
|
291
|
+
for (const [key, entry] of keydir) {
|
|
292
|
+
signalArg?.throwIfAborted();
|
|
293
|
+
await writeBuffer(hintFileHandle, encodeHintEntry(key, entry.offset, entry.recordLen, entry.valueLen, entry.timestamp), signalArg);
|
|
294
|
+
}
|
|
295
|
+
await hintFileHandle.sync();
|
|
296
|
+
signalArg?.throwIfAborted();
|
|
297
|
+
}, signalArg);
|
|
298
|
+
}, signalArg);
|
|
201
299
|
// Copy indexes.json if it exists
|
|
202
|
-
if (
|
|
203
|
-
const destIndexPath = path.join(
|
|
204
|
-
fs.
|
|
300
|
+
if (await pathExists(indexJsonPath)) {
|
|
301
|
+
const destIndexPath = path.join(stagingDir, 'indexes.json');
|
|
302
|
+
await fs.copyFile(indexJsonPath, destIndexPath);
|
|
303
|
+
await syncFile(destIndexPath, signalArg);
|
|
304
|
+
signalArg?.throwIfAborted();
|
|
205
305
|
deletableFiles.push(indexJsonPath);
|
|
206
306
|
}
|
|
207
307
|
else {
|
|
208
308
|
// Write default _id index
|
|
209
|
-
const destIndexPath = path.join(
|
|
210
|
-
fs.
|
|
309
|
+
const destIndexPath = path.join(stagingDir, 'indexes.json');
|
|
310
|
+
await fs.writeFile(destIndexPath, JSON.stringify([{ name: '_id_', key: { _id: 1 } }], null, 2), { signal: signalArg });
|
|
311
|
+
await syncFile(destIndexPath, signalArg);
|
|
312
|
+
signalArg?.throwIfAborted();
|
|
211
313
|
}
|
|
314
|
+
await assertPublishedMigrationComplete(stagingDir);
|
|
315
|
+
await syncDirectory(stagingDir, signalArg);
|
|
316
|
+
signalArg?.throwIfAborted();
|
|
317
|
+
await fs.rename(stagingDir, collDir);
|
|
318
|
+
stagingDirectories.delete(stagingDir);
|
|
319
|
+
await syncDirectory(dbDir, signalArg);
|
|
320
|
+
signalArg?.throwIfAborted();
|
|
212
321
|
deletableFiles.push(jsonPath);
|
|
213
322
|
console.log(`[smartdb] Migrated ${dbEntry.name}.${collName}: ${docs.length} documents`);
|
|
214
323
|
}
|
|
215
324
|
}
|
|
216
325
|
}
|
|
217
326
|
catch (err) {
|
|
218
|
-
|
|
219
|
-
for (const dir of
|
|
327
|
+
const cleanupErrors = [];
|
|
328
|
+
for (const dir of Array.from(stagingDirectories).reverse()) {
|
|
220
329
|
try {
|
|
221
|
-
fs.
|
|
330
|
+
await fs.rm(dir, { recursive: true, force: true });
|
|
331
|
+
await syncDirectory(path.dirname(dir));
|
|
332
|
+
}
|
|
333
|
+
catch (cleanupError) {
|
|
334
|
+
cleanupErrors.push(cleanupError);
|
|
222
335
|
}
|
|
223
|
-
|
|
336
|
+
}
|
|
337
|
+
if (cleanupErrors.length > 0) {
|
|
338
|
+
throw new SmartDbStorageMigrationCleanupError(err, cleanupErrors);
|
|
224
339
|
}
|
|
225
340
|
throw err;
|
|
226
341
|
}
|
|
227
342
|
return deletableFiles;
|
|
228
343
|
}
|
|
229
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"v0_to_v1.js","sourceRoot":"","sources":["../../../ts/ts_migration/migrators/v0_to_v1.ts"],"names":[],"mappings":"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"}
|
|
344
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"v0_to_v1.js","sourceRoot":"","sources":["../../../ts/ts_migration/migrators/v0_to_v1.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { TAuthMetadataPermissionTransitionStatus } from '../../ts_smartdb/rust-db-bridge.js';
|
|
2
|
+
import type { ISmartDbManagementOperationOptions } from '../../ts_smartdb/service-types.js';
|
|
2
3
|
export interface IAuthMetadataPermissionMigrationBridge {
|
|
3
|
-
transitionAuthMetadataPermissions(usersPathArg: string, expectedModeArg: number, targetModeArg: number): Promise<TAuthMetadataPermissionTransitionStatus>;
|
|
4
|
+
transitionAuthMetadataPermissions(usersPathArg: string, expectedModeArg: number, targetModeArg: number, optionsArg?: ISmartDbManagementOperationOptions): Promise<TAuthMetadataPermissionTransitionStatus>;
|
|
4
5
|
}
|
|
5
6
|
export type TAuthMetadataPermissionMigrationStatus = TAuthMetadataPermissionTransitionStatus;
|
|
6
7
|
/**
|
|
@@ -8,4 +9,4 @@ export type TAuthMetadataPermissionMigrationStatus = TAuthMetadataPermissionTran
|
|
|
8
9
|
* process umask and therefore has exact mode 0644 in the supported legacy
|
|
9
10
|
* state. The native primitive retains the descriptor while applying 0600.
|
|
10
11
|
*/
|
|
11
|
-
export declare const migrateV1AuthMetadataPermissions: (bridgeArg: IAuthMetadataPermissionMigrationBridge, usersPathArg: string) => Promise<TAuthMetadataPermissionMigrationStatus>;
|
|
12
|
+
export declare const migrateV1AuthMetadataPermissions: (bridgeArg: IAuthMetadataPermissionMigrationBridge, usersPathArg: string, optionsArg?: ISmartDbManagementOperationOptions) => Promise<TAuthMetadataPermissionMigrationStatus>;
|
|
@@ -5,6 +5,6 @@ const privateAuthMetadataMode = 0o600;
|
|
|
5
5
|
* process umask and therefore has exact mode 0644 in the supported legacy
|
|
6
6
|
* state. The native primitive retains the descriptor while applying 0600.
|
|
7
7
|
*/
|
|
8
|
-
export const migrateV1AuthMetadataPermissions = async (bridgeArg, usersPathArg) => bridgeArg
|
|
9
|
-
.transitionAuthMetadataPermissions(usersPathArg, legacyAuthMetadataMode, privateAuthMetadataMode);
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
8
|
+
export const migrateV1AuthMetadataPermissions = async (bridgeArg, usersPathArg, optionsArg) => bridgeArg
|
|
9
|
+
.transitionAuthMetadataPermissions(usersPathArg, legacyAuthMetadataMode, privateAuthMetadataMode, optionsArg);
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidjFfYXV0aF9tZXRhZGF0YV9wZXJtaXNzaW9ucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL3RzX21pZ3JhdGlvbi9taWdyYXRvcnMvdjFfYXV0aF9tZXRhZGF0YV9wZXJtaXNzaW9ucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFHQSxNQUFNLHNCQUFzQixHQUFHLEtBQUssQ0FBQztBQUNyQyxNQUFNLHVCQUF1QixHQUFHLEtBQUssQ0FBQztBQWN0Qzs7OztHQUlHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sZ0NBQWdDLEdBQUcsS0FBSyxFQUNuRCxTQUFpRCxFQUNqRCxZQUFvQixFQUNwQixVQUErQyxFQUNFLEVBQUUsQ0FBQyxTQUFTO0tBQzVELGlDQUFpQyxDQUNoQyxZQUFZLEVBQ1osc0JBQXNCLEVBQ3RCLHVCQUF1QixFQUN2QixVQUFVLENBQ1gsQ0FBQyJ9
|
|
@@ -146,8 +146,8 @@ export declare class RustDbBridge extends EventEmitter {
|
|
|
146
146
|
get ownershipReleased(): boolean;
|
|
147
147
|
private awaitManagementOperationTermination;
|
|
148
148
|
inspectOfflineStringValue(inputArg: ILocalSmartDbOfflineStringValueInspection, optionsArg?: ISmartDbManagementOperationOptions): Promise<TLocalSmartDbOfflineStringValueInspectionResult>;
|
|
149
|
-
transitionAuthMetadataPermissions(usersPathArg: string, expectedModeArg: number, targetModeArg: number): Promise<TAuthMetadataPermissionTransitionStatus>;
|
|
150
|
-
startDb(config: ISmartDbRustConfig): Promise<{
|
|
149
|
+
transitionAuthMetadataPermissions(usersPathArg: string, expectedModeArg: number, targetModeArg: number, optionsArg?: ISmartDbManagementOperationOptions): Promise<TAuthMetadataPermissionTransitionStatus>;
|
|
150
|
+
startDb(config: ISmartDbRustConfig, optionsArg?: ISmartDbManagementOperationOptions): Promise<{
|
|
151
151
|
connectionUri: string;
|
|
152
152
|
}>;
|
|
153
153
|
stopDb(): Promise<void>;
|