diff --git a/.dockerignore b/.dockerignore index d7e7b41..1b73304 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,13 +1,5 @@ +node_modules .github .git* -.idea -dev -docs -licenses -node_modules -pairdrop-cli -*.md -*.yml -Dockerfile -rtc_config_example.json -turnserver_example.conf \ No newline at end of file + +*.md \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index 5abfbb4..a3be59a 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -36,7 +36,7 @@ If applicable, add screenshots to help explain your problem. **Bug occurs on official PairDrop instance https://pairdrop.net/** No | Yes -Version: v1.11.2 +Version: v1.10.7 **Bug occurs on self-hosted PairDrop instance** No | Yes @@ -44,7 +44,7 @@ No | Yes **Self-Hosted Setup** Proxy: Nginx | Apache2 Deployment: docker run | docker compose | npm run start:prod -Version: v1.11.2 +Version: v1.10.7 **Additional context** Add any other context about the problem here. diff --git a/.gitignore b/.gitignore index d2eca1e..ba0f1e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ node_modules .DS_Store -/dev/certs +fqdn.env +/docker/certs qrcode-svg/ turnserver.conf rtc_config.json diff --git a/Dockerfile b/Dockerfile index 23496e5..43c97ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,11 @@ -FROM alpine:latest +FROM node:lts-alpine WORKDIR /home/node/app COPY package*.json ./ -RUN apk add --no-cache nodejs npm -RUN NODE_ENV="production" npm ci --omit=dev +RUN npm ci -# Directories and files excluded via .dockerignore COPY . . # environment settings diff --git a/README.md b/README.md index 3400704..02621f3 100644 --- a/README.md +++ b/README.md @@ -7,18 +7,13 @@

Local file sharing in your web browser. -
- Inspired by Apple's AirDrop. -
- Fork of Snapdrop. -
-
+
+
Report a bug
Request feature

