Merge branch 'refs/heads/develop'

Author: FoxxMD

README.md

@@ -28,7 +28,7 @@ A javascript app to scrobble music you listened to, to [Maloja](https://github.c
   * [Maloja](/docsite/docs/configuration/configuration.md#maloja)
   * [Last.fm](/docsite/docs/configuration/configuration.md#lastfm)
   * [ListenBrainz](/docsite/docs/configuration/configuration.md#listenbrainz)
-* Monitor status of Sources and Clients using [webhooks (Gotify or Ntfy)](/docsite/docs/configuration/configuration.md#webhook-configurations) or [healthcheck endpoint](/docsite/docs/configuration/configuration.md#health-endpoint)
+* Monitor status of Sources and Clients using [webhooks (Gotify, Ntfy, Apprise)](/docsite/docs/configuration/configuration.md#webhook-configurations) or [healthcheck endpoint](/docsite/docs/configuration/configuration.md#health-endpoint)
 * Supports configuring for single or multiple users (scrobbling for your friends and family!)
 * Web server interface for stats, basic control, and detailed logs
 * Graceful network and client failure handling (queued scrobbles that auto-retry)

config/config.json.example

@@ -1,5 +1,6 @@
 {
   "debugMode": false,
+  "disableWeb": false,
   "sourceDefaults": {
     "maxPollRetries": 1,
     "maxRequestRetries": 1,

docsite/docs/configuration/configuration.md

@@ -195,6 +195,15 @@ EX: Lastfm Redirect Url is `BASE_URL:PORT/lastfm/callback` -- Set `BASE_URL=http
 
 Useful when running with [docker](../installation/installation.md#docker) so that you do not need to specify redirect URLs for each configuration.
 
+#### Disable Web
+
+If you do not need the dashboard and/or ingress sources, or have security concerns about ingress and cannot control their hosting environment, the web server and API can be disabled. Note that any **ingress-based sources will be unusable** (Plex, Jellyfin, Tautulli, etc...) if this is disabled.
+
+Disable using either:
+
+* ENV `DISABLE_WEB=true`
+* In [All-in-One File](#all-in-one-file-configuration) use the top-level property `"disableWeb": true`
+
 # Source Configurations
 
 ## [Spotify](https://www.spotify.com)
@@ -974,6 +983,25 @@ EX
 }
 ```
 
+### [Apprise](https://github.com/caronc/apprise-api)
+
+Refer to the [config schema for AppriseConfig](https://json-schema.app/view/%23/%23%2Fdefinitions%2FAppriseConfig?url=https%3A%2F%2Fraw.githubusercontent.com%2FFoxxMD%2Fmulti-scrobbler%2Fmaster%2Fsrc%2Fbackend%2Fcommon%2Fschema%2Faio.json)
+
+multi-scrobbler supports [stateless](https://github.com/caronc/apprise-api?tab=readme-ov-file#stateless-solution) and [persistent storage](https://github.com/caronc/apprise-api?tab=readme-ov-file#persistent-storage-solution) endpoints as well as [tags](https://github.com/caronc/apprise-api?tab=readme-ov-file#tagging)/
+
+EX
+
+```json5
+{
+  "type": "apprise",
+  "name": "MyAppriseFriendlyNameForLogs",
+  "host": "http://192.168.0.100:8080",
+  "urls": ["gotify://192.168.0.101:8070/MyToken"], // stateless endpoints
+  "keys": ["e90b20526808373353afad7fb98a201198c0c3e0555bea19f182df3388af7b17"], //persistent storage endpoints
+  "tags": ["my","optional","tags"]
+}
+```
+
 ## Health Endpoint
 
 An endpoint for monitoring the health of sources/clients is available at GET `http://YourMultiScrobblerDomain/health`

docsite/src/pages/index.mdx

@@ -31,7 +31,7 @@ A javascript app to scrobble music you listened to, to [Maloja](https://github.c
     * [Maloja](docs/configuration#maloja)
     * [Last.fm](docs/configuration#lastfm)
     * [ListenBrainz](docs/configuration#listenbrainz)
-* Monitor status of Sources and Clients using [webhooks (Gotify or Ntfy)](docs/configuration#webhook-configurations) or [healthcheck endpoint](docs/configuration#health-endpoint)
+* Monitor status of Sources and Clients using [webhooks (Gotify, Ntfy, Apprise)](docs/configuration#webhook-configurations) or [healthcheck endpoint](docs/configuration#health-endpoint)
 * Supports configuring for single or multiple users (scrobbling for your friends and family!)
 * Web server interface for stats, basic control, and detailed logs
 * Graceful network and client failure handling (queued scrobbles that auto-retry)

flatpak/io.github.foxxmd.multiscrobbler.metainfo.xml

@@ -49,6 +49,7 @@
         </screenshot>
     </screenshots>
     <releases>
+        <release version="0.7.1" date="2024-04-11"/>
         <release version="0.7.0" date="2024-03-26"/>
         <release version="0.6.5" date="2024-02-05"/>
         <release version="0.6.4" date="2024-01-29"/>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "multi-scrobbler",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "type": "module",
   "description": "scrobble plays from multiple sources to multiple clients",
   "scripts": {
@@ -51,7 +51,7 @@
     "@fortawesome/free-solid-svg-icons": "^6.4.2",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@foxxmd/chromecast-client": "^1.0.4",
-    "@foxxmd/logging": "^0.1.13",
+    "@foxxmd/logging": "^0.1.14",
     "@foxxmd/string-sameness": "^0.4.0",
     "@kenyip/backoff-strategies": "^1.0.4",
     "@react-nano/use-event-source": "^0.13.0",
@@ -89,13 +89,11 @@
     "passport": "^0.6.0",
     "passport-deezer": "^0.2.0",
     "patch-package": "^8.0.0",
-    "pony-cause": "^1.1.1",
     "postcss": "^8.4.33",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-redux": "^8.1.2",
     "react-router-dom": "^6.15.0",
-    "safe-stable-stringify": "^1.1.1",
     "sass": "^1.70.0",
     "spotify-web-api-node": "^5.0.2",
     "superagent": "^8.0.9",
@@ -107,7 +105,6 @@
     "youtube-music-ts-api": "^1.7.0"
   },
   "devDependencies": {
-    "@dbus-types/dbus": "^0.0.4",
     "@dbus-types/notifications": "^0.0.5",
     "@eslint/js": "^8.56.0",
     "@faker-js/faker": "^8.1.0",

package.json

@@ -1,4 +1,4 @@
-import {ResponseError} from "superagent";
+import { ResponseError } from "superagent";
 
 export const isSuperAgentResponseError = (e: any): e is ResponseError => {
     return typeof e === 'object'

src/backend/common/errors/ErrorUtils.ts

@@ -1,6 +1,6 @@
+import { findCauseByFunc } from "../../utils/ErrorUtils.js";
 import { isArbitraryObject } from "../infrastructure/Atomic.js";
 import ErrnoException = NodeJS.ErrnoException;
-import { findCauseByFunc } from "../../utils.js";
 
 export type NodeNetworkErrorCode = 'ENOTFOUND' | 'ETIMEDOUT' | 'EAI_AGAIN' | 'ECONNRESET' | 'ECONNREFUSED' | 'ERRADDRINUSE' | 'EADDRNOTAVAIL' | 'ECONNABORTED' | 'EHOSTUNREACH';
 export const NETWORK_ERROR_CODES: NodeNetworkErrorCode[] = ['ENOTFOUND', 'ETIMEDOUT',  'EAI_AGAIN', 'ECONNRESET', 'ECONNREFUSED', 'ERRADDRINUSE', 'EADDRNOTAVAIL', 'ECONNABORTED', 'EHOSTUNREACH'];

src/backend/common/errors/NodeErrors.ts

@@ -1,8 +1,8 @@
-import {ErrorWithCause} from "pony-cause";
-import { findCauseByFunc } from "../../utils.js";
-import {Response} from 'superagent';
+import { Response } from 'superagent';
 
-export class UpstreamError<T = undefined> extends ErrorWithCause<T> {
+import { findCauseByFunc } from "../../utils/ErrorUtils.js";
+
+export class UpstreamError<T = undefined> extends Error {
 
     showStopper: boolean = false;
     response?: Response