diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/AppData--1.0-HE.zip b/zefie_wtvp_minisrv/ServiceDeps/viewergen/AppData--1.0-HE.zip similarity index 100% rename from zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/AppData--1.0-HE.zip rename to zefie_wtvp_minisrv/ServiceDeps/viewergen/AppData--1.0-HE.zip diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/AppData--1.0.zip b/zefie_wtvp_minisrv/ServiceDeps/viewergen/AppData--1.0.zip similarity index 100% rename from zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/AppData--1.0.zip rename to zefie_wtvp_minisrv/ServiceDeps/viewergen/AppData--1.0.zip diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/AppData--1.1.zip b/zefie_wtvp_minisrv/ServiceDeps/viewergen/AppData--1.1.zip similarity index 100% rename from zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/AppData--1.1.zip rename to zefie_wtvp_minisrv/ServiceDeps/viewergen/AppData--1.1.zip diff --git a/zefie_wtvp_minisrv/ServiceDeps/viewergen/AppData--2.5-HE.zip b/zefie_wtvp_minisrv/ServiceDeps/viewergen/AppData--2.5-HE.zip new file mode 100644 index 00000000..76f8c5f1 Binary files /dev/null and b/zefie_wtvp_minisrv/ServiceDeps/viewergen/AppData--2.5-HE.zip differ diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/AppData--2.5.zip b/zefie_wtvp_minisrv/ServiceDeps/viewergen/AppData--2.5.zip similarity index 100% rename from zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/AppData--2.5.zip rename to zefie_wtvp_minisrv/ServiceDeps/viewergen/AppData--2.5.zip diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/HackersEdition_Setup.bmp.gz b/zefie_wtvp_minisrv/ServiceDeps/viewergen/HackersEdition_Setup.bmp.gz similarity index 100% rename from zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/HackersEdition_Setup.bmp.gz rename to zefie_wtvp_minisrv/ServiceDeps/viewergen/HackersEdition_Setup.bmp.gz diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/ResData--1.0.res.gz b/zefie_wtvp_minisrv/ServiceDeps/viewergen/ResData--1.0.res.gz similarity index 100% rename from zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/ResData--1.0.res.gz rename to zefie_wtvp_minisrv/ServiceDeps/viewergen/ResData--1.0.res.gz diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/ResData--1.1.res.gz b/zefie_wtvp_minisrv/ServiceDeps/viewergen/ResData--1.1.res.gz similarity index 100% rename from zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/ResData--1.1.res.gz rename to zefie_wtvp_minisrv/ServiceDeps/viewergen/ResData--1.1.res.gz diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/ResData--2.5.res.gz b/zefie_wtvp_minisrv/ServiceDeps/viewergen/ResData--2.5.res.gz similarity index 100% rename from zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/ResData--2.5.res.gz rename to zefie_wtvp_minisrv/ServiceDeps/viewergen/ResData--2.5.res.gz diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/SuperViewer_Setup.bmp.gz b/zefie_wtvp_minisrv/ServiceDeps/viewergen/SuperViewer_Setup.bmp.gz similarity index 100% rename from zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/SuperViewer_Setup.bmp.gz rename to zefie_wtvp_minisrv/ServiceDeps/viewergen/SuperViewer_Setup.bmp.gz diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/WebTVIntel--1.0-HE.exe.gz b/zefie_wtvp_minisrv/ServiceDeps/viewergen/WebTVIntel--1.0-HE.exe.gz similarity index 100% rename from zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/WebTVIntel--1.0-HE.exe.gz rename to zefie_wtvp_minisrv/ServiceDeps/viewergen/WebTVIntel--1.0-HE.exe.gz diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/WebTVIntel--1.0.exe.gz b/zefie_wtvp_minisrv/ServiceDeps/viewergen/WebTVIntel--1.0.exe.gz similarity index 100% rename from zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/WebTVIntel--1.0.exe.gz rename to zefie_wtvp_minisrv/ServiceDeps/viewergen/WebTVIntel--1.0.exe.gz diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/WebTVIntel--1.1.exe.gz b/zefie_wtvp_minisrv/ServiceDeps/viewergen/WebTVIntel--1.1.exe.gz similarity index 100% rename from zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/WebTVIntel--1.1.exe.gz rename to zefie_wtvp_minisrv/ServiceDeps/viewergen/WebTVIntel--1.1.exe.gz diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/WebTVIntel--2.5-HE.exe.gz b/zefie_wtvp_minisrv/ServiceDeps/viewergen/WebTVIntel--2.5-HE.exe.gz similarity index 100% rename from zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/WebTVIntel--2.5-HE.exe.gz rename to zefie_wtvp_minisrv/ServiceDeps/viewergen/WebTVIntel--2.5-HE.exe.gz diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/WebTVIntel--2.5.exe.gz b/zefie_wtvp_minisrv/ServiceDeps/viewergen/WebTVIntel--2.5.exe.gz similarity index 100% rename from zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/WebTVIntel--2.5.exe.gz rename to zefie_wtvp_minisrv/ServiceDeps/viewergen/WebTVIntel--2.5.exe.gz diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/readme_disksets.txt b/zefie_wtvp_minisrv/ServiceDeps/viewergen/readme_disksets.txt similarity index 100% rename from zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/readme_disksets.txt rename to zefie_wtvp_minisrv/ServiceDeps/viewergen/readme_disksets.txt diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/index.js b/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/index.js index 46dd618d..5b1a9e77 100644 --- a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/index.js +++ b/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/index.js @@ -1,6 +1,8 @@ var minisrv_service_file = true; var viewer = 2 // debug override +var viewergen_resource_dir = __dirname + "/" + minisrv_config.config.ServiceDeps + "/viewergen/"; + var viewers = { 0: "WebTVIntel--1.0.exe", 1: "WebTVIntel--1.1.exe", @@ -72,10 +74,10 @@ function getPatchDataType(type, invert = false) { function getResData(file) { var res_data = null; if (file.substr(-2, 2).toLowerCase() == "gz") { - var res_gz_data = fs.readFileSync(cwd + "/viewers/" + file); + var res_gz_data = fs.readFileSync(viewergen_resource_dir + file); res_data = zlib.gunzipSync(res_gz_data); } else { - res_data = fs.readFileSync(cwd + "/viewers/" + file); + res_data = fs.readFileSync(viewergen_resource_dir + file); } return res_data; } @@ -318,7 +320,7 @@ function buildProfile(build) { } var enable_full_hacktv = false; -if (fs.existsSync(cwd + path.sep + "viewers" + path.sep + "HackTV.zip")) { +if (fs.existsSync(viewergen_resource_dir + "HackTV.zip")) { enable_full_hacktv = true; disksets['99'] = "HackTV.zip"; } @@ -338,7 +340,7 @@ if (request_headers.query.viewer && headers = errpage[0]; data = errpage[1]; } else { - var viewer_gz_data = fs.readFileSync(cwd + "/viewers/" + viewer_file + ".gz"); + var viewer_gz_data = fs.readFileSync(viewergen_resource_dir + viewer_file + ".gz"); var viewer_data = zlib.gunzipSync(viewer_gz_data); var viewer_md5 = crypto.createHash('md5').update(viewer_data).digest("hex"); if (viewer_md5 != viewer_stock_md5s[viewer_file]) { @@ -378,13 +380,13 @@ Content-Disposition: attachment; filename="${viewer_file.replace(".exe", ".zip") zip.addZipComment("Viewer SSID: " + client_ssid); zip.addFile(viewer_file, patched_file); if (!request_headers.query.viewer_only) { - var romset_zip = new AdmZip(cwd + "/viewers/" + viewer_file.replace(".exe", "").replace("WebTVIntel", "AppData") + ".zip"); + var romset_zip = new AdmZip(viewergen_resource_dir + viewer_file.replace(".exe", "").replace("WebTVIntel", "AppData") + ".zip"); var zipEntries = romset_zip.getEntries(); zipEntries.forEach(function (zipEntry) { if (zipEntry.entryName == "Setup.bmp" && request_headers.query.logo) { var logo_file = logos[parseInt(request_headers.query.logo) || 0]; if (logo_file) { - var logo_gz_data = fs.readFileSync(cwd + "/viewers/" + logo_file + ".gz"); + var logo_gz_data = fs.readFileSync(viewergen_resource_dir + logo_file + ".gz"); var logo_data = zlib.gunzipSync(logo_gz_data); zip.addFile(zipEntry.entryName, logo_data); } else { @@ -397,7 +399,7 @@ Content-Disposition: attachment; filename="${viewer_file.replace(".exe", ".zip") if (request_headers.query.diskset) { var diskset_file = disksets[parseInt(request_headers.query.diskset) || 0]; if (diskset_file) { - var diskset_zip = new AdmZip(cwd + "/viewers/" + diskset_file); + var diskset_zip = new AdmZip(viewergen_resource_dir + diskset_file); var zipEntries = diskset_zip.getEntries(); zipEntries.forEach(function (zipEntry) { zip.addFile("Disk/" + zipEntry.entryName, zipEntry.getData()); diff --git a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/AppData--2.5-HE.zip b/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/AppData--2.5-HE.zip deleted file mode 100644 index 04bf0370..00000000 Binary files a/zefie_wtvp_minisrv/ServiceVault/http_pc/viewergen/viewers/AppData--2.5-HE.zip and /dev/null differ diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/noflash.js b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/noflash.js index e9f931c5..2f80f353 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/noflash.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/noflash.js @@ -29,7 +29,7 @@ wtv-client-time-zone: GMT -0000 wtv-client-time-dst-rule: GMT wtv-client-date: `+ strftime("%a, %d %b %Y %H:%M:%S", new Date(new Date().toUTCString())) + ` GMT`; - var file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_WTV_18006138199.tok"; + var file_path = __dirname + "/" + minisrv_config.config.ServiceDeps + "/wtv-1800/tellyscripts/bf0app/bf0app_WTV_18006138199.tok"; if (file_path) { request_is_async = true; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js index b14eba97..969d3f9b 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js @@ -77,22 +77,22 @@ if (session_data.data_store.wtvsec_login) { case "US-WEBSTAR-disk-0MB-16MB-softmodem-CPU5230": prereg_contype = "text/tellyscript"; // if wtv-open-access: true then client expects OpenISP - if (session_data.get("wtv-open-access")) file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_OpenISP_56k.tok"; - else var file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_WTV_18006138199.tok"; + if (session_data.get("wtv-open-access")) file_path = __dirname + "/" + minisrv_config.config.ServiceDeps + "/wtv-1800/tellyscripts/LC2/LC2_OpenISP_56k.tok"; + else var file_path = __dirname + "/" + minisrv_config.config.ServiceDeps + "/wtv-1800/tellyscripts/LC2/LC2_WTV_18006138199.tok"; break; case "US-DTV-disk-0MB-32MB-softmodem-CPU5230": if (wtvshared.isMiniBrowser(session_data)) { prereg_contype = "text/tellyscript"; - if (session_data.get("wtv-open-access")) file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_OpenISP_56k.tok"; - else file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_WTV_18006138199.tok"; + if (session_data.get("wtv-open-access")) file_path = __dirname + "/" + minisrv_config.config.ServiceDeps + "/wtv-1800/tellyscripts/LC2/LC2_OpenISP_56k.tok"; + else file_path = __dirname + "/" + minisrv_config.config.ServiceDeps + "/wtv-1800/tellyscripts/LC2/LC2_WTV_18006138199.tok"; } else { prereg_contype = "text/dialscript"; if (session_data.get("wtv-lan") == "true") { - file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/UTV/utv_hsd.tok"; + file_path = __dirname + "/" + minisrv_config.config.ServiceDeps + "/wtv-1800/tellyscripts/UTV/utv_hsd.tok"; } else { // todo OpenISP telly - file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/UTV/utv_normal.tok"; + file_path = __dirname + "/" + minisrv_config.config.ServiceDeps + "/wtv-1800/tellyscripts/UTV/utv_normal.tok"; } } break; @@ -100,8 +100,8 @@ if (session_data.data_store.wtvsec_login) { case "bf0app": prereg_contype = "text/tellyscript"; // if wtv-open-access: true then client expects OpenISP - if (session_data.get("wtv-open-access")) file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_OISP.tok"; - else file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_WTV_18006138199.tok"; + if (session_data.get("wtv-open-access")) file_path = __dirname + "/" + minisrv_config.config.ServiceDeps + "/wtv-1800/tellyscripts/bf0app/bf0app_OISP.tok"; + else file_path = __dirname + "/" + minisrv_config.config.ServiceDeps + "/wtv-1800/tellyscripts/bf0app/bf0app_WTV_18006138199.tok"; break; // the following are not yet zefie generated and may have an unknown username/password attached @@ -109,8 +109,8 @@ if (session_data.data_store.wtvsec_login) { case "JP-Fiji": prereg_contype = "text/tellyscript"; // if wtv-open-access: true then client expects OpenISP - if (session_data.get("wtv-open-access")) var file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/FIJI/dc_production_normal.tok"; - else var file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/FIJI/dc_production_normal.tok"; + if (session_data.get("wtv-open-access")) var file_path = __dirname + "/" + minisrv_config.config.ServiceDeps + "/wtv-1800/tellyscripts/FIJI/dc_production_normal.tok"; + else var file_path = __dirname + "/" + minisrv_config.config.ServiceDeps + "/wtv-1800/tellyscripts/FIJI/dc_production_normal.tok"; break; default: @@ -120,7 +120,7 @@ if (session_data.data_store.wtvsec_login) { if (socket.ssid.substr(0, 8) == "MSTVSIMU") { prereg_contype = "text/dialscript"; - var file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/UTV/utv_hsd.tok"; + var file_path = __dirname + "/" + minisrv_config.config.ServiceDeps + "/wtv-1800/tellyscripts/UTV/utv_hsd.tok"; } } @@ -129,7 +129,7 @@ if (session_data.data_store.wtvsec_login) { // assume old classic in flash mode, override user setting and send tellyscript // because it is required to proceed in flash mode prereg_contype = "text/tellyscript"; - var file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_WTV_18006138199.tok"; + var file_path = __dirname + "/" + minisrv_config.config.ServiceDeps + "/wtv-1800/tellyscripts/bf0app/bf0app_WTV_18006138199.tok"; var bf0app_update = true; session_data.set("bf0app_update", bf0app_update); } diff --git a/zefie_wtvp_minisrv/config.json b/zefie_wtvp_minisrv/config.json index 66870746..db18b2ec 100644 --- a/zefie_wtvp_minisrv/config.json +++ b/zefie_wtvp_minisrv/config.json @@ -6,6 +6,7 @@ "UserServiceVault", "ServiceVault" ], + "ServiceDeps": "ServiceDeps", "SessionStore": "SessionStore", "SharedROMCache": "SharedROMCache", "enable_shared_romcache": true,