ani-cli-npm 2.0.9 → 2.1.0

package/README.MD

@@ -27,7 +27,7 @@ npx ani-cli-npm@latest
 ```
 
 ### Linux:
-#### - Install [nodejs](https://nodejs.org/en/download/ with your distrabutions package manager.
+#### - Install [nodejs](https://nodejs.org/en/download/) with your distrabutions package manager.
 #### - Run the following command:
 ```
 npx ani-cli-npm@latest

package/bin/Anime.js

@@ -7,6 +7,7 @@ const generate_link_1 = require("./generate_link");
 const cache_1 = require("./cache");
 const input_1 = require("./input");
 const load_config_1 = require("./load_config");
+const W2GClient = require("w2g-client");
 const open = require("open");
 const PlayerController = require("media-player-controller");
 const dl = require("download-file-with-progressbar");
@@ -121,8 +122,9 @@ class Anime {
                 console.log(("Opening MPV.."));
                 this.player = await new PlayerController({
                     app: 'mpv',
-                    args: ['--fullscreen'],
-                    media: await this.get_episode_link(episode, config.player)
+                    args: ['--fullscreen', '--keep-open=yes'],
+                    media: await this.get_episode_link(episode, config.player),
+                    ipcPath: config.mpv_socket_path
                 });
                 // @ts-ignore
                 await this.player.launch(err => {
@@ -135,7 +137,9 @@ class Anime {
                 this.player = await new PlayerController({
                     app: 'vlc',
                     args: ['--fullscreen'],
-                    media: await this.get_episode_link(episode, config.player)
+                    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,
                 });
                 // @ts-ignore
                 await this.player.launch(err => {
@@ -147,6 +151,18 @@ class Anime {
                 console.log(("Opening browser..."));
                 await open(await this.get_episode_link(episode, config.player));
                 break;
+            case "W2G":
+                try {
+                    this.player = new W2GClient.W2GClient(config.w2g_api_key);
+                    await this.player.create(await this.get_episode_link(episode, config.player));
+                    console.log(chalk.green("Room link: " + await this.player.getLink()));
+                }
+                catch {
+                    console.log(chalk.red("Failed to create w2g.tv room. \nthis can often be because your API token is invalid. You can change it in options."));
+                    process.exit();
+                }
+                await open(await this.player.getLink());
+                break;
             case "LINK":
                 this.player = 1;
                 console.log(await this.get_episode_link(episode, config.player));
@@ -168,6 +184,10 @@ class Anime {
             else if (this.player == 1) {
                 console.log(await this.get_episode_link(episode));
             }
+            else if (this.player.roomID != undefined) {
+                console.log(chalk.green("Room link: " + await this.player.getLink()));
+                this.player.update(await this.get_episode_link(episode));
+            }
             else if (this.player.opts.app == "mpv") {
                 await this.player.load(await this.get_episode_link(episode));
             }

package/bin/change_config.js

@@ -3,66 +3,97 @@ 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"));
-    let choice = await (0, input_1.selection)([
+    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); }));
-    switch (choice) {
-        case 0:
-            let player = await (0, input_1.selection)([
-                "VLC      - VLC media player",
-                "Browser  - Play in default browser",
-                "MPV      - MPV media player",
-                "Link     - Simply display the link in console"
-            ], [], ((item) => { return chalk.cyan(item); }), ((item) => { return chalk.cyan(item); }));
-            switch (player) {
-                case 0:
-                    temp.player = "VLC";
-                    break;
-                case 1:
-                    temp.player = "BROWSER";
-                    break;
-                case 2:
-                    temp.player = "MPV";
-                    break;
-                case 3:
-                    temp.player = "LINK";
-                    break;
-            }
-            // @ts-ignore
-            return temp, 0;
-        case 1:
-            console.log(chalk.cyan("New Proxy;"));
-            temp.proxy = (await ((0, input_1.input)())).replaceAll(" ", "");
-            // @ts-ignore
-            return temp, 0;
-        case 2:
-            console.log(chalk.cyan("New User Agent"));
-            temp.user_agent = await ((0, input_1.input)());
-            // @ts-ignore
-            return temp, 0;
-        case 3:
-            console.log(chalk.cyan("New Downloads Folder"));
-            temp.download_folder = await ((0, input_1.input)());
-            // @ts-ignore
-            return temp, 0;
-        case 4:
-            // @ts-ignore
-            return temp, 1;
-        case 5:
-            // @ts-ignore
-            return temp, 2;
-    }
+    ], [], ((item) => { return chalk.cyan(item); }), ((item) => { return chalk.cyan(item); }))](temp);
 }
 exports.config_ = config_;

package/bin/generate_link.js

@@ -32,6 +32,7 @@ async function generate_link(provider, id, player) {
             return post;
         case 2:
             provider_name = 'Animixplay';
+            console.log(`Fetching ${provider_name} links...`);
             let buffer = new Buffer(id);
             let enc_id = buffer.toString("base64");
             buffer = new Buffer(id + "LTXs3GrU8we9O" + enc_id);

package/bin/index.js

@@ -51,7 +51,7 @@ async function main() {
                 episode_number = await (0, input_1.number_input)(anime.episode_list.length, 1, (anime.most_recent != 0) ? ["c"] : [], (anime.most_recent != 0) ? [anime.most_recent + 1] : []);
             }
             await anime.play_head(episode_number - 1, config, cache_folder);
-            if (anime.player != 1 && anime.player != 0) {
+            if (anime.player.hasOwnProperty("quit")) {
                 await anime.player.quit();
             }
             await main();
@@ -66,7 +66,7 @@ async function main() {
             let continue_anime = new Anime_1.Anime();
             await continue_anime.init(config.most_recent.anime_id, cache_folder);
             await continue_anime.play_head(config.most_recent.episode_number, config, cache_folder);
-            if (continue_anime.player != 0 && continue_anime.player != 1) {
+            if (continue_anime.player.hasOwnProperty("quit")) {
                 await continue_anime.player.quit();
             }
             await main();

package/bin/load_config.js

@@ -57,7 +57,11 @@ function load_config(cache_dir) {
             anime_id: ""
         },
         download_folder: ".",
-        debug_mode: false
+        debug_mode: false,
+        mpv_socket_path: "",
+        vlc_socket: 0,
+        vlc_pass: "",
+        w2g_api_key: ""
     };
     if (fs.existsSync(cache_dir + "/config.conf")) {
         // @ts-ignore
@@ -83,6 +87,15 @@ function load_config(cache_dir) {
         // @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;
     }
     write_config(cache_dir, config);
     return config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ani-cli-npm",
-  "version": "2.0.9",
+  "version": "2.1.0",
   "description": "ani-cli tool rewritten as npm package",
   "main": "bin/index.js",
   "scripts": {
@@ -36,7 +36,8 @@
     "node-fetch": "^2.6.6",
     "open": "^8.4.0",
     "simple-input": "^1.0.1",
-    "typescript": "^4.9.3"
+    "typescript": "^4.9.3",
+    "w2g-client": "^1.1.0"
   },
   "devDependencies": {
     "@types/node": "^18.11.9"

package/tem.js

@@ -0,0 +1,13 @@
+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()
+

package/temp

@@ -1,16 +0,0 @@
-et_video_quality_mp4() {
-	case $quality in
-		best)
-			video_url=$(printf '%s' "$1" | tail -n 1 | cut -d">" -f2) ;;
-		worst)
-			video_url=$(printf '%s' "$1" | head -n 1 | cut -d">" -f2) ;;
-		*)
-			video_url=$(printf '%s' "$1" | grep -i "${quality}p" | head -n 1 | cut -d">" -f2)
-			if [ -z "$video_url" ]; then
-				err "Current video quality is not available (defaulting to best quality)"
-				video_url=$(printf '%s' "$1" | tail -n 1 | cut -d">" -f2)
-			fi
-			;;
-	esac
-	printf '%s' "$video_url"
-}