zefie/minisrv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version bump

Browse Source 
- new homepage theme inspired by @GraspYonOx
- connect setup also mostly by @GraspYonOx
- some 'fixes' regarding module unloading, hopefully fixing call stack issue
- fixes to wtvshared.isAdmin() to not show log as if it was an access attempt
This commit is contained in:
zefie
2022-11-28 09:51:13 -05:00
parent 203bc73088
commit 12dfd49992
22 changed files with 469 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

588
zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js
View File

@@ -1,18 +1,12 @@
var minisrv_service_file = true; var minisrv_service_file = true;
if (request_headers.query.url) {
headers = `300 OK
Location: ${request_headers.query.url}`;
} else {
headers =`200 OK headers =`200 OK
Connection: Keep-Alive Connection: Keep-Alive
wtv-expire-all: wtv-home:/splash wtv-expire-all: wtv-home:/splash
wtv-expire-all: wtv-flashrom:
Content-type: text/html` Content-type: text/html`
var cryptstatus = (wtv_encrypted ? "Encrypted" : "Not Encrypted")
var comp_type = wtvmime.shouldWeCompress(session_data, 'text/html'); var cryptstatus = (wtv_encrypted ? "Encrypted" : "Not Encrypted")
var comp_type = wtvmime.shouldWeCompress(socket.ssid,'text/html');
var compstatus = "uncompressed"; var compstatus = "uncompressed";
switch (comp_type) { switch (comp_type) {
case 1: case 1:
@@ -23,370 +17,286 @@ Content-type: text/html`
break; break;
} }
var unread_mailcount = session_data.mailstore.countUnreadMessages(0) var wtv_system_sysconfig = session_data.get("wtv-system-sysconfig");
var mailbox_gif_num = 0; // no messages var wtv_client_bootrom_version = session_data.get("wtv-client-bootrom-version");
if (unread_mailcount > 0) { var wtv_system_chipversion_str = session_data.get("wtv-system-chipversion");
if (unread_mailcount == 1) mailbox_gif_num = 1;
else mailbox_gif_num = 2;
}
var notImplementedAlert = new clientShowAlert({
'image': minisrv_config.config.service_logo,
'message': "This feature is not available.",
'buttonlabel1': "Okay",
'buttonaction1': "client:donothing",
'noback': true,
}).getURL();
data = `<HTML> var notAdminAlert = new clientShowAlert({
<HEAD> 'image': minisrv_config.config.service_logo,
'message': "Sorry, you are not configured as an admin on this server.<br><br>If you are the server operator, please<br> see <strong>user_config.example.json</strong><br> for an example on how to configure yourself as an administrator.",
'buttonlabel1': "Ugh, fine.",
'buttonaction1': "client:donothing",
'noback': true,
}).getURL();
<TITLE>Home for ${session_data.getSessionData("subscriber_username") || "minisrv"}</TITLE> var ownMinisrv = new clientShowAlert({
<DISPLAY noscroll fontsize="medium"> 'image': minisrv_config.config.service_logo,
</HEAD> 'message': "To run your own minisrv, please visit the following link on your PC:<br><br><strong>https://zef.pw/minisrv</strong>",
'buttonlabel1': "Okay",
'buttonaction1': "client:donothing",
'noback': true,
}).getURL();
<body background="wtv-home:/images/BackgroundGradient_dark.gif" text="44cc55" link="36d5ff" vlink="36d5ff" hspace=0 vspace=0 > var supportZefieAlert = new clientShowAlert({
'image': minisrv_config.config.service_logo,
'message': "If you would like to support zefie or minisrv, please visit the following link on your PC:<br><br><font size=-1><strong>https://zef.pw/helpminisrv</strong></font>",
'buttonlabel1': "Okay",
'buttonaction1': "client:donothing",
'noback': true,
}).getURL();
<sidebar width=138> data =`\0<html>
<table cellspacing=0 cellpadding=0 bgcolor="202020" gradcolor=080808> <head>
<!-- BEGIN LOGO SPAN --> <display hspace=0 vspace=0 fontsize=small noscroll showwhencomplete>
<tr> <title>
<td width=138 absheight=112 valign=top align=center> Home for ${session_data.getSessionData("subscriber_username") || "minisrv"}
<img src="file://rom/Images/Spacer.gif" width=1 height=9><br> </title>
</head>
<a HREF="client:showservices"> <body bgcolor="#3C2F47" link=#BBAEC8 text="ffffff" vlink=AA9DB7>
<img src="file://rom/Images/Spacer.gif" width=1 height=2> <table border=0 cellspacing=0 cellpadding=0 width="100%" height="60" >
<img src="${minisrv_config.config.service_logo}"" width=127 height=98>
</A>
<!-- BEGIN SEPARATOR -->
<tr>
<td absheight=5>
<table cellspacing=0 cellpadding=0>
<tr>
<td abswidth=138 absheight=2 valign=middle align=center bgcolor="000000">
<img src="file://rom/Images/Spacer.gif" width=1 height=1>
<tr>
<td abswidth=138 absheight=1 valign=top align=left>
<tr>
<td abswidth=138 absheight=2 valign=top align=left bgcolor="181818">
<img src="file://rom/Images/Spacer.gif" width=1 height=1>
</table>
<!-- END LOGO SPAN -->
<!-- BEGIN SPAN -->
<tr>
<td absheight=25>
<table cellspacing=0 cellpadding=0>
<tr>
<td height=2>
<tr>
<td abswidth=7>
<td abswidth=125>
<table cellspacing=0 cellpadding=0 href="client:relogin">
<tr> <tr>
<td> <td>
<table cellspacing=0 cellpadding=0> <td align="left"><img src="images/proto3/HomeTopLeftEdge.gif"></td>
<td valign="top">
<table border=0 cellspacing=0 cellpadding=0>
<tr> <tr>
<td colspan=4 valign="top"><img src="images/proto3/HomeTopEdge.gif">
</tr>
<tr><td height=5 colspan=4>
</tr>
<tr><td></TD>
</tr>
<tr><td height=3 colspan=4>
</tr>
<tr>
<td align="left">
<font color=#EEEEEE>&nbsp;<b>WebTV URL, FILE, and CLIENT Access:</b></font>
<table border=0 cellspacing=0 cellpadding=0>
<tr>
<td width="380">
<form name="urlaccess">
&nbsp;<input type="text" name="visitsite" value="wtv-" border="1" bgcolor="#BBAEC8" text="#423852" cursor="#423852" align="center" width="314" executeurl autoactivate>
<input type="submit" value="Go" width=20>
</form>
</td>
</tr>
</table>
<td> <td>
<shadow><font size=3 color=e7ce4a>Login</font></shadow> <td width=5>
</tr>
</table> </table>
</td>
</tr>
</table> </table>
<td abswidth=6> <table background="images/proto3/HomeTaskBar.gif" bgcolor="#9486A1" border=0 width="" height="25">
<tr>
<td abswidth=1><spacer type=block height=3 width=1>
<td abswidth=50 bgcolor="#3C2F47" href="wtv-mail:/listmail" align="center"><spacer type=block height=3 width=100%><font color="#EEEEEE"><b>Mail</b></font>
<td abswidth=2><img src="images/proto3/HomeTaskBarDividers.gif">
<td abswidth=86 bgcolor="#3C2F47" href="wtv-favorite:/favorite" align="center"><spacer type=block height=3 width=100%><font color="#EEEEEE"><b>Favorites</b></font>
<td abswidth=2><img src="images/proto3/HomeTaskBarDividers.gif">
<td abswidth=70 bgcolor="#3C2F47" href="wtv-setup:/sound" align="center"><spacer type=block height=3 width=100%><font color="#EEEEEE"><b>Music</b></font>
<td abswidth=2><img src="images/proto3/HomeTaskBarDividers.gif">
<td abswidth=74 bgcolor="#3C2F47" href="http://frogfind.com" align="center"><spacer type=block height=3 width=100%><font color="#EEEEEE"><b>Search</b></font>
<td abswidth=2><img src="images/proto3/HomeTaskBarDividers.gif">
<td abswidth=60 bgcolor="#3C2F47" href="wtv-flashrom:/willie" align="center"><spacer type=block height=3 width=100%><font color="#EEEEEE"><b>ROMs</b></font>
<td abswidth=2><img src="images/proto3/HomeTaskBarDividers.gif">
<td abswidth=86 bgcolor="#3C2F47" href="wtv-setup:/setup" align="center"><spacer type=block height=3 width=100%><font color="#EEEEEE"><b>Settings</b></font>
<td abswidth=2><img src="images/proto3/HomeTaskBarDividers.gif">
<td abswidth=50 bgcolor="#3C2F47" href="wtv-guide:/help?topic=Index&subtopic=Glossary" align="center"><spacer type=block height=3 width=100%><font color="#EEEEEE"><b>Help</b></font>
</table> </table>
<!-- BEGIN SEPARATOR --> <table border=0 bgcolor="#3C2F47">
<tr> <tr>
<td absheight=5> <td valign="top">
<table cellspacing=0 cellpadding=0> <table border=0>
<tr> <tr>
<td abswidth=138 absheight=2 valign=middle align=center bgcolor="000000"> <td colspan=3>
<img src="file://rom/Images/Spacer.gif" width=1 height=1> <table bgcolor="#BBAEC8" border=0 cellspacing=0 cellpadding=0>
<tr> <tr>
<td abswidth=138 absheight=1 valign=top align=left> <td background="images/proto3/HomeColumn3Header.gif" abswidth="6">
<td abswidth=125 colspan=2 background="images/proto3/HomeColumn3Header.gif" valign="middle" absheight="26"><font size=2 color="#EEEEEE"><b>&#187; Community &#171;</b></font>
<tr> <tr>
<td abswidth=138 absheight=2 valign=top align=left bgcolor="181818"> <td colspan=3 height=7>
<img src="file://rom/Images/Spacer.gif" width=1 height=1>
<tr>
<td abswidth="6">
<td href="wtv-chat:/home" height="18" valign="middle" bgcolor="#BBAEC8"><font color="#454C73">&#128;&nbsp;</font><font color="#000000">Chat</font>
<tr>
<td absheight="3">
<tr>
<td abswidth="6">
<td href="wtv-news:/lobby" height="18" valign="middle" bgcolor="#BBAEC8"><font color="#454C73">&#128;&nbsp;</font><font color="#000000">Discuss</font>
<td abswidth="15">
<tr>
<td absheight="3">
<tr>
<td abswidth="6">
<td href="wtv-setup:/messenger" height="21" valign="middle" bgcolor="#BBAEC8"><font color="#454C73">&#128;&nbsp;</font><font color="#000000">Messenger</font>
<td abswidth="15">
<tr>
<td absheight="5">
</table> </table>
<!-- END SPAN -->
<!-- BEGIN SPAN -->
<tr> <tr>
<td absheight=25> <td valign="top" colspan=3>
<table cellspacing=0 cellpadding=0> <table bgcolor="#BBAEC8" border=0 cellspacing=0 cellpadding=0>
<tr> <tr>
<td height=2> <td background="images/proto3/HomeColumn3Header.gif" abswidth="6">
<td abswidth=125 colspan=2 background="images/proto3/HomeColumn3Header.gif" valign="middle" absheight="26" valign="top"><font size=2 color="#EEEEEE"><b>&#187; Account &#171;</b></font>
<tr> <tr>
<td abswidth=7> <td colspan=3 height=7>
<td abswidth=125>
<table cellspacing=0 cellpadding=0 href="wtv-setup:/setup">
<tr> <tr>
<td> <td abswidth="6">
<table cellspacing=0 cellpadding=0> <td href="client:relogin" height="21" valign="middle" bgcolor="#BBAEC8"><font color="#454C73">&#128;&nbsp;</font><font color="#000000">Relogin</font>
<td abswidth="6">
<tr> <tr>
<td> <td absheight="3">
<shadow><font size=3 color=e7ce4a>Setup</font></shadow>
</table>
</table>
<td abswidth=6>
</table>
<!-- BEGIN SEPARATOR -->
<tr> <tr>
<td absheight=5> <td abswidth="6">
<table cellspacing=0 cellpadding=0> <td href="wtv-setup:/serve-billing-overview" height="21" valign="middle" bgcolor="#BBAEC8"><font color="#454C73">&#128;&nbsp;</font><font color="#000000">Configure</font>
<td abswidth="6">
<tr> <tr>
<td abswidth=138 absheight=2 valign=middle align=center bgcolor="000000"> <td absheight="3">
<img src="file://rom/Images/Spacer.gif" width=1 height=1>
<tr> <tr>
<td abswidth=138 absheight=1 valign=top align=left> <td abswidth="6">
<td href="wtv-setup:/edit-password" height="21" valign="middle" bgcolor="#BBAEC8"><font color="#454C73">&#128;&nbsp;</font><font color="#000000">Password</font>
<td abswidth="6">
<tr> <tr>
<td abswidth=138 absheight=2 valign=top align=left bgcolor="181818"> <td absheight="3">
<img src="file://rom/Images/Spacer.gif" width=1 height=1>
</table>
<!-- END SPAN -->
<!-- BEGIN SPAN -->
<tr> <tr>
<td absheight=25> <td abswidth="6">
<table cellspacing=0 cellpadding=0> <td href="wtv-setup:/accounts" height="21" valign="middle" bgcolor="#BBAEC8"><font color="#454C73">&#128;&nbsp;</font><font color="#000000">Add User</font>
<td abswidth="6">
<tr> <tr>
<td height=2> <td absheight="3">
<tr> <tr>
<td abswidth=7> <td abswidth="6">
<td abswidth=125>
<table cellspacing=0 cellpadding=0 href="wtv-news:/lobby">
<tr>
<td>
<table cellspacing=0 cellpadding=0>
<tr>
<td>
<shadow><font size=3 color=e7ce4a>Discuss</font></shadow>
</table>
</table>
<td abswidth=6>
</table>
<!-- BEGIN SEPARATOR -->
<!-- BEGIN SEPARATOR -->
<tr>
<td absheight=5>
<table cellspacing=0 cellpadding=0>
<tr>
<td abswidth=138 absheight=2 valign=middle align=center bgcolor="000000">
<img src="file://rom/Images/Spacer.gif" width=1 height=1>
<tr>
<td abswidth=138 absheight=1 valign=top align=left>
<tr>
<td abswidth=138 absheight=2 valign=top align=left bgcolor="181818">
<img src="file://rom/Images/Spacer.gif" width=1 height=1>
</table>
<!-- END SPAN -->
`; `;
if (session_data.getSessionData("registered")) data += `<td href="wtv-tricks:/unregister" height="21" valign="middle" bgcolor="#BBAEC8"><font color="#454C73">&#128;&nbsp;</font><font color="#000000">Unregister</font>`;
else data += `<td href="wtv-tricks:/register" height="21" valign="middle" bgcolor="#BBAEC8"><font color="#454C73">&#128;&nbsp;</font><font color="#000000">Register</font>`
data += ` data += `
<!-- BEGIN SPAN --> <td abswidth="6">
<tr> <tr>
<td absheight=25> <td absheight="3">
<table cellspacing=0 cellpadding=0>
<tr>
<td height=2>
<tr>
<td abswidth=7>
<td abswidth=125>
<table cellspacing=0 cellpadding=0 href="wtv-guide:/help?topic=Index&subtopic=Glossary">
<tr>
<td>
<table cellspacing=0 cellpadding=0>
<tr>
<td>
<shadow><font size=3 color=e7ce4a>Help</font> <font size=-2 color=e7ce4a><sup>(WIP)</sup></font></shadow>
</table>
</table>
<td abswidth=6>
</table>
<!-- BEGIN SEPARATOR -->
<tr>
<td absheight=5>
<table cellspacing=0 cellpadding=0>
<tr>
<td abswidth=138 absheight=2 valign=middle align=center bgcolor="000000">
<img src="file://rom/Images/Spacer.gif" width=1 height=1>
<tr>
<td abswidth=138 absheight=1 valign=top align=left>
<tr>
<td abswidth=138 absheight=2 valign=top align=left bgcolor="181818">
<img src="file://rom/Images/Spacer.gif" width=1 height=1>
</table>
<!-- END SPAN -->
<!-- ADJUST ME FOR HOME TEXT HEIGHT -->
<tr>
<td absheight=28>
<tr>
<td align=right>
<img src="wtv-home:/images/HomeBanner_dark.gif" width=48 height=126>
<tr>
<td absheight=5>
</table>
</sidebar>
<table cellspacing=0 cellpadding=0 width=100% height=383>
<tr>
<td rowspan=10 background="wtv-home:/images/BackgroundGradientEdge_dark.gif" width=6 height=100%>
<tr>
<td valign=top absheight=113>
<table cellspacing=0 cellpadding=0 width=100%>
<tr>
<!-- BEGIN ICON #1 -->
<td width=9%>
<td absheight=113 width=18%>
<LINK REL=next HREF="wtv-mail:/listmail">
<table cellspacing=0 cellpadding=0 border=0 href="wtv-mail:/listmail" selected nocolor width=100%>
<tr>
<td height=10>
<tr>
<td align=center>
<img src="file://ROMCache/OpenMailbox${mailbox_gif_num}.gif" border=0 width=61 height=52>
<tr>
<td height=4>
<tr>
<td valign=bottom>
<table cellspacing=0 cellpadding=0 width=100%>
<tr>
<td align=center>
<font size=3 color=#36d5ff>Mail</font>
</table>
</table>
<!-- BEGIN ICON #2 -->
<td width=6%>
<td absheight=113 width=22%>
<table cellspacing=0 cellpadding=0 border=0 href="wtv-favorite:/favorite" nocolor>
<tr>
<td height=12>
<tr>
<td align=center>
<img src="file://ROMCache/TreasureChest1.gif" border=0 width=92 height=52>
<tr>
<td height=2>
<tr>
<td valign=bottom>
<table cellspacing=0 cellpadding=0 width=100%>
<tr>
<td align=center>
<font size=3 color=#36d5ff>Favorites</font>
</table>
</table>
<!-- BEGIN ICON #3 -->
<td width=5%>
<td absheight=113 width=19%>
<table cellspacing=0 cellpadding=0 border=0 href="wtv-flashrom:/willie" nocolor>
<tr>
<td height=5>
<tr>
<td align=center>
<img src="wtv-home:/images/rom.gif" border=0 width=68 height=59>
<tr>
<td height=2>
<tr>
<td valign=bottom>
<table cellspacing=0 cellpadding=0 width=100%>
<tr>
<td align=center>
<font size=3 color=#36d5ff>Flashroms</font>
</table>
</table>
<!-- BEGIN ICON #4 -->
<td absheight=113 width=3%>
<td absheight=113 width=20%>
<table cellspacing=0 cellpadding=0 border=0 href="http://duckduckgo.com/lite/" nocolor>
<tr>
<td height=12>
<tr>
<td align=center>
<img src="file://ROMCache/Binoculars0.gif" border=0 width=80 height=51>
<tr>
<td height=2>
<tr>
<td valign=bottom>
<table cellspacing=0 cellpadding=0 width=100%>
<tr>
<td align=center>
<font size=3 color=#36d5ff>Search</font>
</table>
</table>
<td width=9%>
</table>
<tr>
<td valign=middle align=center>
<!-- BEGIN MAIN SUB-CONTENT AREA -->
<table cellspacing=0 cellpadding=0 width=480>
<tr>
<td abswidth=100% absheight=18 align=center>
<font size="2"><b>Welcome to ${minisrv_config.config.service_name}`;
if (session_data.getSessionData("registered")) data += ", " + session_data.getSessionData("subscriber_username") + "!";
data += `</font></b>
<tr>
<td width=100% align=center absheight=2 bgcolor="000000">
<tr>
<td abswidth=100% absheight=16 valign=middle align=center>
<font size="small"><b>Status</b>: ${cryptstatus} (${compstatus})</font>
<tr>
<td width=100% align=center absheight=2 bgcolor="000000">
<tr>
<td abswidth=100% absheight=150 valign=top align=left>
<br>
<h4>&nbsp; Main Menu</h4>
<ul>
<font size="2"><li><a href="wtv-admin:/admin">wtv-admin</a> <sup>new!</sup></li>
`;
if (session_data.hasCap("client-can-do-chat")) {
data += "<li><a href=\"wtv-chat:/home\">IRC Chat Test</a></li>\n"
}
if (session_data.hasCap("client-has-disk")) {
// only show disk stuff if client has disk
data += "<li><a href=\"client:diskhax\">DiskHax</a> ~ <a href=\"client:vfathax\">VFatHax</a></li>\n";
if (session_data.hasCap("client-can-do-macromedia-flash2")) {
// only show demo if client can do flash2
data += "<li>Old DealerDemo: <a href=\"wtv-disk:/sync?group=DealerDemo&diskmap=DealerDemo\">Download</a> ~ <a href=\"file://Disk/Demo/index.html\">Access</a></li>\n";
}
}
data += `</ul></font>`;
// for development
if (fs.existsSync(service_vaults[0] + "/" + service_name + "/home.zefie.html")) {
data += fs.readFileSync(service_vaults[0] + "/" + service_name + "/home.zefie.html", { 'encoding': 'utf8' });
}
data += `</table>
<tr>
<td width=100% absheight=28>
<tr>
<td width=100% align=center absheight=2 bgcolor="000000">
<tr>
<td width=100% align=center absheight=22>
<font size="-4"><b>Connection Speed</b>: &rate;</font>
<tr>
<td width=100% align=center absheight=2 bgcolor="000000">
<tr>
<td width=100% align=right absheight=20>
<font size="-4"><i>minisrv v${minisrv_config.version}${(minisrv_config.config.git_commit) ? ' git-' + minisrv_config.config.git_commit : ''}, hosted by ${minisrv_config.config.service_owner}</i></small></font> &nbsp; <br>
<tr>
<td width=100% align=center absheight=2 bgcolor="000000">
</table> </table>
</table> </table>
</body> <td valign="top">
</html>` <table border=0 width=100%>
}
<tr>
<td align="left" colspan=4>
<table border=0 cellspacing=0 cellpadding=0 width="100%">
<tr>
<td background="images/proto3/HomeColumn3Header.gif" abswidth="6">
<td colspan=2 background="images/proto3/HomeColumn3Header.gif" valign="middle" absheight="24"><font color="#EEEEEE"><spacer type=block height=3 width=100%><b> &#128; Welcome to zefie's minisrv ${minisrv_version_string.split(" ")[3]}</b></font>
<tr>
<td absheight="6">
<tr>
<td valign="top" colspan=3 absheight=63>
This server is operated by ${minisrv_config.config.service_owner}.
</table>
<tr>
<td align="left" colspan=4>
<table border=0 cellspacing=0 cellpadding=0 width="100%">
<tr>
<td height=6> <tr>
<td background="images/proto3/HomeColumn3Header.gif" abswidth="6">
<td colspan=2 background="images/proto3/HomeColumn3Header.gif" valign="middle" absheight="24"><font color="#EEEEEE"><spacer type=block height=3 width=100%><b> &#128; minisrv Latest Updates</b></font>
<tr>
<td absheight="6">
<tr>
<td valign="top" colspan=4 absheight=80 >
&#149;&nbsp; Added a <a href="wtv-tricks:/charmap">WebTV Character Map</a><br>
&#149;&nbsp; Redesigned homepage based on MattMan69's HackTV<br>
&#149;&nbsp; Added a new minisrv logo<br>
</table>
</table>
<td valign="top">
<table border=0 width=160>
<tr>
<td valign="top" colspan=3>
<table bgcolor="#BBAEC8" border=0 cellspacing=0 cellpadding=0>
<tr>
<td background="images/proto3/HomeColumn3Header.gif" abswidth="6">
<td abswidth=125 colspan=2 background="images/proto3/HomeColumn3Header.gif" valign="middle" absheight="24" valign="top"><font size=2 color="#EEEEEE"><b>&#187; Tools &#171;</b></font>
<tr>
<td colspan=3 height=6>
<tr>
<td abswidth="6">
<td href="wtv-tricks:/tricks" height="21" valign="middle" bgcolor="#BBAEC8"><font color="#454C73">&#128;&nbsp;</font><font color="#000000">WTV Tricks</font>
<td abswidth="6">
<tr>
<td absheight="3">
<tr>
<td abswidth="6">
<td href="${(wtvshared.isAdmin(session_data)) ? "wtv-admin:/admin" : notAdminAlert}" height="21" valign="middle" bgcolor="#BBAEC8"><font color="#454C73">&#128;&nbsp;</font><font color="#000000">WTV Admin</font>
<td abswidth="6">
<tr>
<td absheight="3">
<tr>
<td abswidth="6">
<td href="wtv-tricks:/blastbacklist?return_to=wtv-home:/home" height="21" valign="middle" bgcolor="#BBAEC8"><font color="#454C73">&#128;&nbsp;</font><font color="#000000">Clear Cache</font>
<td abswidth="6">
<tr>
<td absheight="3">
</table>
<tr>
<td valign="top" colspan=3>
<table bgcolor="#BBAEC8" border=0 cellspacing=0 cellpadding=0>
<tr>
<td background="images/proto3/HomeColumn3Header.gif" abswidth="6">
<td abswidth=125 colspan=2 background="images/proto3/HomeColumn3Header.gif" valign="middle" absheight="24" valign="top"><font size=2 color="#EEEEEE"><b>&#187; More Stuff &#171;</b></font>
<tr>
<td colspan=3 height=7>
<tr>
<td abswidth="6">
<td href="wtv-tricks:/cSetup" height="21" valign="middle" bgcolor="#BBAEC8"><font color="#454C73">&#128;&nbsp;</font><font color="#000000">Switch<br>&nbsp;&nbsp; server</font>
<td abswidth="6">
<tr>
<td absheight="5">
<tr>
<td abswidth="6">
<td href="${ownMinisrv}" height="21" valign="middle" bgcolor="#BBAEC8"><font color="#454C73">&#128;&nbsp;</font><font color="#000000">Run your<br>&nbsp;&nbsp; own server</font>
<td abswidth="6">
<tr>
<td absheight="5">
<tr>
<td abswidth="6">
<td href="http://archive.midnightchannel.net/zefie/media/" height="21" valign="middle" bgcolor="#BBAEC8"><font color="#454C73">&#128;&nbsp;</font><font color="#000000">Midnight<br>&nbsp;&nbsp; Archives</font>
<td abswidth="15">
<tr>
<td absheight="4">
<tr>
<td abswidth="6">
<td href="${supportZefieAlert}" height="21" valign="middle" bgcolor="#BBAEC8"><font color="#454C73">&#128;&nbsp;</font><font color="#000000">Help zefie</font>
<td abswidth="15">
<tr>
<td absheight="3">
</table>
</table>
</table>
`
data += "</body>\n</html>";

BIN
zefie_wtvp_minisrv/ServiceVault/wtv-home/images/proto3/HomeColumn1Header.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 227 B

BIN
zefie_wtvp_minisrv/ServiceVault/wtv-home/images/proto3/HomeColumn2Header.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 205 B

BIN
zefie_wtvp_minisrv/ServiceVault/wtv-home/images/proto3/HomeColumn3Header.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 169 B

BIN
zefie_wtvp_minisrv/ServiceVault/wtv-home/images/proto3/HomeColumn3Top.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 374 B

BIN
zefie_wtvp_minisrv/ServiceVault/wtv-home/images/proto3/HomeMainSearchButton.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 442 B

BIN
zefie_wtvp_minisrv/ServiceVault/wtv-home/images/proto3/HomeShoppingSearchButton.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 284 B

BIN
zefie_wtvp_minisrv/ServiceVault/wtv-home/images/proto3/HomeTaskBar.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 647 B

BIN
zefie_wtvp_minisrv/ServiceVault/wtv-home/images/proto3/HomeTaskBar1.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 655 B

BIN
zefie_wtvp_minisrv/ServiceVault/wtv-home/images/proto3/HomeTaskBarDividers.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 40 B

BIN
zefie_wtvp_minisrv/ServiceVault/wtv-home/images/proto3/HomeTopEdge.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
zefie_wtvp_minisrv/ServiceVault/wtv-home/images/proto3/HomeTopLeftEdge.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
zefie_wtvp_minisrv/ServiceVault/wtv-home/images/proto3/HomeTopLeftEdgeBLANK.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
zefie_wtvp_minisrv/ServiceVault/wtv-home/images/proto3/circlearrow.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 340 B

168
zefie_wtvp_minisrv/ServiceVault/wtv-tricks/cSetup.js Normal file
View File

@@ -0,0 +1,168 @@
var minisrv_service_file = true;
headers = `200 OK
Content-Type: text/html`
data = `<html>
<head>
<title>Connect Setup v2.2-minisrv</title>
<DISPLAY noscroll allowoffline notvaudio switchtowebmode>
</head>
<body bgcolor="#3C2F47" text="#cbcbcb" link="#aaaaaa"
hspace="0" vspace="0" fontsize="large" noscroll hideoptions>
<table cellspacing="0" cellpadding="0" cellborder="0">
<tr>
<td background="cSetup/cSetupShadowLogo.jpg" width="104" height="80" valign="top" align="left"><spacer type="block" WIDTH="11" HEIGHT="11"><br>
<spacer type="block" WIDTH="10" HEIGHT="1"> <a href="wtv-home:/home"><img src="${minisrv_config.config.service_logo}" width="87"
height="67"></a>
</td>
<td width="456" height="80" valign="middle" align="center">
<br><h2>
&nbsp;Connection Setup v2.2-minisrv
</h2>
</td>
</tr>
<tr><td colspan=4><hr>
<tr><td absheight=6>
</table>
<script>
function doConnect() {
if (document.connect.machine.value == "${minisrv_config.services['wtv-1800'].host}" && document.connect.port.value == "${minisrv_config.services['wtv-1800'].port}") {
alert("You are already here!");
} else {
document.connect.submit();
location.href = "client:activ";
}
}
function updateService() {
srv = document.connect.preset[document.connect.preset.selectedIndex].value;
switch (srv) {
case "mattman69":
document.connect.machine.value="74.76.120.18"
document.connect.port.value="1615"
document.message.msg.value="This is MattMan69's Public HackTV minisrv, all are welcome to connect and enjoy the wonders of WebTV. Offers a custom experience."
break;
case "zefie":
document.connect.machine.value="51.222.164.146"
document.connect.port.value="1615"
document.message.msg.value="This is zefie's public minisrv, for those who want the vanilla minisrv experience."
break;
case "local":
document.connect.machine.value="127.0.0.1"
document.connect.port.value="1615"
document.message.msg.value='Connect to your server via localhost. This option is for users running their own server, and connecting with the Viewer.'
break;
case "wni-prod":
document.connect.machine.value="10.0.0.1"
document.connect.port.value="1615"
document.message.msg.value='Default WebTV Production IP/Port. Can be used to check your routing setup.'
break;
case "wni-int":
document.connect.machine.value="10.0.128.1"
document.connect.port.value="1615"
document.message.msg.value='Default WebTV Internal IP/Port. Can be used to check your routing setup.'
break;
case "jarhead":
document.message.msg.value="Jarhead\'s public minisrv, offers the most production-like WebTV service, to simulate how it was like back then."
alert("Coming soon!")
document.connect.preset.selectedIndex = document.connect.preset.selectedIndex - 1;
updateService();
}
}
</script>
<form name="connect" action="client:ConfirmConnectSetup">
<table width=100% cellspacing=1 cellpadding=0>
<tr>
<td colspan=3>
&nbsp;<font color=#4489a8>Presets:</font>
</td>
<td><spacer W=24 type=block>
<select width="440" name="preset" onchange="updateService()" selected>
<option value="mattman69" selected>MattMan69's HackTV minisrv</option>
<option value="zefie">zefie's minisrv</option>
<option value="jarhead">JarHead's WebTV Recreation Server</option>
<option value="local">Your local minisrv</option>
<option value="wni-prod">WebTV Production Default</option>
<option value="wni-int">WebTV Internal Default</option>
</select>
<tr><td absheight=6>
</table>
<hr>
<table width=100% cellspacing=1 cellpadding=0>
<tr>
<td height=6>
<tr>
<td colspan=3>
&nbsp;<font color=#4489a8>Service:</font>
<tr>
<td width=15></td>
<td height=2>
<tr>
<td height=2>
<tr>
<td>
<td>
<input name=serviceType type=radio bgcolor=#444444 value=custom checked>
<td>
&nbsp;Custom:&nbsp;&nbsp;&nbsp;
<td>
Address:
<input size=16 ASCIIONLY name=machine bgcolor=#444444 text=#cbcbcb cursor=#cc9933 value="74.76.120.18">
&nbsp;&nbsp;&nbsp;Port:
<input size=5 ASCIIONLY NUMBERS name=port bgcolor=#444444 text=#cbcbcb cursor=#cc9933 value="1615">
</table>
<spacer type=block height="8">
<hr>
<table cellspacing=1 cellpadding=0>
<tr>
<td height=8>
<tr>
<td colspan=3>
&nbsp;<font color=#4489a8>Description:</font><br><br>
<tr>
<td width=20>
<td width=390 align=left valign=top>
<form name=message>
<textarea rows=4 size=46 text=#cbcbcb id=msg name=msg border="0" bgcolor=#3C2F47 value='This is the public HackTV minisrv, all are welcome to connect and enjoy the wonders of WebTV. Custom experience!' nohighlight noselect>
</textarea>
</form>
<td>
<td width=100% align=right valign=top>
<form action="client:GoToPhoneSetup">
<font color="#E7CE4A" size=-2><shadow>&nbsp;
<input
type=submit
borderimage="file://ROM/tvimages/TVButtonBorder.bif"
value="Phone Settings"
name="Phone Settings"
usestyle
width=170> &nbsp;
</shadow></font>
</form>
<spacer type=block height="60">
<font color="#E7CE4A" size=-2><shadow>&nbsp;
<input type=hidden name=useEncryption value=true checked>
<input
type=button
borderimage="file://ROM/tvimages/TVButtonBorder.bif"
value="Connect"
name="Connect"
onclick="doConnect()"
usestyle
width=170> &nbsp;
</shadow></font>
</table>
</form>
</body>
</html>`;

BIN
zefie_wtvp_minisrv/ServiceVault/wtv-tricks/cSetup/Pattern_Games.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 132 B

BIN
zefie_wtvp_minisrv/ServiceVault/wtv-tricks/cSetup/cSetupShadowLogo.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 84 B

8
zefie_wtvp_minisrv/app.js
View File

@@ -307,12 +307,7 @@ var runScriptInVM = function (script_data, user_contextObj = {}, privileged = fa
} }
// unload any loaded modules for this vm // unload any loaded modules for this vm
if (modules_loaded.length > 0) { modules_loaded = null;
Object.keys(modules_loaded).forEach(function (k) {
wtvshared.unloadModule(modules_loaded[k]);
})
}
return contextObj; // updated context object with whatever global varibles the script set return contextObj; // updated context object with whatever global varibles the script set
} }
@@ -1964,6 +1959,7 @@ Object.keys(minisrv_config.services).forEach(function (k) {
} }
} }
} }
}) })
if (minisrv_config.config.hide_ssid_in_logs) console.log(" * Masking SSIDs in console logs for security"); if (minisrv_config.config.hide_ssid_in_logs) console.log(" * Masking SSIDs in console logs for security");
else console.log(" * Full SSIDs will be shown in console logs"); else console.log(" * Full SSIDs will be shown in console logs");

