Главная Обзор Помощь
Вход
mirrors
/
ntfy
зеркало из https://github.com/binwiederhier/ntfy
1
0
Ответвить 0
Файлы Задачи 0 Вики
Просмотр исходного кода

Comments

Philipp Heckel 3 лет назад
Родитель
c124434429
Сommit
09336fa1e4
9 измененных файлов с 32 добавлено и 33 удалено
Единый вид Показать статистику Diff
  1. 10 0
      docs/releases.md
  2. 1 1
      web/public/index.html
  3. 0 23
      web/public/static/css/home.css
  4. 0 8
      web/public/static/js/home.js
  5. 6 0
      web/src/app/Connection.js
  6. 6 0
      web/src/app/ConnectionManager.js
  7. 4 0
      web/src/app/Notifier.js
  8. 1 1
      web/src/components/SubscribeDialog.js
  9. 4 0
      web/src/components/hooks.js

+ 10 - 0
docs/releases.md
Просмотреть файл 

@@ -2,6 +2,16 @@
 
 Binaries for all releases can be found on the GitHub releases pages for the [ntfy server](https://github.com/binwiederhier/ntfy/releases)
 
 Binaries for all releases can be found on the GitHub releases pages for the [ntfy server](https://github.com/binwiederhier/ntfy/releases)
 
 and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/releases).
 
 and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/releases).
 
 
 
+## ntfy server v1.17.0
 
+Released Mar 11, 2022
 
+
 
+**Features & bug fixes:**
 
+
 
