@livestore/devtools-web-common 0.3.0-dev.11 → 0.3.0-dev.4
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/devtools-bridge/index.d.ts +2 -3
- package/dist/devtools-bridge/index.d.ts.map +1 -1
- package/dist/devtools-bridge/index.js +6 -7
- package/dist/devtools-bridge/index.js.map +1 -1
- package/dist/web-channel/index.d.ts.map +1 -1
- package/dist/web-channel/index.js +1 -4
- package/dist/web-channel/index.js.map +1 -1
- package/dist/worker/mod.d.ts.map +1 -1
- package/dist/worker/mod.js +1 -4
- package/dist/worker/mod.js.map +1 -1
- package/package.json +4 -5
- package/src/devtools-bridge/index.ts +7 -14
- package/src/web-channel/index.ts +1 -4
- package/src/worker/mod.ts +1 -5
|
@@ -2,12 +2,11 @@ import { Devtools } from '@livestore/common';
|
|
|
2
2
|
import type { Scope, Worker } from '@livestore/utils/effect';
|
|
3
3
|
import { Effect } from '@livestore/utils/effect';
|
|
4
4
|
import type * as WorkerSchema from '../worker/schema.js';
|
|
5
|
-
export declare const prepareWebDevtoolsBridge: ({ worker, workerTargetName, storeId,
|
|
5
|
+
export declare const prepareWebDevtoolsBridge: ({ worker, workerTargetName, storeId, appHostId, }: {
|
|
6
6
|
worker: Worker.SerializedWorkerPool<typeof WorkerSchema.Request.Type>;
|
|
7
7
|
/** Usually `shared-worker` */
|
|
8
8
|
workerTargetName: string;
|
|
9
9
|
storeId: string;
|
|
10
|
-
|
|
11
|
-
sessionId: string;
|
|
10
|
+
appHostId: string;
|
|
12
11
|
}) => Effect.Effect<Devtools.PrepareDevtoolsBridge, never, Scope.Scope>;
|
|
13
12
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/devtools-bridge/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAoB,MAAM,mBAAmB,CAAA;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,EAAY,MAAM,EAA0B,MAAM,yBAAyB,CAAA;AAGlF,OAAO,KAAK,KAAK,YAAY,MAAM,qBAAqB,CAAA;AAIxD,eAAO,MAAM,wBAAwB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/devtools-bridge/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAoB,MAAM,mBAAmB,CAAA;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,EAAY,MAAM,EAA0B,MAAM,yBAAyB,CAAA;AAGlF,OAAO,KAAK,KAAK,YAAY,MAAM,qBAAqB,CAAA;AAIxD,eAAO,MAAM,wBAAwB,sDAKlC;IACD,MAAM,EAAE,MAAM,CAAC,oBAAoB,CAAC,OAAO,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IACrE,8BAA8B;IAC9B,gBAAgB,EAAE,MAAM,CAAA;IACxB,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,MAAM,CAAA;CAClB,KAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAuG7C,CAAA"}
|
|
@@ -3,7 +3,7 @@ import { Deferred, Effect, PubSub, Schema, Stream } from '@livestore/utils/effec
|
|
|
3
3
|
import { makeChannelForConnectedMeshNode, makeWebDevtoolsConnectedMeshNode } from '../web-channel/index.js';
|
|
4
4
|
// TODO use a unique bridgeId for each connection (similar to web bridge)
|
|
5
5
|
// TODO refactor the bridge creation code to be re-used for both web and node and possibly expo
|
|
6
|
-
export const prepareWebDevtoolsBridge = ({ worker, workerTargetName, storeId,
|
|
6
|
+
export const prepareWebDevtoolsBridge = ({ worker, workerTargetName, storeId, appHostId, }) => Effect.gen(function* () {
|
|
7
7
|
const meshNode = yield* makeWebDevtoolsConnectedMeshNode({
|
|
8
8
|
nodeName: `devtools`,
|
|
9
9
|
target: workerTargetName,
|
|
@@ -16,12 +16,12 @@ export const prepareWebDevtoolsBridge = ({ worker, workerTargetName, storeId, cl
|
|
|
16
16
|
// TODO maybe we need a temporary channel to create a unique bridge channel e..g see appHostInfoDeferred below
|
|
17
17
|
const webDevtoolsChannelStore = yield* makeChannelForConnectedMeshNode({
|
|
18
18
|
node: meshNode,
|
|
19
|
-
target: `
|
|
19
|
+
target: `app-store-${storeId}-${appHostId}`,
|
|
20
20
|
schema: { listen: Devtools.MessageFromAppClientSession, send: Devtools.MessageToAppClientSession },
|
|
21
21
|
});
|
|
22
22
|
const webDevtoolsChannelCoordinator = yield* makeChannelForConnectedMeshNode({
|
|
23
23
|
node: meshNode,
|
|
24
|
-
target:
|
|
24
|
+
target: 'leader-worker',
|
|
25
25
|
schema: { listen: Devtools.MessageFromAppLeader, send: Devtools.MessageToAppLeader },
|
|
26
26
|
});
|
|
27
27
|
const responsePubSub = yield* PubSub.unbounded().pipe(Effect.acquireRelease(PubSub.shutdown));
|
|
@@ -39,9 +39,9 @@ export const prepareWebDevtoolsBridge = ({ worker, workerTargetName, storeId, cl
|
|
|
39
39
|
// yield* webDevtoolsChannelCoordinator.send(Devtools.DevtoolsReady.make({ liveStoreVersion }))
|
|
40
40
|
// const { appHostId, isLeader } = yield* Deferred.await(appHostInfoDeferred)
|
|
41
41
|
// TODO improve disconnect handling
|
|
42
|
-
yield* Deferred.await(webDevtoolsChannelCoordinator.closedDeferred).pipe(Effect.tap(() => PubSub.publish(responsePubSub, Devtools.Disconnect.make({ liveStoreVersion,
|
|
42
|
+
yield* Deferred.await(webDevtoolsChannelCoordinator.closedDeferred).pipe(Effect.tap(() => PubSub.publish(responsePubSub, Devtools.Disconnect.make({ liveStoreVersion, appHostId }))), Effect.tapCauseLogPretty, Effect.forkScoped);
|
|
43
43
|
// TODO improve disconnect handling
|
|
44
|
-
yield* Deferred.await(webDevtoolsChannelStore.closedDeferred).pipe(Effect.tap(() => PubSub.publish(responsePubSub, Devtools.Disconnect.make({ liveStoreVersion,
|
|
44
|
+
yield* Deferred.await(webDevtoolsChannelStore.closedDeferred).pipe(Effect.tap(() => PubSub.publish(responsePubSub, Devtools.Disconnect.make({ liveStoreVersion, appHostId }))), Effect.tapCauseLogPretty, Effect.forkScoped);
|
|
45
45
|
const sendToAppHost = (msg) => Effect.gen(function* () {
|
|
46
46
|
// NOTE it's possible that a message is for both the coordinator and the store (e.g. Disconnect)
|
|
47
47
|
if (Schema.is(Devtools.MessageToAppLeader)(msg)) {
|
|
@@ -57,8 +57,7 @@ export const prepareWebDevtoolsBridge = ({ worker, workerTargetName, storeId, cl
|
|
|
57
57
|
return {
|
|
58
58
|
responsePubSub,
|
|
59
59
|
sendToAppHost,
|
|
60
|
-
|
|
61
|
-
sessionId,
|
|
60
|
+
appHostId,
|
|
62
61
|
copyToClipboard,
|
|
63
62
|
isLeader,
|
|
64
63
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/devtools-bridge/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AAE9D,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAElF,OAAO,EAAE,+BAA+B,EAAE,gCAAgC,EAAE,MAAM,yBAAyB,CAAA;AAG3G,yEAAyE;AACzE,+FAA+F;AAC/F,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,EACvC,MAAM,EACN,gBAAgB,EAChB,OAAO,EACP,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/devtools-bridge/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/web-channel/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/web-channel/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,EAAY,MAAM,EAAU,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAGlD,OAAO,KAAK,YAAY,MAAM,qBAAqB,CAAA;AAEnD,eAAO,MAAM,gCAAgC,kCAI1C;IACD,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAC,oBAAoB,CAAC,OAAO,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;CACtE,0DAOG,CAAA;AAEJ,eAAO,MAAM,+BAA+B,GAAI,SAAS,EAAE,OAAO,EAAE,gBAAgB,EAAE,cAAc,6BAIjG;IACD,IAAI,EAAE,QAAQ,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAA;CACrF,wFAMG,CAAA;AAEJ,eAAO,MAAM,sBAAsB,GAAI,SAAS,EAAE,OAAO,EAAE,gBAAgB,EAAE,cAAc,2DAMxF;IACD,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,UAAU,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAA;IACpF,MAAM,EAAE,MAAM,CAAC,oBAAoB,CAAC,OAAO,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IACrE,gBAAgB,EAAE,MAAM,CAAA;CACzB,KAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,eAAe,EAAE,KAAK,CAAC,KAAK,CAOjB,CAAA;AAExE,eAAO,MAAM,gBAAgB,8BAI1B;IACD,IAAI,EAAE,QAAQ,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAC,oBAAoB,CAAC,OAAO,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;CACtE,sDA2B8C,CAAA"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { UnexpectedError } from '@livestore/common';
|
|
2
|
-
import { LS_DEV } from '@livestore/utils';
|
|
3
2
|
import { Deferred, Effect, Stream, WebChannel } from '@livestore/utils/effect';
|
|
4
3
|
import { makeMeshNode, WebmeshSchema } from '@livestore/webmesh';
|
|
5
4
|
import * as WorkerSchema from '../worker/schema.js';
|
|
@@ -30,8 +29,6 @@ export const connectViaWorker = ({ node, target, worker, }) => Effect.gen(functi
|
|
|
30
29
|
schema: WebmeshSchema.Packet,
|
|
31
30
|
});
|
|
32
31
|
yield* node.addConnection({ target, connectionChannel: sharedWorkerConnection, replaceIfExists: true });
|
|
33
|
-
|
|
34
|
-
yield* Effect.logDebug(`@livestore/devtools-web-common: initiated connection: ${node.nodeName} → ${target}`);
|
|
35
|
-
}
|
|
32
|
+
yield* Effect.logDebug(`@livestore/devtools-web-common: initiated connection: ${node.nodeName} → ${target}`);
|
|
36
33
|
}).pipe(UnexpectedError.mapToUnexpectedError);
|
|
37
34
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/web-channel/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/web-channel/index.ts"],"names":[],"mappings":"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"}
|
package/dist/worker/mod.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/worker/mod.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../../src/worker/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAU,KAAK,EAAE,MAAM,EAAc,MAAM,yBAAyB,CAAA;AACpF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAGlD,OAAO,KAAK,KAAK,kBAAkB,MAAM,aAAa,CAAA;AAEtD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;;UAI3B,QAAQ;;AAFlB,qBAAa,YAAa,SAAQ,iBAG/B;IACD,MAAM,CAAC,KAAK,iBAAkB;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,6CAQb;CACtC;AAED,eAAO,MAAM,gBAAgB,mBAAoB,OAAO,kBAAkB,CAAC,gBAAgB,CAAC,IAAI,2CAmBJ,CAAA"}
|
package/dist/worker/mod.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { LS_DEV } from '@livestore/utils';
|
|
2
1
|
import { Context, Effect, Layer, Stream, WebChannel } from '@livestore/utils/effect';
|
|
3
2
|
import { makeMeshNode, WebmeshSchema } from '@livestore/webmesh';
|
|
4
3
|
export * as Schema from './schema.js';
|
|
@@ -14,9 +13,7 @@ export const CreateConnection = ({ from, port }) => Stream.asyncScoped((emit) =>
|
|
|
14
13
|
const { node } = yield* CacheService;
|
|
15
14
|
const messagePortChannel = yield* WebChannel.messagePortChannel({ port, schema: WebmeshSchema.Packet });
|
|
16
15
|
yield* node.addConnection({ target: from, connectionChannel: messagePortChannel, replaceIfExists: true });
|
|
17
|
-
|
|
18
|
-
yield* Effect.logDebug(`@livestore/devtools-web-common: accepted connection: ${node.nodeName} ← ${from}`);
|
|
19
|
-
}
|
|
16
|
+
yield* Effect.logDebug(`@livestore/devtools-web-common: accepted connection: ${node.nodeName} ← ${from}`);
|
|
20
17
|
emit.single({});
|
|
21
18
|
yield* Effect.spanEvent({ connectedTo: [...node.connectionKeys] });
|
|
22
19
|
// Keep connection alive
|
package/dist/worker/mod.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/worker/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"mod.js","sourceRoot":"","sources":["../../src/worker/mod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpF,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAIhE,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC,MAAM,OAAO,YAAa,SAAQ,OAAO,CAAC,GAAG,CAAC,6CAA6C,CAAC,EAGzF;IACD,MAAM,CAAC,KAAK,GAAG,CAAC,EAAE,QAAQ,EAAwB,EAAE,EAAE,CACpD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QAE1C,0BAA0B;QAC1B,UAAU,CAAC,kBAAkB,GAAG,IAAI,CAAA;QAEpC,OAAO,EAAE,IAAI,EAAE,CAAA;IACjB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAA;;AAGvC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAAmD,EAAE,EAAE,CAClG,MAAM,CAAC,WAAW,CAA0B,CAAC,IAAI,EAAE,EAAE,CACnD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,YAAY,CAAA;IAEpC,MAAM,kBAAkB,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,CAAC,CAAA;IAEvG,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAA;IACzG,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,wDAAwD,IAAI,CAAC,QAAQ,MAAM,IAAI,EAAE,CAAC,CAAA;IAEzG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IAEf,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;IAElE,wBAAwB;IACxB,sBAAsB;IAEtB,YAAY;AACd,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CACtB,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,2DAA2D,IAAI,EAAE,CAAC,CAAC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@livestore/devtools-web-common",
|
|
3
|
-
"version": "0.3.0-dev.
|
|
3
|
+
"version": "0.3.0-dev.4",
|
|
4
4
|
"type": "module",
|
|
5
|
-
"sideEffects": false,
|
|
6
5
|
"exports": {
|
|
7
6
|
"./web-channel": {
|
|
8
7
|
"types": "./dist/web-channel/index.d.ts",
|
|
@@ -18,9 +17,9 @@
|
|
|
18
17
|
}
|
|
19
18
|
},
|
|
20
19
|
"dependencies": {
|
|
21
|
-
"@livestore/common": "0.3.0-dev.
|
|
22
|
-
"@livestore/utils": "0.3.0-dev.
|
|
23
|
-
"@livestore/webmesh": "0.3.0-dev.
|
|
20
|
+
"@livestore/common": "0.3.0-dev.4",
|
|
21
|
+
"@livestore/utils": "0.3.0-dev.4",
|
|
22
|
+
"@livestore/webmesh": "0.3.0-dev.4"
|
|
24
23
|
},
|
|
25
24
|
"devDependencies": {},
|
|
26
25
|
"publishConfig": {
|
|
@@ -11,15 +11,13 @@ export const prepareWebDevtoolsBridge = ({
|
|
|
11
11
|
worker,
|
|
12
12
|
workerTargetName,
|
|
13
13
|
storeId,
|
|
14
|
-
|
|
15
|
-
sessionId,
|
|
14
|
+
appHostId,
|
|
16
15
|
}: {
|
|
17
16
|
worker: Worker.SerializedWorkerPool<typeof WorkerSchema.Request.Type>
|
|
18
17
|
/** Usually `shared-worker` */
|
|
19
18
|
workerTargetName: string
|
|
20
19
|
storeId: string
|
|
21
|
-
|
|
22
|
-
sessionId: string
|
|
20
|
+
appHostId: string
|
|
23
21
|
}): Effect.Effect<Devtools.PrepareDevtoolsBridge, never, Scope.Scope> =>
|
|
24
22
|
Effect.gen(function* () {
|
|
25
23
|
const meshNode = yield* makeWebDevtoolsConnectedMeshNode({
|
|
@@ -37,13 +35,13 @@ export const prepareWebDevtoolsBridge = ({
|
|
|
37
35
|
// TODO maybe we need a temporary channel to create a unique bridge channel e..g see appHostInfoDeferred below
|
|
38
36
|
const webDevtoolsChannelStore = yield* makeChannelForConnectedMeshNode({
|
|
39
37
|
node: meshNode,
|
|
40
|
-
target: `
|
|
38
|
+
target: `app-store-${storeId}-${appHostId}`,
|
|
41
39
|
schema: { listen: Devtools.MessageFromAppClientSession, send: Devtools.MessageToAppClientSession },
|
|
42
40
|
})
|
|
43
41
|
|
|
44
42
|
const webDevtoolsChannelCoordinator = yield* makeChannelForConnectedMeshNode({
|
|
45
43
|
node: meshNode,
|
|
46
|
-
target:
|
|
44
|
+
target: 'leader-worker',
|
|
47
45
|
schema: { listen: Devtools.MessageFromAppLeader, send: Devtools.MessageToAppLeader },
|
|
48
46
|
})
|
|
49
47
|
|
|
@@ -87,18 +85,14 @@ export const prepareWebDevtoolsBridge = ({
|
|
|
87
85
|
|
|
88
86
|
// TODO improve disconnect handling
|
|
89
87
|
yield* Deferred.await(webDevtoolsChannelCoordinator.closedDeferred).pipe(
|
|
90
|
-
Effect.tap(() =>
|
|
91
|
-
PubSub.publish(responsePubSub, Devtools.Disconnect.make({ liveStoreVersion, clientId, sessionId })),
|
|
92
|
-
),
|
|
88
|
+
Effect.tap(() => PubSub.publish(responsePubSub, Devtools.Disconnect.make({ liveStoreVersion, appHostId }))),
|
|
93
89
|
Effect.tapCauseLogPretty,
|
|
94
90
|
Effect.forkScoped,
|
|
95
91
|
)
|
|
96
92
|
|
|
97
93
|
// TODO improve disconnect handling
|
|
98
94
|
yield* Deferred.await(webDevtoolsChannelStore.closedDeferred).pipe(
|
|
99
|
-
Effect.tap(() =>
|
|
100
|
-
PubSub.publish(responsePubSub, Devtools.Disconnect.make({ liveStoreVersion, clientId, sessionId })),
|
|
101
|
-
),
|
|
95
|
+
Effect.tap(() => PubSub.publish(responsePubSub, Devtools.Disconnect.make({ liveStoreVersion, appHostId }))),
|
|
102
96
|
Effect.tapCauseLogPretty,
|
|
103
97
|
Effect.forkScoped,
|
|
104
98
|
)
|
|
@@ -123,8 +117,7 @@ export const prepareWebDevtoolsBridge = ({
|
|
|
123
117
|
return {
|
|
124
118
|
responsePubSub,
|
|
125
119
|
sendToAppHost,
|
|
126
|
-
|
|
127
|
-
sessionId,
|
|
120
|
+
appHostId,
|
|
128
121
|
copyToClipboard,
|
|
129
122
|
isLeader,
|
|
130
123
|
} satisfies Devtools.PrepareDevtoolsBridge
|
package/src/web-channel/index.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { UnexpectedError } from '@livestore/common'
|
|
2
|
-
import { LS_DEV } from '@livestore/utils'
|
|
3
2
|
import type { Scope, Worker } from '@livestore/utils/effect'
|
|
4
3
|
import { Deferred, Effect, Stream, WebChannel } from '@livestore/utils/effect'
|
|
5
4
|
import type { MeshNode } from '@livestore/webmesh'
|
|
@@ -95,7 +94,5 @@ export const connectViaWorker = ({
|
|
|
95
94
|
|
|
96
95
|
yield* node.addConnection({ target, connectionChannel: sharedWorkerConnection, replaceIfExists: true })
|
|
97
96
|
|
|
98
|
-
|
|
99
|
-
yield* Effect.logDebug(`@livestore/devtools-web-common: initiated connection: ${node.nodeName} → ${target}`)
|
|
100
|
-
}
|
|
97
|
+
yield* Effect.logDebug(`@livestore/devtools-web-common: initiated connection: ${node.nodeName} → ${target}`)
|
|
101
98
|
}).pipe(UnexpectedError.mapToUnexpectedError)
|
package/src/worker/mod.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { LS_DEV } from '@livestore/utils'
|
|
2
1
|
import { Context, Effect, Layer, Stream, WebChannel } from '@livestore/utils/effect'
|
|
3
2
|
import type { MeshNode } from '@livestore/webmesh'
|
|
4
3
|
import { makeMeshNode, WebmeshSchema } from '@livestore/webmesh'
|
|
@@ -30,10 +29,7 @@ export const CreateConnection = ({ from, port }: typeof SharedWorkerSchema.Creat
|
|
|
30
29
|
const messagePortChannel = yield* WebChannel.messagePortChannel({ port, schema: WebmeshSchema.Packet })
|
|
31
30
|
|
|
32
31
|
yield* node.addConnection({ target: from, connectionChannel: messagePortChannel, replaceIfExists: true })
|
|
33
|
-
|
|
34
|
-
if (LS_DEV) {
|
|
35
|
-
yield* Effect.logDebug(`@livestore/devtools-web-common: accepted connection: ${node.nodeName} ← ${from}`)
|
|
36
|
-
}
|
|
32
|
+
yield* Effect.logDebug(`@livestore/devtools-web-common: accepted connection: ${node.nodeName} ← ${from}`)
|
|
37
33
|
|
|
38
34
|
emit.single({})
|
|
39
35
|
|