${config.message}
+ + + + + ` + + return `data:text/html;base64,${Buffer.from(html, 'utf8').toString('base64')}` +} + +module.exports = { + getPromptEncodedHtml +} diff --git a/src/dialogs/prompt/index.js b/src/dialogs/prompt/index.js index bde6e10b5..24146b1f2 100644 --- a/src/dialogs/prompt/index.js +++ b/src/dialogs/prompt/index.js @@ -1,32 +1,38 @@ const { BrowserWindow, ipcMain } = require('electron') const crypto = require('crypto') -const { IS_MAC } = require('../../common/consts') + const dock = require('../../utils/dock') -const makePage = require('./template') const { getBackgroundColor } = require('./styles') +const { getPromptEncodedHtml } = require('./html') -function generatePage ({ message, defaultValue = '', buttons }, id) { - buttons = buttons.map((txt, i) => ``) - - if (IS_MAC) { - buttons.reverse() - } - - const page = makePage({ message, defaultValue, buttons, id }) - return `data:text/html;base64,${Buffer.from(page, 'utf8').toString('base64')}` -} +/** + * @typedef PromptConfiguration + * @type {object} + * @property {string} title + * @property {string} message + * @property {InputConfiguration[]} inputs + * @property {string[]} buttons + * @property {object} window + */ -module.exports = async function showPrompt (options) { - options = Object.assign({}, { +/** + * Displays a prompt to the user according to the given configuration. + * + * @param {PromptConfiguration} config + * @returns + */ +module.exports = async function showPrompt (config) { + config = Object.assign({}, { window: {}, showDock: true - }, options) + }, config) const window = new BrowserWindow({ - title: options.title, + title: config.title, show: false, width: 350, height: 330, + useContentSize: true, resizable: false, autoHideMenuBar: true, fullscreenable: false, @@ -35,7 +41,7 @@ module.exports = async function showPrompt (options) { nodeIntegration: true, contextIsolation: false }, - ...options.window + ...config.window }) // Generate random id @@ -44,20 +50,20 @@ module.exports = async function showPrompt (options) { return new Promise(resolve => { ipcMain.once(id, (_, data) => { window.destroy() - if (options.showDock) dock.hide() + if (config.showDock) dock.hide() resolve(data) }) window.on('close', () => { - if (options.showDock) dock.hide() + if (config.showDock) dock.hide() resolve({ input: '', button: null }) }) window.once('ready-to-show', () => { - if (options.showDock) dock.show() + if (config.showDock) dock.show() window.show() }) - window.loadURL(generatePage(options, id)) + window.loadURL(getPromptEncodedHtml(config, id)) }) } diff --git a/src/dialogs/prompt/styles.js b/src/dialogs/prompt/styles.js index aee1675ec..207406438 100644 --- a/src/dialogs/prompt/styles.js +++ b/src/dialogs/prompt/styles.js @@ -60,9 +60,27 @@ input { padding: 0.15rem; outline: 0; } +div.group { + margin: 0.5rem 0; +} +div.inline input, +div.inline label { + display: inline-block; + width: auto; + vertical-align: middle; +} +input[type=radio], +input[type=checkbox] { + margin-right: 0.25rem; +} #buttons { text-align: right; } +#logo { + width: 4rem; + margin: 0 auto .5rem; + display: block; +} button { margin-left: 0.5rem; padding: 0.25rem 0.5rem; diff --git a/src/dialogs/prompt/template.js b/src/dialogs/prompt/template.js deleted file mode 100644 index 12dfc6b87..000000000 --- a/src/dialogs/prompt/template.js +++ /dev/null @@ -1,35 +0,0 @@ -const { styles } = require('./styles') - -module.exports = ({ message, defaultValue, buttons, id }) => (` - - - - - -${message}
- - - - - -`) diff --git a/src/i18n.js b/src/i18n.js index c23090c7b..3e54255d4 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -6,7 +6,7 @@ const Backend = require('i18next-fs-backend') const store = require('./common/store') const ipcMainEvents = require('./common/ipc-main-events') -module.exports = async function () { +const setupI18n = async () => { await i18n .use(ICU) .use(Backend) @@ -34,3 +34,11 @@ module.exports = async function () { ipcMain.emit(ipcMainEvents.LANG_UPDATED, lang) }) } + +let result = null + +module.exports = async () => { + if (result) return result + result = await setupI18n() + return result +} diff --git a/src/protocol-handlers.js b/src/protocol-handlers.js deleted file mode 100644 index 49595cb90..000000000 --- a/src/protocol-handlers.js +++ /dev/null @@ -1,58 +0,0 @@ -const { app, shell } = require('electron') -const toUri = require('multiaddr-to-uri') - -function openLink (protocol, part, base) { - shell.openExternal(`${base}/${protocol}/${part}`) - return true -} - -function parseAddr (addr) { - return toUri(addr.toString().includes('/http') ? addr : addr.encapsulate('/http')) -} - -async function parseUrl (url, ctx) { - const ipfsd = ctx.getIpfsd ? await ctx.getIpfsd(true) : null - let base = 'https://ipfs.io' - - if (ipfsd && ipfsd.gatewayAddr) { - base = parseAddr(ipfsd.gatewayAddr) - } - - if (url.startsWith('ipfs://')) { - return openLink('ipfs', url.slice(7), base) - } else if (url.startsWith('ipns://')) { - return openLink('ipns', url.slice(7), base) - } else if (url.startsWith('dweb:/ipfs/')) { - return openLink('ipfs', url.slice(11), base) - } else if (url.startsWith('dweb:/ipns/')) { - return openLink('ipns', url.slice(11), base) - } - - return false -} - -async function argvHandler (argv, ctx) { - let handled = false - - for (const arg of argv) { - if (await parseUrl(arg, ctx)) { - handled = true - } - } - - return handled -} - -module.exports = function (ctx) { - // Handle if the app started running now, and a link - // was sent to be handled. - argvHandler(process.argv, ctx) - - // Handle URLs in macOS - app.on('open-url', (event, url) => { - event.preventDefault() - parseUrl(url, ctx) - }) -} - -module.exports.argvHandler = argvHandler diff --git a/src/protocol-handlers/index.js b/src/protocol-handlers/index.js new file mode 100644 index 000000000..072dc3e22 --- /dev/null +++ b/src/protocol-handlers/index.js @@ -0,0 +1,133 @@ +const { app, shell, ipcMain } = require('electron') +const i18n = require('i18next') +const createToggler = require('../utils/create-toggler') +const store = require('../common/store') +const { showPrompt } = require('../dialogs') +const setupI18n = require('../i18n') +const { parseUrl, getGatewayUrl } = require('./urls') +const { ASK_OPENING_IPFS_URIS: CONFIG_KEY } = require('../common/config-keys') + +const CONFIG_KEY_ACTION = 'openIpfsURIsAction' + +const ACTION_OPTIONS = { + OPEN_IN_BROWSER: 'openInBrowser', + OPEN_IN_IPFS_DESKTOP: 'openInIpfsDesktop' +} + +const DEFAULT_ACTION = ACTION_OPTIONS.OPEN_IN_BROWSER + +async function getAction () { + const askWhenOpeningUri = store.get(CONFIG_KEY, true) + if (!askWhenOpeningUri) { + return store.get(CONFIG_KEY_ACTION, DEFAULT_ACTION) + } + + const { button, input } = await showPrompt({ + title: i18n.t('protocolHandlerDialog.title'), + message: i18n.t('protocolHandlerDialog.message'), + inputs: [ + { + type: 'radio', + name: 'action', + defaultValue: DEFAULT_ACTION, + labels: { + [ACTION_OPTIONS.OPEN_IN_BROWSER]: i18n.t('protocolHandlerDialog.openInBrowser'), + [ACTION_OPTIONS.OPEN_IN_IPFS_DESKTOP]: i18n.t('protocolHandlerDialog.openInIpfsDesktop') + } + }, + { + type: 'checkbox', + name: 'remember', + defaultValue: 'checked', + label: i18n.t('protocolHandlerDialog.rememberThisChoice') + } + ], + buttons: [ + i18n.t('continue'), + i18n.t('cancel') + ], + window: { + width: 500, + height: 218 + } + }) + + if (button === 1) { + // User canceled. + return + } + + const { remember, action } = input + if (remember === 'on') { + store.set(CONFIG_KEY, false) + store.set(CONFIG_KEY_ACTION, action) + ipcMain.emit('configUpdated') + } + + return action +} + +/** + * @returns {Promise