@shivaedev/test-story 0.32.0 → 0.34.0
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/CHANGELOG.md +37 -0
- package/README.md +122 -23
- package/dist/client/adapters/reactRendering.d.ts +7 -0
- package/dist/client/adapters/reactRendering.d.ts.map +1 -0
- package/dist/client/adapters/reactRendering.js +4 -0
- package/dist/client/adapters/reactRendering.js.map +1 -0
- package/dist/client/adapters/waitForReact.d.ts +2 -0
- package/dist/client/adapters/waitForReact.d.ts.map +1 -0
- package/dist/client/adapters/waitForReact.js +8 -0
- package/dist/client/adapters/waitForReact.js.map +1 -0
- package/dist/client/react.d.ts +5 -4
- package/dist/client/react.d.ts.map +1 -1
- package/dist/client/react.js +9 -10
- package/dist/client/react.js.map +1 -1
- package/dist/server/adapters/installOutbound.d.ts.map +1 -0
- package/dist/server/{internal → adapters}/installOutbound.js +38 -12
- package/dist/server/adapters/installOutbound.js.map +1 -0
- package/dist/server/adapters/receiveOtlp.d.ts +4 -0
- package/dist/server/adapters/receiveOtlp.d.ts.map +1 -0
- package/dist/server/adapters/receiveOtlp.js +39 -0
- package/dist/server/adapters/receiveOtlp.js.map +1 -0
- package/dist/server/adapters/screenAct.d.ts +4 -0
- package/dist/server/adapters/screenAct.d.ts.map +1 -0
- package/dist/server/adapters/screenAct.js +14 -0
- package/dist/server/adapters/screenAct.js.map +1 -0
- package/dist/server/adapters/screenDialogs.d.ts +2 -0
- package/dist/server/adapters/screenDialogs.d.ts.map +1 -0
- package/dist/server/adapters/screenDialogs.js +9 -0
- package/dist/server/adapters/screenDialogs.js.map +1 -0
- package/dist/server/adapters/screenElements.d.ts +3 -0
- package/dist/server/adapters/screenElements.d.ts.map +1 -1
- package/dist/server/adapters/screenElements.js +9 -0
- package/dist/server/adapters/screenElements.js.map +1 -1
- package/dist/server/adapters/screenMutations.d.ts +1 -1
- package/dist/server/adapters/screenMutations.d.ts.map +1 -1
- package/dist/server/adapters/screenMutations.js +1 -1
- package/dist/server/adapters/screenMutations.js.map +1 -1
- package/dist/server/adapters/screenNavigation.d.ts +1 -1
- package/dist/server/adapters/screenNavigation.d.ts.map +1 -1
- package/dist/server/adapters/screenNavigation.js +1 -1
- package/dist/server/adapters/screenNavigation.js.map +1 -1
- package/dist/server/adapters/screenQueries.d.ts +2 -0
- package/dist/server/adapters/screenQueries.d.ts.map +1 -1
- package/dist/server/adapters/screenQueries.js +27 -3
- package/dist/server/adapters/screenQueries.js.map +1 -1
- package/dist/server/adapters/storyFailure.d.ts +6 -0
- package/dist/server/adapters/storyFailure.d.ts.map +1 -0
- package/dist/server/adapters/storyFailure.js +13 -0
- package/dist/server/adapters/storyFailure.js.map +1 -0
- package/dist/server/adapters/visitHttp.d.ts +2 -0
- package/dist/server/adapters/visitHttp.d.ts.map +1 -0
- package/dist/server/adapters/visitHttp.js +4 -0
- package/dist/server/adapters/visitHttp.js.map +1 -0
- package/dist/server/adapters/writeSnapshot.d.ts +3 -0
- package/dist/server/adapters/writeSnapshot.d.ts.map +1 -0
- package/dist/server/adapters/writeSnapshot.js +24 -0
- package/dist/server/adapters/writeSnapshot.js.map +1 -0
- package/dist/server/browserReads.d.ts +6 -6
- package/dist/server/browserReads.d.ts.map +1 -1
- package/dist/server/browserReads.js +3 -16
- package/dist/server/browserReads.js.map +1 -1
- package/dist/server/domEnvironment.config.js +1 -1
- package/dist/server/domPage.d.ts +1 -1
- package/dist/server/domPage.d.ts.map +1 -1
- package/dist/server/domPage.js +2 -1
- package/dist/server/domPage.js.map +1 -1
- package/dist/server/fakeHttpService.d.ts +3 -1
- package/dist/server/fakeHttpService.d.ts.map +1 -1
- package/dist/server/fakeHttpService.js +9 -6
- package/dist/server/fakeHttpService.js.map +1 -1
- package/dist/server/forwardingProxy.d.ts +1 -1
- package/dist/server/forwardingProxy.d.ts.map +1 -1
- package/dist/server/forwardingProxy.js +1 -1
- package/dist/server/forwardingProxy.js.map +1 -1
- package/dist/server/httpVisitor.d.ts +12 -0
- package/dist/server/httpVisitor.d.ts.map +1 -0
- package/dist/server/httpVisitor.js +29 -0
- package/dist/server/httpVisitor.js.map +1 -0
- package/dist/server/internal/adapters/pageFetch.d.ts +1 -1
- package/dist/server/internal/adapters/pageFetch.d.ts.map +1 -1
- package/dist/server/internal/adapters/pageFetch.js +1 -1
- package/dist/server/internal/adapters/pageFetch.js.map +1 -1
- package/dist/server/internal/browserReadObserver.d.ts +4 -3
- package/dist/server/internal/browserReadObserver.d.ts.map +1 -1
- package/dist/server/internal/browserReadObserver.js +19 -3
- package/dist/server/internal/browserReadObserver.js.map +1 -1
- package/dist/server/internal/browserSubscriptions.d.ts +3 -2
- package/dist/server/internal/browserSubscriptions.d.ts.map +1 -1
- package/dist/server/internal/browserSubscriptions.js +14 -4
- package/dist/server/internal/browserSubscriptions.js.map +1 -1
- package/dist/server/internal/compose.d.ts.map +1 -1
- package/dist/server/internal/compose.js +2 -1
- package/dist/server/internal/compose.js.map +1 -1
- package/dist/server/internal/domDocument.d.ts +1 -1
- package/dist/server/internal/domDocument.d.ts.map +1 -1
- package/dist/server/internal/domDocument.js +1 -1
- package/dist/server/internal/domDocument.js.map +1 -1
- package/dist/server/internal/engineSnapshot.d.ts.map +1 -1
- package/dist/server/internal/engineSnapshot.js +2 -13
- package/dist/server/internal/engineSnapshot.js.map +1 -1
- package/dist/server/internal/failureReport.d.ts +1 -0
- package/dist/server/internal/failureReport.d.ts.map +1 -1
- package/dist/server/internal/failureReport.js +9 -3
- package/dist/server/internal/failureReport.js.map +1 -1
- package/dist/server/internal/fakeHttpAnswer.d.ts.map +1 -1
- package/dist/server/internal/fakeHttpAnswer.js +12 -4
- package/dist/server/internal/fakeHttpAnswer.js.map +1 -1
- package/dist/server/internal/fakeHttpControls.d.ts +1 -1
- package/dist/server/internal/fakeHttpControls.d.ts.map +1 -1
- package/dist/server/internal/fakeHttpControls.js +1 -1
- package/dist/server/internal/fakeHttpControls.js.map +1 -1
- package/dist/server/internal/fakeHttpGates.d.ts.map +1 -1
- package/dist/server/internal/fakeHttpGates.js +2 -1
- package/dist/server/internal/fakeHttpGates.js.map +1 -1
- package/dist/server/internal/fakeHttpReceive.d.ts +1 -1
- package/dist/server/internal/fakeHttpReceive.d.ts.map +1 -1
- package/dist/server/internal/fakeHttpReceive.js +4 -7
- package/dist/server/internal/fakeHttpReceive.js.map +1 -1
- package/dist/server/internal/fakeHttpScripts.js +1 -1
- package/dist/server/internal/fakeHttpScripts.js.map +1 -1
- package/dist/server/internal/fakeHttpSignals.d.ts +10 -0
- package/dist/server/internal/fakeHttpSignals.d.ts.map +1 -0
- package/dist/server/internal/fakeHttpSignals.js +26 -0
- package/dist/server/internal/fakeHttpSignals.js.map +1 -0
- package/dist/server/internal/hooked.d.ts +1 -1
- package/dist/server/internal/hooked.d.ts.map +1 -1
- package/dist/server/internal/hooked.js +1 -1
- package/dist/server/internal/hooked.js.map +1 -1
- package/dist/server/internal/loadingDeadline.d.ts +1 -1
- package/dist/server/internal/loadingDeadline.d.ts.map +1 -1
- package/dist/server/internal/loadingDeadline.js +2 -1
- package/dist/server/internal/loadingDeadline.js.map +1 -1
- package/dist/server/internal/loopback.d.ts +1 -1
- package/dist/server/internal/loopback.d.ts.map +1 -1
- package/dist/server/internal/loopback.js +1 -1
- package/dist/server/internal/loopback.js.map +1 -1
- package/dist/server/internal/narration.d.ts +6 -9
- package/dist/server/internal/narration.d.ts.map +1 -1
- package/dist/server/internal/narration.js +17 -18
- package/dist/server/internal/narration.js.map +1 -1
- package/dist/server/internal/nextClientHint.d.ts +3 -2
- package/dist/server/internal/nextClientHint.d.ts.map +1 -1
- package/dist/server/internal/nextClientHint.js +10 -2
- package/dist/server/internal/nextClientHint.js.map +1 -1
- package/dist/server/internal/observeBrowser.d.ts +61 -0
- package/dist/server/internal/observeBrowser.d.ts.map +1 -0
- package/dist/server/internal/observeBrowser.js +21 -0
- package/dist/server/internal/observeBrowser.js.map +1 -0
- package/dist/server/internal/otlpReadout.js +1 -1
- package/dist/server/internal/otlpReadout.js.map +1 -1
- package/dist/server/internal/otlpReadouts.d.ts +9 -0
- package/dist/server/internal/otlpReadouts.d.ts.map +1 -0
- package/dist/server/internal/otlpReadouts.js +44 -0
- package/dist/server/internal/otlpReadouts.js.map +1 -0
- package/dist/server/internal/otlpTracing.d.ts +10 -0
- package/dist/server/internal/otlpTracing.d.ts.map +1 -0
- package/dist/server/internal/otlpTracing.js +45 -0
- package/dist/server/internal/otlpTracing.js.map +1 -0
- package/dist/server/internal/otlpValue.d.ts +1 -1
- package/dist/server/internal/otlpValue.d.ts.map +1 -1
- package/dist/server/internal/otlpValue.js +1 -1
- package/dist/server/internal/otlpValue.js.map +1 -1
- package/dist/server/internal/recordedSignals.d.ts +1 -1
- package/dist/server/internal/recordedSignals.d.ts.map +1 -1
- package/dist/server/internal/recordedSignals.js +4 -1
- package/dist/server/internal/recordedSignals.js.map +1 -1
- package/dist/server/internal/runUntil.d.ts +1 -1
- package/dist/server/internal/runUntil.d.ts.map +1 -1
- package/dist/server/internal/runUntil.js +1 -1
- package/dist/server/internal/runUntil.js.map +1 -1
- package/dist/server/internal/screenReadouts.d.ts +2 -0
- package/dist/server/internal/screenReadouts.d.ts.map +1 -1
- package/dist/server/internal/screenReadouts.js +13 -1
- package/dist/server/internal/screenReadouts.js.map +1 -1
- package/dist/server/internal/screenWaits.d.ts +1 -1
- package/dist/server/internal/screenWaits.d.ts.map +1 -1
- package/dist/server/internal/screenWaits.js +1 -1
- package/dist/server/internal/screenWaits.js.map +1 -1
- package/dist/server/internal/seed.d.ts +2 -1
- package/dist/server/internal/seed.d.ts.map +1 -1
- package/dist/server/internal/seed.js +4 -1
- package/dist/server/internal/seed.js.map +1 -1
- package/dist/server/internal/start.d.ts +1 -1
- package/dist/server/internal/start.d.ts.map +1 -1
- package/dist/server/internal/start.js +7 -4
- package/dist/server/internal/start.js.map +1 -1
- package/dist/server/internal/storyIt.d.ts.map +1 -1
- package/dist/server/internal/storyIt.js +2 -1
- package/dist/server/internal/storyIt.js.map +1 -1
- package/dist/server/internal/visitorCookies.d.ts +5 -0
- package/dist/server/internal/visitorCookies.d.ts.map +1 -0
- package/dist/server/internal/visitorCookies.js +50 -0
- package/dist/server/internal/visitorCookies.js.map +1 -0
- package/dist/server/internal/waitForScreen.d.ts +1 -1
- package/dist/server/internal/waitForScreen.d.ts.map +1 -1
- package/dist/server/internal/waitForScreen.js +7 -3
- package/dist/server/internal/waitForScreen.js.map +1 -1
- package/dist/server/internal/withWatchedClock.d.ts +1 -1
- package/dist/server/internal/withWatchedClock.d.ts.map +1 -1
- package/dist/server/internal/withWatchedClock.js +2 -1
- package/dist/server/internal/withWatchedClock.js.map +1 -1
- package/dist/server/lineSignals.d.ts +1 -1
- package/dist/server/lineSignals.d.ts.map +1 -1
- package/dist/server/lineSignals.js +1 -1
- package/dist/server/lineSignals.js.map +1 -1
- package/dist/server/memberScreens.d.ts +3 -2
- package/dist/server/memberScreens.d.ts.map +1 -1
- package/dist/server/memberScreens.js +5 -5
- package/dist/server/memberScreens.js.map +1 -1
- package/dist/server/otlpReceiver.d.ts +15 -4
- package/dist/server/otlpReceiver.d.ts.map +1 -1
- package/dist/server/otlpReceiver.js +9 -40
- package/dist/server/otlpReceiver.js.map +1 -1
- package/dist/server/outcomes.d.ts +1 -1
- package/dist/server/outcomes.d.ts.map +1 -1
- package/dist/server/outcomes.js +1 -1
- package/dist/server/outcomes.js.map +1 -1
- package/dist/server/routeOutbound.d.ts +1 -1
- package/dist/server/routeOutbound.d.ts.map +1 -1
- package/dist/server/routeOutbound.js +2 -2
- package/dist/server/routeOutbound.js.map +1 -1
- package/dist/server/screenDriver.d.ts +9 -4
- package/dist/server/screenDriver.d.ts.map +1 -1
- package/dist/server/screenDriver.js +15 -4
- package/dist/server/screenDriver.js.map +1 -1
- package/dist/server/seedCookies.d.ts +3 -3
- package/dist/server/seedCookies.d.ts.map +1 -1
- package/dist/server/seedCookies.js +4 -4
- package/dist/server/seedCookies.js.map +1 -1
- package/dist/server/until.d.ts +3 -1
- package/dist/server/until.d.ts.map +1 -1
- package/dist/server/until.js +4 -1
- package/dist/server/until.js.map +1 -1
- package/dist/server/watchedClock.d.ts +3 -1
- package/dist/server/watchedClock.d.ts.map +1 -1
- package/dist/server/watchedClock.js +5 -1
- package/dist/server/watchedClock.js.map +1 -1
- package/package.json +12 -6
- package/src/client/adapters/reactRendering.ts +5 -0
- package/src/client/adapters/waitForReact.ts +7 -0
- package/src/client/react.ts +13 -12
- package/src/server/{internal → adapters}/installOutbound.ts +47 -12
- package/src/server/adapters/receiveOtlp.ts +45 -0
- package/src/server/adapters/screenAct.ts +20 -0
- package/src/server/adapters/screenDialogs.ts +12 -0
- package/src/server/adapters/screenElements.ts +9 -0
- package/src/server/adapters/screenMutations.ts +1 -1
- package/src/server/adapters/screenNavigation.ts +1 -1
- package/src/server/adapters/screenQueries.ts +31 -5
- package/src/server/adapters/storyFailure.ts +20 -0
- package/src/server/adapters/visitHttp.ts +3 -0
- package/src/server/adapters/writeSnapshot.ts +25 -0
- package/src/server/browserReads.ts +6 -20
- package/src/server/domEnvironment.config.ts +1 -1
- package/src/server/domPage.ts +2 -1
- package/src/server/fakeHttpService.ts +9 -6
- package/src/server/forwardingProxy.ts +1 -1
- package/src/server/httpVisitor.ts +37 -0
- package/src/server/internal/adapters/pageFetch.ts +1 -1
- package/src/server/internal/browserReadObserver.ts +20 -3
- package/src/server/internal/browserSubscriptions.ts +14 -4
- package/src/server/internal/compose.ts +2 -1
- package/src/server/internal/domDocument.ts +1 -1
- package/src/server/internal/engineSnapshot.ts +2 -20
- package/src/server/internal/failureReport.ts +14 -3
- package/src/server/internal/fakeHttpAnswer.ts +11 -4
- package/src/server/internal/fakeHttpControls.ts +1 -1
- package/src/server/internal/fakeHttpGates.ts +2 -1
- package/src/server/internal/fakeHttpReceive.ts +4 -7
- package/src/server/internal/fakeHttpScripts.ts +1 -1
- package/src/server/internal/fakeHttpSignals.ts +28 -0
- package/src/server/internal/hooked.ts +1 -1
- package/src/server/internal/loadingDeadline.ts +2 -1
- package/src/server/internal/loopback.ts +1 -1
- package/src/server/internal/narration.ts +26 -25
- package/src/server/internal/nextClientHint.ts +14 -4
- package/src/server/internal/observeBrowser.ts +25 -0
- package/src/server/internal/otlpReadout.ts +1 -1
- package/src/server/internal/otlpReadouts.ts +50 -0
- package/src/server/internal/otlpTracing.ts +56 -0
- package/src/server/internal/otlpValue.ts +1 -1
- package/src/server/internal/recordedSignals.ts +4 -1
- package/src/server/internal/runUntil.ts +1 -1
- package/src/server/internal/screenReadouts.ts +13 -1
- package/src/server/internal/screenWaits.ts +1 -1
- package/src/server/internal/seed.ts +5 -1
- package/src/server/internal/start.ts +10 -4
- package/src/server/internal/storyIt.ts +2 -1
- package/src/server/internal/visitorCookies.ts +62 -0
- package/src/server/internal/waitForScreen.ts +7 -3
- package/src/server/internal/withWatchedClock.ts +2 -1
- package/src/server/lineSignals.ts +1 -1
- package/src/server/memberScreens.ts +9 -5
- package/src/server/otlpReceiver.ts +13 -46
- package/src/server/outcomes.ts +1 -1
- package/src/server/routeOutbound.ts +2 -2
- package/src/server/screenDriver.ts +23 -10
- package/src/server/seedCookies.ts +6 -6
- package/src/server/until.ts +5 -1
- package/src/server/watchedClock.ts +5 -1
- package/dist/server/internal/installOutbound.d.ts.map +0 -1
- package/dist/server/internal/installOutbound.js.map +0 -1
- /package/dist/server/{internal → adapters}/installOutbound.d.ts +0 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/test-story",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.34.0",
|
|
4
4
|
"description": "Tests that read like stories over the real engine: a story kit per engine with its own it, traits per feature, and a failure that prints the story, where it stopped and the engine's state",
|
|
5
5
|
"homepage": "https://github.com/ShivaeDev/platform/tree/main/packages/test-story#readme",
|
|
6
6
|
"bugs": {
|
|
@@ -20,6 +20,11 @@
|
|
|
20
20
|
"source": "./src/server/*.ts",
|
|
21
21
|
"types": "./dist/server/*.d.ts",
|
|
22
22
|
"default": "./dist/server/*.js"
|
|
23
|
+
},
|
|
24
|
+
"#client/*.ts": {
|
|
25
|
+
"source": "./src/client/*.ts",
|
|
26
|
+
"types": "./dist/client/*.d.ts",
|
|
27
|
+
"default": "./dist/client/*.js"
|
|
23
28
|
}
|
|
24
29
|
},
|
|
25
30
|
"exports": {
|
|
@@ -42,17 +47,18 @@
|
|
|
42
47
|
"README.md"
|
|
43
48
|
],
|
|
44
49
|
"dependencies": {
|
|
45
|
-
"@shivaedev/contract": "0.
|
|
46
|
-
"@shivaedev/test": "0.
|
|
47
|
-
"@shivaedev/test-sql": "0.16.
|
|
50
|
+
"@shivaedev/contract": "0.31.0",
|
|
51
|
+
"@shivaedev/test": "0.13.0",
|
|
52
|
+
"@shivaedev/test-sql": "0.16.2",
|
|
48
53
|
"dom-accessibility-api": "0.7.1"
|
|
49
54
|
},
|
|
50
55
|
"devDependencies": {
|
|
51
56
|
"@effect/atom-react": "4.0.6",
|
|
52
57
|
"@effect/platform-node": "4.0.6",
|
|
58
|
+
"@effect/sql-pg": "4.0.6",
|
|
53
59
|
"@effect/vitest": "4.0.6",
|
|
54
|
-
"@shivaedev/quality": "0.
|
|
55
|
-
"@shivaedev/react": "0.
|
|
60
|
+
"@shivaedev/quality": "0.56.0",
|
|
61
|
+
"@shivaedev/react": "0.34.0",
|
|
56
62
|
"@types/node": "24.19.2",
|
|
57
63
|
"@types/react": "19.3.0",
|
|
58
64
|
"@types/react-dom": "19.3.0",
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export function reactRendering(): Promise<
|
|
2
|
+
[typeof import("@effect/atom-react"), typeof import("effect/reactivity/AtomRegistry"), typeof import("react-dom/client"), typeof import("react")]
|
|
3
|
+
> {
|
|
4
|
+
return Promise.all([import("@effect/atom-react"), import("effect/reactivity/AtomRegistry"), import("react-dom/client"), import("react")]);
|
|
5
|
+
}
|
package/src/client/react.ts
CHANGED
|
@@ -1,11 +1,15 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
3
|
-
import * as
|
|
4
|
-
import
|
|
5
|
-
import
|
|
1
|
+
import * as Clock from "effect/Clock";
|
|
2
|
+
import * as Effect from "effect/Effect";
|
|
3
|
+
import * as Exit from "effect/Exit";
|
|
4
|
+
import type * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
5
|
+
import * as Scope from "effect/Scope";
|
|
6
|
+
import type { ReactNode } from "react";
|
|
7
|
+
import type { RootOptions } from "react-dom/client";
|
|
6
8
|
import { beforeEach, expect, vi } from "vitest";
|
|
7
9
|
import { eventually as retry } from "@shivaedev/test/eventually.ts";
|
|
8
10
|
import { withLive } from "@shivaedev/test/withLive.ts";
|
|
11
|
+
import { reactRendering } from "#client/adapters/reactRendering.ts";
|
|
12
|
+
import { waitForReact } from "#client/adapters/waitForReact.ts";
|
|
9
13
|
|
|
10
14
|
type CaughtErrorHandler = NonNullable<RootOptions["onCaughtError"]>;
|
|
11
15
|
|
|
@@ -86,12 +90,7 @@ export function eventually(assert: () => void) {
|
|
|
86
90
|
const started = yield* Clock.currentTimeMillis;
|
|
87
91
|
return yield* retry(Effect.try({ catch: (error) => error, try: assert }), {
|
|
88
92
|
timeout: "3 seconds",
|
|
89
|
-
|
|
90
|
-
wait: Effect.promise(() =>
|
|
91
|
-
act(async () => {
|
|
92
|
-
await new Promise<void>((resolve) => setTimeout(resolve, 10));
|
|
93
|
-
}),
|
|
94
|
-
),
|
|
93
|
+
wait: Effect.promise(waitForReact),
|
|
95
94
|
}).pipe(
|
|
96
95
|
Effect.catch((error) =>
|
|
97
96
|
Effect.gen(function* () {
|
|
@@ -105,6 +104,7 @@ export function eventually(assert: () => void) {
|
|
|
105
104
|
}),
|
|
106
105
|
);
|
|
107
106
|
}
|
|
107
|
+
|
|
108
108
|
export interface Rendered {
|
|
109
109
|
readonly container: HTMLDivElement;
|
|
110
110
|
readonly registry: AtomRegistry.AtomRegistry;
|
|
@@ -112,7 +112,8 @@ export interface Rendered {
|
|
|
112
112
|
readonly unmount: () => Promise<void>;
|
|
113
113
|
}
|
|
114
114
|
export async function render(node: ReactNode, options?: RootOptions): Promise<Rendered> {
|
|
115
|
-
const
|
|
115
|
+
const [{ RegistryContext }, registryModule, { createRoot }, { act, createElement }] = await reactRendering();
|
|
116
|
+
const registry = registryModule.make();
|
|
116
117
|
const container = document.createElement("div");
|
|
117
118
|
document.body.append(container);
|
|
118
119
|
const root = createRoot(container, options);
|
|
@@ -13,11 +13,28 @@ function isDispatcher(value: unknown): value is Dispatcher {
|
|
|
13
13
|
return typeof value === "object" && value !== null && "dispatch" in value && typeof value.dispatch === "function";
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
16
|
+
interface Registration {
|
|
17
|
+
readonly origins: ReadonlyMap<string, string>;
|
|
18
|
+
refused?: Error;
|
|
19
|
+
readonly strict: boolean;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
const registrations = new Set<Registration>();
|
|
23
|
+
let restoreDispatchers: (() => void) | undefined;
|
|
24
|
+
|
|
25
|
+
function routingFor(hostname: string) {
|
|
26
|
+
let target: string | undefined;
|
|
27
|
+
let strict: Registration | undefined;
|
|
28
|
+
for (const registration of registrations) {
|
|
29
|
+
target = registration.origins.get(hostname) ?? target;
|
|
30
|
+
if (registration.strict) {
|
|
31
|
+
strict = registration;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
return { strict, target };
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
function installDispatchers() {
|
|
21
38
|
const slots = ["undici.globalDispatcher.1", "undici.globalDispatcher.2"].flatMap((name) => {
|
|
22
39
|
const key = Symbol.for(name);
|
|
23
40
|
const previous: unknown = Reflect.get(globalThis, key);
|
|
@@ -36,15 +53,15 @@ export async function installOutbound(routes: Readonly<Record<string, string>>,
|
|
|
36
53
|
const router: Dispatcher = {
|
|
37
54
|
dispatch(options, handler) {
|
|
38
55
|
const hostname = new URL(options.origin).hostname;
|
|
39
|
-
const target =
|
|
56
|
+
const { strict, target } = routingFor(hostname);
|
|
40
57
|
if (
|
|
41
|
-
strict
|
|
58
|
+
strict !== undefined
|
|
42
59
|
&& target === undefined
|
|
43
60
|
&& !["localhost", "[::1]"].includes(hostname)
|
|
44
61
|
&& !(isIP(hostname) === 4 && hostname.startsWith("127."))
|
|
45
62
|
) {
|
|
46
|
-
refused = unrouted(hostname);
|
|
47
|
-
throw refused;
|
|
63
|
+
strict.refused = unrouted(hostname);
|
|
64
|
+
throw strict.refused;
|
|
48
65
|
}
|
|
49
66
|
return previous.dispatch(target === undefined ? options : { ...options, origin: target }, handler);
|
|
50
67
|
},
|
|
@@ -55,10 +72,28 @@ export async function installOutbound(routes: Readonly<Record<string, string>>,
|
|
|
55
72
|
restore();
|
|
56
73
|
throw error;
|
|
57
74
|
}
|
|
75
|
+
return restore;
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
export async function installOutbound(routes: Readonly<Record<string, string>>, strict = true) {
|
|
79
|
+
const registration: Registration = {
|
|
80
|
+
origins: new Map(Object.entries(routes).map(([hostname, target]) => [hostname, new URL(target).origin])),
|
|
81
|
+
strict,
|
|
82
|
+
};
|
|
83
|
+
// A data URL initializes Node's bundled Undici without sending an HTTP request.
|
|
84
|
+
await fetch("data:,");
|
|
85
|
+
if (restoreDispatchers === undefined) {
|
|
86
|
+
restoreDispatchers = installDispatchers();
|
|
87
|
+
}
|
|
88
|
+
registrations.add(registration);
|
|
58
89
|
return () => {
|
|
59
|
-
|
|
60
|
-
if (
|
|
61
|
-
|
|
90
|
+
registrations.delete(registration);
|
|
91
|
+
if (registrations.size === 0) {
|
|
92
|
+
restoreDispatchers?.();
|
|
93
|
+
restoreDispatchers = undefined;
|
|
94
|
+
}
|
|
95
|
+
if (registration.refused !== undefined) {
|
|
96
|
+
throw registration.refused;
|
|
62
97
|
}
|
|
63
98
|
};
|
|
64
99
|
}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
|
+
import * as HttpStatus from "effect/http/HttpStatus";
|
|
3
|
+
import type { OtlpExport, OtlpReceiverOptions, OtlpSpan } from "#otlpReceiver.ts";
|
|
4
|
+
|
|
5
|
+
export async function receiveOtlp(
|
|
6
|
+
request: IncomingMessage,
|
|
7
|
+
response: ServerResponse,
|
|
8
|
+
requests: OtlpExport[],
|
|
9
|
+
record: (span: OtlpSpan) => void,
|
|
10
|
+
options: OtlpReceiverOptions,
|
|
11
|
+
) {
|
|
12
|
+
try {
|
|
13
|
+
const chunks: Buffer[] = [];
|
|
14
|
+
for await (const chunk of request) {
|
|
15
|
+
chunks.push(Buffer.from(chunk));
|
|
16
|
+
}
|
|
17
|
+
const body = Buffer.concat(chunks);
|
|
18
|
+
requests.push({ body, headers: request.headers, path: request.url, rawHeaders: request.rawHeaders });
|
|
19
|
+
if (request.method !== "POST" || request.url !== (options.path ?? "/v1/traces")) {
|
|
20
|
+
response.writeHead(HttpStatus.fromLiteral("NotFound")).end();
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
const contentType = request.headers["content-type"]?.split(";")[0]?.trim();
|
|
24
|
+
if (contentType !== "application/json" && contentType !== "application/x-protobuf") {
|
|
25
|
+
response.writeHead(HttpStatus.fromLiteral("UnsupportedMediaType")).end();
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
const { otlpReadout } = await import("#internal/otlpReadout.ts");
|
|
29
|
+
for (const span of otlpReadout(body, contentType)) {
|
|
30
|
+
record(span);
|
|
31
|
+
}
|
|
32
|
+
const status = typeof options.status === "function" ? options.status(requests.length) : (options.status ?? HttpStatus.fromLiteral("OK"));
|
|
33
|
+
if (status === undefined) {
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
response.writeHead(status);
|
|
37
|
+
if (options.answer === null) {
|
|
38
|
+
response.flushHeaders();
|
|
39
|
+
} else {
|
|
40
|
+
response.end(options.answer ?? "{}");
|
|
41
|
+
}
|
|
42
|
+
} catch {
|
|
43
|
+
response.writeHead(HttpStatus.fromLiteral("BadRequest")).end();
|
|
44
|
+
}
|
|
45
|
+
}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import * as Effect from "effect/Effect";
|
|
2
|
+
import * as Exit from "effect/Exit";
|
|
3
|
+
import type { ScreenDriverOptions } from "#screenDriver.ts";
|
|
4
|
+
|
|
5
|
+
export function screenAct<E>(act: NonNullable<ScreenDriverOptions["act"]>, action: Effect.Effect<void, E>) {
|
|
6
|
+
return Effect.callback<void, E>((resume, signal) => {
|
|
7
|
+
let outcome: Exit.Exit<void, E> = Exit.void;
|
|
8
|
+
const completed = Promise.resolve(
|
|
9
|
+
act(async () => {
|
|
10
|
+
// A rejected callback leaves React's act queue open, so deliver failure after act closes.
|
|
11
|
+
outcome = await Effect.runPromiseExit(action, { signal });
|
|
12
|
+
}),
|
|
13
|
+
);
|
|
14
|
+
completed.then(
|
|
15
|
+
() => resume(Exit.isFailure(outcome) ? Effect.failCause(outcome.cause) : Effect.void),
|
|
16
|
+
(error: unknown) => resume(Effect.die(error)),
|
|
17
|
+
);
|
|
18
|
+
return Effect.promise(() => completed);
|
|
19
|
+
});
|
|
20
|
+
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
const DIALOG_SELECTOR = 'dialog,[role="dialog"],[role="alertdialog"]';
|
|
2
|
+
|
|
3
|
+
export function screenDialogs(root: HTMLElement) {
|
|
4
|
+
const member = root.closest("[data-story-member]");
|
|
5
|
+
const controls = member
|
|
6
|
+
? [...member.querySelectorAll("[aria-controls]")].flatMap((element) => element.getAttribute("aria-controls")?.split(/\s+/u) ?? [])
|
|
7
|
+
: [];
|
|
8
|
+
return [...root.ownerDocument.body.querySelectorAll<HTMLElement>(DIALOG_SELECTOR)].filter(
|
|
9
|
+
(dialog) =>
|
|
10
|
+
!dialog.matches("dialog:not([open])") && (member === null || member.contains(dialog) || (dialog.id !== "" && controls.includes(dialog.id))),
|
|
11
|
+
);
|
|
12
|
+
}
|
|
@@ -39,6 +39,7 @@ export function screenElements(root: () => HTMLElement, dialogs = true) {
|
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
return {
|
|
42
|
+
dialog: queries.dialogElement,
|
|
42
43
|
element,
|
|
43
44
|
enabled,
|
|
44
45
|
enter: (selector: ScreenTarget, value: string) => {
|
|
@@ -62,6 +63,7 @@ export function screenElements(root: () => HTMLElement, dialogs = true) {
|
|
|
62
63
|
return found;
|
|
63
64
|
},
|
|
64
65
|
input,
|
|
66
|
+
labelled: queries.labelledElement,
|
|
65
67
|
matches: queries.matches,
|
|
66
68
|
rendered,
|
|
67
69
|
select: (selector: ScreenTarget, value: string) => {
|
|
@@ -77,6 +79,13 @@ export function screenElements(root: () => HTMLElement, dialogs = true) {
|
|
|
77
79
|
field.value = value;
|
|
78
80
|
field.dispatchEvent(new Event("change", { bubbles: true }));
|
|
79
81
|
},
|
|
82
|
+
table: (selector: ScreenTarget) => {
|
|
83
|
+
const found = element(selector);
|
|
84
|
+
if (!(found instanceof HTMLTableElement)) {
|
|
85
|
+
throw new Error(`The screen's ${targetName(selector)} is not an HTML table.\nhelp: Select a native table to read its rows and cells.`);
|
|
86
|
+
}
|
|
87
|
+
return found;
|
|
88
|
+
},
|
|
80
89
|
text: screenText,
|
|
81
90
|
textElement: queries.textElement,
|
|
82
91
|
};
|
|
@@ -2,6 +2,7 @@ import { isInaccessible } from "dom-accessibility-api";
|
|
|
2
2
|
import { accessibility, isRendered, targetName } from "#internal/screenAccessibility.ts";
|
|
3
3
|
import { screenText } from "#internal/screenText.ts";
|
|
4
4
|
import type { ScreenTarget } from "#screenDriver.ts";
|
|
5
|
+
import { screenDialogs } from "./screenDialogs.ts";
|
|
5
6
|
|
|
6
7
|
function matchesText(value: string, expected: string | RegExp) {
|
|
7
8
|
return typeof expected === "string" ? value === expected : new RegExp(expected.source, expected.flags).test(value);
|
|
@@ -11,11 +12,7 @@ export function screenQueries(root: () => HTMLElement, dialogs: boolean) {
|
|
|
11
12
|
function query(selector: string) {
|
|
12
13
|
const current = root();
|
|
13
14
|
const found = new Set(current.querySelectorAll<HTMLElement>(selector));
|
|
14
|
-
const portals = dialogs
|
|
15
|
-
? [...current.ownerDocument.querySelectorAll<HTMLElement>('dialog,[role="dialog"],[role="alertdialog"]')].filter(
|
|
16
|
-
(dialog) => !current.contains(dialog),
|
|
17
|
-
)
|
|
18
|
-
: [];
|
|
15
|
+
const portals = dialogs ? screenDialogs(current).filter((dialog) => !current.contains(dialog)) : [];
|
|
19
16
|
for (const dialog of portals) {
|
|
20
17
|
if (dialog.matches(selector)) {
|
|
21
18
|
found.add(dialog);
|
|
@@ -39,6 +36,35 @@ export function screenQueries(root: () => HTMLElement, dialogs: boolean) {
|
|
|
39
36
|
return candidates().filter(({ role, name }) => role === target.role && matchesText(name, target.name));
|
|
40
37
|
}
|
|
41
38
|
return {
|
|
39
|
+
dialogElement: (target: ScreenTarget) => {
|
|
40
|
+
const matches = screenDialogs(root()).filter((dialog) => {
|
|
41
|
+
if (!isRendered(dialog) || isInaccessible(dialog)) {
|
|
42
|
+
return false;
|
|
43
|
+
}
|
|
44
|
+
if (typeof target === "string") {
|
|
45
|
+
return dialog.matches(target);
|
|
46
|
+
}
|
|
47
|
+
const { name, role } = accessibility(dialog);
|
|
48
|
+
return role === target.role && matchesText(name, target.name);
|
|
49
|
+
});
|
|
50
|
+
const found = matches[0];
|
|
51
|
+
if (matches.length !== 1 || found === undefined) {
|
|
52
|
+
throw new Error(
|
|
53
|
+
`The screen has ${matches.length} dialogs for ${targetName(target)}.\nhelp: Identify exactly one visible dialog owned by this screen; link body portals from the member's trigger with aria-controls.`,
|
|
54
|
+
);
|
|
55
|
+
}
|
|
56
|
+
return found;
|
|
57
|
+
},
|
|
58
|
+
labelledElement: (name: string | RegExp) => {
|
|
59
|
+
const matches = query("[aria-label],[aria-labelledby],button,input,textarea,select,output,meter,progress").filter(
|
|
60
|
+
(element) => isRendered(element) && !isInaccessible(element) && matchesText(accessibility(element).name, name),
|
|
61
|
+
);
|
|
62
|
+
const found = matches[0];
|
|
63
|
+
if (matches.length !== 1 || found === undefined) {
|
|
64
|
+
throw new Error(`The screen has ${matches.length} elements labelled ${String(name)}.\nhelp: Use a label for exactly one visible readout.`);
|
|
65
|
+
}
|
|
66
|
+
return found;
|
|
67
|
+
},
|
|
42
68
|
matches: (target: ScreenTarget) =>
|
|
43
69
|
(typeof target === "string" ? query(target).filter(isRendered) : roles(target).map(({ element }) => element)).filter(
|
|
44
70
|
(element) => element.isConnected,
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import * as Effect from "effect/Effect";
|
|
2
|
+
import type { TestContext } from "vitest";
|
|
3
|
+
import type { FailedTest } from "#internal/failureReport.ts";
|
|
4
|
+
import { describeFailure } from "#internal/render.ts";
|
|
5
|
+
|
|
6
|
+
export type FailureContext = Pick<TestContext, "onTestFailed" | "task">;
|
|
7
|
+
|
|
8
|
+
export const reportOnFailure = Effect.fnUntraced(function* (
|
|
9
|
+
{ onTestFailed, task }: FailureContext,
|
|
10
|
+
report: (test: FailedTest) => Effect.Effect<string, never, unknown>,
|
|
11
|
+
) {
|
|
12
|
+
const run = Effect.runPromiseWith(yield* Effect.context<unknown>());
|
|
13
|
+
onTestFailed(async ({ task: failedTask }) => {
|
|
14
|
+
const failure = failedTask.result?.errors?.[0];
|
|
15
|
+
if (failure !== undefined) {
|
|
16
|
+
const appendix = await run(report({ file: task.file.filepath, name: task.name, stack: failure.stack }));
|
|
17
|
+
failure.message = `${failure.message || describeFailure({ ...failure, message: "" })}\n\n${appendix}`;
|
|
18
|
+
}
|
|
19
|
+
});
|
|
20
|
+
});
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { mkdirSync, writeFileSync } from "node:fs";
|
|
2
|
+
import { basename, dirname, join, relative } from "node:path";
|
|
3
|
+
import process from "node:process";
|
|
4
|
+
import type { FailedTest } from "#internal/failureReport.ts";
|
|
5
|
+
import { describeValue, toJson } from "#internal/render.ts";
|
|
6
|
+
import { wrap } from "#internal/wrap.ts";
|
|
7
|
+
|
|
8
|
+
function slug(text: string): string {
|
|
9
|
+
return text
|
|
10
|
+
.toLowerCase()
|
|
11
|
+
.replaceAll(/[^a-z0-9.]+/gu, "-")
|
|
12
|
+
.slice(0, 80);
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
export function writeSnapshot(name: string, test: FailedTest, value: unknown, characters: number): string[] {
|
|
16
|
+
const heading = `The ${name} when the test failed`;
|
|
17
|
+
const file = join(process.cwd(), "node_modules", ".cache", "test-story", `${slug(basename(test.file))}--${slug(test.name)}--${slug(name)}.json`);
|
|
18
|
+
try {
|
|
19
|
+
mkdirSync(dirname(file), { recursive: true });
|
|
20
|
+
writeFileSync(file, toJson(value, 2));
|
|
21
|
+
} catch (error) {
|
|
22
|
+
return wrap(`${heading} could not be written to ${relative(process.cwd(), file)}: ${describeValue(error)}`);
|
|
23
|
+
}
|
|
24
|
+
return wrap(`${heading} is ${characters} characters of JSON, too long to print here. Read it in ${relative(process.cwd(), file)}`);
|
|
25
|
+
}
|
|
@@ -1,13 +1,11 @@
|
|
|
1
|
-
import
|
|
2
|
-
import * as
|
|
3
|
-
import
|
|
4
|
-
import * as Socket from "effect/socket/Socket";
|
|
5
|
-
import { browserReadObserver } from "#internal/browserReadObserver.ts";
|
|
1
|
+
import * as Effect from "effect/Effect";
|
|
2
|
+
import type * as Layer from "effect/Layer";
|
|
3
|
+
import type * as Socket from "effect/socket/Socket";
|
|
6
4
|
|
|
7
5
|
export type BrowserSubscription = {
|
|
8
6
|
readonly payload: unknown;
|
|
9
7
|
readonly tag: string;
|
|
10
|
-
} & ({ readonly state: "open" | "answered" } | { readonly state: "refused"; readonly refusalTag: string });
|
|
8
|
+
} & ({ readonly state: "open" | "answered" | "closed" } | { readonly state: "refused"; readonly refusalTag: string });
|
|
11
9
|
|
|
12
10
|
export interface BrowserRead {
|
|
13
11
|
readonly kind: "query" | "subscription";
|
|
@@ -25,18 +23,6 @@ export interface BrowserReadsOptions {
|
|
|
25
23
|
}
|
|
26
24
|
|
|
27
25
|
export const browserReads = Effect.fn("BrowserStory.browserReads")(function* (options: BrowserReadsOptions) {
|
|
28
|
-
const {
|
|
29
|
-
|
|
30
|
-
const protocol = Atom.family((_identity: string | undefined) => {
|
|
31
|
-
const layer = Layer.effect(RpcClient.Protocol, observeProtocol).pipe(Layer.provide(socketProtocol(options)));
|
|
32
|
-
return Layer.effectContext(Effect.flatMap(Effect.scope, (scope) => Layer.buildWithMemoMap(layer, memoMap, scope)));
|
|
33
|
-
});
|
|
34
|
-
return { ...observed, protocol };
|
|
26
|
+
const { observeBrowser } = yield* Effect.promise(() => import("#internal/observeBrowser.ts"));
|
|
27
|
+
return yield* observeBrowser(options);
|
|
35
28
|
});
|
|
36
|
-
|
|
37
|
-
function socketProtocol(options: BrowserReadsOptions) {
|
|
38
|
-
const socket = Socket.layerWebSocket(options.url.replace(/^http/u, "ws"), { headers: options.headers }).pipe(
|
|
39
|
-
Layer.provide(options.webSocketConstructor ?? Socket.layerWebSocketConstructorGlobal),
|
|
40
|
-
);
|
|
41
|
-
return RpcClient.layerProtocolSocket().pipe(Layer.provide(socket), Layer.provide(RpcSerialization.layerNdjson));
|
|
42
|
-
}
|
|
@@ -9,7 +9,7 @@ const domEnvironment: Environment = {
|
|
|
9
9
|
// Vitest loads environments outside the project's source resolution conditions.
|
|
10
10
|
const load = createRequire(import.meta.url);
|
|
11
11
|
const { documentTransport }: typeof import("#internal/documentTransport.ts") = load("#internal/documentTransport.ts");
|
|
12
|
-
const { installOutbound }: typeof import("#
|
|
12
|
+
const { installOutbound }: typeof import("#adapters/installOutbound.ts") = load("#adapters/installOutbound.ts");
|
|
13
13
|
const { installDomTimers }: typeof import("#internal/installDomTimers.ts") = load("#internal/installDomTimers.ts");
|
|
14
14
|
const native = Object.fromEntries(
|
|
15
15
|
["fetch", "AbortController", "AbortSignal", "Headers", "Request", "Response"].map((name) => [name, Reflect.get(global, name)]),
|
package/src/server/domPage.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import
|
|
1
|
+
import * as Effect from "effect/Effect";
|
|
2
|
+
import * as SubscriptionRef from "effect/SubscriptionRef";
|
|
2
3
|
import { pageFetch } from "#internal/adapters/pageFetch.ts";
|
|
3
4
|
|
|
4
5
|
export const domPage = Effect.fn("BrowserStory.domPage")(function* (url: string) {
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { createServer, type IncomingHttpHeaders } from "node:http";
|
|
2
|
-
import
|
|
2
|
+
import * as Clock from "effect/Clock";
|
|
3
|
+
import * as Effect from "effect/Effect";
|
|
3
4
|
import { fakeHttpControls } from "#internal/fakeHttpControls.ts";
|
|
4
5
|
import { fakeHttpReceive } from "#internal/fakeHttpReceive.ts";
|
|
6
|
+
import { fakeHttpSignals } from "#internal/fakeHttpSignals.ts";
|
|
5
7
|
import { loopbackServer } from "#internal/loopback.ts";
|
|
6
|
-
import { recordedSignals } from "#internal/recordedSignals.ts";
|
|
7
8
|
import { type UntilOptions, until } from "#until.ts";
|
|
8
9
|
|
|
9
10
|
export interface FakeHttpRequest {
|
|
@@ -75,11 +76,11 @@ export const fakeHttpService = Effect.fnUntraced(function* (options: FakeHttpSer
|
|
|
75
76
|
narrate?.(line);
|
|
76
77
|
}
|
|
77
78
|
const controls = fakeHttpControls(tell, () => clock.currentTimeMillisUnsafe());
|
|
78
|
-
const
|
|
79
|
-
const server = createServer((request, response) => fakeHttpReceive(request, response, options, requests, controls, tell,
|
|
79
|
+
const signals = fakeHttpSignals();
|
|
80
|
+
const server = createServer((request, response) => fakeHttpReceive(request, response, options, requests, controls, tell, signals.record));
|
|
80
81
|
const url = yield* loopbackServer(server);
|
|
81
82
|
|
|
82
|
-
yield* Effect.addFinalizer(() => Effect.sync(
|
|
83
|
+
yield* Effect.addFinalizer(() => Effect.sync(signals.close));
|
|
83
84
|
yield* Effect.addFinalizer(controls.close);
|
|
84
85
|
function checkRoute(route: string) {
|
|
85
86
|
if (!Object.hasOwn(options.routes, route)) {
|
|
@@ -87,6 +88,7 @@ export const fakeHttpService = Effect.fnUntraced(function* (options: FakeHttpSer
|
|
|
87
88
|
}
|
|
88
89
|
}
|
|
89
90
|
return {
|
|
91
|
+
completed: signals.completed,
|
|
90
92
|
fault: (route: string, fault: FakeHttpFault, scope?: FakeHttpScope) =>
|
|
91
93
|
Effect.sync(() => checkRoute(route)).pipe(Effect.andThen(controls.fault(route, fault, scope))),
|
|
92
94
|
hold: (route: string, holdOptions?: FakeHttpHoldOptions) =>
|
|
@@ -94,6 +96,7 @@ export const fakeHttpService = Effect.fnUntraced(function* (options: FakeHttpSer
|
|
|
94
96
|
narrate: (sink: (line: string) => void) => {
|
|
95
97
|
narrate = sink;
|
|
96
98
|
},
|
|
99
|
+
received: signals.received,
|
|
97
100
|
releaseOnArrival: (route: string, arrival: string, scope?: FakeHttpScope) =>
|
|
98
101
|
Effect.sync(() => {
|
|
99
102
|
checkRoute(route);
|
|
@@ -105,7 +108,7 @@ export const fakeHttpService = Effect.fnUntraced(function* (options: FakeHttpSer
|
|
|
105
108
|
scriptFault: (route: string, fault: FakeHttpFault, scriptOptions?: FakeHttpScriptOptions) =>
|
|
106
109
|
Effect.sync(() => checkRoute(route)).pipe(Effect.andThen(controls.scriptFault(route, fault, scriptOptions))),
|
|
107
110
|
stall: (route: string, scope?: FakeHttpScope) => Effect.sync(() => checkRoute(route)).pipe(Effect.andThen(controls.stall(route, scope))),
|
|
108
|
-
untilAbandoned: (matches: (request: FakeHttpRequestRecord) => boolean, wait: UntilOptions) => until(abandoned
|
|
111
|
+
untilAbandoned: (matches: (request: FakeHttpRequestRecord) => boolean, wait: UntilOptions) => until(signals.abandoned, matches, wait),
|
|
109
112
|
url,
|
|
110
113
|
};
|
|
111
114
|
});
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import * as Clock from "effect/Clock";
|
|
2
|
+
import * as Effect from "effect/Effect";
|
|
3
|
+
import { visitHttp } from "#adapters/visitHttp.ts";
|
|
4
|
+
import { type ForwardingProxyOptions, forwardingProxy } from "#forwardingProxy.ts";
|
|
5
|
+
import { visitorCookies } from "#internal/visitorCookies.ts";
|
|
6
|
+
|
|
7
|
+
export interface HttpVisitorOptions {
|
|
8
|
+
readonly baseUrl?: string;
|
|
9
|
+
readonly edge?: ForwardingProxyOptions;
|
|
10
|
+
readonly headers?: HeadersInit;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
export type VisitorRequest = Omit<RequestInit, "credentials" | "redirect">;
|
|
14
|
+
|
|
15
|
+
export const httpVisitor = Effect.fnUntraced(function* (upstream: string, options: HttpVisitorOptions = {}) {
|
|
16
|
+
const edge = yield* forwardingProxy(upstream, options.edge);
|
|
17
|
+
const cookies = visitorCookies();
|
|
18
|
+
const baseUrl = options.baseUrl ?? upstream;
|
|
19
|
+
return {
|
|
20
|
+
request: Effect.fnUntraced(function* (path: string, init: VisitorRequest = {}) {
|
|
21
|
+
const url = new URL(path, baseUrl);
|
|
22
|
+
const headers = new Headers(options.headers);
|
|
23
|
+
new Headers(init.headers).forEach((value, name) => {
|
|
24
|
+
headers.set(name, value);
|
|
25
|
+
});
|
|
26
|
+
headers.set("x-forwarded-host", url.host);
|
|
27
|
+
headers.set("x-forwarded-proto", url.protocol.slice(0, -1));
|
|
28
|
+
const cookie = cookies.header(url, yield* Clock.currentTimeMillis);
|
|
29
|
+
if (cookie !== "") {
|
|
30
|
+
headers.set("cookie", cookie);
|
|
31
|
+
}
|
|
32
|
+
const response = yield* Effect.tryPromise((signal) => visitHttp(`${edge.url}${url.pathname}${url.search}`, { ...init, headers }, signal));
|
|
33
|
+
cookies.keep(response.headers.getSetCookie(), url, yield* Clock.currentTimeMillis);
|
|
34
|
+
return response;
|
|
35
|
+
}),
|
|
36
|
+
};
|
|
37
|
+
});
|
|
@@ -1,5 +1,8 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
1
|
+
import * as Effect from "effect/Effect";
|
|
2
|
+
import * as PubSub from "effect/PubSub";
|
|
3
|
+
import * as RpcClient from "effect/rpc/RpcClient";
|
|
4
|
+
import type * as RpcMessage from "effect/rpc/RpcMessage";
|
|
5
|
+
import * as Schema from "effect/Schema";
|
|
3
6
|
import { LiveHint } from "@shivaedev/contract/live.ts";
|
|
4
7
|
import type { BrowserRead, BrowserReadsOptions } from "#browserReads.ts";
|
|
5
8
|
import { browserSubscriptions } from "#internal/browserSubscriptions.ts";
|
|
@@ -32,6 +35,14 @@ export const browserReadObserver = Effect.fnUntraced(function* (contracts: Brows
|
|
|
32
35
|
observeProtocol: Effect.gen(function* () {
|
|
33
36
|
const underlying = yield* RpcClient.Protocol;
|
|
34
37
|
const listening = new Map<string, number>();
|
|
38
|
+
const closeClient = Effect.fnUntraced(function* (clientId: number) {
|
|
39
|
+
for (const [key, index] of listening) {
|
|
40
|
+
if (key.startsWith(`${clientId}:`)) {
|
|
41
|
+
yield* tracked.close(index);
|
|
42
|
+
listening.delete(key);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
});
|
|
35
46
|
function record(clientId: number, request: RpcMessage.RequestEncoded) {
|
|
36
47
|
if (subscriptionTags.has(request.tag)) {
|
|
37
48
|
listening.set(`${clientId}:${request.id}`, tracked.open(request.payload, request.tag));
|
|
@@ -41,6 +52,10 @@ export const browserReadObserver = Effect.fnUntraced(function* (contracts: Brows
|
|
|
41
52
|
}
|
|
42
53
|
}
|
|
43
54
|
const observeMessage = Effect.fnUntraced(function* (clientId: number, message: RpcMessage.FromServerEncoded) {
|
|
55
|
+
if (message._tag === "Defect" || message._tag === "ClientProtocolError") {
|
|
56
|
+
yield* closeClient(clientId);
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
44
59
|
const key = "requestId" in message ? `${clientId}:${message.requestId}` : undefined;
|
|
45
60
|
yield* receive(key === undefined ? undefined : listening.get(key), message);
|
|
46
61
|
if (message._tag === "Exit") {
|
|
@@ -50,7 +65,9 @@ export const browserReadObserver = Effect.fnUntraced(function* (contracts: Brows
|
|
|
50
65
|
const protocol: RpcClient.Protocol["Service"] = {
|
|
51
66
|
...underlying,
|
|
52
67
|
run: (clientId, deliver) =>
|
|
53
|
-
underlying
|
|
68
|
+
underlying
|
|
69
|
+
.run(clientId, (message) => observeMessage(clientId, message).pipe(Effect.andThen(() => deliver(message))))
|
|
70
|
+
.pipe(Effect.ensuring(closeClient(clientId))),
|
|
54
71
|
send: (clientId, request, transferables) =>
|
|
55
72
|
Effect.gen(function* () {
|
|
56
73
|
if (request._tag === "Request") {
|