@ninedeploy/sdk 0.18.26 → 0.18.27
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/databaseImport.d.ts +219 -6
- package/dist/databaseImport.d.ts.map +1 -1
- package/dist/databaseImport.js +43 -13
- package/dist/databaseImport.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/resources/databases.d.ts +27 -1
- package/dist/resources/databases.d.ts.map +1 -1
- package/dist/resources/databases.js +21 -0
- package/dist/resources/databases.js.map +1 -1
- package/dist/resources/volumes.d.ts +19 -1
- package/dist/resources/volumes.d.ts.map +1 -1
- package/dist/resources/volumes.js +10 -0
- package/dist/resources/volumes.js.map +1 -1
- package/package.json +2 -2
- package/src/databaseImport.ts +87 -19
- package/src/index.ts +2 -0
- package/src/resources/databases.ts +39 -0
- package/src/resources/volumes.ts +28 -0
package/dist/databaseImport.d.ts
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
import type { DatabaseImport, DatabaseImportOptions } from '@ninedeploy/schemas';
|
|
1
|
+
import type { DatabaseImport, DatabaseImportOptions, VolumeImport } from '@ninedeploy/schemas';
|
|
2
2
|
import type { Transport } from './transport.js';
|
|
3
3
|
/** 0.14: an import that no longer changes (`DatabaseImport['status']`). */
|
|
4
4
|
export declare const DATABASE_IMPORT_FINISHED_STATUSES: ReadonlyArray<DatabaseImport['status']>;
|
|
5
|
-
/**
|
|
6
|
-
export
|
|
5
|
+
/** A1: a volume import that no longer changes (`VolumeImport['status']`). */
|
|
6
|
+
export declare const VOLUME_IMPORT_FINISHED_STATUSES: ReadonlyArray<VolumeImport['status']>;
|
|
7
|
+
/** 0.14: `databases.imports.wait` (and A1 `volumeImports.wait`) polling options. */
|
|
8
|
+
export interface ImportWaitOptions<Row = DatabaseImport> {
|
|
7
9
|
/**
|
|
8
10
|
* `finished` (default) waits for a final status; `uploaded` returns as soon
|
|
9
11
|
* as the import leaves `uploading` (an S3 download landing in `pending`).
|
|
@@ -14,7 +16,7 @@ export interface ImportWaitOptions {
|
|
|
14
16
|
/** Give up after this long (default: never). Throws `import_wait_timeout`. */
|
|
15
17
|
timeoutMs?: number;
|
|
16
18
|
/** Called with every polled row. */
|
|
17
|
-
onStatus?: (row:
|
|
19
|
+
onStatus?: (row: Row) => void;
|
|
18
20
|
}
|
|
19
21
|
/**
|
|
20
22
|
* 0.14: the bytes `databases.importFile` uploads. A factory receives the byte
|
|
@@ -45,6 +47,25 @@ export interface ImportFileOptions {
|
|
|
45
47
|
row: DatabaseImport;
|
|
46
48
|
}) => void;
|
|
47
49
|
}
|
|
50
|
+
/**
|
|
51
|
+
* A1: `volumeImports.importFile` options: a gzipped tar of a volume's
|
|
52
|
+
* contents, restored into a service's data volume. The sha256 is required
|
|
53
|
+
* (the server checks it before the volume is touched) unless resuming.
|
|
54
|
+
*/
|
|
55
|
+
export interface VolumeImportFileOptions {
|
|
56
|
+
sizeBytes?: number;
|
|
57
|
+
filename?: string;
|
|
58
|
+
sha256?: string;
|
|
59
|
+
resumeImportId?: number;
|
|
60
|
+
start?: boolean;
|
|
61
|
+
poll?: boolean | Omit<ImportWaitOptions<VolumeImport>, 'until'>;
|
|
62
|
+
onCreated?: (row: VolumeImport) => void;
|
|
63
|
+
onProgress?: (progress: {
|
|
64
|
+
receivedBytes: number;
|
|
65
|
+
sizeBytes: number;
|
|
66
|
+
row: VolumeImport;
|
|
67
|
+
}) => void;
|
|
68
|
+
}
|
|
48
69
|
/** Chunked dump-import helpers bound to one transport (used by `databases`). */
|
|
49
70
|
export declare function createImportHelpers(t: Transport): {
|
|
50
71
|
importPath: (id: number, importId?: number) => string;
|
|
@@ -132,7 +153,199 @@ export declare function createImportHelpers(t: Transport): {
|
|
|
132
153
|
startedAt: string | null;
|
|
133
154
|
completedAt: string | null;
|
|
134
155
|
}>;
|
|
135
|
-
waitForImport: (id: number, importId: number, o?: ImportWaitOptions
|
|
136
|
-
|
|
156
|
+
waitForImport: (id: number, importId: number, o?: ImportWaitOptions<{
|
|
157
|
+
id: number;
|
|
158
|
+
databaseId: number;
|
|
159
|
+
source: "s3" | "upload";
|
|
160
|
+
status: "cancelled" | "completed" | "completed_with_warnings" | "expired" | "failed" | "pending" | "running" | "uploading";
|
|
161
|
+
format: "mongo_archive" | "mysql_sql" | "pg_custom" | "pg_plain" | "rdb" | null;
|
|
162
|
+
sizeBytes: number;
|
|
163
|
+
receivedBytes: number;
|
|
164
|
+
chunkSize: number;
|
|
165
|
+
sha256: string | null;
|
|
166
|
+
filename: string | null;
|
|
167
|
+
destinationId: number | null;
|
|
168
|
+
objectKey: string | null;
|
|
169
|
+
options: {
|
|
170
|
+
clean?: boolean | undefined;
|
|
171
|
+
singleTransaction?: boolean | undefined;
|
|
172
|
+
drop?: boolean | undefined;
|
|
173
|
+
confirmReplace?: boolean | undefined;
|
|
174
|
+
skipSafetyBackup?: boolean | undefined;
|
|
175
|
+
};
|
|
176
|
+
safetyBackupId: number | null;
|
|
177
|
+
error: string | null;
|
|
178
|
+
createdByUserId: number | null;
|
|
179
|
+
createdAt: string;
|
|
180
|
+
updatedAt: string;
|
|
181
|
+
startedAt: string | null;
|
|
182
|
+
completedAt: string | null;
|
|
183
|
+
}>) => Promise<{
|
|
184
|
+
id: number;
|
|
185
|
+
databaseId: number;
|
|
186
|
+
source: "s3" | "upload";
|
|
187
|
+
status: "cancelled" | "completed" | "completed_with_warnings" | "expired" | "failed" | "pending" | "running" | "uploading";
|
|
188
|
+
format: "mongo_archive" | "mysql_sql" | "pg_custom" | "pg_plain" | "rdb" | null;
|
|
189
|
+
sizeBytes: number;
|
|
190
|
+
receivedBytes: number;
|
|
191
|
+
chunkSize: number;
|
|
192
|
+
sha256: string | null;
|
|
193
|
+
filename: string | null;
|
|
194
|
+
destinationId: number | null;
|
|
195
|
+
objectKey: string | null;
|
|
196
|
+
options: {
|
|
197
|
+
clean?: boolean | undefined;
|
|
198
|
+
singleTransaction?: boolean | undefined;
|
|
199
|
+
drop?: boolean | undefined;
|
|
200
|
+
confirmReplace?: boolean | undefined;
|
|
201
|
+
skipSafetyBackup?: boolean | undefined;
|
|
202
|
+
};
|
|
203
|
+
safetyBackupId: number | null;
|
|
204
|
+
error: string | null;
|
|
205
|
+
createdByUserId: number | null;
|
|
206
|
+
createdAt: string;
|
|
207
|
+
updatedAt: string;
|
|
208
|
+
startedAt: string | null;
|
|
209
|
+
completedAt: string | null;
|
|
210
|
+
}>;
|
|
211
|
+
importFile: (id: number, data: ImportFileData, opts?: ImportFileOptions) => Promise<{
|
|
212
|
+
id: number;
|
|
213
|
+
databaseId: number;
|
|
214
|
+
source: "s3" | "upload";
|
|
215
|
+
status: "cancelled" | "completed" | "completed_with_warnings" | "expired" | "failed" | "pending" | "running" | "uploading";
|
|
216
|
+
format: "mongo_archive" | "mysql_sql" | "pg_custom" | "pg_plain" | "rdb" | null;
|
|
217
|
+
sizeBytes: number;
|
|
218
|
+
receivedBytes: number;
|
|
219
|
+
chunkSize: number;
|
|
220
|
+
sha256: string | null;
|
|
221
|
+
filename: string | null;
|
|
222
|
+
destinationId: number | null;
|
|
223
|
+
objectKey: string | null;
|
|
224
|
+
options: {
|
|
225
|
+
clean?: boolean | undefined;
|
|
226
|
+
singleTransaction?: boolean | undefined;
|
|
227
|
+
drop?: boolean | undefined;
|
|
228
|
+
confirmReplace?: boolean | undefined;
|
|
229
|
+
skipSafetyBackup?: boolean | undefined;
|
|
230
|
+
};
|
|
231
|
+
safetyBackupId: number | null;
|
|
232
|
+
error: string | null;
|
|
233
|
+
createdByUserId: number | null;
|
|
234
|
+
createdAt: string;
|
|
235
|
+
updatedAt: string;
|
|
236
|
+
startedAt: string | null;
|
|
237
|
+
completedAt: string | null;
|
|
238
|
+
}>;
|
|
239
|
+
};
|
|
240
|
+
/** A1: chunked volume-import helpers (`/v1/services/:id/volume-imports`). */
|
|
241
|
+
export declare function createVolumeImportHelpers(t: Transport): {
|
|
242
|
+
importPath: (id: number, importId?: number) => string;
|
|
243
|
+
getImport: (id: number, importId: number) => Promise<{
|
|
244
|
+
id: number;
|
|
245
|
+
serviceId: number;
|
|
246
|
+
volumeName: string;
|
|
247
|
+
status: "cancelled" | "completed" | "expired" | "failed" | "pending" | "running" | "uploading";
|
|
248
|
+
sizeBytes: number;
|
|
249
|
+
receivedBytes: number;
|
|
250
|
+
chunkSize: number;
|
|
251
|
+
sha256: string;
|
|
252
|
+
filename: string | null;
|
|
253
|
+
safetyBackupId: number | null;
|
|
254
|
+
error: string | null;
|
|
255
|
+
createdByUserId: number | null;
|
|
256
|
+
createdAt: string;
|
|
257
|
+
updatedAt: string;
|
|
258
|
+
startedAt: string | null;
|
|
259
|
+
completedAt: string | null;
|
|
260
|
+
}>;
|
|
261
|
+
uploadChunk: (id: number, importId: number, index: number, chunk: Uint8Array) => Promise<{
|
|
262
|
+
id: number;
|
|
263
|
+
serviceId: number;
|
|
264
|
+
volumeName: string;
|
|
265
|
+
status: "cancelled" | "completed" | "expired" | "failed" | "pending" | "running" | "uploading";
|
|
266
|
+
sizeBytes: number;
|
|
267
|
+
receivedBytes: number;
|
|
268
|
+
chunkSize: number;
|
|
269
|
+
sha256: string;
|
|
270
|
+
filename: string | null;
|
|
271
|
+
safetyBackupId: number | null;
|
|
272
|
+
error: string | null;
|
|
273
|
+
createdByUserId: number | null;
|
|
274
|
+
createdAt: string;
|
|
275
|
+
updatedAt: string;
|
|
276
|
+
startedAt: string | null;
|
|
277
|
+
completedAt: string | null;
|
|
278
|
+
}>;
|
|
279
|
+
startImport: (id: number, importId: number) => Promise<{
|
|
280
|
+
id: number;
|
|
281
|
+
serviceId: number;
|
|
282
|
+
volumeName: string;
|
|
283
|
+
status: "cancelled" | "completed" | "expired" | "failed" | "pending" | "running" | "uploading";
|
|
284
|
+
sizeBytes: number;
|
|
285
|
+
receivedBytes: number;
|
|
286
|
+
chunkSize: number;
|
|
287
|
+
sha256: string;
|
|
288
|
+
filename: string | null;
|
|
289
|
+
safetyBackupId: number | null;
|
|
290
|
+
error: string | null;
|
|
291
|
+
createdByUserId: number | null;
|
|
292
|
+
createdAt: string;
|
|
293
|
+
updatedAt: string;
|
|
294
|
+
startedAt: string | null;
|
|
295
|
+
completedAt: string | null;
|
|
296
|
+
}>;
|
|
297
|
+
waitForImport: (id: number, importId: number, o?: ImportWaitOptions<{
|
|
298
|
+
id: number;
|
|
299
|
+
serviceId: number;
|
|
300
|
+
volumeName: string;
|
|
301
|
+
status: "cancelled" | "completed" | "expired" | "failed" | "pending" | "running" | "uploading";
|
|
302
|
+
sizeBytes: number;
|
|
303
|
+
receivedBytes: number;
|
|
304
|
+
chunkSize: number;
|
|
305
|
+
sha256: string;
|
|
306
|
+
filename: string | null;
|
|
307
|
+
safetyBackupId: number | null;
|
|
308
|
+
error: string | null;
|
|
309
|
+
createdByUserId: number | null;
|
|
310
|
+
createdAt: string;
|
|
311
|
+
updatedAt: string;
|
|
312
|
+
startedAt: string | null;
|
|
313
|
+
completedAt: string | null;
|
|
314
|
+
}>) => Promise<{
|
|
315
|
+
id: number;
|
|
316
|
+
serviceId: number;
|
|
317
|
+
volumeName: string;
|
|
318
|
+
status: "cancelled" | "completed" | "expired" | "failed" | "pending" | "running" | "uploading";
|
|
319
|
+
sizeBytes: number;
|
|
320
|
+
receivedBytes: number;
|
|
321
|
+
chunkSize: number;
|
|
322
|
+
sha256: string;
|
|
323
|
+
filename: string | null;
|
|
324
|
+
safetyBackupId: number | null;
|
|
325
|
+
error: string | null;
|
|
326
|
+
createdByUserId: number | null;
|
|
327
|
+
createdAt: string;
|
|
328
|
+
updatedAt: string;
|
|
329
|
+
startedAt: string | null;
|
|
330
|
+
completedAt: string | null;
|
|
331
|
+
}>;
|
|
332
|
+
importFile: (id: number, data: ImportFileData, opts?: VolumeImportFileOptions) => Promise<{
|
|
333
|
+
id: number;
|
|
334
|
+
serviceId: number;
|
|
335
|
+
volumeName: string;
|
|
336
|
+
status: "cancelled" | "completed" | "expired" | "failed" | "pending" | "running" | "uploading";
|
|
337
|
+
sizeBytes: number;
|
|
338
|
+
receivedBytes: number;
|
|
339
|
+
chunkSize: number;
|
|
340
|
+
sha256: string;
|
|
341
|
+
filename: string | null;
|
|
342
|
+
safetyBackupId: number | null;
|
|
343
|
+
error: string | null;
|
|
344
|
+
createdByUserId: number | null;
|
|
345
|
+
createdAt: string;
|
|
346
|
+
updatedAt: string;
|
|
347
|
+
startedAt: string | null;
|
|
348
|
+
completedAt: string | null;
|
|
349
|
+
}>;
|
|
137
350
|
};
|
|
138
351
|
//# sourceMappingURL=databaseImport.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"databaseImport.d.ts","sourceRoot":"","sources":["../src/databaseImport.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,cAAc,EAEd,qBAAqB,
|
|
1
|
+
{"version":3,"file":"databaseImport.d.ts","sourceRoot":"","sources":["../src/databaseImport.ts"],"names":[],"mappings":"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"}
|
package/dist/databaseImport.js
CHANGED
|
@@ -7,6 +7,8 @@ export const DATABASE_IMPORT_FINISHED_STATUSES = [
|
|
|
7
7
|
'cancelled',
|
|
8
8
|
'expired',
|
|
9
9
|
];
|
|
10
|
+
/** A1: a volume import that no longer changes (`VolumeImport['status']`). */
|
|
11
|
+
export const VOLUME_IMPORT_FINISHED_STATUSES = ['completed', 'failed', 'cancelled', 'expired'];
|
|
10
12
|
/** 0.14: the import bytes from `offset` on (a factory seeks; the rest skip). */
|
|
11
13
|
async function* sourceFrom(data, offset) {
|
|
12
14
|
if (data instanceof Uint8Array) {
|
|
@@ -48,11 +50,14 @@ async function* rechunk(source, size) {
|
|
|
48
50
|
if (len > 0)
|
|
49
51
|
yield buf.subarray(0, len);
|
|
50
52
|
}
|
|
51
|
-
/**
|
|
52
|
-
|
|
53
|
+
/**
|
|
54
|
+
* The chunked, resumable upload shared by dump imports and volume imports:
|
|
55
|
+
* create (or resume) a row under `base(id)`, send ordered chunks of the
|
|
56
|
+
* size the server advertised, start, and optionally poll to a final status.
|
|
57
|
+
*/
|
|
58
|
+
function chunkedUploads(t, cfg) {
|
|
53
59
|
const { get, send, request } = t;
|
|
54
|
-
|
|
55
|
-
const importPath = (id, importId) => `/v1/databases/${id}/imports${importId === undefined ? '' : `/${importId}`}`;
|
|
60
|
+
const importPath = (id, importId) => `${cfg.base(id)}${importId === undefined ? '' : `/${importId}`}`;
|
|
56
61
|
const getImport = (id, importId) => get(importPath(id, importId));
|
|
57
62
|
/** An 8 MiB chunk over a slow uplink outlasts the default 30 s budget. */
|
|
58
63
|
const CHUNK_TIMEOUT_MS = 10 * 60_000;
|
|
@@ -67,7 +72,7 @@ export function createImportHelpers(t) {
|
|
|
67
72
|
for (;;) {
|
|
68
73
|
const row = await getImport(id, importId);
|
|
69
74
|
o.onStatus?.(row);
|
|
70
|
-
const done = o.until === 'uploaded' ? row.status !== 'uploading' :
|
|
75
|
+
const done = o.until === 'uploaded' ? row.status !== 'uploading' : cfg.finished.includes(row.status);
|
|
71
76
|
if (done)
|
|
72
77
|
return row;
|
|
73
78
|
if (Date.now() + interval > deadline) {
|
|
@@ -85,14 +90,7 @@ export function createImportHelpers(t) {
|
|
|
85
90
|
else {
|
|
86
91
|
if (declared === undefined)
|
|
87
92
|
throw new NineDeployError(0, 'import_size_required', 'sizeBytes is required for a streamed import');
|
|
88
|
-
|
|
89
|
-
if (opts.sha256 !== undefined)
|
|
90
|
-
input.sha256 = opts.sha256;
|
|
91
|
-
if (opts.filename !== undefined)
|
|
92
|
-
input.filename = opts.filename;
|
|
93
|
-
if (opts.options !== undefined)
|
|
94
|
-
input.options = opts.options;
|
|
95
|
-
row = await send('POST', importPath(id), input);
|
|
93
|
+
row = await send('POST', importPath(id), cfg.createBody(declared, opts));
|
|
96
94
|
opts.onCreated?.(row);
|
|
97
95
|
}
|
|
98
96
|
const size = row.sizeBytes;
|
|
@@ -123,4 +121,36 @@ export function createImportHelpers(t) {
|
|
|
123
121
|
}
|
|
124
122
|
return { importPath, getImport, uploadChunk, startImport, waitForImport, importFile };
|
|
125
123
|
}
|
|
124
|
+
/** Chunked dump-import helpers bound to one transport (used by `databases`). */
|
|
125
|
+
export function createImportHelpers(t) {
|
|
126
|
+
return chunkedUploads(t, {
|
|
127
|
+
base: (id) => `/v1/databases/${id}/imports`,
|
|
128
|
+
createBody: (sizeBytes, opts) => {
|
|
129
|
+
const input = { source: 'upload', sizeBytes };
|
|
130
|
+
if (opts.sha256 !== undefined)
|
|
131
|
+
input.sha256 = opts.sha256;
|
|
132
|
+
if (opts.filename !== undefined)
|
|
133
|
+
input.filename = opts.filename;
|
|
134
|
+
if (opts.options !== undefined)
|
|
135
|
+
input.options = opts.options;
|
|
136
|
+
return input;
|
|
137
|
+
},
|
|
138
|
+
finished: DATABASE_IMPORT_FINISHED_STATUSES,
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
/** A1: chunked volume-import helpers (`/v1/services/:id/volume-imports`). */
|
|
142
|
+
export function createVolumeImportHelpers(t) {
|
|
143
|
+
return chunkedUploads(t, {
|
|
144
|
+
base: (id) => `/v1/services/${id}/volume-imports`,
|
|
145
|
+
createBody: (sizeBytes, opts) => {
|
|
146
|
+
if (opts.sha256 === undefined)
|
|
147
|
+
throw new NineDeployError(0, 'import_sha256_required', "A volume import needs the archive's sha256");
|
|
148
|
+
const input = { sizeBytes, sha256: opts.sha256 };
|
|
149
|
+
if (opts.filename !== undefined)
|
|
150
|
+
input.filename = opts.filename;
|
|
151
|
+
return input;
|
|
152
|
+
},
|
|
153
|
+
finished: VOLUME_IMPORT_FINISHED_STATUSES,
|
|
154
|
+
});
|
|
155
|
+
}
|
|
126
156
|
//# sourceMappingURL=databaseImport.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"databaseImport.js","sourceRoot":"","sources":["../src/databaseImport.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"databaseImport.js","sourceRoot":"","sources":["../src/databaseImport.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9C,2EAA2E;AAC3E,MAAM,CAAC,MAAM,iCAAiC,GAA4C;IACxF,WAAW;IACX,yBAAyB;IACzB,QAAQ;IACR,WAAW;IACX,SAAS;CACV,CAAC;AAEF,6EAA6E;AAC7E,MAAM,CAAC,MAAM,+BAA+B,GAA0C,CAAC,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;AA4DtI,gFAAgF;AAChF,KAAK,SAAS,CAAC,CAAC,UAAU,CAAC,IAAoB,EAAE,MAAc;IAC7D,IAAI,IAAI,YAAY,UAAU,EAAE,CAAC;QAC/B,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC5B,OAAO;IACT,CAAC;IACD,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;QAC/B,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpB,OAAO;IACT,CAAC;IACD,IAAI,IAAI,GAAG,MAAM,CAAC;IAClB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;QAC/B,IAAI,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACzB,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC;YACrB,SAAS;QACX,CAAC;QACD,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAC9C,IAAI,GAAG,CAAC,CAAC;IACX,CAAC;AACH,CAAC;AAED,iFAAiF;AACjF,KAAK,SAAS,CAAC,CAAC,OAAO,CAAC,MAAiC,EAAE,IAAY;IACrE,IAAI,GAAG,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACjC,IAAI,EAAE,GAAG,CAAC,CAAC;QACX,OAAO,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;YACzB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,EAAE,KAAK,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;YACrD,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;YAC5C,GAAG,IAAI,IAAI,CAAC;YACZ,EAAE,IAAI,IAAI,CAAC;YACX,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;gBACjB,MAAM,GAAG,CAAC;gBACV,GAAG,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC;gBAC3B,GAAG,GAAG,CAAC,CAAC;YACV,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,GAAG,GAAG,CAAC;QAAE,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AAC1C,CAAC;AAkBD;;;;GAIG;AACH,SAAS,cAAc,CACrB,CAAY,EACZ,GAA8H;IAE9H,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IACjC,MAAM,UAAU,GAAG,CAAC,EAAU,EAAE,QAAiB,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,QAAQ,EAAE,EAAE,CAAC;IACvH,MAAM,SAAS,GAAG,CAAC,EAAU,EAAE,QAAgB,EAAE,EAAE,CAAC,GAAG,CAAM,UAAU,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC;IACvF,0EAA0E;IAC1E,MAAM,gBAAgB,GAAG,EAAE,GAAG,MAAM,CAAC;IACrC,MAAM,WAAW,GAAG,CAAC,EAAU,EAAE,QAAgB,EAAE,KAAa,EAAE,KAAiB,EAAE,EAAE,CACrF,OAAO,CAAM,GAAG,UAAU,CAAC,EAAE,EAAE,QAAQ,CAAC,WAAW,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,gBAAgB,CAAC,CAAC;IAC/G,MAAM,WAAW,GAAG,CAAC,EAAU,EAAE,QAAgB,EAAE,EAAE,CAAC,IAAI,CAAM,MAAM,EAAE,GAAG,UAAU,CAAC,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC7G,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,EAAE,CAC3B,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;QAC3B,UAAiF,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC7G,CAAC,CAAC,CAAC;IAEL,KAAK,UAAU,aAAa,CAAC,EAAU,EAAE,QAAgB,EAAE,CAAC,GAA2B,EAAE;QACvF,MAAM,QAAQ,GAAG,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC;QACtC,MAAM,QAAQ,GAAG,CAAC,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC;QACjG,SAAS,CAAC;YACR,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAC1C,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;YAClB,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACrG,IAAI,IAAI;gBAAE,OAAO,GAAG,CAAC;YACrB,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,GAAG,QAAQ,EAAE,CAAC;gBACrC,MAAM,IAAI,eAAe,CAAC,CAAC,EAAE,qBAAqB,EAAE,UAAU,QAAQ,aAAa,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;YACnG,CAAC;YACD,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IAED,KAAK,UAAU,UAAU,CAAC,EAAU,EAAE,IAAoB,EAAE,IAAI,GAAS,EAAU;QACjF,MAAM,QAAQ,GAAG,IAAI,YAAY,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;QAC3E,IAAI,GAAQ,CAAC;QACb,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YACtC,GAAG,GAAG,MAAM,SAAS,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YACN,IAAI,QAAQ,KAAK,SAAS;gBAAE,MAAM,IAAI,eAAe,CAAC,CAAC,EAAE,sBAAsB,EAAE,6CAA6C,CAAC,CAAC;YAChI,GAAG,GAAG,MAAM,IAAI,CAAM,MAAM,EAAE,UAAU,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;YAC9E,IAAI,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC;QACxB,CAAC;QACD,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC;QAC3B,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,EAAE,CAChC,IAAI,eAAe,CAAC,CAAC,EAAE,sBAAsB,EAAE,eAAe,IAAI,+BAA+B,IAAI,QAAQ,CAAC,CAAC;QACjH,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,IAAI;YAAE,MAAM,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAExG,IAAI,GAAG,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;YAC/B,IAAI,KAAK,GAAG,GAAG,CAAC,aAAa,GAAG,GAAG,CAAC,SAAS,CAAC;YAC9C,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,aAAa,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBACtF,IAAI,GAAG,CAAC,aAAa,GAAG,KAAK,CAAC,MAAM,GAAG,IAAI;oBAAE,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBACtE,GAAG,GAAG,MAAM,WAAW,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;gBAClD,KAAK,IAAI,CAAC,CAAC;gBACX,IAAI,CAAC,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,GAAG,CAAC,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;YAChF,CAAC;YACD,IAAI,GAAG,CAAC,aAAa,GAAG,IAAI;gBAAE,MAAM,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC1D,CAAC;aAAM,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACpC,MAAM,IAAI,eAAe,CAAC,GAAG,EAAE,sBAAsB,EAAE,UAAU,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,MAAM,oDAAoD,CAAC,CAAC;QAChJ,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK;YAAE,OAAO,GAAG,CAAC;QACrC,GAAG,GAAG,MAAM,WAAW,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO,GAAG,CAAC;QAC3B,OAAO,aAAa,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC;AACxF,CAAC;AAED,gFAAgF;AAChF,MAAM,UAAU,mBAAmB,CAAC,CAAY;IAC9C,OAAO,cAAc,CAAoC,CAAC,EAAE;QAC1D,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU;QAC3C,UAAU,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE;YAC9B,MAAM,KAAK,GAAyB,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;YACpE,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;gBAAE,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAC1D,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS;gBAAE,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAChE,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS;gBAAE,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YAC7D,OAAO,KAAK,CAAC;QACf,CAAC;QACD,QAAQ,EAAE,iCAAiC;KAC5C,CAAC,CAAC;AACL,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,yBAAyB,CAAC,CAAY;IACpD,OAAO,cAAc,CAAwC,CAAC,EAAE;QAC9D,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,gBAAgB,EAAE,iBAAiB;QACjD,UAAU,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE;YAC9B,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;gBAAE,MAAM,IAAI,eAAe,CAAC,CAAC,EAAE,wBAAwB,EAAE,4CAA4C,CAAC,CAAC;YACpI,MAAM,KAAK,GAAuB,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;YACrE,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS;gBAAE,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAChE,OAAO,KAAK,CAAC;QACf,CAAC;QACD,QAAQ,EAAE,+BAA+B;KAC1C,CAAC,CAAC;AACL,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -4,8 +4,8 @@ export { detectProjectKind, formatManifestYaml, ManifestParseError, ManifestVali
|
|
|
4
4
|
export type { ProjectKind, TemplateRegistryEntry } from './manifest.js';
|
|
5
5
|
export type { FetchLike, NineDeployClientOptions, } from './transport.js';
|
|
6
6
|
export type { JobKind, ScheduledJob, JobRun, TraefikVersionInfo, TraefikRoutingConfig, HealthStatus, VaultAllowlistView, VaultSettings, TokenIntrospection, TemplateDeployResult, TemplatePrepareResult, ApplyManifestResult, ApplyManifestInput, BackupDrillResult, BackupDrillEntry, BackupRestoreProbe, LogSearchInput, LogSearchLine, LogSearchResult, EmailTemplateName, EmailTemplateEntry, EmailTemplateRender, PgbouncerStatus, PitrRecovery, PitrRecoveryAdmission, PitrStatus, ImageInfo, PruneImagesInput, PruneImagesResult, DomainVerificationChallenge, CreatedDomain, DomainVerifyResult, StartDomainTransferResult, DomainTransferPreview, AcceptDomainTransferInput, AcceptDomainTransferResult, DatabaseCredentialsWithPublic, GithubAppInstallationSync, SourceRepo, SourceUpdateInput, ServerListEntry, ServerRolesResult, SwarmJoinResult, SwarmLeaveResult, VolumeListEntry, VolumeCreateResult, ServiceDetail, NodeTerminalCapability, TerminalListQuery, TrafficQuery, ContainerInspectData, ContainerComposeData, } from './types.js';
|
|
7
|
-
export { DATABASE_IMPORT_FINISHED_STATUSES, } from './databaseImport.js';
|
|
8
|
-
export type { ImportWaitOptions, ImportFileData, ImportFileOptions, } from './databaseImport.js';
|
|
7
|
+
export { DATABASE_IMPORT_FINISHED_STATUSES, VOLUME_IMPORT_FINISHED_STATUSES, } from './databaseImport.js';
|
|
8
|
+
export type { ImportWaitOptions, ImportFileData, ImportFileOptions, VolumeImportFileOptions, } from './databaseImport.js';
|
|
9
9
|
export type { ApiQuery, } from './apiPath.js';
|
|
10
10
|
export { apiGetUrl, } from './apiPath.js';
|
|
11
11
|
export { AGENT_SWARM_MANAGER_VAR, } from './types.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,mBAAmB,qBAAqB,CAAC;AACzC,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,uBAAuB,EACvB,iBAAiB,EACjB,eAAe,EACf,yBAAyB,GAC1B,MAAM,eAAe,CAAC;AACvB,YAAY,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAExE,YAAY,EACV,SAAS,EACT,uBAAuB,GACxB,MAAM,gBAAgB,CAAC;AAExB,YAAY,EACV,OAAO,EACP,YAAY,EACZ,MAAM,EACN,kBAAkB,EAClB,oBAAoB,EACpB,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACb,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,EACrB,mBAAmB,EACnB,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACd,aAAa,EACb,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,eAAe,EACf,YAAY,EACZ,qBAAqB,EACrB,UAAU,EACV,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,2BAA2B,EAC3B,aAAa,EACb,kBAAkB,EAClB,yBAAyB,EACzB,qBAAqB,EACrB,yBAAyB,EACzB,0BAA0B,EAC1B,6BAA6B,EAC7B,yBAAyB,EACzB,UAAU,EACV,iBAAiB,EACjB,eAAe,EACf,iBAAiB,EACjB,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,kBAAkB,EAClB,aAAa,EACb,sBAAsB,EACtB,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,iCAAiC,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,mBAAmB,qBAAqB,CAAC;AACzC,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,uBAAuB,EACvB,iBAAiB,EACjB,eAAe,EACf,yBAAyB,GAC1B,MAAM,eAAe,CAAC;AACvB,YAAY,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAExE,YAAY,EACV,SAAS,EACT,uBAAuB,GACxB,MAAM,gBAAgB,CAAC;AAExB,YAAY,EACV,OAAO,EACP,YAAY,EACZ,MAAM,EACN,kBAAkB,EAClB,oBAAoB,EACpB,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACb,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,EACrB,mBAAmB,EACnB,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACd,aAAa,EACb,eAAe,EACf,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,eAAe,EACf,YAAY,EACZ,qBAAqB,EACrB,UAAU,EACV,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,2BAA2B,EAC3B,aAAa,EACb,kBAAkB,EAClB,yBAAyB,EACzB,qBAAqB,EACrB,yBAAyB,EACzB,0BAA0B,EAC1B,6BAA6B,EAC7B,yBAAyB,EACzB,UAAU,EACV,iBAAiB,EACjB,eAAe,EACf,iBAAiB,EACjB,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,kBAAkB,EAClB,aAAa,EACb,sBAAsB,EACtB,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,iCAAiC,EACjC,+BAA+B,GAChC,MAAM,qBAAqB,CAAC;AAE7B,YAAY,EACV,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,qBAAqB,CAAC;AAE7B,YAAY,EACV,QAAQ,GACT,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,SAAS,GACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,uBAAuB,GACxB,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,oBAAoB,EACpB,sBAAsB,EACtB,0BAA0B,EAC1B,0BAA0B,EAC1B,kBAAkB,EAClB,oBAAoB,EACpB,eAAe,GAChB,MAAM,eAAe,CAAC;AAEvB,YAAY,EACV,oBAAoB,EACpB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,EACrB,aAAa,EACb,gBAAgB,EAChB,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,YAAY,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACpD,YAAY,EAAE,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAClL,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC9E,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACnE,YAAY,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
// hold one client surface each, client.ts composes them).
|
|
4
4
|
export { NineDeployError } from './errors.js';
|
|
5
5
|
export { detectProjectKind, formatManifestYaml, ManifestParseError, ManifestValidationError, parseManifestYaml, starterManifest, buildManifestFromTemplate, } from './manifest.js';
|
|
6
|
-
export { DATABASE_IMPORT_FINISHED_STATUSES, } from './databaseImport.js';
|
|
6
|
+
export { DATABASE_IMPORT_FINISHED_STATUSES, VOLUME_IMPORT_FINISHED_STATUSES, } from './databaseImport.js';
|
|
7
7
|
export { apiGetUrl, } from './apiPath.js';
|
|
8
8
|
export { AGENT_SWARM_MANAGER_VAR, } from './types.js';
|
|
9
9
|
export { TERMINAL_SUBPROTOCOL, TERMINAL_TICKET_PREFIX, TERMINAL_INPUT_CHUNK_BYTES, TERMINAL_PENDING_INPUT_MAX, terminalAttachInfo, terminalCloseMessage, connectTerminal, } from './terminal.js';
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,6EAA6E;AAC7E,0DAA0D;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,uBAAuB,EACvB,iBAAiB,EACjB,eAAe,EACf,yBAAyB,GAC1B,MAAM,eAAe,CAAC;AA+DvB,OAAO,EACL,iCAAiC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,6EAA6E;AAC7E,0DAA0D;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,uBAAuB,EACvB,iBAAiB,EACjB,eAAe,EACf,yBAAyB,GAC1B,MAAM,eAAe,CAAC;AA+DvB,OAAO,EACL,iCAAiC,EACjC,+BAA+B,GAChC,MAAM,qBAAqB,CAAC;AAa7B,OAAO,EACL,SAAS,GACV,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,uBAAuB,GACxB,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,oBAAoB,EACpB,sBAAsB,EACtB,0BAA0B,EAC1B,0BAA0B,EAC1B,kBAAkB,EAClB,oBAAoB,EACpB,eAAe,GAChB,MAAM,eAAe,CAAC;AAcvB,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { CreateVolumeBackupInput, Backup, BackupPolicy, BackupPolicyInput, BackupWithDb, CreateDatabaseInput, ManagedDatabase, DatabaseDetail, SetLimitsInput, PublicAccessPut, PublicAccessStatus, DatabaseImport, DatabaseImportCreate, BackupDestinationObject, BackupReplica, BackupReplicasView } from '@ninedeploy/schemas';
|
|
1
|
+
import type { CreateVolumeBackupInput, Backup, BackupPolicy, BackupPolicyInput, BackupWithDb, CreateDatabaseInput, ManagedDatabase, DatabaseDetail, SetLimitsInput, PublicAccessPut, PublicAccessStatus, DatabaseImport, DatabaseImportCreate, DatabaseUpgrade, DatabaseUpgradeOptions, BackupDestinationObject, BackupReplica, BackupReplicasView } from '@ninedeploy/schemas';
|
|
2
2
|
import type { ImportWaitOptions, ImportFileData, ImportFileOptions } from '../databaseImport.js';
|
|
3
3
|
import type { BackupDrillResult, BackupDrillEntry, BackupRestoreProbe, PgbouncerStatus, DatabaseCredentialsWithPublic, PitrRecovery, PitrRecoveryAdmission, PitrStatus } from '../types.js';
|
|
4
4
|
import type { Transport } from '../transport.js';
|
|
@@ -109,6 +109,32 @@ export interface DatabasesApi {
|
|
|
109
109
|
recoveries: (id: number) => Promise<PitrRecovery[]>;
|
|
110
110
|
recovery: (id: number, recoveryId: number) => Promise<PitrRecovery>;
|
|
111
111
|
};
|
|
112
|
+
/**
|
|
113
|
+
* O2: major-version upgrades (PostgreSQL on the panel host). `options`
|
|
114
|
+
* reads the running cluster's major and what it can move to. `start`
|
|
115
|
+
* checks the cluster, then answers 202 with the running upgrade: the
|
|
116
|
+
* database is stopped, dumped (the dump is kept in its backups), restored
|
|
117
|
+
* into a new volume on the target major and compared before the switch.
|
|
118
|
+
* The previous volume stays until `finalize`; until then `rollback`
|
|
119
|
+
* points the database back at it. Starting, rolling back and finalizing
|
|
120
|
+
* need `admin` on the database.
|
|
121
|
+
*/
|
|
122
|
+
upgrades: {
|
|
123
|
+
list: (id: number) => Promise<DatabaseUpgrade[]>;
|
|
124
|
+
options: (id: number) => Promise<DatabaseUpgradeOptions>;
|
|
125
|
+
start: (id: number, input: {
|
|
126
|
+
toMajor: number;
|
|
127
|
+
}) => Promise<DatabaseUpgrade>;
|
|
128
|
+
rollback: (id: number, upgradeId: number) => Promise<DatabaseUpgrade>;
|
|
129
|
+
finalize: (id: number, upgradeId: number) => Promise<DatabaseUpgrade & {
|
|
130
|
+
removedVolume: string;
|
|
131
|
+
}>;
|
|
132
|
+
/** Poll until the upgrade is no longer `running` (default every 2 s, for up to 2 h). */
|
|
133
|
+
wait: (id: number, upgradeId: number, opts?: {
|
|
134
|
+
intervalMs?: number;
|
|
135
|
+
timeoutMs?: number;
|
|
136
|
+
}) => Promise<DatabaseUpgrade>;
|
|
137
|
+
};
|
|
112
138
|
/**
|
|
113
139
|
* 0.14: public access through a per-database Traefik TCP sidecar. Reading
|
|
114
140
|
* needs `admin` on the database; `set` and `disable` are operator-only.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"databases.d.ts","sourceRoot":"","sources":["../../src/resources/databases.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,uBAAuB,EACvB,MAAM,EACN,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,cAAc,EACd,eAAe,EACf,kBAAkB,EAClB,cAAc,EACd,oBAAoB,EACpB,uBAAuB,EACvB,aAAa,EACb,kBAAkB,EACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACjG,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,eAAe,EAAE,6BAA6B,EAAE,YAAY,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC5L,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGjD,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE;QACT,2EAA2E;QAC3E,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;QACrD,MAAM,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;QACjE,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;QAC7C,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;YAAE,KAAK,CAAC,EAAE,OAAO,CAAA;SAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACrE,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACpC,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;YAAE,IAAI,EAAE,MAAM,EAAE,CAAA;SAAE,CAAC,CAAC;QAClE,WAAW,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,6BAA6B,CAAC,CAAC;QACpE,SAAS,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC;YAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;YAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;SAAE,CAAC,CAAC;QACnH,WAAW,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;YAAE,EAAE,EAAE,OAAO,CAAC;YAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;YAAC,GAAG,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;QAC1H,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC;YAAE,EAAE,EAAE,OAAO,CAAA;SAAE,CAAC,CAAC;QACrD;;;;;;WAMG;QACH,eAAe,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;QAC1D;;;;;WAKG;QACH,eAAe,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;QACrF,2DAA2D;QAC3D,gBAAgB,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC;QAC3D;;;;;;;;;;;;;;;WAeG;QACH,WAAW,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,kBAAkB,CAAA;SAAE,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACnH,gEAAgE;QAChE,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;QACpD,uFAAuF;QACvF,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAClE;;;;WAIG;QACH,IAAI,EAAE;YACJ,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;YACzC;;;;;eAKG;YACH,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;gBAAE,OAAO,EAAE,OAAO,CAAC;gBAAC,aAAa,CAAC,EAAE,MAAM,CAAA;aAAE,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;YAC9F,mGAAmG;YACnG,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC;gBAAE,OAAO,EAAE,IAAI,CAAA;aAAE,CAAC,CAAC;YACvD;;;;;;eAMG;YACH,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE;gBAAE,IAAI,EAAE,MAAM,CAAC;gBAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAA;aAAE,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;YACpH,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;YACpD,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;SACrE,CAAC;QACF;;;;WAIG;QACH,YAAY,EAAE;YACZ,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;YACjD,oDAAoD;YACpD,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;YACzE,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC;gBAAE,EAAE,EAAE,OAAO,CAAA;aAAE,CAAC,CAAC;SACnD,CAAC;QACF;;;;WAIG;QACH,OAAO,EAAE;YACP,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,oBAAoB,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;YAC7E,wEAAwE;YACxE,WAAW,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;YACzG,qEAAqE;YACrE,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;YACjE,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;YAChD,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;YAC/D,kDAAkD;YAClD,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;YAClE,yFAAyF;YACzF,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,iBAAiB,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;SAC3F,CAAC;QACF;;;;WAIG;QACH,UAAU,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,EAAE,iBAAiB,KAAK,OAAO,CAAC,cAAc,CAAC,CAAC;KACrG,CAAC;IACF,OAAO,EAAE;QACP,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC;YAAE,SAAS,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;QAChE,SAAS,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;QACnD,SAAS,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QACrD,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;YAAE,EAAE,EAAE,OAAO,CAAA;SAAE,CAAC,CAAC;QAC5E,IAAI,EAAE,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;QACpC,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QAC5C,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;QAC1C;kEAC0D;QAC1D,SAAS,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;QACzD,sFAAsF;QACtF,SAAS,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;QACnF,yGAAyG;QACzG,QAAQ,EAAE;YACR,GAAG,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;YACzD,GAAG,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;SACrF,CAAC;KACH,CAAC;IACF,kBAAkB,EAAE;QAClB,IAAI,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC;YAAE,EAAE,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,OAAO,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC,CAAC;QAC/J,MAAM,EAAE,CAAC,KAAK,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,CAAC;YAAC,WAAW,EAAE,MAAM,CAAC;YAAC,eAAe,EAAE,MAAM,CAAA;SAAE,KAAK,OAAO,CAAC;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAC,CAAC;QAC/K,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,OAAO,CAAC;YAAC,WAAW,EAAE,MAAM,CAAC;YAAC,eAAe,EAAE,MAAM,CAAA;SAAE,CAAC,KAAK,OAAO,CAAC;YAAE,EAAE,EAAE,OAAO,CAAA;SAAE,CAAC,CAAC;QACpN,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC;YAAE,EAAE,EAAE,OAAO,CAAA;SAAE,CAAC,CAAC;QACjD,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC;YAAE,EAAE,EAAE,OAAO,CAAA;SAAE,CAAC,CAAC;QAC/C,uFAAuF;QACvF,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAAC;KAC9E,CAAC;IACF;;sDAEkD;IAClD,aAAa,EAAE;QACb,IAAI,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAChD,MAAM,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,uBAAuB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;QAChF,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;YAAE,EAAE,EAAE,OAAO,CAAA;SAAE,CAAC,CAAC;QAC5E,WAAW,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;KAC/D,CAAC;CACH;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,SAAS,GAAG,YAAY,
|
|
1
|
+
{"version":3,"file":"databases.d.ts","sourceRoot":"","sources":["../../src/resources/databases.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,6 +42,27 @@ export function databasesApi(t) {
|
|
|
42
42
|
recoveries: (id) => get(`/v1/databases/${id}/pitr/recoveries`),
|
|
43
43
|
recovery: (id, recoveryId) => get(`/v1/databases/${id}/pitr/recoveries/${recoveryId}`),
|
|
44
44
|
},
|
|
45
|
+
upgrades: {
|
|
46
|
+
list: (id) => get(`/v1/databases/${id}/upgrades`),
|
|
47
|
+
options: (id) => get(`/v1/databases/${id}/upgrades/options`),
|
|
48
|
+
start: (id, input) => send('POST', `/v1/databases/${id}/upgrades`, input),
|
|
49
|
+
rollback: (id, upgradeId) => send('POST', `/v1/databases/${id}/upgrades/${upgradeId}/rollback`, {}),
|
|
50
|
+
finalize: (id, upgradeId) => send('POST', `/v1/databases/${id}/upgrades/${upgradeId}/finalize`, {}),
|
|
51
|
+
wait: async (id, upgradeId, opts = {}) => {
|
|
52
|
+
const interval = opts.intervalMs ?? 2_000;
|
|
53
|
+
const deadline = Date.now() + (opts.timeoutMs ?? 2 * 60 * 60 * 1000);
|
|
54
|
+
for (;;) {
|
|
55
|
+
const row = (await get(`/v1/databases/${id}/upgrades`)).find((u) => u.id === upgradeId);
|
|
56
|
+
if (!row)
|
|
57
|
+
throw new Error(`upgrade ${upgradeId} of database ${id} not found`);
|
|
58
|
+
if (row.status !== 'running')
|
|
59
|
+
return row;
|
|
60
|
+
if (Date.now() >= deadline)
|
|
61
|
+
throw new Error(`upgrade ${upgradeId} is still running (phase ${row.phase ?? 'unknown'})`);
|
|
62
|
+
await new Promise((resolve) => globalThis.setTimeout(resolve, interval));
|
|
63
|
+
}
|
|
64
|
+
},
|
|
65
|
+
},
|
|
45
66
|
pgbouncerStatus: (id) => get(`/v1/databases/${id}/pgbouncer`),
|
|
46
67
|
enablePgbouncer: (id, input) => send('POST', `/v1/databases/${id}/pgbouncer/enable`, input ?? {}),
|
|
47
68
|
disablePgbouncer: (id) => send('POST', `/v1/databases/${id}/pgbouncer/disable`, {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"databases.js","sourceRoot":"","sources":["../../src/resources/databases.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"databases.js","sourceRoot":"","sources":["../../src/resources/databases.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type { CreateServiceVolumeAttachmentInput, ServiceVolumeAttachment, UpdateServiceVolumeAttachmentInput, VolumeFileEntry, VolumeFileWriteInput, VolumePathCreateInput, VolumeCreateInput } from '@ninedeploy/schemas';
|
|
1
|
+
import type { CreateServiceVolumeAttachmentInput, ServiceVolumeAttachment, UpdateServiceVolumeAttachmentInput, VolumeFileEntry, VolumeFileWriteInput, VolumePathCreateInput, VolumeCreateInput, VolumeImport } from '@ninedeploy/schemas';
|
|
2
|
+
import { type ImportFileData, type ImportWaitOptions, type VolumeImportFileOptions } from '../databaseImport.js';
|
|
2
3
|
import type { VolumeListEntry, VolumeCreateResult, ContainerInspectData, ContainerComposeData } from '../types.js';
|
|
3
4
|
import type { Transport } from '../transport.js';
|
|
4
5
|
export interface VolumesApi {
|
|
@@ -137,6 +138,23 @@ export interface VolumesApi {
|
|
|
137
138
|
deploymentId: number;
|
|
138
139
|
}>;
|
|
139
140
|
};
|
|
141
|
+
/**
|
|
142
|
+
* A1: restore a gzipped tar of another host's volume into a service's data
|
|
143
|
+
* volume (`nd-svc-<slug>-data`). Operator only; docker services on the
|
|
144
|
+
* panel host with a volume mount. Uploads in ordered chunks with the
|
|
145
|
+
* archive's sha256; `start` is refused while the service runs, and a volume
|
|
146
|
+
* that exists is snapshotted first (a `pre-import` volume backup). A panel
|
|
147
|
+
* older than this feature answers 404.
|
|
148
|
+
*/
|
|
149
|
+
volumeImports: {
|
|
150
|
+
list: (serviceId: number) => Promise<VolumeImport[]>;
|
|
151
|
+
get: (serviceId: number, importId: number) => Promise<VolumeImport>;
|
|
152
|
+
cancel: (serviceId: number, importId: number) => Promise<VolumeImport>;
|
|
153
|
+
start: (serviceId: number, importId: number) => Promise<VolumeImport>;
|
|
154
|
+
wait: (serviceId: number, importId: number, options?: ImportWaitOptions<VolumeImport>) => Promise<VolumeImport>;
|
|
155
|
+
/** Create (or resume), upload, start and optionally poll, like `databases.importFile`. */
|
|
156
|
+
importFile: (serviceId: number, data: ImportFileData, options?: VolumeImportFileOptions) => Promise<VolumeImport>;
|
|
157
|
+
};
|
|
140
158
|
}
|
|
141
159
|
export declare function volumesApi(t: Transport): VolumesApi;
|
|
142
160
|
//# sourceMappingURL=volumes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"volumes.d.ts","sourceRoot":"","sources":["../../src/resources/volumes.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,kCAAkC,EAClC,uBAAuB,EACvB,kCAAkC,EAClC,eAAe,EACf,oBAAoB,EACpB,qBAAqB,EACrB,iBAAiB,
|
|
1
|
+
{"version":3,"file":"volumes.d.ts","sourceRoot":"","sources":["../../src/resources/volumes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { createVolumeImportHelpers } from '../databaseImport.js';
|
|
1
2
|
import { apiGetUrl } from '../apiPath.js';
|
|
2
3
|
export function volumesApi(t) {
|
|
3
4
|
const { get, send, request } = t;
|
|
5
|
+
const vi = createVolumeImportHelpers(t);
|
|
4
6
|
const volumePath = (name, suffix, options) => {
|
|
5
7
|
const id = options?.serverId;
|
|
6
8
|
if (id != null && (!Number.isSafeInteger(id) || id < 1))
|
|
@@ -58,6 +60,14 @@ export function volumesApi(t) {
|
|
|
58
60
|
},
|
|
59
61
|
repairConfig: (serviceId, input) => send('POST', `/v1/services/${serviceId}/volumes/config-repair`, input),
|
|
60
62
|
},
|
|
63
|
+
volumeImports: {
|
|
64
|
+
list: (serviceId) => get(vi.importPath(serviceId)),
|
|
65
|
+
get: vi.getImport,
|
|
66
|
+
cancel: (serviceId, importId) => send('DELETE', vi.importPath(serviceId, importId)),
|
|
67
|
+
start: vi.startImport,
|
|
68
|
+
wait: vi.waitForImport,
|
|
69
|
+
importFile: vi.importFile,
|
|
70
|
+
},
|
|
61
71
|
};
|
|
62
72
|
}
|
|
63
73
|
//# sourceMappingURL=volumes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"volumes.js","sourceRoot":"","sources":["../../src/resources/volumes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"volumes.js","sourceRoot":"","sources":["../../src/resources/volumes.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ninedeploy/sdk",
|
|
3
|
-
"version": "0.18.
|
|
3
|
+
"version": "0.18.27",
|
|
4
4
|
"description": "Official TypeScript SDK for NineDeploy PaaS",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
}
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@ninedeploy/schemas": "0.18.
|
|
28
|
+
"@ninedeploy/schemas": "0.18.27",
|
|
29
29
|
"js-yaml": "^4.3.1"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
package/src/databaseImport.ts
CHANGED
|
@@ -5,6 +5,8 @@ import type {
|
|
|
5
5
|
DatabaseImport,
|
|
6
6
|
DatabaseImportCreate,
|
|
7
7
|
DatabaseImportOptions,
|
|
8
|
+
VolumeImport,
|
|
9
|
+
VolumeImportCreate,
|
|
8
10
|
} from '@ninedeploy/schemas';
|
|
9
11
|
import { NineDeployError } from './errors.js';
|
|
10
12
|
import type { Transport } from './transport.js';
|
|
@@ -18,8 +20,11 @@ export const DATABASE_IMPORT_FINISHED_STATUSES: ReadonlyArray<DatabaseImport['st
|
|
|
18
20
|
'expired',
|
|
19
21
|
];
|
|
20
22
|
|
|
21
|
-
/**
|
|
22
|
-
export
|
|
23
|
+
/** A1: a volume import that no longer changes (`VolumeImport['status']`). */
|
|
24
|
+
export const VOLUME_IMPORT_FINISHED_STATUSES: ReadonlyArray<VolumeImport['status']> = ['completed', 'failed', 'cancelled', 'expired'];
|
|
25
|
+
|
|
26
|
+
/** 0.14: `databases.imports.wait` (and A1 `volumeImports.wait`) polling options. */
|
|
27
|
+
export interface ImportWaitOptions<Row = DatabaseImport> {
|
|
23
28
|
/**
|
|
24
29
|
* `finished` (default) waits for a final status; `uploaded` returns as soon
|
|
25
30
|
* as the import leaves `uploading` (an S3 download landing in `pending`).
|
|
@@ -30,7 +35,7 @@ export interface ImportWaitOptions {
|
|
|
30
35
|
/** Give up after this long (default: never). Throws `import_wait_timeout`. */
|
|
31
36
|
timeoutMs?: number;
|
|
32
37
|
/** Called with every polled row. */
|
|
33
|
-
onStatus?: (row:
|
|
38
|
+
onStatus?: (row: Row) => void;
|
|
34
39
|
}
|
|
35
40
|
|
|
36
41
|
/**
|
|
@@ -60,6 +65,22 @@ export interface ImportFileOptions {
|
|
|
60
65
|
onProgress?: (progress: { receivedBytes: number; sizeBytes: number; row: DatabaseImport }) => void;
|
|
61
66
|
}
|
|
62
67
|
|
|
68
|
+
/**
|
|
69
|
+
* A1: `volumeImports.importFile` options: a gzipped tar of a volume's
|
|
70
|
+
* contents, restored into a service's data volume. The sha256 is required
|
|
71
|
+
* (the server checks it before the volume is touched) unless resuming.
|
|
72
|
+
*/
|
|
73
|
+
export interface VolumeImportFileOptions {
|
|
74
|
+
sizeBytes?: number;
|
|
75
|
+
filename?: string;
|
|
76
|
+
sha256?: string;
|
|
77
|
+
resumeImportId?: number;
|
|
78
|
+
start?: boolean;
|
|
79
|
+
poll?: boolean | Omit<ImportWaitOptions<VolumeImport>, 'until'>;
|
|
80
|
+
onCreated?: (row: VolumeImport) => void;
|
|
81
|
+
onProgress?: (progress: { receivedBytes: number; sizeBytes: number; row: VolumeImport }) => void;
|
|
82
|
+
}
|
|
83
|
+
|
|
63
84
|
/** 0.14: the import bytes from `offset` on (a factory seeks; the rest skip). */
|
|
64
85
|
async function* sourceFrom(data: ImportFileData, offset: number): AsyncIterable<Uint8Array> {
|
|
65
86
|
if (data instanceof Uint8Array) {
|
|
@@ -102,29 +123,51 @@ async function* rechunk(source: AsyncIterable<Uint8Array>, size: number): AsyncI
|
|
|
102
123
|
if (len > 0) yield buf.subarray(0, len);
|
|
103
124
|
}
|
|
104
125
|
|
|
105
|
-
|
|
106
|
-
|
|
126
|
+
interface UploadRow {
|
|
127
|
+
id: number;
|
|
128
|
+
status: string;
|
|
129
|
+
sizeBytes: number;
|
|
130
|
+
receivedBytes: number;
|
|
131
|
+
chunkSize: number;
|
|
132
|
+
}
|
|
133
|
+
interface UploadFileOptions<Row> {
|
|
134
|
+
sizeBytes?: number;
|
|
135
|
+
resumeImportId?: number;
|
|
136
|
+
start?: boolean;
|
|
137
|
+
poll?: boolean | Omit<ImportWaitOptions<Row>, 'until'>;
|
|
138
|
+
onCreated?: (row: Row) => void;
|
|
139
|
+
onProgress?: (progress: { receivedBytes: number; sizeBytes: number; row: Row }) => void;
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
/**
|
|
143
|
+
* The chunked, resumable upload shared by dump imports and volume imports:
|
|
144
|
+
* create (or resume) a row under `base(id)`, send ordered chunks of the
|
|
145
|
+
* size the server advertised, start, and optionally poll to a final status.
|
|
146
|
+
*/
|
|
147
|
+
function chunkedUploads<Row extends UploadRow, Opts extends UploadFileOptions<Row>>(
|
|
148
|
+
t: Transport,
|
|
149
|
+
cfg: { base: (id: number) => string; createBody: (sizeBytes: number, opts: Opts) => unknown; finished: ReadonlyArray<string> },
|
|
150
|
+
) {
|
|
107
151
|
const { get, send, request } = t;
|
|
108
|
-
|
|
109
|
-
const
|
|
110
|
-
const getImport = (id: number, importId: number) => get<DatabaseImport>(importPath(id, importId));
|
|
152
|
+
const importPath = (id: number, importId?: number) => `${cfg.base(id)}${importId === undefined ? '' : `/${importId}`}`;
|
|
153
|
+
const getImport = (id: number, importId: number) => get<Row>(importPath(id, importId));
|
|
111
154
|
/** An 8 MiB chunk over a slow uplink outlasts the default 30 s budget. */
|
|
112
155
|
const CHUNK_TIMEOUT_MS = 10 * 60_000;
|
|
113
156
|
const uploadChunk = (id: number, importId: number, index: number, chunk: Uint8Array) =>
|
|
114
|
-
request<
|
|
115
|
-
const startImport = (id: number, importId: number) => send<
|
|
157
|
+
request<Row>(`${importPath(id, importId)}/chunks/${index}`, { method: 'PUT', raw: chunk }, CHUNK_TIMEOUT_MS);
|
|
158
|
+
const startImport = (id: number, importId: number) => send<Row>('POST', `${importPath(id, importId)}/start`);
|
|
116
159
|
const sleep = (ms: number) =>
|
|
117
160
|
new Promise<void>((resolve) => {
|
|
118
161
|
(globalThis as unknown as { setTimeout: (fn: () => void, ms: number) => unknown }).setTimeout(resolve, ms);
|
|
119
162
|
});
|
|
120
163
|
|
|
121
|
-
async function waitForImport(id: number, importId: number, o: ImportWaitOptions = {}): Promise<
|
|
164
|
+
async function waitForImport(id: number, importId: number, o: ImportWaitOptions<Row> = {}): Promise<Row> {
|
|
122
165
|
const interval = o.intervalMs ?? 2000;
|
|
123
166
|
const deadline = o.timeoutMs === undefined ? Number.POSITIVE_INFINITY : Date.now() + o.timeoutMs;
|
|
124
167
|
for (;;) {
|
|
125
168
|
const row = await getImport(id, importId);
|
|
126
169
|
o.onStatus?.(row);
|
|
127
|
-
const done = o.until === 'uploaded' ? row.status !== 'uploading' :
|
|
170
|
+
const done = o.until === 'uploaded' ? row.status !== 'uploading' : cfg.finished.includes(row.status);
|
|
128
171
|
if (done) return row;
|
|
129
172
|
if (Date.now() + interval > deadline) {
|
|
130
173
|
throw new NineDeployError(0, 'import_wait_timeout', `Import ${importId} is still ${row.status}`);
|
|
@@ -133,18 +176,14 @@ export function createImportHelpers(t: Transport) {
|
|
|
133
176
|
}
|
|
134
177
|
}
|
|
135
178
|
|
|
136
|
-
async function importFile(id: number, data: ImportFileData, opts:
|
|
179
|
+
async function importFile(id: number, data: ImportFileData, opts: Opts = {} as Opts): Promise<Row> {
|
|
137
180
|
const declared = data instanceof Uint8Array ? data.length : opts.sizeBytes;
|
|
138
|
-
let row:
|
|
181
|
+
let row: Row;
|
|
139
182
|
if (opts.resumeImportId !== undefined) {
|
|
140
183
|
row = await getImport(id, opts.resumeImportId);
|
|
141
184
|
} else {
|
|
142
185
|
if (declared === undefined) throw new NineDeployError(0, 'import_size_required', 'sizeBytes is required for a streamed import');
|
|
143
|
-
|
|
144
|
-
if (opts.sha256 !== undefined) input.sha256 = opts.sha256;
|
|
145
|
-
if (opts.filename !== undefined) input.filename = opts.filename;
|
|
146
|
-
if (opts.options !== undefined) input.options = opts.options;
|
|
147
|
-
row = await send<DatabaseImport>('POST', importPath(id), input);
|
|
186
|
+
row = await send<Row>('POST', importPath(id), cfg.createBody(declared, opts));
|
|
148
187
|
opts.onCreated?.(row);
|
|
149
188
|
}
|
|
150
189
|
const size = row.sizeBytes;
|
|
@@ -172,3 +211,32 @@ export function createImportHelpers(t: Transport) {
|
|
|
172
211
|
|
|
173
212
|
return { importPath, getImport, uploadChunk, startImport, waitForImport, importFile };
|
|
174
213
|
}
|
|
214
|
+
|
|
215
|
+
/** Chunked dump-import helpers bound to one transport (used by `databases`). */
|
|
216
|
+
export function createImportHelpers(t: Transport) {
|
|
217
|
+
return chunkedUploads<DatabaseImport, ImportFileOptions>(t, {
|
|
218
|
+
base: (id) => `/v1/databases/${id}/imports`,
|
|
219
|
+
createBody: (sizeBytes, opts) => {
|
|
220
|
+
const input: DatabaseImportCreate = { source: 'upload', sizeBytes };
|
|
221
|
+
if (opts.sha256 !== undefined) input.sha256 = opts.sha256;
|
|
222
|
+
if (opts.filename !== undefined) input.filename = opts.filename;
|
|
223
|
+
if (opts.options !== undefined) input.options = opts.options;
|
|
224
|
+
return input;
|
|
225
|
+
},
|
|
226
|
+
finished: DATABASE_IMPORT_FINISHED_STATUSES,
|
|
227
|
+
});
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
/** A1: chunked volume-import helpers (`/v1/services/:id/volume-imports`). */
|
|
231
|
+
export function createVolumeImportHelpers(t: Transport) {
|
|
232
|
+
return chunkedUploads<VolumeImport, VolumeImportFileOptions>(t, {
|
|
233
|
+
base: (id) => `/v1/services/${id}/volume-imports`,
|
|
234
|
+
createBody: (sizeBytes, opts) => {
|
|
235
|
+
if (opts.sha256 === undefined) throw new NineDeployError(0, 'import_sha256_required', "A volume import needs the archive's sha256");
|
|
236
|
+
const input: VolumeImportCreate = { sizeBytes, sha256: opts.sha256 };
|
|
237
|
+
if (opts.filename !== undefined) input.filename = opts.filename;
|
|
238
|
+
return input;
|
|
239
|
+
},
|
|
240
|
+
finished: VOLUME_IMPORT_FINISHED_STATUSES,
|
|
241
|
+
});
|
|
242
|
+
}
|
package/src/index.ts
CHANGED
|
@@ -76,12 +76,14 @@ export type {
|
|
|
76
76
|
|
|
77
77
|
export {
|
|
78
78
|
DATABASE_IMPORT_FINISHED_STATUSES,
|
|
79
|
+
VOLUME_IMPORT_FINISHED_STATUSES,
|
|
79
80
|
} from './databaseImport.js';
|
|
80
81
|
|
|
81
82
|
export type {
|
|
82
83
|
ImportWaitOptions,
|
|
83
84
|
ImportFileData,
|
|
84
85
|
ImportFileOptions,
|
|
86
|
+
VolumeImportFileOptions,
|
|
85
87
|
} from './databaseImport.js';
|
|
86
88
|
|
|
87
89
|
export type {
|
|
@@ -15,6 +15,8 @@ import type {
|
|
|
15
15
|
PublicAccessStatus,
|
|
16
16
|
DatabaseImport,
|
|
17
17
|
DatabaseImportCreate,
|
|
18
|
+
DatabaseUpgrade,
|
|
19
|
+
DatabaseUpgradeOptions,
|
|
18
20
|
BackupDestinationObject,
|
|
19
21
|
BackupReplica,
|
|
20
22
|
BackupReplicasView,
|
|
@@ -104,6 +106,25 @@ export interface DatabasesApi {
|
|
|
104
106
|
recoveries: (id: number) => Promise<PitrRecovery[]>;
|
|
105
107
|
recovery: (id: number, recoveryId: number) => Promise<PitrRecovery>;
|
|
106
108
|
};
|
|
109
|
+
/**
|
|
110
|
+
* O2: major-version upgrades (PostgreSQL on the panel host). `options`
|
|
111
|
+
* reads the running cluster's major and what it can move to. `start`
|
|
112
|
+
* checks the cluster, then answers 202 with the running upgrade: the
|
|
113
|
+
* database is stopped, dumped (the dump is kept in its backups), restored
|
|
114
|
+
* into a new volume on the target major and compared before the switch.
|
|
115
|
+
* The previous volume stays until `finalize`; until then `rollback`
|
|
116
|
+
* points the database back at it. Starting, rolling back and finalizing
|
|
117
|
+
* need `admin` on the database.
|
|
118
|
+
*/
|
|
119
|
+
upgrades: {
|
|
120
|
+
list: (id: number) => Promise<DatabaseUpgrade[]>;
|
|
121
|
+
options: (id: number) => Promise<DatabaseUpgradeOptions>;
|
|
122
|
+
start: (id: number, input: { toMajor: number }) => Promise<DatabaseUpgrade>;
|
|
123
|
+
rollback: (id: number, upgradeId: number) => Promise<DatabaseUpgrade>;
|
|
124
|
+
finalize: (id: number, upgradeId: number) => Promise<DatabaseUpgrade & { removedVolume: string }>;
|
|
125
|
+
/** Poll until the upgrade is no longer `running` (default every 2 s, for up to 2 h). */
|
|
126
|
+
wait: (id: number, upgradeId: number, opts?: { intervalMs?: number; timeoutMs?: number }) => Promise<DatabaseUpgrade>;
|
|
127
|
+
};
|
|
107
128
|
/**
|
|
108
129
|
* 0.14: public access through a per-database Traefik TCP sidecar. Reading
|
|
109
130
|
* needs `admin` on the database; `set` and `disable` are operator-only.
|
|
@@ -224,6 +245,24 @@ export function databasesApi(t: Transport): DatabasesApi {
|
|
|
224
245
|
recoveries: (id) => get<PitrRecovery[]>(`/v1/databases/${id}/pitr/recoveries`),
|
|
225
246
|
recovery: (id, recoveryId) => get<PitrRecovery>(`/v1/databases/${id}/pitr/recoveries/${recoveryId}`),
|
|
226
247
|
},
|
|
248
|
+
upgrades: {
|
|
249
|
+
list: (id) => get<DatabaseUpgrade[]>(`/v1/databases/${id}/upgrades`),
|
|
250
|
+
options: (id) => get<DatabaseUpgradeOptions>(`/v1/databases/${id}/upgrades/options`),
|
|
251
|
+
start: (id, input) => send<DatabaseUpgrade>('POST', `/v1/databases/${id}/upgrades`, input),
|
|
252
|
+
rollback: (id, upgradeId) => send<DatabaseUpgrade>('POST', `/v1/databases/${id}/upgrades/${upgradeId}/rollback`, {}),
|
|
253
|
+
finalize: (id, upgradeId) => send<DatabaseUpgrade & { removedVolume: string }>('POST', `/v1/databases/${id}/upgrades/${upgradeId}/finalize`, {}),
|
|
254
|
+
wait: async (id, upgradeId, opts = {}) => {
|
|
255
|
+
const interval = opts.intervalMs ?? 2_000;
|
|
256
|
+
const deadline = Date.now() + (opts.timeoutMs ?? 2 * 60 * 60 * 1000);
|
|
257
|
+
for (;;) {
|
|
258
|
+
const row = (await get<DatabaseUpgrade[]>(`/v1/databases/${id}/upgrades`)).find((u) => u.id === upgradeId);
|
|
259
|
+
if (!row) throw new Error(`upgrade ${upgradeId} of database ${id} not found`);
|
|
260
|
+
if (row.status !== 'running') return row;
|
|
261
|
+
if (Date.now() >= deadline) throw new Error(`upgrade ${upgradeId} is still running (phase ${row.phase ?? 'unknown'})`);
|
|
262
|
+
await new Promise<void>((resolve) => (globalThis as unknown as { setTimeout: (fn: () => void, ms: number) => unknown }).setTimeout(resolve, interval));
|
|
263
|
+
}
|
|
264
|
+
},
|
|
265
|
+
},
|
|
227
266
|
pgbouncerStatus: (id) => get<PgbouncerStatus>(`/v1/databases/${id}/pgbouncer`),
|
|
228
267
|
enablePgbouncer: (id, input) =>
|
|
229
268
|
send<PgbouncerStatus>('POST', `/v1/databases/${id}/pgbouncer/enable`, input ?? {}),
|
package/src/resources/volumes.ts
CHANGED
|
@@ -9,7 +9,9 @@ import type {
|
|
|
9
9
|
VolumeFileWriteInput,
|
|
10
10
|
VolumePathCreateInput,
|
|
11
11
|
VolumeCreateInput,
|
|
12
|
+
VolumeImport,
|
|
12
13
|
} from '@ninedeploy/schemas';
|
|
14
|
+
import { createVolumeImportHelpers, type ImportFileData, type ImportWaitOptions, type VolumeImportFileOptions } from '../databaseImport.js';
|
|
13
15
|
import { apiGetUrl } from '../apiPath.js';
|
|
14
16
|
import type { VolumeListEntry, VolumeCreateResult, ContainerInspectData, ContainerComposeData } from '../types.js';
|
|
15
17
|
import type { Transport } from '../transport.js';
|
|
@@ -78,10 +80,28 @@ export interface VolumesApi {
|
|
|
78
80
|
input: { filePath: string; attachmentId?: number; volumeName?: string },
|
|
79
81
|
) => Promise<{ ok: boolean; deploymentId: number }>;
|
|
80
82
|
};
|
|
83
|
+
/**
|
|
84
|
+
* A1: restore a gzipped tar of another host's volume into a service's data
|
|
85
|
+
* volume (`nd-svc-<slug>-data`). Operator only; docker services on the
|
|
86
|
+
* panel host with a volume mount. Uploads in ordered chunks with the
|
|
87
|
+
* archive's sha256; `start` is refused while the service runs, and a volume
|
|
88
|
+
* that exists is snapshotted first (a `pre-import` volume backup). A panel
|
|
89
|
+
* older than this feature answers 404.
|
|
90
|
+
*/
|
|
91
|
+
volumeImports: {
|
|
92
|
+
list: (serviceId: number) => Promise<VolumeImport[]>;
|
|
93
|
+
get: (serviceId: number, importId: number) => Promise<VolumeImport>;
|
|
94
|
+
cancel: (serviceId: number, importId: number) => Promise<VolumeImport>;
|
|
95
|
+
start: (serviceId: number, importId: number) => Promise<VolumeImport>;
|
|
96
|
+
wait: (serviceId: number, importId: number, options?: ImportWaitOptions<VolumeImport>) => Promise<VolumeImport>;
|
|
97
|
+
/** Create (or resume), upload, start and optionally poll, like `databases.importFile`. */
|
|
98
|
+
importFile: (serviceId: number, data: ImportFileData, options?: VolumeImportFileOptions) => Promise<VolumeImport>;
|
|
99
|
+
};
|
|
81
100
|
}
|
|
82
101
|
|
|
83
102
|
export function volumesApi(t: Transport): VolumesApi {
|
|
84
103
|
const { get, send, request } = t;
|
|
104
|
+
const vi = createVolumeImportHelpers(t);
|
|
85
105
|
const volumePath = (name: string, suffix: string, options?: { serverId?: number }) => {
|
|
86
106
|
const id = options?.serverId;
|
|
87
107
|
if (id != null && (!Number.isSafeInteger(id) || id < 1)) throw new TypeError('Invalid volume node id');
|
|
@@ -148,5 +168,13 @@ export function volumesApi(t: Transport): VolumesApi {
|
|
|
148
168
|
repairConfig: (serviceId, input) =>
|
|
149
169
|
send<{ ok: boolean; deploymentId: number }>('POST', `/v1/services/${serviceId}/volumes/config-repair`, input),
|
|
150
170
|
},
|
|
171
|
+
volumeImports: {
|
|
172
|
+
list: (serviceId) => get<VolumeImport[]>(vi.importPath(serviceId)),
|
|
173
|
+
get: vi.getImport,
|
|
174
|
+
cancel: (serviceId, importId) => send<VolumeImport>('DELETE', vi.importPath(serviceId, importId)),
|
|
175
|
+
start: vi.startImport,
|
|
176
|
+
wait: vi.waitForImport,
|
|
177
|
+
importFile: vi.importFile,
|
|
178
|
+
},
|
|
151
179
|
};
|
|
152
180
|
}
|