6
zefie_wtvp_minisrv/includes/WTVAdmin.js
View File

@@ -72,7 +72,7 @@ class WTVAdmin {
} }
} }
isAuthorized() { isAuthorized(justchecking = false) {
var allowed_ssid = false; var allowed_ssid = false;
var allowed_ip = false; var allowed_ip = false;
if (this.minisrv_config.services[this.service_name].authorized_ssids) { if (this.minisrv_config.services[this.service_name].authorized_ssids) {
@@ -95,8 +95,12 @@ class WTVAdmin {
} }
}); });
} }
if (justchecking) {
return (allowed_ssid && allowed_ip) ? true : false;
} else {
return (allowed_ssid && allowed_ip) ? true : this.rejectConnection(!allowed_ssid); return (allowed_ssid && allowed_ip) ? true : this.rejectConnection(!allowed_ssid);
} }
}
getAccountInfo(username, directory = null) { getAccountInfo(username, directory = null) {
var search_dir = this.minisrv_config.config.SessionStore + this.path.sep + "accounts"; var search_dir = this.minisrv_config.config.SessionStore + this.path.sep + "accounts";

14
zefie_wtvp_minisrv/includes/WTVShared.js
View File

@@ -72,6 +72,14 @@ class WTVShared {
return src; return src;
} }
isAdmin(wtvclient, service_name = "wtv-admin") {
var WTVAdmin = require("./WTVAdmin.js");
var wtva = new WTVAdmin(this.minisrv_config, wtvclient, service_name);
var result = wtva.isAuthorized(true);
wtva, WTVAdmin = null;
return result;
}
parseJSON(json) { parseJSON(json) {
if (!json) return null; if (!json) return null;
if (typeof json !== 'string') json = json.toString(); if (typeof json !== 'string') json = json.toString();
@@ -912,12 +920,6 @@ class WTVShared {
}); });
return outdata; return outdata;
} }
isAdmin(wtvclient, service_name = "wtv-admin") {
var WTVAdmin = require("./WTVAdmin.js");
var wtva = new WTVAdmin(this.minisrv_config, wtvclient, service_name);
return (wtva.isAuthorized() === true) ? true : false;
}
} }
class clientShowAlert { class clientShowAlert {

2
zefie_wtvp_minisrv/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "zefie_wtvp_minisrv", "name": "zefie_wtvp_minisrv",
"version": "0.9.35", "version": "0.9.36",
"description": "WebTV Service (WTVP) Emulation Server", "description": "WebTV Service (WTVP) Emulation Server",
"main": "app.js", "main": "app.js",
"homepage": "https://github.com/zefie/zefie_wtvp_minisrv", "homepage": "https://github.com/zefie/zefie_wtvp_minisrv",

4
zefie_wtvp_minisrv/zefie_wtvp_minisrv.njsproj
View File

@@ -1028,6 +1028,10 @@
<Content Include="ServiceVault\wtv-star\star.js" /> <Content Include="ServiceVault\wtv-star\star.js" />
<Content Include="ServiceVault\wtv-tricks\access.js" /> <Content Include="ServiceVault\wtv-tricks\access.js" />
<Content Include="ServiceVault\wtv-tricks\blastbacklist.js" /> <Content Include="ServiceVault\wtv-tricks\blastbacklist.js" />
<Content Include="ServiceVault\wtv-tricks\charmap.js">
<SubType>Code</SubType>
</Content>
<Content Include="ServiceVault\wtv-tricks\cSetup.js" />
<Content Include="ServiceVault\wtv-tricks\go-offline.js" /> <Content Include="ServiceVault\wtv-tricks\go-offline.js" />
<Content Include="ServiceVault\wtv-tricks\info.js"> <Content Include="ServiceVault\wtv-tricks\info.js">
<SubType>Code</SubType> <SubType>Code</SubType>