effect-genserver 0.1.1 → 0.1.3
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/AtomGenServer.d.ts +25 -9
- package/dist/AtomGenServer.d.ts.map +1 -1
- package/dist/AtomGenServer.js +10 -2
- package/dist/AtomGenServer.js.map +1 -1
- package/dist/GenServer.d.ts +17 -8
- package/dist/GenServer.d.ts.map +1 -1
- package/dist/GenServer.js +23 -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 +9 -10
- package/src/AtomGenServer.ts +86 -24
- package/src/GenServer.test.ts +23 -1
- package/src/GenServer.ts +69 -21
package/dist/AtomGenServer.d.ts
CHANGED
|
@@ -8,19 +8,35 @@ import * as GenServer from "./GenServer.ts";
|
|
|
8
8
|
import * as Atom from "effect/unstable/reactivity/Atom";
|
|
9
9
|
import * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
|
|
10
10
|
import * as Duration from "effect/Duration";
|
|
11
|
+
import type { unassigned } from "effect/Types";
|
|
11
12
|
/**
|
|
12
13
|
* @since 1.0.0
|
|
13
14
|
* @category Atom
|
|
14
15
|
*/
|
|
15
|
-
export
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
readonly
|
|
19
|
-
|
|
16
|
+
export interface GenServerAtom<State extends Schema.Top, Rpcs extends Rpc.Any, E, InitialState extends boolean> extends Atom.Writable<[
|
|
17
|
+
InitialState
|
|
18
|
+
] extends [true] ? State["Type"] : AsyncResult.AsyncResult<State["Type"], E>, Rpcs extends Rpc.Rpc<infer _Tag, infer _Payload, infer _Success, infer _Error, infer _Middleware, infer _Requires> ? {
|
|
19
|
+
readonly _tag: _Tag;
|
|
20
|
+
readonly payload: _Payload["~type.make.in"];
|
|
21
|
+
} : never> {
|
|
22
|
+
/**
|
|
23
|
+
* Atom that contains the actor.
|
|
24
|
+
*/
|
|
20
25
|
readonly actor: Atom.Atom<AsyncResult.AsyncResult<GenServer.Actor<State, Rpcs>, E>>;
|
|
21
|
-
|
|
26
|
+
/**
|
|
27
|
+
* Use .fn when you need to subscribe to the result of an event.
|
|
28
|
+
*/
|
|
29
|
+
fn<Tag extends Rpcs["_tag"], Rpc = Rpc.ExtractTag<Rpcs, Tag>>(tag: Tag, options?: {
|
|
22
30
|
readonly concurrent?: boolean | undefined;
|
|
23
|
-
})
|
|
24
|
-
|
|
25
|
-
|
|
31
|
+
}): Atom.AtomResultFn<Rpc.PayloadConstructor<Rpc>, Rpc.SuccessExit<Rpc>, E | Rpc.ErrorExit<Rpc>>;
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* @since 1.0.0
|
|
35
|
+
* @category Atom
|
|
36
|
+
*/
|
|
37
|
+
export declare const make: <State extends Schema.Top, Rpcs extends Rpc.Any, E, InitialState extends State["Type"] = unassigned>(server: GenServer.GenServer<State, Rpcs>, layer: Layer.Layer<GenServer.ToHandler<Rpcs> | GenServer.InitialState, E, GenServer.SendDiscard> | ((get: Atom.AtomContext) => Layer.Layer<GenServer.ToHandler<Rpcs> | GenServer.InitialState, E, GenServer.SendDiscard>), options?: {
|
|
38
|
+
readonly memoMap?: Layer.MemoMap | undefined;
|
|
39
|
+
readonly actorIdleTTL?: Duration.Input | undefined;
|
|
40
|
+
readonly initialState?: InitialState | undefined;
|
|
41
|
+
}) => GenServerAtom<State, Rpcs, E, [InitialState] extends [unassigned] ? never : true>;
|
|
26
42
|
//# sourceMappingURL=AtomGenServer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AtomGenServer.d.ts","sourceRoot":"","sources":["../src/AtomGenServer.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,KAAK,GAAG,MAAM,yBAAyB,CAAA;AAGnD,OAAO,KAAK,KAAK,MAAM,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,IAAI,MAAM,iCAAiC,CAAA;AAGvD,OAAO,KAAK,WAAW,MAAM,wCAAwC,CAAA;AACrE,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"AtomGenServer.d.ts","sourceRoot":"","sources":["../src/AtomGenServer.ts"],"names":[],"mappings":"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"}
|
package/dist/AtomGenServer.js
CHANGED
|
@@ -16,10 +16,11 @@ export const make = (server, layer, options) => {
|
|
|
16
16
|
const actor = Atom.make((get) => {
|
|
17
17
|
const layer_ = typeof layer === "function" ? layer(get) : layer;
|
|
18
18
|
return GenServer.makeActor(server, layer_).pipe(Effect.provideService(Layer.CurrentMemoMap, memoMap));
|
|
19
|
-
}).pipe(Atom.setIdleTTL(options?.
|
|
19
|
+
}).pipe(Atom.setIdleTTL(options?.actorIdleTTL ?? Duration.zero));
|
|
20
20
|
const state = pipe(Atom.make((get) => pipe(get.result(actor), Effect.map((actor) => actor.changes), Stream.unwrap)), options?.initialState
|
|
21
21
|
? Atom.map(AsyncResult.getOrElse(() => options.initialState))
|
|
22
22
|
: identity);
|
|
23
|
+
const sendDiscard = Atom.fn()(({ tag, payload }, get) => pipe(get.result(actor), Effect.flatMap((actor) => actor.sendDiscard(tag, payload))), { concurrent: true });
|
|
23
24
|
const sendFamily = ([tag, concurrent]) => {
|
|
24
25
|
const rpc = server.protocol.requests.get(tag);
|
|
25
26
|
const isStream = RpcSchema.isStreamSchema(rpc.successSchema);
|
|
@@ -29,6 +30,13 @@ export const make = (server, layer, options) => {
|
|
|
29
30
|
return Atom.fn((payload, get) => pipe(get.result(actor), Effect.flatMap((actor) => actor.send(tag, payload))), { concurrent });
|
|
30
31
|
};
|
|
31
32
|
const send = (tag, options) => sendFamily([tag, options?.concurrent ?? false]);
|
|
32
|
-
return
|
|
33
|
+
return Object.assign(Atom.writable((get) => {
|
|
34
|
+
get.mount(sendDiscard);
|
|
35
|
+
get.subscribe(state, (next) => get.setSelf(next));
|
|
36
|
+
return get.once(state);
|
|
37
|
+
}, (ctx, payload) => ctx.set(sendDiscard, payload)), {
|
|
38
|
+
actor,
|
|
39
|
+
fn: send,
|
|
40
|
+
});
|
|
33
41
|
};
|
|
34
42
|
//# sourceMappingURL=AtomGenServer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AtomGenServer.js","sourceRoot":"","sources":["../src/AtomGenServer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,SAAS,MAAM,+BAA+B,CAAA;AAC1D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,IAAI,MAAM,iCAAiC,CAAA;AACvD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,WAAW,MAAM,wCAAwC,CAAA;AACrE,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"AtomGenServer.js","sourceRoot":"","sources":["../src/AtomGenServer.ts"],"names":[],"mappings":"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"}
|
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,11 +127,16 @@ 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>>;
|
|
135
|
+
sendDiscard<Tag extends Rpcs["_tag"], Rpc = Rpc.ExtractTag<Rpcs, Tag>>(tag: Tag, ...args: Types.EqualsWith<Rpc.PayloadConstructor<Rpc>, void, [
|
|
136
|
+
payload?: Rpc.PayloadConstructor<Rpc>
|
|
137
|
+
], [
|
|
138
|
+
payload: Rpc.PayloadConstructor<Rpc>
|
|
139
|
+
]>): Effect.Effect<void>;
|
|
131
140
|
}
|
|
132
141
|
/**
|
|
133
142
|
* @since 1.0.0
|
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";
|
|
@@ -177,6 +178,7 @@ export const RpcStateChanges = (server) => Rpc.make("GenServerChanges", {
|
|
|
177
178
|
* @category Actor
|
|
178
179
|
*/
|
|
179
180
|
export const makeActor = Effect.fnUntraced(function* (schema, layer, options) {
|
|
181
|
+
const scope = yield* Effect.scope;
|
|
180
182
|
const requestContext = options?.requestContext ?? Context.empty();
|
|
181
183
|
const { handlers, state, pubsub } = yield* makeHandlers(schema, layer);
|
|
182
184
|
const send = (tag, payload_) => {
|
|
@@ -187,17 +189,37 @@ export const makeActor = Effect.fnUntraced(function* (schema, layer, options) {
|
|
|
187
189
|
const message = `Unknown tag: ${tag}`;
|
|
188
190
|
return isStream ? Stream.die(message) : Effect.die(message);
|
|
189
191
|
}
|
|
190
|
-
|
|
192
|
+
const result = entry.handler({
|
|
193
|
+
payload: payload_ !== undefined
|
|
194
|
+
? entry.rpc.payloadSchema.make(payload_)
|
|
195
|
+
: undefined,
|
|
196
|
+
context: requestContext,
|
|
197
|
+
});
|
|
198
|
+
return Stream.isStream(result)
|
|
199
|
+
? result
|
|
200
|
+
: Effect.flatMap(result, (result) => Deferred.isDeferred(result)
|
|
201
|
+
? Deferred.await(result)
|
|
202
|
+
: Effect.succeed(result));
|
|
203
|
+
};
|
|
204
|
+
const sendDiscard = (tag, payload_) => {
|
|
205
|
+
const entry = handlers.get(tag);
|
|
206
|
+
if (!entry) {
|
|
207
|
+
return Effect.die(`Unknown tag: ${tag}`);
|
|
208
|
+
}
|
|
209
|
+
const result = entry.handler({
|
|
191
210
|
payload: payload_ !== undefined
|
|
192
211
|
? entry.rpc.payloadSchema.make(payload_)
|
|
193
212
|
: undefined,
|
|
194
213
|
context: requestContext,
|
|
195
214
|
});
|
|
215
|
+
const eff = Stream.isStream(result) ? Stream.runDrain(result) : result;
|
|
216
|
+
return Effect.forkIn(eff, scope, { startImmediately: true }).pipe(Effect.asVoid);
|
|
196
217
|
};
|
|
197
218
|
return identity({
|
|
198
219
|
changes: Stream.fromPubSub(pubsub),
|
|
199
220
|
state,
|
|
200
221
|
send: send,
|
|
222
|
+
sendDiscard: sendDiscard,
|
|
201
223
|
});
|
|
202
224
|
});
|
|
203
225
|
//# sourceMappingURL=GenServer.js.map
|
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.3",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
7
7
|
},
|
|
@@ -21,23 +21,22 @@
|
|
|
21
21
|
"type": "git",
|
|
22
22
|
"url": "https://github.com/tim-smart/effect-genserver.git"
|
|
23
23
|
},
|
|
24
|
-
"dependencies": {},
|
|
25
24
|
"peerDependencies": {
|
|
26
|
-
"effect": "4.0.0-beta.
|
|
25
|
+
"effect": "4.0.0-beta.51"
|
|
27
26
|
},
|
|
28
27
|
"devDependencies": {
|
|
29
28
|
"@changesets/changelog-github": "^0.6.0",
|
|
30
|
-
"@changesets/cli": "^2.
|
|
29
|
+
"@changesets/cli": "^2.31.0",
|
|
31
30
|
"@effect/language-service": "^0.85.1",
|
|
32
|
-
"@effect/vitest": "4.0.0-beta.
|
|
31
|
+
"@effect/vitest": "4.0.0-beta.51",
|
|
33
32
|
"@types/node": "^25.6.0",
|
|
34
|
-
"@typescript/native-preview": "7.0.0-dev.
|
|
35
|
-
"effect": "4.0.0-beta.
|
|
33
|
+
"@typescript/native-preview": "7.0.0-dev.20260419.1",
|
|
34
|
+
"effect": "4.0.0-beta.51",
|
|
36
35
|
"husky": "^9.1.7",
|
|
37
36
|
"lint-staged": "^16.4.0",
|
|
38
|
-
"oxlint": "^1.
|
|
39
|
-
"prettier": "^3.8.
|
|
40
|
-
"typescript": "^6.0.
|
|
37
|
+
"oxlint": "^1.60.0",
|
|
38
|
+
"prettier": "^3.8.3",
|
|
39
|
+
"typescript": "^6.0.3",
|
|
41
40
|
"vitest": "^4.1.1"
|
|
42
41
|
},
|
|
43
42
|
"lint-staged": {
|
package/src/AtomGenServer.ts
CHANGED
|
@@ -12,6 +12,57 @@ import { identity, pipe } from "effect/Function"
|
|
|
12
12
|
import * as Stream from "effect/Stream"
|
|
13
13
|
import * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
|
|
14
14
|
import * as Duration from "effect/Duration"
|
|
15
|
+
import type { unassigned } from "effect/Types"
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* @since 1.0.0
|
|
19
|
+
* @category Atom
|
|
20
|
+
*/
|
|
21
|
+
export interface GenServerAtom<
|
|
22
|
+
State extends Schema.Top,
|
|
23
|
+
Rpcs extends Rpc.Any,
|
|
24
|
+
E,
|
|
25
|
+
InitialState extends boolean,
|
|
26
|
+
// oxlint-disable-next-line import/namespace
|
|
27
|
+
> extends Atom.Writable<
|
|
28
|
+
[InitialState] extends [true]
|
|
29
|
+
? State["Type"]
|
|
30
|
+
: AsyncResult.AsyncResult<State["Type"], E>,
|
|
31
|
+
Rpcs extends Rpc.Rpc<
|
|
32
|
+
infer _Tag,
|
|
33
|
+
infer _Payload,
|
|
34
|
+
infer _Success,
|
|
35
|
+
infer _Error,
|
|
36
|
+
infer _Middleware,
|
|
37
|
+
infer _Requires
|
|
38
|
+
>
|
|
39
|
+
? {
|
|
40
|
+
readonly _tag: _Tag
|
|
41
|
+
readonly payload: _Payload["~type.make.in"]
|
|
42
|
+
}
|
|
43
|
+
: never
|
|
44
|
+
> {
|
|
45
|
+
/**
|
|
46
|
+
* Atom that contains the actor.
|
|
47
|
+
*/
|
|
48
|
+
readonly actor: Atom.Atom<
|
|
49
|
+
AsyncResult.AsyncResult<GenServer.Actor<State, Rpcs>, E>
|
|
50
|
+
>
|
|
51
|
+
|
|
52
|
+
/**
|
|
53
|
+
* Use .fn when you need to subscribe to the result of an event.
|
|
54
|
+
*/
|
|
55
|
+
fn<Tag extends Rpcs["_tag"], Rpc = Rpc.ExtractTag<Rpcs, Tag>>(
|
|
56
|
+
tag: Tag,
|
|
57
|
+
options?: {
|
|
58
|
+
readonly concurrent?: boolean | undefined
|
|
59
|
+
},
|
|
60
|
+
): Atom.AtomResultFn<
|
|
61
|
+
Rpc.PayloadConstructor<Rpc>,
|
|
62
|
+
Rpc.SuccessExit<Rpc>,
|
|
63
|
+
E | Rpc.ErrorExit<Rpc>
|
|
64
|
+
>
|
|
65
|
+
}
|
|
15
66
|
|
|
16
67
|
/**
|
|
17
68
|
* @since 1.0.0
|
|
@@ -21,7 +72,7 @@ export const make = <
|
|
|
21
72
|
State extends Schema.Top,
|
|
22
73
|
Rpcs extends Rpc.Any,
|
|
23
74
|
E,
|
|
24
|
-
InitialState extends State["Type"]
|
|
75
|
+
InitialState extends State["Type"] = unassigned,
|
|
25
76
|
>(
|
|
26
77
|
server: GenServer.GenServer<State, Rpcs>,
|
|
27
78
|
layer:
|
|
@@ -39,29 +90,15 @@ export const make = <
|
|
|
39
90
|
>),
|
|
40
91
|
options?: {
|
|
41
92
|
readonly memoMap?: Layer.MemoMap | undefined
|
|
42
|
-
readonly
|
|
93
|
+
readonly actorIdleTTL?: Duration.Input | undefined
|
|
43
94
|
readonly initialState?: InitialState | undefined
|
|
44
95
|
},
|
|
45
|
-
):
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
options?: {
|
|
52
|
-
readonly concurrent?: boolean | undefined
|
|
53
|
-
},
|
|
54
|
-
) => Atom.AtomResultFn<
|
|
55
|
-
Rpc.PayloadConstructor<Rpc>,
|
|
56
|
-
Rpc.SuccessExit<Rpc>,
|
|
57
|
-
E | Rpc.ErrorExit<Rpc>
|
|
58
|
-
>
|
|
59
|
-
readonly state: Atom.Atom<
|
|
60
|
-
[InitialState] extends [undefined]
|
|
61
|
-
? AsyncResult.AsyncResult<State["Type"], E>
|
|
62
|
-
: State["Type"]
|
|
63
|
-
>
|
|
64
|
-
} => {
|
|
96
|
+
): GenServerAtom<
|
|
97
|
+
State,
|
|
98
|
+
Rpcs,
|
|
99
|
+
E,
|
|
100
|
+
[InitialState] extends [unassigned] ? never : true
|
|
101
|
+
> => {
|
|
65
102
|
const memoMap = options?.memoMap ?? Atom.runtime.memoMap
|
|
66
103
|
|
|
67
104
|
const actor = Atom.make((get) => {
|
|
@@ -69,7 +106,7 @@ export const make = <
|
|
|
69
106
|
return GenServer.makeActor(server, layer_).pipe(
|
|
70
107
|
Effect.provideService(Layer.CurrentMemoMap, memoMap),
|
|
71
108
|
)
|
|
72
|
-
}).pipe(Atom.setIdleTTL(options?.
|
|
109
|
+
}).pipe(Atom.setIdleTTL(options?.actorIdleTTL ?? Duration.zero))
|
|
73
110
|
|
|
74
111
|
const state = pipe(
|
|
75
112
|
Atom.make((get) =>
|
|
@@ -84,6 +121,18 @@ export const make = <
|
|
|
84
121
|
: identity,
|
|
85
122
|
) as Atom.Atom<AsyncResult.AsyncResult<State["Type"], E>>
|
|
86
123
|
|
|
124
|
+
const sendDiscard = Atom.fn<{
|
|
125
|
+
readonly tag: Rpcs["_tag"]
|
|
126
|
+
readonly payload: any
|
|
127
|
+
}>()(
|
|
128
|
+
({ tag, payload }, get) =>
|
|
129
|
+
pipe(
|
|
130
|
+
get.result(actor),
|
|
131
|
+
Effect.flatMap((actor) => actor.sendDiscard(tag, payload)),
|
|
132
|
+
),
|
|
133
|
+
{ concurrent: true },
|
|
134
|
+
)
|
|
135
|
+
|
|
87
136
|
const sendFamily = <
|
|
88
137
|
Tag extends Rpcs["_tag"],
|
|
89
138
|
Rpc = Rpc.ExtractTag<Rpcs, Tag>,
|
|
@@ -128,5 +177,18 @@ export const make = <
|
|
|
128
177
|
E | Rpc.ErrorExit<Rpc>
|
|
129
178
|
> => sendFamily([tag, options?.concurrent ?? false])
|
|
130
179
|
|
|
131
|
-
return
|
|
180
|
+
return Object.assign(
|
|
181
|
+
Atom.writable(
|
|
182
|
+
(get) => {
|
|
183
|
+
get.mount(sendDiscard)
|
|
184
|
+
get.subscribe(state, (next) => get.setSelf(next))
|
|
185
|
+
return get.once(state)
|
|
186
|
+
},
|
|
187
|
+
(ctx, payload: any) => ctx.set(sendDiscard, payload),
|
|
188
|
+
),
|
|
189
|
+
{
|
|
190
|
+
actor,
|
|
191
|
+
fn: send,
|
|
192
|
+
},
|
|
193
|
+
)
|
|
132
194
|
}
|
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,21 +459,28 @@ 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
|
-
|
|
455
|
-
|
|
456
|
-
Rpc = Rpc.ExtractTag<Rpcs, Tag>,
|
|
457
|
-
Payload = Rpc.PayloadConstructor<Rpc>,
|
|
458
|
-
>(
|
|
462
|
+
|
|
463
|
+
send<Tag extends Rpcs["_tag"], Rpc = Rpc.ExtractTag<Rpcs, Tag>>(
|
|
459
464
|
tag: Tag,
|
|
460
465
|
...args: Types.EqualsWith<
|
|
461
|
-
|
|
466
|
+
Rpc.PayloadConstructor<Rpc>,
|
|
462
467
|
void,
|
|
463
|
-
[payload?:
|
|
464
|
-
[payload:
|
|
468
|
+
[payload?: Rpc.PayloadConstructor<Rpc>],
|
|
469
|
+
[payload: Rpc.PayloadConstructor<Rpc>]
|
|
465
470
|
>
|
|
466
471
|
): Rpc.SuccessSchema<Rpc> extends RpcSchema.Stream<infer A, infer E>
|
|
467
472
|
? Stream.Stream<A["Type"], E["Type"]>
|
|
468
473
|
: Effect.Effect<Rpc.Success<Rpc>, Rpc.Error<Rpc>>
|
|
474
|
+
|
|
475
|
+
sendDiscard<Tag extends Rpcs["_tag"], Rpc = Rpc.ExtractTag<Rpcs, Tag>>(
|
|
476
|
+
tag: Tag,
|
|
477
|
+
...args: Types.EqualsWith<
|
|
478
|
+
Rpc.PayloadConstructor<Rpc>,
|
|
479
|
+
void,
|
|
480
|
+
[payload?: Rpc.PayloadConstructor<Rpc>],
|
|
481
|
+
[payload: Rpc.PayloadConstructor<Rpc>]
|
|
482
|
+
>
|
|
483
|
+
): Effect.Effect<void>
|
|
469
484
|
}
|
|
470
485
|
|
|
471
486
|
/**
|
|
@@ -488,6 +503,7 @@ export const makeActor = Effect.fnUntraced(function* <
|
|
|
488
503
|
E,
|
|
489
504
|
Exclude<R, SendDiscard> | Scope.Scope
|
|
490
505
|
> {
|
|
506
|
+
const scope = yield* Effect.scope
|
|
491
507
|
const requestContext = options?.requestContext ?? Context.empty()
|
|
492
508
|
|
|
493
509
|
const { handlers, state, pubsub } = yield* makeHandlers(schema, layer)
|
|
@@ -503,18 +519,50 @@ export const makeActor = Effect.fnUntraced(function* <
|
|
|
503
519
|
const message = `Unknown tag: ${tag}`
|
|
504
520
|
return isStream ? Stream.die(message) : Effect.die(message)
|
|
505
521
|
}
|
|
506
|
-
|
|
522
|
+
const result = entry.handler({
|
|
507
523
|
payload:
|
|
508
524
|
payload_ !== undefined
|
|
509
525
|
? entry.rpc.payloadSchema.make(payload_)
|
|
510
526
|
: undefined,
|
|
511
527
|
context: requestContext,
|
|
512
528
|
})
|
|
529
|
+
return Stream.isStream(result)
|
|
530
|
+
? result
|
|
531
|
+
: Effect.flatMap(result, (result) =>
|
|
532
|
+
Deferred.isDeferred(result)
|
|
533
|
+
? Deferred.await(result)
|
|
534
|
+
: Effect.succeed(result),
|
|
535
|
+
)
|
|
536
|
+
}
|
|
537
|
+
|
|
538
|
+
const sendDiscard = <
|
|
539
|
+
Tag extends Rpcs["_tag"],
|
|
540
|
+
Rpc = Rpc.ExtractTag<Rpcs, Tag>,
|
|
541
|
+
>(
|
|
542
|
+
tag: Tag,
|
|
543
|
+
payload_?: Rpc.PayloadConstructor<Rpc>,
|
|
544
|
+
) => {
|
|
545
|
+
const entry = handlers.get(tag)
|
|
546
|
+
if (!entry) {
|
|
547
|
+
return Effect.die(`Unknown tag: ${tag}`)
|
|
548
|
+
}
|
|
549
|
+
const result = entry.handler({
|
|
550
|
+
payload:
|
|
551
|
+
payload_ !== undefined
|
|
552
|
+
? entry.rpc.payloadSchema.make(payload_)
|
|
553
|
+
: undefined,
|
|
554
|
+
context: requestContext,
|
|
555
|
+
})
|
|
556
|
+
const eff = Stream.isStream(result) ? Stream.runDrain(result) : result
|
|
557
|
+
return Effect.forkIn(eff, scope, { startImmediately: true }).pipe(
|
|
558
|
+
Effect.asVoid,
|
|
559
|
+
)
|
|
513
560
|
}
|
|
514
561
|
|
|
515
562
|
return identity<Actor<State, Rpcs>>({
|
|
516
563
|
changes: Stream.fromPubSub(pubsub),
|
|
517
564
|
state,
|
|
518
565
|
send: send as any,
|
|
566
|
+
sendDiscard: sendDiscard as any,
|
|
519
567
|
})
|
|
520
568
|
})
|