#399

frontend/src/lib/postImportStorage.ts

@@ -8,6 +8,7 @@ import type { PostImportOrigin,
 
 const SESSION_VERSION = 2
 const SESSION_PREFIX = 'post-import-session:'
+const CURRENT_SESSION_KEY = `${ SESSION_PREFIX }current`
 const SOURCE_DRAFT_KEY = 'post-import-source-draft'
 const SESSION_MAX_AGE_MS = 24 * 60 * 60 * 1000
 const ATTRIBUTE_KEYS = [
@@ -28,7 +29,7 @@ const isPlainObject = (value: unknown): value is Record<string, unknown> =>
     typeof value === 'object' && value != null && !(Array.isArray (value))
 
 
-const sessionKey = (sessionId: string): string => `${ SESSION_PREFIX }${ sessionId }`
+const sessionKey = (): string => CURRENT_SESSION_KEY
 
 
 const readStorage = (
@@ -288,12 +289,6 @@ const isExpiredSession = (savedAt: string): boolean => {
 }
 
 
-export const createPostImportSessionId = (): string =>
-    typeof crypto !== 'undefined' && 'randomUUID' in crypto
-    ? crypto.randomUUID ()
-    : `${ Date.now () }-${ Math.random ().toString (36).slice (2) }`
-
-
 export const cleanupExpiredPostImportSessions = (
     onError?: StorageErrorHandler,
 ) => {
@@ -311,6 +306,13 @@ export const cleanupExpiredPostImportSessions = (
           const raw = sessionStorage.getItem (key)
           if (raw == null)
             continue
+
+          if (key !== CURRENT_SESSION_KEY)
+            {
+              sessionStorage.removeItem (key)
+              --i
+              continue
+            }
           try
           {
             const value = JSON.parse (raw) as { savedAt?: string }
@@ -368,24 +370,38 @@ export const clearPostImportSourceDraft = (
 
 
 export const savePostImportSession = (
-    sessionId: string,
-    session:   Omit<PostImportSession, 'version' | 'savedAt'>,
+    sessionOrLegacyId: string | Omit<PostImportSession, 'version' | 'savedAt'>,
+    sessionOrOnError?: Omit<PostImportSession, 'version' | 'savedAt'> | StorageErrorHandler,
     onError?:  StorageErrorHandler,
-): boolean =>
-    writeStorage (
-        sessionKey (sessionId),
+): boolean => {
+    const session =
+        typeof sessionOrLegacyId === 'string'
+        ? sessionOrOnError as Omit<PostImportSession, 'version' | 'savedAt'>
+        : sessionOrLegacyId
+    const errorHandler =
+        typeof sessionOrLegacyId === 'string'
+        ? onError
+        : sessionOrOnError as StorageErrorHandler | undefined
+
+    return writeStorage (
+        sessionKey (),
         JSON.stringify ({
             ...session,
             version: SESSION_VERSION,
             savedAt: new Date ().toISOString () }),
-        onError)
+        errorHandler)
+}
 
 
 export const loadPostImportSession = (
-    sessionId: string,
+    legacyIdOrOnError?: string | StorageErrorHandler,
     onError?: StorageErrorHandler,
 ): PostImportSession | null => {
-    const raw = readStorage (sessionKey (sessionId), onError)
+    const errorHandler =
+        typeof legacyIdOrOnError === 'string'
+        ? onError
+        : legacyIdOrOnError
+    const raw = readStorage (sessionKey (), errorHandler)
     if (raw == null)
       return null
 
@@ -396,7 +412,7 @@ export const loadPostImportSession = (
         return null
       if (typeof value.savedAt !== 'string' || isExpiredSession (value.savedAt))
         {
-          removeStorage (sessionKey (sessionId), onError)
+          removeStorage (sessionKey (), errorHandler)
           return null
         }
 
@@ -416,3 +432,10 @@ export const loadPostImportSession = (
       return null
     }
 }
+
+
+export const clearPostImportSession = (
+    onError?: StorageErrorHandler,
+) => {
+    removeStorage (sessionKey (), onError)
+}