@effect-app/infra 1.23.3 → 1.23.5

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.
Files changed (53) hide show
  1. package/CHANGELOG.md +15 -0
  2. package/_cjs/api/internal/events.cjs +1 -1
  3. package/_cjs/api/internal/middlewares.cjs +1 -1
  4. package/_cjs/api/internal/middlewares.cjs.map +1 -1
  5. package/_cjs/api/routing/defaultErrorHandler.cjs +1 -1
  6. package/_cjs/api/routing/makeRequestHandler.cjs +1 -1
  7. package/_cjs/services/Emailer/Sendgrid.cjs +1 -1
  8. package/_cjs/services/Emailer/Sendgrid.cjs.map +1 -1
  9. package/_cjs/services/Emailer/fake.cjs +1 -1
  10. package/_cjs/services/QueueMaker/SQLQueue.cjs +39 -39
  11. package/_cjs/services/QueueMaker/SQLQueue.cjs.map +1 -1
  12. package/_cjs/services/QueueMaker/memQueue.cjs +1 -1
  13. package/_cjs/services/QueueMaker/memQueue.cjs.map +1 -1
  14. package/_cjs/services/QueueMaker/sbqueue.cjs +1 -1
  15. package/_cjs/services/QueueMaker/sbqueue.cjs.map +1 -1
  16. package/_cjs/services/Store/Cosmos/query.cjs +1 -1
  17. package/_cjs/services/Store/Cosmos.cjs +1 -1
  18. package/_cjs/services/Store/Cosmos.cjs.map +1 -1
  19. package/_cjs/services/Store/Memory.cjs +1 -1
  20. package/dist/api/internal/events.js +2 -2
  21. package/dist/api/internal/middlewares.js +2 -2
  22. package/dist/api/routing/defaultErrorHandler.js +2 -2
  23. package/dist/api/routing/makeRequestHandler.js +2 -2
  24. package/dist/services/Emailer/Sendgrid.js +2 -2
  25. package/dist/services/Emailer/fake.js +2 -2
  26. package/dist/services/QueueMaker/SQLQueue.d.ts +0 -3
  27. package/dist/services/QueueMaker/SQLQueue.d.ts.map +1 -1
  28. package/dist/services/QueueMaker/SQLQueue.js +23 -23
  29. package/dist/services/QueueMaker/memQueue.js +2 -2
  30. package/dist/services/QueueMaker/sbqueue.js +2 -2
  31. package/dist/services/Store/Cosmos/query.js +2 -2
  32. package/dist/services/Store/Cosmos.js +2 -2
  33. package/dist/services/Store/Memory.js +2 -2
  34. package/package.json +3 -3
  35. package/src/api/internal/events.ts +1 -1
  36. package/src/api/internal/middlewares.ts +1 -1
  37. package/src/api/routing/defaultErrorHandler.ts +1 -1
  38. package/src/api/routing/makeRequestHandler.ts +1 -1
  39. package/src/services/Emailer/Sendgrid.ts +1 -1
  40. package/src/services/Emailer/fake.ts +1 -1
  41. package/src/services/QueueMaker/SQLQueue.ts +23 -23
  42. package/src/services/QueueMaker/memQueue.ts +1 -1
  43. package/src/services/QueueMaker/sbqueue.ts +1 -1
  44. package/src/services/Store/Cosmos/query.ts +1 -1
  45. package/src/services/Store/Cosmos.ts +1 -1
  46. package/src/services/Store/Memory.ts +1 -1
  47. package/tsconfig.json +0 -1
  48. package/tsconfig.src.json +0 -1
  49. package/tsconfig.test.json +0 -1
  50. package/vitest.config.ts.timestamp-1711656440838-19c636fe320df.mjs +0 -0
  51. package/vitest.config.ts.timestamp-1711724061890-6ecedb0a07fdd.mjs +0 -0
  52. package/vitest.config.ts.timestamp-1711743489537-da8d9e5f66c9f.mjs +0 -0
  53. package/vitest.config.ts.timestamp-1711744615239-dcf257a844e01.mjs +37 -0
@@ -1,7 +1,7 @@
1
1
  /* eslint-disable @typescript-eslint/no-explicit-any */
2
2
  import { Array, Effect, FiberRef, flow, Option, Order, pipe, Ref, Struct } from "effect-app";
3
3
  import { get } from "effect-app/utils";
4
- import { InfraLogger } from "src/logger.js";
4
+ import { InfraLogger } from "../../logger.js";
5
5
  import { StoreMaker } from "./service.js";
6
6
  import { codeFilter, makeUpdateETag } from "./utils.js";
