@livestore/adapter-node 0.4.0-dev.9 → 0.4.0
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/client-session/adapter.d.ts +68 -2
- package/dist/client-session/adapter.d.ts.map +1 -1
- package/dist/client-session/adapter.js +121 -42
- package/dist/client-session/adapter.js.map +1 -1
- package/dist/devtools/devtools-server.d.ts.map +1 -1
- package/dist/devtools/devtools-server.js +14 -6
- package/dist/devtools/devtools-server.js.map +1 -1
- package/dist/devtools/mod.d.ts +1 -1
- package/dist/devtools/mod.d.ts.map +1 -1
- package/dist/devtools/mod.js +1 -1
- package/dist/devtools/mod.js.map +1 -1
- package/dist/devtools/vite-dev-server.d.ts +26 -4
- package/dist/devtools/vite-dev-server.d.ts.map +1 -1
- package/dist/devtools/vite-dev-server.js +43 -8
- package/dist/devtools/vite-dev-server.js.map +1 -1
- package/dist/leader-thread-shared.d.ts +5 -4
- package/dist/leader-thread-shared.d.ts.map +1 -1
- package/dist/leader-thread-shared.js +8 -6
- package/dist/leader-thread-shared.js.map +1 -1
- package/dist/make-leader-worker.d.ts +4 -2
- package/dist/make-leader-worker.d.ts.map +1 -1
- package/dist/make-leader-worker.js +45 -20
- package/dist/make-leader-worker.js.map +1 -1
- package/dist/shutdown-channel.d.ts.map +1 -1
- package/dist/shutdown-channel.js.map +1 -1
- package/dist/worker-schema.d.ts +141 -41
- package/dist/worker-schema.d.ts.map +1 -1
- package/dist/worker-schema.js +43 -18
- package/dist/worker-schema.js.map +1 -1
- package/package.json +59 -19
- package/src/client-session/adapter.ts +149 -72
- package/src/devtools/devtools-server.ts +22 -10
- package/src/devtools/mod.ts +1 -1
- package/src/devtools/vite-dev-server.ts +63 -11
- package/src/leader-thread-shared.ts +17 -13
- package/src/make-leader-worker.ts +80 -67
- package/src/shutdown-channel.ts +1 -0
- package/src/worker-schema.ts +67 -18
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { URL } from 'node:url';
|
|
1
2
|
import { type Adapter, type SyncOptions } from '@livestore/common';
|
|
2
3
|
import { Schema } from '@livestore/utils/effect';
|
|
3
4
|
import type { TestingOverrides } from '../leader-thread-shared.ts';
|
|
@@ -41,12 +42,77 @@ export interface NodeAdapterOptions {
|
|
|
41
42
|
overrides?: TestingOverrides;
|
|
42
43
|
};
|
|
43
44
|
}
|
|
44
|
-
/**
|
|
45
|
+
/**
|
|
46
|
+
* Creates a single-threaded LiveStore adapter for Node.js applications.
|
|
47
|
+
*
|
|
48
|
+
* This adapter runs the leader thread (persistence and sync) in the same thread as
|
|
49
|
+
* your application. Suitable for CLI tools, scripts, and applications where simplicity
|
|
50
|
+
* is preferred over maximum performance.
|
|
51
|
+
*
|
|
52
|
+
* For production servers or performance-critical applications, consider `makeWorkerAdapter`
|
|
53
|
+
* which runs persistence/sync in a separate worker thread.
|
|
54
|
+
*
|
|
55
|
+
* @example
|
|
56
|
+
* ```ts
|
|
57
|
+
* import { makeAdapter } from '@livestore/adapter-node'
|
|
58
|
+
* import { makeWsSync } from '@livestore/sync-cf/client'
|
|
59
|
+
*
|
|
60
|
+
* const adapter = makeAdapter({
|
|
61
|
+
* storage: { type: 'fs', baseDirectory: './data' },
|
|
62
|
+
* sync: {
|
|
63
|
+
* backend: makeWsSync({ url: 'wss://api.example.com/sync' }),
|
|
64
|
+
* },
|
|
65
|
+
* })
|
|
66
|
+
* ```
|
|
67
|
+
*
|
|
68
|
+
* @example
|
|
69
|
+
* ```ts
|
|
70
|
+
* // With DevTools support
|
|
71
|
+
* const adapter = makeAdapter({
|
|
72
|
+
* storage: { type: 'fs', baseDirectory: './data' },
|
|
73
|
+
* devtools: {
|
|
74
|
+
* schemaPath: new URL('./schema.ts', import.meta.url),
|
|
75
|
+
* port: 4242,
|
|
76
|
+
* },
|
|
77
|
+
* })
|
|
78
|
+
* ```
|
|
79
|
+
*
|
|
80
|
+
* @see https://livestore.dev/docs/reference/adapters/node for setup guide
|
|
81
|
+
*/
|
|
45
82
|
export declare const makeAdapter: ({ sync, ...options }: NodeAdapterOptions & {
|
|
46
83
|
sync?: SyncOptions;
|
|
47
84
|
}) => Adapter;
|
|
48
85
|
/**
|
|
49
|
-
*
|
|
86
|
+
* Creates a multi-threaded LiveStore adapter for Node.js applications.
|
|
87
|
+
*
|
|
88
|
+
* This adapter runs the leader thread (persistence, sync, and heavy SQLite operations)
|
|
89
|
+
* in a separate worker thread, keeping your main thread responsive. Recommended for
|
|
90
|
+
* production servers and performance-critical applications.
|
|
91
|
+
*
|
|
92
|
+
* You must create a worker file that calls `makeLeaderWorker()` and pass its URL
|
|
93
|
+
* to this function.
|
|
94
|
+
*
|
|
95
|
+
* @example
|
|
96
|
+
* ```ts
|
|
97
|
+
* // In your main file:
|
|
98
|
+
* import { makeWorkerAdapter } from '@livestore/adapter-node'
|
|
99
|
+
*
|
|
100
|
+
* const adapter = makeWorkerAdapter({
|
|
101
|
+
* storage: { type: 'fs', baseDirectory: './data' },
|
|
102
|
+
* workerUrl: new URL('./livestore.worker.ts', import.meta.url),
|
|
103
|
+
* })
|
|
104
|
+
* ```
|
|
105
|
+
*
|
|
106
|
+
* @example
|
|
107
|
+
* ```ts
|
|
108
|
+
* // In livestore.worker.ts:
|
|
109
|
+
* import { makeLeaderWorker } from '@livestore/adapter-node/worker'
|
|
110
|
+
* import { schema } from './schema'
|
|
111
|
+
*
|
|
112
|
+
* makeLeaderWorker({ schema })
|
|
113
|
+
* ```
|
|
114
|
+
*
|
|
115
|
+
* @see https://livestore.dev/docs/reference/adapters/node for setup guide
|
|
50
116
|
*/
|
|
51
117
|
export declare const makeWorkerAdapter: ({ workerUrl, workerExtraArgs, ...options }: NodeAdapterOptions & {
|
|
52
118
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/client-session/adapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/client-session/adapter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAGnC,OAAO,EACL,KAAK,OAAO,EAQZ,KAAK,WAAW,EAEjB,MAAM,mBAAmB,CAAA;AAO1B,OAAO,EAWL,MAAM,EAKP,MAAM,yBAAyB,CAAA;AAIhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAGlE,OAAO,KAAK,YAAY,MAAM,qBAAqB,CAAA;AAEnD,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,YAAY,CAAC,WAAW,CAAA;IACjC,yDAAyD;IACzD,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAElB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAE1B,QAAQ,CAAC,EAAE;QACT,UAAU,EAAE,MAAM,GAAG,GAAG,CAAA;QACxB;;;;WAIG;QACH,IAAI,CAAC,EAAE,MAAM,CAAA;QACb;;WAEG;QACH,IAAI,CAAC,EAAE,MAAM,CAAA;QACb;;;;WAIG;QACH,yBAAyB,CAAC,EAAE,OAAO,CAAA;KACpC,CAAA;IAED,uCAAuC;IACvC,OAAO,CAAC,EAAE;QACR,SAAS,CAAC,EAAE,gBAAgB,CAAA;KAC7B,CAAA;CACF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,eAAO,MAAM,WAAW,GAAI,sBAGzB,kBAAkB,GAAG;IACtB,IAAI,CAAC,EAAE,WAAW,CAAA;CACnB,KAAG,OAA2F,CAAA;AAE/F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,eAAO,MAAM,iBAAiB,GAAI,4CAI/B,kBAAkB,GAAG;IACtB;;OAEG;IACH,SAAS,EAAE,GAAG,CAAA;IACd;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC,SAAS,CAAA;CACnC,KAAG,OAAgH,CAAA"}
|
|
@@ -1,28 +1,93 @@
|
|
|
1
1
|
import { hostname } from 'node:os';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import * as WT from 'node:worker_threads';
|
|
4
|
-
import { ClientSessionLeaderThreadProxy, IntentionalShutdownCause, makeClientSession,
|
|
5
|
-
import { Eventlog, LeaderThreadCtx } from '@livestore/common/leader-thread';
|
|
4
|
+
import { ClientSessionLeaderThreadProxy, IntentionalShutdownCause, isWorkerTransportError, makeClientSession, UnknownError, } from '@livestore/common';
|
|
5
|
+
import { Eventlog, LeaderThreadCtx, streamEventsWithSyncState } from '@livestore/common/leader-thread';
|
|
6
6
|
import { LiveStoreEvent } from '@livestore/common/schema';
|
|
7
7
|
import { loadSqlite3Wasm } from '@livestore/sqlite-wasm/load-wasm';
|
|
8
8
|
import { sqliteDbFactory } from '@livestore/sqlite-wasm/node';
|
|
9
9
|
import { omitUndefineds } from '@livestore/utils';
|
|
10
|
-
import { Cause, Effect, Exit, FetchHttpClient, Fiber, FileSystem, Layer,
|
|
10
|
+
import { Cause, Effect, Exit, FetchHttpClient, Fiber, FileSystem, Layer, Option, Queue, Schedule, Schema, Stream, Subscribable, SubscriptionRef, Worker, } from '@livestore/utils/effect';
|
|
11
11
|
import { PlatformNode } from '@livestore/utils/node';
|
|
12
12
|
import * as Webmesh from '@livestore/webmesh';
|
|
13
13
|
import { makeLeaderThread } from "../leader-thread-shared.js";
|
|
14
14
|
import { makeShutdownChannel } from "../shutdown-channel.js";
|
|
15
15
|
import * as WorkerSchema from "../worker-schema.js";
|
|
16
|
-
/**
|
|
16
|
+
/**
|
|
17
|
+
* Creates a single-threaded LiveStore adapter for Node.js applications.
|
|
18
|
+
*
|
|
19
|
+
* This adapter runs the leader thread (persistence and sync) in the same thread as
|
|
20
|
+
* your application. Suitable for CLI tools, scripts, and applications where simplicity
|
|
21
|
+
* is preferred over maximum performance.
|
|
22
|
+
*
|
|
23
|
+
* For production servers or performance-critical applications, consider `makeWorkerAdapter`
|
|
24
|
+
* which runs persistence/sync in a separate worker thread.
|
|
25
|
+
*
|
|
26
|
+
* @example
|
|
27
|
+
* ```ts
|
|
28
|
+
* import { makeAdapter } from '@livestore/adapter-node'
|
|
29
|
+
* import { makeWsSync } from '@livestore/sync-cf/client'
|
|
30
|
+
*
|
|
31
|
+
* const adapter = makeAdapter({
|
|
32
|
+
* storage: { type: 'fs', baseDirectory: './data' },
|
|
33
|
+
* sync: {
|
|
34
|
+
* backend: makeWsSync({ url: 'wss://api.example.com/sync' }),
|
|
35
|
+
* },
|
|
36
|
+
* })
|
|
37
|
+
* ```
|
|
38
|
+
*
|
|
39
|
+
* @example
|
|
40
|
+
* ```ts
|
|
41
|
+
* // With DevTools support
|
|
42
|
+
* const adapter = makeAdapter({
|
|
43
|
+
* storage: { type: 'fs', baseDirectory: './data' },
|
|
44
|
+
* devtools: {
|
|
45
|
+
* schemaPath: new URL('./schema.ts', import.meta.url),
|
|
46
|
+
* port: 4242,
|
|
47
|
+
* },
|
|
48
|
+
* })
|
|
49
|
+
* ```
|
|
50
|
+
*
|
|
51
|
+
* @see https://livestore.dev/docs/reference/adapters/node for setup guide
|
|
52
|
+
*/
|
|
17
53
|
export const makeAdapter = ({ sync, ...options }) => makeAdapterImpl({ ...options, leaderThread: { _tag: 'single-threaded', sync } });
|
|
18
54
|
/**
|
|
19
|
-
*
|
|
55
|
+
* Creates a multi-threaded LiveStore adapter for Node.js applications.
|
|
56
|
+
*
|
|
57
|
+
* This adapter runs the leader thread (persistence, sync, and heavy SQLite operations)
|
|
58
|
+
* in a separate worker thread, keeping your main thread responsive. Recommended for
|
|
59
|
+
* production servers and performance-critical applications.
|
|
60
|
+
*
|
|
61
|
+
* You must create a worker file that calls `makeLeaderWorker()` and pass its URL
|
|
62
|
+
* to this function.
|
|
63
|
+
*
|
|
64
|
+
* @example
|
|
65
|
+
* ```ts
|
|
66
|
+
* // In your main file:
|
|
67
|
+
* import { makeWorkerAdapter } from '@livestore/adapter-node'
|
|
68
|
+
*
|
|
69
|
+
* const adapter = makeWorkerAdapter({
|
|
70
|
+
* storage: { type: 'fs', baseDirectory: './data' },
|
|
71
|
+
* workerUrl: new URL('./livestore.worker.ts', import.meta.url),
|
|
72
|
+
* })
|
|
73
|
+
* ```
|
|
74
|
+
*
|
|
75
|
+
* @example
|
|
76
|
+
* ```ts
|
|
77
|
+
* // In livestore.worker.ts:
|
|
78
|
+
* import { makeLeaderWorker } from '@livestore/adapter-node/worker'
|
|
79
|
+
* import { schema } from './schema'
|
|
80
|
+
*
|
|
81
|
+
* makeLeaderWorker({ schema })
|
|
82
|
+
* ```
|
|
83
|
+
*
|
|
84
|
+
* @see https://livestore.dev/docs/reference/adapters/node for setup guide
|
|
20
85
|
*/
|
|
21
86
|
export const makeWorkerAdapter = ({ workerUrl, workerExtraArgs, ...options }) => makeAdapterImpl({ ...options, leaderThread: { _tag: 'multi-threaded', workerUrl, workerExtraArgs } });
|
|
22
87
|
const makeAdapterImpl = ({ storage, devtools: devtoolsOptionsInput, clientId = hostname(),
|
|
23
88
|
// TODO make this dynamic and actually support multiple sessions
|
|
24
89
|
sessionId = 'static', testing, resetPersistence = false, leaderThread: leaderThreadInput, }) => ((adapterArgs) => Effect.gen(function* () {
|
|
25
|
-
const { storeId, devtoolsEnabled, shutdown, bootStatusQueue,
|
|
90
|
+
const { storeId, devtoolsEnabled, shutdown, bootStatusQueue, syncPayloadEncoded, syncPayloadSchema, schema } = adapterArgs;
|
|
26
91
|
yield* Queue.offer(bootStatusQueue, { stage: 'loading' });
|
|
27
92
|
const sqlite3 = yield* Effect.promise(() => loadSqlite3Wasm());
|
|
28
93
|
const makeSqliteDb = yield* sqliteDbFactory({ sqlite3 });
|
|
@@ -37,14 +102,14 @@ sessionId = 'static', testing, resetPersistence = false, leaderThread: leaderThr
|
|
|
37
102
|
if (resetPersistence === true) {
|
|
38
103
|
yield* shutdownChannel
|
|
39
104
|
.send(IntentionalShutdownCause.make({ reason: 'adapter-reset' }))
|
|
40
|
-
.pipe(
|
|
105
|
+
.pipe(UnknownError.mapToUnknownError);
|
|
41
106
|
yield* resetNodePersistence({ storage, storeId });
|
|
42
107
|
}
|
|
43
|
-
yield* shutdownChannel.listen.pipe(Stream.flatten(), Stream.tap((cause) => shutdown(cause._tag === '
|
|
108
|
+
yield* shutdownChannel.listen.pipe(Stream.flatten(), Stream.tap((cause) => shutdown(cause._tag === 'IntentionalShutdownCause' ? Exit.succeed(cause) : Exit.fail(cause))), Stream.runDrain, Effect.interruptible, Effect.tapCauseLogPretty, Effect.forkScoped);
|
|
44
109
|
const syncInMemoryDb = yield* makeSqliteDb({ _tag: 'in-memory' }).pipe(Effect.orDie);
|
|
45
110
|
// TODO actually implement this multi-session support
|
|
46
111
|
const lockStatus = yield* SubscriptionRef.make('has-lock');
|
|
47
|
-
const devtoolsOptions = devtoolsEnabled && devtoolsOptionsInput !== undefined
|
|
112
|
+
const devtoolsOptions = devtoolsEnabled === true && devtoolsOptionsInput !== undefined
|
|
48
113
|
? {
|
|
49
114
|
enabled: true,
|
|
50
115
|
schemaPath: typeof devtoolsOptionsInput.schemaPath === 'string'
|
|
@@ -66,10 +131,11 @@ sessionId = 'static', testing, resetPersistence = false, leaderThread: leaderThr
|
|
|
66
131
|
storage,
|
|
67
132
|
...omitUndefineds({
|
|
68
133
|
syncOptions: leaderThreadInput.sync,
|
|
69
|
-
|
|
134
|
+
syncPayloadEncoded,
|
|
135
|
+
syncPayloadSchema,
|
|
70
136
|
testing,
|
|
71
137
|
}),
|
|
72
|
-
}).pipe(
|
|
138
|
+
}).pipe(UnknownError.mapToUnknownError)
|
|
73
139
|
: yield* makeWorkerLeaderThread({
|
|
74
140
|
shutdown,
|
|
75
141
|
storeId,
|
|
@@ -80,7 +146,7 @@ sessionId = 'static', testing, resetPersistence = false, leaderThread: leaderThr
|
|
|
80
146
|
storage,
|
|
81
147
|
devtools: devtoolsOptions,
|
|
82
148
|
bootStatusQueue,
|
|
83
|
-
|
|
149
|
+
syncPayloadEncoded,
|
|
84
150
|
});
|
|
85
151
|
syncInMemoryDb.import(initialSnapshot);
|
|
86
152
|
syncInMemoryDb.debug.head = leaderThread.initialState.leaderHead;
|
|
@@ -89,7 +155,7 @@ sessionId = 'static', testing, resetPersistence = false, leaderThread: leaderThr
|
|
|
89
155
|
sqliteDb: syncInMemoryDb,
|
|
90
156
|
webmeshMode: 'proxy',
|
|
91
157
|
connectWebmeshNode: Effect.fnUntraced(function* ({ webmeshNode }) {
|
|
92
|
-
if (devtoolsOptions.enabled) {
|
|
158
|
+
if (devtoolsOptions.enabled === true) {
|
|
93
159
|
yield* Webmesh.connectViaWebSocket({
|
|
94
160
|
node: webmeshNode,
|
|
95
161
|
url: `ws://${devtoolsOptions.host}:${devtoolsOptions.port}`,
|
|
@@ -104,6 +170,7 @@ sessionId = 'static', testing, resetPersistence = false, leaderThread: leaderThr
|
|
|
104
170
|
isLeader: true,
|
|
105
171
|
// Not really applicable for node as there is no "reload the app" concept
|
|
106
172
|
registerBeforeUnload: (_onBeforeUnload) => () => { },
|
|
173
|
+
origin: undefined,
|
|
107
174
|
});
|
|
108
175
|
return clientSession;
|
|
109
176
|
}).pipe(Effect.withSpan('@livestore/adapter-node:adapter'), Effect.provide(Layer.mergeAll(PlatformNode.NodeFileSystem.layer, FetchHttpClient.layer))));
|
|
@@ -114,47 +181,58 @@ const resetNodePersistence = ({ storage, storeId, }) => {
|
|
|
114
181
|
const directory = path.join(storage.baseDirectory ?? '', storeId);
|
|
115
182
|
return Effect.gen(function* () {
|
|
116
183
|
const fs = yield* FileSystem.FileSystem;
|
|
117
|
-
const directoryExists = yield* fs.exists(directory).pipe(
|
|
184
|
+
const directoryExists = yield* fs.exists(directory).pipe(UnknownError.mapToUnknownError);
|
|
118
185
|
if (directoryExists === false) {
|
|
119
186
|
return;
|
|
120
187
|
}
|
|
121
|
-
yield* fs.remove(directory, { recursive: true }).pipe(
|
|
188
|
+
yield* fs.remove(directory, { recursive: true }).pipe(UnknownError.mapToUnknownError);
|
|
122
189
|
}).pipe(Effect.retry({ schedule: Schedule.exponentialBackoff10Sec }), Effect.withSpan('@livestore/adapter-node:resetPersistence', { attributes: { directory } }));
|
|
123
190
|
};
|
|
124
|
-
const makeLocalLeaderThread = ({ storeId, clientId, schema, makeSqliteDb, syncOptions,
|
|
191
|
+
const makeLocalLeaderThread = ({ storeId, clientId, schema, makeSqliteDb, syncOptions, syncPayloadEncoded, syncPayloadSchema, storage, devtools, testing, }) => Effect.gen(function* () {
|
|
125
192
|
const layer = yield* Layer.build(makeLeaderThread({
|
|
126
193
|
storeId,
|
|
127
194
|
clientId,
|
|
128
195
|
schema,
|
|
129
196
|
syncOptions,
|
|
130
197
|
storage,
|
|
131
|
-
|
|
198
|
+
syncPayloadEncoded,
|
|
199
|
+
syncPayloadSchema,
|
|
132
200
|
devtools,
|
|
133
201
|
makeSqliteDb,
|
|
134
202
|
...omitUndefineds({ testing: testing?.overrides }),
|
|
135
203
|
}).pipe(Layer.unwrapScoped));
|
|
136
204
|
return yield* Effect.gen(function* () {
|
|
137
|
-
const { dbState, dbEventlog, syncProcessor, extraIncomingMessagesQueue, initialState } = yield* LeaderThreadCtx;
|
|
205
|
+
const { dbState, dbEventlog, syncProcessor, extraIncomingMessagesQueue, initialState, networkStatus } = yield* LeaderThreadCtx;
|
|
138
206
|
const initialLeaderHead = Eventlog.getClientHeadFromDb(dbEventlog);
|
|
139
207
|
const leaderThread = ClientSessionLeaderThreadProxy.of({
|
|
140
208
|
events: {
|
|
141
209
|
pull: ({ cursor }) => syncProcessor.pull({ cursor }),
|
|
142
|
-
push: (batch) => syncProcessor.push(batch.map((item) => new LiveStoreEvent.EncodedWithMeta(item)), { waitForProcessing: true }),
|
|
210
|
+
push: (batch) => syncProcessor.push(batch.map((item) => new LiveStoreEvent.Client.EncodedWithMeta(item)), { waitForProcessing: true }),
|
|
211
|
+
stream: (options) => streamEventsWithSyncState({
|
|
212
|
+
dbEventlog,
|
|
213
|
+
syncState: syncProcessor.syncState,
|
|
214
|
+
options,
|
|
215
|
+
}),
|
|
216
|
+
},
|
|
217
|
+
initialState: {
|
|
218
|
+
leaderHead: initialLeaderHead,
|
|
219
|
+
migrationsReport: initialState.migrationsReport,
|
|
220
|
+
storageMode: 'persisted',
|
|
143
221
|
},
|
|
144
|
-
initialState: { leaderHead: initialLeaderHead, migrationsReport: initialState.migrationsReport },
|
|
145
222
|
export: Effect.sync(() => dbState.export()),
|
|
146
223
|
getEventlogData: Effect.sync(() => dbEventlog.export()),
|
|
147
|
-
|
|
224
|
+
syncState: syncProcessor.syncState,
|
|
148
225
|
sendDevtoolsMessage: (message) => extraIncomingMessagesQueue.offer(message),
|
|
226
|
+
networkStatus,
|
|
149
227
|
}, { ...omitUndefineds({ overrides: testing?.overrides?.clientSession?.leaderThreadProxy }) });
|
|
150
228
|
const initialSnapshot = dbState.export();
|
|
151
229
|
return { leaderThread, initialSnapshot };
|
|
152
230
|
}).pipe(Effect.provide(layer));
|
|
153
231
|
});
|
|
154
|
-
const makeWorkerLeaderThread = ({ shutdown, storeId, clientId, sessionId, workerUrl, workerExtraArgs, storage, devtools, bootStatusQueue,
|
|
232
|
+
const makeWorkerLeaderThread = ({ shutdown, storeId, clientId, sessionId, workerUrl, workerExtraArgs, storage, devtools, bootStatusQueue, syncPayloadEncoded, testing, }) => Effect.gen(function* () {
|
|
155
233
|
const nodeWorker = new WT.Worker(workerUrl, {
|
|
156
|
-
execArgv: process.env.DEBUG_WORKER ? ['--inspect --enable-source-maps'] : ['--enable-source-maps'],
|
|
157
|
-
argv: [Schema.
|
|
234
|
+
execArgv: process.env.DEBUG_WORKER !== undefined ? ['--inspect --enable-source-maps'] : ['--enable-source-maps'],
|
|
235
|
+
argv: [yield* Schema.encode(WorkerSchema.WorkerArgv)({ storeId, clientId, sessionId, extraArgs: workerExtraArgs }).pipe(Effect.orDie)],
|
|
158
236
|
});
|
|
159
237
|
const nodeWorkerLayer = yield* Layer.build(PlatformNode.NodeWorker.layer(() => nodeWorker));
|
|
160
238
|
const worker = yield* Worker.makePoolSerialized({
|
|
@@ -165,41 +243,42 @@ const makeWorkerLeaderThread = ({ shutdown, storeId, clientId, sessionId, worker
|
|
|
165
243
|
clientId,
|
|
166
244
|
storage,
|
|
167
245
|
devtools,
|
|
168
|
-
|
|
246
|
+
syncPayloadEncoded,
|
|
169
247
|
}),
|
|
170
|
-
}).pipe(Effect.provide(nodeWorkerLayer),
|
|
171
|
-
const runInWorker = (req) => worker.executeEffect(req).pipe(Effect.logWarnIfTakesLongerThan({
|
|
248
|
+
}).pipe(Effect.provide(nodeWorkerLayer), UnknownError.mapToUnknownError, Effect.tapErrorCause((cause) => shutdown(Exit.failCause(cause))), Effect.withSpan('@livestore/adapter-node:adapter:setupLeaderThread'));
|
|
249
|
+
const runInWorker = (req) => worker.executeEffect(req).pipe(Effect.catchIf(isWorkerTransportError, (e) => Effect.die(e)), Effect.logWarnIfTakesLongerThan({
|
|
172
250
|
label: `@livestore/adapter-node:client-session:runInWorker:${req._tag}`,
|
|
173
251
|
duration: 2000,
|
|
174
|
-
}), Effect.withSpan(`@livestore/adapter-node:client-session:runInWorker:${req._tag}`)
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
? new UnexpectedError({ cause })
|
|
178
|
-
: cause), Effect.catchAllDefect((cause) => new UnexpectedError({ cause })));
|
|
179
|
-
const runInWorkerStream = (req) => worker.execute(req).pipe(Stream.mapError((cause) => Schema.is(UnexpectedError)(cause)
|
|
180
|
-
? cause
|
|
181
|
-
: ParseResult.isParseError(cause) || Schema.is(WorkerError.WorkerError)(cause)
|
|
182
|
-
? new UnexpectedError({ cause })
|
|
183
|
-
: cause), Stream.withSpan(`@livestore/adapter-node:client-session:runInWorkerStream:${req._tag}`));
|
|
184
|
-
const bootStatusFiber = yield* runInWorkerStream(new WorkerSchema.LeaderWorkerInnerBootStatusStream()).pipe(Stream.tap((bootStatus) => Queue.offer(bootStatusQueue, bootStatus)), Stream.runDrain, Effect.tapErrorCause((cause) => (Cause.isInterruptedOnly(cause) ? Effect.void : shutdown(Exit.failCause(cause)))), Effect.interruptible, Effect.tapCauseLogPretty, Effect.forkScoped);
|
|
252
|
+
}), Effect.withSpan(`@livestore/adapter-node:client-session:runInWorker:${req._tag}`));
|
|
253
|
+
const runInWorkerStream = (req) => worker.execute(req).pipe(Stream.refineOrDie((e) => isWorkerTransportError(e) === true ? Option.none() : Option.some(e)), Stream.withSpan(`@livestore/adapter-node:client-session:runInWorkerStream:${req._tag}`));
|
|
254
|
+
const bootStatusFiber = yield* runInWorkerStream(new WorkerSchema.LeaderWorkerInnerBootStatusStream()).pipe(Stream.tap((bootStatus) => Queue.offer(bootStatusQueue, bootStatus)), Stream.runDrain, Effect.tapErrorCause((cause) => (Cause.isInterruptedOnly(cause) === true ? Effect.void : shutdown(Exit.failCause(cause)))), Effect.interruptible, Effect.tapCauseLogPretty, Effect.forkScoped);
|
|
185
255
|
yield* Queue.awaitShutdown(bootStatusQueue).pipe(Effect.andThen(Fiber.interrupt(bootStatusFiber)), Effect.tapCauseLogPretty, Effect.forkScoped);
|
|
186
256
|
const initialLeaderHead = yield* runInWorker(new WorkerSchema.LeaderWorkerInnerGetLeaderHead());
|
|
187
|
-
const bootResult = yield* runInWorker(new WorkerSchema.LeaderWorkerInnerGetRecreateSnapshot()).pipe(Effect.
|
|
257
|
+
const bootResult = yield* runInWorker(new WorkerSchema.LeaderWorkerInnerGetRecreateSnapshot()).pipe(Effect.timeoutOrDie(10_000), Effect.withSpan('@livestore/adapter-node:client-session:export'));
|
|
188
258
|
const leaderThread = ClientSessionLeaderThreadProxy.of({
|
|
189
259
|
events: {
|
|
190
260
|
pull: ({ cursor }) => runInWorkerStream(new WorkerSchema.LeaderWorkerInnerPullStream({ cursor })).pipe(Stream.orDie),
|
|
191
261
|
push: (batch) => runInWorker(new WorkerSchema.LeaderWorkerInnerPushToLeader({ batch })).pipe(Effect.withSpan('@livestore/adapter-node:client-session:pushToLeader', {
|
|
192
262
|
attributes: { batchSize: batch.length },
|
|
193
263
|
})),
|
|
264
|
+
stream: (options) => runInWorkerStream(new WorkerSchema.LeaderWorkerInnerStreamEvents(options)).pipe(Stream.withSpan('@livestore/adapter-node:client-session:streamEvents'), Stream.orDie),
|
|
194
265
|
},
|
|
195
266
|
initialState: {
|
|
196
267
|
leaderHead: initialLeaderHead,
|
|
197
268
|
migrationsReport: bootResult.migrationsReport,
|
|
269
|
+
storageMode: 'persisted',
|
|
198
270
|
},
|
|
199
|
-
export: runInWorker(new WorkerSchema.LeaderWorkerInnerExport()).pipe(Effect.
|
|
271
|
+
export: runInWorker(new WorkerSchema.LeaderWorkerInnerExport()).pipe(Effect.timeoutOrDie(10_000), Effect.withSpan('@livestore/adapter-node:client-session:export')),
|
|
200
272
|
getEventlogData: Effect.dieMessage('Not implemented'),
|
|
201
|
-
|
|
202
|
-
|
|
273
|
+
syncState: Subscribable.make({
|
|
274
|
+
get: runInWorker(new WorkerSchema.LeaderWorkerInnerGetLeaderSyncState()).pipe(Effect.withSpan('@livestore/adapter-node:client-session:getLeaderSyncState')),
|
|
275
|
+
changes: runInWorkerStream(new WorkerSchema.LeaderWorkerInnerSyncStateStream()).pipe(Stream.orDie),
|
|
276
|
+
}),
|
|
277
|
+
sendDevtoolsMessage: (message) => runInWorker(new WorkerSchema.LeaderWorkerInnerExtraDevtoolsMessage({ message })).pipe(Effect.withSpan('@livestore/adapter-node:client-session:devtoolsMessageForLeader')),
|
|
278
|
+
networkStatus: Subscribable.make({
|
|
279
|
+
get: runInWorker(new WorkerSchema.LeaderWorkerInnerGetNetworkStatus()).pipe(Effect.orDie),
|
|
280
|
+
changes: runInWorkerStream(new WorkerSchema.LeaderWorkerInnerNetworkStatusStream()).pipe(Stream.orDie),
|
|
281
|
+
}),
|
|
203
282
|
}, {
|
|
204
283
|
...omitUndefineds({ overrides: testing?.overrides?.clientSession?.leaderThreadProxy }),
|
|
205
284
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/client-session/adapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/client-session/adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"devtools-server.d.ts","sourceRoot":"","sources":["../../src/devtools/devtools-server.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAEL,MAAM,EAQP,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"devtools-server.d.ts","sourceRoot":"","sources":["../../src/devtools/devtools-server.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AACzD,OAAO,EAEL,MAAM,EAQP,MAAM,yBAAyB,CAAA;AAgBhC;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAAI,gDAKjC;IACD,UAAU,EAAE,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;IAC1C,iBAAiB,EAAE,QAAQ,CAAC,WAAW,CAAC,WAAW,GAAG,SAAS,CAAA;IAC/D,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;CACb,KAAG,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,UAAU,CAqGlD,CAAA"}
|
|
@@ -5,6 +5,14 @@ import { Deferred, Effect, Exit, Headers, HttpMiddleware, HttpServer, HttpServer
|
|
|
5
5
|
import { PlatformNode } from '@livestore/utils/node';
|
|
6
6
|
import { makeMeshNode, makeWebSocketEdge } from '@livestore/webmesh';
|
|
7
7
|
import { makeViteMiddleware } from "./vite-dev-server.js";
|
|
8
|
+
/**
|
|
9
|
+
* Determines if a request URL should be routed to the Vite middleware.
|
|
10
|
+
* Includes LiveStore devtools paths and Vite internal paths like `/@fs/`, `/@vite/`, etc.
|
|
11
|
+
*/
|
|
12
|
+
const shouldRouteToVite = (url) => url.startsWith('/_livestore') ||
|
|
13
|
+
url.startsWith('/@fs') ||
|
|
14
|
+
url.startsWith('/@vite') ||
|
|
15
|
+
url.startsWith('/@react-refresh');
|
|
8
16
|
/**
|
|
9
17
|
* Starts a devtools HTTP/WS server which serves ...
|
|
10
18
|
* - the Devtools UI via Vite
|
|
@@ -13,11 +21,11 @@ import { makeViteMiddleware } from "./vite-dev-server.js";
|
|
|
13
21
|
export const startDevtoolsServer = ({ schemaPath, clientSessionInfo, port, host, }) => Effect.gen(function* () {
|
|
14
22
|
const viteMiddleware = yield* makeViteMiddleware({
|
|
15
23
|
mode: { _tag: 'node', url: `http://${host}:${port}` },
|
|
16
|
-
schemaPath: isReadonlyArray(schemaPath)
|
|
24
|
+
schemaPath: isReadonlyArray(schemaPath) === true
|
|
17
25
|
? schemaPath.map((schemaPath) => path.resolve(process.cwd(), schemaPath))
|
|
18
26
|
: path.resolve(process.cwd(), schemaPath),
|
|
19
27
|
viteConfig: (viteConfig) => {
|
|
20
|
-
if (LS_DEV) {
|
|
28
|
+
if (LS_DEV === true) {
|
|
21
29
|
viteConfig.server ??= {};
|
|
22
30
|
viteConfig.server.fs ??= {};
|
|
23
31
|
viteConfig.server.fs.strict = false;
|
|
@@ -31,7 +39,7 @@ export const startDevtoolsServer = ({ schemaPath, clientSessionInfo, port, host,
|
|
|
31
39
|
const node = yield* makeMeshNode(relayNodeName);
|
|
32
40
|
const handler = Effect.gen(function* () {
|
|
33
41
|
const req = yield* HttpServerRequest.HttpServerRequest;
|
|
34
|
-
if (Headers.has(req.headers, 'upgrade')) {
|
|
42
|
+
if (Headers.has(req.headers, 'upgrade') === true) {
|
|
35
43
|
// yield* Effect.logDebug(`WS Relay ${relayNodeName}: WS upgrade request ${req.url}`)
|
|
36
44
|
const socket = yield* req.upgrade;
|
|
37
45
|
const { webChannel, from } = yield* makeWebSocketEdge({
|
|
@@ -44,7 +52,7 @@ export const startDevtoolsServer = ({ schemaPath, clientSessionInfo, port, host,
|
|
|
44
52
|
yield* node
|
|
45
53
|
.addEdge({ target: from, edgeChannel: webChannel, replaceIfExists: true })
|
|
46
54
|
.pipe(Effect.acquireRelease(() => node.removeEdge(from).pipe(Effect.orDie)));
|
|
47
|
-
if (LS_DEV) {
|
|
55
|
+
if (LS_DEV === true) {
|
|
48
56
|
yield* Effect.log(`WS Relay ${relayNodeName}: added edge from '${from}'`);
|
|
49
57
|
yield* Effect.addFinalizerLog(`WS Relay ${relayNodeName}: removed edge from '${from}'`);
|
|
50
58
|
}
|
|
@@ -57,7 +65,7 @@ export const startDevtoolsServer = ({ schemaPath, clientSessionInfo, port, host,
|
|
|
57
65
|
if (req.url === '/' || req.url === '') {
|
|
58
66
|
return HttpServerResponse.redirect('/_livestore/node');
|
|
59
67
|
}
|
|
60
|
-
else if (req.url
|
|
68
|
+
else if (shouldRouteToVite(req.url) === true) {
|
|
61
69
|
// Here we're delegating to the Vite middleware
|
|
62
70
|
// TODO replace this once @effect/platform-node supports Node HTTP middlewares
|
|
63
71
|
const nodeReq = PlatformNode.NodeHttpServerRequest.toIncomingMessage(req);
|
|
@@ -71,7 +79,7 @@ export const startDevtoolsServer = ({ schemaPath, clientSessionInfo, port, host,
|
|
|
71
79
|
}
|
|
72
80
|
return HttpServerResponse.text('Not found');
|
|
73
81
|
}).pipe(Effect.tapCauseLogPretty, Effect.interruptible);
|
|
74
|
-
const sessionSuffix = clientSessionInfo
|
|
82
|
+
const sessionSuffix = clientSessionInfo !== undefined
|
|
75
83
|
? `/${clientSessionInfo.storeId}/${clientSessionInfo.clientId}/${clientSessionInfo.sessionId}/${clientSessionInfo.schemaAlias}`
|
|
76
84
|
: '?autoconnect';
|
|
77
85
|
// Use `localhost` instead of `0.0.0.0` as it doesn't have the `navigator.locks` web adapter limitation (https://share.cleanshot.com/nHBnmk6S)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"devtools-server.js","sourceRoot":"","sources":["../../src/devtools/devtools-server.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,IAAI,MAAM,WAAW,CAAA;AAG5B,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAE1D,OAAO,EACL,QAAQ,EACR,MAAM,EACN,IAAI,EACJ,OAAO,EACP,cAAc,EACd,UAAU,EACV,iBAAiB,EACjB,kBAAkB,EAClB,KAAK,GACN,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAEpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAClC,UAAU,EACV,iBAAiB,EACjB,IAAI,EACJ,IAAI,GAML,EAAsD,EAAE,CACvD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,kBAAkB,CAAC;QAC/C,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,IAAI,IAAI,IAAI,EAAE,EAAE;QACrD,UAAU,
|
|
1
|
+
{"version":3,"file":"devtools-server.js","sourceRoot":"","sources":["../../src/devtools/devtools-server.ts"],"names":[],"mappings":"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"}
|
package/dist/devtools/mod.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { startDevtoolsServer } from './devtools-server.ts';
|
|
2
2
|
export type { ViteDevtoolsOptions } from './vite-dev-server.ts';
|
|
3
|
-
export { makeViteMiddleware } from './vite-dev-server.ts';
|
|
3
|
+
export { DevtoolsViteNotInstalledError, makeViteMiddleware } from './vite-dev-server.ts';
|
|
4
4
|
//# sourceMappingURL=mod.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/devtools/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC1D,YAAY,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA"}
|
|
1
|
+
{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/devtools/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC1D,YAAY,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,EAAE,6BAA6B,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA"}
|
package/dist/devtools/mod.js
CHANGED
package/dist/devtools/mod.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/devtools/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAE1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA"}
|
|
1
|
+
{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/devtools/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAE1D,OAAO,EAAE,6BAA6B,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA"}
|
|
@@ -1,7 +1,28 @@
|
|
|
1
|
+
import type * as Vite from 'vite';
|
|
1
2
|
import type { Devtools } from '@livestore/common';
|
|
2
|
-
import {
|
|
3
|
-
import { Effect } from '@livestore/utils/effect';
|
|
4
|
-
|
|
3
|
+
import { UnknownError } from '@livestore/common';
|
|
4
|
+
import { Effect, Schema } from '@livestore/utils/effect';
|
|
5
|
+
declare const DevtoolsViteNotInstalledError_base: Schema.TaggedErrorClass<DevtoolsViteNotInstalledError, "DevtoolsViteNotInstalledError", {
|
|
6
|
+
readonly _tag: Schema.tag<"DevtoolsViteNotInstalledError">;
|
|
7
|
+
} & {
|
|
8
|
+
cause: typeof Schema.Defect;
|
|
9
|
+
}>;
|
|
10
|
+
/**
|
|
11
|
+
* Error thrown when @livestore/devtools-vite is not installed.
|
|
12
|
+
* This is a peer dependency that must be installed separately.
|
|
13
|
+
*/
|
|
14
|
+
export declare class DevtoolsViteNotInstalledError extends DevtoolsViteNotInstalledError_base {
|
|
15
|
+
get message(): string;
|
|
16
|
+
}
|
|
17
|
+
declare const ViteNotInstalledError_base: Schema.TaggedErrorClass<ViteNotInstalledError, "ViteNotInstalledError", {
|
|
18
|
+
readonly _tag: Schema.tag<"ViteNotInstalledError">;
|
|
19
|
+
} & {
|
|
20
|
+
cause: typeof Schema.Defect;
|
|
21
|
+
}>;
|
|
22
|
+
/** Error thrown when vite is not installed for the devtools server path. */
|
|
23
|
+
export declare class ViteNotInstalledError extends ViteNotInstalledError_base {
|
|
24
|
+
get message(): string;
|
|
25
|
+
}
|
|
5
26
|
export type ViteDevtoolsOptions = {
|
|
6
27
|
viteConfig?: (config: Vite.UserConfig) => Vite.UserConfig;
|
|
7
28
|
/**
|
|
@@ -20,5 +41,6 @@ export type ViteDevtoolsOptions = {
|
|
|
20
41
|
_tag: 'node';
|
|
21
42
|
}>;
|
|
22
43
|
};
|
|
23
|
-
export declare const makeViteMiddleware: (options: ViteDevtoolsOptions) => Effect.Effect<Vite.ViteDevServer,
|
|
44
|
+
export declare const makeViteMiddleware: (options: ViteDevtoolsOptions) => Effect.Effect<Vite.ViteDevServer, DevtoolsViteNotInstalledError | ViteNotInstalledError | UnknownError>;
|
|
45
|
+
export {};
|
|
24
46
|
//# sourceMappingURL=vite-dev-server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vite-dev-server.d.ts","sourceRoot":"","sources":["../../src/devtools/vite-dev-server.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"vite-dev-server.d.ts","sourceRoot":"","sources":["../../src/devtools/vite-dev-server.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,IAAI,MAAM,MAAM,CAAA;AAEjC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;;;;;;AAGxD;;;GAGG;AACH,qBAAa,6BAA8B,SAAQ,kCAIjD;IACA,IAAa,OAAO,IAAI,MAAM,CAM7B;CACF;;;;;;AAED,4EAA4E;AAC5E,qBAAa,qBAAsB,SAAQ,0BAIzC;IACA,IAAa,OAAO,IAAI,MAAM,CAK7B;CACF;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,UAAU,CAAA;IACzD;;;;;OAKG;IACH,UAAU,EAAE,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAA;IAC1C;;;;OAIG;IACH,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACvD,CAAA;AAGD,eAAO,MAAM,kBAAkB,GAC7B,SAAS,mBAAmB,KAC3B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,6BAA6B,GAAG,qBAAqB,GAAG,YAAY,CAsC5B,CAAA"}
|