@shoru/kitten 0.0.1-beta → 0.0.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@shoru/kitten",
   "type": "module",
-  "version": "0.0.1-beta",
+  "version": "0.0.2",
   "description": "A powerful Node.js framework to simplify making WhatsApp Bots",
   "main": "src/index.js",
   "repository": {

package/src/auth/init-session.js

@@ -1,6 +1,8 @@
 import { makeWASocket } from "baileys";
 import { useLMDBAuthState } from "./lmdb-auth-state.js";
-import { config } from "#internals.js";
+import { getConfig } from "#internals.js";
+
+const config = await getConfig();
 
 export const initSession = async ({ socketConfig, id } = {}) => {
   try {

package/src/auth/lmdb-auth-state.js

@@ -17,11 +17,9 @@ const keyBuilder = (sessionId) => {
 };
 
 const genID = async (db) => {
-  return db.transaction(() => {
-    const id = (db.get(COUNTER_KEY) ?? 0) + 1;
-    db.put(COUNTER_KEY, id);
-    return id;
-  });
+  const id = (db.get(COUNTER_KEY) ?? 0) + 1;
+  await db.put(COUNTER_KEY, id);
+  return id;
 };
 
 const getSessionId = async (db, input) => {
@@ -37,6 +35,17 @@ export async function useLMDBAuthState(inputSessionId) {
   const sessionId = await getSessionId(db, inputSessionId);
   const keys = keyBuilder(sessionId);
 
+  const existingCreds = db.get(keys.creds);
+  let creds;
+  
+  if (existingCreds != null) {
+    creds = deserialize(existingCreds);
+  } else {
+    creds = initAuthCreds();
+    await db.put(keys.creds, serialize(creds));
+    await db.put(`${SESSION_PREFIX}${sessionId}`, true);
+  }
+
   const writeCreds = async (credsData) => {
     await db.put(keys.creds, serialize(credsData));
   };
@@ -44,90 +53,87 @@ export async function useLMDBAuthState(inputSessionId) {
   const getKeys = (type, ids) => {
     if (!ids.length) return {};
 
-    const keyList = ids.map((id) => keys.forKey(type, id));
-    const values = db.getMany(keyList);
-
     const result = {};
-    for (let i = 0; i < ids.length; i++) {
-      const rawValue = values[i];
+    for (const id of ids) {
+      const dbKey = keys.forKey(type, id);
+      const rawValue = db.get(dbKey);
 
-      if (rawValue) {
+      if (rawValue != null) {
         try {
           let parsed = deserialize(rawValue);
           if (type === "app-state-sync-key" && parsed) {
             parsed = proto.Message.AppStateSyncKeyData.fromObject(parsed);
           }
-          result[ids[i]] = parsed;
+          result[id] = parsed;
         } catch (err) {
           logger.error(
             err,
-            `[LMDBAuthState] Deserialize error: ${type}:${ids[i]}`
+            `[LMDBAuthState] Deserialize error: ${type}:${id}`
           );
-          db.remove(keys.forKey(type, ids[i]));
+          result[id] = null;
         }
+      } else {
+        result[id] = null;
       }
     }
     return result;
   };
 
   const setKeys = async (data) => {
-    await db.batch(() => {
-      for (const [category, categoryData] of Object.entries(data)) {
-        if (!categoryData) continue;
-        for (const [id, value] of Object.entries(categoryData)) {
-          const key = keys.forKey(category, id);
-          if (value != null) {
-            db.put(key, serialize(value));
-          } else {
-            db.remove(key);
-          }
+    const writes = [];
+    
+    for (const [category, categoryData] of Object.entries(data)) {
+      if (!categoryData) continue;
+      for (const [id, value] of Object.entries(categoryData)) {
+        const key = keys.forKey(category, id);
+        if (value != null) {
+          writes.push(db.put(key, serialize(value)));
+        } else {
+          writes.push(db.remove(key));
         }
       }
-    });
+    }
+    
+    if (writes.length > 0) {
+      await Promise.all(writes);
+    }
   };
 
   const clearKeys = async () => {
     let count = 0;
-    await db.batch(() => {
-      for (const { key } of db.getRange({
-        start: keys.sessionPrefix,
-        end: `${keys.sessionPrefix}\xFF`,
-      })) {
-        if (key !== keys.creds) {
-          db.remove(key);
-          count++;
-        }
+    const writes = [];
+    
+    for (const { key } of db.getRange({
+      start: keys.sessionPrefix,
+      end: `${keys.sessionPrefix}\xFF`,
+    })) {
+      if (key !== keys.creds) {
+        writes.push(db.remove(key));
+        count++;
       }
-    });
+    }
+    
+    if (writes.length > 0) {
+      await Promise.all(writes);
+    }
     logger.debug(`[LMDBAuthState] Cleared ${count} keys`);
   };
 
   const deleteSession = async () => {
-    await db.batch(() => {
-      for (const { key } of db.getRange({
-        start: keys.sessionPrefix,
-        end: `${keys.sessionPrefix}\xFF`,
-      })) {
-        db.remove(key);
-      }
-      db.remove(`${SESSION_PREFIX}${sessionId}`);
-    });
-
+    const writes = [];
+    
+    for (const { key } of db.getRange({
+      start: keys.sessionPrefix,
+      end: `${keys.sessionPrefix}\xFF`,
+    })) {
+      writes.push(db.remove(key));
+    }
+    writes.push(db.remove(`${SESSION_PREFIX}${sessionId}`));
+    
+    await Promise.all(writes);
     logger.debug(`[LMDBAuthState] Deleted session ${sessionId}`);
   };
 
-  const creds = await db.transaction(() => {
-    const existing = db.get(keys.creds);
-    if (existing != null) {
-      return deserialize(existing);
-    }
-
-    const newCreds = initAuthCreds();
-    db.put(keys.creds, serialize(newCreds));
-    db.put(`${SESSION_PREFIX}${sessionId}`, true);
-    return newCreds;
-  });
-
   return {
     state: {
       creds,

package/src/client/client.js

@@ -276,12 +276,6 @@ export class Client {
     this.id = session.id;
     this.#flag = `CLIENT-${session.id}`;
 
-    try {
-      this.#plugins = await pluginManager(this.sock);
-    } catch (err) {
-      this.#logger.error(err, `[${this.#flag}] Failed to initialize plugins`);
-    }
-
     this.sock.ev.on('connection.update', (update) => {
       this.#handleConnectionUpdate(update);
     });
@@ -310,6 +304,14 @@ export class Client {
 
     this.#register();
 
+    if (!this.#plugins || this.#plugins.destroyed) {
+      try {
+        this.#plugins = await pluginManager(this.sock);
+      } catch (err) {
+        this.#logger.error(err, `[${this.#flag}] Failed to initialize plugins`);
+      }
+    }
+
     const attempts = this.#reconnectAttempts;
     this.#reconnectAttempts = 0;
 

package/src/config/default.js

@@ -22,6 +22,7 @@ const db = {
 
 const plugins = {
   dir: 'plugins',
+  prefixes: ['.', '\\', '!'],
   defaultEvent: 'messages.upsert',
   hmr: {
     enable: false,
@@ -34,6 +35,5 @@ export default {
   db,
   socket,
   plugins,
-  timeZone: 'Africa/Casablanca',
-  prefixes: ['!', '.']
+  timeZone: 'Africa/Casablanca'
 }

package/src/formatter/index.js

@@ -1,11 +1,14 @@
 import { formatMessage } from './format-message.js';
 
-export const formatter = async (wa, event, eventName) => {
-  eventName ??= 'massages.upsert';
+export const formatter = (wa, event, eventName) => {
+  eventName ??= 'messages.upsert';
   
   switch (eventName) {
-    case 'massages.upsert':
-      return formatMessage(wa, event);
+    case 'messages.upsert':
+      return {
+        ...formatMessage(wa, event),
+        event: eventName
+      };
     default: return event;
   }
 }

package/src/index.js

@@ -1,4 +1,5 @@
+export * from "#internals.js";
+export * from "#utils.js";
 export * from "#auth.js";
 export * from "#client.js";
-export * from "#internals.js";
-export * from "#utils.js";
+export * from "#formatter.js"

package/src/internals/config.js

@@ -35,6 +35,11 @@ export const loadConfig = async () => {
   return defu(userConfig, defaultConfig);
 };
 
-const configObject = await loadConfig()
+let cachedConfig = null;
 
-export const config = Object.freeze(configObject);
+export const getConfig = async () => {
+  if (!cachedConfig) {
+    cachedConfig = Object.freeze(await loadConfig());
+  }
+  return cachedConfig;
+};

package/src/internals/index.js

@@ -1,5 +1,5 @@
-export * from './logger.js';
-export * from './lmdb-manager.js';
 export * from './config.js';
+export * from './logger.js';
 export * from './spinner.js';
+export * from './lmdb-manager.js';
 export * from './plugin-manager.js'

package/src/internals/lmdb-manager.js

@@ -1,6 +1,8 @@
 import { open } from 'lmdb';
 import { logger } from './logger.js';
-import { config } from './config.js';
+import { getConfig } from './config.js';
+
+const config = await getConfig();
 
 class LMDBDatabaseManager {
   #db = null;

package/src/internals/plugin-manager.js

@@ -1,11 +1,13 @@
 import { Mutex } from 'async-mutex';
-import { config, logger } from '#internals.js';
+import { getConfig, logger } from '#internals.js';
 import { watch } from 'chokidar';
 import fs from 'fs/promises';
 import path from 'path';
 import { pathToFileURL } from 'url';
 import { formatter } from '#formatter.js';
 
+const config = await getConfig();
+
 const {
   dir,
   defaultEvent,
@@ -17,7 +19,7 @@ const {
   }
 } = config.plugins;
 
-const PLUGIN_DIR = path.resolve(import.meta.dirname ?? '.', dir);
+const PLUGIN_DIR = path.join(process.cwd(), dir);
 
 const EVENTS = new Set([
   'messaging-history.set', 'chats.upsert', 'chats.update', 'chats.delete',
@@ -55,10 +57,8 @@ export class PluginManager {
       ?? PluginManager.#fileLocks.set(filePath, new Mutex()).get(filePath);
   }
 
-  static #handleError(context, err, level = 'error') {
+  static #handleError(context, err) {
     if (isDebug) {
-      logger.error(err, context);
-    } else if (level === 'error') {
       logger.warn(`${context} ${err?.message ?? 'Unknown error'}`);
     }
   }
@@ -138,14 +138,15 @@ export class PluginManager {
 
     let loaded = 0;
     let failed = 0;
-
+    
     for (let i = 0; i < results.length; i++) {
       const result = results[i];
       if (result.status === 'fulfilled') {
         loaded += result.value?.size ?? 0;
       } else {
         failed++;
-        PluginManager.#handleError(`[PluginManager] Failed to load ${files[i].path}:`, result.reason, 'warn');
+        const rel = path.relative(PLUGIN_DIR, files[i].path);
+        PluginManager.#handleError(`[PluginManager:${rel}] Failed to load:`, result.reason);
       }
     }
 
@@ -198,7 +199,7 @@ export class PluginManager {
     return null;
   }
 
-  static #compile(match, prefixOpt) {
+  static #compile(match, prefixOpt = PREFIXES) {
     if (!Array.isArray(match) || !match.length) return null;
 
     const strings = match.filter(m => typeof m === 'string').map(s => s.toLowerCase());
@@ -234,12 +235,12 @@ export class PluginManager {
 
         if (cmd) {
           if (matchers.set.has(cmd)) {
-            return { value: cmd, prefix, captures: null };
+            return { match: cmd, prefix };
           }
 
           for (const s of matchers.strings) {
             if (cmd.length > s.length && cmd.startsWith(s)) {
-              return { value: s, prefix, captures: null };
+              return { match: s, prefix };
             }
           }
         }
@@ -249,7 +250,7 @@ export class PluginManager {
     for (const re of matchers.regexes) {
       re.lastIndex = 0;
       const m = re.exec(body);
-      if (m) return { value: re, prefix: null, captures: m };
+      if (m) return { match: m, prefix: null };
     }
 
     return null;
@@ -288,7 +289,7 @@ export class PluginManager {
       if (!active.has(event)) {
         this.#sock.ev.off(event, handler);
         this.#handlers.delete(event);
-        if (isDebug) logger.debug(`[Events] ⬇ ${event}`);
+        if (isDebug) logger.debug(`[Events] (-) ${event}`);
       }
     }
 
@@ -297,7 +298,7 @@ export class PluginManager {
         const handler = this.#createHandler(event);
         this.#sock.ev.on(event, handler);
         this.#handlers.set(event, handler);
-        if (isDebug) logger.debug(`[Events] ⬆ ${event}`);
+        if (isDebug) logger.debug(`[Events] (+) ${event}`);
       }
     }
   }
@@ -317,11 +318,11 @@ export class PluginManager {
       'messages.upsert': ({ messages, type }) => {
         if (type !== 'notify') return;
         for (const msg of messages) {
-          if (!msg?.key?.remoteJid || msg.key.remoteJid === 'status@broadcast' || msg.key.fromMe) continue;
+          if (!msg?.key?.remoteJid || msg.key.remoteJid === 'status@broadcast') continue;
           try {
             dispatch(formatter(sock, msg, event));
           } catch (err) {
-            PluginManager.#handleError('[PluginManager] Format error:', err, 'warn');
+            PluginManager.#handleError('[PluginManager] Format error:', err);
           }
         }
       },
@@ -386,7 +387,7 @@ export class PluginManager {
       .on('add', p => PluginManager.#debounce(p, 'add'))
       .on('change', p => PluginManager.#debounce(p, 'change'))
       .on('unlink', p => PluginManager.#debounce(p, 'unlink'))
-      .on('error', e => PluginManager.#handleError('[Watcher]', e, 'warn'));
+      .on('error', e => PluginManager.#handleError('[Watcher]', e));
   }
 
   static #debounce(filePath, type) {
@@ -402,14 +403,12 @@ export class PluginManager {
 
   static async #hmr(filePath, type) {
     const rel = path.relative(PLUGIN_DIR, filePath);
-    const ts = isDebug ? new Date().toISOString().slice(11, 19) : '';
-    const tag = isDebug ? `[HMR:${ts}]` : '[HMR]';
 
     try {
       await PluginManager.#getLock(filePath).runExclusive(async () => {
         if (type === 'unlink') {
           const n = PluginManager.#unloadFile(filePath);
-          logger.info(`${tag} Unloaded: ${rel} (${n})`);
+          logger.info(`[HMR] Unloaded: ${rel} (${n})`);
         } else {
           const parent = PluginManager.#getParent(path.dirname(filePath));
           const plugins = await PluginManager.#loadFile(filePath, parent, false);
@@ -421,13 +420,13 @@ export class PluginManager {
             PluginManager.#register(id, plugin);
           }
 
-          logger.info(`${tag} ${type === 'add' ? 'Added' : 'Reloaded'}: ${rel} (${plugins.size})`);
+          logger.info(`[HMR] ${type === 'add' ? 'Added' : 'Reloaded'}: ${rel} (${plugins.size})`);
         }
 
         PluginManager.#syncAll();
       });
     } catch (err) {
-      PluginManager.#handleError(`${tag} Failed: ${rel}`, err);
+      PluginManager.#handleError(`[HMR:${rel}] Failed:`, err);
     } finally {
       if (type === 'unlink') {
         const lock = PluginManager.#fileLocks.get(filePath);

package/src/utils/buffer-json.js

@@ -2,10 +2,25 @@ import { BufferJSON } from 'baileys';
 
 export const serialize = (data) => {
   if (data == null) return null;
-  return JSON.stringify(data, BufferJSON.replacer);
-} 
+  try {
+    return JSON.stringify(data, BufferJSON.replacer);
+  } catch (err) {
+    throw new Error(`Serialization failed: ${err.message}`, { cause: err });
+  }
+}; 
 
 export const deserialize = (json) => {
   if (json == null) return null;
-  return JSON.parse(json, BufferJSON.reviver);
+  
+  const str = typeof json === 'string' 
+    ? json 
+    : Buffer.isBuffer(json) 
+      ? json.toString('utf8') 
+      : String(json);
+  
+  try {
+    return JSON.parse(str, BufferJSON.reviver);
+  } catch (err) {
+    throw new Error(`Deserialization failed: ${err.message}`, { cause: err });
+  }
 };

package/src/utils/time-string.js

@@ -1,6 +1,6 @@
-import { loadConfig } from '#internals.js';
+import { getConfig } from '#internals.js';
 
-const { timeZone } = await loadConfig();
+const { timeZone } = await getConfig();
 
 export const getTimeString = (timestamp, TIME_ZONE = timeZone) => {
   const date = new Date(timestamp * 1000);