cabloy 5.1.102 → 5.1.103

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

@@ -1,7 +1,7 @@
 import type {
   IDecoratorImageProviderOptions,
-  IImageDeliveryOptions,
   IImageDirectUploadInput,
+  IImageProviderDeliveryOptions,
   IImageDownloadResult,
   IImageProviderClientOptions,
   IImageProviderClientRecord,
@@ -37,6 +37,7 @@ export interface IImageProviderOptionsCloudflare extends IDecoratorImageProvider
 
 @ImageProvider<IImageProviderOptionsCloudflare>({
   base: {
+    public: true,
     signedDeliveryKind: 'provider',
     variants: {
       original: {},
@@ -92,7 +93,7 @@ export class ImageProviderCloudflare
       size: image.size,
       width: image.width,
       height: image.height,
-      requireSignedURLs: image.requireSignedURLs ?? clientOptions.requireSignedURLs,
+      public: image.public ?? clientOptions.public,
       variants: image.variants ?? clientOptions.variants,
       meta: image.meta,
       deliveryBaseUrl: image.deliveryBaseUrl ?? clientOptions.deliveryBaseUrl,
@@ -112,7 +113,7 @@ export class ImageProviderCloudflare
     request: IImageVariantRequest,
     clientOptions: IImageProviderCloudflareClientOptions,
     _options: IImageProviderOptionsCloudflare,
-    deliveryOptions?: IImageDeliveryOptions,
+    deliveryOptions?: IImageProviderDeliveryOptions,
   ) {
     const variants = image.variants ?? clientOptions.variants;
     const resolved = resolveImageVariantRequestToTransform(request, 'original', variants);
@@ -123,7 +124,7 @@ export class ImageProviderCloudflare
       {
         ...clientOptions,
         deliveryBaseUrl: image.deliveryBaseUrl ?? clientOptions.deliveryBaseUrl,
-        requireSignedURLs: image.requireSignedURLs ?? clientOptions.requireSignedURLs,
+        public: image.public ?? clientOptions.public,
       },
       deliveryOptions,
     );
@@ -134,18 +135,14 @@ export class ImageProviderCloudflare
     request: IImageVariantRequest,
     clientOptions: IImageProviderCloudflareClientOptions,
     options: IImageProviderOptionsCloudflare,
-    deliveryOptions?: IImageDeliveryOptions,
+    deliveryOptions?: IImageProviderDeliveryOptions,
   ): Promise<IImageDownloadResult> {
     return {
       kind: 'url',
       url: await this.getVariantUrl(image, request, clientOptions, options, deliveryOptions),
       filename: image.filename,
       contentType: image.contentType,
-      signed: !!(
-        deliveryOptions?.signed ??
-        image.requireSignedURLs ??
-        clientOptions.requireSignedURLs
-      ),
+      signed: !!deliveryOptions?.protected,
     };
   }
 
@@ -154,7 +151,7 @@ export class ImageProviderCloudflare
     variantName: TypeImageProviderResolvedVariantName,
     transformOptions: Record<string, any>,
     clientOptions: IImageProviderCloudflareClientOptions,
-    deliveryOptions?: IImageDeliveryOptions,
+    deliveryOptions?: IImageProviderDeliveryOptions,
   ) {
     return this.scope.service.imageCloudflare.buildVariantUrl(
       image,

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

@@ -1,12 +1,12 @@
 import type {
-  IImageDeliveryOptions,
+  IImageProviderDeliveryOptions,
   IImageTransformOptions,
   TypeImageVariantName,
 } from 'vona-module-a-image';
 
 import { createHmac } from 'node:crypto';
 
-export interface ICloudflareImageUrlOptions extends IImageDeliveryOptions {
+export interface ICloudflareImageUrlOptions extends IImageProviderDeliveryOptions {
   accountHash?: string;
   deliveryBaseUrl?: string;
   signingKey?: string;
@@ -25,7 +25,7 @@ export function buildCloudflareImageUrl(
       ? buildCloudflareTransformPath(transformOptions)
       : normalizeCloudflareVariantName(variantName);
   const url = new URL(`${baseUrl}/${resourcePath}/${variantPath}`);
-  if (options.signed) {
+  if (options.protected) {
     signCloudflareImageUrl(url, options);
   }
   return url.toString();
@@ -94,19 +94,7 @@ export function signCloudflareImageUrl(url: URL, options: ICloudflareImageUrlOpt
   url.searchParams.set('sig', sig);
 }
 
-function resolveExpiryTimestamp(options: IImageDeliveryOptions) {
-  if (options.expiresAt !== undefined) {
-    const value =
-      options.expiresAt instanceof Date
-        ? options.expiresAt.getTime()
-        : typeof options.expiresAt === 'string'
-          ? new Date(options.expiresAt).getTime()
-          : Number(options.expiresAt);
-    if (!Number.isFinite(value)) {
-      throw new TypeError(`Invalid expiresAt for signed delivery: ${String(options.expiresAt)}`);
-    }
-    return Math.floor(value / 1000);
-  }
+function resolveExpiryTimestamp(options: IImageProviderDeliveryOptions) {
   const expiresIn = options.expiresIn ?? 60 * 10;
   return Math.floor(Date.now() / 1000) + expiresIn;
 }

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

@@ -1,7 +1,7 @@
 import type {
   EntityImage,
-  IImageDeliveryOptions,
   IImageDirectUploadInput,
+  IImageProviderDeliveryOptions,
   IImageProviderDirectUploadResource,
   IImageProviderResource,
   IImageUploadInput,
@@ -32,6 +32,7 @@ interface ICloudflareImageResult {
   id: string;
   filename?: string;
   uploaded?: string;
+  // Cloudflare upstream field; app-level contract should use `public`.
   requireSignedURLs?: boolean;
   variants?: string[];
   metadata?: Record<string, unknown>;
@@ -63,7 +64,7 @@ export class ServiceImageCloudflare extends BeanBase {
     const filename = input.filename ?? path.basename(input.file);
     form.append('file', new Blob([buffer], { type: input.contentType }), filename);
     this._appendUploadFields(form, {
-      requireSignedURLs: input.requireSignedURLs,
+      requireSignedURLs: input.public === undefined ? undefined : !input.public,
       metadata: input.meta,
     });
     const result = await this._request<ICloudflareImageResult>(normalized, '/images/v1', {
@@ -76,7 +77,7 @@ export class ServiceImageCloudflare extends BeanBase {
       contentType: input.contentType,
       size: input.size ?? Number(stat.size),
       meta: input.meta,
-      requireSignedURLs: input.requireSignedURLs,
+      public: input.public,
     });
   }
 
@@ -88,7 +89,7 @@ export class ServiceImageCloudflare extends BeanBase {
     const form = new FormData();
     form.append('url', input.url);
     this._appendUploadFields(form, {
-      requireSignedURLs: input.requireSignedURLs,
+      requireSignedURLs: input.public === undefined ? undefined : !input.public,
       metadata: input.meta,
     });
     const result = await this._request<ICloudflareImageResult>(normalized, '/images/v1', {
@@ -99,7 +100,7 @@ export class ServiceImageCloudflare extends BeanBase {
       filename: input.filename ?? result.filename,
       contentType: input.contentType,
       meta: input.meta,
-      requireSignedURLs: input.requireSignedURLs,
+      public: input.public,
     });
   }
 
@@ -110,7 +111,7 @@ export class ServiceImageCloudflare extends BeanBase {
     const normalized = this._normalizeClientOptions(options);
     const form = new FormData();
     this._appendUploadFields(form, {
-      requireSignedURLs: input.requireSignedURLs,
+      requireSignedURLs: input.public === undefined ? undefined : !input.public,
       metadata: input.meta,
       expiry: input.expiry,
       id: input.customId,
@@ -127,7 +128,7 @@ export class ServiceImageCloudflare extends BeanBase {
       filename: input.filename,
       contentType: input.contentType,
       meta: input.meta,
-      requireSignedURLs: input.requireSignedURLs,
+      public: input.public,
     });
     return {
       ...resource,
@@ -137,7 +138,7 @@ export class ServiceImageCloudflare extends BeanBase {
   }
 
   async finalizeDirectUpload(
-    image: Pick<EntityImage, 'resourceId' | 'filename' | 'meta' | 'requireSignedURLs'>,
+    image: Pick<EntityImage, 'resourceId' | 'filename' | 'meta' | 'public'>,
     options: IImageProviderCloudflareClientOptions,
   ): Promise<IImageProviderResource | undefined> {
     const normalized = this._normalizeClientOptions(options);
@@ -152,7 +153,7 @@ export class ServiceImageCloudflare extends BeanBase {
     return this._mapImageResource(result, normalized, {
       filename: result.filename ?? result.meta?.filename ?? image.filename,
       meta: image.meta,
-      requireSignedURLs: image.requireSignedURLs,
+      public: image.public,
     });
   }
 
@@ -173,19 +174,18 @@ export class ServiceImageCloudflare extends BeanBase {
   }
 
   buildVariantUrl(
-    image: Pick<EntityImage, 'resourceId' | 'deliveryBaseUrl' | 'requireSignedURLs'>,
+    image: Pick<EntityImage, 'resourceId' | 'deliveryBaseUrl' | 'public'>,
     variantName: string | 'custom',
     transformOptions: Record<string, any>,
     options: IImageProviderCloudflareClientOptions,
-    deliveryOptions?: IImageDeliveryOptions,
+    deliveryOptions?: IImageProviderDeliveryOptions,
   ) {
     const normalized = this._normalizeClientOptions(options);
     return buildCloudflareImageUrl(image.resourceId, variantName as any, transformOptions, {
       accountHash: normalized.accountHash,
       deliveryBaseUrl: image.deliveryBaseUrl ?? normalized.deliveryBaseUrl,
       signingKey: normalized.signingKey,
-      signed: deliveryOptions?.signed ?? image.requireSignedURLs ?? normalized.requireSignedURLs,
-      expiresAt: deliveryOptions?.expiresAt,
+      protected: deliveryOptions?.protected ?? !(image.public ?? normalized.public ?? true),
       expiresIn: deliveryOptions?.expiresIn,
     });
   }
@@ -277,7 +277,7 @@ export class ServiceImageCloudflare extends BeanBase {
       contentType?: string;
       size?: number;
       meta?: Record<string, unknown>;
-      requireSignedURLs?: boolean;
+      public?: boolean;
     },
   ): IImageProviderResource {
     const deliveryBaseUrl =
@@ -288,8 +288,9 @@ export class ServiceImageCloudflare extends BeanBase {
       filename: data.filename ?? result.filename,
       contentType: data.contentType,
       size: data.size,
-      requireSignedURLs:
-        data.requireSignedURLs ?? result.requireSignedURLs ?? options.requireSignedURLs,
+      public:
+        data.public ??
+        (result.requireSignedURLs !== undefined ? !result.requireSignedURLs : options.public),
       variants: options.variants,
       meta: data.meta,
       deliveryBaseUrl,

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-image-native",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "description": "",
   "keywords": [
     "Vona Module"
@@ -46,11 +46,7 @@
   "title": "image-native",
   "vonaModule": {
     "dependencies": {
-      "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"
+      "a-image": "5.0.0"
     },
     "globalDependencies": {
       "sharp": true

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

@@ -1,5 +1,4 @@
 // eslint-disable
-import type { TypeControllerOptionsActions } from 'vona-module-a-openapi';
 /** service: begin */
 export * from '../service/imageNative.ts';
 
@@ -73,42 +72,6 @@ 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,8 +1,7 @@
 import type {
   IDecoratorImageProviderOptions,
-  IImageDeliveryOptions,
-  IImageDirectUploadInput,
   IImageDownloadResult,
+  IImageProviderDeliveryOptions,
   IImageProviderClientOptions,
   IImageProviderClientRecord,
   IImageProviderExecute,
@@ -12,7 +11,6 @@ import type {
 } from 'vona-module-a-image';
 import type { EntityImage } from 'vona-module-a-image';
 
-import fse from 'fs-extra';
 import { BeanBase } from 'vona';
 import { ImageProvider } from 'vona-module-a-image';
 
@@ -20,8 +18,6 @@ export interface IImageProviderNativeClientRecord extends IImageProviderClientRe
 
 export interface IImageProviderNativeClientOptions extends IImageProviderClientOptions {
   subdir?: string;
-  signingKey?: string;
-  tokenName?: string;
 }
 
 export interface IImageProviderOptionsNative extends IDecoratorImageProviderOptions<
@@ -32,6 +28,7 @@ export interface IImageProviderOptionsNative extends IDecoratorImageProviderOpti
 @ImageProvider<IImageProviderOptionsNative>({
   base: {
     subdir: 'default',
+    public: false,
     signedDeliveryKind: 'proxy',
   },
 })
@@ -53,22 +50,6 @@ export class ImageProviderNative
     };
   }
 
-  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,
@@ -81,7 +62,7 @@ export class ImageProviderNative
       size: image.size,
       width: image.width,
       height: image.height,
-      requireSignedURLs: image.requireSignedURLs,
+      public: image.public ?? clientOptions.public,
       variants: image.variants,
       meta: image.meta,
       storagePath: image.storagePath,
@@ -102,7 +83,7 @@ export class ImageProviderNative
     request: IImageVariantRequest,
     clientOptions: IImageProviderNativeClientOptions,
     _options: IImageProviderOptionsNative,
-    deliveryOptions?: IImageDeliveryOptions,
+    deliveryOptions?: IImageProviderDeliveryOptions,
   ) {
     return await this.scope.service.imageNative.getVariantUrl(
       image,
@@ -111,6 +92,7 @@ export class ImageProviderNative
         ...clientOptions,
         subdir: clientOptions.subdir ?? 'default',
         deliveryBaseUrl: image.deliveryBaseUrl ?? clientOptions.deliveryBaseUrl,
+        public: image.public ?? clientOptions.public,
       },
       deliveryOptions,
     );
@@ -121,21 +103,16 @@ export class ImageProviderNative
     request: IImageVariantRequest,
     clientOptions: IImageProviderNativeClientOptions,
     options: IImageProviderOptionsNative,
-    deliveryOptions?: IImageDeliveryOptions,
+    deliveryOptions?: IImageProviderDeliveryOptions,
   ): Promise<IImageDownloadResult> {
-    if (
-      (deliveryOptions?.responseMode ?? 'auto') !== 'url' &&
-      !deliveryOptions?.signed &&
-      request.variantName === 'original' &&
-      !request.transformOptions
-    ) {
-      const buffer = image.storagePath ? await fse.readFile(image.storagePath) : undefined;
-      if (buffer) {
+    if ((deliveryOptions?.responseMode ?? 'auto') !== 'url') {
+      const result = await this.scope.service.imageNative.downloadBuffer(image, request);
+      if (result) {
         return {
           kind: 'buffer',
-          buffer,
-          filename: image.filename,
-          contentType: image.contentType,
+          buffer: result.buffer,
+          filename: result.filename,
+          contentType: result.contentType,
           signed: false,
         };
       }
@@ -145,7 +122,7 @@ export class ImageProviderNative
       url: await this.getVariantUrl(image, request, clientOptions, options, deliveryOptions),
       filename: image.filename,
       contentType: image.contentType,
-      signed: !!deliveryOptions?.signed,
+      signed: !!deliveryOptions?.protected,
     };
   }
 }