Merge branch 'develop'

.dockerignore

@@ -15,3 +15,8 @@ config/*.bak
 .flatpak-builder
 flatpak/generated-sources.json
 flatpak/.flatpak-builder
+docsite/build
+docsite/node_modules
+docsite/.docusaurus
+docsite/.cache-loader
+build

.gitignore

@@ -1,7 +1,7 @@
 # Created by .ignore support plugin (hsz.mobi)
 ### Node template
 # Logs
-logs
+/logs
 *.log
 npm-debug.log*
 yarn-debug.log*
@@ -127,3 +127,6 @@ src/**/**.js.map
 *.bak
 .flatpak-builder
 flatpak/generated-sources.json
+
+build
+!setupProxy.js

.mocharc.json

@@ -0,0 +1,4 @@
+{
+  "require": ["./register.js", "source-map-support/register"],
+  "reporter": "dot"
+}

.nvmrc

@@ -1 +1 @@
-lts/hydrogen
+v18.16.0

.nycrc.json

@@ -0,0 +1,24 @@
+{
+  "extends": "@istanbuljs/nyc-config-typescript",
+  "exclude": [
+    "node_modules/",
+    "**/src/backend/common/schema/**",
+    "**/src/backend/tests/**",
+    "register.js",
+    "**/src/server/**/*.d.ts",
+    "**/src/client/**"
+  ],
+  "include": [
+    "**/src/backend/**/*.ts",
+    "**/src/**/backend/*.js",
+    "**/src/**/backend/*.js.map"
+  ],
+  "extension": [
+    ".ts"
+  ],
+  "reporter": [
+    "text-summary",
+    "html"
+  ],
+  "report-dir": "./coverage"
+}

Dockerfile

@@ -9,6 +9,7 @@ RUN \
     git \
     nodejs \
     npm \
+    #yarn \
     openssh && \
   echo "**** cleanup ****" && \
   rm -rf \
@@ -23,31 +24,58 @@ ENV CONFIG_DIR=$data_dir
 
 COPY docker/root/ /
 
+RUN npm install -g patch-package
+
 WORKDIR /app
 
 FROM base as build
 
-# copy NPM dependencies and install
-COPY --chown=abc:abc package*.json ./
-COPY --chown=abc:abc tsconfig.json .
+# would very much like to use YARN for dependency management but its got show-stopping bad design for prod dependencies
+# https://github.com/yarnpkg/yarn/issues/6323 -- always downloads devDependencies -- and im not about to migrate to v2 since alpine doesn't support it yet
+
+# copy dep/TS config and install dev dependencies
+#COPY --chown=abc:abc package.json tsconfig.json yarn.lock ./
+COPY --chown=abc:abc package*.json tsconfig.json ./
+COPY --chown=abc:abc patches ./patches
+
 
 RUN npm install
+#RUN yarn install
 
 COPY --chown=abc:abc . /app
 
+# need to set before build so server/client build is optimized and has constants (if needed)
+ENV NODE_ENV=production
+
 RUN npm run build && rm -rf node_modules
+#RUN yarn run build && rm -rf node_modules
 
 FROM base as app
 
-COPY --from=build --chown=abc:abc /app /app
-
-ENV NODE_ENV="production"
+#COPY --chown=abc:abc package.json yarn.lock ./
+COPY --chown=abc:abc package*.json ./
+COPY --chown=abc:abc patches ./patches
+COPY --from=build --chown=abc:abc /app/build /app/build
+COPY --from=base /usr/local/bin /usr/local/bin
+COPY --from=base /usr/local/lib /usr/local/lib
+
+ENV NODE_ENV=production
+ENV IS_DOCKER=true
+#
+#RUN yarn global add patch-package \
+#    && yarn install --production=true \
+#    && yarn global remove patch-package \
+#    && yarn cache clean --mirror \
+#    && chown abc:abc node_modules \
+#    && rm -rf node_modules/ts-node \
+#    && rm -rf node_modules/typescript
 
 RUN npm install --omit=dev \
     && npm cache clean --force \
     && chown abc:abc node_modules \
     && rm -rf node_modules/ts-node \
-    && rm -rf node_modules/typescript
+    && rm -rf node_modules/typescript \
+    && rm -rf node_modules/@types
 
 ARG webPort=9078
 ENV PORT=$webPort

codeshift/transform.ts

