From 521d530dbd832bbedd58351f9e39ef8d86348dc4 Mon Sep 17 00:00:00 2001 From: Angels-dev Date: Sat, 3 Aug 2024 18:50:04 +0200 Subject: [PATCH] Maj packages --- .vscode/settings.json | 3 +++ .vscode/tasks.json | 28 ---------------------------- Dockerfile | 10 +++++++--- package.json | 18 +++++++++--------- utils/oauthGen.js | 1 - utils/validateToken.js | 2 +- 6 files changed, 20 insertions(+), 42 deletions(-) create mode 100755 .vscode/settings.json delete mode 100644 .vscode/tasks.json mode change 100644 => 100755 package.json mode change 100644 => 100755 utils/oauthGen.js diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100755 index 0000000..f22d945 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "docker.commands.build": "${containerCommand} build --rm -f \"${dockerfile}\" -t bot_laytho:latest \"${context}\"" +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index 9f96f61..0000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": "2.0.0", - "tasks": [ - { - "type": "docker-build", - "label": "Build Node Image", - "platform": "node", - "dockerBuild": { - "dockerfile": "${workspaceFolder}/Dockerfile", - "context": "${workspaceFolder}", - "pull": true - } - }, - { - "type": "docker-run", - "label": "Run Node Image", - "platform": "node", - "dockerRun": { - "containerName": "BotTwitch-Laytho", - "restart": "always", - "network": "host" - }, - "dependsOn": [ - "docker-build" - ] - } - ] -} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 1401abd..4ee1778 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,14 @@ -FROM node:latest +FROM node:alpine as base + ENV NODE_ENV=production WORKDIR /usr/src/app + COPY ["package.json", "package-lock.json*", "./"] -RUN npm install --production --silent && mv node_modules ../ +RUN npm install --production --verbose && mv node_modules ../ + COPY . . RUN chown -R node /usr/src/app USER node + EXPOSE 3000 -CMD ["npm", "start"] +CMD ["npm", "start"] \ No newline at end of file diff --git a/package.json b/package.json old mode 100644 new mode 100755 index 673b54b..d226ffc --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bot_laytho", - "version": "1.0.0", + "version": "1.1.0", "description": "bot_Laytho", "main": "app.js", "scripts": { @@ -12,17 +12,17 @@ "name": "Angels / Jojo" }, "devDependencies": { - "eslint": "^8.40.0", - "nodemon": "^2.0.22", - "prettier": "^2.8.8" + "eslint": "^9.8.0", + "nodemon": "^3.1.4", + "prettier": "^3.3.3" }, "eslintConfig": {}, "dependencies": { - "axios": "^1.4.0", - "dotenv": "^16.0.3", - "express": "^4.18.2", - "mysql2": "^3.3.0", + "axios": "^1.7.3", + "dotenv": "^16.4.5", + "express": "^4.19.2", + "mysql2": "^3.11.0", "require-all": "^3.0.0", - "websocket": "^1.0.34" + "websocket": "^1.0.35" } } diff --git a/utils/oauthGen.js b/utils/oauthGen.js old mode 100644 new mode 100755 index 07a252a..1f1bb5c --- a/utils/oauthGen.js +++ b/utils/oauthGen.js @@ -1,5 +1,4 @@ module.exports = oauthGen = (async (client_id, redirect_uri, scope) => { - console.log(scope) let queries = { response_type: 'code', client_id, diff --git a/utils/validateToken.js b/utils/validateToken.js index 0a426da..d3a611c 100644 --- a/utils/validateToken.js +++ b/utils/validateToken.js @@ -7,5 +7,5 @@ module.exports = validateToken = (async (access_token) => { } }).then(response => { return true - }).catch(error => { console.error(error.response.data) }) + }).catch(error => { if (error.response.data.message == 'invalid access token') console.error(error.response.data) }) }) \ No newline at end of file