From 3e50e2bfb499e0e14f2ae1a2d39fdacf5986e503 Mon Sep 17 00:00:00 2001 From: David Westgate Date: Thu, 17 Apr 2025 05:56:48 +0100 Subject: [PATCH 1/7] video stream work --- .gitea/workflows/deploy.yml | 43 ++++++++ .gitignore | 3 + package.json | 23 ++++ src/http.ts | 84 +++++++++++++++ src/server.ts | 54 ++++++++++ src/static/css/styes.scss | 60 +++++++++++ src/static/index.html | 29 +++++ src/static/js/video.ts | 46 ++++++++ src/ws.ts | 208 ++++++++++++++++++++++++++++++++++++ tsconfig.json | 116 ++++++++++++++++++++ 10 files changed, 666 insertions(+) create mode 100644 .gitea/workflows/deploy.yml create mode 100644 .gitignore create mode 100644 package.json create mode 100644 src/http.ts create mode 100644 src/server.ts create mode 100644 src/static/css/styes.scss create mode 100644 src/static/index.html create mode 100644 src/static/js/video.ts create mode 100644 src/ws.ts create mode 100644 tsconfig.json diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml new file mode 100644 index 0000000..9c1207c --- /dev/null +++ b/.gitea/workflows/deploy.yml @@ -0,0 +1,43 @@ +name: Plant Growing Automation + +on: + push: + branches: + - main + +jobs: + deploy: + runs-on: pigrow + + steps: + - name: Checkout code + run: | + cd ~/apps/grow + git fetch + git checkout main + git pull origin main + - name: Install dependencies + run: | + cd ~/apps/grow + if [ -f package-lock.json ] || [ -f package.json ]; then + echo "Installing npm dependencies..." + npm install + else + echo "No Node.js project found (missing package.json)" + exit 1 + fi + + + - name: Stop existing screen session, if running + run: | + if screen -list | grep -q "grow_server"; then + echo "Stopping existing screen session..." + screen -S grow_server -X quit + fi + + - name: Start server in screen session + run: | + cd ~/apps/grow + + setsid screen -dmS grow_server bash -c 'HTTP_PORT=8080 WS_PORT=3003 npm start >server.log 2>&1' + echo "Server started in detached screen session" diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c3076ac --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +venv/* +node_modules/* +dist/* \ No newline at end of file diff --git a/package.json b/package.json new file mode 100644 index 0000000..f6c819c --- /dev/null +++ b/package.json @@ -0,0 +1,23 @@ +{ + "dependencies": { + "@roamhq/wrtc": "0.8.0", + "node-pre-gyp": "^0.17.0", + "ws": "^8.18.0", + "sass": "1.86.3" + }, + "scripts": { + "build:scss": "npx sass src/static/css:dist/static/css", + "copy:html": "cp src/static/index.html dist/static", + "build:js:fe": "npx tsc src/static/js/*.ts --outDir dist/static/js", + "build:js:be": "npx tsc --skipLibCheck src/*.ts --outDir dist", + "build": "npm run build:js:fe && npm run build:js:be && npm run build:scss && npm run copy:html", + "start": "npm run build && node dist/server.js", + "dev": "npm run build && npx ts-node src/server.ts" + }, + "devDependencies": { + "@types/node": "^22.10.2", + "@types/ws": "^8.5.13", + "ts-node": "^10.9.2", + "typescript": "^5.8.2" + } +} diff --git a/src/http.ts b/src/http.ts new file mode 100644 index 0000000..ce699fd --- /dev/null +++ b/src/http.ts @@ -0,0 +1,84 @@ +import * as http from "http"; +import * as fs from "fs"; +import * as path from "path"; + + +export default class HttpServer { + + private httpServer: http.Server; + private port: number; + private root: string; + // public constructor(port: number, root: string, tune: (ch: string, adp?: number) => void, getChannels: ()=>string[], getSignal: (adapter:number)=>object) { + + public constructor(port: number, root: string) { + this.port = port; + this.root = root; + this.httpServer = http.createServer((req, res) => { + let status: number = 404; + let body: any = ""; + const url = new URL(req.url, `http://${req.headers.host}`); + const pathname = path.normalize(url.pathname); + + if (pathname.startsWith('/api/')) { + const query = pathname.split('/'); + const api = query[2]; + switch (req.method) { + case "GET": + switch (api) { + case "list": + // body = JSON.stringify(getChannels()); + status = 200; + break; + case "signal": + const adapter = parseInt(url.searchParams.get('adapter')); + // body = JSON.stringify(getSignal(adapter)); + status = 200; + break; + + } + break; + case "PUT": + switch (api) { + case "tune": + const channel = decodeURIComponent(query[3]); + const adapter = parseInt(url.searchParams.get('adapter')); + // tune(channel, adapter); + status = 202; + break; + + } + + } + } + else if (req.method === 'GET') { + const filePath = path.join(root, path.extname(pathname) === '' ? pathname + "/index.html" : pathname); + try { + body = fs.readFileSync(filePath); + status = 200; + } + catch (err) { + body = "Invalid File" + } + } + else { + body = "Invalid Request" + } + res.writeHead(status); + res.end(body); + + }); + } + public start() { + this.httpServer.listen(this.port, () => { + console.log(`Serving ${this.root} at http://localhost:${this.port}`); + }); + } + + + + + + + +} + diff --git a/src/server.ts b/src/server.ts new file mode 100644 index 0000000..18705c7 --- /dev/null +++ b/src/server.ts @@ -0,0 +1,54 @@ +import HttpServer from './http'; +import VideoSocket from './ws'; + +const HTTP_PORT = process.env.HTTP_PORT ? parseInt(process.env.HTTP_PORT, 10) : 8080; +const WS_PORT = process.env.WS_PORT ? parseInt(process.env.WS_PORT, 10) : 3003; +const STATIC_ROOT = process.cwd() + "/dist/static"; +const TV_DEV_0 = process.env.TV_DEV_0 ?? '/dev/video0' + +// const zap = new Zap(); + + +// const tune = (reqChannel: string, reqAdapter?: number) => { +// const adapter = reqAdapter === 0 || reqAdapter === 1 ? reqAdapter : 0; +// zap.zapTo(reqChannel, adapter).then((zap: IZap) => { +// console.log(`Tuned ${zap.adapter} to ${zap.channel}`) +// }).catch((err: Error) => { +// console.error(err.message); +// }); +// } + +// const getChannels = () => +// zap.getChannels(); + +// const getSignal = (adapter: number) => +// zap.getSignal(adapter) + +const httpServer = new HttpServer(HTTP_PORT, STATIC_ROOT); +const videoSocket = new VideoSocket(WS_PORT, TV_DEV_0); + +httpServer.start(); + + +process.stdin.setEncoding("utf8"); +process.stdin.resume(); + +console.log("Menu:"); + +process.stdin.on("data", async (data: string) => { + const input = data.trim(); + console.log(`Received: "${input}"`); + // await zap.zapTo(input).then((zap: IZap) => { + // console.log(`Tuned ${zap.adapter} to ${zap.channel}`) + + // }).catch((err: Error) => { + // console.error(err.message); + // }); + +}); + + + + + + diff --git a/src/static/css/styes.scss b/src/static/css/styes.scss new file mode 100644 index 0000000..700d609 --- /dev/null +++ b/src/static/css/styes.scss @@ -0,0 +1,60 @@ +$background-color: #c7c7c7; +$primary-color: #333; +$secondary-color: #d11414; +$text-color: #123455; + +body { + font-family: sans-serif; + background-color: $background-color; + header { + nav { + ul { + display: flex; + list-style: none; + gap: 1em; + li { + + } + } + a { + &:hover {} + } + } + } + + main { + display: flex; + flex-direction: column; + text-align: center; + align-items: center; + justify-content: center; + h1 {} + + p {} + img { + width: 20em; + border-radius: 50%; + } + .content{ + display: flex; + flex-direction: row; + gap: 1em; + .player{ + + .channel-group{ + display: flex; + align-self: center; + justify-self: center; + } + } + } + + } + + + footer { + text-align: center; + // background: #eee; + padding: 1em; + } +} \ No newline at end of file diff --git a/src/static/index.html b/src/static/index.html new file mode 100644 index 0000000..215da3a --- /dev/null +++ b/src/static/index.html @@ -0,0 +1,29 @@ + + + + + WebRTC Stream + + + + + + +
+
+

Video streams

+

WebRTC

+
+
+ +
+
+ + +
+ + + + + + \ No newline at end of file diff --git a/src/static/js/video.ts b/src/static/js/video.ts new file mode 100644 index 0000000..675d93e --- /dev/null +++ b/src/static/js/video.ts @@ -0,0 +1,46 @@ +const isSecure = window.location.protocol === 'https:'; +const host = window.location.hostname; +const ws0builder = isSecure ? `wss://${host}/ws3` : `ws://${host}:3003`; +const ws0 = new WebSocket(ws0builder); +const config = { + iceServers: [ + { + urls: ['stun:dwestgate.us:3478','turn:dwestgate.us:3478?transport=udp'], + username: 'webrtcuser', + credential: 'webrtccred' + } + ] +}; +const pc0 = new RTCPeerConnection(config); +const video0 = document.getElementById('video0') as HTMLVideoElement; + + +pc0.ontrack = (event) => { + console.log("Received track event", event.streams); + video0.srcObject = event.streams[0]; +}; + +pc0.onicecandidate = ({ candidate }) => { + if (candidate) { + ws0.send(JSON.stringify({ type: 'ice-candidate', data: candidate })); + } +}; + +ws0.onopen = async () => { + pc0.addTransceiver('video', { direction: 'recvonly' }); + pc0.addTransceiver('audio', { direction: 'recvonly' }) + const offer = await pc0.createOffer(); + await pc0.setLocalDescription(offer); + ws0.send(JSON.stringify({ type: 'offer', data: offer })); +} + +ws0.onmessage = async (message) => { + const msg = JSON.parse(message.data); + if (msg.type === 'answer') { + await pc0.setRemoteDescription(msg.data); + } + else if (msg.type === 'ice-candidate') { + await pc0.addIceCandidate(msg.data); + } +}; + diff --git a/src/ws.ts b/src/ws.ts new file mode 100644 index 0000000..ec31802 --- /dev/null +++ b/src/ws.ts @@ -0,0 +1,208 @@ +import { MediaStream, MediaStreamTrack, nonstandard, RTCPeerConnection } from '@roamhq/wrtc'; +import { ChildProcessWithoutNullStreams, spawn } from 'child_process'; +import * as ws from 'ws'; + +// Constants +const WIDTH = 640; // Video width +const HEIGHT = 480; // Video height +const FRAME_SIZE = WIDTH * HEIGHT * 1.5; // YUV420P frame size + +export default class VideoSocket { + videoDevice: string; + public constructor(port: number, videoDevice) { + this.videoDevice = videoDevice + const ffmpegProcess = this.startFFmpeg(); + const videoTrack = this.createVideoTrack(ffmpegProcess); + const audioTrack = this.createAudioTrack(ffmpegProcess); + + + // ffmpegProcess.stdio[2].on('data', data => { + // console.log("stdio[2] ",data.toString()) + // }) + + // WebSocket signaling server + const wss = new ws.WebSocketServer({ port }); + + wss.on('connection', async (ws: ws.WebSocket) => { + const peerConnection: RTCPeerConnection = this.createPeerConnection(videoTrack, audioTrack); + + ws.on('message', async (message: Buffer) => { + const { type, data } = JSON.parse(message.toString()); + + if (type == 'offer') { + await peerConnection.setRemoteDescription(data); + const answer = await peerConnection.createAnswer(); + await peerConnection.setLocalDescription(answer); + ws.send(JSON.stringify({ type: 'answer', data: peerConnection.localDescription })); + } + + if (type === 'ice-candidate') { + await peerConnection.addIceCandidate(data); + } + + }); + + peerConnection.oniceconnectionstatechange = () => { + if (peerConnection.iceConnectionState === 'failed') { + console.error('ICE connection failed'); + } + }; + + + // Send ICE candidates to the client + peerConnection.onicecandidate = ({ candidate }) => { + if (candidate) { + ws.send(JSON.stringify({ type: 'ice-candidate', data: candidate })); + } + }; + + ws.on('close', () => { + console.log('Client disconnected'); + peerConnection.close(); + }); + }); + } + + // Function to start FFmpeg and capture raw video + startFFmpeg = (): ChildProcessWithoutNullStreams => { + const p = spawn('ffmpeg', [ + '-loglevel', 'debug', + '-i', this.videoDevice, + + // Video + '-map', '0:v:0', + '-vf', `scale=${WIDTH}:${HEIGHT}`, + '-vcodec', 'rawvideo', + '-pix_fmt', 'yuv420p', + '-f', 'rawvideo', + + //quality + '-fflags', '+discardcorrupt', + '-err_detect', 'ignore_err', + '-analyzeduration', '100M', + '-probesize', '100M', + + 'pipe:3', + + // Audio + // '-map', '0:a:0', + // // '-acodec', 'pcm_s16le', + // '-ac', '1', + // '-ar', '48000', + // '-f', 'alsa', + // 'pipe:4' + + ], { + stdio: ['ignore', 'pipe', 'pipe', 'pipe'/*, 'pipe'*/] + }); + process.on('SIGINT', () => { + console.log('🔻 Server shutting down...'); + p.kill('SIGINT'); + process.exit(0); + }); + + process.on('SIGTERM', () => { + console.log('🔻 SIGTERM received'); + p.kill('SIGTERM'); + process.exit(0); + }); + process.on('exit', () => { + p.kill('SIGHUP'); //this one + p.kill('SIGTERM'); + }); + return p; + } + + + createVideoTrack = (ffmpegProcess: ChildProcessWithoutNullStreams) => { + let videoBuffer = Buffer.alloc(0); + const videoSource = new nonstandard.RTCVideoSource(); + const videoStream = ffmpegProcess.stdio[3]; // pipe:3 + // Start FFmpeg and pipe video frames to the source + videoStream.on('data', (chunk: Buffer) => { + videoBuffer = Buffer.concat([videoBuffer, chunk]); + if (videoBuffer.length > FRAME_SIZE * 2) { + console.warn('Video buffer overrun — possible freeze trigger'); + } + while (videoBuffer.length >= FRAME_SIZE) { + const frameData = videoBuffer.slice(0, FRAME_SIZE); + videoBuffer = videoBuffer.slice(FRAME_SIZE); + const frame: nonstandard.RTCVideoFrame = { + width: WIDTH, + height: HEIGHT, + data: new Uint8Array(frameData), + } + videoSource.onFrame(frame); + } + }); + + videoStream.on('exit', (code) => { + console.log(`FFmpeg exited with code ${code}`); + }); + return videoSource.createTrack(); + + } + + createAudioTrack = (ffmpegProcess: ChildProcessWithoutNullStreams) => { + let audioBuffer = Buffer.alloc(0); + const audioSource = new nonstandard.RTCAudioSource(); + const audioStream = ffmpegProcess.stdio[4]; // pipe:4 + // --- AUDIO handling --- + const AUDIO_FRAME_SIZE = 480 * 2; // 480 samples * 2 bytes (s16le) + + /* + audioStream.on('data', (chunk: Buffer) => { + audioBuffer = Buffer.concat([audioBuffer, chunk]); + while (audioBuffer.length >= AUDIO_FRAME_SIZE) { + const frameData = audioBuffer.slice(0, AUDIO_FRAME_SIZE); + audioBuffer = audioBuffer.slice(AUDIO_FRAME_SIZE); + const samples = new Int16Array(480); + for (let i = 0; i < 480; i++) { + samples[i] = frameData.readInt16LE(i * 2); + } + audioSource.onData({ + samples, + sampleRate: 48000, + bitsPerSample: 16, + channelCount: 1, + numberOfFrames: 480 + }); + } + }); + + audioStream.on('data', (data: Buffer) => { + // console.error('FFmpeg Error:', data.toString()); + }); + + audioStream.on('exit', (code) => { + console.log(`FFmpeg exited with code ${code}`); + }); + */ + return audioSource.createTrack(); + } + + createPeerConnection = (videoTrack: MediaStreamTrack, audioTrack: MediaStreamTrack): RTCPeerConnection => { + const peerConnection = new RTCPeerConnection({ + iceServers: [ + { + urls: 'stun:192.168.0.3:3478' + }, + { + urls: 'turn:192.168.0.3:3478?transport=udp', + username: 'webrtcuser', + credential: 'webrtccred' + } + ] + }); + const stream = new MediaStream() + stream.addTrack(videoTrack) + stream.addTrack(audioTrack); + peerConnection.addTrack(videoTrack, stream); + peerConnection.addTrack(audioTrack, stream); + return peerConnection; + } + +} + + + diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..633cb3e --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,116 @@ +{ + "compilerOptions": { + /* Visit https://aka.ms/tsconfig to read more about this file */ + /* Projects */ + // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ + // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ + // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ + // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ + // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ + // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ + /* Language and Environment */ + "target": "ES2020", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ + "lib": [ + "esnext", + "ES2020", + "DOM" + ], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + // "jsx": "preserve", /* Specify what JSX code is generated. */ + // "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */ + // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ + // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ + // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ + // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ + // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ + "noLib": false, /* Disable including any library files, including the default lib.d.ts. */ + // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ + // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ + /* Modules */ + "module": "commonjs", /* Specify what module code is generated. */ + "rootDir": "src", /* Specify the root folder within your source files. */ + "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ + // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ + // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ + // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ + // "types": ["node", "webrtc"], + // "typeRoots": ["./node_modules/@types"], + // "typeRoots": ["./node_modules/@types/webrtc"], /* Specify multiple folders that act like './node_modules/@types'. */ + // "types": [], /* Specify type package names to be included without being referenced in a source file. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ + // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ + // "rewriteRelativeImportExtensions": true, /* Rewrite '.ts', '.tsx', '.mts', and '.cts' file extensions in relative import paths to their JavaScript equivalent in output files. */ + // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ + // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ + // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ + // "noUncheckedSideEffectImports": true, /* Check side effect imports. */ + // "resolveJsonModule": true, /* Enable importing .json files. */ + // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ + // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ + /* JavaScript Support */ + // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ + // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ + // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ + /* Emit */ + // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ + // "declarationMap": true, /* Create sourcemaps for d.ts files. */ + // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ + "sourceMap": true, /* Create source map files for emitted JavaScript files. */ + // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ + // "noEmit": true, /* Disable emitting files from a compilation. */ + // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ + "outDir": "dist", /* Specify an output folder for all emitted files. */ + // "removeComments": true, /* Disable emitting comments. */ + // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ + // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ + // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ + // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ + // "newLine": "crlf", /* Set the newline character for emitting files. */ + // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ + // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ + "noEmitOnError": false, /* Disable emitting files if any type checking errors are reported. */ + // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ + // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ + /* Interop Constraints */ + // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ + // "isolatedDeclarations": true, /* Require sufficient annotation on exports so other tools can trivially generate declaration files. */ + "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ + "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */ + // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ + "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ + /* Type Checking */ + "strict": false, /* Enable all strict type-checking options. */ + // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ + // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ + // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ + // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ + // "strictBuiltinIteratorReturn": true, /* Built-in iterators are instantiated with a 'TReturn' type of 'undefined' instead of 'any'. */ + // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ + // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ + // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ + // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ + // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ + // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ + // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ + // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ + // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ + // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ + // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ + // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ + // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ + /* Completeness */ + "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ + "skipLibCheck": true /* Skip type checking all .d.ts files. */ + }, + "include": ["src"], + "exclude": [ + "node_modules","./node_modules/@roamhq/wrtc" + ] + // "include": [ + // "./src", "./types" + // ] +} \ No newline at end of file -- 2.39.5 From e6b72c597a16b7ebbd5a6d7793495c0c0748c7a6 Mon Sep 17 00:00:00 2001 From: David Westgate Date: Thu, 17 Apr 2025 18:11:17 +0100 Subject: [PATCH 2/7] add api --- src/http.ts | 9 ++++---- src/io.ts | 50 +++++++++++++++++++++++++++++++++++++++++++ src/serial.ts | 34 +++++++++++++++++++++++++++++ src/server.ts | 33 ++++++++++++++++++++++------ src/static/index.html | 4 +++- src/static/js/api.ts | 9 ++++++++ 6 files changed, 127 insertions(+), 12 deletions(-) create mode 100644 src/io.ts create mode 100644 src/serial.ts create mode 100644 src/static/js/api.ts diff --git a/src/http.ts b/src/http.ts index ce699fd..4239e35 100644 --- a/src/http.ts +++ b/src/http.ts @@ -1,6 +1,7 @@ import * as http from "http"; import * as fs from "fs"; import * as path from "path"; +import { ISensors } from "./io"; export default class HttpServer { @@ -10,7 +11,7 @@ export default class HttpServer { private root: string; // public constructor(port: number, root: string, tune: (ch: string, adp?: number) => void, getChannels: ()=>string[], getSignal: (adapter:number)=>object) { - public constructor(port: number, root: string) { + public constructor(port: number, root: string, getSensors: ()=>ISensors, setPower: (power: boolean) => void) { this.port = port; this.root = root; this.httpServer = http.createServer((req, res) => { @@ -25,8 +26,8 @@ export default class HttpServer { switch (req.method) { case "GET": switch (api) { - case "list": - // body = JSON.stringify(getChannels()); + case "sensors": + body = JSON.stringify(getSensors()); status = 200; break; case "signal": @@ -39,7 +40,7 @@ export default class HttpServer { break; case "PUT": switch (api) { - case "tune": + case "power": const channel = decodeURIComponent(query[3]); const adapter = parseInt(url.searchParams.get('adapter')); // tune(channel, adapter); diff --git a/src/io.ts b/src/io.ts new file mode 100644 index 0000000..e605905 --- /dev/null +++ b/src/io.ts @@ -0,0 +1,50 @@ +import Serial from "./serial"; +import * as onoff from 'onoff' + +const ON = onoff.Gpio.HIGH; +const OFF = onoff.Gpio.LOW; + +export interface ISensors { + temperature: number; + power: boolean; + moisture: number; + humidity: number +} + +export default class IO { + private temp: number + private serial: Serial; + // private power: boolean; + private gpio: onoff.Gpio + + public constructor(POWER_GPIO = 17) { + this.serial = new Serial(); + this.gpio = new onoff.Gpio(POWER_GPIO, 'out'); + } + + public getPower() { + return this.gpio.readSync() + } + + public setPower(power: boolean) { + this.gpio.writeSync(power ? ON : OFF); + } + + public togglePower() { + const cur: onoff.BinaryValue = this.getPower() ; + this.gpio.writeSync(cur ? OFF : ON); + } + + public getSensors (): ISensors { + return { + power: this.getPower() ? true : false, + moisture: 0, + temperature: 0, + humidity: 0 + } + } + + public getMoisture() { + return this.serial.getMoisture() + } +} \ No newline at end of file diff --git a/src/serial.ts b/src/serial.ts new file mode 100644 index 0000000..e550bb4 --- /dev/null +++ b/src/serial.ts @@ -0,0 +1,34 @@ +import * as serialport from 'serialport'; + +// interface ISerial { +// moisture: number; +// parser: serialport.ReadlineParser +// } + +export default class Serial { + private moisture: number; + + public constructor(path = '/dev/ttyUSB0', baudRate = 9600, delimiter = '\n') { + const port = new serialport.SerialPort({ path, baudRate }); + const readline = new serialport.ReadlineParser({ delimiter }); + const parser = port.pipe(readline); + parser.on('data', line => { + const moisture = parseInt(line.trim(), 10); + if (!isNaN(moisture)) { + this.moisture = moisture + } + }); + port.on('error', err => { + console.error('Serial Error:', err.message); + }); + } + public getMoisture() { + return this.moisture; + } + + + + + + +} \ No newline at end of file diff --git a/src/server.ts b/src/server.ts index 18705c7..4ef217a 100644 --- a/src/server.ts +++ b/src/server.ts @@ -1,4 +1,5 @@ import HttpServer from './http'; +import IO from './io'; import VideoSocket from './ws'; const HTTP_PORT = process.env.HTTP_PORT ? parseInt(process.env.HTTP_PORT, 10) : 8080; @@ -24,26 +25,44 @@ const TV_DEV_0 = process.env.TV_DEV_0 ?? '/dev/video0' // const getSignal = (adapter: number) => // zap.getSignal(adapter) -const httpServer = new HttpServer(HTTP_PORT, STATIC_ROOT); +const io = new IO(); + +const httpServer = new HttpServer(HTTP_PORT, STATIC_ROOT, io.getSensors, io.setPower); const videoSocket = new VideoSocket(WS_PORT, TV_DEV_0); + + + httpServer.start(); process.stdin.setEncoding("utf8"); process.stdin.resume(); -console.log("Menu:"); +console.log("Menu:\n1) Power off\n2)Power on\n3) Power flop\n4)Read moisture"); process.stdin.on("data", async (data: string) => { const input = data.trim(); console.log(`Received: "${input}"`); - // await zap.zapTo(input).then((zap: IZap) => { - // console.log(`Tuned ${zap.adapter} to ${zap.channel}`) + const val = parseInt(input); + switch(val) { + case 0: - // }).catch((err: Error) => { - // console.error(err.message); - // }); + break; + case 1: + io.setPower(false); + break; + case 2: + io.setPower(true); + break; + case 3: + io.setPower(io.getPower()? true:false) + break; + case 4: + console.log(io.getMoisture()); + default: + console.log("No option for "+input) + } }); diff --git a/src/static/index.html b/src/static/index.html index 215da3a..7ceffb1 100644 --- a/src/static/index.html +++ b/src/static/index.html @@ -18,12 +18,14 @@
- +

+ + \ No newline at end of file diff --git a/src/static/js/api.ts b/src/static/js/api.ts new file mode 100644 index 0000000..ac8ebc9 --- /dev/null +++ b/src/static/js/api.ts @@ -0,0 +1,9 @@ +const getSensors = () =>{ + +} + +const poll = () =>{ + fetch("/api/sensors").then(r=>r.json()).then(data =>{ + console.log("data ",data) + }) +} \ No newline at end of file -- 2.39.5 From fb5301c9feab070ed2d45f0a72e72197c0eea28d Mon Sep 17 00:00:00 2001 From: David Westgate Date: Thu, 17 Apr 2025 23:08:17 +0100 Subject: [PATCH 3/7] power flipping --- src/http.ts | 6 ++--- src/io.ts | 71 +++++++++++++++++++++++++++++++++------------------ src/server.ts | 20 +++++++++------ 3 files changed, 61 insertions(+), 36 deletions(-) diff --git a/src/http.ts b/src/http.ts index 4239e35..0c0113a 100644 --- a/src/http.ts +++ b/src/http.ts @@ -1,7 +1,7 @@ import * as http from "http"; import * as fs from "fs"; import * as path from "path"; -import { ISensors } from "./io"; +import IO, { ISensors } from "./io"; export default class HttpServer { @@ -11,7 +11,7 @@ export default class HttpServer { private root: string; // public constructor(port: number, root: string, tune: (ch: string, adp?: number) => void, getChannels: ()=>string[], getSignal: (adapter:number)=>object) { - public constructor(port: number, root: string, getSensors: ()=>ISensors, setPower: (power: boolean) => void) { + public constructor(port: number, root: string, io: IO) { this.port = port; this.root = root; this.httpServer = http.createServer((req, res) => { @@ -27,7 +27,7 @@ export default class HttpServer { case "GET": switch (api) { case "sensors": - body = JSON.stringify(getSensors()); + body = JSON.stringify(io.getSensors()); status = 200; break; case "signal": diff --git a/src/io.ts b/src/io.ts index e605905..a55c3fa 100644 --- a/src/io.ts +++ b/src/io.ts @@ -1,50 +1,71 @@ import Serial from "./serial"; -import * as onoff from 'onoff' +import * as pigpio from 'pigpio'; + +type ONOFF = 0 | 1; +const ON: ONOFF = 0 +const OFF: ONOFF = 1 + -const ON = onoff.Gpio.HIGH; -const OFF = onoff.Gpio.LOW; export interface ISensors { temperature: number; power: boolean; moisture: number; - humidity: number + humidity: number; } -export default class IO { - private temp: number - private serial: Serial; - // private power: boolean; - private gpio: onoff.Gpio - +export default class IO implements ISensors { + temperature: number; + moisture: number; + humidity: number; + gpio: pigpio.Gpio + serial: Serial; + power: boolean; public constructor(POWER_GPIO = 17) { - this.serial = new Serial(); - this.gpio = new onoff.Gpio(POWER_GPIO, 'out'); + const serial = new Serial() + serial.getMoisture.bind(this); + this.serial = serial; + // Initialize pigpio and the GPIO pin + const read = new pigpio.Gpio(POWER_GPIO, {mode: pigpio.Gpio.INPUT}); + this.power = read.digitalRead() == ON ? true : false + this.gpio = new pigpio.Gpio(POWER_GPIO, { mode: pigpio.Gpio.OUTPUT }); + + this.humidity = 0 + this.temperature = 0; + // this.serial.getMoisture.bind(this) } - public getPower() { - return this.gpio.readSync() + getMoisture() { + return } + // getPower() { + // // Read the current state of the GPIO pin + // return this.gpio.digitalRead() === ON; + // } + public setPower(power: boolean) { - this.gpio.writeSync(power ? ON : OFF); + // Set the GPIO pin to high (1) or low (0) + this.power = power; + this.gpio.digitalWrite(this.power ? ON : OFF); } public togglePower() { - const cur: onoff.BinaryValue = this.getPower() ; - this.gpio.writeSync(cur ? OFF : ON); + // Toggle the power state (turn the pin on or off) + console.log("toggle") + this.power = !this.power; + this.gpio.digitalWrite(this.power ? ON : OFF); } - public getSensors (): ISensors { + public getSensors(): ISensors { + console.log("serial ", this.serial) return { - power: this.getPower() ? true : false, + power: this.power, moisture: 0, - temperature: 0, - humidity: 0 + temperature: this.temperature, + humidity: this.humidity } } - public getMoisture() { - return this.serial.getMoisture() - } -} \ No newline at end of file + +} diff --git a/src/server.ts b/src/server.ts index 4ef217a..0f2d001 100644 --- a/src/server.ts +++ b/src/server.ts @@ -26,13 +26,16 @@ const TV_DEV_0 = process.env.TV_DEV_0 ?? '/dev/video0' // zap.getSignal(adapter) const io = new IO(); - -const httpServer = new HttpServer(HTTP_PORT, STATIC_ROOT, io.getSensors, io.setPower); +// const getSensors = io.getSensors.bind(this); +// setTimeout(()=>{ +// console.log("sen ",io.getSensors()) +// console.log("sen2 ",getSensors()) +// },200) +// const setPower = io.setPower.bind(this, true) +// const togglePower = io.togglePower.bind(this) +const httpServer = new HttpServer(HTTP_PORT, STATIC_ROOT, io); const videoSocket = new VideoSocket(WS_PORT, TV_DEV_0); - - - httpServer.start(); @@ -50,16 +53,17 @@ process.stdin.on("data", async (data: string) => { break; case 1: - io.setPower(false); + io.setPower(false);// console.log(io.getMoisture()); break; case 2: io.setPower(true); break; case 3: - io.setPower(io.getPower()? true:false) + io.togglePower(); break; case 4: - console.log(io.getMoisture()); + io.getSensors() + break; default: console.log("No option for "+input) } -- 2.39.5 From 22aeed01be533e437d890c46efe677dc82d35571 Mon Sep 17 00:00:00 2001 From: David Westgate Date: Fri, 18 Apr 2025 03:46:42 +0100 Subject: [PATCH 4/7] data channel working --- sketch.c | 16 +++++++++++++ src/io.ts | 12 +++++----- src/serial.ts | 19 +++++++++++----- src/server.ts | 13 ++++++----- src/static/js/video.ts | 25 ++++++++++++++++++--- src/ws.ts | 51 ++++++++++++++++++++++++++++++++++++++++-- 6 files changed, 113 insertions(+), 23 deletions(-) create mode 100644 sketch.c diff --git a/sketch.c b/sketch.c new file mode 100644 index 0000000..a5db3ad --- /dev/null +++ b/sketch.c @@ -0,0 +1,16 @@ +void setup() { + Serial.begin(9600); +} + +void loop() { + int moisture0 = analogRead(A0); + delayMicroseconds(100); + analogRead(A1); + int moisture1 = analogRead(A1); + Serial.print("{\"A0\":"); + Serial.print(moisture0); + Serial.print(",\"A1\":"); + Serial.print(moisture1); + Serial.println("}"); + delay(1000); +} \ No newline at end of file diff --git a/src/io.ts b/src/io.ts index a55c3fa..355837b 100644 --- a/src/io.ts +++ b/src/io.ts @@ -21,9 +21,11 @@ export default class IO implements ISensors { gpio: pigpio.Gpio serial: Serial; power: boolean; + getMoisture : ()=>number; + public constructor(POWER_GPIO = 17) { const serial = new Serial() - serial.getMoisture.bind(this); + this.getMoisture = serial.getMoisture.bind(serial); this.serial = serial; // Initialize pigpio and the GPIO pin const read = new pigpio.Gpio(POWER_GPIO, {mode: pigpio.Gpio.INPUT}); @@ -35,9 +37,6 @@ export default class IO implements ISensors { // this.serial.getMoisture.bind(this) } - getMoisture() { - return - } // getPower() { // // Read the current state of the GPIO pin @@ -52,16 +51,15 @@ export default class IO implements ISensors { public togglePower() { // Toggle the power state (turn the pin on or off) - console.log("toggle") this.power = !this.power; this.gpio.digitalWrite(this.power ? ON : OFF); } public getSensors(): ISensors { - console.log("serial ", this.serial) + // console.log("serial ", ) return { power: this.power, - moisture: 0, + moisture: this.getMoisture(), temperature: this.temperature, humidity: this.humidity } diff --git a/src/serial.ts b/src/serial.ts index e550bb4..67a1594 100644 --- a/src/serial.ts +++ b/src/serial.ts @@ -6,16 +6,25 @@ import * as serialport from 'serialport'; // } export default class Serial { - private moisture: number; + private moisture0: number; + private moisture1: number; public constructor(path = '/dev/ttyUSB0', baudRate = 9600, delimiter = '\n') { const port = new serialport.SerialPort({ path, baudRate }); const readline = new serialport.ReadlineParser({ delimiter }); const parser = port.pipe(readline); parser.on('data', line => { - const moisture = parseInt(line.trim(), 10); - if (!isNaN(moisture)) { - this.moisture = moisture + // console.log("data line ", line) + const data = JSON.parse(line) + const moisture0 = parseInt(data['A0'], 10); + const moisture1 = parseInt(data['A1'], 10); + if (!isNaN(moisture0) && !isNaN(moisture1)) { + // console.log("m ", this.moisture) + this.moisture0 = moisture0; + this.moisture1 = moisture1; + } + else{ + console.log("data ",data) } }); port.on('error', err => { @@ -23,7 +32,7 @@ export default class Serial { }); } public getMoisture() { - return this.moisture; + return this.moisture0; } diff --git a/src/server.ts b/src/server.ts index 0f2d001..baac545 100644 --- a/src/server.ts +++ b/src/server.ts @@ -1,5 +1,5 @@ import HttpServer from './http'; -import IO from './io'; +import IO, { ISensors } from './io'; import VideoSocket from './ws'; const HTTP_PORT = process.env.HTTP_PORT ? parseInt(process.env.HTTP_PORT, 10) : 8080; @@ -26,7 +26,7 @@ const TV_DEV_0 = process.env.TV_DEV_0 ?? '/dev/video0' // zap.getSignal(adapter) const io = new IO(); -// const getSensors = io.getSensors.bind(this); +const getSensors: ()=>ISensors = io.getSensors.bind(io); // setTimeout(()=>{ // console.log("sen ",io.getSensors()) // console.log("sen2 ",getSensors()) @@ -34,7 +34,7 @@ const io = new IO(); // const setPower = io.setPower.bind(this, true) // const togglePower = io.togglePower.bind(this) const httpServer = new HttpServer(HTTP_PORT, STATIC_ROOT, io); -const videoSocket = new VideoSocket(WS_PORT, TV_DEV_0); +const videoSocket = new VideoSocket(WS_PORT, TV_DEV_0, getSensors); httpServer.start(); @@ -42,7 +42,7 @@ httpServer.start(); process.stdin.setEncoding("utf8"); process.stdin.resume(); -console.log("Menu:\n1) Power off\n2)Power on\n3) Power flop\n4)Read moisture"); +console.log("Menu:\n1) Power off\n2)Power on\n3) Power flop\n4)Read Sensors"); process.stdin.on("data", async (data: string) => { const input = data.trim(); @@ -53,7 +53,7 @@ process.stdin.on("data", async (data: string) => { break; case 1: - io.setPower(false);// console.log(io.getMoisture()); + io.setPower(false); break; case 2: io.setPower(true); @@ -62,7 +62,8 @@ process.stdin.on("data", async (data: string) => { io.togglePower(); break; case 4: - io.getSensors() + + console.log("a ", getSensors()) break; default: console.log("No option for "+input) diff --git a/src/static/js/video.ts b/src/static/js/video.ts index 675d93e..b046387 100644 --- a/src/static/js/video.ts +++ b/src/static/js/video.ts @@ -2,16 +2,16 @@ const isSecure = window.location.protocol === 'https:'; const host = window.location.hostname; const ws0builder = isSecure ? `wss://${host}/ws3` : `ws://${host}:3003`; const ws0 = new WebSocket(ws0builder); -const config = { +const config = { iceServers: [ { - urls: ['stun:dwestgate.us:3478','turn:dwestgate.us:3478?transport=udp'], + urls: ['stun:dwestgate.us:3478', 'turn:dwestgate.us:3478?transport=udp'], username: 'webrtcuser', credential: 'webrtccred' } ] }; -const pc0 = new RTCPeerConnection(config); +const pc0 = new RTCPeerConnection(isSecure ? config: {}); const video0 = document.getElementById('video0') as HTMLVideoElement; @@ -26,6 +26,23 @@ pc0.onicecandidate = ({ candidate }) => { } }; + +// Create the data channel (client initiates) +const dataChannel = pc0.createDataChannel('sensors'); +console.log("📡 Data channel created by client"); + +dataChannel.onopen = () => { + console.log('📬 Client: Data channel opened'); +}; + +dataChannel.onmessage = (event) => { + console.log("📦 Client received message:", event.data); +}; + +dataChannel.onclose = () => { + console.log("📴 Client: Data channel closed"); +}; + ws0.onopen = async () => { pc0.addTransceiver('video', { direction: 'recvonly' }); pc0.addTransceiver('audio', { direction: 'recvonly' }) @@ -37,6 +54,7 @@ ws0.onopen = async () => { ws0.onmessage = async (message) => { const msg = JSON.parse(message.data); if (msg.type === 'answer') { + // pc0.data await pc0.setRemoteDescription(msg.data); } else if (msg.type === 'ice-candidate') { @@ -44,3 +62,4 @@ ws0.onmessage = async (message) => { } }; + diff --git a/src/ws.ts b/src/ws.ts index ec31802..5f59f7f 100644 --- a/src/ws.ts +++ b/src/ws.ts @@ -1,6 +1,7 @@ -import { MediaStream, MediaStreamTrack, nonstandard, RTCPeerConnection } from '@roamhq/wrtc'; +import { MediaStream, MediaStreamTrack, nonstandard, RTCPeerConnection, RTCDataChannel } from '@roamhq/wrtc'; import { ChildProcessWithoutNullStreams, spawn } from 'child_process'; import * as ws from 'ws'; +import { ISensors } from './io'; // Constants const WIDTH = 640; // Video width @@ -9,7 +10,7 @@ const FRAME_SIZE = WIDTH * HEIGHT * 1.5; // YUV420P frame size export default class VideoSocket { videoDevice: string; - public constructor(port: number, videoDevice) { + public constructor(port: number, videoDevice, getSensors: () => ISensors) { this.videoDevice = videoDevice const ffmpegProcess = this.startFFmpeg(); const videoTrack = this.createVideoTrack(ffmpegProcess); @@ -25,11 +26,35 @@ export default class VideoSocket { wss.on('connection', async (ws: ws.WebSocket) => { const peerConnection: RTCPeerConnection = this.createPeerConnection(videoTrack, audioTrack); + // The client created the data channel. The server should access it as follows: + peerConnection.ondatachannel = (event) => { + const dataChannel = event.channel; // This is the data channel created by the client + + dataChannel.onopen = () => { + console.log('📬 Server: Data channel opened'); + // Now you can send data through the channel + setInterval(() => { + const sensorData = getSensors(); // Example function to fetch data + dataChannel.send(JSON.stringify(sensorData)); // Send data to the client + }, 1000); + }; + + dataChannel.onmessage = (event) => { + console.log("📦 Server received message:", event.data); + }; + + dataChannel.onclose = () => { + console.log("📴 Server: Data channel closed"); + }; + }; + + ws.on('message', async (message: Buffer) => { const { type, data } = JSON.parse(message.toString()); if (type == 'offer') { + await peerConnection.setRemoteDescription(data); const answer = await peerConnection.createAnswer(); await peerConnection.setLocalDescription(answer); @@ -181,6 +206,28 @@ export default class VideoSocket { return audioSource.createTrack(); } + createDataChannel = (peerConnection: RTCPeerConnection, getSensors: () => any) => { + const dataChannel = peerConnection.createDataChannel('sensors') + console.log("create data channel"); + dataChannel.onopen = () => { + console.log('✅ Data channel is open'); + // Send dummy JSON for testing + setInterval(() => { + const sensorData = getSensors(); // Assuming getSensors returns JSON + dataChannel.send(JSON.stringify(sensorData)); + }, 1000); + }; + + dataChannel.onerror = (error) => { + console.error('❌ DataChannel error:', error); + }; + + dataChannel.onclose = () => { + console.log('❎ DataChannel closed'); + }; + return peerConnection; + } + createPeerConnection = (videoTrack: MediaStreamTrack, audioTrack: MediaStreamTrack): RTCPeerConnection => { const peerConnection = new RTCPeerConnection({ iceServers: [ -- 2.39.5 From e10a4929107f61cbad01683d5866611c5cdd6fef Mon Sep 17 00:00:00 2001 From: David Westgate Date: Sun, 20 Apr 2025 03:48:53 +0100 Subject: [PATCH 5/7] seperate lights/heat --- package.json | 8 +++- src/io.ts | 87 +++++++++++++++++++++++------------------- src/serial.ts | 14 ++++--- src/server.ts | 14 ++++--- src/static/index.html | 8 +++- src/static/js/video.ts | 20 ++++++++-- 6 files changed, 94 insertions(+), 57 deletions(-) diff --git a/package.json b/package.json index f6c819c..969a0cf 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,12 @@ { "dependencies": { "@roamhq/wrtc": "0.8.0", + "node-dht-sensor": "^0.4.5", "node-pre-gyp": "^0.17.0", - "ws": "^8.18.0", - "sass": "1.86.3" + "pigpio": "^3.3.1", + "sass": "1.86.3", + "serialport": "^13.0.0", + "ws": "^8.18.0" }, "scripts": { "build:scss": "npx sass src/static/css:dist/static/css", @@ -16,6 +19,7 @@ }, "devDependencies": { "@types/node": "^22.10.2", + "@types/node-dht-sensor": "^0.4.2", "@types/ws": "^8.5.13", "ts-node": "^10.9.2", "typescript": "^5.8.2" diff --git a/src/io.ts b/src/io.ts index 355837b..308504c 100644 --- a/src/io.ts +++ b/src/io.ts @@ -1,69 +1,78 @@ import Serial from "./serial"; import * as pigpio from 'pigpio'; +import * as dht from 'node-dht-sensor'; type ONOFF = 0 | 1; const ON: ONOFF = 0 -const OFF: ONOFF = 1 +const OFF: ONOFF = 1 export interface ISensors { temperature: number; - power: boolean; - moisture: number; + lights: boolean; + heat: boolean + moisture0: number; + moisture1: number; humidity: number; } -export default class IO implements ISensors { - temperature: number; - moisture: number; - humidity: number; - gpio: pigpio.Gpio +export default class IO { + gpioLights: pigpio.Gpio + gpioHeat: pigpio.Gpio serial: Serial; - power: boolean; - getMoisture : ()=>number; + lights: boolean; + heat: boolean; + getMoisture: () => ({ moisture0: number, moisture1: number }); - public constructor(POWER_GPIO = 17) { + public constructor(LIGHTS_GPIO = 17, HEAT_GPIO=22, DHT_GPIO = 27, DHT_MODEL = 22) { const serial = new Serial() this.getMoisture = serial.getMoisture.bind(serial); this.serial = serial; - // Initialize pigpio and the GPIO pin - const read = new pigpio.Gpio(POWER_GPIO, {mode: pigpio.Gpio.INPUT}); - this.power = read.digitalRead() == ON ? true : false - this.gpio = new pigpio.Gpio(POWER_GPIO, { mode: pigpio.Gpio.OUTPUT }); - this.humidity = 0 - this.temperature = 0; - // this.serial.getMoisture.bind(this) + const readLights = new pigpio.Gpio(LIGHTS_GPIO, { mode: pigpio.Gpio.INPUT }); + this.lights = readLights.digitalRead() == ON ? true : false + this.gpioLights = new pigpio.Gpio(LIGHTS_GPIO, { mode: pigpio.Gpio.OUTPUT }); + + const readHeat = new pigpio.Gpio(HEAT_GPIO, { mode: pigpio.Gpio.INPUT }); + this.lights = readHeat.digitalRead() == ON ? true : false + this.gpioHeat = new pigpio.Gpio(HEAT_GPIO, { mode: pigpio.Gpio.OUTPUT }); + + + dht.initialize(22, DHT_GPIO); + dht.setMaxRetries(10); } + public setPower(state: boolean, GPIO= 17) { + if(GPIO == 17){ + this.lights = state; + this.gpioLights.digitalWrite(this.lights ? ON : OFF); + } + else if(GPIO == 22){ + this.heat = state; + this.gpioHeat.digitalWrite(this.heat ? ON : OFF); + } - // getPower() { - // // Read the current state of the GPIO pin - // return this.gpio.digitalRead() === ON; + } + + // public togglePower() { + // this.power = !this.power; + // this.gpio.digitalWrite(this.power ? ON : OFF); // } - public setPower(power: boolean) { - // Set the GPIO pin to high (1) or low (0) - this.power = power; - this.gpio.digitalWrite(this.power ? ON : OFF); - } - - public togglePower() { - // Toggle the power state (turn the pin on or off) - this.power = !this.power; - this.gpio.digitalWrite(this.power ? ON : OFF); - } + private round = (n) => + (n * 100) / 100 public getSensors(): ISensors { - // console.log("serial ", ) + const { temperature, humidity } = dht.read(22, 27) + const { moisture0, moisture1 } = this.getMoisture() return { - power: this.power, - moisture: this.getMoisture(), - temperature: this.temperature, - humidity: this.humidity + lights: this.lights, + heat: this.heat, + moisture0: moisture0, + moisture1: moisture1, + temperature: this.round(temperature), + humidity: this.round(humidity) } } - - } diff --git a/src/serial.ts b/src/serial.ts index 67a1594..3a564fa 100644 --- a/src/serial.ts +++ b/src/serial.ts @@ -14,25 +14,29 @@ export default class Serial { const readline = new serialport.ReadlineParser({ delimiter }); const parser = port.pipe(readline); parser.on('data', line => { - // console.log("data line ", line) const data = JSON.parse(line) const moisture0 = parseInt(data['A0'], 10); const moisture1 = parseInt(data['A1'], 10); if (!isNaN(moisture0) && !isNaN(moisture1)) { - // console.log("m ", this.moisture) this.moisture0 = moisture0; this.moisture1 = moisture1; } - else{ - console.log("data ",data) + else { + console.error("Error reading analog data") } }); port.on('error', err => { console.error('Serial Error:', err.message); }); } + + private scale = (value: number) => { + const percent = (value / 1024) * 100; + return Math.min(Math.max(percent, 0), 100); // Clamp to 0-100 just in case + } + public getMoisture() { - return this.moisture0; + return { moisture0: this.scale(this.moisture0), moisture1: this.scale(this.moisture1) }; } diff --git a/src/server.ts b/src/server.ts index baac545..3275c97 100644 --- a/src/server.ts +++ b/src/server.ts @@ -42,7 +42,7 @@ httpServer.start(); process.stdin.setEncoding("utf8"); process.stdin.resume(); -console.log("Menu:\n1) Power off\n2)Power on\n3) Power flop\n4)Read Sensors"); +console.log("Menu:\n1)Lights Power off\n2) Lights Power on\n3)Heat Power Off\n4) Heat power on\n5)Read Sensors"); process.stdin.on("data", async (data: string) => { const input = data.trim(); @@ -53,16 +53,20 @@ process.stdin.on("data", async (data: string) => { break; case 1: - io.setPower(false); + io.setPower(false,17); break; case 2: - io.setPower(true); + io.setPower(true,17); break; case 3: - io.togglePower(); + io.setPower(false,22); break; case 4: - + io.setPower(true,22); + break; + + + case 5: console.log("a ", getSensors()) break; default: diff --git a/src/static/index.html b/src/static/index.html index 7ceffb1..032a7b6 100644 --- a/src/static/index.html +++ b/src/static/index.html @@ -18,8 +18,12 @@
-

- +
+ +
diff --git a/src/static/js/video.ts b/src/static/js/video.ts index b046387..d453ae2 100644 --- a/src/static/js/video.ts +++ b/src/static/js/video.ts @@ -2,6 +2,14 @@ const isSecure = window.location.protocol === 'https:'; const host = window.location.hostname; const ws0builder = isSecure ? `wss://${host}/ws3` : `ws://${host}:3003`; const ws0 = new WebSocket(ws0builder); + +interface IData { + power: boolean, + moisture: number, + temperature: number, + humidity: number +} +const dataContainer = document.getElementById('data-container') as HTMLDivElement const config = { iceServers: [ { @@ -11,7 +19,7 @@ const config = { } ] }; -const pc0 = new RTCPeerConnection(isSecure ? config: {}); +const pc0 = new RTCPeerConnection(isSecure ? config : {}); const video0 = document.getElementById('video0') as HTMLVideoElement; @@ -32,15 +40,19 @@ const dataChannel = pc0.createDataChannel('sensors'); console.log("📡 Data channel created by client"); dataChannel.onopen = () => { - console.log('📬 Client: Data channel opened'); + console.log('📬 Client: Data channel opened'); }; dataChannel.onmessage = (event) => { - console.log("📦 Client received message:", event.data); + // console.log("📦 Client received message:", event.data); + const json = JSON.parse(event.data) ; + + dataContainer.innerHTML = Object.entries(json).map(([k,v])=>`

${k}:${v}

`).join('') + }; dataChannel.onclose = () => { - console.log("📴 Client: Data channel closed"); + console.log("📴 Client: Data channel closed"); }; ws0.onopen = async () => { -- 2.39.5 From 14786f378add5c326ff8b05aa80fa567d28cba56 Mon Sep 17 00:00:00 2001 From: David Westgate Date: Mon, 21 Apr 2025 21:59:51 +0100 Subject: [PATCH 6/7] general improvements --- src/http.ts | 15 +++++-------- src/io.ts | 2 +- src/serial.ts | 16 ++++++++------ src/server.ts | 24 +-------------------- src/static/index.html | 5 +---- src/static/js/video.ts | 14 ++++++++++-- src/ws.ts | 48 +++++++++++++++++++++++++++--------------- 7 files changed, 61 insertions(+), 63 deletions(-) diff --git a/src/http.ts b/src/http.ts index 0c0113a..67047a6 100644 --- a/src/http.ts +++ b/src/http.ts @@ -1,15 +1,14 @@ import * as http from "http"; import * as fs from "fs"; import * as path from "path"; -import IO, { ISensors } from "./io"; +import IO from "./io"; -export default class HttpServer { + class HttpServer { private httpServer: http.Server; private port: number; private root: string; - // public constructor(port: number, root: string, tune: (ch: string, adp?: number) => void, getChannels: ()=>string[], getSignal: (adapter:number)=>object) { public constructor(port: number, root: string, io: IO) { this.port = port; @@ -46,7 +45,7 @@ export default class HttpServer { // tune(channel, adapter); status = 202; break; - + } } @@ -76,10 +75,6 @@ export default class HttpServer { } - - - - - -} +}; +export default HttpServer; diff --git a/src/io.ts b/src/io.ts index 308504c..1c6706c 100644 --- a/src/io.ts +++ b/src/io.ts @@ -35,7 +35,7 @@ export default class IO { this.gpioLights = new pigpio.Gpio(LIGHTS_GPIO, { mode: pigpio.Gpio.OUTPUT }); const readHeat = new pigpio.Gpio(HEAT_GPIO, { mode: pigpio.Gpio.INPUT }); - this.lights = readHeat.digitalRead() == ON ? true : false + this.heat = readHeat.digitalRead() == ON ? true : false this.gpioHeat = new pigpio.Gpio(HEAT_GPIO, { mode: pigpio.Gpio.OUTPUT }); diff --git a/src/serial.ts b/src/serial.ts index 3a564fa..126ae3a 100644 --- a/src/serial.ts +++ b/src/serial.ts @@ -14,16 +14,20 @@ export default class Serial { const readline = new serialport.ReadlineParser({ delimiter }); const parser = port.pipe(readline); parser.on('data', line => { - const data = JSON.parse(line) - const moisture0 = parseInt(data['A0'], 10); - const moisture1 = parseInt(data['A1'], 10); - if (!isNaN(moisture0) && !isNaN(moisture1)) { + try{ + const data = JSON.parse(line) + const moisture0 = parseInt(data['A0'], 10); + const moisture1 = parseInt(data['A1'], 10); + if (isNaN(moisture0) || isNaN(moisture1)){ + throw new Error("isNan " + moisture0 + " " + moisture1) + } this.moisture0 = moisture0; this.moisture1 = moisture1; } - else { - console.error("Error reading analog data") + catch(e){ + console.log(e) } + }); port.on('error', err => { console.error('Serial Error:', err.message); diff --git a/src/server.ts b/src/server.ts index 3275c97..d99eedb 100644 --- a/src/server.ts +++ b/src/server.ts @@ -7,32 +7,10 @@ const WS_PORT = process.env.WS_PORT ? parseInt(process.env.WS_PORT, 10) : 3003; const STATIC_ROOT = process.cwd() + "/dist/static"; const TV_DEV_0 = process.env.TV_DEV_0 ?? '/dev/video0' -// const zap = new Zap(); - - -// const tune = (reqChannel: string, reqAdapter?: number) => { -// const adapter = reqAdapter === 0 || reqAdapter === 1 ? reqAdapter : 0; -// zap.zapTo(reqChannel, adapter).then((zap: IZap) => { -// console.log(`Tuned ${zap.adapter} to ${zap.channel}`) -// }).catch((err: Error) => { -// console.error(err.message); -// }); -// } - -// const getChannels = () => -// zap.getChannels(); - -// const getSignal = (adapter: number) => -// zap.getSignal(adapter) const io = new IO(); const getSensors: ()=>ISensors = io.getSensors.bind(io); -// setTimeout(()=>{ -// console.log("sen ",io.getSensors()) -// console.log("sen2 ",getSensors()) -// },200) -// const setPower = io.setPower.bind(this, true) -// const togglePower = io.togglePower.bind(this) + const httpServer = new HttpServer(HTTP_PORT, STATIC_ROOT, io); const videoSocket = new VideoSocket(WS_PORT, TV_DEV_0, getSensors); diff --git a/src/static/index.html b/src/static/index.html index 032a7b6..101f432 100644 --- a/src/static/index.html +++ b/src/static/index.html @@ -5,18 +5,15 @@ WebRTC Stream - +
-

Video streams

-

WebRTC

-
+
diff --git a/src/static/js/api.ts b/src/static/js/api.ts index ac8ebc9..e15359d 100644 --- a/src/static/js/api.ts +++ b/src/static/js/api.ts @@ -1,9 +1,4 @@ -const getSensors = () =>{ +const test = (gpio: string ) => { + fetch(`/api/test/${gpio}`, { method: "PUT"}) +}; -} - -const poll = () =>{ - fetch("/api/sensors").then(r=>r.json()).then(data =>{ - console.log("data ",data) - }) -} \ No newline at end of file diff --git a/src/ws.ts b/src/ws.ts index 017fdef..09176e9 100644 --- a/src/ws.ts +++ b/src/ws.ts @@ -51,7 +51,7 @@ export default class VideoSocket { }; dataChannel.onmessage = (event) => { - console.log("📦 Server received message:", event.data); + // console.log("📦 Server received message:", event.data); }; dataChannel.onclose = () => { diff --git a/tsconfig.json b/tsconfig.json index 633cb3e..76fc191 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -44,7 +44,7 @@ // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ // "noUncheckedSideEffectImports": true, /* Check side effect imports. */ - // "resolveJsonModule": true, /* Enable importing .json files. */ + "resolveJsonModule": true, /* Enable importing .json files. */ // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ /* JavaScript Support */ @@ -106,7 +106,7 @@ "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ "skipLibCheck": true /* Skip type checking all .d.ts files. */ }, - "include": ["src"], + "include": ["src/**/*.ts"], "exclude": [ "node_modules","./node_modules/@roamhq/wrtc" ] -- 2.39.5