bx-rest 0.0.5 → 0.0.7

package/src/services/base.ts

@@ -1,187 +0,0 @@
-import { Injectable } from '@angular/core'
-import { time } from 'bx-rest/src/consts/time'
-// import { environment } from 'bx-rest/src/environments/environment'
-import { DateTime } from 'luxon'
-import { DateTimeOptions } from 'luxon/src/datetime'
-
-@Injectable({
-    providedIn: 'root'
-})
-export class BaseServices {
-
-    toStr(val: any): string {
-        return (val) ? String(val) : ''
-    }
-
-    toNumber(val: any): number {
-        return (val && Number(val)) ? Number(val) : 0
-    }
-
-    toDate(val: number | string | Date, format?: string, opt?: DateTimeOptions): Date {
-        if (val instanceof Date) {
-            return val
-        } else if (typeof val == 'string') {
-            if (format) {
-                if (opt) {
-                    return DateTime.fromFormat(val, format, opt).toJSDate()
-                }
-                return DateTime.fromFormat(val, format).toJSDate()
-            } else {
-                return new Date(val)
-            }
-        } else if (typeof val == 'number') {
-            return new Date(val)
-        }
-        console.error('Wrong date format', val, format)
-        throw 'Wrong date format'
-    }
-
-    getBXStrTime(date: Date): string {
-        return this.toISOStringWithTimezone(date)
-    }
-
-    toISOStringWithTimezone(date: Date): string {
-        const tzOffset = -date.getTimezoneOffset()
-        const diff = tzOffset >= 0 ? '+' : '-'
-        const pad = (n: number) => `${Math.floor(Math.abs(n))}`.padStart(2, '0')
-        return date.getFullYear() +
-            '-' + pad(date.getMonth() + 1) +
-            '-' + pad(date.getDate()) +
-            'T' + pad(date.getHours()) +
-            ':' + pad(date.getMinutes()) +
-            ':' + pad(date.getSeconds()) +
-            diff + pad(tzOffset / 60) +
-            ':' + pad(tzOffset % 60)
-    };
-
-    toBool(val: any) {
-        switch (typeof val) {
-            case 'string':
-                val = val.toLowerCase()
-                if (val === 'n' || val === 'y') { // битриксовые понятия о bool
-                    return val === 'y'
-                } else if (val === 'true' || val === 'false') { // битриксовые понятия о bool
-                    return val === 'true'
-                } else {
-                    return false
-                }
-            default:
-                return Boolean(val)
-        }
-    }
-
-    toBXYorN(val: boolean) {
-        return (val) ? 'Y' : 'N'
-    }
-
-    typeof(val: any) {
-        return typeof val
-    }
-
-    typeDefClass(val: object): undefined | null | 'date' {
-        if (val) {
-            if (val instanceof Date) {
-                return 'date'
-            }
-            return undefined
-        } else {
-            return null
-        }
-    }
-
-    toJSON(val: object) {
-        return JSON.stringify(val)
-    }
-
-    fromJSON<T>(val: string): T | undefined {
-        return JSON.parse(val)
-    }
-
-    prepareBaseAddress(url: string, add: string = '') {
-        if (url.search('https://') !== 0 && url.search('http://')) {
-            url = 'https://' + url
-        }
-
-        if (url.lastIndexOf('/') !== (url.length - 1)) {
-            url = url + '/'
-        }
-
-        url = url + add
-
-        return url
-    }
-
-    getHomeAddress() {
-        // return this.prepareBaseAddress(environment.urls.home)
-        return this.prepareBaseAddress('b24.trace-studio.com')
-    }
-
-    dateDiff(a: Date, b: Date) {
-        return new Date(a.valueOf() - b.valueOf())
-    }
-
-    dateDiffInDays(a: Date, b: Date) {
-        return Math.floor(this.dateDiff(a, b).valueOf() / time.oneDayMilliseconds);
-    }
-
-    getBase64File(file: File) {
-        return new Promise((resolve, reject) => {
-            const reader = new FileReader()
-            reader.readAsDataURL(file)
-            reader.onload = () => resolve(reader.result)
-            reader.onerror = error => reject(error)
-        })
-    }
-
-    async getBase64FileLikeStr(file: File): Promise<{ header: string, val: string } | undefined> {
-        let result = await this.getBase64File(file)
-        if (typeof result === 'string') {
-            let split = result.split(',')
-            return {
-                header: split[0],
-                val: split[1]
-            }
-        }
-        return undefined
-    }
-
-    sumArray(numbers: number[]) {
-        return numbers.reduce((a, b) => {
-            return a + b;
-        })
-    }
-
-    isItTheSameDate(date1: Date, date2: Date) {
-        return date1.getDate() === date2.getDate()
-            && date1.getMonth() === date2.getMonth()
-            && date1.getFullYear() === date2.getFullYear()
-    }
-
-    toUnix(date: Date) {
-        return Math.floor(date.valueOf() / 1000)
-    }
-
-    arrSum(x: number[]) {
-        let s = 0;
-        for (let i = 0; i < x.length; i++) {
-            s += x[i]
-        }
-        return s
-    }
-
-    getBaseUrlHttps(url: string, component = false) {
-        if (component) {
-            return encodeURI(this.cropUrl(url) + '/');
-        } else {
-            return encodeURI('https://' + this.cropUrl(url) + '/');
-        }
-    }
-
-    cropUrl(url: string) {
-        url = (url) ? url.replace('https://', '') : ''
-        url = (url) ? url.replace('http://', '') : ''
-        url = (url) ? url.replace('https:', '') : ''
-        url = (url) ? url.replace('http:', '') : ''
-        return url
-    }
-}

