Version 4.1.1

Revised and updated translation, which contains work from me and @harbons

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,6 +7,11 @@ assignees: ''
 
 ---
 
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
 **Describe the bug**
 A clear and concise description of what the bug is.
 
@@ -23,16 +28,6 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.

LICENSE.md

@@ -30,7 +30,7 @@ THE SOFTWARE.
 ## DownThemAll! uikit
 
 Copyright © 2016-2019 by Nils Maier
-The uikit libraries and assets are licened under the MIT license.
+The uikit libraries and assets are licensed under the MIT license.
 
 ## DownThemAll! interface (.html, .css)
 
@@ -41,7 +41,8 @@ Licensed under GPL2.0; see [LICENSE.gpl-2.0.txt](LICENSE.gpl-2.0.txt).
 ## DownThemAll! icons, icon-font and graphic assets
 
 Copyright (C) 2012-2019 by Nils Maier
-Licensed under Creative Commons Attribution-ShareAlike 4.0 International
+Licensed under Creative Commons Attribution-ShareAlike 4.0 International.
+
 The icon font contains icons from Font Awesome.
 
 See: https://creativecommons.org/licenses/by-sa/4.0/legalcode
@@ -54,21 +55,35 @@ Copyright © 2010-2019 by Nils Maier, Stefano Verna.
 The DownThemAll! name and logo cannot be used without explicit permission
 in any derivative work, except in credits and license-related notices.
 
-Using the DownThemAll! logo in personal non-distributed non-commerical
+Using the DownThemAll! logo in personal non-distributed non-commercial
 modifications of the software and forks is permitted without explicit
 permission.
 
+Distributing official DownThemAll! releases without any modifications is allowed without explicit permission.
+
 ## Font Awesome
 
 Copyright (C) 2016 by Dave Gandy
+
 License:   SIL ()
+
 Homepage:  http://fortawesome.github.com/Font-Awesome/
 
 ## webextension-polyfill
 
-Lcensed under the Mozilla Public License 2.0.
+Licensed under the Mozilla Public License 2.0.
 
 ## PSL (public-suffix-list)
 
 The list itself is licensed under the Mozilla Public License 2.0.
