diff --git a/Plugins/Vorlon/plugins/express/vorlon.express.client.min.js b/Plugins/Vorlon/plugins/express/vorlon.express.client.min.js deleted file mode 100644 index ed26fbdd..00000000 --- a/Plugins/Vorlon/plugins/express/vorlon.express.client.min.js +++ /dev/null @@ -1 +0,0 @@ -var __extends=this&&this.__extends||function(e,o){function t(){this.constructor=e}for(var s in o)o.hasOwnProperty(s)&&(e[s]=o[s]);e.prototype=null===o?Object.create(o):(t.prototype=o.prototype,new t)},VORLON;!function(e){var o=function(o){function t(){o.call(this,"express"),this.hooked=!1,this._ready=!0,console.log("Started")}return __extends(t,o),t.prototype.getID=function(){return"NODEJS"},t.prototype.refresh=function(){},t.prototype.startClientSide=function(){},t.prototype.setupExpressHook=function(){console.log("Hooking express");if(!e.Tools.IsWindowAvailable&&!this._hookAlreadyDone){this._hookAlreadyDone=!0;{require("express")}}this.hooked=!0},t.prototype._hookPrototype=function(e,o){this._previousExpress||(this._previousExpress=o.application.init),o.application.init=function(){return console.log("IN EXPRESS !"),e._previousExpress.apply(this)}},t.prototype.onRealtimeMessageReceivedFromDashboardSide=function(o){e.Tools.IsWindowAvailable||"express"==o&&this.sendToDashboard({type:"express",data:global.express_vorlonJS})},t}(e.ClientPlugin);e.ExpressClient=o,e.Core.RegisterClientPlugin(new o)}(VORLON||(VORLON={})); \ No newline at end of file diff --git a/Plugins/Vorlon/plugins/nodejs/vorlon.nodejs.client.js b/Plugins/Vorlon/plugins/nodejs/vorlon.nodejs.client.js deleted file mode 100644 index 006152f6..00000000 --- a/Plugins/Vorlon/plugins/nodejs/vorlon.nodejs.client.js +++ /dev/null @@ -1,74 +0,0 @@ -var __extends = (this && this.__extends) || function (d, b) { - for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); -}; -var VORLON; -(function (VORLON) { - var NodejsClient = (function (_super) { - __extends(NodejsClient, _super); - function NodejsClient() { - _super.call(this, "nodejs"); - this._ready = true; - console.log('Started'); - } - NodejsClient.prototype.getID = function () { - return "NODEJS"; - }; - NodejsClient.prototype.refresh = function () { - }; - NodejsClient.prototype.startClientSide = function () { - console.log('client'); - }; - NodejsClient.prototype.simpleStringify = function (object) { - var simpleObject = {}; - for (var prop in object) { - if (!object.hasOwnProperty(prop)) { - continue; - } - if (typeof (object[prop]) == 'object') { - continue; - } - if (typeof (object[prop]) == 'function') { - continue; - } - simpleObject[prop] = object[prop]; - } - return JSON.stringify(simpleObject); - }; - ; - NodejsClient.prototype.onRealtimeMessageReceivedFromDashboardSide = function (receivedObject) { - if (!VORLON.Tools.IsWindowAvailable) { - if (receivedObject == 'modules') { - this.sendToDashboard({ type: 'modules', data: Object.keys(require('module')._cache) }); - } - else if (receivedObject == 'infos') { - this.sendToDashboard({ type: 'infos', data: { - title: process.title, - version: process.version, - platform: process.platform, - arch: process.arch, - debugPort: process['debugPort'], - pid: process.pid, - USERNAME: process.env.USERNAME, - USERDOMAIN_ROAMINGPROFILE: process.env.USERDOMAIN_ROAMINGPROFILE, - USERPROFILE: process.env.USERPROFILE, - WINDIR: process.env.WINDIR, - UATDATA: process.env.UATDATA, - USERDOMAIN: process.env.USERDOMAIN, - } }); - } - else if (receivedObject == 'memory') { - var _that = this; - _that.sendToDashboard({ type: 'memory', data: process.memoryUsage() }); - setInterval(function () { - _that.sendToDashboard({ type: 'memory', data: process.memoryUsage() }); - }, 5000); - } - } - }; - return NodejsClient; - }(VORLON.ClientPlugin)); - VORLON.NodejsClient = NodejsClient; - VORLON.Core.RegisterClientPlugin(new NodejsClient()); -})(VORLON || (VORLON = {})); diff --git a/Plugins/Vorlon/plugins/nodejs/vorlon.nodejs.client.min.js b/Plugins/Vorlon/plugins/nodejs/vorlon.nodejs.client.min.js deleted file mode 100644 index 8a27463e..00000000 --- a/Plugins/Vorlon/plugins/nodejs/vorlon.nodejs.client.min.js +++ /dev/null @@ -1 +0,0 @@ -var __extends=this&&this.__extends||function(e,o){function t(){this.constructor=e}for(var s in o)o.hasOwnProperty(s)&&(e[s]=o[s]);e.prototype=null===o?Object.create(o):(t.prototype=o.prototype,new t)},VORLON;!function(e){var o=function(o){function t(){o.call(this,"nodejs"),this._ready=!0,console.log("Started")}return __extends(t,o),t.prototype.getID=function(){return"NODEJS"},t.prototype.refresh=function(){},t.prototype.startClientSide=function(){console.log("client")},t.prototype.simpleStringify=function(e){var o={};for(var t in e)e.hasOwnProperty(t)&&"object"!=typeof e[t]&&"function"!=typeof e[t]&&(o[t]=e[t]);return JSON.stringify(o)},t.prototype.onRealtimeMessageReceivedFromDashboardSide=function(o){if(!e.Tools.IsWindowAvailable)if("modules"==o)this.sendToDashboard({type:"modules",data:Object.keys(require("module")._cache)});else if("infos"==o)this.sendToDashboard({type:"infos",data:{title:process.title,version:process.version,platform:process.platform,arch:process.arch,debugPort:process.debugPort,pid:process.pid,USERNAME:process.env.USERNAME,USERDOMAIN_ROAMINGPROFILE:process.env.USERDOMAIN_ROAMINGPROFILE,USERPROFILE:process.env.USERPROFILE,WINDIR:process.env.WINDIR,UATDATA:process.env.UATDATA,USERDOMAIN:process.env.USERDOMAIN}});else if("memory"==o){var t=this;t.sendToDashboard({type:"memory",data:process.memoryUsage()}),setInterval(function(){t.sendToDashboard({type:"memory",data:process.memoryUsage()})},5e3)}},t}(e.ClientPlugin);e.NodejsClient=o,e.Core.RegisterClientPlugin(new o)}(VORLON||(VORLON={})); \ No newline at end of file diff --git a/Plugins/Vorlon/plugins/nodejs/vorlon.nodejs.dashboard.js b/Plugins/Vorlon/plugins/nodejs/vorlon.nodejs.dashboard.js deleted file mode 100644 index fa42f4c4..00000000 --- a/Plugins/Vorlon/plugins/nodejs/vorlon.nodejs.dashboard.js +++ /dev/null @@ -1,218 +0,0 @@ -var __extends = (this && this.__extends) || function (d, b) { - for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); -}; -var VORLON; -(function (VORLON) { - var NodejsDashboard = (function (_super) { - __extends(NodejsDashboard, _super); - function NodejsDashboard() { - _super.call(this, "nodejs", "control.html", ["control.css", "tree.css"], "chart.js"); - this._ready = true; - this.__MEGA_BYTE = 1048576; - console.log('Started'); - } - NodejsDashboard.prototype.getID = function () { - return "NODEJS"; - }; - NodejsDashboard.prototype.startDashboardSide = function (div) { - var _this = this; - if (div === void 0) { div = null; } - this._insertHtmlContentAsync(div, function (filledDiv) { - _this.toogleMenu(); - _this._time = 0; - _this._ctx = document.getElementById("memory-chart"); - _this._ctx = _this._ctx.getContext("2d"); - _this._chart_data = { - labels: [], - datasets: [ - { - label: "Heap Used (MB)", - fill: false, - lineTension: 0.1, - backgroundColor: "rgba(75,192,192,0.4)", - borderColor: "rgba(75,192,192,1)", - borderCapStyle: 'butt', - borderDash: [], - borderDashOffset: 0.0, - borderJoinStyle: 'miter', - pointBorderColor: "rgba(75,192,192,1)", - pointBackgroundColor: "#fff", - pointBorderWidth: 1, - pointHoverRadius: 5, - pointHoverBackgroundColor: "rgba(75,192,192,1)", - pointHoverBorderColor: "rgba(220,220,220,1)", - pointHoverBorderWidth: 2, - pointRadius: 1, - pointHitRadius: 10, - data: [], - }, - { - label: "Heap Total (MB)", - fill: false, - lineTension: 0.1, - backgroundColor: "rgba(142, 68, 173,0.4)", - borderColor: "rgba(142, 68, 173,1.0)", - borderCapStyle: 'butt', - borderDash: [], - borderDashOffset: 0.0, - borderJoinStyle: 'miter', - pointBorderColor: "rgba(142, 68, 173,1.0)", - pointBackgroundColor: "#fff", - pointBorderWidth: 1, - pointHoverRadius: 5, - pointHoverBackgroundColor: "rgba(142, 68, 173,1.0)", - pointHoverBorderColor: "rgba(155, 89, 182,1.0)", - pointHoverBorderWidth: 2, - pointRadius: 1, - pointHitRadius: 10, - data: [], - }, - { - label: "RSS (MB)", - fill: false, - lineTension: 0.1, - backgroundColor: "rgba(192, 57, 43,0.4)", - borderColor: "rgba(192, 57, 43,1.0)", - borderCapStyle: 'butt', - borderDash: [], - borderDashOffset: 0.0, - borderJoinStyle: 'miter', - pointBorderColor: "rgba(192, 57, 43,1.0)", - pointBackgroundColor: "#fff", - pointBorderWidth: 1, - pointHoverRadius: 5, - pointHoverBackgroundColor: "rgba(192, 57, 43,1.0)", - pointHoverBorderColor: "rgba(231, 76, 60,1.0)", - pointHoverBorderWidth: 2, - pointRadius: 1, - pointHitRadius: 10, - data: [], - } - ] - }; - _this._chart = false; - _this.__html = []; - _this.sendToClient('infos'); - _this.sendToClient('memory'); - _this.sendToClient('modules'); - }); - }; - NodejsDashboard.prototype.chart = function () { - Chart.defaults.global.responsive = true; - Chart.defaults.global.maintainAspectRatio = false; - Chart.defaults.global.animation.easing = 'linear'; - this._chart = new Chart.Line(this._ctx, { - data: this._chart_data, - }); - }; - NodejsDashboard.prototype.jstree = function () { - $('.tree li').each(function () { - if ($(this).find('ul').children('li').length > 0) { - $(this).addClass('parent'); - } - }); - $('.tree li.parent > a').click(function () { - $(this).parent().toggleClass('active'); - $(this).parent().children('ul').slideToggle('fast'); - }); - }; - NodejsDashboard.prototype.toogleMenu = function () { - $('.plugin-nodejs .open-menu').click(function () { - $('.plugin-nodejs .open-menu').removeClass('active-menu'); - $('.plugin-nodejs #searchlist').val(''); - $('.plugin-nodejs .explorer-menu').hide(); - $('.plugin-nodejs #' + $(this).data('menu')).show(); - $('.plugin-nodejs .new-entry').fadeOut(); - $(this).addClass('active-menu'); - }); - }; - NodejsDashboard.prototype.renderTree = function (arr) { - var __that = this; - __that.__html.push(''); - }; - NodejsDashboard.prototype.buildTree = function (parts, treeNode) { - if (parts.length === 0) { - return; - } - for (var i = 0; i < treeNode.length; i++) { - if (parts[0] == treeNode[i].text) { - this.buildTree(parts.splice(1, parts.length), treeNode[i].children); - return; - } - } - var newNode = { 'text': parts[0], 'children': [] }; - treeNode.push(newNode); - this.buildTree(parts.splice(1, parts.length), newNode.children); - }; - NodejsDashboard.prototype.onRealtimeMessageReceivedFromClientSide = function (receivedObject) { - if (receivedObject.type == 'modules') { - var list = receivedObject.data; - var data = []; - for (var i = 0; i < list.length; i++) { - list[i] = list[i].split("\\"); - for (var z = 0; z < list[i].length; z++) { - if (list[i][z] == 'node_modules') { - list[i].splice(0, z); - break; - } - } - this.buildTree(list[i], data); - } - this.renderTree(data); - $('#jstree').append(this.__html.join('')); - this.jstree(); - } - if (receivedObject.type == 'infos') { - for (var k in receivedObject.data) { - $('.infos-' + k).append(receivedObject.data[k]); - } - var icon = ''; - switch (receivedObject.data['platform']) { - case 'linux': - icon = 'linux.png'; - break; - case 'win32': - icon = 'windows.png'; - break; - case 'win64': - icon = 'windows.png'; - break; - case 'darwin': - icon = 'apple.png'; - break; - } - $('.infos-platform img').attr('src', '/images/systems/' + icon); - } - if (receivedObject.type == 'memory') { - if (!this._chart) { - this.chart(); - } - if (this._time >= 70) { - this._chart.data.datasets[0].data.splice(0, 1); - this._chart.data.datasets[1].data.splice(0, 1); - this._chart.data.datasets[2].data.splice(0, 1); - this._chart.data.labels.splice(0, 1); - } - this._chart.data.labels.push(this._time); - this._chart.data.datasets[0].data.push(receivedObject.data['heapUsed'] / this.__MEGA_BYTE); - this._chart.data.datasets[1].data.push(receivedObject.data['heapTotal'] / this.__MEGA_BYTE); - this._chart.data.datasets[2].data.push(receivedObject.data['rss'] / this.__MEGA_BYTE); - this._chart.update(); - this._time += 5; - } - }; - return NodejsDashboard; - }(VORLON.DashboardPlugin)); - VORLON.NodejsDashboard = NodejsDashboard; - VORLON.Core.RegisterDashboardPlugin(new NodejsDashboard()); -})(VORLON || (VORLON = {})); diff --git a/Plugins/Vorlon/plugins/nodejs/vorlon.nodejs.dashboard.min.js b/Plugins/Vorlon/plugins/nodejs/vorlon.nodejs.dashboard.min.js deleted file mode 100644 index 84f51155..00000000 --- a/Plugins/Vorlon/plugins/nodejs/vorlon.nodejs.dashboard.min.js +++ /dev/null @@ -1 +0,0 @@ -var __extends=this&&this.__extends||function(t,e){function r(){this.constructor=t}for(var o in e)e.hasOwnProperty(o)&&(t[o]=e[o]);t.prototype=null===e?Object.create(e):(r.prototype=e.prototype,new r)},VORLON;!function(t){var e=function(t){function e(){t.call(this,"nodejs","control.html",["control.css","tree.css"],"chart.js"),this._ready=!0,this.__MEGA_BYTE=1048576,console.log("Started")}return __extends(e,t),e.prototype.getID=function(){return"NODEJS"},e.prototype.startDashboardSide=function(t){var e=this;void 0===t&&(t=null),this._insertHtmlContentAsync(t,function(){e.toogleMenu(),e._time=0,e._ctx=document.getElementById("memory-chart"),e._ctx=e._ctx.getContext("2d"),e._chart_data={labels:[],datasets:[{label:"Heap Used (MB)",fill:!1,lineTension:.1,backgroundColor:"rgba(75,192,192,0.4)",borderColor:"rgba(75,192,192,1)",borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",pointBorderColor:"rgba(75,192,192,1)",pointBackgroundColor:"#fff",pointBorderWidth:1,pointHoverRadius:5,pointHoverBackgroundColor:"rgba(75,192,192,1)",pointHoverBorderColor:"rgba(220,220,220,1)",pointHoverBorderWidth:2,pointRadius:1,pointHitRadius:10,data:[]},{label:"Heap Total (MB)",fill:!1,lineTension:.1,backgroundColor:"rgba(142, 68, 173,0.4)",borderColor:"rgba(142, 68, 173,1.0)",borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",pointBorderColor:"rgba(142, 68, 173,1.0)",pointBackgroundColor:"#fff",pointBorderWidth:1,pointHoverRadius:5,pointHoverBackgroundColor:"rgba(142, 68, 173,1.0)",pointHoverBorderColor:"rgba(155, 89, 182,1.0)",pointHoverBorderWidth:2,pointRadius:1,pointHitRadius:10,data:[]},{label:"RSS (MB)",fill:!1,lineTension:.1,backgroundColor:"rgba(192, 57, 43,0.4)",borderColor:"rgba(192, 57, 43,1.0)",borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",pointBorderColor:"rgba(192, 57, 43,1.0)",pointBackgroundColor:"#fff",pointBorderWidth:1,pointHoverRadius:5,pointHoverBackgroundColor:"rgba(192, 57, 43,1.0)",pointHoverBorderColor:"rgba(231, 76, 60,1.0)",pointHoverBorderWidth:2,pointRadius:1,pointHitRadius:10,data:[]}]},e._chart=!1,e.__html=[],e.sendToClient("infos"),e.sendToClient("memory"),e.sendToClient("modules")})},e.prototype.chart=function(){Chart.defaults.global.responsive=!0,Chart.defaults.global.maintainAspectRatio=!1,Chart.defaults.global.animation.easing="linear",this._chart=new Chart.Line(this._ctx,{data:this._chart_data})},e.prototype.jstree=function(){$(".tree li").each(function(){$(this).find("ul").children("li").length>0&&$(this).addClass("parent")}),$(".tree li.parent > a").click(function(){$(this).parent().toggleClass("active"),$(this).parent().children("ul").slideToggle("fast")})},e.prototype.toogleMenu=function(){$(".plugin-nodejs .open-menu").click(function(){$(".plugin-nodejs .open-menu").removeClass("active-menu"),$(".plugin-nodejs #searchlist").val(""),$(".plugin-nodejs .explorer-menu").hide(),$(".plugin-nodejs #"+$(this).data("menu")).show(),$(".plugin-nodejs .new-entry").fadeOut(),$(this).addClass("active-menu")})},e.prototype.renderTree=function(t){var e=this;e.__html.push("")},e.prototype.buildTree=function(t,e){if(0!==t.length){for(var r=0;r=70&&(this._chart.data.datasets[0].data.splice(0,1),this._chart.data.datasets[1].data.splice(0,1),this._chart.data.datasets[2].data.splice(0,1),this._chart.data.labels.splice(0,1)),this._chart.data.labels.push(this._time),this._chart.data.datasets[0].data.push(t.data.heapUsed/this.__MEGA_BYTE),this._chart.data.datasets[1].data.push(t.data.heapTotal/this.__MEGA_BYTE),this._chart.data.datasets[2].data.push(t.data.rss/this.__MEGA_BYTE),this._chart.update(),this._time+=5)},e}(t.DashboardPlugin);t.NodejsDashboard=e,t.Core.RegisterDashboardPlugin(new e)}(VORLON||(VORLON={})); \ No newline at end of file diff --git a/Plugins/Vorlon/plugins/office/vorlon.office.dashboard.ts b/Plugins/Vorlon/plugins/office/vorlon.office.dashboard.ts index 8f520d55..e1c09207 100644 --- a/Plugins/Vorlon/plugins/office/vorlon.office.dashboard.ts +++ b/Plugins/Vorlon/plugins/office/vorlon.office.dashboard.ts @@ -1,8 +1,3 @@ -/// -/// -/// -/// -/// var $: any; module VORLON { diff --git a/Plugins/Vorlon/plugins/office/vorlon.office.interfaces.ts b/Plugins/Vorlon/plugins/office/vorlon.office.interfaces.ts index 458ae0d1..3d1aa547 100644 --- a/Plugins/Vorlon/plugins/office/vorlon.office.interfaces.ts +++ b/Plugins/Vorlon/plugins/office/vorlon.office.interfaces.ts @@ -1,7 +1,3 @@ -/// -/// - - module VORLON { export class OfficeFunction { diff --git a/Plugins/Vorlon/plugins/office/vorlon.office.outlook.ts b/Plugins/Vorlon/plugins/office/vorlon.office.outlook.ts index 76339946..a6197e38 100644 --- a/Plugins/Vorlon/plugins/office/vorlon.office.outlook.ts +++ b/Plugins/Vorlon/plugins/office/vorlon.office.outlook.ts @@ -1,7 +1,3 @@ -/// -/// -/// - var $: any; module VORLON { diff --git a/Plugins/Vorlon/plugins/office/vorlon.office.powerpoint.ts b/Plugins/Vorlon/plugins/office/vorlon.office.powerpoint.ts index 3f9f8d46..4421d05e 100644 --- a/Plugins/Vorlon/plugins/office/vorlon.office.powerpoint.ts +++ b/Plugins/Vorlon/plugins/office/vorlon.office.powerpoint.ts @@ -1,6 +1,3 @@ -/// -/// -/// var $: any; module VORLON { diff --git a/Plugins/Vorlon/plugins/webstandards/rules/mobileweb.viewport.ts b/Plugins/Vorlon/plugins/webstandards/rules/mobileweb.viewport.ts index 8e9fecb8..4b0440a4 100644 --- a/Plugins/Vorlon/plugins/webstandards/rules/mobileweb.viewport.ts +++ b/Plugins/Vorlon/plugins/webstandards/rules/mobileweb.viewport.ts @@ -3,7 +3,7 @@ module VORLON.WebStandards.Rules.DOM { export var useViewport = { id: "mobileweb.use-viewport", title: "use meta viewport", - description: "Use meta viewport tag to choose how your website will get scaled on smaller devices like phones. Define at least <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">", + description: "Use meta viewport tag to choose how your website will get scaled on smaller devices like phones. Define at least ", nodeTypes: ["meta"], prepare: function(rulecheck : IRuleCheck, analyzeSummary) { @@ -15,7 +15,7 @@ module VORLON.WebStandards.Rules.DOM { if (viewportattr && viewportattr.toLowerCase() == "viewport") { rulecheck.failed = false; } - + } } diff --git a/Plugins/Vorlon/vorlon.clientPlugin.ts b/Plugins/Vorlon/vorlon.clientPlugin.ts index 1632bbe6..bcd1ebf9 100644 --- a/Plugins/Vorlon/vorlon.clientPlugin.ts +++ b/Plugins/Vorlon/vorlon.clientPlugin.ts @@ -46,6 +46,10 @@ } } + if(Core.IsHttpsEnabled){ + basedUrl = basedUrl.replace("$http://", "https://"); + } + function loadScript() { var scriptToLoad = document.createElement("script"); scriptToLoad.setAttribute("src", basedUrl + scriptName); diff --git a/Plugins/Vorlon/vorlon.core.ts b/Plugins/Vorlon/vorlon.core.ts index abc46042..fb2a17f9 100644 --- a/Plugins/Vorlon/vorlon.core.ts +++ b/Plugins/Vorlon/vorlon.core.ts @@ -11,6 +11,7 @@ _socketIOWaitCount = 0; public debug: boolean = false; _RetryTimeout = 1002; + _isHttpsEnabled = false; public get Messenger(): ClientMessenger { return Core._messenger; @@ -19,6 +20,10 @@ public get ClientPlugins(): Array { return Core._clientPlugins; } + + public get IsHttpsEnabled(): boolean { + return Core._isHttpsEnabled; + } public get DashboardPlugins(): Array { return Core._dashboardPlugins; @@ -43,6 +48,10 @@ Core._side = RuntimeSide.Client; Core._sessionID = sessionId; Core._listenClientId = listenClientId; + + if(serverUrl.match("$https://")){ + Core._isHttpsEnabled = true; + } // Checking socket.io if (Tools.IsWindowAvailable && (window).io === undefined) { diff --git a/Server/.gitignore b/Server/.gitignore index c517bdf2..3c03cff8 100644 --- a/Server/.gitignore +++ b/Server/.gitignore @@ -12,4 +12,5 @@ public/vorlon.production.js.map public/vorlon/**/* public/stylesheets/**/*.css Scripts/typings/vorlon/**/*.d.ts -public/stylesheets/style.css \ No newline at end of file +public/stylesheets/style.css +Scripts/typings/Vorlon/**/*.* \ No newline at end of file diff --git a/Server/Scripts/typings/Vorlon/vorlon.basePlugin.d.ts b/Server/Scripts/typings/Vorlon/vorlon.basePlugin.d.ts deleted file mode 100644 index 4f49c028..00000000 --- a/Server/Scripts/typings/Vorlon/vorlon.basePlugin.d.ts +++ /dev/null @@ -1,18 +0,0 @@ -declare module VORLON { - class BasePlugin { - name: string; - _ready: boolean; - protected _id: string; - protected _debug: boolean; - _type: PluginType; - trace: (msg) => void; - protected traceLog: (msg: any) => void; - protected traceNoop: (msg: any) => void; - loadingDirectory: string; - constructor(name: string); - Type: PluginType; - debug: boolean; - getID(): string; - isReady(): boolean; - } -} diff --git a/Server/Scripts/typings/Vorlon/vorlon.clientMessenger.d.ts b/Server/Scripts/typings/Vorlon/vorlon.clientMessenger.d.ts deleted file mode 100644 index 90241fc0..00000000 --- a/Server/Scripts/typings/Vorlon/vorlon.clientMessenger.d.ts +++ /dev/null @@ -1,39 +0,0 @@ -declare module VORLON { - interface VorlonMessageMetadata { - pluginID: string; - side: RuntimeSide; - sessionId: string; - clientId: string; - listenClientId: string; - } - interface VorlonMessage { - metadata: VorlonMessageMetadata; - command?: string; - data?: any; - } - class ClientMessenger { - private _socket; - private _isConnected; - private _sessionId; - private _clientId; - private _listenClientId; - private _serverUrl; - onRealtimeMessageReceived: (message: VorlonMessage) => void; - onHeloReceived: (id: string) => void; - onIdentifyReceived: (id: string) => void; - onRemoveClient: (id: any) => void; - onAddClient: (id: any) => void; - onStopListenReceived: () => void; - onRefreshClients: () => void; - onReload: (id: string) => void; - onError: (err: Error) => void; - isConnected: boolean; - clientId: string; - socketId: string; - constructor(side: RuntimeSide, serverUrl: string, sessionId: string, clientId: string, listenClientId: string); - stopListening(): void; - sendRealtimeMessage(pluginID: string, objectToSend: any, side: RuntimeSide, messageType?: string, command?: string): void; - sendMonitoringMessage(pluginID: string, message: string): void; - getMonitoringMessage(pluginID: string, onMonitoringMessage: (messages: string[]) => any, from?: string, to?: string): any; - } -} diff --git a/Server/Scripts/typings/Vorlon/vorlon.clientPlugin.d.ts b/Server/Scripts/typings/Vorlon/vorlon.clientPlugin.d.ts deleted file mode 100644 index 40280ebd..00000000 --- a/Server/Scripts/typings/Vorlon/vorlon.clientPlugin.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -declare module VORLON { - class ClientPlugin extends BasePlugin { - ClientCommands: any; - constructor(name: string); - startClientSide(): void; - onRealtimeMessageReceivedFromDashboardSide(receivedObject: any): void; - sendToDashboard(data: any): void; - sendCommandToDashboard(command: string, data?: any): void; - refresh(): void; - _loadNewScriptAsync(scriptName: string, callback: () => void, waitForDOMContentLoaded?: boolean): void; - } -} diff --git a/Server/Scripts/typings/Vorlon/vorlon.core.d.ts b/Server/Scripts/typings/Vorlon/vorlon.core.d.ts deleted file mode 100644 index 73a2f31a..00000000 --- a/Server/Scripts/typings/Vorlon/vorlon.core.d.ts +++ /dev/null @@ -1,37 +0,0 @@ -declare module VORLON { - class _Core { - _clientPlugins: ClientPlugin[]; - _dashboardPlugins: DashboardPlugin[]; - _messenger: ClientMessenger; - _sessionID: string; - _listenClientId: string; - _side: RuntimeSide; - _errorNotifier: any; - _messageNotifier: any; - _socketIOWaitCount: number; - debug: boolean; - _RetryTimeout: number; - Messenger: ClientMessenger; - ClientPlugins: Array; - DashboardPlugins: Array; - RegisterClientPlugin(plugin: ClientPlugin): void; - RegisterDashboardPlugin(plugin: DashboardPlugin): void; - StopListening(): void; - StartClientSide(serverUrl?: string, sessionId?: string, listenClientId?: string): void; - sendHelo(): void; - startClientDirtyCheck(): void; - StartDashboardSide(serverUrl?: string, sessionId?: string, listenClientId?: string, divMapper?: (string) => HTMLDivElement): void; - private _OnStopListenReceived(); - private _OnIdentifyReceived(message); - private ShowError(message, timeout?); - private _OnError(err); - private _OnIdentificationReceived(id); - private _OnReloadClient(id); - private _RetrySendingRealtimeMessage(plugin, message); - private _Dispatch(message); - private _DispatchPluginMessage(plugin, message); - private _DispatchFromClientPluginMessage(plugin, message); - private _DispatchFromDashboardPluginMessage(plugin, message); - } - var Core: _Core; -} diff --git a/Server/Scripts/typings/Vorlon/vorlon.dashboardPlugin.d.ts b/Server/Scripts/typings/Vorlon/vorlon.dashboardPlugin.d.ts deleted file mode 100644 index d1e7385e..00000000 --- a/Server/Scripts/typings/Vorlon/vorlon.dashboardPlugin.d.ts +++ /dev/null @@ -1,17 +0,0 @@ -declare module VORLON { - class DashboardPlugin extends BasePlugin { - htmlFragmentUrl: any; - cssStyleSheetUrl: any; - JavascriptSheetUrl: any; - DashboardCommands: any; - constructor(name: string, htmlFragmentUrl: string, cssStyleSheetUrl?: (string | string[]), JavascriptSheetUrl?: (string | string[])); - startDashboardSide(div: HTMLDivElement): void; - onRealtimeMessageReceivedFromClientSide(receivedObject: any): void; - sendToClient(data: any): void; - sendCommandToClient(command: string, data?: any): void; - sendCommandToPluginClient(pluginId: string, command: string, data?: any): void; - sendCommandToPluginDashboard(pluginId: string, command: string, data?: any): void; - _insertHtmlContentAsync(divContainer: HTMLDivElement, callback: (filledDiv: HTMLDivElement) => void): void; - private _stripContent(content); - } -} diff --git a/Server/Scripts/typings/Vorlon/vorlon.enums.d.ts b/Server/Scripts/typings/Vorlon/vorlon.enums.d.ts deleted file mode 100644 index 96b062b9..00000000 --- a/Server/Scripts/typings/Vorlon/vorlon.enums.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -declare module VORLON { - enum RuntimeSide { - Client = 0, - Dashboard = 1, - Both = 2, - } - enum PluginType { - OneOne = 0, - MulticastReceiveOnly = 1, - Multicast = 2, - } -} diff --git a/Server/Scripts/typings/Vorlon/vorlon.tools.d.ts b/Server/Scripts/typings/Vorlon/vorlon.tools.d.ts deleted file mode 100644 index 41908260..00000000 --- a/Server/Scripts/typings/Vorlon/vorlon.tools.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -declare module VORLON { - class Tools { - static IsWindowAvailable: boolean; - static QuerySelectorById(root: HTMLElement, id: string): HTMLElement; - static SetImmediate(func: () => void): void; - static setLocalStorageValue(key: string, data: string): void; - static getLocalStorageValue(key: string): any; - static Hook(rootObject: any, functionToHook: string, hookingFunction: (...optionalParams: any[]) => void): void; - static HookProperty(rootObjectName: string, propertyToHook: string, callback: any): void; - static getCallStack(skipped: any): any; - static CreateCookie(name: string, value: string, days: number): void; - static ReadCookie(name: string): string; - static CreateGUID(): string; - static RemoveEmpties(arr: string[]): number; - static AddClass(e: HTMLElement, name: string): HTMLElement; - static RemoveClass(e: HTMLElement, name: string): HTMLElement; - static ToggleClass(e: HTMLElement, name: string, callback?: (hasClass: boolean) => void): void; - static htmlToString(text: any): any; - } - class FluentDOM { - element: HTMLElement; - childs: Array; - parent: FluentDOM; - constructor(nodeType: string, className?: string, parentElt?: Element, parent?: FluentDOM); - static forElement(element: HTMLElement): FluentDOM; - addClass(classname: string): FluentDOM; - toggleClass(classname: string): FluentDOM; - className(classname: string): FluentDOM; - opacity(opacity: string): FluentDOM; - display(display: string): FluentDOM; - hide(): FluentDOM; - visibility(visibility: string): FluentDOM; - text(text: string): FluentDOM; - html(text: string): FluentDOM; - attr(name: string, val: string): FluentDOM; - editable(editable: boolean): FluentDOM; - style(name: string, val: string): FluentDOM; - appendTo(elt: Element): FluentDOM; - append(nodeType: string, className?: string, callback?: (fdom: FluentDOM) => void): FluentDOM; - createChild(nodeType: string, className?: string): FluentDOM; - click(callback: (EventTarget) => void): FluentDOM; - blur(callback: (EventTarget) => void): FluentDOM; - keydown(callback: (EventTarget) => void): FluentDOM; - } -} diff --git a/Server/Scripts/vorlon.server.ts b/Server/Scripts/vorlon.server.ts index 26c049e7..97c49d19 100644 --- a/Server/Scripts/vorlon.server.ts +++ b/Server/Scripts/vorlon.server.ts @@ -36,11 +36,11 @@ export module VORLON { res.header('Pragma', 'no-cache'); } - public addRoutes(app: express.Express, passport: any): void { + public addRoutes(app: express.Express, passport: express.Response): void { app.get(this.baseURLConfig.baseURL + "/api/createsession", (req: any, res: any) => { this.json(res, this.guid()); }); - + app.get(this.baseURLConfig.baseURL + "/api/reset/:idSession", (req: any, res: any) => { var session = this._sessions.get(req.params.idSession); if (session && session.connectedClients) { @@ -103,6 +103,7 @@ export module VORLON { }); app.get(this.baseURLConfig.baseURL + "/getplugins/:idsession", (req: any, res: any) => { + this.noCache(res); this._sendConfigJson(req, res); }); @@ -123,6 +124,7 @@ export module VORLON { }); app.get(this.baseURLConfig.baseURL + "/getplugin/:pluginfolder/icon", (req: any, res: any) => { + this.noCache(res); this.sendPluginIcon(req, res); }); @@ -199,7 +201,7 @@ export module VORLON { }); } - private setPluginPanel(req: any, res: any) { + private setPluginPanel(req: express.Request, res: express.Response) { var pluginid = req.params.pluginid; var panel = req.body.panel; this.pluginsConfig.setPluginPanel(pluginid, panel, (err) => { diff --git a/Server/Scripts/vorlon.webServer.ts b/Server/Scripts/vorlon.webServer.ts index d2b15b06..2f47f3c9 100644 --- a/Server/Scripts/vorlon.webServer.ts +++ b/Server/Scripts/vorlon.webServer.ts @@ -131,13 +131,6 @@ export module VORLON { vauth.VORLON.Authentication.loadAuthConfig(); this.init(); - - // app.use((req, res, next) => { - // res.header("Access-Control-Allow-Origin", "*"); - // res.header('Access-Control-Allow-Methods', 'GET,POST,PUT,HEAD,DELETE,OPTIONS'); - // res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, X-VorlonProxyEncoding, content-encoding, content-length"); - // next(); - // }); if (this.httpConfig.useSSL) { this._httpServer = this.httpConfig.httpModule.createServer(this.httpConfig.options, app).listen(app.get('port'), () => { diff --git a/Server/config.json b/Server/config.json index 368f8dba..9be35081 100644 --- a/Server/config.json +++ b/Server/config.json @@ -16,10 +16,10 @@ "vorlonProxyURL": "", "plugins": [ { - "id": "SCREEN", - "name": "Screenshot", + "id": "DOM", + "name": "Dom Explorer", "panel": "top", - "foldername": "screenshot", + "foldername": "domExplorer", "enabled": true }, { @@ -43,14 +43,7 @@ "name": "Babylon Inspector", "panel": "top", "foldername": "babylonInspector", - "enabled": true - }, - { - "id": "DOM", - "name": "Dom Explorer", - "panel": "top", - "foldername": "domExplorer", - "enabled": true + "enabled": false }, { "id": "WEBSTANDARDS", @@ -85,14 +78,14 @@ "name": "UWP apps", "panel": "top", "foldername": "uwp", - "enabled": true + "enabled": false }, { "id": "NGINSPECTOR", "name": "Ng. Inspector", "panel": "top", "foldername": "ngInspector", - "enabled": true + "enabled": false }, { "id": "DEVICE", @@ -101,6 +94,13 @@ "foldername": "device", "enabled": true }, + { + "id": "SCREEN", + "name": "Screenshot", + "panel": "top", + "foldername": "screenshot", + "enabled": false + }, { "id": "OFFICE", "name": "Office Addin", @@ -113,7 +113,7 @@ "name": "NodeJS", "panel": "top", "foldername": "nodejs", - "enabled": true, + "enabled": false, "nodeCompliant": true, "nodeOnly": true }, @@ -137,7 +137,7 @@ "name": "Express", "panel": "bottom", "foldername": "express", - "enabled": true, + "enabled": false, "nodeCompliant": true, "nodeOnly": true } diff --git a/Server/public/vorlon/.gitkeep b/Server/public/vorlon/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/Server/views/httpproxy.jade b/Server/views/httpproxy.jade index 5f5666ea..8614ed36 100644 --- a/Server/views/httpproxy.jade +++ b/Server/views/httpproxy.jade @@ -22,10 +22,10 @@ html(lang='en') input#url(type='text', placeholder='enter website url') div.button div.spacebutton - a#inject.btn.btn-default.left Inspect with VORLON.JS - a#openSite.btn.btn-default.left Open website only - a#openDashboard.btn.btn-default.left Open dashboard only - a#error.message.left.error.hide URL is not valid + a#inject.btn.btn-default.left(role='button', tabindex='0') Inspect with VORLON.JS + a#openSite.btn.btn-default.left(role='button', tabindex='0') Open website only + a#openDashboard.btn.btn-default.left(role='button', tabindex='0') Open dashboard only + a#error.message.left.error.hide(role='button', tabindex='0') URL is not valid script(type='text/javascript'). $(document).ready(function() { @@ -109,4 +109,4 @@ html(lang='en') urlinput.addEventListener("blur", function (e) { checkUrl(); }); - }); \ No newline at end of file + }); diff --git a/gulpfile.js b/gulpfile.js index 58f5b91a..5e561eab 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -148,8 +148,6 @@ gulp.task('scripts-specific-plugins-plugins', ['scripts-plugins'], function() { .pipe(concat('vorlon.office.dashboard.js')) .pipe(gulp.dest('Plugins/release/plugins/office/')); - - gulp.src([ 'Plugins/release/plugins/office/vorlon.office.interfaces.min.js', 'Plugins/release/plugins/office/vorlon.office.tools.min.js', @@ -199,9 +197,8 @@ gulp.task('scripts-specific-plugins-plugins', ['scripts-plugins'], function() { gulp.task('scripts-plugins', ['concat-webstandards-rules-plugins'], function () { return gulp.src([ - './Plugins/**/vorlon.*.interfaces.js', - './Plugins/**/vorlon.*.client.js', - './Plugins/**/vorlon.*.dashboard.js' + './Plugins/**/vorlon.*.js', + '!./Plugins/**/vorlon.*.min.js' ]) .pipe(rename(function (path) { path.extname = ".min.js";