tering-serieuze-cli 1.0.0 → 1.3.0

package/dist/index.mjs

@@ -10,7 +10,7 @@ import { TssApi, FilesystemCache, OnePasswordCache } from "tering-serieuze-sdk";
 import omelette from "omelette";
 async function initCompletion(api2) {
   const playCompletion = {};
-  const jingleFolders = await api2.jingle.getGrouped();
+  const jingleFolders = await api2.jingle.getCache().get("getGrouped") ?? [];
   jingleFolders.forEach((jingleFolder) => {
     playCompletion[jingleFolder.folder] = jingleFolder.jingles.map((jingle) => jingle.file);
   });
@@ -19,6 +19,7 @@ async function initCompletion(api2) {
     ["clearcache" /* clearcache */]: ["auth", "jingle", "all"],
     ["login" /* login */]: [],
     ["play" /* play */]: playCompletion,
+    ["recent" /* recent */]: [],
     ["jingles" /* jingles */]: [],
     ["p" /* playShort */]: [],
     ["version" /* version */]: []
@@ -29,24 +30,30 @@ async function initCompletion(api2) {
 }
 
 // package.json
-var version = "1.0.0";
+var version = "1.2.0";
 
 // src/index.ts
-process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
 var Commands = /* @__PURE__ */ ((Commands2) => {
   Commands2["autocomplete"] = "autocomplete";
   Commands2["clearcache"] = "clearcache";
   Commands2["login"] = "login";
   Commands2["play"] = "play";
+  Commands2["recent"] = "recent";
   Commands2["jingles"] = "jingles";
   Commands2["playShort"] = "p";
   Commands2["version"] = "version";
   return Commands2;
 })(Commands || {});
-var api = new TssApi({
-  jingle: new FilesystemCache("jingle"),
-  auth: new OnePasswordCache("TSS-TOKEN")
-});
+var playWhichJingleString = "Which jingle do you want to play?";
+var api = new TssApi(
+  {
+    API_URL: process.env.API_URL ?? "https://tss.maxserv.dev:8081"
+  },
+  {
+    jingle: new FilesystemCache("jingle"),
+    auth: new OnePasswordCache("TSS-TOKEN")
+  }
+);
 var program = new Command();
 var completion = await initCompletion(api);
 if (process.argv.length <= 2 || process.argv[2] === "help") {
@@ -96,24 +103,61 @@ program.command("clearcache" /* clearcache */).description("Clear the cache").ar
     await api.auth.removeToken();
     await api.jingle.getCache().clear();
     console.log("Cleared all caches");
+  } else {
+    console.error("Invalid cache type");
   }
 });
 program.command("jingles" /* jingles */).description("Show all jingles").action(async () => {
-  const jingles = await api.jingle.getAll();
-  jingles.forEach((jingle) => {
-    console.log(jingle.folder + "/" + jingle.file);
-  });
+  try {
+    const jingles = await api.jingle.getAll();
+    jingles.forEach((jingle) => {
+      console.log(jingle.folder + "/" + jingle.file);
+    });
+  } catch (e) {
+    console.error(e.status + ": " + e.message);
+  }
 });
 program.command("play" /* play */).description("Play a jingle").argument("<folder>", "The folder of the jingle").argument("<file>", "The jingle to play").action(async (folder, file) => {
-  api.jingle.play(folder, file);
+  try {
+    await api.jingle.play({ folder, file });
+  } catch (e) {
+    console.error(`ERROR ${e.status}: ${e.message}`);
+  }
+});
+program.command("recent" /* recent */).description("Show recently added jingles, select a jingle to play").action(async () => {
+  try {
+    const jingles = await api.jingle.getAll();
+    jingles.sort((a, b) => b.mtime - a.mtime);
+    const answers = await inquirer.prompt([
+      {
+        type: "list",
+        name: "jingle",
+        message: playWhichJingleString,
+        choices: jingles.slice(0, 30).map((jingle2) => jingle2.folder + "/" + jingle2.file)
+      }
+    ]);
+    const [folder, file] = answers.jingle.split("/");
+    const jingle = { folder, file };
+    await api.jingle.play(jingle);
+  } catch (e) {
+    console.error(e.status + ": " + e.message);
+  }
 });
 program.command("p" /* playShort */).description("Play a jingle by typing (some) parts of the name").argument("<query...>", "The query to search for").action(async (query) => {
-  const jingles = await api.jingle.getAll();
-  const matches = jingles.filter((jingle) => query.every((q) => (jingle.folder + "/" + jingle.file).includes(q)));
+  let jingles;
+  try {
+    jingles = await api.jingle.getAll();
+  } catch (e) {
+    console.error(e.status + ": " + e.message);
+    return;
+  }
+  const matches = jingles.filter((jingle2) => query.every((q) => (jingle2.folder + "/" + jingle2.file).includes(q)));
+  let jingle;
   if (matches.length === 0) {
     console.log("No matches found");
+    return;
   } else if (matches.length === 1) {
-    api.jingle.play(matches[0].folder, matches[0].file);
+    jingle = { folder: matches[0].folder, file: matches[0].file };
   } else {
     const sortedMatches = matches.sort((a, b) => {
       const aScore = a.keywords.filter((k) => query.includes(k)).length;
@@ -124,17 +168,30 @@ program.command("p" /* playShort */).description("Play a jingle by typing (some)
       {
         type: "list",
         name: "jingle",
-        message: "Which jingle do you want to play?",
-        choices: sortedMatches.map((jingle) => jingle.folder + "/" + jingle.file)
+        message: playWhichJingleString,
+        choices: sortedMatches.map((jingle2) => jingle2.folder + "/" + jingle2.file)
       }
     ]);
     const [folder, file] = answers.jingle.split("/");
-    api.jingle.play(folder, file);
+    jingle = { folder, file };
+  }
+  try {
+    await api.jingle.play(jingle);
+  } catch (e) {
+    console.error(`ERROR ${e.status}: ${e.message}`);
   }
 });
 program.command("version" /* version */).description("Show the TSS-CLI version").action(() => {
   console.log(version);
 });
+program.command("users").action(async () => {
+  try {
+    const users = await api.user.getAll();
+    console.log(users);
+  } catch (e) {
+    console.error(e.status + ": " + e.message);
+  }
+});
 program.parse();
 export {
   Commands

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tering-serieuze-cli",
-  "version": "1.0.0",
+  "version": "1.3.0",
   "description": "Teringserieuze CLI",
   "author": "Frank",
   "main": "dist/index.mjs",
@@ -22,20 +22,20 @@
   },
   "homepage": "https://gitlab.com/tering-serieuze-shit/tering-serieuze-cli#readme",
   "dependencies": {
-    "@types/node": "^18.11.18",
     "commander": "^9.4.1",
     "completion": "^1.0.3",
     "figlet": "^1.5.2",
     "inquirer": "^9.1.4",
     "omelette": "^0.4.17",
-    "tering-serieuze-sdk": "^1.0.1",
-    "tering-serieuze-types": "^1.8.4"
+    "tering-serieuze-sdk": "^3.0.0",
+    "tering-serieuze-types": "^1.14.1"
   },
   "devDependencies": {
     "@types/figlet": "^1.5.5",
     "@types/inquirer": "^9.0.3",
+    "@types/node": "^18.15.3",
     "@types/omelette": "^0.4.2",
-    "esbuild": "^0.16.12",
+    "esbuild": "^0.17.12",
     "prettier": "^2.8.1"
   }
 }

