Release 1.6.1

.github/workflows/main.yml

@@ -22,7 +22,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "webstudio",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "private": true,
   "dependencies": {
     "@babel/core": "7.6.0",
@@ -107,19 +107,19 @@
     "typescript": "3.7.2",
     "url-loader": "2.1.0",
     "wavesurfer.js": "4.1.1",
-    "webpack": "4.41.0",
+    "webpack": "4.47.0",
     "webpack-dev-server": "3.2.1",
     "webpack-manifest-plugin": "2.1.1",
     "workbox-webpack-plugin": "^5.1.2",
     "worklet-loader": "^1.0.0"
   },
   "homepage": "./",
   "scripts": {
-    "start": "node scripts/start.js",
-    "start-baps": "node scripts/start.js baps",
-    "build": "node scripts/build.js",
-    "build-baps": "node scripts/build.js baps",
-    "test": "node scripts/test.js"
+    "start": "node --openssl-legacy-provider scripts/start.js",
+    "start-baps": "node --openssl-legacy-provider scripts/start.js baps",
+    "build": "node --openssl-legacy-provider scripts/build.js",
+    "build-baps": "node --openssl-legacy-provider scripts/build.js baps",
+    "test": "node --openssl-legacy-provider scripts/test.js"
   },
   "eslintConfig": {
     "extends": "react-app"

pyproject.toml

@@ -4,14 +4,15 @@ version = "1.6.0"
 description = ""
 authors = ["Marks Polakovs <marks.polakovs@ury.org.uk>", "Matthew Stratford <matthew.stratford@ury.org.uk>"]
 readme = "README.md"
+package-mode = false
 
 [tool.poetry.dependencies]
-python = "^3.7"
-aiohttp = "^3.8.4"
-av = "^10.0.0"
+python = "^3.9.2"
+aiohttp = "^3.11.18"
+av = "^14.0.0"
 jack-client = "^0.5.4"
-websockets = "^10.4"
-aiortc = "^1.4.0"
+websockets = "^15.0"
+aiortc = "^1.12.0"
 sentry-sdk = "^1.16.0"
 requests = "^2.28.2"
 flask = "^2.2.3"

shittyserver.py

@@ -10,12 +10,12 @@
 from typing import Optional, Any, Type, Dict, List
 
 import aiohttp
-import av  # type: ignore
+import av
 import jack as Jack
 from jack import OwnPort
 import websockets.exceptions, websockets.server, websockets.connection
-from aiortc import MediaStreamTrack, RTCPeerConnection, RTCSessionDescription  # type: ignore
-from aiortc.mediastreams import MediaStreamError  # type: ignore
+from aiortc import MediaStreamTrack, RTCPeerConnection, RTCSessionDescription
+from aiortc.mediastreams import MediaStreamError
 import sentry_sdk
 
 config = configparser.RawConfigParser()
@@ -131,7 +131,7 @@ class NotReadyException(BaseException):
 
 
 class Session(object):
-    websocket: Optional[websockets.server.WebSocketServerProtocol]
+    websocket: Optional[websockets.server.WebSocketServerProtocol]  # type: ignore
     connection_state: Optional[str]
     pc: Optional[Any]
     connection_id: str
@@ -194,7 +194,7 @@ async def end(self) -> None:
 
                 if (
                     self.websocket is not None
-                    and self.websocket.state == websockets.connection.State.OPEN
+                    and self.websocket.state == websockets.connection.State.OPEN  # type: ignore
                 ):
                     try:
                         await self.websocket.send(json.dumps({"kind": "DIED"}))
@@ -225,15 +225,15 @@ def create_peerconnection(self) -> None:
         self.pc = RTCPeerConnection()
         assert self.pc is not None
 
-        @self.pc.on("signalingstatechange")  # type: ignore
+        @self.pc.on("signalingstatechange")
         async def on_signalingstatechange() -> None:
             assert self.pc is not None
             print(
                 self.connection_id,
                 "Signaling state is {}".format(self.pc.signalingState),
             )
 
-        @self.pc.on("iceconnectionstatechange")  # type: ignore
+        @self.pc.on("iceconnectionstatechange")
         async def on_iceconnectionstatechange() -> None:
             if self.pc is None:
                 print(
@@ -249,7 +249,7 @@ async def on_iceconnectionstatechange() -> None:
                     print(self.connection_id, "Ending due to ICE connection failure")
                     await self.end()
 
-        @self.pc.on("track")  # type: ignore
+        @self.pc.on("track")
         async def on_track(track: MediaStreamTrack) -> None:
             global live_session, transfer_buffer1, transfer_buffer2
             print(self.connection_id, "Received track")
@@ -258,7 +258,7 @@ async def on_track(track: MediaStreamTrack) -> None:
 
                 await notify_mattserver_about_sessions()
 
-                @track.on("ended")  # type: ignore
+                @track.on("ended")
                 async def on_ended() -> None:
                     print(
                         self.connection_id,
@@ -325,7 +325,7 @@ async def process_ice(self, message: Any) -> None:
             )
 
     async def connect(
-        self, websocket: websockets.server.WebSocketServerProtocol
+        self, websocket: websockets.server.WebSocketServerProtocol  # type: ignore
     ) -> None:
         global active_sessions
 
@@ -369,7 +369,7 @@ async def connect(
 
 
 async def serve(
-    websocket: websockets.server.WebSocketServerProtocol, path: str
+    websocket: websockets.server.WebSocketServerProtocol, path: str  # type: ignore
 ) -> None:
     if path == "/stream":
         session = Session()
@@ -378,7 +378,7 @@ async def serve(
         pass
 
 
-start_server = websockets.server.serve(
+start_server = websockets.server.serve(  # type: ignore
     serve, host=None, port=int(config.get("shittyserver", "websocket_port"))
 )
 

src/App.css

@@ -212,3 +212,7 @@ button {
 .ReactModal__Overlay {
   z-index: 10000;
 }
+
+.cursor-pointer {
+  cursor: pointer;
+}

src/navbar/index.tsx

@@ -125,7 +125,14 @@ export function NavBarMyRadio() {
             <h6 className="dropdown-header">
               {sessionState.currentTimeslot?.title}
             </h6>
-            <h6 className="dropdown-header">
+            <h6
+              className="dropdown-header cursor-pointer"
+              onClick={() => {
+                navigator.clipboard.writeText(
+                  sessionState.currentTimeslot?.timeslot_id.toString() || ""
+                );
+              }}
+            >
               ID: {sessionState.currentTimeslot?.timeslot_id}
             </h6>
           </div>

src/navbar/loadshow.tsx

@@ -5,6 +5,7 @@ import {
   FaCircleNotch,
   FaCog,
   FaDownload,
+  FaKeyboard,
   FaSearch,
   FaTimesCircle,
   FaTrashAlt,
@@ -15,9 +16,16 @@ type searchingStateEnum = "searching" | "results" | "no-results" | "error";
 
 export function LoadShowDialogue({ close }: { close: () => any }) {
   const [items, setItems] = useState<Timeslot[]>([]);
+  const [customTimeslotID, _setCustomTimeslotID] = useState("");
+  const [isInvalidShowId, setIsInvalidShowId] = useState(false);
 
   const [state, setState] = useState<searchingStateEnum>("searching");
 
+  const setCustomTimeslotID = (value: string) => {
+    _setCustomTimeslotID(value);
+    setIsInvalidShowId(false);
+  };
+
   useEffect(() => {
     getTimeslots().then((timeslots) => {
       if (!timeslots) {
@@ -59,6 +67,34 @@ export function LoadShowDialogue({ close }: { close: () => any }) {
       >
         <FaCircleNotch size={15} /> Mark All Unplayed
       </div>
+      <div
+        className="btn btn-outline-dark outline float-right mr-4"
+        onClick={() => {
+          // check input is a number
+          if (isNaN(parseInt(customTimeslotID))) {
+            console.log("Invalid show ID provided; not loaded");
+            setIsInvalidShowId(true);
+          } else {
+            sendBAPSicleChannel({
+              command: "GETPLAN",
+              timeslotId: customTimeslotID,
+            });
+            close();
+          }
+        }}
+      >
+        <FaKeyboard size={15} /> Load Show ID
+      </div>
+      <input
+        className={
+          "form-control form-control-sm outline float-right mr-1 mt-1 w-25 p-1" +
+          (isInvalidShowId ? " is-invalid" : "")
+        }
+        type="text"
+        placeholder="Enter Show ID..."
+        value={customTimeslotID}
+        onChange={(e) => setCustomTimeslotID(e.target.value)}
+      />
 
       <h2>Load Show</h2>
       <ResultsPlaceholder state={state} />
@@ -74,6 +110,7 @@ export function LoadShowDialogue({ close }: { close: () => any }) {
                     command: "GETPLAN",
                     timeslotId: item.timeslot_id,
                   });
+                  close();
                 }}
               >
                 <FaDownload size={15} /> Load Show Plan

src/navbar/timelord.tsx

@@ -14,7 +14,6 @@ export function Timelord() {
     if (process.env.REACT_APP_BAPSICLE_INTERFACE)
       return { id: -1, name: "Unknown" };
     let studio = await myradioApiRequest("/selector/studioattime", "GET", null);
-
     const sourceNames = [
       "Studio Red",
       "Studio Blue",
@@ -23,7 +22,7 @@ export function Timelord() {
       "WebStudio",
       "Unknown",
       "Sine Wave",
-      "Off Air",
+      "Station is Off Air",
     ];
 
     let sourceName = "Unknown";
@@ -94,7 +93,7 @@ export function Timelord() {
         source.id > -1 && (
           <span className="source">
             <span className={"studio studio" + source.id}>{source.name}</span>
-            &nbsp;is On Air
+            {source.id !== 8 ? " is On Air" : ""}
           </span>
         )
       )}

src/session/index.tsx

@@ -69,8 +69,7 @@ const SessionHandler: React.FC = function() {
           error={userLoadError}
           percent={71}
         />
-        {currentTimeslot === null &&
-          timeslotLoadError == null &&
+        {timeslotLoadError !== null &&
           timeslotLoadError !== undefined &&
           !timeslotLoading &&
           redirectToTimeslotSelect()}

src/showplanner/Item.tsx

@@ -167,7 +167,12 @@ export const Item = memo(function Item({
       );
     }
     data.push(
-      "ID: " + ("trackid" in x ? x.trackid : "managedid" in x && x.managedid)
+      "ID: " +
+        ("trackid" in x && x.trackid
+          ? x.trackid
+          : "managedid" in x && x.managedid
+          ? x.managedid
+          : "None")
     );
     if (showDebug) {
       data.push(

src/showplanner/state.ts

@@ -668,9 +668,6 @@ export const getShowplan = (timeslotId: number): AppThunk => async (
     }
 
     if (ops.length > 0) {
-      console.log("Is corrupt, repairing locally");
-      dispatch(showplan.actions.applyOps(ops));
-
       console.log("Repairing showplan", ops);
       const updateResult = await api.updateShowplan(timeslotId, ops);
       if (!updateResult.every((x) => x.status)) {
@@ -679,6 +676,7 @@ export const getShowplan = (timeslotId: number): AppThunk => async (
         return;
       }
     }
+    // This is the fixed plan
     dispatch(showplan.actions.getShowplanSuccess(plan.flat(2)));
   } catch (e) {
     console.error(e);