cabloy 5.1.102 → 5.1.103

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

@@ -28,7 +28,7 @@ export class MetaVersion extends BeanBase implements IMetaVersionUpdate {
         table.integer(entityImage.size);
         table.integer(entityImage.width);
         table.integer(entityImage.height);
-        table.boolean(entityImage.requireSignedURLs).defaultTo(false);
+        table.boolean(entityImage.public).defaultTo(true);
         table.json(entityImage.variants);
         table.json(entityImage.meta);
         table.text(entityImage.storagePath);

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

@@ -7,6 +7,7 @@ import { BeanBase } from 'vona';
 import { SerializerTransform } from 'vona-module-a-serialization';
 
 import type { DtoImageView } from '../dto/imageView.ts';
+import type { IImageDeliveryOptions } from '../types/image.ts';
 import type { IImageSceneRecord } from '../types/imageScene.ts';
 
 export type TypeSerializerTransformResolveViewValue = unknown;
@@ -18,6 +19,7 @@ export type TypeSerializerTransformResolveViewResult = DtoImageView | undefined;
 export interface ISerializerTransformOptionsResolveView extends IDecoratorSerializerTransformOptions {
   fieldName: string;
   imageScene?: keyof IImageSceneRecord;
+  deliveryOptions?: IImageDeliveryOptions;
 }
 
 @SerializerTransform<ISerializerTransformOptionsResolveView>()
@@ -39,6 +41,7 @@ export class SerializerTransformResolveView
       data[options.fieldName],
       undefined,
       options.imageScene,
+      options.deliveryOptions,
     );
   }
 }

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

@@ -7,6 +7,7 @@ import { BeanBase } from 'vona';
 import { SerializerTransform } from 'vona-module-a-serialization';
 
 import type { DtoImageView } from '../dto/imageView.ts';
+import type { IImageDeliveryOptions } from '../types/image.ts';
 import type { IImageSceneRecord } from '../types/imageScene.ts';
 
 export type TypeSerializerTransformResolveViewsValue = unknown;
@@ -18,6 +19,7 @@ export type TypeSerializerTransformResolveViewsResult = DtoImageView[] | undefin
 export interface ISerializerTransformOptionsResolveViews extends IDecoratorSerializerTransformOptions {
   fieldName: string;
   imageScene?: keyof IImageSceneRecord;
+  deliveryOptions?: IImageDeliveryOptions;
 }
 
 @SerializerTransform<ISerializerTransformOptionsResolveViews>()
@@ -39,6 +41,7 @@ export class SerializerTransformResolveViews
       data[options.fieldName],
       undefined,
       options.imageScene,
+      options.deliveryOptions,
     );
   }
 }

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

@@ -8,6 +8,7 @@ export function config(_app: VonaApplication) {
       defaultVariant: 'original',
       defaultProvider: 'image-native:native' as keyof IImageProviderRecord,
       defaultClientName: 'default',
+      public: true,
       upload: {
         maxSize: 2 * 1024 * 1024,
         mimeTypes: ['image/png', 'image/jpeg', 'image/webp'],
@@ -15,6 +16,9 @@ export function config(_app: VonaApplication) {
       directUpload: {
         draftExpiresIn: 30 * 60 * 1000,
       },
+      delivery: {
+        audienceExpiresIn: 8 * 60 * 60,
+      },
     },
   };
 }

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

@@ -1,11 +1,16 @@
 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 z from 'zod';
+
+import type { TypeImageVariantInput } from '../types/image.ts';
+import type { IImageSceneRecord } from '../types/imageScene.ts';
 
 import { DtoImageDeliveryRequest } from '../dto/imageDeliveryRequest.ts';
 import { DtoImageDirectUploadFinalizeRequest } from '../dto/imageDirectUploadFinalizeRequest.ts';
@@ -15,8 +20,6 @@ import { DtoImageDirectUploadResponse } from '../dto/imageDirectUploadResponse.t
 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';
 import { DtoImageUploadUrlRequest } from '../dto/imageUploadUrlRequest.ts';
 
 export interface IControllerOptionsImage extends IDecoratorControllerOptions {}