package/src/services/http/HttpBX.ts

@@ -1,176 +0,0 @@
-import { Observable, throwError, take, mergeMap, forkJoin } from 'rxjs'
-import { catchError, map } from 'rxjs/operators'
-import { Injectable } from '@angular/core'
-import clone from 'just-clone'
-import { iHttpParamSettings } from 'bx-rest/src/typification/rest/settings'
-import BaseHttpServices from 'bx-rest/src/services/http/http'
-import {
-    iBatchRequestAnswer, iBatchRequestParam,
-    iBatchRequestParamArr,
-    iBatchRequestParamHttp, keyBatch
-} from 'bx-rest/src/typification/rest/batch/batchRequestParam'
-import flatten from 'just-flatten-it'
-
-@Injectable({
-    providedIn: 'root'
-})
-export default class HttpBXServices extends BaseHttpServices {
-
-    timeNowOnServer() {
-        return this.httpGet<{ result?: Date, error?: string }>('server.time').pipe(
-            map(v => {
-                if (v && v.result) {
-                    return new Date(v.result)
-                }
-                return undefined
-            }),
-        )
-    }
-
-    /**
-     * Это пиздец а не метод
-     * @param param
-     */
-    branch<T, A>(param: iBatchRequestParamArr<T> | iBatchRequestParam<T>[]): Observable<iBatchRequestAnswer<A>[] | undefined> {
-        let prepareParam = Object.entries<string>(this.prepareBatch<T>(param))
-        const size = 50 // больше не отдаст
-        let subarray = [] //массив в который будет выведен результат.
-        for (let i = 0; i < Math.ceil(prepareParam.length / size); i++) {
-            subarray[i] = prepareParam.slice((i * size), (i * size) + size)
-        }
-
-        return forkJoin(
-            subarray.map(i => {
-                return this.httpPost('batch.json', {
-                    halt: 0,
-                    cmd: Object.assign({}, ...i.map(x => {
-                        return {[x[0]]: x[1]}
-                    }))
-                })
-            })
-        ) as Observable<iBatchRequestAnswer<A>[]>
-    }
-
-    prepareBatch<T>(param: iBatchRequestParamArr<T> | iBatchRequestParam<T>[]): iBatchRequestParamHttp {
-        let res: iBatchRequestParamHttp = Object.keys(param).reduce(
-            (obj, key) => {
-                obj[key] = '';
-                return obj;
-            },
-            {} as iBatchRequestParamHttp
-        );
-        for (let key in param) {
-            if(typeof key === 'string' || typeof key === 'number' && param[key].param) {
-                res[key] = param[key].name + '?' + this.getHttpParamsGet(param[key].param).toString()
-            }
-        }
-        return res
-    }
-
-    mapBranchResult<T>(res: iBatchRequestAnswer<T>[]){
-        return Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)) as {[key:keyBatch]: T}
-    }
-
-    mapBranchResultWithoutKey<T>(res: iBatchRequestAnswer<T>[]): T[]{
-        return flatten<T>(Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)))
-    }
-
-    post<T>(name: string[],
-            params: any = {},
-            textError = '',
-            settings: iHttpParamSettings = this.defSettings) {
-        return this.httpPost<T>(this.getNameMethod(name), params, textError, settings)
-    }
-
-    get<T>(name: string[],
-           params: any = {},
-           textError = '',
-           settings: iHttpParamSettings = this.defSettings) {
-        return this.httpGet<T>(this.getNameMethod(name), params, textError, settings)
-    }
-
-    override httpPost<T>(url: string,
-                         params: any = {},
-                         textError = '',
-                         settings: iHttpParamSettings = this.defSettings
-    ): Observable<T | undefined> {
-        return this.session.getAuthParams().pipe(
-            mergeMap(auth => {
-                if (auth) {
-                    const paramsClone = clone(params)
-                    paramsClone[this.session.getKeyAuth()] = auth
-                    return this.session.getBaseUrl().pipe(mergeMap(v => {
-                        if (v) {
-                            return this.http.post<T | undefined>(
-                                this.prepareBaseAddress(v) + url,
-                                this.getHttpParamsPost(paramsClone, new FormData(), false, [], settings))
-                                .pipe(
-                                    take(1),
-                                    catchError(err => {
-                                        if (!textError.length && err.error.error_description) {
-                                            textError = err.error.error_description
-                                        }
-
-                                        this.snackBar.error('Ошибка: ' + textError)
-                                        return throwError(() => err)
-                                    })
-                                )
-                        }
-                        return throwError(() => 'get base url error')
-                    }))
-                } else {
-                    this.snackBar.error('Error: Auth not get')
-                    return throwError(() => 'auth not get')
-                }
-            }))
-    }
-
-    override httpGet<T>(
-        url: string,
-        params: any = {},
-        textError = '',
-        settings: iHttpParamSettings = this.defSettings
-    ): Observable<T | undefined> {
-        return this.session.getAuthParams().pipe(
-            mergeMap(auth => {
-                if (auth) {
-                    if (params === null) {
-                        params = {}
-                    }
-                    const paramsClone = clone(params)
-                    paramsClone[this.session.getKeyAuth()] = auth
-                    let options = {
-                        params: this.getHttpParamsGet(paramsClone)
-                    }
-
-                    return this.session.getBaseUrl().pipe(
-                        mergeMap(v => {
-                            if (v) {
-                                return this.http.get<T>(this.prepareBaseAddress(v) + url, options).pipe(
-                                    take(1),
-                                    catchError(err => {
-                                        if (!textError.length && err.error.error_description) {
-                                            textError = err.error.error_description
-                                        }
-
-                                        this.snackBar.error('Ошибка: ' + textError)
-                                        return throwError(() => err)
-                                    }))
-                            }
-                            return throwError(() => 'get base url error')
-                        })
-                    )
-                } else {
-                    this.snackBar.error('Error: Auth not get')
-                    return throwError(() => 'auth not get')
-                }
-            })
-        )
-    }
-
-    getNameMethod(arr: string[]) {
-        return arr.join('.')
-    }
-
-}
-

