.gitignore

@@ -1,6 +1,5 @@
 *.sublime-project
 *.sublime-workspace
-.DS_Store
 node_modules
 fetchlogs
 sessionexports
@@ -9,5 +8,3 @@ target
 lib
 *.tar.gz
 .eslintcache
-.tmp
-tmp/

.ts-eslintrc.js

@@ -19,7 +19,6 @@ module.exports = {
     ],
     rules: {
         "@typescript-eslint/no-floating-promises": 2,
-        "@typescript-eslint/no-misused-promises": 2,
-        "semi": ["error", "always"]
+        "@typescript-eslint/no-misused-promises": 2
     }
 };

.woodpecker.yml

@@ -1,18 +0,0 @@
-pipeline:
-    buildfrontend:
-        image: node:16
-        commands:
-            - yarn install --prefer-offline --frozen-lockfile
-            - yarn test
-            - yarn run lint-ci
-            - yarn run tsc
-            - yarn build
-
-    deploy:
-        image: python
-        when:
-            event: push
-            branch: master
-        commands:
-            - make ci-deploy
-        secrets: [ GITEA_WRITE_DEPLOY_KEY, LIBREPAGES_DEPLOY_SECRET ]

CONTRIBUTING.md

@@ -1,150 +0,0 @@
-Contributing code to hydrogen-web
-==================================
-
-Everyone is welcome to contribute code to hydrogen-web, provided that they are
-willing to license their contributions under the same license as the project
-itself. We follow a simple 'inbound=outbound' model for contributions: the act
-of submitting an 'inbound' contribution means that the contributor agrees to
-license the code under the same terms as the project's overall 'outbound'
-license - in this case, Apache Software License v2 (see
-[LICENSE](LICENSE)).
-
-How to contribute
------------------
-
-The preferred and easiest way to contribute changes to the project is to fork
-it on github, and then create a pull request to ask us to pull your changes
-into our repo (https://help.github.com/articles/using-pull-requests/)
-
-We use GitHub's pull request workflow to review the contribution, and either
-ask you to make any refinements needed or merge it and make them ourselves.
-
-Things that should go into your PR description:
- * References to any bugs fixed by the change (in GitHub's `Fixes` notation)
- * Describe the why and what is changing in the PR description so it's easy for
-   onlookers and reviewers to onboard and context switch.
- * If your PR makes visual changes, include both **before** and **after** screenshots
-   to easily compare and discuss what's changing.
- * Include a step-by-step testing strategy so that a reviewer can check out the
-   code locally and easily get to the point of testing your change.
- * Add comments to the diff for the reviewer that might help them to understand
-   why the change is necessary or how they might better understand and review it.
-
-We use continuous integration, and all pull requests get automatically tested:
-if your change breaks the build, then the PR will show that there are failed
-checks, so please check back after a few minutes.
-
-Tests
------
-If your PR is a feature then we require that the PR also includes tests.
-These need to test that your feature works as expected and ideally test edge cases too.
-
-Tests are written as unit tests by exporting a `tests` function from the file to be tested.
-The function returns an object where the key is the test label, and the value is a 
-function that accepts an [assert](https://nodejs.org/api/assert.html) object, and return a Promise or nothing.
-
-Note that there is currently a limitation that files that are not indirectly included from `src/platform/web/main.js` won't be found by the runner.
-
-You can run the tests by running `yarn test`.
-This uses the [impunity](https://github.com/bwindels/impunity) runner.
-
-We don't require tests for bug fixes.
-
-In the future we may formalise this more.
-
-Code style
-----------
-The js-sdk aims to target TypeScript/ES6. All new files should be written in
-TypeScript and existing files should use ES6 principles where possible.
-
-Please disable any automatic formatting tools you may have active.
-If present, you'll be asked to undo any unrelated whitespace changes during code review.
-
-Members should not be exported as a default export in general.
-In general, avoid using `export default`.
-
-The remaining code-style for hydrogen is [in the process of being documented](codestyle.md), but
-contributors are encouraged to read the
-[code style document for matrix-react-sdk](https://github.com/matrix-org/matrix-react-sdk/blob/master/code_style.md)
-and follow the principles set out there.
-
-Please ensure your changes match the cosmetic style of the existing project,
-and ***never*** mix cosmetic and functional changes in the same commit, as it
-makes it horribly hard to review otherwise.
-
-Attribution
------------
-If you change or create a file, feel free to add yourself to the copyright holders
-in the license header of that file.
-
-Sign off
---------
-In order to have a concrete record that your contribution is intentional
-and you agree to license it under the same terms as the project's license, we've
-adopted the same lightweight approach that the Linux Kernel
-(https://www.kernel.org/doc/Documentation/SubmittingPatches), Docker
-(https://github.com/docker/docker/blob/master/CONTRIBUTING.md), and many other
-projects use: the DCO (Developer Certificate of Origin:
-http://developercertificate.org/). This is a simple declaration that you wrote
-the contribution or otherwise have the right to contribute it to Matrix:
-
-```
-Developer Certificate of Origin
-Version 1.1
-
-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
-660 York Street, Suite 102,
-San Francisco, CA 94110 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
-```
-
-If you agree to this for your contribution, then all that's needed is to
-include the line in your commit or pull request comment:
-
-```
-Signed-off-by: Your Name <your@email.example.org>
-```
-
-We accept contributions under a legally identifiable name, such as your name on
-government documentation or common-law names (names claimed by legitimate usage
-or repute). Unfortunately, we cannot accept anonymous contributions at this
-time.
-
-Git allows you to add this signoff automatically when using the `-s` flag to
-`git commit`, which uses the name and email set in your `user.name` and
-`user.email` git configs.
-
-If you forgot to sign off your commits before making your pull request and are
-on Git 2.17+ you can mass signoff using rebase:
-
-```
-git rebase --signoff origin/develop
-```

Makefile

@@ -1,14 +0,0 @@
-ci-deploy: ## Deploy from CI/CD. Only call from within CI
-	@if [ "${CI}" != "woodpecker" ]; \
-	then echo "Only call from within CI. Will re-write your local Git configuration. To override, set export CI=woodpecker"; \
-		 exit 1; \
-	fi
-	git config --global user.email "${CI_COMMIT_AUTHOR_EMAIL}"
-	git config --global user.name "${CI_COMMIT_AUTHOR}"
-	./scripts/ci.sh --commit-files librepages target "${CI_COMMIT_AUTHOR} <${CI_COMMIT_AUTHOR_EMAIL}>"
-	./scripts/ci.sh --init "$$GITEA_WRITE_DEPLOY_KEY"
-	./scripts/ci.sh --deploy ${LIBREPAGES_DEPLOY_SECRET}  librepages
-	./scripts/ci.sh --clean
-
-help: ## Prints help for targets with comments
-	@cat $(MAKEFILE_LIST) | grep -E '^[a-zA-Z_-]+:.*?## .*$$' | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

README.md

@@ -1,5 +1,3 @@
-[![status-badge](https://ci.batsense.net/api/badges/mystiq/hydrogen-web/status.svg)](https://ci.batsense.net/mystiq/hydrogen-web)
-
 # Hydrogen
 
 A minimal [Matrix](https://matrix.org/) chat client, focused on performance, offline functionality, and broad browser support. This is work in progress and not yet ready for primetime. Bug reports are welcome, but please don't file any feature requests or other missing things to be on par with Element Web.
@@ -12,34 +10,13 @@ Hydrogen's goals are:
  - It is a standalone webapp, but can also be easily embedded into an existing website/webapp to add chat capabilities.
  - Loading (unused) parts of the application after initial page load should be supported
 
-For embedded usage, see the [SDK instructions](doc/SDK.md).
-
 If you find this interesting, come and discuss on [`#hydrogen:matrix.org`](https://matrix.to/#/#hydrogen:matrix.org).
 
 # How to use
 
-Hydrogen is deployed to [hydrogen.element.io](https://hydrogen.element.io). You can also deploy Hydrogen on your own web server:
+Hydrogen is deployed to [hydrogen.element.io](https://hydrogen.element.io). You can run it locally `yarn install` (only the first time) and `yarn start` in the terminal, and point your browser to `http://localhost:3000`. If you prefer, you can also [use docker](doc/docker.md).
 
- 1. Download the [latest release package](https://github.com/vector-im/hydrogen-web/releases).
- 1. Extract the package to the public directory of your web server.
- 1. If this is your first deploy:
-    1. copy `config.sample.json` to `config.json` and if needed, make any modifications (unless you've set up your own [sygnal](https://github.com/matrix-org/sygnal) instance, you don't need to change anything in the `push` section).
-    1. Disable caching entirely on the server for:
-        - `index.html`
-        - `sw.js`
-        - `config.json`
-        - All theme manifests referenced in the `themeManifests` of `config.json`, these files are typically called `theme-{name}.json`.
-
-        These resources will still be cached client-side by the service worker. Because of this; you'll still need to refresh the app twice before config.json changes are applied.
-
-## Set up a dev environment
-
-You can run Hydrogen locally by the following commands in the terminal:
-
- - `yarn install` (only the first time)
- - `yarn start` in the terminal
-
-Now point your browser to `http://localhost:3000`. If you prefer, you can also [use docker](doc/docker.md).
+Hydrogen uses symbolic links in the codebase, so if you are on Windows, have a look at [making git & symlinks work](https://github.com/git-for-windows/git/wiki/Symbolic-Links) there.
 
 # FAQ
 

doc/FAQ.md

@@ -28,7 +28,7 @@ You can only verify by comparing keys manually currently. In Element, go to your
 
 ## I want to host my own Hydrogen, how do I do that?
 
-Published builds can be found at https://github.com/vector-im/hydrogen-web/releases. For building your own, you need to checkout the version you want to build, or master if you want to run bleeding edge, and run `yarn install` and then `yarn build` in a console (and install nodejs >= 15 and yarn if you haven't yet). Now you should find all the files needed to host Hydrogen in the `target/` folder, just copy them all over to your server. As always, don't host your client on the same [origin](https://web.dev/same-origin-policy/#what's-considered-same-origin) as your homeserver.
+Published builds can be found at https://github.com/vector-im/hydrogen-web/releases. For building your own, you need to checkout the version you want to build, or master if you want to run bleeding edge, and run `yarn install` and then `yarn build` in a console (and install nodejs > 14 and yarn if you haven't yet). Now you should find all the files needed to host Hydrogen in the `target/` folder, just copy them all over to your server. As always, don't host your client on the same [origin](https://web.dev/same-origin-policy/#what's-considered-same-origin) as your homeserver.
 
 ## I want to embed Hydrogen in my website, how should I do that?
 

doc/IMPORT-ISSUES.md

@@ -1,11 +0,0 @@
-## How to import common-js dependency using ES6 syntax
----
-Until [#6632](https://github.com/vitejs/vite/issues/6632) is fixed, such imports should be done as follows:
-
-```ts
-import * as pkg from "off-color";
-// @ts-ignore 
-const offColor = pkg.offColor ?? pkg.default.offColor;
-```
-
-This way build, dev server and unit tests should all work.

doc/SDK.md

@@ -1,60 +1,40 @@
-# Hydrogen View SDK
+# How to use Hydrogen as an SDK
 
+If you want to use end-to-end encryption, it is recommended to use a [supported build system](../src/sdk/paths/) (currently only vite) to be able to locate the olm library files.
 
-The Hydrogen view SDK allows developers to integrate parts of the Hydrogen application into the UI of their own application. Hydrogen is written with the MVVM pattern, so to construct a view, you'd first construct a view model, which you then pass into the view. For most view models, you will first need a running client.
+**NOTE**: For now, these instructions will only work at development time, support when building (e.g. `vite build`) is being worked on and tracked in [#529](https://github.com/vector-im/hydrogen-web/issues/529).
 
-## Example
-
-The Hydrogen SDK requires some assets to be shipped along with your app for things like downloading attachments, and end-to-end encryption. A convenient way to make this happen is provided by the SDK (importing `hydrogen-view-sdk/paths/vite`) but depends on your build system. Currently, only [vite](https://vitejs.dev/) is supported, so that's what we'll be using in the example below.
-
-You can create a vite project using the following commands:
+You can create a project using the following commands
 
 ```sh
 # you can pick "vanilla-ts" here for project type if you're not using react or vue
 yarn create vite
 cd <your-project-name>
 yarn
-yarn add hydrogen-view-sdk
+yarn add https://github.com/vector-im/hydrogen-web.git
 ```
 
-You should see a `index.html` in the project root directory, containing an element with `id="app"`. Add the attribute `class="hydrogen"` to this element, as the CSS we'll include from the SDK assumes for now that the app is rendered in an element with this classname.
-
-If you go into the `src` directory, you should see a `main.ts` file. If you put this code in there, you should see a basic timeline after login and initial sync have finished (might take a while before you see anything on the screen actually).
-
-You'll need to provide the username and password of a user that is already in the [#element-dev:matrix.org](https://matrix.to/#/#element-dev:matrix.org) room (or change the room id).
+If you go into the `src` directory, you should see a `main.ts` file. If you put this code in there, you should see a basic timeline after login and initial sync have finished.
 
 ```ts
 import {
     Platform,
-    Client,
+    SessionContainer,
     LoadStatus,
     createNavigation,
     createRouter,
     RoomViewModel,
-    TimelineView,
-    viewClassForTile
-} from "hydrogen-view-sdk";
-import downloadSandboxPath from 'hydrogen-view-sdk/download-sandbox.html?url';
-import workerPath from 'hydrogen-view-sdk/main.js?url';
-import olmWasmPath from '@matrix-org/olm/olm.wasm?url';
-import olmJsPath from '@matrix-org/olm/olm.js?url';
-import olmLegacyJsPath from '@matrix-org/olm/olm_legacy.js?url';
-const assetPaths = {
-    downloadSandbox: downloadSandboxPath,
-    worker: workerPath,
-    olm: {
-        wasm: olmWasmPath,
-        legacyBundle: olmLegacyJsPath,
-        wasmBundle: olmJsPath
-    }
-};
-import "hydrogen-view-sdk/assets/theme-element-light.css";
-// OR import "hydrogen-view-sdk/assets/theme-element-dark.css";
+    TimelineView
+} from "hydrogen-web";
+import {olmPaths, downloadSandboxPath} from "hydrogen-web/src/sdk/paths/vite";
 
-async function main() {
 const app = document.querySelector<HTMLDivElement>('#app')!
-    const config = {};
-    const platform = new Platform({container: app, assetPaths, config, options: { development: import.meta.env.DEV }});
+
+// bootstrap a session container
+const platform = new Platform(app, {
+    downloadSandbox: downloadSandboxPath,
+    olm: olmPaths,
+}, null, { development: true });
 const navigation = createNavigation();
 platform.setNavigation(navigation);
 const urlRouter = createRouter({
@@ -62,24 +42,29 @@ async function main() {
     history: platform.history
 });
 urlRouter.attach();
-    const client = new Client(platform);
+const sessionContainer = new SessionContainer({
+    platform,
+    olmPromise: platform.loadOlm(),
+    workerPromise: platform.loadOlmWorker()
+});
 
-    const loginOptions = await client.queryLogin("matrix.org").result;
-    client.startWithLogin(loginOptions.password("username", "password"));
-
-    await client.loadStatus.waitFor((status: string) => {
+// wait for login and first sync to finish
+const loginOptions = await sessionContainer.queryLogin("matrix.org").result;
+sessionContainer.startWithLogin(loginOptions.password("user", "password"));
+await sessionContainer.loadStatus.waitFor((status: string) => {
     return status === LoadStatus.Ready ||
         status === LoadStatus.Error ||
         status === LoadStatus.LoginFailed;
 }).promise;
-
-    if (client.loginFailure) {
-        alert("login failed: " + client.loginFailure);
-    } else if (client.loadError) {
-        alert("load failed: " + client.loadError.message);
+// check the result
+if (sessionContainer.loginFailure) {
+    alert("login failed: " + sessionContainer.loginFailure);
+} else if (sessionContainer.loadError) {
+    alert("load failed: " + sessionContainer.loadError.message);
 } else {
-        const {session} = client;
-        // looks for room corresponding to #element-dev:matrix.org, assuming it is already joined
+    // we're logged in, we can access the room now
+    const {session} = sessionContainer;
+    // room id for #element-dev:matrix.org
     const room = session.rooms.get("!bEWtlqtDwCLFIAKAcv:matrix.org");
     const vm = new RoomViewModel({
         room,
@@ -89,28 +74,7 @@ async function main() {
         navigation,
     });
     await vm.load();
-        const view = new TimelineView(vm.timelineViewModel, viewClassForTile);
+    const view = new TimelineView(vm.timelineViewModel);
     app.appendChild(view.mount());
 }
-}
-
-main();
 ```
-
-## Typescript support
-
-Typescript support is not yet available while we're converting the Hydrogen codebase to Typescript.
-In your `src` directory, you'll need to add a `.d.ts` (can be called anything, e.g. `deps.d.ts`)
-containing this snippet to make Typescript not complain that `hydrogen-view-sdk` doesn't have types:
-
-```ts
-declare module "hydrogen-view-sdk";
-```
-
-## API Stability
-
-This library follows semantic versioning; there is no API stability promised as long as the major version is still 0. Once 1.0.0 is released, breaking changes will be released with a change in major versioning.
-
-## Third-party licenses
-
-This package bundles the bs58 package ([license](https://github.com/cryptocoinjs/bs58/blob/master/LICENSE)), and the Inter font ([license](https://github.com/rsms/inter/blob/master/LICENSE.txt)).

doc/THEMING.md

@@ -1,204 +0,0 @@
-# Theming Documentation
-## Basic Architecture
-A **theme collection** in Hydrogen is represented by a `manifest.json` file and a `theme.css` file.
-The manifest specifies variants (eg: dark,light ...) each of which is a **theme** and maps to a single css file in the build output.
-
-Each such theme is produced by changing the values of variables in the base `theme.css` file with those specified in the variant section of the manifest:
-
-![](images/theming-architecture.png)
-
-More in depth explanations can be found in later sections.
-
-## Structure of `manifest.json`
-[See theme.ts](../src/platform/types/theme.ts)
-
-## Variables
-CSS variables specific to a particular variant are specified in the `variants` section of the manifest:
-```json=
- "variants": {
-     "light": {
-         ...
-         "variables": {
-             "background-color-primary": "#fff",
-             "text-color": "#2E2F32",
-         }
-     },
-      "dark": {
-         ...
-        "variables": {
-            "background-color-primary": "#21262b",
-            "text-color": "#fff",
-        }
-    }
- }
-```
-
-These variables will appear in the css file (theme.css):
-```css=
-body {
-    background-color: var(--background-color-primary);
-    color: var(--text-color);
-}
-```
-
-During the build process, this would result in the creation of two css files (one for each variant) where the variables are substitued with the corresponding values specified in the manifest:
-
-*element-light.css*:
-```css=
-body {
-    background-color: #fff;
-    color: #2E2F32;
-}
-```
-
-*element-dark.css*:
-```css=
-body {
-    background-color: #21262b;
-    color: #fff;
-}
-```
-
-## Derived Variables
-In addition to simple substitution of variables in the stylesheet, it is also possible to instruct the build system to first produce a new value from the base variable value before the substitution.
-
-Such derived variables have the form `base_css_variable--operation-arg` and can be read as:
-apply `operation` to `base_css_variable` with argument `arg`.
-
-Continuing with the previous example, it possible to specify:
-```css=
-.left-panel {
-    /* background color should be 20% more darker
-       than background-color-primary */
-    background-color: var(--background-color-primary--darker-20);
-}
-```
-
-Currently supported operations are:
-
-| Operation | Argument | Operates On |
-| -------- | -------- | -------- |
-| darker     | percentage | color |
-| lighter     | percentage | color |
-
-## Aliases
-It is possible give aliases to variables in the `theme.css` file:
-```css=
-:root {
-    font-size: 10px;
-    /* Theme aliases */
-    --icon-color: var(--background-color-secondary--darker-40);
-}
-```
-It is possible to further derive from these aliased variables:
-```css=
-div {
-    background: var(--icon-color--darker-20);
-    --my-alias: var(--icon-color--darker-20);
-    /* Derive from aliased  variable */
-    color: var(--my-alias--lighter-15);
-}
-```
-
-
-## Colorizing svgs
-Along with a change in color-scheme, it may be necessary to change the colors in the svg icons and images. 
-This can be done by supplying the preferred colors with query parameters:
-`my-awesome-logo.svg?primary=base-variable-1&secondary=base-variable-2`  
-
-This instructs the build system to colorize the svg with the given primary and secondary colors.
-`base-variable-1` and `base-variable-2` are the css-variables specified in the `variables` section of the manifest.
-
-For colorizing svgs, the source svg must use `#ff00ff` as the primary color and `#00ffff` as the secondary color:
-
-  
-
-| ![](images/svg-icon-example.png) | ![](images/coloring-process.png) |
-| :--: |:--: |
-| **original source image** | **transformation process** |
-
-## Creating your own theme variant in Hydrogen
-If you're looking to change the color-scheme of the existing Element theme, you only need to add your own variant to the existing `manifest.json`.
-
-The steps are fairly simple:
-1. Copy over an existing variant to the variants section of the manifest.
-2. Change `dark`, `default` and `name` fields.
-3. Give new values to each variable in the `variables` section.
-4. Build hydrogen.
-
-## Creating your own theme collection in Hydrogen
-If a theme variant does not solve your needs, you can create a new theme collection with a different base `theme.css` file.
-1. Create a directory for your new theme-collection under `src/platform/web/ui/css/themes/`.
-2. Create `manifest.json` and `theme.css` files within the newly created directory.
-3. Populate `manifest.json` with the base css variables you wish to use.
-4. Write styles in your `theme.css` file using the base variables, derived variables and colorized svg icons.
-5. Tell the build system where to find this theme-collection by providing the location of this directory to the `themeBuilder` plugin in `vite.config.js`:
-```json=
-...
-themeBuilder({
-    themeConfig: {
-        themes: {
-            element: "./src/platform/web/ui/css/themes/element",
-            awesome: "path/to/theme-directory"
-        },
-        default: "element",
-    },
-    compiledVariables,
-}),
-...
-```
-6. Build Hydrogen.
-
-## Changing the default theme
-To change the default theme used in Hydrogen, modify the `defaultTheme` field in `config.json` file (which can be found in the build output):
-```json=
-"defaultTheme": {
-    "light": theme-id,
-    "dark": theme-id
-}
-```
-
-Here *theme-id* is of the form `theme-variant` where `theme` is the key used when specifying the manifest location of the theme collection in `vite.config.js` and `variant` is the key used in variants section of the manifest.
-
-Some examples of theme-ids are `element-dark` and `element-light`.  
-
-To find the theme-id of some theme, you can look at the built-asset section of the manifest in the build output.
-
-This default theme will render as "Default" option in the theme-chooser dropdown. If the device preference is for dark theme, the dark default is selected and vice versa.
-
-**You'll need to reload twice so that Hydrogen picks up the config changes!**
-
-# Derived Theme(Collection)
-This allows users to theme Hydrogen without the need for rebuilding. Derived theme collections can be thought of as extensions (derivations) of some existing build time theme. 
-
-## Creating a derived theme:
-Here's how you create a new derived theme:
-1. You create a new theme manifest file (eg: theme-awesome.json) and mention which build time theme you're basing your new theme on using the `extends` field. The base css file of the mentioned theme is used for your new theme.
-2. You configure the theme manifest as usual by populating the `variants` field with your desired colors.
-3. You add your new theme manifest to the list of themes in `config.json`.
-
-Refresh Hydrogen twice (once to refresh cache, and once to load) and the new theme should show up in the theme chooser.
-
-## How does it work?
-
-For every theme collection in hydrogen, the build process emits a runtime css file which like the built theme css file contains variables in the css code. But unlike the theme css file, the runtime css file lacks the definition for these variables:
-
-CSS for the built theme:
-```css
-:root {
-    --background-color-primary: #f2f20f;
-}
-
-body {
-    background-color: var(--background-color-primary);
-}
-```
-and the corresponding runtime theme:
-```css
-/* Notice the lack of definiton for --background-color-primary here! */
-body {
-    background-color: var(--background-color-primary);
-}
-```
-
-When hydrogen loads a derived theme, it takes the runtime css file of the extended theme and dynamically adds the variable definition based on the values specified in the manifest. Icons are also colored dynamically and injected as variables using Data URIs.

doc/TS-MIGRATION.md

@@ -2,37 +2,8 @@
 
 ## Use `type` rather than `interface` for named parameters and POJO return values.
 
-`type` and `interface` can be used somewhat interchangeably, but let's use `type` to describe data and `interface` to describe (polymorphic) behaviour.
+`type` and `interface` can be used somewhat interchangebly used, but let's use `type` to describe data and `interface` to describe (polymorphic) behaviour.
 
 Good examples of data are option objects to have named parameters, and POJO (plain old javascript objects) without any methods, just fields.
 
 Also see [this playground](https://www.typescriptlang.org/play?#code/C4TwDgpgBACghgJwgO2AeTMAlge2QZygF4oBvAKCiqmTgFsIAuKfYBLZAcwG5LqATCABs4IAPzNkAVzoAjCAl4BfcuVCQoAYQAWWIfwzY8hEvCSpDuAlABkZPlQDGOITgTNW7LstWOR+QjMUYHtqKGcCNilHYDcAChxMK3xmIIsk4wBKewcoFRVyPzgArV19KAgAD2AUfkDEYNDqCM9o2IQEjIJmHT0DLvxsijCw-ClIDsSjAkzeEebjEIYAuE5oEgADABJSKeSAOloGJSgsQh29433nVwQlDbnqfKA)
-
-## Use `type foo = { [key: string]: any }` for types that you intend to fill in later.
-
-For instance, if you have a method such as:
-```js
-    function load(options) {
-        // ...
-    }
-```
-and you intend to type options at some later point, do:
-```ts
-    type Options = { [key: string]: any}
-```
-This makes it much easier to add the necessary type information at a later time.
-
-## Use `object` or `Record<string, any>` to describe a type that accepts any javascript object.
-
-Sometimes a function or method may genuinely need to accept any object; eg:
-```js
-function encodeBody(body) {
-    // ...
-}
-```
-In this scenario:
-- Use `object` if you know that you will not access any property
-- Use `Record<string, any>` if you need to access some property
-
-Both usages prevent the type from accepting primitives (eg: string, boolean...).  
-If using `Record`, ensure that you have guards to check that the properties really do exist.

doc/UI/ui.md

@@ -1,206 +0,0 @@
-## IView components
-
-The [interface](https://github.com/vector-im/hydrogen-web/blob/master/src/platform/web/ui/general/types.ts) adopted by view components is agnostic of how they are rendered to the DOM. This has several benefits:
- - it allows Hydrogen to not ship a [heavy view framework](https://bundlephobia.com/package/react-dom@18.2.0) that may or may not be used by its SDK users, and also keep bundle size of the app down.
- - Given the interface is quite simple, is should be easy to integrate this interface into the render lifecycle of other frameworks.
- - The main implementations used in Hydrogen are [`ListView`](https://github.com/vector-im/hydrogen-web/blob/master/src/platform/web/ui/general/ListView.ts) (rendering [`ObservableList`](https://github.com/vector-im/hydrogen-web/blob/master/src/observable/list/BaseObservableList.ts)s) and [`TemplateView`](https://github.com/vector-im/hydrogen-web/blob/master/src/platform/web/ui/general/TemplateView.ts) (templating and one-way databinding), each only a few 100 lines of code and tailored towards their specific use-case. They work straight with the DOM API and have no other dependencies.
- - a common inteface allows us to mix and match between these different implementations (and gradually shift if need be in the future) with the code.
-
-## Templates
-
-### Template language
-
-Templates use a mini-DSL language in pure javascript to express declarative templates. This is basically a very thin wrapper around `document.createElement`, `document.createTextNode`, `node.setAttribute` and `node.appendChild` to quickly create DOM trees. The general syntax is as follows:
-```js
-t.tag_name({attribute1: value, attribute2: value, ...}, [child_elements]);
-t.tag_name(child_element);
-t.tag_name([child_elements]);
-```
-**tag_name** can be [most HTML or SVG tags](https://github.com/vector-im/hydrogen-web/blob/master/src/platform/web/ui/general/html.ts#L102-L110).
-
-eg:
-Here is an example HTML segment followed with the code to create it in Hydrogen.
-```html
-<section class="main-section">
-    <h1>Demo</h1>
-    <button class="btn_cool">Click me</button>
-</section>
-```
-```js
-t.section({className: "main-section"},[
-    t.h1("Demo"), 
-    t.button({className:"btn_cool"}, "Click me")
-]);
-```
-
-All these functions return DOM element nodes, e.g. the result of `document.createElement`.
-
-### TemplateView
-
-`TemplateView` builds on top of templating by adopting the IView component model and adding event handling attributes, sub views and one-way databinding.
-In views based on `TemplateView`, you will see a render method with a `t` argument.  
-`t` is `TemplateBuilder` object passed to the render function in `TemplateView`. It also takes a data object to render and bind to, often called `vm`, short for view model from the MVVM pattern Hydrogen uses.
-
-You either subclass `TemplateView` and override the `render` method:
-```js
-class MyView extends TemplateView {
-    render(t, vm) {
-        return t.div(...);
-    }
-}
-```
-
-Or you pass a render function to `InlineTemplateView`:
-```js
-new InlineTemplateView(vm, (t, vm) => {
-    return t.div(...);
-});
-```
-
-**Note:** the render function is only called once to build the initial DOM tree and setup bindings, etc ... Any subsequent updates to the DOM of a component happens through bindings.
-
-#### Event handlers
-
-Any attribute starting with `on` and having a function as a value will be attached as an event listener on the given node. The event handler will be removed during unmounting.
-
-```js
-t.button({onClick: evt => {
-    vm.doSomething(evt.target.value);
-}}, "Click me");
-```
-
-#### Subviews
-
-`t.view(instance)` will mount the sub view (can be any IView) and return its root node so it can be attached in the DOM tree.
-All subviews will be unmounted when the parent view gets unmounted.
-
-```js
-t.div({className: "Container"}, t.view(new ChildView(vm.childViewModel)));
-```
-
-#### One-way data-binding
-
-A binding couples a part of the DOM to a value on the view model. The view model emits an update when any of its properties change, to which the view can subscribe. When an update is received by the view, it will reevaluate all the bindings, and update the DOM accordingly.
-
-A binding can appear in many places where a static value can usually be used in the template tree.
-To create a binding, you pass a function that maps the view value to a static value.
-
-##### Text binding
-
-```js
-t.p(["I've got ", vm => vm.counter, " beans"])
-```
-
-##### Attribute binding
-
-```js
-t.button({disabled: vm => vm.isBusy}, "Submit");
-```
-
-##### Class-name binding
-```js
-t.div({className: {
-    button: true,
-    active: vm => vm.isActive
-}})
-```
-##### Subview binding
-
-So far, all the bindings can only change node values within our tree, but don't change the structure of the DOM. A sub view binding allows you to conditionally add a subview based on the result of a binding function.
-
-All sub view bindings return a DOM (element or comment) node and can be directly added to the DOM tree by including them in your template.
-
-###### map
-
-`t.mapView` allows you to choose a view based on the result of the binding function:
-
-```js
-t.mapView(vm => vm.count, count => {
-    return count > 5 ? new LargeView(count) : new SmallView(count);
-});
-```
-
-Every time the first or binding function returns a different value, the second function is run to create a new view to replace the previous view.
-
-You can also return `null` or `undefined` from the second function to indicate a view should not be rendered. In this case a comment node will be used as a placeholder.
-
-There is also a `t.map` which will create a new template view (with the same value) and you directly provide a render function for it:
-
-```js
-t.map(vm => vm.shape, (shape, t, vm) => {
-    switch (shape) {
-        case "rect": return t.rect();
-        case "circle": return t.circle();
-    }
-})
-```
-
-###### if
-
-`t.ifView` will render the subview if the binding returns a truthy value:
-
-```js
-t.ifView(vm => vm.isActive, vm => new View(vm.someValue));
-```
-
-You equally have `t.if`, which creates a `TemplateView` and passes you the `TemplateBuilder`:
-
-```js
-t.if(vm => vm.isActive, (t, vm) => t.div("active!"));
-```
-
-##### Side-effects
-
-Sometimes you want to imperatively modify your DOM tree based on the value of a binding.
-`mapSideEffect` makes this easy to do:
-
-```js
-let node = t.div();
-t.mapSideEffect(vm => vm.color, (color, oldColor) => node.style.background = color);
-return node;
-```
-
-**Note:** you shouldn't add any bindings, subviews or event handlers from the side-effect callback,
-the safest is to not use the `t` argument at all.
-If you do, they will be added every time the callback is run and only cleaned up when the view is unmounted.
-
-#### `tag` vs `t`
-
-If you don't need a view component with data-binding, sub views and event handler attributes, the template language also is available in `ui/general/html.js` without any of these bells and whistles, exported as `tag`. As opposed to static templates with `tag`, you always use
-`TemplateView` as an instance of a class, as there is some extra state to keep track (bindings, event handlers and subviews).
-
-Although syntactically similar, `TemplateBuilder` and `tag` are not functionally equivalent.  
-Primarily `t` **supports** bindings and event handlers while `tag` **does not**. This is because to remove event listeners, we need to keep track of them, and thus we need to keep this state somewhere which
-we can't do with a simple function call but we can insite the TemplateView class.
-
-```js
-    // The onClick here wont work!!
-    tag.button({className:"awesome-btn", onClick: () => this.foo()});
-
-class MyView extends TemplateView {
-    render(t, vm){
-        // The onClick works here.
-        t.button({className:"awesome-btn", onClick: () => this.foo()});
-    }
-}
-```
-
-## ListView
-
-A view component that renders and updates a list of sub views for every item in a `ObservableList`.
-
-```js
-const list = new ListView({
-    list: someObservableList
-}, listValue => return new ChildView(listValue))
-```
-
-As items are added, removed, moved (change position) and updated, the DOM will be kept in sync.
-
-There is also a `LazyListView` that only renders items in and around the current viewport, with the restriction that all items in the list must be rendered with the same height.
-
-### Sub view updates
-
-Unless the `parentProvidesUpdates` option in the constructor is set to `false`, the ListView will call the `update` method on the child `IView` component when it receives an update event for one of the items in the `ObservableList`.
-
-This way, not every sub view has to have an individual listener on it's view model (a value from the observable list), and all updates go from the observable list to the list view, who then notifies the correct sub view.

package.json

@@ -1,24 +1,18 @@
 {
   "name": "hydrogen-web",
-  "version": "0.3.1",
+  "version": "0.2.22",
   "description": "A javascript matrix client prototype, trying to minize RAM usage by offloading as much as possible to IndexedDB",
+  "main": "src/lib.ts",
   "directories": {
     "doc": "doc"
   },
-  "enginesStrict": {
-    "node": ">=15"
-  },
   "scripts": {
     "lint": "eslint --cache src/",
     "lint-ts": "eslint src/ -c .ts-eslintrc.js --ext .ts",
     "lint-ci": "eslint src/",
     "test": "impunity --entry-point src/platform/web/main.js src/platform/web/Platform.js --force-esm-dirs lib/ src/ --root-dir src/",
-    "test:postcss": "impunity --entry-point  scripts/postcss/tests/css-compile-variables.test.js scripts/postcss/tests/css-url-to-variables.test.js",
-    "test:sdk": "yarn build:sdk && cd ./scripts/sdk/test/ && yarn --no-lockfile && node test-sdk-in-esm-vite-build-env.js && node test-sdk-in-commonjs-env.js",
     "start": "vite --port 3000",
-    "build": "vite build && ./scripts/cleanup.sh",
-    "build:sdk": "./scripts/sdk/build.sh",
-    "watch:sdk": "./scripts/sdk/build.sh && yarn run vite build -c vite.sdk-lib-config.js --watch"
+    "build": "vite build"
   },
   "repository": {
     "type": "git",
@@ -33,34 +27,27 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^4.29.2",
     "@typescript-eslint/parser": "^4.29.2",
-    "acorn": "^8.6.0",
-    "acorn-walk": "^8.2.0",
-    "aes-js": "^3.1.2",
-    "bs58": "^4.0.1",
     "core-js": "^3.6.5",
-    "es6-promise": "https://github.com/bwindels/es6-promise.git#bwindels/expose-flush",
-    "escodegen": "^2.0.0",
     "eslint": "^7.32.0",
     "fake-indexeddb": "^3.1.2",
     "impunity": "^1.0.9",
     "mdn-polyfills": "^5.20.0",
-    "merge-options": "^3.0.4",
     "node-html-parser": "^4.0.0",
     "postcss-css-variables": "^0.18.0",
     "postcss-flexbugs-fixes": "^5.0.2",
-    "postcss-value-parser": "^4.2.0",
     "regenerator-runtime": "^0.13.7",
-    "svgo": "^2.8.0",
-    "text-encoding": "^0.7.0",
-    "typescript": "^4.7.0",
-    "vite": "^2.9.8",
+    "typescript": "^4.3.5",
+    "vite": "^2.6.14",
     "xxhashjs": "^0.2.2"
   },
   "dependencies": {
-    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz",
+    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz",
+    "aes-js": "^3.1.2",
     "another-json": "^0.2.0",
     "base64-arraybuffer": "^0.2.0",
+    "bs58": "^4.0.1",
     "dompurify": "^2.3.0",
-    "off-color": "^2.0.0"
+    "es6-promise": "https://github.com/bwindels/es6-promise.git#bwindels/expose-flush",
+    "text-encoding": "^0.7.0"
   }
 }

scripts/.eslintrc.js

@@ -1,18 +0,0 @@
-module.exports = {
-    "env": {
-        "node": true,
-        "es6": true
-    },
-    "extends": "eslint:recommended",
-    "parserOptions": {
-        "ecmaVersion": 2020,
-        "sourceType": "module"
-    },
-    "rules": {
-        "no-console": "off",
-        "no-empty": "off",
-        "no-prototype-builtins": "off",
-        "no-unused-vars": "warn"
-    },
-};
-

scripts/build-plugins/rollup-plugin-build-themes.js

@@ -1,376 +0,0 @@
-/*
-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.
-*/
-const path = require('path').posix;
-const {optimize} = require('svgo');
-
-async function readCSSSource(location) {
-    const fs = require("fs").promises;
-    const resolvedLocation = path.resolve(__dirname, "../../", `${location}/theme.css`);
-    const data = await fs.readFile(resolvedLocation);
-    return data;
-}
-
-function getRootSectionWithVariables(variables) {
-    return `:root{\n${Object.entries(variables).reduce((acc, [key, value]) => acc + `--${key}: ${value};\n`, "")} }\n\n`;
-}
-
-function appendVariablesToCSS(variables, cssSource) {
-    return cssSource + getRootSectionWithVariables(variables);
-}
-
-function addThemesToConfig(bundle, manifestLocations, defaultThemes) {
-    for (const [fileName, info] of Object.entries(bundle)) {
-        if (fileName === "config.json") {
-            const source = new TextDecoder().decode(info.source);
-            const config = JSON.parse(source);
-            config["themeManifests"] = manifestLocations;
-            config["defaultTheme"] = defaultThemes;
-            info.source = new TextEncoder().encode(JSON.stringify(config, undefined, 2));
-        }
-    }
-}
-
-/**
- * Returns an object where keys are the svg file names and the values
- * are the svg code (optimized)
- * @param {*} icons Object where keys are css variable names and values are locations of the svg
- * @param {*} manifestLocation Location of manifest used for resolving path 
- */
-async function generateIconSourceMap(icons, manifestLocation) {
-    const sources = {};
-    const fileNames = [];
-    const promises = [];
-    const fs = require("fs").promises;
-    for (const icon of Object.values(icons)) {
-        const [location] = icon.split("?");
-        // resolve location against manifestLocation
-        const resolvedLocation = path.resolve(manifestLocation, location);
-        const iconData = fs.readFile(resolvedLocation);
-        promises.push(iconData);
-        const fileName = path.basename(resolvedLocation);
-        fileNames.push(fileName);
-    }
-    const results = await Promise.all(promises);
-    for (let i = 0; i < results.length; ++i)  {
-        const svgString = results[i].toString();
-        const result = optimize(svgString, {
-            plugins: [
-                {
-                    name: "preset-default",
-                    params: {
-                        overrides: { convertColors: false, },
-                    },
-                },
-            ],
-        });
-        const optimizedSvgString = result.data;
-        sources[fileNames[i]] = optimizedSvgString;
-    }
-    return sources;
-}
-
-/**
- * Returns a mapping from location (of manifest file) to an array containing all the chunks (of css files) generated from that location.
- * To understand what chunk means in this context, see https://rollupjs.org/guide/en/#generatebundle.
- * @param {*} bundle Mapping from fileName to AssetInfo | ChunkInfo
- */
-function getMappingFromLocationToChunkArray(bundle) {
-    const chunkMap = new Map();
-    for (const [fileName, info] of Object.entries(bundle)) {
-        if (!fileName.endsWith(".css") || info.type === "asset" || info.facadeModuleId?.includes("type=runtime")) {
-            continue;
-        }
-        const location = info.facadeModuleId?.match(/(.+)\/.+\.css/)?.[1];
-        if (!location) {
-            throw new Error("Cannot find location of css chunk!");
-        }
-        const array = chunkMap.get(location);
-        if (!array) {
-            chunkMap.set(location, [info]);
-        }
-        else {
-            array.push(info);
-        }
-    }
-    return chunkMap;
-}
-
-/**
- * Returns a mapping from unhashed file name (of css files) to AssetInfo.
- * To understand what AssetInfo means in this context, see https://rollupjs.org/guide/en/#generatebundle.
- * @param {*} bundle Mapping from fileName to AssetInfo | ChunkInfo 
- */
-function getMappingFromFileNameToAssetInfo(bundle) {
-    const assetMap = new Map();
-    for (const [fileName, info] of Object.entries(bundle)) {
-        if (!fileName.endsWith(".css")) {
-            continue;
-        }
-        if (info.type === "asset") {
-            /**
-             * So this is the css assetInfo that contains the asset hashed file name.
-             * We'll store it in a separate map indexed via fileName (unhashed) to avoid
-             * searching through the bundle array later.
-             */
-            assetMap.set(info.name, info);
-        }
-    }
-    return assetMap;
-}
-
-/**
- * Returns a mapping from location (of manifest file) to ChunkInfo of the runtime css asset
- * To understand what ChunkInfo means in this context, see https://rollupjs.org/guide/en/#generatebundle.
- * @param {*} bundle Mapping from fileName to AssetInfo | ChunkInfo
- */
-function getMappingFromLocationToRuntimeChunk(bundle) {
-    let runtimeThemeChunkMap = new Map();
-    for (const [fileName, info] of Object.entries(bundle)) {
-        if (!fileName.endsWith(".css") || info.type === "asset") {
-            continue;
-        }
-        const location = info.facadeModuleId?.match(/(.+)\/.+\.css/)?.[1];
-        if (!location) {
-            throw new Error("Cannot find location of css chunk!");
-        }
-        if (info.facadeModuleId?.includes("type=runtime")) {
-            /**
-             * We have a separate field in manifest.source just for the runtime theme,
-             * so store this separately.
-             */
-            runtimeThemeChunkMap.set(location, info);
-        }
-    }
-    return runtimeThemeChunkMap;
-}
-
-module.exports = function buildThemes(options) {
-    let manifest, variants, defaultDark, defaultLight, defaultThemes = {};
-    let isDevelopment = false;
-    const virtualModuleId = '@theme/'
-    const resolvedVirtualModuleId = '\0' + virtualModuleId;
-    const themeToManifestLocation = new Map();
-
-    return {
-        name: "build-themes",
-        enforce: "pre",
-
-        configResolved(config) {
-            if (config.command === "serve") {
-                isDevelopment = true;
-            }
-        },
-
-        async buildStart() {
-            const { themeConfig } = options;
-            for (const location of themeConfig.themes) {
-                manifest = require(`${location}/manifest.json`);
-                const themeCollectionId = manifest.id;
-                themeToManifestLocation.set(themeCollectionId, location);
-                variants = manifest.values.variants;
-                for (const [variant, details] of Object.entries(variants)) {
-                    const fileName = `theme-${themeCollectionId}-${variant}.css`;
-                    if (themeCollectionId === themeConfig.default && details.default) {
-                        // This is the default theme, stash  the file name for later
-                        if (details.dark) {
-                            defaultDark = fileName;
-                            defaultThemes["dark"] = `${themeCollectionId}-${variant}`;
-                        }
-                        else {
-                            defaultLight = fileName;
-                            defaultThemes["light"] = `${themeCollectionId}-${variant}`;
-                        }
-                    }
-                    // emit the css as built theme bundle
-                    if (!isDevelopment) {
-                        this.emitFile({ type: "chunk", id: `${location}/theme.css?variant=${variant}${details.dark ? "&dark=true" : ""}`, fileName, });
-                    }
-                }
-                // emit the css as runtime theme bundle
-                if (!isDevelopment) {
-                    this.emitFile({ type: "chunk", id: `${location}/theme.css?type=runtime`, fileName: `theme-${themeCollectionId}-runtime.css`, });
-                }
-            }
-        },
-
-        resolveId(id) {
-            if (id.startsWith(virtualModuleId)) {
-                return '\0' + id;
-            }
-        },
-
-        async load(id) {
-            if (isDevelopment) {
-                /**
-                 * To load the theme during dev, we need to take a different approach because emitFile is not supported in dev.
-                 * We solve this by resolving virtual file "@theme/name/variant" into the necessary css import.
-                 * This virtual file import is removed when hydrogen is built (see transform hook).
-                 */
-                if (id.startsWith(resolvedVirtualModuleId)) {
-                    let [theme, variant, file] = id.substr(resolvedVirtualModuleId.length).split("/");
-                    if (theme === "default") {
-                        theme = options.themeConfig.default;
-                    }
-                    const location = themeToManifestLocation.get(theme);
-                    const manifest = require(`${location}/manifest.json`);
-                    const variants = manifest.values.variants;
-                    if (!variant || variant === "default") {
-                        // choose the first default variant for now
-                        // this will need to support light/dark variants as well
-                        variant = Object.keys(variants).find(variantName => variants[variantName].default);
-                    }
-                    if (!file) {
-                        file = "index.js";
-                    }
-                    switch (file) {
-                        case "index.js": {
-                            const isDark = variants[variant].dark;
-                            return `import "${path.resolve(`${location}/theme.css`)}${isDark? "?dark=true": ""}";` +
-                                `import "@theme/${theme}/${variant}/variables.css"`;
-                        }
-                        case "variables.css": { 
-                            const variables = variants[variant].variables;
-                            const css =  getRootSectionWithVariables(variables);
-                            return css;
-                        }
-                    }
-                }
-            }
-            else {
-                const result = id.match(/(.+)\/theme.css\?variant=([^&]+)/);
-                if (result) {
-                    const [, location, variant] = result;
-                    const cssSource = await readCSSSource(location);
-                    const config = variants[variant];
-                    return appendVariablesToCSS(config.variables, cssSource);
-                }
-                return null;
-            }
-        },
-
-        transform(code, id) {
-            if (isDevelopment) {
-                return;
-            }
-            /**
-             * Removes develop-only script tag; this cannot be done in transformIndexHtml hook because
-             * by the time that hook runs, the import is added to the bundled js file which would
-             * result in a runtime error.
-             */
-
-            const devScriptTag =
-                /<script type="module"> import "@theme\/.+"; <\/script>/;
-            if (id.endsWith("index.html")) {
-                const htmlWithoutDevScript = code.replace(devScriptTag, "");
-                return htmlWithoutDevScript;
-            }
-        },
-
-        transformIndexHtml(_, ctx) {
-            if (isDevelopment) {
-                // Don't add default stylesheets to index.html on dev
-                return;
-            } 
-            let darkThemeLocation, lightThemeLocation;
-            for (const [, bundle] of Object.entries(ctx.bundle)) {
-                if (bundle.name === defaultDark) {
-                    darkThemeLocation = bundle.fileName;
-                }
-                if (bundle.name === defaultLight) {
-                    lightThemeLocation = bundle.fileName;
-                }
-            }
-            return [
-                {
-                    tag: "link",
-                    attrs: {
-                        rel: "stylesheet",
-                        type: "text/css",
-                        media: "(prefers-color-scheme: dark)",
-                        href: `./${darkThemeLocation}`,
-                        class: "theme",
-                    }
-                },
-                {
-                    tag: "link",
-                    attrs: {
-                        rel: "stylesheet",
-                        type: "text/css",
-                        media: "(prefers-color-scheme: light)",
-                        href: `./${lightThemeLocation}`,
-                        class: "theme",
-                    }
-                },
-            ];
-},
-
-        async generateBundle(_, bundle) {
-            const assetMap = getMappingFromFileNameToAssetInfo(bundle);
-            const chunkMap = getMappingFromLocationToChunkArray(bundle);
-            const runtimeThemeChunkMap = getMappingFromLocationToRuntimeChunk(bundle);
-            const manifestLocations = [];
-            // Location of the directory containing manifest relative to the root of the build output
-            const manifestLocation = "assets";
-            for (const [location, chunkArray] of chunkMap) {
-                const manifest = require(`${location}/manifest.json`);
-                const compiledVariables = options.compiledVariables.get(location);
-                const derivedVariables = compiledVariables["derived-variables"];
-                const icon = compiledVariables["icon"];
-                const builtAssets = {};
-                let themeKey;
-                for (const chunk of chunkArray) {
-                    const [, name, variant] = chunk.fileName.match(/theme-(.+)-(.+)\.css/);
-                    themeKey = name;
-                    const locationRelativeToBuildRoot = assetMap.get(chunk.fileName).fileName;
-                    const locationRelativeToManifest = path.relative(manifestLocation, locationRelativeToBuildRoot);
-                    builtAssets[`${name}-${variant}`] = locationRelativeToManifest;
-                }
-                // Emit the base svg icons as asset
-                const nameToAssetHashedLocation = [];
-                const nameToSource = await generateIconSourceMap(icon, location);
-                for (const [name, source] of Object.entries(nameToSource)) {
-                    const ref = this.emitFile({ type: "asset", name, source });
-                    const assetHashedName = this.getFileName(ref);
-                    nameToAssetHashedLocation[name] = assetHashedName;
-                }
-                // Update icon section in output manifest with paths to the icon in build output 
-                for (const [variable, location] of Object.entries(icon)) {
-                    const [locationWithoutQueryParameters, queryParameters] = location.split("?");
-                    const name = path.basename(locationWithoutQueryParameters);
-                    const locationRelativeToBuildRoot = nameToAssetHashedLocation[name];
-                    const locationRelativeToManifest = path.relative(manifestLocation, locationRelativeToBuildRoot);
-                    icon[variable] = `${locationRelativeToManifest}?${queryParameters}`;
-                }
-                const runtimeThemeChunk = runtimeThemeChunkMap.get(location);
-                const runtimeAssetLocation = path.relative(manifestLocation, assetMap.get(runtimeThemeChunk.fileName).fileName); 
-                manifest.source = {
-                    "built-assets": builtAssets,
-                    "runtime-asset": runtimeAssetLocation,
-                    "derived-variables": derivedVariables,
-                    "icon": icon,
-                };
-                const name = `theme-${themeKey}.json`;
-                manifestLocations.push(`${manifestLocation}/${name}`);
-                this.emitFile({
-                    type: "asset",
-                    name,
-                    source: JSON.stringify(manifest),
-                });
-            }
-            addThemesToConfig(bundle, manifestLocations, defaultThemes);
-        },
-    }
-}

scripts/build-plugins/service-worker.js

@@ -8,11 +8,10 @@ function contentHash(str) {
     return hasher.digest();
 }
 
-function injectServiceWorker(swFile, findUnhashedFileNamesFromBundle, placeholdersPerChunk) {
+function injectServiceWorker(swFile, otherUnhashedFiles, placeholdersPerChunk) {
     const swName = path.basename(swFile);
     let root;
     let version;
-    let logger;
 
     return {
         name: "hydrogen:injectServiceWorker",
@@ -28,10 +27,8 @@ function injectServiceWorker(swFile, findUnhashedFileNamesFromBundle, placeholde
         configResolved: config => {
             root = config.root;
             version = JSON.parse(config.define.DEFINE_VERSION); // unquote
-            logger = config.logger;
         },
         generateBundle: async function(options, bundle) {
-            const otherUnhashedFiles = findUnhashedFileNamesFromBundle(bundle);
             const unhashedFilenames = [swName].concat(otherUnhashedFiles);
             const unhashedFileContentMap = unhashedFilenames.reduce((map, fileName) => {
                 const chunkOrAsset = bundle[fileName];
@@ -49,7 +46,7 @@ function injectServiceWorker(swFile, findUnhashedFileNamesFromBundle, placeholde
                 ...getCacheFileNamePlaceholderValues(swName, unhashedFilenames, assets, placeholdersPerChunk)
             };
             replacePlaceholdersInChunks(assets, placeholdersPerChunk, placeholderValues);
-            logger.info(`\nBuilt ${version} (${globalHash})`);
+            console.log(`\nBuilt ${version} (${globalHash})`);
         }
     };
 }

scripts/ci.sh

@@ -1,165 +0,0 @@
-#!/bin/bash
-# ci.sh: Helper script to automate deployment operations on CI/CD
-# Copyright © 2022 Aravinth Manivannan <realaravinth@batsense.net>
-# 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-# 
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-set -xEeuo  pipefail
-#source $(pwd)/scripts/lib.sh
-
-readonly SSH_ID_FILE=/tmp/ci-ssh-id
-readonly SSH_REMOTE_NAME=origin-ssh
-readonly PROJECT_ROOT=$(pwd)
-
-match_arg() {
-    if [ $1 == $2 ] || [ $1 == $3 ]
-    then
-        return 0
-    else
-        return 1
-    fi
-}
-
-help() {
-	cat << EOF
-USAGE: ci.sh [SUBCOMMAND]
-Helper script to automate deployment operations on CI/CD
-
-Subcommands
-
-  -c  --clean	cleanup secrets, SSH key and other runtime data
-  -i  --init <SSH_PRIVATE_KEY>	initialize environment, write SSH private to file
-  -d  --deploy <PAGES-SECRET> <TARGET BRANCH>	push branch to Gitea and call Pages server
-  -h  --help	print this help menu
-EOF
-}
-
-# $1: SSH private key
-write_ssh(){
-	truncate --size 0 $SSH_ID_FILE
-	echo "$1" > $SSH_ID_FILE
-	chmod 600 $SSH_ID_FILE
-}
-
-set_ssh_remote() {
-	http_remote_url=$(git remote get-url origin)
-	remote_hostname=$(echo $http_remote_url | cut -d '/' -f 3) 
-	repository_owner=$(echo $http_remote_url | cut -d '/' -f 4)
-	repository_name=$(echo $http_remote_url | cut -d '/' -f 5)
-	ssh_remote="git@$remote_hostname:$repository_owner/$repository_name"
-	ssh_remote="git@git.batsense.net:mystiq/hydrogen-web.git"
-	git remote add $SSH_REMOTE_NAME $ssh_remote
-}
-
-clean() {
-	if [ -f $SSH_ID_FILE ]
-	then
-		shred $SSH_ID_FILE
-		rm $SSH_ID_FILE
-	fi
-}
-
-# $1: branch name
-# $2: directory containing build assets
-# $3: Author in <author-name author@example.com> format
-commit_files() {
-	cd $PROJECT_ROOT
-	original_branch=$(git branch --show-current)
-	tmp_dir=$(mktemp -d)
-	cp -r $2/* $tmp_dir
-
-	if [[ -z $(git ls-remote --heads origin ${1}) ]]
-	then
-		echo "[*] Creating deployment branch $1"
-		git checkout --orphan $1
-	else
-		echo "[*] Deployment branch $1 exists, pulling changes from remote"
-		git fetch origin $1
-		git switch $1 
-	fi
-
-	git rm -rf .
-	/bin/rm -rf *
-	cp -r $tmp_dir/* .
-	git add --all
-	if [ $(git status --porcelain | xargs | sed '/^$/d' | wc -l) -gt 0 ];
-	then
-		echo "[*] Repository has changed, committing changes"
-		git commit \
-			--author="$3" \
-			--message="new deploy: $(date --iso-8601=seconds)"
-	fi
-	git checkout $original_branch
-}
-
-# $1: Pages API secret
-# $2: Deployment target branch
-deploy() {
-	if (( "$#" < 2 ))
-	then
-		help
-	else
-		git -c core.sshCommand="/usr/bin/ssh -oStrictHostKeyChecking=no -i $SSH_ID_FILE"\
-			push --force  $SSH_REMOTE_NAME $2
-		curl -vv --location --request \
-				POST "https://deploy.batsense.net/api/v1/update"\
-				--header 'Content-Type: application/json' \
-				--data-raw "{ \"secret\": \"$1\", \"branch\": \"$2\" }"
-	fi
-}
-
-if (( "$#" < 1 ))
-then
-	help
-	exit -1
-fi
-
-
-if match_arg $1 '-i' '--init'
-then
-	if (( "$#" < 2 ))
-	then
-		help
-		exit -1
-	fi
-	set_ssh_remote
-	write_ssh "$2"
-elif match_arg $1 '-c' '--clean'
-then
-	clean
-elif match_arg $1 '-cf' '--commit-files'
-then
-	if (( "$#" < 4 ))
-	then
-		help
-		exit -1
-	fi
-    commit_files $2 $3 $4
-elif match_arg $1 '-d' '--deploy'
-then
-	if (( "$#" < 3 ))
-	then
-		help
-		exit -1
-	fi
-	deploy $2 $3
-elif match_arg $1 '-h' '--help'
-then
-	help
-else
-	help
-fi
-
-
-

scripts/cleanup.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-# Remove icons created in .tmp
-rm -rf .tmp

scripts/package.sh

@@ -2,9 +2,6 @@ VERSION=$(jq -r ".version" package.json)
 PACKAGE=hydrogen-web-$VERSION.tar.gz
 yarn build
 pushd target
-# move config file so we don't override it
-# when deploying a new version
-mv config.json config.sample.json
 tar -czvf ../$PACKAGE ./
 popd
 echo $PACKAGE

scripts/postcss/css-compile-variables.js

@@ -1,180 +0,0 @@
-/*
-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.
-*/
-
-const valueParser = require("postcss-value-parser");
-
-/**
- * This plugin derives new css variables from a given set of base variables.
- * A derived css variable has the form --base--operation-argument; meaning that the derived
- * variable has a value that is generated from the base variable "base" by applying "operation"
- * with given "argument".
- * 
- * eg: given the base variable --foo-color: #40E0D0, --foo-color--darker-20 is a css variable
- * derived from foo-color by making it 20% more darker.
- * 
- * All derived variables are added to the :root section.
- * 
- * The actual derivation is done outside the plugin in a callback.
- */
-
-function getValueFromAlias(alias, {aliasMap, baseVariables, resolvedMap}) {
-    const derivedVariable = aliasMap.get(alias);
-    return baseVariables.get(derivedVariable) ?? resolvedMap.get(derivedVariable);
-}
-
-function parseDeclarationValue(value) {
-    const parsed = valueParser(value);
-    const variables = [];
-    parsed.walk(node => {
-        if (node.type !== "function") {
-            return;
-        }
-        switch (node.value) {
-            case "var": {
-                const variable = node.nodes[0];
-                variables.push(variable.value);
-                break;
-            }
-            case "url": {
-                const url = node.nodes[0].value;
-                // resolve url with some absolute url so that we get the query params without using regex
-                const params = new URL(url, "file://foo/bar/").searchParams;
-                const primary = params.get("primary");
-                const secondary = params.get("secondary");
-                if (primary) { variables.push(primary); }
-                if (secondary) { variables.push(secondary); }
-                break;
-            }
-        }
-    });
-    return variables;
-}
-
-function resolveDerivedVariable(decl, derive, maps, isDark) {
-    const { baseVariables, resolvedMap } = maps;
-    const RE_VARIABLE_VALUE = /(?:--)?((.+)--(.+)-(.+))/;
-    const variableCollection = parseDeclarationValue(decl.value);
-    for (const variable of variableCollection) {
-        const matches = variable.match(RE_VARIABLE_VALUE);
-        if (matches) {
-            const [, wholeVariable, baseVariable, operation, argument] = matches;
-            const value = baseVariables.get(baseVariable) ?? getValueFromAlias(baseVariable, maps);
-            if (!value) {
-                throw new Error(`Cannot derive from ${baseVariable} because it is neither defined in config nor is it an alias!`);
-            }
-            const derivedValue = derive(value, operation, argument, isDark);
-            resolvedMap.set(wholeVariable, derivedValue);
-        }
-    }
-}
-
-function extract(decl, {aliasMap, baseVariables}) {
-    if (decl.variable) {
-        // see if right side is of form "var(--foo)"
-        const wholeVariable = decl.value.match(/var\(--(.+)\)/)?.[1];
-        // remove -- from the prop
-        const prop = decl.prop.substring(2);
-        if (wholeVariable) {
-            aliasMap.set(prop, wholeVariable);
-            // Since this is an alias, we shouldn't store it in baseVariables
-            return;
-        }
-        baseVariables.set(prop, decl.value);
-    }
-}
-
-function addResolvedVariablesToRootSelector(root, {Rule, Declaration}, {resolvedMap}) {
-    const newRule = new Rule({ selector: ":root", source: root.source });
-    // Add derived css variables to :root
-    resolvedMap.forEach((value, key) => {
-        const declaration = new Declaration({prop: `--${key}`, value});
-        newRule.append(declaration);
-    });
-    root.append(newRule);
-}
-
-function populateMapWithDerivedVariables(map, cssFileLocation, {resolvedMap, aliasMap}) {
-    const location = cssFileLocation.match(/(.+)\/.+\.css/)?.[1];
-    const derivedVariables = [
-        ...([...resolvedMap.keys()].filter(v => !aliasMap.has(v))),
-        ...([...aliasMap.entries()].map(([alias, variable]) => `${alias}=${variable}`))
-    ];
-    const sharedObject = map.get(location);
-    const output = { "derived-variables": derivedVariables };
-    if (sharedObject) {
-        Object.assign(sharedObject, output);
-    }
-    else {
-        map.set(location, output);
-    }
-}
-
-/**
- * @callback derive
- * @param {string} value - The base value on which an operation is applied
- * @param {string} operation - The operation to be applied (eg: darker, lighter...)
- * @param {string} argument - The argument for this operation
- * @param {boolean} isDark - Indicates whether this theme is dark
- */
-/**
- * 
- * @param {Object} opts - Options for the plugin
- * @param {derive} opts.derive - The callback which contains the logic for resolving derived variables
- * @param {Map} opts.compiledVariables - A map that stores derived variables so that manifest source sections can be produced
- */
-module.exports = (opts = {}) => {
-    const aliasMap = new Map();
-    const resolvedMap = new Map();
-    const baseVariables = new Map();
-    const maps = { aliasMap, resolvedMap, baseVariables };
-
-    return {
-        postcssPlugin: "postcss-compile-variables",
-
-        Once(root, {Rule, Declaration, result}) {
-            const cssFileLocation = root.source.input.from;
-            if (cssFileLocation.includes("type=runtime")) {
-                // If this is a runtime theme, don't derive variables.
-                return;
-            }
-            const isDark = cssFileLocation.includes("dark=true");
-            /*
-            Go through the CSS file once to extract all aliases and base variables.
-            We use these when resolving derived variables later.
-            */
-            root.walkDecls(decl => extract(decl, maps));
-            root.walkDecls(decl => resolveDerivedVariable(decl, opts.derive, maps, isDark));
-            addResolvedVariablesToRootSelector(root, {Rule, Declaration}, maps);
-            if (opts.compiledVariables){
-                populateMapWithDerivedVariables(opts.compiledVariables, cssFileLocation, maps);
-            }
-            // Also produce a mapping from alias to completely resolved color
-            const resolvedAliasMap = new Map();
-            aliasMap.forEach((value, key) => {
-                resolvedAliasMap.set(key, resolvedMap.get(value));
-            });
-            // Publish the base-variables, derived-variables and resolved aliases to the other postcss-plugins
-            const combinedMap = new Map([...baseVariables, ...resolvedMap, ...resolvedAliasMap]);
-            result.messages.push({
-                type: "resolved-variable-map",
-                plugin: "postcss-compile-variables",
-                colorMap: combinedMap,
-            });
-        },
-    };
-};
-
-module.exports.postcss = true;

scripts/postcss/css-url-processor.js

@@ -1,92 +0,0 @@
-/*
-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.
-*/
-
-const valueParser = require("postcss-value-parser");
-const  resolve = require("path").resolve;
-
-function colorsFromURL(url, colorMap) {
-    const params = new URL(`file://${url}`).searchParams;
-    const primary = params.get("primary");
-    if (!primary) {
-        return null;
-    }
-    const secondary = params.get("secondary");
-    const primaryColor = colorMap.get(primary);
-    const secondaryColor = colorMap.get(secondary);
-    if (!primaryColor) {
-        throw new Error(`Variable ${primary} not found in resolved color variables!`);
-    }
-    if (secondary && !secondaryColor) {
-        throw new Error(`Variable ${secondary} not found in resolved color variables!`);
-    }
-    return [primaryColor, secondaryColor];
-}
-
-function processURL(decl, replacer, colorMap, cssPath) {
-    const value = decl.value;
-    const parsed = valueParser(value);
-    parsed.walk(node => {
-        if (node.type !== "function" || node.value !== "url") {
-            return;
-        }
-        const urlStringNode = node.nodes[0];
-        const oldURL = urlStringNode.value;
-        const oldURLAbsolute = resolve(cssPath, oldURL);
-        const colors  = colorsFromURL(oldURLAbsolute, colorMap);
-        if (!colors) {
-            // If no primary color is provided via url params, then this url need not be handled.
-            return;
-        }
-        const newURL = replacer(oldURLAbsolute.replace(/\?.+/, ""), ...colors);
-        if (!newURL) {
-            throw new Error("Replacer failed to produce a replacement URL!");
-        }
-        urlStringNode.value = newURL;
-    });
-    decl.assign({prop: decl.prop, value: parsed.toString()})
-}
-
-/* *
- * @type {import('postcss').PluginCreator}
- */
-module.exports = (opts = {}) => {
-    return {
-        postcssPlugin: "postcss-url-to-variable",
-
-        Once(root, {result}) {
-            const cssFileLocation = root.source.input.from;
-            if (cssFileLocation.includes("type=runtime")) {
-                // If this is a runtime theme, don't process urls.
-                return;
-            }
-            /*
-            postcss-compile-variables should have sent the list of resolved colours down via results
-            */
-            const {colorMap} = result.messages.find(m => m.type === "resolved-variable-map");
-            if (!colorMap) {
-                throw new Error("Postcss results do not contain resolved colors!");
-            }
-            /*
-            Go through each declaration and if it contains an URL, replace the url with the result
-            of running replacer(url)
-            */
-            const cssPath = root.source?.input.file.replace(/[^/]*$/, "");
-            root.walkDecls(decl => processURL(decl, opts.replacer, colorMap, cssPath));
-        },
-    };
-};
-
-module.exports.postcss = true;

scripts/postcss/css-url-to-variables.js

@@ -1,97 +0,0 @@
-/*
-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.
-*/
-
-const valueParser = require("postcss-value-parser");
-
-/**
- * This plugin extracts content inside url() into css variables and adds the variables to the root section.
- * This plugin is used in conjunction with css-url-processor plugin to colorize svg icons.
- */
-const idToPrepend = "icon-url";
-
-function findAndReplaceUrl(decl, urlVariables, counter) {
-    const value = decl.value;
-    const parsed = valueParser(value);
-    parsed.walk(node => {
-        if (node.type !== "function" || node.value !== "url") {
-            return;
-        }
-        const url = node.nodes[0].value;
-        if (!url.match(/\.svg\?primary=.+/)) {
-            return;
-        }
-        const count = counter.next().value;
-        const variableName = `${idToPrepend}-${count}`;
-        urlVariables.set(variableName, url);
-        node.value = "var";
-        node.nodes = [{ type: "word", value: `--${variableName}` }];
-    });
-    decl.assign({prop: decl.prop, value: parsed.toString()})
-}
-
-function addResolvedVariablesToRootSelector(root, { Rule, Declaration }, urlVariables) {
-    const newRule = new Rule({ selector: ":root", source: root.source });
-    // Add derived css variables to :root
-    urlVariables.forEach((value, key) => {
-        const declaration = new Declaration({ prop: `--${key}`, value: `url("${value}")`});
-        newRule.append(declaration);
-    });
-    root.append(newRule);
-}
-
-function populateMapWithIcons(map, cssFileLocation, urlVariables) {
-    const location = cssFileLocation.match(/(.+)\/.+\.css/)?.[1];
-    const sharedObject = map.get(location);
-    const output = {"icon": Object.fromEntries(urlVariables)};
-    if (sharedObject) {
-        Object.assign(sharedObject, output);
-    }
-    else {
-        map.set(location, output);
-    }
-}
-
-function *createCounter() {
-    for (let i = 0; ; ++i) {
-        yield i;
-    }
-}
-
-/* *
- * @type {import('postcss').PluginCreator}
- */
-module.exports = (opts = {}) => {
-    return {
-        postcssPlugin: "postcss-url-to-variable",
-
-        Once(root, { Rule, Declaration }) {
-            const urlVariables = new Map();
-            const counter = createCounter();
-            root.walkDecls(decl => findAndReplaceUrl(decl, urlVariables, counter));
-            const cssFileLocation = root.source.input.from;
-            if (urlVariables.size && !cssFileLocation.includes("type=runtime")) {
-                addResolvedVariablesToRootSelector(root, { Rule, Declaration }, urlVariables);
-            }
-            if (opts.compiledVariables){
-                const cssFileLocation = root.source.input.from;
-                populateMapWithIcons(opts.compiledVariables, cssFileLocation, urlVariables);
-            }
-        },
-    };
-};
-
-module.exports.postcss = true;
-

scripts/postcss/svg-builder.mjs

@@ -1,51 +0,0 @@
-/*
-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 {readFileSync, mkdirSync, writeFileSync} from "fs";
-import {resolve} from "path";
-import {h32} from "xxhashjs";
-import {getColoredSvgString} from "../../src/platform/web/theming/shared/svg-colorizer.mjs";
-
-function createHash(content) {
-    const hasher = new h32(0);
-    hasher.update(content);
-    return hasher.digest();
-}
-
-/**
- * Builds a new svg with the colors replaced and returns its location.
- * @param {string} svgLocation The location of the input svg file
- * @param {string} primaryColor Primary color for the new svg
- * @param {string} secondaryColor Secondary color for the new svg
- */
-export function buildColorizedSVG(svgLocation, primaryColor, secondaryColor) {
-    const svgCode = readFileSync(svgLocation, { encoding: "utf8"});
-    const coloredSVGCode = getColoredSvgString(svgCode, primaryColor, secondaryColor);
-    const fileName = svgLocation.match(/.+[/\\](.+\.svg)/)[1];
-    const outputName = `${fileName.substring(0, fileName.length - 4)}-${createHash(coloredSVGCode)}.svg`;
-    const outputPath = resolve(__dirname, "./.tmp");
-    try {
-       mkdirSync(outputPath);
-    }
-    catch (e) {
-        if (e.code !== "EEXIST") {
-            throw e;
-        }
-    }
-    const outputFile = `${outputPath}/${outputName}`;
-    writeFileSync(outputFile, coloredSVGCode);
-    return outputFile;
-}

scripts/postcss/tests/common.js

@@ -1,30 +0,0 @@
-/*
-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.
-*/
-
-const postcss = require("postcss");
-
-module.exports.createTestRunner = function (plugin) {
-    return async function run(input, output, opts = {}, assert) {
-        let result = await postcss([plugin(opts)]).process(input, { from: undefined, });
-        assert.strictEqual(
-            result.css.replaceAll(/\s/g, ""),
-            output.replaceAll(/\s/g, "")
-        );
-        assert.strictEqual(result.warnings().length, 0);
-    };
-}
-
-

scripts/postcss/tests/css-compile-variables.test.js

@@ -1,156 +0,0 @@
-/*
-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.
-*/
-
-const offColor = require("off-color").offColor;
-const postcss = require("postcss");
-const plugin = require("../css-compile-variables");
-const derive = require("../color").derive;
-const run = require("./common").createTestRunner(plugin);
-
-module.exports.tests = function tests() {
-    return {
-        "derived variables are resolved": async (assert) => {
-            const inputCSS = `
-            :root {
-                --foo-color: #ff0;
-            }
-            div {
-                background-color: var(--foo-color--lighter-50);
-            }`;
-            const transformedColor = offColor("#ff0").lighten(0.5);
-            const outputCSS =
-                inputCSS +
-                `
-            :root {
-                --foo-color--lighter-50: ${transformedColor.hex()};
-            }
-            `;
-            await run( inputCSS, outputCSS, {derive}, assert);
-        },
-
-        "derived variables work with alias": async (assert) => {
-            const inputCSS = `
-            :root {
-                --icon-color: #fff;
-            }
-            div {
-                background: var(--icon-color--darker-20);
-                --my-alias: var(--icon-color--darker-20);
-                color: var(--my-alias--lighter-15);
-            }`;
-            const colorDarker = offColor("#fff").darken(0.2).hex();
-            const aliasLighter = offColor(colorDarker).lighten(0.15).hex();
-            const outputCSS = inputCSS + `:root {
-                --icon-color--darker-20: ${colorDarker};
-                --my-alias--lighter-15: ${aliasLighter};
-            }
-            `;
-            await run(inputCSS, outputCSS, {derive}, assert);
-        },
-
-        "derived variable throws if base not present in config": async (assert) => {
-            const css = `:root {
-                color: var(--icon-color--darker-20);
-            }`;
-            assert.rejects(async () => await postcss([plugin({ variables: {} })]).process(css, { from: undefined, }));
-        },
-
-        "multiple derived variable in single declaration is parsed correctly": async (assert) => {
-            const inputCSS = `
-            :root {
-                --foo-color: #ff0;
-            }
-            div {
-                background-color: linear-gradient(var(--foo-color--lighter-50), var(--foo-color--darker-20));
-            }`;
-            const transformedColor1 = offColor("#ff0").lighten(0.5);
-            const transformedColor2 = offColor("#ff0").darken(0.2);
-            const outputCSS =
-                inputCSS +
-                `
-            :root {
-                --foo-color--lighter-50: ${transformedColor1.hex()};
-                --foo-color--darker-20: ${transformedColor2.hex()};
-            }
-            `;
-            await run( inputCSS, outputCSS, {derive}, assert);
-        },
-
-        "multiple aliased-derived variable in single declaration is parsed correctly": async (assert) => {
-            const inputCSS = `
-            :root {
-                --foo-color: #ff0;
-            }
-            div {
-                --my-alias: var(--foo-color);
-                background-color: linear-gradient(var(--my-alias--lighter-50), var(--my-alias--darker-20));
-            }`;
-            const transformedColor1 = offColor("#ff0").lighten(0.5);
-            const transformedColor2 = offColor("#ff0").darken(0.2);
-            const outputCSS =
-                inputCSS +
-                `
-            :root {
-                --my-alias--lighter-50: ${transformedColor1.hex()};
-                --my-alias--darker-20: ${transformedColor2.hex()};
-            }
-            `;
-            await run( inputCSS, outputCSS, {derive}, assert);
-        },
-
-        "compiledVariables map is populated": async (assert) => {
-            const compiledVariables = new Map();
-            const inputCSS = `
-            :root {
-                --icon-color: #fff;
-            }
-            div {
-                background: var(--icon-color--darker-20);
-                --my-alias: var(--icon-color--darker-20);
-                color: var(--my-alias--lighter-15);
-            }`;
-            await postcss([plugin({ derive, compiledVariables })]).process(inputCSS, { from: "/foo/bar/test.css", });
-            const actualArray = compiledVariables.get("/foo/bar")["derived-variables"];
-            const expectedArray = ["icon-color--darker-20", "my-alias=icon-color--darker-20", "my-alias--lighter-15"];
-            assert.deepStrictEqual(actualArray.sort(), expectedArray.sort());
-        },
-
-        "derived variable are supported in urls": async (assert) => {
-            const inputCSS = `
-            :root {
-                --foo-color: #ff0;
-            }
-            div {
-                background-color: var(--foo-color--lighter-50);
-                background: url("./foo/bar/icon.svg?primary=foo-color--darker-5");
-            }
-            a {
-                background: url("foo/bar/icon.svg");
-            }`;
-            const transformedColorLighter = offColor("#ff0").lighten(0.5);
-            const transformedColorDarker = offColor("#ff0").darken(0.05);
-            const outputCSS =
-                inputCSS +
-                `
-            :root {
-                --foo-color--lighter-50: ${transformedColorLighter.hex()};
-                --foo-color--darker-5: ${transformedColorDarker.hex()};
-            }
-            `;
-            await run( inputCSS, outputCSS, {derive}, assert);
-        }
-    };
-};

scripts/postcss/tests/css-url-to-variables.test.js

@@ -1,71 +0,0 @@
-/*
-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.
-*/
-
-const plugin = require("../css-url-to-variables");
-const run = require("./common").createTestRunner(plugin);
-const postcss = require("postcss");
-
-module.exports.tests = function tests() {
-    return {
-        "url is replaced with variable": async (assert) => {
-            const inputCSS = `div {
-                background: no-repeat center/80% url("../img/image.svg?primary=main-color--darker-20");
-            }
-            button {
-                background: url("/home/foo/bar/cool.svg?primary=blue&secondary=green");
-            }`;
-            const outputCSS =
-            `div {
-                background: no-repeat center/80% var(--icon-url-0);
-            }
-            button {
-                background: var(--icon-url-1);
-            }`+
-                `
-            :root {
-                --icon-url-0: url("../img/image.svg?primary=main-color--darker-20");
-                --icon-url-1: url("/home/foo/bar/cool.svg?primary=blue&secondary=green");
-            }
-            `;
-            await run(inputCSS, outputCSS, { }, assert);
-        },
-        "non svg urls without query params are not replaced": async (assert) => {
-            const inputCSS = `div {
-                background: no-repeat url("./img/foo/bar/image.png");
-            }`;
-            await run(inputCSS, inputCSS, {}, assert);
-        },
-        "map is populated with icons": async (assert) => {
-            const compiledVariables = new Map();
-            compiledVariables.set("/foo/bar", { "derived-variables": ["background-color--darker-20", "accent-color--lighter-15"] });
-            const inputCSS = `div {
-                background: no-repeat center/80% url("../img/image.svg?primary=main-color--darker-20");
-            }
-            button {
-                background: url("/home/foo/bar/cool.svg?primary=blue&secondary=green");
-            }`;
-            const expectedObject = {
-                "icon-url-0": "../img/image.svg?primary=main-color--darker-20",
-                "icon-url-1": "/home/foo/bar/cool.svg?primary=blue&secondary=green",
-            };
-            await postcss([plugin({compiledVariables})]).process(inputCSS, { from: "/foo/bar/test.css", });
-            const sharedVariable = compiledVariables.get("/foo/bar");
-            assert.deepEqual(["background-color--darker-20", "accent-color--lighter-15"], sharedVariable["derived-variables"]);
-            assert.deepEqual(expectedObject, sharedVariable["icon"]);
-        }
-    };
-};
-

scripts/release.sh

@@ -1,4 +1,3 @@
-set -e
 if [ -z "$1" ]; then
     echo "provide a new version, current version is $(jq '.version' package.json)"
     exit 1

scripts/sdk/base-manifest.json

@@ -1,19 +0,0 @@
-{
-    "name": "hydrogen-view-sdk",
-    "description": "Embeddable matrix client library, including view components",
-    "version": "0.1.0",
-    "main": "./lib-build/hydrogen.cjs.js",
-    "exports": {
-        ".": {
-            "import": "./lib-build/hydrogen.es.js",
-            "require": "./lib-build/hydrogen.cjs.js"
-        },
-        "./paths/vite": "./paths/vite.js",
-        "./style.css": "./asset-build/assets/theme-element-light.css",
-        "./theme-element-light.css": "./asset-build/assets/theme-element-light.css",
-        "./theme-element-dark.css": "./asset-build/assets/theme-element-dark.css",
-        "./main.js": "./asset-build/assets/main.js",
-        "./download-sandbox.html": "./asset-build/assets/download-sandbox.html",
-        "./assets/*": "./asset-build/assets/*"
-    }
-}

scripts/sdk/build.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-# Exit whenever one of the commands fail with a non-zero exit code
-set -e
-set -o pipefail
-# Enable extended globs so we can use the `!(filename)` glob syntax
-shopt -s extglob
-
-# Only remove the directory contents instead of the whole directory to maintain
-# the `npm link`/`yarn link` symlink
-rm -rf target/*
-yarn run vite build -c vite.sdk-assets-config.js
-yarn run vite build -c vite.sdk-lib-config.js
-yarn tsc -p tsconfig-declaration.json
-./scripts/sdk/create-manifest.js ./target/package.json
-mkdir target/paths
-# this doesn't work, the ?url imports need to be in the consuming project, so disable for now
-# ./scripts/sdk/transform-paths.js ./src/platform/web/sdk/paths/vite.js ./target/paths/vite.js
-cp doc/SDK.md target/README.md
-pushd target/asset-build
-rm index.html
-popd
-pushd target/asset-build/assets
-# Remove all `*.wasm` and `*.js` files except for `main.js`
-rm !(main).js *.wasm
-popd

scripts/sdk/create-manifest.js

@@ -1,23 +0,0 @@
-#!/usr/bin/env node
-const fs = require("fs");
-const appManifest = require("../../package.json");
-const baseSDKManifest = require("./base-manifest.json");
-/*
-    Need to leave typescript type definitions out until the
-    typescript conversion is complete and all imports in the d.ts files
-    exists.
-    ```
-    "types": "types/lib.d.ts"
-    ```
-*/
-const mergeOptions = require('merge-options');
-
-const manifestExtension = {
-    devDependencies: undefined,
-    scripts: undefined,
-};
-
-const manifest = mergeOptions(appManifest, baseSDKManifest, manifestExtension);
-const json = JSON.stringify(manifest, undefined, 2);
-const outFile = process.argv[2];
-fs.writeFileSync(outFile, json, {encoding: "utf8"});

scripts/sdk/test/.gitignore

@@ -1,3 +0,0 @@
-node_modules
-dist
-yarn.lock

scripts/sdk/test/deps.d.ts

@@ -1,2 +0,0 @@
-// Keep TypeScripts from complaining about hydrogen-view-sdk not having types yet
-declare module "hydrogen-view-sdk";

scripts/sdk/test/esm-entry.ts

@@ -1,21 +0,0 @@
-import * as hydrogenViewSdk from "hydrogen-view-sdk";
-import downloadSandboxPath from 'hydrogen-view-sdk/download-sandbox.html?url';
-import workerPath from 'hydrogen-view-sdk/main.js?url';
-import olmWasmPath from '@matrix-org/olm/olm.wasm?url';
-import olmJsPath from '@matrix-org/olm/olm.js?url';
-import olmLegacyJsPath from '@matrix-org/olm/olm_legacy.js?url';
-const assetPaths = {
-  downloadSandbox: downloadSandboxPath,
-  worker: workerPath,
-  olm: {
-      wasm: olmWasmPath,
-      legacyBundle: olmLegacyJsPath,
-      wasmBundle: olmJsPath
-  }
-};
-import "hydrogen-view-sdk/assets/theme-element-light.css";
-
-console.log('hydrogenViewSdk', hydrogenViewSdk);
-console.log('assetPaths', assetPaths);
-
-console.log('Entry ESM works ✅');

scripts/sdk/test/index.html

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite App</title>
-  </head>
-  <body>
-    <div id="app" class="hydrogen"></div>
-    <script type="module" src="./esm-entry.ts"></script>
-  </body>
-</html>

scripts/sdk/test/package.json

@@ -1,8 +0,0 @@
-{
-  "name": "test-sdk",
-  "version": "0.0.0",
-  "description": "",
-  "dependencies": {
-    "hydrogen-view-sdk": "link:../../../target"
-  }
-}

scripts/sdk/test/test-sdk-in-commonjs-env.js

@@ -1,13 +0,0 @@
-// Make sure the SDK can be used in a CommonJS environment.
-// Usage: node scripts/sdk/test/test-sdk-in-commonjs-env.js
-const hydrogenViewSdk = require('hydrogen-view-sdk');
-
-// Test that the "exports" are available:
-// Worker
-require.resolve('hydrogen-view-sdk/main.js');
-// Styles
-require.resolve('hydrogen-view-sdk/assets/theme-element-light.css');
-// Can access files in the assets/* directory
-require.resolve('hydrogen-view-sdk/assets/main.js');
-
-console.log('SDK works in CommonJS ✅');

scripts/sdk/test/test-sdk-in-esm-vite-build-env.js

@@ -1,19 +0,0 @@
-const { resolve } = require('path');
-const { build } = require('vite');
-
-async function main() {
-  await build({
-    outDir: './dist',
-    build: {
-      rollupOptions: {
-        input: {
-          main: resolve(__dirname, 'index.html')
-        }
-      }
-    }
-  });
-
-  console.log('SDK works in Vite build ✅');
-}
-
-main();

scripts/sdk/transform-paths.js

@@ -1,36 +0,0 @@
-#!/usr/bin/env node
-
-/**
-This script transforms the string literals in the sdk path files to adjust paths
-from what they are at development time to what they will be in the sdk package.
-
-It does this by looking in all string literals in the paths file and looking for file names
-that we expect and need replacing (as they are bundled with the sdk).
- 
-Usage: ./transform-paths.js <input file> <output file>
-*/
-
-const acorn = require("acorn");
-const walk = require("acorn-walk")
-const escodegen = require("escodegen");
-const fs = require("fs");
-
-const code = fs.readFileSync(process.argv[2], {encoding: "utf8"});
-const ast = acorn.parse(code, {ecmaVersion: "13", sourceType: "module"});
-
-function changePrefix(value, file, newPrefix = "") {
-    const idx = value.indexOf(file);
-    if (idx !== -1) {
-        return newPrefix + value.substr(idx);
-    }
-    return value;
-}
-
-walk.simple(ast, {
-    Literal(node) {
-        node.value = changePrefix(node.value, "download-sandbox.html", "../");
-        node.value = changePrefix(node.value, "main.js", "../");
-    }
-});
-const transformedCode = escodegen.generate(ast);
-fs.writeFileSync(process.argv[3], transformedCode, {encoding: "utf8"})

scripts/test-derived-theme/test-theme.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-cp scripts/test-derived-theme/theme.json target/assets/theme-customer.json
-cat target/config.json | jq '.themeManifests += ["assets/theme-customer.json"]' | cat > target/config.temp.json
-rm target/config.json
-mv target/config.temp.json target/config.json

scripts/test-derived-theme/theme.json

@@ -1,51 +0,0 @@
-{
-	"name": "Customer",
-    "extends": "element",
-    "id": "customer",
-	"values": {
-        "variants": {
-            "dark": {
-                "dark": true,
-                "default": true,
-                "name": "Dark",
-                "variables": {
-                    "background-color-primary": "#21262b",
-                    "background-color-secondary": "#2D3239",
-                    "text-color": "#fff",
-                    "accent-color": "#F03F5B",
-                    "error-color": "#FF4B55",
-                    "fixed-white": "#fff",
-                    "room-badge": "#61708b",
-                    "link-color": "#238cf5"
-                }
-            },
-            "light": {
-                "default": true,
-                "name": "Dark",
-                "variables": {
-                    "background-color-primary": "#21262b",
-                    "background-color-secondary": "#2D3239",
-                    "text-color": "#fff",
-                    "accent-color": "#F03F5B",
-                    "error-color": "#FF4B55",
-                    "fixed-white": "#fff",
-                    "room-badge": "#61708b",
-                    "link-color": "#238cf5"
-                }
-            },
-            "red": {
-                "name": "Gruvbox",
-                "variables": {
-                    "background-color-primary": "#282828",
-                    "background-color-secondary": "#3c3836",
-                    "text-color": "#fbf1c7",
-                    "accent-color": "#8ec07c",
-                    "error-color": "#fb4934",
-                    "fixed-white": "#fff",
-                    "room-badge": "#cc241d",
-                    "link-color": "#fe8019"
-                }
-            }
-        }
-    }
-}

src/domain/AccountSetupViewModel.js

@@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ViewModel} from "./ViewModel";
-import {KeyType} from "../matrix/ssss/index";
-import {Status} from "./session/settings/KeyBackupViewModel.js";
+import {ViewModel} from "./ViewModel.js";
+import {KeyType} from "../matrix/ssss/index.js";
+import {Status} from "./session/settings/SessionBackupViewModel.js";
 
 export class AccountSetupViewModel extends ViewModel {
-    constructor(options) {
-        super(options);
-        this._accountSetup = options.accountSetup;
+    constructor(accountSetup) {
+        super();
+        this._accountSetup = accountSetup;
         this._dehydratedDevice = undefined;
         this._decryptDehydratedDeviceViewModel = undefined;
         if (this._accountSetup.encryptedDehydratedDevice) {
@@ -50,10 +50,10 @@ export class AccountSetupViewModel extends ViewModel {
     }
 }
 
-// this vm adopts the same shape as KeyBackupViewModel so the same view can be reused.
+// this vm adopts the same shape as SessionBackupViewModel so the same view can be reused.
 class DecryptDehydratedDeviceViewModel extends ViewModel {
     constructor(accountSetupViewModel, decryptedCallback) {
-        super(accountSetupViewModel.options);
+        super();
         this._accountSetupViewModel = accountSetupViewModel;
         this._isBusy = false;
         this._status = Status.SetupKey;

src/domain/LogoutViewModel.ts

@@ -1,71 +0,0 @@
-/*
-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 {Options as BaseOptions, ViewModel} from "./ViewModel";
-import {Client} from "../matrix/Client.js";
-import {SegmentType} from "./navigation/index";
-
-type Options = { sessionId: string; } & BaseOptions;
-
-export class LogoutViewModel extends ViewModel<SegmentType, Options> {
-    private _sessionId: string;
-    private _busy: boolean;
-    private _showConfirm: boolean;
-    private _error?: Error;
-
-    constructor(options: Options) {
-        super(options);
-        this._sessionId = options.sessionId;
-        this._busy = false;
-        this._showConfirm = true;
-        this._error = undefined;
-    }
-
-    get showConfirm(): boolean {
-        return this._showConfirm;
-    }
-
-    get busy(): boolean {
-        return this._busy;
-    }
-
-    get cancelUrl(): string | undefined {
-        return this.urlCreator.urlForSegment("session", true);
-    }
-
-    async logout(): Promise<void> {
-        this._busy = true;
-        this._showConfirm = false;
-        this.emitChange("busy");
-        try {
-            const client = new Client(this.platform);
-            await client.startLogout(this._sessionId);
-            this.navigation.push("session", true);
-        } catch (err) {
-            this._error = err;
-            this._busy = false;
-            this.emitChange("busy");
-        }
-    }
-
-    get status(): string {
-        if (this._error) {
-            return this.i18n`Could not log out of device: ${this._error.message}`;
-        } else {
-            return this.i18n`Logging out… Please don't close the app.`;
-        }
-    }
-}

src/domain/RootViewModel.js

@@ -14,24 +14,22 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {Client} from "../matrix/Client.js";
 import {SessionViewModel} from "./session/SessionViewModel.js";
 import {SessionLoadViewModel} from "./SessionLoadViewModel.js";
-import {LoginViewModel} from "./login/LoginViewModel";
-import {LogoutViewModel} from "./LogoutViewModel";
+import {LoginViewModel} from "./login/LoginViewModel.js";
 import {SessionPickerViewModel} from "./SessionPickerViewModel.js";
-import {ViewModel} from "./ViewModel";
+import {ViewModel} from "./ViewModel.js";
 
 export class RootViewModel extends ViewModel {
     constructor(options) {
         super(options);
+        this._createSessionContainer = options.createSessionContainer;
         this._error = null;
         this._sessionPickerViewModel = null;
         this._sessionLoadViewModel = null;
         this._loginViewModel = null;
-        this._logoutViewModel = null;
         this._sessionViewModel = null;
-        this._pendingClient = null;
+        this._pendingSessionContainer = null;
     }
 
     async load() {
@@ -42,34 +40,29 @@ export class RootViewModel extends ViewModel {
     }
 
     async _applyNavigation(shouldRestoreLastUrl) {
-        const isLogin = this.navigation.path.get("login");
-        const logoutSessionId = this.navigation.path.get("logout")?.value;
+        const isLogin = this.navigation.path.get("login")
         const sessionId = this.navigation.path.get("session")?.value;
         const loginToken = this.navigation.path.get("sso")?.value;
         if (isLogin) {
             if (this.activeSection !== "login") {
                 this._showLogin();
             }
-        } else if (logoutSessionId) {
-            if (this.activeSection !== "logout") {
-                this._showLogout(logoutSessionId);
-            }
         } else if (sessionId === true) {
             if (this.activeSection !== "picker") {
                 this._showPicker();
             }
         } else if (sessionId) {
             if (!this._sessionViewModel || this._sessionViewModel.id !== sessionId) {
-                // see _showLogin for where _pendingClient comes from
-                if (this._pendingClient && this._pendingClient.sessionId === sessionId) {
-                    const client = this._pendingClient;
-                    this._pendingClient = null;
-                    this._showSession(client);
+                // see _showLogin for where _pendingSessionContainer comes from
+                if (this._pendingSessionContainer && this._pendingSessionContainer.sessionId === sessionId) {
+                    const sessionContainer = this._pendingSessionContainer;
+                    this._pendingSessionContainer = null;
+                    this._showSession(sessionContainer);
                 } else {
                     // this should never happen, but we want to be sure not to leak it
-                    if (this._pendingClient) {
-                        this._pendingClient.dispose();
-                        this._pendingClient = null;
+                    if (this._pendingSessionContainer) {
+                        this._pendingSessionContainer.dispose();
+                        this._pendingSessionContainer = null;
                     }
                     this._showSessionLoader(sessionId);
                 }
@@ -113,7 +106,8 @@ export class RootViewModel extends ViewModel {
         this._setSection(() => {
             this._loginViewModel = new LoginViewModel(this.childOptions({
                 defaultHomeserver: this.platform.config["defaultHomeServer"],
-                ready: client => {
+                createSessionContainer: this._createSessionContainer,
+                ready: sessionContainer => {
                     // we don't want to load the session container again,
                     // but we also want the change of screen to go through the navigation
                     // so we store the session container in a temporary variable that will be
@@ -122,34 +116,28 @@ export class RootViewModel extends ViewModel {
                     // Also, we should not call _setSection before the navigation is in the correct state,
                     // as url creation (e.g. in RoomTileViewModel)
                     // won't be using the correct navigation base path.
-                    this._pendingClient = client;
-                    this.navigation.push("session", client.sessionId);
+                    this._pendingSessionContainer = sessionContainer;
+                    this.navigation.push("session", sessionContainer.sessionId);
                 },
                 loginToken
             }));
         });
     }
 
-    _showLogout(sessionId) {
+    _showSession(sessionContainer) {
         this._setSection(() => {
-            this._logoutViewModel = new LogoutViewModel(this.childOptions({sessionId}));
-        });
-    }
-
-    _showSession(client) {
-        this._setSection(() => {
-            this._sessionViewModel = new SessionViewModel(this.childOptions({client}));
+            this._sessionViewModel = new SessionViewModel(this.childOptions({sessionContainer}));
             this._sessionViewModel.start();
         });
     }
 
     _showSessionLoader(sessionId) {
-        const client = new Client(this.platform);
-        client.startWithExistingSession(sessionId);
+        const sessionContainer = this._createSessionContainer();
+        sessionContainer.startWithExistingSession(sessionId);
         this._setSection(() => {
             this._sessionLoadViewModel = new SessionLoadViewModel(this.childOptions({
-                client,
-                ready: client => this._showSession(client)
+                sessionContainer,
+                ready: sessionContainer => this._showSession(sessionContainer)
             }));
             this._sessionLoadViewModel.start();
         });
@@ -162,8 +150,6 @@ export class RootViewModel extends ViewModel {
             return "session";
         } else if (this._loginViewModel) {
             return "login";
-        } else if (this._logoutViewModel) {
-            return "logout";
         } else if (this._sessionPickerViewModel) {
             return "picker";
         } else if (this._sessionLoadViewModel) {
@@ -179,14 +165,12 @@ export class RootViewModel extends ViewModel {
         this._sessionPickerViewModel = this.disposeTracked(this._sessionPickerViewModel);
         this._sessionLoadViewModel = this.disposeTracked(this._sessionLoadViewModel);
         this._loginViewModel = this.disposeTracked(this._loginViewModel);
-        this._logoutViewModel = this.disposeTracked(this._logoutViewModel);
         this._sessionViewModel = this.disposeTracked(this._sessionViewModel);
         // now set it again
         setter();
         this._sessionPickerViewModel && this.track(this._sessionPickerViewModel);
         this._sessionLoadViewModel && this.track(this._sessionLoadViewModel);
         this._loginViewModel && this.track(this._loginViewModel);
-        this._logoutViewModel && this.track(this._logoutViewModel);
         this._sessionViewModel && this.track(this._sessionViewModel);
         this.emitChange("activeSection");
     }
@@ -194,7 +178,6 @@ export class RootViewModel extends ViewModel {
     get error() { return this._error; }
     get sessionViewModel() { return this._sessionViewModel; }
     get loginViewModel() { return this._loginViewModel; }
-    get logoutViewModel() { return this._logoutViewModel; }
     get sessionPickerViewModel() { return this._sessionPickerViewModel; }
     get sessionLoadViewModel() { return this._sessionLoadViewModel; }
 }

src/domain/SessionLoadViewModel.js

@@ -15,15 +15,15 @@ limitations under the License.
 */
 
 import {AccountSetupViewModel} from "./AccountSetupViewModel.js";
-import {LoadStatus} from "../matrix/Client.js";
+import {LoadStatus} from "../matrix/SessionContainer.js";
 import {SyncStatus} from "../matrix/Sync.js";
-import {ViewModel} from "./ViewModel";
+import {ViewModel} from "./ViewModel.js";
 
 export class SessionLoadViewModel extends ViewModel {
     constructor(options) {
         super(options);
-        const {client, ready, homeserver, deleteSessionOnCancel} = options;
-        this._client = client;
+        const {sessionContainer, ready, homeserver, deleteSessionOnCancel} = options;
+        this._sessionContainer = sessionContainer;
         this._ready = ready;
         this._homeserver = homeserver;
         this._deleteSessionOnCancel = deleteSessionOnCancel;
@@ -41,16 +41,16 @@ export class SessionLoadViewModel extends ViewModel {
         try {
             this._loading = true;
             this.emitChange("loading");
-            this._waitHandle = this._client.loadStatus.waitFor(s => {
+            this._waitHandle = this._sessionContainer.loadStatus.waitFor(s => {
                 if (s === LoadStatus.AccountSetup) {
-                    this._accountSetupViewModel = new AccountSetupViewModel(this.childOptions({accountSetup: this._client.accountSetup}));
+                    this._accountSetupViewModel = new AccountSetupViewModel(this._sessionContainer.accountSetup);
                 } else {
                     this._accountSetupViewModel = undefined;
                 }
                 this.emitChange("loadLabel");
                 // wait for initial sync, but not catchup sync
                 const isCatchupSync = s === LoadStatus.FirstSync &&
-                    this._client.sync.status.get() === SyncStatus.CatchupSync;
+                    this._sessionContainer.sync.status.get() === SyncStatus.CatchupSync;
                 return isCatchupSync ||
                     s === LoadStatus.LoginFailed ||
                     s === LoadStatus.Error ||
@@ -67,15 +67,15 @@ export class SessionLoadViewModel extends ViewModel {
             // much like we will once you are in the app. Probably a good idea
 
             // did it finish or get stuck at LoginFailed or Error?
-            const loadStatus = this._client.loadStatus.get();
-            const loadError = this._client.loadError;
+            const loadStatus = this._sessionContainer.loadStatus.get();
+            const loadError = this._sessionContainer.loadError;
             if (loadStatus === LoadStatus.FirstSync || loadStatus === LoadStatus.Ready) {
-                const client = this._client;
+                const sessionContainer = this._sessionContainer;
                 // session container is ready,
                 // don't dispose it anymore when 
                 // we get disposed
-                this._client = null;
-                this._ready(client);
+                this._sessionContainer = null;
+                this._ready(sessionContainer);
             }
             if (loadError) {
                 console.error("session load error", loadError);
@@ -85,16 +85,16 @@ export class SessionLoadViewModel extends ViewModel {
             console.error("error thrown during session load", err.stack);
         } finally {
             this._loading = false;
-            // loadLabel in case of client.loadError also gets updated through this
+            // loadLabel in case of sc.loadError also gets updated through this
             this.emitChange("loading");
         }
     }
 
 
     dispose() {
-        if (this._client) {
-            this._client.dispose();
-            this._client = null;
+        if (this._sessionContainer) {
+            this._sessionContainer.dispose();
+            this._sessionContainer = null;
         }
         if (this._waitHandle) {
             // rejects with AbortError
@@ -105,23 +105,23 @@ export class SessionLoadViewModel extends ViewModel {
 
     // to show a spinner or not
     get loading() {
-        const client = this._client;
-        if (client && client.loadStatus.get() === LoadStatus.AccountSetup) {
+        const sc = this._sessionContainer;
+        if (sc && sc.loadStatus.get() === LoadStatus.AccountSetup) {
             return false;
         }
         return this._loading;
     }
 
     get loadLabel() {
-        const client = this._client;
+        const sc = this._sessionContainer;
         const error = this._getError();
-        if (error || (client && client.loadStatus.get() === LoadStatus.Error)) {
+        if (error || (sc && sc.loadStatus.get() === LoadStatus.Error)) {
             return `Something went wrong: ${error && error.message}.`;
         }
 
         // Statuses related to login are handled by respective login view models
-        if (client) {
-            switch (client.loadStatus.get()) {
+        if (sc) {
+            switch (sc.loadStatus.get()) {
                 case LoadStatus.QueryAccount:
                     return `Querying account encryption setup…`;
                 case LoadStatus.AccountSetup:
@@ -133,7 +133,7 @@ export class SessionLoadViewModel extends ViewModel {
                 case LoadStatus.FirstSync:
                     return `Getting your conversations from the server…`;
                 default:
-                    return this._client.loadStatus.get();
+                    return this._sessionContainer.loadStatus.get();
             }
         }
 
@@ -141,7 +141,7 @@ export class SessionLoadViewModel extends ViewModel {
     }
 
     _getError() {
-        return this._error || this._client?.loadError; 
+        return this._error || this._sessionContainer?.loadError; 
     }
 
     get hasError() {
@@ -154,7 +154,7 @@ export class SessionLoadViewModel extends ViewModel {
     }
 
     async logout() {
-        await this._client.logout();
+        await this._sessionContainer.logout();
         this.navigation.push("session", true);
     }
 

src/domain/SessionPickerViewModel.js

@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 import {SortedArray} from "../observable/index.js";
-import {ViewModel} from "./ViewModel";
-import {avatarInitials, getIdentifierColorNumber} from "./avatar";
+import {ViewModel} from "./ViewModel.js";
+import {avatarInitials, getIdentifierColorNumber} from "./avatar.js";
 
 class SessionItemViewModel extends ViewModel {
     constructor(options, pickerVM) {

src/domain/ViewModel.js

@@ -1,6 +1,5 @@
 /*
 Copyright 2020 Bruno Windels <bruno@windels.cloud>
-Copyright 2022 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.
@@ -22,82 +21,54 @@ limitations under the License.
 import {EventEmitter} from "../utils/EventEmitter";
 import {Disposables} from "../utils/Disposables";
 
-import type {Disposable} from "../utils/Disposables";
-import type {Platform} from "../platform/web/Platform";
-import type {Clock} from "../platform/web/dom/Clock";
-import type {ILogger} from "../logging/types";
-import type {Navigation} from "./navigation/Navigation";
-import type {SegmentType} from "./navigation/index";
-import type {IURLRouter} from "./navigation/URLRouter";
-
-export type Options<T extends object = SegmentType> = {
-    platform: Platform;
-    logger: ILogger;
-    urlCreator: IURLRouter<T>;
-    navigation: Navigation<T>;
-    emitChange?: (params: any) => void;
-}
-
-
-export class ViewModel<N extends object = SegmentType, O extends Options<N> = Options<N>> extends EventEmitter<{change: never}> {
-    private disposables?: Disposables;
-    private _isDisposed = false;
-    private _options: Readonly<O>;
-
-    constructor(options: Readonly<O>) {
+export class ViewModel extends EventEmitter {
+    constructor(options = {}) {
         super();
+        this.disposables = null;
+        this._isDisposed = false;
         this._options = options;
     }
 
-    childOptions<T extends Object>(explicitOptions: T): T & Options<N> {
-        return Object.assign({}, this._options, explicitOptions);
+    childOptions(explicitOptions) {
+        const {navigation, urlCreator, platform} = this._options;
+        return Object.assign({navigation, urlCreator, platform}, explicitOptions);
     }
 
-    get options(): Readonly<O> { return this._options; }
-
     // makes it easier to pass through dependencies of a sub-view model
-    getOption<N extends keyof O>(name: N): O[N]  {
+    getOption(name) {
         return this._options[name];
     }
 
-    observeNavigation<T extends keyof N>(type: T, onChange: (value: N[T], type: T) => void): void {
-      const segmentObservable = this.navigation.observe(type);
-      const unsubscribe = segmentObservable.subscribe((value: N[T]) => {
-        onChange(value, type);
-      });
-      this.track(unsubscribe);
-    }
-
-    track<D extends Disposable>(disposable: D): D {
+    track(disposable) {
         if (!this.disposables) {
             this.disposables = new Disposables();
         }
         return this.disposables.track(disposable);
     }
 
-    untrack(disposable: Disposable): undefined {
+    untrack(disposable) {
         if (this.disposables) {
             return this.disposables.untrack(disposable);
         }
-        return undefined;
+        return null;
     }
 
-    dispose(): void {
+    dispose() {
         if (this.disposables) {
             this.disposables.dispose();
         }
         this._isDisposed = true;
     }
 
-    get isDisposed(): boolean {
+    get isDisposed() {
         return this._isDisposed;
     }
 
-    disposeTracked(disposable: Disposable | undefined): undefined {
+    disposeTracked(disposable) {
         if (this.disposables) {
             return this.disposables.disposeTracked(disposable);
         }
-        return undefined;
+        return null;
     }
 
     // TODO: this will need to support binding
@@ -105,7 +76,7 @@ export class ViewModel<N extends object = SegmentType, O extends Options<N> = Op
     // 
     // translated string should probably always be bindings, unless we're fine with a refresh when changing the language?
     // we probably are, if we're using routing with a url, we could just refresh.
-    i18n(parts: TemplateStringsArray, ...expr: any[]): string {
+    i18n(parts, ...expr) {
         // just concat for now
         let result = "";
         for (let i = 0; i < parts.length; ++i) {
@@ -117,7 +88,11 @@ export class ViewModel<N extends object = SegmentType, O extends Options<N> = Op
         return result;
     }
 
-    emitChange(changedProps: any): void {
+    updateOptions(options) {
+        this._options = Object.assign(this._options, options);
+    }
+
+    emitChange(changedProps) {
         if (this._options.emitChange) {
             this._options.emitChange(changedProps);
         } else {
@@ -125,24 +100,27 @@ export class ViewModel<N extends object = SegmentType, O extends Options<N> = Op
         }
     }
 
-    get platform(): Platform {
+    get platform() {
         return this._options.platform;
     }
 
-    get clock(): Clock {
+    get clock() {
         return this._options.platform.clock;
     }
 
-    get logger(): ILogger {
+    get logger() {
         return this.platform.logger;
     }
 
-    get urlCreator(): IURLRouter<N> {
+    /**
+     * The url router, only meant to be used to create urls with from view models.
+     * @return {URLRouter}
+     */
+    get urlCreator() {
         return this._options.urlCreator;
     }
 
-    get navigation(): Navigation<N> {
-        // typescript needs a little help here
-        return this._options.navigation as unknown as Navigation<N>;
+    get navigation() {
+        return this._options.navigation;
     }
 }

src/domain/avatar.js

@@ -14,10 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { Platform } from "../platform/web/Platform";
-import { MediaRepository } from "../matrix/net/MediaRepository";
-
-export function avatarInitials(name: string): string {
+export function avatarInitials(name) {
     let firstChar = name.charAt(0);
     if (firstChar === "!" || firstChar === "@" || firstChar === "#") {
         firstChar = name.charAt(1);
@@ -32,10 +29,10 @@ export function avatarInitials(name: string): string {
  *
  * @return {number}
  */
-function hashCode(str: string): number {
+function hashCode(str) {
     let hash = 0;
-    let i: number;
-    let chr: number;
+    let i;
+    let chr;
     if (str.length === 0) {
         return hash;
     }
@@ -47,11 +44,11 @@ function hashCode(str: string): number {
     return Math.abs(hash);
 }
 
-export function getIdentifierColorNumber(id: string): number {
+export function getIdentifierColorNumber(id) {
     return (hashCode(id) % 8) + 1;
 }
 
-export function getAvatarHttpUrl(avatarUrl: string, cssSize: number, platform: Platform, mediaRepository: MediaRepository): string | null {
+export function getAvatarHttpUrl(avatarUrl, cssSize, platform, mediaRepository) {
     if (avatarUrl) {
         const imageSize = cssSize * platform.devicePixelRatio;
         return mediaRepository.mxcUrlThumbnail(avatarUrl, imageSize, imageSize, "crop");

src/domain/login/CompleteSSOLoginViewModel.js

@@ -14,19 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ViewModel} from "../ViewModel";
-import {LoginFailure} from "../../matrix/Client.js";
+import {ViewModel} from "../ViewModel.js";
+import {LoginFailure} from "../../matrix/SessionContainer.js";
 
 export class CompleteSSOLoginViewModel extends ViewModel {
     constructor(options) {
         super(options);
         const {
             loginToken,
-            client,
+            sessionContainer,
             attemptLogin,
         } = options;
         this._loginToken = loginToken;
-        this._client = client;
+        this._sessionContainer = sessionContainer;
         this._attemptLogin = attemptLogin;
         this._errorMessage = "";
         this.performSSOLoginCompletion();
@@ -46,7 +46,7 @@ export class CompleteSSOLoginViewModel extends ViewModel {
         const homeserver = await this.platform.settingsStorage.getString("sso_ongoing_login_homeserver");
         let loginOptions;
         try {
-            loginOptions = await this._client.queryLogin(homeserver).result;
+            loginOptions = await this._sessionContainer.queryLogin(homeserver).result;
         }
         catch (err) {
             this._showError(err.message);

src/domain/login/LoginViewModel.js

@@ -14,176 +14,132 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {Client} from "../../matrix/Client.js";
-import {Options as BaseOptions, ViewModel} from "../ViewModel";
+import {ViewModel} from "../ViewModel.js";
 import {PasswordLoginViewModel} from "./PasswordLoginViewModel.js";
 import {StartSSOLoginViewModel} from "./StartSSOLoginViewModel.js";
 import {CompleteSSOLoginViewModel} from "./CompleteSSOLoginViewModel.js";
-import {LoadStatus} from "../../matrix/Client.js";
+import {LoadStatus} from "../../matrix/SessionContainer.js";
 import {SessionLoadViewModel} from "../SessionLoadViewModel.js";
-import {SegmentType} from "../navigation/index";
 
-import type {PasswordLoginMethod, SSOLoginHelper, TokenLoginMethod, ILoginMethod} from "../../matrix/login";
-
-type Options = {
-    defaultHomeserver: string;
-    ready: ReadyFn;
-    loginToken?: string;
-} & BaseOptions;
-
-export class LoginViewModel extends ViewModel<SegmentType, Options> {
-    private _ready: ReadyFn;
-    private _loginToken?: string;
-    private _client: Client;
-    private _loginOptions?: LoginOptions;
-    private _passwordLoginViewModel?: PasswordLoginViewModel;
-    private _startSSOLoginViewModel?: StartSSOLoginViewModel;
-    private _completeSSOLoginViewModel?: CompleteSSOLoginViewModel;
-    private _loadViewModel?: SessionLoadViewModel;
-    private _loadViewModelSubscription?: () => void;
-    private _homeserver: string;
-    private _queriedHomeserver?: string;
-    private _abortHomeserverQueryTimeout?: () => void;
-    private _abortQueryOperation?: () => void;
-
-    private _hideHomeserver: boolean = false;
-    private _isBusy: boolean = false;
-    private _errorMessage: string = "";
-
-    constructor(options: Readonly<Options>) {
+export class LoginViewModel extends ViewModel {
+    constructor(options) {
         super(options);
-        const {ready, defaultHomeserver, loginToken} = options;
+        const {ready, defaultHomeserver, createSessionContainer, loginToken} = options;
+        this._createSessionContainer = createSessionContainer;
         this._ready = ready;
         this._loginToken = loginToken;
-        this._client = new Client(this.platform);
+        this._sessionContainer = this._createSessionContainer();
+        this._loginOptions = null;
+        this._passwordLoginViewModel = null;
+        this._startSSOLoginViewModel = null;
+        this._completeSSOLoginViewModel = null;
+        this._loadViewModel = null;
+        this._loadViewModelSubscription = null;
         this._homeserver = defaultHomeserver;
+        this._queriedHomeserver = null;
+        this._errorMessage = "";
+        this._hideHomeserver = false;
+        this._isBusy = false;
+        this._abortHomeserverQueryTimeout = null;
+        this._abortQueryOperation = null;
         this._initViewModels();
     }
 
-    get passwordLoginViewModel(): PasswordLoginViewModel {
-        return this._passwordLoginViewModel;
-    }
+    get passwordLoginViewModel() { return this._passwordLoginViewModel; }
+    get startSSOLoginViewModel() { return this._startSSOLoginViewModel; }
+    get completeSSOLoginViewModel(){ return this._completeSSOLoginViewModel; }
+    get homeserver() { return this._homeserver; }
+    get resolvedHomeserver() { return this._loginOptions?.homeserver; }
+    get errorMessage() { return this._errorMessage; }
+    get showHomeserver() { return !this._hideHomeserver; }
+    get loadViewModel() {return this._loadViewModel; }
+    get isBusy() { return this._isBusy; }
+    get isFetchingLoginOptions() { return !!this._abortQueryOperation; }
 
-    get startSSOLoginViewModel(): StartSSOLoginViewModel {
-        return this._startSSOLoginViewModel;
-    }
-
-    get completeSSOLoginViewModel(): CompleteSSOLoginViewModel {
-        return this._completeSSOLoginViewModel;
-    }
-
-    get homeserver(): string {
-        return this._homeserver;
-    }
-
-    get resolvedHomeserver(): string | undefined {
-        return this._loginOptions?.homeserver;
-    }
-
-    get errorMessage(): string {
-        return this._errorMessage;
-    }
-
-    get showHomeserver(): boolean {
-        return !this._hideHomeserver;
-    }
-
-    get loadViewModel(): SessionLoadViewModel {
-        return this._loadViewModel;
-    }
-
-    get isBusy(): boolean {
-        return this._isBusy;
-    }
-
-    get isFetchingLoginOptions(): boolean {
-        return !!this._abortQueryOperation;
-    }
-
-    goBack(): void {
+    goBack() {
         this.navigation.push("session");
     }
 
-    private _initViewModels(): void {
+    async _initViewModels() {
         if (this._loginToken) {
             this._hideHomeserver = true;
             this._completeSSOLoginViewModel = this.track(new CompleteSSOLoginViewModel(
                 this.childOptions(
                     {
-                        client: this._client,
-                        attemptLogin: (loginMethod: TokenLoginMethod) => this.attemptLogin(loginMethod),
+                        sessionContainer: this._sessionContainer,
+                        attemptLogin: loginMethod => this.attemptLogin(loginMethod),
                         loginToken: this._loginToken
                     })));
             this.emitChange("completeSSOLoginViewModel");
         }
         else {
-            void this.queryHomeserver();
+            await this.queryHomeserver();
         }
     }
 
-    private _showPasswordLogin(): void {
+    _showPasswordLogin() {
         this._passwordLoginViewModel = this.track(new PasswordLoginViewModel(
             this.childOptions({
                 loginOptions: this._loginOptions,
-                attemptLogin: (loginMethod: PasswordLoginMethod) => this.attemptLogin(loginMethod)
+                attemptLogin: loginMethod => this.attemptLogin(loginMethod)
         })));
         this.emitChange("passwordLoginViewModel");
     }
 
-    private _showSSOLogin(): void {
+    _showSSOLogin() {
         this._startSSOLoginViewModel = this.track(
             new StartSSOLoginViewModel(this.childOptions({loginOptions: this._loginOptions}))
         );
         this.emitChange("startSSOLoginViewModel");
     }
 
-    private _showError(message: string): void {
+    _showError(message) {
         this._errorMessage = message;
         this.emitChange("errorMessage");
     }
 
-    private _setBusy(status: boolean): void {
+    _setBusy(status) {
         this._isBusy = status;
         this._passwordLoginViewModel?.setBusy(status);
         this._startSSOLoginViewModel?.setBusy(status);
         this.emitChange("isBusy");
     }
 
-    async attemptLogin(loginMethod: ILoginMethod): Promise<null> {
+    async attemptLogin(loginMethod) {
         this._setBusy(true);
-        void this._client.startWithLogin(loginMethod, {inspectAccountSetup: true});
-        const loadStatus = this._client.loadStatus;
-        const handle = loadStatus.waitFor((status: LoadStatus) => status !== LoadStatus.Login);
+        this._sessionContainer.startWithLogin(loginMethod, {inspectAccountSetup: true});
+        const loadStatus = this._sessionContainer.loadStatus;
+        const handle = loadStatus.waitFor(status => status !== LoadStatus.Login);
         await handle.promise;
         this._setBusy(false);
         const status = loadStatus.get();
         if (status === LoadStatus.LoginFailed) {
-            return this._client.loginFailure;
+            return this._sessionContainer.loginFailure;
         }
         this._hideHomeserver = true;
         this.emitChange("hideHomeserver");
         this._disposeViewModels();
-        void this._createLoadViewModel();
+        this._createLoadViewModel();
         return null;
     }
 
-    private _createLoadViewModel(): void {
+    _createLoadViewModel() {
         this._loadViewModelSubscription = this.disposeTracked(this._loadViewModelSubscription);
         this._loadViewModel = this.disposeTracked(this._loadViewModel);
         this._loadViewModel = this.track(
             new SessionLoadViewModel(
                 this.childOptions({
-                    ready: (client) => {
+                    ready: (sessionContainer) => {
                         // make sure we don't delete the session in dispose when navigating away
-                        this._client = null;
-                        this._ready(client);
+                        this._sessionContainer = null;
+                        this._ready(sessionContainer);
                     },
-                    client: this._client,
+                    sessionContainer: this._sessionContainer,
                     homeserver: this._homeserver
                 })
             )
         );
-        void this._loadViewModel.start();
+        this._loadViewModel.start();
         this.emitChange("loadViewModel");
         this._loadViewModelSubscription = this.track(
             this._loadViewModel.disposableOn("change", () => {
@@ -195,22 +151,22 @@ export class LoginViewModel extends ViewModel<SegmentType, Options> {
         );
     }
 
-    private _disposeViewModels(): void {
-        this._startSSOLoginViewModel = this.disposeTracked(this._startSSOLoginViewModel);
+    _disposeViewModels() {
+        this._startSSOLoginViewModel = this.disposeTracked(this._ssoLoginViewModel);
         this._passwordLoginViewModel = this.disposeTracked(this._passwordLoginViewModel);
         this._completeSSOLoginViewModel = this.disposeTracked(this._completeSSOLoginViewModel);
         this.emitChange("disposeViewModels");
     }
 
-    async setHomeserver(newHomeserver: string): Promise<void> {
+    async setHomeserver(newHomeserver) {
         this._homeserver = newHomeserver;
         // clear everything set by queryHomeserver
-        this._loginOptions = undefined;
-        this._queriedHomeserver = undefined;
+        this._loginOptions = null;
+        this._queriedHomeserver = null;
         this._showError("");
         this._disposeViewModels();
         this._abortQueryOperation = this.disposeTracked(this._abortQueryOperation);
-        this.emitChange("loginViewModels"); // multiple fields changing
+        this.emitChange(); // multiple fields changing
         // also clear the timeout if it is still running
         this.disposeTracked(this._abortHomeserverQueryTimeout);
         const timeout = this.clock.createTimeout(1000);
@@ -225,10 +181,10 @@ export class LoginViewModel extends ViewModel<SegmentType, Options> {
             }
         }
         this._abortHomeserverQueryTimeout = this.disposeTracked(this._abortHomeserverQueryTimeout);
-        void this.queryHomeserver();
+        this.queryHomeserver();
     }
     
-    async queryHomeserver(): Promise<void> {
+    async queryHomeserver() {
         // don't repeat a query we've just done
         if (this._homeserver === this._queriedHomeserver || this._homeserver === "") {
             return;
@@ -244,7 +200,7 @@ export class LoginViewModel extends ViewModel<SegmentType, Options> {
         // cancel ongoing query operation, if any
         this._abortQueryOperation = this.disposeTracked(this._abortQueryOperation);
         try {
-            const queryOperation = this._client.queryLogin(this._homeserver);
+            const queryOperation = this._sessionContainer.queryLogin(this._homeserver);
             this._abortQueryOperation = this.track(() => queryOperation.abort());
             this.emitChange("isFetchingLoginOptions");
             this._loginOptions = await queryOperation.result;
@@ -254,7 +210,7 @@ export class LoginViewModel extends ViewModel<SegmentType, Options> {
             if (e.name === "AbortError") {
                 return; //aborted, bail out
             } else {
-                this._loginOptions = undefined;
+                this._loginOptions = null;
             }
         } finally {
             this._abortQueryOperation = this.disposeTracked(this._abortQueryOperation);
@@ -272,22 +228,12 @@ export class LoginViewModel extends ViewModel<SegmentType, Options> {
         }
     }
 
-    dispose(): void {
+    dispose() {
         super.dispose();
-        if (this._client) {
+        if (this._sessionContainer) {
             // if we move away before we're done with initial sync
             // delete the session
-            void this._client.deleteSession();
+            this._sessionContainer.deleteSession();
         }
     }
 }
-
-type ReadyFn = (client: Client) => void;
-
-// TODO: move to Client.js when its converted to typescript.
-type LoginOptions = {
-    homeserver: string;
-    password?: (username: string, password: string) => PasswordLoginMethod;
-    sso?: SSOLoginHelper;
-    token?: (loginToken: string) => TokenLoginMethod;
-};

src/domain/login/PasswordLoginViewModel.js

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ViewModel} from "../ViewModel";
-import {LoginFailure} from "../../matrix/Client.js";
+import {ViewModel} from "../ViewModel.js";
+import {LoginFailure} from "../../matrix/SessionContainer.js";
 
 export class PasswordLoginViewModel extends ViewModel {
     constructor(options) {

src/domain/login/StartSSOLoginViewModel.js

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ViewModel} from "../ViewModel";
+import {ViewModel} from "../ViewModel.js";
 
 export class StartSSOLoginViewModel extends ViewModel{
     constructor(options) {

src/domain/navigation/Navigation.js

@@ -16,49 +16,27 @@ limitations under the License.
 
 import {BaseObservableValue, ObservableValue} from "../../observable/ObservableValue";
 
-
-type AllowsChild<T> = (parent: Segment<T> | undefined, child: Segment<T>) => boolean;
-
-/**
- * OptionalValue is basically stating that if SegmentType[type] = true:
- * - Allow this type to be optional
- * - Give it a default value of undefined
- * - Also allow it to be true
- * This lets us do:
- * const s: Segment<SegmentType> = new Segment("create-room");
- * instead of
- * const s: Segment<SegmentType> = new Segment("create-room", undefined);
- */
-export type OptionalValue<T> = T extends true? [(undefined | true)?]: [T];
-
-export class Navigation<T extends object> {
-    private readonly _allowsChild: AllowsChild<T>;
-    private _path: Path<T>;
-    private readonly _observables: Map<keyof T, SegmentObservable<T>> = new Map();
-    private readonly _pathObservable: ObservableValue<Path<T>>;
-
-    constructor(allowsChild: AllowsChild<T>) {
+export class Navigation {
+    constructor(allowsChild) {
         this._allowsChild = allowsChild;
         this._path = new Path([], allowsChild);
+        this._observables = new Map();
         this._pathObservable = new ObservableValue(this._path);
     }
 
-    get pathObservable(): ObservableValue<Path<T>> {
+    get pathObservable() {
         return this._pathObservable;
     }
 
-    get path(): Path<T> {
+    get path() {
         return this._path;
     }
 
-    push<K extends keyof T>(type: K, ...value: OptionalValue<T[K]>): void {
-        const newPath = this.path.with(new Segment(type, ...value));
-        if (newPath) {
-            this.applyPath(newPath);
-        }
+    push(type, value = undefined) {
+        return this.applyPath(this.path.with(new Segment(type, value)));
     }
 
-    applyPath(path: Path<T>): void {
+    applyPath(path) {
         // Path is not exported, so you can only create a Path through Navigation,
         // so we assume it respects the allowsChild rules
         const oldPath = this._path;
@@ -82,7 +60,7 @@ export class Navigation<T extends object> {
         this._pathObservable.set(this._path);
     }
 
-    observe(type: keyof T): SegmentObservable<T> {
+    observe(type) {
         let observable = this._observables.get(type);
         if (!observable) {
             observable = new SegmentObservable(this, type);
@@ -91,9 +69,9 @@ export class Navigation<T extends object> {
         return observable;
     }
 
-    pathFrom(segments: Segment<any>[]): Path<T> {
-        let parent: Segment<any> | undefined;
-        let i: number;
+    pathFrom(segments) {
+        let parent;
+        let i;
         for (i = 0; i < segments.length; i += 1) {
             if (!this._allowsChild(parent, segments[i])) {
                 return new Path(segments.slice(0, i), this._allowsChild);
@@ -103,12 +81,12 @@ export class Navigation<T extends object> {
         return new Path(segments, this._allowsChild);
     }
 
-    segment<K extends keyof T>(type: K, ...value: OptionalValue<T[K]>): Segment<T> {
-        return new Segment(type, ...value);
+    segment(type, value) {
+        return new Segment(type, value);
     }
 }
 
-function segmentValueEqual<T>(a?: T[keyof T], b?: T[keyof T]): boolean {
+function segmentValueEqual(a, b) {
     if (a === b) {
         return true;
     }
@@ -125,29 +103,24 @@ function segmentValueEqual<T>(a?: T[keyof T], b?: T[keyof T]): boolean {
     return false;
 }
 
-
-export class Segment<T, K extends keyof T = any> {
-    public value: T[K];
-
-    constructor(public type: K, ...value: OptionalValue<T[K]>) {
-        this.value = (value[0] === undefined ? true : value[0]) as unknown as T[K];
+export class Segment {
+    constructor(type, value) {
+        this.type = type;
+        this.value = value === undefined ? true : value;
     }
 }
 
-class Path<T> {
-    private readonly _segments: Segment<T, any>[];
-    private readonly _allowsChild: AllowsChild<T>;
-
-    constructor(segments: Segment<T>[] = [], allowsChild: AllowsChild<T>) {
+class Path {
+    constructor(segments = [], allowsChild) {
         this._segments = segments;
         this._allowsChild = allowsChild;
     }
 
-    clone(): Path<T> {
+    clone() {
         return new Path(this._segments.slice(), this._allowsChild);
     }
 
-    with(segment: Segment<T>): Path<T> | undefined {
+    with(segment) {
         let index = this._segments.length - 1;
         do {
             if (this._allowsChild(this._segments[index], segment)) {
@@ -159,10 +132,10 @@ class Path<T> {
             index -= 1;
         } while(index >= -1);
         // allow -1 as well so we check if the segment is allowed as root
-        return undefined;
+        return null;
     }
 
-    until(type: keyof T): Path<T> {
+    until(type) {
         const index = this._segments.findIndex(s => s.type === type);
         if (index !== -1) {
             return new Path(this._segments.slice(0, index + 1), this._allowsChild)
@@ -170,11 +143,11 @@ class Path<T> {
         return new Path([], this._allowsChild);
     }
 
-    get(type: keyof T): Segment<T> | undefined {
+    get(type) {
         return this._segments.find(s => s.type === type);
     }
 
-    replace(segment: Segment<T>): Path<T> | undefined {
+    replace(segment) {
         const index = this._segments.findIndex(s => s.type === segment.type);
         if (index !== -1) {
             const parent = this._segments[index - 1];
@@ -187,10 +160,10 @@ class Path<T> {
                 }
             }
         }
-        return undefined;
+        return null;
     }
 
-    get segments(): Segment<T>[] {
+    get segments() {
         return this._segments;
     }
 }
@@ -199,49 +172,43 @@ class Path<T> {
  * custom observable so it always returns what is in navigation.path, even if we haven't emitted the change yet.
  * This ensures that observers of a segment can also read the most recent value of other segments.
  */
-class SegmentObservable<T extends object> extends BaseObservableValue<T[keyof T] | undefined> {
-    private readonly _navigation: Navigation<T>;
-    private _type: keyof T;
-    private _lastSetValue?: T[keyof T];
-        
-    constructor(navigation: Navigation<T>, type: keyof T) {
+class SegmentObservable extends BaseObservableValue {
+    constructor(navigation, type) {
         super();
         this._navigation = navigation;
         this._type = type;
         this._lastSetValue = navigation.path.get(type)?.value;
     }
 
-    get(): T[keyof T] | undefined {
+    get() {
         const path = this._navigation.path;
         const segment = path.get(this._type);
         const value = segment?.value;
         return value;
     }
 
-    emitIfChanged(): void {
+    emitIfChanged() {
         const newValue = this.get();
-        if (!segmentValueEqual<T>(newValue, this._lastSetValue)) {
+        if (!segmentValueEqual(newValue, this._lastSetValue)) {
             this._lastSetValue = newValue;
             this.emit(newValue);
         }
     }
 }
 
-export type {Path};
-
 export function tests() {
 
     function createMockNavigation() {
         return new Navigation((parent, {type}) => {
             switch (parent?.type) {
                 case undefined:
-                    return type === "1" || type === "2";
+                    return type === "1" || "2";
                 case "1":
                     return type === "1.1";
                 case "1.1":
                     return type === "1.1.1";
                 case "2":
-                    return type === "2.1" || type === "2.2";
+                    return type === "2.1" || "2.2";
                 default:
                     return false;
             }
@@ -249,7 +216,7 @@ export function tests() {
     }
 
     function observeTypes(nav, types) {
-        const changes: {type:string, value:any}[] = [];
+        const changes = [];
         for (const type of types) {
             nav.observe(type).subscribe(value => {
                 changes.push({type, value});
@@ -258,12 +225,6 @@ export function tests() {
         return changes;
     }
 
-    type SegmentType = {
-        "foo": number;
-        "bar": number;
-        "baz": number;
-    }
-
     return {
         "applying a path emits an event on the observable": assert => {
             const nav = createMockNavigation();
@@ -281,18 +242,18 @@ export function tests() {
             assert.equal(changes[1].value, 8);
         },
         "path.get": assert => {
-            const path = new Path<SegmentType>([new Segment("foo", 5), new Segment("bar", 6)], () => true);
-            assert.equal(path.get("foo")!.value, 5);
-            assert.equal(path.get("bar")!.value, 6);
+            const path = new Path([new Segment("foo", 5), new Segment("bar", 6)], () => true);
+            assert.equal(path.get("foo").value, 5);
+            assert.equal(path.get("bar").value, 6);
         },
         "path.replace success": assert => {
-            const path = new Path<SegmentType>([new Segment("foo", 5), new Segment("bar", 6)], () => true);
+            const path = new Path([new Segment("foo", 5), new Segment("bar", 6)], () => true);
             const newPath = path.replace(new Segment("foo", 1));
-            assert.equal(newPath!.get("foo")!.value, 1);
-            assert.equal(newPath!.get("bar")!.value, 6);
+            assert.equal(newPath.get("foo").value, 1);
+            assert.equal(newPath.get("bar").value, 6);
         },
         "path.replace not found": assert => {
-            const path = new Path<SegmentType>([new Segment("foo", 5), new Segment("bar", 6)], () => true);
+            const path = new Path([new Segment("foo", 5), new Segment("bar", 6)], () => true);
             const newPath = path.replace(new Segment("baz", 1));
             assert.equal(newPath, null);
         }

src/domain/navigation/URLRouter.js

@@ -14,55 +14,28 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import type {History} from "../../platform/web/dom/History.js";
-import type {Navigation, Segment, Path, OptionalValue} from "./Navigation";
-import type {SubscriptionHandle} from "../../observable/BaseObservable";
-
-type ParseURLPath<T> = (urlPath: string, currentNavPath: Path<T>, defaultSessionId?: string) => Segment<T>[];
-type StringifyPath<T> = (path: Path<T>) => string;
-
-export interface IURLRouter<T> {
-    attach(): void;
-    dispose(): void;
-    pushUrl(url: string): void;
-    tryRestoreLastUrl(): boolean;
-    urlForSegments(segments: Segment<T>[]): string | undefined;
-    urlForSegment<K extends keyof T>(type: K, ...value: OptionalValue<T[K]>): string | undefined;
-    urlUntilSegment(type: keyof T): string;
-    urlForPath(path: Path<T>): string;
-    openRoomActionUrl(roomId: string): string;
-    createSSOCallbackURL(): string;
-    normalizeUrl(): void;
-}
-
-export class URLRouter<T extends {session: string | boolean}> implements IURLRouter<T> {
-    private readonly _history: History;
-    private readonly _navigation: Navigation<T>;
-    private readonly _parseUrlPath: ParseURLPath<T>;
-    private readonly _stringifyPath: StringifyPath<T>;
-    private _subscription?: SubscriptionHandle;
-    private _pathSubscription?: SubscriptionHandle;
-    private _isApplyingUrl: boolean = false;
-    private _defaultSessionId?: string;
-
-    constructor(history: History, navigation: Navigation<T>, parseUrlPath: ParseURLPath<T>, stringifyPath: StringifyPath<T>) {
+export class URLRouter {
+    constructor({history, navigation, parseUrlPath, stringifyPath}) {
         this._history = history;
         this._navigation = navigation;
         this._parseUrlPath = parseUrlPath;
         this._stringifyPath = stringifyPath;
+        this._subscription = null;
+        this._pathSubscription = null;
+        this._isApplyingUrl = false;
         this._defaultSessionId = this._getLastSessionId();
     }
 
-    private _getLastSessionId(): string | undefined {
-        const navPath = this._urlAsNavPath(this._history.getLastSessionUrl() || "");
+    _getLastSessionId() {
+        const navPath = this._urlAsNavPath(this._history.getLastUrl() || "");
         const sessionId = navPath.get("session")?.value;
         if (typeof sessionId === "string") {
             return sessionId;
         }
-        return undefined;
+        return null;
     }
 
-    attach(): void {
+    attach() {
         this._subscription = this._history.subscribe(url => this._applyUrl(url));
         // subscribe to path before applying initial url
         // so redirects in _applyNavPathToHistory are reflected in url bar
@@ -70,12 +43,12 @@ export class URLRouter<T extends {session: string | boolean}> implements IURLRou
         this._applyUrl(this._history.get());
     }
 
-    dispose(): void {
-        if (this._subscription) { this._subscription = this._subscription(); }
-        if (this._pathSubscription) { this._pathSubscription = this._pathSubscription(); }
+    dispose() {
+        this._subscription = this._subscription();
+        this._pathSubscription = this._pathSubscription();
     }
 
-    private _applyNavPathToHistory(path: Path<T>): void {
+    _applyNavPathToHistory(path) {
         const url = this.urlForPath(path);
         if (url !== this._history.get()) {
             if (this._isApplyingUrl) {
@@ -87,7 +60,7 @@ export class URLRouter<T extends {session: string | boolean}> implements IURLRou
         }
     }
 
-    private _applyNavPathToNavigation(navPath: Path<T>): void {
+    _applyNavPathToNavigation(navPath) {
         // this will cause _applyNavPathToHistory to be called,
         // so set a flag whether this request came from ourselves
         // (in which case it is a redirect if the url does not match the current one)
@@ -96,22 +69,22 @@ export class URLRouter<T extends {session: string | boolean}> implements IURLRou
         this._isApplyingUrl = false;
     }
 
-    private _urlAsNavPath(url: string): Path<T> {
+    _urlAsNavPath(url) {
         const urlPath = this._history.urlAsPath(url);
         return this._navigation.pathFrom(this._parseUrlPath(urlPath, this._navigation.path, this._defaultSessionId));
     }
 
-    private _applyUrl(url: string): void {
+    _applyUrl(url) {
         const navPath = this._urlAsNavPath(url);
         this._applyNavPathToNavigation(navPath);
     }
 
-    pushUrl(url: string): void {
+    pushUrl(url) {
         this._history.pushUrl(url);
     }
 
-    tryRestoreLastUrl(): boolean {
-        const lastNavPath = this._urlAsNavPath(this._history.getLastSessionUrl() || "");
+    tryRestoreLastUrl() {
+        const lastNavPath = this._urlAsNavPath(this._history.getLastUrl() || "");
         if (lastNavPath.segments.length !== 0) {
             this._applyNavPathToNavigation(lastNavPath);
             return true;
@@ -119,8 +92,8 @@ export class URLRouter<T extends {session: string | boolean}> implements IURLRou
         return false;
     }
 
-    urlForSegments(segments: Segment<T>[]): string | undefined {
-        let path: Path<T> | undefined = this._navigation.path;
+    urlForSegments(segments) {
+        let path = this._navigation.path;
         for (const segment of segments) {
             path = path.with(segment);
             if (!path) {
@@ -130,29 +103,29 @@ export class URLRouter<T extends {session: string | boolean}> implements IURLRou
         return this.urlForPath(path);
     }
 
-    urlForSegment<K extends keyof T>(type: K, ...value: OptionalValue<T[K]>): string | undefined {
-        return this.urlForSegments([this._navigation.segment(type, ...value)]);
+    urlForSegment(type, value) {
+        return this.urlForSegments([this._navigation.segment(type, value)]);
     }
 
-    urlUntilSegment(type: keyof T): string {
+    urlUntilSegment(type) {
         return this.urlForPath(this._navigation.path.until(type));
     }
 
-    urlForPath(path: Path<T>): string {
+    urlForPath(path) {
         return this._history.pathAsUrl(this._stringifyPath(path));
     }
 
-    openRoomActionUrl(roomId: string): string {
+    openRoomActionUrl(roomId) {
         // not a segment to navigation knowns about, so append it manually
         const urlPath = `${this._stringifyPath(this._navigation.path.until("session"))}/open-room/${roomId}`;
         return this._history.pathAsUrl(urlPath);
     }
 
-    createSSOCallbackURL(): string {
+    createSSOCallbackURL() {
         return window.location.origin;
     }
 
-    normalizeUrl(): void {
+    normalizeUrl() {
         // Remove any queryParameters from the URL
         // Gets rid of the loginToken after SSO
         this._history.replaceUrlSilently(`${window.location.origin}/${window.location.hash}`);

src/domain/navigation/index.js

@@ -14,43 +14,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {Navigation, Segment} from "./Navigation";
-import {URLRouter} from "./URLRouter";
-import type {Path, OptionalValue} from "./Navigation";
+import {Navigation, Segment} from "./Navigation.js";
+import {URLRouter} from "./URLRouter.js";
 
-export type SegmentType = {
-    "login": true;
-    "session": string | boolean;
-    "sso": string;
-    "logout": true;
-    "room": string;
-    "rooms": string[];
-    "settings": true;
-    "create-room": true;
-    "empty-grid-tile": number;
-    "lightbox": string;
-    "right-panel": true;
-    "details": true;
-    "members": true;
-    "member": string;
-};
-
-export function createNavigation(): Navigation<SegmentType> {
+export function createNavigation() {
     return new Navigation(allowsChild);
 }
 
-export function createRouter({history, navigation}: {history: History, navigation: Navigation<SegmentType>}): URLRouter<SegmentType> {
-    return new URLRouter(history, navigation, parseUrlPath, stringifyPath);
+export function createRouter({history, navigation}) {
+    return new URLRouter({history, navigation, stringifyPath, parseUrlPath});
 }
 
-function allowsChild(parent: Segment<SegmentType> | undefined, child: Segment<SegmentType>): boolean {
+function allowsChild(parent, child) {
     const {type} = child;
     switch (parent?.type) {
         case undefined:
             // allowed root segments
-            return type === "login"  || type === "session" || type === "sso" || type === "logout";
+            return type === "login"  || type === "session" || type === "sso";
         case "session":
-            return type === "room" || type === "rooms" || type === "settings" || type === "create-room";
+            return type === "room" || type === "rooms" || type === "settings";
         case "rooms":
             // downside of the approach: both of these will control which tile is selected
             return type === "room" || type === "empty-grid-tile";
@@ -63,9 +45,8 @@ function allowsChild(parent: Segment<SegmentType> | undefined, child: Segment<Se
     }
 }
 
-export function removeRoomFromPath(path: Path<SegmentType>, roomId: string): Path<SegmentType> | undefined {
-    let newPath: Path<SegmentType> | undefined = path;
-    const rooms = newPath.get("rooms");
+export function removeRoomFromPath(path, roomId) {
+    const rooms = path.get("rooms");
     let roomIdGridIndex = -1;
     // first delete from rooms segment
     if (rooms) {
@@ -73,22 +54,22 @@ export function removeRoomFromPath(path: Path<SegmentType>, roomId: string): Pat
         if (roomIdGridIndex !== -1) {
             const idsWithoutRoom = rooms.value.slice();
             idsWithoutRoom[roomIdGridIndex] = "";
-            newPath = newPath.replace(new Segment("rooms", idsWithoutRoom));
+            path = path.replace(new Segment("rooms", idsWithoutRoom));
         }
     }
-    const room = newPath!.get("room");
+    const room = path.get("room");
     // then from room (which occurs with or without rooms)
     if (room && room.value === roomId) {
         if (roomIdGridIndex !== -1) {
-            newPath = newPath!.with(new Segment("empty-grid-tile", roomIdGridIndex));
+            path = path.with(new Segment("empty-grid-tile", roomIdGridIndex));
         } else {
-            newPath = newPath!.until("session");
+            path = path.until("session");
         }
     }
-    return newPath;
+    return path;
 }
 
-function roomsSegmentWithRoom(rooms: Segment<SegmentType, "rooms">, roomId: string, path: Path<SegmentType>): Segment<SegmentType, "rooms"> {
+function roomsSegmentWithRoom(rooms, roomId, path) {
     if(!rooms.value.includes(roomId)) {
         const emptyGridTile = path.get("empty-grid-tile");
         const oldRoom = path.get("room");
@@ -106,28 +87,28 @@ function roomsSegmentWithRoom(rooms: Segment<SegmentType, "rooms">, roomId: stri
     }
 }
 
-function pushRightPanelSegment<T extends keyof SegmentType>(array: Segment<SegmentType>[], segment: T, ...value: OptionalValue<SegmentType[T]>): void {
+function pushRightPanelSegment(array, segment, value = true) {
     array.push(new Segment("right-panel"));
-    array.push(new Segment(segment, ...value));
+    array.push(new Segment(segment, value));
 }
 
-export function addPanelIfNeeded<T extends SegmentType>(navigation: Navigation<T>, path: Path<T>): Path<T> {
+export function addPanelIfNeeded(navigation, path) {
     const segments = navigation.path.segments;
     const i = segments.findIndex(segment => segment.type === "right-panel");
     let _path = path;
     if (i !== -1) {
         _path = path.until("room");
-        _path = _path.with(segments[i])!;
-        _path = _path.with(segments[i + 1])!;
+        _path = _path.with(segments[i]);
+        _path = _path.with(segments[i + 1]);
     }
     return _path;
 }
 
-export function parseUrlPath(urlPath: string, currentNavPath: Path<SegmentType>, defaultSessionId?: string): Segment<SegmentType>[] {
-    // substring(1) to take of initial /
-    const parts = urlPath.substring(1).split("/");
+export function parseUrlPath(urlPath, currentNavPath, defaultSessionId) {
+    // substr(1) to take of initial /
+    const parts = urlPath.substr(1).split("/");
     const iterator = parts[Symbol.iterator]();
-    const segments: Segment<SegmentType>[] = [];
+    const segments = [];
     let next; 
     while (!(next = iterator.next()).done) {
         const type = next.value;
@@ -189,9 +170,9 @@ export function parseUrlPath(urlPath: string, currentNavPath: Path<SegmentType>,
     return segments;
 }
 
-export function stringifyPath(path: Path<SegmentType>): string {
+export function stringifyPath(path) {
     let urlPath = "";
-    let prevSegment: Segment<SegmentType> | undefined;
+    let prevSegment;
     for (const segment of path.segments) {
         switch (segment.type) {
             case "rooms":
@@ -224,15 +205,9 @@ export function stringifyPath(path: Path<SegmentType>): string {
 }
 
 export function tests() {
-    function createEmptyPath() {
-        const nav: Navigation<SegmentType> = new Navigation(allowsChild);
-        const path = nav.pathFrom([]);
-        return path;
-    }
-
     return {
         "stringify grid url with focused empty tile": assert => {
-            const nav: Navigation<SegmentType> = new Navigation(allowsChild);
+            const nav = new Navigation(allowsChild);
             const path = nav.pathFrom([
                 new Segment("session", 1),
                 new Segment("rooms", ["a", "b", "c"]),
@@ -242,7 +217,7 @@ export function tests() {
             assert.equal(urlPath, "/session/1/rooms/a,b,c/3");
         },
         "stringify grid url with focused room": assert => {
-            const nav: Navigation<SegmentType> = new Navigation(allowsChild);
+            const nav = new Navigation(allowsChild);
             const path = nav.pathFrom([
                 new Segment("session", 1),
                 new Segment("rooms", ["a", "b", "c"]),
@@ -252,7 +227,7 @@ export function tests() {
             assert.equal(urlPath, "/session/1/rooms/a,b,c/1");
         },
         "stringify url with right-panel and details segment": assert => {
-            const nav: Navigation<SegmentType> = new Navigation(allowsChild);
+            const nav = new Navigation(allowsChild);
             const path = nav.pathFrom([
                 new Segment("session", 1),
                 new Segment("rooms", ["a", "b", "c"]),
@@ -264,15 +239,13 @@ export function tests() {
             assert.equal(urlPath, "/session/1/rooms/a,b,c/1/details");
         },
         "Parse loginToken query parameter into SSO segment": assert => {
-            const path = createEmptyPath();
-            const segments = parseUrlPath("?loginToken=a1232aSD123", path);
+            const segments = parseUrlPath("?loginToken=a1232aSD123");
             assert.equal(segments.length, 1);
             assert.equal(segments[0].type, "sso");
             assert.equal(segments[0].value, "a1232aSD123");
         },
         "parse grid url path with focused empty tile": assert => {
-            const path = createEmptyPath();
-            const segments = parseUrlPath("/session/1/rooms/a,b,c/3", path);
+            const segments = parseUrlPath("/session/1/rooms/a,b,c/3");
             assert.equal(segments.length, 3);
             assert.equal(segments[0].type, "session");
             assert.equal(segments[0].value, "1");
@@ -282,8 +255,7 @@ export function tests() {
             assert.equal(segments[2].value, 3);
         },
         "parse grid url path with focused room": assert => {
-            const path = createEmptyPath();
-            const segments = parseUrlPath("/session/1/rooms/a,b,c/1", path);
+            const segments = parseUrlPath("/session/1/rooms/a,b,c/1");
             assert.equal(segments.length, 3);
             assert.equal(segments[0].type, "session");
             assert.equal(segments[0].value, "1");
@@ -293,8 +265,7 @@ export function tests() {
             assert.equal(segments[2].value, "b");
         },
         "parse empty grid url": assert => {
-            const path = createEmptyPath();
-            const segments = parseUrlPath("/session/1/rooms/", path);
+            const segments = parseUrlPath("/session/1/rooms/");
             assert.equal(segments.length, 3);
             assert.equal(segments[0].type, "session");
             assert.equal(segments[0].value, "1");
@@ -304,8 +275,7 @@ export function tests() {
             assert.equal(segments[2].value, 0);
         },
         "parse empty grid url with focus": assert => {
-            const path = createEmptyPath();
-            const segments = parseUrlPath("/session/1/rooms//1", path);
+            const segments = parseUrlPath("/session/1/rooms//1");
             assert.equal(segments.length, 3);
             assert.equal(segments[0].type, "session");
             assert.equal(segments[0].value, "1");
@@ -315,7 +285,7 @@ export function tests() {
             assert.equal(segments[2].value, 1);
         },
         "parse open-room action replacing the current focused room": assert => {
-            const nav: Navigation<SegmentType> = new Navigation(allowsChild);
+            const nav = new Navigation(allowsChild);
             const path = nav.pathFrom([
                 new Segment("session", 1),
                 new Segment("rooms", ["a", "b", "c"]),
@@ -331,7 +301,7 @@ export function tests() {
             assert.equal(segments[2].value, "d");
         },
         "parse open-room action changing focus to an existing room": assert => {
-            const nav: Navigation<SegmentType> = new Navigation(allowsChild);
+            const nav = new Navigation(allowsChild);
             const path = nav.pathFrom([
                 new Segment("session", 1),
                 new Segment("rooms", ["a", "b", "c"]),
@@ -347,7 +317,7 @@ export function tests() {
             assert.equal(segments[2].value, "a");
         },
         "parse open-room action changing focus to an existing room with details open": assert => {
-            const nav: Navigation<SegmentType> = new Navigation(allowsChild);
+            const nav = new Navigation(allowsChild);
             const path = nav.pathFrom([
                 new Segment("session", 1),
                 new Segment("rooms", ["a", "b", "c"]),
@@ -369,7 +339,7 @@ export function tests() {
             assert.equal(segments[4].value, true);
         },
         "open-room action should only copy over previous segments if there are no parts after open-room": assert => {
-            const nav: Navigation<SegmentType> = new Navigation(allowsChild);
+            const nav = new Navigation(allowsChild);
             const path = nav.pathFrom([
                 new Segment("session", 1),
                 new Segment("rooms", ["a", "b", "c"]),
@@ -391,7 +361,7 @@ export function tests() {
             assert.equal(segments[4].value, "foo");
         },
         "parse open-room action setting a room in an empty tile": assert => {
-            const nav: Navigation<SegmentType> = new Navigation(allowsChild);
+            const nav = new Navigation(allowsChild);
             const path = nav.pathFrom([
                 new Segment("session", 1),
                 new Segment("rooms", ["a", "b", "c"]),
@@ -407,83 +377,82 @@ export function tests() {
             assert.equal(segments[2].value, "d");
         },
         "parse session url path without id": assert => {
-            const path = createEmptyPath();
-            const segments = parseUrlPath("/session", path);
+            const segments = parseUrlPath("/session");
             assert.equal(segments.length, 1);
             assert.equal(segments[0].type, "session");
             assert.strictEqual(segments[0].value, true);
         },
         "remove active room from grid path turns it into empty tile": assert => {
-            const nav: Navigation<SegmentType> = new Navigation(allowsChild);
+            const nav = new Navigation(allowsChild);
             const path = nav.pathFrom([
                 new Segment("session", 1),
                 new Segment("rooms", ["a", "b", "c"]),
                 new Segment("room", "b")
             ]);
             const newPath = removeRoomFromPath(path, "b");
-            assert.equal(newPath?.segments.length, 3);
-            assert.equal(newPath?.segments[0].type, "session");
-            assert.equal(newPath?.segments[0].value, 1);
-            assert.equal(newPath?.segments[1].type, "rooms");
-            assert.deepEqual(newPath?.segments[1].value, ["a", "", "c"]);
-            assert.equal(newPath?.segments[2].type, "empty-grid-tile");
-            assert.equal(newPath?.segments[2].value, 1);
+            assert.equal(newPath.segments.length, 3);
+            assert.equal(newPath.segments[0].type, "session");
+            assert.equal(newPath.segments[0].value, 1);
+            assert.equal(newPath.segments[1].type, "rooms");
+            assert.deepEqual(newPath.segments[1].value, ["a", "", "c"]);
+            assert.equal(newPath.segments[2].type, "empty-grid-tile");
+            assert.equal(newPath.segments[2].value, 1);
         },
         "remove inactive room from grid path": assert => {
-            const nav: Navigation<SegmentType> = new Navigation(allowsChild);
+            const nav = new Navigation(allowsChild);
             const path = nav.pathFrom([
                 new Segment("session", 1),
                 new Segment("rooms", ["a", "b", "c"]),
                 new Segment("room", "b")
             ]);
             const newPath = removeRoomFromPath(path, "a");
-            assert.equal(newPath?.segments.length, 3);
-            assert.equal(newPath?.segments[0].type, "session");
-            assert.equal(newPath?.segments[0].value, 1);
-            assert.equal(newPath?.segments[1].type, "rooms");
-            assert.deepEqual(newPath?.segments[1].value, ["", "b", "c"]);
-            assert.equal(newPath?.segments[2].type, "room");
-            assert.equal(newPath?.segments[2].value, "b");
+            assert.equal(newPath.segments.length, 3);
+            assert.equal(newPath.segments[0].type, "session");
+            assert.equal(newPath.segments[0].value, 1);
+            assert.equal(newPath.segments[1].type, "rooms");
+            assert.deepEqual(newPath.segments[1].value, ["", "b", "c"]);
+            assert.equal(newPath.segments[2].type, "room");
+            assert.equal(newPath.segments[2].value, "b");
         },
         "remove inactive room from grid path with empty tile": assert => {
-            const nav: Navigation<SegmentType> = new Navigation(allowsChild);
+            const nav = new Navigation(allowsChild);
             const path = nav.pathFrom([
                 new Segment("session", 1),
                 new Segment("rooms", ["a", "b", ""]),
                 new Segment("empty-grid-tile", 3)
             ]);
             const newPath = removeRoomFromPath(path, "b");
-            assert.equal(newPath?.segments.length, 3);
-            assert.equal(newPath?.segments[0].type, "session");
-            assert.equal(newPath?.segments[0].value, 1);
-            assert.equal(newPath?.segments[1].type, "rooms");
-            assert.deepEqual(newPath?.segments[1].value, ["a", "", ""]);
-            assert.equal(newPath?.segments[2].type, "empty-grid-tile");
-            assert.equal(newPath?.segments[2].value, 3);
+            assert.equal(newPath.segments.length, 3);
+            assert.equal(newPath.segments[0].type, "session");
+            assert.equal(newPath.segments[0].value, 1);
+            assert.equal(newPath.segments[1].type, "rooms");
+            assert.deepEqual(newPath.segments[1].value, ["a", "", ""]);
+            assert.equal(newPath.segments[2].type, "empty-grid-tile");
+            assert.equal(newPath.segments[2].value, 3);
         },
         "remove active room": assert => {
-            const nav: Navigation<SegmentType> = new Navigation(allowsChild);
+            const nav = new Navigation(allowsChild);
             const path = nav.pathFrom([
                 new Segment("session", 1),
                 new Segment("room", "b")
             ]);
             const newPath = removeRoomFromPath(path, "b");
-            assert.equal(newPath?.segments.length, 1);
-            assert.equal(newPath?.segments[0].type, "session");
-            assert.equal(newPath?.segments[0].value, 1);
+            assert.equal(newPath.segments.length, 1);
+            assert.equal(newPath.segments[0].type, "session");
+            assert.equal(newPath.segments[0].value, 1);
         },
         "remove inactive room doesn't do anything": assert => {
-            const nav: Navigation<SegmentType> = new Navigation(allowsChild);
+            const nav = new Navigation(allowsChild);
             const path = nav.pathFrom([
                 new Segment("session", 1),
                 new Segment("room", "b")
             ]);
             const newPath = removeRoomFromPath(path, "a");
-            assert.equal(newPath?.segments.length, 2);
-            assert.equal(newPath?.segments[0].type, "session");
-            assert.equal(newPath?.segments[0].value, 1);
-            assert.equal(newPath?.segments[1].type, "room");
-            assert.equal(newPath?.segments[1].value, "b");
+            assert.equal(newPath.segments.length, 2);
+            assert.equal(newPath.segments[0].type, "session");
+            assert.equal(newPath.segments[0].value, 1);
+            assert.equal(newPath.segments[1].type, "room");
+            assert.equal(newPath.segments[1].value, "b");
         },
         
     }

src/domain/rageshake.ts

@@ -1,65 +0,0 @@
-/*
-Copyright 2022 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 type {BlobHandle} from "../platform/web/dom/BlobHandle";
-import type {RequestFunction} from "../platform/types/types";
-
-// see https://github.com/matrix-org/rageshake#readme
-type RageshakeData = {
-    // A textual description of the problem. Included in the details.log.gz file.
-    text: string | undefined;
-    // Application user-agent. Included in the details.log.gz file.
-    userAgent: string;
-    // Identifier for the application (eg 'riot-web'). Should correspond to a mapping configured in the configuration file for github issue reporting to work.
-    app: string;
-    // Application version. Included in the details.log.gz file.
-    version: string;
-    // Label to attach to the github issue, and include in the details file.
-    label: string | undefined;
-};
-
-export async function submitLogsToRageshakeServer(data: RageshakeData, logsBlob: BlobHandle, submitUrl: string, request: RequestFunction): Promise<void> {
-    const formData = new Map<string, string | {name: string, blob: BlobHandle}>();
-    if (data.text) {
-        formData.set("text", data.text);
-    }
-    formData.set("user_agent", data.userAgent);
-    formData.set("app", data.app);
-    formData.set("version", data.version);
-    if (data.label) {
-        formData.set("label", data.label);
-    }
-    formData.set("file", {name: "logs.json", blob: logsBlob});
-    const headers: Map<string, string> = new Map();
-    headers.set("Accept", "application/json");
-    const result = request(submitUrl, {
-        method: "POST",
-        body: formData,
-        headers
-    });
-    let response;
-    try {
-        response = await result.response();
-    } catch (err) {
-        throw new Error(`Could not submit logs to ${submitUrl}, got error ${err.message}`);
-    }
-    const {status, body} = response;
-    if (status < 200 || status >= 300) {
-        throw new Error(`Could not submit logs to ${submitUrl}, got status code ${status} with body ${body}`);
-    }
-    // we don't bother with reading report_url from the body as the rageshake server doesn't always return it
-    // and would have to have CORS setup properly for us to be able to read it.
-}

src/domain/session/CreateRoomViewModel.js

@@ -1,144 +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.
-*/
-
-import {ViewModel} from "../ViewModel";
-import {imageToInfo} from "./common.js";
-import {RoomType} from "../../matrix/room/common";
-
-export class CreateRoomViewModel extends ViewModel {
-    constructor(options) {
-        super(options);
-        const {session} = options;
-        this._session = session;
-        this._name = undefined;
-        this._topic = undefined;
-        this._roomAlias = undefined;
-        this._isPublic = false;
-        this._isEncrypted = true;
-        this._isAdvancedShown = false;
-        this._isFederationDisabled = false;
-        this._avatarScaledBlob = undefined;
-        this._avatarFileName = undefined;
-        this._avatarInfo = undefined;
-    }
-
-    get isPublic() { return this._isPublic; }
-    get isEncrypted() { return this._isEncrypted; }
-    get canCreate() { return !!this._name; }
-    avatarUrl() { return this._avatarScaledBlob.url; }
-    get avatarTitle() { return this._name; }
-    get avatarLetter() { return ""; }
-    get avatarColorNumber() { return 0; }
-    get hasAvatar() { return !!this._avatarScaledBlob; }
-    get isFederationDisabled() { return this._isFederationDisabled; }
-    get isAdvancedShown() { return this._isAdvancedShown; }
-
-    setName(name) {
-        this._name = name;
-        this.emitChange("canCreate");
-    }
-
-    setRoomAlias(roomAlias) {
-        this._roomAlias = roomAlias;
-    }
-
-    setTopic(topic) {
-        this._topic = topic;
-    }
-
-    setPublic(isPublic) {
-        this._isPublic = isPublic;
-        this.emitChange("isPublic");
-    }
-
-    setEncrypted(isEncrypted) {
-        this._isEncrypted = isEncrypted;
-        this.emitChange("isEncrypted");
-    }
-
-    setFederationDisabled(disable) {
-        this._isFederationDisabled = disable;
-        this.emitChange("isFederationDisabled");
-    }
-
-    toggleAdvancedShown() {
-        this._isAdvancedShown = !this._isAdvancedShown;
-        this.emitChange("isAdvancedShown");
-    }
-
-    create() {
-        let avatar;
-        if (this._avatarScaledBlob) {
-            avatar = {
-                info: this._avatarInfo,
-                name: this._avatarFileName,
-                blob: this._avatarScaledBlob
-            }
-        }
-        const roomBeingCreated = this._session.createRoom({
-            type: this.isPublic ? RoomType.Public : RoomType.Private,
-            name: this._name ?? undefined,
-            topic: this._topic ?? undefined,
-            isEncrypted: !this.isPublic && this._isEncrypted,
-            isFederationDisabled: this._isFederationDisabled,
-            alias: this.isPublic ? ensureAliasIsLocalPart(this._roomAlias) : undefined,
-            avatar,
-        });
-        this.navigation.push("room", roomBeingCreated.id);
-    }
-
-    async selectAvatar() {
-        if (!this.platform.hasReadPixelPermission()) {
-            alert("Please allow canvas image data access, so we can scale your images down.");
-            return;
-        }
-        if (this._avatarScaledBlob) {
-            this._avatarScaledBlob.dispose();
-        }
-        this._avatarScaledBlob = undefined;
-        this._avatarFileName = undefined;
-        this._avatarInfo = undefined;
-
-        const file = await this.platform.openFile("image/*");
-        if (!file || !file.blob.mimeType.startsWith("image/")) {
-            // allow to clear the avatar by not selecting an image
-            this.emitChange("hasAvatar");
-            return;
-        }
-        let image = await this.platform.loadImage(file.blob);
-        const limit = 800;
-        if (image.maxDimension > limit) {
-            const scaledImage = await image.scale(limit);
-            image.dispose();
-            image = scaledImage;
-        }
-        this._avatarScaledBlob = image.blob;
-        this._avatarInfo = imageToInfo(image);
-        this._avatarFileName = file.name;
-        this.emitChange("hasAvatar");
-    }
-}
-
-function ensureAliasIsLocalPart(roomAliasLocalPart) {
-    if (roomAliasLocalPart.startsWith("#")) {
-        roomAliasLocalPart = roomAliasLocalPart.substr(1);
-    }
-    const colonIdx = roomAliasLocalPart.indexOf(":");
-    if (colonIdx !== -1) {
-        roomAliasLocalPart = roomAliasLocalPart.substr(0, colonIdx);
-    }
-    return roomAliasLocalPart;
-}

src/domain/session/RoomGridViewModel.js

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ViewModel} from "../ViewModel";
-import {addPanelIfNeeded} from "../navigation/index";
+import {ViewModel} from "../ViewModel.js";
+import {addPanelIfNeeded} from "../navigation/index.js";
 
 function dedupeSparse(roomIds) {
     return roomIds.map((id, idx) => {
@@ -185,7 +185,7 @@ export class RoomGridViewModel extends ViewModel {
     }
 }
 
-import {createNavigation} from "../navigation/index";
+import {createNavigation} from "../navigation/index.js";
 import {ObservableValue} from "../../observable/ObservableValue";
 
 export function tests() { 

src/domain/session/RoomViewModelObservable.js

@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 import {ObservableValue} from "../../observable/ObservableValue";
-import {RoomStatus} from "../../matrix/room/common";
 
 /**
 Depending on the status of a room (invited, joined, archived, or none),
@@ -35,11 +34,11 @@ the now transferred child view model.
 This is also why there is an explicit initialize method, see comment there.
 */
 export class RoomViewModelObservable extends ObservableValue {
-    constructor(sessionViewModel, roomIdOrLocalId) {
+    constructor(sessionViewModel, roomId) {
         super(null);
         this._statusSubscription = null;
         this._sessionViewModel = sessionViewModel;
-        this.id = roomIdOrLocalId;
+        this.id = roomId;
     }
 
     /**
@@ -49,7 +48,7 @@ export class RoomViewModelObservable extends ObservableValue {
     are called in that case.
     */
     async initialize() {
-        const {session} = this._sessionViewModel._client;
+        const {session} = this._sessionViewModel._sessionContainer;
         const statusObservable = await session.observeRoomStatus(this.id);
         this.set(await this._statusToViewModel(statusObservable.get()));
         this._statusSubscription = statusObservable.subscribe(async status => {
@@ -60,21 +59,11 @@ export class RoomViewModelObservable extends ObservableValue {
     }
 
     async _statusToViewModel(status) {
-        if (status & RoomStatus.Replaced) {
-            if (status & RoomStatus.BeingCreated) {
-                const {session} = this._sessionViewModel._client;
-                const roomBeingCreated = session.roomsBeingCreated.get(this.id);
-                this._sessionViewModel.notifyRoomReplaced(roomBeingCreated.id, roomBeingCreated.roomId);
-            } else {
-                throw new Error("Don't know how to replace a room with this status: " + (status ^ RoomStatus.Replaced));
-            }
-        } else if (status & RoomStatus.BeingCreated) {
-            return this._sessionViewModel._createRoomBeingCreatedViewModel(this.id);
-        } else if (status & RoomStatus.Invited) {
+        if (status.invited) {
             return this._sessionViewModel._createInviteViewModel(this.id);
-        } else if (status & RoomStatus.Joined) {
-            return this._sessionViewModel._createRoomViewModelInstance(this.id);
-        } else if (status & RoomStatus.Archived) {
+        } else if (status.joined) {
+            return this._sessionViewModel._createRoomViewModel(this.id);
+        } else if (status.archived) {
             return await this._sessionViewModel._createArchivedRoomViewModel(this.id);
         } else {
             return this._sessionViewModel._createUnknownRoomViewModel(this.id);

src/domain/session/SessionStatusViewModel.js

@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ViewModel} from "../ViewModel";
+import {ViewModel} from "../ViewModel.js";
 import {createEnum} from "../../utils/enum";
-import {ConnectionStatus} from "../../matrix/net/Reconnector";
+import {ConnectionStatus} from "../../matrix/net/Reconnector.js";
 import {SyncStatus} from "../../matrix/Sync.js";
 
 const SessionStatus = createEnum(
@@ -36,7 +36,7 @@ export class SessionStatusViewModel extends ViewModel {
         this._reconnector = reconnector;
         this._status = this._calculateState(reconnector.connectionStatus.get(), sync.status.get());
         this._session = session;
-        this._setupKeyBackupUrl = this.urlCreator.urlForSegment("settings");
+        this._setupSessionBackupUrl = this.urlCreator.urlForSegment("settings");
         this._dismissSecretStorage = false;
     }
 
@@ -44,17 +44,17 @@ export class SessionStatusViewModel extends ViewModel {
         const update = () => this._updateStatus();
         this.track(this._sync.status.subscribe(update));
         this.track(this._reconnector.connectionStatus.subscribe(update));
-        this.track(this._session.needsKeyBackup.subscribe(() => {
+        this.track(this._session.needsSessionBackup.subscribe(() => {
             this.emitChange();
         }));
     }
 
-    get setupKeyBackupUrl () {
-        return this._setupKeyBackupUrl;
+    get setupSessionBackupUrl () {
+        return this._setupSessionBackupUrl;
     }
 
     get isShown() {
-        return (this._session.needsKeyBackup.get() && !this._dismissSecretStorage) || this._status !== SessionStatus.Syncing;
+        return (this._session.needsSessionBackup.get() && !this._dismissSecretStorage) || this._status !== SessionStatus.Syncing;
     }
 
     get statusLabel() {
@@ -70,7 +70,7 @@ export class SessionStatusViewModel extends ViewModel {
             case SessionStatus.SyncError:
                 return this.i18n`Sync failed because of ${this._sync.error}`;
         }
-        if (this._session.needsKeyBackup.get()) {
+        if (this._session.needsSessionBackup.get()) {
             return this.i18n`Set up session backup to decrypt older messages.`;
         }
         return "";
@@ -135,7 +135,7 @@ export class SessionStatusViewModel extends ViewModel {
 
     get isSecretStorageShown() {
         // TODO: we need a model here where we can have multiple messages queued up and their buttons don't bleed into each other.
-        return this._status === SessionStatus.Syncing && this._session.needsKeyBackup.get() && !this._dismissSecretStorage;
+        return this._status === SessionStatus.Syncing && this._session.needsSessionBackup.get() && !this._dismissSecretStorage;
     }
 
     get canDismiss() {

src/domain/session/SessionViewModel.js

@@ -19,31 +19,31 @@ import {LeftPanelViewModel} from "./leftpanel/LeftPanelViewModel.js";
 import {RoomViewModel} from "./room/RoomViewModel.js";
 import {UnknownRoomViewModel} from "./room/UnknownRoomViewModel.js";
 import {InviteViewModel} from "./room/InviteViewModel.js";
-import {RoomBeingCreatedViewModel} from "./room/RoomBeingCreatedViewModel.js";
 import {LightboxViewModel} from "./room/LightboxViewModel.js";
 import {SessionStatusViewModel} from "./SessionStatusViewModel.js";
 import {RoomGridViewModel} from "./RoomGridViewModel.js";
 import {SettingsViewModel} from "./settings/SettingsViewModel.js";
-import {CreateRoomViewModel} from "./CreateRoomViewModel.js";
-import {ViewModel} from "../ViewModel";
+import {ViewModel} from "../ViewModel.js";
 import {RoomViewModelObservable} from "./RoomViewModelObservable.js";
 import {RightPanelViewModel} from "./rightpanel/RightPanelViewModel.js";
 
 export class SessionViewModel extends ViewModel {
     constructor(options) {
         super(options);
-        const {client} = options;
-        this._client = this.track(client);
+        const {sessionContainer} = options;
+        this._sessionContainer = this.track(sessionContainer);
         this._sessionStatusViewModel = this.track(new SessionStatusViewModel(this.childOptions({
-            sync: client.sync,
-            reconnector: client.reconnector,
-            session: client.session,
+            sync: sessionContainer.sync,
+            reconnector: sessionContainer.reconnector,
+            session: sessionContainer.session,
+        })));
+        this._leftPanelViewModel = this.track(new LeftPanelViewModel(this.childOptions({
+            invites: this._sessionContainer.session.invites,
+            rooms: this._sessionContainer.session.rooms
         })));
-        this._leftPanelViewModel = this.track(new LeftPanelViewModel(this.childOptions({session: this._client.session})));
         this._settingsViewModel = null;
         this._roomViewModelObservable = null;
         this._gridViewModel = null;
-        this._createRoomViewModel = null;
         this._setupNavigation();
     }
 
@@ -75,12 +75,6 @@ export class SessionViewModel extends ViewModel {
         }));
         this._updateSettings(settings.get());
 
-        const createRoom = this.navigation.observe("create-room");
-        this.track(createRoom.subscribe(createRoomOpen => {
-            this._updateCreateRoom(createRoomOpen);
-        }));
-        this._updateCreateRoom(createRoom.get());
-
         const lightbox = this.navigation.observe("lightbox");
         this.track(lightbox.subscribe(eventId => {
             this._updateLightbox(eventId);
@@ -94,7 +88,7 @@ export class SessionViewModel extends ViewModel {
     }
 
     get id() {
-        return this._client.sessionId;
+        return this._sessionContainer.sessionId;
     }
 
     start() {
@@ -102,7 +96,7 @@ export class SessionViewModel extends ViewModel {
     }
 
     get activeMiddleViewModel() {
-        return this._roomViewModelObservable?.get() || this._gridViewModel || this._settingsViewModel || this._createRoomViewModel;
+        return this._roomViewModelObservable?.get() || this._gridViewModel || this._settingsViewModel;
     }
 
     get roomGridViewModel() {
@@ -125,14 +119,11 @@ export class SessionViewModel extends ViewModel {
         return this._roomViewModelObservable?.get();
     }
 
+
     get rightPanelViewModel() {
         return this._rightPanelViewModel;
     }
 
-    get createRoomViewModel() {
-        return this._createRoomViewModel;
-    }
-
     _updateGrid(roomIds) {
         const changed = !(this._gridViewModel && roomIds);
         const currentRoomId = this.navigation.path.get("room");
@@ -171,8 +162,8 @@ export class SessionViewModel extends ViewModel {
         }
     }
 
-    _createRoomViewModelInstance(roomId) {
-        const room = this._client.session.rooms.get(roomId);
+    _createRoomViewModel(roomId) {
+        const room = this._sessionContainer.session.rooms.get(roomId);
         if (room) {
             const roomVM = new RoomViewModel(this.childOptions({room}));
             roomVM.load();
@@ -184,12 +175,12 @@ export class SessionViewModel extends ViewModel {
     _createUnknownRoomViewModel(roomIdOrAlias) {
         return new UnknownRoomViewModel(this.childOptions({
             roomIdOrAlias,
-            session: this._client.session,
+            session: this._sessionContainer.session,
         }));
     }
 
     async _createArchivedRoomViewModel(roomId) {
-        const room = await this._client.session.loadArchivedRoom(roomId);
+        const room = await this._sessionContainer.session.loadArchivedRoom(roomId);
         if (room) {
             const roomVM = new RoomViewModel(this.childOptions({room}));
             roomVM.load();
@@ -199,22 +190,11 @@ export class SessionViewModel extends ViewModel {
     }
 
     _createInviteViewModel(roomId) {
-        const invite = this._client.session.invites.get(roomId);
+        const invite = this._sessionContainer.session.invites.get(roomId);
         if (invite) {
             return new InviteViewModel(this.childOptions({
                 invite,
-                mediaRepository: this._client.session.mediaRepository,
-            }));
-        }
-        return null;
-    }
-
-    _createRoomBeingCreatedViewModel(localId) {
-        const roomBeingCreated = this._client.session.roomsBeingCreated.get(localId);
-        if (roomBeingCreated) {
-            return new RoomBeingCreatedViewModel(this.childOptions({
-                roomBeingCreated,
-                mediaRepository: this._client.session.mediaRepository,
+                mediaRepository: this._sessionContainer.session.mediaRepository,
             }));
         }
         return null;
@@ -250,23 +230,13 @@ export class SessionViewModel extends ViewModel {
         }
         if (settingsOpen) {
             this._settingsViewModel = this.track(new SettingsViewModel(this.childOptions({
-                client: this._client,
+                sessionContainer: this._sessionContainer,
             })));
             this._settingsViewModel.load();
         }
         this.emitChange("activeMiddleViewModel");
     }
 
-    _updateCreateRoom(createRoomOpen) {
-        if (this._createRoomViewModel) {
-            this._createRoomViewModel = this.disposeTracked(this._createRoomViewModel);
-        }
-        if (createRoomOpen) {
-            this._createRoomViewModel = this.track(new CreateRoomViewModel(this.childOptions({session: this._client.session})));
-        }
-        this.emitChange("activeMiddleViewModel");
-    }
-
     _updateLightbox(eventId) {
         if (this._lightboxViewModel) {
             this._lightboxViewModel = this.disposeTracked(this._lightboxViewModel);
@@ -284,7 +254,7 @@ export class SessionViewModel extends ViewModel {
 
     _roomFromNavigation() {
         const roomId = this.navigation.path.get("room")?.value;
-        const room = this._client.session.rooms.get(roomId);
+        const room = this._sessionContainer.session.rooms.get(roomId);
         return room;
     }
 
@@ -293,12 +263,9 @@ export class SessionViewModel extends ViewModel {
         const enable = !!this.navigation.path.get("right-panel")?.value;
         if (enable) {
             const room = this._roomFromNavigation();
-            this._rightPanelViewModel = this.track(new RightPanelViewModel(this.childOptions({room, session: this._client.session})));
+            this._rightPanelViewModel = this.track(new RightPanelViewModel(this.childOptions({room})));
         }
         this.emitChange("rightPanelViewModel");
     }
 
-    notifyRoomReplaced(oldId, newId) {
-        this.navigation.push("room", newId);
-    }
 }

src/domain/session/common.js

@@ -1,24 +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.
-*/
-
-export function imageToInfo(image) {
-    return {
-        w: image.width,
-        h: image.height,
-        mimetype: image.blob.mimeType,
-        size: image.blob.size
-    };
-}

src/domain/session/leftpanel/BaseTileViewModel.js

@@ -15,10 +15,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl} from "../../avatar";
-import {ViewModel} from "../../ViewModel";
+import {avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl} from "../../avatar.js";
+import {ViewModel} from "../../ViewModel.js";
 
-const KIND_ORDER = ["roomBeingCreated", "invite", "room"];
+const KIND_ORDER = ["invite", "room"];
 
 export class BaseTileViewModel extends ViewModel {
     constructor(options) {

src/domain/session/leftpanel/InviteTileViewModel.js

@@ -1,4 +1,5 @@
 /*
+Copyright 2020 Bruno Windels <bruno@windels.cloud>
 Copyright 2020, 2021 The Matrix.org Foundation C.I.C.
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +16,6 @@ limitations under the License.
 */
 
 import {BaseTileViewModel} from "./BaseTileViewModel.js";
-import {comparePrimitive} from "./common";
 
 export class InviteTileViewModel extends BaseTileViewModel {
     constructor(options) {
@@ -25,40 +25,31 @@ export class InviteTileViewModel extends BaseTileViewModel {
         this._url = this.urlCreator.openRoomActionUrl(this._invite.id);
     }
 
-    get busy() { return this._invite.accepting || this._invite.rejecting; }
-    get kind() { return "invite"; }
-    get url() { return this._url; }
-    get name() { return this._invite.name; }
-    get isHighlighted() { return true; }
-    get isUnread() { return true; }
-    get badgeCount() { return this.i18n`!`; }
-    get _avatarSource() { return this._invite; }
+    get busy() {
+        return this._invite.accepting || this._invite.rejecting;
+    }
+
+    get kind() {
+        return "invite";
+    }
+
+    get url() {
+        return this._url;
+    }
 
-    /** very important that sorting order is stable and that comparing
-     * to itself always returns 0, otherwise SortedMapList will
-     * remove the wrong children, etc ... */
     compare(other) {
         const parentComparison = super.compare(other);
         if (parentComparison !== 0) {
             return parentComparison;
         }
-        const timeDiff = other._invite.timestamp - this._invite.timestamp;
-        if (timeDiff !== 0) {
-            return timeDiff;
-        }
-        return comparePrimitive(this._invite.id, other._invite.id);
-    }
+        return other._invite.timestamp - this._invite.timestamp;
     }
 
-export function tests() {
-    return {
-        "test compare with timestamp": assert => {
-            const urlCreator = {openRoomActionUrl() { return "";}}
-            const vm1 = new InviteTileViewModel({invite: {timestamp: 500, id: "1"}, urlCreator});
-            const vm2 = new InviteTileViewModel({invite: {timestamp: 250, id: "2"}, urlCreator});
-            assert(vm1.compare(vm2) < 0);
-            assert(vm2.compare(vm1) > 0);
-            assert.equal(vm1.compare(vm1), 0);
-        },
+    get name() {
+        return this._invite.name;
+    }
+
+    get _avatarSource() {
+        return this._invite;
     }
 }

src/domain/session/leftpanel/LeftPanelViewModel.js

@@ -15,47 +15,42 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ViewModel} from "../../ViewModel";
+import {ViewModel} from "../../ViewModel.js";
 import {RoomTileViewModel} from "./RoomTileViewModel.js";
 import {InviteTileViewModel} from "./InviteTileViewModel.js";
-import {RoomBeingCreatedTileViewModel} from "./RoomBeingCreatedTileViewModel.js";
 import {RoomFilter} from "./RoomFilter.js";
 import {ApplyMap} from "../../../observable/map/ApplyMap.js";
-import {addPanelIfNeeded} from "../../navigation/index";
+import {addPanelIfNeeded} from "../../navigation/index.js";
 
 export class LeftPanelViewModel extends ViewModel {
     constructor(options) {
         super(options);
-        const {session} = options;
-        this._tileViewModelsMap = this._mapTileViewModels(session.roomsBeingCreated, session.invites, session.rooms);
+        const {rooms, invites} = options;
+        this._tileViewModelsMap = this._mapTileViewModels(rooms, invites);
         this._tileViewModelsFilterMap = new ApplyMap(this._tileViewModelsMap);
         this._tileViewModels = this._tileViewModelsFilterMap.sortValues((a, b) => a.compare(b));
         this._currentTileVM = null;
         this._setupNavigation();
         this._closeUrl = this.urlCreator.urlForSegment("session");
         this._settingsUrl = this.urlCreator.urlForSegment("settings");
-        this._createRoomUrl = this.urlCreator.urlForSegment("create-room");
     }
 
-    _mapTileViewModels(roomsBeingCreated, invites, rooms) {
+    _mapTileViewModels(rooms, invites) {
         // join is not commutative, invites will take precedence over rooms
-        const allTiles = invites.join(roomsBeingCreated, rooms).mapValues((item, emitChange) => {
+        return invites.join(rooms).mapValues((roomOrInvite, emitChange) => {
             let vm;
-            if (item.isBeingCreated) {
-                vm = new RoomBeingCreatedTileViewModel(this.childOptions({roomBeingCreated: item, emitChange}));
-            } else if (item.isInvite) {
-                vm = new InviteTileViewModel(this.childOptions({invite: item, emitChange}));
+            if (roomOrInvite.isInvite) {
+                vm = new InviteTileViewModel(this.childOptions({invite: roomOrInvite, emitChange}));
             } else {
-                vm = new RoomTileViewModel(this.childOptions({room: item, emitChange}));
+                vm = new RoomTileViewModel(this.childOptions({room: roomOrInvite, emitChange}));
             }
-            const isOpen = this.navigation.path.get("room")?.value === item.id;
+            const isOpen = this.navigation.path.get("room")?.value === roomOrInvite.id;
             if (isOpen) {
                 vm.open();
                 this._updateCurrentVM(vm);
             }
             return vm;
         });
-        return allTiles;
     }
 
     _updateCurrentVM(vm) {
@@ -74,8 +69,6 @@ export class LeftPanelViewModel extends ViewModel {
         return this._settingsUrl;
     }
 
-    get createRoomUrl() { return this._createRoomUrl; }
-
     _setupNavigation() {
         const roomObservable = this.navigation.observe("room");
         this.track(roomObservable.subscribe(roomId => this._open(roomId)));

src/domain/session/leftpanel/RoomBeingCreatedTileViewModel.js

@@ -1,70 +0,0 @@
-/*
-Copyright 2020 Bruno Windels <bruno@windels.cloud>
-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 {BaseTileViewModel} from "./BaseTileViewModel.js";
-import {comparePrimitive} from "./common";
-
-export class RoomBeingCreatedTileViewModel extends BaseTileViewModel {
-    constructor(options) {
-        super(options);
-        const {roomBeingCreated} = options;
-        this._roomBeingCreated = roomBeingCreated;
-        this._url = this.urlCreator.openRoomActionUrl(this._roomBeingCreated.id);
-    }
-
-    get busy() { return !this._roomBeingCreated.error; }
-    get kind() { return "roomBeingCreated"; }
-    get isHighlighted() { return !this.busy; }
-    get badgeCount() { return !this.busy && this.i18n`Failed`; }
-    get url() { return this._url; }
-    get name() { return this._roomBeingCreated.name; }
-    get _avatarSource() { return this._roomBeingCreated; }
-
-    /** very important that sorting order is stable and that comparing
-     * to itself always returns 0, otherwise SortedMapList will
-     * remove the wrong children, etc ... */
-    compare(other) {
-        const parentCmp = super.compare(other);
-        if (parentCmp !== 0) {
-            return parentCmp;
-        }
-        const nameCmp = comparePrimitive(this.name, other.name);
-        if (nameCmp === 0) {
-            return comparePrimitive(this._roomBeingCreated.id, other._roomBeingCreated.id);
-        } else {
-            return nameCmp;
-        }
-    }
-
-    avatarUrl(size) {
-        // allow blob url which doesn't need mxc => http resolution
-        return this._roomBeingCreated.avatarBlobUrl ?? super.avatarUrl(size);
-    }
-}
-
-export function tests() {
-    return {
-        "test compare with names": assert => {
-            const urlCreator = {openRoomActionUrl() { return "";}}
-            const vm1 = new RoomBeingCreatedTileViewModel({roomBeingCreated: {name: "A", id: "1"}, urlCreator});
-            const vm2 = new RoomBeingCreatedTileViewModel({roomBeingCreated: {name: "B", id: "2"}, urlCreator});
-            assert(vm1.compare(vm2) < 0);
-            assert(vm2.compare(vm1) > 0);
-            assert.equal(vm1.compare(vm1), 0);
-        },
-    }
-}

src/domain/session/leftpanel/RoomTileViewModel.js

@@ -33,9 +33,6 @@ export class RoomTileViewModel extends BaseTileViewModel {
         return this._url;
     }
 
-    /** very important that sorting order is stable and that comparing
-     * to itself always returns 0, otherwise SortedMapList will
-     * remove the wrong children, etc ... */
     compare(other) {
         const parentComparison = super.compare(other);
         if (parentComparison !== 0) {

src/domain/session/leftpanel/common.js

@@ -1,23 +0,0 @@
-/*
-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.
-*/
-
-export function comparePrimitive(a, b) {
-    if (a === b) {
-        return 0;
-    } else {
-        return a < b ? -1 : 1;
-    }
-}

src/domain/session/rightpanel/MemberDetailsViewModel.js

@@ -14,9 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ViewModel} from "../../ViewModel";
-import {RoomType} from "../../../matrix/room/common";
-import {avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl} from "../../avatar";
+import {ViewModel} from "../../ViewModel.js";
+import {avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl} from "../../avatar.js";
 
 export class MemberDetailsViewModel extends ViewModel {
     constructor(options) {
@@ -26,7 +25,6 @@ export class MemberDetailsViewModel extends ViewModel {
         this._member = this._observableMember.get();
         this._isEncrypted = options.isEncrypted;
         this._powerLevelsObservable = options.powerLevelsObservable;
-        this._session = options.session;
         this.track(this._powerLevelsObservable.subscribe(() => this._onPowerLevelsChange()));
         this.track(this._observableMember.subscribe( () => this._onMemberChange()));
     }
@@ -79,19 +77,6 @@ export class MemberDetailsViewModel extends ViewModel {
     }
 
     get linkToUser() {
-        return `https://matrix.to/#/${encodeURIComponent(this._member.userId)}`;
-    }
-
-    async openDirectMessage() {
-        const room = this._session.findDirectMessageForUserId(this.userId);
-        let roomId = room?.id;
-        if (!roomId) {
-            const roomBeingCreated = await this._session.createRoom({
-                type: RoomType.DirectMessage,
-                invites: [this.userId]
-            });
-            roomId = roomBeingCreated.id;
-        }
-        this.navigation.push("room", roomId);
+        return `https://matrix.to/#/${this._member.userId}`;
     }
 }

src/domain/session/rightpanel/MemberListViewModel.js

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ViewModel} from "../../ViewModel";
+import {ViewModel} from "../../ViewModel.js";
 import {MemberTileViewModel} from "./MemberTileViewModel.js";
 import {createMemberComparator} from "./members/comparator.js";
 import {Disambiguator} from "./members/disambiguator.js";

src/domain/session/rightpanel/MemberTileViewModel.js

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ViewModel} from "../../ViewModel";
-import {avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl} from "../../avatar";
+import {ViewModel} from "../../ViewModel.js";
+import {avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl} from "../../avatar.js";
 
 export class MemberTileViewModel extends ViewModel {
     constructor(options) {

src/domain/session/rightpanel/RightPanelViewModel.js

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ViewModel} from "../../ViewModel";
+import {ViewModel} from "../../ViewModel.js";
 import {RoomDetailsViewModel} from "./RoomDetailsViewModel.js";
 import {MemberListViewModel} from "./MemberListViewModel.js";
 import {MemberDetailsViewModel} from "./MemberDetailsViewModel.js";
@@ -23,7 +23,6 @@ export class RightPanelViewModel extends ViewModel {
     constructor(options) {
         super(options);
         this._room = options.room;
-        this._session = options.session;
         this._members = null;
         this._setupNavigation();
     }
@@ -49,13 +48,7 @@ export class RightPanelViewModel extends ViewModel {
         }
         const isEncrypted = this._room.isEncrypted;
         const powerLevelsObservable = await this._room.observePowerLevels();
-        return {
-            observableMember,
-            isEncrypted,
-            powerLevelsObservable,
-            mediaRepository: this._room.mediaRepository,
-            session: this._session
-        };
+        return {observableMember, isEncrypted, powerLevelsObservable, mediaRepository: this._room.mediaRepository};
     }
 
     _setupNavigation() {

src/domain/session/rightpanel/RoomDetailsViewModel.js

@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ViewModel} from "../../ViewModel";
-import {avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl} from "../../avatar";
+import {ViewModel} from "../../ViewModel.js";
+import {avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl} from "../../avatar.js";
 
 export class RoomDetailsViewModel extends ViewModel {
     constructor(options) {

src/domain/session/room/ComposerViewModel.js

@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ViewModel} from "../../ViewModel";
+import {ViewModel} from "../../ViewModel.js";
 
 export class ComposerViewModel extends ViewModel {
     constructor(roomVM) {
-        super(roomVM.options);
+        super();
         this._roomVM = roomVM;
         this._isEmpty = true;
         this._replyVM = null;
@@ -30,7 +30,6 @@ export class ComposerViewModel extends ViewModel {
             this._replyVM = this.disposeTracked(this._replyVM);
             if (entry) {
                 this._replyVM = this.track(this._roomVM._createTile(entry));
-                this._replyVM.notifyVisible();
             }
             this.emitChange("replyViewModel");
             this.emit("focus");

src/domain/session/room/InviteViewModel.js

@@ -15,8 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl} from "../../avatar";
-import {ViewModel} from "../../ViewModel";
+import {avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl} from "../../avatar.js";
+import {ViewModel} from "../../ViewModel.js";
 
 export class InviteViewModel extends ViewModel {
     constructor(options) {

src/domain/session/room/LightboxViewModel.js

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ViewModel} from "../../ViewModel";
+import {ViewModel} from "../../ViewModel.js";
 
 export class LightboxViewModel extends ViewModel {
     constructor(options) {

src/domain/session/room/README.md

@@ -1,17 +1,9 @@
 # "Room" view models
 
-InviteViewModel, RoomViewModel and RoomBeingCreatedViewModel are interchangebly used as "room view model":
-    - SessionViewModel.roomViewModel can be an instance of any
-    - RoomGridViewModel.roomViewModelAt(i) can return an instance of any
+InviteViewModel and RoomViewModel are interchangebly used as "room view model":
+    - SessionViewModel.roomViewModel can be an instance of either
+    - RoomGridViewModel.roomViewModelAt(i) can return an instance of either
 
 This is because they are accessed by the same url and need to transition into each other, in these two locations. Having two methods, especially in RoomGridViewModel would have been more cumbersome, even though this is not in line with how different view models are exposed in SessionViewModel.
 
 They share an `id` and `kind` property, the latter can be used to differentiate them from the view, and a `focus` method.
-Once we convert this folder to typescript, we should use this interface for all the view models:
-```ts
-interface IGridItemViewModel {
-    id: string;
-    kind: string;
-    focus();
-}
-```

src/domain/session/room/RoomBeingCreatedViewModel.js

@@ -1,75 +0,0 @@
-/*
-Copyright 2020 Bruno Windels <bruno@windels.cloud>
-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 {avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl} from "../../avatar";
-import {ViewModel} from "../../ViewModel";
-
-export class RoomBeingCreatedViewModel extends ViewModel {
-    constructor(options) {
-        super(options);
-        const {roomBeingCreated, mediaRepository} = options;
-        this._roomBeingCreated = roomBeingCreated;
-        this._mediaRepository = mediaRepository;
-        this._onRoomChange = this._onRoomChange.bind(this);
-        this._closeUrl = this.urlCreator.urlUntilSegment("session");
-        this._roomBeingCreated.on("change", this._onRoomChange);
-    }
-
-    get kind() { return "roomBeingCreated"; }
-    get closeUrl() { return this._closeUrl; }
-    get name() { return this._roomBeingCreated.name; }
-    get id() { return this._roomBeingCreated.id; }
-    get isEncrypted() { return this._roomBeingCreated.isEncrypted; }
-    get error() {
-        const {error} = this._roomBeingCreated;
-        if (error) {
-            if (error.name === "ConnectionError") {
-                return this.i18n`You seem to be offline`;
-            } else {
-                return error.message;
-            }
-        }
-        return "";
-    }
-    get avatarLetter() { return avatarInitials(this.name); }
-    get avatarColorNumber() { return getIdentifierColorNumber(this._roomBeingCreated.avatarColorId); }
-    get avatarTitle() { return this.name; }
-
-    avatarUrl(size) {
-        // allow blob url which doesn't need mxc => http resolution
-        return this._roomBeingCreated.avatarBlobUrl ??
-            getAvatarHttpUrl(this._roomBeingCreated.avatarUrl, size, this.platform, this._mediaRepository);
-    }
-
-    focus() {}
-
-    _onRoomChange() {
-        this.emitChange();
-    }
-
-    cancel() {
-        this._roomBeingCreated.cancel();
-        // navigate away from the room
-        this.navigation.applyPath(this.navigation.path.until("session"));
-    }
-
-    dispose() {
-        super.dispose();
-        this._roomBeingCreated.off("change", this._onRoomChange);
-    }
-}
-

src/domain/session/room/RoomViewModel.js

@@ -17,30 +17,25 @@ limitations under the License.
 
 import {TimelineViewModel} from "./timeline/TimelineViewModel.js";
 import {ComposerViewModel} from "./ComposerViewModel.js"
-import {avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl} from "../../avatar";
-import {ViewModel} from "../../ViewModel";
-import {imageToInfo} from "../common.js";
-// TODO: remove fallback so default isn't included in bundle for SDK users that have their custom tileClassForEntry
-// this is a breaking SDK change though to make this option mandatory
-import {tileClassForEntry as defaultTileClassForEntry} from "./timeline/tiles/index";
-import {RoomStatus} from "../../../matrix/room/common";
+import {avatarInitials, getIdentifierColorNumber, getAvatarHttpUrl} from "../../avatar.js";
+import {tilesCreator} from "./timeline/tilesCreator.js";
+import {ViewModel} from "../../ViewModel.js";
 
 export class RoomViewModel extends ViewModel {
     constructor(options) {
         super(options);
-        const {room, tileClassForEntry} = options;
+        const {room} = options;
         this._room = room;
         this._timelineVM = null;
-        this._tileClassForEntry = tileClassForEntry ?? defaultTileClassForEntry;
-        this._tileOptions = undefined;
+        this._tilesCreator = null;
         this._onRoomChange = this._onRoomChange.bind(this);
         this._timelineError = null;
         this._sendError = null;
         this._composerVM = null;
         if (room.isArchived) {
-            this._composerVM = this.track(new ArchivedViewModel(this.childOptions({archivedRoom: room})));
+            this._composerVM = new ArchivedViewModel(this.childOptions({archivedRoom: room}));
         } else {
-            this._recreateComposerOnPowerLevelChange();
+            this._composerVM = new ComposerViewModel(this);
         }
         this._clearUnreadTimout = null;
         this._closeUrl = this.urlCreator.urlUntilSegment("session");
@@ -50,13 +45,12 @@ export class RoomViewModel extends ViewModel {
         this._room.on("change", this._onRoomChange);
         try {
             const timeline = await this._room.openTimeline();
-            this._tileOptions = this.childOptions({
+            this._tilesCreator = tilesCreator(this.childOptions({
                 roomVM: this,
                 timeline,
-                tileClassForEntry: this._tileClassForEntry,
-            });
+            }));
             this._timelineVM = this.track(new TimelineViewModel(this.childOptions({
-                tileOptions: this._tileOptions,
+                tilesCreator: this._tilesCreator,
                 timeline,
             })));
             this.emitChange("timelineViewModel");
@@ -68,30 +62,6 @@ export class RoomViewModel extends ViewModel {
         this._clearUnreadAfterDelay();
     }
 
-    async _recreateComposerOnPowerLevelChange() {
-        const powerLevelObservable = await this._room.observePowerLevels();
-        const canSendMessage = () => powerLevelObservable.get().canSendType("m.room.message");
-        let oldCanSendMessage = canSendMessage();
-        const recreateComposer = newCanSendMessage => {
-            this._composerVM = this.disposeTracked(this._composerVM);
-            if (newCanSendMessage) {
-                this._composerVM = this.track(new ComposerViewModel(this));
-            }
-            else {
-                this._composerVM = this.track(new LowerPowerLevelViewModel(this.childOptions()));
-            }
-            this.emitChange("powerLevelObservable")
-        };
-        this.track(powerLevelObservable.subscribe(() => {
-            const newCanSendMessage = canSendMessage();
-            if (oldCanSendMessage !== newCanSendMessage) {
-                recreateComposer(newCanSendMessage);
-                oldCanSendMessage = newCanSendMessage;
-            }
-        }));
-        recreateComposer(oldCanSendMessage);
-    }
-
     async _clearUnreadAfterDelay() {
         if (this._room.isArchived || this._clearUnreadTimout) {
             return;
@@ -127,8 +97,9 @@ export class RoomViewModel extends ViewModel {
     // room doesn't tell us yet which fields changed,
     // so emit all fields originating from summary
     _onRoomChange() {
-        // propagate the update to the child view models so it's bindings can update based on room changes
+        if (this._room.isArchived) {
             this._composerVM.emitChange();
+        }
         this.emitChange();
     }
 
@@ -190,98 +161,22 @@ export class RoomViewModel extends ViewModel {
     }
 
     _createTile(entry) {
-        if (this._tileOptions) {
-            const Tile = this._tileOptions.tileClassForEntry(entry);
-            if (Tile) {
-                return new Tile(entry, this._tileOptions);
-            }
-        }
-    }
-    
-    async _processCommandJoin(roomName) {
-        try {
-            const roomId = await this._options.client.session.joinRoom(roomName);
-            const roomStatusObserver = await this._options.client.session.observeRoomStatus(roomId);
-            await roomStatusObserver.waitFor(status => status === RoomStatus.Joined);
-            this.navigation.push("room", roomId);
-        } catch (err) {
-            let exc;
-            if ((err.statusCode ?? err.status) === 400) {
-                exc = new Error(`/join : '${roomName}' was not legal room ID or room alias`);
-            } else if ((err.statusCode ?? err.status) === 404 || (err.statusCode ?? err.status) === 502 || err.message == "Internal Server Error") {
-                exc = new Error(`/join : room '${roomName}' not found`);
-            } else if ((err.statusCode ?? err.status) === 403) {
-                exc = new Error(`/join : you're not invited to join '${roomName}'`);
-            } else {
-                exc = err;
-            }
-            this._sendError = exc;
-            this._timelineError = null;
-            this.emitChange("error");
-        }
-    } 
-
-    async _processCommand (message) {
-        let msgtype;
-        const [commandName, ...args] = message.substring(1).split(" ");
-        switch (commandName) {
-            case "me":
-                message = args.join(" ");
-                msgtype = "m.emote";
-                break;
-            case "join":
-                if (args.length === 1) {
-                    const roomName = args[0];
-                    await this._processCommandJoin(roomName);
-                } else {
-                    this._sendError = new Error("join syntax: /join <room-id>");
-                    this._timelineError = null;
-                    this.emitChange("error");
-                }
-                break;
-            case "shrug":
-                message = "¯\\_(ツ)_/¯ " + args.join(" ");
-                msgtype = "m.text";
-                break;
-            case "tableflip":
-                message = "(╯°□°）╯︵ ┻━┻ " + args.join(" ");
-                msgtype = "m.text";
-                break;
-            case "unflip":
-                message = "┬──┬ ノ( ゜-゜ノ) " + args.join(" ");
-                msgtype = "m.text";
-                break;
-            case "lenny":
-                message = "( ͡° ͜ʖ ͡°) " + args.join(" ");
-                msgtype = "m.text";
-                break;
-            default:
-                this._sendError = new Error(`no command name "${commandName}". To send the message instead of executing, please type "/${message}"`);
-                this._timelineError = null;
-                this.emitChange("error");
-                message = undefined;
-       }
-       return {type: msgtype, message: message};
+        return this._tilesCreator(entry);
     }
     
     async _sendMessage(message, replyingTo) {
         if (!this._room.isArchived && message) {
-            let messinfo = {type : "m.text", message : message};
-            if (message.startsWith("//")) {
-                messinfo.message = message.substring(1).trim();
-            } else if (message.startsWith("/")) {
-                messinfo = await this._processCommand(message);
-            }
             try {
-                const msgtype = messinfo.type;
-                const message = messinfo.message;
-                if (msgtype && message) {
+                let msgtype = "m.text";
+                if (message.startsWith("/me ")) {
+                    message = message.substr(4).trim();
+                    msgtype = "m.emote";
+                }
                 if (replyingTo) {
                     await replyingTo.reply(msgtype, message);
                 } else {
                     await this._room.sendEvent("m.room.message", {msgtype, body: message});
                 }
-                }
             } catch (err) {
                 console.error(`room.sendMessage(): ${err.message}:\n${err.stack}`);
                 this._sendError = err;
@@ -379,9 +274,7 @@ export class RoomViewModel extends ViewModel {
             let image = await this.platform.loadImage(file.blob);
             const limit = await this.platform.settingsStorage.getInt("sentImageSizeLimit");
             if (limit && image.maxDimension > limit) {
-                const scaledImage = await image.scale(limit);
-                image.dispose();
-                image = scaledImage;
+                image = await image.scale(limit);
             }
             const content = {
                 body: file.name,
@@ -425,11 +318,15 @@ export class RoomViewModel extends ViewModel {
             this._composerVM.setReplyingTo(entry);
         }
     }
-    
-    dismissError() {
-        this._sendError = null;
-        this.emitChange("error");
 }
+
+function imageToInfo(image) {
+    return {
+        w: image.width,
+        h: image.height,
+        mimetype: image.blob.mimeType,
+        size: image.blob.size
+    };
 }
 
 function videoToInfo(video) {
@@ -463,16 +360,6 @@ class ArchivedViewModel extends ViewModel {
     }
 
     get kind() {
-        return "disabled";
-    }
-}
-
-class LowerPowerLevelViewModel extends ViewModel {
-    get description() {
-        return this.i18n`You do not have the powerlevel necessary to send messages`;
-    }
-
-    get kind() {
-        return "disabled";
+        return "archived";
     }
 }

src/domain/session/room/UnknownRoomViewModel.js

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ViewModel} from "../../ViewModel";
+import {ViewModel} from "../../ViewModel.js";
 
 export class UnknownRoomViewModel extends ViewModel {
     constructor(options) {

src/domain/session/room/timeline/MessageBody.js

@@ -1,5 +1,5 @@
 import { linkify } from "./linkify/linkify.js";
-import { getIdentifierColorNumber, avatarInitials } from "../../../avatar";
+import { getIdentifierColorNumber, avatarInitials } from "../../../avatar.js";
 
 /**
  * Parse text into parts such as newline, links and text.

src/domain/session/room/timeline/ReactionsViewModel.js

@@ -13,7 +13,7 @@ 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 {ObservableMap} from "../../../../observable/map/ObservableMap";
+import {ObservableMap} from "../../../../observable/map/ObservableMap.js";
 
 export class ReactionsViewModel {
     constructor(parentTile) {
@@ -222,10 +222,10 @@ export function tests() {
         };
         const tiles = new MappedList(timeline.entries, entry => {
             if (entry.eventType === "m.room.message") {
-                return new BaseMessageTile(entry, {roomVM: {room}, timeline, platform: {logger}});
+                return new BaseMessageTile({entry, roomVM: {room}, timeline, platform: {logger}});
             }
             return null;
-        }, (tile, params, entry) => tile?.updateEntry(entry, params, function () {}));
+        }, (tile, params, entry) => tile?.updateEntry(entry, params));
         return tiles;
     }
 
@@ -254,14 +254,8 @@ export function tests() {
             // 2. setup queue & timeline
             const queue = new SendQueue({roomId, storage, hsApi: new MockHomeServer().api});
             const powerLevelsObservable = new ObservableValue(new PowerLevels({ ownUserId: alice, membership: "join" }));
-            const timeline = new Timeline({
-                roomId,
-                storage,
-                fragmentIdComparer,
-                clock: new MockClock(),
-                pendingEvents: queue.pendingEvents,
-                powerLevelsObservable
-            });
+            const timeline = new Timeline({roomId, storage, fragmentIdComparer,
+                clock: new MockClock(), pendingEvents: queue.pendingEvents, powerLevelsObservable});
             // 3. load the timeline, which will load the message with the reaction
             await timeline.load(new User(alice), "join", new NullLogItem());
             const tiles = mapMessageEntriesToBaseMessageTile(timeline, queue);

src/domain/session/room/timeline/TilesCollection.js

@@ -18,27 +18,20 @@ import {BaseObservableList} from "../../../../observable/list/BaseObservableList
 import {sortedIndex} from "../../../../utils/sortedIndex";
 
 // maps 1..n entries to 0..1 tile. Entries are what is stored in the timeline, either an event or fragmentboundary
-// for now, tileClassForEntry should be stable in whether it returns a tile or not.
+// for now, tileCreator should be stable in whether it returns a tile or not.
 // e.g. the decision to create a tile or not should be based on properties
 // not updated later on (e.g. event type)
 // also see big comment in onUpdate
 export class TilesCollection extends BaseObservableList {
-    constructor(entries, tileOptions) {
+    constructor(entries, tileCreator) {
         super();
         this._entries = entries;
         this._tiles = null;
         this._entrySubscription = null;
-        this._tileOptions = tileOptions;
+        this._tileCreator = tileCreator;
         this._emitSpontanousUpdate = this._emitSpontanousUpdate.bind(this);
     }
 
-    _createTile(entry) {
-        const Tile = this._tileOptions.tileClassForEntry(entry);
-        if (Tile) {
-            return new Tile(entry, this._tileOptions);
-        }
-    }
-
     _emitSpontanousUpdate(tile, params) {
         const entry = tile.lowerEntry;
         const tileIdx = this._findTileIdx(entry);
@@ -55,7 +48,7 @@ export class TilesCollection extends BaseObservableList {
         let currentTile = null;
         for (let entry of this._entries) {
             if (!currentTile || !currentTile.tryIncludeEntry(entry)) {
-                currentTile = this._createTile(entry);
+                currentTile = this._tileCreator(entry);
                 if (currentTile) {
                     this._tiles.push(currentTile);
                 }
@@ -128,7 +121,7 @@ export class TilesCollection extends BaseObservableList {
             return;
         }
 
-        const newTile = this._createTile(entry);
+        const newTile = this._tileCreator(entry);
         if (newTile) {
             if (prevTile) {
                 prevTile.updateNextSibling(newTile);
@@ -159,7 +152,7 @@ export class TilesCollection extends BaseObservableList {
         if (tile) {
             const action = tile.updateEntry(entry, params);
             if (action.shouldReplace) {
-                const newTile = this._createTile(entry);
+                const newTile = this._tileCreator(entry);
                 if (newTile) {
                     this._replaceTile(tileIdx, tile, newTile, action.updateParams);
                     newTile.setUpdateEmit(this._emitSpontanousUpdate);
@@ -310,10 +303,7 @@ export function tests() {
                 }
             }
             const entries = new ObservableArray([{n: 5}, {n: 10}]);
-            const tileOptions = {
-                tileClassForEntry: () => UpdateOnSiblingTile,
-            };
-            const tiles = new TilesCollection(entries, tileOptions);
+            const tiles = new TilesCollection(entries, entry => new UpdateOnSiblingTile(entry));
             let receivedAdd = false;
             tiles.subscribe({
                 onAdd(idx, tile) {
@@ -336,10 +326,7 @@ export function tests() {
                 }
             }
             const entries = new ObservableArray([{n: 5}, {n: 10}, {n: 15}]);
-            const tileOptions = {
-                tileClassForEntry: () => UpdateOnSiblingTile,
-            };
-            const tiles = new TilesCollection(entries, tileOptions);
+            const tiles = new TilesCollection(entries, entry => new UpdateOnSiblingTile(entry));
             const events = [];
             tiles.subscribe({
                 onUpdate(idx, tile) {

src/domain/session/room/timeline/TimelineViewModel.js

@@ -32,14 +32,14 @@ to the room timeline, which unload entries from memory.
 when loading, it just reads events from a sortkey backwards or forwards...
 */
 import {TilesCollection} from "./TilesCollection.js";
-import {ViewModel} from "../../../ViewModel";
+import {ViewModel} from "../../../ViewModel.js";
 
 export class TimelineViewModel extends ViewModel {
     constructor(options) {
         super(options);
-        const {timeline, tileOptions} = options;
+        const {timeline, tilesCreator} = options;
         this._timeline = this.track(timeline);
-        this._tiles = new TilesCollection(timeline.entries, tileOptions);
+        this._tiles = new TilesCollection(timeline.entries, tilesCreator);
         this._startTile = null;
         this._endTile = null;
         this._topLoadingPromise = null;

src/domain/session/room/timeline/deserialize.js

@@ -34,7 +34,8 @@ const baseUrl = 'https://matrix.to';
 const linkPrefix = `${baseUrl}/#/`;
 
 class Deserializer {
-    constructor(result, mediaRepository) {
+    constructor(result, mediaRepository, allowReplies) {
+        this.allowReplies = allowReplies;
         this.result = result;
         this.mediaRepository = mediaRepository;
     }
@@ -288,7 +289,7 @@ class Deserializer {
     }
 
     _isAllowedNode(node) {
-        return !this._ensureElement(node, "MX-REPLY");
+        return this.allowReplies || !this._ensureElement(node, "MX-REPLY");
     }
 
     _parseInlineNodes(nodes, into) {
@@ -344,9 +345,9 @@ class Deserializer {
     }
 }
 
-export function parseHTMLBody(platform, mediaRepository, html) {
+export function parseHTMLBody(platform, mediaRepository, allowReplies, html) {
     const parseResult = platform.parseHTML(html);
-    const deserializer = new Deserializer(parseResult, mediaRepository);
+    const deserializer = new Deserializer(parseResult, mediaRepository, allowReplies);
     const parts = deserializer.parseAnyNodes(parseResult.rootNodes);
     return new MessageBody(html, parts);
 }
@@ -400,8 +401,8 @@ export async function tests() {
         parseHTML: (html) => new HTMLParseResult(parse(html))
     };
 
-    function test(assert, input, output) {
-        assert.deepEqual(parseHTMLBody(platform, null, input), new MessageBody(input, output));
+    function test(assert, input, output, replies=true) {
+        assert.deepEqual(parseHTMLBody(platform, null, replies, input), new MessageBody(input, output));
     }
 
     return {
@@ -499,14 +500,23 @@ export async function tests() {
             ];
             test(assert, input, output);
         },
-        "Reply fallback is always stripped": assert => {
+        "Replies are inserted when allowed": assert => {
+            const input = 'Hello, <em><mx-reply>World</mx-reply></em>!';
+            const output = [
+                new TextPart('Hello, '),
+                new FormatPart("em", [new TextPart('World')]),
+                new TextPart('!'),
+            ];
+            test(assert, input, output);
+        },
+        "Replies are stripped when not allowed": assert => {
             const input = 'Hello, <em><mx-reply>World</mx-reply></em>!';
             const output = [
                 new TextPart('Hello, '),
                 new FormatPart("em", []),
                 new TextPart('!'),
             ];
-            assert.deepEqual(parseHTMLBody(platform, null, input), new MessageBody(input, output));
+            test(assert, input, output, false);
         }
         /* Doesnt work: HTML library doesn't handle <pre><code> properly.
         "Text with code block": assert => {

src/domain/session/room/timeline/tiles/BaseMediaTile.js

@@ -21,35 +21,14 @@ const MAX_HEIGHT = 300;
 const MAX_WIDTH = 400;
 
 export class BaseMediaTile extends BaseMessageTile {
-    constructor(entry, options) {
-        super(entry, options);
+    constructor(options) {
+        super(options);
         this._decryptedThumbnail = null;
         this._decryptedFile = null;
-        this._isVisible = false;
         this._error = null;
-        this._downloading = false;
-        this._downloadError = null;
+        if (!this.isPending) {
+            this._tryLoadEncryptedThumbnail();
         }
-
-    async downloadMedia() {
-        if (this._downloading || this.isPending) {
-            return;
-        }
-        const content = this._getContent();
-        const filename = content.body;
-        this._downloading = true;
-        this.emitChange("status");
-        let blob;
-        try {
-            blob = await this._mediaRepository.downloadAttachment(content);
-            this.platform.saveFileAs(blob, filename);
-        } catch (err) {
-            this._downloadError = err;
-        } finally {
-            blob?.dispose();
-            this._downloading = false;
-        }
-        this.emitChange("status");
     }
 
     get isUploading() {
@@ -61,7 +40,7 @@ export class BaseMediaTile extends BaseMessageTile {
         return pendingEvent && Math.round((pendingEvent.attachmentsSentBytes / pendingEvent.attachmentsTotalBytes) * 100);
     }
 
-    get status() {
+    get sendStatus() {
         const {pendingEvent} = this._entry;
         switch (pendingEvent?.status) {
             case SendStatus.Waiting:
@@ -76,20 +55,11 @@ export class BaseMediaTile extends BaseMessageTile {
             case SendStatus.Error:
                 return this.i18n`Error: ${pendingEvent.error.message}`;
             default:
-                if (this._downloadError) {
-                    return `Download failed`;
-                }
-                if (this._downloading) {
-                    return this.i18n`Downloading…`;
-                }
                 return "";
         }
     }
 
     get thumbnailUrl() {
-        if (!this._isVisible) {
-            return "";
-        }
         if (this._decryptedThumbnail) {
             return this._decryptedThumbnail.url;
         } else {
@@ -115,15 +85,6 @@ export class BaseMediaTile extends BaseMessageTile {
         return "";
     }
 
-    notifyVisible() {
-        super.notifyVisible();
-        this._isVisible = true;
-        this.emitChange("thumbnailUrl");
-        if (!this.isPending) {
-            this._tryLoadEncryptedThumbnail();
-        }
-    }
-
     get width() {
         const info = this._getContent()?.info;
         return Math.round(info?.w * this._scaleFactor());

src/domain/session/room/timeline/tiles/BaseMessageTile.js

@@ -16,39 +16,23 @@ limitations under the License.
 
 import {SimpleTile} from "./SimpleTile.js";
 import {ReactionsViewModel} from "../ReactionsViewModel.js";
-import {getIdentifierColorNumber, avatarInitials, getAvatarHttpUrl} from "../../../../avatar";
+import {getIdentifierColorNumber, avatarInitials, getAvatarHttpUrl} from "../../../../avatar.js";
 
 export class BaseMessageTile extends SimpleTile {
-    constructor(entry, options) {
-        super(entry, options);
+    constructor(options) {
+        super(options);
         this._date = this._entry.timestamp ? new Date(this._entry.timestamp) : null;
         this._isContinuation = false;
         this._reactions = null;
-        this._replyTile = null;
         if (this._entry.annotations || this._entry.pendingAnnotations) {
             this._updateReactions();
         }
-        this._updateReplyTileIfNeeded(undefined);
     }
 
-    notifyVisible() {
-        super.notifyVisible();
-        this._replyTile?.notifyVisible();
-    }
-
-
     get _mediaRepository() {
         return this._room.mediaRepository;
     }
 
-    get permaLink() {
-        return `https://matrix.to/#/${encodeURIComponent(this._room.id)}/${encodeURIComponent(this._entry.id)}`;
-    }
-
-    get senderProfileLink() {
-        return `https://matrix.to/#/${encodeURIComponent(this.sender)}`;
-    }
-
     get displayName() {
         return this._entry.displayName || this.sender;
     }
@@ -98,10 +82,6 @@ export class BaseMessageTile extends SimpleTile {
         return this._entry.isUnverified;
     }
 
-    get isReply() {
-        return this._entry.isReply;
-    }
-
     _getContent() {
         return this._entry.content;
     }
@@ -127,29 +107,9 @@ export class BaseMessageTile extends SimpleTile {
         if (action.shouldUpdate) {
             this._updateReactions();
         }
-        this._updateReplyTileIfNeeded(param);
         return action;
     }
 
-    _updateReplyTileIfNeeded(param) {
-        const replyEntry = this._entry.contextEntry;
-        if (replyEntry) {
-            // this is an update to contextEntry used for replyPreview
-            const action = this._replyTile?.updateEntry(replyEntry, param);
-            if (action?.shouldReplace || !this._replyTile) {
-                this.disposeTracked(this._replyTile);
-                const tileClassForEntry = this._options.tileClassForEntry;
-                const ReplyTile = tileClassForEntry(replyEntry);
-                if (ReplyTile) {
-                    this._replyTile = new ReplyTile(replyEntry, this._options);
-                }
-            }
-            if(action?.shouldUpdate) {
-                this._replyTile?.emitChange();
-            }
-        }
-    }
-
     startReply() {
         this._roomVM.startReply(this._entry);
     }
@@ -242,11 +202,4 @@ export class BaseMessageTile extends SimpleTile {
             this._reactions.update(annotations, pendingAnnotations);
         }
     }
-
-    get replyTile() {
-        if (!this._entry.contextEventId) {
-            return null;
-        }
-        return this._replyTile;
-    }
 }

src/domain/session/room/timeline/tiles/BaseTextTile.js

@@ -21,8 +21,8 @@ import {createEnum} from "../../../../../utils/enum";
 export const BodyFormat = createEnum("Plain", "Html");
 
 export class BaseTextTile extends BaseMessageTile {
-    constructor(entry, options) {
-        super(entry, options);
+    constructor(options) {
+        super(options);
         this._messageBody = null;
         this._format = null
     }
@@ -56,5 +56,4 @@ export class BaseTextTile extends BaseMessageTile {
         }
         return this._messageBody;
     }
-
 }

src/domain/session/room/timeline/tiles/FileTile.js

@@ -20,8 +20,8 @@ import {formatSize} from "../../../../../utils/formatSize";
 import {SendStatus} from "../../../../../matrix/room/sending/PendingEvent.js";
 
 export class FileTile extends BaseMessageTile {
-    constructor(entry, options) {
-        super(entry, options);
+    constructor(options) {
+        super(options);
         this._downloadError = null;
         this._downloading = false;
     }

src/domain/session/room/timeline/tiles/GapTile.js

@@ -18,8 +18,8 @@ import {SimpleTile} from "./SimpleTile.js";
 import {UpdateAction} from "../UpdateAction.js";
 
 export class GapTile extends SimpleTile {
-    constructor(entry, options) {
-        super(entry, options);
+    constructor(options) {
+        super(options);
         this._loading = false;
         this._error = null;
         this._isAtTop = true;
@@ -125,7 +125,7 @@ export function tests() {
                     tile.updateEntry(newEntry);
                 }
             };
-            const tile = new GapTile(new FragmentBoundaryEntry(fragment, true), {roomVM: {room}});
+            const tile = new GapTile({entry: new FragmentBoundaryEntry(fragment, true), roomVM: {room}});
             await tile.fill();
             await tile.fill();
             await tile.fill();

src/domain/session/room/timeline/tiles/ImageTile.js

@@ -18,8 +18,8 @@ limitations under the License.
 import {BaseMediaTile} from "./BaseMediaTile.js";
 
 export class ImageTile extends BaseMediaTile {
-    constructor(entry, options) {
-        super(entry, options);
+    constructor(options) {
+        super(options);
         this._lightboxUrl = this.urlCreator.urlForSegments([
             // ensure the right room is active if in grid view
             this.navigation.segment("room", this._room.id),

src/domain/session/room/timeline/tiles/LocationTile.js

@@ -16,43 +16,21 @@ limitations under the License.
 
 import {BaseMessageTile} from "./BaseMessageTile.js";
 
+/*
+map urls:
+apple:   https://developer.apple.com/library/archive/featuredarticles/iPhoneURLScheme_Reference/MapLinks/MapLinks.html
+android: https://developers.google.com/maps/documentation/urls/guide
+wp:      maps:49.275267 -122.988617
+https://www.habaneroconsulting.com/stories/insights/2011/opening-native-map-apps-from-the-mobile-browser
+*/
 export class LocationTile extends BaseMessageTile {
-    get shape() {
-        return "location";
-    }
-
     get mapsLink() {
-        try {
-            const url = new URL(this._getContent().geo_uri);
-            if (url.protocol !== "geo:") {
-                return "";
-            }
-            const [locationStr, ...namedParams] = url.pathname.split(";");
-            const [latStr, longStr] = locationStr.split(",");
-            const lat = parseFloat(latStr);
-            const long = parseFloat(longStr);
-            let uncertainty;
-            for (const namedParam of namedParams) {
-                const [name, value] = namedParam.split("=");
-                if (name === "u") {
-                    uncertainty = parseFloat(value);
-                }
-            }
-            if (this.platform.isIOS) {
-                return `http://maps.apple.com/?ll=${lat},${long}`;
-            } else {
-                let uri = `geo:${lat},${long}`;
-                if (uncertainty) {
-                    uri = uri + `;u=${uncertainty}`;
-                }
-                return uri;
-            }
-        } catch {
-            return "";
-        }
+        const geoUri = this._getContent().geo_uri;
+        const [lat, long] = geoUri.split(":")[1].split(",");
+        return `maps:${lat} ${long}`;
     }
 
     get label() {
-        return this.i18n`${this.displayName} sent their location`;
+        return `${this.sender} sent their location, click to see it in maps.`;
     }
 }

src/domain/session/room/timeline/tiles/RoomMemberTile.js

@@ -66,25 +66,23 @@ export class RoomMemberTile extends SimpleTile {
 export function tests() {
     return {
         "user removes display name": (assert) => {
-            const tile = new RoomMemberTile(
-                {
+            const tile = new RoomMemberTile({
+                entry: {
                     prevContent: {displayname: "foo", membership: "join"},
                     content: {membership: "join"},
                     stateKey: "foo@bar.com",
                 },
-                {}
-            );
+            });
             assert.strictEqual(tile.announcement, "foo@bar.com removed their name (foo)");
         },
         "user without display name sets a new display name": (assert) => {
-            const tile = new RoomMemberTile(
-                {
+            const tile = new RoomMemberTile({
+                entry: {
                     prevContent: {membership: "join"},
                     content: {displayname: "foo", membership: "join" },
                     stateKey: "foo@bar.com",
                 },
-                {}
-            );
+            });
             assert.strictEqual(tile.announcement, "foo@bar.com changed their name to foo");
         },
     };

src/domain/session/room/timeline/tiles/SimpleTile.js

@@ -15,14 +15,13 @@ limitations under the License.
 */
 
 import {UpdateAction} from "../UpdateAction.js";
-import {ViewModel} from "../../../../ViewModel";
+import {ViewModel} from "../../../../ViewModel.js";
 import {SendStatus} from "../../../../../matrix/room/sending/PendingEvent.js";
 
 export class SimpleTile extends ViewModel {
-    constructor(entry, options) {
+    constructor(options) {
         super(options);
-        this._entry = entry;
-        this._emitUpdate = undefined;
+        this._entry = options.entry;
     }
     // view model props for all subclasses
     // hmmm, could also do instanceof ... ?
@@ -45,10 +44,6 @@ export class SimpleTile extends ViewModel {
         return this._entry.asEventKey();
     }
 
-    get eventId() {
-        return this._entry.id;
-    }
-
     get isPending() {
         return this._entry.isPending;
     }
@@ -68,20 +63,16 @@ export class SimpleTile extends ViewModel {
 
     // TilesCollection contract below
     setUpdateEmit(emitUpdate) {
-        this._emitUpdate = emitUpdate;
-    }
-
-    /** overrides the emitChange in ViewModel to also emit the update over the tiles collection */
-    emitChange(changedProps) {
-        if (this._emitUpdate) {
+        this.updateOptions({emitChange: paramName => {
             // it can happen that after some network call
             // we switched away from the room and the response
             // comes in, triggering an emitChange in a tile that
             // has been disposed already (and hence the change
             // callback has been cleared by dispose) We should just ignore this.
-            this._emitUpdate(this, changedProps);
+            if (emitUpdate) {
+                emitUpdate(this, paramName);
             }
-        super.emitChange(changedProps);
+        }});
     }
 
     get upperEntry() {

src/domain/session/room/timeline/tiles/TextTile.js

@@ -50,7 +50,7 @@ export class TextTile extends BaseTextTile {
     _parseBody(body, format) {
         let messageBody;
         if (format === BodyFormat.Html) {
-            messageBody = parseHTMLBody(this.platform, this._mediaRepository, body);
+            messageBody = parseHTMLBody(this.platform, this._mediaRepository, this._entry.isReply, body);
         } else {
             messageBody = parsePlainBody(body);
         }

src/domain/session/room/timeline/tiles/index.ts

@@ -1,94 +0,0 @@
-/*
-Copyright 2020 Bruno Windels <bruno@windels.cloud>
-
-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 {GapTile} from "./GapTile.js";
-import {TextTile} from "./TextTile.js";
-import {RedactedTile} from "./RedactedTile.js";
-import {ImageTile} from "./ImageTile.js";
-import {VideoTile} from "./VideoTile.js";
-import {FileTile} from "./FileTile.js";
-import {LocationTile} from "./LocationTile.js";
-import {RoomNameTile} from "./RoomNameTile.js";
-import {RoomMemberTile} from "./RoomMemberTile.js";
-import {EncryptedEventTile} from "./EncryptedEventTile.js";
-import {EncryptionEnabledTile} from "./EncryptionEnabledTile.js";
-import {MissingAttachmentTile} from "./MissingAttachmentTile.js";
-
-import type {SimpleTile} from "./SimpleTile.js";
-import type {Room} from "../../../../../matrix/room/Room";
-import type {Timeline} from "../../../../../matrix/room/timeline/Timeline";
-import type {FragmentBoundaryEntry} from "../../../../../matrix/room/timeline/entries/FragmentBoundaryEntry";
-import type {EventEntry} from "../../../../../matrix/room/timeline/entries/EventEntry";
-import type {PendingEventEntry} from "../../../../../matrix/room/timeline/entries/PendingEventEntry";
-import type {Options as ViewModelOptions} from "../../../../ViewModel";
-
-export type TimelineEntry = FragmentBoundaryEntry | EventEntry | PendingEventEntry;
-export type TileClassForEntryFn = (entry: TimelineEntry) => TileConstructor | undefined;
-export type Options = ViewModelOptions & {
-    room: Room,
-    timeline: Timeline
-    tileClassForEntry: TileClassForEntryFn;
-};
-export type TileConstructor = new (entry: TimelineEntry, options: Options) => SimpleTile;
-
-export function tileClassForEntry(entry: TimelineEntry): TileConstructor | undefined {
-    if (entry.isGap) {
-        return GapTile;
-    } else if (entry.isPending && entry.pendingEvent.isMissingAttachments) {
-        return MissingAttachmentTile;
-    } else if (entry.eventType) {
-        switch (entry.eventType) {
-            case "m.room.message": {
-                if (entry.isRedacted) {
-                    return RedactedTile;
-                }
-                const content = entry.content;
-                const msgtype = content && content.msgtype;
-                switch (msgtype) {
-                    case "m.text":
-                    case "m.notice":
-                    case "m.emote":
-                        return TextTile;
-                    case "m.image":
-                        return ImageTile;
-                    case "m.video":
-                        return VideoTile;
-                    case "m.file":
-                        return FileTile;
-                    case "m.location":
-                        return LocationTile;
-                    default:
-                        // unknown msgtype not rendered
-                        return undefined;
-                }
-            }
-            case "m.room.name":
-                return RoomNameTile;
-            case "m.room.member":
-                return RoomMemberTile;
-            case "m.room.encrypted":
-                if (entry.isRedacted) {
-                    return RedactedTile;
-                }
-                return EncryptedEventTile;
-            case "m.room.encryption":
-                return EncryptionEnabledTile;
-            default:
-                // unknown type not rendered
-                return undefined;
-        }
-    }
-}

src/domain/session/room/timeline/tilesCreator.js

@@ -0,0 +1,80 @@
+/*
+Copyright 2020 Bruno Windels <bruno@windels.cloud>
+
+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 {GapTile} from "./tiles/GapTile.js";
+import {TextTile} from "./tiles/TextTile.js";
+import {RedactedTile} from "./tiles/RedactedTile.js";
+import {ImageTile} from "./tiles/ImageTile.js";
+import {VideoTile} from "./tiles/VideoTile.js";
+import {FileTile} from "./tiles/FileTile.js";
+import {LocationTile} from "./tiles/LocationTile.js";
+import {RoomNameTile} from "./tiles/RoomNameTile.js";
+import {RoomMemberTile} from "./tiles/RoomMemberTile.js";
+import {EncryptedEventTile} from "./tiles/EncryptedEventTile.js";
+import {EncryptionEnabledTile} from "./tiles/EncryptionEnabledTile.js";
+import {MissingAttachmentTile} from "./tiles/MissingAttachmentTile.js";
+
+export function tilesCreator(baseOptions) {
+    return function tilesCreator(entry, emitUpdate) {
+        const options = Object.assign({entry, emitUpdate}, baseOptions);
+        if (entry.isGap) {
+            return new GapTile(options);
+        } else if (entry.isPending && entry.pendingEvent.isMissingAttachments) {
+            return new MissingAttachmentTile(options);
+        } else if (entry.eventType) {
+            switch (entry.eventType) {
+                case "m.room.message": {
+                    if (entry.isRedacted) {
+                        return new RedactedTile(options);
+                    }
+                    const content = entry.content;
+                    const msgtype = content && content.msgtype;
+                    switch (msgtype) {
+                        case "m.text":
+                        case "m.notice":
+                        case "m.emote":
+                            return new TextTile(options);
+                        case "m.image":
+                            return new ImageTile(options);
+                        case "m.video":
+                            return new VideoTile(options);
+                        case "m.file":
+                            return new FileTile(options);
+                        case "m.location":
+                            return new LocationTile(options);
+                        default:
+                            // unknown msgtype not rendered
+                            return null;
+                    }
+                }
+                case "m.room.name":
+                    return new RoomNameTile(options);
+                case "m.room.member":
+                    return new RoomMemberTile(options);
+                case "m.room.encrypted":
+                    if (entry.isRedacted) {
+                        return new RedactedTile(options);
+                    }
+                    return new EncryptedEventTile(options);
+                case "m.room.encryption":
+                    return new EncryptionEnabledTile(options);
+                default:
+                    // unknown type not rendered
+                    return null;
+            }
+        }
+    }   
+}

src/domain/session/settings/SessionBackupViewModel.js

@@ -14,14 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {ViewModel} from "../../ViewModel";
-import {KeyType} from "../../../matrix/ssss/index";
+import {ViewModel} from "../../ViewModel.js";
+import {KeyType} from "../../../matrix/ssss/index.js";
 import {createEnum} from "../../../utils/enum";
 
-export const Status = createEnum("Enabled", "SetupKey", "SetupPhrase", "Pending", "NewVersionAvailable"); 
-export const BackupWriteStatus = createEnum("Writing", "Stopped", "Done", "Pending"); 
+export const Status = createEnum("Enabled", "SetupKey", "SetupPhrase", "Pending"); 
 
-export class KeyBackupViewModel extends ViewModel {
+export class SessionBackupViewModel extends ViewModel {
     constructor(options) {
         super(options);
         this._session = options.session;
@@ -29,16 +28,8 @@ export class KeyBackupViewModel extends ViewModel {
         this._isBusy = false;
         this._dehydratedDeviceId = undefined;
         this._status = undefined;
-        this._backupOperation = this._session.keyBackup.flatMap(keyBackup => keyBackup.operationInProgress);
-        this._progress = this._backupOperation.flatMap(op => op.progress);
-        this.track(this._backupOperation.subscribe(() => {
-            // see if needsNewKey might be set
         this._reevaluateStatus();
-            this.emitChange("isBackingUp");
-        }));
-        this.track(this._progress.subscribe(() => this.emitChange("backupPercentage")));
-        this._reevaluateStatus();
-        this.track(this._session.keyBackup.subscribe(() => {
+        this.track(this._session.hasSecretStorageKey.subscribe(() => {
             if (this._reevaluateStatus()) {
                 this.emitChange("status");
             }
@@ -50,11 +41,11 @@ export class KeyBackupViewModel extends ViewModel {
             return false;
         }
         let status;
-        const keyBackup = this._session.keyBackup.get();
-        if (keyBackup) {
-            status = keyBackup.needsNewKey ? Status.NewVersionAvailable : Status.Enabled;
-        } else if (keyBackup === null) {
-            status = this.showPhraseSetup() ? Status.SetupPhrase : Status.SetupKey;
+        const hasSecretStorageKey = this._session.hasSecretStorageKey.get();
+        if (hasSecretStorageKey === true) {
+            status = this._session.sessionBackup ? Status.Enabled : Status.SetupKey;
+        } else if (hasSecretStorageKey === false) {
+            status = Status.SetupKey;
         } else {
             status = Status.Pending;
         }
@@ -68,7 +59,7 @@ export class KeyBackupViewModel extends ViewModel {
     }
 
     get purpose() {
-        return this.i18n`set up key backup`;
+        return this.i18n`set up session backup`;
     }
 
     offerDehydratedDeviceSetup() {
@@ -84,28 +75,7 @@ export class KeyBackupViewModel extends ViewModel {
     }
 
     get backupVersion() {
-        return this._session.keyBackup.get()?.version;
-    }
-
-    get backupWriteStatus() {
-        const keyBackup = this._session.keyBackup.get();
-        if (!keyBackup) {
-            return BackupWriteStatus.Pending;
-        } else if (keyBackup.hasStopped) {
-            return BackupWriteStatus.Stopped;
-        }
-        const operation = keyBackup.operationInProgress.get();
-        if (operation) {
-            return BackupWriteStatus.Writing;
-        } else if (keyBackup.hasBackedUpAllKeys) {
-            return BackupWriteStatus.Done;
-        } else {
-            return BackupWriteStatus.Pending;
-        }
-    }
-
-    get backupError() {
-        return this._session.keyBackup.get()?.error?.message;
+        return this._session.sessionBackup?.version;
     }
 
     get status() {
@@ -174,33 +144,4 @@ export class KeyBackupViewModel extends ViewModel {
             this.emitChange("");
         }
     }
-
-    get isBackingUp() {
-        return !!this._backupOperation.get();
 }
-
-    get backupPercentage() {
-        const progress = this._progress.get();
-        if (progress) {
-            return Math.round((progress.finished / progress.total) * 100);
-        }
-        return 0;
-    }
-
-    get backupInProgressLabel() {
-        const progress = this._progress.get();
-        if (progress) {
-            return this.i18n`${progress.finished} of ${progress.total}`;
-        }
-        return this.i18n`…`;
-    }
-
-    cancelBackup() {
-        this._backupOperation.get()?.abort();
-    }
-
-    startBackup() {
-        this._session.keyBackup.get()?.flush();
-    }
-}
-