effect-genserver 0.1.1 → 0.1.2
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/GenServer.d.ts +12 -8
- package/dist/GenServer.d.ts.map +1 -1
- package/dist/GenServer.js +7 -1
- package/dist/GenServer.js.map +1 -1
- package/dist/GenServer.test.js +14 -1
- package/dist/GenServer.test.js.map +1 -1
- package/package.json +4 -4
- package/src/GenServer.test.ts +23 -1
- package/src/GenServer.ts +32 -21
package/dist/GenServer.d.ts
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
import * as Rpc from "effect/unstable/rpc/Rpc";
|
|
5
5
|
import * as RpcGroup from "effect/unstable/rpc/RpcGroup";
|
|
6
6
|
import * as Effect from "effect/Effect";
|
|
7
|
+
import * as Deferred from "effect/Deferred";
|
|
7
8
|
import * as Schema from "effect/Schema";
|
|
8
9
|
import * as Layer from "effect/Layer";
|
|
9
10
|
import type * as Scope from "effect/Scope";
|
|
@@ -22,10 +23,10 @@ import type { Types } from "effect";
|
|
|
22
23
|
export interface GenServer<State extends Schema.Top, Rpcs extends Rpc.Any> {
|
|
23
24
|
readonly stateSchema: State;
|
|
24
25
|
readonly protocol: RpcGroup.RpcGroup<Rpcs>;
|
|
25
|
-
readonly sender: Effect.Effect<(<const Tag extends Rpcs["_tag"], Rpc = Rpc.ExtractTag<Rpcs, Tag
|
|
26
|
-
payload?:
|
|
26
|
+
readonly sender: Effect.Effect<(<const Tag extends Rpcs["_tag"], Rpc = Rpc.ExtractTag<Rpcs, Tag>>(tag: Tag, ...args: Types.EqualsWith<Rpc.PayloadConstructor<Rpc>, void, [
|
|
27
|
+
payload?: Rpc.PayloadConstructor<Rpc>
|
|
27
28
|
], [
|
|
28
|
-
payload:
|
|
29
|
+
payload: Rpc.PayloadConstructor<Rpc>
|
|
29
30
|
]>) => Effect.Effect<void>), never, SendDiscard>;
|
|
30
31
|
of<A extends Handlers<State, Rpcs>>(initialState: State["Type"], handlers: A): readonly [state: State["Type"], handlers: A];
|
|
31
32
|
toLayer<A extends Handlers<State, Rpcs>, E, R>(build: Effect.Effect<readonly [state: State["Type"], handlers: A], E, R>): Layer.Layer<ToHandler<Rpcs> | InitialState, E, Exclude<R, Scope.Scope> | HandlerServices<A>>;
|
|
@@ -74,7 +75,10 @@ export type HandlerFn<State extends Schema.Top, Rpc extends Rpc.Any, R> = (optio
|
|
|
74
75
|
readonly changes: Stream.Stream<State["Type"]>;
|
|
75
76
|
readonly payload: Rpc.Payload<Rpc>;
|
|
76
77
|
readonly context: Context.Context<never>;
|
|
77
|
-
}) => Rpc.SuccessSchema<Rpc> extends RpcSchema.Stream<infer A, infer E> ? Stream.Stream<A["Type"], E["Type"], R> : Effect.Effect<readonly [
|
|
78
|
+
}) => Rpc.SuccessSchema<Rpc> extends RpcSchema.Stream<infer A, infer E> ? Stream.Stream<A["Type"], E["Type"], R> : Effect.Effect<readonly [
|
|
79
|
+
state: State["Type"],
|
|
80
|
+
result: Rpc.Success<Rpc> | Deferred.Deferred<Rpc.Success<Rpc>, Rpc.Error<Rpc>>
|
|
81
|
+
], Rpc.Error<Rpc>, R>;
|
|
78
82
|
/**
|
|
79
83
|
* @since 1.0.0
|
|
80
84
|
* @category Handlers
|
|
@@ -108,7 +112,7 @@ export declare const makeHandlers: <State extends Schema.Top, Rpcs extends Rpc.A
|
|
|
108
112
|
readonly handler: (options: {
|
|
109
113
|
readonly payload: any;
|
|
110
114
|
readonly context: Context.Context<never>;
|
|
111
|
-
}) => Stream.Stream<any, any> | Effect.Effect<any, any>;
|
|
115
|
+
}) => Stream.Stream<any, any> | Effect.Effect<{} | Deferred.Deferred<any, any>, any>;
|
|
112
116
|
}>;
|
|
113
117
|
}, E, Scope.Scope | Exclude<R, SendDiscard>>;
|
|
114
118
|
/**
|
|
@@ -123,10 +127,10 @@ export declare const RpcStateChanges: <State extends Schema.Top, Rpcs extends Rp
|
|
|
123
127
|
export interface Actor<State extends Schema.Top, Rpcs extends Rpc.Any> {
|
|
124
128
|
readonly changes: Stream.Stream<State["Type"]>;
|
|
125
129
|
readonly state: MutableRef.MutableRef<State["Type"]>;
|
|
126
|
-
send<Tag extends Rpcs["_tag"], Rpc = Rpc.ExtractTag<Rpcs, Tag
|
|
127
|
-
payload?:
|
|
130
|
+
send<Tag extends Rpcs["_tag"], Rpc = Rpc.ExtractTag<Rpcs, Tag>>(tag: Tag, ...args: Types.EqualsWith<Rpc.PayloadConstructor<Rpc>, void, [
|
|
131
|
+
payload?: Rpc.PayloadConstructor<Rpc>
|
|
128
132
|
], [
|
|
129
|
-
payload:
|
|
133
|
+
payload: Rpc.PayloadConstructor<Rpc>
|
|
130
134
|
]>): Rpc.SuccessSchema<Rpc> extends RpcSchema.Stream<infer A, infer E> ? Stream.Stream<A["Type"], E["Type"]> : Effect.Effect<Rpc.Success<Rpc>, Rpc.Error<Rpc>>;
|
|
131
135
|
}
|
|
132
136
|
/**
|
package/dist/GenServer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GenServer.d.ts","sourceRoot":"","sources":["../src/GenServer.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,yBAAyB,CAAA;AAC9C,OAAO,KAAK,QAAQ,MAAM,8BAA8B,CAAA;AACxD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,KAAK,KAAK,MAAM,cAAc,CAAA;AAC1C,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,WAAW,MAAM,yCAAyC,CAAA;AACtE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,KAAK,SAAS,MAAM,+BAA+B,CAAA;AAE1D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAEnC;;;GAGG;AACH,MAAM,WAAW,SAAS,CAAC,KAAK,SAAS,MAAM,CAAC,GAAG,EAAE,IAAI,SAAS,GAAG,CAAC,GAAG;IACvE,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAA;IAC3B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IAE1C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAC5B,
|
|
1
|
+
{"version":3,"file":"GenServer.d.ts","sourceRoot":"","sources":["../src/GenServer.ts"],"names":[],"mappings":"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"}
|
package/dist/GenServer.js
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
import * as Rpc from "effect/unstable/rpc/Rpc";
|
|
5
5
|
import * as RpcGroup from "effect/unstable/rpc/RpcGroup";
|
|
6
6
|
import * as Effect from "effect/Effect";
|
|
7
|
+
import * as Deferred from "effect/Deferred";
|
|
7
8
|
import * as Schema from "effect/Schema";
|
|
8
9
|
import * as Layer from "effect/Layer";
|
|
9
10
|
import * as Context from "effect/Context";
|
|
@@ -187,12 +188,17 @@ export const makeActor = Effect.fnUntraced(function* (schema, layer, options) {
|
|
|
187
188
|
const message = `Unknown tag: ${tag}`;
|
|
188
189
|
return isStream ? Stream.die(message) : Effect.die(message);
|
|
189
190
|
}
|
|
190
|
-
|
|
191
|
+
const result = entry.handler({
|
|
191
192
|
payload: payload_ !== undefined
|
|
192
193
|
? entry.rpc.payloadSchema.make(payload_)
|
|
193
194
|
: undefined,
|
|
194
195
|
context: requestContext,
|
|
195
196
|
});
|
|
197
|
+
return Stream.isStream(result)
|
|
198
|
+
? result
|
|
199
|
+
: Effect.flatMap(result, (result) => Deferred.isDeferred(result)
|
|
200
|
+
? Deferred.await(result)
|
|
201
|
+
: Effect.succeed(result));
|
|
196
202
|
};
|
|
197
203
|
return identity({
|
|
198
204
|
changes: Stream.fromPubSub(pubsub),
|
package/dist/GenServer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GenServer.js","sourceRoot":"","sources":["../src/GenServer.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,yBAAyB,CAAA;AAC9C,OAAO,KAAK,QAAQ,MAAM,8BAA8B,CAAA;AACxD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAEzC,OAAO,KAAK,WAAW,MAAM,yCAAyC,CAAA;AACtE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtD,OAAO,KAAK,SAAS,MAAM,+BAA+B,CAAA;AAC1D,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"GenServer.js","sourceRoot":"","sources":["../src/GenServer.ts"],"names":[],"mappings":"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"}
|
package/dist/GenServer.test.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { describe, expect, it } from "@effect/vitest";
|
|
2
2
|
import * as GenServer from "./GenServer.js";
|
|
3
|
-
import { Effect, Fiber, pipe, Schema, Stream } from "effect";
|
|
3
|
+
import { Deferred, Effect, Fiber, pipe, Schema, Stream } from "effect";
|
|
4
4
|
import { Rpc } from "effect/unstable/rpc";
|
|
5
5
|
const Counter = GenServer.make({
|
|
6
6
|
state: Schema.Int,
|
|
7
7
|
protocol: [
|
|
8
8
|
Rpc.make("increment"),
|
|
9
|
+
Rpc.make("incrementDeferred"),
|
|
9
10
|
Rpc.make("count", {
|
|
10
11
|
success: Schema.String,
|
|
11
12
|
stream: true,
|
|
@@ -16,6 +17,11 @@ const CounterLayer = Counter.toLayer(Effect.gen(function* () {
|
|
|
16
17
|
yield* Effect.void;
|
|
17
18
|
return Counter.of(0, {
|
|
18
19
|
increment: ({ state }) => Effect.succeed([state + 1, void 0]),
|
|
20
|
+
incrementDeferred: Effect.fnUntraced(function* ({ state }) {
|
|
21
|
+
const deferred = yield* Deferred.make();
|
|
22
|
+
yield* Deferred.succeed(deferred, void 0);
|
|
23
|
+
return [state + 1, deferred];
|
|
24
|
+
}),
|
|
19
25
|
count: ({ changes }) => changes.pipe(Stream.map((a) => a.toString())),
|
|
20
26
|
});
|
|
21
27
|
}));
|
|
@@ -27,5 +33,12 @@ describe("GenServer", () => {
|
|
|
27
33
|
yield* actor.send("increment");
|
|
28
34
|
expect(yield* Fiber.join(arr)).toEqual(["0", "1", "2"]);
|
|
29
35
|
}));
|
|
36
|
+
it.effect("handles deferreds", Effect.fn(function* () {
|
|
37
|
+
const actor = yield* GenServer.makeActor(Counter, CounterLayer);
|
|
38
|
+
const arr = yield* pipe(actor.send("count"), Stream.take(3), Stream.runCollect, Effect.forkChild({ startImmediately: true }));
|
|
39
|
+
yield* actor.send("incrementDeferred");
|
|
40
|
+
yield* actor.send("incrementDeferred");
|
|
41
|
+
expect(yield* Fiber.join(arr)).toEqual(["0", "1", "2"]);
|
|
42
|
+
}));
|
|
30
43
|
});
|
|
31
44
|
//# sourceMappingURL=GenServer.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GenServer.test.js","sourceRoot":"","sources":["../src/GenServer.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"GenServer.test.js","sourceRoot":"","sources":["../src/GenServer.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "effect-genserver",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.1.
|
|
4
|
+
"version": "0.1.2",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
7
7
|
},
|
|
@@ -23,16 +23,16 @@
|
|
|
23
23
|
},
|
|
24
24
|
"dependencies": {},
|
|
25
25
|
"peerDependencies": {
|
|
26
|
-
"effect": "4.0.0-beta.
|
|
26
|
+
"effect": "4.0.0-beta.50"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@changesets/changelog-github": "^0.6.0",
|
|
30
30
|
"@changesets/cli": "^2.29.8",
|
|
31
31
|
"@effect/language-service": "^0.85.1",
|
|
32
|
-
"@effect/vitest": "4.0.0-beta.
|
|
32
|
+
"@effect/vitest": "4.0.0-beta.50",
|
|
33
33
|
"@types/node": "^25.6.0",
|
|
34
34
|
"@typescript/native-preview": "7.0.0-dev.20260412.1",
|
|
35
|
-
"effect": "4.0.0-beta.
|
|
35
|
+
"effect": "4.0.0-beta.50",
|
|
36
36
|
"husky": "^9.1.7",
|
|
37
37
|
"lint-staged": "^16.4.0",
|
|
38
38
|
"oxlint": "^1.57.0",
|
package/src/GenServer.test.ts
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { describe, expect, it } from "@effect/vitest"
|
|
2
2
|
import * as GenServer from "./GenServer.ts"
|
|
3
|
-
import { Effect, Fiber, pipe, Schema, Stream } from "effect"
|
|
3
|
+
import { Deferred, Effect, Fiber, pipe, Schema, Stream } from "effect"
|
|
4
4
|
import { Rpc } from "effect/unstable/rpc"
|
|
5
5
|
|
|
6
6
|
const Counter = GenServer.make({
|
|
7
7
|
state: Schema.Int,
|
|
8
8
|
protocol: [
|
|
9
9
|
Rpc.make("increment"),
|
|
10
|
+
Rpc.make("incrementDeferred"),
|
|
10
11
|
Rpc.make("count", {
|
|
11
12
|
success: Schema.String,
|
|
12
13
|
stream: true,
|
|
@@ -19,6 +20,11 @@ const CounterLayer = Counter.toLayer(
|
|
|
19
20
|
yield* Effect.void
|
|
20
21
|
return Counter.of(0, {
|
|
21
22
|
increment: ({ state }) => Effect.succeed([state + 1, void 0]),
|
|
23
|
+
incrementDeferred: Effect.fnUntraced(function* ({ state }) {
|
|
24
|
+
const deferred = yield* Deferred.make<void>()
|
|
25
|
+
yield* Deferred.succeed(deferred, void 0)
|
|
26
|
+
return [state + 1, deferred]
|
|
27
|
+
}),
|
|
22
28
|
count: ({ changes }) => changes.pipe(Stream.map((a) => a.toString())),
|
|
23
29
|
})
|
|
24
30
|
}),
|
|
@@ -40,4 +46,20 @@ describe("GenServer", () => {
|
|
|
40
46
|
expect(yield* Fiber.join(arr)).toEqual(["0", "1", "2"])
|
|
41
47
|
}),
|
|
42
48
|
)
|
|
49
|
+
|
|
50
|
+
it.effect(
|
|
51
|
+
"handles deferreds",
|
|
52
|
+
Effect.fn(function* () {
|
|
53
|
+
const actor = yield* GenServer.makeActor(Counter, CounterLayer)
|
|
54
|
+
const arr = yield* pipe(
|
|
55
|
+
actor.send("count"),
|
|
56
|
+
Stream.take(3),
|
|
57
|
+
Stream.runCollect,
|
|
58
|
+
Effect.forkChild({ startImmediately: true }),
|
|
59
|
+
)
|
|
60
|
+
yield* actor.send("incrementDeferred")
|
|
61
|
+
yield* actor.send("incrementDeferred")
|
|
62
|
+
expect(yield* Fiber.join(arr)).toEqual(["0", "1", "2"])
|
|
63
|
+
}),
|
|
64
|
+
)
|
|
43
65
|
})
|
package/src/GenServer.ts
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
import * as Rpc from "effect/unstable/rpc/Rpc"
|
|
5
5
|
import * as RpcGroup from "effect/unstable/rpc/RpcGroup"
|
|
6
6
|
import * as Effect from "effect/Effect"
|
|
7
|
+
import * as Deferred from "effect/Deferred"
|
|
7
8
|
import * as Schema from "effect/Schema"
|
|
8
9
|
import * as Layer from "effect/Layer"
|
|
9
10
|
import type * as Scope from "effect/Scope"
|
|
@@ -28,17 +29,13 @@ export interface GenServer<State extends Schema.Top, Rpcs extends Rpc.Any> {
|
|
|
28
29
|
readonly protocol: RpcGroup.RpcGroup<Rpcs>
|
|
29
30
|
|
|
30
31
|
readonly sender: Effect.Effect<
|
|
31
|
-
<
|
|
32
|
-
const Tag extends Rpcs["_tag"],
|
|
33
|
-
Rpc = Rpc.ExtractTag<Rpcs, Tag>,
|
|
34
|
-
Payload = Rpc.PayloadConstructor<Rpc>,
|
|
35
|
-
>(
|
|
32
|
+
<const Tag extends Rpcs["_tag"], Rpc = Rpc.ExtractTag<Rpcs, Tag>>(
|
|
36
33
|
tag: Tag,
|
|
37
34
|
...args: Types.EqualsWith<
|
|
38
|
-
|
|
35
|
+
Rpc.PayloadConstructor<Rpc>,
|
|
39
36
|
void,
|
|
40
|
-
[payload?:
|
|
41
|
-
[payload:
|
|
37
|
+
[payload?: Rpc.PayloadConstructor<Rpc>],
|
|
38
|
+
[payload: Rpc.PayloadConstructor<Rpc>]
|
|
42
39
|
>
|
|
43
40
|
) => Effect.Effect<void>,
|
|
44
41
|
never,
|
|
@@ -136,7 +133,12 @@ export type HandlerFn<
|
|
|
136
133
|
}) => Rpc.SuccessSchema<Rpc> extends RpcSchema.Stream<infer A, infer E>
|
|
137
134
|
? Stream.Stream<A["Type"], E["Type"], R>
|
|
138
135
|
: Effect.Effect<
|
|
139
|
-
readonly [
|
|
136
|
+
readonly [
|
|
137
|
+
state: State["Type"],
|
|
138
|
+
result:
|
|
139
|
+
| Rpc.Success<Rpc>
|
|
140
|
+
| Deferred.Deferred<Rpc.Success<Rpc>, Rpc.Error<Rpc>>,
|
|
141
|
+
],
|
|
140
142
|
Rpc.Error<Rpc>,
|
|
141
143
|
R
|
|
142
144
|
>
|
|
@@ -332,7 +334,9 @@ export const makeHandlers = Effect.fnUntraced(function* <
|
|
|
332
334
|
readonly handler: (options: {
|
|
333
335
|
readonly payload: any
|
|
334
336
|
readonly context: Context.Context<never>
|
|
335
|
-
}) =>
|
|
337
|
+
}) =>
|
|
338
|
+
| Stream.Stream<any, any>
|
|
339
|
+
| Effect.Effect<{} | Deferred.Deferred<any, any>, any>
|
|
336
340
|
}
|
|
337
341
|
>
|
|
338
342
|
},
|
|
@@ -346,7 +350,9 @@ export const makeHandlers = Effect.fnUntraced(function* <
|
|
|
346
350
|
readonly handler: (options: {
|
|
347
351
|
readonly payload: any
|
|
348
352
|
readonly context: Context.Context<never>
|
|
349
|
-
}) =>
|
|
353
|
+
}) =>
|
|
354
|
+
| Stream.Stream<any, any>
|
|
355
|
+
| Effect.Effect<{} | Deferred.Deferred<any, any>, any>
|
|
350
356
|
}
|
|
351
357
|
>()
|
|
352
358
|
const scope = yield* Effect.scope
|
|
@@ -405,7 +411,9 @@ export const makeHandlers = Effect.fnUntraced(function* <
|
|
|
405
411
|
changes,
|
|
406
412
|
payload: options.payload,
|
|
407
413
|
context: options.context,
|
|
408
|
-
}) as
|
|
414
|
+
}) as
|
|
415
|
+
| Stream.Stream<any, any>
|
|
416
|
+
| Effect.Effect<[any, {} | Deferred.Deferred<any, any>], any>
|
|
409
417
|
if (Stream.isStream(result)) return result
|
|
410
418
|
return pipe(
|
|
411
419
|
result,
|
|
@@ -451,17 +459,13 @@ export const RpcStateChanges = <State extends Schema.Top, Rpcs extends Rpc.Any>(
|
|
|
451
459
|
export interface Actor<State extends Schema.Top, Rpcs extends Rpc.Any> {
|
|
452
460
|
readonly changes: Stream.Stream<State["Type"]>
|
|
453
461
|
readonly state: MutableRef.MutableRef<State["Type"]>
|
|
454
|
-
send<
|
|
455
|
-
Tag extends Rpcs["_tag"],
|
|
456
|
-
Rpc = Rpc.ExtractTag<Rpcs, Tag>,
|
|
457
|
-
Payload = Rpc.PayloadConstructor<Rpc>,
|
|
458
|
-
>(
|
|
462
|
+
send<Tag extends Rpcs["_tag"], Rpc = Rpc.ExtractTag<Rpcs, Tag>>(
|
|
459
463
|
tag: Tag,
|
|
460
464
|
...args: Types.EqualsWith<
|
|
461
|
-
|
|
465
|
+
Rpc.PayloadConstructor<Rpc>,
|
|
462
466
|
void,
|
|
463
|
-
[payload?:
|
|
464
|
-
[payload:
|
|
467
|
+
[payload?: Rpc.PayloadConstructor<Rpc>],
|
|
468
|
+
[payload: Rpc.PayloadConstructor<Rpc>]
|
|
465
469
|
>
|
|
466
470
|
): Rpc.SuccessSchema<Rpc> extends RpcSchema.Stream<infer A, infer E>
|
|
467
471
|
? Stream.Stream<A["Type"], E["Type"]>
|
|
@@ -503,13 +507,20 @@ export const makeActor = Effect.fnUntraced(function* <
|
|
|
503
507
|
const message = `Unknown tag: ${tag}`
|
|
504
508
|
return isStream ? Stream.die(message) : Effect.die(message)
|
|
505
509
|
}
|
|
506
|
-
|
|
510
|
+
const result = entry.handler({
|
|
507
511
|
payload:
|
|
508
512
|
payload_ !== undefined
|
|
509
513
|
? entry.rpc.payloadSchema.make(payload_)
|
|
510
514
|
: undefined,
|
|
511
515
|
context: requestContext,
|
|
512
516
|
})
|
|
517
|
+
return Stream.isStream(result)
|
|
518
|
+
? result
|
|
519
|
+
: Effect.flatMap(result, (result) =>
|
|
520
|
+
Deferred.isDeferred(result)
|
|
521
|
+
? Deferred.await(result)
|
|
522
|
+
: Effect.succeed(result),
|
|
523
|
+
)
|
|
513
524
|
}
|
|
514
525
|
|
|
515
526
|
return identity<Actor<State, Rpcs>>({
|