nonotify 0.1.5 → 0.1.6

package/README.md

@@ -14,7 +14,7 @@ After install, `nnt` is available globally.
 
 ## Config location
 
-- Default: `~/.nnt/config`
+- Default: `~/.config/nnt/nnt.json`
 - Override: set `NNT_CONFIG_DIR`
 
 Example:
@@ -23,7 +23,7 @@ Example:
 export NNT_CONFIG_DIR="$HOME/.config/nnt"
 ```
 
-Config is stored as JSON in `<config-dir>/config`.
+Config is stored as JSON in `<config-dir>/nnt.json`.
 
 ## Add profile
 

package/dist/config.d.ts

@@ -11,5 +11,6 @@ export type NntConfig = {
 };
 export declare function getConfigDir(): string;
 export declare function getConfigPath(): string;
+export declare function getLegacyConfigPath(): string;
 export declare function loadConfig(): Promise<NntConfig>;
 export declare function saveConfig(config: NntConfig): Promise<void>;

package/dist/config.js

@@ -5,31 +5,47 @@ const DEFAULT_CONFIG = {
     defaultProfile: null,
     profiles: {},
 };
+const CONFIG_FILENAME = "nnt.json";
+const DEFAULT_CONFIG_DIR = join(homedir(), ".config", "nnt");
+const LEGACY_CONFIG_PATH = join(homedir(), ".nnt", "config");
 export function getConfigDir() {
     const dir = process.env.NNT_CONFIG_DIR;
     if (dir && dir.trim() !== "") {
         return resolve(dir);
     }
-    return join(homedir(), ".nnt");
+    return DEFAULT_CONFIG_DIR;
 }
 export function getConfigPath() {
-    return join(getConfigDir(), "config");
+    return join(getConfigDir(), CONFIG_FILENAME);
+}
+export function getLegacyConfigPath() {
+    return LEGACY_CONFIG_PATH;
 }
 export async function loadConfig() {
     const path = getConfigPath();
     try {
         const raw = await readFile(path, "utf8");
-        const parsed = JSON.parse(raw);
-        return {
-            defaultProfile: typeof parsed.defaultProfile === "string"
-                ? parsed.defaultProfile
-                : null,
-            profiles: parsed.profiles ?? {},
-        };
+        return parseConfig(raw);
     }
     catch (error) {
         if (isNodeError(error) && error.code === "ENOENT") {
-            return { ...DEFAULT_CONFIG };
+            try {
+                const legacyRaw = await readFile(getLegacyConfigPath(), "utf8");
+                const parsed = parseConfig(legacyRaw);
+                try {
+                    await saveConfig(parsed);
+                }
+                catch {
+                    // Best effort migration only.
+                }
+                return parsed;
+            }
+            catch (legacyError) {
+                if (isNodeError(legacyError) && legacyError.code === "ENOENT") {
+                    return { ...DEFAULT_CONFIG };
+                }
+                throw legacyError;
+            }
         }
         throw error;
     }
@@ -51,3 +67,10 @@ export async function saveConfig(config) {
 function isNodeError(error) {
     return typeof error === "object" && error !== null && "code" in error;
 }
+function parseConfig(raw) {
+    const parsed = JSON.parse(raw);
+    return {
+        defaultProfile: typeof parsed.defaultProfile === "string" ? parsed.defaultProfile : null,
+        profiles: parsed.profiles ?? {},
+    };
+}

package/dist/notifier.js

@@ -1,5 +1,5 @@
 import { readFileSync } from "node:fs";
-import { getConfigPath } from "./config.js";
+import { getConfigPath, getLegacyConfigPath } from "./config.js";
 import { sendTelegramMessage } from "./telegram.js";
 export class NotifierError extends Error {
     constructor(message) {
@@ -23,25 +23,27 @@ export class NoProfilesConfiguredError extends NotifierError {
 }
 export class EnvConfigLoader {
     load() {
-        const configPath = getConfigPath();
-        let rawConfig;
-        try {
-            const raw = readFileSync(configPath, "utf8");
-            rawConfig = JSON.parse(raw);
-        }
-        catch (error) {
-            if (isNodeError(error) && error.code === "ENOENT") {
-                return {
-                    profiles: [],
-                    defaultProfile: null,
-                };
+        const configPaths = Array.from(new Set([getConfigPath(), getLegacyConfigPath()]));
+        for (const configPath of configPaths) {
+            try {
+                const raw = readFileSync(configPath, "utf8");
+                const rawConfig = JSON.parse(raw);
+                return normalizeEnvConfig(rawConfig);
             }
-            if (error instanceof SyntaxError) {
-                throw new NotifierError(`Invalid JSON in config file at ${configPath}: ${error.message}`);
+            catch (error) {
+                if (isNodeError(error) && error.code === "ENOENT") {
+                    continue;
+                }
+                if (error instanceof SyntaxError) {
+                    throw new NotifierError(`Invalid JSON in config file at ${configPath}: ${error.message}`);
+                }
+                throw error;
             }
-            throw error;
         }
-        return normalizeEnvConfig(rawConfig);
+        return {
+            profiles: [],
+            defaultProfile: null,
+        };
     }
 }
 export class Notifier {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nonotify",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "nnt CLI for Telegram notifications",
   "type": "module",
   "main": "./dist/index.js",

package/src/config.ts

@@ -20,17 +20,25 @@ const DEFAULT_CONFIG: NntConfig = {
   profiles: {},
 };
 
+const CONFIG_FILENAME = "nnt.json";
+const DEFAULT_CONFIG_DIR = join(homedir(), ".config", "nnt");
+const LEGACY_CONFIG_PATH = join(homedir(), ".nnt", "config");
+
 export function getConfigDir(): string {
   const dir = process.env.NNT_CONFIG_DIR;
   if (dir && dir.trim() !== "") {
     return resolve(dir);
   }
 
-  return join(homedir(), ".nnt");
+  return DEFAULT_CONFIG_DIR;
 }
 
 export function getConfigPath(): string {
-  return join(getConfigDir(), "config");
+  return join(getConfigDir(), CONFIG_FILENAME);
+}
+
+export function getLegacyConfigPath(): string {
+  return LEGACY_CONFIG_PATH;
 }
 
 export async function loadConfig(): Promise<NntConfig> {
@@ -38,18 +46,27 @@ export async function loadConfig(): Promise<NntConfig> {
 
   try {
     const raw = await readFile(path, "utf8");
-    const parsed = JSON.parse(raw) as Partial<NntConfig>;
-
-    return {
-      defaultProfile:
-        typeof parsed.defaultProfile === "string"
-          ? parsed.defaultProfile
-          : null,
-      profiles: parsed.profiles ?? {},
-    };
+    return parseConfig(raw);
   } catch (error) {
     if (isNodeError(error) && error.code === "ENOENT") {
-      return { ...DEFAULT_CONFIG };
+      try {
+        const legacyRaw = await readFile(getLegacyConfigPath(), "utf8");
+        const parsed = parseConfig(legacyRaw);
+
+        try {
+          await saveConfig(parsed);
+        } catch {
+          // Best effort migration only.
+        }
+
+        return parsed;
+      } catch (legacyError) {
+        if (isNodeError(legacyError) && legacyError.code === "ENOENT") {
+          return { ...DEFAULT_CONFIG };
+        }
+
+        throw legacyError;
+      }
     }
 
     throw error;
@@ -75,3 +92,13 @@ export async function saveConfig(config: NntConfig): Promise<void> {
 function isNodeError(error: unknown): error is NodeJS.ErrnoException {
   return typeof error === "object" && error !== null && "code" in error;
 }
+
+function parseConfig(raw: string): NntConfig {
+  const parsed = JSON.parse(raw) as Partial<NntConfig>;
+
+  return {
+    defaultProfile:
+      typeof parsed.defaultProfile === "string" ? parsed.defaultProfile : null,
+    profiles: parsed.profiles ?? {},
+  };
+}

package/src/notifier.ts

@@ -1,5 +1,5 @@
 import { readFileSync } from "node:fs";
-import { getConfigPath } from "./config.js";
+import { getConfigPath, getLegacyConfigPath } from "./config.js";
 import { sendTelegramMessage } from "./telegram.js";
 
 export type NotifierProfile = {
@@ -74,31 +74,34 @@ type RawRecordProfile = {
 
 export class EnvConfigLoader implements NotifierConfigLoader {
   load(): NotifierConfig {
-    const configPath = getConfigPath();
-
-    let rawConfig: RawEnvConfig;
-
-    try {
-      const raw = readFileSync(configPath, "utf8");
-      rawConfig = JSON.parse(raw) as RawEnvConfig;
-    } catch (error) {
-      if (isNodeError(error) && error.code === "ENOENT") {
-        return {
-          profiles: [],
-          defaultProfile: null,
-        };
-      }
+    const configPaths = Array.from(
+      new Set([getConfigPath(), getLegacyConfigPath()]),
+    );
 
-      if (error instanceof SyntaxError) {
-        throw new NotifierError(
-          `Invalid JSON in config file at ${configPath}: ${error.message}`,
-        );
+    for (const configPath of configPaths) {
+      try {
+        const raw = readFileSync(configPath, "utf8");
+        const rawConfig = JSON.parse(raw) as RawEnvConfig;
+        return normalizeEnvConfig(rawConfig);
+      } catch (error) {
+        if (isNodeError(error) && error.code === "ENOENT") {
+          continue;
+        }
+
+        if (error instanceof SyntaxError) {
+          throw new NotifierError(
+            `Invalid JSON in config file at ${configPath}: ${error.message}`,
+          );
+        }
+
+        throw error;
       }
-
-      throw error;
     }
 
-    return normalizeEnvConfig(rawConfig);
+    return {
+      profiles: [],
+      defaultProfile: null,
+    };
   }
 }