cabloy 5.1.102 → 5.1.103

package/vona/src/suite-vendor/a-file/modules/a-file/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 = `file.directUpload.${string}`;
 export type TypeRedlockLockIsolateResource = 'fileProvider.register';
 
 @Meta()

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

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

package/vona/src/suite-vendor/a-file/modules/a-file/src/bean/schedule.fileDraftPrune.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 ScheduleFileDraftPrune extends BeanBase implements IScheduleExecute {
+  async execute() {
+    const items = await this.scope.model.file.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.file.expireDraftFile(item.id);
+    }
+  }
+}

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

@@ -0,0 +1,45 @@
+import type {
+  IDecoratorSerializerTransformOptions,
+  ISerializerTransform,
+} from 'vona-module-a-serialization';
+
+import { BeanBase } from 'vona';
+import { SerializerTransform } from 'vona-module-a-serialization';
+
+import type { IFileDeliveryOptions, IFileView } from '../types/file.ts';
+import type { IFileSceneRecord } from '../types/fileScene.ts';
+
+export type TypeSerializerTransformResolveViewValue = unknown;
+
+export type TypeSerializerTransformResolveViewData = object;
+
+export type TypeSerializerTransformResolveViewResult = IFileView | undefined;
+
+export interface ISerializerTransformOptionsResolveView extends IDecoratorSerializerTransformOptions {
+  fieldName: string;
+  fileScene?: keyof IFileSceneRecord;
+  deliveryOptions?: IFileDeliveryOptions;
+}
+
+@SerializerTransform<ISerializerTransformOptionsResolveView>()
+export class SerializerTransformResolveView
+  extends BeanBase
+  implements
+    ISerializerTransform<
+      TypeSerializerTransformResolveViewValue,
+      TypeSerializerTransformResolveViewData,
+      TypeSerializerTransformResolveViewResult
+    >
+{
+  async transform(
+    _value: TypeSerializerTransformResolveViewValue,
+    data: TypeSerializerTransformResolveViewData,
+    options: ISerializerTransformOptionsResolveView,
+  ): Promise<TypeSerializerTransformResolveViewResult> {
+    return await this.bean.file.resolveView(
+      data[options.fieldName],
+      options.fileScene,
+      options.deliveryOptions,
+    );
+  }
+}

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

@@ -0,0 +1,45 @@
+import type {
+  IDecoratorSerializerTransformOptions,
+  ISerializerTransform,
+} from 'vona-module-a-serialization';
+
+import { BeanBase } from 'vona';
+import { SerializerTransform } from 'vona-module-a-serialization';
+
+import type { IFileDeliveryOptions, IFileView } from '../types/file.ts';
+import type { IFileSceneRecord } from '../types/fileScene.ts';
+
+export type TypeSerializerTransformResolveViewsValue = unknown;
+
+export type TypeSerializerTransformResolveViewsData = object;
+
+export type TypeSerializerTransformResolveViewsResult = IFileView[] | undefined;
+
+export interface ISerializerTransformOptionsResolveViews extends IDecoratorSerializerTransformOptions {
+  fieldName: string;
+  fileScene?: keyof IFileSceneRecord;
+  deliveryOptions?: IFileDeliveryOptions;
+}
+
+@SerializerTransform<ISerializerTransformOptionsResolveViews>()
+export class SerializerTransformResolveViews
+  extends BeanBase
+  implements
+    ISerializerTransform<
+      TypeSerializerTransformResolveViewsValue,
+      TypeSerializerTransformResolveViewsData,
+      TypeSerializerTransformResolveViewsResult
+    >
+{
+  async transform(
+    _value: TypeSerializerTransformResolveViewsValue,
+    data: TypeSerializerTransformResolveViewsData,
+    options: ISerializerTransformOptionsResolveViews,
+  ): Promise<TypeSerializerTransformResolveViewsResult> {
+    return await this.bean.file.resolveViews(
+      data[options.fieldName],
+      options.fileScene,
+      options.deliveryOptions,
+    );
+  }
+}

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

@@ -11,6 +11,12 @@ export function config(_app: VonaApplication) {
       upload: {
         maxSize: 20 * 1024 * 1024,
       },
+      directUpload: {
+        draftExpiresIn: 30 * 60 * 1000,
+      },
+      delivery: {
+        audienceExpiresIn: 8 * 60 * 60,
+      },
     },
   };
 }

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

@@ -1,20 +1,24 @@
 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 { IFileSceneRecord } from '../types/fileScene.ts';