package/src/completion.ts

@@ -1,10 +1,11 @@
 import omelette from "omelette";
 import { Commands } from "./index";
 import { TssApi } from "tering-serieuze-sdk";
+import { JingleFolder } from "tering-serieuze-types";
 
 export async function initCompletion(api: TssApi) {
     const playCompletion: { [key: string]: string[] } = {};
-    const jingleFolders = await api.jingle.getGrouped();
+    const jingleFolders = (await api.jingle.getCache().get<JingleFolder[]>("getGrouped")) ?? [];
     jingleFolders.forEach((jingleFolder) => {
         playCompletion[jingleFolder.folder] = jingleFolder.jingles.map((jingle) => jingle.file);
     });
@@ -14,6 +15,7 @@ export async function initCompletion(api: TssApi) {
         [Commands.clearcache]: ["auth", "jingle", "all"],
         [Commands.login]: [],
         [Commands.play]: playCompletion,
+        [Commands.recent]: [],
         [Commands.jingles]: [],
         [Commands.playShort]: [],
         [Commands.version]: [],

package/src/index.ts

@@ -8,22 +8,28 @@ import { initCompletion } from "./completion";
 // @ts-ignore
 import { version } from "../package.json";
 
-process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
-
 export enum Commands {
     autocomplete = "autocomplete",
     clearcache = "clearcache",
     login = "login",
     play = "play",
+    recent = "recent",
     jingles = "jingles",
     playShort = "p",
     version = "version",
 }
 
-const api = new TssApi({
-    jingle: new FilesystemCache("jingle"),
-    auth: new OnePasswordCache("TSS-TOKEN"),
-});
+const playWhichJingleString = "Which jingle do you want to play?";
+
+const api = new TssApi(
+    {
+        API_URL: process.env.API_URL ?? "https://tss.maxserv.dev:8081",
+    },
+    {
+        jingle: new FilesystemCache("jingle"),
+        auth: new OnePasswordCache("TSS-TOKEN"),
+    }
+);
 
 const program = new Command();
 const completion = await initCompletion(api);
@@ -94,6 +100,8 @@ program
             await api.auth.removeToken();
             await api.jingle.getCache().clear();
             console.log("Cleared all caches");
+        } else {
+            console.error("Invalid cache type");
         }
     });
 
