fix: Axios Wrapper and Pass SDK Version Header (#872)

* fix: Axios Wrapper and Pass SDK Version Header

* fix: deprecation notice

* Update pre-commit

packages/restapi/src/lib/alias/getAliasInfo.ts

@@ -1,7 +1,7 @@
-import axios from 'axios';
 import { getAPIBaseUrls, getCAIPWithChainId } from '../helpers';
 import Constants, { ENV } from '../constants';
 import { ALIAS_CHAIN, ALIAS_CHAIN_ID } from '../config';
+import { axiosGet } from '../utils/axiosUtil';
 
 /**
  *  GET /v1/alias/{aliasAddressinCAIP}/channel
@@ -29,8 +29,7 @@ export const getAliasInfo = async (options: GetAliasInfoOptionsType) => {
   const apiEndpoint = `${API_BASE_URL}/v1/alias`;
   const requestUrl = `${apiEndpoint}/${_alias}/channel`;
 
-  return await axios
-    .get(requestUrl)
+  return await axiosGet(requestUrl)
     .then((response) => response.data)
     .catch((err) => {
       console.error(`[EPNS-SDK] - API ${requestUrl}: `, err);

packages/restapi/src/lib/channels/_getSubscribers.ts

@@ -1,15 +1,11 @@
-import axios from "axios";
-import {
-  getCAIPAddress,
-  getAPIBaseUrls,
-  getCAIPDetails
-} from '../helpers';
-import Constants, {ENV} from '../constants';
+import { getCAIPAddress, getAPIBaseUrls, getCAIPDetails } from '../helpers';
+import Constants, { ENV } from '../constants';
+import { axiosPost } from '../utils/axiosUtil';
 
 export type GetSubscribersOptionsType = {
   channel: string; // plain ETH Format only
-  env?: ENV
-}
+  env?: ENV;
+};
 
 /**
  * LEGACY SDK method, kept to support old functionality
@@ -26,14 +22,10 @@ const deprecationWarning = `
 
 export const _getSubscribers = async (
   options: GetSubscribersOptionsType
-) : Promise<string[]> => {
-
+): Promise<string[]> => {
   console.warn(deprecationWarning);
 
-  const {
-    channel,
-    env = Constants.ENV.PROD,
-  } = options || {};
+  const { channel, env = Constants.ENV.PROD } = options || {};
 
   const _channelAddress = await getCAIPAddress(env, channel, 'Channel');
 
@@ -49,12 +41,9 @@ export const _getSubscribers = async (
   const body = {
     channel: channelCAIPDetails.address, // deprecated API expects ETH address format
     blockchain: chainId,
-    op: "read"
+    op: 'read',
   };
 
-  const apiResponse = await axios.post(requestUrl, body);
-
-  const { data: { subscribers = [] } } = apiResponse;
-
-  return subscribers;
-}
+  const response = await axiosPost<{ subscribers: string[] }>(requestUrl, body);
+  return response.data.subscribers;
+};

packages/restapi/src/lib/channels/getChannel.ts

@@ -1,35 +1,27 @@
-import axios from 'axios';
-import {
-  getCAIPAddress,
-  getAPIBaseUrls
-} from '../helpers';
-import Constants, {ENV} from '../constants';
+import { getCAIPAddress, getAPIBaseUrls } from '../helpers';
+import Constants, { ENV } from '../constants';
+import { axiosGet } from '../utils/axiosUtil';
 
 /**
- *  GET /v1/channels/{addressinCAIP}   
+ *  GET /v1/channels/{addressinCAIP}
  */
 
 export type GetChannelOptionsType = {
   channel: string;
   env?: ENV;
-}
+};
 
