cabloy 5.1.97 → 5.1.99

package/vona/src/suite-vendor/a-image/modules/a-image/src/bean/bean.imageProvider.ts

@@ -2,7 +2,12 @@ import { BeanBase, deepExtend } from 'vona';
 import { Bean } from 'vona-module-a-bean';
 
 import type { EntityImageProvider } from '../entity/imageProvider.ts';
-import type { IImageProviderClientOptions, TypeImageProviderPick } from '../types/imageProvider.ts';
+import type {
+  IImageProviderRecord,
+  TypeImageProviderClientOptionsByName,
+  TypeImageProviderOptionsByName,
+  TypeImageProviderPick,
+} from '../types/imageProvider.ts';
 
 @Bean()
 export class BeanImageProvider extends BeanBase {
@@ -29,27 +34,29 @@ export class BeanImageProvider extends BeanBase {
     return await this.scope.model.imageProvider.insert(dataNew);
   }
 
-  async getClientOptions<T extends IImageProviderClientOptions>(
-    data: TypeImageProviderPick,
-    clientOptionsCustom?: T,
-    clientOptionsDefault?: T,
+  async getClientOptions<N extends keyof IImageProviderRecord>(
+    data: TypeImageProviderPick & { providerName: N },
+    clientOptionsCustom?: TypeImageProviderClientOptionsByName<N>,
+    clientOptionsDefault?: TypeImageProviderClientOptionsByName<N>,
   ) {
     const entityImageProvider = await this.bean.imageProvider.get(data);
     if (!entityImageProvider) return { entityImageProvider: undefined };
     const disabled = entityImageProvider.disabled;
-    const imageProviderName = entityImageProvider.providerName;
+    const imageProviderName = entityImageProvider.providerName as N;
     const clientName = entityImageProvider.clientName ?? 'default';
     const onionSlice = this.bean.onion.imageProvider.getOnionSliceEnabled(true, imageProviderName);
     if (!onionSlice) throw new Error(`Image provider not found: ${imageProviderName}`);
-    const beanFullName = onionSlice.beanOptions.beanFullName;
-    const onionOptions = onionSlice.beanOptions.options ?? {};
-    const clientOptions: IImageProviderClientOptions = deepExtend(
-      clientOptionsDefault ?? {},
-      onionOptions?.base,
-      onionOptions?.clients?.[clientName],
-      entityImageProvider.clientOptions,
+    const beanFullName = onionSlice.beanOptions.beanFullName as N;
+    const onionOptions =
+      (onionSlice.beanOptions.options as TypeImageProviderOptionsByName<N> | undefined) ??
+      ({} as TypeImageProviderOptionsByName<N>);
+    const clientOptions = deepExtend(
+      (clientOptionsDefault ?? {}) as TypeImageProviderClientOptionsByName<N>,
+      onionOptions.base,
+      onionOptions.clients?.[clientName as keyof typeof onionOptions.clients],
+      entityImageProvider.clientOptions as TypeImageProviderClientOptionsByName<N> | undefined,
       clientOptionsCustom,
-    );
+    ) as TypeImageProviderClientOptionsByName<N>;
     return { entityImageProvider, disabled, beanFullName, onionOptions, clientOptions };
   }
 }

package/vona/src/suite-vendor/a-image/modules/a-image/src/bean/bean.imageUploadPolicy.ts

@@ -1,8 +1,10 @@
+import fse from 'fs-extra';
 import { BeanBase } from 'vona';
 import { Bean } from 'vona-module-a-bean';
 
 import type {
   IImageDeliveryTokenPayload,
+  IImageDirectUploadTokenPayload,
   IImageUploadContextResolved,
   IImageUploadPolicyResolved,
   IImageUploadTokenPayload,
@@ -13,6 +15,8 @@ import type {
   IImageSceneRecord,
 } from '../types/imageScene.ts';
 
+import { getImageExtension, matchesImageMimeType } from '../lib/imageUploadValidation.ts';
+
 @Bean()
 export class BeanImageUploadPolicy extends BeanBase {
   async createUploadToken(data: {
@@ -36,6 +40,21 @@ export class BeanImageUploadPolicy extends BeanBase {
     return { token, expiresIn: data.expiresIn };
   }
 
+  async createDirectUploadToken(data: { resourceId: string; path: string; expiresIn?: number }) {
+    const path = data.path;
+    const token = await this.bean.jwt.createTempAuthToken(
+      {
+        kind: 'imageDirectUpload',
+        resourceId: data.resourceId,
+      } as IImageDirectUploadTokenPayload,
+      {
+        path,
+        expiresIn: data.expiresIn,
+      },
+    );
+    return { token, expiresIn: data.expiresIn };
+  }
+
   async createDeliveryToken(data: {
     imageId: number | string;
     request: IImageDeliveryTokenPayload['request'];
@@ -68,6 +87,16 @@ export class BeanImageUploadPolicy extends BeanBase {
     return payload;
   }
 
+  async verifyDirectUploadToken(token: string | undefined, routePathRaw: string) {
+    const payload = (await this.bean.jwt.get('access').verify(token, {
+      path: routePathRaw,
+    })) as IImageDirectUploadTokenPayload | undefined;
+    if (!payload || payload.kind !== 'imageDirectUpload') {
+      return this.app.throw(401);
+    }
+    return payload;
+  }
+
   async verifyDeliveryToken(token: string | undefined, routePathRaw: string) {
     const payload = (await this.bean.jwt.get('access').verify(token, {
       path: routePathRaw,
@@ -92,6 +121,33 @@ export class BeanImageUploadPolicy extends BeanBase {
     };
   }
 
+  async resolveSceneUploadPolicy(data: { imageScene: keyof IImageSceneRecord }) {
+    const imageConfig = this.scope.config.image;
+    const imageScene = data.imageScene;
+    const sceneOptions = this._getSceneOptions(imageScene);
+    const { providerName, clientName } = await this._resolveProvider(sceneOptions);
+    const { entityImageProvider, disabled } = await this.bean.imageProvider.getClientOptions({
+      providerName,
+      clientName,
+    });
+    if (!entityImageProvider || disabled) {
+      return this.app.throw(403, `Image provider unavailable: ${providerName}.${clientName}`);
+    }
+    const uploadOptions = {
+      ...(imageConfig.upload ?? {}),
+      ...(sceneOptions.upload ?? {}),
+    };
+    const mimeTypes = [...(uploadOptions.mimeTypes ?? [])];
+    const extensions = [...(uploadOptions.extensions ?? [])];
+    return {
+      imageScene,
+      maxSize: uploadOptions.maxSize,
+      mimeTypes: mimeTypes.length > 0 ? mimeTypes : undefined,
+      extensions: extensions.length > 0 ? extensions : undefined,
+      multiple: uploadOptions.multiple,
+    };
+  }
+
   async resolveUploadPolicy(data: {
     imageScene: keyof IImageSceneRecord;
     size: number;
@@ -121,7 +177,7 @@ export class BeanImageUploadPolicy extends BeanBase {
     if (maxSize && data.size > maxSize) {
       return this.app.throw(403, `image too large: maxSize=${maxSize}`);
     }
-    if (mimeTypes.length > 0 && !this._matchesMimeType(mimeType, mimeTypes)) {
+    if (mimeTypes.length > 0 && !matchesImageMimeType(mimeType, mimeTypes)) {
       return this.app.throw(403, `unsupported image mimeType: ${mimeType}`);
     }
     return {
@@ -135,6 +191,35 @@ export class BeanImageUploadPolicy extends BeanBase {
     };
   }
 
+  async validateUploadFile(
+    file: {
+      file: string;
+      filename?: string;
+      mimeType: string;
+    },
+    payload: IImageUploadPolicyResolved,
+  ) {
+    const stat = await fse.stat(file.file);
+    const fileSize = Number(stat.size);
+    if (fileSize !== payload.fileSize) {
+      return this.app.throw(403, `image size mismatch: size=${fileSize}`);
+    }
+    if (payload.maxSize && fileSize > payload.maxSize) {
+      return this.app.throw(403, `image too large: maxSize=${payload.maxSize}`);
+    }
+    const mimeType = file.mimeType.toLowerCase();
+    if (mimeType !== payload.mimeType) {
+      return this.app.throw(403, `image mimeType mismatch: mimeType=${mimeType}`);
+    }
+    if (payload.mimeTypes?.length && !matchesImageMimeType(mimeType, payload.mimeTypes)) {
+      return this.app.throw(403, `unsupported image mimeType: ${mimeType}`);
+    }
+    const extension = getImageExtension(file.filename);
+    if (payload.extensions?.length && extension && !payload.extensions.includes(extension)) {
+      return this.app.throw(403, `unsupported image extension: ${extension}`);
+    }
+  }
+
   private _getSceneOptions(imageScene: keyof IImageSceneRecord): IDecoratorImageSceneOptions {
     const onionSlice = this.bean.onion.imageScene.getOnionSlice(imageScene);
     if (!onionSlice) throw new Error(`not found image scene: ${imageScene}`);
@@ -161,14 +246,4 @@ export class BeanImageUploadPolicy extends BeanBase {
     }
     return meta;
   }
-
-  private _matchesMimeType(mimeType: string, mimeTypes: string[]) {
-    return mimeTypes.some(item => {
-      if (item === mimeType) return true;
-      if (item.endsWith('/*')) {
-        return mimeType.startsWith(`${item.slice(0, -1)}`);
-      }
-      return false;
-    });
-  }
 }

package/vona/src/suite-vendor/a-image/modules/a-image/src/bean/meta.index.ts

@@ -0,0 +1,12 @@
+import type { IMetaOptionsIndex } from 'vona-module-a-index';
+
+import { BeanBase } from 'vona';
+import { Meta } from 'vona-module-a-meta';
+import { $tableColumns } from 'vona-module-a-ormutils';
+
+@Meta<IMetaOptionsIndex>({
+  indexes: {
+    ...$tableColumns('aImage', 'status+draftExpiresAt'),
+  },
+})
+export class MetaIndex extends BeanBase {}

package/vona/src/suite-vendor/a-image/modules/a-image/src/bean/meta.redlock.ts

@@ -1,7 +1,7 @@
 import { Meta } from 'vona-module-a-meta';
 import { BeanRedlockBase } from 'vona-module-a-redlock';
 
-export type TypeRedlockLockResource = never;
+export type TypeRedlockLockResource = `image.directUpload.${string}`;
 export type TypeRedlockLockIsolateResource = 'imageProvider.register';
 
 @Meta()

package/vona/src/suite-vendor/a-image/modules/a-image/src/bean/meta.version.ts

@@ -34,6 +34,9 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate {
         table.text(entityImage.storagePath);
         table.text(entityImage.deliveryBaseUrl);
         table.string(entityImage.imageScene, 255);
+        table.string(entityImage.status, 255).defaultTo('ready');
+        table.dateTime(entityImage.draftExpiresAt);
+        table.dateTime(entityImage.finalizedAt);
       });
     }
   }

package/vona/src/suite-vendor/a-image/modules/a-image/src/bean/schedule.imageDraftPrune.ts

@@ -0,0 +1,29 @@
+import type { IScheduleExecute } from 'vona-module-a-schedule';
+
+import { BeanBase } from 'vona';
+import { Schedule } from 'vona-module-a-schedule';
+
+const PruneBatchLimit = 100;
+
+@Schedule({ repeat: { every: 30 * 60 * 1000 } })
+export class ScheduleImageDraftPrune extends BeanBase implements IScheduleExecute {
+  async execute() {
+    const items = await this.scope.model.image.select({
+      columns: ['id'],
+      where: {
+        status: 'draft',
+        draftExpiresAt: {
+          _lt_: new Date(),
+        },
+      },
+      orders: [
+        ['draftExpiresAt', 'asc'],
+        ['id', 'asc'],
+      ],
+      limit: PruneBatchLimit,
+    });
+    for (const item of items) {
+      await this.bean.image.expireDraftImage(item.id);
+    }
+  }
+}

package/vona/src/suite-vendor/a-image/modules/a-image/src/config/config.ts

@@ -12,6 +12,9 @@ export function config(_app: VonaApplication) {
         maxSize: 2 * 1024 * 1024,
         mimeTypes: ['image/png', 'image/jpeg', 'image/webp'],
       },
+      directUpload: {
+        draftExpiresIn: 30 * 60 * 1000,
+      },
     },
   };
 }

package/vona/src/suite-vendor/a-image/modules/a-image/src/controller/image.ts

@@ -1,17 +1,19 @@
 import type { IUploadFile } from 'vona-module-a-upload';
 import type { IDecoratorControllerOptions } from 'vona-module-a-web';
 
-import fse from 'fs-extra';
 import { BeanBase } from 'vona';
 import { Core } from 'vona-module-a-core';
 import { Api, v } from 'vona-module-a-openapiutils';
+import { Passport } from 'vona-module-a-user';
 import { Arg, Controller, Web } from 'vona-module-a-web';
 
-import type { IImageUploadTokenPayload } from '../types/image.ts';
-
 import { DtoImageDeliveryRequest } from '../dto/imageDeliveryRequest.ts';
+import { DtoImageDirectUploadFinalizeRequest } from '../dto/imageDirectUploadFinalizeRequest.ts';
+import { DtoImageDirectUploadFinalizeResponse } from '../dto/imageDirectUploadFinalizeResponse.ts';
 import { DtoImageDirectUploadRequest } from '../dto/imageDirectUploadRequest.ts';
 import { DtoImageDirectUploadResponse } from '../dto/imageDirectUploadResponse.ts';
+import { DtoImageUploadPolicyRequest } from '../dto/imageUploadPolicyRequest.ts';
+import { DtoImageUploadPolicyResponse } from '../dto/imageUploadPolicyResponse.ts';
 import { DtoImageUploadResponse } from '../dto/imageUploadResponse.ts';
 import { DtoImageUploadTokenRequest } from '../dto/imageUploadTokenRequest.ts';
 import { DtoImageUploadTokenResponse } from '../dto/imageUploadTokenResponse.ts';
@@ -21,6 +23,12 @@ export interface IControllerOptionsImage extends IDecoratorControllerOptions {}
 
 @Controller<IControllerOptionsImage>({ path: 'image' })
 export class ControllerImage extends BeanBase {
+  @Web.post('upload-policy')
+  @Api.body(DtoImageUploadPolicyResponse)
+  async getUploadPolicy(@Arg.body() data: DtoImageUploadPolicyRequest) {
+    return await this.bean.imageUploadPolicy.resolveSceneUploadPolicy(data);
+  }
+
   @Web.post('upload-token')
   @Api.body(DtoImageUploadTokenResponse)
   async createUploadToken(@Arg.body() data: DtoImageUploadTokenRequest) {
@@ -36,7 +44,14 @@ export class ControllerImage extends BeanBase {
       token,
       this.ctx.route.routePathRaw,
     );
-    await this._validateUploadFile(file, payload);
+    await this.bean.imageUploadPolicy.validateUploadFile(
+      {
+        file: file.file,
+        filename: file.info.filename,
+        mimeType: file.info.mimeType,
+      },
+      payload,
+    );
     const image = await this.bean.image.upload(
       payload.providerName,
       {
@@ -50,11 +65,7 @@ export class ControllerImage extends BeanBase {
         imageScene: payload.imageScene,
       },
     );
-    return {
-      ...image,
-      url: await this.bean.image.getVariantUrl(image.id),
-      signed: !!image.requireSignedURLs,
-    };
+    return await this.bean.image.createImageActionResponse(image);
   }
 
   @Web.post('direct-upload')
@@ -70,6 +81,7 @@ export class ControllerImage extends BeanBase {
       {
         filename: data.filename,
         contentType: data.contentType,
+        requireSignedURLs: data.requireSignedURLs,
         expiry: data.expiry,
         customId: data.customId,
       },
@@ -81,6 +93,13 @@ export class ControllerImage extends BeanBase {
     );
   }
 
+  @Web.post('direct-upload/finalize')
+  @Api.body(DtoImageDirectUploadFinalizeResponse)
+  async finalizeDirectUpload(@Arg.body() data: DtoImageDirectUploadFinalizeRequest) {
+    const image = await this.bean.image.finalizeDirectUpload(data.imageId);
+    return await this.bean.image.createImageActionResponse(image);
+  }
+
   @Web.post('upload-url')
   @Api.body(DtoImageUploadResponse)
   async uploadUrl(@Arg.body() data: DtoImageUploadUrlRequest) {
@@ -95,6 +114,7 @@ export class ControllerImage extends BeanBase {
         url: data.url,
         filename: data.filename,
         contentType: data.contentType,
+        requireSignedURLs: data.requireSignedURLs,
       },
       {
         clientName: policy.clientName,
@@ -102,64 +122,22 @@ export class ControllerImage extends BeanBase {
         imageScene: policy.imageScene,
       },
     );
-    return {
-      ...image,
-      url: await this.bean.image.getVariantUrl(image.id),
-      signed: !!image.requireSignedURLs,
-    };
+    return await this.bean.image.createImageActionResponse(image);
   }
 
   @Web.get('delivery/:imageId')
+  @Passport.public()
   async delivery(
     @Arg.param('imageId', v.tableIdentity()) imageId: number,
     @Arg.query(v.object(DtoImageDeliveryRequest)) query: DtoImageDeliveryRequest,
   ) {
     const payload = await this.bean.imageUploadPolicy.verifyDeliveryToken(
       query.token,
-      this.ctx.route.routePathRaw,
+      this.scope.util.combineApiPath(`image/delivery/${imageId}`, false, true),
     );
     if (String(payload.imageId) !== String(imageId)) {
       return this.app.throw(401);
     }
     this.ctx.redirect(payload.targetUrl);
   }
-
-  private async _validateUploadFile(file: IUploadFile, payload: IImageUploadTokenPayload) {
-    const stat = await fse.stat(file.file);
-    const fileSize = Number(stat.size);
-    if (fileSize !== payload.fileSize) {
-      return this.app.throw(403, `image size mismatch: size=${fileSize}`);
-    }
-    if (payload.maxSize && fileSize > payload.maxSize) {
-      return this.app.throw(403, `image too large: maxSize=${payload.maxSize}`);
-    }
-    const mimeType = file.info.mimeType.toLowerCase();
-    if (mimeType !== payload.mimeType) {
-      return this.app.throw(403, `image mimeType mismatch: mimeType=${mimeType}`);
-    }
-    if (payload.mimeTypes?.length && !this._matchesMimeType(mimeType, payload.mimeTypes)) {
-      return this.app.throw(403, `unsupported image mimeType: ${mimeType}`);
-    }
-    const extension = this._getExtension(file.info.filename);
-    if (payload.extensions?.length && extension && !payload.extensions.includes(extension)) {
-      return this.app.throw(403, `unsupported image extension: ${extension}`);
-    }
-  }
-
-  private _matchesMimeType(mimeType: string, mimeTypes: string[]) {
-    return mimeTypes.some(item => {
-      if (item === mimeType) return true;
-      if (item.endsWith('/*')) {
-        return mimeType.startsWith(`${item.slice(0, -1)}`);
-      }
-      return false;
-    });
-  }
-
-  private _getExtension(filename?: string) {
-    if (!filename) return '';
-    const index = filename.lastIndexOf('.');
-    if (index === -1) return '';
-    return filename.slice(index).toLowerCase();
-  }
 }

package/vona/src/suite-vendor/a-image/modules/a-image/src/dto/imageDirectUploadFinalizeRequest.ts

@@ -0,0 +1,13 @@
+import type { TableIdentity } from 'table-identity';
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Api, v } from 'vona-module-a-openapiutils';
+import { Dto } from 'vona-module-a-web';
+
+export interface IDtoOptionsImageDirectUploadFinalizeRequest extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsImageDirectUploadFinalizeRequest>()
+export class DtoImageDirectUploadFinalizeRequest {
+  @Api.field(v.tableIdentity())
+  imageId: TableIdentity;
+}

package/vona/src/suite-vendor/a-image/modules/a-image/src/dto/imageDirectUploadFinalizeResponse.ts

@@ -0,0 +1,10 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Dto } from 'vona-module-a-web';
+
+import { DtoImageUploadResponse } from './imageUploadResponse.ts';
+
+export interface IDtoOptionsImageDirectUploadFinalizeResponse extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsImageDirectUploadFinalizeResponse>()
+export class DtoImageDirectUploadFinalizeResponse extends DtoImageUploadResponse {}

package/vona/src/suite-vendor/a-image/modules/a-image/src/dto/imageDirectUploadResponse.ts

@@ -5,6 +5,7 @@ import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 import z from 'zod';
 
+import type { TypeImageStatus } from '../types/image.ts';
 import type { IImageProviderRecord } from '../types/imageProvider.ts';
 import type { IImageSceneRecord } from '../types/imageScene.ts';
 
@@ -33,6 +34,15 @@ export class DtoImageDirectUploadResponse {
   @Api.field(v.optional())
   filename?: string;
 
+  @Api.field(v.optional())
+  requireSignedURLs?: boolean;
+
+  @Api.field(v.optional(), z.string())
+  status?: TypeImageStatus;
+
+  @Api.field(v.optional())
+  draftExpiresAt?: Date;
+
   @Api.field(v.optional(), z.string())
   imageScene?: keyof IImageSceneRecord;
 }

package/vona/src/suite-vendor/a-image/modules/a-image/src/dto/imageUploadPolicyRequest.ts

@@ -0,0 +1,15 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Api } from 'vona-module-a-openapiutils';
+import { Dto } from 'vona-module-a-web';
+import z from 'zod';
+
+import type { IImageSceneRecord } from '../types/imageScene.ts';
+
+export interface IDtoOptionsImageUploadPolicyRequest extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsImageUploadPolicyRequest>()
+export class DtoImageUploadPolicyRequest {
+  @Api.field(z.string())
+  imageScene: keyof IImageSceneRecord;
+}

package/vona/src/suite-vendor/a-image/modules/a-image/src/dto/imageUploadPolicyResponse.ts

@@ -0,0 +1,27 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Api, v } from 'vona-module-a-openapiutils';
+import { Dto } from 'vona-module-a-web';
+import z from 'zod';
+
+import type { IImageSceneRecord } from '../types/imageScene.ts';
+
+export interface IDtoOptionsImageUploadPolicyResponse extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsImageUploadPolicyResponse>()
+export class DtoImageUploadPolicyResponse {
+  @Api.field(z.string())
+  imageScene: keyof IImageSceneRecord;
+
+  @Api.field(v.optional(), z.number().int().positive())
+  maxSize?: number;
+
+  @Api.field(v.optional(), z.array(z.string()))
+  mimeTypes?: string[];
+
+  @Api.field(v.optional(), z.array(z.string()))
+  extensions?: string[];
+
+  @Api.field(v.optional(), z.boolean())
+  multiple?: boolean;
+}

package/vona/src/suite-vendor/a-image/modules/a-image/src/dto/imageUploadResponse.ts

@@ -5,7 +5,7 @@ import { $schema, Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 import z from 'zod';
 
-import type { IImageNamedVariants } from '../types/image.ts';
+import type { IImageNamedVariants, TypeImageStatus } from '../types/image.ts';
 import type { IImageProviderRecord } from '../types/imageProvider.ts';
 import type { IImageSceneRecord } from '../types/imageScene.ts';
 
@@ -51,6 +51,15 @@ export class DtoImageUploadResponse {
   @Api.field(v.optional(), z.string())
   imageScene?: keyof IImageSceneRecord;
 
+  @Api.field(v.optional(), z.string())
+  status?: TypeImageStatus;
+
+  @Api.field(v.optional())
+  draftExpiresAt?: Date;
+
+  @Api.field(v.optional())
+  finalizedAt?: Date;
+
   @Api.field(v.optional())
   uploadedAt?: Date;
 

package/vona/src/suite-vendor/a-image/modules/a-image/src/dto/imageView.ts

@@ -5,7 +5,7 @@ import { $schema, Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 import z from 'zod';
 
-import type { IImageNamedVariants } from '../types/image.ts';
+import type { IImageNamedVariants, TypeImageStatus } from '../types/image.ts';
 import type { IImageSceneRecord } from '../types/imageScene.ts';
 
 import { DtoImageTransformOptions } from './imageTransformOptions.tsx';
@@ -38,6 +38,15 @@ export class DtoImageView {
   @Api.field(v.optional())
   imageScene?: keyof IImageSceneRecord | string;
 
+  @Api.field(v.optional(), z.string())
+  status?: TypeImageStatus;
+
+  @Api.field(v.optional())
+  draftExpiresAt?: Date;
+
+  @Api.field(v.optional())
+  finalizedAt?: Date;
+
   @Api.field(v.optional())
   uploadedAt?: Date;
 

package/vona/src/suite-vendor/a-image/modules/a-image/src/entity/image.ts

@@ -4,7 +4,7 @@ import { $schema, Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 import z from 'zod';
 
-import type { IImageNamedVariants } from '../types/image.ts';
+import type { IImageNamedVariants, TypeImageStatus } from '../types/image.ts';
 import type { IImageProviderRecord } from '../types/imageProvider.ts';
 import type { IImageSceneRecord } from '../types/imageScene.ts';
 
@@ -55,4 +55,13 @@ export class EntityImage extends EntityBase {
 
   @Api.field(v.optional(), z.string())
   imageScene?: keyof IImageSceneRecord;
+
+  @Api.field(v.optional(), z.string())
+  status?: TypeImageStatus;
+
+  @Api.field(v.optional())
+  draftExpiresAt?: Date;
+
+  @Api.field(v.optional())
+  finalizedAt?: Date;
 }

package/vona/src/suite-vendor/a-image/modules/a-image/src/lib/imageUploadValidation.ts

@@ -0,0 +1,15 @@
+import path from 'node:path';
+
+export function matchesImageMimeType(mimeType: string, mimeTypes: string[]) {
+  return mimeTypes.some(item => {
+    if (item === mimeType) return true;
+    if (item.endsWith('/*')) {
+      return mimeType.startsWith(`${item.slice(0, -1)}`);
+    }
+    return false;
+  });
+}
+
+export function getImageExtension(filename?: string) {
+  return path.extname(filename ?? '').toLowerCase();
+}

package/vona/src/suite-vendor/a-image/modules/a-image/src/lib/index.ts

@@ -1,3 +1,4 @@
 export * from './imageProvider.ts';
 export * from './imageScene.ts';
+export * from './imageUploadValidation.ts';
 export * from './imageVariant.ts';