layerbase 1.3.0 → 1.4.1
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 +65 -0
- package/dist/cli.js +64 -4
- package/dist/cli.js.map +1 -1
- package/dist/commands/cloud-write.js +9 -1
- package/dist/commands/cloud-write.js.map +1 -1
- package/dist/commands/import.js +34 -18
- package/dist/commands/import.js.map +1 -1
- package/dist/commands/promote.js +297 -0
- package/dist/commands/promote.js.map +1 -0
- package/dist/lib/cloud-api.js +44 -3
- package/dist/lib/cloud-api.js.map +1 -1
- package/dist/lib/commands.js +11 -0
- package/dist/lib/commands.js.map +1 -1
- package/dist/lib/confirm.js +10 -0
- package/dist/lib/confirm.js.map +1 -1
- package/dist/lib/env-file.js +70 -0
- package/dist/lib/env-file.js.map +1 -0
- package/dist/lib/promote-source.js +319 -0
- package/dist/lib/promote-source.js.map +1 -0
- package/dist/lib/run-spindb.js +98 -13
- package/dist/lib/run-spindb.js.map +1 -1
- package/dist/ui/app.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,319 @@
|
|
|
1
|
+
import { closeSync, openSync, readSync, statSync } from 'node:fs';
|
|
2
|
+
import { basename, extname } from 'node:path';
|
|
3
|
+
// Bytes 0-14 of every SQLite database file.
|
|
4
|
+
const SQLITE_MAGIC = 'SQLite format 3';
|
|
5
|
+
// DuckDB stamps 'DUCK' at bytes 8-11 of its main database file.
|
|
6
|
+
const DUCKDB_MAGIC = 'DUCK';
|
|
7
|
+
const HEADER_BYTES = 16;
|
|
8
|
+
const SQLITE_EXTENSIONS = ['.db', '.sqlite', '.sqlite3'];
|
|
9
|
+
const DUCKDB_EXTENSIONS = ['.duckdb', '.ddb'];
|
|
10
|
+
const SQL_EXTENSIONS = ['.sql'];
|
|
11
|
+
// Accepted `--from` values. `pglite` is the one the plan calls out; the rest
|
|
12
|
+
// exist so an ambiguous path can be disambiguated explicitly instead of guessed.
|
|
13
|
+
export const FROM_VALUES = ['pglite', 'sqlite', 'duckdb', 'sql', 'spindb'];
|
|
14
|
+
export function isSqliteHeader(header) {
|
|
15
|
+
if (!header || header.length < SQLITE_MAGIC.length)
|
|
16
|
+
return false;
|
|
17
|
+
return (header.subarray(0, SQLITE_MAGIC.length).toString('latin1') === SQLITE_MAGIC);
|
|
18
|
+
}
|
|
19
|
+
export function isDuckdbHeader(header) {
|
|
20
|
+
if (!header || header.length < 12)
|
|
21
|
+
return false;
|
|
22
|
+
return header.subarray(8, 12).toString('latin1') === DUCKDB_MAGIC;
|
|
23
|
+
}
|
|
24
|
+
// The three-line pgDump recipe we hand people instead of shipping several MB of
|
|
25
|
+
// WASM in the default install. See the PGlite note in README.
|
|
26
|
+
const PGLITE_DIR_MESSAGE = 'PGlite data directories are not supported yet. Dump the directory to SQL ' +
|
|
27
|
+
'first, then promote the dump:\n' +
|
|
28
|
+
" const db = await PGlite.create('./pgdata') // @electric-sql/pglite\n" +
|
|
29
|
+
' const dump = await pgDump({ pg: db }) // @electric-sql/pglite-tools/pg_dump\n' +
|
|
30
|
+
" await writeFile('./dump.sql', await dump.text()) // node:fs/promises\n" +
|
|
31
|
+
'\n' +
|
|
32
|
+
' layerbase promote ./dump.sql';
|
|
33
|
+
function looksLikePath(ref, probe) {
|
|
34
|
+
if (probe?.exists)
|
|
35
|
+
return true;
|
|
36
|
+
if (ref.includes('/') || ref.includes('\\'))
|
|
37
|
+
return true;
|
|
38
|
+
return extname(ref) !== '';
|
|
39
|
+
}
|
|
40
|
+
function findInstance(name, instances) {
|
|
41
|
+
return instances.find((instance) => instance.name === name);
|
|
42
|
+
}
|
|
43
|
+
function classifyFile(options) {
|
|
44
|
+
const { ref, probe } = options;
|
|
45
|
+
const ext = extname(ref).toLowerCase();
|
|
46
|
+
// The header is authoritative for the binary formats: an app.db that is
|
|
47
|
+
// really a DuckDB file is a DuckDB file, whatever the extension claims.
|
|
48
|
+
if (isSqliteHeader(probe.header)) {
|
|
49
|
+
return { ok: true, source: { kind: 'sqlite', path: ref } };
|
|
50
|
+
}
|
|
51
|
+
if (isDuckdbHeader(probe.header)) {
|
|
52
|
+
return { ok: true, source: { kind: 'duckdb', path: ref } };
|
|
53
|
+
}
|
|
54
|
+
if (SQL_EXTENSIONS.includes(ext)) {
|
|
55
|
+
return { ok: true, source: { kind: 'sql-dump', path: ref } };
|
|
56
|
+
}
|
|
57
|
+
if (SQLITE_EXTENSIONS.includes(ext)) {
|
|
58
|
+
return {
|
|
59
|
+
ok: false,
|
|
60
|
+
error: `${ref} ends in ${ext} but is not a SQLite database file (its header ` +
|
|
61
|
+
`does not start with "${SQLITE_MAGIC}"). Pass the real database file, ` +
|
|
62
|
+
'or promote a SQL dump as ./dump.sql.',
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
if (DUCKDB_EXTENSIONS.includes(ext)) {
|
|
66
|
+
return {
|
|
67
|
+
ok: false,
|
|
68
|
+
error: `${ref} ends in ${ext} but is not a DuckDB database file (no "DUCK" ` +
|
|
69
|
+
'header). Pass the real .duckdb file.',
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
return {
|
|
73
|
+
ok: false,
|
|
74
|
+
error: `Cannot tell what kind of database ${ref} is. promote accepts a SQLite ` +
|
|
75
|
+
'file (.db/.sqlite/.sqlite3), a DuckDB file (.duckdb), a Postgres SQL ' +
|
|
76
|
+
'dump (.sql), or the name of a local spindb container. Force the kind ' +
|
|
77
|
+
`with --from <${FROM_VALUES.join('|')}>.`,
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
// Turn the positional argument into a concrete source. Pure: `probe` is the
|
|
81
|
+
// filesystem fact and `instances` the spindb container list, both supplied by
|
|
82
|
+
// the caller.
|
|
83
|
+
export function classifySource(options) {
|
|
84
|
+
const { ref, probe, instances } = options;
|
|
85
|
+
const from = options.from?.toLowerCase();
|
|
86
|
+
if (from && !FROM_VALUES.includes(from)) {
|
|
87
|
+
return {
|
|
88
|
+
ok: false,
|
|
89
|
+
error: `Unknown --from "${options.from}". Use one of: ${FROM_VALUES.join(', ')}.`,
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
if (from === 'spindb') {
|
|
93
|
+
const instance = findInstance(ref, instances);
|
|
94
|
+
if (!instance) {
|
|
95
|
+
return {
|
|
96
|
+
ok: false,
|
|
97
|
+
error: `No local spindb container named "${ref}". Run \`lbase ls\` to see ` +
|
|
98
|
+
'your local containers.',
|
|
99
|
+
};
|
|
100
|
+
}
|
|
101
|
+
return { ok: true, source: { kind: 'spindb', instance } };
|
|
102
|
+
}
|
|
103
|
+
if (from === 'pglite') {
|
|
104
|
+
if (!probe?.exists) {
|
|
105
|
+
return { ok: false, error: `No such file or directory: ${ref}` };
|
|
106
|
+
}
|
|
107
|
+
if (probe.isDirectory) {
|
|
108
|
+
return { ok: false, error: PGLITE_DIR_MESSAGE };
|
|
109
|
+
}
|
|
110
|
+
if (extname(ref).toLowerCase() !== '.sql') {
|
|
111
|
+
return {
|
|
112
|
+
ok: false,
|
|
113
|
+
error: `--from pglite expects the .sql file pgDump produced, and ${ref} is ` +
|
|
114
|
+
'not one.\n' +
|
|
115
|
+
PGLITE_DIR_MESSAGE,
|
|
116
|
+
};
|
|
117
|
+
}
|
|
118
|
+
return { ok: true, source: { kind: 'sql-dump', path: ref } };
|
|
119
|
+
}
|
|
120
|
+
if (from === 'sqlite' || from === 'duckdb' || from === 'sql') {
|
|
121
|
+
if (!probe?.exists || probe.isDirectory) {
|
|
122
|
+
return { ok: false, error: `No such file: ${ref}` };
|
|
123
|
+
}
|
|
124
|
+
if (from === 'sqlite') {
|
|
125
|
+
if (!isSqliteHeader(probe.header)) {
|
|
126
|
+
return {
|
|
127
|
+
ok: false,
|
|
128
|
+
error: `${ref} is not a SQLite database file (bad header).`,
|
|
129
|
+
};
|
|
130
|
+
}
|
|
131
|
+
return { ok: true, source: { kind: 'sqlite', path: ref } };
|
|
132
|
+
}
|
|
133
|
+
if (from === 'duckdb') {
|
|
134
|
+
if (!isDuckdbHeader(probe.header)) {
|
|
135
|
+
return {
|
|
136
|
+
ok: false,
|
|
137
|
+
error: `${ref} is not a DuckDB database file (bad header).`,
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
return { ok: true, source: { kind: 'duckdb', path: ref } };
|
|
141
|
+
}
|
|
142
|
+
return { ok: true, source: { kind: 'sql-dump', path: ref } };
|
|
143
|
+
}
|
|
144
|
+
// No --from: a path-shaped argument is a file, anything else is a container
|
|
145
|
+
// name. Never guess between the two.
|
|
146
|
+
if (!looksLikePath(ref, probe)) {
|
|
147
|
+
const instance = findInstance(ref, instances);
|
|
148
|
+
if (instance)
|
|
149
|
+
return { ok: true, source: { kind: 'spindb', instance } };
|
|
150
|
+
return {
|
|
151
|
+
ok: false,
|
|
152
|
+
error: `"${ref}" is neither a file on disk nor a local spindb container. ` +
|
|
153
|
+
'Pass a path to a .db/.sqlite/.duckdb/.sql file, or a container name ' +
|
|
154
|
+
'from `lbase ls`.',
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
if (!probe?.exists) {
|
|
158
|
+
const instance = findInstance(ref, instances);
|
|
159
|
+
if (instance)
|
|
160
|
+
return { ok: true, source: { kind: 'spindb', instance } };
|
|
161
|
+
return { ok: false, error: `No such file or directory: ${ref}` };
|
|
162
|
+
}
|
|
163
|
+
if (probe.isDirectory) {
|
|
164
|
+
return {
|
|
165
|
+
ok: false,
|
|
166
|
+
error: `${ref} is a directory. If it is a PGlite data directory, see below.\n` +
|
|
167
|
+
PGLITE_DIR_MESSAGE,
|
|
168
|
+
};
|
|
169
|
+
}
|
|
170
|
+
return classifyFile({ ref, probe });
|
|
171
|
+
}
|
|
172
|
+
// ─── Target mapping ─────────────────────────────────────────────────────────
|
|
173
|
+
// Engines we host locally (spindb/desktop) but cannot host in the cloud, with
|
|
174
|
+
// the licensing reason and the closest cloud alternative.
|
|
175
|
+
const DESKTOP_ONLY_REASONS = {
|
|
176
|
+
mongodb: 'MongoDB is desktop-only on Layerbase: its SSPL license does not allow us ' +
|
|
177
|
+
'to offer it as a managed service. The closest cloud target is FerretDB ' +
|
|
178
|
+
'(the MongoDB wire protocol on Postgres): create one with `lbase cloud ' +
|
|
179
|
+
'create <name> --engine ferretdb` and load it with `lbase import`.',
|
|
180
|
+
cockroachdb: 'CockroachDB is desktop-only on Layerbase: its license does not allow us ' +
|
|
181
|
+
'to offer it as a managed service. The closest cloud target is PostgreSQL ' +
|
|
182
|
+
'(CockroachDB dumps are Postgres-dialect SQL): promote the dump with ' +
|
|
183
|
+
'`lbase promote ./dump.sql`.',
|
|
184
|
+
surrealdb: 'SurrealDB is desktop-only on Layerbase: its license does not allow us to ' +
|
|
185
|
+
'offer it as a managed service, and Layerbase Cloud has no SurrealDB ' +
|
|
186
|
+
'equivalent to promote into.',
|
|
187
|
+
};
|
|
188
|
+
// spindb engines whose `spindb backup` artifact is a format the cloud import
|
|
189
|
+
// endpoint already restores (SQL text, an RDB, or a raw database file). Every
|
|
190
|
+
// other engine backs up to an engine-specific tar/snapshot that only the
|
|
191
|
+
// cloud's own backup pipeline produces, so promote refuses instead of uploading
|
|
192
|
+
// something the restore would reject (or, worse, half-apply).
|
|
193
|
+
export const PROMOTABLE_SPINDB_ENGINES = [
|
|
194
|
+
'postgresql',
|
|
195
|
+
'mysql',
|
|
196
|
+
'mariadb',
|
|
197
|
+
'redis',
|
|
198
|
+
'valkey',
|
|
199
|
+
'sqlite',
|
|
200
|
+
'duckdb',
|
|
201
|
+
];
|
|
202
|
+
export const SQLITE_TARGETS = ['libsql', 'pgsqlite'];
|
|
203
|
+
// pgsqlite is the wire shim in front of the cloud `sqlite` engine, so the flag
|
|
204
|
+
// value the user types and the engine slug the API takes are different words
|
|
205
|
+
// for the same target.
|
|
206
|
+
const PGSQLITE_ENGINE = 'sqlite';
|
|
207
|
+
// libSQL restores from a tar of a live sqld data directory, not from a SQLite
|
|
208
|
+
// file, so there is no shipped path that puts a local .db into a cloud libSQL
|
|
209
|
+
// database. Refused BEFORE anything is created so promote never strands an
|
|
210
|
+
// empty database. Lift this the moment the cloud grows a SQLite-file loader for
|
|
211
|
+
// libSQL (the sqlite -> libsql converter already exists cloud-side for
|
|
212
|
+
// cloud-to-cloud conversions).
|
|
213
|
+
const LIBSQL_UNSUPPORTED = 'Promoting into a cloud libSQL database is not supported yet: libSQL ' +
|
|
214
|
+
'restores from a data-directory archive, not from a SQLite file. Use ' +
|
|
215
|
+
'`--target pgsqlite` (SQLite storage behind the Postgres wire, which is the ' +
|
|
216
|
+
'default), or import an existing hosted libSQL database with `lbase migrate ' +
|
|
217
|
+
'--source turso`.';
|
|
218
|
+
export function mapTargetEngine(options) {
|
|
219
|
+
const { source, sqliteTarget } = options;
|
|
220
|
+
const forSqlite = () => sqliteTarget === 'libsql'
|
|
221
|
+
? { ok: false, error: LIBSQL_UNSUPPORTED }
|
|
222
|
+
: { ok: true, engine: PGSQLITE_ENGINE };
|
|
223
|
+
if (source.kind === 'sqlite')
|
|
224
|
+
return forSqlite();
|
|
225
|
+
if (source.kind === 'duckdb')
|
|
226
|
+
return { ok: true, engine: 'duckdb' };
|
|
227
|
+
if (source.kind === 'sql-dump')
|
|
228
|
+
return { ok: true, engine: 'postgresql' };
|
|
229
|
+
const engine = source.instance.engine.toLowerCase();
|
|
230
|
+
const desktopOnly = DESKTOP_ONLY_REASONS[engine];
|
|
231
|
+
if (desktopOnly)
|
|
232
|
+
return { ok: false, error: desktopOnly };
|
|
233
|
+
if (engine === 'libsql')
|
|
234
|
+
return { ok: false, error: LIBSQL_UNSUPPORTED };
|
|
235
|
+
if (engine === 'sqlite')
|
|
236
|
+
return forSqlite();
|
|
237
|
+
if (!PROMOTABLE_SPINDB_ENGINES.includes(engine)) {
|
|
238
|
+
return {
|
|
239
|
+
ok: false,
|
|
240
|
+
error: `promote does not support ${engine} containers yet: spindb's backup ` +
|
|
241
|
+
'format for this engine is not one the cloud import endpoint ' +
|
|
242
|
+
'restores. Create the database with `lbase cloud create <name> ' +
|
|
243
|
+
`--engine ${engine}` +
|
|
244
|
+
'` and load it with `lbase migrate` instead.',
|
|
245
|
+
};
|
|
246
|
+
}
|
|
247
|
+
return { ok: true, engine };
|
|
248
|
+
}
|
|
249
|
+
export function parseSqliteTarget(raw) {
|
|
250
|
+
if (!raw)
|
|
251
|
+
return { ok: true, target: 'pgsqlite' };
|
|
252
|
+
const value = raw.toLowerCase();
|
|
253
|
+
if (value === 'libsql' || value === 'pgsqlite') {
|
|
254
|
+
return { ok: true, target: value };
|
|
255
|
+
}
|
|
256
|
+
return {
|
|
257
|
+
ok: false,
|
|
258
|
+
error: `Unknown --target "${raw}". Use one of: ${SQLITE_TARGETS.join(', ')}.`,
|
|
259
|
+
};
|
|
260
|
+
}
|
|
261
|
+
// ─── Naming ─────────────────────────────────────────────────────────────────
|
|
262
|
+
const MAX_NAME_LENGTH = 40;
|
|
263
|
+
export function sanitizeDatabaseName(raw) {
|
|
264
|
+
const slug = raw
|
|
265
|
+
.toLowerCase()
|
|
266
|
+
.replace(/[^a-z0-9-]+/g, '-')
|
|
267
|
+
.replace(/-+/g, '-')
|
|
268
|
+
.replace(/^-|-$/g, '')
|
|
269
|
+
.slice(0, MAX_NAME_LENGTH)
|
|
270
|
+
.replace(/-$/, '');
|
|
271
|
+
if (!slug)
|
|
272
|
+
return 'promoted-db';
|
|
273
|
+
return /^[a-z]/.test(slug) ? slug : `db-${slug}`.slice(0, MAX_NAME_LENGTH);
|
|
274
|
+
}
|
|
275
|
+
export function deriveDatabaseName(options) {
|
|
276
|
+
const { source, explicit } = options;
|
|
277
|
+
if (explicit)
|
|
278
|
+
return sanitizeDatabaseName(explicit);
|
|
279
|
+
if (source.kind === 'spindb')
|
|
280
|
+
return sanitizeDatabaseName(source.instance.name);
|
|
281
|
+
const base = basename(source.path, extname(source.path));
|
|
282
|
+
return sanitizeDatabaseName(base);
|
|
283
|
+
}
|
|
284
|
+
// ─── Filesystem probe (the IO half) ─────────────────────────────────────────
|
|
285
|
+
export function probePath(path) {
|
|
286
|
+
let stat;
|
|
287
|
+
try {
|
|
288
|
+
stat = statSync(path);
|
|
289
|
+
}
|
|
290
|
+
catch {
|
|
291
|
+
return null;
|
|
292
|
+
}
|
|
293
|
+
if (stat.isDirectory()) {
|
|
294
|
+
return { exists: true, isDirectory: true, header: null };
|
|
295
|
+
}
|
|
296
|
+
return { exists: true, isDirectory: false, header: readHeader(path) };
|
|
297
|
+
}
|
|
298
|
+
function readHeader(path) {
|
|
299
|
+
let fd;
|
|
300
|
+
try {
|
|
301
|
+
fd = openSync(path, 'r');
|
|
302
|
+
const buffer = Buffer.alloc(HEADER_BYTES);
|
|
303
|
+
const read = readSync(fd, buffer, 0, HEADER_BYTES, 0);
|
|
304
|
+
return buffer.subarray(0, read);
|
|
305
|
+
}
|
|
306
|
+
catch {
|
|
307
|
+
return null;
|
|
308
|
+
}
|
|
309
|
+
finally {
|
|
310
|
+
if (fd !== undefined)
|
|
311
|
+
closeSync(fd);
|
|
312
|
+
}
|
|
313
|
+
}
|
|
314
|
+
export function describeSource(source) {
|
|
315
|
+
return source.kind === 'spindb'
|
|
316
|
+
? `spindb container "${source.instance.name}" (${source.instance.engine})`
|
|
317
|
+
: `${source.path} (${source.kind})`;
|
|
318
|
+
}
|
|
319
|
+
//# sourceMappingURL=promote-source.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"promote-source.js","sourceRoot":"","sources":["../../src/lib/promote-source.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/run-spindb.js
CHANGED
|
@@ -1,20 +1,21 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
2
|
import { existsSync } from 'node:fs';
|
|
3
3
|
import { join, delimiter } from 'node:path';
|
|
4
|
-
//
|
|
5
|
-
//
|
|
6
|
-
//
|
|
7
|
-
function
|
|
4
|
+
// Resolve an executable to a CONCRETE path on PATH (null when it is not there).
|
|
5
|
+
// We resolve it ourselves rather than relying on a shell, because on Windows the
|
|
6
|
+
// real file is a shim (`spindb.cmd`, `npx.cmd`) that bare-name spawn cannot find.
|
|
7
|
+
function resolveOnPath(name) {
|
|
8
8
|
const exts = process.platform === 'win32' ? ['.cmd', '.exe', '.bat', ''] : [''];
|
|
9
9
|
for (const dir of (process.env.PATH ?? '').split(delimiter)) {
|
|
10
10
|
if (!dir)
|
|
11
11
|
continue;
|
|
12
12
|
for (const ext of exts) {
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
const candidate = join(dir, `${name}${ext}`);
|
|
14
|
+
if (existsSync(candidate))
|
|
15
|
+
return candidate;
|
|
15
16
|
}
|
|
16
17
|
}
|
|
17
|
-
return
|
|
18
|
+
return null;
|
|
18
19
|
}
|
|
19
20
|
function detectPackageRunner() {
|
|
20
21
|
const userAgent = process.env.npm_config_user_agent ?? '';
|
|
@@ -24,10 +25,43 @@ function detectPackageRunner() {
|
|
|
24
25
|
return 'bunx';
|
|
25
26
|
return 'npx';
|
|
26
27
|
}
|
|
28
|
+
// If spindb is installed we run the resolved binary directly; otherwise we run
|
|
29
|
+
// it through the package runner that launched layerbase, so `npx layerbase`
|
|
30
|
+
// users get `npx spindb` with no global install. A runner that does not resolve
|
|
31
|
+
// falls back to its bare name so the spawn error stays the familiar ENOENT.
|
|
27
32
|
function spindbInvocation() {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
33
|
+
const spindb = resolveOnPath('spindb');
|
|
34
|
+
if (spindb)
|
|
35
|
+
return { command: spindb, baseArgs: [] };
|
|
36
|
+
const runner = detectPackageRunner();
|
|
37
|
+
return { command: resolveOnPath(runner) ?? runner, baseArgs: ['spindb'] };
|
|
38
|
+
}
|
|
39
|
+
const WINDOWS_BATCH_FILE = /\.(cmd|bat)$/i;
|
|
40
|
+
// Build the spawn call. `shell: true` is NEVER used: a shell flattens argv into
|
|
41
|
+
// a single command line, so an argument containing a space (an --output
|
|
42
|
+
// directory) is re-split and a shell metacharacter in a path or container name
|
|
43
|
+
// is interpreted. Windows batch shims cannot be spawned directly (Node refuses
|
|
44
|
+
// since the CVE-2024-27980 fix), so those alone go through cmd.exe with a
|
|
45
|
+
// pre-quoted, verbatim command line. Pure so the invariant is unit-testable.
|
|
46
|
+
export function buildSpindbSpawn(options) {
|
|
47
|
+
const { command, args, platform = process.platform, comSpec = process.env.ComSpec ?? 'cmd.exe', } = options;
|
|
48
|
+
if (platform !== 'win32' || !WINDOWS_BATCH_FILE.test(command)) {
|
|
49
|
+
return { command, args, windowsVerbatimArguments: false };
|
|
50
|
+
}
|
|
51
|
+
const line = [command, ...args].map(quoteWindowsArgument).join(' ');
|
|
52
|
+
return {
|
|
53
|
+
command: comSpec,
|
|
54
|
+
args: ['/d', '/s', '/c', `"${line}"`],
|
|
55
|
+
windowsVerbatimArguments: true,
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
// cmd.exe keeps a double-quoted argument in one piece and does not interpret
|
|
59
|
+
// metacharacters inside it, so every argument is wrapped and its embedded
|
|
60
|
+
// quotes and trailing backslashes escaped. (cmd still expands %VAR% inside
|
|
61
|
+
// quotes; nothing we pass to spindb is user-supplied Windows env syntax.)
|
|
62
|
+
function quoteWindowsArgument(value) {
|
|
63
|
+
const escaped = value.replace(/(\\*)"/g, '$1$1\\"').replace(/(\\*)$/, '$1$1');
|
|
64
|
+
return `"${escaped}"`;
|
|
31
65
|
}
|
|
32
66
|
function spawnSpindb(args, opts = {}) {
|
|
33
67
|
const { command, baseArgs } = spindbInvocation();
|
|
@@ -41,11 +75,14 @@ function spawnSpindb(args, opts = {}) {
|
|
|
41
75
|
process.removeListener('SIGINT', ignoreSigint);
|
|
42
76
|
resolve(code);
|
|
43
77
|
};
|
|
44
|
-
const
|
|
78
|
+
const invocation = buildSpindbSpawn({
|
|
79
|
+
command,
|
|
80
|
+
args: [...baseArgs, ...args],
|
|
81
|
+
});
|
|
82
|
+
const child = spawn(invocation.command, invocation.args, {
|
|
45
83
|
stdio: opts.quiet ? 'ignore' : 'inherit',
|
|
46
84
|
env: opts.env ? { ...process.env, ...opts.env } : process.env,
|
|
47
|
-
|
|
48
|
-
shell: process.platform === 'win32',
|
|
85
|
+
windowsVerbatimArguments: invocation.windowsVerbatimArguments,
|
|
49
86
|
});
|
|
50
87
|
child.on('error', (error) => {
|
|
51
88
|
if (!opts.quiet) {
|
|
@@ -64,6 +101,54 @@ function spawnSpindb(args, opts = {}) {
|
|
|
64
101
|
export async function runSpindb(args = [], opts = {}) {
|
|
65
102
|
return spawnSpindb(args, { env: opts.env });
|
|
66
103
|
}
|
|
104
|
+
// Run spindb and CAPTURE its output instead of inheriting the terminal, for the
|
|
105
|
+
// machine-readable probes (`list --json`, `backup --json`). Never used for
|
|
106
|
+
// interactive passthrough, which must keep inherited stdio.
|
|
107
|
+
export function captureSpindb(args) {
|
|
108
|
+
const { command, baseArgs } = spindbInvocation();
|
|
109
|
+
return new Promise((resolve) => {
|
|
110
|
+
const invocation = buildSpindbSpawn({
|
|
111
|
+
command,
|
|
112
|
+
args: [...baseArgs, ...args],
|
|
113
|
+
});
|
|
114
|
+
const child = spawn(invocation.command, invocation.args, {
|
|
115
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
116
|
+
windowsVerbatimArguments: invocation.windowsVerbatimArguments,
|
|
117
|
+
});
|
|
118
|
+
let stdout = '';
|
|
119
|
+
let stderr = '';
|
|
120
|
+
child.stdout?.on('data', (chunk) => {
|
|
121
|
+
stdout += String(chunk);
|
|
122
|
+
});
|
|
123
|
+
child.stderr?.on('data', (chunk) => {
|
|
124
|
+
stderr += String(chunk);
|
|
125
|
+
});
|
|
126
|
+
child.on('error', (error) => {
|
|
127
|
+
resolve({ code: 127, stdout, stderr: `${stderr}${error.message}` });
|
|
128
|
+
});
|
|
129
|
+
child.on('close', (code) => resolve({ code: code ?? 0, stdout, stderr }));
|
|
130
|
+
});
|
|
131
|
+
}
|
|
132
|
+
// spindb interleaves human progress lines with its `--json` result on stdout, so
|
|
133
|
+
// pick the LAST line that parses as a JSON object.
|
|
134
|
+
export function parseLastJson(output) {
|
|
135
|
+
const lines = output.split('\n');
|
|
136
|
+
for (let i = lines.length - 1; i >= 0; i -= 1) {
|
|
137
|
+
const line = lines[i]?.trim();
|
|
138
|
+
if (!line || !line.startsWith('{'))
|
|
139
|
+
continue;
|
|
140
|
+
try {
|
|
141
|
+
const parsed = JSON.parse(line);
|
|
142
|
+
if (parsed && typeof parsed === 'object') {
|
|
143
|
+
return parsed;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
catch {
|
|
147
|
+
continue;
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
return null;
|
|
151
|
+
}
|
|
67
152
|
// Whether a local spindb container with this name already exists. Uses
|
|
68
153
|
// `spindb info <name> --json`, which exits non-zero when the container is
|
|
69
154
|
// missing.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-spindb.js","sourceRoot":"","sources":["../../src/lib/run-spindb.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAE3C
|
|
1
|
+
{"version":3,"file":"run-spindb.js","sourceRoot":"","sources":["../../src/lib/run-spindb.ts"],"names":[],"mappings":"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"}
|
package/dist/ui/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/ui/app.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/ui/app.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACxC,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAyCtC,MAAM,UAAU,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAY;IACpD,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,OAAO;YACV,OAAO,KAAC,KAAK,IAAC,KAAK,EAAE,KAAK,GAAI,CAAA;QAChC,KAAK,QAAQ;YACX,OAAO,KAAC,MAAM,KAAG,CAAA;QACnB,KAAK,IAAI;YACP,OAAO,KAAC,IAAI,IAAC,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,KAAK,GAAI,CAAA;QAC5C,KAAK,QAAQ;YACX,OAAO,KAAC,MAAM,IAAC,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,KAAK,GAAI,CAAA;QAC9C,KAAK,OAAO;YACV,OAAO,KAAC,KAAK,KAAG,CAAA;QAClB,KAAK,mBAAmB;YACtB,OAAO,KAAC,gBAAgB,IAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,KAAK,GAAI,CAAA;QACxE;YACE,OAAO,KAAC,OAAO,IAAC,OAAO,EAAE,OAAO,GAAI,CAAA;IACxC,CAAC;AACH,CAAC"}
|