From a6abfcde90730a966d98bf0a6154bcb9e8293076 Mon Sep 17 00:00:00 2001 From: Aetherinox Date: Sun, 23 Mar 2025 03:57:23 -0700 Subject: [PATCH] feat: add `ejs` template system --- tvapp2/index.js | 22 ++-------- tvapp2/package-lock.json | 94 +++++++++++++++++++++++++++++++++++----- tvapp2/package.json | 5 ++- tvapp2/www/index.html | 10 ++--- 4 files changed, 93 insertions(+), 38 deletions(-) diff --git a/tvapp2/index.js b/tvapp2/index.js index 111d3bed..b8326a17 100755 --- a/tvapp2/index.js +++ b/tvapp2/index.js @@ -10,6 +10,7 @@ import path from 'path'; import http from 'http'; import zlib from 'zlib'; import chalk from 'chalk'; +import ejs from 'ejs'; /* Old CJS variables converted to ESM @@ -837,27 +838,11 @@ const server = http.createServer( ( request, response ) => read the loaded asset file */ - fs.readFile( './www/' + loadAsset, ( err, data ) => + ejs.renderFile( './www/' + loadAsset, { fileEPG: envFilePlaylist, fileM3U: envFileEPG, appName: name, appVersion: version }, ( err, data ) => { if ( !err ) { - /* - @todo currently, the index.html has certain template variables loaded using str.replace; - this can be more easily managed by using ejs - - import ejs from 'ejs'; - app.post("index.html", (req, res) => { - const token = req.body.data.token; - ejs.renderFile("./index.ejs", {token: token}, (error, output) => { - // other functionality - }) - } - */ - - const html = data.toString() - .replace( '${ file_m3u }', envFilePlaylist ) - .replace( '${ file_epg }', envFileEPG ) - .replace( '${ version }', version ); + const html = data.toString(); /* This allows us to serve all files locally: css, js, etc. @@ -885,7 +870,6 @@ const server = http.createServer( ( request, response ) => else { Log.error( `www file not found:`, chalk.white( ` → ` ), chalk.grey( `${ request.url }` ) ); - response.writeHead( 404, 'Not Found' ); response.end(); } diff --git a/tvapp2/package-lock.json b/tvapp2/package-lock.json index 2b5407cb..a587171a 100755 --- a/tvapp2/package-lock.json +++ b/tvapp2/package-lock.json @@ -1,15 +1,16 @@ { - "name": "tvapp2", + "name": "TVApp2", "version": "1.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "tvapp2", + "name": "TVApp2", "version": "1.1.0", "license": "MIT", "dependencies": { "chalk": "^5.3.0", + "ejs": "^3.1.10", "playwright": "^1.51.0", "user-agents": "^1.1.480" }, @@ -433,7 +434,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -576,7 +576,6 @@ "version": "3.2.6", "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", - "dev": true, "license": "MIT" }, "node_modules/async-function": { @@ -609,14 +608,12 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, "license": "MIT" }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", @@ -751,7 +748,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -764,7 +760,6 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, "license": "MIT" }, "node_modules/commander": { @@ -781,7 +776,6 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true, "license": "MIT" }, "node_modules/cross-spawn": { @@ -959,6 +953,21 @@ "node": ">= 0.4" } }, + "node_modules/ejs": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", + "license": "Apache-2.0", + "dependencies": { + "jake": "^10.8.5" + }, + "bin": { + "ejs": "bin/cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -1722,6 +1731,36 @@ "node": ">=16.0.0" } }, + "node_modules/filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "license": "Apache-2.0", + "dependencies": { + "minimatch": "^5.0.1" + } + }, + "node_modules/filelist/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/filelist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -1988,7 +2027,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -2564,6 +2602,40 @@ "dev": true, "license": "ISC" }, + "node_modules/jake": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", + "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", + "license": "Apache-2.0", + "dependencies": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + }, + "bin": { + "jake": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jake/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, "node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -2722,7 +2794,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" @@ -3601,7 +3672,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "license": "MIT", "dependencies": { "has-flag": "^4.0.0" diff --git a/tvapp2/package.json b/tvapp2/package.json index 208a3f47..bae2c27b 100755 --- a/tvapp2/package.json +++ b/tvapp2/package.json @@ -1,5 +1,5 @@ { - "name": "tvapp2", + "name": "TVApp2", "version": "1.1.0", "description": "This package allows you to generate M3U playlists and EPG guides from various online IPTV services.", "author": "BinaryNinja", @@ -68,7 +68,8 @@ "dependencies": { "playwright": "^1.51.0", "user-agents": "^1.1.480", - "chalk": "^5.3.0" + "chalk": "^5.3.0", + "ejs": "^3.1.10" }, "devDependencies": { "@types/uuid": "^10.0.0", diff --git a/tvapp2/www/index.html b/tvapp2/www/index.html index a36be66a..6805530b 100644 --- a/tvapp2/www/index.html +++ b/tvapp2/www/index.html @@ -3,7 +3,7 @@ - TVApp2 - v${ version } + <%= appName %> - v<%= appVersion %> @@ -84,7 +84,7 @@
- Developed by BinaryNinja - TVApp2 - v${ version }
+ Developed by BinaryNinja - <%= appName %> - v<%= appVersion %>
This utility is for educational purposes only
@@ -95,12 +95,12 @@ const baseURL = window.location.origin; const playlistURL = baseURL + "/playlist"; const epgURL = baseURL + "/epg"; - document.getElementById("playlist-url").textContent = "${ file_m3u }"; + document.getElementById("playlist-url").textContent = "<%= fileM3U %>"; document.getElementById("playlist-url").href = playlistURL; document.getElementById("playlist-link").textContent = playlistURL; document.getElementById("playlist-link").href = playlistURL; - document.getElementById("epg-url").textContent = "${ file_epg }"; + document.getElementById("epg-url").textContent = "<%= fileEPG %>"; document.getElementById("epg-url").href = epgURL; document.getElementById("epg-link").textContent = epgURL; document.getElementById("epg-link").href = epgURL; @@ -135,6 +135,6 @@ document.getElementById("warning-firewall").innerHTML = warningMessage; }); - +