Specify node-version for setup-node action

Upgrade dependencies

.buildkite/pipeline.yaml

@@ -1,8 +0,0 @@
-steps:
-  - label: ":eslint: Lint"
-    command:
-      - "yarn install"
-      - "yarn lint"
-    plugins:
-      - docker#v3.0.1:
-          image: "node:10"

.eslintrc.js

@@ -1,8 +1,10 @@
-const jsSdkEslintCfg = require('matrix-js-sdk/.eslintrc');
-
 module.exports = {
+    plugins: ["matrix-org"],
+    extends: [
+        "plugin:matrix-org/javascript",
+    ],
     parserOptions: {
-        ecmaVersion: 8,
+        ecmaVersion: 2021,
     },
     env: {
         es6: true,
@@ -10,17 +12,26 @@ module.exports = {
         // we also have some browser code (ie. the preload script)
         browser: true,
     },
-    extends: ["eslint:recommended", "google"],
-    rules: jsSdkEslintCfg.rules,
-}
+    // NOTE: These rules are frozen and new rules should not be added here.
+    // New changes belong in https://github.com/matrix-org/eslint-plugin-matrix-org/
+    rules: {
+        "quotes": "off",
+        "indent": "off",
+        "prefer-promise-reject-errors": "off",
+        "no-async-promise-executor": "off",
+    },
+    overrides: [{
+        files: ["{src,scripts,hak}/**/*.{ts,tsx}"],
+        extends: [
+            "plugin:matrix-org/typescript",
+        ],
+        rules: {
+            // Things we do that break the ideal style
+            "prefer-promise-reject-errors": "off",
+            "quotes": "off",
 
-// js-sdk uses a babel rule which we can't use because we
-// don't use babel, so remove it & put the original back
-delete module.exports.rules["babel/no-invalid-this"];
-module.exports.rules["no-invalid-this"] = "error";
-
-// also override the line length to be consistent with
-// vector-web / react-sdk rather than js-sdk
-module.exports.rules["max-len"] = ["warn", {
-    code: 120,
-}];
+            // We disable this while we're transitioning
+            "@typescript-eslint/no-explicit-any": "off",
+        },
+    }],
+};

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @vector-im/element-web

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,13 @@
+<!-- Thanks for submitting a PR! Please ensure the following requirements are met in order for us to review your PR -->
+
+## Checklist
+
+* [ ] Ensure your code works with manual testing
+* [ ] Linter and other CI checks pass
+* [ ] Sign-off given on the changes (see [CONTRIBUTING.md](https://github.com/vector-im/element-desktop/blob/develop/CONTRIBUTING.md))
+
+<!--
+If you would like to specify text for the changelog entry other than your PR title, add the following:
+
+Notes: Add super cool feature
+-->

.github/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "github>matrix-org/renovate-config-element-web"
+  ]
+}

.github/workflows/backport.yml

@@ -0,0 +1,30 @@
+name: Backport
+on:
+  pull_request_target:
+    types:
+      - closed
+      - labeled
+    branches:
+      - develop
+
+jobs:
+  backport:
+    name: Backport
+    runs-on: ubuntu-latest
+    # Only react to merged PRs for security reasons.
+    # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
+    if: >
+      github.event.pull_request.merged
+      && (
+        github.event.action == 'closed'
+        || (
+          github.event.action == 'labeled'
+          && contains(github.event.label.name, 'backport')
+        )
+      )
+    steps:
+      - uses: tibdex/backport@v2
+        with:
+          labels_template: "<%= JSON.stringify([...labels, 'X-Release-Blocker']) %>"
+          # We can't use GITHUB_TOKEN here or CI won't run on the new PR
+          github_token: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/build.yaml

@@ -0,0 +1,288 @@
+name: Build and Test
+on:
+  pull_request: { }
+  push:
+    branches: [ develop, master ]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  fetch:
+    name: Prepare
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: "yarn"
+          node-version: 16
+
+      - name: Install Deps
+        run: "yarn install --pure-lockfile"
+
+      - name: Fetch Element Web (develop)
+        if: github.event.pull_request.base.ref == 'develop'
+        run: yarn run fetch --noverify develop -d element.io/nightly
+
+      - name: Fetch Element Web
+        if: github.event.pull_request.base.ref != 'develop'
+        run: yarn run fetch --noverify --cfgdir element.io/release
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: webapp
+          retention-days: 1
+          path: |
+            webapp.asar
+            package.json
+
+  windows:
+    needs: fetch
+    strategy:
+      matrix:
+        include:
+          - target: x86_64-pc-windows-msvc
+            arch: x64
+          - target: i686-pc-windows-msvc
+            arch: x86
+            build-args: --ia32
+    name: Windows (${{ matrix.arch }})
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: webapp
+
+      - name: Cache .hak
+        uses: actions/cache@v3
+        with:
+          key: ${{ runner.os }}-${{ hashFiles('./yarn.lock') }}
+          path: |
+            ./.hak
+
+      - name: Set up build tools
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: ${{ matrix.arch }}
+
+      # ActiveTCL package on choco is from 2015,
+      # this one is newer but includes more than we need
+      - name: Choco install tclsh
+        shell: pwsh
+        run: |
+          choco install -y magicsplat-tcl-tk --no-progress
+          echo "${HOME}/AppData/Local/Apps/Tcl86/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+      - name: Choco install NetWide Assembler
+        shell: pwsh
+        run: |
+          choco install -y nasm --no-progress
+          echo "C:/Program Files/NASM" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: ${{ matrix.target }}
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: "yarn"
+          node-version: 16
+
+      # Does not need branch matching as only analyses this layer
+      - name: Install Deps
+        run: "yarn install --pure-lockfile"
+
+      - name: Build Natives
+        run: |
+          refreshenv
+          yarn build:native --target ${{ matrix.target }}
+
+      - name: Build App
+        run: "yarn build --publish never -w ${{ matrix.build-args }}"
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: win-${{ matrix.arch }}
+          path: dist
+          retention-days: 1
+
+  linux:
+    needs: fetch
+    strategy:
+      matrix:
+        include:
+          - sqlcipher: system
+          - sqlcipher: static
+            static: 1
+    name: 'Linux (sqlcipher: ${{ matrix.sqlcipher }})'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: webapp
+
+      - name: Cache .hak
+        uses: actions/cache@v3
+        with:
+          key: ${{ hashFiles('./yarn.lock') }}
+          path: |
+            ./.hak
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+
+      - name: Install libsqlcipher-dev
+        if: matrix.sqlcipher == 'system'
+        run: sudo apt-get install -y libsqlcipher-dev
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: "yarn"
+          node-version: 16
+
+      # Does not need branch matching as only analyses this layer
+      - name: Install Deps
+        run: "yarn install --pure-lockfile"
+
+      - name: Build Natives
+        run: "yarn build:native"
+        env:
+          SQLCIPHER_STATIC: ${{ matrix.static }}
+
+      - name: Build App
+        run: "yarn build --publish never"
+
+      - name: Install .deb
+        run: "sudo apt install ./dist/*.deb"
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: linux-sqlcipher-${{ matrix.sqlcipher }}
+          path: dist
+          retention-days: 1
+
+  macos:
+    needs: fetch
+    name: macOS (universal)
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: webapp
+
+      - name: Cache .hak
+        uses: actions/cache@v3
+        with:
+          key: ${{ hashFiles('./yarn.lock') }}
+          path: |
+            ./.hak
+
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: aarch64-apple-darwin
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: "yarn"
+          node-version: 16
+
+      # Does not need branch matching as only analyses this layer
+      - name: Install Deps
+        run: "yarn install --pure-lockfile"
+
+      - name: Build Natives
+        run: "yarn build:native:universal"
+
+      - name: Build App
+        run: "yarn build:universal --publish never"
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: macos
+          path: dist
+          retention-days: 1
+
+  test:
+    needs:
+      - macos
+      - linux
+      - windows
+    strategy:
+      matrix:
+        include:
+# Disable macOS tests for now, they fail to run in CI, needs investigation.
+#          - name: macOS Universal
+#            os: macos
+#            artifact: macos
+#            executable: "./dist/mac-universal/Element.app/Contents/MacOS/Element"
+#            prepare_cmd: "chmod +x ./dist/mac-universal/Element.app/Contents/MacOS/Element"
+          - name: 'Linux (sqlcipher: system)'
+            os: ubuntu
+            artifact: linux-sqlcipher-system
+            executable: "element-desktop"
+            prepare_cmd: "sudo apt install ./dist/*.deb"
+          - name: 'Linux (sqlcipher: static)'
+            os: ubuntu
+            artifact: linux-sqlcipher-static
+            executable: "element-desktop"
+            prepare_cmd: "sudo apt install ./dist/*.deb"
+          - name: Windows (x86)
+            os: windows
+            artifact: win-x86
+            executable: "./dist/win-ia32-unpacked/Element.exe"
+          - name: Windows (x64)
+            os: windows
+            artifact: win-x64
+            executable: "./dist/win-unpacked/Element.exe"
+    name: Test ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: "yarn"
+          node-version: 16
+
+      - name: Install Deps
+        run: "yarn install --pure-lockfile"
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: ${{ matrix.artifact }}
+          path: dist
+
+      - name: Prepare for tests
+        run: ${{ matrix.prepare_cmd }}
+        if: matrix.prepare_cmd
+
+      - name: Run tests
+        uses: GabrielBB/xvfb-action@v1
+        timeout-minutes: 5
+        with:
+          run: "yarn test"
+        env:
+          ELEMENT_DESKTOP_EXECUTABLE: ${{ matrix.executable }}
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.artifact }}
+          path: test_artifacts
+          retention-days: 1

.github/workflows/pull_request.yaml

@@ -0,0 +1,12 @@
+name: Pull Request
+on:
+  pull_request_target:
+    types: [ opened, edited, labeled, unlabeled, synchronize ]
+concurrency: ${{ github.workflow }}-${{ github.event.pull_request.head.ref }}
+jobs:
+  action:
+    uses: matrix-org/matrix-js-sdk/.github/workflows/pull_request.yaml@develop
+    with:
+      labels: "T-Defect,T-Enhancement,T-Task"
+    secrets:
+      ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/static_analysis.yaml

@@ -0,0 +1,45 @@
+name: Static Analysis
+on:
+  pull_request: { }
+  push:
+    branches: [ develop, master ]
+jobs:
+  ts_lint:
+    name: "Typescript Syntax Check"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'
+          node-version: 16
+
+      # Does not need branch matching as only analyses this layer
+      - name: Install Deps
+        run: "yarn install --pure-lockfile"
+
+      - name: Typecheck
+        run: "yarn run lint:types"
+
+  i18n_lint:
+    name: "i18n Check"
+    uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop
+
+  js_lint:
+    name: "ESLint"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v3
+        with:
+          cache: 'yarn'
+          node-version: 16
+
+      # Does not need branch matching as only analyses this layer
+      - name: Install Deps
+        run: "yarn install --pure-lockfile"
+
+      - name: Run Linter
+        run: "yarn run lint:js"

.github/workflows/upgrade_dependencies.yml

@@ -0,0 +1,8 @@
+name: Upgrade Dependencies
+on:
+  workflow_dispatch: { }
+jobs:
+  upgrade:
+    uses: matrix-org/matrix-js-sdk/.github/workflows/upgrade_dependencies.yml@develop
+    secrets:
+      ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

.gitignore

@@ -1,4 +1,5 @@
 /dist
+/lib
 /webapp
 /webapp.asar
 /packages
@@ -10,3 +11,7 @@
 /.yarnrc
 /docker
 /.npmrc
+.vscode
+.vscode/
+/test_artifacts/
+/coverage/

README.md

