Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| dc25b2aeaf |
@@ -180,7 +180,6 @@ class DefaultController extends ControllerAbstract {
|
|||||||
'entity.copy' => throw new InvalidArgumentException('Operation not implemented: ' . $operation),
|
'entity.copy' => throw new InvalidArgumentException('Operation not implemented: ' . $operation),
|
||||||
'entity.submit' => $this->entitySubmit($tenantId, $userId, $data),
|
'entity.submit' => $this->entitySubmit($tenantId, $userId, $data),
|
||||||
'entity.download' => $this->entityDownload($tenantId, $userId, $data),
|
'entity.download' => $this->entityDownload($tenantId, $userId, $data),
|
||||||
'entity.preview' => $this->entityPreview($tenantId, $userId, $data),
|
|
||||||
'entity.blobs' => $this->entityBlobs($tenantId, $userId, $data),
|
'entity.blobs' => $this->entityBlobs($tenantId, $userId, $data),
|
||||||
|
|
||||||
default => throw new InvalidArgumentException(self::ERR_INVALID_OPERATION . $operation)
|
default => throw new InvalidArgumentException(self::ERR_INVALID_OPERATION . $operation)
|
||||||
@@ -969,39 +968,4 @@ class DefaultController extends ControllerAbstract {
|
|||||||
return $results;
|
return $results;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function entityPreview(string $tenantId, string $userId, array $data): Response {
|
|
||||||
if (!isset($data['target']) || !is_string($data['target'])) {
|
|
||||||
throw new InvalidArgumentException(self::ERR_MISSING_TARGET);
|
|
||||||
}
|
|
||||||
if (!isset($data['part']) || !is_array($data['part'])) {
|
|
||||||
throw new InvalidArgumentException('Attachment preview requires a part');
|
|
||||||
}
|
|
||||||
|
|
||||||
$target = ResourceIdentifier::fromString($data['target']);
|
|
||||||
if (!$target instanceof EntityIdentifier) {
|
|
||||||
throw new InvalidArgumentException(self::ERR_INVALID_IDENTIFIER);
|
|
||||||
}
|
|
||||||
$preview = $this->manager->entityPreview(
|
|
||||||
$tenantId,
|
|
||||||
$userId,
|
|
||||||
$target,
|
|
||||||
$data['part'],
|
|
||||||
isset($data['variant']) && is_string($data['variant']) ? $data['variant'] : 'inline',
|
|
||||||
);
|
|
||||||
if ($preview === null) {
|
|
||||||
return new JsonResponse([
|
|
||||||
'status' => 'error',
|
|
||||||
'error' => ['code' => 404, 'message' => 'Preview unavailable'],
|
|
||||||
], Response::HTTP_NOT_FOUND);
|
|
||||||
}
|
|
||||||
|
|
||||||
return new StreamedResponse($preview->resource->stream(), Response::HTTP_OK, [
|
|
||||||
'Content-Type' => $preview->resource->mimeType(),
|
|
||||||
'Content-Length' => (string) $preview->size,
|
|
||||||
'ETag' => '"' . trim($preview->etag, '"') . '"',
|
|
||||||
'Cache-Control' => 'private, max-age=3600',
|
|
||||||
'X-Content-Type-Options' => 'nosniff',
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-50
@@ -5,10 +5,7 @@ declare(strict_types=1);
|
|||||||
namespace KTXM\MailManager;
|
namespace KTXM\MailManager;
|
||||||
|
|
||||||
use InvalidArgumentException;
|
use InvalidArgumentException;
|
||||||
use KTXC\Preview\Preview;
|
|
||||||
use KTXC\Preview\PreviewManager;
|
|
||||||
use KTXC\Resource\ProviderManager;
|
use KTXC\Resource\ProviderManager;
|
||||||
use KTXF\Preview\PreviewSource;
|
|
||||||
use KTXF\Mail\Collection\CollectionBaseInterface;
|
use KTXF\Mail\Collection\CollectionBaseInterface;
|
||||||
use KTXF\Mail\Collection\CollectionPropertiesMutableInterface;
|
use KTXF\Mail\Collection\CollectionPropertiesMutableInterface;
|
||||||
use KTXF\Mail\Collection\ICollectionBase;
|
use KTXF\Mail\Collection\ICollectionBase;
|
||||||
@@ -50,7 +47,6 @@ class Manager {
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
private LoggerInterface $logger,
|
private LoggerInterface $logger,
|
||||||
private ProviderManager $providerManager,
|
private ProviderManager $providerManager,
|
||||||
private PreviewManager $previewManager,
|
|
||||||
) { }
|
) { }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -938,6 +934,13 @@ class Manager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function entityDownload(string $tenantId, string $userId, EntityIdentifier $targetEntity, array|null $targetPart): BinaryResource {
|
||||||
|
// retrieve service
|
||||||
|
$service = $this->serviceFetch($tenantId, $userId, $targetEntity->provider(), $targetEntity->service());
|
||||||
|
// download entity
|
||||||
|
return $service->entityDownload($targetEntity, $targetPart);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if messages exist
|
* Check if messages exist
|
||||||
*
|
*
|
||||||
@@ -1349,50 +1352,4 @@ class Manager {
|
|||||||
return $service->entitySubmit($sender, $source, $message);
|
return $service->entitySubmit($sender, $source, $message);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function entityDownload(string $tenantId, string $userId, EntityIdentifier $targetEntity, array|null $targetPart): BinaryResource {
|
|
||||||
// retrieve service
|
|
||||||
$service = $this->serviceFetch($tenantId, $userId, $targetEntity->provider(), $targetEntity->service());
|
|
||||||
// download entity
|
|
||||||
return $service->entityDownload($targetEntity, $targetPart);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Resolve an authorized attachment and lazily generate or retrieve its preview.
|
|
||||||
*/
|
|
||||||
public function entityPreview(string $tenantId, string $userId, EntityIdentifier $targetEntity, array $part, string $variant = 'inline'): ?Preview {
|
|
||||||
$mimeType = $part['type'] ?? null;
|
|
||||||
$size = $part['size'] ?? null;
|
|
||||||
if (!is_string($mimeType) || ($size !== null && !is_int($size))) {
|
|
||||||
throw new InvalidArgumentException('Attachment preview requires a MIME type and optional integer size');
|
|
||||||
}
|
|
||||||
|
|
||||||
$selector = array_filter([
|
|
||||||
'blobId' => $part['blobId'] ?? null,
|
|
||||||
'partId' => $part['partId'] ?? null,
|
|
||||||
'cid' => $part['cid'] ?? null,
|
|
||||||
], static fn(mixed $value): bool => is_string($value) && $value !== '');
|
|
||||||
if ($selector === []) {
|
|
||||||
throw new InvalidArgumentException('Attachment preview requires a blob, part, or content identifier');
|
|
||||||
}
|
|
||||||
|
|
||||||
$attachmentIdentity = hash('sha256', json_encode($selector, JSON_THROW_ON_ERROR));
|
|
||||||
|
|
||||||
return $this->previewManager->fetch($tenantId, new PreviewSource(
|
|
||||||
sourceType: 'mail-attachment',
|
|
||||||
identity: (string) $targetEntity . ':' . $attachmentIdentity,
|
|
||||||
// Attachments are immutable once delivered, so there is no revision to track;
|
|
||||||
// existence and access are enforced by entityDownload() (via serviceFetch) below,
|
|
||||||
// which only runs on a cache miss.
|
|
||||||
signature: 'immutable',
|
|
||||||
mimeType: $mimeType,
|
|
||||||
size: $size,
|
|
||||||
resourceFactory: fn(): BinaryResource => $this->entityDownload(
|
|
||||||
$tenantId,
|
|
||||||
$userId,
|
|
||||||
$targetEntity,
|
|
||||||
$selector,
|
|
||||||
),
|
|
||||||
), $variant);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
* Entity management service
|
* Entity management service
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { transceivePost, transceiveStream, transceiveDownload, transceiveBlob } from './transceive';
|
import { transceivePost, transceiveStream, transceiveDownload } from './transceive';
|
||||||
import type {
|
import type {
|
||||||
EntityFetchRequest,
|
EntityFetchRequest,
|
||||||
EntityFetchResponse,
|
EntityFetchResponse,
|
||||||
@@ -28,7 +28,6 @@ import type {
|
|||||||
EntityPatchResponse,
|
EntityPatchResponse,
|
||||||
EntityPatchRequest,
|
EntityPatchRequest,
|
||||||
EntityDownloadRequest,
|
EntityDownloadRequest,
|
||||||
EntityPreviewRequest,
|
|
||||||
EntityBlobsRequest,
|
EntityBlobsRequest,
|
||||||
EntityBlobsResponse,
|
EntityBlobsResponse,
|
||||||
EntityBlobsWireResponse,
|
EntityBlobsWireResponse,
|
||||||
@@ -232,10 +231,6 @@ export const entityService = {
|
|||||||
return transceiveDownload<EntityDownloadRequest>('entity.download', request);
|
return transceiveDownload<EntityDownloadRequest>('entity.download', request);
|
||||||
},
|
},
|
||||||
|
|
||||||
async preview(request: EntityPreviewRequest): Promise<Blob> {
|
|
||||||
return await transceiveBlob<EntityPreviewRequest>('entity.preview', request);
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fetch one or more message parts (attachments) inline for rendering.
|
* Fetch one or more message parts (attachments) inline for rendering.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -188,25 +188,6 @@ export function transceiveDownload<TRequest>(
|
|||||||
return { transaction: request.transaction };
|
return { transaction: request.transaction };
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function transceiveBlob<TRequest>(operation: string, data: TRequest): Promise<Blob> {
|
|
||||||
const request: ApiRequest<TRequest> = {
|
|
||||||
version: API_VERSION,
|
|
||||||
transaction: generateTransactionId(),
|
|
||||||
operation,
|
|
||||||
data,
|
|
||||||
};
|
|
||||||
let blob: Blob | null = null;
|
|
||||||
await fetchWrapper.post(API_URL, request, {
|
|
||||||
headers: { 'Accept': '*/*' },
|
|
||||||
onStream: async (response: Response) => {
|
|
||||||
blob = await response.blob();
|
|
||||||
},
|
|
||||||
});
|
|
||||||
if (blob === null) throw new Error(`[${operation}] Empty preview response`);
|
|
||||||
return blob;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
function appendHiddenField(form: HTMLFormElement, name: string, value: string): void {
|
function appendHiddenField(form: HTMLFormElement, name: string, value: string): void {
|
||||||
const input = document.createElement('input');
|
const input = document.createElement('input');
|
||||||
input.type = 'hidden';
|
input.type = 'hidden';
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import type {
|
|||||||
EntityBlobSelector,
|
EntityBlobSelector,
|
||||||
EntityBlobsResponse,
|
EntityBlobsResponse,
|
||||||
EntityDownloadRequest,
|
EntityDownloadRequest,
|
||||||
EntityPreviewRequest,
|
|
||||||
EntityTransmitRequest,
|
EntityTransmitRequest,
|
||||||
EntityTransmitResponse,
|
EntityTransmitResponse,
|
||||||
} from '../types/entity'
|
} from '../types/entity'
|
||||||
@@ -519,10 +518,6 @@ export const useEntitiesStore = defineStore('mailEntitiesStore', () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function preview(request: EntityPreviewRequest): Promise<Blob> {
|
|
||||||
return await entityService.preview(request)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Return public API
|
// Return public API
|
||||||
return {
|
return {
|
||||||
// State (readonly)
|
// State (readonly)
|
||||||
@@ -545,7 +540,6 @@ export const useEntitiesStore = defineStore('mailEntitiesStore', () => {
|
|||||||
move,
|
move,
|
||||||
transmit,
|
transmit,
|
||||||
download,
|
download,
|
||||||
preview,
|
|
||||||
blobs,
|
blobs,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
+1
-7
@@ -227,12 +227,6 @@ export interface EntityDownloadRequest {
|
|||||||
filename?: string | null;
|
filename?: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface EntityPreviewRequest {
|
|
||||||
target: EntityIdentifier;
|
|
||||||
part: EntityBlobSelector & { type: string; size?: number | null };
|
|
||||||
variant?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface EntityBlobsRequest {
|
export interface EntityBlobsRequest {
|
||||||
target: EntityIdentifier;
|
target: EntityIdentifier;
|
||||||
parts: EntityBlobSelector[];
|
parts: EntityBlobSelector[];
|
||||||
@@ -252,4 +246,4 @@ export interface EntityBlobsResult extends Omit<EntityBlobsWireResult, 'bytes'>
|
|||||||
blob: Blob;
|
blob: Blob;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface EntityBlobsResponse extends Array<EntityBlobsResult> {}
|
export interface EntityBlobsResponse extends Array<EntityBlobsResult> {}
|
||||||
Reference in New Issue
Block a user