cabloy 5.1.97 → 5.1.98

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

@@ -43,7 +43,11 @@ export interface IImageProviderOptionsCloudflare extends IDecoratorImageProvider
     },
   },
 })
-export class ImageProviderCloudflare extends BeanBase implements IImageProviderExecute {
+export class ImageProviderCloudflare
+  extends BeanBase
+  implements
+    IImageProviderExecute<IImageProviderCloudflareClientOptions, IImageProviderOptionsCloudflare>
+{
   async upload(
     input: IImageUploadInput,
     clientOptions: IImageProviderCloudflareClientOptions,
@@ -68,6 +72,14 @@ export class ImageProviderCloudflare extends BeanBase implements IImageProviderE
     return await this.scope.service.imageCloudflare.createDirectUpload(input, clientOptions);
   }
 
+  async finalizeDirectUpload(
+    image: EntityImage,
+    clientOptions: IImageProviderCloudflareClientOptions,
+    _options: IImageProviderOptionsCloudflare,
+  ) {
+    return await this.scope.service.imageCloudflare.finalizeDirectUpload(image, clientOptions);
+  }
+
   async get(
     image: EntityImage,
     clientOptions: IImageProviderCloudflareClientOptions,

package/vona/src/suite-vendor/a-image/modules/image-cloudflare/src/service/imageCloudflare.ts

@@ -38,6 +38,12 @@ interface ICloudflareImageResult {
   draft?: boolean;
 }
 
+interface ICloudflareImageDetailsResult extends ICloudflareImageResult {
+  meta?: {
+    filename?: string;
+  };
+}
+
 interface ICloudflareClientOptionsNormalized extends IImageProviderCloudflareClientOptions {
   accountId: string;
   apiToken: string;
@@ -130,6 +136,26 @@ export class ServiceImageCloudflare extends BeanBase {
     };
   }
 
+  async finalizeDirectUpload(
+    image: Pick<EntityImage, 'resourceId' | 'filename' | 'meta' | 'requireSignedURLs'>,
+    options: IImageProviderCloudflareClientOptions,
+  ): Promise<IImageProviderResource | undefined> {
+    const normalized = this._normalizeClientOptions(options);
+    const result = await this._request<ICloudflareImageDetailsResult>(
+      normalized,
+      `/images/v1/${encodeURIComponent(image.resourceId)}`,
+      {
+        method: 'GET',
+      },
+    );
+    if (result.draft) return undefined;
+    return this._mapImageResource(result, normalized, {
+      filename: result.filename ?? result.meta?.filename ?? image.filename,
+      meta: image.meta,
+      requireSignedURLs: image.requireSignedURLs,
+    });
+  }
+
   async remove(
     image: Pick<EntityImage, 'resourceId'>,
     options: IImageProviderCloudflareClientOptions,

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-image-native",
-  "version": "5.0.1",
+  "version": "5.0.4",
   "description": "",
   "keywords": [
     "Vona Module"
@@ -46,7 +46,11 @@
   "title": "image-native",
   "vonaModule": {
     "dependencies": {
-      "a-image": "5.0.0"
+      "a-core": "5.0.0",
+      "a-image": "5.0.0",
+      "a-upload": "5.0.0",
+      "a-user": "5.0.0",
+      "a-web": "5.0.0"
     },
     "globalDependencies": {
       "sharp": true

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

@@ -1,4 +1,5 @@
 // eslint-disable
+import type { TypeControllerOptionsActions } from 'vona-module-a-openapi';
 /** service: begin */
 export * from '../service/imageNative.ts';
 
@@ -72,6 +73,42 @@ export interface IModuleImageProvider {
   'native': ImageProviderNative;
 }
 /** imageProvider: end */
+/** controller: begin */
+export * from '../controller/image.ts';
+import type { IControllerOptionsImage } from '../controller/image.ts';
+import 'vona-module-a-web';
+declare module 'vona-module-a-web' {
+  export interface IControllerRecord {
+    'image-native:image': IControllerOptionsImage;
+  }
+}
+declare module 'vona-module-image-native' {
+  export interface ControllerImage {
+    /** @internal */
+    get scope(): ScopeModuleImageNative;
+  }
+
+  export interface ControllerImage {
+    get $beanFullName(): 'image-native.controller.image';
+    get $onionName(): 'image-native:image';
+    get $onionOptions(): IControllerOptionsImage;
+  }
+}
+/** controller: end */
+/** controller: begin */
+// @ts-ignore ignore
+import type { ControllerImage } from '../controller/image.ts';
+declare module 'vona-module-image-native' {
+  export interface IControllerOptionsImage {
+    actions?: TypeControllerOptionsActions<ControllerImage>;
+  }
+}
+declare module 'vona-module-a-web' {
+  export interface IApiPathPostRecord {
+    '/image-native/direct-upload/:resourceId': undefined;
+  }
+}
+/** controller: end */
 /** config: begin */
 export * from '../config/config.ts';
 import type { config } from '../config/config.ts';

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

@@ -1,6 +1,7 @@
 import type {
   IDecoratorImageProviderOptions,
   IImageDeliveryOptions,
+  IImageDirectUploadInput,
   IImageDownloadResult,
   IImageProviderClientOptions,
   IImageProviderClientRecord,
@@ -34,7 +35,10 @@ export interface IImageProviderOptionsNative extends IDecoratorImageProviderOpti
     signedDeliveryKind: 'proxy',
   },
 })
-export class ImageProviderNative extends BeanBase implements IImageProviderExecute {
+export class ImageProviderNative
+  extends BeanBase
+  implements IImageProviderExecute<IImageProviderNativeClientOptions, IImageProviderOptionsNative>
+{
   async upload(
     input: IImageUploadInput,
     clientOptions: IImageProviderNativeClientOptions,
@@ -49,6 +53,22 @@ export class ImageProviderNative extends BeanBase implements IImageProviderExecu
     };
   }
 
+  async createDirectUpload(
+    input: IImageDirectUploadInput,
+    clientOptions: IImageProviderNativeClientOptions,
+    _options: IImageProviderOptionsNative,
+  ) {
+    return await this.scope.service.imageNative.createDirectUpload(input, clientOptions);
+  }
+
+  async finalizeDirectUpload(
+    image: EntityImage,
+    clientOptions: IImageProviderNativeClientOptions,
+    _options: IImageProviderOptionsNative,
+  ) {
+    return await this.scope.service.imageNative.finalizeDirectUpload(image, clientOptions);
+  }
+
   async get(
     image: EntityImage,
     clientOptions: IImageProviderNativeClientOptions,

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

@@ -0,0 +1,57 @@
+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 { Passport } from 'vona-module-a-user';
+import { Arg, Controller, Web } from 'vona-module-a-web';
+
+export interface IControllerOptionsImage extends IDecoratorControllerOptions {}
+
+@Controller<IControllerOptionsImage>({ path: 'image-native' })
+export class ControllerImage extends BeanBase {
+  @Web.post('direct-upload/:resourceId')
+  @Passport.public()
+  @Core.fileUpload()
+  async directUpload(
+    @Arg.param('resourceId') resourceId: string,
+    @Arg.query('token') token: string,
+    @Arg.file('image') file: IUploadFile,
+  ) {
+    const payload = await this.bean.imageUploadPolicy.verifyDirectUploadToken(
+      token,
+      this.ctx.route.routePathRaw,
+    );
+    if (payload.resourceId !== resourceId) {
+      return this.app.throw(401);
+    }
+    const modelImage = this.app.bean._getBean<any>('a-image.model.image' as never);
+    const image = await modelImage.get({
+      providerName: 'image-native:native',
+      resourceId,
+    });
+    if (!image || image.status !== 'draft') {
+      return this.app.throw(403, `image is not draft: ${resourceId}`);
+    }
+    if (!image.imageScene) {
+      throw new Error(`image scene missing: ${resourceId}`);
+    }
+    const stat = await fse.stat(file.file);
+    const policy = await this.bean.imageUploadPolicy.resolveUploadPolicy({
+      imageScene: image.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,
+      },
+      policy,
+    );
+    await this.scope.service.imageNative.uploadDirectFile(image, file);
+    return { ok: true };
+  }
+}

package/vona/src/suite-vendor/a-image/modules/image-native/src/service/imageNative.ts

@@ -2,13 +2,15 @@ import type { SharpConstructor } from 'sharp';
 import type {
   EntityImage,
   IImageDeliveryOptions,
-  IImageNamedVariants,
+  IImageDirectUploadInput,
+  IImageProviderDirectUploadResource,
   IImageProviderResolvedVariant,
   IImageProviderResource,
   IImageTransformOptions,
   IImageUploadInput,
   IImageVariantRequest,
 } from 'vona-module-a-image';
+import type { IUploadFile } from 'vona-module-a-upload';
 
 import fse from 'fs-extra';
 import { createHash } from 'node:crypto';
@@ -24,6 +26,20 @@ type IImageNativeStoredImage = Pick<
   'resourceId' | 'filename' | 'storagePath' | 'variants'
 >;
 
+type IImageNativeDraftImage = Pick<
+  EntityImage,
+  | 'resourceId'
+  | 'filename'
+  | 'contentType'
+  | 'meta'
+  | 'imageScene'
+  | 'requireSignedURLs'
+  | 'storagePath'
+  | 'deliveryBaseUrl'
+  | 'variants'
+  | 'clientName'
+>;
+
 @Service()
 export class ServiceImageNative extends BeanBase {
   private _sharpInstance: SharpConstructor;
@@ -39,39 +55,90 @@ export class ServiceImageNative extends BeanBase {
     input: IImageUploadInput,
     options: IImageProviderNativeClientOptions,
   ): Promise<IImageProviderResource> {
-    const publicPath = await this.app.util.getPublicPathPhysical(
-      path.join('image-native', options.subdir ?? 'default'),
-      true,
-    );
     const resourceId = uuidv4();
-    const ext = this._getOriginalExt(input.filename, input.file);
-    const targetName = `${resourceId}${ext}`;
-    const targetPath = path.join(publicPath, targetName);
+    const targetPath = await this._getFinalPath(resourceId, input.filename, options, input.file);
     await fse.copy(input.file, targetPath);
-    const sharp = await this.getSharp();
-    const metadata = await sharp(targetPath).metadata();
-    const stat = await fse.stat(targetPath);
-    const variants = options.variants ?? this.scope.config.imageNative.variants;
-    await this._generateNamedVariants(
-      { resourceId, filename: input.filename, storagePath: targetPath, variants },
-      options,
+    return await this._buildStoredResource(targetPath, {
+      resourceId,
+      filename: input.filename,
+      contentType: input.contentType,
+      meta: input.meta,
+      requireSignedURLs: input.requireSignedURLs ?? options.requireSignedURLs,
+      variants: options.variants ?? this.scope.config.imageNative.variants,
+      deliveryBaseUrl: options.deliveryBaseUrl,
+    });
+  }
+
+  async createDirectUpload(
+    input: IImageDirectUploadInput,
+    options: IImageProviderNativeClientOptions,
+  ): Promise<IImageProviderDirectUploadResource> {
+    const resourceId = this._sanitizeResourceId(input.customId) ?? uuidv4();
+    const storagePath = await this._getFinalPath(resourceId, input.filename, options);
+    const routePath = this.scope.util.combineApiPath(
+      `image-native/direct-upload/${encodeURIComponent(resourceId)}`,
+      false,
+      true,
     );
+    const tokenPath = this.scope.util.combineApiPath(
+      'image-native/direct-upload/:resourceId',
+      false,
+      true,
+    );
+    const tokenPayload = await this.bean.imageUploadPolicy.createDirectUploadToken({
+      resourceId,
+      path: tokenPath,
+    });
+    const uploadUrl = new URL(this.app.util.getAbsoluteUrlByApiPath(routePath));
+    uploadUrl.searchParams.set('token', tokenPayload.token);
     return {
       resourceId,
-      size: Number(stat.size),
-      width: metadata.width,
-      height: metadata.height,
-      storagePath: targetPath,
-      deliveryBaseUrl: options.deliveryBaseUrl,
+      filename: input.filename,
+      contentType: input.contentType,
+      meta: input.meta,
       requireSignedURLs: input.requireSignedURLs ?? options.requireSignedURLs,
-      variants,
+      variants: options.variants ?? this.scope.config.imageNative.variants,
+      deliveryBaseUrl: options.deliveryBaseUrl,
+      storagePath,
+      uploadUrl: uploadUrl.toString(),
+      draft: true,
     };
   }
 
+  async uploadDirectFile(image: IImageNativeDraftImage, file: IUploadFile) {
+    const draftPath = this._getDraftPath(image.storagePath, image.resourceId);
+    await fse.ensureDir(path.dirname(draftPath));
+    await fse.move(file.file, draftPath, { overwrite: true });
+    return draftPath;
+  }
+
+  async finalizeDirectUpload(
+    image: IImageNativeDraftImage,
+    options: IImageProviderNativeClientOptions,
+  ): Promise<IImageProviderResource | undefined> {
+    const storagePath =
+      image.storagePath ?? (await this._getFinalPath(image.resourceId, image.filename, options));
+    const draftPath = this._getDraftPath(storagePath, image.resourceId);
+    if (!(await fse.pathExists(draftPath))) return undefined;
+    await fse.ensureDir(path.dirname(storagePath));
+    await fse.move(draftPath, storagePath, { overwrite: true });
+    return await this._buildStoredResource(storagePath, {
+      resourceId: image.resourceId,
+      filename: image.filename,
+      contentType: image.contentType,
+      meta: image.meta,
+      requireSignedURLs: image.requireSignedURLs ?? options.requireSignedURLs,
+      variants: image.variants ?? options.variants ?? this.scope.config.imageNative.variants,
+      deliveryBaseUrl: image.deliveryBaseUrl ?? options.deliveryBaseUrl,
+    });
+  }
+
   async remove(image: IImageNativeStoredImage) {
     if (!image.storagePath) return;
     const dir = path.dirname(image.storagePath);
     if (!(await fse.pathExists(dir))) return;
+    const draftPath = this._getDraftPath(image.storagePath, image.resourceId);
+    await fse.remove(draftPath);
     const entries = await fse.readdir(dir);
     await Promise.all(
       entries
@@ -100,22 +167,57 @@ export class ServiceImageNative extends BeanBase {
     return await this._buildUrl(targetPath, options.deliveryBaseUrl);
   }
 
-  private async _generateNamedVariants(
-    image: IImageNativeStoredImage,
+  private async _buildStoredResource(
+    targetPath: string,
+    data: {
+      resourceId: string;
+      filename?: string;
+      contentType?: string;
+      meta?: Record<string, unknown>;
+      requireSignedURLs?: boolean;
+      variants?: EntityImage['variants'];
+      deliveryBaseUrl?: string;
+    },
+  ): Promise<IImageProviderResource> {
+    const sharp = await this.getSharp();
+    const metadata = await sharp(targetPath).metadata();
+    const stat = await fse.stat(targetPath);
+    return {
+      resourceId: data.resourceId,
+      filename: data.filename,
+      contentType: data.contentType,
+      size: Number(stat.size),
+      width: metadata.width,
+      height: metadata.height,
+      requireSignedURLs: data.requireSignedURLs,
+      variants: data.variants,
+      meta: data.meta,
+      storagePath: targetPath,
+      deliveryBaseUrl: data.deliveryBaseUrl,
+    };
+  }
+
+  private async _getFinalPath(
+    resourceId: string,
+    filename: string | undefined,
     options: IImageProviderNativeClientOptions,
+    filePath?: string,
   ) {
-    const variantNames = Object.keys(image.variants ?? {}) as Array<
-      keyof NonNullable<IImageNamedVariants>
-    >;
-    for (const variantName of variantNames) {
-      if (variantName === 'original') continue;
-      await this._ensureVariantFile(
-        image,
-        resolveImageVariantRequestToTransform({ variantName }, 'original', image.variants),
-      );
+    const publicPath = await this.app.util.getPublicPathPhysical(
+      path.join('image-native', options.subdir ?? 'default'),
+      true,
+    );
+    const ext = this._getOriginalExt(filename, filePath ?? resourceId);
+    return path.join(publicPath, `${resourceId}${ext}`);
+  }
+
+  private _getDraftPath(storagePath: string | undefined, resourceId: string) {
+    if (!storagePath) {
+      throw new Error(`Image storage path missing: ${resourceId}`);
     }
-    if (!image.variants?.original) return;
-    await this.getVariantUrl(image, { variantName: 'original' }, options);
+    const dir = path.dirname(storagePath);
+    const ext = path.extname(storagePath) || '.bin';
+    return path.join(dir, `${resourceId}__draft${ext}`);
   }
 
   private async _ensureVariantFile(
@@ -266,6 +368,12 @@ export class ServiceImageNative extends BeanBase {
     return JSON.stringify(value);
   }
 
+  private _sanitizeResourceId(resourceId: string | undefined) {
+    if (!resourceId) return undefined;
+    const sanitized = resourceId.replace(/[^\w.-]/g, '-');
+    return sanitized || undefined;
+  }
+
   private _sanitizeVariantName(variantName: string) {
     return variantName.replace(/[^\w.-]/g, '-');
   }

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-image",
-  "version": "5.0.1",
+  "version": "5.0.4",
   "description": "",
   "author": "",
   "files": [],

package/vona/src/suite-vendor/a-vona/modules/a-orm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-orm",
-  "version": "5.1.20",
+  "version": "5.1.23",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "db",
   "keywords": [

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

@@ -11,7 +11,5 @@ export type TypeEntityMeta<T, N = string> = Required<{
 export const SymbolKeyFieldsMore = Symbol('$fieldsMore');
 export type TypeSymbolKeyFieldsMore = typeof SymbolKeyFieldsMore;
 
-export type TypeEntityStudentMetaSimple<T> = Omit<T, '$table' | '$comment' | '$default'>;
-export type TypeEntityStudentMetaSimpleColumns<T> = PickString<
-  keyof TypeEntityStudentMetaSimple<T>
->;
+export type TypeEntityMetaFields<T> = Omit<T, '$table' | '$comment' | '$default'>;
+export type TypeEntityMetaFieldKeys<T> = PickString<keyof TypeEntityMetaFields<T>>;

package/vona/src/suite-vendor/a-vona/modules/a-ormutils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-ormutils",
-  "version": "5.1.11",
+  "version": "5.1.14",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [

package/vona/src/suite-vendor/a-vona/modules/a-ormutils/src/lib/columns.ts

@@ -4,7 +4,7 @@ import type {
   IDecoratorEntityOptions,
   ITableRecord,
   TypeEntityMeta,
-  TypeEntityStudentMetaSimpleColumns,
+  TypeEntityMetaFieldKeys,
 } from 'vona-module-a-orm';
 
 import { isClass } from '@cabloy/utils';
@@ -15,6 +15,9 @@ import {
   getTargetDecoratorRules,
 } from 'vona-module-a-openapiutils';
 
+export type TypeEntityMetaCompositeFieldKeys<T> =
+  `${TypeEntityMetaFieldKeys<T>}+${TypeEntityMetaFieldKeys<T>}`;
+
 export function $column<T>(key: keyof T): keyof T {
   return key;
 }
@@ -53,8 +56,9 @@ export function $columnsAll<T, TableName extends boolean, Meta extends boolean>(
 export function $tableColumns<K extends keyof ITableRecord>(
   tableName: K,
   key?:
-    | TypeEntityStudentMetaSimpleColumns<ITableRecord[K]>
-    | TypeEntityStudentMetaSimpleColumns<ITableRecord[K]>[]
+    | TypeEntityMetaFieldKeys<ITableRecord[K]>
+    | TypeEntityMetaCompositeFieldKeys<ITableRecord[K]>
+    | TypeEntityMetaFieldKeys<ITableRecord[K]>[]
     | undefined,
 ) {
   return { [tableName]: key };

package/vona/src/suite-vendor/a-vona/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-vona",
-  "version": "5.1.61",
+  "version": "5.1.64",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",