@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
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
import * as Duration from "effect/Duration";
|
|
2
|
+
import * as Cookies from "effect/http/Cookies";
|
|
3
|
+
|
|
4
|
+
interface StoredCookie {
|
|
5
|
+
readonly cookie: Cookies.Cookie;
|
|
6
|
+
readonly domain: string;
|
|
7
|
+
readonly expires: number;
|
|
8
|
+
readonly hostOnly: boolean;
|
|
9
|
+
readonly path: string;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
function matchesDomain(host: string, domain: string, hostOnly: boolean) {
|
|
13
|
+
return host === domain || (!hostOnly && host.endsWith(`.${domain}`));
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
function scopeCookie(cookie: Cookies.Cookie, url: URL, now: number): StoredCookie | undefined {
|
|
17
|
+
const options = cookie.options;
|
|
18
|
+
const domain = options?.domain?.toLowerCase() ?? url.hostname;
|
|
19
|
+
const hostOnly = options?.domain === undefined;
|
|
20
|
+
if (!matchesDomain(url.hostname, domain, hostOnly) || (options?.secure && url.protocol !== "https:")) {
|
|
21
|
+
return undefined;
|
|
22
|
+
}
|
|
23
|
+
const defaultPath = url.pathname.slice(0, url.pathname.lastIndexOf("/")) || "/";
|
|
24
|
+
const path = options?.path?.startsWith("/") ? options.path : defaultPath;
|
|
25
|
+
const expires = options?.maxAge === undefined ? (options?.expires?.getTime() ?? Number.POSITIVE_INFINITY) : now + Duration.toMillis(options.maxAge);
|
|
26
|
+
return { cookie, domain, expires, hostOnly, path };
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export function visitorCookies() {
|
|
30
|
+
const stored = new Map<string, StoredCookie>();
|
|
31
|
+
return {
|
|
32
|
+
header(url: URL, now: number) {
|
|
33
|
+
return [...stored.values()]
|
|
34
|
+
.filter(
|
|
35
|
+
({ cookie, domain, expires, hostOnly, path }) =>
|
|
36
|
+
expires > now
|
|
37
|
+
&& matchesDomain(url.hostname, domain, hostOnly)
|
|
38
|
+
&& (!cookie.options?.secure || url.protocol === "https:")
|
|
39
|
+
&& (url.pathname === path || url.pathname.startsWith(path.endsWith("/") ? path : `${path}/`)),
|
|
40
|
+
)
|
|
41
|
+
.sort((left, right) => right.path.length - left.path.length)
|
|
42
|
+
.map(({ cookie }) => `${cookie.name}=${cookie.valueEncoded}`)
|
|
43
|
+
.join("; ");
|
|
44
|
+
},
|
|
45
|
+
keep(headers: readonly string[], url: URL, now: number) {
|
|
46
|
+
for (const header of headers) {
|
|
47
|
+
for (const cookie of Object.values(Cookies.fromSetCookie(header).cookies)) {
|
|
48
|
+
const scoped = scopeCookie(cookie, url, now);
|
|
49
|
+
if (scoped === undefined) {
|
|
50
|
+
continue;
|
|
51
|
+
}
|
|
52
|
+
const key = JSON.stringify([scoped.domain, scoped.path, cookie.name]);
|
|
53
|
+
if (scoped.expires <= now) {
|
|
54
|
+
stored.delete(key);
|
|
55
|
+
} else {
|
|
56
|
+
stored.set(key, scoped);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
},
|
|
61
|
+
};
|
|
62
|
+
}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
|
-
import
|
|
1
|
+
import * as Effect from "effect/Effect";
|
|
2
|
+
import * as Queue from "effect/Queue";
|
|
3
|
+
import * as Result from "effect/Result";
|
|
4
|
+
import * as Stream from "effect/Stream";
|
|
2
5
|
import { isClientIdle } from "@shivaedev/contract/clientActivity.ts";
|
|
6
|
+
import { screenAct } from "#adapters/screenAct.ts";
|
|
3
7
|
import { screenMutations } from "#adapters/screenMutations.ts";
|
|
4
8
|
import type { ScreenDriverOptions } from "#screenDriver.ts";
|
|
5
9
|
|
|
@@ -35,7 +39,7 @@ export const waitForScreen = Effect.fnUntraced(function* <A, E>({ act, pending,
|
|
|
35
39
|
const isBusy = yield* observePending(pending, changes);
|
|
36
40
|
do {
|
|
37
41
|
if (pending !== undefined) {
|
|
38
|
-
yield*
|
|
42
|
+
yield* screenAct(act, Effect.void);
|
|
39
43
|
}
|
|
40
44
|
if (!(yield* isBusy)) {
|
|
41
45
|
const result = yield* Effect.result(read);
|
|
@@ -43,6 +47,6 @@ export const waitForScreen = Effect.fnUntraced(function* <A, E>({ act, pending,
|
|
|
43
47
|
return result.success;
|
|
44
48
|
}
|
|
45
49
|
}
|
|
46
|
-
yield* pending === undefined ? Queue.take(changes) :
|
|
50
|
+
yield* pending === undefined ? Queue.take(changes) : screenAct(act, Queue.take(changes));
|
|
47
51
|
} while (true);
|
|
48
52
|
}, Effect.scoped);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createInterface } from "node:readline";
|
|
2
2
|
import type { Readable } from "node:stream";
|
|
3
|
-
import
|
|
3
|
+
import * as Effect from "effect/Effect";
|
|
4
4
|
import { recordedSignals } from "#internal/recordedSignals.ts";
|
|
5
5
|
import { type UntilOptions, until } from "#until.ts";
|
|
6
6
|
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import
|
|
2
|
-
import * as
|
|
3
|
-
import
|
|
1
|
+
import * as Effect from "effect/Effect";
|
|
2
|
+
import * as Option from "effect/Option";
|
|
3
|
+
import type * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
4
|
+
import type * as Scope from "effect/Scope";
|
|
4
5
|
import { domFetch } from "#domFetch.ts";
|
|
5
6
|
import { memberFetch } from "#internal/adapters/memberFetch.ts";
|
|
6
|
-
import { documentTransport } from "#internal/documentTransport.ts";
|
|
7
7
|
import { type DomCookie, seedCookies } from "#seedCookies.ts";
|
|
8
8
|
|
|
9
9
|
export interface MemberScreen {
|
|
@@ -21,6 +21,9 @@ export function memberScreens<E, R, TVerbs>(options: {
|
|
|
21
21
|
const members = new Map<string, MemberScreen>();
|
|
22
22
|
return {
|
|
23
23
|
open: Effect.fnUntraced(function* (name: string, cookies: readonly DomCookie[]) {
|
|
24
|
+
const [{ GlobalWindow }, registryModule, { documentTransport }] = yield* Effect.promise(() =>
|
|
25
|
+
Promise.all([import("happy-dom"), import("effect/reactivity/AtomRegistry"), import("#internal/documentTransport.ts")]),
|
|
26
|
+
);
|
|
24
27
|
const browser = yield* Effect.acquireRelease(
|
|
25
28
|
Effect.sync(() => new GlobalWindow({ url: options.baseUrl })),
|
|
26
29
|
(target) => Effect.promise(() => target.happyDOM.abort()).pipe(Effect.andThen(Effect.sync(() => target.close()))),
|
|
@@ -30,11 +33,12 @@ export function memberScreens<E, R, TVerbs>(options: {
|
|
|
30
33
|
const member = yield* Effect.acquireRelease(
|
|
31
34
|
Effect.sync(() => {
|
|
32
35
|
const root = document.createElement("div");
|
|
36
|
+
root.setAttribute("data-story-member", name);
|
|
33
37
|
document.body.append(root);
|
|
34
38
|
return {
|
|
35
39
|
fetch: domFetch(options.baseUrl, { fetch: memberFetch(browser), location: browser.location }),
|
|
36
40
|
name,
|
|
37
|
-
registry:
|
|
41
|
+
registry: registryModule.make(),
|
|
38
42
|
root,
|
|
39
43
|
};
|
|
40
44
|
}),
|
|
@@ -1,12 +1,14 @@
|
|
|
1
|
-
import { createServer, type IncomingHttpHeaders
|
|
2
|
-
import
|
|
3
|
-
import
|
|
1
|
+
import { createServer, type IncomingHttpHeaders } from "node:http";
|
|
2
|
+
import * as Effect from "effect/Effect";
|
|
3
|
+
import type { OtlpTracer } from "effect/observability";
|
|
4
|
+
import { receiveOtlp } from "#adapters/receiveOtlp.ts";
|
|
4
5
|
import { loopbackServer } from "#internal/loopback.ts";
|
|
5
|
-
import { otlpReadout } from "#internal/otlpReadout.ts";
|
|
6
|
+
import type { otlpReadout } from "#internal/otlpReadout.ts";
|
|
6
7
|
import { recordedSignals } from "#internal/recordedSignals.ts";
|
|
7
8
|
import { type UntilOptions, until } from "#until.ts";
|
|
8
9
|
|
|
9
10
|
export type OtlpSpan = ReturnType<typeof otlpReadout>[number];
|
|
11
|
+
export type OtlpTracerOptions = Omit<Parameters<typeof OtlpTracer.layer>[0], "url" | "compression">;
|
|
10
12
|
export interface OtlpExport {
|
|
11
13
|
readonly body: Buffer;
|
|
12
14
|
readonly headers: IncomingHttpHeaders;
|
|
@@ -19,54 +21,19 @@ export interface OtlpReceiverOptions {
|
|
|
19
21
|
readonly status?: number | ((attempt: number) => number | undefined);
|
|
20
22
|
}
|
|
21
23
|
|
|
22
|
-
async function receive(
|
|
23
|
-
request: IncomingMessage,
|
|
24
|
-
response: ServerResponse,
|
|
25
|
-
requests: OtlpExport[],
|
|
26
|
-
record: (span: OtlpSpan) => void,
|
|
27
|
-
options: OtlpReceiverOptions,
|
|
28
|
-
) {
|
|
29
|
-
try {
|
|
30
|
-
const chunks: Buffer[] = [];
|
|
31
|
-
for await (const chunk of request) {
|
|
32
|
-
chunks.push(Buffer.from(chunk));
|
|
33
|
-
}
|
|
34
|
-
const body = Buffer.concat(chunks);
|
|
35
|
-
requests.push({ body, headers: request.headers, path: request.url, rawHeaders: request.rawHeaders });
|
|
36
|
-
if (request.method !== "POST" || request.url !== (options.path ?? "/v1/traces")) {
|
|
37
|
-
response.writeHead(HttpStatus.fromLiteral("NotFound")).end();
|
|
38
|
-
return;
|
|
39
|
-
}
|
|
40
|
-
const contentType = request.headers["content-type"]?.split(";")[0]?.trim();
|
|
41
|
-
if (contentType !== "application/json" && contentType !== "application/x-protobuf") {
|
|
42
|
-
response.writeHead(HttpStatus.fromLiteral("UnsupportedMediaType")).end();
|
|
43
|
-
return;
|
|
44
|
-
}
|
|
45
|
-
for (const span of otlpReadout(body, contentType)) {
|
|
46
|
-
record(span);
|
|
47
|
-
}
|
|
48
|
-
const status = typeof options.status === "function" ? options.status(requests.length) : (options.status ?? HttpStatus.fromLiteral("OK"));
|
|
49
|
-
if (status === undefined) {
|
|
50
|
-
return;
|
|
51
|
-
}
|
|
52
|
-
response.writeHead(status);
|
|
53
|
-
if (options.answer === null) {
|
|
54
|
-
response.flushHeaders();
|
|
55
|
-
} else {
|
|
56
|
-
response.end(options.answer ?? "{}");
|
|
57
|
-
}
|
|
58
|
-
} catch {
|
|
59
|
-
response.writeHead(HttpStatus.fromLiteral("BadRequest")).end();
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
|
|
63
24
|
export const otlpReceiver = Effect.fnUntraced(function* (options: OtlpReceiverOptions = {}) {
|
|
64
25
|
const requests: OtlpExport[] = [];
|
|
65
26
|
const signals = recordedSignals<OtlpSpan>();
|
|
66
|
-
const server = createServer((request, response) =>
|
|
27
|
+
const server = createServer((request, response) => receiveOtlp(request, response, requests, signals.push, options));
|
|
67
28
|
const url = yield* loopbackServer(server);
|
|
29
|
+
const { otlpTracing } = yield* Effect.promise(() => import("#internal/otlpTracing.ts"));
|
|
30
|
+
const { errors, exportsSecret, queries } = yield* Effect.promise(() => import("#internal/otlpReadouts.ts"));
|
|
68
31
|
yield* Effect.addFinalizer(() => Effect.sync(() => signals.end()));
|
|
69
32
|
return {
|
|
33
|
+
...otlpTracing(`${url}${options.path ?? "/v1/traces"}`, signals.stream),
|
|
34
|
+
errors: () => errors(signals.values),
|
|
35
|
+
exportsSecret: (secret: string) => exportsSecret(requests, secret),
|
|
36
|
+
queries: () => queries(signals.values),
|
|
70
37
|
get requests(): readonly OtlpExport[] {
|
|
71
38
|
return requests;
|
|
72
39
|
},
|
package/src/server/outcomes.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import
|
|
1
|
+
import * as Effect from "effect/Effect";
|
|
2
|
+
import { installOutbound } from "#adapters/installOutbound.ts";
|
|
2
3
|
import { inDom } from "#internal/domDocument.ts";
|
|
3
|
-
import { installOutbound } from "#internal/installOutbound.ts";
|
|
4
4
|
|
|
5
5
|
export function routeOutbound(routes: Readonly<Record<string, string>>, options: { readonly passthrough?: boolean } = {}) {
|
|
6
6
|
return Effect.acquireRelease(
|
|
@@ -1,11 +1,15 @@
|
|
|
1
|
-
import
|
|
1
|
+
import * as Data from "effect/Data";
|
|
2
|
+
import * as Effect from "effect/Effect";
|
|
3
|
+
import type * as Stream from "effect/Stream";
|
|
2
4
|
import type { ClientActivity } from "@shivaedev/contract/clientActivity.ts";
|
|
3
5
|
import { withLive } from "@shivaedev/test/withLive.ts";
|
|
6
|
+
import { screenAct } from "#adapters/screenAct.ts";
|
|
4
7
|
import { screenElements } from "#adapters/screenElements.ts";
|
|
5
8
|
import { nextClientHint } from "#internal/nextClientHint.ts";
|
|
6
9
|
import { targetName } from "#internal/screenAccessibility.ts";
|
|
7
10
|
import { screenReadouts } from "#internal/screenReadouts.ts";
|
|
8
11
|
import { screenWaits } from "#internal/screenWaits.ts";
|
|
12
|
+
import type { SignalNotReceived } from "#until.ts";
|
|
9
13
|
|
|
10
14
|
export type ScreenTarget = string | { readonly role: string; readonly name: string | RegExp };
|
|
11
15
|
|
|
@@ -28,31 +32,44 @@ export class MissingClientActivity extends Data.TaggedError("MissingClientActivi
|
|
|
28
32
|
"Cannot wait for a live hint without client activity.\nhelp: Supply pending: clientActivity(client) from @shivaedev/contract/clientActivity.ts.";
|
|
29
33
|
}
|
|
30
34
|
|
|
31
|
-
export type ScreenDriver<E = never, THintError = MissingClientActivity> = Omit<
|
|
35
|
+
export type ScreenDriver<E = never, THintError = MissingClientActivity | SignalNotReceived> = Omit<
|
|
36
|
+
ReturnType<typeof makeScreenActions>,
|
|
37
|
+
"settle" | "nextLiveHint"
|
|
38
|
+
> & {
|
|
32
39
|
nextLiveHint: () => Effect.Effect<void, THintError>;
|
|
33
40
|
settle: (options?: { readonly timeoutMs?: number }) => Effect.Effect<void, E>;
|
|
41
|
+
dialog: (target: ScreenTarget) => ScreenDriver<E, THintError>;
|
|
34
42
|
within: (container: ScreenTarget | HTMLElement) => ScreenDriver<E, THintError>;
|
|
35
43
|
};
|
|
36
44
|
|
|
37
|
-
export function screenDriver(options: ScreenDriverOptions & { readonly pending: ClientActivity }): ScreenDriver<never,
|
|
45
|
+
export function screenDriver(options: ScreenDriverOptions & { readonly pending: ClientActivity }): ScreenDriver<never, SignalNotReceived>;
|
|
38
46
|
export function screenDriver(options: ScreenDriverOptions & { readonly pending: (() => boolean) | Stream.Stream<boolean> }): ScreenDriver;
|
|
39
47
|
export function screenDriver(options: ScreenDriverOptions): ScreenDriver<MissingScreenPending>;
|
|
40
48
|
export function screenDriver(options: ScreenDriverOptions): ScreenDriver<MissingScreenPending> {
|
|
41
49
|
return makeDriver(options, true);
|
|
42
50
|
}
|
|
43
51
|
|
|
44
|
-
function makeDriver(options: ScreenDriverOptions, dialogs: boolean): ScreenDriver<MissingScreenPending> {
|
|
52
|
+
function makeDriver(options: ScreenDriverOptions, dialogs: boolean, dialogOwner?: () => HTMLElement): ScreenDriver<MissingScreenPending> {
|
|
45
53
|
const suppliedRoot = options.root;
|
|
46
54
|
const root = typeof suppliedRoot === "function" ? suppliedRoot : () => suppliedRoot;
|
|
47
55
|
const elements = screenElements(root, dialogs);
|
|
56
|
+
const owner = dialogOwner ?? root;
|
|
57
|
+
const dialogElements = screenElements(owner);
|
|
48
58
|
return {
|
|
49
59
|
...makeScreenActions(options, dialogs),
|
|
60
|
+
dialog: (target) => {
|
|
61
|
+
function dialogRoot() {
|
|
62
|
+
return dialogElements.dialog(target);
|
|
63
|
+
}
|
|
64
|
+
dialogRoot();
|
|
65
|
+
return makeDriver({ ...options, root: dialogRoot }, false, owner);
|
|
66
|
+
},
|
|
50
67
|
within: (container) => {
|
|
51
68
|
function scopedRoot() {
|
|
52
69
|
return container instanceof HTMLElement ? elements.rendered(container, container.tagName.toLowerCase()) : elements.element(container);
|
|
53
70
|
}
|
|
54
71
|
scopedRoot();
|
|
55
|
-
return makeDriver({ ...options, root: scopedRoot }, false);
|
|
72
|
+
return makeDriver({ ...options, root: scopedRoot }, false, owner);
|
|
56
73
|
},
|
|
57
74
|
};
|
|
58
75
|
}
|
|
@@ -86,11 +103,7 @@ function makeScreenActions(
|
|
|
86
103
|
if (pending === undefined || typeof pending === "function" || !("current" in pending)) {
|
|
87
104
|
return Effect.fail(new MissingClientActivity());
|
|
88
105
|
}
|
|
89
|
-
return withLive(
|
|
90
|
-
Effect.sync(() => tell("wait for the next live hint")).pipe(
|
|
91
|
-
Effect.andThen(Effect.promise((signal) => act(() => Effect.runPromise(nextClientHint(pending), { signal })))),
|
|
92
|
-
),
|
|
93
|
-
);
|
|
106
|
+
return withLive(Effect.sync(() => tell("wait for the next live hint")).pipe(Effect.andThen(screenAct(act, nextClientHint(pending)))));
|
|
94
107
|
},
|
|
95
108
|
select: (selector: ScreenTarget, value: string) =>
|
|
96
109
|
perform(`select ${JSON.stringify(value)} in ${targetName(selector)}`, () => elements.select(selector, value)),
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { BrowserWindow
|
|
3
|
-
import WindowBrowserContext from "happy-dom/lib/window/WindowBrowserContext.js";
|
|
1
|
+
import * as Effect from "effect/Effect";
|
|
2
|
+
import type { BrowserWindow as DomWindow } from "happy-dom";
|
|
4
3
|
|
|
5
4
|
export interface DomCookie {
|
|
6
5
|
readonly domain?: string;
|
|
@@ -13,9 +12,10 @@ export interface DomCookie {
|
|
|
13
12
|
readonly value: string;
|
|
14
13
|
}
|
|
15
14
|
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
|
|
15
|
+
export const seedCookies = Effect.fnUntraced(function* (cookies: readonly DomCookie[], target: Window | DomWindow = window) {
|
|
16
|
+
const { BrowserWindow, CookieSameSiteEnum } = yield* Effect.promise(() => import("happy-dom"));
|
|
17
|
+
const { default: WindowBrowserContext } = yield* Effect.promise(() => import("happy-dom/lib/window/WindowBrowserContext.js"));
|
|
18
|
+
const sameSites = { Lax: CookieSameSiteEnum.lax, None: CookieSameSiteEnum.none, Strict: CookieSameSiteEnum.strict };
|
|
19
19
|
if (!(target instanceof BrowserWindow)) {
|
|
20
20
|
return yield* Effect.die("Cookie preconditions need a happy-dom window.\nhelp: Use test-story's DOM environment before seeding cookies.");
|
|
21
21
|
}
|
package/src/server/until.ts
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
import
|
|
1
|
+
import * as Data from "effect/Data";
|
|
2
|
+
import type * as Duration from "effect/Duration";
|
|
3
|
+
import * as Effect from "effect/Effect";
|
|
4
|
+
import * as Option from "effect/Option";
|
|
5
|
+
import * as Stream from "effect/Stream";
|
|
2
6
|
import { withLive } from "@shivaedev/test/withLive.ts";
|
|
3
7
|
import { describeValue } from "#internal/render.ts";
|
|
4
8
|
|
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
import
|
|
1
|
+
import * as Clock from "effect/Clock";
|
|
2
|
+
import * as Duration from "effect/Duration";
|
|
3
|
+
import * as Effect from "effect/Effect";
|
|
4
|
+
import * as Queue from "effect/Queue";
|
|
5
|
+
import * as Stream from "effect/Stream";
|
|
2
6
|
import * as TestClock from "effect/testing/TestClock";
|
|
3
7
|
import { type UntilOptions, until } from "#until.ts";
|
|
4
8
|
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"installOutbound.d.ts","sourceRoot":"","sources":["../../../src/server/internal/installOutbound.ts"],"names":[],"mappings":"AAeA,wBAAsB,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,UAAO,uBAgD5F"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"installOutbound.js","sourceRoot":"","sources":["../../../src/server/internal/installOutbound.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|