libroadcast-cli 1.6.0 → 1.7.0

package/README.md

@@ -23,7 +23,7 @@ Commands:
      Note:  The delay is specified in seconds. (max 3600 seconds = 1 hour)
      Options:
        --onlyDelay   Set only the delay without changing the start time.
-       --noDelay     Remove the delay from the rounds.
+       --noDelay     Do not modify the delay, only adjust the start time.
 
   setPGN <broadcastId> <sourcePGNUrl> [--withFilter] [--slice <sliceFilter>]
      Sets the source PGN URL for all rounds in the specified broadcast.

package/dist/cmd/delay.js

@@ -10,8 +10,7 @@ const getInfoBroadcast_1 = require("../utils/getInfoBroadcast");
 const colors_1 = __importDefault(require("../utils/colors"));
 const setDelayRounds = async (rounds, delay, onlyDelay, noDelay) => {
     for (const round of rounds) {
-        await commandHandler_1.client
-            .POST("/broadcast/round/{broadcastRoundId}/edit", {
+        await (0, commandHandler_1.handleApiResponse)(commandHandler_1.client.POST("/broadcast/round/{broadcastRoundId}/edit", {
             params: {
                 path: { broadcastRoundId: round.id },
                 query: { patch: 1 },
@@ -22,16 +21,7 @@ const setDelayRounds = async (rounds, delay, onlyDelay, noDelay) => {
                     ? round.startsAt + delay * 1000
                     : undefined,
             },
-        })
-            .then((response) => {
-            if (response.response.ok)
-                console.log(colors_1.default.green(`Successfully set delay for round ${colors_1.default.whiteBold(round.id)} to ${colors_1.default.whiteBold(delay.toString())} seconds.`));
-            else
-                console.error(colors_1.default.red(`Failed to set delay for round ${colors_1.default.whiteBold(round.id)}: ${colors_1.default.whiteBold(response.response.statusText)}`));
-        })
-            .catch((error) => {
-            console.error(colors_1.default.red(`Error setting delay for round ${colors_1.default.whiteBold(round.id)}:`), error);
-        });
+        }), `Successfully set delay for round ${colors_1.default.whiteBold(round.id)} to ${colors_1.default.whiteBold(delay.toString())} seconds.`, `Error setting delay for round ${colors_1.default.whiteBold(round.id)}`);
         await (0, commandHandler_1.sleep)(200);
     }
 };
@@ -42,7 +32,7 @@ const delayCommand = async (args) => {
         (0, node_process_1.exit)(1);
     }
     const delayNum = parseInt(delay, 10);
-    if (isNaN(delayNum) && delayNum >= 0 && delayNum <= 3600) {
+    if (isNaN(delayNum) || delayNum < 0 || delayNum > 3600) {
         (0, commandHandler_1.msgCommonErrorHelp)("Delay must be a number between 0 and 3600 seconds.");
         (0, node_process_1.exit)(1);
     }
@@ -57,6 +47,6 @@ const delayCommand = async (args) => {
         console.error(colors_1.default.red("No rounds found for the specified broadcast."));
         (0, node_process_1.exit)(1);
     }
-    setDelayRounds(broadcast.rounds, parseInt(delay, 10), onlyDelay, noDelay);
+    await setDelayRounds(broadcast.rounds, delayNum, onlyDelay, noDelay);
 };
 exports.delayCommand = delayCommand;

package/dist/cmd/fixSchedule.js

@@ -10,13 +10,15 @@ const getInfoBroadcast_1 = require("../utils/getInfoBroadcast");
 const colors_1 = __importDefault(require("../utils/colors"));
 const ms_1 = require("ms");
 const fixScheduleRounds = async (rounds, timeDiff, roundsToFix) => {
-    if (roundsToFix && roundsToFix.length > 0) {
-        rounds = rounds.filter((_, i) => roundsToFix.includes(i + 1));
+    rounds = rounds
+        .filter((_, i) => !roundsToFix?.length || roundsToFix.includes(i + 1))
+        .filter((el) => el.startsAt !== undefined);
+    if (rounds.length === 0) {
+        console.error(colors_1.default.red("No rounds to fix after applying filters."));
+        (0, node_process_1.exit)(1);
     }
-    rounds = rounds.filter((el) => el.startsAt !== undefined);
     for (const round of rounds) {
-        await commandHandler_1.client
-            .POST("/broadcast/round/{broadcastRoundId}/edit", {
+        await (0, commandHandler_1.handleApiResponse)(commandHandler_1.client.POST("/broadcast/round/{broadcastRoundId}/edit", {
             params: {
                 path: { broadcastRoundId: round.id },
                 query: { patch: 1 },
@@ -24,16 +26,7 @@ const fixScheduleRounds = async (rounds, timeDiff, roundsToFix) => {
             body: {
                 startsAt: round.startsAt + timeDiff,
             },
-        })
-            .then((response) => {
-            if (response.response.ok)
-                console.log(colors_1.default.green(`Successfully fixed schedule for round ${colors_1.default.whiteBold(round.id)}.`));
-            else
-                console.error(colors_1.default.red(`Failed to fix schedule for round ${colors_1.default.whiteBold(round.id)}: ${colors_1.default.whiteBold(response.response.statusText)}`));
-        })
-            .catch((error) => {
-            console.error(colors_1.default.red(`Error fixing schedule for round ${colors_1.default.whiteBold(round.id)}:`), error);
-        });
+        }), `Successfully fixed schedule for round ${colors_1.default.whiteBold(round.id)}.`, `Error fixing schedule for round ${colors_1.default.whiteBold(round.id)}`);
         await (0, commandHandler_1.sleep)(200);
     }
 };
@@ -43,6 +36,8 @@ const translateRoundsToFix = (arg) => {
     for (const part of parts) {
         if (part.endsWith("+")) {
             const start = parseInt(part.slice(0, -1), 10);
+            if (isNaN(start))
+                continue;
             for (let i = start; i <= 64; i++) {
                 rounds.push(i);
             }
@@ -51,16 +46,20 @@ const translateRoundsToFix = (arg) => {
             const [startStr, endStr] = part.split("-");
             const start = parseInt(startStr, 10);
             const end = parseInt(endStr, 10);
+            if (isNaN(start) || isNaN(end))
+                continue;
             for (let i = start; i <= end; i++) {
                 rounds.push(i);
             }
         }
         else {
             const roundNum = parseInt(part, 10);
+            if (isNaN(roundNum))
+                continue;
             rounds.push(roundNum);
         }
     }
-    return rounds;
+    return [...new Set(rounds)];
 };
 const fixScheduleCommand = async (args) => {
     const [broadcastId, timeDiffStr] = args.slice(0, 2);

package/dist/cmd/setLichessGames.js

@@ -8,8 +8,7 @@ const node_process_1 = require("node:process");
 const commandHandler_1 = require("../utils/commandHandler");
 const getInfoBroadcast_1 = require("../utils/getInfoBroadcast");
 const colors_1 = __importDefault(require("../utils/colors"));
-const setLichessGames = (round, games) => commandHandler_1.client
-    .POST("/broadcast/round/{broadcastRoundId}/edit", {
+const setLichessGames = (round, games) => (0, commandHandler_1.handleApiResponse)(commandHandler_1.client.POST("/broadcast/round/{broadcastRoundId}/edit", {
     params: {
         path: { broadcastRoundId: round.id },
         query: { patch: 1 },
@@ -18,16 +17,7 @@ const setLichessGames = (round, games) => commandHandler_1.client
         syncSource: "ids",
         syncIds: games,
     },
-})
-    .then((response) => {
-    if (response.response.ok)
-        console.log(colors_1.default.green(`Successfully set games for round ${colors_1.default.whiteBold(round.id)} to ${colors_1.default.whiteBold(games)}.`));
-    else
-        console.error(colors_1.default.red(`Failed to set games for round ${colors_1.default.whiteBold(round.id)}: ${colors_1.default.whiteBold(response.response.statusText)}`));
-})
-    .catch((error) => {
-    console.error(colors_1.default.red(`Error setting games for round ${colors_1.default.whiteBold(round.id)}:`), error);
-});
+}), `Successfully set games for round ${colors_1.default.whiteBold(round.id)} to ${colors_1.default.whiteBold(games)}.`, `Error setting games for round ${colors_1.default.whiteBold(round.id)}`);
 const setLichessGamesCommand = async (args) => {
     const bId = args.shift();
     const games = args.slice(0, 64).join(" ");
@@ -40,6 +30,6 @@ const setLichessGamesCommand = async (args) => {
         console.error(colors_1.default.red(`Broadcast round with ID ${colors_1.default.whiteBold(bId)} not found or has no rounds.`));
         (0, node_process_1.exit)(1);
     }
-    setLichessGames(round, games);
+    await setLichessGames(round, games);
 };
 exports.setLichessGamesCommand = setLichessGamesCommand;

package/dist/cmd/setPGN.js

@@ -9,11 +9,10 @@ const commandHandler_1 = require("../utils/commandHandler");
 const getInfoBroadcast_1 = require("../utils/getInfoBroadcast");
 const colors_1 = __importDefault(require("../utils/colors"));
 const setPGN = async (rounds, urlRound, setRoundFilter, setSliceFilter = null) => {
-    for (let rN = 1; rN <= rounds.length; rN++) {
-        const round = rounds[rN - 1];
+    for (const [index, round] of rounds.entries()) {
+        const rN = index + 1;
         const url = urlRound(rN);
-        await commandHandler_1.client
-            .POST("/broadcast/round/{broadcastRoundId}/edit", {
+        await (0, commandHandler_1.handleApiResponse)(commandHandler_1.client.POST("/broadcast/round/{broadcastRoundId}/edit", {
             params: {
                 path: { broadcastRoundId: round.id },
                 query: { patch: 1 },
@@ -22,18 +21,9 @@ const setPGN = async (rounds, urlRound, setRoundFilter, setSliceFilter = null) =
                 syncSource: "url",
                 syncUrl: url,
                 onlyRound: setRoundFilter ? rN : undefined,
-                slices: setSliceFilter ? setSliceFilter : undefined,
+                slices: setSliceFilter || undefined,
             },
-        })
-            .then((response) => {
-            if (response.response.ok)
-                console.log(colors_1.default.green(`Successfully set source for round ${colors_1.default.whiteBold(round.id)} to ${colors_1.default.whiteBold(url)}.`));
-            else
-                console.error(colors_1.default.red(`Failed to set source for round ${colors_1.default.whiteBold(round.id)}: ${colors_1.default.whiteBold(response.response.statusText)}`));
-        })
-            .catch((error) => {
-            console.error(colors_1.default.red(`Error setting source for round ${colors_1.default.whiteBold(round.id)}:`), error);
-        });
+        }), `Successfully set source for round ${colors_1.default.whiteBold(round.id)} to ${colors_1.default.whiteBold(url)}.`, `Error setting source for round ${colors_1.default.whiteBold(round.id)}`);
         await (0, commandHandler_1.sleep)(200);
     }
 };
@@ -49,27 +39,24 @@ const setPGNCommand = async (args) => {
         (0, node_process_1.exit)(1);
     }
     const urlRound = (roundNum) => roundNum ? sourcePGN.replaceAll("{}", roundNum.toString()) : sourcePGN;
-    let isLCC = false;
     try {
         const url = new URL(urlRound());
-        if (!url.protocol.startsWith("http"))
-            throw new Error();
-        isLCC = url.hostname === "view.livechesscloud.com";
-        if (isLCC && url.hash.length > 1 && !url.hash.endsWith("/{}"))
-            throw new Error();
+        if (!url.protocol.startsWith("http")) {
+            throw new Error("Invalid protocol");
+        }
+        const isLCC = url.hostname === "view.livechesscloud.com";
+        if (isLCC && url.hash.length > 1 && !url.hash.endsWith("/{}")) {
+            console.error(colors_1.default.red('Invalid URL. For livechesscloud URLs, please ensure it ends with "/{}".'));
+            (0, node_process_1.exit)(1);
+        }
     }
-    catch {
-        console.error(colors_1.default.red(isLCC
-            ? 'Invalid URL. For livechesscloud URLs, please ensure it ends with "/{}".'
-            : 'Invalid URL. Must be http/https with "{}" as round placeholder.'));
+    catch (error) {
+        console.error(colors_1.default.red('Invalid URL. Must be http/https with "{}" as round placeholder.'));
         (0, node_process_1.exit)(1);
     }
     const setRoundFilter = args.includes("--withFilter");
     const sliceIndex = args.indexOf("--slice");
-    let setSliceFilter = null;
-    if (sliceIndex !== -1 && args.length > sliceIndex + 1) {
-        setSliceFilter = args[sliceIndex + 1];
-    }
-    setPGN(bcast.rounds, urlRound, setRoundFilter, setSliceFilter);
+    const setSliceFilter = sliceIndex !== -1 ? args[sliceIndex + 1] || null : null;
+    await setPGN(bcast.rounds, urlRound, setRoundFilter, setSliceFilter);
 };
 exports.setPGNCommand = setPGNCommand;

package/dist/index.js

@@ -5,13 +5,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_process_1 = require("node:process");
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 const commandHandler_1 = require("./utils/commandHandler");
 const help_1 = require("./utils/help");
 const colors_1 = __importDefault(require("./utils/colors"));
 (async () => {
     if (commandHandler_1.args.includes("--version") || commandHandler_1.args.includes("-v")) {
-        const { version } = require("../package.json");
-        console.log(`${colors_1.default.whiteBold("libroadcast-cli")} ${colors_1.default.underItalic(`v${version}`)}`);
+        const packageJson = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(__dirname, "../package.json"), "utf-8"));
+        console.log(`${colors_1.default.whiteBold("libroadcast-cli")} ${colors_1.default.underItalic(`v${packageJson.version}`)}`);
         (0, node_process_1.exit)(0);
     }
     if (commandHandler_1.args.length === 0 || (0, help_1.includeHelp)(commandHandler_1.args[0])) {
@@ -28,8 +30,8 @@ const colors_1 = __importDefault(require("./utils/colors"));
         console.error(`${colors_1.default.red("Error:")} Command handler not found.`);
         (0, node_process_1.exit)(1);
     }
-    if (!commandHandler_1.LICHESS_TOKEN) {
-        console.error(`${colors_1.default.red("Error:")} ${colors_1.default.whiteBold("LICHESS_TOKEN")} environment variable is not set.`);
+    if (!commandHandler_1.LICHESS_TOKEN?.trim() || !commandHandler_1.LICHESS_TOKEN.startsWith("lip_")) {
+        console.error(`${colors_1.default.red("Error:")} ${colors_1.default.whiteBold("LICHESS_TOKEN")} environment variable is not set, empty, or invalid (must start with 'lip_').`);
         (0, node_process_1.exit)(1);
     }
     await handler(commandHandler_1.args);

package/dist/utils/commandHandler.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.msgCommonErrorHelp = exports.sleep = exports.client = exports.commands = exports.Command = exports.args = exports.LICHESS_TOKEN = void 0;
+exports.handleApiResponse = exports.msgCommonErrorHelp = exports.sleep = exports.client = exports.commands = exports.Command = exports.args = exports.LICHESS_TOKEN = void 0;
 const node_process_1 = require("node:process");
 const openapi_fetch_1 = __importDefault(require("openapi-fetch"));
 const delay_1 = require("../cmd/delay");
@@ -12,7 +12,7 @@ const setLichessGames_1 = require("../cmd/setLichessGames");
 const fixSchedule_1 = require("../cmd/fixSchedule");
 const colors_1 = __importDefault(require("./colors"));
 exports.LICHESS_TOKEN = node_process_1.env.LICHESS_TOKEN;
-const LICHESS_DOMAIN = node_process_1.env.LICHESS_DOMAIN || "https://lichess.org/";
+const LICHESS_DOMAIN = (node_process_1.env.LICHESS_DOMAIN || "https://lichess.org").replace(/\/$/, "") + "/";
 exports.args = node_process_1.argv.slice(2);
 var Command;
 (function (Command) {
@@ -41,3 +41,18 @@ const msgCommonErrorHelp = (msg) => {
     console.info(colors_1.default.blue("Use --help to see usage."));
 };
 exports.msgCommonErrorHelp = msgCommonErrorHelp;
+const handleApiResponse = async (promise, successMsg, errorContext) => {
+    try {
+        const response = await promise;
+        if (response.response.ok) {
+            console.log(colors_1.default.green(successMsg));
+        }
+        else {
+            console.error(colors_1.default.red(`${errorContext}: ${colors_1.default.whiteBold(response.response.statusText)}`));
+        }
+    }
+    catch (error) {
+        console.error(colors_1.default.red(errorContext), error);
+    }
+};
+exports.handleApiResponse = handleApiResponse;

package/dist/utils/help.js

@@ -12,7 +12,7 @@ const helpDelay = [
     `     ${colors_1.default.bold("Note:")}  ${colors_1.default.gray("The delay is specified in seconds. (max 3600 seconds = 1 hour)")}`,
     `     ${colors_1.default.bold("Options:")}`,
     `       --onlyDelay   ${colors_1.default.gray("Set only the delay without changing the start time.")}`,
-    `       --noDelay     ${colors_1.default.gray("Remove the delay from the rounds.")}`,
+    `       --noDelay     ${colors_1.default.gray("Do not modify the delay, only adjust the start time.")}`,
 ].join("\n");
 const helpSetPGN = [
     `  ${colors_1.default.underItalic("setPGN <broadcastId> <sourcePGNUrl> [--withFilter] [--slice <sliceFilter>]")}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libroadcast-cli",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "CLI to help with broadcast maintenance on Lichess",
   "main": "dist/index.js",
   "keywords": [