diff --git a/.gitignore b/.gitignore index 9aa96bd..461b822 100755 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,8 @@ prisma/migrations/* # Swap the comments on the following lines if you don't wish to use zero-installs # Documentation here: https://yarnpkg.com/features/zero-installs !.yarn/cache + +redis.conf +redis_data + +coverage \ No newline at end of file diff --git a/.yarn/cache/@typescript-eslint-eslint-plugin-npm-6.21.0-eed10a6c66-a57de0f630.zip b/.yarn/cache/@typescript-eslint-eslint-plugin-npm-6.21.0-eed10a6c66-a57de0f630.zip deleted file mode 100644 index 6fb6bea..0000000 Binary files a/.yarn/cache/@typescript-eslint-eslint-plugin-npm-6.21.0-eed10a6c66-a57de0f630.zip and /dev/null differ diff --git a/.yarn/cache/@typescript-eslint-eslint-plugin-npm-7.1.0-31bd50d8f4-f0b6b6e6ae.zip b/.yarn/cache/@typescript-eslint-eslint-plugin-npm-7.1.0-31bd50d8f4-f0b6b6e6ae.zip new file mode 100644 index 0000000..cbbf477 Binary files /dev/null and b/.yarn/cache/@typescript-eslint-eslint-plugin-npm-7.1.0-31bd50d8f4-f0b6b6e6ae.zip differ diff --git a/.yarn/cache/@typescript-eslint-parser-npm-6.21.0-d7ff8425ee-4d51cdbc17.zip b/.yarn/cache/@typescript-eslint-parser-npm-6.21.0-d7ff8425ee-4d51cdbc17.zip deleted file mode 100644 index e59c224..0000000 Binary files a/.yarn/cache/@typescript-eslint-parser-npm-6.21.0-d7ff8425ee-4d51cdbc17.zip and /dev/null differ diff --git a/.yarn/cache/@typescript-eslint-parser-npm-7.1.0-4862dd3703-39238d37f5.zip b/.yarn/cache/@typescript-eslint-parser-npm-7.1.0-4862dd3703-39238d37f5.zip new file mode 100644 index 0000000..e99b072 Binary files /dev/null and b/.yarn/cache/@typescript-eslint-parser-npm-7.1.0-4862dd3703-39238d37f5.zip differ diff --git a/.yarn/cache/@typescript-eslint-scope-manager-npm-6.21.0-60aa61cad2-fe91ac52ca.zip b/.yarn/cache/@typescript-eslint-scope-manager-npm-7.1.0-4aebe598fa-3fb18de864.zip similarity index 88% rename from .yarn/cache/@typescript-eslint-scope-manager-npm-6.21.0-60aa61cad2-fe91ac52ca.zip rename to .yarn/cache/@typescript-eslint-scope-manager-npm-7.1.0-4aebe598fa-3fb18de864.zip index 7b7719a..cba9fd0 100644 Binary files a/.yarn/cache/@typescript-eslint-scope-manager-npm-6.21.0-60aa61cad2-fe91ac52ca.zip and b/.yarn/cache/@typescript-eslint-scope-manager-npm-7.1.0-4aebe598fa-3fb18de864.zip differ diff --git a/.yarn/cache/@typescript-eslint-type-utils-npm-6.21.0-b5d74d2e4c-d03fb3ee1c.zip b/.yarn/cache/@typescript-eslint-type-utils-npm-7.1.0-9322895735-439e6fadab.zip similarity index 91% rename from .yarn/cache/@typescript-eslint-type-utils-npm-6.21.0-b5d74d2e4c-d03fb3ee1c.zip rename to .yarn/cache/@typescript-eslint-type-utils-npm-7.1.0-9322895735-439e6fadab.zip index 5cc3839..0db5ae1 100644 Binary files a/.yarn/cache/@typescript-eslint-type-utils-npm-6.21.0-b5d74d2e4c-d03fb3ee1c.zip and b/.yarn/cache/@typescript-eslint-type-utils-npm-7.1.0-9322895735-439e6fadab.zip differ diff --git a/.yarn/cache/@typescript-eslint-types-npm-6.21.0-4d08954078-e26da86d6f.zip b/.yarn/cache/@typescript-eslint-types-npm-7.1.0-9208d73d58-34801a14ea.zip similarity index 86% rename from .yarn/cache/@typescript-eslint-types-npm-6.21.0-4d08954078-e26da86d6f.zip rename to .yarn/cache/@typescript-eslint-types-npm-7.1.0-9208d73d58-34801a14ea.zip index 177b74c..7b0f219 100644 Binary files a/.yarn/cache/@typescript-eslint-types-npm-6.21.0-4d08954078-e26da86d6f.zip and b/.yarn/cache/@typescript-eslint-types-npm-7.1.0-9208d73d58-34801a14ea.zip differ diff --git a/.yarn/cache/@typescript-eslint-typescript-estree-npm-6.21.0-04a199adba-b32fa35fca.zip b/.yarn/cache/@typescript-eslint-typescript-estree-npm-7.1.0-ebb2e5440a-7dfc6fc70f.zip similarity index 73% rename from .yarn/cache/@typescript-eslint-typescript-estree-npm-6.21.0-04a199adba-b32fa35fca.zip rename to .yarn/cache/@typescript-eslint-typescript-estree-npm-7.1.0-ebb2e5440a-7dfc6fc70f.zip index e590185..f31fcbb 100644 Binary files a/.yarn/cache/@typescript-eslint-typescript-estree-npm-6.21.0-04a199adba-b32fa35fca.zip and b/.yarn/cache/@typescript-eslint-typescript-estree-npm-7.1.0-ebb2e5440a-7dfc6fc70f.zip differ diff --git a/.yarn/cache/@typescript-eslint-utils-npm-6.21.0-b19969b8aa-b404a2c55a.zip b/.yarn/cache/@typescript-eslint-utils-npm-6.21.0-b19969b8aa-b404a2c55a.zip deleted file mode 100644 index 45f994d..0000000 Binary files a/.yarn/cache/@typescript-eslint-utils-npm-6.21.0-b19969b8aa-b404a2c55a.zip and /dev/null differ diff --git a/.yarn/cache/@typescript-eslint-utils-npm-7.1.0-379a7d3140-26d64094d8.zip b/.yarn/cache/@typescript-eslint-utils-npm-7.1.0-379a7d3140-26d64094d8.zip new file mode 100644 index 0000000..247fe25 Binary files /dev/null and b/.yarn/cache/@typescript-eslint-utils-npm-7.1.0-379a7d3140-26d64094d8.zip differ diff --git a/.yarn/cache/@typescript-eslint-visitor-keys-npm-6.21.0-b36d99336e-30422cdc1e.zip b/.yarn/cache/@typescript-eslint-visitor-keys-npm-7.1.0-402d386e44-c3e98ebf16.zip similarity index 82% rename from .yarn/cache/@typescript-eslint-visitor-keys-npm-6.21.0-b36d99336e-30422cdc1e.zip rename to .yarn/cache/@typescript-eslint-visitor-keys-npm-7.1.0-402d386e44-c3e98ebf16.zip index 424bec5..ba9170b 100644 Binary files a/.yarn/cache/@typescript-eslint-visitor-keys-npm-6.21.0-b36d99336e-30422cdc1e.zip and b/.yarn/cache/@typescript-eslint-visitor-keys-npm-7.1.0-402d386e44-c3e98ebf16.zip differ diff --git a/.yarn/cache/eslint-config-airbnb-typescript-npm-17.1.0-ed4ce93531-a2238d8209.zip b/.yarn/cache/eslint-config-airbnb-typescript-npm-18.0.0-a74d58b4f0-b913670baf.zip similarity index 56% rename from .yarn/cache/eslint-config-airbnb-typescript-npm-17.1.0-ed4ce93531-a2238d8209.zip rename to .yarn/cache/eslint-config-airbnb-typescript-npm-18.0.0-a74d58b4f0-b913670baf.zip index d73fabb..806e289 100644 Binary files a/.yarn/cache/eslint-config-airbnb-typescript-npm-17.1.0-ed4ce93531-a2238d8209.zip and b/.yarn/cache/eslint-config-airbnb-typescript-npm-18.0.0-a74d58b4f0-b913670baf.zip differ diff --git a/coverage/clover.xml b/coverage/clover.xml deleted file mode 100644 index 468ba24..0000000 --- a/coverage/clover.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/coverage/coverage-final.json b/coverage/coverage-final.json deleted file mode 100644 index 2c63c08..0000000 --- a/coverage/coverage-final.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} diff --git a/coverage/lcov-report/base.css b/coverage/lcov-report/base.css deleted file mode 100644 index f418035..0000000 --- a/coverage/lcov-report/base.css +++ /dev/null @@ -1,224 +0,0 @@ -body, html { - margin:0; padding: 0; - height: 100%; -} -body { - font-family: Helvetica Neue, Helvetica, Arial; - font-size: 14px; - color:#333; -} -.small { font-size: 12px; } -*, *:after, *:before { - -webkit-box-sizing:border-box; - -moz-box-sizing:border-box; - box-sizing:border-box; - } -h1 { font-size: 20px; margin: 0;} -h2 { font-size: 14px; } -pre { - font: 12px/1.4 Consolas, "Liberation Mono", Menlo, Courier, monospace; - margin: 0; - padding: 0; - -moz-tab-size: 2; - -o-tab-size: 2; - tab-size: 2; -} -a { color:#0074D9; text-decoration:none; } -a:hover { text-decoration:underline; } -.strong { font-weight: bold; } -.space-top1 { padding: 10px 0 0 0; } -.pad2y { padding: 20px 0; } -.pad1y { padding: 10px 0; } -.pad2x { padding: 0 20px; } -.pad2 { padding: 20px; } -.pad1 { padding: 10px; } -.space-left2 { padding-left:55px; } -.space-right2 { padding-right:20px; } -.center { text-align:center; } -.clearfix { display:block; } -.clearfix:after { - content:''; - display:block; - height:0; - clear:both; - visibility:hidden; - } -.fl { float: left; } -@media only screen and (max-width:640px) { - .col3 { width:100%; max-width:100%; } - .hide-mobile { display:none!important; } -} - -.quiet { - color: #7f7f7f; - color: rgba(0,0,0,0.5); -} -.quiet a { opacity: 0.7; } - -.fraction { - font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace; - font-size: 10px; - color: #555; - background: #E8E8E8; - padding: 4px 5px; - border-radius: 3px; - vertical-align: middle; -} - -div.path a:link, div.path a:visited { color: #333; } -table.coverage { - border-collapse: collapse; - margin: 10px 0 0 0; - padding: 0; -} - -table.coverage td { - margin: 0; - padding: 0; - vertical-align: top; -} -table.coverage td.line-count { - text-align: right; - padding: 0 5px 0 20px; -} -table.coverage td.line-coverage { - text-align: right; - padding-right: 10px; - min-width:20px; -} - -table.coverage td span.cline-any { - display: inline-block; - padding: 0 5px; - width: 100%; -} -.missing-if-branch { - display: inline-block; - margin-right: 5px; - border-radius: 3px; - position: relative; - padding: 0 4px; - background: #333; - color: yellow; -} - -.skip-if-branch { - display: none; - margin-right: 10px; - position: relative; - padding: 0 4px; - background: #ccc; - color: white; -} -.missing-if-branch .typ, .skip-if-branch .typ { - color: inherit !important; -} -.coverage-summary { - border-collapse: collapse; - width: 100%; -} -.coverage-summary tr { border-bottom: 1px solid #bbb; } -.keyline-all { border: 1px solid #ddd; } -.coverage-summary td, .coverage-summary th { padding: 10px; } -.coverage-summary tbody { border: 1px solid #bbb; } -.coverage-summary td { border-right: 1px solid #bbb; } -.coverage-summary td:last-child { border-right: none; } -.coverage-summary th { - text-align: left; - font-weight: normal; - white-space: nowrap; -} -.coverage-summary th.file { border-right: none !important; } -.coverage-summary th.pct { } -.coverage-summary th.pic, -.coverage-summary th.abs, -.coverage-summary td.pct, -.coverage-summary td.abs { text-align: right; } -.coverage-summary td.file { white-space: nowrap; } -.coverage-summary td.pic { min-width: 120px !important; } -.coverage-summary tfoot td { } - -.coverage-summary .sorter { - height: 10px; - width: 7px; - display: inline-block; - margin-left: 0.5em; - background: url(sort-arrow-sprite.png) no-repeat scroll 0 0 transparent; -} -.coverage-summary .sorted .sorter { - background-position: 0 -20px; -} -.coverage-summary .sorted-desc .sorter { - background-position: 0 -10px; -} -.status-line { height: 10px; } -/* yellow */ -.cbranch-no { background: yellow !important; color: #111; } -/* dark red */ -.red.solid, .status-line.low, .low .cover-fill { background:#C21F39 } -.low .chart { border:1px solid #C21F39 } -.highlighted, -.highlighted .cstat-no, .highlighted .fstat-no, .highlighted .cbranch-no{ - background: #C21F39 !important; -} -/* medium red */ -.cstat-no, .fstat-no, .cbranch-no, .cbranch-no { background:#F6C6CE } -/* light red */ -.low, .cline-no { background:#FCE1E5 } -/* light green */ -.high, .cline-yes { background:rgb(230,245,208) } -/* medium green */ -.cstat-yes { background:rgb(161,215,106) } -/* dark green */ -.status-line.high, .high .cover-fill { background:rgb(77,146,33) } -.high .chart { border:1px solid rgb(77,146,33) } -/* dark yellow (gold) */ -.status-line.medium, .medium .cover-fill { background: #f9cd0b; } -.medium .chart { border:1px solid #f9cd0b; } -/* light yellow */ -.medium { background: #fff4c2; } - -.cstat-skip { background: #ddd; color: #111; } -.fstat-skip { background: #ddd; color: #111 !important; } -.cbranch-skip { background: #ddd !important; color: #111; } - -span.cline-neutral { background: #eaeaea; } - -.coverage-summary td.empty { - opacity: .5; - padding-top: 4px; - padding-bottom: 4px; - line-height: 1; - color: #888; -} - -.cover-fill, .cover-empty { - display:inline-block; - height: 12px; -} -.chart { - line-height: 0; -} -.cover-empty { - background: white; -} -.cover-full { - border-right: none !important; -} -pre.prettyprint { - border: none !important; - padding: 0 !important; - margin: 0 !important; -} -.com { color: #999 !important; } -.ignore-none { color: #999; font-weight: normal; } - -.wrapper { - min-height: 100%; - height: auto !important; - height: 100%; - margin: 0 auto -48px; -} -.footer, .push { - height: 48px; -} diff --git a/coverage/lcov-report/block-navigation.js b/coverage/lcov-report/block-navigation.js deleted file mode 100644 index cc12130..0000000 --- a/coverage/lcov-report/block-navigation.js +++ /dev/null @@ -1,87 +0,0 @@ -/* eslint-disable */ -var jumpToCode = (function init() { - // Classes of code we would like to highlight in the file view - var missingCoverageClasses = ['.cbranch-no', '.cstat-no', '.fstat-no']; - - // Elements to highlight in the file listing view - var fileListingElements = ['td.pct.low']; - - // We don't want to select elements that are direct descendants of another match - var notSelector = ':not(' + missingCoverageClasses.join('):not(') + ') > '; // becomes `:not(a):not(b) > ` - - // Selecter that finds elements on the page to which we can jump - var selector = - fileListingElements.join(', ') + - ', ' + - notSelector + - missingCoverageClasses.join(', ' + notSelector); // becomes `:not(a):not(b) > a, :not(a):not(b) > b` - - // The NodeList of matching elements - var missingCoverageElements = document.querySelectorAll(selector); - - var currentIndex; - - function toggleClass(index) { - missingCoverageElements - .item(currentIndex) - .classList.remove('highlighted'); - missingCoverageElements.item(index).classList.add('highlighted'); - } - - function makeCurrent(index) { - toggleClass(index); - currentIndex = index; - missingCoverageElements.item(index).scrollIntoView({ - behavior: 'smooth', - block: 'center', - inline: 'center' - }); - } - - function goToPrevious() { - var nextIndex = 0; - if (typeof currentIndex !== 'number' || currentIndex === 0) { - nextIndex = missingCoverageElements.length - 1; - } else if (missingCoverageElements.length > 1) { - nextIndex = currentIndex - 1; - } - - makeCurrent(nextIndex); - } - - function goToNext() { - var nextIndex = 0; - - if ( - typeof currentIndex === 'number' && - currentIndex < missingCoverageElements.length - 1 - ) { - nextIndex = currentIndex + 1; - } - - makeCurrent(nextIndex); - } - - return function jump(event) { - if ( - document.getElementById('fileSearch') === document.activeElement && - document.activeElement != null - ) { - // if we're currently focused on the search input, we don't want to navigate - return; - } - - switch (event.which) { - case 78: // n - case 74: // j - goToNext(); - break; - case 66: // b - case 75: // k - case 80: // p - goToPrevious(); - break; - } - }; -})(); -window.addEventListener('keydown', jumpToCode); diff --git a/coverage/lcov-report/favicon.png b/coverage/lcov-report/favicon.png deleted file mode 100644 index c1525b8..0000000 Binary files a/coverage/lcov-report/favicon.png and /dev/null differ diff --git a/coverage/lcov-report/index.html b/coverage/lcov-report/index.html deleted file mode 100644 index 25a1ada..0000000 --- a/coverage/lcov-report/index.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - Code coverage report for All files - - - - - - - - - -
-
-

All files

-
- -
- Unknown% - Statements - 0/0 -
- - -
- Unknown% - Branches - 0/0 -
- - -
- Unknown% - Functions - 0/0 -
- - -
- Unknown% - Lines - 0/0 -
- - -
-

- Press n or j to go to the next uncovered block, b, p or k for the previous block. -

- -
-
-
- - - - - - - - - - - - - - - - -
FileStatementsBranchesFunctionsLines
-
-
-
-
- Code coverage generated by - istanbul - at 2024-03-02T08:22:55.288Z -
- - - - - - - \ No newline at end of file diff --git a/coverage/lcov-report/prettify.css b/coverage/lcov-report/prettify.css deleted file mode 100644 index b317a7c..0000000 --- a/coverage/lcov-report/prettify.css +++ /dev/null @@ -1 +0,0 @@ -.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee} diff --git a/coverage/lcov-report/prettify.js b/coverage/lcov-report/prettify.js deleted file mode 100644 index b322523..0000000 --- a/coverage/lcov-report/prettify.js +++ /dev/null @@ -1,2 +0,0 @@ -/* eslint-disable */ -window.PR_SHOULD_USE_CONTINUATION=true;(function(){var h=["break,continue,do,else,for,if,return,while"];var u=[h,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"];var p=[u,"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"];var l=[p,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"];var x=[p,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"];var R=[x,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"];var r="all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes";var w=[p,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"];var s="caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END";var I=[h,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"];var f=[h,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"];var H=[h,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"];var A=[l,R,w,s+I,f,H];var e=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/;var C="str";var z="kwd";var j="com";var O="typ";var G="lit";var L="pun";var F="pln";var m="tag";var E="dec";var J="src";var P="atn";var n="atv";var N="nocode";var M="(?:^^\\.?|[+-]|\\!|\\!=|\\!==|\\#|\\%|\\%=|&|&&|&&=|&=|\\(|\\*|\\*=|\\+=|\\,|\\-=|\\->|\\/|\\/=|:|::|\\;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\@|\\[|\\^|\\^=|\\^\\^|\\^\\^=|\\{|\\||\\|=|\\|\\||\\|\\|=|\\~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*";function k(Z){var ad=0;var S=false;var ac=false;for(var V=0,U=Z.length;V122)){if(!(al<65||ag>90)){af.push([Math.max(65,ag)|32,Math.min(al,90)|32])}if(!(al<97||ag>122)){af.push([Math.max(97,ag)&~32,Math.min(al,122)&~32])}}}}af.sort(function(av,au){return(av[0]-au[0])||(au[1]-av[1])});var ai=[];var ap=[NaN,NaN];for(var ar=0;arat[0]){if(at[1]+1>at[0]){an.push("-")}an.push(T(at[1]))}}an.push("]");return an.join("")}function W(al){var aj=al.source.match(new RegExp("(?:\\[(?:[^\\x5C\\x5D]|\\\\[\\s\\S])*\\]|\\\\u[A-Fa-f0-9]{4}|\\\\x[A-Fa-f0-9]{2}|\\\\[0-9]+|\\\\[^ux0-9]|\\(\\?[:!=]|[\\(\\)\\^]|[^\\x5B\\x5C\\(\\)\\^]+)","g"));var ah=aj.length;var an=[];for(var ak=0,am=0;ak=2&&ai==="["){aj[ak]=X(ag)}else{if(ai!=="\\"){aj[ak]=ag.replace(/[a-zA-Z]/g,function(ao){var ap=ao.charCodeAt(0);return"["+String.fromCharCode(ap&~32,ap|32)+"]"})}}}}return aj.join("")}var aa=[];for(var V=0,U=Z.length;V=0;){S[ac.charAt(ae)]=Y}}var af=Y[1];var aa=""+af;if(!ag.hasOwnProperty(aa)){ah.push(af);ag[aa]=null}}ah.push(/[\0-\uffff]/);V=k(ah)})();var X=T.length;var W=function(ah){var Z=ah.sourceCode,Y=ah.basePos;var ad=[Y,F];var af=0;var an=Z.match(V)||[];var aj={};for(var ae=0,aq=an.length;ae=5&&"lang-"===ap.substring(0,5);if(am&&!(ai&&typeof ai[1]==="string")){am=false;ap=J}if(!am){aj[ag]=ap}}var ab=af;af+=ag.length;if(!am){ad.push(Y+ab,ap)}else{var al=ai[1];var ak=ag.indexOf(al);var ac=ak+al.length;if(ai[2]){ac=ag.length-ai[2].length;ak=ac-al.length}var ar=ap.substring(5);B(Y+ab,ag.substring(0,ak),W,ad);B(Y+ab+ak,al,q(ar,al),ad);B(Y+ab+ac,ag.substring(ac),W,ad)}}ah.decorations=ad};return W}function i(T){var W=[],S=[];if(T.tripleQuotedStrings){W.push([C,/^(?:\'\'\'(?:[^\'\\]|\\[\s\S]|\'{1,2}(?=[^\']))*(?:\'\'\'|$)|\"\"\"(?:[^\"\\]|\\[\s\S]|\"{1,2}(?=[^\"]))*(?:\"\"\"|$)|\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$))/,null,"'\""])}else{if(T.multiLineStrings){W.push([C,/^(?:\'(?:[^\\\']|\\[\s\S])*(?:\'|$)|\"(?:[^\\\"]|\\[\s\S])*(?:\"|$)|\`(?:[^\\\`]|\\[\s\S])*(?:\`|$))/,null,"'\"`"])}else{W.push([C,/^(?:\'(?:[^\\\'\r\n]|\\.)*(?:\'|$)|\"(?:[^\\\"\r\n]|\\.)*(?:\"|$))/,null,"\"'"])}}if(T.verbatimStrings){S.push([C,/^@\"(?:[^\"]|\"\")*(?:\"|$)/,null])}var Y=T.hashComments;if(Y){if(T.cStyleComments){if(Y>1){W.push([j,/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,null,"#"])}else{W.push([j,/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\r\n]*)/,null,"#"])}S.push([C,/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,null])}else{W.push([j,/^#[^\r\n]*/,null,"#"])}}if(T.cStyleComments){S.push([j,/^\/\/[^\r\n]*/,null]);S.push([j,/^\/\*[\s\S]*?(?:\*\/|$)/,null])}if(T.regexLiterals){var X=("/(?=[^/*])(?:[^/\\x5B\\x5C]|\\x5C[\\s\\S]|\\x5B(?:[^\\x5C\\x5D]|\\x5C[\\s\\S])*(?:\\x5D|$))+/");S.push(["lang-regex",new RegExp("^"+M+"("+X+")")])}var V=T.types;if(V){S.push([O,V])}var U=(""+T.keywords).replace(/^ | $/g,"");if(U.length){S.push([z,new RegExp("^(?:"+U.replace(/[\s,]+/g,"|")+")\\b"),null])}W.push([F,/^\s+/,null," \r\n\t\xA0"]);S.push([G,/^@[a-z_$][a-z_$@0-9]*/i,null],[O,/^(?:[@_]?[A-Z]+[a-z][A-Za-z_$@0-9]*|\w+_t\b)/,null],[F,/^[a-z_$][a-z_$@0-9]*/i,null],[G,new RegExp("^(?:0x[a-f0-9]+|(?:\\d(?:_\\d+)*\\d*(?:\\.\\d*)?|\\.\\d\\+)(?:e[+\\-]?\\d+)?)[a-z]*","i"),null,"0123456789"],[F,/^\\[\s\S]?/,null],[L,/^.[^\s\w\.$@\'\"\`\/\#\\]*/,null]);return g(W,S)}var K=i({keywords:A,hashComments:true,cStyleComments:true,multiLineStrings:true,regexLiterals:true});function Q(V,ag){var U=/(?:^|\s)nocode(?:\s|$)/;var ab=/\r\n?|\n/;var ac=V.ownerDocument;var S;if(V.currentStyle){S=V.currentStyle.whiteSpace}else{if(window.getComputedStyle){S=ac.defaultView.getComputedStyle(V,null).getPropertyValue("white-space")}}var Z=S&&"pre"===S.substring(0,3);var af=ac.createElement("LI");while(V.firstChild){af.appendChild(V.firstChild)}var W=[af];function ae(al){switch(al.nodeType){case 1:if(U.test(al.className)){break}if("BR"===al.nodeName){ad(al);if(al.parentNode){al.parentNode.removeChild(al)}}else{for(var an=al.firstChild;an;an=an.nextSibling){ae(an)}}break;case 3:case 4:if(Z){var am=al.nodeValue;var aj=am.match(ab);if(aj){var ai=am.substring(0,aj.index);al.nodeValue=ai;var ah=am.substring(aj.index+aj[0].length);if(ah){var ak=al.parentNode;ak.insertBefore(ac.createTextNode(ah),al.nextSibling)}ad(al);if(!ai){al.parentNode.removeChild(al)}}}break}}function ad(ak){while(!ak.nextSibling){ak=ak.parentNode;if(!ak){return}}function ai(al,ar){var aq=ar?al.cloneNode(false):al;var ao=al.parentNode;if(ao){var ap=ai(ao,1);var an=al.nextSibling;ap.appendChild(aq);for(var am=an;am;am=an){an=am.nextSibling;ap.appendChild(am)}}return aq}var ah=ai(ak.nextSibling,0);for(var aj;(aj=ah.parentNode)&&aj.nodeType===1;){ah=aj}W.push(ah)}for(var Y=0;Y=S){ah+=2}if(V>=ap){Z+=2}}}var t={};function c(U,V){for(var S=V.length;--S>=0;){var T=V[S];if(!t.hasOwnProperty(T)){t[T]=U}else{if(window.console){console.warn("cannot override language handler %s",T)}}}}function q(T,S){if(!(T&&t.hasOwnProperty(T))){T=/^\s*]*(?:>|$)/],[j,/^<\!--[\s\S]*?(?:-\->|$)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],[L,/^(?:<[%?]|[%?]>)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),["default-markup","htm","html","mxml","xhtml","xml","xsl"]);c(g([[F,/^[\s]+/,null," \t\r\n"],[n,/^(?:\"[^\"]*\"?|\'[^\']*\'?)/,null,"\"'"]],[[m,/^^<\/?[a-z](?:[\w.:-]*\w)?|\/?>$/i],[P,/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^>\'\"\s]*(?:[^>\'\"\s\/]|\/(?=\s)))/],[L,/^[=<>\/]+/],["lang-js",/^on\w+\s*=\s*\"([^\"]+)\"/i],["lang-js",/^on\w+\s*=\s*\'([^\']+)\'/i],["lang-js",/^on\w+\s*=\s*([^\"\'>\s]+)/i],["lang-css",/^style\s*=\s*\"([^\"]+)\"/i],["lang-css",/^style\s*=\s*\'([^\']+)\'/i],["lang-css",/^style\s*=\s*([^\"\'>\s]+)/i]]),["in.tag"]);c(g([],[[n,/^[\s\S]+/]]),["uq.val"]);c(i({keywords:l,hashComments:true,cStyleComments:true,types:e}),["c","cc","cpp","cxx","cyc","m"]);c(i({keywords:"null,true,false"}),["json"]);c(i({keywords:R,hashComments:true,cStyleComments:true,verbatimStrings:true,types:e}),["cs"]);c(i({keywords:x,cStyleComments:true}),["java"]);c(i({keywords:H,hashComments:true,multiLineStrings:true}),["bsh","csh","sh"]);c(i({keywords:I,hashComments:true,multiLineStrings:true,tripleQuotedStrings:true}),["cv","py"]);c(i({keywords:s,hashComments:true,multiLineStrings:true,regexLiterals:true}),["perl","pl","pm"]);c(i({keywords:f,hashComments:true,multiLineStrings:true,regexLiterals:true}),["rb"]);c(i({keywords:w,cStyleComments:true,regexLiterals:true}),["js"]);c(i({keywords:r,hashComments:3,cStyleComments:true,multilineStrings:true,tripleQuotedStrings:true,regexLiterals:true}),["coffee"]);c(g([],[[C,/^[\s\S]+/]]),["regex"]);function d(V){var U=V.langExtension;try{var S=a(V.sourceNode);var T=S.sourceCode;V.sourceCode=T;V.spans=S.spans;V.basePos=0;q(U,T)(V);D(V)}catch(W){if("console" in window){console.log(W&&W.stack?W.stack:W)}}}function y(W,V,U){var S=document.createElement("PRE");S.innerHTML=W;if(U){Q(S,U)}var T={langExtension:V,numberLines:U,sourceNode:S};d(T);return S.innerHTML}function b(ad){function Y(af){return document.getElementsByTagName(af)}var ac=[Y("pre"),Y("code"),Y("xmp")];var T=[];for(var aa=0;aa=0){var ah=ai.match(ab);var am;if(!ah&&(am=o(aj))&&"CODE"===am.tagName){ah=am.className.match(ab)}if(ah){ah=ah[1]}var al=false;for(var ak=aj.parentNode;ak;ak=ak.parentNode){if((ak.tagName==="pre"||ak.tagName==="code"||ak.tagName==="xmp")&&ak.className&&ak.className.indexOf("prettyprint")>=0){al=true;break}}if(!al){var af=aj.className.match(/\blinenums\b(?::(\d+))?/);af=af?af[1]&&af[1].length?+af[1]:true:false;if(af){Q(aj,af)}S={langExtension:ah,sourceNode:aj,numberLines:af};d(S)}}}if(X]*(?:>|$)/],[PR.PR_COMMENT,/^<\!--[\s\S]*?(?:-\->|$)/],[PR.PR_PUNCTUATION,/^(?:<[%?]|[%?]>)/],["lang-",/^<\?([\s\S]+?)(?:\?>|$)/],["lang-",/^<%([\s\S]+?)(?:%>|$)/],["lang-",/^]*>([\s\S]+?)<\/xmp\b[^>]*>/i],["lang-handlebars",/^]*type\s*=\s*['"]?text\/x-handlebars-template['"]?\b[^>]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-js",/^]*>([\s\S]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\s\S]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i],[PR.PR_DECLARATION,/^{{[#^>/]?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{&?\s*[\w.][^}]*}}/],[PR.PR_DECLARATION,/^{{{>?\s*[\w.][^}]*}}}/],[PR.PR_COMMENT,/^{{![^}]*}}/]]),["handlebars","hbs"]);PR.registerLangHandler(PR.createSimpleLexer([[PR.PR_PLAIN,/^[ \t\r\n\f]+/,null," \t\r\n\f"]],[[PR.PR_STRING,/^\"(?:[^\n\r\f\\\"]|\\(?:\r\n?|\n|\f)|\\[\s\S])*\"/,null],[PR.PR_STRING,/^\'(?:[^\n\r\f\\\']|\\(?:\r\n?|\n|\f)|\\[\s\S])*\'/,null],["lang-css-str",/^url\(([^\)\"\']*)\)/i],[PR.PR_KEYWORD,/^(?:url|rgb|\!important|@import|@page|@media|@charset|inherit)(?=[^\-\w]|$)/i,null],["lang-css-kw",/^(-?(?:[_a-z]|(?:\\[0-9a-f]+ ?))(?:[_a-z0-9\-]|\\(?:\\[0-9a-f]+ ?))*)\s*:/i],[PR.PR_COMMENT,/^\/\*[^*]*\*+(?:[^\/*][^*]*\*+)*\//],[PR.PR_COMMENT,/^(?:)/],[PR.PR_LITERAL,/^(?:\d+|\d*\.\d+)(?:%|[a-z]+)?/i],[PR.PR_LITERAL,/^#(?:[0-9a-f]{3}){1,2}/i],[PR.PR_PLAIN,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i],[PR.PR_PUNCTUATION,/^[^\s\w\'\"]+/]]),["css"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_KEYWORD,/^-?(?:[_a-z]|(?:\\[\da-f]+ ?))(?:[_a-z\d\-]|\\(?:\\[\da-f]+ ?))*/i]]),["css-kw"]);PR.registerLangHandler(PR.createSimpleLexer([],[[PR.PR_STRING,/^[^\)\"\']+/]]),["css-str"]); diff --git a/coverage/lcov-report/sort-arrow-sprite.png b/coverage/lcov-report/sort-arrow-sprite.png deleted file mode 100644 index 6ed6831..0000000 Binary files a/coverage/lcov-report/sort-arrow-sprite.png and /dev/null differ diff --git a/coverage/lcov-report/sorter.js b/coverage/lcov-report/sorter.js deleted file mode 100644 index 2bb296a..0000000 --- a/coverage/lcov-report/sorter.js +++ /dev/null @@ -1,196 +0,0 @@ -/* eslint-disable */ -var addSorting = (function() { - 'use strict'; - var cols, - currentSort = { - index: 0, - desc: false - }; - - // returns the summary table element - function getTable() { - return document.querySelector('.coverage-summary'); - } - // returns the thead element of the summary table - function getTableHeader() { - return getTable().querySelector('thead tr'); - } - // returns the tbody element of the summary table - function getTableBody() { - return getTable().querySelector('tbody'); - } - // returns the th element for nth column - function getNthColumn(n) { - return getTableHeader().querySelectorAll('th')[n]; - } - - function onFilterInput() { - const searchValue = document.getElementById('fileSearch').value; - const rows = document.getElementsByTagName('tbody')[0].children; - for (let i = 0; i < rows.length; i++) { - const row = rows[i]; - if ( - row.textContent - .toLowerCase() - .includes(searchValue.toLowerCase()) - ) { - row.style.display = ''; - } else { - row.style.display = 'none'; - } - } - } - - // loads the search box - function addSearchBox() { - var template = document.getElementById('filterTemplate'); - var templateClone = template.content.cloneNode(true); - templateClone.getElementById('fileSearch').oninput = onFilterInput; - template.parentElement.appendChild(templateClone); - } - - // loads all columns - function loadColumns() { - var colNodes = getTableHeader().querySelectorAll('th'), - colNode, - cols = [], - col, - i; - - for (i = 0; i < colNodes.length; i += 1) { - colNode = colNodes[i]; - col = { - key: colNode.getAttribute('data-col'), - sortable: !colNode.getAttribute('data-nosort'), - type: colNode.getAttribute('data-type') || 'string' - }; - cols.push(col); - if (col.sortable) { - col.defaultDescSort = col.type === 'number'; - colNode.innerHTML = - colNode.innerHTML + ''; - } - } - return cols; - } - // attaches a data attribute to every tr element with an object - // of data values keyed by column name - function loadRowData(tableRow) { - var tableCols = tableRow.querySelectorAll('td'), - colNode, - col, - data = {}, - i, - val; - for (i = 0; i < tableCols.length; i += 1) { - colNode = tableCols[i]; - col = cols[i]; - val = colNode.getAttribute('data-value'); - if (col.type === 'number') { - val = Number(val); - } - data[col.key] = val; - } - return data; - } - // loads all row data - function loadData() { - var rows = getTableBody().querySelectorAll('tr'), - i; - - for (i = 0; i < rows.length; i += 1) { - rows[i].data = loadRowData(rows[i]); - } - } - // sorts the table using the data for the ith column - function sortByIndex(index, desc) { - var key = cols[index].key, - sorter = function(a, b) { - a = a.data[key]; - b = b.data[key]; - return a < b ? -1 : a > b ? 1 : 0; - }, - finalSorter = sorter, - tableBody = document.querySelector('.coverage-summary tbody'), - rowNodes = tableBody.querySelectorAll('tr'), - rows = [], - i; - - if (desc) { - finalSorter = function(a, b) { - return -1 * sorter(a, b); - }; - } - - for (i = 0; i < rowNodes.length; i += 1) { - rows.push(rowNodes[i]); - tableBody.removeChild(rowNodes[i]); - } - - rows.sort(finalSorter); - - for (i = 0; i < rows.length; i += 1) { - tableBody.appendChild(rows[i]); - } - } - // removes sort indicators for current column being sorted - function removeSortIndicators() { - var col = getNthColumn(currentSort.index), - cls = col.className; - - cls = cls.replace(/ sorted$/, '').replace(/ sorted-desc$/, ''); - col.className = cls; - } - // adds sort indicators for current column being sorted - function addSortIndicators() { - getNthColumn(currentSort.index).className += currentSort.desc - ? ' sorted-desc' - : ' sorted'; - } - // adds event listeners for all sorter widgets - function enableUI() { - var i, - el, - ithSorter = function ithSorter(i) { - var col = cols[i]; - - return function() { - var desc = col.defaultDescSort; - - if (currentSort.index === i) { - desc = !currentSort.desc; - } - sortByIndex(i, desc); - removeSortIndicators(); - currentSort.index = i; - currentSort.desc = desc; - addSortIndicators(); - }; - }; - for (i = 0; i < cols.length; i += 1) { - if (cols[i].sortable) { - // add the click event handler on the th so users - // dont have to click on those tiny arrows - el = getNthColumn(i).querySelector('.sorter').parentElement; - if (el.addEventListener) { - el.addEventListener('click', ithSorter(i)); - } else { - el.attachEvent('onclick', ithSorter(i)); - } - } - } - } - // adds sorting functionality to the UI - return function() { - if (!getTable()) { - return; - } - cols = loadColumns(); - loadData(); - addSearchBox(); - addSortIndicators(); - enableUI(); - }; -})(); - -window.addEventListener('load', addSorting); diff --git a/coverage/lcov.info b/coverage/lcov.info deleted file mode 100644 index e69de29..0000000 diff --git a/docker-compose.yml b/docker-compose.yml index 2f0f572..9c052c9 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,13 +3,14 @@ version: '3.7' services: redis: image: redis:7.0.15 - container_name: gpt_redis + container_name: news_redis expose: - ${REDIS_PORT} volumes: - ./redis.conf:/etc/redis/redis.conf - ./redis_data:/data\ command: redis-server --requirepass ${REDIS_PASS} + restart: always networks: - proxy @@ -33,6 +34,8 @@ services: reservations: cpus: '0.15' memory: 300M + # ports: + # - 5500:5500 expose: - ${APP_PORT} env_file: diff --git a/package-deploy.json b/package-deploy.json index 67145d3..25c3083 100755 --- a/package-deploy.json +++ b/package-deploy.json @@ -32,12 +32,12 @@ "devDependencies": { "@types/cookie-parser": "^1", "@types/express": "^4.17.21", - "@types/node": "^20.11.19", - "@typescript-eslint/eslint-plugin": "^6.19.0", - "@typescript-eslint/parser": "^6.19.0", - "eslint": "^8.56.0", + "@types/node": "^20.11.24", + "@typescript-eslint/eslint-plugin": "^7.1.0", + "@typescript-eslint/parser": "^7.1.0", + "eslint": "^8.57.0", "eslint-config-airbnb-base": "^15.0.0", - "eslint-config-airbnb-typescript": "^17.1.0", + "eslint-config-airbnb-typescript": "^18.0.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.29.1", "prettier": "^3.2.5", diff --git a/package.json b/package.json index b7f291d..e225fef 100755 --- a/package.json +++ b/package.json @@ -40,13 +40,13 @@ "@types/cookie-parser": "^1", "@types/express": "^4.17.21", "@types/jest": "^29.5.12", - "@types/node": "^20.11.19", - "@typescript-eslint/eslint-plugin": "^6.19.0", - "@typescript-eslint/parser": "^6.19.0", + "@types/node": "^20.11.24", + "@typescript-eslint/eslint-plugin": "^7.1.0", + "@typescript-eslint/parser": "^7.1.0", "dotenv": "^16.4.5", - "eslint": "^8.56.0", + "eslint": "^8.57.0", "eslint-config-airbnb-base": "^15.0.0", - "eslint-config-airbnb-typescript": "^17.1.0", + "eslint-config-airbnb-typescript": "^18.0.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.29.1", "jest": "^29.7.0", diff --git a/src/controllers/client/client.ctl.ts b/src/controllers/client/client.ctl.ts index 34055e4..4859b44 100644 --- a/src/controllers/client/client.ctl.ts +++ b/src/controllers/client/client.ctl.ts @@ -53,11 +53,11 @@ export class ClientController { @Post('logout') async logoutController(@Body() request: ClientLogoutRequest) { try { - const { uuid: clientUuid } = await clientLogoutValidator(request); + const { email: encodedEmail } = await clientLogoutValidator(request); - const uuid = await this.client.logout(clientUuid); + const message = await this.client.logout(encodedEmail); - return new SetResponse(200, { uuid }); + return new SetResponse(200, { message }); } catch (error) { return new SetErrorResponse(error); } @@ -66,12 +66,12 @@ export class ClientController { @Post('myPage') async myPageController(@Body() request: ClientMyPageRequest) { try { - const { uuid } = await clientMyPageValidator(request); + const { email: encodedEmail } = await clientMyPageValidator(request); - const email = await this.client.myPage(uuid); + const results = await this.client.myPage(encodedEmail); return new SetResponse(200, { - email, + results, }); } catch (error) { return new SetErrorResponse(error); diff --git a/src/main.ts b/src/main.ts index 603311f..34e1e89 100755 --- a/src/main.ts +++ b/src/main.ts @@ -1,9 +1,9 @@ import { Logger } from '@nestjs/common'; -import { CorsOptions } from '@nestjs/common/interfaces/external/cors-options.interface'; import { NestFactory } from '@nestjs/core'; import { NestExpressApplication } from '@nestjs/platform-express'; import { AppModule } from 'app.module'; import helmet from 'helmet'; +import { AccountManager } from 'providers/auth/account-manager.pvd'; import { shutdown } from 'utils/shutdown.utils'; process.env.TZ = 'Asia/Seoul'; @@ -17,15 +17,17 @@ export const bootstrap = async () => { const port = Number(process.env.APP_PORT); - const corsOptions: CorsOptions = { - origin: 'https://scrape.donghyuns.com', - allowedHeaders: [ 'GET', 'POST', "Content-Type", "key" ], - optionsSuccessStatus: 204, - preflightContinue: false, - }; + const accountManager = new AccountManager(); + await accountManager.start(); + // const corsOptions: CorsOptions = { + // origin: 'https://scrape.donghyuns.com', + // allowedHeaders: ['GET', 'POST', 'Content-Type', 'key'], + // optionsSuccessStatus: 204, + // preflightContinue: false, + // }; app.use(helmet()); - app.enableCors(corsOptions); + app.enableCors(); app.enableVersioning(); app.useBodyParser('json'); app.enableShutdownHooks(); diff --git a/src/providers/auth/account-manager.pvd.ts b/src/providers/auth/account-manager.pvd.ts index 7abd010..844ad2d 100644 --- a/src/providers/auth/account-manager.pvd.ts +++ b/src/providers/auth/account-manager.pvd.ts @@ -1,9 +1,7 @@ import { RedisError } from '@errors/redis.error'; -import { cryptData } from '@libraries/client/encrypt.lib'; import { Injectable } from '@nestjs/common'; import { ClientLogger, ManagerLogger } from '@utils/logger.util'; import { RedisClientType, createClient } from 'redis'; -import { clearIntervalAsync, setIntervalAsync } from 'set-interval-async'; import { ClientLoginItem } from 'types/client.type'; @Injectable() @@ -12,14 +10,12 @@ export class AccountManager { private keyList: Array; - private redisUrl: string; - constructor() { // eslint-disable-next-line max-len - this.redisUrl = `redis://${process.env.REDIS_USER}:${process.env.REDIS_PASS}@${process.env.REDIS_HOST}:${process.env.REDIS_PORT}`; + // this.redisUrl = `redis://${process.env.REDIS_USER}:${process.env.REDIS_PASS}@${process.env.REDIS_HOST}:${process.env.REDIS_PORT}`; this.redis = createClient({ - url: this.redisUrl, + url: process.env.REDIS_HOST, username: process.env.REDIS_USER, password: process.env.REDIS_PASS, }); @@ -27,6 +23,24 @@ export class AccountManager { this.keyList = []; } + public async start() { + try { + await this.redis.connect(); + + ManagerLogger.info('[START] Redis Connected'); + } catch (error) { + ManagerLogger.error('[START] Redis Connected Error: %o', { + error, + }); + + throw new RedisError( + '[START] Redis Connected', + 'Redis Connected Error.', + error instanceof Error ? error : new Error(JSON.stringify(error)), + ); + } + } + /** * * @param clientUuid @@ -34,83 +48,6 @@ export class AccountManager { * @param password * @returns */ - public async setLoginUser(email: string, uuid: string, password: string) { - const { encodedData: encodedEmail, encodedToken: encodedEmailToken } = cryptData(email); - - const isLogined = await this.getItem(encodedEmail); - - ManagerLogger.debug('[ACCOUNT] Searching User Info: %o', { - isLogined, - encodedEmail, - }); - - if (isLogined === null) { - this.keyList.push(encodedEmail); - await this.setItem(encodedEmail, encodedEmailToken, uuid, password); - - if (this.keyList.length >= 5000) { - ClientLogger.debug('[AccountManager] keyList maximum reached. shift()'); - this.keyList.shift(); - } - - ClientLogger.info('[ACCOUNT] Set Finished'); - - return encodedEmail; - } - - ManagerLogger.debug('[ACCOUNT] Found User Key: %o', { - uuid, - }); - - const interval = 1000 * 60 * 10; - - const timer = setIntervalAsync(async () => { - const isExsit = await this.getItem(encodedEmail); - - if (isExsit === null) { - ManagerLogger.info('[ACCOUNT] It is not existing user. Clear Interval.'); - - ManagerLogger.debug('[ACCOUNT] Client Map Inspection: %o', { - isExsit, - uuid, - }); - - clearIntervalAsync(timer); - } else { - ManagerLogger.info('[ACCOUNT] Expiration time. Delete user.'); - - ManagerLogger.debug('[ACCOUNT] Client Map Inspection: %o', { - uuid, - }); - - await this.deleteItem(encodedEmail); - } - }, interval); - - return encodedEmail; - } - - public async deleteLogoutUser(encodedEmail: string) { - ManagerLogger.debug('[ACCOUNT] Client Data: %o', { - encodedEmail, - }); - - const isExist = await this.getItem(encodedEmail); - - if (isExist === null) { - ManagerLogger.info('[ACCOUNT] Not Matchin Data found. Ignore.'); - - return false; - } - - await this.deleteItem(encodedEmail); - - ManagerLogger.debug('[ACCOUNT] Client Map Delete Inspection: %o', { - encodedEmail, - }); - - return true; - } public async deleteItem(encodedEmail: string) { try { @@ -118,17 +55,11 @@ export class AccountManager { if (index > -1) { this.keyList.splice(index, 1); + await this.redis.connect(); await this.redis.del(encodedEmail); - + await this.redis.disconnect(); ManagerLogger.info('[DELETE] Deleted User Info from Key List and Cache Data'); } - - ManagerLogger.debug('[DELETE] Client Map Inspection: %o', { - encodedEmail, - index, - // map: this.userMap, - userKey: this.keyList, - }); } catch (error) { ManagerLogger.error('[DELETE] Delete User Item Error: %o', { error, @@ -144,6 +75,15 @@ export class AccountManager { public async setItem(encodedEmail: string, encodedToken: string, uuid: string, password: string) { try { + if (this.keyList.length >= 5000) { + ClientLogger.debug('[AccountManager] keyList maximum reached. shift()'); + this.keyList.shift(); + } + + const isKeyExist = this.keyList.findIndex((item) => item === encodedEmail); + + if (isKeyExist > -1) return false; + const setItem: ClientLoginItem = { token: encodedToken, uuid, @@ -152,7 +92,11 @@ export class AccountManager { // this.userMap.set( key, { uuid, address, privateKey, pkToken } ); this.keyList.push(encodedEmail); + await this.redis.connect(); await this.redis.set(encodedEmail, JSON.stringify(setItem)); + await this.redis.disconnect(); + + return true; } catch (error) { ManagerLogger.error('[SET] User Info Error: %o', { error, @@ -181,7 +125,9 @@ export class AccountManager { ManagerLogger.info('[GET] Found key from keyList'); + await this.redis.connect(); const gotItem = await this.redis.get(key); + await this.redis.disconnect(); if (gotItem === null) return null; diff --git a/src/providers/client/client-prisma.pvd.ts b/src/providers/client/client-prisma.pvd.ts index 133fa12..a2c2f7b 100644 --- a/src/providers/client/client-prisma.pvd.ts +++ b/src/providers/client/client-prisma.pvd.ts @@ -112,13 +112,14 @@ export class ClientPrismaLibrary extends PrismaClient { } } - async updateClientLoginStatus(clientUuid: string, isLogined: number) { + async updateClientLoginStatus(email: string, clientUuid: string, isLogined: number) { try { await this.client.update({ data: { is_logined: isLogined, }, where: { + email, uuid: clientUuid, }, }); @@ -135,22 +136,57 @@ export class ClientPrismaLibrary extends PrismaClient { } } - async getMyPageInfo(clientUuid: string) { + async getMyPageInfo(email: string, clientUuid: string) { try { const result = await this.client.findFirst({ select: { - email: true, + liked_ml_posts: { + select: { + postUuid: true, + ml_news: { + select: { + title: true, + link: true, + founded: true, + }, + }, + }, + }, + + liked_geek_posts: { + select: { + geek_news: { + select: { + post: true, + link: true, + descLink: true, + founded: true, + }, + }, + }, + }, + + liked_hacker_posts: { + select: { + hacker_news: { + select: { + post: true, + link: true, + founded: true, + }, + }, + }, + }, }, where: { + email, uuid: clientUuid, }, }); if (result === null) throw new ClientError('[MYPAGE] Get My Page', 'No User Found'); - const { email } = result; - - return email; + return result; } catch (error) { throw new ClientError('[MYPAGE] Get My Page', 'Get My Page Error.'); } diff --git a/src/providers/client/client.pvd.ts b/src/providers/client/client.pvd.ts index def304f..981beda 100644 --- a/src/providers/client/client.pvd.ts +++ b/src/providers/client/client.pvd.ts @@ -1,8 +1,9 @@ import { ClientError } from '@errors/client.error'; -import { comparePassword } from '@libraries/client/decrypt.lib'; +import { comparePassword, decrypt } from '@libraries/client/decrypt.lib'; import { cryptData } from '@libraries/client/encrypt.lib'; import { Injectable } from '@nestjs/common'; import { ClientLogger } from '@utils/logger.util'; +import { clearIntervalAsync, setIntervalAsync } from 'set-interval-async'; import { HadaNewsReturn } from 'types/geek.type'; import { AccountManager } from '../auth/account-manager.pvd'; import { ClientPrismaLibrary } from './client-prisma.pvd'; @@ -66,9 +67,53 @@ export class ClientProvider { throw new ClientError('[LOGIN] Password Matching ', ' Password Matching is Not Match. Reject.'); } - await this.accountManager.setLoginUser(email, uuid, foundPassword); + // Set User Info into REDIS + const { encodedData: encodedEmail, encodedToken: encodedEmailToken } = cryptData(email); - await this.prisma.updateClientLoginStatus(uuid, 1); + ClientLogger.debug('[ACCOUNT] Searching User Info: %o', { + encodedEmail, + }); + + const isLogined = await this.accountManager.getItem(encodedEmail); + + if (isLogined === null) { + await this.accountManager.setItem(encodedEmail, encodedEmailToken, uuid, password); + + ClientLogger.info('[ACCOUNT] Set Finished'); + + return encodedEmail; + } + + ClientLogger.debug('[ACCOUNT] Found User Key: %o', { + uuid, + }); + + const interval = 1000 * 60 * 60; + + const timer = setIntervalAsync(async () => { + const isExsit = await this.accountManager.getItem(encodedEmail); + + if (isExsit === null) { + ClientLogger.info('[ACCOUNT] It is not existing user. Clear Interval.'); + + ClientLogger.debug('[ACCOUNT] Client Map Inspection: %o', { + isExsit, + uuid, + }); + + clearIntervalAsync(timer); + } else { + ClientLogger.info('[ACCOUNT] Expiration time. Delete user.'); + + ClientLogger.debug('[ACCOUNT] Client Map Inspection: %o', { + uuid, + }); + + await this.accountManager.deleteItem(encodedEmail); + } + }, interval); + + await this.prisma.updateClientLoginStatus(email, uuid, 1); return uuid; } catch (error) { @@ -84,25 +129,29 @@ export class ClientProvider { } } - async logout(clientUuid: string) { + async logout(encodedEmail: string) { try { - const foundKey = await this.accountManager.getItem(clientUuid); + const foundKey = await this.accountManager.getItem(encodedEmail); if (foundKey === null) { ClientLogger.debug('[LOGIN] No Matching User Found: %o', { - clientUuid, + encodedEmail, }); throw new ClientError('[LOGIN] Finding Matching User Info', 'No Matching User Found'); } - await this.prisma.updateClientLoginStatus(clientUuid, 0); + const { token, uuid } = foundKey; + + const email = decrypt(encodedEmail, token); - const deleteItem = await this.accountManager.deleteLogoutUser(clientUuid); + await this.prisma.updateClientLoginStatus(email, uuid, 0); + + const deleteItem = await this.accountManager.deleteItem(encodedEmail); if (deleteItem === null) throw new ClientError('[LOGOUT] Logout', 'No Data Found. Ignore.'); - return 'Logout Success'; + return 'Logout'; } catch (error) { ClientLogger.error('[LOGIN] Login Error: %o', { error, @@ -116,26 +165,29 @@ export class ClientProvider { } } - async myPage(clientUuid: string) { + async myPage(encodedEmail: string) { try { - const foundKey = await this.accountManager.getItem(clientUuid); + const foundKey = await this.accountManager.getItem(encodedEmail); if (foundKey === null) { ClientLogger.debug('[MYPAGE] No Matching User Found: %o', { - clientUuid, + encodedEmail, }); throw new ClientError('[MYPAGE] Finding Matching User Info', 'No Matching User Found'); } ClientLogger.debug('[MYPAGE] Found Key Item: %o', { - clientUuid, + encodedEmail, foundKey, }); - const email = await this.prisma.getMyPageInfo(clientUuid); + const { token, uuid } = foundKey; + const email = decrypt(encodedEmail, token); + + const result = await this.prisma.getMyPageInfo(email, uuid); - return email; + return result; } catch (error) { ClientLogger.error('[MYPAGE] Get My Page Error: %o', { error, diff --git a/src/types/client.type.ts b/src/types/client.type.ts index e777bfb..5135370 100644 --- a/src/types/client.type.ts +++ b/src/types/client.type.ts @@ -9,7 +9,7 @@ export interface ClientLoginRequest { } export interface ClientLogoutRequest { - uuid: string; + email: string; } export interface ClientLoginMapKey { @@ -28,7 +28,7 @@ export interface ClientLoginItem { } export interface ClientMyPageRequest { - uuid: string; + email: string; } export interface ClientMyPageStarNewsRequest { diff --git a/src/validators/client/logout.validator.ts b/src/validators/client/logout.validator.ts index f704c05..5400273 100644 --- a/src/validators/client/logout.validator.ts +++ b/src/validators/client/logout.validator.ts @@ -6,7 +6,7 @@ import { z } from 'zod'; export const clientLogoutValidator = async (request: ClientLogoutRequest) => { try { const scheme = z.object({ - uuid: z.string(), + email: z.string(), }); const parsed = await scheme.parseAsync(request); diff --git a/src/validators/client/mypage.validator.ts b/src/validators/client/mypage.validator.ts index 1f9a5b0..39ad6c3 100644 --- a/src/validators/client/mypage.validator.ts +++ b/src/validators/client/mypage.validator.ts @@ -6,7 +6,7 @@ import { z } from 'zod'; export const clientMyPageValidator = async (request: ClientMyPageRequest) => { try { const scheme = z.object({ - uuid: z.string(), + email: z.string(), }); const parsed = await scheme.parseAsync(request); diff --git a/yarn.lock b/yarn.lock index a2d1de3..d9e0eb9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1314,7 +1314,7 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*, @types/node@npm:^20.11.19": +"@types/node@npm:*, @types/node@npm:^20.11.24": version: 20.11.24 resolution: "@types/node@npm:20.11.24" dependencies: @@ -1395,15 +1395,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^6.19.0": - version: 6.21.0 - resolution: "@typescript-eslint/eslint-plugin@npm:6.21.0" +"@typescript-eslint/eslint-plugin@npm:^7.1.0": + version: 7.1.0 + resolution: "@typescript-eslint/eslint-plugin@npm:7.1.0" dependencies: "@eslint-community/regexpp": "npm:^4.5.1" - "@typescript-eslint/scope-manager": "npm:6.21.0" - "@typescript-eslint/type-utils": "npm:6.21.0" - "@typescript-eslint/utils": "npm:6.21.0" - "@typescript-eslint/visitor-keys": "npm:6.21.0" + "@typescript-eslint/scope-manager": "npm:7.1.0" + "@typescript-eslint/type-utils": "npm:7.1.0" + "@typescript-eslint/utils": "npm:7.1.0" + "@typescript-eslint/visitor-keys": "npm:7.1.0" debug: "npm:^4.3.4" graphemer: "npm:^1.4.0" ignore: "npm:^5.2.4" @@ -1411,73 +1411,73 @@ __metadata: semver: "npm:^7.5.4" ts-api-utils: "npm:^1.0.1" peerDependencies: - "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha - eslint: ^7.0.0 || ^8.0.0 + "@typescript-eslint/parser": ^7.0.0 + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: 10/a57de0f630789330204cc1531f86cfc68b391cafb1ba67c8992133f1baa2a09d629df66e71260b040de4c9a3ff1252952037093c4128b0d56c4dbb37720b4c1d + checksum: 10/f0b6b6e6ae2afee1df8dd2fd0c56588f9bb600468be9f255e033709a53371c6434da687e75dcb673503ef4f0416226f4ca3c94c65272828106e39b56aac87334 languageName: node linkType: hard -"@typescript-eslint/parser@npm:^6.19.0": - version: 6.21.0 - resolution: "@typescript-eslint/parser@npm:6.21.0" +"@typescript-eslint/parser@npm:^7.1.0": + version: 7.1.0 + resolution: "@typescript-eslint/parser@npm:7.1.0" dependencies: - "@typescript-eslint/scope-manager": "npm:6.21.0" - "@typescript-eslint/types": "npm:6.21.0" - "@typescript-eslint/typescript-estree": "npm:6.21.0" - "@typescript-eslint/visitor-keys": "npm:6.21.0" + "@typescript-eslint/scope-manager": "npm:7.1.0" + "@typescript-eslint/types": "npm:7.1.0" + "@typescript-eslint/typescript-estree": "npm:7.1.0" + "@typescript-eslint/visitor-keys": "npm:7.1.0" debug: "npm:^4.3.4" peerDependencies: - eslint: ^7.0.0 || ^8.0.0 + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: 10/4d51cdbc170e72275efc5ef5fce48a81ec431e4edde8374f4d0213d8d370a06823e1a61ae31d502a5f1b0d1f48fc4d29a1b1b5c2dcf809d66d3872ccf6e46ac7 + checksum: 10/39238d37f5a5f7058371ee3882fb7cd8a4579883fc5f13fda645c151fcf8d15e4c0db3ea7ffa7915a55c82451b544e9340c0228b45b83085158cb97974112f19 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:6.21.0": - version: 6.21.0 - resolution: "@typescript-eslint/scope-manager@npm:6.21.0" +"@typescript-eslint/scope-manager@npm:7.1.0": + version: 7.1.0 + resolution: "@typescript-eslint/scope-manager@npm:7.1.0" dependencies: - "@typescript-eslint/types": "npm:6.21.0" - "@typescript-eslint/visitor-keys": "npm:6.21.0" - checksum: 10/fe91ac52ca8e09356a71dc1a2f2c326480f3cccfec6b2b6d9154c1a90651ab8ea270b07c67df5678956c3bbf0bbe7113ab68f68f21b20912ea528b1214197395 + "@typescript-eslint/types": "npm:7.1.0" + "@typescript-eslint/visitor-keys": "npm:7.1.0" + checksum: 10/3fb18de864331739c1b04fe9e3bb5d926e2fdf0d1fea2871181f68d0fb52325cbc9a5b81da58b7fe7f22d6d58d62b21c83460907146bc2f54ef0720fb3f9037f languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:6.21.0": - version: 6.21.0 - resolution: "@typescript-eslint/type-utils@npm:6.21.0" +"@typescript-eslint/type-utils@npm:7.1.0": + version: 7.1.0 + resolution: "@typescript-eslint/type-utils@npm:7.1.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:6.21.0" - "@typescript-eslint/utils": "npm:6.21.0" + "@typescript-eslint/typescript-estree": "npm:7.1.0" + "@typescript-eslint/utils": "npm:7.1.0" debug: "npm:^4.3.4" ts-api-utils: "npm:^1.0.1" peerDependencies: - eslint: ^7.0.0 || ^8.0.0 + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: 10/d03fb3ee1caa71f3ce053505f1866268d7ed79ffb7fed18623f4a1253f5b8f2ffc92636d6fd08fcbaf5bd265a6de77bf192c53105131e4724643dfc910d705fc + checksum: 10/439e6fadab3df3c21adfd651af4e605e1020c86c8c2400b0127c2ee914646bc73945b4add31ca7201cafeead261ad2958362c339ebdfc0798064d56daeb60661 languageName: node linkType: hard -"@typescript-eslint/types@npm:6.21.0": - version: 6.21.0 - resolution: "@typescript-eslint/types@npm:6.21.0" - checksum: 10/e26da86d6f36ca5b6ef6322619f8ec55aabcd7d43c840c977ae13ae2c964c3091fc92eb33730d8be08927c9de38466c5323e78bfb270a9ff1d3611fe821046c5 +"@typescript-eslint/types@npm:7.1.0": + version: 7.1.0 + resolution: "@typescript-eslint/types@npm:7.1.0" + checksum: 10/34801a14ea1444a1707de5bd3211f0ea53afc82a3c6c4543092f123267389da607c498d1a7de554ac9f071e6ef488238728a5f279ff2abaa0cbdfaa733899b67 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:6.21.0": - version: 6.21.0 - resolution: "@typescript-eslint/typescript-estree@npm:6.21.0" +"@typescript-eslint/typescript-estree@npm:7.1.0": + version: 7.1.0 + resolution: "@typescript-eslint/typescript-estree@npm:7.1.0" dependencies: - "@typescript-eslint/types": "npm:6.21.0" - "@typescript-eslint/visitor-keys": "npm:6.21.0" + "@typescript-eslint/types": "npm:7.1.0" + "@typescript-eslint/visitor-keys": "npm:7.1.0" debug: "npm:^4.3.4" globby: "npm:^11.1.0" is-glob: "npm:^4.0.3" @@ -1487,34 +1487,34 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10/b32fa35fca2a229e0f5f06793e5359ff9269f63e9705e858df95d55ca2cd7fdb5b3e75b284095a992c48c5fc46a1431a1a4b6747ede2dd08929dc1cbacc589b8 + checksum: 10/7dfc6fc70ff00875728ce5d85a3c5d6cb01435082b20ff9301ebe4d8e4a31a0c997282c762c636937bd66a40b4e0154e2ce98f85d888a6c46d433e9a24c46c4c languageName: node linkType: hard -"@typescript-eslint/utils@npm:6.21.0": - version: 6.21.0 - resolution: "@typescript-eslint/utils@npm:6.21.0" +"@typescript-eslint/utils@npm:7.1.0": + version: 7.1.0 + resolution: "@typescript-eslint/utils@npm:7.1.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" "@types/json-schema": "npm:^7.0.12" "@types/semver": "npm:^7.5.0" - "@typescript-eslint/scope-manager": "npm:6.21.0" - "@typescript-eslint/types": "npm:6.21.0" - "@typescript-eslint/typescript-estree": "npm:6.21.0" + "@typescript-eslint/scope-manager": "npm:7.1.0" + "@typescript-eslint/types": "npm:7.1.0" + "@typescript-eslint/typescript-estree": "npm:7.1.0" semver: "npm:^7.5.4" peerDependencies: - eslint: ^7.0.0 || ^8.0.0 - checksum: 10/b404a2c55a425a79d054346ae123087d30c7ecf7ed7abcf680c47bf70c1de4fabadc63434f3f460b2fa63df76bc9e4a0b9fa2383bb8a9fcd62733fb5c4e4f3e3 + eslint: ^8.56.0 + checksum: 10/26d64094d8b828ce6cfea660c95cdbd4d0193d338646fc773312093388bc781653fc1ca16977b3be5288579fe43f14c7108fc431da66dd95b6ed680ad44712a0 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:6.21.0": - version: 6.21.0 - resolution: "@typescript-eslint/visitor-keys@npm:6.21.0" +"@typescript-eslint/visitor-keys@npm:7.1.0": + version: 7.1.0 + resolution: "@typescript-eslint/visitor-keys@npm:7.1.0" dependencies: - "@typescript-eslint/types": "npm:6.21.0" + "@typescript-eslint/types": "npm:7.1.0" eslint-visitor-keys: "npm:^3.4.1" - checksum: 10/30422cdc1e2ffad203df40351a031254b272f9c6f2b7e02e9bfa39e3fc2c7b1c6130333b0057412968deda17a3a68a578a78929a8139c6acef44d9d841dc72e1 + checksum: 10/c3e98ebf166fd1854adb0e9599dc108cdbbd95f6eb099d31deae2fd1d4df8fcd8dc9c24ad4f509b961ad900b474c246f6b4b228b5711cc504106c3e0f751a11c languageName: node linkType: hard @@ -2772,17 +2772,16 @@ __metadata: languageName: node linkType: hard -"eslint-config-airbnb-typescript@npm:^17.1.0": - version: 17.1.0 - resolution: "eslint-config-airbnb-typescript@npm:17.1.0" +"eslint-config-airbnb-typescript@npm:^18.0.0": + version: 18.0.0 + resolution: "eslint-config-airbnb-typescript@npm:18.0.0" dependencies: eslint-config-airbnb-base: "npm:^15.0.0" peerDependencies: - "@typescript-eslint/eslint-plugin": ^5.13.0 || ^6.0.0 - "@typescript-eslint/parser": ^5.0.0 || ^6.0.0 - eslint: ^7.32.0 || ^8.2.0 - eslint-plugin-import: ^2.25.3 - checksum: 10/a2238d820909ac005704e04d29ed495cebbe024869c488330273ea108e18cbf74b6b13e09d54d22a598fe793b9ed5ae593a7e8f9bdc6ea17614d5f2add340960 + "@typescript-eslint/eslint-plugin": ^7.0.0 + "@typescript-eslint/parser": ^7.0.0 + eslint: ^8.56.0 + checksum: 10/b913670baf3aa457aa1d514ea63813e76f2232a7efdb149ce96cecb10d836cadea6776a304529f1ae371d2e721479540461e89735bdde85a949e2bf62eb3187c languageName: node linkType: hard @@ -2864,7 +2863,7 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^8.56.0": +"eslint@npm:^8.57.0": version: 8.57.0 resolution: "eslint@npm:8.57.0" dependencies: @@ -6266,15 +6265,15 @@ __metadata: "@types/cookie-parser": "npm:^1" "@types/express": "npm:^4.17.21" "@types/jest": "npm:^29.5.12" - "@types/node": "npm:^20.11.19" - "@typescript-eslint/eslint-plugin": "npm:^6.19.0" - "@typescript-eslint/parser": "npm:^6.19.0" + "@types/node": "npm:^20.11.24" + "@typescript-eslint/eslint-plugin": "npm:^7.1.0" + "@typescript-eslint/parser": "npm:^7.1.0" cookie-parser: "npm:^1.4.6" date-fns: "npm:^2.30.0" dotenv: "npm:^16.4.5" - eslint: "npm:^8.56.0" + eslint: "npm:^8.57.0" eslint-config-airbnb-base: "npm:^15.0.0" - eslint-config-airbnb-typescript: "npm:^17.1.0" + eslint-config-airbnb-typescript: "npm:^18.0.0" eslint-config-prettier: "npm:^9.1.0" eslint-plugin-import: "npm:^2.29.1" express: "npm:^4.18.2"