-
## Features File sharing on your local network that works on all platforms. @@ -37,13 +32,14 @@ Send a file from your phone to your laptop? Screenshot GIF showing PairDrop in use ## Differences to the [Snapdrop](https://github.com/RobinLinus/snapdrop) it is based on -
View all differences +
List view ### Paired Devices and Public Rooms — Internet Transfer * Transfer files over the Internet between paired devices or by entering temporary public rooms. * Connect to devices in complex network environments (public Wi-Fi, company network, iCloud Private Relay, VPN, etc.). * Connect to devices on your mobile hotspot. * Devices outside of your local network that are behind a NAT are auto-connected via the PairDrop TURN server. +* Connect to devices on your mobile hotspot. * Devices from the local network, in the same public room, or previously paired are shown. #### Persistent Device Pairing @@ -110,7 +106,6 @@ Connect to others in complex network situations, or over the Internet. * [NoSleep](https://github.com/richtr/NoSleep.js) display sleep, add wake lock ([MIT](licenses/MIT-NoSleep)) * [heic2any](https://github.com/alexcorvi/heic2any) HEIC/HEIF to PNG/GIF/JPEG ([MIT](licenses/MIT-heic2any)) * [Weblate](https://weblate.org/) web-based localization tool -* [BrowserStack](https://www.browserstack.com/) This project is tested with BrowserStack [FAQ](docs/faq.md) @@ -124,9 +119,9 @@ Connect to others in complex network situations, or over the Internet.
PairDrop is libre, and always will be. \ -If you find it useful and want to support free and open-source software, please consider donating using the button above. \ -I footed the bill for the domain and the server, and you can help create and maintain great software by supporting me. \ -Thank you very much for your contribution! +I footed the bill for the domain and the server, and you can help create great softeare by supporting me. \ +Please use BuyMeACoffee via the button above. \ +Thanks a lot for supporting copylefted libre software! ## Contributing Feel free to [open an issue](https://github.com/schlagmichdoch/pairdrop/issues/new/choose) or a diff --git a/dev/nginx-with-openssl.Dockerfile b/dev/nginx-with-openssl.Dockerfile deleted file mode 100644 index 4752a53..0000000 --- a/dev/nginx-with-openssl.Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM nginx:alpine - -RUN apk add --no-cache openssl \ No newline at end of file diff --git a/dev/nginx/default.conf b/dev/nginx/default.conf deleted file mode 100644 index b67d0b2..0000000 --- a/dev/nginx/default.conf +++ /dev/null @@ -1,42 +0,0 @@ -server { - listen 80; - - expires epoch; - - location / { - proxy_connect_timeout 300; - proxy_pass http://pairdrop:3000; - proxy_set_header Connection "upgrade"; - proxy_set_header Upgrade $http_upgrade; - } - - location /ca.crt { - alias /etc/ssl/certs/pairdropCA.crt; - } - - # To allow POST on static pages - error_page 405 =200 $uri; -} - -server { - listen 443 ssl; - http2 on; - ssl_certificate /etc/ssl/certs/pairdrop-dev.crt; - ssl_certificate_key /etc/ssl/certs/pairdrop-dev.key; - - expires epoch; - - location / { - proxy_connect_timeout 300; - proxy_pass http://pairdrop:3000; - proxy_set_header Connection "upgrade"; - proxy_set_header Upgrade $http_upgrade; - } - - location /ca.crt { - alias /etc/ssl/certs/pairdropCA.crt; - } - # To allow POST on static pages - error_page 405 =200 $uri; -} - diff --git a/dev/openssl/create.sh b/dev/openssl/create.sh deleted file mode 100644 index 4f70697..0000000 --- a/dev/openssl/create.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -cnf_dir='/mnt/openssl/' -certs_dir='/etc/ssl/certs/' -openssl req -config ${cnf_dir}pairdropCA.cnf -new -x509 -days 1 -keyout ${certs_dir}pairdropCA.key -out ${certs_dir}pairdropCA.crt -openssl req -config ${cnf_dir}pairdropCert.cnf -new -out /tmp/pairdrop-dev.csr -keyout ${certs_dir}pairdrop-dev.key -openssl x509 -req -in /tmp/pairdrop-dev.csr -CA ${certs_dir}pairdropCA.crt -CAkey ${certs_dir}pairdropCA.key -CAcreateserial -extensions req_ext -extfile ${cnf_dir}pairdropCert.cnf -sha512 -days 1 -out ${certs_dir}pairdrop-dev.crt - -exec "$@" diff --git a/dev/openssl/pairdropCA.cnf b/dev/openssl/pairdropCA.cnf deleted file mode 100644 index 2ef6185..0000000 --- a/dev/openssl/pairdropCA.cnf +++ /dev/null @@ -1,26 +0,0 @@ -[ req ] -default_bits = 2048 -default_md = sha256 -default_days = 1 -encrypt_key = no -distinguished_name = subject -x509_extensions = x509_ext -string_mask = utf8only -prompt = no - -[ subject ] -organizationName = PairDrop -OU = CA -commonName = pairdrop-CA - -[ x509_ext ] -subjectKeyIdentifier = hash -authorityKeyIdentifier = keyid:always,issuer - -# You only need digitalSignature below. *If* you don't allow -# RSA Key transport (i.e., you use ephemeral cipher suites), then -# omit keyEncipherment because that's key transport. - -basicConstraints = critical, CA:TRUE, pathlen:0 -keyUsage = critical, digitalSignature, keyEncipherment, cRLSign, keyCertSign - diff --git a/dev/openssl/pairdropCert.cnf b/dev/openssl/pairdropCert.cnf deleted file mode 100644 index 87202d8..0000000 --- a/dev/openssl/pairdropCert.cnf +++ /dev/null @@ -1,29 +0,0 @@ -[ req ] -default_bits = 2048 -default_md = sha256 -default_days = 1 -encrypt_key = no -distinguished_name = subject -req_extensions = req_ext -string_mask = utf8only -prompt = no - -[ subject ] -organizationName = PairDrop -OU = Development - -# Use a friendly name here because it's presented to the user. The server's DNS -# names are placed in Subject Alternate Names. Plus, DNS names here is deprecated -# by both IETF and CA/Browser Forums. If you place a DNS name here, then you -# must include the DNS name in the SAN too (otherwise, Chrome and others that -# strictly follow the CA/Browser Baseline Requirements will fail). - -commonName = ${ENV::FQDN} - -[ req_ext ] -subjectKeyIdentifier = hash -basicConstraints = CA:FALSE -keyUsage = digitalSignature, keyEncipherment -subjectAltName = DNS:${ENV::FQDN} -nsComment = "OpenSSL Generated Certificate" -extendedKeyUsage = serverAuth diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml deleted file mode 100644 index 091366d..0000000 --- a/docker-compose-dev.yml +++ /dev/null @@ -1,34 +0,0 @@ -version: "3" -services: - pairdrop: - build: . - container_name: pairdrop - restart: unless-stopped - environment: - - PUID=1000 # UID to run the application as - - PGID=1000 # GID to run the application as - - WS_FALLBACK=false # Set to true to enable websocket fallback if the peer to peer WebRTC connection is not available to the client. - - RATE_LIMIT=false # Set to true to limit clients to 1000 requests per 5 min. - - RTC_CONFIG=false # Set to the path of a file that specifies the STUN/TURN servers. - - DEBUG_MODE=false # Set to true to debug container and peer connections. - - TZ=Etc/UTC # Time Zone - ports: - - "127.0.0.1:3000:3000" # Web UI. Change the port number before the last colon e.g. `127.0.0.1:9000:3000` - nginx: - build: - context: dev/ - dockerfile: nginx-with-openssl.Dockerfile - image: "nginx-with-openssl" - volumes: - - ./public:/usr/share/nginx/html - - ./dev/certs:/etc/ssl/certs - - ./dev/openssl:/mnt/openssl - - ./dev/nginx/default.conf:/etc/nginx/conf.d/default.conf - ports: - - "8080:80" - - "8443:443" - environment: - - FQDN=localhost - entrypoint: /mnt/openssl/create.sh - command: ["nginx", "-g", "daemon off;"] - restart: unless-stopped \ No newline at end of file diff --git a/docs/faq.md b/docs/faq.md index c685658..651a826 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -5,39 +5,18 @@ Help! I can't install the PWA! -
- -Here is a good guide on how to install PWAs on different platforms: \ -https://www.cdc.gov/niosh/mining/content/hearingloss/installPWA.html - - -**Chromium-based browser on Desktop (Chrome, Edge, Vivaldi, Brave, etc.)** \ -Easily install PairDrop PWA on your desktop by clicking the install-button in the top-right corner while on [pairdrop.net](https://pairdrop.net). +if you are using a Chromium-based browser (Chrome, Edge, Vivaldi, Brave, etc.), you can easily install PairDrop PWA on your desktop +by clicking the install-button in the top-right corner while on [pairdrop.net](https://pairdrop.net). Example on how to install a pwa with Edge -**Desktop Firefox** \ On Firefox, PWAs are installable via [this browser extensions](https://addons.mozilla.org/de/firefox/addon/pwas-for-firefox/) - -**Android** \ -PWAs are installable only by using Google Chrome or Samsung Browser: -1. Visit [pairdrop.net](https://pairdrop.net) -2. Click _Install_ on the installation pop-up or use the three-dot-menu and click on _Add to Home screen_ -3. Click _Add_ on the pop-up - -**iOS** \ -PWAs are installable only by using Safari: -1. Visit [pairdrop.net](https://pairdrop.net) -2. Click on the share icon -3. Click _Add to Home Screen_ -4. Click _Add_ in the top right corner -
-**Self-Hosted Instance?** \ +Self-Hosted Instance? + To be able to install the PWA from a self-hosted instance, the connection needs to be [established through HTTPS](https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps/Installable_PWAs). See [this host your own section](https://github.com/schlagmichdoch/PairDrop/blob/master/docs/host-your-own.md#testing-pwa-related-features) for more info. -
@@ -47,9 +26,7 @@ See [this host your own section](https://github.com/schlagmichdoch/PairDrop/blob Shortcuts? -
- -Available shortcuts: +Shortcuts - Send a message with `CTRL + ENTER` - Close all "Send" and "Pair" dialogs by pressing `Esc`. - Copy a received message to the clipboard with `CTRL/⌘ + C`. @@ -63,20 +40,12 @@ Available shortcuts: How to save images directly to the gallery on iOS? -
+Apparently, iOS does not allow images shared from a website to be saved to the gallery directly. +It simply does not offer that option for images shared from a website. -~~Apparently, iOS does not allow images shared from a website to be saved to the gallery directly.~~ -~~It simply does not offer that option for images shared from a website.~~ - -~~iOS Shortcuts saves the day:~~ \ +iOS Shortcuts saves the day: I created a simple iOS shortcut that takes your photos and saves them to your gallery: https://routinehub.co/shortcut/13988/ - -Update: \ -Apparently, this was only a bug that is fixed in recent iOS version (https://github.com/WebKit/WebKit/pull/13111). \ -If you use an older affected iOS version this might still be of use. \ -Luckily, you can now simply use `Save Image`/`Save X Images` 🎉 -
@@ -86,13 +55,10 @@ Luckily, you can now simply use `Save Image`/`Save X Images` 🎉 Is it possible to send files or text directly from the "Context" or "Share" menu? -
- Yes, it finally is. * [Send files directly from the "Context" menu on Windows](/docs/how-to.md#send-files-directly-from-context-menu-on-windows) * [Send directly from the "Share" menu on iOS](/docs/how-to.md#send-directly-from-share-menu-on-ios) * [Send directly from the "Share" menu on Android](/docs/how-to.md#send-directly-from-share-menu-on-android) -
@@ -102,12 +68,9 @@ Yes, it finally is. Is it possible to send files or text directly via CLI? -
- Yes. * [Send directly from a command-line interface](/docs/how-to.md#send-directly-via-command-line-interface) -
@@ -117,14 +80,11 @@ Yes. Are there any third-party Apps? -
- These third-party apps are compatible with PairDrop: 1. [Snapdrop Android App](https://github.com/fm-sys/snapdrop-android) 2. [Snapdrop for Firefox (Addon)](https://github.com/ueen/SnapdropFirefoxAddon) 3. Feel free to make one :) -
@@ -134,8 +94,6 @@ These third-party apps are compatible with PairDrop: What about the connection? Is it a P2P connection directly from device to device or is there any third-party-server? -
- It uses a WebRTC peer-to-peer connection. WebRTC needs a signaling server that is only used to establish a connection. The server is not involved in the file transfer. @@ -151,7 +109,6 @@ to learn more about STUN, TURN and WebRTC. If you host your own instance and want to support devices that do not support WebRTC, you can [start the PairDrop instance with an activated WebSocket fallback](https://github.com/schlagmichdoch/PairDrop/blob/master/docs/host-your-own.md#websocket-fallback-for-vpn). -
@@ -161,11 +118,9 @@ you can [start the PairDrop instance with an activated WebSocket fallback](https What about privacy? Will files be saved on third-party servers? -
- Files are sent directly between peers. PairDrop doesn't even use a database. -If curious, study [the signaling server](https://github.com/schlagmichdoch/PairDrop/blob/master/server/ws-server.js). +If curious, study [the server](https://github.com/schlagmichdoch/pairdrop/blob/master/index.js). WebRTC encrypts the files in transit. If the devices are on the same network, @@ -175,7 +130,6 @@ If your devices are paired and behind a NAT, the PairDrop TURN Server is used to route your files and messages. See the [Technical Documentation](technical-documentation.md#encryption-webrtc-stun-and-turn) to learn more about STUN, TURN and WebRTC. -
@@ -185,12 +139,10 @@ to learn more about STUN, TURN and WebRTC. What about security? Are my files encrypted while sent between the computers? -
- Yes. Your files are sent using WebRTC, encrypting them in transit. -Still you have to trust the PairDrop server. To ensure the connection is secure and there is no [MITM](https://en.m.wikipedia.org/wiki/Man-in-the-middle_attack) there is a plan to make PairDrop -zero trust by encrypting the signaling and implementing a verification process. See [issue #180](https://github.com/schlagmichdoch/PairDrop/issues/180) to keep updated. - +To ensure the connection is secure and there is no [MITM](https://wikiless.org/wiki/Man-in-the-middle_attack), +compare the security number shown under the device name on both devices. +The security number is different for every connection.
@@ -200,8 +152,6 @@ zero trust by encrypting the signaling and implementing a verification process. Transferring many files with paired devices takes too long -
- Naturally, if traffic needs to be routed through the TURN server because your devices are behind different NATs, transfer speed decreases. @@ -214,7 +164,6 @@ which omits the need of the TURN server. You can also use mobile hotspots on phones to do that. Then, all data should be sent directly between devices and not use your data plan. -
@@ -224,8 +173,6 @@ Then, all data should be sent directly between devices and not use your data pla Why don't you implement feature xyz? -
- Snapdrop and PairDrop are a study in radical simplicity. The user interface is insanely simple. Features are chosen very carefully because complexity grows quadratically @@ -237,24 +184,22 @@ Don't be sad. We may decline your feature request for the sake of simplicity. Read *Insanely Simple: The Obsession that Drives Apple's Success*, and/or *Thinking, Fast and Slow* to learn more. +
- PairDrop is awesome. How can I support it? + Snapdrop and PairDrop are awesome. How can I support them? -
- * [Buy me a coffee](https://www.buymeacoffee.com/pairdrop) to pay for the domain and the server, and support libre software. * [File bugs, give feedback, submit suggestions](https://github.com/schlagmichdoch/pairdrop/issues) * Share PairDrop on social media. -* Fix bugs and create a pull request. +* Fix bugs and make a pull request. * Do some security analysis and make suggestions. -* Participate in [active discussions](https://github.com/schlagmichdoch/PairDrop/discussions) - +* To support the original Snapdrop and its creator go to [his GitHub page](https://github.com/RobinLinus/snapdrop)
@@ -264,10 +209,7 @@ and/or *Thinking, Fast and Slow* to learn more. How does it work? -
- [See here for info about the technical implementation](/docs/technical-documentation.md) -
diff --git a/docs/host-your-own.md b/docs/host-your-own.md index f846db7..a64064a 100644 --- a/docs/host-your-own.md +++ b/docs/host-your-own.md @@ -556,6 +556,10 @@ a2enmod proxy a2enmod proxy_http ``` +```bash +a2enmod proxy_wstunnel +``` +
Create a new configuration file under `/etc/apache2/sites-available` (on Debian) @@ -566,10 +570,18 @@ Create a new configuration file under `/etc/apache2/sites-available` (on Debian) ```apacheconf - ProxyPass / http://127.0.0.1:3000/ upgrade=websocket + ProxyPass / http://127.0.0.1:3000/ + RewriteEngine on + RewriteCond %{HTTP:Upgrade} websocket [NC] + RewriteCond %{HTTP:Connection} upgrade [NC] + RewriteRule ^/?(.*) "ws://127.0.0.1:3000/$1" [P,L] - ProxyPass / https://127.0.0.1:3000/ upgrade=websocket + ProxyPass / https://127.0.0.1:3000/ + RewriteEngine on + RewriteCond %{HTTP:Upgrade} websocket [NC] + RewriteCond %{HTTP:Connection} upgrade [NC] + RewriteRule ^/?(.*) "wws://127.0.0.1:3000/$1" [P,L] ``` @@ -577,10 +589,14 @@ Create a new configuration file under `/etc/apache2/sites-available` (on Debian) ```apacheconf - Redirect permanent / https://127.0.0.1:3000/ + Redirect permanent / https://127.0.0.1:3000/ - ProxyPass / http://127.0.0.1:3000/ upgrade=websocket + ProxyPass / https://127.0.0.1:3000/ + RewriteEngine on + RewriteCond %{HTTP:Upgrade} websocket [NC] + RewriteCond %{HTTP:Connection} upgrade [NC] + RewriteRule ^/?(.*) "wws://127.0.0.1:3000/$1" [P,L] ``` @@ -636,74 +652,68 @@ To run PairDrop including its own coturn-server you need to punch holes in the f
+### Firewall +To run PairDrop including its own coturn-server you need to punch holes in the firewall. These ports must be opened additionally: +- 3478 tcp/udp +- 5349 tcp/udp +- 10000:20000 tcp/udp + +
+ ## Local Development ### Install -All files needed for developing are available in the folder `./dev`. +All files needed for developing are available on the branch `dev`. -For convenience, there is also a docker compose file for developing: +First, [Install docker with docker-compose.](https://docs.docker.com/compose/install/) -#### Developing with docker compose -First, [Install docker with docker compose.](https://docs.docker.com/compose/install/) - -Then, clone the repository and run docker compose: +Then, clone the repository and run docker-compose: ```bash git clone https://github.com/schlagmichdoch/PairDrop.git && cd PairDrop ``` ```bash -docker compose -f docker-compose-dev.yml up --no-deps --build +git checkout dev +``` +```bash +docker compose -f docker-compose-dev.yml up -d ``` Now point your web browser to `http://localhost:8080`. +- To restart the containers, run `docker compose restart`. +- To stop the containers, run `docker compose stop`. - To debug the Node.js server, run `docker logs pairdrop`. -- After changes to the code you have to rerun the `docker compose` command +
-#### Testing PWA related features +### Testing PWA related features PWAs requires the app to be served under a correctly set up and trusted TLS endpoint. The NGINX container creates a CA certificate and a website certificate for you. To correctly set the common name of the certificate, -you need to change the FQDN environment variable in `docker-compose-dev.yml` -to the fully qualified domain name of your workstation. (Default: localhost) +you need to change the FQDN environment variable in `docker/fqdn.env` +to the fully qualified domain name of your workstation. If you want to test PWA features, you need to trust the CA of the certificate for your local deployment. \ For your convenience, you can download the crt file from `http://:8080/ca.crt`. \ Install that certificate to the trust store of your operating system. \ -##### Windows -- Make sure to install it to the `Trusted Root Certification Authorities` store. - -##### macOS -- Double-click the installed CA certificate in `Keychain Access`, +- On Windows, make sure to install it to the `Trusted Root Certification Authorities` store. +- On macOS, double-click the installed CA certificate in `Keychain Access`, - expand `Trust`, and select `Always Trust` for SSL. - -##### Firefox -Firefox uses its own trust store. To install the CA: -- point Firefox at `http://:8080/ca.crt` (Default: `http://localhost:8080/ca.crt`) +- Firefox uses its own trust store. To install the CA, +- point Firefox at `http://:8080/ca.crt`. - When prompted, select `Trust this CA to identify websites` and click _OK_. - -Alternatively: -1. Download `ca.crt` from `http://:8080/ca.crt` (Default: `http://localhost:8080/ca.crt`) -2. Go to `about:preferences#privacy` scroll down to `Security` and `Certificates` and click `View Certificates` -3. Import the downloaded certificate file (step 1) - -##### Chrome - When using Chrome, you need to restart Chrome so it reloads the trust store (`chrome://restart`). - Additionally, after installing a new cert, you need to clear the Storage (DevTools → Application → Clear storage → Clear site data). -##### Google Chrome -- To skip the installation of the certificate, you can also open `chrome://flags/#unsafely-treat-insecure-origin-as-secure` -- The feature `Insecure origins treated as secure` must be enabled and the list must include your PairDrop test instance. E.g.: `http://127.0.0.1:3000,https://127.0.0.1:8443` - Please note that the certificates (CA and webserver cert) expire after a day. Also, whenever you restart the NGINX Docker container new certificates are created. -The site is served on `https://:8443` (Default: `https://localhost:8443`). +The site is served on `https://:8443`. [< Back](/README.md) diff --git a/docs/how-to.md b/docs/how-to.md index df6d3a1..52a65b3 100644 --- a/docs/how-to.md +++ b/docs/how-to.md @@ -45,11 +45,11 @@ This pairdrop-cli version was released alongside v1.10.4 #### Linux / Mac 1. Download the latest _pairdrop-cli.zip_ from the [releases page](https://github.com/schlagmichdoch/PairDrop/releases) ```shell - wget "https://github.com/schlagmichdoch/PairDrop/releases/download/v1.11.2/pairdrop-cli.zip" + wget "https://github.com/schlagmichdoch/PairDrop/releases/download/v1.10.7/pairdrop-cli.zip" ``` or ```shell - curl -LO "https://github.com/schlagmichdoch/PairDrop/releases/download/v1.11.2/pairdrop-cli.zip" + curl -LO "https://github.com/schlagmichdoch/PairDrop/releases/download/v1.10.7/pairdrop-cli.zip" ``` 2. Unzip the archive to a folder of your choice e.g. `/usr/share/pairdrop-cli/` ```shell diff --git a/package-lock.json b/package-lock.json index be60a08..30a9cb9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pairdrop", - "version": "1.11.2", - "lockfileVersion": 3, + "version": "1.10.7", + "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "pairdrop", - "version": "1.11.2", + "version": "1.10.7", "license": "ISC", "dependencies": { "express": "^4.18.2", @@ -37,20 +37,20 @@ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, "node_modules/body-parser": { - "version": "1.20.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", - "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", + "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", "dependencies": { "bytes": "3.1.2", - "content-type": "~1.0.5", + "content-type": "~1.0.4", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.13.0", - "raw-body": "2.5.2", + "qs": "6.11.0", + "raw-body": "2.5.1", "type-is": "~1.6.18", "unpipe": "1.0.0" }, @@ -67,28 +67,13 @@ "node": ">= 0.8" } }, - "node_modules/call-bind-apply-helpers": { + "node_modules/call-bind": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", "dependencies": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/call-bound": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", - "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", - "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "get-intrinsic": "^1.2.6" - }, - "engines": { - "node": ">= 0.4" + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -106,17 +91,17 @@ } }, "node_modules/content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", "engines": { "node": ">= 0.6" } }, "node_modules/cookie": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", - "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", "engines": { "node": ">= 0.6" } @@ -151,59 +136,19 @@ "npm": "1.2.8000 || >= 1.4.16" } }, - "node_modules/dunder-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "es-errors": "^1.3.0", - "gopd": "^1.2.0" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/encodeurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", "engines": { "node": ">= 0.8" } }, - "node_modules/es-define-property": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "dependencies": { - "es-errors": "^1.3.0" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -218,36 +163,36 @@ } }, "node_modules/express": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", - "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", + "version": "4.18.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", + "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.3", + "body-parser": "1.20.1", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.7.1", + "cookie": "0.5.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~2.0.0", + "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.3.1", + "finalhandler": "1.2.0", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.3", + "merge-descriptors": "1.0.1", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.12", + "path-to-regexp": "0.1.7", "proxy-addr": "~2.0.7", - "qs": "6.13.0", + "qs": "6.11.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.19.0", - "serve-static": "1.16.2", + "send": "0.18.0", + "serve-static": "1.15.0", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -256,16 +201,12 @@ }, "engines": { "node": ">= 0.10.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" } }, "node_modules/express-rate-limit": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.0.tgz", - "integrity": "sha512-eB5zbQh5h+VenMPM3fh+nw1YExi5nMr6HUCR62ELSP11huvxm/Uir1H1QEyTkk5QX6A58pX6NmaTMceKZ0Eodg==", + "version": "7.1.5", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.1.5.tgz", + "integrity": "sha512-/iVogxu7ueadrepw1bS0X0kaRC/U0afwiYRSLg68Ts+p4Dc85Q5QKsOnPS/QUjPMHvOJQtBDrZgvkOzf8ejUYw==", "engines": { "node": ">= 16" }, @@ -273,16 +214,16 @@ "url": "https://github.com/sponsors/express-rate-limit" }, "peerDependencies": { - "express": "^4.11 || 5 || ^5.0.0-beta.1" + "express": "4 || 5 || ^5.0.0-beta.1" } }, "node_modules/finalhandler": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", - "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", + "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", "dependencies": { "debug": "2.6.9", - "encodeurl": "~2.0.0", + "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -310,63 +251,38 @@ } }, "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "node_modules/get-intrinsic": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", - "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", + "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", "dependencies": { - "call-bind-apply-helpers": "^1.0.2", - "es-define-property": "^1.0.1", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.1.1", - "function-bind": "^1.1.2", - "get-proto": "^1.0.1", - "gopd": "^1.2.0", - "has-symbols": "^1.1.0", - "hasown": "^2.0.2", - "math-intrinsics": "^1.1.0" - }, - "engines": { - "node": ">= 0.4" + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.3" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/get-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "dependencies": { - "dunder-proto": "^1.0.1", - "es-object-atoms": "^1.0.0" + "function-bind": "^1.1.1" }, "engines": { - "node": ">= 0.4" - } - }, - "node_modules/gopd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" + "node": ">= 0.4.0" } }, "node_modules/has-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "engines": { "node": ">= 0.4" }, @@ -374,17 +290,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/http-errors": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", @@ -424,14 +329,6 @@ "node": ">= 0.10" } }, - "node_modules/math-intrinsics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "engines": { - "node": ">= 0.4" - } - }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -441,12 +338,9 @@ } }, "node_modules/merge-descriptors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", - "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" }, "node_modules/methods": { "version": "1.1.2", @@ -500,12 +394,9 @@ } }, "node_modules/object-inspect": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", - "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", - "engines": { - "node": ">= 0.4" - }, + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", + "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -530,9 +421,9 @@ } }, "node_modules/path-to-regexp": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", - "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==" + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" }, "node_modules/proxy-addr": { "version": "2.0.7", @@ -547,11 +438,11 @@ } }, "node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", "dependencies": { - "side-channel": "^1.0.6" + "side-channel": "^1.0.4" }, "engines": { "node": ">=0.6" @@ -569,9 +460,9 @@ } }, "node_modules/raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", + "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -607,9 +498,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/send": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", - "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -629,28 +520,20 @@ "node": ">= 0.8.0" } }, - "node_modules/send/node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "node_modules/serve-static": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", - "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", "dependencies": { - "encodeurl": "~2.0.0", + "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.19.0" + "send": "0.18.0" }, "engines": { "node": ">= 0.8.0" @@ -662,68 +545,13 @@ "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" }, "node_modules/side-channel": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", - "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", "dependencies": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3", - "side-channel-list": "^1.0.0", - "side-channel-map": "^1.0.1", - "side-channel-weakmap": "^1.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-list": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", - "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", - "dependencies": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", - "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", - "dependencies": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/side-channel-weakmap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", - "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "dependencies": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3", - "side-channel-map": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -758,9 +586,9 @@ } }, "node_modules/ua-parser-js": { - "version": "1.0.40", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.40.tgz", - "integrity": "sha512-z6PJ8Lml+v3ichVojCiB8toQJBuwR42ySM4ezjXIqXK3M0HczmKQ3LF4rhU55PfD99KEEXQG6yb7iOMyvYuHew==", + "version": "1.0.37", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.37.tgz", + "integrity": "sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==", "funding": [ { "type": "opencollective", @@ -775,9 +603,6 @@ "url": "https://github.com/sponsors/faisalman" } ], - "bin": { - "ua-parser-js": "script/cli.js" - }, "engines": { "node": "*" } @@ -815,9 +640,9 @@ } }, "node_modules/ws": { - "version": "8.18.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz", - "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", + "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", "engines": { "node": ">=10.0.0" }, @@ -834,5 +659,453 @@ } } } + }, + "dependencies": { + "accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "requires": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + } + }, + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" + }, + "body-parser": { + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", + "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "requires": { + "bytes": "3.1.2", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.11.0", + "raw-body": "2.5.1", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + } + }, + "bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==" + }, + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + }, + "content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "requires": { + "safe-buffer": "5.2.1" + } + }, + "content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" + }, + "cookie": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==" + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + }, + "destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" + }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" + }, + "express": { + "version": "4.18.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", + "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "requires": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.20.1", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.5.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "1.2.0", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.7", + "qs": "6.11.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.18.0", + "serve-static": "1.15.0", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + } + }, + "express-rate-limit": { + "version": "7.1.5", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.1.5.tgz", + "integrity": "sha512-/iVogxu7ueadrepw1bS0X0kaRC/U0afwiYRSLg68Ts+p4Dc85Q5QKsOnPS/QUjPMHvOJQtBDrZgvkOzf8ejUYw==", + "requires": {} + }, + "finalhandler": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", + "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "requires": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" + } + }, + "forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==" + }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "get-intrinsic": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", + "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.3" + } + }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "requires": { + "function-bind": "^1.1.1" + } + }, + "has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + }, + "http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "requires": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + } + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" + }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==" + }, + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==" + }, + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" + }, + "mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" + }, + "mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "requires": { + "mime-db": "1.52.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" + }, + "object-inspect": { + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", + "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==" + }, + "on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "requires": { + "ee-first": "1.1.1" + } + }, + "parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" + }, + "path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + }, + "proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "requires": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + } + }, + "qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "requires": { + "side-channel": "^1.0.4" + } + }, + "range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" + }, + "raw-body": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", + "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "requires": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "send": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "requires": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "dependencies": { + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + } + } + }, + "serve-static": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "requires": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.18.0" + } + }, + "setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + }, + "side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "requires": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + } + }, + "statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" + }, + "toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" + }, + "type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "requires": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + } + }, + "ua-parser-js": { + "version": "1.0.37", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.37.tgz", + "integrity": "sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==" + }, + "unique-names-generator": { + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/unique-names-generator/-/unique-names-generator-4.7.1.tgz", + "integrity": "sha512-lMx9dX+KRmG8sq6gulYYpKWZc9RlGsgBR6aoO8Qsm3qvkSJ+3rAymr+TnV8EDMrIrwuFJ4kruzMWM/OpYzPoow==" + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==" + }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==" + }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==" + }, + "ws": { + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", + "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", + "requires": {} + } } } diff --git a/package.json b/package.json index e4032f6..5a08d4b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pairdrop", - "version": "1.11.2", + "version": "1.10.7", "type": "module", "description": "", "main": "server/index.js", diff --git a/public/index.html b/public/index.html index 70eda5b..15922f3 100644 --- a/public/index.html +++ b/public/index.html @@ -10,7 +10,6 @@ - @@ -160,7 +159,7 @@
-
+
@@ -189,173 +188,88 @@ - - - - - - - - - - - - - - - - - -
@@ -417,12 +331,12 @@

-
-
+
+

-

+

@@ -668,7 +582,7 @@

PairDrop

-
v1.11.2
+
v1.10.7
@@ -682,9 +596,9 @@ - + - + ${url}`; + return `${whitespaceOrSpecial}${linkNodePlaceholder}`; + } // link is not valid -> do not replace return match; - } - - // link is valid -> replace with link node placeholder - // find linkNodePlaceholder that is not yet present in text node - m++; - while (occP.includes(`${p}${m}`)) { - m++; - } - let linkNodePlaceholder = `${p}${m}`; - - // add linkNodePlaceholder to text node and save a reference to linkNodes object - linkNodes[linkNodePlaceholder] = `${url}`; - return `${whitespace}${linkNodePlaceholder}`; - } - - text = text.replace(rgxUrlAll, replaceMatchWithPlaceholder); - $textShadow.innerText = text.replace(rgxMailAll, replaceMatchWithPlaceholder); + }); this.$text.innerHTML = $textShadow.innerHTML.replace(pRgx, @@ -2165,16 +2145,9 @@ class ReceiveTextDialog extends Dialog { hide() { super.hide(); - - // If queue is empty -> clear text field | else -> open next message - this._hideTimeout = setTimeout(() => { - if (!this._receiveTextQueue.length) { - this.$text.innerHTML = ""; - } - else { - this._dequeueRequests(); - } - this._hideTimeout = null; + setTimeout(() => { + this._dequeueRequests(); + this.$text.innerHTML = ""; }, 500); } } @@ -2404,7 +2377,7 @@ class Base64Dialog extends Dialog { class AboutUI { constructor() { this.$donationBtn = $('donation-btn'); - this.$twitterBtn = $('x-twitter-btn'); + this.$twitterBtn = $('twitter-btn'); this.$mastodonBtn = $('mastodon-btn'); this.$blueskyBtn = $('bluesky-btn'); this.$customBtn = $('custom-btn'); diff --git a/public/scripts/util.js b/public/scripts/util.js index 24e2626..fc418ff 100644 --- a/public/scripts/util.js +++ b/public/scripts/util.js @@ -392,25 +392,24 @@ const mime = (() => { "vob": "video/x-ms-vob", "wmv": "video/x-ms-wmv", "avi": "video/x-msvideo", - "*": "video/x-sgi-movie", - "kdbx": "application/x-keepass2" + "*": "video/x-sgi-movie" } return { - guessMimeByFilename(filename) { + async guessMimeByFilename(filename) { const split = filename.split('.'); if (split.length === 1) { // Filename does not include suffix - return false; + return ""; } const suffix = split[split.length - 1].toLowerCase(); - return suffixToMimeMap[suffix]; + return suffixToMimeMap[suffix] || ""; }, - addMissingMimeTypesToFiles(files) { + async addMissingMimeTypesToFiles(files) { // if filetype is empty guess via suffix otherwise leave unchanged for (let i = 0; i < files.length; i++) { if (!files[i].type) { - files[i] = new File([files[i]], files[i].name, {type: mime.guessMimeByFilename(files[i].name) || "application/octet-stream"}); + files[i] = new File([files[i]], files[i].name, {type: await mime.guessMimeByFilename(files[i].name) || ""}); } } return files; @@ -478,16 +477,13 @@ function getThumbnailAsDataUrl(file, width = undefined, height = undefined, qual return new Promise(async (resolve, reject) => { try { if (file.type === "image/heif" || file.type === "image/heic") { - // hotfix: Converting heic images taken on iOS 18 crashes page. Waiting for PR #350 - reject(new Error(`Hotfix: Converting of HEIC/HEIF images currently disabled.`)); - return; - // // browsers can't show heic files --> convert to jpeg before creating thumbnail - // let blob = await fileToBlob(file); - // file = await heic2any({ - // blob, - // toType: "image/jpeg", - // quality: quality - // }); + // browsers can't show heic files --> convert to jpeg before creating thumbnail + let blob = await fileToBlob(file); + file = await heic2any({ + blob, + toType: "image/jpeg", + quality: quality + }); } let imageUrl = URL.createObjectURL(file); @@ -591,7 +587,7 @@ async function decodeBase64Text(base64) { function isUrlValid(url) { try { - new URL(url); + let urlObj = new URL(url); return true; } catch (e) { diff --git a/public/scripts/worker/canvas-worker.js b/public/scripts/worker/canvas-worker.js deleted file mode 100644 index ff2650f..0000000 --- a/public/scripts/worker/canvas-worker.js +++ /dev/null @@ -1,141 +0,0 @@ -self.onmessage = (e) => { - switch (e.data.type) { - case "createCanvas": createCanvas(e.data); - break; - case "initCanvas": initCanvas(e.data.footerOffsetHeight, e.data.clientWidth, e.data.clientHeight); - break; - case "startAnimation": startAnimation(); - break; - case "onShareModeChange": onShareModeChange(e.data.active); - break; - case "switchAnimation": switchAnimation(e.data.animate); - break; - } -}; - -let baseColorNormal; -let baseColorShareMode; -let baseOpacityNormal; -let baseOpacityShareMode; -let speed; -let fps; - -let c; -let cCtx; - -let x0, y0, w, h, dw, offset; - -let startTime; -let animate = true; -let currentFrame = 0; -let lastFrame; -let baseColor; -let baseOpacity; - -function createCanvas(data) { - baseColorNormal = data.baseColorNormal; - baseColorShareMode = data.baseColorShareMode; - baseOpacityNormal = data.baseOpacityNormal; - baseOpacityShareMode = data.baseOpacityShareMode; - speed = data.speed; - fps = data.fps; - - c = data.canvas; - cCtx = c.getContext("2d"); - - lastFrame = fps / speed - 1; - baseColor = baseColorNormal; - baseOpacity = baseOpacityNormal; -} - -function initCanvas(footerOffsetHeight, clientWidth, clientHeight) { - let oldW = w; - let oldH = h; - let oldOffset = offset; - w = clientWidth; - h = clientHeight; - offset = footerOffsetHeight - 28; - - if (oldW === w && oldH === h && oldOffset === offset) return; // nothing has changed - - c.width = w; - c.height = h; - x0 = w / 2; - y0 = h - offset; - dw = Math.round(Math.min(Math.max(0.6 * w, h)) / 10); - - drawFrame(currentFrame); -} - -function startAnimation() { - startTime = Date.now(); - animateBg(); -} - -function switchAnimation(state) { - if (!animate && state) { - // animation starts again. Set startTime to specific value to prevent frame jump - startTime = Date.now() - 1000 * currentFrame / fps; - } - animate = state; - requestAnimationFrame(animateBg); -} - -function onShareModeChange(active) { - baseColor = active ? baseColorShareMode : baseColorNormal; - baseOpacity = active ? baseOpacityShareMode : baseOpacityNormal; - drawFrame(currentFrame); -} - -function drawCircle(ctx, radius) { - ctx.lineWidth = 2; - - let opacity = Math.max(0, baseOpacity * (1 - 1.2 * radius / Math.max(w, h))); - if (radius > dw * 7) { - opacity *= (8 * dw - radius) / dw - } - - if (ctx.setStrokeColor) { - // older blink/webkit based browsers do not understand opacity in strokeStyle. Use deprecated setStrokeColor instead - // https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/strokeStyle#webkitblink-specific_note - ctx.setStrokeColor("grey", opacity); - } - else { - ctx.strokeStyle = `rgb(${baseColor} / ${opacity})`; - } - ctx.beginPath(); - ctx.arc(x0, y0, radius, 0, 2 * Math.PI); - ctx.stroke(); -} - -function drawCircles(ctx, frame) { - ctx.clearRect(0, 0, w, h); - for (let i = 7; i >= 0; i--) { - drawCircle(ctx, dw * i + speed * dw * frame / fps + 33); - } -} - -function drawFrame(frame) { - cCtx.clearRect(0, 0, w, h); - drawCircles(cCtx, frame); -} - -function animateBg() { - let now = Date.now(); - - if (!animate && currentFrame === lastFrame) { - // Animation stopped and cycle finished -> stop drawing frames - return; - } - - let timeSinceLastFullCycle = (now - startTime) % (1000 / speed); - let nextFrame = Math.trunc(fps * timeSinceLastFullCycle / 1000); - - // Only draw frame if it differs from current frame - if (nextFrame !== currentFrame) { - drawFrame(nextFrame); - currentFrame = nextFrame; - } - - requestAnimationFrame(animateBg); -} \ No newline at end of file diff --git a/public/scripts/libs/zip.min.js b/public/scripts/zip.min.js similarity index 100% rename from public/scripts/libs/zip.min.js rename to public/scripts/zip.min.js diff --git a/public/service-worker.js b/public/service-worker.js index e1f4f45..b7d8085 100644 --- a/public/service-worker.js +++ b/public/service-worker.js @@ -1,24 +1,22 @@ -const cacheVersion = 'v1.11.2'; +const cacheVersion = 'v1.10.7'; const cacheTitle = `pairdrop-cache-${cacheVersion}`; +const forceFetch = false; // FOR DEVELOPMENT: Set to true to always update assets instead of using cached versions const relativePathsToCache = [ './', 'index.html', 'manifest.json', 'styles/styles-main.css', 'styles/styles-deferred.css', - 'scripts/browser-tabs-connector.js', 'scripts/localization.js', 'scripts/main.js', 'scripts/network.js', + 'scripts/no-sleep.min.js', 'scripts/persistent-storage.js', + 'scripts/qr-code.min.js', 'scripts/ui.js', 'scripts/ui-main.js', 'scripts/util.js', - 'scripts/worker/canvas-worker.js', - 'scripts/libs/heic2any.min.js', - 'scripts/libs/no-sleep.min.js', - 'scripts/libs/qr-code.min.js', - 'scripts/libs/zip.min.js', + 'scripts/zip.min.js', 'sounds/blop.mp3', 'sounds/blop.ogg', 'images/favicon-96x96.png', @@ -28,57 +26,37 @@ const relativePathsToCache = [ 'images/android-chrome-512x512.png', 'images/android-chrome-512x512-maskable.png', 'images/apple-touch-icon.png', - 'fonts/OpenSans/static/OpenSans-Medium.ttf', 'lang/ar.json', - 'lang/be.json', - 'lang/bg.json', 'lang/ca.json', - 'lang/cs.json', - 'lang/da.json', 'lang/de.json', 'lang/en.json', 'lang/es.json', - 'lang/et.json', - 'lang/eu.json', - 'lang/fa.json', 'lang/fr.json', - 'lang/he.json', - 'lang/hu.json', 'lang/id.json', 'lang/it.json', 'lang/ja.json', 'lang/kn.json', - 'lang/ko.json', 'lang/nb.json', 'lang/nl.json', - 'lang/nn.json', - 'lang/pl.json', 'lang/pt-BR.json', 'lang/ro.json', 'lang/ru.json', - 'lang/sk.json', - 'lang/ta.json', 'lang/tr.json', - 'lang/uk.json', - 'lang/zh-CN.json', - 'lang/zh-HK.json', - 'lang/zh-TW.json' + 'lang/zh-CN.json' ]; const relativePathsNotToCache = [ 'config' ] self.addEventListener('install', function(event) { - // Perform install steps - console.log("Cache files for sw:", cacheVersion); + // Perform install steps event.waitUntil( caches.open(cacheTitle) .then(function(cache) { return cache .addAll(relativePathsToCache) .then(_ => { - console.log('All files cached for sw:', cacheVersion); - self.skipWaiting(); + console.log('All files cached.'); }); }) ); @@ -88,25 +66,20 @@ self.addEventListener('install', function(event) { const fromNetwork = (request, timeout) => new Promise((resolve, reject) => { const timeoutId = setTimeout(reject, timeout); - fetch(request, {cache: "no-store"}) + fetch(request) .then(response => { - if (response.redirected) { - throw new Error("Fetch is redirect. Abort usage and cache!"); - } - clearTimeout(timeoutId); resolve(response); - // Prevent requests that are in relativePathsNotToCache from being cached if (doNotCacheRequest(request)) return; - updateCache(request) + update(request) .then(() => console.log("Cache successfully updated for", request.url)) - .catch(err => console.log("Cache could not be updated for", request.url, err)); + .catch(reason => console.log("Cache could not be updated for", request.url, "Reason:", reason)); }) .catch(error => { // Handle any errors that occurred during the fetch - console.error(`Could not fetch ${request.url}.`); + console.error(`Could not fetch ${request.url}. Are you online?`); reject(error); }); }); @@ -128,16 +101,16 @@ const doNotCacheRequest = request => { }; // cache the current page to make it available for offline -const updateCache = request => new Promise((resolve, reject) => { +const update = request => new Promise((resolve, reject) => { + if (doNotCacheRequest(request)) { + reject("Url is specifically prevented from being cached in the serviceworker."); + return; + } caches .open(cacheTitle) .then(cache => fetch(request, {cache: "no-store"}) .then(response => { - if (response.redirected) { - throw new Error("Fetch is redirect. Abort usage and cache!"); - } - cache .put(request, response) .then(() => resolve()); @@ -146,19 +119,11 @@ const updateCache = request => new Promise((resolve, reject) => { ); }); -// general strategy when making a request: -// 1. Try to retrieve file from cache -// 2. If cache is not available: Fetch from network and update cache. -// This way, cached files are only updated if the cacheVersion is changed +// general strategy when making a request (eg if online try to fetch it +// from cache, if something fails fetch from network. Update cache everytime files are fetched. +// This way files should only be fetched if cacheVersion is changed self.addEventListener('fetch', function(event) { - const swOrigin = new URL(self.location.href).origin; - const requestOrigin = new URL(event.request.url).origin; - - if (swOrigin !== requestOrigin) { - // Do not handle requests from other origin - event.respondWith(fetch(event.request)); - } - else if (event.request.method === "POST") { + if (event.request.method === "POST") { // Requests related to Web Share Target. event.respondWith((async () => { const share_url = await evaluateRequestData(event.request); @@ -166,48 +131,39 @@ self.addEventListener('fetch', function(event) { })()); } else { - // Regular requests not related to Web Share Target: - // If request is excluded from cache -> respondWith fromNetwork - // else -> try fromCache first - event.respondWith( - doNotCacheRequest(event.request) - ? fromNetwork(event.request, 10000) - : fromCache(event.request) + // Regular requests not related to Web Share Target. + if (forceFetch) { + event.respondWith(fromNetwork(event.request, 10000)); + } + else { + event.respondWith( + fromCache(event.request) .then(rsp => { // if fromCache resolves to undefined fetch from network instead - if (!rsp) { - throw new Error("No match found."); - } - return rsp; + return rsp || fromNetwork(event.request, 10000); }) - .catch(error => { - console.error("Could not retrieve request from cache:", event.request.url, error); - return fromNetwork(event.request, 10000); - }) - ); + ); + } } }); // on activation, we clean up the previously registered service workers self.addEventListener('activate', evt => { - console.log("Activate sw:", cacheVersion); - evt.waitUntil(clients.claim()); - return evt.waitUntil( - caches - .keys() - .then(cacheNames => { - return Promise.all( - cacheNames.map(cacheName => { - if (cacheName !== cacheTitle) { - console.log("Delete cache:", cacheName); - return caches.delete(cacheName); - } - }) - ); - }) - ) -}); + return evt.waitUntil( + caches.keys() + .then(cacheNames => { + return Promise.all( + cacheNames.map(cacheName => { + if (cacheName !== cacheTitle) { + return caches.delete(cacheName); + } + }) + ); + }) + ) + } +); const evaluateRequestData = function (request) { return new Promise(async (resolve) => { diff --git a/public/styles/styles-main.css b/public/styles/styles-main.css index 32ffc46..fd5b836 100644 --- a/public/styles/styles-main.css +++ b/public/styles/styles-main.css @@ -11,6 +11,10 @@ body { overflow-x: hidden; overscroll-behavior: none; overflow-y: hidden; + /* Only allow selection on message and pair key */ + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; transition: color 300ms; } @@ -553,10 +557,6 @@ footer .logo { position: relative; } -#display-name:focus::before { - display: none; -} - html:not([dir="rtl"]) #display-name, html:not([dir="rtl"]) .edit-pen { margin-left: -1rem; @@ -587,6 +587,7 @@ x-dialog:not([show]) x-background { font-weight: 700; letter-spacing: 0.12em; text-transform: uppercase; + white-space: nowrap; cursor: pointer; user-select: none; background: inherit; @@ -691,6 +692,7 @@ button::-moz-focus-inner { /* Info Animation */ + #about { color: white; z-index: 32; @@ -746,11 +748,9 @@ button::-moz-focus-inner { height: var(--size); z-index: -1; background: var(--primary-color); - background-image: radial-gradient(circle at calc(50% - 36px), var(--primary-color) 0%, black 80%); + background-image: radial-gradient(circle at calc(50% - 36px), var(--accent-color) 0%, color-mix(in srgb, var(--accent-color) 40%, black) 80%); --crop-size: 0px; clip-path: circle(var(--crop-size)); - /* For clients < iOS 13.1 */ - -webkit-clip-path: circle(var(--crop-size)); } html:not([dir="rtl"]) #about x-background { @@ -898,7 +898,7 @@ x-peers:empty~x-instructions { @media screen and (min-height: 800px) { footer { - padding-bottom: 10px; + margin-bottom: 16px; } } @@ -908,13 +908,6 @@ x-peers:empty~x-instructions { } } -/* PWA Standalone styles */ -@media all and (display-mode: standalone) { - footer { - padding-bottom: 34px; - } -} - /* Constants */ :root { @@ -946,8 +939,8 @@ body { --lt-dialog-bg-color: #fff; --lt-bg-color: 255,255,255; --lt-bg-color-secondary: #f2f2f2; - --lt-border-color: #757575; - --lt-badge-color: #757575; + --lt-border-color: #a9a9a9; + --lt-badge-color: #a5a5a5; --lt-lang-hr-color: #DDD; --lt-shadow-color-secondary-rgb: 0,0,0; @@ -960,8 +953,8 @@ body { --dt-dialog-bg-color: #141414; --dt-bg-color: 0,0,0; --dt-bg-color-secondary: #262628; - --dt-border-color: #757575; - --dt-badge-color: #757575; + --dt-border-color: #919191; + --dt-badge-color: #717171; --dt-lang-hr-color: #404040; --dt-shadow-color-secondary-rgb: 255,255,255; diff --git a/server/peer.js b/server/peer.js index 2db112b..3ff9277 100644 --- a/server/peer.js +++ b/server/peer.js @@ -44,18 +44,15 @@ export default class Peer { _setIP(request) { if (request.headers['cf-connecting-ip']) { this.ip = request.headers['cf-connecting-ip'].split(/\s*,\s*/)[0]; - } - else if (request.headers['x-forwarded-for']) { + } else if (request.headers['x-forwarded-for']) { this.ip = request.headers['x-forwarded-for'].split(/\s*,\s*/)[0]; - } - else { - this.ip = request.socket.remoteAddress ?? ''; + } else { + this.ip = request.connection.remoteAddress; } // remove the prefix used for IPv4-translated addresses - if (this.ip.substring(0,7) === "::ffff:") { + if (this.ip.substring(0,7) === "::ffff:") this.ip = this.ip.substring(7); - } let ipv6_was_localized = false; if (this.conf.ipv6Localize && this.ip.includes(':')) {