namirasoft-node 1.4.25 → 1.4.27
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/dist/OTPOperation.js +6 -6
- package/dist/OTPOperation.js.map +1 -1
- package/package.json +1 -1
- package/src/OTPOperation.ts +6 -7
package/dist/OTPOperation.js
CHANGED
|
@@ -26,19 +26,19 @@ class OTPOperation {
|
|
|
26
26
|
return ans;
|
|
27
27
|
}
|
|
28
28
|
static getWaitTime(x_otp_req_tried_count) {
|
|
29
|
-
let wait_time = OTPOperation.OTP_MIN_WAIT_TIME;
|
|
29
|
+
let wait_time = OTPOperation.OTP_MIN_WAIT_TIME * 60;
|
|
30
30
|
let extra_attempt = x_otp_req_tried_count - OTPOperation.OTP_REQ_MAX_TRY_COUNT;
|
|
31
31
|
if (extra_attempt >= 0)
|
|
32
|
-
wait_time = Math.min(Math.pow(OTPOperation.INCREASE_POWER_BASE, extra_attempt)
|
|
32
|
+
wait_time = Math.min(Math.pow(OTPOperation.INCREASE_POWER_BASE, extra_attempt), OTPOperation.OTP_MAX_WAIT_TIME) * 60;
|
|
33
33
|
return parseInt(wait_time + "");
|
|
34
34
|
}
|
|
35
35
|
static onSafeRequest(x_otp, x_otp_time, x_otp_req_tried_count, handler) {
|
|
36
36
|
return __awaiter(this, void 0, void 0, function* () {
|
|
37
|
-
let wait_time =
|
|
38
|
-
let wait_date = namirasoft_core_1.TimeOperation.
|
|
37
|
+
let wait_time = OTPOperation.getWaitTime(x_otp_req_tried_count);
|
|
38
|
+
let wait_date = namirasoft_core_1.TimeOperation.secondsAgo(wait_time, new Date());
|
|
39
39
|
let next_time = namirasoft_core_1.TimeOperation.diffInSecond(x_otp_time !== null && x_otp_time !== void 0 ? x_otp_time : new Date("0001-01-01"), wait_date, false);
|
|
40
40
|
if (next_time > 0) {
|
|
41
|
-
let mins = Math.
|
|
41
|
+
let mins = Math.max(1, Math.round(next_time / 60));
|
|
42
42
|
namirasoft_core_1.ErrorOperation.throwHTTP(429, 'You have sent too many request, please try again in ' + mins + ' minute' + (mins > 1 ? "s" : "") + '.');
|
|
43
43
|
}
|
|
44
44
|
let x_otp_ver_tried_count = 0;
|
|
@@ -48,7 +48,7 @@ class OTPOperation {
|
|
|
48
48
|
x_otp_time = new Date();
|
|
49
49
|
x_otp_req_tried_count += 1;
|
|
50
50
|
yield handler({ x_otp, x_otp_time, x_otp_req_tried_count, x_otp_ver_tried_count });
|
|
51
|
-
wait_time =
|
|
51
|
+
wait_time = OTPOperation.getWaitTime(x_otp_req_tried_count);
|
|
52
52
|
next_time = wait_time * 60;
|
|
53
53
|
return { next_time };
|
|
54
54
|
});
|
package/dist/OTPOperation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OTPOperation.js","sourceRoot":"","sources":["../src/OTPOperation.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAgE;AAEhE,MAAa,YAAY;IAUrB,MAAM,CAAC,QAAQ,CAAC,SAAiB,CAAC,EAAE,QAAgB,CAAC;QAEjD,IAAI,CAAC,MAAM;YACP,MAAM,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,KAAK;YACN,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,GAAG,GAAG,EAAE,CAAC;QACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE;YAC1B,GAAG,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;QACpD,IAAI,GAAG,GAAG,EAAE,CAAC;QACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE;YAC3B,GAAG,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACtE,OAAO,GAAG,CAAC;IACf,CAAC;IACD,MAAM,CAAC,WAAW,CAAC,qBAA6B;QAE5C,IAAI,SAAS,GAAG,YAAY,CAAC,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"OTPOperation.js","sourceRoot":"","sources":["../src/OTPOperation.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/OTPOperation.ts
CHANGED
|
@@ -26,23 +26,22 @@ export class OTPOperation
|
|
|
26
26
|
}
|
|
27
27
|
static getWaitTime(x_otp_req_tried_count: number): number
|
|
28
28
|
{
|
|
29
|
-
let wait_time = OTPOperation.OTP_MIN_WAIT_TIME;
|
|
29
|
+
let wait_time = OTPOperation.OTP_MIN_WAIT_TIME * 60;
|
|
30
30
|
let extra_attempt = x_otp_req_tried_count - OTPOperation.OTP_REQ_MAX_TRY_COUNT;
|
|
31
31
|
if (extra_attempt >= 0)
|
|
32
|
-
wait_time = Math.min(Math.pow(OTPOperation.INCREASE_POWER_BASE, extra_attempt)
|
|
32
|
+
wait_time = Math.min(Math.pow(OTPOperation.INCREASE_POWER_BASE, extra_attempt), OTPOperation.OTP_MAX_WAIT_TIME) * 60;
|
|
33
33
|
return parseInt(wait_time + "");
|
|
34
34
|
}
|
|
35
35
|
static async onSafeRequest(x_otp: string | null, x_otp_time: Date | null, x_otp_req_tried_count: number,
|
|
36
36
|
handler: (row: { x_otp: string, x_otp_time: Date, x_otp_req_tried_count: number, x_otp_ver_tried_count: number }) => Promise<void>)
|
|
37
37
|
{
|
|
38
38
|
// check wait time
|
|
39
|
-
let wait_time =
|
|
40
|
-
let wait_date = TimeOperation.
|
|
39
|
+
let wait_time = OTPOperation.getWaitTime(x_otp_req_tried_count);
|
|
40
|
+
let wait_date = TimeOperation.secondsAgo(wait_time, new Date());
|
|
41
41
|
let next_time = TimeOperation.diffInSecond(x_otp_time ?? new Date("0001-01-01"), wait_date, false);
|
|
42
|
-
console.log({ x_otp, x_otp_time, x_otp_req_tried_count, wait_time, wait_date, next_time })
|
|
43
42
|
if (next_time > 0)
|
|
44
43
|
{
|
|
45
|
-
let mins = Math.
|
|
44
|
+
let mins = Math.max(1, Math.round(next_time / 60));
|
|
46
45
|
ErrorOperation.throwHTTP(429, 'You have sent too many request, please try again in ' + mins + ' minute' + (mins > 1 ? "s" : "") + '.')
|
|
47
46
|
}
|
|
48
47
|
|
|
@@ -55,7 +54,7 @@ export class OTPOperation
|
|
|
55
54
|
|
|
56
55
|
await handler({ x_otp, x_otp_time, x_otp_req_tried_count, x_otp_ver_tried_count });
|
|
57
56
|
|
|
58
|
-
wait_time =
|
|
57
|
+
wait_time = OTPOperation.getWaitTime(x_otp_req_tried_count);
|
|
59
58
|
next_time = wait_time * 60;
|
|
60
59
|
return { next_time };
|
|
61
60
|
}
|