vona-module-image-native 5.0.1 → 5.0.4

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

@@ -1,3 +1,4 @@
+import type { TypeControllerOptionsActions } from 'vona-module-a-openapi';
 /** service: begin */
 export * from '../service/imageNative.ts';
 import 'vona-module-a-bean';
@@ -54,6 +55,38 @@ 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,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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/.metadata/index.ts"],"names":[],"mappings":"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"}

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

@@ -1,4 +1,4 @@
-import type { IDecoratorImageProviderOptions, IImageDeliveryOptions, IImageDownloadResult, IImageProviderClientOptions, IImageProviderClientRecord, IImageProviderExecute, IImageProviderResource, IImageUploadInput, IImageVariantRequest } from 'vona-module-a-image';
+import type { IDecoratorImageProviderOptions, IImageDeliveryOptions, IImageDirectUploadInput, IImageDownloadResult, 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 {
@@ -10,8 +10,10 @@ export interface IImageProviderNativeClientOptions extends IImageProviderClientO
 }
 export interface IImageProviderOptionsNative extends IDecoratorImageProviderOptions<IImageProviderNativeClientRecord, IImageProviderNativeClientOptions> {
 }
-export declare class ImageProviderNative extends BeanBase implements IImageProviderExecute {
+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;

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,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,mBAAoB,SAAQ,QAAS,YAAW,qBAAqB;IAC1E,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,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,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"}

package/dist/controller/image.d.ts

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1 @@
+{"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/dist/index.js

@@ -1,10 +1,13 @@
 import { BeanInfo, BeanBase, uuidv4, BeanSimple, cast, getPlatformArch, resolveAddon, BeanScopeBase } from 'vona';
-import { __decorate } from 'tslib';
+import { __decorate, __param, __metadata } 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) {
@@ -18,37 +21,75 @@ let ServiceImageNative = class ServiceImageNative extends BeanBase {
     return this._sharpInstance;
   }
   async upload(input, options) {
-    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({
+    return await this._buildStoredResource(targetPath, {
       resourceId,
       filename: input.filename,
-      storagePath: targetPath,
-      variants
-    }, options);
+      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, 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,
-      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, 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))));
   }
@@ -60,18 +101,36 @@ let ServiceImageNative = class ServiceImageNative extends BeanBase {
     const targetPath = await this._ensureVariantFile(image, resolved);
     return await this._buildUrl(targetPath, options.deliveryBaseUrl);
   }
-  async _generateNamedVariants(image, options) {
-    const variantNames = Object.keys(image.variants ?? {});
-    for (const variantName of variantNames) {
-      if (variantName === 'original') continue;
-      await this._ensureVariantFile(image, resolveImageVariantRequestToTransform({
-        variantName
-      }, 'original', image.variants));
+  async _buildStoredResource(targetPath, data) {
+    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
+    };
+  }
+  async _getFinalPath(resourceId, filename, options, filePath) {
+    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}`);
+  }
+  _getDraftPath(storagePath, resourceId) {
+    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}`);
   }
   async _ensureVariantFile(image, resolved) {
     if (!image.storagePath) {
@@ -191,6 +250,11 @@ 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, '-');
   }
@@ -225,6 +289,12 @@ 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,
@@ -281,6 +351,47 @@ ImageProviderNative = __decorate([ImageProvider({
   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: {
@@ -320,5 +431,5 @@ ScopeModuleImageNative = __decorate([Scope(), BeanInfo({
 })], ScopeModuleImageNative);
 /** scope: end */
 
-export { ImageProviderNative, Monkey, ScopeModuleImageNative, ServiceImageNative, config };
+export { ControllerImage, 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/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","publicPath","app","util","getPublicPathPhysical","path","join","subdir","resourceId","uuidv4","ext","_getOriginalExt","filename","file","targetName","targetPath","fse","copy","sharp","metadata","stat","variants","scope","config","imageNative","_generateNamedVariants","storagePath","size","Number","width","height","deliveryBaseUrl","requireSignedURLs","remove","image","dir","dirname","pathExists","entries","readdir","Promise","all","filter","name","basename","startsWith","map","getVariantUrl","request","_deliveryOptions","resolved","resolveImageVariantRequestToTransform","variantName","_isOriginalTransform","transformOptions","_getOriginalUrl","_ensureVariantFile","_buildUrl","variantNames","Object","keys","original","Error","_getVariantAbsolutePath","_writeTransformedFile","sourcePath","ensureDir","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","split","sep","posix","ctx","instance","id","toString","_getVariantExt","_sanitizeVariantName","cacheKey","_buildTransformCacheKey","extname","filePath","stable","_stableStringify","createHash","update","digest","slice","value","Array","isArray","item","sort","a","b","localeCompare","key","JSON","stringify","length","__decorate","Service","__z_BeanInfo","module","ImageProviderNative","clientOptions","_options","resource","service","contentType","meta","get","delete","_clientOptions","deliveryOptions","download","responseMode","signed","buffer","readFile","kind","url","ImageProvider","base","signedDeliveryKind","_app","__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/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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"}

package/dist/service/imageNative.d.ts

@@ -1,14 +1,21 @@
-import type { EntityImage, IImageDeliveryOptions, IImageProviderResource, IImageUploadInput, IImageVariantRequest } from 'vona-module-a-image';
+import type { EntityImage, IImageDeliveryOptions, IImageDirectUploadInput, IImageProviderDirectUploadResource, IImageProviderResource, IImageUploadInput, IImageVariantRequest } from 'vona-module-a-image';
+import type { IUploadFile } from 'vona-module-a-upload';
 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'>;
 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>;
-    private _generateNamedVariants;
+    private _buildStoredResource;
+    private _getFinalPath;
+    private _getDraftPath;
     private _ensureVariantFile;
     private _writeTransformedFile;
     private _getOriginalUrl;
@@ -20,6 +27,7 @@ export declare class ServiceImageNative extends BeanBase {
     private _normalizeFormat;
     private _buildTransformCacheKey;
     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,EAGrB,sBAAsB,EAEtB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAK7B,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,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;IA8B5B,MAAM,CAAC,KAAK,EAAE,uBAAuB;IAerC,aAAa,CACjB,KAAK,EAAE,uBAAuB,EAC9B,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,iCAAiC,EAC1C,gBAAgB,CAAC,EAAE,qBAAqB;YAa5B,sBAAsB;YAkBtB,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,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,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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-image-native",
-  "version": "5.0.1",
+  "version": "5.0.4",
   "description": "",
   "keywords": [
     "Vona Module"
@@ -38,7 +38,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
@@ -52,5 +56,5 @@
       "monkey": true
     }
   },
-  "gitHead": "7a711c5f09e0c1d3b0fda2084710297ea45b5d8e"
+  "gitHead": "e6ba99cf7fcb42ab5bc46591e48bd071d7a35a7a"
 }

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