@rivetkit/effect 2.3.0 → 2.3.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/Registry.d.ts.map +1 -1
- package/dist/Registry.js +1 -1
- package/dist/Registry.js.map +1 -1
- package/dist/internal/ActionDispatcher.d.ts.map +1 -1
- package/dist/internal/ActionDispatcher.js.map +1 -1
- package/dist/internal/ActorInstanceManager.js.map +1 -1
- package/package.json +3 -2
- package/src/Actor.test.ts +4 -1
- package/src/Client.test.ts +1 -8
- package/src/Registry.test.ts +5 -12
- package/src/Registry.ts +20 -25
- package/src/internal/ActionDispatcher.ts +8 -11
- package/src/internal/ActorInstanceManager.ts +29 -29
- package/src/internal/logging.test.ts +99 -90
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,EAAuB,KAAK,MAAM,IAAI,UAAU,EAAE,MAAM,cAAc,CAAC;AAC9E,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,CAChD,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,UAAU,CAAC;IAEhC,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;AAWxD,eAAO,MAAM,KAAK,GAAI,UAAS,OAAY,KAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAMhE,CAAC;AAmBH;;;;;;GAMG;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,CAanC,CAAC;AAEH;;;;;;;;;GASG;AACH,eAAO,MAAM,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,CAoC5D,CAAC;AAkBF,MAAM,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AAEpD;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,GAAgC,CAAC;;;;;2KAmBxD,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;;;CA4B7B,CAAC"}
|
package/dist/Registry.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
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 { configureBaseLogger
|
|
4
|
+
import { configureBaseLogger } from "rivetkit/log";
|
|
5
5
|
import * as Client from "./Client.js";
|
|
6
6
|
import { BaseLogger, getOrCreateBaseLogger } from "./internal/logging.js";
|
|
7
7
|
import * as Logger from "./Logger.js";
|
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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActionDispatcher.d.ts","sourceRoot":"","sources":["../../src/internal/ActionDispatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,MAAM,EAEN,KAAK,KAAK,EAKV,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AACrC,OAAO,KAAK,KAAK,MAAM,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"ActionDispatcher.d.ts","sourceRoot":"","sources":["../../src/internal/ActionDispatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,MAAM,EAEN,KAAK,KAAK,EAKV,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AACrC,OAAO,KAAK,KAAK,MAAM,MAAM,cAAc,CAAC;AAC5C,OAAO,KAAK,EAAE,kBAAkB,EAAiB,KAAK,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,KAAK,KAAK,MAAM,MAAM,cAAc,CAAC;AAM5C,MAAM,MAAM,QAAQ,CAAC,cAAc,IAAI;IACtC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,EAChC,OAAO,CAAC,EAAE,MAAM,CAAC,UAAU,KACvB,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,IAAI,GAChB,IAAI,SAAS,MAAM,EACnB,OAAO,SAAS,MAAM,CAAC,YAAY,EACnC,cAAc,SAAS,kBAAkB,CAAC,OAAO,CAAC,EAClD,eAAe,SAAS,QAAQ,CAAC,kBAAkB,EAClD,yBAGC;IACF,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACrC,QAAQ,CAAC,WAAW,EAAE,CACrB,OAAO,EAAE,MAAM,KACX,QAAQ,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;CAC1C,wBAeM,QAAQ,CAAC,eAAe,CAAC,eAAe,CAAC,WACnC,MAAM,CAAC,OAAO,SAAe,SAC/B,MAAM,CAAC,UAAU,sBA8HzB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActionDispatcher.js","sourceRoot":"","sources":["../../src/internal/ActionDispatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,EACL,MAAM,EACN,IAAI,EAEJ,MAAM,EACN,MAAM,EACN,MAAM,EACN,MAAM,GACN,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"ActionDispatcher.js","sourceRoot":"","sources":["../../src/internal/ActionDispatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,EACL,MAAM,EACN,IAAI,EAEJ,MAAM,EACN,MAAM,EACN,MAAM,EACN,MAAM,GACN,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,QAAQ,MAAM,UAAU,CAAC;AAIrC,OAAO,KAAK,mBAAmB,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAU/C,MAAM,CAAC,MAAM,IAAI,GAAG,CAKlB,EACD,KAAK,EACL,WAAW,GAMX,EAAE,EAAE,CACJ,MAAM,CAAC,gBAAgB,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;IACjD,MAAM,aAAa,GAAG,MAAM,CAAC,mBAAmB,CAC/C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,CACxC,CAAC;IACF,MAAM,aAAa,GAAG,MAAM,CAAC,YAAY,CACxC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,aAAa,CAAC,CACxC,CAAC;IACF,MAAM,WAAW,GAAG,MAAM,CAAC,YAAY,CACtC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC,CACtC,CAAC;IAEF,OAAO;QACN,MAAM,CAAC,IAAI;QACX,KAAK,EACJ,CAA4C,EAC5C,OAAsC,EACtC,IAAwB,EACvB,EAAE;YACH,yDAAyD;YACzD,4DAA4D;YAC5D,8DAA8D;YAC9D,2DAA2D;YAC3D,4BAA4B;YAC5B,MAAM,SAAS,GAAG,GAAG,KAAK,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YACjD,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;YAEtC,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACxC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACf,IAAI,CAAC,CAAC,WAAW,CAAC,OAAO;oBAAE,MAAM,qBAAqB,EAAE,CAAC;gBACzD,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAC3C,CAAC;YAED,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBACxC,8CAA8C;gBAC9C,yCAAyC;gBACzC,8CAA8C;gBAC9C,gDAAgD;gBAChD,UAAU;gBACV,MAAM,aAAa,GAAG,QAAQ,CAAC,cAAc,CAC5C,MAAM,CAAC,IAA4B,CAGM,CAAC;gBAC3C,wDAAwD;gBACxD,4DAA4D;gBAC5D,wDAAwD;gBACxD,MAAM,gBAAgB,GACrB,CAAC,MAAM,CAAC,UAAU,IAAI,OAAO,KAAK,SAAS;oBAC1C,CAAC,CAAC,IAAI;oBACN,CAAC,CAAC,OAAO,CAAC;gBACZ,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,aAAa,CAC1C,gBAAgB,CAChB,CAAC,IAAI,CACL,MAAM,CAAC,QAAQ,CACd,GAAG,EAAE,CACJ,IAAI,QAAQ,CAAC,UAAU,CACtB,SAAS,EACT,SAAS,EACT,8BAA8B,KAAK,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,EAAE,CACzD,CACF,CACD,CAAC;gBACF,qDAAqD;gBACrD,oDAAoD;gBACpD,+CAA+C;gBAC/C,MAAM,aAAa,GAAG;oBACrB,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjB,MAAM;oBACN,OAAO,EAAE,cAAc;iBACS,CAAC;gBAElC,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACpC,aAAa,CAAC,aAAa,CAAC,CAC5B,CAAC;gBAEF,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;oBAChC,OAAO,KAAK,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,CACjD,MAAM,CAAC,KAAK,CACZ,CAAC;gBACH,CAAC;gBAED,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;gBAEvD,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;oBAClC,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,WAAW,CACtC,aAAa,CAAC,KAAK,CACnB,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBAErB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACxB,IAAI,QAAQ,CAAC,SAAS,CACrB,iBAAiB,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC;wBACzC,CAAC,CAAC,YAAY,CAAC,OAAO;wBACtB,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,SAAS,EAC1B;wBACC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC,CAC9B,YAAY,CACZ;4BACA,CAAC,CAAC,YAAY,CAAC,IAAI;4BACnB,CAAC,CAAC,SAAS;wBACZ,QAAQ,EACP,mBAAmB,CAAC,IAAI,CAAC,YAAY,CAAC;qBACvC,CACD,CACD,CAAC;gBACH,CAAC;gBAED,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC,IAAI,CACN,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE;gBAC1B,MAAM,EAAE,SAAS;oBAChB,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC;oBAChC,CAAC,CAAC,SAAS;gBACZ,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACX,iBAAiB,EAAE,SAAS;oBAC5B,YAAY,EAAE,SAAS;iBACvB;aACD,CAAC,EACF,MAAM,CAAC,YAAY,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAC/C,CAAC;YACF,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE;gBAC5C,MAAM,EAAE,CAAC,CAAC,WAAW;aACrB,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,IAAI,OAAO,CAC7B,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CACvC,CAAC;YAEF,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;gBAAE,OAAO,IAAI,CAAC,KAAK,CAAC;YAC5C,4DAA4D;YAC5D,gEAAgE;YAChE,2DAA2D;YAC3D,gEAAgE;YAChE,IAAI,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzC,MAAM,qBAAqB,EAAE,CAAC;YAC/B,CAAC;YACD,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YACjD,IAAI,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;gBAClC,MAAM,aAAa,CAAC,KAAK,CAAC;YAC3B,CAAC;YACD,MAAM,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;KACD,CAAC;AACH,CAAC,CAAC,CAAC;AAEJ,MAAM,qBAAqB,GAAG,GAAG,EAAE,CAClC,IAAI,QAAQ,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE;IAC5D,MAAM,EAAE,IAAI;CACZ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActorInstanceManager.js","sourceRoot":"","sources":["../../src/internal/ActorInstanceManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAc,QAAQ,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAuC5E,MAAM,CAAC,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAK7C,EACD,WAAW,EACX,YAAY,EACZ,WAAW,EACX,eAAe,GAgBf;IACA,MAAM,SAAS,GAAG,IAAI,GAAG,EAGtB,CAAC;IAEJ,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAO,CAAC;IAC9C,MAAM,UAAU,GAAG,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ActorInstanceManager.js","sourceRoot":"","sources":["../../src/internal/ActorInstanceManager.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rivetkit/effect",
|
|
3
|
-
"version": "2.3.
|
|
3
|
+
"version": "2.3.2",
|
|
4
4
|
"description": "Effect SDK for Rivet Actors",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"type": "module",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
},
|
|
32
32
|
"peerDependencies": {
|
|
33
33
|
"effect": "^4.0.0-beta.66",
|
|
34
|
-
"rivetkit": "2.3.
|
|
34
|
+
"rivetkit": "2.3.2"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"@arethetypeswrong/cli": "^0.18.3",
|
|
@@ -40,6 +40,7 @@
|
|
|
40
40
|
"@types/node": "^22.18.1",
|
|
41
41
|
"@vitest/coverage-v8": "^4.1.7",
|
|
42
42
|
"publint": "^0.3.21",
|
|
43
|
+
"rivetkit": "2.3.2",
|
|
43
44
|
"typescript": "^5.9.2",
|
|
44
45
|
"vitest": "^4.1.5"
|
|
45
46
|
}
|
package/src/Actor.test.ts
CHANGED
|
@@ -58,7 +58,10 @@ describe("Actor.toWakeHandler", () => {
|
|
|
58
58
|
const wakeHandler = Actor.toWakeHandler(wake);
|
|
59
59
|
const actionHandlers = yield* wakeHandler(wakeOptions);
|
|
60
60
|
|
|
61
|
-
assert.strictEqual(
|
|
61
|
+
assert.strictEqual(
|
|
62
|
+
wakeOptions.rawRivetkitContext,
|
|
63
|
+
rawRivetkitContext,
|
|
64
|
+
);
|
|
62
65
|
assert.strictEqual(yield* actionHandlers.GetKey(), "room/1");
|
|
63
66
|
}),
|
|
64
67
|
);
|
package/src/Client.test.ts
CHANGED
|
@@ -20,14 +20,7 @@ function makeTestLogger(
|
|
|
20
20
|
level: "debug",
|
|
21
21
|
child: () => logger,
|
|
22
22
|
};
|
|
23
|
-
for (const level of [
|
|
24
|
-
"trace",
|
|
25
|
-
"debug",
|
|
26
|
-
"info",
|
|
27
|
-
"warn",
|
|
28
|
-
"error",
|
|
29
|
-
"fatal",
|
|
30
|
-
]) {
|
|
23
|
+
for (const level of ["trace", "debug", "info", "warn", "error", "fatal"]) {
|
|
31
24
|
logger[level] = (
|
|
32
25
|
fields: Record<string, unknown>,
|
|
33
26
|
msg?: string,
|
package/src/Registry.test.ts
CHANGED
|
@@ -33,14 +33,7 @@ function makeTestLogger(): PinoLogger {
|
|
|
33
33
|
level: "debug",
|
|
34
34
|
child: () => logger,
|
|
35
35
|
};
|
|
36
|
-
for (const level of [
|
|
37
|
-
"trace",
|
|
38
|
-
"debug",
|
|
39
|
-
"info",
|
|
40
|
-
"warn",
|
|
41
|
-
"error",
|
|
42
|
-
"fatal",
|
|
43
|
-
]) {
|
|
36
|
+
for (const level of ["trace", "debug", "info", "warn", "error", "fatal"]) {
|
|
44
37
|
logger[level] = (): void => {};
|
|
45
38
|
}
|
|
46
39
|
|
|
@@ -207,8 +200,7 @@ describe("Registry.toWebHandler", () => {
|
|
|
207
200
|
}),
|
|
208
201
|
),
|
|
209
202
|
);
|
|
210
|
-
const { handler, dispose } =
|
|
211
|
-
Registry.toWebHandler(WelcomeRegistryLive);
|
|
203
|
+
const { handler, dispose } = Registry.toWebHandler(WelcomeRegistryLive);
|
|
212
204
|
|
|
213
205
|
try {
|
|
214
206
|
const first = await handler(
|
|
@@ -234,8 +226,9 @@ describe("Registry.toWebHandler", () => {
|
|
|
234
226
|
const CustomLoggerRegistryLive = RegistryLive.pipe(
|
|
235
227
|
Layer.provide(Logger.layerPino(baseLogger)),
|
|
236
228
|
);
|
|
237
|
-
const { handler, dispose } =
|
|
238
|
-
|
|
229
|
+
const { handler, dispose } = Registry.toWebHandler(
|
|
230
|
+
CustomLoggerRegistryLive,
|
|
231
|
+
);
|
|
239
232
|
|
|
240
233
|
try {
|
|
241
234
|
const response = await handler(
|
package/src/Registry.ts
CHANGED
|
@@ -7,10 +7,7 @@ import {
|
|
|
7
7
|
type HttpServerResponse,
|
|
8
8
|
} from "effect/unstable/http";
|
|
9
9
|
import * as Rivetkit from "rivetkit";
|
|
10
|
-
import {
|
|
11
|
-
configureBaseLogger,
|
|
12
|
-
type Logger as PinoLogger,
|
|
13
|
-
} from "rivetkit/log";
|
|
10
|
+
import { configureBaseLogger, type Logger as PinoLogger } from "rivetkit/log";
|
|
14
11
|
import * as Client from "./Client.ts";
|
|
15
12
|
import { BaseLogger, getOrCreateBaseLogger } from "./internal/logging.ts";
|
|
16
13
|
import * as Logger from "./Logger.ts";
|
|
@@ -81,19 +78,19 @@ const setupRivetkitRegistry = (
|
|
|
81
78
|
*/
|
|
82
79
|
export const serve = <E, R>(
|
|
83
80
|
actorsLayer: Layer.Layer<never, E, R>,
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
81
|
+
): Layer.Layer<never, E, R | Registry> =>
|
|
82
|
+
Layer.effectDiscard(
|
|
83
|
+
Effect.gen(function* () {
|
|
84
|
+
const registry = yield* Registry;
|
|
85
|
+
const baseLogger = registry.baseLogger;
|
|
86
|
+
yield* Layer.build(
|
|
87
|
+
actorsLayer.pipe(
|
|
88
|
+
Layer.provideMerge(Logger.layerPino(baseLogger)),
|
|
89
|
+
),
|
|
90
|
+
);
|
|
91
|
+
const rivetkitRegistry = setupRivetkitRegistry(registry);
|
|
92
|
+
yield* Effect.sync(() => rivetkitRegistry.start());
|
|
93
|
+
}),
|
|
97
94
|
);
|
|
98
95
|
|
|
99
96
|
/**
|
|
@@ -137,14 +134,12 @@ export const test: Layer.Layer<Client.Client, never, Registry> = Layer.effect(
|
|
|
137
134
|
// to its (warning-emitting) default.
|
|
138
135
|
const resolvedEndpoint = rivetkitRegistry.parseConfig().endpoint;
|
|
139
136
|
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
}),
|
|
147
|
-
);
|
|
137
|
+
return yield* Client.make({
|
|
138
|
+
...registry.options,
|
|
139
|
+
endpoint: registry.options.endpoint ?? resolvedEndpoint,
|
|
140
|
+
}).pipe(Effect.provideService(BaseLogger, registry.baseLogger));
|
|
141
|
+
}),
|
|
142
|
+
);
|
|
148
143
|
|
|
149
144
|
const makeHttpEffect = (
|
|
150
145
|
registry: Registry,
|
|
@@ -10,11 +10,7 @@ import {
|
|
|
10
10
|
} from "effect";
|
|
11
11
|
import * as Rivetkit from "rivetkit";
|
|
12
12
|
import type * as Action from "../Action.ts";
|
|
13
|
-
import type {
|
|
14
|
-
ActionHandlersFrom,
|
|
15
|
-
ActionRequest,
|
|
16
|
-
Actor,
|
|
17
|
-
} from "../Actor.ts";
|
|
13
|
+
import type { ActionHandlersFrom, ActionRequest, Actor } from "../Actor.ts";
|
|
18
14
|
import type * as Client from "../Client.ts";
|
|
19
15
|
import * as ActionErrorEnvelope from "./ActionErrorEnvelope.ts";
|
|
20
16
|
import { makeActorLogAnnotations } from "./logging.ts";
|
|
@@ -96,12 +92,13 @@ export const make = <
|
|
|
96
92
|
const decodedPayload = yield* decodePayload(
|
|
97
93
|
payloadForDecode,
|
|
98
94
|
).pipe(
|
|
99
|
-
Effect.mapError(
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
95
|
+
Effect.mapError(
|
|
96
|
+
() =>
|
|
97
|
+
new Rivetkit.RivetError(
|
|
98
|
+
"request",
|
|
99
|
+
"invalid",
|
|
100
|
+
`Invalid payload for action ${actor.name}/${action._tag}`,
|
|
101
|
+
),
|
|
105
102
|
),
|
|
106
103
|
);
|
|
107
104
|
// The payload was decoded with this action's schema,
|
|
@@ -71,36 +71,36 @@ export const make = Effect.fnUntraced(function* <
|
|
|
71
71
|
const services = yield* Effect.context<any>();
|
|
72
72
|
const runPromise = Effect.runPromiseWith(services);
|
|
73
73
|
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
74
|
+
const makeInstance = Effect.fnUntraced(function* (
|
|
75
|
+
c: WakeContext<StateDefinition, Database>,
|
|
76
|
+
): Effect.fn.Return<Instance<ActionHandlers, StateDefinition>, never, any> {
|
|
77
|
+
const scope = yield* Scope.make();
|
|
78
|
+
return yield* Effect.gen(function* () {
|
|
79
|
+
const state = stateAdapter
|
|
80
|
+
? yield* stateAdapter.makeStateView(c)
|
|
81
|
+
: undefined;
|
|
82
|
+
const context = makeContext(c, scope);
|
|
83
|
+
const actionHandlers = yield* wakeHandler(
|
|
84
|
+
makeWakeOptions(c, state),
|
|
85
|
+
).pipe(Effect.provide(context));
|
|
86
|
+
const runFork = yield* FiberSet.makeRuntime<
|
|
87
|
+
any,
|
|
88
|
+
unknown,
|
|
89
|
+
unknown
|
|
90
|
+
>().pipe(Effect.provide(Context.merge(services, context)));
|
|
91
91
|
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
92
|
+
return {
|
|
93
|
+
actionHandlers,
|
|
94
|
+
runFork,
|
|
95
|
+
scope,
|
|
96
|
+
state,
|
|
97
|
+
};
|
|
98
|
+
}).pipe(
|
|
99
|
+
Effect.onError((cause) =>
|
|
100
|
+
Scope.close(scope, Exit.failCause(cause)),
|
|
101
|
+
),
|
|
102
|
+
);
|
|
103
|
+
});
|
|
104
104
|
|
|
105
105
|
return {
|
|
106
106
|
get: (actorId: string) => instances.get(actorId),
|
|
@@ -18,14 +18,7 @@ type LogEntry = {
|
|
|
18
18
|
|
|
19
19
|
function makeTestLogger(entries: Array<LogEntry>): PinoLogger {
|
|
20
20
|
const logger: Record<string, unknown> = {};
|
|
21
|
-
for (const level of [
|
|
22
|
-
"trace",
|
|
23
|
-
"debug",
|
|
24
|
-
"info",
|
|
25
|
-
"warn",
|
|
26
|
-
"error",
|
|
27
|
-
"fatal",
|
|
28
|
-
]) {
|
|
21
|
+
for (const level of ["trace", "debug", "info", "warn", "error", "fatal"]) {
|
|
29
22
|
logger[level] = (
|
|
30
23
|
fields: Record<string, unknown>,
|
|
31
24
|
msg?: string,
|
|
@@ -137,12 +130,14 @@ describe("internal/logging", () => {
|
|
|
137
130
|
}),
|
|
138
131
|
);
|
|
139
132
|
|
|
140
|
-
it.effect(
|
|
141
|
-
|
|
142
|
-
|
|
133
|
+
it.effect(
|
|
134
|
+
"uses References.MinimumLogLevel when creating the base logger",
|
|
135
|
+
() =>
|
|
136
|
+
Effect.gen(function* () {
|
|
137
|
+
const baseLogger = yield* Logging.makeDefaultBaseLogger;
|
|
143
138
|
|
|
144
|
-
|
|
145
|
-
|
|
139
|
+
assert.strictEqual(baseLogger.level, "debug");
|
|
140
|
+
}).pipe(Effect.provideService(References.MinimumLogLevel, "Debug")),
|
|
146
141
|
);
|
|
147
142
|
|
|
148
143
|
it.effect("accepts the shared Pino RIVET_LOG_LEVEL values", () =>
|
|
@@ -198,91 +193,105 @@ describe("internal/logging", () => {
|
|
|
198
193
|
),
|
|
199
194
|
);
|
|
200
195
|
|
|
201
|
-
it.effect(
|
|
202
|
-
|
|
203
|
-
|
|
196
|
+
it.effect(
|
|
197
|
+
"uses Config.logLevel values provided to References.MinimumLogLevel",
|
|
198
|
+
() =>
|
|
199
|
+
Effect.gen(function* () {
|
|
200
|
+
const baseLogger = yield* Logging.makeDefaultBaseLogger;
|
|
204
201
|
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
202
|
+
assert.strictEqual(baseLogger.level, "trace");
|
|
203
|
+
}).pipe(
|
|
204
|
+
Effect.provide(
|
|
205
|
+
Layer.effect(
|
|
206
|
+
References.MinimumLogLevel,
|
|
207
|
+
Config.logLevel("RIVET_LOG_LEVEL"),
|
|
208
|
+
),
|
|
209
|
+
),
|
|
210
|
+
Effect.provideService(
|
|
211
|
+
ConfigProvider.ConfigProvider,
|
|
212
|
+
ConfigProvider.fromEnv({
|
|
213
|
+
env: {
|
|
214
|
+
RIVET_LOG_LEVEL: "Trace",
|
|
215
|
+
},
|
|
216
|
+
}),
|
|
211
217
|
),
|
|
212
218
|
),
|
|
213
|
-
Effect.provideService(
|
|
214
|
-
ConfigProvider.ConfigProvider,
|
|
215
|
-
ConfigProvider.fromEnv({
|
|
216
|
-
env: {
|
|
217
|
-
RIVET_LOG_LEVEL: "Trace",
|
|
218
|
-
},
|
|
219
|
-
}),
|
|
220
|
-
),
|
|
221
|
-
),
|
|
222
219
|
);
|
|
223
220
|
|
|
224
|
-
it.effect(
|
|
225
|
-
Effect.
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
Effect.
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
221
|
+
it.effect(
|
|
222
|
+
"uses References.CurrentLogLevel for plain Effect.log calls",
|
|
223
|
+
() =>
|
|
224
|
+
Effect.gen(function* () {
|
|
225
|
+
const entries: Array<LogEntry> = [];
|
|
226
|
+
const baseLogger = makeTestLogger(entries);
|
|
227
|
+
|
|
228
|
+
yield* Effect.log("plain log").pipe(
|
|
229
|
+
Effect.provideService(References.CurrentLogLevel, "Debug"),
|
|
230
|
+
Effect.provideService(References.MinimumLogLevel, "Debug"),
|
|
231
|
+
Effect.provide(
|
|
232
|
+
EffectLogger.layer([
|
|
233
|
+
Logging.makeEffectLogger(baseLogger),
|
|
234
|
+
]),
|
|
235
|
+
),
|
|
236
|
+
);
|
|
237
|
+
|
|
238
|
+
assert.deepStrictEqual(entries, [
|
|
239
|
+
{
|
|
240
|
+
level: "debug",
|
|
241
|
+
fields: {},
|
|
242
|
+
msg: "plain log",
|
|
243
|
+
},
|
|
244
|
+
]);
|
|
245
|
+
}),
|
|
245
246
|
);
|
|
246
247
|
|
|
247
|
-
it.effect(
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
Effect.
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
248
|
+
it.effect(
|
|
249
|
+
"does not call a Pino method for the None current log level",
|
|
250
|
+
() =>
|
|
251
|
+
Effect.gen(function* () {
|
|
252
|
+
const entries: Array<LogEntry> = [];
|
|
253
|
+
const baseLogger = makeTestLogger(entries);
|
|
254
|
+
|
|
255
|
+
yield* Effect.log("hidden log").pipe(
|
|
256
|
+
Effect.provideService(References.CurrentLogLevel, "None"),
|
|
257
|
+
Effect.provideService(References.MinimumLogLevel, "All"),
|
|
258
|
+
Effect.provide(
|
|
259
|
+
EffectLogger.layer([
|
|
260
|
+
Logging.makeEffectLogger(baseLogger),
|
|
261
|
+
]),
|
|
262
|
+
),
|
|
263
|
+
);
|
|
264
|
+
|
|
265
|
+
assert.deepStrictEqual(entries, []);
|
|
266
|
+
}),
|
|
262
267
|
);
|
|
263
268
|
|
|
264
|
-
it.effect(
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
Effect.
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
269
|
+
it.effect(
|
|
270
|
+
"emits References.CurrentLogSpans as structured span durations",
|
|
271
|
+
() =>
|
|
272
|
+
Effect.gen(function* () {
|
|
273
|
+
const entries: Array<LogEntry> = [];
|
|
274
|
+
const baseLogger = makeTestLogger(entries);
|
|
275
|
+
|
|
276
|
+
yield* Effect.logInfo("checkout complete").pipe(
|
|
277
|
+
Effect.withLogSpan("checkout"),
|
|
278
|
+
Effect.provide(
|
|
279
|
+
EffectLogger.layer([
|
|
280
|
+
Logging.makeEffectLogger(baseLogger),
|
|
281
|
+
]),
|
|
282
|
+
),
|
|
283
|
+
);
|
|
284
|
+
|
|
285
|
+
assert.strictEqual(entries.length, 1);
|
|
286
|
+
assert.strictEqual(entries[0]?.level, "info");
|
|
287
|
+
assert.strictEqual(entries[0]?.msg, "checkout complete");
|
|
288
|
+
assert.deepStrictEqual(Object.keys(entries[0]?.fields ?? {}), [
|
|
289
|
+
"spans",
|
|
290
|
+
]);
|
|
291
|
+
const spans = entries[0]?.fields.spans as
|
|
292
|
+
| Record<string, unknown>
|
|
293
|
+
| undefined;
|
|
294
|
+
assert.strictEqual(typeof spans?.checkout, "number");
|
|
295
|
+
}),
|
|
287
296
|
);
|
|
288
297
|
});
|