cabloy 5.1.113 → 5.1.115

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

@@ -162,7 +162,7 @@ export class ServiceImageCloudflare extends BeanBase {
     options: IImageProviderCloudflareClientOptions,
   ) {
     const normalized = this._normalizeClientOptions(options);
-    const response = await fetch(
+    const response = await this.bean.core.fetch(
       `${normalized.apiBaseUrl}/accounts/${normalized.accountId}/images/v1/${encodeURIComponent(image.resourceId)}`,
       {
         method: 'DELETE',
@@ -247,13 +247,16 @@ export class ServiceImageCloudflare extends BeanBase {
     apiPath: string,
     init: RequestInit,
   ) {
-    const response = await fetch(`${options.apiBaseUrl}/accounts/${options.accountId}${apiPath}`, {
-      ...init,
-      headers: {
-        ...this._createHeaders(options),
-        ...(init.headers ?? {}),
+    const response = await this.bean.core.fetch(
+      `${options.apiBaseUrl}/accounts/${options.accountId}${apiPath}`,
+      {
+        ...init,
+        headers: {
+          ...this._createHeaders(options),
+          ...(init.headers ?? {}),
+        },
       },
-    });
+    );
     return await this._parseEnvelope<T>(response);
   }
 

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

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

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

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

package/vona/src/suite-vendor/a-vona/modules/a-aspect/src/types/aopMethod.ts

@@ -15,15 +15,28 @@ export interface IUseAopMethodPropMetadataInner<T extends keyof IAopMethodRecord
 
 export interface IAopMethodRecord {}
 
+export type AopMethodNext = Next & {
+  replay: Next;
+};
+
+export type AopMethodNextSync = NextSync & {
+  replay: NextSync;
+};
+
 export interface IAopMethodGet {
-  get(options: IDecoratorAopMethodOptions, next: NextSync, receiver: any, prop: string): any;
+  get(
+    options: IDecoratorAopMethodOptions,
+    next: AopMethodNextSync,
+    receiver: any,
+    prop: string,
+  ): any;
 }
 
 export interface IAopMethodSet {
   set(
     options: IDecoratorAopMethodOptions,
     value: any,
-    next: NextSync,
+    next: AopMethodNextSync,
     receiver: any,
     prop: string,
   ): boolean;
@@ -33,7 +46,7 @@ export interface IAopMethodExecute {
   execute(
     options: IDecoratorAopMethodOptions,
     args: [],
-    next: Next | NextSync,
+    next: AopMethodNext | AopMethodNextSync,
     receiver: any,
     prop: string,
   ): Promise<any> | any;

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-core",
-  "version": "5.1.44",
+  "version": "5.1.45",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [
@@ -84,7 +84,9 @@
   },
   "title": "a-core",
   "vonaModule": {
-    "dependencies": {},
+    "dependencies": {
+      "a-retryable": "5.0.0"
+    },
     "globalDependencies": {
       "@babel/core": true,
       "@babel/traverse": true,

package/vona/src/suite-vendor/a-vona/modules/a-core/src/bean/bean.core.ts

@@ -1,6 +1,8 @@
 import { BeanBase } from 'vona';
 import { Bean } from 'vona-module-a-bean';
 
+import type { TypeContextFetch } from '../types/fetch.ts';
+
 @Bean()
 export class BeanCore extends BeanBase {
   get protocol() {
@@ -11,6 +13,10 @@ export class BeanCore extends BeanBase {
     return this.app.util.host;
   }
 
+  get fetch(): TypeContextFetch {
+    return this.ctx.state.fetch ?? globalThis.fetch;
+  }
+
   getAbsoluteUrl(path?: string) {
     return this.app.util.getAbsoluteUrl(path);
   }

package/vona/src/suite-vendor/a-vona/modules/a-core/src/index.ts

@@ -1,2 +1,3 @@
 export * from './.metadata/index.ts';
 export * from './lib/index.ts';
+export * from './types/index.ts';

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

@@ -3,6 +3,7 @@ import type { IFilterOptionsError } from 'vona-module-a-error';
 import type { IAopMethodOptionsLog } from 'vona-module-a-logger';
 import type { TypeUseOnionOmitOptionsGlobal } from 'vona-module-a-onion';
 import type { IAopMethodOptionsTransaction } from 'vona-module-a-orm';
+import type { IAopMethodOptionsRetryable } from 'vona-module-a-retryable';
 import type { IInterceptorOptionsUpload } from 'vona-module-a-upload';
 
 import { Aspect } from 'vona-module-a-aspect';
@@ -29,6 +30,10 @@ function Transaction(options?: Partial<IAopMethodOptionsTransaction>): MethodDec
   return Aspect.aopMethod('a-orm:transaction', options);
 }
 
+function Retryable(options: IAopMethodOptionsRetryable): MethodDecorator {
+  return Aspect.aopMethod('a-retryable:retryable', options);
+}
+
 function CaptchaVerify(options?: Partial<IInterceptorOptionsCaptchaVerify>): MethodDecorator {
   return Aspect.interceptor('a-captcha:captchaVerify', options);
 }
@@ -46,6 +51,7 @@ export const Core = {
   error: Error,
   log: Log,
   transaction: Transaction,
+  retryable: Retryable,
   captchaVerify: CaptchaVerify,
   fileUpload: FileUpload,
   serializer: Serializer,

package/vona/src/suite-vendor/a-vona/modules/a-core/src/types/fetch.ts

@@ -0,0 +1,7 @@
+export type TypeContextFetch = typeof globalThis.fetch;
+
+declare module 'vona' {
+  export interface ContextState {
+    fetch?: TypeContextFetch;
+  }
+}

package/vona/src/suite-vendor/a-vona/modules/a-core/src/types/index.ts

@@ -0,0 +1 @@
+export * from './fetch.ts';

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

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

package/vona/src/suite-vendor/a-vona/modules/a-executor/src/lib/utils.ts

@@ -2,9 +2,11 @@ export function __delegateProperties(ctx, ctxCaller) {
   for (const property of ['state']) {
     __delegateProperty(ctx, ctxCaller, property);
   }
-  for (const property of ['headers']) {
-    __delegateProperty(ctx.request, ctxCaller.request, property);
-    // if (ctx.request[property]) req[property] = ctx.request[property];
+  if (ctxCaller.request) {
+    for (const property of ['headers']) {
+      __delegateProperty(ctx.request, ctxCaller.request, property);
+      // if (ctx.request[property]) req[property] = ctx.request[property];
+    }
   }
 }
 

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

@@ -0,0 +1,50 @@
+{
+  "name": "vona-module-a-retryable",
+  "version": "5.0.1",
+  "description": "",
+  "keywords": [
+    "Vona Module"
+  ],
+  "author": "",
+  "files": [
+    "assets",
+    "dist",
+    "src"
+  ],
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": [
+        "./src/index.ts",
+        "./dist/index.d.ts"
+      ],
+      "import": "./src/index.ts",
+      "default": "./dist/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "scripts": {
+    "clean": "rimraf dist tsconfig.build.tsbuildinfo",
+    "tsc:publish": "npm run clean && node ../../../../../packages-cli/cli/src/bin/vona.ts :bin:buildModule --sourcemap && tsc -p tsconfig.build.json",
+    "prepublishOnly": "npm run tsc:publish",
+    "prepack": "clean-package",
+    "postpack": "clean-package restore"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "clean-package": "^2.2.0",
+    "rimraf": "^6.1.3"
+  },
+  "clean-package": {
+    "indent": 2,
+    "remove": [
+      "clean-package",
+      "devDependencies",
+      "exports.\\..import"
+    ]
+  },
+  "title": "a-retryable",
+  "vonaModule": {
+    "dependencies": {}
+  }
+}

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

@@ -0,0 +1,55 @@
+// eslint-disable
+/** aopMethod: begin */
+export * from '../bean/aopMethod.retryable.ts';
+import type { IAopMethodOptionsRetryable } from '../bean/aopMethod.retryable.ts';
+import 'vona-module-a-aspect';
+declare module 'vona-module-a-aspect' {
+  
+    export interface IAopMethodRecord {
+      'a-retryable:retryable': IAopMethodOptionsRetryable;
+    }
+
+  
+}
+declare module 'vona-module-a-retryable' {
+  
+        export interface AopMethodRetryable {
+          /** @internal */
+          get scope(): ScopeModuleARetryable;
+        }
+
+          export interface AopMethodRetryable {
+            get $beanFullName(): 'a-retryable.aopMethod.retryable';
+            get $onionName(): 'a-retryable:retryable';
+            get $onionOptions(): IAopMethodOptionsRetryable;
+          } 
+}
+/** aopMethod: end */
+/** scope: begin */
+import { BeanScopeBase, type BeanScopeUtil } from 'vona';
+import { Scope } from 'vona-module-a-bean';
+
+@Scope()
+export class ScopeModuleARetryable extends BeanScopeBase {}
+
+export interface ScopeModuleARetryable {
+  util: BeanScopeUtil;
+}
+
+import 'vona';
+declare module 'vona' {
+  export interface IBeanScopeRecord {
+    'a-retryable': ScopeModuleARetryable;
+  }
+
+  export interface IBeanScopeContainer {
+    retryable: ScopeModuleARetryable;
+  }
+  
+  
+
+  
+
+  
+}
+/** scope: end */

package/vona/src/suite-vendor/a-vona/modules/a-retryable/src/.metadata/this.ts

@@ -0,0 +1,2 @@
+export const __ThisModule__ = 'a-retryable';
+export { ScopeModuleARetryable as ScopeModule } from './index.ts';

package/vona/src/suite-vendor/a-vona/modules/a-retryable/src/bean/aopMethod.retryable.ts

@@ -0,0 +1,45 @@
+import type {
+  AopMethodNext,
+  IAopMethodExecute,
+  IDecoratorAopMethodOptions,
+} from 'vona-module-a-aspect';
+
+import { BeanAopMethodBase, Retry } from 'vona';
+import { AopMethod } from 'vona-module-a-aspect';
+
+export interface IAopMethodOptionsRetryable extends IDecoratorAopMethodOptions, Retry.WrapOptions {
+  errorCodes: string[];
+  ownerOnly?: boolean;
+}
+
+@AopMethod<IAopMethodOptionsRetryable>()
+export class AopMethodRetryable extends BeanAopMethodBase implements IAopMethodExecute {
+  async execute(
+    options: IAopMethodOptionsRetryable,
+    _args: [],
+    next: AopMethodNext,
+    _receiver: any,
+    _prop: string,
+  ): Promise<any> {
+    if (options.ownerOnly && this.bean.database.current.transaction.inTransaction) {
+      return await next.replay();
+    }
+    const operation = Retry.operation(options);
+    return await new Promise((resolve, reject) => {
+      operation.attempt(() => {
+        next
+          .replay()
+          .then(resolve)
+          .catch(error => {
+            if (this._shouldRetry(error, options) && operation.retry(error)) return;
+            reject(error);
+          });
+      });
+    });
+  }
+
+  private _shouldRetry(error: unknown, options: IAopMethodOptionsRetryable) {
+    const code = (error as { code?: unknown })?.code;
+    return typeof code === 'string' && options.errorCodes?.includes(code) === true;
+  }
+}

package/vona/src/suite-vendor/a-vona/modules/a-retryable/src/index.ts

@@ -0,0 +1 @@
+export * from './.metadata/index.ts';

package/vona/src/suite-vendor/a-vona/modules/a-retryable/tsconfig.build.json

@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.base",
+  "compilerOptions": {
+    "rootDir": "src",
+    "declaration": true,
+    "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "outDir": "dist"
+  },
+  "include": ["src", "src/.metadata/*.ts", "src/**/*.json"]
+}

package/vona/src/suite-vendor/a-vona/modules/a-retryable/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.base",
+  "compilerOptions": {
+    "noEmit": true
+  },
+  "include": ["src", "src/.metadata/*.ts", "src/**/*.json", "test"]
+}

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-vona",
-  "version": "5.1.12",
+  "version": "5.1.13",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "keywords": [
@@ -84,6 +84,7 @@
       "a-queue": "5.0.0",
       "a-redis": "5.0.0",
       "a-redlock": "5.0.0",
+      "a-retryable": "5.0.0",
       "a-runtime": "5.0.0",
       "a-schedule": "5.0.0",
       "a-security": "5.0.0",

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-suite-a-vona",
-  "version": "5.1.71",
+  "version": "5.1.72",
   "gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
   "description": "",
   "author": "",
@@ -44,6 +44,7 @@
     "vona-module-a-queue": "workspace:^",
     "vona-module-a-redis": "workspace:^",
     "vona-module-a-redlock": "workspace:^",
+    "vona-module-a-retryable": "workspace:^",
     "vona-module-a-runtime": "workspace:^",
     "vona-module-a-schedule": "workspace:^",
     "vona-module-a-security": "workspace:^",

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

@@ -160,6 +160,9 @@
     },
     {
       "path": "modules/a-hmrbase/tsconfig.build.json"
+    },
+    {
+      "path": "modules/a-retryable/tsconfig.build.json"
     }
   ],
   "exclude": ["modules"]

package/zova/packages-utils/zova-jsx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-jsx",
-  "version": "1.1.78",
+  "version": "1.1.79",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "Zova JSX",
   "keywords": [
@@ -45,12 +45,12 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "@cabloy/compose": "^2.1.8",
+    "@cabloy/compose": "^2.1.9",
     "@cabloy/utils": "^2.1.26",
     "@cabloy/word-utils": "^2.1.14",
     "typestyle": "^2.4.0",
     "vue": "^3.5.38",
-    "zova-core": "^5.1.78"
+    "zova-core": "^5.1.79"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova",
-  "version": "5.1.139",
+  "version": "5.1.140",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -45,8 +45,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "zova-core": "^5.1.78",
-    "zova-suite-a-zova": "^5.1.138"
+    "zova-core": "^5.1.79",
+    "zova-suite-a-zova": "^5.1.139"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/zova/packages-zova/zova-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zova-core",
-  "version": "5.1.78",
+  "version": "5.1.79",
   "gitHead": "2c5c19284bab738e492856189acb6fad74b8a7b7",
   "description": "A vue3 framework with ioc",
   "keywords": [
@@ -46,7 +46,7 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "@cabloy/compose": "^2.1.8",
+    "@cabloy/compose": "^2.1.9",
     "@cabloy/extend": "^3.2.8",
     "@cabloy/json5": "^1.1.9",
     "@cabloy/localeutil": "^2.1.8",