+
+import { DtoFileDirectUploadFinalizeRequest } from '../dto/fileDirectUploadFinalizeRequest.ts';
+import { DtoFileDirectUploadFinalizeResponse } from '../dto/fileDirectUploadFinalizeResponse.ts';
 import { DtoFileDirectUploadRequest } from '../dto/fileDirectUploadRequest.ts';
 import { DtoFileDirectUploadResponse } from '../dto/fileDirectUploadResponse.ts';
 import { DtoFileDownloadRequest } from '../dto/fileDownloadRequest.ts';
 import { DtoFileUploadPolicyRequest } from '../dto/fileUploadPolicyRequest.ts';
 import { DtoFileUploadPolicyResponse } from '../dto/fileUploadPolicyResponse.ts';
 import { DtoFileUploadResponse } from '../dto/fileUploadResponse.ts';
-import { DtoFileUploadTokenRequest } from '../dto/fileUploadTokenRequest.ts';
-import { DtoFileUploadTokenResponse } from '../dto/fileUploadTokenResponse.ts';
 import { DtoFileUploadUrlRequest } from '../dto/fileUploadUrlRequest.ts';
 
 export interface IControllerOptionsFile extends IDecoratorControllerOptions {}
@@ -27,49 +31,52 @@ export class ControllerFile extends BeanBase {
     return await this.bean.fileUploadPolicy.resolveSceneUploadPolicy(data);
   }
 
-  @Web.post('upload-token')
-  @Api.body(DtoFileUploadTokenResponse)
-  async createUploadToken(@Arg.body() data: DtoFileUploadTokenRequest) {
-    return await this.bean.fileUploadPolicy.createUploadToken(data);
-  }
-
   @Web.post('upload')
-  @Core.fileUpload()
+  @Core.fileUpload({
+    busboy: {
+      limits: {
+        fields: 1,
+        files: 1,
+        parts: 3,
+      },
+    },
+  })
   @Api.body(DtoFileUploadResponse)
   @Api.contentType('application/json')