-The javascript library accessing it is licensed under the MIT license.
+The javascript library accessing it is licensed under the MIT license.
+
+## whatwg-mimetype
+
+Licensed under MIT
+
+
+## CDHeaderParser
+
+Licensed under MPL-2
+(c) 2017 Rob Wu <rob@robwu.nl> (https://robwu.nl)

Readme.md

@@ -1,12 +1,10 @@
-DownThemAll! WE
-===
+# DownThemAll! WE
 
 The DownThemAll! WebExtension.
 
 For those still on supported browser: [Non-WebExtension legacy code](https://github.com/downthemall/downthemall-legacy).
 
-About
----
+## About
 
 This is the WebExtension version of DownThemAll!, a complete re-development from scratch.
 Being a WebExtension it lacks a ton of features the original DownThemAll! had. Sorry, but there is no way around it since Mozilla decided to adopt WebExtensions as the *only* extension type and WebExtensions are extremely limited in what they can do.
@@ -23,19 +21,48 @@ But it is what it is...
 
 **What we *can* do and did do is bring the mass selection, organizing (renaming masks, etc) and queueing tools of DownThemAll! over to the WebExtension, so you can easily queue up hundreds or thousands files at once without the downloads going up in flames because the browser tried to download them all at once.**
 
+## Translations
+
+If you would like to help out translating DTA, please see our [translation guide](_locales/Readme.md).
+
+## Development
 
-Development
----
 
 You will want to `yarn` the development dependencies such as webpack first.
 
-Afterwards there is two important commands to run
+Afterwards, you will want to run`yarn watch`.
+This will run the webpack bundler in watch mode, transpiling the TypeScript to Javascript and updating bundles as you change the source.
 
-  * `yarn watch` - This will run the webpack bundler in watch mode, updating bundles as you change the source.
-  * `yarn webext` - This will run the WebExtension in a development profile using the [`web-ext` tool from mozilla](https://www.npmjs.com/package/web-ext) (which you need to install separately).
+Please note: You have to run `yarn watch` (at least once) as it builds the actual script bundles.
+
+### Firefox
+
+I recommend you install the [`web-ext`](https://www.npmjs.com/package/web-ext) tools from mozilla. It is not listed as a dependency by design at it causes problems with dependency resolution in yarn right now if installed in the same location as the rest of the dependencies.
+
+If you did, then running `yarn webext` (additionally to `yarn watch`) will run the WebExtension in a development profile. This will use the directory `../dtalite.p` to keep a development profile. You might need to create this directory before you use this command. Furthermore `yarn webext` will watch for changes to the sources and automatically reload the extension.
   
-Alternative, you can also `yarn build`, which then builds an *unsigned* zip that you can then install permanently in a browser that does not enforce signing (i.e. Nightly or the Unbranded Firefox).
+Alternative, you can also `yarn build`, which then builds an *unsigned* zip that you can then install permanently in a browser that does not enforce signing (i.e. Nightly or the Unbranded Firefox with the right about:config preferences).
 
-Before submitting patches, please make sure you run eslint, if this isn't done automatically, and eslint does not report any open issues. Code contributions should favor typescript code over javascript code. External dependencies that would ship with the final product (including all npm/yarn packages) should be kept to a bare minimum.
+### Chrome
 
-The code base is comparatively large for a WebExtension, with over 10K sloc of typescript and over 14K sloc total.
+You have to build the bundles first, of course.
+
+Then put your Chrome into Developement Mode on the Extensions page, and Load Unpacked the directory of your downthemall clone.
+
+### Patches
+
+Before submitting patches, please make sure you run eslint (if this isn't done automatically in your text editor/IDE), and eslint does not report any open issues. Code contributions should favor typescript code over javascript code. External dependencies that would ship with the final product (including all npm/yarn packages) should be kept to a bare minimum and need justification.
+
+Please submit your patches as Pull Requests, and rebase your commits onto the current `master` before submitting.
+
+### Code structure
+
+The code base is comparatively large for a WebExtension, with over 11K sloc of typescript.
+It isn't as well organized as it should be in some places; hope you don't mind.
+
+* `uikit/` - The base User Interface Kit, which currently consists of
+  * the `VirtualTable` implementation, aka that interactive HTML table with columns, columns resizing and hiding, etc you see in the Manager, Select and Preferences windows/tabs
+  * the `ContextMenu` and related classes that drive the HTML-based context menus
+* `lib/` - The "backend stuff" and assorted library routines and classes.
+* `windows/` - The "frontend stuff" so all the HTML and corresponding code to make that HTML into something interactive
+* `style/` - CSS and images

TODO.md

@@ -3,31 +3,14 @@ TODO
 
 aka a lot
 
-P1
-===
-
-Musts.
-
-* packaging
-  * signing
-
 P2
 ===
 
 Planned for later.
 
-* Investigate using an action popup for the browser action
-* Soft errors and retry logic
-  * Big caveat: When the server still responds, like 50x errors which would be recoverable, we actually have no way of knowing it did in respond in such a way. See P4 - Handle Errors remarks.
-* Delete files (well, as far as the browser allows)
 * Inter-addon API (basic)
   * Add downloads
-* Chrome support
 * vtable perf: cache column widths
-* Localizations
-  * Settle on system
-  * Do the de-locale
-  * Enagage translators
 * Download options
   * This is a bit more limited, as we cannot modify options of downloads that have been started (and paused) or that are done.
 
@@ -48,7 +31,6 @@ Nice-to-haves.
 * Dark Theme support
   * os/browser define be default
   * overwritable
-* Get and cache system icons (because Firefox doesn't allow moz-icon: for WE, but makes them kinda accessible through the downloads API anyway, essentially copying them via a canvas on a privileged hidden page into a data URL... ikr)
 * Remove `any` types as possible, and generally improve typescript (new language to me)
 
 P4
@@ -60,14 +42,10 @@ Stuff that probably cannot be implemented due to WeberEension limitations.
   * Firefox helpfully keeps different lists of downloads. One for newly added downloads, and other ones for "previous" downloads. Turns out the WebExtension API only ever queries the "new" list.
 * Segmented downloads
   * Cannot be done with WebExtensions - downloads API has no support and manually downloading, storing in temporary add-on storage and reassmbling the downloaded parts later is not only efficient but does not reliabliy work due to storage limitations.
-* Handle errors, 404 and such
-  * The Firefox download manager is too stupid and webRequest does not see Downloads, so cannot be done right now.
 * Conflicts: ask when a file exists
   * Not supported by Firefox
 * Speed limiter
   * Cannot be done with the WebExtensions downloads API
-* Actually send referrers for downloads
-  * Cannot be done with WebExtensions - webRequest does not see Downloads
 * contenthandling aka video sniffing, request manipulation?
   * PITA and/or infeasible - Essentially cannot be done for a large part and the other prt is extemely inefficient
 * Checksums/Hashes?

_locales/Readme.md

@@ -0,0 +1,33 @@
+# Translations
+
+Right now we did not standardize on a tool/website/community use for translations
+
+## Website-based Translation
+
+Please go to [https://downthemall.github.io/translate/](https://downthemall.github.io/translate/) for a "good enough" tool to translate DownThemAll! for now. It will load the English locale as a base automatically.
+
+Then you can translate (your progress will be saved in the browser). Once done, you can Download the `messages.json` and test it or submit it for inclusion.
+
+You can also import your or other people's existing translations to modify. This will overwrite any progress you made so far, tho.
+
+## Manual Translation
+
+* Get the [`en/messages.json`](https://github.com/downthemall/downthemall/raw/master/_locales/en/messages.json) as a base.
+* Translate the `"message"` items in that file only. Whip our your favorite text editor, JSON editor, special translation tool, what have you.
+  * Do not translate anything besides the "message" elements. Pay attention to the descriptions.
+  * Do not remove anything.
+  * Do not translate `$PLACEHOLDERS$`. Placeholders should appear in your translation with the same spelling and all uppercase.
+    They will be relaced at runtime with actual values.
+* Make sure you save the file in an "utf-8" encoding. If you need double quotes, you need to escape the quotes with a backslash, e.g. `"some \"quoted\" text"`
+* You should translate all strings. If you want to skip a string, set it to an empty `""` string. DTA will then use the English string.
+
+## Testing Your Translation
+
+* Go to the DownThemAll! Preferences where you will find a "Load custom translation" button.
+* Select your translated `messages.json`. (it doesn't have to be named exactly like that, but should have a `.json` extension)
+  * If everything was OK, you will be asked to reload the extension (this will only reload DTA not the entire browser).
+* See your strings in action once you reloaded DTA (either by answering OK when asked, or disable/enable the extension manually or restart your browser).
+
+## Submitting Your Translation
+
+If you're happy with the result and would like to contribute it back, you can either file a full Pull Request, or just file an issue and post a link to e.g. a [gist](https://gist.github.com/) or paste the translation in the issue text.

_locales/all.json

@@ -0,0 +1,23 @@
+{
+  "ar": "العربية [ar]",
+  "bg": "Български [bg]",
+  "cs": "Čeština (CZ) [cs]",
+  "de": "Deutsch [de]",
+  "el": "Ελληνικά [el]",
+  "en": "English (US) [en]",
+  "es": "Español (España) [es]",
+  "et": "Eesti keel [et]",
+  "fr": "Français [fr]",
+  "hu": "Magyar (HU) [hu]",
+  "id": "Bahasa Indonesia [id]",
+  "it": "Italiano [it]",
+  "ja": "日本語 (JP) [ja]",
+  "ko": "한국어 [ko]",
+  "lt": "Lietuvių [lt]",
+  "nl": "Nederlands [nl]",
+  "pl": "Polski [pl]",
+  "pt": "Português (Brasil) [pt]",
+  "ru": "Русский [ru]",
+  "zh_CN": "简体中文 [zh_CN]",
+  "zh_TW": "正體中文 [zh_TW]"
+}

data/filters.json

@@ -14,7 +14,7 @@
 	},
 	"deffilter-aud": {
 		"label": "Audio",
-		"expr": "/\\.(?:mp3|wav|og(?:g|a)|flac|midi?|rm|aac|wma|mka|ape)$/i",
+		"expr": "/\\.(?:mp3|wav|og(?:g|a)|flac|midi?|rm|aac|wma|mka|ape|opus)$/i",
 		"type": 1,
 		"active": false,
 		"icon": "mp3"
@@ -35,7 +35,7 @@
 	},
 	"deffilter-img": {
 		"label": "Images",
-		"expr": "/\\.(?:jp(?:e?g|e|2)|gif|png|tiff?|bmp|ico)$/i",
+		"expr": "/\\.(?:jp(?:e?g|e|2)|gif|png|tiff?|bmp|ico|heic|heif|webp|jxr|wdp|dng|cr2|arw)$/i",
 		"type": 3,
 		"active": false,
 		"icon": "jpg"
@@ -63,7 +63,7 @@
 	},
 	"deffilter-vid": {
 		"label": "Videos",
-		"expr": "/\\.(?:mpeg|ra?m|avi|mp(?:g|e|4)|mov|divx|asf|qt|wmv|m\\dv|rv|vob|asx|ogm|ogv|webm|flv|mkv)$/i",
+		"expr": "/\\.(?:mpeg|ra?m|avi|mp(?:g|e|4)|mov|divx|asf|qt|wmv|m\\dv|rv|vob|asx|ogm|ogv|webm|flv|mkv|f4v|m4v)$/i",
 		"type": 3,
 		"active": true,
 		"icon": "mkv"

data/icons.json

@@ -80,7 +80,11 @@
 		"tif",
 		"tiff",
 		"wmf",
-		"webp"
+		"webp",
+		"heic",
+		"heif",
+		"jxr",
+		"wdp"
 	],
 	"video": [
 		"3g2",

data/mime.json

@@ -0,0 +1,396 @@
+{
+  "e": {
+    "3gpp": "3gp",
+    "asx": "asf",
+    "gz": "gzip",
+    "heic": "heif",
+    "html": [
+      "htm",
+      "shtml",
+      "php"
+    ],
+    "jar": [
+      "war",
+      "ear"
+    ],
+    "jpg": [
+      "jpeg",
+      "jpe",
+      "jfif"
+    ],
+    "js": "jsx",
+    "mid": [
+      "midi",
+      "kar"
+    ],
+    "mkv": [
+      "mk3d",
+      "mks"
+    ],
+    "mov": [
+      "qt",
+      "moov"
+    ],
+    "mpg": [
+      "mpe",
+      "mpeg"
+    ],
+    "pem": [
+      "crt",
+      "der"
+    ],
+    "pl": "pm",
+    "prc": "pdb",
+    "ps": [
+      "eps",
+      "ai"
+    ],
+    "svg": "svgz",
+    "tcl": "tk",
+    "tif": "tiff"
+  },
+  "m": {
+    "application/7z": "7z",
+    "application/7z-compressed": "7z",
+    "application/ai": "ps",
+    "application/atom": "atom",
+    "application/atom+xml": "atom",
+    "application/bz2": "bz2",
+    "application/bzip2": "bz2",
+    "application/cco": "cco",
+    "application/cocoa": "cco",
+    "application/compressed": "gz",
+    "application/crt": "pem",
+    "application/der": "pem",
+    "application/doc": "doc",
+    "application/ear": "jar",
+    "application/eot": "eot",
+    "application/eps": "ps",
+    "application/gz": "gz",
+    "application/gzip": "gz",
+    "application/hqx": "hqx",
+    "application/jar": "jar",
+    "application/jardiff": "jardiff",
+    "application/java-archive": "jar",
+    "application/java-archive-diff": "jardiff",
+    "application/java-jnlp-file": "jnlp",
+    "application/javascript": "js",
+    "application/jnlp": "jnlp",
+    "application/js": "js",
+    "application/json": "json",
+    "application/jsx": "js",
+    "application/kml": "kml",
+    "application/kmz": "kmz",
+    "application/m3u8": "m3u8",
+    "application/mac-binhex40": "hqx",
+    "application/makeself": "run",
+    "application/msword": "doc",
+    "application/odg": "odg",
+    "application/odp": "odp",
+    "application/ods": "ods",
+    "application/odt": "odt",
+    "application/pdb": "prc",
+    "application/pdf": "pdf",
+    "application/pem": "pem",
+    "application/perl": "pl",
+    "application/pilot": "prc",
+    "application/pl": "pl",
+    "application/pm": "pl",
+    "application/postscript": "ps",
+    "application/ppt": "ppt",
+    "application/prc": "prc",
+    "application/ps": "ps",
+    "application/rar": "rar",
+    "application/rar-compressed": "rar",
+    "application/redhat-package-manager": "rpm",
+    "application/rpm": "rpm",
+    "application/rss": "rss",
+    "application/rss+xml": "rss",
+    "application/rtf": "rtf",
+    "application/run": "run",
+    "application/sea": "sea",
+    "application/shockwave-flash": "swf",
+    "application/sit": "sit",
+    "application/stuffit": "sit",
+    "application/swf": "swf",
+    "application/tar": "tar",
+    "application/tcl": "tcl",
+    "application/tk": "tcl",
+    "application/vnd.apple.mpegurl": "m3u8",
+    "application/vnd.google-earth.kml+xml": "kml",
+    "application/vnd.google-earth.kmz": "kmz",
+    "application/vnd.ms-excel": "xls",
+    "application/vnd.ms-fontobject": "eot",
+    "application/vnd.ms-powerpoint": "ppt",
+    "application/vnd.oasis.opendocument.graphics": "odg",
+    "application/vnd.oasis.opendocument.presentation": "odp",
+    "application/vnd.oasis.opendocument.spreadsheet": "ods",
+    "application/vnd.oasis.opendocument.text": "odt",
+    "application/vnd.wap.wmlc": "wmlc",
+    "application/war": "jar",
+    "application/wmlc": "wmlc",
+    "application/x-7z": "7z",
+    "application/x-7z-compressed": "7z",
+    "application/x-ai": "ps",
+    "application/x-atom": "atom",
+    "application/x-atom+xml": "atom",
+    "application/x-bz2": "bz2",
+    "application/x-bzip2": "bz2",
+    "application/x-cco": "cco",
+    "application/x-cocoa": "cco",
+    "application/x-compressed": "gz",
+    "application/x-crt": "pem",
+    "application/x-der": "pem",
+    "application/x-doc": "doc",
+    "application/x-ear": "jar",
+    "application/x-eot": "eot",
+    "application/x-eps": "ps",
+    "application/x-gz": "gz",
+    "application/x-gzip": "gz",
+    "application/x-hqx": "hqx",
+    "application/x-jar": "jar",
+    "application/x-jardiff": "jardiff",
+    "application/x-java-archive": "jar",
+    "application/x-java-archive-diff": "jardiff",
+    "application/x-java-jnlp-file": "jnlp",
+    "application/x-javascript": "js",
+    "application/x-jnlp": "jnlp",
+    "application/x-js": "js",
+    "application/x-json": "json",
+    "application/x-jsx": "js",
+    "application/x-kml": "kml",
+    "application/x-kmz": "kmz",
+    "application/x-m3u8": "m3u8",
+    "application/x-mac-binhex40": "hqx",
+    "application/x-makeself": "run",
+    "application/x-msword": "doc",
+    "application/x-odg": "odg",
+    "application/x-odp": "odp",
+    "application/x-ods": "ods",
+    "application/x-odt": "odt",
+    "application/x-pdb": "prc",
+    "application/x-pdf": "pdf",
+    "application/x-pem": "pem",
+    "application/x-perl": "pl",
+    "application/x-pilot": "prc",
+    "application/x-pl": "pl",
+    "application/x-pm": "pl",
+    "application/x-postscript": "ps",
+    "application/x-ppt": "ppt",
+    "application/x-prc": "prc",
+    "application/x-ps": "ps",
+    "application/x-rar": "rar",
+    "application/x-rar-compressed": "rar",
+    "application/x-redhat-package-manager": "rpm",
+    "application/x-rpm": "rpm",
+    "application/x-rss": "rss",
+    "application/x-rss+xml": "rss",
+    "application/x-rtf": "rtf",
+    "application/x-run": "run",
+    "application/x-sea": "sea",
+    "application/x-shockwave-flash": "swf",
+    "application/x-sit": "sit",
+    "application/x-stuffit": "sit",
+    "application/x-swf": "swf",
+    "application/x-tar": "tar",
+    "application/x-tcl": "tcl",
+    "application/x-tk": "tcl",
+    "application/x-vnd.apple.mpegurl": "m3u8",
+    "application/x-vnd.google-earth.kml+xml": "kml",
+    "application/x-vnd.google-earth.kmz": "kmz",
+    "application/x-vnd.ms-excel": "xls",
+    "application/x-vnd.ms-fontobject": "eot",
+    "application/x-vnd.ms-powerpoint": "ppt",
+    "application/x-vnd.oasis.opendocument.graphics": "odg",
+    "application/x-vnd.oasis.opendocument.presentation": "odp",
+    "application/x-vnd.oasis.opendocument.spreadsheet": "ods",
+    "application/x-vnd.oasis.opendocument.text": "odt",
+    "application/x-vnd.wap.wmlc": "wmlc",
+    "application/x-war": "jar",
+    "application/x-wmlc": "wmlc",
+    "application/x-x509-ca-cert": "pem",
+    "application/x-xhtml": "xhtml",
+    "application/x-xhtml+xml": "xhtml",
+    "application/x-xls": "xls",
+    "application/x-xpi": "xpi",
+    "application/x-xpinstall": "xpi",
+    "application/x-xspf": "xspf",
+    "application/x-xspf+xml": "xspf",
+    "application/x-xz": "xz",
+    "application/x-zip": "zip",
+    "application/x509-ca-cert": "pem",
+    "application/xhtml": "xhtml",
+    "application/xhtml+xml": "xhtml",
+    "application/xls": "xls",
+    "application/xpi": "xpi",
+    "application/xpinstall": "xpi",
+    "application/xspf": "xspf",
+    "application/xspf+xml": "xspf",
+    "application/xz": "xz",
+    "application/zip": "zip",
+    "audio/kar": "mid",
+    "audio/m4a": "m4a",
+    "audio/matroska": "mka",
+    "audio/mid": "mid",
+    "audio/midi": "mid",
+    "audio/mka": "mka",
+    "audio/mp3": "mp3",
+    "audio/mpeg": "mp3",
+    "audio/ogg": "ogg",
+    "audio/ra": "ra",
+    "audio/realaudio": "ra",
+    "audio/x-kar": "mid",
+    "audio/x-m4a": "m4a",
+    "audio/x-matroska": "mka",
+    "audio/x-mid": "mid",
+    "audio/x-midi": "mid",
+    "audio/x-mka": "mka",
+    "audio/x-mp3": "mp3",
+    "audio/x-mpeg": "mp3",
+    "audio/x-ogg": "ogg",
+    "audio/x-ra": "ra",
+    "audio/x-realaudio": "ra",
+    "font/woff": "woff",
+    "font/woff2": "woff2",
+    "font/x-woff": "woff",
+    "font/x-woff2": "woff2",
+    "image/bmp": "bmp",
+    "image/gif": "gif",
+    "image/heic": "heic",
+    "image/heif": "heic",
+    "image/heif-sequence": "heic",
+    "image/ico": "ico",
+    "image/icon": "ico",
+    "image/jfif": "jpg",
+    "image/jng": "jng",
+    "image/jpe": "jpg",
+    "image/jpeg": "jpg",
+    "image/jpg": "jpg",
+    "image/ms-bmp": "bmp",
+    "image/png": "png",
+    "image/svg": "svg",
+    "image/svg+xml": "svg",
+    "image/svgz": "svg",
+    "image/tif": "tif",
+    "image/tiff": "tif",
+    "image/vnd.wap.wbmp": "wbmp",
+    "image/wbmp": "wbmp",
+    "image/webp": "webp",
+    "image/x-bmp": "bmp",
+    "image/x-gif": "gif",
+    "image/x-heic": "heic",
+    "image/x-heif": "heic",
+    "image/x-heif-sequence": "heic",
+    "image/x-ico": "ico",
+    "image/x-icon": "ico",
+    "image/x-jfif": "jpg",
+    "image/x-jng": "jng",
+    "image/x-jpe": "jpg",
+    "image/x-jpeg": "jpg",
+    "image/x-jpg": "jpg",
+    "image/x-ms-bmp": "bmp",
+    "image/x-png": "png",
+    "image/x-svg": "svg",
+    "image/x-svg+xml": "svg",
+    "image/x-svgz": "svg",
+    "image/x-tif": "tif",
+    "image/x-tiff": "tif",
+    "image/x-vnd.wap.wbmp": "wbmp",
+    "image/x-wbmp": "wbmp",
+    "image/x-webp": "webp",
+    "text/component": "htc",
+    "text/css": "css",
+    "text/htc": "htc",
+    "text/htm": "html",
+    "text/html": "html",
+    "text/jad": "jad",
+    "text/javascript": "js",
+    "text/js": "js",
+    "text/jsx": "js",
+    "text/mathml": "mml",
+    "text/mml": "mml",
+    "text/php": "html",
+    "text/plain": "txt",
+    "text/shtml": "html",
+    "text/txt": "txt",
+    "text/vnd.sun.j2me.app-descriptor": "jad",
+    "text/vnd.wap.wml": "wml",
+    "text/wml": "wml",
+    "text/x-component": "htc",
+    "text/x-css": "css",
+    "text/x-htc": "htc",
+    "text/x-htm": "html",
+    "text/x-html": "html",
+    "text/x-jad": "jad",
+    "text/x-javascript": "js",
+    "text/x-js": "js",
+    "text/x-jsx": "js",
+    "text/x-mathml": "mml",
+    "text/x-mml": "mml",
+    "text/x-php": "html",
+    "text/x-plain": "txt",
+    "text/x-shtml": "html",
+    "text/x-txt": "txt",
+    "text/x-vnd.sun.j2me.app-descriptor": "jad",
+    "text/x-vnd.wap.wml": "wml",
+    "text/x-wml": "wml",
+    "text/x-xml": "xml",
+    "text/xml": "xml",
+    "video/3gp": "3gpp",
+    "video/3gpp": "3gpp",
+    "video/asf": "asx",
+    "video/asx": "asx",
+    "video/avi": "avi",
+    "video/flv": "flv",
+    "video/m4v": "m4v",
+    "video/matroska": "mkv",
+    "video/mk3d": "mkv",
+    "video/mks": "mkv",
+    "video/mkv": "mkv",
+    "video/mng": "mng",
+    "video/moov": "mov",
+    "video/mov": "mov",
+    "video/mp2t": "ts",
+    "video/mp4": "mp4",
+    "video/mpe": "mpg",
+    "video/mpeg": "mpg",
+    "video/mpg": "mpg",
+    "video/ms-asf": "asx",
+    "video/ms-wmv": "wmv",
+    "video/msvideo": "avi",
+    "video/opus": "opus",
+    "video/qt": "mov",
+    "video/quicktime": "mov",
+    "video/ts": "ts",
+    "video/webm": "webm",
+    "video/wmv": "wmv",
+    "video/x-3gp": "3gpp",
+    "video/x-3gpp": "3gpp",
+    "video/x-asf": "asx",
+    "video/x-asx": "asx",
+    "video/x-avi": "avi",
+    "video/x-flv": "flv",
+    "video/x-m4v": "m4v",
+    "video/x-matroska": "mkv",
+    "video/x-mk3d": "mkv",
+    "video/x-mks": "mkv",
+    "video/x-mkv": "mkv",
+    "video/x-mng": "mng",
+    "video/x-moov": "mov",
+    "video/x-mov": "mov",
+    "video/x-mp2t": "ts",
+    "video/x-mp4": "mp4",
+    "video/x-mpe": "mpg",
+    "video/x-mpeg": "mpg",
+    "video/x-mpg": "mpg",
+    "video/x-ms-asf": "asx",
+    "video/x-ms-wmv": "wmv",
+    "video/x-msvideo": "avi",
+    "video/x-opus": "opus",
+    "video/x-qt": "mov",
+    "video/x-quicktime": "mov",
+    "video/x-ts": "ts",
+    "video/x-webm": "webm",
+    "video/x-wmv": "wmv"
+  }
+}

data/prefs.json

@@ -1,17 +1,22 @@
 {
-	"global-turbo": false,
+	"button-type": "popup",
+	"manager-in-popup": false,
 	"concurrent": 4,
 	"queue-notification": true,
 	"finish-notification": true,
+	"sounds": true,
 	"open-manager-on-queue": true,
 	"text-links": true,
 	"add-paused": false,
+	"hide-context": false,
 	"conflict-action": "uniquify",
 	"nagging": 0,
-	"nagging-next": 6,
+	"nagging-next": 7,
 	"tooltip": true,
 	"show-urls": false,
 	"remove-missing-on-init": false,
+	"retries": 5,
+	"retry-time": 10,
 	"limits": [
 		{
 			"domain": "*",

lib/api.ts

@@ -5,25 +5,33 @@ import { TYPE_LINK, TYPE_MEDIA } from "./constants";
 import { filters } from "./filters";
 import { Prefs } from "./prefs";
 import { lazy } from "./util";
-import { Item, makeUniqueItems } from "./item";
+// eslint-disable-next-line no-unused-vars
+import { Item, makeUniqueItems, BaseItem } from "./item";
 import { getManager } from "./manager/man";
 import { select } from "./select";
 import { single } from "./single";
 import { Notification } from "./notifications";
-import { MASK, FASTFILTER } from "./recentlist";
+import { MASK, FASTFILTER, SUBFOLDER } from "./recentlist";
 import { openManager } from "./windowutils";
 import { _ } from "./i18n";
 
 const MAX_BATCH = 10000;
 
-export const API = new class {
-  async filter(arr: any, type: number) {
-    return (await filters()).filterItemsByType(arr, type);
+export interface QueueOptions {
+  mask?: string;
+  subfolder?: string;
+  paused?: boolean;
+}
+
+export const API = new class APIImpl {
+  async filter(arr: BaseItem[], type: number) {
+    return await (await filters()).filterItemsByType(arr, type);
   }
 
-  async queue(items: any, options: any) {
-    await MASK.init();
+  async queue(items: BaseItem[], options: QueueOptions) {
+    await Promise.all([MASK.init(), SUBFOLDER.init()]);
     const {mask = MASK.current} = options;
+    const {subfolder = SUBFOLDER.current} = options;
 
     const {paused = false} = options;
     const defaults: any = {
@@ -36,13 +44,11 @@ export const API = new class {
       fileName: null,
       title: "",
       description: "",
-      fromMetalink: false,
       startDate: new Date(),
-      hashes: [],
       private: false,
       postData: null,
-      cleanRequest: false,
       mask,
+      subfolder,
       date: Date.now(),
       paused
     };
@@ -54,7 +60,7 @@ export const API = new class {
       }
       return currentBatch;
     });
-    items = items.map((i: any) => {
+    items = items.map(i => {
       delete i.idx;
       return new Item(i, defaults);
     });
@@ -79,7 +85,7 @@ export const API = new class {
     }
   }
 
-  sanity(links: any[], media: any[]) {
+  sanity(links: BaseItem[], media: BaseItem[]) {
     if (!links.length && !media.length) {
       new Notification(null, _("no-links"));
       return false;
@@ -87,48 +93,57 @@ export const API = new class {
     return true;
   }
 
-  async turbo(links: any[], media: any[]) {
+  async turbo(links: BaseItem[], media: BaseItem[]) {
     if (!this.sanity(links, media)) {
       return false;
     }
-    const selected = makeUniqueItems([
-      await API.filter(links, TYPE_LINK),
-      await API.filter(media, TYPE_MEDIA),
-    ]);
+    const type = await Prefs.get("last-type", "links");
+    const items = await (async () => {
+      if (type === "links") {
+        return await API.filter(links, TYPE_LINK);
+      }
+      return await API.filter(media, TYPE_MEDIA);
+    })();
+    const selected = makeUniqueItems([items]);
     if (!selected.length) {
       return await this.regular(links, media);
     }
     return await this.queue(selected, {paused: await Prefs.get("add-paused")});
   }
 
-  async regularInternal(selected: any) {
-    if (selected.mask && !selected.maskOnce) {
+  async regularInternal(selected: BaseItem[], options: any) {
+    if (options.mask && !options.maskOnce) {
       await MASK.init();
-      await MASK.push(selected.mask);
+      await MASK.push(options.mask);
     }
-    if (typeof selected.fast === "string" && !selected.fastOnce) {
+    if (typeof options.fast === "string" && !options.fastOnce) {
       await FASTFILTER.init();
-      await FASTFILTER.push(selected.fast);
+      await FASTFILTER.push(options.fast);
     }
-    const {items} = selected;
-    delete selected.items;
-    return await this.queue(items, selected);
+    if (typeof options.subfolder === "string" && !options.subfolderOnce) {
+      await SUBFOLDER.init();
+      await SUBFOLDER.push(options.subfolder);
+    }
+    if (typeof options.type === "string") {
+      await Prefs.set("last-type", options.type);
+    }
+    return await this.queue(selected, options);
   }
 
-  async regular(links: any[], media: any[]) {
+  async regular(links: BaseItem[], media: BaseItem[]) {
     if (!this.sanity(links, media)) {
       return false;
     }
-    const selected = await select(links, media);
-    return this.regularInternal(selected);
+    const {items, options} = await select(links, media);
+    return this.regularInternal(items, options);
   }
 
-  async singleTurbo(item: any) {
+  async singleTurbo(item: BaseItem) {
     return await this.queue([item], {paused: await Prefs.get("add-paused")});
   }
 
-  async singleRegular(item: any) {
-    const selected = await single(item);
-    return this.regularInternal(selected);
+  async singleRegular(item: BaseItem | null) {
+    const {items, options} = await single(item);
+    return this.regularInternal(items, options);
   }
 }();

lib/background.ts

@@ -5,7 +5,7 @@ import { ALLOWED_SCHEMES, TRANSFERABLE_PROPERTIES } from "./constants";
 import { API } from "./api";
 import { Finisher, makeUniqueItems } from "./item";
 import { Prefs } from "./prefs";
-import { _ } from "./i18n";
+import { _, locale } from "./i18n";
 import { openPrefs, openManager } from "./windowutils";
 import { filters } from "./filters";
 import { getManager } from "./manager/man";
@@ -13,14 +13,44 @@ import {
   browserAction as action,
   menus as _menus, contextMenus as _cmenus,
   tabs,
-  webNavigation as nav
+  webNavigation as nav,
+  // eslint-disable-next-line no-unused-vars
+  Tab,
+  // eslint-disable-next-line no-unused-vars
+  MenuClickInfo,
+  CHROME,
+  runtime,
+  history,
+  sessions,
 } from "./browser";
+import { Bus } from "./bus";
+import { filterInSitu } from "./util";
+
 
 const menus = typeof (_menus) !== "undefined" && _menus || _cmenus;
 
+const GATHER = "/bundles/content-gather.js";
 
-async function runContentJob(tab: any, file: string, msg: any) {
+const CHROME_CONTEXTS = Object.freeze(new Set([
+  "all",
+  "audio",
+  "browser_action",
+  "editable",
+  "frame",
+  "image",
+  "launcher",
+  "link",
+  "page",
+  "page_action",
+  "selection",
+  "video",
+]));
+
+async function runContentJob(tab: Tab, file: string, msg: any) {
   try {
+    if (tab && tab.incognito && msg) {
+      msg.private = tab.incognito;
+    }
     const res = await tabs.executeScript(tab.id, {
       file,
       allFrames: true,
@@ -48,6 +78,14 @@ async function runContentJob(tab: any, file: string, msg: any) {
   }
 }
 
+type SelectionOptions = {
+  selectionOnly: boolean;
+  allTabs: boolean;
+  turbo: boolean;
+  tab: Tab;
+};
+
+
 class Handler {
   async processResults(turbo = false, results: any[]) {
     const links = this.makeUnique(results, "links");
@@ -59,305 +97,547 @@ class Handler {
     return makeUniqueItems(
       results.filter(e => e[what]).map(e => {
         const finisher = new Finisher(e);
-        return e[what].
-          map((item: any) => finisher.finish(item)).
-          filter((i: any) => i);
+        return filterInSitu(e[what].
+          map((item: any) => finisher.finish(item)), e => !!e);
       }));
   }
+
+  async performSelection(options: SelectionOptions) {
+    try {
+      const toptions: any = {
+        currentWindow: true,
+        discarded: false,
+      };
+      if (!CHROME) {
+        toptions.hidden = false;
+      }
+      const selectedTabs = options.allTabs ?
+        await tabs.query(toptions) as any[] :
+        [options.tab];
+
+      const textLinks = await Prefs.get("text-links", true);
+      const goptions = {
+        type: "DTA:gather",
+        selectionOnly: options.selectionOnly,
+        textLinks,
+        schemes: Array.from(ALLOWED_SCHEMES.values()),
+        transferable: TRANSFERABLE_PROPERTIES,
+      };
+
+      const results = await Promise.all(selectedTabs.
+        map((tab: any) => runContentJob(tab, GATHER, goptions)));
+
+      await this.processResults(options.turbo, results.flat());
+    }
+    catch (ex) {
+      console.error(ex.toString(), ex.stack, ex);
+    }
+  }
 }
 
-new class Action extends Handler {
-  constructor() {
-    super();
-    this.onClicked = this.onClicked.bind(this);
-    action.onClicked.addListener(this.onClicked);
-  }
-
-  async onClicked(tab: {id: number}) {
-    if (!tab.id) {
-      return;
-    }
-    try {
-      await this.processResults(
-        await Prefs.get("global-turbo"),
-        await runContentJob(
-          tab, "/bundles/content-gather.js", {
-            type: "DTA:gather",
-            selectionOnly: false,
-            textLinks: await Prefs.get("text-links", true),
-            schemes: Array.from(ALLOWED_SCHEMES.values()),
-            transferable: TRANSFERABLE_PROPERTIES,
-          }));
-    }
-    catch (ex) {
-      console.error(ex);
-    }
-  }
-}();
-
-new class Menus extends Handler {
-  constructor() {
-    super();
-    this.onClicked = this.onClicked.bind(this);
-    menus.create({
-      id: "DTARegular",
-      contexts: ["all", "browser_action", "tools_menu"],
-      icons: {
-        16: "/style/button-regular.png",
-        32: "/style/button-regular@2x.png",
-      },
-      title: _("dta.regular"),
-    });
-    menus.create({
-      id: "DTATurbo",
-      contexts: ["all", "browser_action", "tools_menu"],
-      icons: {
-        16: "/style/button-turbo.png",
-        32: "/style/button-turbo@2x.png",
-      },
-      title: _("dta.turbo"),
-    });
-    menus.create({
-      id: "DTARegularLink",
-      contexts: ["link"],
-      icons: {
-        16: "/style/button-regular.png",
-        32: "/style/button-regular@2x.png",
-      },
-      title: _("dta.regular.link"),
-    });
-    menus.create({
-      id: "DTATurboLink",
-      contexts: ["link"],
-      icons: {
-        16: "/style/button-turbo.png",
-        32: "/style/button-turbo@2x.png",
-      },
-      title: _("dta.turbo.link"),
-    });
-    menus.create({
-      id: "DTARegularImage",
-      contexts: ["image"],
-      icons: {
-        16: "/style/button-regular.png",
-        32: "/style/button-regular@2x.png",
-      },
-      title: _("dta.regular.image"),
-    });
-    menus.create({
-      id: "DTATurboImage",
-      contexts: ["image"],
-      icons: {
-        16: "/style/button-turbo.png",
-        32: "/style/button-turbo@2x.png",
-      },
-      title: _("dta.turbo.image"),
-    });
-    menus.create({
-      id: "DTARegularMedia",
-      contexts: ["video", "audio"],
-      icons: {
-        16: "/style/button-regular.png",
-        32: "/style/button-regular@2x.png",
-      },
-      title: _("dta.regular.media"),
-    });
-    menus.create({
-      id: "DTATurboMedia",
-      contexts: ["video", "audio"],
-      icons: {
-        16: "/style/button-turbo.png",
-        32: "/style/button-turbo@2x.png",
-      },
-      title: _("dta.turbo.media"),
-    });
-    menus.create({
-      id: "DTARegularSelection",
-      contexts: ["selection"],
-      icons: {
-        16: "/style/button-regular.png",
-        32: "/style/button-regular@2x.png",
-      },
-      title: _("dta.regular.selection"),
-    });
-    menus.create({
-      id: "DTATurboSelection",
-      contexts: ["selection"],
-      icons: {
-        16: "/style/button-turbo.png",
-        32: "/style/button-turbo@2x.png",
-      },
-      title: _("dta.turbo.selection"),
-    });
-    menus.create({
-      id: "sep-1",
-      contexts: ["all", "browser_action", "tools_menu"],
-      type: "separator"
-    });
-    menus.create({
-      id: "DTAManager",
-      contexts: ["all", "browser_action", "tools_menu"],
-      icons: {
-        16: "/style/button-manager.png",
-        32: "/style/button-manager@2x.png",
-      },
-      title: _("manager.short"),
-    });
-    menus.create({
-      id: "DTAPrefs",
-      contexts: ["all", "browser_action", "tools_menu"],
-      icons: {
-        16: "/style/settings.svg",
-        32: "/style/settings.svg",
-        64: "/style/settings.svg",
-        128: "/style/settings.svg",
-      },
-      title: _("prefs.short"),
-    });
-    menus.onClicked.addListener(this.onClicked);
-  }
-
-  *makeSingleItemList(url: string, results: any[]) {
-    for (const result of results) {
-      const finisher = new Finisher(result);
-      for (const list of [result.links, result.media]) {
-        for (const e of list) {
-          if (e.url !== url) {
-            continue;
+locale.then(() => {
+  const menuHandler = new class Menus extends Handler {
+    constructor() {
+      super();
+      this.onClicked = this.onClicked.bind(this);
+      const alls = new Map<string, string[]>();
+      const mcreate = (options: any) => {
+        if (CHROME) {
+          delete options.icons;
+          options.contexts = options.contexts.
+            filter((e: string) => CHROME_CONTEXTS.has(e));
+          if (!options.contexts.length) {
+            return;
           }
-          const finished = finisher.finish(e);
-          if (!finished) {
-            continue;
+        }
+        if (options.contexts.includes("all")) {
+          alls.set(options.id, options.contexts);
+        }
+        menus.create(options);
+      };
+      mcreate({
+        id: "DTARegularLink",
+        contexts: ["link"],
+        icons: {
+          16: "/style/button-regular.png",
+          32: "/style/button-regular@2x.png",
+        },
+        title: _("dta.regular.link"),
+      });
+      mcreate({
+        id: "DTATurboLink",
+        contexts: ["link"],
+        icons: {
+          16: "/style/button-turbo.png",
+          32: "/style/button-turbo@2x.png",
+        },
+        title: _("dta.turbo.link"),
+      });
+      mcreate({
+        id: "DTARegularImage",
+        contexts: ["image"],
+        icons: {
+          16: "/style/button-regular.png",
+          32: "/style/button-regular@2x.png",
+        },
+        title: _("dta.regular.image"),
+      });
+      mcreate({
+        id: "DTATurboImage",
+        contexts: ["image"],
+        icons: {
+          16: "/style/button-turbo.png",
+          32: "/style/button-turbo@2x.png",
+        },
+        title: _("dta.turbo.image"),
+      });
+      mcreate({
+        id: "DTARegularMedia",
+        contexts: ["video", "audio"],
+        icons: {
+          16: "/style/button-regular.png",
+          32: "/style/button-regular@2x.png",
+        },
+        title: _("dta.regular.media"),
+      });
+      mcreate({
+        id: "DTATurboMedia",
+        contexts: ["video", "audio"],
+        icons: {
+          16: "/style/button-turbo.png",
+          32: "/style/button-turbo@2x.png",
+        },
+        title: _("dta.turbo.media"),
+      });
+      mcreate({
+        id: "DTARegularSelection",
+        contexts: ["selection"],
+        icons: {
+          16: "/style/button-regular.png",
+          32: "/style/button-regular@2x.png",
+        },
+        title: _("dta.regular.selection"),
+      });
+      mcreate({
+        id: "DTATurboSelection",
+        contexts: ["selection"],
+        icons: {
+          16: "/style/button-turbo.png",
+          32: "/style/button-turbo@2x.png",
+        },
+        title: _("dta.turbo.selection"),
+      });
+      mcreate({
+        id: "DTARegular",
+        contexts: ["all", "browser_action", "tools_menu"],
+        icons: {
+          16: "/style/button-regular.png",
+          32: "/style/button-regular@2x.png",
+        },
+        title: _("dta.regular"),
+      });
+      mcreate({
+        id: "DTATurbo",
+        contexts: ["all", "browser_action", "tools_menu"],
+        icons: {
+          16: "/style/button-turbo.png",
+          32: "/style/button-turbo@2x.png",
+        },
+        title: _("dta.turbo"),
+      });
+      mcreate({
+        id: "sep-1",
+        contexts: ["all", "browser_action", "tools_menu"],
+        type: "separator"
+      });
+      mcreate({
+        id: "DTARegularAll",
+        contexts: ["all", "browser_action", "tools_menu"],
+        icons: {
+          16: "/style/button-regular.png",
+          32: "/style/button-regular@2x.png",
+        },
+        title: _("dta-regular-all"),
+      });
+      mcreate({
+        id: "DTATurboAll",
+        contexts: ["all", "browser_action", "tools_menu"],
+        icons: {
+          16: "/style/button-turbo.png",
+          32: "/style/button-turbo@2x.png",
+        },
+        title: _("dta-turbo-all"),
+      });
+      const sep2ctx = menus.ACTION_MENU_TOP_LEVEL_LIMIT === 6 ?
+        ["all", "tools_menu"] :
+        ["all", "browser_action", "tools_menu"];
+      mcreate({
+        id: "sep-2",
+        contexts: sep2ctx,
+        type: "separator"
+      });
+      mcreate({
+        id: "DTAAdd",
+        contexts: ["all", "browser_action", "tools_menu"],
+        icons: {
+          16: "/style/add.svg",
+          32: "/style/add.svg",
+          64: "/style/add.svg",
+          128: "/style/add.svg",
+        },
+        title: _("add-download"),
+      });
+      mcreate({
+        id: "sep-3",
+        contexts: ["all", "browser_action", "tools_menu"],
+        type: "separator"
+      });
+      mcreate({
+        id: "DTAManager",
+        contexts: ["all", "browser_action", "tools_menu"],
+        icons: {
+          16: "/style/button-manager.png",
+          32: "/style/button-manager@2x.png",
+        },
+        title: _("manager.short"),
+      });
+      mcreate({
+        id: "DTAPrefs",
+        contexts: ["all", "browser_action", "tools_menu"],
+        icons: {
+          16: "/style/settings.svg",
+          32: "/style/settings.svg",
+          64: "/style/settings.svg",
+          128: "/style/settings.svg",
+        },
+        title: _("prefs.short"),
+      });
+      Object.freeze(alls);
+
+      const adjustMenus = (v: boolean) => {
+        for (const [id, contexts] of alls.entries()) {
+          const adjusted = v ?
+            contexts.filter(e => e !== "all") :
+            contexts;
+          menus.update(id, {
+            contexts: adjusted
+          });
+        }
+      };
+      Prefs.get("hide-context", false).then((v: boolean) => {
+      // This is the initial load, so no need to adjust when visible already
+        if (!v) {
+          return;
+        }
+        adjustMenus(v);
+      });
+      Prefs.on("hide-context", (prefs, key, value: boolean) => {
+        adjustMenus(value);
+      });
+
+      menus.onClicked.addListener(this.onClicked);
+    }
+
+    *makeSingleItemList(url: string, results: any[]) {
+      for (const result of results) {
+        const finisher = new Finisher(result);
+        for (const list of [result.links, result.media]) {
+          for (const e of list) {
+            if (e.url !== url) {
+              continue;
+            }
+            const finished = finisher.finish(e);
+            if (!finished) {
+              continue;
+            }
+            yield finished;
           }
-          yield finished;
         }
       }
     }
-  }
 
-  async findSingleItem(tab: any, url: string, turbo = false) {
-    if (!url) {
-      return;
+    async findSingleItem(tab: Tab, url: string, turbo = false) {
+      if (!url) {
+        return;
+      }
+      const results = await runContentJob(
+        tab, "/bundles/content-gather.js", {
+          type: "DTA:gather",
+          selectionOnly: false,
+          schemes: Array.from(ALLOWED_SCHEMES.values()),
+          transferable: TRANSFERABLE_PROPERTIES,
+        });
+      const found = Array.from(this.makeSingleItemList(url, results));
+      const unique = makeUniqueItems([found]);
+      if (!unique.length) {
+        return;
+      }
+      const [item] = unique;
+      API[turbo ? "singleTurbo" : "singleRegular"](item);
     }
-    const results = await runContentJob(
-      tab, "/bundles/content-gather.js", {
-        type: "DTA:gather",
-        selectionOnly: false,
-        schemes: Array.from(ALLOWED_SCHEMES.values()),
-        transferable: TRANSFERABLE_PROPERTIES,
+
+    onClicked(info: MenuClickInfo, tab: Tab) {
+      if (!tab.id) {
+        return;
+      }
+      const {menuItemId} = info;
+      const {[`onClicked${menuItemId}`]: handler}: any = this;
+      if (!handler) {
+        console.error("Invalid Handler for", menuItemId);
+        return;
+      }
+      const rv: Promise<void> | void = handler.call(this, info, tab);
+      if (rv && rv.catch) {
+        rv.catch(console.error);
+      }
+    }
+
+    async emulate(action: string) {
+      const tab = await tabs.query({
+        active: true,
+        currentWindow: true,
       });
-    const found = Array.from(this.makeSingleItemList(url, results));
-    const unique = makeUniqueItems([found]);
-    if (!unique.length) {
-      return;
+      if (!tab || !tab.length) {
+        return;
+      }
+      this.onClicked({
+        menuItemId: action
+      }, tab[0]);
     }
-    const [item] = unique;
-    API[turbo ? "singleTurbo" : "singleRegular"](item);
-  }
 
-  onClicked(info: any, tab: any) {
-    if (!tab.id) {
-      return;
+    async onClickedDTARegular(info: MenuClickInfo, tab: Tab) {
+      return await this.performSelection({
+        selectionOnly: false,
+        allTabs: false,
+        turbo: false,
+        tab,
+      });
     }
-    const {menuItemId} = info;
-    const {[`onClicked${menuItemId}`]: handler}: any = this;
-    if (!handler) {
-      console.error("Invalid Handler for", menuItemId);
-      return;
+
+    async onClickedDTARegularAll(info: MenuClickInfo, tab: Tab) {
+      return await this.performSelection({
+        selectionOnly: false,
+        allTabs: true,
+        turbo: false,
+        tab,
+      });
     }
-    handler.call(this, info, tab).catch(console.error);
-  }
 
-  async onClickedDTARegularInternal(
-      selectionOnly: boolean, info: any, tab: any) {
-    try {
-      await this.processResults(
-        false,
-        await runContentJob(
-          tab, "/bundles/content-gather.js", {
-            type: "DTA:gather",
-            selectionOnly,
-            textLinks: await Prefs.get("text-links", true),
-            schemes: Array.from(ALLOWED_SCHEMES.values()),
-            transferable: TRANSFERABLE_PROPERTIES,
-          }));
+    async onClickedDTARegularSelection(info: MenuClickInfo, tab: Tab) {
+      return await this.performSelection({
+        selectionOnly: true,
+        allTabs: false,
+        turbo: false,
+        tab,
+      });
     }
-    catch (ex) {
-      console.error(ex);
+
+    async onClickedDTATurbo(info: MenuClickInfo, tab: Tab) {
+      return await this.performSelection({
+        selectionOnly: false,
+        allTabs: false,
+        turbo: true,
+        tab,
+      });
     }
-  }
 
-  async onClickedDTARegular(info: any, tab: any) {
-    return await this.onClickedDTARegularInternal(false, info, tab);
-  }
-
-  async onClickedDTARegularSelection(info: any, tab: any) {
-    return await this.onClickedDTARegularInternal(true, info, tab);
-  }
-
-  async onClickedDTATurboInternal(selectionOnly: boolean, info: any, tab: any) {
-    try {
-      await this.processResults(
-        true,
-        await runContentJob(
-          tab, "/bundles/content-gather.js", {
-            type: "DTA:gather",
-            selectionOnly,
-            textLinks: await Prefs.get("text-links", true),
-            schemes: Array.from(ALLOWED_SCHEMES.values()),
-            transferable: TRANSFERABLE_PROPERTIES,
-          }));
+    async onClickedDTATurboAll(info: MenuClickInfo, tab: Tab) {
+      return await this.performSelection({
+        selectionOnly: false,
+        allTabs: true,
+        turbo: true,
+        tab,
+      });
     }
-    catch (ex) {
-      console.error(ex);
+
+    async onClickedDTATurboSelection(info: MenuClickInfo, tab: Tab) {
+      return await this.performSelection({
+        selectionOnly: true,
+        allTabs: false,
+        turbo: true,
+        tab,
+      });
     }
-  }
 
-  async onClickedDTATurbo(info: any, tab: any) {
-    return await this.onClickedDTATurboInternal(false, info, tab);
-  }
+    async onClickedDTARegularLink(info: MenuClickInfo, tab: Tab) {
+      if (!info.linkUrl) {
+        return;
+      }
+      await this.findSingleItem(tab, info.linkUrl, false);
+    }
 
-  async onClickedDTATurboSelection(info: any, tab: any) {
-    return await this.onClickedDTATurboInternal(false, info, tab);
-  }
+    async onClickedDTATurboLink(info: MenuClickInfo, tab: Tab) {
+      if (!info.linkUrl) {
+        return;
+      }
+      await this.findSingleItem(tab, info.linkUrl, true);
+    }
 
-  async onClickedDTARegularLink(info: any, tab: any) {
-    return await this.findSingleItem(tab, info.linkUrl, false);
-  }
+    async onClickedDTARegularImage(info: MenuClickInfo, tab: Tab) {
+      if (!info.srcUrl) {
+        return;
+      }
+      await this.findSingleItem(tab, info.srcUrl, false);
+    }
 
-  async onClickedDTATurboLink(info: any, tab: any) {
-    return await this.findSingleItem(tab, info.linkUrl, true);
-  }
+    async onClickedDTATurboImage(info: MenuClickInfo, tab: Tab) {
+      if (!info.srcUrl) {
+        return;
+      }
+      await this.findSingleItem(tab, info.srcUrl, true);
+    }
 
-  async onClickedDTARegularImage(info: any, tab: any) {
-    return await this.findSingleItem(tab, info.srcUrl, false);
-  }
+    async onClickedDTARegularMedia(info: MenuClickInfo, tab: Tab) {
+      if (!info.srcUrl) {
+        return;
+      }
+      await this.findSingleItem(tab, info.srcUrl, false);
+    }
 
-  async onClickedDTATurboImage(info: any, tab: any) {
-    return await this.findSingleItem(tab, info.srcUrl, true);
-  }
+    async onClickedDTATurboMedia(info: MenuClickInfo, tab: Tab) {
+      if (!info.srcUrl) {
+        return;
+      }
+      await this.findSingleItem(tab, info.srcUrl, true);
+    }
 
-  async onClickedDTARegularMedia(info: any, tab: any) {
-    return await this.findSingleItem(tab, info.srcUrl, false);
-  }
+    onClickedDTAAdd() {
+      API.singleRegular(null);
+    }
 
-  async onClickedDTATurboMedia(info: any, tab: any) {
-    return await this.findSingleItem(tab, info.srcUrl, true);
-  }
+    async onClickedDTAManager() {
+      await openManager();
+    }
 
-  async onClickedDTAManager() {
-    await openManager();
-  }
+    async onClickedDTAPrefs() {
+      await openPrefs();
+    }
+  }();
 
-  async onClickedDTAPrefs() {
-    await openPrefs();
-  }
-}();
+  new class Action extends Handler {
+    constructor() {
+      super();
+      this.onClicked = this.onClicked.bind(this);
+      action.onClicked.addListener(this.onClicked);
+      Prefs.get("button-type", false).then(v => this.adjust(v));
+      Prefs.on("button-type", (prefs, key, value) => {
+        this.adjust(value);
+      });
+    }
 
-(async function init() {
-  await Prefs.set("last-run", new Date());
-  await filters();
-  await getManager();
-})().catch(ex => {
-  console.error("Failed to init components", ex.toString(), ex.stack, ex);
+    adjust(type: string) {
+      action.setPopup({
+        popup: type !== "popup" ? "" : "/windows/popup.html"
+      });
+      let icons;
+      switch (type) {
+      case "popup":
+        icons = {
+          16: "/style/icon16.png",
+          32: "/style/icon32.png",
+          48: "/style/icon48.png",
+          64: "/style/icon64.png",
+          96: "/style/icon96.png",
+          128: "/style/icon128.png",
+          256: "/style/icon256.png"
+        };
+        break;
+
+      case "dta":
+        icons = {
+          16: "/style/button-regular.png",
+          32: "/style/button-regular@2x.png",
+        };
+        break;
+
+      case "turbo":
+        icons = {
+          16: "/style/button-turbo.png",
+          32: "/style/button-turbo@2x.png",
+        };
+        break;
+
+      case "manager":
+        icons = {
+          16: "/style/button-manager.png",
+          32: "/style/button-manager@2x.png",
+        };
+        break;
+      }
+      action.setIcon({path: icons});
+    }
+
+    async onClicked() {
+      switch (await Prefs.get("button-type")) {
+      case "popup":
+        break;
+
+      case "dta":
+        menuHandler.emulate("DTARegular");
+        break;
+
+      case "turbo":
+        menuHandler.emulate("DTATurbo");
+        break;
+
+      case "manager":
+        menuHandler.emulate("DTAManager");
+        break;
+      }
+    }
+  }();
+
+
+  Bus.on("do-regular", () => menuHandler.emulate("DTARegular"));
+  Bus.on("do-regular-all", () => menuHandler.emulate("DTARegularAll"));
+  Bus.on("do-turbo", () => menuHandler.emulate("DTATurbo"));
+  Bus.on("do-turbo-all", () => menuHandler.emulate("DTATurboAll"));
+  Bus.on("do-single", () => API.singleRegular(null));
+  Bus.on("open-manager", () => openManager(true));
+  Bus.on("open-prefs", () => openPrefs());
+
+  (async function init() {
+    const urlBase = runtime.getURL("");
+    history.onVisited.addListener(({url}: {url: string}) => {
+      if (!url || !url.startsWith(urlBase)) {
+        return;
+      }
+      history.deleteUrl({url});
+    });
+    const results: {url?: string}[] = await history.search({text: urlBase});
+    for (const {url} of results) {
+      if (!url) {
+        continue;
+      }
+      history.deleteUrl({url});
+    }
+
+    if (!CHROME) {
+      const sessionRemover = async () => {
+        for (const s of await sessions.getRecentlyClosed()) {
+          if (s.tab) {
+            if (s.tab.url.startsWith(urlBase)) {
+              await sessions.forgetClosedTab(s.tab.windowId, s.tab.sessionId);
+            }
+            continue;
+          }
+          if (!s.window || !s.window.tabs || s.window.tabs.length > 1) {
+            continue;
+          }
+          const [tab] = s.window.tabs;
+          if (tab.url.startsWith(urlBase)) {
+            await sessions.forgetClosedWindow(s.window.sessionId);
+          }
+        }
+      };
+      sessions.onChanged.addListener(sessionRemover);
+      await sessionRemover();
+    }
+
+    await Prefs.set("last-run", new Date());
+    await filters();
+    await getManager();
+  })().catch(ex => {
+    console.error("Failed to init components", ex.toString(), ex.stack, ex);
+  });
 });

lib/batches.ts

@@ -98,9 +98,9 @@ export class BatchGenerator implements Generator {
 
   public readonly hasInvalid: boolean;
 
-  public readonly length: any;
+  public readonly length: number;
 
-  public readonly preview: any;
+  public readonly preview: string;
 
   constructor(str: string) {
     this.gens = [];

lib/browser.ts

@@ -3,15 +3,109 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const polyfill = require("webextension-polyfill");
 
-export const {i18n} = polyfill;
-export const {extension} = polyfill;
-export const {notifications} = polyfill;
+interface ExtensionListener {
+  addListener: (listener: Function) => void;
+  removeListener: (listener: Function) => void;
+}
+
+export interface MessageSender {
+  tab?: Tab;
+  frameId?: number;
+  id?: number;
+  url?: string;
+  tlsChannelId?: string;
+}
+
+
+export interface Tab {
+  id?: number;
+  incognito?: boolean;
+}
+
+export interface MenuClickInfo {
+  menuItemId: string | number;
+  button?: number;
+  linkUrl?: string;
+  srcUrl?: string;
+}
+
+
+export interface RawPort {
+  error: any;
+  name: string;
+  onDisconnect: ExtensionListener;
+  onMessage: ExtensionListener;
+  sender?: MessageSender;
+  disconnect: () => void;
+  postMessage: (message: any) => void;
+}
+
+interface WebRequestFilter {
+  urls?: string[];
+}
+
+interface WebRequestListener {
+  addListener(
+    callback: Function,
+    filter: WebRequestFilter,
+    extraInfoSpec: string[]
+    ): void;
+  removeListener(callback: Function): void;
+}
+
+type Header = {name: string; value: string};
+
+export interface DownloadOptions {
+  conflictAction: string;
+  filename: string;
+  saveAs: boolean;
+  url: string;
+  method?: string;
+  body?: string;
+  incognito?: boolean;
+  headers: Header[];
+}
+
+export interface DownloadsQuery {
+  id?: number;
+}
+
+interface Downloads {
+  download(download: DownloadOptions): Promise<number>;
+  open(manId: number): Promise<void>;
+  show(manId: number): Promise<void>;
+  pause(manId: number): Promise<void>;
+  resume(manId: number): Promise<void>;
+  cancel(manId: number): Promise<void>;
+  erase(query: DownloadsQuery): Promise<void>;
+  search(query: DownloadsQuery): Promise<any[]>;
+  getFileIcon(id: number, options?: any): Promise<string>;
+  setShelfEnabled(state: boolean): void;
+  removeFile(manId: number): Promise<void>;
+  onCreated: ExtensionListener;
+  onChanged: ExtensionListener;
+  onErased: ExtensionListener;
+}
+
+interface WebRequest {
+  onBeforeSendHeaders: WebRequestListener;
+  onSendHeaders: WebRequestListener;
+  onHeadersReceived: WebRequestListener;
+}
+
 export const {browserAction} = polyfill;
 export const {contextMenus} = polyfill;
-export const {downloads} = polyfill;
+export const {downloads}: {downloads: Downloads} = polyfill;
+export const {extension} = polyfill;
+export const {history} = polyfill;
 export const {menus} = polyfill;
+export const {notifications} = polyfill;
 export const {runtime} = polyfill;
+export const {sessions} = polyfill;
 export const {storage} = polyfill;
 export const {tabs} = polyfill;
 export const {webNavigation} = polyfill;
+export const {webRequest}: {webRequest: WebRequest} = polyfill;
 export const {windows} = polyfill;
+
+export const CHROME = navigator.appVersion.includes("Chrome/");

lib/bus.ts

@@ -2,22 +2,18 @@
 // License: MIT
 
 import { EventEmitter } from "./events";
-import {runtime, tabs} from "./browser";
+// eslint-disable-next-line no-unused-vars
+import {runtime, tabs, RawPort, MessageSender} from "./browser";
 
 export class Port extends EventEmitter {
-  private port: any;
+  private port: RawPort | null;
 
-  constructor(port: any) {
+  constructor(port: RawPort) {
     super();
     this.port = port;
 
     let disconnected = false;
-    let tabListener: any;
     const disconnect = () => {
-      if (tabListener) {
-        tabs.onRemoved.removeListener(tabListener);
-        tabListener = null;
-      }
       if (disconnected) {
         return;
       }
@@ -41,11 +37,17 @@ export class Port extends EventEmitter {
   }
 
   get name() {
+    if (!this.port) {
+      return null;
+    }
     return this.port.name;
   }
 
   get id() {
-    return this.port.sender && this.port.sender.extensionId;
+    if (!this.port || !this.port.sender) {
+      return null;
+    }
+    return this.port.sender.id;
   }
 
   get isSelf() {
@@ -53,6 +55,9 @@ export class Port extends EventEmitter {
   }
 
   post(msg: string, ...data: any[]) {
+    if (!this.port) {
+      return;
+    }
     if (!data) {
       this.port.postMessage({msg});
       return;
@@ -64,14 +69,17 @@ export class Port extends EventEmitter {
   }
 
   onMessage(message: any) {
-    if (Object.keys(message).includes("msg")) {
-      this.emit(message.msg, message);
+    if (!this.port) {
       return;
     }
     if (Array.isArray(message)) {
       message.forEach(this.onMessage, this);
       return;
     }
+    if (Object.keys(message).includes("msg")) {
+      this.emit(message.msg, message);
+      return;
+    }
     if (typeof message === "string") {
       this.emit(message);
       return;
@@ -99,7 +107,7 @@ export const Bus = new class extends EventEmitter {
     runtime.onConnect.addListener(this.onConnect.bind(this));
   }
 
-  onMessage(msg: any, sender: any, callback: any) {
+  onMessage(msg: any, sender: MessageSender, callback: any) {
     let {type = null} = msg;
     if (!type) {
       type = msg;
@@ -107,7 +115,7 @@ export const Bus = new class extends EventEmitter {
     this.emit(type, msg, callback);
   }
 
-  onConnect(port: any) {
+  onConnect(port: RawPort) {
     if (!port.name) {
       port.disconnect();
       return;

lib/cdheaderparser.ts

@@ -0,0 +1,230 @@
+/**
+ * (c) 2017 Rob Wu <rob@robwu.nl> (https://robwu.nl)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+/* eslint-disable max-len,no-magic-numbers */
+// License: MPL-2
+
+/**
+  * This typescript port was done by Nils Maier based on
+  * https://github.com/Rob--W/open-in-browser/blob/83248155b633ed41bc9cdb1205042653e644abd2/extension/content-disposition.js
+  * Special thanks goes to Rob doing all the heavy lifting and putting
+  * it together in a reuseable, open source'd library.
+  */
+
+const R_RFC6266 = /(?:^|;)\s*filename\*\s*=\s*([^";\s][^;\s]*|"(?:[^"\\]|\\"?)+"?)/i;
+const R_RFC5987 = /(?:^|;)\s*filename\s*=\s*([^";\s][^;\s]*|"(?:[^"\\]|\\"?)+"?)/i;
+
+function unquoteRFC2616(value: string) {
+  if (!value.startsWith("\"")) {
+    return value;
+  }
+
+  const parts = value.slice(1).split("\\\"");
+  // Find the first unescaped " and terminate there.
+  for (let i = 0; i < parts.length; ++i) {
+    const quotindex = parts[i].indexOf("\"");
+    if (quotindex !== -1) {
+      parts[i] = parts[i].slice(0, quotindex);
+      // Truncate and stop the iteration.
+      parts.length = i + 1;
+    }
+    parts[i] = parts[i].replace(/\\(.)/g, "$1");
+  }
+  value = parts.join("\"");
+  return value;
+}
+
+export class CDHeaderParser {
+  private needsFixup: boolean;
+
+  // We need to keep this per instance, because of the global flag.
+  // Hence we need to reset it after a use.
+  private R_MULTI = /(?:^|;)\s*filename\*((?!0\d)\d+)(\*?)\s*=\s*([^";\s][^;\s]*|"(?:[^"\\]|\\"?)+"?)/gi;
+
+  /**
+   * Parse a content-disposition header, with relaxed spec tolerance
+   *
+   * @param {string} header Header to parse
+   * @returns {string} Parsed header
+   */
+  parse(header: string) {
+    this.needsFixup = true;
+
+    // filename*=ext-value ("ext-value" from RFC 5987, referenced by RFC 6266).
+    {
+      const match = R_RFC6266.exec(header);
+      if (match) {
+        const [, tmp] = match;
+        let filename = unquoteRFC2616(tmp);
+        filename = unescape(filename);
+        filename = this.decodeRFC5897(filename);
+        filename = this.decodeRFC2047(filename);
+        return this.maybeFixupEncoding(filename);
+      }
+    }
+
+    // Continuations (RFC 2231 section 3, referenced by RFC 5987 section 3.1).
+    // filename*n*=part
+    // filename*n=part
+    {
+      const tmp = this.getParamRFC2231(header);
+      if (tmp) {
+        // RFC 2047, section
+        const filename = this.decodeRFC2047(tmp);
+        return this.maybeFixupEncoding(filename);
+      }
+    }
+
+    // filename=value (RFC 5987, section 4.1).
+    {
+      const match = R_RFC5987.exec(header);
+      if (match) {
+        const [, tmp] = match;
+        let filename = unquoteRFC2616(tmp);
+        filename = this.decodeRFC2047(filename);
+        return this.maybeFixupEncoding(filename);
+      }
+    }
+    return "";
+  }
+
+  private maybeDecode(encoding: string, value: string) {
+    if (!encoding) {
+      return value;
+    }
+    const bytes = Array.from(value, c => c.charCodeAt(0));
+    if (!bytes.every(code => code <= 0xff)) {
+      return value;
+    }
+    try {
+      value = new TextDecoder(encoding, {fatal: true}).
+        decode(new Uint8Array(bytes));
+      this.needsFixup = false;
+    }
+    catch {
+      // TextDecoder constructor threw - unrecognized encoding.
+    }
+    return value;
+  }
+
+  private maybeFixupEncoding(value: string) {
+    if (!this.needsFixup && /[\x80-\xff]/.test(value)) {
+      return value;
+    }
+
+    // Maybe multi-byte UTF-8.
+    value = this.maybeDecode("utf-8", value);
+    if (!this.needsFixup) {
+      return value;
+    }
+
+    // Try iso-8859-1 encoding.
+    return this.maybeDecode("iso-8859-1", value);
+  }
+
+  private getParamRFC2231(value: string) {
+    const matches: string[][] = [];
+
+    // Iterate over all filename*n= and filename*n*= with n being an integer
+    // of at least zero. Any non-zero number must not start with '0'.
+    let match;
+    this.R_MULTI.lastIndex = 0;
+    while ((match = this.R_MULTI.exec(value)) !== null) {
+      const [, num, quot, part] = match;
+      const n = parseInt(num, 10);
+      if (n in matches) {
+        // Ignore anything after the invalid second filename*0.
+        if (n === 0) {
+          break;
+        }
+        continue;
+      }
+      matches[n] = [quot, part];
+    }
+
+    const parts: string[] = [];
+    for (let n = 0; n < matches.length; ++n) {
+      if (!(n in matches)) {
+        // Numbers must be consecutive. Truncate when there is a hole.
+        break;
+      }
+      const [quot, rawPart] = matches[n];
+      let part = unquoteRFC2616(rawPart);
+      if (quot) {
+        part = unescape(part);
+        if (n === 0) {
+          part = this.decodeRFC5897(part);
+        }
+      }
+      parts.push(part);
+    }
+    return parts.join("");
+  }
+
+  private decodeRFC2047(value: string) {
+    // RFC 2047-decode the result. Firefox tried to drop support for it, but
+    // backed out because some servers use it - https://bugzil.la/875615
+    // Firefox's condition for decoding is here:
+
+    // eslint-disable-next-line max-len
+    // https://searchfox.org/mozilla-central/rev/4a590a5a15e35d88a3b23dd6ac3c471cf85b04a8/netwerk/mime/nsMIMEHeaderParamImpl.cpp#742-748
+
+    // We are more strict and only recognize RFC 2047-encoding if the value
+    // starts with "=?", since then it is likely that the full value is
+    // RFC 2047-encoded.
+
+    // Firefox also decodes words even where RFC 2047 section 5 states:
+    // "An 'encoded-word' MUST NOT appear within a 'quoted-string'."
+
+    // eslint-disable-next-line no-control-regex
+    if (!value.startsWith("=?") || /[\x00-\x19\x80-\xff]/.test(value)) {
+      return value;
+    }
+    // RFC 2047, section 2.4
+    // encoded-word = "=?" charset "?" encoding "?" encoded-text "?="
+    // charset = token (but let's restrict to characters that denote a
+    //           possibly valid encoding).
+    // encoding = q or b
+    // encoded-text = any printable ASCII character other than ? or space.
+    //                ... but Firefox permits ? and space.
+    return value.replace(
+      /=\?([\w-]*)\?([QqBb])\?((?:[^?]|\?(?!=))*)\?=/g,
+      (_, charset, encoding, text) => {
+        if (encoding === "q" || encoding === "Q") {
+          // RFC 2047 section 4.2.
+          text = text.replace(/_/g, " ");
+          text = text.replace(/=([0-9a-fA-F]{2})/g,
+            (_: string, hex: string) => String.fromCharCode(parseInt(hex, 16)));
+          return this.maybeDecode(charset, text);
+        }
+
+        // else encoding is b or B - base64 (RFC 2047 section 4.1)
+        try {
+          text = atob(text);
+        }
+        catch {
+          // ignored
+        }
+        return this.maybeDecode(charset, text);
+      });
+  }
+
+  private decodeRFC5897(extValue: string) {
+    // Decodes "ext-value" from RFC 5987.
+    const extEnd = extValue.indexOf("'");
+    if (extEnd < 0) {
+      // Some servers send "filename*=" without encoding'language' prefix,
+      // e.g. in https://github.com/Rob--W/open-in-browser/issues/26
+      // Let's accept the value like Firefox (57) (Chrome 62 rejects it).
+      return extValue;
+    }
+    const encoding = extValue.slice(0, extEnd);
+    const langvalue = extValue.slice(extEnd + 1);
+    // Ignore language (RFC 5987 section 3.2.1, and RFC 6266 section 4.1 ).
+    return this.maybeDecode(encoding, langvalue.replace(/^[^']*'/, ""));
+  }
+}

lib/db.ts

@@ -1,5 +1,11 @@
 "use strict";
 
+// eslint-disable-next-line no-unused-vars
+import { BaseItem } from "./item";
+// eslint-disable-next-line no-unused-vars
+import { Download } from "./manager/download";
+import { RUNNING, QUEUED, RETRYING } from "./manager/state";
+
 // License: MIT
 
 const VERSION = 1;
@@ -40,12 +46,12 @@ export const DB = new class DB {
     });
   }
 
-  getAllInternal(resolve: (items: any[]) => void, reject: Function) {
+  getAllInternal(resolve: (items: BaseItem[]) => void, reject: Function) {
     if (!this.db) {
       reject(new Error("db closed"));
       return;
     }
-    const items: any[] = [];
+    const items: BaseItem[] = [];
     const transaction = this.db.transaction(STORE, "readonly");
     transaction.onerror = ex => reject(ex);
     const store = transaction.objectStore(STORE);
@@ -66,7 +72,7 @@ export const DB = new class DB {
     return await new Promise(this.getAllInternal);
   }
 
-  saveItemsInternal(items: any[], resolve: Function, reject: Function) {
+  saveItemsInternal(items: Download[], resolve: Function, reject: Function) {
     if (!items || !items.length || !this.db) {
       resolve();
       return;
@@ -80,9 +86,13 @@ export const DB = new class DB {
         if (item.private) {
           continue;
         }
-        const req = store.put(item.toJSON());
+        const json = item.toJSON();
+        if (item.state === RUNNING || item.state === RETRYING) {
+          json.state = QUEUED;
+        }
+        const req = store.put(json);
         if (!("dbId" in item) || item.dbId < 0) {
-          req.onsuccess = () => item.dbId = req.result;
+          req.onsuccess = () => item.dbId = req.result as number;
         }
       }
     }
@@ -91,7 +101,7 @@ export const DB = new class DB {
     }
   }
 
-  async saveItems(items: any[]) {
+  async saveItems(items: Download[]) {
     await this.init();
     return await new Promise(this.saveItemsInternal.bind(this, items));
   }

lib/filters.ts

@@ -4,13 +4,16 @@
 import uuid from "./uuid";
 
 import "./objectoverlay";
-import { storage, i18n } from "./browser";
+import { storage } from "./browser";
 import { EventEmitter } from "./events";
-import { Prefs } from "./prefs";
 import { TYPE_LINK, TYPE_MEDIA, TYPE_ALL } from "./constants";
 // eslint-disable-next-line no-unused-vars
 import { Overlayable } from "./objectoverlay";
-import * as DEFAULT_FILTERS from "../data/filters.json";
+import DEFAULT_FILTERS from "../data/filters.json";
+import { FASTFILTER } from "./recentlist";
+import { _, locale } from "./i18n";
+// eslint-disable-next-line no-unused-vars
+import { BaseItem } from "./item";
 
 const REG_ESCAPE = /[{}()[\]\\^$.]/g;
 const REG_FNMATCH = /[*?]/;
@@ -91,7 +94,7 @@ function *parseIntoRegexpInternal(str: string): Iterable<RegExp> {
 
   // multi-expression
   if (str.includes(",")) {
-    for (const part in str.split(",")) {
+    for (const part of str.split(",")) {
       yield *parseIntoRegexpInternal(part);
     }
     return;
@@ -173,25 +176,37 @@ export class Matcher {
   }
   /* eslint-enable no-unused-vars */
 
-  matchItem(item: any) {
+  matchItem(item: BaseItem) {
     const {usable = "", title = "", description = "", fileName = ""} = item;
     return this.match(usable) || this.match(title) ||
              this.match(description) || this.match(fileName);
   }
 }
 
+interface RawFilter extends Object {
+  active: boolean;
+  type: number;
+  label: string;
+  expr: string;
+  icon?: string;
+  custom?: boolean;
+  isOverridden?: (prop: string) => boolean;
+  reset?: () => void;
+  toJSON?: () => any;
+}
+
 export class Filter {
   private readonly owner: Filters;
 
-  public readonly id: any;
+  public readonly id: string | symbol;
 
-  private readonly raw: any;
+  private readonly raw: RawFilter;
 
   private _label: string;
 
   private _reg: Matcher;
 
-  constructor(owner: Filters, id: any, raw: any) {
+  constructor(owner: Filters, id: string | symbol, raw: RawFilter) {
     if (!owner || !id || !raw) {
       throw new Error("null argument");
     }
@@ -203,9 +218,11 @@ export class Filter {
 
   init() {
     this._label = this.raw.label;
-    if (this.id !== FAST && this.id.startsWith("deffilter-") &&
-      !this.raw.isOverridden("label")) {
-      this._label = i18n.getMessage(this.id) || this._label;
+    if (typeof this.raw.isOverridden !== "undefined" &&
+        typeof this.id === "string") {
+      if (this.id.startsWith("deffilter-") && !this.raw.isOverridden("label")) {
+        this._label = _(this.id) || this._label;
+      }
     }
     this._reg = Matcher.fromExpression(this.expr);
     Object.seal(this);
@@ -281,7 +298,7 @@ export class Filter {
   }
 
   async reset() {
-    if (this.raw.custom) {
+    if (!this.raw.reset) {
       throw Error("Cannot reset non-default filter");
     }
     this.raw.reset();
@@ -291,7 +308,10 @@ export class Filter {
 
   async "delete"() {
     if (!this.raw.custom) {
-      throw Error("Cannot delete default filter");
+      throw new Error("Cannot delete default filter");
+    }
+    if (typeof this.id !== "string") {
+      throw new Error("Cannot delete symbolized");
     }
     await this.owner.delete(this.id);
   }
@@ -300,7 +320,7 @@ export class Filter {
     return this._reg.match(str);
   }
 
-  matchItem(item: any) {
+  matchItem(item: BaseItem) {
     return this._reg.matchItem(item);
   }
 
@@ -315,8 +335,7 @@ class FastFilter extends Filter {
       throw new Error("Invalid fast filter value");
     }
     super(owner, FAST, {
-      id: FAST,
-      label: FAST,
+      label: "fast",
       type: TYPE_ALL,
       active: true,
       expr: value,
@@ -351,8 +370,6 @@ class Filters extends EventEmitter {
 
   private filters: Filter[];
 
-  private fastFilter: string | null;
-
   ignoreNext: boolean;
 
   private readonly typeMatchers: Map<number, Matcher>;
@@ -362,10 +379,8 @@ class Filters extends EventEmitter {
     this.typeMatchers = new Map();
     this.loaded = false;
     this.filters = [];
-    this.fastFilter = null;
     this.ignoreNext = false;
     this.regenerate();
-    Prefs.on("fast-filter", this.updateFastFilter.bind(this));
     storage.onChanged.addListener(async (changes: any) => {
       if (this.ignoreNext) {
         this.ignoreNext = false;
@@ -403,6 +418,7 @@ class Filters extends EventEmitter {
     const id = `custom-${uuid()}`;
     const filter = new Filter(this, id, {
       active: true,
+      custom: true,
       label,
       expr,
       type,
@@ -411,11 +427,11 @@ class Filters extends EventEmitter {
     await this.save();
   }
 
-  "get"(id: any) {
+  "get"(id: string | symbol) {
     return this.filters.find(e => e.id === id);
   }
 
-  async "delete"(id: any) {
+  async "delete"(id: string) {
     const idx = this.filters.findIndex(e => e.id === id);
     if (idx < 0) {
       return;
@@ -438,21 +454,12 @@ class Filters extends EventEmitter {
     return new FastFilter(this, value);
   }
 
-  getFastFilter() {
-    if (!this.fastFilter) {
-      throw new Error("Nothing stored");
+  async getFastFilter() {
+    await FASTFILTER.init();
+    if (!FASTFILTER.current) {
+      return null;
     }
-    return new FastFilter(this, this.fastFilter);
-  }
-
-  async setFastFilter(value: string) {
-    this.fastFilter = value || "";
-    await Prefs.set("fast-filter", this.fastFilter);
-  }
-
-  updateFastFilter(pref: any, key: string, value: string) {
-    this.fastFilter = value || null;
-    this.regenerate();
+    return new FastFilter(this, FASTFILTER.current);
   }
 
   regenerate() {
@@ -480,17 +487,6 @@ class Filters extends EventEmitter {
         console.error("Filter", current.label || "unknown", ex);
       }
     }
-    if (this.fastFilter) {
-      try {
-        const fastFilter = new FastFilter(this, this.fastFilter);
-        all.push(fastFilter);
-        links.push(fastFilter);
-        media.push(fastFilter);
-      }
-      catch (ex) {
-        console.error("fast filter", this.fastFilter, "is invalid", ex);
-      }
-    }
     this.typeMatchers.set(TYPE_ALL, new Matcher(all));
     this.typeMatchers.set(TYPE_LINK, new Matcher(links));
     this.typeMatchers.set(TYPE_MEDIA, new Matcher(media));
@@ -498,6 +494,7 @@ class Filters extends EventEmitter {
   }
 
   async load() {
+    await locale;
     const defaultFilters = DEFAULT_FILTERS as any;
     let savedFilters = (await storage.local.get("userFilters"));
     if (savedFilters && "userFilters" in savedFilters) {
@@ -534,14 +531,17 @@ class Filters extends EventEmitter {
         defaultFilters[filter]);
       this.filters.push(new Filter(this, filter, current));
     }
-    this.fastFilter = await Prefs.get("fast-filter", null);
     this.loaded = true;
     this.regenerate();
   }
 
-  filterItemsByType(items: any[], type: number) {
+  async filterItemsByType(items: BaseItem[], type: number) {
     const matcher = this.typeMatchers.get(type);
+    const fast = await this.getFastFilter();
     return items.filter(function(item) {
+      if (fast && fast.matchItem(item)) {
+        return true;
+      }
       return matcher && matcher.matchItem(item);
     });
   }
@@ -562,12 +562,14 @@ class Filters extends EventEmitter {
   }
 }
 
-let _filters: any;
+let _filters: Filters;
+let _loader: Promise<void>;
 
 export async function filters(): Promise<Filters> {
-  if (!_filters) {
+  if (!_loader) {
     _filters = new Filters();
-    await _filters.load();
+    _loader = _filters.load();
   }
+  await _loader;
   return _filters;
 }

lib/i18n.ts

@@ -2,50 +2,239 @@
 // License: MIT
 
 import {memoize} from "./memoize";
+import langs from "../_locales/all.json";
+import { sorted, naturalCaseCompare } from "./sorting";
 
-function load() {
-  try {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const {i18n} = require("webextension-polyfill");
 
-    return i18n;
+export const ALL_LANGS = Object.freeze(new Map<string, string>(
+  sorted(Object.entries(langs), e => {
+    return [e[1], e[0]];
+  }, naturalCaseCompare)));
+
+let CURRENT = "en";
+export function getCurrentLanguage() {
+  return CURRENT;
+}
+
+declare let browser: any;
+declare let chrome: any;
+
+const CACHE_KEY = "_cached_locales";
+const CUSTOM_KEY = "_custom_locale";
+
+const normalizer = /[^A-Za-z0-9_]/g;
+
+interface JSONEntry {
+  message: string;
+  placeholders: any;
+}
+
+class Entry {
+  private message: string;
+
+  constructor(entry: JSONEntry) {
+    if (!entry.message.includes("$")) {
+      throw new Error("Not entry-able");
+    }
+    let hit = false;
+    this.message = entry.message.replace(/\$[A-Z0-9]+\$/g, (r: string) => {
+      hit = true;
+      const id = r.substr(1, r.length - 2).toLocaleLowerCase();
+      const pholder = entry.placeholders[id];
+      if (!pholder || !pholder.content) {
+        throw new Error(`Invalid placeholder: ${id}`);
+      }
+      return `${pholder.content}$`;
+    });
+    if (!hit) {
+      throw new Error("Not entry-able");
+    }
   }
-  catch (ex) {
+
+  localize(args: any[]) {
+    return this.message.replace(/\$\d+\$/g, (r: string) => {
+      const idx = parseInt(r.substr(1, r.length - 2), 10) - 1;
+      return args[idx] || "";
+    });
+  }
+}
+
+class Localization {
+  private strings: Map<string, Entry | string>;
+
+  constructor(baseLanguage: any, ...overlayLanguages: any) {
+    this.strings = new Map();
+    const mapLanguage = (lang: any) => {
+      for (const [id, entry] of Object.entries<JSONEntry>(lang)) {
+        if (!entry.message) {
+          continue;
+        }
+        try {
+          if (entry.message.includes("$")) {
+            this.strings.set(id, new Entry(entry));
+          }
+          else {
+            this.strings.set(id, entry.message);
+          }
+        }
+        catch (ex) {
+          this.strings.set(id, entry.message);
+        }
+      }
+    };
+    mapLanguage(baseLanguage);
+    overlayLanguages.forEach(mapLanguage);
+  }
+
+  localize(id: string, ...args: any[]) {
+    const entry = this.strings.get(id.replace(normalizer, "_"));
+    if (!entry) {
+      return "";
+    }
+    if (typeof entry === "string") {
+      return entry;
+    }
+    if (args.length === 1 && Array.isArray(args)) {
+      [args] = args;
+    }
+    return entry.localize(args);
+  }
+}
+
+function checkBrowser() {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  if (typeof browser !== "undefined" && browser.i18n) {
+    return;
+  }
+  if (typeof chrome !== "undefined" && chrome.i18n) {
+    return;
+  }
+  throw new Error("not in a webext");
+}
+
+async function fetchLanguage(code: string) {
+  try {
+    const resp = await fetch(`/_locales/${code}/messages.json`);
+    return await resp.json();
+  }
+  catch {
+    return null;
+  }
+}
+
+
+function loadCached() {
+  if (document.location.pathname.includes("/windows/")) {
+    const cached = localStorage.getItem(CACHE_KEY);
+    if (cached) {
+      return JSON.parse(cached) as any[];
+    }
+  }
+  return null;
+}
+
+async function loadRawLocales() {
+  // en is the base locale, always to be loaded
+  // The loader will override string from it with more specific string
+  // from other locales
+  const langs = new Set<string>(["en"]);
+
+  const uiLang: string = (typeof browser !== "undefined" ? browser : chrome).
+    i18n.getUILanguage();
+
+  // Chrome will only look for underscore versions of locale codes,
+  // while Firefox will look for both.
+  // So we better normalize the code to the underscore version.
+  // However, the API seems to always return the dash-version.
+
+  // Add all base locales into ascending order of priority,
+  // starting with the most unspecific base locale, ending
+  // with the most specific locale.
+  // e.g. this will transform ["zh", "CN"] -> ["zh", "zh_CN"]
+  uiLang.split(/[_-]/g).reduce<string[]>((prev, curr) => {
+    prev.push(curr);
+    langs.add(prev.join("_"));
+    return prev;
+  }, []);
+
+  if (CURRENT && CURRENT !== "default") {
+    langs.delete(CURRENT);
+    langs.add(CURRENT);
+  }
+
+  const valid = Array.from(langs).filter(e => ALL_LANGS.has(e));
+  const fetched = await Promise.all(Array.from(valid, fetchLanguage));
+  return fetched.filter(e => !!e);
+}
+
+async function load(): Promise<Localization> {
+  try {
+    checkBrowser();
+    try {
+      let currentLang: any = "";
+      if (typeof browser !== "undefined") {
+        currentLang = await browser.storage.sync.get("language");
+      }
+      else {
+        currentLang = await new Promise(
+          resolve => chrome.storage.sync.get("language", resolve));
+      }
+      if ("language" in currentLang) {
+        currentLang = currentLang.language;
+      }
+      if (!currentLang || !currentLang.length) {
+        currentLang = "default";
+      }
+      CURRENT = currentLang;
+      // en is the base locale
+      let valid = loadCached();
+      if (!valid) {
+        valid = await loadRawLocales();
+        localStorage.setItem(CACHE_KEY, JSON.stringify(valid));
+      }
+      if (!valid.length) {
+        throw new Error("Could not lood ANY of these locales");
+      }
+
+      const custom = localStorage.getItem(CUSTOM_KEY);
+      if (custom) {
+        try {
+          valid.push(JSON.parse(custom));
+        }
+        catch (ex) {
+          console.error(ex);
+          // ignored
+        }
+      }
+
+      const base = valid.shift();
+      const rv = new Localization(base, ...valid);
+      return rv;
+    }
+    catch (ex) {
+      console.error("Failed to load locale", ex.toString(), ex.stack, ex);
+      return new Localization({});
+    }
+  }
+  catch {
     // We might be running under node for tests
 
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     const messages = require("../_locales/en/messages.json");
 
-    const map = new Map();
-    for (const [k, v] of Object.entries<any>(messages)) {
-      const {placeholders = {}} = v;
-      let {message = ""} = v;
-      for (const [pname, pval] of Object.entries<any>(placeholders)) {
-        message = message.replace(`$${pname.toUpperCase()}$`, `${pval.content}$`);
-      }
-      map.set(k, message);
-    }
-
-    return {
-      getMessage(id: string, subst: string[]) {
-        const m = map.get(id);
-        if (typeof subst === undefined) {
-          return m;
-        }
-        if (!Array.isArray(subst)) {
-          subst = [subst];
-        }
-        return m.replace(/\$\d+\$/g, (r: string) => {
-          const idx = parseInt(r.substr(1, r.length - 2), 10) - 1;
-          return subst[idx] || "";
-        });
-      }
-    };
+    return new Localization(messages);
   }
 }
 
-const i18n = load();
-const memoGetMessage = memoize(i18n.getMessage, 10 * 1000, 0);
+type MemoLocalize = (id: string, ...args: any[]) => string;
+
+export const locale = load();
+let loc: Localization | null;
+let memoLocalize: MemoLocalize | null = null;
+locale.then(l => {
+  loc = l;
+  memoLocalize = memoize(loc.localize.bind(loc), 10 * 1000, 10);
+});
 
 /**
  * Localize a message
@@ -53,22 +242,22 @@ const memoGetMessage = memoize(i18n.getMessage, 10 * 1000, 0);
  * @param {string[]} [subst] Message substituations
  * @returns {string} Localized message
  */
-function _(id: string, ...subst: any[]) {
+export function _(id: string, ...subst: any[]) {
+  if (!loc || !memoLocalize) {
+    console.trace("TOO SOON");
+    throw new Error("Called too soon");
+  }
   if (!subst.length) {
-    return memoGetMessage(id);
+    return memoLocalize(id);
   }
-  if (subst.length === 1 && Array.isArray(subst[0])) {
-    subst = subst.pop();
-  }
-  return i18n.getMessage(id, subst);
+  return loc.localize(id, subst);
 }
 
-/**
- * Localize a DOM
- * @param {Element} elem DOM to localize
- * @returns {Element} Passed in element (fluent)
- */
-function localize(elem: HTMLElement) {
+function localize_<T extends HTMLElement | DocumentFragment>(elem: T): T {
+  for (const tmpl of elem.querySelectorAll<HTMLTemplateElement>("template")) {
+    localize_(tmpl.content);
+  }
+
   for (const el of elem.querySelectorAll<HTMLElement>("*[data-i18n]")) {
     const {i18n: i} = el.dataset;
     if (!i) {
@@ -99,8 +288,25 @@ function localize(elem: HTMLElement) {
   for (const el of document.querySelectorAll("*[data-l18n]")) {
     console.error("wrong!", el);
   }
-  return elem;
+  return elem as T;
 }
 
+/**
+ * Localize a DOM
+ * @param {Element} elem DOM to localize
+ * @returns {Element} Passed in element (fluent)
+ */
+export async function localize<T extends HTMLElement | DocumentFragment>(
+    elem: T): Promise<T> {
+  await locale;
+  return localize_(elem);
+}
 
-export {localize, _};
+export function saveCustomLocale(data?: string) {
+  if (!data) {
+    localStorage.removeItem(CUSTOM_KEY);
+    return;
+  }
+  new Localization(JSON.parse(data));
+  localStorage.setItem(CUSTOM_KEY, data);
+}

lib/iconcache.ts

@@ -0,0 +1,162 @@
+"use strict";
+// License: MIT
+
+import { downloads, CHROME } from "./browser";
+import { EventEmitter } from "../uikit/lib/events";
+import { PromiseSerializer } from "./pserializer";
+
+const VERSION = 1;
+const STORE = "iconcache";
+// eslint-disable-next-line no-magic-numbers
+const CACHE_SIZES = CHROME ? [16, 32] : [16, 32, 64, 127];
+
+const BLACKLISTED = Object.freeze(new Set([
+  "",
+  "ext",
+  "ico",
+  "pif",
+  "scr",
+  "ani",
+  "cur",
+  "ttf",
+  "otf",
+  "woff",
+  "woff2",
+  "cpl",
+  "desktop",
+  "app",
+]));
+
+async function getIcon(size: number, manId: number) {
+  const raw = await downloads.getFileIcon(manId, {size});
+  const icon = new URL(raw);
+  if (icon.protocol === "data:") {
+    const res = await fetch(icon.toString());
+    const blob = await res.blob();
+    return {size, icon: blob};
+  }
+  return {size, icon};
+}
+
+const SYNONYMS = Object.freeze(new Map<string, string>([
+  ["jpe", "jpg"],
+  ["jpeg", "jpg"],
+  ["jfif", "jpg"],
+  ["mpe", "mpg"],
+  ["mpeg", "mpg"],
+  ["m4v", "mp4"],
+]));
+
+export const IconCache = new class IconCache extends EventEmitter {
+  private db: Promise<IDBDatabase>;
+
+  private cache: Map<string, string>;
+
+  constructor() {
+    super();
+    this.db = this.init();
+    this.cache = new Map();
+    this.get = PromiseSerializer.wrapNew(8, this, this.get);
+    this.set = PromiseSerializer.wrapNew(1, this, this.set);
+  }
+
+  private async init() {
+    return await new Promise<IDBDatabase>((resolve, reject) => {
+      const req = indexedDB.open(STORE, VERSION);
+      req.onupgradeneeded = evt => {
+        const db = req.result;
+        switch (evt.oldVersion) {
+        case 0: {
+          db.createObjectStore(STORE);
+          break;
+        }
+        }
+      };
+      req.onerror = ex => reject(ex);
+      req.onsuccess = () => {
+        resolve(req.result);
+      };
+    });
+  }
+
+  private normalize(ext: string) {
+    ext = ext.toLocaleLowerCase();
+    return SYNONYMS.get(ext) || ext;
+  }
+
+  // eslint-disable-next-line no-magic-numbers
+  async get(ext: string, size = 16) {
+    ext = this.normalize(ext);
+    if (BLACKLISTED.has(ext)) {
+      return undefined;
+    }
+    const sext = `${ext}-${size}`;
+    let rv = this.cache.get(sext);
+    if (rv) {
+      return rv;
+    }
+    const db = await this.db;
+    rv = this.cache.get(sext);
+    if (rv) {
+      return rv;
+    }
+    return await new Promise<string | undefined>(resolve => {
+      const trans = db.transaction(STORE, "readonly");
+      trans.onerror = () => resolve(undefined);
+      const store = trans.objectStore(STORE);
+      const req = store.get(sext);
+      req.onerror = () => resolve(undefined);
+      req.onsuccess = () => {
+        const rv = this.cache.get(sext);
+        if (rv) {
+          resolve(rv);
+          return;
+        }
+        let {result} = req;
+        if (!result) {
+          resolve(undefined);
+          return;
+        }
+        if (typeof req.result !== "string") {
+          result = URL.createObjectURL(result).toString();
+        }
+        this.cache.set(sext, result);
+        this.cache.set(ext, "");
+        resolve(result);
+      };
+    });
+  }
+
+  async set(ext: string, manId: number) {
+    ext = this.normalize(ext);
+    if (BLACKLISTED.has(ext)) {
+      return;
+    }
+    if (this.cache.has(ext)) {
+      // already processed in this session
+      return;
+    }
+    // eslint-disable-next-line no-magic-numbers
+    const urls = await Promise.all(CACHE_SIZES.map(
+      size => getIcon(size, manId)));
+    if (this.cache.has(ext)) {
+      // already processed in this session
+      return;
+    }
+    for (const {size, icon} of urls) {
+      this.cache.set(`${ext}-${size}`, URL.createObjectURL(icon));
+    }
+    this.cache.set(ext, "");
+    const db = await this.db;
+    await new Promise((resolve, reject) => {
+      const trans = db.transaction(STORE, "readwrite");
+      trans.onerror = reject;
+      trans.oncomplete = resolve;
+      const store = trans.objectStore(STORE);
+      for (const {size, icon} of urls) {
+        store.put(icon, `${ext}-${size}`);
+      }
+    });
+    this.emit("cached", ext);
+  }
+}();

lib/imex.ts

@@ -0,0 +1,247 @@
+"use strict";
+// License: MIT
+
+import { getTextLinks } from "./textlinks";
+// eslint-disable-next-line no-unused-vars
+import { BaseItem } from "./item";
+import { ALLOWED_SCHEMES } from "./constants";
+
+export const NS_METALINK_RFC5854 = "urn:ietf:params:xml:ns:metalink";
+export const NS_DTA = "http://www.downthemall.net/properties#";
+
+function parseNum(
+    file: Element,
+    attr: string,
+    defaultValue: number,
+    ns = NS_METALINK_RFC5854) {
+  const val = file.getAttributeNS(ns, attr);
+  if (!val) {
+    return defaultValue + 1;
+  }
+  const num = parseInt(val, 10);
+  if (isFinite(num)) {
+    return num;
+  }
+  return defaultValue + 1;
+}
+
+function importMeta4(data: string) {
+  const parser = new DOMParser();
+  const document = parser.parseFromString(data, "text/xml");
+  const {documentElement} = document;
+  const items: BaseItem[] = [];
+  let batch = 0;
+  for (const file of documentElement.querySelectorAll("file")) {
+    try {
+      const url = Array.from(file.querySelectorAll("url")).map(u => {
+        try {
+          const {textContent} = u;
+          if (!textContent) {
+            return null;
+          }
+          const url = new URL(textContent);
+          if (!ALLOWED_SCHEMES.has(url.protocol)) {
+            return null;
+          }
+          const prio = parseNum(u, "priority", 0);
+          return {
+            url,
+            prio
+          };
+        }
+        catch {
+          return null;
+        }
+      }).filter(u => !!u).reduce((p, c) => {
+        if (!c) {
+          return null;
+        }
+        if (!p || p.prio < c.prio) {
+          return c;
+        }
+        return p;
+      });
+      if (!url) {
+        continue;
+      }
+      batch = parseNum(file, "num", batch, NS_DTA);
+      const idx = parseNum(file, "idx", 0, NS_DTA);
+      const item: BaseItem = {
+        url: url.url.toString(),
+        usable: decodeURIComponent(url.url.toString()),
+        batch,
+        idx
+      };
+      const ref = file.getAttributeNS(NS_DTA, "referrer");
+      if (ref) {
+        item.referrer = ref;
+        item.usableReferrer = decodeURIComponent(ref);
+      }
+      const mask = file.getAttributeNS(NS_DTA, "mask");
+      if (mask) {
+        item.mask = mask;
+      }
+      items.push(item);
+    }
+    catch (ex) {
+      console.error("Failed to import file", ex);
+    }
+  }
+  return items;
+}
+
+function parseKV(current: BaseItem, line: string) {
+  const [k, v] = line.split("=", 2);
+  switch (k.toLocaleLowerCase().trim()) {
+  case "referer": {
+    const rurls = getTextLinks(v);
+    if (rurls && rurls.length) {
+      current.referrer = rurls.pop();
+      current.usableReferrer = decodeURIComponent(current.referrer || "");
+    }
+    break;
+  }
+  }
+}
+
+export function importText(data: string) {
+  if (data.includes(NS_METALINK_RFC5854)) {
+    return importMeta4(data);
+  }
+  const splitter = /(.+)\n|(.+)$/g;
+  const spacer = /^\s+/;
+  let match;
+  let current: BaseItem | undefined = undefined;
+  let idx = 0;
+  const items = [];
+  while ((match = splitter.exec(data)) !== null) {
+    try {
+      const line = match[0].trimRight();
+      if (!line) {
+        continue;
+      }
+      if (spacer.test(line)) {
+        if (!current) {
+          continue;
+        }
+        parseKV(current, line);
+        continue;
+      }
+      const urls = getTextLinks(line);
+      if (!urls || !urls.length) {
+        continue;
+      }
+      current = {
+        url: urls[0],
+        usable: decodeURIComponent(urls[0]),
+        idx: ++idx
+      };
+      items.push(current);
+    }
+    catch (ex) {
+      current = undefined;
+      console.error("Failed to import", ex);
+    }
+  }
+  return items;
+}
+
+export interface Exporter {
+  fileName: string;
+  getText(items: BaseItem[]): string;
+}
+
+class TextExporter {
+  readonly fileName: string;
+
+  constructor() {
+    this.fileName = "links.txt";
+  }
+
+  getText(items: BaseItem[]) {
+    const lines = [];
+    for (const item of items) {
+      lines.push(item.url);
+    }
+    return lines.join("\n");
+  }
+}
+
+class Aria2Exporter {
+  readonly fileName: string;
+
+  constructor() {
+    this.fileName = "links.aria2.txt";
+  }
+
+  getText(items: BaseItem[]) {
+    const lines = [];
+    for (const item of items) {
+      lines.push(item.url);
+      if (item.referrer) {
+        lines.push(`  referer=${item.referrer}`);
+      }
+    }
+    return lines.join("\n");
+  }
+}
+
+class MetalinkExporter {
+  readonly fileName: string;
+
+  constructor() {
+    this.fileName = "links.meta4";
+  }
+
+  getText(items: BaseItem[]) {
+    const document = window.document.implementation.
+      createDocument(NS_METALINK_RFC5854, "metalink", null);
+    const root = document.documentElement;
+    root.setAttributeNS(NS_DTA, "generator", "DownThemAll!");
+    root.appendChild(document.createComment(
+      "metalink as exported by DownThemAll!",
+    ));
+
+    for (const item of items) {
+      const aitem = item as any;
+      const f = document.createElementNS(NS_METALINK_RFC5854, "file");
+      f.setAttribute("name", aitem.currentName);
+      if (item.batch) {
+        f.setAttributeNS(NS_DTA, "num", item.batch.toString());
+      }
+      if (item.idx) {
+        f.setAttributeNS(NS_DTA, "idx", item.idx.toString());
+      }
+      if (item.referrer) {
+        f.setAttributeNS(NS_DTA, "referrer", item.referrer);
+      }
+      if (item.mask) {
+        f.setAttributeNS(NS_DTA, "mask", item.mask);
+      }
+
+      if (item.description) {
+        const n = document.createElementNS(NS_METALINK_RFC5854, "description");
+        n.textContent = item.description;
+        f.appendChild(n);
+      }
+
+      const u = document.createElementNS(NS_METALINK_RFC5854, "url");
+      u.textContent = item.url;
+      f.appendChild(u);
+
+      if (aitem.totalSize > 0) {
+        const s = document.createElementNS(NS_METALINK_RFC5854, "size");
+        s.textContent = aitem.totalSize.toString();
+        f.appendChild(s);
+      }
+      root.appendChild(f);
+    }
+    let xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
+    xml += root.outerHTML;
+    return xml;
+  }
+}
+
+export const textExporter = new TextExporter();
+export const aria2Exporter = new Aria2Exporter();
+export const metalinkExporter = new MetalinkExporter();

lib/item.ts

@@ -4,18 +4,34 @@
 import { ALLOWED_SCHEMES } from "./constants";
 import { TRANSFERABLE_PROPERTIES } from "./constants";
 
+export interface BaseItem {
+  url: string;
+  usable: string;
+  referrer?: string;
+  usableReferrer?: string;
+  description?: string;
+  title?: string;
+  fileName?: string;
+  batch?: number;
+  idx: number;
+  mask?: string;
+  subfolder?: string;
+  startDate?: number;
+  private?: boolean;
+  postData?: string;
+  paused?: boolean;
+}
+
 const OPTIONPROPS = Object.freeze([
   "referrer", "usableReferrer",
   "description", "title",
   "fileName",
   "batch", "idx",
   "mask",
-  "fromMetalink",
+  "subfolder",
   "startDate",
-  "hashes",
   "private",
   "postData",
-  "cleanRequest",
   "paused"
 ]);
 
@@ -34,7 +50,7 @@ function maybeAssign(options: any, what: any) {
   this[what] = val;
 }
 
-export class Item {
+export class Item implements BaseItem {
   public url: string;
 
   public usable: string;
@@ -43,6 +59,8 @@ export class Item {
 
   public usableReferrer: string;
 
+  public idx: number;
+
   constructor(raw: any, options?: any) {
     Object.assign(this, raw);
     OPTIONPROPS.forEach(maybeAssign.bind(this, options || {}));
@@ -99,7 +117,7 @@ function transfer(e: any, other: any) {
 }
 
 
-export function makeUniqueItems(items: any, mapping?: Function) {
+export function makeUniqueItems(items: any[][], mapping?: Function) {
   const known = new Map();
   const unique = [];
   for (const itemlist of items) {

lib/manager/basedownload.ts

@@ -5,6 +5,8 @@
 import { parsePath, URLd } from "../util";
 import { QUEUED, RUNNING, PAUSED } from "./state";
 import Renamer from "./renamer";
+// eslint-disable-next-line no-unused-vars
+import { BaseItem } from "../item";
 
 const SAVEDPROPS = [
   "state",
@@ -14,6 +16,7 @@ const SAVEDPROPS = [
   "usableReferrer",
   "fileName",
   "mask",
+  "subfolder",
   "date",
   // batches
   "batch",
@@ -27,10 +30,11 @@ const SAVEDPROPS = [
   "written",
   // server stuff
   "serverName",
+  "browserName",
+  "mime",
+  "prerolled",
   // other options
   "private",
-  "fromMetalink",
-  "cleanRequest",
   // db
   "manId",
   "dbId",
@@ -41,10 +45,15 @@ const DEFAULTS = {
   state: QUEUED,
   error: "",
   serverName: "",
+  browserName: "",
   fileName: "",
   totalSize: 0,
   written: 0,
   manId: 0,
+  mime: "",
+  prerolled: false,
+  retries: 0,
+  deadline: 0
 };
 
 let sessionId = 0;
@@ -61,14 +70,26 @@ export class BaseDownload {
 
   public url: string;
 
+  public usable: string;
+
   public uReferrer: URLd;
 
   public referrer: string;
 
+  public usableReferrer: string;
+
   public startDate: Date;
 
   public fileName: string;
 
+  public description?: string;
+
+  public title?: string;
+
+  public batch: number;
+
+  public idx: number;
+
   public error: string;
 
   public postData: any;
@@ -81,10 +102,19 @@ export class BaseDownload {
 
   public serverName: string;
 
+  public browserName: string;
+
+  public mime: string;
+
   public mask: string;
 
+  public subfolder: string;
 
-  constructor(options: any) {
+  public prerolled: boolean;
+
+  public retries: number;
+
+  constructor(options: BaseItem) {
     Object.assign(this, DEFAULTS);
     this.assign(options);
     if (this.state === RUNNING) {
@@ -92,14 +122,16 @@ export class BaseDownload {
     }
     this.sessionId = ++sessionId;
     this.renamer = new Renamer(this);
+    this.retries = 0;
   }
 
-  assign(options: any) {
+  assign(options: BaseItem) {
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     const self: any = this;
+    const other: any = options;
     for (const prop of SAVEDPROPS) {
       if (prop in options) {
-        self[prop] = options[prop];
+        self[prop] = other[prop];
       }
     }
     this.uURL = new URL(this.url) as URLd;
@@ -117,6 +149,10 @@ export class BaseDownload {
     return this.serverName || this.fileName || this.urlName || "index.html";
   }
 
+  get currentName() {
+    return this.browserName || this.dest.name || this.finalName;
+  }
+
   get urlName() {
     const path = parsePath(this.uURL);
     if (path.name) {
@@ -154,7 +190,10 @@ export class BaseDownload {
     rv.destName = dest.name;
     rv.destPath = dest.path;
     rv.destFull = dest.full;
+    rv.currentName = this.browserName || rv.destName || rv.finalName;
     rv.error = this.error;
+    rv.ext = this.renamer.p_ext;
+    rv.retries = this.retries;
     return rv;
   }
 }

lib/manager/download.ts

@@ -1,22 +1,41 @@
 "use strict";
 // License: MIT
 
-import { Prefs } from "../prefs";
-import { parsePath } from "../util";
-import {
-  QUEUED, RUNNING, CANCELED, PAUSED, MISSING, DONE,
-  FORCABLE, PAUSABLE, CANCELABLE,
-} from "./state";
-import { BaseDownload } from "./basedownload";
+// eslint-disable-next-line no-unused-vars
+import { CHROME, downloads, DownloadOptions } from "../browser";
+import { Prefs, PrefWatcher } from "../prefs";
 import { PromiseSerializer } from "../pserializer";
+import { filterInSitu, parsePath } from "../util";
+import { BaseDownload } from "./basedownload";
 // eslint-disable-next-line no-unused-vars
 import { Manager } from "./man";
-import { downloads } from "../browser";
+import Renamer from "./renamer";
+import {
+  CANCELABLE,
+  CANCELED,
+  DONE,
+  FORCABLE,
+  MISSING,
+  PAUSABLE,
+  PAUSED,
+  QUEUED,
+  RUNNING,
+  RETRYING
+} from "./state";
+import { Preroller } from "./preroller";
 
+function isRecoverable(error: string) {
+  switch (error) {
+  case "SERVER_FAILED":
+    return true;
 
-const setShelfEnabled = downloads.setShelfEnabled || function() {
-  // ignored
-};
+  default:
+    return error.startsWith("NETWORK_");
+  }
+}
+
+const RETRIES = new PrefWatcher("retries", 5);
+const RETRY_TIME = new PrefWatcher("retry-time", 5);
 
 export class Download extends BaseDownload {
   public manager: Manager;
@@ -29,6 +48,10 @@ export class Download extends BaseDownload {
 
   public error: string;
 
+  public dbId: number;
+
+  public deadline: number;
+
   constructor(manager: Manager, options: any) {
     super(options);
     this.manager = manager;
@@ -38,6 +61,7 @@ export class Download extends BaseDownload {
   }
 
   markDirty() {
+    this.renamer = new Renamer(this);
     this.manager.setDirty(this);
   }
 
@@ -59,22 +83,28 @@ export class Download extends BaseDownload {
     if (this.manId) {
       const {manId: id} = this;
       try {
-        const state = await downloads.search({id});
-        if (state[0].state === "in_progress") {
+        const state = (await downloads.search({id})).pop() || {};
+        if (state.state === "in_progress" && !state.error && !state.paused) {
           this.changeState(RUNNING);
           this.updateStateFromBrowser();
           return;
         }
-        if (!state[0].canResume) {
+        if (state.state === "complete") {
+          this.changeState(DONE);
+          this.updateStateFromBrowser();
+          return;
+        }
+        if (!state.canResume) {
           throw new Error("Cannot resume");
         }
         // Cannot await here
         // Firefox bug: will not return until download is finished
-        downloads.resume(id).catch(() => {});
+        downloads.resume(id).catch(console.error);
         this.changeState(RUNNING);
         return;
       }
       catch (ex) {
+        console.error("cannot resume", ex);
         this.manager.removeManId(this.manId);
         this.removeFromBrowser();
       }
@@ -82,46 +112,64 @@ export class Download extends BaseDownload {
     if (this.state !== QUEUED) {
       throw new Error("invalid state");
     }
-    console.trace("starting", this.toString(), this.dest, this.mask);
+    console.log("starting", this.toString(), this.toMsg());
     this.changeState(RUNNING);
+
+    // Do NOT await
+    this.reallyStart();
+  }
+
+  private async reallyStart() {
     try {
-      const options: any = {
+      if (!this.prerolled) {
+        await this.maybePreroll();
+        if (this.state !== RUNNING) {
+          // Aborted by preroll
+          return;
+        }
+      }
+      const options: DownloadOptions = {
         conflictAction: await Prefs.get("conflict-action"),
         filename: this.dest.full,
         saveAs: false,
         url: this.url,
-        headers: [{
-          name: "X-DTA-Tag",
-          value: this.sessionId.toString(),
-        }],
+        headers: [],
       };
+      if (!CHROME && this.private) {
+        options.incognito = true;
+      }
       if (this.postData) {
         options.body = this.postData;
         options.method = "POST";
       }
-      if (this.private) {
-        options.incognito = true;
-      }
-      /* XXX "forbidden"
-         Cannot be worked around with webRequest either
-         as those do not see downloads.
-      if (this.referrer) {
+      if (!CHROME && this.referrer) {
         options.headers.push({
           name: "Referer",
           value: this.referrer
         });
       }
-      */
+      else if (CHROME) {
+        options.headers.push({
+          name: "X-DTA-ID",
+          value: this.sessionId.toString(),
+        });
+      }
       if (this.manId) {
         this.manager.removeManId(this.manId);
       }
-      setShelfEnabled(false);
+
       try {
         this.manager.addManId(
           this.manId = await downloads.download(options), this);
       }
-      finally {
-        setShelfEnabled(true);
+      catch (ex) {
+        if (!this.referrer) {
+          throw ex;
+        }
+        // Re-attempt without referrer
+        filterInSitu(options.headers, h => h.name !== "Referer");
+        this.manager.addManId(
+          this.manId = await downloads.download(options), this);
       }
       this.markDirty();
     }
@@ -132,6 +180,41 @@ export class Download extends BaseDownload {
     }
   }
 
+  private async maybePreroll() {
+    try {
+      if (this.prerolled) {
+        // Check again, just in case, async and all
+        return;
+      }
+      const roller = new Preroller(this);
+      if (!roller.shouldPreroll) {
+        return;
+      }
+      const res = await roller.roll();
+      if (!res) {
+        return;
+      }
+      if (res.mime) {
+        this.mime = res.mime;
+      }
+      if (res.name) {
+        this.serverName = res.name;
+      }
+      if (res.error) {
+        this.cancelAccordingToError(res.error);
+      }
+    }
+    catch (ex) {
+      console.error("Failed to preroll", this, ex.toString(), ex.stack, ex);
+    }
+    finally {
+      if (this.state === RUNNING) {
+        this.prerolled = true;
+        this.markDirty();
+      }
+    }
+  }
+
   resume(forced = false) {
     if (!(FORCABLE & this.state)) {
       return;
@@ -144,26 +227,41 @@ export class Download extends BaseDownload {
     }
   }
 
-  async pause() {
+  async pause(retry?: boolean) {
     if (!(PAUSABLE & this.state)) {
       return;
     }
+
+    if (!retry) {
+      this.retries = 0;
+      this.deadline = 0;
+    }
+    else {
+      // eslint-disable-next-line no-magic-numbers
+      this.deadline = Date.now() + RETRY_TIME.value * 60 * 1000;
+    }
+
     if (this.state === RUNNING && this.manId) {
       try {
         await downloads.pause(this.manId);
       }
       catch (ex) {
         console.error("pause", ex.toString(), ex);
+        this.cancel();
         return;
       }
     }
-    this.changeState(PAUSED);
+
+    this.changeState(retry ? RETRYING : PAUSED);
   }
 
   reset() {
+    this.prerolled = false;
     this.manId = 0;
     this.written = this.totalSize = 0;
-    this.serverName = "";
+    this.mime = this.serverName = this.browserName = "";
+    this.retries = 0;
+    this.deadline = 0;
   }
 
   async removeFromBrowser() {
@@ -196,6 +294,17 @@ export class Download extends BaseDownload {
     this.changeState(CANCELED);
   }
 
+  async cancelAccordingToError(error: string) {
+    if (!isRecoverable(error) || ++this.retries > RETRIES.value) {
+      this.cancel();
+      this.error = error;
+      return;
+    }
+
+    await this.pause(true);
+    this.error = error;
+  }
+
   setMissing() {
     if (this.manId) {
       this.manager.removeManId(this.manId);
@@ -240,14 +349,19 @@ export class Download extends BaseDownload {
       const state = (await downloads.search({id: this.manId})).pop();
       const {filename, error} = state;
       const path = parsePath(filename);
-      this.serverName = path.name;
+      this.browserName = path.name;
       this.adoptSize(state);
+      if (!this.mime && state.mime) {
+        this.mime = state.mime;
+      }
       this.markDirty();
       switch (state.state) {
       case "in_progress":
-        if (error) {
-          this.cancel();
-          this.error = error;
+        if (state.paused) {
+          this.changeState(PAUSED);
+        }
+        else if (error) {
+          this.cancelAccordingToError(error);
         }
         else {
           this.changeState(RUNNING);
@@ -258,6 +372,9 @@ export class Download extends BaseDownload {
         if (state.paused) {
           this.changeState(PAUSED);
         }
+        else if (error) {
+          this.cancelAccordingToError(error);
+        }
         else {
           this.cancel();
           this.error = error || "";

lib/manager/man.ts

@@ -4,30 +4,39 @@
 import { EventEmitter } from "../events";
 import { Notification } from "../notifications";
 import { DB } from "../db";
-import { QUEUED, CANCELED, RUNNING } from "./state";
+import { QUEUED, CANCELED, RUNNING, RETRYING } from "./state";
 // eslint-disable-next-line no-unused-vars
 import { Bus, Port } from "../bus";
 import { sort } from "../sorting";
-import { Prefs } from "../prefs";
+import { Prefs, PrefWatcher } from "../prefs";
 import { _ } from "../i18n";
 import { CoalescedUpdate, mapFilterInSitu, filterInSitu } from "../util";
 import { PromiseSerializer } from "../pserializer";
-import {Download} from "./download";
-import {ManagerPort} from "./port";
-import {Scheduler} from "./scheduler";
-import {Limits} from "./limits";
-import { downloads } from "../browser";
+import { Download } from "./download";
+import { ManagerPort } from "./port";
+import { Scheduler } from "./scheduler";
+import { Limits } from "./limits";
+import { downloads, runtime, webRequest, CHROME } from "../browser";
 
+const US = runtime.getURL("");
 
 const AUTOSAVE_TIMEOUT = 2000;
 const DIRTY_TIMEOUT = 100;
 // eslint-disable-next-line no-magic-numbers
 const MISSING_TIMEOUT = 12 * 1000;
+const RELOAD_TIMEOUT = 10 * 1000;
+
+const setShelfEnabled = downloads.setShelfEnabled || function() {
+  // ignored
+};
+
+const FINISH_NOTIFICATION = new PrefWatcher("finish-notification", true);
+const SOUNDS = new PrefWatcher("sounds", false);
 
 export class Manager extends EventEmitter {
   private items: Download[];
 
-  private active: boolean;
+  public active: boolean;
 
   private notifiedFinished: boolean;
 
@@ -43,22 +52,31 @@ export class Manager extends EventEmitter {
 
   private readonly running: Set<Download>;
 
+  private readonly retrying: Set<Download>;
+
   private scheduler: Scheduler | null;
 
+  private shouldReload: boolean;
+
+  private deadlineTimer: number;
+
   constructor() {
     super();
     this.active = true;
+    this.shouldReload = false;
     this.notifiedFinished = true;
     this.items = [];
     this.saveQueue = new CoalescedUpdate(
       AUTOSAVE_TIMEOUT, this.save.bind(this));
     this.dirty = new CoalescedUpdate(
       DIRTY_TIMEOUT, this.processDirty.bind(this));
+    this.processDeadlines = this.processDeadlines.bind(this);
     this.sids = new Map();
     this.manIds = new Map();
     this.ports = new Set();
     this.scheduler = null;
     this.running = new Set();
+    this.retrying = new Set();
 
     this.startNext = PromiseSerializer.wrapNew(1, this, this.startNext);
 
@@ -75,6 +93,14 @@ export class Manager extends EventEmitter {
     Limits.on("changed", () => {
       this.resetScheduler();
     });
+
+    if (CHROME) {
+      webRequest.onBeforeSendHeaders.addListener(
+        this.stuffReferrer.bind(this),
+        {urls: ["<all_urls>"]},
+        ["blocking", "requestHeaders", "extraHeaders"]
+      );
+    }
   }
 
   async init() {
@@ -88,9 +114,19 @@ export class Manager extends EventEmitter {
       }
       this.items.push(rv);
     });
-    await this.resetScheduler();
+
+    // Do not wait for the scheduler
+    this.resetScheduler();
+
     this.emit("inited");
     setTimeout(() => this.checkMissing(), MISSING_TIMEOUT);
+    runtime.onUpdateAvailable.addListener(() => {
+      if (this.running.size) {
+        this.shouldReload = true;
+        return;
+      }
+      runtime.reload();
+    });
     return this;
   }
 
@@ -136,7 +172,7 @@ export class Manager extends EventEmitter {
       }
       const next = await this.scheduler.next(this.running);
       if (!next) {
-        this.maybeNotifyFinished();
+        this.maybeRunFinishActions();
         break;
       }
       if (this.running.has(next) || next.state !== QUEUED) {
@@ -147,6 +183,7 @@ export class Manager extends EventEmitter {
       }
       catch (ex) {
         next.changeState(CANCELED);
+        next.error = ex.toString();
         console.error(ex.toString(), ex);
       }
     }
@@ -155,19 +192,43 @@ export class Manager extends EventEmitter {
   async startDownload(download: Download) {
     // Add to running first, so we don't confuse the scheduler and other parts
     this.running.add(download);
+    setShelfEnabled(false);
     await download.start();
     this.notifiedFinished = false;
   }
 
-  async maybeNotifyFinished() {
-    if (!(await Prefs.get("finish-notification"))) {
+  maybeRunFinishActions() {
+    if (this.running.size) {
       return;
     }
-    if (this.notifiedFinished || this.running.size) {
+    this.maybeNotifyFinished();
+    if (this.shouldReload) {
+      this.saveQueue.trigger();
+      setTimeout(() => {
+        if (this.running.size) {
+          return;
+        }
+        runtime.reload();
+      }, RELOAD_TIMEOUT);
+    }
+    setShelfEnabled(true);
+  }
+
+  maybeNotifyFinished() {
+    if (this.notifiedFinished || this.running.size || this.retrying.size) {
       return;
     }
+    if (SOUNDS.value) {
+      const audio = new Audio(runtime.getURL("/style/done.opus"));
+      audio.addEventListener("canplaythrough", () => audio.play());
+      audio.addEventListener("ended", () => document.body.removeChild(audio));
+      audio.addEventListener("error", () => document.body.removeChild(audio));
+      document.body.appendChild(audio);
+    }
+    if (FINISH_NOTIFICATION.value) {
+      new Notification(null, _("queue-finished"));
+    }
     this.notifiedFinished = true;
-    new Notification(null, _("queue-finished"));
   }
 
   addManId(id: number, download: Download) {
@@ -215,7 +276,7 @@ export class Manager extends EventEmitter {
     this.emit("dirty", items);
   }
 
-  save(items: Download[]) {
+  private save(items: Download[]) {
     DB.saveItems(items.filter(i => !i.removed)).
       catch(console.error);
   }
@@ -265,7 +326,10 @@ export class Manager extends EventEmitter {
   changedState(download: Download, oldState: number, newState: number) {
     if (oldState === RUNNING) {
       this.running.delete(download);
-      this.maybeNotifyFinished();
+    }
+    else if (oldState === RETRYING) {
+      this.retrying.delete(download);
+      this.findDeadline();
     }
     if (newState === QUEUED) {
       this.resetScheduler();
@@ -278,7 +342,53 @@ export class Manager extends EventEmitter {
       this.running.add(download);
     }
     else {
-      this.startNext();
+      if (newState === RETRYING) {
+        this.addRetry(download);
+      }
+      this.startNext().catch(console.error);
+    }
+  }
+
+  addRetry(download: Download) {
+    this.retrying.add(download);
+    this.findDeadline();
+  }
+
+  private findDeadline() {
+    let deadline = Array.from(this.retrying).
+      reduce<number>((deadline, item) => {
+        if (deadline) {
+          return item.deadline ? Math.min(deadline, item.deadline) : deadline;
+        }
+        return item.deadline;
+      }, 0);
+    if (deadline <= 0) {
+      return;
+    }
+    deadline -= Date.now();
+    if (deadline <= 0) {
+      return;
+    }
+
+    if (this.deadlineTimer) {
+      window.clearTimeout(this.deadlineTimer);
+    }
+    this.deadlineTimer = window.setTimeout(this.processDeadlines, deadline);
+  }
+
+  private processDeadlines() {
+    this.deadlineTimer = 0;
+    try {
+      const now = Date.now();
+      this.items.forEach(item => {
+        if (item.deadline && Math.abs(item.deadline - now) < 1000) {
+          this.retrying.delete(item);
+          item.resume(false);
+        }
+      });
+    }
+    finally {
+      this.findDeadline();
     }
   }
 
@@ -341,6 +451,35 @@ export class Manager extends EventEmitter {
     }
     this.emit("active", this.active);
   }
+
+  getMsgItems() {
+    return this.items.map(e => e.toMsg());
+  }
+
+  stuffReferrer(details: any): any {
+    if (details.tabId > 0 && !US.startsWith(details.initiator)) {
+      return undefined;
+    }
+    const sidx = details.requestHeaders.findIndex(
+      (e: any) => e.name.toLowerCase() === "x-dta-id");
+    if (sidx < 0) {
+      return undefined;
+    }
+    const sid = parseInt(details.requestHeaders[sidx].value, 10);
+    details.requestHeaders.splice(sidx, 1);
+    const item = this.sids.get(sid);
+    if (!item) {
+      return undefined;
+    }
+    details.requestHeaders.push({
+      name: "Referer",
+      value: (item.uReferrer || item.uURL).toString()
+    });
+    const rv: any = {
+      requestHeaders: details.requestHeaders
+    };
+    return rv;
+  }
 }
 
 let inited: Promise<Manager>;

lib/manager/port.ts

@@ -5,6 +5,10 @@ import { donate, openPrefs } from "../windowutils";
 import { API } from "../api";
 // eslint-disable-next-line no-unused-vars
 import { BaseDownload } from "./basedownload";
+// eslint-disable-next-line no-unused-vars
+import { Manager } from "./man";
+// eslint-disable-next-line no-unused-vars
+import { Port } from "../bus";
 
 type SID = {sid: number};
 type SIDS = {
@@ -13,9 +17,9 @@ type SIDS = {
 };
 
 export class ManagerPort {
-  private manager: any;
+  private manager: Manager;
 
-  private port: any;
+  private port: Port;
 
   constructor(manager: any, port: any) {
     this.manager = manager;
@@ -61,6 +65,7 @@ export class ManagerPort {
       delete this.manager;
       delete this.port;
     });
+
     this.port.post("active", this.manager.active);
     this.sendAll();
   }
@@ -78,7 +83,6 @@ export class ManagerPort {
   }
 
   sendAll() {
-    this.port.post(
-      "all", this.manager.items.map((e: BaseDownload) => e.toMsg()));
+    this.port.post("all", this.manager.getMsgItems());
   }
 }

lib/manager/preroller.ts

@@ -0,0 +1,234 @@
+"use strict";
+// License: MIT
+
+import MimeType from "whatwg-mimetype";
+// eslint-disable-next-line no-unused-vars
+import { Download } from "./download";
+import { CHROME, webRequest } from "../browser";
+import { CDHeaderParser } from "../cdheaderparser";
+import { sanitizePath, parsePath } from "../util";
+import { MimeDB } from "../mime";
+
+const PREROLL_HEURISTICS = /dl|attach|download|name|file|get|retr|^n$|\.(php|asp|py|pl|action|htm|shtm)/i;
+const PREROLL_HOSTS = /4cdn|chan/;
+const PREROLL_TIMEOUT = 10000;
+const PREROLL_NOPE = new Set<string>();
+
+/* eslint-disable no-magic-numbers */
+const NOPE_STATUSES = Object.freeze(new Set([
+  400,
+  401,
+  402,
+  405,
+  416,
+]));
+/* eslint-enable no-magic-numbers */
+
+const PREROLL_SEARCHEXTS = Object.freeze(new Set<string>([
+  "php",
+  "asp",
+  "aspx",
+  "inc",
+  "py",
+  "pl",
+  "action",
+  "htm",
+  "html",
+  "shtml"
+]));
+const NAME_TESTER = /\.[a-z0-9]{1,5}$/i;
+const CDPARSER = new CDHeaderParser();
+
+export interface PrerollResults {
+  error?: string;
+  name?: string;
+  mime?: string;
+  finalURL?: string;
+}
+
+export class Preroller {
+  private readonly download: Download
+
+  constructor(download: Download) {
+    this.download = download;
+  }
+
+  get shouldPreroll() {
+    const {uURL, renamer} = this.download;
+    const {pathname, search, host} = uURL;
+    if (PREROLL_NOPE.has(host)) {
+      return false;
+    }
+    if (!renamer.p_ext) {
+      return true;
+    }
+    if (search.length) {
+      return true;
+    }
+    if (uURL.pathname.endsWith("/")) {
+      return true;
+    }
+    if (PREROLL_HEURISTICS.test(pathname)) {
+      return true;
+    }
+    if (PREROLL_HOSTS.test(host)) {
+      return true;
+    }
+    return false;
+  }
+
+  async roll() {
+    try {
+      return await (CHROME ? this.prerollChrome() : this.prerollFirefox());
+    }
+    catch (ex) {
+      console.error("Failed to preroll", this, ex.toString(), ex.stack, ex);
+    }
+    return null;
+  }
+
+  private async prerollFirefox() {
+    const controller = new AbortController();
+    const {signal} = controller;
+    const {uURL, uReferrer} = this.download;
+    const res = await fetch(uURL.toString(), {
+      method: "GET",
+      headers: new Headers({
+        Range: "bytes=0-1",
+      }),
+      mode: "same-origin",
+      signal,
+      referrer: (uReferrer || uURL).toString(),
+    });
+    if (res.body) {
+      res.body.cancel();
+    }
+    controller.abort();
+    const {headers} = res;
+    return this.finalize(headers, res);
+  }
+
+  private async prerollChrome() {
+    let rid = "";
+    const {uURL, uReferrer} = this.download;
+    const rurl = uURL.toString();
+    let listener: any;
+    const wr = new Promise<any[]>(resolve => {
+      listener = (details: any) => {
+        const {url, requestId, statusCode} = details;
+        if (rid !== requestId && url !== rurl) {
+          return;
+        }
+        // eslint-disable-next-line no-magic-numbers
+        if (statusCode >= 300 && statusCode < 400) {
+          // Redirect, continue tracking;
+          rid = requestId;
+          return;
+        }
+        resolve(details.responseHeaders);
+      };
+      webRequest.onHeadersReceived.addListener(
+        listener, {urls: ["<all_urls>"]}, ["responseHeaders"]);
+    });
+    const p = Promise.race([
+      wr,
+      new Promise<any[]>((_, reject) =>
+        setTimeout(() => reject(new Error("timeout")), PREROLL_TIMEOUT))
+    ]);
+
+    p.finally(() => {
+      webRequest.onHeadersReceived.removeListener(listener);
+    });
+    const controller = new AbortController();
+    const {signal} = controller;
+    const res = await fetch(rurl, {
+      method: "GET",
+      headers: new Headers({
+        "Range": "bytes=0-1",
+        "X-DTA-ID": this.download.sessionId.toString(),
+      }),
+      signal,
+      referrer: (uReferrer || uURL).toString(),
+    });
+    if (res.body) {
+      res.body.cancel();
+    }
+    controller.abort();
+    const headers = await p;
+    return this.finalize(
+      new Headers(headers.map(i => [i.name, i.value])), res);
+  }
+
+  private finalize(headers: Headers, res: Response): PrerollResults {
+    const rv: PrerollResults = {};
+
+    const type = MimeType.parse(headers.get("content-type") || "");
+    if (type) {
+      rv.mime = type.essence;
+    }
+
+    const {p_ext: ext} = this.download.renamer;
+    const dispHeader = headers.get("content-disposition");
+    if (dispHeader) {
+      const file = CDPARSER.parse(dispHeader);
+      // Sanitize
+      rv.name = sanitizePath(file.replace(/[/\\]+/g, "-"));
+    }
+    else if (!ext || PREROLL_SEARCHEXTS.has(ext.toLocaleLowerCase())) {
+      const {searchParams} = this.download.uURL;
+      let detected = "";
+      for (const [, value] of searchParams) {
+        if (!NAME_TESTER.test(value)) {
+          continue;
+        }
+        const p = parsePath(value);
+        if (!p.base || !p.ext) {
+          continue;
+        }
+        if (!MimeDB.hasExtension(p.ext)) {
+          continue;
+        }
+        if (rv.mime) {
+          const mime = MimeDB.getMime(rv.mime);
+          if (mime && !mime.extensions.has(p.ext.toLowerCase())) {
+            continue;
+          }
+        }
+        const sanitized = sanitizePath(p.name);
+        if (sanitized.length <= detected.length) {
+          continue;
+        }
+        detected = sanitized;
+      }
+      if (detected) {
+        rv.name = detected;
+      }
+    }
+
+    rv.finalURL = res.url;
+
+    /* eslint-disable no-magic-numbers */
+    const {status} = res;
+    if (status === 404) {
+      rv.error = "SERVER_BAD_CONTENT";
+    }
+    else if (status === 403) {
+      rv.error = "SERVER_FORBIDDEN";
+    }
+    else if (status === 402 || status === 407) {
+      rv.error = "SERVER_UNAUTHORIZED";
+    }
+    else if (NOPE_STATUSES.has(status)) {
+      PREROLL_NOPE.add(this.download.uURL.host);
+      if (PREROLL_NOPE.size > 1000) {
+        PREROLL_NOPE.delete(PREROLL_NOPE.keys().next().value);
+      }
+    }
+    else if (status > 400 && status < 500) {
+      rv.error = "SERVER_FAILED";
+    }
+    /* eslint-enable no-magic-numbers */
+
+    return rv;
+  }
+}

lib/manager/renamer.ts

@@ -2,8 +2,12 @@
 "use strict";
 // License: MIT
 
-import { parsePath, sanitizePath } from "../util";
 import { _ } from "../i18n";
+import { MimeDB } from "../mime";
+// eslint-disable-next-line no-unused-vars
+import { parsePath, PathInfo, sanitizePath } from "../util";
+// eslint-disable-next-line no-unused-vars
+import { BaseDownload } from "./basedownload";
 
 const REPLACE_EXPR = /\*\w+\*/gi;
 
@@ -22,21 +26,41 @@ const DATE_FORMATTER = new Intl.NumberFormat(undefined, {
 });
 
 export default class Renamer {
-  private readonly d: any;
+  private readonly d: BaseDownload;
 
-  constructor(download: any) {
+  private readonly nameinfo: PathInfo;
+
+  constructor(download: BaseDownload) {
     this.d = download;
+    const info = parsePath(this.d.finalName);
+    this.nameinfo = this.fixupExtension(info);
   }
 
-  get nameinfo() {
-    return parsePath(this.d.finalName);
+  private fixupExtension(info: PathInfo): PathInfo {
+    if (!this.d.mime) {
+      return info;
+    }
+    const mime = MimeDB.getMime(this.d.mime);
+    if (!mime) {
+      return info;
+    }
+    const {ext} = info;
+    if (mime.major === "image" || mime.major === "video") {
+      if (ext && mime.extensions.has(ext.toLowerCase())) {
+        return info;
+      }
+      return new PathInfo(info.base, mime.primary, info.path);
+    }
+    if (ext) {
+      return info;
+    }
+    return new PathInfo(info.base, mime.primary, info.path);
   }
 
   get ref() {
     return this.d.uReferrer;
   }
 
-
   get p_name() {
     return this.nameinfo.base;
   }
@@ -169,24 +193,24 @@ export default class Renamer {
   }
 
   toString() {
-    const {mask} = this.d;
+    const {mask, subfolder} = this.d;
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     const self: any = this;
-    // XXX flat
-    return sanitizePath(mask.replace(REPLACE_EXPR, function(type: string) {
+    const baseMask = subfolder ? `${subfolder}/${mask}` : mask;
+    return sanitizePath(baseMask.replace(REPLACE_EXPR, function(type: string) {
       let prop = type.substr(1, type.length - 2);
       const flat = prop.startsWith("flat");
       if (flat) {
         prop = prop.substr(4);
       }
       prop = `p_${prop}`;
-      const rv = (prop in self) ?
+      let rv = (prop in self) ?
         (self[prop] || "").trim() :
         type;
       if (flat) {
-        return rv.replace(/\/+/g, "-");
+        rv = rv.replace(/[/\\]+/g, "-");
       }
-      return rv;
+      return rv.replace(/\/{2,}/g, "/");
     }));
   }
 }

lib/manager/state.ts

@@ -8,8 +8,9 @@ export const PAUSED = 1 << 3;
 export const DONE = 1 << 4;
 export const CANCELED = 1 << 5;
 export const MISSING = 1 << 6;
+export const RETRYING = 1 << 7;
 
-export const RESUMABLE = PAUSED | CANCELED;
-export const FORCABLE = PAUSED | QUEUED | CANCELED;
-export const PAUSABLE = QUEUED | CANCELED | RUNNING;
-export const CANCELABLE = QUEUED | RUNNING | PAUSED | DONE | MISSING;
+export const RESUMABLE = PAUSED | CANCELED | RETRYING;
+export const FORCABLE = PAUSED | QUEUED | CANCELED | RETRYING;
+export const PAUSABLE = QUEUED | CANCELED | RUNNING | RETRYING;
+export const CANCELABLE = QUEUED | RUNNING | PAUSED | DONE | MISSING | RETRYING;

lib/mime.ts

@@ -0,0 +1,65 @@
+"use strict";
+// License: MIT
+
+import mime from "../data/mime.json";
+
+export class MimeInfo {
+  public readonly type: string;
+
+  public readonly extensions: Set<string>;
+
+  public readonly major: string;
+
+  public readonly minor: string;
+
+  public readonly primary: string;
+
+  constructor(type: string, extensions: string[]) {
+    this.type = type;
+    const [major, minor] = type.split("/", 2);
+    this.major = major;
+    this.minor = minor;
+    [this.primary] = extensions;
+    this.extensions = new Set(extensions);
+    Object.freeze(this);
+  }
+}
+
+export const MimeDB = new class MimeDB {
+  private readonly mimeToExts: Map<string, MimeInfo>;
+
+  private readonly registeredExtensions: Set<string>;
+
+  constructor() {
+    const exts = new Map<string, string[]>();
+    for (const [prim, more] of Object.entries(mime.e)) {
+      let toadd = more;
+      if (!Array.isArray(toadd)) {
+        toadd = [toadd];
+      }
+      toadd.unshift(prim);
+      exts.set(prim, toadd);
+    }
+    this.mimeToExts = new Map(Array.from(
+      Object.entries(mime.m),
+      ([mime, prim]) => [mime, new MimeInfo(mime, exts.get(prim) || [prim])]
+    ));
+    const all = Array.from(
+      this.mimeToExts.values(),
+      m => Array.from(m.extensions, e => e.toLowerCase()));
+    this.registeredExtensions = new Set(all.flat());
+  }
+
+  getPrimary(mime: string) {
+    const info = this.mimeToExts.get(mime.trim().toLocaleLowerCase());
+    return info ? info.primary : "";
+  }
+
+  getMime(mime: string) {
+    return this.mimeToExts.get(mime.trim().toLocaleLowerCase());
+  }
+
+  hasExtension(ext: string) {
+    return this.registeredExtensions.has(ext.toLowerCase());
+  }
+}();

lib/notifications.ts

@@ -12,13 +12,20 @@ const DEFAULTS = {
   message: "message",
 };
 
+const TIMEOUT = 4000;
+
+let gid = 1;
+
 export class Notification extends EventEmitter {
   private notification: any;
 
+  private readonly generated: boolean;
+
   constructor(id: string | null, options = {}) {
     super();
 
-    id = id || "DownThemAll-notification";
+    this.generated = !id;
+    id = id || `DownThemAll-notification${++gid}`;
     if (typeof options === "string") {
       options = {message: options};
     }
@@ -39,11 +46,16 @@ export class Notification extends EventEmitter {
   opened(notification: any) {
     this.notification = notification;
     this.emit("opened", this);
+    if (this.generated) {
+      setTimeout(() => {
+        notifications.clear(notification);
+      }, TIMEOUT);
+    }
   }
 
   clicked(notification: any, button?: number) {
     // We can only be clicked, when we were opened, at which point the
-    // notification id is availablfalse
+    // notification id is available
     if (notification !== this.notification) {
       return;
     }
@@ -52,6 +64,7 @@ export class Notification extends EventEmitter {
       return;
     }
     this.emit("clicked", this);
+    console.log("clicked", notification);
   }
 
   async closed(notification: any) {

lib/prefs.ts

@@ -1,9 +1,9 @@
 "use strict";
 // License: MIT
 
-import * as DEFAULT_PREFS from "../data/prefs.json";
+import DEFAULT_PREFS from "../data/prefs.json";
 import { EventEmitter } from "./events";
-import {loadOverlay} from "./objectoverlay";
+import { loadOverlay } from "./objectoverlay";
 import { storage } from "./browser";
 
 const PREFS = Symbol("PREFS");

lib/recentlist.ts

@@ -36,7 +36,7 @@ export class RecentList {
     this.pref = `savedlist-${pref}`;
     this.defaults = Array.from(defaults);
     this[LIST] = [];
-    this.limit = 5;
+    this.limit = 15;
   }
 
   get values() {
@@ -102,8 +102,8 @@ export const MASK = new RecentList("mask", [
   "*name*.*ext*",
   "*num*_*name*.*ext*",
   "*url*-*name*.*ext*",
-  "*name* (*text*).*ext*",
-  "*name* (*hh*-*mm*).*ext*"
+  "downthemall/*y*-*m*/*name*.*ext*",
+  "*name* (*text*).*ext*"
 ]);
 MASK.init().catch(console.error);
 
@@ -116,3 +116,9 @@ export const FASTFILTER = new RecentList("fastfilter", [
   "*.z??, *.css, *.html"
 ]);
 FASTFILTER.init().catch(console.error);
+
+export const SUBFOLDER = new RecentList("subfolder", [
+  "",
+  "downthemall",
+]);
+SUBFOLDER.init().catch(console.error);

lib/select.ts

@@ -10,11 +10,25 @@ import { donate, openPrefs, openUrls } from "./windowutils";
 import { filters, FAST, Filter } from "./filters";
 import { WindowStateTracker } from "./windowstatetracker";
 import { windows } from "./browser";
+// eslint-disable-next-line no-unused-vars
+import { BaseItem } from "./item";
 
+interface BaseMatchedItem extends BaseItem {
+  matched?: string | null;
+  prevMatched?: string | null;
+}
 
-function computeSelection(filters: any[], items: any[], onlyFast: boolean) {
-  let ws = items.map((item: any, idx: number) => {
-    item.idx = idx;
+export interface ItemDelta {
+  idx: number;
+  matched?: string | null;
+}
+
+function computeSelection(
+    filters: Filter[],
+    items: BaseMatchedItem[],
+    onlyFast: boolean): ItemDelta[] {
+  let ws = items.map((item, idx: number) => {
+    item.idx = item.idx || idx;
     const {matched = null} = item;
     item.prevMatched = matched;
     item.matched = null;
@@ -23,14 +37,20 @@ function computeSelection(filters: any[], items: any[], onlyFast: boolean) {
   for (const filter of filters) {
     ws = ws.filter(item => {
       if (filter.matchItem(item)) {
-        item.matched = filter.id === FAST ?
-          "fast" :
-          (onlyFast ? null : filter.id);
+        if (filter.id === FAST) {
+          item.matched = "fast";
+        }
+        else if (!onlyFast && typeof filter.id === "string") {
+          item.matched = filter.id;
+        }
+        else {
+          item.matched = null;
+        }
       }
       return !item.matched;
     });
   }
-  return items.filter(item => item.prevMatched !== item.matched). map(item => {
+  return items.filter(item => item.prevMatched !== item.matched).map(item => {
     return {
       idx: item.idx,
       matched: item.matched
@@ -41,6 +61,9 @@ function computeSelection(filters: any[], items: any[], onlyFast: boolean) {
 function *computeActiveFiltersGen(
     filters: Filter[], activeOverrides: Map<string, boolean>) {
   for (const filter of filters) {
+    if (typeof filter.id !== "string") {
+      continue;
+    }
     const override = activeOverrides.get(filter.id);
     if (typeof override === "boolean") {
       if (override) {
@@ -59,11 +82,11 @@ function computeActiveFilters(
   return Array.from(computeActiveFiltersGen(filters, activeOverrides));
 }
 
-function filtersToDescs(filters: any[]) {
+function filtersToDescs(filters: Filter[]) {
   return filters.map(f => f.descriptor);
 }
 
-export async function select(links: any[], media: any[]) {
+export async function select(links: BaseItem[], media: BaseItem[]) {
   const fm = await filters();
   const tracker = new WindowStateTracker("select", {
     minWidth: 700,
@@ -75,6 +98,7 @@ export async function select(links: any[], media: any[]) {
     type: "popup",
   });
   const window = await windows.create(windowOptions);
+  tracker.track(window.id, null);
   try {
     const port = await Promise.race<Port>([
       new Promise<Port>(resolve => Bus.oncePort("select", resolve)),
@@ -85,26 +109,26 @@ export async function select(links: any[], media: any[]) {
     tracker.track(window.id, port);
 
     const overrides = new Map();
-    let fast: any = null;
+    let fast: Filter | null = null;
     let onlyFast: false;
     try {
-      fast = fm.getFastFilter();
+      fast = await fm.getFastFilter();
     }
     catch (ex) {
       // ignored
     }
 
     const sendFilters = function(delta = false) {
-      let {linkFilters, mediaFilters} = fm;
+      const {linkFilters, mediaFilters} = fm;
       const alink = computeActiveFilters(linkFilters, overrides);
       const amedia = computeActiveFilters(mediaFilters, overrides);
       const sactiveFilters = new Set<any>();
       [alink, amedia].forEach(
         a => a.forEach(filter => sactiveFilters.add(filter.id)));
       const activeFilters = Array.from(sactiveFilters);
-      linkFilters = filtersToDescs(linkFilters);
-      mediaFilters = filtersToDescs(mediaFilters);
-      port.post("filters", {linkFilters, mediaFilters, activeFilters});
+      const linkFilterDescs = filtersToDescs(linkFilters);
+      const mediaFilterDescs = filtersToDescs(mediaFilters);
+      port.post("filters", {linkFilterDescs, mediaFilterDescs, activeFilters});
 
       if (fast) {
         alink.unshift(fast);
@@ -128,9 +152,6 @@ export async function select(links: any[], media: any[]) {
     });
 
     port.on("queue", (msg: any) => {
-      const selected = new Set<number>(msg.items);
-      const items = (msg.type === "links" ? links : media);
-      msg.items = items.filter((item: any, idx: number) => selected.has(idx));
       done.resolve(msg);
     });
 
@@ -166,8 +187,8 @@ export async function select(links: any[], media: any[]) {
       openPrefs();
     });
 
-    port.on("openUrls", ({urls}) => {
-      openUrls(urls);
+    port.on("openUrls", ({urls, incognito}) => {
+      openUrls(urls, incognito);
     });
 
     try {
@@ -175,7 +196,11 @@ export async function select(links: any[], media: any[]) {
       sendFilters(false);
       const type = await Prefs.get("last-type", "links");
       port.post("items", {type, links, media});
-      const result = await done;
+      const {items, options} = await done;
+      const selectedIndexes = new Set<number>(items);
+      const selectedList = (options.type === "links" ? links : media);
+      const selectedItems = selectedList.filter(
+        (item: BaseItem, idx: number) => selectedIndexes.has(idx));
       for (const [filter, override] of overrides) {
         const f = fm.get(filter);
         if (f) {
@@ -183,7 +208,7 @@ export async function select(links: any[], media: any[]) {
         }
       }
       await fm.save();
-      return result;
+      return {items: selectedItems, options};
     }
     finally {
       fm.off("changed", sendFilters);

lib/single.ts

@@ -7,8 +7,10 @@ import { WindowStateTracker } from "./windowstatetracker";
 import { Promised, timeout } from "./util";
 import { donate } from "./windowutils";
 import { windows } from "./browser";
+// eslint-disable-next-line no-unused-vars
+import { BaseItem } from "./item";
 
-export async function single(item: any) {
+export async function single(item: BaseItem | null) {
   const tracker = new WindowStateTracker("single", {
     minWidth: 700,
     minHeight: 460
@@ -19,6 +21,7 @@ export async function single(item: any) {
     type: "popup",
   });
   const window = await windows.create(windowOptions);
+  tracker.track(window.id, null);
   try {
     const port: Port = await Promise.race<Port>([
       new Promise<Port>(resolve => Bus.oncePort("single", resolve)),
@@ -46,7 +49,9 @@ export async function single(item: any) {
       donate();
     });
 
-    port.post("item", item);
+    if (item) {
+      port.post("item", {item});
+    }
     return await done;
   }
   finally {

lib/util.ts

@@ -2,8 +2,8 @@
 // License: MIT
 
 import * as psl from "psl";
-import {memoize, identity} from "./memoize";
-export {debounce} from "../uikit/lib/util";
+import { identity, memoize } from "./memoize";
+export { debounce } from "../uikit/lib/util";
 
 export class Promised {
   private promise: Promise<any>;
@@ -96,8 +96,72 @@ export const IS_WIN = typeof navigator !== "undefined" &&
 export const sanitizePath = identity(
   IS_WIN ? sanitizePathWindows : sanitizePathGeneric);
 
+export class PathInfo {
+  private baseField: string;
+
+  private extField: string;
+
+  private pathField: string;
+
+  private nameField: string;
+
+  private fullField: string;
+
+  constructor(base: string, ext: string, path: string) {
+    this.baseField = base;
+    this.extField = ext;
+    this.pathField = path;
+    this.update();
+  }
+
+  get base() {
+    return this.baseField;
+  }
+
+  set base(nv) {
+    this.baseField = sanitizePath(nv);
+    this.update();
+  }
+
+  get ext() {
+    return this.extField;
+  }
+
+  set ext(nv) {
+    this.extField = sanitizePath(nv);
+    this.update();
+  }
+
+  get name() {
+    return this.nameField;
+  }
+
+  get path() {
+    return this.pathField;
+  }
+
+  set path(nv) {
+    this.pathField = sanitizePath(nv);
+    this.update();
+  }
+
+  get full() {
+    return this.fullField;
+  }
+
+  private update() {
+    this.nameField = this.extField ? `${this.baseField}.${this.extField}` : this.baseField;
+    this.fullField = this.pathField ? `${this.pathField}/${this.nameField}` : this.nameField;
+  }
+
+  clone() {
+    return new PathInfo(this.baseField, this.extField, this.pathField);
+  }
+}
+
 // XXX cleanup + test
-export const parsePath = memoize(function parsePath(path: string | URL) {
+export const parsePath = memoize(function parsePath(
+    path: string | URL): PathInfo {
   if (path instanceof URL) {
     path = decodeURIComponent(path.pathname);
   }
@@ -127,13 +191,7 @@ export const parsePath = memoize(function parsePath(path: string | URL) {
   }
 
   path = pieces.join("/");
-  return {
-    path,
-    name,
-    base,
-    ext,
-    full: path ? `${path}/${name}` : name
-  };
+  return new PathInfo(base, ext, path);
 });
 
 export class CoalescedUpdate<T> extends Set<T> {
@@ -299,3 +357,20 @@ export function mapFilterInSitu<TRes, T>(
 export function randint(min: number, max: number) {
   return Math.floor(Math.random() * (max - min)) + min;
 }
+
+
+export function validateSubFolder(folder: string) {
+  if (!folder) {
+    return;
+  }
+  folder = folder.replace(/[/\\]+/g, "/");
+  if (folder.startsWith("/")) {
+    throw new Error("error.noabsolutepath");
+  }
+  if (/^[a-z]:\//i.test(folder)) {
+    throw new Error("error.noabsolutepath");
+  }
+  if (/^\.+\/|\/\.+\/|\/\.+$/g.test(folder)) {
+    throw new Error("error.nodotsinpath");
+  }
+}

lib/windowstatetracker.ts

@@ -55,13 +55,15 @@ export class WindowStateTracker {
 
   getOptions(options: any) {
     const result = Object.assign(options, {
-      width: this.width,
-      height: this.height,
       state: this.state,
     });
-    if (this.top >= 0) {
-      result.top = this.top;
-      result.left = this.left;
+    if (result.state !== "maximized") {
+      result.width = this.width;
+      result.height = this.height;
+      if (this.top >= 0) {
+        result.top = this.top;
+        result.left = this.left;
+      }
     }
     return result;
   }

lib/windowutils.ts

@@ -2,29 +2,56 @@
 // License: MIT
 
 import { windows, tabs, runtime } from "../lib/browser";
-import {getManager} from "./manager/man";
-import * as DEFAULT_ICONS from "../data/icons.json";
+import { getManager } from "./manager/man";
+import DEFAULT_ICONS from "../data/icons.json";
+import { Prefs } from "./prefs";
+import { _ } from "./i18n";
 
 const DONATE_URL = "https://www.downthemall.org/howto/donate/";
+const DONATE_LANG_URLS = Object.freeze(new Map([
+  ["de", "https://www.downthemall.org/howto/donate/spenden/"],
+]));
 const MANAGER_URL = "/windows/manager.html";
 
-const IS_CHROME = navigator && navigator.userAgent.includes("Chrome");
-
-
-export async function mostRecentBrowser(): Promise<any> {
-  let window = Array.from(await windows.getAll({windowTypes: ["normal"]})).
-    filter((w: any) => w.type === "normal").pop();
+export async function mostRecentBrowser(incognito: boolean): Promise<any> {
+  let window;
+  try {
+    window = await windows.getCurrent();
+    if (window.type !== "normal") {
+      throw new Error("not a normal window");
+    }
+    if (incognito && !window.incognito) {
+      throw new Error("Not incognito");
+    }
+  }
+  catch {
+    try {
+      window = await windows.getlastFocused();
+      if (window.type !== "normal") {
+        throw new Error("not a normal window");
+      }
+      if (incognito && !window.incognito) {
+        throw new Error("Not incognito");
+      }
+    }
+    catch {
+      window = Array.from(await windows.getAll({windowTypes: ["normal"]})).
+        filter(
+          (w: any) => w.type === "normal" && !!w.incognito === !!incognito).
+        pop();
+    }
+  }
   if (!window) {
     window = await windows.create({
-      url: DONATE_URL,
+      incognito: !!incognito,
       type: "normal",
     });
   }
   return window;
 }
 
-export async function openInTab(url: string) {
-  const window = await mostRecentBrowser();
+export async function openInTab(url: string, incognito: boolean) {
+  const window = await mostRecentBrowser(incognito);
   await tabs.create({
     active: true,
     url,
@@ -33,7 +60,7 @@ export async function openInTab(url: string) {
   await windows.update(window.id, {focused: true});
 }
 
-export async function openInTabOrFocus(url: string) {
+export async function openInTabOrFocus(url: string, incognito: boolean) {
   const etabs = await tabs.query({
     url
   });
@@ -43,21 +70,22 @@ export async function openInTabOrFocus(url: string) {
     await windows.update(tab.windowId, {focused: true});
     return;
   }
-  await openInTab(url);
+  await openInTab(url, incognito);
 }
 
-export async function maybeOpenInTab(url: string) {
+export async function maybeOpenInTab(url: string, incognito: boolean) {
   const etabs = await tabs.query({
     url
   });
   if (etabs.length) {
     return;
   }
-  await openInTab(url);
+  await openInTab(url, incognito);
 }
 
 export async function donate() {
-  await openInTab(DONATE_URL);
+  const url = DONATE_LANG_URLS.get(_("language_code")) || DONATE_URL;
+  await openInTab(url, false);
 }
 
 export async function openPrefs() {
@@ -71,16 +99,38 @@ export async function openManager(focus = true) {
   catch (ex) {
     console.error(ex.toString(), ex);
   }
+  const url = runtime.getURL(MANAGER_URL);
+  const openInPopup = await Prefs.get("manager-in-popup");
+  if (openInPopup) {
+    const etabs = await tabs.query({
+      url
+    });
+    if (etabs.length) {
+      if (!focus) {
+        return;
+      }
+      const tab = etabs.pop();
+      await tabs.update(tab.id, {active: true});
+      await windows.update(tab.windowId, {focused: true});
+      return;
+    }
+    const windowOptions = {
+      url,
+      type: "popup",
+    };
+    await windows.create(windowOptions);
+    return;
+  }
   if (focus) {
-    await openInTabOrFocus(await runtime.getURL(MANAGER_URL));
+    await openInTabOrFocus(runtime.getURL(MANAGER_URL), false);
   }
   else {
-    await maybeOpenInTab(await runtime.getURL(MANAGER_URL));
+    await maybeOpenInTab(runtime.getURL(MANAGER_URL), false);
   }
 }
 
-export async function openUrls(urls: string) {
-  const window = await mostRecentBrowser();
+export async function openUrls(urls: string, incognito: boolean) {
+  const window = await mostRecentBrowser(incognito);
   for (const url of urls) {
     try {
       await tabs.create({
@@ -106,32 +156,10 @@ const ICONS = Object.freeze((() => {
   return new Map<string, string>(rv);
 })());
 
-let iconForPathPlatform: Function;
-if (IS_CHROME) {
-  const FOUR = 128;
-  const DOUBLE = 64;
-  iconForPathPlatform = function(icon: string, size: number) {
-    let scale = "1x";
-    if (size > FOUR) {
-      // wishful thinking at this point
-      scale = "4x";
-    }
-    else if (size > DOUBLE) {
-      scale = "2x";
-    }
-    return `chrome://fileicon/${icon}?scale=${scale}`;
-  };
-}
-else {
-  // eslint-disable-next-line no-unused-vars
-  iconForPathPlatform = function(icon: string, size: number) {
-    return ICONS.get(icon) || "icon-file-generic";
-  };
-}
+export const DEFAULT_ICON_SIZE = 16;
 
-
-// eslint-disable-next-line no-magic-numbers
-export function iconForPath(path: string, size = 16) {
+// eslint-disable-next-line no-unused-vars
+export function iconForPath(path: string, size = DEFAULT_ICON_SIZE) {
   const web = /^https?:\/\//.test(path);
   let file = path.split(/[\\/]/).pop();
   if (file) {
@@ -152,7 +180,7 @@ export function iconForPath(path: string, size = 16) {
       file = "file";
     }
   }
-  return iconForPathPlatform(file, size);
+  return ICONS.get(file) || "icon-file-generic";
 }
 
 /**

manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "DownThemAll!",
-  "version": "4.0.1",
+  "version": "4.1.1",
 
   "description": "__MSG_extensionDescription__",
   "homepage_url": "https://downthemall.org/",
@@ -9,6 +9,8 @@
 
   "default_locale": "en",
 
+  "content_security_policy": "script-src 'self'; style-src 'self' 'unsafe-inline'; img-src data: blob: 'self'; connect-src data: blob: http: https: 'self'; default-src 'self'",
+
   "icons": {
     "16": "style/icon16.png",
     "32": "style/icon32.png",
@@ -22,14 +24,18 @@
   "permissions": [
     "<all_urls>",
     "contextMenus",
-    "menus",
     "downloads",
     "downloads.open",
     "downloads.shelf",
+    "history",
+    "menus",
     "notifications",
+    "sessions",
     "storage",
     "tabs",
-    "webNavigation"
+    "webNavigation",
+    "webRequest",
+    "webRequestBlocking"
   ],
 
   "background": {
@@ -40,7 +46,8 @@
   },
 
   "browser_action": {
-    "browser_style": false,
+    "browser_style": true,
+    "default_popup": "windows/popup.html",
     "default_icon": {
       "16": "style/icon16.png",
       "32": "style/icon32.png",

package.json

@@ -22,18 +22,20 @@
     "@typescript-eslint/eslint-plugin": "^2.0.0",
     "@typescript-eslint/parser": "^2.0.0",
     "chai": "^4.1.2",
-    "eslint": "^6.1.0",
+    "eslint": "^6.2.2",
     "mocha": "^6.2.0",
     "ts-loader": "^6.0.4",
     "ts-node": "^8.3.0",
     "typescript": "^3.5.3",
-    "webpack": "^4.39.2",
-    "webpack-cli": "^3.3.6",
+    "webpack": "^4.39.3",
+    "webpack-cli": "^3.3.7",
     "xregexp": "^4.2.4"
   },
   "dependencies": {
     "@types/psl": "^1.1.0",
+    "@types/whatwg-mimetype": "^2.1.0",
     "psl": "^1.3.0",
-    "webextension-polyfill": "^0.4.0"
+    "webextension-polyfill": "^0.4.0",
+    "whatwg-mimetype": "^2.3.0"
   }
 }

scripts/gather.ts

@@ -28,7 +28,9 @@ return url;
 }();
 
 function makeURL(url: string) {
-  return new URL(url, baseURL);
+  const rv = new URL(url, baseURL);
+  rv.hash = "";
+  return rv;
 }
 
 function sanitize(str: string | null | undefined) {
@@ -75,6 +77,8 @@ function urlToUsable(e: any, u: string) {
 }
 
 class Gatherer {
+  private: boolean;
+
   textLinks: boolean;
 
   selectionOnly: boolean;
@@ -86,53 +90,69 @@ class Gatherer {
   transferable: string[];
 
   constructor(options: any) {
+    this.private = !!options.private;
     this.textLinks = options.textLinks;
     this.selectionOnly = options.selectionOnly;
     this.selection = options.selectionOnly ? getSelection() : null;
     this.schemes = new Set(options.schemes);
     this.transferable = options.transferable;
     this.collectLink = this.collectLink.bind(this);
-    this.collectImages = this.collectImages.bind(this);
+    this.collectImage = this.collectImage.bind(this);
     this.collectMedia = this.collectMedia.bind(this);
     Object.freeze(this);
   }
 
   collectLink(a: HTMLAnchorElement) {
-    const item = this.makeItem(a.href, a);
-    if (!item) {
+    try {
+      const item = this.makeItem(a.href, a);
+      if (!item) {
+        return item;
+      }
+      urlToUsable(item, item.url);
+      item.fileName = sanitize(a.getAttribute("download"));
+      item.description = extractDescription(a);
       return item;
     }
-    urlToUsable(item, item.url);
-    item.fileName = sanitize(a.getAttribute("download"));
-    item.description = extractDescription(a);
-    return item;
+    catch (ex) {
+      console.error("oopsed link", ex.toString(), ex);
+    }
+    return null;
   }
 
-  *collectImagesInternal(img: HTMLImageElement) {
-    const src = img.currentSrc || img.src;
-    const item = this.makeItem(src, img);
-    item.fileName = "";
-    item.description = item.title;
-    yield item;
-
-    const {srcset} = img;
-    if (!srcset) {
-      return;
-    }
-    const imgs = srcset.split(",").flatMap(e => {
-      const idx = e.lastIndexOf(" ");
-      return (idx > 0 ? e.slice(0, idx) : e).trim();
-    });
-    for (const i of imgs) {
-      const item = this.makeItem(i, img);
+  *collectImageInternal(img: HTMLImageElement) {
+    try {
+      const src = img.currentSrc || img.src;
+      const item = this.makeItem(src, img);
       if (item) {
+        item.fileName = "";
+        item.description = item.title;
         yield item;
       }
+
+      const {srcset} = img;
+      if (!srcset) {
+        return;
+      }
+      const imgs = srcset.split(",").flatMap(e => {
+        const idx = e.lastIndexOf(" ");
+        return (idx > 0 ? e.slice(0, idx) : e).trim();
+      });
+      for (const i of imgs) {
+        const item = this.makeItem(i, img);
+        if (item) {
+          item.fileName = "";
+          item.description = item.title;
+          yield item;
+        }
+      }
+    }
+    catch (ex) {
+      console.error("oops image", ex.toString(), ex.stack, ex);
     }
   }
 
-  collectImages(img: HTMLImageElement) {
-    return [...this.collectImagesInternal(img)];
+  collectImage(img: HTMLImageElement) {
+    return [...this.collectImageInternal(img)];
   }
 
   collectMediaInternal(title: string | undefined | null, el: HTMLMediaElement) {
@@ -156,13 +176,19 @@ class Gatherer {
   }
 
   collectMedia(el: HTMLMediaElement) {
-    const item = this.collectMediaInternal(el.getAttribute("title"), el);
-    const rv = item ? [item] : [];
-    const title: string | undefined = item && item.title ||
+    try {
+      const item = this.collectMediaInternal(el.getAttribute("title"), el);
+      const rv = item ? [item] : [];
+      const title: string | undefined = item && item.title ||
       el.getAttribute("title");
-    rv.push(...Array.from(el.querySelectorAll("source")).
-      map(this.collectMediaInternal.bind(this, title)));
-    return rv;
+      rv.push(...Array.from(el.querySelectorAll("source")).
+        map(this.collectMediaInternal.bind(this, title)));
+      return rv;
+    }
+    catch (ex) {
+      console.log("oopsed media", ex.toString(), ex);
+    }
+    return [];
   }
 
   *findTexts() {
@@ -207,8 +233,14 @@ class Gatherer {
     if (!this.textLinks) {
       return [];
     }
-    return Array.from(this.findTextLinks()).
-      map(link => this.makeItem(link.href, link));
+    try {
+      return Array.from(this.findTextLinks()).
+        map(link => this.makeItem(link.href, link));
+    }
+    catch (ex) {
+      console.error("oopsed textlinks", ex.toString(), ex);
+    }
+    return [];
   }
 
   makeItem(surl: string, el: HTMLElement, title?: string | null): any {
@@ -226,6 +258,7 @@ class Gatherer {
       return {
         url: url.href,
         title,
+        private: this.private
       };
     }
     catch (ex) {
@@ -266,7 +299,7 @@ class Gatherer {
 function gather(msg: any, sender: any, callback: Function) {
   try {
     if (!msg || msg.type !== "DTA:gather" || !callback) {
-      return;
+      return Promise.resolve(null);
     }
     const gatherer = new Gatherer(msg);
     const result = {
@@ -276,7 +309,7 @@ function gather(msg: any, sender: any, callback: Function) {
         gatherer.collectTextLinks()),
       media: gatherer.makeUniqueItems(
         Array.from(document.querySelectorAll("img")).
-          flatMap(gatherer.collectImages),
+          flatMap(gatherer.collectImage),
         Array.from(document.querySelectorAll("video")).
           flatMap(gatherer.collectMedia),
         Array.from(document.querySelectorAll("audio")).
@@ -284,10 +317,11 @@ function gather(msg: any, sender: any, callback: Function) {
       ),
     };
     urlToUsable(result, result.baseURL);
-    callback(result);
+    return Promise.resolve(result);
   }
   catch (ex) {
     console.error(ex.toString(), ex.stack, ex);
+    return Promise.resolve(null);
   }
 }
 

style/add.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 16" width="16" height="16" xmlns="http://www.w3.org/2000/svg">
+ <path d="m8 0a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm-1.5 3h3v3.5h3.5v3h-3.5v3.5h-3v-3.5h-3.5v-3h3.5v-3.5z" fill="#000080" fill-rule="evenodd"/>
+</svg>

style/common.css

@@ -10,6 +10,7 @@
   --add-color: navy;
   --queue-color: gray;
   --pause-color: #ffa318;
+  --retry-color: rgb(0, 112, 204);
   --error-color: rgb(160, 13, 42);
   --running-color: #aae061;
   --finishing-color: #57cc12;
@@ -18,12 +19,17 @@
   --folder-color: rgb(214, 165, 4);
   --maskbutton-color: rgb(236, 185, 16);
   --missing-color: rgb(0, 82, 204);
+  --open-color: rgba(236, 185, 16, 0.8);
 }
 
 html[data-platform="mac"] {
   --folder-color: rgb(4, 102, 214);
 }
 
+html, body {
+  font-size: 10pt !important;
+}
+
 @font-face {
   font-family: 'downthemall';
   src: url('downthemall.woff2?75791791') format('woff2');
@@ -88,6 +94,7 @@ html[data-platform="mac"] {
 .icon-file-video:before { content: '\e825'; } /* '' */
 .icon-file-generic:before { content: '\e826'; } /* '' */
 .icon-question-dark:before { content: '\e827'; } /* '' */
+.icon-forward:before { content: '\e828'; } /* '' */
 .icon-filter:before { content: '\f0b0'; } /* '' */
 .icon-donate:before { content: '\f0d6'; } /* '' */
 .icon-file-doc:before { content: '\f0f6'; } /* '' */
@@ -100,7 +107,8 @@ html[data-platform="mac"] {
 .icon-file-image:before { content: '\f1c5'; } /* '' */
 .icon-file-archive:before { content: '\f1c6'; } /* '' */
 .icon-file-audio:before { content: '\f1c7'; } /* '' */
-.icon-toggle:before { content: '\f205'; } /* '' */
+.icon-toggle-off:before { content: '\f204'; } /* '' */
+.icon-toggle-on:before { content: '\f205'; } /* '' */
 .icon-server:before { content: '\f233'; } /* '' */
 .icon-question-light:before { content: '\f29c'; } /* '' */
 

style/manager.css

@@ -46,6 +46,11 @@ body > * {
   background: rgb(246,246,246);
   color: black;
   transition: box-shadow 0.5s, background 1s;
+  font-size: 24px;
+  line-height: 24px;
+}
+#toolbar > .button > span:before {
+  display: block;
 }
 
 #toolbar > .button.disabled {
@@ -63,13 +68,6 @@ body > * {
   box-shadow: 0px 0px 7px 2px rgba(220,220,220,0.75);
 }
 
-#toolbar > .button > span {
-  display: block;
-  flex-grow: 0;
-  width: 24px;
-  line-height: 24px;
-}
-
 #toolbar > .button > .icon-add {
   color: var(--add-color);
 }
@@ -110,11 +108,11 @@ body > * {
 }
 
 #colURL {
-  width: 38%;
+  width: 42%;
 }
 
 #colPercent {
-  width: 3em;
+  width: 4em;
   min-width: 3em;
 }
 
@@ -123,11 +121,11 @@ body > * {
 }
 
 #colSize {
-  width: 15em;
+  width: 14em;
 }
 
 #colSpeed {
-  width: 6em;
+  width: 7em;
 }
 
 #colDomain,
@@ -156,6 +154,14 @@ body > * {
   height: 26px;
 }
 
+.virtualtable-row.opening {
+  background: var(--open-color) !important;
+}
+
+.virtualtable-progress-container {
+  border-radius: 2px;
+}
+
 .virtualtable-progress-bar {
   height: 14px;
 }
@@ -196,6 +202,23 @@ body > * {
   );
 }
 
+.retrying .virtualtable-column-2 .virtualtable-icon {
+  color: var(--retry-color);
+}
+.retrying .virtualtable-column-2 .virtualtable-progress-bar {
+  background: var(--retry-color);
+}
+.retrying .virtualtable-column-2 .virtualtable-progress-undetermined {
+  background: repeating-linear-gradient(
+    45deg,
+    var(--retry-color),
+    var(--retry-color) 6px,
+    transparent 6px,
+    transparent 12px
+  );
+}
+
+
 .missing .virtualtable-column-2 .virtualtable-icon,
 .canceled .virtualtable-column-2 .virtualtable-icon {
   color: var(--error-color);
@@ -264,6 +287,7 @@ body > * {
 }
 
 .virtualtable-column-6,
+.virtualtable-column-4,
 .virtualtable-column-3 {
   text-align: right;
 }
@@ -432,6 +456,8 @@ body > * {
   justify-items: stretch;
   border-radius: 4px;
   box-shadow: 2px 2px 6px black;
+  -webkit-user-select: none;
+  user-select: none;
 }
 
 #tooltip-infos {
@@ -444,8 +470,13 @@ body > * {
 }
 
 #tooltip-icon {
-  font-size: 48px;
-  line-height: 48px;
+  height: 64px;
+  width: 64px;
+  background-size: 64px 64px;
+  background-repeat: no-repeat;
+  background-position: center center;
+  font-size: 64px;
+  line-height: 64px;
   padding: 6px;
   text-align: center;
   grid-row: 1/-1;
@@ -497,4 +528,24 @@ body > * {
   height: 100%;
   width: 100%;
   background: var(--done-color);
+}
+
+#tooltip-eta.single {
+  font-weight: bold;
+  grid-column-end: span 2;
+}
+
+.deletefiles-list {
+  padding-left: 1ex;
+  padding-right: 1.5ex;
+  border: 1px solid lightgray;
+  border-radius: 6px;
+  background-color: rgba(128,128,128,0.1);
+  max-height: 8em;
+  overflow-y: auto;
+}
+.deletefiles-list > li {
+  list-style-type: none;
+  padding: 0;
+  margin: 0;
 }

style/prefs.css

@@ -19,7 +19,7 @@ article {
 
 #tabs {
   display: flex;
-  background: url(icon64.png) 1em 0/32px 32px no-repeat, url(tile.png) repeat-x, var(--toolbar-bg-color);
+  background: url(icon64.png) 1em 50%/32px 32px no-repeat, url(tile.png) repeat-x, var(--toolbar-bg-color);
   padding-left: calc(2em + 32px);
   color: white;
 }
@@ -28,7 +28,7 @@ input.tab {
   display: none;
 }
 
-#tabs > label{
+#tabs > label {
   display: inline-block;
   cursor: pointer;
   font-size: 150%;
@@ -138,4 +138,11 @@ legend {
   border-radius: 6px;
   background: rgba(128, 128, 128, 0.05);
   box-shadow: 1px 1px 6px lightgray;
+}
+
+#network-general {
+  display: grid;
+  grid-template-columns: auto 1fr;
+  grid-column-gap: 1em;
+  grid-row-gap: 1ex;
 }

style/select.css

@@ -117,7 +117,7 @@ body > * {
 }
 @media (-webkit-min-device-pixel-ratio: 1.3), (min-resolution: 124.8dpi) {
   #tabs {
-    background: url(icon64.png) 1em 0/32px 32px no-repeat, url(tile.png) repeat-x, var(--toolbar-bg-color);
+    background: url(icon64.png) 1em 50%/32px 32px no-repeat, url(tile.png) repeat-x, var(--toolbar-bg-color);
   }
 }
 
@@ -147,7 +147,7 @@ body > * {
   background: var(--toolbar-bg-color);
   color: white;
   min-width: 10em;
-  padding: 1.2ex;
+  padding: 1ex;
   padding-left: 1em;
   cursor: pointer;
   border: 0;
@@ -232,3 +232,7 @@ body > * {
 #maskButton {
   justify-self: flex-start;
 }
+
+#btnDownload {
+  font-weight: bold;
+}

style/single.css

@@ -49,7 +49,7 @@ p.example {
 }
 
 #options > * {
-  margin: 0;
+  margin: 2px;
 }
 
 #options > input {
@@ -63,6 +63,7 @@ p.example {
   align-items: center;
 }
 
+#options > #subfolderOptions,
 #options > #maskOptions {
   display: grid;
   grid-template-columns: 2fr auto auto;
@@ -81,3 +82,7 @@ h3 {
   font-weight: normal;
   font-style: italic;
 }
+
+#btnDownload {
+  font-weight: bold;
+}

tests/test_cdheaderparser.js

@@ -0,0 +1,289 @@
+/* eslint-disable max-len */
+/* eslint-env node */
+"use strict";
+// License: MPL-2
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const { CDHeaderParser } = require("../lib/cdheaderparser");
+
+const parser = new CDHeaderParser();
+
+function check(header, expected) {
+  expect(parser.parse(header)).to.equal(expected);
+}
+
+function nocheck(header, expected) {
+  expect(parser.parse(header)).not.to.equal(expected);
+}
+
+describe("CDHeaderParser", function() {
+  it("parse wget", function() {
+    // From wget, test_parse_content_disposition
+    // http://git.savannah.gnu.org/cgit/wget.git/tree/src/http.c?id=8551ceccfedb4390fbfa82c12f0ff714dab1ac76#n5325
+    check("filename=\"file.ext\"", "file.ext");
+    check("attachment; filename=\"file.ext\"", "file.ext");
+    check("attachment; filename=\"file.ext\"; dummy", "file.ext");
+    check("attachment", ""); // wget uses NULL, we use "".
+    check("attachement; filename*=UTF-8'en-US'hello.txt", "hello.txt");
+    check("attachement; filename*0=\"hello\"; filename*1=\"world.txt\"",
+      "helloworld.txt");
+    check("attachment; filename=\"A.ext\"; filename*=\"B.ext\"", "B.ext");
+    check("attachment; filename*=\"A.ext\"; filename*0=\"B\"; filename*1=\"B.ext\"",
+      "A.ext");
+    // This test is faulty - https://savannah.gnu.org/bugs/index.php?52531
+    //check("filename**0=\"A\"; filename**1=\"A.ext\"; filename*0=\"B\";filename*1=\"B\"", "AA.ext");
+  });
+
+  it("parse Firefox", function() {
+    // From Firefox
+    // https://searchfox.org/mozilla-central/rev/45a3df4e6b8f653b0103d18d97c34dd666706358/netwerk/test/unit/test_MIME_params.js
+    // Changed as follows:
+    // - Replace error codes with empty string (we never throw).
+
+    const BS = "\\";
+    const DQUOTE = "\"";
+    // No filename parameter: return nothing
+    check("attachment;", "");
+    // basic
+    check("attachment; filename=basic", "basic");
+    // extended
+    check("attachment; filename*=UTF-8''extended", "extended");
+    // prefer extended to basic (bug 588781)
+    check("attachment; filename=basic; filename*=UTF-8''extended", "extended");
+    // prefer extended to basic (bug 588781)
+    check("attachment; filename*=UTF-8''extended; filename=basic", "extended");
+    // use first basic value (invalid; error recovery)
+    check("attachment; filename=first; filename=wrong", "first");
+    // old school bad HTTP servers: missing 'attachment' or 'inline'
+    // (invalid; error recovery)
+    check("filename=old", "old");
+    check("attachment; filename*=UTF-8''extended", "extended");
+    // continuations not part of RFC 5987 (bug 610054)
+    check("attachment; filename*0=foo; filename*1=bar", "foobar");
+    // Return first continuation (invalid; error recovery)
+    check("attachment; filename*0=first; filename*0=wrong; filename=basic", "first");
+    // Only use correctly ordered continuations  (invalid; error recovery)
+    check("attachment; filename*0=first; filename*1=second; filename*0=wrong", "firstsecond");
+    // prefer continuation to basic (unless RFC 5987)
+    check("attachment; filename=basic; filename*0=foo; filename*1=bar", "foobar");
+    // Prefer extended to basic and/or (broken or not) continuation
+    // (invalid; error recovery)
+    check("attachment; filename=basic; filename*0=first; filename*0=wrong; filename*=UTF-8''extended", "extended");
+    // RFC 2231 not clear on correct outcome: we prefer non-continued extended
+    // (invalid; error recovery)
+    check("attachment; filename=basic; filename*=UTF-8''extended; filename*0=foo; filename*1=bar", "extended");
+    // Gaps should result in returning only value until gap hit
+    // (invalid; error recovery)
+    check("attachment; filename*0=foo; filename*2=bar", "foo");
+    // Don't allow leading 0's (*01) (invalid; error recovery)
+    check("attachment; filename*0=foo; filename*01=bar", "foo");
+    // continuations should prevail over non-extended (unless RFC 5987)
+    check("attachment; filename=basic; filename*0*=UTF-8''multi;\r\n" +
+      " filename*1=line;\r\n" +
+      " filename*2*=%20extended",
+    "multiline extended");
+    // Gaps should result in returning only value until gap hit
+    // (invalid; error recovery)
+    check("attachment; filename=basic; filename*0*=UTF-8''multi;\r\n" +
+      " filename*1=line;\r\n" +
+      " filename*3*=%20extended",
+    "multiline");
+    // First series, only please, and don't slurp up higher elements (*2 in this
+    // case) from later series into earlier one (invalid; error recovery)
+    check("attachment; filename=basic; filename*0*=UTF-8''multi;\r\n" +
+      " filename*1=line;\r\n" +
+      " filename*0*=UTF-8''wrong;\r\n" +
+      " filename*1=bad;\r\n" +
+      " filename*2=evil",
+    "multiline");
+    // RFC 2231 not clear on correct outcome: we prefer non-continued extended
+    // (invalid; error recovery)
+    check("attachment; filename=basic; filename*0=UTF-8''multi\r\n;" +
+      " filename*=UTF-8''extended;\r\n" +
+      " filename*1=line;\r\n" +
+      " filename*2*=%20extended",
+    "extended");
+    // sneaky: if unescaped, make sure we leave UTF-8'' in value
+    check("attachment; filename*0=UTF-8''unescaped;\r\n" +
+      " filename*1*=%20so%20includes%20UTF-8''%20in%20value",
+    "UTF-8''unescaped so includes UTF-8'' in value");
+    // sneaky: if unescaped, make sure we leave UTF-8'' in value
+    check("attachment; filename=basic; filename*0=UTF-8''unescaped;\r\n" +
+      " filename*1*=%20so%20includes%20UTF-8''%20in%20value",
+    "UTF-8''unescaped so includes UTF-8'' in value");
+    // Prefer basic over invalid continuation
+    // (invalid; error recovery)
+    check("attachment; filename=basic; filename*1=multi;\r\n" +
+      " filename*2=line;\r\n" +
+      " filename*3*=%20extended",
+    "basic");
+    // support digits over 10
+    check("attachment; filename=basic; filename*0*=UTF-8''0;\r\n" +
+      " filename*1=1; filename*2=2;filename*3=3;filename*4=4;filename*5=5;\r\n" +
+      " filename*6=6; filename*7=7;filename*8=8;filename*9=9;filename*10=a;\r\n" +
+      " filename*11=b; filename*12=c;filename*13=d;filename*14=e;filename*15=f\r\n",
+    "0123456789abcdef");
+    // support digits over 10 (detect gaps)
+    check("attachment; filename=basic; filename*0*=UTF-8''0;\r\n" +
+      " filename*1=1; filename*2=2;filename*3=3;filename*4=4;filename*5=5;\r\n" +
+      " filename*6=6; filename*7=7;filename*8=8;filename*9=9;filename*10=a;\r\n" +
+      " filename*11=b; filename*12=c;filename*14=e\r\n",
+    "0123456789abc");
+    // return nothing: invalid
+    // (invalid; error recovery)
+    check("attachment; filename*1=multi;\r\n" +
+      " filename*2=line;\r\n" +
+      " filename*3*=%20extended",
+    "");
+    // Bug 272541: Empty disposition type treated as "attachment"
+    // sanity check
+    check("attachment; filename=foo.html", "foo.html");
+    // the actual bug
+    check("; filename=foo.html", "foo.html");
+    // regression check, but see bug 671204
+    check("filename=foo.html", "foo.html");
+    // Bug 384571: RFC 2231 parameters not decoded when appearing in reversed order
+    // check ordering
+    check("attachment; filename=basic; filename*0*=UTF-8''0;\r\n" +
+      " filename*1=1; filename*2=2;filename*3=3;filename*4=4;filename*5=5;\r\n" +
+      " filename*6=6; filename*7=7;filename*8=8;filename*9=9;filename*10=a;\r\n" +
+      " filename*11=b; filename*12=c;filename*13=d;filename*15=f;filename*14=e;\r\n",
+    "0123456789abcdef");
+    // check non-digits in sequence numbers
+    check("attachment; filename=basic; filename*0*=UTF-8''0;\r\n" +
+      " filename*1a=1\r\n",
+    "0");
+    // check duplicate sequence numbers
+    check("attachment; filename=basic; filename*0*=UTF-8''0;\r\n" +
+      " filename*0=bad; filename*1=1;\r\n",
+    "0");
+    // check overflow
+    check("attachment; filename=basic; filename*0*=UTF-8''0;\r\n" +
+      " filename*11111111111111111111111111111111111111111111111111111111111=1",
+    "0");
+    // check underflow
+    check("attachment; filename=basic; filename*0*=UTF-8''0;\r\n" +
+      " filename*-1=1",
+    "0");
+    // check mixed token/quoted-string
+    check("attachment; filename=basic; filename*0=\"0\";\r\n" +
+      " filename*1=1;\r\n" +
+      " filename*2*=%32",
+    "012");
+    // check empty sequence number
+    check("attachment; filename=basic; filename**=UTF-8''0\r\n", "basic");
+    // Bug 419157: ensure that a MIME parameter with no charset information
+    // fallbacks to Latin-1
+    check("attachment;filename=IT839\x04\xB5(m8)2.pdf;", "IT839\u0004\u00b5(m8)2.pdf");
+    // Bug 588389: unescaping backslashes in quoted string parameters
+    // '\"', should be parsed as '"'
+    check(`attachment; filename=${DQUOTE}${BS + DQUOTE}${DQUOTE}`, DQUOTE);
+    // 'a\"b', should be parsed as 'a"b'
+    check(`attachment; filename=${DQUOTE}a${BS + DQUOTE}b${DQUOTE}`, `a${DQUOTE}b`);
+    // '\x', should be parsed as 'x'
+    check(`attachment; filename=${DQUOTE}${BS}x${DQUOTE}`, "x");
+    // test empty param (quoted-string)
+    check(`attachment; filename=${DQUOTE}${DQUOTE}`, "");
+    // test empty param
+    check("attachment; filename=", "");
+    // Bug 601933: RFC 2047 does not apply to parameters (at least in HTTP)
+    check("attachment; filename==?ISO-8859-1?Q?foo-=E4.html?=", "foo-\u00e4.html");
+    check("attachment; filename=\"=?ISO-8859-1?Q?foo-=E4.html?=\"", "foo-\u00e4.html");
+    // format sent by GMail as of 2012-07-23 (5987 overrides 2047)
+    check("attachment; filename=\"=?ISO-8859-1?Q?foo-=E4.html?=\"; filename*=UTF-8''5987", "5987");
+    // Bug 651185: double quotes around 2231/5987 encoded param
+    // Change reverted to backwards compat issues with various web services,
+    // such as OWA (Bug 703015), plus similar problems in Thunderbird. If this
+    // is tried again in the future, email probably needs to be special-cased.
+    // sanity check
+    check("attachment; filename*=utf-8''%41", "A");
+    // the actual bug
+    check(`attachment; filename*=${DQUOTE}utf-8''%41${DQUOTE}`, "A");
+    // Bug 670333: Content-Disposition parser does not require presence of "="
+    // in params
+    // sanity check
+    check("attachment; filename*=UTF-8''foo-%41.html", "foo-A.html");
+    // the actual bug
+    check("attachment; filename *=UTF-8''foo-%41.html", "");
+    // the actual bug, without 2231/5987 encoding
+    check("attachment; filename X", "");
+    // sanity check with WS on both sides
+    check("attachment; filename = foo-A.html", "foo-A.html");
+    // Bug 685192: in RFC2231/5987 encoding, a missing charset field should be
+    // treated as error
+    // the actual bug
+    check("attachment; filename*=''foo", "foo");
+    // sanity check
+    check("attachment; filename*=a''foo", "foo");
+    // Bug 692574: RFC2231/5987 decoding should not tolerate missing single
+    // quotes
+    // one missing
+    check("attachment; filename*=UTF-8'foo-%41.html", "foo-A.html");
+    // both missing
+    check("attachment; filename*=foo-%41.html", "foo-A.html");
+    // make sure fallback works
+    check("attachment; filename*=UTF-8'foo-%41.html; filename=bar.html", "foo-A.html");
+    // Bug 693806: RFC2231/5987 encoding: charset information should be treated
+    // as authoritative
+    // UTF-8 labeled ISO-8859-1
+    check("attachment; filename*=ISO-8859-1''%c3%a4", "\u00c3\u00a4");
+    // UTF-8 labeled ISO-8859-1, but with octets not allowed in ISO-8859-1
+    // accepts x82, understands it as Win1252, maps it to Unicode \u20a1
+    check("attachment; filename*=ISO-8859-1''%e2%82%ac", "\u00e2\u201a\u00ac");
+    // defective UTF-8
+    nocheck("attachment; filename*=UTF-8''A%e4B", "");
+    // defective UTF-8, with fallback
+    nocheck("attachment; filename*=UTF-8''A%e4B; filename=fallback", "fallback");
+    // defective UTF-8 (continuations), with fallback
+    nocheck("attachment; filename*0*=UTF-8''A%e4B; filename=fallback", "fallback");
+    // check that charsets aren't mixed up
+    check("attachment; filename*0*=ISO-8859-15''euro-sign%3d%a4; filename*=ISO-8859-1''currency-sign%3d%a4", "currency-sign=\u00a4");
+    // same as above, except reversed
+    check("attachment; filename*=ISO-8859-1''currency-sign%3d%a4; filename*0*=ISO-8859-15''euro-sign%3d%a4", "currency-sign=\u00a4");
+    // Bug 704989: add workaround for broken Outlook Web App (OWA)
+    // attachment handling
+    check("attachment; filename*=\"a%20b\"", "a b");
+    // Bug 717121: crash nsMIMEHeaderParamImpl::DoParameterInternal
+    check("attachment; filename=\"", "");
+    // We used to read past string if last param w/o = and ;
+    // Note: was only detected on windows PGO builds
+    check("attachment; filename=foo; trouble", "foo");
+    // Same, followed by space, hits another case
+    check("attachment; filename=foo; trouble ", "foo");
+    check("attachment", "");
+    // Bug 730574: quoted-string in RFC2231-continuations not handled
+    check("attachment; filename=basic; filename*0=\"foo\"; filename*1=\"\\b\\a\\r.html\"", "foobar.html");
+    // unmatched escape char
+    check("attachment; filename=basic; filename*0=\"foo\"; filename*1=\"\\b\\a\\", "fooba\\");
+    // Bug 732369: Content-Disposition parser does not require presence of ";" between params
+    // optimally, this would not even return the disposition type "attachment"
+    check("attachment; extension=bla filename=foo", "");
+    check("attachment; filename=foo extension=bla", "foo");
+    check("attachment filename=foo", "");
+    // Bug 777687: handling of broken %escapes
+    nocheck("attachment; filename*=UTF-8''f%oo; filename=bar", "bar");
+    nocheck("attachment; filename*=UTF-8''foo%; filename=bar", "bar");
+    // Bug 783502 - xpcshell test netwerk/test/unit/test_MIME_params.js fails on AddressSanitizer
+    check("attachment; filename=\"\\b\\a\\", "ba\\");
+  });
+
+  it("parse extra", function() {
+    // Extra tests, not covered by above tests.
+    check("inline; FILENAME=file.txt", "file.txt");
+    check("INLINE; FILENAME= \"an example.html\"", "an example.html"); // RFC 6266, section 5.
+    check("inline; filename= \"tl;dr.txt\"", "tl;dr.txt");
+    check("INLINE; FILENAME*= \"an example.html\"", "an example.html");
+    check("inline; filename*= \"tl;dr.txt\"", "tl;dr.txt");
+    check("inline; filename*0=\"tl;dr and \"; filename*1=more.txt", "tl;dr and more.txt");
+  });
+
+  it("parse issue 26", function() {
+    // https://github.com/Rob--W/open-in-browser/issues/26
+    check("attachment; filename=\xe5\x9c\x8b.pdf", "\u570b.pdf");
+  });
+
+  it("parse issue 35", function() {
+    // https://github.com/Rob--W/open-in-browser/issues/35
+    check("attachment; filename=okre\x9clenia.rtf", "okreœlenia.rtf");
+  });
+});

tests/test_mime.js

@@ -0,0 +1,30 @@
+"use strict";
+// License: CC0 1.0
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const {MimeDB} = require("../lib/mime");
+
+describe("MIME", function() {
+  it("general", function() {
+    expect(MimeDB.getMime("image/jpeg").major).to.equal("image");
+    expect(MimeDB.getMime("image/jpeg").minor).to.equal("jpeg");
+    expect(MimeDB.getMime("iMage/jPeg").major).to.equal("image");
+    expect(MimeDB.getMime("imAge/jpEg").minor).to.equal("jpeg");
+  });
+
+  it("exts", function() {
+    expect(MimeDB.getMime("image/jpeg").primary).to.equal("jpg");
+    expect(MimeDB.getMime("image/jpeg").primary).to.equal(
+      MimeDB.getPrimary("image/jpeg"));
+    expect(MimeDB.getMime("iMage/jPeg").primary).to.equal("jpg");
+    expect(MimeDB.getMime("imAge/jpEg").primary).to.equal(
+      MimeDB.getPrimary("image/jpeg"));
+    expect(Array.from(MimeDB.getMime("imAge/jpEg").extensions)).to.deep.equal(
+      ["jpg", "jpeg", "jpe", "jfif"]);
+  });
+
+  it("application/octet-stream should not yield results", function() {
+    expect(MimeDB.getPrimary("application/octet-stream")).to.equal("");
+    expect(MimeDB.getMime("application/octet-Stream")).to.be.undefined;
+  });
+});

tests/test_renamer.js

@@ -19,7 +19,7 @@ const OPTS = {
   state: DownloadState.QUEUED,
   batch: 42,
   idx: 23,
-  mask: "*name*.*ext",
+  mask: "*name*.*ext*",
   description: "desc / ript.ion .",
   title: " *** TITLE *** ",
 };
@@ -57,6 +57,49 @@ describe("Renamer", function() {
       expect(dest.path).to.equal("");
     });
 
+    it("*name*.*ext* (mime override)", function() {
+      const {dest} = new BaseDownload(
+        Object.assign({}, OPTS, {
+          mask: "*name* *batch*.*ext*",
+          mime: "image/jpeg"
+        }));
+      expect(dest.full).to.equal("filenäme 042.jpg");
+      expect(dest.name).to.equal("filenäme 042.jpg");
+      expect(dest.base).to.equal("filenäme 042");
+      expect(dest.ext).to.equal("jpg");
+      expect(dest.path).to.equal("");
+    });
+
+    it("*name*.*ext* (mime no override)", function() {
+      const {dest} = new BaseDownload(
+        Object.assign({}, OPTS, {
+          mask: "*name* *batch*.*ext*",
+          mime: "image/jpeg",
+          url: "https://www.example.co.uk/filen%C3%A4me.JPe",
+          usable: "https://www.example.co.uk/filenäme.JPe",
+        }));
+      expect(dest.full).to.equal("filenäme 042.JPe");
+      expect(dest.name).to.equal("filenäme 042.JPe");
+      expect(dest.base).to.equal("filenäme 042");
+      expect(dest.ext).to.equal("JPe");
+      expect(dest.path).to.equal("");
+    });
+
+    it("*name*.*ext* (mime override; missing ext)", function() {
+      const {dest} = new BaseDownload(
+        Object.assign({}, OPTS, {
+          mask: "*name* *batch*.*ext*",
+          mime: "application/json",
+          url: "https://www.example.co.uk/filen%C3%A4me",
+          usable: "https://www.example.co.uk/filenäme",
+        }));
+      expect(dest.full).to.equal("filenäme 042.json");
+      expect(dest.name).to.equal("filenäme 042.json");
+      expect(dest.base).to.equal("filenäme 042");
+      expect(dest.ext).to.equal("json");
+      expect(dest.path).to.equal("");
+    });
+
     it("*text*", function() {
       const dest = makeOne("*text*");
       expect(dest.full).to.equal("desc/ript.ion");

tsconfig.json

@@ -12,6 +12,8 @@
     "noImplicitReturns": true,
     "noUnusedLocals": true,
     "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "importHelpers": true,
     "sourceMap": true
   }
 }

uikit/css/modal.css

@@ -33,7 +33,7 @@
 .modal-footer {
   display: flex;
   flex-wrap: nowrap;
-  justify-content: right;
+  justify-content: flex-end;
   background: rgba(30, 30, 30, 0.2);
   margin-top: 2em;
   border-top: 1px solid rgba(30, 30, 30, 0.5);

uikit/lib/basetable.ts

@@ -14,6 +14,8 @@ import {
 } from "./tablesymbols";
 import { InvalidatedSet, UpdateRecord } from "./tableutil";
 import { addClass, clampUInt, IS_MAC } from "./util";
+// eslint-disable-next-line no-unused-vars
+import { TableConfig } from "./config";
 
 const ROWS_SMALL_UPDATE = 5;
 const PIXEL_PREC = 5;
@@ -79,7 +81,7 @@ export class BaseTable extends AbstractTable {
 
   [COLS]: Columns;
 
-  constructor(elem: any, config: any, version?: number) {
+  constructor(elem: any, config: TableConfig | null, version?: number) {
     config = (config && config.version === version && config) || {};
     super();
 
@@ -121,9 +123,9 @@ export class BaseTable extends AbstractTable {
     this.makeDOM(config);
   }
 
-  makeDOM(config: any) {
+  makeDOM(config: TableConfig) {
     const configColumns = "columns" in config ? config.columns : null;
-    const cols = this[COLS] = new Columns(this, configColumns);
+    const cols = this[COLS] = new Columns(this, configColumns || null);
 
     const container = document.createElement("div");
     const thead = document.createElement("div");
@@ -241,7 +243,7 @@ export class BaseTable extends AbstractTable {
     return new SelectionRange(firstIdx, lastIdx);
   }
 
-  get config() {
+  get config(): TableConfig {
     return {
       version: this.version,
       columns: this.columnConfig

uikit/lib/column.ts

@@ -1,14 +1,12 @@
 "use strict";
+// License: MIT
 
 /* eslint-disable no-unused-vars */
 import { TableEvents } from "./tableevents";
 import {addClass, debounce, sum} from "./util";
 import {EventEmitter} from "./events";
 import {APOOL} from "./animationpool";
-
-/* eslint-enable no-unused-vars */
-
-// License: MIT
+import { ColumnConfig, ColumnConfigs } from "./config";
 
 const PIXLIT_WIDTH = 2;
 const MIN_COL_WIDTH = 16;
@@ -55,8 +53,7 @@ export class Column extends EventEmitter {
       columns: Columns,
       col: HTMLTableHeaderCellElement,
       id: number,
-      config: any) {
-    config = config || {};
+      config: ColumnConfig | null) {
     super();
     this.columns = columns;
     this.elem = col;
@@ -89,7 +86,7 @@ export class Column extends EventEmitter {
 
     this.elem.appendChild(containerElem);
 
-    if ("visible" in config) {
+    if (config) {
       this.visible = config.visible;
     }
     this.initWidths(config);
@@ -148,18 +145,18 @@ export class Column extends EventEmitter {
     return Math.max(0, this.currentWidth - this.minWidth);
   }
 
-  get config() {
+  get config(): ColumnConfig {
     return {
       visible: this.visible,
       width: this.currentWidth,
     };
   }
 
-  initWidths(config: any) {
+  initWidths(config: ColumnConfig | null) {
     const style = getComputedStyle(this.elem, null);
     this.minWidth = toPixel(style.getPropertyValue("min-width"), MIN_COL_WIDTH);
     this.maxWidth = toPixel(style.getPropertyValue("max-width"), 0);
-    const width = config.width || this.baseWidth;
+    const width = (config && config.width) || this.baseWidth;
     this.setWidth(width);
   }
 
@@ -236,7 +233,7 @@ export class Columns extends EventEmitter {
 
   public visible: Column[];
 
-  constructor(table: any, config: any) {
+  constructor(table: any, config: ColumnConfigs | null) {
     config = config || {};
     super();
     this.table = table;
@@ -247,7 +244,9 @@ export class Columns extends EventEmitter {
     this.named = new Map<string, Column>();
     this.cols = Array.from(table.elem.querySelectorAll("th")).
       map((colEl: HTMLTableHeaderCellElement, colid: number) => {
-        const columnConfig = colEl.id in config ? config[colEl.id] : null;
+        const columnConfig = config && colEl.id in config ?
+          config[colEl.id] :
+          null;
         const col = new Column(this, colEl, colid, columnConfig);
         col.on("gripmoved", this.gripmoved);
         this.named.set(colEl.id, col);
@@ -261,7 +260,7 @@ export class Columns extends EventEmitter {
     Object.seal(this);
   }
 
-  get config() {
+  get config(): ColumnConfigs {
     const rv: any = {};
     for (const c of this.cols) {
       rv[c.elem.id] = c.config;

uikit/lib/config.ts

@@ -0,0 +1,13 @@
+"use strict";
+// License: MIT
+
+export interface ColumnConfig {
+  visible: boolean;
+  width: number;
+}
+export type ColumnConfigs ={ [name: string]: ColumnConfig };
+
+export interface TableConfig {
+  version?: number;
+  columns?: ColumnConfigs;
+}

uikit/lib/contextmenu.ts

@@ -10,7 +10,7 @@ const MENU_OPEN_BOUNCE = 500;
 
 let ids = 0;
 
-const Keys = new Map([
+export const Keys = new Map([
   ["ACCEL", IS_MAC ? "⌘" : "Ctrl"],
   ["CTRL", "Ctrl"],
   ["ALT", IS_MAC ? "⌥" : "Alt"],
@@ -33,6 +33,14 @@ export interface MenuPosition {
   clientY: number;
 }
 
+interface MenuOptions {
+  disabled?: string;
+  allowClick?: string;
+  icon?: string;
+  key?: string;
+  autoHide?: string;
+}
+
 export class MenuItemBase {
   public readonly owner: ContextMenu;
 
@@ -44,7 +52,7 @@ export class MenuItemBase {
 
   public readonly key: string;
 
-  public readonly autohide: boolean;
+  public readonly autoHide: boolean;
 
   public readonly elem: HTMLLIElement;
 
@@ -54,18 +62,16 @@ export class MenuItemBase {
 
   public readonly keyElem: HTMLSpanElement;
 
-  constructor(owner: ContextMenu, id = "", text = "", {
-    key = "", icon = "", autohide = Object()
-  }) {
+  constructor(owner: ContextMenu, id = "", text = "", options: MenuOptions) {
     this.owner = owner;
     if (!id) {
       id = `contextmenu-${++ids}`;
     }
     this.id = id;
     this.text = text || "";
-    this.icon = icon || "";
-    this.key = key || "";
-    this.autohide = autohide !== "false" && autohide !== false;
+    this.icon = options.icon || "";
+    this.key = options.key || "";
+    this.autoHide = options.autoHide !== "false";
 
     this.elem = document.createElement("li");
     this.elem.id = this.id;
@@ -96,13 +102,14 @@ export class MenuItemBase {
 }
 
 export class MenuItem extends MenuItemBase {
-  constructor(owner: ContextMenu, id = "", text = "", options: any = {}) {
+  constructor(
+      owner: ContextMenu, id = "", text = "", options: MenuOptions = {}) {
     options = options || {};
     super(owner, id, text, options);
-    this.disabled = !!options.disabled;
+    this.disabled = options.disabled === "true";
     this.elem.setAttribute("aria-role", "menuitem");
     this.elem.addEventListener(
-      "click", () => this.owner.emit("clicked", this.id, this.autohide));
+      "click", () => this.owner.emit("clicked", this.id, this.autoHide));
   }
 
   get disabled() {
@@ -132,7 +139,8 @@ export class SubMenuItem extends MenuItemBase {
 
   public readonly expandElem: HTMLSpanElement;
 
-  constructor(owner: ContextMenu, id = "", text = "", options: any = {}) {
+  constructor(
+      owner: ContextMenu, id = "", text = "", options: MenuOptions = {}) {
     super(owner, id, text, options);
     this.elem.setAttribute("aria-role", "menuitem");
     this.elem.setAttribute("aria-haspopup", "true");
@@ -145,8 +153,8 @@ export class SubMenuItem extends MenuItemBase {
     this.expandElem.textContent = "►";
     this.elem.appendChild(this.expandElem);
     this.elem.addEventListener("click", event => {
-      if (options.allowClick) {
-        this.owner.emit("clicked", this.id, this.autohide);
+      if (options.allowClick === "true") {
+        this.owner.emit("clicked", this.id, this.autoHide);
       }
       event.stopPropagation();
       event.preventDefault();
@@ -160,7 +168,7 @@ export class SubMenuItem extends MenuItemBase {
     this.owner.on("showing", () => {
       this.menu.dismiss();
     });
-    this.menu.on("clicked", (...args: any) => {
+    this.menu.on("clicked", (...args: any[]) => {
       this.owner.emit("clicked", ...args);
     });
   }
@@ -215,7 +223,7 @@ export class SubMenuItem extends MenuItemBase {
 export class ContextMenu extends EventEmitter {
   id: string;
 
-  items: any[];
+  items: MenuItemBase[];
 
   itemMap: Map<string, MenuItemBase>;
 
@@ -223,7 +231,7 @@ export class ContextMenu extends EventEmitter {
 
   showing: boolean;
 
-  _maybeDismiss: any;
+  _maybeDismiss: (this: Window, ev: MouseEvent) => any;
 
   constructor(el?: any) {
     super();
@@ -348,10 +356,12 @@ export class ContextMenu extends EventEmitter {
     return this.itemMap.get(id);
   }
 
-  add(item: MenuItemBase, before: any = "") {
+  add(item: MenuItemBase, before: MenuItemBase | string = "") {
     let idx = this.items.length;
     if (before) {
-      before = before.id || before;
+      if (typeof before !== "string") {
+        before = before.id;
+      }
       const ni = this.items.findIndex(i => i.id === before);
       if (ni >= 0) {
         idx = ni;
@@ -366,8 +376,8 @@ export class ContextMenu extends EventEmitter {
     this.itemMap.set(item.id, item);
   }
 
-  remove(item: any) {
-    const id = item.id || item;
+  remove(item: MenuItemBase | string) {
+    const id = typeof item === "string" ? item : item.id;
     const idx = this.items.findIndex(i => i.id === id);
     if (idx >= 0) {
       this.items.splice(idx, 1);

uikit/lib/modal.ts

@@ -1,15 +1,20 @@
 "use strict";
 // License: MIT
 
-interface ModalButton {
+export interface ModalButton {
   title: string;
   value: string;
   default?: boolean;
   dismiss?: boolean;
 }
 
-export default class ModalDialog {
-  private _showing: any;
+interface Promised {
+  resolve: Function;
+  reject: Function;
+}
+
+export default abstract class ModalDialog {
+  private _showing: Promised | null;
 
   private _dismiss: HTMLButtonElement | null;
 
@@ -23,7 +28,7 @@ export default class ModalDialog {
     this._default = null;
   }
 
-  _makeEl() {
+  async _makeEl() {
     this._dismiss = null;
     this._default = null;
 
@@ -35,7 +40,7 @@ export default class ModalDialog {
 
     const body = document.createElement("article");
     body.classList.add("modal-body");
-    body.appendChild(this.content);
+    body.appendChild(await this.getContent());
     cont.appendChild(body);
 
     const footer = document.createElement("footer");
@@ -87,9 +92,8 @@ export default class ModalDialog {
     return el;
   }
 
-  get content(): DocumentFragment | HTMLElement {
-    throw new Error("Not implemented");
-  }
+  abstract getContent():
+    Promise<DocumentFragment | HTMLElement> | HTMLElement | DocumentFragment;
 
   get buttons(): ModalButton[] {
     return [
@@ -108,7 +112,10 @@ export default class ModalDialog {
     ];
   }
 
-  done(button: any) {
+  done(button: ModalButton) {
+    if (!this._showing) {
+      return;
+    }
     const value = this.convertValue(button.value);
     if (button.dismiss) {
       this._showing.reject(new Error(value));
@@ -131,7 +138,7 @@ export default class ModalDialog {
   }
 
 
-  async show() {
+  async show(): Promise<any> {
     if (this._showing) {
       throw new Error("Double show");
     }
@@ -160,7 +167,7 @@ export default class ModalDialog {
       return;
     };
 
-    document.body.appendChild(this.el = this._makeEl());
+    document.body.appendChild(this.el = await this._makeEl());
     this.shown();
     addEventListener("keydown", escapeHandler);
     addEventListener("keydown", enterHandler);
@@ -205,7 +212,7 @@ export default class ModalDialog {
    */
   static async inform(title: string, text: string, oktext: string) {
     const dialog = new class extends ModalDialog {
-      get content() {
+      getContent() {
         const rv = document.createDocumentFragment();
         const h = document.createElement("h1");
         h.textContent = title || "Information";
@@ -241,7 +248,7 @@ export default class ModalDialog {
 
   static async confirm(title: string, text: string) {
     const dialog = new class extends ModalDialog {
-      get content() {
+      getContent() {
         const rv = document.createDocumentFragment();
         const h = document.createElement("h1");
         h.textContent = title || "Confirm";
@@ -280,7 +287,7 @@ export default class ModalDialog {
     const dialog = new class extends ModalDialog {
       _input: HTMLInputElement;
 
-      get content() {
+      getContent() {
         const rv = document.createDocumentFragment();
         const h = document.createElement("h1");
         h.textContent = title || "Confirm";

uikit/lib/row.ts

@@ -38,7 +38,7 @@ class Hover {
 
   private hovering: boolean;
 
-  private timer: any;
+  private timer: number | null;
 
   constructor(row: Row) {
     this.row = row;
@@ -62,7 +62,7 @@ class Hover {
     this.elem.addEventListener("mousemove", this.onmove, {passive: true});
     this.x = evt.clientX;
     this.y = evt.clientY;
-    this.timer = setTimeout(this.onhover, HOVER_TIME);
+    this.timer = window.setTimeout(this.onhover, HOVER_TIME);
   }
 
   onleave() {
@@ -93,7 +93,7 @@ class Hover {
       if (this.timer) {
         clearTimeout(this.timer);
       }
-      this.timer = setTimeout(this.onhover, HOVER_TIME);
+      this.timer = window.setTimeout(this.onhover, HOVER_TIME);
     }
   }
 

uikit/lib/tableevents.ts

@@ -12,6 +12,8 @@ import {Row} from "./row";
 import {APOOL} from "./animationpool";
 import {COLS, ROWCACHE, VISIBLE} from "./tablesymbols";
 import {ContextMenu, MenuItem} from "./contextmenu";
+// eslint-disable-next-line no-unused-vars
+import { TableConfig } from "./config";
 
 const RESIZE_DEBOUNCE = 500;
 const SCROLL_DEBOUNCE = 250;
@@ -19,7 +21,7 @@ const SCROLL_DEBOUNCE = 250;
 export class TableEvents extends BaseTable {
   private oldVisibleTop: number;
 
-  constructor(elem: any, config?: any, version?: number) {
+  constructor(elem: any, config: TableConfig | null, version?: number) {
     super(elem, config, version);
     const {selection} = this;
     selection.on("selection-added", this.selectionAdded.bind(this));
@@ -172,7 +174,7 @@ export class TableEvents extends BaseTable {
         ctx,
         id,
         col.spanElem.textContent || "",
-        {autohide: "false"});
+        {autoHide: "false"});
       ctx.add(item);
       item.iconElem.textContent = col.visible ? "✓" : " ";
       ctx.on(id, async () => {

uikit/lib/tableutil.ts

@@ -8,6 +8,8 @@ import { Row } from "./row";
 import {APOOL} from "./animationpool";
 import {ROW_CACHE_SIZE, ROW_REUSE_SIZE} from "./constants";
 import {clampUInt} from "./util";
+// eslint-disable-next-line no-unused-vars
+import { BaseTable } from "./basetable";
 
 
 export class InvalidatedSet<T> extends Set<T> {
@@ -70,7 +72,7 @@ export class UpdateRecord {
 
   bottom: number;
 
-  constructor(table: any, cols: Column[]) {
+  constructor(table: BaseTable, cols: Column[]) {
     this.rowCount = table.rowCount;
     this.scrollTop = table.visibleTop;
     this.rowHeight = table.rowHeight;

uikit/lib/util.ts

@@ -13,14 +13,25 @@ export function addClass(elem: HTMLElement, ...cls: string[]) {
   }
 }
 
-export function debounce(fn: Function, to: number) {
-  let timer: any;
+interface Timer {
+  args: any[];
+  id: number;
+}
+
+export function debounce(fn: Function, to: number, reset?: boolean) {
+  let timer: Timer | null;
   return function(...args: any[]) {
     if (timer) {
-      timer.args = args;
-      return;
+      if (!reset) {
+        timer.args = args;
+        return;
+      }
+      window.clearTimeout(timer.id);
     }
-    setTimeout(function() {
+    const id = window.setTimeout(function() {
+      if (!timer) {
+        return;
+      }
       const {args} = timer;
       timer = null;
       try {
@@ -30,7 +41,7 @@ export function debounce(fn: Function, to: number) {
         console.error(ex.toString(), ex);
       }
     }, to);
-    timer = {args};
+    timer = {args, id};
   };
 }
 
@@ -38,7 +49,7 @@ function sumreduce(p: number, c: number) {
   return p + c;
 }
 
-export function sum(arr: any[]) {
+export function sum(arr: number[]) {
   return arr.reduce(sumreduce, 0);
 }
 

util/additional.types

@@ -0,0 +1,23 @@
+types {
+  application/x-x509-ca-cert pem crt der;
+  application/javascript js jsx;
+  audio/x-matroska mka;
+  image/bmp bmp;
+  image/heic heic heif;
+  image/heic heic heif;
+  image/heif-sequence heic heif;
+  image/heif-sequence heic heif;
+  image/jpeg jpg jpeg jpe jfif;
+  image/webp webp;
+  text/html html htm shtml php;
+  text/javascript js jsx;
+  video/mpeg mpg mpe mpeg mpg;
+  video/opus opus;
+  video/x-matroska mkv mk3d mks;
+  video/quicktime mov qt moov;
+  application/x-compressed gz;
+  application/x-gzip gz gzip;
+  application/x-bzip2 bz2;
+  application/x-tar tar;
+  application/x-xz xz;
+}