@@ -101,10 +109,14 @@ program
     .command(Commands.jingles)
     .description("Show all jingles")
     .action(async () => {
-        const jingles = await api.jingle.getAll();
-        jingles.forEach((jingle) => {
-            console.log(jingle.folder + "/" + jingle.file);
-        });
+        try {
+            const jingles = await api.jingle.getAll();
+            jingles.forEach((jingle) => {
+                console.log(jingle.folder + "/" + jingle.file);
+            });
+        } catch (e: any) {
+            console.error(e.status + ": " + e.message);
+        }
     });
 
 program
@@ -113,7 +125,36 @@ program
     .argument("<folder>", "The folder of the jingle")
     .argument("<file>", "The jingle to play")
     .action(async (folder, file) => {
-        api.jingle.play(folder, file);
+        try {
+            await api.jingle.play({ folder, file });
+        } catch (e: any) {
+            console.error(`ERROR ${e.status}: ${e.message}`);
+        }
+    });
+
+program
+    .command(Commands.recent)
+    .description("Show recently added jingles, select a jingle to play")
+    .action(async () => {
+        try {
+            const jingles = await api.jingle.getAll();
+            jingles.sort((a, b) => b.mtime - a.mtime);
+
+            const answers = await inquirer.prompt([
+                {
+                    type: "list",
+                    name: "jingle",
+                    message: playWhichJingleString,
+                    choices: jingles.slice(0, 30).map((jingle) => jingle.folder + "/" + jingle.file),
+                },
+            ]);
+
+            const [folder, file]: [folder: string, file: string] = answers.jingle.split("/");
+            const jingle = { folder, file };
+            await api.jingle.play(jingle);
+        } catch (e: any) {
+            console.error(e.status + ": " + e.message);
+        }
     });
 
 program
@@ -121,13 +162,22 @@ program
     .description("Play a jingle by typing (some) parts of the name")
     .argument("<query...>", "The query to search for")
     .action(async (query: string[]) => {
-        const jingles = await api.jingle.getAll();
+        let jingles;
+        try {
+            jingles = await api.jingle.getAll();
+        } catch (e: any) {
+            console.error(e.status + ": " + e.message);
+            return;
+        }
+
         const matches = jingles.filter((jingle) => query.every((q) => (jingle.folder + "/" + jingle.file).includes(q)));
 
+        let jingle;
         if (matches.length === 0) {
             console.log("No matches found");
+            return;
         } else if (matches.length === 1) {
-            api.jingle.play(matches[0].folder, matches[0].file);
+            jingle = { folder: matches[0].folder, file: matches[0].file };
         } else {
             const sortedMatches = matches.sort((a, b) => {
                 const aScore = a.keywords.filter((k) => query.includes(k)).length;
@@ -140,13 +190,19 @@ program
                 {
                     type: "list",
                     name: "jingle",
-                    message: "Which jingle do you want to play?",
+                    message: playWhichJingleString,
                     choices: sortedMatches.map((jingle) => jingle.folder + "/" + jingle.file),
                 },
             ]);
 
-            const [folder, file] = answers.jingle.split("/");
-            api.jingle.play(folder, file);
+            const [folder, file]: [folder: string, file: string] = answers.jingle.split("/");
+            jingle = { folder, file };
+        }
+
+        try {
+            await api.jingle.play(jingle);
+        } catch (e: any) {
+            console.error(`ERROR ${e.status}: ${e.message}`);
         }
     });
 
@@ -157,4 +213,13 @@ program
         console.log(version);
     });
 
+program.command("users").action(async () => {
+    try {
+        const users = await api.user.getAll();
+        console.log(users);
+    } catch (e: any) {
+        console.error(e.status + ": " + e.message);
+    }
+});
+
 program.parse();