kimaki 0.4.54 → 0.4.55

package/bin.js

@@ -1,70 +1,2 @@
 #!/usr/bin/env node
-
-// CLI entrypoint with automatic restart capability.
-// Spawns the main CLI and restarts it on non-zero exit codes with throttling.
-// Exit codes 0, 130 (SIGINT), 143 (SIGTERM), or 64 (EXIT_NO_RESTART) terminate cleanly.
-
-import { spawn } from 'node:child_process'
-import { fileURLToPath } from 'node:url'
-import { dirname, join } from 'node:path'
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = dirname(__filename)
-
-const NODE_PATH = process.execPath
-const CLI_PATH = join(__dirname, 'dist', 'cli.js')
-
-let lastStart = 0
-
-async function sleep(ms) {
-  return new Promise(resolve => setTimeout(resolve, ms))
-}
-
-async function run() {
-  while (true) {
-    const now = Date.now()
-    const elapsed = now - lastStart
-    if (elapsed < 5000) {
-      await sleep(5000 - elapsed)
-    }
-    lastStart = Date.now()
-
-    try {
-      const code = await new Promise((resolve) => {
-        const child = spawn(NODE_PATH, [CLI_PATH, ...process.argv.slice(2)], {
-          stdio: 'inherit'
-        })
-
-        child.on('exit', (code, signal) => {
-          if (signal) {
-            // Map signals to exit codes similar to bash
-            if (signal === 'SIGINT') resolve(130)
-            else if (signal === 'SIGTERM') resolve(143)
-            else resolve(1)
-          } else {
-            resolve(code || 0)
-          }
-        })
-
-        child.on('error', (err) => {
-          console.error('Failed to start process:', err)
-          resolve(1)
-        })
-      })
-
-      // Exit cleanly if the app ended OK or via SIGINT/SIGTERM
-      if (code === 0 || code === 130 || code === 143 || code === 64) {
-        process.exit(code)
-      }
-      // otherwise loop; the 5s throttle above will apply
-    } catch (err) {
-      console.error('Unexpected error:', err)
-      // Continue looping after error
-    }
-  }
-}
-
-run().catch(err => {
-  console.error('Fatal error:', err)
-  process.exit(1)
-})
+import './dist/cli.js'

package/dist/channel-management.js

@@ -3,7 +3,7 @@
 // extracts channel metadata from topic tags, and ensures category structure.
 import { ChannelType } from 'discord.js';
 import path from 'node:path';
-import { getDatabase, getChannelDirectory } from './database.js';
+import { getChannelDirectory, setChannelDirectory } from './database.js';
 export async function ensureKimakiCategory(guild, botName) {
     // Skip appending bot name if it's already "kimaki" to avoid "Kimaki kimaki"
     const isKimakiBot = botName?.toLowerCase() === 'kimaki';
@@ -53,9 +53,12 @@ export async function createProjectChannels({ guild, projectDirectory, appId, bo
         parent: kimakiCategory,
         // Channel configuration is stored in SQLite, not in the topic
     });
-    getDatabase()
-        .prepare('INSERT OR REPLACE INTO channel_directories (channel_id, directory, channel_type, app_id) VALUES (?, ?, ?, ?)')
-        .run(textChannel.id, projectDirectory, 'text', appId);
+    await setChannelDirectory({
+        channelId: textChannel.id,
+        directory: projectDirectory,
+        channelType: 'text',
+        appId,
+    });
     let voiceChannelId = null;
     if (enableVoiceChannels) {
         const kimakiAudioCategory = await ensureKimakiAudioCategory(guild, botName);
@@ -64,9 +67,12 @@ export async function createProjectChannels({ guild, projectDirectory, appId, bo
             type: ChannelType.GuildVoice,
             parent: kimakiAudioCategory,
         });
-        getDatabase()
-            .prepare('INSERT OR REPLACE INTO channel_directories (channel_id, directory, channel_type, app_id) VALUES (?, ?, ?, ?)')
-            .run(voiceChannel.id, projectDirectory, 'voice', appId);
+        await setChannelDirectory({
+            channelId: voiceChannel.id,
+            directory: projectDirectory,
+            channelType: 'voice',
+            appId,
+        });
         voiceChannelId = voiceChannel.id;
     }
     return {
@@ -77,13 +83,12 @@ export async function createProjectChannels({ guild, projectDirectory, appId, bo
 }
 export async function getChannelsWithDescriptions(guild) {
     const channels = [];
-    guild.channels.cache
-        .filter((channel) => channel.isTextBased())
-        .forEach((channel) => {
+    const textChannels = guild.channels.cache.filter((channel) => channel.isTextBased());
+    for (const channel of textChannels.values()) {
         const textChannel = channel;
         const description = textChannel.topic || null;
         // Get channel config from database instead of parsing XML from topic
-        const channelConfig = getChannelDirectory(textChannel.id);
+        const channelConfig = await getChannelDirectory(textChannel.id);
         channels.push({
             id: textChannel.id,
             name: textChannel.name,
@@ -91,6 +96,6 @@ export async function getChannelsWithDescriptions(guild) {
             kimakiDirectory: channelConfig?.directory,
             kimakiApp: channelConfig?.appId || undefined,
         });
-    });
+    }
     return channels;
 }