plexsonic 0.1.0 → 0.1.2

package/README.md

@@ -33,7 +33,9 @@ cp .env.example .env
 Install globally from this repo:
 
 ```bash
-pnpm add -g .
+pnpm add -g plexsonic
+# or
+npm install -g plexsonic
 ```
 
 Then run:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plexsonic",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "PlexMusic to OpenSubsonic bridge",
   "main": "./src/index.js",
   "bin": {

package/src/plex.js

@@ -18,6 +18,8 @@
  * under the License.
  */
 
+import { APP_VERSION } from './version.js';
+
 const PLEX_TV_BASE = 'https://plex.tv';
 const PLEX_CLIENTS_BASE = 'https://clients.plex.tv';
 
@@ -25,7 +27,7 @@ function makePlexHeaders(config, token = null) {
   const headers = {
     Accept: 'application/json',
     'X-Plex-Product': config.plexProduct,
-    'X-Plex-Version': '0.1.0',
+    'X-Plex-Version': APP_VERSION,
     'X-Plex-Client-Identifier': config.plexClientIdentifier,
     'X-Plex-Platform': process.platform,
     'X-Plex-Device': 'Plexsonic Bridge',

package/src/server.js

@@ -73,6 +73,39 @@ import { createTokenCipher } from './token-crypto.js';
 import { emptyNode, failedResponse, failedResponseJson, node, okResponse, okResponseJson } from './subsonic-xml.js';
 
 const USERNAME_PATTERN = /^[A-Za-z0-9_.-]{3,32}$/;
+const DEFAULT_CORS_ALLOW_HEADERS = [
+  'Accept',
+  'Authorization',
+  'Content-Type',
+  'X-Requested-With',
+  'X-Plex-Token',
+  'X-Plex-Client-Identifier',
+  'X-Plex-Product',
+  'X-Plex-Version',
+  'X-Plex-Platform',
+  'X-Plex-Device',
+  'X-Plex-Device-Name',
+  'X-Plex-Model',
+].join(', ');
+const DEFAULT_CORS_ALLOW_METHODS = 'GET, POST, PUT, PATCH, DELETE, OPTIONS';
+const DEFAULT_CORS_EXPOSE_HEADERS = 'content-type, content-length, content-range, accept-ranges, etag, last-modified';
+
+function applyCorsHeaders(request, reply) {
+  const origin = firstForwardedValue(request.headers?.origin);
+  if (origin) {
+    reply.header('access-control-allow-origin', origin);
+    reply.header('vary', 'Origin');
+  } else {
+    reply.header('access-control-allow-origin', '*');
+  }
+
+  reply.header('access-control-allow-methods', DEFAULT_CORS_ALLOW_METHODS);
+
+  const requestedHeaders = firstForwardedValue(request.headers?.['access-control-request-headers']);
+  reply.header('access-control-allow-headers', requestedHeaders || DEFAULT_CORS_ALLOW_HEADERS);
+  reply.header('access-control-expose-headers', DEFAULT_CORS_EXPOSE_HEADERS);
+  reply.header('access-control-max-age', '86400');
+}
 
 function normalizeUsername(value) {
   return String(value || '').trim();
@@ -351,6 +384,31 @@ function decodePasswordParam(rawPassword) {
   }
 }
 
+function syncStoredSubsonicPassword(repo, tokenCipher, account, clearPassword) {
+  const normalizedPassword = String(clearPassword || '');
+  if (!account || !account.id || !normalizedPassword) {
+    return;
+  }
+
+  let shouldUpdate = false;
+  if (!account.subsonic_password_enc) {
+    shouldUpdate = true;
+  } else {
+    try {
+      const decrypted = tokenCipher.decrypt(account.subsonic_password_enc);
+      if (decrypted !== normalizedPassword) {
+        shouldUpdate = true;
+      }
+    } catch {
+      shouldUpdate = true;
+    }
+  }
+
+  if (shouldUpdate) {
+    repo.updateSubsonicPasswordEnc(account.id, tokenCipher.encrypt(normalizedPassword));
+  }
+}
+
 async function authenticateSubsonicRequest(request, reply, repo, tokenCipher) {
   const username = normalizeUsername(getRequestParam(request, 'u'));
   const passwordRaw = normalizePassword(getRequestParam(request, 'p'));
@@ -424,9 +482,7 @@ async function authenticateSubsonicRequest(request, reply, repo, tokenCipher) {
       return null;
     }
 
-    if (!account.subsonic_password_enc) {
-      repo.updateSubsonicPasswordEnc(account.id, tokenCipher.encrypt(decodedPassword));
-    }
+    syncStoredSubsonicPassword(repo, tokenCipher, account, decodedPassword);
 
     return account;
   }
@@ -1981,6 +2037,13 @@ export async function buildServer(config = loadConfig()) {
     },
   });
 
+  app.addHook('onRequest', async (request, reply) => {
+    applyCorsHeaders(request, reply);
+    if (request.method === 'OPTIONS') {
+      return reply.code(204).send();
+    }
+  });
+
   app.addHook('onClose', async () => {
     db.close();
   });
@@ -2357,9 +2420,7 @@ export async function buildServer(config = loadConfig()) {
       return reply.code(401).type('text/html; charset=utf-8').send(loginPage('Invalid username or password.'));
     }
 
-    if (!account.subsonic_password_enc) {
-      repo.updateSubsonicPasswordEnc(account.id, tokenCipher.encrypt(password));
-    }
+    syncStoredSubsonicPassword(repo, tokenCipher, account, password);
 
     request.session.accountId = account.id;
     request.session.username = account.username;
@@ -2417,9 +2478,7 @@ export async function buildServer(config = loadConfig()) {
       });
     }
 
-    if (!account.subsonic_password_enc) {
-      repo.updateSubsonicPasswordEnc(account.id, tokenCipher.encrypt(password));
-    }
+    syncStoredSubsonicPassword(repo, tokenCipher, account, password);
 
     request.session.accountId = account.id;
     request.session.username = account.username;

package/src/subsonic-xml.js

@@ -18,11 +18,13 @@
  * under the License.
  */
 
+import { APP_VERSION } from './version.js';
+
 const XML_HEADER = '<?xml version="1.0" encoding="UTF-8"?>';
 const XMLNS = 'http://subsonic.org/restapi';
 const API_VERSION = '1.16.1';
 const SERVER_TYPE = 'Plexsonic';
-const SERVER_VERSION = '0.1.0';
+const SERVER_VERSION = APP_VERSION;
 const OPEN_SUBSONIC = true;
 
 const TOKEN_START = '\u0001';

package/src/version.js

@@ -0,0 +1,37 @@
+/* Copyright Yukino Song, SudoMaker Ltd.
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * 	http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { createRequire } from 'node:module';
+
+const require = createRequire(import.meta.url);
+
+function loadPackageVersion() {
+  try {
+    const packageJson = require('../package.json');
+    const rawVersion = String(packageJson?.version || '').trim();
+    if (rawVersion) {
+      return rawVersion;
+    }
+  } catch {}
+
+  return '0.0.0';
+}
+
+export const APP_VERSION = loadPackageVersion();