@shoru/kitten 0.0.5 → 0.1.0

package/src/formatter/format-message.js

@@ -1,144 +1,189 @@
-import {
-  isJidGroup, 
-  areJidsSameUser,
-  getDevice,
-  downloadMediaMessage,
-  getContentType,
-  isLidUser,
-  jidNormalizedUser
- } from 'baileys';
-
-import {
-  getTimeString,
-  isString,
-  toNumber,
-  toBase64,
-  getPN
-} from '#utils.js';
-
-const extractMessage = (message) => {
-  let type = getContentType(message);
-  let data = message?.[type];
-
-  // cases like viewonce or document messages etc
-  if (data?.message) {
-    const innerType = getContentType(data.message);
-    if (innerType) {
-      type = innerType;
-      data = data.message[type];
-    }
-  }
-  return [type, data];
-};
-
-const extractContent = (message = {}) => ({
-    body: message.text ?? message.caption ??
-      (isString(message) ? message : undefined),
-    mentions: message.contextInfo?.mentionedJid,
-    groupMentions: message.contextInfo?.groupMentions,
-    mimetype: message.mimetype,
-    fileName: message.fileName,
-    pageCount: message.pageCount,
-    fileLength: toNumber(message.fileLength),
-    hash: toBase64(message.fileSha256),
-    isViewOnce: message.viewOnce,
-    url: message.matchedText,
-    description: message.description,
-    thumbnail: message.jpegThumbnail,
-});
-
-const load = async (x) => downloadMediaMessage(x, 'buffer', {});
-
-export const formatMessage = (sock, raw) => {
-  const myId = jidNormalizedUser(sock.user.lid);
-  const [type, messageData] = extractMessage(raw.message);
-
-  const {
-    pushName: name,
-    messageTimestamp,
-    participant: p1,
-    broadcast,
-    key,
-    key: {
-      remoteJid: roomId, 
-      id, fromMe,
-      participant: p2,
-    }
-  } = raw;
-
-  const jid = fromMe ? myId : p2 || p1 || roomId;
-
-  const {
-    quotedMessage,
-    participant: quotedSender,
-    stanzaId: quotedId,
-    isForwarded,
-    forwardingScore,
-  } = messageData?.contextInfo || {};
-  const [quotedType, quotedData] = extractMessage(quotedMessage);
-
-  const quotedKey = {
-    id: quotedId,
-    participant: quotedSender,
-    remoteJid: roomId,
-    fromMe: areJidsSameUser(quotedSender, myId)
-  };
-
-  return {
-    type,
-    name,
-    id,
-    broadcast,
-    isForwarded,
-    forwardingScore,
-    fromMe,
-    jid,
-    roomId,
-    timestamp: toNumber(messageTimestamp),
-    isLid: isLidUser(jid),
-    device: getDevice(id),
-    isGroup: isJidGroup(roomId),
-    timeString: getTimeString(messageTimestamp),
-    ...extractContent(messageData),
-    key, raw,
-    contextInfo: {
-      stanzaId: id,
-      participant: jid,
-      remoteJid: roomId
-    },
-    load() {
-      return load(this.raw)
-    },
-    senderIs(id) {
-      return areJidsSameUser(this.jid, id)
-    },
-    pn() {
-      return getPN(sock, this.jid)
-    },
-    quoted: quotedData ? {
-      type: quotedType,
-      jid: quotedSender,
-      id: quotedId,
-      ...extractContent(quotedData),
-      key: quotedKey,
-      contextInfo: {
-        stanzaId: quotedId,
-        participant: quotedSender,
-        remoteJid: roomId
-      },
-      raw: {
-        key: quotedKey,
-        message: quotedMessage
-      },
-      load() {
-        return load(this.raw)
-      },
-      senderIs(id) {
-        return areJidsSameUser(this.jid, id)
-      },
-      pn() {
-        return getPN(sock, this.jid)
-      }
-    }: undefined,
-  }
-}
+import {
+  isJidGroup,
+  areJidsSameUser,
+  getDevice,
+  downloadMediaMessage,
+  getContentType,
+  isLidUser,
+  jidNormalizedUser,
+} from 'baileys';
+
+import {
+  getTimeString,
+  isString,
+  toNumber,
+  toBase64,
+  getPN,
+} from '#utils.js';
+
+const extractMessage = (message) => {
+  if (!message) return [undefined, undefined];
+  let type = getContentType(message);
+  let data = message?.[type];
+
+  // cases like viewonce or document messages etc
+  if (data?.message) {
+    const innerType = getContentType(data.message);
+    if (innerType) {
+      type = innerType;
+      data = data.message[type];
+    }
+  }
+  return [type, data];
+};
+
+const extractContent = (message = {}) => ({
+  body:
+    message.text ??
+    message.caption ??
+    (isString(message) ? message : undefined),
+  mentions: message.contextInfo?.mentionedJid,
+  groupMentions: message.contextInfo?.groupMentions,
+  mimetype: message.mimetype,
+  fileName: message.fileName,
+  pageCount: message.pageCount,
+  fileLength: toNumber(message.fileLength),
+  hash: toBase64(message.fileSha256),
+  isViewOnce: message.viewOnce,
+  url: message.matchedText,
+  description: message.description,
+  thumbnail: message.jpegThumbnail,
+});
+
+const load = async (x) => downloadMediaMessage(x, 'buffer', {});
+
+export const formatMessage = (sock, raw) => {
+  const userJid = sock.user?.lid || sock.user?.id || '';
+  const myId = userJid ? jidNormalizedUser(userJid) : '';
+  const [type, messageData] = extractMessage(raw.message);
+
+  const {
+    pushName: name,
+    messageTimestamp,
+    participant: p1,
+    broadcast,
+    key,
+    key: {
+      remoteJid: roomId,
+      id,
+      fromMe,
+      participant: p2,
+    } = {},
+  } = raw;
+
+  const jid = fromMe ? myId : p2 || p1 || roomId;
+
+  const {
+    quotedMessage,
+    participant: quotedSender,
+    stanzaId: quotedId,
+    isForwarded,
+    forwardingScore,
+  } = messageData?.contextInfo || {};
+  const [quotedType, quotedData] = quotedMessage ? extractMessage(quotedMessage) : [undefined, undefined];
+
+  const quotedKey = quotedData
+    ? {
+        id: quotedId,
+        participant: quotedSender,
+        remoteJid: roomId,
+        fromMe: areJidsSameUser(quotedSender, myId),
+      }
+    : undefined;
+
+  let cachedTimeString;
+  let cachedQuoted;
+
+  const msg = {
+    type,
+    name,
+    id,
+    broadcast,
+    isForwarded,
+    forwardingScore,
+    fromMe,
+    jid,
+    roomId,
+    timestamp: toNumber(messageTimestamp),
+    isLid: isLidUser(jid),
+    device: getDevice(id),
+    isGroup: isJidGroup(roomId),
+    ...extractContent(messageData),
+    key,
+    raw,
+    contextInfo: {
+      stanzaId: id,
+      participant: jid,
+      remoteJid: roomId,
+    },
+    load() {
+      return load(this.raw);
+    },
+    senderIs(targetId) {
+      return areJidsSameUser(this.jid, targetId);
+    },
+    pn() {
+      return getPN(sock, this.jid);
+    },
+  };
+
+  Object.defineProperty(msg, 'timeString', {
+    enumerable: true,
+    configurable: true,
+    get() {
+      if (cachedTimeString === undefined) {
+        cachedTimeString = getTimeString(messageTimestamp);
+      }
+      return cachedTimeString;
+    },
+  });
+
+  Object.defineProperty(msg, 'quoted', {
+    enumerable: true,
+    configurable: true,
+    get() {
+      if (!quotedData) return undefined;
+      if (cachedQuoted === undefined) {
+        let cachedQuotedTimeString;
+        cachedQuoted = {
+          type: quotedType,
+          jid: quotedSender,
+          id: quotedId,
+          ...extractContent(quotedData),
+          key: quotedKey,
+          contextInfo: {
+            stanzaId: quotedId,
+            participant: quotedSender,
+            remoteJid: roomId,
+          },
+          raw: {
+            key: quotedKey,
+            message: quotedMessage,
+          },
+          load() {
+            return load(this.raw);
+          },
+          senderIs(targetId) {
+            return areJidsSameUser(this.jid, targetId);
+          },
+          pn() {
+            return getPN(sock, this.jid);
+          },
+        };
+        Object.defineProperty(cachedQuoted, 'timeString', {
+          enumerable: true,
+          configurable: true,
+          get() {
+            if (cachedQuotedTimeString === undefined) {
+              cachedQuotedTimeString = getTimeString(messageTimestamp);
+            }
+            return cachedQuotedTimeString;
+          },
+        });
+      }
+      return cachedQuoted;
+    },
+  });
+
+  return msg;
+};