package/src/services/http/HttpData.ts

@@ -1,142 +0,0 @@
-import { BaseServices } from 'bx-rest/src/services/base'
-import { HttpParams } from '@angular/common/http'
-import { iHttpParamSettings } from 'bx-rest/src/typification/rest/settings'
-import iHttpAnswerBX from 'bx-rest/src/typification/rest/base/httpAnswerBX'
-
-export class HttpData extends BaseServices {
-
-    defSettings: iHttpParamSettings = {
-        timeZone: {
-            calc: true,
-            levelOut: false
-        }
-    }
-
-    getHttpParamsGet( // не так уж и сложно сделать сложенный HttpParams, да гугл?
-        obj: any,
-        sendHttpParams: HttpParams = new HttpParams(),
-        thisArray = false,
-        nesting: string[] = [],
-        // settings = this.defSettings
-        _ = this.defSettings
-    ): any {
-        for (const key in obj) {
-            let setKey = ''
-            if (nesting.length) {
-                let first = nesting[0]
-                setKey = (nesting.length > 1)
-                    ? first + '[' + nesting.slice(1).join('][') + '][' + key + ']'
-                    : first + '[' + key + ']'
-            } else {
-                setKey = key
-            }
-            switch (typeof obj[key]) {
-                case 'string':
-                    sendHttpParams = sendHttpParams.set(setKey, obj[key])
-                    break
-                case 'symbol':
-                case 'number':
-                case 'bigint':
-                case 'boolean':
-                    sendHttpParams = sendHttpParams.set(setKey, String(obj[key]))
-                    break
-                case 'object':
-                    nesting.push(key)
-                    sendHttpParams = this.getHttpParamsGet(obj[key], sendHttpParams, false, nesting)
-                    nesting.pop()
-                    break
-                case 'function':
-                case 'undefined':
-                default:
-                    console.error('Ты отправил что-то не то', obj[key], typeof obj[key], typeof obj)
-            }
-        }
-        return sendHttpParams
-    }
-
-    getHttpParamsPost(
-        obj: any,
-        sendHttpParams: FormData = new FormData(),
-        thisArray = false,
-        nesting: string[] = [],
-        settings = this.defSettings
-    ): any {
-
-        if (obj instanceof Blob) {
-            let first = nesting[0]
-            let setKey = (nesting.length > 1)
-                ? first + '[' + nesting.slice(1).join('][') + ']'
-                : first
-            sendHttpParams.set(setKey, obj)
-            return sendHttpParams
-        } else if (obj instanceof Date) {
-            let first = nesting[0]
-            let tzoffset = (settings.timeZone.calc) ?  obj.getTimezoneOffset() * 60000 : 0 // вычисляем влияние часового пояса
-            let levelOut = (settings.timeZone.levelOut) ?  obj.getTimezoneOffset() * 60000 : 0 // вычисляем влияние часового пояса
-            let setKey = (nesting.length > 1)
-                ? first + '[' + nesting.slice(1).join('][') + ']'
-                : first
-            sendHttpParams.set(setKey, (new Date(obj.valueOf() + tzoffset - levelOut)).toISOString())
-            return sendHttpParams
-        } else {
-            for (const key in obj) {
-                let setKey = ''
-                if (nesting.length) {
-                    let first = nesting[0]
-                    setKey = (nesting.length > 1)
-                        ? first + '[' + nesting.slice(1).join('][') + '][' + key + ']'
-                        : first + '[' + key + ']'
-                } else {
-                    setKey = key
-                }
-                switch (typeof obj[key]) {
-                    case 'string':
-                        sendHttpParams.set(setKey, obj[key])
-                        break
-                    case 'symbol':
-                    case 'number':
-                    case 'bigint':
-                    case 'boolean':
-                        sendHttpParams.set(setKey, String(obj[key]))
-                        break
-                    case 'object':
-                        nesting.push(key)
-                        sendHttpParams = this.getHttpParamsPost(
-                            obj[key],
-                            sendHttpParams,
-                            false,
-                            nesting,
-                            settings
-                        )
-                        nesting.pop()
-                        break
-                    case 'function':
-                    case 'undefined':
-                    default:
-                        console.error('Ты отправил что-то не то', obj[key], typeof obj[key], typeof obj)
-                }
-            }
-        }
-        return sendHttpParams
-    }
-
-    mapResult<T>(v: iHttpAnswerBX<T> | undefined): T | undefined {
-        if (v && (v.result || typeof v.result === 'boolean')) {
-            return v.result
-        }
-        return undefined
-    }
-
-    sliceArrayIntoChunks(arr: any[], chunkSize: number) {
-        const res = [];
-        for (let i = 0; i < arr.length; i += chunkSize) {
-            const chunk = arr.slice(i, i + chunkSize);
-            res.push(chunk);
-        }
-        return res;
-    }
-
-    removingMultipleSlashes(str: string) {
-        return str.replace(/\/{2,}/g, '/')
-    }
-}

