@sebspark/openapi-client 2.4.1 → 3.0.0

package/dist/index.d.ts

@@ -1,12 +1,12 @@
+export * from '@sebspark/retry';
 import { BaseClient, ClientOptions, RequestOptions, APIResponse } from '@sebspark/openapi-core';
 import { AxiosInstance } from 'axios';
-import { Logger } from 'winston';
-export * from '@sebspark/retry';
+import { getLogger } from '@sebspark/otel';
 
 type TypedAxiosClient<T> = T & {
     axiosInstance: AxiosInstance;
 };
-declare const TypedClient: <C extends Partial<BaseClient>>(baseURL: string, globalOptions?: ClientOptions, logger?: Logger) => TypedAxiosClient<C>;
+declare const TypedClient: <C extends Partial<BaseClient>>(baseURL: string, globalOptions?: ClientOptions) => TypedAxiosClient<C>;
 
 type GatewayGraphqlClient$1 = Pick<BaseClient, 'post' | 'get'> & {
     post: {
@@ -44,14 +44,13 @@ type GatewayGraphqlClient$1 = Pick<BaseClient, 'post' | 'get'> & {
     };
 };
 type GatewayGraphqlClientArgs = {
-    logger: Logger;
     uri: string;
     apiKey: string;
 };
 
 declare class GatewayGraphqlClient<T extends GatewayGraphqlClient$1 = GatewayGraphqlClient$1> {
     client: T;
-    logger: Logger;
+    logger: ReturnType<typeof getLogger>;
     private uri;
     private options;
     constructor(args: GatewayGraphqlClientArgs);

package/dist/index.js

@@ -18,9 +18,13 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 
+// src/index.ts
+var _retry = require('@sebspark/retry'); _createStarExport(_retry);
+
 // src/client.ts
 var _openapicore = require('@sebspark/openapi-core');
-var _retry = require('@sebspark/retry'); _createStarExport(_retry);
+var _otel = require('@sebspark/otel');
+
 var _axios = require('axios'); var _axios2 = _interopRequireDefault(_axios);
 var _axiosauthrefresh = require('axios-auth-refresh'); var _axiosauthrefresh2 = _interopRequireDefault(_axiosauthrefresh);
 
@@ -78,53 +82,53 @@ var paramsSerializer = (format) => (params) => {
 };
 
 // src/client.ts
-var TypedClient = (baseURL, globalOptions, logger) => {
+var TypedClient = (baseURL, globalOptions) => {
   const axiosInstance = _axios2.default.create();
-  logger == null ? void 0 : logger.debug("client initialized with arrayFormat", globalOptions == null ? void 0 : globalOptions.arrayFormat);
+  const logger = _otel.getLogger.call(void 0, "TypedClient");
+  logger.debug(`client initialized with arrayFormat '${globalOptions == null ? void 0 : globalOptions.arrayFormat}'`);
   if (globalOptions == null ? void 0 : globalOptions.authorizationTokenGenerator) {
-    logger == null ? void 0 : logger.debug("authorizationTokenGenerator is set");
+    logger.debug("authorizationTokenGenerator is set");
     axiosInstance.interceptors.request.use(async (request) => {
       const url = `${request.baseURL}${request.url}`;
-      logger == null ? void 0 : logger.debug(`Intercepting request to ${url}`);
+      logger.debug(`Intercepting request to ${url}`);
       if ((globalOptions == null ? void 0 : globalOptions.authorizationTokenGenerator) && url) {
         try {
           const authorizationTokenHeaders = await globalOptions.authorizationTokenGenerator(url);
           if (authorizationTokenHeaders) {
             for (const key of Object.keys(authorizationTokenHeaders)) {
               const value = authorizationTokenHeaders[key];
-              logger == null ? void 0 : logger.debug(`Setting header ${key} to ${value}`);
+              logger.debug(`Setting header ${key} to ${value}`);
               request.headers[key] = value;
             }
           }
         } catch (error) {
-          logger == null ? void 0 : logger.error(`Error generating token for URL: ${url}`);
+          logger.error(`Error generating token for URL: ${url}`, error);
           throw error;
         }
       }
-      logger == null ? void 0 : logger.debug("Intercepted request:");
-      logger == null ? void 0 : logger.debug(JSON.stringify(request, null, 2));
+      logger.debug("Intercepted request:");
+      logger.debug(JSON.stringify(request, null, 2));
       return request;
     });
   }
   if (globalOptions == null ? void 0 : globalOptions.authorizationTokenRefresh) {
     const refreshAuthLogic = async (failedRequest) => {
       var _a, _b;
-      logger == null ? void 0 : logger.debug("Failed request");
-      logger == null ? void 0 : logger.debug(JSON.stringify(failedRequest, null, 2));
       if (!_axios2.default.isAxiosError(failedRequest)) {
-        logger == null ? void 0 : logger.error("Failed request is not an axios error");
+        logger.error("Failed request is not an axios error", failedRequest);
         return;
+      } else {
+        logger.debug("Failed request", failedRequest);
       }
       const axiosError = failedRequest;
-      logger == null ? void 0 : logger.debug("Failed request config:");
-      logger == null ? void 0 : logger.debug(JSON.stringify(axiosError.config, null, 2));
+      logger.debug("Failed request config", axiosError.config);
       const url = `${(_a = axiosError.config) == null ? void 0 : _a.baseURL}${(_b = axiosError.config) == null ? void 0 : _b.url}`;
       if ((globalOptions == null ? void 0 : globalOptions.authorizationTokenRefresh) && url) {
-        logger == null ? void 0 : logger.debug(`Refreshing token for URL ${url}`);
+        logger.debug(`Refreshing token for URL ${url}`);
         try {
           await (globalOptions == null ? void 0 : globalOptions.authorizationTokenRefresh(url));
         } catch (error) {
-          logger == null ? void 0 : logger.error(`Error refreshing token for URL: ${url}`);
+          logger.error(`Error refreshing token for URL: ${url}`, error);
           throw error;
         }
       }
@@ -138,7 +142,7 @@ var TypedClient = (baseURL, globalOptions, logger) => {
         params: request.params,
         headers: request.headers
       };
-      logger.debug(JSON.stringify(requestObject, null, 2));
+      logger.debug("request", requestObject);
       return request;
     });
     axiosInstance.interceptors.response.use((response) => {
@@ -147,7 +151,7 @@ var TypedClient = (baseURL, globalOptions, logger) => {
         config: response.config,
         headers: response.headers
       };
-      logger.debug(JSON.stringify(responseObject, null, 2));
+      logger.debug("response", responseObject);
       return response;
     });
   }
@@ -164,8 +168,7 @@ var callServer = async (axiosInstance, args, logger) => {
   var _a, _b;
   try {
     const serializer = paramsSerializer(args.arrayFormat);
-    logger == null ? void 0 : logger.debug(`[callServer] typeof serializer: ${typeof serializer}`);
-    logger == null ? void 0 : logger.debug(`[callServer] sample serialization: ${serializer({test: ["a", "b"]})}`);
+    logger.debug(`[callServer] typeof serializer: ${typeof serializer}`);
     const body = ((_a = args.method) == null ? void 0 : _a.toLowerCase()) === "get" || ((_b = args.method) == null ? void 0 : _b.toLowerCase()) === "delete" ? void 0 : args.body;
     const {headers, data} = await _retry.retry.call(void 0, () => axiosInstance.request({
       baseURL: args.baseUrl,
@@ -206,18 +209,16 @@ var mergeArgs = (baseUrl, url, method, requestArgs, extras, global) => {
 var merge = (prop, ...args) => Object.assign({}, ...args.map((a) => (a == null ? void 0 : a[prop]) || {}));
 var setParams = (url, params = {}) => Object.entries(params).reduce((url2, [key, val]) => url2.replace(new RegExp(`/:${key}(?!\\w|\\d)`, "g"), `/${val}`), url);
 
-// src/index.ts
-
-
 // src/graphql/client.ts
 
 
 
 var _openapiauthiam = require('@sebspark/openapi-auth-iam');
+
 var GatewayGraphqlClient = class {
   constructor(args) {
     this.uri = args.uri;
-    this.logger = args.logger;
+    this.logger = _otel.getLogger.call(void 0, "GatewayGraphqlClient");
     this.options = {
       timeout: 10 * 1e3,
       authorizationTokenGenerator: async (url) => {
@@ -229,7 +230,7 @@ var GatewayGraphqlClient = class {
         return _openapiauthiam.apiGatewayTokenRefresh.call(void 0, )(url);
       }
     };
-    this.client = TypedClient(args.uri, this.options, this.logger);
+    this.client = TypedClient(args.uri, this.options);
   }
   async graphql(query, variables) {
     try {

package/dist/index.mjs

@@ -18,8 +18,12 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 
+// src/index.ts
+export * from "@sebspark/retry";
+
 // src/client.ts
 import {fromAxiosError} from "@sebspark/openapi-core";
+import {getLogger} from "@sebspark/otel";
 import {retry} from "@sebspark/retry";
 import axios from "axios";
 import createAuthRefreshInterceptor from "axios-auth-refresh";
@@ -78,53 +82,53 @@ var paramsSerializer = (format) => (params) => {
 };
 
 // src/client.ts
-var TypedClient = (baseURL, globalOptions, logger) => {
+var TypedClient = (baseURL, globalOptions) => {
   const axiosInstance = axios.create();
-  logger == null ? void 0 : logger.debug("client initialized with arrayFormat", globalOptions == null ? void 0 : globalOptions.arrayFormat);
+  const logger = getLogger("TypedClient");
+  logger.debug(`client initialized with arrayFormat '${globalOptions == null ? void 0 : globalOptions.arrayFormat}'`);
   if (globalOptions == null ? void 0 : globalOptions.authorizationTokenGenerator) {
-    logger == null ? void 0 : logger.debug("authorizationTokenGenerator is set");
+    logger.debug("authorizationTokenGenerator is set");
     axiosInstance.interceptors.request.use(async (request) => {
       const url = `${request.baseURL}${request.url}`;
-      logger == null ? void 0 : logger.debug(`Intercepting request to ${url}`);
+      logger.debug(`Intercepting request to ${url}`);
       if ((globalOptions == null ? void 0 : globalOptions.authorizationTokenGenerator) && url) {
         try {
           const authorizationTokenHeaders = await globalOptions.authorizationTokenGenerator(url);
           if (authorizationTokenHeaders) {
             for (const key of Object.keys(authorizationTokenHeaders)) {
               const value = authorizationTokenHeaders[key];
-              logger == null ? void 0 : logger.debug(`Setting header ${key} to ${value}`);
+              logger.debug(`Setting header ${key} to ${value}`);
               request.headers[key] = value;
             }
           }
         } catch (error) {
-          logger == null ? void 0 : logger.error(`Error generating token for URL: ${url}`);
+          logger.error(`Error generating token for URL: ${url}`, error);
           throw error;
         }
       }
-      logger == null ? void 0 : logger.debug("Intercepted request:");
-      logger == null ? void 0 : logger.debug(JSON.stringify(request, null, 2));
+      logger.debug("Intercepted request:");
+      logger.debug(JSON.stringify(request, null, 2));
       return request;
     });
   }
   if (globalOptions == null ? void 0 : globalOptions.authorizationTokenRefresh) {
     const refreshAuthLogic = async (failedRequest) => {
       var _a, _b;
-      logger == null ? void 0 : logger.debug("Failed request");
-      logger == null ? void 0 : logger.debug(JSON.stringify(failedRequest, null, 2));
       if (!axios.isAxiosError(failedRequest)) {
-        logger == null ? void 0 : logger.error("Failed request is not an axios error");
+        logger.error("Failed request is not an axios error", failedRequest);
         return;
+      } else {
+        logger.debug("Failed request", failedRequest);
       }
       const axiosError = failedRequest;
-      logger == null ? void 0 : logger.debug("Failed request config:");
-      logger == null ? void 0 : logger.debug(JSON.stringify(axiosError.config, null, 2));
+      logger.debug("Failed request config", axiosError.config);
       const url = `${(_a = axiosError.config) == null ? void 0 : _a.baseURL}${(_b = axiosError.config) == null ? void 0 : _b.url}`;
       if ((globalOptions == null ? void 0 : globalOptions.authorizationTokenRefresh) && url) {
-        logger == null ? void 0 : logger.debug(`Refreshing token for URL ${url}`);
+        logger.debug(`Refreshing token for URL ${url}`);
         try {
           await (globalOptions == null ? void 0 : globalOptions.authorizationTokenRefresh(url));
         } catch (error) {
-          logger == null ? void 0 : logger.error(`Error refreshing token for URL: ${url}`);
+          logger.error(`Error refreshing token for URL: ${url}`, error);
           throw error;
         }
       }
@@ -138,7 +142,7 @@ var TypedClient = (baseURL, globalOptions, logger) => {
         params: request.params,
         headers: request.headers
       };
-      logger.debug(JSON.stringify(requestObject, null, 2));
+      logger.debug("request", requestObject);
       return request;
     });
     axiosInstance.interceptors.response.use((response) => {
@@ -147,7 +151,7 @@ var TypedClient = (baseURL, globalOptions, logger) => {
         config: response.config,
         headers: response.headers
       };
-      logger.debug(JSON.stringify(responseObject, null, 2));
+      logger.debug("response", responseObject);
       return response;
     });
   }
@@ -164,8 +168,7 @@ var callServer = async (axiosInstance, args, logger) => {
   var _a, _b;
   try {
     const serializer = paramsSerializer(args.arrayFormat);
-    logger == null ? void 0 : logger.debug(`[callServer] typeof serializer: ${typeof serializer}`);
-    logger == null ? void 0 : logger.debug(`[callServer] sample serialization: ${serializer({test: ["a", "b"]})}`);
+    logger.debug(`[callServer] typeof serializer: ${typeof serializer}`);
     const body = ((_a = args.method) == null ? void 0 : _a.toLowerCase()) === "get" || ((_b = args.method) == null ? void 0 : _b.toLowerCase()) === "delete" ? void 0 : args.body;
     const {headers, data} = await retry(() => axiosInstance.request({
       baseURL: args.baseUrl,
@@ -206,18 +209,16 @@ var mergeArgs = (baseUrl, url, method, requestArgs, extras, global) => {
 var merge = (prop, ...args) => Object.assign({}, ...args.map((a) => (a == null ? void 0 : a[prop]) || {}));
 var setParams = (url, params = {}) => Object.entries(params).reduce((url2, [key, val]) => url2.replace(new RegExp(`/:${key}(?!\\w|\\d)`, "g"), `/${val}`), url);
 
-// src/index.ts
-export * from "@sebspark/retry";
-
 // src/graphql/client.ts
 import {
   apiGatewayTokenByUrlGenerator,
   apiGatewayTokenRefresh
 } from "@sebspark/openapi-auth-iam";
+import {getLogger as getLogger2} from "@sebspark/otel";
 var GatewayGraphqlClient = class {
   constructor(args) {
     this.uri = args.uri;
-    this.logger = args.logger;
+    this.logger = getLogger2("GatewayGraphqlClient");
     this.options = {
       timeout: 10 * 1e3,
       authorizationTokenGenerator: async (url) => {
@@ -229,7 +230,7 @@ var GatewayGraphqlClient = class {
         return apiGatewayTokenRefresh()(url);
       }
     };
-    this.client = TypedClient(args.uri, this.options, this.logger);
+    this.client = TypedClient(args.uri, this.options);
   }
   async graphql(query, variables) {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/openapi-client",
-  "version": "2.4.1",
+  "version": "3.0.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -19,16 +19,20 @@
   },
   "devDependencies": {
     "@sebspark/openapi-typegen": "*",
-    "nock": "14.0.5",
+    "@sebspark/otel": "*",
+    "nock": "14.0.10",
     "tsconfig": "*",
     "tsup-node": "^0.1.0",
-    "vitest": "3.2.4"
+    "vitest": "4.0.3"
   },
   "dependencies": {
     "@sebspark/openapi-auth-iam": "*",
     "@sebspark/openapi-core": "*",
     "@sebspark/retry": "*",
-    "axios": "^1.12.0",
+    "axios": "^1.12.2",
     "axios-auth-refresh": "3.3.6"
+  },
+  "peerDependencies": {
+    "@sebspark/otel": ">=1.1.3"
   }
 }