sync files.

devicestreams - initial proper bringup
devicestreams still needs to be made more stable.
pushimage - image preview bringup. should work as is.
imageserve - image preview bringup. should work as is, unless
theres a bug in Express.static.
package.json - added deps
ws/* - some events

Author: capthndsme

.gitignore

@@ -3,4 +3,5 @@ config.js
 media/
 dist/
 src/config.ts
-legacystuff/
+legacystuff/
+preview_images/

package-lock.json

@@ -17,13 +17,15 @@
     "express": "^4.18.2",
     "http": "^0.0.1-security",
     "js-event-bus": "^1.1.1",
+    "multer": "^1.4.5-lts.1",
     "mysql2": "^2.3.3",
     "node-media-server": "^2.4.9",
     "socket.io": "^4.5.4"
   },
   "devDependencies": {
     "@types/bcrypt": "^5.0.0",
     "@types/express": "^4.17.17",
+    "@types/multer": "^1.4.7",
     "@types/node": "^18.15.11",
     "@types/node-media-server": "^2.3.4",
     "@typescript-eslint/eslint-plugin": "^5.59.0",

package.json

@@ -1,29 +1,69 @@
+import { findDeviceSocket } from "../ws/DeviceSocketList";
+
 export type DeviceStream = {
-   deviceHwid: string;
-   streamId: string;
-}
+	deviceHwid: string;
+	streamId: string;
+};
 
 let _deviceStreams: DeviceStream[] = [];
-
+let _deviceLocks: boolean[] = [];
 export function findDeviceStream(deviceHwid: string): DeviceStream | undefined {
-   return _deviceStreams.find((ds) => ds.deviceHwid === deviceHwid);
+	return _deviceStreams.find((ds) => ds.deviceHwid === deviceHwid);
+}
+
+// This returns undefined when, either the device is offline or the device is online but the device did not send a stream request.
+export function findOrRequestDeviceStream(deviceHwid: string): DeviceStream | undefined {
+   console.log("findOrRequestDeviceStream")
+  
+   if (_deviceLocks[deviceHwid] === true) {
+      console.log("Device is locked, returning undefined");
+      return undefined;
+   } // This is to prevent multiple requests from being sent to the device.
+   _deviceLocks[deviceHwid] = true;
+	let deviceStream = findDeviceStream(deviceHwid);
+	if (deviceStream === undefined) {
+		// Request stream from device.
+		const generatedStreamKey = Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
+
+		findDeviceSocket(deviceHwid)
+			?.socket.timeout(20000)
+			.emit(
+				"CameraStreamRequest",
+				{
+					streamKey: generatedStreamKey,
+				},
+				(error, data: any) => {
+               if (error) {
+                  _deviceLocks[deviceHwid] = false;
+               }
+					if (data && data.success) {
+                  _deviceLocks[deviceHwid] = false;
+						addToDeviceStreamList(deviceHwid, generatedStreamKey);
+						deviceStream = findDeviceStream(deviceHwid);
+					}
+				}
+			);
+	} else {
+      _deviceLocks[deviceHwid] = false;
+		return deviceStream;
+	}
 }
 
 export function addToDeviceStreamList(deviceHwid: string, streamId: string): void {
-   if (findDeviceStream(deviceHwid) === undefined) {
-      _deviceStreams.push({ deviceHwid, streamId });
-   } else {
-      console.log("Device already has stream, lets override the device stream id.");
-      _deviceStreams = _deviceStreams.map((ds) => {
-         if (ds.deviceHwid === deviceHwid) {
-            ds.streamId = streamId;
-         }
-         return ds;
-      });
-   }
+	if (findDeviceStream(deviceHwid) === undefined) {
+		_deviceStreams.push({ deviceHwid, streamId });
+	} else {
+		console.log("Device already has stream, lets override the device stream id.");
+		_deviceStreams = _deviceStreams.map((ds) => {
+			if (ds.deviceHwid === deviceHwid) {
+				ds.streamId = streamId;
+			}
+			return ds;
+		});
+	}
 }
 
 export function removeFromDeviceStreamList(deviceHwid: string): void {
-   _deviceStreams = _deviceStreams.filter((ds) => ds.deviceHwid !== deviceHwid);
+	_deviceStreams = _deviceStreams.filter((ds) => ds.deviceHwid !== deviceHwid);
+	_deviceLocks[deviceHwid] = false;
 }
-

src/rtmp/DeviceStreams.ts

@@ -61,8 +61,8 @@ export function startStreamingServer() {
 		CheckDeviceSessionValidity(deviceID, deviceKey)
 			.then((DeviceCheckStatus) => {
 				if (DeviceCheckStatus.success) {
-					console.log(`[StreamServer Ingest Authenticator] Device ${deviceID} succeeded authentication.`);
-					addToDeviceStreamList(deviceID, id);
+					console.log(`[StreamServer Ingest Authenticator] Device ${deviceID} succeeded authentication with key ${deviceKey}.`);
+					 
 				} else {
 					const session = nms.getSession(id);
 					console.warn(
@@ -74,7 +74,7 @@ export function startStreamingServer() {
 			})
 			.catch((e) => {
 				console.warn(`[StreamServer Ingest Authenticator] Database failure, rejecting stream for hwid ${deviceID}...`);
-			});
+			}); 
 	});
    // prePlay event is not really working for transcoded streams, so we're not using it until the 
    // authors of NodeMediaServer fix it. Or maybe I am doing something wrong.

src/rtmp/StreamServer.ts

@@ -23,4 +23,6 @@ function loadRoutes(): void {
          console.log("[PTServer Web] Loaded route " + file)
       });
    });
-} 
+} 
+
+export {express}

src/web/ExpressInstance.ts

@@ -0,0 +1,8 @@
+import { app, express } from "../ExpressInstance";
+
+ 
+
+
+app.use("/preview_images/", express.static("/root/ProjectTiaraBackendServer/preview_images/", {
+   index: false
+}));