@rivetkit/effect 0.0.0-main.9d355a2 → 0.0.0-raw-fetch-retry.e47ce6c
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/Actor.d.ts +2 -3
- package/dist/Actor.d.ts.map +1 -1
- package/dist/Actor.js +2 -2
- package/dist/Actor.js.map +1 -1
- package/dist/Client.d.ts.map +1 -1
- package/dist/Client.js +6 -4
- package/dist/Client.js.map +1 -1
- package/dist/Registry.d.ts +69 -7
- package/dist/Registry.d.ts.map +1 -1
- package/dist/Registry.js +93 -40
- package/dist/Registry.js.map +1 -1
- package/dist/RivetError.d.ts +45 -3
- package/dist/RivetError.d.ts.map +1 -1
- package/dist/RivetError.js +112 -0
- package/dist/RivetError.js.map +1 -1
- package/dist/RivetLogger.d.ts +41 -0
- package/dist/RivetLogger.d.ts.map +1 -0
- package/dist/RivetLogger.js +41 -0
- package/dist/RivetLogger.js.map +1 -0
- package/dist/State.d.ts +92 -56
- package/dist/State.d.ts.map +1 -1
- package/dist/State.js +51 -57
- package/dist/State.js.map +1 -1
- package/dist/internal/ActorInstanceManager.d.ts.map +1 -1
- package/dist/internal/ActorInstanceManager.js +4 -4
- package/dist/internal/ActorInstanceManager.js.map +1 -1
- package/dist/internal/ActorStateAdapter.d.ts +1 -1
- package/dist/internal/ActorStateAdapter.d.ts.map +1 -1
- package/dist/internal/ActorStateAdapter.js +2 -7
- package/dist/internal/ActorStateAdapter.js.map +1 -1
- package/dist/internal/StateOptions.d.ts +1 -0
- package/dist/internal/StateOptions.d.ts.map +1 -1
- package/dist/internal/logging.d.ts +6 -7
- package/dist/internal/logging.d.ts.map +1 -1
- package/dist/internal/logging.js +78 -102
- package/dist/internal/logging.js.map +1 -1
- package/dist/mod.d.ts +1 -1
- package/dist/mod.d.ts.map +1 -1
- package/dist/mod.js +1 -1
- package/dist/mod.js.map +1 -1
- package/package.json +8 -3
- package/src/Actor.test-d.ts +38 -0
- package/src/Actor.ts +29 -4
- package/src/Client.test.ts +21 -18
- package/src/Client.ts +6 -4
- package/src/Registry.test.ts +7 -11
- package/src/Registry.ts +116 -50
- package/src/RivetError.test.ts +11 -0
- package/src/RivetError.ts +119 -0
- package/src/RivetLogger.ts +60 -0
- package/src/State.test.ts +163 -4
- package/src/State.ts +293 -97
- package/src/internal/ActorInstanceManager.ts +4 -10
- package/src/internal/ActorStateAdapter.ts +5 -11
- package/src/internal/StateOptions.ts +4 -0
- package/src/internal/logging.test.ts +65 -88
- package/src/internal/logging.ts +103 -143
- package/src/mod.ts +1 -1
- package/dist/Logger.d.ts +0 -29
- package/dist/Logger.d.ts.map +0 -1
- package/dist/Logger.js +0 -31
- package/dist/Logger.js.map +0 -1
- package/src/Logger.ts +0 -43
package/dist/Actor.d.ts
CHANGED
|
@@ -68,7 +68,7 @@ type RawWakeContextFor<State extends StateOptions.Any, Database extends Rivetkit
|
|
|
68
68
|
type WakeOptionsFor<StateDefinition extends StateOptions.Any, Database extends RivetkitDb.AnyDatabaseProvider> = {
|
|
69
69
|
readonly rawRivetkitContext: RawWakeContextFor<StateDefinition, Database>;
|
|
70
70
|
} & ([StateDefinition] extends [never] ? unknown : {
|
|
71
|
-
readonly state: State.State<StateOptions.Decoded<StateDefinition>, Schema.SchemaError
|
|
71
|
+
readonly state: State.State<StateOptions.Decoded<StateDefinition>, Schema.SchemaError, StateOptions.Services<StateDefinition>>;
|
|
72
72
|
});
|
|
73
73
|
type WakeFunction<ActionHandlers, R, W extends WakeOptions> = ((wakeOptions: W) => ActionHandlers) | ((wakeOptions: W) => Effect.Effect<ActionHandlers, never, R>);
|
|
74
74
|
type Wake<ActionHandlers, R, RX, W extends WakeOptions> = ActionHandlers | Effect.Effect<ActionHandlers, never, RX> | WakeFunction<ActionHandlers, R, W> | Effect.Effect<WakeFunction<ActionHandlers, R, W>, never, RX>;
|
|
@@ -91,7 +91,7 @@ export type Accessor<Actions extends Action.Any> = {
|
|
|
91
91
|
};
|
|
92
92
|
type UnknownToNever<T> = unknown extends T ? never : T;
|
|
93
93
|
type ExcludeBuiltInWakeServices<T, _State extends StateOptions.Any> = UnknownToNever<Exclude<T, Scope.Scope | CurrentAddress | Sleep>>;
|
|
94
|
-
type ToLayerRequirements<Actions extends Action.Any, ActionHandlers, State extends StateOptions.Any, R, RX> = ExcludeBuiltInWakeServices<R, State> | ExcludeBuiltInWakeServices<RX, State> | UnknownToNever<ActionHandlerServices<ActionHandlers>> | UnknownToNever<Action.ServicesServer<Actions>> | UnknownToNever<Action.ServicesClient<Actions>> | Registry.Registry;
|
|
94
|
+
type ToLayerRequirements<Actions extends Action.Any, ActionHandlers, State extends StateOptions.Any, R, RX> = ExcludeBuiltInWakeServices<R, State> | ExcludeBuiltInWakeServices<RX, State> | UnknownToNever<ActionHandlerServices<ActionHandlers>> | UnknownToNever<StateOptions.Services<State>> | UnknownToNever<Action.ServicesServer<Actions>> | UnknownToNever<Action.ServicesClient<Actions>> | Registry.Registry;
|
|
95
95
|
/**
|
|
96
96
|
* A Rivet Actor contract. It carries the action schemas and
|
|
97
97
|
* display options, but no server implementation.
|
|
@@ -122,7 +122,6 @@ export type ActionHandlersFrom<Actions extends Action.Any> = {
|
|
|
122
122
|
export declare const make: <const Name extends string, const Actions extends ReadonlyArray<Action.AnyWithProps> = readonly []>(name: Name, options?: {
|
|
123
123
|
readonly actions?: Actions;
|
|
124
124
|
}) => Actor<Name, Actions[number]>;
|
|
125
|
-
export declare function toWakeHandler<ActionHandlers extends object, R, RX, W extends WakeOptions = WakeOptions>(wake: Effect.Effect<(wakeOptions: W) => Effect.Effect<ActionHandlers, never, R>, never, RX>): (wakeOptions: W) => Effect.Effect<ActionHandlers, never, R | RX>;
|
|
126
125
|
export declare function toWakeHandler<ActionHandlers extends object, RX, W extends WakeOptions = WakeOptions>(wake: Effect.Effect<(wakeOptions: W) => ActionHandlers, never, RX>): (wakeOptions: W) => Effect.Effect<ActionHandlers, never, RX>;
|
|
127
126
|
export declare function toWakeHandler<ActionHandlers extends object, R, W extends WakeOptions = WakeOptions>(wake: (wakeOptions: W) => Effect.Effect<ActionHandlers, never, R>): (wakeOptions: W) => Effect.Effect<ActionHandlers, never, R>;
|
|
128
127
|
export declare function toWakeHandler<ActionHandlers extends object, W extends WakeOptions = WakeOptions>(wake: (wakeOptions: W) => ActionHandlers): (wakeOptions: W) => Effect.Effect<ActionHandlers>;
|
package/dist/Actor.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Actor.d.ts","sourceRoot":"","sources":["../src/Actor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Actor.d.ts","sourceRoot":"","sources":["../src/Actor.ts"],"names":[],"mappings":"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"}
|
package/dist/Actor.js
CHANGED
|
@@ -32,7 +32,7 @@ const Proto = {
|
|
|
32
32
|
actor: this,
|
|
33
33
|
wakeHandler: toWakeHandler(wake),
|
|
34
34
|
options,
|
|
35
|
-
}).pipe(Effect.
|
|
35
|
+
}).pipe(Effect.tap((rivetKitActor) => Registry.Registry.pipe(Effect.tap((registry) => Effect.sync(() => registry.rivetkitActors.set(this.name, rivetKitActor))))), Layer.effectDiscard);
|
|
36
36
|
},
|
|
37
37
|
get client() {
|
|
38
38
|
return Client.Client.pipe(Effect.map((client) => client.makeActorAccessor(this)));
|
|
@@ -54,7 +54,7 @@ export function toWakeHandler(wake) {
|
|
|
54
54
|
? wake
|
|
55
55
|
: Effect.succeed(wake);
|
|
56
56
|
return wakeEffect.pipe(Effect.flatMap((resolvedWake) => {
|
|
57
|
-
if (
|
|
57
|
+
if (Predicate.isFunction(resolvedWake)) {
|
|
58
58
|
const actionHandlers = resolvedWake(wakeOptions);
|
|
59
59
|
return Effect.isEffect(actionHandlers)
|
|
60
60
|
? actionHandlers
|
package/dist/Actor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Actor.js","sourceRoot":"","sources":["../src/Actor.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,OAAO,EACP,MAAM,EACN,QAAQ,EACR,KAAK,EACL,SAAS,EAGT,KAAK,EACL,MAAM,GACN,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AAGrC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,gBAAgB,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,oBAAoB,MAAM,oCAAoC,CAAC;AAC3E,OAAO,KAAK,iBAAiB,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAI1C,MAAM,MAAM,GAAG,yBAAyB,CAAC;AAEzC,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAU,EAAwB,EAAE,CAC3D,SAAS,CAAC,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;AAElC,MAAM,wBAAwB,GAAG;IAChC,MAAM;IACN,MAAM;CAGN,CAAC;AAmCF,MAAM,YAAY,GAAG,CAIpB,OAAiC,EAChC,EAAE,CAAC,CAAC;IACL,eAAe,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,wBAAwB,CAAC;IAC/D,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,wBAAwB,CAAC;CAC7D,CAAC,CAAC;AAiBH;;;;GAIG;AACH,MAAM,OAAO,cAAe,SAAQ,OAAO,CAAC,OAAO,EAGhD,CAAC,uCAAuC,CAAC;CAAG;AAE/C,MAAM,OAAO,KAAM,SAAQ,OAAO,CAAC,OAAO,EAA8B,CACvE,8BAA8B,CAC9B;CAAG;
|
|
1
|
+
{"version":3,"file":"Actor.js","sourceRoot":"","sources":["../src/Actor.ts"],"names":[],"mappings":"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"}
|
package/dist/Client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Client.d.ts","sourceRoot":"","sources":["../src/Client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAA0B,MAAM,QAAQ,CAAC;AACxE,OAAO,KAAK,cAAc,MAAM,iBAAiB,CAAC;AAGlD,OAAO,KAAK,KAAK,MAAM,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,KAAK,KAAK,MAAM,YAAY,CAAC;AAGzC,OAAO,EAAa,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIlE,QAAA,MAAM,MAAM,6BAA6B,CAAC;AAE1C;;;;GAIG;AACH,MAAM,MAAM,OAAO,GAAG,IAAI,CACzB,cAAc,CAAC,iBAAiB,EAChC,UAAU,GAAG,OAAO,GAAG,WAAW,CAClC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,WAAW,UAAU;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,MAAM,WAAW,MAAM;IACtB,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,MAAM,CAAC;IAEjC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,OAAO,SAAS,MAAM,CAAC,YAAY,EAC/D,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,KAC/B,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;CAC7B;AAED,eAAO,MAAM,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAElD,CAAC;AAEF,eAAO,MAAM,IAAI,+
|
|
1
|
+
{"version":3,"file":"Client.d.ts","sourceRoot":"","sources":["../src/Client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAA0B,MAAM,QAAQ,CAAC;AACxE,OAAO,KAAK,cAAc,MAAM,iBAAiB,CAAC;AAGlD,OAAO,KAAK,KAAK,MAAM,MAAM,aAAa,CAAC;AAC3C,OAAO,KAAK,KAAK,KAAK,MAAM,YAAY,CAAC;AAGzC,OAAO,EAAa,KAAK,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIlE,QAAA,MAAM,MAAM,6BAA6B,CAAC;AAE1C;;;;GAIG;AACH,MAAM,MAAM,OAAO,GAAG,IAAI,CACzB,cAAc,CAAC,iBAAiB,EAChC,UAAU,GAAG,OAAO,GAAG,WAAW,CAClC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,WAAW,UAAU;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,MAAM,WAAW,MAAM;IACtB,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,MAAM,CAAC;IAEjC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,OAAO,SAAS,MAAM,CAAC,YAAY,EAC/D,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,KAC/B,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;CAC7B;AAED,eAAO,MAAM,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAElD,CAAC;AAEF,eAAO,MAAM,IAAI,+FAiGf,CAAC;AAEH,eAAO,MAAM,KAAK,GAAI,UAAS,OAAY,KAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAO9D,CAAC"}
|
package/dist/Client.js
CHANGED
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
import { Context, Effect, Layer, Record, Result, Schema } from "effect";
|
|
2
2
|
import * as RivetkitClient from "rivetkit/client";
|
|
3
3
|
import * as RivetkitErrors from "rivetkit/errors";
|
|
4
|
-
import
|
|
4
|
+
import * as RivetkitLog from "rivetkit/log";
|
|
5
5
|
import * as ActionErrorEnvelope from "./internal/ActionErrorEnvelope.js";
|
|
6
6
|
import { getOrCreateBaseLogger } from "./internal/logging.js";
|
|
7
7
|
import { rpcSystem } from "./internal/tracing.js";
|
|
8
|
-
import * as
|
|
8
|
+
import * as RivetLogger from "./RivetLogger.js";
|
|
9
9
|
import * as RivetError from "./RivetError.js";
|
|
10
10
|
const TypeId = "~@rivetkit/effect/Client";
|
|
11
11
|
export const Client = Context.Service("@rivetkit/effect/Client");
|
|
12
12
|
export const make = Effect.fnUntraced(function* (options = {}) {
|
|
13
13
|
const baseLogger = yield* getOrCreateBaseLogger;
|
|
14
14
|
const rivetkitClient = yield* Effect.acquireRelease(Effect.sync(() => {
|
|
15
|
-
|
|
15
|
+
// Raw RivetKit clients do not accept a logger in their config,
|
|
16
|
+
// so install the Effect-selected logger before construction.
|
|
17
|
+
RivetkitLog.configureBaseLogger(baseLogger);
|
|
16
18
|
return RivetkitClient.createClient(options);
|
|
17
19
|
}), (c) => Effect.promise(() => c.dispose()));
|
|
18
20
|
return Client.of({
|
|
@@ -63,7 +65,7 @@ export const make = Effect.fnUntraced(function* (options = {}) {
|
|
|
63
65
|
}),
|
|
64
66
|
});
|
|
65
67
|
});
|
|
66
|
-
export const layer = (options = {}) => Layer.unwrap(Effect.map(getOrCreateBaseLogger, (baseLogger) => Layer.effect(Client, make(options)).pipe(Layer.provideMerge(
|
|
68
|
+
export const layer = (options = {}) => Layer.unwrap(Effect.map(getOrCreateBaseLogger, (baseLogger) => Layer.effect(Client, make(options)).pipe(Layer.provideMerge(RivetLogger.layerFromPino(baseLogger)))));
|
|
67
69
|
const decodeActionErrorEnvelope = Schema.decodeUnknownEffect(ActionErrorEnvelope.ActionErrorEnvelope);
|
|
68
70
|
/** @internal */
|
|
69
71
|
export const makeRivetkitActionFailureClassifier = (actionErrorSchema) => {
|
package/dist/Client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Client.js","sourceRoot":"","sources":["../src/Client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxE,OAAO,KAAK,cAAc,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,cAAc,MAAM,iBAAiB,CAAC;AAClD,OAAO,
|
|
1
|
+
{"version":3,"file":"Client.js","sourceRoot":"","sources":["../src/Client.ts"],"names":[],"mappings":"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"}
|
package/dist/Registry.d.ts
CHANGED
|
@@ -1,25 +1,87 @@
|
|
|
1
1
|
import { Context, Effect, Layer, type Scope } from "effect";
|
|
2
2
|
import { type HttpMiddleware, type HttpServerError, type HttpServerRequest, type HttpServerResponse } from "effect/unstable/http";
|
|
3
3
|
import * as Rivetkit from "rivetkit";
|
|
4
|
-
import
|
|
4
|
+
import * as RivetkitLog from "rivetkit/log";
|
|
5
5
|
import * as Client from "./Client.ts";
|
|
6
6
|
declare const TypeId = "~@rivetkit/effect/Registry";
|
|
7
7
|
type ServerlessOptions = NonNullable<Rivetkit.RegistryConfigInput<Rivetkit.RegistryActors>["serverless"]>;
|
|
8
|
-
export type Options = Pick<Rivetkit.RegistryConfigInput<Rivetkit.RegistryActors>, "endpoint" | "token" | "namespace" | "noWelcome">;
|
|
8
|
+
export type Options = Pick<Rivetkit.RegistryConfigInput<Rivetkit.RegistryActors>, "endpoint" | "token" | "namespace" | "noWelcome" | "sqlite">;
|
|
9
9
|
export interface Registry {
|
|
10
10
|
readonly [TypeId]: typeof TypeId;
|
|
11
11
|
readonly options: Options;
|
|
12
|
-
readonly baseLogger:
|
|
12
|
+
readonly baseLogger: RivetkitLog.Logger;
|
|
13
13
|
readonly rivetkitActors: Map<string, Rivetkit.AnyActorDefinition>;
|
|
14
14
|
}
|
|
15
15
|
export declare const Registry: Context.Service<Registry, Registry>;
|
|
16
|
+
/**
|
|
17
|
+
* Creates the shared registry that actor layers register into.
|
|
18
|
+
*
|
|
19
|
+
* @remarks
|
|
20
|
+
* Actor layers created with {@link Actor.Actor.toLayer|`Actor.toLayer()`}
|
|
21
|
+
* register into this service. Registry entrypoints such as
|
|
22
|
+
* {@link serve|`Registry.serve()`}, {@link toWebHandler|`Registry.toWebHandler()`},
|
|
23
|
+
* and {@link toHttpEffect|`Registry.toHttpEffect()`} later use the collected
|
|
24
|
+
* actors to create the underlying RivetKit runtime.
|
|
25
|
+
*
|
|
26
|
+
* @param options - RivetKit runtime options shared by the registered actors.
|
|
27
|
+
*
|
|
28
|
+
* @returns A layer that provides the {@link Registry|`Registry.Registry`}
|
|
29
|
+
* service.
|
|
30
|
+
*
|
|
31
|
+
* @example
|
|
32
|
+
* ```ts
|
|
33
|
+
* import { Registry } from "@rivetkit/effect"
|
|
34
|
+
* import { Layer } from "effect"
|
|
35
|
+
*
|
|
36
|
+
* const ActorsLayer = Layer.mergeAll(ChatRoomLive, ModeratorLive)
|
|
37
|
+
*
|
|
38
|
+
* const MainLayer = Registry.serve(ActorsLayer).pipe(
|
|
39
|
+
* Layer.provide(Registry.layer({ endpoint: "http://127.0.0.1:6420" }))
|
|
40
|
+
* )
|
|
41
|
+
* ```
|
|
42
|
+
*
|
|
43
|
+
* @see {@link serve|`Registry.serve()`} for starting a long-running actor
|
|
44
|
+
* server.
|
|
45
|
+
* @see {@link toWebHandler|`Registry.toWebHandler()`} for Fetch-compatible
|
|
46
|
+
* serverless handlers.
|
|
47
|
+
* @see {@link toHttpEffect|`Registry.toHttpEffect()`} for Effect HTTP handlers.
|
|
48
|
+
*/
|
|
16
49
|
export declare const layer: (options?: Options) => Layer.Layer<Registry>;
|
|
17
50
|
/**
|
|
18
|
-
*
|
|
51
|
+
* Serves the actors registered by `actorsLayer`.
|
|
52
|
+
*
|
|
53
|
+
* @remarks
|
|
54
|
+
* Provide this with {@link layer|`Registry.layer()`} at the application root.
|
|
55
|
+
* Building the returned layer evaluates the actor layer, collects its registered
|
|
56
|
+
* actors, and starts the underlying RivetKit runtime using the options from
|
|
57
|
+
* {@link layer|`Registry.layer()`}. Launch the resulting layer with
|
|
58
|
+
* {@link Layer.launch|`Layer.launch()`} to keep the server process alive.
|
|
59
|
+
*
|
|
60
|
+
* @param actorsLayer - A layer containing one or more
|
|
61
|
+
* {@link Actor.Actor.toLayer|`Actor.toLayer()`} registrations.
|
|
62
|
+
*
|
|
63
|
+
* @returns A side-effecting startup layer that requires the
|
|
64
|
+
* {@link Registry|`Registry.Registry`} service and the services required by
|
|
65
|
+
* `actorsLayer`.
|
|
66
|
+
*
|
|
67
|
+
* @example
|
|
68
|
+
* ```ts
|
|
69
|
+
* import { Registry } from "@rivetkit/effect"
|
|
70
|
+
* import { Layer } from "effect"
|
|
71
|
+
*
|
|
72
|
+
* const ActorsLayer = Layer.mergeAll(ChatRoomLive, ModeratorLive)
|
|
73
|
+
*
|
|
74
|
+
* const MainLayer = Registry.serve(ActorsLayer).pipe(
|
|
75
|
+
* Layer.provide(Registry.layer({ endpoint: "http://127.0.0.1:6420" }))
|
|
76
|
+
* )
|
|
77
|
+
*
|
|
78
|
+
* Layer.launch(MainLayer).pipe(NodeRuntime.runMain);
|
|
79
|
+
* ```
|
|
80
|
+
*
|
|
81
|
+
* @see {@link toWebHandler|`Registry.toWebHandler()`} for Fetch-compatible
|
|
82
|
+
* serverless handlers.
|
|
83
|
+
* @see {@link toHttpEffect|`Registry.toHttpEffect()`} for Effect HTTP handlers.
|
|
19
84
|
*
|
|
20
|
-
* The actor layer is built in the server layer scope. Registered Rivet Actors
|
|
21
|
-
* are collected from `Registry`, materialized into a single underlying RivetKit
|
|
22
|
-
* registry, and started.
|
|
23
85
|
*/
|
|
24
86
|
export declare const serve: <E, R>(actorsLayer: Layer.Layer<never, E, R>) => Layer.Layer<never, E, R | Registry>;
|
|
25
87
|
/**
|
package/dist/Registry.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Registry.d.ts","sourceRoot":"","sources":["../src/Registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC5D,OAAO,EAEN,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"Registry.d.ts","sourceRoot":"","sources":["../src/Registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC5D,OAAO,EAEN,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AACrC,OAAO,KAAK,WAAW,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AAItC,QAAA,MAAM,MAAM,+BAA+B,CAAC;AAC5C,KAAK,iBAAiB,GAAG,WAAW,CACnC,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,YAAY,CAAC,CACnE,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG,IAAI,CACzB,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,CAAC,cAAc,CAAC,EACrD,UAAU,GAAG,OAAO,GAAG,WAAW,GAAG,WAAW,GAAG,QAAQ,CAC3D,CAAC;AAEF,MAAM,WAAW,QAAQ;IACxB,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,MAAM,CAAC;IAEjC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAE1B,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC;IAExC,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,kBAAkB,CAAC,CAAC;CAClE;AAED,eAAO,MAAM,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CACF,CAAC;AAExD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,eAAO,MAAM,KAAK,GAAI,UAAS,OAAY,KAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAWhE,CAAC;AAmBH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,eAAO,MAAM,KAAK,GAAI,CAAC,EAAE,CAAC,EACzB,aAAa,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,KACnC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,GAAG,QAAQ,CAcnC,CAAC;AAEH;;;;;;;;;GASG;AACH,eAAO,MAAM,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,CAoC5D,CAAC;AAsBF,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AAEpD;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,GAAgC,CAAC;;;;;2KAqBxD,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,GAAG;IACrD;;OAEG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,cAAc,CAAC,cAAc,GAAG,SAAS,CAAC;IAChE;;OAEG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC;CAC7C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,GAAI,CAAC,EAC7B,eAAe,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,EACvC,UAAU,mBAAmB;;;CA6B7B,CAAC"}
|
package/dist/Registry.js
CHANGED
|
@@ -1,44 +1,99 @@
|
|
|
1
1
|
import { Context, Effect, Layer } from "effect";
|
|
2
2
|
import { HttpEffect, } from "effect/unstable/http";
|
|
3
3
|
import * as Rivetkit from "rivetkit";
|
|
4
|
-
import
|
|
4
|
+
import * as RivetkitLog from "rivetkit/log";
|
|
5
5
|
import * as Client from "./Client.js";
|
|
6
6
|
import { BaseLogger, getOrCreateBaseLogger } from "./internal/logging.js";
|
|
7
|
-
import * as
|
|
7
|
+
import * as RivetLogger from "./RivetLogger.js";
|
|
8
8
|
const TypeId = "~@rivetkit/effect/Registry";
|
|
9
9
|
export const Registry = Context.Service("@rivetkit/effect/Registry");
|
|
10
|
-
const make = (options, baseLogger) => {
|
|
11
|
-
return Registry.of({
|
|
12
|
-
[TypeId]: TypeId,
|
|
13
|
-
options,
|
|
14
|
-
baseLogger,
|
|
15
|
-
rivetkitActors: new Map(),
|
|
16
|
-
});
|
|
17
|
-
};
|
|
18
|
-
export const layer = (options = {}) => Layer.effect(Registry, Effect.map(getOrCreateBaseLogger, (baseLogger) => make(options, baseLogger)));
|
|
19
|
-
const setupRivetkitRegistry = (registry, options) => {
|
|
20
|
-
configureBaseLogger(registry.baseLogger);
|
|
21
|
-
return Rivetkit.setup({
|
|
22
|
-
use: Object.fromEntries(registry.rivetkitActors),
|
|
23
|
-
...registry.options,
|
|
24
|
-
logging: { baseLogger: registry.baseLogger },
|
|
25
|
-
...(options?.serverless === undefined
|
|
26
|
-
? {}
|
|
27
|
-
: { serverless: options.serverless }),
|
|
28
|
-
});
|
|
29
|
-
};
|
|
30
10
|
/**
|
|
31
|
-
*
|
|
11
|
+
* Creates the shared registry that actor layers register into.
|
|
12
|
+
*
|
|
13
|
+
* @remarks
|
|
14
|
+
* Actor layers created with {@link Actor.Actor.toLayer|`Actor.toLayer()`}
|
|
15
|
+
* register into this service. Registry entrypoints such as
|
|
16
|
+
* {@link serve|`Registry.serve()`}, {@link toWebHandler|`Registry.toWebHandler()`},
|
|
17
|
+
* and {@link toHttpEffect|`Registry.toHttpEffect()`} later use the collected
|
|
18
|
+
* actors to create the underlying RivetKit runtime.
|
|
19
|
+
*
|
|
20
|
+
* @param options - RivetKit runtime options shared by the registered actors.
|
|
21
|
+
*
|
|
22
|
+
* @returns A layer that provides the {@link Registry|`Registry.Registry`}
|
|
23
|
+
* service.
|
|
24
|
+
*
|
|
25
|
+
* @example
|
|
26
|
+
* ```ts
|
|
27
|
+
* import { Registry } from "@rivetkit/effect"
|
|
28
|
+
* import { Layer } from "effect"
|
|
29
|
+
*
|
|
30
|
+
* const ActorsLayer = Layer.mergeAll(ChatRoomLive, ModeratorLive)
|
|
31
|
+
*
|
|
32
|
+
* const MainLayer = Registry.serve(ActorsLayer).pipe(
|
|
33
|
+
* Layer.provide(Registry.layer({ endpoint: "http://127.0.0.1:6420" }))
|
|
34
|
+
* )
|
|
35
|
+
* ```
|
|
36
|
+
*
|
|
37
|
+
* @see {@link serve|`Registry.serve()`} for starting a long-running actor
|
|
38
|
+
* server.
|
|
39
|
+
* @see {@link toWebHandler|`Registry.toWebHandler()`} for Fetch-compatible
|
|
40
|
+
* serverless handlers.
|
|
41
|
+
* @see {@link toHttpEffect|`Registry.toHttpEffect()`} for Effect HTTP handlers.
|
|
42
|
+
*/
|
|
43
|
+
export const layer = (options = {}) => Layer.effect(Registry, Effect.map(getOrCreateBaseLogger, (baseLogger) => Registry.of({
|
|
44
|
+
[TypeId]: TypeId,
|
|
45
|
+
options,
|
|
46
|
+
baseLogger,
|
|
47
|
+
rivetkitActors: new Map(),
|
|
48
|
+
})));
|
|
49
|
+
const setupRivetkitRegistry = (registry, options) => Effect.sync(() => Rivetkit.setup({
|
|
50
|
+
use: Object.fromEntries(registry.rivetkitActors),
|
|
51
|
+
...registry.options,
|
|
52
|
+
logging: { baseLogger: registry.baseLogger },
|
|
53
|
+
...(options?.serverless === undefined
|
|
54
|
+
? {}
|
|
55
|
+
: { serverless: options.serverless }),
|
|
56
|
+
}));
|
|
57
|
+
/**
|
|
58
|
+
* Serves the actors registered by `actorsLayer`.
|
|
59
|
+
*
|
|
60
|
+
* @remarks
|
|
61
|
+
* Provide this with {@link layer|`Registry.layer()`} at the application root.
|
|
62
|
+
* Building the returned layer evaluates the actor layer, collects its registered
|
|
63
|
+
* actors, and starts the underlying RivetKit runtime using the options from
|
|
64
|
+
* {@link layer|`Registry.layer()`}. Launch the resulting layer with
|
|
65
|
+
* {@link Layer.launch|`Layer.launch()`} to keep the server process alive.
|
|
66
|
+
*
|
|
67
|
+
* @param actorsLayer - A layer containing one or more
|
|
68
|
+
* {@link Actor.Actor.toLayer|`Actor.toLayer()`} registrations.
|
|
69
|
+
*
|
|
70
|
+
* @returns A side-effecting startup layer that requires the
|
|
71
|
+
* {@link Registry|`Registry.Registry`} service and the services required by
|
|
72
|
+
* `actorsLayer`.
|
|
73
|
+
*
|
|
74
|
+
* @example
|
|
75
|
+
* ```ts
|
|
76
|
+
* import { Registry } from "@rivetkit/effect"
|
|
77
|
+
* import { Layer } from "effect"
|
|
78
|
+
*
|
|
79
|
+
* const ActorsLayer = Layer.mergeAll(ChatRoomLive, ModeratorLive)
|
|
80
|
+
*
|
|
81
|
+
* const MainLayer = Registry.serve(ActorsLayer).pipe(
|
|
82
|
+
* Layer.provide(Registry.layer({ endpoint: "http://127.0.0.1:6420" }))
|
|
83
|
+
* )
|
|
84
|
+
*
|
|
85
|
+
* Layer.launch(MainLayer).pipe(NodeRuntime.runMain);
|
|
86
|
+
* ```
|
|
87
|
+
*
|
|
88
|
+
* @see {@link toWebHandler|`Registry.toWebHandler()`} for Fetch-compatible
|
|
89
|
+
* serverless handlers.
|
|
90
|
+
* @see {@link toHttpEffect|`Registry.toHttpEffect()`} for Effect HTTP handlers.
|
|
32
91
|
*
|
|
33
|
-
* The actor layer is built in the server layer scope. Registered Rivet Actors
|
|
34
|
-
* are collected from `Registry`, materialized into a single underlying RivetKit
|
|
35
|
-
* registry, and started.
|
|
36
92
|
*/
|
|
37
93
|
export const serve = (actorsLayer) => Layer.effectDiscard(Effect.gen(function* () {
|
|
38
94
|
const registry = yield* Registry;
|
|
39
|
-
|
|
40
|
-
yield*
|
|
41
|
-
const rivetkitRegistry = setupRivetkitRegistry(registry);
|
|
95
|
+
yield* Layer.build(actorsLayer.pipe(Layer.provideMerge(RivetLogger.layerFromPino(registry.baseLogger))));
|
|
96
|
+
const rivetkitRegistry = yield* setupRivetkitRegistry(registry);
|
|
42
97
|
yield* Effect.sync(() => rivetkitRegistry.start());
|
|
43
98
|
}));
|
|
44
99
|
/**
|
|
@@ -53,7 +108,7 @@ export const serve = (actorsLayer) => Layer.effectDiscard(Effect.gen(function* (
|
|
|
53
108
|
*/
|
|
54
109
|
export const test = Layer.effect(Client.Client, Effect.gen(function* () {
|
|
55
110
|
const registry = yield* Registry;
|
|
56
|
-
const rivetkitRegistry = setupRivetkitRegistry(registry);
|
|
111
|
+
const rivetkitRegistry = yield* setupRivetkitRegistry(registry);
|
|
57
112
|
rivetkitRegistry.config.test = {
|
|
58
113
|
...rivetkitRegistry.config.test,
|
|
59
114
|
enabled: true,
|
|
@@ -83,12 +138,9 @@ export const test = Layer.effect(Client.Client, Effect.gen(function* () {
|
|
|
83
138
|
endpoint: registry.options.endpoint ?? resolvedEndpoint,
|
|
84
139
|
}).pipe(Effect.provideService(BaseLogger, registry.baseLogger));
|
|
85
140
|
}));
|
|
86
|
-
const makeHttpEffect = (registry, options) => {
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
});
|
|
90
|
-
return HttpEffect.fromWebHandler((request) => rivetkitRegistry.handler(request));
|
|
91
|
-
};
|
|
141
|
+
const makeHttpEffect = (registry, options) => Effect.map(setupRivetkitRegistry(registry, {
|
|
142
|
+
serverless: options,
|
|
143
|
+
}), (rivetkitRegistry) => HttpEffect.fromWebHandler((request) => rivetkitRegistry.handler(request)));
|
|
92
144
|
/**
|
|
93
145
|
* Builds a scoped Effect HTTP handler from a registry layer.
|
|
94
146
|
*
|
|
@@ -97,9 +149,10 @@ const makeHttpEffect = (registry, options) => {
|
|
|
97
149
|
* request is delegated to that registry's serverless handler.
|
|
98
150
|
*/
|
|
99
151
|
export const toHttpEffect = Effect.fnUntraced(function* (registryLayer, options) {
|
|
100
|
-
const context = yield* Layer.build(registryLayer.pipe(Layer.provideMerge(
|
|
152
|
+
const context = yield* Layer.build(registryLayer.pipe(Layer.provideMerge(RivetLogger.defaultLayer)));
|
|
153
|
+
const httpEffect = yield* makeHttpEffect(Context.get(context, Registry), options);
|
|
101
154
|
// @effect-diagnostics-next-line returnEffectInGen:off
|
|
102
|
-
return
|
|
155
|
+
return httpEffect.pipe(Effect.provide(context));
|
|
103
156
|
});
|
|
104
157
|
/**
|
|
105
158
|
* Builds a Fetch-compatible request handler from a registry layer.
|
|
@@ -115,9 +168,9 @@ export const toWebHandler = (registryLayer, options) => {
|
|
|
115
168
|
const { middleware: _middleware, memoMap: _memoMap, ...handlerOptions } = options;
|
|
116
169
|
serverlessOptions = handlerOptions;
|
|
117
170
|
}
|
|
118
|
-
const registryLayerWithLogging = registryLayer.pipe(Layer.provideMerge(
|
|
171
|
+
const registryLayerWithLogging = registryLayer.pipe(Layer.provideMerge(RivetLogger.defaultLayer));
|
|
119
172
|
return HttpEffect.toWebHandlerLayerWith(registryLayerWithLogging, {
|
|
120
|
-
toHandler: (context) => Effect.
|
|
173
|
+
toHandler: (context) => Effect.map(makeHttpEffect(Context.get(context, Registry), serverlessOptions), (httpEffect) => httpEffect.pipe(Effect.provide(context))),
|
|
121
174
|
middleware,
|
|
122
175
|
memoMap,
|
|
123
176
|
});
|
package/dist/Registry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Registry.js","sourceRoot":"","sources":["../src/Registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAc,MAAM,QAAQ,CAAC;AAC5D,OAAO,EACN,UAAU,GAKV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AACrC,OAAO,
|
|
1
|
+
{"version":3,"file":"Registry.js","sourceRoot":"","sources":["../src/Registry.ts"],"names":[],"mappings":"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"}
|