@livestore/adapter-expo 0.4.0-dev.7 → 0.4.0-dev.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/.tsbuildinfo +1 -1
- package/dist/index.d.ts +6 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +37 -10
- package/dist/index.js.map +1 -1
- package/package.json +4 -4
- package/src/index.ts +88 -11
package/dist/index.d.ts
CHANGED
|
@@ -15,6 +15,12 @@ export type MakeDbOptions = {
|
|
|
15
15
|
clientId?: string;
|
|
16
16
|
/** @default 'static' */
|
|
17
17
|
sessionId?: string;
|
|
18
|
+
/**
|
|
19
|
+
* Warning: This will reset both the app and eventlog database. This should only be used during development.
|
|
20
|
+
*
|
|
21
|
+
* @default false
|
|
22
|
+
*/
|
|
23
|
+
resetPersistence?: boolean;
|
|
18
24
|
};
|
|
19
25
|
declare global {
|
|
20
26
|
var RN$Bridgeless: boolean | undefined;
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAA;AAEtB,OAAO,EACL,KAAK,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAA;AAEtB,OAAO,EACL,KAAK,OAAO,EAQZ,KAAK,WAAW,EAEjB,MAAM,mBAAmB,CAAA;AA2B1B,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,CAAC,EAAE,WAAW,CAAA;IAClB,OAAO,CAAC,EAAE;QACR;;;;;WAKG;QACH,YAAY,CAAC,EAAE,MAAM,CAAA;KACtB,CAAA;IAED,0FAA0F;IAC1F,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,wBAAwB;IACxB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,CAAA;AAED,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,aAAa,EAAE,OAAO,GAAG,SAAS,CAAA;CACvC;AAKD,eAAO,MAAM,oBAAoB,GAC9B,UAAS,aAAkB,KAAG,OA0FiF,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import "./polyfill.js";
|
|
2
|
-
import { ClientSessionLeaderThreadProxy, Devtools, liveStoreStorageFormatVersion, makeClientSession, UnexpectedError, } from '@livestore/common';
|
|
2
|
+
import { ClientSessionLeaderThreadProxy, Devtools, IntentionalShutdownCause, liveStoreStorageFormatVersion, makeClientSession, UnexpectedError, } from '@livestore/common';
|
|
3
3
|
import { Eventlog, LeaderThreadCtx, makeLeaderThreadLayer } from '@livestore/common/leader-thread';
|
|
4
4
|
import { LiveStoreEvent } from '@livestore/common/schema';
|
|
5
5
|
import { shouldNeverHappen } from '@livestore/utils';
|
|
6
|
-
import { Effect, Exit, FetchHttpClient, Fiber, Layer, Queue, Stream, SubscriptionRef } from '@livestore/utils/effect';
|
|
6
|
+
import { Effect, Exit, FetchHttpClient, Fiber, Layer, Queue, Schedule, Stream, SubscriptionRef, } from '@livestore/utils/effect';
|
|
7
7
|
import * as Webmesh from '@livestore/webmesh';
|
|
8
8
|
import * as ExpoApplication from 'expo-application';
|
|
9
9
|
import * as SQLite from 'expo-sqlite';
|
|
@@ -19,10 +19,14 @@ export const makePersistedAdapter = (options = {}) => (adapterArgs) => Effect.ge
|
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
21
|
const { schema, shutdown, devtoolsEnabled, storeId, bootStatusQueue, syncPayload } = adapterArgs;
|
|
22
|
-
const { storage, clientId = yield* getDeviceId, sessionId = 'static', sync: syncOptions } = options;
|
|
22
|
+
const { storage, clientId = yield* getDeviceId, sessionId = 'static', sync: syncOptions, resetPersistence = false, } = options;
|
|
23
23
|
yield* Queue.offer(bootStatusQueue, { stage: 'loading' });
|
|
24
24
|
const lockStatus = yield* SubscriptionRef.make('has-lock');
|
|
25
25
|
const shutdownChannel = yield* makeShutdownChannel(storeId);
|
|
26
|
+
if (resetPersistence === true) {
|
|
27
|
+
yield* shutdownChannel.send(IntentionalShutdownCause.make({ reason: 'adapter-reset' }));
|
|
28
|
+
yield* resetExpoPersistence({ storeId, storage, schema });
|
|
29
|
+
}
|
|
26
30
|
yield* shutdownChannel.listen.pipe(Stream.flatten(), Stream.tap((cause) => shutdown(cause._tag === 'LiveStore.IntentionalShutdownCause' ? Exit.succeed(cause) : Exit.fail(cause))), Stream.runDrain, Effect.interruptible, Effect.tapCauseLogPretty, Effect.forkScoped);
|
|
27
31
|
const devtoolsUrl = getDevtoolsUrl().toString();
|
|
28
32
|
const { leaderThread, initialSnapshot } = yield* makeLeaderThread({
|
|
@@ -67,14 +71,13 @@ export const makePersistedAdapter = (options = {}) => (adapterArgs) => Effect.ge
|
|
|
67
71
|
return clientSession;
|
|
68
72
|
}).pipe(UnexpectedError.mapToUnexpectedError, Effect.provide(FetchHttpClient.layer), Effect.tapCauseLogPretty);
|
|
69
73
|
const makeLeaderThread = ({ storeId, clientId, schema, makeSqliteDb, syncOptions, storage, devtoolsEnabled, bootStatusQueue: bootStatusQueueClientSession, syncPayload, devtoolsUrl, }) => Effect.gen(function* () {
|
|
70
|
-
const
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
const dbEventlogPath = `${'livestore-'}eventlog@${liveStoreStorageFormatVersion}.db`;
|
|
74
|
+
const { directory, stateDatabaseName, eventlogDatabaseName } = resolveExpoPersistencePaths({
|
|
75
|
+
storeId,
|
|
76
|
+
storage,
|
|
77
|
+
schema,
|
|
78
|
+
});
|
|
76
79
|
const dbState = yield* makeSqliteDb({ _tag: 'file', databaseName: stateDatabaseName, directory });
|
|
77
|
-
const dbEventlog = yield* makeSqliteDb({ _tag: 'file', databaseName:
|
|
80
|
+
const dbEventlog = yield* makeSqliteDb({ _tag: 'file', databaseName: eventlogDatabaseName, directory });
|
|
78
81
|
const devtoolsOptions = yield* makeDevtoolsOptions({
|
|
79
82
|
devtoolsEnabled,
|
|
80
83
|
devtoolsUrl,
|
|
@@ -118,6 +121,30 @@ const makeLeaderThread = ({ storeId, clientId, schema, makeSqliteDb, syncOptions
|
|
|
118
121
|
return { leaderThread, initialSnapshot };
|
|
119
122
|
}).pipe(Effect.provide(layer));
|
|
120
123
|
});
|
|
124
|
+
const resolveExpoPersistencePaths = ({ storeId, storage, schema, }) => {
|
|
125
|
+
const subDirectory = storage?.subDirectory ? `${storage.subDirectory.replace(/\/$/, '')}/` : '';
|
|
126
|
+
const pathJoin = (...paths) => paths.join('/').replaceAll(/\/+/g, '/');
|
|
127
|
+
const directory = pathJoin(SQLite.defaultDatabaseDirectory, subDirectory, storeId);
|
|
128
|
+
const schemaHashSuffix = schema.state.sqlite.migrations.strategy === 'manual' ? 'fixed' : schema.state.sqlite.hash.toString();
|
|
129
|
+
const stateDatabaseName = `livestore-${schemaHashSuffix}@${liveStoreStorageFormatVersion}.db`;
|
|
130
|
+
const eventlogDatabaseName = `livestore-eventlog@${liveStoreStorageFormatVersion}.db`;
|
|
131
|
+
return { directory, stateDatabaseName, eventlogDatabaseName };
|
|
132
|
+
};
|
|
133
|
+
const resetExpoPersistence = ({ storeId, storage, schema, }) => Effect.try({
|
|
134
|
+
try: () => {
|
|
135
|
+
const { directory, stateDatabaseName, eventlogDatabaseName } = resolveExpoPersistencePaths({
|
|
136
|
+
storeId,
|
|
137
|
+
storage,
|
|
138
|
+
schema,
|
|
139
|
+
});
|
|
140
|
+
SQLite.deleteDatabaseSync(stateDatabaseName, directory);
|
|
141
|
+
SQLite.deleteDatabaseSync(eventlogDatabaseName, directory);
|
|
142
|
+
},
|
|
143
|
+
catch: (cause) => new UnexpectedError({
|
|
144
|
+
cause,
|
|
145
|
+
note: `@livestore/adapter-expo: Failed to reset persistence for store ${storeId}`,
|
|
146
|
+
}),
|
|
147
|
+
}).pipe(Effect.retry({ schedule: Schedule.exponentialBackoff10Sec }), Effect.withSpan('@livestore/adapter-expo:resetPersistence', { attributes: { storeId } }));
|
|
121
148
|
const makeDevtoolsOptions = ({ devtoolsEnabled, devtoolsUrl, dbState, dbEventlog, storeId, clientId, }) => Effect.sync(() => {
|
|
122
149
|
if (devtoolsEnabled === false) {
|
|
123
150
|
return {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAA;AAEtB,OAAO,EAGL,8BAA8B,EAC9B,QAAQ,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@livestore/adapter-expo",
|
|
3
|
-
"version": "0.4.0-dev.
|
|
3
|
+
"version": "0.4.0-dev.8",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"exports": {
|
|
@@ -8,9 +8,9 @@
|
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
10
|
"@opentelemetry/api": "1.9.0",
|
|
11
|
-
"@livestore/common": "0.4.0-dev.
|
|
12
|
-
"@livestore/
|
|
13
|
-
"@livestore/
|
|
11
|
+
"@livestore/common": "0.4.0-dev.8",
|
|
12
|
+
"@livestore/utils": "0.4.0-dev.8",
|
|
13
|
+
"@livestore/webmesh": "0.4.0-dev.8"
|
|
14
14
|
},
|
|
15
15
|
"devDependencies": {
|
|
16
16
|
"expo-application": "^6.1.5",
|
package/src/index.ts
CHANGED
|
@@ -5,6 +5,7 @@ import {
|
|
|
5
5
|
type BootStatus,
|
|
6
6
|
ClientSessionLeaderThreadProxy,
|
|
7
7
|
Devtools,
|
|
8
|
+
IntentionalShutdownCause,
|
|
8
9
|
type LockStatus,
|
|
9
10
|
liveStoreStorageFormatVersion,
|
|
10
11
|
makeClientSession,
|
|
@@ -17,7 +18,17 @@ import type { LiveStoreSchema } from '@livestore/common/schema'
|
|
|
17
18
|
import { LiveStoreEvent } from '@livestore/common/schema'
|
|
18
19
|
import { shouldNeverHappen } from '@livestore/utils'
|
|
19
20
|
import type { Schema, Scope } from '@livestore/utils/effect'
|
|
20
|
-
import {
|
|
21
|
+
import {
|
|
22
|
+
Effect,
|
|
23
|
+
Exit,
|
|
24
|
+
FetchHttpClient,
|
|
25
|
+
Fiber,
|
|
26
|
+
Layer,
|
|
27
|
+
Queue,
|
|
28
|
+
Schedule,
|
|
29
|
+
Stream,
|
|
30
|
+
SubscriptionRef,
|
|
31
|
+
} from '@livestore/utils/effect'
|
|
21
32
|
import * as Webmesh from '@livestore/webmesh'
|
|
22
33
|
import * as ExpoApplication from 'expo-application'
|
|
23
34
|
import * as SQLite from 'expo-sqlite'
|
|
@@ -43,6 +54,12 @@ export type MakeDbOptions = {
|
|
|
43
54
|
clientId?: string
|
|
44
55
|
/** @default 'static' */
|
|
45
56
|
sessionId?: string
|
|
57
|
+
/**
|
|
58
|
+
* Warning: This will reset both the app and eventlog database. This should only be used during development.
|
|
59
|
+
*
|
|
60
|
+
* @default false
|
|
61
|
+
*/
|
|
62
|
+
resetPersistence?: boolean
|
|
46
63
|
}
|
|
47
64
|
|
|
48
65
|
declare global {
|
|
@@ -66,7 +83,13 @@ export const makePersistedAdapter =
|
|
|
66
83
|
|
|
67
84
|
const { schema, shutdown, devtoolsEnabled, storeId, bootStatusQueue, syncPayload } = adapterArgs
|
|
68
85
|
|
|
69
|
-
const {
|
|
86
|
+
const {
|
|
87
|
+
storage,
|
|
88
|
+
clientId = yield* getDeviceId,
|
|
89
|
+
sessionId = 'static',
|
|
90
|
+
sync: syncOptions,
|
|
91
|
+
resetPersistence = false,
|
|
92
|
+
} = options
|
|
70
93
|
|
|
71
94
|
yield* Queue.offer(bootStatusQueue, { stage: 'loading' })
|
|
72
95
|
|
|
@@ -74,6 +97,12 @@ export const makePersistedAdapter =
|
|
|
74
97
|
|
|
75
98
|
const shutdownChannel = yield* makeShutdownChannel(storeId)
|
|
76
99
|
|
|
100
|
+
if (resetPersistence === true) {
|
|
101
|
+
yield* shutdownChannel.send(IntentionalShutdownCause.make({ reason: 'adapter-reset' }))
|
|
102
|
+
|
|
103
|
+
yield* resetExpoPersistence({ storeId, storage, schema })
|
|
104
|
+
}
|
|
105
|
+
|
|
77
106
|
yield* shutdownChannel.listen.pipe(
|
|
78
107
|
Stream.flatten(),
|
|
79
108
|
Stream.tap((cause) =>
|
|
@@ -159,17 +188,14 @@ const makeLeaderThread = ({
|
|
|
159
188
|
devtoolsUrl: string
|
|
160
189
|
}) =>
|
|
161
190
|
Effect.gen(function* () {
|
|
162
|
-
const
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
schema.state.sqlite.migrations.strategy === 'manual' ? 'fixed' : schema.state.sqlite.hash.toString()
|
|
168
|
-
const stateDatabaseName = `${'livestore-'}${schemaHashSuffix}@${liveStoreStorageFormatVersion}.db`
|
|
169
|
-
const dbEventlogPath = `${'livestore-'}eventlog@${liveStoreStorageFormatVersion}.db`
|
|
191
|
+
const { directory, stateDatabaseName, eventlogDatabaseName } = resolveExpoPersistencePaths({
|
|
192
|
+
storeId,
|
|
193
|
+
storage,
|
|
194
|
+
schema,
|
|
195
|
+
})
|
|
170
196
|
|
|
171
197
|
const dbState = yield* makeSqliteDb({ _tag: 'file', databaseName: stateDatabaseName, directory })
|
|
172
|
-
const dbEventlog = yield* makeSqliteDb({ _tag: 'file', databaseName:
|
|
198
|
+
const dbEventlog = yield* makeSqliteDb({ _tag: 'file', databaseName: eventlogDatabaseName, directory })
|
|
173
199
|
|
|
174
200
|
const devtoolsOptions = yield* makeDevtoolsOptions({
|
|
175
201
|
devtoolsEnabled,
|
|
@@ -245,6 +271,57 @@ const makeLeaderThread = ({
|
|
|
245
271
|
}).pipe(Effect.provide(layer))
|
|
246
272
|
})
|
|
247
273
|
|
|
274
|
+
const resolveExpoPersistencePaths = ({
|
|
275
|
+
storeId,
|
|
276
|
+
storage,
|
|
277
|
+
schema,
|
|
278
|
+
}: {
|
|
279
|
+
storeId: string
|
|
280
|
+
storage: { subDirectory?: string } | undefined
|
|
281
|
+
schema: LiveStoreSchema
|
|
282
|
+
}) => {
|
|
283
|
+
const subDirectory = storage?.subDirectory ? `${storage.subDirectory.replace(/\/$/, '')}/` : ''
|
|
284
|
+
const pathJoin = (...paths: string[]) => paths.join('/').replaceAll(/\/+/g, '/')
|
|
285
|
+
const directory = pathJoin(SQLite.defaultDatabaseDirectory, subDirectory, storeId)
|
|
286
|
+
|
|
287
|
+
const schemaHashSuffix =
|
|
288
|
+
schema.state.sqlite.migrations.strategy === 'manual' ? 'fixed' : schema.state.sqlite.hash.toString()
|
|
289
|
+
const stateDatabaseName = `livestore-${schemaHashSuffix}@${liveStoreStorageFormatVersion}.db`
|
|
290
|
+
const eventlogDatabaseName = `livestore-eventlog@${liveStoreStorageFormatVersion}.db`
|
|
291
|
+
|
|
292
|
+
return { directory, stateDatabaseName, eventlogDatabaseName }
|
|
293
|
+
}
|
|
294
|
+
|
|
295
|
+
const resetExpoPersistence = ({
|
|
296
|
+
storeId,
|
|
297
|
+
storage,
|
|
298
|
+
schema,
|
|
299
|
+
}: {
|
|
300
|
+
storeId: string
|
|
301
|
+
storage: MakeDbOptions['storage']
|
|
302
|
+
schema: LiveStoreSchema
|
|
303
|
+
}) =>
|
|
304
|
+
Effect.try({
|
|
305
|
+
try: () => {
|
|
306
|
+
const { directory, stateDatabaseName, eventlogDatabaseName } = resolveExpoPersistencePaths({
|
|
307
|
+
storeId,
|
|
308
|
+
storage,
|
|
309
|
+
schema,
|
|
310
|
+
})
|
|
311
|
+
|
|
312
|
+
SQLite.deleteDatabaseSync(stateDatabaseName, directory)
|
|
313
|
+
SQLite.deleteDatabaseSync(eventlogDatabaseName, directory)
|
|
314
|
+
},
|
|
315
|
+
catch: (cause) =>
|
|
316
|
+
new UnexpectedError({
|
|
317
|
+
cause,
|
|
318
|
+
note: `@livestore/adapter-expo: Failed to reset persistence for store ${storeId}`,
|
|
319
|
+
}),
|
|
320
|
+
}).pipe(
|
|
321
|
+
Effect.retry({ schedule: Schedule.exponentialBackoff10Sec }),
|
|
322
|
+
Effect.withSpan('@livestore/adapter-expo:resetPersistence', { attributes: { storeId } }),
|
|
323
|
+
)
|
|
324
|
+
|
|
248
325
|
const makeDevtoolsOptions = ({
|
|
249
326
|
devtoolsEnabled,
|
|
250
327
|
devtoolsUrl,
|