cabloy 5.1.102 → 5.1.103

package/zova/src/suite/cabloy-basic/modules/basic-image/src/apiSchema/image.ts

@@ -5,7 +5,6 @@ import { ApiSchema } from 'zova-module-a-api';
 
 import {
   ApiApiImagegetUploadPolicyPath,
-  ApiApiImagecreateUploadTokenPath,
   ApiApiImageuploadPath,
   ApiApiImagecreateDirectUploadPath,
   ApiApiImagefinalizeDirectUploadPath,
@@ -19,10 +18,6 @@ export class ApiSchemaImage extends BeanBase {
     return this.$sdk.createApiSchemas(ApiApiImagegetUploadPolicyPath, 'post', options);
   }
 
-  createUploadToken(options?: IApiSchemaOptions) {
-    return this.$sdk.createApiSchemas(ApiApiImagecreateUploadTokenPath, 'post', options);
-  }
-
   upload(options?: IApiSchemaOptions) {
     return this.$sdk.createApiSchemas(ApiApiImageuploadPath, 'post', options);
   }

package/zova/src/suite/cabloy-basic/modules/basic-image/src/bean/tableCell.image.tsx

@@ -7,7 +7,7 @@ import type {
 } from 'zova-module-a-table';
 
 import { classes } from 'typestyle';
-import { BeanBase } from 'zova';
+import { BeanBase, ClientOnly } from 'zova';
 import { TableCell } from 'zova-module-a-table';
 
 import type { IImagePreviewItem } from '../lib/index.js';
@@ -105,6 +105,8 @@ export class TableCellImage extends BeanBase implements ITableCellRender {
     item: IImagePreviewItem,
     previewUrl: string,
   ): VNode {
+    const passportCode = this._getDeliveryPassportCode();
+    const src = passportCode ? this._resolvePreviewUrl(previewUrl, passportCode) : undefined;
     const size = options.size ?? 40;
     const style = {
       ...(options.style as any),
@@ -119,22 +121,30 @@ export class TableCellImage extends BeanBase implements ITableCellRender {
         )}
         style={style}
       >
-        <img
-          class="h-full w-full object-cover"
-          style={{ objectFit: options.fit ?? 'cover' }}
-          src={previewUrl}
-          alt={item.filename ?? 'image'}
-        />
+        <ClientOnly>
+          {src && (
+            <img
+              class="h-full w-full object-cover"
+              style={{ objectFit: options.fit ?? 'cover' }}
+              alt={item.filename ?? 'image'}
+              src={src}
+            />
+          )}
+        </ClientOnly>
       </div>
     );
   }
 