package/src/services/http/base/HttpData.ts

@@ -1,141 +0,0 @@
-import { BaseServices } from 'bx-rest/src/services/base'
-import { HttpParams } from '@angular/common/http'
-import { iHttpParamSettings } from 'bx-rest/src/typification/rest/settings'
-import iHttpAnswerBX from 'bx-rest/src/typification/rest/base/httpAnswerBX'
-
-export class HttpData extends BaseServices {
-
-    defSettings: iHttpParamSettings = {
-        timeZone: {
-            calc: true,
-            levelOut: false
-        }
-    }
-
-    getHttpParamsGet( // не так уж и сложно сделать сложенный HttpParams, да гугл?
-        obj: any,
-        sendHttpParams: HttpParams = new HttpParams(),
-        thisArray = false,
-        nesting: string[] = [],
-        // settings = this.defSettings
-        _ = this.defSettings
-    ): any {
-        for (const key in obj) {
-            let setKey = ''
-            if (nesting.length) {
-                let first = nesting[0]
-                setKey = (nesting.length > 1)
-                    ? first + '[' + nesting.slice(1).join('][') + '][' + key + ']'
-                    : first + '[' + key + ']'
-            } else {
-                setKey = key
-            }
-            switch (typeof obj[key]) {
-                case 'string':
-                    sendHttpParams = sendHttpParams.set(setKey, obj[key])
-                    break
-                case 'symbol':
-                case 'number':
-                case 'bigint':
-                case 'boolean':
-                    sendHttpParams = sendHttpParams.set(setKey, String(obj[key]))
-                    break
-                case 'object':
-                    nesting.push(key)
-                    sendHttpParams = this.getHttpParamsGet(obj[key], sendHttpParams, false, nesting)
-                    nesting.pop()
-                    break
-                case 'function':
-                case 'undefined':
-                default:
-                    console.error('Ты отправил что-то не то', obj[key], typeof obj[key], typeof obj)
-            }
-        }
-        return sendHttpParams
-    }
-
-    getHttpParamsPost(
-        obj: any,
-        sendHttpParams: FormData = new FormData(),
-        thisArray = false,
-        nesting: string[] = [],
-        settings = this.defSettings
-    ): any {
-
-        if (obj instanceof Blob) {
-            let first = nesting[0]
-            let setKey = (nesting.length > 1)
-                ? first + '[' + nesting.slice(1).join('][') + ']'
-                : first
-            sendHttpParams.set(setKey, obj)
-            return sendHttpParams
-        } else if (obj instanceof Date) {
-            let first = nesting[0]
-            let tzoffset = (settings.timeZone.calc) ?  obj.getTimezoneOffset() * 60000 : 0 // вычисляем влияние часового пояса
-            let setKey = (nesting.length > 1)
-                ? first + '[' + nesting.slice(1).join('][') + ']'
-                : first
-            sendHttpParams.set(setKey, (new Date(obj.valueOf() + tzoffset)).toISOString())
-            return sendHttpParams
-        } else {
-            for (const key in obj) {
-                let setKey = ''
-                if (nesting.length) {
-                    let first = nesting[0]
-                    setKey = (nesting.length > 1)
-                        ? first + '[' + nesting.slice(1).join('][') + '][' + key + ']'
-                        : first + '[' + key + ']'
-                } else {
-                    setKey = key
-                }
-                switch (typeof obj[key]) {
-                    case 'string':
-                        sendHttpParams.set(setKey, obj[key])
-                        break
-                    case 'symbol':
-                    case 'number':
-                    case 'bigint':
-                    case 'boolean':
-                        sendHttpParams.set(setKey, String(obj[key]))
-                        break
-                    case 'object':
-                        nesting.push(key)
-                        sendHttpParams = this.getHttpParamsPost(
-                            obj[key],
-                            sendHttpParams,
-                            false,
-                            nesting,
-                            settings
-                        )
-                        nesting.pop()
-                        break
-                    case 'function':
-                    case 'undefined':
-                    default:
-                        console.error('Ты отправил что-то не то', obj[key], typeof obj[key], typeof obj)
-                }
-            }
-        }
-        return sendHttpParams
-    }
-
-    mapResult<T>(v: iHttpAnswerBX<T> | undefined): T | undefined {
-        if (v && (v.result || typeof v.result === 'boolean')) {
-            return v.result
-        }
-        return undefined
-    }
-
-    sliceArrayIntoChunks(arr: any[], chunkSize: number) {
-        const res = [];
-        for (let i = 0; i < arr.length; i += chunkSize) {
-            const chunk = arr.slice(i, i + chunkSize);
-            res.push(chunk);
-        }
-        return res;
-    }
-
-    removingMultipleSlashes(str: string) {
-        return str.replace(/\/{2,}/g, '/')
-    }
-}

