embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(@embark/storage): Allow upload when storage disabled 

Allow `embark upload` to upload to IPFS/Swarm even if the storage module is disabled in the storage config.

An easy way to test this is to set `config/storage.js` > `enabled` to `false` in the demo. Then run `embark upload`.
This commit is contained in:
emizzle 2019-03-07 10:21:07 +11:00 committed by Eric Mastro
parent c233dbc7fb
commit 9ea0383046
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/embark/src/lib/modules/ipfs/index.js
View File

@ -3,6 +3,7 @@ const utils = require('../../utils/utils.js');
const IpfsApi = require('ipfs-api'); const IpfsApi = require('ipfs-api');
// TODO: not great, breaks module isolation // TODO: not great, breaks module isolation
const StorageProcessesLauncher = require('../storage/storageProcessesLauncher'); const StorageProcessesLauncher = require('../storage/storageProcessesLauncher');
const constants = require('../../constants.json');
class IPFS { class IPFS {
@ -168,12 +169,12 @@ class IPFS {
} }
listenToCommands() { listenToCommands() {
this.events.setCommandHandler('logs:ipfs:enable', (cb) => { this.events.setCommandHandler('logs:ipfs:enable', (cb) => {
this.events.emit('logs:storage:enable'); this.events.emit('logs:storage:enable');
return cb(null, 'Enabling IPFS logs'); return cb(null, 'Enabling IPFS logs');
}); });
this.events.setCommandHandler('logs:ipfs:disable', (cb) => { this.events.setCommandHandler('logs:ipfs:disable', (cb) => {
this.events.emit('logs:storage:disable'); this.events.emit('logs:storage:disable');
return cb(null, 'Disabling IPFS logs'); return cb(null, 'Disabling IPFS logs');
}); });
@ -196,12 +197,14 @@ class IPFS {
isIpfsStorageEnabledInTheConfig() { isIpfsStorageEnabledInTheConfig() {
let {enabled, available_providers, dappConnection, upload} = this.storageConfig; let {enabled, available_providers, dappConnection, upload} = this.storageConfig;
return enabled && return (enabled || this.embark.currentContext.includes(constants.contexts.upload)) &&
available_providers.includes('ipfs') && (
( available_providers.includes('ipfs') &&
dappConnection.some(c => c.provider === 'ipfs') || (
upload.provider === 'ipfs' dappConnection.some(c => c.provider === 'ipfs') ||
); upload.provider === 'ipfs'
)
);
} }
} }

18
packages/embark/src/lib/modules/swarm/index.js
View File

@ -23,7 +23,7 @@ class Swarm {
const cantDetermineUrl = this.storageConfig.upload.provider !== 'swarm' && !this.storageConfig.dappConnection.some(connection => connection.provider === 'swarm'); const cantDetermineUrl = this.storageConfig.upload.provider !== 'swarm' && !this.storageConfig.dappConnection.some(connection => connection.provider === 'swarm');
if(this.isSwarmEnabledInTheConfig() && cantDetermineUrl){ if (this.isSwarmEnabledInTheConfig() && cantDetermineUrl) {
console.warn('\n===== Swarm module will not be loaded ====='); console.warn('\n===== Swarm module will not be loaded =====');
console.warn(`Swarm is enabled in the config, however the config is not setup to provide a URL for swarm and therefore the Swarm module will not be loaded. Please either change the ${'config/storage > upload'.bold} setting to Swarm or add the Swarm config to the ${'config/storage > dappConnection'.bold} array. Please see ${'https://embark.status.im/docs/storage_configuration.html'.underline} for more information.\n`); console.warn(`Swarm is enabled in the config, however the config is not setup to provide a URL for swarm and therefore the Swarm module will not be loaded. Please either change the ${'config/storage > upload'.bold} setting to Swarm or add the Swarm config to the ${'config/storage > dappConnection'.bold} array. Please see ${'https://embark.status.im/docs/storage_configuration.html'.underline} for more information.\n`);
return; return;
@ -136,12 +136,12 @@ class Swarm {
} }
listenToCommands() { listenToCommands() {
this.events.setCommandHandler('logs:swarm:enable', (cb) => { this.events.setCommandHandler('logs:swarm:enable', (cb) => {
this.events.emit('logs:storage:enable'); this.events.emit('logs:storage:enable');
return cb(null, 'Enabling Swarm logs'); return cb(null, 'Enabling Swarm logs');
}); });
this.events.setCommandHandler('logs:swarm:disable', (cb) => { this.events.setCommandHandler('logs:swarm:disable', (cb) => {
this.events.emit('logs:storage:disable'); this.events.emit('logs:storage:disable');
return cb(null, 'Disabling Swarm logs'); return cb(null, 'Disabling Swarm logs');
}); });
@ -164,12 +164,12 @@ class Swarm {
isSwarmEnabledInTheConfig() { isSwarmEnabledInTheConfig() {
let {enabled, available_providers, dappConnection, upload} = this.storageConfig; let {enabled, available_providers, dappConnection, upload} = this.storageConfig;
return enabled && return (enabled || this.embark.currentContext.includes(constants.contexts.upload)) &&
available_providers.includes('swarm') && available_providers.includes('swarm') &&
( (
dappConnection.some(c => c.provider === 'swarm') || dappConnection.some(c => c.provider === 'swarm') ||
upload.provider === "swarm" upload.provider === "swarm"
); );
} }
} }