7
7
  export function memFilter(f) {
@@ -170,4 +170,4 @@ export const makeMemoryStore = () => ({
170
170
  })
171
171
  });
172
172
  export const MemoryStoreLive = StoreMaker.toLayer(Effect.sync(() => makeMemoryStore()));
173
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Memory.js","sourceRoot":"","sources":["../../../src/services/Store/Memory.ts"],"names":[],"mappings":"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"}
173
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Memory.js","sourceRoot":"","sources":["../../../src/services/Store/Memory.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAEvD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAE5F,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAG7C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAEvD,MAAM,UAAU,SAAS,CAAsD,CAAmB;IAEhG,OAAO,CAAC,CAAC,CAAM,EAAO,EAAE;QACtB,MAAM,MAAM,GAAG,CAAC,CAAM,EAAO,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAQ,CAAA;QACvF,MAAM,IAAI,GAAG,CAAC,EAAE,IAAI,CAAA;QACpB,MAAM,KAAK,GAAG,CAAC,EAAE,KAAK,CAAA;QACtB,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAC1D,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACV,KAAK,CAAC,IAAI,CAAI,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YAC3B,qDAAqD;YACrD,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,CAAA;YACvC,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,CAAA;YACvC,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;gBACpB,OAAO,CAAC,CAAA;YACV,CAAC;YACD,IAAI,CAAC,CAAC,SAAS,KAAK,KAAK,EAAE,CAAC;gBAC1B,OAAO,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAC/B,CAAC;YACD,OAAO,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/B,CAAC,CAAC,CACH,CAAC,CAAA;QACJ,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YACxB,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QACpC,CAAC;QACD,IAAI,CAAC,IAAI,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,MAAM,CACX,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAC9E,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EACtB,MAAM,CAAC,SAAS,CACd,GAAG,EAAE,CAAC,EAAE,CACT,CACF,CACF,CAAA;QACH,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/D,IAAI,IAAI,EAAE,CAAC;YACT,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAA;QACzB,CAAC;QACD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QAC1B,CAAC;QAED,OAAO,MAAM,CAAC,CAAC,CAAC,CAAA;IAClB,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;AAErD;;GAEG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,GAAmB,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,SAAS,IAAI,SAAS,CAAC,CAAA;AAEnH,SAAS,QAAQ,CAAC,CAAuB,EAAE,aAAmB;IAC5D,OAAO,WAAW;SACf,QAAQ,CAAC,WAAW,CAAC;SACrB,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;QACxB,MAAM,EAAE,IAAI,CAAC,SAAS,CACpB,CAAC,CAAC,MAAM,EACR,SAAS,EACT,CAAC,CACF;QACD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QAC5C,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QAC9C,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,SAAS,EAAE,CAAC,CAAC;QAC1D,IAAI,EAAE,CAAC,CAAC,IAAI;QACZ,KAAK,EAAE,CAAC,CAAC,KAAK;KACf,CAAC,CAAC,CAAA;AACP,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,SAAiB,EACjB,SAAiB,EACjB,IAAsC,EACtC,cAAiC;IAGjC,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACzB,MAAM,UAAU,GAAG,cAAc,CAAC,SAAS,CAAC,CAAA;QAC5C,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAA;QACnD,MAAM,aAAa,GAAG,cAAc,IAAI,EAAE,CAAA;QAE1C,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,aAAa,EAAE,GAAG,CAAC,EAAE,CAAU,CAAC,CAAC,CAAA;QAC5G,MAAM,KAAK,GAAG,GAAG,CAAC,UAAU,CAAsB,KAAK,CAAC,CAAA;QACxD,MAAM,GAAG,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAA;QACzC,MAAM,UAAU,GAAG,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;QACrC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAA;QAE5D,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,YAAY,CAAC,CAAA;QAElD,MAAM,QAAQ,GAAG,CAAC,KAAgC,EAAE,EAAE,CACpD,MAAM;aACH,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;aACxF,IAAI,CACH,MAAM;aACH,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACb,GAAG;aACA,GAAG,CAAC,KAAK,CAAC;aACV,IAAI,CACH,MAAM;aACH,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,MAAM,GAAG,GAAG,CAAgB,CAAA;YAC5B,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;YACtC,OAAO,GAAG,CAAA;QACZ,CAAC,CAAC,EACJ,MAAM;aACH,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CACrC,CACJ,EACH,MAAM;aACH,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAChB,UAAU,CACX,CAAA;QACL,MAAM,CAAC,GAAuB;YAC5B,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,qCAAqC,EAAE;gBACnE,iBAAiB,EAAE,KAAK;gBACxB,UAAU,EAAE;oBACV,SAAS;oBACT,SAAS;iBACV;aACF,CAAC,CAAC;YACH,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CACX,GAAG;iBACA,GAAG,CAAC,KAAK,CAAC;iBACV,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EACjD,MAAM;iBACH,QAAQ,CAAC,sCAAsC,EAAE;gBAChD,iBAAiB,EAAE,KAAK;gBACxB,UAAU,EAAE;oBACV,SAAS;oBACT,SAAS;iBACV;aACF,CAAC,CACL;YACL,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CACZ,GAAG;iBACA,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,EAC5C,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EACxB,MAAM,CAAC,QAAQ,CAAC,wCAAwC,EAAE;gBACxD,iBAAiB,EAAE,KAAK;gBACxB,UAAU,EAAE,EAAE,uBAAuB,EAAE,SAAS,EAAE,sBAAsB,EAAE,SAAS,EAAE;aACtF,CAAC,CACH;YACL,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CACT,CAAC;iBACE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;iBACV,IAAI,CACH,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,EACnD,MAAM;iBACH,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACT,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CACjB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAC7C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CACzC,CACF,EACH,UAAU,EACV,MAAM;iBACH,QAAQ,CAAC,qCAAqC,EAAE;gBAC/C,iBAAiB,EAAE,KAAK;gBACxB,UAAU,EAAE,EAAE,uBAAuB,EAAE,SAAS,EAAE,sBAAsB,EAAE,SAAS,EAAE;aACtF,CAAC,CACL;YACL,QAAQ,EAAE,CAAC,KAA6B,EAAE,EAAE,CAC1C,IAAI,CACF,MAAM;iBACH,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC;gBAClB,sBAAsB;iBACrB,IAAI,CACH,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,GAAG,EAAE,4CAA4C,CAAC,EAC/F,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EACxB,MAAM;iBACH,QAAQ,CAAC,0CAA0C,EAAE;gBACpD,iBAAiB,EAAE,KAAK;gBACxB,UAAU,EAAE,EAAE,uBAAuB,EAAE,SAAS,EAAE,sBAAsB,EAAE,SAAS,EAAE;aACtF,CAAC,CACL,CACJ;YACH,OAAO,EAAE,IAAI,CACX,QAAQ,EACR,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,yCAAyC,EAAE;gBAChE,iBAAiB,EAAE,KAAK;gBACxB,UAAU,EAAE,EAAE,uBAAuB,EAAE,SAAS,EAAE,sBAAsB,EAAE,SAAS,EAAE;aACtF,CAAC,CAAC,CACN;YACD,MAAM,EAAE,CAAC,CAAU,EAAE,EAAE,CACrB,GAAG;iBACA,GAAG,CAAC,KAAK,CAAC;iBACV,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAC9D,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EACxC,UAAU,EACV,MAAM,CAAC,QAAQ,CAAC,wCAAwC,EAAE;gBACxD,iBAAiB,EAAE,KAAK;gBACxB,UAAU,EAAE,EAAE,uBAAuB,EAAE,SAAS,EAAE,sBAAsB,EAAE,SAAS,EAAE;aACtF,CAAC,CACH;SACN,CAAA;QACD,OAAO,CAAC,CAAA;IACV,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,CAAC;IACpC,IAAI,EAAE,CACJ,SAAiB,EACjB,IAAsC,EACtC,MAA6B,EAC7B,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,SAAS,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAA;QAC/C,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,kBAAkB,CAAoB,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAA;QAC/G,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAK,CAAA;QACtC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;QAC9C,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,cAAc;YACtC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;YACzB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;gBACxD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;gBACnC,IAAI,KAAK,EAAE,CAAC;oBACV,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;gBAC9B,CAAC;gBACD,IAAI,CAAC,MAAM,CAAC,cAAe,CAAC,SAAS,CAAC,EAAE,CAAC;oBACvC,MAAM,IAAI,KAAK,CAAC,aAAa,SAAS,eAAe,CAAC,CAAA;gBACxD,CAAC;gBACD,OAAO,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;oBAClD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;oBACnC,IAAI,KAAK;wBAAE,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAA;oBAC1C,OAAO,kBAAkB,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC;yBACzE,IAAI,CACH,MAAM,CAAC,KAAK,EACZ,MAAM;yBACH,OAAO,CAAC,GAAG,CAAC,EACf,MAAM;yBACH,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,CACnE,CAAA;gBACL,CAAC,CAAC,CAAC,CAAA;YACL,CAAC,CAAC,CAAC,CAAA;QACL,MAAM,CAAC,GAAuB;YAC5B,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;YAC3C,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;YACnE,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;YACvE,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;YACjE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;YAC3E,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;YACzE,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;SACxE,CAAA;QACD,OAAO,CAAC,CAAA;IACV,CAAC,CAAC;CACL,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,eAAe,EAAE,CAAC,CAAC,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect-app/infra",
3
- "version": "1.23.3",
3
+ "version": "1.23.5",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "dependencies": {
@@ -19,9 +19,9 @@
19
19
  "pure-rand": "6.1.0",
20
20
  "redlock": "^4.2.0",
21
21
  "@effect-app/core": "1.10.2",
22
- "effect-app": "1.17.4",
23
22
  "@effect-app/schema": "1.12.2",
24
- "@effect-app/infra-adapters": "1.11.6"
23
+ "@effect-app/infra-adapters": "1.11.7",
24
+ "effect-app": "1.17.5"
25
25
  },