@@ -1,90 +1,91 @@
-Riot Desktop
-============
+![Build](https://github.com/vector-im/element-desktop/actions/workflows/build.yaml/badge.svg)
+![Static Analysis](https://github.com/vector-im/element-desktop/actions/workflows/static_analysis.yaml/badge.svg)
+[![Weblate](https://translate.element.io/widgets/element-desktop/-/element-desktop/svg-badge.svg)](https://translate.element.io/engage/element-desktop/)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=element-desktop&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=element-desktop)
+[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=element-desktop&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=element-desktop)
+[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=element-desktop&metric=bugs)](https://sonarcloud.io/summary/new_code?id=element-desktop)
 
-This is Riot desktop app as of release 1.6.
+Element Desktop
+===============
 
-Fetching Riot
-=============
-Since this package is just the Electron wrapper for Riot, it doesn't contain any of the Riot code,
-so the first step is to get a working copy of Riot. There are a few ways of doing this:
+Element Desktop is a Matrix client for desktop platforms with Element Web at its core.
+
+First Steps
+===========
+Before you do anything else, fetch the dependencies:
 
 ```
-# Fetch the prebuilt release Riot package from the riot.im GitHub releases page. The version
-# fetched will be the same as the local riot-desktop package.
-# We're explicitly asking for no config, so the package Riot will have no config.json.
-yarn run fetch --noverify --cfgdir ''
+yarn install
+```
+
+Fetching Element
+================
+Since this package is just the Electron wrapper for Element Web, it doesn't contain any of the Element Web code,
+so the first step is to get a working copy of Element Web. There are a few ways of doing this:
+
+```
+# Fetch the prebuilt release Element package from the element-web GitHub releases page. The version
+# fetched will be the same as the local element-desktop package.
+# We're explicitly asking for no config, so the packaged Element will have no config.json.
+yarn run fetch --noverify --cfgdir ""
 ```
 
 ...or if you'd like to use GPG to verify the downloaded package:
 ```
-# Fetch the Riot public key from the riot.im web server over a secure connection and import
+# Fetch the Element public key from the element.io web server over a secure connection and import
 # it into your local GPG keychain (you'll need GPG installed). You only need to to do this
 # once.
 yarn run fetch --importkey
 # Fetch the package and verify the signature
-yarn run fetch --cfgdir ''
+yarn run fetch --cfgdir ""
 ```
 
-...or either of the above, but fetching a specific version of Riot:
+...or either of the above, but fetching a specific version of Element:
 ```
-# Fetch the prebuilt release Riot package from the riot.im GitHub releases page. The version
-# fetched will be the same as the local riot-desktop package.
-yarn run fetch --noverify --cfgdir '' v1.5.6
+# Fetch the prebuilt release Element package from the element-web GitHub releases page. The version
+# fetched will be the same as the local element-desktop package.
+yarn run fetch --noverify --cfgdir "" v1.5.6
 ```
 
 If you only want to run the app locally and don't need to build packages, you can
 provide the `webapp` directory directly:
 ```
-# Assuming you've checked out and built a copy of riot-web in ../riot-web
-ln -s ../riot-web/webapp ./
+# Assuming you've checked out and built a copy of element-web in ../element-web
+ln -s ../element-web/webapp ./
 ```
 
 [TODO: add support for fetching develop builds, arbitrary URLs and arbitrary paths]
 
-
 Building
 ========
-Now you have a copy of Riot, you're ready to build packages. If you'd just like to
-run Riot locally, skip to the next section.
 
+## Native Build
+
+TODO: List native pre-requisites
+
+Optionally, [build the native modules](https://github.com/vector-im/element-desktop/blob/develop/docs/native-node-modules.md), 
+which include support for searching in encrypted rooms and secure storage. Skipping this step is fine, you just won't have those features.  
+
+Then, run
 ```
 yarn run build
 ```
 This will do a couple of things:
  * Run the `setversion` script to set the local package version to match whatever
-   version of Riot you installed above.
+   version of Element you installed above.
  * Run electron-builder to build a package. The package built will match the operating system
    you're running the build process on.
 
-If you're on Windows, you can choose to build specifically for 32 or 64 bit:
-```
-yarn run build32
-```
-or
-```
-yarn run build64
-```
+## Docker
 
-This build step will not build any native modules.
-
-If you'd like to build the native modules (for searching in encrypted rooms):
-This will take 10 minutes or so, and will require a number of native tools
-to be installed, depending on your OS (eg. rust, tcl, make/nmake).
-```
-yarn run build:native
-```
-
-On Windows, this will automatically determine the architecture to build for based
-on the environment (ie. set up by vcvarsall.bat).
-
-You can also build using docker, which will always produce the linux package:
+Alternatively, you can also build using docker, which will always produce the linux package:
 ```
 # Run this once to make the docker image
 yarn run docker:setup
 
 yarn run docker:install
 # if you want to build the native modules (this will take a while)
-yarn run docker:buildnative
+yarn run docker:build:native
 yarn run docker:build
 ```
 
@@ -102,7 +103,7 @@ yarn start
 
 Config
 ======
-If you'd like the packaged Riot to have a configuration file, you can create a
+If you'd like the packaged Element to have a configuration file, you can create a
 config directory and place `config.json` in there, then specify this directory
 with the `--cfgdir` option to `yarn run fetch`, eg:
 ```
@@ -110,15 +111,15 @@ mkdir myconfig
 cp /path/to/my/config.json myconfig/
 yarn run fetch --cfgdir myconfig
 ```
-The config dir for the official Riot.im app is in `riot.im`. If you use this,
-your app will auto-update itself using builds from Riot.im.
+The config dir for the official Element app is in `element.io`. If you use this,
+your app will auto-update itself using builds from element.io.
 
 Profiles
 ========
 
 To run multiple instances of the desktop app for different accounts, you can
 launch the executable with the `--profile` argument followed by a unique
-identifier, e.g `riot-desktop --profile Work` for it to run a separate profile and
+identifier, e.g `element-desktop --profile Work` for it to run a separate profile and
 not interfere with the default one.
 
 Alternatively, a custom location for the profile data can be specified using the
@@ -128,8 +129,26 @@ User-specified config.json
 ==========================
 
 + `%APPDATA%\$NAME\config.json` on Windows
-+ `$XDG_CONFIG_HOME\$NAME\config.json` or `~/.config/$NAME/config.json` on Linux
-+ `~Library/Application Support/$NAME/config.json` on macOS
++ `$XDG_CONFIG_HOME/$NAME/config.json` or `~/.config/$NAME/config.json` on Linux
++ `~/Library/Application Support/$NAME/config.json` on macOS
 
-In the paths above, `$NAME` is typically `Riot`, unless you use `--profile
-$PROFILE` in which case it becomes `Riot-$PROFILE`.
+In the paths above, `$NAME` is typically `Element`, unless you use `--profile
+$PROFILE` in which case it becomes `Element-$PROFILE`, or it is using one of
+the above created by a pre-1.7 install, in which case it will be `Riot` or
+`Riot-$PROFILE`.
+
+Translations
+==========================
+
+To add a new translation, head to the [translating doc](https://github.com/vector-im/element-web/blob/develop/docs/translating.md).
+
+For a developer guide, see the [translating dev doc](https://github.com/vector-im/element-web/blob/develop/docs/translating-dev.md).
+
+[<img src="https://translate.element.io/widgets/element-desktop/-/multi-auto.svg" alt="translationsstatus" width="340">](https://translate.element.io/engage/element-desktop/?utm_source=widget)
+
+Report bugs & give feedback
+==========================
+
+If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.
+
+To help avoid duplicate issues, please [view existing issues](https://github.com/vector-im/element-web/issues?q=is%3Aopen+is%3Aissue+sort%3Areactions-%2B1-desc) first (and add a +1) or [create a new issue](https://github.com/vector-im/element-web/issues/new/choose) if you can't find it.  Please note that this issue tracker is associated with the [element-web](https://github.com/vector-im/element-web) repo, but is also applied to the code in this repo as well.

babel.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+    presets: [
+        ['@babel/preset-env', { targets: { node: 'current' } }],
+        '@babel/preset-typescript',
+    ],
+};

build/rebrand_stub/rebrand_stub.c

@@ -0,0 +1,51 @@
+#include <windows.h>
+#include <stdio.h>
+#include <string.h>
+#include <tchar.h>
+
+/*
+ * This just runs 'Element.exe' with the same args as
+ * this process was invoked with. This gets around the fact that
+ * squirrel always tries to run an executable with the same name,
+ * so fails to restart if the app's name has changed.
+ */
+void _tmain( int argc, TCHAR *argv[] )
+{
+    LPSTR myCmdLine = GetCommandLineA();
+    char cmdLine[32767];
+
+    LPSTR cmdLinePos = cmdLine;
+    LPSTR toRun = "\"Element.exe\" ";
+    strncpy(cmdLinePos, toRun, strlen(toRun));
+    cmdLinePos += strlen(toRun);
+
+    if (myCmdLine[0] == '"') ++myCmdLine;
+    myCmdLine += strlen(argv[0]);
+    if (myCmdLine[0] == '"') ++myCmdLine;
+    if (myCmdLine[0] == ' ') ++myCmdLine;
+
+    strncpy(cmdLinePos, myCmdLine, (cmdLine + 32767) - cmdLinePos);
+
+    STARTUPINFO si;
+    PROCESS_INFORMATION pi;
+
+    ZeroMemory(&si, sizeof(si));
+    si.cb = sizeof(si);
+    ZeroMemory(&pi, sizeof(pi));
+
+    if (!CreateProcess(NULL,
+        cmdLine,        // Command line
+        NULL,           // Process handle not inheritable
+        NULL,           // Thread handle not inheritable
+        FALSE,          // Set handle inheritance to FALSE
+        0,              // No creation flags
+        NULL,           // Use parent's environment block
+        NULL,           // Use parent's starting directory 
+        &si,            // Pointer to STARTUPINFO structure
+        &pi )           // Pointer to PROCESS_INFORMATION structure
+    ) 
+    {
+        printf("CreateProcess failed (%d).\n", GetLastError());
+        return;
+    }
+}

dockerbuild/Dockerfile

@@ -1,4 +1,4 @@
-FROM buildpack-deps:xenial-curl
+FROM buildpack-deps:bionic-curl
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -9,11 +9,12 @@ RUN apt-get -qq update && apt-get -qq dist-upgrade && \
   # git ssh for using as docker image on CircleCI
   # python for node-gyp
   # rpm is required for FPM to build rpm package
+  # tclsh is required for building SQLite as part of SQLCipher
   # libsecret-1-dev and libgnome-keyring-dev are required even for prebuild keytar
-  apt-get -qq install --no-install-recommends qtbase5-dev bsdtar build-essential autoconf libssl-dev gcc-multilib g++-multilib lzip rpm python libcurl3 git git-lfs ssh unzip \
+  apt-get -qq install --no-install-recommends qtbase5-dev bsdtar build-essential autoconf libssl-dev gcc-multilib g++-multilib lzip rpm python libcurl4 git git-lfs ssh unzip tcl \
   libsecret-1-dev libgnome-keyring-dev \
   libopenjp2-tools \
-  # Used by Seshat
+  # Used by seshat (when not SQLCIPHER_STATIC) \
   libsqlcipher-dev && \
   # git-lfs
   git lfs install && \
@@ -30,7 +31,7 @@ ENV LC_ALL C.UTF-8
 
 ENV DEBUG_COLORS true
 ENV FORCE_COLOR true
-ENV NODE_VERSION 12.16.1
+ENV NODE_VERSION 14.17.0
 
 # this package is used for snapcraft and we should not clear apt list - to avoid apt-get update during snap build
 RUN curl -L https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz | tar xz -C /usr/local --strip-components=1 && \

docs/native-node-modules.md

@@ -0,0 +1,149 @@
+# Native Node Modules
+
+For some features, the desktop version of Element can make use of native Node
+modules. These allow Element to integrate with the desktop in ways that a browser
+cannot.
+
+While native modules enable powerful new features, they must be complied for
+each operating system. For official Element releases, we will always build these
+modules from source to ensure we can trust the compiled output. In the future,
+we may offer a pre-compiled path for those who want to use these features in a
+custom build of Element without installing the various build tools required.
+
+The process is automated by [vector-im/element-builder](https://github.com/vector-im/element-builder)
+when releasing.
+
+## Building
+
+Install the pre-requisites for your system:
+
+* [Windows pre-requisites](https://github.com/vector-im/element-desktop/blob/develop/docs/windows-requirements.md)
+* Linux: TODO
+* OS X: TODO
+
+Then optionally, [add seshat and dependencies to support search in E2E rooms](#adding-seshat-for-search-in-e2e-encrypted-rooms).
+
+Then, to build for an architecture selected automatically based on your system (recommended), run:
+```
+yarn run build:native
+```
+
+If you need to build for a specific architecture, see [here](#compiling-for-specific-architectures).
+
+## Adding Seshat for search in E2E encrypted rooms
+
+Seshat is a native Node module that adds support for local event indexing and
+full text search in E2E encrypted rooms.
+
+Since Seshat is written in Rust, the Rust compiler and related tools need to be
+installed before installing Seshat itself. To install Rust please consult the
+official Rust [documentation](https://www.rust-lang.org/tools/install).
+
+Seshat also depends on the SQLCipher library to store its data in encrypted form
+on disk. You'll need to install it via your OS package manager.
+
+After installing the Rust compiler and SQLCipher, Seshat support can be added
+using yarn at the root of this project:
+
+    yarn add matrix-seshat
+
+You will have to rebuild the native libraries against electron's version
+of node rather than your system node, using the `electron-build-env` tool.
+This is also needed to when pulling in changes to Seshat using `yarn link`.
+
+    yarn add electron-build-env
+
+Recompiling Seshat itself can be done like so:
+
+    yarn run electron-build-env -- --electron 6.1.1 -- neon build matrix-seshat --release
+
+Please make sure to include all the `--` as well as the `--release` command line
+switch at the end. Modify your electron version accordingly depending on the
+version that is installed on your system.
+
+After this is done the Electron version of Element can be run from the main folder
+as usual using:
+
+    yarn start
+
+### Statically linking libsqlcipher
+
+On Windows & macOS we always statically link libsqlcipher for it is not generally available.
+On Linux by default we will use a system package, on debian & ubuntu this is `libsqlcipher0`,
+but this is problematic for some other packages. 
+By including `SQLCIPHER_STATIC=1` in the build environment, the build scripts will statically link sqlcipher,
+note that this will want a `libcrypto1.1` shared library available in the system.
+
+More info can be found at https://github.com/matrix-org/seshat/issues/102
+and https://github.com/vector-im/element-web/issues/20926.
+
+## Compiling for specific architectures
+
+### macOS
+
+On macOS, you can build universal native modules too:
+```
+yarn run build:native:universal
+```
+
+...or you can build for a specific architecture:
+```
+yarn run build:native --target x86_64-apple-darwin
+```
+or
+```
+yarn run build:native --target aarch64-apple-darwin
+```
+
+You'll then need to create a built bundle with the same architecture.
+To bundle a universal build for macOS, run:
+
+```
+yarn run build:universal
+```
+
+### Windows
+
+If you're on Windows, you can choose to build specifically for 32 or 64 bit:
+```
+yarn run build:32
+```
+or
+```
+yarn run build:64
+```
+
+### Cross compiling
+
+Compiling a module for a particular operating system (Linux/macOS/Windows) needs
+to be done on that operating system. Cross-compiling from a host OS for a different
+target OS may be possible, but we don't support this flow with Element dependencies
+at this time.
+
+### Switching between architectures
+
+The native module build system keeps the different architectures
+separate, so you can keep native modules for several architectures at the same
+time and switch which are active using a `yarn run hak copy` command, passing
+the appropriate architectures. This will error if you haven't yet built those
+architectures. eg:
+
+```
+yarn run build:native --target x86_64-apple-darwin
+# We've now built & linked into place native modules for Intel
+yarn run build:native --target aarch64-apple-darwin
+# We've now built Apple Silicon modules too, and linked them into place as the active ones
+
+yarn run hak copy --target x86_64-apple-darwin
+# We've now switched back to our Intel modules
+yarn run hak copy --target x86_64-apple-darwin --target aarch64-apple-darwin
+# Now our native modules are universal x86_64+aarch64 binaries
+```
+
+The current set of native modules are stored in `.hak/hakModules`,
+so you can use this to check what architecture is currently in place, eg:
+
+```
+$ lipo -info .hak/hakModules/keytar/build/Release/keytar.node 
+Architectures in the fat file: .hak/hakModules/keytar/build/Release/keytar.node are: x86_64 arm64 
+```

docs/windows-requirements.md

@@ -0,0 +1,35 @@
+# Windows
+
+## Requirements to build native modules
+
+If you want to build native modules, make sure that the following tools are installed on your system.
+
+- [Git for Windows](https://git-scm.com/download/win)
+- [Node 14](https://nodejs.org)
+- [Python 3](https://www.python.org/downloads/) (if you type 'python' into command prompt it will offer to install it from the windows store)
+- [Strawberry Perl](https://strawberryperl.com/)
+- [Rustup](https://rustup.rs/)
+- [NASM](https://www.nasm.us/)
+- [Build Tools for Visual Studio 2019](https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2019) with the following configuration:
+  - On the Workloads tab:
+    - Desktop & Mobile -> C++ build tools
+  - On the Individual components tab:
+    - MSVC VS 2019 C++ build tools
+    - Windows 10 SDK (latest version available)
+    - C++ CMake tools for Windows
+
+Once installed make sure all those utilities are accessible in your `PATH`.
+
+If you want to be able to build x86 targets from an x64 host install the right toolchain:
+```cmd
+rustup toolchain install stable-i686-pc-windows-msvc
+rustup target add i686-pc-windows-msvc
+```
+
+In order to load all the C++ utilities installed by Visual Studio you can run the following in a terminal window.
+
+```
+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" amd64
+```
+
+You can replace `amd64` with `x86` depending on your CPU architecture.

element.io/New_Vector_Ltd.pem

@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+MIIF8DCCBNigAwIBAgIRAIZSd8hNVs3w8AhJIsQSoYYwDQYJKoZIhvcNAQELBQAw
+gZExCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTcwNQYD
+VQQDEy5DT01PRE8gUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5n
+IENBMB4XDTIwMDczMDAwMDAwMFoXDTIzMDczMDIzNTk1OVowgfMxETAPBgNVBAUT
+CDEwODczNjYxMRMwEQYLKwYBBAGCNzwCAQMTAkdCMR0wGwYDVQQPExRQcml2YXRl
+IE9yZ2FuaXphdGlvbjELMAkGA1UEBhMCR0IxDzANBgNVBBEMBlc0IDFRVTEYMBYG
+A1UECAwPTG9uZG9uLCBDaXR5IG9mMQ8wDQYDVQQHDAZMb25kb24xJzAlBgNVBAkM
+HjE0IFR1cm5oYW0gR3JlZW4sIFRlcnJhY2UgTWV3czEbMBkGA1UECgwSTmV3IFZl
+Y3RvciBMaW1pdGVkMRswGQYDVQQDDBJOZXcgVmVjdG9yIExpbWl0ZWQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKDnGul2M7oCCN+3veGf7yfakSfMjK
+Kqeylyo0Nj8dUleNQvsRo0OHxIWJlbHDYglxebT109MqgyASr0SoeiqvXOSSFACD
+MYFoyerRGMnXEuomTU0y7+FE3p/hcim8+C5gS+rHr3YaJJuzzXRztjjCBGoY4was
+h9V8kYiyMMK0xi2WftOCBa1yYS32CInHIZVmdhzoK4k4YzSYIp57BWvnIUlDyCYk
+slNfp0SFbDrOGa7kbmy8HRfWPLjNmW5PPIrsf8LlnVRBfmTeUIJtV31w/FuMjeir
+pzYjzooXmpIrj96ecxdc9thP6etCUazvpowjfewu7UNWRUhGPtYn8v8rAgMBAAGj
+ggHdMIIB2TAfBgNVHSMEGDAWgBTfj/MgDOnKpgTYW1g3Kj2rRtyDSTAdBgNVHQ4E
+FgQUB9su4pCQXE5ZWFhB1eo48992LEcwDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB
+/wQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwMwEQYJYIZIAYb4QgEBBAQDAgQQMEkG
+A1UdIARCMEAwNQYMKwYBBAGyMQECAQYBMCUwIwYIKwYBBQUHAgEWF2h0dHBzOi8v
+c2VjdGlnby5jb20vQ1BTMAcGBWeBDAEDMFUGA1UdHwROMEwwSqBIoEaGRGh0dHA6
+Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQUV4dGVuZGVkVmFsaWRhdGlvbkNv
+ZGVTaWduaW5nQ0EuY3JsMIGGBggrBgEFBQcBAQR6MHgwUAYIKwYBBQUHMAKGRGh0
+dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQUV4dGVuZGVkVmFsaWRhdGlv
+bkNvZGVTaWduaW5nQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21v
+ZG9jYS5jb20wJgYDVR0RBB8wHaAbBggrBgEFBQcIA6APMA0MC0dCLTEwODczNjYx
+MA0GCSqGSIb3DQEBCwUAA4IBAQBZ8/YtqW/+VUoV8knKpdhMR2uTn8AEyVmfmoZA
+Ly5kdCRoKvFm/z4VK4cqF7gsUDxRIgDuMKKbWTtr1FEXuaZkUkOjicNcdYxc0pDn
+nFKBWAv5pN5OmnC9cVqIG7PtvD+8bKVzDdQRjpGMy6PY4rN2PYGfQ7KGgddEDD6m
+oM51jI/OTvCeU0Tyl0bixKEmpUJvbeQM9Ul2Y1o5Enx1Q9uda8xATb0HCMKgJ+GC
+iFHL2DNC3j1xK4QoZEIYgbTscj9rK4OMEov3PT/e1FwQyB5V9xdJ5i1MDBDD9fAf
+OiVgf90SffT7TgWUbA4Z+PtQHq/qNma0+dZWyeq7zYn2IIX3
+-----END CERTIFICATE-----

element.io/README

@@ -0,0 +1,6 @@
+This directory contains the config file for the official element.io distribution
+of Element Desktop.
+
+You probably do not want to build with this config unless you're building the
+official element.io distribution, or you'll find your builds will replace
+themselves with the element.io build.

element.io/nightly/config.json

@@ -0,0 +1,56 @@
+{
+    "update_base_url": "https://packages.element.io/nightly/update/",
+    "default_server_name": "matrix.org",
+    "brand": "Element Nightly",
+    "integrations_ui_url": "https://scalar.vector.im/",
+    "integrations_rest_url": "https://scalar.vector.im/api",
+    "integrations_widgets_urls": [
+        "https://scalar.vector.im/_matrix/integrations/v1",
+        "https://scalar.vector.im/api",
+        "https://scalar-staging.vector.im/_matrix/integrations/v1",
+        "https://scalar-staging.vector.im/api",
+        "https://scalar-staging.riot.im/scalar/api"
+    ],
+    "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
+    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
+    "uisi_autorageshake_app": "element-auto-uisi",
+    "showLabsSettings": true,
+    "roomDirectory": {
+        "servers": [
+            "matrix.org",
+            "gitter.im",
+            "libera.chat"
+        ]
+    },
+    "enable_presence_by_hs_url": {
+        "https://matrix.org": false,
+        "https://matrix-client.matrix.org": false
+    },
+    "terms_and_conditions_links": [
+        {
+            "url": "https://element.io/privacy",
+            "text": "Privacy Policy"
+        },
+        {
+            "url": "https://element.io/cookie-policy",
+            "text": "Cookie Policy"
+        }
+    ],
+    "sentry": {
+        "dsn": "https://029a0eb289f942508ae0fb17935bd8c5@sentry.matrix.org/6",
+        "environment": "nightly"
+    },
+    "posthog": {
+        "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
+        "apiHost": "https://posthog.element.io"
+    },
+    "privacy_policy_url": "https://element.io/cookie-policy",
+    "features": {
+        "feature_spotlight": true,
+        "feature_video_rooms": true
+    },
+    "element_call": {
+        "url": "https://element-call.netlify.app"
+    },
+    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
+}

element.io/nightly/control.template

@@ -0,0 +1,12 @@
+Package: element-nightly
+License: Apache-2.0
+Vendor: support@element.io
+Architecture: amd64
+Maintainer: support@element.io
+Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0
+Recommends: libappindicator3-1, libsqlcipher0
+Section: net
+Priority: extra
+Homepage: https://element.io/
+Description:
+ riot.im A feature-rich client for Matrix.org (nightly unstable build).

element.io/nightly/riot-nightly_2020071502_all/DEBIAN/control

@@ -0,0 +1,9 @@
+Package: riot-nightly
+Version: 2020071502
+Depends: element-nightly
+Maintainer: packages@element.io
+Architecture: all
+Priority: optional
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.

element.io/release/config.json

@@ -0,0 +1,45 @@
+{
+    "update_base_url": "https://packages.element.io/desktop/update/",
+    "default_server_name": "matrix.org",
+    "brand": "Element",
+    "integrations_ui_url": "https://scalar.vector.im/",
+    "integrations_rest_url": "https://scalar.vector.im/api",
+    "integrations_widgets_urls": [
+        "https://scalar.vector.im/_matrix/integrations/v1",
+        "https://scalar.vector.im/api",
+        "https://scalar-staging.vector.im/_matrix/integrations/v1",
+        "https://scalar-staging.vector.im/api",
+        "https://scalar-staging.riot.im/scalar/api"
+    ],
+    "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
+    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
+    "uisi_autorageshake_app": "element-auto-uisi",
+    "roomDirectory": {
+        "servers": [
+            "matrix.org",
+            "gitter.im",
+            "libera.chat"
+        ]
+    },
+    "showLabsSettings": false,
+    "enable_presence_by_hs_url": {
+        "https://matrix.org": false,
+        "https://matrix-client.matrix.org": false
+    },
+    "terms_and_conditions_links": [
+        {
+            "url": "https://element.io/privacy",
+            "text": "Privacy Policy"
+        },
+        {
+            "url": "https://element.io/cookie-policy",
+            "text": "Cookie Policy"
+        }
+    ],
+    "posthog": {
+        "projectApiKey": "phc_Jzsm6DTm6V2705zeU5dcNvQDlonOR68XvX2sh1sEOHO",
+        "apiHost": "https://posthog.element.io"
+    },
+    "privacy_policy_url": "https://element.io/cookie-policy",
+    "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
+}

element.io/release/control.template

@@ -0,0 +1,14 @@
+Package: element-desktop
+License: Apache-2.0
+Vendor: support@element.io
+Architecture: amd64
+Maintainer: support@element.io
+Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0
+Recommends: libappindicator3-1, libsqlcipher0
+Replaces: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)
+Breaks: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)
+Section: net
+Priority: extra
+Homepage: https://element.io/
+Description:
+  A feature-rich client for Matrix.org

element.io/release/riot-desktop_1.7.0_all/DEBIAN/control

@@ -0,0 +1,9 @@
+Package: riot-desktop
+Version: 1.7.0
+Depends: element-desktop
+Maintainer: packages@element.io
+Architecture: all
+Priority: optional
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.

hak/keytar/build.ts

@@ -0,0 +1,41 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+import path from 'path';
+import childProcess from 'child_process';
+
+import HakEnv from '../../scripts/hak/hakEnv';
+import { DependencyInfo } from '../../scripts/hak/dep';
+
+export default async function buildKeytar(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
+    const env = hakEnv.makeGypEnv();
+
+    console.log("Running yarn with env", env);
+    await new Promise<void>((resolve, reject) => {
+        const proc = childProcess.spawn(
+            path.join(moduleInfo.nodeModuleBinDir, 'node-gyp' + (hakEnv.isWin() ? '.cmd' : '')),
+            ['rebuild'],
+            {
+                cwd: moduleInfo.moduleBuildDir,
+                env,
+                stdio: 'inherit',
+            },
+        );
+        proc.on('exit', (code) => {
+            code ? reject(code) : resolve();
+        });
+    });
+}

hak/keytar/check.ts

@@ -14,37 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const childProcess = require('child_process');
+import childProcess from 'child_process';
 
-module.exports = async function(hakEnv, moduleInfo) {
-    // of course tcl doesn't have a --version
-    if (!hakEnv.isLinux()) {
-        await new Promise((resolve, reject) => {
-            const proc = childProcess.spawn('tclsh', [], {
-                stdio: ['pipe', 'ignore', 'ignore'],
-            });
-            proc.on('exit', (code) => {
-                if (code !== 0) {
-                    reject("Can't find tclsh - have you installed TCL?");
-                } else {
-                    resolve();
-                }
-            });
-            proc.stdin.end();
-        });
-    }
+import HakEnv from '../../scripts/hak/hakEnv';
+import { DependencyInfo } from '../../scripts/hak/dep';
 
+export default async function(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
     const tools = [['python', '--version']]; // node-gyp uses python for reasons beyond comprehension
-    if (hakEnv.isWin()) {
-        tools.push(['perl', '--version']); // for openssl configure
-        tools.push(['patch', '--version']); // to patch sqlcipher Makefile.msc
-        tools.push(['nmake', '/?']);
-    } else {
-        tools.push(['make', '--version']);
-    }
 
     for (const tool of tools) {
-        await new Promise((resolve, reject) => {
+        await new Promise<void>((resolve, reject) => {
             const proc = childProcess.spawn(tool[0], tool.slice(1), {
                 stdio: ['ignore'],
             });
@@ -57,4 +36,4 @@ module.exports = async function(hakEnv, moduleInfo) {
             });
         });
     }
-};
+}

hak/keytar/hak.json

@@ -0,0 +1,10 @@
+{
+    "scripts": {
+        "check": "check.ts",
+        "build": "build.ts"
+    },
+    "copy": "build/Release/keytar.node",
+    "dependencies": {
+        "libsecret": "0.20.3"
+    }
+}

hak/matrix-seshat/build.ts

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020-2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,38 +14,40 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const path = require('path');
-const childProcess = require('child_process');
+import path from 'path';
+import childProcess from 'child_process';
+import mkdirp from 'mkdirp';
+import fsExtra from 'fs-extra';
 
-const mkdirp = require('mkdirp');
-const fsExtra = require('fs-extra');
+import HakEnv from '../../scripts/hak/hakEnv';
+import { DependencyInfo } from '../../scripts/hak/dep';
 
-module.exports = async function(hakEnv, moduleInfo) {
+export default async function(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
     if (hakEnv.isWin()) {
         await buildOpenSslWin(hakEnv, moduleInfo);
         await buildSqlCipherWin(hakEnv, moduleInfo);
-    } else if (hakEnv.isMac()) {
+    } else if (hakEnv.wantsStaticSqlCipherUnix()) {
         await buildSqlCipherUnix(hakEnv, moduleInfo);
     }
     await buildMatrixSeshat(hakEnv, moduleInfo);
-};
+}
 
-async function buildOpenSslWin(hakEnv, moduleInfo) {
+async function buildOpenSslWin(hakEnv: HakEnv, moduleInfo: DependencyInfo) {
     const version = moduleInfo.cfg.dependencies.openssl;
-    const openSslDir = path.join(moduleInfo.moduleDotHakDir, `openssl-${version}`);
+    const openSslDir = path.join(moduleInfo.moduleTargetDotHakDir, `openssl-${version}`);
 
-    const openSslArch = hakEnv.arch === 'x64' ? 'VC-WIN64A' : 'VC-WIN32';
+    const openSslArch = hakEnv.getTargetArch() === 'x64' ? 'VC-WIN64A' : 'VC-WIN32';
 
     console.log("Building openssl in " + openSslDir);
-    await new Promise((resolve, reject) => {
+    await new Promise<void>((resolve, reject) => {
         const proc = childProcess.spawn(
             'perl',
             [
                 'Configure',
                 '--prefix=' + moduleInfo.depPrefix,
-                 // sqlcipher only uses about a tiny part of openssl. We link statically
-                 // so will only pull in the symbols we use, but we may as well turn off
-                 // as much as possible to save on build time.
+                // sqlcipher only uses about a tiny part of openssl. We link statically
+                // so will only pull in the symbols we use, but we may as well turn off
+                // as much as possible to save on build time.
                 'no-afalgeng',
                 'no-capieng',
                 'no-cms',
@@ -103,7 +105,7 @@ async function buildOpenSslWin(hakEnv, moduleInfo) {
         });
     });
 
-    await new Promise((resolve, reject) => {
+    await new Promise<void>((resolve, reject) => {
         const proc = childProcess.spawn(
             'nmake',
             ['build_libs'],
@@ -117,7 +119,7 @@ async function buildOpenSslWin(hakEnv, moduleInfo) {
         });
     });
 
-    await new Promise((resolve, reject) => {
+    await new Promise<void>((resolve, reject) => {
         const proc = childProcess.spawn(
             'nmake',
             ['install_dev'],
@@ -132,14 +134,14 @@ async function buildOpenSslWin(hakEnv, moduleInfo) {
     });
 }
 
-async function buildSqlCipherWin(hakEnv, moduleInfo) {
+async function buildSqlCipherWin(hakEnv: HakEnv, moduleInfo: DependencyInfo) {
     const version = moduleInfo.cfg.dependencies.sqlcipher;
-    const sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}`);
+    const sqlCipherDir = path.join(moduleInfo.moduleTargetDotHakDir, `sqlcipher-${version}`);
     const buildDir = path.join(sqlCipherDir, 'bld');
 
     await mkdirp(buildDir);
 
-    await new Promise((resolve, reject) => {
+    await new Promise<void>((resolve, reject) => {
         const proc = childProcess.spawn(
             'nmake',
             ['/f', path.join('..', 'Makefile.msc'), 'libsqlite3.lib', 'TOP=..'],
@@ -169,25 +171,61 @@ async function buildSqlCipherWin(hakEnv, moduleInfo) {
     );
 }
 
-async function buildSqlCipherUnix(hakEnv, moduleInfo) {
+async function buildSqlCipherUnix(hakEnv: HakEnv, moduleInfo: DependencyInfo) {
     const version = moduleInfo.cfg.dependencies.sqlcipher;
-    const sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}`);
+    const sqlCipherDir = path.join(moduleInfo.moduleTargetDotHakDir, `sqlcipher-${version}`);
 
     const args = [
         '--prefix=' + moduleInfo.depPrefix + '',
         '--enable-tempstore=yes',
         '--enable-shared=no',
+        '--enable-tcl=no',
     ];
 
     if (hakEnv.isMac()) {
         args.push('--with-crypto-lib=commoncrypto');
     }
-    args.push('CFLAGS=-DSQLITE_HAS_CODEC');
-    if (hakEnv.isMac()) {
-        args.push('LDFLAGS=-framework Security -framework Foundation');
+
+    if (hakEnv.wantsStaticSqlCipherUnix()) {
+        args.push('--enable-tcl=no');
+
+        if (hakEnv.isLinux()) {
+            args.push('--with-pic=yes');
+        }
     }
 
-    await new Promise((resolve, reject) => {
+    if (!hakEnv.isHost()) {
+        // In the nonsense world of `configure`, it is assumed you are building
+        // a compiler like `gcc`, so the `host` option actually means the target
+        // the build output runs on.
+        args.push(`--host=${hakEnv.getTargetId()}`);
+    }
+
+    const cflags = [
+        '-DSQLITE_HAS_CODEC',
+    ];
+
+    if (!hakEnv.isHost()) {
+        // `clang` uses more logical option naming.
+        cflags.push(`--target=${hakEnv.getTargetId()}`);
+    }
+
+    if (cflags.length) {
+        args.push(`CFLAGS=${cflags.join(' ')}`);
+    }
+
+    const ldflags: string[] = [];
+
+    if (hakEnv.isMac()) {
+        ldflags.push('-framework Security');
+        ldflags.push('-framework Foundation');
+    }
+
+    if (ldflags.length) {
+        args.push(`LDFLAGS=${ldflags.join(' ')}`);
+    }
+
+    await new Promise<void>((resolve, reject) => {
         const proc = childProcess.spawn(
             path.join(sqlCipherDir, 'configure'),
             args,
@@ -201,7 +239,7 @@ async function buildSqlCipherUnix(hakEnv, moduleInfo) {
         });
     });
 
-    await new Promise((resolve, reject) => {
+    await new Promise<void>((resolve, reject) => {
         const proc = childProcess.spawn(
             'make',
             [],
@@ -215,7 +253,7 @@ async function buildSqlCipherUnix(hakEnv, moduleInfo) {
         });
     });
 
-    await new Promise((resolve, reject) => {
+    await new Promise<void>((resolve, reject) => {
         const proc = childProcess.spawn(
             'make',
             ['install'],
@@ -230,10 +268,13 @@ async function buildSqlCipherUnix(hakEnv, moduleInfo) {
     });
 }
 
-async function buildMatrixSeshat(hakEnv, moduleInfo) {
+async function buildMatrixSeshat(hakEnv: HakEnv, moduleInfo: DependencyInfo) {
+    // seshat now uses n-api so we shouldn't need to specify a node version to
+    // build against, but it does seems to still need something in here, so leaving
+    // it for now: we should confirm how much of this it still actually needs.
     const env = hakEnv.makeGypEnv();
 
-    if (!hakEnv.isLinux()) {
+    if (!hakEnv.isLinux() || hakEnv.wantsStaticSqlCipherUnix()) {
         Object.assign(env, {
             SQLCIPHER_STATIC: 1,
             SQLCIPHER_LIB_DIR: path.join(moduleInfo.depPrefix, 'lib'),
@@ -241,6 +282,25 @@ async function buildMatrixSeshat(hakEnv, moduleInfo) {
         });
     }
 
+    if (hakEnv.isLinux() && hakEnv.wantsStaticSqlCipherUnix()) {
+        // Ensure Element uses the statically-linked seshat build, and prevent other applications
+        // from attempting to use this one. Detailed explanation:
+        //
+        // RUSTFLAGS
+        //     An environment variable containing a list of arguments to pass to rustc.
+        // -Clink-arg=VALUE
+        //     A rustc argument to pass a single argument to the linker.
+        // -Wl,
+        //     gcc syntax to pass an argument (from gcc) to the linker (ld).
+        // -Bsymbolic:
+        //     Prefer local/statically linked symbols over those in the environment.
+        //     Prevent overriding native libraries by LD_PRELOAD etc.
+        // --exclude-libs ALL
+        //     Prevent symbols from being exported by any archive libraries.
+        //     Reduces output filesize and prevents being dynamically linked against.
+        env.RUSTFLAGS = '-Clink-arg=-Wl,-Bsymbolic -Clink-arg=-Wl,--exclude-libs,ALL';
+    }
+
     if (hakEnv.isWin()) {
         env.RUSTFLAGS = '-Ctarget-feature=+crt-static -Clink-args=libcrypto.lib';
         // Note that in general, you can specify targets in Rust without having to have
@@ -248,11 +308,15 @@ async function buildMatrixSeshat(hakEnv, moduleInfo) {
         // the build scripts since they run on the host, but vcvarsall.bat sets the c
         // compiler in the path to be the one for the target, so we just use the matching
         // toolchain for the target architecture which makes everything happy.
-        env.RUSTUP_TOOLCHAIN = hakEnv.arch == 'x64' ? 'stable-x86_64-pc-windows-msvc' : 'stable-i686-pc-windows-msvc';
+        env.RUSTUP_TOOLCHAIN = `stable-${hakEnv.getTargetId()}`;
+    }
+
+    if (!hakEnv.isHost()) {
+        env.CARGO_BUILD_TARGET = hakEnv.getTargetId();
     }
 
     console.log("Running neon with env", env);
-    await new Promise((resolve, reject) => {
+    await new Promise<void>((resolve, reject) => {
         const proc = childProcess.spawn(
             path.join(moduleInfo.nodeModuleBinDir, 'neon' + (hakEnv.isWin() ? '.cmd' : '')),
             ['build', '--release'],

hak/matrix-seshat/check.ts

@@ -0,0 +1,86 @@
+/*
+Copyright 2020-2021 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+import childProcess from 'child_process';
+import fsProm from 'fs/promises';
+
+import HakEnv from '../../scripts/hak/hakEnv';
+import { DependencyInfo } from '../../scripts/hak/dep';
+
+export default async function(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
+    if (hakEnv.wantsStaticSqlCipher()) {
+        // of course tcl doesn't have a --version
+        await new Promise<void>((resolve, reject) => {
+            const proc = childProcess.spawn('tclsh', [], {
+                stdio: ['pipe', 'ignore', 'ignore'],
+            });
+            proc.on('exit', (code) => {
+                if (code !== 0) {
+                    reject("Can't find tclsh - have you installed TCL?");
+                } else {
+                    resolve();
+                }
+            });
+            proc.stdin.end();
+        });
+    }
+
+    const tools = [
+        ['rustc', '--version'],
+        ['python', '--version'], // node-gyp uses python for reasons beyond comprehension
+    ];
+    if (hakEnv.isWin()) {
+        tools.push(['perl', '--version']); // for openssl configure
+        tools.push(['nasm', '-v']); // for openssl building
+        tools.push(['patch', '--version']); // to patch sqlcipher Makefile.msc
+        tools.push(['nmake', '/?']);
+    } else {
+        tools.push(['make', '--version']);
+    }
+
+    for (const tool of tools) {
+        await new Promise<void>((resolve, reject) => {
+            const proc = childProcess.spawn(tool[0], tool.slice(1), {
+                stdio: ['ignore'],
+            });
+            proc.on('exit', (code) => {
+                if (code !== 0) {
+                    reject("Can't find " + tool);
+                } else {
+                    resolve();
+                }
+            });
+        });
+    }
+
+    // Ensure Rust target exists (nb. we avoid depending on rustup)
+    await new Promise((resolve, reject) => {
+        const rustc = childProcess.execFile('rustc', [
+            '--target', hakEnv.getTargetId(), '-o', 'tmp', '-',
+        ], (err, out) => {
+            if (err) {
+                reject(
+                    "rustc can't build for target " + hakEnv.getTargetId() +
+                    ": ensure target is installed via `rustup target add " + hakEnv.getTargetId() + "` " +
+                    "or your package manager if not using `rustup`",
+                );
+            }
+            fsProm.unlink('tmp').then(resolve);
+        });
+        rustc.stdin.write('fn main() {}');
+        rustc.stdin.end();
+    });
+}

hak/matrix-seshat/fetchDeps.ts

@@ -14,29 +14,31 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const path = require('path');
-const childProcess = require('child_process');
+import path from 'path';
+import childProcess from 'child_process';
+import fs from 'fs';
+import fsProm from 'fs/promises';
+import needle from 'needle';
+import tar from 'tar';
 
-const fs = require('fs');
-const fsProm = require('fs').promises;
-const needle = require('needle');
-const tar = require('tar');
+import HakEnv from '../../scripts/hak/hakEnv';
+import { DependencyInfo } from '../../scripts/hak/dep';
 
-module.exports = async function(hakEnv, moduleInfo) {
-    if (!hakEnv.isLinux()) {
+export default async function(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
+    if (hakEnv.wantsStaticSqlCipher()) {
         await getSqlCipher(hakEnv, moduleInfo);
     }
 
     if (hakEnv.isWin()) {
         await getOpenSsl(hakEnv, moduleInfo);
     }
-};
+}
 
-async function getSqlCipher(hakEnv, moduleInfo) {
+async function getSqlCipher(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
     const version = moduleInfo.cfg.dependencies.sqlcipher;
-    const sqlCipherDir = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}`);
+    const sqlCipherDir = path.join(moduleInfo.moduleTargetDotHakDir, `sqlcipher-${version}`);
 
-    let haveSqlcipher;
+    let haveSqlcipher: boolean;
     try {
         await fsProm.stat(sqlCipherDir);
         haveSqlcipher = true;
@@ -47,7 +49,7 @@ async function getSqlCipher(hakEnv, moduleInfo) {
     if (haveSqlcipher) return;
 
     const sqlCipherTarball = path.join(moduleInfo.moduleDotHakDir, `sqlcipher-${version}.tar.gz`);
-    let haveSqlcipherTar;
+    let haveSqlcipherTar: boolean;
     try {
         await fsProm.stat(sqlCipherTarball);
         haveSqlcipherTar = true;
@@ -62,9 +64,10 @@ async function getSqlCipher(hakEnv, moduleInfo) {
         await bob;
     }
 
+    // Extract the tarball to per-target directories, then we avoid cross-contaiminating archs
     await tar.x({
         file: sqlCipherTarball,
-        cwd: moduleInfo.moduleDotHakDir,
+        cwd: moduleInfo.moduleTargetDotHakDir,
     });
 
     if (hakEnv.isWin()) {
@@ -73,8 +76,8 @@ async function getSqlCipher(hakEnv, moduleInfo) {
         // set it to 2 (default to memory).
         const patchFile = path.join(moduleInfo.moduleHakDir, `sqlcipher-${version}-win.patch`);
 
-        await new Promise((resolve, reject) => {
-        const readStream = fs.createReadStream(patchFile);
+        await new Promise<void>((resolve, reject) => {
+            const readStream = fs.createReadStream(patchFile);
 
             const proc = childProcess.spawn(
                 'patch',
@@ -92,11 +95,11 @@ async function getSqlCipher(hakEnv, moduleInfo) {
     }
 }
 
-async function getOpenSsl(hakEnv, moduleInfo) {
+async function getOpenSsl(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
     const version = moduleInfo.cfg.dependencies.openssl;
-    const openSslDir = path.join(moduleInfo.moduleDotHakDir, `openssl-${version}`);
+    const openSslDir = path.join(moduleInfo.moduleTargetDotHakDir, `openssl-${version}`);
 
-    let haveOpenSsl;
+    let haveOpenSsl: boolean;
     try {
         await fsProm.stat(openSslDir);
         haveOpenSsl = true;
@@ -107,7 +110,7 @@ async function getOpenSsl(hakEnv, moduleInfo) {
     if (haveOpenSsl) return;
 
     const openSslTarball = path.join(moduleInfo.moduleDotHakDir, `openssl-${version}.tar.gz`);
-    let haveOpenSslTar;
+    let haveOpenSslTar: boolean;
     try {
         await fsProm.stat(openSslTarball);
         haveOpenSslTar = true;
@@ -121,9 +124,9 @@ async function getOpenSsl(hakEnv, moduleInfo) {
         });
     }
 
-    console.log("extracting " + openSslTarball + " in " + moduleInfo.moduleDotHakDir);
+    console.log("extracting " + openSslTarball + " in " + moduleInfo.moduleTargetDotHakDir);
     await tar.x({
         file: openSslTarball,
-        cwd: moduleInfo.moduleDotHakDir,
+        cwd: moduleInfo.moduleTargetDotHakDir,
     });
 }

hak/matrix-seshat/hak.json

@@ -1,8 +1,8 @@
 {
     "scripts": {
-        "check": "check.js",
-        "fetchDeps": "fetchDeps.js",
-        "build": "build.js"
+        "check": "check.ts",
+        "fetchDeps": "fetchDeps.ts",
+        "build": "build.ts"
     },
     "prune": "native",
     "copy": "native/index.node",

hak/tsconfig.json

@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "target": "es2016",
+    "sourceMap": false,
+    "lib": [
+      "es2019",
+    ]
+  },
+  "include": [
+    "./**/*.ts"
+  ],
+  "ts-node": {
+    "transpileOnly": true
+  }
+}

package.json

@@ -1,74 +1,117 @@
 {
-  "name": "riot-desktop",
-  "productName": "Riot",
-  "main": "src/electron-main.js",
-  "version": "1.6.1",
+  "name": "element-desktop",
+  "productName": "Element",
+  "main": "lib/electron-main.js",
+  "version": "1.11.10",
   "description": "A feature-rich client for Matrix.org",
-  "author": "New Vector Ltd.",
+  "author": "Element",
   "repository": {
     "type": "git",
-    "url": "https://github.com/vector-im/riot-desktop"
+    "url": "https://github.com/vector-im/element-desktop"
   },
   "license": "Apache-2.0",
   "files": [],
   "scripts": {
+    "i18n": "matrix-gen-i18n",
+    "prunei18n": "matrix-prune-i18n",
+    "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && matrix-gen-i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
     "mkdirs": "mkdirp packages deploys",
     "fetch": "yarn run mkdirs && node scripts/fetch-package.js",
-    "start": "electron .",
-    "lint": "eslint src/ scripts/ hak/",
+    "asar-webapp": "asar p webapp webapp.asar",
+    "start": "yarn run build:ts && yarn run build:res && electron .",
+    "lint": "yarn lint:types && yarn lint:js",
+    "lint:js": "eslint --max-warnings 0 src scripts hak",
+    "lint:js-fix": "eslint --fix src scripts hak",
+    "lint:types": "tsc --noEmit && tsc -p scripts/hak/tsconfig.json --noEmit && tsc -p hak/tsconfig.json --noEmit",
     "build:native": "yarn run hak",
-    "build32": "electron-builder --ia32",
-    "build64": "electron-builder --x64",
-    "build": "electron-builder",
-    "docker:setup": "docker build -t riot-desktop-dockerbuild dockerbuild",
+    "build:native:universal": "yarn run hak --target x86_64-apple-darwin fetchandbuild && yarn run hak --target aarch64-apple-darwin fetchandbuild && yarn run hak --target x86_64-apple-darwin --target aarch64-apple-darwin copyandlink",
+    "build:32": "yarn run build:ts && yarn run build:res && electron-builder --ia32",
+    "build:64": "yarn run build:ts && yarn run build:res && electron-builder --x64",
+    "build:universal": "yarn run build:ts && yarn run build:res && electron-builder --universal",
+    "build": "yarn run build:ts && yarn run build:res && electron-builder",
+    "build:ts": "tsc",
+    "build:res": "node scripts/copy-res.js",
+    "docker:setup": "docker build -t element-desktop-dockerbuild dockerbuild",
     "docker:build:native": "scripts/in-docker.sh yarn run hak",
     "docker:build": "scripts/in-docker.sh yarn run build",
     "docker:install": "scripts/in-docker.sh yarn install",
     "debrepo": "scripts/mkrepo.sh",
-    "clean": "rimraf webapp.asar dist packages deploys",
-    "hak": "node scripts/hak/index.js"
+    "clean": "rimraf webapp.asar dist packages deploys lib",
+    "hak": "ts-node scripts/hak/index.ts",
+    "test": "jest"
   },
   "dependencies": {
-    "auto-launch": "^5.0.1",
-    "electron-store": "^2.0.0",
-    "electron-window-state": "^4.1.0",
-    "minimist": "^1.2.3",
-    "png-to-ico": "^1.0.2"
+    "auto-launch": "^5.0.5",
+    "counterpart": "^0.18.6",
+    "electron-store": "^8.0.2",
+    "electron-window-state": "^5.0.3",
+    "minimist": "^1.2.6",
+    "png-to-ico": "^2.1.1",
+    "request": "^2.88.2"
   },
   "devDependencies": {
+    "@babel/core": "^7.18.10",
+    "@babel/preset-env": "^7.18.10",
+    "@babel/preset-typescript": "^7.18.6",
+    "@types/auto-launch": "^5.0.1",
+    "@types/counterpart": "^0.18.1",
+    "@types/detect-libc": "^1.0.0",
+    "@types/jest": "^28",
+    "@types/minimist": "^1.2.1",
+    "@types/mkdirp": "^1.0.2",
+    "@types/pacote": "^11.1.1",
+    "@types/rimraf": "^3.0.2",
+    "@typescript-eslint/eslint-plugin": "^5.6.0",
+    "@typescript-eslint/parser": "^5.6.0",
+    "allchange": "^1.0.6",
+    "app-builder-lib": "^22.14.10",
     "asar": "^2.0.1",
-    "electron-builder": "^22.3.2",
-    "electron-builder-squirrel-windows": "^22.3.2",
-    "electron-devtools-installer": "^2.2.4",
-    "electron-notarize": "^0.2.0",
-    "eslint": "^5.8.0",
-    "eslint-config-google": "^0.7.1",
-    "eslint-plugin-babel": "^4.1.2",
+    "babel-jest": "^28.1.3",
+    "chokidar": "^3.5.2",
+    "detect-libc": "^1.0.3",
+    "electron": "^20",
+    "electron-builder": "22.11.4",
+    "electron-builder-squirrel-windows": "22.11.4",
+    "electron-devtools-installer": "^3.1.1",
+    "electron-notarize": "^1.0.0",
+    "eslint": "7.18.0",
+    "eslint-config-google": "^0.14.0",
+    "eslint-plugin-import": "^2.25.4",
+    "eslint-plugin-matrix-org": "^0.4.0",
+    "expect-playwright": "^0.8.0",
     "find-npm-prefix": "^1.0.2",
     "fs-extra": "^8.1.0",
     "glob": "^7.1.6",
-    "matrix-js-sdk": "6.1.0",
+    "jest": "^28",
+    "matrix-web-i18n": "^1.3.0",
     "mkdirp": "^1.0.3",
-    "needle": "^2.3.2",
-    "node-pre-gyp": "^0.14.0",
-    "npm": "^6.13.7",
+    "needle": "^2.5.0",
+    "node-pre-gyp": "^0.15.0",
+    "pacote": "^11.3.5",
+    "playwright": "^1.25.0",
     "rimraf": "^3.0.2",
-    "semver": "^7.1.3",
-    "tar": "^6.0.1"
+    "tar": "^6.1.2",
+    "ts-jest": "^28.0.8",
+    "ts-node": "^10.4.0",
+    "typescript": "4.5.5"
   },
   "hakDependencies": {
-    "matrix-seshat": "^1.3.3"
+    "matrix-seshat": "^2.3.3",
+    "keytar": "^7.9.0"
+  },
+  "resolutions": {
+    "@types/node": "16.11.38"
   },
   "build": {
     "appId": "im.riot.app",
-    "electronVersion": "8.0.3",
+    "asarUnpack": "**/*.node",
     "files": [
       "package.json",
       {
         "from": ".hak/hakModules",
         "to": "node_modules"
       },
-      "src/**"
+      "lib/**"
     ],
     "extraResources": [
       {
@@ -80,9 +123,9 @@
     "linux": {
       "target": "deb",
       "category": "Network;InstantMessaging;Chat",
-      "maintainer": "support@riot.im",
+      "maintainer": "support@element.io",
       "desktop": {
-        "StartupWMClass": "riot"
+        "StartupWMClass": "element"
       }
     },
     "mac": {
@@ -90,22 +133,36 @@
       "darkModeSupport": true
     },
     "win": {
-      "target": {
-        "target": "squirrel"
-      },
+      "target": [
+        "squirrel",
+        "msi"
+      ],
       "sign": "scripts/electron_winSign"
     },
+    "msi": {
+      "perMachine": true
+    },
     "directories": {
       "output": "dist"
     },
+    "afterPack": "scripts/electron_afterPack",
     "afterSign": "scripts/electron_afterSign",
     "protocols": [
       {
-        "name": "riot",
+        "name": "element",
         "schemes": [
-          "riot"
+          "element"
         ]
       }
     ]
+  },
+  "jest": {
+    "testEnvironment": "node",
+    "testMatch": [
+      "<rootDir>/test/**/*-test.[jt]s?(x)"
+    ],
+    "setupFilesAfterEnv": [
+      "expect-playwright"
+    ]
   }
 }

release.sh

@@ -1,60 +1,9 @@
 #!/bin/bash
 #
-# Script to perform a release of riot-desktop.
-#
-# Requires githib-changelog-generator; to install, do 
-#   pip install git+https://github.com/matrix-org/github-changelog-generator.git
+# Script to perform a release of element-desktop.
 
 set -e
 
-cd `dirname $0`
+cd "$(dirname "$0")"
 
-for i in matrix-js-sdk
-do
-    echo "Checking version of $i..."
-    depver=`cat package.json | jq -r .devDependencies[\"$i\"]`
-    latestver=`yarn info -s $i dist-tags.next`
-    if [ "$depver" != "$latestver" ]
-    then
-        echo "The latest version of $i is $latestver but package.json depends on $depver."
-        echo -n "Type 'u' to auto-upgrade, 'c' to continue anyway, or 'a' to abort:"
-        read resp
-        if [ "$resp" != "u" ] && [ "$resp" != "c" ]
-        then
-            echo "Aborting."
-            exit 1
-        fi
-        if [ "$resp" == "u" ]
-        then
-            echo "Upgrading $i to $latestver..."
-            yarn add -ED $i@$latestver
-            git add -u
-            # The `-e` flag opens the editor and gives you a chance to check
-            # the upgrade for correctness.
-            git commit -m "Upgrade $i to $latestver" -e
-        fi
-    fi
-done
-
-./node_modules/matrix-js-sdk/release.sh -n -z "$@"
-
-release="${1#v}"
-prerelease=0
-# We check if this build is a prerelease by looking to
-# see if the version has a hyphen in it. Crude,
-# but semver doesn't support postreleases so anything
-# with a hyphen is a prerelease.
-echo $release | grep -q '-' && prerelease=1
-
-if [ $prerelease -eq 0 ]
-then
-    # For a release, reset SDK deps back to the `develop` branch.
-    for i in matrix-js-sdk
-    do
-        echo "Resetting $i to develop branch..."
-        yarn add -D github:matrix-org/$i#develop
-        git add -u
-        git commit -m "Reset $i back to develop branch"
-    done
-    git push origin develop
-fi
+./node_modules/matrix-js-sdk/release.sh "$@"

release_config.yaml

@@ -1 +1,7 @@
 signing_id: releases@riot.im
+subprojects:
+    element-web:
+        includeByDefault: true
+        # Because element-web is not in our dependencies, but the versions
+        # follow those of this project (well, vice-versa really)
+        mirrorVersion: true

riot.im/New_Vector_Ltd.pem

@@ -1,34 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIF0jCCBLqgAwIBAgIRAISYBqZi3VvCUeSfHXF+cbwwDQYJKoZIhvcNAQELBQAw
-gZExCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTcwNQYD
-VQQDEy5DT01PRE8gUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5n
-IENBMB4XDTE3MDgyMzAwMDAwMFoXDTIwMDgyMjIzNTk1OVowgdgxETAPBgNVBAUT
-CDEwODczNjYxMRMwEQYLKwYBBAGCNzwCAQMTAkdCMR0wGwYDVQQPExRQcml2YXRl
-IE9yZ2FuaXphdGlvbjELMAkGA1UEBhMCR0IxETAPBgNVBBEMCFdDMVIgNEFHMQ8w
-DQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEbMBkGA1UECQwSMjYgUmVk
-IExpb24gU3F1YXJlMRcwFQYDVQQKDA5OZXcgVmVjdG9yIEx0ZDEXMBUGA1UEAwwO
-TmV3IFZlY3RvciBMdGQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7
-X0HP3oM/SVr6PboD03ndtYTONZDcJ/GJ3EyYi6UNrcbKjuDHwPktx9hjAhNjcVkG
-lmuTEPluPj9DbvjaTrers0cQsAS1vJ0RHjLfA93Flg1ys9Q6OThUMw77FtFPtiJU
-z5cSYzfFAhn/4dv7BcgGptn+Mv/8CaTu+RUZJUgoSlRWcT1TREmxkzWotbblqsHO
-zjDmUg20tL5/qpt6BSWsNespf5udKQFXMtqkczBcLvBLmql0vurVcQy8BibB+Q89
-QKwRzwLgaIa7O8WEssFcW8uJe9s0SNtUy8ehbuoSxpA/DbHFwsiDbNA78vp7HrqM
-qY6t6OIgLtDYBFCfe/btAgMBAAGjggHaMIIB1jAfBgNVHSMEGDAWgBTfj/MgDOnK
-pgTYW1g3Kj2rRtyDSTAdBgNVHQ4EFgQUH+mDOdRkF3bYDxCWEaGB4lxiCxcwDgYD
-VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwMw
-EQYJYIZIAYb4QgEBBAQDAgQQMEYGA1UdIAQ/MD0wOwYMKwYBBAGyMQECAQYBMCsw
-KQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMFUGA1Ud
-HwROMEwwSqBIoEaGRGh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQUV4
-dGVuZGVkVmFsaWRhdGlvbkNvZGVTaWduaW5nQ0EuY3JsMIGGBggrBgEFBQcBAQR6
-MHgwUAYIKwYBBQUHMAKGRGh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JT
-QUV4dGVuZGVkVmFsaWRhdGlvbkNvZGVTaWduaW5nQ0EuY3J0MCQGCCsGAQUFBzAB
-hhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wJgYDVR0RBB8wHaAbBggrBgEFBQcI
-A6APMA0MC0dCLTEwODczNjYxMA0GCSqGSIb3DQEBCwUAA4IBAQBJ2aH4aixh0aiz
-4WKlK+LMVLHpQ2POE3FZYNpAW7o1q2YDGEADXdGrygPE9NCGNBXKo0CAemCYNWfX
-Ov/jdoiMfeqW3vrZ66oEy8OqbvJSwK1xmomWuYw3wYPWcPVG+YbWYD2CGdQu8jTz
-fzAJCpvAuY3Wji3fQjiecAC7JCSB4fBHa0ALJOmiSqKQUUpkXs5kW7O0lPBnHzNF
-2tQGltXMSIrq1QfFtcreMyKlwDOxPIh360dv5aHhaeSRDRKxq7uq5ikQF2gjKx4k
-ieg2HRbAW6fVPpFr4zRS5umpeZV3i06i11VQQPS/mA/OBEXyaqzx4mr6B7U6ptrp
-jMqiUv2w
------END CERTIFICATE-----

riot.im/README

@@ -1,6 +0,0 @@
-This directory contains the config file for the official riot.im distribution
-of Riot Desktop.
-
-You probably do not want to build with this config unless you're building the
-official riot.im distribution, or you'll find your builds will replace
-themselves with the riot.im build.

riot.im/nightly/config.json

@@ -1,52 +0,0 @@
-{
-    "update_base_url": "https://packages.riot.im/nightly/update/",
-    "default_server_name": "matrix.org",
-    "brand": "Riot Nightly",
-    "integrations_ui_url": "https://scalar-staging.vector.im/",
-    "integrations_rest_url": "https://scalar-staging.vector.im/api",
-    "integrations_widgets_urls": [
-        "https://scalar.vector.im/_matrix/integrations/v1",
-        "https://scalar.vector.im/api",
-        "https://scalar-staging.vector.im/_matrix/integrations/v1",
-        "https://scalar-staging.vector.im/api",
-        "https://scalar-staging.riot.im/scalar/api"
-    ],
-    "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
-    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
-    "features": {
-        "feature_pinning": "labs",
-        "feature_custom_status": "labs",
-        "feature_custom_tags": "labs",
-        "feature_state_counters": "labs",
-        "feature_many_integration_managers": "labs",
-        "feature_mjolnir": "labs",
-        "feature_dm_verification": "labs",
-        "feature_bridge_state": "labs",
-        "feature_presence_in_room_list": "labs",
-        "feature_custom_themes": "labs"
-    },
-    "piwik": {
-        "url": "https://piwik.riot.im/",
-        "siteId": 1,
-        "policyUrl": "https://matrix.org/legal/riot-im-cookie-policy"
-    },
-    "roomDirectory": {
-        "servers": [
-            "matrix.org"
-        ]
-    },
-    "enable_presence_by_hs_url": {
-        "https://matrix.org": false,
-        "https://matrix-client.matrix.org": false
-    },
-    "terms_and_conditions_links": [
-        {
-            "url": "https://riot.im/privacy",
-            "text": "Privacy Policy"
-        },
-        {
-            "url": "https://matrix.org/legal/riot-im-cookie-policy",
-            "text": "Cookie Policy"
-        }
-    ]
-}

riot.im/nightly/control.template

@@ -1,11 +0,0 @@
-Package: riot-nightly
-License: Apache-2.0
-Vendor: support@riot.im
-Architecture: amd64
-Maintainer: support@riot.im
-Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libappindicator3-1, libsecret-1-0, libsqlcipher0
-Section: net
-Priority: extra
-Homepage: https://riot.im/
-Description: 
-  A feature-rich client for Matrix.org (nightly unstable build).

riot.im/release/config.json

@@ -1,40 +0,0 @@
-{
-    "update_base_url": "https://packages.riot.im/desktop/update/",
-    "default_server_name": "matrix.org",
-    "brand": "Riot",
-    "integrations_ui_url": "https://scalar.vector.im/",
-    "integrations_rest_url": "https://scalar.vector.im/api",
-    "integrations_widgets_urls": [
-        "https://scalar.vector.im/_matrix/integrations/v1",
-        "https://scalar.vector.im/api",
-        "https://scalar-staging.vector.im/_matrix/integrations/v1",
-        "https://scalar-staging.vector.im/api",
-        "https://scalar-staging.riot.im/scalar/api"
-    ],
-    "hosting_signup_link": "https://modular.im/?utm_source=riot-web&utm_medium=web",
-    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
-    "roomDirectory": {
-        "servers": [
-            "matrix.org"
-        ]
-    },
-    "piwik": {
-        "url": "https://piwik.riot.im/",
-        "siteId": 1,
-        "policyUrl": "https://matrix.org/legal/riot-im-cookie-policy"
-    },
-    "enable_presence_by_hs_url": {
-        "https://matrix.org": false,
-        "https://matrix-client.matrix.org": false
-    },
-    "terms_and_conditions_links": [
-        {
-            "url": "https://riot.im/privacy",
-            "text": "Privacy Policy"
-        },
-        {
-            "url": "https://matrix.org/legal/riot-im-cookie-policy",
-            "text": "Cookie Policy"
-        }
-    ]
-}

riot.im/release/control.template

@@ -1,13 +0,0 @@
-Package: riot-desktop
-License: Apache-2.0
-Vendor: support@riot.im
-Architecture: amd64
-Maintainer: support@riot.im
-Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libappindicator3-1, libsecret-1-0, libsqlcipher0
-Provides: riot-web
-Replaces: riot-web
-Section: net
-Priority: extra
-Homepage: https://riot.im/
-Description: 
-  A feature-rich client for Matrix.org

scripts/ci/install-deps.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-scripts/fetchdep.sh matrix-org matrix-js-sdk
-
-pushd matrix-js-sdk
-yarn link
-yarn install $@
-popd
-
-yarn link matrix-js-sdk
-yarn install $@

scripts/copy-res.js

@@ -0,0 +1,127 @@
+#!/usr/bin/env node
+
+// copies resources into the lib directory.
+
+const parseArgs = require('minimist');
+const chokidar = require('chokidar');
+const path = require('path');
+const fs = require('fs');
+
+const argv = parseArgs(process.argv.slice(2), {});
+
+const watch = argv.w;
+const verbose = argv.v;
+
+function errCheck(err) {
+    if (err) {
+        console.error(err.message);
+        process.exit(1);
+    }
+}
+
+const I18N_BASE_PATH = "src/i18n/strings/";
+const INCLUDE_LANGS = fs.readdirSync(I18N_BASE_PATH).filter(fn => fn.endsWith(".json"));
+
+// Ensure lib, lib/i18n and lib/i18n/strings all exist
+fs.mkdirSync('lib/i18n/strings', { recursive: true });
+
+function genLangFile(file, dest) {
+    let translations = {};
+    [file].forEach(function(f) {
+        if (fs.existsSync(f)) {
+            try {
+                Object.assign(
+                    translations,
+                    JSON.parse(fs.readFileSync(f).toString()),
+                );
+            } catch (e) {
+                console.error("Failed: " + f, e);
+                throw e;
+            }
+        }
+    });
+
+    translations = weblateToCounterpart(translations);
+
+    const json = JSON.stringify(translations, null, 4);
+    const filename = path.basename(file);
+
+    fs.writeFileSync(dest + filename, json);
+    if (verbose) {
+        console.log("Generated language file: " + filename);
+    }
+}
+
+/*
+ * Convert translation key from weblate format
+ * (which only supports a single level) to counterpart
+ * which requires object values for 'count' translations.
+ *
+ * eg.
+ *     "there are %(count)s badgers|one": "a badger",
+ *     "there are %(count)s badgers|other": "%(count)s badgers"
+ *   becomes
+ *     "there are %(count)s badgers": {
+ *         "one": "a badger",
+ *         "other": "%(count)s badgers"
+ *     }
+ */
+function weblateToCounterpart(inTrs) {
+    const outTrs = {};
+
+    for (const key of Object.keys(inTrs)) {
+        const keyParts = key.split('|', 2);
+        if (keyParts.length === 2) {
+            let obj = outTrs[keyParts[0]];
+            if (obj === undefined) {
+                obj = outTrs[keyParts[0]] = {};
+            } else if (typeof obj === "string") {
+                // This is a transitional edge case if a string went from singular to pluralised and both still remain
+                // in the translation json file. Use the singular translation as `other` and merge pluralisation atop.
+                obj = outTrs[keyParts[0]] = {
+                    "other": inTrs[key],
+                };
+                console.warn("Found entry in i18n file in both singular and pluralised form", keyParts[0]);
+            }
+            obj[keyParts[1]] = inTrs[key];
+        } else {
+            outTrs[key] = inTrs[key];
+        }
+    }
+
+    return outTrs;
+}
+
+/*
+ watch the input files for a given language,
+ regenerate the file, and regenerating languages.json with the new filename
+ */
+function watchLanguage(file, dest) {
+    // XXX: Use a debounce because for some reason if we read the language
+    // file immediately after the FS event is received, the file contents
+    // appears empty. Possibly https://github.com/nodejs/node/issues/6112
+    let makeLangDebouncer;
+    const makeLang = () => {
+        if (makeLangDebouncer) {
+            clearTimeout(makeLangDebouncer);
+        }
+        makeLangDebouncer = setTimeout(() => {
+            genLangFile(file, dest);
+        }, 500);
+    };
+
+    chokidar.watch(file)
+        .on('add', makeLang)
+        .on('change', makeLang)
+        .on('error', errCheck);
+}
+
+// language resources
+const I18N_DEST = "lib/i18n/strings/";
+INCLUDE_LANGS.forEach((file) => {
+    genLangFile(I18N_BASE_PATH + file, I18N_DEST);
+}, {});
+
+if (watch) {
+    INCLUDE_LANGS.forEach(file => watchLanguage(I18N_BASE_PATH + file, I18N_DEST));
+}

scripts/electron-package.sh

@@ -1,170 +0,0 @@
-#!/bin/bash
-
-usage() {
-    echo "Usage: $0 -v <version> -d <config directory> [-n]"
-    echo
-    echo "version: commit-ish to check out and build"
-    echo "config directory: a path to a directory containing"
-    echo "config.json, a json config file to ship with the build"
-    echo "and env.sh, a file to source environment variables"
-    echo "from."
-    echo "-n: build with no config file."
-    echo
-    echo "The update_base_url value from config.json is used to set up auto-update."
-    echo
-    echo "Environment variables:"
-    echo "   OSSLSIGNCODE_SIGNARGS: Arguments to pass to osslsigncode when signing"
-    echo "   NOTARIZE_APPLE_ID: Apple ID to use for notarisation. The password for"
-    echo "   this account must be set in NOTARIZE_CREDS in the keychain."
-}
-
-confdir=
-version=
-skipcfg=0
-while getopts "d:v:n" opt; do
-    case $opt in
-        d)
-            confdir=$OPTARG
-            ;;
-        v)
-            version=$OPTARG
-            ;;
-        n)
-            skipcfg=1
-            ;;
-        \?)
-            echo "Invalid option: -$OPTARG" >&2
-            usage
-            exit
-            ;;
-    esac
-done
-
-if [ -z "$version" ]; then
-    echo "No version supplied"
-    usage
-    exit
-fi
-
-conffile="$confdir/config.json"
-
-if [ -z "$conffile" ] && [ "$skipcfg" = 0 ]; then
-    echo "No config file given. Use -c to supply a config file or"
-    echo "-n to build with no config file (and no auto update)."
-    exit
-fi
-
-if [ -n "$conffile" ]; then
-    update_base_url=`jq -r .update_base_url $conffile`
-
-    if [ -z "$update_base_url" ]; then
-        echo "No update URL supplied. Use update_base_url: null if you really"
-        echo "want a build with no auto-update."
-        usage
-        exit
-    fi
-    # Make sure the base URL ends in a slash if it doesn't already
-    update_base_url=`echo $update_base_url | sed -e 's#\([^\/]\)$#\1\/#'`
-fi
-
-if [ ! -f package.json ]; then
-    echo "No package.json found. This script must be run from"
-    echo "the riot-web directory."
-    exit
-fi
-
-[ -f "$confdir/env.sh" ] && . "$confdir/env.sh"
-
-if [ -z "$NOTARIZE_APPLE_ID" ]; then
-    echo "NOTARIZE_APPLE_ID is not set"
-    exit
-fi
-
-osslsigncode -h 2> /dev/null
-if [ $? -ne 255 ]; then # osslsigncode exits with 255 after printing usage...
-    echo "osslsigncode not found"
-    exit
-fi
-
-# Test that altool can get its credentials for notarising the mac app
-xcrun altool -u "$NOTARIZE_APPLE_ID" -p '@keychain:NOTARIZE_CREDS' --list-apps || exit
-
-# Get the token password: we'll need it later, but get it now so we fail early if it's not there
-token_password=`security find-generic-password -s riot_signing_token -w`
-if [ $? -ne 0 ]; then
-    echo "riot_signing_token not found in keychain"
-    exit
-fi
-
-set -e
-
-echo "Building $version using Update base URL $update_base_url"
-
-projdir=`pwd`
-builddir=`mktemp -d 2>/dev/null || mktemp -d -t 'buildtmp'`
-pushd "$builddir"
-
-git clone "$projdir" .
-git checkout "$version"
-
-# Figure out what version we're building
-vername=`jq -r .version package.json`
-
-if [ -n "$conffile" ]; then
-    popd
-    cp "$conffile" "$builddir/"
-    pushd "$builddir"
-fi
-
-# We use Git branch / commit dependencies for some packages, and Yarn seems
-# to have a hard time getting that right. See also
-# https://github.com/yarnpkg/yarn/issues/4734. As a workaround, we clean the
-# global cache here to ensure we get the right thing.
-yarn cache clean
-yarn install
-yarn build:electron
-
-popd
-
-distdir="$builddir/electron_app/dist"
-pubdir="$projdir/electron_app/pub"
-rm -r "$pubdir" || true
-mkdir -p "$pubdir"
-rm -r "$projdir/electron_app/dist" || true
-mkdir -p "$projdir/electron_app/dist"
-
-# Install packages: what the user downloads the first time,
-# (DMGs for mac, exe installer for windows)
-mkdir -p "$pubdir/install/macos"
-cp $distdir/*.dmg "$pubdir/install/macos/"
-
-mkdir -p "$pubdir/install/win32/ia32/"
-cp $distdir/squirrel-windows-ia32/*.exe "$pubdir/install/win32/ia32/"
-
-mkdir -p "$pubdir/install/win32/x64/"
-cp $distdir/squirrel-windows/*.exe "$pubdir/install/win32/x64/"
-
-# Packages for auto-update
-mkdir -p "$pubdir/update/macos"
-cp $distdir/*-mac.zip "$pubdir/update/macos/"
-echo "$vername" > "$pubdir/update/macos/latest"
-
-mkdir -p "$pubdir/update/win32/ia32/"
-cp $distdir/squirrel-windows-ia32/*.nupkg "$pubdir/update/win32/ia32/"
-cp $distdir/squirrel-windows-ia32/RELEASES "$pubdir/update/win32/ia32/"
-
-mkdir -p "$pubdir/update/win32/x64/"
-cp $distdir/squirrel-windows/*.nupkg "$pubdir/update/win32/x64/"
-cp $distdir/squirrel-windows/RELEASES "$pubdir/update/win32/x64/"
-
-# Move the deb to the main project dir's dist folder
-# (just the 64 bit one - the 32 bit one still gets built because
-# it's one arch argument for all platforms and we still want 32 bit
-# windows, but 32 bit linux is unsupported as of electron 4 and no
-# longer appears to work).
-cp $distdir/*_amd64.deb "$projdir/electron_app/dist/"
-
-rm -rf "$builddir"
-
-echo "$pubdir can now be hosted on your web server."
-echo "deb archives are in electron_app/dist/ - these should be added into your debian repository"

scripts/electron_afterPack.js

@@ -0,0 +1,15 @@
+const fsProm = require('fs').promises;
+const path = require('path');
+
+exports.default = async function(context) {
+    const { electronPlatformName, appOutDir } = context;
+
+    // Squirrel windows will try to relaunch the app using an executable of the same name as
+    // before in the new version, so will fail if the executable is now called something else.
+    // We add a fake Riot.exe that it can run which runs the real one.
+    // This also gets signed automatically, presumably because electron-build just looks for all
+    // exe files and signs them all...
+    if (electronPlatformName === 'win32') {
+        await fsProm.copyFile('build/rebrand_stub/rebrand_stub.exe', path.join(appOutDir, "Riot.exe"));
+    }
+};

scripts/electron_afterSign.js

@@ -1,5 +1,6 @@
 const { notarize } = require('electron-notarize');
 
+let warned = false;
 exports.default = async function(context) {
     const { electronPlatformName, appOutDir } = context;
     const appId = context.packager.info.appInfo.id;
@@ -11,10 +12,13 @@ exports.default = async function(context) {
         // from the keychain, so we need to get it from the environment.
         const userId = process.env.NOTARIZE_APPLE_ID;
         if (userId === undefined) {
-            console.log("*************************************");
-            console.log("*   NOTARIZE_APPLE_ID is not set.   *");
-            console.log("* This build will NOT be notarised. *");
-            console.log("*************************************");
+            if (!warned) {
+                console.log("*************************************");
+                console.log("*   NOTARIZE_APPLE_ID is not set.   *");
+                console.log("* This build will NOT be notarised. *");
+                console.log("*************************************");
+                warned = true;
+            }
             return;
         }
 

scripts/electron_winSign.js

@@ -24,7 +24,7 @@ function computeSignToolArgs(options, keyContainer) {
     // so we don't have to hard-code this here
     // fwiw https://stackoverflow.com/questions/17927895/automate-extended-validation-ev-code-signing
     // is about the most useful resource on automating code signing...
-    args.push('/f', 'riot.im\\New_Vector_Ltd.pem');
+    args.push('/f', 'element.io\\New_Vector_Ltd.pem');
 
     if (options.hash !== "sha1") {
         args.push("/fd", options.hash);
@@ -46,15 +46,19 @@ function computeSignToolArgs(options, keyContainer) {
     return args;
 }
 
+let warned = false;
 exports.default = async function(options) {
     const keyContainer = process.env.SIGNING_KEY_CONTAINER;
     if (keyContainer === undefined) {
-        console.warn(
-            "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +
-            "! Skipping Windows signing.          !\n" +
-            "! SIGNING_KEY_CONTAINER not defined. !\n" +
-            "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",
-        );
+        if (!warned) {
+            console.warn(
+                "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +
+                "! Skipping Windows signing.          !\n" +
+                "! SIGNING_KEY_CONTAINER not defined. !\n" +
+                "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!",
+            );
+            warned = true;
+        }
         return;
     }
 

scripts/fetch-package.js

@@ -10,75 +10,13 @@ const asar = require('asar');
 const needle = require('needle');
 
 const riotDesktopPackageJson = require('../package.json');
+const { setPackageVersion } = require('./set-version.js');
 
-const PUB_KEY_URL = "https://packages.riot.im/riot-release-key.asc";
-const PACKAGE_URL_PREFIX = "https://github.com/vector-im/riot-web/releases/download/";
+const PUB_KEY_URL = "https://packages.riot.im/element-release-key.asc";
+const PACKAGE_URL_PREFIX = "https://github.com/vector-im/element-web/releases/download/";
+const DEVELOP_TGZ_URL = "https://vector-im.github.io/element-web/develop.tar.gz";
 const ASAR_PATH = 'webapp.asar';
 
-const {setPackageVersion, setDebVersion} = require('./set-version.js');
-
-async function getLatestDevelopUrl(bkToken) {
-    const buildsResult = await needle('get',
-        "https://api.buildkite.com/v2/organizations/matrix-dot-org/pipelines/riot-web/builds",
-        {
-            branch: 'develop',
-            state: 'passed',
-            per_page: 1,
-        },
-        {
-            headers: {
-                authorization: "Bearer " + bkToken,
-            },
-        },
-    );
-    const latestBuild = buildsResult.body[0];
-    console.log("Latest build is " + latestBuild.number);
-    let artifactUrl;
-    for (const job of latestBuild.jobs) {
-        // Strip any colon-form emoji from the build name
-        if (job.name && job.name.replace(/:\w*:\s*/, '') === 'Package') {
-            artifactUrl = job.artifacts_url;
-            break;
-        }
-    }
-    if (artifactUrl === undefined) {
-        throw new Error("Couldn't find artifact URL - has the name of the package job changed?");
-    }
-
-    const artifactsResult = await needle('get', artifactUrl, {},
-        {
-            headers: {
-                authorization: "Bearer " + bkToken,
-            },
-        },
-    );
-    let dlUrl;
-    let dlFilename;
-    for (const artifact of artifactsResult.body) {
-        if (artifact.filename && /^riot-.*\.tar.gz$/.test(artifact.filename)) {
-            dlUrl = artifact.download_url;
-            dlFilename = artifact.filename;
-            break;
-        }
-    }
-    if (dlUrl === undefined) {
-        throw new Error("Couldn't find artifact download URL - has the artifact filename changed?");
-    }
-    console.log("Fetching artifact URL...");
-    const dlResult = await needle('get', dlUrl, {},
-        {
-            headers: {
-                authorization: "Bearer " + bkToken,
-            },
-            // This URL will give us a Location header, but will also give us
-            // a JSON object with the direct URL. We'll take the URL and pass it
-            // back, then we can easily support specifying a URL directly.
-            follow_max: 0,
-        },
-    );
-    return [dlFilename, dlResult.body.url];
-}
-
 async function downloadToFile(url, filename) {
     console.log("Downloading " + url + "...");
 
@@ -149,24 +87,21 @@ async function main() {
 
     if (targetVersion === undefined) {
         targetVersion = 'v' + riotDesktopPackageJson.version;
-        filename = 'riot-' + targetVersion + '.tar.gz';
-        url = PACKAGE_URL_PREFIX + targetVersion + '/' + filename;
-    } else if (targetVersion === 'develop') {
-        const buildKiteApiKey = process.env.BUILDKITE_API_KEY;
-        if (buildKiteApiKey === undefined) {
-            console.log("Set BUILDKITE_API_KEY to fetch latest develop version");
-            console.log(
-                "Sorry - Buildkite's API requires authentication to access builds, " +
-                "even if those builds are accessible on the web with no auth.",
-            );
-            process.exit(1);
-        }
-        [filename, url] = await getLatestDevelopUrl(buildKiteApiKey);
+    } else if (targetVersion !== 'develop') {
+        setVersion = true; // version was specified
+    }
+
+    if (targetVersion === 'develop') {
+        filename = 'develop.tar.gz';
+        url = DEVELOP_TGZ_URL;
         verify = false; // develop builds aren't signed
+    } else if (targetVersion.includes("://")) {
+        filename = targetVersion.substring(targetVersion.lastIndexOf("/") + 1);
+        url = targetVersion;
+        verify = false; // manually verified
     } else {
-        filename = 'riot-' + targetVersion + '.tar.gz';
+        filename = `element-${targetVersion}.tar.gz`;
         url = PACKAGE_URL_PREFIX + targetVersion + '/' + filename;
-        setVersion = true;
     }
 
     const haveGpg = await new Promise((resolve) => {
@@ -208,7 +143,7 @@ async function main() {
     }
 
     let haveDeploy = false;
-    const expectedDeployDir = path.join(deployDir, path.basename(filename).replace(/\.tar\.gz/, ''));
+    let expectedDeployDir = path.join(deployDir, path.basename(filename).replace(/\.tar\.gz/, ''));
     try {
         await fs.opendir(expectedDeployDir);
         console.log(expectedDeployDir + "already exists");
@@ -257,6 +192,12 @@ async function main() {
         await tar.x({
             file: outPath,
             cwd: deployDir,
+            onentry: entry => {
+                // Find the appropriate extraction path, only needed for `develop` where the dir name is unknown
+                if (entry.type === "Directory" && !path.join(deployDir, entry.path).startsWith(expectedDeployDir)) {
+                    expectedDeployDir = path.join(deployDir, entry.path);
+                }
+            },
         });
     }
 
@@ -280,13 +221,17 @@ async function main() {
     await asar.createPackage(expectedDeployDir, ASAR_PATH);
 
     if (setVersion) {
-        const semVer = targetVersion.slice(1);
+        const semVer = fs.readFileSync(path.join(expectedDeployDir, "version"), "utf-8").trim();
         console.log("Updating version to " + semVer);
         await setPackageVersion(semVer);
-        await setDebVersion(semVer);
     }
 
     console.log("Done!");
 }
 
-main().then((ret) => process.exit(ret));
+main().then((ret) => {
+    process.exit(ret);
+}).catch(e => {
+    console.error(e);
+    process.exit(1);
+});

scripts/fetchdep.sh

@@ -17,7 +17,8 @@ clone() {
     if [ -n "$branch" ]
     then
         echo "Trying to use $org/$repo#$branch"
-        git clone git://github.com/$org/$repo.git $repo --branch "$branch" --depth 1 && exit 0
+        # Disable auth prompts: https://serverfault.com/a/665959
+        GIT_TERMINAL_PROMPT=0 git clone https://github.com/$org/$repo.git $repo --branch "$branch" --depth 1 && exit 0
     fi
 }
 

scripts/hak/README.md

@@ -1,7 +1,7 @@
 hak
 ===
 
-This tool builds native dependencies for riot-desktop. Here follows some very minimal
+This tool builds native dependencies for element-desktop. Here follows some very minimal
 documentation for it.
 
 Goals:

scripts/hak/build.ts

@@ -14,8 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-async function build(hakEnv, moduleInfo) {
+import { DependencyInfo } from "./dep";
+import HakEnv from "./hakEnv";
+
+export default async function build(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
     await moduleInfo.scripts.build(hakEnv, moduleInfo);
 }
-
-module.exports = build;

scripts/hak/check.ts

@@ -14,10 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-async function check(hakEnv, moduleInfo) {
+import { DependencyInfo } from "./dep";
+import HakEnv from "./hakEnv";
+
+export default async function check(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
     if (moduleInfo.scripts.check) {
         await moduleInfo.scripts.check(hakEnv, moduleInfo);
     }
 }
-
-module.exports = check;

scripts/hak/clean.ts

@@ -14,13 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const path = require('path');
+import path from 'path';
+import rimraf from 'rimraf';
 
-const rimraf = require('rimraf');
+import { DependencyInfo } from './dep';
+import HakEnv from './hakEnv';
 
-async function clean(hakEnv, moduleInfo) {
-    await new Promise((resolve, reject) => {
-        rimraf(moduleInfo.moduleDotHakDir, (err) => {
+export default async function clean(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
+    await new Promise<void>((resolve, reject) => {
+        rimraf(moduleInfo.moduleDotHakDir, (err: Error) => {
             if (err) {
                 reject(err);
             } else {
@@ -29,8 +31,8 @@ async function clean(hakEnv, moduleInfo) {
         });
     });
 
-    await new Promise((resolve, reject) => {
-        rimraf(path.join(hakEnv.dotHakDir, 'links', moduleInfo.name), (err) => {
+    await new Promise<void>((resolve, reject) => {
+        rimraf(path.join(hakEnv.dotHakDir, 'links', moduleInfo.name), (err: Error) => {
             if (err) {
                 reject(err);
             } else {
@@ -39,8 +41,8 @@ async function clean(hakEnv, moduleInfo) {
         });
     });
 
-    await new Promise((resolve, reject) => {
-        rimraf(path.join(hakEnv.projectRoot, 'node_modules', moduleInfo.name), (err) => {
+    await new Promise<void>((resolve, reject) => {
+        rimraf(path.join(hakEnv.projectRoot, 'node_modules', moduleInfo.name), (err: Error) => {
             if (err) {
                 reject(err);
             } else {
@@ -49,5 +51,3 @@ async function clean(hakEnv, moduleInfo) {
         });
     });
 }
-
-module.exports = clean;

scripts/hak/copy.js

@@ -1,67 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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.
-*/
-
-const path = require('path');
-const fsProm = require('fs').promises;
-
-const rimraf = require('rimraf');
-const glob = require('glob');
-const mkdirp = require('mkdirp');
-
-async function copy(hakEnv, moduleInfo) {
-    if (moduleInfo.cfg.prune) {
-        console.log("Removing " + moduleInfo.cfg.prune + " from " + moduleInfo.moduleOutDir);
-        // rimraf doesn't have a 'cwd' option: it always uses process.cwd()
-        // (and if you set glob.cwd it just breaks because it can't find the files)
-        const oldCwd = process.cwd();
-        try {
-            process.chdir(moduleInfo.moduleOutDir);
-            await new Promise((resolve, reject) => {
-                rimraf(moduleInfo.cfg.prune, {}, err => {
-                    err ? reject(err) : resolve();
-                });
-            });
-        } finally {
-            process.chdir(oldCwd);
-        }
-    }
-
-    if (moduleInfo.cfg.copy) {
-        console.log(
-            "Copying " + moduleInfo.cfg.prune + " from " +
-            moduleInfo.moduleOutDir + " to " + moduleInfo.moduleOutDir,
-        );
-        const files = await new Promise(async (resolve, reject) => {
-            glob(moduleInfo.cfg.copy, {
-                nosort: true,
-                silent: true,
-                cwd: moduleInfo.moduleBuildDir,
-            }, (err, files) => {
-                err ? reject(err) : resolve(files);
-            });
-        });
-        for (const f of files) {
-            console.log("\t" + f);
-            const src = path.join(moduleInfo.moduleBuildDir, f);
-            const dst = path.join(moduleInfo.moduleOutDir, f);
-
-            await mkdirp(path.dirname(dst));
-            await fsProm.copyFile(src, dst);
-        }
-    }
-}
-
-module.exports = copy;

scripts/hak/copy.ts

@@ -0,0 +1,101 @@
+/*
+Copyright 2020-2021 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+import path from 'path';
+import fsProm from 'fs/promises';
+import childProcess from 'child_process';
+import rimraf from 'rimraf';
+import glob from 'glob';
+import mkdirp from 'mkdirp';
+
+import HakEnv from './hakEnv';
+import { DependencyInfo } from './dep';
+
+export default async function copy(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
+    if (moduleInfo.cfg.prune) {
+        console.log("Removing " + moduleInfo.cfg.prune + " from " + moduleInfo.moduleOutDir);
+        // rimraf doesn't have a 'cwd' option: it always uses process.cwd()
+        // (and if you set glob.cwd it just breaks because it can't find the files)
+        const oldCwd = process.cwd();
+        try {
+            await mkdirp(moduleInfo.moduleOutDir);
+            process.chdir(moduleInfo.moduleOutDir);
+            await new Promise<void>((resolve, reject) => {
+                rimraf(moduleInfo.cfg.prune, {}, err => {
+                    err ? reject(err) : resolve();
+                });
+            });
+        } finally {
+            process.chdir(oldCwd);
+        }
+    }
+
+    if (moduleInfo.cfg.copy) {
+        // If there are multiple moduleBuildDirs, singular moduleBuildDir
+        // is the same as moduleBuildDirs[0], so we're just listing the contents
+        // of the first one.
+        const files = await new Promise<string[]>((resolve, reject) => {
+            glob(moduleInfo.cfg.copy, {
+                nosort: true,
+                silent: true,
+                cwd: moduleInfo.moduleBuildDir,
+            }, (err, files) => {
+                err ? reject(err) : resolve(files);
+            });
+        });
+
+        if (moduleInfo.moduleBuildDirs.length > 1) {
+            if (!hakEnv.isMac()) {
+                console.error(
+                    "You asked me to copy multiple targets but I've only been taught " +
+                    "how to do that on macOS.",
+                );
+                throw new Error("Can't copy multiple targets on this platform");
+            }
+
+            for (const f of files) {
+                const components = moduleInfo.moduleBuildDirs.map(dir => path.join(dir, f));
+                const dst = path.join(moduleInfo.moduleOutDir, f);
+
+                await mkdirp(path.dirname(dst));
+                await new Promise<void>((resolve, reject) => {
+                    childProcess.execFile('lipo',
+                        ['-create', '-output', dst, ...components], (err) => {
+                            if (err) {
+                                reject(err);
+                            } else {
+                                resolve();
+                            }
+                        },
+                    );
+                });
+            }
+        } else {
+            console.log(
+                "Copying files from " +
+                moduleInfo.moduleBuildDir + " to " + moduleInfo.moduleOutDir,
+            );
+            for (const f of files) {
+                console.log("\t" + f);
+                const src = path.join(moduleInfo.moduleBuildDir, f);
+                const dst = path.join(moduleInfo.moduleOutDir, f);
+
+                await mkdirp(path.dirname(dst));
+                await fsProm.copyFile(src, dst);
+            }
+        }
+    }
+}

scripts/hak/dep.ts

@@ -0,0 +1,32 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+import HakEnv from "./hakEnv";
+
+export interface DependencyInfo {
+    name: string;
+    version: string;
+    cfg: Record<string, any>;
+    moduleHakDir: string;
+    moduleDotHakDir: string;
+    moduleTargetDotHakDir: string;
+    moduleBuildDir: string;
+    moduleBuildDirs: string[];
+    moduleOutDir: string;
+    nodeModuleBinDir: string;
+    depPrefix: string;
+    scripts: Record<string, (hakEnv: HakEnv, moduleInfo: DependencyInfo) => Promise<void> >;
+}

scripts/hak/fetch.js

@@ -1,125 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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.
-*/
-
-const path = require('path');
-const url = require('url');
-const fsProm = require('fs').promises;
-const childProcess = require('child_process');
-
-const npm = require('npm');
-const semver = require('semver');
-const needle = require('needle');
-const mkdirp = require('mkdirp');
-const tar = require('tar');
-
-async function fetch(hakEnv, moduleInfo) {
-    let haveModuleBuildDir;
-    try {
-        const stats = await fsProm.stat(moduleInfo.moduleBuildDir);
-        haveModuleBuildDir = stats.isDirectory();
-    } catch (e) {
-        haveModuleBuildDir = false;
-    }
-
-    if (haveModuleBuildDir) return;
-
-    await new Promise((resolve) => {
-        npm.load({'loglevel': 'silent'}, resolve);
-    });
-
-    console.log("Fetching " + moduleInfo.name + " at version " + moduleInfo.version);
-    const versions = await new Promise((resolve, reject) => {
-        npm.view([
-            moduleInfo.name + '@' + moduleInfo.version,
-            'dist.tarball',
-            (err, versions) => {
-                if (err) {
-                    reject(err);
-                } else {
-                    resolve(versions);
-                }
-            },
-        ]);
-    });
-
-    const orderedVersions = Object.keys(versions);
-    semver.sort(orderedVersions);
-
-    console.log("Resolved version " + orderedVersions[0] + " for " + moduleInfo.name);
-
-    const tarballUrl = versions[orderedVersions[0]]['dist.tarball'];
-
-    await mkdirp(moduleInfo.moduleDotHakDir);
-
-    const parsedUrl = url.parse(tarballUrl);
-    const tarballFile = path.join(moduleInfo.moduleDotHakDir, path.basename(parsedUrl.path));
-
-    let haveTarball;
-    try {
-        await fsProm.stat(tarballFile);
-        haveTarball = true;
-    } catch (e) {
-        haveTarball = false;
-    }
-    if (!haveTarball) {
-        console.log("Downloading " + tarballUrl);
-        await needle('get', tarballUrl, { output: tarballFile });
-    } else {
-        console.log(tarballFile + " already exists.");
-    }
-
-    await mkdirp(moduleInfo.moduleBuildDir);
-
-    await tar.x({
-        file: tarballFile,
-        cwd: moduleInfo.moduleBuildDir,
-        strip: 1,
-    });
-
-    console.log("Running yarn install in " + moduleInfo.moduleBuildDir);
-    await new Promise((resolve, reject) => {
-        const proc = childProcess.spawn(
-            hakEnv.isWin() ? 'yarn.cmd' : 'yarn',
-            ['install', '--ignore-scripts'],
-            {
-                stdio: 'inherit',
-                cwd: moduleInfo.moduleBuildDir,
-            },
-        );
-        proc.on('exit', code => {
-            code ? reject(code) : resolve();
-        });
-    });
-
-    // also extract another copy to the output directory at this point
-    // nb. we do not yarn install in the output copy: we could install in
-    // production mode to get only runtime dependencies and not devDependencies,
-    // but usually native modules come with dependencies that are needed for
-    // building/fetching the native modules (eg. node-pre-gyp) rather than
-    // actually used at runtime: we do not want to bundle these into our app.
-    // We therefore just install no dependencies at all, and accept that any
-    // actual runtime dependencies will have to be added to the main app's
-    // dependencies. We can't tell what dependencies are real runtime deps
-    // and which are just used for native module building.
-    await mkdirp(moduleInfo.moduleOutDir);
-    await tar.x({
-        file: tarballFile,
-        cwd: moduleInfo.moduleOutDir,
-        strip: 1,
-    });
-}
-
-module.exports = fetch;

scripts/hak/fetch.ts

@@ -0,0 +1,70 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+import fsProm from 'fs/promises';
+import childProcess from 'child_process';
+import pacote from 'pacote';
+
+import HakEnv from './hakEnv';
+import { DependencyInfo } from './dep';
+
+export default async function fetch(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
+    let haveModuleBuildDir;
+    try {
+        const stats = await fsProm.stat(moduleInfo.moduleBuildDir);
+        haveModuleBuildDir = stats.isDirectory();
+    } catch (e) {
+        haveModuleBuildDir = false;
+    }
+
+    if (haveModuleBuildDir) return;
+
+    console.log("Fetching " + moduleInfo.name + "@" + moduleInfo.version);
+
+    const packumentCache = new Map();
+    await pacote.extract(`${moduleInfo.name}@${moduleInfo.version}`, moduleInfo.moduleBuildDir, {
+        packumentCache,
+    });
+
+    console.log("Running yarn install in " + moduleInfo.moduleBuildDir);
+    await new Promise<void>((resolve, reject) => {
+        const proc = childProcess.spawn(
+            hakEnv.isWin() ? 'yarn.cmd' : 'yarn',
+            ['install', '--ignore-scripts'],
+            {
+                stdio: 'inherit',
+                cwd: moduleInfo.moduleBuildDir,
+            },
+        );
+        proc.on('exit', code => {
+            code ? reject(code) : resolve();
+        });
+    });
+
+    // also extract another copy to the output directory at this point
+    // nb. we do not yarn install in the output copy: we could install in
+    // production mode to get only runtime dependencies and not devDependencies,
+    // but usually native modules come with dependencies that are needed for
+    // building/fetching the native modules (eg. node-pre-gyp) rather than
+    // actually used at runtime: we do not want to bundle these into our app.
+    // We therefore just install no dependencies at all, and accept that any
+    // actual runtime dependencies will have to be added to the main app's
+    // dependencies. We can't tell what dependencies are real runtime deps
+    // and which are just used for native module building.
+    await pacote.extract(`${moduleInfo.name}@${moduleInfo.version}`, moduleInfo.moduleOutDir, {
+        packumentCache,
+    });
+}

scripts/hak/fetchDeps.ts

@@ -14,13 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const mkdirp = require('mkdirp');
+import mkdirp from 'mkdirp';
 
-async function fetchDeps(hakEnv, moduleInfo) {
+import { DependencyInfo } from './dep';
+import HakEnv from './hakEnv';
+
+export default async function fetchDeps(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
     await mkdirp(moduleInfo.moduleDotHakDir);
     if (moduleInfo.scripts.fetchDeps) {
         await moduleInfo.scripts.fetchDeps(hakEnv, moduleInfo);
     }
 }
-
-module.exports = fetchDeps;

scripts/hak/hakEnv.js

@@ -1,115 +0,0 @@
-/*
-Copyright 2020 The Matrix.org Foundation C.I.C.
-
-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.
-*/
-
-const path = require('path');
-const os = require('os');
-
-const nodePreGypVersioning = require('node-pre-gyp/lib/util/versioning');
-
-function getElectronVersion(packageJson) {
-    // should we pick the version of an installed electron
-    // dependency, and if so, before or after electronVersion?
-    if (packageJson.build && packageJson.build.electronVersion) {
-        return packageJson.build.electronVersion;
-    }
-    return null;
-}
-
-function getRuntime(packageJson) {
-    const electronVersion = getElectronVersion(packageJson);
-    return electronVersion ? 'electron' : 'node-webkit';
-}
-
-function getTarget(packageJson) {
-    const electronVersion = getElectronVersion(packageJson);
-    if (electronVersion) {
-        return electronVersion;
-    } else {
-        return process.version.substr(1);
-    }
-}
-
-function detectArch() {
-    if (process.platform === 'win32') {
-        // vcvarsall.bat (the script that sets up the environment for
-        // visual studio build tools) sets an env var to tell us what
-        // architecture the active build tools target, so we auto-detect
-        // this.
-        const targetArch = process.env.VSCMD_ARG_TGT_ARCH;
-        if (targetArch === 'x86') {
-            return 'ia32';
-        } else if (targetArch === 'x64') {
-            return 'x64';
-        }
-    }
-    return process.arch;
-}
-
-module.exports = class HakEnv {
-    constructor(prefix, packageJson) {
-        Object.assign(this, {
-            // what we're targeting
-            runtime: getRuntime(packageJson),
-            target: getTarget(packageJson),
-            platform: process.platform,
-            arch: detectArch(),
-
-            // paths
-            projectRoot: prefix,
-            dotHakDir: path.join(prefix, '.hak'),
-        });
-    }
-
-    getRuntimeAbi() {
-        return nodePreGypVersioning.get_runtime_abi(
-            this.runtime,
-            this.target,
-        );
-    }
-
-    // {node_abi}-{platform}-{arch}
-    getNodeTriple() {
-        return this.getRuntimeAbi() + '-' + this.platform + '-' + this.arch;
-    }
-
-    isWin() {
-        return this.platform === 'win32';
-    }
-
-    isMac() {
-        return this.platform === 'darwin';
-    }
-
-    isLinux() {
-        return this.platform === 'linux';
-    }
-
-    makeGypEnv() {
-        return Object.assign({}, process.env, {
-            npm_config_target: this.target,
-            npm_config_arch: this.arch,
-            npm_config_target_arch: this.arch,
-            npm_config_disturl: 'https://atom.io/download/electron',
-            npm_config_runtime: this.runtime,
-            npm_config_build_from_source: true,
-            npm_config_devdir: path.join(os.homedir(), ".electron-gyp"),
-        });
-    }
-
-    getNodeModuleBin(name) {
-        return path.join(this.projectRoot, 'node_modules', '.bin', name);
-    }
-};

scripts/hak/hakEnv.ts

@@ -0,0 +1,121 @@
+/*
+Copyright 2020-2021 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+import path from 'path';
+import os from 'os';
+import nodePreGypVersioning from "node-pre-gyp/lib/util/versioning";
+import { getElectronVersion } from "app-builder-lib/out/electron/electronVersion";
+
+import { Arch, Target, TARGETS, getHost, isHostId, TargetId } from './target';
+
+async function getRuntime(projectRoot: string): Promise<string> {
+    const electronVersion = await getElectronVersion(projectRoot);
+    return electronVersion ? 'electron' : 'node-webkit';
+}
+
+async function getRuntimeVersion(projectRoot: string): Promise<string> {
+    const electronVersion = await getElectronVersion(projectRoot);
+    if (electronVersion) {
+        return electronVersion;
+    } else {
+        return process.version.substr(1);
+    }
+}
+
+export default class HakEnv {
+    public readonly target: Target;
+    public runtime: string;
+    public runtimeVersion: string;
+    public dotHakDir: string;
+
+    constructor(public readonly projectRoot: string, targetId: TargetId | null) {
+        if (targetId) {
+            this.target = TARGETS[targetId];
+        } else {
+            this.target = getHost();
+        }
+
+        if (!this.target) {
+            throw new Error(`Unknown target ${targetId}!`);
+        }
+        this.dotHakDir = path.join(this.projectRoot, '.hak');
+    }
+
+    public async init() {
+        this.runtime = await getRuntime(this.projectRoot);
+        this.runtimeVersion = await getRuntimeVersion(this.projectRoot);
+    }
+
+    public getRuntimeAbi(): string {
+        return nodePreGypVersioning.get_runtime_abi(
+            this.runtime,
+            this.runtimeVersion,
+        );
+    }
+
+    // {node_abi}-{platform}-{arch}
+    public getNodeTriple(): string {
+        return this.getRuntimeAbi() + '-' + this.target.platform + '-' + this.target.arch;
+    }
+
+    public getTargetId(): TargetId {
+        return this.target.id;
+    }
+
+    public isWin(): boolean {
+        return this.target.platform === 'win32';
+    }
+
+    public isMac(): boolean {
+        return this.target.platform === 'darwin';
+    }
+
+    public isLinux(): boolean {
+        return this.target.platform === 'linux';
+    }
+
+    public getTargetArch(): Arch {
+        return this.target.arch;
+    }
+
+    public isHost(): boolean {
+        return isHostId(this.target.id);
+    }
+
+    public makeGypEnv(): Record<string, string> {
+        return Object.assign({}, process.env, {
+            npm_config_arch: this.target.arch,
+            npm_config_target_arch: this.target.arch,
+            npm_config_disturl: 'https://electronjs.org/headers',
+            npm_config_runtime: this.runtime,
+            npm_config_target: this.runtimeVersion,
+            npm_config_build_from_source: true,
+            npm_config_devdir: path.join(os.homedir(), ".electron-gyp"),
+        });
+    }
+
+    public getNodeModuleBin(name: string): string {
+        return path.join(this.projectRoot, 'node_modules', '.bin', name);
+    }
+
+    public wantsStaticSqlCipherUnix(): boolean {
+        return this.isMac() || process.env.SQLCIPHER_STATIC == '1';
+    }
+
+    public wantsStaticSqlCipher(): boolean {
+        return this.isWin() || this.wantsStaticSqlCipherUnix();
+    }
+}

scripts/hak/index.ts

@@ -1,5 +1,5 @@
 /*
-Copyright 2020 The Matrix.org Foundation C.I.C.
+Copyright 2020-2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,11 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const path = require('path');
+import path from 'path';
+import findNpmPrefix from 'find-npm-prefix';
 
-const findNpmPrefix = require('find-npm-prefix');
-
-const HakEnv = require('./hakEnv');
+import HakEnv from './hakEnv';
+import { TargetId } from './target';
+import { DependencyInfo } from './dep';
 
 const GENERALCOMMANDS = [
     'target',
@@ -35,6 +36,13 @@ const MODULECOMMANDS = [
     'clean',
 ];
 
+// Shortcuts for multiple commands at once (useful for building universal binaries
+// because you can run the fetch/fetchDeps/build for each arch and then copy/link once)
+const METACOMMANDS = {
+    'fetchandbuild': ['check', 'fetch', 'fetchDeps', 'build'],
+    'copyandlink': ['copy', 'link'],
+};
+
 // Scripts valid in a hak.json 'scripts' section
 const HAKSCRIPTS = [
     'check',
@@ -53,15 +61,36 @@ async function main() {
         process.exit(1);
     }
 
-    const hakEnv = new HakEnv(prefix, packageJson);
+    const targetIds: TargetId[] = [];
+    // Apply `--target <target>` option if specified
+    // Can be specified multiple times for the copy command to bundle
+    // multiple archs into a single universal output module)
+    while (true) { // eslint-disable-line no-constant-condition
+        const targetIndex = process.argv.indexOf('--target');
+        if (targetIndex === -1) break;
 
-    const deps = {};
+        if ((targetIndex + 1) >= process.argv.length) {
+            console.error("--target option specified without a target");
+            process.exit(1);
+        }
+        // Extract target ID and remove from args
+        targetIds.push(process.argv.splice(targetIndex, 2)[1] as TargetId);
+    }
+
+    const hakEnvs = targetIds.map(tid => new HakEnv(prefix, tid));
+    if (hakEnvs.length == 0) hakEnvs.push(new HakEnv(prefix, null));
+    for (const h of hakEnvs) {
+        await h.init();
+    }
+    const hakEnv = hakEnvs[0];
+
+    const deps: Record<string, DependencyInfo> = {};
 
     const hakDepsCfg = packageJson.hakDependencies || {};
 
     for (const dep of Object.keys(hakDepsCfg)) {
         const hakJsonPath = path.join(prefix, 'hak', dep, 'hak.json');
-        let hakJson;
+        let hakJson: Record<string, any>;
         try {
             hakJson = await require(hakJsonPath);
         } catch (e) {
@@ -75,27 +104,42 @@ async function main() {
             cfg: hakJson,
             moduleHakDir: path.join(prefix, 'hak', dep),
             moduleDotHakDir: path.join(hakEnv.dotHakDir, dep),
-            moduleBuildDir: path.join(hakEnv.dotHakDir, dep, 'build'),
+            moduleTargetDotHakDir: path.join(hakEnv.dotHakDir, dep, hakEnv.getTargetId()),
+            moduleBuildDir: path.join(hakEnv.dotHakDir, dep, hakEnv.getTargetId(), 'build'),
+            moduleBuildDirs: hakEnvs.map(h => path.join(h.dotHakDir, dep, h.getTargetId(), 'build')),
             moduleOutDir: path.join(hakEnv.dotHakDir, 'hakModules', dep),
-            nodeModuleBinDir: path.join(hakEnv.dotHakDir, dep, 'build', 'node_modules', '.bin'),
-            depPrefix: path.join(hakEnv.dotHakDir, dep, 'opt'),
+            nodeModuleBinDir: path.join(hakEnv.dotHakDir, dep, hakEnv.getTargetId(), 'build', 'node_modules', '.bin'),
+            depPrefix: path.join(hakEnv.dotHakDir, dep, hakEnv.getTargetId(), 'opt'),
             scripts: {},
         };
 
         for (const s of HAKSCRIPTS) {
             if (hakJson.scripts && hakJson.scripts[s]) {
-                deps[dep].scripts[s] = require(path.join(prefix, 'hak', dep, hakJson.scripts[s]));
+                const scriptModule = await import(path.join(prefix, 'hak', dep, hakJson.scripts[s]));
+                if (scriptModule.__esModule) {
+                    deps[dep].scripts[s] = scriptModule.default;
+                } else {
+                    deps[dep].scripts[s] = scriptModule;
+                }
             }
         }
     }
 
-    let cmds;
+    let cmds: string[];
     if (process.argv.length < 3) {
         cmds = ['check', 'fetch', 'fetchDeps', 'build', 'copy', 'link'];
+    } else if (METACOMMANDS[process.argv[2]]) {
+        cmds = METACOMMANDS[process.argv[2]];
     } else {
         cmds = [process.argv[2]];
     }
 
+    if (hakEnvs.length > 1 && cmds.some(c => !['copy', 'link'].includes(c))) {
+        // We allow link here too for convenience because it's completely arch independent
+        console.error("Multiple targets only supported with the copy command");
+        return;
+    }
+
     let modules = process.argv.slice(3);
     if (modules.length === 0) modules = Object.keys(deps);
 
@@ -116,7 +160,7 @@ async function main() {
             process.exit(1);
         }
 
-        const cmdFunc = require('./' + cmd);
+        const cmdFunc = (await import('./' + cmd)).default;
 
         for (const mod of modules) {
             const depInfo = deps[mod];
@@ -133,4 +177,7 @@ async function main() {
     }
 }
 
-main().catch(() => process.exit(1));
+main().catch(err => {
+    console.error(err);
+    process.exit(1);
+});

scripts/hak/link.ts

@@ -14,12 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const path = require('path');
-const os = require('os');
-const fsProm = require('fs').promises;
-const childProcess = require('child_process');
+import path from 'path';
+import os from 'os';
+import fsProm from 'fs/promises';
+import childProcess from 'child_process';
 
-async function link(hakEnv, moduleInfo) {
+import HakEnv from './hakEnv';
+import { DependencyInfo } from './dep';
+
+export default async function link(hakEnv: HakEnv, moduleInfo: DependencyInfo): Promise<void> {
     const yarnrc = path.join(hakEnv.projectRoot, '.yarnrc');
     // this is fairly terrible but it's reasonably clunky to either parse a yarnrc
     // properly or get yarn to do it, so this will probably suffice for now.
@@ -46,7 +49,7 @@ async function link(hakEnv, moduleInfo) {
 
     const yarnCmd = 'yarn' + (hakEnv.isWin() ? '.cmd' : '');
 
-    await new Promise((resolve, reject) => {
+    await new Promise<void>((resolve, reject) => {
         const proc = childProcess.spawn(yarnCmd, ['link'], {
             cwd: moduleInfo.moduleOutDir,
             stdio: 'inherit',
@@ -56,7 +59,7 @@ async function link(hakEnv, moduleInfo) {
         });
     });
 
-    await new Promise((resolve, reject) => {
+    await new Promise<void>((resolve, reject) => {
         const proc = childProcess.spawn(yarnCmd, ['link', moduleInfo.name], {
             cwd: hakEnv.projectRoot,
             stdio: 'inherit',
@@ -66,5 +69,3 @@ async function link(hakEnv, moduleInfo) {
         });
     });
 }
-
-module.exports = link;

scripts/hak/target.ts

@@ -0,0 +1,196 @@
+/*
+Copyright 2021 The Matrix.org Foundation C.I.C.
+
+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.
+*/
+
+import { GLIBC, MUSL, family as processLibC } from "detect-libc";
+
+// We borrow Rust's target naming scheme as a way of expressing all target
+// details in a single string.
+// See https://doc.rust-lang.org/rustc/platform-support.html.
+export type TargetId =
+    'aarch64-apple-darwin' |
+    'x86_64-apple-darwin' |
+    'universal-apple-darwin' |
+    'i686-pc-windows-msvc' |
+    'x86_64-pc-windows-msvc' |
+    'i686-unknown-linux-musl' |
+    'i686-unknown-linux-gnu' |
+    'x86_64-unknown-linux-musl' |
+    'x86_64-unknown-linux-gnu' |
+    'aarch64-unknown-linux-musl' |
+    'aarch64-unknown-linux-gnu' |
+    'powerpc64le-unknown-linux-musl' |
+    'powerpc64le-unknown-linux-gnu';
+
+// Values are expected to match those used in `process.platform`.
+export type Platform = 'darwin' | 'linux' | 'win32';
+
+// Values are expected to match those used in `process.arch`.
+export type Arch = 'arm64' | 'ia32' | 'x64' | 'ppc64' | 'universal';
+
+// Values are expected to match those used by Visual Studio's `vcvarsall.bat`.
+// See https://docs.microsoft.com/cpp/build/building-on-the-command-line?view=msvc-160#vcvarsall-syntax
+export type VcVarsArch = 'amd64' | 'arm64' | 'x86';
+
+export type Target = {
+    id: TargetId;
+    platform: Platform;
+    arch: Arch;
+};
+
+export type WindowsTarget = Target & {
+    platform: 'win32';
+    vcVarsArch: VcVarsArch;
+};
+
+export type LinuxTarget = Target & {
+    platform: 'linux';
+    libC: typeof processLibC;
+};
+
+export type UniversalTarget = Target & {
+    arch: 'universal';
+    subtargets: Target[];
+};
+
+const aarch64AppleDarwin: Target = {
+    id: 'aarch64-apple-darwin',
+    platform: 'darwin',
+    arch: 'arm64',
+};
+
+const x8664AppleDarwin: Target = {
+    id: 'x86_64-apple-darwin',
+    platform: 'darwin',
+    arch: 'x64',
+};
+
+const universalAppleDarwin: UniversalTarget = {
+    id: 'universal-apple-darwin',
+    platform: 'darwin',
+    arch: 'universal',
+    subtargets: [
+        aarch64AppleDarwin,
+        x8664AppleDarwin,
+    ],
+};
+
+const i686PcWindowsMsvc: WindowsTarget = {
+    id: 'i686-pc-windows-msvc',
+    platform: 'win32',
+    arch: 'ia32',
+    vcVarsArch: 'x86',
+};
+
+const x8664PcWindowsMsvc: WindowsTarget = {
+    id: 'x86_64-pc-windows-msvc',
+    platform: 'win32',
+    arch: 'x64',
+    vcVarsArch: 'amd64',
+};
+
+const x8664UnknownLinuxGnu: LinuxTarget = {
+    id: 'x86_64-unknown-linux-gnu',
+    platform: 'linux',
+    arch: 'x64',
+    libC: GLIBC,
+};
+
+const x8664UnknownLinuxMusl: LinuxTarget = {
+    id: 'x86_64-unknown-linux-musl',
+    platform: 'linux',
+    arch: 'x64',
+    libC: MUSL,
+};
+
+const i686UnknownLinuxGnu: LinuxTarget = {
+    id: 'i686-unknown-linux-gnu',
+    platform: 'linux',
+    arch: 'ia32',
+    libC: GLIBC,
+};
+
+const i686UnknownLinuxMusl: LinuxTarget = {
+    id: 'i686-unknown-linux-musl',
+    platform: 'linux',
+    arch: 'ia32',
+    libC: MUSL,
+};
+
+const aarch64UnknownLinuxGnu: LinuxTarget = {
+    id: 'aarch64-unknown-linux-gnu',
+    platform: 'linux',
+    arch: 'arm64',
+    libC: GLIBC,
+};
+
+const aarch64UnknownLinuxMusl: LinuxTarget = {
+    id: 'aarch64-unknown-linux-musl',
+    platform: 'linux',
+    arch: 'arm64',
+    libC: MUSL,
+};
+
+const powerpc64leUnknownLinuxGnu: LinuxTarget = {
+    id: 'powerpc64le-unknown-linux-gnu',
+    platform: 'linux',
+    arch: 'ppc64',
+    libC: GLIBC,
+};
+
+const powerpc64leUnknownLinuxMusl: LinuxTarget = {
+    id: 'powerpc64le-unknown-linux-musl',
+    platform: 'linux',
+    arch: 'ppc64',
+    libC: MUSL,
+};
+
+export const TARGETS: Record<TargetId, Target> = {
+    // macOS
+    'aarch64-apple-darwin': aarch64AppleDarwin,
+    'x86_64-apple-darwin': x8664AppleDarwin,
+    'universal-apple-darwin': universalAppleDarwin,
+    // Windows
+    'i686-pc-windows-msvc': i686PcWindowsMsvc,
+    'x86_64-pc-windows-msvc': x8664PcWindowsMsvc,
+    // Linux
+    'i686-unknown-linux-musl': i686UnknownLinuxMusl,
+    'i686-unknown-linux-gnu': i686UnknownLinuxGnu,
+    'x86_64-unknown-linux-musl': x8664UnknownLinuxMusl,
+    'x86_64-unknown-linux-gnu': x8664UnknownLinuxGnu,
+    'aarch64-unknown-linux-musl': aarch64UnknownLinuxMusl,
+    'aarch64-unknown-linux-gnu': aarch64UnknownLinuxGnu,
+    'powerpc64le-unknown-linux-musl': powerpc64leUnknownLinuxMusl,
+    'powerpc64le-unknown-linux-gnu': powerpc64leUnknownLinuxGnu,
+};
+
+export function getHost(): Target | undefined {
+    return Object.values(TARGETS).find(target => (
+        target.platform === process.platform &&
+        target.arch === process.arch &&
+        (
+            process.platform !== 'linux' ||
+            (target as LinuxTarget).libC === processLibC
+        )
+    ));
+}
+
+export function isHostId(id: TargetId): boolean {
+    return getHost()?.id === id;
+}
+
+export function isHost(target: Target): boolean {
+    return getHost()?.id === target.id;
+}

scripts/hak/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+    "target": "es2017",
+    "module": "commonjs",
+    "sourceMap": false,
+    "lib": [
+      "es2019",
+    ]
+  },
+  "include": [
+    "./**/*.ts"
+  ],
+  "ts-node": {
+    "transpileOnly": true
+  }
+}

scripts/in-docker.sh

@@ -1,14 +1,17 @@
 #!/bin/bash
 
-docker inspect riot-desktop-dockerbuild 2> /dev/null > /dev/null
+IMAGE=${DOCKER_IMAGE_NAME:-"element-desktop-dockerbuild"}
+
+docker inspect "$IMAGE" 2> /dev/null > /dev/null
 if [ $? != 0 ]; then
-    echo "Docker image riot-desktop-dockerbuild not found. Have you run yarn run docker:setup?"
+    echo "Docker image $IMAGE not found. Have you run yarn run docker:setup?"
     exit 1
 fi
 
 # Taken from https://www.electron.build/multi-platform-build#docker
+# Pass through any vars prefixed with INDOCKER_, removing the prefix
 docker run --rm -ti \
- --env-file <(env | grep -iE '^BUILDKITE_API_KEY=') \
+ --env-file <(env | grep -E '^INDOCKER_' | sed -e 's/^INDOCKER_//') \
  --env ELECTRON_CACHE="/root/.cache/electron" \
  --env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \
  -v ${PWD}:/project \
@@ -17,4 +20,4 @@ docker run --rm -ti \
  -v ${PWD}/docker/.gnupg:/root/.gnupg \
  -v ~/.cache/electron:/root/.cache/electron \
  -v ~/.cache/electron-builder:/root/.cache/electron-builder \
- riot-desktop-dockerbuild "$@"
+ "$IMAGE" "$@"

scripts/mkrepo.sh

@@ -22,10 +22,10 @@ cp $confdir/conf_distributions $repodir/conf/distributions
 pushd $repodir
 for i in `cat conf/distributions | grep Codename | cut -d ' ' -f 2`
 do
-    reprepro includedeb $i $distdir/riot-desktop_${ver}_amd64.deb
+    reprepro includedeb $i $distdir/element-desktop_${ver}_amd64.deb
 done
 
-tar cvzf $distdir/riot-desktop_repo_$ver.tar.gz .
+tar cvzf $distdir/element-desktop_repo_$ver.tar.gz .
 
 popd
 

scripts/set-version.js

@@ -52,4 +52,4 @@ if (require.main === module) {
     main(process.argv.slice(2)).then((ret) => process.exit(ret));
 }
 
-module.exports = {versionFromAsar, setPackageVersion};
+module.exports = { versionFromAsar, setPackageVersion };

src/@types/global.d.ts

@@ -0,0 +1,46 @@
+/*
+Copyright 2021 - 2022 New Vector Ltd
+
+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.
+*/
+
+import { BrowserWindow } from "electron";
+import Store from "electron-store";
+import AutoLaunch from "auto-launch";
+
+import { AppLocalization } from "../language-helper";
+
+declare global {
+    namespace NodeJS {
+        interface Global {
+            mainWindow: BrowserWindow;
+            appQuitting: boolean;
+            appLocalization: AppLocalization;
+            launcher: AutoLaunch;
+            vectorConfig: Record<string, any>;
+            trayConfig: {
+                // eslint-disable-next-line camelcase
+                icon_path: string;
+                brand: string;
+            };
+            store: Store<{
+                warnBeforeExit?: boolean;
+                minimizeToTray?: boolean;
+                spellCheckerEnabled?: boolean;
+                autoHideMenuBar?: boolean;
+                locale?: string | string[];
+                disableHardwareAcceleration?: boolean;
+            }>;
+        }
+    }
+}

src/@types/keytar.d.ts

@@ -0,0 +1,54 @@
+// Based on https://github.com/atom/node-keytar/blob/master/keytar.d.ts because keytar is a hak-dependency and not a normal one
+// Definitions by: Milan Burda <https://github.com/miniak>, Brendan Forster <https://github.com/shiftkey>, Hari Juturu <https://github.com/juturu>
+// Adapted from DefinitelyTyped: https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/keytar/index.d.ts
+
+declare module "keytar" {
+    /**
+     * Get the stored password for the service and account.
+     *
+     * @param service The string service name.
+     * @param account The string account name.
+     *
+     * @returns A promise for the password string.
+     */
+    export function getPassword(service: string, account: string): Promise<string | null>;
+
+    /**
+     * Add the password for the service and account to the keychain.
+     *
+     * @param service The string service name.
+     * @param account The string account name.
+     * @param password The string password.
+     *
+     * @returns A promise for the set password completion.
+     */
+    export function setPassword(service: string, account: string, password: string): Promise<void>;
+
+    /**
+     * Delete the stored password for the service and account.
+     *
+     * @param service The string service name.
+     * @param account The string account name.
+     *
+     * @returns A promise for the deletion status. True on success.
+     */
+    export function deletePassword(service: string, account: string): Promise<boolean>;
+
+    /**
+     * Find a password for the service in the keychain.
+     *
+     * @param service The string service name.
+     *
+     * @returns A promise for the password string.
+     */
+    export function findPassword(service: string): Promise<string | null>;
+
+    /**
+     * Find all accounts and passwords for `service` in the keychain.
+     *
+     * @param service The string service name.
+     *
+     * @returns A promise for the array of found credentials.
+     */
+    export function findCredentials(service: string): Promise<Array<{ account: string, password: string}>>;
+}

src/@types/matrix-seshat.d.ts

@@ -0,0 +1,145 @@
+/*
+Copyright 2022 New Vector Ltd
+
+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.
+*/
+
+declare module "matrix-seshat" {
+    interface IConfig {
+        language?: string;
+        passphrase?: string;
+    }
+
+    /* eslint-disable camelcase */
+    interface IMatrixEvent {
+        event_id: string;
+        sender: string;
+        room_id: string;
+        origin_server_ts: number;
+        content: Record<string, any>;
+    }
+
+    interface IMatrixProfile {
+        displayname?: string;
+        avatar_url?: string;
+    }
+
+    interface ISearchArgs {
+        searchTerm: number;
+        limit: number;
+        before_limit: number;
+        after_limit: number;
+        order_by_recency: boolean;
+        next_batch?: string;
+    }
+
+    interface ISearchContext {
+        events_before: IMatrixEvent[];
+        events_after: IMatrixEvent[];
+        profile_info: { [userId: string]: IMatrixProfile };
+    }
+
+    interface ISearchResult {
+        next_batch: string;
+        count: number;
+        results: Array<{
+            rank: number;
+            result: IMatrixEvent;
+            context: ISearchContext;
+        }>;
+    }
+    /* eslint-enable camelcase */
+
+    interface ICheckpoint {
+        roomId: string;
+        token: string;
+        fullCrawl: boolean;
+        direction: "b" | "f";
+    }
+
+    interface IDatabaseStats {
+        size: number;
+        eventCount: number;
+        roomCount: number;
+    }
+
+    interface ILoadArgs {
+        roomId: string;
+        limit: number;
+        fromEvent: string;
+        direction: "b" | "f";
+    }
+
+    interface ILoadResult {
+        event: IMatrixEvent;
+        matrixProfile: IMatrixProfile;
+    }
+
+    export class Seshat {
+        constructor(path: string, config?: IConfig);
+        public addEvent(matrixEvent: IMatrixEvent, profile?: IMatrixProfile): void;
+        public deleteEvent(eventId: string): Promise<boolean>;
+        public commit(force?: boolean): Promise<number>;
+        public commitSync(wait?: boolean, force?: boolean): number;
+        public reload(): void;
+        public search(args: ISearchArgs): Promise<ISearchResult>;
+        public searchSync(
+            term: string,
+            limit?: number,
+            beforeLimit?: number,
+            afterLimit?: number,
+            orderByRecency?: boolean,
+        ): ISearchResult;
+        public addHistoricEventsSync(
+            events: IMatrixEvent[],
+            newCheckpoint?: ICheckpoint,
+            oldCheckpoint?: ICheckpoint,
+        ): boolean;
+        public addHistoricEvents(
+            events: IMatrixEvent[],
+            newCheckpoint?: ICheckpoint,
+            oldCheckpoint?: ICheckpoint,
+        ): Promise<boolean>;
+        public addCrawlerCheckpoint(checkpoint: ICheckpoint): Promise<void>;
+        public removeCrawlerCheckpoint(checkpoint: ICheckpoint): Promise<void>;
+        public loadCheckpoints(): Promise<ICheckpoint[]>;
+        public getSize(): Promise<number>;
+        public getStats(): Promise<IDatabaseStats>;
+        public delete(): Promise<void>;
+        public shutdown(): Promise<void>;
+        public changePassphrase(newPassphrase: string): Promise<void>;
+        public isEmpty(): Promise<boolean>;
+        public isRoomIndexed(roomId: string): Promise<boolean>;
+        public getUserVersion(): Promise<number>;
+        public setUserVersion(version: number): Promise<void>;
+        public loadFileEvents(args: ILoadArgs): Promise<ILoadResult[]>;
+    }
+
+    interface IRecoveryInfo {
+        totalEvents: number;
+        reindexedEvents: number;
+        done: number;
+    }
+
+    export class SeshatRecovery {
+        constructor(path: string, config?: IConfig);
+        public info(): IRecoveryInfo;
+        public getUserVersion(): Promise<number>;
+        public shutdown(): Promise<void>;
+        public reindex(): Promise<void>;
+    }
+
+    export class ReindexError extends Error {
+        constructor(message?: string);
+    }
+}

src/electron-main.js

@@ -1,816 +0,0 @@
-/*
-Copyright 2016 Aviral Dasgupta
-Copyright 2016 OpenMarket Ltd
-Copyright 2018, 2019 New Vector Ltd
-Copyright 2017, 2019 Michael Telatynski <7t3chguy@gmail.com>
-
-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.
-*/
-
-// Squirrel on windows starts the app with various flags
-// as hooks to tell us when we've been installed/uninstalled
-// etc.
-const checkSquirrelHooks = require('./squirrelhooks');
-if (checkSquirrelHooks()) return;
-
-const argv = require('minimist')(process.argv, {
-    alias: {help: "h"},
-});
-
-const {app, ipcMain, powerSaveBlocker, BrowserWindow, Menu, autoUpdater, protocol} = require('electron');
-const AutoLaunch = require('auto-launch');
-const path = require('path');
-
-const tray = require('./tray');
-const vectorMenu = require('./vectormenu');
-const webContentsHandler = require('./webcontents-handler');
-const updater = require('./updater');
-const {getProfileFromDeeplink, protocolInit, recordSSOSession} = require('./protocol');
-
-const windowStateKeeper = require('electron-window-state');
-const Store = require('electron-store');
-
-const fs = require('fs');
-const afs = fs.promises;
-
-let seshatSupported = false;
-let Seshat;
-let SeshatRecovery;
-let ReindexError;
-
-const seshatPassphrase = "DEFAULT_PASSPHRASE";
-
-try {
-    const seshatModule = require('matrix-seshat');
-    Seshat = seshatModule.Seshat;
-    SeshatRecovery = seshatModule.SeshatRecovery;
-    ReindexError = seshatModule.ReindexError;
-    seshatSupported = true;
-} catch (e) {
-    if (e.code === "MODULE_NOT_FOUND") {
-        console.log("Seshat isn't installed, event indexing is disabled.");
-    } else {
-        console.warn("Seshat unexpected error:", e);
-    }
-}
-
-// Things we need throughout the file but need to be created
-// async to are initialised in setupGlobals()
-let asarPath;
-let resPath;
-let vectorConfig;
-let iconPath;
-let trayConfig;
-let launcher;
-
-if (argv["help"]) {
-    console.log("Options:");
-    console.log("  --profile-dir {path}: Path to where to store the profile.");
-    console.log("  --profile {name}:     Name of alternate profile to use, allows for running multiple accounts.");
-    console.log("  --devtools:           Install and use react-devtools and react-perf.");
-    console.log("  --no-update:          Disable automatic updating.");
-    console.log("  --hidden:             Start the application hidden in the system tray.");
-    console.log("  --help:               Displays this help message.");
-    console.log("And more such as --proxy, see:" +
-        "https://electronjs.org/docs/api/chrome-command-line-switches#supported-chrome-command-line-switches");
-    app.exit();
-}
-
-// check if we are passed a profile in the SSO callback url
-const userDataPathInProtocol = getProfileFromDeeplink(argv["_"]);
-if (userDataPathInProtocol) {
-    app.setPath('userData', userDataPathInProtocol);
-} else if (argv['profile-dir']) {
-    app.setPath('userData', argv['profile-dir']);
-} else if (argv['profile']) {
-    app.setPath('userData', `${app.getPath('userData')}-${argv['profile']}`);
-}
-
-async function tryPaths(name, root, rawPaths) {
-    // Make everything relative to root
-    const paths = rawPaths.map(p => path.join(root, p));
-
-    for (const p of paths) {
-        try {
-            await afs.stat(p);
-            return p + '/';
-        } catch (e) {
-        }
-    }
-    console.log(`Couldn't find ${name} files in any of: `);
-    for (const p of paths) {
-        console.log("\t"+path.resolve(p));
-    }
-    throw new Error(`Failed to find ${name} files`);
-}
-
-// Find the webapp resources and set up things that require them
-async function setupGlobals() {
-    // find the webapp asar.
-    asarPath = await tryPaths("webapp", __dirname, [
-        // If run from the source checkout, this will be in the directory above
-        '../webapp.asar',
-        // but if run from a packaged application, electron-main.js will be in
-        // a different asar file so it will be two levels above
-        '../../webapp.asar',
-        // also try without the 'asar' suffix to allow symlinking in a directory
-        '../webapp',
-        // from a packaged application
-        '../../webapp',
-    ]);
-
-    // we assume the resources path is in the same place as the asar
-    resPath = await tryPaths("res", path.dirname(asarPath), [
-        // If run from the source checkout
-        'res',
-        // if run from packaged application
-        '',
-    ]);
-
-    try {
-        vectorConfig = require(asarPath + 'config.json');
-    } catch (e) {
-        // it would be nice to check the error code here and bail if the config
-        // is unparseable, but we get MODULE_NOT_FOUND in the case of a missing
-        // file or invalid json, so node is just very unhelpful.
-        // Continue with the defaults (ie. an empty config)
-        vectorConfig = {};
-    }
-
-    try {
-        // Load local config and use it to override values from the one baked with the build
-        const localConfig = require(path.join(app.getPath('userData'), 'config.json'));
-
-        // If the local config has a homeserver defined, don't use the homeserver from the build
-        // config. This is to avoid a problem where Riot thinks there are multiple homeservers
-        // defined, and panics as a result.
-        const homeserverProps = ['default_is_url', 'default_hs_url', 'default_server_name', 'default_server_config'];
-        if (Object.keys(localConfig).find(k => homeserverProps.includes(k))) {
-            // Rip out all the homeserver options from the vector config
-            vectorConfig = Object.keys(vectorConfig)
-                .filter(k => !homeserverProps.includes(k))
-                .reduce((obj, key) => {obj[key] = vectorConfig[key]; return obj;}, {});
-        }
-
-        vectorConfig = Object.assign(vectorConfig, localConfig);
-    } catch (e) {
-        // Could not load local config, this is expected in most cases.
-    }
-
-    // The tray icon
-    // It's important to call `path.join` so we don't end up with the packaged asar in the final path.
-    const iconFile = `riot.${process.platform === 'win32' ? 'ico' : 'png'}`;
-    iconPath = path.join(resPath, "img", iconFile);
-    trayConfig = {
-        icon_path: iconPath,
-        brand: vectorConfig.brand || 'Riot',
-    };
-
-    // launcher
-    launcher = new AutoLaunch({
-        name: vectorConfig.brand || 'Riot',
-        isHidden: true,
-        mac: {
-            useLaunchAgent: true,
-        },
-    });
-}
-
-const eventStorePath = path.join(app.getPath('userData'), 'EventStore');
-const store = new Store({ name: "electron-config" });
-
-let eventIndex = null;
-
-let mainWindow = null;
-global.appQuitting = false;
-
-// handle uncaught errors otherwise it displays
-// stack traces in popup dialogs, which is terrible (which
-// it will do any time the auto update poke fails, and there's
-// no other way to catch this error).
-// Assuming we generally run from the console when developing,
-// this is far preferable.
-process.on('uncaughtException', function(error) {
-    console.log('Unhandled exception', error);
-});
-
-let focusHandlerAttached = false;
-ipcMain.on('setBadgeCount', function(ev, count) {
-    app.badgeCount = count;
-    if (count === 0 && mainWindow) {
-        mainWindow.flashFrame(false);
-    }
-});
-
-ipcMain.on('loudNotification', function() {
-    if (process.platform === 'win32' && mainWindow && !mainWindow.isFocused() && !focusHandlerAttached) {
-        mainWindow.flashFrame(true);
-        mainWindow.once('focus', () => {
-            mainWindow.flashFrame(false);
-            focusHandlerAttached = false;
-        });
-        focusHandlerAttached = true;
-    }
-});
-
-let powerSaveBlockerId = null;
-ipcMain.on('app_onAction', function(ev, payload) {
-    switch (payload.action) {
-        case 'call_state':
-            if (powerSaveBlockerId !== null && powerSaveBlocker.isStarted(powerSaveBlockerId)) {
-                if (payload.state === 'ended') {
-                    powerSaveBlocker.stop(powerSaveBlockerId);
-                    powerSaveBlockerId = null;
-                }
-            } else {
-                if (powerSaveBlockerId === null && payload.state === 'connected') {
-                    powerSaveBlockerId = powerSaveBlocker.start('prevent-display-sleep');
-                }
-            }
-            break;
-    }
-});
-
-autoUpdater.on('update-downloaded', (ev, releaseNotes, releaseName, releaseDate, updateURL) => {
-    if (!mainWindow) return;
-    // forward to renderer
-    mainWindow.webContents.send('update-downloaded', {
-        releaseNotes,
-        releaseName,
-        releaseDate,
-        updateURL,
-    });
-});
-
-ipcMain.on('ipcCall', async function(ev, payload) {
-    if (!mainWindow) return;
-
-    const args = payload.args || [];
-    let ret;
-
-    switch (payload.name) {
-        case 'getUpdateFeedUrl':
-            ret = autoUpdater.getFeedURL();
-            break;
-        case 'getAutoLaunchEnabled':
-            ret = await launcher.isEnabled();
-            break;
-        case 'setAutoLaunchEnabled':
-            if (args[0]) {
-                launcher.enable();
-            } else {
-                launcher.disable();
-            }
-            break;
-        case 'getMinimizeToTrayEnabled':
-            ret = tray.hasTray();
-            break;
-        case 'setMinimizeToTrayEnabled':
-            if (args[0]) {
-                // Create trayIcon icon
-                tray.create(trayConfig);
-            } else {
-                tray.destroy();
-            }
-            store.set('minimizeToTray', args[0]);
-            break;
-        case 'getAutoHideMenuBarEnabled':
-            ret = global.mainWindow.autoHideMenuBar;
-            break;
-        case 'setAutoHideMenuBarEnabled':
-            store.set('autoHideMenuBar', args[0]);
-            global.mainWindow.autoHideMenuBar = Boolean(args[0]);
-            global.mainWindow.setMenuBarVisibility(!args[0]);
-            break;
-        case 'getAppVersion':
-            ret = app.getVersion();
-            break;
-        case 'focusWindow':
-            if (mainWindow.isMinimized()) {
-                mainWindow.restore();
-            } else if (!mainWindow.isVisible()) {
-                mainWindow.show();
-            } else {
-                mainWindow.focus();
-            }
-            break;
-        case 'getConfig':
-            ret = vectorConfig;
-            break;
-        case 'navigateBack':
-            if (mainWindow.webContents.canGoBack()) {
-                mainWindow.webContents.goBack();
-            }
-            break;
-        case 'navigateForward':
-            if (mainWindow.webContents.canGoForward()) {
-                mainWindow.webContents.goForward();
-            }
-            break;
-        case 'setLanguage': {
-            // work around `setSpellCheckerLanguages` being case-sensitive by converting to expected case
-            const caseMap = {};
-            const availableLanguages = mainWindow.webContents.session.availableSpellCheckerLanguages;
-            availableLanguages.forEach(lang => {
-                caseMap[lang.toLowerCase()] = lang;
-            });
-
-            if (!caseMap["en"]) {
-                // default special-case for `en` as in Riot is actually implies `en-GB`. `en-US` is distinct.
-                // this way if `en` is requested and not available and `en-GB` is available it'll be used.
-                caseMap["en"] = caseMap["en-gb"];
-            }
-
-            const languages = new Set();
-            args[0].forEach(lang => {
-                const lcLang = lang.toLowerCase();
-                if (caseMap[lcLang]) {
-                    languages.add(caseMap[lcLang]);
-                    return;
-                }
-
-                // as a fallback if the language is unknown check if the language group is known, e.g en for en-AU
-                const langGroup = lcLang.split("-")[0];
-                if (caseMap[langGroup]) {
-                    languages.add(caseMap[langGroup]);
-                    return;
-                }
-
-                // as a further fallback, pick all other matching variants from the same language group
-                // this means that if we cannot find `ar-dz` or `ar` for example, we will pick `ar-*` to
-                // offer a spellcheck which is least likely to wrongly red underline something.
-                availableLanguages.forEach(availableLang => {
-                    if (availableLang.startsWith(langGroup)) {
-                        languages.add(availableLang);
-                    }
-                });
-            });
-
-            if (languages.size > 0) {
-                mainWindow.webContents.session.setSpellCheckerLanguages([...languages]);
-            }
-            break;
-        }
-        case 'startSSOFlow':
-            recordSSOSession(args[0]);
-            break;
-
-        default:
-            mainWindow.webContents.send('ipcReply', {
-                id: payload.id,
-                error: "Unknown IPC Call: " + payload.name,
-            });
-            return;
-    }
-
-    mainWindow.webContents.send('ipcReply', {
-        id: payload.id,
-        reply: ret,
-    });
-});
-
-ipcMain.on('seshat', async function(ev, payload) {
-    if (!mainWindow) return;
-
-    const sendError = (id, e) => {
-        const error = {
-            message: e.message,
-        };
-
-        mainWindow.webContents.send('seshatReply', {
-            id: id,
-            error: error,
-        });
-    };
-
-    const args = payload.args || [];
-    let ret;
-
-    switch (payload.name) {
-        case 'supportsEventIndexing':
-            ret = seshatSupported;
-            break;
-
-        case 'initEventIndex':
-            if (eventIndex === null) {
-                try {
-                    await afs.mkdir(eventStorePath, {recursive: true});
-                    eventIndex = new Seshat(eventStorePath, {passphrase: seshatPassphrase});
-                } catch (e) {
-                    if (e instanceof ReindexError) {
-                        // If this is a reindex error, the index schema
-                        // changed. Try to open the database in recovery mode,
-                        // reindex the database and finally try to open the
-                        // database again.
-                        try {
-                            const recoveryIndex = new SeshatRecovery(eventStorePath, {
-                                passphrase: seshatPassphrase,
-                            });
-                            await recoveryIndex.reindex();
-                            eventIndex = new Seshat(eventStorePath, {
-                                passphrase: seshatPassphrase,
-                            });
-                        } catch (e) {
-                            sendError(payload.id, e);
-                            return;
-                        }
-                    } else {
-                        sendError(payload.id, e);
-                        return;
-                    }
-                }
-            }
-            break;
-
-        case 'closeEventIndex':
-            if (eventIndex !== null) {
-                const index = eventIndex;
-                eventIndex = null;
-
-                try {
-                    await index.shutdown();
-                } catch (e) {
-                    sendError(payload.id, e);
-                    return;
-                }
-            }
-            break;
-
-        case 'deleteEventIndex':
-            {
-                const deleteFolderRecursive = async (p) => {
-                    for (const entry of await afs.readdir(p)) {
-                        const curPath = path.join(p, entry);
-                        await afs.unlink(curPath);
-                    }
-                };
-
-                try {
-                    await deleteFolderRecursive(eventStorePath);
-                } catch (e) {
-                }
-            }
-
-            break;
-
-        case 'isEventIndexEmpty':
-            if (eventIndex === null) ret = true;
-            else ret = await eventIndex.isEmpty();
-            break;
-
-        case 'addEventToIndex':
-            try {
-                eventIndex.addEvent(args[0], args[1]);
-            } catch (e) {
-                sendError(payload.id, e);
-                return;
-            }
-            break;
-
-        case 'deleteEvent':
-            try {
-                ret = await eventIndex.deleteEvent(args[0]);
-            } catch (e) {
-                sendError(payload.id, e);
-                return;
-            }
-            break;
-
-        case 'commitLiveEvents':
-            try {
-                ret = await eventIndex.commit();
-            } catch (e) {
-                sendError(payload.id, e);
-                return;
-            }
-            break;
-
-        case 'searchEventIndex':
-            try {
-                ret = await eventIndex.search(args[0]);
-            } catch (e) {
-                sendError(payload.id, e);
-                return;
-            }
-            break;
-
-        case 'addHistoricEvents':
-            if (eventIndex === null) ret = false;
-            else {
-                try {
-                    ret = await eventIndex.addHistoricEvents(
-                        args[0], args[1], args[2]);
-                } catch (e) {
-                    sendError(payload.id, e);
-                    return;
-                }
-            }
-            break;
-
-        case 'getStats':
-            if (eventIndex === null) ret = 0;
-            else {
-                try {
-                    ret = await eventIndex.getStats();
-                } catch (e) {
-                    sendError(payload.id, e);
-                    return;
-                }
-            }
-            break;
-
-        case 'removeCrawlerCheckpoint':
-            if (eventIndex === null) ret = false;
-            else {
-                try {
-                    ret = await eventIndex.removeCrawlerCheckpoint(args[0]);
-                } catch (e) {
-                    sendError(payload.id, e);
-                    return;
-                }
-            }
-            break;
-
-        case 'addCrawlerCheckpoint':
-            if (eventIndex === null) ret = false;
-            else {
-                try {
-                    ret = await eventIndex.addCrawlerCheckpoint(args[0]);
-                } catch (e) {
-                    sendError(payload.id, e);
-                    return;
-                }
-            }
-            break;
-
-        case 'loadFileEvents':
-            if (eventIndex === null) ret = [];
-            else {
-                try {
-                    ret = await eventIndex.loadFileEvents(args[0]);
-                } catch (e) {
-                    sendError(payload.id, e);
-                    return;
-                }
-            }
-            break;
-
-        case 'loadCheckpoints':
-            if (eventIndex === null) ret = [];
-            else {
-                try {
-                    ret = await eventIndex.loadCheckpoints();
-                } catch (e) {
-                    ret = [];
-                }
-            }
-            break;
-
-        default:
-            mainWindow.webContents.send('seshatReply', {
-                id: payload.id,
-                error: "Unknown IPC Call: " + payload.name,
-            });
-            return;
-    }
-
-    mainWindow.webContents.send('seshatReply', {
-        id: payload.id,
-        reply: ret,
-    });
-});
-
-app.commandLine.appendSwitch('--enable-usermedia-screen-capturing');
-
-const gotLock = app.requestSingleInstanceLock();
-if (!gotLock) {
-    console.log('Other instance detected: exiting');
-    app.exit();
-}
-
-// do this after we know we are the primary instance of the app
-protocolInit();
-
-// Register the scheme the app is served from as 'standard'
-// which allows things like relative URLs and IndexedDB to
-// work.
-// Also mark it as secure (ie. accessing resources from this
-// protocol and HTTPS won't trigger mixed content warnings).
-protocol.registerSchemesAsPrivileged([{
-    scheme: 'vector',
-    privileges: {
-        standard: true,
-        secure: true,
-        supportFetchAPI: true,
-    },
-}]);
-
-app.on('ready', async () => {
-    try {
-        await setupGlobals();
-    } catch (e) {
-        console.log("App setup failed: exiting", e);
-        process.exit(1);
-        // process.exit doesn't cause node to stop running code immediately,
-        // so return (we could let the exception propagate but then we end up
-        // with node printing all sorts of stuff about unhandled exceptions
-        // when we want the actual error to be as obvious as possible).
-        return;
-    }
-
-    if (argv['devtools']) {
-        try {
-            const { default: installExt, REACT_DEVELOPER_TOOLS, REACT_PERF } = require('electron-devtools-installer');
-            installExt(REACT_DEVELOPER_TOOLS)
-                .then((name) => console.log(`Added Extension: ${name}`))
-                .catch((err) => console.log('An error occurred: ', err));
-            installExt(REACT_PERF)
-                .then((name) => console.log(`Added Extension: ${name}`))
-                .catch((err) => console.log('An error occurred: ', err));
-        } catch (e) {
-            console.log(e);
-        }
-    }
-
-    protocol.registerFileProtocol('vector', (request, callback) => {
-        if (request.method !== 'GET') {
-            callback({error: -322}); // METHOD_NOT_SUPPORTED from chromium/src/net/base/net_error_list.h
-            return null;
-        }
-
-        const parsedUrl = new URL(request.url);
-        if (parsedUrl.protocol !== 'vector:') {
-            callback({error: -302}); // UNKNOWN_URL_SCHEME
-            return;
-        }
-        if (parsedUrl.host !== 'vector') {
-            callback({error: -105}); // NAME_NOT_RESOLVED
-            return;
-        }
-
-        const target = parsedUrl.pathname.split('/');
-
-        // path starts with a '/'
-        if (target[0] !== '') {
-            callback({error: -6}); // FILE_NOT_FOUND
-            return;
-        }
-
-        if (target[target.length - 1] == '') {
-            target[target.length - 1] = 'index.html';
-        }
-
-        let baseDir;
-        if (target[1] === 'webapp') {
-            baseDir = asarPath;
-        } else {
-            callback({error: -6}); // FILE_NOT_FOUND
-            return;
-        }
-
-        // Normalise the base dir and the target path separately, then make sure
-        // the target path isn't trying to back out beyond its root
-        baseDir = path.normalize(baseDir);
-
-        const relTarget = path.normalize(path.join(...target.slice(2)));
-        if (relTarget.startsWith('..')) {
-            callback({error: -6}); // FILE_NOT_FOUND
-            return;
-        }
-        const absTarget = path.join(baseDir, relTarget);
-
-        callback({
-            path: absTarget,
-        });
-    });
-
-    if (argv['no-update']) {
-        console.log('Auto update disabled via command line flag "--no-update"');
-    } else if (vectorConfig['update_base_url']) {
-        console.log(`Starting auto update with base URL: ${vectorConfig['update_base_url']}`);
-        updater.start(vectorConfig['update_base_url']);
-    } else {
-        console.log('No update_base_url is defined: auto update is disabled');
-    }
-
-    // Load the previous window state with fallback to defaults
-    const mainWindowState = windowStateKeeper({
-        defaultWidth: 1024,
-        defaultHeight: 768,
-    });
-
-    const preloadScript = path.normalize(`${__dirname}/preload.js`);
-    mainWindow = global.mainWindow = new BrowserWindow({
-        // https://www.electronjs.org/docs/faq#the-font-looks-blurry-what-is-this-and-what-can-i-do
-        backgroundColor: '#fff',
-
-        icon: iconPath,
-        show: false,
-        autoHideMenuBar: store.get('autoHideMenuBar', true),
-
-        x: mainWindowState.x,
-        y: mainWindowState.y,
-        width: mainWindowState.width,
-        height: mainWindowState.height,
-        webPreferences: {
-            preload: preloadScript,
-            nodeIntegration: false,
-            sandbox: true,
-            enableRemoteModule: false,
-            // We don't use this: it's useful for the preload script to
-            // share a context with the main page so we can give select
-            // objects to the main page. The sandbox option isolates the
-            // main page from the background script.
-            contextIsolation: false,
-            webgl: false,
-            spellcheck: true,
-        },
-    });
-    mainWindow.loadURL('vector://vector/webapp/');
-    Menu.setApplicationMenu(vectorMenu);
-
-    // Create trayIcon icon
-    if (store.get('minimizeToTray', true)) tray.create(trayConfig);
-
-    mainWindow.once('ready-to-show', () => {
-        mainWindowState.manage(mainWindow);
-
-        if (!argv['hidden']) {
-            mainWindow.show();
-        } else {
-            // hide here explicitly because window manage above sometimes shows it
-            mainWindow.hide();
-        }
-    });
-
-    mainWindow.on('closed', () => {
-        mainWindow = global.mainWindow = null;
-    });
-    mainWindow.on('close', (e) => {
-        // If we are not quitting and have a tray icon then minimize to tray
-        if (!global.appQuitting && (tray.hasTray() || process.platform === 'darwin')) {
-            // On Mac, closing the window just hides it
-            // (this is generally how single-window Mac apps
-            // behave, eg. Mail.app)
-            e.preventDefault();
-            mainWindow.hide();
-            return false;
-        }
-    });
-
-    if (process.platform === 'win32') {
-        // Handle forward/backward mouse buttons in Windows
-        mainWindow.on('app-command', (e, cmd) => {
-            if (cmd === 'browser-backward' && mainWindow.webContents.canGoBack()) {
-                mainWindow.webContents.goBack();
-            } else if (cmd === 'browser-forward' && mainWindow.webContents.canGoForward()) {
-                mainWindow.webContents.goForward();
-            }
-        });
-    }
-
-    webContentsHandler(mainWindow.webContents);
-});
-
-app.on('window-all-closed', () => {
-    app.quit();
-});
-
-app.on('activate', () => {
-    mainWindow.show();
-});
-
-app.on('before-quit', () => {
-    global.appQuitting = true;
-    if (mainWindow) {
-        mainWindow.webContents.send('before-quit');
-    }
-});
-
-app.on('second-instance', (ev, commandLine, workingDirectory) => {
-    // If other instance launched with --hidden then skip showing window
-    if (commandLine.includes('--hidden')) return;
-
-    // Someone tried to run a second instance, we should focus our window.
-    if (mainWindow) {
-        if (!mainWindow.isVisible()) mainWindow.show();
-        if (mainWindow.isMinimized()) mainWindow.restore();
-        mainWindow.focus();
-    }
-});
-
-// Set the App User Model ID to match what the squirrel
-// installer uses for the shortcut icon.
-// This makes notifications work on windows 8.1 (and is
-// a noop on other platforms).
-app.setAppUserModelId('com.squirrel.riot-web.Riot');

src/electron-main.ts

@@ -0,0 +1,536 @@
+/*
+Copyright 2016 Aviral Dasgupta
+Copyright 2016 OpenMarket Ltd
+Copyright 2017, 2019 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2018 - 2021 New Vector Ltd
+
+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.
+*/
+
+// Squirrel on windows starts the app with various flags as hooks to tell us when we've been installed/uninstalled etc.
+import "./squirrelhooks";
+import {
+    app,
+    BrowserWindow,
+    Menu,
+    autoUpdater,
+    protocol,
+    dialog,
+} from "electron";
+import AutoLaunch from "auto-launch";
+import path from "path";
+import windowStateKeeper from 'electron-window-state';
+import Store from 'electron-store';
+import fs, { promises as afs } from "fs";
+import { URL } from "url";
+import minimist from "minimist";
+
+import "./ipc";
+import "./keytar";
+import "./seshat";
+import "./settings";
+import * as tray from "./tray";
+import { buildMenuTemplate } from './vectormenu';
+import webContentsHandler from './webcontents-handler';
+import * as updater from './updater';
+import { getProfileFromDeeplink, protocolInit } from './protocol';
+import { _t, AppLocalization } from './language-helper';
+import Input = Electron.Input;
+
+const argv = minimist(process.argv, {
+    alias: { help: "h" },
+});
+
+// Things we need throughout the file but need to be created
+// async to are initialised in setupGlobals()
+let asarPath: string;
+let resPath: string;
+let iconPath: string;
+
+if (argv["help"]) {
+    console.log("Options:");
+    console.log("  --profile-dir {path}: Path to where to store the profile.");
+    console.log("  --profile {name}:     Name of alternate profile to use, allows for running multiple accounts.");
+    console.log("  --devtools:           Install and use react-devtools and react-perf.");
+    console.log("  --no-update:          Disable automatic updating.");
+    console.log("  --hidden:             Start the application hidden in the system tray.");
+    console.log("  --help:               Displays this help message.");
+    console.log("And more such as --proxy, see:" +
+        "https://electronjs.org/docs/api/command-line-switches");
+    app.exit();
+}
+
+// Electron creates the user data directory (with just an empty 'Dictionaries' directory...)
+// as soon as the app path is set, so pick a random path in it that must exist if it's a
+// real user data directory.
+function isRealUserDataDir(d: string): boolean {
+    return fs.existsSync(path.join(d, 'IndexedDB'));
+}
+
+// check if we are passed a profile in the SSO callback url
+let userDataPath: string;
+
+const userDataPathInProtocol = getProfileFromDeeplink(argv["_"]);
+if (userDataPathInProtocol) {
+    userDataPath = userDataPathInProtocol;
+} else if (argv['profile-dir']) {
+    userDataPath = argv['profile-dir'];
+} else {
+    let newUserDataPath = app.getPath('userData');
+    if (argv['profile']) {
+        newUserDataPath += '-' + argv['profile'];
+    }
+    const newUserDataPathExists = isRealUserDataDir(newUserDataPath);
+    let oldUserDataPath = path.join(app.getPath('appData'), app.getName().replace('Element', 'Riot'));
+    if (argv['profile']) {
+        oldUserDataPath += '-' + argv['profile'];
+    }
+
+    const oldUserDataPathExists = isRealUserDataDir(oldUserDataPath);
+    console.log(newUserDataPath + " exists: " + (newUserDataPathExists ? 'yes' : 'no'));
+    console.log(oldUserDataPath + " exists: " + (oldUserDataPathExists ? 'yes' : 'no'));
+    if (!newUserDataPathExists && oldUserDataPathExists) {
+        console.log("Using legacy user data path: " + oldUserDataPath);
+        userDataPath = oldUserDataPath;
+    } else {
+        userDataPath = newUserDataPath;
+    }
+}
+app.setPath('userData', userDataPath);
+
+async function tryPaths(name: string, root: string, rawPaths: string[]): Promise<string> {
+    // Make everything relative to root
+    const paths = rawPaths.map(p => path.join(root, p));
+
+    for (const p of paths) {
+        try {
+            await afs.stat(p);
+            return p + '/';
+        } catch (e) {
+        }
+    }
+    console.log(`Couldn't find ${name} files in any of: `);
+    for (const p of paths) {
+        console.log("\t"+path.resolve(p));
+    }
+    throw new Error(`Failed to find ${name} files`);
+}
+
+// Find the webapp resources and set up things that require them
+async function setupGlobals(): Promise<void> {
+    // find the webapp asar.
+    asarPath = await tryPaths("webapp", __dirname, [
+        // If run from the source checkout, this will be in the directory above
+        '../webapp.asar',
+        // but if run from a packaged application, electron-main.js will be in
+        // a different asar file so it will be two levels above
+        '../../webapp.asar',
+        // also try without the 'asar' suffix to allow symlinking in a directory
+        '../webapp',
+        // from a packaged application
+        '../../webapp',
+    ]);
+
+    // we assume the resources path is in the same place as the asar
+    resPath = await tryPaths("res", path.dirname(asarPath), [
+        // If run from the source checkout
+        'res',
+        // if run from packaged application
+        '',
+    ]);
+
+    try {
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        global.vectorConfig = require(asarPath + 'config.json');
+    } catch (e) {
+        // it would be nice to check the error code here and bail if the config
+        // is unparsable, but we get MODULE_NOT_FOUND in the case of a missing
+        // file or invalid json, so node is just very unhelpful.
+        // Continue with the defaults (ie. an empty config)
+        global.vectorConfig = {};
+    }
+
+    try {
+        // Load local config and use it to override values from the one baked with the build
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const localConfig = require(path.join(app.getPath('userData'), 'config.json'));
+
+        // If the local config has a homeserver defined, don't use the homeserver from the build
+        // config. This is to avoid a problem where Riot thinks there are multiple homeservers
+        // defined, and panics as a result.
+        const homeserverProps = ['default_is_url', 'default_hs_url', 'default_server_name', 'default_server_config'];
+        if (Object.keys(localConfig).find(k => homeserverProps.includes(k))) {
+            // Rip out all the homeserver options from the vector config
+            global.vectorConfig = Object.keys(global.vectorConfig)
+                .filter(k => !homeserverProps.includes(k))
+                .reduce((obj, key) => {obj[key] = global.vectorConfig[key]; return obj;}, {});
+        }
+
+        global.vectorConfig = Object.assign(global.vectorConfig, localConfig);
+    } catch (e) {
+        if (e instanceof SyntaxError) {
+            dialog.showMessageBox({
+                type: "error",
+                title: `Your ${global.vectorConfig.brand || 'Element'} is misconfigured`,
+                message: `Your custom ${global.vectorConfig.brand || 'Element'} configuration contains invalid JSON. ` +
+                         `Please correct the problem and reopen ${global.vectorConfig.brand || 'Element'}.`,
+                detail: e.message || "",
+            });
+        }
+
+        // Could not load local config, this is expected in most cases.
+    }
+
+    // The tray icon
+    // It's important to call `path.join` so we don't end up with the packaged asar in the final path.
+    const iconFile = `element.${process.platform === 'win32' ? 'ico' : 'png'}`;
+    iconPath = path.join(resPath, "img", iconFile);
+    global.trayConfig = {
+        icon_path: iconPath,
+        brand: global.vectorConfig.brand || 'Element',
+    };
+
+    // launcher
+    global.launcher = new AutoLaunch({
+        name: global.vectorConfig.brand || 'Element',
+        isHidden: true,
+        mac: {
+            useLaunchAgent: true,
+        },
+    });
+}
+
+async function moveAutoLauncher(): Promise<void> {
+    // Look for an auto-launcher under 'Riot' and if we find one, port it's
+    // enabled/disabled-ness over to the new 'Element' launcher
+    if (!global.vectorConfig.brand || global.vectorConfig.brand === 'Element') {
+        const oldLauncher = new AutoLaunch({
+            name: 'Riot',
+            isHidden: true,
+            mac: {
+                useLaunchAgent: true,
+            },
+        });
+        const wasEnabled = await oldLauncher.isEnabled();
+        if (wasEnabled) {
+            await oldLauncher.disable();
+            await global.launcher.enable();
+        }
+    }
+}
+
+global.store = new Store({ name: "electron-config" });
+
+global.appQuitting = false;
+
+const exitShortcuts: Array<(input: Input, platform: string) => boolean> = [
+    (input, platform) => platform !== 'darwin' && input.alt && input.key.toUpperCase() === 'F4',
+    (input, platform) => platform !== 'darwin' && input.control && input.key.toUpperCase() === 'Q',
+    (input, platform) => platform === 'darwin' && input.meta && input.key.toUpperCase() === 'Q',
+];
+
+const warnBeforeExit = (event: Event, input: Input): void => {
+    const shouldWarnBeforeExit = global.store.get('warnBeforeExit', true);
+    const exitShortcutPressed =
+        input.type === 'keyDown' && exitShortcuts.some(shortcutFn => shortcutFn(input, process.platform));
+
+    if (shouldWarnBeforeExit && exitShortcutPressed) {
+        const shouldCancelCloseRequest = dialog.showMessageBoxSync(global.mainWindow, {
+            type: "question",
+            buttons: [_t("Cancel"), _t("Close Element")],
+            message: _t("Are you sure you want to quit?"),
+            defaultId: 1,
+            cancelId: 0,
+        }) === 0;
+
+        if (shouldCancelCloseRequest) {
+            event.preventDefault();
+        }
+    }
+};
+
+// handle uncaught errors otherwise it displays
+// stack traces in popup dialogs, which is terrible (which
+// it will do any time the auto update poke fails, and there's
+// no other way to catch this error).
+// Assuming we generally run from the console when developing,
+// this is far preferable.
+process.on('uncaughtException', function(error: Error): void {
+    console.log('Unhandled exception', error);
+});
+
+app.commandLine.appendSwitch('--enable-usermedia-screen-capturing');
+if (!app.commandLine.hasSwitch('enable-features')) {
+    app.commandLine.appendSwitch('enable-features', 'WebRTCPipeWireCapturer');
+}
+
+const gotLock = app.requestSingleInstanceLock();
+if (!gotLock) {
+    console.log('Other instance detected: exiting');
+    app.exit();
+}
+
+// do this after we know we are the primary instance of the app
+protocolInit();
+
+// Register the scheme the app is served from as 'standard'
+// which allows things like relative URLs and IndexedDB to
+// work.
+// Also mark it as secure (ie. accessing resources from this
+// protocol and HTTPS won't trigger mixed content warnings).
+protocol.registerSchemesAsPrivileged([{
+    scheme: 'vector',
+    privileges: {
+        standard: true,
+        secure: true,
+        supportFetchAPI: true,
+    },
+}]);
+
+// Turn the sandbox on for *all* windows we might generate. Doing this means we don't
+// have to specify a `sandbox: true` to each BrowserWindow.
+//
+// This also fixes an issue with window.open where if we only specified the sandbox
+// on the main window we'd run into cryptic "ipc_renderer be broke" errors. Turns out
+// it's trying to jump the sandbox and make some calls into electron, which it can't
+// do when half of it is sandboxed. By turning on the sandbox for everything, the new
+// window (no matter how temporary it may be) is also sandboxed, allowing for a clean
+// transition into the user's browser.
+app.enableSandbox();
+
+// We disable media controls here. We do this because calls use audio and video elements and they sometimes capture the media keys. See https://github.com/vector-im/element-web/issues/15704
+app.commandLine.appendSwitch('disable-features', 'HardwareMediaKeyHandling,MediaSessionService');
+
+// Disable hardware acceleration if the setting has been set.
+if (global.store.get('disableHardwareAcceleration', false) === true) {
+    console.log("Disabling hardware acceleration.");
+    app.disableHardwareAcceleration();
+}
+
+app.on('ready', async () => {
+    try {
+        await setupGlobals();
+        await moveAutoLauncher();
+    } catch (e) {
+        console.log("App setup failed: exiting", e);
+        process.exit(1);
+        // process.exit doesn't cause node to stop running code immediately,
+        // so return (we could let the exception propagate but then we end up
+        // with node printing all sorts of stuff about unhandled exceptions
+        // when we want the actual error to be as obvious as possible).
+        return;
+    }
+
+    if (argv['devtools']) {
+        try {
+            // eslint-disable-next-line @typescript-eslint/no-var-requires
+            const { default: installExt, REACT_DEVELOPER_TOOLS, REACT_PERF } = require('electron-devtools-installer');
+            installExt(REACT_DEVELOPER_TOOLS)
+                .then((name) => console.log(`Added Extension: ${name}`))
+                .catch((err) => console.log('An error occurred: ', err));
+            installExt(REACT_PERF)
+                .then((name) => console.log(`Added Extension: ${name}`))
+                .catch((err) => console.log('An error occurred: ', err));
+        } catch (e) {
+            console.log(e);
+        }
+    }
+
+    protocol.registerFileProtocol('vector', (request, callback) => {
+        if (request.method !== 'GET') {
+            callback({ error: -322 }); // METHOD_NOT_SUPPORTED from chromium/src/net/base/net_error_list.h
+            return null;
+        }
+
+        const parsedUrl = new URL(request.url);
+        if (parsedUrl.protocol !== 'vector:') {
+            callback({ error: -302 }); // UNKNOWN_URL_SCHEME
+            return;
+        }
+        if (parsedUrl.host !== 'vector') {
+            callback({ error: -105 }); // NAME_NOT_RESOLVED
+            return;
+        }
+
+        const target = parsedUrl.pathname.split('/');
+
+        // path starts with a '/'
+        if (target[0] !== '') {
+            callback({ error: -6 }); // FILE_NOT_FOUND
+            return;
+        }
+
+        if (target[target.length - 1] == '') {
+            target[target.length - 1] = 'index.html';
+        }
+
+        let baseDir: string;
+        if (target[1] === 'webapp') {
+            baseDir = asarPath;
+        } else {
+            callback({ error: -6 }); // FILE_NOT_FOUND
+            return;
+        }
+
+        // Normalise the base dir and the target path separately, then make sure
+        // the target path isn't trying to back out beyond its root
+        baseDir = path.normalize(baseDir);
+
+        const relTarget = path.normalize(path.join(...target.slice(2)));
+        if (relTarget.startsWith('..')) {
+            callback({ error: -6 }); // FILE_NOT_FOUND
+            return;
+        }
+        const absTarget = path.join(baseDir, relTarget);
+
+        callback({
+            path: absTarget,
+        });
+    });
+
+    if (argv['no-update']) {
+        console.log('Auto update disabled via command line flag "--no-update"');
+    } else if (global.vectorConfig['update_base_url']) {
+        console.log(`Starting auto update with base URL: ${global.vectorConfig['update_base_url']}`);
+        updater.start(global.vectorConfig['update_base_url']);
+    } else {
+        console.log('No update_base_url is defined: auto update is disabled');
+    }
+
+    // Load the previous window state with fallback to defaults
+    const mainWindowState = windowStateKeeper({
+        defaultWidth: 1024,
+        defaultHeight: 768,
+    });
+
+    const preloadScript = path.normalize(`${__dirname}/preload.js`);
+    global.mainWindow = new BrowserWindow({
+        // https://www.electronjs.org/docs/faq#the-font-looks-blurry-what-is-this-and-what-can-i-do
+        backgroundColor: '#fff',
+
+        icon: iconPath,
+        show: false,
+        autoHideMenuBar: global.store.get('autoHideMenuBar', true),
+
+        x: mainWindowState.x,
+        y: mainWindowState.y,
+        width: mainWindowState.width,
+        height: mainWindowState.height,
+        webPreferences: {
+            preload: preloadScript,
+            nodeIntegration: false,
+            //sandbox: true, // We enable sandboxing from app.enableSandbox() above
+            contextIsolation: true,
+            webgl: true,
+        },
+    });
+    global.mainWindow.loadURL('vector://vector/webapp/');
+
+    // Handle spellchecker
+    // For some reason spellCheckerEnabled isn't persisted, so we have to use the store here
+    global.mainWindow.webContents.session.setSpellCheckerEnabled(global.store.get("spellCheckerEnabled", true));
+
+    // Create trayIcon icon
+    if (global.store.get('minimizeToTray', true)) tray.create(global.trayConfig);
+
+    global.mainWindow.once('ready-to-show', () => {
+        mainWindowState.manage(global.mainWindow);
+
+        if (!argv['hidden']) {
+            global.mainWindow.show();
+        } else {
+            // hide here explicitly because window manage above sometimes shows it
+            global.mainWindow.hide();
+        }
+    });
+
+    global.mainWindow.webContents.on('before-input-event', warnBeforeExit);
+
+    global.mainWindow.on('closed', () => {
+        global.mainWindow = null;
+    });
+    global.mainWindow.on('close', async (e) => {
+        // If we are not quitting and have a tray icon then minimize to tray
+        if (!global.appQuitting && (tray.hasTray() || process.platform === 'darwin')) {
+            // On Mac, closing the window just hides it
+            // (this is generally how single-window Mac apps
+            // behave, eg. Mail.app)
+            e.preventDefault();
+
+            if (global.mainWindow.isFullScreen()) {
+                global.mainWindow.once('leave-full-screen', () => global.mainWindow.hide());
+
+                global.mainWindow.setFullScreen(false);
+            } else {
+                global.mainWindow.hide();
+            }
+
+            return false;
+        }
+    });
+
+    if (process.platform === 'win32') {
+        // Handle forward/backward mouse buttons in Windows
+        global.mainWindow.on('app-command', (e, cmd) => {
+            if (cmd === 'browser-backward' && global.mainWindow.webContents.canGoBack()) {
+                global.mainWindow.webContents.goBack();
+            } else if (cmd === 'browser-forward' && global.mainWindow.webContents.canGoForward()) {
+                global.mainWindow.webContents.goForward();
+            }
+        });
+    }
+
+    webContentsHandler(global.mainWindow.webContents);
+
+    global.appLocalization = new AppLocalization({
+        store: global.store,
+        components: [
+            () => tray.initApplicationMenu(),
+            () => Menu.setApplicationMenu(buildMenuTemplate()),
+        ],
+    });
+});
+
+app.on('window-all-closed', () => {
+    app.quit();
+});
+
+app.on('activate', () => {
+    global.mainWindow.show();
+});
+
+function beforeQuit(): void {
+    global.appQuitting = true;
+    global.mainWindow?.webContents.send('before-quit');
+}
+
+app.on('before-quit', beforeQuit);
+autoUpdater.on('before-quit-for-update', beforeQuit);
+
+app.on('second-instance', (ev, commandLine, workingDirectory) => {
+    // If other instance launched with --hidden then skip showing window
+    if (commandLine.includes('--hidden')) return;
+
+    // Someone tried to run a second instance, we should focus our window.
+    if (global.mainWindow) {
+        if (!global.mainWindow.isVisible()) global.mainWindow.show();
+        if (global.mainWindow.isMinimized()) global.mainWindow.restore();
+        global.mainWindow.focus();
+    }
+});
+
+// Set the App User Model ID to match what the squirrel
+// installer uses for the shortcut icon.
+// This makes notifications work on windows 8.1 (and is
+// a noop on other platforms).
+app.setAppUserModelId('com.squirrel.element-desktop.Element');

src/i18n/strings/ar.json

@@ -0,0 +1,46 @@
+{
+    "File": "ملف",
+    "Close": "أغلِق",
+    "Actual Size": "المقاس الفعلي",
+    "View": "منظور",
+    "Select All": "حدّد الكل",
+    "Delete": "احذف",
+    "Copy": "انسخ",
+    "Edit": "تحرير",
+    "Close Element": "أغلِق Element",
+    "Cancel": "ألغِ",
+    "Bring All to Front": "ضَع الكل في المقدّمة",
+    "Speech": "نطق",
+    "Add to dictionary": "أضِف إلى القاموس",
+    "The image failed to save": "فشل حفظ الصورة",
+    "Failed to save image": "فشل حفظ الصورة",
+    "Save image as...": "احفظ الصورة كَ‍...",
+    "Copy link address": "انسخ عنوان الرابط",
+    "Copy email address": "انسخ عنوان البريد الإلكتروني",
+    "Copy image": "انسخ الصورة",
+    "Zoom": "تقريب",
+    "Stop Speaking": "أوقِف النطق",
+    "Start Speaking": "ابدأ النطق",
+    "Unhide": "اعرض",
+    "Hide Others": "أخفِ البقية",
+    "Hide": "أخفِ",
+    "Services": "الخدمات",
+    "About": "عن",
+    "Element Help": "مساعدة Element",
+    "Help": "مساعدة",
+    "Minimize": "صغّر",
+    "Window": "نافذة",
+    "Toggle Developer Tools": "فعّل/عطّل أدوات المطوّرين",
+    "Toggle Full Screen": "فعّل/عطّل ملء الشاشة",
+    "Preferences": "التفضيلات",
+    "Zoom In": "قرّب",
+    "Zoom Out": "بعّد",
+    "Paste and Match Style": "ألصِق وطابِق النمط",
+    "Paste": "ألصِق",
+    "Cut": "قصّ",
+    "Redo": "أعِد",
+    "Undo": "تراجَع",
+    "Quit": "غادِر",
+    "Show/Hide": "اعرض/أخفِ",
+    "Are you sure you want to quit?": "أمتأكّد من الإغلاق؟"
+}

src/i18n/strings/basefile.json

@@ -0,0 +1 @@
+{}

src/i18n/strings/be.json

@@ -0,0 +1,46 @@
+{
+    "Add to dictionary": "Дадаць у слоўнік",
+    "The image failed to save": "Не атрымалася захаваць малюнак",
+    "Failed to save image": "Не атрымалася захаваць малюнак",
+    "Save image as...": "Захаваць малюнак як...",
+    "Copy link address": "Скапіраваць спасылку",
+    "Copy email address": "Скапіраваць адрас пошты",
+    "Copy image": "Скапіраваць малюнак",
+    "File": "Файл",
+    "Bring All to Front": "Вынесці ўсё наперад",
+    "Zoom": "Маштаб",
+    "Stop Speaking": "Перастаць гаварыць",
+    "Start Speaking": "Гаварыць",
+    "Speech": "Голас",
+    "Unhide": "Паказаць",
+    "Hide Others": "Схаваць іншыя",
+    "Hide": "Схаваць",
+    "Services": "Сервісы",
+    "About": "Аб праграме",
+    "Element Help": "Даведка Element",
+    "Help": "Даведка",
+    "Close": "Зачыніць",
+    "Minimize": "Згарнуць",
+    "Window": "Акно",
+    "Toggle Developer Tools": "Пераключэнне інструментаў распрацоўніка",
+    "Toggle Full Screen": "Пераключэнне на ўвесь экран",
+    "Preferences": "Параметры",
+    "Zoom Out": "Паменшыць",
+    "Zoom In": "Павялічыць",
+    "Actual Size": "Фактычны Памер",
+    "View": "Прагляд",
+    "Select All": "Выбраць усё",
+    "Delete": "Выдаліць",
+    "Paste and Match Style": "Уставіць і супаставіць стыль",
+    "Paste": "Уставіць",
+    "Copy": "Капіяваць",
+    "Cut": "Выразаць",
+    "Redo": "Паўтарыць",
+    "Undo": "Адмяніць",
+    "Edit": "Змяніць",
+    "Quit": "Выйсці",
+    "Show/Hide": "Паказаць / схаваць",
+    "Are you sure you want to quit?": "Вы ўпэўненыя, што хочаце выйсці?",
+    "Close Element": "Зачыніць Element",
+    "Cancel": "Адмена"
+}

src/i18n/strings/bg.json

@@ -0,0 +1,47 @@
+{
+    "Add to dictionary": "Добави към речника",
+    "The image failed to save": "Изображението не успя да се запази",
+    "Failed to save image": "Неуспешно запазване на изображението",
+    "Save image as...": "Запази изображението като...",
+    "Copy link address": "Копирай линка",
+    "Copy image address": "Копирай адреса на изображението",
+    "Copy email address": "Копирай имейл адрес",
+    "Copy image": "Копирай изображение",
+    "File": "Файл",
+    "Bring All to Front": "Покажи всички най-отгоре",
+    "Zoom": "Мащабирай",
+    "Stop Speaking": "Спри да говориш",
+    "Start Speaking": "Започни да говориш",
+    "Speech": "Говор",
+    "Unhide": "Покажи",
+    "Hide Others": "Скрий Останалите",
+    "Hide": "Скрий",
+    "Services": "Услуги",
+    "About": "Относно",
+    "Element Help": "Помощ за Елемент",
+    "Help": "Помощ",
+    "Close": "Затвори",
+    "Minimize": "Минимизирай",
+    "Window": "Прозорец",
+    "Toggle Developer Tools": "Превключи инструментите за разработчици",
+    "Toggle Full Screen": "Превключи на Цял екран",
+    "Preferences": "Предпочитания",
+    "Zoom Out": "Намали",
+    "Zoom In": "Увеличи",
+    "Actual Size": "Действителен Размер",
+    "View": "Преглед",
+    "Select All": "Избери Всичко",
+    "Delete": "Изтрий",
+    "Paste and Match Style": "Постави и Използвай текущия стил",
+    "Paste": "Постави",
+    "Copy": "Копирай",
+    "Cut": "Изрежи",
+    "Redo": "Върни",
+    "Undo": "Отмени",
+    "Edit": "Редактирай",
+    "Quit": "Напусни",
+    "Show/Hide": "Покажи/Скрий",
+    "Are you sure you want to quit?": "Сигурен ли си че искаш да напуснеш?",
+    "Close Element": "Затвори Елемент",
+    "Cancel": "Отказ"
+}

src/i18n/strings/bn.json

@@ -0,0 +1,47 @@
+{
+    "Are you sure you want to quit?": "তুমি কি আসলেই বের হতে চাও?",
+    "Close Element": "এলিমেন্ট বন্ধ করো",
+    "Cancel": "বাতিল",
+    "Save image as...": "ছবি সংরক্ষণের ধরন...",
+    "Failed to save image": "ছবি সংরক্ষণ ব্যর্থ",
+    "The image failed to save": "ছবি সংরক্ষণ ব্যর্থ",
+    "Add to dictionary": "অভিধানে যোগ করি",
+    "Copy link address": "সংযোগের ঠিকানা অনুলিপি করো",
+    "Copy image address": "ছবির ঠিকানা অনুলিপি করো",
+    "Copy email address": "ইমেইল ঠিকানা অনুলিপি করো",
+    "Copy image": "ছবি অনুলিপি করো",
+    "File": "নথি",
+    "Bring All to Front": "সবকিছু সামনে আনো",
+    "Zoom": "বড় করা",
+    "Stop Speaking": "কথা বন্ধ করো",
+    "Start Speaking": "কথা শুরু করো",
+    "Speech": "বাচন",
+    "Unhide": "দেখাও",
+    "Hide Others": "অন্যগুলো লুকাও",
+    "Hide": "লুকাও",
+    "Services": "সেবা",
+    "About": "আমাদের সম্পর্কে",
+    "Element Help": "এলিমেন্ট সাহায্য",
+    "Help": "সাহায্য",
+    "Close": "বন্ধ",
+    "Minimize": "সংকোচন",
+    "Window": "জানালা",
+    "Toggle Developer Tools": "ডেভেলপার সরঞ্জামাদি",
+    "Toggle Full Screen": "পূর্ণ পর্দা করো/বের হও",
+    "Preferences": "পছন্দসমূহ",
+    "Zoom Out": "ছোট করো",
+    "Zoom In": "বড়ো করো",
+    "Actual Size": "আসল আকার",
+    "View": "দেখো",
+    "Select All": "সব নির্বাচন",
+    "Delete": "অপসারণ",
+    "Paste and Match Style": "লেপন ও একই ধরনে",
+    "Paste": "লেপন",
+    "Copy": "অনুলিপি",
+    "Cut": "কাটো",
+    "Redo": "পুন",
+    "Undo": "ফিরত",
+    "Edit": "সম্পাদনা",
+    "Quit": "প্রস্থান",
+    "Show/Hide": "দেখাও/লুকাও"
+}

src/i18n/strings/ca.json

@@ -0,0 +1,46 @@
+{
+    "Add to dictionary": "Afegeix al diccionari",
+    "The image failed to save": "S'ha fallat en desar la imatge",
+    "Failed to save image": "S'ha fallat en desar la imatge",
+    "Save image as...": "Anomena i desa la imatge...",
+    "Copy link address": "Copia l'adreça de l'enllaç",
+    "Copy email address": "Copia l'adreça de correu electrònic",
+    "Copy image": "Copia la imatge",
+    "File": "Fitxer",
+    "Bring All to Front": "Porta-ho tot al davant",
+    "Zoom": "Escala",
+    "Stop Speaking": "Para la veu",
+    "Start Speaking": "Comença la veu",
+    "Speech": "Veu",
+    "Unhide": "Deixa d'amagar",
+    "Hide Others": "Amaga les altres",
+    "Hide": "Amaga",
+    "Services": "Serveis",
+    "About": "Quant a",
+    "Element Help": "Ajuda sobre l'Element",
+    "Help": "Ajuda",
+    "Close": "Tanca",
+    "Minimize": "Minimitza",
+    "Window": "Finestra",
+    "Toggle Developer Tools": "Commuta les eines per a desenvolupadors",
+    "Toggle Full Screen": "Commuta la pantalla completa",
+    "Preferences": "Preferències",
+    "Zoom Out": "Allunya",
+    "Zoom In": "Apropia",
+    "Actual Size": "Mida real",
+    "View": "Visualitza",
+    "Select All": "Selecciona-ho tot",
+    "Delete": "Suprimeix",
+    "Paste and Match Style": "Enganxa i fes coincidir l'estil",
+    "Paste": "Enganxa",
+    "Copy": "Copia",
+    "Cut": "Retalla",
+    "Redo": "Refés",
+    "Undo": "Desfés",
+    "Edit": "Edita",
+    "Quit": "Surt",
+    "Show/Hide": "Mostra/Amaga",
+    "Are you sure you want to quit?": "Esteu segur que voleu sortir?",
+    "Close Element": "Tanca l'Element",
+    "Cancel": "Cancel·la"
+}

src/i18n/strings/de.json

@@ -0,0 +1,47 @@
+{
+    "Speech": "Sprache",
+    "Paste and Match Style": "Einfügen und Formatierung beibehalten",
+    "Stop Speaking": "Aufnahme beenden",
+    "Start Speaking": "Aufnahme starten",
+    "Services": "Dienste",
+    "Are you sure you want to quit?": "Wirklich beenden?",
+    "Add to dictionary": "Wörterbuch hinzufügen",
+    "The image failed to save": "Das Bild konnte nicht gespeichert werden",
+    "Failed to save image": "Bild kann nicht gespeichert werden",
+    "Save image as...": "Bild speichern unter...",
+    "Copy link address": "Link-Adresse kopieren",
+    "Copy email address": "Email-Adresse kopieren",
+    "Copy image": "Bild kopieren",
+    "File": "Datei",
+    "Bring All to Front": "Alles in den Vordergrund",
+    "Zoom": "Zoom",
+    "Unhide": "Wieder anzeigen",
+    "Hide Others": "Andere verstecken",
+    "Hide": "Verstecken",
+    "About": "Über",
+    "Element Help": "Hilfe zu Element",
+    "Help": "Hilfe",
+    "Close": "Schließen",
+    "Minimize": "Minimieren",
+    "Window": "Fenster",
+    "Toggle Developer Tools": "Developer-Tools an/aus",
+    "Toggle Full Screen": "Vollbildschirm an/aus",
+    "Preferences": "Einstellungen",
+    "Zoom Out": "Verkleinern",
+    "Zoom In": "Vergrößern",
+    "Actual Size": "Tatsächliche Größe",
+    "View": "Ansicht",
+    "Select All": "Alles auswählen",
+    "Delete": "Löschen",
+    "Paste": "Einfügen",
+    "Copy": "Kopieren",
+    "Cut": "Ausschneiden",
+    "Redo": "Wiederherstellen",
+    "Undo": "Rückgängig",
+    "Edit": "Bearbeiten",
+    "Quit": "Beenden",
+    "Show/Hide": "Anzeigen/Ausblenden",
+    "Close Element": "Element schließen",
+    "Cancel": "Abbrechen",
+    "Copy image address": "Bild-Adresse kopieren"
+}

src/i18n/strings/el.json

@@ -0,0 +1,47 @@
+{
+    "Are you sure you want to quit?": "Είστε βέβαιος ότι θέλετε να εγκαταλείψετε;",
+    "Zoom": "Ζουμ",
+    "Unhide": "Εμφάνιση",
+    "Window": "Παράθυρο",
+    "Toggle Developer Tools": "Άνοιγμα Εργαλείων Προγραμματιστή",
+    "Toggle Full Screen": "Εναλλαγή σε Πλήρη Οθόνη",
+    "Copy email address": "Αντιγραφή διεύθυνσης email",
+    "File": "Αρχείο",
+    "Bring All to Front": "Μεταφορά Όλων στο Προσκήνιο",
+    "Stop Speaking": "Τερματίστε να μιλάτε",
+    "Start Speaking": "Ξεκινήστε να μιλάτε",
+    "Speech": "Ομιλία",
+    "Hide Others": "Απόκρυψη Άλλων",
+    "Hide": "Απόκρυψη",
+    "Services": "Υπηρεσίες",
+    "About": "Σχετικά με",
+    "Element Help": "Βοήθεια για το Element",
+    "Help": "Βοήθεια",
+    "Close": "Κλείσιμο",
+    "Minimize": "Ελαχιστοποίηση",
+    "Preferences": "Προτιμήσεις",
+    "Zoom Out": "Σμίκρυνση",
+    "Zoom In": "Μεγέθυνση",
+    "Actual Size": "Πραγματικό Μέγεθος",
+    "View": "Προβολή",
+    "Select All": "Επιλογή Όλων",
+    "Delete": "Διαγραφή",
+    "Paste and Match Style": "Επικόλληση και Ταίριασμα Στυλ",
+    "Paste": "Επικόλληση",
+    "Copy": "Αντιγραφή",
+    "Cut": "Αποκοπή",
+    "Redo": "Επανάληψη",
+    "Undo": "Αναίρεση",
+    "Edit": "Επεξεργασία",
+    "Quit": "Κλείσιμο",
+    "Show/Hide": "Eμφάνιση/Απόκρυψη",
+    "Close Element": "Κλείστε το Element",
+    "Cancel": "Ακύρωση",
+    "Add to dictionary": "Προσθήκη στο λεξικό",
+    "The image failed to save": "Η αποθήκευση της εικόνας απέτυχε",
+    "Failed to save image": "Αποτυχία αποθήκευσης εικόνας",
+    "Save image as...": "Αποθήκευση εικόνας ως...",
+    "Copy link address": "Αντιγραφή διεύθυνσης συνδέσμου",
+    "Copy image address": "Αντιγραφή διεύθυνσης εικόνας",
+    "Copy image": "Αντιγραφή εικόνας"
+}