package.json

Install NativeMessagingHost for Chromium and Chrome dev/canary

.babelrc

@@ -0,0 +1,14 @@
+{
+    "presets": [],
+    "plugins": [
+        ["@babel/plugin-proposal-class-properties", { "loose": true }],
+        ["@babel/plugin-proposal-object-rest-spread", { "loose": true,
+            "useBuiltIns": true
+        }],
+        "@babel/plugin-proposal-optional-catch-binding",
+        "@babel/plugin-proposal-optional-chaining",
+        "@babel/plugin-proposal-nullish-coalescing-operator",
+        "@babel/plugin-proposal-logical-assignment-operators",
+        "@babel/plugin-external-helpers"
+    ]
+}

.editorconfig

@@ -10,14 +10,10 @@ insert_final_newline = true
 charset = utf-8
 indent_style = space
 indent_size = 4
-charset = utf-8
 trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
 
-[*.json]
-indent_size = 2
-
-[*.scss]
+[{*.nsh,*.yml,*.yaml,*.json}]
 indent_size = 2

.eslintrc

@@ -0,0 +1,69 @@
+{
+    "plugins": ["prettier", "import", "babel"],
+    "extends": ["standard", "eslint:recommended", "plugin:prettier/recommended"],
+    "rules": {
+        "semi": ["error", "always"],
+        "one-var": "off",
+        "space-before-function-paren": "off",
+        "no-throw-literal": "off",
+        "camelcase": ["error", { "properties": "always" }],
+        "no-console": "error",
+        "no-alert": "error",
+        "no-debugger": "error",
+        "prefer-arrow-callback": "error",
+        "object-property-newline": "off",
+        "no-useless-escape": "off",
+        "no-var": "error",
+        "prefer-const": "error",
+        "no-unused-expressions": "off",
+        "strict": ["error", "never"],
+        "no-mixed-operators": "off",
+        "prefer-promise-reject-errors": "off",
+        "standard/no-callback-literal": "off",
+        "object-curly-spacing": "off",
+        "quote-props": "off",
+        "no-new-object": "error",
+        "object-shorthand": "error",
+        "no-array-constructor": "error",
+        "array-callback-return": "error",
+        "no-eval": "error",
+        "no-new-func": "error",
+        "prefer-rest-params": "error",
+        "prefer-spread": "error",
+        "no-useless-constructor": "error",
+        "no-dupe-class-members": "error",
+        "no-duplicate-imports": "error",
+        "eqeqeq": "error",
+        "no-unneeded-ternary": "error",
+        "curly": "error",
+        "prettier/prettier": "error",
+        "no-empty": "off",
+        "no-restricted-syntax": [
+            "error",
+            {
+                "selector": "ExportDefaultDeclaration",
+                "message": "Prefer named exports"
+            }
+        ],
+        "import/no-webpack-loader-syntax": "off",
+        "import/no-relative-parent-imports": "error",
+        "import/first": "error",
+        "import/no-default-export": "error",
+        "babel/no-unused-expressions": "error",
+        "node/no-callback-literal": "off"
+    },
+    "parserOptions": {
+        "sourceType": "module",
+        "ecmaFeatures": {
+            "impliedStrict": true
+        }
+    },
+    "parser": "babel-eslint",
+    "globals": {
+        "_": true,
+        "$": true
+    },
+    "env": {
+        "browser": true
+    }
+}

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at antelle.net@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [keeweb, antelle]
+patreon: # Replace with a single Patreon username
+open_collective: keeweb
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # for example PayPal links

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve KeeWeb
+title: ''
+labels: 'bug'
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Environment**
+Please copy all version information from Settings/Help
+
+**Kdbx File**
+Does it happen on Demo or New database?  
+If you have a test db without your personal data, please attach it.
+
+**Logs**
+Please open dev tools in your browser and attach output log from Console tab. If you are using a desktop app, devtools can be opened from Settings/General/Advanced.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: true

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'enhancement'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,15 @@
+Thanks for taking the time to contribute! :gift:
+
+Please follow these steps:
+
+1. work on the right branch: it must be `develop` for new features and `master` for hotfixes
+2. make sure the feature you add is not listed in [banned features](https://github.com/keeweb/keeweb/wiki/Unsupported-Features)
+3. check compatibility with [the project roadmap](https://github.com/keeweb/keeweb/wiki/TODO) and key features: you should not break anything
+4. if your feature is introducing a lot of new UI or changing any UX or design concept, please open an issue to discuss it first
+5. please respect existing style in code, styles, and markup (hint: install and enable [editorconfig](http://editorconfig.org/) in your editor)
+6. don't add any dependencies
+7. test your code: it must work in all browsers, Windows, OSX, and Linux
+8. if your code is platform-dependent, please add corresponding switches
+9. respect each platform: don't create a behaviour that breaks interface guidelines or user expectations 
+10. run `grunt` and make sure it's passing 
+11. replace this message with the actual description

.github/actions/linux-build/Dockerfile

@@ -0,0 +1,11 @@
+FROM snapcore/snapcraft:stable
+
+COPY entrypoint.sh /entrypoint.sh
+
+RUN apt-get update
+RUN apt-get install -y build-essential git-core unzip curl pkg-config rpm
+RUN curl -sL https://deb.nodesource.com/setup_15.x | sudo -E bash -
+RUN apt-get install -y nodejs
+RUN npm i -g grunt-cli
+
+ENTRYPOINT ["/entrypoint.sh"]

.github/actions/linux-build/action.yml

@@ -0,0 +1,5 @@
+name: 'Linux Build'
+description: 'Build KeeWeb on Linux in Docker'
+runs:
+  using: 'docker'
+  image: 'Dockerfile'

.github/actions/linux-build/entrypoint.sh

@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+cd /github/workspace
+npm ci
+grunt desktop-linux

.github/actions/scripts/git-restore-mtime.py

@@ -0,0 +1,404 @@
+#!/usr/bin/env python3
+#
+# git-restore-mtime - Change mtime of files based on commit date of last change
+#
+#    Copyright (C) 2012 Rodrigo Silva (MestreLion) <linux@rodrigosilva.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program. See <http://www.gnu.org/licenses/gpl.html>
+#
+"""
+Change the modification time (mtime) of all files in work tree, based on the
+date of the most recent commit that modified the file.
+
+Useful prior to generating release tarballs, so each file is archived with a
+date that is similar to the date when the file was actually last modified,
+assuming the actual modification date and its commit date are close.
+
+By default ignores all ignored and untracked files, and also refuses to work
+on trees with uncommitted changes.
+"""
+
+# TODO:
+# - Add -z on git whatchanged/ls-files so we don't deal with filename decode/OS normalization
+# - When Python is bumped to 3.7, use text instead of universal_newlines on subprocess
+# - Update "Statistics for some large projects" with modern hardware and repositories.
+# - Create a README.md for git-restore-mtime alone. It deserves extensive documentation
+#   - Move Statistics there
+
+# FIXME:
+# - When current dir is outside the worktree, e.g. using --work-tree, `git ls-files`
+#   assume any relative pathspecs are to worktree root, not the current dir. As such,
+#   relative pathspecs may not work.
+# - Renames and mode changes should not change file mtime:
+#   - Must check on status 'R100' and mode changes with same blobs
+#   - Should require status to be (A, C, M, R<100, T). D will never be processed as
+#     filelist is a subset of lsfileslist.
+# - Check file (A, D) for directory mtime is not sufficient:
+#   - Renames also change dir mtime, unless rename was on a parent dir
+#   - If most recent change of all files in a dir was a [M]odification,
+#     dir might not be touched at all.
+#   - Dirs containing only subdirectories but no direct files will also
+#     not be touched. They're files' [grand]parent dir, but never their dirname().
+#   - Some solutions:
+#     - After files done, perform some dir processing for missing dirs, finding latest
+#       file (A, D, R)
+#     - Simple approach: dir mtime is most recent child (dir or file) mtime
+#     - Use a virtual concept of "created at most at" to fill missing info, bubble up
+#       to parents and grandparents
+#   - When handling [grand]parent dirs, stay inside <pathspec>
+# - Better handling of merge commits. `-m` is plain *wrong*. `-c/--cc` is perfect, but
+#   painfully slow. First pass without merge commits is not accurate. Maybe add a new
+#   `--accurate` mode for `--cc`?
+
+if __name__ != "__main__":
+    raise ImportError("{} should not be used as a module.".format(__name__))
+
+import subprocess, shlex
+import sys, os.path
+import logging
+import argparse
+import time
+
+
+# Update symlinks only if the OS supports not following them
+UPDATE_SYMLINKS = bool(os.utime in getattr(os, 'supports_follow_symlinks', []))
+STEPMISSING = 100
+
+
+# Command-line interface ######################################################
+
+def parse_args():
+    parser = argparse.ArgumentParser(
+        description="""Restore original modification time of files based on the date of the
+        most recent commit that modified them. Useful when generating release tarballs.""")
+
+    group = parser.add_mutually_exclusive_group()
+    group.add_argument('--quiet', '-q', dest='loglevel',
+        action="store_const", const=logging.WARNING, default=logging.INFO,
+        help="Suppress informative messages and summary statistics.")
+    group.add_argument('--verbose', '-v', action="count",
+        help="Print additional information for each processed file.")
+
+    parser.add_argument('--force', '-f', action="store_true",
+        help="Force execution on trees with uncommitted changes.")
+
+    parser.add_argument('--merge', '-m', action="store_true",
+        help="""Include merge commits. Leads to more recent mtimes and more files per
+        commit, thus with the same mtime (which may or may not be what you want). Including
+        merge commits may lead to less commits being evaluated (all files are found sooner),
+        which improves performance, sometimes substantially. But since merge commits are
+        usually huge, processing them may also take longer, sometimes substantially.
+        By default merge logs are only used for files missing from regular commit logs.""")
+
+    parser.add_argument('--first-parent', action="store_true",
+        help="""Consider only the first parent, the "main branch", when parsing merge
+        commit logs. Only effective when merge commits are included in the log, either
+        by --merge or to find missing files after first log parse. See --skip-missing.""")
+
+    parser.add_argument('--skip-missing', '-s',
+        action="store_false", default=True, dest="missing",
+        help="""Do not try to find missing files. If some files were not found in regular
+        commit logs, by default it re-tries using merge commit logs for these files (if
+        --merge was not already used). This option disables this behavior, which may slightly
+        improve performance, but files found only in merge commits will not be updated.""")
+
+    parser.add_argument('--no-directories', '-D',
+        action="store_false", default=True, dest='dirs',
+        help="""Do not update directory mtime for files created, renamed or deleted in it.
+        Note: just modifying a file will not update its directory mtime.""")
+
+    parser.add_argument('--test', '-t', action="store_true", default=False,
+        help="Test run: do not actually update any file")
+
+    parser.add_argument('--commit-time', '-c',
+        action='store_true', default=False, dest='commit_time',
+        help="Use commit time instead of author time")
+
+    parser.add_argument('pathspec', nargs='*', metavar='PATH',
+        help="""Only modify paths matching PATH, directories or files, relative to current
+        directory. Default is to modify all files handled by git, ignoring untracked files
+        and submodules.""")
+
+    parser.add_argument('--work-tree', dest='workdir',
+        help="Path to the work tree, if not current directory or one of its parents.")
+
+    parser.add_argument('--git-dir', dest='gitdir',
+        help="Path to the git repository, if not the default <work-tree-root>/.git")
+
+    parser.add_argument('--skip-older-than', metavar='SECONDS', type=int,
+        help="""Do not modify files that are older than %(metavar)s.
+        It can significantly improve performance if fewer files are processed.
+        Useful on CI builds, which can eventually switch workspace to different branch,
+        but mostly performs builds on the same one (e.g. master).
+        """)
+
+    return parser.parse_args()
+
+
+# Helper functions ############################################################
+
+def setup_logging(args):
+    TRACE = logging.DEBUG // 2
+    logging.Logger.trace = lambda _, m, *a, **k: _.log(TRACE, m, *a, **k)
+    level = (args.verbose and max(TRACE, logging.DEBUG // args.verbose)) or args.loglevel
+    logging.basicConfig(level=level, format='%(message)s')
+    return logging.getLogger()
+
+
+def normalize(path):
+    """Normalize paths from git, handling non-ASCII characters.
+
+    Git for Windows, as of v1.7.10, stores paths as UTF-8 normalization form C. If path
+    contains non-ASCII or non-printable chars it outputs the UTF-8 in octal-escaped
+    notation, double-quoting the whole path. Double-quotes and backslashes are also escaped.
+
+    https://git-scm.com/docs/git-config#Documentation/git-config.txt-corequotePath
+    https://github.com/msysgit/msysgit/wiki/Git-for-Windows-Unicode-Support
+    https://github.com/git/git/blob/master/Documentation/i18n.txt
+
+    Example on git output, this function reverts this:
+    r'back\slash_double"quote_açaí' -> r'"back\\slash_double\"quote_a\303\247a\303\255"'
+    """
+    if path and path[0] == '"':
+        # Python 2: path = path[1:-1].decode("string-escape")
+        # Python 3: https://stackoverflow.com/a/46650050/624066
+        path = (path[1:-1]                 # Remove enclosing double quotes
+                .encode('latin1')          # Convert to bytes, required 'unicode-escape'
+                .decode('unicode-escape')  # Perform the actual octal-escaping decode
+                .encode('latin1')          # 1:1 mapping to bytes, forming UTF-8 encoding
+                .decode('utf8'))           # Decode from UTF-8
+    # Make sure the slash matches the OS; for Windows we need a backslash
+    return os.path.normpath(path)
+
+
+if UPDATE_SYMLINKS:
+    def touch(path, mtime, test=False):
+        """The actual mtime update"""
+        if test: return
+        os.utime(path, (mtime, mtime), follow_symlinks=False)
+else:
+    def touch(path, mtime, test=False):
+        """The actual mtime update"""
+        if test: return
+        os.utime(path, (mtime, mtime))
+
+
+def isodate(secs):
+    return time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(secs))
+
+
+# Git class and parselog(), the heart of the script ###########################
+
+class Git():
+    def __init__(self, workdir=None, gitdir=None):
+        self.gitcmd = ['git']
+        if workdir: self.gitcmd.extend(('--work-tree', workdir))
+        if gitdir : self.gitcmd.extend(('--git-dir',   gitdir))
+        self.workdir, self.gitdir = self._repodirs()
+
+    def ls_files(self, pathlist=None):
+        return (normalize(_) for _ in self._run('ls-files --full-name', pathlist))
+
+    def is_dirty(self):
+        return bool(self._run('diff --no-ext-diff --quiet', output=False))
+
+    def log(self, merge=False, first_parent=False, commit_time=False, pathlist=None):
+        cmd = 'whatchanged --pretty={}'.format('%ct' if commit_time else '%at')
+        if merge:        cmd += ' -m'
+        if first_parent: cmd += ' --first-parent'
+        return self._run(cmd, pathlist)
+
+    def _repodirs(self):
+        return (os.path.normpath(_) for _ in
+                self._run('rev-parse --show-toplevel --absolute-git-dir', check=True))
+
+    def _run(self, cmdstr, pathlist=None, output=True, check=False):
+        cmdlist = self.gitcmd + shlex.split(cmdstr)
+        if pathlist:
+            cmdlist.append('--')
+            cmdlist.extend(pathlist)
+        log.trace("Executing: %s", ' '.join(cmdlist))
+        if not output:
+            return subprocess.call(cmdlist)
+        if check:
+            try:
+                stdout = subprocess.check_output(cmdlist, universal_newlines=True)
+                return stdout.splitlines()
+            except subprocess.CalledProcessError as e:
+                raise self.Error(e.returncode, e.cmd, e.output, e.stderr)
+        self.proc = subprocess.Popen(cmdlist, stdout=subprocess.PIPE, universal_newlines=True)
+        return (_.strip() for _ in self.proc.stdout)
+
+    class Error(subprocess.CalledProcessError): pass
+
+
+def parselog(filelist, dirlist, stats, git, merge=False, filterlist=None):
+    mtime = 0
+    for line in git.log(merge, args.first_parent, args.commit_time, filterlist):
+        stats['loglines'] += 1
+
+        # Blank line between Date and list of files
+        if not line: continue
+
+        # File line
+        if line[0] == ':':  # Faster than line.startswith(':')
+            # If line describes a rename, linetok has three tokens, otherwise two
+            linetok = line.split('\t')
+            status = linetok[0]
+            file = linetok[-1]
+
+            # Handles non-ASCII chars and OS path separator
+            file = normalize(file)
+
+            if file in filelist:
+                stats['files'] -= 1
+                log.debug("%d\t%d\t%d\t%s\t%s",
+                             stats['loglines'], stats['commits'], stats['files'],
+                             isodate(mtime), file)
+                filelist.remove(file)
+                try:
+                    touch(os.path.join(git.workdir, file), mtime, args.test)
+                    stats['touches'] += 1
+                except Exception as e:
+                    log.error("ERROR: %s", e)
+                    stats['errors'] += 1
+
+            if args.dirs:
+                dirname = os.path.dirname(file)
+                if status[-1] in ('A', 'D') and dirname in dirlist:
+                    log.debug("%d\t%d\t-\t%s\t%s",
+                                 stats['loglines'], stats['commits'],
+                                 isodate(mtime), "{}/".format(dirname or '.'))
+                    dirlist.remove(dirname)
+                    try:
+                        touch(os.path.join(git.workdir, dirname), mtime, args.test)
+                        stats['dirtouches'] += 1
+                    except Exception as e:
+                        log.error("ERROR: %s", e)
+                        stats['direrrors'] += 1
+
+        # Date line
+        else:
+            stats['commits'] += 1
+            mtime = int(line)
+
+        # All files done?
+        if not stats['files']:
+            git.proc.terminate()  # hackish, but does the job. Not needed anyway
+            return
+
+
+# Main Logic ##################################################################
+
+def main():
+    start = time.time()  # yes, Wall time. CPU time is not realistic for users.
+    stats = {_: 0 for _ in ('loglines', 'commits', 'touches', 'errors', 'dirtouches', 'direrrors')}
+
+    # First things first: Where and Who are we?
+    try:
+        git = Git(args.workdir, args.gitdir)
+    except Git.Error as e:
+        # Not in a git repository, and git already informed user on stderr. So we just...
+        return e.returncode
+
+    # Do not work on dirty repositories, unless --force
+    if not args.force and git.is_dirty():
+        log.critical(
+         "ERROR: There are local changes in the working directory.\n"
+         "This could lead to undesirable results for modified files.\n"
+         "Please, commit your changes (or use --force) and try again.\n"
+         "Aborting")
+        return 1
+
+    # Get the files managed by git and build file and dir list to be processed
+    filelist = set()
+    dirlist  = set()
+    if UPDATE_SYMLINKS and not args.skip_older_than:
+        filelist = set(git.ls_files(args.pathspec))
+        dirlist  = set(os.path.dirname(_) for _ in filelist)
+    else:
+        for path in git.ls_files(args.pathspec):
+            fullpath = os.path.join(git.workdir, path)
+
+            # Symlink (to file, to dir or broken - git handles the same way)
+            if not UPDATE_SYMLINKS and os.path.islink(fullpath):
+                log.warning("WARNING: Skipping symlink, OS does not support update: %s", path)
+                continue
+
+            # skip files which are older than given threshold
+            if args.skip_older_than and start - os.path.getmtime(fullpath) > args.skip_older_than:
+                continue
+
+            # Always add them relative to worktree root
+            filelist.add(path)
+            dirlist.add(os.path.dirname(path))
+
+    stats['totalfiles'] = stats['files'] = len(filelist)
+    log.info("{0:,} files to be processed in work dir".format(stats['totalfiles']))
+
+    if not filelist:
+        # Nothing to do. Exit silently and without errors, just like git does
+        return
+
+    # Process the log until all files are 'touched'
+    log.debug("Line #\tLog #\tF.Left\tModification Time\tFile Name")
+    parselog(filelist, dirlist, stats, git, args.merge, args.pathspec)
+
+    # Missing files
+    if filelist:
+        # Try to find them in merge logs, if not done already
+        # (usually HUGE, thus MUCH slower!)
+        if args.missing and not args.merge:
+            filterlist = list(filelist)
+            for i in range(0, len(filterlist), STEPMISSING):
+                parselog(filelist, dirlist, stats, git,
+                         merge=True, filterlist=filterlist[i:i+STEPMISSING])
+
+        # Still missing some?
+        for file in filelist:
+            log.warning("WARNING: not found in log: %s", file)
+
+    # Final statistics
+    # Suggestion: use git-log --before=mtime to brag about skipped log entries
+    log.info(
+        "Statistics:\n"
+        "{:13,.2f} seconds\n"
+        "{:13,} log lines processed\n"
+        "{:13,} commits evaluated"
+        "".format(time.time()-start, stats['loglines'], stats['commits']))
+
+    if args.dirs:
+        if stats['direrrors']: log.info("{:13,} directory update errors".format(stats['direrrors']))
+        log.info("{:13,} directories updated".format(stats['dirtouches']))
+
+    if stats['touches'] != stats['totalfiles']: log.info("{:13,} files".format(stats['totalfiles']))
+    if stats['files']:                          log.info("{:13,} files missing".format(stats['files']))
+    if stats['errors']:                         log.info("{:13,} file update errors".format(stats['errors']))
+
+    log.info("{:13,} files updated".format(stats['touches']))
+
+    if args.test:
+        log.info("TEST RUN - No files modified!")
+
+
+args = parse_args()
+log = setup_logging(args)
+log.trace("Arguments: %s", args)
+
+# UI done, it's show time!
+try:
+    sys.exit(main())
+except KeyboardInterrupt:
+    log.info("Aborting")
+    sys.exit(-1)

.github/workflows/build.yaml

@@ -0,0 +1,426 @@
+name: Build
+on:
+  push:
+    tags: [ '*' ]
+jobs:
+
+  web:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get current git tag
+        id: get_tag
+        uses: keeweb/get-git-tag@v3.0.2
+        with:
+          tagRegex: "^v(\\d+\\.\\d+\\.\\d+)$"
+          tagRegexGroup: 1
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          repository: keeweb/keeweb
+          ref: ${{ github.repository == 'keeweb/keeweb' && github.sha || 'develop' }}
+      - name: Upgrade Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+          registry-url: 'https://registry.npmjs.org'
+      - name: Install npm modules
+        run: npm ci
+      - name: Test
+        run: npm test
+      - name: Grunt
+        run: grunt
+      - name: Upload artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.html
+          path: dist
+      - name: Write secrets
+        env:
+          VIRUS_TOTAL: ${{ secrets.VIRUS_TOTAL }}
+        run: |
+          mkdir keys
+          echo "$VIRUS_TOTAL" > keys/virus-total.json
+      - name: Check on VirusTotal
+        run: grunt virustotal
+        if: ${{ github.repository == 'keeweb/keeweb' }}
+
+  linux:
+    runs-on: ubuntu-latest
+    needs:
+      - web
+    steps:
+      - name: Get current git tag
+        id: get_tag
+        uses: keeweb/get-git-tag@v3.0.2
+        with:
+          tagRegex: "^v(\\d+\\.\\d+\\.\\d+)$"
+          tagRegexGroup: 1
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          repository: keeweb/keeweb
+          ref: ${{ github.repository == 'keeweb/keeweb' && github.sha || 'develop' }}
+      - name: Download artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.html
+          path: dist
+      - name: Write secrets
+        env:
+          PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
+          KEEWEB_SIGN: ${{ secrets.KEEWEB_SIGN }}
+        run: |
+          mkdir keys
+          echo "$PRIVATE_KEY" > keys/private-key.pem
+          echo "$KEEWEB_SIGN" > keys/keeweb-sign.json
+      - name: Build in Docker
+        uses: ./.github/actions/linux-build
+      - name: Upload AppImage artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.AppImage
+          path: dist/desktop/KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.AppImage
+      - name: Upload snap artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.snap
+          path: dist/desktop/KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.snap
+      - name: Upload deb artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.x64.deb
+          path: dist/desktop/KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.x64.deb
+      - name: Upload zip artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.x64.zip
+          path: dist/desktop/KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.x64.zip
+      - name: Upload rpm artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.x86_64.rpm
+          path: dist/desktop/KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.x86_64.rpm
+
+  darwin:
+    runs-on: macos-latest
+    needs:
+      - web
+    steps:
+      - name: Get current git tag
+        id: get_tag
+        uses: keeweb/get-git-tag@v3.0.2
+        with:
+          tagRegex: "^v(\\d+\\.\\d+\\.\\d+)$"
+          tagRegexGroup: 1
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          repository: keeweb/keeweb
+          ref: ${{ github.repository == 'keeweb/keeweb' && github.sha || 'develop' }}
+      - name: Download artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.html
+          path: dist
+      - name: Upgrade Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+          registry-url: 'https://registry.npmjs.org'
+      - name: Install npm modules
+        run: npm ci
+      - name: Install grunt
+        run: sudo npm i -g grunt-cli
+      - name: Write secrets
+        env:
+          CODESIGN: ${{ secrets.CODESIGN }}
+          APPLE_DEPLOY_PASSWORD: ${{ secrets.APPLE_DEPLOY_PASSWORD }}
+          APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
+          APPLE_PROVISIONING_PROFILE: ${{ secrets.APPLE_PROVISIONING_PROFILE }}
+        run: |
+          mkdir keys
+          echo "$CODESIGN" > keys/codesign.json
+          xcrun altool --store-password-in-keychain-item "AC_PASSWORD" -u "$APPLE_ID_USERNAME" -p "$APPLE_DEPLOY_PASSWORD"
+          echo "$APPLE_PROVISIONING_PROFILE" | base64 -d > keys/keeweb.provisionprofile
+      - name: Import certificates
+        uses: keeweb/import-codesign-certs@v1
+        with:
+          p12-file-base64: ${{ secrets.APPLE_CERTIFICATE }}
+          p12-password: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+      - name: Grunt
+        run: grunt --max-old-space-size=4096 desktop-darwin ${{ github.repository != 'keeweb/keeweb' && '--skip-sign' || '' }}
+      - name: Upload x64 dmg artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.x64.dmg
+          path: dist/desktop/KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.x64.dmg
+      - name: Upload arm64 dmg artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.arm64.dmg
+          path: dist/desktop/KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.arm64.dmg
+
+  win32:
+    runs-on: windows-latest
+    needs:
+      - web
+    steps:
+      - name: Get current git tag
+        id: get_tag
+        uses: keeweb/get-git-tag@v3.0.2
+        with:
+          tagRegex: "^v(\\d+\\.\\d+\\.\\d+)$"
+          tagRegexGroup: 1
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          repository: keeweb/keeweb
+          ref: ${{ github.repository == 'keeweb/keeweb' && github.sha || 'develop' }}
+      - name: Download artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.html
+          path: dist
+      - name: Upgrade Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+          registry-url: 'https://registry.npmjs.org'
+      - name: Install npm modules
+        run: npm ci
+      - name: Install grunt
+        run: npm i -g grunt-cli
+      - name: Write secrets
+        env:
+          CODESIGN: ${{ secrets.CODESIGN }}
+          MS_CODESIGN_PRIVATE_KEY_CLIENT: ${{ secrets.MS_CODESIGN_PRIVATE_KEY_CLIENT }}
+          MS_CODESIGN_PUBLIC_KEY_CLIENT: ${{ secrets.MS_CODESIGN_PUBLIC_KEY_CLIENT }}
+          MS_CODESIGN_PUBLIC_KEY_SERVER: ${{ secrets.MS_CODESIGN_PUBLIC_KEY_SERVER }}
+        run: |
+          mkdir keys
+          echo $Env:CODESIGN > keys/codesign.json
+          mkdir keys/code-signing
+          echo $Env:MS_CODESIGN_PRIVATE_KEY_CLIENT > keys/code-signing/private-key-client.pem
+          echo $Env:MS_CODESIGN_PUBLIC_KEY_CLIENT > keys/code-signing/public-key-client.pem
+          echo $Env:MS_CODESIGN_PUBLIC_KEY_SERVER > keys/code-signing/public-key-server.pem
+      - name: Grunt
+        run: grunt desktop-win32 ${{ github.repository != 'keeweb/keeweb' && '--skip-sign' || '' }}
+      - name: Upload ia32 exe artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.win.ia32.exe
+          path: dist/desktop/KeeWeb-${{ steps.get_tag.outputs.tag }}.win.ia32.exe
+      - name: Upload ia32 zip artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.win.ia32.zip
+          path: dist/desktop/KeeWeb-${{ steps.get_tag.outputs.tag }}.win.ia32.zip
+      - name: Upload x64 exe artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.win.x64.exe
+          path: dist/desktop/KeeWeb-${{ steps.get_tag.outputs.tag }}.win.x64.exe
+      - name: Upload x64 zip artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.win.x64.zip
+          path: dist/desktop/KeeWeb-${{ steps.get_tag.outputs.tag }}.win.x64.zip
+      - name: Upload arm64 exe artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.win.arm64.exe
+          path: dist/desktop/KeeWeb-${{ steps.get_tag.outputs.tag }}.win.arm64.exe
+      - name: Upload arm64 zip artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.win.arm64.zip
+          path: dist/desktop/KeeWeb-${{ steps.get_tag.outputs.tag }}.win.arm64.zip
+
+  publish:
+    runs-on: ubuntu-latest
+    needs:
+      - linux
+      - darwin
+      - win32
+    steps:
+      - name: Get current git tag
+        id: get_tag
+        uses: keeweb/get-git-tag@v3.0.2
+        with:
+          tagRegex: "^v(\\d+\\.\\d+\\.\\d+)$"
+          tagRegexGroup: 1
+      - name: Setup GCloud
+        uses: google-github-actions/setup-gcloud@master
+        with:
+          version: '285.0.0'
+          service_account_key: ${{ secrets.GCP_SA_KEY }}
+          export_default_credentials: true
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          repository: keeweb/keeweb
+          path: keeweb
+          ref: ${{ github.repository == 'keeweb/keeweb' && github.sha || 'develop' }}
+      - name: Upgrade Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16'
+          registry-url: 'https://registry.npmjs.org'
+      - name: Install npm modules
+        working-directory: keeweb
+        run: npm ci
+      - name: Download html artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.html
+          path: html
+      - name: Download linux.AppImage artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.AppImage
+          path: assets
+      - name: Download linux.snap artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.snap
+          path: assets
+      - name: Download linux.deb artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.x64.deb
+          path: assets
+      - name: Download linux.zip artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.x64.zip
+          path: assets
+      - name: Download linux.rpm artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.linux.x86_64.rpm
+          path: assets
+      - name: Download darwin.x64.dmg artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.x64.dmg
+          path: assets
+      - name: Download darwin.arm64.dmg artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.mac.arm64.dmg
+          path: assets
+      - name: Download win32.ia32.exe artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.win.ia32.exe
+          path: assets
+      - name: Download win32.ia32.zip artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.win.ia32.zip
+          path: assets
+      - name: Download win32.x64.exe artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.win.x64.exe
+          path: assets
+      - name: Download win32.x64.zip artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.win.x64.zip
+          path: assets
+      - name: Download win32.arm64.exe artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.win.arm64.exe
+          path: assets
+      - name: Download win32.arm64.zip artifact
+        uses: actions/download-artifact@v1
+        with:
+          name: KeeWeb-${{ steps.get_tag.outputs.tag }}.win.arm64.zip
+          path: assets
+      - name: Zip html
+        working-directory: html
+        run: zip -vr ../assets/KeeWeb-${{ steps.get_tag.outputs.tag }}.html.zip .
+      - name: Copy assets to dist
+        run: mkdir -p keeweb/dist/desktop && cp assets/* keeweb/dist/desktop
+      - name: Write secrets
+        env:
+          PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
+          KEEWEB_SIGN: ${{ secrets.KEEWEB_SIGN }}
+        working-directory: keeweb
+        run: |
+          mkdir keys
+          echo "$PRIVATE_KEY" > keys/private-key.pem
+          echo "$KEEWEB_SIGN" > keys/keeweb-sign.json
+      - name: Grunt
+        working-directory: keeweb
+        run: grunt finish-release
+      - name: Copy signatures to assets
+        run: cp keeweb/dist/desktop/Verify.sign.sha256 assets
+      - name: Copy checksums to assets
+        run: cp keeweb/dist/desktop/Verify.sha256 assets
+      - name: Login to DockerHub Registry
+        env:
+          DOCKERHUB_ACCESS_TOKEN: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+        run: echo $DOCKERHUB_ACCESS_TOKEN | docker login -u $DOCKERHUB_USERNAME --password-stdin
+      - name: Copy dist to the Docker context
+        run: cp -r html keeweb/package/docker/dist
+      - name: Build the Docker image
+        working-directory: keeweb
+        run: docker build -t antelle/keeweb:latest -t antelle/keeweb:${{ steps.get_tag.outputs.tag }} package/docker
+      - name: Push the Docker image to dockerhub
+        if: ${{ github.repository == 'keeweb/keeweb' }}
+        run: docker push --all-tags antelle/keeweb
+      - name: Extract release notes
+        run: node util/extract-release-notes.js --version=${{ steps.get_tag.outputs.tag }} --output=tmp/release-body.md
+        working-directory: keeweb
+      - name: Publish GitHub release
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: v${{ steps.get_tag.outputs.tag }}
+          name: Desktop apps v${{ steps.get_tag.outputs.tag }}
+          files: assets/*
+          body_path: keeweb/tmp/release-body.md
+      - name: Checkout gh-pages
+        uses: actions/checkout@v2
+        with:
+          ref: gh-pages
+          path: gh-pages
+          fetch-depth: 0
+      - name: Commit dist to gh-pages
+        working-directory: gh-pages
+        run: |
+          git rm -r '*'
+          cp -r ../html/* .
+          mkdir -p .github/workflows
+          echo $GITHUB_SHA > build.txt
+          date >> build.txt
+          git add .
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+          git commit -am v${{ steps.get_tag.outputs.tag }}
+      - name: Push gh-pages
+        uses: keeweb/github-push-action@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: gh-pages
+          directory: gh-pages
+      - name: Restore git mtime
+        working-directory: gh-pages
+        run: python3 ../keeweb/.github/actions/scripts/git-restore-mtime.py
+      - name: Sync the website
+        if: ${{ github.repository == 'keeweb/keeweb' }}
+        run: gsutil -m rsync -r -d -x "^\." gh-pages gs://app.keeweb.info/
+      - name: Purge CloudFlare cache
+        if: ${{ github.repository == 'keeweb/keeweb' }}
+        env:
+          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+        run: |
+          curl -sS -X POST "https://api.cloudflare.com/client/v4/zones/dbda8e7e454d23edb08d4bc3b3f6f872/purge_cache" \
+            -H "Authorization: Bearer $CLOUDFLARE_API_TOKEN" \
+            -H "Content-Type: application/json" \
+            --data '{"purge_everything":true}'

.gitignore

@@ -1,9 +1,19 @@
 workspace.xml
+misc.xml
 .DS_Store
 node_modules/
-bower_components/
 *.log
-dist/
+/dist/
 tmp/
-build/
 coverage/
+keys
+*.user
+bin/
+obj/
+*.xcworkspace/
+xcuserdata/
+*.suo
+.idea/
+.vscode/
+*.iml
+test/dist/

.idea/.name

@@ -1 +0,0 @@
-keeweb

.idea/codeStyleSettings.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
-  </component>
-</project>

.idea/compiler.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>

.idea/copyright/profiles_settings.xml

@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="JSHint" enabled="true" level="ERROR" enabled_by_default="true" />
-  </profile>
-</component>

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
-    <version value="1.0" />
-  </settings>
-</component>

.idea/jsLibraryMappings.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4" />

.idea/jsLinters/jshint.xml

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JSHintConfiguration" version="2.6.3" use-config-file="true">
-    <option asi="false" />
-    <option bitwise="true" />
-    <option boss="false" />
-    <option browser="true" />
-    <option camelcase="false" />
-    <option couch="false" />
-    <option curly="true" />
-    <option debug="false" />
-    <option devel="false" />
-    <option dojo="false" />
-    <option eqeqeq="true" />
-    <option eqnull="false" />
-    <option es3="false" />
-    <option esnext="false" />
-    <option evil="false" />
-    <option expr="false" />
-    <option forin="true" />
-    <option freeze="false" />
-    <option funcscope="false" />
-    <option gcl="false" />
-    <option globalstrict="false" />
-    <option immed="false" />
-    <option iterator="false" />
-    <option jquery="false" />
-    <option lastsemic="false" />
-    <option latedef="false" />
-    <option laxbreak="false" />
-    <option laxcomma="false" />
-    <option loopfunc="false" />
-    <option maxerr="50" />
-    <option mootools="false" />
-    <option moz="false" />
-    <option multistr="false" />
-    <option newcap="false" />
-    <option noarg="true" />
-    <option node="false" />
-    <option noempty="true" />
-    <option nomen="false" />
-    <option nonbsp="false" />
-    <option nonew="true" />
-    <option nonstandard="false" />
-    <option notypeof="false" />
-    <option noyield="false" />
-    <option onevar="false" />
-    <option passfail="false" />
-    <option phantom="false" />
-    <option plusplus="false" />
-    <option proto="false" />
-    <option prototypejs="false" />
-    <option quotmark="false" />
-    <option rhino="false" />
-    <option scripturl="false" />
-    <option shadow="false" />
-    <option smarttabs="false" />
-    <option strict="true" />
-    <option sub="false" />
-    <option supernew="false" />
-    <option trailing="false" />
-    <option undef="true" />
-    <option unused="false" />
-    <option validthis="false" />
-    <option white="false" />
-    <option worker="false" />
-    <option wsh="false" />
-    <option yui="false" />
-  </component>
-</project>

.idea/libraries/keeweb_node_modules.xml

@@ -1,15 +0,0 @@
-<component name="libraryTable">
-  <library name="keeweb node_modules" type="javaScript">
-    <properties>
-      <option name="frameworkName" value="node_modules" />
-      <sourceFilesUrls>
-        <item url="file://$PROJECT_DIR$/node_modules" />
-      </sourceFilesUrls>
-    </properties>
-    <CLASSES>
-      <root url="file://$PROJECT_DIR$/node_modules" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/misc.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/keeweb.iml" filepath="$PROJECT_DIR$/keeweb.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

.jshintrc

@@ -1,94 +0,0 @@
-{
-  "maxerr"        : 50,       // {int} Maximum error before stopping
-
-  // Enforcing
-  "bitwise"       : false,     // true: Prohibit bitwise operators (&, |, ^, etc.)
-  "camelcase"     : true,     // true: Identifiers must be in camelCase
-  "curly"         : true,     // true: Require {} for every new block or scope
-  "eqeqeq"        : true,     // true: Require triple equals (===) for comparison
-  "forin"         : true,     // true: Require filtering for..in loops with obj.hasOwnProperty()
-  "freeze"        : true,     // true: prohibits overwriting prototypes of native objects such as Array, Date etc.
-  "immed"         : false,    // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
-  "indent"        : 4,        // {int} Number of spaces to use for indentation
-  "latedef"       : false,    // true: Require variables/functions to be defined before being used
-  "newcap"        : true,     // true: Require capitalization of all constructor functions e.g. `new F()`
-  "noarg"         : true,     // true: Prohibit use of `arguments.caller` and `arguments.callee`
-  "noempty"       : true,     // true: Prohibit use of empty blocks
-  "nonbsp"        : true,     // true: Prohibit "non-breaking whitespace" characters.
-  "nonew"         : false,    // true: Prohibit use of constructors for side-effects (without assignment)
-  "plusplus"      : false,    // true: Prohibit use of `++` & `--`
-  "quotmark"      : "single",    // Quotation mark consistency:
-  //   false    : do nothing (default)
-  //   true     : ensure whatever is used is consistent
-  //   "single" : require single quotes
-  //   "double" : require double quotes
-  "undef"         : true,     // true: Require all non-global variables to be declared (prevents global leaks)
-  "unused"        : true,     // Unused variables:
-  //   true     : all variables, last function parameter
-  //   "vars"   : all variables only
-  //   "strict" : all variables, all function parameters
-  "strict"        : true,     // true: Requires all functions run in ES5 Strict Mode
-  "maxparams"     : false,    // {int} Max number of formal params allowed per function
-  "maxdepth"      : false,    // {int} Max depth of nested blocks (within functions)
-  "maxstatements" : false,    // {int} Max number statements per function
-  "maxcomplexity" : false,    // {int} Max cyclomatic complexity per function
-  "maxlen"        : 160,      // {int} Max number of characters per line
-  "varstmt"       : false,    // true: Disallow any var statements. Only `let` and `const` are allowed.
-
-  // Relaxing
-  "asi"           : false,     // true: Tolerate Automatic Semicolon Insertion (no semicolons)
-  "boss"          : false,     // true: Tolerate assignments where comparisons would be expected
-  "debug"         : false,     // true: Allow debugger statements e.g. browser breakpoints.
-  "eqnull"        : false,     // true: Tolerate use of `== null`
-  "esnext"        : true,      // true: Allow ES.next (ES6) syntax (ex: `const`)
-  "moz"           : false,     // true: Allow Mozilla specific syntax (extends and overrides esnext features)
-  // (ex: `for each`, multiple try/catch, function expression…)
-  "evil"          : false,     // true: Tolerate use of `eval` and `new Function()`
-  "expr"          : false,     // true: Tolerate `ExpressionStatement` as Programs
-  "funcscope"     : false,     // true: Tolerate defining variables inside control statements
-  "globalstrict"  : true,     // true: Allow global "use strict" (also enables 'strict')
-  "iterator"      : false,     // true: Tolerate using the `__iterator__` property
-  "lastsemic"     : false,     // true: Tolerate omitting a semicolon for the last statement of a 1-line block
-  "laxbreak"      : false,     // true: Tolerate possibly unsafe line breakings
-  "laxcomma"      : false,     // true: Tolerate comma-first style coding
-  "loopfunc"      : false,     // true: Tolerate functions being defined in loops
-  "multistr"      : false,     // true: Tolerate multi-line strings
-  "noyield"       : false,     // true: Tolerate generator functions with no yield statement in them.
-  "notypeof"      : false,     // true: Tolerate invalid typeof operator values
-  "proto"         : false,     // true: Tolerate using the `__proto__` property
-  "scripturl"     : false,     // true: Tolerate script-targeted URLs
-  "shadow"        : false,     // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
-  "sub"           : false,     // true: Tolerate using `[]` notation when it can still be expressed in dot notation
-  "supernew"      : false,     // true: Tolerate `new function () { ... };` and `new Object;`
-  "validthis"     : false,     // true: Tolerate using this in a non-constructor function
-
-  // Environments
-  "browser"       : true,     // Web Browser (window, document, etc)
-  "browserify"    : false,    // Browserify (node.js code in the browser)
-  "couch"         : false,    // CouchDB
-  "devel"         : false,    // Development/debugging (alert, confirm, etc)
-  "dojo"          : false,    // Dojo Toolkit
-  "jasmine"       : true,     // Jasmine
-  "jquery"        : false,    // jQuery
-  "mocha"         : true,     // Mocha
-  "mootools"      : false,    // MooTools
-  "node"          : false,    // Node.js
-  "nonstandard"   : false,    // Widely adopted globals (escape, unescape, etc)
-  "phantom"       : false,    // PhantomJS
-  "prototypejs"   : false,    // Prototype and Scriptaculous
-  "qunit"         : false,    // QUnit
-  "rhino"         : false,    // Rhino
-  "shelljs"       : false,    // ShellJS
-  "typed"         : false,    // Globals for typed array constructions
-  "worker"        : false,    // Web Workers
-  "wsh"           : false,    // Windows Scripting Host
-  "yui"           : false,    // Yahoo User Interface
-
-  // Custom Globals
-  "globals"       : {
-    "require": true,
-    "module": true,
-    "$": true,
-    "_": true
-  }
-}

.prettierrc

@@ -0,0 +1,8 @@
+{
+    "tabWidth": 4,
+    "singleQuote": true,
+    "printWidth": 100,
+    "trailingComma": "none",
+    "quoteProps": "preserve",
+    "endOfLine": "auto"
+}

CONTRIBUTING.md

@@ -0,0 +1,66 @@
+# Contributing to KeeWeb
+
+Thanks for taking the time to contribute! :gift:
+
+There are different ways to help the project, you will find a summary here.
+
+## Code of conduct
+
+This project and everyone participating in it is governed by the [KeeWeb Code of Conduct](https://github.com/keeweb/keeweb/blob/master/.github/CODE_OF_CONDUCT.md#readme). 
+By participating, you are expected to uphold this code. Please report unacceptable behavior to antelle.net@gmail.com.
+
+## Issues
+
+First, let's check if it's [already there](https://github.com/keeweb/keeweb/issues).
+Perhaps, someone has already reported it?
+
+[Click here](https://github.com/keeweb/keeweb/issues/new/choose) to create a new issue.
+When creating issues, please answer some questions asked on that page.
+They will help to understand, reproduce, and fix your issue.
+
+## Vulnerabilities
+
+We would appreciate [responsible disclosure](https://en.wikipedia.org/wiki/Responsible_disclosure).
+If you would like to report a vulnerability, the preferred way to do so is [contacting the developer directly](mailto:antelle.net@gmail.com).
+
+## Questions, great ideas, etc...
+
+You can [create an issue](https://github.com/keeweb/keeweb/issues/new/choose) to discuss any topic.
+Indeed, questions on that page are not applicable in this case.
+
+## Development
+
+We don't accept (and in foreseeable future, we won't accept) anyone as a project collaborator directly. 
+Instead, the code should be contributed via pull requests. To get started with development, take a look at these pages:
+- [Architecture](https://github.com/keeweb/keeweb/wiki/Architecture)
+- [Engineering](https://github.com/keeweb/keeweb/wiki/Engineering)
+- [Unsupported Features](https://github.com/keeweb/keeweb/wiki/Unsupported%20Features)
+- [Pull Request Guidelines](https://github.com/keeweb/keeweb/blob/master/.github/PULL_REQUEST_TEMPLATE.md#readme)
+
+## Pull requests
+
+Please follow [this guide](https://github.com/keeweb/keeweb/blob/master/.github/PULL_REQUEST_TEMPLATE.md#readme).
+
+## Docs (Wiki pages)
+
+KeeWeb has [Wiki pages](https://github.com/keeweb/keeweb/wiki), however it's not possible to contribute with pull requests.
+If you would like to improve it, please [open an issue](https://github.com/keeweb/keeweb/issues/new/choose) and submit your changes in Markdown format.
+
+## Donations
+
+There are two ways of donating:  
+- join as backer on [OpenCollective](https://opencollective.com/keeweb#support);
+- sponsor the developer directly on [GitHub](https://github.com/sponsors/antelle).
+
+Please note: donation does not imply any type of service contract.  
+
+## Translations
+
+All KeeWeb translations are contributed by the community. To improve a translation or add a missing one,
+join us on [OneSky](https://keeweb.oneskyapp.com).
+
+## PR
+
+We would be happy to support you if you decide to post, blog, or review the project, 
+or provide any other kind of PR. Please [contact the developer](mailto:antelle.net@gmail.com) 
+if you have anything to share. You can also poke us on [Twitter](https://twitter.com/kee_web).

DEPS-LICENSE

@@ -0,0 +1,211 @@
+======================================================================================
+
+                              Dependencies Licenses
+
+======================================================================================
+
+jsqrcode license: Apache-2.0
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+================================================================================

Gruntfile.js

@@ -1,48 +1,96 @@
-'use strict';
+/* eslint-env node */
 
-var fs = require('fs'),
-    path = require('path');
+const fs = require('fs-extra');
+const path = require('path');
+const { execSync } = require('child_process');
+const debug = require('debug');
 
-var StringReplacePlugin = require('string-replace-webpack-plugin');
+const webpackConfig = require('./build/webpack.config');
+const webpackConfigTest = require('./test/test.webpack.config');
+const pkg = require('./package.json');
 
-module.exports = function(grunt) {
+debug.enable('electron-notarize');
+
+module.exports = function (grunt) {
     require('time-grunt')(grunt);
     require('load-grunt-tasks')(grunt);
 
-    var webpack = require('webpack');
-    var pkg = require('./package.json');
-    var dt = new Date().toISOString().replace(/T.*/, '');
+    grunt.loadTasks('build/tasks');
 
-    function replaceFont(css) {
-        css.walkAtRules('font-face', function (rule) {
-            var fontFamily = rule.nodes.filter(function(n) { return n.prop === 'font-family'; })[0];
-            if (!fontFamily) {
-                throw 'Bad font rule: ' + rule.toString();
-            }
-            var value = fontFamily.value.replace(/["']/g, '');
-            var fontFiles = {
-                FontAwesome: 'fontawesome-webfont.woff'
-            };
-            var fontFile = fontFiles[value];
-            if (!fontFile) {
-                throw 'Unsupported font ' + value + ': ' + rule.toString();
-            }
-            var data = fs.readFileSync('tmp/fonts/' + fontFile, 'base64');
-            var src = 'url(data:application/font-woff;charset=utf-8;base64,{data}) format(\'woff\')'
-                .replace('{data}', data);
-            //var src = 'url(\'../fonts/fontawesome-webfont.woff\') format(\'woff\')';
-            rule.nodes = rule.nodes.filter(function(n) { return n.prop !== 'src'; });
-            rule.append({ prop: 'src', value: src });
-        });
+    require('./grunt.tasks')(grunt);
+    require('./grunt.entrypoints')(grunt);
+
+    const date = new Date();
+    grunt.config.set('date', date);
+
+    const dt = date.toISOString().replace(/T.*/, '');
+    const year = date.getFullYear();
+    const electronVersion = pkg.dependencies.electron.replace(/^\D/, '');
+    const skipSign = grunt.option('skip-sign');
+    const getCodeSignConfig = () =>
+        skipSign ? { identities: {} } : require('./keys/codesign.json');
+
+    let sha = grunt.option('commit-sha');
+    if (!sha) {
+        try {
+            sha = execSync('git rev-parse --short HEAD').toString('utf8').trim();
+        } catch (e) {
+            grunt.warn(
+                "Cannot get commit sha from git. It's recommended to build KeeWeb from a git repo " +
+                    'because commit sha is displayed in the UI, however if you would like to build from a folder, ' +
+                    'you can override what will be displayed in the UI with --commit-sha=xxx.'
+            );
+        }
     }
+    grunt.log.writeln(`Building KeeWeb v${pkg.version} (${sha})`);
+
+    const webpackOptions = {
+        date,
+        beta: !!grunt.option('beta'),
+        sha,
+        appleTeamId: '3LE7JZ657W'
+    };
+
+    const windowsAppVersionString = {
+        CompanyName: 'KeeWeb',
+        FileDescription: pkg.description,
+        OriginalFilename: 'KeeWeb.exe',
+        ProductName: 'KeeWeb',
+        InternalName: 'KeeWeb'
+    };
+
+    const appdmgOptions = (arch) => ({
+        title: 'KeeWeb',
+        icon: 'graphics/icon.icns',
+        background: 'graphics/dmg-background.png',
+        'background-color': '#E0E6F9',
+        'icon-size': 80,
+        window: { size: { width: 658, height: 498 } },
+        contents: [
+            { x: 438, y: 344, type: 'link', path: '/Applications' },
+            {
+                x: 192,
+                y: 344,
+                type: 'file',
+                path: `tmp/desktop/KeeWeb-darwin-${arch}/KeeWeb.app`
+            }
+        ]
+    });
+
+    const linuxDependencies = [
+        'libappindicator1',
+        'libgconf-2-4',
+        'gnome-keyring',
+        'libxtst6',
+        'libx11-6',
+        'libatspi2.0-0'
+    ];
 
     grunt.initConfig({
-        'bower-install-simple': {
-            install: {
-            }
-        },
+        noop: { noop: {} },
         clean: {
-            dist: ['dist', 'tmp']
+            dist: ['dist', 'tmp'],
+            desktop: ['tmp/desktop', 'dist/desktop']
         },
         copy: {
             html: {
@@ -50,47 +98,185 @@ module.exports = function(grunt) {
                 dest: 'tmp/index.html',
                 nonull: true
             },
-            favicon: {
-                src: 'app/favicon.png',
-                dest: 'tmp/favicon.png',
+            'content-dist': {
+                cwd: 'app/content/',
+                src: '**',
+                dest: 'dist/',
+                expand: true,
                 nonull: true
             },
-            fonts: {
-                src: 'bower_components/font-awesome/fonts/fontawesome-webfont.*',
-                dest: 'tmp/fonts/',
-                nonull: true,
+            icons: {
+                cwd: 'app/icons/',
+                src: ['*.png', '*.svg'],
+                dest: 'tmp/icons/',
                 expand: true,
-                flatten: true
+                nonull: true
+            },
+            'dist-icons': {
+                cwd: 'app/icons/',
+                src: ['*.png', '*.svg'],
+                dest: 'dist/icons/',
+                expand: true,
+                nonull: true
+            },
+            manifest: {
+                cwd: 'app/manifest/',
+                src: ['*.json', '*.xml'],
+                dest: 'tmp/',
+                expand: true,
+                nonull: true
+            },
+            'dist-manifest': {
+                cwd: 'app/manifest/',
+                src: ['*.json', '*.xml'],
+                dest: 'dist/',
+                expand: true,
+                nonull: true
+            },
+            'desktop-html': {
+                src: 'dist/index.html',
+                dest: 'tmp/desktop/app/index.html',
+                nonull: true
+            },
+            'desktop-app-content': {
+                cwd: 'desktop/',
+                src: ['**', '!package-lock.json'],
+                dest: 'tmp/desktop/app/',
+                expand: true,
+                nonull: true
+            },
+            'desktop-darwin-installer-helper-x64': {
+                cwd: 'tmp/desktop/KeeWeb Installer.app',
+                src: '**',
+                dest:
+                    'tmp/desktop/KeeWeb-darwin-x64/KeeWeb.app/Contents/Installer/KeeWeb Installer.app',
+                expand: true,
+                nonull: true,
+                options: { mode: true }
+            },
+            'desktop-darwin-installer-helper-arm64': {
+                cwd: 'tmp/desktop/KeeWeb Installer.app',
+                src: '**',
+                dest:
+                    'tmp/desktop/KeeWeb-darwin-arm64/KeeWeb.app/Contents/Installer/KeeWeb Installer.app',
+                expand: true,
+                nonull: true,
+                options: { mode: true }
+            },
+            'desktop-win32-dist-x64': {
+                src: 'tmp/desktop/KeeWeb.win.x64.exe',
+                dest: `dist/desktop/KeeWeb-${pkg.version}.win.x64.exe`,
+                nonull: true
+            },
+            'desktop-win32-dist-ia32': {
+                src: 'tmp/desktop/KeeWeb.win.ia32.exe',
+                dest: `dist/desktop/KeeWeb-${pkg.version}.win.ia32.exe`,
+                nonull: true
+            },
+            'desktop-win32-dist-arm64': {
+                src: 'tmp/desktop/KeeWeb.win.arm64.exe',
+                dest: `dist/desktop/KeeWeb-${pkg.version}.win.arm64.exe`,
+                nonull: true
+            },
+            'native-modules-darwin-x64': {
+                src: 'node_modules/@keeweb/keeweb-native-modules/*-darwin-x64.node',
+                dest: 'tmp/desktop/KeeWeb-darwin-x64/KeeWeb.app/Contents/Resources/',
+                nonull: true
+            },
+            'native-modules-darwin-arm64': {
+                src: 'node_modules/@keeweb/keeweb-native-modules/*-darwin-arm64.node',
+                dest: 'tmp/desktop/KeeWeb-darwin-arm64/KeeWeb.app/Contents/Resources/',
+                nonull: true
+            },
+            'native-modules-win32-x64': {
+                src: 'node_modules/@keeweb/keeweb-native-modules/*-win32-x64.node',
+                dest: 'tmp/desktop/KeeWeb-win32-x64/resources/',
+                nonull: true
+            },
+            'native-modules-win32-ia32': {
+                src: 'node_modules/@keeweb/keeweb-native-modules/*-win32-ia32.node',
+                dest: 'tmp/desktop/KeeWeb-win32-ia32/resources/',
+                nonull: true
+            },
+            'native-modules-win32-arm64': {
+                src: 'node_modules/@keeweb/keeweb-native-modules/*-win32-arm64.node',
+                dest: 'tmp/desktop/KeeWeb-win32-arm64/resources/',
+                nonull: true
+            },
+            'native-modules-linux-x64': {
+                src: 'node_modules/@keeweb/keeweb-native-modules/*-linux-x64.node',
+                dest: 'tmp/desktop/keeweb-linux-x64/resources/',
+                nonull: true
+            },
+            'electron-builder-dist-linux-rpm': {
+                src: `tmp/desktop/electron-builder/KeeWeb-${pkg.version}.x86_64.rpm`,
+                dest: `dist/desktop/KeeWeb-${pkg.version}.linux.x86_64.rpm`,
+                nonull: true
+            },
+            'electron-builder-dist-linux-snap': {
+                src: `tmp/desktop/electron-builder/KeeWeb_${pkg.version}_amd64.snap`,
+                dest: `dist/desktop/KeeWeb-${pkg.version}.linux.snap`,
+                nonull: true
+            },
+            'electron-builder-dist-linux-appimage': {
+                src: `tmp/desktop/electron-builder/keeweb-${pkg.version}.AppImage`,
+                dest: `dist/desktop/KeeWeb-${pkg.version}.linux.AppImage`,
+                nonull: true
+            },
+            'darwin-installer-icon': {
+                src: 'graphics/icon.icns',
+                dest: 'tmp/desktop/KeeWeb Installer.app/Contents/Resources/applet.icns',
+                nonull: true
+            },
+            'native-messaging-host-darwin-x64': {
+                src:
+                    'node_modules/@keeweb/keeweb-native-messaging-host/darwin-x64/keeweb-native-messaging-host',
+                dest:
+                    'tmp/desktop/KeeWeb-darwin-x64/KeeWeb.app/Contents/MacOS/util/keeweb-native-messaging-host',
+                nonull: true,
+                options: { mode: '0755' }
+            },
+            'native-messaging-host-darwin-arm64': {
+                src:
+                    'node_modules/@keeweb/keeweb-native-messaging-host/darwin-arm64/keeweb-native-messaging-host',
+                dest:
+                    'tmp/desktop/KeeWeb-darwin-arm64/KeeWeb.app/Contents/MacOS/util/keeweb-native-messaging-host',
+                nonull: true,
+                options: { mode: '0755' }
+            },
+            'native-messaging-host-linux-x64': {
+                src:
+                    'node_modules/@keeweb/keeweb-native-messaging-host/linux-x64/keeweb-native-messaging-host',
+                dest: 'tmp/desktop/keeweb-linux-x64/keeweb-native-messaging-host',
+                nonull: true,
+                options: { mode: '0755' }
+            },
+            'native-messaging-host-win32-x64': {
+                src:
+                    'node_modules/@keeweb/keeweb-native-messaging-host/win32-x64/keeweb-native-messaging-host.exe',
+                dest: 'tmp/desktop/KeeWeb-win32-x64/keeweb-native-messaging-host.exe',
+                nonull: true
+            },
+            'native-messaging-host-win32-ia32': {
+                src:
+                    'node_modules/@keeweb/keeweb-native-messaging-host/win32-ia32/keeweb-native-messaging-host.exe',
+                dest: 'tmp/desktop/KeeWeb-win32-ia32/keeweb-native-messaging-host.exe',
+                nonull: true
+            },
+            'native-messaging-host-win32-arm64': {
+                src:
+                    'node_modules/@keeweb/keeweb-native-messaging-host/win32-arm64/keeweb-native-messaging-host.exe',
+                dest: 'tmp/desktop/KeeWeb-win32-arm64/keeweb-native-messaging-host.exe',
+                nonull: true
             }
         },
-        jshint: {
-            options: {
-                jshintrc: true
-            },
-            all: ['app/scripts/**/*.js']
-        },
-        sass: {
-            options: {
-                sourceMap: false,
-                includePaths: ['./bower_components']
-            },
-            dist: {
-                files: {
-                    'tmp/css/main.css': 'app/styles/main.scss'
-                }
-            }
-        },
-        postcss: {
-            options: {
-                processors: [
-                    replaceFont,
-                    require('cssnano')({discardComments: {removeAll: true}})
-                ]
-            },
-            dist: {
-                src: 'tmp/css/main.css',
-                dest: 'tmp/css/main.css'
-            }
+        eslint: {
+            app: ['app/scripts/**/*.js'],
+            desktop: ['desktop/**/*.js', '!desktop/node_modules/**'],
+            build: ['Gruntfile.js', 'grunt.*.js', 'build/**/*.js', 'webpack.config.js'],
+            plugins: ['plugins/**/*.js'],
+            util: ['util/**/*.js'],
+            installer: ['package/osx/installer.js']
         },
         inline: {
             app: {
@@ -98,6 +284,19 @@ module.exports = function(grunt) {
                 dest: 'tmp/app.html'
             }
         },
+        'csp-hashes': {
+            options: {
+                algo: 'sha512',
+                expected: {
+                    style: 1,
+                    script: 1
+                }
+            },
+            app: {
+                src: 'tmp/app.html',
+                dest: 'dist/index.html'
+            }
+        },
         htmlmin: {
             options: {
                 removeComments: true,
@@ -105,135 +304,491 @@ module.exports = function(grunt) {
             },
             app: {
                 files: {
-                    'dist/index.html': 'tmp/app.html'
+                    'tmp/app.html': 'tmp/app.html'
                 }
             }
         },
         'string-replace': {
-            manifest: {
+            'update-manifest': {
                 options: {
-                    replacements: [{
-                        pattern: '# YYYY-MM-DD:v0.0.0',
-                        replacement: '# ' + dt + ':v' + require('./package').version
-                    }]
+                    replacements: [
+                        {
+                            pattern: /"version":\s*".*?"/,
+                            replacement: `"version": "${pkg.version}"`
+                        },
+                        {
+                            pattern: /"date":\s*".*?"/,
+                            replacement: `"date": "${dt}"`
+                        }
+                    ]
                 },
-                files: { 'dist/manifest.appcache': 'app/manifest.appcache' }
+                files: { 'dist/update.json': 'app/update.json' }
+            },
+            'service-worker': {
+                options: { replacements: [{ pattern: '0.0.0', replacement: pkg.version }] },
+                files: { 'dist/service-worker.js': 'app/service-worker.js' }
+            },
+            'desktop-public-key': {
+                options: {
+                    replacements: [
+                        {
+                            pattern: "'@@PUBLIC_KEY_CONTENT'",
+                            replacement:
+                                '`' +
+                                fs
+                                    .readFileSync('app/resources/public-key.pem', {
+                                        encoding: 'utf8'
+                                    })
+                                    .trim() +
+                                '`'
+                        }
+                    ]
+                },
+                files: { 'tmp/desktop/app/main.js': 'desktop/main.js' }
             }
         },
         webpack: {
-            js: {
-                entry: {
-                    app: 'app',
-                    vendor: ['zepto', 'jquery', 'underscore', 'backbone', 'kdbxweb', 'baron', 'dropbox', 'pikaday', 'filesaver']
-                },
-                output: {
-                    path: 'tmp/js',
-                    filename: 'app.js'
-                },
-                stats: {
-                    colors: false,
-                    modules: true,
-                    reasons: true
-                },
-                progress: false,
-                failOnError: true,
-                resolve: {
-                    root: [path.join(__dirname, 'app/scripts'), path.join(__dirname, 'bower_components')],
-                    alias: {
-                        backbone: 'backbone/backbone-min.js',
-                        underscore: 'underscore/underscore-min.js',
-                        _: 'underscore/underscore-min.js',
-                        zepto: 'zepto/zepto.min.js',
-                        jquery: 'zepto/zepto.min.js',
-                        kdbxweb: 'kdbxweb/dist/kdbxweb.js',
-                        dropbox: 'dropbox/lib/dropbox.min.js',
-                        baron: 'baron/baron.min.js',
-                        pikaday: 'pikaday/pikaday.js',
-                        filesaver: 'FileSaver.js/FileSaver.min.js',
-                        templates: path.join(__dirname, 'app/templates')
-                    }
-                },
-                module: {
-                    loaders: [
-                        { test: /\.html$/, loader: StringReplacePlugin.replace('ejs', { replacements: [{
-                            pattern: /\r?\n\s*/g,
-                            replacement: function() { return '\n'; }
-                        }]})},
-                        { test: /runtime\-info\.js$/, loader: StringReplacePlugin.replace({ replacements: [
-                            { pattern: /@@VERSION/g, replacement: function() { return pkg.version; } },
-                            { pattern: /@@DATE/g, replacement: function() { return dt; } }
-                        ]})},
-                        { test: /zepto(\.min)?\.js$/, loader: 'exports?Zepto; delete window.$; delete window.Zepto;' },
-                        { test: /baron(\.min)?\.js$/, loader: 'exports?baron; delete window.baron;' },
-                        { test: /pikadat\.js$/, loader: 'uglify' }
-                    ]
-                },
-                plugins: [
-                    new webpack.optimize.CommonsChunkPlugin('vendor', 'vendor.js'),
-                    new webpack.BannerPlugin('keeweb v' + pkg.version + ', (c) 2015 ' + pkg.author +
-                        ', opensource.org/licenses/' + pkg.license),
-                    new webpack.optimize.OccurenceOrderPlugin(),
-                    new webpack.ProvidePlugin({ _: 'underscore', $: 'jquery' }),
-                    new webpack.IgnorePlugin(/^(moment)$/),
-                    new StringReplacePlugin()
+            app: webpackConfig.config(webpackOptions),
+            test: webpackConfigTest
+        },
+        'webpack-dev-server': {
+            options: {
+                webpack: webpackConfig.config({
+                    ...webpackOptions,
+                    mode: 'development',
+                    sha: 'dev'
+                }),
+                publicPath: '/',
+                contentBase: [
+                    path.resolve(__dirname, 'tmp'),
+                    path.resolve(__dirname, 'app/content')
                 ],
-                node: {
-                    console: false,
-                    process: false,
-                    Buffer: false,
-                    __filename: false,
-                    __dirname: false
+                progress: false
+            },
+            js: {
+                keepalive: true,
+                port: 8085
+            }
+        },
+        electron: {
+            options: {
+                name: 'KeeWeb',
+                dir: 'tmp/desktop/app',
+                out: 'tmp/desktop',
+                electronVersion,
+                overwrite: true,
+                asar: true,
+                appCopyright: `Copyright © ${year} Antelle`,
+                appVersion: pkg.version,
+                buildVersion: sha
+            },
+            linux: {
+                options: {
+                    name: 'keeweb',
+                    platform: 'linux',
+                    arch: 'x64',
+                    icon: 'graphics/icon.ico'
+                }
+            },
+            'darwin-x64': {
+                options: {
+                    platform: 'darwin',
+                    arch: 'x64',
+                    icon: 'graphics/icon.icns',
+                    appBundleId: 'net.antelle.keeweb',
+                    appCategoryType: 'public.app-category.productivity',
+                    extendInfo: 'package/osx/extend.plist'
+                }
+            },
+            'darwin-arm64': {
+                options: {
+                    platform: 'darwin',
+                    arch: 'arm64',
+                    icon: 'graphics/icon.icns',
+                    appBundleId: 'net.antelle.keeweb',
+                    appCategoryType: 'public.app-category.productivity',
+                    extendInfo: 'package/osx/extend.plist'
+                }
+            },
+            'win32-x64': {
+                options: {
+                    platform: 'win32',
+                    arch: 'x64',
+                    icon: 'graphics/icon.ico',
+                    buildVersion: pkg.version,
+                    'version-string': windowsAppVersionString
+                }
+            },
+            'win32-ia32': {
+                options: {
+                    platform: 'win32',
+                    arch: 'ia32',
+                    icon: 'graphics/icon.ico',
+                    buildVersion: pkg.version,
+                    'version-string': windowsAppVersionString
+                }
+            },
+            'win32-arm64': {
+                options: {
+                    platform: 'win32',
+                    arch: 'arm64',
+                    icon: 'graphics/icon.ico',
+                    buildVersion: pkg.version,
+                    'version-string': windowsAppVersionString
                 }
             }
         },
-        uglify: {
-            options: {
-                preserveComments: false
-            },
-            app: {
-                files: { 'tmp/js/app.js': ['tmp/js/app.js'] }
-            },
-            vendor: {
+        'electron-builder': {
+            linux: {
                 options: {
-                    mangle: false,
-                    compress: false
-                },
-                files: { 'tmp/js/vendor.js': ['tmp/js/vendor.js'] }
+                    publish: 'never',
+                    targets: 'linux',
+                    prepackaged: 'tmp/desktop/keeweb-linux-x64',
+                    config: {
+                        appId: 'net.antelle.keeweb',
+                        productName: 'keeweb',
+                        copyright: `Copyright © ${year} Antelle`,
+                        directories: {
+                            output: 'tmp/desktop/electron-builder',
+                            app: 'desktop',
+                            buildResources: 'graphics'
+                        },
+                        fileAssociations: {
+                            ext: 'kdbx',
+                            name: 'KeePass 2 database',
+                            mimeType: 'application/x-keepass2'
+                        },
+                        linux: {
+                            target: ['AppImage', 'snap', 'rpm'],
+                            category: 'Utility'
+                        },
+                        rpm: {
+                            // depends: linuxDependencies
+                        },
+                        snap: {
+                            stagePackages: linuxDependencies
+                        }
+                    }
+                }
             }
         },
-        watch: {
+        'electron-patch': {
+            'win32-x64': 'tmp/desktop/KeeWeb-win32-x64/KeeWeb.exe',
+            'win32-ia32': 'tmp/desktop/KeeWeb-win32-ia32/KeeWeb.exe',
+            'win32-arm64': 'tmp/desktop/KeeWeb-win32-arm64/KeeWeb.exe',
+            'darwin-x64': 'tmp/desktop/KeeWeb-darwin-x64/KeeWeb.app',
+            'darwin-arm64': 'tmp/desktop/KeeWeb-darwin-arm64/KeeWeb.app',
+            'linux': 'tmp/desktop/KeeWeb-linux-x64/keeweb'
+        },
+        osacompile: {
             options: {
-                interrupt: true,
-                debounceDelay: 500
+                language: 'JavaScript'
             },
-            scripts: {
-                files: ['app/scripts/**/*.js', 'app/templates/**/*.html'],
-                tasks: ['webpack']
-            },
-            styles: {
-                files: 'app/styles/**/*.scss',
-                tasks: ['sass']
-            },
-            indexhtml: {
-                files: 'app/index.html',
-                tasks: ['copy:html']
+            installer: {
+                files: {
+                    'tmp/desktop/KeeWeb Installer.app': 'package/osx/installer.js'
+                }
             }
+        },
+        compress: {
+            options: {
+                level: 6
+            },
+            'win32-x64': {
+                options: { archive: `dist/desktop/KeeWeb-${pkg.version}.win.x64.zip` },
+                files: [{ cwd: 'tmp/desktop/KeeWeb-win32-x64', src: '**', expand: true }]
+            },
+            'win32-ia32': {
+                options: { archive: `dist/desktop/KeeWeb-${pkg.version}.win.ia32.zip` },
+                files: [{ cwd: 'tmp/desktop/KeeWeb-win32-ia32', src: '**', expand: true }]
+            },
+            'win32-arm64': {
+                options: { archive: `dist/desktop/KeeWeb-${pkg.version}.win.arm64.zip` },
+                files: [{ cwd: 'tmp/desktop/KeeWeb-win32-arm64', src: '**', expand: true }]
+            },
+            'linux-x64': {
+                options: { archive: `dist/desktop/KeeWeb-${pkg.version}.linux.x64.zip` },
+                files: [
+                    { cwd: 'tmp/desktop/keeweb-linux-x64', src: '**', expand: true },
+                    { cwd: 'graphics', src: '128x128.png', nonull: true, expand: true }
+                ]
+            }
+        },
+        appdmg: {
+            x64: {
+                options: appdmgOptions('x64'),
+                dest: `dist/desktop/KeeWeb-${pkg.version}.mac.x64.dmg`
+            },
+            arm64: {
+                options: appdmgOptions('arm64'),
+                dest: `dist/desktop/KeeWeb-${pkg.version}.mac.arm64.dmg`
+            }
+        },
+        nsis: {
+            options: {
+                vars: {
+                    version: pkg.version,
+                    rev: sha,
+                    homepage: pkg.homepage
+                }
+            },
+            'win32-x64': {
+                options: {
+                    installScript: 'package/nsis/main.nsi',
+                    arch: 'x64',
+                    output: 'tmp/desktop/KeeWeb.win.x64.exe'
+                }
+            },
+            'win32-un-x64': {
+                options: {
+                    installScript: 'package/nsis/main-un.nsi',
+                    arch: 'x64',
+                    output: 'tmp/desktop/KeeWeb-win32-x64/uninst.exe'
+                }
+            },
+            'win32-ia32': {
+                options: {
+                    installScript: 'package/nsis/main.nsi',
+                    arch: 'ia32',
+                    output: 'tmp/desktop/KeeWeb.win.ia32.exe'
+                }
+            },
+            'win32-un-ia32': {
+                options: {
+                    installScript: 'package/nsis/main-un.nsi',
+                    arch: 'ia32',
+                    output: 'tmp/desktop/KeeWeb-win32-ia32/uninst.exe'
+                }
+            },
+            'win32-arm64': {
+                options: {
+                    installScript: 'package/nsis/main.nsi',
+                    arch: 'arm64',
+                    output: 'tmp/desktop/KeeWeb.win.arm64.exe'
+                }
+            },
+            'win32-un-arm64': {
+                options: {
+                    installScript: 'package/nsis/main-un.nsi',
+                    arch: 'arm64',
+                    output: 'tmp/desktop/KeeWeb-win32-arm64/uninst.exe'
+                }
+            }
+        },
+        chmod: {
+            'linux-desktop-x64': {
+                options: {
+                    mode: '4755'
+                },
+                src: ['tmp/desktop/keeweb-linux-x64/chrome-sandbox']
+            }
+        },
+        deb: {
+            options: {
+                tmpPath: 'tmp/desktop/',
+                package: {
+                    name: 'keeweb-desktop',
+                    version: pkg.version,
+                    description: pkg.description,
+                    author: pkg.author,
+                    homepage: pkg.homepage,
+                    rev: sha
+                }
+            },
+            'linux-x64': {
+                options: {
+                    info: {
+                        arch: 'amd64',
+                        pkgName: `KeeWeb-${pkg.version}.linux.x64.deb`,
+                        targetDir: 'dist/desktop',
+                        appName: 'KeeWeb',
+                        depends: linuxDependencies.join(', '),
+                        scripts: {
+                            postinst: 'package/deb/scripts/postinst'
+                        }
+                    }
+                },
+                files: [
+                    { cwd: 'package/deb/usr', src: '**', dest: '/usr', expand: true, nonull: true },
+                    {
+                        cwd: 'tmp/desktop/keeweb-linux-x64/',
+                        src: '**',
+                        dest: '/usr/share/keeweb-desktop',
+                        expand: true,
+                        nonull: true
+                    },
+                    {
+                        src: 'graphics/128x128.png',
+                        dest: '/usr/share/icons/hicolor/128x128/apps/keeweb.png',
+                        nonull: true
+                    }
+                ]
+            }
+        },
+        'osx-sign': {
+            options: {
+                get identity() {
+                    return getCodeSignConfig().identities.app;
+                },
+                hardenedRuntime: true,
+                entitlements: 'package/osx/entitlements.plist',
+                'entitlements-inherit': 'package/osx/entitlements-inherit.plist',
+                'gatekeeper-assess': false
+            },
+            'desktop-x64': {
+                options: {
+                    'provisioning-profile': './keys/keeweb.provisionprofile'
+                },
+                src: 'tmp/desktop/KeeWeb-darwin-x64/KeeWeb.app'
+            },
+            'desktop-arm64': {
+                options: {
+                    'provisioning-profile': './keys/keeweb.provisionprofile'
+                },
+                src: 'tmp/desktop/KeeWeb-darwin-arm64/KeeWeb.app'
+            },
+            'installer': {
+                src: 'tmp/desktop/KeeWeb Installer.app'
+            }
+        },
+        notarize: {
+            options: {
+                appBundleId: 'net.antelle.keeweb',
+                get appleId() {
+                    return getCodeSignConfig().appleId;
+                },
+                appleIdPassword: '@keychain:AC_PASSWORD',
+                get ascProvider() {
+                    return getCodeSignConfig().teamId;
+                }
+            },
+            'desktop-x64': {
+                src: 'tmp/desktop/KeeWeb-darwin-x64/KeeWeb.app'
+            },
+            'desktop-arm64': {
+                src: 'tmp/desktop/KeeWeb-darwin-arm64/KeeWeb.app'
+            }
+        },
+        'sign-exe': {
+            options: {
+                url: pkg.homepage,
+                get windows() {
+                    return getCodeSignConfig().windows;
+                },
+                get certHash() {
+                    return getCodeSignConfig().microsoftCertHash;
+                }
+            },
+            'win32-build-x64': {
+                options: {
+                    files: {
+                        'tmp/desktop/KeeWeb-win32-x64/KeeWeb.exe': 'KeeWeb',
+                        'tmp/desktop/KeeWeb-win32-x64/keeweb-native-messaging-host.exe':
+                            'KeeWeb Native Messaging Host',
+                        'tmp/desktop/KeeWeb-win32-x64/ffmpeg.dll': '',
+                        'tmp/desktop/KeeWeb-win32-x64/libEGL.dll':
+                            'ANGLE libEGL Dynamic Link Library',
+                        'tmp/desktop/KeeWeb-win32-x64/libGLESv2.dll':
+                            'ANGLE libGLESv2 Dynamic Link Library'
+                    }
+                }
+            },
+            'win32-build-ia32': {
+                options: {
+                    files: {
+                        'tmp/desktop/KeeWeb-win32-ia32/KeeWeb.exe': 'KeeWeb',
+                        'tmp/desktop/KeeWeb-win32-ia32/keeweb-native-messaging-host.exe':
+                            'KeeWeb Native Messaging Host',
+                        'tmp/desktop/KeeWeb-win32-ia32/ffmpeg.dll': '',
+                        'tmp/desktop/KeeWeb-win32-ia32/libEGL.dll':
+                            'ANGLE libEGL Dynamic Link Library',
+                        'tmp/desktop/KeeWeb-win32-ia32/libGLESv2.dll':
+                            'ANGLE libGLESv2 Dynamic Link Library'
+                    }
+                }
+            },
+            'win32-build-arm64': {
+                options: {
+                    files: {
+                        'tmp/desktop/KeeWeb-win32-arm64/KeeWeb.exe': 'KeeWeb',
+                        'tmp/desktop/KeeWeb-win32-arm64/keeweb-native-messaging-host.exe':
+                            'KeeWeb Native Messaging Host',
+                        'tmp/desktop/KeeWeb-win32-arm64/ffmpeg.dll': '',
+                        'tmp/desktop/KeeWeb-win32-arm64/libEGL.dll':
+                            'ANGLE libEGL Dynamic Link Library',
+                        'tmp/desktop/KeeWeb-win32-arm64/libGLESv2.dll':
+                            'ANGLE libGLESv2 Dynamic Link Library'
+                    }
+                }
+            },
+            'win32-uninst-x64': {
+                options: {
+                    files: {
+                        'tmp/desktop/KeeWeb-win32-x64/uninst.exe': 'KeeWeb Uninstaller'
+                    }
+                }
+            },
+            'win32-uninst-ia32': {
+                options: {
+                    files: {
+                        'tmp/desktop/KeeWeb-win32-ia32/uninst.exe': 'KeeWeb Uninstaller'
+                    }
+                }
+            },
+            'win32-uninst-arm64': {
+                options: {
+                    files: {
+                        'tmp/desktop/KeeWeb-win32-arm64/uninst.exe': 'KeeWeb Uninstaller'
+                    }
+                }
+            },
+            'win32-installer-x64': {
+                options: {
+                    files: {
+                        'tmp/desktop/KeeWeb.win.x64.exe': 'KeeWeb Setup'
+                    }
+                }
+            },
+            'win32-installer-ia32': {
+                options: {
+                    files: {
+                        'tmp/desktop/KeeWeb.win.ia32.exe': 'KeeWeb Setup'
+                    }
+                }
+            },
+            'win32-installer-arm64': {
+                options: {
+                    files: {
+                        'tmp/desktop/KeeWeb.win.arm64.exe': 'KeeWeb Setup'
+                    }
+                }
+            }
+        },
+        'sign-dist': {
+            dist: {
+                options: {
+                    sign: 'dist/desktop/Verify.sign.sha256'
+                },
+                files: {
+                    'dist/desktop/Verify.sha256': ['dist/desktop/KeeWeb-*']
+                }
+            }
+        },
+        'run-test': {
+            options: {
+                headless: true
+            },
+            default: 'test/runner.html'
+        },
+        virustotal: {
+            options: {
+                prefix: `keeweb.v${pkg.version}-${sha}.`,
+                timeout: 10 * 60 * 1000,
+                get apiKey() {
+                    return require('./keys/virus-total.json').apiKey;
+                }
+            },
+            html: 'dist/index.html'
         }
     });
-
-    grunt.registerTask('default', [
-        'bower-install-simple',
-        'clean',
-        'jshint',
-        'copy:html',
-        'copy:favicon',
-        'copy:fonts',
-        'webpack',
-        'uglify',
-        'sass',
-        'postcss',
-        'inline',
-        'htmlmin',
-        'string-replace'
-    ]);
 };

LICENSE

@@ -0,0 +1,24 @@
+MIT License
+
+Copyright (c) 2021 Antelle https://antelle.net
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Licences of dependencies can be found here:
+https://raw.githubusercontent.com/keeweb/keeweb/master/DEPS-LICENSE

MIT-LICENSE.txt

@@ -1,20 +0,0 @@
-Copyright (C) 2015 Antelle
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,33 +1,100 @@
-# KeePass web app (unofficial)
+# Free cross-platform password manager compatible with KeePass
 
-This webapp can read KeePass databases. It doesn't require any server or additional resources.
-It can be run either in browser, or as a desktop app. 
+This webapp is a browser and desktop password manager compatible with KeePass databases. It doesn't require any server or additional resources.
+The app can run either in browser, or as a desktop app.
 
-![screenshot](https://antelle.github.io/keeweb/screenshot2x.png)
+![screenshot](img/screenshot.png)
 
-# Quick Links
+## Quick Links
 
-[Web](https://antelle.github.io/keeweb/)
-[Windows](https://github.com/antelle/keeweb/releases/download/v0.0.1/KeeWeb.win32.exe)
-[Mac OSX](https://github.com/antelle/keeweb/releases/download/v0.0.1/KeeWeb.mac.dmg)
-[Linux](https://github.com/antelle/keeweb/releases/download/v0.0.1/KeeWeb.linux.x64.zip)
+Apps: [Web](https://app.keeweb.info/), [Desktop](https://github.com/keeweb/keeweb/releases/latest)  
+Timeline: [Release Notes](release-notes.md), [TODO](https://github.com/keeweb/keeweb/wiki/TODO)  
+On one page: [Features](https://keeweb.info/#features), [FAQ](https://github.com/keeweb/keeweb/wiki/FAQ)  
+Website: [keeweb.info](https://keeweb.info)  
+Twitter: [kee_web](https://twitter.com/kee_web)  
+Donate: [OpenCollective](https://opencollective.com/keeweb#support), [GitHub](https://github.com/sponsors/antelle)  
 
-# Status
+## Status
 
-Reading and display is mostly complete; modification and sync is under construction, please see [TODO](TODO.md) for more details.
+The app is quite stable now. Basic stuff, as well as more advanced operations, should be rather reliable.
 
-# Building
+## Self-hosting
 
-The app can be built with grunt: `grunt` (html file will be in `dist/`) or `grunt watch` (result will be in `tmp/`).
-Electron app is built manually, scripts and configs are in `util` directory.
-To run Electron app without building, install electron package (`npm install electron-prebuilt -g`) and start with `electron ./electron/`.
+Everything you need to host this app on your server is any static file server. The app is a single HTML file + a service worker (optionally; for offline access).
+You can download the latest distribution files from [gh-pages](https://github.com/keeweb/keeweb/archive/gh-pages.zip) branch.  
 
-# Contributing
+If you are using Docker:
 
-Plugins are not supported for now. If you want to add a feature, please contact the author first. Pull requests, patches and issues are very welcome.  
-If you have found an bug, please [open an issue](https://github.com/antelle/keeweb/issues/new) and fill in the app version and your user-agent 
-(you can find these details on Settings/Help section).
+1. put your dh.pem, cert.pem, key.pem to /etc/nginx/external/ 
+2. run this script:
+```bash
+docker run --name keeweb -d -p 443:443 -p 80:80 -v $EXT_DIR:/etc/nginx/external/ antelle/keeweb
+```
 
-# License
+To make Dropbox work in your self-hosted app, [go to this Wiki page](https://github.com/keeweb/keeweb/wiki/Dropbox-and-GDrive).
 
-[MIT](https://github.com/antelle/keeweb/blob/master/MIT-LICENSE.txt)
+## Building
+
+The easiest way to clone all KeeWeb repos is:
+```bash
+curl https://raw.githubusercontent.com/keeweb/keeweb/develop/dev-env.sh | bash -
+```
+
+The app can be built with grunt: `grunt` (html files will be in `dist/`).  
+Desktop apps are built with `grunt desktop`. This requires some magic and currently works only on CI, 
+you can find more details in [the GitHub Actions workflow](.github/workflows/build.yaml).  
+
+To run the desktop (electron) app without building an installer, build the app with `grunt` and start it this way:
+```bash
+npm run dev
+npm run electron
+```
+
+For debug build:
+
+1. run `npm run dev`
+2. open `http://localhost:8085`
+
+To build desktop apps, use these goals, the result can be found in `tmp`:
+
+```
+npm run dev-desktop-macos
+npm run dev-desktop-windows
+npm run dev-desktop-linux
+```
+
+## Contributing
+
+Please read contribution guidelines [for pull requests](.github/PULL_REQUEST_TEMPLATE.md).  
+Here's a [list of issues](https://github.com/keeweb/keeweb/labels/help%20wanted) where your help would be very welcome.
+Also you can help by [translating KeeWeb](https://keeweb.oneskyapp.com) to your language.  
+
+Other ways of contribution can be found [on this page](CONTRIBUTING.md).
+
+#### Important notes for pull requests
+
+- please branch from `develop`, not `master`
+- don't edit translation files except base.json, they will be replaced
+
+## Donations
+
+KeeWeb is not free to develop. It takes time, requires paid code signing certificates and domains.  
+You can help the project or say "thank you" with this button:  
+[<img src="https://opencollective.com/keeweb/tiers/backer.svg?avatarHeight=42&width=880" alt="OpenCollective">](https://opencollective.com/keeweb#support)
+
+You can also sponsor the developer directly [on GitHub](https://github.com/sponsors/antelle).  
+
+Please note: donation does not imply any type of service contract.  
+
+## Thank you
+
+Notable contributions to KeeWeb:
+
+- Florian Reuschel ([@Loilo](https://github.com/Loilo)): [German translation](https://keeweb.oneskyapp.com/collaboration/translate/project/project/173183/language/550)
+- Dennis Ploeger ([@dploeger](https://github.com/dploeger)): [auto-type improvements](https://github.com/keeweb/keeweb/pulls?q=is%3Apr+is%3Aclosed+author%3Adploeger)
+- Hackmanit ([hackmanit.de](https://www.hackmanit.de)): [penetration test](https://www.hackmanit.de/en/blog-en/104-pro-bono-penetration-test-keeweb)
+- Peter Bittner ([@bittner](https://github.com/bittner)): [Wikipedia article](https://en.wikipedia.org/wiki/KeeWeb)
+
+## License
+
+[MIT](https://github.com/keeweb/keeweb/blob/master/LICENSE)

SECURITY.md

@@ -0,0 +1,11 @@
+# Security Policy
+
+## Supported Versions
+
+Only the latest version of the product is supported. This version can be accessed at https://app.keeweb.info 
+and downloaded from https://keeweb.info or GitHub releases ([latest release link](https://github.com/keeweb/keeweb/releases/latest)).
+
+## Reporting a Vulnerability
+
+We would appreciate [responsible disclosure](https://en.wikipedia.org/wiki/Responsible_disclosure).
+If you would like to report a vulnerability, the preferred way to do so is [contacting the developer directly](mailto:antelle.net@gmail.com).

TODO.md

@@ -1,26 +0,0 @@
-# MVP
-
-- [ ] add/edit groups
-
-# FUTURE
-
-- [ ] trash: groups/empty/untrash
-- [ ] move groups/entries
-- [ ] help/tips
-- [ ] switch view
-- [ ] optional auto-update
-- [ ] lock without closing
-- [ ] merge
-- [ ] show sync date
-- [ ] dropbox keyfiles
-- [ ] save to localstorage
-- [ ] generation templates
-- [ ] advanced search
-- [ ] mobile
-- [ ] file type associations
-- [ ] auto-type
-- [ ] secure fields
-- [ ] audit
-- [ ] entry templates
-- [ ] custom icons
-- [ ] plugins

app/content/404.html

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <title>Not Found</title>
+        <style>
+            body {
+                font-family: -apple-system, 'BlinkMacSystemFont', 'Raleway', 'Helvetica Neue',
+                    'Helvetica', 'Arial', sans-serif;
+                font-feature-settings: 'liga' 0;
+                text-align: center;
+                background: #f5f5f5;
+                font-weight: 300;
+            }
+            h1 {
+                font-size: 3em;
+                margin-top: 10vh;
+            }
+            p {
+                line-height: 1.5em;
+            }
+        </style>
+    </head>
+    <body>
+        <h1>404 Not Found</h1>
+        <p>Sorry, the page you're looking for was not found.</p>
+    </body>
+</html>

app/content/oauth-result/dropbox.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <title>KeeWeb</title>
+    </head>
+    <body>
+        <script>
+            window.opener.postMessage(
+                { storage: 'dropbox', search: location.search },
+                window.location.origin
+            );
+            window.close();
+        </script>
+    </body>
+</html>

app/content/oauth-result/gdrive.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <title>KeeWeb</title>
+    </head>
+    <body>
+        <script>
+            window.opener.postMessage(
+                { storage: 'gdrive', search: location.search },
+                window.location.origin
+            );
+            window.close();
+        </script>
+    </body>
+</html>

app/content/oauth-result/msteams.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <title>KeeWeb</title>
+    </head>
+    <body>
+        <script>
+            window.opener.postMessage(
+                { storage: 'teams', search: location.search },
+                window.location.origin
+            );
+            window.close();
+        </script>
+    </body>
+</html>

app/content/oauth-result/onedrive.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <title>KeeWeb</title>
+    </head>
+    <body>
+        <script>
+            window.opener.postMessage(
+                { storage: 'onedrive', search: location.search },
+                window.location.origin
+            );
+            window.close();
+        </script>
+    </body>
+</html>

app/icons/safari-pinned-tab.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-64 -64 640 640"><path d="M136.736 512c-4.892-.008-10.322-2.061-15.92-4.997-11.941-6.265-20.13-14.185-13.293-27.218l166.101-316.638c-1.972-1.022-3.619-1.88-4.743-2.469-59.892-31.418-86.463-77.87-64.952-118.877 24.726-47.135 101.304-55.69 171.042-19.107 69.738 36.584 106.227 104.451 81.501 151.586-21.264 40.536-76.784 44.151-132.61 14.866-1.538-.807-4.033-2.103-6.857-3.567L150.768 502.471c-3.632 6.924-8.488 9.538-14.032 9.529zm-30.582-67.835l-3.144-1.649-.7-.366-42.546-22.32v-.001l-10.256-5.38c-1.738-.911-2.407-3.057-1.496-4.794l13.465-25.667c.906-1.728 3.036-2.399 4.768-1.509l.028.013 20.513 10.761c1.736.911 3.883.241 4.794-1.496l13.466-25.667c.911-1.737.24-3.883-1.497-4.794l-10.256-5.382-10.256-5.38c-1.737-.911-2.406-3.057-1.495-4.794l13.464-25.669c.911-1.737 3.058-2.406 4.794-1.494l10.258 5.38 26.697 14.005 16.548 8.681c.007.003.014.007.021.011l3.125 1.639-14.142 26.957-.973 1.855c0 .001-.001.003-.002.004l-20.063 38.245-2.041 3.888-11.424 21.779c-.002.004-.005.009-.008.014zm67.232-128.162l-3.145-1.651-14.938-7.837-11.794-6.187c-1.737-.911-2.408-3.057-1.497-4.794l13.466-25.667c.911-1.737 3.058-2.408 4.794-1.497l11.795 6.188 14.939 7.837c.007.003.014.007.021.01l3.125 1.64-1.651 3.145-6.731 12.834-6.733 12.833c-.003.005-.006.008-.009.013zm219.778-151.914c8.857.016 15.784-3.552 20.386-12.326 14.027-26.737-11.92-67.987-57.953-92.135-46.032-24.148-94.719-22.049-108.746 4.688-14.026 26.737 24.987 44.293 71.02 68.441 30.928 16.224 57.156 31.296 75.293 31.332z"/></svg>

app/index.html

@@ -1,18 +1,85 @@
 <!DOCTYPE html>
-<html manifest="manifest.appcache">
-<head lang="en">
-    <meta charset="UTF-8">
-    <title>KeeWeb</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <link rel="shortcut icon" href="favicon.png?__inline=true" />
-    <link rel="stylesheet" href="css/main.css?__inline=true" />
-    <script src="js/vendor.js?__inline=true"></script>
-    <script src="js/app.js?__inline=true"></script>
-</head>
-<body class="th-d">
-    <noscript>
-        <h1>KeePass Web App</h1>
-        <p>This app is written entirely in JavaScript. Please, enable JavaScript to run it.</p>
-    </noscript>
-</body>
+<html>
+    <head lang="en">
+        <meta charset="UTF-8" />
+        <title>KeeWeb</title>
+        <meta
+            http-equiv="Content-Security-Policy"
+            content="
+                            default-src 'self';
+                            font-src data:;
+                            script-src 'self' 'unsafe-eval';
+                            style-src 'self' blob:;
+                            connect-src 'self' ws: https:;
+                            child-src 'self' blob:;
+                            worker-src 'self' blob:;
+                            img-src 'self' data: blob: https://services.keeweb.info/;
+                            object-src 'none';
+                            form-action 'none';
+            "
+        />
+        <meta name="application-name" content="KeeWeb" />
+        <meta name="kw-config" content="(no-config)" />
+        <meta
+            name="viewport"
+            content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
+        />
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+        <meta name="apple-mobile-web-app-title" content="KeeWeb" />
+        <meta name="theme-color" content="#6386ec" />
+        <meta name="msapplication-config" content="browserconfig.xml" />
+        <meta name="msapplication-TileColor" content="#6386ec" />
+        <link rel="apple-touch-icon" sizes="180x180" href="icons/apple-touch-icon.png" />
+        <link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png" />
+        <link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png" />
+        <link rel="mask-icon" href="icons/safari-pinned-tab.svg" color="#6386ec" />
+        <link
+            rel="apple-touch-startup-image"
+            href="icons/splash-640x1136.png"
+            media="(device-width: 320px) and (device-height: 568px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
+        />
+        <link
+            rel="apple-touch-startup-image"
+            href="icons/splash-750x1294.png"
+            media="(device-width: 375px) and (device-height: 667px) and (-webkit-device-pixel-ratio: 2) and (orientation: portrait)"
+        />
+        <link
+            rel="apple-touch-startup-image"
+            href="icons/splash-1242x2148.png"
+            media="(device-width: 414px) and (device-height: 736px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)"
+        />
+        <link
+            rel="apple-touch-startup-image"
+            href="icons/splash-1125x2436.png"
+            media="(device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) and (orientation: portrait)"
+        />
+        <link
+            rel="apple-touch-startup-image"
+            href="icons/splash-1536x2048.png"
+            media="(min-device-width: 768px) and (max-device-width: 1024px) and (-webkit-min-device-pixel-ratio: 2) and (orientation: portrait)"
+        />
+        <link
+            rel="apple-touch-startup-image"
+            href="icons/splash-1668x2224.png"
+            media="(min-device-width: 834px) and (max-device-width: 834px) and (-webkit-min-device-pixel-ratio: 2) and (orientation: portrait)"
+        />
+        <link
+            rel="apple-touch-startup-image"
+            href="icons/splash-2048x2732.png"
+            media="(min-device-width: 1024px) and (max-device-width: 1024px) and (-webkit-min-device-pixel-ratio: 2) and (orientation: portrait)"
+        />
+        <link rel="manifest" href="manifest.json" />
+        <link rel="stylesheet" href="css/app.css?__inline=true" />
+        <script src="js/app.js?__inline=true"></script>
+    </head>
+    <body class="th-d">
+        <noscript>
+            <h1>KeeWeb</h1>
+            <p>
+                KeeWeb is a password manager written in JavaScript. Please enable JavaScript to run
+                it.
+            </p>
+        </noscript>
+    </body>
 </html>

app/lib/babel-helpers.js

@@ -0,0 +1,71 @@
+(function (global) {
+  var babelHelpers = global.babelHelpers = {};
+  babelHelpers.typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
+    return typeof obj;
+  } : function (obj) {
+    return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+  };
+
+  babelHelpers.defineProperty = function (obj, key, value) {
+    if (key in obj) {
+      Object.defineProperty(obj, key, {
+        value: value,
+        enumerable: true,
+        configurable: true,
+        writable: true
+      });
+    } else {
+      obj[key] = value;
+    }
+
+    return obj;
+  };
+
+  babelHelpers.slicedToArray = function () {
+    function sliceIterator(arr, i) {
+      var _arr = [];
+      var _n = true;
+      var _d = false;
+      var _e = undefined;
+
+      try {
+        for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
+          _arr.push(_s.value);
+
+          if (i && _arr.length === i) break;
+        }
+      } catch (err) {
+        _d = true;
+        _e = err;
+      } finally {
+        try {
+          if (!_n && _i["return"]) _i["return"]();
+        } finally {
+          if (_d) throw _e;
+        }
+      }
+
+      return _arr;
+    }
+
+    return function (arr, i) {
+      if (Array.isArray(arr)) {
+        return arr;
+      } else if (Symbol.iterator in Object(arr)) {
+        return sliceIterator(arr, i);
+      } else {
+        throw new TypeError("Invalid attempt to destructure non-iterable instance");
+      }
+    };
+  }();
+
+  babelHelpers.toConsumableArray = function (arr) {
+    if (Array.isArray(arr)) {
+      for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i];
+
+      return arr2;
+    } else {
+      return Array.from(arr);
+    }
+  };
+})(typeof global === "undefined" ? self : global);

app/manifest.appcache

@@ -1,9 +0,0 @@
-CACHE MANIFEST
-
-# YYYY-MM-DD:v0.0.0
-
-CACHE:
-index.html
-
-NETWORK:
-*

app/manifest/browserconfig.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square70x70logo src="/icons/mstile-70x70.png"/>
+            <square150x150logo src="/icons/mstile-150x150.png"/>
+            <square310x310logo src="/icons/mstile-310x310.png"/>
+            <wide310x150logo src="/icons/mstile-310x150.png"/>
+            <TileColor>#6386ec</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>

app/manifest/manifest.json

@@ -0,0 +1,21 @@
+{
+    "name": "KeeWeb",
+    "short_name": "KeeWeb",
+    "description": "Free cross-platform password manager compatible with KeePass",
+    "start_url": "./",
+    "display": "standalone",
+    "theme_color": "#6386ec",
+    "background_color": "#6386ec",
+    "icons": [
+        {
+            "src": "icons/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ]
+}

app/resources/public-key-new.pem

@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyZAmWXMpKsh9WCyUO5TR
+2/QIJsgyaViWRAgY5nHZhTR/sjhfG97OeurW7NYC4XPsnyJDepEjDsj9LNzquMES
+xsLRSmxo+m1lVWn8Q59LwqOvUK+BKH4eZYF89Nwv2HZjZnr/w7xYcxJbhOuAzpbq
+FD/gAvlozrsHG9uI95h1FHPd6mfolEHLK30LXPQ5FdJ/AWb29ILKYbVEdM8qsjoN
+fSICw7XTbd7wB0TMcgRpjWllzKaftxCO38svhBjAz4cUvtZ05yi4dzK0VsJHfW33
+uno3YBn0/bwLkqMzD1/Hv05p6CVzuDTOCBsXkEobra8OBviatoSukot6cS4Famki
+9QIDAQAB
+-----END PUBLIC KEY-----

app/resources/public-key.pem

@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnRq2k3TTx0ewTe6wDr6Q
+VeB5diwiIWzsJD+ApfZu1KNPedcAgslAfjpNsYF1if6cYsPMJH70xJ2np6RQBl1V
+PdwShOuxkD7m0BD5Hw/Aar8Hdp5cvAdOOMdBO+0DbGeUMy+z66s+oUCJmqVp19T6
+PkkxbhN08rgtT7v+aFvrbqbO/vlsskbJpH2K2io+e1XmRGPnSr9q4KSqfGbTfe5g
+LwDIOFd66Z4mb5Utb5wWpsy6Gjh06Yf257AccGD3A1bkTNOyeeX0tqciYBePWMk0
+icP/aZ6hnErfhnUKf3tOgPLppSHiGcaSKekhChZ2xLUs3U64JwrXSmwHj+TzdO3S
+0QIDAQAB
+-----END PUBLIC KEY-----

app/scripts/.eslintrc

@@ -0,0 +1,5 @@
+{
+    "rules": {
+        "import/no-commonjs": "error"
+    }
+}

app/scripts/app.js

@@ -1,38 +1,212 @@
-'use strict';
+import { Events } from 'framework/events';
+import { StartProfiler } from 'comp/app/start-profiler';
+import { FileInfoCollection } from 'collections/file-info-collection';
+import { AppRightsChecker } from 'comp/app/app-rights-checker';
+import { ExportApi } from 'comp/app/export-api';
+import { SingleInstanceChecker } from 'comp/app/single-instance-checker';
+import { Updater } from 'comp/app/updater';
+import { UsbListener } from 'comp/app/usb-listener';
+import { BrowserExtensionConnector } from 'comp/extension/browser-extension-connector';
+import { FeatureTester } from 'comp/browser/feature-tester';
+import { FocusDetector } from 'comp/browser/focus-detector';
+import { IdleTracker } from 'comp/browser/idle-tracker';
+import { ThemeWatcher } from 'comp/browser/theme-watcher';
+import { KeyHandler } from 'comp/browser/key-handler';
+import { PopupNotifier } from 'comp/browser/popup-notifier';
+import { Launcher } from 'comp/launcher';
+import { SettingsManager } from 'comp/settings/settings-manager';
+import { Alerts } from 'comp/ui/alerts';
+import { Timeouts } from 'const/timeouts';
+import { AppModel } from 'models/app-model';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { RuntimeDataModel } from 'models/runtime-data-model';
+import { UpdateModel } from 'models/update-model';
+import { PluginManager } from 'plugins/plugin-manager';
+import { Features } from 'util/features';
+import { KdbxwebInit } from 'util/kdbxweb/kdbxweb-init';
+import { Locale } from 'util/locale';
+import { AppView } from 'views/app-view';
+import 'hbs-helpers';
+import { AutoType } from './auto-type';
+import { Storage } from './storage';
 
-var AppModel = require('./models/app-model'),
-    AppView = require('./views/app-view'),
-    KeyHandler = require('./comp/key-handler'),
-    Alerts = require('./comp/alerts'),
-    DropboxLink = require('./comp/dropbox-link');
+StartProfiler.milestone('loading modules');
 
-$(function() {
-    require('./mixins/view');
+const ready = (Launcher && Launcher.ready) || $;
 
-    if (location.href.indexOf('state=') >= 0) {
-        DropboxLink.receive();
-        return;
-    }
-    KeyHandler.init();
-    if (['https:', 'file:', 'app:'].indexOf(location.protocol) < 0) {
-        Alerts.error({ header: 'Not Secure!', icon: 'user-secret', esc: false, enter: false, click: false,
-            body: 'You have loaded this app with insecure connection. ' +
-                'Someone may be watching you and stealing your passwords. ' +
-                'We strongly advice you to stop, unless you clearly understand what you\'re doing.' +
-                '<br/><br/>' +
-                'Yes, your database is encrypted but no one can guarantee that the app has not been modified on the way to you.',
-            buttons: [
-                { result: '', title: 'I understand the risks, continue', error: true }
-            ],
-            complete: showApp
+ready(() => {
+    StartProfiler.milestone('document ready');
+
+    const appModel = new AppModel();
+    StartProfiler.milestone('creating app model');
+
+    Promise.resolve()
+        .then(loadConfigs)
+        .then(initModules)
+        .then(loadRemoteConfig)
+        .then(ensureCanRun)
+        .then(initStorage)
+        .then(initUsbListener)
+        .then(showApp)
+        .then(postInit)
+        .catch((e) => {
+            appModel.appLogger.error('Error starting app', e);
         });
-    } else {
-        showApp();
+
+    function ensureCanRun() {
+        if (Features.isFrame && !appModel.settings.allowIframes) {
+            return Promise.reject(
+                'Running in iframe is not allowed (this can be changed in the app config).'
+            );
+        }
+        return FeatureTester.test()
+            .catch((e) => {
+                Alerts.error({
+                    header: Locale.appSettingsError,
+                    body: Locale.appNotSupportedError,
+                    pre: e,
+                    buttons: [],
+                    esc: false,
+                    enter: false,
+                    click: false
+                });
+                throw 'Feature testing failed: ' + e;
+            })
+            .then(() => {
+                StartProfiler.milestone('checking features');
+            });
+    }
+
+    function loadConfigs() {
+        return Promise.all([
+            AppSettingsModel.load(),
+            UpdateModel.load(),
+            RuntimeDataModel.load(),
+            FileInfoCollection.load()
+        ]).then(() => {
+            StartProfiler.milestone('loading configs');
+        });
+    }
+
+    function initModules() {
+        KeyHandler.init();
+        PopupNotifier.init();
+        KdbxwebInit.init();
+        FocusDetector.init();
+        AutoType.init();
+        ThemeWatcher.init();
+        SettingsManager.init();
+        window.kw = ExportApi;
+        return PluginManager.init().then(() => {
+            StartProfiler.milestone('initializing modules');
+        });
+    }
+
+    function showSettingsLoadError() {
+        Alerts.error({
+            header: Locale.appSettingsError,
+            body: Locale.appSettingsErrorBody,
+            buttons: [],
+            esc: false,
+            enter: false,
+            click: false
+        });
+    }
+
+    function loadRemoteConfig() {
+        return Promise.resolve()
+            .then(() => {
+                SettingsManager.setBySettings();
+                const configParam = getConfigParam();
+                if (configParam) {
+                    return appModel
+                        .loadConfig(configParam)
+                        .then(() => {
+                            SettingsManager.setBySettings();
+                        })
+                        .catch((e) => {
+                            if (!appModel.settings.cacheConfigSettings) {
+                                showSettingsLoadError();
+                                throw e;
+                            }
+                        });
+                }
+            })
+            .then(() => {
+                StartProfiler.milestone('loading remote config');
+            });
+    }
+
+    function initStorage() {
+        for (const prv of Object.values(Storage)) {
+            prv.init();
+        }
+        StartProfiler.milestone('initializing storage');
+    }
+
+    function initUsbListener() {
+        UsbListener.init();
+        StartProfiler.milestone('starting usb');
     }
 
     function showApp() {
-        var appModel = new AppModel();
-        new AppView({ model: appModel }).render().showOpenFile(appModel.settings.get('lastOpenFile'));
+        return Promise.resolve().then(() => {
+            const skipHttpsWarning =
+                localStorage.skipHttpsWarning || appModel.settings.skipHttpsWarning;
+            const protocolIsInsecure = ['https:', 'file:', 'app:'].indexOf(location.protocol) < 0;
+            const hostIsInsecure = location.hostname !== 'localhost';
+            if (protocolIsInsecure && hostIsInsecure && !skipHttpsWarning) {
+                return new Promise((resolve) => {
+                    Alerts.error({
+                        header: Locale.appSecWarn,
+                        icon: 'user-secret',
+                        esc: false,
+                        enter: false,
+                        click: false,
+                        body: Locale.appSecWarnBody1 + '\n\n' + Locale.appSecWarnBody2,
+                        buttons: [{ result: '', title: Locale.appSecWarnBtn, error: true }],
+                        complete: () => {
+                            showView();
+                            resolve();
+                        }
+                    });
+                });
+            } else {
+                showView();
+                return new Promise((resolve) => requestAnimationFrame(resolve));
+            }
+        });
+    }
+
+    function postInit() {
+        setTimeout(() => {
+            Updater.init();
+            SingleInstanceChecker.init();
+            AppRightsChecker.init();
+            IdleTracker.init();
+            BrowserExtensionConnector.init(appModel);
+            PluginManager.runAutoUpdate();
+        }, Timeouts.AutoUpdatePluginsAfterStart);
+    }
+
+    function showView() {
+        new AppView(appModel).render();
+        StartProfiler.milestone('first view rendering');
+
+        Events.emit('app-ready');
+        StartProfiler.milestone('app ready event');
+
+        StartProfiler.report();
+    }
+
+    function getConfigParam() {
+        const metaConfig = document.head.querySelector('meta[name=kw-config]');
+        if (metaConfig && metaConfig.content && metaConfig.content[0] !== '(') {
+            return metaConfig.content;
+        }
+        const match = location.search.match(/[?&]config=([^&]+)/i);
+        if (match && match[1]) {
+            return match[1];
+        }
     }
 });
-

app/scripts/auto-type/auto-type-emitter.js

@@ -0,0 +1,160 @@
+import { Features } from 'util/features';
+import { NativeModules } from 'comp/launcher/native-modules';
+import { Logger } from 'util/logger';
+import { Launcher } from 'comp/launcher';
+import { Timeouts } from 'const/timeouts';
+
+const logger = new Logger('auto-type-emitter');
+
+const KeyMap = {
+    tab: 'Tab',
+    enter: 'Return',
+    space: 'Space',
+    up: 'UpArrow',
+    down: 'DownArrow',
+    left: 'LeftArrow',
+    right: 'RightArrow',
+    home: 'Home',
+    end: 'End',
+    pgup: 'PageUp',
+    pgdn: 'PageDown',
+    ins: 'Insert',
+    del: 'ForwardDelete',
+    bs: 'BackwardDelete',
+    esc: 'Escape',
+    win: 'Meta',
+    rwin: 'RightMeta',
+    f1: 'F1',
+    f2: 'F2',
+    f3: 'F3',
+    f4: 'F4',
+    f5: 'F5',
+    f6: 'F6',
+    f7: 'F7',
+    f8: 'F8',
+    f9: 'F9',
+    f10: 'F10',
+    f11: 'F11',
+    f12: 'F12',
+    f13: 'F13',
+    f14: 'F14',
+    f15: 'F15',
+    f16: 'F16',
+    add: 'KeypadPlus',
+    subtract: 'KeypadMinus',
+    multiply: 'KeypadMultiply',
+    divide: 'KeypadDivide',
+    n0: 'D0',
+    n1: 'D1',
+    n2: 'D2',
+    n3: 'D3',
+    n4: 'D4',
+    n5: 'D5',
+    n6: 'D6',
+    n7: 'D7',
+    n8: 'D8',
+    n9: 'D9'
+};
+
+const ModMap = {
+    '^': Features.isMac ? 'Command' : 'Ctrl',
+    '+': 'Shift',
+    '%': 'Alt',
+    '^^': 'Ctrl'
+};
+
+class AutoTypeEmitter {
+    constructor(callback) {
+        this.callback = callback;
+        this.mod = {};
+    }
+
+    begin() {
+        this.withCallback(NativeModules.kbdEnsureModifierNotPressed());
+    }
+
+    setMod(mod, enabled) {
+        const nativeMod = ModMap[mod];
+        if (!nativeMod) {
+            return this.callback(`Bad modifier: ${mod}`);
+        }
+        NativeModules.kbdKeyMoveWithModifier(!!enabled, [nativeMod]).catch((e) => {
+            logger.error('Error moving modifier', mod, enabled ? 'down' : 'up', e);
+        });
+        if (enabled) {
+            this.mod[nativeMod] = true;
+        } else {
+            delete this.mod[nativeMod];
+        }
+    }
+
+    text(str) {
+        if (!str) {
+            return this.withCallback(Promise.resolve());
+        }
+        const mods = Object.keys(this.mod);
+        if (mods.length) {
+            this.withCallback(NativeModules.kbdTextAsKeys(str, mods));
+        } else {
+            this.withCallback(NativeModules.kbdText(str));
+        }
+    }
+
+    key(key) {
+        const mods = Object.keys(this.mod);
+        if (typeof key === 'number') {
+            this.withCallback(NativeModules.kbdKeyPressWithCharacter(0, key, mods));
+        } else {
+            if (!KeyMap[key]) {
+                return this.callback('Bad key: ' + key);
+            }
+            const code = KeyMap[key];
+            this.withCallback(NativeModules.kbdKeyPress(code, mods));
+        }
+    }
+
+    copyPaste(text) {
+        setTimeout(() => {
+            Launcher.setClipboardText(text);
+            setTimeout(() => {
+                this.withCallback(NativeModules.kbdShortcut('V'));
+            }, Timeouts.AutoTypeCopyPaste);
+        }, Timeouts.AutoTypeCopyPaste);
+    }
+
+    wait(time) {
+        setTimeout(() => this.withCallback(Promise.resolve()), time);
+    }
+
+    waitComplete() {
+        this.withCallback(Promise.resolve());
+    }
+
+    setDelay() {
+        this.callback('Not implemented');
+    }
+
+    withCallback(promise) {
+        promise
+            .then(() => {
+                try {
+                    this.callback();
+                } catch (err) {
+                    logger.error('Callback error', err);
+                }
+            })
+            .catch((err) => {
+                const keyPressFailed = err.message === 'Key press failed';
+                if (keyPressFailed) {
+                    err.keyPressFailed = true;
+                }
+                try {
+                    this.callback(err);
+                } catch (err) {
+                    logger.error('Callback error', err);
+                }
+            });
+    }
+}
+
+export { AutoTypeEmitter };

app/scripts/auto-type/auto-type-helper.js

@@ -0,0 +1,16 @@
+import { NativeModules } from 'comp/launcher/native-modules';
+
+class AutoTypeHelper {
+    getActiveWindowInfo(callback) {
+        NativeModules.kbdGetActiveWindow({
+            getWindowTitle: true,
+            getBrowserUrl: true
+        })
+            .then((win) => {
+                callback(undefined, win);
+            })
+            .catch((err) => callback(err));
+    }
+}
+
+export { AutoTypeHelper };

app/scripts/auto-type/auto-type-obfuscator.js

@@ -0,0 +1,209 @@
+import { Logger } from 'util/logger';
+
+const logger = new Logger(
+    'auto-type-obfuscator',
+    undefined,
+    localStorage.debugAutoType ? Logger.Level.All : Logger.Level.Warn
+);
+
+const MaxFakeOps = 30;
+const MaxSteps = 1000;
+const MaxCopy = 2;
+const FakeCharAlphabet = 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnpqrstuvwxyz123456789O0oIl';
+
+const AutoTypeObfuscator = function (chars) {
+    this.chars = chars;
+    this.inputChars = [];
+    this.inputCursor = 0;
+    this.inputSel = 0;
+    this.ops = [];
+    this.stepCount = 0;
+    this.copyCount = 0;
+};
+
+AutoTypeObfuscator.prototype.obfuscate = function () {
+    while (!this.finished()) {
+        this.step();
+        if (this.stepCount++ > MaxSteps) {
+            throw 'Obfuscate failed';
+        }
+    }
+    for (let i = 0; i < this.chars.length; i++) {
+        this.chars[i] = null;
+        this.inputChars[i] = null;
+    }
+    return this.ops;
+};
+
+AutoTypeObfuscator.prototype.finished = function () {
+    return (
+        this.chars.length === this.inputChars.length &&
+        this.chars.every(function (ch, ix) {
+            return this.inputChars[ix].ch === ch;
+        }, this)
+    );
+};
+
+AutoTypeObfuscator.prototype.step = function () {
+    const isFake = this.stepCount < MaxFakeOps && Math.random() > this.stepCount / MaxFakeOps;
+    if (isFake) {
+        this.stepFake();
+    } else {
+        this.stepReal();
+    }
+    if (logger.getLevel() >= Logger.Level.Debug) {
+        logger.debug('value', this.inputChars.map((ic) => ic.ch).join(''));
+    }
+};
+
+AutoTypeObfuscator.prototype.stepFake = function () {
+    const pos = Math.floor(Math.random() * (this.inputChars.length + 1));
+    const ch = FakeCharAlphabet[Math.floor(Math.random() * FakeCharAlphabet.length)];
+    logger.info('step.fake', pos, ch);
+    this.moveToPos(pos);
+    const insert = this.inputChars.length === 0 || Math.random() > 0.3;
+    if (insert) {
+        this.inputChar(ch);
+    } else {
+        let moveLeft = Math.random() > 0.5;
+        let maxMove = moveLeft ? pos : this.inputChars.length - pos;
+        if (maxMove === 0) {
+            moveLeft = !moveLeft;
+            maxMove = moveLeft ? pos : this.inputChars.length - pos;
+        }
+        const moveCount = Math.max(Math.floor(Math.pow(Math.random(), 3) * maxMove), 1);
+        if (moveCount <= 1 && Math.random() > 0.5) {
+            this.deleteText(moveLeft);
+        } else {
+            this.selectText(moveLeft, moveCount);
+            if (Math.random() > 0.3) {
+                this.deleteText(Math.random() > 0.5);
+            } else {
+                this.inputChar(ch);
+            }
+        }
+    }
+};
+
+AutoTypeObfuscator.prototype.stepReal = function () {
+    const possibleActions = [];
+    const inputRealPositions = [];
+    let i;
+    for (i = 0; i < this.chars.length; i++) {
+        inputRealPositions.push(-1);
+    }
+    for (i = 0; i < this.inputChars.length; i++) {
+        const ix = this.inputChars[i].ix;
+        if (ix === undefined) {
+            possibleActions.push({ del: true, pos: i });
+        } else {
+            inputRealPositions[ix] = i;
+        }
+    }
+    for (i = 0; i < this.chars.length; i++) {
+        if (inputRealPositions[i] < 0) {
+            let from = 0,
+                to = this.inputChars.length;
+            for (let j = 0; j < this.chars.length; j++) {
+                if (j < i && inputRealPositions[j] >= 0) {
+                    from = inputRealPositions[j] + 1;
+                }
+                if (j > i && inputRealPositions[j] >= 0) {
+                    to = inputRealPositions[j];
+                    break;
+                }
+            }
+            possibleActions.push({ ins: true, ch: this.chars[i], ix: i, from, to });
+        }
+    }
+    const action = possibleActions[Math.floor(Math.random() * possibleActions.length)];
+    logger.info('step.real', inputRealPositions, action);
+    if (action.del) {
+        this.moveToPos(action.pos + 1);
+        this.deleteText(true);
+    } else {
+        const insPos = action.from + Math.floor(Math.random() * (action.to - action.from));
+        this.moveToPos(insPos);
+        if (this.copyCount < MaxCopy && action.ch !== '\n' && Math.random() > 0.5) {
+            this.copyCount++;
+            this.copyPaste(action.ch);
+        } else {
+            this.inputChar(action.ch);
+        }
+        this.inputChars[insPos].ix = action.ix;
+    }
+};
+
+AutoTypeObfuscator.prototype.moveToPos = function (pos) {
+    logger.debug('moveToPos', pos);
+    while (this.inputCursor > pos) {
+        this.moveLeft();
+    }
+    while (this.inputCursor < pos) {
+        this.moveRight();
+    }
+};
+
+AutoTypeObfuscator.prototype.moveLeft = function () {
+    logger.debug('moveLeft');
+    this.ops.push({ type: 'key', value: 'left' });
+    this.inputCursor--;
+    this.inputSel = 0;
+};
+
+AutoTypeObfuscator.prototype.moveRight = function () {
+    logger.debug('moveRight');
+    this.ops.push({ type: 'key', value: 'right' });
+    this.inputCursor++;
+    this.inputSel = 0;
+};
+
+AutoTypeObfuscator.prototype.inputChar = function (ch) {
+    logger.debug('inputChar', ch);
+    this.ops.push({ type: 'text', value: ch });
+    this.inputChars.splice(this.inputCursor, this.inputSel, { ch });
+    this.inputCursor++;
+    this.inputSel = 0;
+};
+
+AutoTypeObfuscator.prototype.copyPaste = function (ch) {
+    logger.debug('copyPaste', ch);
+    this.ops.push({ type: 'cmd', value: 'copyPaste', arg: ch });
+    this.inputChars.splice(this.inputCursor, this.inputSel, { ch });
+    this.inputCursor++;
+    this.inputSel = 0;
+};
+
+AutoTypeObfuscator.prototype.selectText = function (backward, count) {
+    logger.debug('selectText', backward ? 'left' : 'right', count);
+    const ops = [];
+    for (let i = 0; i < count; i++) {
+        ops.push({ type: 'key', value: backward ? 'left' : 'right' });
+    }
+    if (ops.length === 1) {
+        ops[0].mod = { '+': true };
+        this.ops.push(ops[0]);
+    } else {
+        this.ops.push({ type: 'group', value: ops, mod: { '+': true } });
+    }
+    if (backward) {
+        this.inputCursor -= count;
+    }
+    this.inputSel = count;
+};
+
+AutoTypeObfuscator.prototype.deleteText = function (backward) {
+    logger.debug('deleteText', backward ? 'left' : 'right');
+    this.ops.push({ type: 'key', value: backward ? 'bs' : 'del' });
+    if (this.inputSel) {
+        this.inputChars.splice(this.inputCursor, this.inputSel);
+        this.inputSel = 0;
+    } else {
+        this.inputChars.splice(backward ? this.inputCursor - 1 : this.inputCursor, 1);
+        if (backward) {
+            this.inputCursor--;
+        }
+    }
+};
+
+export { AutoTypeObfuscator };

app/scripts/auto-type/auto-type-parser.js

@@ -0,0 +1,127 @@
+import { AutoTypeRunner } from 'auto-type/auto-type-runner';
+
+const AutoTypeParser = function (sequence) {
+    this.sequence = sequence;
+    this.ix = 0;
+    this.states = [];
+};
+
+AutoTypeParser.opRegex = /^(.*?)(?:([\s:=])[\s:=]*(.*))?$/;
+
+AutoTypeParser.prototype.parse = function () {
+    const len = this.sequence.length;
+    this.pushState();
+    while (this.ix < len) {
+        const ch = this.sequence[this.ix];
+        switch (ch) {
+            case '{':
+                this.readOp();
+                continue;
+            case '+':
+            case '%':
+            case '^':
+                this.readModifier(ch);
+                break;
+            case '(':
+                this.pushState();
+                break;
+            case ')':
+                this.popState();
+                break;
+            case ' ':
+                break;
+            case '~':
+                this.addOp('enter');
+                break;
+            default:
+                this.addChar(ch);
+                break;
+        }
+        this.ix++;
+    }
+    if (this.states.length !== 1) {
+        throw 'Groups count mismatch';
+    }
+    return new AutoTypeRunner(this.state().ops);
+};
+
+AutoTypeParser.prototype.pushState = function () {
+    this.states.unshift({
+        modifiers: null,
+        ops: []
+    });
+};
+
+AutoTypeParser.prototype.popState = function () {
+    if (this.states.length <= 1) {
+        throw 'Unexpected ")" at index ' + this.ix;
+    }
+    const state = this.states.shift();
+    this.addState(state);
+};
+
+AutoTypeParser.prototype.state = function () {
+    return this.states[0];
+};
+
+AutoTypeParser.prototype.readOp = function () {
+    const toIx = this.sequence.indexOf('}', this.ix + 2);
+    if (toIx < 0) {
+        throw 'Mismatched "{" at index ' + this.ix;
+    }
+    const contents = this.sequence.substring(this.ix + 1, toIx);
+    this.ix = toIx + 1;
+    if (contents.length === 1) {
+        this.addChar(contents);
+        return;
+    }
+    const [, op, sep, arg] = contents.match(AutoTypeParser.opRegex);
+    this.addOp(op, sep, arg);
+};
+
+AutoTypeParser.prototype.readModifier = function (modifier) {
+    const state = this.state();
+    if (!state.modifiers) {
+        state.modifiers = {};
+    }
+    if (modifier === '^' && state.modifiers['^']) {
+        delete state.modifiers['^'];
+        modifier = '^^';
+    }
+    state.modifiers[modifier] = true;
+};
+
+AutoTypeParser.prototype.resetModifiers = function () {
+    const state = this.state();
+    const modifiers = state.modifiers;
+    state.modifiers = null;
+    return modifiers;
+};
+
+AutoTypeParser.prototype.addState = function (state) {
+    this.state().ops.push({
+        type: 'group',
+        value: state.ops,
+        mod: this.resetModifiers()
+    });
+};
+
+AutoTypeParser.prototype.addChar = function (ch) {
+    this.state().ops.push({
+        type: 'text',
+        value: ch,
+        mod: this.resetModifiers()
+    });
+};
+
+AutoTypeParser.prototype.addOp = function (op, sep, arg) {
+    this.state().ops.push({
+        type: 'op',
+        value: op,
+        mod: this.resetModifiers(),
+        sep,
+        arg
+    });
+};
+
+export { AutoTypeParser };

app/scripts/auto-type/auto-type-runner.js

@@ -0,0 +1,541 @@
+import { AutoTypeEmitter } from 'auto-type/auto-type-emitter';
+import { AutoTypeObfuscator } from 'auto-type/auto-type-obfuscator';
+import { StringFormat } from 'util/formatting/string-format';
+import { Logger } from 'util/logger';
+
+const emitterLogger = new Logger(
+    'auto-type-emitter',
+    undefined,
+    localStorage.debugAutoType ? Logger.Level.All : Logger.Level.Info
+);
+
+const AutoTypeRunner = function (ops) {
+    this.ops = ops;
+    this.pendingResolvesCount = 0;
+    this.entry = null;
+    this.now = new Date();
+};
+
+AutoTypeRunner.PendingResolve = { pending: true };
+
+AutoTypeRunner.Keys = {
+    tab: 'tab',
+    enter: 'enter',
+    space: 'space',
+    up: 'up',
+    down: 'down',
+    left: 'left',
+    right: 'right',
+    home: 'home',
+    end: 'end',
+    pgup: 'pgup',
+    pgdn: 'pgdn',
+    insert: 'ins',
+    ins: 'ins',
+    delete: 'del',
+    del: 'del',
+    backspace: 'bs',
+    bs: 'bs',
+    bksp: 'bs',
+    esc: 'esc',
+    win: 'win',
+    lwin: 'win',
+    rwin: 'rwin',
+    f1: 'f1',
+    f2: 'f2',
+    f3: 'f3',
+    f4: 'f4',
+    f5: 'f5',
+    f6: 'f6',
+    f7: 'f7',
+    f8: 'f8',
+    f9: 'f9',
+    f10: 'f10',
+    f11: 'f11',
+    f12: 'f12',
+    f13: 'f13',
+    f14: 'f14',
+    f15: 'f15',
+    f16: 'f16',
+    add: 'add',
+    subtract: 'subtract',
+    multiply: 'multiply',
+    divide: 'divide',
+    numpad0: 'n0',
+    numpad1: 'n1',
+    numpad2: 'n2',
+    numpad3: 'n3',
+    numpad4: 'n4',
+    numpad5: 'n5',
+    numpad6: 'n6',
+    numpad7: 'n7',
+    numpad8: 'n8',
+    numpad9: 'n9'
+};
+
+AutoTypeRunner.Substitutions = {
+    title(runner, op) {
+        return runner.getEntryFieldKeys('Title', op);
+    },
+    username(runner, op) {
+        return runner.getEntryFieldKeys('UserName', op);
+    },
+    url(runner, op) {
+        return runner.getEntryFieldKeys('URL', op);
+    },
+    password(runner, op) {
+        return runner.getEntryFieldKeys('Password', op);
+    },
+    notes(runner, op) {
+        return runner.getEntryFieldKeys('Notes', op);
+    },
+    group(runner) {
+        return runner.getEntryGroupName();
+    },
+    totp(runner, op) {
+        return runner.getOtp(op);
+    },
+    s(runner, op) {
+        return runner.getEntryFieldKeys(op.arg, op);
+    },
+    'dt_simple'(runner) {
+        return runner.dt('simple');
+    },
+    'dt_year'(runner) {
+        return runner.dt('Y');
+    },
+    'dt_month'(runner) {
+        return runner.dt('M');
+    },
+    'dt_day'(runner) {
+        return runner.dt('D');
+    },
+    'dt_hour'(runner) {
+        return runner.dt('h');
+    },
+    'dt_minute'(runner) {
+        return runner.dt('m');
+    },
+    'dt_second'(runner) {
+        return runner.dt('s');
+    },
+    'dt_utc_simple'(runner) {
+        return runner.udt('simple');
+    },
+    'dt_utc_year'(runner) {
+        return runner.udt('Y');
+    },
+    'dt_utc_month'(runner) {
+        return runner.udt('M');
+    },
+    'dt_utc_day'(runner) {
+        return runner.udt('D');
+    },
+    'dt_utc_hour'(runner) {
+        return runner.udt('h');
+    },
+    'dt_utc_minute'(runner) {
+        return runner.udt('m');
+    },
+    'dt_utc_second'(runner) {
+        return runner.udt('s');
+    }
+};
+
+AutoTypeRunner.prototype.resolve = function (entry, context, callback) {
+    this.entry = entry;
+    this.context = context;
+    try {
+        this.resolveOps(this.ops);
+        if (!this.pendingResolvesCount) {
+            callback();
+        } else {
+            this.resolveCallback = callback;
+        }
+    } catch (e) {
+        return callback(e);
+    }
+};
+
+AutoTypeRunner.prototype.resolveOps = function (ops) {
+    for (let i = 0, len = ops.length; i < len; i++) {
+        const op = ops[i];
+        if (op.type === 'group') {
+            this.resolveOps(op.value);
+        } else {
+            this.resolveOp(op);
+        }
+    }
+};
+
+AutoTypeRunner.prototype.resolveOp = function (op) {
+    if (op.value.length === 1 && !op.sep) {
+        // {x}
+        op.type = 'text';
+        return;
+    }
+    if (op.value.length === 1 && op.sep === ' ') {
+        // {x 3}
+        op.type = 'text';
+        const ch = op.value;
+        let text = ch;
+        const len = +op.arg;
+        while (text.length < len) {
+            text += ch;
+        }
+        op.value = text;
+        return;
+    }
+    const lowerValue = op.value.toLowerCase();
+    const key = AutoTypeRunner.Keys[lowerValue];
+    if (key) {
+        if (op.sep === ' ' && +op.arg > 0) {
+            // {TAB 3}
+            op.type = 'group';
+            op.value = [];
+            const count = +op.arg;
+            for (let i = 0; i < count; i++) {
+                op.value.push({ type: 'key', value: key });
+            }
+        } else {
+            // {TAB}
+            op.type = 'key';
+            op.value = key;
+        }
+        return;
+    }
+    if (this.context?.resolved?.[lowerValue]) {
+        op.type = 'text';
+        op.value = this.context.resolved[lowerValue];
+        return;
+    }
+    const substitution = AutoTypeRunner.Substitutions[lowerValue];
+    if (substitution) {
+        // {title}
+        op.type = 'text';
+        op.value = substitution(this, op);
+        if (op.value === AutoTypeRunner.PendingResolve) {
+            this.pendingResolvesCount++;
+        }
+        return;
+    }
+    if (!this.tryParseCommand(op)) {
+        throw 'Bad op: ' + op.value;
+    }
+};
+
+AutoTypeRunner.prototype.tryParseCommand = function (op) {
+    switch (op.value.toLowerCase()) {
+        case 'clearfield':
+            // {CLEARFIELD}
+            op.type = 'group';
+            op.value = [
+                { type: 'key', value: 'end' },
+                { type: 'key', value: 'home', mod: { '+': true } },
+                { type: 'key', value: 'bs' }
+            ];
+            return true;
+        case 'vkey':
+            // {VKEY 10} {VKEY 0x1F}
+            op.type = 'key';
+            op.value = parseInt(op.arg);
+            if (isNaN(op.value) || op.value < 0) {
+                throw 'Bad vkey: ' + op.arg;
+            }
+            return true;
+        case 'delay':
+            // {DELAY 5} {DELAY=5}
+            op.type = 'cmd';
+            op.value = op.sep === '=' ? 'setDelay' : 'wait';
+            if (!op.arg) {
+                throw 'Delay requires milliseconds count';
+            }
+            if (isNaN(+op.arg)) {
+                throw 'Bad delay: ' + op.arg;
+            }
+            if (op.arg < 0) {
+                throw 'Delay requires positive interval';
+            }
+            op.arg = +op.arg;
+            return true;
+        default:
+            return false;
+    }
+};
+
+AutoTypeRunner.prototype.getEntryFieldKeys = function (field, op) {
+    if (!field || !this.entry) {
+        return '';
+    }
+    const value = this.entry.getFieldValue(field);
+    if (!value) {
+        return '';
+    }
+    if (value.isProtected) {
+        op.type = 'group';
+        const ops = [];
+        value.forEachChar((ch) => {
+            if (ch === 10 || ch === 13) {
+                ops.push({ type: 'key', value: 'enter' });
+            } else {
+                ops.push({ type: 'text', value: String.fromCharCode(ch) });
+            }
+        });
+        return ops;
+    } else {
+        const parts = value.split(/[\r\n]/g);
+        if (parts.length === 1) {
+            return value;
+        }
+        op.type = 'group';
+        const partsOps = [];
+        parts.forEach((part) => {
+            if (partsOps.length) {
+                partsOps.push({ type: 'key', value: 'enter' });
+            }
+            if (part) {
+                partsOps.push({ type: 'text', value: part });
+            }
+        });
+        return partsOps;
+    }
+};
+
+AutoTypeRunner.prototype.getEntryGroupName = function () {
+    return this.entry && this.entry.group.title;
+};
+
+AutoTypeRunner.prototype.dt = function (part) {
+    switch (part) {
+        case 'simple':
+            return (
+                this.dt('Y') +
+                this.dt('M') +
+                this.dt('D') +
+                this.dt('h') +
+                this.dt('m') +
+                this.dt('s')
+            );
+        case 'Y':
+            return this.now.getFullYear().toString();
+        case 'M':
+            return StringFormat.pad(this.now.getMonth() + 1, 2);
+        case 'D':
+            return StringFormat.pad(this.now.getDate(), 2);
+        case 'h':
+            return StringFormat.pad(this.now.getHours(), 2);
+        case 'm':
+            return StringFormat.pad(this.now.getMinutes(), 2);
+        case 's':
+            return StringFormat.pad(this.now.getSeconds(), 2);
+        default:
+            throw 'Bad part: ' + part;
+    }
+};
+
+AutoTypeRunner.prototype.udt = function (part) {
+    switch (part) {
+        case 'simple':
+            return (
+                this.udt('Y') +
+                this.udt('M') +
+                this.udt('D') +
+                this.udt('h') +
+                this.udt('m') +
+                this.udt('s')
+            );
+        case 'Y':
+            return this.now.getUTCFullYear().toString();
+        case 'M':
+            return StringFormat.pad(this.now.getUTCMonth() + 1, 2);
+        case 'D':
+            return StringFormat.pad(this.now.getUTCDate(), 2);
+        case 'h':
+            return StringFormat.pad(this.now.getUTCHours(), 2);
+        case 'm':
+            return StringFormat.pad(this.now.getUTCMinutes(), 2);
+        case 's':
+            return StringFormat.pad(this.now.getUTCSeconds(), 2);
+        default:
+            throw 'Bad part: ' + part;
+    }
+};
+
+AutoTypeRunner.prototype.getOtp = function (op) {
+    if (!this.entry) {
+        return '';
+    }
+    this.entry.initOtpGenerator();
+    if (!this.entry.otpGenerator) {
+        return '';
+    }
+    this.entry.otpGenerator.next((err, otp) => {
+        this.pendingResolved(op, otp, err);
+    });
+    return AutoTypeRunner.PendingResolve;
+};
+
+AutoTypeRunner.prototype.pendingResolved = function (op, value, error) {
+    const wasPending = op.value === AutoTypeRunner.PendingResolve;
+    if (value) {
+        op.value = value;
+    }
+    if (!wasPending) {
+        return;
+    }
+    this.pendingResolvesCount--;
+    if ((this.pendingResolvesCount === 0 || error) && this.resolveCallback) {
+        this.resolveCallback(error);
+        this.resolveCallback = null;
+    }
+};
+
+AutoTypeRunner.prototype.obfuscate = function () {
+    this.obfuscateOps(this.ops);
+};
+
+AutoTypeRunner.prototype.obfuscateOps = function (ops) {
+    for (let i = 0, len = ops.length; i < len; i++) {
+        const op = ops[i];
+        if (op.mod) {
+            continue;
+        }
+        if (op.type === 'text') {
+            this.obfuscateOp(op);
+        } else if (op.type === 'group') {
+            const onlyText = op.value.every((grOp) => grOp.type === 'text' && !grOp.mod);
+            if (onlyText) {
+                this.obfuscateOp(op);
+            } else {
+                this.obfuscateOps(op.value);
+            }
+        }
+    }
+};
+
+AutoTypeRunner.prototype.obfuscateOp = function (op) {
+    let letters = [];
+    if (op.type === 'text') {
+        if (!op.value || op.value.length <= 1) {
+            return;
+        }
+        letters = op.value.split('');
+    } else {
+        op.value.forEach((grOp) => letters.push(...grOp.value.split('')));
+    }
+    if (letters.length <= 1) {
+        return;
+    }
+    const obfuscator = new AutoTypeObfuscator(letters);
+    op.value = obfuscator.obfuscate();
+    op.type = 'group';
+};
+
+AutoTypeRunner.prototype.run = function (callback, windowId) {
+    this.emitter = new AutoTypeEmitter(this.emitNext.bind(this), windowId);
+    this.emitterState = {
+        callback,
+        stack: [],
+        ops: this.ops,
+        opIx: 0,
+        mod: {},
+        activeMod: {},
+        finished: null
+    };
+    this.emitter.begin();
+};
+
+AutoTypeRunner.prototype.emitNext = function (err) {
+    if (err) {
+        this.emitterState.finished = true;
+        this.emitterState.callback(err);
+        return;
+    }
+    if (this.emitterState.finished) {
+        this.emitterState.callback();
+        return;
+    }
+    this.resetEmitterMod(this.emitterState.mod);
+    if (this.emitterState.opIx >= this.emitterState.ops.length) {
+        const state = this.emitterState.stack.pop();
+        if (state) {
+            Object.assign(this.emitterState, { ops: state.ops, opIx: state.opIx, mod: state.mod });
+            this.emitNext();
+        } else {
+            this.resetEmitterMod({});
+            this.emitterState.finished = true;
+            emitterLogger.debug('waitComplete');
+            this.emitter.waitComplete();
+        }
+        return;
+    }
+    const op = this.emitterState.ops[this.emitterState.opIx];
+    if (op.type === 'group') {
+        if (op.mod) {
+            this.setEmitterMod(op.mod);
+        }
+        this.emitterState.stack.push({
+            ops: this.emitterState.ops,
+            opIx: this.emitterState.opIx + 1,
+            mod: { ...this.emitterState.mod }
+        });
+        Object.assign(this.emitterState, {
+            ops: op.value,
+            opIx: 0,
+            mod: { ...this.emitterState.activeMod }
+        });
+        this.emitNext();
+        return;
+    }
+    this.emitterState.opIx++;
+    if (op.mod) {
+        this.setEmitterMod(op.mod);
+    }
+    switch (op.type) {
+        case 'text':
+            emitterLogger.debug('text', op.value);
+            if (op.value) {
+                this.emitter.text(op.value);
+            } else {
+                this.emitNext();
+            }
+            break;
+        case 'key':
+            emitterLogger.debug('key', op.value);
+            this.emitter.key(op.value);
+            break;
+        case 'cmd': {
+            const method = this.emitter[op.value];
+            if (!method) {
+                throw 'Bad cmd: ' + op.value;
+            }
+            emitterLogger.debug(op.value, op.arg);
+            method.call(this.emitter, op.arg);
+            break;
+        }
+        default:
+            throw 'Bad op: ' + op.type;
+    }
+};
+
+AutoTypeRunner.prototype.setEmitterMod = function (addedMod) {
+    Object.keys(addedMod).forEach(function (mod) {
+        if (addedMod[mod] && !this.emitterState.activeMod[mod]) {
+            emitterLogger.debug('mod', mod, true);
+            this.emitter.setMod(mod, true);
+            this.emitterState.activeMod[mod] = true;
+        }
+    }, this);
+};
+
+AutoTypeRunner.prototype.resetEmitterMod = function (targetState) {
+    Object.keys(this.emitterState.activeMod).forEach(function (mod) {
+        if (this.emitterState.activeMod[mod] && !targetState[mod]) {
+            emitterLogger.debug('mod', mod, false);
+            this.emitter.setMod(mod, false);
+            delete this.emitterState.activeMod[mod];
+        }
+    }, this);
+};
+
+export { AutoTypeRunner };

app/scripts/auto-type/index.js

@@ -0,0 +1,312 @@
+import { Events } from 'framework/events';
+import { AutoTypeHelper } from 'auto-type/auto-type-helper';
+import { AutoTypeParser } from 'auto-type/auto-type-parser';
+import { SelectEntryFilter } from 'comp/app/select-entry-filter';
+import { Launcher } from 'comp/launcher';
+import { Features } from 'util/features';
+import { Alerts } from 'comp/ui/alerts';
+import { Timeouts } from 'const/timeouts';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { AppModel } from 'models/app-model';
+import { Locale } from 'util/locale';
+import { Logger } from 'util/logger';
+import { Links } from 'const/links';
+import { SelectEntryView } from 'views/select/select-entry-view';
+
+const logger = new Logger('auto-type');
+const clearTextAutoTypeLog = !!localStorage.debugAutoType;
+
+const AutoType = {
+    enabled: !!(Launcher && Launcher.autoTypeSupported),
+    supportsEventsWithWindowId: !!(Launcher && Launcher.platform() === 'linux'),
+    selectEntryView: false,
+    running: false,
+
+    init() {
+        if (!this.enabled) {
+            return;
+        }
+        Events.on('auto-type', (e) => this.handleEvent(e));
+    },
+
+    handleEvent(e) {
+        const entry = (e && e.entry) || null;
+        const sequence = (e && e.sequence) || null;
+        const context = (e && e.context) || null;
+        logger.debug('Auto type event', entry);
+        if (this.running) {
+            logger.debug('Already running, skipping event');
+            return;
+        }
+        if (entry) {
+            this.hideWindow(() => {
+                this.runAndHandleResult({ entry, sequence, context });
+            });
+        } else {
+            if (this.selectEntryView) {
+                return;
+            }
+            if (Launcher.isAppFocused()) {
+                return Alerts.error({
+                    header: Locale.autoTypeError,
+                    body: Locale.autoTypeErrorGlobal,
+                    skipIfAlertDisplayed: true
+                });
+            }
+            this.selectEntryAndRun();
+        }
+    },
+
+    runAndHandleResult(result, windowId) {
+        this.run(result, windowId, (err) => {
+            if (err) {
+                let body = Locale.autoTypeErrorGeneric.replace('{}', err.message || err.toString());
+                let link;
+                if (err.keyPressFailed && Features.isMac) {
+                    body = Locale.autoTypeErrorAccessibilityMacOS;
+                    link = Links.AutoTypeMacOS;
+                }
+                Alerts.error({
+                    header: Locale.autoTypeError,
+                    body,
+                    link
+                });
+            }
+        });
+
+        if (AppSettingsModel.lockOnAutoType) {
+            Events.emit('lock-workspace');
+        }
+    },
+
+    run(result, windowId, callback) {
+        this.running = true;
+        const sequence = result.sequence || result.entry.getEffectiveAutoTypeSeq();
+        const context = result.context;
+        logger.debug('Start', sequence);
+        const ts = logger.ts();
+        try {
+            const parser = new AutoTypeParser(sequence);
+            const runner = parser.parse();
+            logger.debug('Parsed', this.printOps(runner.ops));
+            runner.resolve(result.entry, context, (err) => {
+                if (err) {
+                    this.running = false;
+                    logger.error('Resolve error', err);
+                    return callback && callback(err);
+                }
+                logger.debug('Resolved', this.printOps(runner.ops));
+                if (result.entry.autoTypeObfuscation) {
+                    try {
+                        runner.obfuscate();
+                    } catch (e) {
+                        this.running = false;
+                        logger.error('Obfuscate error', e);
+                        return callback && callback(e);
+                    }
+                    logger.debug('Obfuscated');
+                }
+                runner.run((err) => {
+                    this.running = false;
+                    if (err) {
+                        logger.error('Run error', err);
+                        return callback && callback(err);
+                    }
+                    logger.debug('Complete', logger.ts(ts));
+                    return callback && callback();
+                }, windowId);
+            });
+        } catch (ex) {
+            this.running = false;
+            logger.error('Parse error', ex);
+            return callback && callback(ex);
+        }
+    },
+
+    validate(entry, sequence, callback) {
+        try {
+            const parser = new AutoTypeParser(sequence);
+            const runner = parser.parse();
+            runner.resolve(entry, null, callback);
+        } catch (ex) {
+            return callback(ex);
+        }
+    },
+
+    printOps(ops) {
+        return '[' + ops.map(this.printOp, this).join(',') + ']';
+    },
+
+    printOp(op) {
+        const mod = op.mod ? Object.keys(op.mod).join('') : '';
+        if (op.type === 'group') {
+            return mod + this.printOps(op.value);
+        }
+        if (op.type === 'text') {
+            let value = op.value;
+            if (!clearTextAutoTypeLog) {
+                value = value.replace(/./g, '*');
+            }
+            return mod + value;
+        }
+        return mod + op.type + ':' + op.value;
+    },
+
+    hideWindow(callback) {
+        logger.debug('Hide window');
+        if (Launcher.isAppFocused()) {
+            Launcher.hideApp();
+            setTimeout(callback, Timeouts.AutoTypeAfterHide);
+        } else {
+            callback();
+        }
+    },
+
+    getActiveWindowInfo(callback) {
+        logger.debug('Getting window info');
+        const helper = new AutoTypeHelper();
+        return helper.getActiveWindowInfo((err, windowInfo) => {
+            if (err) {
+                logger.error('Error getting window info', err);
+            } else {
+                if (!windowInfo.url) {
+                    // try to find a URL in the title
+                    const urlMatcher = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\\+.~#?&\/=]*)/;
+                    const urlMatches = urlMatcher.exec(windowInfo.title);
+                    windowInfo.url = urlMatches && urlMatches.length > 0 ? urlMatches[0] : null;
+                }
+                logger.debug('Window info', windowInfo.id, windowInfo.title, windowInfo.url);
+            }
+            return callback(err, windowInfo);
+        });
+    },
+
+    activeWindowMatches(windowInfo, callback) {
+        if (!windowInfo || !windowInfo.id) {
+            logger.debug('Skipped active window check because window id is unknown');
+            return callback(true);
+        }
+        this.getActiveWindowInfo((err, activeWindowInfo) => {
+            if (!activeWindowInfo) {
+                logger.debug('Error during active window check, something is wrong', err);
+                return callback(false);
+            }
+            if (activeWindowInfo.id !== windowInfo.id && !this.supportsEventsWithWindowId) {
+                logger.info(
+                    `Active window doesn't match: ID is different. ` +
+                        `Expected ${windowInfo.id}, got ${activeWindowInfo.id}`
+                );
+                return callback(false, activeWindowInfo);
+            }
+            if (activeWindowInfo.url !== windowInfo.url && !this.supportsEventsWithWindowId) {
+                logger.info(
+                    `Active window doesn't match: url is different. ` +
+                        `Expected "${windowInfo.url}", got "${activeWindowInfo.url}"`
+                );
+                return callback(false, activeWindowInfo);
+            }
+            logger.info('Active window matches');
+            callback(true, activeWindowInfo);
+        });
+    },
+
+    selectEntryAndRun() {
+        this.getActiveWindowInfo(async (e, windowInfo) => {
+            const filter = new SelectEntryFilter(
+                windowInfo,
+                AppModel.instance,
+                AppModel.instance.files,
+                {
+                    autoType: true
+                }
+            );
+            const evt = { filter, windowInfo };
+            if (!AppModel.instance.files.hasOpenFiles()) {
+                logger.debug('auto-type event delayed');
+                this.focusMainWindow();
+                try {
+                    await AppModel.instance.unlockAnyFile('autoTypeUnlockMessage');
+                } catch {
+                    logger.debug('auto-type event canceled');
+                    return;
+                }
+                if (this.selectEntryView) {
+                    this.selectEntryView.show();
+                }
+            }
+            logger.debug('processing auto-type event');
+            this.processEventWithFilter(evt);
+        });
+    },
+
+    focusMainWindow() {
+        if (!Launcher.isAppFocused()) {
+            setTimeout(() => Launcher.showMainWindow(), Timeouts.RedrawInactiveWindow);
+        }
+    },
+
+    processEventWithFilter(evt) {
+        let entries = evt.filter.getEntries();
+        if (entries.length === 1 && AppSettingsModel.directAutotype) {
+            this.hideWindow(() => {
+                this.runAndHandleResult({ entry: entries[0] }, evt.windowInfo.id);
+            });
+            return;
+        }
+        this.focusMainWindow();
+
+        if (entries.length === 0) {
+            if (evt.filter.useUrl) {
+                evt.filter.useUrl = false;
+                if (evt.filter.title && AppSettingsModel.autoTypeTitleFilterEnabled) {
+                    evt.filter.useTitle = true;
+                }
+            }
+            entries = evt.filter.getEntries();
+            if (entries.length === 0 && evt.filter.useTitle) {
+                evt.filter.useTitle = false;
+            }
+        }
+
+        const humanReadableTarget = evt.filter.title || evt.filter.url;
+        const topMessage = humanReadableTarget
+            ? Locale.autoTypeMsgMatchedByWindow.replace('{}', humanReadableTarget)
+            : Locale.autoTypeMsgNoWindow;
+
+        this.selectEntryView = new SelectEntryView({
+            isAutoType: true,
+            itemOptions: true,
+            filter: evt.filter,
+            topMessage
+        });
+        this.selectEntryView.on('result', (result) => {
+            logger.debug('Entry selected', result);
+            this.selectEntryView.off('result');
+            this.selectEntryView.remove();
+            this.selectEntryView = null;
+            this.hideWindow(() => {
+                if (result?.entry) {
+                    this.activeWindowMatches(evt.windowInfo, (matches, activeWindowInfo) => {
+                        if (matches) {
+                            this.runAndHandleResult(result, evt.windowInfo.id);
+                        }
+                    });
+                }
+            });
+        });
+        this.selectEntryView.render();
+        this.selectEntryView.on('show-open-files', async () => {
+            this.selectEntryView.hide();
+            try {
+                await AppModel.instance.unlockAnyFile('autoTypeUnlockMessage');
+            } catch {
+                this.selectEntryView.emit('result', undefined);
+                return;
+            }
+            this.selectEntryView.show();
+            this.selectEntryView.render();
+        });
+    }
+};
+
+export { AutoType };

app/scripts/collections/entry-collection.js

@@ -1,64 +1,8 @@
-'use strict';
+import { Collection } from 'framework/collection';
+import { EntryModel } from 'models/entry-model';
 
-var Backbone = require('backbone'),
-    EntryModel = require('../models/entry-model'),
-    Comparators = require('../util/comparators');
+class EntryCollection extends Collection {
+    static model = EntryModel;
+}
 
-var EntryCollection = Backbone.Collection.extend({
-    model: EntryModel,
-
-    comparator: function() {},
-
-    comparators: {
-        'title': Comparators.stringComparator('title', true),
-        '-title': Comparators.stringComparator('title', false),
-        'website': Comparators.stringComparator('url', true),
-        '-website': Comparators.stringComparator('url', false),
-        'user': Comparators.stringComparator('user', true),
-        '-user': Comparators.stringComparator('user', false),
-        'created': Comparators.dateComparator('created', true),
-        '-created': Comparators.dateComparator('created', false),
-        'updated': Comparators.dateComparator('updated', true),
-        '-updated': Comparators.dateComparator('updated', false),
-        '-attachments': function(x, y) { return this.attachmentSortVal(x).localeCompare(this.attachmentSortVal(y)); }
-    },
-
-    defaultComparator: 'title',
-
-    activeEntry: null,
-
-    initialize: function() {
-        this.comparator = this.comparators[this.defaultComparator];
-    },
-
-    setActive: function(entry) {
-        if (!(entry instanceof EntryModel)) {
-            entry = this.get(entry);
-        }
-        this.forEach(function(entry) { entry.active = false; });
-        if (entry) {
-            entry.active = true;
-        }
-        this.activeEntry = entry;
-    },
-
-    getActive: function() {
-        return this.activeEntry;
-    },
-
-    sortEntries: function(comparator) {
-        this.comparator = this.comparators[comparator] || this.comparators[this.defaultComparator];
-        this.sort();
-    },
-
-    attachmentSortVal: function(entry) {
-        var att = entry.attachments;
-        var str = att.length ? String.fromCharCode(64 + att.length) : 'Z';
-        if (att[0]) {
-            str += att[0].title;
-        }
-        return str;
-    }
-});
-
-module.exports = EntryCollection;
+export { EntryCollection };

app/scripts/collections/file-collection.js

@@ -1,22 +1,24 @@
-'use strict';
+import { Collection } from 'framework/collection';
+import { Model } from 'framework/model';
 
-var Backbone = require('backbone'),
-    FileModel = require('../models/file-model');
+class FileCollection extends Collection {
+    static model = Model;
 
-var FileCollection = Backbone.Collection.extend({
-    model: FileModel,
-
-    hasOpenFiles: function() {
-        return this.some(function(file) { return file.get('open'); });
-    },
-
-    hasUnsavedFiles: function() {
-        return this.some(function(file) { return file.get('modified'); });
-    },
-
-    getByName: function(name) {
-        return this.find(function(file) { return file.get('name') === name; });
+    hasOpenFiles() {
+        return this.some((file) => file.active);
     }
-});
 
-module.exports = FileCollection;
+    hasUnsavedFiles() {
+        return this.some((file) => file.modified);
+    }
+
+    hasDirtyFiles() {
+        return this.some((file) => file.dirty);
+    }
+
+    getByName(name) {
+        return this.find((file) => file.name.toLowerCase() === name.toLowerCase());
+    }
+}
+
+export { FileCollection };

app/scripts/collections/file-info-collection.js

@@ -0,0 +1,39 @@
+import { Collection } from 'framework/collection';
+import { SettingsStore } from 'comp/settings/settings-store';
+import { FileInfoModel } from 'models/file-info-model';
+
+class FileInfoCollection extends Collection {
+    static model = FileInfoModel;
+
+    load() {
+        return SettingsStore.load('file-info').then((data) => {
+            if (data) {
+                for (const item of data) {
+                    this.push(new FileInfoModel(item));
+                }
+            }
+        });
+    }
+
+    save() {
+        SettingsStore.save('file-info', this);
+    }
+
+    getMatch(storage, name, path) {
+        return this.find((fi) => {
+            return (
+                (fi.storage || '') === (storage || '') &&
+                (fi.name || '') === (name || '') &&
+                (fi.path || '') === (path || '')
+            );
+        });
+    }
+
+    getByName(name) {
+        return this.find((file) => file.name.toLowerCase() === name.toLowerCase());
+    }
+}
+
+const instance = new FileInfoCollection();
+
+export { instance as FileInfoCollection };

app/scripts/collections/group-collection.js

@@ -1,19 +1,8 @@
-'use strict';
+import { Collection } from 'framework/collection';
+import { GroupModel } from 'models/group-model';
 
-var Backbone = require('backbone'),
-    GroupModel = require('../models/group-model');
+class GroupCollection extends Collection {
+    static model = GroupModel;
+}
 
-var GroupCollection = Backbone.Collection.extend({
-    model: GroupModel,
-
-    removeByAttr: function(attr, val) {
-        var items = this.get('items');
-        items.forEach(function(item) {
-            if (item[attr] === val) {
-                items.remove(item);
-            }
-        });
-    }
-});
-
-module.exports = GroupCollection;
+export { GroupCollection };

app/scripts/collections/menu/menu-item-collection.js

@@ -1,10 +1,8 @@
-'use strict';
+import { Collection } from 'framework/collection';
+import { MenuItemModel } from 'models/menu/menu-item-model';
 
-var Backbone = require('backbone'),
-    MenuItemModel = require('../../models/menu/menu-item-model');
+class MenuItemCollection extends Collection {
+    static model = MenuItemModel;
+}
 
-var MenuItemCollection = Backbone.Collection.extend({
-    model: MenuItemModel
-});
-
-module.exports = MenuItemCollection;
+export { MenuItemCollection };

app/scripts/collections/menu/menu-option-collection.js

@@ -1,10 +1,8 @@
-'use strict';
+import { Collection } from 'framework/collection';
+import { MenuOptionModel } from 'models/menu/menu-option-model';
 
-var Backbone = require('backbone'),
-    MenuOptionModel = require('../../models/menu/menu-option-model');
+class MenuOptionCollection extends Collection {
+    static model = MenuOptionModel;
+}
 
-var MenuOptionCollection = Backbone.Collection.extend({
-    model: MenuOptionModel
-});
-
-module.exports = MenuOptionCollection;
+export { MenuOptionCollection };

app/scripts/collections/menu/menu-section-collection.js

@@ -1,10 +1,8 @@
-'use strict';
+import { Collection } from 'framework/collection';
+import { MenuSectionModel } from 'models/menu/menu-section-model';
 
-var Backbone = require('backbone'),
-    MenuSectionModel = require('../../models/menu/menu-section-model');
+class MenuSectionCollection extends Collection {
+    static model = MenuSectionModel;
+}
 
-var MenuSectionCollection = Backbone.Collection.extend({
-    model: MenuSectionModel
-});
-
-module.exports = MenuSectionCollection;
+export { MenuSectionCollection };

app/scripts/collections/search-result-collection.js

@@ -0,0 +1,52 @@
+import { Collection } from 'framework/collection';
+import { Model } from 'framework/model';
+import { Comparators } from 'util/data/comparators';
+
+class SearchResultCollection extends Collection {
+    static model = Model;
+
+    comparators = {
+        'none': null,
+        'title': Comparators.stringComparator('title', true),
+        '-title': Comparators.stringComparator('title', false),
+        'website': Comparators.stringComparator('url', true),
+        '-website': Comparators.stringComparator('url', false),
+        'user': Comparators.stringComparator('user', true),
+        '-user': Comparators.stringComparator('user', false),
+        'created': Comparators.dateComparator('created', true),
+        '-created': Comparators.dateComparator('created', false),
+        'updated': Comparators.dateComparator('updated', true),
+        '-updated': Comparators.dateComparator('updated', false),
+        '-attachments': (x, y) => {
+            return this.attachmentSortVal(x).localeCompare(this.attachmentSortVal(y));
+        },
+        '-rank': Comparators.rankComparator().bind(this)
+    };
+
+    defaultComparator = 'title';
+
+    entryFilter = null;
+
+    constructor(models, options) {
+        super(models);
+        const comparatorName = (options && options.comparator) || this.defaultComparator;
+        this.comparator = this.comparators[comparatorName];
+    }
+
+    sortEntries(comparator, filter) {
+        this.entryFilter = filter;
+        this.comparator = this.comparators[comparator] || this.comparators[this.defaultComparator];
+        this.sort();
+    }
+
+    attachmentSortVal(entry) {
+        const att = entry.attachments;
+        let str = att.length ? String.fromCharCode(64 + att.length) : 'Z';
+        if (att[0]) {
+            str += att[0].title;
+        }
+        return str;
+    }
+}
+
+export { SearchResultCollection };

app/scripts/comp/alerts.js

@@ -1,77 +0,0 @@
-'use strict';
-
-var ModalView = require('../views/modal-view');
-
-var Alerts = {
-    buttons: {
-        ok: {result: 'yes', title: 'OK'},
-        yes: {result: 'yes', title: 'Yes'},
-        no: {result: '', title: 'No'}
-    },
-
-    alert: function(config) {
-        var view = new ModalView({ model: config });
-        view.render();
-        view.on('result', function(res) {
-            if (res && config.success) {
-                config.success(res);
-            }
-            if (!res && config.cancel) {
-                config.cancel();
-            }
-            if (config.complete) {
-                config.complete(res);
-            }
-        });
-    },
-
-    notImplemented: function() {
-        this.alert({
-            header: 'Not Implemented',
-            body: '',
-            icon: 'exclamation-triangle',
-            buttons: [this.buttons.ok],
-            esc: '',
-            click: '',
-            enter: ''
-        });
-    },
-
-    info: function(config) {
-        this.alert(_.extend({
-            header: '',
-            body: '',
-            icon: 'info',
-            buttons: [this.buttons.ok],
-            esc: '',
-            click: '',
-            enter: ''
-        }, config));
-    },
-
-    error: function(config) {
-        this.alert(_.extend({
-            header: '',
-            body: '',
-            icon: 'exclamation-circle',
-            buttons: [this.buttons.ok],
-            esc: '',
-            click: '',
-            enter: ''
-        }, config));
-    },
-
-    yesno: function(config) {
-        this.alert(_.extend({
-            header: '',
-            body: '',
-            icon: 'question',
-            buttons: [this.buttons.yes, this.buttons.no],
-            esc: '',
-            click: '',
-            enter: 'yes'
-        }, config));
-    }
-};
-
-module.exports = Alerts;

app/scripts/comp/app/app-rights-checker.js

@@ -0,0 +1,81 @@
+import { Launcher } from 'comp/launcher';
+import { Alerts } from 'comp/ui/alerts';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { Features } from 'util/features';
+import { Locale } from 'util/locale';
+
+const AppRightsChecker = {
+    AppPath: '/Applications/KeeWeb.app',
+
+    init() {
+        if (!Features.isDesktop || !Features.isMac) {
+            return;
+        }
+        if (AppSettingsModel.skipFolderRightsWarning) {
+            return;
+        }
+        if (!Launcher.getAppPath().startsWith(this.AppPath)) {
+            return;
+        }
+        this.needRunInstaller((needRun) => {
+            if (needRun) {
+                this.showAlert();
+                this.runInstaller();
+            }
+        });
+    },
+
+    needRunInstaller(callback) {
+        Launcher.statFile(this.AppPath, (stat) => {
+            const folderIsRoot = stat && stat.uid === 0;
+            callback(!folderIsRoot);
+        });
+    },
+
+    showAlert() {
+        const command = 'sudo chown -R root ' + this.AppPath;
+        this.alert = Alerts.alert({
+            icon: 'lock',
+            header: Locale.appRightsAlert,
+            body:
+                Locale.appRightsAlertBody1.replace('{}', this.AppPath) +
+                '\n' +
+                Locale.appRightsAlertBody2,
+            pre: command,
+            buttons: [
+                { result: 'skip', title: Locale.alertDoNotAsk, error: true },
+                Alerts.buttons.ok
+            ],
+            success: (result) => {
+                if (result === 'skip') {
+                    this.dontAskAnymore();
+                }
+                this.alert = null;
+            }
+        });
+    },
+
+    runInstaller() {
+        Launcher.spawn({
+            cmd: this.AppPath + '/Contents/Installer/KeeWeb Installer.app/Contents/MacOS/applet',
+            args: ['--install'],
+            complete: () => {
+                this.needRunInstaller((needRun) => {
+                    if (this.alert && !needRun) {
+                        this.alert.closeWithResult('cancel');
+                    }
+                });
+            }
+        });
+    },
+
+    dontAskAnymore() {
+        this.needRunInstaller((needRun) => {
+            if (needRun) {
+                AppSettingsModel.skipFolderRightsWarning = true;
+            }
+        });
+    }
+};
+
+export { AppRightsChecker };

app/scripts/comp/app/chal-resp-calculator.js

@@ -0,0 +1,194 @@
+import { Events } from 'framework/events';
+import { Logger } from 'util/logger';
+import { YubiKey } from 'comp/app/yubikey';
+import { UsbListener } from 'comp/app/usb-listener';
+import { Alerts } from 'comp/ui/alerts';
+import { Locale } from 'util/locale';
+import { Timeouts } from 'const/timeouts';
+import { Launcher } from 'comp/launcher';
+import { AppSettingsModel } from 'models/app-settings-model';
+
+const logger = new Logger('chal-resp');
+
+const ChalRespCalculator = {
+    cache: {},
+
+    getCacheKey(params) {
+        return `${params.vid}:${params.pid}:${params.serial}:${params.slot}`;
+    },
+
+    build(params) {
+        if (!params) {
+            return null;
+        }
+        return (challenge) => {
+            return new Promise((resolve, reject) => {
+                challenge = Buffer.from(challenge);
+                const hexChallenge = challenge.toString('hex');
+
+                const cacheKey = this.getCacheKey(params);
+                const respFromCache = this.cache[cacheKey]?.[hexChallenge];
+                if (respFromCache) {
+                    logger.debug('Found ChalResp in cache');
+                    return resolve(Buffer.from(respFromCache, 'hex'));
+                }
+
+                if (!AppSettingsModel.enableUsb) {
+                    logger.debug('USB is disabled');
+                    Alerts.error({
+                        header: Locale.yubiKeyDisabledErrorHeader,
+                        body: Locale.yubiKeyDisabledErrorBody,
+                        complete() {
+                            const err = new Error(Locale.yubiKeyDisabledErrorHeader);
+                            err.userCanceled = true;
+                            err.ykError = true;
+
+                            reject(err);
+                        }
+                    });
+                    return;
+                }
+
+                logger.debug('Calculating ChalResp using a YubiKey', params);
+
+                this._calc(params, challenge, (err, response) => {
+                    if (err) {
+                        return reject(err);
+                    }
+                    resolve(response);
+                });
+            });
+        };
+    },
+
+    _calc(params, challenge, callback) {
+        let touchAlert = null;
+        let userCanceled = false;
+
+        YubiKey.calculateChalResp(params, challenge, (err, response) => {
+            if (userCanceled) {
+                userCanceled = false;
+                return;
+            }
+            if (touchAlert) {
+                touchAlert.closeWithoutResult();
+                touchAlert = null;
+            }
+            if (err) {
+                if (err.noKey) {
+                    logger.info('YubiKey ChalResp: no key');
+                    this._showNoKeyAlert(params.serial, (err) => {
+                        if (err) {
+                            return callback(err);
+                        }
+                        this._calc(params, challenge, callback);
+                    });
+                    return;
+                } else if (err.touchRequested) {
+                    logger.info('YubiKey ChalResp: touch requested');
+                    touchAlert = this._showTouchAlert(params.serial, (err) => {
+                        touchAlert = null;
+                        userCanceled = true;
+
+                        logger.info('YubiKey ChalResp canceled');
+                        YubiKey.cancelChalResp();
+
+                        callback(err);
+                    });
+                    return;
+                } else {
+                    logger.error('YubiKey ChalResp error', err);
+                }
+                return callback(err);
+            }
+
+            const cacheKey = this.getCacheKey(params);
+            if (!this.cache[cacheKey]) {
+                this.cache[cacheKey] = {};
+            }
+
+            const hexChallenge = challenge.toString('hex');
+            this.cache[cacheKey][hexChallenge] = response.toString('hex');
+
+            logger.info('Calculated YubiKey ChalResp');
+            callback(null, response);
+        });
+    },
+
+    _showNoKeyAlert(serial, callback) {
+        Launcher.showMainWindow();
+
+        let noKeyAlert = null;
+        let deviceEnumerationTimer;
+
+        const onUsbDevicesChanged = () => {
+            if (!UsbListener.attachedYubiKeys) {
+                return;
+            }
+            deviceEnumerationTimer = setTimeout(() => {
+                YubiKey.list((err, list) => {
+                    if (err) {
+                        logger.error('YubiKey list error', err);
+                        return;
+                    }
+                    const isAttached = list.some((yk) => yk.serial === serial);
+                    logger.info(isAttached ? 'YubiKey found' : 'YubiKey not found');
+                    if (isAttached) {
+                        Events.off('usb-devices-changed', onUsbDevicesChanged);
+                        if (noKeyAlert) {
+                            noKeyAlert.closeWithoutResult();
+                        }
+                        callback();
+                    }
+                });
+            }, Timeouts.ExternalDeviceAfterReconnect);
+        };
+
+        Events.on('usb-devices-changed', onUsbDevicesChanged);
+
+        noKeyAlert = Alerts.alert({
+            header: Locale.yubiKeyNoKeyHeader,
+            body: Locale.yubiKeyNoKeyBody.replace('{}', serial),
+            buttons: [Alerts.buttons.cancel],
+            icon: 'usb-token',
+            cancel: () => {
+                logger.info('No key alert closed');
+
+                clearTimeout(deviceEnumerationTimer);
+                Events.off('usb-devices-changed', onUsbDevicesChanged);
+
+                const err = new Error('User canceled the YubiKey no key prompt');
+                err.userCanceled = true;
+                err.ykError = true;
+
+                return callback(err);
+            }
+        });
+    },
+
+    _showTouchAlert(serial, callback) {
+        Launcher.showMainWindow();
+
+        return Alerts.alert({
+            header: Locale.yubiKeyTouchRequestedHeader,
+            body: Locale.yubiKeyTouchRequestedBody.replace('{}', serial),
+            buttons: [Alerts.buttons.cancel],
+            icon: 'usb-token',
+            cancel: () => {
+                logger.info('Touch alert closed');
+
+                const err = new Error('User canceled the YubiKey touch prompt');
+                err.userCanceled = true;
+                err.ykError = true;
+
+                return callback(err);
+            }
+        });
+    },
+
+    clearCache(params) {
+        delete this.cache[this.getCacheKey(params)];
+    }
+};
+
+export { ChalRespCalculator };

app/scripts/comp/app/drag-drop-info.js

@@ -0,0 +1,5 @@
+const DragDropInfo = {
+    dragObject: null
+};
+
+export { DragDropInfo };

app/scripts/comp/app/dropbox-chooser.js

@@ -0,0 +1,102 @@
+import { AppSettingsModel } from 'models/app-settings-model';
+import { UrlFormat } from 'util/formatting/url-format';
+
+const ChooserAppKey = 'qp7ctun6qt5n9d6';
+
+const DropboxChooser = function (callback) {
+    this.cb = callback;
+    this.onMessage = this.onMessage.bind(this);
+};
+
+DropboxChooser.prototype.callback = function (err, res) {
+    if (this.cb) {
+        this.cb(err, res);
+    }
+    this.cb = null;
+};
+
+DropboxChooser.prototype.choose = function () {
+    const windowFeatures = 'width=640,height=552,left=357,top=100,resizable=yes,location=yes';
+    const url = this.buildUrl();
+    this.popup = window.open(url, 'dropbox', windowFeatures);
+    if (!this.popup) {
+        return this.callback('Failed to open window');
+    }
+    window.addEventListener('message', this.onMessage);
+    this.closeInt = setInterval(this.checkClose.bind(this), 200);
+};
+
+DropboxChooser.prototype.buildUrl = function () {
+    return UrlFormat.makeUrl('https://www.dropbox.com/chooser', {
+        origin: window.location.protocol + '//' + window.location.host,
+        'app_key': AppSettingsModel.dropboxAppKey || ChooserAppKey,
+        'link_type': 'direct',
+        trigger: 'js',
+        multiselect: 'false',
+        extensions: '',
+        folderselect: 'false',
+        iframe: 'false',
+        version: 2
+    });
+};
+
+DropboxChooser.prototype.onMessage = function (e) {
+    if (e.source !== this.popup || e.origin !== 'https://www.dropbox.com') {
+        return;
+    }
+    const data = JSON.parse(e.data);
+    switch (data.method) {
+        case 'origin_request':
+            e.source.postMessage(JSON.stringify({ method: 'origin' }), 'https://www.dropbox.com');
+            break;
+        case 'files_selected':
+            this.popup.close();
+            this.success(data.params);
+            break;
+        case 'close_dialog':
+            this.popup.close();
+            break;
+        case 'web_session_error':
+        case 'web_session_unlinked':
+            this.callback(data.method);
+            break;
+        case 'resize':
+            this.popup.resize(data.params);
+            break;
+        case 'error':
+            this.callback(data.params);
+            break;
+    }
+};
+
+DropboxChooser.prototype.checkClose = function () {
+    if (this.popup.closed) {
+        clearInterval(this.closeInt);
+        window.removeEventListener('message', this.onMessage);
+        if (!this.result) {
+            this.callback('closed');
+        }
+    }
+};
+
+DropboxChooser.prototype.success = function (params) {
+    if (!params || !params[0] || !params[0].link || params[0].is_dir) {
+        return this.callback('bad result');
+    }
+    this.result = params[0];
+    this.readFile(this.result.link);
+};
+
+DropboxChooser.prototype.readFile = function (url) {
+    const xhr = new XMLHttpRequest();
+    xhr.addEventListener('load', () => {
+        this.callback(null, { name: this.result.name, data: xhr.response });
+    });
+    xhr.addEventListener('error', this.callback.bind(this, 'download error'));
+    xhr.addEventListener('abort', this.callback.bind(this, 'download abort'));
+    xhr.open('GET', url);
+    xhr.responseType = 'arraybuffer';
+    xhr.send();
+};
+
+export { DropboxChooser };

app/scripts/comp/app/export-api.js

@@ -0,0 +1,29 @@
+import { AppSettingsModel } from 'models/app-settings-model';
+import { RuntimeDataModel } from 'models/runtime-data-model';
+
+const ExportApi = {
+    settings: {
+        get(key) {
+            return key ? AppSettingsModel[key] : { ...AppSettingsModel };
+        },
+        set(key, value) {
+            AppSettingsModel[key] = value;
+        },
+        del(key) {
+            delete AppSettingsModel[key];
+        }
+    },
+    runtimeData: {
+        get(key) {
+            return key ? RuntimeDataModel[key] : { ...RuntimeDataModel };
+        },
+        set(key, value) {
+            RuntimeDataModel[key] = value;
+        },
+        del(key) {
+            delete RuntimeDataModel[key];
+        }
+    }
+};
+
+export { ExportApi };

app/scripts/comp/app/focus-manager.js

@@ -0,0 +1,18 @@
+import { Logger } from 'util/logger';
+
+const logger = new Logger(
+    'focus-manager',
+    undefined,
+    localStorage.debugFocusManager ? Logger.Level.Debug : Logger.Level.Info
+);
+
+const FocusManager = {
+    modal: null,
+
+    setModal(modal) {
+        this.modal = modal;
+        logger.debug('Set modal', modal);
+    }
+};
+
+export { FocusManager };

app/scripts/comp/app/generator-presets.js

@@ -0,0 +1,177 @@
+import { AppSettingsModel } from 'models/app-settings-model';
+import { Locale } from 'util/locale';
+
+const GeneratorPresets = {
+    get defaultPreset() {
+        return {
+            name: 'Default',
+            title: Locale.genPresetDefault,
+            length: 16,
+            upper: true,
+            lower: true,
+            digits: true
+        };
+    },
+
+    get browserExtensionPreset() {
+        return {
+            name: 'BrowserExtension',
+            length: 20,
+            upper: true,
+            lower: true,
+            special: true,
+            brackets: true,
+            ambiguous: true
+        };
+    },
+
+    get builtIn() {
+        return [
+            this.defaultPreset,
+            {
+                name: 'Pronounceable',
+                title: Locale.genPresetPronounceable,
+                length: 10,
+                lower: true,
+                upper: true
+            },
+            {
+                name: 'Med',
+                title: Locale.genPresetMed,
+                length: 16,
+                upper: true,
+                lower: true,
+                digits: true,
+                special: true,
+                brackets: true,
+                ambiguous: true
+            },
+            {
+                name: 'Long',
+                title: Locale.genPresetLong,
+                length: 32,
+                upper: true,
+                lower: true,
+                digits: true
+            },
+            { name: 'Pin4', title: Locale.genPresetPin4, length: 4, digits: true },
+            {
+                name: 'Mac',
+                title: Locale.genPresetMac,
+                length: 17,
+                include: '0123456789ABCDEF',
+                pattern: 'XX-'
+            },
+            {
+                name: 'Hash128',
+                title: Locale.genPresetHash128,
+                length: 32,
+                include: '0123456789abcdef'
+            },
+            {
+                name: 'Hash256',
+                title: Locale.genPresetHash256,
+                length: 64,
+                include: '0123456789abcdef'
+            }
+        ];
+    },
+
+    get all() {
+        let presets = this.builtIn;
+        presets.forEach((preset) => {
+            preset.builtIn = true;
+        });
+        const setting = AppSettingsModel.generatorPresets;
+        if (setting) {
+            if (setting.user) {
+                presets = presets.concat(setting.user.map((item) => ({ ...item })));
+            }
+            let hasDefault = false;
+            presets.forEach((preset) => {
+                if (setting.disabled && setting.disabled[preset.name]) {
+                    preset.disabled = true;
+                }
+                if (setting.default === preset.name) {
+                    hasDefault = true;
+                    preset.default = true;
+                }
+            });
+            if (!hasDefault) {
+                presets[0].default = true;
+            }
+        }
+        return presets;
+    },
+
+    get enabled() {
+        const allPresets = this.all.filter((preset) => !preset.disabled);
+        if (!allPresets.length) {
+            allPresets.push(this.defaultPreset);
+        }
+        return allPresets;
+    },
+
+    getOrCreateSetting() {
+        let setting = AppSettingsModel.generatorPresets;
+        if (!setting) {
+            setting = { user: [] };
+        }
+        return setting;
+    },
+
+    add(preset) {
+        const setting = this.getOrCreateSetting();
+        if (preset.name && !setting.user.filter((p) => p.name === preset.name).length) {
+            setting.user.push(preset);
+            this.save(setting);
+        }
+    },
+
+    remove(name) {
+        const setting = this.getOrCreateSetting();
+        setting.user = setting.user.filter((p) => p.name !== name);
+        this.save(setting);
+    },
+
+    setPreset(name, props) {
+        const setting = this.getOrCreateSetting();
+        const preset = setting.user.filter((p) => p.name === name)[0];
+        if (preset) {
+            Object.assign(preset, props);
+            this.save(setting);
+        }
+    },
+
+    setDisabled(name, disabled) {
+        const setting = this.getOrCreateSetting();
+        if (disabled) {
+            if (!setting.disabled) {
+                setting.disabled = {};
+            }
+            setting.disabled[name] = true;
+        } else {
+            if (setting.disabled) {
+                delete setting.disabled[name];
+            }
+        }
+        this.save(setting);
+    },
+
+    setDefault(name) {
+        const setting = this.getOrCreateSetting();
+        if (name) {
+            setting.default = name;
+        } else {
+            delete setting.default;
+        }
+        this.save(setting);
+    },
+
+    save(setting) {
+        AppSettingsModel.set({ generatorPresets: undefined }, { silent: true });
+        AppSettingsModel.generatorPresets = setting;
+    }
+};
+
+export { GeneratorPresets };

app/scripts/comp/app/online-password-checker.js

@@ -0,0 +1,37 @@
+import * as kdbxweb from 'kdbxweb';
+import { Logger } from 'util/logger';
+
+const logger = new Logger('online-password-checker');
+
+const exposedPasswords = {};
+
+function checkIfPasswordIsExposedOnline(password) {
+    if (!password || !password.isProtected || !password.byteLength) {
+        return false;
+    }
+    const saltedValue = password.saltedValue();
+    const cached = exposedPasswords[saltedValue];
+    if (cached !== undefined) {
+        return cached;
+    }
+    const passwordBytes = password.getBinary();
+    return crypto.subtle
+        .digest({ name: 'SHA-1' }, passwordBytes)
+        .then((sha1) => {
+            kdbxweb.ByteUtils.zeroBuffer(passwordBytes);
+            sha1 = kdbxweb.ByteUtils.bytesToHex(sha1).toUpperCase();
+            const shaFirst = sha1.substr(0, 5);
+            return fetch(`https://api.pwnedpasswords.com/range/${shaFirst}`)
+                .then((response) => response.text())
+                .then((response) => {
+                    const isPresent = response.includes(sha1.substr(5));
+                    exposedPasswords[saltedValue] = isPresent;
+                    return isPresent;
+                });
+        })
+        .catch((e) => {
+            logger.error('Error checking password online', e);
+        });
+}
+
+export { checkIfPasswordIsExposedOnline };

app/scripts/comp/app/select-entry-filter.js

@@ -0,0 +1,99 @@
+import { SearchResultCollection } from 'collections/search-result-collection';
+import { Ranking } from 'util/data/ranking';
+
+const urlPartsRegex = /^(\w+:\/\/)?(?:(?:www|wwws|secure)\.)?([^\/]+)\/?(.*)/;
+
+class SelectEntryFilter {
+    constructor(windowInfo, appModel, files, filterOptions) {
+        this.title = windowInfo.title;
+        this.useTitle = !!windowInfo.title && !windowInfo.url;
+        this.url = windowInfo.url;
+        this.useUrl = !!windowInfo.url;
+        this.subdomains = true;
+        this.text = '';
+        this.appModel = appModel;
+        this.files = files;
+        this.filterOptions = filterOptions;
+    }
+
+    getEntries() {
+        const filter = {
+            text: this.text,
+            ...this.filterOptions
+        };
+        let entries = this.appModel
+            .getEntriesByFilter(filter, this.files)
+            .map((e) => [e, this._getEntryRank(e)]);
+        if (this.useUrl || this.useTitle) {
+            entries = entries.filter((e) => e[1]);
+        }
+        entries = entries.sort((x, y) =>
+            x[1] === y[1] ? x[0].title.localeCompare(y[0].title) : y[1] - x[1]
+        );
+        entries = entries.map((p) => p[0]);
+        return new SearchResultCollection(entries, { comparator: 'none' });
+    }
+
+    _getEntryRank(entry) {
+        let titleRank = 0;
+        let urlRank = 0;
+
+        if (this.useTitle && this.title && entry.title) {
+            titleRank = Ranking.getStringRank(entry.title.toLowerCase(), this.title.toLowerCase());
+            if (!titleRank) {
+                return 0;
+            }
+        }
+
+        if (this.useUrl && this.url) {
+            const searchUrlLower = this.url.toLowerCase();
+            const searchUrlParts = urlPartsRegex.exec(searchUrlLower);
+
+            for (const url of entry.getAllUrls()) {
+                const entryUrlParts = urlPartsRegex.exec(url.toLowerCase());
+                if (entryUrlParts) {
+                    const [, scheme, domain, path] = entryUrlParts;
+                    const [, searchScheme, searchDomain, searchPath] = searchUrlParts;
+                    if (
+                        domain === searchDomain ||
+                        (this.subdomains && searchDomain.indexOf('.' + domain) > 0)
+                    ) {
+                        if (domain === searchDomain) {
+                            urlRank += 20;
+                        } else {
+                            urlRank += 10;
+                        }
+                        if (path === searchPath) {
+                            urlRank += 10;
+                        } else if (path && searchPath) {
+                            if (path.lastIndexOf(searchPath, 0) === 0) {
+                                urlRank += 5;
+                            } else if (searchPath.lastIndexOf(path, 0) === 0) {
+                                urlRank += 3;
+                            }
+                        }
+                        if (scheme === searchScheme) {
+                            urlRank += 1;
+                        }
+                    }
+                }
+            }
+
+            if (entry.searchText.includes(searchUrlLower)) {
+                // the url is in some field; include it
+                urlRank += 5;
+            }
+        }
+
+        if (this.useTitle && !titleRank) {
+            return 0;
+        }
+        if (this.useUrl && !urlRank) {
+            return 0;
+        }
+
+        return titleRank + urlRank;
+    }
+}
+
+export { SelectEntryFilter };

app/scripts/comp/app/shortcuts.js

@@ -0,0 +1,138 @@
+import { Launcher } from 'comp/launcher';
+import { Keys } from 'const/keys';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { Features } from 'util/features';
+import { StringFormat } from 'util/formatting/string-format';
+import { Locale } from 'util/locale';
+
+let allowedKeys;
+
+function getAllowedKeys() {
+    if (!allowedKeys) {
+        allowedKeys = {};
+        for (const [name, code] of Object.entries(Keys)) {
+            const keyName = name.replace('DOM_VK_', '');
+            if (/^([0-9A-Z]|F\d{1,2})$/.test(keyName)) {
+                allowedKeys[code] = keyName;
+            }
+        }
+    }
+    return allowedKeys;
+}
+
+const globalShortcuts = {
+    copyPassword: { mac: 'Ctrl+Alt+C', all: 'Shift+Alt+C' },
+    copyUser: { mac: 'Ctrl+Alt+B', all: 'Shift+Alt+B' },
+    copyUrl: { mac: 'Ctrl+Alt+U', all: 'Shift+Alt+U' },
+    copyOtp: {},
+    autoType: { mac: 'Ctrl+Alt+T', all: 'Shift+Alt+T' },
+    restoreApp: {}
+};
+
+const Shortcuts = {
+    keyEventToShortcut(event) {
+        const modifiers = [];
+        if (event.ctrlKey) {
+            modifiers.push('Ctrl');
+        }
+        if (event.altKey) {
+            modifiers.push('Alt');
+        }
+        if (event.shiftKey) {
+            modifiers.push('Shift');
+        }
+        if (Features.isMac && event.metaKey) {
+            modifiers.push('Meta');
+        }
+        const keyName = getAllowedKeys()[event.which];
+        return {
+            value: modifiers.join('+') + '+' + (keyName || '…'),
+            valid: modifiers.length > 0 && !!keyName
+        };
+    },
+    presentShortcut(shortcutValue, formatting) {
+        if (!shortcutValue) {
+            return '-';
+        }
+        return shortcutValue
+            .split(/\+/g)
+            .map((part) => {
+                switch (part) {
+                    case 'Ctrl':
+                        return this.ctrlShortcutSymbol(formatting);
+                    case 'Alt':
+                        return this.altShortcutSymbol(formatting);
+                    case 'Shift':
+                        return this.shiftShortcutSymbol(formatting);
+                    case 'Meta':
+                        return this.actionShortcutSymbol(formatting);
+                    default:
+                        return part;
+                }
+            })
+            .join('');
+    },
+    actionShortcutSymbol(formatting) {
+        return Features.isMac ? '⌘' : this.formatShortcut(Locale.ctrlKey, formatting);
+    },
+    altShortcutSymbol(formatting) {
+        return Features.isMac ? '⌥' : this.formatShortcut(Locale.altKey, formatting);
+    },
+    shiftShortcutSymbol(formatting) {
+        return Features.isMac ? '⇧' : this.formatShortcut(Locale.shiftKey, formatting);
+    },
+    ctrlShortcutSymbol(formatting) {
+        return Features.isMac ? '⌃' : this.formatShortcut(Locale.ctrlKey, formatting);
+    },
+    formatShortcut(shortcut, formatting) {
+        return formatting ? `${shortcut} + ` : `${shortcut}+`;
+    },
+    globalShortcutText(type, formatting) {
+        return this.presentShortcut(this.globalShortcut(type), formatting);
+    },
+    globalShortcut(type) {
+        const appSettingsShortcut = AppSettingsModel[this.globalShortcutAppSettingsKey(type)];
+        if (appSettingsShortcut) {
+            return appSettingsShortcut;
+        }
+        const globalShortcut = globalShortcuts[type];
+        if (globalShortcut) {
+            if (Features.isMac && globalShortcut.mac) {
+                return globalShortcut.mac;
+            }
+            return globalShortcut.all;
+        }
+        return undefined;
+    },
+    setGlobalShortcut(type, value) {
+        if (!globalShortcuts[type]) {
+            throw new Error('Bad shortcut: ' + type);
+        }
+        if (value) {
+            AppSettingsModel[this.globalShortcutAppSettingsKey(type)] = value;
+        } else {
+            delete AppSettingsModel[this.globalShortcutAppSettingsKey(type)];
+        }
+        Launcher.setGlobalShortcuts(AppSettingsModel);
+    },
+    globalShortcutAppSettingsKey(type) {
+        return 'globalShortcut' + StringFormat.capFirst(type);
+    },
+    screenshotToClipboardShortcut() {
+        if (Features.isiOS) {
+            return 'Sleep+Home';
+        }
+        if (Features.isMobile) {
+            return '';
+        }
+        if (Features.isMac) {
+            return 'Command-Shift-Control-4';
+        }
+        if (Features.isWindows) {
+            return 'Alt+PrintScreen';
+        }
+        return '';
+    }
+};
+
+export { Shortcuts };

app/scripts/comp/app/single-instance-checker.js

@@ -0,0 +1,43 @@
+import { Events } from 'framework/events';
+import { Launcher } from 'comp/launcher';
+
+const LocalStorageKeyName = 'instanceCheck';
+const LocalStorageResponseKeyName = 'instanceMaster';
+
+const instanceKey = Date.now().toString();
+
+const SingleInstanceChecker = {
+    init() {
+        if (Launcher) {
+            return;
+        }
+        window.addEventListener('storage', SingleInstanceChecker.storageChanged);
+        SingleInstanceChecker.setKey(LocalStorageKeyName, instanceKey);
+    },
+
+    storageChanged(e) {
+        if (!e.newValue) {
+            return;
+        }
+        if (e.key === LocalStorageKeyName && e.newValue !== instanceKey) {
+            SingleInstanceChecker.setKey(
+                LocalStorageResponseKeyName,
+                instanceKey + Math.random().toString()
+            );
+        } else if (e.key === LocalStorageResponseKeyName && e.newValue.indexOf(instanceKey) < 0) {
+            window.removeEventListener('storage', SingleInstanceChecker.storageChanged);
+            Events.emit('second-instance');
+        }
+    },
+
+    setKey(key, value) {
+        try {
+            localStorage.setItem(key, value);
+            setTimeout(() => {
+                localStorage.removeItem(key);
+            }, 100);
+        } catch (e) {}
+    }
+};
+
+export { SingleInstanceChecker };

app/scripts/comp/app/start-profiler.js

@@ -0,0 +1,54 @@
+import { Logger } from 'util/logger';
+
+const logger = new Logger('start-profiler');
+
+let lastTs = 0;
+
+const operations = [];
+
+const StartProfiler = {
+    milestone(name) {
+        const ts = logger.ts();
+        const elapsed = ts - lastTs;
+        lastTs = ts;
+        operations.push({ name, elapsed });
+    },
+
+    report() {
+        const networkTime = this.getNetworkTime();
+        operations.unshift({ name: 'fetching', elapsed: networkTime });
+
+        const time = Math.round(performance.now());
+
+        this.printReport('App', operations, time);
+    },
+
+    reportAppProfile(data) {
+        this.printReport('Electron app', data.timings, data.totalTime);
+    },
+
+    printReport(name, operations, totalTime) {
+        const message =
+            `${name} started in ${totalTime}ms: ` +
+            operations.map((op) => `${op.name}=${Math.round(op.elapsed)}ms`).join(', ');
+
+        logger.info(message);
+    },
+
+    getNetworkTime() {
+        let perfEntry;
+
+        if (performance.getEntriesByType) {
+            [perfEntry] = performance.getEntriesByType('navigation');
+        }
+        if (!perfEntry || !perfEntry.responseEnd || !perfEntry.fetchStart) {
+            perfEntry = performance.timing;
+        }
+
+        return perfEntry.responseEnd - perfEntry.fetchStart;
+    }
+};
+
+StartProfiler.milestone('pre-init');
+
+export { StartProfiler };

app/scripts/comp/app/updater.js

@@ -0,0 +1,306 @@
+import * as kdbxweb from 'kdbxweb';
+import { Events } from 'framework/events';
+import { RuntimeInfo } from 'const/runtime-info';
+import { Transport } from 'comp/browser/transport';
+import { Launcher } from 'comp/launcher';
+import { Links } from 'const/links';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { UpdateModel } from 'models/update-model';
+import { SemVer } from 'util/data/semver';
+import { Logger } from 'util/logger';
+import { SignatureVerifier } from 'util/data/signature-verifier';
+
+const logger = new Logger('updater');
+
+const Updater = {
+    UpdateInterval: 1000 * 60 * 60 * 24,
+    MinUpdateTimeout: 500,
+    MinUpdateSize: 10000,
+    nextCheckTimeout: null,
+    updateCheckDate: new Date(0),
+    enabled: Launcher?.updaterEnabled(),
+
+    getAutoUpdateType() {
+        if (!this.enabled) {
+            return false;
+        }
+        let autoUpdate = AppSettingsModel.autoUpdate;
+        if (autoUpdate && autoUpdate === true) {
+            autoUpdate = 'install';
+        }
+        return autoUpdate;
+    },
+
+    updateInProgress() {
+        return (
+            UpdateModel.status === 'checking' ||
+            ['downloading', 'extracting', 'updating'].indexOf(UpdateModel.updateStatus) >= 0
+        );
+    },
+
+    init() {
+        this.scheduleNextCheck();
+        if (!Launcher && navigator.serviceWorker && !RuntimeInfo.beta && !RuntimeInfo.devMode) {
+            navigator.serviceWorker
+                .register('service-worker.js')
+                .then((reg) => {
+                    logger.info('Service worker registered');
+                    reg.addEventListener('updatefound', () => {
+                        if (reg.active) {
+                            logger.info('Service worker found an update');
+                            UpdateModel.set({ updateStatus: 'ready' });
+                        }
+                    });
+                })
+                .catch((e) => {
+                    logger.error('Failed to register a service worker', e);
+                });
+        }
+    },
+
+    scheduleNextCheck() {
+        if (this.nextCheckTimeout) {
+            clearTimeout(this.nextCheckTimeout);
+            this.nextCheckTimeout = null;
+        }
+        if (!this.getAutoUpdateType()) {
+            return;
+        }
+        let timeDiff = this.MinUpdateTimeout;
+        const lastCheckDate = UpdateModel.lastCheckDate;
+        if (lastCheckDate) {
+            timeDiff = Math.min(
+                Math.max(this.UpdateInterval + (lastCheckDate - new Date()), this.MinUpdateTimeout),
+                this.UpdateInterval
+            );
+        }
+        this.nextCheckTimeout = setTimeout(this.check.bind(this), timeDiff);
+        logger.info('Next update check will happen in ' + Math.round(timeDiff / 1000) + 's');
+    },
+
+    check(startedByUser) {
+        if (!this.enabled || this.updateInProgress()) {
+            return;
+        }
+        UpdateModel.set({ status: 'checking' });
+        if (!startedByUser) {
+            // additional protection from broken program logic, to ensure that auto-checks are not performed more than once an hour
+            const diffMs = new Date() - this.updateCheckDate;
+            if (isNaN(diffMs) || diffMs < 1000 * 60 * 60) {
+                logger.error(
+                    'Prevented update check; last check was performed at ' + this.updateCheckDate
+                );
+                this.scheduleNextCheck();
+                return;
+            }
+            this.updateCheckDate = new Date();
+        }
+        logger.info('Checking for update...');
+        Transport.httpGet({
+            url: Links.UpdateJson,
+            json: true,
+            success: (updateJson) => {
+                const dt = new Date();
+                logger.info('Update check: ' + (updateJson.version || 'unknown'));
+                if (!updateJson.version) {
+                    const errMsg = 'No version info found';
+                    UpdateModel.set({
+                        status: 'error',
+                        lastCheckDate: dt,
+                        lastCheckError: errMsg
+                    });
+                    UpdateModel.save();
+                    this.scheduleNextCheck();
+                    return;
+                }
+                const prevLastVersion = UpdateModel.lastVersion;
+                UpdateModel.set({
+                    status: 'ok',
+                    lastCheckDate: dt,
+                    lastSuccessCheckDate: dt,
+                    lastVersionReleaseDate: new Date(updateJson.date),
+                    lastVersion: updateJson.version,
+                    lastCheckError: null,
+                    lastCheckUpdMin: updateJson.minVersion || null
+                });
+                UpdateModel.save();
+                this.scheduleNextCheck();
+                if (!this.canAutoUpdate()) {
+                    return;
+                }
+                if (
+                    prevLastVersion === UpdateModel.lastVersion &&
+                    UpdateModel.updateStatus === 'ready'
+                ) {
+                    logger.info('Waiting for the user to apply downloaded update');
+                    return;
+                }
+                if (!startedByUser && this.getAutoUpdateType() === 'install') {
+                    this.update(startedByUser);
+                } else if (
+                    SemVer.compareVersions(UpdateModel.lastVersion, RuntimeInfo.version) > 0
+                ) {
+                    UpdateModel.set({ updateStatus: 'found' });
+                }
+            },
+            error: (e) => {
+                logger.error('Update check error', e);
+                UpdateModel.set({
+                    status: 'error',
+                    lastCheckDate: new Date(),
+                    lastCheckError: 'Error checking last version'
+                });
+                UpdateModel.save();
+                this.scheduleNextCheck();
+            }
+        });
+    },
+
+    canAutoUpdate() {
+        const minLauncherVersion = UpdateModel.lastCheckUpdMin;
+        if (minLauncherVersion) {
+            const cmp = SemVer.compareVersions(RuntimeInfo.version, minLauncherVersion);
+            if (cmp < 0) {
+                UpdateModel.set({ updateStatus: 'ready', updateManual: true });
+                return false;
+            }
+        }
+        return true;
+    },
+
+    update(startedByUser, successCallback) {
+        const ver = UpdateModel.lastVersion;
+        if (!this.enabled) {
+            logger.info('Updater is disabled');
+            return;
+        }
+        if (SemVer.compareVersions(RuntimeInfo.version, ver) >= 0) {
+            logger.info('You are using the latest version');
+            return;
+        }
+        UpdateModel.set({ updateStatus: 'downloading', updateError: null });
+        logger.info('Downloading update', ver);
+        const updateAssetName = this.getUpdateAssetName(ver);
+        if (!updateAssetName) {
+            logger.error('Empty updater asset name for', Launcher.platform(), Launcher.arch());
+            return;
+        }
+        const updateUrlBasePath = Links.UpdateBasePath.replace('{ver}', ver);
+        const updateAssetUrl = updateUrlBasePath + updateAssetName;
+        Transport.httpGet({
+            url: updateAssetUrl,
+            file: updateAssetName,
+            cleanupOldFiles: true,
+            cache: true,
+            success: (assetFilePath) => {
+                logger.info('Downloading update signatures');
+                Transport.httpGet({
+                    url: updateUrlBasePath + 'Verify.sign.sha256',
+                    text: true,
+                    file: updateAssetName + '.sign',
+                    cleanupOldFiles: true,
+                    cache: true,
+                    success: (assetFileSignaturePath) => {
+                        this.verifySignature(assetFilePath, updateAssetName, (err, valid) => {
+                            if (err || !valid) {
+                                UpdateModel.set({
+                                    updateStatus: 'error',
+                                    updateError: err
+                                        ? 'Error verifying update signature'
+                                        : 'Invalid update signature'
+                                });
+                                Launcher.deleteFile(assetFilePath);
+                                Launcher.deleteFile(assetFileSignaturePath);
+                                return;
+                            }
+                            logger.info('Update is ready', assetFilePath);
+                            UpdateModel.set({ updateStatus: 'ready', updateError: null });
+                            if (!startedByUser) {
+                                Events.emit('update-app');
+                            }
+                            if (typeof successCallback === 'function') {
+                                successCallback();
+                            }
+                        });
+                    },
+                    error(e) {
+                        logger.error('Error downloading update signatures', e);
+                        UpdateModel.set({
+                            updateStatus: 'error',
+                            updateError: 'Error downloading update signatures'
+                        });
+                    }
+                });
+            },
+            error(e) {
+                logger.error('Error downloading update', e);
+                UpdateModel.set({
+                    updateStatus: 'error',
+                    updateError: 'Error downloading update'
+                });
+            }
+        });
+    },
+
+    verifySignature(assetFilePath, assetName, callback) {
+        logger.info('Verifying update signature', assetName);
+        const fs = Launcher.req('fs');
+        const signaturesTxt = fs.readFileSync(assetFilePath + '.sign', 'utf8');
+        const assetSignatureLine = signaturesTxt
+            .split('\n')
+            .find((line) => line.endsWith(assetName));
+        if (!assetSignatureLine) {
+            logger.error('Signature not found for asset', assetName);
+            callback('Asset signature not found');
+            return;
+        }
+        const signature = kdbxweb.ByteUtils.hexToBytes(assetSignatureLine.split(' ')[0]);
+        const fileBytes = fs.readFileSync(assetFilePath);
+        SignatureVerifier.verify(fileBytes, signature)
+            .catch((e) => {
+                logger.error('Error verifying signature', e);
+                callback('Error verifying signature');
+            })
+            .then((valid) => {
+                logger.info(`Update asset signature is ${valid ? 'valid' : 'invalid'}`);
+                callback(undefined, valid);
+            });
+    },
+
+    getUpdateAssetName(ver) {
+        const platform = Launcher.platform();
+        const arch = Launcher.arch();
+        switch (platform) {
+            case 'win32':
+                switch (arch) {
+                    case 'x64':
+                        return `KeeWeb-${ver}.win.x64.exe`;
+                    case 'ia32':
+                        return `KeeWeb-${ver}.win.ia32.exe`;
+                    case 'arm64':
+                        return `KeeWeb-${ver}.win.arm64.exe`;
+                }
+                break;
+            case 'darwin':
+                switch (arch) {
+                    case 'x64':
+                        return `KeeWeb-${ver}.mac.x64.dmg`;
+                    case 'arm64':
+                        return `KeeWeb-${ver}.mac.arm64.dmg`;
+                }
+                break;
+        }
+        return undefined;
+    },
+
+    installAndRestart() {
+        if (!Launcher) {
+            return;
+        }
+        const updateAssetName = this.getUpdateAssetName(UpdateModel.lastVersion);
+        const updateFilePath = Transport.cacheFilePath(updateAssetName);
+        Launcher.requestRestartAndUpdate(updateFilePath);
+    }
+};
+
+export { Updater };

app/scripts/comp/app/usb-listener.js

@@ -0,0 +1,69 @@
+import { Events } from 'framework/events';
+import { Logger } from 'util/logger';
+import { NativeModules } from 'comp/launcher/native-modules';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { Features } from 'util/features';
+
+const logger = new Logger('usb-listener');
+
+const UsbListener = {
+    supported: Features.isDesktop,
+    attachedYubiKeys: 0,
+
+    init() {
+        if (!this.supported) {
+            return;
+        }
+
+        Events.on('native-modules-yubikeys', (e) => {
+            if (e.numYubiKeys !== this.attachedYubiKeys) {
+                logger.debug(`YubiKeys changed ${this.attachedYubiKeys} => ${e.numYubiKeys}`);
+                this.attachedYubiKeys = e.numYubiKeys;
+                Events.emit('usb-devices-changed');
+            }
+        });
+
+        AppSettingsModel.on('change:enableUsb', (model, enabled) => {
+            if (enabled) {
+                this.start();
+            } else {
+                this.stop();
+            }
+        });
+
+        if (AppSettingsModel.enableUsb) {
+            this.start();
+        }
+    },
+
+    start() {
+        logger.info('Starting USB listener');
+
+        if (this.usb) {
+            this.stop();
+        }
+
+        try {
+            NativeModules.startUsbListener();
+        } catch (e) {
+            logger.error('Error starting USB listener', e);
+        }
+    },
+
+    stop() {
+        logger.info('Stopping USB listener');
+
+        try {
+            NativeModules.stopUsbListener();
+        } catch (e) {
+            logger.error('Error stopping USB listener', e);
+        }
+
+        if (this.attachedYubiKeys) {
+            this.attachedYubiKeys = 0;
+            Events.emit('usb-devices-changed');
+        }
+    }
+};
+
+export { UsbListener };

app/scripts/comp/app/yubikey.js

@@ -0,0 +1,291 @@
+import { Events } from 'framework/events';
+import { Launcher } from 'comp/launcher';
+import { NativeModules } from 'comp/launcher/native-modules';
+import { Logger } from 'util/logger';
+import { UsbListener } from 'comp/app/usb-listener';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { Timeouts } from 'const/timeouts';
+import { YubiKeyProductIds, YubiKeyChallengeSize } from 'const/hardware';
+import { Locale } from 'util/locale';
+
+const logger = new Logger('yubikey');
+
+const YubiKey = {
+    ykmanStatus: undefined,
+    process: null,
+    aborted: false,
+
+    cmd() {
+        if (this._cmd) {
+            return this._cmd;
+        }
+        const macYkmanPath = '/usr/local/bin/ykman';
+        if (Launcher.platform() === 'darwin' && Launcher.fileExistsSync(macYkmanPath)) {
+            this._cmd = macYkmanPath;
+        } else {
+            this._cmd = 'ykman';
+        }
+        return this._cmd;
+    },
+
+    checkToolStatus() {
+        if (this.ykmanStatus === 'ok') {
+            return Promise.resolve(this.ykmanStatus);
+        }
+        return new Promise((resolve) => {
+            this.ykmanStatus = 'checking';
+            this._cmd = undefined;
+            Launcher.spawn({
+                cmd: this.cmd(),
+                args: ['-v'],
+                noStdOutLogging: true,
+                complete: (err, stdout, code) => {
+                    if (err || code !== 0) {
+                        this.ykmanStatus = 'error';
+                    } else {
+                        this.ykmanStatus = 'ok';
+                    }
+                    resolve(this.ykmanStatus);
+                }
+            });
+        });
+    },
+
+    abort() {
+        logger.info('Aborting');
+        if (this.process) {
+            logger.info('Killing the process');
+            try {
+                this.process.kill();
+            } catch {}
+        }
+        this.aborted = true;
+        this.process = null;
+    },
+
+    list(callback) {
+        NativeModules.getYubiKeys({})
+            .then((yubiKeys) => {
+                yubiKeys = yubiKeys.map(({ serial, vid, pid, version, slots }) => {
+                    return {
+                        vid,
+                        pid,
+                        serial,
+                        slots,
+                        fullName: this.getKeyFullName(pid, version, serial)
+                    };
+                });
+                callback(null, yubiKeys);
+            })
+            .catch(callback);
+    },
+
+    getKeyFullName(pid, version, serial) {
+        let name = 'YubiKey';
+        if (YubiKeyProductIds.Gen1.includes(pid)) {
+            name += ' Gen 1';
+        } else if (YubiKeyProductIds.NEO.includes(pid)) {
+            name += ' NEO';
+        } else if (YubiKeyProductIds.YK4.includes(pid)) {
+            if (version >= '5.1.0') {
+                name += ' 5';
+            }
+        }
+        return `${name} ${serial}`;
+    },
+
+    listWithYkman(callback) {
+        this._listWithYkman(callback, true);
+    },
+
+    _listWithYkman(callback, canRetry) {
+        if (this.process) {
+            return callback('Already in progress');
+        }
+        this.aborted = false;
+
+        logger.info('Listing YubiKeys');
+
+        if (!UsbListener.attachedYubiKeys) {
+            return callback(null, []);
+        }
+
+        this.process = Launcher.spawn({
+            cmd: this.cmd(),
+            args: ['list'],
+            noStdOutLogging: true,
+            complete: (err, stdout) => {
+                this.process = null;
+
+                if (this.aborted) {
+                    return callback('Aborted');
+                }
+                if (err) {
+                    return callback(err);
+                }
+
+                const yubiKeysIncludingEmpty = stdout
+                    .trim()
+                    .split(/\n/g)
+                    .map((line) => {
+                        const fullName = line;
+                        const serial = (line.match(/\d{5,}$/g) || [])[0];
+                        return { fullName, serial };
+                    });
+
+                const yubiKeys = yubiKeysIncludingEmpty.filter((s) => s.serial);
+
+                if (
+                    yubiKeysIncludingEmpty.length === 1 &&
+                    yubiKeys.length === 0 &&
+                    stdout.startsWith('YubiKey') &&
+                    stdout.includes('CCID') &&
+                    !stdout.includes('Serial')
+                ) {
+                    logger.info('The YubiKey is probably stuck');
+                    if (!AppSettingsModel.yubiKeyStuckWorkaround) {
+                        return callback(Locale.yubiKeyStuckError);
+                    }
+                    if (canRetry) {
+                        return this._repairStuckYubiKey(callback);
+                    }
+                }
+
+                if (!yubiKeys.length) {
+                    return callback('No YubiKeys returned by "ykman list"');
+                }
+
+                callback(null, yubiKeys);
+            }
+        });
+    },
+
+    _repairStuckYubiKey(callback) {
+        logger.info('Repairing a stuck YubiKey');
+
+        let openTimeout;
+        const countYubiKeys = UsbListener.attachedYubiKeys;
+        const onDevicesChangedDuringRepair = () => {
+            if (UsbListener.attachedYubiKeys === countYubiKeys) {
+                logger.info('YubiKey was reconnected');
+                Events.off('usb-devices-changed', onDevicesChangedDuringRepair);
+                clearTimeout(openTimeout);
+                this.aborted = false;
+                setTimeout(() => {
+                    this._listWithYkman(callback, false);
+                }, Timeouts.ExternalDeviceAfterReconnect);
+            }
+        };
+        Events.on('usb-devices-changed', onDevicesChangedDuringRepair);
+
+        Launcher.spawn({
+            cmd: this.cmd(),
+            args: ['config', 'usb', '-e', 'oath', '-f'],
+            noStdOutLogging: true,
+            complete: (err) => {
+                logger.info('Repair complete', err ? 'with error' : 'OK');
+                if (err) {
+                    Events.off('usb-devices-changed', onDevicesChangedDuringRepair);
+                    return callback(`YubiKey repair error: ${err}`);
+                }
+                openTimeout = setTimeout(() => {
+                    Events.off('usb-devices-changed', onDevicesChangedDuringRepair);
+                }, Timeouts.ExternalDeviceReconnect);
+            }
+        });
+    },
+
+    getOtpCodes(serial, callback) {
+        if (this.process) {
+            return callback('Already in progress');
+        }
+        this.aborted = false;
+
+        this.process = Launcher.spawn({
+            cmd: this.cmd(),
+            args: ['-d', serial, 'oath', 'accounts', 'code'],
+            noStdOutLogging: true,
+            throwOnStdErr: true,
+            complete: (err, stdout) => {
+                this.process = null;
+
+                if (this.aborted) {
+                    return callback('Aborted');
+                }
+                if (err) {
+                    return callback(err);
+                }
+
+                const codes = [];
+
+                for (const line of stdout.split('\n')) {
+                    const match = line.match(/^(.*?):(.*?)\s+(.*)$/);
+                    if (!match) {
+                        continue;
+                    }
+                    const [, title, user, code] = match;
+                    const needsTouch = !code.match(/^\d+$/);
+
+                    codes.push({
+                        title,
+                        user,
+                        needsTouch
+                    });
+                }
+
+                callback(null, codes);
+            }
+        });
+    },
+
+    getOtp(serial, entry, callback) {
+        return Launcher.spawn({
+            cmd: this.cmd(),
+            args: ['-d', serial, 'oath', 'accounts', 'code', '--single', entry],
+            noStdOutLogging: true,
+            complete: (err, stdout) => {
+                if (err) {
+                    return callback(err);
+                }
+                const otp = stdout.trim();
+                callback(null, otp);
+            }
+        });
+    },
+
+    calculateChalResp(chalResp, challenge, callback) {
+        const { vid, pid, serial, slot } = chalResp;
+        const yubiKey = { vid, pid, serial };
+
+        challenge = Buffer.from(challenge);
+
+        // https://github.com/Yubico/yubikey-personalization-gui/issues/86
+        // https://github.com/keepassxreboot/keepassxc/blob/develop/src/keys/drivers/YubiKey.cpp#L318
+
+        const padLen = YubiKeyChallengeSize - challenge.byteLength;
+
+        const paddedChallenge = Buffer.alloc(YubiKeyChallengeSize, padLen);
+        challenge.copy(paddedChallenge);
+
+        NativeModules.yubiKeyChallengeResponse(
+            yubiKey,
+            [...paddedChallenge],
+            slot,
+            (err, result) => {
+                if (result) {
+                    result = Buffer.from(result);
+                }
+                if (err) {
+                    err.ykError = true;
+                }
+                return callback(err, result);
+            }
+        );
+    },
+
+    cancelChalResp() {
+        NativeModules.yubiKeyCancelChallengeResponse();
+    }
+};
+
+export { YubiKey };