@unchainedshop/plugins 4.2.1 → 4.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/accounts/google-oauth.d.ts +4 -0
- package/lib/accounts/google-oauth.d.ts.map +1 -0
- package/lib/accounts/google-oauth.js +145 -0
- package/lib/accounts/google-oauth.js.map +1 -0
- package/lib/accounts/linkedin-oauth.d.ts +4 -0
- package/lib/accounts/linkedin-oauth.d.ts.map +1 -0
- package/lib/accounts/linkedin-oauth.js +82 -0
- package/lib/accounts/linkedin-oauth.js.map +1 -0
- package/lib/files/gridfs/gridfs-adapter.d.ts +3 -0
- package/lib/files/gridfs/gridfs-adapter.d.ts.map +1 -0
- package/lib/files/gridfs/gridfs-adapter.js +97 -0
- package/lib/files/gridfs/gridfs-adapter.js.map +1 -0
- package/lib/files/gridfs/gridfs-webhook.d.ts +11 -0
- package/lib/files/gridfs/gridfs-webhook.d.ts.map +1 -0
- package/lib/files/gridfs/gridfs-webhook.js +84 -0
- package/lib/files/gridfs/gridfs-webhook.js.map +1 -0
- package/lib/files/minio/minio-adapter.d.ts +6 -0
- package/lib/files/minio/minio-adapter.d.ts.map +1 -0
- package/lib/files/minio/minio-adapter.js +181 -0
- package/lib/files/minio/minio-adapter.js.map +1 -0
- package/lib/files/minio/minio-webhook.d.ts +2 -0
- package/lib/files/minio/minio-webhook.d.ts.map +1 -0
- package/lib/files/minio/minio-webhook.js +33 -0
- package/lib/files/minio/minio-webhook.js.map +1 -0
- package/lib/payment/apple-iap/module/configureAppleTransactionsModule.d.ts +9 -0
- package/lib/payment/apple-iap/module/configureAppleTransactionsModule.d.ts.map +1 -0
- package/lib/payment/apple-iap/module/configureAppleTransactionsModule.js +17 -0
- package/lib/payment/apple-iap/module/configureAppleTransactionsModule.js.map +1 -0
- package/lib/payment/cryptopay/middleware.d.ts +2 -0
- package/lib/payment/cryptopay/middleware.d.ts.map +1 -0
- package/lib/payment/cryptopay/middleware.js +75 -0
- package/lib/payment/cryptopay/middleware.js.map +1 -0
- package/lib/payment/cryptopay/module/configureCryptopayModule.d.ts +25 -0
- package/lib/payment/cryptopay/module/configureCryptopayModule.d.ts.map +1 -0
- package/lib/payment/cryptopay/module/configureCryptopayModule.js +75 -0
- package/lib/payment/cryptopay/module/configureCryptopayModule.js.map +1 -0
- package/lib/payment/datatrans-v2/middleware.d.ts +2 -0
- package/lib/payment/datatrans-v2/middleware.d.ts.map +1 -0
- package/lib/payment/datatrans-v2/middleware.js +68 -0
- package/lib/payment/datatrans-v2/middleware.js.map +1 -0
- package/lib/payment/paypal-checkout.js +6 -2
- package/lib/payment/paypal-checkout.js.map +1 -1
- package/lib/payment/payrexx/middleware.d.ts +2 -0
- package/lib/payment/payrexx/middleware.d.ts.map +1 -0
- package/lib/payment/payrexx/middleware.js +86 -0
- package/lib/payment/payrexx/middleware.js.map +1 -0
- package/lib/payment/postfinance-checkout/middleware.d.ts +2 -0
- package/lib/payment/postfinance-checkout/middleware.d.ts.map +1 -0
- package/lib/payment/postfinance-checkout/middleware.js +38 -0
- package/lib/payment/postfinance-checkout/middleware.js.map +1 -0
- package/lib/payment/postfinance-checkout/utils.d.ts.map +1 -1
- package/lib/payment/postfinance-checkout/utils.js +6 -2
- package/lib/payment/postfinance-checkout/utils.js.map +1 -1
- package/lib/payment/saferpay/middleware.d.ts +2 -0
- package/lib/payment/saferpay/middleware.d.ts.map +1 -0
- package/lib/payment/saferpay/middleware.js +57 -0
- package/lib/payment/saferpay/middleware.js.map +1 -0
- package/lib/payment/saferpay/module/configureSaferpayTransactionsModule.d.ts +10 -0
- package/lib/payment/saferpay/module/configureSaferpayTransactionsModule.d.ts.map +1 -0
- package/lib/payment/saferpay/module/configureSaferpayTransactionsModule.js +24 -0
- package/lib/payment/saferpay/module/configureSaferpayTransactionsModule.js.map +1 -0
- package/lib/payment/stripe/middleware.d.ts +6 -0
- package/lib/payment/stripe/middleware.d.ts.map +1 -0
- package/lib/payment/stripe/middleware.js +114 -0
- package/lib/payment/stripe/middleware.js.map +1 -0
- package/lib/plugins-index.d.ts +48 -0
- package/lib/plugins-index.d.ts.map +1 -0
- package/lib/plugins-index.js +107 -0
- package/lib/plugins-index.js.map +1 -0
- package/lib/worker/sms.js +17 -17
- package/lib/worker/sms.js.map +1 -1
- package/package.json +13 -13
- package/src/payment/paypal-checkout.ts +7 -2
- package/src/payment/postfinance-checkout/utils.ts +7 -2
- package/lib/payment/cryptopay/de.d.ts +0 -2
- package/lib/payment/cryptopay/de.d.ts.map +0 -1
- package/lib/payment/cryptopay/de.js +0 -10
- package/lib/payment/cryptopay/de.js.map +0 -1
- package/lib/payment/cryptopay/derive-btc-address.test copy.d.ts +0 -2
- package/lib/payment/cryptopay/derive-btc-address.test copy.d.ts.map +0 -1
- package/lib/payment/cryptopay/derive-btc-address.test copy.js +0 -10
- package/lib/payment/cryptopay/derive-btc-address.test copy.js.map +0 -1
- package/lib/worker/BaseWorker.d.ts +0 -30
- package/lib/worker/BaseWorker.d.ts.map +0 -1
- package/lib/worker/BaseWorker.js +0 -79
- package/lib/worker/BaseWorker.js.map +0 -1
- package/lib/worker/EventListenerWorker.d.ts +0 -6
- package/lib/worker/EventListenerWorker.d.ts.map +0 -1
- package/lib/worker/EventListenerWorker.js +0 -46
- package/lib/worker/EventListenerWorker.js.map +0 -1
- package/lib/worker/FailedRescheduler.d.ts +0 -15
- package/lib/worker/FailedRescheduler.d.ts.map +0 -1
- package/lib/worker/FailedRescheduler.js +0 -45
- package/lib/worker/FailedRescheduler.js.map +0 -1
- package/lib/worker/IntervalWorker.d.ts +0 -10
- package/lib/worker/IntervalWorker.d.ts.map +0 -1
- package/lib/worker/IntervalWorker.js +0 -37
- package/lib/worker/IntervalWorker.js.map +0 -1
package/lib/worker/sms.js
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { WorkerDirector, WorkerAdapter } from '@unchainedshop/core-worker';
|
|
2
|
+
import Twilio from 'twilio';
|
|
2
3
|
const { TWILIO_ACCOUNT_SID, TWILIO_AUTH_TOKEN, TWILIO_SMS_FROM } = process.env;
|
|
4
|
+
/* Potential: no need for twilio npm
|
|
5
|
+
curl -X POST "https://api.twilio.com/2010-04-01/Accounts/$TWILIO_ACCOUNT_SID/Messages.json" \
|
|
6
|
+
--data-urlencode "From=+15017122661" \
|
|
7
|
+
--data-urlencode "Body=Hi there" \
|
|
8
|
+
--data-urlencode "To=+15558675310" \
|
|
9
|
+
-u $TWILIO_ACCOUNT_SID:$TWILIO_AUTH_TOKEN
|
|
10
|
+
*/
|
|
3
11
|
const SmsWorkerPlugin = {
|
|
4
12
|
...WorkerAdapter,
|
|
5
13
|
key: 'shop.unchained.worker-plugin.sms',
|
|
@@ -26,33 +34,25 @@ const SmsWorkerPlugin = {
|
|
|
26
34
|
};
|
|
27
35
|
}
|
|
28
36
|
try {
|
|
29
|
-
const
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
'Content-Type': 'application/x-www-form-urlencoded',
|
|
35
|
-
},
|
|
36
|
-
body: new URLSearchParams({
|
|
37
|
-
Body: text || '',
|
|
38
|
-
From: from || TWILIO_SMS_FROM,
|
|
39
|
-
To: to,
|
|
40
|
-
}),
|
|
37
|
+
const client = Twilio(TWILIO_ACCOUNT_SID, TWILIO_AUTH_TOKEN);
|
|
38
|
+
const { sid, errorMessage } = await client.messages.create({
|
|
39
|
+
body: text,
|
|
40
|
+
from: from || TWILIO_SMS_FROM,
|
|
41
|
+
to,
|
|
41
42
|
});
|
|
42
|
-
|
|
43
|
-
if (!response.ok) {
|
|
43
|
+
if (errorMessage) {
|
|
44
44
|
return {
|
|
45
45
|
success: false,
|
|
46
46
|
error: {
|
|
47
47
|
name: 'TWILIO_ERROR',
|
|
48
|
-
message:
|
|
48
|
+
message: errorMessage.toString(),
|
|
49
49
|
},
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
52
|
return {
|
|
53
53
|
success: true,
|
|
54
54
|
result: {
|
|
55
|
-
sid
|
|
55
|
+
sid,
|
|
56
56
|
},
|
|
57
57
|
error: null,
|
|
58
58
|
};
|
package/lib/worker/sms.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sms.js","sourceRoot":"","sources":["../../src/worker/sms.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"sms.js","sourceRoot":"","sources":["../../src/worker/sms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3E,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,MAAM,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE/E;;;;;;EAME;AAEF,MAAM,eAAe,GAOjB;IACF,GAAG,aAAa;IAEhB,GAAG,EAAE,kCAAkC;IACvC,KAAK,EAAE,2BAA2B;IAClC,OAAO,EAAE,OAAO;IAEhB,IAAI,EAAE,KAAK;IAEX,MAAM,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;QACnC,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,EAAE,CAAC;YAC9B,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,iBAAiB;oBACvB,OAAO,EAAE,8CAA8C;iBACxD;aACF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,oBAAoB;oBAC1B,OAAO,EAAE,mBAAmB;iBAC7B;aACF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC;YAC7D,MAAM,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACzD,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,IAAI,IAAI,eAAe;gBAC7B,EAAE;aACH,CAAC,CAAC;YACH,IAAI,YAAY,EAAE,CAAC;gBACjB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE;wBACL,IAAI,EAAE,cAAc;wBACpB,OAAO,EAAE,YAAY,CAAC,QAAQ,EAAE;qBACjC;iBACF,CAAC;YACJ,CAAC;YACD,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE;oBACN,GAAG;iBACJ;gBACD,KAAK,EAAE,IAAI;aACZ,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACL,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,KAAK,EAAE,GAAG,CAAC,KAAK;iBACjB;aACF,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC;AAEF,cAAc,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/plugins",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.3.0",
|
|
4
4
|
"main": "lib/plugins-index.js",
|
|
5
5
|
"types": "lib/plugins-index.d.ts",
|
|
6
6
|
"exports": {
|
|
@@ -34,18 +34,18 @@
|
|
|
34
34
|
},
|
|
35
35
|
"homepage": "https://github.com/unchainedshop/unchained#readme",
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@unchainedshop/api": "^4.
|
|
38
|
-
"@unchainedshop/core-delivery": "^4.
|
|
39
|
-
"@unchainedshop/core-enrollments": "^4.
|
|
40
|
-
"@unchainedshop/core-orders": "^4.
|
|
41
|
-
"@unchainedshop/core-payment": "^4.
|
|
42
|
-
"@unchainedshop/core-products": "^4.
|
|
43
|
-
"@unchainedshop/core-warehousing": "^4.
|
|
44
|
-
"@unchainedshop/core-worker": "^4.
|
|
45
|
-
"@unchainedshop/events": "^4.
|
|
46
|
-
"@unchainedshop/file-upload": "^4.
|
|
47
|
-
"@unchainedshop/logger": "^4.
|
|
48
|
-
"@unchainedshop/utils": "^4.
|
|
37
|
+
"@unchainedshop/api": "^4.3.0",
|
|
38
|
+
"@unchainedshop/core-delivery": "^4.3.0",
|
|
39
|
+
"@unchainedshop/core-enrollments": "^4.3.0",
|
|
40
|
+
"@unchainedshop/core-orders": "^4.3.0",
|
|
41
|
+
"@unchainedshop/core-payment": "^4.3.0",
|
|
42
|
+
"@unchainedshop/core-products": "^4.3.0",
|
|
43
|
+
"@unchainedshop/core-warehousing": "^4.3.0",
|
|
44
|
+
"@unchainedshop/core-worker": "^4.3.0",
|
|
45
|
+
"@unchainedshop/events": "^4.3.0",
|
|
46
|
+
"@unchainedshop/file-upload": "^4.3.0",
|
|
47
|
+
"@unchainedshop/logger": "^4.3.0",
|
|
48
|
+
"@unchainedshop/utils": "^4.3.0"
|
|
49
49
|
},
|
|
50
50
|
"peerDependencies": {
|
|
51
51
|
"@aws-sdk/client-eventbridge": ">= 3.714 < 4",
|
|
@@ -36,6 +36,11 @@ const environment = () => {
|
|
|
36
36
|
: new checkoutNodeJssdk.core.LiveEnvironment(clientId, clientSecret);
|
|
37
37
|
};
|
|
38
38
|
|
|
39
|
+
const roundToDecimals = (number, decimals) => {
|
|
40
|
+
const num = Math.pow(10, decimals);
|
|
41
|
+
return Math.round(number * num) / num;
|
|
42
|
+
};
|
|
43
|
+
|
|
39
44
|
const PaypalCheckout: IPaymentAdapter = {
|
|
40
45
|
...PaymentAdapter,
|
|
41
46
|
|
|
@@ -93,8 +98,8 @@ const PaypalCheckout: IPaymentAdapter = {
|
|
|
93
98
|
calculation: order.calculation,
|
|
94
99
|
currencyCode: order.currencyCode,
|
|
95
100
|
});
|
|
96
|
-
const ourTotal = (pricing.total({ useNetPrice: false }).amount / 100
|
|
97
|
-
const paypalTotal = paypalOrder.result.purchase_units[0].amount.value;
|
|
101
|
+
const ourTotal = roundToDecimals(pricing.total({ useNetPrice: false }).amount / 100, 2);
|
|
102
|
+
const paypalTotal = roundToDecimals(paypalOrder.result.purchase_units[0].amount.value, 2);
|
|
98
103
|
|
|
99
104
|
if (ourTotal === paypalTotal) {
|
|
100
105
|
return order;
|
|
@@ -2,6 +2,11 @@ import { OrderPricingSheet } from '@unchainedshop/core';
|
|
|
2
2
|
import { Order } from '@unchainedshop/core-orders';
|
|
3
3
|
import { Transaction, TransactionState } from './api-types.js';
|
|
4
4
|
|
|
5
|
+
const roundToDecimals = (number, decimals) => {
|
|
6
|
+
const num = Math.pow(10, decimals);
|
|
7
|
+
return Math.round(number * num) / num;
|
|
8
|
+
};
|
|
9
|
+
|
|
5
10
|
export const transactionIsPaid = async (
|
|
6
11
|
transaction: Transaction,
|
|
7
12
|
expectedCurrency: string,
|
|
@@ -10,14 +15,14 @@ export const transactionIsPaid = async (
|
|
|
10
15
|
if (transaction.state === TransactionState.FULFILL) {
|
|
11
16
|
return (
|
|
12
17
|
transaction.completedAmount !== undefined &&
|
|
13
|
-
transaction.completedAmount
|
|
18
|
+
roundToDecimals(transaction.completedAmount, 2) === roundToDecimals(expectedAmount, 2) &&
|
|
14
19
|
transaction.currency === expectedCurrency
|
|
15
20
|
);
|
|
16
21
|
}
|
|
17
22
|
if (transaction.state === TransactionState.AUTHORIZED) {
|
|
18
23
|
return (
|
|
19
24
|
transaction.authorizationAmount !== undefined &&
|
|
20
|
-
transaction.authorizationAmount
|
|
25
|
+
roundToDecimals(transaction.authorizationAmount, 2) === roundToDecimals(expectedAmount, 2) &&
|
|
21
26
|
transaction.currency === expectedCurrency
|
|
22
27
|
);
|
|
23
28
|
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"de.d.ts","sourceRoot":"","sources":["../../../src/payment/cryptopay/de.ts"],"names":[],"mappings":""}
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
import { describe, it } from 'node:test';
|
|
2
|
-
import assert from 'node:assert';
|
|
3
|
-
import deriveBtcAddress from './derive-btc-address.js';
|
|
4
|
-
describe('BTC Address Derivation', () => {
|
|
5
|
-
it('returns a deterministic BIP44 child address', () => {
|
|
6
|
-
assert.equal(deriveBtcAddress('zpub6qpRm6gMdkrXvVKw7qgayHnqJGJkpE4rnYQdyJfZW87ed4Fk6HjVaThN12hv2rrL3EzfvvBW6ZpbMEe5UxZYEjhgeMigyvAbS5LiXPkKrys', 1), 'bc1qspcam3ntdpvhgz4vnxfdhas6qr8hf8tjfaz5p4');
|
|
7
|
-
assert.equal(deriveBtcAddress('zpub6qpRm6gMdkrXvVKw7qgayHnqJGJkpE4rnYQdyJfZW87ed4Fk6HjVaThN12hv2rrL3EzfvvBW6ZpbMEe5UxZYEjhgeMigyvAbS5LiXPkKrys', 2), 'bc1qd0a7znq3pz3sc4armthddkyam57ey7qjc4v6vn');
|
|
8
|
-
});
|
|
9
|
-
});
|
|
10
|
-
//# sourceMappingURL=de.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"de.js","sourceRoot":"","sources":["../../../src/payment/cryptopay/de.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,gBAAgB,MAAM,yBAAyB,CAAC;AAEvD,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,CAAC,KAAK,CACV,gBAAgB,CACd,iHAAiH,EACjH,CAAC,CACF,EACD,4CAA4C,CAC7C,CAAC;QACF,MAAM,CAAC,KAAK,CACV,gBAAgB,CACd,iHAAiH,EACjH,CAAC,CACF,EACD,4CAA4C,CAC7C,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"derive-btc-address.test copy.d.ts","sourceRoot":"","sources":["../../../src/payment/cryptopay/derive-btc-address.test copy.ts"],"names":[],"mappings":""}
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
import { describe, it } from 'node:test';
|
|
2
|
-
import assert from 'node:assert';
|
|
3
|
-
import deriveBtcAddress from './derive-btc-address.js';
|
|
4
|
-
describe('BTC Address Derivation', () => {
|
|
5
|
-
it('returns a deterministic BIP44 child address', () => {
|
|
6
|
-
assert.equal(deriveBtcAddress('zpub6qpRm6gMdkrXvVKw7qgayHnqJGJkpE4rnYQdyJfZW87ed4Fk6HjVaThN12hv2rrL3EzfvvBW6ZpbMEe5UxZYEjhgeMigyvAbS5LiXPkKrys', 1), 'bc1qspcam3ntdpvhgz4vnxfdhas6qr8hf8tjfaz5p4');
|
|
7
|
-
assert.equal(deriveBtcAddress('zpub6qpRm6gMdkrXvVKw7qgayHnqJGJkpE4rnYQdyJfZW87ed4Fk6HjVaThN12hv2rrL3EzfvvBW6ZpbMEe5UxZYEjhgeMigyvAbS5LiXPkKrys', 2), 'bc1qd0a7znq3pz3sc4armthddkyam57ey7qjc4v6vn');
|
|
8
|
-
});
|
|
9
|
-
});
|
|
10
|
-
//# sourceMappingURL=derive-btc-address.test%20copy.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"derive-btc-address.test copy.js","sourceRoot":"","sources":["../../../src/payment/cryptopay/derive-btc-address.test copy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,gBAAgB,MAAM,yBAAyB,CAAC;AAEvD,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;IACtC,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,CAAC,KAAK,CACV,gBAAgB,CACd,iHAAiH,EACjH,CAAC,CACF,EACD,4CAA4C,CAC7C,CAAC;QACF,MAAM,CAAC,KAAK,CACV,gBAAgB,CACd,iHAAiH,EACjH,CAAC,CACF,EACD,4CAA4C,CAC7C,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
import { Work } from '@unchainedshop/core-worker';
|
|
2
|
-
export type IWorker<P extends {
|
|
3
|
-
workerId?: string;
|
|
4
|
-
}> = {
|
|
5
|
-
key: string;
|
|
6
|
-
label: string;
|
|
7
|
-
version: string;
|
|
8
|
-
type: string;
|
|
9
|
-
external: boolean;
|
|
10
|
-
getFloorDate: (date?: Date) => Date;
|
|
11
|
-
actions: (params: P, unchainedAPI: any) => {
|
|
12
|
-
autorescheduleTypes: (options: {
|
|
13
|
-
referenceDate: Date;
|
|
14
|
-
}) => Promise<Array<Work | null>>;
|
|
15
|
-
process: (options: {
|
|
16
|
-
maxWorkItemCount?: number;
|
|
17
|
-
referenceDate?: Date;
|
|
18
|
-
}) => Promise<void>;
|
|
19
|
-
reset: () => Promise<void>;
|
|
20
|
-
start: () => void;
|
|
21
|
-
stop: () => void;
|
|
22
|
-
};
|
|
23
|
-
};
|
|
24
|
-
interface WorkerParams {
|
|
25
|
-
workerId?: string;
|
|
26
|
-
worker: IWorker<any>;
|
|
27
|
-
}
|
|
28
|
-
export declare const BaseWorker: IWorker<WorkerParams>;
|
|
29
|
-
export {};
|
|
30
|
-
//# sourceMappingURL=BaseWorker.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"BaseWorker.d.ts","sourceRoot":"","sources":["../../src/worker/BaseWorker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAY,MAAM,4BAA4B,CAAC;AAG5D,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,IAAI;IACrD,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAElB,YAAY,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,KAAK,IAAI,CAAC;IAEpC,OAAO,EAAE,CACP,MAAM,EAAE,CAAC,EACT,YAAY,KAAA,KACT;QACH,mBAAmB,EAAE,CAAC,OAAO,EAAE;YAAE,aAAa,EAAE,IAAI,CAAA;SAAE,KAAK,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC;QACvF,OAAO,EAAE,CAAC,OAAO,EAAE;YAAE,gBAAgB,CAAC,EAAE,MAAM,CAAC;YAAC,aAAa,CAAC,EAAE,IAAI,CAAA;SAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACzF,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3B,KAAK,EAAE,MAAM,IAAI,CAAC;QAClB,IAAI,EAAE,MAAM,IAAI,CAAC;KAClB,CAAC;CACH,CAAC;AAEF,UAAU,YAAY;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;CACtB;AAED,eAAO,MAAM,UAAU,EAAE,OAAO,CAAC,YAAY,CAqF5C,CAAC"}
|
package/lib/worker/BaseWorker.js
DELETED
|
@@ -1,79 +0,0 @@
|
|
|
1
|
-
import later from '@breejs/later';
|
|
2
|
-
import { WorkerDirector } from '@unchainedshop/core';
|
|
3
|
-
export const BaseWorker = {
|
|
4
|
-
key: 'shop.unchained.worker.base',
|
|
5
|
-
label: 'Base worker. Do not use this directly.',
|
|
6
|
-
version: '1.0.0',
|
|
7
|
-
type: 'BASE',
|
|
8
|
-
external: false,
|
|
9
|
-
getFloorDate: (date = new Date()) => {
|
|
10
|
-
const floored = new Date(Math.floor(date.getTime() / 1000) * 1000);
|
|
11
|
-
return floored;
|
|
12
|
-
},
|
|
13
|
-
actions: ({ workerId }, unchainedAPI) => {
|
|
14
|
-
const workerActions = {
|
|
15
|
-
start() {
|
|
16
|
-
throw new Error(`Not implemented on ${this.constructor.key}`);
|
|
17
|
-
},
|
|
18
|
-
stop() {
|
|
19
|
-
throw new Error(`Not implemented on ${this.constructor.key}`);
|
|
20
|
-
},
|
|
21
|
-
reset: async (referenceDate = new Date()) => {
|
|
22
|
-
await unchainedAPI.modules.worker.markOldWorkAsFailed({
|
|
23
|
-
types: WorkerDirector.getActivePluginTypes({ external: false }),
|
|
24
|
-
worker: workerId,
|
|
25
|
-
referenceDate,
|
|
26
|
-
});
|
|
27
|
-
},
|
|
28
|
-
autorescheduleTypes: async ({ referenceDate }) => {
|
|
29
|
-
return Promise.all(WorkerDirector.getAutoSchedules().map(async ([scheduleId, workConfig]) => {
|
|
30
|
-
if (!workConfig.schedule) {
|
|
31
|
-
await unchainedAPI.modules.worker.ensureNoWork({
|
|
32
|
-
type: workConfig.type,
|
|
33
|
-
priority: workConfig.priority || 0,
|
|
34
|
-
scheduleId,
|
|
35
|
-
});
|
|
36
|
-
return null;
|
|
37
|
-
}
|
|
38
|
-
const fixedSchedule = { ...workConfig.schedule };
|
|
39
|
-
fixedSchedule.schedules[0].s = [0]; // ignore seconds, always run on second 0
|
|
40
|
-
const nextDate = later.schedule(fixedSchedule).next(1, referenceDate);
|
|
41
|
-
nextDate.setMilliseconds(0);
|
|
42
|
-
const workData = {
|
|
43
|
-
type: workConfig.type,
|
|
44
|
-
scheduleId,
|
|
45
|
-
scheduled: nextDate,
|
|
46
|
-
timeout: workConfig.timeout,
|
|
47
|
-
priority: workConfig.priority || 0,
|
|
48
|
-
retries: workConfig.retries || 0,
|
|
49
|
-
};
|
|
50
|
-
if (workConfig.input) {
|
|
51
|
-
workData.input = await workConfig.input(workData);
|
|
52
|
-
// A work input fn can skip auto scheduling a new record
|
|
53
|
-
// when it explicitly returns a falsish input instead of a dictionary
|
|
54
|
-
if (!workData.input)
|
|
55
|
-
return null;
|
|
56
|
-
}
|
|
57
|
-
return unchainedAPI.modules.worker.ensureOneWork(workData);
|
|
58
|
-
}));
|
|
59
|
-
},
|
|
60
|
-
process: async ({ maxWorkItemCount, referenceDate }) => {
|
|
61
|
-
await workerActions.autorescheduleTypes({
|
|
62
|
-
referenceDate,
|
|
63
|
-
});
|
|
64
|
-
const processRecursively = async (recursionCounter = 0) => {
|
|
65
|
-
if (maxWorkItemCount && maxWorkItemCount < recursionCounter)
|
|
66
|
-
return null;
|
|
67
|
-
const doneWork = await WorkerDirector.processNextWork(unchainedAPI, workerId);
|
|
68
|
-
if (doneWork)
|
|
69
|
-
return processRecursively(recursionCounter + 1);
|
|
70
|
-
return null;
|
|
71
|
-
};
|
|
72
|
-
await processRecursively();
|
|
73
|
-
},
|
|
74
|
-
};
|
|
75
|
-
workerActions.reset();
|
|
76
|
-
return workerActions;
|
|
77
|
-
},
|
|
78
|
-
};
|
|
79
|
-
//# sourceMappingURL=BaseWorker.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"BaseWorker.js","sourceRoot":"","sources":["../../src/worker/BaseWorker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"EventListenerWorker.d.ts","sourceRoot":"","sources":["../../src/worker/EventListenerWorker.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,OAAO,EAAE,MAAM,iBAAiB,CAAC;AActD,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,mBAAmB,EAAE,OAAO,CAAC,yBAAyB,CAyClE,CAAC"}
|
|
@@ -1,46 +0,0 @@
|
|
|
1
|
-
import { subscribe } from '@unchainedshop/events';
|
|
2
|
-
import { BaseWorker } from './BaseWorker.js';
|
|
3
|
-
import { WorkerEventTypes } from '@unchainedshop/core-worker';
|
|
4
|
-
function debounce(func, wait) {
|
|
5
|
-
let timeout;
|
|
6
|
-
return (...args) => {
|
|
7
|
-
clearTimeout(timeout);
|
|
8
|
-
timeout = setTimeout(() => {
|
|
9
|
-
timeout = null;
|
|
10
|
-
func(...args);
|
|
11
|
-
}, wait);
|
|
12
|
-
};
|
|
13
|
-
}
|
|
14
|
-
export const EventListenerWorker = {
|
|
15
|
-
...BaseWorker,
|
|
16
|
-
key: 'shop.unchained.worker.event-listener',
|
|
17
|
-
label: 'Allocates work on events. This worker does not make sense on multiple containers.',
|
|
18
|
-
version: '1.0.0',
|
|
19
|
-
type: 'EVENT_LISTENER',
|
|
20
|
-
actions: ({ workerId }, unchainedAPI) => {
|
|
21
|
-
const baseWorkerActions = BaseWorker.actions({ workerId, worker: EventListenerWorker }, unchainedAPI);
|
|
22
|
-
// Debounce in the event of many work queue events conflicting with each other
|
|
23
|
-
const processWorkQueue = debounce(async () => {
|
|
24
|
-
await baseWorkerActions.process({
|
|
25
|
-
maxWorkItemCount: 1, // only one work item at a time, else we could end up in a loop
|
|
26
|
-
referenceDate: EventListenerWorker.getFloorDate(),
|
|
27
|
-
});
|
|
28
|
-
}, 300);
|
|
29
|
-
return {
|
|
30
|
-
...baseWorkerActions,
|
|
31
|
-
start() {
|
|
32
|
-
subscribe(WorkerEventTypes.ADDED, processWorkQueue);
|
|
33
|
-
subscribe(WorkerEventTypes.FINISHED, processWorkQueue);
|
|
34
|
-
setTimeout(async () => {
|
|
35
|
-
await baseWorkerActions.autorescheduleTypes({
|
|
36
|
-
referenceDate: EventListenerWorker.getFloorDate(),
|
|
37
|
-
});
|
|
38
|
-
}, 300);
|
|
39
|
-
},
|
|
40
|
-
stop() {
|
|
41
|
-
/* */
|
|
42
|
-
},
|
|
43
|
-
};
|
|
44
|
-
},
|
|
45
|
-
};
|
|
46
|
-
//# sourceMappingURL=EventListenerWorker.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"EventListenerWorker.js","sourceRoot":"","sources":["../../src/worker/EventListenerWorker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAW,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,SAAS,QAAQ,CAAkC,IAAO,EAAE,IAAI;IAC9D,IAAI,OAAO,CAAC;IACZ,OAAO,CAAC,GAAG,IAAI,EAAE,EAAE;QACjB,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YACxB,OAAO,GAAG,IAAI,CAAC;YACf,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;QAChB,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC,CAAC;AACJ,CAAC;AAMD,MAAM,CAAC,MAAM,mBAAmB,GAAuC;IACrE,GAAG,UAAU;IAEb,GAAG,EAAE,sCAAsC;IAC3C,KAAK,EAAE,mFAAmF;IAC1F,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,gBAAgB;IAEtB,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,YAAY,EAAE,EAAE;QACtC,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,CAC1C,EAAE,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAE,EACzC,YAAY,CACb,CAAC;QAEF,8EAA8E;QAC9E,MAAM,gBAAgB,GAAG,QAAQ,CAAsB,KAAK,IAAI,EAAE;YAChE,MAAM,iBAAiB,CAAC,OAAO,CAAC;gBAC9B,gBAAgB,EAAE,CAAC,EAAE,+DAA+D;gBACpF,aAAa,EAAE,mBAAmB,CAAC,YAAY,EAAE;aAClD,CAAC,CAAC;QACL,CAAC,EAAE,GAAG,CAAC,CAAC;QAER,OAAO;YACL,GAAG,iBAAiB;YAEpB,KAAK;gBACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;gBACpD,SAAS,CAAC,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC;gBAEvD,UAAU,CAAC,KAAK,IAAI,EAAE;oBACpB,MAAM,iBAAiB,CAAC,mBAAmB,CAAC;wBAC1C,aAAa,EAAE,mBAAmB,CAAC,YAAY,EAAE;qBAClD,CAAC,CAAC;gBACL,CAAC,EAAE,GAAG,CAAC,CAAC;YACV,CAAC;YAED,IAAI;gBACF,KAAK;YACP,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import { WorkData } from '@unchainedshop/core-worker';
|
|
2
|
-
export interface FailedReschedulerParams {
|
|
3
|
-
retryInput?: (workData: WorkData, priorInput: Record<string, any>) => Promise<Record<string, any> | null>;
|
|
4
|
-
}
|
|
5
|
-
export type IScheduler<P> = {
|
|
6
|
-
key: string;
|
|
7
|
-
label: string;
|
|
8
|
-
version: string;
|
|
9
|
-
actions: (params: P, unchainedAPI: any) => {
|
|
10
|
-
start: () => void;
|
|
11
|
-
stop: () => void;
|
|
12
|
-
};
|
|
13
|
-
};
|
|
14
|
-
export declare const FailedRescheduler: IScheduler<FailedReschedulerParams>;
|
|
15
|
-
//# sourceMappingURL=FailedRescheduler.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"FailedRescheduler.d.ts","sourceRoot":"","sources":["../../src/worker/FailedRescheduler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,QAAQ,EAAoB,MAAM,4BAA4B,CAAC;AAE9E,MAAM,WAAW,uBAAuB;IACtC,UAAU,CAAC,EAAE,CACX,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAC5B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;CAC1C;AAED,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAEhB,OAAO,EAAE,CACP,MAAM,EAAE,CAAC,EACT,YAAY,KAAA,KACT;QACH,KAAK,EAAE,MAAM,IAAI,CAAC;QAClB,IAAI,EAAE,MAAM,IAAI,CAAC;KAClB,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,UAAU,CAAC,uBAAuB,CAsDjE,CAAC"}
|
|
@@ -1,45 +0,0 @@
|
|
|
1
|
-
import { defaultLogger } from '@unchainedshop/logger';
|
|
2
|
-
import { subscribe } from '@unchainedshop/events';
|
|
3
|
-
import { WorkerEventTypes } from '@unchainedshop/core-worker';
|
|
4
|
-
export const FailedRescheduler = {
|
|
5
|
-
key: 'shop.unchained.scheduler.failed',
|
|
6
|
-
label: 'Reschedule failed works',
|
|
7
|
-
version: '1.0.0',
|
|
8
|
-
actions: ({ retryInput }, unchainedAPI) => {
|
|
9
|
-
const handleFinishedWork = async ({ payload: work }) => {
|
|
10
|
-
if (!work.success && work.retries > 0) {
|
|
11
|
-
const now = new Date();
|
|
12
|
-
const workDelayMs = work.scheduled.getTime() - work.created.getTime();
|
|
13
|
-
// In short: Double the delay of the old work or delay for 5 seconds
|
|
14
|
-
const scheduled = workDelayMs > 1000
|
|
15
|
-
? new Date(now.getTime() + workDelayMs * 2)
|
|
16
|
-
: new Date(now.setSeconds(now.getSeconds() + 5));
|
|
17
|
-
defaultLogger.error(`${FailedRescheduler.key} -> Reschedule failed work ${work._id} ${work.type} for ${scheduled.toISOString()} (in ${Math.round(workDelayMs / 1000)}). Remaining retries: ${work.retries}`);
|
|
18
|
-
const workData = {
|
|
19
|
-
type: work.type,
|
|
20
|
-
priority: work.priority,
|
|
21
|
-
originalWorkId: work.originalWorkId || work._id,
|
|
22
|
-
retries: work.retries - 1,
|
|
23
|
-
timeout: work.timeout,
|
|
24
|
-
scheduled,
|
|
25
|
-
};
|
|
26
|
-
if (retryInput) {
|
|
27
|
-
workData.input = await retryInput(workData, work.input);
|
|
28
|
-
}
|
|
29
|
-
else {
|
|
30
|
-
workData.input = work.input;
|
|
31
|
-
}
|
|
32
|
-
unchainedAPI.modules.worker.addWork(workData);
|
|
33
|
-
}
|
|
34
|
-
};
|
|
35
|
-
return {
|
|
36
|
-
start() {
|
|
37
|
-
subscribe(WorkerEventTypes.FINISHED, handleFinishedWork);
|
|
38
|
-
},
|
|
39
|
-
stop() {
|
|
40
|
-
/* */
|
|
41
|
-
},
|
|
42
|
-
};
|
|
43
|
-
},
|
|
44
|
-
};
|
|
45
|
-
//# sourceMappingURL=FailedRescheduler.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"FailedRescheduler.js","sourceRoot":"","sources":["../../src/worker/FailedRescheduler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAkB,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAuB9E,MAAM,CAAC,MAAM,iBAAiB,GAAwC;IACpE,GAAG,EAAE,iCAAiC;IACtC,KAAK,EAAE,yBAAyB;IAChC,OAAO,EAAE,OAAO;IAEhB,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,YAAY,EAAE,EAAE;QACxC,MAAM,kBAAkB,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAqB,EAAE,EAAE;YACxE,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,GAAG,CAAC,EAAE,CAAC;gBACtC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;gBAEtE,oEAAoE;gBACpE,MAAM,SAAS,GACb,WAAW,GAAG,IAAI;oBAChB,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,WAAW,GAAG,CAAC,CAAC;oBAC3C,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;gBAErD,aAAa,CAAC,KAAK,CACjB,GAAG,iBAAiB,CAAC,GAAG,8BAA8B,IAAI,CAAC,GAAG,IAC5D,IAAI,CAAC,IACP,QAAQ,SAAS,CAAC,WAAW,EAAE,QAAQ,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,yBACnE,IAAI,CAAC,OACP,EAAE,CACH,CAAC;gBAEF,MAAM,QAAQ,GAAa;oBACzB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,cAAc,EAAE,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,GAAG;oBAC/C,OAAO,EAAE,IAAI,CAAC,OAAO,GAAG,CAAC;oBACzB,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,SAAS;iBACV,CAAC;gBAEF,IAAI,UAAU,EAAE,CAAC;oBACf,QAAQ,CAAC,KAAK,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC1D,CAAC;qBAAM,CAAC;oBACN,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;gBAC9B,CAAC;gBAED,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAChD,CAAC;QACH,CAAC,CAAC;QAEF,OAAO;YACL,KAAK;gBACH,SAAS,CAAO,gBAAgB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;YACjE,CAAC;YAED,IAAI;gBACF,KAAK;YACP,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
import { ScheduleData } from '@breejs/later';
|
|
2
|
-
import { IWorker } from './BaseWorker.js';
|
|
3
|
-
export interface IntervalWorkerParams {
|
|
4
|
-
workerId?: string;
|
|
5
|
-
batchCount?: number;
|
|
6
|
-
schedule?: ScheduleData;
|
|
7
|
-
}
|
|
8
|
-
export declare const scheduleToInterval: (schedule: ScheduleData) => number;
|
|
9
|
-
export declare const IntervalWorker: IWorker<IntervalWorkerParams>;
|
|
10
|
-
//# sourceMappingURL=IntervalWorker.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"IntervalWorker.d.ts","sourceRoot":"","sources":["../../src/worker/IntervalWorker.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAc,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAItD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,YAAY,CAAC;CACzB;AAMD,eAAO,MAAM,kBAAkB,GAAI,UAAU,YAAY,WAKxD,CAAC;AAEF,eAAO,MAAM,cAAc,EAAE,OAAO,CAAC,oBAAoB,CA+BxD,CAAC"}
|
|
@@ -1,37 +0,0 @@
|
|
|
1
|
-
import later from '@breejs/later';
|
|
2
|
-
import { BaseWorker } from './BaseWorker.js';
|
|
3
|
-
const { NODE_ENV } = process.env;
|
|
4
|
-
const defaultSchedule = later.parse.text(NODE_ENV !== 'production' ? 'every 2 seconds' : 'every 30 seconds');
|
|
5
|
-
export const scheduleToInterval = (schedule) => {
|
|
6
|
-
const referenceDate = new Date(1000);
|
|
7
|
-
const [one, two] = later.schedule(schedule).next(2, referenceDate);
|
|
8
|
-
const diff = new Date(two).getTime() - new Date(one).getTime();
|
|
9
|
-
return Math.min(1000 * 60 * 60, diff); // at least once every hour!
|
|
10
|
-
};
|
|
11
|
-
export const IntervalWorker = {
|
|
12
|
-
...BaseWorker,
|
|
13
|
-
key: 'shop.unchained.worker.cron',
|
|
14
|
-
label: 'Allocates work on fixed intervals with native node setInterval',
|
|
15
|
-
version: '1.0.0',
|
|
16
|
-
type: 'CRON',
|
|
17
|
-
actions: ({ workerId, batchCount = 0, schedule = defaultSchedule }, unchainedAPI) => {
|
|
18
|
-
const baseWorkerActions = BaseWorker.actions({ workerId, worker: IntervalWorker }, unchainedAPI);
|
|
19
|
-
const intervalDelay = scheduleToInterval(schedule);
|
|
20
|
-
let intervalHandle;
|
|
21
|
-
return {
|
|
22
|
-
...baseWorkerActions,
|
|
23
|
-
start() {
|
|
24
|
-
intervalHandle = setInterval(() => {
|
|
25
|
-
baseWorkerActions.process({
|
|
26
|
-
maxWorkItemCount: batchCount,
|
|
27
|
-
referenceDate: IntervalWorker.getFloorDate(),
|
|
28
|
-
});
|
|
29
|
-
}, intervalDelay);
|
|
30
|
-
},
|
|
31
|
-
stop() {
|
|
32
|
-
clearInterval(intervalHandle);
|
|
33
|
-
},
|
|
34
|
-
};
|
|
35
|
-
},
|
|
36
|
-
};
|
|
37
|
-
//# sourceMappingURL=IntervalWorker.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"IntervalWorker.js","sourceRoot":"","sources":["../../src/worker/IntervalWorker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAuB,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,UAAU,EAAW,MAAM,iBAAiB,CAAC;AAEtD,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAQjC,MAAM,eAAe,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CACtC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,kBAAkB,CACnE,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,QAAsB,EAAE,EAAE;IAC3D,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,aAAa,CAAW,CAAC;IAC7E,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/D,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,4BAA4B;AACrE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAkC;IAC3D,GAAG,UAAU;IAEb,GAAG,EAAE,4BAA4B;IACjC,KAAK,EAAE,gEAAgE;IACvE,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,MAAM;IAEZ,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,UAAU,GAAG,CAAC,EAAE,QAAQ,GAAG,eAAe,EAAE,EAAE,YAAY,EAAE,EAAE;QAClF,MAAM,iBAAiB,GAAG,UAAU,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,YAAY,CAAC,CAAC;QAEjG,MAAM,aAAa,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,cAA8B,CAAC;QAEnC,OAAO;YACL,GAAG,iBAAiB;YAEpB,KAAK;gBACH,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;oBAChC,iBAAiB,CAAC,OAAO,CAAC;wBACxB,gBAAgB,EAAE,UAAU;wBAC5B,aAAa,EAAE,cAAc,CAAC,YAAY,EAAE;qBAC7C,CAAC,CAAC;gBACL,CAAC,EAAE,aAAa,CAAC,CAAC;YACpB,CAAC;YAED,IAAI;gBACF,aAAa,CAAC,cAAc,CAAC,CAAC;YAChC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}
|