@n42/cli 0.1.71 → 0.1.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@n42/cli",
-  "version": "0.1.71",
+  "version": "0.1.88",
   "description": "Node42 CLI – Command-line interface for Peppol eDelivery path discovery, diagnostics, and tooling",
   "keywords": [
     "node42"

package/src/auth.js

@@ -1,14 +1,14 @@
 const fs = require("fs");
-const { NODE42_DIR, TOKENS_FILE, API_URL, EP_SIGNIN, EP_REFRESH } = require("./config");
+const { NODE42_DIR, TOKENS_FILE, API_URL, EP_SIGNIN, EP_REFRESH, EP_ME } = require("./config");
 const { handleError } = require("./errors");
-const { getUser } = require("./user");
+const { getUserWithIndex } = require("./user");
 const { clearScreen, ask, startSpinner } = require("./utils");
 const db = require("./db");
 
 
 async function login() {
   clearScreen("Sign in to Node42");
-  let user = getUser();
+  let user = getUserWithIndex(0);
 
   const username = await ask("Username", user.userMail ?? "");
   const password = await ask("Password", null, true);
@@ -24,17 +24,16 @@ async function login() {
 
   if (!res.ok) {
     stopSpinner();
-
+    
     console.error(`Login failed (${res.status}) – Invalid credentials`);
     process.exit(1);
   }
 
   const tokens = await res.json();
-
+  stopSpinner();
+  
   const { accessToken, refreshToken, idToken } = tokens;
   if (!accessToken || !refreshToken || !idToken) {
-    stopSpinner();
-
     console.error("Invalid auth response");
     process.exit(1);
   }
@@ -45,13 +44,17 @@ async function login() {
     JSON.stringify({ accessToken, refreshToken, idToken }, null, 2)
   );
 
-  stopSpinner();
   stopSpinner = startSpinner();
 
-  await checkAuth();
-  user = getUser();
+  const authenticated = await checkAuth();
   stopSpinner();
-  
+
+  if (!authenticated) {
+    console.error("Not authenticated");
+    process.exit(1);
+  }
+
+  user = getUserWithIndex(0);
   console.log(
     `Authenticated as ${user.userName} <${user.userMail}> (${user.role})`
   );
@@ -61,14 +64,12 @@ function logout() {
   if (fs.existsSync(TOKENS_FILE)) {
     fs.unlinkSync(TOKENS_FILE);
   }
-
-  let user = getUser();
-  db.delete("user", user.id);
+  db.clear("user");
 }
 
-function loadAuth() {
+function loadTokens() {
   if (!fs.existsSync(TOKENS_FILE)) {
-    console.error("Not logged in. Run: n42 login");
+    console.error("Tokens missing...\nRun: n42 login");
     process.exit(1);
   }
   return JSON.parse(fs.readFileSync(TOKENS_FILE, "utf8"));
@@ -77,10 +78,10 @@ function loadAuth() {
 async function checkAuth() {
   if (!fs.existsSync(TOKENS_FILE)) {
     handleError({ code: "N42E-9033", message: "Token missing..."})
-    process.exit(1);
+    return false;
   }
 
-  const res = await fetchWithAuth(`${API_URL}/users/me`, {
+  const res = await fetchWithAuth(`${API_URL}/${EP_ME}`, {
         method: "GET",
         headers: {
             "Content-Type": "application/json"
@@ -93,25 +94,22 @@ async function checkAuth() {
 
   if (!res.ok) {
     const err = await res.json();
-    await handleError(err);
+    handleError(err);
     return false;
   }
 
-  const auth = await res.json();
-  //console.log(auth);
-  if (auth) {  
-
+  const userInfo = await res.json();
+  //console.log(userInfo);
+  
+  if (userInfo) {  
     db.upsert("user", {
-      id: auth.sub,
-      userName: auth.userName,
-      userMail: auth.userMail,
-      role: auth.role,
-      rateLimits: auth.rateLimits,
-      serviceUsage: auth.serviceUsage,
+      id: userInfo.sub,
+      userName: userInfo.userName,
+      userMail: userInfo.userMail,
+      role: userInfo.role,
+      rateLimits: userInfo.rateLimits,
+      serviceUsage: userInfo.serviceUsage,
     })
-
-    db.replace("serviceUsage", auth.serviceUsage);
-    db.replace("rateLimits", auth.rateLimits);
     return true;
   }
 
@@ -119,7 +117,7 @@ async function checkAuth() {
 }
 
 async function refreshSession() {
-  const { refreshToken } = loadAuth();
+  const { refreshToken } = loadTokens();
   if (!refreshToken) {
     return false;
   }
@@ -160,7 +158,7 @@ async function refreshSession() {
 }
 
 async function fetchWithAuth(url, options = {}) {
-  let { accessToken } = loadAuth();
+  let { accessToken } = loadTokens();
   if (!accessToken) {
     handleError({ code: "N42E-9032" });
     return;
@@ -183,7 +181,7 @@ async function fetchWithAuth(url, options = {}) {
     return res;
   }
 
-  accessToken = loadAuth().accessToken;
+  accessToken = loadTokens().accessToken;
   return fetch(url, {
     ...options,
     headers: {
@@ -193,4 +191,4 @@ async function fetchWithAuth(url, options = {}) {
   });
 }
 
-module.exports = { login, logout, loadAuth, checkAuth, fetchWithAuth };
+module.exports = { login, logout, loadTokens, checkAuth, fetchWithAuth };

package/src/cli.js

@@ -2,9 +2,9 @@
 
 const { Command } = require("commander");
 const { login, logout, checkAuth } = require("./auth");
-const { getUser, getUserUsage } = require("./user");
+const { getUserWithIndex, getUserUsage } = require("./user");
 const { runDiscovery } = require("./discover");
-const { clearScreen, startSpinner, validateEnv, validateId, createAppDirs, getArtefactExt } = require("./utils");
+const { clearScreen, startSpinner, validateEnv, validateId, createAppDirs, getArtefactExt, cleanAppDirs } = require("./utils");
 const { NODE42_DIR, ARTEFACTS_DIR, DEFAULT_OUTPUT, DEFAULT_FORMAT } = require("./config");
 
 createAppDirs(); 
@@ -18,7 +18,7 @@ const path = require("path");
 
 program
   .name("n42")
-  .description("Command-line interface for eDelivery path discovery and diagnostics")
+  .description("Node42 Command-line interface for eDelivery path discovery and diagnostics")
   .version(pkg.version);
 
 program
@@ -50,16 +50,34 @@ program
   .description("Terminate user session and delete all local tokens")
   .action(logout);
 
+program
+  .command("clean")
+  .description("Remove locally stored artefacts and cache")
+  .option("--tokens", "Remove stored authentication tokens")
+  .option("--artefacts", "Remove artefacts")
+  .option("--transactions", "Remove transactions")
+  .option("--validations", "Remove validations")
+  .option("--db", "Remove local database")
+  .option("--all", "Wipe all local data")
+  .action((options)=> {
+      cleanAppDirs(options);
+  });
+
 program
   .command("me")
   .description("Returns identity and billing status for the authenticated user.")
   .action(async () => {
     const stopSpinner = startSpinner();
     
-    await checkAuth(); 
-    const user = getUser();
+    const authenticated = await checkAuth(); 
     stopSpinner();
+
+    if (!authenticated) {
+      console.error("Not authenticated");
+      process.exit(1);
+    }
     
+    const user = getUserWithIndex(0);
     const currentMonth = new Date().toISOString().slice(0, 7);
     console.log(`Node42 CLI v${pkg.version}
     User
@@ -71,7 +89,7 @@ program
     Rate Limits
       Discovery    : ${user.rateLimits.discovery}
       Transactions : ${user.rateLimits.transactions}
-      Validation  : ${user.rateLimits.validation}
+      Validation   : ${user.rateLimits.validation}
   
     Usage (Current Month)
       Discovery    : ${user.serviceUsage.discovery[currentMonth] ?? 0}
@@ -83,25 +101,31 @@ program
 program
   .command("usage <service>")
   .description("Returns usage for the authenticated user.")
-  .action((service) => {
-    const userUsage = getUserUsage();
-    const currentMonth = new Date().toISOString().slice(0, 7);
-
-    const usage =
-      userUsage?.serviceUsage?.[service]?.[currentMonth] ?? 0;
+  .option("-m, --month <yyyy-mm>", "Show usage for a specific month")
+  .action((service, options) => {
+    const user = getUserWithIndex(0);
+    const currentMonth = options.month ? options.month : new Date().toISOString().slice(0, 7);
+    let usage = getUserUsage(user.id, service, currentMonth);
+    if (!usage) {
+      usage = 0;
+    }
 
     clearScreen(`Node42 CLI v${pkg.version}`);
     console.log(`Usage for ${service} (${currentMonth}): ${usage}`);
   });
 
 program
-  .command("history <participantId>")
+  .command("history [participantId]")
   .description("Show local discovery history for a participant")
   .option("--today", "Show only today's artefacts")
   .option("--day <yyyy-mm-dd>", "Show artefacts for a specific day")
   .option("--last <n>", "Show only last N results", parseInt)
   .action((participantId, options) => {
-    let artefacts = db.artefactsByParticipant(participantId) ?? [];
+    let artefacts = participantId
+      ? db.artefactsByParticipant(participantId)
+      : db.get("artefacts");
+
+    artefacts ??= [];
 
     // newest first
     artefacts.sort((a, b) => b.createdAt - a.createdAt);
@@ -140,13 +164,23 @@ program
     clearScreen(`Node42 CLI v${pkg.version}`);
     console.log(`Found ${artefacts.length} artefact(s)${filterInfo}\n`);
 
+    const DATE = "DATE".padEnd(19);
+    const PID = "PID".padEnd(15);
+    const FILE = "FILE";
+    console.log(`${DATE} ${PID} ${FILE}`);
+
     for (const item of artefacts) {
       const d = new Date(item.createdAt);
       const dt = d.toISOString().slice(0, 19).replace("T", " ");
-      const ext = getArtefactExt(item.output, item.format);
-      const file = path.join(ARTEFACTS_DIR, `${item.id}.${ext}`);
-
-      console.log(`${dt}  ${file}`);
+      const file = path.join(ARTEFACTS_DIR, `${item.file}`);
+
+      let pid = item.participantId;
+      if (!participantId) {
+        pid = pid.length > 15 ? pid.substring(0, 12) + "..." : pid
+        console.log(`${dt} ${pid.padEnd(15)} ${file}`);
+      } else {
+        console.log(`${dt} ${file}`);
+      }
     }
 
     console.log("");
@@ -159,7 +193,7 @@ const discover = program
 
 discover
   .command("peppol <participantId>")
-  .description("Resolve the Peppol eDelivery message path")
+  .description("Resolve and validate the full (Peppol) eDelivery path:\nSML/SMK (BDXR DNS) lookup, SMP resolution, endpoint discovery, and TLS diagnostics.")
   .option("-e, --env <environment>", "Environment", "TEST")
   .option("-o, --output <type>", "Result type (json | plantuml)", DEFAULT_OUTPUT)
   .option("-f, --format <format>", "When output=plantuml (svg | text)", DEFAULT_FORMAT)

package/src/completion/bash.sh

@@ -3,17 +3,24 @@ _n42_completions()
   local cur prev words cword
   _init_completion || return
 
-  local commands="login logout me usage history discover"
+  local commands="login logout me usage history discover clean"
 
   if [[ $cword -eq 1 ]]; then
     COMPREPLY=( $(compgen -W "$commands" -- "$cur") )
     return
   fi
 
+  # discover peppol
   if [[ ${words[1]} == "discover" && $cword -eq 2 ]]; then
     COMPREPLY=( $(compgen -W "peppol" -- "$cur") )
     return
   fi
+
+  # usage discovery|validation|transactions
+  if [[ ${words[1]} == "usage" && $cword -eq 2 ]]; then
+    COMPREPLY=( $(compgen -W "discovery validation transactions" -- "$cur") )
+    return
+  fi
 }
 
 complete -F _n42_completions n42

package/src/config.js

@@ -12,7 +12,7 @@ const config = {
   
   ARTEFACTS_DIR: null,
   TRANSACTIONS_DIR: null,
-  VALIDATION_DIR: null,
+  VALIDATIONS_DIR: null,
   
   DATABASE_FILE: null,
   TOKENS_FILE: null,
@@ -23,12 +23,13 @@ const config = {
 
   EP_SIGNIN: "auth/signin",
   EP_REFRESH: "auth/refresh",
+  EP_ME: "users/me",
   EP_DISCOVER: "discover/peppol"
 };
 
 config.ARTEFACTS_DIR = path.join(config.NODE42_DIR, "artefacts", "discovery");
 config.TRANSACTIONS_DIR = path.join(config.NODE42_DIR, "artefacts", "transactions");
-config.VALIDATION_DIR = path.join(config.NODE42_DIR, "artefacts", "validation");
+config.VALIDATIONS_DIR = path.join(config.NODE42_DIR, "artefacts", "validations");
 
 config.DATABASE_FILE = path.join(config.NODE42_DIR, "db.json");
 config.TOKENS_FILE = path.join(config.NODE42_DIR, "tokens.json");

package/src/db.js

@@ -13,7 +13,6 @@ function load() {
   if (!fs.existsSync(DATABASE_FILE)) return { 
     user: [],
     artefacts: [],
-    usage: [], 
   };
   return JSON.parse(fs.readFileSync(DATABASE_FILE, "utf8"));
 }
@@ -91,6 +90,12 @@ function remove(collection, keyValue, key = "id") {
   save(db);
 }
 
+function clear(collection) {
+  const db = load();
+  db[collection] = [];
+  save(db);
+}
+
 function get(collection) {
   const db = load();
   return db[collection] ?? [];
@@ -154,4 +159,4 @@ function artefactsByParticipant(pid) {
   return idx[pid] ?? [];
 }
 
-module.exports = { setSource, load, save, insert, update, upsert, replace, set, remove, get, find, indexBy, indexByFn, indexByMap, artefactsByParticipant };
+module.exports = { setSource, load, save, insert, update, upsert, replace, set, remove, clear, get, find, indexBy, indexByFn, indexByMap, artefactsByParticipant };

package/src/discover.js

@@ -5,8 +5,8 @@ const db = require("./db");
 
 const { fetchWithAuth } = require("./auth");
 const { API_URL, EP_DISCOVER, DEFAULT_OUTPUT, DEFAULT_FORMAT, ARTEFACTS_DIR } = require("./config");
-const { getUserUsage } = require("./user");
-const { clearScreen, startSpinner, buildDocLabel, promptForDocument } = require("./utils");
+const { getUserWithIndex, setUserUsage } = require("./user");
+const { clearScreen, startSpinner, buildDocLabel, promptForDocument, getShortId, getArtefactExt } = require("./utils");
 const { handleError } = require("./errors"); 
 
 const DEFAULT_DISCOVERY_INPUT = {
@@ -115,17 +115,25 @@ async function runDiscovery(participantId, options) {
   const serviceUsage = res.headers.get("X-Node42-ServiceUsage");
   const rateLimit = res.headers.get("X-Node42-RateLimit");
   const encodedDocs = res.headers.get("X-Node42-Documents");
-
-  const userUsage = getUserUsage();
   const currentMonth = new Date().toISOString().slice(0, 7);
-  userUsage.serviceUsage.discovery[currentMonth] = serviceUsage;
-  
-  db.replace("serviceUsage", userUsage);
+ 
+  const user = getUserWithIndex(0);
+  setUserUsage(
+    user.id,
+    "discovery",
+    currentMonth,
+    serviceUsage
+  );
+
+  const fileId = getShortId(refId);
+  const fileExt = getArtefactExt(output, format);
+  const fileName = `${fileId}.${fileExt}`;
 
   db.insert("artefacts", {
     id: refId,
     participantId,
     options,
+    file: fileName, 
     createdAt: Date.now()
   });
  
@@ -142,7 +150,7 @@ async function runDiscovery(participantId, options) {
       await runDiscovery(participantId, options);
     });
 
-    const file = path.join(ARTEFACTS_DIR, `${refId}.svg`);
+    const file = path.join(ARTEFACTS_DIR, `${fileName}`);
     fs.writeFileSync(file, svg);
 
     console.log(`Discovery completed`);
@@ -159,7 +167,7 @@ async function runDiscovery(participantId, options) {
       await runDiscovery(participantId, options);
     });
 
-    const file = path.join(ARTEFACTS_DIR, `${refId}.puml`);
+    const file = path.join(ARTEFACTS_DIR, `${fileName}`);
     fs.writeFileSync(file, text);
 
     console.log(`Discovery completed`);
@@ -176,7 +184,7 @@ async function runDiscovery(participantId, options) {
     await runDiscovery(participantId, options);
   });
 
-  const file = path.join(ARTEFACTS_DIR, `${refId}.json`);
+  const file = path.join(ARTEFACTS_DIR, `${fileName}`);
   fs.writeFileSync(file, JSON.stringify(json, null, 2));
 
   console.log(`Discovery completed`);

package/src/errors.js

@@ -1,7 +1,7 @@
 const { WWW_URL } = require("./config");
 
 
-async function handleError(err) {
+function handleError(err) {
   //console.log(err);
 
   const code = err.code?.startsWith("N42E-")
@@ -16,9 +16,9 @@ async function handleError(err) {
   //console.log(url);
 
   if (message) {
-    console.error(`${err.message}\nSee details: ${url}\n`);
+    console.error(`\r${err.message}\nSee details: ${url}\n`);
   } else {
-    console.error(`See details: ${url}\n`);
+    console.error(`\rSee details: ${url}\n`);
   }
 }
 

package/src/user.js

@@ -1,8 +1,8 @@
 const db = require("./db");
 
-function getUser() {
+function getUserWithIndex(index) {
   const users = db.get("user");
-  return users.length ? users[0] : {
+  return users.length ? users[index] : {
       "id": "n/a",
       "userName": "n/a",
       "userMail": "n/a",
@@ -10,18 +10,43 @@ function getUser() {
     };
 }
 
-function getUserUsage() {
-  const usage = db.get("serviceUsage");
+function getUserWithId(userId) {
+  const database = db.load();
 
-  if (usage && usage.serviceUsage) return usage;
-
-  return {
-    serviceUsage: {
-      discovery: {},
-      validation: {},
-      transactions: {}
+  const u = database.user.find(x => x.id === userId);
+  if (!u) {
+    return {
+      "id": "n/a",
+      "userName": "n/a",
+      "userMail": "n/a",
+      "role": "n/a"
     }
-  };
+  }
+  return u;
+}
+
+function getUserUsage(userId, service, month) {
+  const database = db.load();
+
+  const u = database.user.find(x => x.id === userId);
+  if (!u) return;
+
+  u.serviceUsage[service] ??= {};
+  const usage = u.serviceUsage[service][month];
+  return usage;
+}
+
+
+function setUserUsage(userId, service, month, value) {
+  const database = db.load();
+
+  const u = database.user.find(x => x.id === userId);
+  if (!u) return;
+
+  u.serviceUsage[service] ??= {};
+  u.serviceUsage[service][month] = value;
+
+  db.save(database);
 }
 
-module.exports = { getUser, getUserUsage };
+module.exports = { getUserWithIndex, getUserWithId, getUserUsage, setUserUsage };

package/src/utils.js

@@ -2,6 +2,7 @@ const fs = require("fs");
 const inquirer = require("inquirer");
 const readline = require("readline");
 const config = require("./config");
+const db = require("./db");
 
 
 function clearScreen(text) {
@@ -97,11 +98,15 @@ function validateId(type, id) {
   }
 }
 
+function getShortId(id) {
+  return id.slice(0, 8);
+}
+
 function createAppDirs(force=false) {
   fs.mkdirSync(config.NODE42_DIR, { recursive: true });
   fs.mkdirSync(config.ARTEFACTS_DIR, { recursive: true });
   fs.mkdirSync(config.TRANSACTIONS_DIR, { recursive: true });
-  fs.mkdirSync(config.VALIDATION_DIR, { recursive: true });
+  fs.mkdirSync(config.VALIDATIONS_DIR, { recursive: true });
 
   if (!fs.existsSync(config.CONFIG_FILE) || force) {
     fs.writeFileSync(
@@ -114,6 +119,67 @@ function createAppDirs(force=false) {
   }
 }
 
+function cleanAppDirs(options) {
+  const {
+    tokens,
+    artefacts,
+    transactions,
+    validations,
+    db: dbFlag,
+    all
+  } = options;
+
+  if ((all || tokens) && fs.existsSync(config.TOKENS_FILE)) {
+    fs.unlinkSync(config.TOKENS_FILE);
+    console.log("Tokens removed");
+  }
+
+  if ((all || dbFlag) && fs.existsSync(config.DATABASE_FILE)) {
+    fs.unlinkSync(config.DATABASE_FILE);
+    console.log("Database removed");
+  }
+
+  if (all || artefacts) {
+    try {
+      db.clear("artefacts");
+    } catch {}
+
+    if (fs.existsSync(config.ARTEFACTS_DIR)) {
+      fs.rmSync(config.ARTEFACTS_DIR, { recursive: true, force: true });
+      fs.mkdirSync(config.ARTEFACTS_DIR, { recursive: true });
+    }
+
+    console.log("Artefacts removed");
+  }
+
+  if (all || transactions) {
+    try {
+      db.clear("transactions");
+    } catch {}
+
+    if (fs.existsSync(config.TRANSACTIONS_DIR)) {
+      fs.rmSync(config.TRANSACTIONS_DIR, { recursive: true, force: true });
+      fs.mkdirSync(config.TRANSACTIONS_DIR, { recursive: true });
+    }
+
+    console.log("Transactions removed");
+  }
+
+  if (all || validations) {
+    try {
+      db.clear("validations");
+    } catch {}
+
+    if (fs.existsSync(config.VALIDATIONS_DIR)) {
+      fs.rmSync(config.VALIDATIONS_DIR, { recursive: true, force: true });
+      fs.mkdirSync(config.VALIDATIONS_DIR, { recursive: true });
+    }
+
+    console.log("Transactions removed");
+  }
+ 
+}
+
 function buildDocLabel({ scheme, value }) {
   // 1. Document name (after :: before ##)
   const docMatch = value.match(/::([^#]+)##/);
@@ -163,4 +229,4 @@ function getArtefactExt(output, format) {
   }
 }
 
-module.exports = { clearScreen, startSpinner, ask, buildDocLabel, promptForDocument, validateEnv, validateId, createAppDirs, getArtefactExt };
+module.exports = { clearScreen, startSpinner, ask, buildDocLabel, promptForDocument, validateEnv, validateId, getShortId, createAppDirs, cleanAppDirs, getArtefactExt };

package/test/auth.test.js

@@ -17,6 +17,8 @@ describe("auth", () => {
     beforeEach(() => {
       sinon.restore();
 
+      global.fetch = sinon.stub();
+     
       db.setSource(TEST_DB);
       if (fs.existsSync(TEST_DB)) fs.unlinkSync(TEST_DB);
 
@@ -34,14 +36,17 @@ describe("auth", () => {
         .onSecondCall().resolves("secret");
 
       sinon.stub(utils, "startSpinner").callsFake(() => () => {});
-      sinon.stub(user, "getUser").returns({
+      sinon.stub(user, "getUserWithIndex")
+      .withArgs(0)
+      .returns({
+        id: "1",
         userName: "User",
         userMail: "user@test.com",
-        role: "user"
+        role: "user",
       });
 
-      sinon.stub(fs, "mkdirSync");
-      sinon.stub(fs, "writeFileSync");
+      sinon.spy(fs, "mkdirSync");
+      sinon.spy(fs, "writeFileSync");
 
       sinon.stub(console, "log");
       sinon.stub(console, "error");
@@ -52,7 +57,7 @@ describe("auth", () => {
       auth = require("../src/auth");
       login = auth.login;
 
-      sinon.stub(auth, "checkAuth").returns(true);
+      sinon.stub(auth, "checkAuth").resolves(true);
     });
 
     afterEach(() => {
@@ -62,7 +67,7 @@ describe("auth", () => {
 
     it("logs in successfully and writes tokens", async () => {
       // mock fetch
-      global.fetch = sinon.stub().resolves({
+      global.fetch.resolves({
         ok: true,
         json: async () => ({
           accessToken: "a",
@@ -78,7 +83,7 @@ describe("auth", () => {
     });
 
     it("exits on http error", async () => {
-      global.fetch = sinon.stub().resolves({
+      global.fetch.resolves({
         ok: false,
         status: 401,
         json: async () => ({})

package/test/db.test.js

@@ -24,7 +24,6 @@ describe("db", () => {
       const dbObj = db.load();
       expect(dbObj).to.have.property("user");
       expect(dbObj).to.have.property("artefacts");
-      expect(dbObj).to.have.property("usage");
     });
   });