reduce ifs in auth state

Author: clairton

package.json

@@ -1,6 +1,6 @@
 {
   "name": "unoapi-cloud",
-  "version": "2.10.2",
+  "version": "2.11-0-dev",
   "description": "Unoapi Cloud",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",

src/defaults.ts

@@ -79,6 +79,7 @@ export const UNOAPI_RETRY_REQUEST_DELAY_MS = parseInt(process.env.UNOAPI_RETRY_R
 export const DATA_TTL: number = parseInt(process.env.DATA_TTL || `${60 * 60 * 24 * 30}`) // a month
 export const DATA_URL_TTL: number = parseInt(process.env.DATA_URL_TTL || `${60 * 60 * 24 * 3}`) // tree days
 export const SESSION_TTL: number = parseInt(process.env.SESSION_TTL || '-1')
+export const SESSION_KEY_TTL: number = parseInt(process.env.SESSION_KEY_TTL || '-1') // a day
 export const UNOAPI_X_COUNT_RETRIES: string = process.env.UNOAPI_X_COUNT_RETRIES || 'x-unoapi-count-retries'
 export const UNOAPI_X_MAX_RETRIES: string = process.env.UNOAPI_X_MAX_RETRIES || 'x-unoapi-max-retries'
 export const UNOAPI_EXCHANGE_NAME = process.env.UNOAPI_EXCHANGE_NAME || 'unoapi'

src/services/auth_state.ts

@@ -1,11 +1,12 @@
 import { initAuthCreds, proto, AuthenticationState, AuthenticationCreds, makeCacheableSignalKeyStore } from 'baileys'
 import { session } from './session'
 import logger from './logger'
+import { SESSION_KEY_TTL } from '../defaults'
 
 export const authState = async (session: session, phone: string) => {
-  const { readData, writeData, removeData, getKey } = await session(phone)
+  const { readData, writeData, removeData, getKey, extension } = await session(phone)
 
-  const creds: AuthenticationCreds = ((await readData('')) || initAuthCreds()) as AuthenticationCreds
+  const creds: AuthenticationCreds = ((await readData(`creds${extension}`)) || initAuthCreds()) as AuthenticationCreds
 
   const keys = {
     get: async (type: string, ids: string[]) => {
@@ -32,7 +33,7 @@ export const authState = async (session: session, phone: string) => {
         for (const id in data[category]) {
           const value = data[category][id]
           const key = getKey(category, id)
-          tasks.push(value ? writeData(key, value) : removeData(key))
+          tasks.push(value ? writeData(key, value, SESSION_KEY_TTL) : removeData(key || `creds${extension}`))
         }
       }
       await Promise.all(tasks)
@@ -46,7 +47,7 @@ export const authState = async (session: session, phone: string) => {
 
   const saveCreds: () => Promise<void> = async () => {
     logger.debug('save creds %s', phone)
-    return await writeData('', creds)
+    return await writeData(`creds${extension}`, creds, -1)
   }
 
   return {

src/services/redis.ts

@@ -362,10 +362,10 @@ export const getAuth = async (phone: string, parse = (value: string) => JSON.par
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const setAuth = async (phone: string, value: any, stringify = (value: string) => JSON.stringify(value, null, '\t')) => {
+export const setAuth = async (phone: string, value: any, ttl, stringify = (value: string) => JSON.stringify(value, null, '\t')) => {
   const key = authKey(phone)
   const authValue = stringify(value)
-  return redisSetAndExpire(key, authValue, SESSION_TTL)
+  return redisSetAndExpire(key, authValue, ttl)
 }
 
 export const setbulkMessage = async (phone: string, bulkId: string, messageId: string, phoneNumber) => {

src/services/session.ts

@@ -1,5 +1,5 @@
 export interface writeData {
-  (key: string, data: object): Promise<void>
+  (key: string, data: object, ttl: number): Promise<void>
 }
 
 export interface readData {
@@ -15,5 +15,5 @@ export interface getKey {
 }
 
 export interface session {
-  (phone: string): Promise<{ writeData: writeData; readData: readData; removeData: removeData; getKey: getKey }>
+  (phone: string): Promise<{ writeData: writeData; readData: readData; removeData: removeData; getKey: getKey, extension }>
 }

src/services/session_file.ts

@@ -4,8 +4,9 @@ import { session, writeData, readData, removeData, getKey } from './session'
 import logger from './logger'
 
 export const sessionFile: session = async (phone: string) => {
-  const getKey: getKey = (type: string, id: string) => `/${type}-${id}.json`
-  const getFile = (key: string) => `${phone}${key ? key : '/creds.json'}`.replace('/.', '')
+  const extension = '.json'
+  const getKey: getKey = (type: string, id: string) => `${type}-${id}${extension}`
+  const getFile = (key: string) => `${phone}/${key}`.replace('/.', '')
 
   if (!existsSync(phone)) {
     mkdirSync(phone, { recursive: true })
@@ -46,7 +47,7 @@ export const sessionFile: session = async (phone: string) => {
     }
   }
 
-  const writeData: writeData = async (key: string, data: object) => {
+  const writeData: writeData = async (key: string, data: object, _ttl: number) => {
     const file = getFile(key)
     logger.debug('write data', file)
     try {
@@ -88,5 +89,5 @@ export const sessionFile: session = async (phone: string) => {
     }
   }
 
-  return { writeData, readData, removeData, getKey }
+  return { writeData, readData, removeData, getKey, extension }
 }

src/services/session_redis.ts

@@ -4,13 +4,12 @@ import { session, writeData, readData, removeData, getKey } from './session'
 import logger from './logger'
 
 export const sessionRedis: session = async (phone: string) => {
-  const getKey: getKey = (type: string, id: string) => `:${type}-${id}`
-  const getBase = (key: string) => `${phone}${key ? key : ':creds'}`
+  const getKey: getKey = (type: string, id: string) => `${phone}:${type}-${id}`
 
-  const writeData: writeData = async (key: string, data: object) => {
+  const writeData: writeData = async (key: string, data: object, ttl: number) => {
     try {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      return setAuth(getBase(key), data, (value: any) => JSON.stringify(value, BufferJSON.replacer))
+      return setAuth(key, data, ttl, (value: any) => JSON.stringify(value, BufferJSON.replacer))
     } catch (error) {
       logger.error(error, 'Error on write auth')
       throw error
@@ -19,7 +18,7 @@ export const sessionRedis: session = async (phone: string) => {
 
   const readData: readData = async (key: string) => {
     try {
-      return getAuth(getBase(key), (value: string) => {
+      return getAuth(key, (value: string) => {
         try {
           return value ? JSON.parse(value, BufferJSON.reviver) : null
         } catch (error) {
@@ -35,12 +34,12 @@ export const sessionRedis: session = async (phone: string) => {
 
   const removeData: removeData = async (key: string) => {
     try {
-      await delAuth(getBase(key))
+      await delAuth(key)
     } catch (error) {
       logger.error(error, 'Error on remove auth %s')
       throw error
     }
   }
 
-  return { writeData, getKey, removeData, readData }
+  return { writeData, getKey, removeData, readData, extension: '' }
 }