ntfy-reverse-proxy 2.0.4 → 2.1.1

package/build/src/cli/menu/interactive.js

@@ -1,6 +1,6 @@
-import { existsSync, readFileSync } from 'fs';
-import { dirname, join } from 'path';
-import { fileURLToPath } from 'url';
+import { existsSync, readFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { Bootstrap, CLIHeader, Logger } from '@cbnventures/nova/toolkit';
 import chalk from 'chalk';
 import prompts from 'prompts';
@@ -64,19 +64,24 @@ async function interactiveMenu(configDirs) {
             message: chalk.cyan('What would you like to do?'),
             choices: [
                 {
-                    title: 'Manage Servers', value: 'servers',
+                    title: 'Manage Servers',
+                    value: 'servers',
                 },
                 {
-                    title: 'Manage Contexts', value: 'contexts',
+                    title: 'Manage Contexts',
+                    value: 'contexts',
                 },
                 {
-                    title: 'Settings', value: 'settings',
+                    title: 'Settings',
+                    value: 'settings',
                 },
                 {
-                    title: 'Deploy', value: 'deploy',
+                    title: 'Deploy',
+                    value: 'deploy',
                 },
                 {
-                    title: 'Exit', value: 'exit',
+                    title: 'Exit',
+                    value: 'exit',
                 },
             ],
         });
@@ -115,16 +120,20 @@ async function serverMenu(configPath) {
             message: chalk.cyan('Manage Servers'),
             choices: [
                 {
-                    title: 'Add', value: 'add',
+                    title: 'Add',
+                    value: 'add',
                 },
                 {
-                    title: 'Edit', value: 'edit',
+                    title: 'Edit',
+                    value: 'edit',
                 },
                 {
-                    title: 'Remove', value: 'remove',
+                    title: 'Remove',
+                    value: 'remove',
                 },
                 {
-                    title: 'Back', value: 'back',
+                    title: chalk.dim('Go back'),
+                    value: 'back',
                 },
             ],
         });
@@ -198,12 +207,19 @@ async function serverMenu(configPath) {
                         type: 'select',
                         name: 'name',
                         message: 'Select server to edit:',
-                        choices: servers.map((server) => ({
-                            title: server['name'], value: server['name'],
-                        })),
+                        choices: [
+                            ...servers.map((server) => ({
+                                title: server['name'],
+                                value: server['name'],
+                            })),
+                            {
+                                title: chalk.dim('Go back'),
+                                value: 'back',
+                            },
+                        ],
                     });
                     const name = selectResponse['name'];
