Skip to content

Commit 88eff01

Browse files
committed
fix: set keep-alive to true
1 parent 19e3d79 commit 88eff01

File tree

4 files changed

+40
-25
lines changed

4 files changed

+40
-25
lines changed

api.ts

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313

14-
import globalAxios, { AxiosStatic } from "axios";
14+
import globalAxios, { AxiosInstance } from "axios";
1515

1616
import { BaseAPI } from "./base";
1717
import {
@@ -121,8 +121,7 @@ export const OpenFgaApiAxiosParamCreator = function (configuration: Configuratio
121121
localVarHeaderParameter["Content-Type"] = "application/json";
122122

123123
setSearchParams(localVarUrlObj, localVarQueryParameter, options.query);
124-
const headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
125-
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
124+
localVarRequestOptions.headers = {...localVarHeaderParameter, ...options.headers};
126125
localVarRequestOptions.data = serializeDataIfNeeded(body, localVarRequestOptions);
127126

128127
return {
@@ -693,7 +692,7 @@ export const OpenFgaApiFp = function(configuration: Configuration, credentials:
693692
* @param {*} [options] Override http request option.
694693
* @throws { FgaError }
695694
*/
696-
async check(body: CheckRequest, options?: any): Promise<(axios?: AxiosStatic) => PromiseResult<CheckResponse>> {
695+
async check(body: CheckRequest, options?: any): Promise<(axios?: AxiosInstance) => PromiseResult<CheckResponse>> {
697696
const localVarAxiosArgs = await localVarAxiosParamCreator.check(body, options);
698697
return createRequestFunction(localVarAxiosArgs, globalAxios, configuration, credentials);
699698
},
@@ -704,7 +703,7 @@ export const OpenFgaApiFp = function(configuration: Configuration, credentials:
704703
* @param {*} [options] Override http request option.
705704
* @throws { FgaError }
706705
*/
707-
async createStore(body: CreateStoreRequest, options?: any): Promise<(axios?: AxiosStatic) => PromiseResult<CreateStoreResponse>> {
706+
async createStore(body: CreateStoreRequest, options?: any): Promise<(axios?: AxiosInstance) => PromiseResult<CreateStoreResponse>> {
708707
const localVarAxiosArgs = await localVarAxiosParamCreator.createStore(body, options);
709708
return createRequestFunction(localVarAxiosArgs, globalAxios, configuration, credentials);
710709
},
@@ -714,7 +713,7 @@ export const OpenFgaApiFp = function(configuration: Configuration, credentials:
714713
* @param {*} [options] Override http request option.
715714
* @throws { FgaError }
716715
*/
717-
async deleteStore(options?: any): Promise<(axios?: AxiosStatic) => PromiseResult<void>> {
716+
async deleteStore(options?: any): Promise<(axios?: AxiosInstance) => PromiseResult<void>> {
718717
const localVarAxiosArgs = await localVarAxiosParamCreator.deleteStore(options);
719718
return createRequestFunction(localVarAxiosArgs, globalAxios, configuration, credentials);
720719
},
@@ -725,7 +724,7 @@ export const OpenFgaApiFp = function(configuration: Configuration, credentials:
725724
* @param {*} [options] Override http request option.
726725
* @throws { FgaError }
727726
*/
728-
async expand(body: ExpandRequest, options?: any): Promise<(axios?: AxiosStatic) => PromiseResult<ExpandResponse>> {
727+
async expand(body: ExpandRequest, options?: any): Promise<(axios?: AxiosInstance) => PromiseResult<ExpandResponse>> {
729728
const localVarAxiosArgs = await localVarAxiosParamCreator.expand(body, options);
730729
return createRequestFunction(localVarAxiosArgs, globalAxios, configuration, credentials);
731730
},
@@ -735,7 +734,7 @@ export const OpenFgaApiFp = function(configuration: Configuration, credentials:
735734
* @param {*} [options] Override http request option.
736735
* @throws { FgaError }
737736
*/
738-
async getStore(options?: any): Promise<(axios?: AxiosStatic) => PromiseResult<GetStoreResponse>> {
737+
async getStore(options?: any): Promise<(axios?: AxiosInstance) => PromiseResult<GetStoreResponse>> {
739738
const localVarAxiosArgs = await localVarAxiosParamCreator.getStore(options);
740739
return createRequestFunction(localVarAxiosArgs, globalAxios, configuration, credentials);
741740
},
@@ -746,7 +745,7 @@ export const OpenFgaApiFp = function(configuration: Configuration, credentials:
746745
* @param {*} [options] Override http request option.
747746
* @throws { FgaError }
748747
*/
749-
async listObjects(body: ListObjectsRequest, options?: any): Promise<(axios?: AxiosStatic) => PromiseResult<ListObjectsResponse>> {
748+
async listObjects(body: ListObjectsRequest, options?: any): Promise<(axios?: AxiosInstance) => PromiseResult<ListObjectsResponse>> {
750749
const localVarAxiosArgs = await localVarAxiosParamCreator.listObjects(body, options);
751750
return createRequestFunction(localVarAxiosArgs, globalAxios, configuration, credentials);
752751
},
@@ -758,7 +757,7 @@ export const OpenFgaApiFp = function(configuration: Configuration, credentials:
758757
* @param {*} [options] Override http request option.
759758
* @throws { FgaError }
760759
*/
761-
async listStores(pageSize?: number, continuationToken?: string, options?: any): Promise<(axios?: AxiosStatic) => PromiseResult<ListStoresResponse>> {
760+
async listStores(pageSize?: number, continuationToken?: string, options?: any): Promise<(axios?: AxiosInstance) => PromiseResult<ListStoresResponse>> {
762761
const localVarAxiosArgs = await localVarAxiosParamCreator.listStores(pageSize, continuationToken, options);
763762
return createRequestFunction(localVarAxiosArgs, globalAxios, configuration, credentials);
764763
},
@@ -769,7 +768,7 @@ export const OpenFgaApiFp = function(configuration: Configuration, credentials:
769768
* @param {*} [options] Override http request option.
770769
* @throws { FgaError }
771770
*/
772-
async read(body: ReadRequest, options?: any): Promise<(axios?: AxiosStatic) => PromiseResult<ReadResponse>> {
771+
async read(body: ReadRequest, options?: any): Promise<(axios?: AxiosInstance) => PromiseResult<ReadResponse>> {
773772
const localVarAxiosArgs = await localVarAxiosParamCreator.read(body, options);
774773
return createRequestFunction(localVarAxiosArgs, globalAxios, configuration, credentials);
775774
},
@@ -780,7 +779,7 @@ export const OpenFgaApiFp = function(configuration: Configuration, credentials:
780779
* @param {*} [options] Override http request option.
781780
* @throws { FgaError }
782781
*/
783-
async readAssertions(authorizationModelId: string, options?: any): Promise<(axios?: AxiosStatic) => PromiseResult<ReadAssertionsResponse>> {
782+
async readAssertions(authorizationModelId: string, options?: any): Promise<(axios?: AxiosInstance) => PromiseResult<ReadAssertionsResponse>> {
784783
const localVarAxiosArgs = await localVarAxiosParamCreator.readAssertions(authorizationModelId, options);
785784
return createRequestFunction(localVarAxiosArgs, globalAxios, configuration, credentials);
786785
},
@@ -791,7 +790,7 @@ export const OpenFgaApiFp = function(configuration: Configuration, credentials:
791790
* @param {*} [options] Override http request option.
792791
* @throws { FgaError }
793792
*/
794-
async readAuthorizationModel(id: string, options?: any): Promise<(axios?: AxiosStatic) => PromiseResult<ReadAuthorizationModelResponse>> {
793+
async readAuthorizationModel(id: string, options?: any): Promise<(axios?: AxiosInstance) => PromiseResult<ReadAuthorizationModelResponse>> {
795794
const localVarAxiosArgs = await localVarAxiosParamCreator.readAuthorizationModel(id, options);
796795
return createRequestFunction(localVarAxiosArgs, globalAxios, configuration, credentials);
797796
},
@@ -803,7 +802,7 @@ export const OpenFgaApiFp = function(configuration: Configuration, credentials:
803802
* @param {*} [options] Override http request option.
804803
* @throws { FgaError }
805804
*/
806-
async readAuthorizationModels(pageSize?: number, continuationToken?: string, options?: any): Promise<(axios?: AxiosStatic) => PromiseResult<ReadAuthorizationModelsResponse>> {
805+
async readAuthorizationModels(pageSize?: number, continuationToken?: string, options?: any): Promise<(axios?: AxiosInstance) => PromiseResult<ReadAuthorizationModelsResponse>> {
807806
const localVarAxiosArgs = await localVarAxiosParamCreator.readAuthorizationModels(pageSize, continuationToken, options);
808807
return createRequestFunction(localVarAxiosArgs, globalAxios, configuration, credentials);
809808
},
@@ -816,7 +815,7 @@ export const OpenFgaApiFp = function(configuration: Configuration, credentials:
816815
* @param {*} [options] Override http request option.
817816
* @throws { FgaError }
818817
*/
819-
async readChanges(type?: string, pageSize?: number, continuationToken?: string, options?: any): Promise<(axios?: AxiosStatic) => PromiseResult<ReadChangesResponse>> {
818+
async readChanges(type?: string, pageSize?: number, continuationToken?: string, options?: any): Promise<(axios?: AxiosInstance) => PromiseResult<ReadChangesResponse>> {
820819
const localVarAxiosArgs = await localVarAxiosParamCreator.readChanges(type, pageSize, continuationToken, options);
821820
return createRequestFunction(localVarAxiosArgs, globalAxios, configuration, credentials);
822821
},
@@ -827,7 +826,7 @@ export const OpenFgaApiFp = function(configuration: Configuration, credentials:
827826
* @param {*} [options] Override http request option.
828827
* @throws { FgaError }
829828
*/
830-
async write(body: WriteRequest, options?: any): Promise<(axios?: AxiosStatic) => PromiseResult<object>> {
829+
async write(body: WriteRequest, options?: any): Promise<(axios?: AxiosInstance) => PromiseResult<object>> {
831830
const localVarAxiosArgs = await localVarAxiosParamCreator.write(body, options);
832831
return createRequestFunction(localVarAxiosArgs, globalAxios, configuration, credentials);
833832
},
@@ -839,7 +838,7 @@ export const OpenFgaApiFp = function(configuration: Configuration, credentials:
839838
* @param {*} [options] Override http request option.
840839
* @throws { FgaError }
841840
*/
842-
async writeAssertions(authorizationModelId: string, body: WriteAssertionsRequest, options?: any): Promise<(axios?: AxiosStatic) => PromiseResult<void>> {
841+
async writeAssertions(authorizationModelId: string, body: WriteAssertionsRequest, options?: any): Promise<(axios?: AxiosInstance) => PromiseResult<void>> {
843842
const localVarAxiosArgs = await localVarAxiosParamCreator.writeAssertions(authorizationModelId, body, options);
844843
return createRequestFunction(localVarAxiosArgs, globalAxios, configuration, credentials);
845844
},
@@ -850,7 +849,7 @@ export const OpenFgaApiFp = function(configuration: Configuration, credentials:
850849
* @param {*} [options] Override http request option.
851850
* @throws { FgaError }
852851
*/
853-
async writeAuthorizationModel(body: WriteAuthorizationModelRequest, options?: any): Promise<(axios?: AxiosStatic) => PromiseResult<WriteAuthorizationModelResponse>> {
852+
async writeAuthorizationModel(body: WriteAuthorizationModelRequest, options?: any): Promise<(axios?: AxiosInstance) => PromiseResult<WriteAuthorizationModelResponse>> {
854853
const localVarAxiosArgs = await localVarAxiosParamCreator.writeAuthorizationModel(body, options);
855854
return createRequestFunction(localVarAxiosArgs, globalAxios, configuration, credentials);
856855
},
@@ -861,7 +860,7 @@ export const OpenFgaApiFp = function(configuration: Configuration, credentials:
861860
* OpenFgaApi - factory interface
862861
* @export
863862
*/
864-
export const OpenFgaApiFactory = function (configuration: Configuration, credentials: Credentials, axios?: AxiosStatic) {
863+
export const OpenFgaApiFactory = function (configuration: Configuration, credentials: Credentials, axios?: AxiosInstance) {
865864
const localVarFp = OpenFgaApiFp(configuration, credentials);
866865
return {
867866
/**

base.ts

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,16 @@
1212

1313

1414
// Some imports not used depending on template conditions
15-
import globalAxios, { AxiosStatic } from "axios";
15+
import globalAxios, {AxiosInstance} from "axios";
16+
17+
import * as http from "http";
18+
import * as https from "https";
1619

1720
import { Configuration, UserConfigurationParams } from "./configuration";
1821
import { Credentials } from "./credentials";
1922

23+
const DEFAULT_CONNECTION_TIMEOUT_IN_MS = 10_000;
24+
2025
/**
2126
*
2227
* @export
@@ -36,15 +41,26 @@ export class BaseAPI {
3641
protected configuration: Configuration;
3742
protected credentials: Credentials;
3843

39-
constructor(configuration: UserConfigurationParams | Configuration, protected axios?: AxiosStatic) {
44+
constructor(configuration: UserConfigurationParams | Configuration, protected axios?: AxiosInstance) {
4045
if (configuration instanceof Configuration) {
4146
this.configuration = configuration;
4247
} else {
43-
this.configuration = new Configuration(configuration, axios || globalAxios);
48+
this.configuration = new Configuration(configuration);
4449
}
4550
this.configuration.isValid();
4651

4752
this.credentials = Credentials.init(this.configuration);
53+
54+
if (!this.axios) {
55+
const httpAgent = new http.Agent({ keepAlive: true });
56+
const httpsAgent = new https.Agent({ keepAlive: true });
57+
this.axios = globalAxios.create({
58+
httpAgent,
59+
httpsAgent,
60+
timeout: DEFAULT_CONNECTION_TIMEOUT_IN_MS,
61+
headers: this.configuration.baseOptions?.headers,
62+
});
63+
}
4864
}
4965

5066
public get storeId() {

common.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ export async function attemptHttpRequest<B, R>(
180180
/**
181181
* creates an axios request function
182182
*/
183-
export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosStatic, configuration: Configuration, credentials?: Credentials) {
183+
export const createRequestFunction = function (axiosArgs: RequestArgs, axiosInstance: AxiosInstance, configuration: Configuration, credentials?: Credentials) {
184184
configuration.isValid();
185185

186186
const retryParams = axiosArgs.options?.retryParams ? axiosArgs.options?.retryParams : configuration.retryParams;
@@ -189,7 +189,7 @@ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxi
189189
if (!credentials) {
190190
credentials = Credentials.init(configuration);
191191
}
192-
return async (axios: AxiosStatic = globalAxios) : PromiseResult<any> => {
192+
return async (axios: AxiosInstance = axiosInstance) : PromiseResult<any> => {
193193
await setBearerAuthToObject(axiosArgs.options.headers, credentials!);
194194

195195
const axiosRequestArgs = {...axiosArgs.options, url: configuration.getBasePath() + axiosArgs.url};

configuration.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export class Configuration {
114114
*/
115115
retryParams?: RetryParams;
116116

117-
constructor(params: UserConfigurationParams = {} as unknown as UserConfigurationParams, private axios: AxiosInstance = globalAxios) {
117+
constructor(params: UserConfigurationParams = {} as unknown as UserConfigurationParams) {
118118
this.apiScheme = params.apiScheme || this.apiScheme;
119119
this.apiHost = params.apiHost!;
120120
this.storeId = params.storeId!;

0 commit comments

Comments
 (0)