package/src/services/http/base/base.ts

@@ -1,40 +0,0 @@
-// import { iHttpParamSettings } from '../../../typification/rest/settings'
-import { iHttpParamSettings } from 'bx-rest/src/typification/rest/settings'
-import { HttpClient } from '@angular/common/http'
-import SnackBarService from 'bx-rest/src/services/snack-bar/snack-bar.service'
-import { Observable, of, } from 'rxjs'
-import { HttpData } from 'bx-rest/src/services/http/HttpData'
-import { Injectable } from '@angular/core'
-
-@Injectable({
-    providedIn: 'root'
-})
-export abstract class BaseHttp extends HttpData {
-
-    protected constructor(public http: HttpClient, public snackBar: SnackBarService) {
-        super()
-    }
-
-    abstract httpGet<T>(
-        url: string,
-        params: any,
-        textError: string,
-        settings: iHttpParamSettings
-    ): Observable<T | undefined>
-
-    abstract httpPost<T>(url: string,
-                       params: any ,
-                       textError: string,
-                       settings: iHttpParamSettings
-    ): Observable<T | undefined>
-
-    handleError<T>(
-        result?: T,
-        textError = 'получения данных') {
-        return (error: Error): Observable<T> => {
-            console.error(`failed: ${error.message}`)
-            this.snackBar.error('Ошибка: ' + textError)
-            return of(result as T)
-        };
-    }
-}