@sebspark/openapi-client 4.0.9 → 4.0.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.mts.map +1 -1
- package/dist/index.mjs +0 -3
- package/dist/index.mjs.map +1 -1
- package/package.json +2 -2
package/dist/index.d.mts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.mts","names":[],"sources":["../src/client.ts","../src/graphql/types.ts","../src/graphql/client.ts"],"sourcesContent":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"index.d.mts","names":[],"sources":["../src/client.ts","../src/graphql/types.ts","../src/graphql/client.ts"],"sourcesContent":[],"mappings":";;;;;;KA2BY,sBAAsB;iBACjB;;cAGJ,wBAAyB,QAAQ,8CAE5B,kBACf,iBAAiB;;;KC5BR,sBAAA,GAAuB,KAAK;;;;;;ADqBxC;AAIA;;;;;;IAGmB,CAAA,GAAA,EAAA,UAAA,EAAA,IC5BqB,CD4BrB,EAAA;;;oBCVG;MAlBV,CAAA;IAA4B,CAAA,EAAA,IAAA,CAAA,EAqB3B,cArB2B,CAAA,EAsBjC,OAtBiC,CAuBlC,WAvBkC,CAAA;MAAL,IAAA,EAyBrB,MAzBqB,CAAA,MAAA,EAAA,GAAA,CAAA;MAkBb,MAAA,CAAA,EAAA,CAAA;QAGT,OAAA,EAAA,MAAA;MAIC,CAAA,GAE0B,MAF1B,CAAA,MAAA,EAAA,GAAA,CAAA,CAAA,EAAA;IAE0B,CAAA,CAAA,CAAA;EAJlC,CAAA;EADC,GAAA,EAAA;IAgBqB;;;AAI5B;;;4BAJ4B,iBAAiB;EChChC,CAAA;CACD;AAA2B,KDmC3B,wBAAA,GCnC2B;EAEtB,GAAA,EAAA,MAAA;EACkB,MAAA,EAAA,MAAA;CAAlB;;;cAJJ,+BACD,yBAA2B;UAEtB;UACA,kBAAkB;;;EFWvB,WAAA,CAAA,IAAA,EEPQ,wBFQH;EAGJ,OAAA,CAAA,CAAA,CAAA,CAAA,KAoIZ,EAAA,MAAA,EAAA,SAAA,CAAA,EE9HoD,MF8HpD,CAAA,MAAA,EAAA,OAAA,CAAA,CAAA,EE9H2E,OF8H3E,CE9H2E,CF8H3E,CAAA;EApI6C,SAAA,CAAA,CAAA,EEwBtB,OFxBsB,CAAA,OAAA,CAAA"}
|
package/dist/index.mjs
CHANGED
|
@@ -63,15 +63,12 @@ const TypedClient = (baseURL, globalOptions) => {
|
|
|
63
63
|
const authorizationTokenHeaders = await globalOptions.authorizationTokenGenerator(url);
|
|
64
64
|
if (authorizationTokenHeaders) for (const key of Object.keys(authorizationTokenHeaders)) {
|
|
65
65
|
const value = authorizationTokenHeaders[key];
|
|
66
|
-
logger.debug(`Setting header ${key} to ${value}`);
|
|
67
66
|
request.headers[key] = value;
|
|
68
67
|
}
|
|
69
68
|
} catch (error) {
|
|
70
69
|
logger.error(`Error generating token for URL: ${url}`, error);
|
|
71
70
|
throw error;
|
|
72
71
|
}
|
|
73
|
-
logger.debug("Intercepted request:");
|
|
74
|
-
logger.debug(JSON.stringify(request, null, 2));
|
|
75
72
|
return request;
|
|
76
73
|
});
|
|
77
74
|
}
|
package/dist/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.mjs","names":["value","retry","url"],"sources":["../src/paramsSerializer.ts","../src/client.ts","../src/graphql/client.ts"],"sourcesContent":["import type { ArrayFormat } from '@sebspark/openapi-core'\n\ntype Param = boolean | string | number | Date | undefined | Array<Param>\ntype Params = Record<string, Param>\n\nconst encodeParam = (param: string) => encodeURIComponent(param)\nconst encodeValue = (param: Param, encodeCommas = false) => {\n if (param instanceof Date) {\n return encodeURIComponent(param.toISOString())\n }\n if (\n typeof param === 'number' ||\n typeof param === 'string' ||\n typeof param === 'boolean'\n ) {\n if (encodeCommas) {\n return encodeURIComponent(param)\n }\n\n return param\n .toString()\n .split(',')\n .map((p) => encodeURIComponent(p))\n .join(',')\n }\n\n return ''\n}\n\nexport const paramsSerializer = (format?: ArrayFormat) => (params?: Params) => {\n if (!params) {\n return ''\n }\n\n const s = []\n\n for (const [key, value] of Object.entries(params)) {\n if (value === undefined) {\n continue\n }\n\n if (Array.isArray(value)) {\n const title = encodeParam(key)\n\n if (format === 'comma') {\n s.push(`${title}=${value.map((v) => encodeValue(v, true)).join(',')}`)\n continue\n }\n\n value.forEach((v, ix) => {\n const value = encodeValue(v)\n\n switch (format) {\n case 'indices': {\n s.push(`${title}[${ix}]=${value}`)\n break\n }\n case 'repeat': {\n s.push(`${title}=${value}`)\n break\n }\n default: {\n s.push(`${title}[]=${value}`)\n break\n }\n }\n })\n } else {\n s.push(`${encodeParam(key)}=${encodeValue(value)}`)\n }\n }\n\n return s.join('&')\n}\n","import type {\n APIResponse,\n BaseClient,\n ClientOptions,\n RequestArgs,\n RequestOptions,\n} from '@sebspark/openapi-core'\nimport { fromAxiosError } from '@sebspark/openapi-core'\nimport { getLogger } from '@sebspark/otel'\nimport { retry } from '@sebspark/retry'\nimport type {\n AxiosError,\n AxiosInstance,\n AxiosRequestConfig,\n AxiosResponse,\n} from 'axios'\nimport axios from 'axios'\nimport createAuthRefreshInterceptor from 'axios-auth-refresh'\nimport { paramsSerializer } from './paramsSerializer'\n\nconst createAuthRefreshInterceptorFunc =\n (createAuthRefreshInterceptor as any)?.default ?? createAuthRefreshInterceptor\n\nexport type TypedAxiosClient<T> = T & {\n axiosInstance: AxiosInstance\n}\n\nexport const TypedClient = <C extends Partial<BaseClient>>(\n baseURL: string,\n globalOptions?: ClientOptions\n): TypedAxiosClient<C> => {\n const axiosInstance = axios.create()\n\n const logger = getLogger('TypedClient')\n\n logger.debug(\n `client initialized with arrayFormat '${globalOptions?.arrayFormat}'`\n )\n\n if (globalOptions?.authorizationTokenGenerator) {\n logger.debug('authorizationTokenGenerator is set')\n\n axiosInstance.interceptors.request.use(async (request) => {\n const url = `${request.baseURL}${request.url}`\n logger.debug(`Intercepting request to ${url}`)\n\n if (globalOptions?.authorizationTokenGenerator && url) {\n try {\n const authorizationTokenHeaders =\n await globalOptions.authorizationTokenGenerator(url)\n\n if (authorizationTokenHeaders) {\n for (const key of Object.keys(authorizationTokenHeaders)) {\n const value = authorizationTokenHeaders[key]\n logger.debug(`Setting header ${key} to ${value}`)\n request.headers[key] = value\n }\n }\n } catch (error) {\n logger.error(`Error generating token for URL: ${url}`, error as Error)\n throw error\n }\n }\n\n logger.debug('Intercepted request:')\n logger.debug(JSON.stringify(request, null, 2))\n return request\n })\n }\n\n if (globalOptions?.authorizationTokenRefresh) {\n const refreshAuthLogic = async (\n // biome-ignore lint/suspicious/noExplicitAny: Defined by dependency\n failedRequest: any\n ): Promise<AxiosResponse> => {\n if (!axios.isAxiosError(failedRequest)) {\n logger.error(\n 'Failed request is not an axios error',\n failedRequest as Error\n )\n throw failedRequest\n } else {\n logger.debug('Failed request', failedRequest)\n }\n\n const axiosError = failedRequest as AxiosError\n\n logger.debug('Failed request config', axiosError.config)\n\n const url = `${axiosError.config?.baseURL}${axiosError.config?.url}`\n if (globalOptions?.authorizationTokenRefresh && url) {\n logger.debug(`Refreshing token for URL ${url}`)\n try {\n await globalOptions?.authorizationTokenRefresh(url)\n } catch (error) {\n logger.error(`Error refreshing token for URL: ${url}`, error as Error)\n throw error\n }\n }\n\n return axiosError.response as AxiosResponse\n }\n\n createAuthRefreshInterceptorFunc(axiosInstance, refreshAuthLogic)\n }\n\n if (logger) {\n axiosInstance.interceptors.request.use((request) => {\n const requestObject = {\n url: request.url,\n params: request.params,\n headers: request.headers,\n }\n logger.debug('request', requestObject)\n return request\n })\n\n axiosInstance.interceptors.response.use((response) => {\n const responseObject = {\n data: response.data,\n config: response.config,\n headers: response.headers,\n }\n\n logger.debug('response', responseObject)\n return response\n })\n }\n\n const client: BaseClient = {\n get: (url, args, opts) =>\n callServer(\n axiosInstance,\n mergeArgs(baseURL, url, 'get', args, opts, globalOptions),\n logger\n ),\n post: (url, args, opts) =>\n callServer(\n axiosInstance,\n mergeArgs(baseURL, url, 'post', args, opts, globalOptions),\n logger\n ),\n put: (url, args, opts) =>\n callServer(\n axiosInstance,\n mergeArgs(baseURL, url, 'put', args, opts, globalOptions),\n logger\n ),\n patch: (url, args, opts) =>\n callServer(\n axiosInstance,\n mergeArgs(baseURL, url, 'patch', args, opts, globalOptions),\n logger\n ),\n delete: (url, args, opts) =>\n callServer(\n axiosInstance,\n mergeArgs(baseURL, url, 'delete', args, opts, globalOptions),\n logger\n ),\n }\n\n return { ...client, axiosInstance } as TypedAxiosClient<C>\n}\n\nconst callServer = async <\n R extends APIResponse<\n unknown | undefined,\n Record<string, string> | undefined\n >,\n>(\n axiosInstance: AxiosInstance,\n args: Partial<ClientOptions & RequestArgs>,\n logger: ReturnType<typeof getLogger>\n): Promise<R> => {\n try {\n const serializer = paramsSerializer((args as ClientOptions).arrayFormat)\n\n logger.debug(`[callServer] typeof serializer: ${typeof serializer}`)\n\n const body =\n args.method?.toLowerCase() === 'get' ||\n args.method?.toLowerCase() === 'delete'\n ? undefined\n : args.body\n const { headers, data } = await retry(\n () =>\n axiosInstance.request({\n baseURL: args.baseUrl,\n url: args.url,\n method: args.method,\n headers: args.headers as AxiosRequestConfig['headers'],\n params: args.params,\n paramsSerializer: serializer,\n data: body,\n httpsAgent: args.httpsAgent,\n httpAgent: args.httpAgent,\n }),\n args.retry\n )\n return { headers, data } as R\n } catch (error) {\n throw fromAxiosError(error as AxiosError)\n }\n}\n\nconst mergeArgs = (\n baseUrl: string,\n url: string,\n method: string,\n requestArgs: RequestArgs | RequestOptions | undefined,\n extras: RequestOptions | undefined,\n global: ClientOptions | undefined\n): Partial<ClientOptions & RequestArgs> => {\n const params = merge('params', global, requestArgs, extras)\n const query = merge('query', global, requestArgs, extras)\n const headers = merge('headers', global, requestArgs, extras)\n const body = merge('body', global, requestArgs, extras)\n const retry = merge('retry', global, requestArgs, extras)\n const merged: Partial<ClientOptions & RequestArgs> = {\n url: setParams(url, params),\n baseUrl,\n method,\n params: query,\n headers,\n body,\n retry,\n arrayFormat: global?.arrayFormat,\n httpsAgent: extras?.httpsAgent,\n httpAgent: extras?.httpAgent,\n }\n\n return merged\n}\n\nconst merge = (\n prop: keyof (ClientOptions & RequestArgs),\n // biome-ignore lint/suspicious/noExplicitAny: it is any\n ...args: (any | undefined)[]\n // biome-ignore lint/suspicious/noExplicitAny: it is any\n): any => Object.assign({}, ...args.map((a) => a?.[prop] || {}))\n\nconst setParams = (url: string, params: Record<string, string> = {}): string =>\n Object.entries(params).reduce(\n (url, [key, val]) =>\n url.replace(new RegExp(`/:${key}(?!\\\\w|\\\\d)`, 'g'), `/${val}`),\n url\n )\n","import {\n apiGatewayTokenByUrlGenerator,\n apiGatewayTokenRefresh,\n} from '@sebspark/openapi-auth-iam'\nimport type { ClientOptions } from '@sebspark/openapi-core'\nimport { getLogger } from '@sebspark/otel'\nimport { TypedClient } from '../client'\nimport type {\n GatewayGraphqlClientArgs,\n GatewayGraphqlClient as GatewayGraphqlClientType,\n} from './types'\n\nexport class GatewayGraphqlClient<\n T extends GatewayGraphqlClientType = GatewayGraphqlClientType,\n> {\n public client: T\n public logger: ReturnType<typeof getLogger>\n private uri: string\n private options: ClientOptions\n\n constructor(args: GatewayGraphqlClientArgs) {\n this.uri = args.uri\n this.logger = getLogger('GatewayGraphqlClient')\n this.options = {\n timeout: 10 * 1000,\n authorizationTokenGenerator: async (url) => {\n this.logger.debug(`Generating token for: ${this.uri}`)\n return apiGatewayTokenByUrlGenerator(args.apiKey)(url)\n },\n authorizationTokenRefresh: async (url) => {\n this.logger.debug(`Refreshing token for: ${this.uri}`)\n return apiGatewayTokenRefresh()(url)\n },\n }\n this.client = TypedClient<T>(args.uri, this.options)\n }\n\n public async graphql<K>(query: string, variables?: Record<string, unknown>) {\n try {\n const response = await this.client.post('/graphql', {\n body: { query: query.trim(), variables },\n })\n\n if (response.data.errors) {\n this.logger.error(`Error posting graphql query to: ${this.uri}`)\n throw new Error(response.data.errors.map((e) => e.message).join('\\n'))\n }\n\n return response.data.data as K\n } catch (error) {\n this.logger.error(`Error posting graphql: ${this.uri}`)\n throw error\n }\n }\n\n public async isHealthy() {\n try {\n await this.client.get('/health')\n return true\n } catch (error) {\n this.logger.error(error as Error)\n }\n return false\n }\n}\n"],"mappings":";;;;;;;;;;AAKA,MAAM,eAAe,UAAkB,mBAAmB,MAAM;AAChE,MAAM,eAAe,OAAc,eAAe,UAAU;AAC1D,KAAI,iBAAiB,KACnB,QAAO,mBAAmB,MAAM,aAAa,CAAC;AAEhD,KACE,OAAO,UAAU,YACjB,OAAO,UAAU,YACjB,OAAO,UAAU,WACjB;AACA,MAAI,aACF,QAAO,mBAAmB,MAAM;AAGlC,SAAO,MACJ,UAAU,CACV,MAAM,IAAI,CACV,KAAK,MAAM,mBAAmB,EAAE,CAAC,CACjC,KAAK,IAAI;;AAGd,QAAO;;AAGT,MAAa,oBAAoB,YAA0B,WAAoB;AAC7E,KAAI,CAAC,OACH,QAAO;CAGT,MAAM,IAAI,EAAE;AAEZ,MAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ,OAAO,EAAE;AACjD,MAAI,UAAU,OACZ;AAGF,MAAI,MAAM,QAAQ,MAAM,EAAE;GACxB,MAAM,QAAQ,YAAY,IAAI;AAE9B,OAAI,WAAW,SAAS;AACtB,MAAE,KAAK,GAAG,MAAM,GAAG,MAAM,KAAK,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,KAAK,IAAI,GAAG;AACtE;;AAGF,SAAM,SAAS,GAAG,OAAO;IACvB,MAAMA,UAAQ,YAAY,EAAE;AAE5B,YAAQ,QAAR;KACE,KAAK;AACH,QAAE,KAAK,GAAG,MAAM,GAAG,GAAG,IAAIA,UAAQ;AAClC;KAEF,KAAK;AACH,QAAE,KAAK,GAAG,MAAM,GAAGA,UAAQ;AAC3B;KAEF;AACE,QAAE,KAAK,GAAG,MAAM,KAAKA,UAAQ;AAC7B;;KAGJ;QAEF,GAAE,KAAK,GAAG,YAAY,IAAI,CAAC,GAAG,YAAY,MAAM,GAAG;;AAIvD,QAAO,EAAE,KAAK,IAAI;;;;;ACpDpB,MAAM,mCACH,8BAAsC,WAAW;AAMpD,MAAa,eACX,SACA,kBACwB;CACxB,MAAM,gBAAgB,MAAM,QAAQ;CAEpC,MAAM,SAAS,UAAU,cAAc;AAEvC,QAAO,MACL,wCAAwC,eAAe,YAAY,GACpE;AAED,KAAI,eAAe,6BAA6B;AAC9C,SAAO,MAAM,qCAAqC;AAElD,gBAAc,aAAa,QAAQ,IAAI,OAAO,YAAY;GACxD,MAAM,MAAM,GAAG,QAAQ,UAAU,QAAQ;AACzC,UAAO,MAAM,2BAA2B,MAAM;AAE9C,OAAI,eAAe,+BAA+B,IAChD,KAAI;IACF,MAAM,4BACJ,MAAM,cAAc,4BAA4B,IAAI;AAEtD,QAAI,0BACF,MAAK,MAAM,OAAO,OAAO,KAAK,0BAA0B,EAAE;KACxD,MAAM,QAAQ,0BAA0B;AACxC,YAAO,MAAM,kBAAkB,IAAI,MAAM,QAAQ;AACjD,aAAQ,QAAQ,OAAO;;YAGpB,OAAO;AACd,WAAO,MAAM,mCAAmC,OAAO,MAAe;AACtE,UAAM;;AAIV,UAAO,MAAM,uBAAuB;AACpC,UAAO,MAAM,KAAK,UAAU,SAAS,MAAM,EAAE,CAAC;AAC9C,UAAO;IACP;;AAGJ,KAAI,eAAe,2BAA2B;EAC5C,MAAM,mBAAmB,OAEvB,kBAC2B;AAC3B,OAAI,CAAC,MAAM,aAAa,cAAc,EAAE;AACtC,WAAO,MACL,wCACA,cACD;AACD,UAAM;SAEN,QAAO,MAAM,kBAAkB,cAAc;GAG/C,MAAM,aAAa;AAEnB,UAAO,MAAM,yBAAyB,WAAW,OAAO;GAExD,MAAM,MAAM,GAAG,WAAW,QAAQ,UAAU,WAAW,QAAQ;AAC/D,OAAI,eAAe,6BAA6B,KAAK;AACnD,WAAO,MAAM,4BAA4B,MAAM;AAC/C,QAAI;AACF,WAAM,eAAe,0BAA0B,IAAI;aAC5C,OAAO;AACd,YAAO,MAAM,mCAAmC,OAAO,MAAe;AACtE,WAAM;;;AAIV,UAAO,WAAW;;AAGpB,mCAAiC,eAAe,iBAAiB;;AAGnE,KAAI,QAAQ;AACV,gBAAc,aAAa,QAAQ,KAAK,YAAY;GAClD,MAAM,gBAAgB;IACpB,KAAK,QAAQ;IACb,QAAQ,QAAQ;IAChB,SAAS,QAAQ;IAClB;AACD,UAAO,MAAM,WAAW,cAAc;AACtC,UAAO;IACP;AAEF,gBAAc,aAAa,SAAS,KAAK,aAAa;GACpD,MAAM,iBAAiB;IACrB,MAAM,SAAS;IACf,QAAQ,SAAS;IACjB,SAAS,SAAS;IACnB;AAED,UAAO,MAAM,YAAY,eAAe;AACxC,UAAO;IACP;;AAoCJ,QAAO;EAhCL,MAAM,KAAK,MAAM,SACf,WACE,eACA,UAAU,SAAS,KAAK,OAAO,MAAM,MAAM,cAAc,EACzD,OACD;EACH,OAAO,KAAK,MAAM,SAChB,WACE,eACA,UAAU,SAAS,KAAK,QAAQ,MAAM,MAAM,cAAc,EAC1D,OACD;EACH,MAAM,KAAK,MAAM,SACf,WACE,eACA,UAAU,SAAS,KAAK,OAAO,MAAM,MAAM,cAAc,EACzD,OACD;EACH,QAAQ,KAAK,MAAM,SACjB,WACE,eACA,UAAU,SAAS,KAAK,SAAS,MAAM,MAAM,cAAc,EAC3D,OACD;EACH,SAAS,KAAK,MAAM,SAClB,WACE,eACA,UAAU,SAAS,KAAK,UAAU,MAAM,MAAM,cAAc,EAC5D,OACD;EAGe;EAAe;;AAGrC,MAAM,aAAa,OAMjB,eACA,MACA,WACe;AACf,KAAI;EACF,MAAM,aAAa,iBAAkB,KAAuB,YAAY;AAExE,SAAO,MAAM,mCAAmC,OAAO,aAAa;EAEpE,MAAM,OACJ,KAAK,QAAQ,aAAa,KAAK,SAC/B,KAAK,QAAQ,aAAa,KAAK,WAC3B,SACA,KAAK;EACX,MAAM,EAAE,SAAS,SAAS,MAAM,YAE5B,cAAc,QAAQ;GACpB,SAAS,KAAK;GACd,KAAK,KAAK;GACV,QAAQ,KAAK;GACb,SAAS,KAAK;GACd,QAAQ,KAAK;GACb,kBAAkB;GAClB,MAAM;GACN,YAAY,KAAK;GACjB,WAAW,KAAK;GACjB,CAAC,EACJ,KAAK,MACN;AACD,SAAO;GAAE;GAAS;GAAM;UACjB,OAAO;AACd,QAAM,eAAe,MAAoB;;;AAI7C,MAAM,aACJ,SACA,KACA,QACA,aACA,QACA,WACyC;CACzC,MAAM,SAAS,MAAM,UAAU,QAAQ,aAAa,OAAO;CAC3D,MAAM,QAAQ,MAAM,SAAS,QAAQ,aAAa,OAAO;CACzD,MAAM,UAAU,MAAM,WAAW,QAAQ,aAAa,OAAO;CAC7D,MAAM,OAAO,MAAM,QAAQ,QAAQ,aAAa,OAAO;CACvD,MAAMC,UAAQ,MAAM,SAAS,QAAQ,aAAa,OAAO;AAczD,QAbqD;EACnD,KAAK,UAAU,KAAK,OAAO;EAC3B;EACA;EACA,QAAQ;EACR;EACA;EACA;EACA,aAAa,QAAQ;EACrB,YAAY,QAAQ;EACpB,WAAW,QAAQ;EACpB;;AAKH,MAAM,SACJ,MAEA,GAAG,SAEK,OAAO,OAAO,EAAE,EAAE,GAAG,KAAK,KAAK,MAAM,IAAI,SAAS,EAAE,CAAC,CAAC;AAEhE,MAAM,aAAa,KAAa,SAAiC,EAAE,KACjE,OAAO,QAAQ,OAAO,CAAC,QACpB,OAAK,CAAC,KAAK,SACVC,MAAI,QAAQ,IAAI,OAAO,KAAK,IAAI,cAAc,IAAI,EAAE,IAAI,MAAM,EAChE,IACD;;;;AC3OH,IAAa,uBAAb,MAEE;CACA,AAAO;CACP,AAAO;CACP,AAAQ;CACR,AAAQ;CAER,YAAY,MAAgC;AAC1C,OAAK,MAAM,KAAK;AAChB,OAAK,SAAS,UAAU,uBAAuB;AAC/C,OAAK,UAAU;GACb,SAAS,KAAK;GACd,6BAA6B,OAAO,QAAQ;AAC1C,SAAK,OAAO,MAAM,yBAAyB,KAAK,MAAM;AACtD,WAAO,8BAA8B,KAAK,OAAO,CAAC,IAAI;;GAExD,2BAA2B,OAAO,QAAQ;AACxC,SAAK,OAAO,MAAM,yBAAyB,KAAK,MAAM;AACtD,WAAO,wBAAwB,CAAC,IAAI;;GAEvC;AACD,OAAK,SAAS,YAAe,KAAK,KAAK,KAAK,QAAQ;;CAGtD,MAAa,QAAW,OAAe,WAAqC;AAC1E,MAAI;GACF,MAAM,WAAW,MAAM,KAAK,OAAO,KAAK,YAAY,EAClD,MAAM;IAAE,OAAO,MAAM,MAAM;IAAE;IAAW,EACzC,CAAC;AAEF,OAAI,SAAS,KAAK,QAAQ;AACxB,SAAK,OAAO,MAAM,mCAAmC,KAAK,MAAM;AAChE,UAAM,IAAI,MAAM,SAAS,KAAK,OAAO,KAAK,MAAM,EAAE,QAAQ,CAAC,KAAK,KAAK,CAAC;;AAGxE,UAAO,SAAS,KAAK;WACd,OAAO;AACd,QAAK,OAAO,MAAM,0BAA0B,KAAK,MAAM;AACvD,SAAM;;;CAIV,MAAa,YAAY;AACvB,MAAI;AACF,SAAM,KAAK,OAAO,IAAI,UAAU;AAChC,UAAO;WACA,OAAO;AACd,QAAK,OAAO,MAAM,MAAe;;AAEnC,SAAO"}
|
|
1
|
+
{"version":3,"file":"index.mjs","names":["value","retry","url"],"sources":["../src/paramsSerializer.ts","../src/client.ts","../src/graphql/client.ts"],"sourcesContent":["import type { ArrayFormat } from '@sebspark/openapi-core'\n\ntype Param = boolean | string | number | Date | undefined | Array<Param>\ntype Params = Record<string, Param>\n\nconst encodeParam = (param: string) => encodeURIComponent(param)\nconst encodeValue = (param: Param, encodeCommas = false) => {\n if (param instanceof Date) {\n return encodeURIComponent(param.toISOString())\n }\n if (\n typeof param === 'number' ||\n typeof param === 'string' ||\n typeof param === 'boolean'\n ) {\n if (encodeCommas) {\n return encodeURIComponent(param)\n }\n\n return param\n .toString()\n .split(',')\n .map((p) => encodeURIComponent(p))\n .join(',')\n }\n\n return ''\n}\n\nexport const paramsSerializer = (format?: ArrayFormat) => (params?: Params) => {\n if (!params) {\n return ''\n }\n\n const s = []\n\n for (const [key, value] of Object.entries(params)) {\n if (value === undefined) {\n continue\n }\n\n if (Array.isArray(value)) {\n const title = encodeParam(key)\n\n if (format === 'comma') {\n s.push(`${title}=${value.map((v) => encodeValue(v, true)).join(',')}`)\n continue\n }\n\n value.forEach((v, ix) => {\n const value = encodeValue(v)\n\n switch (format) {\n case 'indices': {\n s.push(`${title}[${ix}]=${value}`)\n break\n }\n case 'repeat': {\n s.push(`${title}=${value}`)\n break\n }\n default: {\n s.push(`${title}[]=${value}`)\n break\n }\n }\n })\n } else {\n s.push(`${encodeParam(key)}=${encodeValue(value)}`)\n }\n }\n\n return s.join('&')\n}\n","import type {\n APIResponse,\n BaseClient,\n ClientOptions,\n RequestArgs,\n RequestOptions,\n} from '@sebspark/openapi-core'\nimport { fromAxiosError } from '@sebspark/openapi-core'\nimport { getLogger } from '@sebspark/otel'\nimport { retry } from '@sebspark/retry'\nimport type {\n AxiosError,\n AxiosInstance,\n AxiosRequestConfig,\n AxiosResponse,\n} from 'axios'\nimport axios from 'axios'\nimport createAuthRefreshInterceptor from 'axios-auth-refresh'\nimport { paramsSerializer } from './paramsSerializer'\n\nconst createAuthRefreshInterceptorFunc =\n (\n createAuthRefreshInterceptor as unknown as {\n default: typeof createAuthRefreshInterceptor\n }\n )?.default ?? createAuthRefreshInterceptor\n\nexport type TypedAxiosClient<T> = T & {\n axiosInstance: AxiosInstance\n}\n\nexport const TypedClient = <C extends Partial<BaseClient>>(\n baseURL: string,\n globalOptions?: ClientOptions\n): TypedAxiosClient<C> => {\n const axiosInstance = axios.create()\n\n const logger = getLogger('TypedClient')\n\n logger.debug(\n `client initialized with arrayFormat '${globalOptions?.arrayFormat}'`\n )\n\n if (globalOptions?.authorizationTokenGenerator) {\n logger.debug('authorizationTokenGenerator is set')\n\n axiosInstance.interceptors.request.use(async (request) => {\n const url = `${request.baseURL}${request.url}`\n logger.debug(`Intercepting request to ${url}`)\n\n if (globalOptions?.authorizationTokenGenerator && url) {\n try {\n const authorizationTokenHeaders =\n await globalOptions.authorizationTokenGenerator(url)\n\n if (authorizationTokenHeaders) {\n for (const key of Object.keys(authorizationTokenHeaders)) {\n const value = authorizationTokenHeaders[key]\n request.headers[key] = value\n }\n }\n } catch (error) {\n logger.error(`Error generating token for URL: ${url}`, error as Error)\n throw error\n }\n }\n return request\n })\n }\n\n if (globalOptions?.authorizationTokenRefresh) {\n const refreshAuthLogic = async (\n // biome-ignore lint/suspicious/noExplicitAny: Defined by dependency\n failedRequest: any\n ): Promise<AxiosResponse> => {\n if (!axios.isAxiosError(failedRequest)) {\n logger.error(\n 'Failed request is not an axios error',\n failedRequest as Error\n )\n throw failedRequest\n } else {\n logger.debug('Failed request', failedRequest)\n }\n\n const axiosError = failedRequest as AxiosError\n\n logger.debug('Failed request config', axiosError.config)\n\n const url = `${axiosError.config?.baseURL}${axiosError.config?.url}`\n if (globalOptions?.authorizationTokenRefresh && url) {\n logger.debug(`Refreshing token for URL ${url}`)\n try {\n await globalOptions?.authorizationTokenRefresh(url)\n } catch (error) {\n logger.error(`Error refreshing token for URL: ${url}`, error as Error)\n throw error\n }\n }\n\n return axiosError.response as AxiosResponse\n }\n\n createAuthRefreshInterceptorFunc(axiosInstance, refreshAuthLogic)\n }\n\n if (logger) {\n axiosInstance.interceptors.request.use((request) => {\n const requestObject = {\n url: request.url,\n params: request.params,\n headers: request.headers,\n }\n logger.debug('request', requestObject)\n return request\n })\n\n axiosInstance.interceptors.response.use((response) => {\n const responseObject = {\n data: response.data,\n config: response.config,\n headers: response.headers,\n }\n\n logger.debug('response', responseObject)\n return response\n })\n }\n\n const client: BaseClient = {\n get: (url, args, opts) =>\n callServer(\n axiosInstance,\n mergeArgs(baseURL, url, 'get', args, opts, globalOptions),\n logger\n ),\n post: (url, args, opts) =>\n callServer(\n axiosInstance,\n mergeArgs(baseURL, url, 'post', args, opts, globalOptions),\n logger\n ),\n put: (url, args, opts) =>\n callServer(\n axiosInstance,\n mergeArgs(baseURL, url, 'put', args, opts, globalOptions),\n logger\n ),\n patch: (url, args, opts) =>\n callServer(\n axiosInstance,\n mergeArgs(baseURL, url, 'patch', args, opts, globalOptions),\n logger\n ),\n delete: (url, args, opts) =>\n callServer(\n axiosInstance,\n mergeArgs(baseURL, url, 'delete', args, opts, globalOptions),\n logger\n ),\n }\n\n return { ...client, axiosInstance } as TypedAxiosClient<C>\n}\n\nconst callServer = async <\n R extends APIResponse<\n unknown | undefined,\n Record<string, string> | undefined\n >,\n>(\n axiosInstance: AxiosInstance,\n args: Partial<ClientOptions & RequestArgs>,\n logger: ReturnType<typeof getLogger>\n): Promise<R> => {\n try {\n const serializer = paramsSerializer((args as ClientOptions).arrayFormat)\n\n logger.debug(`[callServer] typeof serializer: ${typeof serializer}`)\n\n const body =\n args.method?.toLowerCase() === 'get' ||\n args.method?.toLowerCase() === 'delete'\n ? undefined\n : args.body\n const { headers, data } = await retry(\n () =>\n axiosInstance.request({\n baseURL: args.baseUrl,\n url: args.url,\n method: args.method,\n headers: args.headers as AxiosRequestConfig['headers'],\n params: args.params,\n paramsSerializer: serializer,\n data: body,\n httpsAgent: args.httpsAgent,\n httpAgent: args.httpAgent,\n }),\n args.retry\n )\n return { headers, data } as R\n } catch (error) {\n throw fromAxiosError(error as AxiosError)\n }\n}\n\nconst mergeArgs = (\n baseUrl: string,\n url: string,\n method: string,\n requestArgs: RequestArgs | RequestOptions | undefined,\n extras: RequestOptions | undefined,\n global: ClientOptions | undefined\n): Partial<ClientOptions & RequestArgs> => {\n const params = merge('params', global, requestArgs, extras)\n const query = merge('query', global, requestArgs, extras)\n const headers = merge('headers', global, requestArgs, extras)\n const body = merge('body', global, requestArgs, extras)\n const retry = merge('retry', global, requestArgs, extras)\n const merged: Partial<ClientOptions & RequestArgs> = {\n url: setParams(url, params),\n baseUrl,\n method,\n params: query,\n headers,\n body,\n retry,\n arrayFormat: global?.arrayFormat,\n httpsAgent: extras?.httpsAgent,\n httpAgent: extras?.httpAgent,\n }\n\n return merged\n}\n\nconst merge = (\n prop: keyof (ClientOptions & RequestArgs),\n // biome-ignore lint/suspicious/noExplicitAny: it is any\n ...args: (any | undefined)[]\n // biome-ignore lint/suspicious/noExplicitAny: it is any\n): any => Object.assign({}, ...args.map((a) => a?.[prop] || {}))\n\nconst setParams = (url: string, params: Record<string, string> = {}): string =>\n Object.entries(params).reduce(\n (url, [key, val]) =>\n url.replace(new RegExp(`/:${key}(?!\\\\w|\\\\d)`, 'g'), `/${val}`),\n url\n )\n","import {\n apiGatewayTokenByUrlGenerator,\n apiGatewayTokenRefresh,\n} from '@sebspark/openapi-auth-iam'\nimport type { ClientOptions } from '@sebspark/openapi-core'\nimport { getLogger } from '@sebspark/otel'\nimport { TypedClient } from '../client'\nimport type {\n GatewayGraphqlClientArgs,\n GatewayGraphqlClient as GatewayGraphqlClientType,\n} from './types'\n\nexport class GatewayGraphqlClient<\n T extends GatewayGraphqlClientType = GatewayGraphqlClientType,\n> {\n public client: T\n public logger: ReturnType<typeof getLogger>\n private uri: string\n private options: ClientOptions\n\n constructor(args: GatewayGraphqlClientArgs) {\n this.uri = args.uri\n this.logger = getLogger('GatewayGraphqlClient')\n this.options = {\n timeout: 10 * 1000,\n authorizationTokenGenerator: async (url) => {\n this.logger.debug(`Generating token for: ${this.uri}`)\n return apiGatewayTokenByUrlGenerator(args.apiKey)(url)\n },\n authorizationTokenRefresh: async (url) => {\n this.logger.debug(`Refreshing token for: ${this.uri}`)\n return apiGatewayTokenRefresh()(url)\n },\n }\n this.client = TypedClient<T>(args.uri, this.options)\n }\n\n public async graphql<K>(query: string, variables?: Record<string, unknown>) {\n try {\n const response = await this.client.post('/graphql', {\n body: { query: query.trim(), variables },\n })\n\n if (response.data.errors) {\n this.logger.error(`Error posting graphql query to: ${this.uri}`)\n throw new Error(response.data.errors.map((e) => e.message).join('\\n'))\n }\n\n return response.data.data as K\n } catch (error) {\n this.logger.error(`Error posting graphql: ${this.uri}`)\n throw error\n }\n }\n\n public async isHealthy() {\n try {\n await this.client.get('/health')\n return true\n } catch (error) {\n this.logger.error(error as Error)\n }\n return false\n }\n}\n"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sebspark/openapi-client",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.12",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.mjs",
|
|
@@ -41,6 +41,6 @@
|
|
|
41
41
|
"axios-auth-refresh": "3.3.6"
|
|
42
42
|
},
|
|
43
43
|
"peerDependencies": {
|
|
44
|
-
"@sebspark/otel": ">=2.0.
|
|
44
|
+
"@sebspark/otel": ">=2.0.6"
|
|
45
45
|
}
|
|
46
46
|
}
|