mirror of
https://github.com/status-im/embark-area-51.git
synced 2025-02-17 01:37:26 +00:00
add early returns and lint
This commit is contained in:
Jonathan Rainville
parent
8770e1e2fe
commit
2ad852667e
23
lib/index.js
23
lib/index.js
@ -323,16 +323,15 @@ class Embark {
|
||||
return true;
|
||||
}
|
||||
});
|
||||
if(!checkFn || typeof checkFn.fn !== 'function') callback();
|
||||
else{
|
||||
checkFn.fn(function(serviceCheckResult){
|
||||
if(!serviceCheckResult.status || serviceCheckResult.status === 'off'){
|
||||
callback({message:`Cannot upload: ${platform} node is not running on http://${engine.config.storageConfig.host}:${engine.config.storageConfig.port}.`});
|
||||
} else {
|
||||
callback(null);
|
||||
}
|
||||
});
|
||||
if (!checkFn || typeof checkFn.fn !== 'function') {
|
||||
return callback();
|
||||
}
|
||||
checkFn.fn(function (serviceCheckResult) {
|
||||
if (!serviceCheckResult.status || serviceCheckResult.status === 'off') {
|
||||
return callback({message: `Cannot upload: ${platform} node is not running on http://${engine.config.storageConfig.host}:${engine.config.storageConfig.port}.`});
|
||||
}
|
||||
callback();
|
||||
});
|
||||
},
|
||||
function setupStoragePlugin(callback){
|
||||
let pluginList = engine.plugins.listPlugins();
|
||||
@ -352,9 +351,9 @@ class Embark {
|
||||
}
|
||||
if (!cmdPlugin) {
|
||||
engine.logger.info('try "embark upload ipfs" or "embark upload swarm"'.green);
|
||||
callback({message: 'unknown platform: ' + platform});
|
||||
}
|
||||
else callback(null);
|
||||
return callback({message: 'unknown platform: ' + platform});
|
||||
}
|
||||
callback();
|
||||
},
|
||||
function deploy(callback) {
|
||||
// 2. upload to storage (outputDone event triggered after webpack finished)
|
||||
|
||||
@ -2,9 +2,9 @@ import IpfsApi from 'ipfs-api';
|
||||
|
||||
let __embarkIPFS = {};
|
||||
|
||||
__embarkIPFS.setProvider = function(options) {
|
||||
__embarkIPFS.setProvider = function (options) {
|
||||
var self = this;
|
||||
var promise = new Promise(function(resolve, reject) {
|
||||
var promise = new Promise(function (resolve, reject) {
|
||||
try {
|
||||
if (options === undefined) {
|
||||
self.ipfsConnection = IpfsApi('localhost', '5001');
|
||||
@ -30,14 +30,14 @@ __embarkIPFS.setProvider = function(options) {
|
||||
return promise;
|
||||
};
|
||||
|
||||
__embarkIPFS.saveText = function(text) {
|
||||
__embarkIPFS.saveText = function (text) {
|
||||
const self = this;
|
||||
var promise = new Promise(function(resolve, reject) {
|
||||
var promise = new Promise(function (resolve, reject) {
|
||||
if (!self.ipfsConnection) {
|
||||
var connectionError = new Error('No IPFS connection. Please ensure to call Embark.Storage.setProvider()');
|
||||
reject(connectionError);
|
||||
}
|
||||
self.ipfsConnection.add(self.ipfsConnection.Buffer.from(text), function(err, result) {
|
||||
self.ipfsConnection.add(self.ipfsConnection.Buffer.from(text), function (err, result) {
|
||||
if (err) {
|
||||
reject(err);
|
||||
} else {
|
||||
@ -49,11 +49,11 @@ __embarkIPFS.saveText = function(text) {
|
||||
return promise;
|
||||
};
|
||||
|
||||
__embarkIPFS.get = function(hash) {
|
||||
__embarkIPFS.get = function (hash) {
|
||||
const self = this;
|
||||
// TODO: detect type, then convert if needed
|
||||
//var ipfsHash = web3.toAscii(hash);
|
||||
var promise = new Promise(function(resolve, reject) {
|
||||
var promise = new Promise(function (resolve, reject) {
|
||||
if (!self.ipfsConnection) {
|
||||
var connectionError = new Error('No IPFS connection. Please ensure to call Embark.Storage.setProvider()');
|
||||
reject(connectionError);
|
||||
@ -69,7 +69,7 @@ __embarkIPFS.get = function(hash) {
|
||||
return promise;
|
||||
};
|
||||
|
||||
__embarkIPFS.uploadFile = function(inputSelector) {
|
||||
__embarkIPFS.uploadFile = function (inputSelector) {
|
||||
const self = this;
|
||||
var file = inputSelector[0].files[0];
|
||||
|
||||
@ -77,16 +77,16 @@ __embarkIPFS.uploadFile = function(inputSelector) {
|
||||
throw new Error('no file found');
|
||||
}
|
||||
|
||||
var promise = new Promise(function(resolve, reject) {
|
||||
var promise = new Promise(function (resolve, reject) {
|
||||
if (!self.ipfsConnection) {
|
||||
var connectionError = new Error('No IPFS connection. Please ensure to call Embark.Storage.setProvider()');
|
||||
reject(connectionError);
|
||||
}
|
||||
var reader = new FileReader();
|
||||
reader.onloadend = function() {
|
||||
reader.onloadend = function () {
|
||||
var fileContent = reader.result;
|
||||
var buffer = self.ipfsConnection.Buffer.from(fileContent);
|
||||
self.ipfsConnection.add(buffer, function(err, result) {
|
||||
self.ipfsConnection.add(buffer, function (err, result) {
|
||||
if (err) {
|
||||
reject(err);
|
||||
} else {
|
||||
@ -100,16 +100,22 @@ __embarkIPFS.uploadFile = function(inputSelector) {
|
||||
return promise;
|
||||
};
|
||||
|
||||
__embarkIPFS.isAvailable = function(){
|
||||
__embarkIPFS.isAvailable = function () {
|
||||
return new Promise((resolve) => {
|
||||
if(!this.ipfsConnection) resolve(false);
|
||||
if (!this.ipfsConnection) {
|
||||
return resolve(false);
|
||||
}
|
||||
this.ipfsConnection.id()
|
||||
.then((id) => { resolve(Boolean(id)); })
|
||||
.catch(() => { resolve(false); });
|
||||
.then((id) => {
|
||||
resolve(Boolean(id));
|
||||
})
|
||||
.catch(() => {
|
||||
resolve(false);
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
__embarkIPFS.getUrl = function(hash) {
|
||||
__embarkIPFS.getUrl = function (hash) {
|
||||
return (this._getUrl || "http://localhost:8080/ipfs/") + hash;
|
||||
};
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
let __embarkSwarm = {};
|
||||
const bytes = require("eth-lib/lib/bytes");
|
||||
|
||||
__embarkSwarm.setProvider = function(options) {
|
||||
__embarkSwarm.setProvider = function (options) {
|
||||
this.bzz = web3.bzz;
|
||||
this.protocol = options.protocol;
|
||||
this.host = options.host;
|
||||
@ -13,7 +13,7 @@ __embarkSwarm.setProvider = function(options) {
|
||||
|
||||
var promise = new Promise((resolve, reject) => {
|
||||
try {
|
||||
if(!this.bzz.currentProvider) {
|
||||
if (!this.bzz.currentProvider) {
|
||||
this.bzz.setProvider(`${options.protocol}://${options.host}:${options.port}`);
|
||||
}
|
||||
resolve(this);
|
||||
@ -25,19 +25,25 @@ __embarkSwarm.setProvider = function(options) {
|
||||
return promise;
|
||||
};
|
||||
|
||||
__embarkSwarm.isAvailable = function(){
|
||||
__embarkSwarm.isAvailable = function () {
|
||||
return new Promise((resolve, reject) => {
|
||||
if(!this.bzz) resolve(false);
|
||||
if (!this.bzz) {
|
||||
return resolve(false);
|
||||
}
|
||||
this.bzz.isAvailable()
|
||||
.then(resolve)
|
||||
.catch(() => { reject(this.connectError); });
|
||||
.catch(() => {
|
||||
reject(this.connectError);
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
__embarkSwarm.saveText = function(text) {
|
||||
__embarkSwarm.saveText = function (text) {
|
||||
return new Promise((resolve, reject) => {
|
||||
this.isAvailable().then((isAvailable) => {
|
||||
if(!isAvailable) reject(this.connectError);
|
||||
if (!isAvailable) {
|
||||
return reject(this.connectError);
|
||||
}
|
||||
this.bzz.upload(text)
|
||||
.then(resolve)
|
||||
.catch(reject);
|
||||
@ -45,10 +51,12 @@ __embarkSwarm.saveText = function(text) {
|
||||
});
|
||||
};
|
||||
|
||||
__embarkSwarm.get = function(hash) {
|
||||
__embarkSwarm.get = function (hash) {
|
||||
return new Promise((resolve, reject) => {
|
||||
this.isAvailable().then((isAvailable) => {
|
||||
if(!isAvailable) reject(this.connectError);
|
||||
if (!isAvailable) {
|
||||
return reject(this.connectError);
|
||||
}
|
||||
this.bzz.download(hash)
|
||||
.then((uint8Array) => resolve(bytes.toString(bytes.fromUint8Array(uint8Array))))
|
||||
.catch(reject);
|
||||
@ -56,7 +64,7 @@ __embarkSwarm.get = function(hash) {
|
||||
});
|
||||
};
|
||||
|
||||
__embarkSwarm.uploadFile = function(inputSelector) {
|
||||
__embarkSwarm.uploadFile = function (inputSelector) {
|
||||
let file = inputSelector[0].files[0];
|
||||
|
||||
if (file === undefined) {
|
||||
@ -68,10 +76,12 @@ __embarkSwarm.uploadFile = function(inputSelector) {
|
||||
reader.onloadend = (event) => {
|
||||
var fileContent = new Uint8Array(event.target.result);
|
||||
this.isAvailable().then((isAvailable) => {
|
||||
if(!isAvailable) reject(this.connectError);
|
||||
if (!isAvailable) {
|
||||
return reject(this.connectError);
|
||||
}
|
||||
this.bzz.upload(fileContent)
|
||||
.then(resolve)
|
||||
.catch(reject);
|
||||
.then(resolve)
|
||||
.catch(reject);
|
||||
}).catch(reject);
|
||||
};
|
||||
reader.onerror = reject;
|
||||
@ -79,7 +89,7 @@ __embarkSwarm.uploadFile = function(inputSelector) {
|
||||
});
|
||||
};
|
||||
|
||||
__embarkSwarm.getUrl = function(hash) {
|
||||
__embarkSwarm.getUrl = function (hash) {
|
||||
return this._getUrl + hash;
|
||||
};
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
// for the whisper v5 and web3.js 1.0
|
||||
let __embarkWhisperNewWeb3 = {};
|
||||
|
||||
__embarkWhisperNewWeb3.setProvider = function(options) {
|
||||
__embarkWhisperNewWeb3.setProvider = function (options) {
|
||||
const self = this;
|
||||
let provider;
|
||||
if (options === undefined) {
|
||||
@ -13,12 +13,16 @@ __embarkWhisperNewWeb3.setProvider = function(options) {
|
||||
}
|
||||
// TODO: take into account type
|
||||
self.web3 = new Web3(new Web3.providers.WebsocketProvider("ws://" + provider));
|
||||
self.getWhisperVersion(function(err, version) {
|
||||
self.getWhisperVersion(function (err, version) {
|
||||
if (err) {
|
||||
console.log("whisper not available");
|
||||
} else if (version >= 5) {
|
||||
self.web3.shh.newSymKey().then((id) => { self.symKeyID = id; });
|
||||
self.web3.shh.newKeyPair().then((id) => { self.sig = id; });
|
||||
self.web3.shh.newSymKey().then((id) => {
|
||||
self.symKeyID = id;
|
||||
});
|
||||
self.web3.shh.newKeyPair().then((id) => {
|
||||
self.sig = id;
|
||||
});
|
||||
} else {
|
||||
throw new Error("version of whisper not supported");
|
||||
}
|
||||
@ -26,7 +30,7 @@ __embarkWhisperNewWeb3.setProvider = function(options) {
|
||||
});
|
||||
};
|
||||
|
||||
__embarkWhisperNewWeb3.sendMessage = function(options) {
|
||||
__embarkWhisperNewWeb3.sendMessage = function (options) {
|
||||
var topics, data, ttl, payload;
|
||||
topics = options.topic || options.topics;
|
||||
data = options.data || options.payload;
|
||||
@ -56,10 +60,11 @@ __embarkWhisperNewWeb3.sendMessage = function(options) {
|
||||
powTarget: powTarget
|
||||
};
|
||||
|
||||
this.web3.shh.post(message, function() { });
|
||||
this.web3.shh.post(message, function () {
|
||||
});
|
||||
};
|
||||
|
||||
__embarkWhisperNewWeb3.listenTo = function(options) {
|
||||
__embarkWhisperNewWeb3.listenTo = function (options) {
|
||||
var topics = options.topic || options.topics;
|
||||
|
||||
let promise = new __MessageEvents();
|
||||
@ -73,7 +78,7 @@ __embarkWhisperNewWeb3.listenTo = function(options) {
|
||||
let filter = this.web3.shh.subscribe("messages", {
|
||||
symKeyID: this.symKeyID,
|
||||
topics: topics
|
||||
}).on('data', function(result) {
|
||||
}).on('data', function (result) {
|
||||
var payload = JSON.parse(EmbarkJS.Utils.toAscii(result.payload));
|
||||
var data;
|
||||
data = {
|
||||
@ -91,21 +96,25 @@ __embarkWhisperNewWeb3.listenTo = function(options) {
|
||||
return promise;
|
||||
};
|
||||
|
||||
__embarkWhisperNewWeb3.getWhisperVersion = function(cb) {
|
||||
this.web3.shh.getVersion(function(err, version) {
|
||||
__embarkWhisperNewWeb3.getWhisperVersion = function (cb) {
|
||||
this.web3.shh.getVersion(function (err, version) {
|
||||
cb(err, version);
|
||||
});
|
||||
};
|
||||
|
||||
__embarkWhisperNewWeb3.isAvailable = function(){
|
||||
__embarkWhisperNewWeb3.isAvailable = function () {
|
||||
return new Promise((resolve, reject) => {
|
||||
if(!this.web3.shh) resolve(false);
|
||||
try{
|
||||
if (!this.web3.shh) {
|
||||
return resolve(false);
|
||||
}
|
||||
try {
|
||||
this.getWhisperVersion((err) => {
|
||||
resolve(Boolean(!err));
|
||||
});
|
||||
}
|
||||
catch(err){ reject(err); }
|
||||
catch (err) {
|
||||
reject(err);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
// for the old version of whisper and web3.js
|
||||
let __embarkWhisperOld = {};
|
||||
|
||||
__embarkWhisperOld.setProvider = function(options) {
|
||||
__embarkWhisperOld.setProvider = function (options) {
|
||||
const self = this;
|
||||
let provider;
|
||||
if (options === undefined) {
|
||||
@ -12,7 +12,7 @@ __embarkWhisperOld.setProvider = function(options) {
|
||||
provider = options.server + ':' + options.port;
|
||||
}
|
||||
self.web3 = new Web3(new Web3.providers.HttpProvider("http://" + provider));
|
||||
self.getWhisperVersion(function(err, version) {
|
||||
self.getWhisperVersion(function (err, version) {
|
||||
if (err) {
|
||||
console.log("whisper not available");
|
||||
} else if (version >= 5) {
|
||||
@ -24,7 +24,7 @@ __embarkWhisperOld.setProvider = function(options) {
|
||||
});
|
||||
};
|
||||
|
||||
__embarkWhisperOld.sendMessage = function(options) {
|
||||
__embarkWhisperOld.sendMessage = function (options) {
|
||||
var topics, data, ttl, priority, payload;
|
||||
topics = options.topic || options.topics;
|
||||
data = options.data || options.payload;
|
||||
@ -59,10 +59,11 @@ __embarkWhisperOld.sendMessage = function(options) {
|
||||
priority: priority
|
||||
};
|
||||
|
||||
return this.web3.shh.post(message, function() { });
|
||||
return this.web3.shh.post(message, function () {
|
||||
});
|
||||
};
|
||||
|
||||
__embarkWhisperOld.listenTo = function(options) {
|
||||
__embarkWhisperOld.listenTo = function (options) {
|
||||
var topics, _topics;
|
||||
topics = options.topic || options.topics;
|
||||
_topics = [];
|
||||
@ -80,7 +81,7 @@ __embarkWhisperOld.listenTo = function(options) {
|
||||
|
||||
let promise = new __MessageEvents();
|
||||
|
||||
let filter = this.web3.shh.filter(filterOptions, function(err, result) {
|
||||
let filter = this.web3.shh.filter(filterOptions, function (err, result) {
|
||||
var payload = JSON.parse(EmbarkJS.Utils.toAscii(result.payload));
|
||||
var data;
|
||||
if (err) {
|
||||
@ -101,20 +102,24 @@ __embarkWhisperOld.listenTo = function(options) {
|
||||
return promise;
|
||||
};
|
||||
|
||||
__embarkWhisperOld.getWhisperVersion = function(cb) {
|
||||
this.web3.version.getWhisper(function(err, _res) {
|
||||
__embarkWhisperOld.getWhisperVersion = function (cb) {
|
||||
this.web3.version.getWhisper(function (err, _res) {
|
||||
cb(err, self.web3.version.whisper);
|
||||
});
|
||||
};
|
||||
|
||||
__embarkWhisperOld.isAvailable = function(){
|
||||
__embarkWhisperOld.isAvailable = function () {
|
||||
return new Promise((resolve, reject) => {
|
||||
if(!this.web3) resolve(false);
|
||||
try{
|
||||
if (!this.web3) {
|
||||
return resolve(false);
|
||||
}
|
||||
try {
|
||||
this.getWhisperVersion((err) => {
|
||||
resolve(Boolean(!err));
|
||||
});
|
||||
}
|
||||
catch(err){ reject(err); }
|
||||
catch (err) {
|
||||
reject(err);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
17
package-lock.json
generated
17
package-lock.json
generated
@ -6025,7 +6025,7 @@
|
||||
"lockfile": "1.0.4",
|
||||
"node-fetch": "2.1.2",
|
||||
"semver": "5.5.0",
|
||||
"tar": "4.4.1",
|
||||
"tar": "4.4.2",
|
||||
"url-join": "4.0.0"
|
||||
},
|
||||
"dependencies": {
|
||||
@ -6060,21 +6060,26 @@
|
||||
"resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz",
|
||||
"integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
|
||||
"requires": {
|
||||
"safe-buffer": "5.1.1",
|
||||
"safe-buffer": "5.1.2",
|
||||
"yallist": "3.0.2"
|
||||
}
|
||||
},
|
||||
"safe-buffer": {
|
||||
"version": "5.1.2",
|
||||
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
|
||||
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
|
||||
},
|
||||
"tar": {
|
||||
"version": "4.4.1",
|
||||
"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz",
|
||||
"integrity": "sha512-O+v1r9yN4tOsvl90p5HAP4AEqbYhx4036AGMm075fH9F8Qwi3oJ+v4u50FkT/KkvywNGtwkk0zRI+8eYm1X/xg==",
|
||||
"version": "4.4.2",
|
||||
"resolved": "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz",
|
||||
"integrity": "sha512-BfkE9CciGGgDsATqkikUHrQrraBCO+ke/1f6SFAEMnxyyfN9lxC+nW1NFWMpqH865DhHIy9vQi682gk1X7friw==",
|
||||
"requires": {
|
||||
"chownr": "1.0.1",
|
||||
"fs-minipass": "1.2.5",
|
||||
"minipass": "2.2.4",
|
||||
"minizlib": "1.1.0",
|
||||
"mkdirp": "0.5.1",
|
||||
"safe-buffer": "5.1.1",
|
||||
"safe-buffer": "5.1.2",
|
||||
"yallist": "3.0.2"
|
||||
}
|
||||
},
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user