-export const getChannel = async (
-  options: GetChannelOptionsType
-) => {
-  const {
-    channel,
-    env = Constants.ENV.PROD,
-  } = options || {};
+export const getChannel = async (options: GetChannelOptionsType) => {
+  const { channel, env = Constants.ENV.PROD } = options || {};
 
   const _channel = await getCAIPAddress(env, channel, 'Channel');
   const API_BASE_URL = getAPIBaseUrls(env);
   const apiEndpoint = `${API_BASE_URL}/v1/channels`;
   const requestUrl = `${apiEndpoint}/${_channel}`;
 
-  return await axios.get(requestUrl)
+  return await axiosGet(requestUrl)
     .then((response) => response.data)
     .catch((err) => {
       console.error(`[Push SDK] - API ${requestUrl}: `, err);
     });
-}
+};

packages/restapi/src/lib/channels/getDelegates.ts

@@ -1,9 +1,9 @@
-import axios from 'axios';
 import {
   getCAIPAddress,
   getAPIBaseUrls
 } from '../helpers';
 import Constants, { ENV } from '../constants';
+import { axiosGet } from '../utils/axiosUtil';
 
 /**
  *  GET v1/channels/${channelAddressInCAIP}/delegates  
@@ -32,7 +32,7 @@ export const getDelegates = async (
   const apiEndpoint = `${API_BASE_URL}/v1/channels`;
   const requestUrl = `${apiEndpoint}/${_channel}/delegates`;
 
-  return await axios.get(requestUrl)
+  return await axiosGet(requestUrl)
     .then((response) => response.data?.delegates)
     .catch((err) => {
       console.error(`[EPNS-SDK] - API ${requestUrl}: `, err);

packages/restapi/src/lib/channels/getSubscribers.ts

@@ -1,14 +1,7 @@
-import axios from 'axios';
-import {
-    getCAIPAddress,
-    getAPIBaseUrls,
-} from '../helpers';
-import Constants, {ENV} from '../constants';
-import {
-    Subscribers
-} from '../types';
-import { ResourceLimits } from 'worker_threads';
-
+import { getCAIPAddress, getAPIBaseUrls } from '../helpers';
+import Constants, { ENV } from '../constants';
+import { Subscribers } from '../types';
+import { axiosGet } from '../utils/axiosUtil';
 
 /**
  *  GET /v1/channels/:channelId/:subscribers
@@ -24,8 +17,11 @@ export type GetChannelSubscribersOptionsType = {
 }
 
 export const getSubscribers = async (
-    options: GetChannelSubscribersOptionsType
+  options: GetChannelSubscribersOptionsType
 ): Promise<Subscribers> => {
+
+  try {
+
     const {
         channel,
         page = 1,
@@ -57,13 +53,17 @@ export const getSubscribers = async (
         if(category){
             apiEndpoint = apiEndpoint+`&category=${category}`
         }
-        return await axios.get(apiEndpoint)
-            .then((response) => response.data)
-            .catch((err) => {
-                console.error(`[Push SDK] - API ${apiEndpoint}: `, err);
-            });
+        return await axiosGet(apiEndpoint)
+          .then((response) => response.data)
+          .catch((err) => {
+            console.error(`[Push SDK] - API ${apiEndpoint}: `, err);
+          });
     } catch (err) {
         console.error(`[Push SDK] - API  - Error - API send() -:  `, err);
         throw Error(`[Push SDK] - API  - Error - API send() -: ${err}`);
     }
-};
+  } catch (err) {
+    console.error(`[Push SDK] - API  - Error - API send() -:  `, err);
+    throw Error(`[Push SDK] - API  - Error - API send() -: ${err}`);
+  }
+};

packages/restapi/src/lib/channels/search.ts

@@ -1,6 +1,6 @@
-import axios from 'axios';
 import { getAPIBaseUrls, getQueryParams, getLimit } from '../helpers';
 import Constants, {ENV} from '../constants';
+import { axiosGet } from '../utils/axiosUtil';
 
 /**
  *  GET /v1/channels/search/ 
@@ -34,7 +34,7 @@ export const search = async (
     query: query
   };
   const requestUrl = `${apiEndpoint}?${getQueryParams(queryObj)}`;
-  return axios.get(requestUrl)
+  return axiosGet(requestUrl)
     .then((response) => response.data.channels)
     .catch((err) => {
       console.error(`[Push SDK] - API ${requestUrl}: `, err);

packages/restapi/src/lib/channels/subscribe.ts

@@ -1,12 +1,12 @@
-import axios from 'axios';
 import { getCAIPAddress, getConfig, getCAIPDetails, Signer } from '../helpers';
 import {
   getTypeInformation,
   getDomainInformation,
   getSubscriptionMessage,
 } from './signature.helpers';
-import Constants, { ENV } from '../constants';
-import { SignerType } from '../types';
+import Constants, {ENV} from '../constants';
+import { SignerType } from "../types";
+import { axiosPost } from "../utils/axiosUtil";
 export type SubscribeOptionsType = {
   signer: SignerType;
   channelAddress: string;
@@ -88,7 +88,7 @@ export const subscribe = async (options: SubscribeOptionsType) => {
       },
     };
 
-    await axios.post(requestUrl, body);
+    await axiosPost(requestUrl, body);
 
     if (typeof onSuccess === 'function') onSuccess();
 

packages/restapi/src/lib/channels/subscribeV2.ts

@@ -1,4 +1,3 @@
-import axios from 'axios';
 import { getCAIPAddress, getConfig, getCAIPDetails, Signer } from '../helpers';
 import {
   getDomainInformation,
@@ -7,6 +6,7 @@ import {
 } from './signature.helpers';
 import Constants, { ENV } from '../constants';
 import { SignerType } from '../types';
+import { axiosPost } from '../utils/axiosUtil';
 
 export type SubscribeOptionsV2Type = {
   signer: SignerType;
@@ -87,7 +87,7 @@ export const subscribeV2 = async (options: SubscribeOptionsV2Type) => {
       message: messageInformation.data,
     };
 
-    const res = await axios.post(requestUrl, body);
+    const res = await axiosPost(requestUrl, body);
 
     if (typeof onSuccess === 'function') onSuccess();
 

packages/restapi/src/lib/channels/unsubscribe.ts

@@ -1,12 +1,14 @@
-import axios from 'axios';
 import { getCAIPAddress, getConfig, getCAIPDetails, Signer } from '../helpers';
 import {
   getTypeInformation,
   getDomainInformation,
   getSubscriptionMessage,
 } from './signature.helpers';
-import Constants, { ENV } from '../constants';
-import { SignerType } from '../types';
+import Constants, {ENV} from '../constants';
+import { SignerType } from "../types";
+import { axiosPost } from "../utils/axiosUtil";
+
+
 
 export type UnSubscribeOptionsType = {
   signer: SignerType;
@@ -89,7 +91,7 @@ export const unsubscribe = async (options: UnSubscribeOptionsType) => {
       },
     };
 
-    await axios.post(requestUrl, body);
+    await axiosPost(requestUrl, body);
 
     if (typeof onSuccess === 'function') onSuccess();
 

packages/restapi/src/lib/channels/unsubscribeV2.ts

@@ -1,4 +1,3 @@
-import axios from 'axios';
 import { getCAIPAddress, getConfig, getCAIPDetails, Signer } from '../helpers';
 import {
   getDomainInformation,
@@ -7,6 +6,7 @@ import {
 } from './signature.helpers';
 import Constants, { ENV } from '../constants';
 import { SignerType } from '../types';
+import { axiosPost } from '../utils/axiosUtil';
 
 export type UnSubscribeOptionsV2Type = {
   signer: SignerType;
@@ -87,7 +87,7 @@ export const unsubscribeV2 = async (options: UnSubscribeOptionsV2Type) => {
       message: messageInformation.data,
     };
 
-    const res = await axios.post(requestUrl, body);
+    const res = await axiosPost(requestUrl, body);
 
     if (typeof onSuccess === 'function') onSuccess();
 

packages/restapi/src/lib/chat/approveRequest.ts

@@ -1,4 +1,3 @@
-import axios from 'axios';
 import { getAPIBaseUrls, isValidETHAddress } from '../helpers';
 import Constants, { PACKAGE_BUILD } from '../constants';
 import { EnvOptionsType, SignerType } from '../types';
@@ -11,6 +10,7 @@ import {
   IPGPHelper,
 } from './helpers';
 import * as CryptoJS from 'crypto-js';
+import { axiosPut } from '../utils/axiosUtil';
 import * as AES from '../chat/helpers/aes';
 import { getGroupInfo } from './getGroupInfo';
 import { getAllGroupMembersPublicKeys } from './getAllGroupMembersPublicKeys';
@@ -165,13 +165,9 @@ export const approveCore = async (
     encryptedSecret,
   };
 
-  /**
-   * API CALL TO PUSH NODES
-   */
   const API_BASE_URL = getAPIBaseUrls(env);
   const apiEndpoint = `${API_BASE_URL}/v1/chat/request/accept`;
