tering-serieuze-cli 1.2.0 → 1.4.0

package/dist/index.mjs

@@ -4,7 +4,7 @@
 import { Command } from "commander";
 import figlet from "figlet";
 import inquirer from "inquirer";
-import { TssApi, FilesystemCache, OnePasswordCache } from "tering-serieuze-sdk";
+import { TssApi, FilesystemCache } from "tering-serieuze-sdk";
 
 // src/completion.ts
 import omelette from "omelette";
@@ -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,7 +30,7 @@ async function initCompletion(api2) {
 }
 
 // package.json
-var version = "1.1.1";
+var version = "1.3.0";
 
 // src/index.ts
 var Commands = /* @__PURE__ */ ((Commands2) => {
@@ -37,18 +38,20 @@ var Commands = /* @__PURE__ */ ((Commands2) => {
   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 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")
+    auth: new FilesystemCache("TSS-TOKEN")
   }
 );
 var program = new Command();
@@ -85,7 +88,11 @@ program.command("login" /* login */).description("Authenticate yourself so you c
     const user = await api.user.get();
     console.log("Logged in as " + user.email);
   } catch (e) {
-    console.error("Invalid token!");
+    if (e.status >= 500) {
+      console.error("Uit. Dit kan niet gebeuren want TSS geeft een status >= 500 terug");
+    } else {
+      console.error("Invalid token!");
+    }
     await api.auth.removeToken();
   }
 });
@@ -100,6 +107,8 @@ 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 () => {
@@ -119,6 +128,25 @@ program.command("play" /* play */).description("Play a jingle").argument("<folde
     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) => {
   let jingles;
   try {
@@ -144,7 +172,7 @@ program.command("p" /* playShort */).description("Play a jingle by typing (some)
       {
         type: "list",
         name: "jingle",
-        message: "Which jingle do you want to play?",
+        message: playWhichJingleString,
         choices: sortedMatches.map((jingle2) => jingle2.folder + "/" + jingle2.file)
       }
     ]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tering-serieuze-cli",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "Teringserieuze CLI",
   "author": "Frank",
   "main": "dist/index.mjs",
@@ -27,8 +27,8 @@
     "figlet": "^1.5.2",
     "inquirer": "^9.1.4",
     "omelette": "^0.4.17",
-    "tering-serieuze-sdk": "^2.0.0",
-    "tering-serieuze-types": "^1.9.0"
+    "tering-serieuze-sdk": "^3.0.0",
+    "tering-serieuze-types": "^1.14.1"
   },
   "devDependencies": {
     "@types/figlet": "^1.5.5",

package/src/completion.ts

@@ -15,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

@@ -13,18 +13,21 @@ export enum Commands {
     clearcache = "clearcache",
     login = "login",
     play = "play",
+    recent = "recent",
     jingles = "jingles",
     playShort = "p",
     version = "version",
 }
 
+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"),
+        auth: new FilesystemCache("TSS-TOKEN"),
     }
 );
 
@@ -76,8 +79,13 @@ program
         try {
             const user = await api.user.get();
             console.log("Logged in as " + user.email);
-        } catch (e) {
-            console.error("Invalid token!");
+        } catch (e: any) {
+            if (e.status >= 500) {
+                console.error("Uit. Dit kan niet gebeuren want TSS geeft een status >= 500 terug");
+            } else {
+                console.error("Invalid token!");
+            }
+
             await api.auth.removeToken();
         }
     });
@@ -97,6 +105,8 @@ program
             await api.auth.removeToken();
             await api.jingle.getCache().clear();
             console.log("Cleared all caches");
+        } else {
+            console.error("Invalid cache type");
         }
     });
 
@@ -127,6 +137,31 @@ program
         }
     });
 
+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
     .command(Commands.playShort)
     .description("Play a jingle by typing (some) parts of the name")
@@ -160,12 +195,12 @@ 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("/");
+            const [folder, file]: [folder: string, file: string] = answers.jingle.split("/");
             jingle = { folder, file };
         }