vona-module-image-native 5.0.5 → 5.0.6

package/dist/.metadata/index.d.ts

@@ -1,4 +1,3 @@
-import type { TypeControllerOptionsActions } from 'vona-module-a-openapi';
 /** service: begin */
 export * from '../service/imageNative.ts';
 import 'vona-module-a-bean';
@@ -55,38 +54,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' {
-    interface IControllerRecord {
-        'image-native:image': IControllerOptionsImage;
-    }
-}
-declare module 'vona-module-image-native' {
-    interface ControllerImage {
-    }
-    interface ControllerImage {
-        get $beanFullName(): 'image-native.controller.image';
-        get $onionName(): 'image-native:image';
-        get $onionOptions(): IControllerOptionsImage;
-    }
-}
-/** controller: end */
-/** controller: begin */
-import '../controller/image.ts';
-declare module 'vona-module-image-native' {
-    interface IControllerOptionsImage {
-        actions?: TypeControllerOptionsActions<ControllerImage>;
-    }
-}
-declare module 'vona-module-a-web' {
-    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/dist/.metadata/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/.metadata/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAC1E,qBAAqB;AACrB,cAAc,2BAA2B,CAAC;AAE1C,OAAO,oBAAoB,CAAC;AAC5B,OAAO,QAAQ,oBAAoB,CAAC;IAEhC,UAAiB,cAAc;QAC7B,0BAA0B,EAAE,KAAK,CAAC;KACnC;CAGJ;AACD,OAAO,QAAQ,0BAA0B,CAAC;IAElC,UAAiB,kBAAkB;KAGlC;IAEC,UAAiB,kBAAkB;QACjC,IAAI,aAAa,IAAI,kCAAkC,CAAC;QACxD,IAAI,UAAU,IAAI,0BAA0B,CAAC;KAE9C;CACV;AACD,mBAAmB;AACnB,qBAAqB;AACrB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE,kBAAkB,CAAC;CACnC;AACD,mBAAmB;AACnB,qBAAqB;AAErB,OAAO,MAAM,CAAC;AACd,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAiB,kBAAkB;QACjC,kCAAkC,EAAE,kBAAkB,CAAC;KACxD;CACF;AACD,mBAAmB;AACnB,2BAA2B;AAC3B,cAAc,iCAAiC,CAAC;AAChD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,qBAAqB,CAAC;AAC7B,OAAO,QAAQ,qBAAqB,CAAC;IAEjC,UAAiB,oBAAoB;QACnC,qBAAqB,EAAE,2BAA2B,CAAC;KACpD;CAGJ;AACD,OAAO,QAAQ,0BAA0B,CAAC;IAElC,UAAiB,mBAAmB;KAGnC;IAEC,UAAiB,mBAAmB;QAClC,IAAI,aAAa,IAAI,mCAAmC,CAAC;QACzD,IAAI,UAAU,IAAI,qBAAqB,CAAC;QACxC,IAAI,aAAa,IAAI,2BAA2B,CAAC;KAClD;CACV;AACD,yBAAyB;AACzB,2BAA2B;AAC3B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,mBAAmB,CAAC;CAC/B;AACD,yBAAyB;AACzB,wBAAwB;AACxB,cAAc,wBAAwB,CAAC;AACvC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,mBAAmB,CAAC;AAC3B,OAAO,QAAQ,mBAAmB,CAAC;IACjC,UAAiB,iBAAiB;QAChC,oBAAoB,EAAE,uBAAuB,CAAC;KAC/C;CACF;AACD,OAAO,QAAQ,0BAA0B,CAAC;IACxC,UAAiB,eAAe;KAG/B;IAED,UAAiB,eAAe;QAC9B,IAAI,aAAa,IAAI,+BAA+B,CAAC;QACrD,IAAI,UAAU,IAAI,oBAAoB,CAAC;QACvC,IAAI,aAAa,IAAI,uBAAuB,CAAC;KAC9C;CACF;AACD,sBAAsB;AACtB,wBAAwB;AAExB,OAAqC,wBAAwB,CAAC;AAC9D,OAAO,QAAQ,0BAA0B,CAAC;IACxC,UAAiB,uBAAuB;QACtC,OAAO,CAAC,EAAE,4BAA4B,CAAC,eAAe,CAAC,CAAC;KACzD;CACF;AACD,OAAO,QAAQ,mBAAmB,CAAC;IACjC,UAAiB,kBAAkB;QACjC,yCAAyC,EAAE,SAAS,CAAC;KACtD;CACF;AACD,sBAAsB;AACtB,oBAAoB;AACpB,cAAc,qBAAqB,CAAC;AACpC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,kBAAkB;AAClB,oBAAoB;AACpB,cAAc,cAAc,CAAC;AAC7B,kBAAkB;AAClB,mBAAmB;AACnB,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAGhF,qBACa,sBAAuB,SAAQ,aAAa;CAAG;AAE5D,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,gBAAgB,CAAC,OAAO,MAAM,CAAC,CAAC;IACxC,OAAO,EAAE,cAAc,CAAC;IACxB,aAAa,EAAE,oBAAoB,CAAC;CACnC;AAED,OAAO,MAAM,CAAC;AACd,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAiB,gBAAgB;QAC/B,cAAc,EAAE,sBAAsB,CAAC;KACxC;IAED,UAAiB,mBAAmB;QAClC,WAAW,EAAE,sBAAsB,CAAC;KACrC;IAED,UAAiB,gBAAgB;QAC/B,cAAc,EAAE,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC;KAC3C;CAKF;AACD,iBAAiB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/.metadata/index.ts"],"names":[],"mappings":"AACA,qBAAqB;AACrB,cAAc,2BAA2B,CAAC;AAE1C,OAAO,oBAAoB,CAAC;AAC5B,OAAO,QAAQ,oBAAoB,CAAC;IAEhC,UAAiB,cAAc;QAC7B,0BAA0B,EAAE,KAAK,CAAC;KACnC;CAGJ;AACD,OAAO,QAAQ,0BAA0B,CAAC;IAElC,UAAiB,kBAAkB;KAGlC;IAEC,UAAiB,kBAAkB;QACjC,IAAI,aAAa,IAAI,kCAAkC,CAAC;QACxD,IAAI,UAAU,IAAI,0BAA0B,CAAC;KAE9C;CACV;AACD,mBAAmB;AACnB,qBAAqB;AACrB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AACpE,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE,kBAAkB,CAAC;CACnC;AACD,mBAAmB;AACnB,qBAAqB;AAErB,OAAO,MAAM,CAAC;AACd,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAiB,kBAAkB;QACjC,kCAAkC,EAAE,kBAAkB,CAAC;KACxD;CACF;AACD,mBAAmB;AACnB,2BAA2B;AAC3B,cAAc,iCAAiC,CAAC;AAChD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AACnF,OAAO,qBAAqB,CAAC;AAC7B,OAAO,QAAQ,qBAAqB,CAAC;IAEjC,UAAiB,oBAAoB;QACnC,qBAAqB,EAAE,2BAA2B,CAAC;KACpD;CAGJ;AACD,OAAO,QAAQ,0BAA0B,CAAC;IAElC,UAAiB,mBAAmB;KAGnC;IAEC,UAAiB,mBAAmB;QAClC,IAAI,aAAa,IAAI,mCAAmC,CAAC;QACzD,IAAI,UAAU,IAAI,qBAAqB,CAAC;QACxC,IAAI,aAAa,IAAI,2BAA2B,CAAC;KAClD;CACV;AACD,yBAAyB;AACzB,2BAA2B;AAC3B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAC3E,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,mBAAmB,CAAC;CAC/B;AACD,yBAAyB;AACzB,oBAAoB;AACpB,cAAc,qBAAqB,CAAC;AACpC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,kBAAkB;AAClB,oBAAoB;AACpB,cAAc,cAAc,CAAC;AAC7B,kBAAkB;AAClB,mBAAmB;AACnB,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAGhF,qBACa,sBAAuB,SAAQ,aAAa;CAAG;AAE5D,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,gBAAgB,CAAC,OAAO,MAAM,CAAC,CAAC;IACxC,OAAO,EAAE,cAAc,CAAC;IACxB,aAAa,EAAE,oBAAoB,CAAC;CACnC;AAED,OAAO,MAAM,CAAC;AACd,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAiB,gBAAgB;QAC/B,cAAc,EAAE,sBAAsB,CAAC;KACxC;IAED,UAAiB,mBAAmB;QAClC,WAAW,EAAE,sBAAsB,CAAC;KACrC;IAED,UAAiB,gBAAgB;QAC/B,cAAc,EAAE,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC;KAC3C;CAKF;AACD,iBAAiB"}

package/dist/bean/imageProvider.native.d.ts

@@ -1,19 +1,15 @@
-import type { IDecoratorImageProviderOptions, IImageDeliveryOptions, IImageDirectUploadInput, IImageDownloadResult, IImageProviderClientOptions, IImageProviderClientRecord, IImageProviderExecute, IImageProviderResource, IImageUploadInput, IImageVariantRequest } from 'vona-module-a-image';
+import type { IDecoratorImageProviderOptions, IImageDownloadResult, IImageProviderDeliveryOptions, IImageProviderClientOptions, IImageProviderClientRecord, IImageProviderExecute, IImageProviderResource, IImageUploadInput, IImageVariantRequest } from 'vona-module-a-image';
 import type { EntityImage } from 'vona-module-a-image';
 import { BeanBase } from 'vona';
 export interface IImageProviderNativeClientRecord extends IImageProviderClientRecord {
 }
 export interface IImageProviderNativeClientOptions extends IImageProviderClientOptions {
     subdir?: string;
-    signingKey?: string;
-    tokenName?: string;
 }
 export interface IImageProviderOptionsNative extends IDecoratorImageProviderOptions<IImageProviderNativeClientRecord, IImageProviderNativeClientOptions> {
 }
 export declare class ImageProviderNative extends BeanBase implements IImageProviderExecute<IImageProviderNativeClientOptions, IImageProviderOptionsNative> {
     upload(input: IImageUploadInput, clientOptions: IImageProviderNativeClientOptions, _options: IImageProviderOptionsNative): Promise<IImageProviderResource>;
-    createDirectUpload(input: IImageDirectUploadInput, clientOptions: IImageProviderNativeClientOptions, _options: IImageProviderOptionsNative): Promise<import("vona-module-a-image").IImageProviderDirectUploadResource<import("vona-module-a-image").TypeImageMeta, unknown>>;
-    finalizeDirectUpload(image: EntityImage, clientOptions: IImageProviderNativeClientOptions, _options: IImageProviderOptionsNative): Promise<IImageProviderResource<import("vona-module-a-image").TypeImageMeta, unknown> | undefined>;
     get(image: EntityImage, clientOptions: IImageProviderNativeClientOptions, _options: IImageProviderOptionsNative): Promise<{
         resourceId: string;
         filename: string | undefined;
@@ -21,14 +17,14 @@ export declare class ImageProviderNative extends BeanBase implements IImageProvi
         size: number | undefined;
         width: number | undefined;
         height: number | undefined;
-        requireSignedURLs: boolean | undefined;
+        public: boolean | undefined;
         variants: Partial<Record<keyof import("vona-module-a-image").IImageVariantNameRecord, import("vona-module-a-image").IImageTransformOptions>> | undefined;
         meta: Record<string, any> | undefined;
         storagePath: string | undefined;
         deliveryBaseUrl: string | undefined;
     }>;
     delete(image: EntityImage, _clientOptions: IImageProviderClientOptions, _options: IImageProviderOptionsNative): Promise<void>;
-    getVariantUrl(image: EntityImage, request: IImageVariantRequest, clientOptions: IImageProviderNativeClientOptions, _options: IImageProviderOptionsNative, deliveryOptions?: IImageDeliveryOptions): Promise<string>;
-    download(image: EntityImage, request: IImageVariantRequest, clientOptions: IImageProviderNativeClientOptions, options: IImageProviderOptionsNative, deliveryOptions?: IImageDeliveryOptions): Promise<IImageDownloadResult>;
+    getVariantUrl(image: EntityImage, request: IImageVariantRequest, clientOptions: IImageProviderNativeClientOptions, _options: IImageProviderOptionsNative, deliveryOptions?: IImageProviderDeliveryOptions): Promise<string>;
+    download(image: EntityImage, request: IImageVariantRequest, clientOptions: IImageProviderNativeClientOptions, options: IImageProviderOptionsNative, deliveryOptions?: IImageProviderDeliveryOptions): Promise<IImageDownloadResult>;
 }
 //# sourceMappingURL=imageProvider.native.d.ts.map

package/dist/bean/imageProvider.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imageProvider.native.d.ts","sourceRoot":"","sources":["../../src/bean/imageProvider.native.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,8BAA8B,EAC9B,qBAAqB,EACrB,uBAAuB,EACvB,oBAAoB,EACpB,2BAA2B,EAC3B,0BAA0B,EAC1B,qBAAqB,EACrB,sBAAsB,EACtB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAGvD,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAGhC,MAAM,WAAW,gCAAiC,SAAQ,0BAA0B;CAAG;AAEvF,MAAM,WAAW,iCAAkC,SAAQ,2BAA2B;IACpF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,2BAA4B,SAAQ,8BAA8B,CACjF,gCAAgC,EAChC,iCAAiC,CAClC;CAAG;AAEJ,qBAMa,mBACX,SAAQ,QACR,YAAW,qBAAqB,CAAC,iCAAiC,EAAE,2BAA2B,CAAC;IAE1F,MAAM,CACV,KAAK,EAAE,iBAAiB,EACxB,aAAa,EAAE,iCAAiC,EAChD,QAAQ,EAAE,2BAA2B,GACpC,OAAO,CAAC,sBAAsB,CAAC;IAU5B,kBAAkB,CACtB,KAAK,EAAE,uBAAuB,EAC9B,aAAa,EAAE,iCAAiC,EAChD,QAAQ,EAAE,2BAA2B;IAKjC,oBAAoB,CACxB,KAAK,EAAE,WAAW,EAClB,aAAa,EAAE,iCAAiC,EAChD,QAAQ,EAAE,2BAA2B;IAKjC,GAAG,CACP,KAAK,EAAE,WAAW,EAClB,aAAa,EAAE,iCAAiC,EAChD,QAAQ,EAAE,2BAA2B;;;;;;;;;;;;;IAiBjC,MAAM,CACV,KAAK,EAAE,WAAW,EAClB,cAAc,EAAE,2BAA2B,EAC3C,QAAQ,EAAE,2BAA2B;IAKjC,aAAa,CACjB,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,oBAAoB,EAC7B,aAAa,EAAE,iCAAiC,EAChD,QAAQ,EAAE,2BAA2B,EACrC,eAAe,CAAC,EAAE,qBAAqB;IAcnC,QAAQ,CACZ,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,oBAAoB,EAC7B,aAAa,EAAE,iCAAiC,EAChD,OAAO,EAAE,2BAA2B,EACpC,eAAe,CAAC,EAAE,qBAAqB,GACtC,OAAO,CAAC,oBAAoB,CAAC;CA0BjC"}
+{"version":3,"file":"imageProvider.native.d.ts","sourceRoot":"","sources":["../../src/bean/imageProvider.native.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,8BAA8B,EAC9B,oBAAoB,EACpB,6BAA6B,EAC7B,2BAA2B,EAC3B,0BAA0B,EAC1B,qBAAqB,EACrB,sBAAsB,EACtB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAGhC,MAAM,WAAW,gCAAiC,SAAQ,0BAA0B;CAAG;AAEvF,MAAM,WAAW,iCAAkC,SAAQ,2BAA2B;IACpF,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,2BAA4B,SAAQ,8BAA8B,CACjF,gCAAgC,EAChC,iCAAiC,CAClC;CAAG;AAEJ,qBAOa,mBACX,SAAQ,QACR,YAAW,qBAAqB,CAAC,iCAAiC,EAAE,2BAA2B,CAAC;IAE1F,MAAM,CACV,KAAK,EAAE,iBAAiB,EACxB,aAAa,EAAE,iCAAiC,EAChD,QAAQ,EAAE,2BAA2B,GACpC,OAAO,CAAC,sBAAsB,CAAC;IAU5B,GAAG,CACP,KAAK,EAAE,WAAW,EAClB,aAAa,EAAE,iCAAiC,EAChD,QAAQ,EAAE,2BAA2B;;;;;;;;;;;;;IAiBjC,MAAM,CACV,KAAK,EAAE,WAAW,EAClB,cAAc,EAAE,2BAA2B,EAC3C,QAAQ,EAAE,2BAA2B;IAKjC,aAAa,CACjB,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,oBAAoB,EAC7B,aAAa,EAAE,iCAAiC,EAChD,QAAQ,EAAE,2BAA2B,EACrC,eAAe,CAAC,EAAE,6BAA6B;IAe3C,QAAQ,CACZ,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,oBAAoB,EAC7B,aAAa,EAAE,iCAAiC,EAChD,OAAO,EAAE,2BAA2B,EACpC,eAAe,CAAC,EAAE,6BAA6B,GAC9C,OAAO,CAAC,oBAAoB,CAAC;CAqBjC"}

package/dist/index.js

@@ -1,13 +1,10 @@
-import { BeanInfo, BeanBase, uuidv4, BeanSimple, cast, getPlatformArch, resolveAddon, BeanScopeBase } from 'vona';
-import { __decorate, __param, __metadata } from 'tslib';
+import { BeanInfo, BeanBase, uuidv4, getRuntimePathPhysicalRoot, BeanSimple, cast, getPlatformArch, resolveAddon, BeanScopeBase } from 'vona';
+import { __decorate } from 'tslib';
 import fse from 'fs-extra';
 import { createHash } from 'node:crypto';
 import path from 'node:path';
 import { Service, Scope } from 'vona-module-a-bean';
 import { resolveImageVariantRequestToTransform, ImageProvider } from 'vona-module-a-image';
-import { Core } from 'vona-module-a-core';
-import { Passport } from 'vona-module-a-user';
-import { Web, Arg, Controller } from 'vona-module-a-web';
 
 let ServiceImageNative = class ServiceImageNative extends BeanBase {
   constructor(...args) {
@@ -22,78 +19,31 @@ let ServiceImageNative = class ServiceImageNative extends BeanBase {
   }
   async upload(input, options) {
     const resourceId = uuidv4();
-    const targetPath = await this._getFinalPath(resourceId, input.filename, options, input.file);
+    const isPublic = input.public ?? options.public;
+    const targetPath = await this._getFinalPath(resourceId, input.filename, isPublic, options, input.file);
+    await fse.ensureDir(path.dirname(targetPath));
     await fse.copy(input.file, targetPath);
     return await this._buildStoredResource(targetPath, {
       resourceId,
       filename: input.filename,
       contentType: input.contentType,
       meta: input.meta,
-      requireSignedURLs: input.requireSignedURLs ?? options.requireSignedURLs,
+      public: isPublic,
       variants: options.variants ?? this.scope.config.imageNative.variants,
       deliveryBaseUrl: options.deliveryBaseUrl
     });
   }
-  async createDirectUpload(input, options) {
-    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,
-      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,
-      storagePath,
-      uploadUrl: uploadUrl.toString(),
-      draft: true
-    };
-  }
-  async uploadDirectFile(image, file) {
-    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, options) {
-    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) {
     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.filter(name => name === path.basename(image.storagePath) || name.startsWith(`${image.resourceId}__`)).map(name => fse.remove(path.join(dir, name))));
   }
   async getVariantUrl(image, request, options, _deliveryOptions) {
+    if (!(image.public ?? options.public)) {
+      throw new Error(`Private image-native variant URL requires signed delivery: ${image.resourceId}`);
+    }
     const resolved = resolveImageVariantRequestToTransform(request, 'original', image.variants);
     if (resolved.variantName === 'original' && this._isOriginalTransform(resolved.transformOptions)) {
       return await this._getOriginalUrl(image, options);
@@ -101,6 +51,19 @@ let ServiceImageNative = class ServiceImageNative extends BeanBase {
     const targetPath = await this._ensureVariantFile(image, resolved);
     return await this._buildUrl(targetPath, options.deliveryBaseUrl);
   }
+  async downloadBuffer(image, request) {
+    if (!image.storagePath) {
+      throw new Error(`Image storage path missing: ${image.resourceId}`);
+    }
+    const resolved = resolveImageVariantRequestToTransform(request, 'original', image.variants);
+    const targetPath = resolved.variantName === 'original' && this._isOriginalTransform(resolved.transformOptions) ? image.storagePath : await this._ensureVariantFile(image, resolved);
+    if (!(await fse.pathExists(targetPath))) return null;
+    return {
+      buffer: await fse.readFile(targetPath),
+      filename: image.filename,
+      contentType: this._resolveContentType(targetPath, image.contentType, resolved.transformOptions)
+    };
+  }
   async _buildStoredResource(targetPath, data) {
     const sharp = await this.getSharp();
     const metadata = await sharp(targetPath).metadata();
@@ -112,25 +75,26 @@ let ServiceImageNative = class ServiceImageNative extends BeanBase {
       size: Number(stat.size),
       width: metadata.width,
       height: metadata.height,
-      requireSignedURLs: data.requireSignedURLs,
+      public: data.public,
       variants: data.variants,
       meta: data.meta,
       storagePath: targetPath,
       deliveryBaseUrl: data.deliveryBaseUrl
     };
   }
-  async _getFinalPath(resourceId, filename, options, filePath) {
-    const publicPath = await this.app.util.getPublicPathPhysical(path.join('image-native', options.subdir ?? 'default'), true);
+  async _getFinalPath(resourceId, filename, isPublic, options, filePath) {
+    const basePath = await this._getBasePath(isPublic, options);
     const ext = this._getOriginalExt(filename, filePath ?? resourceId);
-    return path.join(publicPath, `${resourceId}${ext}`);
+    return path.join(basePath, `${resourceId}${ext}`);
   }
-  _getDraftPath(storagePath, resourceId) {
-    if (!storagePath) {
-      throw new Error(`Image storage path missing: ${resourceId}`);
+  async _getBasePath(isPublic, options) {
+    if (isPublic) {
+      return await this.app.util.getPublicPathPhysical(path.join('image-native', options.subdir ?? 'default'), true);
     }
-    const dir = path.dirname(storagePath);
-    const ext = path.extname(storagePath) || '.bin';
-    return path.join(dir, `${resourceId}__draft${ext}`);
+    const runtimeRoot = getRuntimePathPhysicalRoot(this.app);
+    const basePath = path.join(runtimeRoot, this.ctx.instance.id.toString(), 'image-native', options.subdir ?? 'default');
+    await fse.ensureDir(basePath);
+    return basePath;
   }
   async _ensureVariantFile(image, resolved) {
     if (!image.storagePath) {
@@ -208,8 +172,11 @@ let ServiceImageNative = class ServiceImageNative extends BeanBase {
   }
   async _getVariantStaticPath(targetPath) {
     const publicRoot = await this.app.util.getPublicPathPhysical(undefined, true);
-    const relativePath = path.relative(publicRoot, targetPath).split(path.sep).join(path.posix.sep);
-    return path.posix.join('public', this.ctx.instance.id.toString(), relativePath);
+    const relativePath = path.relative(publicRoot, targetPath);
+    if (relativePath.startsWith('..') || path.isAbsolute(relativePath)) {
+      throw new Error(`Image target path is not publicly accessible: ${targetPath}`);
+    }
+    return path.posix.join('public', this.ctx.instance.id.toString(), relativePath.split(path.sep).join(path.posix.sep));
   }
   async _getVariantAbsolutePath(image, resolved) {
     if (!image.storagePath) throw new Error(`Image storage path missing: ${image.resourceId}`);
@@ -219,8 +186,8 @@ let ServiceImageNative = class ServiceImageNative extends BeanBase {
       const variantName = this._sanitizeVariantName(resolved.variantName);
       return path.join(dir, `${image.resourceId}__${variantName}${ext}`);
     }
-    const cacheKey = this._buildTransformCacheKey(resolved.transformOptions);
-    return path.join(dir, `${image.resourceId}__t_${cacheKey}${ext}`);
+    const transformKey = this._buildTransformKey(resolved.transformOptions);
+    return path.join(dir, `${image.resourceId}__t_${transformKey}${ext}`);
   }
   _getVariantExt(filename, storagePath, transformOptions) {
     const format = this._normalizeFormat(transformOptions.format);
@@ -236,7 +203,20 @@ let ServiceImageNative = class ServiceImageNative extends BeanBase {
     if (!format || format === 'auto') return undefined;
     return format === 'jpeg' ? 'jpeg' : format;
   }
-  _buildTransformCacheKey(transformOptions) {
+  _resolveContentType(targetPath, contentType, transformOptions) {
+    const format = this._normalizeFormat(transformOptions.format);
+    if (format === 'jpeg') return 'image/jpeg';
+    if (format === 'png') return 'image/png';
+    if (format === 'webp') return 'image/webp';
+    if (format === 'avif') return 'image/avif';
+    const ext = path.extname(targetPath).toLowerCase();
+    if (ext === '.jpg' || ext === '.jpeg') return 'image/jpeg';
+    if (ext === '.png') return 'image/png';
+    if (ext === '.webp') return 'image/webp';
+    if (ext === '.avif') return 'image/avif';
+    return contentType;
+  }
+  _buildTransformKey(transformOptions) {
     const stable = this._stableStringify(transformOptions);
     return createHash('sha1').update(stable).digest('hex').slice(0, 12);
   }
@@ -250,11 +230,6 @@ let ServiceImageNative = class ServiceImageNative extends BeanBase {
     }
     return JSON.stringify(value);
   }
-  _sanitizeResourceId(resourceId) {
-    if (!resourceId) return undefined;
-    const sanitized = resourceId.replace(/[^\w.-]/g, '-');
-    return sanitized || undefined;
-  }
   _sanitizeVariantName(variantName) {
     return variantName.replace(/[^\w.-]/g, '-');
   }
@@ -289,12 +264,6 @@ let ImageProviderNative = class ImageProviderNative extends BeanBase {
       meta: input.meta
     };
   }
-  async createDirectUpload(input, clientOptions, _options) {
-    return await this.scope.service.imageNative.createDirectUpload(input, clientOptions);
-  }
-  async finalizeDirectUpload(image, clientOptions, _options) {
-    return await this.scope.service.imageNative.finalizeDirectUpload(image, clientOptions);
-  }
   async get(image, clientOptions, _options) {
     return {
       resourceId: image.resourceId,
@@ -303,7 +272,7 @@ let ImageProviderNative = class ImageProviderNative extends BeanBase {
       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,
@@ -317,18 +286,19 @@ let ImageProviderNative = class ImageProviderNative extends BeanBase {
     return await this.scope.service.imageNative.getVariantUrl(image, request, {
       ...clientOptions,
       subdir: clientOptions.subdir ?? 'default',
-      deliveryBaseUrl: image.deliveryBaseUrl ?? clientOptions.deliveryBaseUrl
+      deliveryBaseUrl: image.deliveryBaseUrl ?? clientOptions.deliveryBaseUrl,
+      public: image.public ?? clientOptions.public
     }, deliveryOptions);
   }
   async download(image, request, clientOptions, options, deliveryOptions) {
-    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
         };
       }
@@ -338,60 +308,20 @@ let ImageProviderNative = class ImageProviderNative extends BeanBase {
       url: await this.getVariantUrl(image, request, clientOptions, options, deliveryOptions),
       filename: image.filename,
       contentType: image.contentType,
-      signed: !!deliveryOptions?.signed
+      signed: !!deliveryOptions?.protected
     };
   }
 };
 ImageProviderNative = __decorate([ImageProvider({
   base: {
     subdir: 'default',
+    public: false,
     signedDeliveryKind: 'proxy'
   }
 }), BeanInfo({
   module: "image-native"
 })], ImageProviderNative);
 
-let ControllerImage = class ControllerImage extends BeanBase {
-  async directUpload(resourceId, token, file) {
-    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('a-image.model.image');
-    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
-    };
-  }
-};
-__decorate([Web.post('direct-upload/:resourceId'), Passport.public(), Core.fileUpload(), __param(0, Arg.param('resourceId')), __param(1, Arg.query('token')), __param(2, Arg.file('image')), __metadata("design:type", Function), __metadata("design:paramtypes", [String, String, Object]), __metadata("design:returntype", Promise)], ControllerImage.prototype, "directUpload", null);
-ControllerImage = __decorate([Controller({
-  path: 'image-native'
-}), BeanInfo({
-  module: "image-native"
-})], ControllerImage);
-
 function config(_app) {
   return {
     imageNative: {
@@ -431,5 +361,5 @@ ScopeModuleImageNative = __decorate([Scope(), BeanInfo({
 })], ScopeModuleImageNative);
 /** scope: end */
 
-export { ControllerImage, ImageProviderNative, Monkey, ScopeModuleImageNative, ServiceImageNative, config };
+export { ImageProviderNative, Monkey, ScopeModuleImageNative, ServiceImageNative, config };
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../src/service/imageNative.ts","../src/bean/imageProvider.native.ts","../src/controller/image.ts","../src/config/config.ts","../src/monkey.ts","../src/.metadata/index.ts"],"sourcesContent":[null,null,null,null,null,null],"names":["ServiceImageNative","BeanBase","constructor","args","_sharpInstance","getSharp","default","upload","input","options","resourceId","uuidv4","targetPath","_getFinalPath","filename","file","fse","copy","_buildStoredResource","contentType","meta","requireSignedURLs","variants","scope","config","imageNative","deliveryBaseUrl","createDirectUpload","_sanitizeResourceId","customId","storagePath","routePath","util","combineApiPath","encodeURIComponent","tokenPath","tokenPayload","bean","imageUploadPolicy","createDirectUploadToken","path","uploadUrl","URL","app","getAbsoluteUrlByApiPath","searchParams","set","token","toString","draft","uploadDirectFile","image","draftPath","_getDraftPath","ensureDir","dirname","move","overwrite","finalizeDirectUpload","pathExists","undefined","remove","dir","entries","readdir","Promise","all","filter","name","basename","startsWith","map","join","getVariantUrl","request","_deliveryOptions","resolved","resolveImageVariantRequestToTransform","variantName","_isOriginalTransform","transformOptions","_getOriginalUrl","_ensureVariantFile","_buildUrl","data","sharp","metadata","stat","size","Number","width","height","filePath","publicPath","getPublicPathPhysical","subdir","ext","_getOriginalExt","Error","extname","_getVariantAbsolutePath","_writeTransformedFile","sourcePath","pipeline","failOn","dpr","Math","round","fit","gravity","background","resize","_mapFit","position","_mapGravity","rotate","sharpen","sigma","format","_normalizeFormat","jpeg","quality","png","webp","avif","toFile","variantPath","_getVariantStaticPath","replace","combineStaticPath","publicRoot","relativePath","relative","split","sep","posix","ctx","instance","id","_getVariantExt","_sanitizeVariantName","cacheKey","_buildTransformCacheKey","stable","_stableStringify","createHash","update","digest","slice","value","Array","isArray","item","Object","sort","a","b","localeCompare","key","JSON","stringify","sanitized","keys","length","__decorate","Service","__z_BeanInfo","module","ImageProviderNative","clientOptions","_options","resource","service","get","delete","_clientOptions","deliveryOptions","download","responseMode","signed","buffer","readFile","kind","url","ImageProvider","base","signedDeliveryKind","ControllerImage","directUpload","payload","verifyDirectUploadToken","route","routePathRaw","throw","modelImage","_getBean","providerName","status","imageScene","policy","resolveUploadPolicy","mimeType","info","validateUploadFile","ok","Web","post","Passport","public","Core","fileUpload","__param","Arg","param","query","prototype","Controller","_app","original","__Version","__MapTargetNames","Monkey","BeanSimple","appStart","cast","__prepareSharpLibvips","platformArch","getPlatformArch","addonFileSrc","resolveAddon","addonDirDest","import","addonFileDest","existsSync","ensureDirSync","copyFileSync","ScopeModuleImageNative","BeanScopeBase","Scope"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../src/service/imageNative.ts","../src/bean/imageProvider.native.ts","../src/config/config.ts","../src/monkey.ts","../src/.metadata/index.ts"],"sourcesContent":[null,null,null,null,null],"names":["ServiceImageNative","BeanBase","constructor","args","_sharpInstance","getSharp","default","upload","input","options","resourceId","uuidv4","isPublic","public","targetPath","_getFinalPath","filename","file","fse","ensureDir","path","dirname","copy","_buildStoredResource","contentType","meta","variants","scope","config","imageNative","deliveryBaseUrl","remove","image","storagePath","dir","pathExists","entries","readdir","Promise","all","filter","name","basename","startsWith","map","join","getVariantUrl","request","_deliveryOptions","Error","resolved","resolveImageVariantRequestToTransform","variantName","_isOriginalTransform","transformOptions","_getOriginalUrl","_ensureVariantFile","_buildUrl","downloadBuffer","buffer","readFile","_resolveContentType","data","sharp","metadata","stat","size","Number","width","height","filePath","basePath","_getBasePath","ext","_getOriginalExt","app","util","getPublicPathPhysical","subdir","runtimeRoot","getRuntimePathPhysicalRoot","ctx","instance","id","toString","_getVariantAbsolutePath","_writeTransformedFile","sourcePath","overwrite","pipeline","failOn","dpr","Math","round","fit","gravity","background","resize","_mapFit","position","_mapGravity","rotate","undefined","sharpen","sigma","format","_normalizeFormat","jpeg","quality","png","webp","avif","toFile","variantPath","_getVariantStaticPath","replace","combineStaticPath","publicRoot","relativePath","relative","isAbsolute","posix","split","sep","_getVariantExt","_sanitizeVariantName","transformKey","_buildTransformKey","extname","toLowerCase","stable","_stableStringify","createHash","update","digest","slice","value","Array","isArray","item","Object","sort","a","b","localeCompare","key","JSON","stringify","keys","length","__decorate","Service","__z_BeanInfo","module","ImageProviderNative","clientOptions","_options","resource","service","get","delete","_clientOptions","deliveryOptions","download","responseMode","result","kind","signed","url","protected","ImageProvider","base","signedDeliveryKind","_app","original","__Version","__MapTargetNames","Monkey","BeanSimple","appStart","cast","__prepareSharpLibvips","platformArch","getPlatformArch","addonFileSrc","resolveAddon","addonDirDest","import","addonFileDest","existsSync","ensureDirSync","copyFileSync","ScopeModuleImageNative","BeanScopeBase","Scope"],"mappings":"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"}

package/dist/service/imageNative.d.ts

@@ -1,21 +1,21 @@
-import type { EntityImage, IImageDeliveryOptions, IImageDirectUploadInput, IImageProviderDirectUploadResource, IImageProviderResource, IImageUploadInput, IImageVariantRequest } from 'vona-module-a-image';
-import type { IUploadFile } from 'vona-module-a-upload';
+import type { EntityImage, IImageProviderDeliveryOptions, IImageProviderResource, IImageUploadInput, IImageVariantRequest } from 'vona-module-a-image';
 import { BeanBase } from 'vona';
 import type { IImageProviderNativeClientOptions } from '../bean/imageProvider.native.ts';
-type IImageNativeStoredImage = Pick<EntityImage, 'resourceId' | 'filename' | 'storagePath' | 'variants'>;
-type IImageNativeDraftImage = Pick<EntityImage, 'resourceId' | 'filename' | 'contentType' | 'meta' | 'imageScene' | 'requireSignedURLs' | 'storagePath' | 'deliveryBaseUrl' | 'variants' | 'clientName'>;
+type IImageNativeStoredImage = Pick<EntityImage, 'id' | 'resourceId' | 'filename' | 'contentType' | 'public' | 'storagePath' | 'variants'>;
 export declare class ServiceImageNative extends BeanBase {
     private _sharpInstance;
     private getSharp;
     upload(input: IImageUploadInput, options: IImageProviderNativeClientOptions): Promise<IImageProviderResource>;
-    createDirectUpload(input: IImageDirectUploadInput, options: IImageProviderNativeClientOptions): Promise<IImageProviderDirectUploadResource>;
-    uploadDirectFile(image: IImageNativeDraftImage, file: IUploadFile): Promise<string>;
-    finalizeDirectUpload(image: IImageNativeDraftImage, options: IImageProviderNativeClientOptions): Promise<IImageProviderResource | undefined>;
     remove(image: IImageNativeStoredImage): Promise<void>;
-    getVariantUrl(image: IImageNativeStoredImage, request: IImageVariantRequest, options: IImageProviderNativeClientOptions, _deliveryOptions?: IImageDeliveryOptions): Promise<string>;
+    getVariantUrl(image: IImageNativeStoredImage, request: IImageVariantRequest, options: IImageProviderNativeClientOptions, _deliveryOptions?: IImageProviderDeliveryOptions): Promise<string>;
+    downloadBuffer(image: IImageNativeStoredImage, request: IImageVariantRequest): Promise<{
+        buffer: Buffer;
+        filename?: string;
+        contentType?: string;
+    } | null>;
     private _buildStoredResource;
     private _getFinalPath;
-    private _getDraftPath;
+    private _getBasePath;
     private _ensureVariantFile;
     private _writeTransformedFile;
     private _getOriginalUrl;
@@ -25,9 +25,9 @@ export declare class ServiceImageNative extends BeanBase {
     private _getVariantExt;
     private _getOriginalExt;
     private _normalizeFormat;
-    private _buildTransformCacheKey;
+    private _resolveContentType;
+    private _buildTransformKey;
     private _stableStringify;
-    private _sanitizeResourceId;
     private _sanitizeVariantName;
     private _isOriginalTransform;
     private _mapFit;

package/dist/service/imageNative.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"imageNative.d.ts","sourceRoot":"","sources":["../../src/service/imageNative.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,WAAW,EACX,qBAAqB,EACrB,uBAAuB,EACvB,kCAAkC,EAElC,sBAAsB,EAEtB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAKxD,OAAO,EAAE,QAAQ,EAAU,MAAM,MAAM,CAAC;AAIxC,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,iCAAiC,CAAC;AAEzF,KAAK,uBAAuB,GAAG,IAAI,CACjC,WAAW,EACX,YAAY,GAAG,UAAU,GAAG,aAAa,GAAG,UAAU,CACvD,CAAC;AAEF,KAAK,sBAAsB,GAAG,IAAI,CAChC,WAAW,EACT,YAAY,GACZ,UAAU,GACV,aAAa,GACb,MAAM,GACN,YAAY,GACZ,mBAAmB,GACnB,aAAa,GACb,iBAAiB,GACjB,UAAU,GACV,YAAY,CACf,CAAC;AAEF,qBACa,kBAAmB,SAAQ,QAAQ;IAC9C,OAAO,CAAC,cAAc,CAAmB;YAE3B,QAAQ;IAOhB,MAAM,CACV,KAAK,EAAE,iBAAiB,EACxB,OAAO,EAAE,iCAAiC,GACzC,OAAO,CAAC,sBAAsB,CAAC;IAe5B,kBAAkB,CACtB,KAAK,EAAE,uBAAuB,EAC9B,OAAO,EAAE,iCAAiC,GACzC,OAAO,CAAC,kCAAkC,CAAC;IAiCxC,gBAAgB,CAAC,KAAK,EAAE,sBAAsB,EAAE,IAAI,EAAE,WAAW;IAOjE,oBAAoB,CACxB,KAAK,EAAE,sBAAsB,EAC7B,OAAO,EAAE,iCAAiC,GACzC,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAkBxC,MAAM,CAAC,KAAK,EAAE,uBAAuB;IAiBrC,aAAa,CACjB,KAAK,EAAE,uBAAuB,EAC9B,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,iCAAiC,EAC1C,gBAAgB,CAAC,EAAE,qBAAqB;YAa5B,oBAAoB;YA8BpB,aAAa;IAc3B,OAAO,CAAC,aAAa;YASP,kBAAkB;YAclB,qBAAqB;YAsDrB,eAAe;YAUf,SAAS;YAQT,qBAAqB;YAMrB,uBAAuB;IAerC,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,uBAAuB;IAK/B,OAAO,CAAC,gBAAgB;IAexB,OAAO,CAAC,mBAAmB;IAM3B,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,OAAO;IAOf,OAAO,CAAC,WAAW;CAOpB"}
+{"version":3,"file":"imageNative.d.ts","sourceRoot":"","sources":["../../src/service/imageNative.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,WAAW,EACX,6BAA6B,EAE7B,sBAAsB,EAEtB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAK7B,OAAO,EAAE,QAAQ,EAAsC,MAAM,MAAM,CAAC;AAIpE,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,iCAAiC,CAAC;AAEzF,KAAK,uBAAuB,GAAG,IAAI,CACjC,WAAW,EACX,IAAI,GAAG,YAAY,GAAG,UAAU,GAAG,aAAa,GAAG,QAAQ,GAAG,aAAa,GAAG,UAAU,CACzF,CAAC;AAEF,qBACa,kBAAmB,SAAQ,QAAQ;IAC9C,OAAO,CAAC,cAAc,CAAmB;YAE3B,QAAQ;IAOhB,MAAM,CACV,KAAK,EAAE,iBAAiB,EACxB,OAAO,EAAE,iCAAiC,GACzC,OAAO,CAAC,sBAAsB,CAAC;IAuB5B,MAAM,CAAC,KAAK,EAAE,uBAAuB;IAerC,aAAa,CACjB,KAAK,EAAE,uBAAuB,EAC9B,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,iCAAiC,EAC1C,gBAAgB,CAAC,EAAE,6BAA6B;IAkB5C,cAAc,CAClB,KAAK,EAAE,uBAAuB,EAC9B,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC;QACT,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,GAAG,IAAI,CAAC;YAqBK,oBAAoB;YA8BpB,aAAa;YAYb,YAAY;YAqBZ,kBAAkB;YAclB,qBAAqB;YAsDrB,eAAe;YAUf,SAAS;YAQT,qBAAqB;YAarB,uBAAuB;IAerC,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,mBAAmB;IAkB3B,OAAO,CAAC,kBAAkB;IAK1B,OAAO,CAAC,gBAAgB;IAexB,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,OAAO;IAOf,OAAO,CAAC,WAAW;CAOpB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-image-native",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "description": "",
   "keywords": [
     "Vona Module"
@@ -38,11 +38,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
@@ -56,5 +52,5 @@
       "monkey": true
     }
   },
-  "gitHead": "f7296d0004da7e5c173bc9149d209c2e57cab1b8"
+  "gitHead": "c11c57c30cfd0703183edbd23f203b78dc329427"
 }

package/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/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,
     };
   }
 }

package/src/service/imageNative.ts

@@ -1,21 +1,18 @@
 import type { SharpConstructor } from 'sharp';
 import type {
   EntityImage,
-  IImageDeliveryOptions,
-  IImageDirectUploadInput,
-  IImageProviderDirectUploadResource,
+  IImageProviderDeliveryOptions,
   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';
 import path from 'node:path';
-import { BeanBase, uuidv4 } from 'vona';
+import { BeanBase, getRuntimePathPhysicalRoot, uuidv4 } from 'vona';
 import { Service } from 'vona-module-a-bean';
 import { resolveImageVariantRequestToTransform } from 'vona-module-a-image';
 
@@ -23,21 +20,7 @@ import type { IImageProviderNativeClientOptions } from '../bean/imageProvider.na
 
 type IImageNativeStoredImage = Pick<
   EntityImage,
-  'resourceId' | 'filename' | 'storagePath' | 'variants'
->;
-
-type IImageNativeDraftImage = Pick<
-  EntityImage,
-  | 'resourceId'
-  | 'filename'
-  | 'contentType'
-  | 'meta'
-  | 'imageScene'
-  | 'requireSignedURLs'
-  | 'storagePath'
-  | 'deliveryBaseUrl'
-  | 'variants'
-  | 'clientName'
+  'id' | 'resourceId' | 'filename' | 'contentType' | 'public' | 'storagePath' | 'variants'
 >;
 
 @Service()
@@ -56,80 +39,24 @@ export class ServiceImageNative extends BeanBase {
     options: IImageProviderNativeClientOptions,
   ): Promise<IImageProviderResource> {
     const resourceId = uuidv4();
-    const targetPath = await this._getFinalPath(resourceId, input.filename, options, input.file);
-    await fse.copy(input.file, targetPath);
-    return await this._buildStoredResource(targetPath, {
+    const isPublic = input.public ?? options.public;
+    const targetPath = await this._getFinalPath(
       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,
+      input.filename,
+      isPublic,
+      options,
+      input.file,
     );
-    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 {
+    await fse.ensureDir(path.dirname(targetPath));
+    await fse.copy(input.file, targetPath);
+    return await this._buildStoredResource(targetPath, {
       resourceId,
       filename: input.filename,
       contentType: input.contentType,
       meta: input.meta,
-      requireSignedURLs: input.requireSignedURLs ?? options.requireSignedURLs,
+      public: isPublic,
       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,
     });
   }
 
@@ -137,8 +64,6 @@ export class ServiceImageNative extends BeanBase {
     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
@@ -154,8 +79,13 @@ export class ServiceImageNative extends BeanBase {
     image: IImageNativeStoredImage,
     request: IImageVariantRequest,
     options: IImageProviderNativeClientOptions,
-    _deliveryOptions?: IImageDeliveryOptions,
+    _deliveryOptions?: IImageProviderDeliveryOptions,
   ) {
+    if (!(image.public ?? options.public)) {
+      throw new Error(
+        `Private image-native variant URL requires signed delivery: ${image.resourceId}`,
+      );
+    }
     const resolved = resolveImageVariantRequestToTransform(request, 'original', image.variants);
     if (
       resolved.variantName === 'original' &&
@@ -167,6 +97,34 @@ export class ServiceImageNative extends BeanBase {
     return await this._buildUrl(targetPath, options.deliveryBaseUrl);
   }
 
+  async downloadBuffer(
+    image: IImageNativeStoredImage,
+    request: IImageVariantRequest,
+  ): Promise<{
+    buffer: Buffer;
+    filename?: string;
+    contentType?: string;
+  } | null> {
+    if (!image.storagePath) {
+      throw new Error(`Image storage path missing: ${image.resourceId}`);
+    }
+    const resolved = resolveImageVariantRequestToTransform(request, 'original', image.variants);
+    const targetPath =
+      resolved.variantName === 'original' && this._isOriginalTransform(resolved.transformOptions)
+        ? image.storagePath
+        : await this._ensureVariantFile(image, resolved);
+    if (!(await fse.pathExists(targetPath))) return null;
+    return {
+      buffer: await fse.readFile(targetPath),
+      filename: image.filename,
+      contentType: this._resolveContentType(
+        targetPath,
+        image.contentType,
+        resolved.transformOptions,
+      ),
+    };
+  }
+
   private async _buildStoredResource(
     targetPath: string,
     data: {
@@ -174,7 +132,7 @@ export class ServiceImageNative extends BeanBase {
       filename?: string;
       contentType?: string;
       meta?: Record<string, unknown>;
-      requireSignedURLs?: boolean;
+      public?: boolean;
       variants?: EntityImage['variants'];
       deliveryBaseUrl?: string;
     },
@@ -189,7 +147,7 @@ export class ServiceImageNative extends BeanBase {
       size: Number(stat.size),
       width: metadata.width,
       height: metadata.height,
-      requireSignedURLs: data.requireSignedURLs,
+      public: data.public,
       variants: data.variants,
       meta: data.meta,
       storagePath: targetPath,
@@ -200,24 +158,34 @@ export class ServiceImageNative extends BeanBase {
   private async _getFinalPath(
     resourceId: string,
     filename: string | undefined,
+    isPublic: boolean | undefined,
     options: IImageProviderNativeClientOptions,
     filePath?: string,
   ) {
-    const publicPath = await this.app.util.getPublicPathPhysical(
-      path.join('image-native', options.subdir ?? 'default'),
-      true,
-    );
+    const basePath = await this._getBasePath(isPublic, options);
     const ext = this._getOriginalExt(filename, filePath ?? resourceId);
-    return path.join(publicPath, `${resourceId}${ext}`);
+    return path.join(basePath, `${resourceId}${ext}`);
   }
 
-  private _getDraftPath(storagePath: string | undefined, resourceId: string) {
-    if (!storagePath) {
-      throw new Error(`Image storage path missing: ${resourceId}`);
+  private async _getBasePath(
+    isPublic: boolean | undefined,
+    options: IImageProviderNativeClientOptions,
+  ) {
+    if (isPublic) {
+      return await this.app.util.getPublicPathPhysical(
+        path.join('image-native', options.subdir ?? 'default'),
+        true,
+      );
     }
-    const dir = path.dirname(storagePath);
-    const ext = path.extname(storagePath) || '.bin';
-    return path.join(dir, `${resourceId}__draft${ext}`);
+    const runtimeRoot = getRuntimePathPhysicalRoot(this.app);
+    const basePath = path.join(
+      runtimeRoot,
+      this.ctx.instance.id.toString(),
+      'image-native',
+      options.subdir ?? 'default',
+    );
+    await fse.ensureDir(basePath);
+    return basePath;
   }
 
   private async _ensureVariantFile(
@@ -308,8 +276,15 @@ export class ServiceImageNative extends BeanBase {
 
   private async _getVariantStaticPath(targetPath: string) {
     const publicRoot = await this.app.util.getPublicPathPhysical(undefined, true);
-    const relativePath = path.relative(publicRoot, targetPath).split(path.sep).join(path.posix.sep);
-    return path.posix.join('public', this.ctx.instance.id.toString(), relativePath);
+    const relativePath = path.relative(publicRoot, targetPath);
+    if (relativePath.startsWith('..') || path.isAbsolute(relativePath)) {
+      throw new Error(`Image target path is not publicly accessible: ${targetPath}`);
+    }
+    return path.posix.join(
+      'public',
+      this.ctx.instance.id.toString(),
+      relativePath.split(path.sep).join(path.posix.sep),
+    );
   }
 
   private async _getVariantAbsolutePath(
@@ -323,8 +298,8 @@ export class ServiceImageNative extends BeanBase {
       const variantName = this._sanitizeVariantName(resolved.variantName);
       return path.join(dir, `${image.resourceId}__${variantName}${ext}`);
     }
-    const cacheKey = this._buildTransformCacheKey(resolved.transformOptions);
-    return path.join(dir, `${image.resourceId}__t_${cacheKey}${ext}`);
+    const transformKey = this._buildTransformKey(resolved.transformOptions);
+    return path.join(dir, `${image.resourceId}__t_${transformKey}${ext}`);
   }
 
   private _getVariantExt(
@@ -348,7 +323,25 @@ export class ServiceImageNative extends BeanBase {
     return format === 'jpeg' ? 'jpeg' : format;
   }
 
-  private _buildTransformCacheKey(transformOptions: IImageTransformOptions) {
+  private _resolveContentType(
+    targetPath: string,
+    contentType: string | undefined,
+    transformOptions: IImageTransformOptions,
+  ) {
+    const format = this._normalizeFormat(transformOptions.format);
+    if (format === 'jpeg') return 'image/jpeg';
+    if (format === 'png') return 'image/png';
+    if (format === 'webp') return 'image/webp';
+    if (format === 'avif') return 'image/avif';
+    const ext = path.extname(targetPath).toLowerCase();
+    if (ext === '.jpg' || ext === '.jpeg') return 'image/jpeg';
+    if (ext === '.png') return 'image/png';
+    if (ext === '.webp') return 'image/webp';
+    if (ext === '.avif') return 'image/avif';
+    return contentType;
+  }
+
+  private _buildTransformKey(transformOptions: IImageTransformOptions) {
     const stable = this._stableStringify(transformOptions);
     return createHash('sha1').update(stable).digest('hex').slice(0, 12);
   }
@@ -368,12 +361,6 @@ 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/dist/controller/image.d.ts

@@ -1,11 +0,0 @@
-import type { IUploadFile } from 'vona-module-a-upload';
-import type { IDecoratorControllerOptions } from 'vona-module-a-web';
-import { BeanBase } from 'vona';
-export interface IControllerOptionsImage extends IDecoratorControllerOptions {
-}
-export declare class ControllerImage extends BeanBase {
-    directUpload(resourceId: string, token: string, file: IUploadFile): Promise<{
-        ok: boolean;
-    }>;
-}
-//# sourceMappingURL=image.d.ts.map

package/dist/controller/image.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"image.d.ts","sourceRoot":"","sources":["../../src/controller/image.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAGrE,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAKhC,MAAM,WAAW,uBAAwB,SAAQ,2BAA2B;CAAG;AAE/E,qBACa,eAAgB,SAAQ,QAAQ;IAIrC,YAAY,CACS,UAAU,EAAE,MAAM,EACvB,KAAK,EAAE,MAAM,EACd,IAAI,EAAE,WAAW;;;CAqCvC"}

package/src/controller/image.ts

@@ -1,57 +0,0 @@
-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 as never,
-      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 };
-  }
-}