@@ -0,0 +1,217 @@
+import {API, Collection, FileInfo, Options} from 'jscodeshift';
+import path from 'path';
+import fs from 'fs';
+
+export type TransformFrom = 'none' | 'any' | string;
+export type TransformTo = 'none' | 'any' | string;
+export type ImportTypes = 'any' | 'relative' | 'alias';
+
+const base = process.cwd();
+export default function transformer(
+  file: FileInfo,
+  { jscodeshift: j }: API,
+  options: Options,
+) {
+
+  const tf = options.transformFrom as string | undefined;
+  if(tf === undefined) {
+    throw new Error(`arg '--transformFrom' must be defined.`);
+  }
+  const transformFrom = tf.split(',').map(x => x.toLocaleLowerCase()) as TransformFrom[];
+  const tfIsAny = transformFrom.includes('any');
+
+  const tt = options.transformTo as string | undefined;
+  if(tt === undefined) {
+    throw new Error(`arg '--transformTo' must be defined.`);
+  }
+  const transformTo = tt.split(',').map(x => x.toLocaleLowerCase()) as TransformTo[];
+
+  if(transformTo.length > 1 && transformFrom.length !== transformTo.length) {
+    throw new Error('When more than one Transform To is specified then number of Transform From arguments must match');
+  }
+
+  const itypes = options.importTypes as string | undefined;
+  if(itypes === undefined) {
+    throw new Error(`arg '--importTypes' must be defined.`);
+  }
+  const importTypes = itypes.split(',').map(x => x.toLocaleLowerCase()) as ImportTypes[];
+  const importsIsAny = importTypes.includes('any');
+
+  const fileDir = path.dirname(path.join(base, file.path));
+  const processingFilePath = file.path;
+  console.log(`Processing => ${processingFilePath}`);
+  let source: Collection<any>;
+  try {
+    source = j(file.source);
+  } catch (e) {
+    console.error(`Failed to parse ${processingFilePath}, will skip`);
+    console.error(e);
+  }
+
+  const imports = source.find(j.ImportDeclaration)
+  imports.forEach((x) => {
+    const importPath = x.value.source.value as string;
+    const importPathPrefix = `${importPath.padEnd(60, ' ')} =>`;
+
+    const pathInfo = path.parse(importPath);
+    const hasNoExt = pathInfo.ext === '';
+    let filenameFromDir: string;
+    if(tfIsAny || (hasNoExt && transformFrom.includes('none')) || (transformFrom.includes(pathInfo.ext.replace('.', '').toLocaleLowerCase()))) {
+      const pathFull = path.join(fileDir, importPath);
+      const dir = path.dirname(pathFull);
+      const normalExt = pathInfo.ext.replace('.', '');
+      let isRelative: boolean | undefined;
+      let dirExists: boolean | undefined;
+      let fileExists: boolean | undefined;
+      try {
+        // is dir path real?
+        fs.realpathSync(dir);
+        dirExists = true;
+      } catch (e) {
+        isRelative = false;
+        dirExists = false;
+      }
+
+      if(isRelative === undefined) {
+          // if extension is none we need to check for any file in dir with this name
+          if(hasNoExt) {
+            const dirFiles = fs.readdirSync(dir)
+            filenameFromDir = dirFiles.find(x => path.parse(x).name === pathInfo.name);
+            if(filenameFromDir !== undefined) {
+              fileExists = false;
+              isRelative = false;
+            } else {
+              fileExists = true;
+              isRelative = true;
+            }
+          } else {
+            try {
+              // does a file exist?
+              fs.realpathSync(pathFull);
+              isRelative = true;
+            } catch (e) {
+              isRelative = false;
+              fileExists = false;
+            }
+          }
+      }
+
+      if(!importsIsAny) {
+        if(!isRelative && !importTypes.includes('alias')) {
+          console.log(`${importPathPrefix} Import looks like an alias ${dirExists ? '(dir exists, file does not)' : '(dir does not exist)'} but import types does specify alias`);
+          return;
+        } else if(isRelative && !importTypes.includes('relative')) {
+          console.log(`${pathFull} => Import is relative but import types does not specify relative`);
+          return;
+        }
+      }
+
+      // determine transformTo
+
+      // if there is only one TO then use it
+      let derivedTT: undefined | string = transformTo.length === 1 ? transformTo[0] : undefined;
+      if(derivedTT === undefined) {
+        // otherwise we find the TO by using the same index as the matching FROM extension type
+        const tfIndex = transformFrom.findIndex((x) => {
+          if(x === 'any') {
+            return true;
+          }
+          if(x === 'none' && hasNoExt) {
+            return true;
+          }
+          if(x === normalExt) {
+            return true;
+          }
+        });
+        if(tfIndex === -1) {
+          console.warn(`${importPathPrefix} did not match a Transform From type. Will not transform`);
+          return;
+        }
+        derivedTT = transformTo[tfIndex];
+      }
+
+      let transformPrefix = ` --> ${hasNoExt ? '(None)' : normalExt} TO ${derivedTT} <--`;
+
+      let transformedImport: string;
+
+      switch(derivedTT) {
+        case 'none':
+          if(hasNoExt) {
+            console.log(`${importPathPrefix} ${transformPrefix} => Import already has no extension, nothing to do`);
+            return;
+          }
+          transformedImport = combineDirFile(pathInfo.dir, pathInfo.name); // path.join(pathInfo.root, pathInfo.dir, pathInfo.name);
+          break;
+        case 'any':
+          if(hasNoExt && filenameFromDir) {
+            transformedImport = filenameFromDir;
+          } else {
+            const otherFilename = fs.readdirSync(dir).find(x => {
+              const pinfo = path.parse(x);
+              return pinfo.name === pathInfo.name && pinfo.ext !== pathInfo.ext;
+            });
+            if(otherFilename === undefined) {
+              console.warn(`${importPathPrefix} ${transformPrefix} => Could not find another file in directory that had same name but different extension. Will not transform.`);
+              return;
+            }
+            transformedImport = combineDirFile(pathInfo.dir, otherFilename); // path.join(pathInfo.root, dir, otherFilename);
+            transformPrefix = `${transformPrefix} (${path.parse(otherFilename).ext})`
+          }
+          break;
+        default:
+          transformedImport = combineDirFile(pathInfo.dir, `.${derivedTT}`); // path.join(pathInfo.root, dir, pathInfo.name, `.${derivedTT}`);
+          break;
+      }
+
+      console.log(`${importPathPrefix} ${transformPrefix} => Replacing with ${transformedImport}`);
+      j(x).replaceWith(
+          j.importDeclaration(
+              x.node.specifiers,
+              j.stringLiteral(transformedImport)
+          )
+      );
+
+    } else {
+      console.log(`${importPathPrefix} Import did not match transformFrom ('${tf}')`);
+      return;
+    }
+  });
+
+  /**
+   * Early exit condition
+   * -----
+   * It is often good practice to exit early and return the original source file
+   * if it does not contain code relevant to the codemod.
+   * See this page for more information:
+   * https://codeshiftcommunity.github.io/CodeshiftCommunity/docs/your-first-codemod#output
+   */
+  // if (/* Some condition here */ true) {
+  //   return file.source;
+  // }
+
+  /**
+   * Codemod logic goes here 👇
+   * -----
+   * This is where the core logic for your codemod will go,
+   * consider grouping specific actions into 'motions' and running them in sequence
+   *
+   * See this page for more information:
+   * https://codeshiftcommunity.github.io/CodeshiftCommunity/docs/authoring#motions
+   */
+  //source.findVariableDeclarators('foo').renameTo('bar');
+
+  /**
+   * Return your modified AST here 👇
+   * -----
+   * This is where your modified AST will be transformed back into a string
+   * and written back to the file.
+   */
+  return source.toSource(options.printOptions);
+}
+
+const combineDirFile = (dir: string, file: string) => {
+  if(dir === '') {
+    return file;
+  }
+  return `${dir}${path.sep}${file}`;
+}

config/README.md

@@ -9,4 +9,4 @@ These are **NOT** exhaustive examples. You should consult the  **configuration**
 Documentation at
 
 * [internal docs](../docsite/docs/configuration/configuration.md)
-* External Link: https://github.com/FoxxMD/multi-scrobbler/blob/master/docsite/docs/configuration/configuration.md
+* External Link: https://foxxmd.github.io/multi-scrobbler/docs/configuration

config/config.json.example

@@ -1,8 +1,18 @@
 {
+  "debugMode": false,
   "sourceDefaults": {
-    "maxPollRetries": 0,
+    "maxPollRetries": 1,
     "maxRequestRetries": 1,
-    "retryMultiplier": 1.5
+    "retryMultiplier": 1.5,
+    "scrobbleThresholds": {
+      "duration": 30,
+      "percent": 50
+    },
+    "options": {
+      "logPayload": false,
+      "logFilterFailure": "warn",
+      "logPlayerState": false
+    }
   },
   "clientDefaults": {
     "maxRequestRetries": 1,