Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions src/services/modules/snapshot/snapshot.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import type {snapshot_id} from '@icp-sdk/canisters/ic-management';
import {encodeSnapshotId} from '@icp-sdk/canisters/ic-management';
import {Principal} from '@icp-sdk/core/principal';
import {nextArg} from '@junobuild/cli-tools';
import {red} from 'kleur';
import ora from 'ora';
import {
deleteCanisterSnapshot,
Expand All @@ -19,7 +20,11 @@ import {
loadSnapshotAndAssertOverwrite
} from './_snapshot.loader.services';
import {downloadExistingSnapshot} from './snapshot.download.services';
import {uploadExistingSnapshot} from './snapshot.upload.services';
import {
SnapshotAssertError,
SnapshotFsReadError,
uploadExistingSnapshot
} from './snapshot.upload.services';

export const createSnapshot = async ({
canisterId: cId,
Expand Down Expand Up @@ -164,12 +169,25 @@ export const uploadSnapshot = async ({

const {snapshotId} = await loadSnapshotAndAssertOverwrite({canisterId, segment});

await uploadExistingSnapshot({
const result = await uploadExistingSnapshot({
canisterId,
snapshotId,
segment,
folder
});

if (result.success) {
return;
}

const {err} = result;

if (err instanceof SnapshotFsReadError || err instanceof SnapshotAssertError) {
console.log(red(err.message));
process.exit(1);
}

throw err;
};

const restoreExistingSnapshot = async ({
Expand Down
23 changes: 12 additions & 11 deletions src/services/modules/snapshot/snapshot.upload.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
type snapshot_id,
type UploadCanisterSnapshotDataKind
} from '@icp-sdk/canisters/ic-management';
import {red} from 'kleur';
import {lstatSync} from 'node:fs';
import {type FileHandle, open as openFile, readFile} from 'node:fs/promises';
import {join, relative} from 'node:path';
Expand All @@ -30,16 +29,21 @@ interface DataChunk {
size: number;
}

class SnapshotAssertError extends Error {}
class SnapshotFsReadError extends Error {}
export class SnapshotAssertError extends Error {}
export class SnapshotFsReadError extends Error {}

export const uploadExistingSnapshot = async ({
segment,
...params
}: UploadSnapshotParams & {
segment: AssetKey;
folder: string;
}): Promise<void> => {
}): Promise<
| {
success: true;
}
| {success: false; err: unknown}
> => {
const spinner = ora('Uploading the snapshot...').start();

try {
Expand All @@ -55,15 +59,12 @@ export const uploadExistingSnapshot = async ({
console.log(
`✅ The snapshot ${snapshotIdText} for your ${displaySegment(segment)} has been uploaded.`
);
} catch (error: unknown) {
spinner.stop();

if (error instanceof SnapshotFsReadError || error instanceof SnapshotAssertError) {
console.log(red(error.message));
return;
}
return {success: true};
} catch (err: unknown) {
spinner.stop();

throw error;
return {success: false, err};
}
};

Expand Down