@livestore/sync-cf 0.3.0-dev.22 → 0.3.0-dev.23
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/cf-worker/worker.d.ts +7 -1
- package/dist/cf-worker/worker.d.ts.map +1 -1
- package/dist/cf-worker/worker.js +35 -8
- package/dist/cf-worker/worker.js.map +1 -1
- package/dist/common/mod.d.ts +5 -0
- package/dist/common/mod.d.ts.map +1 -1
- package/dist/common/mod.js +5 -0
- package/dist/common/mod.js.map +1 -1
- package/dist/sync-impl/ws-impl.d.ts +6 -3
- package/dist/sync-impl/ws-impl.d.ts.map +1 -1
- package/dist/sync-impl/ws-impl.js +9 -5
- package/dist/sync-impl/ws-impl.js.map +1 -1
- package/package.json +3 -3
- package/src/cf-worker/worker.ts +72 -28
- package/src/common/mod.ts +7 -0
- package/src/sync-impl/ws-impl.ts +16 -6
|
@@ -1,6 +1,12 @@
|
|
|
1
|
+
import type { Schema } from '@livestore/utils/effect';
|
|
1
2
|
import type { Env } from './durable-object.js';
|
|
2
3
|
export type CFWorker = {
|
|
3
4
|
fetch: (request: Request, env: Env, ctx: ExecutionContext) => Promise<Response>;
|
|
4
5
|
};
|
|
5
|
-
export
|
|
6
|
+
export type MakeWorkerOptions = {
|
|
7
|
+
validatePayload?: (payload: Schema.JsonValue | undefined) => void | Promise<void>;
|
|
8
|
+
/** @default false */
|
|
9
|
+
enableCORS?: boolean;
|
|
10
|
+
};
|
|
11
|
+
export declare const makeWorker: (options?: MakeWorkerOptions) => CFWorker;
|
|
6
12
|
//# sourceMappingURL=worker.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/cf-worker/worker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/cf-worker/worker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAIrD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAE9C,MAAM,MAAM,QAAQ,GAAG;IACrB,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,gBAAgB,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;CAChF,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,GAAG,SAAS,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACjF,qBAAqB;IACrB,UAAU,CAAC,EAAE,OAAO,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,UAAS,iBAAsB,KAAG,QAiE5D,CAAA"}
|
package/dist/cf-worker/worker.js
CHANGED
|
@@ -1,18 +1,44 @@
|
|
|
1
|
-
|
|
1
|
+
import { UnexpectedError } from '@livestore/common';
|
|
2
|
+
import { Effect, UrlParams } from '@livestore/utils/effect';
|
|
3
|
+
import { SearchParamsSchema } from '../common/mod.js';
|
|
4
|
+
export const makeWorker = (options = {}) => {
|
|
2
5
|
return {
|
|
3
|
-
fetch: async (request, env, _ctx) => {
|
|
6
|
+
fetch: async (request, env, _ctx) => Effect.gen(function* () {
|
|
4
7
|
const url = new URL(request.url);
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
|
|
8
|
-
|
|
8
|
+
const urlParams = UrlParams.fromInput(url.searchParams);
|
|
9
|
+
const paramsResult = yield* UrlParams.schemaStruct(SearchParamsSchema)(urlParams).pipe(Effect.either);
|
|
10
|
+
const corsHeaders = options.enableCORS
|
|
11
|
+
? {
|
|
12
|
+
'Access-Control-Allow-Origin': '*',
|
|
13
|
+
'Access-Control-Allow-Methods': 'GET, POST, OPTIONS',
|
|
14
|
+
'Access-Control-Allow-Headers': request.headers.get('Access-Control-Request-Headers') ?? '*',
|
|
15
|
+
}
|
|
16
|
+
: {};
|
|
17
|
+
if (request.method === 'OPTIONS' && options.enableCORS) {
|
|
18
|
+
return new Response(null, {
|
|
19
|
+
status: 204,
|
|
20
|
+
headers: corsHeaders,
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
if (paramsResult._tag === 'Left') {
|
|
24
|
+
return new Response(`Invalid search params: ${paramsResult.left.toString()}`, {
|
|
25
|
+
status: 500,
|
|
26
|
+
headers: corsHeaders,
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
const { storeId, payload } = paramsResult.right;
|
|
30
|
+
if (options.validatePayload !== undefined) {
|
|
31
|
+
const result = yield* Effect.promise(async () => options.validatePayload(payload)).pipe(UnexpectedError.mapToUnexpectedError, Effect.either);
|
|
32
|
+
if (result._tag === 'Left') {
|
|
33
|
+
return new Response(result.left.toString(), { status: 400, headers: corsHeaders });
|
|
34
|
+
}
|
|
9
35
|
}
|
|
10
36
|
const id = env.WEBSOCKET_SERVER.idFromName(storeId);
|
|
11
37
|
const durableObject = env.WEBSOCKET_SERVER.get(id);
|
|
12
38
|
if (url.pathname.endsWith('/websocket')) {
|
|
13
39
|
const upgradeHeader = request.headers.get('Upgrade');
|
|
14
40
|
if (!upgradeHeader || upgradeHeader !== 'websocket') {
|
|
15
|
-
return new Response('Durable Object expected Upgrade: websocket', { status: 426 });
|
|
41
|
+
return new Response('Durable Object expected Upgrade: websocket', { status: 426, headers: corsHeaders });
|
|
16
42
|
}
|
|
17
43
|
return durableObject.fetch(request);
|
|
18
44
|
}
|
|
@@ -20,10 +46,11 @@ export const makeWorker = () => {
|
|
|
20
46
|
status: 400,
|
|
21
47
|
statusText: 'Bad Request',
|
|
22
48
|
headers: {
|
|
49
|
+
...corsHeaders,
|
|
23
50
|
'Content-Type': 'text/plain',
|
|
24
51
|
},
|
|
25
52
|
});
|
|
26
|
-
},
|
|
53
|
+
}).pipe(Effect.tapCauseLogPretty, Effect.runPromise),
|
|
27
54
|
};
|
|
28
55
|
};
|
|
29
56
|
//# sourceMappingURL=worker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/cf-worker/worker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/cf-worker/worker.ts"],"names":[],"mappings":"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"}
|
package/dist/common/mod.d.ts
CHANGED
|
@@ -1,2 +1,7 @@
|
|
|
1
|
+
import { Schema } from '@livestore/utils/effect';
|
|
1
2
|
export * as WSMessage from './ws-message-types.js';
|
|
3
|
+
export declare const SearchParamsSchema: Schema.Struct<{
|
|
4
|
+
storeId: typeof Schema.String;
|
|
5
|
+
payload: Schema.UndefinedOr<Schema.transform<Schema.transformOrFail<Schema.SchemaClass<string, string, never>, typeof Schema.String, never>, Schema.transform<Schema.SchemaClass<unknown, string, never>, Schema.Schema<Schema.JsonValue, Schema.JsonValue, never>>>>;
|
|
6
|
+
}>;
|
|
2
7
|
//# sourceMappingURL=mod.d.ts.map
|
package/dist/common/mod.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/common/mod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA"}
|
|
1
|
+
{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/common/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA;AAElD,eAAO,MAAM,kBAAkB;;;EAG7B,CAAA"}
|
package/dist/common/mod.js
CHANGED
|
@@ -1,2 +1,7 @@
|
|
|
1
|
+
import { Schema } from '@livestore/utils/effect';
|
|
1
2
|
export * as WSMessage from './ws-message-types.js';
|
|
3
|
+
export const SearchParamsSchema = Schema.Struct({
|
|
4
|
+
storeId: Schema.String,
|
|
5
|
+
payload: Schema.compose(Schema.StringFromUriComponent, Schema.parseJson(Schema.JsonValue)).pipe(Schema.UndefinedOr),
|
|
6
|
+
});
|
|
2
7
|
//# sourceMappingURL=mod.js.map
|
package/dist/common/mod.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/common/mod.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA"}
|
|
1
|
+
{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/common/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA;AAElD,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC9C,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,sBAAsB,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;CACpH,CAAC,CAAA"}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import type { SyncBackend } from '@livestore/common';
|
|
2
|
-
import
|
|
3
|
-
import {
|
|
2
|
+
import { UnexpectedError } from '@livestore/common';
|
|
3
|
+
import type { HttpClient, Scope } from '@livestore/utils/effect';
|
|
4
|
+
import { Effect, Schema } from '@livestore/utils/effect';
|
|
4
5
|
import type { SyncMetadata } from '../common/ws-message-types.js';
|
|
5
6
|
export interface WsSyncOptions {
|
|
6
7
|
url: string;
|
|
7
8
|
storeId: string;
|
|
9
|
+
/** Payload can be used to implement custom business logic (e.g. authentication). */
|
|
10
|
+
payload?: Schema.JsonValue;
|
|
8
11
|
}
|
|
9
|
-
export declare const makeWsSync: (options: WsSyncOptions) => Effect.Effect<SyncBackend<SyncMetadata>,
|
|
12
|
+
export declare const makeWsSync: (options: WsSyncOptions) => Effect.Effect<SyncBackend<SyncMetadata>, UnexpectedError, Scope.Scope | HttpClient.HttpClient>;
|
|
10
13
|
//# sourceMappingURL=ws-impl.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-impl.d.ts","sourceRoot":"","sources":["../../src/sync-impl/ws-impl.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"ws-impl.d.ts","sourceRoot":"","sources":["../../src/sync-impl/ws-impl.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,EAAsC,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAGvF,OAAO,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAChE,OAAO,EAEL,MAAM,EAKN,MAAM,EAKP,MAAM,yBAAyB,CAAA;AAIhC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAEjE,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;IACf,oFAAoF;IACpF,OAAO,CAAC,EAAE,MAAM,CAAC,SAAS,CAAA;CAC3B;AAED,eAAO,MAAM,UAAU,GACrB,SAAS,aAAa,KACrB,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,CAoH5F,CAAA"}
|
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
/// <reference lib="dom" />
|
|
2
|
-
import { InvalidPullError, InvalidPushError } from '@livestore/common';
|
|
2
|
+
import { InvalidPullError, InvalidPushError, UnexpectedError } from '@livestore/common';
|
|
3
3
|
import { EventId } from '@livestore/common/schema';
|
|
4
4
|
import { LS_DEV, shouldNeverHappen } from '@livestore/utils';
|
|
5
|
-
import { Deferred, Effect, Option, PubSub, Queue, Schedule, Schema, Stream, SubscriptionRef, WebSocket, } from '@livestore/utils/effect';
|
|
5
|
+
import { Deferred, Effect, Option, PubSub, Queue, Schedule, Schema, Stream, SubscriptionRef, UrlParams, WebSocket, } from '@livestore/utils/effect';
|
|
6
6
|
import { nanoid } from '@livestore/utils/nanoid';
|
|
7
|
-
import { WSMessage } from '../common/mod.js';
|
|
7
|
+
import { SearchParamsSchema, WSMessage } from '../common/mod.js';
|
|
8
8
|
export const makeWsSync = (options) => Effect.gen(function* () {
|
|
9
|
-
|
|
10
|
-
|
|
9
|
+
const urlParamsData = yield* Schema.encode(SearchParamsSchema)({
|
|
10
|
+
storeId: options.storeId,
|
|
11
|
+
payload: options.payload,
|
|
12
|
+
}).pipe(UnexpectedError.mapToUnexpectedError);
|
|
13
|
+
const urlParams = UrlParams.fromInput(urlParamsData);
|
|
14
|
+
const wsUrl = `${options.url}/websocket?${UrlParams.toString(urlParams)}`;
|
|
11
15
|
const { isConnected, incomingMessages, send } = yield* connect(wsUrl);
|
|
12
16
|
/**
|
|
13
17
|
* We need to account for the scenario where push-caused PullRes message arrive before the pull-caused PullRes message.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-impl.js","sourceRoot":"","sources":["../../src/sync-impl/ws-impl.ts"],"names":[],"mappings":"AAAA,2BAA2B;AAG3B,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"ws-impl.js","sourceRoot":"","sources":["../../src/sync-impl/ws-impl.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@livestore/sync-cf",
|
|
3
|
-
"version": "0.3.0-dev.
|
|
3
|
+
"version": "0.3.0-dev.23",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"sideEffects": false,
|
|
6
6
|
"exports": {
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
}
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@livestore/common": "0.3.0-dev.
|
|
18
|
-
"@livestore/utils": "0.3.0-dev.
|
|
17
|
+
"@livestore/common": "0.3.0-dev.23",
|
|
18
|
+
"@livestore/utils": "0.3.0-dev.23"
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
21
|
"@cloudflare/workers-types": "^4.20250303.0"
|
package/src/cf-worker/worker.ts
CHANGED
|
@@ -1,39 +1,83 @@
|
|
|
1
|
+
import { UnexpectedError } from '@livestore/common'
|
|
2
|
+
import type { Schema } from '@livestore/utils/effect'
|
|
3
|
+
import { Effect, UrlParams } from '@livestore/utils/effect'
|
|
4
|
+
|
|
5
|
+
import { SearchParamsSchema } from '../common/mod.js'
|
|
1
6
|
import type { Env } from './durable-object.js'
|
|
2
7
|
|
|
3
8
|
export type CFWorker = {
|
|
4
9
|
fetch: (request: Request, env: Env, ctx: ExecutionContext) => Promise<Response>
|
|
5
10
|
}
|
|
6
11
|
|
|
7
|
-
export
|
|
12
|
+
export type MakeWorkerOptions = {
|
|
13
|
+
validatePayload?: (payload: Schema.JsonValue | undefined) => void | Promise<void>
|
|
14
|
+
/** @default false */
|
|
15
|
+
enableCORS?: boolean
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export const makeWorker = (options: MakeWorkerOptions = {}): CFWorker => {
|
|
8
19
|
return {
|
|
9
|
-
fetch: async (request, env, _ctx) =>
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
if (
|
|
24
|
-
return new Response(
|
|
20
|
+
fetch: async (request, env, _ctx) =>
|
|
21
|
+
Effect.gen(function* () {
|
|
22
|
+
const url = new URL(request.url)
|
|
23
|
+
const urlParams = UrlParams.fromInput(url.searchParams)
|
|
24
|
+
const paramsResult = yield* UrlParams.schemaStruct(SearchParamsSchema)(urlParams).pipe(Effect.either)
|
|
25
|
+
|
|
26
|
+
const corsHeaders: HeadersInit = options.enableCORS
|
|
27
|
+
? {
|
|
28
|
+
'Access-Control-Allow-Origin': '*',
|
|
29
|
+
'Access-Control-Allow-Methods': 'GET, POST, OPTIONS',
|
|
30
|
+
'Access-Control-Allow-Headers': request.headers.get('Access-Control-Request-Headers') ?? '*',
|
|
31
|
+
}
|
|
32
|
+
: {}
|
|
33
|
+
|
|
34
|
+
if (request.method === 'OPTIONS' && options.enableCORS) {
|
|
35
|
+
return new Response(null, {
|
|
36
|
+
status: 204,
|
|
37
|
+
headers: corsHeaders,
|
|
38
|
+
})
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
if (paramsResult._tag === 'Left') {
|
|
42
|
+
return new Response(`Invalid search params: ${paramsResult.left.toString()}`, {
|
|
43
|
+
status: 500,
|
|
44
|
+
headers: corsHeaders,
|
|
45
|
+
})
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
const { storeId, payload } = paramsResult.right
|
|
49
|
+
|
|
50
|
+
if (options.validatePayload !== undefined) {
|
|
51
|
+
const result = yield* Effect.promise(async () => options.validatePayload!(payload)).pipe(
|
|
52
|
+
UnexpectedError.mapToUnexpectedError,
|
|
53
|
+
Effect.either,
|
|
54
|
+
)
|
|
55
|
+
|
|
56
|
+
if (result._tag === 'Left') {
|
|
57
|
+
return new Response(result.left.toString(), { status: 400, headers: corsHeaders })
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
const id = env.WEBSOCKET_SERVER.idFromName(storeId)
|
|
62
|
+
const durableObject = env.WEBSOCKET_SERVER.get(id)
|
|
63
|
+
|
|
64
|
+
if (url.pathname.endsWith('/websocket')) {
|
|
65
|
+
const upgradeHeader = request.headers.get('Upgrade')
|
|
66
|
+
if (!upgradeHeader || upgradeHeader !== 'websocket') {
|
|
67
|
+
return new Response('Durable Object expected Upgrade: websocket', { status: 426, headers: corsHeaders })
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
return durableObject.fetch(request)
|
|
25
71
|
}
|
|
26
72
|
|
|
27
|
-
return
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
})
|
|
37
|
-
},
|
|
73
|
+
return new Response(null, {
|
|
74
|
+
status: 400,
|
|
75
|
+
statusText: 'Bad Request',
|
|
76
|
+
headers: {
|
|
77
|
+
...corsHeaders,
|
|
78
|
+
'Content-Type': 'text/plain',
|
|
79
|
+
},
|
|
80
|
+
})
|
|
81
|
+
}).pipe(Effect.tapCauseLogPretty, Effect.runPromise),
|
|
38
82
|
}
|
|
39
83
|
}
|
package/src/common/mod.ts
CHANGED
|
@@ -1 +1,8 @@
|
|
|
1
|
+
import { Schema } from '@livestore/utils/effect'
|
|
2
|
+
|
|
1
3
|
export * as WSMessage from './ws-message-types.js'
|
|
4
|
+
|
|
5
|
+
export const SearchParamsSchema = Schema.Struct({
|
|
6
|
+
storeId: Schema.String,
|
|
7
|
+
payload: Schema.compose(Schema.StringFromUriComponent, Schema.parseJson(Schema.JsonValue)).pipe(Schema.UndefinedOr),
|
|
8
|
+
})
|
package/src/sync-impl/ws-impl.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/// <reference lib="dom" />
|
|
2
2
|
|
|
3
3
|
import type { SyncBackend } from '@livestore/common'
|
|
4
|
-
import { InvalidPullError, InvalidPushError } from '@livestore/common'
|
|
4
|
+
import { InvalidPullError, InvalidPushError, UnexpectedError } from '@livestore/common'
|
|
5
5
|
import { EventId } from '@livestore/common/schema'
|
|
6
6
|
import { LS_DEV, shouldNeverHappen } from '@livestore/utils'
|
|
7
|
-
import type { Scope } from '@livestore/utils/effect'
|
|
7
|
+
import type { HttpClient, Scope } from '@livestore/utils/effect'
|
|
8
8
|
import {
|
|
9
9
|
Deferred,
|
|
10
10
|
Effect,
|
|
@@ -15,22 +15,32 @@ import {
|
|
|
15
15
|
Schema,
|
|
16
16
|
Stream,
|
|
17
17
|
SubscriptionRef,
|
|
18
|
+
UrlParams,
|
|
18
19
|
WebSocket,
|
|
19
20
|
} from '@livestore/utils/effect'
|
|
20
21
|
import { nanoid } from '@livestore/utils/nanoid'
|
|
21
22
|
|
|
22
|
-
import { WSMessage } from '../common/mod.js'
|
|
23
|
+
import { SearchParamsSchema, WSMessage } from '../common/mod.js'
|
|
23
24
|
import type { SyncMetadata } from '../common/ws-message-types.js'
|
|
24
25
|
|
|
25
26
|
export interface WsSyncOptions {
|
|
26
27
|
url: string
|
|
27
28
|
storeId: string
|
|
29
|
+
/** Payload can be used to implement custom business logic (e.g. authentication). */
|
|
30
|
+
payload?: Schema.JsonValue
|
|
28
31
|
}
|
|
29
32
|
|
|
30
|
-
export const makeWsSync = (
|
|
33
|
+
export const makeWsSync = (
|
|
34
|
+
options: WsSyncOptions,
|
|
35
|
+
): Effect.Effect<SyncBackend<SyncMetadata>, UnexpectedError, Scope.Scope | HttpClient.HttpClient> =>
|
|
31
36
|
Effect.gen(function* () {
|
|
32
|
-
|
|
33
|
-
|
|
37
|
+
const urlParamsData = yield* Schema.encode(SearchParamsSchema)({
|
|
38
|
+
storeId: options.storeId,
|
|
39
|
+
payload: options.payload,
|
|
40
|
+
}).pipe(UnexpectedError.mapToUnexpectedError)
|
|
41
|
+
|
|
42
|
+
const urlParams = UrlParams.fromInput(urlParamsData)
|
|
43
|
+
const wsUrl = `${options.url}/websocket?${UrlParams.toString(urlParams)}`
|
|
34
44
|
|
|
35
45
|
const { isConnected, incomingMessages, send } = yield* connect(wsUrl)
|
|
36
46
|
|