@webda/core 3.16.4 → 4.0.0-beta.2
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/lib/application.d.ts +29 -8
- package/lib/application.d.ts.map +1 -0
- package/lib/application.js +65 -38
- package/lib/application.js.map +1 -1
- package/lib/application.spec.d.ts +1 -0
- package/lib/application.spec.d.ts.map +1 -0
- package/lib/application.spec.js +57 -43
- package/lib/application.spec.js.map +1 -1
- package/lib/core.d.ts +16 -12
- package/lib/core.d.ts.map +1 -0
- package/lib/core.js +105 -80
- package/lib/core.js.map +1 -1
- package/lib/core.spec.d.ts +1 -0
- package/lib/core.spec.d.ts.map +1 -0
- package/lib/core.spec.js +96 -67
- package/lib/core.spec.js.map +1 -1
- package/lib/errors.d.ts +59 -60
- package/lib/errors.d.ts.map +1 -0
- package/lib/errors.js +92 -108
- package/lib/errors.js.map +1 -1
- package/lib/errors.spec.d.ts +1 -0
- package/lib/errors.spec.d.ts.map +1 -0
- package/lib/errors.spec.js +1 -1
- package/lib/errors.spec.js.map +1 -1
- package/lib/index.d.ts +6 -3
- package/lib/index.d.ts.map +1 -0
- package/lib/index.js +6 -3
- package/lib/index.js.map +1 -1
- package/lib/models/aclmodel.d.ts +2 -2
- package/lib/models/aclmodel.d.ts.map +1 -0
- package/lib/models/aclmodel.js +8 -9
- package/lib/models/aclmodel.js.map +1 -1
- package/lib/models/aclmodel.spec.d.ts +1 -0
- package/lib/models/aclmodel.spec.d.ts.map +1 -0
- package/lib/models/aclmodel.spec.js +3 -3
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +15 -0
- package/lib/models/coremodel.d.ts.map +1 -0
- package/lib/models/coremodel.js +35 -28
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.d.ts +1 -0
- package/lib/models/coremodel.spec.d.ts.map +1 -0
- package/lib/models/coremodel.spec.js +33 -31
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/deployment.d.ts +1 -0
- package/lib/models/deployment.d.ts.map +1 -0
- package/lib/models/ident.d.ts +17 -2
- package/lib/models/ident.d.ts.map +1 -0
- package/lib/models/ident.js +0 -14
- package/lib/models/ident.js.map +1 -1
- package/lib/models/ident.spec.d.ts +1 -0
- package/lib/models/ident.spec.d.ts.map +1 -0
- package/lib/models/ident.spec.js +1 -20
- package/lib/models/ident.spec.js.map +1 -1
- package/lib/models/ownermodel.d.ts +1 -0
- package/lib/models/ownermodel.d.ts.map +1 -0
- package/lib/models/ownermodel.spec.d.ts +1 -0
- package/lib/models/ownermodel.spec.d.ts.map +1 -0
- package/lib/models/ownermodel.spec.js +57 -33
- package/lib/models/ownermodel.spec.js.map +1 -1
- package/lib/models/relations.d.ts +1 -0
- package/lib/models/relations.d.ts.map +1 -0
- package/lib/models/relations.js +3 -3
- package/lib/models/relations.js.map +1 -1
- package/lib/models/relations.spec.d.ts +2 -0
- package/lib/models/relations.spec.d.ts.map +1 -0
- package/lib/models/relations.spec.js +10 -17
- package/lib/models/relations.spec.js.map +1 -1
- package/lib/models/rolemodel.d.ts +1 -0
- package/lib/models/rolemodel.d.ts.map +1 -0
- package/lib/models/rolemodel.js +2 -2
- package/lib/models/rolemodel.js.map +1 -1
- package/lib/models/rolemodel.spec.d.ts +1 -0
- package/lib/models/rolemodel.spec.d.ts.map +1 -0
- package/lib/models/rolemodel.spec.js +5 -1
- package/lib/models/rolemodel.spec.js.map +1 -1
- package/lib/models/simpleuser.d.ts +47 -0
- package/lib/models/simpleuser.d.ts.map +1 -0
- package/lib/models/simpleuser.js +84 -0
- package/lib/models/simpleuser.js.map +1 -0
- package/lib/models/test.d.ts +11 -0
- package/lib/models/test.d.ts.map +1 -0
- package/lib/models/test.js +7 -0
- package/lib/models/test.js.map +1 -0
- package/lib/models/user.d.ts +2 -35
- package/lib/models/user.d.ts.map +1 -0
- package/lib/models/user.js +3 -74
- package/lib/models/user.js.map +1 -1
- package/lib/models/user.spec.d.ts +1 -0
- package/lib/models/user.spec.d.ts.map +1 -0
- package/lib/models/user.spec.js +7 -6
- package/lib/models/user.spec.js.map +1 -1
- package/lib/queues/filequeue.d.ts +1 -0
- package/lib/queues/filequeue.d.ts.map +1 -0
- package/lib/queues/filequeue.js +5 -5
- package/lib/queues/filequeue.js.map +1 -1
- package/lib/queues/filequeue.spec.d.ts +1 -0
- package/lib/queues/filequeue.spec.d.ts.map +1 -0
- package/lib/queues/filequeue.spec.js +11 -5
- package/lib/queues/filequeue.spec.js.map +1 -1
- package/lib/queues/memoryqueue.d.ts +14 -0
- package/lib/queues/memoryqueue.d.ts.map +1 -0
- package/lib/queues/memoryqueue.js +38 -7
- package/lib/queues/memoryqueue.js.map +1 -1
- package/lib/queues/memoryqueue.spec.d.ts +1 -0
- package/lib/queues/memoryqueue.spec.d.ts.map +1 -0
- package/lib/queues/memoryqueue.spec.js +18 -7
- package/lib/queues/memoryqueue.spec.js.map +1 -1
- package/lib/queues/pubsubservice.d.ts +1 -0
- package/lib/queues/pubsubservice.d.ts.map +1 -0
- package/lib/queues/queue.spec.d.ts +3 -2
- package/lib/queues/queue.spec.d.ts.map +1 -0
- package/lib/queues/queue.spec.js +5 -3
- package/lib/queues/queue.spec.js.map +1 -1
- package/lib/queues/queueservice.d.ts +1 -0
- package/lib/queues/queueservice.d.ts.map +1 -0
- package/lib/queues/queueservice.js +7 -7
- package/lib/queues/queueservice.js.map +1 -1
- package/lib/rest/restdomainservice.d.ts +63 -0
- package/lib/rest/restdomainservice.d.ts.map +1 -0
- package/lib/rest/restdomainservice.js +687 -0
- package/lib/rest/restdomainservice.js.map +1 -0
- package/lib/rest/restdomainservice.spec.d.ts +2 -0
- package/lib/rest/restdomainservice.spec.d.ts.map +1 -0
- package/lib/rest/restdomainservice.spec.js +124 -0
- package/lib/rest/restdomainservice.spec.js.map +1 -0
- package/lib/{router.d.ts → rest/router.d.ts} +6 -4
- package/lib/rest/router.d.ts.map +1 -0
- package/lib/{router.js → rest/router.js} +33 -23
- package/lib/rest/router.js.map +1 -0
- package/lib/rest/router.spec.d.ts +2 -0
- package/lib/rest/router.spec.d.ts.map +1 -0
- package/lib/{router.spec.js → rest/router.spec.js} +54 -28
- package/lib/rest/router.spec.js.map +1 -0
- package/lib/services/asyncevents.d.ts +1 -0
- package/lib/services/asyncevents.d.ts.map +1 -0
- package/lib/services/asyncevents.js +4 -4
- package/lib/services/asyncevents.js.map +1 -1
- package/lib/services/asyncevents.spec.d.ts +1 -0
- package/lib/services/asyncevents.spec.d.ts.map +1 -0
- package/lib/services/asyncevents.spec.js +10 -10
- package/lib/services/asyncevents.spec.js.map +1 -1
- package/lib/services/authentication.d.ts +2 -1
- package/lib/services/authentication.d.ts.map +1 -0
- package/lib/services/authentication.js +26 -25
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/authentication.spec.d.ts +1 -0
- package/lib/services/authentication.spec.d.ts.map +1 -0
- package/lib/services/authentication.spec.js +24 -24
- package/lib/services/authentication.spec.js.map +1 -1
- package/lib/services/binary.d.ts +13 -87
- package/lib/services/binary.d.ts.map +1 -0
- package/lib/services/binary.js +39 -421
- package/lib/services/binary.js.map +1 -1
- package/lib/services/binary.spec.d.ts +19 -22
- package/lib/services/binary.spec.d.ts.map +1 -0
- package/lib/services/binary.spec.js +87 -374
- package/lib/services/binary.spec.js.map +1 -1
- package/lib/services/cloudbinary.d.ts +3 -2
- package/lib/services/cloudbinary.d.ts.map +1 -0
- package/lib/services/cloudbinary.js +1 -1
- package/lib/services/cloudbinary.js.map +1 -1
- package/lib/services/cloudbinary.spec.d.ts +1 -8
- package/lib/services/cloudbinary.spec.d.ts.map +1 -0
- package/lib/services/cloudbinary.spec.js +4 -130
- package/lib/services/cloudbinary.spec.js.map +1 -1
- package/lib/services/configuration.d.ts +10 -1
- package/lib/services/configuration.d.ts.map +1 -0
- package/lib/services/configuration.js +22 -7
- package/lib/services/configuration.js.map +1 -1
- package/lib/services/configuration.spec.d.ts +1 -0
- package/lib/services/configuration.spec.d.ts.map +1 -0
- package/lib/services/configuration.spec.js +60 -17
- package/lib/services/configuration.spec.js.map +1 -1
- package/lib/services/cron.d.ts +2 -1
- package/lib/services/cron.d.ts.map +1 -0
- package/lib/services/cron.js +10 -10
- package/lib/services/cron.js.map +1 -1
- package/lib/services/cron.spec.d.ts +1 -0
- package/lib/services/cron.spec.d.ts.map +1 -0
- package/lib/services/cron.spec.js +2 -2
- package/lib/services/cron.spec.js.map +1 -1
- package/lib/services/cryptoservice.d.ts +3 -2
- package/lib/services/cryptoservice.d.ts.map +1 -0
- package/lib/services/cryptoservice.js +29 -30
- package/lib/services/cryptoservice.js.map +1 -1
- package/lib/services/cryptoservice.spec.d.ts +1 -0
- package/lib/services/cryptoservice.spec.d.ts.map +1 -0
- package/lib/services/cryptoservice.spec.js +17 -17
- package/lib/services/cryptoservice.spec.js.map +1 -1
- package/lib/services/debugmailer.d.ts +2 -2
- package/lib/services/debugmailer.d.ts.map +1 -0
- package/lib/services/debugmailer.js +1 -2
- package/lib/services/debugmailer.js.map +1 -1
- package/lib/services/debugmailer.spec.d.ts +1 -0
- package/lib/services/debugmailer.spec.d.ts.map +1 -0
- package/lib/services/debugmailer.spec.js +6 -3
- package/lib/services/debugmailer.spec.js.map +1 -1
- package/lib/services/domainservice.d.ts +167 -47
- package/lib/services/domainservice.d.ts.map +1 -0
- package/lib/services/domainservice.js +520 -753
- package/lib/services/domainservice.js.map +1 -1
- package/lib/services/domainservice.spec.d.ts +1 -0
- package/lib/services/domainservice.spec.d.ts.map +1 -0
- package/lib/services/domainservice.spec.js +201 -31
- package/lib/services/domainservice.spec.js.map +1 -1
- package/lib/services/filebinary.d.ts +8 -5
- package/lib/services/filebinary.d.ts.map +1 -0
- package/lib/services/filebinary.js +34 -32
- package/lib/services/filebinary.js.map +1 -1
- package/lib/services/filebinary.spec.d.ts +12 -8
- package/lib/services/filebinary.spec.d.ts.map +1 -0
- package/lib/services/filebinary.spec.js +135 -122
- package/lib/services/filebinary.spec.js.map +1 -1
- package/lib/services/fileconfiguration.d.ts +2 -1
- package/lib/services/fileconfiguration.d.ts.map +1 -0
- package/lib/services/fileconfiguration.js +1 -1
- package/lib/services/fileconfiguration.js.map +1 -1
- package/lib/services/fileconfiguration.spec.d.ts +1 -0
- package/lib/services/fileconfiguration.spec.d.ts.map +1 -0
- package/lib/services/fileconfiguration.spec.js +65 -27
- package/lib/services/fileconfiguration.spec.js.map +1 -1
- package/lib/services/invitationservice.d.ts +2 -1
- package/lib/services/invitationservice.d.ts.map +1 -0
- package/lib/services/invitationservice.js +19 -16
- package/lib/services/invitationservice.js.map +1 -1
- package/lib/services/invitationservice.spec.d.ts +1 -0
- package/lib/services/invitationservice.spec.d.ts.map +1 -0
- package/lib/services/invitationservice.spec.js +73 -22
- package/lib/services/invitationservice.spec.js.map +1 -1
- package/lib/services/kubernetesconfiguration.d.ts +1 -0
- package/lib/services/kubernetesconfiguration.d.ts.map +1 -0
- package/lib/services/kubernetesconfiguration.js +0 -2
- package/lib/services/kubernetesconfiguration.js.map +1 -1
- package/lib/services/kubernetesconfiguration.spec.d.ts +1 -0
- package/lib/services/kubernetesconfiguration.spec.d.ts.map +1 -0
- package/lib/services/kubernetesconfiguration.spec.js +67 -8
- package/lib/services/kubernetesconfiguration.spec.js.map +1 -1
- package/lib/services/mailer.d.ts +1 -0
- package/lib/services/mailer.d.ts.map +1 -0
- package/lib/services/mailer.js +3 -3
- package/lib/services/mailer.js.map +1 -1
- package/lib/services/mailer.spec.d.ts +1 -0
- package/lib/services/mailer.spec.d.ts.map +1 -0
- package/lib/services/mailer.spec.js +18 -4
- package/lib/services/mailer.spec.js.map +1 -1
- package/lib/services/notificationservice.d.ts +1 -0
- package/lib/services/notificationservice.d.ts.map +1 -0
- package/lib/services/notificationservice.js +1 -1
- package/lib/services/notificationservice.js.map +1 -1
- package/lib/services/notificationservice.spec.d.ts +1 -0
- package/lib/services/notificationservice.spec.d.ts.map +1 -0
- package/lib/services/notificationservice.spec.js +8 -3
- package/lib/services/notificationservice.spec.js.map +1 -1
- package/lib/services/oauth.d.ts +6 -3
- package/lib/services/oauth.d.ts.map +1 -0
- package/lib/services/oauth.js +11 -8
- package/lib/services/oauth.js.map +1 -1
- package/lib/services/oauth.spec.d.ts +1 -0
- package/lib/services/oauth.spec.d.ts.map +1 -0
- package/lib/services/oauth.spec.js +39 -15
- package/lib/services/oauth.spec.js.map +1 -1
- package/lib/services/prometheus.d.ts +1 -0
- package/lib/services/prometheus.d.ts.map +1 -0
- package/lib/services/prometheus.spec.d.ts +1 -0
- package/lib/services/prometheus.spec.d.ts.map +1 -0
- package/lib/services/prometheus.spec.js +38 -19
- package/lib/services/prometheus.spec.js.map +1 -1
- package/lib/services/resource.d.ts +21 -1
- package/lib/services/resource.d.ts.map +1 -0
- package/lib/services/resource.js +20 -3
- package/lib/services/resource.js.map +1 -1
- package/lib/services/resource.spec.d.ts +1 -0
- package/lib/services/resource.spec.d.ts.map +1 -0
- package/lib/services/resource.spec.js +38 -20
- package/lib/services/resource.spec.js.map +1 -1
- package/lib/services/service.d.ts +2 -2
- package/lib/services/service.d.ts.map +1 -0
- package/lib/services/service.js +13 -23
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.d.ts +1 -0
- package/lib/services/service.spec.d.ts.map +1 -0
- package/lib/services/service.spec.js +58 -40
- package/lib/services/service.spec.js.map +1 -1
- package/lib/stores/aggregator.d.ts +10 -3
- package/lib/stores/aggregator.d.ts.map +1 -0
- package/lib/stores/aggregator.js +6 -6
- package/lib/stores/aggregator.js.map +1 -1
- package/lib/stores/file.d.ts +3 -2
- package/lib/stores/file.d.ts.map +1 -0
- package/lib/stores/file.js +13 -13
- package/lib/stores/file.js.map +1 -1
- package/lib/stores/file.spec.d.ts +5 -11
- package/lib/stores/file.spec.d.ts.map +1 -0
- package/lib/stores/file.spec.js +20 -114
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.d.ts +2 -1
- package/lib/stores/mapper.d.ts.map +1 -0
- package/lib/stores/mapper.js +12 -12
- package/lib/stores/mapper.js.map +1 -1
- package/lib/stores/mapper.spec.d.ts +1 -0
- package/lib/stores/mapper.spec.d.ts.map +1 -0
- package/lib/stores/mapper.spec.js +24 -17
- package/lib/stores/mapper.spec.js.map +1 -1
- package/lib/stores/memory.d.ts +2 -1
- package/lib/stores/memory.d.ts.map +1 -0
- package/lib/stores/memory.js +15 -15
- package/lib/stores/memory.js.map +1 -1
- package/lib/stores/memory.spec.d.ts +7 -13
- package/lib/stores/memory.spec.d.ts.map +1 -0
- package/lib/stores/memory.spec.js +118 -183
- package/lib/stores/memory.spec.js.map +1 -1
- package/lib/stores/modelmapper.d.ts +1 -0
- package/lib/stores/modelmapper.d.ts.map +1 -0
- package/lib/stores/modelmapper.js +8 -10
- package/lib/stores/modelmapper.js.map +1 -1
- package/lib/stores/store.d.ts +4 -145
- package/lib/stores/store.d.ts.map +1 -0
- package/lib/stores/store.js +54 -654
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +11 -19
- package/lib/stores/store.spec.d.ts.map +1 -0
- package/lib/stores/store.spec.js +99 -268
- package/lib/stores/store.spec.js.map +1 -1
- package/lib/test.d.ts +109 -6
- package/lib/test.d.ts.map +1 -0
- package/lib/test.js +245 -22
- package/lib/test.js.map +1 -1
- package/lib/unpackedapplication.d.ts +3 -2
- package/lib/unpackedapplication.d.ts.map +1 -0
- package/lib/unpackedapplication.js +29 -16
- package/lib/unpackedapplication.js.map +1 -1
- package/lib/utils/abstractdeployer.d.ts +1 -0
- package/lib/utils/abstractdeployer.d.ts.map +1 -0
- package/lib/utils/abstractdeployer.spec.d.ts +1 -0
- package/lib/utils/abstractdeployer.spec.d.ts.map +1 -0
- package/lib/utils/case.d.ts +1 -0
- package/lib/utils/case.d.ts.map +1 -0
- package/lib/utils/case.spec.d.ts +1 -0
- package/lib/utils/case.spec.d.ts.map +1 -0
- package/lib/utils/context.d.ts +37 -17
- package/lib/utils/context.d.ts.map +1 -0
- package/lib/utils/context.js +53 -42
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.d.ts +1 -0
- package/lib/utils/context.spec.d.ts.map +1 -0
- package/lib/utils/context.spec.js +21 -14
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/cookie.d.ts +1 -0
- package/lib/utils/cookie.d.ts.map +1 -0
- package/lib/utils/cookie.js +2 -2
- package/lib/utils/cookie.js.map +1 -1
- package/lib/utils/cookie.spec.d.ts +1 -0
- package/lib/utils/cookie.spec.d.ts.map +1 -0
- package/lib/utils/cookie.spec.js +20 -10
- package/lib/utils/cookie.spec.js.map +1 -1
- package/lib/utils/esm.d.ts +1 -0
- package/lib/utils/esm.d.ts.map +1 -0
- package/lib/utils/httpcontext.d.ts +1 -0
- package/lib/utils/httpcontext.d.ts.map +1 -0
- package/lib/utils/httpcontext.js +7 -7
- package/lib/utils/httpcontext.js.map +1 -1
- package/lib/utils/httpcontext.spec.d.ts +1 -0
- package/lib/utils/httpcontext.spec.d.ts.map +1 -0
- package/lib/utils/httpcontext.spec.js +7 -7
- package/lib/utils/httpcontext.spec.js.map +1 -1
- package/lib/utils/logger.d.ts +1 -0
- package/lib/utils/logger.d.ts.map +1 -0
- package/lib/utils/logger.spec.d.ts +1 -0
- package/lib/utils/logger.spec.d.ts.map +1 -0
- package/lib/utils/logger.spec.js +5 -5
- package/lib/utils/logger.spec.js.map +1 -1
- package/lib/utils/serializers.d.ts +6 -4
- package/lib/utils/serializers.d.ts.map +1 -0
- package/lib/utils/serializers.js +30 -27
- package/lib/utils/serializers.js.map +1 -1
- package/lib/utils/serializers.spec.d.ts +1 -0
- package/lib/utils/serializers.spec.d.ts.map +1 -0
- package/lib/utils/serializers.spec.js +12 -14
- package/lib/utils/serializers.spec.js.map +1 -1
- package/lib/utils/session.d.ts +2 -5
- package/lib/utils/session.d.ts.map +1 -0
- package/lib/utils/session.js +1 -11
- package/lib/utils/session.js.map +1 -1
- package/lib/utils/session.spec.d.ts +1 -0
- package/lib/utils/session.spec.d.ts.map +1 -0
- package/lib/utils/session.spec.js +22 -12
- package/lib/utils/session.spec.js.map +1 -1
- package/lib/utils/throttler.d.ts +1 -4
- package/lib/utils/throttler.d.ts.map +1 -0
- package/lib/utils/throttler.js +1 -9
- package/lib/utils/throttler.js.map +1 -1
- package/lib/utils/throttler.spec.d.ts +1 -0
- package/lib/utils/throttler.spec.d.ts.map +1 -0
- package/lib/utils/throttler.spec.js +4 -6
- package/lib/utils/throttler.spec.js.map +1 -1
- package/lib/utils/waiter.d.ts +1 -0
- package/lib/utils/waiter.d.ts.map +1 -0
- package/lib/utils/waiter.js +3 -3
- package/lib/utils/waiter.js.map +1 -1
- package/lib/utils/waiter.spec.d.ts +1 -0
- package/lib/utils/waiter.spec.d.ts.map +1 -0
- package/lib/utils/waiter.spec.js +6 -6
- package/lib/utils/waiter.spec.js.map +1 -1
- package/package.json +20 -16
- package/test/config.json +6 -90
- package/test/data/.env +1 -0
- package/webda.module.json +607 -377
- package/lib/router.js.map +0 -1
- package/lib/router.spec.d.ts +0 -1
- package/lib/router.spec.js.map +0 -1
- package/lib/stores/aliasstore.d.ts +0 -108
- package/lib/stores/aliasstore.js +0 -168
- package/lib/stores/aliasstore.js.map +0 -1
- package/lib/stores/aliasstore.spec.d.ts +0 -11
- package/lib/stores/aliasstore.spec.js +0 -89
- package/lib/stores/aliasstore.spec.js.map +0 -1
- package/lib/stores/webdaql/WebdaQLLexer.d.ts +0 -54
- package/lib/stores/webdaql/WebdaQLLexer.js +0 -295
- package/lib/stores/webdaql/WebdaQLLexer.js.map +0 -1
- package/lib/stores/webdaql/WebdaQLParserLexer.d.ts +0 -54
- package/lib/stores/webdaql/WebdaQLParserLexer.js +0 -295
- package/lib/stores/webdaql/WebdaQLParserLexer.js.map +0 -1
- package/lib/stores/webdaql/WebdaQLParserListener.d.ts +0 -296
- package/lib/stores/webdaql/WebdaQLParserListener.js +0 -3
- package/lib/stores/webdaql/WebdaQLParserListener.js.map +0 -1
- package/lib/stores/webdaql/WebdaQLParserParser.d.ts +0 -311
- package/lib/stores/webdaql/WebdaQLParserParser.js +0 -1807
- package/lib/stores/webdaql/WebdaQLParserParser.js.map +0 -1
- package/lib/stores/webdaql/WebdaQLParserVisitor.d.ts +0 -181
- package/lib/stores/webdaql/WebdaQLParserVisitor.js +0 -3
- package/lib/stores/webdaql/WebdaQLParserVisitor.js.map +0 -1
- package/lib/stores/webdaql/query.d.ts +0 -390
- package/lib/stores/webdaql/query.js +0 -702
- package/lib/stores/webdaql/query.js.map +0 -1
- package/lib/stores/webdaql/query.spec.d.ts +0 -1
- package/lib/stores/webdaql/query.spec.js +0 -206
- package/lib/stores/webdaql/query.spec.js.map +0 -1
- package/test/config-file-missing-file-no-default.json +0 -44
- package/test/config-file-missing-file.json +0 -55
- package/test/config-file-no-reload.json +0 -69
- package/test/config-file-reload.json +0 -68
- package/test/config-invitation.json +0 -63
- package/test/config-kube-reload.json +0 -68
- package/test/config-reload.json +0 -66
- package/test/config.old.json +0 -152
- package/test/moddas/annotatedservice.js +0 -23
- package/test/moddas/debugmailer.js +0 -13
- package/test/moddas/fakeservice.js +0 -4
- package/test/moddas/voidstore.js +0 -66
- package/test/models/ident.js +0 -36
- package/test/models/task.js +0 -42
|
@@ -7,10 +7,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
import { suite, test } from "@testdeck/mocha";
|
|
8
8
|
import * as assert from "assert";
|
|
9
9
|
import * as sinon from "sinon";
|
|
10
|
-
import { WebdaError } from "../errors.js";
|
|
11
10
|
import { CoreModel } from "../models/coremodel.js";
|
|
12
11
|
import { WebdaTest } from "../test.js";
|
|
13
|
-
import { BinaryTest } from "./binary.spec.js";
|
|
14
12
|
import { CloudBinary, CloudBinaryParameters } from "./cloudbinary.js";
|
|
15
13
|
class CloudBinaryFakeService extends CloudBinary {
|
|
16
14
|
store(object, property, file, metadata) {
|
|
@@ -35,35 +33,12 @@ class CloudBinaryFakeService extends CloudBinary {
|
|
|
35
33
|
return `${map.hash}:${expires}`;
|
|
36
34
|
}
|
|
37
35
|
}
|
|
38
|
-
export class CloudBinaryTest extends BinaryTest {
|
|
39
|
-
async redirectUrl() {
|
|
40
|
-
let { user1, ctx } = await this.setupDefault();
|
|
41
|
-
// Making sure we are redirected on GET
|
|
42
|
-
let executor = this.getExecutor(ctx, "test.webda.io", "GET", `/binary/users/${user1.getUuid()}/images/0`, {});
|
|
43
|
-
await executor.execute(ctx);
|
|
44
|
-
assert.ok(ctx.getResponseHeaders().Location !== undefined);
|
|
45
|
-
}
|
|
46
|
-
async redirectUrlInfo() {
|
|
47
|
-
let { user1, ctx } = await this.setupDefault();
|
|
48
|
-
// Making sure we are redirected on GET
|
|
49
|
-
let executor = this.getExecutor(ctx, "test.webda.io", "GET", `/binary/users/${user1.getUuid()}/images/0/url`, {});
|
|
50
|
-
await executor.execute(ctx);
|
|
51
|
-
assert.ok(ctx.getResponseHeaders().Location === undefined);
|
|
52
|
-
assert.notStrictEqual(JSON.parse(ctx.getResponseBody()).Location, undefined);
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
__decorate([
|
|
56
|
-
test
|
|
57
|
-
], CloudBinaryTest.prototype, "redirectUrl", null);
|
|
58
|
-
__decorate([
|
|
59
|
-
test
|
|
60
|
-
], CloudBinaryTest.prototype, "redirectUrlInfo", null);
|
|
61
36
|
let FakeCloudBinaryTest = class FakeCloudBinaryTest extends WebdaTest {
|
|
62
37
|
async testDefaults() {
|
|
63
|
-
|
|
64
|
-
|
|
38
|
+
const service = new CloudBinaryFakeService(this.webda, "fake", {});
|
|
39
|
+
const binaryMap = { hash: "test", size: 10 };
|
|
65
40
|
await service.cascadeDelete(binaryMap, "plop");
|
|
66
|
-
|
|
41
|
+
const stub = sinon.stub(service, "_cleanUsage").callsFake(() => {
|
|
67
42
|
throw new Error();
|
|
68
43
|
});
|
|
69
44
|
// Should not fail even with exception
|
|
@@ -74,117 +49,16 @@ let FakeCloudBinaryTest = class FakeCloudBinaryTest extends WebdaTest {
|
|
|
74
49
|
assert.strictEqual(service._getKey("hash", "plop"), "prefix/hash/plop");
|
|
75
50
|
assert.strictEqual(new CloudBinaryParameters({}, service).prefix, "");
|
|
76
51
|
sinon.stub(service, "deleteSuccess").resolves();
|
|
77
|
-
|
|
52
|
+
const model = new CoreModel();
|
|
78
53
|
// @ts-ignore
|
|
79
54
|
model.load({ plop: [{}, { hash: "fake" }] }, true);
|
|
80
55
|
await service.delete(model, "plop", 1);
|
|
81
56
|
// Check called with "fake", 1
|
|
82
57
|
}
|
|
83
|
-
async initRoutes() {
|
|
84
|
-
let service = new CloudBinaryFakeService(this.webda, "fake", {});
|
|
85
|
-
// @ts-ignore addRoute is a protected method of service
|
|
86
|
-
let stub = sinon.stub(service, "addRoute");
|
|
87
|
-
service.initRoutes();
|
|
88
|
-
assert.strictEqual(stub.callCount, 0);
|
|
89
|
-
service.getParameters().expose = {
|
|
90
|
-
url: "plop",
|
|
91
|
-
restrict: {}
|
|
92
|
-
};
|
|
93
|
-
service.initRoutes();
|
|
94
|
-
assert.strictEqual(stub.callCount, 6);
|
|
95
|
-
stub.callCount = 0;
|
|
96
|
-
service.getParameters().expose = {
|
|
97
|
-
url: "plop",
|
|
98
|
-
restrict: {
|
|
99
|
-
get: true
|
|
100
|
-
}
|
|
101
|
-
};
|
|
102
|
-
service.initRoutes();
|
|
103
|
-
assert.strictEqual(stub.callCount, 4);
|
|
104
|
-
}
|
|
105
|
-
async routes() {
|
|
106
|
-
let service = new CloudBinaryFakeService(this.webda, "fake", {});
|
|
107
|
-
let wrote;
|
|
108
|
-
let wroteHead;
|
|
109
|
-
let context = {
|
|
110
|
-
parameter: name => {
|
|
111
|
-
return name === "index" ? 1 : name;
|
|
112
|
-
},
|
|
113
|
-
write: (...arg) => {
|
|
114
|
-
wrote = arg;
|
|
115
|
-
},
|
|
116
|
-
writeHead: (...arg) => {
|
|
117
|
-
wroteHead = arg;
|
|
118
|
-
},
|
|
119
|
-
getParameters: () => ({ index: 1, hash: "hash", property: "property" }),
|
|
120
|
-
getHttpContext: () => ({
|
|
121
|
-
getAbsoluteUrl: () => "http://myhost/test",
|
|
122
|
-
getRelativeUri: () => "/test"
|
|
123
|
-
})
|
|
124
|
-
};
|
|
125
|
-
let storeGetResult;
|
|
126
|
-
// @ts-ignore
|
|
127
|
-
sinon.stub(service, "_verifyMapAndStore").callsFake(() => {
|
|
128
|
-
return {
|
|
129
|
-
get: async () => {
|
|
130
|
-
return storeGetResult;
|
|
131
|
-
}
|
|
132
|
-
};
|
|
133
|
-
});
|
|
134
|
-
await assert.rejects(() => service.httpGet(context), WebdaError.NotFound);
|
|
135
|
-
storeGetResult = {
|
|
136
|
-
property: [1],
|
|
137
|
-
checkAct: () => { }
|
|
138
|
-
};
|
|
139
|
-
await assert.rejects(() => service.httpGet(context), (err) => err.getResponseCode() === 404);
|
|
140
|
-
let myEvt;
|
|
141
|
-
storeGetResult = {
|
|
142
|
-
property: [
|
|
143
|
-
1,
|
|
144
|
-
{
|
|
145
|
-
hash: "myhash"
|
|
146
|
-
}
|
|
147
|
-
],
|
|
148
|
-
checkAct: (ctx, evt) => {
|
|
149
|
-
myEvt = evt;
|
|
150
|
-
},
|
|
151
|
-
canAct: (ctx, evt) => {
|
|
152
|
-
myEvt = evt;
|
|
153
|
-
}
|
|
154
|
-
};
|
|
155
|
-
let counter = 0;
|
|
156
|
-
service.on("Binary.Get", () => {
|
|
157
|
-
counter++;
|
|
158
|
-
});
|
|
159
|
-
await service.httpGet(context);
|
|
160
|
-
assert.deepStrictEqual(wroteHead, [302, { Location: "myhash:30" }]);
|
|
161
|
-
// @ts-ignore
|
|
162
|
-
context.getHttpContext = () => ({
|
|
163
|
-
getAbsoluteUrl: () => "http://myhost/test/url",
|
|
164
|
-
getRelativeUri: () => "/test/url"
|
|
165
|
-
});
|
|
166
|
-
await service.httpGet(context);
|
|
167
|
-
assert.strictEqual(counter, 2);
|
|
168
|
-
assert.deepStrictEqual(wrote, [
|
|
169
|
-
{
|
|
170
|
-
Location: "myhash:30",
|
|
171
|
-
Map: {
|
|
172
|
-
hash: "myhash"
|
|
173
|
-
}
|
|
174
|
-
}
|
|
175
|
-
]);
|
|
176
|
-
assert.strictEqual(myEvt, "get_binary");
|
|
177
|
-
}
|
|
178
58
|
};
|
|
179
59
|
__decorate([
|
|
180
60
|
test
|
|
181
61
|
], FakeCloudBinaryTest.prototype, "testDefaults", null);
|
|
182
|
-
__decorate([
|
|
183
|
-
test
|
|
184
|
-
], FakeCloudBinaryTest.prototype, "initRoutes", null);
|
|
185
|
-
__decorate([
|
|
186
|
-
test
|
|
187
|
-
], FakeCloudBinaryTest.prototype, "routes", null);
|
|
188
62
|
FakeCloudBinaryTest = __decorate([
|
|
189
63
|
suite
|
|
190
64
|
], FakeCloudBinaryTest);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudbinary.spec.js","sourceRoot":"","sources":["../../src/services/cloudbinary.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"cloudbinary.spec.js","sourceRoot":"","sources":["../../src/services/cloudbinary.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEnE,MAAM,sBAAuB,SAAQ,WAAW;IAC9C,KAAK,CAAC,MAAiB,EAAE,QAAgB,EAAE,IAAgB,EAAE,QAAyB;QACpF,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,aAAa,CAAC,IAAY;QACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD;;OAEG;IACH,KAAK,CAAC,WAAW,CAAC,IAAY,EAAE,IAAY,IAAkB,CAAC;IAE/D,KAAK,CAAC,IAAI;QACR,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,mBAAmB,CAAC,GAAc,EAAE,OAAe;QACvD,OAAO,GAAG,GAAG,CAAC,IAAI,IAAI,OAAO,EAAE,CAAC;IAClC,CAAC;CACF;AAGM,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,SAAS;IAI1C,AAAN,KAAK,CAAC,YAAY;QAChB,MAAM,OAAO,GAAG,IAAI,sBAAsB,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACnE,MAAM,SAAS,GAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QAElD,MAAM,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC/C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE;YAC7D,MAAM,IAAI,KAAK,EAAE,CAAC;QACpB,CAAC,CAAC,CAAC;QACH,sCAAsC;QACtC,MAAM,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,EAAE,CAAC;QAEf,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,CAAC;QACzD,OAAO,CAAC,aAAa,EAAE,CAAC,MAAM,GAAG,QAAQ,CAAC;QAC1C,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,kBAAkB,CAAC,CAAC;QAExE,MAAM,CAAC,WAAW,CAAC,IAAI,qBAAqB,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAEtE,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAC;QAChD,MAAM,KAAK,GAAG,IAAI,SAAS,EAAE,CAAC;QAC9B,aAAa;QACb,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACnD,MAAM,OAAO,CAAC,MAAM,CAAsB,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAC5D,8BAA8B;IAChC,CAAC;CACF,CAAA;AAzBO;IADL,IAAI;uDAyBJ;AA5BU,mBAAmB;IAD/B,KAAK;GACO,mBAAmB,CA6B/B"}
|
|
@@ -53,7 +53,7 @@ export type ConfigurationEvents = {
|
|
|
53
53
|
* @category CoreServices
|
|
54
54
|
* @WebdaModda
|
|
55
55
|
*/
|
|
56
|
-
|
|
56
|
+
declare class ConfigurationService<T extends ConfigurationServiceParameters = ConfigurationServiceParameters, E extends ConfigurationEvents = ConfigurationEvents> extends Service<T, E> {
|
|
57
57
|
protected serializedConfiguration: any;
|
|
58
58
|
/**
|
|
59
59
|
*
|
|
@@ -135,6 +135,14 @@ export default class ConfigurationService<T extends ConfigurationServiceParamete
|
|
|
135
135
|
* Update the next check time
|
|
136
136
|
*/
|
|
137
137
|
protected updateNextCheck(): void;
|
|
138
|
+
/**
|
|
139
|
+
* Complete the configuration
|
|
140
|
+
*/
|
|
141
|
+
private completeConfiguration;
|
|
142
|
+
/**
|
|
143
|
+
* Load the configuration and complete it
|
|
144
|
+
*/
|
|
145
|
+
private loadGoodConfiguration;
|
|
138
146
|
/**
|
|
139
147
|
* Read the file and store it
|
|
140
148
|
*/
|
|
@@ -143,3 +151,4 @@ export default class ConfigurationService<T extends ConfigurationServiceParamete
|
|
|
143
151
|
}>;
|
|
144
152
|
}
|
|
145
153
|
export { ConfigurationProvider, ConfigurationService };
|
|
154
|
+
//# sourceMappingURL=configuration.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../src/services/configuration.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAEvD;;GAEG;AACH,UAAU,qBAAqB;IAC7B;;;OAGG;IACH,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC,CAAC;IAC9D;;;;;;;;OAQG;IACH,uBAAuB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;CACpE;AAED,qBAAa,8BAA+B,SAAQ,iBAAiB;IACnE;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,OAAO,EAAE,GAAG,CAAC;gBACD,MAAM,EAAE,GAAG;CAKxB;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,uBAAuB,EAAE,GAAG,CAAC;IAC7B,wBAAwB,EAAE,GAAG,CAAC;IAC9B,sBAAsB,EAAE,GAAG,CAAC;CAC7B,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,cAAM,oBAAoB,CACxB,CAAC,SAAS,8BAA8B,GAAG,8BAA8B,EACzE,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CACnD,SAAQ,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IACrB,SAAS,CAAC,uBAAuB,EAAE,GAAG,CAAC;IACvC;;OAEG;IACH,SAAS,CAAC,SAAS,EAAE,MAAM,CAAC;IAC5B;;OAEG;IACH,SAAS,CAAC,aAAa,EAAE,qBAAqB,CAAC;IAC/C;;OAEG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC3B;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAwB;IACxC;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,CAAM;IAC7B;;OAEG;IACH,SAAS,CAAC,aAAa,EAAE,GAAG,CAAC;IAE7B;;;;;OAKG;IACH,cAAc,CAAC,MAAM,EAAE,GAAG,GAAG,iBAAiB;IAI9C;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC3B;;;;;;OAMG;IACH,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,YAAY,GAAE,GAAe;IAItG;;OAEG;IACG,IAAI;IAQV;;;OAGG;IACH,gBAAgB;IAIhB;;;;OAIG;IACG,MAAM,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAKzC;;;OAGG;cACa,iBAAiB,IAAI,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAI9D,iBAAiB,IAAI,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAI1D;;;;;;OAMG;cACa,WAAW,CAAC,OAAO,GAAE,OAAe;IA0CpD;;OAEG;IACH,SAAS,CAAC,eAAe;IAIzB;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAM7B;;OAEG;YACW,qBAAqB;IAInC;;OAEG;IACG,yBAAyB,IAAI,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;CAMnE;AAED,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,CAAC"}
|
|
@@ -5,6 +5,7 @@ export class ConfigurationServiceParameters extends ServiceParameters {
|
|
|
5
5
|
constructor(params) {
|
|
6
6
|
super(params);
|
|
7
7
|
this.checkInterval ?? (this.checkInterval = 3600);
|
|
8
|
+
this.default ?? (this.default = {});
|
|
8
9
|
}
|
|
9
10
|
}
|
|
10
11
|
/**
|
|
@@ -19,7 +20,7 @@ export class ConfigurationServiceParameters extends ServiceParameters {
|
|
|
19
20
|
* @category CoreServices
|
|
20
21
|
* @WebdaModda
|
|
21
22
|
*/
|
|
22
|
-
|
|
23
|
+
class ConfigurationService extends Service {
|
|
23
24
|
constructor() {
|
|
24
25
|
super(...arguments);
|
|
25
26
|
/**
|
|
@@ -44,7 +45,7 @@ export default class ConfigurationService extends Service {
|
|
|
44
45
|
if (!this.parameters.source) {
|
|
45
46
|
throw new WebdaError.CodeError("CONFIGURATION_SOURCE_MISSING", "Need a source for ConfigurationService");
|
|
46
47
|
}
|
|
47
|
-
|
|
48
|
+
const source = this.parameters.source.split(":");
|
|
48
49
|
this.sourceService = this.getService(source[0]);
|
|
49
50
|
if (!this.sourceService) {
|
|
50
51
|
throw new WebdaError.CodeError("CONFIGURATION_SOURCE_INVALID", 'Need a valid service for source ("sourceService:sourceId")');
|
|
@@ -124,7 +125,7 @@ export default class ConfigurationService extends Service {
|
|
|
124
125
|
return;
|
|
125
126
|
}
|
|
126
127
|
this.log("DEBUG", "Refreshing configuration");
|
|
127
|
-
const newConfig =
|
|
128
|
+
const newConfig = await this.loadGoodConfiguration();
|
|
128
129
|
this.emit("Configuration.Loaded", newConfig);
|
|
129
130
|
const serializedConfig = JSON.stringify(newConfig);
|
|
130
131
|
if (serializedConfig !== this.serializedConfiguration) {
|
|
@@ -135,16 +136,16 @@ export default class ConfigurationService extends Service {
|
|
|
135
136
|
// Add the webda parameters logical
|
|
136
137
|
if (this.configuration && this.configuration.services) {
|
|
137
138
|
// Merge parameters with each service - cannot add new services for security
|
|
138
|
-
for (
|
|
139
|
+
for (const i in this.configuration.services) {
|
|
139
140
|
if (this.getWebda().getService(i)) {
|
|
140
141
|
this.configuration.services[i] = this.getWebda().getServiceParams(i, this.configuration);
|
|
141
142
|
}
|
|
142
143
|
}
|
|
143
144
|
}
|
|
144
|
-
|
|
145
|
+
const promises = [];
|
|
145
146
|
this.watchs.forEach(w => {
|
|
146
147
|
this.log("TRACE", "Apply new configuration value", jsonpath.query(newConfig, w.path).pop() || w.defaultValue);
|
|
147
|
-
|
|
148
|
+
const p = w.callback(jsonpath.query(newConfig, w.path).pop() || w.defaultValue);
|
|
148
149
|
if (p) {
|
|
149
150
|
promises.push(p);
|
|
150
151
|
}
|
|
@@ -164,11 +165,25 @@ export default class ConfigurationService extends Service {
|
|
|
164
165
|
updateNextCheck() {
|
|
165
166
|
this.nextCheck = Date.now() + this.parameters.checkInterval * 1000;
|
|
166
167
|
}
|
|
168
|
+
/**
|
|
169
|
+
* Complete the configuration
|
|
170
|
+
*/
|
|
171
|
+
completeConfiguration(cfg) {
|
|
172
|
+
cfg.parameters ?? (cfg.parameters = {});
|
|
173
|
+
cfg.services ?? (cfg.services = {});
|
|
174
|
+
return cfg;
|
|
175
|
+
}
|
|
176
|
+
/**
|
|
177
|
+
* Load the configuration and complete it
|
|
178
|
+
*/
|
|
179
|
+
async loadGoodConfiguration() {
|
|
180
|
+
return this.completeConfiguration((await this.loadConfiguration()) || this.parameters.default);
|
|
181
|
+
}
|
|
167
182
|
/**
|
|
168
183
|
* Read the file and store it
|
|
169
184
|
*/
|
|
170
185
|
async loadAndStoreConfiguration() {
|
|
171
|
-
|
|
186
|
+
const res = await this.loadGoodConfiguration();
|
|
172
187
|
this.emit("Configuration.Loaded", res);
|
|
173
188
|
this.serializedConfiguration = JSON.stringify(res);
|
|
174
189
|
return res;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../src/services/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAuBvD,MAAM,OAAO,8BAA+B,SAAQ,iBAAiB;IAanE,YAAY,MAAW;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,aAAa,KAAlB,IAAI,CAAC,aAAa,GAAK,IAAI,EAAC;
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../src/services/configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"configuration.spec.d.ts","sourceRoot":"","sources":["../../src/services/configuration.spec.ts"],"names":[],"mappings":""}
|
|
@@ -7,25 +7,68 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
import { suite, test } from "@testdeck/mocha";
|
|
8
8
|
import * as assert from "assert";
|
|
9
9
|
import { stub } from "sinon";
|
|
10
|
-
import {
|
|
10
|
+
import { WebdaInternalSimpleTest } from "../test.js";
|
|
11
11
|
import { getCommonJS } from "../utils/esm.js";
|
|
12
12
|
import { ConfigurationService } from "./configuration.js";
|
|
13
13
|
const { __filename, __dirname } = getCommonJS(import.meta.url);
|
|
14
|
-
let ConfigurationServiceTest = class ConfigurationServiceTest extends
|
|
14
|
+
let ConfigurationServiceTest = class ConfigurationServiceTest extends WebdaInternalSimpleTest {
|
|
15
15
|
getTestConfiguration() {
|
|
16
|
-
return
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
16
|
+
return {
|
|
17
|
+
parameters: {
|
|
18
|
+
ignoreBeans: true
|
|
19
|
+
},
|
|
20
|
+
services: {
|
|
21
|
+
Authentication: {
|
|
22
|
+
successRedirect: "https://webda.io/user.html",
|
|
23
|
+
failureRedirect: "/login-error",
|
|
24
|
+
providers: {
|
|
25
|
+
facebook: {},
|
|
26
|
+
email: {
|
|
27
|
+
from: "",
|
|
28
|
+
subject: "",
|
|
29
|
+
html: "",
|
|
30
|
+
text: "Test",
|
|
31
|
+
mailer: "DefinedMailer",
|
|
32
|
+
postValidation: false
|
|
33
|
+
},
|
|
34
|
+
phone: {},
|
|
35
|
+
twitter: {},
|
|
36
|
+
google: {},
|
|
37
|
+
github: {}
|
|
38
|
+
}
|
|
39
|
+
},
|
|
40
|
+
DefinedMailer: {
|
|
41
|
+
type: "WebdaTest/Mailer"
|
|
42
|
+
},
|
|
43
|
+
Users: {
|
|
44
|
+
type: "MemoryStore"
|
|
45
|
+
},
|
|
46
|
+
Idents: {
|
|
47
|
+
type: "MemoryStore"
|
|
48
|
+
},
|
|
49
|
+
ConfigurationStore: {
|
|
50
|
+
type: "MemoryStore"
|
|
51
|
+
},
|
|
52
|
+
ConfigurationService: {
|
|
53
|
+
source: "ConfigurationStore:test",
|
|
54
|
+
checkInterval: 2,
|
|
55
|
+
default: {
|
|
56
|
+
services: {
|
|
57
|
+
Authentication: {
|
|
58
|
+
providers: {
|
|
59
|
+
email: {
|
|
60
|
+
text: "Test"
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
};
|
|
26
69
|
}
|
|
27
70
|
async init() {
|
|
28
|
-
|
|
71
|
+
const service = new ConfigurationService(this.webda, "name", {});
|
|
29
72
|
assert.deepStrictEqual(service.getConfiguration(), {});
|
|
30
73
|
// @ts-ignore
|
|
31
74
|
service.configuration = { test: "plop" };
|
|
@@ -42,7 +85,7 @@ let ConfigurationServiceTest = class ConfigurationServiceTest extends WebdaTest
|
|
|
42
85
|
async initialLoad() {
|
|
43
86
|
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Test");
|
|
44
87
|
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
|
|
45
|
-
|
|
88
|
+
const test = {
|
|
46
89
|
uuid: "test",
|
|
47
90
|
services: {
|
|
48
91
|
Authentication: {
|
|
@@ -54,18 +97,18 @@ let ConfigurationServiceTest = class ConfigurationServiceTest extends WebdaTest
|
|
|
54
97
|
}
|
|
55
98
|
}
|
|
56
99
|
};
|
|
57
|
-
|
|
100
|
+
const store = this.webda.getService("ConfigurationStore");
|
|
58
101
|
await new Promise(async (resolve) => {
|
|
59
102
|
this.webda.getService("ConfigurationService").on("Configuration.Applied", resolve);
|
|
60
103
|
await store.save(test);
|
|
61
104
|
});
|
|
62
105
|
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.text, "Plop");
|
|
63
106
|
assert.strictEqual(this.webda.getConfiguration().services.Authentication.providers.email.mailer, "DefinedMailer");
|
|
64
|
-
|
|
107
|
+
const service = this.webda.getService("ConfigurationService");
|
|
65
108
|
// @ts-ignore
|
|
66
109
|
await service.checkUpdate();
|
|
67
110
|
// @ts-ignore
|
|
68
|
-
|
|
111
|
+
const mock = stub(service, "loadConfiguration").callsFake(() => { });
|
|
69
112
|
// @ts-ignore
|
|
70
113
|
service.nextCheck = Date.now() + 86400000;
|
|
71
114
|
// @ts-ignore
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.spec.js","sourceRoot":"","sources":["../../src/services/configuration.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAG7B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"configuration.spec.js","sourceRoot":"","sources":["../../src/services/configuration.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/services/cron.d.ts
CHANGED
|
@@ -52,7 +52,7 @@ declare class CronService extends Service {
|
|
|
52
52
|
}[];
|
|
53
53
|
crontabSchedule: any;
|
|
54
54
|
private _scanned;
|
|
55
|
-
static Annotation(cron: string, description?: string, ...args: any[]):
|
|
55
|
+
static Annotation(cron: string, description?: string, ...args: any[]): MethodDecorator;
|
|
56
56
|
static getCronId(cron: CronDefinition, name?: string): string;
|
|
57
57
|
static loadAnnotations(services: any): CronDefinition[];
|
|
58
58
|
addAnnotations(): void;
|
|
@@ -71,3 +71,4 @@ declare class CronService extends Service {
|
|
|
71
71
|
}
|
|
72
72
|
declare const Cron: typeof CronService.Annotation;
|
|
73
73
|
export { Cron, CronService };
|
|
74
|
+
//# sourceMappingURL=cron.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cron.d.ts","sourceRoot":"","sources":["../../src/services/cron.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC;;GAEG;AACH,qBAAa,cAAc;IACzB;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;;;;;OAOG;gBACS,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,GAAG,EAAO,EAAE,WAAW,GAAE,MAAW,EAAE,MAAM,GAAE,MAAW,EAAE,WAAW,GAAE,MAAW;IAQnH,QAAQ;CAKT;AAED;;GAEG;AACH,cAAM,WAAY,SAAQ,OAAO;IAC/B,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,EAAE,CAAC,EAAE,MAAM,IAAI,CAAC;KACjB,EAAE,CAAM;IACT,eAAe,MAAY;IAC3B,OAAO,CAAC,QAAQ,CAAkB;IAElC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,GAAE,MAAW,EAAE,GAAG,IAAI,OAAA,GAAG,eAAe;IAOnF,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,GAAE,MAAW;IAQxD,MAAM,CAAC,eAAe,CAAC,QAAQ,KAAA,GAAG,cAAc,EAAE;IAmBlD,cAAc;IAQd,UAAU;cArDF,MAAM;sBACE,MAAM;sBACN,MAAM;iBACX,MAAM;kBACL,MAAM;eACT,GAAG,EAAE;aACP,MAAM,IAAI;;IAqDjB,IAAI,CAAC,WAAW,GAAE,MAAe,GAAG,iBAAiB;IAIrD,GAAG,CAAC,WAAW,GAAE,OAAc,GAAG,iBAAiB;IAwCnD,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,EAAE,WAAW,GAAE,MAAW;CAe/D;AAED,QAAA,MAAM,IAAI,+BAAyB,CAAC;AAEpC,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC"}
|
package/lib/services/cron.js
CHANGED
|
@@ -42,19 +42,19 @@ class CronService extends Service {
|
|
|
42
42
|
};
|
|
43
43
|
}
|
|
44
44
|
static getCronId(cron, name = "") {
|
|
45
|
-
|
|
45
|
+
const hash = createHash("sha256");
|
|
46
46
|
return hash
|
|
47
47
|
.update(JSON.stringify(cron) + name)
|
|
48
48
|
.digest("hex")
|
|
49
49
|
.substring(0, 8);
|
|
50
50
|
}
|
|
51
51
|
static loadAnnotations(services) {
|
|
52
|
-
|
|
53
|
-
for (
|
|
54
|
-
|
|
55
|
-
for (
|
|
52
|
+
const cronsResult = [];
|
|
53
|
+
for (const i in services) {
|
|
54
|
+
const props = Object.getOwnPropertyDescriptors(services[i].constructor.prototype);
|
|
55
|
+
for (const method in props) {
|
|
56
56
|
// @ts-ignore
|
|
57
|
-
|
|
57
|
+
const crons = props[method].value?.cron;
|
|
58
58
|
if (crons) {
|
|
59
59
|
crons.forEach(cron => {
|
|
60
60
|
cron.method = method;
|
|
@@ -99,7 +99,7 @@ class CronService extends Service {
|
|
|
99
99
|
});
|
|
100
100
|
}
|
|
101
101
|
});
|
|
102
|
-
|
|
102
|
+
const msgs = [];
|
|
103
103
|
// Display before
|
|
104
104
|
this.crons.forEach(c => {
|
|
105
105
|
if (c.cb) {
|
|
@@ -109,8 +109,8 @@ class CronService extends Service {
|
|
|
109
109
|
msgs.push(`${c.serviceName}.${c.method}(${c.args.length ? "..." + c.args : ""})`);
|
|
110
110
|
}
|
|
111
111
|
});
|
|
112
|
-
|
|
113
|
-
|
|
112
|
+
const cronPad = Math.max(...this.crons.map(c => c.cron.length));
|
|
113
|
+
const servicePad = Math.max(...msgs.map(c => c.length));
|
|
114
114
|
this.crons.forEach((c, i) => {
|
|
115
115
|
this.log("INFO", `${c.cron.padEnd(cronPad)} : ${msgs[i].padEnd(servicePad)}${c.description ? " # " + c.description : ""}`);
|
|
116
116
|
});
|
|
@@ -129,7 +129,7 @@ class CronService extends Service {
|
|
|
129
129
|
}
|
|
130
130
|
catch (err) {
|
|
131
131
|
// Based on stack trace (not super clean)
|
|
132
|
-
|
|
132
|
+
const info = err.stack.split("\n")[2].match(/\((.*)\)/);
|
|
133
133
|
context = info[1].replace(process.cwd() + "/", "");
|
|
134
134
|
}
|
|
135
135
|
this.crons.push({ cron, cb, description, context });
|
package/lib/services/cron.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron.js","sourceRoot":"","sources":["../../src/services/cron.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC;;GAEG;AACH,MAAM,OAAO,cAAc;IAwBzB;;;;;;;OAOG;IACH,YAAY,IAAY,EAAE,OAAc,EAAE,EAAE,cAAsB,EAAE,EAAE,SAAiB,EAAE,EAAE,cAAsB,EAAE;QACjH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,QAAQ;QACN,OAAO,GAAG,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IACnG,IAAI,CAAC,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EACvD,EAAE,CAAC;IACL,CAAC;CACF;AAED;;GAEG;AACH,MAAM,WAAY,SAAQ,OAAO;IAAjC;;QAEE,UAAK,GAQC,EAAE,CAAC;QACT,oBAAe,GAAG,QAAQ,CAAC;QACnB,aAAQ,GAAY,KAAK,CAAC;IA6GpC,CAAC;IA3GC,MAAM,CAAC,UAAU,CAAC,IAAY,EAAE,cAAsB,EAAE,EAAE,GAAG,IAAI;QAC/D,OAAO,CAAC,OAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"cron.js","sourceRoot":"","sources":["../../src/services/cron.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cron.spec.d.ts","sourceRoot":"","sources":["../../src/services/cron.spec.ts"],"names":[],"mappings":""}
|
|
@@ -27,8 +27,8 @@ let CronServiceTest = class CronServiceTest extends WebdaTest {
|
|
|
27
27
|
}
|
|
28
28
|
annotations() {
|
|
29
29
|
this.registerService(new MyService(this.webda, "myService", {}));
|
|
30
|
-
|
|
31
|
-
|
|
30
|
+
const def = new CronDefinition("0/15 * * * *", [], "myService", "test", "plop");
|
|
31
|
+
const service = new CronService(this.webda, "cron", {});
|
|
32
32
|
service.schedule("* * * * *", () => { }, "mine");
|
|
33
33
|
assert.deepStrictEqual(service.getCrontab()[1], def);
|
|
34
34
|
// for cov
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cron.spec.js","sourceRoot":"","sources":["../../src/services/cron.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,MAAM,SAAU,SAAQ,OAAO;IAE7B,IAAI;QACF,YAAY;IACd,CAAC;IAGD,KAAK,CAAC,KAAa,IAAG,CAAC;CACxB;AANC;IADC,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC;qCAG5B;AAGD;IADC,IAAI,CAAC,cAAc,EAAE,SAAS,EAAE,OAAO,CAAC;sCAClB;AAGzB,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,SAAS;IAC3B,KAAK,CAAC,UAAU;QACxB,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;QACzB,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;IACjC,CAAC;IAED,WAAW;QACT,IAAI,CAAC,eAAe,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;QACjE,
|
|
1
|
+
{"version":3,"file":"cron.spec.js","sourceRoot":"","sources":["../../src/services/cron.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -168,7 +168,7 @@ interface KeysDefinition {
|
|
|
168
168
|
/**
|
|
169
169
|
* @WebdaModda
|
|
170
170
|
*/
|
|
171
|
-
export
|
|
171
|
+
export declare class CryptoService<T extends CryptoServiceParameters = CryptoServiceParameters> extends Service<T> implements StringEncrypter {
|
|
172
172
|
private static encrypters;
|
|
173
173
|
/**
|
|
174
174
|
* Register an encrypter for configuration
|
|
@@ -300,4 +300,5 @@ export default class CryptoService<T extends CryptoServiceParameters = CryptoSer
|
|
|
300
300
|
*/
|
|
301
301
|
rotate(): Promise<void>;
|
|
302
302
|
}
|
|
303
|
-
export
|
|
303
|
+
export default CryptoService;
|
|
304
|
+
//# sourceMappingURL=cryptoservice.d.ts.map
|