bx-rest 0.0.9 → 0.0.11
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/consts/part-name-metods.d.ts +11 -0
- package/esm2020/consts/part-name-metods.mjs +12 -0
- package/esm2020/functions/serializeJavascript.mjs +200 -0
- package/esm2020/public-api.mjs +3 -3
- package/esm2020/{rest → request}/bx-rest.module.mjs +1 -1
- package/esm2020/request/user/user.mjs +263 -0
- package/esm2020/services/http/HttpBX.mjs +128 -0
- package/esm2020/services/http/HttpData.mjs +124 -0
- package/esm2020/services/http/base/base.mjs +29 -0
- package/esm2020/services/http/base/http.mjs +28 -0
- package/esm2020/services/http/http.mjs +135 -0
- package/esm2020/services/http/sessionKey.mjs +180 -0
- package/esm2020/services/map/base.mjs +14 -0
- package/esm2020/services/map/rest/user.mjs +89 -0
- package/esm2020/services/snack-bar/snack-bar.service.mjs +42 -0
- package/esm2020/services/snack-bar/toast-message/toast-message.component.mjs +31 -0
- package/esm2020/services/vanilla/JSON.mjs +20 -0
- package/esm2020/services/vanilla/localStorage.mjs +35 -0
- package/esm2020/services/vanilla//321/201ookies.mjs +44 -0
- package/esm2020/store/auth.mjs +26 -0
- package/esm2020/store/users.mjs +67 -0
- package/esm2020/typification/auth/save.mjs +2 -0
- package/esm2020/typification/rest/api-lib.mjs +21 -0
- package/esm2020/typification/rest/base/YesNo.mjs +2 -0
- package/esm2020/typification/rest/base/httpAnswerBX.mjs +2 -0
- package/esm2020/typification/rest/batch/batchRequestParam.mjs +2 -0
- package/esm2020/typification/rest/lib.mjs +2 -0
- package/esm2020/typification/rest/settings.mjs +2 -0
- package/esm2020/typification/rest/support/param.mjs +2 -0
- package/esm2020/typification/rest/user/CustomUserFieldInfo.mjs +2 -0
- package/esm2020/typification/rest/user/UserFilterSearch.mjs +2 -0
- package/esm2020/typification/rest/user/get.mjs +2 -0
- package/esm2020/typification/rest/user/user.mjs +2 -0
- package/esm2020/typification/rest/user/userFilter.mjs +2 -0
- package/fesm2015/bx-rest.mjs +343 -42
- package/fesm2015/bx-rest.mjs.map +1 -1
- package/fesm2020/bx-rest.mjs +342 -41
- package/fesm2020/bx-rest.mjs.map +1 -1
- package/functions/serializeJavascript.d.ts +2 -0
- package/package.json +1 -1
- package/public-api.d.ts +1 -2
- package/request/user/user.d.ts +60 -0
- package/services/http/HttpBX.d.ts +26 -0
- package/services/http/HttpData.d.ts +13 -0
- package/services/http/base/base.d.ts +16 -0
- package/services/http/base/http.d.ts +7 -0
- package/services/http/http.d.ts +31 -0
- package/services/http/sessionKey.d.ts +34 -0
- package/services/map/base.d.ts +6 -0
- package/services/map/rest/user.d.ts +12 -0
- package/services/snack-bar/snack-bar.service.d.ts +12 -0
- package/services/snack-bar/toast-message/toast-message.component.d.ts +16 -0
- package/services/vanilla/JSON.d.ts +7 -0
- package/services/vanilla/localStorage.d.ts +10 -0
- package/services/vanilla//321/201ookies.d.ts +9 -0
- package/store/auth.d.ts +20 -0
- package/store/users.d.ts +34 -0
- package/typification/auth/save.d.ts +14 -0
- package/typification/rest/api-lib.d.ts +9 -0
- package/typification/rest/base/YesNo.d.ts +1 -0
- package/typification/rest/base/httpAnswerBX.d.ts +15 -0
- package/typification/rest/batch/batchRequestParam.d.ts +16 -0
- package/typification/rest/lib.d.ts +18 -0
- package/typification/rest/settings.d.ts +6 -0
- package/typification/rest/support/param.d.ts +5 -0
- package/typification/rest/user/CustomUserFieldInfo.d.ts +56 -0
- package/typification/rest/user/UserFilterSearch.d.ts +43 -0
- package/typification/rest/user/get.d.ts +13 -0
- package/typification/rest/user/user.d.ts +62 -0
- package/typification/rest/user/userFilter.d.ts +13 -0
- package/bx-rest.service.d.ts +0 -6
- package/esm2020/bx-rest.service.mjs +0 -14
- /package/{rest → request}/bx-rest.module.d.ts +0 -0
|
@@ -0,0 +1,128 @@
|
|
|
1
|
+
import { throwError, take, mergeMap, forkJoin } from 'rxjs';
|
|
2
|
+
import { catchError, map } from 'rxjs/operators';
|
|
3
|
+
import { Injectable } from '@angular/core';
|
|
4
|
+
import clone from 'just-clone';
|
|
5
|
+
import BaseHttpServices from '../../services/http/http';
|
|
6
|
+
import flatten from 'just-flatten-it';
|
|
7
|
+
import * as i0 from "@angular/core";
|
|
8
|
+
export default class HttpBXServices extends BaseHttpServices {
|
|
9
|
+
timeNowOnServer() {
|
|
10
|
+
return this.httpGet('server.time').pipe(map(v => {
|
|
11
|
+
if (v && v.result) {
|
|
12
|
+
return new Date(v.result);
|
|
13
|
+
}
|
|
14
|
+
return undefined;
|
|
15
|
+
}));
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Это пиздец а не метод
|
|
19
|
+
* @param param
|
|
20
|
+
*/
|
|
21
|
+
branch(param) {
|
|
22
|
+
let prepareParam = Object.entries(this.prepareBatch(param));
|
|
23
|
+
const size = 50; // больше не отдаст
|
|
24
|
+
let subarray = []; //массив в который будет выведен результат.
|
|
25
|
+
for (let i = 0; i < Math.ceil(prepareParam.length / size); i++) {
|
|
26
|
+
subarray[i] = prepareParam.slice((i * size), (i * size) + size);
|
|
27
|
+
}
|
|
28
|
+
return forkJoin(subarray.map(i => {
|
|
29
|
+
return this.httpPost('batch.json', {
|
|
30
|
+
halt: 0,
|
|
31
|
+
cmd: Object.assign({}, ...i.map(x => {
|
|
32
|
+
return { [x[0]]: x[1] };
|
|
33
|
+
}))
|
|
34
|
+
});
|
|
35
|
+
}));
|
|
36
|
+
}
|
|
37
|
+
prepareBatch(param) {
|
|
38
|
+
let res = Object.keys(param).reduce((obj, key) => {
|
|
39
|
+
obj[key] = '';
|
|
40
|
+
return obj;
|
|
41
|
+
}, {});
|
|
42
|
+
for (let key in param) {
|
|
43
|
+
if (typeof key === 'string' || typeof key === 'number' && param[key].param) {
|
|
44
|
+
res[key] = param[key].name + '?' + this.getHttpParamsGet(param[key].param).toString();
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
return res;
|
|
48
|
+
}
|
|
49
|
+
mapBranchResult(res) {
|
|
50
|
+
return Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined));
|
|
51
|
+
}
|
|
52
|
+
mapBranchResultWithoutKey(res) {
|
|
53
|
+
return flatten(Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)));
|
|
54
|
+
}
|
|
55
|
+
post(name, params = {}, textError = '', settings = this.defSettings) {
|
|
56
|
+
return this.httpPost(this.getNameMethod(name), params, textError, settings);
|
|
57
|
+
}
|
|
58
|
+
get(name, params = {}, textError = '', settings = this.defSettings) {
|
|
59
|
+
return this.httpGet(this.getNameMethod(name), params, textError, settings);
|
|
60
|
+
}
|
|
61
|
+
httpPost(url, params = {}, textError = '', settings = this.defSettings) {
|
|
62
|
+
return this.session.getAuthParams().pipe(mergeMap(auth => {
|
|
63
|
+
if (auth) {
|
|
64
|
+
const paramsClone = clone(params);
|
|
65
|
+
paramsClone[this.session.getKeyAuth()] = auth;
|
|
66
|
+
return this.session.getBaseUrl().pipe(mergeMap(v => {
|
|
67
|
+
if (v) {
|
|
68
|
+
return this.http.post(this.prepareBaseAddress(v) + url, this.getHttpParamsPost(paramsClone, new FormData(), false, [], settings))
|
|
69
|
+
.pipe(take(1), catchError(err => {
|
|
70
|
+
if (!textError.length && err.error.error_description) {
|
|
71
|
+
textError = err.error.error_description;
|
|
72
|
+
}
|
|
73
|
+
this.snackBar.error('Ошибка: ' + textError);
|
|
74
|
+
return throwError(() => err);
|
|
75
|
+
}));
|
|
76
|
+
}
|
|
77
|
+
return throwError(() => 'get base url error');
|
|
78
|
+
}));
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
this.snackBar.error('Error: Auth not get');
|
|
82
|
+
return throwError(() => 'auth not get');
|
|
83
|
+
}
|
|
84
|
+
}));
|
|
85
|
+
}
|
|
86
|
+
httpGet(url, params = {}, textError = '', settings = this.defSettings) {
|
|
87
|
+
return this.session.getAuthParams().pipe(mergeMap(auth => {
|
|
88
|
+
if (auth) {
|
|
89
|
+
if (params === null) {
|
|
90
|
+
params = {};
|
|
91
|
+
}
|
|
92
|
+
const paramsClone = clone(params);
|
|
93
|
+
paramsClone[this.session.getKeyAuth()] = auth;
|
|
94
|
+
let options = {
|
|
95
|
+
params: this.getHttpParamsGet(paramsClone)
|
|
96
|
+
};
|
|
97
|
+
return this.session.getBaseUrl().pipe(mergeMap(v => {
|
|
98
|
+
if (v) {
|
|
99
|
+
return this.http.get(this.prepareBaseAddress(v) + url, options).pipe(take(1), catchError(err => {
|
|
100
|
+
if (!textError.length && err.error.error_description) {
|
|
101
|
+
textError = err.error.error_description;
|
|
102
|
+
}
|
|
103
|
+
this.snackBar.error('Ошибка: ' + textError);
|
|
104
|
+
return throwError(() => err);
|
|
105
|
+
}));
|
|
106
|
+
}
|
|
107
|
+
return throwError(() => 'get base url error');
|
|
108
|
+
}));
|
|
109
|
+
}
|
|
110
|
+
else {
|
|
111
|
+
this.snackBar.error('Error: Auth not get');
|
|
112
|
+
return throwError(() => 'auth not get');
|
|
113
|
+
}
|
|
114
|
+
}));
|
|
115
|
+
}
|
|
116
|
+
getNameMethod(arr) {
|
|
117
|
+
return arr.join('.');
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
HttpBXServices.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: HttpBXServices, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
|
|
121
|
+
HttpBXServices.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: HttpBXServices, providedIn: 'root' });
|
|
122
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: HttpBXServices, decorators: [{
|
|
123
|
+
type: Injectable,
|
|
124
|
+
args: [{
|
|
125
|
+
providedIn: 'root'
|
|
126
|
+
}]
|
|
127
|
+
}] });
|
|
128
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"HttpBX.js","sourceRoot":"","sources":["../../../../../projects/bx-rest/src/services/http/HttpBX.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,KAAK,MAAM,YAAY,CAAA;AAE9B,OAAO,gBAAgB,MAAM,0BAA0B,CAAA;AAMvD,OAAO,OAAO,MAAM,iBAAiB,CAAA;;AAKrC,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,gBAAgB;IAEjD,eAAe;QACtB,OAAO,IAAI,CAAC,OAAO,CAAoC,aAAa,CAAC,CAAC,IAAI,CACxE,GAAG,CAAC,CAAC,CAAC,EAAE;YACN,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE;gBACjB,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;aAC1B;YACD,OAAO,SAAS,CAAA;QAClB,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAED;;;OAGG;IACM,MAAM,CAAO,KAAyD;QAC7E,IAAI,YAAY,GAAG,MAAM,CAAC,OAAO,CAAS,IAAI,CAAC,YAAY,CAAI,KAAK,CAAC,CAAC,CAAA;QACtE,MAAM,IAAI,GAAG,EAAE,CAAA,CAAC,mBAAmB;QACnC,IAAI,QAAQ,GAAG,EAAE,CAAA,CAAC,2CAA2C;QAC7D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;YAC9D,QAAQ,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;SAChE;QAED,OAAO,QAAQ,CACb,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACf,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE;gBACjC,IAAI,EAAE,CAAC;gBACP,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;oBAClC,OAAO,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAC,CAAA;gBACvB,CAAC,CAAC,CAAC;aACJ,CAAC,CAAA;QACJ,CAAC,CAAC,CACqC,CAAA;IAC3C,CAAC;IAEQ,YAAY,CAAI,KAAyD;QAChF,IAAI,GAAG,GAA2B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CACzD,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACX,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;YACd,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAA4B,CAC7B,CAAC;QACF,KAAK,IAAI,GAAG,IAAI,KAAK,EAAE;YACrB,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE;gBAC1E,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAA;aACtF;SACF;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;IAEQ,eAAe,CAAI,GAA6B;QACvD,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAEpG,CAAA;IACH,CAAC;IAEQ,yBAAyB,CAAI,GAA6B;QACjE,OAAO,OAAO,CAAI,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;IACpH,CAAC;IAEQ,IAAI,CAAI,IAAc,EACd,SAAc,EAAE,EAChB,SAAS,GAAG,EAAE,EACd,WAA+B,IAAI,CAAC,WAAW;QAC9D,OAAO,IAAI,CAAC,QAAQ,CAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;IAChF,CAAC;IAEQ,GAAG,CAAI,IAAc,EACd,SAAc,EAAE,EAChB,SAAS,GAAG,EAAE,EACd,WAA+B,IAAI,CAAC,WAAW;QAC7D,OAAO,IAAI,CAAC,OAAO,CAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;IAC/E,CAAC;IAEQ,QAAQ,CAAI,GAAW,EACX,SAAc,EAAE,EAChB,SAAS,GAAG,EAAE,EACd,WAA+B,IAAI,CAAC,WAAW;QAElE,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,IAAI,CACtC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACd,IAAI,IAAI,EAAE;gBACR,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,CAAA;gBACjC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,GAAG,IAAI,CAAA;gBAC7C,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;oBACjD,IAAI,CAAC,EAAE;wBACL,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CACnB,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,GAAG,EAChC,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE,IAAI,QAAQ,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;6BACxE,IAAI,CACH,IAAI,CAAC,CAAC,CAAC,EACP,UAAU,CAAC,GAAG,CAAC,EAAE;4BACf,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE;gCACpD,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAA;6BACxC;4BAED,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,GAAG,SAAS,CAAC,CAAA;4BAC3C,OAAO,UAAU,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAA;wBAC9B,CAAC,CAAC,CACH,CAAA;qBACJ;oBACD,OAAO,UAAU,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,CAAA;gBAC/C,CAAC,CAAC,CAAC,CAAA;aACJ;iBAAM;gBACL,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;gBAC1C,OAAO,UAAU,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,CAAA;aACxC;QACH,CAAC,CAAC,CAAC,CAAA;IACP,CAAC;IAEQ,OAAO,CACd,GAAW,EACX,SAAc,EAAE,EAChB,SAAS,GAAG,EAAE,EACd,WAA+B,IAAI,CAAC,WAAW;QAE/C,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,IAAI,CACtC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACd,IAAI,IAAI,EAAE;gBACR,IAAI,MAAM,KAAK,IAAI,EAAE;oBACnB,MAAM,GAAG,EAAE,CAAA;iBACZ;gBACD,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,CAAA;gBACjC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,GAAG,IAAI,CAAA;gBAC7C,IAAI,OAAO,GAAG;oBACZ,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC;iBAC3C,CAAA;gBAED,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,IAAI,CACnC,QAAQ,CAAC,CAAC,CAAC,EAAE;oBACX,IAAI,CAAC,EAAE;wBACL,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAI,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,OAAO,CAAC,CAAC,IAAI,CACrE,IAAI,CAAC,CAAC,CAAC,EACP,UAAU,CAAC,GAAG,CAAC,EAAE;4BACf,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,GAAG,CAAC,KAAK,CAAC,iBAAiB,EAAE;gCACpD,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAA;6BACxC;4BAED,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,GAAG,SAAS,CAAC,CAAA;4BAC3C,OAAO,UAAU,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAA;wBAC9B,CAAC,CAAC,CAAC,CAAA;qBACN;oBACD,OAAO,UAAU,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,CAAA;gBAC/C,CAAC,CAAC,CACH,CAAA;aACF;iBAAM;gBACL,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;gBAC1C,OAAO,UAAU,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,CAAA;aACxC;QACH,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAEQ,aAAa,CAAC,GAAa;QAClC,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACtB,CAAC;;2GA9JkB,cAAc;+GAAd,cAAc,cAFrB,MAAM;2FAEC,cAAc;kBAHlC,UAAU;mBAAC;oBACV,UAAU,EAAE,MAAM;iBACnB","sourcesContent":["import { Observable, throwError, take, mergeMap, forkJoin } from 'rxjs'\nimport { catchError, map } from 'rxjs/operators'\nimport { Injectable } from '@angular/core'\nimport clone from 'just-clone'\nimport { iHttpParamSettings } from '../../typification/rest/settings'\nimport BaseHttpServices from '../../services/http/http'\nimport {\n  iBatchRequestAnswer, iBatchRequestParam,\n  iBatchRequestParamArr,\n  iBatchRequestParamHttp, keyBatch\n} from '../../typification/rest/batch/batchRequestParam'\nimport flatten from 'just-flatten-it'\n\n@Injectable({\n  providedIn: 'root'\n})\nexport default class HttpBXServices extends BaseHttpServices {\n\n  override timeNowOnServer() {\n    return this.httpGet<{ result?: Date, error?: string }>('server.time').pipe(\n      map(v => {\n        if (v && v.result) {\n          return new Date(v.result)\n        }\n        return undefined\n      }),\n    )\n  }\n\n  /**\n   * Это пиздец а не метод\n   * @param param\n   */\n  override branch<T, A>(param: iBatchRequestParamArr<T> | iBatchRequestParam<T>[]): Observable<iBatchRequestAnswer<A>[] | undefined> {\n    let prepareParam = Object.entries<string>(this.prepareBatch<T>(param))\n    const size = 50 // больше не отдаст\n    let subarray = [] //массив в который будет выведен результат.\n    for (let i = 0; i < Math.ceil(prepareParam.length / size); i++) {\n      subarray[i] = prepareParam.slice((i * size), (i * size) + size)\n    }\n\n    return forkJoin(\n      subarray.map(i => {\n        return this.httpPost('batch.json', {\n          halt: 0,\n          cmd: Object.assign({}, ...i.map(x => {\n            return {[x[0]]: x[1]}\n          }))\n        })\n      })\n    ) as Observable<iBatchRequestAnswer<A>[]>\n  }\n\n  override prepareBatch<T>(param: iBatchRequestParamArr<T> | iBatchRequestParam<T>[]): iBatchRequestParamHttp {\n    let res: iBatchRequestParamHttp = Object.keys(param).reduce(\n      (obj, key) => {\n        obj[key] = '';\n        return obj;\n      },\n      {} as iBatchRequestParamHttp\n    );\n    for (let key in param) {\n      if (typeof key === 'string' || typeof key === 'number' && param[key].param) {\n        res[key] = param[key].name + '?' + this.getHttpParamsGet(param[key].param).toString()\n      }\n    }\n    return res\n  }\n\n  override mapBranchResult<T>(res: iBatchRequestAnswer<T>[]) {\n    return Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)) as {\n      [key: keyBatch]: T\n    }\n  }\n\n  override mapBranchResultWithoutKey<T>(res: iBatchRequestAnswer<T>[]): T[] {\n    return flatten<T>(Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)))\n  }\n\n  override post<T>(name: string[],\n                   params: any = {},\n                   textError = '',\n                   settings: iHttpParamSettings = this.defSettings) {\n    return this.httpPost<T>(this.getNameMethod(name), params, textError, settings)\n  }\n\n  override get<T>(name: string[],\n                  params: any = {},\n                  textError = '',\n                  settings: iHttpParamSettings = this.defSettings) {\n    return this.httpGet<T>(this.getNameMethod(name), params, textError, settings)\n  }\n\n  override httpPost<T>(url: string,\n                       params: any = {},\n                       textError = '',\n                       settings: iHttpParamSettings = this.defSettings\n  ): Observable<T | undefined> {\n    return this.session.getAuthParams().pipe(\n      mergeMap(auth => {\n        if (auth) {\n          const paramsClone = clone(params)\n          paramsClone[this.session.getKeyAuth()] = auth\n          return this.session.getBaseUrl().pipe(mergeMap(v => {\n            if (v) {\n              return this.http.post<T | undefined>(\n                this.prepareBaseAddress(v) + url,\n                this.getHttpParamsPost(paramsClone, new FormData(), false, [], settings))\n                .pipe(\n                  take(1),\n                  catchError(err => {\n                    if (!textError.length && err.error.error_description) {\n                      textError = err.error.error_description\n                    }\n\n                    this.snackBar.error('Ошибка: ' + textError)\n                    return throwError(() => err)\n                  })\n                )\n            }\n            return throwError(() => 'get base url error')\n          }))\n        } else {\n          this.snackBar.error('Error: Auth not get')\n          return throwError(() => 'auth not get')\n        }\n      }))\n  }\n\n  override httpGet<T>(\n    url: string,\n    params: any = {},\n    textError = '',\n    settings: iHttpParamSettings = this.defSettings\n  ): Observable<T | undefined> {\n    return this.session.getAuthParams().pipe(\n      mergeMap(auth => {\n        if (auth) {\n          if (params === null) {\n            params = {}\n          }\n          const paramsClone = clone(params)\n          paramsClone[this.session.getKeyAuth()] = auth\n          let options = {\n            params: this.getHttpParamsGet(paramsClone)\n          }\n\n          return this.session.getBaseUrl().pipe(\n            mergeMap(v => {\n              if (v) {\n                return this.http.get<T>(this.prepareBaseAddress(v) + url, options).pipe(\n                  take(1),\n                  catchError(err => {\n                    if (!textError.length && err.error.error_description) {\n                      textError = err.error.error_description\n                    }\n\n                    this.snackBar.error('Ошибка: ' + textError)\n                    return throwError(() => err)\n                  }))\n              }\n              return throwError(() => 'get base url error')\n            })\n          )\n        } else {\n          this.snackBar.error('Error: Auth not get')\n          return throwError(() => 'auth not get')\n        }\n      })\n    )\n  }\n\n  override getNameMethod(arr: string[]) {\n    return arr.join('.')\n  }\n\n}\n\n"]}
|
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
import { BaseServices } from '../../services/base';
|
|
2
|
+
import { HttpParams } from '@angular/common/http';
|
|
3
|
+
export class HttpData extends BaseServices {
|
|
4
|
+
constructor() {
|
|
5
|
+
super(...arguments);
|
|
6
|
+
this.defSettings = {
|
|
7
|
+
timeZone: {
|
|
8
|
+
calc: true,
|
|
9
|
+
levelOut: false
|
|
10
|
+
}
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
getHttpParamsGet(// не так уж и сложно сделать сложенный HttpParams, да гугл?
|
|
14
|
+
obj, sendHttpParams = new HttpParams(), thisArray = false, nesting = [],
|
|
15
|
+
// settings = this.defSettings
|
|
16
|
+
_ = this.defSettings) {
|
|
17
|
+
for (const key in obj) {
|
|
18
|
+
let setKey = '';
|
|
19
|
+
if (nesting.length) {
|
|
20
|
+
let first = nesting[0];
|
|
21
|
+
setKey = (nesting.length > 1)
|
|
22
|
+
? first + '[' + nesting.slice(1).join('][') + '][' + key + ']'
|
|
23
|
+
: first + '[' + key + ']';
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
setKey = key;
|
|
27
|
+
}
|
|
28
|
+
switch (typeof obj[key]) {
|
|
29
|
+
case 'string':
|
|
30
|
+
sendHttpParams = sendHttpParams.set(setKey, obj[key]);
|
|
31
|
+
break;
|
|
32
|
+
case 'symbol':
|
|
33
|
+
case 'number':
|
|
34
|
+
case 'bigint':
|
|
35
|
+
case 'boolean':
|
|
36
|
+
sendHttpParams = sendHttpParams.set(setKey, String(obj[key]));
|
|
37
|
+
break;
|
|
38
|
+
case 'object':
|
|
39
|
+
nesting.push(key);
|
|
40
|
+
sendHttpParams = this.getHttpParamsGet(obj[key], sendHttpParams, false, nesting);
|
|
41
|
+
nesting.pop();
|
|
42
|
+
break;
|
|
43
|
+
case 'function':
|
|
44
|
+
case 'undefined':
|
|
45
|
+
default:
|
|
46
|
+
console.error('Ты отправил что-то не то', obj[key], typeof obj[key], typeof obj);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
return sendHttpParams;
|
|
50
|
+
}
|
|
51
|
+
getHttpParamsPost(obj, sendHttpParams = new FormData(), thisArray = false, nesting = [], settings = this.defSettings) {
|
|
52
|
+
if (obj instanceof Blob) {
|
|
53
|
+
let first = nesting[0];
|
|
54
|
+
let setKey = (nesting.length > 1)
|
|
55
|
+
? first + '[' + nesting.slice(1).join('][') + ']'
|
|
56
|
+
: first;
|
|
57
|
+
sendHttpParams.set(setKey, obj);
|
|
58
|
+
return sendHttpParams;
|
|
59
|
+
}
|
|
60
|
+
else if (obj instanceof Date) {
|
|
61
|
+
let first = nesting[0];
|
|
62
|
+
let tzoffset = (settings.timeZone.calc) ? obj.getTimezoneOffset() * 60000 : 0; // вычисляем влияние часового пояса
|
|
63
|
+
let levelOut = (settings.timeZone.levelOut) ? obj.getTimezoneOffset() * 60000 : 0; // вычисляем влияние часового пояса
|
|
64
|
+
let setKey = (nesting.length > 1)
|
|
65
|
+
? first + '[' + nesting.slice(1).join('][') + ']'
|
|
66
|
+
: first;
|
|
67
|
+
sendHttpParams.set(setKey, (new Date(obj.valueOf() + tzoffset - levelOut)).toISOString());
|
|
68
|
+
return sendHttpParams;
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
for (const key in obj) {
|
|
72
|
+
let setKey = '';
|
|
73
|
+
if (nesting.length) {
|
|
74
|
+
let first = nesting[0];
|
|
75
|
+
setKey = (nesting.length > 1)
|
|
76
|
+
? first + '[' + nesting.slice(1).join('][') + '][' + key + ']'
|
|
77
|
+
: first + '[' + key + ']';
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
setKey = key;
|
|
81
|
+
}
|
|
82
|
+
switch (typeof obj[key]) {
|
|
83
|
+
case 'string':
|
|
84
|
+
sendHttpParams.set(setKey, obj[key]);
|
|
85
|
+
break;
|
|
86
|
+
case 'symbol':
|
|
87
|
+
case 'number':
|
|
88
|
+
case 'bigint':
|
|
89
|
+
case 'boolean':
|
|
90
|
+
sendHttpParams.set(setKey, String(obj[key]));
|
|
91
|
+
break;
|
|
92
|
+
case 'object':
|
|
93
|
+
nesting.push(key);
|
|
94
|
+
sendHttpParams = this.getHttpParamsPost(obj[key], sendHttpParams, false, nesting, settings);
|
|
95
|
+
nesting.pop();
|
|
96
|
+
break;
|
|
97
|
+
case 'function':
|
|
98
|
+
case 'undefined':
|
|
99
|
+
default:
|
|
100
|
+
console.error('Ты отправил что-то не то', obj[key], typeof obj[key], typeof obj);
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
return sendHttpParams;
|
|
105
|
+
}
|
|
106
|
+
mapResult(v) {
|
|
107
|
+
if (v && (v.result || typeof v.result === 'boolean')) {
|
|
108
|
+
return v.result;
|
|
109
|
+
}
|
|
110
|
+
return undefined;
|
|
111
|
+
}
|
|
112
|
+
sliceArrayIntoChunks(arr, chunkSize) {
|
|
113
|
+
const res = [];
|
|
114
|
+
for (let i = 0; i < arr.length; i += chunkSize) {
|
|
115
|
+
const chunk = arr.slice(i, i + chunkSize);
|
|
116
|
+
res.push(chunk);
|
|
117
|
+
}
|
|
118
|
+
return res;
|
|
119
|
+
}
|
|
120
|
+
removingMultipleSlashes(str) {
|
|
121
|
+
return str.replace(/\/{2,}/g, '/');
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"HttpData.js","sourceRoot":"","sources":["../../../../../projects/bx-rest/src/services/http/HttpData.ts"],"names":[],"mappings":"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","sourcesContent":["import { BaseServices } from '../../services/base'\r\nimport { HttpParams } from '@angular/common/http'\r\nimport { iHttpParamSettings } from '../../typification/rest/settings'\r\nimport iHttpAnswerBX from '../../typification/rest/base/httpAnswerBX'\r\n\r\nexport class HttpData extends BaseServices {\r\n\r\n    defSettings: iHttpParamSettings = {\r\n        timeZone: {\r\n            calc: true,\r\n            levelOut: false\r\n        }\r\n    }\r\n\r\n    getHttpParamsGet( // не так уж и сложно сделать сложенный HttpParams, да гугл?\r\n        obj: any,\r\n        sendHttpParams: HttpParams = new HttpParams(),\r\n        thisArray = false,\r\n        nesting: string[] = [],\r\n        // settings = this.defSettings\r\n        _ = this.defSettings\r\n    ): any {\r\n        for (const key in obj) {\r\n            let setKey = ''\r\n            if (nesting.length) {\r\n                let first = nesting[0]\r\n                setKey = (nesting.length > 1)\r\n                    ? first + '[' + nesting.slice(1).join('][') + '][' + key + ']'\r\n                    : first + '[' + key + ']'\r\n            } else {\r\n                setKey = key\r\n            }\r\n            switch (typeof obj[key]) {\r\n                case 'string':\r\n                    sendHttpParams = sendHttpParams.set(setKey, obj[key])\r\n                    break\r\n                case 'symbol':\r\n                case 'number':\r\n                case 'bigint':\r\n                case 'boolean':\r\n                    sendHttpParams = sendHttpParams.set(setKey, String(obj[key]))\r\n                    break\r\n                case 'object':\r\n                    nesting.push(key)\r\n                    sendHttpParams = this.getHttpParamsGet(obj[key], sendHttpParams, false, nesting)\r\n                    nesting.pop()\r\n                    break\r\n                case 'function':\r\n                case 'undefined':\r\n                default:\r\n                    console.error('Ты отправил что-то не то', obj[key], typeof obj[key], typeof obj)\r\n            }\r\n        }\r\n        return sendHttpParams\r\n    }\r\n\r\n    getHttpParamsPost(\r\n        obj: any,\r\n        sendHttpParams: FormData = new FormData(),\r\n        thisArray = false,\r\n        nesting: string[] = [],\r\n        settings = this.defSettings\r\n    ): any {\r\n\r\n        if (obj instanceof Blob) {\r\n            let first = nesting[0]\r\n            let setKey = (nesting.length > 1)\r\n                ? first + '[' + nesting.slice(1).join('][') + ']'\r\n                : first\r\n            sendHttpParams.set(setKey, obj)\r\n            return sendHttpParams\r\n        } else if (obj instanceof Date) {\r\n            let first = nesting[0]\r\n            let tzoffset = (settings.timeZone.calc) ?  obj.getTimezoneOffset() * 60000 : 0 // вычисляем влияние часового пояса\r\n            let levelOut = (settings.timeZone.levelOut) ?  obj.getTimezoneOffset() * 60000 : 0 // вычисляем влияние часового пояса\r\n            let setKey = (nesting.length > 1)\r\n                ? first + '[' + nesting.slice(1).join('][') + ']'\r\n                : first\r\n            sendHttpParams.set(setKey, (new Date(obj.valueOf() + tzoffset - levelOut)).toISOString())\r\n            return sendHttpParams\r\n        } else {\r\n            for (const key in obj) {\r\n                let setKey = ''\r\n                if (nesting.length) {\r\n                    let first = nesting[0]\r\n                    setKey = (nesting.length > 1)\r\n                        ? first + '[' + nesting.slice(1).join('][') + '][' + key + ']'\r\n                        : first + '[' + key + ']'\r\n                } else {\r\n                    setKey = key\r\n                }\r\n                switch (typeof obj[key]) {\r\n                    case 'string':\r\n                        sendHttpParams.set(setKey, obj[key])\r\n                        break\r\n                    case 'symbol':\r\n                    case 'number':\r\n                    case 'bigint':\r\n                    case 'boolean':\r\n                        sendHttpParams.set(setKey, String(obj[key]))\r\n                        break\r\n                    case 'object':\r\n                        nesting.push(key)\r\n                        sendHttpParams = this.getHttpParamsPost(\r\n                            obj[key],\r\n                            sendHttpParams,\r\n                            false,\r\n                            nesting,\r\n                            settings\r\n                        )\r\n                        nesting.pop()\r\n                        break\r\n                    case 'function':\r\n                    case 'undefined':\r\n                    default:\r\n                        console.error('Ты отправил что-то не то', obj[key], typeof obj[key], typeof obj)\r\n                }\r\n            }\r\n        }\r\n        return sendHttpParams\r\n    }\r\n\r\n    mapResult<T>(v: iHttpAnswerBX<T> | undefined): T | undefined {\r\n        if (v && (v.result || typeof v.result === 'boolean')) {\r\n            return v.result\r\n        }\r\n        return undefined\r\n    }\r\n\r\n    sliceArrayIntoChunks(arr: any[], chunkSize: number) {\r\n        const res = [];\r\n        for (let i = 0; i < arr.length; i += chunkSize) {\r\n            const chunk = arr.slice(i, i + chunkSize);\r\n            res.push(chunk);\r\n        }\r\n        return res;\r\n    }\r\n\r\n    removingMultipleSlashes(str: string) {\r\n        return str.replace(/\\/{2,}/g, '/')\r\n    }\r\n}\r\n"]}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import SnackBarService from '../../../services/snack-bar/snack-bar.service';
|
|
2
|
+
import { of, } from 'rxjs';
|
|
3
|
+
import { HttpData } from '../../../services/http/HttpData';
|
|
4
|
+
import { Injectable } from '@angular/core';
|
|
5
|
+
import * as i0 from "@angular/core";
|
|
6
|
+
import * as i1 from "@angular/common/http";
|
|
7
|
+
export class BaseHttp extends HttpData {
|
|
8
|
+
constructor(http, snackBar) {
|
|
9
|
+
super();
|
|
10
|
+
this.http = http;
|
|
11
|
+
this.snackBar = snackBar;
|
|
12
|
+
}
|
|
13
|
+
handleError(result, textError = 'получения данных') {
|
|
14
|
+
return (error) => {
|
|
15
|
+
console.error(`failed: ${error.message}`);
|
|
16
|
+
this.snackBar.error('Ошибка: ' + textError);
|
|
17
|
+
return of(result);
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
BaseHttp.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseHttp, deps: [{ token: i1.HttpClient }, { token: SnackBarService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
22
|
+
BaseHttp.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseHttp, providedIn: 'root' });
|
|
23
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: BaseHttp, decorators: [{
|
|
24
|
+
type: Injectable,
|
|
25
|
+
args: [{
|
|
26
|
+
providedIn: 'root'
|
|
27
|
+
}]
|
|
28
|
+
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: SnackBarService }]; } });
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2J4LXJlc3Qvc3JjL3NlcnZpY2VzL2h0dHAvYmFzZS9iYXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBLE9BQU8sZUFBZSxNQUFNLCtDQUErQyxDQUFBO0FBQzNFLE9BQU8sRUFBYyxFQUFFLEdBQUcsTUFBTSxNQUFNLENBQUE7QUFDdEMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLGlDQUFpQyxDQUFBO0FBQzFELE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUE7OztBQUsxQyxNQUFNLE9BQWdCLFFBQVMsU0FBUSxRQUFRO0lBRTNDLFlBQTZCLElBQWdCLEVBQVMsUUFBeUI7UUFDM0UsS0FBSyxFQUFFLENBQUE7UUFEa0IsU0FBSSxHQUFKLElBQUksQ0FBWTtRQUFTLGFBQVEsR0FBUixRQUFRLENBQWlCO0lBRS9FLENBQUM7SUFlRCxXQUFXLENBQ1AsTUFBVSxFQUNWLFNBQVMsR0FBRyxrQkFBa0I7UUFDOUIsT0FBTyxDQUFDLEtBQVksRUFBaUIsRUFBRTtZQUNuQyxPQUFPLENBQUMsS0FBSyxDQUFDLFdBQVcsS0FBSyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQUE7WUFDekMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsVUFBVSxHQUFHLFNBQVMsQ0FBQyxDQUFBO1lBQzNDLE9BQU8sRUFBRSxDQUFDLE1BQVcsQ0FBQyxDQUFBO1FBQzFCLENBQUMsQ0FBQztJQUNOLENBQUM7O3FHQTNCaUIsUUFBUSw0Q0FSdkIsZUFBZTt5R0FRQSxRQUFRLGNBRmQsTUFBTTsyRkFFQSxRQUFRO2tCQUg3QixVQUFVO21CQUFDO29CQUNSLFVBQVUsRUFBRSxNQUFNO2lCQUNyQjttRkFQTSxlQUFlIiwic291cmNlc0NvbnRlbnQiOlsiLy8gaW1wb3J0IHsgaUh0dHBQYXJhbVNldHRpbmdzIH0gZnJvbSAnLi4vLi4vLi4vdHlwaWZpY2F0aW9uL3Jlc3Qvc2V0dGluZ3MnXHJcbi8vIGltcG9ydCB7IGlIdHRwUGFyYW1TZXR0aW5ncyB9IGZyb20gJ2J4LXJlc3QvdHlwaWZpY2F0aW9uL3Jlc3Qvc2V0dGluZ3MnXHJcblxyXG5pbXBvcnQgeyBpSHR0cFBhcmFtU2V0dGluZ3MgfSBmcm9tICcuLi8uLi8uLi90eXBpZmljYXRpb24vcmVzdC9zZXR0aW5ncydcclxuaW1wb3J0IHsgSHR0cENsaWVudCB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJ1xyXG5pbXBvcnQgU25hY2tCYXJTZXJ2aWNlIGZyb20gJy4uLy4uLy4uL3NlcnZpY2VzL3NuYWNrLWJhci9zbmFjay1iYXIuc2VydmljZSdcclxuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgb2YsIH0gZnJvbSAncnhqcydcclxuaW1wb3J0IHsgSHR0cERhdGEgfSBmcm9tICcuLi8uLi8uLi9zZXJ2aWNlcy9odHRwL0h0dHBEYXRhJ1xyXG5pbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSdcclxuXHJcbkBJbmplY3RhYmxlKHtcclxuICAgIHByb3ZpZGVkSW46ICdyb290J1xyXG59KVxyXG5leHBvcnQgYWJzdHJhY3QgY2xhc3MgQmFzZUh0dHAgZXh0ZW5kcyBIdHRwRGF0YSB7XHJcblxyXG4gICAgcHJvdGVjdGVkIGNvbnN0cnVjdG9yKHB1YmxpYyBodHRwOiBIdHRwQ2xpZW50LCBwdWJsaWMgc25hY2tCYXI6IFNuYWNrQmFyU2VydmljZSkge1xyXG4gICAgICAgIHN1cGVyKClcclxuICAgIH1cclxuXHJcbiAgICBhYnN0cmFjdCBodHRwR2V0PFQ+KFxyXG4gICAgICAgIHVybDogc3RyaW5nLFxyXG4gICAgICAgIHBhcmFtczogYW55LFxyXG4gICAgICAgIHRleHRFcnJvcjogc3RyaW5nLFxyXG4gICAgICAgIHNldHRpbmdzOiBpSHR0cFBhcmFtU2V0dGluZ3NcclxuICAgICk6IE9ic2VydmFibGU8VCB8IHVuZGVmaW5lZD5cclxuXHJcbiAgICBhYnN0cmFjdCBodHRwUG9zdDxUPih1cmw6IHN0cmluZyxcclxuICAgICAgICAgICAgICAgICAgICAgICBwYXJhbXM6IGFueSAsXHJcbiAgICAgICAgICAgICAgICAgICAgICAgdGV4dEVycm9yOiBzdHJpbmcsXHJcbiAgICAgICAgICAgICAgICAgICAgICAgc2V0dGluZ3M6IGlIdHRwUGFyYW1TZXR0aW5nc1xyXG4gICAgKTogT2JzZXJ2YWJsZTxUIHwgdW5kZWZpbmVkPlxyXG5cclxuICAgIGhhbmRsZUVycm9yPFQ+KFxyXG4gICAgICAgIHJlc3VsdD86IFQsXHJcbiAgICAgICAgdGV4dEVycm9yID0gJ9C/0L7Qu9GD0YfQtdC90LjRjyDQtNCw0L3QvdGL0YUnKSB7XHJcbiAgICAgICAgcmV0dXJuIChlcnJvcjogRXJyb3IpOiBPYnNlcnZhYmxlPFQ+ID0+IHtcclxuICAgICAgICAgICAgY29uc29sZS5lcnJvcihgZmFpbGVkOiAke2Vycm9yLm1lc3NhZ2V9YClcclxuICAgICAgICAgICAgdGhpcy5zbmFja0Jhci5lcnJvcign0J7RiNC40LHQutCwOiAnICsgdGV4dEVycm9yKVxyXG4gICAgICAgICAgICByZXR1cm4gb2YocmVzdWx0IGFzIFQpXHJcbiAgICAgICAgfTtcclxuICAgIH1cclxufVxyXG4iXX0=
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { throwError } from 'rxjs';
|
|
2
|
+
import { catchError } from 'rxjs/operators';
|
|
3
|
+
import { HttpParams } from '@angular/common/http';
|
|
4
|
+
import { BaseHttp } from '../../../services/http/base/base';
|
|
5
|
+
export class BaseHttpServices extends BaseHttp {
|
|
6
|
+
httpGet(url, params = {}, textError = '', settings = this.defSettings) {
|
|
7
|
+
return this.http.get(url, {
|
|
8
|
+
params: this.getHttpParamsGet(params, new HttpParams(), false, [], settings)
|
|
9
|
+
}).pipe(catchError(err => {
|
|
10
|
+
if (!textError.length && err.error.error_description) {
|
|
11
|
+
textError = err.error.error_description;
|
|
12
|
+
}
|
|
13
|
+
this.snackBar.error('Ошибка: ' + textError);
|
|
14
|
+
return throwError(() => err);
|
|
15
|
+
}));
|
|
16
|
+
}
|
|
17
|
+
httpPost(url, params = {}, textError = '', settings = this.defSettings) {
|
|
18
|
+
return this.http.post(url, this.getHttpParamsPost(params, new FormData(), false, [], settings)).pipe(catchError(err => {
|
|
19
|
+
if (!textError.length && err.error.error_description) {
|
|
20
|
+
textError = err.error.error_description;
|
|
21
|
+
}
|
|
22
|
+
this.snackBar.error('Ошибка: ' + textError);
|
|
23
|
+
console.error(err);
|
|
24
|
+
return throwError(() => err);
|
|
25
|
+
}));
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaHR0cC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2J4LXJlc3Qvc3JjL3NlcnZpY2VzL2h0dHAvYmFzZS9odHRwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBYyxVQUFVLEVBQUUsTUFBTSxNQUFNLENBQUE7QUFDN0MsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGdCQUFnQixDQUFBO0FBQzNDLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQTtBQUVqRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFFM0QsTUFBTSxPQUFPLGdCQUFpQixTQUFRLFFBQVE7SUFFbkMsT0FBTyxDQUNWLEdBQVcsRUFDWCxNQUFNLEdBQUcsRUFBRSxFQUNYLFNBQVMsR0FBRyxFQUFFLEVBQ2QsV0FBK0IsSUFBSSxDQUFDLFdBQVc7UUFFL0MsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBZ0IsR0FBRyxFQUFFO1lBQ3JDLE1BQU0sRUFBRSxJQUFJLENBQUMsZ0JBQWdCLENBQUMsTUFBTSxFQUFFLElBQUksVUFBVSxFQUFFLEVBQUUsS0FBSyxFQUFFLEVBQUUsRUFBRSxRQUFRLENBQUM7U0FDL0UsQ0FBQyxDQUFDLElBQUksQ0FDSCxVQUFVLENBQUMsR0FBRyxDQUFDLEVBQUU7WUFDYixJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sSUFBSSxHQUFHLENBQUMsS0FBSyxDQUFDLGlCQUFpQixFQUFFO2dCQUNsRCxTQUFTLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQTthQUMxQztZQUVELElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLFVBQVUsR0FBRyxTQUFTLENBQUMsQ0FBQTtZQUMzQyxPQUFPLFVBQVUsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUNoQyxDQUFDLENBQUMsQ0FDTCxDQUFBO0lBQ0wsQ0FBQztJQUVNLFFBQVEsQ0FBSSxHQUFXLEVBQ1gsU0FBYyxFQUFFLEVBQ2hCLFNBQVMsR0FBRyxFQUFFLEVBQ2QsV0FBK0IsSUFBSSxDQUFDLFdBQVc7UUFFOUQsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUksQ0FDakIsR0FBRyxFQUNILElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsSUFBSSxRQUFRLEVBQUUsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLFFBQVEsQ0FBQyxDQUN0RSxDQUFDLElBQUksQ0FDRixVQUFVLENBQUMsR0FBRyxDQUFDLEVBQUU7WUFDYixJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sSUFBSSxHQUFHLENBQUMsS0FBSyxDQUFDLGlCQUFpQixFQUFFO2dCQUNsRCxTQUFTLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQTthQUMxQztZQUVELElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLFVBQVUsR0FBRyxTQUFTLENBQUMsQ0FBQTtZQUMzQyxPQUFPLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ2xCLE9BQU8sVUFBVSxDQUFDLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ2hDLENBQUMsQ0FBQyxDQUNMLENBQUE7SUFDTCxDQUFDO0NBbUJKIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgT2JzZXJ2YWJsZSwgdGhyb3dFcnJvciB9IGZyb20gJ3J4anMnXHJcbmltcG9ydCB7IGNhdGNoRXJyb3IgfSBmcm9tICdyeGpzL29wZXJhdG9ycydcclxuaW1wb3J0IHsgSHR0cFBhcmFtcyB9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJ1xyXG5pbXBvcnQgeyBpSHR0cFBhcmFtU2V0dGluZ3MgfSBmcm9tICcuLi8uLi8uLi90eXBpZmljYXRpb24vcmVzdC9zZXR0aW5ncydcclxuaW1wb3J0IHsgQmFzZUh0dHAgfSBmcm9tICcuLi8uLi8uLi9zZXJ2aWNlcy9odHRwL2Jhc2UvYmFzZSdcclxuXHJcbmV4cG9ydCBjbGFzcyBCYXNlSHR0cFNlcnZpY2VzIGV4dGVuZHMgQmFzZUh0dHAge1xyXG5cclxuICAgIHB1YmxpYyBodHRwR2V0PFQ+KFxyXG4gICAgICAgIHVybDogc3RyaW5nLFxyXG4gICAgICAgIHBhcmFtcyA9IHt9LFxyXG4gICAgICAgIHRleHRFcnJvciA9ICcnLFxyXG4gICAgICAgIHNldHRpbmdzOiBpSHR0cFBhcmFtU2V0dGluZ3MgPSB0aGlzLmRlZlNldHRpbmdzXHJcbiAgICApOiBPYnNlcnZhYmxlPFQgfCB1bmRlZmluZWQ+IHtcclxuICAgICAgICByZXR1cm4gdGhpcy5odHRwLmdldDxUIHwgdW5kZWZpbmVkPih1cmwsIHtcclxuICAgICAgICAgICAgcGFyYW1zOiB0aGlzLmdldEh0dHBQYXJhbXNHZXQocGFyYW1zLCBuZXcgSHR0cFBhcmFtcygpLCBmYWxzZSwgW10sIHNldHRpbmdzKVxyXG4gICAgICAgIH0pLnBpcGUoXHJcbiAgICAgICAgICAgIGNhdGNoRXJyb3IoZXJyID0+IHtcclxuICAgICAgICAgICAgICAgIGlmICghdGV4dEVycm9yLmxlbmd0aCAmJiBlcnIuZXJyb3IuZXJyb3JfZGVzY3JpcHRpb24pIHtcclxuICAgICAgICAgICAgICAgICAgICB0ZXh0RXJyb3IgPSBlcnIuZXJyb3IuZXJyb3JfZGVzY3JpcHRpb25cclxuICAgICAgICAgICAgICAgIH1cclxuXHJcbiAgICAgICAgICAgICAgICB0aGlzLnNuYWNrQmFyLmVycm9yKCfQntGI0LjQsdC60LA6ICcgKyB0ZXh0RXJyb3IpXHJcbiAgICAgICAgICAgICAgICByZXR1cm4gdGhyb3dFcnJvcigoKSA9PiBlcnIpXHJcbiAgICAgICAgICAgIH0pXHJcbiAgICAgICAgKVxyXG4gICAgfVxyXG5cclxuICAgIHB1YmxpYyBodHRwUG9zdDxUPih1cmw6IHN0cmluZyxcclxuICAgICAgICAgICAgICAgICAgICAgICBwYXJhbXM6IGFueSA9IHt9LFxyXG4gICAgICAgICAgICAgICAgICAgICAgIHRleHRFcnJvciA9ICcnLFxyXG4gICAgICAgICAgICAgICAgICAgICAgIHNldHRpbmdzOiBpSHR0cFBhcmFtU2V0dGluZ3MgPSB0aGlzLmRlZlNldHRpbmdzXHJcbiAgICApOiBPYnNlcnZhYmxlPFQgfCB1bmRlZmluZWQ+IHtcclxuICAgICAgICByZXR1cm4gdGhpcy5odHRwLnBvc3Q8VCB8IHVuZGVmaW5lZD4oXHJcbiAgICAgICAgICAgIHVybCxcclxuICAgICAgICAgICAgdGhpcy5nZXRIdHRwUGFyYW1zUG9zdChwYXJhbXMsIG5ldyBGb3JtRGF0YSgpLCBmYWxzZSwgW10sIHNldHRpbmdzKVxyXG4gICAgICAgICkucGlwZShcclxuICAgICAgICAgICAgY2F0Y2hFcnJvcihlcnIgPT4ge1xyXG4gICAgICAgICAgICAgICAgaWYgKCF0ZXh0RXJyb3IubGVuZ3RoICYmIGVyci5lcnJvci5lcnJvcl9kZXNjcmlwdGlvbikge1xyXG4gICAgICAgICAgICAgICAgICAgIHRleHRFcnJvciA9IGVyci5lcnJvci5lcnJvcl9kZXNjcmlwdGlvblxyXG4gICAgICAgICAgICAgICAgfVxyXG5cclxuICAgICAgICAgICAgICAgIHRoaXMuc25hY2tCYXIuZXJyb3IoJ9Ce0YjQuNCx0LrQsDogJyArIHRleHRFcnJvcilcclxuICAgICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoZXJyKVxyXG4gICAgICAgICAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoKCkgPT4gZXJyKVxyXG4gICAgICAgICAgICB9KVxyXG4gICAgICAgIClcclxuICAgIH1cclxuXHJcbiAgICAvLyBUT0RPOiDQtNC+0LTQtdC70LDRgtGMXHJcbiAgICAvLyBodHRwUG9zdEJhc2VXaXRoRmlsZTxUPih1cmw6IHN0cmluZyxcclxuICAgIC8vICAgICAgICAgICAgICAgICAgICAgICAgIHBhcmFtczogYW55ID0ge30sXHJcbiAgICAvLyAgICAgICAgICAgICAgICAgICAgICAgICB0ZXh0RXJyb3IgPSAnJyk6IE9ic2VydmFibGU8VCB8IHVuZGVmaW5lZD4ge1xyXG4gICAgLy8gICAgIGxldCBzZWFyY2hGaWxlID0gT2JqZWN0LnZhbHVlcyhwYXJhbXMpLmZpbmQoKGk6IGFueSkgPT4gaSBpbnN0YW5jZW9mIEJsb2IpXHJcbiAgICAvLyAgICAgaWYgKHNlYXJjaEZpbGUpIHtcclxuICAgIC8vICAgICAgICAgcmV0dXJuIHRoaXMuaHR0cC5wb3N0PFQgfCB1bmRlZmluZWQ+KHVybCwgdGhpcy5nZXRIdHRwUGFyYW1zUG9zdChwYXJhbXMpKS5waXBlKFxyXG4gICAgLy8gICAgICAgICAgICAgY2F0Y2hFcnJvcihlcnIgPT4ge1xyXG4gICAgLy8gICAgICAgICAgICAgICAgIHRoaXMuc25hY2tCYXIuZXJyb3IoJ9Ce0YjQuNCx0LrQsDogJyArIHRleHRFcnJvcilcclxuICAgIC8vICAgICAgICAgICAgICAgICBjb25zb2xlLmVycm9yKGVycilcclxuICAgIC8vICAgICAgICAgICAgICAgICByZXR1cm4gdGhyb3dFcnJvcigoKSA9PiBlcnIpXHJcbiAgICAvLyAgICAgICAgICAgICB9KVxyXG4gICAgLy8gICAgICAgICApXHJcbiAgICAvLyAgICAgfSBlbHNlIHtcclxuICAgIC8vICAgICAgICAgcmV0dXJuIHRoaXMuaHR0cFBvc3QodXJsLCBwYXJhbXMsIHRleHRFcnJvcilcclxuICAgIC8vICAgICB9XHJcbiAgICAvLyB9XHJcbn1cclxuIl19
|
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
import { throwError, take, mergeMap, forkJoin } from 'rxjs';
|
|
2
|
+
import { catchError, map } from 'rxjs/operators';
|
|
3
|
+
import { Injectable } from '@angular/core';
|
|
4
|
+
import SnackBarService from '../../services/snack-bar/snack-bar.service';
|
|
5
|
+
import SessionKeyServices from '../../services/http/sessionKey';
|
|
6
|
+
import clone from 'just-clone';
|
|
7
|
+
import flatten from 'just-flatten-it';
|
|
8
|
+
import { BaseHttpServices } from './base/http';
|
|
9
|
+
import * as i0 from "@angular/core";
|
|
10
|
+
import * as i1 from "@angular/common/http";
|
|
11
|
+
export default class HttpServices extends BaseHttpServices {
|
|
12
|
+
constructor(http, snackBar, session) {
|
|
13
|
+
super(http, snackBar);
|
|
14
|
+
this.session = session;
|
|
15
|
+
}
|
|
16
|
+
timeNowOnServer() {
|
|
17
|
+
return this.httpGet('server.time').pipe(map(v => {
|
|
18
|
+
if (v && v.result) {
|
|
19
|
+
return new Date(v.result);
|
|
20
|
+
}
|
|
21
|
+
return undefined;
|
|
22
|
+
}));
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Это пиздец а не метод
|
|
26
|
+
* @param param
|
|
27
|
+
*/
|
|
28
|
+
branch(param) {
|
|
29
|
+
let prepareParam = Object.entries(this.prepareBatch(param));
|
|
30
|
+
const size = 50; // больше не отдаст
|
|
31
|
+
let subarray = []; //массив в который будет выведен результат.
|
|
32
|
+
for (let i = 0; i < Math.ceil(prepareParam.length / size); i++) {
|
|
33
|
+
subarray[i] = prepareParam.slice((i * size), (i * size) + size);
|
|
34
|
+
}
|
|
35
|
+
return forkJoin(subarray.map(i => {
|
|
36
|
+
return this.httpPost('batch.json', {
|
|
37
|
+
halt: 0,
|
|
38
|
+
cmd: Object.assign({}, ...i.map(x => {
|
|
39
|
+
return { [x[0]]: x[1] };
|
|
40
|
+
}))
|
|
41
|
+
});
|
|
42
|
+
}));
|
|
43
|
+
}
|
|
44
|
+
prepareBatch(param) {
|
|
45
|
+
let res = Object.keys(param).reduce((obj, key) => {
|
|
46
|
+
obj[key] = '';
|
|
47
|
+
return obj;
|
|
48
|
+
}, {});
|
|
49
|
+
for (let key in param) {
|
|
50
|
+
if (typeof key === 'string' || typeof key === 'number' && param[key].param) {
|
|
51
|
+
res[key] = param[key].name + '?' + this.getHttpParamsGet(param[key].param).toString();
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return res;
|
|
55
|
+
}
|
|
56
|
+
mapBranchResult(res) {
|
|
57
|
+
return Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined));
|
|
58
|
+
}
|
|
59
|
+
mapBranchResultWithoutKey(res) {
|
|
60
|
+
return flatten(Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)));
|
|
61
|
+
}
|
|
62
|
+
post(name, params = {}, textError = '', settings = this.defSettings) {
|
|
63
|
+
return this.httpPost(this.getNameMethod(name), params, textError, settings);
|
|
64
|
+
}
|
|
65
|
+
get(name, params = {}, textError = '', settings = this.defSettings) {
|
|
66
|
+
return this.httpGet(this.getNameMethod(name), params, textError, settings);
|
|
67
|
+
}
|
|
68
|
+
httpPost(url, params = {}, textError = '', settings = this.defSettings) {
|
|
69
|
+
return this.session.getAuthParams().pipe(mergeMap(auth => {
|
|
70
|
+
if (auth) {
|
|
71
|
+
const paramsClone = clone(params);
|
|
72
|
+
paramsClone[this.session.getKeyAuth()] = auth;
|
|
73
|
+
return this.session.getBaseUrl().pipe(mergeMap(v => {
|
|
74
|
+
if (v) {
|
|
75
|
+
return this.http.post(this.prepareBaseAddress(v) + url, this.getHttpParamsPost(paramsClone, new FormData(), false, [], settings))
|
|
76
|
+
.pipe(take(1), catchError(err => {
|
|
77
|
+
if (!textError.length && err.error.error_description) {
|
|
78
|
+
textError = err.error.error_description;
|
|
79
|
+
}
|
|
80
|
+
this.snackBar.error('Ошибка: ' + textError);
|
|
81
|
+
return throwError(() => err);
|
|
82
|
+
}));
|
|
83
|
+
}
|
|
84
|
+
return throwError(() => 'get base url error');
|
|
85
|
+
}));
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
this.snackBar.error('Error: Auth not get');
|
|
89
|
+
return throwError(() => 'auth not get');
|
|
90
|
+
}
|
|
91
|
+
}));
|
|
92
|
+
}
|
|
93
|
+
httpGet(url, params = {}, textError = '', settings = this.defSettings) {
|
|
94
|
+
return this.session.getAuthParams().pipe(mergeMap(auth => {
|
|
95
|
+
if (auth) {
|
|
96
|
+
if (params === null) {
|
|
97
|
+
params = {};
|
|
98
|
+
}
|
|
99
|
+
const paramsClone = clone(params);
|
|
100
|
+
paramsClone[this.session.getKeyAuth()] = auth;
|
|
101
|
+
let options = {
|
|
102
|
+
params: this.getHttpParamsGet(paramsClone)
|
|
103
|
+
};
|
|
104
|
+
return this.session.getBaseUrl().pipe(mergeMap(v => {
|
|
105
|
+
if (v) {
|
|
106
|
+
return this.http.get(this.prepareBaseAddress(v) + url, options).pipe(take(1), catchError(err => {
|
|
107
|
+
if (!textError.length && err.error.error_description) {
|
|
108
|
+
textError = err.error.error_description;
|
|
109
|
+
}
|
|
110
|
+
this.snackBar.error('Ошибка: ' + textError);
|
|
111
|
+
return throwError(() => err);
|
|
112
|
+
}));
|
|
113
|
+
}
|
|
114
|
+
return throwError(() => 'get base url error');
|
|
115
|
+
}));
|
|
116
|
+
}
|
|
117
|
+
else {
|
|
118
|
+
this.snackBar.error('Error: Auth not get');
|
|
119
|
+
return throwError(() => 'auth not get');
|
|
120
|
+
}
|
|
121
|
+
}));
|
|
122
|
+
}
|
|
123
|
+
getNameMethod(arr) {
|
|
124
|
+
return arr.join('.');
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
HttpServices.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: HttpServices, deps: [{ token: i1.HttpClient }, { token: SnackBarService }, { token: SessionKeyServices }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
128
|
+
HttpServices.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: HttpServices, providedIn: 'root' });
|
|
129
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: HttpServices, decorators: [{
|
|
130
|
+
type: Injectable,
|
|
131
|
+
args: [{
|
|
132
|
+
providedIn: 'root'
|
|
133
|
+
}]
|
|
134
|
+
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: SnackBarService }, { type: SessionKeyServices }]; } });
|
|
135
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../../projects/bx-rest/src/services/http/http.ts"],"names":[],"mappings":"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","sourcesContent":["import { Observable, throwError, take, mergeMap, forkJoin } from 'rxjs'\r\nimport { catchError, map } from 'rxjs/operators'\r\nimport { Injectable } from '@angular/core'\r\nimport { HttpClient } from '@angular/common/http'\r\nimport SnackBarService from '../../services/snack-bar/snack-bar.service'\r\nimport SessionKeyServices from '../../services/http/sessionKey'\r\nimport clone from 'just-clone'\r\nimport { iHttpParamSettings } from '../../typification/rest/settings'\r\nimport {\r\n    iBatchRequestAnswer, iBatchRequestParam,\r\n    iBatchRequestParamArr,\r\n    iBatchRequestParamHttp, keyBatch\r\n} from '../../typification/rest/batch/batchRequestParam'\r\nimport flatten from 'just-flatten-it'\r\nimport { BaseHttpServices } from './base/http'\r\n\r\n@Injectable({\r\n    providedIn: 'root'\r\n})\r\nexport default class HttpServices extends BaseHttpServices {\r\n\r\n    constructor(http: HttpClient, snackBar: SnackBarService, public session: SessionKeyServices) {\r\n        super(http, snackBar)\r\n    }\r\n\r\n    timeNowOnServer() {\r\n        return this.httpGet<{ result?: Date, error?: string }>('server.time').pipe(\r\n            map(v => {\r\n                if (v && v.result) {\r\n                    return new Date(v.result)\r\n                }\r\n                return undefined\r\n            }),\r\n        )\r\n    }\r\n\r\n    /**\r\n     * Это пиздец а не метод\r\n     * @param param\r\n     */\r\n    branch<T, A>(param: iBatchRequestParamArr<T> | iBatchRequestParam<T>[]): Observable<iBatchRequestAnswer<A>[] | undefined> {\r\n        let prepareParam = Object.entries<string>(this.prepareBatch<T>(param))\r\n        const size = 50 // больше не отдаст\r\n        let subarray = [] //массив в который будет выведен результат.\r\n        for (let i = 0; i < Math.ceil(prepareParam.length / size); i++) {\r\n            subarray[i] = prepareParam.slice((i * size), (i * size) + size)\r\n        }\r\n\r\n        return forkJoin(\r\n            subarray.map(i => {\r\n                return this.httpPost('batch.json', {\r\n                    halt: 0,\r\n                    cmd: Object.assign({}, ...i.map(x => {\r\n                        return {[x[0]]: x[1]}\r\n                    }))\r\n                })\r\n            })\r\n        ) as Observable<iBatchRequestAnswer<A>[]>\r\n    }\r\n\r\n    prepareBatch<T>(param: iBatchRequestParamArr<T> | iBatchRequestParam<T>[]): iBatchRequestParamHttp {\r\n        let res: iBatchRequestParamHttp = Object.keys(param).reduce(\r\n            (obj, key) => {\r\n                obj[key] = '';\r\n                return obj;\r\n            },\r\n            {} as iBatchRequestParamHttp\r\n        );\r\n        for (let key in param) {\r\n            if(typeof key === 'string' || typeof key === 'number' && param[key].param) {\r\n                res[key] = param[key].name + '?' + this.getHttpParamsGet(param[key].param).toString()\r\n            }\r\n        }\r\n        return res\r\n    }\r\n\r\n    mapBranchResult<T>(res: iBatchRequestAnswer<T>[]){\r\n        return Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)) as {[key:keyBatch]: T}\r\n    }\r\n\r\n    mapBranchResultWithoutKey<T>(res: iBatchRequestAnswer<T>[]): T[]{\r\n        return flatten<T>(Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)))\r\n    }\r\n\r\n    post<T>(name: string[],\r\n            params: any = {},\r\n            textError = '',\r\n            settings: iHttpParamSettings = this.defSettings) {\r\n        return this.httpPost<T>(this.getNameMethod(name), params, textError, settings)\r\n    }\r\n\r\n    get<T>(name: string[],\r\n           params: any = {},\r\n           textError = '',\r\n           settings: iHttpParamSettings = this.defSettings) {\r\n        return this.httpGet<T>(this.getNameMethod(name), params, textError, settings)\r\n    }\r\n\r\n    override httpPost<T>(url: string,\r\n                         params: any = {},\r\n                         textError = '',\r\n                         settings: iHttpParamSettings = this.defSettings\r\n    ): Observable<T | undefined> {\r\n        return this.session.getAuthParams().pipe(\r\n            mergeMap(auth => {\r\n                if (auth) {\r\n                    const paramsClone = clone(params)\r\n                    paramsClone[this.session.getKeyAuth()] = auth\r\n                    return this.session.getBaseUrl().pipe(mergeMap(v => {\r\n                        if (v) {\r\n                            return this.http.post<T | undefined>(\r\n                                this.prepareBaseAddress(v) + url,\r\n                                this.getHttpParamsPost(paramsClone, new FormData(), false, [], settings))\r\n                                .pipe(\r\n                                    take(1),\r\n                                    catchError(err => {\r\n                                        if (!textError.length && err.error.error_description) {\r\n                                            textError = err.error.error_description\r\n                                        }\r\n\r\n                                        this.snackBar.error('Ошибка: ' + textError)\r\n                                        return throwError(() => err)\r\n                                    })\r\n                                )\r\n                        }\r\n                        return throwError(() => 'get base url error')\r\n                    }))\r\n                } else {\r\n                    this.snackBar.error('Error: Auth not get')\r\n                    return throwError(() => 'auth not get')\r\n                }\r\n            }))\r\n    }\r\n\r\n    override httpGet<T>(\r\n        url: string,\r\n        params: any = {},\r\n        textError = '',\r\n        settings: iHttpParamSettings = this.defSettings\r\n    ): Observable<T | undefined> {\r\n        return this.session.getAuthParams().pipe(\r\n            mergeMap(auth => {\r\n                if (auth) {\r\n                    if (params === null) {\r\n                        params = {}\r\n                    }\r\n                    const paramsClone = clone(params)\r\n                    paramsClone[this.session.getKeyAuth()] = auth\r\n                    let options = {\r\n                        params: this.getHttpParamsGet(paramsClone)\r\n                    }\r\n\r\n                    return this.session.getBaseUrl().pipe(\r\n                        mergeMap(v => {\r\n                            if (v) {\r\n                                return this.http.get<T>(this.prepareBaseAddress(v) + url, options).pipe(\r\n                                    take(1),\r\n                                    catchError(err => {\r\n                                        if (!textError.length && err.error.error_description) {\r\n                                            textError = err.error.error_description\r\n                                        }\r\n\r\n                                        this.snackBar.error('Ошибка: ' + textError)\r\n                                        return throwError(() => err)\r\n                                    }))\r\n                            }\r\n                            return throwError(() => 'get base url error')\r\n                        })\r\n                    )\r\n                } else {\r\n                    this.snackBar.error('Error: Auth not get')\r\n                    return throwError(() => 'auth not get')\r\n                }\r\n            })\r\n        )\r\n    }\r\n\r\n    getNameMethod(arr: string[]) {\r\n        return arr.join('.')\r\n    }\r\n\r\n}\r\n"]}
|