-  return axios
-    .put(apiEndpoint, body)
+  return axiosPut(apiEndpoint, body)
     .then((response) => {
       return response.data;
     })

packages/restapi/src/lib/chat/chat.ts

@@ -1,7 +1,7 @@
-import axios from 'axios';
 import { getAPIBaseUrls, isValidETHAddress, walletToPCAIP10 } from '../helpers';
 import Constants, { ENV } from '../constants';
 import { IFeeds } from '../types';
+import { axiosGet } from '../utils/axiosUtil';
 import { PGPHelper, addDeprecatedInfo, getInboxLists, getUserDID } from './helpers';
 
 export const chat = async (options: {
@@ -24,7 +24,7 @@ export const chat = async (options: {
   const API_BASE_URL = getAPIBaseUrls(env);
   const apiEndpoint = `${API_BASE_URL}/v1/chat/users/${user}/chat/${recipientWallet}`;
   try {
-    const response = await axios.get(apiEndpoint);
+     const response = await axiosGet(apiEndpoint);
     // If no chat between users, then returns {}
     const chat: IFeeds = response.data;
     if (Object.keys(chat).length !== 0) {

packages/restapi/src/lib/chat/chats.ts

@@ -1,8 +1,8 @@
-import axios from 'axios';
 import { getAPIBaseUrls, isValidETHAddress } from '../helpers';
 import Constants, { ENV } from '../constants';
 import { IFeeds } from '../types';
 import { getInboxLists, getUserDID, addDeprecatedInfo, IPGPHelper, PGPHelper } from './helpers';
+import { axiosGet } from '../utils/axiosUtil';
 
 export type ChatsOptionsType = {
   account: string;
@@ -50,7 +50,7 @@ export const chatsCore = async (options: ChatsOptionsType, pgpHelper: IPGPHelper
   const apiEndpoint = `${API_BASE_URL}/v1/chat/users/${user}/chats?page=${page}&limit=${limit}`;
   const requestUrl = `${apiEndpoint}`;
   try {
-    const response = await axios.get(requestUrl);
+    const response = await axiosGet(requestUrl);
     const chats: IFeeds[] = response.data.chats;
     const updatedChats = addDeprecatedInfo(chats);
     const feeds: IFeeds[] = await getInboxLists({

packages/restapi/src/lib/chat/createGroup.ts

@@ -1,4 +1,3 @@
-import axios from 'axios';
 import { getAPIBaseUrls } from '../helpers';
 import Constants from '../constants';
 import { EnvOptionsType, GroupDTO, SignerType, Rules } from '../types';
@@ -14,6 +13,7 @@ import {
   getConnectedUserV2Core,
 } from './helpers';
 import * as CryptoJS from 'crypto-js';
+import { axiosPost } from '../utils/axiosUtil';
 
 export interface ChatCreateGroupType extends EnvOptionsType {
   account?: string | null;
@@ -149,8 +149,7 @@ export const createGroupCore = async (
       rules
     );
 
-    return axios
-      .post(apiEndpoint, body)
+    return axiosPost(apiEndpoint, body)
       .then((response) => {
         return response.data;
       })