szdl-utils-kit 0.3.17 → 0.3.19
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/index.js +673 -675
- package/dist/index.umd.cjs +2 -2
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
var ge = Object.defineProperty;
|
|
2
|
-
var
|
|
3
|
-
var
|
|
2
|
+
var ye = (y, t, e) => t in y ? ge(y, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : y[t] = e;
|
|
3
|
+
var H = (y, t, e) => (ye(y, typeof t != "symbol" ? t + "" : t, e), e), Wt = (y, t, e) => {
|
|
4
4
|
if (!t.has(y))
|
|
5
5
|
throw TypeError("Cannot " + e);
|
|
6
6
|
};
|
|
7
|
-
var
|
|
7
|
+
var M = (y, t, e) => (Wt(y, t, "read from private field"), e ? e.call(y) : t.get(y)), L = (y, t, e) => {
|
|
8
8
|
if (t.has(y))
|
|
9
9
|
throw TypeError("Cannot add the same private member more than once");
|
|
10
10
|
t instanceof WeakSet ? t.add(y) : t.set(y, e);
|
|
11
11
|
}, F = (y, t, e, r) => (Wt(y, t, "write to private field"), r ? r.call(y, e) : t.set(y, e), e);
|
|
12
12
|
var _ = (y, t, e) => (Wt(y, t, "access private method"), e);
|
|
13
|
-
var
|
|
13
|
+
var pe = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
|
|
14
14
|
function Ne(y) {
|
|
15
15
|
return y && y.__esModule && Object.prototype.hasOwnProperty.call(y, "default") ? y.default : y;
|
|
16
16
|
}
|
|
@@ -30,25 +30,25 @@ var Xt = { exports: {} };
|
|
|
30
30
|
return m;
|
|
31
31
|
}, a = function(s, o) {
|
|
32
32
|
return o !== e ? (s.year(o.year() || o.year), s.month(o.month() || o.month), s.day(o.day() || o.day), s.hours(o.hours() || o.hours), s.minutes(o.minutes() || o.minutes), s.seconds(o.seconds() || o.seconds), s.milliseconds(o.milliseconds() || o.milliseconds), s) : e;
|
|
33
|
-
},
|
|
33
|
+
}, c = function(s, o) {
|
|
34
34
|
var m, g = "";
|
|
35
35
|
return m = s.slice(o, o + 1), m !== "" && !isNaN(Number(m)) && (g += "%H"), m = s.charAt(o + 2), m !== "" && m === ":" && (g += m), m = s.slice(o + 3, o + 4), m !== "" && !isNaN(Number(m)) && (g += "%M"), m = s.charAt(o + 5), m !== "" && m === ":" && (g += m), m = s.slice(o + 6, o + 7), m !== "" && !isNaN(Number(m)) && (g += "%S"), g;
|
|
36
|
-
},
|
|
36
|
+
}, l = function(s, o) {
|
|
37
37
|
var m, g = [
|
|
38
38
|
s.slice(o, o + 1),
|
|
39
39
|
s.charAt(o + 2),
|
|
40
40
|
s.slice(o + 3, o + 4),
|
|
41
41
|
s.charAt(o + 5),
|
|
42
42
|
s.slice(o + 6, o + 9)
|
|
43
|
-
],
|
|
44
|
-
return !isNaN(Number(g[0])) && !isNaN(Number(g[2])) && !isNaN(Number(g[4])) ? (g[1] === "." && g[3] === "." ? m = "%d.%m.%Y" : g[1] === "-" && g[3] === "-" ? m = "%m-%d-%Y" : g[1] === "/" && g[3] === "/" && (m = "%m/%d/%Y"), m) : (
|
|
43
|
+
], B;
|
|
44
|
+
return !isNaN(Number(g[0])) && !isNaN(Number(g[2])) && !isNaN(Number(g[4])) ? (g[1] === "." && g[3] === "." ? m = "%d.%m.%Y" : g[1] === "-" && g[3] === "-" ? m = "%m-%d-%Y" : g[1] === "/" && g[3] === "/" && (m = "%m/%d/%Y"), m) : (B = [
|
|
45
45
|
s.slice(o, o + 3),
|
|
46
46
|
s.charAt(o + 4),
|
|
47
47
|
s.slice(o + 5, o + 6),
|
|
48
48
|
s.charAt(o + 7),
|
|
49
49
|
s.slice(o + 8, o + 9)
|
|
50
|
-
], !isNaN(Number(
|
|
51
|
-
}, u = r.tempus, n, f, d = r.navigator || {},
|
|
50
|
+
], !isNaN(Number(B[0])) && !isNaN(Number(B[2])) && !isNaN(Number(B[4])) ? (B[1] === "-" && B[3] === "-" && (m = "%Y-%m-%d"), m) : "");
|
|
51
|
+
}, u = r.tempus, n, f, d = r.navigator || {}, A = "en", h = {
|
|
52
52
|
en: {
|
|
53
53
|
JANUARY_SHORT: "Jan",
|
|
54
54
|
FEBRUARY_SHORT: "Feb",
|
|
@@ -211,61 +211,61 @@ var Xt = { exports: {} };
|
|
|
211
211
|
}
|
|
212
212
|
}, O = function() {
|
|
213
213
|
return [
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
214
|
+
h[A].JANUARY_LONG,
|
|
215
|
+
h[A].FEBRUARY_LONG,
|
|
216
|
+
h[A].MARCH_LONG,
|
|
217
|
+
h[A].APRIL_LONG,
|
|
218
|
+
h[A].MAY_LONG,
|
|
219
|
+
h[A].JUNE_LONG,
|
|
220
|
+
h[A].JULY_LONG,
|
|
221
|
+
h[A].AUGUST_LONG,
|
|
222
|
+
h[A].SEPTEMBER_LONG,
|
|
223
|
+
h[A].OCTOBER_LONG,
|
|
224
|
+
h[A].NOVEMBER_LONG,
|
|
225
|
+
h[A].DECEMBER_LONG
|
|
226
226
|
];
|
|
227
227
|
}, T = function() {
|
|
228
228
|
return [
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
229
|
+
h[A].JANUARY_SHORT,
|
|
230
|
+
h[A].FEBRUARY_SHORT,
|
|
231
|
+
h[A].MARCH_SHORT,
|
|
232
|
+
h[A].APRIL_SHORT,
|
|
233
|
+
h[A].MAY_SHORT,
|
|
234
|
+
h[A].JUNE_SHORT,
|
|
235
|
+
h[A].JULY_SHORT,
|
|
236
|
+
h[A].AUGUST_SHORT,
|
|
237
|
+
h[A].SEPTEMBER_SHORT,
|
|
238
|
+
h[A].OCTOBER_SHORT,
|
|
239
|
+
h[A].NOVEMBER_SHORT,
|
|
240
|
+
h[A].DECEMBER_SHORT
|
|
241
241
|
];
|
|
242
|
-
},
|
|
242
|
+
}, R = function() {
|
|
243
243
|
return [
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
244
|
+
h[A].SUNDAY_LONG,
|
|
245
|
+
h[A].MONDAY_LONG,
|
|
246
|
+
h[A].TUESDAY_LONG,
|
|
247
|
+
h[A].WEDNESDAY_LONG,
|
|
248
|
+
h[A].THURSDAY_LONG,
|
|
249
|
+
h[A].FRIDAY_LONG,
|
|
250
|
+
h[A].SATURDAY_LONG
|
|
251
251
|
];
|
|
252
|
-
},
|
|
252
|
+
}, b = function() {
|
|
253
253
|
return [
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
254
|
+
h[A].SUNDAY_SHORT,
|
|
255
|
+
h[A].MONDAY_SHORT,
|
|
256
|
+
h[A].TUESDAY_SHORT,
|
|
257
|
+
h[A].WEDNESDAY_SHORT,
|
|
258
|
+
h[A].THURSDAY_SHORT,
|
|
259
|
+
h[A].FRIDAY_SHORT,
|
|
260
|
+
h[A].SATURDAY_SHORT
|
|
261
261
|
];
|
|
262
|
-
},
|
|
262
|
+
}, p, S, C, N, I = function(s, o, m) {
|
|
263
263
|
var g;
|
|
264
264
|
r.XMLHttpRequest ? g = new XMLHttpRequest() : g = new ActiveXObject("Microsoft.XMLHTTP"), g.onreadystatechange = function() {
|
|
265
265
|
g.readyState === 4 && (g.status === 200 ? o && (r.JSON === e ? alert(`Please, include json2 into your project if you want use old browsers!
|
|
266
266
|
https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.parse(g.responseText))) : m && m(g));
|
|
267
267
|
}, g.open("GET", s, !1), g.send();
|
|
268
|
-
},
|
|
268
|
+
}, E = {
|
|
269
269
|
"%d": {
|
|
270
270
|
format: function(s) {
|
|
271
271
|
return i(s.day() || n.MIN_DAY, 2);
|
|
@@ -316,7 +316,7 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
316
316
|
"%a": {
|
|
317
317
|
format: function(s) {
|
|
318
318
|
var o = s.dayOfWeek();
|
|
319
|
-
return
|
|
319
|
+
return N[o !== e ? o : n.MIN_DAY_OF_WEEK];
|
|
320
320
|
},
|
|
321
321
|
parse: function() {
|
|
322
322
|
return {};
|
|
@@ -328,7 +328,7 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
328
328
|
"%A": {
|
|
329
329
|
format: function(s) {
|
|
330
330
|
var o = s.dayOfWeek();
|
|
331
|
-
return
|
|
331
|
+
return C[o !== e ? o : n.MIN_DAY_OF_WEEK];
|
|
332
332
|
},
|
|
333
333
|
parse: function() {
|
|
334
334
|
return {};
|
|
@@ -340,7 +340,7 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
340
340
|
"%b": {
|
|
341
341
|
format: function(s) {
|
|
342
342
|
var o = n.options("monthFromZero") ? s.month() : s.month() - 1;
|
|
343
|
-
return
|
|
343
|
+
return S[o !== e ? o : n.MIN_MONTH];
|
|
344
344
|
},
|
|
345
345
|
parse: function(s) {
|
|
346
346
|
var o = n.monthNames().indexOf(s) + (n.options("monthFromZero") ? 0 : 1);
|
|
@@ -353,7 +353,7 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
353
353
|
"%B": {
|
|
354
354
|
format: function(s) {
|
|
355
355
|
var o = n.options("monthFromZero") ? s.month() : s.month() - 1;
|
|
356
|
-
return
|
|
356
|
+
return p[o !== e ? o : n.MIN_MONTH];
|
|
357
357
|
},
|
|
358
358
|
parse: function(s) {
|
|
359
359
|
var o = n.monthNames(!0).indexOf(s) + (n.options("monthFromZero") ? 0 : 1);
|
|
@@ -442,11 +442,11 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
442
442
|
maxLength: 10,
|
|
443
443
|
type: "string"
|
|
444
444
|
}
|
|
445
|
-
},
|
|
445
|
+
}, k = {
|
|
446
446
|
useMilliseconds: !1,
|
|
447
447
|
monthFromZero: !1
|
|
448
|
-
},
|
|
449
|
-
|
|
448
|
+
}, w;
|
|
449
|
+
w = function(s, o, m) {
|
|
450
450
|
return this._d = /* @__PURE__ */ new Date(), this._i = {
|
|
451
451
|
year: !1,
|
|
452
452
|
month: !1,
|
|
@@ -456,55 +456,55 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
456
456
|
seconds: !1,
|
|
457
457
|
milliseconds: !1
|
|
458
458
|
}, s !== e && this.set(s, o, m), this;
|
|
459
|
-
},
|
|
459
|
+
}, w.fn = w.prototype, w.fn.dayCount = function() {
|
|
460
460
|
var s = this.month(), o = n.MAX_DAY_IN_MONTHS[s - (n.options("monthFromZero") ? 0 : 1)];
|
|
461
461
|
return this.leapYear() && s === (n.options("monthFromZero") ? 1 : 2) && (o += 1), o;
|
|
462
|
-
},
|
|
462
|
+
}, w.fn.year = function(s) {
|
|
463
463
|
if (arguments.length !== 0)
|
|
464
464
|
(typeof s == "number" || typeof s == "string") && !isNaN(Number(s)) ? Number(s) >= n.MIN_YEAR && Number(s) <= n.MAX_YEAR ? (this._d.setFullYear(Number(s)), this._i.year = !1) : this._i.year = Number(s) : (this._d.setFullYear(n.MIN_YEAR), this._i.year = !1);
|
|
465
465
|
else
|
|
466
466
|
return this._i.year === !1 ? this._d.getFullYear() : this._i.year;
|
|
467
467
|
return this;
|
|
468
|
-
},
|
|
468
|
+
}, w.fn.month = function(s) {
|
|
469
469
|
if (arguments.length !== 0)
|
|
470
470
|
(typeof s == "number" || typeof s == "string") && !isNaN(Number(s)) ? Number(s) >= n.MIN_MONTH && Number(s) <= n.MAX_MONTH ? (this._d.setMonth(n.options("monthFromZero") ? Number(s) : Number(s) - 1), this._i.month = !1) : this._i.month = Number(s) : (this._d.setMonth(n.options("monthFromZero") ? n.MIN_MONTH : n.MIN_MONTH - 1), this._i.month = !1);
|
|
471
471
|
else
|
|
472
472
|
return this._i.month === !1 ? n.options("monthFromZero") ? this._d.getMonth() : this._d.getMonth() + 1 : this._i.month;
|
|
473
473
|
return this;
|
|
474
|
-
},
|
|
474
|
+
}, w.fn.day = function(s) {
|
|
475
475
|
if (arguments.length !== 0)
|
|
476
476
|
(typeof s == "number" || typeof s == "string") && !isNaN(Number(s)) ? Number(s) >= n.MIN_DAY && Number(s) <= this.dayCount() ? (this._d.setDate(Number(s)), this._i.day = !1) : this._i.day = Number(s) : (this._d.setDate(n.MIN_DAY), this._i.day = !1);
|
|
477
477
|
else
|
|
478
478
|
return this._i.day === !1 ? this._d.getDate() : this._i.day;
|
|
479
479
|
return this;
|
|
480
|
-
},
|
|
480
|
+
}, w.fn.hours = function(s) {
|
|
481
481
|
if (arguments.length !== 0)
|
|
482
482
|
(typeof s == "number" || typeof s == "string") && !isNaN(Number(s)) ? Number(s) >= n.MIN_HOURS && Number(s) <= n.MAX_HOURS ? (this._d.setHours(Number(s)), this._i.hours = !1) : this._i.hours = Number(s) : (this._d.setHours(n.MIN_HOURS), this._i.hours = !1);
|
|
483
483
|
else
|
|
484
484
|
return this._i.hours === !1 ? this._d.getHours() : this._i.hours;
|
|
485
485
|
return this;
|
|
486
|
-
},
|
|
486
|
+
}, w.fn.minutes = function(s) {
|
|
487
487
|
if (arguments.length !== 0)
|
|
488
488
|
(typeof s == "number" || typeof s == "string") && !isNaN(Number(s)) ? Number(s) >= n.MIN_MINUTES && Number(s) <= n.MAX_MINUTES ? (this._d.setMinutes(Number(s)), this._i.minutes = !1) : this._i.minutes = Number(s) : (this._d.setMinutes(n.MIN_MINUTES), this._i.minutes = !1);
|
|
489
489
|
else
|
|
490
490
|
return this._i.minutes === !1 ? this._d.getMinutes() : this._i.minutes;
|
|
491
491
|
return this;
|
|
492
|
-
},
|
|
492
|
+
}, w.fn.seconds = function(s) {
|
|
493
493
|
if (arguments.length !== 0)
|
|
494
494
|
(typeof s == "number" || typeof s == "string") && !isNaN(Number(s)) ? Number(s) >= n.MIN_SECONDS && Number(s) <= n.MAX_SECONDS ? (this._d.setSeconds(Number(s)), this._i.seconds = !1) : this._i.seconds = Number(s) : (this._d.setSeconds(n.MIN_SECONDS), this._i.seconds = !1);
|
|
495
495
|
else
|
|
496
496
|
return this._i.seconds === !1 ? this._d.getSeconds() : this._i.seconds;
|
|
497
497
|
return this;
|
|
498
|
-
},
|
|
498
|
+
}, w.fn.milliseconds = function(s) {
|
|
499
499
|
if (arguments.length !== 0)
|
|
500
500
|
(typeof s == "number" || typeof s == "string") && !isNaN(Number(s)) ? Number(s) >= n.MIN_MILLISECONDS && Number(s) <= n.MAX_MILLISECONDS ? (this._d.setMilliseconds(Number(s)), this._i.milliseconds = !1) : this._i.milliseconds = Number(s) : (this._d.setMilliseconds(n.MIN_MILLISECONDS), this._i.milliseconds = !1);
|
|
501
501
|
else
|
|
502
502
|
return this._i.milliseconds === !1 ? this._d.getMilliseconds() : this._i.milliseconds;
|
|
503
503
|
return this;
|
|
504
|
-
},
|
|
504
|
+
}, w.fn.week = function() {
|
|
505
505
|
var s = new Date(this.year(), 0, 1), o = n(this.utc()).hours(0).minutes(0).seconds(0).milliseconds(0).utc() * 1e3;
|
|
506
506
|
return Math.ceil(((o - s.getTime()) / 864e5 + s.getDay() + 1) / 7);
|
|
507
|
-
},
|
|
507
|
+
}, w.fn.set = function(s, o, m) {
|
|
508
508
|
if (this._i = {
|
|
509
509
|
year: !1,
|
|
510
510
|
month: !1,
|
|
@@ -520,9 +520,9 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
520
520
|
if (typeof s == "number")
|
|
521
521
|
return this._d = new Date(s * (n.options("useMilliseconds") ? 1 : 1e3)), this;
|
|
522
522
|
if (typeof s == "object" && (s instanceof Array ? (this.day(n.MIN_DAY), this.year(s[0]), this.month(s[1]), this.day(s[2]), this.hours(s[3]), this.minutes(s[4]), this.seconds(s[5]), this.milliseconds(s[6])) : (this.day(n.MIN_DAY), this.year(s.year), this.month(s.month), this.day(s.day), this.hours(s.hours), this.minutes(s.minutes), this.seconds(s.seconds), this.milliseconds(s.milliseconds))), typeof s == "string") {
|
|
523
|
-
var g,
|
|
523
|
+
var g, B = [], D, U, q = [], W = 0, x = 0, G, J, Y = {}, P;
|
|
524
524
|
if (s === e)
|
|
525
|
-
return
|
|
525
|
+
return D = a(this, m), D === e && (this._i = {
|
|
526
526
|
year: -1,
|
|
527
527
|
month: -1,
|
|
528
528
|
day: -1,
|
|
@@ -530,26 +530,26 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
530
530
|
minutes: -1,
|
|
531
531
|
seconds: -1,
|
|
532
532
|
milliseconds: -1
|
|
533
|
-
}),
|
|
533
|
+
}), D;
|
|
534
534
|
for (o === e && (o = n.detectFormat(s)); W < o.length; ) {
|
|
535
535
|
if (o.charAt(W) === "%") {
|
|
536
|
-
if (
|
|
537
|
-
switch (
|
|
536
|
+
if (U = o.charAt(W) + o.charAt(W + 1), E[U] !== e) {
|
|
537
|
+
switch (G = 0, J = "", E[U].type) {
|
|
538
538
|
case "number":
|
|
539
|
-
for (;
|
|
540
|
-
|
|
539
|
+
for (; G < E[U].maxLength && x + G < s.length && !isNaN(Number(s.charAt(x + G))); )
|
|
540
|
+
J += s.charAt(x + G), G += 1;
|
|
541
541
|
break;
|
|
542
542
|
case "word":
|
|
543
|
-
for (;
|
|
544
|
-
|
|
543
|
+
for (; G < E[U].maxLength && x + G < s.length && /^[\u00BF-\u1FFF\u2C00-\uD7FF\w]+$/.test(s.charAt(x + G)); )
|
|
544
|
+
J += s.charAt(x + G), G += 1;
|
|
545
545
|
break;
|
|
546
546
|
case "string":
|
|
547
|
-
for (;
|
|
548
|
-
|
|
547
|
+
for (; G < E[U].maxLength && x + G < s.length; )
|
|
548
|
+
J += s.charAt(x + G), G += 1;
|
|
549
549
|
break;
|
|
550
550
|
}
|
|
551
|
-
if (
|
|
552
|
-
return
|
|
551
|
+
if (G < E[U].minLength)
|
|
552
|
+
return D = a(this, m), D === e && (this._i = {
|
|
553
553
|
year: -1,
|
|
554
554
|
month: -1,
|
|
555
555
|
day: -1,
|
|
@@ -557,11 +557,11 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
557
557
|
minutes: -1,
|
|
558
558
|
seconds: -1,
|
|
559
559
|
milliseconds: -1
|
|
560
|
-
}),
|
|
561
|
-
|
|
560
|
+
}), D;
|
|
561
|
+
B.push(U), q.push(J), G -= 1, x += G, W += 1;
|
|
562
562
|
}
|
|
563
563
|
} else if (s.charAt(x) !== o.charAt(W))
|
|
564
|
-
return
|
|
564
|
+
return D = a(this, m), D === e && (this._i = {
|
|
565
565
|
year: -1,
|
|
566
566
|
month: -1,
|
|
567
567
|
day: -1,
|
|
@@ -569,33 +569,33 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
569
569
|
minutes: -1,
|
|
570
570
|
seconds: -1,
|
|
571
571
|
milliseconds: -1
|
|
572
|
-
}),
|
|
572
|
+
}), D;
|
|
573
573
|
W += 1, x += 1;
|
|
574
574
|
}
|
|
575
|
-
for (g in
|
|
576
|
-
|
|
577
|
-
year:
|
|
578
|
-
month:
|
|
579
|
-
day:
|
|
580
|
-
hours:
|
|
581
|
-
minutes:
|
|
582
|
-
seconds:
|
|
575
|
+
for (g in B)
|
|
576
|
+
B.hasOwnProperty(g) && E.hasOwnProperty(B[g]) && (P = E[B[g]].parse(q[g]), Y = {
|
|
577
|
+
year: P.year !== e ? P.year : Y.year,
|
|
578
|
+
month: P.month !== e ? P.month : Y.month,
|
|
579
|
+
day: P.day !== e ? P.day : Y.day,
|
|
580
|
+
hours: P.hours !== e ? P.hours : Y.hours,
|
|
581
|
+
minutes: P.minutes !== e ? P.minutes : Y.minutes,
|
|
582
|
+
seconds: P.seconds !== e ? P.seconds : Y.seconds
|
|
583
583
|
});
|
|
584
|
-
this.day(n.MIN_DAY), this.year(
|
|
584
|
+
this.day(n.MIN_DAY), this.year(Y.year), this.month(Y.month), this.day(Y.day), this.hours(Y.hours), this.minutes(Y.minutes), this.seconds(Y.seconds), this.milliseconds(Y.milliseconds);
|
|
585
585
|
}
|
|
586
586
|
return this;
|
|
587
|
-
},
|
|
587
|
+
}, w.fn.leapYear = function() {
|
|
588
588
|
var s = this.year();
|
|
589
589
|
return s % 4 === 0 ? s % 100 === 0 ? s % 400 === 0 : !0 : !1;
|
|
590
|
-
},
|
|
590
|
+
}, w.fn.timestamp = function(s) {
|
|
591
591
|
return arguments.length !== 0 ? (this._d = new Date(Number(s) * (n.options("useMilliseconds") ? 1 : 1e3) + this._d.getTimezoneOffset() * 6e4), this) : n.options("useMilliseconds") ? this._d.getTime() - this._d.getTimezoneOffset() * 6e4 : Math.floor(this._d.getTime() / 1e3) - this._d.getTimezoneOffset() * 60;
|
|
592
|
-
},
|
|
592
|
+
}, w.fn.utc = function(s) {
|
|
593
593
|
return arguments.length !== 0 ? (this._d = new Date(Number(s) * (n.options("useMilliseconds") ? 1 : 1e3)), this) : n.options("useMilliseconds") ? this._d.getTime() : Math.floor(this._d.getTime() / 1e3);
|
|
594
|
-
},
|
|
594
|
+
}, w.fn.dayOfWeek = function(s) {
|
|
595
595
|
if (s === "long")
|
|
596
|
-
return
|
|
596
|
+
return C[this._d.getDay()];
|
|
597
597
|
if (s === "short")
|
|
598
|
-
return
|
|
598
|
+
return N[this._d.getDay()];
|
|
599
599
|
if (s === e)
|
|
600
600
|
return this._d.getDay();
|
|
601
601
|
if (s === 0 || s === "Sunday")
|
|
@@ -612,7 +612,7 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
612
612
|
return this.calc({ day: (this.dayOfWeek() === 0 ? -2 : 5) - this.dayOfWeek() });
|
|
613
613
|
if (s === 6 || s === "Saturday")
|
|
614
614
|
return this.calc({ day: (this.dayOfWeek() === 0 ? -1 : 6) - this.dayOfWeek() });
|
|
615
|
-
},
|
|
615
|
+
}, w.fn.timezone = function(s) {
|
|
616
616
|
switch (s) {
|
|
617
617
|
case "hours":
|
|
618
618
|
return Math.floor(this._d.getTimezoneOffset() / 60);
|
|
@@ -621,7 +621,7 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
621
621
|
default:
|
|
622
622
|
return this._d.getTimezoneOffset() * 60;
|
|
623
623
|
}
|
|
624
|
-
},
|
|
624
|
+
}, w.fn.get = function(s) {
|
|
625
625
|
switch (s) {
|
|
626
626
|
case "Date":
|
|
627
627
|
return new Date(
|
|
@@ -670,15 +670,15 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
670
670
|
timestamp: this.timestamp()
|
|
671
671
|
};
|
|
672
672
|
}
|
|
673
|
-
},
|
|
673
|
+
}, w.fn.format = function(s) {
|
|
674
674
|
for (var o = 0, m = "", g; o < s.length; )
|
|
675
|
-
s.charAt(o) === "%" ? (g = s.charAt(o) + s.charAt(o + 1),
|
|
675
|
+
s.charAt(o) === "%" ? (g = s.charAt(o) + s.charAt(o + 1), E[g] !== e ? (m += E[g].format(this), o += 1) : m += "%") : m += s.charAt(o), o += 1;
|
|
676
676
|
return m;
|
|
677
|
-
},
|
|
677
|
+
}, w.fn.valid = function() {
|
|
678
678
|
return this._i.year === !1 && this._i.month === !1 && this._i.day === !1 && this._i.hours === !1 && this._i.minutes === !1 && this._i.seconds === !1 && this._i.milliseconds === !1;
|
|
679
|
-
},
|
|
679
|
+
}, w.fn.errors = function() {
|
|
680
680
|
return this._i;
|
|
681
|
-
},
|
|
681
|
+
}, w.fn.between = function(s, o) {
|
|
682
682
|
var m = this.timestamp(), g = s.timestamp();
|
|
683
683
|
switch (o) {
|
|
684
684
|
case "year":
|
|
@@ -696,123 +696,123 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
696
696
|
default:
|
|
697
697
|
return e;
|
|
698
698
|
}
|
|
699
|
-
},
|
|
699
|
+
}, w.fn.calc = function(s) {
|
|
700
700
|
return s.year !== e && this._d.setFullYear(this._d.getFullYear() + s.year), s.month !== e && this._d.setMonth(this._d.getMonth() + s.month), s.day !== e && this._d.setDate(this._d.getDate() + s.day), s.hours !== e && this._d.setHours(this._d.getHours() + s.hours), s.minutes !== e && this._d.setMinutes(this._d.getMinutes() + s.minutes), s.seconds !== e && this._d.setSeconds(this._d.getSeconds() + s.seconds), s.milliseconds !== e && this._d.setMilliseconds(this._d.getMilliseconds() + s.milliseconds), this;
|
|
701
701
|
}, n = function(s, o, m) {
|
|
702
|
-
return new
|
|
702
|
+
return new w(s, o, m);
|
|
703
703
|
}, n.MIN_YEAR = 1e3, n.MAX_YEAR = 3e3, n.MIN_MONTH = 1, n.MAX_MONTH = 12, n.MIN_DAY = 1, n.MAX_DAY_IN_MONTHS = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31], n.MIN_DAY_OF_WEEK = 0, n.MAX_DAY_OF_WEEK = 6, n.MIN_HOURS = 0, n.MAX_HOURS = 23, n.MIN_MINUTES = 0, n.MAX_MINUTES = 59, n.MIN_SECONDS = 0, n.MAX_SECONDS = 59, n.MIN_MILLISECONDS = 0, n.MAX_MILLISECONDS = 999, n.VERSION = "0.2.18", n.options = function(s, o) {
|
|
704
704
|
if (s === e)
|
|
705
|
-
return
|
|
706
|
-
if (
|
|
705
|
+
return k;
|
|
706
|
+
if (k.hasOwnProperty(s)) {
|
|
707
707
|
if (o === e)
|
|
708
|
-
return
|
|
709
|
-
|
|
708
|
+
return k[s];
|
|
709
|
+
k[s] = o, s === "monthFromZero" && (n.MIN_MONTH = o ? 0 : 1, n.MAX_MONTH = o ? 11 : 12);
|
|
710
710
|
}
|
|
711
711
|
return e;
|
|
712
712
|
}, n.noConflict = function() {
|
|
713
713
|
return r.tempus = u, n;
|
|
714
714
|
}, n.generate = function(s) {
|
|
715
|
-
var o, m, g,
|
|
716
|
-
if (typeof s.dateFrom != "number" && (s.dateFrom instanceof
|
|
715
|
+
var o, m, g, B, D, U, q, W;
|
|
716
|
+
if (typeof s.dateFrom != "number" && (s.dateFrom instanceof w ? o = s.dateFrom.utc() : o = n(s.dateFrom, s.formatFrom).utc()), typeof s.dateTo != "number" && (s.dateTo instanceof w ? m = s.dateTo.utc() : m = n(s.dateTo, s.formatTo !== e ? s.formatTo : s.formatFrom).utc()), typeof s.period == "number" ? D = {
|
|
717
717
|
year: 0,
|
|
718
718
|
month: 0,
|
|
719
719
|
day: 0,
|
|
720
720
|
hours: 0,
|
|
721
721
|
minutes: 0,
|
|
722
722
|
seconds: s.period
|
|
723
|
-
} : typeof s.period == "string" ?
|
|
723
|
+
} : typeof s.period == "string" ? D = {
|
|
724
724
|
year: s.period === "year" ? 1 : 0,
|
|
725
725
|
month: s.period === "month" ? 1 : 0,
|
|
726
726
|
day: s.period === "day" ? 1 : 0,
|
|
727
727
|
hours: s.period === "hours" ? 1 : 0,
|
|
728
728
|
minutes: s.period === "minutes" ? 1 : 0,
|
|
729
729
|
seconds: s.period === "seconds" ? 1 : 0
|
|
730
|
-
} : typeof s.period == "object" && (
|
|
730
|
+
} : typeof s.period == "object" && (D = {
|
|
731
731
|
year: s.period.year !== e ? s.period.year : 0,
|
|
732
732
|
month: s.period.month !== e ? s.period.month : 0,
|
|
733
733
|
day: s.period.day !== e ? s.period.day : 0,
|
|
734
734
|
hours: s.period.hours !== e ? s.period.hours : 0,
|
|
735
735
|
minutes: s.period.minutes !== e ? s.period.minutes : 0,
|
|
736
736
|
seconds: s.period.seconds !== e ? s.period.seconds : 0
|
|
737
|
-
}), s.groupBy === e ?
|
|
738
|
-
return s.asObject === !0 ? s.format !== e ?
|
|
737
|
+
}), s.groupBy === e ? U = s.asObject === !0 ? {} : [] : (U = [], U.push([]), q = n(o).get()[s.groupBy]), W = function(J, Y, P) {
|
|
738
|
+
return s.asObject === !0 ? s.format !== e ? J[n(Y).format(s.format)] = {} : J[n(Y).format("%F %H:%M:%S")] = {} : s.format !== e ? J.push(P ? null : n(Y).format(s.format)) : J.push(P ? null : n(Y)), J;
|
|
739
739
|
}, s.groupBy !== e && s.fillNulls) {
|
|
740
740
|
var x = {
|
|
741
|
-
year:
|
|
742
|
-
month:
|
|
743
|
-
day:
|
|
744
|
-
hours:
|
|
745
|
-
minutes:
|
|
746
|
-
seconds:
|
|
747
|
-
milliseconds:
|
|
741
|
+
year: D.year ? -D.year : e,
|
|
742
|
+
month: D.month ? -D.month : e,
|
|
743
|
+
day: D.day ? -D.day : e,
|
|
744
|
+
hours: D.hours ? -D.hours : e,
|
|
745
|
+
minutes: D.minutes ? -D.minutes : e,
|
|
746
|
+
seconds: D.seconds ? -D.seconds : e,
|
|
747
|
+
milliseconds: D.milliseconds ? -D.milliseconds : e
|
|
748
748
|
};
|
|
749
|
-
for (g = n(o).calc(x).utc(); n(g).get()[s.groupBy] ===
|
|
750
|
-
W(
|
|
749
|
+
for (g = n(o).calc(x).utc(); n(g).get()[s.groupBy] === q; )
|
|
750
|
+
W(U[U.length - 1], g, !0), g = n(g).calc(x).utc();
|
|
751
751
|
if (s.groupBy === "week") {
|
|
752
|
-
var
|
|
753
|
-
for (g = n(o).dayOfWeek(0).utc();
|
|
754
|
-
W(
|
|
752
|
+
var G = n(o).dayOfWeek();
|
|
753
|
+
for (g = n(o).dayOfWeek(0).utc(); U[0].length < G && g < o; )
|
|
754
|
+
W(U[U.length - 1], g, !0), g = n(g).calc(D).utc();
|
|
755
755
|
}
|
|
756
756
|
}
|
|
757
757
|
for (; o <= m; )
|
|
758
|
-
s.groupBy === e ? W(
|
|
758
|
+
s.groupBy === e ? W(U, o) : n(o).get()[s.groupBy] === q ? W(U[U.length - 1], o) : (U.push([]), W(U[U.length - 1], o), q = n(o).get()[s.groupBy]), o = n(o).calc(D).utc();
|
|
759
759
|
if (s.groupBy !== e && s.fillNulls)
|
|
760
|
-
for (
|
|
761
|
-
W(
|
|
762
|
-
return
|
|
760
|
+
for (B = n(m).calc(D).utc(); n(B).get()[s.groupBy] === q; )
|
|
761
|
+
W(U[U.length - 1], B, !0), B = n(B).calc(D).utc();
|
|
762
|
+
return U;
|
|
763
763
|
}, n.monthNames = function(s) {
|
|
764
764
|
switch (s) {
|
|
765
765
|
case "long":
|
|
766
|
-
return N;
|
|
767
|
-
default:
|
|
768
766
|
return p;
|
|
767
|
+
default:
|
|
768
|
+
return S;
|
|
769
769
|
}
|
|
770
770
|
}, n.dayNames = function(s) {
|
|
771
771
|
switch (s) {
|
|
772
772
|
case "long":
|
|
773
|
-
return
|
|
773
|
+
return C;
|
|
774
774
|
default:
|
|
775
|
-
return
|
|
775
|
+
return N;
|
|
776
776
|
}
|
|
777
777
|
}, n.lang = function(s) {
|
|
778
778
|
if (s !== e)
|
|
779
|
-
|
|
779
|
+
A = s, h[A] === e && (A = "en"), p = O(), S = T(), C = R(), N = b();
|
|
780
780
|
else
|
|
781
|
-
return
|
|
781
|
+
return A;
|
|
782
782
|
return e;
|
|
783
783
|
}, n.availableLangs = function() {
|
|
784
|
-
return Object.keys(
|
|
785
|
-
}, n.registerFormat = function(s, o, m, g,
|
|
786
|
-
|
|
784
|
+
return Object.keys(h);
|
|
785
|
+
}, n.registerFormat = function(s, o, m, g, B, D) {
|
|
786
|
+
E[s] = {
|
|
787
787
|
format: o,
|
|
788
788
|
parse: m,
|
|
789
789
|
minLength: g,
|
|
790
|
-
maxLength:
|
|
791
|
-
type:
|
|
790
|
+
maxLength: B,
|
|
791
|
+
type: D
|
|
792
792
|
};
|
|
793
793
|
}, n.unregisterFormat = function(s) {
|
|
794
|
-
delete
|
|
794
|
+
delete E[s];
|
|
795
795
|
}, n.detectFormat = function(s) {
|
|
796
796
|
var o, m, g;
|
|
797
|
-
return o =
|
|
797
|
+
return o = l(s, 0), o !== "" && (g = 10), m = s.charAt(g), (m === "T" || m === " ") && (o += m, g += 1), o += c(s, g), o;
|
|
798
798
|
}, f = {
|
|
799
|
-
TempusDate:
|
|
799
|
+
TempusDate: w
|
|
800
800
|
}, n.classes = function(s, o) {
|
|
801
801
|
if (o === e)
|
|
802
802
|
return f[s];
|
|
803
803
|
f[s] = o;
|
|
804
804
|
}, n.loadTranslations = function(s) {
|
|
805
|
-
typeof s == "object" ?
|
|
806
|
-
|
|
805
|
+
typeof s == "object" ? h = s : typeof s == "string" && I(s, function(o) {
|
|
806
|
+
h = o;
|
|
807
807
|
}, function(o) {
|
|
808
808
|
});
|
|
809
|
-
},
|
|
810
|
-
}).call(
|
|
809
|
+
}, A = (d.language || d.systemLanguage || d.userLanguage || "en").substr(0, 2).toLowerCase(), h[A] === e && (A = "en"), p = O(), S = T(), C = R(), N = b(), y.exports && (t = y.exports = n), t.tempus = n;
|
|
810
|
+
}).call(pe);
|
|
811
811
|
})(Xt, Xt.exports);
|
|
812
812
|
var Oe = Xt.exports;
|
|
813
|
-
const
|
|
814
|
-
var _t, Vt, Tt, Et,
|
|
815
|
-
const
|
|
813
|
+
const pt = /* @__PURE__ */ Ne(Oe);
|
|
814
|
+
var _t, Vt, Tt, Et, Rt, bt, at, Nt, Lt, $t, St, te, z, it, $, lt, tt, ht, It, ee, ut, Jt;
|
|
815
|
+
const j = class j {
|
|
816
816
|
constructor(t) {
|
|
817
817
|
/**
|
|
818
818
|
* Режим «прогресс по доле завершённых подкоманд» — только когда пачка похожа на
|
|
@@ -820,25 +820,25 @@ const J = class J {
|
|
|
820
820
|
* формула sum(count)/sum(total)×chunkRate (один длинный list, batchTotalCount, смешанные batch).
|
|
821
821
|
* @returns {boolean}
|
|
822
822
|
*/
|
|
823
|
-
|
|
823
|
+
L(this, _t);
|
|
824
824
|
/**
|
|
825
825
|
* Одно обновление колбэка прогресса, если снимок изменился.
|
|
826
826
|
* @returns {void}
|
|
827
827
|
*/
|
|
828
|
-
|
|
828
|
+
L(this, at);
|
|
829
829
|
/**
|
|
830
830
|
* Проверяет, изменились ли метрики прогресса относительно предыдущей отправки.
|
|
831
831
|
*
|
|
832
832
|
* @param {{percent: number, allCount: number, allTotal: number}} snapshot - Текущий снимок прогресса.
|
|
833
833
|
* @returns {boolean} `true`, если нужно отправить callback прогресса.
|
|
834
834
|
*/
|
|
835
|
-
|
|
835
|
+
L(this, Lt);
|
|
836
836
|
/**
|
|
837
837
|
* Уведомляет подписчиков о текущем состоянии лимита.
|
|
838
838
|
*
|
|
839
839
|
* @returns {void}
|
|
840
840
|
*/
|
|
841
|
-
|
|
841
|
+
L(this, St);
|
|
842
842
|
/**
|
|
843
843
|
* Включает состояние лимита, выдерживает паузу и затем выключает лимит.
|
|
844
844
|
* Используется как единый "cooldown" перед повторной отправкой chunk.
|
|
@@ -846,7 +846,7 @@ const J = class J {
|
|
|
846
846
|
* @param {number} [pauseMs=this.defaultPauseMs] - Длительность паузы; для batch по умолчанию 120 с, для `call()` — `callLimitPauseMs` (30 с).
|
|
847
847
|
* @returns {Promise<void>}
|
|
848
848
|
*/
|
|
849
|
-
|
|
849
|
+
L(this, z);
|
|
850
850
|
/**
|
|
851
851
|
* Проверяет operating-time в результате batch и ставит паузу,
|
|
852
852
|
* если сервер приблизился к лимиту выполнения.
|
|
@@ -854,7 +854,7 @@ const J = class J {
|
|
|
854
854
|
* @param {Object} result - Результат текущего batch-запроса.
|
|
855
855
|
* @returns {Promise<number>} Максимальный operating-time среди команд.
|
|
856
856
|
*/
|
|
857
|
-
|
|
857
|
+
L(this, $);
|
|
858
858
|
/**
|
|
859
859
|
* Выполняет один chunk с автоматическим повтором после лимит-паузы.
|
|
860
860
|
* Повтор запускается при ошибках QUERY_LIMIT_EXCEEDED, OPERATION_TIME_LIMIT или TIMEOUT.
|
|
@@ -863,7 +863,7 @@ const J = class J {
|
|
|
863
863
|
* @param {(result: Object) => Promise<void>} processResult - Обработчик успешного результата chunk.
|
|
864
864
|
* @returns {Promise<void>}
|
|
865
865
|
*/
|
|
866
|
-
|
|
866
|
+
L(this, tt);
|
|
867
867
|
/**
|
|
868
868
|
* Выполняет BX24.callMethod с таймаутом ожидания ответа.
|
|
869
869
|
*
|
|
@@ -871,13 +871,13 @@ const J = class J {
|
|
|
871
871
|
* @param {Object} params - Параметры REST-метода.
|
|
872
872
|
* @returns {Promise<Object|null>} Raw-result BX24 или null при таймауте/ошибке вызова.
|
|
873
873
|
*/
|
|
874
|
-
|
|
874
|
+
L(this, It);
|
|
875
875
|
/**
|
|
876
876
|
* Resets mutable runtime state before each public batch run.
|
|
877
877
|
* @param {Function} progressCall - Progress callback for current run.
|
|
878
878
|
* @returns {void}
|
|
879
879
|
*/
|
|
880
|
-
|
|
880
|
+
L(this, ut);
|
|
881
881
|
typeof t == "function" ? (this.callBatch = t, this.callMethod = null) : (this.callBatch = (t == null ? void 0 : t.callBatch) || null, this.callMethod = (t == null ? void 0 : t.callMethod) || null), this.result = {}, this.errors = {}, this.timeLimit = {
|
|
882
882
|
limit: !1,
|
|
883
883
|
date: void 0,
|
|
@@ -893,29 +893,29 @@ const J = class J {
|
|
|
893
893
|
return { percent: 0, allCount: 0, allTotal: 0 };
|
|
894
894
|
const t = this.totalBatchCommands || 0;
|
|
895
895
|
if (t > 0 && Array.isArray(this.batchCommandKeyOrder) && this.batchCommandKeyOrder.length && _(this, _t, Vt).call(this)) {
|
|
896
|
-
let
|
|
897
|
-
for (const
|
|
898
|
-
const
|
|
899
|
-
if (!
|
|
896
|
+
let l = 0;
|
|
897
|
+
for (const A of this.batchCommandKeyOrder) {
|
|
898
|
+
const h = this.progressData[A];
|
|
899
|
+
if (!h)
|
|
900
900
|
continue;
|
|
901
|
-
const O = Number(
|
|
902
|
-
O === 0 && T === 0 ?
|
|
901
|
+
const O = Number(h.total) || 0, T = Number(h.count) || 0;
|
|
902
|
+
O === 0 && T === 0 ? l += 1 : O > 0 && (l += Math.min(1, T / O));
|
|
903
903
|
}
|
|
904
|
-
const u =
|
|
904
|
+
const u = l / t * 100;
|
|
905
905
|
let n = Math.max(0, Math.min(100, Math.floor(u)));
|
|
906
|
-
const f = t, d = Math.min(t, Math.floor(
|
|
906
|
+
const f = t, d = Math.min(t, Math.floor(l));
|
|
907
907
|
return { percent: n, allCount: d, allTotal: f };
|
|
908
908
|
}
|
|
909
909
|
let e = 0, r = 0;
|
|
910
|
-
for (const
|
|
911
|
-
const { total: u, count: n } =
|
|
910
|
+
for (const l of Object.values(this.progressData)) {
|
|
911
|
+
const { total: u, count: n } = l;
|
|
912
912
|
e += u ?? 0, r += n ?? 0;
|
|
913
913
|
}
|
|
914
914
|
const i = Number(this.chunkRate) || 0;
|
|
915
915
|
let a = 0;
|
|
916
916
|
e ? a = r / e * 100 * i + this.totalProgress : r === 0 && e === 0 ? a = 100 * i + this.totalProgress : a = 100, a = Math.max(0, Math.min(a, 100));
|
|
917
|
-
let
|
|
918
|
-
return e > 0 && r >= e && (
|
|
917
|
+
let c = Math.floor(a);
|
|
918
|
+
return e > 0 && r >= e && (c = 100), { percent: c, allCount: r, allTotal: e };
|
|
919
919
|
}
|
|
920
920
|
/**
|
|
921
921
|
* Обновление данных прогресса выполнения
|
|
@@ -925,35 +925,35 @@ const J = class J {
|
|
|
925
925
|
* @param {string} params.type - Тип обработки ('count' или undefined)
|
|
926
926
|
*/
|
|
927
927
|
setProgressData({ key: t, value: e, type: r }) {
|
|
928
|
-
var
|
|
928
|
+
var h, O;
|
|
929
929
|
if (!this.progressCall)
|
|
930
930
|
return;
|
|
931
931
|
const i = this.getData(e.data()), a = Array.isArray(i) ? i.length : 0;
|
|
932
|
-
let
|
|
932
|
+
let c = a;
|
|
933
933
|
if (typeof e.total == "function") {
|
|
934
934
|
const T = e.total();
|
|
935
935
|
if (T != null && T !== "") {
|
|
936
|
-
const
|
|
937
|
-
Number.isFinite(
|
|
936
|
+
const R = Number(T);
|
|
937
|
+
Number.isFinite(R) && (c = R);
|
|
938
938
|
}
|
|
939
939
|
}
|
|
940
|
-
r === "count" && (
|
|
941
|
-
let
|
|
942
|
-
i && (
|
|
943
|
-
const u = ((
|
|
940
|
+
r === "count" && (c = a);
|
|
941
|
+
let l = 1;
|
|
942
|
+
i && (l = a), this.progressData || (this.progressData = {});
|
|
943
|
+
const u = ((h = this.progressData[t]) == null ? void 0 : h.total) ?? 0, n = ((O = this.progressData[t]) == null ? void 0 : O.count) ?? 0, f = l + n, d = Math.max(u, c ?? 0, f);
|
|
944
944
|
if (this.progressData[t] = {
|
|
945
945
|
total: d,
|
|
946
946
|
count: Math.min(f, d)
|
|
947
947
|
}, typeof document < "u" && (document == null ? void 0 : document.hidden) === !0) {
|
|
948
|
-
_(this,
|
|
948
|
+
_(this, at, Nt).call(this);
|
|
949
949
|
return;
|
|
950
950
|
}
|
|
951
|
-
_(this,
|
|
951
|
+
_(this, at, Nt).call(this), this.progressTimer || (this.progressTimer = setInterval(() => {
|
|
952
952
|
if (!this.progressCall) {
|
|
953
953
|
this.clearProgressData();
|
|
954
954
|
return;
|
|
955
955
|
}
|
|
956
|
-
_(this,
|
|
956
|
+
_(this, at, Nt).call(this);
|
|
957
957
|
const { percent: T } = this.progressPercent;
|
|
958
958
|
T >= 100 && (clearInterval(this.progressTimer), this.progressTimer = "");
|
|
959
959
|
}, this.progressDelay));
|
|
@@ -978,7 +978,7 @@ const J = class J {
|
|
|
978
978
|
* @returns {void}
|
|
979
979
|
*/
|
|
980
980
|
setTimeLimitState(t, e, r) {
|
|
981
|
-
this.timeLimit.limit = !!t, this.timeLimit.date = t ? e : void 0, t && typeof r == "number" && r > 0 ? this.timeLimit.pauseMs = r : this.timeLimit.pauseMs = void 0, _(this,
|
|
981
|
+
this.timeLimit.limit = !!t, this.timeLimit.date = t ? e : void 0, t && typeof r == "number" && r > 0 ? this.timeLimit.pauseMs = r : this.timeLimit.pauseMs = void 0, _(this, St, te).call(this);
|
|
982
982
|
}
|
|
983
983
|
/**
|
|
984
984
|
* Подписывает внешний код на изменения состояния лимита.
|
|
@@ -1011,16 +1011,16 @@ const J = class J {
|
|
|
1011
1011
|
const a = i.filter || i.FILTER;
|
|
1012
1012
|
if (!a || typeof a != "object" || Array.isArray(a))
|
|
1013
1013
|
return [{ key: t, request: e }];
|
|
1014
|
-
for (const [
|
|
1015
|
-
if (!String(
|
|
1014
|
+
for (const [c, l] of Object.entries(a))
|
|
1015
|
+
if (!String(c).trim().startsWith("!") && Array.isArray(l) && l.length > this.filterChunkSize) {
|
|
1016
1016
|
const u = [];
|
|
1017
|
-
for (let n = 0; n <
|
|
1018
|
-
const f =
|
|
1019
|
-
i.filter ? (
|
|
1017
|
+
for (let n = 0; n < l.length; n += this.filterChunkSize) {
|
|
1018
|
+
const f = l.slice(n, n + this.filterChunkSize), d = n === 0 ? t : `${t}__chunk_${Math.floor(n / this.filterChunkSize)}`, A = { ...i };
|
|
1019
|
+
i.filter ? (A.filter = { ...a }, A.filter[c] = f) : i.FILTER && (A.FILTER = { ...a }, A.FILTER[c] = f), u.push({
|
|
1020
1020
|
key: d,
|
|
1021
|
-
request: { method: r, params:
|
|
1021
|
+
request: { method: r, params: A },
|
|
1022
1022
|
originalKey: t,
|
|
1023
|
-
filterKey:
|
|
1023
|
+
filterKey: c,
|
|
1024
1024
|
chunkIndex: Math.floor(n / this.filterChunkSize)
|
|
1025
1025
|
});
|
|
1026
1026
|
}
|
|
@@ -1035,12 +1035,12 @@ const J = class J {
|
|
|
1035
1035
|
* @returns {Array} Объединенный массив результатов
|
|
1036
1036
|
*/
|
|
1037
1037
|
mergeSplitResults(t, e) {
|
|
1038
|
-
const r = [], i = String(e).replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), a = new RegExp(`^${i}(?:__chunk_\\d+)?$`),
|
|
1039
|
-
const n =
|
|
1038
|
+
const r = [], i = String(e).replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), a = new RegExp(`^${i}(?:__chunk_\\d+)?$`), c = Object.keys(t).filter((l) => a.test(l)).sort((l, u) => {
|
|
1039
|
+
const n = l.match(/__chunk_(\d+)$/), f = u.match(/__chunk_(\d+)$/);
|
|
1040
1040
|
return n ? f ? parseInt(n[1]) - parseInt(f[1]) : 1 : -1;
|
|
1041
1041
|
});
|
|
1042
|
-
for (const
|
|
1043
|
-
const u = t[
|
|
1042
|
+
for (const l of c) {
|
|
1043
|
+
const u = t[l];
|
|
1044
1044
|
Array.isArray(u) ? r.push(...u) : u && r.push(u);
|
|
1045
1045
|
}
|
|
1046
1046
|
return r;
|
|
@@ -1062,10 +1062,10 @@ const J = class J {
|
|
|
1062
1062
|
*/
|
|
1063
1063
|
callBatchWithTimeout(t, e) {
|
|
1064
1064
|
return new Promise((r, i) => {
|
|
1065
|
-
let a = !1,
|
|
1066
|
-
const
|
|
1065
|
+
let a = !1, c = null;
|
|
1066
|
+
const l = async (n) => {
|
|
1067
1067
|
if (!a) {
|
|
1068
|
-
a = !0,
|
|
1068
|
+
a = !0, c && clearTimeout(c);
|
|
1069
1069
|
try {
|
|
1070
1070
|
await Promise.resolve(e(n)), r();
|
|
1071
1071
|
} catch (f) {
|
|
@@ -1074,7 +1074,7 @@ const J = class J {
|
|
|
1074
1074
|
}
|
|
1075
1075
|
}, u = async () => {
|
|
1076
1076
|
if (!a) {
|
|
1077
|
-
a = !0,
|
|
1077
|
+
a = !0, c && clearTimeout(c), console.warn(
|
|
1078
1078
|
`Batch request timeout after ${this.requestTimeoutMs}ms. This may indicate a CORS or network error.`
|
|
1079
1079
|
);
|
|
1080
1080
|
const n = {};
|
|
@@ -1099,12 +1099,12 @@ const J = class J {
|
|
|
1099
1099
|
};
|
|
1100
1100
|
try {
|
|
1101
1101
|
this.callBatch(t, async (n) => {
|
|
1102
|
-
await
|
|
1102
|
+
await l(n);
|
|
1103
1103
|
});
|
|
1104
1104
|
} catch (n) {
|
|
1105
1105
|
a || console.error("Error calling callBatch:", n);
|
|
1106
1106
|
}
|
|
1107
|
-
|
|
1107
|
+
c = setTimeout(async () => {
|
|
1108
1108
|
a || (console.warn(
|
|
1109
1109
|
`Batch request attempt timeout after ${this.requestTimeoutMs}ms. Switching to timeout fallback result.`
|
|
1110
1110
|
), await u());
|
|
@@ -1130,19 +1130,19 @@ const J = class J {
|
|
|
1130
1130
|
* @returns {Promise<Object>}
|
|
1131
1131
|
*/
|
|
1132
1132
|
async batch(t, e, r = {}) {
|
|
1133
|
-
_(this, ut,
|
|
1134
|
-
const i = {}, a = {},
|
|
1133
|
+
_(this, ut, Jt).call(this, e);
|
|
1134
|
+
const i = {}, a = {}, c = {};
|
|
1135
1135
|
for (const [f, d] of Object.entries(t)) {
|
|
1136
|
-
const
|
|
1137
|
-
if (!
|
|
1136
|
+
const A = this.arrayChunk(d);
|
|
1137
|
+
if (!A)
|
|
1138
1138
|
continue;
|
|
1139
|
-
const
|
|
1140
|
-
if (
|
|
1141
|
-
a[f] =
|
|
1139
|
+
const h = this.splitLargeFilters(f, A);
|
|
1140
|
+
if (h.length === 1)
|
|
1141
|
+
a[f] = A;
|
|
1142
1142
|
else {
|
|
1143
|
-
|
|
1144
|
-
for (const O of
|
|
1145
|
-
a[O.key] = O.request,
|
|
1143
|
+
c[f] = [];
|
|
1144
|
+
for (const O of h)
|
|
1145
|
+
a[O.key] = O.request, c[f].push(O.key);
|
|
1146
1146
|
}
|
|
1147
1147
|
}
|
|
1148
1148
|
this.batchCommandKeyOrder = Object.keys(a), this.totalBatchCommands = this.batchCommandKeyOrder.length, this.batchCommandMethods = this.batchCommandKeyOrder.map(
|
|
@@ -1151,35 +1151,35 @@ const J = class J {
|
|
|
1151
1151
|
return String(((d = a[f]) == null ? void 0 : d.method) || "");
|
|
1152
1152
|
}
|
|
1153
1153
|
), this.chunkRate = (1 / Math.ceil(Object.keys(a).length / this.limit)).toFixed(5);
|
|
1154
|
-
let
|
|
1154
|
+
let l = {}, u = 0;
|
|
1155
1155
|
const n = Object.keys(a).length;
|
|
1156
1156
|
for (const [f, d] of Object.entries(a)) {
|
|
1157
1157
|
if (!this.canContinue)
|
|
1158
1158
|
break;
|
|
1159
|
-
if (
|
|
1160
|
-
const
|
|
1159
|
+
if (l[f] = d, Object.keys(l).length >= this.limit || u + 1 === n) {
|
|
1160
|
+
const A = u + 1 === n;
|
|
1161
1161
|
await this.batchChunk(
|
|
1162
|
-
|
|
1162
|
+
l,
|
|
1163
1163
|
void 0,
|
|
1164
|
-
!
|
|
1164
|
+
!A,
|
|
1165
1165
|
{
|
|
1166
1166
|
disablePagination: !1,
|
|
1167
1167
|
oneBatch: !!(r != null && r.oneBatch)
|
|
1168
1168
|
}
|
|
1169
|
-
), Object.entries(this.result).forEach(([
|
|
1170
|
-
i[
|
|
1169
|
+
), Object.entries(this.result).forEach(([h, O]) => {
|
|
1170
|
+
i[h] = O;
|
|
1171
1171
|
}), this.totalProgress = Math.round(
|
|
1172
1172
|
u / n * 100
|
|
1173
|
-
),
|
|
1173
|
+
), l = {};
|
|
1174
1174
|
}
|
|
1175
1175
|
u++;
|
|
1176
1176
|
}
|
|
1177
|
-
for (const [f, d] of Object.entries(
|
|
1177
|
+
for (const [f, d] of Object.entries(c))
|
|
1178
1178
|
if (d && d.length > 0) {
|
|
1179
|
-
const
|
|
1180
|
-
for (const
|
|
1181
|
-
delete i[
|
|
1182
|
-
i[f] =
|
|
1179
|
+
const A = this.mergeSplitResults(i, f);
|
|
1180
|
+
for (const h of d)
|
|
1181
|
+
delete i[h];
|
|
1182
|
+
i[f] = A;
|
|
1183
1183
|
}
|
|
1184
1184
|
return Object.entries(this.errors).length && (i.errorsList = this.errors), e && e({ percent: 100 }), Promise.resolve(i);
|
|
1185
1185
|
}
|
|
@@ -1193,7 +1193,7 @@ const J = class J {
|
|
|
1193
1193
|
* @returns {Promise<Object>} Объект с количеством элементов для каждого ключа
|
|
1194
1194
|
*/
|
|
1195
1195
|
async batchTotalCount(t, e) {
|
|
1196
|
-
_(this, ut,
|
|
1196
|
+
_(this, ut, Jt).call(this, e);
|
|
1197
1197
|
const r = {}, i = {}, a = {};
|
|
1198
1198
|
for (const [u, n] of Object.entries(t)) {
|
|
1199
1199
|
const f = this.arrayChunk(n);
|
|
@@ -1204,40 +1204,40 @@ const J = class J {
|
|
|
1204
1204
|
i[u] = f;
|
|
1205
1205
|
else {
|
|
1206
1206
|
a[u] = [];
|
|
1207
|
-
for (const
|
|
1208
|
-
i[
|
|
1207
|
+
for (const A of d)
|
|
1208
|
+
i[A.key] = A.request, a[u].push(A.key);
|
|
1209
1209
|
}
|
|
1210
1210
|
}
|
|
1211
|
-
const
|
|
1212
|
-
for (let u = 0; u <
|
|
1213
|
-
const n =
|
|
1214
|
-
for (const [d,
|
|
1211
|
+
const c = [], l = Object.entries(i);
|
|
1212
|
+
for (let u = 0; u < l.length; u += this.limit) {
|
|
1213
|
+
const n = l.slice(u, u + this.limit), f = {};
|
|
1214
|
+
for (const [d, A] of n) {
|
|
1215
1215
|
if (!this.canContinue)
|
|
1216
1216
|
break;
|
|
1217
|
-
f[d] =
|
|
1217
|
+
f[d] = A;
|
|
1218
1218
|
}
|
|
1219
|
-
Object.keys(f).length > 0 &&
|
|
1219
|
+
Object.keys(f).length > 0 && c.push(f);
|
|
1220
1220
|
}
|
|
1221
|
-
this.chunkRate = (1 /
|
|
1222
|
-
for (const [u, n] of Object.entries(
|
|
1221
|
+
this.chunkRate = (1 / c.length).toFixed(5);
|
|
1222
|
+
for (const [u, n] of Object.entries(c)) {
|
|
1223
1223
|
if (!this.canContinue)
|
|
1224
1224
|
break;
|
|
1225
|
-
this.totalProgress = Math.round(Number(u) /
|
|
1226
|
-
const f = Number(u) ===
|
|
1227
|
-
await _(this, tt,
|
|
1228
|
-
var
|
|
1229
|
-
for (const [
|
|
1225
|
+
this.totalProgress = Math.round(Number(u) / c.length * 100);
|
|
1226
|
+
const f = Number(u) === c.length - 1;
|
|
1227
|
+
await _(this, tt, ht).call(this, n, async (d) => {
|
|
1228
|
+
var A, h, O, T, R;
|
|
1229
|
+
for (const [b, p] of Object.entries(d)) {
|
|
1230
1230
|
if (!this.canContinue)
|
|
1231
1231
|
return;
|
|
1232
|
-
if (
|
|
1233
|
-
const
|
|
1234
|
-
this.errors[
|
|
1232
|
+
if (p.error()) {
|
|
1233
|
+
const E = (h = (A = p.error()) == null ? void 0 : A.ex) == null ? void 0 : h.error, k = (T = (O = p.error()) == null ? void 0 : O.ex) == null ? void 0 : T.error_description;
|
|
1234
|
+
this.errors[b] = E && E.trim() || k && k.trim() || ((R = p.error()) == null ? void 0 : R.toString()) || "Неизвестная ошибка", r[b] = 0;
|
|
1235
1235
|
continue;
|
|
1236
1236
|
}
|
|
1237
|
-
const
|
|
1238
|
-
r[
|
|
1237
|
+
const S = this.getData(p.data()), C = Array.isArray(S) ? S.length : 0, I = typeof p.total == "function" && p.total() !== void 0 ? p.total() : C;
|
|
1238
|
+
r[b] = I, this.setProgressData({ key: b, value: p, type: "count" });
|
|
1239
1239
|
}
|
|
1240
|
-
await _(this, $,
|
|
1240
|
+
await _(this, $, lt).call(this, d, !f);
|
|
1241
1241
|
});
|
|
1242
1242
|
}
|
|
1243
1243
|
for (const [u, n] of Object.entries(a))
|
|
@@ -1257,24 +1257,24 @@ const J = class J {
|
|
|
1257
1257
|
* @returns {Promise<{success: boolean, data: any, answer: Object, error: string|null}>}
|
|
1258
1258
|
*/
|
|
1259
1259
|
async call({ method: t, params: e = {} }) {
|
|
1260
|
-
var r, i, a,
|
|
1260
|
+
var r, i, a, c, l, u, n;
|
|
1261
1261
|
for (; ; ) {
|
|
1262
|
-
const f = await _(this,
|
|
1262
|
+
const f = await _(this, It, ee).call(this, t, e);
|
|
1263
1263
|
if (!f) {
|
|
1264
|
-
await _(this,
|
|
1264
|
+
await _(this, z, it).call(this, this.callLimitPauseMs);
|
|
1265
1265
|
continue;
|
|
1266
1266
|
}
|
|
1267
1267
|
const d = {};
|
|
1268
1268
|
if (f != null && f.answer)
|
|
1269
|
-
for (const [
|
|
1270
|
-
|
|
1269
|
+
for (const [h, O] of Object.entries(f.answer))
|
|
1270
|
+
h !== "result" && O && (d[h] = O);
|
|
1271
1271
|
if (f.error()) {
|
|
1272
|
-
const
|
|
1273
|
-
if (["QUERY_LIMIT_EXCEEDED", "OPERATION_TIME_LIMIT", "TIMEOUT"].includes(
|
|
1274
|
-
await _(this,
|
|
1272
|
+
const h = ((i = (r = f.error()) == null ? void 0 : r.ex) == null ? void 0 : i.error) ?? "";
|
|
1273
|
+
if (["QUERY_LIMIT_EXCEEDED", "OPERATION_TIME_LIMIT", "TIMEOUT"].includes(h)) {
|
|
1274
|
+
await _(this, z, it).call(this, this.callLimitPauseMs);
|
|
1275
1275
|
continue;
|
|
1276
1276
|
}
|
|
1277
|
-
const O = ((a = f.error()) == null ? void 0 : a.toString()) || ((
|
|
1277
|
+
const O = ((a = f.error()) == null ? void 0 : a.toString()) || ((l = (c = f.error()) == null ? void 0 : c.ex) == null ? void 0 : l.error_description) || ((n = (u = f.error()) == null ? void 0 : u.ex) == null ? void 0 : n.error) || "Неизвестная ошибка";
|
|
1278
1278
|
return {
|
|
1279
1279
|
success: !1,
|
|
1280
1280
|
data: !1,
|
|
@@ -1282,10 +1282,10 @@ const J = class J {
|
|
|
1282
1282
|
error: O
|
|
1283
1283
|
};
|
|
1284
1284
|
}
|
|
1285
|
-
let
|
|
1286
|
-
return
|
|
1285
|
+
let A = f.data();
|
|
1286
|
+
return A != null && A.items && (A = A.items), {
|
|
1287
1287
|
success: !0,
|
|
1288
|
-
data:
|
|
1288
|
+
data: A,
|
|
1289
1289
|
answer: d,
|
|
1290
1290
|
error: null
|
|
1291
1291
|
};
|
|
@@ -1306,8 +1306,8 @@ const J = class J {
|
|
|
1306
1306
|
else {
|
|
1307
1307
|
e === "entity.item.get" ? (r.SORT || (r.SORT = { ID: "ASC" }), Array.isArray(r.select) ? r.select.includes("ID") || r.select.push("ID") : r.select = ["ID"]) : e === "tasks.task.list" ? (r.order || (r.order = {}), r.order.ID = "asc") : e === "user.get" ? (r.sort || (r.sort = "ID"), r.order || (r.order = "ASC")) : r.order = { ID: "ASC", id: "ASC" }, Array.isArray(r.select) && !r.select.includes("ID") && r.select.push("ID");
|
|
1308
1308
|
const i = e === "user.get" || e === "entity.item.get" ? r.FILTER : r.filter;
|
|
1309
|
-
typeof i == "object" && i !== null && !Array.isArray(i) && Object.entries(i).forEach(([a,
|
|
1310
|
-
(r.start === void 0 || r.start !== -1) && ["id", "ID"].includes(a) && (typeof
|
|
1309
|
+
typeof i == "object" && i !== null && !Array.isArray(i) && Object.entries(i).forEach(([a, c]) => {
|
|
1310
|
+
(r.start === void 0 || r.start !== -1) && ["id", "ID"].includes(a) && (typeof c == "string" || Array.isArray(c) && c.length <= 50) && (r.start = -1);
|
|
1311
1311
|
});
|
|
1312
1312
|
}
|
|
1313
1313
|
e === "crm.type.list" && r.order && delete r.order.ID;
|
|
@@ -1317,8 +1317,8 @@ const J = class J {
|
|
|
1317
1317
|
r = [{ ID: "ASC" }, [""], [""], ["ID"]];
|
|
1318
1318
|
else {
|
|
1319
1319
|
Array.isArray(r[0]) && (r[0] = {});
|
|
1320
|
-
const [i, a,
|
|
1321
|
-
i.ID = "ASC",
|
|
1320
|
+
const [i, a, c, l] = r;
|
|
1321
|
+
i.ID = "ASC", l[0] !== "" && l.includes("ID") || l.push("ID");
|
|
1322
1322
|
}
|
|
1323
1323
|
return { method: e, params: r };
|
|
1324
1324
|
}
|
|
@@ -1330,42 +1330,42 @@ const J = class J {
|
|
|
1330
1330
|
*/
|
|
1331
1331
|
async batchChunk(t, e, r = !0, i = {}) {
|
|
1332
1332
|
return new Promise((a) => {
|
|
1333
|
-
const
|
|
1334
|
-
let
|
|
1333
|
+
const c = [];
|
|
1334
|
+
let l;
|
|
1335
1335
|
const u = !!(i != null && i.disablePagination);
|
|
1336
1336
|
(async () => {
|
|
1337
|
-
await _(this, tt,
|
|
1338
|
-
var
|
|
1339
|
-
for (const [
|
|
1337
|
+
await _(this, tt, ht).call(this, t, async (f) => {
|
|
1338
|
+
var A, h, O, T, R;
|
|
1339
|
+
for (const [b, p] of Object.entries(f)) {
|
|
1340
1340
|
if (!this.canContinue)
|
|
1341
1341
|
return;
|
|
1342
|
-
if (
|
|
1343
|
-
const g = (
|
|
1344
|
-
this.errors[
|
|
1342
|
+
if (p.error()) {
|
|
1343
|
+
const g = (h = (A = p.error()) == null ? void 0 : A.ex) == null ? void 0 : h.error, B = (T = (O = p.error()) == null ? void 0 : O.ex) == null ? void 0 : T.error_description;
|
|
1344
|
+
this.errors[b] = g && g.trim() || B && B.trim() || ((R = p.error()) == null ? void 0 : R.toString()) || "Неизвестная ошибка", l = !0;
|
|
1345
1345
|
}
|
|
1346
|
-
const
|
|
1347
|
-
e === "count" ? this.result[
|
|
1348
|
-
const
|
|
1346
|
+
const S = this.getData(p.data()), C = Array.isArray(S) ? S.length : 0, N = typeof p.total == "function" && p.total() !== void 0, I = N ? p.total() : C;
|
|
1347
|
+
e === "count" ? this.result[b] ? this.result[b] += C : this.result[b] = I : this.result[b] = S, this.setProgressData({ key: b, value: p, type: e });
|
|
1348
|
+
const E = t[b], k = Array.isArray(E) ? E[0] : E == null ? void 0 : E.method, w = typeof k == "string" && (k.includes(".list") || k === "user.get" || k === "entity.item.get"), s = e === "count" ? !N && C === this.limit : w ? C === this.limit : I > this.limit && I > C, o = e !== "count" && k === "entity.item.get" && C === this.limit && !s, m = s || o;
|
|
1349
1349
|
if (!u && (!this.canContinue || m)) {
|
|
1350
|
-
let g = t[
|
|
1350
|
+
let g = t[b];
|
|
1351
1351
|
if (Array.isArray(g)) {
|
|
1352
|
-
const [
|
|
1353
|
-
g = [
|
|
1352
|
+
const [B, D = {}] = g;
|
|
1353
|
+
g = [B, D];
|
|
1354
1354
|
} else {
|
|
1355
|
-
const { method:
|
|
1356
|
-
g = [
|
|
1355
|
+
const { method: B, params: D = {} } = g;
|
|
1356
|
+
g = [B, D];
|
|
1357
1357
|
}
|
|
1358
|
-
|
|
1359
|
-
|
|
1358
|
+
c.push([
|
|
1359
|
+
b,
|
|
1360
1360
|
g,
|
|
1361
|
-
|
|
1361
|
+
I,
|
|
1362
1362
|
{ entityItemGetScan: o }
|
|
1363
1363
|
]);
|
|
1364
1364
|
}
|
|
1365
1365
|
}
|
|
1366
|
-
|
|
1367
|
-
const d =
|
|
1368
|
-
await _(this, $,
|
|
1366
|
+
l > 0 && this.errorLogger();
|
|
1367
|
+
const d = c.length > 0 || r;
|
|
1368
|
+
await _(this, $, lt).call(this, f, d), c.length ? await this.batchPayload(c, e, i).then(
|
|
1369
1369
|
() => a(this.result)
|
|
1370
1370
|
) : a(this.result);
|
|
1371
1371
|
});
|
|
@@ -1378,99 +1378,99 @@ const J = class J {
|
|
|
1378
1378
|
* @param {{oneBatch?: boolean}} [options] - Опции выполнения payload.
|
|
1379
1379
|
*/
|
|
1380
1380
|
async batchPayload(t, e, r = {}) {
|
|
1381
|
-
const i = !!(r != null && r.oneBatch), a = (O, T,
|
|
1382
|
-
let
|
|
1383
|
-
this.result[O][this.result[O].length - 1].ID || (
|
|
1384
|
-
let
|
|
1385
|
-
if (JSON.stringify(
|
|
1381
|
+
const i = !!(r != null && r.oneBatch), a = (O, T, R, b) => {
|
|
1382
|
+
let p = "ID";
|
|
1383
|
+
this.result[O][this.result[O].length - 1].ID || (p = "id");
|
|
1384
|
+
let S = `${p}`;
|
|
1385
|
+
if (JSON.stringify(b[1]).toLocaleLowerCase().includes('"id":"desc"') ? S = "<" + S : S = ">" + S, T === 1 || R.length === 0)
|
|
1386
1386
|
return {
|
|
1387
|
-
field:
|
|
1388
|
-
id: this.result[O][this.result[O].length - 1][
|
|
1387
|
+
field: S,
|
|
1388
|
+
id: this.result[O][this.result[O].length - 1][p]
|
|
1389
1389
|
};
|
|
1390
|
-
let
|
|
1391
|
-
const [
|
|
1392
|
-
return (
|
|
1393
|
-
field:
|
|
1394
|
-
id: `$result[${[O, T - 1].join("__")}]${
|
|
1390
|
+
let N = "";
|
|
1391
|
+
const [I, E] = b;
|
|
1392
|
+
return (I === "tasks.task.list" || I === "task.item.list") && (N = "[tasks]"), ["crm.item.list", "crm.stagehistory.list"].includes(I) && (N = "[items]"), I === "crm.type.list" && (N = "[types]"), I === "socialnetwork.api.workgroup.list" && (N = "[workgroups]"), {
|
|
1393
|
+
field: S,
|
|
1394
|
+
id: `$result[${[O, T - 1].join("__")}]${N}[49][${p}]`
|
|
1395
1395
|
};
|
|
1396
|
-
},
|
|
1397
|
-
const [
|
|
1398
|
-
let
|
|
1399
|
-
if (
|
|
1400
|
-
|
|
1401
|
-
const [
|
|
1402
|
-
return
|
|
1396
|
+
}, c = (O, T) => {
|
|
1397
|
+
const [R, b] = O;
|
|
1398
|
+
let p = JSON.parse(JSON.stringify(b)), S;
|
|
1399
|
+
if (R === "task.item.list") {
|
|
1400
|
+
p = [...p];
|
|
1401
|
+
const [C, N, I, E] = p;
|
|
1402
|
+
return N[T.field] = T.id, [R, p];
|
|
1403
1403
|
}
|
|
1404
|
-
return ["user.get"].includes(
|
|
1404
|
+
return ["user.get"].includes(R) || p.FILTER ? (p.FILTER || (p.FILTER = {}), S = p.FILTER) : (p.filter || (p.filter = {}), S = p.filter), [
|
|
1405
1405
|
"socialnetwork.api.workgroup.list",
|
|
1406
1406
|
"tasks.task.list"
|
|
1407
|
-
].includes(
|
|
1408
|
-
},
|
|
1409
|
-
Object.entries(O).forEach(([T,
|
|
1410
|
-
var
|
|
1411
|
-
const [
|
|
1412
|
-
if (Array.isArray(
|
|
1413
|
-
const
|
|
1414
|
-
this.errors[
|
|
1407
|
+
].includes(R) ? S[">ID"] = T.id : S[T.field] = T.id, [R, { ...p, start: -1 }];
|
|
1408
|
+
}, l = (O) => {
|
|
1409
|
+
Object.entries(O).forEach(([T, R]) => {
|
|
1410
|
+
var S, C, N, I, E;
|
|
1411
|
+
const [b] = T.split("__"), p = this.getData(R.data());
|
|
1412
|
+
if (Array.isArray(p) && (e === "count" ? this.result[b] += p.length : this.result[b].push(...p)), R.error()) {
|
|
1413
|
+
const k = (C = (S = R.error()) == null ? void 0 : S.ex) == null ? void 0 : C.error, w = (I = (N = R.error()) == null ? void 0 : N.ex) == null ? void 0 : I.error_description;
|
|
1414
|
+
this.errors[b] = k && k.trim() || w && w.trim() || ((E = R.error()) == null ? void 0 : E.toString()) || "Неизвестная ошибка";
|
|
1415
1415
|
}
|
|
1416
|
-
this.setProgressData({ key:
|
|
1416
|
+
this.setProgressData({ key: b, value: R, type: e });
|
|
1417
1417
|
});
|
|
1418
1418
|
}, u = (O, T) => {
|
|
1419
1419
|
if (!Array.isArray(O) || O.length === 0)
|
|
1420
1420
|
return null;
|
|
1421
|
-
const
|
|
1422
|
-
let
|
|
1423
|
-
|
|
1424
|
-
let
|
|
1425
|
-
return JSON.stringify(T[1]).toLocaleLowerCase().includes('"id":"desc"') ?
|
|
1421
|
+
const R = O[O.length - 1];
|
|
1422
|
+
let b = "ID";
|
|
1423
|
+
R.ID || (b = "id");
|
|
1424
|
+
let p = b;
|
|
1425
|
+
return JSON.stringify(T[1]).toLocaleLowerCase().includes('"id":"desc"') ? p = "<" + p : p = ">" + p, { field: p, id: R[b] };
|
|
1426
1426
|
}, n = 1e4, f = async (O, T) => {
|
|
1427
|
-
var
|
|
1428
|
-
let
|
|
1429
|
-
for (let
|
|
1430
|
-
const
|
|
1431
|
-
if (!
|
|
1427
|
+
var b, p;
|
|
1428
|
+
let R = this.limit;
|
|
1429
|
+
for (let S = 1; this.canContinue && R === this.limit && S <= n; S++) {
|
|
1430
|
+
const C = this.result[O], N = u(C, T);
|
|
1431
|
+
if (!N)
|
|
1432
1432
|
break;
|
|
1433
|
-
const
|
|
1434
|
-
let
|
|
1435
|
-
await _(this, tt,
|
|
1436
|
-
|
|
1433
|
+
const I = `${O}__eiscan_${S}`, E = c(T, N);
|
|
1434
|
+
let k = null;
|
|
1435
|
+
await _(this, tt, ht).call(this, { [I]: E }, async (m) => {
|
|
1436
|
+
k = m, l(m);
|
|
1437
1437
|
});
|
|
1438
|
-
const
|
|
1439
|
-
await _(this, $,
|
|
1440
|
-
const s =
|
|
1441
|
-
if ((
|
|
1442
|
-
|
|
1438
|
+
const w = S < n;
|
|
1439
|
+
await _(this, $, lt).call(this, k, w), await this.delay();
|
|
1440
|
+
const s = k == null ? void 0 : k[I];
|
|
1441
|
+
if ((b = s == null ? void 0 : s.error) != null && b.call(s)) {
|
|
1442
|
+
R = 0;
|
|
1443
1443
|
break;
|
|
1444
1444
|
}
|
|
1445
|
-
const o = this.getData((
|
|
1446
|
-
|
|
1445
|
+
const o = this.getData((p = s == null ? void 0 : s.data) == null ? void 0 : p.call(s));
|
|
1446
|
+
R = Array.isArray(o) ? o.length : 0;
|
|
1447
1447
|
}
|
|
1448
1448
|
};
|
|
1449
|
-
let d = [],
|
|
1450
|
-
const
|
|
1451
|
-
|
|
1452
|
-
}),
|
|
1449
|
+
let d = [], A = 0;
|
|
1450
|
+
const h = async (O = !0) => d.length ? (await _(this, tt, ht).call(this, Object.fromEntries(d), async (T) => {
|
|
1451
|
+
l(T), await _(this, $, lt).call(this, T, O);
|
|
1452
|
+
}), A++, d = [], i && A >= 1 ? !0 : (await this.delay(), !1)) : !1;
|
|
1453
1453
|
for await (const O of t) {
|
|
1454
1454
|
if (!this.canContinue)
|
|
1455
1455
|
return;
|
|
1456
|
-
const [T,
|
|
1457
|
-
if (
|
|
1458
|
-
if (await
|
|
1456
|
+
const [T, R, b, p = {}] = O;
|
|
1457
|
+
if (p.entityItemGetScan) {
|
|
1458
|
+
if (await h(!0))
|
|
1459
1459
|
return;
|
|
1460
1460
|
if (i)
|
|
1461
1461
|
continue;
|
|
1462
|
-
await f(T,
|
|
1462
|
+
await f(T, R);
|
|
1463
1463
|
continue;
|
|
1464
1464
|
}
|
|
1465
|
-
let
|
|
1466
|
-
for (;
|
|
1467
|
-
const
|
|
1468
|
-
if (d.push([
|
|
1465
|
+
let S = 1;
|
|
1466
|
+
for (; b > S * this.limit; ) {
|
|
1467
|
+
const C = [T, S].join("__"), N = a(T, S, d, R);
|
|
1468
|
+
if (d.push([C, c(R, N)]), i && d.length === 49 && await h(!0) || d.length % 50 === 0 && await h(!0))
|
|
1469
1469
|
return;
|
|
1470
|
-
|
|
1470
|
+
S++;
|
|
1471
1471
|
}
|
|
1472
1472
|
}
|
|
1473
|
-
await
|
|
1473
|
+
await h(!1);
|
|
1474
1474
|
}
|
|
1475
1475
|
/**
|
|
1476
1476
|
* Вывод ошибок в консоль в группированном виде
|
|
@@ -1483,27 +1483,27 @@ const J = class J {
|
|
|
1483
1483
|
};
|
|
1484
1484
|
_t = new WeakSet(), Vt = function() {
|
|
1485
1485
|
const t = this.totalBatchCommands || 0, e = this.batchCommandMethods;
|
|
1486
|
-
if (t <
|
|
1486
|
+
if (t < M(j, Tt) || !Array.isArray(e) || e.length !== t)
|
|
1487
1487
|
return !1;
|
|
1488
|
-
if (e.filter((a) => a === "crm.deal.list").length >=
|
|
1488
|
+
if (e.filter((a) => a === "crm.deal.list").length >= M(j, Et))
|
|
1489
1489
|
return !0;
|
|
1490
1490
|
const i = e.filter(
|
|
1491
1491
|
(a) => typeof a == "string" && a.includes(".list")
|
|
1492
1492
|
).length;
|
|
1493
|
-
return i >=
|
|
1494
|
-
}, Tt = new WeakMap(), Et = new WeakMap(),
|
|
1493
|
+
return i >= M(j, Rt) && i / t >= M(j, bt);
|
|
1494
|
+
}, Tt = new WeakMap(), Et = new WeakMap(), Rt = new WeakMap(), bt = new WeakMap(), at = new WeakSet(), Nt = function() {
|
|
1495
1495
|
if (!this.progressCall || !this.progressData)
|
|
1496
1496
|
return;
|
|
1497
1497
|
const { percent: t, allCount: e, allTotal: r } = this.progressPercent, i = { percent: t, allCount: e, allTotal: r };
|
|
1498
|
-
_(this,
|
|
1498
|
+
_(this, Lt, $t).call(this, i) && (this.progressCall({
|
|
1499
1499
|
data: this.progressData,
|
|
1500
1500
|
percent: t,
|
|
1501
1501
|
allCount: e,
|
|
1502
1502
|
allTotal: r
|
|
1503
1503
|
}), this.lastProgressSnapshot = i);
|
|
1504
|
-
},
|
|
1504
|
+
}, Lt = new WeakSet(), $t = function(t) {
|
|
1505
1505
|
return this.lastProgressSnapshot ? this.lastProgressSnapshot.percent !== t.percent || this.lastProgressSnapshot.allCount !== t.allCount || this.lastProgressSnapshot.allTotal !== t.allTotal : !0;
|
|
1506
|
-
},
|
|
1506
|
+
}, St = new WeakSet(), te = function() {
|
|
1507
1507
|
const t = {
|
|
1508
1508
|
limit: this.timeLimit.limit,
|
|
1509
1509
|
date: this.timeLimit.date,
|
|
@@ -1515,9 +1515,9 @@ _t = new WeakSet(), Vt = function() {
|
|
|
1515
1515
|
} catch (r) {
|
|
1516
1516
|
console.warn("Batch timeLimit listener error:", r);
|
|
1517
1517
|
}
|
|
1518
|
-
},
|
|
1518
|
+
}, z = new WeakSet(), it = async function(t = this.defaultPauseMs) {
|
|
1519
1519
|
this.setTimeLimitState(!0, (/* @__PURE__ */ new Date()).toISOString(), t), await new Promise((e) => setTimeout(e, t)), this.setTimeLimitState(!1, void 0);
|
|
1520
|
-
}, $ = new WeakSet(),
|
|
1520
|
+
}, $ = new WeakSet(), lt = async function(t, e = !0) {
|
|
1521
1521
|
if (!e)
|
|
1522
1522
|
return 0;
|
|
1523
1523
|
let r = 0;
|
|
@@ -1532,43 +1532,43 @@ _t = new WeakSet(), Vt = function() {
|
|
|
1532
1532
|
}
|
|
1533
1533
|
} catch {
|
|
1534
1534
|
}
|
|
1535
|
-
r >= this.operatingThreshold && await _(this,
|
|
1536
|
-
}, tt = new WeakSet(),
|
|
1535
|
+
r >= this.operatingThreshold && await _(this, z, it).call(this);
|
|
1536
|
+
}, tt = new WeakSet(), ht = async function(t, e) {
|
|
1537
1537
|
let r = !1, i = t;
|
|
1538
1538
|
do
|
|
1539
1539
|
r = !1, await this.callBatchWithTimeout(i, async (a) => {
|
|
1540
1540
|
var u, n;
|
|
1541
|
-
let
|
|
1542
|
-
const
|
|
1541
|
+
let c = !1;
|
|
1542
|
+
const l = /* @__PURE__ */ new Set();
|
|
1543
1543
|
for (const [f, d] of Object.entries(a || {})) {
|
|
1544
1544
|
if (!(d != null && d.error) || !d.error())
|
|
1545
1545
|
continue;
|
|
1546
|
-
const
|
|
1547
|
-
if (
|
|
1548
|
-
|
|
1546
|
+
const A = ((n = (u = d.error()) == null ? void 0 : u.ex) == null ? void 0 : n.error) ?? "";
|
|
1547
|
+
if (A === "TIMEOUT") {
|
|
1548
|
+
c = !0;
|
|
1549
1549
|
break;
|
|
1550
1550
|
}
|
|
1551
|
-
["QUERY_LIMIT_EXCEEDED", "OPERATION_TIME_LIMIT"].includes(
|
|
1551
|
+
["QUERY_LIMIT_EXCEEDED", "OPERATION_TIME_LIMIT"].includes(A) && l.add(f);
|
|
1552
1552
|
}
|
|
1553
|
-
if (
|
|
1554
|
-
r = !0, await _(this,
|
|
1553
|
+
if (c) {
|
|
1554
|
+
r = !0, await _(this, z, it).call(this);
|
|
1555
1555
|
return;
|
|
1556
1556
|
}
|
|
1557
|
-
if (
|
|
1557
|
+
if (l.size > 0) {
|
|
1558
1558
|
const f = {};
|
|
1559
|
-
for (const [
|
|
1560
|
-
|
|
1559
|
+
for (const [A, h] of Object.entries(a || {}))
|
|
1560
|
+
l.has(A) || (f[A] = h);
|
|
1561
1561
|
Object.keys(f).length && await e(f);
|
|
1562
1562
|
const d = {};
|
|
1563
|
-
for (const
|
|
1564
|
-
i[
|
|
1565
|
-
i = d, Object.keys(i).length && (r = !0, await _(this,
|
|
1563
|
+
for (const A of l)
|
|
1564
|
+
i[A] && (d[A] = i[A]);
|
|
1565
|
+
i = d, Object.keys(i).length && (r = !0, await _(this, z, it).call(this));
|
|
1566
1566
|
return;
|
|
1567
1567
|
}
|
|
1568
1568
|
await e(a);
|
|
1569
1569
|
});
|
|
1570
1570
|
while (r);
|
|
1571
|
-
},
|
|
1571
|
+
}, It = new WeakSet(), ee = function(t, e) {
|
|
1572
1572
|
return new Promise((r) => {
|
|
1573
1573
|
if (typeof this.callMethod != "function") {
|
|
1574
1574
|
r(null);
|
|
@@ -1579,24 +1579,24 @@ _t = new WeakSet(), Vt = function() {
|
|
|
1579
1579
|
i || (i = !0, r(null));
|
|
1580
1580
|
}, this.requestTimeoutMs);
|
|
1581
1581
|
try {
|
|
1582
|
-
this.callMethod(t, e, (
|
|
1583
|
-
i || (i = !0, clearTimeout(a), r(
|
|
1582
|
+
this.callMethod(t, e, (c) => {
|
|
1583
|
+
i || (i = !0, clearTimeout(a), r(c));
|
|
1584
1584
|
});
|
|
1585
1585
|
} catch {
|
|
1586
1586
|
i || (i = !0, clearTimeout(a), r(null));
|
|
1587
1587
|
}
|
|
1588
1588
|
});
|
|
1589
|
-
}, ut = new WeakSet(),
|
|
1589
|
+
}, ut = new WeakSet(), Jt = function(t) {
|
|
1590
1590
|
this.clearProgressData(), this.progressCall = typeof t == "function" ? t : "", this.canContinue = !0, this.result = {}, this.errors = {}, this.chunkRate = 1, this.totalProgress = 0, this.batchCommandKeyOrder = [], this.totalBatchCommands = 0, this.batchCommandMethods = [], this.setTimeLimitState(!1, void 0);
|
|
1591
1591
|
}, /** Не включать вес по командам для совсем маленьких batch. */
|
|
1592
|
-
|
|
1593
|
-
|
|
1594
|
-
|
|
1595
|
-
let v =
|
|
1592
|
+
L(j, Tt, 5), /** Явный сигнал: много отдельных выборок сделок по фильтрам. */
|
|
1593
|
+
L(j, Et, 5), /** Достаточно «list»-методов в пачке и доля list от всех команд. */
|
|
1594
|
+
L(j, Rt, 8), L(j, bt, 0.65);
|
|
1595
|
+
let v = j;
|
|
1596
1596
|
var et;
|
|
1597
1597
|
class se {
|
|
1598
1598
|
constructor() {
|
|
1599
|
-
|
|
1599
|
+
L(this, et, {});
|
|
1600
1600
|
}
|
|
1601
1601
|
/**
|
|
1602
1602
|
* Получить случайный хеш-код длиной 8 символов
|
|
@@ -1625,7 +1625,7 @@ class se {
|
|
|
1625
1625
|
* @param {Function} params.action - Функция для выполнения
|
|
1626
1626
|
*/
|
|
1627
1627
|
actionFilter({ keyTimer: t, duration: e = 10, action: r }) {
|
|
1628
|
-
|
|
1628
|
+
M(this, et)[t] && (clearTimeout(M(this, et)[t]), M(this, et)[t] = null), r && (M(this, et)[t] = setTimeout(() => {
|
|
1629
1629
|
r();
|
|
1630
1630
|
}, e));
|
|
1631
1631
|
}
|
|
@@ -1665,29 +1665,29 @@ class se {
|
|
|
1665
1665
|
}
|
|
1666
1666
|
et = new WeakMap();
|
|
1667
1667
|
const xt = new se();
|
|
1668
|
-
var K,
|
|
1668
|
+
var K, Q, st, ot, ft, Z, X, rt, At, Mt, re, mt, jt, Dt, ie, wt, ne, kt, ae;
|
|
1669
1669
|
class _e {
|
|
1670
1670
|
constructor() {
|
|
1671
1671
|
/** user.current — только при первом реальном использовании (сохранение лога, выгрузка). */
|
|
1672
|
-
|
|
1672
|
+
L(this, Mt);
|
|
1673
1673
|
/** Вывод ошибок логера
|
|
1674
1674
|
* @param {'entity'} type - тип ошибки
|
|
1675
1675
|
*/
|
|
1676
|
-
|
|
1677
|
-
|
|
1678
|
-
|
|
1679
|
-
|
|
1680
|
-
|
|
1681
|
-
|
|
1682
|
-
|
|
1683
|
-
|
|
1684
|
-
|
|
1685
|
-
|
|
1686
|
-
|
|
1687
|
-
|
|
1688
|
-
|
|
1676
|
+
L(this, mt);
|
|
1677
|
+
L(this, Dt);
|
|
1678
|
+
L(this, wt);
|
|
1679
|
+
L(this, kt);
|
|
1680
|
+
L(this, K, "logger");
|
|
1681
|
+
L(this, Q, !1);
|
|
1682
|
+
L(this, st, /* @__PURE__ */ new Map());
|
|
1683
|
+
L(this, ot, {});
|
|
1684
|
+
L(this, ft, !1);
|
|
1685
|
+
L(this, Z, null);
|
|
1686
|
+
L(this, X, null);
|
|
1687
|
+
L(this, rt, !1);
|
|
1688
|
+
L(this, At, !1);
|
|
1689
1689
|
/** Очистка хранилища элементов старше 'N' месяцев */
|
|
1690
|
-
|
|
1690
|
+
H(this, "periodClear", 3);
|
|
1691
1691
|
}
|
|
1692
1692
|
/** Инициализация логера */
|
|
1693
1693
|
async init() {
|
|
@@ -1697,23 +1697,23 @@ class _e {
|
|
|
1697
1697
|
});
|
|
1698
1698
|
if (e && Array.isArray(e))
|
|
1699
1699
|
if (e.find(
|
|
1700
|
-
(i) => i.ENTITY ==
|
|
1700
|
+
(i) => i.ENTITY == M(this, K)
|
|
1701
1701
|
))
|
|
1702
|
-
F(this,
|
|
1702
|
+
F(this, Q, !0);
|
|
1703
1703
|
else {
|
|
1704
1704
|
let { entityAdd: i } = await t.batch({
|
|
1705
1705
|
entityAdd: {
|
|
1706
1706
|
method: "entity.add",
|
|
1707
1707
|
params: {
|
|
1708
|
-
ENTITY:
|
|
1709
|
-
NAME:
|
|
1708
|
+
ENTITY: M(this, K),
|
|
1709
|
+
NAME: M(this, K),
|
|
1710
1710
|
ACCESS: { AU: "X" }
|
|
1711
1711
|
}
|
|
1712
1712
|
}
|
|
1713
1713
|
});
|
|
1714
|
-
i && F(this,
|
|
1714
|
+
i && F(this, Q, !0);
|
|
1715
1715
|
}
|
|
1716
|
-
return
|
|
1716
|
+
return M(this, Q);
|
|
1717
1717
|
} catch (t) {
|
|
1718
1718
|
return console.error("Ошибка при инициализации логера:", t), !1;
|
|
1719
1719
|
}
|
|
@@ -1728,9 +1728,8 @@ class _e {
|
|
|
1728
1728
|
* @returns {string|null}
|
|
1729
1729
|
*/
|
|
1730
1730
|
start({ type: t, data: e }) {
|
|
1731
|
-
if (
|
|
1732
|
-
|
|
1733
|
-
return _(this, dt, Jt).call(this, "entity"), null;
|
|
1731
|
+
if (!M(this, Q))
|
|
1732
|
+
return _(this, mt, jt).call(this, "entity"), null;
|
|
1734
1733
|
if (!t || !e)
|
|
1735
1734
|
return console.error("Невалидные данные для логирования:", { type: t, data: e }), null;
|
|
1736
1735
|
const r = xt.hash, i = {
|
|
@@ -1742,7 +1741,7 @@ class _e {
|
|
|
1742
1741
|
answer: null,
|
|
1743
1742
|
date: (/* @__PURE__ */ new Date()).getTime()
|
|
1744
1743
|
};
|
|
1745
|
-
return
|
|
1744
|
+
return M(this, st).set(r, i), F(this, At, !0), r;
|
|
1746
1745
|
}
|
|
1747
1746
|
/**
|
|
1748
1747
|
* @param {{
|
|
@@ -1752,20 +1751,19 @@ class _e {
|
|
|
1752
1751
|
* answer: { [key]: unknown } }}
|
|
1753
1752
|
*/
|
|
1754
1753
|
async stop({ key: t, errorList: e, status: r, answer: i }) {
|
|
1755
|
-
var
|
|
1756
|
-
if (
|
|
1757
|
-
}), !E(this, it))
|
|
1754
|
+
var c;
|
|
1755
|
+
if (!M(this, At))
|
|
1758
1756
|
return;
|
|
1759
|
-
if (!
|
|
1760
|
-
_(this,
|
|
1757
|
+
if (!M(this, Q)) {
|
|
1758
|
+
_(this, mt, jt).call(this, "entity");
|
|
1761
1759
|
return;
|
|
1762
1760
|
}
|
|
1763
|
-
let a =
|
|
1761
|
+
let a = M(this, st).get(t);
|
|
1764
1762
|
if (!a) {
|
|
1765
1763
|
console.error(`Не найдены данные логирования для ключа: ${t}`);
|
|
1766
1764
|
return;
|
|
1767
1765
|
}
|
|
1768
|
-
e && (a.errorList = e), r && (a.status = r), i && (a.answer = i), await _(this, Mt, re).call(this), a.userInfo =
|
|
1766
|
+
e && (a.errorList = e), r && (a.status = r), i && (a.answer = i), await _(this, Mt, re).call(this), a.userInfo = M(this, ot), await _(this, Dt, ie).call(this), (c = a == null ? void 0 : a.data) != null && c.updateList && F(this, rt, !0), F(this, At, !1);
|
|
1769
1767
|
}
|
|
1770
1768
|
/**
|
|
1771
1769
|
* @param { ({percent}:{percent:number})=>{} } progressCall - коллбэк
|
|
@@ -1773,14 +1771,14 @@ class _e {
|
|
|
1773
1771
|
async getEntityList(t) {
|
|
1774
1772
|
var e;
|
|
1775
1773
|
try {
|
|
1776
|
-
if ((e =
|
|
1777
|
-
return
|
|
1774
|
+
if ((e = M(this, X)) != null && e.length && !M(this, rt))
|
|
1775
|
+
return M(this, X);
|
|
1778
1776
|
let r = new v(BX24.callBatch), { entityList: i } = await r.batch(
|
|
1779
1777
|
{
|
|
1780
1778
|
entityList: {
|
|
1781
1779
|
method: "entity.item.get",
|
|
1782
1780
|
params: {
|
|
1783
|
-
ENTITY:
|
|
1781
|
+
ENTITY: M(this, K),
|
|
1784
1782
|
SORT: { ID: "DESC" }
|
|
1785
1783
|
}
|
|
1786
1784
|
}
|
|
@@ -1789,16 +1787,16 @@ class _e {
|
|
|
1789
1787
|
);
|
|
1790
1788
|
return !i || !Array.isArray(i) ? (console.warn("Получен невалидный список записей"), []) : (i = i.map((a) => {
|
|
1791
1789
|
try {
|
|
1792
|
-
const { ID:
|
|
1790
|
+
const { ID: c, DATE_CREATE: l, DETAIL_TEXT: u } = a;
|
|
1793
1791
|
return {
|
|
1794
1792
|
...JSON.parse(u),
|
|
1795
|
-
id:
|
|
1796
|
-
dateCreate:
|
|
1793
|
+
id: c,
|
|
1794
|
+
dateCreate: l
|
|
1797
1795
|
};
|
|
1798
|
-
} catch (
|
|
1796
|
+
} catch (c) {
|
|
1799
1797
|
return console.error(
|
|
1800
1798
|
`Ошибка парсинга записи ${a.ID}:`,
|
|
1801
|
-
|
|
1799
|
+
c
|
|
1802
1800
|
), null;
|
|
1803
1801
|
}
|
|
1804
1802
|
}).filter((a) => a !== null), F(this, rt, !1), F(this, X, i), i);
|
|
@@ -1811,16 +1809,16 @@ class _e {
|
|
|
1811
1809
|
* Не вызывается из `init` — вызывайте явно (например, из настроек или планировщика).
|
|
1812
1810
|
*/
|
|
1813
1811
|
runStorageMaintenance() {
|
|
1814
|
-
return _(this,
|
|
1812
|
+
return _(this, wt, ne).call(this);
|
|
1815
1813
|
}
|
|
1816
1814
|
/** Выгрузка всех данных из хранилища в JSON-файл */
|
|
1817
1815
|
async downAllEntityJson() {
|
|
1818
1816
|
try {
|
|
1819
|
-
if (
|
|
1817
|
+
if (M(this, X) || await this.getEntityList(), !M(this, X) || M(this, X).length === 0)
|
|
1820
1818
|
return console.warn("Нет данных для выгрузки"), !1;
|
|
1821
|
-
let t =
|
|
1819
|
+
let t = pt().format("%Y-%m-%d");
|
|
1822
1820
|
return xt.downloadFileJson(
|
|
1823
|
-
|
|
1821
|
+
M(this, X),
|
|
1824
1822
|
`sdklogger-entity-data__${t}`
|
|
1825
1823
|
), !0;
|
|
1826
1824
|
} catch (t) {
|
|
@@ -1828,24 +1826,24 @@ class _e {
|
|
|
1828
1826
|
}
|
|
1829
1827
|
}
|
|
1830
1828
|
}
|
|
1831
|
-
K = new WeakMap(),
|
|
1832
|
-
if (!
|
|
1833
|
-
return
|
|
1829
|
+
K = new WeakMap(), Q = new WeakMap(), st = new WeakMap(), ot = new WeakMap(), ft = new WeakMap(), Z = new WeakMap(), X = new WeakMap(), rt = new WeakMap(), At = new WeakMap(), Mt = new WeakSet(), re = async function() {
|
|
1830
|
+
if (!M(this, ft))
|
|
1831
|
+
return M(this, Z) ? M(this, Z) : (F(this, Z, (async () => {
|
|
1834
1832
|
try {
|
|
1835
1833
|
const t = new v(BX24.callBatch), e = BX24.isAdmin(), { curUser: r } = await t.batch({
|
|
1836
1834
|
curUser: { method: "user.current" }
|
|
1837
1835
|
});
|
|
1838
|
-
F(this,
|
|
1836
|
+
F(this, ot, { isAdmin: e, curUser: r });
|
|
1839
1837
|
} catch (t) {
|
|
1840
1838
|
console.error(
|
|
1841
1839
|
"Ошибка при получении информации о пользователе:",
|
|
1842
1840
|
t
|
|
1843
|
-
), F(this,
|
|
1841
|
+
), F(this, ot, { isAdmin: !1, curUser: null });
|
|
1844
1842
|
} finally {
|
|
1845
1843
|
F(this, ft, !0), F(this, Z, null);
|
|
1846
1844
|
}
|
|
1847
|
-
})()),
|
|
1848
|
-
},
|
|
1845
|
+
})()), M(this, Z));
|
|
1846
|
+
}, mt = new WeakSet(), jt = function(t) {
|
|
1849
1847
|
t == "entity" && xt.actionFilter({
|
|
1850
1848
|
keyTimer: "error.logger.entity",
|
|
1851
1849
|
duration: 500,
|
|
@@ -1856,29 +1854,29 @@ K = new WeakMap(), q = new WeakMap(), st = new WeakMap(), At = new WeakMap(), ft
|
|
|
1856
1854
|
}, Dt = new WeakSet(), ie = async function() {
|
|
1857
1855
|
try {
|
|
1858
1856
|
let t = {}, e = new v(BX24.callBatch);
|
|
1859
|
-
for (let [r, i] of
|
|
1857
|
+
for (let [r, i] of M(this, st).entries())
|
|
1860
1858
|
if (i.status) {
|
|
1861
1859
|
const a = JSON.stringify(i);
|
|
1862
1860
|
t[r] = {
|
|
1863
1861
|
method: "entity.item.add",
|
|
1864
1862
|
params: {
|
|
1865
|
-
ENTITY:
|
|
1866
|
-
NAME:
|
|
1863
|
+
ENTITY: M(this, K),
|
|
1864
|
+
NAME: M(this, K),
|
|
1867
1865
|
DETAIL_TEXT: a
|
|
1868
1866
|
}
|
|
1869
1867
|
};
|
|
1870
1868
|
}
|
|
1871
1869
|
if (Object.keys(t).length) {
|
|
1872
1870
|
let r = await e.batch(t), { errors: i } = e;
|
|
1873
|
-
for (let [a,
|
|
1874
|
-
|
|
1871
|
+
for (let [a, c] of Object.entries({ ...r, ...i }))
|
|
1872
|
+
M(this, st).delete(a);
|
|
1875
1873
|
return !0;
|
|
1876
1874
|
}
|
|
1877
1875
|
return !1;
|
|
1878
1876
|
} catch (t) {
|
|
1879
1877
|
return console.error("Ошибка при добавлении записей в хранилище:", t), !1;
|
|
1880
1878
|
}
|
|
1881
|
-
},
|
|
1879
|
+
}, wt = new WeakSet(), ne = async function() {
|
|
1882
1880
|
try {
|
|
1883
1881
|
let t = new v(BX24.callBatch), { serverTime: e } = await t.batch({
|
|
1884
1882
|
serverTime: { method: "server.time" }
|
|
@@ -1887,13 +1885,13 @@ K = new WeakMap(), q = new WeakMap(), st = new WeakMap(), At = new WeakMap(), ft
|
|
|
1887
1885
|
console.error("Не удалось получить время сервера");
|
|
1888
1886
|
return;
|
|
1889
1887
|
}
|
|
1890
|
-
if (
|
|
1888
|
+
if (M(this, X) || await this.getEntityList(), !M(this, X) || M(this, X).length === 0)
|
|
1891
1889
|
return;
|
|
1892
|
-
let r =
|
|
1890
|
+
let r = M(this, X).filter((i) => {
|
|
1893
1891
|
try {
|
|
1894
1892
|
let { dateCreate: a } = i;
|
|
1895
|
-
return a ?
|
|
1896
|
-
|
|
1893
|
+
return a ? pt(new Date(a)).between(
|
|
1894
|
+
pt(new Date(e)),
|
|
1897
1895
|
"month"
|
|
1898
1896
|
) >= this.periodClear : !1;
|
|
1899
1897
|
} catch (a) {
|
|
@@ -1902,21 +1900,21 @@ K = new WeakMap(), q = new WeakMap(), st = new WeakMap(), At = new WeakMap(), ft
|
|
|
1902
1900
|
});
|
|
1903
1901
|
r.length > 0 && (console.log(
|
|
1904
1902
|
`Найдено ${r.length} записей для очистки (старше ${this.periodClear} месяцев)`
|
|
1905
|
-
), await _(this,
|
|
1903
|
+
), await _(this, kt, ae).call(this, r));
|
|
1906
1904
|
} catch (t) {
|
|
1907
1905
|
console.error("Ошибка при проверке периода очистки:", t);
|
|
1908
1906
|
}
|
|
1909
|
-
},
|
|
1907
|
+
}, kt = new WeakSet(), ae = async function(t) {
|
|
1910
1908
|
try {
|
|
1911
1909
|
if (!t || t.length === 0)
|
|
1912
1910
|
return !1;
|
|
1913
1911
|
let e = new v(BX24.callBatch), r = t.filter((a) => a && a.id).map((a) => {
|
|
1914
|
-
let { id:
|
|
1912
|
+
let { id: c } = a;
|
|
1915
1913
|
return {
|
|
1916
1914
|
method: "entity.item.delete",
|
|
1917
1915
|
params: {
|
|
1918
|
-
ENTITY:
|
|
1919
|
-
ID:
|
|
1916
|
+
ENTITY: M(this, K),
|
|
1917
|
+
ID: c
|
|
1920
1918
|
}
|
|
1921
1919
|
};
|
|
1922
1920
|
});
|
|
@@ -1956,8 +1954,8 @@ function Kt(y) {
|
|
|
1956
1954
|
const t = Te();
|
|
1957
1955
|
return t ? (y.appConst.pathApp = t, t) : Qt(y.appConst.pathApp ?? "");
|
|
1958
1956
|
}
|
|
1959
|
-
var ct, Ot,
|
|
1960
|
-
class
|
|
1957
|
+
var ct, Ot, Bt, Ae, Ct, ce, Ut, le, Ht, he, Gt, ue, V, nt, dt, vt, Yt, fe, gt, qt, Pt, me;
|
|
1958
|
+
class Ie {
|
|
1961
1959
|
/**
|
|
1962
1960
|
* @param {Object} appConst - Константы приложения
|
|
1963
1961
|
* @param {string} appConst.appName - Название приложения
|
|
@@ -1970,24 +1968,24 @@ class Le {
|
|
|
1970
1968
|
*
|
|
1971
1969
|
* @returns {Batch} Shared Batch instance.
|
|
1972
1970
|
*/
|
|
1973
|
-
|
|
1974
|
-
|
|
1971
|
+
L(this, ct);
|
|
1972
|
+
L(this, Bt);
|
|
1975
1973
|
/**
|
|
1976
1974
|
* `this.logger === true` → `BxLogger` + лёгкий `init` (сущность хранилища, без полной выгрузки);
|
|
1977
1975
|
* иначе — заглушка.
|
|
1978
1976
|
* @param {boolean} runLoggerMaintenance
|
|
1979
1977
|
*/
|
|
1980
|
-
|
|
1978
|
+
L(this, Ct);
|
|
1981
1979
|
/**
|
|
1982
1980
|
* @returns {boolean}
|
|
1983
1981
|
*/
|
|
1984
|
-
|
|
1982
|
+
L(this, Ut);
|
|
1985
1983
|
/** Запрос данных о приложении */
|
|
1986
|
-
|
|
1984
|
+
L(this, Ht);
|
|
1987
1985
|
/** Запрос данных о текущем пользователе */
|
|
1988
|
-
|
|
1989
|
-
|
|
1990
|
-
|
|
1986
|
+
L(this, Gt);
|
|
1987
|
+
L(this, V);
|
|
1988
|
+
L(this, dt);
|
|
1991
1989
|
/**
|
|
1992
1990
|
* Расширяет errorList для случаев TIMEOUT и LIMIT
|
|
1993
1991
|
* Если есть ошибки TIMEOUT или LIMIT, добавляет все необработанные сущности из commandList
|
|
@@ -1997,31 +1995,31 @@ class Le {
|
|
|
1997
1995
|
* @param {Array} updateList - Список обновлений для логирования (опционально)
|
|
1998
1996
|
* @returns {Object} Расширенный список ошибок
|
|
1999
1997
|
*/
|
|
2000
|
-
|
|
1998
|
+
L(this, Yt);
|
|
2001
1999
|
/**
|
|
2002
2000
|
* Нормализует входные данные в массив объектов {placement, handler?}
|
|
2003
2001
|
* @private
|
|
2004
2002
|
*/
|
|
2005
|
-
|
|
2003
|
+
L(this, gt);
|
|
2006
2004
|
/**
|
|
2007
2005
|
* Находит встройки с устаревшим handler (не содержащим текущий pathApp)
|
|
2008
2006
|
* @private
|
|
2009
2007
|
*/
|
|
2010
|
-
|
|
2011
|
-
|
|
2012
|
-
|
|
2013
|
-
|
|
2014
|
-
|
|
2015
|
-
|
|
2016
|
-
|
|
2017
|
-
|
|
2018
|
-
|
|
2019
|
-
|
|
2008
|
+
L(this, Pt);
|
|
2009
|
+
H(this, "domain", "");
|
|
2010
|
+
H(this, "isAdmin", !1);
|
|
2011
|
+
H(this, "appInfo", null);
|
|
2012
|
+
H(this, "appConst", null);
|
|
2013
|
+
H(this, "userInfo", null);
|
|
2014
|
+
H(this, "placeData", null);
|
|
2015
|
+
H(this, "placeInfo", null);
|
|
2016
|
+
H(this, "logger", !1);
|
|
2017
|
+
H(this, "timeLimit", {
|
|
2020
2018
|
limit: !1,
|
|
2021
2019
|
date: void 0,
|
|
2022
2020
|
pauseMs: void 0
|
|
2023
2021
|
});
|
|
2024
|
-
|
|
2022
|
+
H(this, "batchClient", null);
|
|
2025
2023
|
this.appConst = t;
|
|
2026
2024
|
}
|
|
2027
2025
|
/**
|
|
@@ -2044,37 +2042,33 @@ class Le {
|
|
|
2044
2042
|
* @throws {Error} Если BX24 не загружен в течение 30 секунд
|
|
2045
2043
|
*/
|
|
2046
2044
|
init() {
|
|
2047
|
-
return
|
|
2048
|
-
}), new Promise((t, e) => {
|
|
2045
|
+
return new Promise((t, e) => {
|
|
2049
2046
|
const i = setTimeout(() => {
|
|
2050
2047
|
clearInterval(a);
|
|
2051
|
-
const
|
|
2048
|
+
const c = new Error(
|
|
2052
2049
|
"BX24 initialization timeout: BX24 object not found within 30 seconds"
|
|
2053
2050
|
);
|
|
2054
|
-
console.error(
|
|
2051
|
+
console.error(c), e(c);
|
|
2055
2052
|
}, 3e4);
|
|
2056
2053
|
let a = setInterval(() => {
|
|
2057
2054
|
window.BX24 && BX24.init(async () => {
|
|
2058
|
-
var h, u, n;
|
|
2059
2055
|
clearInterval(a), clearTimeout(i), this.domain = BX24.getDomain(), this.isAdmin = BX24.isAdmin(), this.placeInfo = BX24.placement.info();
|
|
2060
|
-
const
|
|
2061
|
-
if (
|
|
2062
|
-
|
|
2063
|
-
|
|
2064
|
-
|
|
2065
|
-
|
|
2066
|
-
const f = new se();
|
|
2056
|
+
const c = _(this, Ut, le).call(this);
|
|
2057
|
+
if (console.info(
|
|
2058
|
+
c ? "init BX24 (background worker)" : "init BX24"
|
|
2059
|
+
), this.appInfo = await _(this, Ht, he).call(this), this.userInfo = await _(this, Gt, ue).call(this), Kt(this), !c) {
|
|
2060
|
+
await _(this, Ct, ce).call(this, !0);
|
|
2061
|
+
const l = new se();
|
|
2067
2062
|
try {
|
|
2068
|
-
|
|
2069
|
-
} catch (
|
|
2063
|
+
l.noSleep();
|
|
2064
|
+
} catch (u) {
|
|
2070
2065
|
console.warn(
|
|
2071
2066
|
"Failed to initialize noSleep:",
|
|
2072
|
-
|
|
2067
|
+
u
|
|
2073
2068
|
);
|
|
2074
2069
|
}
|
|
2075
2070
|
}
|
|
2076
|
-
|
|
2077
|
-
}), t({ isBackworker: A });
|
|
2071
|
+
t({ isBackworker: c });
|
|
2078
2072
|
});
|
|
2079
2073
|
}, 100);
|
|
2080
2074
|
});
|
|
@@ -2127,18 +2121,17 @@ class Le {
|
|
|
2127
2121
|
type: "call",
|
|
2128
2122
|
data: { method: t, params: e, updateList: r }
|
|
2129
2123
|
})), e || (e = {}), typeof BX24 > "u" || !BX24.callMethod) {
|
|
2130
|
-
const
|
|
2131
|
-
throw console.error(
|
|
2124
|
+
const l = new Error("BX24 is not initialized");
|
|
2125
|
+
throw console.error(l), l;
|
|
2132
2126
|
}
|
|
2133
|
-
const
|
|
2134
|
-
return
|
|
2135
|
-
answer:
|
|
2127
|
+
const c = await _(this, ct, Ot).call(this).call({ method: t, params: e });
|
|
2128
|
+
return c.success ? (await _(this, V, nt).call(this, i, {
|
|
2129
|
+
answer: c.answer,
|
|
2136
2130
|
status: "success"
|
|
2137
|
-
}),
|
|
2138
|
-
|
|
2139
|
-
answer: A.answer,
|
|
2131
|
+
}), c.data) : (console.error(c.error), await _(this, V, nt).call(this, i, {
|
|
2132
|
+
answer: c.answer,
|
|
2140
2133
|
status: "fail",
|
|
2141
|
-
errorList: { 0:
|
|
2134
|
+
errorList: { 0: c.error || "Unknown call error" }
|
|
2142
2135
|
}), !1);
|
|
2143
2136
|
}
|
|
2144
2137
|
/**
|
|
@@ -2162,10 +2155,10 @@ class Le {
|
|
|
2162
2155
|
*/
|
|
2163
2156
|
async batch(t, e, { errorCall: r, updateList: i, batchOptions: a } = {}) {
|
|
2164
2157
|
if (typeof BX24 > "u" || !BX24.callBatch) {
|
|
2165
|
-
const
|
|
2166
|
-
return console.error(
|
|
2158
|
+
const c = new Error("BX24 is not initialized");
|
|
2159
|
+
return console.error(c), !1;
|
|
2167
2160
|
}
|
|
2168
|
-
return _(this,
|
|
2161
|
+
return _(this, dt, vt).call(this, {
|
|
2169
2162
|
mode: "batch",
|
|
2170
2163
|
commandList: t,
|
|
2171
2164
|
progressCall: e,
|
|
@@ -2201,7 +2194,7 @@ class Le {
|
|
|
2201
2194
|
const a = new Error("BX24 is not initialized");
|
|
2202
2195
|
return console.error(a), !1;
|
|
2203
2196
|
}
|
|
2204
|
-
return _(this,
|
|
2197
|
+
return _(this, dt, vt).call(this, {
|
|
2205
2198
|
mode: "batch-total-count",
|
|
2206
2199
|
commandList: t,
|
|
2207
2200
|
progressCall: e,
|
|
@@ -2219,46 +2212,46 @@ class Le {
|
|
|
2219
2212
|
* @param {string|string[]|Object|Object[]} place - Место или массив мест для встройки
|
|
2220
2213
|
*/
|
|
2221
2214
|
async placementBind(t) {
|
|
2222
|
-
var
|
|
2215
|
+
var A;
|
|
2223
2216
|
if (!this.isAdmin || (this.placeData = await this.getPlacement(), !this.placeData))
|
|
2224
2217
|
return;
|
|
2225
2218
|
const { appName: e, pathApp: r } = this.appConst;
|
|
2226
2219
|
let i = _(this, gt, qt).call(this, t);
|
|
2227
2220
|
i = i.filter(
|
|
2228
|
-
(
|
|
2221
|
+
(h) => h.placement !== "PAGE_BACKGROUND_WORKER" && h.placement !== "PAGE_BACKGROUND_WORKER_ALL"
|
|
2229
2222
|
);
|
|
2230
|
-
const a = _(this,
|
|
2231
|
-
for (const
|
|
2232
|
-
|
|
2223
|
+
const a = _(this, Pt, me).call(this, r), c = new Set(i.map((h) => h.placement));
|
|
2224
|
+
for (const h of a)
|
|
2225
|
+
c.has(h.placement) || i.push({ placement: h.placement });
|
|
2233
2226
|
if (i.length === 0)
|
|
2234
2227
|
return;
|
|
2235
|
-
let
|
|
2236
|
-
this.domain === "szdl.bitrix24.ru" && ((
|
|
2237
|
-
const u =
|
|
2238
|
-
for (const
|
|
2239
|
-
d.has(
|
|
2240
|
-
for (let
|
|
2241
|
-
const O = i[
|
|
2228
|
+
let l = e;
|
|
2229
|
+
this.domain === "szdl.bitrix24.ru" && ((A = this.appInfo) != null && A.ID) && (l = `${e}: #${this.appInfo.ID}`);
|
|
2230
|
+
const u = l.replace(" CRM", ""), n = {}, f = [], d = /* @__PURE__ */ new Map();
|
|
2231
|
+
for (const h of this.placeData)
|
|
2232
|
+
d.has(h.placement) || d.set(h.placement, []), d.get(h.placement).push(h);
|
|
2233
|
+
for (let h = 0; h < i.length; h++) {
|
|
2234
|
+
const O = i[h].placement, T = d.get(O) || [];
|
|
2242
2235
|
if (T.some(
|
|
2243
|
-
(
|
|
2236
|
+
(p) => p.handler === r
|
|
2244
2237
|
))
|
|
2245
2238
|
continue;
|
|
2246
|
-
const
|
|
2247
|
-
(
|
|
2239
|
+
const b = T.filter(
|
|
2240
|
+
(p) => p.handler !== r
|
|
2248
2241
|
);
|
|
2249
|
-
for (const
|
|
2242
|
+
for (const p of b)
|
|
2250
2243
|
f.push({
|
|
2251
2244
|
placement: O,
|
|
2252
|
-
handler:
|
|
2245
|
+
handler: p.handler
|
|
2253
2246
|
});
|
|
2254
|
-
n[`bind_${
|
|
2247
|
+
n[`bind_${h}`] = {
|
|
2255
2248
|
method: "placement.bind",
|
|
2256
2249
|
params: {
|
|
2257
2250
|
PLACEMENT: O,
|
|
2258
2251
|
HANDLER: r,
|
|
2259
2252
|
LANG_ALL: {
|
|
2260
2253
|
ru: {
|
|
2261
|
-
TITLE: O === "USER_PROFILE_TOOLBAR" ? u :
|
|
2254
|
+
TITLE: O === "USER_PROFILE_TOOLBAR" ? u : l
|
|
2262
2255
|
}
|
|
2263
2256
|
},
|
|
2264
2257
|
OPTIONS: {
|
|
@@ -2267,8 +2260,8 @@ class Le {
|
|
|
2267
2260
|
}
|
|
2268
2261
|
};
|
|
2269
2262
|
}
|
|
2270
|
-
f.length > 0 && await this.placementUnBind(f), Object.keys(n).length > 0 && (await this.batch(n), this.placeData = await this.getPlacement(), Object.values(n).forEach((
|
|
2271
|
-
console.log("Приложение успешно встроено в",
|
|
2263
|
+
f.length > 0 && await this.placementUnBind(f), Object.keys(n).length > 0 && (await this.batch(n), this.placeData = await this.getPlacement(), Object.values(n).forEach((h) => {
|
|
2264
|
+
console.log("Приложение успешно встроено в", h.params.PLACEMENT);
|
|
2272
2265
|
}));
|
|
2273
2266
|
}
|
|
2274
2267
|
/**
|
|
@@ -2306,7 +2299,7 @@ class Le {
|
|
|
2306
2299
|
}
|
|
2307
2300
|
/* регистрация бота */
|
|
2308
2301
|
async regBot({ code: t, type: e, name: r }) {
|
|
2309
|
-
const { appName: i, pathApp: a, chatBotLogo:
|
|
2302
|
+
const { appName: i, pathApp: a, chatBotLogo: c } = this.appConst, l = this.appInfo.ID, u = await this.call({
|
|
2310
2303
|
method: "imbot.register",
|
|
2311
2304
|
params: {
|
|
2312
2305
|
CODE: t ?? this.appInfo.CODE,
|
|
@@ -2321,7 +2314,7 @@ class Le {
|
|
|
2321
2314
|
// строковый идентификатор чат-бота, используется только в режиме Вебхуков
|
|
2322
2315
|
PROPERTIES: {
|
|
2323
2316
|
// Личные данные чат-бота (обяз.)
|
|
2324
|
-
NAME: `${r ?? i} - бот #${
|
|
2317
|
+
NAME: `${r ?? i} - бот #${l}`,
|
|
2325
2318
|
// Имя чат-бота (обязательное одно из полей NAME или LAST_NAME)
|
|
2326
2319
|
LAST_NAME: "",
|
|
2327
2320
|
// Фамилия чат-бота (обязательное одно из полей NAME или LAST_NAME)
|
|
@@ -2329,7 +2322,7 @@ class Le {
|
|
|
2329
2322
|
// Цвет чат-бота для мобильного приложения RED, GREEN, MINT, LIGHT_BLUE, DARK_BLUE, PURPLE, AQUA, PINK, LIME, BROWN, AZURE, KHAKI, SAND, MARENGO, GRAY, GRAPHITE
|
|
2330
2323
|
EMAIL: "",
|
|
2331
2324
|
// E-mail для связи. НЕЛЬЗЯ использовать e-mail, дублирующий e-mail реальных пользователей
|
|
2332
|
-
PERSONAL_BIRTHDAY:
|
|
2325
|
+
PERSONAL_BIRTHDAY: pt().format("%Y-%m-%d"),
|
|
2333
2326
|
// День рождения в формате YYYY-mm-dd
|
|
2334
2327
|
WORK_POSITION: "Почтальон",
|
|
2335
2328
|
// Занимаемая должность, используется как описание чат-бота
|
|
@@ -2337,7 +2330,7 @@ class Le {
|
|
|
2337
2330
|
// Ссылка на сайт
|
|
2338
2331
|
PERSONAL_GENDER: "M",
|
|
2339
2332
|
// Пол чат-бота, допустимые значения M - мужской, F - женский, пусто, если не требуется указывать
|
|
2340
|
-
PERSONAL_PHOTO:
|
|
2333
|
+
PERSONAL_PHOTO: c ?? ""
|
|
2341
2334
|
// Аватар чат-бота - base64
|
|
2342
2335
|
}
|
|
2343
2336
|
}
|
|
@@ -2364,7 +2357,7 @@ ct = new WeakSet(), Ot = function() {
|
|
|
2364
2357
|
callBatch: BX24.callBatch,
|
|
2365
2358
|
callMethod: BX24.callMethod
|
|
2366
2359
|
}), this.timeLimit = this.batchClient.timeLimit), this.batchClient;
|
|
2367
|
-
},
|
|
2360
|
+
}, Bt = new WeakSet(), Ae = function() {
|
|
2368
2361
|
return {
|
|
2369
2362
|
start: () => {
|
|
2370
2363
|
},
|
|
@@ -2373,18 +2366,17 @@ ct = new WeakSet(), Ot = function() {
|
|
|
2373
2366
|
getEntityList: () => {
|
|
2374
2367
|
}
|
|
2375
2368
|
};
|
|
2376
|
-
},
|
|
2377
|
-
|
|
2378
|
-
|
|
2379
|
-
}, Ht = new WeakSet(), he = function() {
|
|
2369
|
+
}, Ct = new WeakSet(), ce = async function(t) {
|
|
2370
|
+
this.logger ? (this.logger = new _e(), await this.logger.init(), t && typeof this.logger.runStorageMaintenance == "function" && this.logger.runStorageMaintenance()) : this.logger = _(this, Bt, Ae).call(this);
|
|
2371
|
+
}, Ut = new WeakSet(), le = function() {
|
|
2380
2372
|
var r, i, a;
|
|
2381
2373
|
const t = (r = this.placeInfo) == null ? void 0 : r.placement, e = (a = (i = this.placeInfo) == null ? void 0 : i.options) == null ? void 0 : a.ID;
|
|
2382
2374
|
return t === "PAGE_BACKGROUND_WORKER" || e === "PAGE_BACKGROUND_WORKER";
|
|
2383
|
-
},
|
|
2375
|
+
}, Ht = new WeakSet(), he = function() {
|
|
2384
2376
|
return this.call({ method: "app.info" });
|
|
2385
|
-
},
|
|
2377
|
+
}, Gt = new WeakSet(), ue = function() {
|
|
2386
2378
|
return this.call({ method: "user.current" });
|
|
2387
|
-
}, V = new WeakSet(),
|
|
2379
|
+
}, V = new WeakSet(), nt = async function(t, e) {
|
|
2388
2380
|
if (t)
|
|
2389
2381
|
try {
|
|
2390
2382
|
await this.logger.stop({
|
|
@@ -2394,54 +2386,54 @@ ct = new WeakSet(), Ot = function() {
|
|
|
2394
2386
|
} catch (r) {
|
|
2395
2387
|
console.error("Logger error:", r);
|
|
2396
2388
|
}
|
|
2397
|
-
},
|
|
2389
|
+
}, dt = new WeakSet(), vt = async function({
|
|
2398
2390
|
mode: t,
|
|
2399
2391
|
commandList: e,
|
|
2400
2392
|
progressCall: r,
|
|
2401
2393
|
errorCall: i,
|
|
2402
2394
|
updateList: a,
|
|
2403
|
-
batchOptions:
|
|
2395
|
+
batchOptions: c
|
|
2404
2396
|
}) {
|
|
2405
|
-
const
|
|
2397
|
+
const l = _(this, ct, Ot).call(this), u = a ? this.logger.start({
|
|
2406
2398
|
type: t,
|
|
2407
2399
|
data: t === "batch" ? { commandList: e, updateList: a } : { commandList: e }
|
|
2408
2400
|
}) : void 0;
|
|
2409
2401
|
try {
|
|
2410
|
-
const n = t === "batch" ? await
|
|
2411
|
-
return Object.keys(f).length ? (i && i(f), await _(this, V,
|
|
2402
|
+
const n = t === "batch" ? await l.batch(e, r, c) : await l.batchTotalCount(e, r), f = _(this, Yt, fe).call(this, l, n, e, a);
|
|
2403
|
+
return Object.keys(f).length ? (i && i(f), await _(this, V, nt).call(this, u, {
|
|
2412
2404
|
status: "fail",
|
|
2413
2405
|
errorList: f
|
|
2414
|
-
})) : await _(this, V,
|
|
2406
|
+
})) : await _(this, V, nt).call(this, u, { status: "success" }), n;
|
|
2415
2407
|
} catch (n) {
|
|
2416
|
-
return await _(this, V,
|
|
2408
|
+
return await _(this, V, nt).call(this, u, {
|
|
2417
2409
|
status: "fail-runtime",
|
|
2418
2410
|
errorList: { 0: n == null ? void 0 : n.toString() }
|
|
2419
2411
|
}), console.error(n), !1;
|
|
2420
2412
|
}
|
|
2421
|
-
},
|
|
2413
|
+
}, Yt = new WeakSet(), fe = function(t, e, r, i) {
|
|
2422
2414
|
let a = { ...t.errors };
|
|
2423
2415
|
if (Object.values(t.errors).some(
|
|
2424
|
-
(
|
|
2425
|
-
if (typeof
|
|
2416
|
+
(l) => {
|
|
2417
|
+
if (typeof l != "string")
|
|
2426
2418
|
return !1;
|
|
2427
|
-
const u =
|
|
2419
|
+
const u = l.toUpperCase();
|
|
2428
2420
|
return u === "TIMEOUT" || u === "OPERATION_TIME_LIMIT" || u.includes("TIMEOUT") || u.includes("OPERATION_TIME_LIMIT");
|
|
2429
2421
|
}
|
|
2430
2422
|
) && i) {
|
|
2431
|
-
const
|
|
2423
|
+
const l = e ? Object.keys(e).filter((d) => d !== "errorsList") : [], u = new Set(Object.keys(t.errors || {})), n = /* @__PURE__ */ new Set();
|
|
2432
2424
|
if (e) {
|
|
2433
|
-
for (const d of
|
|
2425
|
+
for (const d of l)
|
|
2434
2426
|
if (!u.has(d)) {
|
|
2435
|
-
const
|
|
2436
|
-
|
|
2427
|
+
const A = e[d];
|
|
2428
|
+
A != null && n.add(d);
|
|
2437
2429
|
}
|
|
2438
2430
|
}
|
|
2439
2431
|
const f = Object.values(t.errors).find(
|
|
2440
2432
|
(d) => {
|
|
2441
2433
|
if (typeof d != "string")
|
|
2442
2434
|
return !1;
|
|
2443
|
-
const
|
|
2444
|
-
return
|
|
2435
|
+
const A = d.toUpperCase();
|
|
2436
|
+
return A === "TIMEOUT" || A === "OPERATION_TIME_LIMIT" || A.includes("TIMEOUT") || A.includes("OPERATION_TIME_LIMIT");
|
|
2445
2437
|
}
|
|
2446
2438
|
);
|
|
2447
2439
|
for (const d of Object.keys(r))
|
|
@@ -2455,28 +2447,28 @@ ct = new WeakSet(), Ot = function() {
|
|
|
2455
2447
|
return Array.isArray(t) ? e = t.map(
|
|
2456
2448
|
(r) => typeof r == "string" ? { placement: r } : r
|
|
2457
2449
|
) : typeof t == "string" ? e = [{ placement: t }] : e = [t], e;
|
|
2458
|
-
},
|
|
2450
|
+
}, Pt = new WeakSet(), me = function(t) {
|
|
2459
2451
|
return this.placeData ? this.placeData.filter((e) => !(e.placement === "PAGE_BACKGROUND_WORKER" || !e.handler || e.handler.includes(t))) : [];
|
|
2460
2452
|
};
|
|
2461
|
-
const
|
|
2453
|
+
const de = "szdl-utils-kit|";
|
|
2462
2454
|
function Ee() {
|
|
2463
2455
|
if (typeof sessionStorage > "u")
|
|
2464
2456
|
return `ephemeral-${Date.now()}-${Math.random().toString(16).slice(2)}`;
|
|
2465
2457
|
let y = sessionStorage.getItem("szdl-cross-tab-instance-id");
|
|
2466
2458
|
return y || (y = `${Date.now()}-${Math.random().toString(16).slice(2)}`, sessionStorage.setItem("szdl-cross-tab-instance-id", y)), y;
|
|
2467
2459
|
}
|
|
2468
|
-
function
|
|
2460
|
+
function Re() {
|
|
2469
2461
|
return typeof navigator < "u" && typeof navigator.locks < "u" && typeof navigator.locks.request == "function";
|
|
2470
2462
|
}
|
|
2471
2463
|
const Ft = /* @__PURE__ */ new Map();
|
|
2472
|
-
function
|
|
2464
|
+
function be(y = "default") {
|
|
2473
2465
|
if (typeof BroadcastChannel > "u")
|
|
2474
2466
|
return null;
|
|
2475
|
-
const t = `${
|
|
2467
|
+
const t = `${de}bc:${y}`;
|
|
2476
2468
|
return Ft.has(t) || Ft.set(t, new BroadcastChannel(t)), Ft.get(t);
|
|
2477
2469
|
}
|
|
2478
2470
|
function Zt(y, t) {
|
|
2479
|
-
const e =
|
|
2471
|
+
const e = be(y);
|
|
2480
2472
|
if (e)
|
|
2481
2473
|
try {
|
|
2482
2474
|
const r = t && typeof t == "object" && !Array.isArray(t) ? t : { data: t };
|
|
@@ -2488,13 +2480,13 @@ function Zt(y, t) {
|
|
|
2488
2480
|
} catch {
|
|
2489
2481
|
}
|
|
2490
2482
|
}
|
|
2491
|
-
async function
|
|
2492
|
-
const { ifAvailable: r = !1 } = e, i = typeof y == "string" && y.length > 0 ? y : "default", a = `${
|
|
2493
|
-
return
|
|
2483
|
+
async function Le(y, t, e = {}) {
|
|
2484
|
+
const { ifAvailable: r = !1 } = e, i = typeof y == "string" && y.length > 0 ? y : "default", a = `${de}${i}`;
|
|
2485
|
+
return Re() ? navigator.locks.request(
|
|
2494
2486
|
a,
|
|
2495
2487
|
{ mode: "exclusive", ifAvailable: !!r },
|
|
2496
|
-
async (
|
|
2497
|
-
if (r &&
|
|
2488
|
+
async (c) => {
|
|
2489
|
+
if (r && c == null)
|
|
2498
2490
|
return { skipped: !0, coordination: "locks" };
|
|
2499
2491
|
Zt(i, { type: "lock-acquired", resource: i });
|
|
2500
2492
|
try {
|
|
@@ -2505,38 +2497,38 @@ async function Se(y, t, e = {}) {
|
|
|
2505
2497
|
}
|
|
2506
2498
|
) : { skipped: !1, result: await t(), coordination: "none" };
|
|
2507
2499
|
}
|
|
2508
|
-
var
|
|
2500
|
+
var yt, zt;
|
|
2509
2501
|
class Me {
|
|
2510
2502
|
constructor(t) {
|
|
2511
2503
|
/**
|
|
2512
2504
|
* Канонический base URL для placement (без завершающего `/`).
|
|
2513
2505
|
* Пустая строка — не биндить (некорректный или marketplace URL).
|
|
2514
2506
|
*/
|
|
2515
|
-
|
|
2516
|
-
|
|
2517
|
-
|
|
2518
|
-
|
|
2519
|
-
|
|
2520
|
-
|
|
2521
|
-
|
|
2522
|
-
|
|
2507
|
+
L(this, yt);
|
|
2508
|
+
H(this, "entityName", "tabs");
|
|
2509
|
+
H(this, "maxTabs", 20);
|
|
2510
|
+
H(this, "tabList", []);
|
|
2511
|
+
H(this, "id", 0);
|
|
2512
|
+
H(this, "hasStarted", !1);
|
|
2513
|
+
H(this, "heartbeat");
|
|
2514
|
+
H(this, "runHeartbeat");
|
|
2523
2515
|
/** Вкладка считается «мёртвой», если нет обновления lastActive дольше этого (см. refreshTabs). */
|
|
2524
|
-
|
|
2525
|
-
|
|
2516
|
+
H(this, "activeMaxPause", 10 * 1e3);
|
|
2517
|
+
H(this, "quickCleanupThreshold", 2 * 60 * 1e3);
|
|
2526
2518
|
// агрессивная очистка при переполнении
|
|
2527
2519
|
/** Должен быть заметно меньше activeMaxPause: иначе «живые» вкладки успеют удалиться до следующего тика. */
|
|
2528
|
-
|
|
2520
|
+
H(this, "pollInterval", 6 * 1e3 + Math.floor(Math.random() * 2e3));
|
|
2529
2521
|
// ~6–8 с + размазать одновременные запросы
|
|
2530
|
-
|
|
2531
|
-
|
|
2532
|
-
|
|
2533
|
-
var
|
|
2522
|
+
H(this, "sessionId", `${Date.now()}-${Math.random().toString(16).slice(2)}`);
|
|
2523
|
+
H(this, "continueCondition");
|
|
2524
|
+
H(this, "defaultContinueBackground", () => !0);
|
|
2525
|
+
var c, l, u;
|
|
2534
2526
|
if (!t) {
|
|
2535
2527
|
console.error("BackgroundWorker: Нет опций конструктора");
|
|
2536
2528
|
return;
|
|
2537
2529
|
}
|
|
2538
2530
|
const { appFunc: e, bx: r, users: i, continueBackground: a } = t;
|
|
2539
|
-
this.bx = r, this.appInit = e, this.users = i, Kt(r), this.appPath = _(this,
|
|
2531
|
+
this.bx = r, this.appInit = e, this.users = i, Kt(r), this.appPath = _(this, yt, zt).call(this, ((c = r == null ? void 0 : r.appConst) == null ? void 0 : c.pathApp) ?? ""), this.appName = ((l = r == null ? void 0 : r.appConst) == null ? void 0 : l.appName) ?? "", this.appCodeName = ((u = r == null ? void 0 : r.appConst) == null ? void 0 : u.appCodeName) ?? "", this.start = /* @__PURE__ */ new Date(), this.continueCondition = typeof a == "function" ? a : this.defaultContinueBackground;
|
|
2540
2532
|
}
|
|
2541
2533
|
async init() {
|
|
2542
2534
|
if (!this.appInit) {
|
|
@@ -2578,8 +2570,8 @@ class Me {
|
|
|
2578
2570
|
if (typeof BX24 > "u" || !((t = BX24.placement) != null && t.info))
|
|
2579
2571
|
return !1;
|
|
2580
2572
|
try {
|
|
2581
|
-
const e = BX24.placement.info(), r = e == null ? void 0 : e.placement, i = (e == null ? void 0 : e.options) || {}, a = (i == null ? void 0 : i.URI) || "",
|
|
2582
|
-
return !
|
|
2573
|
+
const e = BX24.placement.info(), r = e == null ? void 0 : e.placement, i = (e == null ? void 0 : e.options) || {}, a = (i == null ? void 0 : i.URI) || "", c = r === "PAGE_BACKGROUND_WORKER" || (i == null ? void 0 : i.ID) === "PAGE_BACKGROUND_WORKER", l = typeof a == "string" && (a.includes("marketplace/app") || a.includes("marketplace/apps") || a.includes("placement") || a.includes("sozdavatel" + this.appCodeName));
|
|
2574
|
+
return !c || l;
|
|
2583
2575
|
} catch {
|
|
2584
2576
|
return !1;
|
|
2585
2577
|
}
|
|
@@ -2702,22 +2694,22 @@ class Me {
|
|
|
2702
2694
|
), !0;
|
|
2703
2695
|
const i = +(((e = this.bx.userInfo) == null ? void 0 : e.ID) ?? 0), a = this.isIndividualPlacement(
|
|
2704
2696
|
typeof window < "u" ? window.location.href : ""
|
|
2705
|
-
),
|
|
2697
|
+
), c = !a;
|
|
2706
2698
|
if (!i)
|
|
2707
2699
|
return !0;
|
|
2708
|
-
let
|
|
2700
|
+
let l = !1;
|
|
2709
2701
|
for (const u of r) {
|
|
2710
2702
|
if (u.placement !== "PAGE_BACKGROUND_WORKER" || !(u.userId || u.handler && u.handler.includes("USER_ID=")))
|
|
2711
2703
|
continue;
|
|
2712
2704
|
const f = u.userId || (u.handler ? this.extractUserIdFromHandler(u.handler) : null);
|
|
2713
2705
|
if (f && +f === i) {
|
|
2714
|
-
|
|
2706
|
+
l = !0;
|
|
2715
2707
|
break;
|
|
2716
2708
|
}
|
|
2717
2709
|
}
|
|
2718
2710
|
return a ? (console.log(
|
|
2719
2711
|
"BackgroundWorker: Индивидуальная встройка - разрешено"
|
|
2720
|
-
), !0) :
|
|
2712
|
+
), !0) : c && l ? (console.log(
|
|
2721
2713
|
"BackgroundWorker: Есть личная встройка, общую не запускаем"
|
|
2722
2714
|
), !1) : (console.log(
|
|
2723
2715
|
"BackgroundWorker: Проверка типа встройки пройдена, продолжаем"
|
|
@@ -2752,58 +2744,58 @@ class Me {
|
|
|
2752
2744
|
}
|
|
2753
2745
|
}
|
|
2754
2746
|
async refreshTabs(t = !1, e = this.activeMaxPause) {
|
|
2755
|
-
const r = [], i = [], a = Date.now(),
|
|
2756
|
-
for (const
|
|
2757
|
-
if (!(
|
|
2758
|
-
r.push(
|
|
2747
|
+
const r = [], i = [], a = Date.now(), c = await this.getTabs();
|
|
2748
|
+
for (const l of c) {
|
|
2749
|
+
if (!(l != null && l.data)) {
|
|
2750
|
+
r.push(l);
|
|
2759
2751
|
continue;
|
|
2760
2752
|
}
|
|
2761
|
-
if (a - new Date(
|
|
2762
|
-
r.push(
|
|
2753
|
+
if (a - new Date(l.data.lastActive || 0).getTime() > e) {
|
|
2754
|
+
r.push(l);
|
|
2763
2755
|
continue;
|
|
2764
2756
|
}
|
|
2765
|
-
i.push(
|
|
2757
|
+
i.push(l);
|
|
2766
2758
|
}
|
|
2767
2759
|
return t && r.length && await this.deleteTabs(r), this.tabList = i, i;
|
|
2768
2760
|
}
|
|
2769
2761
|
selectLeaderId() {
|
|
2770
2762
|
var e;
|
|
2771
2763
|
return this.tabList.length && +((e = [...this.tabList].sort((r, i) => {
|
|
2772
|
-
var
|
|
2764
|
+
var l, u, n, f;
|
|
2773
2765
|
const a = new Date(
|
|
2774
|
-
((
|
|
2775
|
-
).getTime(),
|
|
2766
|
+
((l = r.data) == null ? void 0 : l.createdAt) || ((u = r.data) == null ? void 0 : u.lastActive) || 0
|
|
2767
|
+
).getTime(), c = new Date(
|
|
2776
2768
|
((n = i.data) == null ? void 0 : n.createdAt) || ((f = i.data) == null ? void 0 : f.lastActive) || 0
|
|
2777
2769
|
).getTime();
|
|
2778
|
-
return a ===
|
|
2770
|
+
return a === c ? (+r.id || 0) - (+i.id || 0) : a - c;
|
|
2779
2771
|
})[0]) == null ? void 0 : e.id) || 0;
|
|
2780
2772
|
}
|
|
2781
2773
|
async runAsLeader() {
|
|
2782
2774
|
var i, a;
|
|
2783
2775
|
const t = String(((a = (i = this.bx) == null ? void 0 : i.userInfo) == null ? void 0 : a.ID) ?? "0"), e = `background-worker:${this.entityName}:${t}`;
|
|
2784
|
-
(await
|
|
2776
|
+
(await Le(
|
|
2785
2777
|
e,
|
|
2786
2778
|
async () => {
|
|
2787
2779
|
this.hasStarted = !0;
|
|
2788
|
-
const
|
|
2780
|
+
const c = Math.min(
|
|
2789
2781
|
this.activeMaxPause - 1500,
|
|
2790
2782
|
Math.max(2500, Math.floor(this.pollInterval / 2))
|
|
2791
2783
|
);
|
|
2792
2784
|
this.runHeartbeat = setInterval(
|
|
2793
2785
|
() => {
|
|
2794
2786
|
this.updateTabState(!0).catch(
|
|
2795
|
-
(
|
|
2787
|
+
(l) => console.error(
|
|
2796
2788
|
"BackgroundWorker: heartbeat update failed",
|
|
2797
|
-
|
|
2789
|
+
l
|
|
2798
2790
|
)
|
|
2799
2791
|
);
|
|
2800
2792
|
},
|
|
2801
|
-
|
|
2793
|
+
c
|
|
2802
2794
|
);
|
|
2803
2795
|
try {
|
|
2804
2796
|
await this.appInit();
|
|
2805
|
-
} catch (
|
|
2806
|
-
console.error("BackgroundWorker: appInit failed",
|
|
2797
|
+
} catch (l) {
|
|
2798
|
+
console.error("BackgroundWorker: appInit failed", l);
|
|
2807
2799
|
}
|
|
2808
2800
|
this.stopTimers(), this.id && (await this.deleteTabs([{ id: this.id }]), this.id = 0);
|
|
2809
2801
|
},
|
|
@@ -2813,15 +2805,15 @@ class Me {
|
|
|
2813
2805
|
);
|
|
2814
2806
|
}
|
|
2815
2807
|
async setBackgroundWorkerAll() {
|
|
2816
|
-
var
|
|
2817
|
-
if (!((
|
|
2808
|
+
var b, p, S, C;
|
|
2809
|
+
if (!((b = this.bx) != null && b.isAdmin)) {
|
|
2818
2810
|
console.log(
|
|
2819
2811
|
"BackgroundWorker: setBackgroundWorkerAll доступен только админам"
|
|
2820
2812
|
);
|
|
2821
2813
|
return;
|
|
2822
2814
|
}
|
|
2823
|
-
(
|
|
2824
|
-
const t = _(this,
|
|
2815
|
+
(p = this.users) != null && p.length || await this.getEntityData(), Kt(this.bx);
|
|
2816
|
+
const t = _(this, yt, zt).call(this, ((C = (S = this.bx) == null ? void 0 : S.appConst) == null ? void 0 : C.pathApp) ?? "");
|
|
2825
2817
|
if (!t) {
|
|
2826
2818
|
console.error(
|
|
2827
2819
|
"BackgroundWorker: setBackgroundWorkerAll — нет валидного pathApp, привязка PAGE_BACKGROUND_WORKER пропущена"
|
|
@@ -2830,71 +2822,77 @@ class Me {
|
|
|
2830
2822
|
}
|
|
2831
2823
|
const e = await this.safeCall(
|
|
2832
2824
|
() => this.bx.getPlacement()
|
|
2833
|
-
), r = /* @__PURE__ */ new Map();
|
|
2834
|
-
let
|
|
2835
|
-
(e || []).forEach((
|
|
2836
|
-
if (
|
|
2825
|
+
), r = /* @__PURE__ */ new Map(), i = /* @__PURE__ */ new Map();
|
|
2826
|
+
let a = null;
|
|
2827
|
+
(e || []).forEach((N) => {
|
|
2828
|
+
if (N.placement !== "PAGE_BACKGROUND_WORKER")
|
|
2837
2829
|
return;
|
|
2838
|
-
if (
|
|
2839
|
-
const
|
|
2840
|
-
|
|
2830
|
+
if (N.userId || N.handler && N.handler.includes("USER_ID=")) {
|
|
2831
|
+
const E = N.userId || (N.handler ? this.extractUserIdFromHandler(N.handler) : null);
|
|
2832
|
+
if (E) {
|
|
2833
|
+
const k = +E;
|
|
2834
|
+
r.set(k, N), i.has(k) || i.set(k, []), i.get(k).push(N);
|
|
2835
|
+
}
|
|
2841
2836
|
} else
|
|
2842
|
-
|
|
2837
|
+
a = N;
|
|
2843
2838
|
});
|
|
2844
|
-
const
|
|
2845
|
-
|
|
2846
|
-
const
|
|
2847
|
-
return (
|
|
2839
|
+
const c = await this.resolveAdmins(), l = await this.getEligibleUsersForBackgroundWorker(c);
|
|
2840
|
+
l.sort((N, I) => {
|
|
2841
|
+
const E = N.LAST_LOGIN ? new Date(N.LAST_LOGIN) : /* @__PURE__ */ new Date(0);
|
|
2842
|
+
return (I.LAST_LOGIN ? new Date(I.LAST_LOGIN) : /* @__PURE__ */ new Date(0)) - E;
|
|
2848
2843
|
});
|
|
2849
|
-
const
|
|
2850
|
-
const
|
|
2851
|
-
if (!
|
|
2844
|
+
const u = 10, n = l.slice(0, u), f = n.filter((N) => {
|
|
2845
|
+
const I = r.get(+N.ID);
|
|
2846
|
+
if (!I)
|
|
2852
2847
|
return !0;
|
|
2853
|
-
const
|
|
2854
|
-
return
|
|
2855
|
-
}),
|
|
2856
|
-
for (const [
|
|
2857
|
-
const
|
|
2858
|
-
|
|
2848
|
+
const E = `${t}?USER_ID=${N.ID}/`;
|
|
2849
|
+
return I.handler !== E;
|
|
2850
|
+
}), d = [];
|
|
2851
|
+
for (const [N] of r) {
|
|
2852
|
+
const I = +N || 0;
|
|
2853
|
+
l.find((k) => +k.ID === I) || d.push(I);
|
|
2859
2854
|
}
|
|
2860
|
-
for (const
|
|
2861
|
-
const
|
|
2862
|
-
if (!
|
|
2855
|
+
for (const N of n) {
|
|
2856
|
+
const I = r.get(+N.ID);
|
|
2857
|
+
if (!I)
|
|
2863
2858
|
continue;
|
|
2864
|
-
const
|
|
2865
|
-
|
|
2859
|
+
const E = `${t}?USER_ID=${N.ID}/`;
|
|
2860
|
+
I.handler !== E && d.push(+N.ID);
|
|
2866
2861
|
}
|
|
2867
|
-
const
|
|
2868
|
-
for (const
|
|
2869
|
-
|
|
2870
|
-
|
|
2871
|
-
|
|
2872
|
-
|
|
2873
|
-
|
|
2874
|
-
|
|
2875
|
-
|
|
2876
|
-
|
|
2877
|
-
|
|
2862
|
+
const A = [], h = [...new Set(d)];
|
|
2863
|
+
for (const N of h) {
|
|
2864
|
+
const I = i.get(+N) || [];
|
|
2865
|
+
for (const E of I)
|
|
2866
|
+
E != null && E.handler && A.push({
|
|
2867
|
+
method: "placement.unbind",
|
|
2868
|
+
params: {
|
|
2869
|
+
PLACEMENT: "PAGE_BACKGROUND_WORKER",
|
|
2870
|
+
HANDLER: E.handler
|
|
2871
|
+
}
|
|
2872
|
+
});
|
|
2873
|
+
}
|
|
2874
|
+
const O = a && (f.length > 0 || a.handler !== `${t}`);
|
|
2875
|
+
O && A.push({
|
|
2878
2876
|
method: "placement.unbind",
|
|
2879
2877
|
params: {
|
|
2880
2878
|
PLACEMENT: "PAGE_BACKGROUND_WORKER",
|
|
2881
|
-
HANDLER:
|
|
2879
|
+
HANDLER: a.handler || `${t}`
|
|
2882
2880
|
}
|
|
2883
2881
|
});
|
|
2884
|
-
for (const
|
|
2885
|
-
|
|
2882
|
+
for (const N of f)
|
|
2883
|
+
A.push({
|
|
2886
2884
|
method: "placement.bind",
|
|
2887
2885
|
params: {
|
|
2888
2886
|
PLACEMENT: "PAGE_BACKGROUND_WORKER",
|
|
2889
|
-
HANDLER: `${t}?USER_ID=${
|
|
2887
|
+
HANDLER: `${t}?USER_ID=${N.ID}/`,
|
|
2890
2888
|
LANG_ALL: { ru: { TITLE: this.appName } },
|
|
2891
2889
|
OPTIONS: {
|
|
2892
|
-
errorHandlerUrl: `${t}?USER_ID=${
|
|
2890
|
+
errorHandlerUrl: `${t}?USER_ID=${N.ID}/`
|
|
2893
2891
|
},
|
|
2894
|
-
USER_ID:
|
|
2892
|
+
USER_ID: N.ID
|
|
2895
2893
|
}
|
|
2896
2894
|
});
|
|
2897
|
-
(!
|
|
2895
|
+
(!a || O) && A.push({
|
|
2898
2896
|
method: "placement.bind",
|
|
2899
2897
|
params: {
|
|
2900
2898
|
PLACEMENT: "PAGE_BACKGROUND_WORKER",
|
|
@@ -2903,24 +2901,24 @@ class Me {
|
|
|
2903
2901
|
OPTIONS: { errorHandlerUrl: `${t}` }
|
|
2904
2902
|
}
|
|
2905
2903
|
});
|
|
2906
|
-
const
|
|
2907
|
-
(
|
|
2908
|
-
),
|
|
2909
|
-
(
|
|
2904
|
+
const T = A.filter(
|
|
2905
|
+
(N) => N.method === "placement.unbind"
|
|
2906
|
+
), R = A.filter(
|
|
2907
|
+
(N) => N.method === "placement.bind"
|
|
2910
2908
|
);
|
|
2911
|
-
|
|
2909
|
+
T.length && await this.safeCall(
|
|
2912
2910
|
() => this.bx.batch(
|
|
2913
2911
|
Object.fromEntries(
|
|
2914
|
-
|
|
2912
|
+
T.map((N, I) => [`unbind_${I}`, N])
|
|
2915
2913
|
)
|
|
2916
2914
|
)
|
|
2917
|
-
),
|
|
2915
|
+
), R.length && await this.safeCall(
|
|
2918
2916
|
() => this.bx.batch(
|
|
2919
2917
|
Object.fromEntries(
|
|
2920
|
-
|
|
2918
|
+
R.map((N, I) => [`bind_${I}`, N])
|
|
2921
2919
|
)
|
|
2922
2920
|
)
|
|
2923
|
-
),
|
|
2921
|
+
), A.length || console.log("setBackgroundWorkerAll: Нет операций");
|
|
2924
2922
|
}
|
|
2925
2923
|
async resolveAdmins() {
|
|
2926
2924
|
var t, e;
|
|
@@ -2935,10 +2933,10 @@ class Me {
|
|
|
2935
2933
|
}
|
|
2936
2934
|
return a;
|
|
2937
2935
|
}
|
|
2938
|
-
const
|
|
2939
|
-
r &&
|
|
2940
|
-
const
|
|
2941
|
-
return await this.saveAdminsList(
|
|
2936
|
+
const c = /* @__PURE__ */ new Set([...a || []]);
|
|
2937
|
+
r && c.add(+r);
|
|
2938
|
+
const l = [...c].filter(Boolean);
|
|
2939
|
+
return await this.saveAdminsList(l), l;
|
|
2942
2940
|
} catch (r) {
|
|
2943
2941
|
return console.error("BackgroundWorker: resolveAdmins error", r), [];
|
|
2944
2942
|
}
|
|
@@ -2996,7 +2994,7 @@ class Me {
|
|
|
2996
2994
|
}
|
|
2997
2995
|
}
|
|
2998
2996
|
}
|
|
2999
|
-
|
|
2997
|
+
yt = new WeakSet(), zt = function(t) {
|
|
3000
2998
|
if (!t || typeof t != "string")
|
|
3001
2999
|
return "";
|
|
3002
3000
|
const e = Qt(t).replace(/\/+$/, "");
|
|
@@ -3007,8 +3005,8 @@ pt = new WeakSet(), zt = function(t) {
|
|
|
3007
3005
|
export {
|
|
3008
3006
|
Me as BackgroundWorker,
|
|
3009
3007
|
v as Batch,
|
|
3010
|
-
|
|
3008
|
+
Ie as BxBoot,
|
|
3011
3009
|
se as BxHelper,
|
|
3012
3010
|
_e as BxLogger,
|
|
3013
|
-
|
|
3011
|
+
pt as tempus
|
|
3014
3012
|
};
|