Partial migration of UI to nodes API (#3195)
* feat(ui): add axios client generator and simple example
* fix(ui): update client & nodes test code w/ new Edge type
* chore(ui): organize generated files
* chore(ui): update .eslintignore, .prettierignore
* chore(ui): update openapi.json
* feat(backend): fixes for nodes/generator
* feat(ui): generate object args for api client
* feat(ui): more nodes api prototyping
* feat(ui): nodes cancel
* chore(ui): regenerate api client
* fix(ui): disable OG web server socket connection
* fix(ui): fix scrollbar styles typing and prop
just noticed the typo, and made the types stronger.
* feat(ui): add socketio types
* feat(ui): wip nodes
- extract api client method arg types instead of manually declaring them
- update example to display images
- general tidy up
* start building out node translations from frontend state and add notes about missing features
* use reference to sampler_name
* use reference to sampler_name
* add optional apiUrl prop
* feat(ui): start hooking up dynamic txt2img node generation, create middleware for session invocation
* feat(ui): write separate nodes socket layer, txt2img generating and rendering w single node
* feat(ui): img2img implementation
* feat(ui): get intermediate images working but types are stubbed out
* chore(ui): add support for package mode
* feat(ui): add nodes mode script
* feat(ui): handle random seeds
* fix(ui): fix middleware types
* feat(ui): add rtk action type guard
* feat(ui): disable NodeAPITest
This was polluting the network/socket logs.
* feat(ui): fix parameters panel border color
This commit should be elsewhere but I don't want to break my flow
* feat(ui): make thunk types more consistent
* feat(ui): add type guards for outputs
* feat(ui): load images on socket connect
Rudimentary
* chore(ui): bump redux-toolkit
* docs(ui): update readme
* chore(ui): regenerate api client
* chore(ui): add typescript as dev dependency
I am having trouble with TS versions after vscode updated and now uses TS 5. `madge` has installed 3.9.10 and for whatever reason my vscode wants to use that. Manually specifying 4.9.5 and then setting vscode to use that as the workspace TS fixes the issue.
* feat(ui): begin migrating gallery to nodes
Along the way, migrate to use RTK `createEntityAdapter` for gallery images, and separate `results` and `uploads` into separate slices. Much cleaner this way.
* feat(ui): clean up & comment results slice
* fix(ui): separate thunk for initial gallery load so it properly gets index 0
* feat(ui): POST upload working
* fix(ui): restore removed type
* feat(ui): patch api generation for headers access
* chore(ui): regenerate api
* feat(ui): wip gallery migration
* feat(ui): wip gallery migration
* chore(ui): regenerate api
* feat(ui): wip refactor socket events
* feat(ui): disable panels based on app props
* feat(ui): invert logic to be disabled
* disable panels when app mounts
* feat(ui): add support to disableTabs
* docs(ui): organise and update docs
* lang(ui): add toast strings
* feat(ui): wip events, comments, and general refactoring
* feat(ui): add optional token for auth
* feat(ui): export StatusIndicator and ModelSelect for header use
* feat(ui) working on making socket URL dynamic
* feat(ui): dynamic middleware loading
* feat(ui): prep for socket jwt
* feat(ui): migrate cancelation
also updated action names to be event-like instead of declaration-like
sorry, i was scattered and this commit has a lot of unrelated stuff in it.
* fix(ui): fix img2img type
* chore(ui): regenerate api client
* feat(ui): improve InvocationCompleteEvent types
* feat(ui): increase StatusIndicator font size
* fix(ui): fix middleware order for multi-node graphs
* feat(ui): add exampleGraphs object w/ iterations example
* feat(ui): generate iterations graph
* feat(ui): update ModelSelect for nodes API
* feat(ui): add hi-res functionality for txt2img generations
* feat(ui): "subscribe" to particular nodes
feels like a dirty hack but oh well it works
* feat(ui): first steps to node editor ui
* fix(ui): disable event subscription
it is not fully baked just yet
* feat(ui): wip node editor
* feat(ui): remove extraneous field types
* feat(ui): nodes before deleting stuff
* feat(ui): cleanup nodes ui stuff
* feat(ui): hook up nodes to redux
* fix(ui): fix handle
* fix(ui): add basic node edges & connection validation
* feat(ui): add connection validation styling
* feat(ui): increase edge width
* feat(ui): it blends
* feat(ui): wip model handling and graph topology validation
* feat(ui): validation connections w/ graphlib
* docs(ui): update nodes doc
* feat(ui): wip node editor
* chore(ui): rebuild api, update types
* add redux-dynamic-middlewares as a dependency
* feat(ui): add url host transformation
* feat(ui): handle already-connected fields
* feat(ui): rewrite SqliteItemStore in sqlalchemy
* fix(ui): fix sqlalchemy dynamic model instantiation
* feat(ui, nodes): metadata wip
* feat(ui, nodes): models
* feat(ui, nodes): more metadata wip
* feat(ui): wip range/iterate
* fix(nodes): fix sqlite typing
* feat(ui): export new type for invoke component
* tests(nodes): fix test instantiation of ImageField
* feat(nodes): fix LoadImageInvocation
* feat(nodes): add `title` ui hint
* feat(nodes): make ImageField attrs optional
* feat(ui): wip nodes etc
* feat(nodes): roll back sqlalchemy
* fix(nodes): partially address feedback
* fix(backend): roll back changes to pngwriter
* feat(nodes): wip address metadata feedback
* feat(nodes): add seeded rng to RandomRange
* feat(nodes): address feedback
* feat(nodes): move GET images error handling to DiskImageStorage
* feat(nodes): move GET images error handling to DiskImageStorage
* fix(nodes): fix image output schema customization
* feat(ui): img2img/txt2img -> linear
- remove txt2img and img2img tabs
- add linear tab
- add initial image selection to linear parameters accordion
* feat(ui): tidy graph builders
* feat(ui): tidy misc
* feat(ui): improve invocation union types
* feat(ui): wip metadata viewer recall
* feat(ui): move fonts to normal deps
* feat(nodes): fix broken upload
* feat(nodes): add metadata module + tests, thumbnails
- `MetadataModule` is stateless and needed in places where the `InvocationContext` is not available, so have not made it a `service`
- Handles loading/parsing/building metadata, and creating png info objects
- added tests for MetadataModule
- Lifted thumbnail stuff to util
* fix(nodes): revert change to RandomRangeInvocation
* feat(nodes): address feedback
- make metadata a service
- rip out pydantic validation, implement metadata parsing as simple functions
- update tests
- address other minor feedback items
* fix(nodes): fix other tests
* fix(nodes): add metadata service to cli
* fix(nodes): fix latents/image field parsing
* feat(nodes): customise LatentsField schema
* feat(nodes): move metadata parsing to frontend
* fix(nodes): fix metadata test
---------
Co-authored-by: maryhipp <maryhipp@gmail.com>
Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
2023-04-22 03:10:20 +00:00
|
|
|
/* istanbul ignore file */
|
|
|
|
/* tslint:disable */
|
|
|
|
/* eslint-disable */
|
|
|
|
|
|
|
|
/**
|
2023-05-15 12:48:06 +00:00
|
|
|
* DO NOT DELETE EVEN THOUGH IT IS NOT USED!
|
|
|
|
*
|
Partial migration of UI to nodes API (#3195)
* feat(ui): add axios client generator and simple example
* fix(ui): update client & nodes test code w/ new Edge type
* chore(ui): organize generated files
* chore(ui): update .eslintignore, .prettierignore
* chore(ui): update openapi.json
* feat(backend): fixes for nodes/generator
* feat(ui): generate object args for api client
* feat(ui): more nodes api prototyping
* feat(ui): nodes cancel
* chore(ui): regenerate api client
* fix(ui): disable OG web server socket connection
* fix(ui): fix scrollbar styles typing and prop
just noticed the typo, and made the types stronger.
* feat(ui): add socketio types
* feat(ui): wip nodes
- extract api client method arg types instead of manually declaring them
- update example to display images
- general tidy up
* start building out node translations from frontend state and add notes about missing features
* use reference to sampler_name
* use reference to sampler_name
* add optional apiUrl prop
* feat(ui): start hooking up dynamic txt2img node generation, create middleware for session invocation
* feat(ui): write separate nodes socket layer, txt2img generating and rendering w single node
* feat(ui): img2img implementation
* feat(ui): get intermediate images working but types are stubbed out
* chore(ui): add support for package mode
* feat(ui): add nodes mode script
* feat(ui): handle random seeds
* fix(ui): fix middleware types
* feat(ui): add rtk action type guard
* feat(ui): disable NodeAPITest
This was polluting the network/socket logs.
* feat(ui): fix parameters panel border color
This commit should be elsewhere but I don't want to break my flow
* feat(ui): make thunk types more consistent
* feat(ui): add type guards for outputs
* feat(ui): load images on socket connect
Rudimentary
* chore(ui): bump redux-toolkit
* docs(ui): update readme
* chore(ui): regenerate api client
* chore(ui): add typescript as dev dependency
I am having trouble with TS versions after vscode updated and now uses TS 5. `madge` has installed 3.9.10 and for whatever reason my vscode wants to use that. Manually specifying 4.9.5 and then setting vscode to use that as the workspace TS fixes the issue.
* feat(ui): begin migrating gallery to nodes
Along the way, migrate to use RTK `createEntityAdapter` for gallery images, and separate `results` and `uploads` into separate slices. Much cleaner this way.
* feat(ui): clean up & comment results slice
* fix(ui): separate thunk for initial gallery load so it properly gets index 0
* feat(ui): POST upload working
* fix(ui): restore removed type
* feat(ui): patch api generation for headers access
* chore(ui): regenerate api
* feat(ui): wip gallery migration
* feat(ui): wip gallery migration
* chore(ui): regenerate api
* feat(ui): wip refactor socket events
* feat(ui): disable panels based on app props
* feat(ui): invert logic to be disabled
* disable panels when app mounts
* feat(ui): add support to disableTabs
* docs(ui): organise and update docs
* lang(ui): add toast strings
* feat(ui): wip events, comments, and general refactoring
* feat(ui): add optional token for auth
* feat(ui): export StatusIndicator and ModelSelect for header use
* feat(ui) working on making socket URL dynamic
* feat(ui): dynamic middleware loading
* feat(ui): prep for socket jwt
* feat(ui): migrate cancelation
also updated action names to be event-like instead of declaration-like
sorry, i was scattered and this commit has a lot of unrelated stuff in it.
* fix(ui): fix img2img type
* chore(ui): regenerate api client
* feat(ui): improve InvocationCompleteEvent types
* feat(ui): increase StatusIndicator font size
* fix(ui): fix middleware order for multi-node graphs
* feat(ui): add exampleGraphs object w/ iterations example
* feat(ui): generate iterations graph
* feat(ui): update ModelSelect for nodes API
* feat(ui): add hi-res functionality for txt2img generations
* feat(ui): "subscribe" to particular nodes
feels like a dirty hack but oh well it works
* feat(ui): first steps to node editor ui
* fix(ui): disable event subscription
it is not fully baked just yet
* feat(ui): wip node editor
* feat(ui): remove extraneous field types
* feat(ui): nodes before deleting stuff
* feat(ui): cleanup nodes ui stuff
* feat(ui): hook up nodes to redux
* fix(ui): fix handle
* fix(ui): add basic node edges & connection validation
* feat(ui): add connection validation styling
* feat(ui): increase edge width
* feat(ui): it blends
* feat(ui): wip model handling and graph topology validation
* feat(ui): validation connections w/ graphlib
* docs(ui): update nodes doc
* feat(ui): wip node editor
* chore(ui): rebuild api, update types
* add redux-dynamic-middlewares as a dependency
* feat(ui): add url host transformation
* feat(ui): handle already-connected fields
* feat(ui): rewrite SqliteItemStore in sqlalchemy
* fix(ui): fix sqlalchemy dynamic model instantiation
* feat(ui, nodes): metadata wip
* feat(ui, nodes): models
* feat(ui, nodes): more metadata wip
* feat(ui): wip range/iterate
* fix(nodes): fix sqlite typing
* feat(ui): export new type for invoke component
* tests(nodes): fix test instantiation of ImageField
* feat(nodes): fix LoadImageInvocation
* feat(nodes): add `title` ui hint
* feat(nodes): make ImageField attrs optional
* feat(ui): wip nodes etc
* feat(nodes): roll back sqlalchemy
* fix(nodes): partially address feedback
* fix(backend): roll back changes to pngwriter
* feat(nodes): wip address metadata feedback
* feat(nodes): add seeded rng to RandomRange
* feat(nodes): address feedback
* feat(nodes): move GET images error handling to DiskImageStorage
* feat(nodes): move GET images error handling to DiskImageStorage
* fix(nodes): fix image output schema customization
* feat(ui): img2img/txt2img -> linear
- remove txt2img and img2img tabs
- add linear tab
- add initial image selection to linear parameters accordion
* feat(ui): tidy graph builders
* feat(ui): tidy misc
* feat(ui): improve invocation union types
* feat(ui): wip metadata viewer recall
* feat(ui): move fonts to normal deps
* feat(nodes): fix broken upload
* feat(nodes): add metadata module + tests, thumbnails
- `MetadataModule` is stateless and needed in places where the `InvocationContext` is not available, so have not made it a `service`
- Handles loading/parsing/building metadata, and creating png info objects
- added tests for MetadataModule
- Lifted thumbnail stuff to util
* fix(nodes): revert change to RandomRangeInvocation
* feat(nodes): address feedback
- make metadata a service
- rip out pydantic validation, implement metadata parsing as simple functions
- update tests
- address other minor feedback items
* fix(nodes): fix other tests
* fix(nodes): add metadata service to cli
* fix(nodes): fix latents/image field parsing
* feat(nodes): customise LatentsField schema
* feat(nodes): move metadata parsing to frontend
* fix(nodes): fix metadata test
---------
Co-authored-by: maryhipp <maryhipp@gmail.com>
Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
2023-04-22 03:10:20 +00:00
|
|
|
* Custom `request.ts` file for OpenAPI code generator.
|
|
|
|
*
|
|
|
|
* Patches the request logic in such a way that we can extract headers from requests.
|
|
|
|
*
|
|
|
|
* Copied from https://github.com/ferdikoomen/openapi-typescript-codegen/issues/829#issuecomment-1228224477
|
2023-05-15 12:48:06 +00:00
|
|
|
*
|
Partial migration of UI to nodes API (#3195)
* feat(ui): add axios client generator and simple example
* fix(ui): update client & nodes test code w/ new Edge type
* chore(ui): organize generated files
* chore(ui): update .eslintignore, .prettierignore
* chore(ui): update openapi.json
* feat(backend): fixes for nodes/generator
* feat(ui): generate object args for api client
* feat(ui): more nodes api prototyping
* feat(ui): nodes cancel
* chore(ui): regenerate api client
* fix(ui): disable OG web server socket connection
* fix(ui): fix scrollbar styles typing and prop
just noticed the typo, and made the types stronger.
* feat(ui): add socketio types
* feat(ui): wip nodes
- extract api client method arg types instead of manually declaring them
- update example to display images
- general tidy up
* start building out node translations from frontend state and add notes about missing features
* use reference to sampler_name
* use reference to sampler_name
* add optional apiUrl prop
* feat(ui): start hooking up dynamic txt2img node generation, create middleware for session invocation
* feat(ui): write separate nodes socket layer, txt2img generating and rendering w single node
* feat(ui): img2img implementation
* feat(ui): get intermediate images working but types are stubbed out
* chore(ui): add support for package mode
* feat(ui): add nodes mode script
* feat(ui): handle random seeds
* fix(ui): fix middleware types
* feat(ui): add rtk action type guard
* feat(ui): disable NodeAPITest
This was polluting the network/socket logs.
* feat(ui): fix parameters panel border color
This commit should be elsewhere but I don't want to break my flow
* feat(ui): make thunk types more consistent
* feat(ui): add type guards for outputs
* feat(ui): load images on socket connect
Rudimentary
* chore(ui): bump redux-toolkit
* docs(ui): update readme
* chore(ui): regenerate api client
* chore(ui): add typescript as dev dependency
I am having trouble with TS versions after vscode updated and now uses TS 5. `madge` has installed 3.9.10 and for whatever reason my vscode wants to use that. Manually specifying 4.9.5 and then setting vscode to use that as the workspace TS fixes the issue.
* feat(ui): begin migrating gallery to nodes
Along the way, migrate to use RTK `createEntityAdapter` for gallery images, and separate `results` and `uploads` into separate slices. Much cleaner this way.
* feat(ui): clean up & comment results slice
* fix(ui): separate thunk for initial gallery load so it properly gets index 0
* feat(ui): POST upload working
* fix(ui): restore removed type
* feat(ui): patch api generation for headers access
* chore(ui): regenerate api
* feat(ui): wip gallery migration
* feat(ui): wip gallery migration
* chore(ui): regenerate api
* feat(ui): wip refactor socket events
* feat(ui): disable panels based on app props
* feat(ui): invert logic to be disabled
* disable panels when app mounts
* feat(ui): add support to disableTabs
* docs(ui): organise and update docs
* lang(ui): add toast strings
* feat(ui): wip events, comments, and general refactoring
* feat(ui): add optional token for auth
* feat(ui): export StatusIndicator and ModelSelect for header use
* feat(ui) working on making socket URL dynamic
* feat(ui): dynamic middleware loading
* feat(ui): prep for socket jwt
* feat(ui): migrate cancelation
also updated action names to be event-like instead of declaration-like
sorry, i was scattered and this commit has a lot of unrelated stuff in it.
* fix(ui): fix img2img type
* chore(ui): regenerate api client
* feat(ui): improve InvocationCompleteEvent types
* feat(ui): increase StatusIndicator font size
* fix(ui): fix middleware order for multi-node graphs
* feat(ui): add exampleGraphs object w/ iterations example
* feat(ui): generate iterations graph
* feat(ui): update ModelSelect for nodes API
* feat(ui): add hi-res functionality for txt2img generations
* feat(ui): "subscribe" to particular nodes
feels like a dirty hack but oh well it works
* feat(ui): first steps to node editor ui
* fix(ui): disable event subscription
it is not fully baked just yet
* feat(ui): wip node editor
* feat(ui): remove extraneous field types
* feat(ui): nodes before deleting stuff
* feat(ui): cleanup nodes ui stuff
* feat(ui): hook up nodes to redux
* fix(ui): fix handle
* fix(ui): add basic node edges & connection validation
* feat(ui): add connection validation styling
* feat(ui): increase edge width
* feat(ui): it blends
* feat(ui): wip model handling and graph topology validation
* feat(ui): validation connections w/ graphlib
* docs(ui): update nodes doc
* feat(ui): wip node editor
* chore(ui): rebuild api, update types
* add redux-dynamic-middlewares as a dependency
* feat(ui): add url host transformation
* feat(ui): handle already-connected fields
* feat(ui): rewrite SqliteItemStore in sqlalchemy
* fix(ui): fix sqlalchemy dynamic model instantiation
* feat(ui, nodes): metadata wip
* feat(ui, nodes): models
* feat(ui, nodes): more metadata wip
* feat(ui): wip range/iterate
* fix(nodes): fix sqlite typing
* feat(ui): export new type for invoke component
* tests(nodes): fix test instantiation of ImageField
* feat(nodes): fix LoadImageInvocation
* feat(nodes): add `title` ui hint
* feat(nodes): make ImageField attrs optional
* feat(ui): wip nodes etc
* feat(nodes): roll back sqlalchemy
* fix(nodes): partially address feedback
* fix(backend): roll back changes to pngwriter
* feat(nodes): wip address metadata feedback
* feat(nodes): add seeded rng to RandomRange
* feat(nodes): address feedback
* feat(nodes): move GET images error handling to DiskImageStorage
* feat(nodes): move GET images error handling to DiskImageStorage
* fix(nodes): fix image output schema customization
* feat(ui): img2img/txt2img -> linear
- remove txt2img and img2img tabs
- add linear tab
- add initial image selection to linear parameters accordion
* feat(ui): tidy graph builders
* feat(ui): tidy misc
* feat(ui): improve invocation union types
* feat(ui): wip metadata viewer recall
* feat(ui): move fonts to normal deps
* feat(nodes): fix broken upload
* feat(nodes): add metadata module + tests, thumbnails
- `MetadataModule` is stateless and needed in places where the `InvocationContext` is not available, so have not made it a `service`
- Handles loading/parsing/building metadata, and creating png info objects
- added tests for MetadataModule
- Lifted thumbnail stuff to util
* fix(nodes): revert change to RandomRangeInvocation
* feat(nodes): address feedback
- make metadata a service
- rip out pydantic validation, implement metadata parsing as simple functions
- update tests
- address other minor feedback items
* fix(nodes): fix other tests
* fix(nodes): add metadata service to cli
* fix(nodes): fix latents/image field parsing
* feat(nodes): customise LatentsField schema
* feat(nodes): move metadata parsing to frontend
* fix(nodes): fix metadata test
---------
Co-authored-by: maryhipp <maryhipp@gmail.com>
Co-authored-by: Mary Hipp <maryhipp@Marys-MacBook-Air.local>
2023-04-22 03:10:20 +00:00
|
|
|
* This file should be excluded in `tsconfig.json` and ignored by prettier/eslint!
|
|
|
|
*/
|
|
|
|
|
|
|
|
import axios from 'axios';
|
|
|
|
import type { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios';
|
|
|
|
import FormData from 'form-data';
|
|
|
|
|
|
|
|
import { ApiError } from './ApiError';
|
|
|
|
import type { ApiRequestOptions } from './ApiRequestOptions';
|
|
|
|
import type { ApiResult } from './ApiResult';
|
|
|
|
import { CancelablePromise } from './CancelablePromise';
|
|
|
|
import type { OnCancel } from './CancelablePromise';
|
|
|
|
import type { OpenAPIConfig } from './OpenAPI';
|
|
|
|
|
|
|
|
export const HEADERS = Symbol('HEADERS');
|
|
|
|
|
|
|
|
const isDefined = <T>(
|
|
|
|
value: T | null | undefined
|
|
|
|
): value is Exclude<T, null | undefined> => {
|
|
|
|
return value !== undefined && value !== null;
|
|
|
|
};
|
|
|
|
|
|
|
|
const isString = (value: any): value is string => {
|
|
|
|
return typeof value === 'string';
|
|
|
|
};
|
|
|
|
|
|
|
|
const isStringWithValue = (value: any): value is string => {
|
|
|
|
return isString(value) && value !== '';
|
|
|
|
};
|
|
|
|
|
|
|
|
const isBlob = (value: any): value is Blob => {
|
|
|
|
return (
|
|
|
|
typeof value === 'object' &&
|
|
|
|
typeof value.type === 'string' &&
|
|
|
|
typeof value.stream === 'function' &&
|
|
|
|
typeof value.arrayBuffer === 'function' &&
|
|
|
|
typeof value.constructor === 'function' &&
|
|
|
|
typeof value.constructor.name === 'string' &&
|
|
|
|
/^(Blob|File)$/.test(value.constructor.name) &&
|
|
|
|
/^(Blob|File)$/.test(value[Symbol.toStringTag])
|
|
|
|
);
|
|
|
|
};
|
|
|
|
|
|
|
|
const isFormData = (value: any): value is FormData => {
|
|
|
|
return value instanceof FormData;
|
|
|
|
};
|
|
|
|
|
|
|
|
const isSuccess = (status: number): boolean => {
|
|
|
|
return status >= 200 && status < 300;
|
|
|
|
};
|
|
|
|
|
|
|
|
const base64 = (str: string): string => {
|
|
|
|
try {
|
|
|
|
return btoa(str);
|
|
|
|
} catch (err) {
|
|
|
|
// @ts-ignore
|
|
|
|
return Buffer.from(str).toString('base64');
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
const getQueryString = (params: Record<string, any>): string => {
|
|
|
|
const qs: string[] = [];
|
|
|
|
|
|
|
|
const append = (key: string, value: any) => {
|
|
|
|
qs.push(`${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`);
|
|
|
|
};
|
|
|
|
|
|
|
|
const process = (key: string, value: any) => {
|
|
|
|
if (isDefined(value)) {
|
|
|
|
if (Array.isArray(value)) {
|
|
|
|
value.forEach((v) => {
|
|
|
|
process(key, v);
|
|
|
|
});
|
|
|
|
} else if (typeof value === 'object') {
|
|
|
|
Object.entries(value).forEach(([k, v]) => {
|
|
|
|
process(`${key}[${k}]`, v);
|
|
|
|
});
|
|
|
|
} else {
|
|
|
|
append(key, value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
Object.entries(params).forEach(([key, value]) => {
|
|
|
|
process(key, value);
|
|
|
|
});
|
|
|
|
|
|
|
|
if (qs.length > 0) {
|
|
|
|
return `?${qs.join('&')}`;
|
|
|
|
}
|
|
|
|
|
|
|
|
return '';
|
|
|
|
};
|
|
|
|
|
|
|
|
const getUrl = (config: OpenAPIConfig, options: ApiRequestOptions): string => {
|
|
|
|
const encoder = config.ENCODE_PATH || encodeURI;
|
|
|
|
|
|
|
|
const path = options.url
|
|
|
|
.replace('{api-version}', config.VERSION)
|
|
|
|
.replace(/{(.*?)}/g, (substring: string, group: string) => {
|
|
|
|
if (options.path?.hasOwnProperty(group)) {
|
|
|
|
return encoder(String(options.path[group]));
|
|
|
|
}
|
|
|
|
return substring;
|
|
|
|
});
|
|
|
|
|
|
|
|
const url = `${config.BASE}${path}`;
|
|
|
|
if (options.query) {
|
|
|
|
return `${url}${getQueryString(options.query)}`;
|
|
|
|
}
|
|
|
|
return url;
|
|
|
|
};
|
|
|
|
|
|
|
|
const getFormData = (options: ApiRequestOptions): FormData | undefined => {
|
|
|
|
if (options.formData) {
|
|
|
|
const formData = new FormData();
|
|
|
|
|
|
|
|
const process = (key: string, value: any) => {
|
|
|
|
if (isString(value) || isBlob(value)) {
|
|
|
|
formData.append(key, value);
|
|
|
|
} else {
|
|
|
|
formData.append(key, JSON.stringify(value));
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
Object.entries(options.formData)
|
|
|
|
.filter(([_, value]) => isDefined(value))
|
|
|
|
.forEach(([key, value]) => {
|
|
|
|
if (Array.isArray(value)) {
|
|
|
|
value.forEach((v) => process(key, v));
|
|
|
|
} else {
|
|
|
|
process(key, value);
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
return formData;
|
|
|
|
}
|
|
|
|
return undefined;
|
|
|
|
};
|
|
|
|
|
|
|
|
type Resolver<T> = (options: ApiRequestOptions) => Promise<T>;
|
|
|
|
|
|
|
|
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,
|
|
|
|
formData?: FormData
|
|
|
|
): Promise<Record<string, string>> => {
|
|
|
|
const token = await resolve(options, config.TOKEN);
|
|
|
|
const username = await resolve(options, config.USERNAME);
|
|
|
|
const password = await resolve(options, config.PASSWORD);
|
|
|
|
const additionalHeaders = await resolve(options, config.HEADERS);
|
|
|
|
const formHeaders =
|
|
|
|
(typeof formData?.getHeaders === 'function' && formData?.getHeaders()) ||
|
|
|
|
{};
|
|
|
|
|
|
|
|
const headers = Object.entries({
|
|
|
|
Accept: 'application/json',
|
|
|
|
...additionalHeaders,
|
|
|
|
...options.headers,
|
|
|
|
...formHeaders,
|
|
|
|
})
|
|
|
|
.filter(([_, value]) => isDefined(value))
|
|
|
|
.reduce(
|
|
|
|
(headers, [key, value]) => ({
|
|
|
|
...headers,
|
|
|
|
[key]: String(value),
|
|
|
|
}),
|
|
|
|
{} as Record<string, string>
|
|
|
|
);
|
|
|
|
|
|
|
|
if (isStringWithValue(token)) {
|
|
|
|
headers['Authorization'] = `Bearer ${token}`;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (isStringWithValue(username) && isStringWithValue(password)) {
|
|
|
|
const credentials = base64(`${username}:${password}`);
|
|
|
|
headers['Authorization'] = `Basic ${credentials}`;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (options.body) {
|
|
|
|
if (options.mediaType) {
|
|
|
|
headers['Content-Type'] = options.mediaType;
|
|
|
|
} else if (isBlob(options.body)) {
|
|
|
|
headers['Content-Type'] = options.body.type || 'application/octet-stream';
|
|
|
|
} else if (isString(options.body)) {
|
|
|
|
headers['Content-Type'] = 'text/plain';
|
|
|
|
} else if (!isFormData(options.body)) {
|
|
|
|
headers['Content-Type'] = 'application/json';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return headers;
|
|
|
|
};
|
|
|
|
|
|
|
|
const getRequestBody = (options: ApiRequestOptions): any => {
|
|
|
|
if (options.body) {
|
|
|
|
return options.body;
|
|
|
|
}
|
|
|
|
return undefined;
|
|
|
|
};
|
|
|
|
|
|
|
|
const sendRequest = async <T>(
|
|
|
|
config: OpenAPIConfig,
|
|
|
|
options: ApiRequestOptions,
|
|
|
|
url: string,
|
|
|
|
body: any,
|
|
|
|
formData: FormData | undefined,
|
|
|
|
headers: Record<string, string>,
|
|
|
|
onCancel: OnCancel
|
|
|
|
): Promise<AxiosResponse<T>> => {
|
|
|
|
const source = axios.CancelToken.source();
|
|
|
|
|
|
|
|
const requestConfig: AxiosRequestConfig = {
|
|
|
|
url,
|
|
|
|
headers,
|
|
|
|
data: body ?? formData,
|
|
|
|
method: options.method,
|
|
|
|
withCredentials: config.WITH_CREDENTIALS,
|
|
|
|
cancelToken: source.token,
|
|
|
|
};
|
|
|
|
|
|
|
|
onCancel(() => source.cancel('The user aborted a request.'));
|
|
|
|
|
|
|
|
try {
|
|
|
|
return await axios.request(requestConfig);
|
|
|
|
} catch (error) {
|
|
|
|
const axiosError = error as AxiosError<T>;
|
|
|
|
if (axiosError.response) {
|
|
|
|
return axiosError.response;
|
|
|
|
}
|
|
|
|
throw error;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
const getResponseHeader = (
|
|
|
|
response: AxiosResponse<any>,
|
|
|
|
responseHeader?: string
|
|
|
|
): string | undefined => {
|
|
|
|
if (responseHeader) {
|
|
|
|
const content = response.headers[responseHeader];
|
|
|
|
if (isString(content)) {
|
|
|
|
return content;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return undefined;
|
|
|
|
};
|
|
|
|
|
|
|
|
const getResponseBody = (response: AxiosResponse<any>): any => {
|
|
|
|
if (response.status !== 204) {
|
|
|
|
return response.data;
|
|
|
|
}
|
|
|
|
return undefined;
|
|
|
|
};
|
|
|
|
|
|
|
|
const catchErrorCodes = (
|
|
|
|
options: ApiRequestOptions,
|
|
|
|
result: ApiResult
|
|
|
|
): void => {
|
|
|
|
const errors: Record<number, string> = {
|
|
|
|
400: 'Bad Request',
|
|
|
|
401: 'Unauthorized',
|
|
|
|
403: 'Forbidden',
|
|
|
|
404: 'Not Found',
|
|
|
|
500: 'Internal Server Error',
|
|
|
|
502: 'Bad Gateway',
|
|
|
|
503: 'Service Unavailable',
|
|
|
|
...options.errors,
|
|
|
|
};
|
|
|
|
|
|
|
|
const error = errors[result.status];
|
|
|
|
if (error) {
|
|
|
|
throw new ApiError(options, result, error);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!result.ok) {
|
|
|
|
throw new ApiError(options, result, 'Generic Error');
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Request method
|
|
|
|
* @param config The OpenAPI configuration object
|
|
|
|
* @param options The request options from the service
|
|
|
|
* @returns CancelablePromise<T>
|
|
|
|
* @throws ApiError
|
|
|
|
*/
|
|
|
|
export const request = <T>(
|
|
|
|
config: OpenAPIConfig,
|
|
|
|
options: ApiRequestOptions
|
|
|
|
): CancelablePromise<T> => {
|
|
|
|
return new CancelablePromise(async (resolve, reject, onCancel) => {
|
|
|
|
try {
|
|
|
|
const url = getUrl(config, options);
|
|
|
|
const formData = getFormData(options);
|
|
|
|
const body = getRequestBody(options);
|
|
|
|
const headers = await getHeaders(config, options, formData);
|
|
|
|
|
|
|
|
if (!onCancel.isCancelled) {
|
|
|
|
const response = await sendRequest<T>(
|
|
|
|
config,
|
|
|
|
options,
|
|
|
|
url,
|
|
|
|
body,
|
|
|
|
formData,
|
|
|
|
headers,
|
|
|
|
onCancel
|
|
|
|
);
|
|
|
|
const responseBody = getResponseBody(response);
|
|
|
|
const responseHeader = getResponseHeader(
|
|
|
|
response,
|
|
|
|
options.responseHeader
|
|
|
|
);
|
|
|
|
|
|
|
|
const result: ApiResult = {
|
|
|
|
url,
|
|
|
|
ok: isSuccess(response.status),
|
|
|
|
status: response.status,
|
|
|
|
statusText: response.statusText,
|
|
|
|
body: responseHeader ?? responseBody,
|
|
|
|
};
|
|
|
|
|
|
|
|
catchErrorCodes(options, result);
|
|
|
|
|
|
|
|
resolve({ ...result.body, [HEADERS]: response.headers });
|
|
|
|
}
|
|
|
|
} catch (error) {
|
|
|
|
reject(error);
|
|
|
|
}
|
|
|
|
});
|
|
|
|
};
|