-                    if (name !== undefined) {
+                    if (name !== undefined && name !== 'back') {
                         const current = servers.find((server) => server['name'] === name);
                         const currentServer = (current !== undefined) ? current['server'] : undefined;
                         const updates = await prompts([
@@ -217,8 +233,8 @@ async function serverMenu(configPath) {
                                         return 'URL must start with https://';
                                     }
                                     try {
-                                        const urlInstance = new URL(value);
-                                        void urlInstance;
+                                        const editUrlInstance = new URL(value);
+                                        void editUrlInstance;
                                         return true;
                                     }
                                     catch {
@@ -240,6 +256,9 @@ async function serverMenu(configPath) {
                                 },
                             },
                         ]);
+                        if (updates['server'] === undefined || updates['token'] === undefined) {
+                            continue;
+                        }
                         const editImport = await import('../commands/server.js');
                         const updatesServerString = updates['server'];
                         const serverUrlTrimmed = updatesServerString.trim();
@@ -262,45 +281,52 @@ async function serverMenu(configPath) {
                 }
             }
             catch (error) {
-                const errorMessage = (error instanceof Error) ? error['message'] : String(error);
-                Logger.error(`Error: ${errorMessage}`);
+                const editErrorMessage = (error instanceof Error) ? error['message'] : String(error);
+                Logger.error(`Error: ${editErrorMessage}`);
             }
         }
         else if (action === 'remove') {
             try {
-                const servers = listServers(configPath);
-                servers.sort((a, b) => a['name'].localeCompare(b['name']));
-                if (servers['length'] === 0) {
+                const removeServers = listServers(configPath);
+                removeServers.sort((a, b) => a['name'].localeCompare(b['name']));
+                if (removeServers['length'] === 0) {
                     Logger.warn('No servers to remove.');
                 }
                 else {
-                    const selectResponse = await prompts({
+                    const removeSelectResponse = await prompts({
                         type: 'select',
                         name: 'name',
                         message: 'Select server to remove:',
-                        choices: servers.map((server) => ({
-                            title: server['name'], value: server['name'],
-                        })),
+                        choices: [
+                            ...removeServers.map((server) => ({
+                                title: server['name'],
+                                value: server['name'],
+                            })),
+                            {
+                                title: chalk.dim('Go back'),
+                                value: 'back',
+                            },
+                        ],
                     });
-                    const name = selectResponse['name'];
-                    if (name !== undefined) {
+                    const removeName = removeSelectResponse['name'];
+                    if (removeName !== undefined && removeName !== 'back') {
                         const confirmResponse = await prompts({
                             type: 'confirm',
                             name: 'confirmed',
-                            message: chalk.yellow(`Remove "${name}"?`),
+                            message: chalk.yellow(`Remove "${removeName}"?`),
                             initial: false,
                         });
                         const confirmed = confirmResponse['confirmed'];
                         if (confirmed === true) {
-                            removeServer(configPath, name);
-                            Logger.info(`Server "${name}" removed.`);
+                            removeServer(configPath, removeName);
+                            Logger.info(`Server "${removeName}" removed.`);
                         }
                     }
                 }
             }
             catch (error) {
-                const errorMessage = (error instanceof Error) ? error['message'] : String(error);
-                Logger.error(`Error: ${errorMessage}`);
+                const removeErrorMessage = (error instanceof Error) ? error['message'] : String(error);
+                Logger.error(`Error: ${removeErrorMessage}`);
             }
         }
     }
@@ -315,16 +341,20 @@ async function contextMenu(configPath) {
             message: chalk.cyan('Manage Contexts'),
             choices: [
                 {
-                    title: 'Add', value: 'add',
+                    title: 'Add',
+                    value: 'add',
                 },
                 {
-                    title: 'Edit', value: 'edit',
+                    title: 'Edit',
+                    value: 'edit',
                 },
                 {
-                    title: 'Remove', value: 'remove',
+                    title: 'Remove',
+                    value: 'remove',
                 },
                 {
-                    title: 'Back', value: 'back',
+                    title: chalk.dim('Go back'),
+                    value: 'back',
                 },
             ],
         });
@@ -360,17 +390,25 @@ async function contextMenu(configPath) {
                         type: 'select',
                         name: 'name',
                         message: 'Select context to edit:',
-                        choices: contexts.map((context) => ({
-                            title: context['name'], value: context['name'],
-                        })),
+                        choices: [
+                            ...contexts.map((context) => ({
+                                title: context['name'],
+                                value: context['name'],
+                            })),
+                            {
+                                title: chalk.dim('Go back'),
+                                value: 'back',
+                            },
+                        ],
                     });
                     const name = selectResponse['name'];
-                    if (name !== undefined) {
+                    if (name !== undefined && name !== 'back') {
                         const current = contexts.find((context) => context['name'] === name);
                         if (current !== undefined) {
-                            const servers = listServers(configPath);
-                            const serverChoices = servers.map((server) => ({
-                                title: server['name'], value: server['name'],
+                            const editServers = listServers(configPath);
+                            const serverChoices = editServers.map((server) => ({
+                                title: server['name'],
+                                value: server['name'],
                             }));
                             const keepIdResponse = await prompts({
                                 type: 'confirm',
@@ -379,6 +417,9 @@ async function contextMenu(configPath) {
                                 initial: true,
                             });
                             const keepId = keepIdResponse['keepId'];
+                            if (keepId === undefined) {
+                                continue;
+                            }
                             let id = undefined;
                             if (keepId === false) {
                                 id = generateId();
@@ -386,37 +427,46 @@ async function contextMenu(configPath) {
                             }
                             const httpChoices = [
                                 {
-                                    title: 'Plain Text', value: 'plain-text',
+                                    title: 'Plain Text',
+                                    value: 'plain-text',
                                 },
                                 {
-                                    title: 'ntfy JSON', value: 'ntfy-json',
+                                    title: 'ntfy JSON',
+                                    value: 'ntfy-json',
                                 },
                                 {
-                                    title: 'Seerr', value: 'seerr',
+                                    title: 'Seerr',
+                                    value: 'seerr',
                                 },
                                 {
-                                    title: 'Synology DSM', value: 'synology',
+                                    title: 'Synology DSM',
+                                    value: 'synology',
                                 },
                                 {
-                                    title: 'Statuspage.io', value: 'statuspage',
+                                    title: 'Statuspage.io',
+                                    value: 'statuspage',
                                 },
                             ];
                             const emailChoices = [
                                 {
-                                    title: 'Plain Text', value: 'plain-text',
+                                    title: 'Plain Text',
+                                    value: 'plain-text',
                                 },
                                 {
-                                    title: 'pfSense', value: 'pfsense',
+                                    title: 'pfSense',
+                                    value: 'pfsense',
                                 },
                                 {
-                                    title: 'UniFi', value: 'unifi',
+                                    title: 'UniFi',
+                                    value: 'unifi',
                                 },
                             ];
                             const knownChoices = (current['type'] === 'http') ? httpChoices : emailChoices;
                             const exists = knownChoices.some((c) => c['value'] === current['interpreter']);
                             if (exists === false) {
                                 knownChoices.unshift({
-                                    title: `${current['interpreter']} (current, unknown)`, value: current['interpreter'],
+                                    title: `${current['interpreter']} (current, unknown)`,
+                                    value: current['interpreter'],
                                 });
                             }
                             const httpValues = [
@@ -442,6 +492,9 @@ async function contextMenu(configPath) {
                                 initial: interpreterInitial,
                             });
                             const interpreter = interpreterResponse['interpreter'];
+                            if (interpreter === undefined) {
+                                continue;
+                            }
                             const topicResponse = await prompts({
                                 type: 'text',
                                 name: 'topic',
@@ -450,6 +503,9 @@ async function contextMenu(configPath) {
                                 validate: (value) => value.trim()['length'] > 0 || 'Topic is required',
                             });
                             const topic = topicResponse['topic'];
+                            if (topic === undefined) {
+                                continue;
+                            }
                             const currentErrorTopic = (current['error_topic'] !== undefined) ? current['error_topic'] : '';
                             const errorTopicResponse = await prompts({
                                 type: 'text',
@@ -458,6 +514,31 @@ async function contextMenu(configPath) {
                                 initial: currentErrorTopic,
                             });
                             const errorTopic = errorTopicResponse['error_topic'];
+                            if (errorTopic === undefined) {
+                                continue;
+                            }
+                            const currentErrorEvents = current['error_events'];
+                            const errorEventsResponse = await prompts({
+                                type: 'multiselect',
+                                name: 'error_events',
+                                message: 'Errors that notify the error topic (space to select):',
+                                choices: [
+                                    {
+                                        title: 'Authentication (failed auth, scanner traffic)',
+                                        value: 'authentication',
+                                        selected: currentErrorEvents === undefined || currentErrorEvents.includes('authentication'),
+                                    },
+                                    {
+                                        title: 'Interpretation (interpreter errors)',
+                                        value: 'interpretation',
+                                        selected: currentErrorEvents === undefined || currentErrorEvents.includes('interpretation'),
+                                    },
+                                ],
+                            });
+                            const errorEvents = errorEventsResponse['error_events'];
+                            if (errorEvents === undefined) {
+                                continue;
+                            }
                             const modeInitial = (current['mode'] === 'send-all') ? 1 : 0;
                             const modeResponse = await prompts({
                                 type: 'select',
@@ -465,15 +546,20 @@ async function contextMenu(configPath) {
                                 message: 'Mode:',
                                 choices: [
                                     {
-                                        title: 'Send to one server only', value: 'send-once',
+                                        title: 'Send to one server only',
+                                        value: 'send-once',
                                     },
                                     {
-                                        title: 'Send to all servers', value: 'send-all',
+                                        title: 'Send to all servers',
+                                        value: 'send-all',
                                     },
                                 ],
                                 initial: modeInitial,
                             });
                             const mode = modeResponse['mode'];
+                            if (mode === undefined) {
+                                continue;
+                            }
                             const showVisitorInfoResponse = await prompts({
                                 type: 'confirm',
                                 name: 'show_visitor_info',
@@ -481,10 +567,14 @@ async function contextMenu(configPath) {
                                 initial: current['show_visitor_info'],
                             });
                             const showVisitorInfo = showVisitorInfoResponse['show_visitor_info'];
+                            if (showVisitorInfo === undefined) {
+                                continue;
+                            }
                             const primaryServerIdx = serverChoices.findIndex((s) => s['value'] === current['primary_server']);
                             if (primaryServerIdx < 0) {
                                 serverChoices.unshift({
-                                    title: `${current['primary_server']} (current, not found)`, value: current['primary_server'],
+                                    title: `${current['primary_server']} (current, not found)`,
+                                    value: current['primary_server'],
                                 });
                             }
                             const primaryServerInitial = (primaryServerIdx >= 0) ? primaryServerIdx : 0;
@@ -496,6 +586,9 @@ async function contextMenu(configPath) {
                                 initial: primaryServerInitial,
                             });
                             const primaryServer = primaryServerResponse['primary_server'];
+                            if (primaryServer === undefined) {
+                                continue;
+                            }
                             const selectedServersResponse = await prompts({
                                 type: 'multiselect',
                                 name: 'selectedServers',
@@ -506,6 +599,9 @@ async function contextMenu(configPath) {
                                 })),
                             });
                             const selectedServers = selectedServersResponse['selectedServers'];
+                            if (selectedServers === undefined) {
+                                continue;
+                            }
                             const updates = {};
                             if (id !== undefined) {
                                 Reflect.set(updates, 'id', id);
@@ -531,7 +627,12 @@ async function contextMenu(configPath) {
                             const errorTopicValue = errorTopic;
                             const errorTopicTrimmed = (errorTopicValue !== undefined) ? errorTopicValue.trim() : '';
                             const resolvedErrorTopic = (errorTopicTrimmed !== '') ? errorTopicTrimmed : undefined;
-                            Reflect.set(updates, 'error_topic', resolvedErrorTopic);
+                            if (errorTopic !== undefined) {
+                                Reflect.set(updates, 'error_topic', resolvedErrorTopic);
+                            }
+                            if (errorEvents !== undefined) {
+                                Reflect.set(updates, 'error_events', errorEvents);
+                            }
                             if (current['type'] === 'http' && current['token'] !== undefined) {
                                 const keepTokenResponse = await prompts({
                                     type: 'confirm',
@@ -540,6 +641,9 @@ async function contextMenu(configPath) {
                                     initial: true,
                                 });
                                 const keepToken = keepTokenResponse['keepToken'];
+                                if (keepToken === undefined) {
+                                    continue;
+                                }
                                 if (keepToken === false) {
                                     const newToken = generateToken();
                                     Reflect.set(updates, 'token', newToken);
@@ -554,10 +658,13 @@ async function contextMenu(configPath) {
                                     initial: false,
                                 });
                                 const addToken = addTokenResponse['addToken'];
+                                if (addToken === undefined) {
+                                    continue;
+                                }
                                 if (addToken === true) {
-                                    const newToken = generateToken();
-                                    Reflect.set(updates, 'token', newToken);
-                                    Logger.info(`  New token: ${newToken}`);
+                                    const addNewToken = generateToken();
+                                    Reflect.set(updates, 'token', addNewToken);
+                                    Logger.info(`  New token: ${addNewToken}`);
                                 }
                             }
                             else if (current['type'] === 'email') {
@@ -569,9 +676,14 @@ async function contextMenu(configPath) {
                                     initial: currentAllowedFrom,
                                 });
                                 const allowedFrom = allowedFromResponse['allowed_from'];
+                                if (allowedFrom === undefined) {
+                                    continue;
+                                }
                                 const allowedFromTrimmed = (allowedFrom !== undefined) ? allowedFrom.trim() : '';
                                 const resolvedAllowedFrom = (allowedFromTrimmed !== '') ? allowedFromTrimmed : undefined;
-                                Reflect.set(updates, 'allowed_from', resolvedAllowedFrom);
+                                if (allowedFrom !== undefined) {
+                                    Reflect.set(updates, 'allowed_from', resolvedAllowedFrom);
+                                }
                             }
                             const editImport = await import('../commands/context.js');
                             editImport.editContext(configPath, name, updates);
@@ -581,45 +693,52 @@ async function contextMenu(configPath) {
                 }
             }
             catch (error) {
-                const errorMessage = (error instanceof Error) ? error['message'] : String(error);
-                Logger.error(`Error: ${errorMessage}`);
+                const editErrorMessage = (error instanceof Error) ? error['message'] : String(error);
+                Logger.error(`Error: ${editErrorMessage}`);
             }
         }
         else if (action === 'remove') {
             try {
-                const contexts = listContexts(configPath);
-                contexts.sort((a, b) => a['name'].localeCompare(b['name']));
-                if (contexts['length'] === 0) {
+                const removeContexts = listContexts(configPath);
+                removeContexts.sort((a, b) => a['name'].localeCompare(b['name']));
+                if (removeContexts['length'] === 0) {
                     Logger.warn('No contexts to remove.');
                 }
                 else {
-                    const selectResponse = await prompts({
+                    const removeSelectResponse = await prompts({
                         type: 'select',
                         name: 'name',
                         message: 'Select context to remove:',
-                        choices: contexts.map((context) => ({
-                            title: context['name'], value: context['name'],
-                        })),
+                        choices: [
+                            ...removeContexts.map((context) => ({
+                                title: context['name'],
+                                value: context['name'],
+                            })),
+                            {
+                                title: chalk.dim('Go back'),
+                                value: 'back',
+                            },
+                        ],
                     });
-                    const name = selectResponse['name'];
-                    if (name !== undefined) {
+                    const removeName = removeSelectResponse['name'];
+                    if (removeName !== undefined && removeName !== 'back') {
                         const confirmResponse = await prompts({
                             type: 'confirm',
                             name: 'confirmed',
-                            message: chalk.yellow(`Remove "${name}"?`),
+                            message: chalk.yellow(`Remove "${removeName}"?`),
                             initial: false,
                         });
                         const confirmed = confirmResponse['confirmed'];
                         if (confirmed === true) {
-                            removeContext(configPath, name);
-                            Logger.info(`Context "${name}" removed.`);
+                            removeContext(configPath, removeName);
+                            Logger.info(`Context "${removeName}" removed.`);
                         }
                     }
                 }
             }
             catch (error) {
-                const errorMessage = (error instanceof Error) ? error['message'] : String(error);
-                Logger.error(`Error: ${errorMessage}`);
+                const removeErrorMessage = (error instanceof Error) ? error['message'] : String(error);
+                Logger.error(`Error: ${removeErrorMessage}`);
             }
         }
     }
@@ -633,10 +752,12 @@ async function addContextFlow(configPath, servers) {
         message: 'Context type:',
         choices: [
             {
-                title: 'HTTP', value: 'http',
+                title: 'HTTP',
+                value: 'http',
             },
             {
-                title: 'Email', value: 'email',
+                title: 'Email',
+                value: 'email',
             },
         ],
     });
@@ -646,30 +767,38 @@ async function addContextFlow(configPath, servers) {
     }
     const httpInterpreters = [
         {
-            title: 'Plain Text', value: 'plain-text',
+            title: 'Plain Text',
+            value: 'plain-text',
         },
         {
-            title: 'ntfy JSON', value: 'ntfy-json',
+            title: 'ntfy JSON',
+            value: 'ntfy-json',
         },
         {
-            title: 'Seerr', value: 'seerr',
+            title: 'Seerr',
+            value: 'seerr',
         },
         {
-            title: 'Synology DSM', value: 'synology',
+            title: 'Synology DSM',
+            value: 'synology',
         },
         {
-            title: 'Statuspage.io', value: 'statuspage',
+            title: 'Statuspage.io',
+            value: 'statuspage',
         },
     ];
     const emailInterpreters = [
         {
-            title: 'Plain Text', value: 'plain-text',
+            title: 'Plain Text',
+            value: 'plain-text',
         },
         {
-            title: 'pfSense', value: 'pfsense',
+            title: 'pfSense',
+            value: 'pfsense',
         },
         {
-            title: 'UniFi', value: 'unifi',
+            title: 'UniFi',
+            value: 'unifi',
         },
     ];
     const nameResponse = await prompts({
@@ -731,16 +860,42 @@ async function addContextFlow(configPath, servers) {
         message: 'ntfy error topic (blank to skip):',
     });
     const errorTopic = errorTopicResponse['error_topic'];
+    if (errorTopic === undefined) {
+        return;
+    }
+    const errorEventsResponse = await prompts({
+        type: 'multiselect',
+        name: 'error_events',
+        message: 'Errors that notify the error topic (space to select):',
+        choices: [
+            {
+                title: 'Authentication (failed auth, scanner traffic)',
+                value: 'authentication',
+                selected: true,
+            },
+            {
+                title: 'Interpretation (interpreter errors)',
+                value: 'interpretation',
+                selected: true,
+            },
+        ],
+    });
+    const errorEvents = errorEventsResponse['error_events'];
+    if (errorEvents === undefined) {
+        return;
+    }
     const modeResponse = await prompts({
         type: 'select',
         name: 'mode',
         message: 'Mode:',
         choices: [
             {
-                title: 'Send to one server only', value: 'send-once',
+                title: 'Send to one server only',
+                value: 'send-once',
             },
             {
-                title: 'Send to all servers', value: 'send-all',
+                title: 'Send to all servers',
+                value: 'send-all',
             },
         ],
     });
@@ -763,7 +918,8 @@ async function addContextFlow(configPath, servers) {
         name: 'primary_server',
         message: 'Primary server:',
         choices: servers.map((server) => ({
-            title: server['name'], value: server['name'],
+            title: server['name'],
+            value: server['name'],
         })),
     });
     const primaryServer = primaryServerResponse['primary_server'];
@@ -775,7 +931,8 @@ async function addContextFlow(configPath, servers) {
         name: 'selectedServers',
         message: 'All servers for this context (space to select):',
         choices: servers.map((server) => ({
-            title: server['name'], value: server['name'],
+            title: server['name'],
+            value: server['name'],
         })),
     });
     const selectedServers = selectedServersResponse['selectedServers'];
@@ -791,6 +948,7 @@ async function addContextFlow(configPath, servers) {
     const topicString = topic;
     const typedInterpreter = interpreter;
     const typedMode = mode;
+    const typedErrorEvents = errorEvents;
     if (contextType === 'http') {
         const autoToken = generateToken();
         const tokenResponse = await prompts({
@@ -800,6 +958,9 @@ async function addContextFlow(configPath, servers) {
             initial: autoToken,
         });
         const rawToken = tokenResponse['token'];
+        if (rawToken === undefined) {
+            return;
+        }
         const tokenTrimmed = (rawToken !== undefined) ? rawToken.trim() : '';
         const resolvedToken = (tokenTrimmed !== '') ? tokenTrimmed : undefined;
         addContext(configPath, {
@@ -809,6 +970,7 @@ async function addContextFlow(configPath, servers) {
             interpreter: typedInterpreter,
             topic: topicString,
             error_topic: resolvedErrorTopic,
+            error_events: typedErrorEvents,
             mode: typedMode,
             show_visitor_info: showVisitorInfo,
             primary_server: primaryServer,
@@ -823,6 +985,9 @@ async function addContextFlow(configPath, servers) {
             message: 'Allowed from email (blank to skip):',
         });
         const rawAllowedFrom = allowedFromResponse['allowed_from'];
+        if (rawAllowedFrom === undefined) {
+            return;
+        }
         const allowedFromTrimmed = (rawAllowedFrom !== undefined) ? rawAllowedFrom.trim() : '';
         const resolvedAllowedFrom = (allowedFromTrimmed !== '') ? allowedFromTrimmed : undefined;
         addContext(configPath, {
@@ -832,6 +997,7 @@ async function addContextFlow(configPath, servers) {
             interpreter: typedInterpreter,
             topic: topicString,
             error_topic: resolvedErrorTopic,
+            error_events: typedErrorEvents,
             mode: typedMode,
             show_visitor_info: showVisitorInfo,
             primary_server: primaryServer,
@@ -893,8 +1059,8 @@ async function settingsFlow(configPath) {
         Logger.info('Settings updated.');
     }
     catch (error) {
-        const errorMessage = (error instanceof Error) ? error['message'] : String(error);
-        Logger.error(`Error: ${errorMessage}`);
+        const updateErrorMessage = (error instanceof Error) ? error['message'] : String(error);
+        Logger.error(`Error: ${updateErrorMessage}`);
     }
     return;
 }