interior crocodile alligator (kurisufriend#1)

* check for blocking

* fiddle with timeouts?

* move stuff around

* a

* typo

* timestamp serber logs

* &tear

* nab whipper conf

* pass along ws

* stupendous things

* or gathering wood at your campsite reduces the spread of invasive species

* select stdout to display webside

* send discinfo no matter the drive state

* rip with --cdr and -U (-unknown)

* extend timeouts. just cause.

* songtitle n reduce mainloop polling rate (gotta scrimp n save dem packets)

* eep~

* namecollide on 'nodes'. my bad!

* delineate blocks

* multilines somehow generating? test.

* advertising neals

* bleh

* fix title parsing

* s/song title/album title/g

* s not working...

* whitespace is the mind killer. whitespace is the little death that leads to total annihalation.

* reset rip status on tray open

* s/saya/\$hostname/ for key specified in mount

* final touches to the deploy stack + all working nodes

* definitely send diskinfo before ripping

Author: kurisufriend

client/client.py

@@ -117,21 +117,31 @@ def disk_id():
 def diskinfo():
     return {"type": "diskinfo", "data": {"open": get_drive_status(), "title": disk_id()}}
 
-async def rip():
-    cmd = ["whipper", "cd", "rip", "-O", "/mnt/chip/ripz/" + disk_id()]
+async def rip(ws):
+    cmd = ["whipper", "cd", "rip", "--cdr", "-U", "-O", "/mnt/chip/ripz/" + disk_id()]
     process = await asyncio.create_subprocess_exec(*cmd, stdout=asyncio.subprocess.PIPE)
 
+    await ws.send(json.dumps({"type": "songtitle", "data": {"songtitle": "not sure yet..."}}))
+    await ws.send(json.dumps(diskinfo()))
+    
     acc = ""
     while not process.stdout.at_eof():
         newc = await process.stdout.read(1)
-        time.sleep(.01)
+        await asyncio.sleep(.01)
         if not newc:
             break
         acc += newc.decode("latin-1")
         if "\r" in acc:
             print(acc)
-            acc = ""
+            acc = acc.strip()
+            if acc == "": continue # don't blank out rip status! whipper sends newlines sometimes.
+                                   # god only knows why.
+            if "Title" in acc:
+                tit = [i for i in acc.split("\n") if "Title" in i][0]
+                
+                await ws.send(json.dumps({"type": "songtitle", "data": {"songtitle": tit}}))
             await ws.send(json.dumps({"type": "liverip", "data": {"stdout": acc, "stderr": ""}}))
+            acc = ""
 
 
 
@@ -142,28 +152,22 @@ async def rip():
 # assert whipper cfg exists
 if not os.path.exists("/root/.config/whipper/whipper.conf"):
     os.makedirs("/root/.config/whipper", exist_ok=True)
-    urllib.request.urlretrieve("https://raw.githubusercontent.com/kurisufriend/chip/refs/heads/master/tools/whipper/whipper.conf")
-
+    urllib.request.urlretrieve("https://raw.githubusercontent.com/kurisufriend/chip/refs/heads/master/tools/whipper/whipper.conf", filename="/root/.config/whipper/whipper.conf")
 
-# event loop
-async def fuck():
-    # checkin
-    ws = await websockets.connect("ws://"+cfg["master-fqdn"]+":"+str(cfg["master-ws-port"]))
-    hostname = subprocess.check_output("hostname", shell=True).decode("latin-1").strip()
-    await ws.send(json.dumps({"type": "checkin/client", "data": {
-        "hostname": hostname,
-        "meta": "",
-        "diskinfo": diskinfo()
-    }}))
-    print("semt")
+# mind to the drive
+async def handle_drive(ws):
     while True:
-        time.sleep(1)
+        await ws.send(json.dumps(diskinfo()))
+        await asyncio.sleep(5)
         # tray closed w nothing in
         if get_drive_status() == "empty":
             drive_open()
+            await ws.send(json.dumps({"type": "songtitle", "data": {"songtitle": "no disk"}}))
+            continue
+        elif get_drive_status() == "open":
+            await ws.send(json.dumps({"type": "songtitle", "data": {"songtitle": "no disk"}}))
+            await ws.send(json.dumps({"type": "liverip", "data": {"stdout": "", "stderr": ""}}))
             continue
-        elif get_drive_status() == "open": continue
-        
         # => we full
         did = disk_id()
 
@@ -172,10 +176,22 @@ async def fuck():
             drive_open()
             continue
 
-        # => we got an unripped disk. 
+        # => we got an unripped disk.
+        await rip(ws)
 
-        await ws.send(json.dumps(diskinfo()))
-        #await rip()
+
+# event loop
+async def fuck():
+    # checkin
+    ws = await websockets.connect("ws://"+cfg["master-fqdn"]+":"+str(cfg["master-ws-port"]), ping_timeout=40, close_timeout=60)
+    hostname = subprocess.check_output("hostname", shell=True).decode("latin-1").strip()
+    await ws.send(json.dumps({"type": "checkin/client", "data": {
+        "hostname": hostname,
+        "meta": "",
+        "diskinfo": diskinfo()
+    }}))
+    print("semt")
+    await handle_drive(ws)
     await ws.close()
 
 asyncio.run(fuck())

fe/index.html

@@ -32,6 +32,19 @@ <h1>cdr (legally distinct from jtr)</h1>
 
 let ws = new WebSocket(backend)
 
+const nodes_pos = {
+    "sweeneytodd": "1",
+    "williamafton": "2",
+    "patrickbateman": "3",
+    "lightyagami": "6",
+    "victorzsasz": "10",
+    "hanniballecter": "11",
+    "jasonvoorhess": "13",
+    "michaelmeyers": "17",
+    "carcer": "4",
+    "saya": "8"
+}
+
 ws.addEventListener('open', (event) => {
     console.log('connected');
     ws.send(JSON.stringify(
@@ -48,10 +61,11 @@ <h1>cdr (legally distinct from jtr)</h1>
     if (j["type"] == "state")
     {
         const nodes = j.data.map((node) => ({
-            id: 0,
+            id: nodes_pos[node.hostname] || "?",
             hostname: node.hostname,
             tray_status: node.diskinfo.data.open,
             barcode: node.diskinfo.data.title,
+            song_title: node.songtitle,
             rip_status: node.ripstatus,
         }));
 
@@ -75,6 +89,7 @@ <h1>cdr (legally distinct from jtr)</h1>
 <th>hostname</th>\
 <th>tray status</th>\
 <th>barcode</th>\
+<th>album title</th>\
 <th>rip status</th>\
 </tr>';
 
@@ -93,6 +108,9 @@ <h1>cdr (legally distinct from jtr)</h1>
         let barcode = row.insertCell();
         barcode.textContent = node['barcode'];
 
+        let song_title = row.insertCell();
+        song_title.textContent = node['song_title'];
+
         let rip_status = row.insertCell();
         rip_status.textContent = node['rip_status'];
     });

nodes.json

@@ -2,5 +2,33 @@
     {
         "host": "saya",
         "ipv4": "192.168.10.103"
+    },
+    {
+        "host": "sweeneytodd",
+        "ipv4": "192.168.10.112"
+    },
+    {
+        "host": "williamafton",
+        "ipv4": "192.168.10.114"
+    },
+    {
+        "host": "patrickbateman",
+        "ipv4": "192.168.10.143"
+    },
+    {
+        "host": "lightyagami",
+        "ipv4": "192.168.10.100"
+    },
+    {
+        "host": "victorzsasz",
+        "ipv4": "192.168.10.122"
+    },
+    {
+        "host": "hanniballecter",
+        "ipv4": "192.168.10.108"
+    },
+    {
+        "host": "michaelmeyers",
+        "ipv4": "192.168.10.87"
     }
 ]

serb/serb.py

@@ -63,19 +63,26 @@ async def ws_handler(self, ws):
                 print("new FE")
                 continue
 
-            print("FROM " + self.clients[ws.remote_address]["hostname"] + json.dumps(j, indent=2))
+            print(time.ctime() + " // FROM " + self.clients[ws.remote_address]["hostname"] + json.dumps(j, indent=2))
 
     async def wsh_checkin_client(self, ws, message):
         self.clients[ws.remote_address] = {"hostname": message["data"]["hostname"]}
         self.clients[ws.remote_address]["diskinfo"] = message["data"]["diskinfo"]
         self.clients[ws.remote_address]["ws"] = ws
         self.clients[ws.remote_address]["ripstatus"] = "..."
+        self.clients[ws.remote_address]["songtitle"] = "..."
 
     async def wsh_checkin_fe(self, ws, message):
         self.fes[ws.remote_address] = {"yay": "louder", "ws": ws}
 
     async def wsh_diskinfo(self, ws, message):
         self.clients[ws.remote_address]["diskinfo"] = message
+        
+    async def wsh_songtitle(self, ws, message):
+        self.clients[ws.remote_address]["songtitle"] = message["data"]["songtitle"]
+        
+    async def wsh_liverip(self, ws, message):
+        self.clients[ws.remote_address]["ripstatus"] = message["data"]["stdout"]
 
     async def update_fes(self):
         while True:
@@ -87,6 +94,7 @@ async def update_fes(self):
                     "hostname": client["hostname"],
                     "diskinfo": client["diskinfo"],
                     "ripstatus": client["ripstatus"],
+                    "songtitle": client["songtitle"]
                 }
                 package["data"].append(res)
             for fek in self.fes.keys():

tools/bootstrap.py

@@ -3,11 +3,6 @@
 import os, sys, subprocess
 
 
-if not os.getenv("SSHPASS"):
-    print("SSHPASS environment variable must be set the the password of the `chip` service user on alexandria")
-    print("try something like\nexport SSHPASS=\"passwd goes here\" && python3 tools/bootstrap.py")
-    sys.exit(1)
-
 # run as root
 if subprocess.check_output(["whoami"]).decode("ascii").replace("\n", "") != "root":
     print("run as root")
@@ -39,12 +34,10 @@ def notsed(file, old, new):
 os.system("systemctl restart sshd")
 
 
-# install sshpass
-os.system("apt install -y sshpass")
-
 # generate new keys & copy to chip@alexandria
 os.system("ssh-keygen -f /root/.ssh/$(hostname)-whoreslayer-node -t ed25519")
-os.system("sshpass -e ssh-copy-id -i /root/.ssh/$(hostname)-whoreslayer-node [email protected]")
+os.system("ssh-copy-id -i /root/.ssh/$(hostname)-whoreslayer-node [email protected]")
+os.system("ssh-keyscan -t ed25519 alexandria.wuvt.vt.edu >> /root/.ssh/known_hosts")
 
 # clear bash_history to minimize cred leakage
 os.system("rm /root/.bash_history")

tools/deploy.py

@@ -1,4 +1,4 @@
-import os, json
+import os, json, sys
 
 manifest = []
 
@@ -14,15 +14,16 @@
     "curl",
     "beep"
 ]
+manifest.append("apt update")
 manifest.append("apt install -y " + " ".join(pkgs))
 
 
 # add sshfs mount to <strike>/etc/fstab</strike> crontab
 
 manifest.append("mkdir -p /mnt/chip")
 # idempotent as heck
-manifest.append("(echo \\\"@reboot sshfs /mnt/chip/ [email protected]:/tank/archive/rips/chip -o IdentityFile=/root/.ssh/saya-whoreslayer-node\\\") | crontab -")
-manifest.append("(crontab -l; echo \\\"*/1 * * * * [ -d /mnt/chip/tools ] || sshfs /mnt/chip/ [email protected]:/tank/archive/rips/chip -o IdentityFile=/root/.ssh/saya-whoreslayer-node\\\") | crontab -")
+manifest.append("(echo \\\"@reboot sshfs /mnt/chip/ [email protected]:/tank/archive/rips/chip -o IdentityFile=/root/.ssh/$$$HOSTNAME$$$-whoreslayer-node\\\") | crontab -")
+manifest.append("(crontab -l; echo \\\"*/1 * * * * [ -d /mnt/chip/tools ] || sshfs /mnt/chip/ [email protected]:/tank/archive/rips/chip -o IdentityFile=/root/.ssh/$$$HOSTNAME$$$-whoreslayer-node\\\") | crontab -")
 
 # install systemd service (re-installs every time: idempotent by default)
 link = "https://raw.githubusercontent.com/kurisufriend/chip/refs/heads/master/tools/service/chip-client.service"
@@ -36,6 +37,8 @@
 with open("nodes.json", "r") as f:
     nodes = json.loads(f.read())
     for n in nodes:
+        if "--specify" in sys.argv and not n["host"] in sys.argv:
+            continue
         for cmd in manifest:
             print(">> " + cmd)
-            os.system(f"ssh root@{n['ipv4']} \"{cmd}\"")
+            os.system(f"ssh root@{n['ipv4']} \"{cmd}\"".replace("$$$HOSTNAME$$$", n["host"]))