kokoirc 0.2.2 → 0.2.4

package/src/core/irc/events.ts

@@ -1,12 +1,15 @@
 import type { Client } from "kofany-irc-framework"
 import { useStore } from "@/core/state/store"
 import { makeBufferId, BufferType, ActivityLevel } from "@/types"
-import type { Message } from "@/types"
+import type { Message, NickEntry } from "@/types"
+import { nextMsgId } from "@/core/utils/id"
 import { formatDuration, formatDate, buildModeString, buildPrefixMap, buildModeOrder, getHighestPrefix, getNickMode } from "./formatting"
 import { handleNetsplitQuit, handleNetsplitJoin, destroyNetsplitState } from "./netsplit"
 import { shouldSuppressNickFlood, destroyAntifloodState } from "./antiflood"
 import { shouldIgnore } from "./ignore"
 import { eventBus } from "@/core/scripts/event-bus"
+import { parseCommand } from "@/core/commands/parser"
+import { executeCommand } from "@/core/commands/execution"
 
 function isChannelTarget(target: string): boolean {
   return target.startsWith("#") || target.startsWith("&") || target.startsWith("+") || target.startsWith("!")
@@ -53,15 +56,18 @@ export function bindEvents(client: Client, connectionId: string) {
     const s = getStore()
     s.updateConnection(connectionId, { status: "connected", nick: event.nick })
     statusMsg(`%Z9ece6aRegistered as %Zc0caf5${event.nick}%N`)
-    // Auto-join channels from config
     const config = s.config
-    if (config) {
-      const serverConfig = Object.entries(config.servers).find(([id]) => id === connectionId)?.[1]
-      if (serverConfig) {
-        for (const channel of serverConfig.channels) {
-          client.join(channel)
-        }
-      }
+    const serverConfig = config
+      ? Object.entries(config.servers).find(([id]) => id === connectionId)?.[1]
+      : undefined
+
+    // Execute autosendcmd before autojoin (erssi-style: ";"-separated, WAIT <ms> for delays)
+    if (serverConfig?.autosendcmd) {
+      runAutosendcmd(serverConfig.autosendcmd, connectionId, event.nick, () => {
+        autojoinChannels(client, serverConfig)
+      })
+    } else {
+      if (serverConfig) autojoinChannels(client, serverConfig)
     }
   })
 
@@ -140,10 +146,8 @@ export function bindEvents(client: Client, connectionId: string) {
       .filter(([_, buf]) => buf.connectionId === connectionId && buf.users.has(event.nick))
       .map(([id]) => id)
 
-    // Remove nick from all affected channels
-    for (const id of affected) {
-      getStore().removeNick(id, event.nick)
-    }
+    // Batch-remove nick from all affected channels (1 set() call)
+    getStore().batchRemoveNick(affected.map(id => ({ bufferId: id, nick: event.nick })))
 
     // Check if this is a netsplit — if so, batch it instead of showing individual quits
     if (handleNetsplitQuit(connectionId, event.nick, event.message || "", affected)) {
@@ -152,11 +156,12 @@ export function bindEvents(client: Client, connectionId: string) {
 
     if (shouldIgnore(event.nick, event.ident, event.hostname, "QUITS")) return
 
-    for (const id of affected) {
-      getStore().addMessage(id, makeFormattedEvent("quit", [
+    getStore().batchAddMessage(affected.map(id => ({
+      bufferId: id,
+      message: makeFormattedEvent("quit", [
         event.nick, event.ident || "", event.hostname || "", event.message || "",
-      ]))
-    }
+      ]),
+    })))
   })
 
   client.on("kick", (event) => {
@@ -227,14 +232,13 @@ export function bindEvents(client: Client, connectionId: string) {
       : false
 
     s.addMessage(bufferId, {
-      id: crypto.randomUUID(),
+      id: nextMsgId(),
       timestamp: new Date(event.time || Date.now()),
       type: "message",
       nick: event.nick,
       nickMode: getNickMode(s.buffers, bufferId, event.nick),
       text: event.message,
       highlight: isMention,
-      tags: event.tags,
     })
 
     if (s.activeBufferId !== bufferId && !isOwnMsg) {
@@ -257,13 +261,12 @@ export function bindEvents(client: Client, connectionId: string) {
     const bufferId = makeBufferId(connectionId, bufferName)
 
     s.addMessage(bufferId, {
-      id: crypto.randomUUID(),
+      id: nextMsgId(),
       timestamp: new Date(event.time || Date.now()),
       type: "action",
       nick: event.nick,
       text: event.message,
       highlight: false,
-      tags: event.tags,
     })
   })
 
@@ -283,7 +286,7 @@ export function bindEvents(client: Client, connectionId: string) {
       // Fallback to server status buffer
       const statusId = makeBufferId(connectionId, "Status")
       s.addMessage(statusId, {
-        id: crypto.randomUUID(),
+        id: nextMsgId(),
         timestamp: new Date(event.time || Date.now()),
         type: "notice",
         nick: event.nick,
@@ -294,7 +297,7 @@ export function bindEvents(client: Client, connectionId: string) {
     }
 
     s.addMessage(bufferId, {
-      id: crypto.randomUUID(),
+      id: nextMsgId(),
       timestamp: new Date(event.time || Date.now()),
       type: "notice",
       nick: event.nick,
@@ -322,14 +325,24 @@ export function bindEvents(client: Client, connectionId: string) {
       .filter(([_, buf]) => buf.connectionId === connectionId && buf.users.has(event.nick))
       .map(([id]) => id)
 
+    // Batch-update nick across all affected buffers (1 set() call)
+    getStore().batchUpdateNick(affected.map(id => ({
+      bufferId: id, oldNick: event.nick, newNick: event.new_nick,
+    })))
+
     const nickIgnored = shouldIgnore(event.nick, event.ident, event.hostname, "NICKS")
-    for (const id of affected) {
-      getStore().updateNick(id, event.nick, event.new_nick)
-      if (nickIgnored) continue
-      if (shouldSuppressNickFlood(connectionId, id)) continue
-      getStore().addMessage(id, makeFormattedEvent("nick_change", [
-        event.nick, event.new_nick,
-      ]))
+    if (!nickIgnored) {
+      const msgEntries: Array<{ bufferId: string; message: Message }> = []
+      for (const id of affected) {
+        if (shouldSuppressNickFlood(connectionId, id)) continue
+        msgEntries.push({
+          bufferId: id,
+          message: makeFormattedEvent("nick_change", [event.nick, event.new_nick]),
+        })
+      }
+      if (msgEntries.length > 0) {
+        getStore().batchAddMessage(msgEntries)
+      }
     }
   })
 
@@ -364,11 +377,12 @@ export function bindEvents(client: Client, connectionId: string) {
     const prefixMap = buildPrefixMap(conn?.isupport?.PREFIX)
     const modeOrder = buildModeOrder(conn?.isupport?.PREFIX)
 
+    const nickEntries: Array<{ bufferId: string; entry: NickEntry }> = []
     for (const user of event.users) {
       // irc-framework gives modes as array of chars (["o","v"]) or prefix symbols (["@","+"])
       // Normalize to mode chars and store all of them
       const rawModes = (user.modes ?? [])
-        .map((m) => {
+        .map((m: string) => {
           // If it's already a mode char in the order list, keep it
           if (modeOrder.includes(m)) return m
           // Otherwise it's a prefix symbol — reverse-lookup
@@ -380,14 +394,14 @@ export function bindEvents(client: Client, connectionId: string) {
         .filter(Boolean)
         .join("")
       const prefix = getHighestPrefix(rawModes, modeOrder, prefixMap)
-      getStore().addNick(bufferId, {
-        nick: user.nick,
-        prefix,
-        modes: rawModes,
-        away: !!user.away,
-        account: user.account,
+      nickEntries.push({
+        bufferId,
+        entry: { nick: user.nick, prefix, modes: rawModes, away: !!user.away, account: user.account },
       })
     }
+    if (nickEntries.length > 0) {
+      getStore().batchAddNick(nickEntries)
+    }
   })
 
   client.on("mode", (event) => {
@@ -592,18 +606,22 @@ export function bindEvents(client: Client, connectionId: string) {
     }
     if (!event.nick) return
 
-    // Update nick away status in all shared channels
+    // Batch-update nick away status in all shared channels (1 set() call)
+    const nickEntries: Array<{ bufferId: string; entry: NickEntry }> = []
     for (const [bufId, buf] of s.buffers) {
       if (buf.connectionId === connectionId && buf.users.has(event.nick)) {
         const entry = buf.users.get(event.nick)!
-        getStore().addNick(bufId, { ...entry, away: true })
+        nickEntries.push({ bufferId: bufId, entry: { ...entry, away: true } })
       }
     }
+    if (nickEntries.length > 0) {
+      getStore().batchAddNick(nickEntries)
+    }
 
     // Show in query buffer if we have one open (RPL_AWAY response to messaging)
     const queryId = makeBufferId(connectionId, event.nick)
     if (s.buffers.has(queryId)) {
-      s.addMessage(queryId, makeEventMessage(
+      getStore().addMessage(queryId, makeEventMessage(
         `%Z565f89${event.nick} is away${event.message ? ": " + event.message : ""}%N`
       ))
     }
@@ -617,13 +635,17 @@ export function bindEvents(client: Client, connectionId: string) {
     }
     if (!event.nick) return
 
-    // Update nick away status in all shared channels
+    // Batch-update nick away status in all shared channels (1 set() call)
+    const nickEntries: Array<{ bufferId: string; entry: NickEntry }> = []
     for (const [bufId, buf] of s.buffers) {
       if (buf.connectionId === connectionId && buf.users.has(event.nick)) {
         const entry = buf.users.get(event.nick)!
-        getStore().addNick(bufId, { ...entry, away: false })
+        nickEntries.push({ bufferId: bufId, entry: { ...entry, away: false } })
       }
     }
+    if (nickEntries.length > 0) {
+      getStore().batchAddNick(nickEntries)
+    }
   })
 
   // ─── Channel redirect ─────────────────────────────────────
@@ -712,15 +734,19 @@ export function bindEvents(client: Client, connectionId: string) {
   // ACCOUNT-NOTIFY — a user's account changed (requires account-notify cap)
   client.on("account", (event) => {
     const s = getStore()
+    const nickEntries: Array<{ bufferId: string; entry: NickEntry }> = []
     for (const [bufId, buf] of s.buffers) {
       if (buf.connectionId === connectionId && buf.users.has(event.nick)) {
         const entry = buf.users.get(event.nick)!
-        getStore().addNick(bufId, {
-          ...entry,
-          account: event.account === false ? undefined : event.account,
+        nickEntries.push({
+          bufferId: bufId,
+          entry: { ...entry, account: event.account === false ? undefined : event.account },
         })
       }
     }
+    if (nickEntries.length > 0) {
+      getStore().batchAddNick(nickEntries)
+    }
   })
 
   // ─── Displayed host ────────────────────────────────────────
@@ -1008,7 +1034,7 @@ function displayNumberedList(
 /** System/inline event — text may contain %Z color codes. */
 function makeEventMessage(text: string): Message {
   return {
-    id: crypto.randomUUID(),
+    id: nextMsgId(),
     timestamp: new Date(),
     type: "event",
     text,
@@ -1019,7 +1045,7 @@ function makeEventMessage(text: string): Message {
 /** IRC event with theme format key — rendered via [formats.events] in MessageLine. */
 function makeFormattedEvent(key: string, params: string[]): Message {
   return {
-    id: crypto.randomUUID(),
+    id: nextMsgId(),
     timestamp: new Date(),
     type: "event",
     text: params.join(" "),
@@ -1029,3 +1055,51 @@ function makeFormattedEvent(key: string, params: string[]): Message {
   }
 }
 
+// ─── Autosendcmd ─────────────────────────────────────────
+
+/** Join channels from config, supporting "channel key" syntax. */
+function autojoinChannels(client: Client, serverConfig: import("@/types/config").ServerConfig) {
+  for (const entry of serverConfig.channels) {
+    const spaceIdx = entry.indexOf(" ")
+    if (spaceIdx === -1) {
+      client.join(entry)
+    } else {
+      client.join(entry.slice(0, spaceIdx), entry.slice(spaceIdx + 1))
+    }
+  }
+}
+
+/**
+ * Execute autosendcmd string (erssi-style: ";"-separated commands, WAIT <ms> for delays).
+ * Substitutes $N with current nick. Calls onDone() when all commands (including WAITs) complete.
+ */
+function runAutosendcmd(cmd: string, connectionId: string, nick: string, onDone: () => void) {
+  const parts = cmd.split(";").map((p) => p.trim()).filter(Boolean)
+  let i = 0
+
+  function next() {
+    while (i < parts.length) {
+      const part = parts[i++]
+      // Variable substitution ($N = nick)
+      const expanded = part.replace(/\$\{?N\}?/g, nick)
+
+      // WAIT <ms> — delay before next command
+      const waitMatch = expanded.match(/^WAIT\s+(\d+)$/i)
+      if (waitMatch) {
+        setTimeout(next, parseInt(waitMatch[1], 10))
+        return
+      }
+
+      // Treat as command: prepend / if missing, parse and execute
+      const line = expanded.startsWith("/") ? expanded : "/" + expanded
+      const parsed = parseCommand(line)
+      if (parsed) {
+        executeCommand(parsed, connectionId)
+      }
+    }
+    onDone()
+  }
+
+  next()
+}
+

package/src/core/irc/netsplit.ts

@@ -1,6 +1,7 @@
 import { useStore } from "@/core/state/store"
 import { makeBufferId } from "@/types"
 import type { Message } from "@/types"
+import { nextMsgId } from "@/core/utils/id"
 
 // ─── Types ───────────────────────────────────────────────────
 
@@ -232,7 +233,7 @@ function tick(connId: string) {
 
 function makeEventMessage(text: string): Message {
   return {
-    id: crypto.randomUUID(),
+    id: nextMsgId(),
     timestamp: new Date(),
     type: "event",
     text,

package/src/core/scripts/api.ts

@@ -1,6 +1,7 @@
 import { useStore } from "@/core/state/store"
 import { getClient } from "@/core/irc"
 import { makeBufferId } from "@/types"
+import { nextMsgId } from "@/core/utils/id"
 import { eventBus } from "./event-bus"
 import { EventPriority } from "./types"
 import type {
@@ -106,7 +107,7 @@ export function createScriptAPI(meta: ScriptMeta, scriptDefaults: Record<string,
       const buf = s.activeBufferId
       if (!buf) return
       s.addMessage(buf, {
-        id: crypto.randomUUID(),
+        id: nextMsgId(),
         timestamp: new Date(),
         type: "event",
         text,
@@ -115,7 +116,7 @@ export function createScriptAPI(meta: ScriptMeta, scriptDefaults: Record<string,
     },
     addMessage(bufferId, partial) {
       useStore.getState().addMessage(bufferId, {
-        id: crypto.randomUUID(),
+        id: nextMsgId(),
         timestamp: new Date(),
         ...partial,
       })