@@ -271,6 +369,7 @@
var features = {{{features}}};
var attemptWebRTC = ((features & 128) != 0);
var StatusStrs = ['Disconnected', 'Connecting...', 'Setup...', 'Connected', 'Intel® AMT Connected'];
+ var files;
function startup() {
if ((features & 32) == 0) {
@@ -617,8 +716,9 @@
}
function updateFooterMenu(options) {
- var x = '', count = 0;
- if (options != null) { for (var i in options) { x += '
' + options[i].n; count++; } }
+ while (options != null && options.length < 3) { options.push( { n:'' } ); }
+ var x = '', prev = '';
+ if (options != null) { for (var i in options) { x += '
";
+ } else {
+ var link = shortname;
+ if (f.s > 0) { link = "" + shortname + ""; }
+ h = "
" + fsize + "" + link + "
";
+ }
+
+ if (f.t < 3) { html1 += h; } else { html2 += h; }
+ }
+
+ // Display the files and path
+ QH('p13files', html1 + html2);
+ QH('p13currentpath', displayPath);
+ QE('p13FolderUp', p13filetreelocation.length != 0);
+
+ // Re-check all boxes if needed using names
+ if (checkedNames != null) { var checkboxes = document.getElementsByName('fd'); for (var i = 0; i < checkboxes.length; i++) { if (checkedNames.indexOf(p13filetree.dir[checkboxes[i].value].n) >= 0) { checkboxes[i].checked = true; } } }
+
+ // Update the actions buttons
+ p13setActions();
+ }
+
+ function p13folderset(x) {
+ p13targetpath = joinPaths(p13filetree.path, p13filetree.dir[x].n).split('\\').join('/');
+ files.send(JSON.stringify({ action: 'ls', reqid: 1, path: p13targetpath }));
+ }
+
+ function p13folderup(x) {
+ if (x == null) { p13filetreelocation.pop(); } else { while (p13filetreelocation.length > x) { p13filetreelocation.pop(); } }
+ p13targetpath = p13filetreelocation.join('/');
+ files.send(JSON.stringify({ action: 'ls', reqid: 1, path: p13targetpath }));
+ }
+
+ var p13sortorder;
+ function p13sort_filename(a, b) { if (a.ln > b.ln) return (1 * p13sortorder); if (a.ln < b.ln) return (-1 * p13sortorder); return 0; }
+ function p13sort_timestamp(a, b) { if (a.d > b.d) return (1 * p13sortorder); if (a.d < b.d) return (-1 * p13sortorder); return 0; }
+ function p13sort_bysize(a, b) { if (a.s == b.s) return p13sort_filename(a, b); return (((a.s - b.s)) * p13sortorder); }
+
+ function p13sort_files(files) {
+ var r = [], sortselection = Q('p13sortdropdown').value;
+ for (var i in files) { files[i].nx = i; if (files[i].s == null) { files[i].s = 0; } if (files[i].n == null) { files[i].n = i; } files[i].ln = files[i].n.toLowerCase(); r.push(files[i]); }
+ p13sortorder = 1;
+ if (sortselection > 3) { p13sortorder = -1; sortselection -= 3; }
+ if (sortselection == 1) { r.sort(p13sort_filename); }
+ else if (sortselection == 2) { r.sort(p13sort_bysize); }
+ else if (sortselection == 3) { r.sort(p13sort_timestamp); }
+ return r;
+ }
+
+ function p13setActions() {
+ if (p13filetree == null) {
+ QE('p13DeleteFileButton', false);
+ QE('p13NewFolderButton', false);
+ QE('p13UploadButton', false);
+ QE('p13RenameFileButton', false);
+ QE('p13SelectAllButton', false);
+ Q('p13SelectAllButton').value = 'All';
+ QE('p13RefreshButton', false);
+ QE('p13CutButton', false);
+ QE('p13CopyButton', false);
+ QE('p13PasteButton', false);
+ } else {
+ var cc = p13getFileSelCount(), tc = p13getFileCount(), sfc = p13getFileSelCount(false); // In order: number of entires selected, number of total entries, number of selected entires that are files (not folders)
+ var winAgent = ((currentNode.agent.id > 0) && (currentNode.agent.id < 5));
+ QE('p13DeleteFileButton', (cc > 0) && ((p13filetreelocation.length > 0) || (winAgent == false)));
+ QE('p13NewFolderButton', ((p13filetreelocation.length > 0) || (winAgent == false)));
+ QE('p13UploadButton', ((p13filetreelocation.length > 0) || (winAgent == false)));
+ QE('p13RenameFileButton', (cc == 1) && ((p13filetreelocation.length > 0) || (winAgent == false)));
+ QE('p13SelectAllButton', tc > 0);
+ Q('p13SelectAllButton').value = (cc > 0 ? 'None' : 'All');
+ QE('p13RefreshButton', true);
+ QE('p13CutButton', (cc > 0) && (cc == sfc) && ((p13filetreelocation.length > 0) || (winAgent == false)));
+ QE('p13CopyButton', (cc > 0) && (cc == sfc) && ((p13filetreelocation.length > 0) || (winAgent == false)));
+ QE('p13PasteButton', ((p13filetreelocation.length > 0) || (winAgent == false)) && ((p13clipboard != null) && (p13clipboard.length > 0)));
+ }
+ }
+
+ function p13getFileSelCount(includeDirs) { var cc = 0; var checkboxes = document.getElementsByName('fd'); for (var i = 0; i < checkboxes.length; i++) { if ((checkboxes[i].checked) && ((includeDirs != false) || (checkboxes[i].attributes.file.value == "3"))) cc++; } return cc; }
+ function p13getFileCount() { var cc = 0; var checkboxes = document.getElementsByName('fd'); return checkboxes.length; }
+ function p13selectallfile() { var nv = (p13getFileSelCount() == 0), checkboxes = document.getElementsByName('fd'); for (var i = 0; i < checkboxes.length; i++) { checkboxes[i].checked = nv; } p13setActions(); }
+ function p13createfolder() { setDialogMode(2, "New Folder", 3, p13createfolderEx, ''); focusTextBox('p13renameinput'); p13fileNameCheck(); }
+ function p13createfolderEx() { files.send(JSON.stringify({ action: 'mkdir', reqid: 1, path: p13filetreelocation.join('/') + '/' + Q('p13renameinput').value })); p13folderup(999); }
+ function p13deletefile() { var cc = getFileSelCount(); setDialogMode(2, "Delete", 3, p13deletefileEx, (cc > 1)?('Delete ' + cc + ' selected items?'):('Delete selected item?')); }
+ function p13deletefileEx() { var delfiles = [], checkboxes = document.getElementsByName('fd'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { delfiles.push(p13filetree.dir[checkboxes[i].value].n); } } files.send(JSON.stringify({ action: 'rm', reqid: 1, path: p13filetreelocation.join('/'), delfiles: delfiles })); p13folderup(999); }
+ function p13renamefile() { var renamefile, checkboxes = document.getElementsByName('fd'); for (var i = 0; i < checkboxes.length; i++) { if (checkboxes[i].checked) { renamefile = p13filetree.dir[checkboxes[i].value].n; } } setDialogMode(2, "Rename", 3, p13renamefileEx, '', { action: 'rename', path: p13filetreelocation.join('/'), oldname: renamefile}); focusTextBox('p13renameinput'); p13fileNameCheck(); }
+ function p13renamefileEx(b, t) { t.newname = Q('p13renameinput').value; files.send(JSON.stringify(t)); p13folderup(999); }
+ function p13fileNameCheck(e) { var x = isFilenameValid(Q('p13renameinput').value); QE('idx_dlgOkButton', x); if ((x == true) && (e != null) && (e.keyCode == 13)) { dialogclose(1); } }
+ function p13uploadFile() { setDialogMode(2, "Upload File", 3, p13uploadFileEx, ''); updateUploadDialogOk('p13uploadinput'); }
+ function p13uploadFileEx() { p13doUploadFiles(Q('p13uploadinput').files); }
+
+ var p13clipboard = null, p13clipboardFolder = null, p13clipboardCut = 0;
+ function p13copyFile(cut) { var checkboxes = document.getElementsByName('fd'); p13clipboard = []; p13clipboardCut = cut, p13clipboardFolder = p13targetpath; for (var i = 0; i < checkboxes.length; i++) { if ((checkboxes[i].checked) && (checkboxes[i].attributes.file.value == "3")) { p13clipboard.push(p13filetree.dir[checkboxes[i].value].n); } } p13updateClipview(); }
+ function p13pasteFile() { var x = ''; if ((p13clipboard != null) && (p13clipboard.length > 0)) { x = 'Confim ' + (p13clipboardCut == 0?'copy':'move') + ' of ' + p13clipboard.length + ' entrie' + ((p13clipboard.length > 1)?'s':'') + ' to this location?' } setDialogMode(2, "Paste", 3, p13pasteFileEx, x); }
+ function p13pasteFileEx() { files.send(JSON.stringify({ action: (p13clipboardCut == 0?'copy':'move'), reqid: 1, scpath: p13clipboardFolder, dspath: p13targetpath, names: p13clipboard })); p13folderup(999); if (p13clipboardCut == 1) { p13clipboard = null, p13clipboardFolder = null, p13clipboardCut = 0; p13updateClipview(); } }
+ function p13updateClipview() { var x = ''; if ((p13clipboard != null) && (p13clipboard.length > 0)) { x = 'Holding ' + p13clipboard.length + ' entrie' + ((p13clipboard.length > 1)?'s':'') + ' for ' + (p13clipboardCut == 0?'copy':'move') + ', Clear.' } QH('p13bottomstatus', x); p13setActions(); }
+ function p13clearClip() { p13clipboard = null; p13clipboardFolder = null; p13clipboardCut = 0; p13updateClipview(); }
+ function updateUploadDialogOk(x) { QE('idx_dlgOkButton', Q(x).value != ''); }
+ function getFileSelCount(includeDirs) { var cc = 0; var checkboxes = document.getElementsByName('fc'); for (var i = 0; i < checkboxes.length; i++) { if ((checkboxes[i].checked) && ((includeDirs != false) || (checkboxes[i].attributes.file.value == "3"))) cc++; } return cc; }
+ function getFileCount() { var cc = 0; var checkboxes = document.getElementsByName('fc'); return checkboxes.length; }
+
+ //
+ // FILES DOWNLOAD
+ //
+
+ var downloadFile; // Global state for file download
+
+ // Called by the html page to start a download, arguments are: path, file name and file size.
+ function p13downloadfile(x, y, z) {
+ if (xxdialogMode || downloadFile || !files) return;
+ downloadFile = { path: decodeURIComponent(x), file: decodeURIComponent(y), size: z, tsize: 0, data: '', state: 0, id: Math.random() }
+ //console.log('p13downloadFileCancel', downloadFile);
+ files.send(JSON.stringify({ action: 'download', sub: 'start', id: downloadFile.id, path: downloadFile.path }));
+ setDialogMode(2, "Download File", 10, p13downloadFileCancel, '
' + downloadFile.file + '
');
+ }
+
+ // Called by the html page to cancel the download
+ function p13downloadFileCancel() { setDialogMode(0); files.send(JSON.stringify({ action: 'download', sub: 'cancel', id: downloadFile.id })); downloadFile = null; }
+
+ // Called by the transport when download control command is received
+ function p13gotDownloadCommand(cmd) {
+ //console.log('p13gotDownloadCommand', cmd);
+ if ((downloadFile == null) || (cmd.id != downloadFile.id)) return;
+ if (cmd.sub == 'start') { downloadFile.state = 1; files.send(JSON.stringify({ action: 'download', sub: 'startack', id: downloadFile.id })); }
+ else if (cmd.sub == 'cancel') { downloadFile = null; setDialogMode(0); }
+ }
+
+ // Called by the transport when binary data is received
+ function p13gotDownloadBinaryData(data) {
+ if (!downloadFile || downloadFile.state == 0) return;
+ if (data.length > 4) {
+ downloadFile.tsize += (data.length - 4); // Add to the total bytes received
+ downloadFile.data += data.substring(4); // Append the data
+ Q('d2progressBar').value = downloadFile.tsize; // Change the progress bar
+ }
+ if ((ReadInt(data, 0) & 1) != 0) { // Check end flag
+ saveAs(data2blob(downloadFile.data), downloadFile.file); downloadFile = null; setDialogMode(0); // Save the file
+ } else {
+ files.send(JSON.stringify({ action: 'download', sub: 'ack', id: downloadFile.id })); // Send the ACK
+ }
+ }
+
+ /*
+ var downloadFile; // Global state for file download
+
+ // Called by the html page to start a download, arguments are: path, file name and file size.
+ function p13downloadfile(x, y, z) {
+ if (xxdialogMode) return;
+ downloadFile = CreateAgentRedirect(meshserver, CreateRemoteFiles(p13gotDownloadData), serverPublicNamePort); // Create our websocket file transport
+ downloadFile.ctrlMsgAllowed = false;
+ downloadFile.onStateChanged = onFileDownloadStateChange;
+ downloadFile.xpath = decodeURIComponent(x);
+ downloadFile.xfile = decodeURIComponent(y);
+ downloadFile.xsize = z;
+ downloadFile.xtsize = 0;
+ downloadFile.xstate = 0;
+ downloadFile.Start(filesNode._id);
+ setDialogMode(2, "Download File", 10, p13downloadFileCancel, '
' + downloadFile.xfile + '
');
+ }
+
+ // Called by the html page to cancel the download
+ function p13downloadFileCancel(button, tag) {
+ //console.log('p13downloadFileCancel');
+ downloadFile.Stop();
+ delete downloadFile;
+ downloadFile = null;
+ }
+
+ // Called by the file transport to indicate when the transport connection state has changed
+ function onFileDownloadStateChange(xdownloadFile, state) {
+ switch (state) {
+ case 0: // Transport as disconnected. If this is not part of an abort, we need to save the file
+ setDialogMode(0); // Close any dialog boxes if present
+ if ((downloadFile != null) && (downloadFile.xstate == 1)) { saveAs(data2blob(downloadFile.xdata), downloadFile.xfile); } // Save the file
+ break;
+ case 3: // Transport as connected, send a command to indicate we want to start a file download
+ downloadFile.send(JSON.stringify({ action: 'download', reqid: 1, path: downloadFile.xpath }));
+ break;
+ }
+ }
+
+ // Called by the transport when data is received
+ function p13gotDownloadData(data) {
+ if (downloadFile.xstate == 0) { // If state is 0, this is a command confirming if the file will be transfered.
+ var cmd = JSON.parse(data);
+ if (cmd.action == 'downloadstart') { // Yes, the file is about to start
+ downloadFile.xstate = 1; // Switch to state 1, we will start receiving the file data
+ downloadFile.xdata = ''; // Start with empty data
+ downloadFile.send('a'); // Send the first ACK
+ } else if (cmd.action == 'downloaderror') { // Problem opening this file, cancel
+ p13downloadFileCancel();
+ }
+ } else { // We are in the process of receiving the file
+ downloadFile.xtsize += (data.length); // Add to the total bytes received
+ downloadFile.xdata += data; // Append the data
+ Q('d2progressBar').value = downloadFile.xtsize; // Change the progress bar
+ downloadFile.send('a'); // Send the ACK
+ }
+ }
+ */
+
+ //
+ // FILES UPLOAD
+ //
+
+ var uploadFile;
+ function p13doUploadFiles(files) {
+ if (xxdialogMode) return;
+ uploadFile = {};
+ uploadFile.xpath = p13filetreelocation.join('/');
+ uploadFile.xfiles = files;
+ uploadFile.xfilePtr = -1;
+ setDialogMode(2, "Upload File", 10, p13uploadFileCancel, '
Connecting...
');
+ p13uploadReconnect();
+ }
+
+ function onFileUploadStateChange(xdownloadFile, state) {
+ switch (state) {
+ case 0:
+ p13folderup(9999);
+ break;
+ case 3:
+ p13uploadNextFile();
+ break;
+ }
+ }
+
+ // Connect again
+ function p13uploadReconnect() {
+ uploadFile.ws = CreateAgentRedirect(meshserver, CreateRemoteFiles(p13gotUploadData), serverPublicNamePort);
+ uploadFile.ws.attemptWebRTC = false;
+ uploadFile.ws.ctrlMsgAllowed = false;
+ uploadFile.ws.onStateChanged = onFileUploadStateChange;
+ uploadFile.ws.Start(filesNode._id);
+ }
+
+ // Push the next file
+ function p13uploadNextFile() {
+ uploadFile.xfilePtr++;
+ if (uploadFile.xfiles.length > uploadFile.xfilePtr) {
+ uploadFile.xptr = 0;
+ var file = uploadFile.xfiles[uploadFile.xfilePtr];
+ QH('p13dfileName', file.name);
+ Q('d2progressBar').max = file.size;
+ Q('d2progressBar').value = 0;
+
+ uploadFile.xreader = new FileReader();
+ uploadFile.xreader.onload = function() {
+ uploadFile.xdata = uploadFile.xreader.result;
+ uploadFile.ws.send(JSON.stringify({ action: 'upload', reqid: uploadFile.xfilePtr, path: uploadFile.xpath, name: file.name, size: uploadFile.xdata.byteLength }));
+ };
+ uploadFile.xreader.readAsArrayBuffer(file);
+ } else {
+ p13uploadFileCancel();
+ }
+ }
+
+ // Used to cancel the entire transfer.
+ function p13uploadFileCancel(button, tag) {
+ if (uploadFile != null) {
+ if (uploadFile.ws != null) {
+ uploadFile.ws.Stop();
+ uploadFile.ws = null;
+ }
+ uploadFile = null;
+ }
+ setDialogMode(0); // Close any dialog boxes if present
+ }
+
+ // Receive upload ack from the mesh agent, use this to keep sending more data
+ function p13gotUploadData(data) {
+ var cmd = JSON.parse(data);
+ if ((uploadFile == null) || (parseInt(uploadFile.xfilePtr) != parseInt(cmd.reqid))) { return; }
+
+ if (cmd.action == 'uploadstart') {
+ p13uploadNextPart(false);
+ for (var i = 0; i < 8; i++) { p13uploadNextPart(true); } // Send 8 more blocks of 4 k to full the websocket.
+ } else if (cmd.action == 'uploadack') {
+ p13uploadNextPart(false);
+ } else if (cmd.action == 'uploaderror') {
+ p13uploadFileCancel();
+ }
+ }
+
+ // Push the next part of the file into the websocket. If dataPriming is true, push more data only if it's not the last block of the file.
+ function p13uploadNextPart(dataPriming) {
+ var data = uploadFile.xdata;
+ var start = uploadFile.xptr;
+ var end = uploadFile.xptr + 4096;
+ if (end > data.byteLength) { if (dataPriming == true) { return; } end = data.byteLength; }
+ if (start == data.byteLength) {
+ if (uploadFile.ws != null) { uploadFile.ws.Stop(); uploadFile.ws = null; }
+ if (uploadFile.xfiles.length > uploadFile.xfilePtr + 1) { p13uploadReconnect(); } else { p13uploadFileCancel(); }
+ } else {
+ var datapart = data.slice(start, end);
+ uploadFile.ws.send(datapart);
+ uploadFile.xptr = end;
+ Q('d2progressBar').value = end;
+ }
+ }
+
//
// MY MESHS
//
@@ -1907,7 +2430,7 @@
if (((b & 8) || x) && f) f(x, t);
}
- function center() { QS('dialog').left = ((((getDocWidth() - 300) / 2)) + "px"); }
+ function center() { QS('dialog').left = ((((getDocWidth() - 300) / 2)) + "px"); deskAdjust(); /*drawDeviceTimeline();*/ }
function messagebox(t, m) { QH('id_dialogMessage', m); setDialogMode(1, t, 1); }
function statusbox(t, m) { QH('id_dialogMessage', m); setDialogMode(1, t); }
function getDocWidth() { if (window.innerWidth) return window.innerWidth; if (document.documentElement && document.documentElement.clientWidth && document.documentElement.clientWidth != 0) return document.documentElement.clientWidth; return document.getElementsByTagName('body')[0].clientWidth; }
@@ -1921,6 +2444,10 @@
function addLink(x, f) { return "♦ " + x + ""; }
function addLinkConditional(x, f, c) { if (c) return addLink(x, f); return x; }
function passwordcheck(p) { var re = /(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%^&*()]).{8,}/; return re.test(p); }
+ function getFileSizeStr(size) { if (size == 1) return "1 byte"; return "" + size + " bytes"; }
+ function joinPaths() { var x = []; for (var i in arguments) { var w = arguments[i]; if ((w != null) && (w != '')) { while (w.endsWith('/') || w.endsWith('\\')) { w = w.substring(0, w.length - 1); } while (w.startsWith('/') || w.startsWith('\\')) { w = w.substring(1); } x.push(w); } } return x.join('/'); }
+ function focusTextBox(x) { setTimeout(function(){ Q(x).selectionStart = Q(x).selectionEnd = 65535; Q(x).focus(); }, 0); }
+ var isFilenameValid = (function(){ var x1=/^[^\\/:\*\?"<>\|]+$/, x2=/^\./, x3=/^(nul|prn|con|lpt[0-9]|com[0-9])(\.|$)/i; return function isFilenameValid(fname){ return x1.test(fname)&&!x2.test(fname)&&!x3.test(fname)&&(fname[0] != '.'); } })();
diff --git a/views/default.handlebars b/views/default.handlebars
index 31570086..d061bb86 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -5716,10 +5716,7 @@
if (((b & 8) || x) && f) f(x, t);
}
- function center() {
- QS('dialog').left = ((((getDocWidth() - 400) / 2)) + "px"); deskAdjust();
- drawDeviceTimeline();
- }
+ function center() { QS('dialog').left = ((((getDocWidth() - 400) / 2)) + "px"); deskAdjust(); drawDeviceTimeline(); }
function messagebox(t, m) { QH('id_dialogMessage', m); setDialogMode(1, t, 1); }
function statusbox(t, m) { QH('id_dialogMessage', m); setDialogMode(1, t); }
function getDocWidth() { if (window.innerWidth) return window.innerWidth; if (document.documentElement && document.documentElement.clientWidth && document.documentElement.clientWidth != 0) return document.documentElement.clientWidth; return document.getElementsByTagName('body')[0].clientWidth; }