From 748551a353786e14d35b1ee25d5814f096ea46f1 Mon Sep 17 00:00:00 2001 From: mmcwilliams Date: Mon, 4 Nov 2024 15:13:59 -0500 Subject: [PATCH] Add ability to use ENV variables in a subprocess. Use the DISPLAY env variable when launching fd to set which screen it launches on. --- default.env | 1 + dist/fd/index.d.ts | 3 ++- dist/fd/index.js | 10 ++++++++-- dist/fd/index.js.map | 2 +- dist/ffmpeg/index.js | 4 ++-- dist/ffmpeg/index.js.map | 2 +- dist/ffprobe/index.js | 2 +- dist/ffprobe/index.js.map | 2 +- dist/image/index.js | 2 +- dist/image/index.js.map | 2 +- dist/index.js | 2 +- dist/index.js.map | 2 +- dist/shell/index.d.ts | 3 ++- dist/shell/index.js | 5 ++++- dist/shell/index.js.map | 2 +- src/fd/index.ts | 10 ++++++++-- src/ffmpeg/index.ts | 4 ++-- src/ffprobe/index.ts | 2 +- src/image/index.ts | 2 +- src/index.ts | 3 +-- src/shell/index.ts | 6 ++++-- 21 files changed, 45 insertions(+), 26 deletions(-) diff --git a/default.env b/default.env index 86cd7d1..db8cba7 100644 --- a/default.env +++ b/default.env @@ -5,6 +5,7 @@ WS_PORT=8081 WIDTH=2560 HEIGHT=1600 FD=../filmout_display/build/bin/fd +#FD_DISPLAY=:0 FFMPEG=ffmpeg FD_HOST=localhost FD_PORT=8082 diff --git a/dist/fd/index.d.ts b/dist/fd/index.d.ts index 97cf1f2..cede953 100644 --- a/dist/fd/index.d.ts +++ b/dist/fd/index.d.ts @@ -43,6 +43,7 @@ export declare class FD { private height; private host; private port; + private env; private shell; private log; private client; @@ -50,7 +51,7 @@ export declare class FD { private socketConnected; private waiting; private mock; - constructor(bin: string, width: number, height: number, host: string, port: number, mock?: boolean); + constructor(bin: string, width: number, height: number, host: string, port: number, display?: string, mock?: boolean); private startDisplay; private startClient; private logstd; diff --git a/dist/fd/index.js b/dist/fd/index.js index f97b921..804c8ef 100644 --- a/dist/fd/index.js +++ b/dist/fd/index.js @@ -25,7 +25,8 @@ var Mode; Mode[Mode["INVERT_CHANNELS"] = 5] = "INVERT_CHANNELS"; })(Mode || (Mode = {})); class FD { - constructor(bin, width, height, host, port, mock = false) { + constructor(bin, width, height, host, port, display = null, mock = false) { + this.env = null; this.shell = null; this.client = null; this.socketAvailable = false; @@ -40,12 +41,17 @@ class FD { this.mock = mock; this.log = (0, log_1.createLog)('fd'); if (!this.mock) { + if (display !== null) { + this.env = { + DISPLAY: display + }; + } this.shell = new shell_1.Shell([ this.bin, '--width', `${this.width}`, '--height', `${this.height}`, '--port', `${this.port}` - ], this.logstd.bind(this), this.logsterr.bind(this), null, true); + ], this.env, this.logstd.bind(this), this.logsterr.bind(this), null, true); } this.startDisplay(); this.startClient(); diff --git a/dist/fd/index.js.map b/dist/fd/index.js.map index e1528f5..10570d4 100644 --- a/dist/fd/index.js.map +++ b/dist/fd/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/fd/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/fd/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/ffmpeg/index.js b/dist/ffmpeg/index.js index f4033e6..b863cf9 100644 --- a/dist/ffmpeg/index.js +++ b/dist/ffmpeg/index.js @@ -14,14 +14,14 @@ class FFMPEG { async rawList() { const cmd = [this.bin, '-formats']; return new Promise(async (resolve, reject) => { - this.shell = new shell_1.Shell(cmd, null, null, resolve, true); + this.shell = new shell_1.Shell(cmd, null, null, null, resolve, true); await this.shell.execute(); }); } async demuxerInfo(demuxer) { const cmd = [this.bin, `ffmpeg -h demuxer=${demuxer}`]; return new Promise(async (resolve, reject) => { - this.shell = new shell_1.Shell(cmd, null, null, resolve, true); + this.shell = new shell_1.Shell(cmd, null, null, null, resolve, true); await this.shell.execute(); }); } diff --git a/dist/ffmpeg/index.js.map b/dist/ffmpeg/index.js.map index bc6a5e2..fbd2a05 100644 --- a/dist/ffmpeg/index.js.map +++ b/dist/ffmpeg/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ffmpeg/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ffmpeg/index.ts"],"names":[],"mappings":";;;AACA,gCAAkC;AAClC,oCAAiC;AAEjC,2BAAyB;AAEzB,MAAa,MAAM;IAOlB,YAAa,MAAc,QAAQ;QAH3B,YAAO,GAAc,EAAE,CAAC;QACxB,gBAAW,GAAS,EAAE,CAAC;QAG9B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,GAAG,GAAG,IAAA,eAAS,EAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IAEO,KAAK,CAAC,OAAO;QACpB,MAAM,GAAG,GAAc,CAAE,IAAI,CAAC,GAAG,EAAE,UAAU,CAAE,CAAC;QAChD,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAkB,EAAE,MAAiB,EAAE,EAAE;YAClE,IAAI,CAAC,KAAK,GAAG,IAAI,aAAK,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YAC7D,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QAC5B,CAAC,CAAC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,WAAW,CAAE,OAAgB;QAC1C,MAAM,GAAG,GAAc,CAAE,IAAI,CAAC,GAAG,EAAE,qBAAqB,OAAO,EAAE,CAAE,CAAC;QACpE,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,OAAkB,EAAE,MAAiB,EAAE,EAAE;YAClE,IAAI,CAAC,KAAK,GAAG,IAAI,aAAK,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YAC7D,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QAC5B,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW;QAEhB,IAAI,IAAI,GAAY,IAAI,CAAC;QACzB,IAAI,IAAe,CAAC;QACpB,IAAI,GAAY,CAAC;QACjB,IAAI,WAAoB,CAAC;QACzB,IAAI,IAAa,CAAC;QAElB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;QAEtB,IAAI,CAAC;YACJ,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;QAC9C,CAAC;QAED,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YACnB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAG,CAAC,CAAC;YACvB,KAAK,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;gBACtB,4BAA4B;gBAC5B,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC5B,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBACrD,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;oBAC1C,qBAAqB;oBACrB;;;;uBAIG;oBACH,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACvB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG;wBACvB,WAAW;qBACX,CAAC;gBACH,CAAC;qBAAM,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;oBACnC,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBACrD,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;oBAC1C,qBAAqB;oBACrB;;;;uBAIG;oBACH,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACvB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG;wBACvB,WAAW;qBACX,CAAC;gBACH,CAAC;YACF,CAAC;QACF,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;CACD;AAjFD,wBAiFC;AAED,MAAM,CAAC,OAAO,GAAG,EAAE,MAAM,EAAE,CAAC"} \ No newline at end of file diff --git a/dist/ffprobe/index.js b/dist/ffprobe/index.js index f0fc56d..02e514f 100644 --- a/dist/ffprobe/index.js +++ b/dist/ffprobe/index.js @@ -103,7 +103,7 @@ class FFPROBE { function after(lines) { return resolve(lines); } - const child = new shell_1.Shell(cmd, null, null, after, true); + const child = new shell_1.Shell(cmd, null, null, null, after, true); await child.execute(); }); } diff --git a/dist/ffprobe/index.js.map b/dist/ffprobe/index.js.map index 048a4a7..7b94214 100644 --- a/dist/ffprobe/index.js.map +++ b/dist/ffprobe/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ffprobe/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/ffprobe/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/image/index.js b/dist/image/index.js index 94e2d2d..d23d245 100644 --- a/dist/image/index.js +++ b/dist/image/index.js @@ -42,7 +42,7 @@ class Image { '-depth', '8', output ]; - const shell = new shell_1.Shell(args, null, null, null, true); + const shell = new shell_1.Shell(args, null, null, null, null, true); try { await shell.execute(); } diff --git a/dist/image/index.js.map b/dist/image/index.js.map index 27ee098..861b97b 100644 --- a/dist/image/index.js.map +++ b/dist/image/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/image/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/image/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/index.js b/dist/index.js index 46d5c56..9d082d8 100644 --- a/dist/index.js +++ b/dist/index.js @@ -467,7 +467,7 @@ async function main() { image = new image_1.Image(); camera = new camera_1.Camera(mock); display = new display_1.Display(width, height); - fd = new fd_1.FD((0, env_1.envString)('FD', 'fd'), width, height, (0, env_1.envString)('FD_HOST', 'localhost'), (0, env_1.envInt)('FD_PORT', 8082), mock); + fd = new fd_1.FD((0, env_1.envString)('FD', 'fd'), width, height, (0, env_1.envString)('FD_HOST', 'localhost'), (0, env_1.envInt)('FD_PORT', 8082), (0, env_1.envString)('FD_DISPLAY', null), mock); app.listen(port, async () => { log.info(`filmout_manager HTTP server running on port ${port}`); }); diff --git a/dist/index.js.map b/dist/index.js.map index fb97f46..ad8873f 100644 --- a/dist/index.js.map +++ b/dist/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/shell/index.d.ts b/dist/shell/index.d.ts index d5661f0..0bad819 100644 --- a/dist/shell/index.d.ts +++ b/dist/shell/index.d.ts @@ -3,12 +3,13 @@ export declare class Shell { private log; private bin; private args; + private opts; private lines; private stdio; private stderr; private after; private silent; - constructor(args: any[], stdio?: Function, stderr?: Function, after?: Function, silent?: boolean); + constructor(args: any[], env?: any, stdio?: Function, stderr?: Function, after?: Function, silent?: boolean); execute(): Promise; kill(): void; } diff --git a/dist/shell/index.js b/dist/shell/index.js index cd8f910..65238b8 100644 --- a/dist/shell/index.js +++ b/dist/shell/index.js @@ -5,13 +5,16 @@ const child_process_1 = require("child_process"); const log_1 = require("../log"); const os_1 = require("os"); class Shell { - constructor(args, stdio = null, stderr = null, after = null, silent = false) { + constructor(args, env = null, stdio = null, stderr = null, after = null, silent = false) { + this.opts = {}; this.lines = []; this.stdio = null; this.stderr = null; this.after = null; this.silent = false; const bin = args.shift(); + if (env !== null) + this.opts = { env }; this.bin = bin; this.args = args; this.stdio = stdio; diff --git a/dist/shell/index.js.map b/dist/shell/index.js.map index 9fd94f7..da0efb1 100644 --- a/dist/shell/index.js.map +++ b/dist/shell/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/shell/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/shell/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/fd/index.ts b/src/fd/index.ts index 2949d82..1faeda0 100644 --- a/src/fd/index.ts +++ b/src/fd/index.ts @@ -56,6 +56,7 @@ export class FD { private height : number; private host : string; private port : number; + private env : any = null; private shell : Shell = null; private log : Logger; private client : Socket = null; @@ -65,7 +66,7 @@ export class FD { private waiting : Function = null; private mock : boolean = false; - constructor (bin: string, width : number, height : number, host : string, port : number, mock : boolean = false) { + constructor (bin: string, width : number, height : number, host : string, port : number, display : string = null, mock : boolean = false) { this.bin = bin; this.width = width; this.height = height; @@ -74,12 +75,17 @@ export class FD { this.mock = mock; this.log = createLog('fd'); if (!this.mock) { + if (display !== null) { + this.env = { + DISPLAY : display + } + } this.shell = new Shell([ this.bin, '--width', `${this.width}`, '--height', `${this.height}`, '--port', `${this.port}` - ], this.logstd.bind(this), this.logsterr.bind(this), null, true); + ], this.env, this.logstd.bind(this), this.logsterr.bind(this), null, true); } this.startDisplay(); this.startClient(); diff --git a/src/ffmpeg/index.ts b/src/ffmpeg/index.ts index 3c83c66..dd6db63 100644 --- a/src/ffmpeg/index.ts +++ b/src/ffmpeg/index.ts @@ -19,7 +19,7 @@ export class FFMPEG { private async rawList () : Promise { const cmd : string[] = [ this.bin, '-formats' ]; return new Promise(async (resolve : Function, reject : Function) => { - this.shell = new Shell(cmd, null, null, resolve, true); + this.shell = new Shell(cmd, null, null, null, resolve, true); await this.shell.execute(); }); } @@ -27,7 +27,7 @@ export class FFMPEG { private async demuxerInfo (demuxer : string) : Promise { const cmd : string[] = [ this.bin, `ffmpeg -h demuxer=${demuxer}` ]; return new Promise(async (resolve : Function, reject : Function) => { - this.shell = new Shell(cmd, null, null, resolve, true); + this.shell = new Shell(cmd, null, null, null, resolve, true); await this.shell.execute(); }); } diff --git a/src/ffprobe/index.ts b/src/ffprobe/index.ts index 7109e62..8504626 100644 --- a/src/ffprobe/index.ts +++ b/src/ffprobe/index.ts @@ -124,7 +124,7 @@ export class FFPROBE { function after (lines : string) { return resolve(lines); } - const child : Shell = new Shell(cmd, null, null, after, true); + const child : Shell = new Shell(cmd, null, null, null, after, true); await child.execute(); }); diff --git a/src/image/index.ts b/src/image/index.ts index 5d6216a..1d1d196 100644 --- a/src/image/index.ts +++ b/src/image/index.ts @@ -41,7 +41,7 @@ export class Image { '-depth', '8', output ]; - const shell : Shell = new Shell(args, null, null, null, true); + const shell : Shell = new Shell(args, null, null, null, null, true); try { await shell.execute(); } catch (err) { diff --git a/src/index.ts b/src/index.ts index 97dfb48..6b515f3 100644 --- a/src/index.ts +++ b/src/index.ts @@ -19,7 +19,6 @@ import { envString, envInt } from './env'; import { sendMail } from './mail'; import { Files } from './files'; import type { SequenceObject, VideoObject, ImageObject } from './files'; -import { Shell } from './shell'; import { delay } from './delay'; import { TestImage } from './testimage'; import { FD } from './fd'; @@ -467,7 +466,7 @@ async function main () { image = new Image(); camera = new Camera(mock); display = new Display(width, height); - fd = new FD(envString('FD', 'fd'), width, height, envString('FD_HOST', 'localhost'), envInt('FD_PORT', 8082), mock); + fd = new FD(envString('FD', 'fd'), width, height, envString('FD_HOST', 'localhost'), envInt('FD_PORT', 8082), envString('FD_DISPLAY', null), mock); app.listen(port, async () => { log.info(`filmout_manager HTTP server running on port ${port}`); diff --git a/src/shell/index.ts b/src/shell/index.ts index 97d0590..deb0e35 100644 --- a/src/shell/index.ts +++ b/src/shell/index.ts @@ -7,15 +7,17 @@ export class Shell { private child : ChildProcessWithoutNullStreams; private log : Logger; private bin : string; - private args : any[]; + private args : any[]; + private opts : any = {}; private lines : string[] = []; private stdio : Function = null; private stderr : Function = null; private after : Function = null; private silent : boolean = false; - constructor (args : any[], stdio : Function = null, stderr : Function = null, after : Function = null, silent : boolean = false) { + constructor (args : any[], env : any = null, stdio : Function = null, stderr : Function = null, after : Function = null, silent : boolean = false) { const bin : string = args.shift(); + if (env !== null) this.opts = { env }; this.bin = bin; this.args = args; this.stdio = stdio;