package/src/index.js

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

package/src/internals/config.js

@@ -1,5 +1,13 @@
 import { cosmiconfig } from 'cosmiconfig';
-import { defu } from 'defu';
+import { createDefu } from 'defu';
+import path from 'path';
+
+const mergeConfig = createDefu((obj, key, value) => {
+  if (Array.isArray(value)) {
+    obj[key] = value;
+    return true;
+  }
+});
 
 const loadDefaultConfig = async () => {
   try {
@@ -19,7 +27,11 @@ const loadDefaultConfig = async () => {
 const loadUserConfig = async () => {
   try {
     const explorer = cosmiconfig('kittenwa');
-    const result = await explorer.search();
+    const searchFrom = process.argv[1] ? path.dirname(path.resolve(process.argv[1])) : process.cwd();
+    let result = await explorer.search(searchFrom);
+    if (!result && searchFrom !== process.cwd()) {
+      result = await explorer.search(process.cwd());
+    }
     return result?.config ?? {};
   } catch (err) {
     throw new Error(`[USER_CONFIG] Error loading user config: ${err.message}`, { cause: err });
@@ -32,7 +44,7 @@ export const loadConfig = async () => {
     loadDefaultConfig()
   ]);
   
-  return defu(userConfig, defaultConfig);
+  return mergeConfig(userConfig, defaultConfig);
 };
 
 let cachedConfig = null;

package/src/internals/index.js

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

package/src/internals/lmdb-manager.js

@@ -1,54 +1,79 @@
-import { open } from 'lmdb';
-import { logger } from './logger.js';
-import { getConfig } from './config.js';
-
-const config = await getConfig();
-
-class LMDBDatabaseManager {
-  #db = null;
-  #config = config.db;
-  #isClosing = false;
-
-  constructor(config) {
-    this.#config = { ...this.#config, ...config };
-  }
-
-  get db() {
-    if (this.#isClosing) {
-      throw new Error('[LMDBManager] Database is closing');
-    }
-
-    if (!this.#db) {
-      this.#db = open(this.#config);
-    }
-
-    return this.#db;
-  }
-
-  get isOpen() {
-    return this.#db !== null && !this.#isClosing;
-  }
-
-  get config() {
-    return Object.freeze({ ...this.#config });
-  }
-
-  async close() {
-    if (!this.#db || this.#isClosing) return;
-
-    this.#isClosing = true;
-
-    try {
-      await this.#db.flushed;
-      await this.#db.close();
-    } catch (err) {
-      logger.error(err, '[LMDBManager] Error closing database');
-      throw err;
-    } finally {
-      this.#db = null;
-      this.#isClosing = false;
-    }
-  }
-}
-
-export const LMDBManager = new LMDBDatabaseManager();
+import { open } from 'lmdb';
+import { logger } from './logger.js';
+import { getConfig } from './config.js';
+
+const config = await getConfig();
+
+class LMDBDatabaseManager {
+  #db = null;
+  #config = config.db;
+  #isClosing = false;
+
+  constructor(config) {
+    this.#config = { ...this.#config, ...config };
+  }
+
+  get db() {
+    if (this.#isClosing) {
+      throw new Error('[LMDBManager] Database is closing');
+    }
+
+    if (!this.#db) {
+      this.#db = open(this.#config);
+    }
+
+    return this.#db;
+  }
+
+  get isOpen() {
+    return this.#db !== null && !this.#isClosing;
+  }
+
+  get config() {
+    return Object.freeze({ ...this.#config });
+  }
+
+  async sync() {
+    if (this.#db && !this.#isClosing) {
+      await this.#db.flushed;
+    }
+  }
+
+  async close() {
+    if (!this.#db || this.#isClosing) return;
+
+    this.#isClosing = true;
+
+    try {
+      await this.#db.flushed;
+      await this.#db.close();
+    } catch (err) {
+      logger.error(err, '[LMDBManager] Error closing database');
+      throw err;
+    } finally {
+      this.#db = null;
+      this.#isClosing = false;
+    }
+  }
+}
+
+export const LMDBManager = new LMDBDatabaseManager();
+
+// Graceful shutdown hooks to guarantee asynchronous writes are flushed
+const handleExit = async () => {
+  try {
+    await LMDBManager.close();
+  } catch {
+    /* noop */
+  }
+};
+
+process.once('beforeExit', handleExit);
+process.once('SIGINT', async () => {
+  await handleExit();
+  process.exit(0);
+});
+process.once('SIGTERM', async () => {
+  await handleExit();
+  process.exit(0);
+});

package/src/plugins/config.js

@@ -14,7 +14,7 @@ export const {
   }
 } = config.plugins;
 
-export const PLUGIN_DIR = path.join(process.cwd(), dir);
+export const PLUGIN_DIR = path.resolve(process.cwd(), dir);
 
 export const EVENTS = Object.freeze(new Set([
   'messaging-history.set', 'chats.upsert', 'chats.update', 'chats.delete',