@@ -2,8 +2,10 @@ import * as NodeServices from "@effect/platform-node/NodeServices";
22import { assert , describe , it } from "@effect/vitest" ;
33import { ConnectionCatalogDocument } from "@t3tools/client-runtime/platform" ;
44import { EnvironmentId , type PersistedSavedEnvironmentRecord } from "@t3tools/contracts" ;
5+ import * as Deferred from "effect/Deferred" ;
56import * as Effect from "effect/Effect" ;
67import * as Base64 from "effect/encoding/Base64" ;
8+ import * as Fiber from "effect/Fiber" ;
79import * as FileSystem from "effect/FileSystem" ;
810import * as Path from "effect/Path" ;
911import * as Layer from "effect/Layer" ;
@@ -51,25 +53,26 @@ function layerSafeStorageFor(available: boolean, failDecrypt: Ref.Ref<boolean> |
5153 } satisfies ElectronSafeStorage . ElectronSafeStorage [ "Service" ] ) ;
5254}
5355
54- const layerPreviousSafeStorageIdentity = Layer . succeed (
55- DesktopSafeStorageIdentity . DesktopSafeStorageIdentity ,
56- {
56+ const layerPreviousSafeStorageIdentity = ( previousKeyLookup : Effect . Effect < void > ) =>
57+ Layer . succeed ( DesktopSafeStorageIdentity . DesktopSafeStorageIdentity , {
5758 decryptWithPreviousName : ( value ) => {
5859 const decoded = textDecoder . decode ( value ) ;
59- return Effect . succeed (
60- decoded . startsWith ( "previous:" )
61- ? Option . some ( decoded . slice ( "previous:" . length ) )
62- : Option . none ( ) ,
60+ return previousKeyLookup . pipe (
61+ Effect . as (
62+ decoded . startsWith ( "previous:" )
63+ ? Option . some ( decoded . slice ( "previous:" . length ) )
64+ : Option . none ( ) ,
65+ ) ,
6366 ) ;
6467 } ,
65- } satisfies DesktopSafeStorageIdentity . DesktopSafeStorageIdentity [ "Service" ] ,
66- ) ;
68+ } satisfies DesktopSafeStorageIdentity . DesktopSafeStorageIdentity [ "Service" ] ) ;
6769
6870function layerFor (
6971 baseDir : string ,
7072 encryptionAvailable = true ,
7173 failDecrypt : Ref . Ref < boolean > | null = null ,
7274 fileSystemLayer : Layer . Layer < FileSystem . FileSystem > = NodeServices . layer ,
75+ previousKeyLookup : Effect . Effect < void > = Effect . void ,
7376) {
7477 const layerEnvironment = DesktopEnvironment . layer ( {
7578 dirname : "/repo/apps/desktop/src" ,
@@ -90,7 +93,7 @@ function layerFor(
9093 const layerDependencies = Layer . mergeAll (
9194 layerEnvironment ,
9295 layerSafeStorage ,
93- layerPreviousSafeStorageIdentity ,
96+ layerPreviousSafeStorageIdentity ( previousKeyLookup ) ,
9497 NodeServices . layer ,
9598 fileSystemLayer ,
9699 ) ;
@@ -489,6 +492,35 @@ describe("DesktopConnectionCatalogStore", () => {
489492 ) ,
490493 ) ;
491494
495+ it . effect ( "keeps a catalog saved while the previous key was being read" , ( ) =>
496+ Effect . gen ( function * ( ) {
497+ const fileSystem = yield * FileSystem . FileSystem ;
498+ const baseDir = yield * fileSystem . makeTempDirectoryScoped ( {
499+ prefix : "t3-desktop-connection-catalog-test-" ,
500+ } ) ;
501+ const lookupStarted = yield * Deferred . make < void > ( ) ;
502+ const lookupReleased = yield * Deferred . make < void > ( ) ;
503+ const previousKeyLookup = Deferred . succeed ( lookupStarted , undefined ) . pipe (
504+ Effect . andThen ( Deferred . await ( lookupReleased ) ) ,
505+ ) ;
506+ const previous = '{"schemaVersion":1,"targets":[]}' ;
507+ const newer = '{"schemaVersion":1,"targets":[{"newer":true}]}' ;
508+
509+ yield * Effect . gen ( function * ( ) {
510+ const store = yield * DesktopConnectionCatalogStore . DesktopConnectionCatalogStore ;
511+ yield * writeEncryptedCatalog ( `previous:${ previous } ` ) ;
512+
513+ const recovery = yield * store . get . pipe ( Effect . forkChild ) ;
514+ yield * Deferred . await ( lookupStarted ) ;
515+ assert . isTrue ( yield * store . set ( newer ) ) ;
516+ yield * Deferred . succeed ( lookupReleased , undefined ) ;
517+
518+ assert . deepStrictEqual ( yield * Fiber . join ( recovery ) , Option . some ( previous ) ) ;
519+ assert . deepStrictEqual ( yield * store . get , Option . some ( newer ) ) ;
520+ } ) . pipe ( Effect . provide ( layerFor ( baseDir , true , null , NodeServices . layer , previousKeyLookup ) ) ) ;
521+ } ) . pipe ( Effect . provide ( NodeServices . layer ) , Effect . scoped ) ,
522+ ) ;
523+
492524 it . effect ( "keeps the catalog when the previous name yields no catalog" , ( ) =>
493525 withStore (
494526 Effect . gen ( function * ( ) {
0 commit comments