@neohm/nestend 3.0.2 → 3.0.4
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/README.md +157 -81
- package/dist/admin/admin.module.d.ts +2 -3
- package/dist/admin/admin.module.d.ts.map +1 -1
- package/dist/admin/admin.module.js +9 -2
- package/dist/admin/admin.module.js.map +1 -1
- package/dist/admin/controllers/admin.scheduled.task.controller.js +1 -1
- package/dist/admin/controllers/admin.scheduled.task.controller.js.map +1 -1
- package/dist/admin/controllers/admin.tenant.controller.d.ts +5 -1
- package/dist/admin/controllers/admin.tenant.controller.d.ts.map +1 -1
- package/dist/admin/controllers/admin.tenant.controller.js +10 -4
- package/dist/admin/controllers/admin.tenant.controller.js.map +1 -1
- package/dist/admin/controllers/admin.user.controller.d.ts +6 -2
- package/dist/admin/controllers/admin.user.controller.d.ts.map +1 -1
- package/dist/admin/controllers/admin.user.controller.js +10 -4
- package/dist/admin/controllers/admin.user.controller.js.map +1 -1
- package/dist/admin/libraries/admin.user.data.processor.d.ts.map +1 -1
- package/dist/admin/libraries/admin.user.data.processor.js +2 -1
- package/dist/admin/libraries/admin.user.data.processor.js.map +1 -1
- package/dist/admin/libraries/bulk.user.data.processor.d.ts +2 -5
- package/dist/admin/libraries/bulk.user.data.processor.d.ts.map +1 -1
- package/dist/admin/libraries/bulk.user.data.processor.js +4 -3
- package/dist/admin/libraries/bulk.user.data.processor.js.map +1 -1
- package/dist/admin/libraries/client.user.data.processor.d.ts +9 -1
- package/dist/admin/libraries/client.user.data.processor.d.ts.map +1 -1
- package/dist/admin/libraries/client.user.data.processor.js +42 -2
- package/dist/admin/libraries/client.user.data.processor.js.map +1 -1
- package/dist/admin/libraries/tenant.data.processor.d.ts +8 -1
- package/dist/admin/libraries/tenant.data.processor.d.ts.map +1 -1
- package/dist/admin/libraries/tenant.data.processor.js +40 -2
- package/dist/admin/libraries/tenant.data.processor.js.map +1 -1
- package/dist/admin/types/admin.types.d.ts +9 -0
- package/dist/admin/types/admin.types.d.ts.map +1 -0
- package/dist/admin/types/admin.types.js +3 -0
- package/dist/admin/types/admin.types.js.map +1 -0
- package/dist/auth/auth.module.d.ts +2 -3
- package/dist/auth/auth.module.d.ts.map +1 -1
- package/dist/auth/auth.module.js.map +1 -1
- package/dist/auth/controllers/admin.auth.controller.js +1 -1
- package/dist/auth/controllers/admin.auth.controller.js.map +1 -1
- package/dist/auth/controllers/auth.controller.js +1 -1
- package/dist/auth/controllers/auth.controller.js.map +1 -1
- package/dist/auth/es6.classes.d.ts +2 -12
- package/dist/auth/es6.classes.d.ts.map +1 -1
- package/dist/auth/es6.classes.js +2 -24
- package/dist/auth/es6.classes.js.map +1 -1
- package/dist/auth/helpers/admin.auth.d.ts.map +1 -1
- package/dist/auth/helpers/admin.auth.js.map +1 -1
- package/dist/auth/helpers/auth.d.ts.map +1 -1
- package/dist/auth/helpers/auth.js.map +1 -1
- package/dist/auth/processors/change.password.data.processor.d.ts.map +1 -1
- package/dist/auth/processors/change.password.data.processor.js.map +1 -1
- package/dist/auth/processors/register.user.data.processor.d.ts.map +1 -1
- package/dist/auth/processors/register.user.data.processor.js +2 -1
- package/dist/auth/processors/register.user.data.processor.js.map +1 -1
- package/dist/auth/services/admin.auth.service.d.ts.map +1 -1
- package/dist/auth/services/admin.auth.service.js +1 -0
- package/dist/auth/services/admin.auth.service.js.map +1 -1
- package/dist/auth/services/auth.service.d.ts.map +1 -1
- package/dist/auth/services/auth.service.js +1 -0
- package/dist/auth/services/auth.service.js.map +1 -1
- package/dist/auth/types/auth.types.d.ts +11 -0
- package/dist/auth/types/auth.types.d.ts.map +1 -1
- package/dist/auth/utilities/auth.utilities.d.ts +2 -0
- package/dist/auth/utilities/auth.utilities.d.ts.map +1 -1
- package/dist/auth/utilities/auth.utilities.js +7 -0
- package/dist/auth/utilities/auth.utilities.js.map +1 -1
- package/dist/common/consumers/job.consumer.d.ts +4 -0
- package/dist/common/consumers/job.consumer.d.ts.map +1 -1
- package/dist/common/consumers/job.consumer.js +22 -2
- package/dist/common/consumers/job.consumer.js.map +1 -1
- package/dist/common/entities/scheduled.event.entity.d.ts.map +1 -1
- package/dist/common/entities/scheduled.event.entity.js.map +1 -1
- package/dist/common/es6.classes.d.ts +3 -21
- package/dist/common/es6.classes.d.ts.map +1 -1
- package/dist/common/es6.classes.js +2 -20
- package/dist/common/es6.classes.js.map +1 -1
- package/dist/common/jobs/dispatch.scheduled.event.job.d.ts +2 -0
- package/dist/common/jobs/dispatch.scheduled.event.job.d.ts.map +1 -1
- package/dist/common/jobs/dispatch.scheduled.event.job.js +18 -7
- package/dist/common/jobs/dispatch.scheduled.event.job.js.map +1 -1
- package/dist/common/jobs/set.scheduled.event.job.d.ts +1 -2
- package/dist/common/jobs/set.scheduled.event.job.d.ts.map +1 -1
- package/dist/common/jobs/set.scheduled.event.job.js +22 -19
- package/dist/common/jobs/set.scheduled.event.job.js.map +1 -1
- package/dist/common/jobs/system.scheduled.task.job.d.ts.map +1 -1
- package/dist/common/jobs/system.scheduled.task.job.js +3 -1
- package/dist/common/jobs/system.scheduled.task.job.js.map +1 -1
- package/dist/common/libraries/common.data.processor.d.ts +2 -4
- package/dist/common/libraries/common.data.processor.d.ts.map +1 -1
- package/dist/common/libraries/common.data.processor.js.map +1 -1
- package/dist/common/queue.module.d.ts.map +1 -1
- package/dist/common/queue.module.js +8 -0
- package/dist/common/queue.module.js.map +1 -1
- package/dist/common/services/queue.service.d.ts +2 -2
- package/dist/common/services/queue.service.d.ts.map +1 -1
- package/dist/common/services/queue.service.js.map +1 -1
- package/dist/common/services/system.property.service.d.ts +3 -4
- package/dist/common/services/system.property.service.d.ts.map +1 -1
- package/dist/common/services/system.property.service.js +12 -14
- package/dist/common/services/system.property.service.js.map +1 -1
- package/dist/common/subscribers/common.subscriber.d.ts.map +1 -1
- package/dist/common/subscribers/common.subscriber.js +8 -0
- package/dist/common/subscribers/common.subscriber.js.map +1 -1
- package/dist/common/system.property.module.d.ts +2 -3
- package/dist/common/system.property.module.d.ts.map +1 -1
- package/dist/common/system.property.module.js.map +1 -1
- package/dist/common/types/data.processor.types.d.ts +5 -0
- package/dist/common/types/data.processor.types.d.ts.map +1 -0
- package/dist/common/types/data.processor.types.js +3 -0
- package/dist/common/types/data.processor.types.js.map +1 -0
- package/dist/common/types/queue.types.d.ts +1 -0
- package/dist/common/types/queue.types.d.ts.map +1 -1
- package/dist/common/types/system.property.types.d.ts +12 -0
- package/dist/common/types/system.property.types.d.ts.map +1 -0
- package/dist/common/types/system.property.types.js +3 -0
- package/dist/common/types/system.property.types.js.map +1 -0
- package/dist/constants/job.constants.d.ts +0 -16
- package/dist/constants/job.constants.d.ts.map +1 -1
- package/dist/constants/job.constants.js +0 -16
- package/dist/constants/job.constants.js.map +1 -1
- package/dist/constants/job.maps.d.ts +0 -32
- package/dist/constants/job.maps.d.ts.map +1 -1
- package/dist/constants/job.maps.js +0 -32
- package/dist/constants/job.maps.js.map +1 -1
- package/dist/document/document.module.d.ts +2 -3
- package/dist/document/document.module.d.ts.map +1 -1
- package/dist/document/document.module.js.map +1 -1
- package/dist/document/types/document.types.d.ts +3 -0
- package/dist/document/types/document.types.d.ts.map +1 -1
- package/dist/global/filters/global.exception.filter.d.ts.map +1 -1
- package/dist/global/filters/global.exception.filter.js.map +1 -1
- package/dist/global/types/exception.filter.types.d.ts +9 -0
- package/dist/global/types/exception.filter.types.d.ts.map +1 -0
- package/dist/global/types/exception.filter.types.js +3 -0
- package/dist/global/types/exception.filter.types.js.map +1 -0
- package/dist/global/types/seeder.utility.types.d.ts +5 -0
- package/dist/global/types/seeder.utility.types.d.ts.map +1 -0
- package/dist/global/types/seeder.utility.types.js +3 -0
- package/dist/global/types/seeder.utility.types.js.map +1 -0
- package/dist/global/utilities/schedule.utility.d.ts.map +1 -1
- package/dist/global/utilities/schedule.utility.js +1 -5
- package/dist/global/utilities/schedule.utility.js.map +1 -1
- package/dist/global/utilities/seeder.utility.d.ts.map +1 -1
- package/dist/global/utilities/seeder.utility.js.map +1 -1
- package/dist/index.d.ts +3 -8
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +8 -18
- package/dist/index.js.map +1 -1
- package/dist/migrations/1749600000021.CreateSysEmailNotificationLogsTable.js +2 -2
- package/dist/notification/dtos/email.notification.options.dto.d.ts +3 -3
- package/dist/notification/dtos/email.notification.options.dto.js +3 -3
- package/dist/notification/entities/email.notification.log.entity.d.ts +1 -1
- package/dist/notification/entities/email.notification.log.entity.js +1 -1
- package/dist/notification/enums/email.notification.default.enum.d.ts +5 -1
- package/dist/notification/enums/email.notification.default.enum.d.ts.map +1 -1
- package/dist/notification/enums/email.notification.default.enum.js +4 -0
- package/dist/notification/enums/email.notification.default.enum.js.map +1 -1
- package/dist/notification/enums/email.template.identifier.enum.d.ts +5 -0
- package/dist/notification/enums/email.template.identifier.enum.d.ts.map +1 -0
- package/dist/notification/enums/email.template.identifier.enum.js +9 -0
- package/dist/notification/enums/email.template.identifier.enum.js.map +1 -0
- package/dist/notification/es6.classes.d.ts +2 -6
- package/dist/notification/es6.classes.d.ts.map +1 -1
- package/dist/notification/es6.classes.js +12 -8
- package/dist/notification/es6.classes.js.map +1 -1
- package/dist/notification/libraries/process.email.notification.js +6 -6
- package/dist/notification/notification.module.d.ts +2 -3
- package/dist/notification/notification.module.d.ts.map +1 -1
- package/dist/notification/notification.module.js.map +1 -1
- package/dist/notification/services/email.notification.service.js +9 -9
- package/dist/notification/types/email.notification.types.d.ts +2 -2
- package/dist/notification/types/notification.types.d.ts +3 -0
- package/dist/notification/types/notification.types.d.ts.map +1 -1
- package/dist/tenant/tenant.module.d.ts +2 -3
- package/dist/tenant/tenant.module.d.ts.map +1 -1
- package/dist/tenant/tenant.module.js.map +1 -1
- package/dist/tenant/types/tenant.types.d.ts +3 -0
- package/dist/tenant/types/tenant.types.d.ts.map +1 -1
- package/package.json +1 -1
- package/dist/auth/jobs/system.refresh.token.job.d.ts +0 -8
- package/dist/auth/jobs/system.refresh.token.job.d.ts.map +0 -1
- package/dist/auth/jobs/system.refresh.token.job.js +0 -31
- package/dist/auth/jobs/system.refresh.token.job.js.map +0 -1
- package/dist/auth/jobs/system.role.job.d.ts +0 -8
- package/dist/auth/jobs/system.role.job.d.ts.map +0 -1
- package/dist/auth/jobs/system.role.job.js +0 -31
- package/dist/auth/jobs/system.role.job.js.map +0 -1
- package/dist/auth/jobs/user.details.job.d.ts +0 -8
- package/dist/auth/jobs/user.details.job.d.ts.map +0 -1
- package/dist/auth/jobs/user.details.job.js +0 -31
- package/dist/auth/jobs/user.details.job.js.map +0 -1
- package/dist/auth/jobs/user.job.d.ts +0 -8
- package/dist/auth/jobs/user.job.d.ts.map +0 -1
- package/dist/auth/jobs/user.job.js +0 -31
- package/dist/auth/jobs/user.job.js.map +0 -1
- package/dist/auth/jobs/user.role.job.d.ts +0 -8
- package/dist/auth/jobs/user.role.job.d.ts.map +0 -1
- package/dist/auth/jobs/user.role.job.js +0 -31
- package/dist/auth/jobs/user.role.job.js.map +0 -1
- package/dist/auth/subscribers/system.refresh.token.subscriber.d.ts +0 -10
- package/dist/auth/subscribers/system.refresh.token.subscriber.d.ts.map +0 -1
- package/dist/auth/subscribers/system.refresh.token.subscriber.js +0 -33
- package/dist/auth/subscribers/system.refresh.token.subscriber.js.map +0 -1
- package/dist/auth/subscribers/system.role.subscriber.d.ts +0 -10
- package/dist/auth/subscribers/system.role.subscriber.d.ts.map +0 -1
- package/dist/auth/subscribers/system.role.subscriber.js +0 -33
- package/dist/auth/subscribers/system.role.subscriber.js.map +0 -1
- package/dist/auth/subscribers/user.details.subscriber.d.ts +0 -10
- package/dist/auth/subscribers/user.details.subscriber.d.ts.map +0 -1
- package/dist/auth/subscribers/user.details.subscriber.js +0 -33
- package/dist/auth/subscribers/user.details.subscriber.js.map +0 -1
- package/dist/auth/subscribers/user.role.subscriber.d.ts +0 -10
- package/dist/auth/subscribers/user.role.subscriber.d.ts.map +0 -1
- package/dist/auth/subscribers/user.role.subscriber.js +0 -33
- package/dist/auth/subscribers/user.role.subscriber.js.map +0 -1
- package/dist/auth/subscribers/user.subscriber.d.ts +0 -11
- package/dist/auth/subscribers/user.subscriber.d.ts.map +0 -1
- package/dist/auth/subscribers/user.subscriber.js +0 -39
- package/dist/auth/subscribers/user.subscriber.js.map +0 -1
- package/dist/common/jobs/activity.log.job.d.ts +0 -8
- package/dist/common/jobs/activity.log.job.d.ts.map +0 -1
- package/dist/common/jobs/activity.log.job.js +0 -31
- package/dist/common/jobs/activity.log.job.js.map +0 -1
- package/dist/common/jobs/document.job.d.ts +0 -8
- package/dist/common/jobs/document.job.d.ts.map +0 -1
- package/dist/common/jobs/document.job.js +0 -31
- package/dist/common/jobs/document.job.js.map +0 -1
- package/dist/common/jobs/scheduled.event.job.d.ts +0 -10
- package/dist/common/jobs/scheduled.event.job.d.ts.map +0 -1
- package/dist/common/jobs/scheduled.event.job.js +0 -29
- package/dist/common/jobs/scheduled.event.job.js.map +0 -1
- package/dist/common/jobs/system.audit.log.job.d.ts +0 -8
- package/dist/common/jobs/system.audit.log.job.d.ts.map +0 -1
- package/dist/common/jobs/system.audit.log.job.js +0 -31
- package/dist/common/jobs/system.audit.log.job.js.map +0 -1
- package/dist/common/jobs/system.constant.job.d.ts +0 -8
- package/dist/common/jobs/system.constant.job.d.ts.map +0 -1
- package/dist/common/jobs/system.constant.job.js +0 -31
- package/dist/common/jobs/system.constant.job.js.map +0 -1
- package/dist/common/jobs/system.constant.type.job.d.ts +0 -8
- package/dist/common/jobs/system.constant.type.job.d.ts.map +0 -1
- package/dist/common/jobs/system.constant.type.job.js +0 -31
- package/dist/common/jobs/system.constant.type.job.js.map +0 -1
- package/dist/common/jobs/system.failed.job.job.d.ts +0 -8
- package/dist/common/jobs/system.failed.job.job.d.ts.map +0 -1
- package/dist/common/jobs/system.failed.job.job.js +0 -31
- package/dist/common/jobs/system.failed.job.job.js.map +0 -1
- package/dist/common/jobs/system.notification.job.d.ts +0 -8
- package/dist/common/jobs/system.notification.job.d.ts.map +0 -1
- package/dist/common/jobs/system.notification.job.js +0 -31
- package/dist/common/jobs/system.notification.job.js.map +0 -1
- package/dist/common/jobs/system.property.job.d.ts +0 -8
- package/dist/common/jobs/system.property.job.d.ts.map +0 -1
- package/dist/common/jobs/system.property.job.js +0 -31
- package/dist/common/jobs/system.property.job.js.map +0 -1
- package/dist/common/subscribers/activity.log.subscriber.d.ts +0 -10
- package/dist/common/subscribers/activity.log.subscriber.d.ts.map +0 -1
- package/dist/common/subscribers/activity.log.subscriber.js +0 -33
- package/dist/common/subscribers/activity.log.subscriber.js.map +0 -1
- package/dist/common/subscribers/document.subscriber.d.ts +0 -10
- package/dist/common/subscribers/document.subscriber.d.ts.map +0 -1
- package/dist/common/subscribers/document.subscriber.js +0 -33
- package/dist/common/subscribers/document.subscriber.js.map +0 -1
- package/dist/common/subscribers/scheduled.event.subscriber.d.ts +0 -11
- package/dist/common/subscribers/scheduled.event.subscriber.d.ts.map +0 -1
- package/dist/common/subscribers/scheduled.event.subscriber.js +0 -35
- package/dist/common/subscribers/scheduled.event.subscriber.js.map +0 -1
- package/dist/common/subscribers/system.audit.log.subscriber.d.ts +0 -10
- package/dist/common/subscribers/system.audit.log.subscriber.d.ts.map +0 -1
- package/dist/common/subscribers/system.audit.log.subscriber.js +0 -33
- package/dist/common/subscribers/system.audit.log.subscriber.js.map +0 -1
- package/dist/common/subscribers/system.constant.subscriber.d.ts +0 -10
- package/dist/common/subscribers/system.constant.subscriber.d.ts.map +0 -1
- package/dist/common/subscribers/system.constant.subscriber.js +0 -33
- package/dist/common/subscribers/system.constant.subscriber.js.map +0 -1
- package/dist/common/subscribers/system.constant.type.subscriber.d.ts +0 -10
- package/dist/common/subscribers/system.constant.type.subscriber.d.ts.map +0 -1
- package/dist/common/subscribers/system.constant.type.subscriber.js +0 -33
- package/dist/common/subscribers/system.constant.type.subscriber.js.map +0 -1
- package/dist/common/subscribers/system.failed.job.subscriber.d.ts +0 -10
- package/dist/common/subscribers/system.failed.job.subscriber.d.ts.map +0 -1
- package/dist/common/subscribers/system.failed.job.subscriber.js +0 -33
- package/dist/common/subscribers/system.failed.job.subscriber.js.map +0 -1
- package/dist/common/subscribers/system.notification.subscriber.d.ts +0 -10
- package/dist/common/subscribers/system.notification.subscriber.d.ts.map +0 -1
- package/dist/common/subscribers/system.notification.subscriber.js +0 -33
- package/dist/common/subscribers/system.notification.subscriber.js.map +0 -1
- package/dist/common/subscribers/system.property.subscriber.d.ts +0 -10
- package/dist/common/subscribers/system.property.subscriber.d.ts.map +0 -1
- package/dist/common/subscribers/system.property.subscriber.js +0 -33
- package/dist/common/subscribers/system.property.subscriber.js.map +0 -1
- package/dist/notification/jobs/email.notification.log.job.d.ts +0 -8
- package/dist/notification/jobs/email.notification.log.job.d.ts.map +0 -1
- package/dist/notification/jobs/email.notification.log.job.js +0 -31
- package/dist/notification/jobs/email.notification.log.job.js.map +0 -1
- package/dist/notification/jobs/email.template.job.d.ts +0 -8
- package/dist/notification/jobs/email.template.job.d.ts.map +0 -1
- package/dist/notification/jobs/email.template.job.js +0 -31
- package/dist/notification/jobs/email.template.job.js.map +0 -1
- package/dist/notification/subscribers/email.notification.log.subscriber.d.ts +0 -11
- package/dist/notification/subscribers/email.notification.log.subscriber.d.ts.map +0 -1
- package/dist/notification/subscribers/email.notification.log.subscriber.js +0 -35
- package/dist/notification/subscribers/email.notification.log.subscriber.js.map +0 -1
- package/dist/notification/subscribers/email.template.subscriber.d.ts +0 -11
- package/dist/notification/subscribers/email.template.subscriber.d.ts.map +0 -1
- package/dist/notification/subscribers/email.template.subscriber.js +0 -35
- package/dist/notification/subscribers/email.template.subscriber.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.auth.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/admin.auth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAsB,MAAM,SAAS,CAAC;AAIzD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,EACL,wBAAwB,EACxB,aAAa,EACb,eAAe,EACf,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAI7B,qBACa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU;IASnC,YAAY,CAChB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,wBAAwB,CAAC;IA6B9B,mBAAmB,CACvB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"admin.auth.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/admin.auth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAsB,MAAM,SAAS,CAAC;AAIzD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGhE,OAAO,EACL,wBAAwB,EACxB,aAAa,EACb,eAAe,EACf,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAI7B,qBACa,gBAAgB;IAEzB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU;IASnC,YAAY,CAChB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,wBAAwB,CAAC;IA6B9B,mBAAmB,CACvB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC;IAuBrB,WAAW,CACf,IAAI,EAAE,eAAe,EACrB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAuDnB,OAAO,CACX,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAiCnB,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAajD,MAAM,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYpD,OAAO,CAAC,SAAS;IAIjB,OAAO,KAAK,gBAAgB,GAE3B;IAED,OAAO,KAAK,WAAW,GAEtB;CACF"}
|
|
@@ -53,6 +53,7 @@ let AdminAuthService = class AdminAuthService {
|
|
|
53
53
|
})
|
|
54
54
|
.getOne();
|
|
55
55
|
if (!user || !user.password) {
|
|
56
|
+
await auth_utilities_1.AuthUtility.compareAgainstDummy(password);
|
|
56
57
|
throw new common_1.UnauthorizedException('Invalid credentials');
|
|
57
58
|
}
|
|
58
59
|
const matches = await auth_utilities_1.AuthUtility.comparePassword(password, user.password);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin.auth.service.js","sourceRoot":"","sources":["../../../src/auth/services/admin.auth.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"admin.auth.service.js","sourceRoot":"","sources":["../../../src/auth/services/admin.auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/auth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAsB,MAAM,SAAS,CAAC;AAIzD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAI7B,qBACa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAFV,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU;IAYnC,YAAY,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA+BnE,mBAAmB,CACvB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../src/auth/services/auth.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,EAAsB,MAAM,SAAS,CAAC;AAIzD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,OAAO,EACL,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,iBAAiB,EAClB,MAAM,qBAAqB,CAAC;AAI7B,qBACa,WAAW;IAEpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAFV,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY,EAC1B,UAAU,EAAE,UAAU;IAYnC,YAAY,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IA+BnE,mBAAmB,CACvB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,UAAU,CAAC;IAwBhB,WAAW,CACf,IAAI,EAAE,eAAe,EACrB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAuDnB,OAAO,CACX,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAgCnB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASjD,SAAS,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUjD,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjE,MAAM,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYpD,OAAO,CAAC,SAAS;IAIjB,OAAO,KAAK,gBAAgB,GAE3B;IAED,OAAO,KAAK,WAAW,GAEtB;CACF"}
|
|
@@ -53,6 +53,7 @@ let AuthService = class AuthService {
|
|
|
53
53
|
.where('user.email = :email', { email })
|
|
54
54
|
.getOne();
|
|
55
55
|
if (!user || !user.password) {
|
|
56
|
+
await auth_utilities_1.AuthUtility.compareAgainstDummy(password);
|
|
56
57
|
throw new common_1.UnauthorizedException('Invalid email or password');
|
|
57
58
|
}
|
|
58
59
|
const matches = await auth_utilities_1.AuthUtility.comparePassword(password, user.password);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/auth/services/auth.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../../src/auth/services/auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,4 +41,15 @@ export interface TokenIssueContext {
|
|
|
41
41
|
ip_address?: string;
|
|
42
42
|
user_agent?: string;
|
|
43
43
|
}
|
|
44
|
+
export interface AuthModuleOptions {
|
|
45
|
+
dataSourceName?: string;
|
|
46
|
+
}
|
|
47
|
+
export interface AuthContextValue {
|
|
48
|
+
user: Record<string, any>;
|
|
49
|
+
sessionIdentifier?: string;
|
|
50
|
+
}
|
|
51
|
+
export interface AdminAuthContextValue {
|
|
52
|
+
adminUser: Record<string, any>;
|
|
53
|
+
sessionIdentifier?: string;
|
|
54
|
+
}
|
|
44
55
|
//# sourceMappingURL=auth.types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.types.d.ts","sourceRoot":"","sources":["../../../src/auth/types/auth.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAElF,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,gBAAgB,EAAE,CAAC;CAC3B;AAGD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,qBAAqB,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB"}
|
|
1
|
+
{"version":3,"file":"auth.types.d.ts","sourceRoot":"","sources":["../../../src/auth/types/auth.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAElF,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,gBAAgB,EAAE,CAAC;CAC3B;AAGD,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,qBAAqB,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAGD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAGD,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
export declare class AuthUtility {
|
|
2
|
+
private static dummyHash;
|
|
2
3
|
static hashPassword(plain: string): Promise<string>;
|
|
3
4
|
static comparePassword(plain: string, hashed: string): Promise<boolean>;
|
|
5
|
+
static compareAgainstDummy(plain: string): Promise<false>;
|
|
4
6
|
static parseExpiryMs(expiry: string): number;
|
|
5
7
|
}
|
|
6
8
|
//# sourceMappingURL=auth.utilities.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.utilities.d.ts","sourceRoot":"","sources":["../../../src/auth/utilities/auth.utilities.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth.utilities.d.ts","sourceRoot":"","sources":["../../../src/auth/utilities/auth.utilities.ts"],"names":[],"mappings":"AAIA,qBAAa,WAAW;IAMtB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAgC;IAGxD,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKnD,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;WAW1D,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAM/D,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAqB7C"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AuthUtility = void 0;
|
|
4
4
|
const bcrypt_1 = require("bcrypt");
|
|
5
|
+
const crypto_1 = require("crypto");
|
|
5
6
|
const auth_default_enum_1 = require("../enums/auth.default.enum");
|
|
6
7
|
class AuthUtility {
|
|
7
8
|
static hashPassword(plain) {
|
|
@@ -10,6 +11,11 @@ class AuthUtility {
|
|
|
10
11
|
static comparePassword(plain, hashed) {
|
|
11
12
|
return (0, bcrypt_1.compare)(plain, hashed);
|
|
12
13
|
}
|
|
14
|
+
static async compareAgainstDummy(plain) {
|
|
15
|
+
AuthUtility.dummyHash ??= AuthUtility.hashPassword((0, crypto_1.randomUUID)());
|
|
16
|
+
await (0, bcrypt_1.compare)(plain, await AuthUtility.dummyHash);
|
|
17
|
+
return false;
|
|
18
|
+
}
|
|
13
19
|
static parseExpiryMs(expiry) {
|
|
14
20
|
const unit = expiry.slice(-1);
|
|
15
21
|
const value = parseInt(expiry.slice(0, -1), 10);
|
|
@@ -30,4 +36,5 @@ class AuthUtility {
|
|
|
30
36
|
}
|
|
31
37
|
}
|
|
32
38
|
exports.AuthUtility = AuthUtility;
|
|
39
|
+
AuthUtility.dummyHash = null;
|
|
33
40
|
//# sourceMappingURL=auth.utilities.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.utilities.js","sourceRoot":"","sources":["../../../src/auth/utilities/auth.utilities.ts"],"names":[],"mappings":";;;AAAA,mCAAuC;AACvC,kEAAyD;AAEzD,MAAa,WAAW;
|
|
1
|
+
{"version":3,"file":"auth.utilities.js","sourceRoot":"","sources":["../../../src/auth/utilities/auth.utilities.ts"],"names":[],"mappings":";;;AAAA,mCAAuC;AACvC,mCAAoC;AACpC,kEAAyD;AAEzD,MAAa,WAAW;IAStB,MAAM,CAAC,YAAY,CAAC,KAAa;QAC/B,OAAO,IAAA,aAAI,EAAC,KAAK,EAAE,+BAAW,CAAC,kBAAkB,CAAC,CAAC;IACrD,CAAC;IAGD,MAAM,CAAC,eAAe,CAAC,KAAa,EAAE,MAAc;QAClD,OAAO,IAAA,gBAAO,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC;IASD,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,KAAa;QAC5C,WAAW,CAAC,SAAS,KAAK,WAAW,CAAC,YAAY,CAAC,IAAA,mBAAU,GAAE,CAAC,CAAC;QACjE,MAAM,IAAA,gBAAO,EAAC,KAAK,EAAE,MAAM,WAAW,CAAC,SAAS,CAAC,CAAC;QAClD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,MAAc;QACjC,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAEhD,IAAI,KAAK,CAAC,KAAK,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,iCAAiC,MAAM,GAAG,CAAC,CAAC;QAC9D,QAAQ,IAAI,EAAE,CAAC;YACb,KAAK,GAAG;gBACN,OAAO,KAAK,GAAG,IAAI,CAAC;YACtB,KAAK,GAAG;gBACN,OAAO,KAAK,GAAG,EAAE,GAAG,IAAI,CAAC;YAC3B,KAAK,GAAG;gBACN,OAAO,KAAK,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;YAChC,KAAK,GAAG;gBACN,OAAO,KAAK,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;YACrC;gBACE,MAAM,IAAI,KAAK,CACb,wBAAwB,IAAI,SAAS,MAAM,uBAAuB,CACnE,CAAC;QACN,CAAC;IACH,CAAC;;AAnDH,kCAoDC;AA9CgB,qBAAS,GAA2B,IAAI,CAAC"}
|
|
@@ -5,8 +5,12 @@ import { QueueService } from '../services/queue.service';
|
|
|
5
5
|
export declare class JobConsumer extends WorkerHost implements OnApplicationBootstrap {
|
|
6
6
|
private readonly queueService;
|
|
7
7
|
private readonly logger;
|
|
8
|
+
private bootstrapped;
|
|
9
|
+
private workerReady;
|
|
10
|
+
private enrolment;
|
|
8
11
|
constructor(queueService: QueueService);
|
|
9
12
|
onApplicationBootstrap(): Promise<void>;
|
|
13
|
+
private enrolWhenReady;
|
|
10
14
|
process(job: Job): Promise<any>;
|
|
11
15
|
private setWorker;
|
|
12
16
|
private handleNextJob;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.consumer.d.ts","sourceRoot":"","sources":["../../../src/common/consumers/job.consumer.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAU,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAyBzD,qBAIa,WAAY,SAAQ,UAAW,YAAW,sBAAsB;
|
|
1
|
+
{"version":3,"file":"job.consumer.d.ts","sourceRoot":"","sources":["../../../src/common/consumers/job.consumer.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAU,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAyBzD,qBAIa,WAAY,SAAQ,UAAW,YAAW,sBAAsB;IAU/D,OAAO,CAAC,QAAQ,CAAC,YAAY;IATzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA6B;IAGpD,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,WAAW,CAAS;IAE5B,OAAO,CAAC,SAAS,CAA8B;gBAElB,YAAY,EAAE,YAAY;IASjD,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;YAmC/B,cAAc;IAmBtB,OAAO,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAsBrC,OAAO,CAAC,SAAS;YAUH,aAAa;IAmC3B,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAMxB,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAYrB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAavC,QAAQ,IAAI,IAAI;IAKhB,SAAS,IAAI,IAAI;IAKjB,OAAO,IAAI,IAAI;YAgBD,yBAAyB;YAyBzB,mBAAmB;YAanB,cAAc;IA2B5B,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,OAAO;CAKhB"}
|
|
@@ -24,14 +24,32 @@ let JobConsumer = class JobConsumer extends bullmq_1.WorkerHost {
|
|
|
24
24
|
super();
|
|
25
25
|
this.queueService = queueService;
|
|
26
26
|
this.logger = new common_1.Logger('JobConsumer');
|
|
27
|
+
this.bootstrapped = false;
|
|
28
|
+
this.workerReady = false;
|
|
29
|
+
this.enrolment = null;
|
|
27
30
|
}
|
|
28
31
|
async onApplicationBootstrap() {
|
|
29
32
|
this.setWorker();
|
|
30
|
-
await this.enrolScheduledEventDriver();
|
|
31
33
|
if (!this.worker.isRunning())
|
|
32
34
|
this.worker.run().catch((error) => {
|
|
33
35
|
this.logger.error(`Worker run loop ended with error: ${error instanceof Error ? error.message : String(error)}`);
|
|
34
36
|
});
|
|
37
|
+
this.bootstrapped = true;
|
|
38
|
+
await this.enrolWhenReady();
|
|
39
|
+
}
|
|
40
|
+
async enrolWhenReady() {
|
|
41
|
+
if (!this.bootstrapped || !this.workerReady)
|
|
42
|
+
return;
|
|
43
|
+
if (this.enrolment !== null)
|
|
44
|
+
return this.enrolment;
|
|
45
|
+
this.enrolment = this.enrolScheduledEventDriver()
|
|
46
|
+
.catch((error) => {
|
|
47
|
+
this.logger.error(`Failed to enrol SetScheduledEventJob: ${error instanceof Error ? error.message : String(error)}`);
|
|
48
|
+
})
|
|
49
|
+
.finally(() => {
|
|
50
|
+
this.enrolment = null;
|
|
51
|
+
});
|
|
52
|
+
return this.enrolment;
|
|
35
53
|
}
|
|
36
54
|
async process(job) {
|
|
37
55
|
this.setWorker();
|
|
@@ -98,12 +116,14 @@ let JobConsumer = class JobConsumer extends bullmq_1.WorkerHost {
|
|
|
98
116
|
}
|
|
99
117
|
onReady() {
|
|
100
118
|
this.setWorker();
|
|
119
|
+
this.workerReady = true;
|
|
101
120
|
this.logger.log(`Worker ready for queue: ${this.queueService.queueName}`);
|
|
121
|
+
void this.enrolWhenReady();
|
|
102
122
|
}
|
|
103
123
|
async enrolScheduledEventDriver() {
|
|
104
124
|
const every = schedule_utility_1.ScheduleUtility.intervalToMs(schedule_utility_1.ScheduleUtility.envInterval());
|
|
105
125
|
if (every <= 0) {
|
|
106
|
-
this.logger.warn('SetScheduledEventJob not scheduled:
|
|
126
|
+
this.logger.warn('SetScheduledEventJob not scheduled: SCHEDULED_EVENT_MIN resolves to 0ms.');
|
|
107
127
|
return;
|
|
108
128
|
}
|
|
109
129
|
if (!this.queueService.hasJob(job_constants_1.baseJobConstants.setScheduledEventJob)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.consumer.js","sourceRoot":"","sources":["../../../src/common/consumers/job.consumer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAsE;AACtE,2CAAgE;AAChE,mCAA6B;AAC7B,6DAAyD;AACzD,mFAA6E;AAC7E,qFAAiF;AACjF,8EAA0E;AAC1E,iEAAiE;AACjE,oDAAmD;AAwB5C,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,mBAAU;
|
|
1
|
+
{"version":3,"file":"job.consumer.js","sourceRoot":"","sources":["../../../src/common/consumers/job.consumer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduled.event.entity.d.ts","sourceRoot":"","sources":["../../../src/common/entities/scheduled.event.entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAO3E,qBACa,oBAAqB,SAAQ,UAAU;IAElD,MAAM,EAAE,MAAM,CAAC;IAIf,YAAY,EAAE,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"scheduled.event.entity.d.ts","sourceRoot":"","sources":["../../../src/common/entities/scheduled.event.entity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAO3E,qBACa,oBAAqB,SAAQ,UAAU;IAElD,MAAM,EAAE,MAAM,CAAC;IAIf,YAAY,EAAE,IAAI,CAAC;IAOnB,UAAU,EAAE,IAAI,CAAC;IAIjB,SAAS,EAAE,IAAI,CAAC;IAGhB,KAAK,EAAE,MAAM,CAAC;IAId,cAAc,EAAE,MAAM,CAAC;IAGvB,MAAM,EAAE,OAAO,CAAC;IAMhB,GAAG,EAAE,yBAAyB,CAAC;CAChC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduled.event.entity.js","sourceRoot":"","sources":["../../../src/common/entities/scheduled.event.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgE;AAChE,+CAA2C;AAC3C,iFAA2E;AAQpE,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,wBAAU;
|
|
1
|
+
{"version":3,"file":"scheduled.event.entity.js","sourceRoot":"","sources":["../../../src/common/entities/scheduled.event.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgE;AAChE,+CAA2C;AAC3C,iFAA2E;AAQpE,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,wBAAU;CAkCnD,CAAA;AAlCY,oDAAoB;AAE/B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;oDACV;AAIf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;8BAClB,IAAI;0DAAC;AAOnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;8BACpB,IAAI;wDAAC;AAIjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;8BACrB,IAAI;uDAAC;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;mDACX;AAId;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;4DACA;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;oDACV;AAMhB;IAJC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,wDAAyB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE;QACjE,QAAQ,EAAE,SAAS;KACpB,CAAC;IACD,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;8BAC1B,wDAAyB;iDAAC;+BAjCpB,oBAAoB;IADhC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC;GAC5B,oBAAoB,CAkChC"}
|
|
@@ -14,34 +14,16 @@ import { CommonPayloadDto } from './dtos/common.payload.dto';
|
|
|
14
14
|
import { DatabaseEventDto } from './dtos/database.event.dto';
|
|
15
15
|
import { FilterDto } from './dtos/filter.dto';
|
|
16
16
|
import { SortDto } from './dtos/sort.dto';
|
|
17
|
-
import { ActivityLogJob } from './jobs/activity.log.job';
|
|
18
17
|
import { DispatchScheduledEventJob } from './jobs/dispatch.scheduled.event.job';
|
|
19
|
-
import { DocumentJob } from './jobs/document.job';
|
|
20
|
-
import { ScheduledEventJob } from './jobs/scheduled.event.job';
|
|
21
18
|
import { SetScheduledEventJob } from './jobs/set.scheduled.event.job';
|
|
22
|
-
import { SystemAuditLogJob } from './jobs/system.audit.log.job';
|
|
23
|
-
import { SystemConstantJob } from './jobs/system.constant.job';
|
|
24
|
-
import { SystemConstantTypeJob } from './jobs/system.constant.type.job';
|
|
25
|
-
import { SystemFailedJobJob } from './jobs/system.failed.job.job';
|
|
26
|
-
import { SystemNotificationJob } from './jobs/system.notification.job';
|
|
27
|
-
import { SystemPropertyJob } from './jobs/system.property.job';
|
|
28
19
|
import { SystemScheduledTaskJob } from './jobs/system.scheduled.task.job';
|
|
29
|
-
import { ActivityLogSubscriber } from './subscribers/activity.log.subscriber';
|
|
30
|
-
import { DocumentSubscriber } from './subscribers/document.subscriber';
|
|
31
|
-
import { ScheduledEventSubscriber } from './subscribers/scheduled.event.subscriber';
|
|
32
|
-
import { SystemAuditLogSubscriber } from './subscribers/system.audit.log.subscriber';
|
|
33
|
-
import { SystemConstantSubscriber } from './subscribers/system.constant.subscriber';
|
|
34
|
-
import { SystemConstantTypeSubscriber } from './subscribers/system.constant.type.subscriber';
|
|
35
|
-
import { SystemFailedJobSubscriber } from './subscribers/system.failed.job.subscriber';
|
|
36
|
-
import { SystemNotificationSubscriber } from './subscribers/system.notification.subscriber';
|
|
37
|
-
import { SystemPropertySubscriber } from './subscribers/system.property.subscriber';
|
|
38
20
|
import { SystemScheduledTaskSubscriber } from './subscribers/system.scheduled.task.subscriber';
|
|
39
21
|
export declare const es6Classes: {
|
|
40
22
|
controllers: any[];
|
|
41
23
|
services: readonly [typeof AuditService, typeof CacheService, typeof EncryptionService, typeof FeatureFlagService, typeof MonitoringService, typeof QueueService, typeof RemoteRequestService, typeof SqlService, typeof SystemPropertyService];
|
|
42
24
|
libraries: (typeof CommonDataProcessor | typeof CommonListProcessor)[];
|
|
43
|
-
dtos: (typeof
|
|
44
|
-
jobs: (typeof
|
|
45
|
-
subscribers: (typeof
|
|
25
|
+
dtos: (typeof FilterDto | typeof SortDto | typeof CommonListFilterDto | typeof CommonPayloadDto | typeof DatabaseEventDto)[];
|
|
26
|
+
jobs: (typeof DispatchScheduledEventJob | typeof SetScheduledEventJob | typeof SystemScheduledTaskJob)[];
|
|
27
|
+
subscribers: (typeof SystemScheduledTaskSubscriber)[];
|
|
46
28
|
};
|
|
47
29
|
//# sourceMappingURL=es6.classes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"es6.classes.d.ts","sourceRoot":"","sources":["../../src/common/es6.classes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"es6.classes.d.ts","sourceRoot":"","sources":["../../src/common/es6.classes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAE/F,eAAO,MAAM,UAAU;;;;;;;CAOtB,CAAC"}
|
|
@@ -18,34 +18,16 @@ const common_payload_dto_1 = require("./dtos/common.payload.dto");
|
|
|
18
18
|
const database_event_dto_1 = require("./dtos/database.event.dto");
|
|
19
19
|
const filter_dto_1 = require("./dtos/filter.dto");
|
|
20
20
|
const sort_dto_1 = require("./dtos/sort.dto");
|
|
21
|
-
const activity_log_job_1 = require("./jobs/activity.log.job");
|
|
22
21
|
const dispatch_scheduled_event_job_1 = require("./jobs/dispatch.scheduled.event.job");
|
|
23
|
-
const document_job_1 = require("./jobs/document.job");
|
|
24
|
-
const scheduled_event_job_1 = require("./jobs/scheduled.event.job");
|
|
25
22
|
const set_scheduled_event_job_1 = require("./jobs/set.scheduled.event.job");
|
|
26
|
-
const system_audit_log_job_1 = require("./jobs/system.audit.log.job");
|
|
27
|
-
const system_constant_job_1 = require("./jobs/system.constant.job");
|
|
28
|
-
const system_constant_type_job_1 = require("./jobs/system.constant.type.job");
|
|
29
|
-
const system_failed_job_job_1 = require("./jobs/system.failed.job.job");
|
|
30
|
-
const system_notification_job_1 = require("./jobs/system.notification.job");
|
|
31
|
-
const system_property_job_1 = require("./jobs/system.property.job");
|
|
32
23
|
const system_scheduled_task_job_1 = require("./jobs/system.scheduled.task.job");
|
|
33
|
-
const activity_log_subscriber_1 = require("./subscribers/activity.log.subscriber");
|
|
34
|
-
const document_subscriber_1 = require("./subscribers/document.subscriber");
|
|
35
|
-
const scheduled_event_subscriber_1 = require("./subscribers/scheduled.event.subscriber");
|
|
36
|
-
const system_audit_log_subscriber_1 = require("./subscribers/system.audit.log.subscriber");
|
|
37
|
-
const system_constant_subscriber_1 = require("./subscribers/system.constant.subscriber");
|
|
38
|
-
const system_constant_type_subscriber_1 = require("./subscribers/system.constant.type.subscriber");
|
|
39
|
-
const system_failed_job_subscriber_1 = require("./subscribers/system.failed.job.subscriber");
|
|
40
|
-
const system_notification_subscriber_1 = require("./subscribers/system.notification.subscriber");
|
|
41
|
-
const system_property_subscriber_1 = require("./subscribers/system.property.subscriber");
|
|
42
24
|
const system_scheduled_task_subscriber_1 = require("./subscribers/system.scheduled.task.subscriber");
|
|
43
25
|
exports.es6Classes = {
|
|
44
26
|
controllers: [],
|
|
45
27
|
services: [audit_service_1.AuditService, cache_service_1.CacheService, encryption_service_1.EncryptionService, feature_flag_service_1.FeatureFlagService, monitoring_service_1.MonitoringService, queue_service_1.QueueService, remote_request_service_1.RemoteRequestService, sql_service_1.SqlService, system_property_service_1.SystemPropertyService],
|
|
46
28
|
libraries: [common_data_processor_1.CommonDataProcessor, common_list_processor_1.CommonListProcessor],
|
|
47
29
|
dtos: [common_list_filter_dto_1.CommonListFilterDto, common_params_dto_1.CommonParamsDto, common_payload_dto_1.CommonPayloadDto, database_event_dto_1.DatabaseEventDto, filter_dto_1.FilterDto, sort_dto_1.SortDto],
|
|
48
|
-
jobs: [
|
|
49
|
-
subscribers: [
|
|
30
|
+
jobs: [dispatch_scheduled_event_job_1.DispatchScheduledEventJob, set_scheduled_event_job_1.SetScheduledEventJob, system_scheduled_task_job_1.SystemScheduledTaskJob],
|
|
31
|
+
subscribers: [system_scheduled_task_subscriber_1.SystemScheduledTaskSubscriber],
|
|
50
32
|
};
|
|
51
33
|
//# sourceMappingURL=es6.classes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"es6.classes.js","sourceRoot":"","sources":["../../src/common/es6.classes.ts"],"names":[],"mappings":";;;AAAA,4DAAwD;AACxD,4DAAwD;AACxD,sEAAkE;AAClE,0EAAqE;AACrE,sEAAkE;AAClE,4DAAwD;AACxD,8EAAyE;AACzE,wDAAoD;AACpD,gFAA2E;AAC3E,6EAAwE;AACxE,6EAAwE;AACxE,0EAAoE;AACpE,gEAA2D;AAC3D,kEAA6D;AAC7D,kEAA6D;AAC7D,kDAA8C;AAC9C,8CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"es6.classes.js","sourceRoot":"","sources":["../../src/common/es6.classes.ts"],"names":[],"mappings":";;;AAAA,4DAAwD;AACxD,4DAAwD;AACxD,sEAAkE;AAClE,0EAAqE;AACrE,sEAAkE;AAClE,4DAAwD;AACxD,8EAAyE;AACzE,wDAAoD;AACpD,gFAA2E;AAC3E,6EAAwE;AACxE,6EAAwE;AACxE,0EAAoE;AACpE,gEAA2D;AAC3D,kEAA6D;AAC7D,kEAA6D;AAC7D,kDAA8C;AAC9C,8CAA0C;AAC1C,sFAAgF;AAChF,4EAAsE;AACtE,gFAA0E;AAC1E,qGAA+F;AAElF,QAAA,UAAU,GAAG;IACxB,WAAW,EAAE,EAAE;IACf,QAAQ,EAAE,CAAC,4BAAY,EAAE,4BAAY,EAAE,sCAAiB,EAAE,yCAAkB,EAAE,sCAAiB,EAAE,4BAAY,EAAE,6CAAoB,EAAE,wBAAU,EAAE,+CAAqB,CAAU;IAChL,SAAS,EAAE,CAAC,2CAAmB,EAAE,2CAAmB,CAAC;IACrD,IAAI,EAAE,CAAC,4CAAmB,EAAE,mCAAe,EAAE,qCAAgB,EAAE,qCAAgB,EAAE,sBAAS,EAAE,kBAAO,CAAC;IACpG,IAAI,EAAE,CAAC,wDAAyB,EAAE,8CAAoB,EAAE,kDAAsB,CAAC;IAC/E,WAAW,EAAE,CAAC,gEAA6B,CAAC;CAC7C,CAAC"}
|
|
@@ -6,6 +6,8 @@ export declare class DispatchScheduledEventJob extends CommonJob {
|
|
|
6
6
|
handle(): Promise<void>;
|
|
7
7
|
private fetchDueEvents;
|
|
8
8
|
private processScheduledEvent;
|
|
9
|
+
private claimEvent;
|
|
10
|
+
private releaseEvent;
|
|
9
11
|
private dispatchEvents;
|
|
10
12
|
}
|
|
11
13
|
//# sourceMappingURL=dispatch.scheduled.event.job.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch.scheduled.event.job.d.ts","sourceRoot":"","sources":["../../../src/common/jobs/dispatch.scheduled.event.job.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAMzD,qBACa,yBAA0B,SAAQ,SAAS;IAC1C,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY;gBAA1B,YAAY,EAAE,YAAY;IAInD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;YAIf,cAAc;
|
|
1
|
+
{"version":3,"file":"dispatch.scheduled.event.job.d.ts","sourceRoot":"","sources":["../../../src/common/jobs/dispatch.scheduled.event.job.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAMzD,qBACa,yBAA0B,SAAQ,SAAS;IAC1C,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY;gBAA1B,YAAY,EAAE,YAAY;IAInD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;YAIf,cAAc;YAqBd,qBAAqB;YA6BrB,UAAU;YAkBV,YAAY;YAgBZ,cAAc;CAO7B"}
|
|
@@ -31,25 +31,36 @@ let DispatchScheduledEventJob = class DispatchScheduledEventJob extends common_j
|
|
|
31
31
|
where: {
|
|
32
32
|
scheduled_at: (0, typeorm_1.LessThan)(new Date()),
|
|
33
33
|
active: true,
|
|
34
|
+
started_at: (0, typeorm_1.IsNull)(),
|
|
34
35
|
total_attempts: (0, typeorm_1.LessThan)(maxRetries),
|
|
35
36
|
},
|
|
36
37
|
relations: { job: true },
|
|
37
38
|
});
|
|
38
39
|
}
|
|
39
40
|
async processScheduledEvent(scheduledEvent) {
|
|
41
|
+
if (!(await this.claimEvent(scheduledEvent)))
|
|
42
|
+
return;
|
|
40
43
|
try {
|
|
41
44
|
await this.queueService.addJob(scheduledEvent.job.identifier);
|
|
42
|
-
scheduledEvent.total_attempts += 1;
|
|
43
45
|
}
|
|
44
46
|
catch (error) {
|
|
45
|
-
scheduledEvent.
|
|
46
|
-
scheduledEvent.error =
|
|
47
|
-
error instanceof Error ? error.message : String(error);
|
|
48
|
-
}
|
|
49
|
-
finally {
|
|
50
|
-
await scheduledEvent.save();
|
|
47
|
+
await this.releaseEvent(scheduledEvent, error instanceof Error ? error.message : String(error));
|
|
51
48
|
}
|
|
52
49
|
}
|
|
50
|
+
async claimEvent(scheduledEvent) {
|
|
51
|
+
const claim = await scheduled_event_entity_1.ScheduledEventEntity.update({ id: scheduledEvent.id, active: true, started_at: (0, typeorm_1.IsNull)() }, {
|
|
52
|
+
started_at: new Date(),
|
|
53
|
+
total_attempts: () => '"total_attempts" + 1',
|
|
54
|
+
});
|
|
55
|
+
return (claim.affected ?? 0) > 0;
|
|
56
|
+
}
|
|
57
|
+
async releaseEvent(scheduledEvent, reason) {
|
|
58
|
+
await scheduled_event_entity_1.ScheduledEventEntity.update({ id: scheduledEvent.id }, {
|
|
59
|
+
started_at: () => 'NULL',
|
|
60
|
+
failed_at: new Date(),
|
|
61
|
+
error: reason,
|
|
62
|
+
});
|
|
63
|
+
}
|
|
53
64
|
async dispatchEvents() {
|
|
54
65
|
const scheduledEvents = await this.fetchDueEvents();
|
|
55
66
|
for (const scheduledEvent of scheduledEvents) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch.scheduled.event.job.js","sourceRoot":"","sources":["../../../src/common/jobs/dispatch.scheduled.event.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAyC;AACzC,6DAAyD;AACzD,iEAAiE;AACjE,+EAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"dispatch.scheduled.event.job.js","sourceRoot":"","sources":["../../../src/common/jobs/dispatch.scheduled.event.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAyC;AACzC,6DAAyD;AACzD,iEAAiE;AACjE,+EAA0E;AAC1E,qCAA2C;AAC3C,oDAAmD;AAG5C,IAAM,yBAAyB,GAA/B,MAAM,yBAA0B,SAAQ,sBAAS;IACtD,YAA+B,YAA0B;QACvD,KAAK,CAAC,gCAAgB,CAAC,yBAAyB,CAAC,CAAC;QADrB,iBAAY,GAAZ,YAAY,CAAc;IAEzD,CAAC;IAED,KAAK,CAAC,MAAM;QACV,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;IAC9B,CAAC;IAEO,KAAK,CAAC,cAAc;QAC1B,MAAM,UAAU,GACd,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,CAAC,IAAI,yBAAY,CAAC,eAAe,CAAC;QAE5E,OAAO,6CAAoB,CAAC,IAAI,CAAC;YAC/B,KAAK,EAAE;gBACL,YAAY,EAAE,IAAA,kBAAQ,EAAC,IAAI,IAAI,EAAE,CAAC;gBAClC,MAAM,EAAE,IAAI;gBAOZ,UAAU,EAAE,IAAA,gBAAM,GAAE;gBACpB,cAAc,EAAE,IAAA,kBAAQ,EAAC,UAAU,CAAC;aACrC;YACD,SAAS,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;SACzB,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,qBAAqB,CACjC,cAAoC;QAKpC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YAAE,OAAO;QACrD,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAChE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,CAAC,YAAY,CACrB,cAAc,EACd,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACvD,CAAC;QACJ,CAAC;IACH,CAAC;IAcO,KAAK,CAAC,UAAU,CACtB,cAAoC;QAEpC,MAAM,KAAK,GAAG,MAAM,6CAAoB,CAAC,MAAM,CAC7C,EAAE,EAAE,EAAE,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAA,gBAAM,GAAE,EAAE,EAC7D;YACE,UAAU,EAAE,IAAI,IAAI,EAAE;YACtB,cAAc,EAAE,GAAG,EAAE,CAAC,sBAAsB;SAC7C,CACF,CAAC;QACF,OAAO,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAOO,KAAK,CAAC,YAAY,CACxB,cAAoC,EACpC,MAAc;QAEd,MAAM,6CAAoB,CAAC,MAAM,CAC/B,EAAE,EAAE,EAAE,cAAc,CAAC,EAAE,EAAE,EACzB;YAGE,UAAU,EAAE,GAAG,EAAE,CAAC,MAAM;YACxB,SAAS,EAAE,IAAI,IAAI,EAAE;YACrB,KAAK,EAAE,MAAM;SACd,CACF,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,cAAc;QAC1B,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAEpD,KAAK,MAAM,cAAc,IAAI,eAAe,EAAE,CAAC;YAC7C,MAAM,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;CACF,CAAA;AApGY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAU,GAAE;qCAEkC,4BAAY;GAD9C,yBAAyB,CAoGrC"}
|
|
@@ -7,8 +7,7 @@ export declare class SetScheduledEventJob extends CommonJob {
|
|
|
7
7
|
constructor(queueService: QueueService, dispatchScheduledEventJob: DispatchScheduledEventJob);
|
|
8
8
|
handle(): Promise<void>;
|
|
9
9
|
private upsertScheduledEvents;
|
|
10
|
-
private
|
|
11
|
-
private updateNextUpsertTime;
|
|
10
|
+
private materialiseOccurrence;
|
|
12
11
|
private getScheduledJobs;
|
|
13
12
|
private dispatchScheduledEvents;
|
|
14
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set.scheduled.event.job.d.ts","sourceRoot":"","sources":["../../../src/common/jobs/set.scheduled.event.job.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAMzC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAS3E,qBACa,oBAAqB,SAAQ,SAAS;IAE/C,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY;IAC7C,OAAO,CAAC,QAAQ,CAAC,yBAAyB;gBADvB,YAAY,EAAE,YAAY,EAC5B,yBAAyB,EAAE,yBAAyB;IAMjE,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"set.scheduled.event.job.d.ts","sourceRoot":"","sources":["../../../src/common/jobs/set.scheduled.event.job.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAMzC,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAS3E,qBACa,oBAAqB,SAAQ,SAAS;IAE/C,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY;IAC7C,OAAO,CAAC,QAAQ,CAAC,yBAAyB;gBADvB,YAAY,EAAE,YAAY,EAC5B,yBAAyB,EAAE,yBAAyB;IAMjE,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;YASf,qBAAqB;YA2BrB,qBAAqB;YAgCrB,gBAAgB;YAYhB,uBAAuB;CAKtC"}
|
|
@@ -26,36 +26,39 @@ let SetScheduledEventJob = class SetScheduledEventJob extends common_job_1.Commo
|
|
|
26
26
|
this.dispatchScheduledEventJob = dispatchScheduledEventJob;
|
|
27
27
|
}
|
|
28
28
|
async handle() {
|
|
29
|
-
if (
|
|
29
|
+
if (process.env.ENABLE_SCHEDULED_EVENTS_EXECUTION !== 'true')
|
|
30
30
|
return;
|
|
31
31
|
await this.upsertScheduledEvents();
|
|
32
32
|
await this.dispatchScheduledEvents();
|
|
33
33
|
}
|
|
34
34
|
async upsertScheduledEvents() {
|
|
35
|
-
const
|
|
36
|
-
for (const scheduledJob of
|
|
37
|
-
|
|
38
|
-
await this.createScheduledEvent(scheduledJob.id, scheduled_time);
|
|
39
|
-
await this.updateNextUpsertTime(scheduledJob, scheduled_time);
|
|
35
|
+
const now = new Date();
|
|
36
|
+
for (const scheduledJob of await this.getScheduledJobs(now)) {
|
|
37
|
+
await this.materialiseOccurrence(scheduledJob, now);
|
|
40
38
|
}
|
|
41
39
|
}
|
|
42
|
-
async
|
|
43
|
-
const
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
40
|
+
async materialiseOccurrence(scheduledJob, dueBefore) {
|
|
41
|
+
const scheduledAt = schedule_utility_1.ScheduleUtility.addInterval(scheduledJob.schedule_interval, dueBefore);
|
|
42
|
+
await system_scheduled_task_entity_1.SystemScheduledTaskEntity.getRepository().manager.transaction(async (trx) => {
|
|
43
|
+
const claim = await trx.update(system_scheduled_task_entity_1.SystemScheduledTaskEntity, {
|
|
44
|
+
id: scheduledJob.id,
|
|
45
|
+
enabled: true,
|
|
46
|
+
next_upsert_at: (0, typeorm_1.LessThan)(dueBefore),
|
|
47
|
+
}, { next_upsert_at: scheduledAt });
|
|
48
|
+
if (!claim.affected)
|
|
49
|
+
return;
|
|
50
|
+
await trx.insert(scheduled_event_entity_1.ScheduledEventEntity, {
|
|
51
|
+
job_id: scheduledJob.id,
|
|
52
|
+
scheduled_at: scheduledAt,
|
|
53
|
+
active: true,
|
|
54
|
+
});
|
|
47
55
|
});
|
|
48
|
-
await scheduledEvent.save();
|
|
49
|
-
}
|
|
50
|
-
async updateNextUpsertTime(scheduledJob, next_upsert_at) {
|
|
51
|
-
scheduledJob.next_upsert_at = next_upsert_at;
|
|
52
|
-
await scheduledJob.save();
|
|
53
56
|
}
|
|
54
|
-
async getScheduledJobs() {
|
|
57
|
+
async getScheduledJobs(dueBefore) {
|
|
55
58
|
return system_scheduled_task_entity_1.SystemScheduledTaskEntity.find({
|
|
56
59
|
where: {
|
|
57
|
-
start_from: (0, typeorm_1.LessThan)(
|
|
58
|
-
next_upsert_at: (0, typeorm_1.LessThan)(
|
|
60
|
+
start_from: (0, typeorm_1.LessThan)(dueBefore),
|
|
61
|
+
next_upsert_at: (0, typeorm_1.LessThan)(dueBefore),
|
|
59
62
|
enabled: true,
|
|
60
63
|
},
|
|
61
64
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set.scheduled.event.job.js","sourceRoot":"","sources":["../../../src/common/jobs/set.scheduled.event.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6DAAyD;AACzD,6CAAyC;AACzC,iEAAiE;AACjE,8EAA0E;AAC1E,2FAAqF;AACrF,qCAAmC;AACnC,+EAA0E;AAC1E,iFAA2E;AAUpE,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,sBAAS;IACjD,YACqB,YAA0B,EAC5B,yBAAoD;QAErE,KAAK,CAAC,gCAAgB,CAAC,oBAAoB,CAAC,CAAC;QAH1B,iBAAY,GAAZ,YAAY,CAAc;QAC5B,8BAAyB,GAAzB,yBAAyB,CAA2B;IAGvE,CAAC;IAGD,KAAK,CAAC,MAAM;
|
|
1
|
+
{"version":3,"file":"set.scheduled.event.job.js","sourceRoot":"","sources":["../../../src/common/jobs/set.scheduled.event.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6DAAyD;AACzD,6CAAyC;AACzC,iEAAiE;AACjE,8EAA0E;AAC1E,2FAAqF;AACrF,qCAAmC;AACnC,+EAA0E;AAC1E,iFAA2E;AAUpE,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,sBAAS;IACjD,YACqB,YAA0B,EAC5B,yBAAoD;QAErE,KAAK,CAAC,gCAAgB,CAAC,oBAAoB,CAAC,CAAC;QAH1B,iBAAY,GAAZ,YAAY,CAAc;QAC5B,8BAAyB,GAAzB,yBAAyB,CAA2B;IAGvE,CAAC;IAGD,KAAK,CAAC,MAAM;QAGV,IAAI,OAAO,CAAC,GAAG,CAAC,iCAAiC,KAAK,MAAM;YAAE,OAAO;QAErE,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACnC,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;IACvC,CAAC;IAEO,KAAK,CAAC,qBAAqB;QAGjC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QAEvB,KAAK,MAAM,YAAY,IAAI,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5D,MAAM,IAAI,CAAC,qBAAqB,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAmBO,KAAK,CAAC,qBAAqB,CACjC,YAAuC,EACvC,SAAe;QAEf,MAAM,WAAW,GAAG,kCAAe,CAAC,WAAW,CAC7C,YAAY,CAAC,iBAAiB,EAC9B,SAAS,CACV,CAAC;QAEF,MAAM,wDAAyB,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,WAAW,CACjE,KAAK,EAAE,GAAG,EAAE,EAAE;YACZ,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,MAAM,CAC5B,wDAAyB,EACzB;gBACE,EAAE,EAAE,YAAY,CAAC,EAAE;gBACnB,OAAO,EAAE,IAAI;gBACb,cAAc,EAAE,IAAA,kBAAQ,EAAC,SAAS,CAAC;aACpC,EACD,EAAE,cAAc,EAAE,WAAW,EAAE,CAChC,CAAC;YAEF,IAAI,CAAC,KAAK,CAAC,QAAQ;gBAAE,OAAO;YAE5B,MAAM,GAAG,CAAC,MAAM,CAAC,6CAAoB,EAAE;gBACrC,MAAM,EAAE,YAAY,CAAC,EAAE;gBACvB,YAAY,EAAE,WAAW;gBACzB,MAAM,EAAE,IAAI;aACb,CAAC,CAAC;QACL,CAAC,CACF,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,SAAe;QAEf,OAAO,wDAAyB,CAAC,IAAI,CAAC;YACpC,KAAK,EAAE;gBACL,UAAU,EAAE,IAAA,kBAAQ,EAAC,SAAS,CAAC;gBAC/B,cAAc,EAAE,IAAA,kBAAQ,EAAC,SAAS,CAAC;gBACnC,OAAO,EAAE,IAAI;aACd;SACF,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,uBAAuB;QACnC,MAAM,IAAI,CAAC,yBAAyB,CAAC,QAAQ,EAAE,CAAC;QAEhD,OAAO;IACT,CAAC;CACF,CAAA;AA9FY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;qCAGwB,4BAAY;QACD,wDAAyB;GAH5D,oBAAoB,CA8FhC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system.scheduled.task.job.d.ts","sourceRoot":"","sources":["../../../src/common/jobs/system.scheduled.task.job.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AAGrF,qBACa,sBAAuB,SAAQ,SAAS;IACvC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY;gBAA1B,YAAY,EAAE,YAAY;IAInD,MAAM,CACV,KAAK,EAAE,gBAAgB,CAAC,yBAAyB,CAAC,GACjD,OAAO,CAAC,IAAI,CAAC;IAYV,2BAA2B,CAC/B,KAAK,EAAE,gBAAgB,CAAC,yBAAyB,CAAC,GACjD,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"system.scheduled.task.job.d.ts","sourceRoot":"","sources":["../../../src/common/jobs/system.scheduled.task.job.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,0CAA0C,CAAC;AAGrF,qBACa,sBAAuB,SAAQ,SAAS;IACvC,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY;gBAA1B,YAAY,EAAE,YAAY;IAInD,MAAM,CACV,KAAK,EAAE,gBAAgB,CAAC,yBAAyB,CAAC,GACjD,OAAO,CAAC,IAAI,CAAC;IAYV,2BAA2B,CAC/B,KAAK,EAAE,gBAAgB,CAAC,yBAAyB,CAAC,GACjD,OAAO,CAAC,IAAI,CAAC;YAcF,iCAAiC;CAgBhD"}
|
|
@@ -30,13 +30,15 @@ let SystemScheduledTaskJob = class SystemScheduledTaskJob extends common_job_1.C
|
|
|
30
30
|
return;
|
|
31
31
|
if (this.isNewRecord(event))
|
|
32
32
|
return;
|
|
33
|
-
if (!this.isColumnUpdated(event, ['
|
|
33
|
+
if (!this.isColumnUpdated(event, ['deleted_at']))
|
|
34
34
|
return;
|
|
35
35
|
await scheduled_event_entity_1.ScheduledEventEntity.softDelete({ job_id: task.id });
|
|
36
36
|
return;
|
|
37
37
|
}
|
|
38
38
|
async syncScheduledEventsOnActiveToggle(event) {
|
|
39
39
|
const task = event.entity;
|
|
40
|
+
if (!task?.id)
|
|
41
|
+
return;
|
|
40
42
|
if (this.isNewRecord(event))
|
|
41
43
|
return;
|
|
42
44
|
if (!this.isColumnUpdated(event, 'enabled'))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system.scheduled.task.job.js","sourceRoot":"","sources":["../../../src/common/jobs/system.scheduled.task.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6DAAyD;AACzD,6CAAyC;AACzC,iEAAiE;AAGjE,+EAA0E;AAGnE,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,sBAAS;IACnD,YAA+B,YAA0B;QACvD,KAAK,CAAC,gCAAgB,CAAC,sBAAsB,CAAC,CAAC;QADlB,iBAAY,GAAZ,YAAY,CAAc;IAEzD,CAAC;IAED,KAAK,CAAC,MAAM,CACV,KAAkD;QAElD,MAAM,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QAC9C,MAAM,IAAI,CAAC,iCAAiC,CAAC,KAAK,CAAC,CAAC;IACtD,CAAC;IASD,KAAK,CAAC,2BAA2B,CAC/B,KAAkD;QAElD,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC;QAE1B,IAAI,CAAC,IAAI,EAAE,EAAE;YAAE,OAAO;QACtB,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;YAAE,OAAO;
|
|
1
|
+
{"version":3,"file":"system.scheduled.task.job.js","sourceRoot":"","sources":["../../../src/common/jobs/system.scheduled.task.job.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6DAAyD;AACzD,6CAAyC;AACzC,iEAAiE;AAGjE,+EAA0E;AAGnE,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,sBAAS;IACnD,YAA+B,YAA0B;QACvD,KAAK,CAAC,gCAAgB,CAAC,sBAAsB,CAAC,CAAC;QADlB,iBAAY,GAAZ,YAAY,CAAc;IAEzD,CAAC;IAED,KAAK,CAAC,MAAM,CACV,KAAkD;QAElD,MAAM,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QAC9C,MAAM,IAAI,CAAC,iCAAiC,CAAC,KAAK,CAAC,CAAC;IACtD,CAAC;IASD,KAAK,CAAC,2BAA2B,CAC/B,KAAkD;QAElD,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC;QAE1B,IAAI,CAAC,IAAI,EAAE,EAAE;YAAE,OAAO;QACtB,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;YAAE,OAAO;QAGpC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,YAAY,CAAC,CAAC;YAAE,OAAO;QAEzD,MAAM,6CAAoB,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAE3D,OAAO;IACT,CAAC;IAEO,KAAK,CAAC,iCAAiC,CAC7C,KAAkD;QAElD,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC;QAE1B,IAAI,CAAC,IAAI,EAAE,EAAE;YAAE,OAAO;QACtB,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;YAAE,OAAO;QACpC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,SAAS,CAAC;YAAE,OAAO;QAEpD,MAAM,6CAAoB,CAAC,MAAM,CAC/B,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,EACnB,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,CACzB,CAAC;QAEF,OAAO;IACT,CAAC;CACF,CAAA;AAnDY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;qCAEkC,4BAAY;GAD9C,sBAAsB,CAmDlC"}
|