cabloy 5.1.136 → 5.1.138

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

@@ -4,15 +4,15 @@ export * from '../bean/bean.redis.ts';
 
 import 'vona';
 declare module 'vona' {
-  
-  
+
+
 }
 declare module 'vona-module-a-redis' {
-  
+
         export interface BeanRedis {
           /** @internal */
           get scope(): ScopeModuleARedis;
-        } 
+        }
 }
 /** bean: end */
 /** bean: begin */
@@ -30,15 +30,15 @@ export * from '../service/redisClient_.ts';
 
 import 'vona-module-a-bean';
 declare module 'vona-module-a-bean' {
-  
+
     export interface IServiceRecord {
       'a-redis:redis': never;
     }
 
-  
+
 }
 declare module 'vona-module-a-redis' {
-  
+
         export interface ServiceRedis {
           /** @internal */
           get scope(): ScopeModuleARedis;
@@ -47,8 +47,7 @@ declare module 'vona-module-a-redis' {
           export interface ServiceRedis {
             get $beanFullName(): 'a-redis.service.redis';
             get $onionName(): 'a-redis:redis';
-            
-          } 
+          }
 }
 /** service: end */
 /** service: begin */
@@ -90,11 +89,11 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     redis: ScopeModuleARedis;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
 /** scope: end */

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

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

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

@@ -4,15 +4,15 @@ export * from '../service/redlock.ts';
 
 import 'vona-module-a-bean';
 declare module 'vona-module-a-bean' {
-  
+
     export interface IServiceRecord {
       'a-redlock:redlock': never;
     }
 
-  
+
 }
 declare module 'vona-module-a-redlock' {
-  
+
         export interface ServiceRedlock {
           /** @internal */
           get scope(): ScopeModuleARedlock;
@@ -21,8 +21,7 @@ declare module 'vona-module-a-redlock' {
           export interface ServiceRedlock {
             get $beanFullName(): 'a-redlock.service.redlock';
             get $onionName(): 'a-redlock:redlock';
-            
-          } 
+          }
 }
 /** service: end */
 /** service: begin */
@@ -66,13 +65,13 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     redlock: ScopeModuleARedlock;
   }
-  
+
   export interface IBeanScopeConfig {
     'a-redlock': ReturnType<typeof config>;
   }
 
-  
 
-  
+
+
 }
 /** scope: end */

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

@@ -1,6 +1,6 @@
 {
   "name": "vona-module-a-retryable",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "",
   "keywords": [
     "Vona Module"

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

@@ -4,15 +4,15 @@ 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;
@@ -22,7 +22,7 @@ declare module 'vona-module-a-retryable' {
             get $beanFullName(): 'a-retryable.aopMethod.retryable';
             get $onionName(): 'a-retryable:retryable';
             get $onionOptions(): IAopMethodOptionsRetryable;
-          } 
+          }
 }
 /** aopMethod: end */
 /** scope: begin */
@@ -45,11 +45,11 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     retryable: ScopeModuleARetryable;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
 /** scope: end */

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

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

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

