@tstdl/base 0.71.60 → 0.71.63
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/api/client/client.js +6 -7
- package/api/client/client.js.map +1 -1
- package/api/default-error-handlers.js +2 -4
- package/api/default-error-handlers.js.map +1 -1
- package/api/response.js +1 -2
- package/api/response.js.map +1 -1
- package/api/server/api-controller.js +2 -3
- package/api/server/api-controller.js.map +1 -1
- package/api/server/gateway.js +9 -12
- package/api/server/gateway.js.map +1 -1
- package/api/server/middlewares/cors.middleware.js +3 -4
- package/api/server/middlewares/cors.middleware.js.map +1 -1
- package/api/server/module.js +1 -2
- package/api/server/module.js.map +1 -1
- package/collections/sorted-map.js +1 -2
- package/collections/sorted-map.js.map +1 -1
- package/container/container.js +13 -17
- package/container/container.js.map +1 -1
- package/container/decorators.js +5 -17
- package/container/decorators.js.map +1 -1
- package/container/resolve-chain.js +1 -1
- package/container/resolve-chain.js.map +1 -1
- package/container/type-info.js +4 -5
- package/container/type-info.js.map +1 -1
- package/core.js +4 -5
- package/core.js.map +1 -1
- package/css/theme/theme.service.js +1 -2
- package/css/theme/theme.service.js.map +1 -1
- package/data-structures/circular-buffer.js +12 -27
- package/data-structures/circular-buffer.js.map +1 -1
- package/database/module.js +2 -3
- package/database/module.js.map +1 -1
- package/database/mongo/model/document.js +35 -26
- package/database/mongo/model/document.js.map +1 -1
- package/database/mongo/module.js +5 -18
- package/database/mongo/module.js.map +1 -1
- package/database/mongo/mongo-base.repository.js +16 -61
- package/database/mongo/mongo-base.repository.js.map +1 -1
- package/database/mongo/mongo-entity-repository.js +25 -98
- package/database/mongo/mongo-entity-repository.js.map +1 -1
- package/database/mongo/query-converter.js +7 -11
- package/database/mongo/query-converter.js.map +1 -1
- package/disposable/disposable.js +2 -2
- package/disposable/disposable.js.map +1 -1
- package/distributed-loop/distributed-loop.js +1 -2
- package/distributed-loop/distributed-loop.js.map +1 -1
- package/enumerable/async-enumerable.js +2 -2
- package/enumerable/async-enumerable.js.map +1 -1
- package/enumerable/enumerable.js +2 -2
- package/enumerable/enumerable.js.map +1 -1
- package/error/custom.error.js +1 -2
- package/error/custom.error.js.map +1 -1
- package/http/client/adapters/got-http-client.adapter.js +13 -42
- package/http/client/adapters/got-http-client.adapter.js.map +1 -1
- package/http/client/adapters/undici-http-client.adapter.js +6 -8
- package/http/client/adapters/undici-http-client.adapter.js.map +1 -1
- package/http/client/adapters/utils.js +2 -3
- package/http/client/adapters/utils.js.map +1 -1
- package/http/client/http-client-request.js +14 -16
- package/http/client/http-client-request.js.map +1 -1
- package/http/client/http-client.js +40 -78
- package/http/client/http-client.js.map +1 -1
- package/http/http-headers.js +1 -2
- package/http/http-headers.js.map +1 -1
- package/http/http-value-map.js +2 -4
- package/http/http-value-map.js.map +1 -1
- package/http/http.error.js +2 -3
- package/http/http.error.js.map +1 -1
- package/http/server/http-server-request.js +2 -3
- package/http/server/http-server-request.js.map +1 -1
- package/http/server/node/node-http-server.js +15 -61
- package/http/server/node/node-http-server.js.map +1 -1
- package/image-service/imgproxy/imgproxy-image-service.js +1 -1
- package/image-service/imgproxy/imgproxy-image-service.js.map +1 -1
- package/instance-provider.js +7 -8
- package/instance-provider.js.map +1 -1
- package/json-path/json-path.js +1 -2
- package/json-path/json-path.js.map +1 -1
- package/lock/mongo/lock.js +1 -1
- package/lock/mongo/lock.js.map +1 -1
- package/logger/console/logger.js +2 -6
- package/logger/console/logger.js.map +1 -1
- package/mail/clients/nodemailer.mail-client.js +1 -2
- package/mail/clients/nodemailer.mail-client.js.map +1 -1
- package/mail/mail.service.js +2 -3
- package/mail/mail.service.js.map +1 -1
- package/mail/repositories/mongo-mail-log.repository.js +1 -2
- package/mail/repositories/mongo-mail-log.repository.js.map +1 -1
- package/mail/template-providers/file-mail-template.provider.js +1 -2
- package/mail/template-providers/file-mail-template.provider.js.map +1 -1
- package/mail/template-renderers/mjml.mail-template-renderer.js +9 -6
- package/mail/template-renderers/mjml.mail-template-renderer.js.map +1 -1
- package/message-bus/broadcast-channel/broadcast-channel-message-bus.js +1 -2
- package/message-bus/broadcast-channel/broadcast-channel-message-bus.js.map +1 -1
- package/migration/migrator.js +1 -2
- package/migration/migrator.js.map +1 -1
- package/module/modules/old-web-server.module.js +2 -20
- package/module/modules/old-web-server.module.js.map +1 -1
- package/module/modules/web-server.module.js +3 -22
- package/module/modules/web-server.module.js.map +1 -1
- package/object-storage/object-storage.d.ts +5 -0
- package/object-storage/object-storage.js.map +1 -1
- package/object-storage/s3/s3.object-storage.d.ts +1 -0
- package/object-storage/s3/s3.object-storage.js +4 -0
- package/object-storage/s3/s3.object-storage.js.map +1 -1
- package/old-api/http-api.js +11 -24
- package/old-api/http-api.js.map +1 -1
- package/openid-connect/mongo-oidc-state.repository.js +2 -2
- package/openid-connect/mongo-oidc-state.repository.js.map +1 -1
- package/package.json +1 -1
- package/pdf/pdf.service.js +10 -11
- package/pdf/pdf.service.js.map +1 -1
- package/pool/pool.js +1 -2
- package/pool/pool.js.map +1 -1
- package/queue/enqueue-batch.js +1 -1
- package/queue/enqueue-batch.js.map +1 -1
- package/queue/mongo/mongo-job.repository.js +4 -15
- package/queue/mongo/mongo-job.repository.js.map +1 -1
- package/queue/mongo/queue.js +23 -69
- package/queue/mongo/queue.js.map +1 -1
- package/rxjs/intersection-observer.js +1 -12
- package/rxjs/intersection-observer.js.map +1 -1
- package/rxjs/mutation-observer.js +2 -14
- package/rxjs/mutation-observer.js.map +1 -1
- package/rxjs/resize-observer.js +2 -14
- package/rxjs/resize-observer.js.map +1 -1
- package/rxjs/slow-array.js +4 -8
- package/rxjs/slow-array.js.map +1 -1
- package/rxjs/timing.js +2 -2
- package/rxjs/timing.js.map +1 -1
- package/schema/schema.validator.js +4 -7
- package/schema/schema.validator.js.map +1 -1
- package/schema/schemas/any.js +4 -1
- package/schema/schemas/any.js.map +1 -1
- package/schema/schemas/array.js +5 -1
- package/schema/schemas/array.js.map +1 -1
- package/schema/schemas/async-iterable.js +5 -1
- package/schema/schemas/async-iterable.js.map +1 -1
- package/schema/schemas/boolean.js +5 -3
- package/schema/schemas/boolean.js.map +1 -1
- package/schema/schemas/date.js +5 -3
- package/schema/schemas/date.js.map +1 -1
- package/schema/schemas/defaulted.js +6 -1
- package/schema/schemas/defaulted.js.map +1 -1
- package/schema/schemas/enumeration.d.ts +1 -4
- package/schema/schemas/enumeration.js +6 -3
- package/schema/schemas/enumeration.js.map +1 -1
- package/schema/schemas/instance.js +5 -1
- package/schema/schemas/instance.js.map +1 -1
- package/schema/schemas/iterable.js +5 -1
- package/schema/schemas/iterable.js.map +1 -1
- package/schema/schemas/literal.js +5 -1
- package/schema/schemas/literal.js.map +1 -1
- package/schema/schemas/never.js +4 -1
- package/schema/schemas/never.js.map +1 -1
- package/schema/schemas/nullable.js +6 -3
- package/schema/schemas/nullable.js.map +1 -1
- package/schema/schemas/number.js +5 -3
- package/schema/schemas/number.js.map +1 -1
- package/schema/schemas/object.js +8 -4
- package/schema/schemas/object.js.map +1 -1
- package/schema/schemas/optional.js +6 -3
- package/schema/schemas/optional.js.map +1 -1
- package/schema/schemas/preprocess.js +6 -1
- package/schema/schemas/preprocess.js.map +1 -1
- package/schema/schemas/readable-stream.js +4 -1
- package/schema/schemas/readable-stream.js.map +1 -1
- package/schema/schemas/refine.js +6 -1
- package/schema/schemas/refine.js.map +1 -1
- package/schema/schemas/regexp.js +5 -3
- package/schema/schemas/regexp.js.map +1 -1
- package/schema/schemas/string.js +7 -6
- package/schema/schemas/string.js.map +1 -1
- package/schema/schemas/transform.js +6 -1
- package/schema/schemas/transform.js.map +1 -1
- package/schema/schemas/uint8-array.js +5 -3
- package/schema/schemas/uint8-array.js.map +1 -1
- package/schema/schemas/union.js +5 -1
- package/schema/schemas/union.js.map +1 -1
- package/schema/schemas/unknown.js +4 -1
- package/schema/schemas/unknown.js.map +1 -1
- package/search-index/elastic/module.js +2 -3
- package/search-index/elastic/module.js.map +1 -1
- package/search-index/elastic/search-index.js +11 -23
- package/search-index/elastic/search-index.js.map +1 -1
- package/search-index/elastic/sort-converter.js +2 -3
- package/search-index/elastic/sort-converter.js.map +1 -1
- package/search-index/memory/memory-search-index.js +1 -2
- package/search-index/memory/memory-search-index.js.map +1 -1
- package/search-index/search-index.js +8 -34
- package/search-index/search-index.js.map +1 -1
- package/serializer/serializable.js +3 -4
- package/serializer/serializable.js.map +1 -1
- package/serializer/serializer.js +1 -1
- package/serializer/serializer.js.map +1 -1
- package/tailwind/colors.js +1 -2
- package/tailwind/colors.js.map +1 -1
- package/templates/module.js +2 -2
- package/templates/module.js.map +1 -1
- package/templates/providers/file-template.provider.js +1 -2
- package/templates/providers/file-template.provider.js.map +1 -1
- package/templates/renderers/handlebars.template-renderer.js +1 -2
- package/templates/renderers/handlebars.template-renderer.js.map +1 -1
- package/templates/renderers/mjml.template-renderer.js +6 -3
- package/templates/renderers/mjml.template-renderer.js.map +1 -1
- package/tsconfig.json +1 -1
- package/types.d.ts +3 -0
- package/utils/async-iterable-helpers/all.js +6 -24
- package/utils/async-iterable-helpers/all.js.map +1 -1
- package/utils/async-iterable-helpers/any.js +6 -24
- package/utils/async-iterable-helpers/any.js.map +1 -1
- package/utils/async-iterable-helpers/assert.js +18 -52
- package/utils/async-iterable-helpers/assert.js.map +1 -1
- package/utils/async-iterable-helpers/batch.js +22 -56
- package/utils/async-iterable-helpers/batch.js.map +1 -1
- package/utils/async-iterable-helpers/buffer.js +39 -82
- package/utils/async-iterable-helpers/buffer.js.map +1 -1
- package/utils/async-iterable-helpers/concat.js +3 -29
- package/utils/async-iterable-helpers/concat.js.map +1 -1
- package/utils/async-iterable-helpers/default-if-empty.js +9 -41
- package/utils/async-iterable-helpers/default-if-empty.js.map +1 -1
- package/utils/async-iterable-helpers/deferred.js +3 -29
- package/utils/async-iterable-helpers/deferred.js.map +1 -1
- package/utils/async-iterable-helpers/distinct.js +20 -54
- package/utils/async-iterable-helpers/distinct.js.map +1 -1
- package/utils/async-iterable-helpers/drain.js +2 -19
- package/utils/async-iterable-helpers/drain.js.map +1 -1
- package/utils/async-iterable-helpers/filter.js +19 -53
- package/utils/async-iterable-helpers/filter.js.map +1 -1
- package/utils/async-iterable-helpers/first-or-default.js +3 -21
- package/utils/async-iterable-helpers/first-or-default.js.map +1 -1
- package/utils/async-iterable-helpers/first.js +3 -21
- package/utils/async-iterable-helpers/first.js.map +1 -1
- package/utils/async-iterable-helpers/for-each.js +4 -22
- package/utils/async-iterable-helpers/for-each.js.map +1 -1
- package/utils/async-iterable-helpers/group-single.js +2 -28
- package/utils/async-iterable-helpers/group-single.js.map +1 -1
- package/utils/async-iterable-helpers/group-to-map.js +3 -21
- package/utils/async-iterable-helpers/group-to-map.js.map +1 -1
- package/utils/async-iterable-helpers/group-to-single-map.js +5 -23
- package/utils/async-iterable-helpers/group-to-single-map.js.map +1 -1
- package/utils/async-iterable-helpers/group.js +2 -28
- package/utils/async-iterable-helpers/group.js.map +1 -1
- package/utils/async-iterable-helpers/interrupt.js +17 -62
- package/utils/async-iterable-helpers/interrupt.js.map +1 -1
- package/utils/async-iterable-helpers/last-or-default.js +3 -21
- package/utils/async-iterable-helpers/last-or-default.js.map +1 -1
- package/utils/async-iterable-helpers/last.js +3 -21
- package/utils/async-iterable-helpers/last.js.map +1 -1
- package/utils/async-iterable-helpers/map-many.js +16 -55
- package/utils/async-iterable-helpers/map-many.js.map +1 -1
- package/utils/async-iterable-helpers/map.js +16 -50
- package/utils/async-iterable-helpers/map.js.map +1 -1
- package/utils/async-iterable-helpers/materialize.js +4 -32
- package/utils/async-iterable-helpers/materialize.js.map +1 -1
- package/utils/async-iterable-helpers/metadata.js +32 -66
- package/utils/async-iterable-helpers/metadata.js.map +1 -1
- package/utils/async-iterable-helpers/multiplex.js +3 -21
- package/utils/async-iterable-helpers/multiplex.js.map +1 -1
- package/utils/async-iterable-helpers/observable-iterable.js +27 -41
- package/utils/async-iterable-helpers/observable-iterable.js.map +1 -1
- package/utils/async-iterable-helpers/pairwise.js +21 -55
- package/utils/async-iterable-helpers/pairwise.js.map +1 -1
- package/utils/async-iterable-helpers/parallel/feed.js +21 -47
- package/utils/async-iterable-helpers/parallel/feed.js.map +1 -1
- package/utils/async-iterable-helpers/parallel/for-each.js +8 -26
- package/utils/async-iterable-helpers/parallel/for-each.js.map +1 -1
- package/utils/async-iterable-helpers/reduce.js +8 -26
- package/utils/async-iterable-helpers/reduce.js.map +1 -1
- package/utils/async-iterable-helpers/retry.js +38 -72
- package/utils/async-iterable-helpers/retry.js.map +1 -1
- package/utils/async-iterable-helpers/single-or-default.js +10 -28
- package/utils/async-iterable-helpers/single-or-default.js.map +1 -1
- package/utils/async-iterable-helpers/single.js +10 -28
- package/utils/async-iterable-helpers/single.js.map +1 -1
- package/utils/async-iterable-helpers/take-until.js +26 -43
- package/utils/async-iterable-helpers/take-until.js.map +1 -1
- package/utils/async-iterable-helpers/take-while.js +25 -59
- package/utils/async-iterable-helpers/take-while.js.map +1 -1
- package/utils/async-iterable-helpers/take.js +10 -42
- package/utils/async-iterable-helpers/take.js.map +1 -1
- package/utils/async-iterable-helpers/tap.js +16 -50
- package/utils/async-iterable-helpers/tap.js.map +1 -1
- package/utils/async-iterable-helpers/throttle.js +8 -40
- package/utils/async-iterable-helpers/throttle.js.map +1 -1
- package/utils/async-iterable-helpers/to-array.js +2 -20
- package/utils/async-iterable-helpers/to-array.js.map +1 -1
- package/utils/async-iterable-helpers/to-async-iterable-iterator.js +36 -68
- package/utils/async-iterable-helpers/to-async-iterable-iterator.js.map +1 -1
- package/utils/async-iterable-helpers/while.js +21 -55
- package/utils/async-iterable-helpers/while.js.map +1 -1
- package/utils/async-iterator-iterable-iterator.js +20 -34
- package/utils/async-iterator-iterable-iterator.js.map +1 -1
- package/utils/backoff.js +22 -38
- package/utils/backoff.js.map +1 -1
- package/utils/base64.js +2 -2
- package/utils/base64.js.map +1 -1
- package/utils/binary-search.js +2 -3
- package/utils/binary-search.js.map +1 -1
- package/utils/binary.js +1 -1
- package/utils/binary.js.map +1 -1
- package/utils/cancellation-token.js +1 -1
- package/utils/cancellation-token.js.map +1 -1
- package/utils/cryptography.js +8 -9
- package/utils/cryptography.js.map +1 -1
- package/utils/date-time.js +6 -7
- package/utils/date-time.js.map +1 -1
- package/utils/enum.d.ts +5 -4
- package/utils/enum.js +6 -1
- package/utils/enum.js.map +1 -1
- package/utils/equals.js +2 -3
- package/utils/equals.js.map +1 -1
- package/utils/factory-map.js +1 -1
- package/utils/factory-map.js.map +1 -1
- package/utils/feedable-async-iterable.js +8 -40
- package/utils/feedable-async-iterable.js.map +1 -1
- package/utils/helpers.js +8 -20
- package/utils/helpers.js.map +1 -1
- package/utils/image.js +1 -1
- package/utils/image.js.map +1 -1
- package/utils/object/forward-ref.js +5 -6
- package/utils/object/forward-ref.js.map +1 -1
- package/utils/object/lazy-property.js +1 -1
- package/utils/object/lazy-property.js.map +1 -1
- package/utils/object/merge.js +1 -1
- package/utils/object/merge.js.map +1 -1
- package/utils/object/property-name.js +3 -5
- package/utils/object/property-name.js.map +1 -1
- package/utils/patch-worker.js +6 -7
- package/utils/patch-worker.js.map +1 -1
- package/utils/provider-function-iterable.js +12 -26
- package/utils/provider-function-iterable.js.map +1 -1
- package/utils/random.js +1 -1
- package/utils/random.js.map +1 -1
- package/utils/stream/async-iterable-readable.js +2 -3
- package/utils/stream/async-iterable-readable.js.map +1 -1
- package/utils/stream/stream-reader.js +10 -38
- package/utils/stream/stream-reader.js.map +1 -1
- package/utils/type-guards.js +1 -1
- package/utils/type-guards.js.map +1 -1
- package/utils/type-of.js +1 -2
- package/utils/type-of.js.map +1 -1
- package/utils/url-builder.js +1 -13
- package/utils/url-builder.js.map +1 -1
|
@@ -26,7 +26,6 @@ let MjmlMailTemplateRenderer = class MjmlMailTemplateRenderer extends mail_templ
|
|
|
26
26
|
return this.mjmlTemplateRenderer.canHandleType(type);
|
|
27
27
|
}
|
|
28
28
|
async render(template, context) {
|
|
29
|
-
var _a, _b, _c;
|
|
30
29
|
if (template.type == 'mjml') {
|
|
31
30
|
const mjmlTemplate = (0, type_guards_1.isDefined)(template.html) ? {
|
|
32
31
|
type: template.type,
|
|
@@ -43,12 +42,16 @@ let MjmlMailTemplateRenderer = class MjmlMailTemplateRenderer extends mail_templ
|
|
|
43
42
|
}
|
|
44
43
|
const parent = template.type.slice(5);
|
|
45
44
|
const renderer = this.rendererProvider.get(parent);
|
|
46
|
-
const subject = (0, type_guards_1.isDefined)(template.subject) ? await renderer.render({ type: parent, template: template.subject, options:
|
|
47
|
-
const html = (0, type_guards_1.isDefined)(template.html) ? await renderer.render({ type: parent, template: template.html, options:
|
|
48
|
-
const text = (0, type_guards_1.isDefined)(template.text) ? await renderer.render({ type: parent, template: template.text, options:
|
|
49
|
-
const preprocessedTemplate =
|
|
45
|
+
const subject = (0, type_guards_1.isDefined)(template.subject) ? await renderer.render({ type: parent, template: template.subject, options: template.options?.preprocessorOptions }, context) : undefined;
|
|
46
|
+
const html = (0, type_guards_1.isDefined)(template.html) ? await renderer.render({ type: parent, template: template.html, options: template.options?.preprocessorOptions }, context) : undefined;
|
|
47
|
+
const text = (0, type_guards_1.isDefined)(template.text) ? await renderer.render({ type: parent, template: template.text, options: template.options?.preprocessorOptions }, context) : undefined;
|
|
48
|
+
const preprocessedTemplate = {
|
|
49
|
+
...template,
|
|
50
|
+
type: 'mjml',
|
|
51
|
+
subject,
|
|
50
52
|
html,
|
|
51
|
-
text
|
|
53
|
+
text
|
|
54
|
+
};
|
|
52
55
|
return this.render(preprocessedTemplate);
|
|
53
56
|
}
|
|
54
57
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mjml.mail-template-renderer.js","sourceRoot":"","sources":["../../../source/mail/template-renderers/mjml.mail-template-renderer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAwC;AACxC,+CAA2E;AAE3E,6FAAoF;AACpF,yDAAgD;AAEhD,sEAAiE;AAKjE,IAAA,8BAAkB,EAAC,EAAE,iBAAiB,EAAE,CAAC,6CAAoB,CAAC,EAAE,CAAC,CAAC;AAGlE,IAAa,wBAAwB,GAArC,MAAa,wBAAyB,SAAQ,6CAAsC;IAIlF,YAAY,gBAA0C,EAAE,oBAA0C;QAChG,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAC;IACnD,CAAC;IAED,aAAa,CAAC,IAAY;QACxB,OAAO,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,QAA0B,EAAE,OAAgB
|
|
1
|
+
{"version":3,"file":"mjml.mail-template-renderer.js","sourceRoot":"","sources":["../../../source/mail/template-renderers/mjml.mail-template-renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,8 +23,7 @@ class BroadcastChannelMessageBus extends message_bus_base_1.MessageBusBase {
|
|
|
23
23
|
await this.channel.postMessage(message);
|
|
24
24
|
}
|
|
25
25
|
async _disposeAsync() {
|
|
26
|
-
|
|
27
|
-
await ((_a = this._channel) === null || _a === void 0 ? void 0 : _a.close());
|
|
26
|
+
await this._channel?.close();
|
|
28
27
|
this._channel = undefined;
|
|
29
28
|
}
|
|
30
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"broadcast-channel-message-bus.js","sourceRoot":"","sources":["../../../source/message-bus/broadcast-channel/broadcast-channel-message-bus.ts"],"names":[],"mappings":";;;AAEA,+BAA4D;AAC5D,yDAAsD;AAEtD,0DAAqD;AAQrD,MAAa,0BAA8B,SAAQ,iCAAiB;IAmBlE,YAAY,eAAuC,EAAE,MAAc;QACjE,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,eAAe,GAAG,eAAoD,CAAC;QAE5E,IAAI,CAAC,UAAU,GAAG,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAA,SAAE,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAClD,IAAA,gBAAS,EAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,gBAAS,EAAkB,OAAO,EAAE,SAAS,CAAC,CAAC,EACtE,IAAA,UAAG,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAC3B,CAAC;IACJ,CAAC;IArBD,IAAI,OAAO;QACT,IAAI,IAAA,yBAAW,EAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC9B,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE;gBAC3B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;aAC5C;YAED,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;SACxC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAaS,KAAK,CAAC,QAAQ,CAAC,OAAU;QACjC,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAES,KAAK,CAAC,aAAa
|
|
1
|
+
{"version":3,"file":"broadcast-channel-message-bus.js","sourceRoot":"","sources":["../../../source/message-bus/broadcast-channel/broadcast-channel-message-bus.ts"],"names":[],"mappings":";;;AAEA,+BAA4D;AAC5D,yDAAsD;AAEtD,0DAAqD;AAQrD,MAAa,0BAA8B,SAAQ,iCAAiB;IAmBlE,YAAY,eAAuC,EAAE,MAAc;QACjE,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,eAAe,GAAG,eAAoD,CAAC;QAE5E,IAAI,CAAC,UAAU,GAAG,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,IAAA,SAAE,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAClD,IAAA,gBAAS,EAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,gBAAS,EAAkB,OAAO,EAAE,SAAS,CAAC,CAAC,EACtE,IAAA,UAAG,EAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAC3B,CAAC;IACJ,CAAC;IArBD,IAAI,OAAO;QACT,IAAI,IAAA,yBAAW,EAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YAC9B,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE;gBAC3B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;aAC5C;YAED,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;SACxC;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAaS,KAAK,CAAC,QAAQ,CAAC,OAAU;QACjC,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAES,KAAK,CAAC,aAAa;QAC3B,MAAM,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC5B,CAAC;CACF;AAtCD,gEAsCC"}
|
package/migration/migrator.js
CHANGED
|
@@ -38,7 +38,6 @@ let Migrator = Migrator_1 = class Migrator {
|
|
|
38
38
|
const lock = this.lockProvider.get(`${name}`);
|
|
39
39
|
// eslint-disable-next-line max-statements, max-lines-per-function
|
|
40
40
|
const { result } = await lock.using(30000, true, async () => {
|
|
41
|
-
var _a;
|
|
42
41
|
const results = [];
|
|
43
42
|
while (true) {
|
|
44
43
|
const restartToken = new cancellation_token_1.CancellationToken();
|
|
@@ -46,7 +45,7 @@ let Migrator = Migrator_1 = class Migrator {
|
|
|
46
45
|
restart: () => restartToken.set()
|
|
47
46
|
};
|
|
48
47
|
const currentState = await this.migrationStateRepository.tryLoadByFilter({ name });
|
|
49
|
-
const currentRevision =
|
|
48
|
+
const currentRevision = currentState?.revision ?? 'init';
|
|
50
49
|
const latestRevision = migrations.sort((0, comparison_1.compareByValueSelectionDescending)((migration) => migration.to))[0].to;
|
|
51
50
|
if (currentRevision == latestRevision) {
|
|
52
51
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrator.js","sourceRoot":"","sources":["../../source/migration/migrator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAAoD;AAEpD,kCAAsC;AAEtC,sCAAkC;AAClC,0CAAwC;AACxC,oEAA+D;AAC/D,oDAAuE;AACvE,wCAAqC;AACrC,0CAAsC;AACtC,sDAAgD;AAEhD,6EAAwE;AA0BxE,IAAa,QAAQ,gBAArB,MAAa,QAAQ;IAKnB,YAAY,wBAAkD,EAAiD,YAA0B,EAA6C,MAAc;QAClM,IAAI,CAAC,wBAAwB,GAAG,wBAAwB,CAAC;QACzD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,kEAAkE;IAClE,KAAK,CAAC,OAAO,CAAI,EAAE,IAAI,EAAE,UAAU,EAA0B;QAC3D,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;SAC3C;QAED,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;QAE9C,kEAAkE;QAClE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,IAAmC,EAAE
|
|
1
|
+
{"version":3,"file":"migrator.js","sourceRoot":"","sources":["../../source/migration/migrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
3
|
-
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
4
|
-
var m = o[Symbol.asyncIterator], i;
|
|
5
|
-
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
|
6
|
-
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
7
|
-
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
8
|
-
};
|
|
9
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
3
|
exports.OldWebServerModule = void 0;
|
|
11
4
|
const module_1 = require("../module");
|
|
@@ -28,25 +21,14 @@ class OldWebServerModule extends module_base_1.ModuleBase {
|
|
|
28
21
|
this.httpApi.registerRoutes(...routes);
|
|
29
22
|
}
|
|
30
23
|
async _run(cancellationToken) {
|
|
31
|
-
var e_1, _a;
|
|
32
24
|
await this.httpServer.listen(this.port);
|
|
33
25
|
this.logger.info(`listening on port ${this.port}`);
|
|
34
26
|
const closePromise = cancellationToken.$set.then(async () => {
|
|
35
27
|
this.logger.info('closing http server');
|
|
36
28
|
return this.httpServer.close(3000);
|
|
37
29
|
});
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
const context = _c.value;
|
|
41
|
-
this.httpApi.handleRequest(context.context.nodeRequest, context.context.nodeResponse);
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
45
|
-
finally {
|
|
46
|
-
try {
|
|
47
|
-
if (_c && !_c.done && (_a = _b.return)) await _a.call(_b);
|
|
48
|
-
}
|
|
49
|
-
finally { if (e_1) throw e_1.error; }
|
|
30
|
+
for await (const context of this.httpServer) {
|
|
31
|
+
this.httpApi.handleRequest(context.context.nodeRequest, context.context.nodeResponse);
|
|
50
32
|
}
|
|
51
33
|
await closePromise;
|
|
52
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"old-web-server.module.js","sourceRoot":"","sources":["../../../source/module/modules/old-web-server.module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"old-web-server.module.js","sourceRoot":"","sources":["../../../source/module/modules/old-web-server.module.ts"],"names":[],"mappings":";;;AAKA,sCAA6C;AAC7C,gDAA4C;AAE5C,MAAa,kBAAmB,SAAQ,wBAAU;IAchD,YAAY,UAA0B,EAAE,OAAgB,EAAE,IAAY,EAAE,MAAc;QACpF,KAAK,CAAC,WAAW,CAAC,CAAC;QARZ,YAAO,GAAG;YACjB,gBAAgB,EAAE;gBAChB,IAAI,EAAE,yBAAgB,CAAC,KAAK;gBAC5B,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB;aACtD;SACF,CAAC;QAKA,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,cAAc,CAAC,GAAG,MAAkB;QAClC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,MAAM,CAAC,CAAC;IACzC,CAAC;IAES,KAAK,CAAC,IAAI,CAAC,iBAA4C;QAC/D,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAEnD,MAAM,YAAY,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAC1D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YACxC,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,MAAM,OAAO,IAAI,IAAI,CAAC,UAAU,EAAE;YAC3C,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;SACvF;QAED,MAAM,YAAY,CAAC;IACrB,CAAC;CACF;AA1CD,gDA0CC"}
|
|
@@ -11,13 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
-
var __asyncValues = (this && this.__asyncValues) || function (o) {
|
|
15
|
-
if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
|
|
16
|
-
var m = o[Symbol.asyncIterator], i;
|
|
17
|
-
return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
|
|
18
|
-
function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
|
|
19
|
-
function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
|
|
20
|
-
};
|
|
21
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
15
|
exports.configureWebServerModule = exports.WebServerModule = exports.webServerModuleConfiguration = void 0;
|
|
23
16
|
const server_1 = require("../../api/server");
|
|
@@ -60,24 +53,13 @@ let WebServerModule = class WebServerModule extends module_base_1.ModuleBase {
|
|
|
60
53
|
await this.apiGateway.registerApiController(controller);
|
|
61
54
|
}
|
|
62
55
|
async _run(cancellationToken) {
|
|
63
|
-
var e_1, _a;
|
|
64
56
|
await this.initialize();
|
|
65
57
|
await this.httpServer.listen(this.config.port);
|
|
66
58
|
const closePromise = cancellationToken.$set.then(async () => {
|
|
67
59
|
await this.httpServer[disposable_1.disposeAsync]();
|
|
68
60
|
});
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
const context = _c.value;
|
|
72
|
-
void this.apiGateway.handleHttpServerRequestContext(context);
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
76
|
-
finally {
|
|
77
|
-
try {
|
|
78
|
-
if (_c && !_c.done && (_a = _b.return)) await _a.call(_b);
|
|
79
|
-
}
|
|
80
|
-
finally { if (e_1) throw e_1.error; }
|
|
61
|
+
for await (const context of this.httpServer) {
|
|
62
|
+
void this.apiGateway.handleHttpServerRequestContext(context);
|
|
81
63
|
}
|
|
82
64
|
await closePromise;
|
|
83
65
|
}
|
|
@@ -92,8 +74,7 @@ WebServerModule = __decorate([
|
|
|
92
74
|
], WebServerModule);
|
|
93
75
|
exports.WebServerModule = WebServerModule;
|
|
94
76
|
function configureWebServerModule(config) {
|
|
95
|
-
|
|
96
|
-
exports.webServerModuleConfiguration.port = (_a = config === null || config === void 0 ? void 0 : config.port) !== null && _a !== void 0 ? _a : exports.webServerModuleConfiguration.port;
|
|
77
|
+
exports.webServerModuleConfiguration.port = config?.port ?? exports.webServerModuleConfiguration.port;
|
|
97
78
|
}
|
|
98
79
|
exports.configureWebServerModule = configureWebServerModule;
|
|
99
80
|
//# sourceMappingURL=web-server.module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-server.module.js","sourceRoot":"","sources":["../../../source/module/modules/web-server.module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"web-server.module.js","sourceRoot":"","sources":["../../../source/module/modules/web-server.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAA8D;AAE9D,+CAAwG;AACxG,4DAAuD;AACvD,8CAA2C;AAI3C,sCAA6C;AAC7C,gDAA4C;AAM/B,QAAA,4BAA4B,GAAiC;IACxE,IAAI,EAAE,IAAI;CACX,CAAC;AAGF,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,wBAAU;IAiB7C,YACe,MAAoC,EACjD,UAAsB,EACtB,UAAsB,EAC+D,iBAAyB,EAAE;QAEhH,KAAK,CAAC,WAAW,CAAC,CAAC;QAfZ,YAAO,GAAG;YACjB,gBAAgB,EAAE;gBAChB,IAAI,EAAE,yBAAgB,CAAC,KAAK;gBAC5B,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB;aACtD;SACF,CAAC;QAYA,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QAErC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,UAAU;QACd,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,OAAO;SACR;QAED,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QAExB,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,cAAc,EAAE;YAC5C,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;SAC9C;IACH,CAAC;IAED,KAAK,CAAC,CAAC,wBAAY,CAAC;QAClB,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,UAAgB;QAC1C,MAAM,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAC1D,CAAC;IAES,KAAK,CAAC,IAAI,CAAC,iBAA4C;QAC/D,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAExB,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,YAAY,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAC1D,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAY,CAAC,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,MAAM,OAAO,IAAI,IAAI,CAAC,UAAU,EAAE;YAC3C,KAAK,IAAI,CAAC,UAAU,CAAC,8BAA8B,CAAC,OAAO,CAAC,CAAC;SAC9D;QAED,MAAM,YAAY,CAAC;IACrB,CAAC;CACF,CAAA;AApEY,eAAe;IAD3B,IAAA,qBAAS,EAAC,EAAE,uBAAuB,EAAE,GAAG,EAAE,CAAC,oCAA4B,EAAE,CAAC;IAmBtE,WAAA,IAAA,qBAAS,GAAE,CAAA;IAGX,WAAA,IAAA,kBAAM,EAAC,2BAAkB,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IAAE,WAAA,IAAA,oBAAQ,GAAE,CAAA;6CAFxE,mBAAU;QACV,mBAAU;GApBb,eAAe,CAoE3B;AApEY,0CAAe;AAsE5B,SAAgB,wBAAwB,CAAC,MAA8C;IACrF,oCAA4B,CAAC,IAAI,GAAG,MAAM,EAAE,IAAI,IAAI,oCAA4B,CAAC,IAAI,CAAC;AACxF,CAAC;AAFD,4DAEC"}
|
|
@@ -45,6 +45,11 @@ export declare abstract class ObjectStorage<OI extends ObjectInformation = Objec
|
|
|
45
45
|
* @param key object key
|
|
46
46
|
*/
|
|
47
47
|
abstract getResourceUri(key: string): Promise<string>;
|
|
48
|
+
/**
|
|
49
|
+
* get stream of object content
|
|
50
|
+
* @param key object key
|
|
51
|
+
*/
|
|
52
|
+
abstract getContentStream(key: string): AsyncIterable<Uint8Array>;
|
|
48
53
|
/**
|
|
49
54
|
* gets an url which can be used to download the object without further authorization
|
|
50
55
|
* @param key object key
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object-storage.js","sourceRoot":"","sources":["../../source/object-storage/object-storage.ts"],"names":[],"mappings":";;;AACA,4CAAkD;AAKlD,MAAsB,aAAa;IAQjC,YAAY,MAAc;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;
|
|
1
|
+
{"version":3,"file":"object-storage.js","sourceRoot":"","sources":["../../source/object-storage/object-storage.ts"],"names":[],"mappings":";;;AACA,4CAAkD;AAKlD,MAAsB,aAAa;IAQjC,YAAY,MAAc;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CAqEF;AA/ED,sCA+EC"}
|
|
@@ -14,6 +14,7 @@ export declare class S3ObjectStorage extends ObjectStorage<S3ObjectInformation,
|
|
|
14
14
|
getObject(key: string): Promise<S3Object>;
|
|
15
15
|
getObjectInformation(key: string): Promise<ObjectInformation>;
|
|
16
16
|
getResourceUri(key: string): Promise<string>;
|
|
17
|
+
getContentStream(key: string): AsyncIterable<Uint8Array>;
|
|
17
18
|
getDownloadUrl(key: string, expirationTimestamp: number): Promise<string>;
|
|
18
19
|
getUploadUrl(key: string, expirationTimestamp: number): Promise<string>;
|
|
19
20
|
deleteObject(key: string): Promise<void>;
|
|
@@ -90,6 +90,10 @@ let S3ObjectStorage = class S3ObjectStorage extends object_storage_1.ObjectStora
|
|
|
90
90
|
const bucketKey = this.getBucketKey(key);
|
|
91
91
|
return `s3://${this.bucket}/${bucketKey}`;
|
|
92
92
|
}
|
|
93
|
+
async *getContentStream(key) {
|
|
94
|
+
const bucketKey = this.getBucketKey(key);
|
|
95
|
+
yield* await this.client.getObject(this.bucket, bucketKey);
|
|
96
|
+
}
|
|
93
97
|
async getDownloadUrl(key, expirationTimestamp) {
|
|
94
98
|
const bucketKey = this.getBucketKey(key);
|
|
95
99
|
const { date, expiration } = getDateAndExpiration(expirationTimestamp);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"s3.object-storage.js","sourceRoot":"","sources":["../../../source/object-storage/s3/s3.object-storage.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAwC;AACxC,iDAA+C;AAE/C,uCAAiD;AACjD,qDAAwC;AACxC,oEAAgE;AAChE,yDAAiE;AAEjE,iCAA+B;AAE/B,6EAAuE;AAOvE,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,8BAA4C;IAK/E,YAAY,MAAc,EAAE,MAAc,EAAE,MAAc,EAAE,SAAiB;QAC3E,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,MAAc;QACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE3D,IAAI,MAAM,EAAE;YACV,OAAO;SACR;QAED,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAW;QACtB,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAEzC,IAAI;YACF,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;YACrD,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAc,EAAE;YACrB,IAAI,IAAA,sBAAQ,EAAC,KAAK,CAAC,IAAK,KAA0B,CAAC,IAAI,IAAI,UAAU,EAAE;gBACrE,OAAO,KAAK,CAAC;aACd;YAED,MAAM,KAAK,CAAC;SACb;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAW,EAAE,OAAoB;QAClD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEpC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACzE,MAAM,WAAW,GAAG,MAAM,4BAAe,CAAC,IAAI,CAAa,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;QAC7E,MAAM,kBAAkB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAuB,EAAE,CAAC,CAAC;YACzE,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;YAC3B,WAAW,EAAE,QAAQ,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE;YAC/C,aAAa,EAAE,IAAI,CAAC,IAAI;SACzB,CAAC,CAAC,CAAC;QAEJ,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAW;QACzB,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAClE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACnE,MAAM,OAAO,GAAG,MAAM,IAAA,gCAAgB,EAAC,MAAM,CAAC,CAAC;QAE/C,MAAM,MAAM,GAAa;YACvB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG;YACH,WAAW,EAAE,QAAQ,IAAI,CAAC,MAAM,IAAI,SAAS,EAAE;YAC/C,aAAa,EAAE,IAAI,CAAC,IAAI;YACxB,OAAO;SACR,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,GAAW;QACpC,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAElE,MAAM,WAAW,GAAwB;YACvC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG;YACH,WAAW,EAAE,QAAQ,IAAI,CAAC,MAAM,IAAI,SAAS,EAAE;YAC/C,aAAa,EAAE,IAAI,CAAC,IAAI;SACzB,CAAC;QAEF,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAW;QAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACzC,OAAO,QAAQ,IAAI,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAW,EAAE,mBAA2B;QAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;QAEvE,OAAO,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;IACtF,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAW,EAAE,mBAA2B;QACzD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;QAEvE,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;IACvF,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAW;QAC5B,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAAc;QAChC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7D,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC3D,CAAC;IAEO,YAAY,CAAC,GAAW;QAC9B,OAAO,GAAG,IAAI,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;IAChC,CAAC;IAEO,MAAM,CAAC,SAAiB;QAC9B,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;CACF,CAAA;
|
|
1
|
+
{"version":3,"file":"s3.object-storage.js","sourceRoot":"","sources":["../../../source/object-storage/s3/s3.object-storage.ts"],"names":[],"mappings":"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"}
|
package/old-api/http-api.js
CHANGED
|
@@ -1,15 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __rest = (this && this.__rest) || function (s, e) {
|
|
3
|
-
var t = {};
|
|
4
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
5
|
-
t[p] = s[p];
|
|
6
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
7
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
8
|
-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
9
|
-
t[p[i]] = s[p[i]];
|
|
10
|
-
}
|
|
11
|
-
return t;
|
|
12
|
-
};
|
|
13
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
3
|
exports.HttpApi = exports.noopRequestDataTransformer = exports.getDefaultRequestDataTransformer = exports.getSimpleRouteHandler = exports.getStreamRouteHandler = exports.getBufferRouteHandler = exports.getJsonRouteHandler = exports.getTextRouteHandler = exports.route = exports.simpleRoute = void 0;
|
|
15
4
|
const response_1 = require("../api/response");
|
|
@@ -67,13 +56,13 @@ function getSimpleRouteHandler(handler) {
|
|
|
67
56
|
exports.getSimpleRouteHandler = getSimpleRouteHandler;
|
|
68
57
|
function getDefaultRequestDataTransformer() {
|
|
69
58
|
function defaultRequestDataTransformer(data, bodyType, context) {
|
|
70
|
-
let transformed =
|
|
59
|
+
let transformed = { ...data.parameters };
|
|
71
60
|
const requestBodyType = contentTypeToBodyType(context.request.type);
|
|
72
61
|
if ((bodyType == 'json' && (0, type_guards_1.isObject)(data.body) && !Array.isArray(data.body)) || (bodyType == 'auto' && requestBodyType == 'json')) {
|
|
73
|
-
transformed =
|
|
62
|
+
transformed = { ...transformed, ...data.body };
|
|
74
63
|
}
|
|
75
64
|
else if (bodyType != 'none' && (0, type_guards_1.isDefined)(data.body)) {
|
|
76
|
-
transformed =
|
|
65
|
+
transformed = { ...transformed, body: data.body };
|
|
77
66
|
}
|
|
78
67
|
return transformed;
|
|
79
68
|
}
|
|
@@ -109,20 +98,19 @@ class HttpApi {
|
|
|
109
98
|
}
|
|
110
99
|
}
|
|
111
100
|
registerRoutes(...routes) {
|
|
112
|
-
var _a, _b, _c;
|
|
113
101
|
// eslint-disable-next-line @typescript-eslint/no-shadow
|
|
114
102
|
for (const route of routes) {
|
|
115
103
|
const methods = (0, array_1.toArray)(route.method);
|
|
116
104
|
for (const method of methods) {
|
|
117
105
|
switch (method) {
|
|
118
106
|
case 'GET':
|
|
119
|
-
this.registerRoute(method, route.path, 'none',
|
|
107
|
+
this.registerRoute(method, route.path, 'none', route.maxRequestBodyBytes ?? 10e6, route.requestDataTransformer, route.endpoint, route.handler);
|
|
120
108
|
break;
|
|
121
109
|
case 'POST':
|
|
122
110
|
case 'PATCH':
|
|
123
111
|
case 'PUT':
|
|
124
112
|
case 'DELETE':
|
|
125
|
-
this.registerRoute(method, route.path,
|
|
113
|
+
this.registerRoute(method, route.path, route.bodyType ?? 'auto', route.maxRequestBodyBytes ?? 10e6, route.requestDataTransformer, route.endpoint, route.handler);
|
|
126
114
|
break;
|
|
127
115
|
default:
|
|
128
116
|
throw new Error('unknown route method');
|
|
@@ -139,8 +127,8 @@ class HttpApi {
|
|
|
139
127
|
// eslint-disable-next-line max-lines-per-function, max-statements, class-methods-use-this
|
|
140
128
|
async handle(context, bodyType, maxBytes, requestDataTransformer, endpoint, handler) {
|
|
141
129
|
const { request, response, params } = context;
|
|
142
|
-
const query =
|
|
143
|
-
const requestParameters =
|
|
130
|
+
const { query: { ...query } } = request;
|
|
131
|
+
const requestParameters = { ...params, ...query };
|
|
144
132
|
let body;
|
|
145
133
|
try {
|
|
146
134
|
body = await getBody(request, bodyType, maxBytes);
|
|
@@ -166,18 +154,17 @@ class HttpApi {
|
|
|
166
154
|
}
|
|
167
155
|
exports.HttpApi = HttpApi;
|
|
168
156
|
function applyResponse(response, responseResult) {
|
|
169
|
-
|
|
170
|
-
if (((_a = responseResult.body) === null || _a === void 0 ? void 0 : _a.json) != undefined) {
|
|
157
|
+
if (responseResult.body?.json != undefined) {
|
|
171
158
|
response.set('Content-Type', 'application/json; charset=utf-8');
|
|
172
159
|
response.body = JSON.stringify(responseResult.body.json);
|
|
173
160
|
}
|
|
174
|
-
else if (
|
|
161
|
+
else if (responseResult.body?.text != undefined) {
|
|
175
162
|
response.body = responseResult.body.text;
|
|
176
163
|
}
|
|
177
|
-
else if (
|
|
164
|
+
else if (responseResult.body?.stream != undefined) {
|
|
178
165
|
response.body = responseResult.body.stream;
|
|
179
166
|
}
|
|
180
|
-
else if (
|
|
167
|
+
else if (responseResult.body?.buffer != undefined) {
|
|
181
168
|
response.body = responseResult.body.buffer;
|
|
182
169
|
}
|
|
183
170
|
for (const [field, value] of responseResult.headers.normalizedEntries()) {
|
package/old-api/http-api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-api.js","sourceRoot":"","sources":["../../source/old-api/http-api.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"http-api.js","sourceRoot":"","sources":["../../source/old-api/http-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,8 +24,8 @@ const indexes = [
|
|
|
24
24
|
{ key: { expiration: 1 }, expireAfterSeconds: 1 }
|
|
25
25
|
];
|
|
26
26
|
const transformer = {
|
|
27
|
-
transform: (state) => (
|
|
28
|
-
untransform: (state) => (
|
|
27
|
+
transform: (state) => ({ ...state, expiration: new Date(state.expiration) }),
|
|
28
|
+
untransform: (state) => ({ ...state, expiration: state.expiration.getTime() }),
|
|
29
29
|
mapping: {
|
|
30
30
|
expiration: (0, mongo_1.mapTo)('expiration', (timestamp) => new Date(timestamp))
|
|
31
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongo-oidc-state.repository.js","sourceRoot":"","sources":["../../source/openid-connect/mongo-oidc-state.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,4CAAgG;AAEhG,6CAA4E;AAE5E,sCAAkC;AAGlC,mEAA8D;AAI9D,IAAI,gBAA8E,CAAC;AAEnF,MAAM,OAAO,GAA4C;IACvD,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;IACnC,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,kBAAkB,EAAE,CAAC,EAAE;CAClD,CAAC;AAEF,MAAM,WAAW,GAAiD;IAChE,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"mongo-oidc-state.repository.js","sourceRoot":"","sources":["../../source/openid-connect/mongo-oidc-state.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,4CAAgG;AAEhG,6CAA4E;AAE5E,sCAAkC;AAGlC,mEAA8D;AAI9D,IAAI,gBAA8E,CAAC;AAEnF,MAAM,OAAO,GAA4C;IACvD,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;IACnC,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE,kBAAkB,EAAE,CAAC,EAAE;CAClD,CAAC;AAEF,MAAM,WAAW,GAAiD;IAChE,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;IAC5E,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;IAC9E,OAAO,EAAE;QACP,UAAU,EAAE,IAAA,aAAK,EAAC,YAAY,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;KACpE;CACF,CAAC;AAGF,IAAa,wBAAwB,gCAArC,MAAa,wBAAyB,SAAQ,6BAAgD;IAG5F,YAA0B,UAAsC,EAA6D,MAAc;QACzI,KAAK,CAAC,UAAU,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IACtD,CAAC;CACF,CAAA;AANY,wBAAwB;IADpC,IAAA,qBAAS,EAAC,EAAE,uBAAuB,EAAE,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAIhD,WAAA,IAAA,sBAAU,GAAE,CAAA;IAA0C,WAAA,IAAA,sBAAU,EAAiB,0BAAwB,CAAC,IAAI,CAAC,CAAA;qCAAtF,kBAAU,EAAqF,eAAM;GAHhI,wBAAwB,CAMpC;AANY,4DAAwB;AAQrC;;;;GAIG;AACH,SAAgB,iCAAiC,CAAC,8BAAgF,EAAE,WAAoB,IAAI;IAC1J,gBAAgB,GAAG,8BAA8B,CAAC;IAElD,IAAI,QAAQ,EAAE;QACZ,qBAAS,CAAC,iBAAiB,CAAC,2CAAmB,EAAE,EAAE,QAAQ,EAAE,wBAAwB,EAAE,CAAC,CAAC;KAC1F;AACH,CAAC;AAND,8EAMC"}
|
package/package.json
CHANGED
package/pdf/pdf.service.js
CHANGED
|
@@ -32,10 +32,10 @@ let PdfService = class PdfService {
|
|
|
32
32
|
return this.pool.dispose();
|
|
33
33
|
}
|
|
34
34
|
async renderHtml(html, options) {
|
|
35
|
-
return this.render(async (page) => page.setContent(html, { waitUntil: (
|
|
35
|
+
return this.render(async (page) => page.setContent(html, { waitUntil: (options?.waitForNetworkIdle == true) ? 'networkidle2' : 'load' }), options);
|
|
36
36
|
}
|
|
37
37
|
async renderUrl(url, options) {
|
|
38
|
-
return this.render(async (page) => page.goto(url, { waitUntil: (
|
|
38
|
+
return this.render(async (page) => page.goto(url, { waitUntil: (options?.waitForNetworkIdle == true) ? 'networkidle2' : 'load' }), options);
|
|
39
39
|
}
|
|
40
40
|
async renderTemplate(key, templateContext, options) {
|
|
41
41
|
const html = await this.templateService.render(key, templateContext);
|
|
@@ -43,11 +43,10 @@ let PdfService = class PdfService {
|
|
|
43
43
|
}
|
|
44
44
|
async render(handler, options) {
|
|
45
45
|
return this.pool.use(async (browser) => {
|
|
46
|
-
var _a;
|
|
47
46
|
const page = await browser.newPage();
|
|
48
47
|
try {
|
|
49
48
|
await handler(page);
|
|
50
|
-
const margin = (0, type_guards_1.isUndefined)(options
|
|
49
|
+
const margin = (0, type_guards_1.isUndefined)(options?.margin)
|
|
51
50
|
? undefined
|
|
52
51
|
: (0, type_guards_1.isObject)(options.margin)
|
|
53
52
|
? options.margin
|
|
@@ -58,13 +57,13 @@ let PdfService = class PdfService {
|
|
|
58
57
|
left: options.margin
|
|
59
58
|
};
|
|
60
59
|
const result = await page.pdf({
|
|
61
|
-
format:
|
|
62
|
-
scale: options
|
|
63
|
-
landscape: options
|
|
64
|
-
width: options
|
|
65
|
-
height: options
|
|
66
|
-
omitBackground: options
|
|
67
|
-
printBackground: options
|
|
60
|
+
format: options?.format ?? 'a4',
|
|
61
|
+
scale: options?.scale,
|
|
62
|
+
landscape: options?.landscape,
|
|
63
|
+
width: options?.width,
|
|
64
|
+
height: options?.height,
|
|
65
|
+
omitBackground: options?.omitDefaultBackground,
|
|
66
|
+
printBackground: options?.renderBackground,
|
|
68
67
|
margin
|
|
69
68
|
});
|
|
70
69
|
return result;
|
package/pdf/pdf.service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pdf.service.js","sourceRoot":"","sources":["../../source/pdf/pdf.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,4CAAsD;AACtD,kCAAkC;AAElC,yDAAuD;AACvD,kCAA8B;AAC9B,4CAA8C;AAC9C,sDAA4D;AAC5D,uCAAuC;AAoBvC,IAAa,UAAU,GAAvB,MAAa,UAAU;IAIrB,YAAY,eAAgC;QAC1C,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QAEvC,IAAI,CAAC,IAAI,GAAG,IAAI,WAAI,CAClB,KAAK,IAAI,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,EAC9B,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,CACnC,CAAC;IACJ,CAAC;IAED,CAAC,wBAAY,CAAC;QACZ,eAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,CAAC,yBAAY,CAAC;QAClB,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAY,EAAE,OAA0B;QACvD,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"pdf.service.js","sourceRoot":"","sources":["../../source/pdf/pdf.service.ts"],"names":[],"mappings":"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"}
|
package/pool/pool.js
CHANGED
|
@@ -9,8 +9,7 @@ const rxjs_1 = require("rxjs");
|
|
|
9
9
|
const placeholder = Symbol('pool placeholder');
|
|
10
10
|
class Pool {
|
|
11
11
|
constructor(factory, disposer, options) {
|
|
12
|
-
|
|
13
|
-
this.size = (_a = options === null || options === void 0 ? void 0 : options.size) !== null && _a !== void 0 ? _a : (0, os_1.cpus)().length;
|
|
12
|
+
this.size = options?.size ?? (0, os_1.cpus)().length;
|
|
14
13
|
this.factory = factory;
|
|
15
14
|
this.disposer = disposer;
|
|
16
15
|
this.freeInstances = new data_structures_1.ArrayList();
|
package/pool/pool.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../source/pool/pool.ts"],"names":[],"mappings":";;;AAAA,wDAA8C;AAC9C,gDAA4C;AAE5C,yDAAuD;AACvD,2BAA0B;AAC1B,+BAA4C;AAa5C,MAAM,WAAW,GAAG,MAAM,CAAC,kBAAkB,CAAC,CAAC;AAE/C,MAAa,IAAI;IAaf,YAAY,OAA+B,EAAE,QAAiC,EAAE,OAAqB
|
|
1
|
+
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../source/pool/pool.ts"],"names":[],"mappings":"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"}
|
package/queue/enqueue-batch.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enqueue-batch.js","sourceRoot":"","sources":["../../source/queue/enqueue-batch.ts"],"names":[],"mappings":";;;AAOA,MAAa,iBAAiB;IAM5B,YAAY,KAAe;QACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QAEnB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,wBAAwB;IACxB,GAAG,CAAC,IAAO,EAAE,OAAwB;QACnC,IAAI,CAAC,KAAK,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"enqueue-batch.js","sourceRoot":"","sources":["../../source/queue/enqueue-batch.ts"],"names":[],"mappings":";;;AAOA,MAAa,iBAAiB;IAM5B,YAAY,KAAe;QACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QAEnB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,wBAAwB;IACxB,GAAG,CAAC,IAAO,EAAE,OAAwB;QACnC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;IACxC,CAAC;IAKD,KAAK,CAAC,OAAO,CAAC,UAAoB;QAChC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;QAEhB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAC/D,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AA3BD,8CA2BC"}
|
|
@@ -11,17 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
-
var __rest = (this && this.__rest) || function (s, e) {
|
|
15
|
-
var t = {};
|
|
16
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
17
|
-
t[p] = s[p];
|
|
18
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
19
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
20
|
-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
21
|
-
t[p[i]] = s[p[i]];
|
|
22
|
-
}
|
|
23
|
-
return t;
|
|
24
|
-
};
|
|
25
14
|
var MongoJobRepository_1;
|
|
26
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
16
|
exports.MongoJobRepository = void 0;
|
|
@@ -42,18 +31,18 @@ let MongoJobRepository = MongoJobRepository_1 = class MongoJobRepository extends
|
|
|
42
31
|
super(collection, mongo_1.noopTransformer, { indexes: indexes, logger });
|
|
43
32
|
}
|
|
44
33
|
async insertWithUniqueTagStrategy(newJob, uniqueTagStrategy) {
|
|
45
|
-
const { queue, tag
|
|
34
|
+
const { queue, tag, ...rest } = newJob;
|
|
46
35
|
const updateQuery = (uniqueTagStrategy == queue_1.UniqueTagStrategy.KeepOld)
|
|
47
|
-
? { $setOnInsert:
|
|
36
|
+
? { $setOnInsert: { _id: (0, database_1.getNewId)(), ...rest } }
|
|
48
37
|
: { $set: rest, $setOnInsert: { _id: (0, database_1.getNewId)() } };
|
|
49
38
|
return this.baseRepository.loadByFilterAndUpdate({ queue, tag }, updateQuery, { upsert: true, returnDocument: 'after' });
|
|
50
39
|
}
|
|
51
40
|
async bulkInsertWithUniqueTagStrategy(newJobs, uniqueTagStrategy) {
|
|
52
41
|
const bulk = this.baseRepository.bulk();
|
|
53
42
|
for (const newJob of newJobs) {
|
|
54
|
-
const { queue, tag
|
|
43
|
+
const { queue, tag, ...rest } = newJob;
|
|
55
44
|
const updateQuery = (uniqueTagStrategy == queue_1.UniqueTagStrategy.KeepOld)
|
|
56
|
-
? { $setOnInsert:
|
|
45
|
+
? { $setOnInsert: { _id: (0, database_1.getNewId)(), ...rest } }
|
|
57
46
|
: { $set: rest, $setOnInsert: { _id: (0, database_1.getNewId)() } };
|
|
58
47
|
bulk.update({ queue, tag }, updateQuery, { upsert: true });
|
|
59
48
|
}
|