vona-module-a-captcha 5.1.4 → 5.1.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/.metadata/index.d.ts +25 -25
- package/dist/.metadata/index.d.ts.map +1 -1
- package/dist/.metadata/locales.d.ts.map +1 -1
- package/dist/bean/bean.captcha.d.ts.map +1 -1
- package/dist/bean/cacheRedis.captcha.d.ts.map +1 -1
- package/dist/controller/captcha.d.ts.map +1 -1
- package/dist/index.js +19 -19
- package/dist/index.js.map +1 -1
- package/dist/lib/captchaProvider.d.ts.map +1 -1
- package/dist/types/captchaProvider.d.ts.map +1 -1
- package/dist/types/captchaScene.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/.metadata/index.ts +39 -39
- package/src/.metadata/locales.ts +6 -1
- package/src/bean/bean.captcha.ts +50 -15
- package/src/bean/cacheRedis.captcha.ts +4 -1
- package/src/controller/captcha.ts +4 -1
- package/src/lib/captchaProvider.ts +3 -1
- package/src/types/captchaProvider.ts +5 -1
- package/src/types/captchaScene.ts +10 -3
|
@@ -62,6 +62,31 @@ export interface IModuleCacheRedis {
|
|
|
62
62
|
'captcha': CacheRedisCaptcha;
|
|
63
63
|
}
|
|
64
64
|
/** cacheRedis: end */
|
|
65
|
+
/** hmr: begin */
|
|
66
|
+
export * from '../bean/hmr.captchaProvider.ts';
|
|
67
|
+
export * from '../bean/hmr.captchaScene.ts';
|
|
68
|
+
import 'vona';
|
|
69
|
+
declare module 'vona' {
|
|
70
|
+
interface IHmrRecord {
|
|
71
|
+
'a-captcha:captchaProvider': never;
|
|
72
|
+
'a-captcha:captchaScene': never;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
declare module 'vona-module-a-captcha' {
|
|
76
|
+
interface HmrCaptchaProvider {
|
|
77
|
+
}
|
|
78
|
+
interface HmrCaptchaProvider {
|
|
79
|
+
get $beanFullName(): 'a-captcha.hmr.captchaProvider';
|
|
80
|
+
get $onionName(): 'a-captcha:captchaProvider';
|
|
81
|
+
}
|
|
82
|
+
interface HmrCaptchaScene {
|
|
83
|
+
}
|
|
84
|
+
interface HmrCaptchaScene {
|
|
85
|
+
get $beanFullName(): 'a-captcha.hmr.captchaScene';
|
|
86
|
+
get $onionName(): 'a-captcha:captchaScene';
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
/** hmr: end */
|
|
65
90
|
/** dto: begin */
|
|
66
91
|
export * from '../dto/captchaData.ts';
|
|
67
92
|
export * from '../dto/captchaVerify.ts';
|
|
@@ -123,31 +148,6 @@ declare module 'vona-module-a-web' {
|
|
|
123
148
|
}
|
|
124
149
|
}
|
|
125
150
|
/** controller: end */
|
|
126
|
-
/** hmr: begin */
|
|
127
|
-
export * from '../bean/hmr.captchaProvider.ts';
|
|
128
|
-
export * from '../bean/hmr.captchaScene.ts';
|
|
129
|
-
import 'vona';
|
|
130
|
-
declare module 'vona' {
|
|
131
|
-
interface IHmrRecord {
|
|
132
|
-
'a-captcha:captchaProvider': never;
|
|
133
|
-
'a-captcha:captchaScene': never;
|
|
134
|
-
}
|
|
135
|
-
}
|
|
136
|
-
declare module 'vona-module-a-captcha' {
|
|
137
|
-
interface HmrCaptchaProvider {
|
|
138
|
-
}
|
|
139
|
-
interface HmrCaptchaProvider {
|
|
140
|
-
get $beanFullName(): 'a-captcha.hmr.captchaProvider';
|
|
141
|
-
get $onionName(): 'a-captcha:captchaProvider';
|
|
142
|
-
}
|
|
143
|
-
interface HmrCaptchaScene {
|
|
144
|
-
}
|
|
145
|
-
interface HmrCaptchaScene {
|
|
146
|
-
get $beanFullName(): 'a-captcha.hmr.captchaScene';
|
|
147
|
-
get $onionName(): 'a-captcha:captchaScene';
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
/** hmr: end */
|
|
151
151
|
/** config: begin */
|
|
152
152
|
export * from '../config/config.ts';
|
|
153
153
|
import type { config } from '../config/config.ts';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/.metadata/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/.metadata/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"locales.d.ts","sourceRoot":"","sources":["../../src/.metadata/locales.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"locales.d.ts","sourceRoot":"","sources":["../../src/.metadata/locales.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC;AAO3C,eAAO,MAAM,OAAO;;;;;;;CAGnB,CAAC;AAEF,wBAAgB,OAAO,CAAC,CAAC,SAAS,MAAM,CAAC,OAAO,OAAO,CAAC,CAAC,cAAc,CAAC,EACtE,GAAG,EAAE,CAAC,EACN,GAAG,IAAI,EAAE,GAAG,EAAE,GACb,GAAG,CAEL"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bean.captcha.d.ts","sourceRoot":"","sources":["../../src/bean/bean.captcha.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAiD,MAAM,MAAM,CAAC;AAG/E,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE3E,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"bean.captcha.d.ts","sourceRoot":"","sources":["../../src/bean/bean.captcha.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAiD,MAAM,MAAM,CAAC;AAG/E,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE3E,OAAO,KAAK,EAGV,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAIlC,qBACa,WAAY,SAAQ,QAAQ;IACjC,MAAM,CAAC,SAAS,EAAE,MAAM,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC;IA8BnE,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,mBAAmB;IA8BxD,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC;YAUlF,YAAY;IAoCpB,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC;IA4BpE,cAAc,CAAC,EAAE,EAAE,MAAM;IAIzB,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAYnD,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,mBAAmB;YASb,gBAAgB;IAe9B,OAAO,CAAC,aAAa;IAarB,OAAO,CAAC,iBAAiB;CAa1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cacheRedis.captcha.d.ts","sourceRoot":"","sources":["../../src/bean/cacheRedis.captcha.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAc,MAAM,qBAAqB,CAAC;AAErE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC;AAC3C,MAAM,MAAM,sBAAsB,GAAG,iBAAiB,CAAC;AAEvD,qBACa,iBAAkB,SAAQ,kBAAkB,
|
|
1
|
+
{"version":3,"file":"cacheRedis.captcha.d.ts","sourceRoot":"","sources":["../../src/bean/cacheRedis.captcha.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAc,MAAM,qBAAqB,CAAC;AAErE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC;AAC3C,MAAM,MAAM,sBAAsB,GAAG,iBAAiB,CAAC;AAEvD,qBACa,iBAAkB,SAAQ,kBAAkB,CACvD,qBAAqB,EACrB,sBAAsB,CACvB;CAAG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../src/controller/captcha.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAQhC,MAAM,WAAW,yBAA0B,SAAQ,2BAA2B;CAAG;AAEjF,qBACa,iBAAkB,SAAQ,QAAQ;IAIvC,MAAM,CAAoB,KAAK,EAAE,MAAM;IAOvC,OAAO,CAAiB,EAAE,EAAE,MAAM,EAAqB,KAAK,EAAE,MAAM;IAOpE,eAAe,
|
|
1
|
+
{"version":3,"file":"captcha.d.ts","sourceRoot":"","sources":["../../src/controller/captcha.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAErE,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAQhC,MAAM,WAAW,yBAA0B,SAAQ,2BAA2B;CAAG;AAEjF,qBACa,iBAAkB,SAAQ,QAAQ;IAIvC,MAAM,CAAoB,KAAK,EAAE,MAAM;IAOvC,OAAO,CAAiB,EAAE,EAAE,MAAM,EAAqB,KAAK,EAAE,MAAM;IAOpE,eAAe,CACH,EAAE,EAAE,MAAM,EACP,KAAK,EAAE,OAAO,GAChC,OAAO,CAAC,MAAM,CAAC;CAKnB"}
|
package/dist/index.js
CHANGED
|
@@ -4,11 +4,11 @@ import { zodCustomError, getRandomInt } from '@cabloy/utils';
|
|
|
4
4
|
import { Interceptor } from 'vona-module-a-aspect';
|
|
5
5
|
import { Bean, Scope } from 'vona-module-a-bean';
|
|
6
6
|
import { CacheRedis, BeanCacheRedisBase } from 'vona-module-a-cache';
|
|
7
|
+
import { Hmr } from 'vona-module-a-hmrbase';
|
|
7
8
|
import { Api, v } from 'vona-module-a-openapiutils';
|
|
8
9
|
import { Dto, Web, Arg, Controller } from 'vona-module-a-web';
|
|
9
10
|
import z from 'zod';
|
|
10
11
|
import { Passport } from 'vona-module-a-user';
|
|
11
|
-
import { Hmr } from 'vona-module-a-hmrbase';
|
|
12
12
|
|
|
13
13
|
let InterceptorCaptchaVerify = class InterceptorCaptchaVerify extends BeanBase {
|
|
14
14
|
async execute(options, next) {
|
|
@@ -257,6 +257,24 @@ CacheRedisCaptcha = __decorate([CacheRedis({
|
|
|
257
257
|
module: "a-captcha"
|
|
258
258
|
})], CacheRedisCaptcha);
|
|
259
259
|
|
|
260
|
+
let HmrCaptchaProvider = class HmrCaptchaProvider extends BeanBase {
|
|
261
|
+
async reload(_beanOptions) {
|
|
262
|
+
clearAllCacheSceneProviders(this.app);
|
|
263
|
+
}
|
|
264
|
+
};
|
|
265
|
+
HmrCaptchaProvider = __decorate([Hmr(), BeanInfo({
|
|
266
|
+
module: "a-captcha"
|
|
267
|
+
})], HmrCaptchaProvider);
|
|
268
|
+
|
|
269
|
+
let HmrCaptchaScene = class HmrCaptchaScene extends BeanBase {
|
|
270
|
+
async reload(_beanOptions) {
|
|
271
|
+
clearAllCacheSceneProviders(this.app);
|
|
272
|
+
}
|
|
273
|
+
};
|
|
274
|
+
HmrCaptchaScene = __decorate([Hmr(), BeanInfo({
|
|
275
|
+
module: "a-captcha"
|
|
276
|
+
})], HmrCaptchaScene);
|
|
277
|
+
|
|
260
278
|
let DtoCaptchaData = class DtoCaptchaData {
|
|
261
279
|
constructor() {
|
|
262
280
|
this.id = void 0;
|
|
@@ -305,24 +323,6 @@ ControllerCaptcha = __decorate([Controller('captcha'), BeanInfo({
|
|
|
305
323
|
module: "a-captcha"
|
|
306
324
|
})], ControllerCaptcha);
|
|
307
325
|
|
|
308
|
-
let HmrCaptchaProvider = class HmrCaptchaProvider extends BeanBase {
|
|
309
|
-
async reload(_beanOptions) {
|
|
310
|
-
clearAllCacheSceneProviders(this.app);
|
|
311
|
-
}
|
|
312
|
-
};
|
|
313
|
-
HmrCaptchaProvider = __decorate([Hmr(), BeanInfo({
|
|
314
|
-
module: "a-captcha"
|
|
315
|
-
})], HmrCaptchaProvider);
|
|
316
|
-
|
|
317
|
-
let HmrCaptchaScene = class HmrCaptchaScene extends BeanBase {
|
|
318
|
-
async reload(_beanOptions) {
|
|
319
|
-
clearAllCacheSceneProviders(this.app);
|
|
320
|
-
}
|
|
321
|
-
};
|
|
322
|
-
HmrCaptchaScene = __decorate([Hmr(), BeanInfo({
|
|
323
|
-
module: "a-captcha"
|
|
324
|
-
})], HmrCaptchaScene);
|
|
325
|
-
|
|
326
326
|
function config(app) {
|
|
327
327
|
const showToken = !app.meta.isProd;
|
|
328
328
|
return {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../src/bean/interceptor.captchaVerify.ts","../src/lib/const.ts","../src/bean/bean.captcha.ts","../src/bean/cacheRedis.captcha.ts","../src/dto/captchaData.ts","../src/dto/captchaVerify.ts","../src/controller/captcha.ts","../src/bean/hmr.captchaProvider.ts","../src/bean/hmr.captchaScene.ts","../src/config/config.ts","../src/.metadata/index.ts","../src/config/locale/en-us.ts","../src/config/locale/zh-cn.ts","../src/.metadata/locales.ts","../src/lib/captchaProvider.ts","../src/lib/captchaScene.ts"],"sourcesContent":[null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null],"names":["InterceptorCaptchaVerify","BeanBase","execute","options","next","sceneName","scene","Error","bodyField","captcha","ctx","request","body","verified","bean","verify","id","token","zodCustomError","scope","locale","CaptchaInvalid","__decorate","Interceptor","__z_BeanInfo","module","SymbolCacheSceneProviders","Symbol","clearAllCacheSceneProviders","app","meta","BeanCaptcha","create","provider","_resolveProvider","beanInstance","_getProviderInstance","name","uuidv4","captchaData","cacheRedis","set","ttl","config","captchaProvider","$loggerChild","debug","result","payload","showToken","refresh","getCaptchaData","throw","providerOptions","_getProviderOptions","_verifyInner","tokenSecondary","token2","del","undefined","verifyImmediate","ttlSecondary","get","updateCaptchaToken","providerName","beanFullName","beanFullNameFromOnionName","_getBean","providers","_getProviders","Object","keys","length","onionSlice","onion","captchaScene","getOnionSlice","onionOptions","beanOptions","resolver","resolverDefault","_prepareProviders","providersNew","_key","key","getOnionSliceEnabled","deepExtend","Bean","_ctx","index","getRandomInt","CacheRedisCaptcha","BeanCacheRedisBase","CacheRedis","disableTransactionCompensate","DtoCaptchaData","constructor","Api","field","prototype","z","string","v","optional","Dto","DtoCaptchaVerify","required","ControllerCaptcha","Web","post","Passport","public","__param","Arg","Controller","HmrCaptchaProvider","reload","_beanOptions","Hmr","HmrCaptchaScene","isProd","ScopeModuleACaptcha","BeanScopeBase","Scope","locales","locale_en_us","locale_zh_cn","$locale","args","$makeLocaleMagic","CaptchaProvider","createBeanDecorator","CaptchaScene"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../src/bean/interceptor.captchaVerify.ts","../src/lib/const.ts","../src/bean/bean.captcha.ts","../src/bean/cacheRedis.captcha.ts","../src/bean/hmr.captchaProvider.ts","../src/bean/hmr.captchaScene.ts","../src/dto/captchaData.ts","../src/dto/captchaVerify.ts","../src/controller/captcha.ts","../src/config/config.ts","../src/.metadata/index.ts","../src/config/locale/en-us.ts","../src/config/locale/zh-cn.ts","../src/.metadata/locales.ts","../src/lib/captchaProvider.ts","../src/lib/captchaScene.ts"],"sourcesContent":[null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null],"names":["InterceptorCaptchaVerify","BeanBase","execute","options","next","sceneName","scene","Error","bodyField","captcha","ctx","request","body","verified","bean","verify","id","token","zodCustomError","scope","locale","CaptchaInvalid","__decorate","Interceptor","__z_BeanInfo","module","SymbolCacheSceneProviders","Symbol","clearAllCacheSceneProviders","app","meta","BeanCaptcha","create","provider","_resolveProvider","beanInstance","_getProviderInstance","name","uuidv4","captchaData","cacheRedis","set","ttl","config","captchaProvider","$loggerChild","debug","result","payload","showToken","refresh","getCaptchaData","throw","providerOptions","_getProviderOptions","_verifyInner","tokenSecondary","token2","del","undefined","verifyImmediate","ttlSecondary","get","updateCaptchaToken","providerName","beanFullName","beanFullNameFromOnionName","_getBean","providers","_getProviders","Object","keys","length","onionSlice","onion","captchaScene","getOnionSlice","onionOptions","beanOptions","resolver","resolverDefault","_prepareProviders","providersNew","_key","key","getOnionSliceEnabled","deepExtend","Bean","_ctx","index","getRandomInt","CacheRedisCaptcha","BeanCacheRedisBase","CacheRedis","disableTransactionCompensate","HmrCaptchaProvider","reload","_beanOptions","Hmr","HmrCaptchaScene","DtoCaptchaData","constructor","Api","field","prototype","z","string","v","optional","Dto","DtoCaptchaVerify","required","ControllerCaptcha","Web","post","Passport","public","__param","Arg","Controller","isProd","ScopeModuleACaptcha","BeanScopeBase","Scope","locales","locale_en_us","locale_zh_cn","$locale","args","$makeLocaleMagic","CaptchaProvider","createBeanDecorator","CaptchaScene"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captchaProvider.d.ts","sourceRoot":"","sources":["../../src/lib/captchaProvider.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,6BAA6B,CAAC;AAEpF,wBAAgB,eAAe,CAAC,CAAC,SAAS,gCAAgC,
|
|
1
|
+
{"version":3,"file":"captchaProvider.d.ts","sourceRoot":"","sources":["../../src/lib/captchaProvider.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,6BAA6B,CAAC;AAEpF,wBAAgB,eAAe,CAAC,CAAC,SAAS,gCAAgC,EACxE,OAAO,CAAC,EAAE,CAAC,GACV,cAAc,CAEhB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captchaProvider.d.ts","sourceRoot":"","sources":["../../src/types/captchaProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAEtF,MAAM,WAAW,sBAAsB;CAAG;AAE1C,MAAM,WAAW,uBAAuB,CAAC,KAAK,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO;IACzE,MAAM,CAAC,OAAO,EAAE,gCAAgC,GAAG,OAAO,CAAC,oBAAoB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IACjG,MAAM,
|
|
1
|
+
{"version":3,"file":"captchaProvider.d.ts","sourceRoot":"","sources":["../../src/types/captchaProvider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AAEtF,MAAM,WAAW,sBAAsB;CAAG;AAE1C,MAAM,WAAW,uBAAuB,CAAC,KAAK,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO;IACzE,MAAM,CAAC,OAAO,EAAE,gCAAgC,GAAG,OAAO,CAAC,oBAAoB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IACjG,MAAM,CACJ,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,KAAK,EACjB,OAAO,EAAE,gCAAgC,GACxC,OAAO,CAAC,OAAO,CAAC,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB,CAAC,KAAK,GAAG,OAAO,EAAE,OAAO,GAAG,OAAO;IACtE,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,gCAAiC,SAAQ,4BAA4B;IACpF,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAiB,SAAS;QACxB,eAAe,EAAE,YAAY,CAAC,sBAAsB,CAAC,CAAC;KACvD;CACF;AAED,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAiB,YAAY;QAC3B,eAAe,EAAE,SAAS,CAAC,sBAAsB,CAAC,CAAC;KACpD;IAED,UAAiB,gBAAgB;QAC/B,eAAe,EAAE,KAAK,CAAC;KACxB;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captchaScene.d.ts","sourceRoot":"","sources":["../../src/types/captchaScene.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AAEvF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAEnE,MAAM,WAAW,mBAAmB;CAAG;AAEvC,MAAM,MAAM,6BAA6B,GAAG;KACzC,CAAC,IAAI,MAAM,sBAAsB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"captchaScene.d.ts","sourceRoot":"","sources":["../../src/types/captchaScene.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAC;AAEvF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAEnE,MAAM,WAAW,mBAAmB;CAAG;AAEvC,MAAM,MAAM,6BAA6B,GAAG;KACzC,CAAC,IAAI,MAAM,sBAAsB,CAAC,CAAC,EAChC,YAAY,CAAC,6BAA6B,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,GACtE,OAAO;CACZ,CAAC;AAEF,MAAM,WAAW,kCAAkC,CACjD,CAAC,SAAS,MAAM,sBAAsB,GAAG,MAAM,sBAAsB;IAErE,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC;CACpC;AAED,MAAM,MAAM,+BAA+B,GAAG,CAC5C,GAAG,EAAE,WAAW,EAChB,SAAS,EAAE,sBAAsB,KAC9B,OAAO,CAAC,MAAM,sBAAsB,CAAC,CAAC;AAE3C,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,EAAE,+BAA+B,CAAC;IAC3C,SAAS,EAAE,6BAA6B,CAAC;CAC1C;AAED,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAiB,SAAS;QACxB,YAAY,EAAE,YAAY,CAAC,mBAAmB,CAAC,CAAC;KACjD;CACF;AAED,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAiB,YAAY;QAC3B,YAAY,EAAE,SAAS,CAAC,mBAAmB,CAAC,CAAC;KAC9C;IAED,UAAiB,gBAAgB;QAC/B,YAAY,EAAE,KAAK,CAAC;KACrB;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "vona-module-a-captcha",
|
|
3
|
-
"version": "5.1.
|
|
3
|
+
"version": "5.1.6",
|
|
4
|
+
"gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
|
|
4
5
|
"description": "",
|
|
5
6
|
"keywords": [
|
|
6
7
|
"Vona Module"
|
|
@@ -39,7 +40,6 @@
|
|
|
39
40
|
}
|
|
40
41
|
}
|
|
41
42
|
},
|
|
42
|
-
"gitHead": "a79189b882c17af5911573896a781bbb0046d37d",
|
|
43
43
|
"scripts": {
|
|
44
44
|
"clean": "rimraf dist tsconfig.build.tsbuildinfo",
|
|
45
45
|
"tsc:publish": "npm run clean && vona :bin:buildModule --sourcemap && tsc -p tsconfig.build.json"
|
package/src/.metadata/index.ts
CHANGED
|
@@ -84,6 +84,45 @@ export interface IModuleCacheRedis {
|
|
|
84
84
|
'captcha': CacheRedisCaptcha;
|
|
85
85
|
}
|
|
86
86
|
/** cacheRedis: end */
|
|
87
|
+
/** hmr: begin */
|
|
88
|
+
export * from '../bean/hmr.captchaProvider.ts';
|
|
89
|
+
export * from '../bean/hmr.captchaScene.ts';
|
|
90
|
+
|
|
91
|
+
import 'vona';
|
|
92
|
+
declare module 'vona' {
|
|
93
|
+
|
|
94
|
+
export interface IHmrRecord {
|
|
95
|
+
'a-captcha:captchaProvider': never;
|
|
96
|
+
'a-captcha:captchaScene': never;
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
|
|
100
|
+
}
|
|
101
|
+
declare module 'vona-module-a-captcha' {
|
|
102
|
+
|
|
103
|
+
export interface HmrCaptchaProvider {
|
|
104
|
+
/** @internal */
|
|
105
|
+
get scope(): ScopeModuleACaptcha;
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
export interface HmrCaptchaProvider {
|
|
109
|
+
get $beanFullName(): 'a-captcha.hmr.captchaProvider';
|
|
110
|
+
get $onionName(): 'a-captcha:captchaProvider';
|
|
111
|
+
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
export interface HmrCaptchaScene {
|
|
115
|
+
/** @internal */
|
|
116
|
+
get scope(): ScopeModuleACaptcha;
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
export interface HmrCaptchaScene {
|
|
120
|
+
get $beanFullName(): 'a-captcha.hmr.captchaScene';
|
|
121
|
+
get $onionName(): 'a-captcha:captchaScene';
|
|
122
|
+
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
/** hmr: end */
|
|
87
126
|
/** dto: begin */
|
|
88
127
|
export * from '../dto/captchaData.ts';
|
|
89
128
|
export * from '../dto/captchaVerify.ts';
|
|
@@ -162,45 +201,6 @@ declare module 'vona-module-a-web' {
|
|
|
162
201
|
}
|
|
163
202
|
|
|
164
203
|
/** controller: end */
|
|
165
|
-
/** hmr: begin */
|
|
166
|
-
export * from '../bean/hmr.captchaProvider.ts';
|
|
167
|
-
export * from '../bean/hmr.captchaScene.ts';
|
|
168
|
-
|
|
169
|
-
import 'vona';
|
|
170
|
-
declare module 'vona' {
|
|
171
|
-
|
|
172
|
-
export interface IHmrRecord {
|
|
173
|
-
'a-captcha:captchaProvider': never;
|
|
174
|
-
'a-captcha:captchaScene': never;
|
|
175
|
-
}
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
}
|
|
179
|
-
declare module 'vona-module-a-captcha' {
|
|
180
|
-
|
|
181
|
-
export interface HmrCaptchaProvider {
|
|
182
|
-
/** @internal */
|
|
183
|
-
get scope(): ScopeModuleACaptcha;
|
|
184
|
-
}
|
|
185
|
-
|
|
186
|
-
export interface HmrCaptchaProvider {
|
|
187
|
-
get $beanFullName(): 'a-captcha.hmr.captchaProvider';
|
|
188
|
-
get $onionName(): 'a-captcha:captchaProvider';
|
|
189
|
-
|
|
190
|
-
}
|
|
191
|
-
|
|
192
|
-
export interface HmrCaptchaScene {
|
|
193
|
-
/** @internal */
|
|
194
|
-
get scope(): ScopeModuleACaptcha;
|
|
195
|
-
}
|
|
196
|
-
|
|
197
|
-
export interface HmrCaptchaScene {
|
|
198
|
-
get $beanFullName(): 'a-captcha.hmr.captchaScene';
|
|
199
|
-
get $onionName(): 'a-captcha:captchaScene';
|
|
200
|
-
|
|
201
|
-
}
|
|
202
|
-
}
|
|
203
|
-
/** hmr: end */
|
|
204
204
|
/** config: begin */
|
|
205
205
|
export * from '../config/config.ts';
|
|
206
206
|
import type { config } from '../config/config.ts';
|
package/src/.metadata/locales.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import type { TypeLocaleBase } from 'vona';
|
|
2
|
+
|
|
2
3
|
import { $makeLocaleMagic } from 'vona';
|
|
4
|
+
|
|
3
5
|
import locale_en_us from '../config/locale/en-us.ts';
|
|
4
6
|
import locale_zh_cn from '../config/locale/zh-cn.ts';
|
|
5
7
|
|
|
@@ -8,6 +10,9 @@ export const locales = {
|
|
|
8
10
|
'zh-cn': locale_zh_cn,
|
|
9
11
|
};
|
|
10
12
|
|
|
11
|
-
export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(
|
|
13
|
+
export function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(
|
|
14
|
+
key: K,
|
|
15
|
+
...args: any[]
|
|
16
|
+
): any {
|
|
12
17
|
return $makeLocaleMagic(`a-captcha::${key}`, ...args);
|
|
13
18
|
}
|
package/src/bean/bean.captcha.ts
CHANGED
|
@@ -6,7 +6,11 @@ import { Bean } from 'vona-module-a-bean';
|
|
|
6
6
|
|
|
7
7
|
import type { ICaptchaData, ICaptchaDataCache } from '../types/captcha.ts';
|
|
8
8
|
import type { ICaptchaProviderExecute, ICaptchaProviderRecord } from '../types/captchaProvider.ts';
|
|
9
|
-
import type {
|
|
9
|
+
import type {
|
|
10
|
+
ICaptchaSceneOptionsProviders,
|
|
11
|
+
ICaptchaSceneOptionsResolverResult,
|
|
12
|
+
ICaptchaSceneRecord,
|
|
13
|
+
} from '../types/captchaScene.ts';
|
|
10
14
|
|
|
11
15
|
import { SymbolCacheSceneProviders } from '../lib/const.ts';
|
|
12
16
|
|
|
@@ -21,10 +25,19 @@ export class BeanCaptcha extends BeanBase {
|
|
|
21
25
|
const captcha = await beanInstance.create(provider.options);
|
|
22
26
|
// data
|
|
23
27
|
const id = uuidv4();
|
|
24
|
-
const captchaData: ICaptchaDataCache = {
|
|
28
|
+
const captchaData: ICaptchaDataCache = {
|
|
29
|
+
scene: sceneName,
|
|
30
|
+
provider: provider.name,
|
|
31
|
+
token: captcha.token,
|
|
32
|
+
};
|
|
25
33
|
// cache
|
|
26
|
-
await this.scope.cacheRedis.captcha.set(captchaData, id, {
|
|
27
|
-
|
|
34
|
+
await this.scope.cacheRedis.captcha.set(captchaData, id, {
|
|
35
|
+
ttl: provider.options.ttl ?? this.scope.config.captchaProvider.ttl,
|
|
36
|
+
});
|
|
37
|
+
this.$loggerChild('captcha').debug(
|
|
38
|
+
() =>
|
|
39
|
+
`captcha.create: id:${id}, sceneName:${sceneName}, provider:${provider.name}, token:${captcha.token}`,
|
|
40
|
+
);
|
|
28
41
|
// result
|
|
29
42
|
const result: ICaptchaData = { id, provider: provider.name, payload: captcha.payload };
|
|
30
43
|
if (this.scope.config.captcha.showToken) {
|
|
@@ -48,9 +61,12 @@ export class BeanCaptcha extends BeanBase {
|
|
|
48
61
|
// data
|
|
49
62
|
captchaData = { scene: sceneName, provider: captchaData.provider, token: captcha.token };
|
|
50
63
|
// cache
|
|
51
|
-
await this.scope.cacheRedis.captcha.set(captchaData, id, {
|
|
64
|
+
await this.scope.cacheRedis.captcha.set(captchaData, id, {
|
|
65
|
+
ttl: providerOptions.ttl ?? this.scope.config.captchaProvider.ttl,
|
|
66
|
+
});
|
|
52
67
|
this.$loggerChild('captcha').debug(
|
|
53
|
-
() =>
|
|
68
|
+
() =>
|
|
69
|
+
`captcha.refresh: id:${id}, sceneName:${sceneName}, provider:${captchaData.provider}, token:${captcha.token}`,
|
|
54
70
|
);
|
|
55
71
|
// result
|
|
56
72
|
const result: ICaptchaData = { id, provider: captchaData.provider, payload: captcha.payload };
|
|
@@ -64,7 +80,8 @@ export class BeanCaptcha extends BeanBase {
|
|
|
64
80
|
const captchaData = await this.getCaptchaData(id);
|
|
65
81
|
const verified = await this._verifyInner(captchaData, id, token, sceneName);
|
|
66
82
|
this.$loggerChild('captcha').debug(
|
|
67
|
-
() =>
|
|
83
|
+
() =>
|
|
84
|
+
`captcha.verify: id:${id}, sceneName:${sceneName}, provider:${captchaData?.provider}, token:${token}, tokenWanted:${captchaData?.token}`,
|
|
68
85
|
);
|
|
69
86
|
return verified;
|
|
70
87
|
}
|
|
@@ -94,7 +111,9 @@ export class BeanCaptcha extends BeanBase {
|
|
|
94
111
|
if (!verified) {
|
|
95
112
|
// update token. not delete cache for refresh
|
|
96
113
|
captchaData = { ...captchaData, token: undefined };
|
|
97
|
-
await this.scope.cacheRedis.captcha.set(captchaData, id, {
|
|
114
|
+
await this.scope.cacheRedis.captcha.set(captchaData, id, {
|
|
115
|
+
ttl: providerOptions.ttl ?? this.scope.config.captchaProvider.ttl,
|
|
116
|
+
});
|
|
98
117
|
return false;
|
|
99
118
|
}
|
|
100
119
|
// delete cache
|
|
@@ -115,14 +134,18 @@ export class BeanCaptcha extends BeanBase {
|
|
|
115
134
|
if (!verified) {
|
|
116
135
|
// update token. not delete cache for refresh
|
|
117
136
|
captchaData = { ...captchaData, token: undefined };
|
|
118
|
-
await this.scope.cacheRedis.captcha.set(captchaData, id, {
|
|
137
|
+
await this.scope.cacheRedis.captcha.set(captchaData, id, {
|
|
138
|
+
ttl: providerOptions.ttl ?? this.scope.config.captchaProvider.ttl,
|
|
139
|
+
});
|
|
119
140
|
return false;
|
|
120
141
|
}
|
|
121
142
|
// tokenSecondary
|
|
122
143
|
const tokenSecondary = uuidv4();
|
|
123
144
|
captchaData = { ...captchaData, token: undefined, token2: tokenSecondary };
|
|
124
145
|
// update cache
|
|
125
|
-
await this.scope.cacheRedis.captcha.set(captchaData, id, {
|
|
146
|
+
await this.scope.cacheRedis.captcha.set(captchaData, id, {
|
|
147
|
+
ttl: providerOptions.ttlSecondary ?? this.scope.config.captchaProvider.ttlSecondary,
|
|
148
|
+
});
|
|
126
149
|
// ok
|
|
127
150
|
return tokenSecondary;
|
|
128
151
|
}
|
|
@@ -138,7 +161,9 @@ export class BeanCaptcha extends BeanBase {
|
|
|
138
161
|
const providerOptions = this._getProviderOptions(captchaData.scene, captchaData.provider)!;
|
|
139
162
|
// update cache
|
|
140
163
|
captchaData = { ...captchaData, token };
|
|
141
|
-
await this.scope.cacheRedis.captcha.set(captchaData, id, {
|
|
164
|
+
await this.scope.cacheRedis.captcha.set(captchaData, id, {
|
|
165
|
+
ttl: providerOptions.ttl ?? this.scope.config.captchaProvider.ttl,
|
|
166
|
+
});
|
|
142
167
|
}
|
|
143
168
|
|
|
144
169
|
private _getProviderInstance(providerName: keyof ICaptchaProviderRecord) {
|
|
@@ -146,13 +171,18 @@ export class BeanCaptcha extends BeanBase {
|
|
|
146
171
|
return this.bean._getBean(beanFullName) as unknown as ICaptchaProviderExecute;
|
|
147
172
|
}
|
|
148
173
|
|
|
149
|
-
private _getProviderOptions(
|
|
174
|
+
private _getProviderOptions(
|
|
175
|
+
sceneName: keyof ICaptchaSceneRecord,
|
|
176
|
+
providerName: keyof ICaptchaProviderRecord,
|
|
177
|
+
) {
|
|
150
178
|
// providers
|
|
151
179
|
const providers = this._getProviders(sceneName);
|
|
152
180
|
return providers[providerName];
|
|
153
181
|
}
|
|
154
182
|
|
|
155
|
-
private async _resolveProvider(
|
|
183
|
+
private async _resolveProvider(
|
|
184
|
+
sceneName: keyof ICaptchaSceneRecord,
|
|
185
|
+
): Promise<ICaptchaSceneOptionsResolverResult | undefined> {
|
|
156
186
|
// providers
|
|
157
187
|
const providers = this._getProviders(sceneName);
|
|
158
188
|
if (Object.keys(providers).length === 0) return;
|
|
@@ -171,7 +201,9 @@ export class BeanCaptcha extends BeanBase {
|
|
|
171
201
|
const onionSlice = this.bean.onion.captchaScene.getOnionSlice(sceneName);
|
|
172
202
|
if (!onionSlice) throw new Error(`not found captcha scene: ${sceneName}`);
|
|
173
203
|
const onionOptions = onionSlice.beanOptions.options;
|
|
174
|
-
this.app.meta[SymbolCacheSceneProviders][sceneName] = this._prepareProviders(
|
|
204
|
+
this.app.meta[SymbolCacheSceneProviders][sceneName] = this._prepareProviders(
|
|
205
|
+
onionOptions?.providers,
|
|
206
|
+
);
|
|
175
207
|
}
|
|
176
208
|
return this.app.meta[SymbolCacheSceneProviders][sceneName];
|
|
177
209
|
}
|
|
@@ -191,7 +223,10 @@ export class BeanCaptcha extends BeanBase {
|
|
|
191
223
|
}
|
|
192
224
|
}
|
|
193
225
|
|
|
194
|
-
async function resolverDefault(
|
|
226
|
+
async function resolverDefault(
|
|
227
|
+
_ctx: VonaContext,
|
|
228
|
+
providers: ICaptchaProviderRecord,
|
|
229
|
+
): Promise<keyof ICaptchaProviderRecord> {
|
|
195
230
|
const keys = Object.keys(providers);
|
|
196
231
|
const index = getRandomInt(keys.length, 0);
|
|
197
232
|
return keys[index] as keyof ICaptchaProviderRecord;
|
|
@@ -6,4 +6,7 @@ export type TCacheRedisCaptchaKey = string;
|
|
|
6
6
|
export type TCacheRedisCaptchaData = ICaptchaDataCache;
|
|
7
7
|
|
|
8
8
|
@CacheRedis({ disableTransactionCompensate: true })
|
|
9
|
-
export class CacheRedisCaptcha extends BeanCacheRedisBase<
|
|
9
|
+
export class CacheRedisCaptcha extends BeanCacheRedisBase<
|
|
10
|
+
TCacheRedisCaptchaKey,
|
|
11
|
+
TCacheRedisCaptchaData
|
|
12
|
+
> {}
|
|
@@ -29,7 +29,10 @@ export class ControllerCaptcha extends BeanBase {
|
|
|
29
29
|
@Web.post('verifyImmediate')
|
|
30
30
|
@Api.body(z.string())
|
|
31
31
|
@Passport.public()
|
|
32
|
-
async verifyImmediate(
|
|
32
|
+
async verifyImmediate(
|
|
33
|
+
@Arg.body('id') id: string,
|
|
34
|
+
@Arg.body('token') token: unknown,
|
|
35
|
+
): Promise<string> {
|
|
33
36
|
const verified = await this.bean.captcha.verifyImmediate(id, token);
|
|
34
37
|
if (!verified) this.app.throw(403);
|
|
35
38
|
return verified;
|
|
@@ -2,6 +2,8 @@ import { createBeanDecorator } from 'vona';
|
|
|
2
2
|
|
|
3
3
|
import type { IDecoratorCaptchaProviderOptions } from '../types/captchaProvider.ts';
|
|
4
4
|
|
|
5
|
-
export function CaptchaProvider<T extends IDecoratorCaptchaProviderOptions>(
|
|
5
|
+
export function CaptchaProvider<T extends IDecoratorCaptchaProviderOptions>(
|
|
6
|
+
options?: T,
|
|
7
|
+
): ClassDecorator {
|
|
6
8
|
return createBeanDecorator('captchaProvider', options);
|
|
7
9
|
}
|
|
@@ -5,7 +5,11 @@ export interface ICaptchaProviderRecord {}
|
|
|
5
5
|
|
|
6
6
|
export interface ICaptchaProviderExecute<TOKEN = unknown, PAYLOAD = unknown> {
|
|
7
7
|
create(options: IDecoratorCaptchaProviderOptions): Promise<ICaptchaProviderData<TOKEN, PAYLOAD>>;
|
|
8
|
-
verify(
|
|
8
|
+
verify(
|
|
9
|
+
token: TOKEN,
|
|
10
|
+
tokenInput: TOKEN,
|
|
11
|
+
options: IDecoratorCaptchaProviderOptions,
|
|
12
|
+
): Promise<boolean>;
|
|
9
13
|
}
|
|
10
14
|
|
|
11
15
|
export interface ICaptchaProviderData<TOKEN = unknown, PAYLOAD = unknown> {
|
|
@@ -6,15 +6,22 @@ import type { ICaptchaProviderRecord } from './captchaProvider.ts';
|
|
|
6
6
|
export interface ICaptchaSceneRecord {}
|
|
7
7
|
|
|
8
8
|
export type ICaptchaSceneOptionsProviders = {
|
|
9
|
-
[K in keyof ICaptchaProviderRecord]?:
|
|
9
|
+
[K in keyof ICaptchaProviderRecord]?:
|
|
10
|
+
| PowerPartial<TypeUseOnionOmitOptionsEnable<ICaptchaProviderRecord[K]>>
|
|
11
|
+
| boolean;
|
|
10
12
|
};
|
|
11
13
|
|
|
12
|
-
export interface ICaptchaSceneOptionsResolverResult<
|
|
14
|
+
export interface ICaptchaSceneOptionsResolverResult<
|
|
15
|
+
T extends keyof ICaptchaProviderRecord = keyof ICaptchaProviderRecord,
|
|
16
|
+
> {
|
|
13
17
|
name: T;
|
|
14
18
|
options: ICaptchaProviderRecord[T];
|
|
15
19
|
}
|
|
16
20
|
|
|
17
|
-
export type TypeCaptchaSceneOptionsResolver = (
|
|
21
|
+
export type TypeCaptchaSceneOptionsResolver = (
|
|
22
|
+
ctx: VonaContext,
|
|
23
|
+
providers: ICaptchaProviderRecord,
|
|
24
|
+
) => Promise<keyof ICaptchaProviderRecord>;
|
|
18
25
|
|
|
19
26
|
export interface IDecoratorCaptchaSceneOptions {
|
|
20
27
|
resolver?: TypeCaptchaSceneOptionsResolver;
|