change to use storage path

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

Author: ShMcK

src/environment.ts

@@ -48,4 +48,4 @@ export const CONTENT_SECURITY_POLICY_EXEMPTIONS: string | null =
 exportconstWEBHOOK_TOKEN=process.env.CODEROAD_WEBHOOK_TOKEN||null
 
 // a path to write session state to a file. Useful for maintaining session across containers
-exportconstSESSION_FILE_PATH=process.env.CODEROAD_SESSION_FILE_PATH||null
+exportconstSESSION_STORAGE_PATH=process.env.CODEROAD_STORAGE_PATH||null

src/services/context/state/Position.ts

@@ -19,6 +19,7 @@ class Position {
 setTutorial(workspaceState: vscode.Memento,tutorial: TT.Tutorial): void{
 this.storage=newStorage<T.Position>({
 key: `coderoad:position:${tutorial.id}:${tutorial.version}`,
+filePath: 'coderoad_position',
 storage: workspaceState,
  defaultValue,
 })

src/services/context/state/Tutorial.ts

@@ -9,6 +9,7 @@ class Tutorial {
 constructor(workspaceState: vscode.Memento){
 this.storage=newStorage<TT.Tutorial|null>({
 key: 'coderoad:currentTutorial',
+filePath: 'coderoad_tutorial',
 storage: workspaceState,
 defaultValue: null,
 })

src/services/node/index.ts

@@ -35,13 +35,13 @@ export const removeFile = (...paths: string[]) => {
 exportconstreadFile=(...paths: string[]): Promise<string|void>=>{
 constfilePath=getWorkspacePath(...paths)
 returnasyncReadFile(getWorkspacePath(...paths),'utf8').catch((err)=>{
-console.warn(`Failed to read from ${filePath}`)
+console.warn(`Failed to read from ${filePath}: ${err.message}`)
 })
 }
 
 exportconstwriteFile=(data: any, ...paths: string[]): Promise<void>=>{
 constfilePath=getWorkspacePath(...paths)
 returnasyncWriteFile(filePath,JSON.stringify(data)).catch((err)=>{
-console.warn(`Failed to write to ${filePath}`)
+console.warn(`Failed to write to ${filePath}: ${err.message}`)
 })
 }

src/services/storage/index.ts

@@ -1,6 +1,6 @@
 import*asvscodefrom'vscode'
 import{readFile,writeFile}from'../node'
-import{SESSION_FILE_PATH}from'../../environment'
+import{SESSION_STORAGE_PATH}from'../../environment'
 
 // NOTE: localStorage is not available on client
 // and must be stored in editor
@@ -10,37 +10,47 @@ import { SESSION_FILE_PATH } from '../../environment'
 // forcing it to be passed in through activation and down to other tools
 classStorage<T>{
 privatekey: string
+privatefilePath: string
 privatestorage: vscode.Memento
 privatedefaultValue: T
-constructor({ key, storage, defaultValue }: {key: string;storage: vscode.Memento;defaultValue: T}){
+constructor({
+ key,
+ filePath,
+ storage,
+ defaultValue,
+}: {
+key: string
+filePath: string
+storage: vscode.Memento
+defaultValue: T
+}){
 this.storage=storage
 this.key=key
+this.filePath=filePath
 this.defaultValue=defaultValue
 }
 publicget=async(): Promise<T>=>{
 constvalue: string|undefined=awaitthis.storage.get(this.key)
 if(value){
 returnJSON.parse(value)
-}elseif(SESSION_FILE_PATH){
+}elseif(SESSION_STORAGE_PATH){
 try{
 // optionally read from file as a fallback to local storage
-constsessionFile=awaitreadFile(SESSION_FILE_PATH)
+constsessionFile=awaitreadFile(SESSION_STORAGE_PATH,`${this.filePath}.json`)
 if(!sessionFile){
 thrownewError('No session file found')
 }
-constsession=JSON.parse(sessionFile)
+constdata: T=JSON.parse(sessionFile)
 
-if(session){
-constkeys=Object.keys(session)
+if(data){
 // validate session
+constkeys=Object.keys(data)
 if(keys.length){
-// should only be one
-this.key=keys[0]
-returnsession[this.key]
+returndata
 }
 }
 }catch(err){
-console.warn(`Failed to read or parse session file: ${SESSION_FILE_PATH}`)
+console.warn(`Failed to read or parse session file: ${SESSION_STORAGE_PATH}/${this.filePath}.json`)
 }
 }
 returnthis.defaultValue
@@ -61,12 +71,12 @@ class Storage<T> {
 this.writeToSessionFile(next)
 }
 publicwriteToSessionFile(data: string){
-// optionally write to file
-if(SESSION_FILE_PATH){
+// optionally write state to file, useful when state cannot be controlled across containers
+if(SESSION_STORAGE_PATH){
 try{
-writeFile({[this.key]: data},SESSION_FILE_PATH)
+writeFile(data,SESSION_STORAGE_PATH,`${this.filePath}.json`)
 }catch(err: any){
-console.warn(`Failed to write coderoad session to path: ${SESSION_FILE_PATH}`)
+console.warn(`Failed to write coderoad session to path: ${SESSION_STORAGE_PATH}/${this.filePath}.json`)
 }
 }
 }