mirror of
https://gitlab.com/deeplydrumming/DeemixFix.git
synced 2026-01-15 08:22:59 -03:00
server fixes: check for updated version in GDrive, fixed logger in dev mode, updated dependencies, gitignore.
This commit is contained in:
deeplydrumming
5
server/.gitignore
vendored
5
server/.gitignore
vendored
@@ -65,4 +65,9 @@ typings/
|
||||
.idea
|
||||
|
||||
# development
|
||||
*.map
|
||||
dev.sh
|
||||
|
||||
# distribution
|
||||
dist/*
|
||||
yarn.lock
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
module.exports = {
|
||||
clearMocks: true,
|
||||
roots: ['<rootDir>/src', '<rootDir>/tests'],
|
||||
testEnvironment: 'node',
|
||||
preset: 'ts-jest',
|
||||
setupFiles: ['dotenv/config']
|
||||
clearMocks: true,
|
||||
roots: ['<rootDir>/src', '<rootDir>/tests'],
|
||||
testEnvironment: 'node',
|
||||
preset: 'ts-jest',
|
||||
setupFiles: ['dotenv/config']
|
||||
}
|
||||
|
||||
@@ -21,47 +21,46 @@
|
||||
"../package.json"
|
||||
],
|
||||
"targets": [
|
||||
"node16-linux-x64",
|
||||
"node16-win-x64",
|
||||
"node16-macos-x64"
|
||||
"node20-linux-x64",
|
||||
"node20-win-x64",
|
||||
"node20-macos-x64"
|
||||
]
|
||||
},
|
||||
"dependencies": {
|
||||
"@types/cookie-parser": "1.4.2",
|
||||
"@types/dateformat": "5.0.0",
|
||||
"@types/debug": "4.1.5",
|
||||
"@types/ejs": "3.1.1",
|
||||
"@types/express": "4.17.11",
|
||||
"@types/cookie-parser": "1.4.7",
|
||||
"@types/dateformat": "5.0.2",
|
||||
"@types/debug": "4.1.12",
|
||||
"@types/ejs": "3.1.5",
|
||||
"@types/express": "4.17.21",
|
||||
"@types/express-session": "^1.17.3",
|
||||
"@types/morgan": "1.9.2",
|
||||
"@types/morgan": "1.9.9",
|
||||
"@types/node": "14.14.37",
|
||||
"@types/ramda": "0.27.40",
|
||||
"@types/uuid": "8.3.0",
|
||||
"@types/ws": "7.4.1",
|
||||
"@types/yargs": "17.0.0",
|
||||
"bufferutil": "4.0.3",
|
||||
"cookie-parser": "1.4.5",
|
||||
"dateformat": "5.0.3",
|
||||
"@types/yargs": "17.0.32",
|
||||
"bufferutil": "4.0.8",
|
||||
"cookie-parser": "1.4.6",
|
||||
"debug": "2.6.9",
|
||||
"deemix": "^3.6.0",
|
||||
"deezer-js": "^1.3.0",
|
||||
"deemix": "../deemix",
|
||||
"deezer-js": "^1.3.8",
|
||||
"dotenv": "8.2.0",
|
||||
"ejs": "3.1.8",
|
||||
"express": "4.17.1",
|
||||
"express-session": "^1.17.1",
|
||||
"memorystore": "1.6.6",
|
||||
"ejs": "3.1.10",
|
||||
"express": "4.19.2",
|
||||
"express-session": "^1.17.3",
|
||||
"memorystore": "1.6.7",
|
||||
"morgan": "1.10.0",
|
||||
"nodemon": "2.0.7",
|
||||
"nodemon-webpack-plugin": "4.8.1",
|
||||
"nodemon-webpack-plugin": "4.8.2",
|
||||
"ramda": "0.27.1",
|
||||
"ts-loader": "9.4.2",
|
||||
"ts-loader": "9.5.1",
|
||||
"utf-8-validate": "5.0.5",
|
||||
"uuid": "8.3.2",
|
||||
"webpack": "5.75.0",
|
||||
"webpack-cli": "5.0.1",
|
||||
"winston": "3.6.0",
|
||||
"webpack": "5.93.0",
|
||||
"webpack-cli": "5.1.4",
|
||||
"winston": "3.13.1",
|
||||
"ws": "7.4.5",
|
||||
"yargs": "17.0.1"
|
||||
"yargs": "17.7.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@nuxtjs/eslint-config": "6.0.0",
|
||||
|
||||
@@ -27,6 +27,10 @@ export const currentVersion = currentVersionTemp === '0.0.0' ? 'continuous' : cu
|
||||
|
||||
export const sessionDZ: any = {}
|
||||
|
||||
process.on('warning', warning => {
|
||||
console.log(warning.stack)
|
||||
})
|
||||
|
||||
export class DeemixApp {
|
||||
queueOrder: string[]
|
||||
queue: any
|
||||
@@ -85,7 +89,7 @@ export class DeemixApp {
|
||||
if ((this.latestVersion === null || force) && !this.settings.disableUpdateCheck) {
|
||||
let response
|
||||
try {
|
||||
response = await got.get('https://deemix.app/gui/latest', {
|
||||
response = await got.get('https://gitlab.com/deeplydrumming/DeemixFix2/-/raw/main/latest.txt', {
|
||||
https: {
|
||||
rejectUnauthorized: false
|
||||
}
|
||||
|
||||
@@ -11,9 +11,11 @@ const logFolder: string = joinPath(deemix.utils.localpaths.getConfigFolder(), 'l
|
||||
const logFilename = joinPath(logFolder, `${dateFormat(new Date(), 'yyyy-mm-dd-HH.MM.ss')}.log`)
|
||||
|
||||
const logFormat = printf(error => {
|
||||
const { level, message, timestamp, stack } = error
|
||||
let result = `${timestamp} [${level}] ${message}`
|
||||
if (stack && !message.startsWith('uncaughtException')) result += '\n' + stack + '\n'
|
||||
/* const { level, message, timestamp, stack } = error */
|
||||
const { level, message } = error
|
||||
const result = `[${level}] ${message}`
|
||||
/* let result = `${timestamp} [${level}] ${message}`
|
||||
if (stack && !message.startsWith('uncaughtException')) result += '\n' + stack + '\n' */
|
||||
return result
|
||||
})
|
||||
|
||||
|
||||
@@ -1,76 +1,16 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
/* Visit https://aka.ms/tsconfig.json to read more about this file */
|
||||
|
||||
/* Basic Options */
|
||||
// "incremental": true, /* Enable incremental compilation */
|
||||
"target": "es6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
|
||||
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
|
||||
// "lib": [], /* Specify library files to be included in the compilation. */
|
||||
// "allowJs": true, /* Allow javascript files to be compiled. */
|
||||
// "checkJs": true, /* Report errors in .js files. */
|
||||
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */
|
||||
// "declaration": true, /* Generates corresponding '.d.ts' file. */
|
||||
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
|
||||
"sourceMap": true, /* Generates corresponding '.map' file. */
|
||||
// "outFile": "./", /* Concatenate and emit output to single file. */
|
||||
"outDir": "./dist", /* Redirect output structure to the directory. */
|
||||
"rootDir": "./src", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
|
||||
// "composite": true, /* Enable project compilation */
|
||||
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
|
||||
// "removeComments": true, /* Do not emit comments to output. */
|
||||
// "noEmit": true, /* Do not emit outputs. */
|
||||
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
|
||||
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
|
||||
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
|
||||
|
||||
/* Strict Type-Checking Options */
|
||||
"strict": true, /* Enable all strict type-checking options. */
|
||||
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
|
||||
// "strictNullChecks": true, /* Enable strict null checks. */
|
||||
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
|
||||
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
|
||||
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
|
||||
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
|
||||
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
|
||||
|
||||
/* Additional Checks */
|
||||
// "noUnusedLocals": true, /* Report errors on unused locals. */
|
||||
// "noUnusedParameters": true, /* Report errors on unused parameters. */
|
||||
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
|
||||
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
|
||||
// "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */
|
||||
// "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */
|
||||
|
||||
/* Module Resolution Options */
|
||||
"moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
|
||||
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
|
||||
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
|
||||
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
|
||||
// "typeRoots": [], /* List of folders to include type definitions from. */
|
||||
// "types": [], /* Type declaration files to be included in compilation. */
|
||||
"allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
|
||||
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
|
||||
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
|
||||
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
|
||||
|
||||
/* Source Map Options */
|
||||
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
|
||||
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
|
||||
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
|
||||
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
|
||||
|
||||
/* Experimental Options */
|
||||
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
|
||||
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
|
||||
|
||||
/* Advanced Options */
|
||||
"skipLibCheck": true, /* Skip type checking of declaration files. */
|
||||
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
|
||||
},
|
||||
"exclude": [
|
||||
"node_modules",
|
||||
"**/*.spec.ts",
|
||||
"tests/**"
|
||||
]
|
||||
"compilerOptions": {
|
||||
"target": "ES2015" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
|
||||
"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
|
||||
"sourceMap": true /* Generates corresponding '.map' file. */,
|
||||
"outDir": "./dist" /* Redirect output structure to the directory. */,
|
||||
"rootDir": "./src" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
|
||||
"strict": true /* Enable all strict type-checking options. */,
|
||||
"moduleResolution": "node" /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */,
|
||||
"allowSyntheticDefaultImports": true /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */,
|
||||
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
|
||||
"skipLibCheck": true /* Skip type checking of declaration files. */,
|
||||
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
|
||||
},
|
||||
"exclude": ["node_modules", "**/*.spec.ts", "tests/**"]
|
||||
}
|
||||
|
||||
@@ -3,48 +3,48 @@ const webpack = require('webpack')
|
||||
const NodemonPlugin = require('nodemon-webpack-plugin')
|
||||
|
||||
module.exports = env => {
|
||||
const isProduction = !!env.production
|
||||
const generateSourceMap = !!env.sourcemap
|
||||
let devtool = 'eval'
|
||||
if (isProduction) {
|
||||
devtool = generateSourceMap ? 'source-map' : false
|
||||
}
|
||||
const config = {
|
||||
mode: isProduction ? 'production' : 'development',
|
||||
entry: './src/index.ts',
|
||||
devtool,
|
||||
module: {
|
||||
rules: [
|
||||
{
|
||||
test: /\.tsx?$/,
|
||||
use: 'ts-loader',
|
||||
exclude: /node_modules/
|
||||
}
|
||||
]
|
||||
},
|
||||
resolve: {
|
||||
extensions: ['.tsx', '.ts', '.js']
|
||||
},
|
||||
output: {
|
||||
path: path.resolve(__dirname, 'dist'),
|
||||
filename: 'app.js',
|
||||
sourceMapFilename: '[file].map',
|
||||
library: {
|
||||
name: 'DeemixServer',
|
||||
type: 'umd'
|
||||
}
|
||||
},
|
||||
target: 'node',
|
||||
plugins: [
|
||||
new NodemonPlugin(),
|
||||
new webpack.DefinePlugin({ 'global.GENTLY': false }),
|
||||
new webpack.ContextReplacementPlugin(/[/\\](express|keyv)[/\\]/, data => {
|
||||
delete data.dependencies[0].critical
|
||||
return data
|
||||
}),
|
||||
new webpack.ContextReplacementPlugin(/yargs/)
|
||||
]
|
||||
}
|
||||
const isProduction = !!env.production
|
||||
const generateSourceMap = !!env.sourcemap
|
||||
let devtool = 'eval'
|
||||
if (isProduction) {
|
||||
devtool = generateSourceMap ? 'source-map' : false
|
||||
}
|
||||
const config = {
|
||||
mode: isProduction ? 'production' : 'development',
|
||||
entry: './src/index.ts',
|
||||
devtool,
|
||||
module: {
|
||||
rules: [
|
||||
{
|
||||
test: /\.tsx?$/,
|
||||
use: 'ts-loader',
|
||||
exclude: /node_modules/
|
||||
}
|
||||
]
|
||||
},
|
||||
resolve: {
|
||||
extensions: ['.tsx', '.ts', '.js']
|
||||
},
|
||||
output: {
|
||||
path: path.resolve(__dirname, 'dist'),
|
||||
filename: 'app.js',
|
||||
sourceMapFilename: '[file].map',
|
||||
library: {
|
||||
name: 'DeemixServer',
|
||||
type: 'umd'
|
||||
}
|
||||
},
|
||||
target: 'node',
|
||||
plugins: [
|
||||
new NodemonPlugin(),
|
||||
new webpack.DefinePlugin({ 'global.GENTLY': false }),
|
||||
new webpack.ContextReplacementPlugin(/[/\\](express|keyv)[/\\]/, data => {
|
||||
delete data.dependencies[0].critical
|
||||
return data
|
||||
}),
|
||||
new webpack.ContextReplacementPlugin(/yargs/)
|
||||
]
|
||||
}
|
||||
|
||||
return config
|
||||
return config
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user