ITQC/pydase_service_base
24
0
Fork 0
mirror of https://github.com/tiqi-group/pydase_service_base.git synced 2025-04-22 01:00:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: formatting

Browse Source
This commit is contained in:
Mose Mueller 2023-04-11 09:16:13 +02:00
parent 2e9f95211f
commit e84c19a4be
7 changed files with 399 additions and 371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/CancelablePromise.ts
View File

@ -2,7 +2,6 @@
/* tslint:disable */
/* eslint-disable */
export class CancelError extends Error {
constructor(message: string) {
super(message);
this.name = 'CancelError';
@ -71,15 +70,15 @@ export class CancelablePromise<T> implements Promise<T> {
};
Object.defineProperty(onCancel, 'isResolved', {
get: (): boolean => this._isResolved,
get: (): boolean => this._isResolved
});
Object.defineProperty(onCancel, 'isRejected', {
get: (): boolean => this._isRejected,
get: (): boolean => this._isRejected
});
Object.defineProperty(onCancel, 'isCancelled', {
get: (): boolean => this._isCancelled,
get: (): boolean => this._isCancelled
});
return executor(onResolve, onReject, onCancel as OnCancel);

2
frontend/src/OpenAPI.ts
View File

@ -27,5 +27,5 @@ export const OpenAPI: OpenAPIConfig = {
USERNAME: undefined,
PASSWORD: undefined,
HEADERS: undefined,
ENCODE_PATH: undefined,
ENCODE_PATH: undefined
};

65
frontend/src/request.ts
View File

@ -8,7 +8,9 @@ import { CancelablePromise } from './CancelablePromise';
import type { OnCancel } from './CancelablePromise';
import type { OpenAPIConfig } from './OpenAPI';
const isDefined = <T>(value: T | null | undefined): value is Exclude<T, null | undefined> => {
const isDefined = <T>(
value: T | null | undefined
): value is Exclude<T, null | undefined> => {
return value !== undefined && value !== null;
};
@ -56,7 +58,7 @@ const getQueryString = (params: Record<string, any>): string => {
const process = (key: string, value: any) => {
if (isDefined(value)) {
if (Array.isArray(value)) {
value.forEach(v => {
value.forEach((v) => {
process(key, v);
});
} else if (typeof value === 'object') {
@ -115,7 +117,7 @@ const getFormData = (options: ApiRequestOptions): FormData | undefined => {
.filter(([_, value]) => isDefined(value))
.forEach(([key, value]) => {
if (Array.isArray(value)) {
value.forEach(v => process(key, v));
value.forEach((v) => process(key, v));
} else {
process(key, value);
}
@ -128,14 +130,20 @@ const getFormData = (options: ApiRequestOptions): FormData | undefined => {
type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
const resolve = async <T>(options: ApiRequestOptions, resolver?: T | Resolver<T>): Promise<T | undefined> => {
const resolve = async <T>(
options: ApiRequestOptions,
resolver?: T | Resolver<T>
): Promise<T | undefined> => {
if (typeof resolver === 'function') {
return (resolver as Resolver<T>)(options);
}
return resolver;
};
const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Promise<Headers> => {
const getHeaders = async (
config: OpenAPIConfig,
options: ApiRequestOptions
): Promise<Headers> => {
const token = await resolve(options, config.TOKEN);
const username = await resolve(options, config.USERNAME);
const password = await resolve(options, config.PASSWORD);
@ -144,13 +152,16 @@ const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Pr
const headers = Object.entries({
Accept: 'application/json',
...additionalHeaders,
...options.headers,
...options.headers
})
.filter(([_, value]) => isDefined(value))
.reduce((headers, [key, value]) => ({
.reduce(
(headers, [key, value]) => ({
...headers,
[key]: String(value),
}), {} as Record<string, string>);
[key]: String(value)
}),
{} as Record<string, string>
);
if (isStringWithValue(token)) {
headers['Authorization'] = `Bearer ${token}`;
@ -179,8 +190,12 @@ const getHeaders = async (config: OpenAPIConfig, options: ApiRequestOptions): Pr
const getRequestBody = (options: ApiRequestOptions): any => {
if (options.body) {
if (options.mediaType?.includes('/json')) {
return JSON.stringify(options.body)
} else if (isString(options.body) || isBlob(options.body) || isFormData(options.body)) {
return JSON.stringify(options.body);
} else if (
isString(options.body) ||
isBlob(options.body) ||
isFormData(options.body)
) {
return options.body;
} else {
return JSON.stringify(options.body);
@ -204,7 +219,7 @@ export const sendRequest = async (
headers,
body: body ?? formData,
method: options.method,
signal: controller.signal,
signal: controller.signal
};
if (config.WITH_CREDENTIALS) {
@ -216,7 +231,10 @@ export const sendRequest = async (
return await fetch(url, request);
};
const getResponseHeader = (response: Response, responseHeader?: string): string | undefined => {
const getResponseHeader = (
response: Response,
responseHeader?: string
): string | undefined => {
if (responseHeader) {
const content = response.headers.get(responseHeader);
if (isString(content)) {
@ -254,8 +272,8 @@ const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult): void =>
500: 'Internal Server Error',
502: 'Bad Gateway',
503: 'Service Unavailable',
...options.errors,
}
...options.errors
};
const error = errors[result.status];
if (error) {
@ -274,7 +292,10 @@ const catchErrorCodes = (options: ApiRequestOptions, result: ApiResult): void =>
* @returns CancelablePromise<T>
* @throws ApiError
*/
export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): CancelablePromise<T> => {
export const request = <T>(
config: OpenAPIConfig,
options: ApiRequestOptions
): CancelablePromise<T> => {
return new CancelablePromise(async (resolve, reject, onCancel) => {
try {
const url = getUrl(config, options);
@ -283,7 +304,15 @@ export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): C
const headers = await getHeaders(config, options);
if (!onCancel.isCancelled) {
const response = await sendRequest(config, options, url, body, formData, headers, onCancel);
const response = await sendRequest(
config,
options,
url,
body,
formData,
headers,
onCancel
);
const responseBody = await getResponseBody(response);
const responseHeader = getResponseHeader(response, options.responseHeader);
@ -292,7 +321,7 @@ export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): C
ok: response.ok,
status: response.status,
statusText: response.statusText,
body: responseHeader ?? responseBody,
body: responseHeader ?? responseBody
};
catchErrorCodes(options, result);