@@ -4,15 +4,15 @@ export * from '../bean/hmr.metaRuntime.ts';
 
 import 'vona';
 declare module 'vona' {
-  
+
     export interface IHmrRecord {
       'a-runtime:metaRuntime': never;
     }
 
-  
+
 }
 declare module 'vona-module-a-runtime' {
-  
+
         export interface HmrMetaRuntime {
           /** @internal */
           get scope(): ScopeModuleARuntime;
@@ -21,8 +21,7 @@ declare module 'vona-module-a-runtime' {
           export interface HmrMetaRuntime {
             get $beanFullName(): 'a-runtime.hmr.metaRuntime';
             get $onionName(): 'a-runtime:metaRuntime';
-            
-          } 
+          }
 }
 /** hmr: end */
 /** startup: begin */
@@ -30,15 +29,15 @@ export * from '../bean/startup.runtime.ts';
 
 import { type IDecoratorStartupOptions } from 'vona-module-a-startup';
 declare module 'vona-module-a-startup' {
-  
+
     export interface IStartupRecord {
       'a-runtime:runtime': IDecoratorStartupOptions;
     }
 
-  
+
 }
 declare module 'vona-module-a-runtime' {
-  
+
         export interface StartupRuntime {
           /** @internal */
           get scope(): ScopeModuleARuntime;
@@ -48,7 +47,7 @@ declare module 'vona-module-a-runtime' {
             get $beanFullName(): 'a-runtime.startup.runtime';
             get $onionName(): 'a-runtime:runtime';
             get $onionOptions(): IDecoratorStartupOptions;
-          } 
+          }
 }
 /** startup: end */
 /** scope: begin */
@@ -71,11 +70,11 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     runtime: ScopeModuleARuntime;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
 /** scope: end */

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

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

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

@@ -4,15 +4,15 @@ export * from '../service/schedule.ts';
 
 import 'vona-module-a-bean';
 declare module 'vona-module-a-bean' {
-  
+
     export interface IServiceRecord {
       'a-schedule:schedule': never;
     }
 
-  
+
 }
 declare module 'vona-module-a-schedule' {
-  
+
         export interface ServiceSchedule {
           /** @internal */
           get scope(): ScopeModuleASchedule;
@@ -21,8 +21,7 @@ declare module 'vona-module-a-schedule' {
           export interface ServiceSchedule {
             get $beanFullName(): 'a-schedule.service.schedule';
             get $onionName(): 'a-schedule:schedule';
-            
-          } 
+          }
 }
 /** service: end */
 /** service: begin */
@@ -45,15 +44,15 @@ export * from '../bean/hmr.schedule.ts';
 
 import 'vona';
 declare module 'vona' {
-  
+
     export interface IHmrRecord {
       'a-schedule:schedule': never;
     }
 
-  
+
 }
 declare module 'vona-module-a-schedule' {
-  
+
         export interface HmrSchedule {
           /** @internal */
           get scope(): ScopeModuleASchedule;
@@ -62,8 +61,7 @@ declare module 'vona-module-a-schedule' {
           export interface HmrSchedule {
             get $beanFullName(): 'a-schedule.hmr.schedule';
             get $onionName(): 'a-schedule:schedule';
-            
-          } 
+          }
 }
 /** hmr: end */
 /** meta: begin */
@@ -71,15 +69,15 @@ export * from '../bean/meta.redlock.ts';
 
 import 'vona-module-a-meta';
 declare module 'vona-module-a-meta' {
-  
+
     export interface IMetaRecord {
       'a-schedule:redlock': never;
     }
 
-  
+
 }
 declare module 'vona-module-a-schedule' {
-  
+
         export interface MetaRedlock {
           /** @internal */
           get scope(): ScopeModuleASchedule;
@@ -88,8 +86,7 @@ declare module 'vona-module-a-schedule' {
           export interface MetaRedlock {
             get $beanFullName(): 'a-schedule.meta.redlock';
             get $onionName(): 'a-schedule:redlock';
-            
-          } 
+          }
 }
 /** meta: end */
 /** meta redlock: begin */
@@ -100,15 +97,15 @@ export * from '../bean/queue.schedule.ts';
 
 import { type IDecoratorQueueOptions } from 'vona-module-a-queue';
 declare module 'vona-module-a-queue' {
-  
+
     export interface IQueueRecord {
       'a-schedule:schedule': IDecoratorQueueOptions;
     }
 
-  
+
 }
 declare module 'vona-module-a-schedule' {
-  
+
         export interface QueueSchedule {
           /** @internal */
           get scope(): ScopeModuleASchedule;
@@ -118,7 +115,7 @@ declare module 'vona-module-a-schedule' {
             get $beanFullName(): 'a-schedule.queue.schedule';
             get $onionName(): 'a-schedule:schedule';
             get $onionOptions(): IDecoratorQueueOptions;
-          } 
+          }
 }
 /** queue: end */
 /** queue: begin */
@@ -132,15 +129,15 @@ export * from '../bean/startup.loadSchedules.ts';
 
 import { type IDecoratorStartupOptions } from 'vona-module-a-startup';
 declare module 'vona-module-a-startup' {
-  
+
     export interface IStartupRecord {
       'a-schedule:loadSchedules': IDecoratorStartupOptions;
     }
 
-  
+
 }
 declare module 'vona-module-a-schedule' {
-  
+
         export interface StartupLoadSchedules {
           /** @internal */
           get scope(): ScopeModuleASchedule;
@@ -150,7 +147,7 @@ declare module 'vona-module-a-schedule' {
             get $beanFullName(): 'a-schedule.startup.loadSchedules';
             get $onionName(): 'a-schedule:loadSchedules';
             get $onionOptions(): IDecoratorStartupOptions;
-          } 
+          }
 }
 /** startup: end */
 /** config: begin */
@@ -181,13 +178,13 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     schedule: ScopeModuleASchedule;
   }
-  
+
   export interface IBeanScopeConfig {
     'a-schedule': ReturnType<typeof config>;
   }
 
-  
 
-  
+
+
 }
 /** scope: end */

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

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

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

@@ -6,16 +6,16 @@ import type { IMiddlewareSystemOptionsCors } from '../bean/middlewareSystem.cors
 import type { IMiddlewareSystemOptionsSecurities } from '../bean/middlewareSystem.securities.ts';
 import 'vona-module-a-aspect';
 declare module 'vona-module-a-aspect' {
-  
+
     export interface IMiddlewareSystemRecord {
       'a-security:cors': IMiddlewareSystemOptionsCors;
 'a-security:securities': IMiddlewareSystemOptionsSecurities;
     }
 
-  
+
 }
 declare module 'vona-module-a-security' {
-  
+
         export interface MiddlewareSystemCors {
           /** @internal */
           get scope(): ScopeModuleASecurity;
@@ -36,7 +36,7 @@ declare module 'vona-module-a-security' {
             get $beanFullName(): 'a-security.middlewareSystem.securities';
             get $onionName(): 'a-security:securities';
             get $onionOptions(): IMiddlewareSystemOptionsSecurities;
-          } 
+          }
 }
 /** middlewareSystem: end */
 /** bean: begin */
@@ -44,15 +44,15 @@ export * from '../bean/bean.security.ts';
 
 import 'vona';
 declare module 'vona' {
-  
-  
+
+
 }
 declare module 'vona-module-a-security' {
-  
+
         export interface BeanSecurity {
           /** @internal */
           get scope(): ScopeModuleASecurity;
-        } 
+        }
 }
 /** bean: end */
 /** bean: begin */
@@ -84,11 +84,11 @@ declare module 'vona' {
   export interface IBeanScopeContainer {
     security: ScopeModuleASecurity;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
 /** scope: end */

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

@@ -29,6 +29,13 @@ export class BeanSecurity extends BeanBase {
     }
 
     if (parsedUrl.host === hostCurrent) return true;
+    if (
+      (this.app.meta.isDev || this.app.meta.isTest) &&
+      this._isLocalhostOrigin(parsedUrl.origin) &&
+      this._isLocalhostHost(hostCurrent)
+    ) {
+      return true;
+    }
 
     // whiteList
     // todo: combine app config
@@ -45,6 +52,77 @@ export class BeanSecurity extends BeanBase {
     }
     return false;
   }
+
+  checkOriginExact(origin: string | undefined | null, hostCurrent?: string): string {
+    const originNormalized = this._normalizeOrigin(origin);
+    if (!originNormalized) return '';
+
+    if (originNormalized === this._normalizeOriginFromHost(hostCurrent, this.ctx.protocol)) {
+      return originNormalized;
+    }
+
+    if (
+      (this.app.meta.isDev || this.app.meta.isTest) &&
+      this._isLocalhostOrigin(originNormalized) &&
+      this._isLocalhostHost(hostCurrent)
+    ) {
+      return originNormalized;
+    }
+
+    const onionCors = this.bean.onion.middlewareSystem.getOnionSlice('a-security:cors');
+    let whiteListCors = (<IMiddlewareSystemOptionsCors>onionCors.beanOptions.options).whiteList;
+    if (whiteListCors && whiteListCors !== '*') {
+      if (typeof whiteListCors === 'string') {
+        whiteListCors = whiteListCors.split(',');
+      }
+      for (const item of whiteListCors) {
+        if (this._normalizeOrigin(item.trim()) === originNormalized) return originNormalized;
+      }
+    }
+
+    return '';
+  }
+
+  private _isLocalhostOrigin(origin: string): boolean {
+    try {
+      const hostname = new URL(origin).hostname.replace(/^\[|\]$/g, '');
+      return hostname === 'localhost' || hostname === '127.0.0.1' || hostname === '::1';
+    } catch {
+      return false;
+    }
+  }
+
+  private _isLocalhostHost(hostCurrent: string | undefined): boolean {
+    const origin = this._normalizeOriginFromHost(hostCurrent, 'http');
+    return !!origin && this._isLocalhostOrigin(origin);
+  }
+
+  private _normalizeOriginFromHost(host: string | undefined, protocol: string): string | undefined {
+    if (!host || (protocol !== 'http' && protocol !== 'https')) return;
+    return this._normalizeOrigin(`${protocol}://${host}`);
+  }
+
+  private _normalizeOrigin(origin: string | undefined | null): string | undefined {
+    if (!origin || origin === 'null') return;
+    let url: URL;
+    try {
+      url = new URL(origin);
+    } catch {
+      return;
+    }
+    if (
+      (url.protocol !== 'http:' && url.protocol !== 'https:') ||
+      url.username ||
+      url.password ||
+      url.pathname !== '/' ||
+      url.search ||
+      url.hash ||
+      url.origin === 'null'
+    ) {
+      return;
+    }
+    return url.origin;
+  }
 }
 
 // getWhiteListCors(ctx) {

package/vona/src/suite-vendor/a-vona/modules/a-security/src/bean/middlewareSystem.cors.ts

@@ -5,9 +5,11 @@ import type {
 } from 'vona-module-a-aspect';
 
 import koaCors from '@koa/cors';
-import { BeanBase } from 'vona';
+import { BeanBase, useApp } from 'vona';
 import { MiddlewareSystem } from 'vona-module-a-aspect';
 
+const app = useApp();
+
 export interface IMiddlewareSystemOptionsCors extends IDecoratorMiddlewareSystemOptions {
   whiteList: string | string[];
   origin: Function;
@@ -23,7 +25,7 @@ export interface IMiddlewareSystemOptionsCors extends IDecoratorMiddlewareSystem
 
 @MiddlewareSystem<IMiddlewareSystemOptionsCors>({
   dependencies: 'a-instance:instance',
-  whiteList: '*',
+  whiteList: app.meta.env.CORS_WHITE_LIST || [],
   origin: _corsOrigin,
   allowMethods: 'GET,HEAD,PUT,POST,DELETE,PATCH',
   exposeHeaders: '',

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

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

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

@@ -0,0 +1,7 @@
+declare module 'vona' {
+  export interface VonaConfigEnv {
+    CORS_WHITE_LIST: string | undefined;
+  }
+}
+
+export {};