@@ -29,40 +32,48 @@ export class ControllerImage extends BeanBase {
     return await this.bean.imageUploadPolicy.resolveSceneUploadPolicy(data);
   }
 
-  @Web.post('upload-token')
-  @Api.body(DtoImageUploadTokenResponse)
-  async createUploadToken(@Arg.body() data: DtoImageUploadTokenRequest) {
-    return await this.bean.imageUploadPolicy.createUploadToken(data);
-  }
-
   @Web.post('upload')
-  @Core.fileUpload()
+  @Core.fileUpload({
+    busboy: {
+      limits: {
+        fields: 1,
+        files: 1,
+        parts: 3,
+      },
+    },
+  })
   @Api.body(DtoImageUploadResponse)
   @Api.contentType('application/json')
-  async upload(@Arg.field('token') token: string, @Arg.file('image') file: IUploadFile) {
-    const payload = await this.bean.imageUploadPolicy.verifyUploadToken(
-      token,
-      this.ctx.route.routePathRaw,
-    );
+  async upload(
+    @Arg.field('imageScene', v.required(), z.string()) imageScene: keyof IImageSceneRecord,
+    @Arg.file('image', v.required()) file: IUploadFile,
+  ) {
+    const stat = await fse.stat(file.file);
+    const policy = await this.bean.imageUploadPolicy.resolveUploadPolicy({
+      imageScene,
+      size: Number(stat.size),
+      mimeType: file.info.mimeType,
+    });
     await this.bean.imageUploadPolicy.validateUploadFile(
       {
         file: file.file,
         filename: file.info.filename,
         mimeType: file.info.mimeType,
       },
-      payload,
+      policy,
     );
     const image = await this.bean.image.upload(
-      payload.providerName,
+      policy.providerName,
       {
         file: file.file,
         filename: file.info.filename,
         contentType: file.info.mimeType,
+        public: policy.public,
       },
       {
-        clientName: payload.clientName,
-        meta: payload.meta,
-        imageScene: payload.imageScene,
+        clientName: policy.clientName,
+        meta: policy.meta,
+        imageScene: policy.imageScene,
       },
     );
     return await this.bean.image.createImageActionResponse(image);
@@ -80,8 +91,8 @@ export class ControllerImage extends BeanBase {
       policy.providerName,
       {
         filename: data.filename,
-        contentType: data.contentType,
-        requireSignedURLs: data.requireSignedURLs,
+        contentType: data.contentType ?? data.mimeType,
+        public: policy.public,
         expiry: data.expiry,
         customId: data.customId,
       },
@@ -114,7 +125,7 @@ export class ControllerImage extends BeanBase {
         url: data.url,
         filename: data.filename,
         contentType: data.contentType,
-        requireSignedURLs: data.requireSignedURLs,
+        public: policy.public,
       },
       {
         clientName: policy.clientName,
@@ -125,19 +136,52 @@ export class ControllerImage extends BeanBase {
     return await this.bean.image.createImageActionResponse(image);
   }
 
-  @Web.get('delivery/:imageId')
+  @Web.get('delivery')
   @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.scope.util.combineApiPath(`image/delivery/${imageId}`, false, true),
-    );
-    if (String(payload.imageId) !== String(imageId)) {
-      return this.app.throw(401);
+  async delivery(@Arg.query(v.object(DtoImageDeliveryRequest)) query: DtoImageDeliveryRequest) {
+    const { imageId } = query;
+    const image = await this.bean.image.get(imageId);
+    if (!image) return this.app.throw(404);
+    let request: TypeImageVariantInput = query.token
+      ? undefined
+      : {
+          variantName: query.variantName as any,
+          transformOptions: query.transformOptions as any,
+        };
+    if (query.token || !image.public) {
+      const payload = await this.bean.imageUploadPolicy.verifyDeliveryToken(
+        query.token,
+        this.scope.util.combineApiPath('image/delivery', false, true),
+      );
+      if (String(payload.imageId) !== String(imageId)) {
+        return this.app.throw(401);
+      }
+      if (payload.audienceUserId !== undefined) {
+        const auth = await this.bean.passport.checkAuthToken(
+          this.bean.jwt.extractAuthTokenFromAllWays(),
+          undefined,
+          { path: this.ctx.path },
+        );
+        if (!auth) return this.app.throw(401);
+        const user = auth.passport.user;
+        if (!user || user.anonymous) return this.app.throw(401);
+        if (String(user.id) !== String(payload.audienceUserId)) return this.app.throw(403);
+      }
+      request = payload.request;
+    }
+    const result = await this.bean.image.downloadForDelivery(imageId, request, {
+      protected: !image.public,
+    });
+    if (result.kind === 'url') {
+      if (!result.url) {
+        throw new Error(`image delivery url missing: ${imageId}`);
+      }
+      this.ctx.redirect(result.url);
+      return;
+    }
+    if (result.contentType) {
+      this.ctx.type = result.contentType;
     }
-    this.ctx.redirect(payload.targetUrl);
+    this.ctx.body = result.buffer;
   }
 }

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

@@ -9,6 +9,9 @@ export interface IDtoOptionsImageDeliveryRequest extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsImageDeliveryRequest>()
 export class DtoImageDeliveryRequest {
+  @Api.field(v.tableIdentity())
+  imageId: number | string;
+
   @Api.field(v.optional())
   variantName?: string;
 

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

@@ -25,9 +25,6 @@ export class DtoImageDirectUploadRequest {
   @Api.field(v.optional())
   contentType?: string;
 
-  @Api.field(v.optional())
-  requireSignedURLs?: boolean;
-
   @Api.field(v.optional())
   expiry?: string;
 

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

@@ -3,11 +3,6 @@ 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 { TypeImageStatus } from '../types/image.ts';
-import type { IImageProviderRecord } from '../types/imageProvider.ts';
-import type { IImageSceneRecord } from '../types/imageScene.ts';
 
 export interface IDtoOptionsImageDirectUploadResponse extends IDecoratorDtoOptions {}
 
@@ -16,33 +11,12 @@ export class DtoImageDirectUploadResponse {
   @Api.field(v.tableIdentity())
   id: TableIdentity;
 
-  @Api.field(z.string())
-  provider: keyof IImageProviderRecord;
-
-  @Api.field()
-  clientName: string;
-
-  @Api.field()
-  resourceId: string;
-
   @Api.field()
   uploadUrl: string;
 
-  @Api.field(v.optional())
-  draft?: boolean;
-
   @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;
+  public?: boolean;
 }

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

@@ -24,4 +24,10 @@ export class DtoImageUploadPolicyResponse {
 
   @Api.field(v.optional(), z.boolean())
   multiple?: boolean;
+
+  @Api.field(v.optional(), z.boolean())
+  public?: boolean;
+
+  @Api.field(v.optional(), z.boolean())
+  directUpload?: boolean;
 }

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

@@ -1,15 +1,8 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
-import { $schema, Api, v } from 'vona-module-a-openapiutils';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
-import z from 'zod';
-
-import type { IImageNamedVariants, TypeImageStatus } from '../types/image.ts';
-import type { IImageProviderRecord } from '../types/imageProvider.ts';
-import type { IImageSceneRecord } from '../types/imageScene.ts';
-
-import { DtoImageTransformOptions } from './imageTransformOptions.tsx';
 
 export interface IDtoOptionsImageUploadResponse extends IDecoratorDtoOptions {}
 
@@ -18,15 +11,6 @@ export class DtoImageUploadResponse {
   @Api.field(v.tableIdentity())
   id: TableIdentity;
 
-  @Api.field(z.string())
-  provider: keyof IImageProviderRecord;
-
-  @Api.field()
-  clientName: string;
-
-  @Api.field()
-  resourceId: string;
-
   @Api.field(v.optional())
   filename?: string;
 
@@ -43,25 +27,7 @@ export class DtoImageUploadResponse {
   height?: number;
 
   @Api.field(v.optional())
-  requireSignedURLs?: boolean;
-
-  @Api.field(v.optional(), z.record(z.string(), $schema(DtoImageTransformOptions)))
-  variants?: IImageNamedVariants;
-
-  @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;
+  public?: boolean;
 
   @Api.field(v.optional())
   url?: string;

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

@@ -27,7 +27,4 @@ export class DtoImageUploadUrlRequest {
 
   @Api.field(v.optional())
   contentType?: string;
-
-  @Api.field(v.optional())
-  requireSignedURLs?: boolean;
 }

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

@@ -1,15 +1,10 @@
 import type { TableIdentity } from 'table-identity';
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
-import { $schema, Api, v } from 'vona-module-a-openapiutils';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 import z from 'zod';
 
-import type { IImageNamedVariants, TypeImageStatus } from '../types/image.ts';
-import type { IImageSceneRecord } from '../types/imageScene.ts';
-
-import { DtoImageTransformOptions } from './imageTransformOptions.tsx';
-
 export interface IDtoOptionsImageView extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsImageView>()
@@ -29,27 +24,9 @@ export class DtoImageView {
   @Api.field(v.optional())
   height?: number;
 
-  @Api.field(z.string())
-  provider: string;
-
-  @Api.field(z.string())
-  clientName: string;
-
-  @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;
+  public?: boolean;
 
-  @Api.field(v.optional(), z.record(z.string(), $schema(DtoImageTransformOptions)))
-  variants?: IImageNamedVariants;
+  @Api.field(v.default(true))
+  signed: boolean;
 }

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

@@ -39,7 +39,7 @@ export class EntityImage extends EntityBase {
   height?: number;
 
   @Api.field(v.optional())
-  requireSignedURLs?: boolean;
+  public?: boolean;
 
   @Api.field(v.optional(), z.record(z.string(), $schema(DtoImageTransformOptions)))
   variants?: IImageNamedVariants;

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

@@ -37,14 +37,19 @@ export type TypeImageVariantName = keyof IImageVariantNameRecord;
 
 export type IImageNamedVariants = Partial<Record<TypeImageVariantName, IImageTransformOptions>>;
 
-export type TypeImageDeliveryExpiry = Date | string | number;
+export type TypeImageDirectUploadExpiry = Date | string | number;
 
 export type TypeImageStatus = 'draft' | 'ready' | 'expired';
 
 export interface IImageDeliveryOptions {
-  signed?: boolean;
   expiresIn?: number;
-  expiresAt?: TypeImageDeliveryExpiry;
+  audience?: boolean;
+  responseMode?: 'auto' | 'buffer' | 'url';
+}
+
+export interface IImageProviderDeliveryOptions {
+  protected: boolean;
+  expiresIn?: number;
   responseMode?: 'auto' | 'buffer' | 'url';
 }
 
@@ -73,7 +78,7 @@ export interface IImageUploadInput<TMeta extends TypeImageMeta = TypeImageMeta>
   filename?: string;
   contentType?: string;
   size?: number;
-  requireSignedURLs?: boolean;
+  public?: boolean;
   meta?: TMeta;
 }
 
@@ -81,16 +86,16 @@ export interface IImageUploadUrlInput<TMeta extends TypeImageMeta = TypeImageMet
   url: string;
   filename?: string;
   contentType?: string;
-  requireSignedURLs?: boolean;
+  public?: boolean;
   meta?: TMeta;
 }
 
 export interface IImageDirectUploadInput<TMeta extends TypeImageMeta = TypeImageMeta> {
   filename?: string;
   contentType?: string;
-  requireSignedURLs?: boolean;
+  public?: boolean;
   meta?: TMeta;
-  expiry?: TypeImageDeliveryExpiry;
+  expiry?: TypeImageDirectUploadExpiry;
   customId?: string;
 }
 
@@ -98,6 +103,7 @@ export interface IImageUploadContextResolved<TMeta extends TypeImageMeta = TypeI
   imageScene: keyof IImageSceneRecord;
   providerName: keyof IImageProviderRecord;
   clientName: string;
+  public?: boolean;
   meta?: TMeta;
 }
 
@@ -120,7 +126,7 @@ export interface IImageProviderResource<
   size?: number;
   width?: number;
   height?: number;
-  requireSignedURLs?: boolean;
+  public?: boolean;
   variants?: IImageNamedVariants;
   meta?: TMeta;
   storagePath?: string;
@@ -163,21 +169,33 @@ export interface IImageFinalizeDirectUploadResult<
   TRaw = unknown,
 > extends IImageResource<TMeta, TRaw> {}
 
+export interface IImageActionResponse {
+  id: TableIdentity;
+  filename?: string;
+  contentType?: string;
+  size?: number;
+  width?: number;
+  height?: number;
+  public?: boolean;
+  url: string;
+  signed: boolean;
+}
+
+export interface IImageDirectUploadResponse {
+  id: TableIdentity;
+  uploadUrl: string;
+  filename?: string;
+  public?: boolean;
+}
+
 export interface IImageView {
   id: TableIdentity;
   url: string;
   filename?: string;
   width?: number;
   height?: number;
-  provider: keyof IImageProviderRecord;
-  clientName: string;
-  imageScene?: keyof IImageSceneRecord | string;
-  status?: TypeImageStatus;
-  draftExpiresAt?: Date;
-  finalizedAt?: Date;
-  uploadedAt?: Date;
-  variants?: IImageNamedVariants;
-  signed?: boolean;
+  public?: boolean;
+  signed: boolean;
 }
 
 export interface IImageUploadOptions<
@@ -201,22 +219,11 @@ export interface IImageUploadPolicyResolved<
   mimeType: string;
 }
 
-export interface IImageUploadTokenPayload<
-  TMeta extends TypeImageMeta = TypeImageMeta,
-> extends IImageUploadPolicyResolved<TMeta> {
-  kind: 'imageUpload';
-}
-
-export interface IImageDirectUploadTokenPayload {
-  kind: 'imageDirectUpload';
-  resourceId: string;
-}
-
 export interface IImageDeliveryTokenPayload {
   kind: 'imageDelivery';
   imageId: TableIdentity;
   request: IImageVariantRequest;
-  targetUrl: string;
+  audienceUserId?: TableIdentity;
 }
 
 declare module 'vona' {

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

@@ -4,8 +4,8 @@ import type { ServiceOnion, TypeOnionOptionsEnableSimple } from 'vona-module-a-o
 import type { EntityImage } from '../entity/image.ts';
 import type { EntityImageProvider } from '../entity/imageProvider.ts';
 import type {
-  IImageDeliveryOptions,
   IImageDirectUploadInput,
+  IImageProviderDeliveryOptions,
   IImageDownloadResult,
   IImageNamedVariants,
   IImageProviderDirectUploadResource,
@@ -29,7 +29,7 @@ export interface IImageProviderClientRecord {
 export interface IImageProviderClientOptions {
   deliveryBaseUrl?: string;
   variants?: IImageNamedVariants;
-  requireSignedURLs?: boolean;
+  public?: boolean;
   signedDeliveryKind?: 'proxy' | 'provider';
 }
 
@@ -108,14 +108,14 @@ export interface IImageProviderExecute<
     request: IImageVariantRequest,
     clientOptions: T,
     options: O,
-    deliveryOptions?: IImageDeliveryOptions,
+    deliveryOptions?: IImageProviderDeliveryOptions,
   ): Promise<string>;
   download?(
     image: EntityImage,
     request: IImageVariantRequest,
     clientOptions: T,
     options: O,
-    deliveryOptions?: IImageDeliveryOptions,
+    deliveryOptions?: IImageProviderDeliveryOptions,
   ): Promise<IImageDownloadResult>;
 }
 

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

@@ -32,6 +32,7 @@ export type TypeImageSceneOptionsMetaResolver = (
 export interface IDecoratorImageSceneOptions {
   provider?: TypeDecoratorImageSceneOptionsProvider;
   upload?: IImageSceneOptionsUpload;
+  public?: boolean;
   meta?: Record<string, any> | TypeImageSceneOptionsMetaResolver;
 }
 

package/vona/src/suite-vendor/a-image/modules/image-cloudflare/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-image-cloudflare",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "description": "",
   "keywords": [
     "Vona Module"