@stigg/node-server-sdk 3.22.0 → 3.24.0
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/client.d.ts +1 -1
- package/dist/client.js +2 -2
- package/dist/clientInitialization.js +2 -2
- package/dist/models.d.ts +2 -0
- package/dist/models.js +1 -1
- package/dist/services/cache/cacheService.d.ts +2 -3
- package/dist/services/cache/inMemoryCacheService.d.ts +2 -2
- package/dist/services/cache/inMemoryCacheService.js +3 -3
- package/dist/services/cache/redisCacheService.d.ts +6 -5
- package/dist/services/cache/redisCacheService.js +25 -18
- package/dist/services/entitlementsService.d.ts +2 -4
- package/dist/services/entitlementsService.js +18 -10
- package/dist/services/inMemoryEntitlementsService.js +3 -4
- package/dist/services/redisEntitlementsService.d.ts +1 -1
- package/dist/services/redisEntitlementsService.js +6 -7
- package/dist/utils/decorators/ReuseOngoingExecution.d.ts +2 -0
- package/dist/utils/decorators/ReuseOngoingExecution.js +31 -0
- package/package.json +1 -1
package/dist/client.d.ts
CHANGED
|
@@ -172,7 +172,7 @@ export declare class Stigg implements StiggEntitlementAPI, StiggManagementAPI {
|
|
|
172
172
|
* @param email - optional customer email.
|
|
173
173
|
* @param name - optional customer name.
|
|
174
174
|
*/
|
|
175
|
-
importCustomer({ billingId, customerId, email, name, metadata }: ImportCustomer): Promise<Customer>;
|
|
175
|
+
importCustomer({ billingId, customerId, email, name, metadata, }: Omit<ImportCustomer, 'updatedAt'>): Promise<Customer>;
|
|
176
176
|
importSubscriptionBulk({ subscriptions }: ImportSubscriptionBulk): Promise<void>;
|
|
177
177
|
/**
|
|
178
178
|
* Create a Customer and its first subscription
|
package/dist/client.js
CHANGED
|
@@ -271,7 +271,7 @@ class Stigg {
|
|
|
271
271
|
* @param email - optional customer email.
|
|
272
272
|
* @param name - optional customer name.
|
|
273
273
|
*/
|
|
274
|
-
async importCustomer({ billingId, customerId, email, name, metadata }) {
|
|
274
|
+
async importCustomer({ billingId, customerId, email, name, metadata, }) {
|
|
275
275
|
return (0, apiErrorHandling_1.withErrorHandling)(async () => {
|
|
276
276
|
const refId = customerId || `customer-${(0, identifiers_1.generateRandomSlug)()}`;
|
|
277
277
|
const { data } = await this.managementApi.importCustomer({
|
|
@@ -853,4 +853,4 @@ class Stigg {
|
|
|
853
853
|
}
|
|
854
854
|
}
|
|
855
855
|
exports.Stigg = Stigg;
|
|
856
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":";;;AAAA,qCAgDkB;AAClB,qDAAkD;AAGlD,mDAA+F;AAC/F,4DAAyD;AACzD,wDAAgF;AAChF,+DAA6D;AAE7D,4DAAsD;AACtD,mCAAgD;AAChD,gEAOgD;AAChD,sFAAmF;AAEnF,iEAAoE;AACpE,mFAAgF;AAyDhF,IAAI,aAAa,GAAiB,IAAI,CAAC;AAEvC;;GAEG;AACH,MAAa,KAAK;IAIhB,YACmB,gBAAqD,EACrD,mBAAwC,EACxC,aAA4B,EAC5B,aAA4B,EAC5B,mBAAwC,EACxC,YAA+B;QAL/B,qBAAgB,GAAhB,gBAAgB,CAAqC;QACrD,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,kBAAa,GAAb,aAAa,CAAe;QAC5B,kBAAa,GAAb,aAAa,CAAe;QAC5B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,iBAAY,GAAZ,YAAY,CAAmB;QAEhD,IAAI,CAAC,WAAW,GAAG,IAAI,yBAAW,EAAE,CAAC;QACrC,IAAI,CAAC,0BAA0B,GAAG,IAAI,uDAA0B,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACtF,CAAC;IAED,KAAK,CAAC,qBAAqB;QACzB,OAAO,IAAI,CAAC,0BAA0B,CAAC,wBAAwB,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACrF,CAAC;IAED;;;;OAIG;IACH,WAAW,CAAuB,SAAY,EAAE,QAAmB;QACjE,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACrD,CAAC;IAED;;;;OAIG;IACH,cAAc,CAAuB,SAAY,EAAE,QAAmB;QACpE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,aAAkC;QAClD,MAAM,gBAAgB,GAAG,IAAA,gCAAgB,EAAC,aAAa,CAAC,CAAC;QACzD,MAAM,uBAAuB,GAAG,CAAC,IAAA,gBAAO,EAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACjE,MAAM,aAAa,GAAG,IAAI,6BAAa,CACrC,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,EACxC,gBAAgB,CAAC,gBAAgB,CAAC,QAAQ,CAC3C,CAAC;QAEF,+HAA+H;QAC/H,IAAI,aAAa,IAAI,aAAa,CAAC,gBAAgB,CAAC,MAAM,KAAK,gBAAgB,CAAC,MAAM,EAAE;YACtF,aAAa,CAAC,KAAK,CAAC;uGAC6E,CAAC,CAAC;YACnG,OAAO,aAAa,CAAC;SACtB;QAED,MAAM,UAAU,GAAG,IAAA,gCAAkB,GAAE,CAAC;QACxC,aAAa,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAExC,IAAA,qCAAqB,EAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QAEpD,aAAa,GAAG,IAAI,CAAC,uBAAuB,CAAC,gBAAgB,EAAE,aAAa,EAAE,uBAAuB,CAAC,CAAC;QAEvG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC;aAC9B,IAAI,CAAC,GAAG,EAAE,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,0BAA0B,CAAC,iBAAiB,EAAE,CAAC;aACzE,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,0BAA0B,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;QAEnF,IAAI,gBAAgB,CAAC,sBAAsB,EAAE;YAC3C,aAAa,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC;SAC1C;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAED;;;;OAIG;IACH,KAAK;QACH,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;QACnC,aAAa,GAAG,IAAI,CAAC;IACvB,CAAC;IAEO,MAAM,CAAC,uBAAuB,CACpC,gBAA+C,EAC/C,aAA4B,EAC5B,uBAAgC;QAEhC,MAAM,EAAE,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,mBAAmB,EAAE,GAAG,IAAA,iDAA0B,EAC1G,uBAAuB,EACvB,gBAAgB,EAChB,aAAa,CACd,CAAC;QAEF,OAAO,IAAI,KAAK,CACd,gBAAgB,EAChB,mBAAmB,EACnB,aAAa,EACb,aAAa,EACb,mBAAmB,EACnB,YAAY,CACb,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,KAAY;;QAC7C,IAAI;YACF,MAAM,iBAAiB,GAAG,MAAM,KAAK,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,CAAC;YAChF,MAAM,SAAS,GAAG,MAAA,iBAAiB,CAAC,IAAI,0CAAE,gBAAgB,CAAC;YAC3D,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,SAAS,EAAE;gBACxB,KAAK,IAAA,0BAAU,EAAC,SAAS,CAAC,SAAS,CAAC,CAAC;aACtC;SACF;QAAC,OAAO,KAAU,EAAE;YACnB,IACE,CAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,MAAM,MAAK,GAAG;gBAC9B,CAAC,KAAK,CAAC,aAAa,IAAI,CAAA,MAAA,MAAA,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,0CAAE,UAAU,0CAAE,IAAI,MAAK,eAAS,CAAC,eAAe,CAAC,EAC/F;gBACA,MAAM,YAAY,GAAG,mDAAmD,CAAC;gBACzE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gBACxC,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;aAC/B;iBAAM;gBACL,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,qCAAqC,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC7F,MAAM,KAAK,CAAC;aACb;SACF;IACH,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,qBAAqB,CAAC,EAC1B,UAAU,EACV,SAAS,EACT,UAAU,EACV,OAAO,GACe;;QACtB,MAAM,aAAa,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,MAAI,MAAA,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,0CAAG,SAAS,CAAC,CAAA,IAAI,EAAE,CAAC;QACzG,MAAM,mBAAmB,mCACpB,6CAAoC,GACpC,aAAa,CACjB,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,IAAA,oCAAiB,EACzC,GAAG,EAAE,CACH,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,UAAU,EAAE,SAAS,EAAE,mBAAmB,EAAE,UAAU,EAAE,OAAO,CAAC,EACjH,IAAI,CAAC,aAAa,EAClB;YACE,UAAU;YACV,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE;YAC3C,kBAAkB,EAAE,+DAA+D;YACnF,YAAY,EAAE,KAAK;SACpB,CACF,CAAC;QAEF,OAAO,WAAW,IAAI,mBAAmB,CAAC;IAC5C,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,qBAAqB,CAAC,EAC1B,UAAU,EACV,SAAS,EACT,UAAU,EACV,OAAO,GACe;;QACtB,MAAM,aAAa,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,MAAI,MAAA,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,0CAAG,SAAS,CAAC,CAAA,IAAI,EAAE,CAAC;QACzG,MAAM,mBAAmB,mCACpB,6CAAoC,GACpC,aAAa,CACjB,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,IAAA,oCAAiB,EACzC,GAAG,EAAE,CACH,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,UAAU,EAAE,SAAS,EAAE,mBAAmB,EAAE,UAAU,EAAE,OAAO,CAAC,EACjH,IAAI,CAAC,aAAa,EAClB;YACE,UAAU;YACV,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE;YAC3C,kBAAkB,EAAE,+DAA+D;YACnF,YAAY,EAAE,KAAK;SACpB,CACF,CAAC;QAEF,OAAO,WAAW,IAAI,mBAAmB,CAAC;IAC5C,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,qBAAqB,CAAC,EAC1B,UAAU,EACV,SAAS,EACT,UAAU,EACV,OAAO,GACe;;QACtB,MAAM,aAAa,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,MAAI,MAAA,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,0CAAG,SAAS,CAAC,CAAA,IAAI,EAAE,CAAC;QACzG,MAAM,mBAAmB,mCACpB,6CAAoC,GACpC,aAAa,CACjB,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,IAAA,oCAAiB,EACzC,GAAG,EAAE,CACH,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,UAAU,EAAE,SAAS,EAAE,mBAAmB,EAAE,UAAU,EAAE,OAAO,CAAC,EACjH,IAAI,CAAC,aAAa,EAClB;YACE,UAAU;YACV,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE;YAC3C,kBAAkB,EAAE,+DAA+D;YACnF,YAAY,EAAE,KAAK;SACpB,CACF,CAAC;QAEF,OAAO,WAAW,IAAI,mBAAmB,CAAC;IAC5C,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,eAAe,CAAC,UAAkB,EAAE,UAAmB;QAC3D,MAAM,YAAY,GAAG,MAAM,IAAA,oCAAiB,EAC1C,GAAG,EAAE;YACH,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBACjD,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACjD;YACD,OAAO,IAAI,CAAC,mBAAmB,CAAC,gCAAgC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAC3F,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,UAAU;YACV,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,kBAAkB,EAAE,qCAAqC;YACzD,YAAY,EAAE,KAAK;SACpB,CACF,CAAC;QAEF,OAAO,YAAY,IAAI,IAAA,uDAA0B,EAAC,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,CAAC;IAChG,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,WAAW,CAAC,MAAmC;QACnD,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,WAAW,GAAG,IAAA,gBAAO,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YACxD,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAC1D,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,MAAM,EAAE;YAC/B,kBAAkB,EAAE,8BAA8B;YAClD,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,WAAW,CAAC,EAChB,UAAU,EACV,UAAU,EACV,SAAS,EACT,KAAK,EACL,cAAc,EACd,SAAS,GACG;QACZ,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC;gBAC1D,SAAS;gBACT,UAAU;gBACV,UAAU;gBACV,KAAK;gBACL,cAAc;gBACd,SAAS;aACV,CAAC,CAAC;YAEH,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAE/C,OAAO,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC9D,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,UAAU;YACV,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;YACzC,kBAAkB,EAAE,wBAAwB;YAC5C,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,eAAe,CAAC,EAAE,MAAM,EAAmB;QAC/C,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC;gBAC9D,MAAM;aACP,CAAC,CAAC;YAEH,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAE/C,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;QACtF,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,kBAAkB,EAAE,6BAA6B;YACjD,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,EAAE,SAAS,EAAsB;QACxD,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC;gBAC1C,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,iCAClC,IAAA,aAAI,EAAC,QAAQ,EAAE,UAAU,CAAC,KAC7B,kBAAkB,EAAE,QAAQ,CAAC,QAAQ,IACrC,CAAC;aACJ,CAAC,CAAC;QACL,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,kBAAkB,EAAE,4BAA4B;YAChD,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAkB;QACnF,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,KAAK,GAAG,UAAU,IAAI,YAAY,IAAA,gCAAkB,GAAE,EAAE,CAAC;YAC/D,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;gBACvD,KAAK;gBACL,KAAK;gBACL,IAAI;gBACJ,SAAS;gBACT,kBAAkB,EAAE,QAAQ;aAC7B,CAAC,CAAC;YAEH,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAE/C,OAAO,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC/D,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,UAAU;YACV,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE;YAC/C,kBAAkB,EAAE,2BAA2B;YAC/C,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,EAAE,aAAa,EAA0B;QACpE,MAAM,IAAA,oCAAiB,EACrB,KAAK,IAAI,EAAE;YACT,MAAM,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC;gBAC9C,aAAa,EAAE,aAAa,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,iCAC9C,IAAA,aAAI,EAAC,YAAY,EAAE,UAAU,CAAC,KACjC,kBAAkB,EAAE,YAAY,CAAC,QAAQ,IACzC,CAAC;aACJ,CAAC,CAAC;QACL,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,kBAAkB,EAAE,qCAAqC;YACzD,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,iBAAiB,CAAC,EACtB,UAAU,EACV,KAAK,EACL,IAAI,EACJ,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,kBAAkB,EAClB,qBAAqB,EACrB,SAAS,GACS;QAClB,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,yBAAyB,GAAmD,kBAAkB;gBAClG,CAAC,iCACM,IAAA,aAAI,EAAC,kBAAkB,EAAE,cAAc,EAAE,UAAU,CAAC,KACvD,kBAAkB,EAAE,kBAAkB,CAAC,QAAQ,EAC/C,eAAe,EAAE,kBAAkB,CAAC,YAAY,IAEpD,CAAC,CAAC,SAAS,CAAC;YAEd,MAAM,KAAK,GAAG,UAAU,IAAI,YAAY,IAAA,gCAAkB,GAAE,EAAE,CAAC;YAC/D,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC;gBAC1D,KAAK;gBACL,SAAS;gBACT,KAAK;gBACL,IAAI;gBACJ,kBAAkB,EAAE,WAAW;gBAC/B,kBAAkB,EAAE,QAAQ;gBAC5B,WAAW,EAAE,QAAQ;gBACrB,kBAAkB,EAAE,yBAAyB;gBAC7C,qBAAqB;aACtB,CAAC,CAAC;YAEH,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAE/C,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC;gBAC7C,YAAY,EAAE,IAAI,CAAC,iBAAiB,CAAC,YAAY;gBACjD,UAAU,EAAE,KAAK;gBACjB,UAAU,EAAE,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,UAAU;aAC3C,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QACvD,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,UAAU;YACV,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,EAAE;YACzF,kBAAkB,EAAE,8BAA8B;YAClD,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,qBAAqB,CAAC,qBAA4C;QACtE,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,qBAAqB,CAAC,CAAC;YAEvF,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAE/C,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC;gBAC7C,YAAY,EAAE,IAAI,CAAC,qBAAqB,CAAC,YAAY;gBACrD,UAAU,EAAE,qBAAqB,CAAC,UAAU;gBAC5C,UAAU,EAAE,qBAAqB,CAAC,UAAU;aAC7C,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,WAAW,CAAC,gCAAgC,CAAC,IAAI,CAAC,CAAC;QACjE,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,qBAAqB,EAAE;YAC9C,kBAAkB,EAAE,kCAAkC;YACtD,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,iBAAiB,CAAC,iBAAoC;QAC1D,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;YAC/E,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACrE,OAAO,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC7D,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,kBAAkB,EAAE,+BAA+B;YACnD,YAAY,EAAE,KAAK;SACpB,CACF,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,cAAc,CAAC,KAAqB;QACxC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,iCACxC,KAAK,KACR,kBAAkB,EAAE,IAAI,IACxB,CAAC;QAEH,OAAO,QAAQ,CAAC,QAAQ,CAAC;IAC3B,CAAC;IAED;;;;;;;;;OASG;IACH,KAAK,CAAC,cAAc,CAAC,EACnB,UAAU,EACV,KAAK,EACL,IAAI,EACJ,SAAS,EACT,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,cAAc,GACC;QACf,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;gBACvD,KAAK,EAAE,UAAU;gBACjB,KAAK;gBACL,IAAI;gBACJ,WAAW,EAAE,QAAQ;gBACrB,SAAS;gBACT,kBAAkB,EAAE,WAAW;gBAC/B,kBAAkB,EAAE,QAAQ;gBAC5B,cAAc;aACf,CAAC,CAAC;YAEH,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAE/C,OAAO,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC/D,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,UAAU;YACV,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE;YACrE,kBAAkB,EAAE,2BAA2B;YAC/C,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;SAIK;IACL,KAAK,CAAC,2BAA2B,CAAC,UAAkB;QAClD,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAC;YAElF,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAE/C,OAAO,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAC5E,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,UAAU;YACV,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,kBAAkB,EAAE,0CAA0C;YAC9D,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,WAAW,CAAC,UAAkB;QAClC,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBACjD,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACjD;YACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC;YAC9C,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;aACvC;YACD,OAAO,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QACpD,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,UAAU;YACV,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,kBAAkB,EAAE,wBAAwB;YAC5C,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,qBAAqB,CAAC,UAAkB;QAC5C,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBACjD,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACjD;YACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;YACxE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC;YAC9C,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;aACvC;YACD,OAAO,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QAC1D,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,UAAU;YACV,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,kBAAkB,EAAE,mCAAmC;YACvD,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,UAAkB;QACtC,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;;YACT,IAAI,CAAC,UAAU,EAAE;gBACf,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACjD;YACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YAClE,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,IAAI,0CAAE,eAAe,CAAC;YAC5C,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;aACvC;YACD,OAAO,QAAQ,CAAC,UAAU,CAAC;QAC7B,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,UAAU;YACV,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,kBAAkB,EAAE,4BAA4B;YAChD,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,UAAkB;QACxC,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;;YACT,IAAI,CAAC,UAAU,EAAE;gBACf,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACjD;YACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;YACpE,MAAM,QAAQ,GAAG,MAAA,IAAI,CAAC,IAAI,0CAAE,iBAAiB,CAAC;YAC9C,IAAI,CAAC,QAAQ,EAAE;gBACb,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;aACvC;YACD,OAAO,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QACpD,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,UAAU;YACV,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,kBAAkB,EAAE,8BAA8B;YAClD,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,sBAAsB,CAAC,EAAE,UAAU,EAAE,UAAU,EAA0B;QAC7E,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBACjD,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACjD;YACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,sBAAsB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YACrF,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC;YAC7D,IAAI,CAAC,mBAAmB,EAAE;gBACxB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;aACvC;YACD,OAAO,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;QACpE,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,UAAU;YACV,UAAU;YACV,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,kBAAkB,EAAE,oCAAoC;YACxD,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,kBAAkB,CAAC,kBAAsC;QAC7D,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,uBAAuB,mCACxB,kBAAkB,KACrB,SAAS,EAAE,kBAAkB,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,GACtD,CAAC;YAEF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,CAAC;YAEtF,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAE/C,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAChD,kBAAkB,CAAC,UAAU,EAC7B,uBAAuB,CAAC,UAAU,EAClC,IAAI,EACJ,oBAAoB,CACrB,CAAC;YAEF,OAAO,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACvE,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,kBAAkB,EAAE;YAC3C,kBAAkB,EAAE,+BAA+B;YACnD,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,kBAAkB,CAAC,kBAAsC;QAC7D,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;;YACT,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;YAEjF,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAE/C,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAChD,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,KAAK,EACtC,MAAA,IAAI,CAAC,kBAAkB,CAAC,QAAQ,0CAAE,UAAU,EAC5C,IAAI,EACJ,oBAAoB,CACrB,CAAC;YAEF,OAAO,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACvE,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,kBAAkB,EAAE;YAC3C,kBAAkB,EAAE,+BAA+B;YACnD,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,iBAAiB,CAAC,sBAAyC;QAC/D,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;YAEpF,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAE/C,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC;gBAC7C,YAAY,EAAE,IAAI,CAAC,iBAAiB,CAAC,YAAY;gBACjD,UAAU,EAAE,sBAAsB,CAAC,UAAU;gBAC7C,UAAU,EAAE,sBAAsB,CAAC,UAAU;aAC9C,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,WAAW,CAAC,2BAA2B,CAAC,IAAI,EAAE,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAC/F,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,sBAAsB,EAAE;YAC/C,kBAAkB,EAAE,0CAA0C;YAC9D,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,kBAAkB,CAAC,kBAAsC;QAC7D,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;;YACT,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,CAAC;YAEjF,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAE/C,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAChD,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,KAAK,EACtC,MAAA,IAAI,CAAC,kBAAkB,CAAC,QAAQ,0CAAE,UAAU,EAC5C,IAAI,EACJ,oBAAoB,CACrB,CAAC;YAEF,OAAO,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACvE,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,kBAAkB,EAAE;YAC3C,kBAAkB,EAAE,+BAA+B;YACnD,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,UAAU,CAAC,EACf,SAAS,EACT,UAAU,EACV,UAAU,EACV,kBAAkB,EAClB,uBAAuB,EACvB,kBAAkB,MACJ,EAAE;QAChB,MAAM,MAAM,GAAoB;YAC9B,SAAS;YACT,UAAU;YACV,UAAU;YACV,kBAAkB;YAClB,uBAAuB;YACvB,kBAAkB;SACnB,CAAC;QAEF,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAClE,OAAO,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACzD,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,SAAS,EAAE;YAClC,kBAAkB,EAAE,uBAAuB;YAC3C,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,UAAU;QACd,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC;YAC5D,OAAO,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACzD,CAAC,EACD,IAAI,CAAC,aAAa,EAClB,EAAE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,YAAY,EAAE,IAAI,EAAE,CAC7G,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,WAAW;QACf,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC;YAC7D,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC1D,CAAC,EACD,IAAI,CAAC,aAAa,EAClB,EAAE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,YAAY,EAAE,IAAI,EAAE,CAC9G,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,oBAAoB,CAAC,oBAA0C;QACnE,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,CAAC;YAErF,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAE/C,OAAO,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAC5E,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,oBAAoB,EAAE;YAC7C,kBAAkB,EAAE,iCAAiC;YACrD,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,0BAA0B,CAC9B,0BAAsD;QAEtD,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,0BAA0B,CAAC,0BAA0B,CAAC,CAAC;YAEjG,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAE/C,OAAO,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAClF,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,0BAA0B,EAAE;YACnD,kBAAkB,EAAE,iCAAiC;YACrD,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,mBAAmB,CAAC,mBAAwC;QAChE,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;YAEnF,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAE/C,OAAO,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC7E,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,mBAAmB,EAAE;YAC5C,kBAAkB,EAAE,gCAAgC;YACpD,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,kCAAkC,CACtC,kCAAsE;QAEtE,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,kCAAkC,CAC1E,kCAAkC,CACnC,CAAC;YAEF,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAE/C,OAAO,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC;QACjD,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,kCAAkC,EAAE;YAC3D,kBAAkB,EAAE,iDAAiD;YACrE,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,2BAA2B,CAC/B,2BAAwD;QAExD,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,2BAA2B,CAAC,2BAA2B,CAAC,CAAC;YAEnG,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAE/C,OAAO,EAAE,cAAc,EAAE,IAAI,CAAC,2BAA2B,CAAC,cAAc,EAAE,CAAC;QAC7E,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,2BAA2B,EAAE;YACpD,kBAAkB,EAAE,0CAA0C;YAC9D,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,oBAAoB,CAAC,KAAgC;QACzD,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACtE,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC/C,OAAO,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QACzE,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,KAAK,EAAE;YAC9B,kBAAkB,EAAE,iCAAiC;YACrD,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED,4BAA4B,CAAC,KAAwC;QACnE,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC;YAC9E,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC/C,OAAO,IAAI,CAAC,4BAA4B,CAAC;QAC3C,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,KAAK,EAAE;YAC9B,kBAAkB,EAAE,0CAA0C;YAC9D,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED,6BAA6B,CAAC,KAAwC;QACpE,OAAO,IAAA,oCAAiB,EACtB,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC;YAC9E,IAAI,CAAC,IAAI;gBAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC/C,OAAO,IAAI,CAAC,4BAA4B,CAAC;QAC3C,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,mBAAmB,EAAE,EAAE,KAAK,EAAE;YAC9B,kBAAkB,EAAE,0CAA0C;YAC9D,YAAY,EAAE,IAAI;SACnB,CACF,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,kBAAkB,CAAC,UAAkB,EAAE,UAAmB;QAC9D,MAAM,MAAM,GAAG,MAAM,IAAA,oCAAiB,EACpC,GAAG,EAAE;YACH,IAAI,CAAC,UAAU,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;gBACjD,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACjD;YACD,OAAO,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,oBAAoB,CAAC,CAAC;QAC1G,CAAC,EACD,IAAI,CAAC,aAAa,EAClB;YACE,UAAU;YACV,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,kBAAkB,EAAE,wCAAwC;YAC5D,YAAY,EAAE,KAAK;SACpB,CACF,CAAC;QACF,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,cAAc,EAAE,CAAC;IAC1D,CAAC;CACF;AArpCD,sBAqpCC"}
|
|
856
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ const intializeStiggDependencies = (isPersistedCacheEnabled, sdkConfiguration, l
|
|
|
43
43
|
const batchedGraphClient = (0, initApolloClient_1.initBatchedApolloClient)(sdkConfiguration, loggerService);
|
|
44
44
|
const edgeApiClient = EdgeApiClient_1.EdgeApiClient.create(sdkConfiguration, loggerService);
|
|
45
45
|
if (isPersistedCacheEnabled) {
|
|
46
|
-
entitlementsService = new redisEntitlementsService_1.RedisEntitlementsService(
|
|
46
|
+
entitlementsService = new redisEntitlementsService_1.RedisEntitlementsService(new redisCacheService_1.RedisCacheService(sdkConfiguration.redis, loggerService), graphqlClient, loggerService, batchedGraphClient, edgeApiClient);
|
|
47
47
|
}
|
|
48
48
|
else if (inMemoryCacheService) {
|
|
49
49
|
entitlementsService = new inMemoryEntitlementsService_1.InMemoryEntitlementsService(inMemoryCacheService, graphqlClient, batchedGraphClient, eventEmitter, loggerService, edgeApiClient);
|
|
@@ -56,4 +56,4 @@ const intializeStiggDependencies = (isPersistedCacheEnabled, sdkConfiguration, l
|
|
|
56
56
|
return { eventEmitter, entitlementsService, managementApi, sdkConfigurationApi };
|
|
57
57
|
};
|
|
58
58
|
exports.intializeStiggDependencies = intializeStiggDependencies;
|
|
59
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
59
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xpZW50SW5pdGlhbGl6YXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY2xpZW50SW5pdGlhbGl6YXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUVBLDBEQUE0RDtBQUM1RCxnRkFBNkU7QUFFN0UsMkVBQW1GO0FBQ25GLGtGQUErRTtBQUMvRSwwRUFBdUU7QUFDdkUsd0ZBQXFGO0FBQ3JGLHdFQUFnRDtBQUNoRCxvRkFBNEQ7QUFDNUQsNERBQXlEO0FBRWxELE1BQU0sMEJBQTBCLEdBQUcsQ0FDeEMsdUJBQWdDLEVBQ2hDLGdCQUErQyxFQUMvQyxhQUE0QixFQUM1QixFQUFFO0lBQ0YsTUFBTSxZQUFZLEdBQUcsSUFBSSxnQ0FBaUIsRUFBRSxDQUFDO0lBQzdDLElBQUksb0JBQW9CLEdBQWdDLElBQUksQ0FBQztJQUM3RCxJQUFJLG1CQUF3QyxDQUFDO0lBRTdDLElBQUksQ0FBQyx1QkFBdUIsRUFBRTtRQUM1QixvQkFBb0IsR0FBRyxJQUFJLDJDQUFvQixDQUFDLGdCQUFnQixDQUFDLHVCQUF1QixDQUFDLENBQUM7S0FDM0Y7SUFFRCxNQUFNLGFBQWEsR0FBRyxJQUFBLDBCQUFnQixrQ0FDakMsZ0JBQWdCLEtBQ25CLFdBQVcsRUFBRSxDQUFBLG9CQUFvQixhQUFwQixvQkFBb0IsdUJBQXBCLG9CQUFvQixDQUFFLFVBQVUsS0FBSSxPQUFPLENBQUMsT0FBTyxFQUNoRSxhQUFhLElBQ2IsQ0FBQztJQUVILE1BQU0sa0JBQWtCLEdBQUcsSUFBQSwwQ0FBdUIsRUFBQyxnQkFBZ0IsRUFBRSxhQUFhLENBQUMsQ0FBQztJQUNwRixNQUFNLGFBQWEsR0FBRyw2QkFBYSxDQUFDLE1BQU0sQ0FBQyxnQkFBZ0IsRUFBRSxhQUFhLENBQUMsQ0FBQztJQUU1RSxJQUFJLHVCQUF1QixFQUFFO1FBQzNCLG1CQUFtQixHQUFHLElBQUksbURBQXdCLENBQ2hELElBQUkscUNBQWlCLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLGFBQWEsQ0FBQyxFQUM1RCxhQUFhLEVBQ2IsYUFBYSxFQUNiLGtCQUFrQixFQUNsQixhQUFhLENBQ2QsQ0FBQztLQUNIO1NBQU0sSUFBSSxvQkFBb0IsRUFBRTtRQUMvQixtQkFBbUIsR0FBRyxJQUFJLHlEQUEyQixDQUNuRCxvQkFBb0IsRUFDcEIsYUFBYSxFQUNiLGtCQUFrQixFQUNsQixZQUFZLEVBQ1osYUFBYSxFQUNiLGFBQWEsQ0FDZCxDQUFDO0tBQ0g7U0FBTTtRQUNMLE1BQU0sSUFBSSxLQUFLLENBQUMsMEJBQTBCLENBQUMsQ0FBQztLQUM3QztJQUVELE1BQU0sYUFBYSxHQUFHLElBQUksdUJBQWEsQ0FBQyxhQUFhLEVBQUUsYUFBYSxDQUFDLENBQUM7SUFFdEUsTUFBTSxtQkFBbUIsR0FBRyxJQUFJLDZCQUFtQixDQUFDLGFBQWEsRUFBRSxhQUFhLENBQUMsQ0FBQztJQUNsRixPQUFPLEVBQUUsWUFBWSxFQUFFLG1CQUFtQixFQUFFLGFBQWEsRUFBRSxtQkFBbUIsRUFBRSxDQUFDO0FBQ25GLENBQUMsQ0FBQztBQS9DVyxRQUFBLDBCQUEwQiw4QkErQ3JDIn0=
|
package/dist/models.d.ts
CHANGED
|
@@ -334,6 +334,7 @@ export declare type ImportSubscription = {
|
|
|
334
334
|
resourceId?: string;
|
|
335
335
|
startDate?: Date;
|
|
336
336
|
unitQuantity?: number;
|
|
337
|
+
updatedAt?: Date;
|
|
337
338
|
};
|
|
338
339
|
export declare type BillableFeature = {
|
|
339
340
|
featureId: string;
|
|
@@ -447,6 +448,7 @@ export declare type ImportCustomer = {
|
|
|
447
448
|
email?: string;
|
|
448
449
|
paymentMethodId?: string;
|
|
449
450
|
metadata?: Metadata | null;
|
|
451
|
+
updatedAt?: Date;
|
|
450
452
|
};
|
|
451
453
|
export declare type CreateCustomer = {
|
|
452
454
|
customerId?: string;
|
package/dist/models.js
CHANGED
|
@@ -52,4 +52,4 @@ class CustomerModel {
|
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
exports.CustomerModel = CustomerModel;
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kZWxzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL21vZGVscy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7O0FBQUEsZ0VBc0NnRDtBQUVoRCx5RUFBdUQ7QUF1RHZELGdCQUFnQjtBQUNILFFBQUEsb0NBQW9DLEdBQXVCO0lBQ3RFLFVBQVUsRUFBRSxJQUFJO0lBQ2hCLFNBQVMsRUFBRSxLQUFLO0lBQ2hCLGtCQUFrQixFQUFFLHdCQUFrQixDQUFDLE9BQU87Q0FDL0MsQ0FBQztBQUVGLGdCQUFnQjtBQUNILFFBQUEsb0NBQW9DLEdBQXVCO0lBQ3RFLFVBQVUsRUFBRSxJQUFJO0lBQ2hCLFNBQVMsRUFBRSxLQUFLO0lBQ2hCLFdBQVcsRUFBRSxLQUFLO0lBQ2xCLGtCQUFrQixFQUFFLHdCQUFrQixDQUFDLE9BQU87Q0FDL0MsQ0FBQztBQUVGLGdCQUFnQjtBQUNILFFBQUEsb0NBQW9DLEdBQXVCO0lBQ3RFLFVBQVUsRUFBRSxJQUFJO0lBQ2hCLFNBQVMsRUFBRSxLQUFLO0lBQ2hCLFdBQVcsRUFBRSxLQUFLO0lBQ2xCLFlBQVksRUFBRSxLQUFLO0lBQ25CLFlBQVksRUFBRSxDQUFDO0lBQ2YsY0FBYyxFQUFFLENBQUM7SUFDakIsa0JBQWtCLEVBQUUsd0JBQWtCLENBQUMsT0FBTztDQUMvQyxDQUFDO0FBb3dCRixjQUFjO0FBQ2QsTUFBYSxhQUFhO0lBU3hCLFlBQVksS0FBb0I7UUFDOUIsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDN0IsQ0FBQztJQUVELHNCQUFzQjtRQUNwQixPQUFPLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTSxLQUFLLHdCQUFrQixDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ2xGLENBQUM7SUFFRCxlQUFlO1FBQ2IsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLE1BQU0sS0FBSyx3QkFBa0IsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNuRixDQUFDO0lBRUQsZ0NBQWdDO1FBQzlCLE9BQU8sSUFBSSxDQUFDLHVCQUF1QixDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLE1BQU0sS0FBSyxrQ0FBNEIsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUN0RyxDQUFDO0NBQ0Y7QUF4QkQsc0NBd0JDIn0=
|
|
@@ -3,14 +3,13 @@ export declare type UpdateFeatureUsagePayload = {
|
|
|
3
3
|
customerId: string;
|
|
4
4
|
featureId: string;
|
|
5
5
|
currentUsage: number;
|
|
6
|
-
environmentPrefix: string;
|
|
7
6
|
timestamp: Date;
|
|
8
7
|
resourceId: string | undefined;
|
|
9
8
|
nextResetDate?: number;
|
|
10
9
|
};
|
|
11
10
|
export interface CacheService {
|
|
12
11
|
clearCache(): void | Promise<void>;
|
|
13
|
-
setCustomer(
|
|
12
|
+
setCustomer(customerId: string, customerEntitlements: Map<string, CachedEntitlement>, resourceId: string | undefined, entitlementsTimestamp: number, usageTimestamp: Map<string, number>): void | Promise<void>;
|
|
14
13
|
updateFeatureUsage(payload: UpdateFeatureUsagePayload): boolean | Promise<boolean>;
|
|
15
|
-
getCustomerEntitlements(
|
|
14
|
+
getCustomerEntitlements(customerId: string, resourceId: string | undefined): Map<string, CachedEntitlement> | Promise<Map<string, CachedEntitlement> | null> | null;
|
|
16
15
|
}
|
|
@@ -5,7 +5,7 @@ export declare class InMemoryCacheService implements CacheService {
|
|
|
5
5
|
private readonly entitlements;
|
|
6
6
|
constructor(maxSizeBytes: number);
|
|
7
7
|
clearCache: () => void;
|
|
8
|
-
setCustomer(
|
|
9
|
-
getCustomerEntitlements(
|
|
8
|
+
setCustomer(customerId: string, customerEntitlements: Map<string, CachedEntitlement>, resourceId: string | undefined): void;
|
|
9
|
+
getCustomerEntitlements(customerId: string, resourceId: string | undefined): Map<string, CachedEntitlement> | Promise<Map<string, CachedEntitlement> | null> | null;
|
|
10
10
|
updateFeatureUsage({ customerId, featureId, currentUsage, resourceId, nextResetDate, }: UpdateFeatureUsagePayload): boolean | Promise<boolean>;
|
|
11
11
|
}
|
|
@@ -19,11 +19,11 @@ class InMemoryCacheService {
|
|
|
19
19
|
sizeCalculation: (value) => getApproxSizeBytes(value),
|
|
20
20
|
});
|
|
21
21
|
}
|
|
22
|
-
setCustomer(
|
|
22
|
+
setCustomer(customerId, customerEntitlements, resourceId) {
|
|
23
23
|
const cachedCustomerKey = (0, cacheKeysHelpers_1.buildCachedCustomerKey)(customerId, resourceId);
|
|
24
24
|
this.entitlements.set(cachedCustomerKey, customerEntitlements);
|
|
25
25
|
}
|
|
26
|
-
getCustomerEntitlements(
|
|
26
|
+
getCustomerEntitlements(customerId, resourceId) {
|
|
27
27
|
const cachedCustomerKey = (0, cacheKeysHelpers_1.buildCachedCustomerKey)(customerId, resourceId);
|
|
28
28
|
return this.entitlements.get(cachedCustomerKey) || null;
|
|
29
29
|
}
|
|
@@ -44,4 +44,4 @@ class InMemoryCacheService {
|
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
exports.InMemoryCacheService = InMemoryCacheService;
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5NZW1vcnlDYWNoZVNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvY2FjaGUvaW5NZW1vcnlDYWNoZVNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRUEsbUVBQXNFO0FBQ3RFLHlDQUFxQztBQUdyQyxNQUFNLFdBQVcsR0FBRyxJQUFJLFdBQVcsRUFBRSxDQUFDO0FBRXRDLFNBQWdCLGtCQUFrQixDQUFDLEdBQVE7SUFDekMsT0FBTyxXQUFXLENBQUMsTUFBTSxDQUFDLE9BQU8sR0FBRyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDO0FBQ3hGLENBQUM7QUFGRCxnREFFQztBQUVELE1BQWEsb0JBQW9CO0lBRy9CLFlBQVksWUFBb0I7UUFRaEMsZUFBVSxHQUFHLEdBQUcsRUFBRTtZQUNoQixJQUFJLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzVCLENBQUMsQ0FBQztRQVRBLE1BQU0sT0FBTyxHQUFHLFlBQVksQ0FBQztRQUM3QixJQUFJLENBQUMsWUFBWSxHQUFHLElBQUksb0JBQVEsQ0FBeUM7WUFDdkUsT0FBTztZQUNQLGVBQWUsRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsa0JBQWtCLENBQUMsS0FBSyxDQUFDO1NBQ3RELENBQUMsQ0FBQztJQUNMLENBQUM7SUFNRCxXQUFXLENBQ1QsVUFBa0IsRUFDbEIsb0JBQW9ELEVBQ3BELFVBQThCO1FBRTlCLE1BQU0saUJBQWlCLEdBQUcsSUFBQSx5Q0FBc0IsRUFBQyxVQUFVLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFDekUsSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsaUJBQWlCLEVBQUUsb0JBQW9CLENBQUMsQ0FBQztJQUNqRSxDQUFDO0lBRUQsdUJBQXVCLENBQ3JCLFVBQWtCLEVBQ2xCLFVBQThCO1FBRTlCLE1BQU0saUJBQWlCLEdBQUcsSUFBQSx5Q0FBc0IsRUFBQyxVQUFVLEVBQUUsVUFBVSxDQUFDLENBQUM7UUFDekUsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLElBQUksQ0FBQztJQUMxRCxDQUFDO0lBRUQsa0JBQWtCLENBQUMsRUFDakIsVUFBVSxFQUNWLFNBQVMsRUFDVCxZQUFZLEVBQ1osVUFBVSxFQUNWLGFBQWEsR0FDYTtRQUMxQixNQUFNLGlCQUFpQixHQUFHLElBQUEseUNBQXNCLEVBQUMsVUFBVSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1FBQ3pFLE1BQU0sb0JBQW9CLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUMsQ0FBQztRQUN0RSxNQUFNLDBCQUEwQixHQUFHLG9CQUFvQixhQUFwQixvQkFBb0IsdUJBQXBCLG9CQUFvQixDQUFFLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUV4RSxJQUFJLENBQUMsb0JBQW9CLElBQUksQ0FBQywwQkFBMEIsRUFBRTtZQUN4RCxrRkFBa0Y7WUFDbEYsT0FBTyxLQUFLLENBQUM7U0FDZDtRQUVELE1BQU0sRUFBRSxZQUFZLEVBQUUsb0JBQW9CLEVBQUUscUJBQXFCLEVBQUUsR0FBRywwQkFBMEIsQ0FBQztRQUVqRyxvQkFBb0IsQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUFFO1lBQ2xDLHFCQUFxQjtZQUNyQixZQUFZLGtDQUFPLG9CQUFvQixLQUFFLFlBQVksRUFBRSxhQUFhLEVBQUUsYUFBYSxHQUFFO1NBQ3RGLENBQUMsQ0FBQztRQUVILE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztDQUNGO0FBekRELG9EQXlEQyJ9
|
|
@@ -9,12 +9,13 @@ export declare class RedisCacheService implements CacheService {
|
|
|
9
9
|
private readonly redisClient;
|
|
10
10
|
private readonly redlock;
|
|
11
11
|
constructor(options: StiggRedisOptions, loggerService: LoggerService);
|
|
12
|
-
updateFeatureUsage({ featureId, currentUsage, customerId, nextResetDate,
|
|
13
|
-
setCustomer(
|
|
14
|
-
getCustomerEntitlements(
|
|
15
|
-
getCustomerEntitlementsWithUsage(
|
|
16
|
-
getFeatureUsage(
|
|
12
|
+
updateFeatureUsage({ featureId, currentUsage, customerId, nextResetDate, resourceId, timestamp, }: UpdateFeatureUsagePayload): Promise<boolean>;
|
|
13
|
+
setCustomer(customerId: string, customerEntitlements: Map<string, CachedEntitlement>, resourceId: string | undefined, entitlementsTimestamp: number, featureIdToUsageTimestamp: Map<string, number>): Promise<void>;
|
|
14
|
+
getCustomerEntitlements(customerId: string, resourceId: string | undefined): Promise<Map<string, CachedEntitlement> | null>;
|
|
15
|
+
getCustomerEntitlementsWithUsage(customerId: string, resourceId: string | undefined): Promise<Map<string, CachedEntitlement> | null>;
|
|
16
|
+
getFeatureUsage(customerId: string, featureId: string, resourceId: string | undefined): Promise<string | null>;
|
|
17
17
|
private getFeaturesUsage;
|
|
18
18
|
clearCache(): void | Promise<void>;
|
|
19
19
|
private updateKey;
|
|
20
|
+
private getKeyLatestTimestamp;
|
|
20
21
|
}
|
|
@@ -23,8 +23,8 @@ class RedisCacheService {
|
|
|
23
23
|
this.redisClient.on('error', (err) => this.loggerService.error('Redis client error: ', err));
|
|
24
24
|
this.redisClient.on('connect', () => this.loggerService.log('Redis client connected!'));
|
|
25
25
|
}
|
|
26
|
-
async updateFeatureUsage({ featureId, currentUsage, customerId, nextResetDate,
|
|
27
|
-
const entitlementUsageKey = (0, cacheKeysHelpers_1.buildUsageKey)(environmentPrefix, customerId, featureId, resourceId);
|
|
26
|
+
async updateFeatureUsage({ featureId, currentUsage, customerId, nextResetDate, resourceId, timestamp, }) {
|
|
27
|
+
const entitlementUsageKey = (0, cacheKeysHelpers_1.buildUsageKey)(this.environmentPrefix, customerId, featureId, resourceId);
|
|
28
28
|
const usageValue = {
|
|
29
29
|
currentUsage,
|
|
30
30
|
nextResetDate,
|
|
@@ -32,9 +32,9 @@ class RedisCacheService {
|
|
|
32
32
|
await this.updateKey(timestamp, entitlementUsageKey, usageValue);
|
|
33
33
|
return true;
|
|
34
34
|
}
|
|
35
|
-
async setCustomer(
|
|
36
|
-
const lockKey = (0, cacheKeysHelpers_1.buildLockKey)(environmentPrefix, customerId, resourceId);
|
|
37
|
-
const entitlementsDbKey = (0, cacheKeysHelpers_1.buildCustomerKey)(environmentPrefix, customerId, resourceId);
|
|
35
|
+
async setCustomer(customerId, customerEntitlements, resourceId, entitlementsTimestamp, featureIdToUsageTimestamp) {
|
|
36
|
+
const lockKey = (0, cacheKeysHelpers_1.buildLockKey)(this.environmentPrefix, customerId, resourceId);
|
|
37
|
+
const entitlementsDbKey = (0, cacheKeysHelpers_1.buildCustomerKey)(this.environmentPrefix, customerId, resourceId);
|
|
38
38
|
const customerEntitlementsAsObject = Object.fromEntries(customerEntitlements);
|
|
39
39
|
await this.redlock.using([lockKey], LOCK_DURATION, async () => {
|
|
40
40
|
await this.updateKey(new Date(entitlementsTimestamp), entitlementsDbKey, customerEntitlementsAsObject);
|
|
@@ -61,7 +61,6 @@ class RedisCacheService {
|
|
|
61
61
|
timestamp: new Date(featureUsageTimestamp),
|
|
62
62
|
currentUsage,
|
|
63
63
|
nextResetDate: nextResetDate,
|
|
64
|
-
environmentPrefix,
|
|
65
64
|
resourceId,
|
|
66
65
|
});
|
|
67
66
|
}
|
|
@@ -92,8 +91,8 @@ class RedisCacheService {
|
|
|
92
91
|
.forEach((result) => this.loggerService.error(`Failed to update feature usage result: ${result.reason}`));
|
|
93
92
|
});
|
|
94
93
|
}
|
|
95
|
-
async getCustomerEntitlements(
|
|
96
|
-
const customerKey = (0, cacheKeysHelpers_1.buildCustomerKey)(environmentPrefix, customerId, resourceId);
|
|
94
|
+
async getCustomerEntitlements(customerId, resourceId) {
|
|
95
|
+
const customerKey = (0, cacheKeysHelpers_1.buildCustomerKey)(this.environmentPrefix, customerId, resourceId);
|
|
97
96
|
const entitlements = await this.redisClient.get(customerKey);
|
|
98
97
|
if (entitlements === null || (0, lodash_1.isEmpty)(entitlements)) {
|
|
99
98
|
return null;
|
|
@@ -101,8 +100,8 @@ class RedisCacheService {
|
|
|
101
100
|
this.loggerService.debug(`Found entitlements in persisted cache for customer`, { customerId, resourceId });
|
|
102
101
|
return new Map(Object.entries(JSON.parse(entitlements)));
|
|
103
102
|
}
|
|
104
|
-
async getCustomerEntitlementsWithUsage(
|
|
105
|
-
const cachedEntitlements = await this.getCustomerEntitlements(
|
|
103
|
+
async getCustomerEntitlementsWithUsage(customerId, resourceId) {
|
|
104
|
+
const cachedEntitlements = await this.getCustomerEntitlements(customerId, resourceId);
|
|
106
105
|
if (cachedEntitlements === null) {
|
|
107
106
|
return null;
|
|
108
107
|
}
|
|
@@ -129,8 +128,8 @@ class RedisCacheService {
|
|
|
129
128
|
});
|
|
130
129
|
return cachedEntitlements;
|
|
131
130
|
}
|
|
132
|
-
async getFeatureUsage(
|
|
133
|
-
return this.redisClient.get((0, cacheKeysHelpers_1.buildUsageKey)(environmentPrefix, customerId, featureId, resourceId));
|
|
131
|
+
async getFeatureUsage(customerId, featureId, resourceId) {
|
|
132
|
+
return this.redisClient.get((0, cacheKeysHelpers_1.buildUsageKey)(this.environmentPrefix, customerId, featureId, resourceId));
|
|
134
133
|
}
|
|
135
134
|
async getFeaturesUsage(environmentPrefix, customerId, resourceId, meteredFeatureIds) {
|
|
136
135
|
const keysToFetch = meteredFeatureIds.map((featureId) => (0, cacheKeysHelpers_1.buildUsageKey)(environmentPrefix, customerId, featureId, resourceId));
|
|
@@ -151,12 +150,9 @@ class RedisCacheService {
|
|
|
151
150
|
return;
|
|
152
151
|
}
|
|
153
152
|
async updateKey(timestamp, key, value) {
|
|
154
|
-
const
|
|
155
|
-
const latestTimestamp = latestTimestampValue !== null && parseInt(latestTimestampValue, 10) !== Number.NaN
|
|
156
|
-
? new Date(parseInt(latestTimestampValue, 10))
|
|
157
|
-
: undefined;
|
|
153
|
+
const latestTimestamp = await this.getKeyLatestTimestamp(key);
|
|
158
154
|
const messageTimestamp = timestamp.getTime();
|
|
159
|
-
if (!latestTimestamp ||
|
|
155
|
+
if (!latestTimestamp || latestTimestamp.getTime() <= messageTimestamp) {
|
|
160
156
|
const writeableValue = typeof value === 'string' ? value : JSON.stringify(value);
|
|
161
157
|
await this.redisClient
|
|
162
158
|
.multi()
|
|
@@ -172,6 +168,17 @@ class RedisCacheService {
|
|
|
172
168
|
});
|
|
173
169
|
}
|
|
174
170
|
}
|
|
171
|
+
async getKeyLatestTimestamp(key) {
|
|
172
|
+
const value = await this.redisClient.get(`${key}#${TIMESTAMP_SUFFIX}`);
|
|
173
|
+
if ((0, lodash_1.isNil)(value)) {
|
|
174
|
+
return undefined;
|
|
175
|
+
}
|
|
176
|
+
const number = parseInt(value, 10);
|
|
177
|
+
if (Number.isNaN(number)) {
|
|
178
|
+
return undefined;
|
|
179
|
+
}
|
|
180
|
+
return new Date(number);
|
|
181
|
+
}
|
|
175
182
|
}
|
|
176
183
|
exports.RedisCacheService = RedisCacheService;
|
|
177
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
184
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"redisCacheService.js","sourceRoot":"","sources":["../../../src/services/cache/redisCacheService.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,17 +8,16 @@ import { CacheService } from './cache/cacheService';
|
|
|
8
8
|
import { EdgeApiClient } from './EdgeApiClient';
|
|
9
9
|
import { ReportUsageMutation, ReportEventMutation, EntitlementCheckResult, EntitlementFragment, ReportUsageBulkInput, ReportUsageBulkMutation, ReportUsageFragment } from '@stigg/api-client-js/src/generated/sdk';
|
|
10
10
|
import CacheMapper from '../utils/CacheMapper';
|
|
11
|
-
declare type RefetchEntitlementsTriggeredBy = '
|
|
11
|
+
export declare type RefetchEntitlementsTriggeredBy = 'updateSubscription' | 'getBooleanEntitlement' | 'getNumericEntitlement' | 'getMeteredEntitlement' | 'getCustomerEntitlements' | 'cancelSubscription' | 'createSubscription' | 'getCustomerEntitlementsWithUsage' | 'reloadEntitlements';
|
|
12
12
|
export declare abstract class EntitlementsService {
|
|
13
13
|
protected readonly loggerService: LoggerService;
|
|
14
14
|
protected readonly cacheService: CacheService;
|
|
15
|
-
protected readonly environmentPrefix: string;
|
|
16
15
|
private readonly entitlementCheckReportingService;
|
|
17
16
|
protected readonly entitlementsApi: EntitlementsApi;
|
|
18
17
|
protected readonly modelMapper: ModelMapper;
|
|
19
18
|
protected readonly cacheMapper: CacheMapper;
|
|
20
19
|
protected isInitialized: boolean;
|
|
21
|
-
protected constructor(client: ApolloClient<NormalizedCacheObject>, loggerService: LoggerService, batchedGraphqlClient: ApolloClient<NormalizedCacheObject>, edgeApiClient: EdgeApiClient | null, cacheService: CacheService
|
|
20
|
+
protected constructor(client: ApolloClient<NormalizedCacheObject>, loggerService: LoggerService, batchedGraphqlClient: ApolloClient<NormalizedCacheObject>, edgeApiClient: EdgeApiClient | null, cacheService: CacheService);
|
|
22
21
|
getBooleanEntitlement(customerRefId: string, featureRefId: string, fallbackEntitlement: BooleanEntitlement, resourceId?: string, options?: BooleanEntitlementOptions): Promise<BooleanEntitlement>;
|
|
23
22
|
getNumericEntitlement(customerRefId: string, featureRefId: string, fallbackEntitlement: NumericEntitlement, resourceId?: string, options?: NumericEntitlementOptions): Promise<NumericEntitlement>;
|
|
24
23
|
getMeteredEntitlement(customerRefId: string, featureRefId: string, fallbackEntitlement: MeteredEntitlement, resourceId?: string, options?: MeteredEntitlementOptions): Promise<MeteredEntitlement>;
|
|
@@ -48,4 +47,3 @@ export declare abstract class EntitlementsService {
|
|
|
48
47
|
protected tryTrackEntitlementCheck(shouldTrack: boolean, featureRefId: string, customerRefId: string, resourceRefId: string | undefined, result: EntitlementCheckResult, requestedUsage?: number): void;
|
|
49
48
|
updateFeatureUsage({ featureId, customerId, resourceId, currentUsage, nextResetDate, timestamp, }: ReportUsageFragment): Promise<void>;
|
|
50
49
|
}
|
|
51
|
-
export {};
|
|
@@ -1,4 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
2
8
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
9
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
10
|
};
|
|
@@ -12,11 +18,11 @@ const entitlementDecisionService_1 = require("./entitlementDecisionService");
|
|
|
12
18
|
const lodash_1 = require("lodash");
|
|
13
19
|
const dateUtils_1 = require("../utils/dateUtils");
|
|
14
20
|
const CacheMapper_1 = __importDefault(require("../utils/CacheMapper"));
|
|
21
|
+
const ReuseOngoingExecution_1 = require("../utils/decorators/ReuseOngoingExecution");
|
|
15
22
|
class EntitlementsService {
|
|
16
|
-
constructor(client, loggerService, batchedGraphqlClient, edgeApiClient, cacheService
|
|
23
|
+
constructor(client, loggerService, batchedGraphqlClient, edgeApiClient, cacheService) {
|
|
17
24
|
this.loggerService = loggerService;
|
|
18
25
|
this.cacheService = cacheService;
|
|
19
|
-
this.environmentPrefix = environmentPrefix;
|
|
20
26
|
this.isInitialized = false;
|
|
21
27
|
this.modelMapper = new ModelMapper_1.ModelMapper();
|
|
22
28
|
this.cacheMapper = new CacheMapper_1.default();
|
|
@@ -107,12 +113,12 @@ class EntitlementsService {
|
|
|
107
113
|
return this.getCustomerEntitlements(customerRefId, resourceId);
|
|
108
114
|
}
|
|
109
115
|
async getCustomerEntitlements(customerRefId, resourceId) {
|
|
110
|
-
const entitlements = await this.cacheService.getCustomerEntitlements(
|
|
116
|
+
const entitlements = await this.cacheService.getCustomerEntitlements(customerRefId, resourceId);
|
|
111
117
|
if (!entitlements || !this.isInitialized) {
|
|
112
118
|
await this.refetchEntitlements(customerRefId, resourceId, false, 'getCustomerEntitlements');
|
|
113
119
|
// TODO: currently there is no good way to find out if the customer exists or not
|
|
114
120
|
}
|
|
115
|
-
const cachedEntitlements = (await this.cacheService.getCustomerEntitlements(
|
|
121
|
+
const cachedEntitlements = (await this.cacheService.getCustomerEntitlements(customerRefId, resourceId)) || new Map();
|
|
116
122
|
return Array.from(cachedEntitlements.values()).map((value) => {
|
|
117
123
|
const decision = entitlementDecisionService_1.EntitlementDecisionService.decideEntitlementPolicy(true, value);
|
|
118
124
|
return this.modelMapper.mapEntitlement(value, decision);
|
|
@@ -138,7 +144,7 @@ class EntitlementsService {
|
|
|
138
144
|
return this.entitlementsApi.reportEvent(input);
|
|
139
145
|
}
|
|
140
146
|
async tryGetCacheCustomerAndEntitlement(featureRefId, customerRefId, resourceId) {
|
|
141
|
-
const customer = await this.cacheService.getCustomerEntitlements(
|
|
147
|
+
const customer = await this.cacheService.getCustomerEntitlements(customerRefId, resourceId);
|
|
142
148
|
if (!customer) {
|
|
143
149
|
return { customerExists: false, entitlement: null };
|
|
144
150
|
}
|
|
@@ -146,7 +152,7 @@ class EntitlementsService {
|
|
|
146
152
|
return { customerExists: true, entitlement };
|
|
147
153
|
}
|
|
148
154
|
async refetchEntitlements(customerId, resourceId, skipEdge, triggeredBy) {
|
|
149
|
-
this.loggerService.log(`
|
|
155
|
+
this.loggerService.log(`Re-fetching entitlements`, {
|
|
150
156
|
customerId,
|
|
151
157
|
resourceId,
|
|
152
158
|
skipEdge,
|
|
@@ -191,7 +197,7 @@ class EntitlementsService {
|
|
|
191
197
|
const cachedEntitlements = this.cacheMapper.mapCachedEntitlements(entitlements);
|
|
192
198
|
// optimistically update the cache
|
|
193
199
|
try {
|
|
194
|
-
await this.cacheService.setCustomer(
|
|
200
|
+
await this.cacheService.setCustomer(customerId, cachedEntitlements, resourceId, entitlementsUpdatedAtTimestamp, featureIdToUsageTimestamp);
|
|
195
201
|
}
|
|
196
202
|
catch (err) {
|
|
197
203
|
this.loggerService.error('Failed to set customer entitlements in cache (soft ignored)', err);
|
|
@@ -208,12 +214,11 @@ class EntitlementsService {
|
|
|
208
214
|
if ((0, lodash_1.isNil)(currentUsage)) {
|
|
209
215
|
return;
|
|
210
216
|
}
|
|
211
|
-
const cachedCustomer = await this.cacheService.getCustomerEntitlements(
|
|
217
|
+
const cachedCustomer = await this.cacheService.getCustomerEntitlements(customerId, resourceId || undefined);
|
|
212
218
|
if (cachedCustomer === null) {
|
|
213
219
|
return;
|
|
214
220
|
}
|
|
215
221
|
await this.cacheService.updateFeatureUsage({
|
|
216
|
-
environmentPrefix: this.environmentPrefix,
|
|
217
222
|
featureId,
|
|
218
223
|
customerId,
|
|
219
224
|
resourceId: resourceId || undefined,
|
|
@@ -223,5 +228,8 @@ class EntitlementsService {
|
|
|
223
228
|
});
|
|
224
229
|
}
|
|
225
230
|
}
|
|
231
|
+
__decorate([
|
|
232
|
+
(0, ReuseOngoingExecution_1.ReuseOngoingExecution)((customerId, resourceId, skipEdge) => skipEdge ? undefined : (0, lodash_1.compact)([customerId, resourceId]).join(':'))
|
|
233
|
+
], EntitlementsService.prototype, "refetchEntitlements", null);
|
|
226
234
|
exports.EntitlementsService = EntitlementsService;
|
|
227
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"entitlementsService.js","sourceRoot":"","sources":["../../src/services/entitlementsService.ts"],"names":[],"mappings":"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"}
|
|
235
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"entitlementsService.js","sourceRoot":"","sources":["../../src/services/entitlementsService.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ const entitlementsService_1 = require("./entitlementsService");
|
|
|
6
6
|
const WS_ERROR_RECONNECT_INTERVAL_MS = 5 * 1000;
|
|
7
7
|
class InMemoryEntitlementsService extends entitlementsService_1.EntitlementsService {
|
|
8
8
|
constructor(cacheService, client, batchedGraphqlClient, eventEmitter, loggerService, edgeApiClient) {
|
|
9
|
-
super(client, loggerService, batchedGraphqlClient, edgeApiClient, cacheService
|
|
9
|
+
super(client, loggerService, batchedGraphqlClient, edgeApiClient, cacheService);
|
|
10
10
|
this.cacheService = cacheService;
|
|
11
11
|
this.eventEmitter = eventEmitter;
|
|
12
12
|
this.entitlementsSubscription = null;
|
|
@@ -25,7 +25,7 @@ class InMemoryEntitlementsService extends entitlementsService_1.EntitlementsServ
|
|
|
25
25
|
entitlements: entitlementsUpdated.entitlements,
|
|
26
26
|
});
|
|
27
27
|
const entitlements = this.cacheMapper.mapCachedEntitlements(entitlementsUpdated.entitlements);
|
|
28
|
-
this.cacheService.setCustomer(
|
|
28
|
+
this.cacheService.setCustomer(entitlementsUpdated.customerId, entitlements, entitlementsUpdated.resourceId || undefined);
|
|
29
29
|
this.eventEmitter.emit('entitlementsUpdated', entitlementsUpdated);
|
|
30
30
|
};
|
|
31
31
|
this.onUsageUpdated = (result) => {
|
|
@@ -45,7 +45,6 @@ class InMemoryEntitlementsService extends entitlementsService_1.EntitlementsServ
|
|
|
45
45
|
});
|
|
46
46
|
const wasSet = this.cacheService.updateFeatureUsage({
|
|
47
47
|
timestamp: new Date(),
|
|
48
|
-
environmentPrefix: '',
|
|
49
48
|
customerId,
|
|
50
49
|
resourceId: resourceId || undefined,
|
|
51
50
|
featureId,
|
|
@@ -119,4 +118,4 @@ class InMemoryEntitlementsService extends entitlementsService_1.EntitlementsServ
|
|
|
119
118
|
}
|
|
120
119
|
}
|
|
121
120
|
exports.InMemoryEntitlementsService = InMemoryEntitlementsService;
|
|
122
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
121
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5NZW1vcnlFbnRpdGxlbWVudHNTZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2VzL2luTWVtb3J5RW50aXRsZW1lbnRzU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSxnRUFLZ0Q7QUFHaEQsK0RBQTREO0FBSzVELE1BQU0sOEJBQThCLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQztBQUVoRCxNQUFhLDJCQUE0QixTQUFRLHlDQUFtQjtJQUtsRSxZQUNxQixZQUFrQyxFQUNyRCxNQUEyQyxFQUMzQyxvQkFBeUQsRUFDeEMsWUFBK0IsRUFDaEQsYUFBNEIsRUFDNUIsYUFBbUM7UUFFbkMsS0FBSyxDQUFDLE1BQU0sRUFBRSxhQUFhLEVBQUUsb0JBQW9CLEVBQUUsYUFBYSxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBUDdELGlCQUFZLEdBQVosWUFBWSxDQUFzQjtRQUdwQyxpQkFBWSxHQUFaLFlBQVksQ0FBbUI7UUFSMUMsNkJBQXdCLEdBQWtDLElBQUksQ0FBQztRQUMvRCxzQkFBaUIsR0FBa0MsSUFBSSxDQUFDO1FBQ3hELHFCQUFnQixHQUFrQyxJQUFJLENBQUM7UUFnRXZELDBCQUFxQixHQUFHLENBQUMsTUFBc0QsRUFBRSxFQUFFO1lBQ3pGLElBQUksTUFBTSxDQUFDLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUU7Z0JBQ2pDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLHdEQUF3RCxNQUFNLENBQUMsTUFBTSxFQUFFLEVBQUU7b0JBQ2hHLE1BQU0sRUFBRSxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUM7aUJBQ3RDLENBQUMsQ0FBQztnQkFDSCxPQUFPO2FBQ1I7WUFFRCxNQUFNLG1CQUFtQixHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsbUJBQW1CLENBQUM7WUFFNUQsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMscUNB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
|
|
@@ -9,7 +9,7 @@ export declare class RedisEntitlementsService extends EntitlementsService {
|
|
|
9
9
|
protected readonly graphqlClient: ApolloClient<NormalizedCacheObject>;
|
|
10
10
|
protected readonly loggerService: LoggerService;
|
|
11
11
|
protected readonly batchedGraphClient: ApolloClient<NormalizedCacheObject>;
|
|
12
|
-
constructor(
|
|
12
|
+
constructor(cacheService: RedisCacheService, graphqlClient: ApolloClient<NormalizedCacheObject>, loggerService: LoggerService, batchedGraphClient: ApolloClient<NormalizedCacheObject>, edgeApiClient: EdgeApiClient | null);
|
|
13
13
|
getMeteredEntitlement(customerRefId: string, featureRefId: string, fallbackEntitlement: MeteredEntitlement, resourceId?: string, options?: MeteredEntitlementOptions): Promise<MeteredEntitlement>;
|
|
14
14
|
getCustomerEntitlementsWithUsage(customerRefId: string, resourceId: string | undefined): Promise<import("../models").Entitlement[]>;
|
|
15
15
|
clearCache(): Promise<void>;
|
|
@@ -6,8 +6,8 @@ const models_1 = require("../models");
|
|
|
6
6
|
const entitlementDecisionService_1 = require("./entitlementDecisionService");
|
|
7
7
|
const lodash_1 = require("lodash");
|
|
8
8
|
class RedisEntitlementsService extends entitlementsService_1.EntitlementsService {
|
|
9
|
-
constructor(
|
|
10
|
-
super(graphqlClient, loggerService, batchedGraphClient, edgeApiClient, cacheService
|
|
9
|
+
constructor(cacheService, graphqlClient, loggerService, batchedGraphClient, edgeApiClient) {
|
|
10
|
+
super(graphqlClient, loggerService, batchedGraphClient, edgeApiClient, cacheService);
|
|
11
11
|
this.cacheService = cacheService;
|
|
12
12
|
this.graphqlClient = graphqlClient;
|
|
13
13
|
this.loggerService = loggerService;
|
|
@@ -20,12 +20,11 @@ class RedisEntitlementsService extends entitlementsService_1.EntitlementsService
|
|
|
20
20
|
const requestUsage = options === null || options === void 0 ? void 0 : options.requestedUsage;
|
|
21
21
|
let { entitlement, customerExists } = await this.tryGetCacheCustomerAndEntitlement(featureRefId, customerRefId, resourceId);
|
|
22
22
|
if (!(0, lodash_1.isEmpty)(entitlement)) {
|
|
23
|
-
const featureUsageData = await this.cacheService.getFeatureUsage(
|
|
23
|
+
const featureUsageData = await this.cacheService.getFeatureUsage(customerRefId, featureRefId, resourceId);
|
|
24
24
|
if (featureUsageData === null) {
|
|
25
25
|
this.loggerService.error('Failed to find metered feature usage - going to refetch entitlements', {
|
|
26
26
|
customerRefId,
|
|
27
27
|
featureRefId,
|
|
28
|
-
environmentPrefix: this.environmentPrefix,
|
|
29
28
|
});
|
|
30
29
|
entitlement = null;
|
|
31
30
|
}
|
|
@@ -62,10 +61,10 @@ class RedisEntitlementsService extends entitlementsService_1.EntitlementsService
|
|
|
62
61
|
return this.modelMapper.mapMeteredEntitlement(entitlement, decision, requestUsage);
|
|
63
62
|
}
|
|
64
63
|
async getCustomerEntitlementsWithUsage(customerRefId, resourceId) {
|
|
65
|
-
let cachedEntitlements = await this.cacheService.getCustomerEntitlementsWithUsage(
|
|
64
|
+
let cachedEntitlements = await this.cacheService.getCustomerEntitlementsWithUsage(customerRefId, resourceId);
|
|
66
65
|
if (cachedEntitlements === null) {
|
|
67
66
|
await this.refetchEntitlements(customerRefId, resourceId, false, 'getCustomerEntitlementsWithUsage');
|
|
68
|
-
cachedEntitlements = await this.cacheService.getCustomerEntitlementsWithUsage(
|
|
67
|
+
cachedEntitlements = await this.cacheService.getCustomerEntitlementsWithUsage(customerRefId, resourceId);
|
|
69
68
|
if (cachedEntitlements === null) {
|
|
70
69
|
return [];
|
|
71
70
|
}
|
|
@@ -89,4 +88,4 @@ class RedisEntitlementsService extends entitlementsService_1.EntitlementsService
|
|
|
89
88
|
}
|
|
90
89
|
}
|
|
91
90
|
exports.RedisEntitlementsService = RedisEntitlementsService;
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
91
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXNFbnRpdGxlbWVudHNTZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlcnZpY2VzL3JlZGlzRW50aXRsZW1lbnRzU2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwrREFBNEQ7QUFJNUQsc0NBQXFGO0FBQ3JGLDZFQUEwRTtBQUMxRSxtQ0FBaUM7QUFHakMsTUFBYSx3QkFBeUIsU0FBUSx5Q0FBbUI7SUFDL0QsWUFDcUIsWUFBK0IsRUFDL0IsYUFBa0QsRUFDbEQsYUFBNEIsRUFDNUIsa0JBQXVELEVBQzFFLGFBQW1DO1FBRW5DLEtBQUssQ0FBQyxhQUFhLEVBQUUsYUFBYSxFQUFFLGtCQUFrQixFQUFFLGFBQWEsRUFBRSxZQUFZLENBQUMsQ0FBQztRQU5sRSxpQkFBWSxHQUFaLFlBQVksQ0FBbUI7UUFDL0Isa0JBQWEsR0FBYixhQUFhLENBQXFDO1FBQ2xELGtCQUFhLEdBQWIsYUFBYSxDQUFlO1FBQzVCLHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBcUM7UUFJMUUsSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLENBQUMsQ0FBQyw0Q0FBNEM7SUFDekUsQ0FBQztJQUVELEtBQUssQ0FBQyxxQkFBcUIsQ0FDekIsYUFBcUIsRUFDckIsWUFBb0IsRUFDcEIsbUJBQXVDLEVBQ3ZDLFVBQW1CLEVBQ25CLE9BQW1DOztRQUVuQyxNQUFNLFdBQVcsR0FBRyxDQUFBLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxXQUFXLEtBQUksS0FBSyxDQUFDO1FBQ2xELE1BQU0sWUFBWSxHQUFHLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxjQUFjLENBQUM7UUFDN0MsSUFBSSxFQUFFLFdBQVcsRUFBRSxjQUFjLEVBQUUsR0FBRyxNQUFNLElBQUksQ0FBQyxpQ0FBaUMsQ0FDaEYsWUFBWSxFQUNaLGFBQWEsRUFDYixVQUFVLENBQ1gsQ0FBQztRQUVGLElBQUksQ0FBQyxJQUFBLGdCQUFP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
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ReuseOngoingExecution = void 0;
|
|
4
|
+
// This decorator ensures that a function, when invoked with the same arguments,
|
|
5
|
+
// does not execute multiple times simultaneously. Instead, it reuses the promise from the ongoing
|
|
6
|
+
// execution for subsequent calls with the same arguments.
|
|
7
|
+
const ReuseOngoingExecution = (getUniqueKey) => {
|
|
8
|
+
const onGoingPromises = new Map();
|
|
9
|
+
return (_target, _propertyKey, descriptor) => {
|
|
10
|
+
const fn = descriptor.value;
|
|
11
|
+
descriptor.value = function decoratedValue(...args) {
|
|
12
|
+
const key = getUniqueKey(...args);
|
|
13
|
+
if (key) {
|
|
14
|
+
const existingPromise = onGoingPromises.get(key);
|
|
15
|
+
if (existingPromise) {
|
|
16
|
+
return existingPromise;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
|
20
|
+
const result = fn.apply(this, args);
|
|
21
|
+
if (key) {
|
|
22
|
+
const promise = result.finally(() => onGoingPromises.delete(key));
|
|
23
|
+
onGoingPromises.set(key, promise);
|
|
24
|
+
return promise;
|
|
25
|
+
}
|
|
26
|
+
return result;
|
|
27
|
+
};
|
|
28
|
+
};
|
|
29
|
+
};
|
|
30
|
+
exports.ReuseOngoingExecution = ReuseOngoingExecution;
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmV1c2VPbmdvaW5nRXhlY3V0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3V0aWxzL2RlY29yYXRvcnMvUmV1c2VPbmdvaW5nRXhlY3V0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLGdGQUFnRjtBQUNoRixrR0FBa0c7QUFDbEcsMERBQTBEO0FBQ25ELE1BQU0scUJBQXFCLEdBQUcsQ0FBQyxZQUE0QixFQUFFLEVBQUU7SUFDcEUsTUFBTSxlQUFlLEdBQUcsSUFBSSxHQUFHLEVBQTRCLENBQUM7SUFFNUQsT0FBTyxDQUFDLE9BQVksRUFBRSxZQUFvQixFQUFFLFVBQThCLEVBQUUsRUFBRTtRQUM1RSxNQUFNLEVBQUUsR0FBRyxVQUFVLENBQUMsS0FBSyxDQUFDO1FBRTVCLFVBQVUsQ0FBQyxLQUFLLEdBQUcsU0FBUyxjQUFjLENBQUMsR0FBRyxJQUFXO1lBQ3ZELE1BQU0sR0FBRyxHQUFHLFlBQVksQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUFDO1lBRWxDLElBQUksR0FBRyxFQUFFO2dCQUNQLE1BQU0sZUFBZSxHQUFHLGVBQWUsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQ2pELElBQUksZUFBZSxFQUFFO29CQUNuQixPQUFPLGVBQWUsQ0FBQztpQkFDeEI7YUFDRjtZQUVELDZEQUE2RDtZQUM3RCxNQUFNLE1BQU0sR0FBRyxFQUFFLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztZQUVwQyxJQUFJLEdBQUcsRUFBRTtnQkFDUCxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLGVBQWUsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztnQkFDbEUsZUFBZSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUM7Z0JBQ2xDLE9BQU8sT0FBTyxDQUFDO2FBQ2hCO1lBRUQsT0FBTyxNQUFNLENBQUM7UUFDaEIsQ0FBQyxDQUFDO0lBQ0osQ0FBQyxDQUFDO0FBQ0osQ0FBQyxDQUFDO0FBNUJXLFFBQUEscUJBQXFCLHlCQTRCaEMifQ==
|