bdware/bdcontract-web-ide
21
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: update param filters in listContractProcess

Browse Source 
refactor
style
This commit is contained in:
Frank.R.Wu 2021-06-30 10:39:00 +08:00
parent 10841c1b03
commit 59d54cb2b5
12 changed files with 1449 additions and 1457 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BaaSOnlineIDE.html
View File

@ -405,7 +405,7 @@
</select> </select>
<div class="input-group-append"> <div class="input-group-append">
<button type="button" class="btn btn-outline-primary" <button type="button" class="btn btn-outline-primary"
title="预览" data-toggle="tooltip" onclick="openinClient()"> title="预览" data-toggle="tooltip" onclick="openInClient()">
<img alt="Brand" src="./images/onlineide/preview.png" <img alt="Brand" src="./images/onlineide/preview.png"
class="buttonimg"> class="buttonimg">
</button> </button>

2
NodePortal.html
View File

@ -584,7 +584,7 @@
</div> </div>
<select id="selectMemeryFiles" class="custom-select" <select id="selectMemeryFiles" class="custom-select"
onchange="changeMemeryFiles(this.value)" onchange="changeMemoryFiles(this.value)"
style="appearance:none; -webkit-appearance:none"> style="appearance:none; -webkit-appearance:none">
<option selected>选择时间</option> <option selected>选择时间</option>
</select> </select>

2
OnlineIDE.html
View File

@ -413,7 +413,7 @@
</select> </select>
<div class="input-group-append"> <div class="input-group-append">
<button type="button" class="btn btn-outline-primary" <button type="button" class="btn btn-outline-primary"
title="预览" data-toggle="tooltip" onclick="openinClient()"> title="预览" data-toggle="tooltip" onclick="openInClient()">
<img alt="Brand" src="./images/onlineide/preview.png" <img alt="Brand" src="./images/onlineide/preview.png"
class="buttonimg"> class="buttonimg">
</button> </button>

2
OnlineIDE_en.html
View File

@ -394,7 +394,7 @@
<div class="input-group-append"> <div class="input-group-append">
<button type="button" class="btn btn-outline-primary" <button type="button" class="btn btn-outline-primary"
title="Preview" data-toggle="tooltip" onclick="openinClient()"> title="Preview" data-toggle="tooltip" onclick="openInClient()">
<img alt="Brand" src="./images/onlineide/preview.png" <img alt="Brand" src="./images/onlineide/preview.png"
class="buttonimg"> class="buttonimg">
</button> </button>

465
js/NodeContractInstances.js
View File