26
26
  "devDependencies": {
27
27
  "@babel/cli": "^7.25.6",
@@ -2,7 +2,7 @@ import { setupRequestContext } from "@effect-app/infra/api/setupRequest"
2
2
  import { reportError } from "@effect-app/infra/errorReporter"
3
3
  import { Duration, Effect, pipe, S, Schedule, Stream } from "effect-app"
4
4
  import { HttpHeaders, HttpServerResponse } from "effect-app/http"
5
- import { InfraLogger } from "src/logger.js"
5
+ import { InfraLogger } from "../../logger.js"
6
6
 
7
7
  // Tell the client to retry every 10 seconds if connectivity is lost
8
8
  const setRetry = Stream.succeed("retry: 10000")
@@ -17,7 +17,7 @@ import * as FiberRef from "effect/FiberRef"
17
17
  import { pipe } from "effect/Function"
18
18
  import * as HashMap from "effect/HashMap"
19
19
  import * as Metric from "effect/Metric"
20
- import { InfraLogger } from "src/logger.js"
20
+ import { InfraLogger } from "../../logger.js"
21
21
  import type * as Middlewares from "../middlewares.js"
22
22
 
23
23
  export const accessLog = (level: "Info" | "Warning" | "Debug" = "Info") =>
@@ -19,7 +19,7 @@ import type {
19
19
  InvalidTokenError,
20
20
  UnauthorizedError as JWTUnauthorizedError
21
21
  } from "express-oauth2-jwt-bearer"
22
- import { InfraLogger } from "src/logger.js"
22
+ import { InfraLogger } from "../../logger.js"
23
23
 
24
24
  export class JWTError extends Data.TaggedClass("JWTError")<{
25
25
  error:
@@ -15,7 +15,7 @@ import type { HttpServerError } from "effect-app/http"
15
15
  import { HttpBody, HttpRouter, HttpServerRequest, HttpServerResponse } from "effect-app/http"
16
16
  import { NonEmptyString255 } from "effect-app/schema"
17
17
  import type { REST } from "effect-app/schema"
18
- import { InfraLogger } from "src/logger.js"
18
+ import { InfraLogger } from "../../logger.js"
19
19
  import { updateRequestContext } from "../setupRequest.js"
20
20
  import { makeRequestParsers, parseRequestParams } from "./base.js"
21
21
  import type { RequestHandler, RequestHandlerBase } from "./base.js"
@@ -2,8 +2,8 @@ import { dropUndefinedT } from "@effect-app/core/utils"
2
2
  import type { EmailData } from "@sendgrid/helpers/classes/email-address.js"
3
3
  import sgMail from "@sendgrid/mail"
4
4
  import { Array, Effect, Equivalence, Secret } from "effect-app"
5
- import { InfraLogger } from "src/logger.js"
6
5
  import { inspect } from "util"
6
+ import { InfraLogger } from "../../logger.js"
7
7
  import { Emailer } from "./service.js"
8
8
  import type { EmailMsg, EmailMsgOptionalFrom, SendgridConfig } from "./service.js"
9
9
 
@@ -1,6 +1,6 @@
1
1
  import { Effect } from "effect-app"
2
2
  import { pretty } from "effect-app/utils"
3
- import { InfraLogger } from "src/logger.js"
3
+ import { InfraLogger } from "../../logger.js"
4
4
  import { Emailer } from "./service.js"
5
5
 
6
6
  const makeFake = InfraLogger
@@ -1,23 +1,23 @@
1
+ import { Model } from "@effect-app/infra-adapters/SQL"
1
2
  import { setupRequestContext } from "@effect-app/infra/api/setupRequest"
2
3
  import { RequestContext } from "@effect-app/infra/RequestContext"
3
4
  import { reportNonInterruptedFailure } from "@effect-app/infra/services/QueueMaker/errors"
4
5
  import type { QueueBase } from "@effect-app/infra/services/QueueMaker/service"
5
6
  import { QueueMeta } from "@effect-app/infra/services/QueueMaker/service"
6
7
  import { RequestContextContainer } from "@effect-app/infra/services/RequestContextContainer"
7
- import { Model, SqlClient } from "@effect/sql"
8
+ import { SqlClient } from "@effect/sql"
9
+ import { randomUUID } from "crypto"
8
10
  import { subMinutes } from "date-fns"
9
11
  import { Effect, Fiber, Option, S, Tracer } from "effect-app"
10
12
  import { RequestId } from "effect-app/ids"
11
13
  import { NonEmptyString255 } from "effect-app/schema"
12
14
  import { pretty } from "effect-app/utils"
13
- import { InfraLogger } from "src/logger.js"
15
+ import { InfraLogger } from "../../logger.js"
14
16
 
15
17
  export const QueueId = S.Number.pipe(S.brand("QueueId"))
16
18
  export type QueueId = typeof QueueId.Type
17
19
 
18
- /**
19
- * Currently limited to one process draining at a time, due to in-process Semaphore instead of row-level locking.
20
- */
20
+ // TODO: let the model track and Auto Generate versionColumn on every update instead
21
21
  export function makeSQLQueue<
22
22
  Evt extends { id: S.StringId; _tag: string },
23
23
  DrainEvt extends { id: S.StringId; _tag: string },
@@ -38,7 +38,8 @@ export function makeSQLQueue<
38
38
  updatedAt: Model.DateTimeUpdate,
39
39
  // TODO: at+owner
40
40
  processingAt: Model.FieldOption(S.Date),
41
- finishedAt: Model.FieldOption(S.Date)
41
+ finishedAt: Model.FieldOption(S.Date),
42
+ etag: S.String // TODO: use a Model thing that auto updates it?
42
43
  // TODO: record locking.. / optimistic locking
43
44
  // rowVersion: Model.DateTimeFromNumberWithNow
44
45
  }
@@ -55,13 +56,15 @@ export function makeSQLQueue<
55
56
  const queueRepo = yield* Model.makeRepository(Queue, {
56
57
  tableName: "queue",
57
58
  spanPrefix: "QueueRepo",
58
- idColumn: "id"
59
+ idColumn: "id",
60
+ versionColumn: "etag"
59
61
  })
60
62
 
61
63
  const drainRepo = yield* Model.makeRepository(Drain, {
62
64
  tableName: "queue",
63
65
  spanPrefix: "DrainRepo",
64
- idColumn: "id"
66
+ idColumn: "id",
67
+ versionColumn: "etag"
65
68
  })
66
69
 
67
70
  const decodeDrain = S.decode(Drain)
@@ -74,9 +77,6 @@ export function makeSQLQueue<
74
77
  LIMIT 1`
75
78
  }
76
79
 
77
- // temporary workaround until we have a SQLite rowversion..
78
- const lock = yield* Effect.makeSemaphore(1)
79
-
80
80
  const q = {
81
81
  offer: (body: Evt, meta: typeof QueueMeta.Type) =>
82
82
  Effect.gen(function*() {
@@ -86,28 +86,28 @@ export function makeSQLQueue<
86
86
  meta,
87
87
  name: queueName,
88
88
  processingAt: Option.none(),
89
- finishedAt: Option.none()
89
+ finishedAt: Option.none(),
90
+ etag: randomUUID()
90
91
  })
91
92
  )
92
93
  }),
93
94
  take: Effect.gen(function*() {
94
95
  while (true) {
95
- const first = yield* lock.withPermits(1)(Effect.gen(function*() {
96
- const [first] = yield* drain()
97
- if (first) {
98
- const dec = yield* decodeDrain(first)
99
- const { createdAt, updatedAt, ...rest } = dec
100
- yield* drainRepo.update(Drain.update.make({ ...rest, processingAt: Option.some(new Date()) }))
101
- return dec
102
- }
103
- return null
104
- }))
96
+ const [first] = yield* drain()
97
+ if (first) {
98
+ const dec = yield* decodeDrain(first)
99
+ const { createdAt, updatedAt, ...rest } = dec
100
+ yield* drainRepo.update(
101
+ Drain.update.make({ ...rest, processingAt: Option.some(new Date()) }) // auto in lib , etag: randomUUID()
102
+ )
103
+ return dec
104
+ }
105
105
  if (first) return first
106
106
  yield* Effect.sleep(250)
107
107
  }
108
108
  }),
109
109
  finish: ({ createdAt, updatedAt, ...q }: Drain) =>
110
- drainRepo.update(Drain.update.make({ ...q, finishedAt: Option.some(new Date()) }))
110
+ drainRepo.update(Drain.update.make({ ...q, finishedAt: Option.some(new Date()) })) // auto in lib , etag: randomUUID()
111
111
  }
112
112
  const rcc = yield* RequestContextContainer
113
113
 
@@ -5,8 +5,8 @@ import { Tracer } from "effect"
5
5
  import { Effect, Fiber, flow, Option, S } from "effect-app"
6
6
  import { RequestId } from "effect-app/ids"
7
7
  import { pretty } from "effect-app/utils"
8
- import { InfraLogger } from "src/logger.js"
9
8
  import { setupRequestContext } from "../../api/setupRequest.js"
9
+ import { InfraLogger } from "../../logger.js"
10
10
  import { RequestContextContainer } from "../RequestContextContainer.js"
11
11
  import { reportNonInterruptedFailure } from "./errors.js"
12
12
  import { type QueueBase, QueueMeta } from "./service.js"
@@ -13,8 +13,8 @@ import { RequestId } from "effect-app/ids"
13
13
  import type { StringId } from "effect-app/schema"
14
14
  import { NonEmptyString255 } from "effect-app/schema"
15
15
  import { pretty } from "effect-app/utils"
16
- import { InfraLogger } from "src/logger.js"
17
16
  import { setupRequestContext } from "../../api/setupRequest.js"
17
+ import { InfraLogger } from "../../logger.js"
18
18
  import { RequestContextContainer } from "../RequestContextContainer.js"
19
19
  import { reportNonInterruptedFailure, reportNonInterruptedFailureCause, reportQueueError } from "./errors.js"
20
20
  import { type QueueBase, QueueMeta } from "./service.js"
@@ -1,7 +1,7 @@
1
1
  import { Array, Effect, Equivalence, pipe } from "effect-app"
2
2
  import type { NonEmptyReadonlyArray } from "effect-app"
3
3
  import { assertUnreachable } from "effect-app/utils"
4
- import { InfraLogger } from "src/logger.js"
4
+ import { InfraLogger } from "../../../logger.js"
5
5
  import type { FilterR, FilterResult } from "../filterApi/query.js"
6
6
  import type { SupportedValues } from "../service.js"
7
7
 
@@ -5,8 +5,8 @@ import { CosmosClient, CosmosClientLayer } from "@effect-app/infra-adapters/cosm
5
5
  import { Array, Chunk, Duration, Effect, Layer, Option, pipe, Secret, Struct } from "effect-app"
6
6
  import type { NonEmptyReadonlyArray } from "effect-app"
7
7
  import { dropUndefinedT } from "effect-app/utils"
8
- import { InfraLogger } from "src/logger.js"
9
8
  import { OptimisticConcurrencyException } from "../../errors.js"
9
+ import { InfraLogger } from "../../logger.js"
10
10
  import { buildWhereCosmosQuery3, logQuery } from "./Cosmos/query.js"
11
11
  import { StoreMaker } from "./service.js"
12
12
  import type { FilterArgs, PersistenceModelType, StorageConfig, Store, StoreConfig } from "./service.js"
@@ -3,7 +3,7 @@
3
3
  import { Array, Effect, FiberRef, flow, Option, Order, pipe, Ref, Struct } from "effect-app"
4
4
  import type { NonEmptyReadonlyArray } from "effect-app"
5
5
  import { get } from "effect-app/utils"
6
- import { InfraLogger } from "src/logger.js"
6
+ import { InfraLogger } from "../../logger.js"
7
7
  import type { RequestContext } from "../../RequestContext.js"
8
8
  import type { FilterArgs, PersistenceModelType, Store, StoreConfig } from "./service.js"
9
9
  import { StoreMaker } from "./service.js"
package/tsconfig.json CHANGED
@@ -19,7 +19,6 @@
19
19
  "lib": [
20
20
  "ES2023"
21
21
  ],
22
- "baseUrl": "./",
23
22
  "target": "es2022",
24
23
  "inlineSourceMap": true,
25
24
  "incremental": true,
package/tsconfig.src.json CHANGED
@@ -6,7 +6,6 @@
6
6
  ],
7
7
  "tsBuildInfoFile": "./dist/.tsbuildinfo",
8
8
  "esModuleInterop": true,
9
- "baseUrl": "./",
10
9
  "rootDir": "./src",
11
10
  // keep in here, cause madge can't detect it from extended tsconfig
12
11
  "moduleResolution": "Node16",
@@ -2,7 +2,6 @@
2
2
  "extends": "./tsconfig.src.json",
3
3
  "compilerOptions": {
4
4
  "rootDir": "./test",
5
- "baseUrl": "./test",
6
5
  "outDir": "./test/dist",
7
6
  "tsBuildInfoFile": "./test/dist/.tsbuildinfo",
8
7
  // "types": [
@@ -0,0 +1,37 @@
1
+ // packages/infra/vitest.config.ts
2
+ import { defineConfig } from "file:///Users/patrickroza/pj/effect-app/libs/node_modules/.pnpm/vite@5.2.6_@types+node@20.11.30/node_modules/vite/dist/node/index.js";
3
+
4
+ // vite.config.base.ts
5
+ import path from "path";
6
+ import fs from "fs";
7
+ var __vite_injected_original_dirname = "/Users/patrickroza/pj/effect-app/libs";
8
+ function makeConfig(dirName) {
9
+ const prefix = path.resolve(__vite_injected_original_dirname, "packages");
10
+ const packages = fs.readdirSync(prefix).map((f) => prefix + "/" + f).filter((f) => fs.lstatSync(f).isDirectory());
11
+ const cfg = {
12
+ // eslint-disable-next-line @typescript-eslint/no-var-requires
13
+ //plugins: [autoImport],
14
+ test: {
15
+ include: ["./test/**/*.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"],
16
+ reporters: "verbose",
17
+ globals: true
18
+ },
19
+ resolve: {
20
+ alias: packages.reduce((acc, cur) => {
21
+ acc[JSON.parse(fs.readFileSync(cur + "/package.json", "utf-8")).name] = path.resolve(cur, cur.endsWith("core") ? "dist" : "src");
22
+ return acc;
23
+ }, {})
24
+ // "@effect-app/core/Prelude": path.join(__dirname, "packages/core/src/Prelude.code.ts")
25
+ }
26
+ };
27
+ console.log(cfg);
28
+ return cfg;
29
+ }
30
+
31
+ // packages/infra/vitest.config.ts
32
+ var __vite_injected_original_dirname2 = "/Users/patrickroza/pj/effect-app/libs/packages/infra";
33
+ var vitest_config_default = defineConfig(makeConfig(__vite_injected_original_dirname2));
34
+ export {
35
+ vitest_config_default as default
36
+ };
37
+ //# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsicGFja2FnZXMvaW5mcmEvdml0ZXN0LmNvbmZpZy50cyIsICJ2aXRlLmNvbmZpZy5iYXNlLnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy9wYWNrYWdlcy9pbmZyYVwiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy9wYWNrYWdlcy9pbmZyYS92aXRlc3QuY29uZmlnLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9wai9lZmZlY3QtYXBwL2xpYnMvcGFja2FnZXMvaW5mcmEvdml0ZXN0LmNvbmZpZy50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCB7IGRlZmluZUNvbmZpZyB9IGZyb20gXCJ2aXRlXCJcbmltcG9ydCBtYWtlQ29uZmlnIGZyb20gXCIuLi8uLi92aXRlLmNvbmZpZy5iYXNlXCJcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lQ29uZmlnKG1ha2VDb25maWcoX19kaXJuYW1lKSlcbiIsICJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlic1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy92aXRlLmNvbmZpZy5iYXNlLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9wai9lZmZlY3QtYXBwL2xpYnMvdml0ZS5jb25maWcuYmFzZS50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCBwYXRoIGZyb20gXCJwYXRoXCJcbmltcG9ydCBmcyBmcm9tIFwiZnNcIlxuaW1wb3J0IEF1dG9JbXBvcnQgZnJvbSBcInVucGx1Z2luLWF1dG8taW1wb3J0L3ZpdGVcIlxuaW1wb3J0IHsgZGVmaW5lQ29uZmlnIH0gZnJvbSBcInZpdGVzdC9jb25maWdcIlxuXG4vLyBjb25zdCBhdXRvSW1wb3J0ID0gQXV0b0ltcG9ydCh7XG4vLyAgIGR0czogXCIuL3Rlc3QvYXV0by1pbXBvcnRzLmQudHNcIixcbi8vICAgLy8gaW5jbHVkZTogW1xuLy8gICAvLyAgIC9cXC50ZXN0XFwuW3RqXXN4PyQvIC8vIC50cywgLnRzeCwgLmpzLCAuanN4XG4vLyAgIC8vIF0sXG4vLyAgIGltcG9ydHM6IFtcbi8vICAgICBcInZpdGVzdFwiXG4vLyAgIF1cbi8vIH0pXG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIG1ha2VDb25maWcoZGlyTmFtZT86IHN0cmluZykge1xuICBjb25zdCBwcmVmaXggPSBwYXRoLnJlc29sdmUoX19kaXJuYW1lLCBcInBhY2thZ2VzXCIpXG4gIGNvbnN0IHBhY2thZ2VzID0gZnMucmVhZGRpclN5bmMocHJlZml4KS5tYXAoZiA9PiBwcmVmaXggKyBcIi9cIiArIGYpLmZpbHRlcihmID0+IGZzLmxzdGF0U3luYyhmKS5pc0RpcmVjdG9yeSgpIClcbiAgY29uc3QgY2ZnID0ge1xuICAgIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBAdHlwZXNjcmlwdC1lc2xpbnQvbm8tdmFyLXJlcXVpcmVzXG4gICAgLy9wbHVnaW5zOiBbYXV0b0ltcG9ydF0sXG4gICAgdGVzdDoge1xuICAgICAgaW5jbHVkZTogIFtcIi4vdGVzdC8qKi8qLnRlc3Que2pzLG1qcyxjanMsdHMsbXRzLGN0cyxqc3gsdHN4fVwiXSxcbiAgICAgIHJlcG9ydGVyczogXCJ2ZXJib3NlXCIsXG4gICAgICBnbG9iYWxzOiB0cnVlXG4gICAgfSxcbiAgICByZXNvbHZlOiB7XG4gICAgICBhbGlhczogcGFja2FnZXMucmVkdWNlKChhY2MsIGN1cikgPT4geyAvLyB3b3JrYXJvdW5kIGZvciAvUHJlbHVkZSBpc3N1ZVxuICAgICAgYWNjW0pTT04ucGFyc2UoZnMucmVhZEZpbGVTeW5jKGN1ciArIFwiL3BhY2thZ2UuanNvblwiLCBcInV0Zi04XCIpKS5uYW1lXSA9IHBhdGgucmVzb2x2ZShjdXIsIGN1ci5lbmRzV2l0aChcImNvcmVcIikgPyBcImRpc3RcIiA6IFwic3JjXCIpXG4gICAgICByZXR1cm4gYWNjXG4gICAgfSwgeyB9KSAvLyBcIkBlZmZlY3QtYXBwL2NvcmUvUHJlbHVkZVwiOiBwYXRoLmpvaW4oX19kaXJuYW1lLCBcInBhY2thZ2VzL2NvcmUvc3JjL1ByZWx1ZGUuY29kZS50c1wiKVxuICB9XG4gIH1cbiAgY29uc29sZS5sb2coY2ZnKVxuICByZXR1cm4gY2ZnXG59XG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQ0EsU0FBUyxvQkFBb0I7OztBQ0E3QixPQUFPLFVBQVU7QUFDakIsT0FBTyxRQUFRO0FBRmYsSUFBTSxtQ0FBbUM7QUFnQjFCLFNBQVIsV0FBNEIsU0FBa0I7QUFDbkQsUUFBTSxTQUFTLEtBQUssUUFBUSxrQ0FBVyxVQUFVO0FBQ2pELFFBQU0sV0FBVyxHQUFHLFlBQVksTUFBTSxFQUFFLElBQUksT0FBSyxTQUFTLE1BQU0sQ0FBQyxFQUFFLE9BQU8sT0FBSyxHQUFHLFVBQVUsQ0FBQyxFQUFFLFlBQVksQ0FBRTtBQUM3RyxRQUFNLE1BQU07QUFBQTtBQUFBO0FBQUEsSUFHVixNQUFNO0FBQUEsTUFDSixTQUFVLENBQUMsa0RBQWtEO0FBQUEsTUFDN0QsV0FBVztBQUFBLE1BQ1gsU0FBUztBQUFBLElBQ1g7QUFBQSxJQUNBLFNBQVM7QUFBQSxNQUNQLE9BQU8sU0FBUyxPQUFPLENBQUMsS0FBSyxRQUFRO0FBQ3JDLFlBQUksS0FBSyxNQUFNLEdBQUcsYUFBYSxNQUFNLGlCQUFpQixPQUFPLENBQUMsRUFBRSxJQUFJLElBQUksS0FBSyxRQUFRLEtBQUssSUFBSSxTQUFTLE1BQU0sSUFBSSxTQUFTLEtBQUs7QUFDL0gsZUFBTztBQUFBLE1BQ1QsR0FBRyxDQUFFLENBQUM7QUFBQTtBQUFBLElBQ1I7QUFBQSxFQUNBO0FBQ0EsVUFBUSxJQUFJLEdBQUc7QUFDZixTQUFPO0FBQ1Q7OztBRHBDQSxJQUFNQSxvQ0FBbUM7QUFJekMsSUFBTyx3QkFBUSxhQUFhLFdBQVdDLGlDQUFTLENBQUM7IiwKICAibmFtZXMiOiBbIl9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lIiwgIl9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lIl0KfQo=