+* Replace [web app](https://ntfy.sh/app) with a React/MUI-based web app from the 21st century (#111)
 
+* Web UI broken with auth (#132, thanks for reporting @arminus)
 
+* Send static web resources as `Content-Encoding: gzip`, i.e. docs and web app (no ticket)
 
+* Add support for auth via `?auth=...` query param, used by WebSocket in web app (no ticket) 
+
 
 ## ntfy server v1.16.0
 
 ## ntfy server v1.16.0
 
 Released Feb 27, 2022
 
 Released Feb 27, 2022

+ 1 - 1
web/public/index.html
Просмотреть файл 

@@ -34,7 +34,7 @@
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
   <noscript>
 
   <noscript>
 
-    ntfy web requires JavaScript, but you can use the <a href="https://ntfy.sh/docs/subscribe/cli/">CLI</a>
 
+    ntfy web requires JavaScript, but you can also use the <a href="https://ntfy.sh/docs/subscribe/cli/">CLI</a>
 
     or <a href="https://ntfy.sh/docs/subscribe/phone/">Android/iOS app</a> to subscribe.
 
     or <a href="https://ntfy.sh/docs/subscribe/phone/">Android/iOS app</a> to subscribe.
 
   </noscript>
 
   </noscript>
 
   <div id="root"></div>
 
   <div id="root"></div>

+ 0 - 23
web/public/static/css/home.css
Просмотреть файл 

@@ -265,29 +265,6 @@ figcaption {
 
     text-decoration: underline;
 
     text-decoration: underline;
 
 }
 
 }
 
 
 
-/* Subscribe box */
 
-
 
-button {
 
-    background: #3a9784;
 
-    border: none;
 
-    border-radius: 3px;
 
-    padding: 3px 5px;
 
-    color: white;
 
-    cursor: pointer;
 
-}
 
-
 
-button:hover {
 
-    background: #317f6f;
 
-    padding: 5px;
 
-}
 
-
 
-ul {
 
-    padding-left: 1em;
 
-    list-style-type: circle;
 
-    padding-bottom: 0;
 
-    margin: 0;
 
-}
 
-
 
 li {
 
 li {
 
     padding: 4px 0;
 
     padding: 4px 0;
 
     margin: 4px 0;
 
     margin: 4px 0;

+ 0 - 8
web/public/static/js/home.js
Просмотреть файл 

@@ -1,12 +1,4 @@
 
 
 
-/**
 
- * Hello, dear curious visitor. I am not a web-guy, so please don't judge my horrible JS code.
 
- * In fact, please do tell me about all the things I did wrong and that I could improve. I've been trying
 
- * to read up on modern JS, but it's just a little much.
 
- *
 
- * Feel free to open tickets at https://github.com/binwiederhier/ntfy/issues. Thank you!
 
- */
 
-
 
 /* All the things */
 
 /* All the things */
 
 
 
 let currentUrl = window.location.hostname;
 
 let currentUrl = window.location.hostname;

+ 6 - 0
web/src/app/Connection.js
Просмотреть файл 

@@ -2,6 +2,12 @@ import {basicAuth, encodeBase64Url, topicShortUrl, topicUrlWs} from "./utils";
 
 
 
 const retryBackoffSeconds = [5, 10, 15, 20, 30];
 
 const retryBackoffSeconds = [5, 10, 15, 20, 30];
 
 
 
+/**
 
+ * A connection contains a single WebSocket connection for one topic. It handles its connection
 
+ * status itself, including reconnect attempts and backoff.
 
+ *
 
+ * Incoming messages and state changes are forwarded via listeners.
 
+ */
 
 class Connection {
 
 class Connection {
 
     constructor(connectionId, subscriptionId, baseUrl, topic, user, since, onNotification, onStateChanged) {
 
     constructor(connectionId, subscriptionId, baseUrl, topic, user, since, onNotification, onStateChanged) {
 
         this.connectionId = connectionId;
 
         this.connectionId = connectionId;

+ 6 - 0
web/src/app/ConnectionManager.js
Просмотреть файл 

@@ -1,6 +1,12 @@
 
 import Connection from "./Connection";
 
 import Connection from "./Connection";
 
 import {sha256} from "./utils";
 
 import {sha256} from "./utils";
 
 
 
+/**
 
+ * The connection manager keeps track of active connections (WebSocket connections, see Connection).
 
+ *
 
+ * Its refresh() method reconciles state changes with the target state by closing/opening connections
 
+ * as required. This is done pretty much exactly the same way as in the Android app.
 
+ */
 
 class ConnectionManager {
 
 class ConnectionManager {
 
     constructor() {
 
     constructor() {
 
         this.connections = new Map(); // ConnectionId -> Connection (hash, see below)
 
         this.connections = new Map(); // ConnectionId -> Connection (hash, see below)

+ 4 - 0
web/src/app/Notifier.js
Просмотреть файл 

@@ -3,6 +3,10 @@ import prefs from "./Prefs";
 
 import subscriptionManager from "./SubscriptionManager";
 
 import subscriptionManager from "./SubscriptionManager";
 
 import logo from "../img/ntfy.png";
 
 import logo from "../img/ntfy.png";
 
 
 
+/**
 
+ * The notifier is responsible for displaying desktop notifications. Note that not all modern browsers
 
+ * support this; most importantly, all iOS browsers do not support window.Notification.
 
+ */
 
 class Notifier {
 
 class Notifier {
 
     async notify(subscriptionId, notification, onClickFallback) {
 
     async notify(subscriptionId, notification, onClickFallback) {
 
         if (!this.supported()) {
 
         if (!this.supported()) {

+ 1 - 1
web/src/components/SubscribeDialog.js
Просмотреть файл 

@@ -85,7 +85,7 @@ const SubscribePage = (props) => {
 
             const isExistingTopicUrl = existingTopicUrls.includes(topicUrl(baseUrl, topic));
 
             const isExistingTopicUrl = existingTopicUrls.includes(topicUrl(baseUrl, topic));
 
             return validTopic(topic) && validUrl(baseUrl) && !isExistingTopicUrl;
 
             return validTopic(topic) && validUrl(baseUrl) && !isExistingTopicUrl;
 
         } else {
 
         } else {
 
-            const isExistingTopicUrl = existingTopicUrls.includes(topicUrl(window.location.origin, topic)); // FIXME
 
+            const isExistingTopicUrl = existingTopicUrls.includes(topicUrl(window.location.origin, topic));
 
             return validTopic(topic) && !isExistingTopicUrl;
 
             return validTopic(topic) && !isExistingTopicUrl;
 
         }
 
         }
 
     })();
 
     })();

+ 4 - 0
web/src/components/hooks.js
Просмотреть файл 

@@ -66,6 +66,10 @@ export const useAutoSubscribe = (subscriptions, selected) => {
 
     }, [params, subscriptions, selected, hasRun]);
 
     }, [params, subscriptions, selected, hasRun]);
 
 };
 
 };
 
 
 
+/**
 
+ * Migrate the 'topics' item in localStorage to the subscriptionManager. This is only done once to migrate away
 
+ * from the old web UI.
 
+ */
 
 export const useLocalStorageMigration = () => {
 
 export const useLocalStorageMigration = () => {
 
     const [hasRun, setHasRun] = useState(false);
 
     const [hasRun, setHasRun] = useState(false);
 
     useEffect(() => {
 
     useEffect(() => {