ani-cli-npm 2.1.0 → 2.1.1

package/bin/Anime.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Anime = void 0;
-const curl_1 = require("./curl");
-const regex_1 = require("./regex");
+const curl_1 = require("./core_utils/curl");
+const regex_1 = require("./core_utils/regex");
 const generate_link_1 = require("./generate_link");
-const cache_1 = require("./cache");
+const cache_1 = require("./file_managment/cache");
 const input_1 = require("./input");
-const load_config_1 = require("./load_config");
+const load_config_1 = require("./file_managment/load_config");
 const W2GClient = require("w2g-client");
 const open = require("open");
 const PlayerController = require("media-player-controller");
@@ -25,6 +25,7 @@ class Anime {
     episode_list = [];
     most_recent = 0;
     player = 0;
+    current_pos = 0;
     async init(anime_id, cache_folder) {
         /*
         Initiate Anime object
@@ -51,6 +52,9 @@ class Anime {
                 if (cache_object.most_recent != undefined) {
                     this.most_recent = cache_object.most_recent;
                 }
+                if (cache_object.position != undefined) {
+                    this.current_pos = cache_object.position;
+                }
             }
             catch {
                 await this.get_ep_bases(this.id);
@@ -116,13 +120,13 @@ class Anime {
          - If set to Link, it will simply print the media stream link to console, primarily for debuting peruses.
          */
         console.clear();
-        console.log(`Playing ${this.id} episode ${episode + 1}`);
+        console.log(`Playing ${this.id} episode ${episode + 1} from ${new Date(this.current_pos * 1000).toISOString().slice(11, 19)}`);
         switch (config.player) {
             case "MPV":
                 console.log(("Opening MPV.."));
                 this.player = await new PlayerController({
                     app: 'mpv',
-                    args: ['--fullscreen', '--keep-open=yes'],
+                    args: ['--fullscreen', '--keep-open=yes', `--start=+${this.current_pos}`],
                     media: await this.get_episode_link(episode, config.player),
                     ipcPath: config.mpv_socket_path
                 });
@@ -136,7 +140,7 @@ class Anime {
                 console.log(("Opening VLC.."));
                 this.player = await new PlayerController({
                     app: 'vlc',
-                    args: ['--fullscreen'],
+                    args: ['--fullscreen', `--start-time ${this.current_pos}`],
                     media: await this.get_episode_link(episode, config.player),
                     //httpPort: (config.vlc_socket !== 0)? config.vlc_socket : null,                     // HTTP port for local communication (vlc only)
                     //httpPass: (config.vlc_pass !== "")? config.vlc_socket : null,
@@ -168,6 +172,26 @@ class Anime {
                 console.log(await this.get_episode_link(episode, config.player));
                 break;
         }
+        if (this.player.on !== undefined) {
+            this.player.on('playback', (data) => {
+                if (data.name == "time-pos" && data.value >= 0) {
+                    this.current_pos = data.value;
+                }
+            });
+            this.player.on('app-exit', (code) => {
+                config.most_recent.anime_id = this.id;
+                config.most_recent.episode_number = episode;
+                config.most_recent.episode_second = this.current_pos;
+                (0, load_config_1.write_config)(config_dir, config);
+                this.most_recent = episode;
+                (0, cache_1.new_cache)(config_dir, {
+                    id: this.id,
+                    episode_list: this.episode_list,
+                    most_recent: this.most_recent,
+                    position: this.current_pos
+                });
+            });
+        }
         await this.play(episode, config, config_dir, true);
     }
     async play(episode, config, config_dir, first = false) {
@@ -207,12 +231,14 @@ class Anime {
         }
         config.most_recent.anime_id = this.id;
         config.most_recent.episode_number = episode;
+        config.most_recent.episode_second = this.current_pos;
         (0, load_config_1.write_config)(config_dir, config);
         this.most_recent = episode;
         (0, cache_1.new_cache)(config_dir, {
             id: this.id,
             episode_list: this.episode_list,
-            most_recent: this.most_recent
+            most_recent: this.most_recent,
+            position: this.current_pos
         });
         let selected; // Look, I'm sorry, but there is no way I can possibly document this in a sane way. It's a dumb patch.
         do {
@@ -250,44 +276,6 @@ class Anime {
             case 3:
                 break;
         }
-        // if (episode <= 0){
-        //     switch(await selection([
-        //         "Next",
-        //         "Quit"
-        //     ], ["n", "q"])){
-        //         case 0:
-        //             await this.play(episode+1, config, config_dir)
-        //             break
-        //         case 1:
-        //             break
-        //     }
-        // }else if(episode >= this.episode_list.length-2){
-        //     switch(await selection([
-        //         "Previous",
-        //         "Quit"
-        //     ], ["p", "q"])){
-        //         case 0:
-        //             await this.play(episode-1, config, config_dir)
-        //             break
-        //         case 1:
-        //             break
-        //     }
-        // }else{
-        //     switch(await selection([
-        //         "Next",
-        //         "Previous",
-        //         "Quit"
-        //     ], ["n", "p", "q"])){
-        //         case 0:
-        //             await this.play(episode+1, config, config_dir)
-        //             break
-        //         case 1:
-        //             await this.play(episode-1, config, config_dir)
-        //             break
-        //         case 2:
-        //             break
-        //     }
-        // }
     }
     async download(episode, download_folder, final_ep) {
         /*

package/bin/core_utils/curl.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.curl = void 0;
+const fetch = require("node-fetch");
+const chalk = require("chalk");
+async function curl(url, method = "GET", redirect = false) {
+    try {
+        let response = await fetch(url, {
+            //"agent": proxyAgent,
+            "headers": {
+                'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101 Firefox/100.0',
+                "X-Requested-With": "XMLHttpRequest"
+            },
+            "referrerPolicy": "origin",
+            "body": null,
+            "method": method,
+            "redirect": 'follow',
+            // "follow": 10,
+        }).catch(async function (err) {
+            console.warn(chalk.red(`Something went wrong connecting to ${url}. ${err}`));
+            process.exit();
+        });
+        if (redirect) {
+            return response.url;
+        }
+        else {
+            return await response.text();
+        }
+    }
+    catch {
+        console.log(chalk.red("Something went wrong in curl()"));
+        process.exit();
+    }
+}
+exports.curl = curl;

package/bin/core_utils/libs.js

@@ -0,0 +1,12 @@
+"use strict";
+// Random functions
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.range = void 0;
+function range(start, end) {
+    let ans = [];
+    for (let i = start; i <= end; i++) {
+        ans.push(i);
+    }
+    return ans;
+}
+exports.range = range;

package/bin/core_utils/regex.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RegexParse = void 0;
+function RegexParse(str, rule) {
+    let escapeRegex = (str) => str.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, "\\$1");
+    return new RegExp("^" + rule.split("*").map(escapeRegex).join(".*") + "$").test(str);
+}
+exports.RegexParse = RegexParse;

package/bin/file_managment/cache.js

@@ -0,0 +1,79 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.search_cache = exports.new_cache = exports.clear_cache = void 0;
+const fs = __importStar(require("fs"));
+function clear_cache(location, show) {
+    try {
+        console.log("ye sorry that doesnt exist yet.");
+        if (show) {
+            console.log("Cleared cache");
+        }
+    }
+    catch {
+        if (show) {
+            console.log("Failed to clear cache.");
+        }
+    }
+}
+exports.clear_cache = clear_cache;
+function new_cache(location, anime) {
+    /*
+    Creates cache of Anime object, in cache file.
+     */
+    try {
+        fs.writeFileSync(location + "/" + anime.id + ".cache", JSON.stringify(anime));
+    }
+    catch {
+        console.log("Failed to write to cache");
+    }
+}
+exports.new_cache = new_cache;
+function get_cache(location, anime_id) {
+    /*
+    ## Get cache by anime_id. Does not check if the cache exists.
+     */
+    return JSON.parse(fs.readFileSync(location + "/" + anime_id + ".cache").toString());
+}
+function search_cache(cache_folder, anime_id) {
+    /*
+    ## Searches cache folder for cache file with name of anime_id, at the location of cache_folder
+
+    ### returns boolean for weather it is found.
+     */
+    try {
+        if (check_cache(cache_folder, anime_id)) {
+            return get_cache(cache_folder, anime_id);
+        }
+        return false;
+    }
+    catch {
+        return false;
+    }
+}
+exports.search_cache = search_cache;
+function check_cache(location, anime_id) {
+    return fs.readdirSync(location).includes(anime_id + ".cache");
+}

package/bin/file_managment/change_config.js

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.config_ = void 0;
+const chalk = require("chalk");
+const input_1 = require("../input");
+const configs = [
+    (async (temp) => {
+        temp.player = [
+            "VLC",
+            "BROWSER",
+            "MPV",
+            "W2G",
+            "LINK",
+        ][await (0, input_1.selection)([
+            "VLC      - VLC media player",
+            "Browser  - Play in default browser",
+            "MPV      - MPV media player",
+            "w2g.tv   - Watch together with friends in browser (Specify api token to create rooms linked to your account)",
+            "Link     - Simply display the link in console"
+        ], [], ((item) => { return chalk.cyan(item); }), ((item) => { return chalk.cyan(item); }))];
+        // @ts-ignore
+        return temp, 0;
+    }),
+    (async (temp) => {
+        console.log(chalk.cyan("New Proxy;"));
+        temp.proxy = (await ((0, input_1.input)())).replaceAll(" ", "");
+        // @ts-ignore
+        return temp, 0;
+    }),
+    (async (temp) => {
+        console.log(chalk.cyan("New User Agent"));
+        temp.user_agent = await ((0, input_1.input)());
+        // @ts-ignore
+        return temp, 0;
+    }),
+    (async (temp) => {
+        console.log(chalk.cyan("New Downloads Folder"));
+        temp.download_folder = await ((0, input_1.input)());
+        // @ts-ignore
+        return temp, 0;
+    }),
+    (async (temp) => {
+        console.log(chalk.cyan("New socket file"));
+        temp.mpv_socket_path = await ((0, input_1.input)());
+        // @ts-ignore
+        return temp, 0;
+    }),
+    (async (temp) => {
+        console.log(chalk.cyan("New VLC socket"));
+        temp.vlc_socket = await ((0, input_1.input)());
+        // @ts-ignore
+        return temp, 0;
+    }),
+    (async (temp) => {
+        console.log(chalk.cyan("New VLC password"));
+        temp.vlc_pass = await ((0, input_1.input)());
+        // @ts-ignore
+        return temp, 0;
+    }),
+    (async (temp) => {
+        console.log(chalk.cyan("New w2g.tv api token"));
+        temp.w2g_api_key = await ((0, input_1.input)());
+        // @ts-ignore
+        return temp, 0;
+    }),
+    (async (temp) => {
+        // @ts-ignore
+        return temp, 1;
+    }),
+    (async (temp) => {
+        // @ts-ignore
+        return temp, 2;
+    })
+];
+async function config_(temp) {
+    /*
+    ## Lets user change a single attribute of config. Returns new config object, and an exit code
+
+    ### 0 to continue (generic return)
+    ### 1 To confirm  (Save and exit)
+    ### 2 to cancel   (exit without saving changes)
+     */
+    console.clear();
+    console.log(chalk.blue("ANI-CLI-NPM \n"));
+    console.log(chalk.yellow("Config:\n"));
+    return configs[await (0, input_1.selection)([
+        "Player; " + temp.player,
+        "Proxy; " + temp.proxy,
+        "User agent; " + temp.user_agent,
+        "Downloads folder; " + temp.download_folder,
+        "Mpv socket connection file; " + temp.mpv_socket_path,
+        "VLC socket; " + temp.vlc_socket,
+        "VLC pass; " + temp.vlc_pass,
+        "W2G api token: " + temp.w2g_api_key,
+        "Save and exit",
+        "Exit without saving"
+    ], [], ((item) => { return chalk.cyan(item); }), ((item) => { return chalk.cyan(item); }))](temp);
+}
+exports.config_ = config_;

package/bin/file_managment/load_config.js

@@ -0,0 +1,110 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.make_config_dir = exports.write_config = exports.load_config = void 0;
+const fs = __importStar(require("fs"));
+function make_config_dir(cache_dir, debug) {
+    try {
+        if (!fs.existsSync(cache_dir + "/"))
+            fs.mkdirSync(cache_dir + "/");
+    }
+    catch {
+        if (debug) {
+            console.log("Failed to make cache dir");
+        }
+    }
+}
+exports.make_config_dir = make_config_dir;
+function write_config(cache_dir, config) {
+    try {
+        //make_config_dir(cache_dir, config.debug_mode)
+        fs.writeFileSync(cache_dir + "/config.conf", JSON.stringify(config), "utf-8");
+    }
+    catch {
+        console.log(("Failed to write to config file."));
+    }
+}
+exports.write_config = write_config;
+function load_config(cache_dir) {
+    let config = {
+        player: "BROWSER",
+        proxy: "",
+        user_agent: "Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101 Firefox/100.0",
+        most_recent: {
+            episode_number: 0,
+            episode_second: 0,
+            anime_id: ""
+        },
+        download_folder: ".",
+        debug_mode: false,
+        mpv_socket_path: "",
+        vlc_socket: 0,
+        vlc_pass: "",
+        w2g_api_key: ""
+    };
+    if (fs.existsSync(cache_dir + "/config.conf")) {
+        // @ts-ignore
+        let tmp = JSON.parse(fs.readFileSync(cache_dir + "/config.conf"), "utf8");
+        // @ts-ignore
+        if (tmp.player !== undefined)
+            config.player = tmp.player;
+        // @ts-ignore
+        if (tmp.proxy !== undefined)
+            config.proxy = tmp.proxy;
+        // @ts-ignore
+        if (tmp.user_agent !== undefined)
+            config.user_agent = tmp.user_agent;
+        // @ts-ignore
+        if (tmp.most_recent !== undefined) {
+            // @ts-ignore
+            if (tmp.most_recent.episode_number !== undefined)
+                config.most_recent.episode_number = tmp.most_recent.episode_number;
+            // @ts-ignore
+            if (tmp.most_recent.anime_id !== undefined)
+                config.most_recent.anime_id = tmp.most_recent.anime_id;
+            // @ts-ignore
+            if (tmp.most_recent.episode_second !== undefined)
+                config.most_recent.episode_second = tmp.most_recent.episode_second;
+        }
+        // @ts-ignore
+        if (tmp.download_folder !== undefined)
+            config.download_folder = tmp.download_folder;
+        // @ts-ignore
+        if (tmp.mpv_socket_path !== undefined)
+            config.mpv_socket_path = tmp.mpv_socket_path;
+        // @ts-ignore
+        if (tmp.vlc_socket !== undefined)
+            config.vlc_socket = tmp.vlc_socket;
+        // @ts-ignore
+        if (tmp.vlc_pass !== undefined)
+            config.vlc_pass = tmp.vlc_pass;
+        // @ts-ignore
+        if (tmp.w2g_api_key !== undefined)
+            config.w2g_api_key = tmp.w2g_api_key;
+    }
+    write_config(cache_dir, config);
+    return config;
+}
+exports.load_config = load_config;

package/bin/generate_link.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generate_link = void 0;
 const gogohd_url = "https://gogohd.net/";
 const base_url = "https://animixplay.to";
-const curl_1 = require("./curl");
-const regex_1 = require("./regex");
+const curl_1 = require("./core_utils/curl");
+const regex_1 = require("./core_utils/regex");
 async function generate_link(provider, id, player) {
     let html_ = "";
     let provider_name = "";

package/bin/help.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.help = void 0;
+const input_1 = require("./input");
+const chalk = require("chalk");
+const helps = [
+    (async () => {
+        console.log(chalk.cyan("Playing anime: \n" +
+            "  Search: \n" +
+            "    Search for a show/movie. This will search on gogoanime.dk.\n" +
+            "  Episode selection: \n" +
+            "    Once an anime is selected, select an episode. If there is only 1 episode " +
+            "(in the case of a movie), the episode will be played automatically.\n" +
+            "    The episode selected will be played in the video player selected in options. Info on video players can be found in options help."));
+        await help();
+        return;
+    }),
+    (async () => {
+        console.log(chalk.cyan("Downloading anime: \n" +
+            "  Search: \n" +
+            "    Search for a show/movie. This will search on gogoanime.dk.\n" +
+            "  Episode selection: \n" +
+            "    Once an anime is selected, select a start episode and an end episode. If there is only 1 episode " +
+            "(in the case of a movie), the episode will be downloaded automatically. Download folder can be changed in options. Default to run location.\n" +
+            "    The selected episodes will be downloaded. It is common for episode links to fail to be fetched, when this happens the episode will be passed, then reattempted in another pass.\n" +
+            "    Episodes sourced from Animixplay links will download m3u8 file, which you will have difficulty playing, if you are able to at all."));
+        await help();
+        return;
+    }),
+    (async () => {
+        console.log(chalk.cyan("Options: \n" +
+            "  Player: \n" +
+            "    Player used to play anime.\n" +
+            "  Proxy: \n" +
+            "    https proxy address and port in form ip:port. This is not currently implemented.\n" +
+            "  User agent:\n" +
+            "    node-fetch user agent.\n" +
+            "  Downloads folder:\n" +
+            "    Folder to place downloaded episodes.\n" +
+            "  MPV socket connection file:\n" +
+            "    File for mpv socket, used to control mpv instance with outside tools.\n" +
+            "  VLC socket:\n" +
+            "    VLC http control socket\n" +
+            "  VLC pass:\n" +
+            "    VLC http control password\n" +
+            "  W2G api token:\n" +
+            "    Your user access token for w2g.tv. Can be found at https://w2g.tv/en/account/edit_user under Tools/API\n"));
+        await help();
+        return;
+    }),
+    (async () => {
+        return;
+    })
+];
+async function help() {
+    console.log(chalk.cyan("Help page select: \n"));
+    return helps[await (0, input_1.selection)(["Playing", "Downloading", "Options", "Quit"], ["p", "d", "o", "q"])]();
+}
+exports.help = help;

package/bin/index.js

@@ -11,10 +11,11 @@ const chalk = require("chalk");
 // Internal
 const Anime_1 = require("./Anime");
 const search_anime_1 = require("./search_anime");
-const load_config_1 = require("./load_config");
+const load_config_1 = require("./file_managment/load_config");
 const input_1 = require("./input");
-const change_config_1 = require("./change_config");
+const change_config_1 = require("./file_managment/change_config");
 const download_1 = require("./download");
+const help_1 = require("./help");
 const app_data_folder = (0, appdata_path_1.default)();
 const cache_folder = app_data_folder + "/ani-cli-npm";
 (0, load_config_1.make_config_dir)(cache_folder, true);
@@ -30,8 +31,9 @@ async function main() {
         "Continue",
         "Download",
         "Option",
+        "Help",
         "Quit",
-    ], ["s", "c", "d", "o", "q"], ((thing) => { return chalk.magenta(thing); }), ((thing) => { return chalk.magenta(thing); }));
+    ], ["s", "c", "d", "o", "h", "q"], ((thing) => { return chalk.magenta(thing); }), ((thing) => { return chalk.magenta(thing); }));
     switch (choice) {
         case 0: // Search
             let temp_ = await (0, search_anime_1.search)();
@@ -105,7 +107,10 @@ async function main() {
             }
             await main();
             break;
-        case 4: // Quit
+        case 4:
+            await (0, help_1.help)();
+            break;
+        case 5: // Quit
             console.log("Exit");
     }
     return 0;

package/bin/load_config.js

@@ -96,6 +96,9 @@ function load_config(cache_dir) {
         // @ts-ignore
         if (tmp.vlc_pass !== undefined)
             config.vlc_pass = tmp.vlc_pass;
+        // @ts-ignore
+        if (tmp.w2g_api_key !== undefined)
+            config.w2g_api_key = tmp.w2g_api_key;
     }
     write_config(cache_dir, config);
     return config;

package/bin/search_anime.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.search = void 0;
-const regex_1 = require("./regex");
-const curl_1 = require("./curl");
+const regex_1 = require("./core_utils/regex");
+const curl_1 = require("./core_utils/curl");
 const input_1 = require("./input");
 const chalk_1 = __importDefault(require("chalk"));
 async function search_anime(search) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ani-cli-npm",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "ani-cli tool rewritten as npm package",
   "main": "bin/index.js",
   "scripts": {

package/tem.js

@@ -1,13 +0,0 @@
-const W2GClient = require("w2g-client")
-
-let client = new W2GClient.W2GClient("sovw9okdu5kb9vr39yy9k34u25sftalqz5ntluxshn48ooza1x5ih3yzaay6ie097z")
-
-async function main(){
-    await client.create()
-    console.log(client.getLink())
-    await client.update("https://wwwx12.gogocdn.stream/videos/hls/nHDWH61tDXm9bXm7-tFVIw/1670878227/107271/f23efce39606d64216a0023544f49bb4/ep.29.1662456614.m3u8")
-
-}
-
-main()
-