fix: Resolve axios config and message dto

Author: peoray

global.d.ts

@@ -0,0 +1,5 @@
+declare namespace NodeJS {
+  interface ProcessEnv {
+    TERMII_API_KEY: string
+  }
+}

package.json

@@ -1,8 +1,24 @@
 {
   "name": "termii",
   "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
+  "description": "Nodejs SDK for Termii",
+  "author": "",
+  "module": "dist/termii.esm.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/peoray/termii-node-sdk.git"
+  },
+  "homepage": "https://github.com/peoray/termii-node-sdk#readme",
+  "bugs": {
+    "url": "https://github.com/peoray/termii-node-sdk/issues"
+  },
+  "readme": "README.md",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "typings": "dist/index.d.ts",
+  "files": [
+    "dist/**/*"
+  ],
   "engines": {
     "node": ">=16"
   },
@@ -12,16 +28,16 @@
     "lint": "tsdx lint"
   },
   "keywords": [],
-  "author": "",
   "license": "ISC",
   "devDependencies": {
+    "@types/node": "^20.4.8",
     "class-validator": "^0.14.0",
     "ts-node": "^10.9.1",
     "tsdx": "^0.14.1",
     "tslib": "^2.6.1",
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "axios": "^1.4.0"
+    "axios": "^1.3.6"
   }
 }

pnpm-lock.yaml

@@ -1,11 +1,5 @@
 import axios, { AxiosInstance } from 'axios'
-import {
-  IAxiosStruct,
-  BaseError,
-  BASE_URL,
-  excludeFields,
-  handleAxiosError,
-} from './utils'
+import { IAxiosStruct, BaseError, BASE_URL, handleAxiosError } from './utils'
 
 export class TermiiCore {
   public request: AxiosInstance
@@ -23,19 +17,28 @@ export class TermiiCore {
 
   public async useRequest(req: IAxiosStruct) {
     try {
-      const customHeaders = excludeFields(
-        ['common', 'delete', 'get', 'head', 'put', 'patch', 'post'],
-        this.request.defaults.headers
-      )
+      const { method, url, data } = req
 
-      const getUrl = this.request.defaults.baseURL
-      const requestInstance = await axios.request({
-        url: `${getUrl}${req.url}`,
-        method: req.method,
-        headers: customHeaders,
-        data: req.data,
-      })
-      return requestInstance
+      if (method === 'GET' || method === 'DELETE') {
+        return this.request({
+          method,
+          url,
+          params: {
+            api_key: this.apiKey,
+          },
+        })
+      } else if (method === 'POST' || method === 'PUT') {
+        return this.request({
+          method,
+          url,
+          data: {
+            ...data,
+            api_key: this.apiKey,
+          },
+        })
+      } else {
+        throw new BaseError({ message: 'Invalid HTTP method' })
+      }
     } catch (error) {
       throw new BaseError({ message: handleAxiosError(error) })
     }

src/api.ts

@@ -4,7 +4,6 @@ import {
   IsOptional,
   IsObject,
   ValidateNested,
-  IsEnum,
 } from 'class-validator'
 
 class MediaDto {
@@ -17,17 +16,7 @@ class MediaDto {
   caption: string
 }
 
-enum ChannelType {
-  DND = 'dnd',
-  GENERIC = 'generic',
-  WHATSAPP = 'whatsapp',
-}
-
 export class SendMessageDto {
-  @IsNotEmpty()
-  @IsString()
-  apiKey: string
-
   @IsNotEmpty()
   @IsString()
   to: string
@@ -46,8 +35,7 @@ export class SendMessageDto {
 
   @IsNotEmpty()
   @IsString()
-  @IsEnum(ChannelType)
-  channel: ChannelType
+  channel: string
 
   @IsOptional()
   @IsObject()

src/services/message/message.dto.ts

@@ -1,22 +1,21 @@
 import { TermiiCore } from '../../api'
-import { BaseError, handleAxiosError } from '../../utils'
+import { BaseError, IAxiosStruct, handleAxiosError } from '../../utils'
 import { SendMessageDto } from './message.dto'
 
 export class Message extends TermiiCore {
   constructor(apiKey: string) {
     super(apiKey)
   }
-  public async sendSMS(data: SendMessageDto) {
+  public async sendMessage(data: SendMessageDto) {
     try {
-      const requestObj = {
+      const requestObj: IAxiosStruct = {
         method: 'POST',
         url: `/sms/send`,
         data,
       }
 
       const response = await this.useRequest(requestObj)
-      return response
-      //   return data
+      return response.data
     } catch (error) {
       throw new BaseError({ message: handleAxiosError(error) })
     }

src/services/message/message.ts

@@ -6,7 +6,7 @@ export interface Media {
 }
 
 export interface ISendMessage {
-  apiKey: string
+  api_key: string
   to: string
   from: string
   sms: string
@@ -15,7 +15,9 @@ export interface ISendMessage {
   media?: Media
 }
 export interface ISendMessageResponse {
+  code: string
   message_id: string
+  message_id_str: string
   message: string
   balance: string
   user: string

src/types/message/index.ts

@@ -12,7 +12,7 @@ export class BaseError extends Error {
   constructor(options: Record<any, any> = {}) {
     const errorMessage = options.message || '' // Default to an empty string if options.message is not provided
     super(errorMessage)
-    Error.captureStackTrace(this, this.constructor)
+    // Error.captureStackTrace(this, this.constructor)
     this.name = this.constructor.name
     this.message = options.message
     this.stack = new Error().stack

src/utils/error.ts

@@ -2,9 +2,7 @@
 
 // export interface IAxiosStruct extends AxiosRequestConfig {
 export interface IAxiosStruct {
-  // method: 'GET' | 'POST' | 'PUT' | 'DELETE'
-  method: string
+  method: 'GET' | 'POST' | 'PUT' | 'DELETE'
   url: string
   data?: any
-  params?: any
 }