szdl-utils-kit 0.3.16 → 0.3.17
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 +1156 -1166
- package/dist/index.umd.cjs +2 -2
- package/dist/types/bx-boot.d.ts +10 -2
- package/dist/types/bx-logger.d.ts +5 -0
- package/package.json +45 -44
package/dist/index.js
CHANGED
|
@@ -1,54 +1,54 @@
|
|
|
1
|
-
var
|
|
2
|
-
var
|
|
3
|
-
var
|
|
4
|
-
if (!t.has(
|
|
1
|
+
var ge = Object.defineProperty;
|
|
2
|
+
var pe = (y, t, e) => t in y ? ge(y, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : y[t] = e;
|
|
3
|
+
var B = (y, t, e) => (pe(y, typeof t != "symbol" ? t + "" : t, e), e), Wt = (y, t, e) => {
|
|
4
|
+
if (!t.has(y))
|
|
5
5
|
throw TypeError("Cannot " + e);
|
|
6
6
|
};
|
|
7
|
-
var
|
|
8
|
-
if (t.has(
|
|
7
|
+
var E = (y, t, e) => (Wt(y, t, "read from private field"), e ? e.call(y) : t.get(y)), S = (y, t, e) => {
|
|
8
|
+
if (t.has(y))
|
|
9
9
|
throw TypeError("Cannot add the same private member more than once");
|
|
10
|
-
t instanceof WeakSet ? t.add(
|
|
11
|
-
},
|
|
12
|
-
var
|
|
13
|
-
var
|
|
14
|
-
function
|
|
15
|
-
return
|
|
10
|
+
t instanceof WeakSet ? t.add(y) : t.set(y, e);
|
|
11
|
+
}, F = (y, t, e, r) => (Wt(y, t, "write to private field"), r ? r.call(y, e) : t.set(y, e), e);
|
|
12
|
+
var _ = (y, t, e) => (Wt(y, t, "access private method"), e);
|
|
13
|
+
var ye = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
|
|
14
|
+
function Ne(y) {
|
|
15
|
+
return y && y.__esModule && Object.prototype.hasOwnProperty.call(y, "default") ? y.default : y;
|
|
16
16
|
}
|
|
17
|
-
var
|
|
18
|
-
(function(
|
|
17
|
+
var Xt = { exports: {} };
|
|
18
|
+
(function(y, t) {
|
|
19
19
|
(function(e) {
|
|
20
|
-
Array.prototype.indexOf || (Array.prototype.indexOf = function(
|
|
21
|
-
var
|
|
22
|
-
for (
|
|
23
|
-
if (this[
|
|
24
|
-
return
|
|
20
|
+
Array.prototype.indexOf || (Array.prototype.indexOf = function(s, o) {
|
|
21
|
+
var m, g;
|
|
22
|
+
for (m = o || 0, g = this.length; m < g; m += 1)
|
|
23
|
+
if (this[m] === s)
|
|
24
|
+
return m;
|
|
25
25
|
return -1;
|
|
26
26
|
});
|
|
27
|
-
var
|
|
28
|
-
for (var
|
|
29
|
-
|
|
30
|
-
return
|
|
31
|
-
}, a = function(
|
|
32
|
-
return o !== e ? (
|
|
33
|
-
},
|
|
34
|
-
var
|
|
35
|
-
return
|
|
36
|
-
},
|
|
37
|
-
var
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
27
|
+
var r = this, i = function(s, o) {
|
|
28
|
+
for (var m = s.toString(); m.length < o; )
|
|
29
|
+
m = "0" + m;
|
|
30
|
+
return m;
|
|
31
|
+
}, a = function(s, o) {
|
|
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
|
+
}, A = function(s, o) {
|
|
34
|
+
var m, g = "";
|
|
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
|
+
}, h = function(s, o) {
|
|
37
|
+
var m, g = [
|
|
38
|
+
s.slice(o, o + 1),
|
|
39
|
+
s.charAt(o + 2),
|
|
40
|
+
s.slice(o + 3, o + 4),
|
|
41
|
+
s.charAt(o + 5),
|
|
42
|
+
s.slice(o + 6, o + 9)
|
|
43
43
|
], w;
|
|
44
|
-
return !isNaN(Number(g[0])) && !isNaN(Number(g[2])) && !isNaN(Number(g[4])) ? (g[1] === "." && g[3] === "." ?
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
], !isNaN(Number(w[0])) && !isNaN(Number(w[2])) && !isNaN(Number(w[4])) ? (w[1] === "-" && w[3] === "-" && (
|
|
51
|
-
},
|
|
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) : (w = [
|
|
45
|
+
s.slice(o, o + 3),
|
|
46
|
+
s.charAt(o + 4),
|
|
47
|
+
s.slice(o + 5, o + 6),
|
|
48
|
+
s.charAt(o + 7),
|
|
49
|
+
s.slice(o + 8, o + 9)
|
|
50
|
+
], !isNaN(Number(w[0])) && !isNaN(Number(w[2])) && !isNaN(Number(w[4])) ? (w[1] === "-" && w[3] === "-" && (m = "%Y-%m-%d"), m) : "");
|
|
51
|
+
}, u = r.tempus, n, f, d = r.navigator || {}, c = "en", l = {
|
|
52
52
|
en: {
|
|
53
53
|
JANUARY_SHORT: "Jan",
|
|
54
54
|
FEBRUARY_SHORT: "Feb",
|
|
@@ -211,67 +211,67 @@ var Ht = { exports: {} };
|
|
|
211
211
|
}
|
|
212
212
|
}, O = function() {
|
|
213
213
|
return [
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
214
|
+
l[c].JANUARY_LONG,
|
|
215
|
+
l[c].FEBRUARY_LONG,
|
|
216
|
+
l[c].MARCH_LONG,
|
|
217
|
+
l[c].APRIL_LONG,
|
|
218
|
+
l[c].MAY_LONG,
|
|
219
|
+
l[c].JUNE_LONG,
|
|
220
|
+
l[c].JULY_LONG,
|
|
221
|
+
l[c].AUGUST_LONG,
|
|
222
|
+
l[c].SEPTEMBER_LONG,
|
|
223
|
+
l[c].OCTOBER_LONG,
|
|
224
|
+
l[c].NOVEMBER_LONG,
|
|
225
|
+
l[c].DECEMBER_LONG
|
|
226
226
|
];
|
|
227
227
|
}, T = function() {
|
|
228
228
|
return [
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
229
|
+
l[c].JANUARY_SHORT,
|
|
230
|
+
l[c].FEBRUARY_SHORT,
|
|
231
|
+
l[c].MARCH_SHORT,
|
|
232
|
+
l[c].APRIL_SHORT,
|
|
233
|
+
l[c].MAY_SHORT,
|
|
234
|
+
l[c].JUNE_SHORT,
|
|
235
|
+
l[c].JULY_SHORT,
|
|
236
|
+
l[c].AUGUST_SHORT,
|
|
237
|
+
l[c].SEPTEMBER_SHORT,
|
|
238
|
+
l[c].OCTOBER_SHORT,
|
|
239
|
+
l[c].NOVEMBER_SHORT,
|
|
240
|
+
l[c].DECEMBER_SHORT
|
|
241
241
|
];
|
|
242
|
-
},
|
|
242
|
+
}, b = function() {
|
|
243
243
|
return [
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
244
|
+
l[c].SUNDAY_LONG,
|
|
245
|
+
l[c].MONDAY_LONG,
|
|
246
|
+
l[c].TUESDAY_LONG,
|
|
247
|
+
l[c].WEDNESDAY_LONG,
|
|
248
|
+
l[c].THURSDAY_LONG,
|
|
249
|
+
l[c].FRIDAY_LONG,
|
|
250
|
+
l[c].SATURDAY_LONG
|
|
251
251
|
];
|
|
252
|
-
},
|
|
252
|
+
}, I = function() {
|
|
253
253
|
return [
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
254
|
+
l[c].SUNDAY_SHORT,
|
|
255
|
+
l[c].MONDAY_SHORT,
|
|
256
|
+
l[c].TUESDAY_SHORT,
|
|
257
|
+
l[c].WEDNESDAY_SHORT,
|
|
258
|
+
l[c].THURSDAY_SHORT,
|
|
259
|
+
l[c].FRIDAY_SHORT,
|
|
260
|
+
l[c].SATURDAY_SHORT
|
|
261
261
|
];
|
|
262
|
-
}, N,
|
|
262
|
+
}, N, p, R, M, H = function(s, o, m) {
|
|
263
263
|
var g;
|
|
264
|
-
|
|
265
|
-
g.readyState === 4 && (g.status === 200 ? o && (
|
|
266
|
-
https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.parse(g.responseText))) :
|
|
267
|
-
}, g.open("GET",
|
|
264
|
+
r.XMLHttpRequest ? g = new XMLHttpRequest() : g = new ActiveXObject("Microsoft.XMLHTTP"), g.onreadystatechange = function() {
|
|
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
|
+
https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.parse(g.responseText))) : m && m(g));
|
|
267
|
+
}, g.open("GET", s, !1), g.send();
|
|
268
268
|
}, k = {
|
|
269
269
|
"%d": {
|
|
270
|
-
format: function(
|
|
271
|
-
return i(
|
|
270
|
+
format: function(s) {
|
|
271
|
+
return i(s.day() || n.MIN_DAY, 2);
|
|
272
272
|
},
|
|
273
|
-
parse: function(
|
|
274
|
-
var o = Number(
|
|
273
|
+
parse: function(s) {
|
|
274
|
+
var o = Number(s);
|
|
275
275
|
return { day: isNaN(o) ? e : o };
|
|
276
276
|
},
|
|
277
277
|
minLength: 2,
|
|
@@ -279,11 +279,11 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
279
279
|
type: "number"
|
|
280
280
|
},
|
|
281
281
|
"%m": {
|
|
282
|
-
format: function(
|
|
283
|
-
return i(
|
|
282
|
+
format: function(s) {
|
|
283
|
+
return i(s.month() || n.MIN_MONTH, 2);
|
|
284
284
|
},
|
|
285
|
-
parse: function(
|
|
286
|
-
var o = Number(
|
|
285
|
+
parse: function(s) {
|
|
286
|
+
var o = Number(s);
|
|
287
287
|
return { month: isNaN(o) ? e : o };
|
|
288
288
|
},
|
|
289
289
|
minLength: 2,
|
|
@@ -291,11 +291,11 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
291
291
|
type: "number"
|
|
292
292
|
},
|
|
293
293
|
"%Y": {
|
|
294
|
-
format: function(
|
|
295
|
-
return i(
|
|
294
|
+
format: function(s) {
|
|
295
|
+
return i(s.year() || n.MIN_YEAR, 4);
|
|
296
296
|
},
|
|
297
|
-
parse: function(
|
|
298
|
-
var o = Number(
|
|
297
|
+
parse: function(s) {
|
|
298
|
+
var o = Number(s);
|
|
299
299
|
return { year: isNaN(o) ? e : o };
|
|
300
300
|
},
|
|
301
301
|
minLength: 4,
|
|
@@ -303,8 +303,8 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
303
303
|
type: "number"
|
|
304
304
|
},
|
|
305
305
|
"%w": {
|
|
306
|
-
format: function(
|
|
307
|
-
return
|
|
306
|
+
format: function(s) {
|
|
307
|
+
return s.dayOfWeek() || n.MIN_DAY_OF_WEEK;
|
|
308
308
|
},
|
|
309
309
|
parse: function() {
|
|
310
310
|
return {};
|
|
@@ -314,9 +314,9 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
314
314
|
type: "number"
|
|
315
315
|
},
|
|
316
316
|
"%a": {
|
|
317
|
-
format: function(
|
|
318
|
-
var o =
|
|
319
|
-
return
|
|
317
|
+
format: function(s) {
|
|
318
|
+
var o = s.dayOfWeek();
|
|
319
|
+
return M[o !== e ? o : n.MIN_DAY_OF_WEEK];
|
|
320
320
|
},
|
|
321
321
|
parse: function() {
|
|
322
322
|
return {};
|
|
@@ -326,9 +326,9 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
326
326
|
type: "word"
|
|
327
327
|
},
|
|
328
328
|
"%A": {
|
|
329
|
-
format: function(
|
|
330
|
-
var o =
|
|
331
|
-
return
|
|
329
|
+
format: function(s) {
|
|
330
|
+
var o = s.dayOfWeek();
|
|
331
|
+
return R[o !== e ? o : n.MIN_DAY_OF_WEEK];
|
|
332
332
|
},
|
|
333
333
|
parse: function() {
|
|
334
334
|
return {};
|
|
@@ -338,12 +338,12 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
338
338
|
type: "word"
|
|
339
339
|
},
|
|
340
340
|
"%b": {
|
|
341
|
-
format: function(
|
|
342
|
-
var o = n.options("monthFromZero") ?
|
|
343
|
-
return
|
|
341
|
+
format: function(s) {
|
|
342
|
+
var o = n.options("monthFromZero") ? s.month() : s.month() - 1;
|
|
343
|
+
return p[o !== e ? o : n.MIN_MONTH];
|
|
344
344
|
},
|
|
345
|
-
parse: function(
|
|
346
|
-
var o = n.monthNames().indexOf(
|
|
345
|
+
parse: function(s) {
|
|
346
|
+
var o = n.monthNames().indexOf(s) + (n.options("monthFromZero") ? 0 : 1);
|
|
347
347
|
return { month: o !== -1 ? o : e };
|
|
348
348
|
},
|
|
349
349
|
minLength: 1,
|
|
@@ -351,12 +351,12 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
351
351
|
type: "word"
|
|
352
352
|
},
|
|
353
353
|
"%B": {
|
|
354
|
-
format: function(
|
|
355
|
-
var o = n.options("monthFromZero") ?
|
|
354
|
+
format: function(s) {
|
|
355
|
+
var o = n.options("monthFromZero") ? s.month() : s.month() - 1;
|
|
356
356
|
return N[o !== e ? o : n.MIN_MONTH];
|
|
357
357
|
},
|
|
358
|
-
parse: function(
|
|
359
|
-
var o = n.monthNames(!0).indexOf(
|
|
358
|
+
parse: function(s) {
|
|
359
|
+
var o = n.monthNames(!0).indexOf(s) + (n.options("monthFromZero") ? 0 : 1);
|
|
360
360
|
return { month: o !== -1 ? o : e };
|
|
361
361
|
},
|
|
362
362
|
minLength: 1,
|
|
@@ -364,11 +364,11 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
364
364
|
type: "word"
|
|
365
365
|
},
|
|
366
366
|
"%H": {
|
|
367
|
-
format: function(
|
|
368
|
-
return i(
|
|
367
|
+
format: function(s) {
|
|
368
|
+
return i(s.hours() || n.MIN_HOURS, 2);
|
|
369
369
|
},
|
|
370
|
-
parse: function(
|
|
371
|
-
var o = Number(
|
|
370
|
+
parse: function(s) {
|
|
371
|
+
var o = Number(s);
|
|
372
372
|
return { hours: isNaN(o) ? e : o };
|
|
373
373
|
},
|
|
374
374
|
minLength: 2,
|
|
@@ -376,11 +376,11 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
376
376
|
type: "number"
|
|
377
377
|
},
|
|
378
378
|
"%M": {
|
|
379
|
-
format: function(
|
|
380
|
-
return i(
|
|
379
|
+
format: function(s) {
|
|
380
|
+
return i(s.minutes() || n.MIN_MINUTES, 2);
|
|
381
381
|
},
|
|
382
|
-
parse: function(
|
|
383
|
-
var o = Number(
|
|
382
|
+
parse: function(s) {
|
|
383
|
+
var o = Number(s);
|
|
384
384
|
return { minutes: isNaN(o) ? e : o };
|
|
385
385
|
},
|
|
386
386
|
minLength: 2,
|
|
@@ -388,11 +388,11 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
388
388
|
type: "number"
|
|
389
389
|
},
|
|
390
390
|
"%S": {
|
|
391
|
-
format: function(
|
|
392
|
-
return i(
|
|
391
|
+
format: function(s) {
|
|
392
|
+
return i(s.seconds() || n.MIN_SECONDS, 2);
|
|
393
393
|
},
|
|
394
|
-
parse: function(
|
|
395
|
-
var o = Number(
|
|
394
|
+
parse: function(s) {
|
|
395
|
+
var o = Number(s);
|
|
396
396
|
return { seconds: isNaN(o) ? e : o };
|
|
397
397
|
},
|
|
398
398
|
minLength: 2,
|
|
@@ -400,25 +400,25 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
400
400
|
type: "number"
|
|
401
401
|
},
|
|
402
402
|
"%s": {
|
|
403
|
-
format: function(
|
|
404
|
-
return
|
|
403
|
+
format: function(s) {
|
|
404
|
+
return s.timestamp();
|
|
405
405
|
},
|
|
406
|
-
parse: function(
|
|
407
|
-
return isNaN(Number(
|
|
406
|
+
parse: function(s) {
|
|
407
|
+
return isNaN(Number(s)) ? {} : n(Number(s)).get();
|
|
408
408
|
},
|
|
409
409
|
minLength: 1,
|
|
410
410
|
maxLength: 20,
|
|
411
411
|
type: "number"
|
|
412
412
|
},
|
|
413
413
|
"%F": {
|
|
414
|
-
format: function(
|
|
415
|
-
return i(
|
|
414
|
+
format: function(s) {
|
|
415
|
+
return i(s.year() || n.MIN_YEAR, 4) + "-" + i(s.month() || n.MIN_MONTH, 2) + "-" + i(s.day() || n.MIN_DAY, 2);
|
|
416
416
|
},
|
|
417
|
-
parse: function(
|
|
418
|
-
var o = Number(
|
|
417
|
+
parse: function(s) {
|
|
418
|
+
var o = Number(s.slice(0, 4)), m = Number(s.slice(5, 7)), g = Number(s.slice(8, 10));
|
|
419
419
|
return {
|
|
420
420
|
year: o,
|
|
421
|
-
month:
|
|
421
|
+
month: m,
|
|
422
422
|
day: g
|
|
423
423
|
};
|
|
424
424
|
},
|
|
@@ -427,15 +427,15 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
427
427
|
type: "string"
|
|
428
428
|
},
|
|
429
429
|
"%D": {
|
|
430
|
-
format: function(
|
|
431
|
-
return i(
|
|
430
|
+
format: function(s) {
|
|
431
|
+
return i(s.month() || n.MIN_MONTH, 2) + "/" + i(s.day() || n.MIN_DAY, 2) + "/" + i(s.year() || n.MIN_YEAR, 4);
|
|
432
432
|
},
|
|
433
|
-
parse: function(
|
|
434
|
-
var o = Number(
|
|
433
|
+
parse: function(s) {
|
|
434
|
+
var o = Number(s.slice(0, 2)), m = Number(s.slice(3, 5)), g = Number(s.slice(6, 10));
|
|
435
435
|
return {
|
|
436
436
|
year: g,
|
|
437
437
|
month: o,
|
|
438
|
-
day:
|
|
438
|
+
day: m
|
|
439
439
|
};
|
|
440
440
|
},
|
|
441
441
|
minLength: 10,
|
|
@@ -445,8 +445,8 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
445
445
|
}, U = {
|
|
446
446
|
useMilliseconds: !1,
|
|
447
447
|
monthFromZero: !1
|
|
448
|
-
},
|
|
449
|
-
|
|
448
|
+
}, D;
|
|
449
|
+
D = function(s, o, m) {
|
|
450
450
|
return this._d = /* @__PURE__ */ new Date(), this._i = {
|
|
451
451
|
year: !1,
|
|
452
452
|
month: !1,
|
|
@@ -455,56 +455,56 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
455
455
|
minutes: !1,
|
|
456
456
|
seconds: !1,
|
|
457
457
|
milliseconds: !1
|
|
458
|
-
},
|
|
459
|
-
},
|
|
460
|
-
var
|
|
461
|
-
return this.leapYear() &&
|
|
462
|
-
},
|
|
458
|
+
}, s !== e && this.set(s, o, m), this;
|
|
459
|
+
}, D.fn = D.prototype, D.fn.dayCount = function() {
|
|
460
|
+
var s = this.month(), o = n.MAX_DAY_IN_MONTHS[s - (n.options("monthFromZero") ? 0 : 1)];
|
|
461
|
+
return this.leapYear() && s === (n.options("monthFromZero") ? 1 : 2) && (o += 1), o;
|
|
462
|
+
}, D.fn.year = function(s) {
|
|
463
463
|
if (arguments.length !== 0)
|
|
464
|
-
(typeof
|
|
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
|
+
}, D.fn.month = function(s) {
|
|
469
469
|
if (arguments.length !== 0)
|
|
470
|
-
(typeof
|
|
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
|
+
}, D.fn.day = function(s) {
|
|
475
475
|
if (arguments.length !== 0)
|
|
476
|
-
(typeof
|
|
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
|
+
}, D.fn.hours = function(s) {
|
|
481
481
|
if (arguments.length !== 0)
|
|
482
|
-
(typeof
|
|
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
|
+
}, D.fn.minutes = function(s) {
|
|
487
487
|
if (arguments.length !== 0)
|
|
488
|
-
(typeof
|
|
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
|
+
}, D.fn.seconds = function(s) {
|
|
493
493
|
if (arguments.length !== 0)
|
|
494
|
-
(typeof
|
|
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
|
+
}, D.fn.milliseconds = function(s) {
|
|
499
499
|
if (arguments.length !== 0)
|
|
500
|
-
(typeof
|
|
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
|
-
},
|
|
505
|
-
var
|
|
506
|
-
return Math.ceil(((o -
|
|
507
|
-
},
|
|
504
|
+
}, D.fn.week = function() {
|
|
505
|
+
var s = new Date(this.year(), 0, 1), o = n(this.utc()).hours(0).minutes(0).seconds(0).milliseconds(0).utc() * 1e3;
|
|
506
|
+
return Math.ceil(((o - s.getTime()) / 864e5 + s.getDay() + 1) / 7);
|
|
507
|
+
}, D.fn.set = function(s, o, m) {
|
|
508
508
|
if (this._i = {
|
|
509
509
|
year: !1,
|
|
510
510
|
month: !1,
|
|
@@ -513,16 +513,16 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
513
513
|
minutes: !1,
|
|
514
514
|
seconds: !1,
|
|
515
515
|
milliseconds: !1
|
|
516
|
-
},
|
|
516
|
+
}, s === e)
|
|
517
517
|
return this._d = /* @__PURE__ */ new Date(), this;
|
|
518
|
-
if (
|
|
519
|
-
return this._d =
|
|
520
|
-
if (typeof
|
|
521
|
-
return this._d = new Date(
|
|
522
|
-
if (typeof
|
|
523
|
-
var g, w = [],
|
|
524
|
-
if (
|
|
525
|
-
return
|
|
518
|
+
if (s instanceof Date)
|
|
519
|
+
return this._d = s, this;
|
|
520
|
+
if (typeof s == "number")
|
|
521
|
+
return this._d = new Date(s * (n.options("useMilliseconds") ? 1 : 1e3)), this;
|
|
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, w = [], L, C, z = [], W = 0, x = 0, P, j, G = {}, Y;
|
|
524
|
+
if (s === e)
|
|
525
|
+
return L = a(this, m), L === 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
|
-
}),
|
|
534
|
-
for (o === e && (o = n.detectFormat(
|
|
533
|
+
}), L;
|
|
534
|
+
for (o === e && (o = n.detectFormat(s)); W < o.length; ) {
|
|
535
535
|
if (o.charAt(W) === "%") {
|
|
536
|
-
if (
|
|
537
|
-
switch (
|
|
536
|
+
if (C = o.charAt(W) + o.charAt(W + 1), k[C] !== e) {
|
|
537
|
+
switch (P = 0, j = "", k[C].type) {
|
|
538
538
|
case "number":
|
|
539
|
-
for (;
|
|
540
|
-
|
|
539
|
+
for (; P < k[C].maxLength && x + P < s.length && !isNaN(Number(s.charAt(x + P))); )
|
|
540
|
+
j += s.charAt(x + P), P += 1;
|
|
541
541
|
break;
|
|
542
542
|
case "word":
|
|
543
|
-
for (;
|
|
544
|
-
|
|
543
|
+
for (; P < k[C].maxLength && x + P < s.length && /^[\u00BF-\u1FFF\u2C00-\uD7FF\w]+$/.test(s.charAt(x + P)); )
|
|
544
|
+
j += s.charAt(x + P), P += 1;
|
|
545
545
|
break;
|
|
546
546
|
case "string":
|
|
547
|
-
for (;
|
|
548
|
-
|
|
547
|
+
for (; P < k[C].maxLength && x + P < s.length; )
|
|
548
|
+
j += s.charAt(x + P), P += 1;
|
|
549
549
|
break;
|
|
550
550
|
}
|
|
551
|
-
if (
|
|
552
|
-
return
|
|
551
|
+
if (P < k[C].minLength)
|
|
552
|
+
return L = a(this, m), L === 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
|
-
w.push(
|
|
560
|
+
}), L;
|
|
561
|
+
w.push(C), z.push(j), P -= 1, x += P, W += 1;
|
|
562
562
|
}
|
|
563
|
-
} else if (
|
|
564
|
-
return
|
|
563
|
+
} else if (s.charAt(x) !== o.charAt(W))
|
|
564
|
+
return L = a(this, m), L === e && (this._i = {
|
|
565
565
|
year: -1,
|
|
566
566
|
month: -1,
|
|
567
567
|
day: -1,
|
|
@@ -569,51 +569,51 @@ 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
|
+
}), L;
|
|
573
573
|
W += 1, x += 1;
|
|
574
574
|
}
|
|
575
575
|
for (g in w)
|
|
576
|
-
w.hasOwnProperty(g) && k.hasOwnProperty(w[g]) && (
|
|
577
|
-
year:
|
|
578
|
-
month:
|
|
579
|
-
day:
|
|
580
|
-
hours:
|
|
581
|
-
minutes:
|
|
582
|
-
seconds:
|
|
576
|
+
w.hasOwnProperty(g) && k.hasOwnProperty(w[g]) && (Y = k[w[g]].parse(z[g]), G = {
|
|
577
|
+
year: Y.year !== e ? Y.year : G.year,
|
|
578
|
+
month: Y.month !== e ? Y.month : G.month,
|
|
579
|
+
day: Y.day !== e ? Y.day : G.day,
|
|
580
|
+
hours: Y.hours !== e ? Y.hours : G.hours,
|
|
581
|
+
minutes: Y.minutes !== e ? Y.minutes : G.minutes,
|
|
582
|
+
seconds: Y.seconds !== e ? Y.seconds : G.seconds
|
|
583
583
|
});
|
|
584
584
|
this.day(n.MIN_DAY), this.year(G.year), this.month(G.month), this.day(G.day), this.hours(G.hours), this.minutes(G.minutes), this.seconds(G.seconds), this.milliseconds(G.milliseconds);
|
|
585
585
|
}
|
|
586
586
|
return this;
|
|
587
|
-
},
|
|
588
|
-
var
|
|
589
|
-
return
|
|
590
|
-
},
|
|
591
|
-
return arguments.length !== 0 ? (this._d = new Date(Number(
|
|
592
|
-
},
|
|
593
|
-
return arguments.length !== 0 ? (this._d = new Date(Number(
|
|
594
|
-
},
|
|
595
|
-
if (
|
|
596
|
-
return
|
|
597
|
-
if (
|
|
598
|
-
return
|
|
599
|
-
if (
|
|
587
|
+
}, D.fn.leapYear = function() {
|
|
588
|
+
var s = this.year();
|
|
589
|
+
return s % 4 === 0 ? s % 100 === 0 ? s % 400 === 0 : !0 : !1;
|
|
590
|
+
}, D.fn.timestamp = function(s) {
|
|
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
|
+
}, D.fn.utc = function(s) {
|
|
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
|
+
}, D.fn.dayOfWeek = function(s) {
|
|
595
|
+
if (s === "long")
|
|
596
|
+
return R[this._d.getDay()];
|
|
597
|
+
if (s === "short")
|
|
598
|
+
return M[this._d.getDay()];
|
|
599
|
+
if (s === e)
|
|
600
600
|
return this._d.getDay();
|
|
601
|
-
if (
|
|
601
|
+
if (s === 0 || s === "Sunday")
|
|
602
602
|
return this.calc({ day: -this.dayOfWeek() });
|
|
603
|
-
if (
|
|
603
|
+
if (s === 1 || s === "Monday")
|
|
604
604
|
return this.calc({ day: (this.dayOfWeek() === 0 ? -6 : 1) - this.dayOfWeek() });
|
|
605
|
-
if (
|
|
605
|
+
if (s === 2 || s === "Tuesday")
|
|
606
606
|
return this.calc({ day: (this.dayOfWeek() === 0 ? -5 : 2) - this.dayOfWeek() });
|
|
607
|
-
if (
|
|
607
|
+
if (s === 3 || s === "Wednesday")
|
|
608
608
|
return this.calc({ day: (this.dayOfWeek() === 0 ? -4 : 3) - this.dayOfWeek() });
|
|
609
|
-
if (
|
|
609
|
+
if (s === 4 || s === "Thursday")
|
|
610
610
|
return this.calc({ day: (this.dayOfWeek() === 0 ? -3 : 4) - this.dayOfWeek() });
|
|
611
|
-
if (
|
|
611
|
+
if (s === 5 || s === "Friday")
|
|
612
612
|
return this.calc({ day: (this.dayOfWeek() === 0 ? -2 : 5) - this.dayOfWeek() });
|
|
613
|
-
if (
|
|
613
|
+
if (s === 6 || s === "Saturday")
|
|
614
614
|
return this.calc({ day: (this.dayOfWeek() === 0 ? -1 : 6) - this.dayOfWeek() });
|
|
615
|
-
},
|
|
616
|
-
switch (
|
|
615
|
+
}, D.fn.timezone = function(s) {
|
|
616
|
+
switch (s) {
|
|
617
617
|
case "hours":
|
|
618
618
|
return Math.floor(this._d.getTimezoneOffset() / 60);
|
|
619
619
|
case "minutes":
|
|
@@ -621,8 +621,8 @@ 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
|
-
},
|
|
625
|
-
switch (
|
|
624
|
+
}, D.fn.get = function(s) {
|
|
625
|
+
switch (s) {
|
|
626
626
|
case "Date":
|
|
627
627
|
return new Date(
|
|
628
628
|
this.year(),
|
|
@@ -670,149 +670,149 @@ https://github.com/douglascrockford/JSON-js/blob/master/json2.js`) : o(JSON.pars
|
|
|
670
670
|
timestamp: this.timestamp()
|
|
671
671
|
};
|
|
672
672
|
}
|
|
673
|
-
},
|
|
674
|
-
for (var o = 0,
|
|
675
|
-
|
|
676
|
-
return
|
|
677
|
-
},
|
|
673
|
+
}, D.fn.format = function(s) {
|
|
674
|
+
for (var o = 0, m = "", g; o < s.length; )
|
|
675
|
+
s.charAt(o) === "%" ? (g = s.charAt(o) + s.charAt(o + 1), k[g] !== e ? (m += k[g].format(this), o += 1) : m += "%") : m += s.charAt(o), o += 1;
|
|
676
|
+
return m;
|
|
677
|
+
}, D.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
|
+
}, D.fn.errors = function() {
|
|
680
680
|
return this._i;
|
|
681
|
-
},
|
|
682
|
-
var
|
|
681
|
+
}, D.fn.between = function(s, o) {
|
|
682
|
+
var m = this.timestamp(), g = s.timestamp();
|
|
683
683
|
switch (o) {
|
|
684
684
|
case "year":
|
|
685
|
-
return Math.floor((g -
|
|
685
|
+
return Math.floor((g - m) / 31556952);
|
|
686
686
|
case "month":
|
|
687
|
-
return Math.floor((g -
|
|
687
|
+
return Math.floor((g - m) / 2629746);
|
|
688
688
|
case "day":
|
|
689
|
-
return Math.floor((g -
|
|
689
|
+
return Math.floor((g - m) / 86400);
|
|
690
690
|
case "hours":
|
|
691
|
-
return Math.floor((g -
|
|
691
|
+
return Math.floor((g - m) / 3600);
|
|
692
692
|
case "minutes":
|
|
693
|
-
return Math.floor((g -
|
|
693
|
+
return Math.floor((g - m) / 60);
|
|
694
694
|
case "seconds":
|
|
695
|
-
return g -
|
|
695
|
+
return g - m;
|
|
696
696
|
default:
|
|
697
697
|
return e;
|
|
698
698
|
}
|
|
699
|
-
},
|
|
700
|
-
return
|
|
701
|
-
}, n = function(
|
|
702
|
-
return new
|
|
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(
|
|
704
|
-
if (
|
|
699
|
+
}, D.fn.calc = function(s) {
|
|
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
|
+
}, n = function(s, o, m) {
|
|
702
|
+
return new D(s, o, m);
|
|
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
|
+
if (s === e)
|
|
705
705
|
return U;
|
|
706
|
-
if (U.hasOwnProperty(
|
|
706
|
+
if (U.hasOwnProperty(s)) {
|
|
707
707
|
if (o === e)
|
|
708
|
-
return U[
|
|
709
|
-
U[
|
|
708
|
+
return U[s];
|
|
709
|
+
U[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
|
-
return
|
|
714
|
-
}, n.generate = function(
|
|
715
|
-
var o,
|
|
716
|
-
if (typeof
|
|
713
|
+
return r.tempus = u, n;
|
|
714
|
+
}, n.generate = function(s) {
|
|
715
|
+
var o, m, g, w, L, C, z, W;
|
|
716
|
+
if (typeof s.dateFrom != "number" && (s.dateFrom instanceof D ? o = s.dateFrom.utc() : o = n(s.dateFrom, s.formatFrom).utc()), typeof s.dateTo != "number" && (s.dateTo instanceof D ? m = s.dateTo.utc() : m = n(s.dateTo, s.formatTo !== e ? s.formatTo : s.formatFrom).utc()), typeof s.period == "number" ? L = {
|
|
717
717
|
year: 0,
|
|
718
718
|
month: 0,
|
|
719
719
|
day: 0,
|
|
720
720
|
hours: 0,
|
|
721
721
|
minutes: 0,
|
|
722
|
-
seconds:
|
|
723
|
-
} : typeof
|
|
724
|
-
year:
|
|
725
|
-
month:
|
|
726
|
-
day:
|
|
727
|
-
hours:
|
|
728
|
-
minutes:
|
|
729
|
-
seconds:
|
|
730
|
-
} : typeof
|
|
731
|
-
year:
|
|
732
|
-
month:
|
|
733
|
-
day:
|
|
734
|
-
hours:
|
|
735
|
-
minutes:
|
|
736
|
-
seconds:
|
|
737
|
-
}),
|
|
738
|
-
return
|
|
739
|
-
},
|
|
722
|
+
seconds: s.period
|
|
723
|
+
} : typeof s.period == "string" ? L = {
|
|
724
|
+
year: s.period === "year" ? 1 : 0,
|
|
725
|
+
month: s.period === "month" ? 1 : 0,
|
|
726
|
+
day: s.period === "day" ? 1 : 0,
|
|
727
|
+
hours: s.period === "hours" ? 1 : 0,
|
|
728
|
+
minutes: s.period === "minutes" ? 1 : 0,
|
|
729
|
+
seconds: s.period === "seconds" ? 1 : 0
|
|
730
|
+
} : typeof s.period == "object" && (L = {
|
|
731
|
+
year: s.period.year !== e ? s.period.year : 0,
|
|
732
|
+
month: s.period.month !== e ? s.period.month : 0,
|
|
733
|
+
day: s.period.day !== e ? s.period.day : 0,
|
|
734
|
+
hours: s.period.hours !== e ? s.period.hours : 0,
|
|
735
|
+
minutes: s.period.minutes !== e ? s.period.minutes : 0,
|
|
736
|
+
seconds: s.period.seconds !== e ? s.period.seconds : 0
|
|
737
|
+
}), s.groupBy === e ? C = s.asObject === !0 ? {} : [] : (C = [], C.push([]), z = n(o).get()[s.groupBy]), W = function(j, G, Y) {
|
|
738
|
+
return s.asObject === !0 ? s.format !== e ? j[n(G).format(s.format)] = {} : j[n(G).format("%F %H:%M:%S")] = {} : s.format !== e ? j.push(Y ? null : n(G).format(s.format)) : j.push(Y ? null : n(G)), j;
|
|
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: L.year ? -L.year : e,
|
|
742
|
+
month: L.month ? -L.month : e,
|
|
743
|
+
day: L.day ? -L.day : e,
|
|
744
|
+
hours: L.hours ? -L.hours : e,
|
|
745
|
+
minutes: L.minutes ? -L.minutes : e,
|
|
746
|
+
seconds: L.seconds ? -L.seconds : e,
|
|
747
|
+
milliseconds: L.milliseconds ? -L.milliseconds : e
|
|
748
748
|
};
|
|
749
|
-
for (g = n(o).calc(x).utc(); n(g).get()[
|
|
750
|
-
W(
|
|
751
|
-
if (
|
|
752
|
-
var
|
|
753
|
-
for (g = n(o).dayOfWeek(0).utc();
|
|
754
|
-
W(
|
|
749
|
+
for (g = n(o).calc(x).utc(); n(g).get()[s.groupBy] === z; )
|
|
750
|
+
W(C[C.length - 1], g, !0), g = n(g).calc(x).utc();
|
|
751
|
+
if (s.groupBy === "week") {
|
|
752
|
+
var P = n(o).dayOfWeek();
|
|
753
|
+
for (g = n(o).dayOfWeek(0).utc(); C[0].length < P && g < o; )
|
|
754
|
+
W(C[C.length - 1], g, !0), g = n(g).calc(L).utc();
|
|
755
755
|
}
|
|
756
756
|
}
|
|
757
|
-
for (; o <=
|
|
758
|
-
|
|
759
|
-
if (
|
|
760
|
-
for (w = n(
|
|
761
|
-
W(
|
|
762
|
-
return
|
|
763
|
-
}, n.monthNames = function(
|
|
764
|
-
switch (
|
|
757
|
+
for (; o <= m; )
|
|
758
|
+
s.groupBy === e ? W(C, o) : n(o).get()[s.groupBy] === z ? W(C[C.length - 1], o) : (C.push([]), W(C[C.length - 1], o), z = n(o).get()[s.groupBy]), o = n(o).calc(L).utc();
|
|
759
|
+
if (s.groupBy !== e && s.fillNulls)
|
|
760
|
+
for (w = n(m).calc(L).utc(); n(w).get()[s.groupBy] === z; )
|
|
761
|
+
W(C[C.length - 1], w, !0), w = n(w).calc(L).utc();
|
|
762
|
+
return C;
|
|
763
|
+
}, n.monthNames = function(s) {
|
|
764
|
+
switch (s) {
|
|
765
765
|
case "long":
|
|
766
766
|
return N;
|
|
767
767
|
default:
|
|
768
|
-
return
|
|
768
|
+
return p;
|
|
769
769
|
}
|
|
770
|
-
}, n.dayNames = function(
|
|
771
|
-
switch (
|
|
770
|
+
}, n.dayNames = function(s) {
|
|
771
|
+
switch (s) {
|
|
772
772
|
case "long":
|
|
773
|
-
return
|
|
773
|
+
return R;
|
|
774
774
|
default:
|
|
775
|
-
return
|
|
775
|
+
return M;
|
|
776
776
|
}
|
|
777
|
-
}, n.lang = function(
|
|
778
|
-
if (
|
|
779
|
-
c =
|
|
777
|
+
}, n.lang = function(s) {
|
|
778
|
+
if (s !== e)
|
|
779
|
+
c = s, l[c] === e && (c = "en"), N = O(), p = T(), R = b(), M = I();
|
|
780
780
|
else
|
|
781
781
|
return c;
|
|
782
782
|
return e;
|
|
783
783
|
}, n.availableLangs = function() {
|
|
784
|
-
return Object.keys(
|
|
785
|
-
}, n.registerFormat = function(
|
|
786
|
-
k[
|
|
784
|
+
return Object.keys(l);
|
|
785
|
+
}, n.registerFormat = function(s, o, m, g, w, L) {
|
|
786
|
+
k[s] = {
|
|
787
787
|
format: o,
|
|
788
|
-
parse:
|
|
788
|
+
parse: m,
|
|
789
789
|
minLength: g,
|
|
790
790
|
maxLength: w,
|
|
791
|
-
type:
|
|
791
|
+
type: L
|
|
792
792
|
};
|
|
793
|
-
}, n.unregisterFormat = function(
|
|
794
|
-
delete k[
|
|
795
|
-
}, n.detectFormat = function(
|
|
796
|
-
var o,
|
|
797
|
-
return o =
|
|
798
|
-
},
|
|
799
|
-
TempusDate:
|
|
800
|
-
}, n.classes = function(
|
|
793
|
+
}, n.unregisterFormat = function(s) {
|
|
794
|
+
delete k[s];
|
|
795
|
+
}, n.detectFormat = function(s) {
|
|
796
|
+
var o, m, g;
|
|
797
|
+
return o = h(s, 0), o !== "" && (g = 10), m = s.charAt(g), (m === "T" || m === " ") && (o += m, g += 1), o += A(s, g), o;
|
|
798
|
+
}, f = {
|
|
799
|
+
TempusDate: D
|
|
800
|
+
}, n.classes = function(s, o) {
|
|
801
801
|
if (o === e)
|
|
802
|
-
return
|
|
803
|
-
|
|
804
|
-
}, n.loadTranslations = function(
|
|
805
|
-
typeof
|
|
806
|
-
|
|
802
|
+
return f[s];
|
|
803
|
+
f[s] = o;
|
|
804
|
+
}, n.loadTranslations = function(s) {
|
|
805
|
+
typeof s == "object" ? l = s : typeof s == "string" && H(s, function(o) {
|
|
806
|
+
l = o;
|
|
807
807
|
}, function(o) {
|
|
808
808
|
});
|
|
809
|
-
}, c = (
|
|
810
|
-
}).call(
|
|
811
|
-
})(
|
|
812
|
-
var
|
|
813
|
-
const
|
|
814
|
-
var
|
|
815
|
-
const
|
|
809
|
+
}, c = (d.language || d.systemLanguage || d.userLanguage || "en").substr(0, 2).toLowerCase(), l[c] === e && (c = "en"), N = O(), p = T(), R = b(), M = I(), y.exports && (t = y.exports = n), t.tempus = n;
|
|
810
|
+
}).call(ye);
|
|
811
|
+
})(Xt, Xt.exports);
|
|
812
|
+
var Oe = Xt.exports;
|
|
813
|
+
const yt = /* @__PURE__ */ Ne(Oe);
|
|
814
|
+
var _t, Vt, Tt, Et, bt, It, ot, Nt, St, $t, Rt, te, Q, nt, $, ht, tt, lt, Lt, 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
|
+
S(this, _t);
|
|
824
824
|
/**
|
|
825
825
|
* Одно обновление колбэка прогресса, если снимок изменился.
|
|
826
826
|
* @returns {void}
|
|
827
827
|
*/
|
|
828
|
-
|
|
828
|
+
S(this, ot);
|
|
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
|
+
S(this, St);
|
|
836
836
|
/**
|
|
837
837
|
* Уведомляет подписчиков о текущем состоянии лимита.
|
|
838
838
|
*
|
|
839
839
|
* @returns {void}
|
|
840
840
|
*/
|
|
841
|
-
|
|
841
|
+
S(this, Rt);
|
|
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
|
+
S(this, Q);
|
|
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
|
+
S(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
|
+
S(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
|
+
S(this, Lt);
|
|
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
|
+
S(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,
|
|
@@ -892,30 +892,30 @@ const j = class j {
|
|
|
892
892
|
if (!this.progressData)
|
|
893
893
|
return { percent: 0, allCount: 0, allTotal: 0 };
|
|
894
894
|
const t = this.totalBatchCommands || 0;
|
|
895
|
-
if (t > 0 && Array.isArray(this.batchCommandKeyOrder) && this.batchCommandKeyOrder.length &&
|
|
896
|
-
let
|
|
895
|
+
if (t > 0 && Array.isArray(this.batchCommandKeyOrder) && this.batchCommandKeyOrder.length && _(this, _t, Vt).call(this)) {
|
|
896
|
+
let h = 0;
|
|
897
897
|
for (const c of this.batchCommandKeyOrder) {
|
|
898
|
-
const
|
|
899
|
-
if (!
|
|
898
|
+
const l = this.progressData[c];
|
|
899
|
+
if (!l)
|
|
900
900
|
continue;
|
|
901
|
-
const O = Number(
|
|
902
|
-
O === 0 && T === 0 ?
|
|
901
|
+
const O = Number(l.total) || 0, T = Number(l.count) || 0;
|
|
902
|
+
O === 0 && T === 0 ? h += 1 : O > 0 && (h += Math.min(1, T / O));
|
|
903
903
|
}
|
|
904
|
-
const
|
|
905
|
-
let n = Math.max(0, Math.min(100, Math.floor(
|
|
906
|
-
const
|
|
907
|
-
return { percent: n, allCount:
|
|
904
|
+
const u = h / t * 100;
|
|
905
|
+
let n = Math.max(0, Math.min(100, Math.floor(u)));
|
|
906
|
+
const f = t, d = Math.min(t, Math.floor(h));
|
|
907
|
+
return { percent: n, allCount: d, allTotal: f };
|
|
908
908
|
}
|
|
909
|
-
let e = 0,
|
|
910
|
-
for (const
|
|
911
|
-
const { total:
|
|
912
|
-
e +=
|
|
909
|
+
let e = 0, r = 0;
|
|
910
|
+
for (const h of Object.values(this.progressData)) {
|
|
911
|
+
const { total: u, count: n } = h;
|
|
912
|
+
e += u ?? 0, r += n ?? 0;
|
|
913
913
|
}
|
|
914
914
|
const i = Number(this.chunkRate) || 0;
|
|
915
915
|
let a = 0;
|
|
916
|
-
e ? a =
|
|
917
|
-
let
|
|
918
|
-
return e > 0 &&
|
|
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 A = Math.floor(a);
|
|
918
|
+
return e > 0 && r >= e && (A = 100), { percent: A, allCount: r, allTotal: e };
|
|
919
919
|
}
|
|
920
920
|
/**
|
|
921
921
|
* Обновление данных прогресса выполнения
|
|
@@ -924,36 +924,36 @@ const j = class j {
|
|
|
924
924
|
* @param {Object} params.value - Значение ответа от API
|
|
925
925
|
* @param {string} params.type - Тип обработки ('count' или undefined)
|
|
926
926
|
*/
|
|
927
|
-
setProgressData({ key: t, value: e, type:
|
|
928
|
-
var
|
|
927
|
+
setProgressData({ key: t, value: e, type: r }) {
|
|
928
|
+
var l, 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 A = 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 b = Number(T);
|
|
937
|
+
Number.isFinite(b) && (A = b);
|
|
938
938
|
}
|
|
939
939
|
}
|
|
940
|
-
|
|
941
|
-
let
|
|
942
|
-
i && (
|
|
943
|
-
const
|
|
940
|
+
r === "count" && (A = a);
|
|
941
|
+
let h = 1;
|
|
942
|
+
i && (h = a), this.progressData || (this.progressData = {});
|
|
943
|
+
const u = ((l = this.progressData[t]) == null ? void 0 : l.total) ?? 0, n = ((O = this.progressData[t]) == null ? void 0 : O.count) ?? 0, f = h + n, d = Math.max(u, A ?? 0, f);
|
|
944
944
|
if (this.progressData[t] = {
|
|
945
|
-
total:
|
|
946
|
-
count: Math.min(
|
|
945
|
+
total: d,
|
|
946
|
+
count: Math.min(f, d)
|
|
947
947
|
}, typeof document < "u" && (document == null ? void 0 : document.hidden) === !0) {
|
|
948
|
-
|
|
948
|
+
_(this, ot, Nt).call(this);
|
|
949
949
|
return;
|
|
950
950
|
}
|
|
951
|
-
|
|
951
|
+
_(this, ot, Nt).call(this), this.progressTimer || (this.progressTimer = setInterval(() => {
|
|
952
952
|
if (!this.progressCall) {
|
|
953
953
|
this.clearProgressData();
|
|
954
954
|
return;
|
|
955
955
|
}
|
|
956
|
-
|
|
956
|
+
_(this, ot, Nt).call(this);
|
|
957
957
|
const { percent: T } = this.progressPercent;
|
|
958
958
|
T >= 100 && (clearInterval(this.progressTimer), this.progressTimer = "");
|
|
959
959
|
}, this.progressDelay));
|
|
@@ -977,8 +977,8 @@ const j = class j {
|
|
|
977
977
|
* @param {number|undefined} pauseMs - Длительность текущей лимит-паузы (мс); при снятии лимита не передаётся.
|
|
978
978
|
* @returns {void}
|
|
979
979
|
*/
|
|
980
|
-
setTimeLimitState(t, e,
|
|
981
|
-
this.timeLimit.limit = !!t, this.timeLimit.date = t ? e : void 0, t && typeof
|
|
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, Rt, te).call(this);
|
|
982
982
|
}
|
|
983
983
|
/**
|
|
984
984
|
* Подписывает внешний код на изменения состояния лимита.
|
|
@@ -1005,26 +1005,26 @@ const j = class j {
|
|
|
1005
1005
|
* @returns {Array} Массив запросов (может быть один или несколько)
|
|
1006
1006
|
*/
|
|
1007
1007
|
splitLargeFilters(t, e) {
|
|
1008
|
-
const { method:
|
|
1008
|
+
const { method: r, params: i } = e;
|
|
1009
1009
|
if (!i)
|
|
1010
1010
|
return [{ key: t, request: e }];
|
|
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(
|
|
1016
|
-
const
|
|
1017
|
-
for (let n = 0; n <
|
|
1018
|
-
const
|
|
1019
|
-
i.filter ? (c.filter = { ...a }, c.filter[
|
|
1020
|
-
key:
|
|
1021
|
-
request: { method:
|
|
1014
|
+
for (const [A, h] of Object.entries(a))
|
|
1015
|
+
if (!String(A).trim().startsWith("!") && Array.isArray(h) && h.length > this.filterChunkSize) {
|
|
1016
|
+
const u = [];
|
|
1017
|
+
for (let n = 0; n < h.length; n += this.filterChunkSize) {
|
|
1018
|
+
const f = h.slice(n, n + this.filterChunkSize), d = n === 0 ? t : `${t}__chunk_${Math.floor(n / this.filterChunkSize)}`, c = { ...i };
|
|
1019
|
+
i.filter ? (c.filter = { ...a }, c.filter[A] = f) : i.FILTER && (c.FILTER = { ...a }, c.FILTER[A] = f), u.push({
|
|
1020
|
+
key: d,
|
|
1021
|
+
request: { method: r, params: c },
|
|
1022
1022
|
originalKey: t,
|
|
1023
|
-
filterKey:
|
|
1023
|
+
filterKey: A,
|
|
1024
1024
|
chunkIndex: Math.floor(n / this.filterChunkSize)
|
|
1025
1025
|
});
|
|
1026
1026
|
}
|
|
1027
|
-
return
|
|
1027
|
+
return u;
|
|
1028
1028
|
}
|
|
1029
1029
|
return [{ key: t, request: e }];
|
|
1030
1030
|
}
|
|
@@ -1035,15 +1035,15 @@ const j = class j {
|
|
|
1035
1035
|
* @returns {Array} Объединенный массив результатов
|
|
1036
1036
|
*/
|
|
1037
1037
|
mergeSplitResults(t, e) {
|
|
1038
|
-
const
|
|
1039
|
-
const n =
|
|
1040
|
-
return n ?
|
|
1038
|
+
const r = [], i = String(e).replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), a = new RegExp(`^${i}(?:__chunk_\\d+)?$`), A = Object.keys(t).filter((h) => a.test(h)).sort((h, u) => {
|
|
1039
|
+
const n = h.match(/__chunk_(\d+)$/), f = u.match(/__chunk_(\d+)$/);
|
|
1040
|
+
return n ? f ? parseInt(n[1]) - parseInt(f[1]) : 1 : -1;
|
|
1041
1041
|
});
|
|
1042
|
-
for (const
|
|
1043
|
-
const
|
|
1044
|
-
Array.isArray(
|
|
1042
|
+
for (const h of A) {
|
|
1043
|
+
const u = t[h];
|
|
1044
|
+
Array.isArray(u) ? r.push(...u) : u && r.push(u);
|
|
1045
1045
|
}
|
|
1046
|
-
return
|
|
1046
|
+
return r;
|
|
1047
1047
|
}
|
|
1048
1048
|
/**
|
|
1049
1049
|
* Задержка между запросами
|
|
@@ -1061,25 +1061,25 @@ const j = class j {
|
|
|
1061
1061
|
* @returns {Promise<void>}
|
|
1062
1062
|
*/
|
|
1063
1063
|
callBatchWithTimeout(t, e) {
|
|
1064
|
-
return new Promise((
|
|
1065
|
-
let a = !1,
|
|
1066
|
-
const
|
|
1064
|
+
return new Promise((r, i) => {
|
|
1065
|
+
let a = !1, A = null;
|
|
1066
|
+
const h = async (n) => {
|
|
1067
1067
|
if (!a) {
|
|
1068
|
-
a = !0,
|
|
1068
|
+
a = !0, A && clearTimeout(A);
|
|
1069
1069
|
try {
|
|
1070
|
-
await Promise.resolve(e(n)),
|
|
1071
|
-
} catch (
|
|
1072
|
-
console.error("Error in callBatch callback:",
|
|
1070
|
+
await Promise.resolve(e(n)), r();
|
|
1071
|
+
} catch (f) {
|
|
1072
|
+
console.error("Error in callBatch callback:", f), i(f);
|
|
1073
1073
|
}
|
|
1074
1074
|
}
|
|
1075
|
-
},
|
|
1075
|
+
}, u = async () => {
|
|
1076
1076
|
if (!a) {
|
|
1077
|
-
a = !0,
|
|
1077
|
+
a = !0, A && clearTimeout(A), 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 = {};
|
|
1081
|
-
Object.keys(t).forEach((
|
|
1082
|
-
n[
|
|
1081
|
+
Object.keys(t).forEach((f) => {
|
|
1082
|
+
n[f] = {
|
|
1083
1083
|
error: () => ({
|
|
1084
1084
|
ex: {
|
|
1085
1085
|
error: "TIMEOUT",
|
|
@@ -1091,23 +1091,23 @@ const j = class j {
|
|
|
1091
1091
|
};
|
|
1092
1092
|
});
|
|
1093
1093
|
try {
|
|
1094
|
-
await Promise.resolve(e(n)),
|
|
1095
|
-
} catch (
|
|
1096
|
-
console.error("Error in timeout callback:",
|
|
1094
|
+
await Promise.resolve(e(n)), r();
|
|
1095
|
+
} catch (f) {
|
|
1096
|
+
console.error("Error in timeout callback:", f), r();
|
|
1097
1097
|
}
|
|
1098
1098
|
}
|
|
1099
1099
|
};
|
|
1100
1100
|
try {
|
|
1101
1101
|
this.callBatch(t, async (n) => {
|
|
1102
|
-
await
|
|
1102
|
+
await h(n);
|
|
1103
1103
|
});
|
|
1104
1104
|
} catch (n) {
|
|
1105
1105
|
a || console.error("Error calling callBatch:", n);
|
|
1106
1106
|
}
|
|
1107
|
-
|
|
1107
|
+
A = setTimeout(async () => {
|
|
1108
1108
|
a || (console.warn(
|
|
1109
1109
|
`Batch request attempt timeout after ${this.requestTimeoutMs}ms. Switching to timeout fallback result.`
|
|
1110
|
-
), await
|
|
1110
|
+
), await u());
|
|
1111
1111
|
}, this.requestTimeoutMs);
|
|
1112
1112
|
});
|
|
1113
1113
|
}
|
|
@@ -1129,57 +1129,57 @@ const j = class j {
|
|
|
1129
1129
|
* @param {{oneBatch?: boolean}} [options] - Опции выполнения.
|
|
1130
1130
|
* @returns {Promise<Object>}
|
|
1131
1131
|
*/
|
|
1132
|
-
async batch(t, e,
|
|
1133
|
-
|
|
1134
|
-
const i = {}, a = {},
|
|
1135
|
-
for (const [
|
|
1136
|
-
const c = this.arrayChunk(
|
|
1132
|
+
async batch(t, e, r = {}) {
|
|
1133
|
+
_(this, ut, jt).call(this, e);
|
|
1134
|
+
const i = {}, a = {}, A = {};
|
|
1135
|
+
for (const [f, d] of Object.entries(t)) {
|
|
1136
|
+
const c = this.arrayChunk(d);
|
|
1137
1137
|
if (!c)
|
|
1138
1138
|
continue;
|
|
1139
|
-
const
|
|
1140
|
-
if (
|
|
1141
|
-
a[
|
|
1139
|
+
const l = this.splitLargeFilters(f, c);
|
|
1140
|
+
if (l.length === 1)
|
|
1141
|
+
a[f] = c;
|
|
1142
1142
|
else {
|
|
1143
|
-
|
|
1144
|
-
for (const O of
|
|
1145
|
-
a[O.key] = O.request,
|
|
1143
|
+
A[f] = [];
|
|
1144
|
+
for (const O of l)
|
|
1145
|
+
a[O.key] = O.request, A[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(
|
|
1149
|
-
(
|
|
1150
|
-
var
|
|
1151
|
-
return String(((
|
|
1149
|
+
(f) => {
|
|
1150
|
+
var d;
|
|
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 h = {}, u = 0;
|
|
1155
1155
|
const n = Object.keys(a).length;
|
|
1156
|
-
for (const [
|
|
1156
|
+
for (const [f, d] of Object.entries(a)) {
|
|
1157
1157
|
if (!this.canContinue)
|
|
1158
1158
|
break;
|
|
1159
|
-
if (
|
|
1160
|
-
const c =
|
|
1159
|
+
if (h[f] = d, Object.keys(h).length >= this.limit || u + 1 === n) {
|
|
1160
|
+
const c = u + 1 === n;
|
|
1161
1161
|
await this.batchChunk(
|
|
1162
|
-
|
|
1162
|
+
h,
|
|
1163
1163
|
void 0,
|
|
1164
1164
|
!c,
|
|
1165
1165
|
{
|
|
1166
1166
|
disablePagination: !1,
|
|
1167
|
-
oneBatch: !!(
|
|
1167
|
+
oneBatch: !!(r != null && r.oneBatch)
|
|
1168
1168
|
}
|
|
1169
|
-
), Object.entries(this.result).forEach(([
|
|
1170
|
-
i[
|
|
1169
|
+
), Object.entries(this.result).forEach(([l, O]) => {
|
|
1170
|
+
i[l] = O;
|
|
1171
1171
|
}), this.totalProgress = Math.round(
|
|
1172
|
-
|
|
1173
|
-
),
|
|
1172
|
+
u / n * 100
|
|
1173
|
+
), h = {};
|
|
1174
1174
|
}
|
|
1175
|
-
|
|
1175
|
+
u++;
|
|
1176
1176
|
}
|
|
1177
|
-
for (const [
|
|
1178
|
-
if (
|
|
1179
|
-
const c = this.mergeSplitResults(i,
|
|
1180
|
-
for (const
|
|
1181
|
-
delete i[
|
|
1182
|
-
i[
|
|
1177
|
+
for (const [f, d] of Object.entries(A))
|
|
1178
|
+
if (d && d.length > 0) {
|
|
1179
|
+
const c = this.mergeSplitResults(i, f);
|
|
1180
|
+
for (const l of d)
|
|
1181
|
+
delete i[l];
|
|
1182
|
+
i[f] = c;
|
|
1183
1183
|
}
|
|
1184
1184
|
return Object.entries(this.errors).length && (i.errorsList = this.errors), e && e({ percent: 100 }), Promise.resolve(i);
|
|
1185
1185
|
}
|
|
@@ -1193,61 +1193,61 @@ const j = class j {
|
|
|
1193
1193
|
* @returns {Promise<Object>} Объект с количеством элементов для каждого ключа
|
|
1194
1194
|
*/
|
|
1195
1195
|
async batchTotalCount(t, e) {
|
|
1196
|
-
|
|
1197
|
-
const
|
|
1198
|
-
for (const [
|
|
1199
|
-
const
|
|
1200
|
-
if (!
|
|
1196
|
+
_(this, ut, jt).call(this, e);
|
|
1197
|
+
const r = {}, i = {}, a = {};
|
|
1198
|
+
for (const [u, n] of Object.entries(t)) {
|
|
1199
|
+
const f = this.arrayChunk(n);
|
|
1200
|
+
if (!f)
|
|
1201
1201
|
continue;
|
|
1202
|
-
const
|
|
1203
|
-
if (
|
|
1204
|
-
i[
|
|
1202
|
+
const d = this.splitLargeFilters(u, f);
|
|
1203
|
+
if (d.length === 1)
|
|
1204
|
+
i[u] = f;
|
|
1205
1205
|
else {
|
|
1206
|
-
a[
|
|
1207
|
-
for (const c of
|
|
1208
|
-
i[c.key] = c.request, a[
|
|
1206
|
+
a[u] = [];
|
|
1207
|
+
for (const c of d)
|
|
1208
|
+
i[c.key] = c.request, a[u].push(c.key);
|
|
1209
1209
|
}
|
|
1210
1210
|
}
|
|
1211
|
-
const
|
|
1212
|
-
for (let
|
|
1213
|
-
const n =
|
|
1214
|
-
for (const [
|
|
1211
|
+
const A = [], h = Object.entries(i);
|
|
1212
|
+
for (let u = 0; u < h.length; u += this.limit) {
|
|
1213
|
+
const n = h.slice(u, u + this.limit), f = {};
|
|
1214
|
+
for (const [d, c] of n) {
|
|
1215
1215
|
if (!this.canContinue)
|
|
1216
1216
|
break;
|
|
1217
|
-
|
|
1217
|
+
f[d] = c;
|
|
1218
1218
|
}
|
|
1219
|
-
Object.keys(
|
|
1219
|
+
Object.keys(f).length > 0 && A.push(f);
|
|
1220
1220
|
}
|
|
1221
|
-
this.chunkRate = (1 /
|
|
1222
|
-
for (const [
|
|
1221
|
+
this.chunkRate = (1 / A.length).toFixed(5);
|
|
1222
|
+
for (const [u, n] of Object.entries(A)) {
|
|
1223
1223
|
if (!this.canContinue)
|
|
1224
1224
|
break;
|
|
1225
|
-
this.totalProgress = Math.round(Number(
|
|
1226
|
-
const
|
|
1227
|
-
await
|
|
1228
|
-
var c,
|
|
1229
|
-
for (const [
|
|
1225
|
+
this.totalProgress = Math.round(Number(u) / A.length * 100);
|
|
1226
|
+
const f = Number(u) === A.length - 1;
|
|
1227
|
+
await _(this, tt, lt).call(this, n, async (d) => {
|
|
1228
|
+
var c, l, O, T, b;
|
|
1229
|
+
for (const [I, N] of Object.entries(d)) {
|
|
1230
1230
|
if (!this.canContinue)
|
|
1231
1231
|
return;
|
|
1232
1232
|
if (N.error()) {
|
|
1233
|
-
const k = (
|
|
1234
|
-
this.errors[
|
|
1233
|
+
const k = (l = (c = N.error()) == null ? void 0 : c.ex) == null ? void 0 : l.error, U = (T = (O = N.error()) == null ? void 0 : O.ex) == null ? void 0 : T.error_description;
|
|
1234
|
+
this.errors[I] = k && k.trim() || U && U.trim() || ((b = N.error()) == null ? void 0 : b.toString()) || "Неизвестная ошибка", r[I] = 0;
|
|
1235
1235
|
continue;
|
|
1236
1236
|
}
|
|
1237
|
-
const
|
|
1238
|
-
|
|
1237
|
+
const p = this.getData(N.data()), R = Array.isArray(p) ? p.length : 0, H = typeof N.total == "function" && N.total() !== void 0 ? N.total() : R;
|
|
1238
|
+
r[I] = H, this.setProgressData({ key: I, value: N, type: "count" });
|
|
1239
1239
|
}
|
|
1240
|
-
await
|
|
1240
|
+
await _(this, $, ht).call(this, d, !f);
|
|
1241
1241
|
});
|
|
1242
1242
|
}
|
|
1243
|
-
for (const [
|
|
1243
|
+
for (const [u, n] of Object.entries(a))
|
|
1244
1244
|
if (n && n.length > 0) {
|
|
1245
|
-
let
|
|
1246
|
-
for (const
|
|
1247
|
-
|
|
1248
|
-
|
|
1245
|
+
let f = 0;
|
|
1246
|
+
for (const d of n)
|
|
1247
|
+
r[d] !== void 0 && (f += r[d] || 0), delete r[d];
|
|
1248
|
+
r[u] = f;
|
|
1249
1249
|
}
|
|
1250
|
-
return Object.entries(this.errors).length && (
|
|
1250
|
+
return Object.entries(this.errors).length && (r.errorsList = this.errors, this.errorLogger()), e && e({ percent: 100 }), Promise.resolve(r);
|
|
1251
1251
|
}
|
|
1252
1252
|
/**
|
|
1253
1253
|
* Выполняет одиночный REST-вызов с таймаутом и авто-повтором после лимит-паузы.
|
|
@@ -1257,36 +1257,36 @@ 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
|
|
1260
|
+
var r, i, a, A, h, u, n;
|
|
1261
1261
|
for (; ; ) {
|
|
1262
|
-
const
|
|
1263
|
-
if (!
|
|
1264
|
-
await
|
|
1262
|
+
const f = await _(this, Lt, ee).call(this, t, e);
|
|
1263
|
+
if (!f) {
|
|
1264
|
+
await _(this, Q, nt).call(this, this.callLimitPauseMs);
|
|
1265
1265
|
continue;
|
|
1266
1266
|
}
|
|
1267
|
-
const
|
|
1268
|
-
if (
|
|
1269
|
-
for (const [
|
|
1270
|
-
|
|
1271
|
-
if (
|
|
1272
|
-
const
|
|
1273
|
-
if (["QUERY_LIMIT_EXCEEDED", "OPERATION_TIME_LIMIT", "TIMEOUT"].includes(
|
|
1274
|
-
await
|
|
1267
|
+
const d = {};
|
|
1268
|
+
if (f != null && f.answer)
|
|
1269
|
+
for (const [l, O] of Object.entries(f.answer))
|
|
1270
|
+
l !== "result" && O && (d[l] = O);
|
|
1271
|
+
if (f.error()) {
|
|
1272
|
+
const l = ((i = (r = f.error()) == null ? void 0 : r.ex) == null ? void 0 : i.error) ?? "";
|
|
1273
|
+
if (["QUERY_LIMIT_EXCEEDED", "OPERATION_TIME_LIMIT", "TIMEOUT"].includes(l)) {
|
|
1274
|
+
await _(this, Q, nt).call(this, this.callLimitPauseMs);
|
|
1275
1275
|
continue;
|
|
1276
1276
|
}
|
|
1277
|
-
const O = ((a =
|
|
1277
|
+
const O = ((a = f.error()) == null ? void 0 : a.toString()) || ((h = (A = f.error()) == null ? void 0 : A.ex) == null ? void 0 : h.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,
|
|
1281
|
-
answer:
|
|
1281
|
+
answer: d,
|
|
1282
1282
|
error: O
|
|
1283
1283
|
};
|
|
1284
1284
|
}
|
|
1285
|
-
let c =
|
|
1285
|
+
let c = f.data();
|
|
1286
1286
|
return c != null && c.items && (c = c.items), {
|
|
1287
1287
|
success: !0,
|
|
1288
1288
|
data: c,
|
|
1289
|
-
answer:
|
|
1289
|
+
answer: d,
|
|
1290
1290
|
error: null
|
|
1291
1291
|
};
|
|
1292
1292
|
}
|
|
@@ -1297,30 +1297,30 @@ const j = class j {
|
|
|
1297
1297
|
* @param {Array/Object} request - Массив/объект методов
|
|
1298
1298
|
*/
|
|
1299
1299
|
arrayChunk(t) {
|
|
1300
|
-
let e = "",
|
|
1301
|
-
if (Array.isArray(t) ? [e] = t : (e = t.method,
|
|
1302
|
-
if (!
|
|
1303
|
-
|
|
1300
|
+
let e = "", r = {};
|
|
1301
|
+
if (Array.isArray(t) ? [e] = t : (e = t.method, r = t.params), (e.includes("list") || e === "user.get" || e === "entity.item.get") && e !== "task.item.list") {
|
|
1302
|
+
if (!r)
|
|
1303
|
+
r = e === "entity.item.get" ? { SORT: { ID: "ASC" } } : {
|
|
1304
1304
|
order: { ID: "ASC", id: "ASC" }
|
|
1305
1305
|
};
|
|
1306
1306
|
else {
|
|
1307
|
-
e === "entity.item.get" ? (
|
|
1308
|
-
const i = e === "user.get" || e === "entity.item.get" ?
|
|
1309
|
-
typeof i == "object" && i !== null && !Array.isArray(i) && Object.entries(i).forEach(([a,
|
|
1310
|
-
(
|
|
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
|
+
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, A]) => {
|
|
1310
|
+
(r.start === void 0 || r.start !== -1) && ["id", "ID"].includes(a) && (typeof A == "string" || Array.isArray(A) && A.length <= 50) && (r.start = -1);
|
|
1311
1311
|
});
|
|
1312
1312
|
}
|
|
1313
|
-
e === "crm.type.list" &&
|
|
1313
|
+
e === "crm.type.list" && r.order && delete r.order.ID;
|
|
1314
1314
|
}
|
|
1315
1315
|
if (e === "task.item.list")
|
|
1316
|
-
if (!
|
|
1317
|
-
|
|
1316
|
+
if (!r)
|
|
1317
|
+
r = [{ ID: "ASC" }, [""], [""], ["ID"]];
|
|
1318
1318
|
else {
|
|
1319
|
-
Array.isArray(
|
|
1320
|
-
const [i, a,
|
|
1321
|
-
i.ID = "ASC",
|
|
1319
|
+
Array.isArray(r[0]) && (r[0] = {});
|
|
1320
|
+
const [i, a, A, h] = r;
|
|
1321
|
+
i.ID = "ASC", h[0] !== "" && h.includes("ID") || h.push("ID");
|
|
1322
1322
|
}
|
|
1323
|
-
return { method: e, params:
|
|
1323
|
+
return { method: e, params: r };
|
|
1324
1324
|
}
|
|
1325
1325
|
/** Выполняет первичный запрос с массивом методов
|
|
1326
1326
|
* При наличии более 50 элементов в нем, подготоваливаем данные и передаем в this.batchPayload
|
|
@@ -1328,44 +1328,44 @@ const j = class j {
|
|
|
1328
1328
|
* @param {Array} query - Тот же массив с методами
|
|
1329
1329
|
* @returns {Object} Объект с результатами запросов
|
|
1330
1330
|
*/
|
|
1331
|
-
async batchChunk(t, e,
|
|
1331
|
+
async batchChunk(t, e, r = !0, i = {}) {
|
|
1332
1332
|
return new Promise((a) => {
|
|
1333
|
-
const
|
|
1334
|
-
let
|
|
1335
|
-
const
|
|
1333
|
+
const A = [];
|
|
1334
|
+
let h;
|
|
1335
|
+
const u = !!(i != null && i.disablePagination);
|
|
1336
1336
|
(async () => {
|
|
1337
|
-
await
|
|
1338
|
-
var c,
|
|
1339
|
-
for (const [
|
|
1337
|
+
await _(this, tt, lt).call(this, t, async (f) => {
|
|
1338
|
+
var c, l, O, T, b;
|
|
1339
|
+
for (const [I, N] of Object.entries(f)) {
|
|
1340
1340
|
if (!this.canContinue)
|
|
1341
1341
|
return;
|
|
1342
1342
|
if (N.error()) {
|
|
1343
|
-
const g = (
|
|
1344
|
-
this.errors[
|
|
1343
|
+
const g = (l = (c = N.error()) == null ? void 0 : c.ex) == null ? void 0 : l.error, w = (T = (O = N.error()) == null ? void 0 : O.ex) == null ? void 0 : T.error_description;
|
|
1344
|
+
this.errors[I] = g && g.trim() || w && w.trim() || ((b = N.error()) == null ? void 0 : b.toString()) || "Неизвестная ошибка", h = !0;
|
|
1345
1345
|
}
|
|
1346
|
-
const
|
|
1347
|
-
e === "count" ? this.result[
|
|
1348
|
-
const k = t[
|
|
1349
|
-
if (!
|
|
1350
|
-
let g = t[
|
|
1346
|
+
const p = this.getData(N.data()), R = Array.isArray(p) ? p.length : 0, M = typeof N.total == "function" && N.total() !== void 0, H = M ? N.total() : R;
|
|
1347
|
+
e === "count" ? this.result[I] ? this.result[I] += R : this.result[I] = H : this.result[I] = p, this.setProgressData({ key: I, value: N, type: e });
|
|
1348
|
+
const k = t[I], U = Array.isArray(k) ? k[0] : k == null ? void 0 : k.method, D = typeof U == "string" && (U.includes(".list") || U === "user.get" || U === "entity.item.get"), s = e === "count" ? !M && R === this.limit : D ? R === this.limit : H > this.limit && H > R, o = e !== "count" && U === "entity.item.get" && R === this.limit && !s, m = s || o;
|
|
1349
|
+
if (!u && (!this.canContinue || m)) {
|
|
1350
|
+
let g = t[I];
|
|
1351
1351
|
if (Array.isArray(g)) {
|
|
1352
|
-
const [w,
|
|
1353
|
-
g = [w,
|
|
1352
|
+
const [w, L = {}] = g;
|
|
1353
|
+
g = [w, L];
|
|
1354
1354
|
} else {
|
|
1355
|
-
const { method: w, params:
|
|
1356
|
-
g = [w,
|
|
1355
|
+
const { method: w, params: L = {} } = g;
|
|
1356
|
+
g = [w, L];
|
|
1357
1357
|
}
|
|
1358
|
-
|
|
1359
|
-
|
|
1358
|
+
A.push([
|
|
1359
|
+
I,
|
|
1360
1360
|
g,
|
|
1361
1361
|
H,
|
|
1362
1362
|
{ entityItemGetScan: o }
|
|
1363
1363
|
]);
|
|
1364
1364
|
}
|
|
1365
1365
|
}
|
|
1366
|
-
|
|
1367
|
-
const
|
|
1368
|
-
await
|
|
1366
|
+
h > 0 && this.errorLogger();
|
|
1367
|
+
const d = A.length > 0 || r;
|
|
1368
|
+
await _(this, $, ht).call(this, f, d), A.length ? await this.batchPayload(A, e, i).then(
|
|
1369
1369
|
() => a(this.result)
|
|
1370
1370
|
) : a(this.result);
|
|
1371
1371
|
});
|
|
@@ -1377,100 +1377,100 @@ const j = class j {
|
|
|
1377
1377
|
* @param {String} type - Тип обработки результатов ('count' или undefined)
|
|
1378
1378
|
* @param {{oneBatch?: boolean}} [options] - Опции выполнения payload.
|
|
1379
1379
|
*/
|
|
1380
|
-
async batchPayload(t, e,
|
|
1381
|
-
const i = !!(
|
|
1380
|
+
async batchPayload(t, e, r = {}) {
|
|
1381
|
+
const i = !!(r != null && r.oneBatch), a = (O, T, b, I) => {
|
|
1382
1382
|
let N = "ID";
|
|
1383
1383
|
this.result[O][this.result[O].length - 1].ID || (N = "id");
|
|
1384
|
-
let
|
|
1385
|
-
if (JSON.stringify(
|
|
1384
|
+
let p = `${N}`;
|
|
1385
|
+
if (JSON.stringify(I[1]).toLocaleLowerCase().includes('"id":"desc"') ? p = "<" + p : p = ">" + p, T === 1 || b.length === 0)
|
|
1386
1386
|
return {
|
|
1387
|
-
field:
|
|
1387
|
+
field: p,
|
|
1388
1388
|
id: this.result[O][this.result[O].length - 1][N]
|
|
1389
1389
|
};
|
|
1390
|
-
let
|
|
1391
|
-
const [H, k] =
|
|
1392
|
-
return (H === "tasks.task.list" || H === "task.item.list") && (
|
|
1393
|
-
field:
|
|
1394
|
-
id: `$result[${[O, T - 1].join("__")}]${
|
|
1390
|
+
let M = "";
|
|
1391
|
+
const [H, k] = I;
|
|
1392
|
+
return (H === "tasks.task.list" || H === "task.item.list") && (M = "[tasks]"), ["crm.item.list", "crm.stagehistory.list"].includes(H) && (M = "[items]"), H === "crm.type.list" && (M = "[types]"), H === "socialnetwork.api.workgroup.list" && (M = "[workgroups]"), {
|
|
1393
|
+
field: p,
|
|
1394
|
+
id: `$result[${[O, T - 1].join("__")}]${M}[49][${N}]`
|
|
1395
1395
|
};
|
|
1396
|
-
},
|
|
1397
|
-
const [
|
|
1398
|
-
let N = JSON.parse(JSON.stringify(
|
|
1399
|
-
if (
|
|
1396
|
+
}, A = (O, T) => {
|
|
1397
|
+
const [b, I] = O;
|
|
1398
|
+
let N = JSON.parse(JSON.stringify(I)), p;
|
|
1399
|
+
if (b === "task.item.list") {
|
|
1400
1400
|
N = [...N];
|
|
1401
|
-
const [
|
|
1402
|
-
return
|
|
1401
|
+
const [R, M, H, k] = N;
|
|
1402
|
+
return M[T.field] = T.id, [b, N];
|
|
1403
1403
|
}
|
|
1404
|
-
return ["user.get"].includes(
|
|
1404
|
+
return ["user.get"].includes(b) || N.FILTER ? (N.FILTER || (N.FILTER = {}), p = N.FILTER) : (N.filter || (N.filter = {}), p = N.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(N) && (e === "count" ? this.result[
|
|
1413
|
-
const U = (
|
|
1414
|
-
this.errors[
|
|
1407
|
+
].includes(b) ? p[">ID"] = T.id : p[T.field] = T.id, [b, { ...N, start: -1 }];
|
|
1408
|
+
}, h = (O) => {
|
|
1409
|
+
Object.entries(O).forEach(([T, b]) => {
|
|
1410
|
+
var p, R, M, H, k;
|
|
1411
|
+
const [I] = T.split("__"), N = this.getData(b.data());
|
|
1412
|
+
if (Array.isArray(N) && (e === "count" ? this.result[I] += N.length : this.result[I].push(...N)), b.error()) {
|
|
1413
|
+
const U = (R = (p = b.error()) == null ? void 0 : p.ex) == null ? void 0 : R.error, D = (H = (M = b.error()) == null ? void 0 : M.ex) == null ? void 0 : H.error_description;
|
|
1414
|
+
this.errors[I] = U && U.trim() || D && D.trim() || ((k = b.error()) == null ? void 0 : k.toString()) || "Неизвестная ошибка";
|
|
1415
1415
|
}
|
|
1416
|
-
this.setProgressData({ key:
|
|
1416
|
+
this.setProgressData({ key: I, value: b, 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 N =
|
|
1425
|
-
return JSON.stringify(T[1]).toLocaleLowerCase().includes('"id":"desc"') ? N = "<" + N : N = ">" + N, { field: N, id:
|
|
1426
|
-
}, n = 1e4,
|
|
1427
|
-
var
|
|
1428
|
-
let
|
|
1429
|
-
for (let
|
|
1430
|
-
const
|
|
1431
|
-
if (!
|
|
1421
|
+
const b = O[O.length - 1];
|
|
1422
|
+
let I = "ID";
|
|
1423
|
+
b.ID || (I = "id");
|
|
1424
|
+
let N = I;
|
|
1425
|
+
return JSON.stringify(T[1]).toLocaleLowerCase().includes('"id":"desc"') ? N = "<" + N : N = ">" + N, { field: N, id: b[I] };
|
|
1426
|
+
}, n = 1e4, f = async (O, T) => {
|
|
1427
|
+
var I, N;
|
|
1428
|
+
let b = this.limit;
|
|
1429
|
+
for (let p = 1; this.canContinue && b === this.limit && p <= n; p++) {
|
|
1430
|
+
const R = this.result[O], M = u(R, T);
|
|
1431
|
+
if (!M)
|
|
1432
1432
|
break;
|
|
1433
|
-
const H = `${O}__eiscan_${
|
|
1433
|
+
const H = `${O}__eiscan_${p}`, k = A(T, M);
|
|
1434
1434
|
let U = null;
|
|
1435
|
-
await
|
|
1436
|
-
U =
|
|
1435
|
+
await _(this, tt, lt).call(this, { [H]: k }, async (m) => {
|
|
1436
|
+
U = m, h(m);
|
|
1437
1437
|
});
|
|
1438
|
-
const
|
|
1439
|
-
await
|
|
1440
|
-
const
|
|
1441
|
-
if ((
|
|
1442
|
-
|
|
1438
|
+
const D = p < n;
|
|
1439
|
+
await _(this, $, ht).call(this, U, D), await this.delay();
|
|
1440
|
+
const s = U == null ? void 0 : U[H];
|
|
1441
|
+
if ((I = s == null ? void 0 : s.error) != null && I.call(s)) {
|
|
1442
|
+
b = 0;
|
|
1443
1443
|
break;
|
|
1444
1444
|
}
|
|
1445
|
-
const o = this.getData((N =
|
|
1446
|
-
|
|
1445
|
+
const o = this.getData((N = s == null ? void 0 : s.data) == null ? void 0 : N.call(s));
|
|
1446
|
+
b = Array.isArray(o) ? o.length : 0;
|
|
1447
1447
|
}
|
|
1448
1448
|
};
|
|
1449
|
-
let
|
|
1450
|
-
const
|
|
1451
|
-
|
|
1452
|
-
}), c++,
|
|
1449
|
+
let d = [], c = 0;
|
|
1450
|
+
const l = async (O = !0) => d.length ? (await _(this, tt, lt).call(this, Object.fromEntries(d), async (T) => {
|
|
1451
|
+
h(T), await _(this, $, ht).call(this, T, O);
|
|
1452
|
+
}), c++, d = [], i && c >= 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,
|
|
1456
|
+
const [T, b, I, N = {}] = O;
|
|
1457
1457
|
if (N.entityItemGetScan) {
|
|
1458
|
-
if (await
|
|
1458
|
+
if (await l(!0))
|
|
1459
1459
|
return;
|
|
1460
1460
|
if (i)
|
|
1461
1461
|
continue;
|
|
1462
|
-
await
|
|
1462
|
+
await f(T, b);
|
|
1463
1463
|
continue;
|
|
1464
1464
|
}
|
|
1465
|
-
let
|
|
1466
|
-
for (;
|
|
1467
|
-
const
|
|
1468
|
-
if (
|
|
1465
|
+
let p = 1;
|
|
1466
|
+
for (; I > p * this.limit; ) {
|
|
1467
|
+
const R = [T, p].join("__"), M = a(T, p, d, b);
|
|
1468
|
+
if (d.push([R, A(b, M)]), i && d.length === 49 && await l(!0) || d.length % 50 === 0 && await l(!0))
|
|
1469
1469
|
return;
|
|
1470
|
-
|
|
1470
|
+
p++;
|
|
1471
1471
|
}
|
|
1472
1472
|
}
|
|
1473
|
-
await
|
|
1473
|
+
await l(!1);
|
|
1474
1474
|
}
|
|
1475
1475
|
/**
|
|
1476
1476
|
* Вывод ошибок в консоль в группированном виде
|
|
@@ -1481,29 +1481,29 @@ const j = class j {
|
|
|
1481
1481
|
}), console.groupEnd();
|
|
1482
1482
|
}
|
|
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 < E(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 >= E(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
|
-
},
|
|
1493
|
+
return i >= E(J, bt) && i / t >= E(J, It);
|
|
1494
|
+
}, Tt = new WeakMap(), Et = new WeakMap(), bt = new WeakMap(), It = new WeakMap(), ot = new WeakSet(), Nt = function() {
|
|
1495
1495
|
if (!this.progressCall || !this.progressData)
|
|
1496
1496
|
return;
|
|
1497
|
-
const { percent: t, allCount: e, allTotal:
|
|
1498
|
-
|
|
1497
|
+
const { percent: t, allCount: e, allTotal: r } = this.progressPercent, i = { percent: t, allCount: e, allTotal: r };
|
|
1498
|
+
_(this, St, $t).call(this, i) && (this.progressCall({
|
|
1499
1499
|
data: this.progressData,
|
|
1500
1500
|
percent: t,
|
|
1501
1501
|
allCount: e,
|
|
1502
|
-
allTotal:
|
|
1502
|
+
allTotal: r
|
|
1503
1503
|
}), this.lastProgressSnapshot = i);
|
|
1504
|
-
},
|
|
1504
|
+
}, St = 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
|
+
}, Rt = new WeakSet(), te = function() {
|
|
1507
1507
|
const t = {
|
|
1508
1508
|
limit: this.timeLimit.limit,
|
|
1509
1509
|
date: this.timeLimit.date,
|
|
@@ -1512,15 +1512,15 @@ yt = new WeakSet(), Jt = function() {
|
|
|
1512
1512
|
for (const e of this.timeLimitListeners)
|
|
1513
1513
|
try {
|
|
1514
1514
|
e(t);
|
|
1515
|
-
} catch (
|
|
1516
|
-
console.warn("Batch timeLimit listener error:",
|
|
1515
|
+
} catch (r) {
|
|
1516
|
+
console.warn("Batch timeLimit listener error:", r);
|
|
1517
1517
|
}
|
|
1518
|
-
}, Q = new WeakSet(),
|
|
1518
|
+
}, Q = new WeakSet(), nt = 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
|
-
},
|
|
1520
|
+
}, $ = new WeakSet(), ht = async function(t, e = !0) {
|
|
1521
1521
|
if (!e)
|
|
1522
1522
|
return 0;
|
|
1523
|
-
let
|
|
1523
|
+
let r = 0;
|
|
1524
1524
|
if (!t || typeof t != "object")
|
|
1525
1525
|
return 0;
|
|
1526
1526
|
for (const i of Object.values(t))
|
|
@@ -1528,75 +1528,75 @@ yt = new WeakSet(), Jt = function() {
|
|
|
1528
1528
|
try {
|
|
1529
1529
|
if (typeof i.time == "function") {
|
|
1530
1530
|
const a = i.time();
|
|
1531
|
-
a && typeof a.operating == "number" && (
|
|
1531
|
+
a && typeof a.operating == "number" && (r = Math.max(r, a.operating));
|
|
1532
1532
|
}
|
|
1533
1533
|
} catch {
|
|
1534
1534
|
}
|
|
1535
|
-
|
|
1536
|
-
},
|
|
1537
|
-
let
|
|
1535
|
+
r >= this.operatingThreshold && await _(this, Q, nt).call(this);
|
|
1536
|
+
}, tt = new WeakSet(), lt = async function(t, e) {
|
|
1537
|
+
let r = !1, i = t;
|
|
1538
1538
|
do
|
|
1539
|
-
|
|
1540
|
-
var
|
|
1541
|
-
let
|
|
1542
|
-
const
|
|
1543
|
-
for (const [
|
|
1544
|
-
if (!(
|
|
1539
|
+
r = !1, await this.callBatchWithTimeout(i, async (a) => {
|
|
1540
|
+
var u, n;
|
|
1541
|
+
let A = !1;
|
|
1542
|
+
const h = /* @__PURE__ */ new Set();
|
|
1543
|
+
for (const [f, d] of Object.entries(a || {})) {
|
|
1544
|
+
if (!(d != null && d.error) || !d.error())
|
|
1545
1545
|
continue;
|
|
1546
|
-
const c = ((n = (
|
|
1546
|
+
const c = ((n = (u = d.error()) == null ? void 0 : u.ex) == null ? void 0 : n.error) ?? "";
|
|
1547
1547
|
if (c === "TIMEOUT") {
|
|
1548
|
-
|
|
1548
|
+
A = !0;
|
|
1549
1549
|
break;
|
|
1550
1550
|
}
|
|
1551
|
-
["QUERY_LIMIT_EXCEEDED", "OPERATION_TIME_LIMIT"].includes(c) &&
|
|
1551
|
+
["QUERY_LIMIT_EXCEEDED", "OPERATION_TIME_LIMIT"].includes(c) && h.add(f);
|
|
1552
1552
|
}
|
|
1553
|
-
if (
|
|
1554
|
-
|
|
1553
|
+
if (A) {
|
|
1554
|
+
r = !0, await _(this, Q, nt).call(this);
|
|
1555
1555
|
return;
|
|
1556
1556
|
}
|
|
1557
|
-
if (
|
|
1558
|
-
const
|
|
1559
|
-
for (const [c,
|
|
1560
|
-
|
|
1561
|
-
Object.keys(
|
|
1562
|
-
const
|
|
1563
|
-
for (const c of
|
|
1564
|
-
i[c] && (
|
|
1565
|
-
i =
|
|
1557
|
+
if (h.size > 0) {
|
|
1558
|
+
const f = {};
|
|
1559
|
+
for (const [c, l] of Object.entries(a || {}))
|
|
1560
|
+
h.has(c) || (f[c] = l);
|
|
1561
|
+
Object.keys(f).length && await e(f);
|
|
1562
|
+
const d = {};
|
|
1563
|
+
for (const c of h)
|
|
1564
|
+
i[c] && (d[c] = i[c]);
|
|
1565
|
+
i = d, Object.keys(i).length && (r = !0, await _(this, Q, nt).call(this));
|
|
1566
1566
|
return;
|
|
1567
1567
|
}
|
|
1568
1568
|
await e(a);
|
|
1569
1569
|
});
|
|
1570
|
-
while (
|
|
1571
|
-
}, Lt = new WeakSet(),
|
|
1572
|
-
return new Promise((
|
|
1570
|
+
while (r);
|
|
1571
|
+
}, Lt = new WeakSet(), ee = function(t, e) {
|
|
1572
|
+
return new Promise((r) => {
|
|
1573
1573
|
if (typeof this.callMethod != "function") {
|
|
1574
|
-
|
|
1574
|
+
r(null);
|
|
1575
1575
|
return;
|
|
1576
1576
|
}
|
|
1577
1577
|
let i = !1;
|
|
1578
1578
|
const a = setTimeout(() => {
|
|
1579
|
-
i || (i = !0,
|
|
1579
|
+
i || (i = !0, r(null));
|
|
1580
1580
|
}, this.requestTimeoutMs);
|
|
1581
1581
|
try {
|
|
1582
|
-
this.callMethod(t, e, (
|
|
1583
|
-
i || (i = !0, clearTimeout(a),
|
|
1582
|
+
this.callMethod(t, e, (A) => {
|
|
1583
|
+
i || (i = !0, clearTimeout(a), r(A));
|
|
1584
1584
|
});
|
|
1585
1585
|
} catch {
|
|
1586
|
-
i || (i = !0, clearTimeout(a),
|
|
1586
|
+
i || (i = !0, clearTimeout(a), r(null));
|
|
1587
1587
|
}
|
|
1588
1588
|
});
|
|
1589
|
-
},
|
|
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 =
|
|
1596
|
-
var
|
|
1597
|
-
class
|
|
1592
|
+
S(J, Tt, 5), /** Явный сигнал: много отдельных выборок сделок по фильтрам. */
|
|
1593
|
+
S(J, Et, 5), /** Достаточно «list»-методов в пачке и доля list от всех команд. */
|
|
1594
|
+
S(J, bt, 8), S(J, It, 0.65);
|
|
1595
|
+
let v = J;
|
|
1596
|
+
var et;
|
|
1597
|
+
class se {
|
|
1598
1598
|
constructor() {
|
|
1599
|
-
|
|
1599
|
+
S(this, et, {});
|
|
1600
1600
|
}
|
|
1601
1601
|
/**
|
|
1602
1602
|
* Получить случайный хеш-код длиной 8 символов
|
|
@@ -1611,11 +1611,11 @@ class zt {
|
|
|
1611
1611
|
* @returns {string}
|
|
1612
1612
|
*/
|
|
1613
1613
|
createHash(t) {
|
|
1614
|
-
let e = "abcdefghijklmnopqrstuvwxyz0123456789",
|
|
1614
|
+
let e = "abcdefghijklmnopqrstuvwxyz0123456789", r = "";
|
|
1615
1615
|
t = t || 6;
|
|
1616
1616
|
for (let i = 0; i < t; i++)
|
|
1617
|
-
|
|
1618
|
-
return
|
|
1617
|
+
r += e.charAt(Math.floor(Math.random() * e.length));
|
|
1618
|
+
return r;
|
|
1619
1619
|
}
|
|
1620
1620
|
/**
|
|
1621
1621
|
* Фильтр часто запускаемых действий (debounce)
|
|
@@ -1624,9 +1624,9 @@ class zt {
|
|
|
1624
1624
|
* @param {number} params.duration - Задержка в миллисекундах (по умолчанию 10)
|
|
1625
1625
|
* @param {Function} params.action - Функция для выполнения
|
|
1626
1626
|
*/
|
|
1627
|
-
actionFilter({ keyTimer: t, duration: e = 10, action:
|
|
1628
|
-
|
|
1629
|
-
|
|
1627
|
+
actionFilter({ keyTimer: t, duration: e = 10, action: r }) {
|
|
1628
|
+
E(this, et)[t] && (clearTimeout(E(this, et)[t]), E(this, et)[t] = null), r && (E(this, et)[t] = setTimeout(() => {
|
|
1629
|
+
r();
|
|
1630
1630
|
}, e));
|
|
1631
1631
|
}
|
|
1632
1632
|
/**
|
|
@@ -1657,35 +1657,37 @@ class zt {
|
|
|
1657
1657
|
* @param {string} filename - Имя файла без расширения
|
|
1658
1658
|
*/
|
|
1659
1659
|
downloadFileJson(t, e) {
|
|
1660
|
-
let
|
|
1660
|
+
let r = new Blob([JSON.stringify(t)], { type: "application/json" }), i = URL.createObjectURL(r), a = document.createElement("a");
|
|
1661
1661
|
a.style.display = "none", a.href = i, a.download = `${e}.json`, document.body.appendChild(a), a.click(), setTimeout(() => {
|
|
1662
1662
|
document.body.removeChild(a), URL.revokeObjectURL(i);
|
|
1663
1663
|
}, 200);
|
|
1664
1664
|
}
|
|
1665
1665
|
}
|
|
1666
|
-
|
|
1667
|
-
const
|
|
1668
|
-
var K, q,
|
|
1669
|
-
class
|
|
1666
|
+
et = new WeakMap();
|
|
1667
|
+
const xt = new se();
|
|
1668
|
+
var K, q, st, At, ft, Z, X, rt, it, Mt, re, dt, Jt, Dt, ie, kt, ne, wt, ae;
|
|
1669
|
+
class _e {
|
|
1670
1670
|
constructor() {
|
|
1671
|
-
|
|
1671
|
+
/** user.current — только при первом реальном использовании (сохранение лога, выгрузка). */
|
|
1672
|
+
S(this, Mt);
|
|
1672
1673
|
/** Вывод ошибок логера
|
|
1673
1674
|
* @param {'entity'} type - тип ошибки
|
|
1674
1675
|
*/
|
|
1675
|
-
|
|
1676
|
-
|
|
1677
|
-
|
|
1678
|
-
|
|
1679
|
-
|
|
1680
|
-
|
|
1681
|
-
|
|
1682
|
-
|
|
1683
|
-
|
|
1684
|
-
|
|
1685
|
-
|
|
1676
|
+
S(this, dt);
|
|
1677
|
+
S(this, Dt);
|
|
1678
|
+
S(this, kt);
|
|
1679
|
+
S(this, wt);
|
|
1680
|
+
S(this, K, "logger");
|
|
1681
|
+
S(this, q, !1);
|
|
1682
|
+
S(this, st, /* @__PURE__ */ new Map());
|
|
1683
|
+
S(this, At, {});
|
|
1684
|
+
S(this, ft, !1);
|
|
1685
|
+
S(this, Z, null);
|
|
1686
|
+
S(this, X, null);
|
|
1687
|
+
S(this, rt, !1);
|
|
1688
|
+
S(this, it, !1);
|
|
1686
1689
|
/** Очистка хранилища элементов старше 'N' месяцев */
|
|
1687
|
-
|
|
1688
|
-
E(this, Rt, Qt).call(this);
|
|
1690
|
+
B(this, "periodClear", 3);
|
|
1689
1691
|
}
|
|
1690
1692
|
/** Инициализация логера */
|
|
1691
1693
|
async init() {
|
|
@@ -1695,25 +1697,23 @@ class ce {
|
|
|
1695
1697
|
});
|
|
1696
1698
|
if (e && Array.isArray(e))
|
|
1697
1699
|
if (e.find(
|
|
1698
|
-
(i) => i.ENTITY ==
|
|
1700
|
+
(i) => i.ENTITY == E(this, K)
|
|
1699
1701
|
))
|
|
1700
|
-
|
|
1702
|
+
F(this, q, !0);
|
|
1701
1703
|
else {
|
|
1702
1704
|
let { entityAdd: i } = await t.batch({
|
|
1703
1705
|
entityAdd: {
|
|
1704
1706
|
method: "entity.add",
|
|
1705
1707
|
params: {
|
|
1706
|
-
ENTITY:
|
|
1707
|
-
NAME:
|
|
1708
|
+
ENTITY: E(this, K),
|
|
1709
|
+
NAME: E(this, K),
|
|
1708
1710
|
ACCESS: { AU: "X" }
|
|
1709
1711
|
}
|
|
1710
1712
|
}
|
|
1711
1713
|
});
|
|
1712
|
-
i &&
|
|
1714
|
+
i && F(this, q, !0);
|
|
1713
1715
|
}
|
|
1714
|
-
return E(this,
|
|
1715
|
-
console.error("Ошибка при проверке периода очистки:", s);
|
|
1716
|
-
}), S(this, q);
|
|
1716
|
+
return E(this, q);
|
|
1717
1717
|
} catch (t) {
|
|
1718
1718
|
return console.error("Ошибка при инициализации логера:", t), !1;
|
|
1719
1719
|
}
|
|
@@ -1728,20 +1728,21 @@ class ce {
|
|
|
1728
1728
|
* @returns {string|null}
|
|
1729
1729
|
*/
|
|
1730
1730
|
start({ type: t, data: e }) {
|
|
1731
|
-
if (
|
|
1732
|
-
|
|
1731
|
+
if (fetch("http://127.0.0.1:7903/ingest/d13e6df1-e437-464b-831d-29219bd3ff29", { method: "POST", headers: { "Content-Type": "application/json", "X-Debug-Session-Id": "e57011" }, body: JSON.stringify({ sessionId: "e57011", runId: "pre-fix", hypothesisId: "H4", location: "src/utils-kit/bx-logger.js:start", message: "logger start called", data: { isInitEntity: E(this, q), type: t, hasData: !!e }, timestamp: Date.now() }) }).catch(() => {
|
|
1732
|
+
}), !E(this, q))
|
|
1733
|
+
return _(this, dt, Jt).call(this, "entity"), null;
|
|
1733
1734
|
if (!t || !e)
|
|
1734
1735
|
return console.error("Невалидные данные для логирования:", { type: t, data: e }), null;
|
|
1735
|
-
const
|
|
1736
|
+
const r = xt.hash, i = {
|
|
1736
1737
|
type: t,
|
|
1737
1738
|
data: e,
|
|
1738
|
-
userInfo:
|
|
1739
|
+
userInfo: null,
|
|
1739
1740
|
errorList: {},
|
|
1740
1741
|
status: "",
|
|
1741
1742
|
answer: null,
|
|
1742
1743
|
date: (/* @__PURE__ */ new Date()).getTime()
|
|
1743
1744
|
};
|
|
1744
|
-
return
|
|
1745
|
+
return E(this, st).set(r, i), F(this, it, !0), r;
|
|
1745
1746
|
}
|
|
1746
1747
|
/**
|
|
1747
1748
|
* @param {{
|
|
@@ -1750,20 +1751,21 @@ class ce {
|
|
|
1750
1751
|
* status: 'success'|'fail'|'fail-runtime',
|
|
1751
1752
|
* answer: { [key]: unknown } }}
|
|
1752
1753
|
*/
|
|
1753
|
-
async stop({ key: t, errorList: e, status:
|
|
1754
|
-
var
|
|
1755
|
-
if (
|
|
1754
|
+
async stop({ key: t, errorList: e, status: r, answer: i }) {
|
|
1755
|
+
var A;
|
|
1756
|
+
if (fetch("http://127.0.0.1:7903/ingest/d13e6df1-e437-464b-831d-29219bd3ff29", { method: "POST", headers: { "Content-Type": "application/json", "X-Debug-Session-Id": "e57011" }, body: JSON.stringify({ sessionId: "e57011", runId: "pre-fix", hypothesisId: "H5", location: "src/utils-kit/bx-logger.js:stop", message: "logger stop called", data: { keyPresent: !!t, status: r, loggerStarted: E(this, it) }, timestamp: Date.now() }) }).catch(() => {
|
|
1757
|
+
}), !E(this, it))
|
|
1756
1758
|
return;
|
|
1757
|
-
if (!
|
|
1758
|
-
|
|
1759
|
+
if (!E(this, q)) {
|
|
1760
|
+
_(this, dt, Jt).call(this, "entity");
|
|
1759
1761
|
return;
|
|
1760
1762
|
}
|
|
1761
|
-
let a =
|
|
1763
|
+
let a = E(this, st).get(t);
|
|
1762
1764
|
if (!a) {
|
|
1763
1765
|
console.error(`Не найдены данные логирования для ключа: ${t}`);
|
|
1764
1766
|
return;
|
|
1765
1767
|
}
|
|
1766
|
-
e && (a.errorList = e),
|
|
1768
|
+
e && (a.errorList = e), r && (a.status = r), i && (a.answer = i), await _(this, Mt, re).call(this), a.userInfo = E(this, At), await _(this, Dt, ie).call(this), (A = a == null ? void 0 : a.data) != null && A.updateList && F(this, rt, !0), F(this, it, !1);
|
|
1767
1769
|
}
|
|
1768
1770
|
/**
|
|
1769
1771
|
* @param { ({percent}:{percent:number})=>{} } progressCall - коллбэк
|
|
@@ -1771,14 +1773,14 @@ class ce {
|
|
|
1771
1773
|
async getEntityList(t) {
|
|
1772
1774
|
var e;
|
|
1773
1775
|
try {
|
|
1774
|
-
if ((e =
|
|
1775
|
-
return
|
|
1776
|
-
let
|
|
1776
|
+
if ((e = E(this, X)) != null && e.length && !E(this, rt))
|
|
1777
|
+
return E(this, X);
|
|
1778
|
+
let r = new v(BX24.callBatch), { entityList: i } = await r.batch(
|
|
1777
1779
|
{
|
|
1778
1780
|
entityList: {
|
|
1779
1781
|
method: "entity.item.get",
|
|
1780
1782
|
params: {
|
|
1781
|
-
ENTITY:
|
|
1783
|
+
ENTITY: E(this, K),
|
|
1782
1784
|
SORT: { ID: "DESC" }
|
|
1783
1785
|
}
|
|
1784
1786
|
}
|
|
@@ -1787,31 +1789,38 @@ class ce {
|
|
|
1787
1789
|
);
|
|
1788
1790
|
return !i || !Array.isArray(i) ? (console.warn("Получен невалидный список записей"), []) : (i = i.map((a) => {
|
|
1789
1791
|
try {
|
|
1790
|
-
const { ID:
|
|
1792
|
+
const { ID: A, DATE_CREATE: h, DETAIL_TEXT: u } = a;
|
|
1791
1793
|
return {
|
|
1792
|
-
...JSON.parse(
|
|
1793
|
-
id:
|
|
1794
|
-
dateCreate:
|
|
1794
|
+
...JSON.parse(u),
|
|
1795
|
+
id: A,
|
|
1796
|
+
dateCreate: h
|
|
1795
1797
|
};
|
|
1796
|
-
} catch (
|
|
1798
|
+
} catch (A) {
|
|
1797
1799
|
return console.error(
|
|
1798
1800
|
`Ошибка парсинга записи ${a.ID}:`,
|
|
1799
|
-
|
|
1801
|
+
A
|
|
1800
1802
|
), null;
|
|
1801
1803
|
}
|
|
1802
|
-
}).filter((a) => a !== null),
|
|
1803
|
-
} catch (
|
|
1804
|
-
return console.error("Ошибка при получении списка записей:",
|
|
1804
|
+
}).filter((a) => a !== null), F(this, rt, !1), F(this, X, i), i);
|
|
1805
|
+
} catch (r) {
|
|
1806
|
+
return console.error("Ошибка при получении списка записей:", r), [];
|
|
1805
1807
|
}
|
|
1806
1808
|
}
|
|
1809
|
+
/**
|
|
1810
|
+
* Проверка возраста записей и очистка старых. Дёргает `entity.item.get` (как и выгрузка).
|
|
1811
|
+
* Не вызывается из `init` — вызывайте явно (например, из настроек или планировщика).
|
|
1812
|
+
*/
|
|
1813
|
+
runStorageMaintenance() {
|
|
1814
|
+
return _(this, kt, ne).call(this);
|
|
1815
|
+
}
|
|
1807
1816
|
/** Выгрузка всех данных из хранилища в JSON-файл */
|
|
1808
1817
|
async downAllEntityJson() {
|
|
1809
1818
|
try {
|
|
1810
|
-
if (
|
|
1819
|
+
if (E(this, X) || await this.getEntityList(), !E(this, X) || E(this, X).length === 0)
|
|
1811
1820
|
return console.warn("Нет данных для выгрузки"), !1;
|
|
1812
|
-
let t =
|
|
1813
|
-
return
|
|
1814
|
-
|
|
1821
|
+
let t = yt().format("%Y-%m-%d");
|
|
1822
|
+
return xt.downloadFileJson(
|
|
1823
|
+
E(this, X),
|
|
1815
1824
|
`sdklogger-entity-data__${t}`
|
|
1816
1825
|
), !0;
|
|
1817
1826
|
} catch (t) {
|
|
@@ -1819,52 +1828,57 @@ class ce {
|
|
|
1819
1828
|
}
|
|
1820
1829
|
}
|
|
1821
1830
|
}
|
|
1822
|
-
K = new WeakMap(), q = new WeakMap(),
|
|
1823
|
-
|
|
1824
|
-
|
|
1825
|
-
|
|
1826
|
-
|
|
1827
|
-
|
|
1828
|
-
|
|
1829
|
-
|
|
1830
|
-
|
|
1831
|
-
|
|
1832
|
-
|
|
1833
|
-
|
|
1834
|
-
|
|
1835
|
-
|
|
1831
|
+
K = new WeakMap(), q = new WeakMap(), st = new WeakMap(), At = new WeakMap(), ft = new WeakMap(), Z = new WeakMap(), X = new WeakMap(), rt = new WeakMap(), it = new WeakMap(), Mt = new WeakSet(), re = async function() {
|
|
1832
|
+
if (!E(this, ft))
|
|
1833
|
+
return E(this, Z) ? E(this, Z) : (F(this, Z, (async () => {
|
|
1834
|
+
try {
|
|
1835
|
+
const t = new v(BX24.callBatch), e = BX24.isAdmin(), { curUser: r } = await t.batch({
|
|
1836
|
+
curUser: { method: "user.current" }
|
|
1837
|
+
});
|
|
1838
|
+
F(this, At, { isAdmin: e, curUser: r });
|
|
1839
|
+
} catch (t) {
|
|
1840
|
+
console.error(
|
|
1841
|
+
"Ошибка при получении информации о пользователе:",
|
|
1842
|
+
t
|
|
1843
|
+
), F(this, At, { isAdmin: !1, curUser: null });
|
|
1844
|
+
} finally {
|
|
1845
|
+
F(this, ft, !0), F(this, Z, null);
|
|
1846
|
+
}
|
|
1847
|
+
})()), E(this, Z));
|
|
1848
|
+
}, dt = new WeakSet(), Jt = function(t) {
|
|
1849
|
+
t == "entity" && xt.actionFilter({
|
|
1836
1850
|
keyTimer: "error.logger.entity",
|
|
1837
1851
|
duration: 500,
|
|
1838
1852
|
action: () => {
|
|
1839
1853
|
console.error("Хранилище для логгера не инициализировано");
|
|
1840
1854
|
}
|
|
1841
1855
|
});
|
|
1842
|
-
},
|
|
1856
|
+
}, Dt = new WeakSet(), ie = async function() {
|
|
1843
1857
|
try {
|
|
1844
1858
|
let t = {}, e = new v(BX24.callBatch);
|
|
1845
|
-
for (let [
|
|
1859
|
+
for (let [r, i] of E(this, st).entries())
|
|
1846
1860
|
if (i.status) {
|
|
1847
1861
|
const a = JSON.stringify(i);
|
|
1848
|
-
t[
|
|
1862
|
+
t[r] = {
|
|
1849
1863
|
method: "entity.item.add",
|
|
1850
1864
|
params: {
|
|
1851
|
-
ENTITY:
|
|
1852
|
-
NAME:
|
|
1865
|
+
ENTITY: E(this, K),
|
|
1866
|
+
NAME: E(this, K),
|
|
1853
1867
|
DETAIL_TEXT: a
|
|
1854
1868
|
}
|
|
1855
1869
|
};
|
|
1856
1870
|
}
|
|
1857
1871
|
if (Object.keys(t).length) {
|
|
1858
|
-
let
|
|
1859
|
-
for (let [a,
|
|
1860
|
-
|
|
1872
|
+
let r = await e.batch(t), { errors: i } = e;
|
|
1873
|
+
for (let [a, A] of Object.entries({ ...r, ...i }))
|
|
1874
|
+
E(this, st).delete(a);
|
|
1861
1875
|
return !0;
|
|
1862
1876
|
}
|
|
1863
1877
|
return !1;
|
|
1864
1878
|
} catch (t) {
|
|
1865
1879
|
return console.error("Ошибка при добавлении записей в хранилище:", t), !1;
|
|
1866
1880
|
}
|
|
1867
|
-
},
|
|
1881
|
+
}, kt = new WeakSet(), ne = async function() {
|
|
1868
1882
|
try {
|
|
1869
1883
|
let t = new v(BX24.callBatch), { serverTime: e } = await t.batch({
|
|
1870
1884
|
serverTime: { method: "server.time" }
|
|
@@ -1873,77 +1887,77 @@ K = new WeakMap(), q = new WeakMap(), tt = new WeakMap(), nt = new WeakMap(), F
|
|
|
1873
1887
|
console.error("Не удалось получить время сервера");
|
|
1874
1888
|
return;
|
|
1875
1889
|
}
|
|
1876
|
-
if (
|
|
1890
|
+
if (E(this, X) || await this.getEntityList(), !E(this, X) || E(this, X).length === 0)
|
|
1877
1891
|
return;
|
|
1878
|
-
let
|
|
1892
|
+
let r = E(this, X).filter((i) => {
|
|
1879
1893
|
try {
|
|
1880
1894
|
let { dateCreate: a } = i;
|
|
1881
|
-
return a ?
|
|
1882
|
-
|
|
1895
|
+
return a ? yt(new Date(a)).between(
|
|
1896
|
+
yt(new Date(e)),
|
|
1883
1897
|
"month"
|
|
1884
1898
|
) >= this.periodClear : !1;
|
|
1885
1899
|
} catch (a) {
|
|
1886
1900
|
return console.error("Ошибка при проверке даты записи:", a), !1;
|
|
1887
1901
|
}
|
|
1888
1902
|
});
|
|
1889
|
-
|
|
1890
|
-
`Найдено ${
|
|
1891
|
-
), await
|
|
1903
|
+
r.length > 0 && (console.log(
|
|
1904
|
+
`Найдено ${r.length} записей для очистки (старше ${this.periodClear} месяцев)`
|
|
1905
|
+
), await _(this, wt, ae).call(this, r));
|
|
1892
1906
|
} catch (t) {
|
|
1893
1907
|
console.error("Ошибка при проверке периода очистки:", t);
|
|
1894
1908
|
}
|
|
1895
|
-
},
|
|
1909
|
+
}, wt = new WeakSet(), ae = async function(t) {
|
|
1896
1910
|
try {
|
|
1897
1911
|
if (!t || t.length === 0)
|
|
1898
1912
|
return !1;
|
|
1899
|
-
let e = new v(BX24.callBatch),
|
|
1900
|
-
let { id:
|
|
1913
|
+
let e = new v(BX24.callBatch), r = t.filter((a) => a && a.id).map((a) => {
|
|
1914
|
+
let { id: A } = a;
|
|
1901
1915
|
return {
|
|
1902
1916
|
method: "entity.item.delete",
|
|
1903
1917
|
params: {
|
|
1904
|
-
ENTITY:
|
|
1905
|
-
ID:
|
|
1918
|
+
ENTITY: E(this, K),
|
|
1919
|
+
ID: A
|
|
1906
1920
|
}
|
|
1907
1921
|
};
|
|
1908
1922
|
});
|
|
1909
|
-
if (
|
|
1923
|
+
if (r.length === 0)
|
|
1910
1924
|
return !1;
|
|
1911
|
-
const i = await e.batch(
|
|
1912
|
-
return console.log(`Успешно удалено ${
|
|
1925
|
+
const i = await e.batch(r);
|
|
1926
|
+
return console.log(`Успешно удалено ${r.length} записей`), F(this, rt, !0), i;
|
|
1913
1927
|
} catch (e) {
|
|
1914
1928
|
return console.error("Ошибка при очистке устаревших записей:", e), !1;
|
|
1915
1929
|
}
|
|
1916
1930
|
};
|
|
1917
|
-
function
|
|
1918
|
-
if (!
|
|
1931
|
+
function Qt(y) {
|
|
1932
|
+
if (!y || typeof y != "string")
|
|
1919
1933
|
return "";
|
|
1920
1934
|
try {
|
|
1921
|
-
const t = new URL(
|
|
1935
|
+
const t = new URL(y);
|
|
1922
1936
|
t.search = "", t.hash = "";
|
|
1923
1937
|
let e = t.toString();
|
|
1924
1938
|
return e.endsWith("/") && t.pathname !== "/" && (e = e.slice(0, -1)), e;
|
|
1925
1939
|
} catch {
|
|
1926
|
-
return
|
|
1940
|
+
return y.split("?")[0].split("#")[0].replace(/\/$/, "");
|
|
1927
1941
|
}
|
|
1928
1942
|
}
|
|
1929
|
-
function
|
|
1930
|
-
return !
|
|
1943
|
+
function oe(y) {
|
|
1944
|
+
return !y || typeof y != "string" ? !1 : y.toLowerCase().includes("/marketplace/app");
|
|
1931
1945
|
}
|
|
1932
|
-
function
|
|
1946
|
+
function Te() {
|
|
1933
1947
|
var t;
|
|
1934
1948
|
if (typeof window > "u" || !((t = window.location) != null && t.href))
|
|
1935
1949
|
return "";
|
|
1936
|
-
const
|
|
1937
|
-
return
|
|
1950
|
+
const y = Qt(window.location.href);
|
|
1951
|
+
return oe(y) ? "" : y;
|
|
1938
1952
|
}
|
|
1939
|
-
function
|
|
1940
|
-
if (!(
|
|
1953
|
+
function Kt(y) {
|
|
1954
|
+
if (!(y != null && y.appConst) || typeof y.appConst != "object")
|
|
1941
1955
|
return "";
|
|
1942
|
-
const t =
|
|
1943
|
-
return t ? (
|
|
1956
|
+
const t = Te();
|
|
1957
|
+
return t ? (y.appConst.pathApp = t, t) : Qt(y.appConst.pathApp ?? "");
|
|
1944
1958
|
}
|
|
1945
|
-
var
|
|
1946
|
-
class
|
|
1959
|
+
var ct, Ot, Ct, Ae, Bt, ce, Ht, he, Ut, le, Pt, ue, V, at, mt, vt, Gt, fe, gt, qt, Yt, de;
|
|
1960
|
+
class Le {
|
|
1947
1961
|
/**
|
|
1948
1962
|
* @param {Object} appConst - Константы приложения
|
|
1949
1963
|
* @param {string} appConst.appName - Название приложения
|
|
@@ -1956,11 +1970,24 @@ class ge {
|
|
|
1956
1970
|
*
|
|
1957
1971
|
* @returns {Batch} Shared Batch instance.
|
|
1958
1972
|
*/
|
|
1959
|
-
|
|
1973
|
+
S(this, ct);
|
|
1974
|
+
S(this, Ct);
|
|
1975
|
+
/**
|
|
1976
|
+
* `this.logger === true` → `BxLogger` + лёгкий `init` (сущность хранилища, без полной выгрузки);
|
|
1977
|
+
* иначе — заглушка.
|
|
1978
|
+
* @param {boolean} runLoggerMaintenance
|
|
1979
|
+
*/
|
|
1980
|
+
S(this, Bt);
|
|
1981
|
+
/**
|
|
1982
|
+
* @returns {boolean}
|
|
1983
|
+
*/
|
|
1984
|
+
S(this, Ht);
|
|
1960
1985
|
/** Запрос данных о приложении */
|
|
1961
|
-
|
|
1986
|
+
S(this, Ut);
|
|
1962
1987
|
/** Запрос данных о текущем пользователе */
|
|
1963
|
-
|
|
1988
|
+
S(this, Pt);
|
|
1989
|
+
S(this, V);
|
|
1990
|
+
S(this, mt);
|
|
1964
1991
|
/**
|
|
1965
1992
|
* Расширяет errorList для случаев TIMEOUT и LIMIT
|
|
1966
1993
|
* Если есть ошибки TIMEOUT или LIMIT, добавляет все необработанные сущности из commandList
|
|
@@ -1970,31 +1997,31 @@ class ge {
|
|
|
1970
1997
|
* @param {Array} updateList - Список обновлений для логирования (опционально)
|
|
1971
1998
|
* @returns {Object} Расширенный список ошибок
|
|
1972
1999
|
*/
|
|
1973
|
-
|
|
2000
|
+
S(this, Gt);
|
|
1974
2001
|
/**
|
|
1975
2002
|
* Нормализует входные данные в массив объектов {placement, handler?}
|
|
1976
2003
|
* @private
|
|
1977
2004
|
*/
|
|
1978
|
-
|
|
2005
|
+
S(this, gt);
|
|
1979
2006
|
/**
|
|
1980
2007
|
* Находит встройки с устаревшим handler (не содержащим текущий pathApp)
|
|
1981
2008
|
* @private
|
|
1982
2009
|
*/
|
|
1983
|
-
|
|
1984
|
-
|
|
1985
|
-
|
|
1986
|
-
|
|
1987
|
-
|
|
1988
|
-
|
|
1989
|
-
|
|
1990
|
-
|
|
1991
|
-
|
|
1992
|
-
|
|
2010
|
+
S(this, Yt);
|
|
2011
|
+
B(this, "domain", "");
|
|
2012
|
+
B(this, "isAdmin", !1);
|
|
2013
|
+
B(this, "appInfo", null);
|
|
2014
|
+
B(this, "appConst", null);
|
|
2015
|
+
B(this, "userInfo", null);
|
|
2016
|
+
B(this, "placeData", null);
|
|
2017
|
+
B(this, "placeInfo", null);
|
|
2018
|
+
B(this, "logger", !1);
|
|
2019
|
+
B(this, "timeLimit", {
|
|
1993
2020
|
limit: !1,
|
|
1994
2021
|
date: void 0,
|
|
1995
2022
|
pauseMs: void 0
|
|
1996
2023
|
});
|
|
1997
|
-
|
|
2024
|
+
B(this, "batchClient", null);
|
|
1998
2025
|
this.appConst = t;
|
|
1999
2026
|
}
|
|
2000
2027
|
/**
|
|
@@ -2004,49 +2031,52 @@ class ge {
|
|
|
2004
2031
|
* @returns {() => void} Функция отписки.
|
|
2005
2032
|
*/
|
|
2006
2033
|
subscribeTimeLimit(t) {
|
|
2007
|
-
return
|
|
2034
|
+
return _(this, ct, Ot).call(this).subscribeTimeLimit(t);
|
|
2008
2035
|
}
|
|
2009
2036
|
/**
|
|
2010
|
-
*
|
|
2011
|
-
*
|
|
2037
|
+
* Единая инициализация: внутри автоматически выбирается ветка обычного приложения или
|
|
2038
|
+
* `PAGE_BACKGROUND_WORKER`. Всегда заполняет `app.info` и `user.current`, а также
|
|
2039
|
+
* возвращает флаг контекста запуска `{ isBackworker }`.
|
|
2040
|
+
* @param {{ runLoggerMaintenance?: boolean }} [options] — опциональная фоновая
|
|
2041
|
+
* очистка старых записей логгера (раньше запускалась вместе с `logger.init`, теперь явно).
|
|
2042
|
+
* `noSleep` запускается только вне `PAGE_BACKGROUND_WORKER`.
|
|
2043
|
+
* @returns {Promise<{ isBackworker: boolean }>}
|
|
2012
2044
|
* @throws {Error} Если BX24 не загружен в течение 30 секунд
|
|
2013
2045
|
*/
|
|
2014
2046
|
init() {
|
|
2015
|
-
return
|
|
2016
|
-
|
|
2047
|
+
return fetch("http://127.0.0.1:7903/ingest/d13e6df1-e437-464b-831d-29219bd3ff29", { method: "POST", headers: { "Content-Type": "application/json", "X-Debug-Session-Id": "e57011" }, body: JSON.stringify({ sessionId: "e57011", runId: "pre-fix", hypothesisId: "H1", location: "src/utils-kit/bx-boot.js:init", message: "init invoked", data: { loggerFlag: this.logger }, timestamp: Date.now() }) }).catch(() => {
|
|
2048
|
+
}), new Promise((t, e) => {
|
|
2049
|
+
const i = setTimeout(() => {
|
|
2050
|
+
clearInterval(a);
|
|
2051
|
+
const A = new Error(
|
|
2052
|
+
"BX24 initialization timeout: BX24 object not found within 30 seconds"
|
|
2053
|
+
);
|
|
2054
|
+
console.error(A), e(A);
|
|
2055
|
+
}, 3e4);
|
|
2056
|
+
let a = setInterval(() => {
|
|
2017
2057
|
window.BX24 && BX24.init(async () => {
|
|
2018
|
-
|
|
2019
|
-
|
|
2020
|
-
|
|
2021
|
-
|
|
2022
|
-
|
|
2023
|
-
|
|
2058
|
+
var h, u, n;
|
|
2059
|
+
clearInterval(a), clearTimeout(i), this.domain = BX24.getDomain(), this.isAdmin = BX24.isAdmin(), this.placeInfo = BX24.placement.info();
|
|
2060
|
+
const A = _(this, Ht, he).call(this);
|
|
2061
|
+
if (fetch("http://127.0.0.1:7903/ingest/d13e6df1-e437-464b-831d-29219bd3ff29", { method: "POST", headers: { "Content-Type": "application/json", "X-Debug-Session-Id": "e57011" }, body: JSON.stringify({ sessionId: "e57011", runId: "pre-fix", hypothesisId: "H1", location: "src/utils-kit/bx-boot.js:init:after-placement", message: "placement detected", data: { placement: (h = this.placeInfo) == null ? void 0 : h.placement, placementId: (n = (u = this.placeInfo) == null ? void 0 : u.options) == null ? void 0 : n.ID, isBackworker: A }, timestamp: Date.now() }) }).catch(() => {
|
|
2062
|
+
}), console.info(
|
|
2063
|
+
A ? "init BX24 (background worker)" : "init BX24"
|
|
2064
|
+
), this.appInfo = await _(this, Ut, le).call(this), this.userInfo = await _(this, Pt, ue).call(this), Kt(this), !A) {
|
|
2065
|
+
await _(this, Bt, ce).call(this, !0);
|
|
2066
|
+
const f = new se();
|
|
2067
|
+
try {
|
|
2068
|
+
f.noSleep();
|
|
2069
|
+
} catch (d) {
|
|
2070
|
+
console.warn(
|
|
2071
|
+
"Failed to initialize noSleep:",
|
|
2072
|
+
d
|
|
2073
|
+
);
|
|
2024
2074
|
}
|
|
2025
|
-
};
|
|
2026
|
-
const [l, A] = await Promise.all([
|
|
2027
|
-
E(this, Mt, te).call(this),
|
|
2028
|
-
E(this, Dt, ee).call(this)
|
|
2029
|
-
]);
|
|
2030
|
-
this.appInfo = l, this.userInfo = A, Gt(this);
|
|
2031
|
-
let h = new zt();
|
|
2032
|
-
try {
|
|
2033
|
-
h.noSleep();
|
|
2034
|
-
} catch (n) {
|
|
2035
|
-
console.warn(
|
|
2036
|
-
"Failed to initialize noSleep:",
|
|
2037
|
-
n
|
|
2038
|
-
);
|
|
2039
2075
|
}
|
|
2040
|
-
|
|
2076
|
+
fetch("http://127.0.0.1:7903/ingest/d13e6df1-e437-464b-831d-29219bd3ff29", { method: "POST", headers: { "Content-Type": "application/json", "X-Debug-Session-Id": "e57011" }, body: JSON.stringify({ sessionId: "e57011", runId: "pre-fix", hypothesisId: "H3", location: "src/utils-kit/bx-boot.js:init:resolve", message: "init resolved", data: { isBackworker: A, hasAppInfo: !!this.appInfo, hasUserInfo: !!this.userInfo, loggerType: typeof this.logger }, timestamp: Date.now() }) }).catch(() => {
|
|
2077
|
+
}), t({ isBackworker: A });
|
|
2041
2078
|
});
|
|
2042
2079
|
}, 100);
|
|
2043
|
-
const a = setTimeout(() => {
|
|
2044
|
-
clearInterval(i);
|
|
2045
|
-
const l = new Error(
|
|
2046
|
-
"BX24 initialization timeout: BX24 object not found within 30 seconds"
|
|
2047
|
-
);
|
|
2048
|
-
console.error(l), e(l);
|
|
2049
|
-
}, 3e4);
|
|
2050
2080
|
});
|
|
2051
2081
|
}
|
|
2052
2082
|
/**
|
|
@@ -2091,41 +2121,25 @@ class ge {
|
|
|
2091
2121
|
* }[]
|
|
2092
2122
|
* }[]
|
|
2093
2123
|
*/
|
|
2094
|
-
async call({ method: t, params: e, updateList:
|
|
2124
|
+
async call({ method: t, params: e, updateList: r }) {
|
|
2095
2125
|
let i;
|
|
2096
|
-
if (
|
|
2126
|
+
if (r && (i = this.logger.start({
|
|
2097
2127
|
type: "call",
|
|
2098
|
-
data: { method: t, params: e, updateList:
|
|
2128
|
+
data: { method: t, params: e, updateList: r }
|
|
2099
2129
|
})), e || (e = {}), typeof BX24 > "u" || !BX24.callMethod) {
|
|
2100
|
-
const
|
|
2101
|
-
throw console.error(
|
|
2102
|
-
}
|
|
2103
|
-
const l = await E(this, rt, ct).call(this).call({ method: t, params: e });
|
|
2104
|
-
if (!l.success) {
|
|
2105
|
-
if (console.error(l.error), i)
|
|
2106
|
-
try {
|
|
2107
|
-
await this.logger.stop({
|
|
2108
|
-
answer: l.answer,
|
|
2109
|
-
key: i,
|
|
2110
|
-
status: "fail",
|
|
2111
|
-
errorList: { 0: l.error || "Unknown call error" }
|
|
2112
|
-
});
|
|
2113
|
-
} catch (A) {
|
|
2114
|
-
console.error("Logger error:", A);
|
|
2115
|
-
}
|
|
2116
|
-
return !1;
|
|
2130
|
+
const h = new Error("BX24 is not initialized");
|
|
2131
|
+
throw console.error(h), h;
|
|
2117
2132
|
}
|
|
2118
|
-
|
|
2119
|
-
|
|
2120
|
-
|
|
2121
|
-
|
|
2122
|
-
|
|
2123
|
-
|
|
2124
|
-
|
|
2125
|
-
|
|
2126
|
-
|
|
2127
|
-
|
|
2128
|
-
return l.data;
|
|
2133
|
+
const A = await _(this, ct, Ot).call(this).call({ method: t, params: e });
|
|
2134
|
+
return A.success ? (await _(this, V, at).call(this, i, {
|
|
2135
|
+
answer: A.answer,
|
|
2136
|
+
status: "success"
|
|
2137
|
+
}), A.data) : (fetch("http://127.0.0.1:7903/ingest/d13e6df1-e437-464b-831d-29219bd3ff29", { method: "POST", headers: { "Content-Type": "application/json", "X-Debug-Session-Id": "e57011" }, body: JSON.stringify({ sessionId: "e57011", runId: "pre-fix", hypothesisId: "H4", location: "src/utils-kit/bx-boot.js:call", message: "call failed", data: { method: t, error: A.error, hasUpdateList: !!r, loggerType: typeof this.logger }, timestamp: Date.now() }) }).catch(() => {
|
|
2138
|
+
}), console.error(A.error), await _(this, V, at).call(this, i, {
|
|
2139
|
+
answer: A.answer,
|
|
2140
|
+
status: "fail",
|
|
2141
|
+
errorList: { 0: A.error || "Unknown call error" }
|
|
2142
|
+
}), !1);
|
|
2129
2143
|
}
|
|
2130
2144
|
/**
|
|
2131
2145
|
* @param commandList - объект/массив команд
|
|
@@ -2146,58 +2160,19 @@ class ge {
|
|
|
2146
2160
|
* }[]
|
|
2147
2161
|
* }}
|
|
2148
2162
|
*/
|
|
2149
|
-
async batch(t, e, { errorCall:
|
|
2163
|
+
async batch(t, e, { errorCall: r, updateList: i, batchOptions: a } = {}) {
|
|
2150
2164
|
if (typeof BX24 > "u" || !BX24.callBatch) {
|
|
2151
|
-
const
|
|
2152
|
-
return console.error(
|
|
2153
|
-
}
|
|
2154
|
-
const l = E(this, rt, ct).call(this);
|
|
2155
|
-
let A;
|
|
2156
|
-
i && (A = this.logger.start({
|
|
2157
|
-
type: "batch",
|
|
2158
|
-
data: { commandList: t, updateList: i }
|
|
2159
|
-
}));
|
|
2160
|
-
try {
|
|
2161
|
-
let h = await l.batch(
|
|
2162
|
-
t,
|
|
2163
|
-
e,
|
|
2164
|
-
a
|
|
2165
|
-
);
|
|
2166
|
-
const n = E(this, ut, Pt).call(this, l, h, t, i);
|
|
2167
|
-
if (Object.keys(n).length) {
|
|
2168
|
-
if (s && s(n), A)
|
|
2169
|
-
try {
|
|
2170
|
-
await this.logger.stop({
|
|
2171
|
-
key: A,
|
|
2172
|
-
status: "fail",
|
|
2173
|
-
errorList: n
|
|
2174
|
-
});
|
|
2175
|
-
} catch (u) {
|
|
2176
|
-
console.error("Logger error:", u);
|
|
2177
|
-
}
|
|
2178
|
-
} else if (A)
|
|
2179
|
-
try {
|
|
2180
|
-
await this.logger.stop({
|
|
2181
|
-
key: A,
|
|
2182
|
-
status: "success"
|
|
2183
|
-
});
|
|
2184
|
-
} catch (u) {
|
|
2185
|
-
console.error("Logger error:", u);
|
|
2186
|
-
}
|
|
2187
|
-
return h;
|
|
2188
|
-
} catch (h) {
|
|
2189
|
-
if (A)
|
|
2190
|
-
try {
|
|
2191
|
-
await this.logger.stop({
|
|
2192
|
-
key: A,
|
|
2193
|
-
status: "fail-runtime",
|
|
2194
|
-
errorList: { 0: h == null ? void 0 : h.toString() }
|
|
2195
|
-
});
|
|
2196
|
-
} catch (n) {
|
|
2197
|
-
console.error("Logger error:", n);
|
|
2198
|
-
}
|
|
2199
|
-
return console.error(h), !1;
|
|
2165
|
+
const A = new Error("BX24 is not initialized");
|
|
2166
|
+
return console.error(A), !1;
|
|
2200
2167
|
}
|
|
2168
|
+
return _(this, mt, vt).call(this, {
|
|
2169
|
+
mode: "batch",
|
|
2170
|
+
commandList: t,
|
|
2171
|
+
progressCall: e,
|
|
2172
|
+
errorCall: r,
|
|
2173
|
+
updateList: i,
|
|
2174
|
+
batchOptions: a
|
|
2175
|
+
});
|
|
2201
2176
|
}
|
|
2202
2177
|
/**
|
|
2203
2178
|
* Получить количество элементов для списочных методов
|
|
@@ -2221,115 +2196,79 @@ class ge {
|
|
|
2221
2196
|
* }}
|
|
2222
2197
|
* @returns {Promise<Object|false>}
|
|
2223
2198
|
*/
|
|
2224
|
-
async batchTotalCount(t, e, { errorCall:
|
|
2199
|
+
async batchTotalCount(t, e, { errorCall: r, updateList: i } = {}) {
|
|
2225
2200
|
if (typeof BX24 > "u" || !BX24.callBatch) {
|
|
2226
|
-
const
|
|
2227
|
-
return console.error(
|
|
2228
|
-
}
|
|
2229
|
-
const a = E(this, rt, ct).call(this);
|
|
2230
|
-
let l;
|
|
2231
|
-
i && (l = this.logger.start({
|
|
2232
|
-
type: "batch-total-count",
|
|
2233
|
-
data: { commandList: t }
|
|
2234
|
-
}));
|
|
2235
|
-
try {
|
|
2236
|
-
let A = await a.batchTotalCount(
|
|
2237
|
-
t,
|
|
2238
|
-
e
|
|
2239
|
-
);
|
|
2240
|
-
const h = E(this, ut, Pt).call(this, a, A, t, i);
|
|
2241
|
-
if (Object.keys(h).length) {
|
|
2242
|
-
if (s && s(h), l)
|
|
2243
|
-
try {
|
|
2244
|
-
await this.logger.stop({
|
|
2245
|
-
key: l,
|
|
2246
|
-
status: "fail",
|
|
2247
|
-
errorList: h
|
|
2248
|
-
});
|
|
2249
|
-
} catch (n) {
|
|
2250
|
-
console.error("Logger error:", n);
|
|
2251
|
-
}
|
|
2252
|
-
} else if (l)
|
|
2253
|
-
try {
|
|
2254
|
-
await this.logger.stop({
|
|
2255
|
-
key: l,
|
|
2256
|
-
status: "success"
|
|
2257
|
-
});
|
|
2258
|
-
} catch (n) {
|
|
2259
|
-
console.error("Logger error:", n);
|
|
2260
|
-
}
|
|
2261
|
-
return A;
|
|
2262
|
-
} catch (A) {
|
|
2263
|
-
if (l)
|
|
2264
|
-
try {
|
|
2265
|
-
await this.logger.stop({
|
|
2266
|
-
key: l,
|
|
2267
|
-
status: "fail-runtime",
|
|
2268
|
-
errorList: { 0: A == null ? void 0 : A.toString() }
|
|
2269
|
-
});
|
|
2270
|
-
} catch (h) {
|
|
2271
|
-
console.error("Logger error:", h);
|
|
2272
|
-
}
|
|
2273
|
-
return console.error(A), !1;
|
|
2201
|
+
const a = new Error("BX24 is not initialized");
|
|
2202
|
+
return console.error(a), !1;
|
|
2274
2203
|
}
|
|
2204
|
+
return _(this, mt, vt).call(this, {
|
|
2205
|
+
mode: "batch-total-count",
|
|
2206
|
+
commandList: t,
|
|
2207
|
+
progressCall: e,
|
|
2208
|
+
errorCall: r,
|
|
2209
|
+
updateList: i
|
|
2210
|
+
});
|
|
2275
2211
|
}
|
|
2276
2212
|
/** Запрос данных о местах встройки приложения */
|
|
2277
2213
|
async getPlacement() {
|
|
2278
|
-
|
|
2214
|
+
const t = await this.call({ method: "placement.get" });
|
|
2215
|
+
return this.placeData || (this.placeData = t), t;
|
|
2279
2216
|
}
|
|
2280
2217
|
/**
|
|
2281
2218
|
* Встройка приложения в указанные места
|
|
2282
2219
|
* @param {string|string[]|Object|Object[]} place - Место или массив мест для встройки
|
|
2283
2220
|
*/
|
|
2284
2221
|
async placementBind(t) {
|
|
2285
|
-
var
|
|
2222
|
+
var c;
|
|
2286
2223
|
if (!this.isAdmin || (this.placeData = await this.getPlacement(), !this.placeData))
|
|
2287
2224
|
return;
|
|
2288
|
-
const { appName: e, pathApp:
|
|
2289
|
-
let i =
|
|
2225
|
+
const { appName: e, pathApp: r } = this.appConst;
|
|
2226
|
+
let i = _(this, gt, qt).call(this, t);
|
|
2290
2227
|
i = i.filter(
|
|
2291
|
-
(
|
|
2228
|
+
(l) => l.placement !== "PAGE_BACKGROUND_WORKER" && l.placement !== "PAGE_BACKGROUND_WORKER_ALL"
|
|
2292
2229
|
);
|
|
2293
|
-
const a =
|
|
2294
|
-
for (const
|
|
2295
|
-
|
|
2230
|
+
const a = _(this, Yt, de).call(this, r), A = new Set(i.map((l) => l.placement));
|
|
2231
|
+
for (const l of a)
|
|
2232
|
+
A.has(l.placement) || i.push({ placement: l.placement });
|
|
2296
2233
|
if (i.length === 0)
|
|
2297
2234
|
return;
|
|
2298
|
-
let
|
|
2299
|
-
this.domain === "szdl.bitrix24.ru" && ((
|
|
2300
|
-
const
|
|
2301
|
-
for (
|
|
2302
|
-
|
|
2303
|
-
|
|
2304
|
-
|
|
2235
|
+
let h = e;
|
|
2236
|
+
this.domain === "szdl.bitrix24.ru" && ((c = this.appInfo) != null && c.ID) && (h = `${e}: #${this.appInfo.ID}`);
|
|
2237
|
+
const u = h.replace(" CRM", ""), n = {}, f = [], d = /* @__PURE__ */ new Map();
|
|
2238
|
+
for (const l of this.placeData)
|
|
2239
|
+
d.has(l.placement) || d.set(l.placement, []), d.get(l.placement).push(l);
|
|
2240
|
+
for (let l = 0; l < i.length; l++) {
|
|
2241
|
+
const O = i[l].placement, T = d.get(O) || [];
|
|
2242
|
+
if (T.some(
|
|
2243
|
+
(N) => N.handler === r
|
|
2305
2244
|
))
|
|
2306
2245
|
continue;
|
|
2307
|
-
const
|
|
2308
|
-
(
|
|
2246
|
+
const I = T.filter(
|
|
2247
|
+
(N) => N.handler !== r
|
|
2309
2248
|
);
|
|
2310
|
-
for (const
|
|
2311
|
-
|
|
2312
|
-
placement:
|
|
2313
|
-
handler:
|
|
2249
|
+
for (const N of I)
|
|
2250
|
+
f.push({
|
|
2251
|
+
placement: O,
|
|
2252
|
+
handler: N.handler
|
|
2314
2253
|
});
|
|
2315
|
-
n[`bind_${
|
|
2254
|
+
n[`bind_${l}`] = {
|
|
2316
2255
|
method: "placement.bind",
|
|
2317
2256
|
params: {
|
|
2318
|
-
PLACEMENT:
|
|
2319
|
-
HANDLER:
|
|
2257
|
+
PLACEMENT: O,
|
|
2258
|
+
HANDLER: r,
|
|
2320
2259
|
LANG_ALL: {
|
|
2321
2260
|
ru: {
|
|
2322
|
-
TITLE:
|
|
2261
|
+
TITLE: O === "USER_PROFILE_TOOLBAR" ? u : h
|
|
2323
2262
|
}
|
|
2324
2263
|
},
|
|
2325
2264
|
OPTIONS: {
|
|
2326
|
-
errorHandlerUrl:
|
|
2265
|
+
errorHandlerUrl: r
|
|
2327
2266
|
}
|
|
2328
2267
|
}
|
|
2329
2268
|
};
|
|
2330
2269
|
}
|
|
2331
|
-
|
|
2332
|
-
console.log("Приложение успешно встроено в",
|
|
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((l) => {
|
|
2271
|
+
console.log("Приложение успешно встроено в", l.params.PLACEMENT);
|
|
2333
2272
|
}));
|
|
2334
2273
|
}
|
|
2335
2274
|
/**
|
|
@@ -2337,40 +2276,37 @@ class ge {
|
|
|
2337
2276
|
* @param {string|string[]|Object|Object[]} place - Место или массив мест для отвязки
|
|
2338
2277
|
*/
|
|
2339
2278
|
async placementUnBind(t) {
|
|
2340
|
-
let e =
|
|
2279
|
+
let e = _(this, gt, qt).call(this, t);
|
|
2341
2280
|
if (e = e.filter(
|
|
2342
2281
|
(i) => i.placement !== "PAGE_BACKGROUND_WORKER" && i.placement !== "PAGE_BACKGROUND_WORKER_ALL"
|
|
2343
2282
|
), e.length === 0)
|
|
2344
2283
|
return;
|
|
2345
|
-
const
|
|
2284
|
+
const r = {};
|
|
2346
2285
|
for (let i = 0; i < e.length; i++) {
|
|
2347
2286
|
const a = {
|
|
2348
2287
|
PLACEMENT: e[i].placement
|
|
2349
2288
|
};
|
|
2350
|
-
e[i].handler && (a.HANDLER = e[i].handler),
|
|
2289
|
+
e[i].handler && (a.HANDLER = e[i].handler), r[`unbind_${i}`] = {
|
|
2351
2290
|
method: "placement.unbind",
|
|
2352
2291
|
params: a
|
|
2353
2292
|
};
|
|
2354
2293
|
}
|
|
2355
|
-
await this.batch(
|
|
2294
|
+
await this.batch(r), e.forEach((i) => {
|
|
2356
2295
|
console.log("Встройка отвязана", i.placement);
|
|
2357
2296
|
});
|
|
2358
2297
|
}
|
|
2359
2298
|
/** Чат-бот */
|
|
2360
2299
|
/* получение списка ботов */
|
|
2361
|
-
getBotList() {
|
|
2362
|
-
|
|
2300
|
+
async getBotList() {
|
|
2301
|
+
const t = await this.call({
|
|
2363
2302
|
method: "imbot.bot.list",
|
|
2364
2303
|
params: {}
|
|
2365
|
-
}).
|
|
2366
|
-
|
|
2367
|
-
return console.log("chat-bot list:", e), e;
|
|
2368
|
-
});
|
|
2304
|
+
}), e = Object.values(t);
|
|
2305
|
+
return console.log("chat-bot list:", e), e;
|
|
2369
2306
|
}
|
|
2370
2307
|
/* регистрация бота */
|
|
2371
|
-
regBot({ code: t, type: e, name:
|
|
2372
|
-
const { appName: i, pathApp: a, chatBotLogo:
|
|
2373
|
-
return this.call({
|
|
2308
|
+
async regBot({ code: t, type: e, name: r }) {
|
|
2309
|
+
const { appName: i, pathApp: a, chatBotLogo: A } = this.appConst, h = this.appInfo.ID, u = await this.call({
|
|
2374
2310
|
method: "imbot.register",
|
|
2375
2311
|
params: {
|
|
2376
2312
|
CODE: t ?? this.appInfo.CODE,
|
|
@@ -2385,7 +2321,7 @@ class ge {
|
|
|
2385
2321
|
// строковый идентификатор чат-бота, используется только в режиме Вебхуков
|
|
2386
2322
|
PROPERTIES: {
|
|
2387
2323
|
// Личные данные чат-бота (обяз.)
|
|
2388
|
-
NAME: `${
|
|
2324
|
+
NAME: `${r ?? i} - бот #${h}`,
|
|
2389
2325
|
// Имя чат-бота (обязательное одно из полей NAME или LAST_NAME)
|
|
2390
2326
|
LAST_NAME: "",
|
|
2391
2327
|
// Фамилия чат-бота (обязательное одно из полей NAME или LAST_NAME)
|
|
@@ -2393,7 +2329,7 @@ class ge {
|
|
|
2393
2329
|
// Цвет чат-бота для мобильного приложения RED, GREEN, MINT, LIGHT_BLUE, DARK_BLUE, PURPLE, AQUA, PINK, LIME, BROWN, AZURE, KHAKI, SAND, MARENGO, GRAY, GRAPHITE
|
|
2394
2330
|
EMAIL: "",
|
|
2395
2331
|
// E-mail для связи. НЕЛЬЗЯ использовать e-mail, дублирующий e-mail реальных пользователей
|
|
2396
|
-
PERSONAL_BIRTHDAY:
|
|
2332
|
+
PERSONAL_BIRTHDAY: yt().format("%Y-%m-%d"),
|
|
2397
2333
|
// День рождения в формате YYYY-mm-dd
|
|
2398
2334
|
WORK_POSITION: "Почтальон",
|
|
2399
2335
|
// Занимаемая должность, используется как описание чат-бота
|
|
@@ -2401,154 +2337,206 @@ class ge {
|
|
|
2401
2337
|
// Ссылка на сайт
|
|
2402
2338
|
PERSONAL_GENDER: "M",
|
|
2403
2339
|
// Пол чат-бота, допустимые значения M - мужской, F - женский, пусто, если не требуется указывать
|
|
2404
|
-
PERSONAL_PHOTO:
|
|
2340
|
+
PERSONAL_PHOTO: A ?? ""
|
|
2405
2341
|
// Аватар чат-бота - base64
|
|
2406
2342
|
}
|
|
2407
2343
|
}
|
|
2408
|
-
})
|
|
2344
|
+
});
|
|
2345
|
+
return console.log("Чат-бот добавлен", u), u;
|
|
2409
2346
|
}
|
|
2410
2347
|
/* Убрать регистрацию бота */
|
|
2411
|
-
unRegBot(t) {
|
|
2412
|
-
|
|
2348
|
+
async unRegBot(t) {
|
|
2349
|
+
const e = await this.call({
|
|
2413
2350
|
method: "imbot.unregister",
|
|
2414
2351
|
params: {
|
|
2415
2352
|
BOT_ID: t
|
|
2416
2353
|
}
|
|
2417
|
-
})
|
|
2354
|
+
});
|
|
2355
|
+
return console.log("чат-бот удален", e), e;
|
|
2418
2356
|
}
|
|
2419
2357
|
/* Получение данных логера */
|
|
2420
2358
|
getLoggerList(t) {
|
|
2421
2359
|
return this.logger.getEntityList(t);
|
|
2422
2360
|
}
|
|
2423
2361
|
}
|
|
2424
|
-
|
|
2362
|
+
ct = new WeakSet(), Ot = function() {
|
|
2425
2363
|
return this.batchClient || (this.batchClient = new v({
|
|
2426
2364
|
callBatch: BX24.callBatch,
|
|
2427
2365
|
callMethod: BX24.callMethod
|
|
2428
2366
|
}), this.timeLimit = this.batchClient.timeLimit), this.batchClient;
|
|
2429
|
-
},
|
|
2367
|
+
}, Ct = new WeakSet(), Ae = function() {
|
|
2368
|
+
return {
|
|
2369
|
+
start: () => {
|
|
2370
|
+
},
|
|
2371
|
+
stop: () => {
|
|
2372
|
+
},
|
|
2373
|
+
getEntityList: () => {
|
|
2374
|
+
}
|
|
2375
|
+
};
|
|
2376
|
+
}, Bt = new WeakSet(), ce = async function(t) {
|
|
2377
|
+
fetch("http://127.0.0.1:7903/ingest/d13e6df1-e437-464b-831d-29219bd3ff29", { method: "POST", headers: { "Content-Type": "application/json", "X-Debug-Session-Id": "e57011" }, body: JSON.stringify({ sessionId: "e57011", runId: "pre-fix", hypothesisId: "H2", location: "src/utils-kit/bx-boot.js:#initLoggerOrStub", message: "logger init branch selected", data: { loggerFlag: this.logger, runLoggerMaintenance: t }, timestamp: Date.now() }) }).catch(() => {
|
|
2378
|
+
}), this.logger ? (this.logger = new _e(), await this.logger.init(), t && typeof this.logger.runStorageMaintenance == "function" && this.logger.runStorageMaintenance()) : this.logger = _(this, Ct, Ae).call(this);
|
|
2379
|
+
}, Ht = new WeakSet(), he = function() {
|
|
2380
|
+
var r, i, a;
|
|
2381
|
+
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
|
+
return t === "PAGE_BACKGROUND_WORKER" || e === "PAGE_BACKGROUND_WORKER";
|
|
2383
|
+
}, Ut = new WeakSet(), le = function() {
|
|
2430
2384
|
return this.call({ method: "app.info" });
|
|
2431
|
-
},
|
|
2385
|
+
}, Pt = new WeakSet(), ue = function() {
|
|
2432
2386
|
return this.call({ method: "user.current" });
|
|
2433
|
-
},
|
|
2387
|
+
}, V = new WeakSet(), at = async function(t, e) {
|
|
2388
|
+
if (t)
|
|
2389
|
+
try {
|
|
2390
|
+
await this.logger.stop({
|
|
2391
|
+
key: t,
|
|
2392
|
+
...e
|
|
2393
|
+
});
|
|
2394
|
+
} catch (r) {
|
|
2395
|
+
console.error("Logger error:", r);
|
|
2396
|
+
}
|
|
2397
|
+
}, mt = new WeakSet(), vt = async function({
|
|
2398
|
+
mode: t,
|
|
2399
|
+
commandList: e,
|
|
2400
|
+
progressCall: r,
|
|
2401
|
+
errorCall: i,
|
|
2402
|
+
updateList: a,
|
|
2403
|
+
batchOptions: A
|
|
2404
|
+
}) {
|
|
2405
|
+
const h = _(this, ct, Ot).call(this), u = a ? this.logger.start({
|
|
2406
|
+
type: t,
|
|
2407
|
+
data: t === "batch" ? { commandList: e, updateList: a } : { commandList: e }
|
|
2408
|
+
}) : void 0;
|
|
2409
|
+
try {
|
|
2410
|
+
const n = t === "batch" ? await h.batch(e, r, A) : await h.batchTotalCount(e, r), f = _(this, Gt, fe).call(this, h, n, e, a);
|
|
2411
|
+
return Object.keys(f).length ? (i && i(f), await _(this, V, at).call(this, u, {
|
|
2412
|
+
status: "fail",
|
|
2413
|
+
errorList: f
|
|
2414
|
+
})) : await _(this, V, at).call(this, u, { status: "success" }), n;
|
|
2415
|
+
} catch (n) {
|
|
2416
|
+
return await _(this, V, at).call(this, u, {
|
|
2417
|
+
status: "fail-runtime",
|
|
2418
|
+
errorList: { 0: n == null ? void 0 : n.toString() }
|
|
2419
|
+
}), console.error(n), !1;
|
|
2420
|
+
}
|
|
2421
|
+
}, Gt = new WeakSet(), fe = function(t, e, r, i) {
|
|
2434
2422
|
let a = { ...t.errors };
|
|
2435
2423
|
if (Object.values(t.errors).some(
|
|
2436
|
-
(
|
|
2437
|
-
if (typeof
|
|
2424
|
+
(h) => {
|
|
2425
|
+
if (typeof h != "string")
|
|
2438
2426
|
return !1;
|
|
2439
|
-
const
|
|
2440
|
-
return
|
|
2427
|
+
const u = h.toUpperCase();
|
|
2428
|
+
return u === "TIMEOUT" || u === "OPERATION_TIME_LIMIT" || u.includes("TIMEOUT") || u.includes("OPERATION_TIME_LIMIT");
|
|
2441
2429
|
}
|
|
2442
2430
|
) && i) {
|
|
2443
|
-
const
|
|
2431
|
+
const h = e ? Object.keys(e).filter((d) => d !== "errorsList") : [], u = new Set(Object.keys(t.errors || {})), n = /* @__PURE__ */ new Set();
|
|
2444
2432
|
if (e) {
|
|
2445
|
-
for (const
|
|
2446
|
-
if (!
|
|
2447
|
-
const c = e[
|
|
2448
|
-
c != null && n.add(
|
|
2433
|
+
for (const d of h)
|
|
2434
|
+
if (!u.has(d)) {
|
|
2435
|
+
const c = e[d];
|
|
2436
|
+
c != null && n.add(d);
|
|
2449
2437
|
}
|
|
2450
2438
|
}
|
|
2451
|
-
const
|
|
2452
|
-
(
|
|
2453
|
-
if (typeof
|
|
2439
|
+
const f = Object.values(t.errors).find(
|
|
2440
|
+
(d) => {
|
|
2441
|
+
if (typeof d != "string")
|
|
2454
2442
|
return !1;
|
|
2455
|
-
const c =
|
|
2443
|
+
const c = d.toUpperCase();
|
|
2456
2444
|
return c === "TIMEOUT" || c === "OPERATION_TIME_LIMIT" || c.includes("TIMEOUT") || c.includes("OPERATION_TIME_LIMIT");
|
|
2457
2445
|
}
|
|
2458
2446
|
);
|
|
2459
|
-
for (const
|
|
2460
|
-
!n.has(
|
|
2447
|
+
for (const d of Object.keys(r))
|
|
2448
|
+
!n.has(d) && !t.errors[d] && (a[d] = f || "TIMEOUT или OPERATION_TIME_LIMIT: запрос не был обработан");
|
|
2461
2449
|
}
|
|
2462
2450
|
return a;
|
|
2463
|
-
},
|
|
2451
|
+
}, gt = new WeakSet(), qt = function(t) {
|
|
2464
2452
|
if (!t)
|
|
2465
2453
|
return [];
|
|
2466
2454
|
let e = [];
|
|
2467
2455
|
return Array.isArray(t) ? e = t.map(
|
|
2468
|
-
(
|
|
2456
|
+
(r) => typeof r == "string" ? { placement: r } : r
|
|
2469
2457
|
) : typeof t == "string" ? e = [{ placement: t }] : e = [t], e;
|
|
2470
|
-
},
|
|
2458
|
+
}, Yt = new WeakSet(), de = function(t) {
|
|
2471
2459
|
return this.placeData ? this.placeData.filter((e) => !(e.placement === "PAGE_BACKGROUND_WORKER" || !e.handler || e.handler.includes(t))) : [];
|
|
2472
2460
|
};
|
|
2473
|
-
const
|
|
2474
|
-
function
|
|
2461
|
+
const me = "szdl-utils-kit|";
|
|
2462
|
+
function Ee() {
|
|
2475
2463
|
if (typeof sessionStorage > "u")
|
|
2476
2464
|
return `ephemeral-${Date.now()}-${Math.random().toString(16).slice(2)}`;
|
|
2477
|
-
let
|
|
2478
|
-
return
|
|
2465
|
+
let y = sessionStorage.getItem("szdl-cross-tab-instance-id");
|
|
2466
|
+
return y || (y = `${Date.now()}-${Math.random().toString(16).slice(2)}`, sessionStorage.setItem("szdl-cross-tab-instance-id", y)), y;
|
|
2479
2467
|
}
|
|
2480
|
-
function
|
|
2468
|
+
function be() {
|
|
2481
2469
|
return typeof navigator < "u" && typeof navigator.locks < "u" && typeof navigator.locks.request == "function";
|
|
2482
2470
|
}
|
|
2483
|
-
const
|
|
2484
|
-
function
|
|
2471
|
+
const Ft = /* @__PURE__ */ new Map();
|
|
2472
|
+
function Ie(y = "default") {
|
|
2485
2473
|
if (typeof BroadcastChannel > "u")
|
|
2486
2474
|
return null;
|
|
2487
|
-
const t = `${
|
|
2488
|
-
return
|
|
2475
|
+
const t = `${me}bc:${y}`;
|
|
2476
|
+
return Ft.has(t) || Ft.set(t, new BroadcastChannel(t)), Ft.get(t);
|
|
2489
2477
|
}
|
|
2490
|
-
function
|
|
2491
|
-
const e =
|
|
2478
|
+
function Zt(y, t) {
|
|
2479
|
+
const e = Ie(y);
|
|
2492
2480
|
if (e)
|
|
2493
2481
|
try {
|
|
2494
|
-
const
|
|
2482
|
+
const r = t && typeof t == "object" && !Array.isArray(t) ? t : { data: t };
|
|
2495
2483
|
e.postMessage({
|
|
2496
|
-
...
|
|
2497
|
-
tabId:
|
|
2484
|
+
...r,
|
|
2485
|
+
tabId: Ee(),
|
|
2498
2486
|
ts: Date.now()
|
|
2499
2487
|
});
|
|
2500
2488
|
} catch {
|
|
2501
2489
|
}
|
|
2502
2490
|
}
|
|
2503
|
-
async function
|
|
2504
|
-
const { ifAvailable:
|
|
2505
|
-
return
|
|
2491
|
+
async function Se(y, t, e = {}) {
|
|
2492
|
+
const { ifAvailable: r = !1 } = e, i = typeof y == "string" && y.length > 0 ? y : "default", a = `${me}${i}`;
|
|
2493
|
+
return be() ? navigator.locks.request(
|
|
2506
2494
|
a,
|
|
2507
|
-
{ mode: "exclusive", ifAvailable: !!
|
|
2508
|
-
async (
|
|
2509
|
-
if (
|
|
2495
|
+
{ mode: "exclusive", ifAvailable: !!r },
|
|
2496
|
+
async (A) => {
|
|
2497
|
+
if (r && A == null)
|
|
2510
2498
|
return { skipped: !0, coordination: "locks" };
|
|
2511
|
-
|
|
2499
|
+
Zt(i, { type: "lock-acquired", resource: i });
|
|
2512
2500
|
try {
|
|
2513
2501
|
return { skipped: !1, result: await t(), coordination: "locks" };
|
|
2514
2502
|
} finally {
|
|
2515
|
-
|
|
2503
|
+
Zt(i, { type: "lock-released", resource: i });
|
|
2516
2504
|
}
|
|
2517
2505
|
}
|
|
2518
2506
|
) : { skipped: !1, result: await t(), coordination: "none" };
|
|
2519
2507
|
}
|
|
2520
|
-
var
|
|
2521
|
-
class
|
|
2508
|
+
var pt, zt;
|
|
2509
|
+
class Me {
|
|
2522
2510
|
constructor(t) {
|
|
2523
2511
|
/**
|
|
2524
2512
|
* Канонический base URL для placement (без завершающего `/`).
|
|
2525
2513
|
* Пустая строка — не биндить (некорректный или marketplace URL).
|
|
2526
2514
|
*/
|
|
2527
|
-
|
|
2528
|
-
|
|
2529
|
-
|
|
2530
|
-
|
|
2531
|
-
|
|
2532
|
-
|
|
2533
|
-
|
|
2534
|
-
|
|
2515
|
+
S(this, pt);
|
|
2516
|
+
B(this, "entityName", "tabs");
|
|
2517
|
+
B(this, "maxTabs", 20);
|
|
2518
|
+
B(this, "tabList", []);
|
|
2519
|
+
B(this, "id", 0);
|
|
2520
|
+
B(this, "hasStarted", !1);
|
|
2521
|
+
B(this, "heartbeat");
|
|
2522
|
+
B(this, "runHeartbeat");
|
|
2535
2523
|
/** Вкладка считается «мёртвой», если нет обновления lastActive дольше этого (см. refreshTabs). */
|
|
2536
|
-
|
|
2537
|
-
|
|
2524
|
+
B(this, "activeMaxPause", 10 * 1e3);
|
|
2525
|
+
B(this, "quickCleanupThreshold", 2 * 60 * 1e3);
|
|
2538
2526
|
// агрессивная очистка при переполнении
|
|
2539
2527
|
/** Должен быть заметно меньше activeMaxPause: иначе «живые» вкладки успеют удалиться до следующего тика. */
|
|
2540
|
-
|
|
2528
|
+
B(this, "pollInterval", 6 * 1e3 + Math.floor(Math.random() * 2e3));
|
|
2541
2529
|
// ~6–8 с + размазать одновременные запросы
|
|
2542
|
-
|
|
2543
|
-
|
|
2544
|
-
|
|
2545
|
-
var
|
|
2530
|
+
B(this, "sessionId", `${Date.now()}-${Math.random().toString(16).slice(2)}`);
|
|
2531
|
+
B(this, "continueCondition");
|
|
2532
|
+
B(this, "defaultContinueBackground", () => !0);
|
|
2533
|
+
var A, h, u;
|
|
2546
2534
|
if (!t) {
|
|
2547
2535
|
console.error("BackgroundWorker: Нет опций конструктора");
|
|
2548
2536
|
return;
|
|
2549
2537
|
}
|
|
2550
|
-
const { appFunc: e, bx:
|
|
2551
|
-
this.bx =
|
|
2538
|
+
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, pt, zt).call(this, ((A = r == null ? void 0 : r.appConst) == null ? void 0 : A.pathApp) ?? ""), this.appName = ((h = r == null ? void 0 : r.appConst) == null ? void 0 : h.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;
|
|
2552
2540
|
}
|
|
2553
2541
|
async init() {
|
|
2554
2542
|
if (!this.appInit) {
|
|
@@ -2579,8 +2567,8 @@ class ye {
|
|
|
2579
2567
|
return;
|
|
2580
2568
|
}
|
|
2581
2569
|
await this.refreshTabs(!0), await this.ensureTabRegistered();
|
|
2582
|
-
const e = this.selectLeaderId(),
|
|
2583
|
-
await this.updateTabState(
|
|
2570
|
+
const e = this.selectLeaderId(), r = e && +this.id == +e;
|
|
2571
|
+
await this.updateTabState(r), r && !this.hasStarted && await this.runAsLeader();
|
|
2584
2572
|
}
|
|
2585
2573
|
stopTimers() {
|
|
2586
2574
|
this.heartbeat && (clearInterval(this.heartbeat), this.heartbeat = void 0), this.runHeartbeat && (clearInterval(this.runHeartbeat), this.runHeartbeat = void 0);
|
|
@@ -2590,18 +2578,18 @@ class ye {
|
|
|
2590
2578
|
if (typeof BX24 > "u" || !((t = BX24.placement) != null && t.info))
|
|
2591
2579
|
return !1;
|
|
2592
2580
|
try {
|
|
2593
|
-
const e = BX24.placement.info(),
|
|
2594
|
-
return !
|
|
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) || "", A = r === "PAGE_BACKGROUND_WORKER" || (i == null ? void 0 : i.ID) === "PAGE_BACKGROUND_WORKER", h = typeof a == "string" && (a.includes("marketplace/app") || a.includes("marketplace/apps") || a.includes("placement") || a.includes("sozdavatel" + this.appCodeName));
|
|
2582
|
+
return !A || h;
|
|
2595
2583
|
} catch {
|
|
2596
2584
|
return !1;
|
|
2597
2585
|
}
|
|
2598
2586
|
}
|
|
2599
2587
|
async checkEntity() {
|
|
2600
|
-
var
|
|
2588
|
+
var r;
|
|
2601
2589
|
const t = await this.safeCall(
|
|
2602
2590
|
() => this.bx.call({ method: "entity.get" })
|
|
2603
2591
|
);
|
|
2604
|
-
((
|
|
2592
|
+
((r = t == null ? void 0 : t.find) == null ? void 0 : r.call(
|
|
2605
2593
|
t,
|
|
2606
2594
|
(i) => i.ENTITY === this.entityName
|
|
2607
2595
|
)) || await this.safeCall(
|
|
@@ -2633,10 +2621,10 @@ class ye {
|
|
|
2633
2621
|
if (!e)
|
|
2634
2622
|
return { id: void 0, data: void 0 };
|
|
2635
2623
|
try {
|
|
2636
|
-
const
|
|
2637
|
-
return { id: +e.ID || 0, data:
|
|
2638
|
-
} catch (
|
|
2639
|
-
return console.log("BackgroundWorker: parse tab error",
|
|
2624
|
+
const r = JSON.parse(e.DETAIL_TEXT);
|
|
2625
|
+
return { id: +e.ID || 0, data: r };
|
|
2626
|
+
} catch (r) {
|
|
2627
|
+
return console.log("BackgroundWorker: parse tab error", r), { id: +e.ID || 0, data: void 0 };
|
|
2640
2628
|
}
|
|
2641
2629
|
});
|
|
2642
2630
|
}
|
|
@@ -2654,12 +2642,12 @@ class ye {
|
|
|
2654
2642
|
sessionId: this.sessionId
|
|
2655
2643
|
}, e = await this.safeCall(
|
|
2656
2644
|
() => {
|
|
2657
|
-
var
|
|
2645
|
+
var r;
|
|
2658
2646
|
return this.bx.call({
|
|
2659
2647
|
method: "entity.item.add",
|
|
2660
2648
|
params: {
|
|
2661
2649
|
ENTITY: this.entityName,
|
|
2662
|
-
NAME: (
|
|
2650
|
+
NAME: (r = this.bx.userInfo) == null ? void 0 : r.ID,
|
|
2663
2651
|
DETAIL_TEXT: JSON.stringify(t)
|
|
2664
2652
|
}
|
|
2665
2653
|
});
|
|
@@ -2678,13 +2666,13 @@ class ye {
|
|
|
2678
2666
|
};
|
|
2679
2667
|
await this.safeCall(
|
|
2680
2668
|
() => {
|
|
2681
|
-
var
|
|
2669
|
+
var r;
|
|
2682
2670
|
return this.bx.call({
|
|
2683
2671
|
method: "entity.item.update",
|
|
2684
2672
|
params: {
|
|
2685
2673
|
ENTITY: this.entityName,
|
|
2686
2674
|
ID: this.id,
|
|
2687
|
-
NAME: (
|
|
2675
|
+
NAME: (r = this.bx.userInfo) == null ? void 0 : r.ID,
|
|
2688
2676
|
DETAIL_TEXT: JSON.stringify(e)
|
|
2689
2677
|
}
|
|
2690
2678
|
});
|
|
@@ -2694,48 +2682,50 @@ class ye {
|
|
|
2694
2682
|
async deleteTabs(t = []) {
|
|
2695
2683
|
if (!t.length)
|
|
2696
2684
|
return;
|
|
2697
|
-
const e = t.map((
|
|
2685
|
+
const e = t.map((r) => ({
|
|
2698
2686
|
method: "entity.item.delete",
|
|
2699
|
-
params: { ENTITY: this.entityName, ID:
|
|
2687
|
+
params: { ENTITY: this.entityName, ID: r.id }
|
|
2700
2688
|
}));
|
|
2701
2689
|
await this.safeCall(() => this.bx.batch(e));
|
|
2702
2690
|
}
|
|
2703
2691
|
async checkPlacementType() {
|
|
2704
|
-
var t;
|
|
2692
|
+
var t, e;
|
|
2705
2693
|
try {
|
|
2706
|
-
|
|
2694
|
+
if (!((t = this.bx) != null && t.isAdmin))
|
|
2695
|
+
return !0;
|
|
2696
|
+
const r = await this.safeCall(
|
|
2707
2697
|
() => this.bx.getPlacement()
|
|
2708
2698
|
);
|
|
2709
|
-
if (!
|
|
2699
|
+
if (!r || !Array.isArray(r))
|
|
2710
2700
|
return console.log(
|
|
2711
2701
|
"BackgroundWorker: Не получили список размещений, продолжаем"
|
|
2712
2702
|
), !0;
|
|
2713
|
-
const
|
|
2703
|
+
const i = +(((e = this.bx.userInfo) == null ? void 0 : e.ID) ?? 0), a = this.isIndividualPlacement(
|
|
2714
2704
|
typeof window < "u" ? window.location.href : ""
|
|
2715
|
-
),
|
|
2716
|
-
if (!
|
|
2705
|
+
), A = !a;
|
|
2706
|
+
if (!i)
|
|
2717
2707
|
return !0;
|
|
2718
|
-
let
|
|
2719
|
-
for (const
|
|
2720
|
-
if (
|
|
2708
|
+
let h = !1;
|
|
2709
|
+
for (const u of r) {
|
|
2710
|
+
if (u.placement !== "PAGE_BACKGROUND_WORKER" || !(u.userId || u.handler && u.handler.includes("USER_ID=")))
|
|
2721
2711
|
continue;
|
|
2722
|
-
const
|
|
2723
|
-
if (
|
|
2724
|
-
|
|
2712
|
+
const f = u.userId || (u.handler ? this.extractUserIdFromHandler(u.handler) : null);
|
|
2713
|
+
if (f && +f === i) {
|
|
2714
|
+
h = !0;
|
|
2725
2715
|
break;
|
|
2726
2716
|
}
|
|
2727
2717
|
}
|
|
2728
|
-
return
|
|
2718
|
+
return a ? (console.log(
|
|
2729
2719
|
"BackgroundWorker: Индивидуальная встройка - разрешено"
|
|
2730
|
-
), !0) :
|
|
2720
|
+
), !0) : A && h ? (console.log(
|
|
2731
2721
|
"BackgroundWorker: Есть личная встройка, общую не запускаем"
|
|
2732
2722
|
), !1) : (console.log(
|
|
2733
2723
|
"BackgroundWorker: Проверка типа встройки пройдена, продолжаем"
|
|
2734
2724
|
), !0);
|
|
2735
|
-
} catch (
|
|
2725
|
+
} catch (r) {
|
|
2736
2726
|
return console.error(
|
|
2737
2727
|
"BackgroundWorker: Ошибка при проверке типа встройки",
|
|
2738
|
-
|
|
2728
|
+
r
|
|
2739
2729
|
), !0;
|
|
2740
2730
|
}
|
|
2741
2731
|
}
|
|
@@ -2762,58 +2752,58 @@ class ye {
|
|
|
2762
2752
|
}
|
|
2763
2753
|
}
|
|
2764
2754
|
async refreshTabs(t = !1, e = this.activeMaxPause) {
|
|
2765
|
-
const
|
|
2766
|
-
for (const
|
|
2767
|
-
if (!(
|
|
2768
|
-
|
|
2755
|
+
const r = [], i = [], a = Date.now(), A = await this.getTabs();
|
|
2756
|
+
for (const h of A) {
|
|
2757
|
+
if (!(h != null && h.data)) {
|
|
2758
|
+
r.push(h);
|
|
2769
2759
|
continue;
|
|
2770
2760
|
}
|
|
2771
|
-
if (a - new Date(
|
|
2772
|
-
|
|
2761
|
+
if (a - new Date(h.data.lastActive || 0).getTime() > e) {
|
|
2762
|
+
r.push(h);
|
|
2773
2763
|
continue;
|
|
2774
2764
|
}
|
|
2775
|
-
i.push(
|
|
2765
|
+
i.push(h);
|
|
2776
2766
|
}
|
|
2777
|
-
return t &&
|
|
2767
|
+
return t && r.length && await this.deleteTabs(r), this.tabList = i, i;
|
|
2778
2768
|
}
|
|
2779
2769
|
selectLeaderId() {
|
|
2780
2770
|
var e;
|
|
2781
|
-
return this.tabList.length && +((e = [...this.tabList].sort((
|
|
2782
|
-
var
|
|
2771
|
+
return this.tabList.length && +((e = [...this.tabList].sort((r, i) => {
|
|
2772
|
+
var h, u, n, f;
|
|
2783
2773
|
const a = new Date(
|
|
2784
|
-
((
|
|
2785
|
-
).getTime(),
|
|
2786
|
-
((n = i.data) == null ? void 0 : n.createdAt) || ((
|
|
2774
|
+
((h = r.data) == null ? void 0 : h.createdAt) || ((u = r.data) == null ? void 0 : u.lastActive) || 0
|
|
2775
|
+
).getTime(), A = new Date(
|
|
2776
|
+
((n = i.data) == null ? void 0 : n.createdAt) || ((f = i.data) == null ? void 0 : f.lastActive) || 0
|
|
2787
2777
|
).getTime();
|
|
2788
|
-
return a ===
|
|
2778
|
+
return a === A ? (+r.id || 0) - (+i.id || 0) : a - A;
|
|
2789
2779
|
})[0]) == null ? void 0 : e.id) || 0;
|
|
2790
2780
|
}
|
|
2791
2781
|
async runAsLeader() {
|
|
2792
2782
|
var i, a;
|
|
2793
2783
|
const t = String(((a = (i = this.bx) == null ? void 0 : i.userInfo) == null ? void 0 : a.ID) ?? "0"), e = `background-worker:${this.entityName}:${t}`;
|
|
2794
|
-
(await
|
|
2784
|
+
(await Se(
|
|
2795
2785
|
e,
|
|
2796
2786
|
async () => {
|
|
2797
2787
|
this.hasStarted = !0;
|
|
2798
|
-
const
|
|
2788
|
+
const A = Math.min(
|
|
2799
2789
|
this.activeMaxPause - 1500,
|
|
2800
2790
|
Math.max(2500, Math.floor(this.pollInterval / 2))
|
|
2801
2791
|
);
|
|
2802
2792
|
this.runHeartbeat = setInterval(
|
|
2803
2793
|
() => {
|
|
2804
2794
|
this.updateTabState(!0).catch(
|
|
2805
|
-
(
|
|
2795
|
+
(h) => console.error(
|
|
2806
2796
|
"BackgroundWorker: heartbeat update failed",
|
|
2807
|
-
|
|
2797
|
+
h
|
|
2808
2798
|
)
|
|
2809
2799
|
);
|
|
2810
2800
|
},
|
|
2811
|
-
|
|
2801
|
+
A
|
|
2812
2802
|
);
|
|
2813
2803
|
try {
|
|
2814
2804
|
await this.appInit();
|
|
2815
|
-
} catch (
|
|
2816
|
-
console.error("BackgroundWorker: appInit failed",
|
|
2805
|
+
} catch (h) {
|
|
2806
|
+
console.error("BackgroundWorker: appInit failed", h);
|
|
2817
2807
|
}
|
|
2818
2808
|
this.stopTimers(), this.id && (await this.deleteTabs([{ id: this.id }]), this.id = 0);
|
|
2819
2809
|
},
|
|
@@ -2823,15 +2813,15 @@ class ye {
|
|
|
2823
2813
|
);
|
|
2824
2814
|
}
|
|
2825
2815
|
async setBackgroundWorkerAll() {
|
|
2826
|
-
var T,
|
|
2816
|
+
var T, b, I, N;
|
|
2827
2817
|
if (!((T = this.bx) != null && T.isAdmin)) {
|
|
2828
2818
|
console.log(
|
|
2829
2819
|
"BackgroundWorker: setBackgroundWorkerAll доступен только админам"
|
|
2830
2820
|
);
|
|
2831
2821
|
return;
|
|
2832
2822
|
}
|
|
2833
|
-
(
|
|
2834
|
-
const t =
|
|
2823
|
+
(b = this.users) != null && b.length || await this.getEntityData(), Kt(this.bx);
|
|
2824
|
+
const t = _(this, pt, zt).call(this, ((N = (I = this.bx) == null ? void 0 : I.appConst) == null ? void 0 : N.pathApp) ?? "");
|
|
2835
2825
|
if (!t) {
|
|
2836
2826
|
console.error(
|
|
2837
2827
|
"BackgroundWorker: setBackgroundWorkerAll — нет валидного pathApp, привязка PAGE_BACKGROUND_WORKER пропущена"
|
|
@@ -2840,71 +2830,71 @@ class ye {
|
|
|
2840
2830
|
}
|
|
2841
2831
|
const e = await this.safeCall(
|
|
2842
2832
|
() => this.bx.getPlacement()
|
|
2843
|
-
),
|
|
2833
|
+
), r = /* @__PURE__ */ new Map();
|
|
2844
2834
|
let i = null;
|
|
2845
|
-
(e || []).forEach((
|
|
2846
|
-
if (
|
|
2835
|
+
(e || []).forEach((p) => {
|
|
2836
|
+
if (p.placement !== "PAGE_BACKGROUND_WORKER")
|
|
2847
2837
|
return;
|
|
2848
|
-
if (
|
|
2849
|
-
const
|
|
2850
|
-
|
|
2838
|
+
if (p.userId || p.handler && p.handler.includes("USER_ID=")) {
|
|
2839
|
+
const M = p.userId || (p.handler ? this.extractUserIdFromHandler(p.handler) : null);
|
|
2840
|
+
M && r.set(+M, p);
|
|
2851
2841
|
} else
|
|
2852
|
-
i =
|
|
2842
|
+
i = p;
|
|
2853
2843
|
});
|
|
2854
|
-
const a = await this.resolveAdmins(),
|
|
2855
|
-
|
|
2856
|
-
const
|
|
2857
|
-
return (
|
|
2844
|
+
const a = await this.resolveAdmins(), A = await this.getEligibleUsersForBackgroundWorker(a);
|
|
2845
|
+
A.sort((p, R) => {
|
|
2846
|
+
const M = p.LAST_LOGIN ? new Date(p.LAST_LOGIN) : /* @__PURE__ */ new Date(0);
|
|
2847
|
+
return (R.LAST_LOGIN ? new Date(R.LAST_LOGIN) : /* @__PURE__ */ new Date(0)) - M;
|
|
2858
2848
|
});
|
|
2859
|
-
const
|
|
2860
|
-
const
|
|
2861
|
-
if (!
|
|
2849
|
+
const h = 10, u = A.slice(0, h), n = u.filter((p) => {
|
|
2850
|
+
const R = r.get(+p.ID);
|
|
2851
|
+
if (!R)
|
|
2862
2852
|
return !0;
|
|
2863
|
-
const
|
|
2864
|
-
return
|
|
2865
|
-
}),
|
|
2866
|
-
for (const [
|
|
2867
|
-
const
|
|
2868
|
-
|
|
2853
|
+
const M = `${t}?USER_ID=${p.ID}/`;
|
|
2854
|
+
return R.handler !== M;
|
|
2855
|
+
}), f = [];
|
|
2856
|
+
for (const [p] of r) {
|
|
2857
|
+
const R = +p || 0;
|
|
2858
|
+
A.find((H) => +H.ID === R) || f.push(R);
|
|
2869
2859
|
}
|
|
2870
|
-
for (const
|
|
2871
|
-
const
|
|
2872
|
-
if (!
|
|
2860
|
+
for (const p of u) {
|
|
2861
|
+
const R = r.get(+p.ID);
|
|
2862
|
+
if (!R)
|
|
2873
2863
|
continue;
|
|
2874
|
-
const
|
|
2875
|
-
|
|
2864
|
+
const M = `${t}?USER_ID=${p.ID}/`;
|
|
2865
|
+
R.handler !== M && f.push(+p.ID);
|
|
2876
2866
|
}
|
|
2877
|
-
const
|
|
2878
|
-
for (const
|
|
2879
|
-
|
|
2867
|
+
const d = [];
|
|
2868
|
+
for (const p of f)
|
|
2869
|
+
d.push({
|
|
2880
2870
|
method: "placement.unbind",
|
|
2881
2871
|
params: {
|
|
2882
2872
|
PLACEMENT: "PAGE_BACKGROUND_WORKER",
|
|
2883
|
-
HANDLER: `${t}?USER_ID=${
|
|
2873
|
+
HANDLER: `${t}?USER_ID=${p}/`
|
|
2884
2874
|
}
|
|
2885
2875
|
});
|
|
2886
2876
|
const c = i && (n.length > 0 || i.handler !== `${t}`);
|
|
2887
|
-
c &&
|
|
2877
|
+
c && d.push({
|
|
2888
2878
|
method: "placement.unbind",
|
|
2889
2879
|
params: {
|
|
2890
2880
|
PLACEMENT: "PAGE_BACKGROUND_WORKER",
|
|
2891
2881
|
HANDLER: i.handler || `${t}`
|
|
2892
2882
|
}
|
|
2893
2883
|
});
|
|
2894
|
-
for (const
|
|
2895
|
-
|
|
2884
|
+
for (const p of n)
|
|
2885
|
+
d.push({
|
|
2896
2886
|
method: "placement.bind",
|
|
2897
2887
|
params: {
|
|
2898
2888
|
PLACEMENT: "PAGE_BACKGROUND_WORKER",
|
|
2899
|
-
HANDLER: `${t}?USER_ID=${
|
|
2889
|
+
HANDLER: `${t}?USER_ID=${p.ID}/`,
|
|
2900
2890
|
LANG_ALL: { ru: { TITLE: this.appName } },
|
|
2901
2891
|
OPTIONS: {
|
|
2902
|
-
errorHandlerUrl: `${t}?USER_ID=${
|
|
2892
|
+
errorHandlerUrl: `${t}?USER_ID=${p.ID}/`
|
|
2903
2893
|
},
|
|
2904
|
-
USER_ID:
|
|
2894
|
+
USER_ID: p.ID
|
|
2905
2895
|
}
|
|
2906
2896
|
});
|
|
2907
|
-
(!i || c) &&
|
|
2897
|
+
(!i || c) && d.push({
|
|
2908
2898
|
method: "placement.bind",
|
|
2909
2899
|
params: {
|
|
2910
2900
|
PLACEMENT: "PAGE_BACKGROUND_WORKER",
|
|
@@ -2913,51 +2903,51 @@ class ye {
|
|
|
2913
2903
|
OPTIONS: { errorHandlerUrl: `${t}` }
|
|
2914
2904
|
}
|
|
2915
2905
|
});
|
|
2916
|
-
const
|
|
2917
|
-
(
|
|
2918
|
-
), O =
|
|
2919
|
-
(
|
|
2906
|
+
const l = d.filter(
|
|
2907
|
+
(p) => p.method === "placement.unbind"
|
|
2908
|
+
), O = d.filter(
|
|
2909
|
+
(p) => p.method === "placement.bind"
|
|
2920
2910
|
);
|
|
2921
|
-
|
|
2911
|
+
l.length && await this.safeCall(
|
|
2922
2912
|
() => this.bx.batch(
|
|
2923
2913
|
Object.fromEntries(
|
|
2924
|
-
|
|
2914
|
+
l.map((p, R) => [`unbind_${R}`, p])
|
|
2925
2915
|
)
|
|
2926
2916
|
)
|
|
2927
2917
|
), O.length && await this.safeCall(
|
|
2928
2918
|
() => this.bx.batch(
|
|
2929
2919
|
Object.fromEntries(
|
|
2930
|
-
O.map((
|
|
2920
|
+
O.map((p, R) => [`bind_${R}`, p])
|
|
2931
2921
|
)
|
|
2932
2922
|
)
|
|
2933
|
-
),
|
|
2923
|
+
), d.length || console.log("setBackgroundWorkerAll: Нет операций");
|
|
2934
2924
|
}
|
|
2935
2925
|
async resolveAdmins() {
|
|
2936
2926
|
var t, e;
|
|
2937
2927
|
try {
|
|
2938
|
-
const
|
|
2928
|
+
const r = +(((t = this.bx.userInfo) == null ? void 0 : t.ID) ?? 0), i = !!((e = this.bx) != null && e.isAdmin), a = await this.getAdminsList() || [];
|
|
2939
2929
|
if (!i) {
|
|
2940
|
-
if (
|
|
2941
|
-
const
|
|
2942
|
-
(n) => +n != +
|
|
2930
|
+
if (r && a.includes(+r)) {
|
|
2931
|
+
const u = a.filter(
|
|
2932
|
+
(n) => +n != +r
|
|
2943
2933
|
);
|
|
2944
|
-
return await this.saveAdminsList(
|
|
2934
|
+
return await this.saveAdminsList(u), u;
|
|
2945
2935
|
}
|
|
2946
2936
|
return a;
|
|
2947
2937
|
}
|
|
2948
|
-
const
|
|
2949
|
-
|
|
2950
|
-
const
|
|
2951
|
-
return await this.saveAdminsList(
|
|
2952
|
-
} catch (
|
|
2953
|
-
return console.error("BackgroundWorker: resolveAdmins error",
|
|
2938
|
+
const A = /* @__PURE__ */ new Set([...a || []]);
|
|
2939
|
+
r && A.add(+r);
|
|
2940
|
+
const h = [...A].filter(Boolean);
|
|
2941
|
+
return await this.saveAdminsList(h), h;
|
|
2942
|
+
} catch (r) {
|
|
2943
|
+
return console.error("BackgroundWorker: resolveAdmins error", r), [];
|
|
2954
2944
|
}
|
|
2955
2945
|
}
|
|
2956
2946
|
async getEligibleUsersForBackgroundWorker(t = []) {
|
|
2957
2947
|
const e = (this.users ?? []).filter(
|
|
2958
2948
|
(i) => i.ACTIVE === "Y" || i.ACTIVE === !0
|
|
2959
|
-
),
|
|
2960
|
-
return e.filter((i) =>
|
|
2949
|
+
), r = t.map((i) => +i || 0).filter(Boolean);
|
|
2950
|
+
return e.filter((i) => r.includes(+i.ID || 0));
|
|
2961
2951
|
}
|
|
2962
2952
|
async saveAdminsList(t = []) {
|
|
2963
2953
|
try {
|
|
@@ -2969,7 +2959,7 @@ class ye {
|
|
|
2969
2959
|
async getAdminsList() {
|
|
2970
2960
|
try {
|
|
2971
2961
|
const t = BX24.appOption.get("adminsList"), e = t ? JSON.parse(t) : [];
|
|
2972
|
-
return Array.isArray(e) ? e.map((
|
|
2962
|
+
return Array.isArray(e) ? e.map((r) => +r || 0).filter(Boolean) : [];
|
|
2973
2963
|
} catch (t) {
|
|
2974
2964
|
return console.error("BackgroundWorker: getAdminsList error", t), [];
|
|
2975
2965
|
}
|
|
@@ -2978,7 +2968,7 @@ class ye {
|
|
|
2978
2968
|
const t = {
|
|
2979
2969
|
users: { method: "user.get", params: { filter: { ACTIVE: "Y" } } }
|
|
2980
2970
|
}, { users: e } = await this.safeCall(
|
|
2981
|
-
() => this.bx.batch(t).then((
|
|
2971
|
+
() => this.bx.batch(t).then((r) => r ? (Array.isArray(r.users) || (r.users = []), r) : { users: [] })
|
|
2982
2972
|
);
|
|
2983
2973
|
this.users = e;
|
|
2984
2974
|
}
|
|
@@ -2991,9 +2981,9 @@ class ye {
|
|
|
2991
2981
|
(t = this.bx) != null && t.isAdmin && ((e = this.users) != null && e.length || await this.getEntityData(), await this.setBackgroundWorkerAll());
|
|
2992
2982
|
}
|
|
2993
2983
|
pause(t = 500, e) {
|
|
2994
|
-
return new Promise((
|
|
2984
|
+
return new Promise((r) => {
|
|
2995
2985
|
setTimeout(() => {
|
|
2996
|
-
e && e(),
|
|
2986
|
+
e && e(), r(!0);
|
|
2997
2987
|
}, t);
|
|
2998
2988
|
});
|
|
2999
2989
|
}
|
|
@@ -3006,19 +2996,19 @@ class ye {
|
|
|
3006
2996
|
}
|
|
3007
2997
|
}
|
|
3008
2998
|
}
|
|
3009
|
-
|
|
2999
|
+
pt = new WeakSet(), zt = function(t) {
|
|
3010
3000
|
if (!t || typeof t != "string")
|
|
3011
3001
|
return "";
|
|
3012
|
-
const e =
|
|
3013
|
-
return e ?
|
|
3002
|
+
const e = Qt(t).replace(/\/+$/, "");
|
|
3003
|
+
return e ? oe(e) ? (console.error(
|
|
3014
3004
|
"BackgroundWorker: pathApp не должен указывать на /marketplace/app/… Откройте приложение во встроенном iframe (entry CDN), не в оболочке маркетплейса."
|
|
3015
3005
|
), "") : e : "";
|
|
3016
3006
|
};
|
|
3017
3007
|
export {
|
|
3018
|
-
|
|
3008
|
+
Me as BackgroundWorker,
|
|
3019
3009
|
v as Batch,
|
|
3020
|
-
|
|
3021
|
-
|
|
3022
|
-
|
|
3023
|
-
|
|
3010
|
+
Le as BxBoot,
|
|
3011
|
+
se as BxHelper,
|
|
3012
|
+
_e as BxLogger,
|
|
3013
|
+
yt as tempus
|
|
3024
3014
|
};
|