Skip to content
This repository has been archived by the owner on Mar 2, 2020. It is now read-only.

Commit

Permalink
* fix new bug in #74
Browse files Browse the repository at this point in the history
  • Loading branch information
Sing Painter committed Aug 29, 2018
1 parent 19f7971 commit 57af88c
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 29 deletions.
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ <h5 class="modal-title">Node address</h5>
<div class="modal-body">
<form class="form-inline" id="node-address">
<div class="input-group">
<input class="form-control" name="node-address" type="search" placeholder="wss://ws.golos.io" aria-label="wss://ws.golos.io" value="wss://ws.golos.io" required="">
<input class="form-control" name="node-address" type="url" placeholder="wss://ws.golos.io" aria-label="wss://ws.golos.io" value="wss://ws.golos.io" required="">
<button class="btn btn-danger" id="reset-node-address" type="button"><span class="icon-spinner11"></span></button>
<button class="btn btn-success" type="submit"><span class="icon-database"></span> Change</button>
</div>
Expand Down Expand Up @@ -588,7 +588,7 @@ <h5 class="modal-title">Node address</h5>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/plotly.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/swagger-ui-bundle.js"></script>
<script src="utils.js?201807131930"></script>
<script src="init.js?201808281600"></script>
<script src="init.js?201808300000"></script>
<script src="analytics.js"></script>
</body>
</html>
61 changes: 34 additions & 27 deletions init.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,6 @@ let $nodeAddressInput = $nodeAddress.querySelector('.form-control[name="node-add
if (localStorage && localStorage.nodeAddress) $nodeAddressInput.value = localStorage.nodeAddress;
let nodeAddress = $nodeAddressInput.value;

let getBlockchainVersion = (nodeAddress, callback) => {
let socket = new WebSocket(nodeAddress);
socket.onopen = (event) => {
socket.send(JSON.stringify({
jsonrpc: '2.0',
id: 1,
method: 'call',
params: ['database_api', 'get_config', [0], ]
}));
socket.onmessage = (raw) => {
let data = JSON.parse(raw.data);
socket.close();
callback(null, data.result);
};
};
socket.onerror = (event) => {
console.error('onerror', event);
callback(event.code, null);
}
};

getBlockchainVersion(nodeAddress, (err, result) => {
if (result && parseFloat(result.STEEMIT_BLOCKCHAIN_VERSION) < 0.18) golosJsVersion = '0.6.3';
loadGolosJsLib();
});

let loadGolosJsLib = () => {
let golosJsLib = document.createElement('script');
golosJsLib.src = `https://cdn.jsdelivr.net/npm/golos-js@${golosJsVersion}/dist/golos.min.js`;
Expand All @@ -40,4 +14,37 @@ let loadGolosJsLib = () => {
(document.head || document.documentElement).appendChild(appLib);
};
(document.head || document.documentElement).appendChild(golosJsLib);
};
};

let getBlockchainVersion = (nodeAddress, callback) => {
let socket;
try {
socket = new WebSocket(nodeAddress);
}
catch (e) {}
if (socket) {
socket.onopen = (event) => {
socket.send(JSON.stringify({
jsonrpc: '2.0',
id: 1,
method: 'call',
params: ['database_api', 'get_config', [0], ]
}));
socket.onmessage = (raw) => {
let data = JSON.parse(raw.data);
socket.close();
callback(null, data.result);
};
};
socket.onerror = (event) => {
console.error('onerror', event);
callback(event.code);
}
}
else callback(true);
};

getBlockchainVersion(nodeAddress, (err, result) => {
if (result && parseFloat(result.STEEMIT_BLOCKCHAIN_VERSION) < 0.18) golosJsVersion = '0.6.3';
loadGolosJsLib();
});

0 comments on commit 57af88c

Please sign in to comment.