diff --git a/api/package-lock.json b/api/package-lock.json index d5e78f3..0bd14cd 100644 --- a/api/package-lock.json +++ b/api/package-lock.json @@ -59,7 +59,7 @@ "nodejs-file-downloader": "4.10.2", "nodemon": "^2.0.7", "pkg": "5.6.0", - "prettier": "^2.3.1", + "prettier": "^3.0.3", "rimraf": "^3.0.2", "supertest": "^6.1.3", "ts-jest": "^27.0.3", @@ -9831,15 +9831,18 @@ } }, "node_modules/prettier": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.1.tgz", - "integrity": "sha512-p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" } }, "node_modules/pretty-format": { @@ -19655,9 +19658,9 @@ "dev": true }, "prettier": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.1.tgz", - "integrity": "sha512-p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true }, "pretty-format": { diff --git a/api/package.json b/api/package.json index 49ec2e6..e410ffa 100644 --- a/api/package.json +++ b/api/package.json @@ -96,7 +96,7 @@ "nodejs-file-downloader": "4.10.2", "nodemon": "^2.0.7", "pkg": "5.6.0", - "prettier": "^2.3.1", + "prettier": "^3.0.3", "rimraf": "^3.0.2", "supertest": "^6.1.3", "ts-jest": "^27.0.3", diff --git a/api/src/controllers/internal/Session.ts b/api/src/controllers/internal/Session.ts index cb3ba68..31ee7f3 100644 --- a/api/src/controllers/internal/Session.ts +++ b/api/src/controllers/internal/Session.ts @@ -190,17 +190,20 @@ ${autoExecContent}` } private scheduleSessionDestroy(session: Session) { - setTimeout(async () => { - if (session.inUse) { - // adding 10 more minutes - const newDeathTimeStamp = parseInt(session.deathTimeStamp) + 10 * 1000 - session.deathTimeStamp = newDeathTimeStamp.toString() + setTimeout( + async () => { + if (session.inUse) { + // adding 10 more minutes + const newDeathTimeStamp = parseInt(session.deathTimeStamp) + 10 * 1000 + session.deathTimeStamp = newDeathTimeStamp.toString() - this.scheduleSessionDestroy(session) - } else { - await this.deleteSession(session) - } - }, parseInt(session.deathTimeStamp) - new Date().getTime() - 100) + this.scheduleSessionDestroy(session) + } else { + await this.deleteSession(session) + } + }, + parseInt(session.deathTimeStamp) - new Date().getTime() - 100 + ) } } diff --git a/api/src/utils/upload.ts b/api/src/utils/upload.ts index d4a4119..f85cf57 100644 --- a/api/src/utils/upload.ts +++ b/api/src/utils/upload.ts @@ -51,9 +51,8 @@ export const generateFileUploadSasCode = async ( let fileCount = 0 const uploadedFiles: UploadedFiles[] = [] - const sasSessionFolderList: string[] = await listFilesInFolder( - sasSessionFolder - ) + const sasSessionFolderList: string[] = + await listFilesInFolder(sasSessionFolder) sasSessionFolderList.forEach((fileName) => { let fileCountString = fileCount < 100 ? '0' + fileCount : fileCount fileCountString = fileCount < 10 ? '00' + fileCount : fileCount diff --git a/web/package-lock.json b/web/package-lock.json index c9a552e..713c536 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -56,7 +56,7 @@ "file-loader": "^6.2.0", "html-webpack-plugin": "5.5.0", "path": "0.12.7", - "prettier": "^2.4.1", + "prettier": "^3.0.3", "sass": "^1.44.0", "sass-loader": "^12.3.0", "style-loader": "^3.3.1", @@ -9413,15 +9413,18 @@ } }, "node_modules/prettier": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz", - "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" } }, "node_modules/pretty-error": { @@ -18615,9 +18618,9 @@ "dev": true }, "prettier": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz", - "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true }, "pretty-error": { diff --git a/web/package.json b/web/package.json index 03b6f7f..c23f237 100644 --- a/web/package.json +++ b/web/package.json @@ -4,7 +4,9 @@ "private": true, "scripts": { "start": "webpack-dev-server --config webpack.dev.ts --hot", - "build": "webpack --config webpack.prod.ts" + "build": "webpack --config webpack.prod.ts", + "lint": "npx prettier --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"", + "lint:fix": "npx prettier --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"" }, "dependencies": { "@emotion/react": "^11.4.1", @@ -55,7 +57,7 @@ "file-loader": "^6.2.0", "html-webpack-plugin": "5.5.0", "path": "0.12.7", - "prettier": "^2.4.1", + "prettier": "^3.0.3", "sass": "^1.44.0", "sass-loader": "^12.3.0", "style-loader": "^3.3.1",