mirror of
https://github.com/samsonjs/immich.git
synced 2026-03-30 10:05:54 +00:00
* feat: ProcessRepository#createSpawnDuplexStream
* test: write tests for ProcessRepository#createSpawnDuplexStream
* feat: StorageRepository#createGzip,createGunzip,createPlainReadStream
* feat: backups util (args, create, restore, progress)
* feat: wait on maintenance operation lock on boot
* chore: use backup util from backup.service.ts
test: update backup.service.ts tests with new util
* feat: list/delete backups (maintenance services)
* chore: open api
fix: missing action in cli.service.ts
* chore: add missing repositories to MaintenanceModule
* refactor: move logSecret into module init
* feat: initialise StorageCore in maintenance mode
* feat: authenticate websocket requests in maintenance mode
* test: add mock for new storage fns
* feat: add MaintenanceEphemeralStateRepository
refactor: cache the secret in memory
* test: update service worker tests
* feat: add external maintenance mode status
* feat: synchronised status, restore db action
* test: backup restore service tests
* refactor: DRY end maintenance
* feat: list and delete backup routes
* feat: start action on boot
* fix: should set status on restore end
* refactor: add maintenanceStore to hold writables
* feat: sync status to web app
* feat: web impl.
* test: various utils for testings
* test: web e2e tests
* test: e2e maintenance spec
* test: update cli spec
* chore: e2e lint
* chore: lint fixes
* chore: lint fixes
* feat: start restore flow route
* test: update e2e tests
* chore: remove neon lights on maintenance action pages
* fix: use 'startRestoreFlow' on onboarding page
* chore: ignore any library folder in `docker/`
* fix: load status on boot
* feat: upload backups
* refactor: permit any .sql(.gz) to be listed/restored
* feat: download backups from list
* fix: permit uploading just .sql files
* feat: restore just .sql files
* fix: don't show backups list if logged out
* feat: system integrity check in restore flow
* test: not providing failed backups in API anymore
* test: util should also not try to use failedBackups
* fix: actually assign inputStream
* test: correct test backup prep.
* fix: ensure task is defined to show error
* test: fix docker cp command
* test: update e2e web spec to select next button
* test: update e2e api tests
* test: refactor timeouts
* chore: remove `showDelete` from maint. settings
* chore: lint
* chore: lint
* fix: make sure backups are correctly sorted for clean up
* test: update service spec
* test: adjust e2e timeout
* test: increase web timeouts for ci
* chore: move gitignore changes
* chore: additional filename validation
* refactor: better typings for integrity API
* feat: higher accuracy progress tracking
* chore: delay lock retry
* refactor: remove old maintenance settings
* refactor: clean up tailwind classes
* refactor: use while loop rather than recursive calls
* test: update service specs
* chore: check canParse too
* chore: lint
* fix: logic error causing infinite loop
* refactor: use <ProgressBar /> from ui library
* fix: create or overwrite file
* chore: i18n pass, update progress bar
* fix: wrong translation string
* chore: update colour variables
* test: update web test for new maint. page
* chore: format, fix key
* test: update tests to be more linter complaint & use new routines
* chore: update onClick -> onAction, title -> breadcrumbs
* fix: use wrench icon in admin settings sidebar
* chore: add translation strings to accordion
* chore: lint
* refactor: move maintenance worker init into service
* refactor: `maintenanceStatus` -> `getMaintenanceStatus`
refactor: `integrityCheck` -> `detectPriorInstall`
chore: add `v2.4.0` version
refactor: `/backups/list` -> `/backups`
refactor: use sendFile in download route
refactor: use separate backups permissions
chore: correct descriptions
refactor: permit handler that doesn't return promise for sendfile
* refactor: move status impl into service
refactor: add active flag to maintenance status
* refactor: split into database backup controller
* test: split api e2e tests and passing
* fix: move end button into authed default maint page
* fix: also show in restore flow
* fix: import getMaintenanceStatus
* test: split web e2e tests
* refactor: ensure detect install is consistently named
* chore: ensure admin for detect install while out of maint.
* refactor: remove state repository
* test: update maint. worker service spec
* test: split backup service spec
* refactor: rename db backup routes
* refactor: instead of param, allow bulk backup deletion
* test: update sdk use in e2e test
* test: correct deleteBackup call
* fix: correct type for serverinstall response dto
* chore: validate filename for deletion
* test: wip
* test: backups no longer take path param
* refactor: scope util to database-backups instead of backups
* fix: update worker controller with new route
* chore: use new admin page actions
* chore: remove stray comment
* test: rename outdated test
* refactor: getter pattern for maintenance secret
* refactor: `createSpawnDuplexStream` -> `spawnDuplexStream`
* refactor: prefer `Object.assign`
* refactor: remove useless try {} block
* refactor: prefer `type Props`
refactor: prefer arrow function
* refactor: use luxon API for minutesAgo
* chore: remove change to gitignore
* refactor: prefer `type Props`
* refactor: remove async from onMount
* refactor: use luxon toRelative for relative time
* refactor: duplicate logic check
* chore: open api
* refactor: begin moving code into web//services
* refactor: don't use template string with $t
* test: use dialog role to match prompt
* refactor: split actions into flow/restore
* test: fix action value
* refactor: move more service calls into web//services
* chore: should void fn return
* chore: bump 2.4.0 to 2.5.0 in controller
* chore: bump 2.4.0 to 2.5.0 in controller
* refactor: use events for web//services
* chore: open api
* chore: open api
* refactor: don't await returned promise
* refactor: remove redundant check
* refactor: add `type: command` to actions
* refactor: split backup entries into own component
* refactor: split restore flow into separate components
* refactor(web): split BackupDelete event
* chore: stylings
* chore: stylings
* fix: don't log query failure on first boot
* feat: support pg_dumpall backups
* feat: display information about each backup
* chore: i18n
* feat: rollback to restore point on migrations failure
* feat: health check after restore
* chore: format
* refactor: split health check into separate function
* refactor: split health into repository
test: write tests covering rollbacks
* fix: omit 'health' requirement from createDbBackup
* test(e2e): rollback test
* fix: wrap text in backup entry
* fix: don't shrink context menu button
* fix: correct CREATE DB syntax for postgres
* test: rename backups generated by test
* feat: add filesize to backup response dto
* feat: restore list
* feat: ui work
* fix: e2e test
* fix: e2e test
* pr feedback
* pr feedback
---------
Co-authored-by: Alex <alex.tran1502@gmail.com>
Co-authored-by: Jason Rasmussen <jason@rasm.me>
245 lines
8.4 KiB
TypeScript
245 lines
8.4 KiB
TypeScript
import { authManager } from '$lib/managers/auth-manager.svelte';
|
|
import { uploadManager } from '$lib/managers/upload-manager.svelte';
|
|
import { uploadAssetsStore } from '$lib/stores/upload';
|
|
import { user } from '$lib/stores/user.store';
|
|
import { UploadState } from '$lib/types';
|
|
import { uploadRequest } from '$lib/utils';
|
|
import { addAssetsToAlbum } from '$lib/utils/asset-utils';
|
|
import { ExecutorQueue } from '$lib/utils/executor-queue';
|
|
import { asQueryString } from '$lib/utils/shared-links';
|
|
import {
|
|
Action,
|
|
AssetMediaStatus,
|
|
AssetVisibility,
|
|
checkBulkUpload,
|
|
getBaseUrl,
|
|
type AssetMediaResponseDto,
|
|
} from '@immich/sdk';
|
|
import { tick } from 'svelte';
|
|
import { t } from 'svelte-i18n';
|
|
import { get } from 'svelte/store';
|
|
import { handleError } from './handle-error';
|
|
|
|
export const addDummyItems = () => {
|
|
uploadAssetsStore.addItem({ id: 'asset-0', file: { name: 'asset0.jpg', size: 123_456 } as File });
|
|
uploadAssetsStore.updateItem('asset-0', { state: UploadState.PENDING });
|
|
uploadAssetsStore.addItem({ id: 'asset-1', file: { name: 'asset1.jpg', size: 123_456 } as File });
|
|
uploadAssetsStore.updateItem('asset-1', { state: UploadState.STARTED });
|
|
uploadAssetsStore.updateProgress('asset-1', 75, 100);
|
|
uploadAssetsStore.addItem({ id: 'asset-2', file: { name: 'asset2.jpg', size: 123_456 } as File });
|
|
uploadAssetsStore.updateItem('asset-2', { state: UploadState.ERROR, error: new Error('Internal server error') });
|
|
uploadAssetsStore.addItem({ id: 'asset-3', file: { name: 'asset3.jpg', size: 123_456 } as File });
|
|
uploadAssetsStore.updateItem('asset-3', { state: UploadState.DUPLICATED, assetId: 'asset-2' });
|
|
uploadAssetsStore.addItem({ id: 'asset-4', file: { name: 'asset3.jpg', size: 123_456 } as File });
|
|
uploadAssetsStore.updateItem('asset-4', { state: UploadState.DUPLICATED, assetId: 'asset-2', isTrashed: true });
|
|
uploadAssetsStore.addItem({ id: 'asset-10', file: { name: 'asset3.jpg', size: 123_456 } as File });
|
|
uploadAssetsStore.updateItem('asset-10', { state: UploadState.DONE });
|
|
uploadAssetsStore.track('error');
|
|
uploadAssetsStore.track('success');
|
|
uploadAssetsStore.track('duplicate');
|
|
};
|
|
|
|
// addDummyItems();
|
|
|
|
export const uploadExecutionQueue = new ExecutorQueue({ concurrency: 2 });
|
|
|
|
type FilePickerParam = { multiple?: boolean; extensions?: string[] };
|
|
type FileUploadParam = { multiple?: boolean; albumId?: string };
|
|
|
|
export const openFilePicker = async (options: FilePickerParam = {}) => {
|
|
const { multiple = true, extensions } = options;
|
|
|
|
return new Promise<File[]>((resolve, reject) => {
|
|
try {
|
|
const fileSelector = document.createElement('input');
|
|
|
|
fileSelector.type = 'file';
|
|
fileSelector.multiple = multiple;
|
|
|
|
if (extensions) {
|
|
fileSelector.accept = extensions.join(',');
|
|
}
|
|
|
|
fileSelector.addEventListener(
|
|
'change',
|
|
(e: Event) => {
|
|
const target = e.target as HTMLInputElement;
|
|
if (!target.files) {
|
|
return;
|
|
}
|
|
|
|
const files = Array.from(target.files);
|
|
resolve(files);
|
|
},
|
|
{ passive: true },
|
|
);
|
|
|
|
fileSelector.click();
|
|
} catch (error) {
|
|
console.log('Error selecting file', error);
|
|
reject(error);
|
|
}
|
|
});
|
|
};
|
|
|
|
export const openFileUploadDialog = async (options: FileUploadParam = {}) => {
|
|
const { albumId, multiple = true } = options;
|
|
const extensions = uploadManager.getExtensions();
|
|
const files = await openFilePicker({
|
|
multiple,
|
|
extensions,
|
|
});
|
|
|
|
return fileUploadHandler({ files, albumId });
|
|
};
|
|
|
|
type FileUploadHandlerParams = Omit<FileUploaderParams, 'deviceAssetId' | 'assetFile'> & {
|
|
files: File[];
|
|
};
|
|
|
|
export const fileUploadHandler = async ({
|
|
files,
|
|
albumId,
|
|
isLockedAssets = false,
|
|
}: FileUploadHandlerParams): Promise<string[]> => {
|
|
const extensions = uploadManager.getExtensions();
|
|
const promises = [];
|
|
for (const file of files) {
|
|
const name = file.name.toLowerCase();
|
|
if (extensions.some((extension) => name.endsWith(extension))) {
|
|
const deviceAssetId = getDeviceAssetId(file);
|
|
uploadAssetsStore.addItem({ id: deviceAssetId, file, albumId });
|
|
promises.push(
|
|
uploadExecutionQueue.addTask(() => fileUploader({ assetFile: file, deviceAssetId, albumId, isLockedAssets })),
|
|
);
|
|
}
|
|
}
|
|
|
|
const results = await Promise.all(promises);
|
|
return results.filter((result): result is string => !!result);
|
|
};
|
|
|
|
function getDeviceAssetId(asset: File) {
|
|
return 'web' + '-' + asset.name + '-' + asset.lastModified;
|
|
}
|
|
|
|
type FileUploaderParams = {
|
|
assetFile: File;
|
|
albumId?: string;
|
|
replaceAssetId?: string;
|
|
isLockedAssets?: boolean;
|
|
deviceAssetId: string;
|
|
};
|
|
|
|
// TODO: should probably use the @api SDK
|
|
async function fileUploader({
|
|
assetFile,
|
|
deviceAssetId,
|
|
albumId,
|
|
isLockedAssets = false,
|
|
}: FileUploaderParams): Promise<string | undefined> {
|
|
const fileCreatedAt = new Date(assetFile.lastModified).toISOString();
|
|
const $t = get(t);
|
|
const wasInitiallyLoggedIn = !!get(user);
|
|
|
|
uploadAssetsStore.markStarted(deviceAssetId);
|
|
|
|
try {
|
|
const formData = new FormData();
|
|
for (const [key, value] of Object.entries({
|
|
deviceAssetId,
|
|
deviceId: 'WEB',
|
|
fileCreatedAt,
|
|
fileModifiedAt: new Date(assetFile.lastModified).toISOString(),
|
|
isFavorite: 'false',
|
|
duration: '0:00:00.000000',
|
|
assetData: new File([assetFile], assetFile.name),
|
|
})) {
|
|
formData.append(key, value);
|
|
}
|
|
|
|
if (isLockedAssets) {
|
|
formData.append('visibility', AssetVisibility.Locked);
|
|
}
|
|
|
|
let responseData: { id: string; status: AssetMediaStatus; isTrashed?: boolean } | undefined;
|
|
if (crypto?.subtle?.digest && !authManager.isSharedLink) {
|
|
uploadAssetsStore.updateItem(deviceAssetId, { message: $t('asset_hashing') });
|
|
await tick();
|
|
try {
|
|
const bytes = await assetFile.arrayBuffer();
|
|
const hash = await crypto.subtle.digest('SHA-1', bytes);
|
|
const checksum = Array.from(new Uint8Array(hash))
|
|
.map((b) => b.toString(16).padStart(2, '0'))
|
|
.join('');
|
|
|
|
const {
|
|
results: [checkUploadResult],
|
|
} = await checkBulkUpload({ assetBulkUploadCheckDto: { assets: [{ id: assetFile.name, checksum }] } });
|
|
if (checkUploadResult.action === Action.Reject && checkUploadResult.assetId) {
|
|
responseData = {
|
|
status: AssetMediaStatus.Duplicate,
|
|
id: checkUploadResult.assetId,
|
|
isTrashed: checkUploadResult.isTrashed,
|
|
};
|
|
}
|
|
} catch (error) {
|
|
console.error(`Error calculating sha1 file=${assetFile.name})`, error);
|
|
}
|
|
}
|
|
|
|
if (!responseData) {
|
|
const queryParams = asQueryString(authManager.params);
|
|
|
|
uploadAssetsStore.updateItem(deviceAssetId, { message: $t('asset_uploading') });
|
|
const response = await uploadRequest<AssetMediaResponseDto>({
|
|
url: getBaseUrl() + '/assets' + (queryParams ? `?${queryParams}` : ''),
|
|
data: formData,
|
|
onUploadProgress: (event) => uploadAssetsStore.updateProgress(deviceAssetId, event.loaded, event.total),
|
|
});
|
|
|
|
if (![200, 201].includes(response.status)) {
|
|
throw new Error($t('errors.unable_to_upload_file'));
|
|
}
|
|
|
|
responseData = response.data;
|
|
}
|
|
|
|
if (responseData.status === AssetMediaStatus.Duplicate) {
|
|
uploadAssetsStore.track('duplicate');
|
|
} else {
|
|
uploadAssetsStore.track('success');
|
|
}
|
|
|
|
if (albumId) {
|
|
uploadAssetsStore.updateItem(deviceAssetId, { message: $t('asset_adding_to_album') });
|
|
await addAssetsToAlbum(albumId, [responseData.id], false);
|
|
uploadAssetsStore.updateItem(deviceAssetId, { message: $t('asset_added_to_album') });
|
|
}
|
|
|
|
uploadAssetsStore.updateItem(deviceAssetId, {
|
|
state: responseData.status === AssetMediaStatus.Duplicate ? UploadState.DUPLICATED : UploadState.DONE,
|
|
assetId: responseData.id,
|
|
isTrashed: responseData.isTrashed,
|
|
});
|
|
|
|
if (responseData.status !== AssetMediaStatus.Duplicate) {
|
|
setTimeout(() => {
|
|
uploadAssetsStore.removeItem(deviceAssetId);
|
|
}, 1000);
|
|
}
|
|
|
|
return responseData.id;
|
|
} catch (error) {
|
|
// If the user store no longer holds a user, it means they have logged out
|
|
// In this case don't bother reporting any errors.
|
|
if (wasInitiallyLoggedIn && !get(user)) {
|
|
return;
|
|
}
|
|
|
|
const errorMessage = handleError(error, $t('errors.unable_to_upload_file'));
|
|
uploadAssetsStore.track('error');
|
|
uploadAssetsStore.updateItem(deviceAssetId, { state: UploadState.ERROR, error: errorMessage });
|
|
return;
|
|
}
|
|
}
|