-  async upload(@Arg.field('token') token: string, @Arg.file('file') file: IUploadFile) {
-    const payload = await this.bean.fileUploadPolicy.verifyUploadToken(
-      token,
-      this.ctx.route.routePathRaw,
-    );
+  async upload(
+    @Arg.field('fileScene', v.required(), z.string()) fileScene: keyof IFileSceneRecord,
+    @Arg.file('file', v.required()) file: IUploadFile,
+  ) {
+    const stat = await fse.stat(file.file);
+    const policy = await this.bean.fileUploadPolicy.resolveUploadPolicy({
+      fileScene,
+      size: Number(stat.size),
+      mimeType: file.info.mimeType,
+    });
     await this.bean.fileUploadPolicy.validateUploadFile(
       {
         file: file.file,
         filename: file.info.filename,
         mimeType: file.info.mimeType,
       },
-      payload,
+      policy,
     );
     const uploadedFile = await this.bean.file.upload(
-      payload.providerName,
+      policy.providerName,
       {
         file: file.file,
         filename: file.info.filename,
-        contentType: file.info.mimeType,
-        public: payload.public,
+        contentType: policy.mimeType,
+        public: policy.public,
       },
       {
-        clientName: payload.clientName,
-        meta: payload.meta,
-        public: payload.public,
-        fileScene: payload.fileScene,
+        clientName: policy.clientName,
+        meta: policy.meta,
+        public: policy.public,
+        fileScene: policy.fileScene,
       },
     );
-    return {
-      ...uploadedFile,
-      url: await this.bean.file.getDownloadUrl(uploadedFile.id),
-      signed: !uploadedFile.public,
-    };
+    return await this.bean.file.createFileActionResponse(uploadedFile);
   }
 
   @Web.post('direct-upload')
@@ -84,9 +91,8 @@ export class ControllerFile extends BeanBase {
       policy.providerName,
       {
         filename: data.filename,
-        contentType: data.contentType,
-        size: data.size,
-        objectKey: data.objectKey,
+        contentType: policy.mimeType,
+        size: policy.fileSize,
         public: policy.public,
         expiry: data.expiry,
       },
@@ -99,22 +105,25 @@ export class ControllerFile extends BeanBase {
     );
   }
 
+  @Web.post('direct-upload/finalize')
+  @Api.body(DtoFileDirectUploadFinalizeResponse)
+  async finalizeDirectUpload(@Arg.body() data: DtoFileDirectUploadFinalizeRequest) {
+    const file = await this.bean.file.finalizeDirectUpload(data.fileId);
+    return await this.bean.file.createFileActionResponse(file);
+  }
+
   @Web.post('upload-url')
   @Api.body(DtoFileUploadResponse)
   async uploadUrl(@Arg.body() data: DtoFileUploadUrlRequest) {
-    const policy = await this.bean.fileUploadPolicy.resolveUploadPolicy({
+    const policy = await this.bean.fileUploadPolicy.resolveUploadUrlPolicy({
       fileScene: data.fileScene,
-      size: data.size,
-      mimeType: data.mimeType,
     });
     const uploadedFile = await this.bean.file.uploadUrl(
       policy.providerName,
       {
         url: data.url,
+        policy,
         filename: data.filename,
-        contentType: data.contentType,
-        size: data.size,
-        objectKey: data.objectKey,
         public: policy.public,
       },
       {
@@ -124,39 +133,38 @@ export class ControllerFile extends BeanBase {
         fileScene: policy.fileScene,
       },
     );
-    return {
-      ...uploadedFile,
-      url: await this.bean.file.getDownloadUrl(uploadedFile.id),
-      signed: !uploadedFile.public,
-    };
+    return await this.bean.file.createFileActionResponse(uploadedFile);
   }
 
-  @Web.get('download/:fileId')
+  @Web.get('download')
   @Passport.public()
-  async download(
-    @Arg.param('fileId', v.tableIdentity()) fileId: number,
-    @Arg.query(v.object(DtoFileDownloadRequest)) query: DtoFileDownloadRequest,
-  ) {
+  async download(@Arg.query(v.object(DtoFileDownloadRequest)) query: DtoFileDownloadRequest) {
+    const { fileId } = query;
     const file = await this.bean.file.get(fileId);
     if (!file) return this.app.throw(404);
     if (!file.public) {
       const payload = await this.bean.fileUploadPolicy.verifyDownloadToken(
         query.token,
-        this.scope.util.combineApiPath(`file/download/${fileId}`, false, true),
+        this.scope.util.combineApiPath('file/download', false, true),
       );
       if (String(payload.fileId) !== String(fileId)) {
         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);
+      }
     }
-    const result = await this.bean.file.download(
-      fileId,
-      file.public
-        ? undefined
-        : {
-            signed: false,
-            responseMode: 'buffer',
-          },
-    );
+    const result = await this.bean.file.downloadForDelivery(fileId, {
+      protected: !file.public,
+    });
     if (result.kind === 'url') {
       if (!result.url) {
         throw new Error(`file download url missing: ${fileId}`);

package/vona/src/suite-vendor/a-file/modules/a-file/src/dto/fileDirectUploadFinalizeRequest.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 IDtoOptionsFileDirectUploadFinalizeRequest extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsFileDirectUploadFinalizeRequest>()
+export class DtoFileDirectUploadFinalizeRequest {
+  @Api.field(v.tableIdentity())
+  fileId: TableIdentity;
+}

package/vona/src/suite-vendor/a-file/modules/a-file/src/dto/fileDirectUploadFinalizeResponse.ts

@@ -0,0 +1,10 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Dto } from 'vona-module-a-web';
+
+import { DtoFileUploadResponse } from './fileUploadResponse.ts';
+
+export interface IDtoOptionsFileDirectUploadFinalizeResponse extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsFileDirectUploadFinalizeResponse>()
+export class DtoFileDirectUploadFinalizeResponse extends DtoFileUploadResponse {}

package/vona/src/suite-vendor/a-file/modules/a-file/src/dto/fileDirectUploadRequest.ts

@@ -25,9 +25,6 @@ export class DtoFileDirectUploadRequest {
   @Api.field(v.optional())
   contentType?: string;
 
-  @Api.field(v.optional())
-  objectKey?: string;
-
   @Api.field(v.optional())
   expiry?: string;
 }

package/vona/src/suite-vendor/a-file/modules/a-file/src/dto/fileDirectUploadResponse.ts

@@ -5,9 +5,6 @@ import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 import z from 'zod';
 
-import type { IFileProviderRecord } from '../types/fileProvider.ts';
-import type { IFileSceneRecord } from '../types/fileScene.ts';
-
 export interface IDtoOptionsFileDirectUploadResponse extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsFileDirectUploadResponse>()
@@ -15,15 +12,6 @@ export class DtoFileDirectUploadResponse {
   @Api.field(v.tableIdentity())
   id: TableIdentity;
 
-  @Api.field(z.string())
-  provider: keyof IFileProviderRecord;
-
-  @Api.field()
-  clientName: string;
-
-  @Api.field()
-  resourceId: string;
-
   @Api.field()
   uploadUrl: string;
 
@@ -36,6 +24,6 @@ export class DtoFileDirectUploadResponse {
   @Api.field(v.optional())
   filename?: string;
 
-  @Api.field(v.optional(), z.string())
-  fileScene?: keyof IFileSceneRecord;
+  @Api.field(v.optional())
+  public?: boolean;
 }

package/vona/src/suite-vendor/a-file/modules/a-file/src/dto/fileDownloadRequest.ts

@@ -7,6 +7,9 @@ export interface IDtoOptionsFileDownloadRequest extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsFileDownloadRequest>()
 export class DtoFileDownloadRequest {
+  @Api.field(v.tableIdentity())
+  fileId: number | string;
+
   @Api.field(v.optional())
   token?: string;
 }

package/vona/src/suite-vendor/a-file/modules/a-file/src/dto/fileUploadPolicyResponse.ts

@@ -27,4 +27,7 @@ export class DtoFileUploadPolicyResponse {
 
   @Api.field(v.optional(), z.boolean())
   public?: boolean;
+
+  @Api.field(z.boolean())
+  directUpload: boolean;
 }

package/vona/src/suite-vendor/a-file/modules/a-file/src/dto/fileUploadResponse.ts

@@ -3,10 +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 { IFileProviderRecord } from '../types/fileProvider.ts';
-import type { IFileSceneRecord } from '../types/fileScene.ts';
 
 export interface IDtoOptionsFileUploadResponse extends IDecoratorDtoOptions {}
 
@@ -15,21 +11,6 @@ export class DtoFileUploadResponse {
   @Api.field(v.tableIdentity())
   id: TableIdentity;
 
-  @Api.field(z.string())
-  provider: keyof IFileProviderRecord;
-
-  @Api.field()
-  clientName: string;
-
-  @Api.field()
-  resourceId: string;
-
-  @Api.field(v.optional())
-  bucket?: string;
-
-  @Api.field(v.optional())
-  objectKey?: string;
-
   @Api.field(v.optional())
   filename?: string;
 
@@ -39,15 +20,9 @@ export class DtoFileUploadResponse {
   @Api.field(v.optional())
   size?: number;
 
-  @Api.field(v.optional())
-  etag?: string;
-
   @Api.field(v.optional())
   public?: boolean;
 
-  @Api.field(v.optional(), z.string())
-  fileScene?: keyof IFileSceneRecord;
-
   @Api.field(v.optional())
   uploadedAt?: Date;
 

package/vona/src/{suite/a-training/modules/training-record/src/dto/recordDossierFileView.ts → suite-vendor/a-file/modules/a-file/src/dto/fileView.ts}

@@ -5,22 +5,13 @@ import { Api, v } from 'vona-module-a-openapiutils';
 import { Dto } from 'vona-module-a-web';
 import z from 'zod';
 
-export interface IDtoOptionsRecordDossierFileView extends IDecoratorDtoOptions {}
+export interface IDtoOptionsFileView extends IDecoratorDtoOptions {}
 
-@Dto<IDtoOptionsRecordDossierFileView>()
-export class DtoRecordDossierFileView {
+@Dto<IDtoOptionsFileView>()
+export class DtoFileView {
   @Api.field(v.tableIdentity())
   id: TableIdentity;
 
-  @Api.field(z.string())
-  provider: string;
-
-  @Api.field(z.string())
-  clientName: string;
-
-  @Api.field(v.optional(), z.string())
-  fileScene?: string;
-
   @Api.field(v.optional())
   filename?: string;
 
@@ -36,9 +27,6 @@ export class DtoRecordDossierFileView {
   @Api.field(v.optional())
   uploadedAt?: Date;
 
-  @Api.field(v.optional(), z.record(z.string(), z.unknown()))
-  meta?: Record<string, unknown>;
-
   @Api.field(z.string())
   downloadUrl: string;
 

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

@@ -4,6 +4,7 @@ import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBase } from 'vona-module-a-orm';
 import z from 'zod';
 
+import type { TypeFileStatus } from '../types/file.ts';
 import type { IFileProviderRecord } from '../types/fileProvider.ts';
 import type { IFileSceneRecord } from '../types/fileScene.ts';
 
@@ -52,4 +53,13 @@ export class EntityFile extends EntityBase {
 
   @Api.field(v.optional(), z.string())
   fileScene?: keyof IFileSceneRecord;
+
+  @Api.field(z.enum(['draft', 'ready', 'expired']))
+  status: TypeFileStatus;
+
+  @Api.field(v.optional(), z.date())
+  draftExpiresAt?: Date;
+
+  @Api.field(v.optional(), z.date())
+  finalizedAt?: Date;
 }