@ -1,57 +1,70 @@
var loadContractInstances = function (event) { const CONSENSUS_TABLE = {
console.log("loadContractInstances" + event); 0: '无',
1: 'PBFT',
listContractProcess(); 2: 'RAFT',
3: 'Single'
}; };
var listContractProcess = function (event) { const RESPONSE_TYPE_TABLE = {
0: 'ALL',
1: 'MOST',
2: 'FIRST'
};
function loadContractInstances(event) {
console.log("loadContractInstances" + event);
listContractProcess();
}
function listContractProcess(event) {
console.log("listContractProcess" + event); console.log("listContractProcess" + event);
setTimeout(function () { setTimeout(function () {
var param = {}; global.wssocket.send(JSON.stringify({
param.action = "listContractProcess"; action: 'listContractProcess',
// data: event,
// 1 << 0: INIT, 1 << 1: RUNNING, 1 << 2: HANGED, 1 << 3: KILLED, 0: ALL
filters: global.myRole && global.myRole.indexOf('NodeManager') > -1 ? 0 : 7
}));
// param.data = event; global.wssocket.send(JSON.stringify({
param.fromNodePortal = true; action: 'listLeakContractProcess'
}));
global.wssocket.send(JSON.stringify(param));
var request2 = {};
request2.action = "listLeakContractProcess";
global.wssocket.send(JSON.stringify(request2));
}, 300); }, 300);
}; }
var onListContractProcess1 = function (obj) { function onListContractProcess1(obj) {
console.log("+++++++++=" + obj.data); console.log("+++++++++=" + obj.data.length);
var table = JSON.parse(obj.data); const table = JSON.parse(obj.data);
global.contractList = table; global.contractList = table;
drawContractInstanceStatusPie(table); drawContractInstanceStatusPie(table);
// drawContractInstanceTimesPie(table); // drawContractInstanceTimesPie(table);
drawContractInstanceTypeTimesPie(table); drawContractInstanceTypeTimesPie(table);
drawciTable(table); drawConInfoTable(table);
console.log(table); console.log(table);
$("#selectContractInstance").html(""); $("#selectContractInstance").html("");
var x = document.getElementById("selectContractInstance"); const x = document.getElementById("selectContractInstance");
x.options.length = 0; x.options.length = 0;
x.add(new Option("选择...", " ")); x.add(new Option("选择...", " "));
global.permissionNameMap = {}; global.permissionNameMap = {};
for (var i = 0; i < table.length; i++) { for (let i = 0; i < table.length; i++) {
if (table[i].contractStatus == "KILLED") { if (table[i]['contractStatus'] !== 'RUNNING') {
continue; continue;
} }
var option = document.createElement("option"); let option = document.createElement("option");
option.text = table[i].name; option.text = table[i].name;
console.log(table[i].name); console.log(table[i].name);
global.permissionNameMap[table[i].id] = table[i].contractPermission; global.permissionNameMap[table[i].id] = table[i]['contractPermission'];
// option.value=table[i].id; // option.value=table[i].id;
option.value = table[i].id; option.value = table[i].id;
x.add(option, null); x.add(option, null);
} }
}; }
var drawciTable = function (table) { function drawConInfoTable(table) {
if ($("#ciTabDiv").css("height") == "0px") { const ciTabDiv = $("#ciTabDiv");
console.log("drawciTabDiv: ignore"); if (ciTabDiv.css("height") === "0px") {
console.log("drawConInfoTabDiv: ignore");
return; return;
} }
var dtLang = { var dtLang = {
@ -81,78 +94,51 @@ var drawciTable = function (table) {
"sSortDescending": ": 以降序排列此列" "sSortDescending": ": 以降序排列此列"
} }
}; };
var tableHead = "<table id='ciTabDivTab' class='table display row-border' style='word-break:normal; word-break:keep-all'><thead><tr><th>序号</th><th>ID</th><th>名称</th><th>状态</th><th>端口</th><th>类型</th><th>通讯</th><th>共识</th><th>统计</th><th>次数</th><th>流量</th><th>内存</th><th>管理</th></tr></thead><tbody>"; const tableHead = `<table id='ciTabDivTab' class='table display row-border' style='word-break:keep-all;'>
var tableTail = "</tbody></table>"; <thead><tr>
<th>序号</th>
<th>ID</th>
<th>名称</th>
<th>状态</th>
<th>端口</th>
<th>类型</th>
<th>通讯</th>
<th>共识</th>
<!--<th>返回方式</th>-->
<th>次数</th>
<th>流量</th>
<th>内存</th>
<th>管理</th>
</tr>
</thead><tbody>`;
const tableTail = "</tbody></table>";
console.log("drawciTable"); console.log("drawConInfoTable");
var html = tableHead; let html = tableHead;
for (var i = 0; i < table.length; i++) { for (let i = 0; i < table.length; i++) {
if (table[i].contractStatus=="KILLED") continue; html += `<tr>
html += "<tr><td>"; <td>${i + 1}</td>
html += (i + 1); <td>${table[i].id}</td>
html += "</td> <td>"; <td><a href='/client/bdwareclient.html?self=true&contract=${table[i].id}' target='_blank'>
html += table[i].id; ${table[i].name}
html += "</td> <td>"; </a></td>
html += "<a href='/client/bdwareclient.html?self=true&contract=" <td>${table[i]['contractStatus']}</td>
+ table[i].id + "' target='_blank'>" + table[i].name + "</>"; <td>${table[i].port || '-'}</td>
html += "</td> <td>"; <td>${table[i].type}</td>
html += table[i].contractStatus; <td>${table[i]['networkType'] ? "P2P" : "TCP"}</td>
html += "</td> <td>"; <td>${table[i]['consensusType'] ? CONSENSUS_TABLE[table[i]['consensusType']] : '无'}</td>
html += table[i].port; <!--<td>${table[i].responseType ? RESPONSE_TYPE_TABLE[table[i].responseType] : '-'}</td>-->
html += "</td><td>"; <td>${table[i].times}</td>
html += table[i].type; <td>${table[i]['traffic'] || '-'}</td>
html += "</td> <td>"; <td>${table[i].storage || '-'}</td>
html += table[i].networkType == 0 ? "TCP" : "P2P"; <td style='padding:2px 12px 2px 12px'>
html += "</td><td>"; <button onclick="stopContractByID('${table[i].id}')" class="btn btn-secondary">停止</button>
var consensusType; </td>
switch (table[i].consensusType) { </tr>`
case 0:
consensusType = "无";
break;
case 1:
consensusType = "PBFT";
break;
case 2:
consensusType = "RAFT";
break;
case 3:
consensusType = "Single";
break;
}
html += consensusType;
html += "</td><td>";
var responseType;
switch (table[i].responseType) {
case 0:
responseType = "ALL";
break;
case 1:
responseType = "MOST";
break;
case 2:
responseType = "FIRST";
break;
}
html += responseType;
html += "</td><td>";
html += table[i].times;
table[i].port;
html += "</td> <td>";
html += table[i].traffic;
html += "</td> <td>";
html += table[i].storage;
html += "</td> <td style='padding:2px 12px 2px 12px'>";
html += "<button onclick='stopContractByID(\"" + table[i].id + "\")' class='btn btn-secondary'>" + "停止</button>"
//table[i].resultCheck;
// html += "</td> <td>";
// html += "<button class='btn btn-outline-secondary' type='button'
// onclick='viewContractInstance("+ table[i].contractID +
// ")'>更多</button>";
html += "</td> </tr>";
} }
html += tableTail; html += tableTail;
html = "<h5 class='card-title'>合约实例列表</h5>" + html; html = "<h5 class='card-title'>合约实例列表</h5>" + html;
$("#ciTabDiv").html(html); ciTabDiv.html(html);
$("#ciTabDivTab").DataTable( $("#ciTabDivTab").DataTable(
{ {
@ -161,7 +147,7 @@ var drawciTable = function (table) {
dataIndex) { dataIndex) {
}, },
"headerCallback": function (thead, data, start, end, display) { "headerCallback": function (thead/*, data, start, end, display*/) {
$(thead).css("background", primaryColor); $(thead).css("background", primaryColor);
$(thead).css("color", "white"); $(thead).css("color", "white");
$(thead).children().css("background", primaryColor); $(thead).children().css("background", primaryColor);
@ -174,7 +160,7 @@ var drawciTable = function (table) {
"columnDefs": [ "columnDefs": [
{ {
"targets": 1, "targets": 1,
"render": function (data, type, row, meta) { "render": function (data/*, type, row, meta*/) {
if (data.length > 8) if (data.length > 8)
return "<span title='" + data + "'>" return "<span title='" + data + "'>"
+ data.substring(0, 8) + data.substring(0, 8)
@ -185,46 +171,48 @@ var drawciTable = function (table) {
},] },]
}); });
}; }
var stopContractByID = function (contractID) {
$("#dialogBodyDiv").html("是否停止合约，ContractID:" + contractID); function stopContractByID(contractID) {
$("#dialogBodyDiv").html("是否停止合约，ContractID：" + contractID);
showDialog("请确认", function () { showDialog("请确认", function () {
var request = {}; global.wssocket.send(JSON.stringify({
request.action = "killContractProcess"; action: 'killContractProcess',
request.requestID = new Date().getTime() + ""; requestID: new Date().getTime().toString(),
request.id = contractID; id: contractID
global.wssocket.send(JSON.stringify(request)); }));
}); });
}; }
var drawContractInstanceStatusPie = function (table) {
if ($("#ciStatusPieDiv").css("height") == "0px") { function drawContractInstanceStatusPie(table) {
const ciStatusPieDiv = $("#ciStatusPieDiv")
if (ciStatusPieDiv.css("height") === "0px") {
console.log("drawContractInstanceStatusPie: ignore"); console.log("drawContractInstanceStatusPie: ignore");
return; return;
} }
$("#ciStatusPieDiv") $(ciStatusPieDiv).html(
.html( "<div class='col-12' id='ciStatusPieDivCanv' style='width:100%; min-height: 150px; padding: 0;'></div>");
"<div class='col-12' id='ciStatusPieDivCanv' style='width:100%; min-height: 150px; padding: 0px'></div>"); const result = {};
var result = {}; for (let i = 0; i < table.length; i++) {
for (var i = 0; i < table.length; i++) { const obj = table[i];
var obj = table[i]; if (!result[obj['contractStatus']]) {
if (result[obj.contractStatus] == undefined) { result[obj['contractStatus']] = 1;
result[obj.contractStatus] = 1;
} else } else
result[obj.contractStatus]++; result[obj['contractStatus']]++;
} }
global.result = result; global.result = result;
var dataList = []; const dataList = [];
var valDataList = []; const valDataList = [];
for (var key in result) { for (const key in result) {
dataList.push(key); dataList.push(key);
var l = {}; valDataList.push({
l.name = key name: key,
l.value = result[key]; value: result[key]
valDataList.push(l); });
} }
var myChart = echarts.init($("#ciStatusPieDivCanv")[0], 'walden'); const myChart = echarts.init($("#ciStatusPieDivCanv")[0], 'walden');
var option222 = { const option222 = {
tooltip: { tooltip: {
trigger: 'item', trigger: 'item',
formatter: '{a} <br/>{b}: {c} ({d}%)' formatter: '{a} <br/>{b}: {c} ({d}%)'
@ -261,35 +249,35 @@ var drawContractInstanceStatusPie = function (table) {
}] }]
}; };
myChart.setOption(option222); myChart.setOption(option222);
}; }
var drawContractInstanceTimesPie = function (table) { function drawContractInstanceTimesPie(table) {
if ($("#ciTimesPieDiv").css("height") == "0px") { const ciTimesPieDiv = $("#ciTimesPieDiv");
if (ciTimesPieDiv.css("height") === "0px") {
console.log("drawContractInstanceTimesPie: ignore"); console.log("drawContractInstanceTimesPie: ignore");
return; return;
} }
$("#ciTimesPieDiv") ciTimesPieDiv.html(
.html( "<div class='col-12' id='ciTimesPieDivCanv' style='width:100%; min-height: 150px; padding: 0;'></div>");
"<div class='col-12' id='ciTimesPieDivCanv' style='width:100%; min-height: 150px; padding: 0px'></div>"); const result = {};
var result = {}; for (let i = 0; i < table.length; i++) {
for (var i = 0; i < table.length; i++) { const obj = table[i];
var obj = table[i];
result[obj.name] = obj.times; result[obj.name] = obj.times;
} }
global.result = result; global.result = result;
var dataList = []; const dataList = [];
var valDataList = []; const valDataList = [];
for (var key in result) { for (const key in result) {
dataList.push(key); dataList.push(key);
var l = {}; valDataList.push({
l.name = key name: key,
l.value = result[key]; value: result[key]
valDataList.push(l); });
} }
var myChart = echarts.init($("#ciTimesPieDivCanv")[0], 'walden'); const myChart = echarts.init($("#ciTimesPieDivCanv")[0], 'walden');
var option222 = { const option222 = {
tooltip: { tooltip: {
trigger: 'item', trigger: 'item',
formatter: '{a} <br/>{b}: {c} ({d}%)' formatter: '{a} <br/>{b}: {c} ({d}%)'
@ -326,18 +314,19 @@ var drawContractInstanceTimesPie = function (table) {
}] }]
}; };
myChart.setOption(option222); myChart.setOption(option222);
}; }
var changeContractInstance = function (obj) { function changeContractInstance(obj) {
let i;
console.log(obj); console.log(obj);
global.contractInstance = obj; global.contractInstance = obj;
console.log(typeof (obj)); console.log(typeof (obj));
showPermissionList(global.contractInstance); showPermissionList(global.contractInstance);
var contract; let contract;
for (var i = 0; i < global.contractList.length; i++) { for (i = 0; i < global.contractList.length; i++) {
if (global.contractList[i].id == obj) { if (global.contractList[i].id === obj) {
contract = global.contractList[i]; contract = global.contractList[i];
global.instance = contract; global.instance = contract;
global.instanceName = contract.name; global.instanceName = contract.name;
@ -350,79 +339,82 @@ var changeContractInstance = function (obj) {
} }
$("#selectContractFunction").html(""); $("#selectContractFunction").html("");
var x = document.getElementById("selectContractFunction"); const x = document.getElementById("selectContractFunction");
x.options.length = 0; x.options.length = 0;
x.add(new Option("选择方法...", " ")); x.add(new Option("选择方法...", " "));
console.log("contract ", contract); console.log("contract ", contract);
for (var i = 0; i < contract.exportedFunctions.length; i++) { for (i = 0; i < contract['exportedFunctions'].length; i++) {
var option = document.createElement("option"); const option = document.createElement("option");
option.text = contract.exportedFunctions[i].functionName; option.text = contract['exportedFunctions'][i].functionName;
option.value = contract.exportedFunctions[i].functionName; option.value = contract['exportedFunctions'][i].functionName;
x.add(option, null); x.add(option, null);
} }
}; }
var changeMemeryFiles = function (obj) { function changeMemoryFiles(obj) {
console.log(obj); console.log(obj);
global.memoryFile = obj; global.memoryFile = obj;
}; }
var executeContractWithDynamicResult = function () { function executeContractWithDynamicResult() {
const argDiv = $("#arg")[0]
console.log("executeContractWithDynamicResult"); console.log("executeContractWithDynamicResult");
var request = {}; const request = {};
request.action = "executeContract"; request.action = "executeContract";
request.requestID = new Date().getTime() + ""; request.requestID = new Date().getTime() + "";
request.contractName = global.contractInstance; request.contractName = global.contractInstance;
request.sequencing = global.instanceSequencing; request.sequencing = global.instanceSequencing;
request.useP2P = global.useP2P; request.useP2P = global.useP2P;
request.isDebug = executeContractAsDebug.checked; request.isDebug = executeContractAsDebug.checked;
var operation = $("#selectContractFunction")[0].value; const operation = $("#selectContractFunction")[0].value;
if (operation == " " && operation == undefined) { if (operation === " " && !operation) {
myToast("执行合约", "请选择合约方法！"); myToast("执行合约", "请选择合约方法！");
return; return;
} }
request.arg = "{\"action\":\"" + operation + "\",\"arg\":\"" request.arg = `{"action":"${operation}","arg":"${argDiv.value}"}`;
+ $("#arg")[0].value + "\"}";
request.pubkey = global.sm2Key.publicKey; request.pubkey = global.sm2Key.publicKey;
request.withDyanmicAnalysis = true; request.withDyanmicAnalysis = true;
request.signature = sm2.doSignature(request.contractID + "|" + operation request.signature = sm2.doSignature(
+ "|" + $("#arg")[0].value + "|" + global.sm2Key.publicKey, `${request.contractID}|${operation}|${argDiv.value}|${global.sm2Key.publicKey}`,
global.sm2Key.privateKey, {hash: true, der: true}); global.sm2Key.privateKey,
{hash: true, der: true});
localStorage.setItem("persisArg", JSON.stringify(request)); localStorage.setItem("persisArg", JSON.stringify(request));
global.wssocket.send(JSON.stringify(request)); global.wssocket.send(JSON.stringify(request));
}; }
var executeContract = function () { function executeContract() {
var request = {}; const argDiv = $('#arg')[0];
const request = {};
request.action = "executeContract"; request.action = "executeContract";
request.requestID = new Date().getTime() + ""; request.requestID = new Date().getTime() + "";
request.contractID = global.contractInstance; request.contractID = global.contractInstance;
var operation = $("#selectContractFunction")[0].value; const operation = $("#selectContractFunction")[0].value;
if (operation == " " && operation == undefined) { if (operation === " " && !operation) {
myToast("执行合约", "请选择合约方法！"); myToast("执行合约", "请选择合约方法！");
return; return;
} }
request.operation = operation; request.operation = operation;
request.arg = $("#arg")[0].value; request.arg = argDiv.value;
request.pubkey = global.sm2Key.publicKey; request.pubkey = global.sm2Key.publicKey;
request.isDebug = executeContractAsDebug.checked; request.isDebug = executeContractAsDebug.checked;
console.log(request.arg); console.log(request.arg);
request.signature = sm2.doSignature(request.contractID + "|" + operation request.signature = sm2.doSignature(
+ "|" + $("#arg")[0].value + "|" + global.sm2Key.publicKey, `${request.contractID}|${operation}|${argDiv.value}|${global.sm2Key.publicKey}`,
global.sm2Key.privateKey, {hash: true, der: true}); global.sm2Key.privateKey,
{hash: true, der: true});
localStorage.setItem("persisArg", JSON.stringify(request)); localStorage.setItem("persisArg", JSON.stringify(request));
global.wssocket.send(JSON.stringify(request)); global.wssocket.send(JSON.stringify(request));
}; }
var onExecuteResult = function (obj) { function onExecuteResult(obj) {
console.log("onExecuteResult obj.data", obj.data); console.log("onExecuteResult obj.data", obj.data);
try { try {
var result = obj; const result = obj;
var styleTail = "<br>字符串格式"; let styleTail = "<br>字符串格式";
$("#responseStatus").html("执行状态:" + result.status); $("#responseStatus").html("执行状态:" + result.status);
if (result.analysis != undefined) { if (result['analysis']) {
$("#responseArea")[0].value = "执行结果:" + result.result + "\n动态分析结果:" $("#responseArea")[0].value = "执行结果:" + result.result + "\n动态分析结果:"
+ result.analysis; + result['analysis'];
} else { } else {
if (result.result instanceof Object) { if (result.result instanceof Object) {
$("#responseArea")[0].value = JSON.stringify(result.result); $("#responseArea")[0].value = JSON.stringify(result.result);
@ -430,27 +422,25 @@ var onExecuteResult = function (obj) {
} else } else
$("#responseArea")[0].value = result.result; $("#responseArea")[0].value = result.result;
} }
$("#responseID").html("请求ID:" + obj.responseID); $("#responseID").html(`请求ID:${obj['responseID']}`);
$("#responseTime").html("响应时间:" + obj.executeTime + ("ms") + styleTail); $("#responseTime").html(`响应时间:${obj['executeTime']}ms${styleTail}`);
} catch (e) { } catch (e) {
$("#responseStatus").html("执行状态:Fail"); $("#responseStatus").html("执行状态：Failed");
$("#responseArea")[0].value = obj.data; $("#responseArea")[0].value = obj.data;
$("#responseID").html("请求ID:" + obj.responseID); $("#responseID").html(`请求ID：${obj['responseID']}`);
$("#responseTime").html("响应时间:" + obj.executeTime + ("ms")); $("#responseTime").html(`响应时间：${obj['executeTime']}ms`);
}
} }
};
function onHashResult(obj) {
var onHashResult = function (obj) {
$("#hashResult").html("数链指纹:" + obj.data); $("#hashResult").html("数链指纹:" + obj.data);
}; }
function drawCPTable(table) {
var drawCPTable = function (table) {
console.log("drawCPTable"); console.log("drawCPTable");
global.contractprocess = table.data; global.contractprocess = table.data;
if ($("#ciTabDiv").css("height") == "0px") { if ($("#ciTabDiv").css("height") === "0px") {
console.log("drawciTabDiv: ignore"); console.log("drawCPTableDiv: ignore");
return; return;
} }
var dtLang = { var dtLang = {
@ -480,39 +470,39 @@ var drawCPTable = function (table) {
"sSortDescending": ": 以降序排列此列" "sSortDescending": ": 以降序排列此列"
} }
}; };
var tableHead = "<table id='cpTabDivTab' class='table display row-border'><thead><tr><th>序号</th><th>PID</th><th>是否泄漏</th><th>启动时间</th><th>CPUUser</th><th>CPUSyss</th><th>resident</th><th>memory</th><th>管理</th></tr></thead><tbody>"; const tableHead = `<table id='cpTabDivTab' class='table display row-border'>
var tableTail = "</tbody></table>"; <thead><tr>
<th>序号</th>
<th>PID</th>
<th>是否泄漏</th>
<th>启动时间</th>
<th>CPUUser</th>
<th>CPUSyss</th>
<th>resident</th>
<th>memory</th>
<th>管理</th>
</tr></thead><tbody>`;
const tableTail = "</tbody></table>";
table = table.data; table = table.data;
console.log("drawciTable"); console.log("drawConInfoTable");
var html = tableHead; let html = tableHead;
for (var i = 0; i < table.length; i++) { for (let i = 0; i < table.length; i++) {
html += "<tr><td>"; html += `<tr>
html += (i + 1); <td>${i + 1}</td>
html += "</td> <td>"; <td>${table[i].pid}</td>
html += table[i].pid; <td>${table[i]['isLeak']}</td>
html += "</td> <td>"; <td>${new Date(table[i]['cpuStart']).toLocaleString()}/td>
html += table[i].isLeak; <td>${table[i]['cpuTotal']}</td>
html += "</td> <td>"; <td>${table[i]['cpuSys']}</td>
html += new Date(table[i].cpuStart).toLocaleString(); <td>${(table[i]['resident'] / (1024 * 1024)).toFixed(2)}MB</td>
html += "</td> <td>"; <td>${(table[i]['memsize'] / (1024 * 1024)).toFixed(2)}MB</td>
html += table[i].cpuTotal; <td style='padding:2px 12px 2px 12px'>
html += "</td> <td>"; <button onclick="stopContractByPID('${table[i].pid}')" class='btn btn-secondary'>停止</button>
html += table[i].cpuSys; </td>
html += "</td> <td>"; </tr>`
html += ((table[i].resident) / (1024 * 1024)).toFixed(2) + "MB";
html += "</td><td>";
html += ((table[i].memsize) / (1024 * 1024)).toFixed(2) + "MB";
html += "</td> <td style='padding:2px 12px 2px 12px'>";
html += "<button onclick='stopContractByPID(\"" + table[i].pid + "\")' class='btn btn-secondary'>" + "停止</button>"
//table[i].resultCheck;
// html += "</td> <td>";
// html += "<button class='btn btn-outline-secondary' type='button'
// onclick='viewContractInstance("+ table[i].contractID +
// ")'>更多</button>";
html += "</td> </tr>";
} }
html += tableTail; html += tableTail;
html = "<h5 class='card-title'>合约进程列表</h5>" + html; html = `<h5 class='card-title'>合约进程列表</h5>${html}`;
$("#cpTabDiv").html(html); $("#cpTabDiv").html(html);
$("#cpTabDivTab").DataTable( $("#cpTabDivTab").DataTable(
@ -522,7 +512,7 @@ var drawCPTable = function (table) {
dataIndex) { dataIndex) {
}, },
"headerCallback": function (thead, data, start, end, display) { "headerCallback": function (thead/*, data, start, end, display*/) {
$(thead).css("background", primaryColor); $(thead).css("background", primaryColor);
$(thead).css("color", "white"); $(thead).css("color", "white");
$(thead).children().css("background", primaryColor); $(thead).children().css("background", primaryColor);
@ -535,7 +525,7 @@ var drawCPTable = function (table) {
"columnDefs": [ "columnDefs": [
{ {
"targets": 1, "targets": 1,
"render": function (data, type, row, meta) { "render": function (data/*, type, row, meta*/) {
if (data.length > 10) if (data.length > 10)
// return "<span title='" + data + "'>" // return "<span title='" + data + "'>"
// + data.substring(0, 10) // + data.substring(0, 10)
@ -547,16 +537,17 @@ var drawCPTable = function (table) {
},] },]
}); });
}; }
var stopContractByPID = function (pid) {
function stopContractByPID(pid) {
$("#dialogBodyDiv").html("是否停止PID:" + pid); $("#dialogBodyDiv").html("是否停止PID:" + pid);
showDialog("请确认", function () { showDialog("请确认", function () {
var request = {}; global.wssocket.send(JSON.stringify({
request.action = "killProcessByPID"; action: 'killProcessByPID',
request.pid = pid; pid: pid
global.wssocket.send(JSON.stringify(request)); }));
var request2 = {}; global.wssocket.send(JSON.stringify({
request2.action = "listLeakContractProcess"; action: 'listLeakContractProcess'
global.wssocket.send(JSON.stringify(request2)); }));
}); });
}; }

93
js/OnlineIDE.js
View File

@ -28,10 +28,10 @@ function WSHandler(event) {
onDeleteFile(obj); onDeleteFile(obj);
break; break;
case "onStartContract": case "onStartContract":
onStartContract(obj); // onStartContract(obj);
break; // break;
case "onStartContractAsDebug": case "onStartContractAsDebug":
onStartContractAsDebug(obj); onStartContract(obj);
break; break;
case "onListContractProcess": case "onListContractProcess":
onListContractProcess(obj); onListContractProcess(obj);
@ -140,9 +140,10 @@ function getControlWsUrl(host) {
} }
function initWSocket() { function initWSocket() {
console.log("[nodecenterManagement.js] initWSocket : "); console.log("[OnlineIDE.js] initWSocket : ");
let host = document.location.host; let host = document.location.host;
let url = getControlWsUrl(global.urlparam && global.urlparam.nodeAddr ? global.urlparam.nodeAddr : host); let url = getControlWsUrl(
global.urlparam && global.urlparam['nodeAddr'] ? global.urlparam['nodeAddr'] : host);
// console.log("connect ws:" + url); // console.log("connect ws:" + url);
global.wssocket = createWssocket(url, function () { global.wssocket = createWssocket(url, function () {
getSession(); getSession();
@ -201,7 +202,7 @@ function onStartContract(data) {
showDialog("部署合约成功", function() { showDialog("部署合约成功", function() {
}); });
}*/ }*/
startResult.innerText = result.status + "(" + data.executeTime + "ms" + ")"; startResult.innerText = `${result.status}(${data['executeTime']}ms)`;
if (result.status !== "Success") { if (result.status !== "Success") {
let body = "<div class='input-group mb-3'>"; let body = "<div class='input-group mb-3'>";
body += " <textarea id='onStartContractFailedContent' class='form-control' style='min-height:300px' ></textarea>"; body += " <textarea id='onStartContractFailedContent' class='form-control' style='min-height:300px' ></textarea>";
@ -213,33 +214,33 @@ function onStartContract(data) {
} }
} }
function onStartContractAsDebug(data) { // function onStartContractAsDebug(data) {
// console.log(data); // // console.log(data);
const result = JSON.parse(data.data); // const result = JSON.parse(data.data);
/* if (result.isInsnLimit) { // /* if (result.isInsnLimit) {
global.withEvaluatesAnalysis = true; // global.withEvaluatesAnalysis = true;
$("#dialogBodyDiv").text("此合约在执行时会消耗gas,请在执行前进行预估，根据预估值给出相应的值，建议给出的值大于预估值"); // $("#dialogBodyDiv").text("此合约在执行时会消耗gas,请在执行前进行预估，根据预估值给出相应的值，建议给出的值大于预估值");
showDialog("部署合约成功", function() { // showDialog("部署合约成功", function() {
}); // });
}*/ // }*/
startResult.innerText = result.status + "(" + data.executeTime + "ms" + ")"; // startResult.innerText = `${result.status}(${data['executeTime']}ms)`;
if (result.status !== "Success") { // if (result.status !== "Success") {
let body = "<div class='input-group mb-3'>"; // let body = "<div class='input-group mb-3'>";
body += " <textarea id='onStartContractFailedContent' class='form-control' style='min-height:300px' ></textarea>"; // body += " <textarea id='onStartContractFailedContent' class='form-control' style='min-height:300px' ></textarea>";
body += " </div>"; // body += " </div>";
$("#dialogBodyDiv").html(body); // $("#dialogBodyDiv").html(body);
$("#onStartContractFailedContent")[0].value = result.result // $("#onStartContractFailedContent")[0].value = result.result
showDialog("部署合约失败", function () { // showDialog("部署合约失败", function () {
}); // });
} // }
} // }
function onKillContractProcess(data) { function onKillContractProcess(data) {
// console.log(data); // console.log(data);
if (data.data === "success") { if (data.data === "success") {
listContracts(); listContracts();
} }
stopResult.innerText = data.data + "(" + data.executeTime + "ms" + ")"; stopResult.innerText = `${data.data}(${data['executeTime']}ms)`;
} }
function onKillAllContract(data) { function onKillAllContract(data) {
@ -275,7 +276,7 @@ function onQueryContractInstanceInfoByDOI(data) {
initContractInstanceInfoArea(); initContractInstanceInfoArea();
// console.log(data); // console.log(data);
$("#contractInstanceInfoTitle") $("#contractInstanceInfoTitle")
.html(" (" + data.executeTime + "ms)"); .html(` (${data['executeTime']}ms)`);
global.contractInstanceInfoEditor.setValue(data.data); global.contractInstanceInfoEditor.setValue(data.data);
let totalLines = global.contractInstanceInfoEditor.lineCount(); let totalLines = global.contractInstanceInfoEditor.lineCount();
@ -292,7 +293,7 @@ function onImportContractInstanceCodeByDOI(data) {
initContractInstanceInfoArea(); initContractInstanceInfoArea();
// console.log(data); // console.log(data);
$("#contractInstanceInfoTitle") $("#contractInstanceInfoTitle")
.html(" (" + data.executeTime + "ms)"); .html(` (${data['executeTime']}ms)`);
global.contractInstanceInfoEditor.setValue(data.data); global.contractInstanceInfoEditor.setValue(data.data);
let totalLines = global.contractInstanceInfoEditor.lineCount(); let totalLines = global.contractInstanceInfoEditor.lineCount();
@ -307,14 +308,12 @@ function onImportContractInstanceCodeByDOI(data) {
global.wssocket.send("{\"action\":\"listProjects\",\"isPrivate\":true}"); global.wssocket.send("{\"action\":\"listProjects\",\"isPrivate\":true}");
} }
function onListContractProcess(data) { function onListContractProcess(data) {
// console.log(data); // console.log(data);
mainVue.contracts = []; mainVue.contracts = [];
var list = JSON.parse(data.data); const list = JSON.parse(data.data);
for (var i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
if (list[i].contractStatus != "KILLED") { if (list[i].contractStatus !== "KILLED") {
mainVue.contracts.push(list[i]); mainVue.contracts.push(list[i]);
} }
} }
@ -359,25 +358,25 @@ function initResponseAndOutputArea() {
} }
function onExecuteResult(obj) { function onExecuteResult(obj) {
const executeResultTitleEl = $("#executeResultTitle")
const data = obj; const data = obj;
$("#executeResultTitle") executeResultTitleEl
.html(data.status + " (" + obj.executeTime + "ms) 未知格式"); .html(`${data.status} (${obj['executeTime']}ms) 未知格式`);
if (data.result instanceof Object) { if (data.result instanceof Object) {
$("#executeResultTitle") executeResultTitleEl
.html(data.status + " (" + obj.executeTime + "ms) JSON格式"); .html(`${data.status} (${obj['executeTime']}ms) JSON格式`);
global.responseEditor.setValue(JSON.stringify(data.result)); global.responseEditor.setValue(JSON.stringify(data.result));
} else if (typeof data.result == 'string') { } else if (typeof data.result == 'string') {
$("#executeResultTitle") executeResultTitleEl
.html(data.status + " (" + obj.executeTime + "ms) 字符串格式"); .html(`${data.status} (${obj['executeTime']}ms) 字符串格式`);
global.responseEditor.setValue(data.result); global.responseEditor.setValue(data.result);
} else { } else {
if (typeof data.result == 'number') { if (typeof data.result == 'number') {
$("#executeResultTitle") executeResultTitleEl
.html(data.status + " (" + obj.executeTime + "ms) 数值格式"); .html(`${data.status} (${obj['executeTime']}ms) 数值格式`);
} else if (typeof data.result == 'boolean') { } else if (typeof data.result == 'boolean') {
$("#executeResultTitle") executeResultTitleEl
.html(data.status + " (" + obj.executeTime + "ms) 布尔型格式"); .html(`${data.status} (${obj['executeTime']}ms) 布尔型格式`);
} }
global.responseEditor.setValue(data.result.toString()); global.responseEditor.setValue(data.result.toString());
} }
@ -391,9 +390,9 @@ function onExecuteResult(obj) {
}, { }, {
line: totalLines line: totalLines
}); });
if (data.analysis && data.analysis.length > 0) { // if (data['analysis'] && data['analysis'].length > 0) {
// displayOutputStr(data.analysis); // displayOutputStr(data.analysis);
} // }
} }
function onGenerateReadme(obj) { function onGenerateReadme(obj) {

7
js/cm.js
View File

@ -399,9 +399,10 @@ var executeContract = function() {
global.wssocket.send(JSON.stringify(request)); global.wssocket.send(JSON.stringify(request));
}; };
var listContractProcess = function () { var listContractProcess = function () {
var request = {}; global.wssocket.send(JSON.stringify({
request.action = "listContractProcess"; action: 'listContractProcess',
global.wssocket.send(JSON.stringify(request)); filters: 2
}));
}; };
var killContractProcess = function () { var killContractProcess = function () {

2
js/codeManage/recoverFrame.js
View File

@ -50,7 +50,7 @@ var onListMemoryFiles = function(obj){
console.log(htm); console.log(htm);
$("#selectMemeryFiles").html(htm); $("#selectMemeryFiles").html(htm);
changeMemeryFiles($("#selectMemeryFiles")[0].value); changeMemoryFiles($("#selectMemeryFiles")[0].value);
}; };
var transferTo = function(){ var transferTo = function(){

114
js/codeManage/selectManage.js
View File

@ -1,29 +1,29 @@
var listContractProcess = function() { function listContractProcess() {
console.log("listContractProcess : "); console.log("listContractProcess : ");
var request = {}; global.wssocket.send(JSON.stringify({
request.action = "listContractProcess"; action: 'listContractProcess',
global.wssocket.send(JSON.stringify(request)); filters: 2
}));
}
}; function onListContractProcess(obj) {
const userManTab = $("#v-pills-contractInstance-tab")[0];
var onListContractProcess = function(obj) { const isActive = (userManTab.getAttribute("aria-selected") === "true");
var userManTab = $("#v-pills-contractInstance-tab")[0];
var isActive = (userManTab.getAttribute("aria-selected") == "true");
if (isActive) { if (isActive) {
onListContractProcess1(obj); onListContractProcess1(obj);
} else { } else {
onListContractProcess2(obj); onListContractProcess2(obj);
} }
}; }
var changeContractProcess = function(obj) { function changeContractProcess(obj) {
global.contractProcess = obj; // 代码管理菜单选中的合约 global.contractProcess = obj; // 代码管理菜单选中的合约
console.log("oooooooooooo" + global.contractProcess); console.log("oooooooooooo" + global.contractProcess);
//showPermissionList(global.contractProcess); //showPermissionList(global.contractProcess);
}; }
var onListContractProcess2 = function(obj) { function onListContractProcess2(obj) {
var data = JSON.parse(obj.data); const data = JSON.parse(obj.data);
global.contracts = data; global.contracts = data;
// $("#contractProcess").editableSelect('clear'); // $("#contractProcess").editableSelect('clear');
@ -31,9 +31,9 @@ var onListContractProcess2 = function(obj) {
global.contractName2ID = {}; global.contractName2ID = {};
//global.permissionNameMap = {}; //global.permissionNameMap = {};
var name = ""; let name = "";
var htm = "<option selected>选择合约进程</option>"; let htm = "<option selected>选择合约进程</option>";
for (var i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
// htm += "<option value='" + 0 + "'>" + data[i].name + "</option>"; // htm += "<option value='" + 0 + "'>" + data[i].name + "</option>";
htm += "<option selected>" + data[i].name + "</option>"; htm += "<option selected>" + data[i].name + "</option>";
global.contractName2ID[data[i].name] = data[i].id; global.contractName2ID[data[i].name] = data[i].id;
@ -58,32 +58,32 @@ var onListContractProcess2 = function(obj) {
* data[i].id).text( // data[i].id)); } } if (data.length > 0) * data[i].id).text( // data[i].id)); } } if (data.length > 0)
* $("#contractProcess").editableSelect()[0].value = data[0].name; * $("#contractProcess").editableSelect()[0].value = data[0].name;
*/ */
}; }
var addTcpNodeUnits = function(data) { function addTcpNodeUnits(data) {
if (data.length > 0) { if (data.length > 0) {
for (var i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
var unitID = data[i].key; const unitID = data[i].key;
var nodes = JSON.parse(data[i].value); const nodes = JSON.parse(data[i].value);
var json = {}; addNodeUnit({
json.type = "TCP"; type: 'TCP',
json.key = unitID; key: unitID,
json.value = nodes; value: nodes
addNodeUnit(json); });
}
} }
} }
};
var listSelectUnits = function(data) { function listSelectUnits(data) {
console.log(data); console.log(data);
global.units = {}; global.units = {};
var htm = ""; let htm = "";
if (data.length > 0) { if (data.length > 0) {
// data的key是创建人公钥_时间戳,value是nodes的ID // data的key是创建人公钥_时间戳,value是nodes的ID
for (var i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
var unitID = data[i].key; const unitID = data[i].key;
var nodes = JSON.parse(data[i].value); const nodes = JSON.parse(data[i].value);
var at_ = data[i].key.indexOf("_"); const at_ = data[i].key.indexOf("_");
console.log(nodes); console.log(nodes);
htm += "<option>集群:" + unitID.substring(at_ + 1) htm += "<option>集群:" + unitID.substring(at_ + 1)
+ "</option>"; + "</option>";
@ -96,26 +96,28 @@ var listSelectUnits = function(data) {
$("#selectUnits").html(htm); $("#selectUnits").html(htm);
} }
var onCancelAuth = function(obj) {
myToast("取消权限", obj.data);
if (obj.data == "success") {
}
};
var setPermission = function(data) { function onCancelAuth(obj) {
var request = {}; myToast("取消权限", obj.data);
request.resetContractProcess = data.name; if (obj.data === "success") {
console.log(request.resetContractName); }
request.closePer = data.permission; }
request.oldPer = data.oldPermission;
request.isOpen = data.isOpen; function setPermission(data) {
request.action = "setPermission"; // console.log(request.resetContractName);
global.wssocket.send(JSON.stringify(request)); global.wssocket.send(JSON.stringify({
}; resetContractProcess: data.name,
var onSetPermission = function(obj) { closePer: data.permission,
oldPer: data['oldPermission'],
isOpen: data.isOpen,
action: 'setPermission'
}));
}
function onSetPermission(obj) {
console.log(obj); console.log(obj);
var html = "<div class='input-group mb-2'>"; let html = "<div class='input-group mb-2'>";
html += "<div class='input-group-prepend'>"; html += "<div class='input-group-prepend'>";
html += "<span class='input-group-text' id='inputGroup-sizing-default'>"; html += "<span class='input-group-text' id='inputGroup-sizing-default'>";
@ -123,17 +125,17 @@ var onSetPermission = function(obj) {
html += "<div class='input-group-append'>"; html += "<div class='input-group-append'>";
html += "<select id='selectDumpPeriod2' class='custom-select' style='appearance: none; -webkit-appearance: none;'>"; html += "<select id='selectDumpPeriod2' class='custom-select' style='appearance: none; -webkit-appearance: none;'>";
if(period == "43200000"){ if (period === "43200000") {
html += "<option selected>/1day自动保存</option>"; html += "<option selected>/1day自动保存</option>";
html += "<option selected>/2days自动保存</option> "; html += "<option selected>/2days自动保存</option> ";
html += "<option selected>不保存</option>"; html += "<option selected>不保存</option>";
html += "<option selected>/12hours自动保存</option>"; html += "<option selected>/12hours自动保存</option>";
}else if(period == "86400000"){ } else if (period === "86400000") {
html += "<option selected>/2days自动保存</option> "; html += "<option selected>/2days自动保存</option> ";
html += "<option selected>不保存</option>"; html += "<option selected>不保存</option>";
html += "<option selected>/12hours自动保存</option>"; html += "<option selected>/12hours自动保存</option>";
html += "<option selected>/1day自动保存</option>"; html += "<option selected>/1day自动保存</option>";
}else if(period == "172800000"){ } else if (period === "172800000") {
html += "<option selected>不保存</option>"; html += "<option selected>不保存</option>";
html += "<option selected>/12hours自动保存</option>"; html += "<option selected>/12hours自动保存</option>";
html += "<option selected>/1day自动保存</option>"; html += "<option selected>/1day自动保存</option>";
@ -144,8 +146,8 @@ var onSetPermission = function(obj) {
html += "<option selected>/2days自动保存</option> "; html += "<option selected>/2days自动保存</option> ";
html += "<option selected>不保存</option>"; html += "<option selected>不保存</option>";
} }
}; }
var onListLeakContractProcess = function(obj){ function onListLeakContractProcess(obj) {
drawCPTable(obj); drawCPTable(obj);
} }

320
js/onlineide/rightmenu.js
View File

@ -1,28 +1,31 @@
var expandOrCollapse = function () { function expandOrCollapse() {
if ($("#outputNav").hasClass("col-2")) { const outputNavEl = $("#outputNav")
$("#outputNav").removeClass("col-2").addClass("col-6"); if (outputNavEl.hasClass("col-2")) {
outputNavEl.removeClass("col-2").addClass("col-6");
$("#mainBox").removeClass("col-8").addClass("col-4"); $("#mainBox").removeClass("col-8").addClass("col-4");
$("#expand").html("收起"); $("#expand").html("收起");
} else { } else {
$("#outputNav").removeClass("col-6").addClass("col-2"); outputNavEl.removeClass("col-6").addClass("col-2");
$("#mainBox").removeClass("col-4").addClass("col-8"); $("#mainBox").removeClass("col-4").addClass("col-8");
$("#expand").html("展开"); $("#expand").html("展开");
} }
}; }
var listContracts = function () {
var request = {};
request.action = "listContractProcess";
global.wssocket.send(JSON.stringify(request));
};
var startContract = function () { function listContracts() {
var key = pubkeyDialogVue.sm2KeyList[pubkeyDialogVue.selectedSM2Key]; global.wssocket.send(JSON.stringify({
var sm2Key = JSON.parse(key.sm2Key); action: 'listContractProcess',
var projectId = $("#selectedProject")[0].value; filters: 2
var project = global.projects[projectId]; }));
}
function startContract() {
const key = pubkeyDialogVue.sm2KeyList[pubkeyDialogVue.selectedSM2Key];
const sm2Key = JSON.parse(key.sm2Key);
const projectId = $("#selectedProject")[0].value;
const project = global.projects[projectId];
startResult.innerText = "正在启动合约:" + project; startResult.innerText = "正在启动合约:" + project;
var request = {}; const request = {};
request.action = "startContract"; request.action = "startContract";
request.isPrivate = $("#privateprojecttab").hasClass("active"); request.isPrivate = $("#privateprojecttab").hasClass("active");
@ -38,17 +41,16 @@ var startContract = function () {
request.script = "empty"; request.script = "empty";
} }
global.wssocket.send(JSON.stringify(request)); global.wssocket.send(JSON.stringify(request));
}
}; function startContractAsDebug() {
const key = pubkeyDialogVue.sm2KeyList[pubkeyDialogVue.selectedSM2Key];
var startContractAsDebug = function () { const sm2Key = JSON.parse(key.sm2Key);
var key = pubkeyDialogVue.sm2KeyList[pubkeyDialogVue.selectedSM2Key]; const projectId = $("#selectedProject")[0].value;
var sm2Key = JSON.parse(key.sm2Key); const project = global.projects[projectId];
var projectId = $("#selectedProject")[0].value;
var project = global.projects[projectId];
startResult.innerText = "正在以调试模式启动合约:" + project; startResult.innerText = "正在以调试模式启动合约:" + project;
var request = {}; const request = {};
request.action = "startContractAsDebug"; request.action = "startContractAsDebug";
request.isPrivate = $("#privateprojecttab").hasClass("active"); request.isPrivate = $("#privateprojecttab").hasClass("active");
@ -64,32 +66,32 @@ var startContractAsDebug = function () {
request.script = "empty"; request.script = "empty";
} }
global.wssocket.send(JSON.stringify(request)); global.wssocket.send(JSON.stringify(request));
}
function stopContract() {
global.wssocket.send(JSON.stringify({
action: 'killContractProcess',
requestID: new Date().getTime().toString(),
name: mainVue.contracts[selectedContract.value].name,
id: mainVue.contracts[selectedContract.value].id
}));
}
function genReadme() {
const request = {
isPrivate: global.currentFile.isPrivate,
path: global.currentFile.path
}; };
var stopContract = function () { const tmpIndex = request.path.lastIndexOf('/');
var request = {}; const yjsName = request.path.substring(tmpIndex + 1, request.path.length - 4);
request.action = "killContractProcess";
request.requestID = new Date().getTime() + "";
request.name = mainVue.contracts[selectedContract.value].name;
request.id = mainVue.contracts[selectedContract.value].id;
global.wssocket.send(JSON.stringify(request));
};
var genReadme = function () {
var request = {};
request.isPrivate = global.currentFile.isPrivate;
request.path = global.currentFile.path;
var tmpIndex = request.path.lastIndexOf('/');
var yjsName = request.path.substring(tmpIndex + 1, request.path.length - 4);
request.path = request.path.substring(0, tmpIndex); request.path = request.path.substring(0, tmpIndex);
var key = pubkeyDialogVue.sm2KeyList[pubkeyDialogVue.selectedSM2Key]; const key = pubkeyDialogVue.sm2KeyList[pubkeyDialogVue.selectedSM2Key];
var sm2Key = JSON.parse(key.sm2Key); const sm2Key = JSON.parse(key.sm2Key);
for (c of mainVue.contracts) { for (const c of mainVue.contracts) {
// 这里假设合约名同文件名 // 这里假设合约名同文件名
if (yjsName == c.name) { if (yjsName === c.name) {
var exportedFunction = c.exportedFunctions; const exportedFunction = c.exportedFunctions;
ReadmeFunction = []; ReadmeFunction = [];
for (let f of exportedFunction) { for (let f of exportedFunction) {
let description = "暂无描述"; let description = "暂无描述";
@ -97,11 +99,11 @@ var genReadme = function () {
readmeFunc.functionName = f.functionName; readmeFunc.functionName = f.functionName;
readmeFunc.description = description; readmeFunc.description = description;
for (let anno of f.annotations) { for (let anno of f.annotations) {
if (anno.type == 'Param') { if (anno.type === 'Param') {
readmeFunc.args = anno.args[0]; readmeFunc.args = anno.args[0];
} else if (anno.type == 'Description') { } else if (anno.type === 'Description') {
readmeFunc.description = anno.args[0]; readmeFunc.description = anno.args[0];
} else if (anno.type == 'Result') { } else if (anno.type === 'Result') {
readmeFunc.result = anno.args[0]; readmeFunc.result = anno.args[0];
} }
} }
@ -117,174 +119,168 @@ var genReadme = function () {
} }
} }
myToast("生成文档失败", "请启动合约并检查合约与文件名是否一致！"); myToast("生成文档失败", "请启动合约并检查合约与文件名是否一致！");
}; }
var genData = function () { function genData() {
var key = pubkeyDialogVue.sm2KeyList[pubkeyDialogVue.selectedSM2Key]; const key = pubkeyDialogVue.sm2KeyList[pubkeyDialogVue.selectedSM2Key];
var sm2Key = JSON.parse(key.sm2Key); const sm2Key = JSON.parse(key.sm2Key);
var value = selectedContract.value; const value = selectedContract.value;
if (value != undefined && value != "选择合约实例") { if (value && value !== "选择合约实例") {
var request = {}; const request = {};
request.action = "generateDataFromRM"; request.action = "generateDataFromRM";
request.requestID = new Date().getTime() + "_" request.requestID = `${new Date().getTime()}_${Math.floor(Math.random() * 10000)}`;
+ Math.floor(Math.random() * 10000); const contract = mainVue.contracts[selectedContract.value];
var contract = mainVue.contracts[selectedContract.value];
request.isPrivate = $("#privateprojecttab").hasClass("active"); request.isPrivate = $("#privateprojecttab").hasClass("active");
request.contractID = contract.id; request.contractID = contract.id;
request.contractName = mainVue.contracts[selectedContract.value].name; request.contractName = mainVue.contracts[selectedContract.value].name;
var arg = {};
if ($('#gasLimit').val() == undefined || $('#gasLimit').val() == "") {
arg.gasLimit = '1000';
} else {
arg.gasLimit = $('#gasLimit').val();
}
// console.log("[arg.gasLimit]"+arg.gasLimit);
request.pubkey = sm2Key.publicKey; request.pubkey = sm2Key.publicKey;
request.signature = sm2.doSignature(request.contractID + "|" + arg.action request.signature = sm2.doSignature(
+ "|" + arg.arg + "|" + sm2Key.publicKey, sm2Key.privateKey); `${request.contractID}|${arg.action}|${arg.arg}|${sm2Key.publicKey}`,
request.arg = JSON.stringify(arg); sm2Key.privateKey,
{hash: true, der: true});
const gasLimit = $('#gasLimit').val()
request.arg = JSON.stringify({
gasLimit: gasLimit ? gasLimit : '1000'
});
localStorage.setItem("persisArg", JSON.stringify(request)); localStorage.setItem("persisArg", JSON.stringify(request));
global.wssocket.send(JSON.stringify(request)); global.wssocket.send(JSON.stringify(request));
} }
};
var queryContractInstanceDOI = function () {
var request = {};
request.action = "queryContractInstanceDOI";
request.requestID = new Date().getTime() + "";
request.name = mainVue.contracts[selectedContract.value].name;
request.id = mainVue.contracts[selectedContract.value].id;
global.wssocket.send(JSON.stringify(request));
};
var queryContractInstanceInfoByDOI = function () {
var request = {};
request.action = "queryContractInstanceInfoByDOI";
request.requestID = new Date().getTime() + "";
request.doi = contractInstanceDOIInput.value;
global.wssocket.send(JSON.stringify(request));
};
var importContractInstanceCodeByDOI = function () {
var request = {};
request.action = "importContractInstanceCodeByDOI";
request.requestID = new Date().getTime() + "";
request.doi = contractInstanceDOIInput.value;
global.wssocket.send(JSON.stringify(request));
};
var openinClient = function () {
let url
if (isBaaS) {
url = `${location.origin}/client/BaaSClient.html${location.search}`;
} else {
url = `${location.origin}/client/bdwareclient.html?self=true&contract=${mainVue.contracts[selectedContract.value].id}`
} }
window.open(url);
};
var stopAllContract = function () {
var request = {};
request.action = "killAllContract";
global.wssocket.send(JSON.stringify(request));
};
var selectContractToExecute = function () {
var value = selectedContractAtExecute.value;
if (value && value !== "选择实例") {
var exportedFunction = mainVue.contracts[value].exportedFunctions;
mainVue.contractFunctions = exportedFunction;
var pingObj = {};
pingObj.action = "connectTo";
pingObj.name = mainVue.contracts[value].name;
pingObj.id = mainVue.contracts[value].id;
global.wssocket.send(JSON.stringify(pingObj));
function queryContractInstanceDOI() {
global.wssocket.send(JSON.stringify({
action: "queryContractInstanceDOI",
requestID: new Date().getTime().toString(),
name: mainVue.contracts[selectedContract.value].name,
id: mainVue.contracts[selectedContract.value].id
}));
} }
};
var executeContract = function () { function queryContractInstanceInfoByDOI() {
if (selectedFunction.value == undefined) { global.wssocket.send(JSON.stringify({
action: 'queryContractInstanceInfoByDOI',
requestID: new Date().getTime().toString(),
doi: contractInstanceDOIInput.value
}));
}
function importContractInstanceCodeByDOI() {
global.wssocket.send(JSON.stringify({
action: "importContractInstanceCodeByDOI",
requestID: new Date().getTime().toString(),
doi: contractInstanceDOIInput.value
}));
}
function openInClient() {
window.open(isBaaS ?
`${location.origin}/client/BaaSClient.html${location.search}` :
`${location.origin}/client/bdwareclient.html?self=true&` +
`contract=${mainVue.contracts[selectedContract.value].id}`);
}
function stopAllContract() {
global.wssocket.send(JSON.stringify({
action: 'killAllContract'
}));
}
function selectContractToExecute() {
const value = selectedContractAtExecute.value;
if (value && value !== "选择实例" && mainVue.contracts[value]) {
mainVue.contractFunctions = mainVue.contracts[value].exportedFunctions;
global.wssocket.send(JSON.stringify({
action: "connectTo",
name: mainVue.contracts[value].name,
id: mainVue.contracts[value].id
}));
}
}
function executeContract() {
if (!selectedFunction.value) {
myToast("调用合约失败", "请选择合约方法"); myToast("调用合约失败", "请选择合约方法");
return; return;
} }
if (selectedContractAtExecute.value == undefined) { if (!selectedContractAtExecute.value) {
myToast("调用合约失败", "请选择合约"); myToast("调用合约失败", "请选择合约");
return; return;
} }
var key = pubkeyDialogVue.sm2KeyList[pubkeyDialogVue.selectedSM2Key]; const key = pubkeyDialogVue.sm2KeyList[pubkeyDialogVue.selectedSM2Key];
var sm2Key = JSON.parse(key.sm2Key); const sm2Key = JSON.parse(key.sm2Key);
var request = {}; const request = {};
request.action = "executeContract"; request.action = "executeContract";
request.requestID = new Date().getTime() + "_" request.requestID = new Date().getTime() + "_"
+ Math.floor(Math.random() * 10000); + Math.floor(Math.random() * 10000);
var contract = mainVue.contracts[selectedContractAtExecute.value]; const contract = mainVue.contracts[selectedContractAtExecute.value];
request.contractID = contract.id; request.contractID = contract.id;
request.operation = contract.exportedFunctions[selectedFunction.value].functionName; request.operation = contract.exportedFunctions[selectedFunction.value].functionName;
arg = executeContractArgInput.value; const arg = executeContractArgInput.value;
if ($('#gasLimit').val() == undefined || $('#gasLimit').val() == "") { const gasLimit = $('#gasLimit').val()
request.gasLimit = '1000'; request.gasLimit = gasLimit ? gasLimit : '1000'
} else {
request.gasLimit = $('#gasLimit').val();
}
request.pubkey = sm2Key.publicKey; request.pubkey = sm2Key.publicKey;
request.signature = sm2.doSignature(request.contractID + "|" + request.operation request.signature = sm2.doSignature(
+ "|" + arg + "|" + sm2Key.publicKey, sm2Key.privateKey, {hash: true, der: true}); `${request.contractID}|${request.operation}|${arg}|${sm2Key.publicKey}`,
sm2Key.privateKey,
{hash: true, der: true});
request.arg = arg; request.arg = arg;
localStorage.setItem("persisArg", JSON.stringify(request)); localStorage.setItem("persisArg", JSON.stringify(request));
global.wssocket.send(JSON.stringify(request)); global.wssocket.send(JSON.stringify(request));
}; }
var executeContractWithDynamicResult = function () {
if (selectedFunction.value == undefined) { function executeContractWithDynamicResult() {
if (!selectedFunction.value) {
myToast("调用合约失败", "请选择合约方法"); myToast("调用合约失败", "请选择合约方法");
return; return;
} }
if (selectedContractAtExecute.value == undefined) { if (!selectedContractAtExecute.value) {
myToast("调用合约失败", "请选择合约"); myToast("调用合约失败", "请选择合约");
return; return;
} }
console.log("executeContractWithDynamicResult"); console.log("executeContractWithDynamicResult");
var request = {}; const request = {};
request.action = "executeContract"; request.action = "executeContract";
request.requestID = new Date().getTime() + ""; request.requestID = new Date().getTime() + "";
var contract = mainVue.contracts[selectedContractAtExecute.value]; const contract = mainVue.contracts[selectedContractAtExecute.value];
request.contractName = contract.id; request.contractName = contract.id;
var arg = {}; const arg = {
arg.action = contract.exportedFunctions[selectedFunction.value].functionName; action: contract.exportedFunctions[selectedFunction.value].functionName,
arg.arg = executeContractArgInput.value; arg: executeContractArgInput.value
};
request.withDyanmicAnalysis = true; request.withDyanmicAnalysis = true;
request.arg = "{\"action\":\"" + arg.action + "\",\"arg\":\"" + arg.arg request.arg = "{\"action\":\"" + arg.action + "\",\"arg\":\"" + arg.arg
+ "\"}"; + "\"}";
request.pubkey = global.sm2Key.publicKey; request.pubkey = global.sm2Key.publicKey;
request.signature = sm2.doSignature(request.contractID + "|" + arg.action request.signature = sm2.doSignature(
+ "|" + arg.arg + "|" + global.sm2Key.publicKey, `${request.contractID}|${arg.action}|${arg.arg}|${global.sm2Key.publicKey}`,
global.sm2Key.privateKey, {hash: true, der: true}); global.sm2Key.privateKey,
{hash: true, der: true});
localStorage.setItem("persisArg", JSON.stringify(request)); localStorage.setItem("persisArg", JSON.stringify(request));
global.wssocket.send(JSON.stringify(request)); global.wssocket.send(JSON.stringify(request));
}; }
var testEvaluates = function () {
if (selectedFunction.value == undefined) { function testEvaluates() {
if (!selectedFunction.value) {
myToast("调用合约失败", "请选择合约方法"); myToast("调用合约失败", "请选择合约方法");
return; return;
} }
if (selectedContractAtExecute.value == undefined) { if (!selectedContractAtExecute.value) {
myToast("调用合约失败", "请选择合约"); myToast("调用合约失败", "请选择合约");
return; return;
} }
console.log("Evaluates"); console.log("Evaluates");
var contract = mainVue.contracts[selectedContractAtExecute.value]; const contract = mainVue.contracts[selectedContractAtExecute.value];
var request = {}; global.wssocket.send(JSON.stringify({
request.action = "evaluates"; action: "evaluates",
request.contractName = contract.id; contractName: contract.id,
request.functionName = contract.exportedFunctions[selectedFunction.value].functionName; functionName: contract.exportedFunctions[selectedFunction.value].functionName,
request.args = executeContractArgInput.value; args: executeContractArgInput.value
}));
global.wssocket.send(JSON.stringify(request)); }
};

3
js/onlineide/rightmenu_en.js
View File

@ -12,6 +12,7 @@ var expandOrCollapse = function () {
var listContracts = function () { var listContracts = function () {
var request = {}; var request = {};
request.action = "listContractProcess"; request.action = "listContractProcess";
request.filters = 2;
global.wssocket.send(JSON.stringify(request)); global.wssocket.send(JSON.stringify(request));
}; };
@ -75,7 +76,7 @@ var importContractInstanceCodeByDOI = function () {
global.wssocket.send(JSON.stringify(request)); global.wssocket.send(JSON.stringify(request));
}; };
var openinClient = function () { var openInClient = function () {
var path = document.location.pathname; var path = document.location.pathname;
path = path.replace("/SCIDE", ""); path = path.replace("/SCIDE", "");
path = path.replace("/OnlineIDE.html", ""); path = path.replace("/OnlineIDE.html", "");

12
js/scide.js
View File

@ -326,11 +326,13 @@ var executeContract = function() {
localStorage.setItem("persisArg", JSON.stringify(request)); localStorage.setItem("persisArg", JSON.stringify(request));
global.wssocket.send(JSON.stringify(request)); global.wssocket.send(JSON.stringify(request));
}; };
var listContractProcess = function() {
var request = {}; function listContractProcess() {
request.action = "listContractProcess"; global.wssocket.send(JSON.stringify({
global.wssocket.send(JSON.stringify(request)); action: 'listContractProcess',
}; filters: 2
}));
}
var killContractProcess = function () { var killContractProcess = function () {
var request = {}; var request = {};