handle session keys in file

Signed-off-by: shmck <shawn.j.mckay@gmail.com>

Author: ShMcK

src/services/node/index.ts

@@ -14,26 +14,34 @@ interface ExecParams {
 dir?: string
 }
 
+// correct paths to be from workspace root rather than extension folder
+constgetWorkspacePath=(...paths: string[])=>{
+returnjoin(WORKSPACE_ROOT, ...paths)
+}
+
 exportconstexec=(params: ExecParams): Promise<{stdout: string;stderr: string}>|never=>{
 constcwd=join(WORKSPACE_ROOT,params.dir||'')
 returnasyncExec(params.command,{ cwd })
 }
 
 exportconstexists=(...paths: string[]): boolean|never=>{
-returnfs.existsSync(join(WORKSPACE_ROOT,...paths))
+returnfs.existsSync(getWorkspacePath(...paths))
 }
 
 exportconstremoveFile=(...paths: string[])=>{
-returnasyncRemoveFile(join(WORKSPACE_ROOT,...paths))
+returnasyncRemoveFile(getWorkspacePath(...paths))
 }
 
-exportconstreadFile=(...paths: string[])=>{
-returnasyncReadFile(join(...paths),'utf8')
+exportconstreadFile=(...paths: string[]): Promise<string|void>=>{
+constfilePath=getWorkspacePath(...paths)
+returnasyncReadFile(getWorkspacePath(...paths),'utf8').catch((err)=>{
+console.warn(`Failed to read from ${filePath}`)
+})
 }
 
-exportconstwriteFile=(data: any, ...paths: string[])=>{
-constfilePath=join(...paths)
+exportconstwriteFile=(data: any, ...paths: string[]): Promise<void>=>{
+constfilePath=getWorkspacePath(...paths)
 returnasyncWriteFile(filePath,JSON.stringify(data)).catch((err)=>{
-console.error(`Failed to write to ${filePath}`)
+console.warn(`Failed to write to ${filePath}`)
 })
 }

src/services/storage/index.ts

@@ -22,36 +22,53 @@ class Storage<T> {
 if(value){
 returnJSON.parse(value)
 }elseif(SESSION_FILE_PATH){
-// optionally read from file as a fallback to localstorage
-constsessionFile=awaitreadFile(SESSION_FILE_PATH)
 try{
+// optionally read from file as a fallback to local storage
+constsessionFile=awaitreadFile(SESSION_FILE_PATH)
+if(!sessionFile){
+thrownewError('No session file found')
+}
 constsession=JSON.parse(sessionFile)
-if(session&&session[this.key]){
-// TODO: validate session
-returnsession[this.key]
+
+if(session){
+constkeys=Object.keys(session)
+// validate session
+if(keys.length){
+// should only be one
+this.key=keys[0]
+returnsession[this.key]
+}
 }
 }catch(err){
-console.error(`Failed to parse session file: ${SESSION_FILE_PATH}`)
+console.warn(`Failed to read or parse session file: ${SESSION_FILE_PATH}`)
 }
 }
 returnthis.defaultValue
 }
 publicset=(value: T): void=>{
 conststringValue=JSON.stringify(value)
 this.storage.update(this.key,stringValue)
+this.writeToSessionFile(stringValue)
 }
 publicupdate=async(value: T): Promise<void>=>{
 constcurrent=awaitthis.get()
 constnext=JSON.stringify({
  ...current,
  ...value,
 })
-this.storage.update(this.key,next).then(()=>{
-// optionally write to file
-if(SESSION_FILE_PATH){
-writeFile(this.storage,SESSION_FILE_PATH)
+awaitthis.storage.update(this.key,next)
+
+this.writeToSessionFile(next)
+}
+publicwriteToSessionFile(data: string){
+// optionally write to file
+if(SESSION_FILE_PATH){
+try{
+writeFile({[this.key]: data},SESSION_FILE_PATH)
+}catch(err: any){
+console.warn(`Failed to write coderoad session to path: ${SESSION_FILE_PATH}`)
 }
-})
+}
 }
 publicreset=()=>{
 this.set(this.defaultValue)