use extension packer

add firefox extension
set playlistid
2022-10-16 22:34:25 +02:00 · 2022-10-16 21:17:23 +02:00 · 2022-03-06 09:31:36 +01:00 · 2022-03-06 09:28:44 +01:00 · 2022-03-06 09:26:03 +01:00 · 2022-03-06 08:54:23 +01:00
6 changed files with 136 additions and 77 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,13 +1,13 @@
 kind: pipeline
 name: default
 steps:
- name: compile-chrome
-  image: roypur/chrome-packer:latest
+- name: compile-extensions
+  image: roypur/extension-packer:latest
  environment:
    CHROME_PRIVKEY:
      from_secret: chrome_privkey
  commands:
-    - ./pack-chrome.sh
+    - ./pack-browsers.sh
 - name: gitea_release
  image: plugins/gitea-release
  settings:
@ -15,6 +15,6 @@ steps:
      from_secret: gitea_token
    base_url: https://git.purser.it
    title: ${DRONE_TAG}
-    files: out/proxy-stream-${DRONE_TAG}.crx
+    files: out/proxy-stream-${DRONE_TAG}.crx out/proxy-stream-${DRONE_TAG}.xpi
  when:
    event: tag
--- a/.gitignore
+++ b/.gitignore
@ -11,4 +11,5 @@ android/.gradle/*
 android/gradle/*
 chrome/*.png
 *.crx
+*.xpi
 sources.json
--- a/chrome/manifest.json
+++ b/chrome/manifest.json
@ -7,9 +7,9 @@
        "48": "icon-48.png",
        "128": "icon-128.png"
    },
-    "version": "104.0",
+    "version": "111.0",
    "manifest_version": 3,
-    "host_permissions": ["http://127.0.0.1:8083/jsonrpc", "http://127.0.0.1:8080/jsonrpc"],
+    "host_permissions": ["http://127.0.0.1:4000/jsonrpc"],
    "permissions": ["tabs"],
    "action": {
        "default_title": "Proxy Stream",
--- a/chrome/popup.html
+++ b/chrome/popup.html
@ -4,7 +4,8 @@
        <title>Proxy Stream</title>
    </head>
    <body>
-        <button>Proxy Stream</button>
-        <button>Play on kodi</button>
+        <button id="proxy-button">Proxy Stream</button>
+        <button id="kodi-play-button">Play on kodi</button>
+        <button id="kodi-queue-button">Queue on kodi</button>
    </body>
 </html>
--- a/chrome/script.js
+++ b/chrome/script.js
@ -1,83 +1,122 @@
-let providers = new Map();
-providers.set("www.youtube.com", "youtube");
-providers.set("youtube.com", "youtube");
-providers.set("youtu.be", "youtube");
-providers.set("tv.nrk.no", "nrk");
-providers.set("seafile.purser.it", "seafile");
+let providers = new Map()
+providers.set("www.youtube.com", "youtube")
+providers.set("youtube.com", "youtube")
+providers.set("youtu.be", "youtube")
+providers.set("tv.nrk.no", "nrk")
+providers.set("seafile.purser.it", "seafile")
+
+const random = () => {
+    const arr = new Uint8Array(32)
+    window.crypto.getRandomValues(arr)
+    return [...arr].map(x => x.toString(16).padStart(2, "0")).join("")
+}

 document.addEventListener("DOMContentLoaded", () => {
-    let [proxyButton, kodiButton] = document.getElementsByTagName("button");
-    proxyButton.addEventListener("click", (ev) => {
-        chrome.tabs.query({currentWindow: true, active: true}, (tabs) => {
-            let oldurl = new URL(tabs[0].url);
-            let newurl = new URL("https://stream.purser.it");
-            let search = new URLSearchParams();
-            let hostname = oldurl.hostname.toLowerCase();
-            if(providers.has(hostname)) {
-                if(hostname.includes("youtube.com")) {
-                    let newpath = oldurl.searchParams.get("v");
-                    if((newpath instanceof String) || ((typeof newpath) === "string")) {
-                        newurl.pathname = "/" + newpath;
-                    }
-                } else {
-                    newurl.pathname = oldurl.pathname;
+    const proxyButton = document.getElementById("proxy-button")
+    const kodiPlayButton = document.getElementById("kodi-play-button")
+    const kodiQueueButton = document.getElementById("kodi-queue-button")
+
+    async function handleProxyButton(ev) {
+        const [tab] = chrome.tabs.query({currentWindow: true, active: true})
+        const oldurl = new URL(tab.url)
+        const search = new URLSearchParams()
+        const hostname = oldurl.hostname.toLowerCase()
+        let newurl = new URL("https://stream.purser.it")
+        
+        if(providers.has(hostname)) {
+            if(hostname.includes("youtube.com")) {
+                let newpath = oldurl.searchParams.get("v")
+                if(newpath) {
+                    newurl.pathname = "/" + newpath
                }
-                search.append("provider", providers.get(hostname));
+            } else {
+                newurl.pathname = oldurl.pathname
            }
-            newurl.search = search.toString();
-            let tab = {};
-            tab.url = newurl.href;
-            chrome.tabs.create(tab);
-        });
-    });
-    kodiButton.addEventListener("click", (ev) => {
-        chrome.tabs.query({currentWindow: true, active: true}, (tabs) => {
-            let oldurl = new URL(tabs[0].url);
-            let newurl = new URL(tabs[0].url);
-            let search = new URLSearchParams();
-            let hostname = oldurl.hostname.toLowerCase();
+            search.append("provider", providers.get(hostname))
+        } else {
+            return
+        }
+
+        newurl.search = search.toString()
+        const newtab = {}
+        newtab.url = newurl.href
+        chrome.tabs.create(newtab)
+    }
+
+    async function handleKodiButton(ev, method, playlistid) {
+        const [tab] = await chrome.tabs.query({currentWindow: true, active: true})
+        const oldurl = new URL(tab.url)
+        const search = new URLSearchParams()
+        const hostname = oldurl.hostname.toLowerCase()
+        let newurl = new URL("https://stream.purser.it")
+
+        if(providers.has(hostname)) {
            if(hostname.includes("youtube.com")) {
                newurl = new URL("plugin://plugin.video.youtube")
                search.append("action", "play_video")
-                let video_id = oldurl.searchParams.get("v");
+                const video_id = oldurl.searchParams.get("v")
                if(video_id) {
                    search.append("videoid", video_id)
                }
+            } else {
+                search.append("provider", providers.get(hostname))
+                search.append("raw", "true")
+                newurl.pathname = oldurl.pathname
            }
-            newurl.search = search.toString();
-
-            let req = {
-                jsonrpc: "2.0",
-                method: "Player.Open",
-                id:     12345,
-                params: {
-                    item: {
-                        file: newurl.href
+        } else if(hostname == "stream.purser.it") {
+            const provider = oldurl.searchParams.get("provider")
+            if(provider) {
+                if(provider == "youtube") {
+                    newurl = new URL("plugin://plugin.video.youtube")
+                    search.append("action", "play_video")
+                    const video_id = oldurl.pathname.replace("/", "")
+                    if(video_id) {
+                        search.append("videoid", video_id)
                    }
+                } else {
+                    newurl.pathname = oldurl.pathname
+                    search.append("provider", provider)
+                    search.append("raw", "true")
                }
            }
-            try {
-                fetch("http://127.0.0.1:8080/jsonrpc", {
-                    method: "POST",
-                    body: JSON.stringify(req),
-                    headers: {
-                        "Content-Type": "application/json; charset=utf-8"
-                    }
-                }).then(resp => console.log(resp))
-            } catch(e) {
-                console.log(e)
+        } else {
+            return
+        }
+
+        newurl.search = search.toString()
+
+        const req = {
+            jsonrpc: "2.0",
+            method: method,
+            id:     random(),
+            params: {
+                item: {
+                    file: newurl.href
+                }
            }
-            try {
-                fetch("http://127.0.0.1:8083/jsonrpc", {
-                    method: "POST",
-                    body: JSON.stringify(req),
-                    headers: {
-                        "Content-Type": "application/json; charset=utf-8"
-                    }
-                }).then(resp => console.log(resp))
-            } catch(e) {
-                console.log(e)
+        }
+
+        if(playlistid) {
+            req.params.playlistid = playlistid
+        }
+
+        const resp = await fetch("http://127.0.0.1:4000/jsonrpc", {
+            method: "POST",
+            body: JSON.stringify(req),
+            headers: {
+                "Content-Type": "application/json; charset=utf-8"
            }
-        });
-    });
-});
+        })
+        console.log(resp)
+    }
+
+    kodiPlayButton.addEventListener("click", async ev => {
+        await handleKodiButton(ev, "Player.Open")
+    })
+
+    kodiQueueButton.addEventListener("click", async ev => {
+        await handleKodiButton(ev, "Playlist.Add", 1)
+    })
+
+    proxyButton.addEventListener("click", handleProxyButton)
+})
--- a/pack-browsers.sh
+++ b/pack-browsers.sh
@ -4,6 +4,14 @@ temp_name=$(head -c 20 /dev/random | xxd -p | tr -dc a-f0-9)
 temp_dir="/tmp/${temp_name}"
 chrome_dir="${temp_dir}/chrome"

+if [[ ! -n "${DRONE_TAG}" ]]
+then
+    export DRONE_TAG=$(git describe --abbrev=0 | tr -dc v0-9)
+fi
+
+mkdir -p "${dir}/out"
+rm -rf "${dir}/out"
+
 mkdir -p "${temp_dir}/out"
 mkdir -p "${chrome_dir}"

@ -22,12 +30,15 @@ then
    dbus-daemon --session --address="${DBUS_SESSION_BUS_ADDRESS}" &
 fi

-if [[ "${DISPLAY}test" == "test" ]]
+if [[ ! -n "${DISPLAY}" ]]
 then
    export DISPLAY=:8819
    Xvfb "${DISPLAY}" &
 fi

+echo "DRONE_TAG=${DRONE_TAG}"
+echo "DISPLAY=${DISPLAY}"
+
 ${dir}/icons.sh

 browser=$(which chromium-browser 2> /dev/null)
@ -39,7 +50,14 @@ fi
 release_folder="${temp_dir}/out/proxy-stream-${DRONE_TAG}"
 cp -r "${dir}/chrome" "${release_folder}"

-${browser} --disable-gpu --no-sandbox --user-data-dir=${chrome_dir} --pack-extension="${temp_dir}/out/proxy-stream-${DRONE_TAG}" --pack-extension-key="${temp_dir}/privkey.pem"
+(cd "${release_folder}" && zip -r "${temp_dir}/out/proxy-stream-${DRONE_TAG}.xpi" .)
+
+if grep "/proc/1/cgroup" -q -F -e docker
+then
+    ${browser} --disable-gpu --no-sandbox --user-data-dir=${chrome_dir} --pack-extension="${temp_dir}/out/proxy-stream-${DRONE_TAG}" --pack-extension-key="${temp_dir}/privkey.pem"
+else
+    ${browser} --user-data-dir=${chrome_dir} --pack-extension="${temp_dir}/out/proxy-stream-${DRONE_TAG}" --pack-extension-key="${temp_dir}/privkey.pem"
+fi

 rm -rf "${release_folder}"
 mv "${temp_dir}/out" "${dir}/out"
Author	SHA1	Message	Date
Roy Olav Purser	0eedf53fc8	use extension packer	2022-10-16 22:34:25 +02:00
Roy Olav Purser	1e6316f2b3	add firefox extension All checks were successful continuous-integration/drone Build is passing Details	2022-10-16 21:17:23 +02:00
Roy Olav Purser	da2c738c52	set playlistid Some checks reported errors continuous-integration/drone Build was killed Details	2022-03-06 09:31:36 +01:00
Roy Olav Purser	a190acd1d8	set pathname for kodi	2022-03-06 09:28:44 +01:00
Roy Olav Purser	93547547f1	add kodi support for stream.purser.it	2022-03-06 09:26:03 +01:00
Roy Olav Purser	050cf89b45	add kodi queue	2022-03-06 08:54:23 +01:00
Roy Olav Purser	487e15e429	fix content type	2022-03-05 23:51:03 +01:00
Roy Olav Purser	cd5894429c	random id	2022-03-05 20:33:15 +01:00
Roy Olav Purser	108de113d1	add print	2022-03-05 20:07:41 +01:00
Roy Olav Purser	57decd2fe2	support other services	2022-03-05 20:04:04 +01:00
Roy Olav Purser	e8d4f1f329	fix local build	2022-03-05 19:41:02 +01:00
Roy Olav Purser	21c4c64cde	set tag	2022-03-05 19:33:56 +01:00