-  private _openPreviewDialog(preview: IImagePreviewSummary, previewTitle: string) {
-    const items = this._resolveDialogItems(preview);
+  private async _openPreviewDialog(preview: IImagePreviewSummary, previewTitle: string) {
+    const passportCode = await this._ensureDeliveryPassportCode();
+    const items = this._resolveDialogItems(preview).map(item => ({
+      ...item,
+      url: this._resolvePreviewUrl(item.url, passportCode),
+    }));
     openImagePreviewDialog({
       appModal: this.$appModal,
       title: previewTitle,
-      items,
+      items: items.filter(item => !!item.url).map(item => ({ ...item, url: item.url! })),
       baseURL: this.sys.config.api.baseURL,
     });
   }
@@ -194,7 +204,23 @@ export class TableCellImage extends BeanBase implements ITableCellRender {
     return collectImageUrlPreviewItems(preview.source.value);
   }
 
-  private _resolvePreviewUrl(url: string) {
-    return resolveImagePreviewUrl(url, this.sys.config.api.baseURL);
+  private _getDeliveryPassportCode() {
+    const apiPrefix = this.sys.config.api.prefix ?? '/api';
+    return this.$passport.getFreshTempAuthToken({
+      path: `${apiPrefix}/image/delivery`,
+      staleTime: 30 * 1000,
+    });
+  }
+
+  private async _ensureDeliveryPassportCode() {
+    const apiPrefix = this.sys.config.api.prefix ?? '/api';
+    return await this.$passport.ensureFreshTempAuthToken({
+      path: `${apiPrefix}/image/delivery`,
+      staleTime: 30 * 1000,
+    });
+  }
+
+  private _resolvePreviewUrl(url: string, passportCode?: string) {
+    return resolveImagePreviewUrl(url, this.sys.config.api.baseURL, passportCode);
   }
 }

package/zova/src/suite/cabloy-basic/modules/basic-image/src/component/formFieldImage/controller.tsx

@@ -231,23 +231,24 @@ export class ControllerFormFieldImage extends BeanControllerBase {
     disableNotifyChanged?: boolean,
   ) {
     const previewUrl = item.url ? this._resolvePreviewUrl(item.url) : undefined;
+    const passportCode = this._getDeliveryPassportCode();
+    const src =
+      previewUrl && passportCode ? this._resolvePreviewUrl(previewUrl, passportCode) : undefined;
     return (
       <div
         key={`${item.id}-${index}`}
         class="rounded-box border border-base-300 bg-base-100 shadow-sm"
       >
         <div class="aspect-square overflow-hidden rounded-t-box bg-base-200">
-          {previewUrl ? (
-            <img
-              class="h-full w-full object-cover"
-              src={previewUrl}
-              alt={item.filename ?? `image-${index + 1}`}
-            />
-          ) : (
-            <div class="flex h-full w-full items-center justify-center text-sm text-base-content/50">
-              #{String(item.id)}
-            </div>
-          )}
+          <ClientOnly>
+            {src && (
+              <img
+                class="h-full w-full object-cover"
+                alt={item.filename ?? `image-${index + 1}`}
+                src={src}
+              />
+            )}
+          </ClientOnly>
         </div>
         <div class="space-y-2 p-3">
           <div class="min-h-10 text-sm text-base-content/70">
@@ -365,15 +366,12 @@ export class ControllerFormFieldImage extends BeanControllerBase {
         }
         const preparedFile = await this._prepareFile(file, options);
         if (!preparedFile) continue;
-        const tokenRes = await this.scope.api.image.createUploadToken({
-          ...uploadTarget,
-          size: preparedFile.size,
-          mimeType: preparedFile.type || file.type,
-        });
-        const uploaded = await this.scope.api.image.upload({
-          token: tokenRes.token,
-          image: preparedFile,
-        });
+        const uploaded = await this._uploadPreparedFile(
+          preparedFile,
+          file,
+          uploadTarget,
+          !!this._getCachedUploadPolicy(options)?.directUpload,
+        );
         const item: IImagePreviewItem = {
           id: uploaded.id,
           url: uploaded.url,
@@ -397,6 +395,40 @@ export class ControllerFormFieldImage extends BeanControllerBase {
     }
   }
 
+  private async _uploadPreparedFile(
+    preparedFile: File,
+    sourceFile: File,
+    uploadTarget: { imageScene: string },
+    directUpload: boolean,
+  ) {
+    if (!directUpload) {
+      return await this.scope.api.image.upload({
+        ...uploadTarget,
+        image: preparedFile,
+      });
+    }
+
+    const mimeType = preparedFile.type || sourceFile.type;
+    const directUploadRes = await this.scope.api.image.createDirectUpload({
+      ...uploadTarget,
+      filename: preparedFile.name,
+      size: preparedFile.size,
+      mimeType,
+    });
+    const formData = new FormData();
+    formData.append('file', preparedFile);
+    const providerRes = await fetch(directUploadRes.uploadUrl, {
+      method: 'POST',
+      body: formData,
+    });
+    if (!providerRes.ok) {
+      throw new Error(`image direct upload failed: ${providerRes.status}`);
+    }
+    return await this.scope.api.image.finalizeDirectUpload({
+      imageId: directUploadRes.id,
+    });
+  }
+
   private _resolveUploadTarget() {
     const imageScene = this.currentOptions.imageScene;
     if (!imageScene) {
@@ -794,26 +826,25 @@ export class ControllerFormFieldImage extends BeanControllerBase {
     });
   }
 
-  private _openPreviewDialog(items: IImagePreviewItem[], currentIndex: number) {
+  private async _openPreviewDialog(items: IImagePreviewItem[], currentIndex: number) {
+    const passportCode = await this._ensureDeliveryPassportCode();
     const previewItems = items
-      .map((item, index) => ({
-        index,
-        item,
-      }))
+      .map((item, index) => ({ index, item }))
       .filter(({ item }) => !!item.url)
       .map(({ index, item }) => ({
         index,
         item: {
-          url: item.url!,
+          url: this._resolvePreviewUrl(item.url!, passportCode),
           filename: item.filename,
         },
       }));
-    if (previewItems.length === 0) return;
-    const initialIndex = previewItems.findIndex(({ index }) => index === currentIndex);
+    const resolvedItems = previewItems.filter(item => !!item.item.url);
+    if (resolvedItems.length === 0) return;
+    const initialIndex = resolvedItems.findIndex(({ index }) => index === currentIndex);
     openImagePreviewDialog({
       appModal: this.$appModal,
-      title: this._getPreviewDialogTitle(previewItems.length),
-      items: previewItems.map(({ item }) => item),
+      title: this._getPreviewDialogTitle(resolvedItems.length),
+      items: resolvedItems.map(({ item }) => ({ ...item, url: item.url! })),
       initialIndex: initialIndex === -1 ? 0 : initialIndex,
       baseURL: this.sys.config.api.baseURL,
     });
@@ -829,8 +860,24 @@ export class ControllerFormFieldImage extends BeanControllerBase {
     );
   }
 
-  private _resolvePreviewUrl(url: string) {
-    return resolveImagePreviewUrl(url, this.sys.config.api.baseURL);
+  private _getDeliveryPassportCode() {
+    const apiPrefix = this.sys.config.api.prefix ?? '/api';
+    return this.$passport.getFreshTempAuthToken({
+      path: `${apiPrefix}/image/delivery`,
+      staleTime: 30 * 1000,
+    });
+  }
+
+  private async _ensureDeliveryPassportCode() {
+    const apiPrefix = this.sys.config.api.prefix ?? '/api';
+    return await this.$passport.ensureFreshTempAuthToken({
+      path: `${apiPrefix}/image/delivery`,
+      staleTime: 30 * 1000,
+    });
+  }
+
+  private _resolvePreviewUrl(url: string, passportCode?: string) {
+    return resolveImagePreviewUrl(url, this.sys.config.api.baseURL, passportCode);
   }
 
   private _formatBytes(bytes: number) {

package/zova/src/suite/cabloy-basic/modules/basic-image/src/lib/preview.ts

@@ -1,3 +1,5 @@
+import { $protocolKey } from 'zova';
+
 export interface IImagePreviewItemBase {
   url?: string;
   filename?: string;
@@ -19,10 +21,26 @@ export function inferImageRelationName(fieldName?: string, relationName?: string
   return undefined;
 }
 
-export function resolveImagePreviewUrl(url: string | undefined, baseURL?: string) {
-  if (!url || !url.startsWith('/api/')) return url;
-  if (!baseURL) return url;
-  return `${baseURL.replace(/\/$/, '')}${url}`;
+export function resolveImagePreviewUrl(
+  url: string | undefined,
+  baseURL?: string,
+  passportCode?: string,
+) {
+  if (!url) return url;
+  const resolvedUrl =
+    url.startsWith('/api/') && baseURL ? `${baseURL.replace(/\/$/, '')}${url}` : url;
+  if (!passportCode) return resolvedUrl;
+  const apiBaseUrl = new URL(baseURL ?? 'http://localhost', 'http://localhost');
+  const parsedUrl = new URL(resolvedUrl, apiBaseUrl);
+  if (parsedUrl.origin !== apiBaseUrl.origin || !parsedUrl.pathname.startsWith('/api/')) {
+    return resolvedUrl;
+  }
+  const passportCodeKey = $protocolKey('x-vona-passport-code');
+  if (!parsedUrl.searchParams.has(passportCodeKey)) {
+    parsedUrl.searchParams.set(passportCodeKey, passportCode);
+  }
+  if (!baseURL) return `${parsedUrl.pathname}${parsedUrl.search}${parsedUrl.hash}`;
+  return parsedUrl.toString();
 }
 
 export function buildImagePreviewTitle(

package/zova/src/suite/cabloy-basic/modules/basic-image/src/types/image.ts

@@ -1,5 +1,4 @@
-import type { components } from '../api/openapi/index.js';
+import type { ApiSchemaAImageDtoImageTransformOptions_2d063d28bc7243bed02ebd8bddf1212a93c6305b } from '../api/openapi/schemas.js';
 
-export type IImageTransformOptions = NonNullable<
-  NonNullable<components['schemas']['a-image.dto.imageUploadResponse']['variants']>[string]
->;
+export type IImageTransformOptions =
+  NonNullable<ApiSchemaAImageDtoImageTransformOptions_2d063d28bc7243bed02ebd8bddf1212a93c6305b>;

package/zova/src/suite-vendor/a-zova/modules/a-model/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-module-a-model",
-  "version": "5.1.31",
+  "version": "5.1.32",
   "gitHead": "09d901d17140a80ee0764211b441cda72fd94663",
   "description": "core",
   "keywords": [

package/zova/src/suite-vendor/a-zova/modules/a-model/src/lib/utils.ts

@@ -1,6 +1,34 @@
 import type { DataQuery } from '../types/query.js';
 
-export type TypeQueryEnsureLoadedFn<T> = () => DataQuery<T> | undefined;
+export type TypeQueryEnsureLoadedFn<TData, TError = Error | null> = () =>
+  | DataQuery<TData, TError>
+  | undefined;
+
+export type TypeQueryIsStaleFn<TData, TError = Error | null> = (
+  query: DataQuery<TData, TError>,
+) => boolean;
+
+export function $QueryGetFresh<TData = any, TError = Error | null>(
+  fn: TypeQueryEnsureLoadedFn<TData, TError>,
+  isStale: TypeQueryIsStaleFn<TData, TError>,
+): TData | undefined {
+  const query = fn();
+  if (!query) return;
+  if (!isStale(query)) return query.data;
+  void query.suspense();
+}
+
+export async function $QueryEnsureFresh<TData = any, TError = Error | null>(
+  fn: TypeQueryEnsureLoadedFn<TData, TError>,
+  isStale: TypeQueryIsStaleFn<TData, TError>,
+): Promise<TData | undefined> {
+  const query = fn();
+  if (!query) return;
+  if (!isStale(query)) return query.data;
+  const result = await query.suspense();
+  if (result.error) throw result.error;
+  return result.data;
+}
 
 export async function $QueryEnsureLoaded<T = any>(fn: TypeQueryEnsureLoadedFn<T>) {
   return _QueryEnsureLoadedInner<T>(fn);

package/zova/src/suite-vendor/a-zova/modules/a-model/src/types/query.ts

@@ -108,8 +108,8 @@ export interface QueryMetaPersister {
   refetchOnRestore?: boolean | 'always';
 }
 
-export type DataQuery<TData> = UnwrapNestedRefs<
-  ReturnType<typeof useQuery<TData | undefined, Error | null>>
+export type DataQuery<TData, TError = Error | null> = UnwrapNestedRefs<
+  ReturnType<typeof useQuery<TData | undefined, TError>>
 >;
 
 export type DataMutation<TData = unknown, TVariables = void, TContext = unknown> = UnwrapNestedRefs<

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

@@ -1,6 +1,6 @@
 {
   "name": "zova-suite-a-zova",
-  "version": "5.1.131",
+  "version": "5.1.132",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "zova",
   "license": "MIT",
@@ -21,7 +21,7 @@
     "zova-module-a-interceptor": "^5.1.29",
     "zova-module-a-logger": "^5.1.26",
     "zova-module-a-meta": "^5.1.21",
-    "zova-module-a-model": "^5.1.31",
+    "zova-module-a-model": "^5.1.32",
     "zova-module-a-openapi": "^5.1.43",
     "zova-module-a-router": "^5.1.29",
     "zova-module-a-routerstack": "^5.1.26",

package/vona/src/suite/a-training/modules/training-record/src/lib/resolveDossierFiles.ts

@@ -1,34 +0,0 @@
-import type { TableIdentity } from 'table-identity';
-import type { VonaContext } from 'vona';
-
-import type { DtoRecordDossierFileView } from '../dto/recordDossierFileView.ts';
-
-export async function resolveDossierFiles(
-  this: VonaContext,
-  _value: unknown,
-  data: { dossierFileIds?: TableIdentity[] },
-): Promise<DtoRecordDossierFileView[]> {
-  const dossierFileIds = data.dossierFileIds;
-  if (!dossierFileIds?.length) return [];
-  const items: Array<DtoRecordDossierFileView | undefined> = await Promise.all(
-    dossierFileIds.map(async dossierFileId => {
-      const file = await this.bean.file.get(dossierFileId);
-      if (!file || file.fileScene !== 'training-record:dossierFile') return undefined;
-      return {
-        id: file.id,
-        provider: String(file.provider),
-        clientName: file.clientName,
-        fileScene: file.fileScene ? String(file.fileScene) : undefined,
-        filename: file.filename,
-        contentType: file.contentType,
-        size: file.size,
-        public: file.public,
-        uploadedAt: file.uploadedAt,
-        meta: file.meta as Record<string, unknown> | undefined,
-        downloadUrl: await this.bean.file.getDownloadUrl(file.id),
-        signed: !file.public,
-      } satisfies DtoRecordDossierFileView;
-    }),
-  );
-  return items.filter((item): item is DtoRecordDossierFileView => !!item);
-}

package/vona/src/suite-vendor/a-image/modules/a-image/src/dto/imageUploadTokenRequest.ts

@@ -1,24 +0,0 @@
-import type { IDecoratorDtoOptions } from 'vona-module-a-web';
-
-import { Api, v } from 'vona-module-a-openapiutils';
-import { Dto } from 'vona-module-a-web';
-import z from 'zod';
-
-import type { IImageSceneRecord } from '../types/imageScene.ts';
-
-export interface IDtoOptionsImageUploadTokenRequest extends IDecoratorDtoOptions {}
-
-@Dto<IDtoOptionsImageUploadTokenRequest>()
-export class DtoImageUploadTokenRequest {
-  @Api.field(z.string())
-  imageScene: keyof IImageSceneRecord;
-
-  @Api.field(z.number().int().positive())
-  size: number;
-
-  @Api.field(z.string())
-  mimeType: string;
-
-  @Api.field(v.optional(), z.number().int().positive())
-  expiresIn?: number;
-}

package/vona/src/suite-vendor/a-image/modules/a-image/src/dto/imageUploadTokenResponse.ts

@@ -1,16 +0,0 @@
-import type { IDecoratorDtoOptions } from 'vona-module-a-web';
-
-import { Api, v } from 'vona-module-a-openapiutils';
-import { Dto } from 'vona-module-a-web';
-import z from 'zod';
-
-export interface IDtoOptionsImageUploadTokenResponse extends IDecoratorDtoOptions {}
-
-@Dto<IDtoOptionsImageUploadTokenResponse>()
-export class DtoImageUploadTokenResponse {
-  @Api.field(z.string())
-  token: string;
-
-  @Api.field(v.optional(), z.number().int().positive())
-  expiresIn?: number;
-}

package/vona/src/suite-vendor/a-image/modules/image-native/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 };
-  }
-}

package/zova/src/suite/cabloy-basic/modules/basic-image/src/api/imageNativeImage.ts

@@ -1,31 +0,0 @@
-import type { IApiActionOptions } from 'zova-module-a-api';
-
-import { Api, BeanApiBase } from 'zova-module-a-api';
-
-import type { paths } from './openapi/index.js';
-
-import { OpenApiBaseURL } from './openapi/index.js';
-
-/** ImageNativeImage_directUpload */
-export const ApiApiImageNativeImagedirectUploadPath =
-  '/api/image/native/image-native/direct-upload/{resourceId}';
-export type ApiApiImageNativeImagedirectUploadPath =
-  '/api/image/native/image-native/direct-upload/{resourceId}';
-export type ApiApiImageNativeImagedirectUploadMethod = 'post';
-export type ApiApiImageNativeImagedirectUploadRequestBody = {
-  /** Format: binary */
-  image: Blob;
-};
-export type ApiApiImageNativeImagedirectUploadResponseBody =
-  paths[ApiApiImageNativeImagedirectUploadPath][ApiApiImageNativeImagedirectUploadMethod]['responses']['200']['content']['application/json']['data'];
-
-@Api()
-export class ApiImageNativeImage extends BeanApiBase {
-  directUpload(body: ApiApiImageNativeImagedirectUploadRequestBody, options?: IApiActionOptions) {
-    return this.$fetch.post<any, ApiApiImageNativeImagedirectUploadResponseBody>(
-      ApiApiImageNativeImagedirectUploadPath,
-      this.$formData(body),
-      this.$configPrepare(OpenApiBaseURL(this.sys), options),
-    );
-  }
-}

package/zova/src/suite/cabloy-basic/modules/basic-image/src/apiSchema/imageNativeImage.ts

@@ -1,13 +0,0 @@
-import type { IApiSchemaOptions } from 'zova-module-a-api';
-
-import { BeanBase } from 'zova';
-import { ApiSchema } from 'zova-module-a-api';
-
-import { ApiApiImageNativeImagedirectUploadPath } from '../api/imageNativeImage.js';
-
-@ApiSchema()
-export class ApiSchemaImageNativeImage extends BeanBase {
-  directUpload(options?: IApiSchemaOptions) {
-    return this.$sdk.createApiSchemas(ApiApiImageNativeImagedirectUploadPath, 'post', options);
-  }
-}