@graftland/plugin-remote 0.3.2 → 0.4.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/README.md +18 -54
- package/README.zh-CN.md +17 -51
- package/README.zh-TW.md +17 -51
- package/dist/Auth.d.ts.map +1 -1
- package/dist/Auth.js.map +1 -1
- package/dist/Config.d.ts +1151 -0
- package/dist/Config.d.ts.map +1 -0
- package/dist/Config.js +183 -0
- package/dist/Config.js.map +1 -0
- package/dist/Contract.d.ts +1 -1
- package/dist/Contract.d.ts.map +1 -1
- package/dist/Contract.js +32 -1
- package/dist/Contract.js.map +1 -1
- package/dist/Instance.d.ts.map +1 -1
- package/dist/Instance.js.map +1 -1
- package/dist/Testing.d.ts +1 -1
- package/dist/Testing.d.ts.map +1 -1
- package/dist/Testing.js.map +1 -1
- package/dist/Transport.d.ts +1 -1
- package/dist/Transport.d.ts.map +1 -1
- package/dist/Transport.js.map +1 -1
- package/dist/cli.d.ts +4 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +25 -0
- package/dist/cli.js.map +1 -0
- package/dist/host/auth/bearer.d.ts +9 -1
- package/dist/host/auth/bearer.d.ts.map +1 -1
- package/dist/host/auth/bearer.js +4 -2
- package/dist/host/auth/bearer.js.map +1 -1
- package/dist/host/auth/jwt.d.ts +9 -1
- package/dist/host/auth/jwt.d.ts.map +1 -1
- package/dist/host/auth/jwt.js +4 -2
- package/dist/host/auth/jwt.js.map +1 -1
- package/dist/host/auth/mtls.d.ts +10 -7
- package/dist/host/auth/mtls.d.ts.map +1 -1
- package/dist/host/auth/mtls.js +13 -14
- package/dist/host/auth/mtls.js.map +1 -1
- package/dist/host/auth/none.d.ts +3 -1
- package/dist/host/auth/none.js +7 -5
- package/dist/host/auth/none.js.map +1 -1
- package/dist/host/command.d.ts +14 -1
- package/dist/host/command.d.ts.map +1 -1
- package/dist/host/command.js +11 -9
- package/dist/host/command.js.map +1 -1
- package/dist/host/local.d.ts +2 -1
- package/dist/host/local.d.ts.map +1 -1
- package/dist/host/local.js +9 -30
- package/dist/host/local.js.map +1 -1
- package/dist/host/unix.d.ts +6 -1
- package/dist/host/unix.d.ts.map +1 -1
- package/dist/host/unix.js +13 -9
- package/dist/host/unix.js.map +1 -1
- package/dist/host/websocket.d.ts +10 -1
- package/dist/host/websocket.d.ts.map +1 -1
- package/dist/host/websocket.js +11 -8
- package/dist/host/websocket.js.map +1 -1
- package/dist/host/worker.d.ts +3 -1
- package/dist/host/worker.d.ts.map +1 -1
- package/dist/host/worker.js +13 -9
- package/dist/host/worker.js.map +1 -1
- package/dist/index.d.ts +6 -8
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +30 -64
- package/dist/index.js.map +1 -1
- package/dist/internal/Certificates.js.map +1 -1
- package/dist/internal/FailureGroup.js +6 -6
- package/dist/internal/FailureGroup.js.map +1 -1
- package/dist/internal/Peer.js.map +1 -1
- package/dist/internal/{ServeLifecycle.js → RunnerLifecycle.js} +6 -6
- package/dist/internal/RunnerLifecycle.js.map +1 -0
- package/dist/internal/Supervisor.js.map +1 -1
- package/dist/internal/assembly.d.ts +3 -2
- package/dist/internal/assembly.js +8 -8
- package/dist/internal/assembly.js.map +1 -1
- package/dist/internal/auth/config.d.ts +27 -0
- package/dist/internal/auth/config.d.ts.map +1 -0
- package/dist/internal/auth/config.js +29 -0
- package/dist/internal/auth/config.js.map +1 -0
- package/dist/internal/auth/mtls.js.map +1 -1
- package/dist/internal/auth/token.js.map +1 -1
- package/dist/internal/auth/tokenCredentials.d.ts +2 -1
- package/dist/internal/auth/tokenCredentials.d.ts.map +1 -1
- package/dist/internal/auth/tokenCredentials.js +1 -1
- package/dist/internal/auth/tokenCredentials.js.map +1 -1
- package/dist/internal/child.js +3 -3
- package/dist/internal/child.js.map +1 -1
- package/dist/internal/childMain.js +47 -0
- package/dist/internal/childMain.js.map +1 -0
- package/dist/internal/childRuntime.js +8 -8
- package/dist/internal/childRuntime.js.map +1 -1
- package/dist/internal/cleanup.js +3 -3
- package/dist/internal/cleanup.js.map +1 -1
- package/dist/internal/contract.js.map +1 -1
- package/dist/internal/credentials.d.ts +3 -2
- package/dist/internal/credentials.d.ts.map +1 -1
- package/dist/internal/credentials.js +1 -1
- package/dist/internal/credentials.js.map +1 -1
- package/dist/internal/directTransport.js.map +1 -1
- package/dist/internal/entry.d.ts +493 -3
- package/dist/internal/entry.d.ts.map +1 -1
- package/dist/internal/entry.js +22 -9
- package/dist/internal/entry.js.map +1 -1
- package/dist/internal/entryConfig.d.ts +2 -202
- package/dist/internal/entryConfig.js +2 -136
- package/dist/internal/entryConfig.js.map +1 -1
- package/dist/internal/execution.d.ts +4 -4
- package/dist/internal/execution.js +11 -11
- package/dist/internal/execution.js.map +1 -1
- package/dist/internal/follow.js +1 -1
- package/dist/internal/follow.js.map +1 -1
- package/dist/internal/forkTree.js.map +1 -1
- package/dist/internal/host/local.js.map +1 -1
- package/dist/internal/host/runner.js +4 -4
- package/dist/internal/host/runner.js.map +1 -1
- package/dist/internal/host.js +2 -2
- package/dist/internal/host.js.map +1 -1
- package/dist/internal/importer.js +1 -1
- package/dist/internal/importer.js.map +1 -1
- package/dist/internal/listenerStartup.js +1 -1
- package/dist/internal/listenerStartup.js.map +1 -1
- package/dist/internal/loadModule.js.map +1 -1
- package/dist/internal/platform.js +1 -9
- package/dist/internal/port.d.ts +1 -1
- package/dist/internal/port.js +2 -2
- package/dist/internal/port.js.map +1 -1
- package/dist/internal/runner/Bootstrap.js.map +1 -1
- package/dist/internal/runner/Connection.d.ts +3 -2
- package/dist/internal/runner/Connection.js +6 -6
- package/dist/internal/runner/Connection.js.map +1 -1
- package/dist/internal/runner/Execution.js +6 -6
- package/dist/internal/runner/Execution.js.map +1 -1
- package/dist/internal/runner/Local.js +1 -1
- package/dist/internal/runner/Local.js.map +1 -1
- package/dist/internal/runner/Lock.js.map +1 -1
- package/dist/internal/runner/Multiplex.js.map +1 -1
- package/dist/internal/runner/Packages.js.map +1 -1
- package/dist/internal/runner/ProcessObservation.js.map +1 -1
- package/dist/internal/runner/Processes.js.map +1 -1
- package/dist/internal/runner/Retention.js.map +1 -1
- package/dist/internal/runner/Store.js.map +1 -1
- package/dist/internal/runner/Supervisor.js +5 -5
- package/dist/internal/runner/Supervisor.js.map +1 -1
- package/dist/internal/runner/Watchdog.js.map +1 -1
- package/dist/internal/runner/Wire.d.ts +1 -1
- package/dist/internal/runner/Wire.js.map +1 -1
- package/dist/internal/runner/accept.js +2 -2
- package/dist/internal/runner/accept.js.map +1 -1
- package/dist/internal/runner/command.js +1 -1
- package/dist/internal/runner/command.js.map +1 -1
- package/dist/internal/runner/connectionEnded.js +1 -1
- package/dist/internal/runner/connectionEnded.js.map +1 -1
- package/dist/internal/runner/model.d.ts.map +1 -1
- package/dist/internal/runner/model.js.map +1 -1
- package/dist/internal/services.d.ts.map +1 -1
- package/dist/internal/services.js +1 -1
- package/dist/internal/services.js.map +1 -1
- package/dist/internal/socketChannel.js.map +1 -1
- package/dist/internal/stdioChannel.js.map +1 -1
- package/dist/internal/supervisorPlugin.js +48 -1
- package/dist/internal/supervisorPlugin.js.map +1 -1
- package/dist/internal/transportOptions.d.ts.map +1 -1
- package/dist/internal/watchdogMain.js +5 -3
- package/dist/internal/watchdogMain.js.map +1 -1
- package/dist/internal/websocket.js.map +1 -1
- package/dist/internal/websocketServer.js +1 -1
- package/dist/internal/websocketServer.js.map +1 -1
- package/dist/internal/workerChannel.js.map +1 -1
- package/dist/internal/workerMain.js +13 -6
- package/dist/internal/workerMain.js.map +1 -1
- package/dist/runner/auth/bearer.d.ts +8 -5
- package/dist/runner/auth/bearer.d.ts.map +1 -1
- package/dist/runner/auth/bearer.js +13 -11
- package/dist/runner/auth/bearer.js.map +1 -1
- package/dist/runner/auth/jwt.d.ts +30 -17
- package/dist/runner/auth/jwt.d.ts.map +1 -1
- package/dist/runner/auth/jwt.js +16 -28
- package/dist/runner/auth/jwt.js.map +1 -1
- package/dist/runner/auth/mtls.d.ts +8 -6
- package/dist/runner/auth/mtls.d.ts.map +1 -1
- package/dist/runner/auth/mtls.js +13 -29
- package/dist/runner/auth/mtls.js.map +1 -1
- package/dist/runner/auth/none.d.ts +7 -1
- package/dist/runner/auth/none.js +7 -5
- package/dist/runner/auth/none.js.map +1 -1
- package/dist/runner/index.d.ts +5 -1
- package/dist/runner/index.d.ts.map +1 -1
- package/dist/runner/index.js +62 -30
- package/dist/runner/index.js.map +1 -1
- package/dist/runner/stdio.d.ts +6 -1
- package/dist/runner/stdio.d.ts.map +1 -1
- package/dist/runner/stdio.js +11 -9
- package/dist/runner/stdio.js.map +1 -1
- package/dist/runner/unix.d.ts +6 -1
- package/dist/runner/unix.d.ts.map +1 -1
- package/dist/runner/unix.js +10 -8
- package/dist/runner/unix.js.map +1 -1
- package/dist/runner/websocket.d.ts +24 -1
- package/dist/runner/websocket.d.ts.map +1 -1
- package/dist/runner/websocket.js +12 -10
- package/dist/runner/websocket.js.map +1 -1
- package/package.json +14 -12
- package/schema.json +2269 -0
- package/src/Auth.ts +8 -2
- package/src/Config.ts +196 -0
- package/src/Contract.ts +12 -3
- package/src/Instance.ts +1 -0
- package/src/Testing.ts +6 -4
- package/src/Transport.ts +12 -3
- package/src/cli.ts +60 -0
- package/src/host/auth/bearer.ts +1 -0
- package/src/host/auth/jwt.ts +1 -0
- package/src/host/auth/mtls.ts +7 -12
- package/src/host/auth/none.ts +3 -1
- package/src/host/command.ts +8 -5
- package/src/host/local.ts +4 -2
- package/src/host/unix.ts +11 -7
- package/src/host/websocket.ts +10 -7
- package/src/host/worker.ts +8 -5
- package/src/index.ts +36 -23
- package/src/internal/Certificates.ts +1 -0
- package/src/internal/FailureGroup.ts +5 -3
- package/src/internal/Peer.ts +1 -0
- package/src/internal/{ServeLifecycle.ts → RunnerLifecycle.ts} +7 -5
- package/src/internal/Supervisor.ts +5 -4
- package/src/internal/assembly.ts +11 -9
- package/src/internal/auth/config.ts +44 -0
- package/src/internal/auth/mtls.ts +1 -0
- package/src/internal/auth/token.ts +1 -0
- package/src/internal/auth/tokenCredentials.ts +4 -2
- package/src/internal/child.ts +8 -6
- package/src/{bin.ts → internal/childMain.ts} +16 -61
- package/src/internal/childRuntime.ts +12 -10
- package/src/internal/cleanup.ts +3 -2
- package/src/internal/contract.ts +1 -0
- package/src/internal/credentials.ts +3 -1
- package/src/internal/directTransport.ts +9 -2
- package/src/internal/entry.ts +53 -16
- package/src/internal/entryConfig.ts +10 -132
- package/src/internal/execution.ts +17 -15
- package/src/internal/follow.ts +2 -1
- package/src/internal/forkTree.ts +2 -1
- package/src/internal/host/local.ts +1 -0
- package/src/internal/host/runner.ts +7 -5
- package/src/internal/host.ts +9 -8
- package/src/internal/importer.ts +3 -2
- package/src/internal/listenerStartup.ts +4 -2
- package/src/internal/loadModule.ts +1 -0
- package/src/internal/platform.ts +1 -12
- package/src/internal/port.ts +11 -6
- package/src/internal/runner/Bootstrap.ts +1 -0
- package/src/internal/runner/Connection.ts +13 -11
- package/src/internal/runner/Execution.ts +14 -13
- package/src/internal/runner/Local.ts +3 -2
- package/src/internal/runner/Lock.ts +1 -0
- package/src/internal/runner/Multiplex.ts +2 -1
- package/src/internal/runner/Packages.ts +7 -5
- package/src/internal/runner/ProcessObservation.ts +2 -1
- package/src/internal/runner/Processes.ts +3 -1
- package/src/internal/runner/Retention.ts +1 -0
- package/src/internal/runner/Store.ts +3 -2
- package/src/internal/runner/Supervisor.ts +22 -20
- package/src/internal/runner/Watchdog.ts +3 -1
- package/src/internal/runner/Wire.ts +13 -12
- package/src/internal/runner/accept.ts +6 -5
- package/src/internal/runner/command.ts +3 -2
- package/src/internal/runner/connectionEnded.ts +2 -1
- package/src/internal/runner/model.ts +5 -3
- package/src/internal/services.ts +9 -2
- package/src/internal/socketChannel.ts +2 -1
- package/src/internal/stdioChannel.ts +4 -2
- package/src/internal/supervisorPlugin.ts +10 -8
- package/src/internal/transportOptions.ts +1 -0
- package/src/internal/watchdogMain.ts +5 -3
- package/src/internal/websocket.ts +5 -2
- package/src/internal/websocketServer.ts +6 -4
- package/src/internal/workerChannel.ts +1 -0
- package/src/internal/workerMain.ts +21 -5
- package/src/runner/auth/bearer.ts +10 -6
- package/src/runner/auth/jwt.ts +10 -41
- package/src/runner/auth/mtls.ts +6 -3
- package/src/runner/auth/none.ts +3 -1
- package/src/runner/index.ts +102 -11
- package/src/runner/stdio.ts +15 -10
- package/src/runner/unix.ts +7 -4
- package/src/runner/websocket.ts +9 -7
- package/dist/Auth-BElTC9_X.js +0 -6
- package/dist/Bootstrap-H9gDsgsC.js +0 -9
- package/dist/ConfigDirectory-BCC6q2R4.js +0 -5
- package/dist/Contract-DsJtisvL.js +0 -83
- package/dist/Errors-DYhsGZcZ.js +0 -58
- package/dist/FailureGroup-BgT73AaR.js +0 -63
- package/dist/Framing-G9eSaeLb.js +0 -61
- package/dist/Graft-B71CPA2Y.js +0 -996
- package/dist/Packages-AgoCGotL.js +0 -108
- package/dist/Peer-DXeVrGBh.js +0 -342
- package/dist/ProcessObservation-gLgGirYv.js +0 -38
- package/dist/ServeLifecycle-Bd1FPJ6e.js +0 -24
- package/dist/Transport-DULzpsgR.js +0 -6
- package/dist/WatchdogProtocol-BZmVxrBP.js +0 -17
- package/dist/bin.js +0 -28276
- package/dist/bin.js.map +0 -1
- package/dist/childRuntime-Bm3iSg_N.js +0 -192
- package/dist/command-9zrHdbwT.js +0 -7
- package/dist/connectionEnded-BwcxQ7W8.js +0 -54
- package/dist/directTransport-DrexuPSm.js +0 -5
- package/dist/entry-psOpX3Bj.js +0 -736
- package/dist/importer-Cvf88eAY.js +0 -344
- package/dist/internal/ServeLifecycle.js.map +0 -1
- package/dist/internal/entryConfig.d.ts.map +0 -1
- package/dist/internal/platform.js.map +0 -1
- package/dist/internal/release.js +0 -25
- package/dist/internal/release.js.map +0 -1
- package/dist/internal/serve.js +0 -60
- package/dist/internal/serve.js.map +0 -1
- package/dist/port--3x2zJ4D.js +0 -285
- package/dist/release-DfZPuIcK.js +0 -23
- package/dist/rolldown-runtime-DYf_mQCB.js +0 -34
- package/dist/socketChannel-CJvL2DiB.js +0 -3658
- package/dist/supervisorPlugin-t6Z6PrhD.js +0 -733
- package/dist/token-CYBNNlhS.js +0 -17
- package/dist/tokenCredentials-CbCuk-Rt.js +0 -31
- package/dist/websocketServer-NQhODlEt.js +0 -60
- package/dist/workerChannel-C8hhBJzA.js +0 -27
- package/src/internal/release.ts +0 -72
- package/src/internal/serve.ts +0 -119
- /package/dist/{bin.d.ts → internal/childMain.d.ts} +0 -0
package/dist/runner/auth/jwt.js
CHANGED
|
@@ -1,28 +1,14 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import { Cause, Duration, Effect, FileSystem, Layer, Option, Path, Schema } from "effect";
|
|
1
|
+
import { Authenticator } from "../../Auth.js";
|
|
2
|
+
import { AuthenticationFailed, AuthenticatorUnavailable } from "../../Errors.js";
|
|
3
|
+
import { ClockTolerance, Jwt } from "../../internal/auth/config.js";
|
|
4
|
+
import { read } from "../../internal/auth/token.js";
|
|
5
|
+
import { Cause, Effect, FileSystem, Layer, Option, Path, Schema } from "effect";
|
|
7
6
|
import { Signature } from "effect/crypto";
|
|
7
|
+
import { Graft, Plugin } from "@graftland/graft";
|
|
8
|
+
import { ConfigDirectory } from "@graftland/loader";
|
|
9
|
+
import { Jwk, Jwks, Jwt as Jwt$1 } from "effect/jose";
|
|
8
10
|
import { HttpClient } from "effect/http";
|
|
9
|
-
|
|
10
|
-
// packages/remote/src/runner/auth/jwt.ts
|
|
11
|
-
const ClockTolerance = Schema.DurationFromString.check(Schema.makeFilter((duration) => Duration.isFinite(duration) && Duration.toMillis(duration) >= 0, { expected: "a finite, non-negative duration" }));
|
|
12
|
-
const Config = Schema.Struct({
|
|
13
|
-
issuer: Schema.NonEmptyString,
|
|
14
|
-
audience: Schema.NonEmptyArray(Schema.NonEmptyString),
|
|
15
|
-
algorithms: Schema.NonEmptyArray(Jwk.AsymmetricAlgorithm),
|
|
16
|
-
identityClaim: Schema.NonEmptyString.pipe(Schema.withDecodingDefaultKey(Effect.succeed("sub"))),
|
|
17
|
-
clockTolerance: ClockTolerance.pipe(Schema.withDecodingDefaultKey(Effect.succeed("5 seconds"))),
|
|
18
|
-
keys: Schema.Union([Schema.Struct({
|
|
19
|
-
jwksUrl: Schema.String,
|
|
20
|
-
publicKey: Schema.optionalKey(Schema.Never)
|
|
21
|
-
}), Schema.Struct({
|
|
22
|
-
publicKey: Schema.String,
|
|
23
|
-
jwksUrl: Schema.optionalKey(Schema.Never)
|
|
24
|
-
})])
|
|
25
|
-
});
|
|
11
|
+
// src/runner/auth/jwt.ts
|
|
26
12
|
const keys = Effect.fnUntraced(function* (config) {
|
|
27
13
|
if (config.keys.jwksUrl !== void 0) return Jwks.layerRemote({ url: config.keys.jwksUrl });
|
|
28
14
|
const fs = yield* FileSystem.FileSystem;
|
|
@@ -32,9 +18,9 @@ const keys = Effect.fnUntraced(function* (config) {
|
|
|
32
18
|
const keys = yield* Effect.forEach(config.algorithms, (algorithm) => Jwk.importSpki(pem, algorithm).pipe(Effect.flatMap(Jwk.exportPublic)));
|
|
33
19
|
return Jwks.layerLocal({ keys });
|
|
34
20
|
});
|
|
35
|
-
var jwt_default = make({
|
|
21
|
+
var jwt_default = Plugin.make({
|
|
36
22
|
name: "remote-jwt-authenticator",
|
|
37
|
-
config:
|
|
23
|
+
config: Jwt,
|
|
38
24
|
inject: [
|
|
39
25
|
FileSystem.FileSystem,
|
|
40
26
|
Path.Path,
|
|
@@ -45,10 +31,10 @@ var jwt_default = make({
|
|
|
45
31
|
const keySet = yield* keys(config);
|
|
46
32
|
const services = yield* Layer.build(keySet);
|
|
47
33
|
const signature = yield* Signature.Signature;
|
|
48
|
-
yield* provide(Authenticator, {
|
|
34
|
+
yield* Graft.provide(Authenticator, {
|
|
49
35
|
_tag: "Header",
|
|
50
36
|
issuer: config.issuer,
|
|
51
|
-
authenticate: (authorization) => read(authorization).pipe(Effect.flatMap((token) => Jwt.verifyWithKeySet(Schema.Record(Schema.String, Schema.Unknown), token, {
|
|
37
|
+
authenticate: (authorization) => read(authorization).pipe(Effect.flatMap((token) => Jwt$1.verifyWithKeySet(Schema.Record(Schema.String, Schema.Unknown), token, {
|
|
52
38
|
issuer: config.issuer,
|
|
53
39
|
audience: config.audience,
|
|
54
40
|
algorithms: config.algorithms,
|
|
@@ -62,4 +48,6 @@ var jwt_default = make({
|
|
|
62
48
|
});
|
|
63
49
|
})
|
|
64
50
|
});
|
|
65
|
-
export { ClockTolerance, Config, jwt_default as default };
|
|
51
|
+
export { ClockTolerance, Jwt as Config, jwt_default as default };
|
|
52
|
+
|
|
53
|
+
//# sourceMappingURL=jwt.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.js","names":["Token.read"],"sources":["../../../src/runner/auth/jwt.ts"],"sourcesContent":["import { Option } from \"effect\"\nimport {
|
|
1
|
+
{"version":3,"file":"jwt.js","names":["Config","Token.read","Jwt"],"sources":["../../../src/runner/auth/jwt.ts"],"sourcesContent":["import { Cause, Effect, FileSystem, Layer, Option, Path, Schema } from \"effect\"\nimport { Signature } from \"effect/crypto\"\nimport { HttpClient } from \"effect/http\"\nimport { Jwk, Jwks, Jwt } from \"effect/jose\"\n\nimport { Graft, Plugin } from \"@graftland/graft\"\nimport { ConfigDirectory } from \"@graftland/loader\"\n\nimport { Authenticator } from \"../../Auth\"\nimport { AuthenticationFailed, AuthenticatorUnavailable } from \"../../Errors\"\nimport { Jwt as Config } from \"../../internal/auth/config\"\nimport * as Token from \"../../internal/auth/token\"\n\nexport { ClockTolerance } from \"../../internal/auth/config\"\n\nexport { Config }\nconst keys = Effect.fnUntraced(function* (config: typeof Config.Type) {\n\tif (config.keys.jwksUrl !== undefined)\n\t\treturn Jwks.layerRemote({ url: config.keys.jwksUrl })\n\tconst fs = yield* FileSystem.FileSystem\n\tconst path = yield* Path.Path\n\tconst directory = yield* ConfigDirectory.pipe(\n\t\tEffect.map(Option.getOrElse(() => \".\")),\n\t)\n\tconst pem = yield* fs.readFileString(\n\t\tpath.resolve(directory, config.keys.publicKey),\n\t)\n\t// A single PEM must support the allowed algorithms; use JWKS for multiple key types.\n\tconst keys = yield* Effect.forEach(config.algorithms, (algorithm) =>\n\t\tJwk.importSpki(pem, algorithm).pipe(Effect.flatMap(Jwk.exportPublic)),\n\t)\n\treturn Jwks.layerLocal({ keys })\n})\nexport default Plugin.make({\n\tname: \"remote-jwt-authenticator\",\n\tconfig: Config,\n\tinject: [\n\t\tFileSystem.FileSystem,\n\t\tPath.Path,\n\t\tSignature.Signature,\n\t\tHttpClient.HttpClient,\n\t],\n\tapply: Effect.fnUntraced(function* (config) {\n\t\tconst keySet = yield* keys(config)\n\t\tconst services = yield* Layer.build(keySet)\n\t\tconst signature = yield* Signature.Signature\n\t\tyield* Graft.provide(Authenticator, {\n\t\t\t_tag: \"Header\",\n\t\t\tissuer: config.issuer,\n\t\t\tauthenticate: (authorization) =>\n\t\t\t\tToken.read(authorization).pipe(\n\t\t\t\t\tEffect.flatMap((token) =>\n\t\t\t\t\t\tJwt.verifyWithKeySet(\n\t\t\t\t\t\t\tSchema.Record(Schema.String, Schema.Unknown),\n\t\t\t\t\t\t\ttoken,\n\t\t\t\t\t\t\t{\n\t\t\t\t\t\t\t\tissuer: config.issuer,\n\t\t\t\t\t\t\t\taudience: config.audience,\n\t\t\t\t\t\t\t\talgorithms: config.algorithms,\n\t\t\t\t\t\t\t\tclockTolerance: config.clockTolerance,\n\t\t\t\t\t\t\t\trequiredClaims: [\"exp\"],\n\t\t\t\t\t\t\t},\n\t\t\t\t\t\t).pipe(\n\t\t\t\t\t\t\tEffect.flatMap((verified) =>\n\t\t\t\t\t\t\t\tSchema.decodeUnknownEffect(Schema.NonEmptyString)(\n\t\t\t\t\t\t\t\t\tverified.claims[config.identityClaim],\n\t\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\t// An unreachable key set says nothing about the token; the client must not discard it.\n\t\t\t\t\t\t\tEffect.mapError((error) =>\n\t\t\t\t\t\t\t\terror._tag === \"JoseError\" &&\n\t\t\t\t\t\t\t\terror.reason._tag === \"KeySetUnavailable\"\n\t\t\t\t\t\t\t\t\t? AuthenticatorUnavailable.make({ cause: Cause.fail(error) })\n\t\t\t\t\t\t\t\t\t: AuthenticationFailed.make({\n\t\t\t\t\t\t\t\t\t\t\treason: \"invalid\",\n\t\t\t\t\t\t\t\t\t\t\tchallenge: 'Bearer error=\"invalid_token\"',\n\t\t\t\t\t\t\t\t\t\t\tcause: Cause.fail(error),\n\t\t\t\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\tEffect.provideService(Signature.Signature, signature),\n\t\t\t\t\t\t\tEffect.provideContext(services),\n\t\t\t\t\t\t),\n\t\t\t\t\t),\n\t\t\t\t),\n\t\t})\n\t}),\n})\n"],"mappings":";;;;;;;;;;;AAgBA,MAAM,OAAO,OAAO,WAAW,WAAW,QAA4B;CACrE,IAAI,OAAO,KAAK,YAAY,KAAA,GAC3B,OAAO,KAAK,YAAY,EAAE,KAAK,OAAO,KAAK,QAAQ,CAAC;CACrD,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,YAAY,OAAO,gBAAgB,KACxC,OAAO,IAAI,OAAO,gBAAgB,GAAG,CAAC,CACvC;CACA,MAAM,MAAM,OAAO,GAAG,eACrB,KAAK,QAAQ,WAAW,OAAO,KAAK,SAAS,CAC9C;CAEA,MAAM,OAAO,OAAO,OAAO,QAAQ,OAAO,aAAa,cACtD,IAAI,WAAW,KAAK,SAAS,CAAC,CAAC,KAAK,OAAO,QAAQ,IAAI,YAAY,CAAC,CACrE;CACA,OAAO,KAAK,WAAW,EAAE,KAAK,CAAC;AAChC,CAAC;AACD,IAAA,cAAe,OAAO,KAAK;CAC1B,MAAM;CACN,QAAQA;CACR,QAAQ;EACP,WAAW;EACX,KAAK;EACL,UAAU;EACV,WAAW;CACZ;CACA,OAAO,OAAO,WAAW,WAAW,QAAQ;EAC3C,MAAM,SAAS,OAAO,KAAK,MAAM;EACjC,MAAM,WAAW,OAAO,MAAM,MAAM,MAAM;EAC1C,MAAM,YAAY,OAAO,UAAU;EACnC,OAAO,MAAM,QAAQ,eAAe;GACnC,MAAM;GACN,QAAQ,OAAO;GACf,eAAe,kBACdC,KAAW,aAAa,CAAC,CAAC,KACzB,OAAO,SAAS,UACfC,MAAI,iBACH,OAAO,OAAO,OAAO,QAAQ,OAAO,OAAO,GAC3C,OACA;IACC,QAAQ,OAAO;IACf,UAAU,OAAO;IACjB,YAAY,OAAO;IACnB,gBAAgB,OAAO;IACvB,gBAAgB,CAAC,KAAK;GACvB,CACD,CAAC,CAAC,KACD,OAAO,SAAS,aACf,OAAO,oBAAoB,OAAO,cAAc,CAAC,CAChD,SAAS,OAAO,OAAO,cACxB,CACD,GAEA,OAAO,UAAU,UAChB,MAAM,SAAS,eACf,MAAM,OAAO,SAAS,sBACnB,yBAAyB,KAAK,EAAE,OAAO,MAAM,KAAK,KAAK,EAAE,CAAC,IAC1D,qBAAqB,KAAK;IAC1B,QAAQ;IACR,WAAW;IACX,OAAO,MAAM,KAAK,KAAK;GACxB,CAAC,CACJ,GACA,OAAO,eAAe,UAAU,WAAW,SAAS,GACpD,OAAO,eAAe,QAAQ,CAC/B,CACD,CACD;EACF,CAAC;CACF,CAAC;AACF,CAAC"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { AuthenticatorApi } from "../../Auth.js";
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
readonly ca: Schema.String;
|
|
5
|
-
}>;
|
|
2
|
+
import { Mtls } from "../../internal/auth/config.js";
|
|
3
|
+
import { Graft, Plugin } from "@graftland/graft";
|
|
6
4
|
export declare const make: (ca: string) => Extract<AuthenticatorApi, {
|
|
7
5
|
readonly _tag: "Mtls";
|
|
8
6
|
}>;
|
|
9
|
-
declare const _default:
|
|
10
|
-
|
|
7
|
+
declare const _default: Plugin.Definition<{
|
|
8
|
+
readonly ca: string;
|
|
9
|
+
}, {
|
|
10
|
+
readonly ca: string;
|
|
11
|
+
}, import("effect/PlatformError").PlatformError | import("effect/Schema").SchemaError | Graft.ServiceConflict>;
|
|
12
|
+
export { Mtls as Config, _default as default };
|
|
11
13
|
//# sourceMappingURL=mtls.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mtls.d.ts","names":[],"sources":["../../../src/runner/auth/mtls.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"mtls.d.ts","names":[],"sources":["../../../src/runner/auth/mtls.ts"],"mappings":";;;qBAkBa,OAAI,eAEd,QAAQ;WAA6B"}
|
package/dist/runner/auth/mtls.js
CHANGED
|
@@ -1,28 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
const value = String.slice(4)(field);
|
|
9
|
-
return String.startsWith("\"")(value) ? Schema.decodeEffect(Schema.fromJsonString(Schema.String))(value).pipe(Effect.mapError((error) => AuthenticationFailed.make({
|
|
10
|
-
reason: "invalid",
|
|
11
|
-
cause: Cause.fail(error)
|
|
12
|
-
}))) : Effect.succeed(value);
|
|
13
|
-
};
|
|
14
|
-
/** Read exactly one graft URI from Node's plain or JSON-quoted SAN representation. */
|
|
15
|
-
const identityFromSubjectAltName = Effect.fnUntraced(function* (san) {
|
|
16
|
-
const values = yield* Effect.forEach(Array.filter(String.split(san ?? "", ", "), String.startsWith("URI:")), uriValue);
|
|
17
|
-
const uris = Array.filter(values, String.startsWith("graft://"));
|
|
18
|
-
const [uri] = uris;
|
|
19
|
-
return yield* uris.length === 1 && uri !== void 0 ? Effect.succeed(uri) : Effect.fail(AuthenticationFailed.make({
|
|
20
|
-
reason: "invalid",
|
|
21
|
-
cause: Cause.fail("The peer certificate must contain exactly one graft SAN URI")
|
|
22
|
-
}));
|
|
23
|
-
});
|
|
24
|
-
// packages/remote/src/runner/auth/mtls.ts
|
|
25
|
-
const Config = Schema.Struct({ ca: Schema.String });
|
|
1
|
+
import { Authenticator } from "../../Auth.js";
|
|
2
|
+
import { Mtls } from "../../internal/auth/config.js";
|
|
3
|
+
import { identityFromSubjectAltName } from "../../internal/auth/mtls.js";
|
|
4
|
+
import { Effect, FileSystem, Option, Path } from "effect";
|
|
5
|
+
import { Graft, Plugin } from "@graftland/graft";
|
|
6
|
+
import { ConfigDirectory } from "@graftland/loader";
|
|
7
|
+
// src/runner/auth/mtls.ts
|
|
26
8
|
const read = Effect.fnUntraced(function* (ca) {
|
|
27
9
|
const fs = yield* FileSystem.FileSystem;
|
|
28
10
|
const path = yield* Path.Path;
|
|
@@ -39,10 +21,12 @@ const make = (ca) => ({
|
|
|
39
21
|
},
|
|
40
22
|
authenticate: (peer) => identityFromSubjectAltName(Option.getOrUndefined(peer.subjectAltName))
|
|
41
23
|
});
|
|
42
|
-
var mtls_default = make
|
|
24
|
+
var mtls_default = Plugin.make({
|
|
43
25
|
name: "remote-certificate-authenticator",
|
|
44
|
-
config:
|
|
26
|
+
config: Mtls,
|
|
45
27
|
inject: [FileSystem.FileSystem, Path.Path],
|
|
46
|
-
apply: ({ ca }) => read(ca).pipe(Effect.flatMap((ca) => provide(Authenticator, make(ca))))
|
|
28
|
+
apply: ({ ca }) => read(ca).pipe(Effect.flatMap((ca) => Graft.provide(Authenticator, make(ca))))
|
|
47
29
|
});
|
|
48
|
-
export { Config, mtls_default as default, make };
|
|
30
|
+
export { Mtls as Config, mtls_default as default, make };
|
|
31
|
+
|
|
32
|
+
//# sourceMappingURL=mtls.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mtls.js","names":[],"sources":["../../../src/runner/auth/mtls.ts"],"sourcesContent":["import { Graft, Plugin } from \"@graftland/graft\"\nimport {
|
|
1
|
+
{"version":3,"file":"mtls.js","names":["Config"],"sources":["../../../src/runner/auth/mtls.ts"],"sourcesContent":["import { Effect, FileSystem, Option, Path } from \"effect\"\n\nimport { Graft, Plugin } from \"@graftland/graft\"\nimport { ConfigDirectory } from \"@graftland/loader\"\n\nimport { Authenticator, type AuthenticatorApi } from \"../../Auth\"\nimport { Mtls as Config } from \"../../internal/auth/config\"\nimport { identityFromSubjectAltName } from \"../../internal/auth/mtls\"\n\nexport { Config }\nconst read = Effect.fnUntraced(function* (ca: string) {\n\tconst fs = yield* FileSystem.FileSystem\n\tconst path = yield* Path.Path\n\tconst directory = yield* ConfigDirectory.pipe(\n\t\tEffect.map(Option.getOrElse(() => \".\")),\n\t)\n\treturn yield* fs.readFileString(path.resolve(directory, ca))\n})\nexport const make = (\n\tca: string,\n): Extract<AuthenticatorApi, { readonly _tag: \"Mtls\" }> => ({\n\t_tag: \"Mtls\",\n\ttls: {\n\t\tca: [ca],\n\t\tminVersion: \"TLSv1.3\",\n\t\trequestCert: true,\n\t\trejectUnauthorized: true,\n\t},\n\tauthenticate: (peer) =>\n\t\tidentityFromSubjectAltName(Option.getOrUndefined(peer.subjectAltName)),\n})\nexport default Plugin.make({\n\tname: \"remote-certificate-authenticator\",\n\tconfig: Config,\n\tinject: [FileSystem.FileSystem, Path.Path],\n\tapply: ({ ca }) =>\n\t\tread(ca).pipe(\n\t\t\tEffect.flatMap((ca) => Graft.provide(Authenticator, make(ca))),\n\t\t),\n})\n"],"mappings":";;;;;;;AAUA,MAAM,OAAO,OAAO,WAAW,WAAW,IAAY;CACrD,MAAM,KAAK,OAAO,WAAW;CAC7B,MAAM,OAAO,OAAO,KAAK;CACzB,MAAM,YAAY,OAAO,gBAAgB,KACxC,OAAO,IAAI,OAAO,gBAAgB,GAAG,CAAC,CACvC;CACA,OAAO,OAAO,GAAG,eAAe,KAAK,QAAQ,WAAW,EAAE,CAAC;AAC5D,CAAC;AACD,MAAa,QACZ,QAC2D;CAC3D,MAAM;CACN,KAAK;EACJ,IAAI,CAAC,EAAE;EACP,YAAY;EACZ,aAAa;EACb,oBAAoB;CACrB;CACA,eAAe,SACd,2BAA2B,OAAO,eAAe,KAAK,cAAc,CAAC;AACvE;AACA,IAAA,eAAe,OAAO,KAAK;CAC1B,MAAM;CACN,QAAQA;CACR,QAAQ,CAAC,WAAW,YAAY,KAAK,IAAI;CACzC,QAAQ,EAAE,SACT,KAAK,EAAE,CAAC,CAAC,KACR,OAAO,SAAS,OAAO,MAAM,QAAQ,eAAe,KAAK,EAAE,CAAC,CAAC,CAC9D;AACF,CAAC"}
|
|
@@ -1,3 +1,9 @@
|
|
|
1
|
-
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import { Graft, Plugin } from "@graftland/graft";
|
|
3
|
+
declare const _default: Plugin.Definition<{
|
|
4
|
+
readonly identity: string;
|
|
5
|
+
}, {
|
|
6
|
+
readonly identity?: string;
|
|
7
|
+
}, Schema.SchemaError | Graft.ServiceConflict>;
|
|
2
8
|
export { _default as default };
|
|
3
9
|
//# sourceMappingURL=none.d.ts.map
|
package/dist/runner/auth/none.js
CHANGED
|
@@ -1,13 +1,15 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { t as Authenticator } from "../../Auth-BElTC9_X.js";
|
|
1
|
+
import { Authenticator } from "../../Auth.js";
|
|
3
2
|
import { Effect, Schema } from "effect";
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
import { Graft, Plugin } from "@graftland/graft";
|
|
4
|
+
// src/runner/auth/none.ts
|
|
5
|
+
var none_default = Plugin.make({
|
|
6
6
|
name: "remote-none-authenticator",
|
|
7
7
|
config: Schema.Struct({ identity: Schema.String.pipe(Schema.withDecodingDefaultKey(Effect.succeed("anonymous"))) }),
|
|
8
|
-
apply: (config) => provide(Authenticator, {
|
|
8
|
+
apply: (config) => Graft.provide(Authenticator, {
|
|
9
9
|
_tag: "None",
|
|
10
10
|
...config
|
|
11
11
|
})
|
|
12
12
|
});
|
|
13
13
|
export { none_default as default };
|
|
14
|
+
|
|
15
|
+
//# sourceMappingURL=none.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"none.js","names":[],"sources":["../../../src/runner/auth/none.ts"],"sourcesContent":["import {
|
|
1
|
+
{"version":3,"file":"none.js","names":[],"sources":["../../../src/runner/auth/none.ts"],"sourcesContent":["import { Effect, Schema } from \"effect\"\n\nimport { Graft, Plugin } from \"@graftland/graft\"\n\nimport { Authenticator } from \"../../Auth\"\n\nexport default Plugin.make({\n\tname: \"remote-none-authenticator\",\n\tconfig: Schema.Struct({\n\t\tidentity: Schema.String.pipe(\n\t\t\tSchema.withDecodingDefaultKey(Effect.succeed(\"anonymous\")),\n\t\t),\n\t}),\n\tapply: (config) => Graft.provide(Authenticator, { _tag: \"None\", ...config }),\n})\n"],"mappings":";;;;AAMA,IAAA,eAAe,OAAO,KAAK;CAC1B,MAAM;CACN,QAAQ,OAAO,OAAO,EACrB,UAAU,OAAO,OAAO,KACvB,OAAO,uBAAuB,OAAO,QAAQ,WAAW,CAAC,CAC1D,EACD,CAAC;CACD,QAAQ,WAAW,MAAM,QAAQ,eAAe;EAAE,MAAM;EAAQ,GAAG;CAAO,CAAC;AAC5E,CAAC"}
|
package/dist/runner/index.d.ts
CHANGED
|
@@ -1,3 +1,7 @@
|
|
|
1
|
-
|
|
1
|
+
import { RemoteEntryError } from "../Errors.js";
|
|
2
|
+
import "../index.js";
|
|
3
|
+
import { Schema } from "effect";
|
|
4
|
+
import { Plugin } from "@graftland/graft";
|
|
5
|
+
declare const _default: Plugin.Definition<unknown, unknown, RemoteEntryError | Schema.SchemaError>;
|
|
2
6
|
export { _default as default };
|
|
3
7
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","names":[],"sources":["../../src/runner/index.ts"],"mappings":""}
|
|
1
|
+
{"version":3,"file":"index.d.ts","names":["_$__0.RemoteEntryError"],"sources":["../../src/runner/index.ts"],"mappings":""}
|
package/dist/runner/index.js
CHANGED
|
@@ -1,23 +1,19 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
1
|
+
import { directAuth, makeListenerConsumer, runner } from "../internal/assembly.js";
|
|
2
|
+
import { cleanupCause } from "../internal/cleanup.js";
|
|
3
|
+
import { boundary, resolve } from "../internal/entry.js";
|
|
4
|
+
import { runnerAuthentication, runnerTransport } from "../internal/entryConfig.js";
|
|
5
|
+
import { follow } from "../internal/follow.js";
|
|
6
|
+
import { Runner } from "../Config.js";
|
|
7
|
+
import { signals, validate, wait } from "../internal/listenerStartup.js";
|
|
8
|
+
import { RunnerLifecycle, StartupError, make } from "../internal/RunnerLifecycle.js";
|
|
9
|
+
import { Supervisor } from "../internal/Supervisor.js";
|
|
10
|
+
import supervisorPlugin_default, { Config } from "../internal/supervisorPlugin.js";
|
|
11
|
+
import { Array, Cause, Deferred, Effect, Exit, Option, Path, Schema, Stream } from "effect";
|
|
7
12
|
import { SecureRandom } from "effect/crypto";
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
});
|
|
13
|
-
/** A startup signal races its assembly's failure; no runtime failure is promoted to the owner. */
|
|
14
|
-
const wait = (fork, signal) => Deferred.await(signal).pipe(Effect.raceFirst(fork.state.pipe(Stream.runForEach((state) => state._tag === "Failed" ? Effect.fail(CapabilityFailed.make({ cause: state.cause })) : Effect.void), Effect.andThen(Effect.never))));
|
|
15
|
-
const validate = (listeners) => {
|
|
16
|
-
if (listeners.length !== 1 && Array.some(listeners, ({ properties }) => properties.protocol === "stdio")) return Effect.fail(CapabilityCombinationError.make({ detail: "A stdio listener must be the only listener in serve" }));
|
|
17
|
-
const issuers = HashSet.fromIterable(Array.getSomes(Array.map(listeners, ({ auth }) => auth._tag === "Header" ? Option.fromUndefinedOr(auth.issuer) : Option.none())));
|
|
18
|
-
return HashSet.size(issuers) > 1 ? Effect.fail(CapabilityCombinationError.make({ detail: "A runner must use a single authentication issuer" })) : Effect.void;
|
|
19
|
-
};
|
|
20
|
-
// packages/remote/src/runner/index.ts
|
|
13
|
+
import { Graft, Plugin } from "@graftland/graft";
|
|
14
|
+
import { ModuleResolver } from "@graftland/loader";
|
|
15
|
+
import { Application, ProtocolOutput } from "@graftland/cli/Application";
|
|
16
|
+
// src/runner/index.ts
|
|
21
17
|
const startListener = Effect.fnUntraced(function* (input, index, begin) {
|
|
22
18
|
const field = `listen[${index}]`;
|
|
23
19
|
const transport = yield* resolve(runnerTransport(input), field + ".transport");
|
|
@@ -36,36 +32,72 @@ const startListener = Effect.fnUntraced(function* (input, index, begin) {
|
|
|
36
32
|
field
|
|
37
33
|
};
|
|
38
34
|
});
|
|
39
|
-
const owner = make({
|
|
35
|
+
const owner = Plugin.make({
|
|
40
36
|
name: "remote-supervised-runtime",
|
|
41
37
|
config: Runner,
|
|
42
38
|
inject: [
|
|
43
|
-
ModuleResolver,
|
|
39
|
+
ModuleResolver.ModuleResolver,
|
|
44
40
|
Path.Path,
|
|
45
|
-
SecureRandom.SecureRandom
|
|
41
|
+
SecureRandom.SecureRandom,
|
|
42
|
+
Plugin.optional(Application)
|
|
46
43
|
],
|
|
47
44
|
apply: Effect.fnUntraced(function* (config) {
|
|
48
|
-
const options = yield* Schema.encodeEffect(Config
|
|
49
|
-
const engine = yield* plugin(supervisorPlugin_default, options);
|
|
45
|
+
const options = yield* Schema.encodeEffect(Config)(config);
|
|
46
|
+
const engine = yield* Graft.plugin(supervisorPlugin_default, options);
|
|
50
47
|
const fail = yield* boundary("supervisor");
|
|
51
48
|
yield* follow(engine, fail);
|
|
52
49
|
const begin = yield* Deferred.make();
|
|
53
50
|
const listeners = yield* Effect.forEach(config.listen, (input, index) => startListener(input, index, begin));
|
|
54
51
|
const descriptions = yield* Effect.forEach(listeners, ({ fork, signals }) => wait(fork, signals.description), { concurrency: "unbounded" });
|
|
55
52
|
yield* validate(descriptions);
|
|
53
|
+
const protocol = yield* ProtocolOutput;
|
|
54
|
+
if (Array.some(descriptions, (description) => description.properties.protocol === "stdio") !== protocol) return yield* StartupError.make({ detail: "A stdio runner requires graft start --stdio and exactly one stdio listener" });
|
|
55
|
+
if (protocol) {
|
|
56
|
+
const application = yield* Effect.serviceOption(Application);
|
|
57
|
+
if (Option.isSome(application)) yield* application.value.claimProtocol;
|
|
58
|
+
}
|
|
56
59
|
yield* Deferred.succeed(begin, void 0);
|
|
57
60
|
yield* Effect.forEach(listeners, ({ fork, signals }) => wait(fork, signals.ready), { concurrency: "unbounded" });
|
|
58
|
-
yield* Effect.forEach(listeners, ({ fork
|
|
61
|
+
yield* Effect.forEach(listeners, ({ fork, field }) => Plugin.fork(fork.state.pipe(Stream.runForEach((state) => state._tag === "Failed" ? Effect.logWarning("Remote listener failed", state.cause).pipe(Effect.annotateLogs({ "remote.listener": field })) : Effect.void))), { discard: true });
|
|
59
62
|
})
|
|
60
63
|
});
|
|
61
|
-
|
|
64
|
+
const shutdown = Effect.fnUntraced(function* (fork, lifecycle) {
|
|
65
|
+
const disposed = yield* Effect.exit(fork.dispose);
|
|
66
|
+
const result = yield* Deferred.poll(lifecycle.released);
|
|
67
|
+
const released = Option.isSome(result) ? yield* Effect.exit(result.value) : Exit.void;
|
|
68
|
+
const cause = Cause.combine(Exit.isFailure(disposed) ? disposed.cause : Cause.empty, Exit.isFailure(released) ? released.cause : Cause.empty);
|
|
69
|
+
if (cause.reasons.length > 0) return yield* Effect.failCause(cleanupCause(cause));
|
|
70
|
+
});
|
|
71
|
+
var runner_default = Plugin.make({
|
|
62
72
|
name: "remote-server",
|
|
63
|
-
config:
|
|
64
|
-
|
|
73
|
+
config: Schema.Unknown,
|
|
74
|
+
inject: [Plugin.optional(Application)],
|
|
75
|
+
apply: Effect.fnUntraced(function* (input) {
|
|
76
|
+
const application = yield* Effect.serviceOption(Application);
|
|
77
|
+
const config = yield* Schema.decodeUnknownEffect(Runner)(input).pipe(Effect.tapError((error) => Option.isSome(application) ? application.value.finish(Exit.fail(error)) : Effect.void));
|
|
78
|
+
const lifecycle = yield* make;
|
|
65
79
|
const encoded = yield* Schema.encodeEffect(Runner)(config);
|
|
66
|
-
const
|
|
80
|
+
const assembly = Plugin.make({
|
|
81
|
+
name: "remote-runner-runtime",
|
|
82
|
+
apply: Effect.fnUntraced(function* () {
|
|
83
|
+
yield* Graft.provide(RunnerLifecycle, lifecycle);
|
|
84
|
+
const fork = yield* Graft.plugin(owner, encoded);
|
|
85
|
+
const fail = yield* boundary("runner");
|
|
86
|
+
yield* follow(fork, fail);
|
|
87
|
+
})
|
|
88
|
+
});
|
|
89
|
+
const fork = yield* Graft.plugin(assembly, void 0, { isolate: [Supervisor, RunnerLifecycle] });
|
|
90
|
+
if (Option.isSome(application)) {
|
|
91
|
+
yield* application.value.onExit(shutdown(fork, lifecycle));
|
|
92
|
+
yield* Plugin.fork(Deferred.await(lifecycle.ended).pipe(Effect.matchCauseEffect({
|
|
93
|
+
onSuccess: () => application.value.finish(Exit.void),
|
|
94
|
+
onFailure: (cause) => application.value.finish(Exit.failCause(cause))
|
|
95
|
+
})));
|
|
96
|
+
}
|
|
67
97
|
const fail = yield* boundary("runner");
|
|
68
|
-
yield* follow(fork, fail);
|
|
98
|
+
yield* follow(fork, (cause) => (Option.isSome(application) && !Cause.hasInterruptsOnly(cause) ? application.value.finish(Exit.failCause(cause)) : Effect.void).pipe(Effect.andThen(fail(cause))));
|
|
69
99
|
})
|
|
70
100
|
});
|
|
71
101
|
export { runner_default as default };
|
|
102
|
+
|
|
103
|
+
//# sourceMappingURL=index.js.map
|
package/dist/runner/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":["Configuration.runnerTransport","Configuration.runnerAuthentication","signals","Startup.signals","Assembly.makeListenerConsumer","Assembly.directAuth","Assembly.runner","Configuration.Runner","SupervisorConfig","supervisor","Startup.wait","Startup.validate"],"sources":["../../src/runner/index.ts"],"sourcesContent":["import { Graft, Plugin } from \"@graftland/graft\"\nimport { SecureRandom } from \"effect/crypto\"\nimport { Path } from \"effect\"\nimport { ModuleResolver } from \"@graftland/loader\"\nimport { Deferred, Effect, Schema, Stream } from \"effect\"\nimport * as Configuration from \"../internal/entryConfig\"\nimport { boundary, resolve } from \"../internal/entry\"\nimport * as Assembly from \"../internal/assembly\"\nimport * as Startup from \"../internal/listenerStartup\"\nimport { follow } from \"../internal/follow\"\nimport { Supervisor } from \"../internal/Supervisor\"\nimport supervisor, {\n\tConfig as SupervisorConfig,\n} from \"../internal/supervisorPlugin\"\n\nconst startListener = Effect.fnUntraced(function* (\n\tinput: Configuration.Listen,\n\tindex: number,\n\tbegin: Deferred.Deferred<void>,\n) {\n\tconst field = `listen[${index}]`\n\tconst transport = yield* resolve(\n\t\tConfiguration.runnerTransport(input),\n\t\tfield + \".transport\",\n\t)\n\tconst auth = yield* resolve(\n\t\tConfiguration.runnerAuthentication(input),\n\t\tfield + \".auth\",\n\t)\n\tconst signals = yield* Startup.signals\n\tconst consumer = Assembly.makeListenerConsumer(\n\t\t(properties, auth) =>\n\t\t\tAssembly.directAuth(properties, input.auth !== undefined).pipe(\n\t\t\t\tEffect.andThen(\n\t\t\t\t\tDeferred.succeed(signals.description, { properties, auth }),\n\t\t\t\t),\n\t\t\t\tEffect.andThen(Deferred.await(begin)),\n\t\t\t),\n\t\tDeferred.succeed(signals.ready, undefined).pipe(Effect.asVoid),\n\t)\n\tconst fork = yield* Assembly.runner({ transport, auth }, consumer)\n\treturn { fork, signals, field }\n})\n\nconst owner = Plugin.make({\n\tname: \"remote-supervised-runtime\",\n\tconfig: Configuration.Runner,\n\tinject: [ModuleResolver.ModuleResolver, Path.Path, SecureRandom.SecureRandom],\n\tapply: Effect.fnUntraced(function* (config) {\n\t\tconst options = yield* Schema.encodeEffect(SupervisorConfig)(config)\n\t\tconst engine = yield* Graft.plugin(supervisor, options)\n\t\tconst fail = yield* boundary(\"supervisor\")\n\t\tyield* follow(engine, fail)\n\t\tconst begin = yield* Deferred.make<void>()\n\t\tconst listeners = yield* Effect.forEach(config.listen, (input, index) =>\n\t\t\tstartListener(input, index, begin),\n\t\t)\n\t\tconst descriptions = yield* Effect.forEach(\n\t\t\tlisteners,\n\t\t\t({ fork, signals }) => Startup.wait(fork, signals.description),\n\t\t\t{ concurrency: \"unbounded\" },\n\t\t)\n\t\tyield* Startup.validate(descriptions)\n\t\tyield* Deferred.succeed(begin, undefined)\n\t\tyield* Effect.forEach(\n\t\t\tlisteners,\n\t\t\t({ fork, signals }) => Startup.wait(fork, signals.ready),\n\t\t\t{ concurrency: \"unbounded\" },\n\t\t)\n\t\tyield* Effect.forEach(\n\t\t\tlisteners,\n\t\t\t({ fork, field }) =>\n\t\t\t\tPlugin.fork(\n\t\t\t\t\tfork.state.pipe(\n\t\t\t\t\t\tStream.runForEach((state) =>\n\t\t\t\t\t\t\tstate._tag === \"Failed\"\n\t\t\t\t\t\t\t\t? Effect.logWarning(\"Remote listener failed\", state.cause).pipe(\n\t\t\t\t\t\t\t\t\t\tEffect.annotateLogs({ \"remote.listener\": field }),\n\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t: Effect.void,\n\t\t\t\t\t\t),\n\t\t\t\t\t),\n\t\t\t\t),\n\t\t\t{ discard: true },\n\t\t)\n\t}),\n})\nexport default Plugin.make({\n\tname: \"remote-server\",\n\tconfig: Configuration.Runner,\n\tapply: Effect.fnUntraced(function* (config) {\n\t\tconst encoded = yield* Schema.encodeEffect(Configuration.Runner)(config)\n\t\tconst fork = yield* Graft.plugin(owner, encoded, { isolate: [Supervisor] })\n\t\tconst fail = yield* boundary(\"runner\")\n\t\tyield* follow(fork, fail)\n\t}),\n})\n"],"mappings":";;;;;;;;;;;;AAeA,MAAM,gBAAgB,OAAO,WAAW,WACvC,OACA,OACA,OACC;CACD,MAAM,QAAQ,UAAU,MAAM;CAC9B,MAAM,YAAY,OAAO,QACxBA,gBAA8B,KAAK,GACnC,QAAQ,YACT;CACA,MAAM,OAAO,OAAO,QACnBC,qBAAmC,KAAK,GACxC,QAAQ,OACT;CACA,MAAMC,YAAU,OAAOC;CACvB,MAAM,WAAWC,sBACf,YAAY,SACZC,WAAoB,YAAY,MAAM,SAAS,KAAA,CAAS,CAAC,CAAC,KACzD,OAAO,QACN,SAAS,QAAQH,UAAQ,aAAa;EAAE;EAAY;CAAK,CAAC,CAC3D,GACA,OAAO,QAAQ,SAAS,MAAM,KAAK,CAAC,CACrC,GACD,SAAS,QAAQA,UAAQ,OAAO,KAAA,CAAS,CAAC,CAAC,KAAK,OAAO,MAAM,CAC9D;CAEA,OAAO;EAAE,MAAA,OADWI,OAAgB;GAAE;GAAW;EAAK,GAAG,QAAQ;EAClD,SAAA;EAAS;CAAM;AAC/B,CAAC;AAED,MAAM,QAAQ,OAAO,KAAK;CACzB,MAAM;CACN,QAAQC;CACR,QAAQ;EAAC,eAAe;EAAgB,KAAK;EAAM,aAAa;CAAY;CAC5E,OAAO,OAAO,WAAW,WAAW,QAAQ;EAC3C,MAAM,UAAU,OAAO,OAAO,aAAaC,MAAgB,CAAC,CAAC,MAAM;EACnE,MAAM,SAAS,OAAO,MAAM,OAAOC,0BAAY,OAAO;EACtD,MAAM,OAAO,OAAO,SAAS,YAAY;EACzC,OAAO,OAAO,QAAQ,IAAI;EAC1B,MAAM,QAAQ,OAAO,SAAS,KAAW;EACzC,MAAM,YAAY,OAAO,OAAO,QAAQ,OAAO,SAAS,OAAO,UAC9D,cAAc,OAAO,OAAO,KAAK,CAClC;EACA,MAAM,eAAe,OAAO,OAAO,QAClC,YACC,EAAE,MAAM,cAAcC,KAAa,MAAM,QAAQ,WAAW,GAC7D,EAAE,aAAa,YAAY,CAC5B;EACA,OAAOC,SAAiB,YAAY;EACpC,OAAO,SAAS,QAAQ,OAAO,KAAA,CAAS;EACxC,OAAO,OAAO,QACb,YACC,EAAE,MAAM,cAAcD,KAAa,MAAM,QAAQ,KAAK,GACvD,EAAE,aAAa,YAAY,CAC5B;EACA,OAAO,OAAO,QACb,YACC,EAAE,MAAM,YACR,OAAO,KACN,KAAK,MAAM,KACV,OAAO,YAAY,UAClB,MAAM,SAAS,WACZ,OAAO,WAAW,0BAA0B,MAAM,KAAK,CAAC,CAAC,KACzD,OAAO,aAAa,EAAE,mBAAmB,MAAM,CAAC,CACjD,IACC,OAAO,IACX,CACD,CACD,GACD,EAAE,SAAS,KAAK,CACjB;CACD,CAAC;AACF,CAAC;AACD,IAAA,iBAAe,OAAO,KAAK;CAC1B,MAAM;CACN,QAAQH;CACR,OAAO,OAAO,WAAW,WAAW,QAAQ;EAC3C,MAAM,UAAU,OAAO,OAAO,aAAaA,MAAoB,CAAC,CAAC,MAAM;EACvE,MAAM,OAAO,OAAO,MAAM,OAAO,OAAO,SAAS,EAAE,SAAS,CAAC,UAAU,EAAE,CAAC;EAC1E,MAAM,OAAO,OAAO,SAAS,QAAQ;EACrC,OAAO,OAAO,MAAM,IAAI;CACzB,CAAC;AACF,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","names":["Configuration.runnerTransport","Configuration.runnerAuthentication","signals","Startup.signals","Assembly.makeListenerConsumer","Assembly.directAuth","Assembly.runner","Configuration.Runner","SupervisorConfig","supervisor","Startup.wait","Startup.validate","Lifecycle.make","Lifecycle.RunnerLifecycle"],"sources":["../../src/runner/index.ts"],"sourcesContent":["import {\n\tArray,\n\tCause,\n\tDeferred,\n\tEffect,\n\tExit,\n\tOption,\n\tPath,\n\tSchema,\n\tStream,\n} from \"effect\"\nimport { SecureRandom } from \"effect/crypto\"\n\nimport { Application, ProtocolOutput } from \"@graftland/cli/Application\"\nimport { Graft, Plugin, type Fork } from \"@graftland/graft\"\nimport { ModuleResolver } from \"@graftland/loader\"\n\nimport * as Assembly from \"../internal/assembly\"\nimport { cleanupCause } from \"../internal/cleanup\"\nimport { boundary, resolve } from \"../internal/entry\"\nimport * as Configuration from \"../internal/entryConfig\"\nimport { follow } from \"../internal/follow\"\nimport * as Startup from \"../internal/listenerStartup\"\nimport * as Lifecycle from \"../internal/RunnerLifecycle\"\nimport { Supervisor } from \"../internal/Supervisor\"\nimport supervisor, {\n\tConfig as SupervisorConfig,\n} from \"../internal/supervisorPlugin\"\n\nconst startListener = Effect.fnUntraced(function* (\n\tinput: Configuration.Listen,\n\tindex: number,\n\tbegin: Deferred.Deferred<void>,\n) {\n\tconst field = `listen[${index}]`\n\tconst transport = yield* resolve(\n\t\tConfiguration.runnerTransport(input),\n\t\tfield + \".transport\",\n\t)\n\tconst auth = yield* resolve(\n\t\tConfiguration.runnerAuthentication(input),\n\t\tfield + \".auth\",\n\t)\n\tconst signals = yield* Startup.signals\n\tconst consumer = Assembly.makeListenerConsumer(\n\t\t(properties, auth) =>\n\t\t\tAssembly.directAuth(properties, input.auth !== undefined).pipe(\n\t\t\t\tEffect.andThen(\n\t\t\t\t\tDeferred.succeed(signals.description, { properties, auth }),\n\t\t\t\t),\n\t\t\t\tEffect.andThen(Deferred.await(begin)),\n\t\t\t),\n\t\tDeferred.succeed(signals.ready, undefined).pipe(Effect.asVoid),\n\t)\n\tconst fork = yield* Assembly.runner({ transport, auth }, consumer)\n\treturn { fork, signals, field }\n})\n\nconst owner = Plugin.make({\n\tname: \"remote-supervised-runtime\",\n\tconfig: Configuration.Runner,\n\tinject: [\n\t\tModuleResolver.ModuleResolver,\n\t\tPath.Path,\n\t\tSecureRandom.SecureRandom,\n\t\tPlugin.optional(Application),\n\t],\n\tapply: Effect.fnUntraced(function* (config) {\n\t\tconst options = yield* Schema.encodeEffect(SupervisorConfig)(config)\n\t\tconst engine = yield* Graft.plugin(supervisor, options)\n\t\tconst fail = yield* boundary(\"supervisor\")\n\t\tyield* follow(engine, fail)\n\t\tconst begin = yield* Deferred.make<void>()\n\t\tconst listeners = yield* Effect.forEach(config.listen, (input, index) =>\n\t\t\tstartListener(input, index, begin),\n\t\t)\n\t\tconst descriptions = yield* Effect.forEach(\n\t\t\tlisteners,\n\t\t\t({ fork, signals }) => Startup.wait(fork, signals.description),\n\t\t\t{ concurrency: \"unbounded\" },\n\t\t)\n\t\tyield* Startup.validate(descriptions)\n\t\tconst protocol = yield* ProtocolOutput\n\t\tif (\n\t\t\tArray.some(\n\t\t\t\tdescriptions,\n\t\t\t\t(description) => description.properties.protocol === \"stdio\",\n\t\t\t) !== protocol\n\t\t)\n\t\t\treturn yield* Lifecycle.StartupError.make({\n\t\t\t\tdetail:\n\t\t\t\t\t\"A stdio runner requires graft start --stdio and exactly one stdio listener\",\n\t\t\t})\n\t\tif (protocol) {\n\t\t\tconst application = yield* Effect.serviceOption(Application)\n\t\t\tif (Option.isSome(application)) yield* application.value.claimProtocol\n\t\t}\n\t\tyield* Deferred.succeed(begin, undefined)\n\t\tyield* Effect.forEach(\n\t\t\tlisteners,\n\t\t\t({ fork, signals }) => Startup.wait(fork, signals.ready),\n\t\t\t{ concurrency: \"unbounded\" },\n\t\t)\n\t\tyield* Effect.forEach(\n\t\t\tlisteners,\n\t\t\t({ fork, field }) =>\n\t\t\t\tPlugin.fork(\n\t\t\t\t\tfork.state.pipe(\n\t\t\t\t\t\tStream.runForEach((state) =>\n\t\t\t\t\t\t\tstate._tag === \"Failed\"\n\t\t\t\t\t\t\t\t? Effect.logWarning(\"Remote listener failed\", state.cause).pipe(\n\t\t\t\t\t\t\t\t\t\tEffect.annotateLogs({ \"remote.listener\": field }),\n\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t: Effect.void,\n\t\t\t\t\t\t),\n\t\t\t\t\t),\n\t\t\t\t),\n\t\t\t{ discard: true },\n\t\t)\n\t}),\n})\nconst shutdown = Effect.fnUntraced(function* (\n\tfork: Fork.Fork,\n\tlifecycle: typeof Lifecycle.RunnerLifecycle.Service,\n) {\n\tconst disposed = yield* Effect.exit(fork.dispose)\n\tconst result = yield* Deferred.poll(lifecycle.released)\n\tconst released = Option.isSome(result)\n\t\t? yield* Effect.exit(result.value)\n\t\t: Exit.void\n\tconst cause = Cause.combine(\n\t\tExit.isFailure(disposed) ? disposed.cause : Cause.empty,\n\t\tExit.isFailure(released) ? released.cause : Cause.empty,\n\t)\n\tif (cause.reasons.length > 0)\n\t\treturn yield* Effect.failCause(cleanupCause(cause))\n})\n\nexport default Plugin.make({\n\tname: \"remote-server\",\n\tconfig: Schema.Unknown,\n\tinject: [Plugin.optional(Application)],\n\tapply: Effect.fnUntraced(function* (input) {\n\t\tconst application = yield* Effect.serviceOption(Application)\n\t\tconst config = yield* Schema.decodeUnknownEffect(Configuration.Runner)(\n\t\t\tinput,\n\t\t).pipe(\n\t\t\tEffect.tapError((error) =>\n\t\t\t\tOption.isSome(application)\n\t\t\t\t\t? application.value.finish(Exit.fail(error))\n\t\t\t\t\t: Effect.void,\n\t\t\t),\n\t\t)\n\t\tconst lifecycle = yield* Lifecycle.make\n\t\tconst encoded = yield* Schema.encodeEffect(Configuration.Runner)(config)\n\t\tconst assembly = Plugin.make({\n\t\t\tname: \"remote-runner-runtime\",\n\t\t\tapply: Effect.fnUntraced(function* () {\n\t\t\t\tyield* Graft.provide(Lifecycle.RunnerLifecycle, lifecycle)\n\t\t\t\tconst fork = yield* Graft.plugin(owner, encoded)\n\t\t\t\tconst fail = yield* boundary(\"runner\")\n\t\t\t\tyield* follow(fork, fail)\n\t\t\t}),\n\t\t})\n\t\tconst fork = yield* Graft.plugin(assembly, undefined, {\n\t\t\tisolate: [Supervisor, Lifecycle.RunnerLifecycle],\n\t\t})\n\t\tif (Option.isSome(application)) {\n\t\t\tyield* application.value.onExit(shutdown(fork, lifecycle))\n\t\t\tyield* Plugin.fork(\n\t\t\t\tDeferred.await(lifecycle.ended).pipe(\n\t\t\t\t\tEffect.matchCauseEffect({\n\t\t\t\t\t\tonSuccess: () => application.value.finish(Exit.void),\n\t\t\t\t\t\tonFailure: (cause) =>\n\t\t\t\t\t\t\tapplication.value.finish(Exit.failCause(cause)),\n\t\t\t\t\t}),\n\t\t\t\t),\n\t\t\t)\n\t\t}\n\t\tconst fail = yield* boundary(\"runner\")\n\t\tyield* follow(fork, (cause) =>\n\t\t\t(Option.isSome(application) && !Cause.hasInterruptsOnly(cause)\n\t\t\t\t? application.value.finish(Exit.failCause(cause))\n\t\t\t\t: Effect.void\n\t\t\t).pipe(Effect.andThen(fail(cause))),\n\t\t)\n\t}),\n})\n"],"mappings":"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"}
|
package/dist/runner/stdio.d.ts
CHANGED
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
import { Schema } from "effect";
|
|
2
|
+
import { Graft, Plugin } from "@graftland/graft";
|
|
2
3
|
export declare const Config: Schema.Struct<{
|
|
3
4
|
readonly auth: Schema.optionalKey<Schema.Never>;
|
|
4
5
|
}>;
|
|
5
|
-
declare const _default:
|
|
6
|
+
declare const _default: Plugin.Definition<{
|
|
7
|
+
readonly auth?: never;
|
|
8
|
+
}, {
|
|
9
|
+
readonly auth?: never;
|
|
10
|
+
}, Schema.SchemaError | Graft.ServiceConflict>;
|
|
6
11
|
export { _default as default };
|
|
7
12
|
//# sourceMappingURL=stdio.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stdio.d.ts","names":[],"sources":["../../src/runner/stdio.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"stdio.d.ts","names":[],"sources":["../../src/runner/stdio.ts"],"mappings":";;qBAkBa,QAAM,OAAA"}
|
package/dist/runner/stdio.js
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { u as TransportError } from "../Errors-DYhsGZcZ.js";
|
|
4
|
-
import { r as scoped } from "../release-DfZPuIcK.js";
|
|
1
|
+
import { TransportError } from "../Errors.js";
|
|
2
|
+
import { Listener } from "../Transport.js";
|
|
5
3
|
import { Cause, Deferred, Effect, Exit, Option, Schema, Sink, Stdio, Stream } from "effect";
|
|
6
|
-
|
|
4
|
+
import { Graft, Plugin } from "@graftland/graft";
|
|
5
|
+
import * as Release from "@graftland/graft/Release";
|
|
6
|
+
// src/runner/stdio.ts
|
|
7
7
|
const Config = Schema.Struct({ auth: Schema.optionalKey(Schema.Never) });
|
|
8
|
-
var stdio_default = make({
|
|
8
|
+
var stdio_default = Plugin.make({
|
|
9
9
|
name: "remote-stdio-listener",
|
|
10
10
|
config: Config,
|
|
11
11
|
inject: [Stdio.Stdio],
|
|
12
12
|
apply: Effect.fnUntraced(function* () {
|
|
13
13
|
const stdio = yield* Stdio.Stdio;
|
|
14
|
-
yield* provide(Listener, {
|
|
14
|
+
yield* Graft.provide(Listener, {
|
|
15
15
|
properties: {
|
|
16
16
|
protocol: "stdio",
|
|
17
17
|
encrypted: false,
|
|
@@ -23,17 +23,19 @@ var stdio_default = make({
|
|
|
23
23
|
const eof = yield* Deferred.make();
|
|
24
24
|
const channel = {
|
|
25
25
|
input: stdio.stdin.pipe(Stream.onExit((exit) => Exit.isSuccess(exit) ? Deferred.succeed(eof, void 0) : Effect.void), Stream.mapError((error) => TransportError.make({ cause: Cause.fail(error) }))),
|
|
26
|
-
output: stdio.stdout({ endOnDone: false }).pipe(Sink.mapError((error) => TransportError.make({ cause: Cause.fail(error) })))
|
|
26
|
+
output: stdio.stdout({ endOnDone: false }).pipe(Sink.mapError((error) => TransportError.make({ cause: Cause.fail(error) })), Sink.onExit((exit) => Exit.isFailure(exit) && !Cause.hasInterruptsOnly(exit.cause) ? Deferred.failCause(eof, exit.cause) : Effect.void))
|
|
27
27
|
};
|
|
28
28
|
return {
|
|
29
29
|
ready: Deferred.await(ready),
|
|
30
30
|
serve: (accept) => accept({
|
|
31
31
|
authorization: Option.none(),
|
|
32
32
|
certificate: Option.none()
|
|
33
|
-
}).pipe(Effect.mapError((error) => TransportError.make({ cause: Cause.fail(error) })), Effect.flatMap((session) => Deferred.succeed(ready, void 0).pipe(Effect.andThen(session(channel)))), scoped, Effect.andThen(Deferred.await(eof)))
|
|
33
|
+
}).pipe(Effect.mapError((error) => TransportError.make({ cause: Cause.fail(error) })), Effect.flatMap((session) => Deferred.succeed(ready, void 0).pipe(Effect.andThen(session(channel)))), Release.scoped, Effect.andThen(Deferred.await(eof)))
|
|
34
34
|
};
|
|
35
35
|
})
|
|
36
36
|
});
|
|
37
37
|
})
|
|
38
38
|
});
|
|
39
39
|
export { Config, stdio_default as default };
|
|
40
|
+
|
|
41
|
+
//# sourceMappingURL=stdio.js.map
|
package/dist/runner/stdio.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stdio.js","names":[
|
|
1
|
+
{"version":3,"file":"stdio.js","names":[],"sources":["../../src/runner/stdio.ts"],"sourcesContent":["import {\n\tCause,\n\tDeferred,\n\tEffect,\n\tExit,\n\tOption,\n\tSchema,\n\tSink,\n\tStdio,\n\tStream,\n} from \"effect\"\n\nimport { Graft, Plugin } from \"@graftland/graft\"\nimport * as Release from \"@graftland/graft/Release\"\n\nimport { TransportError } from \"../Errors\"\nimport { Listener, type Accept } from \"../Transport\"\n\nexport const Config = Schema.Struct({ auth: Schema.optionalKey(Schema.Never) })\nexport default Plugin.make({\n\tname: \"remote-stdio-listener\",\n\tconfig: Config,\n\tinject: [Stdio.Stdio],\n\tapply: Effect.fnUntraced(function* () {\n\t\tconst stdio = yield* Stdio.Stdio\n\t\tyield* Graft.provide(Listener, {\n\t\t\tproperties: {\n\t\t\t\tprotocol: \"stdio\",\n\t\t\t\tencrypted: false,\n\t\t\t\tnetwork: false,\n\t\t\t\tcarries: [],\n\t\t\t},\n\t\t\tbind: Effect.fnUntraced(function* () {\n\t\t\t\tconst ready = yield* Deferred.make<void>()\n\t\t\t\tconst eof = yield* Deferred.make<void, TransportError>()\n\t\t\t\tconst channel = {\n\t\t\t\t\tinput: stdio.stdin.pipe(\n\t\t\t\t\t\tStream.onExit((exit) =>\n\t\t\t\t\t\t\tExit.isSuccess(exit)\n\t\t\t\t\t\t\t\t? Deferred.succeed(eof, undefined)\n\t\t\t\t\t\t\t\t: Effect.void,\n\t\t\t\t\t\t),\n\t\t\t\t\t\tStream.mapError((error) =>\n\t\t\t\t\t\t\tTransportError.make({ cause: Cause.fail(error) }),\n\t\t\t\t\t\t),\n\t\t\t\t\t),\n\t\t\t\t\toutput: stdio.stdout({ endOnDone: false }).pipe(\n\t\t\t\t\t\tSink.mapError((error) =>\n\t\t\t\t\t\t\tTransportError.make({ cause: Cause.fail(error) }),\n\t\t\t\t\t\t),\n\t\t\t\t\t\tSink.onExit((exit) =>\n\t\t\t\t\t\t\tExit.isFailure(exit) && !Cause.hasInterruptsOnly(exit.cause)\n\t\t\t\t\t\t\t\t? Deferred.failCause(eof, exit.cause)\n\t\t\t\t\t\t\t\t: Effect.void,\n\t\t\t\t\t\t),\n\t\t\t\t\t),\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\tready: Deferred.await(ready),\n\t\t\t\t\tserve: (accept: Accept) =>\n\t\t\t\t\t\taccept({\n\t\t\t\t\t\t\tauthorization: Option.none(),\n\t\t\t\t\t\t\tcertificate: Option.none(),\n\t\t\t\t\t\t}).pipe(\n\t\t\t\t\t\t\tEffect.mapError((error) =>\n\t\t\t\t\t\t\t\tTransportError.make({ cause: Cause.fail(error) }),\n\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\tEffect.flatMap((session) =>\n\t\t\t\t\t\t\t\tDeferred.succeed(ready, undefined).pipe(\n\t\t\t\t\t\t\t\t\tEffect.andThen(session(channel)),\n\t\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\tRelease.scoped,\n\t\t\t\t\t\t\t// Successful session completion alone is not EOF.\n\t\t\t\t\t\t\tEffect.andThen(Deferred.await(eof)),\n\t\t\t\t\t\t),\n\t\t\t\t}\n\t\t\t}),\n\t\t})\n\t}),\n})\n"],"mappings":";;;;;;AAkBA,MAAa,SAAS,OAAO,OAAO,EAAE,MAAM,OAAO,YAAY,OAAO,KAAK,EAAE,CAAC;AAC9E,IAAA,gBAAe,OAAO,KAAK;CAC1B,MAAM;CACN,QAAQ;CACR,QAAQ,CAAC,MAAM,KAAK;CACpB,OAAO,OAAO,WAAW,aAAa;EACrC,MAAM,QAAQ,OAAO,MAAM;EAC3B,OAAO,MAAM,QAAQ,UAAU;GAC9B,YAAY;IACX,UAAU;IACV,WAAW;IACX,SAAS;IACT,SAAS,CAAC;GACX;GACA,MAAM,OAAO,WAAW,aAAa;IACpC,MAAM,QAAQ,OAAO,SAAS,KAAW;IACzC,MAAM,MAAM,OAAO,SAAS,KAA2B;IACvD,MAAM,UAAU;KACf,OAAO,MAAM,MAAM,KAClB,OAAO,QAAQ,SACd,KAAK,UAAU,IAAI,IAChB,SAAS,QAAQ,KAAK,KAAA,CAAS,IAC/B,OAAO,IACX,GACA,OAAO,UAAU,UAChB,eAAe,KAAK,EAAE,OAAO,MAAM,KAAK,KAAK,EAAE,CAAC,CACjD,CACD;KACA,QAAQ,MAAM,OAAO,EAAE,WAAW,MAAM,CAAC,CAAC,CAAC,KAC1C,KAAK,UAAU,UACd,eAAe,KAAK,EAAE,OAAO,MAAM,KAAK,KAAK,EAAE,CAAC,CACjD,GACA,KAAK,QAAQ,SACZ,KAAK,UAAU,IAAI,KAAK,CAAC,MAAM,kBAAkB,KAAK,KAAK,IACxD,SAAS,UAAU,KAAK,KAAK,KAAK,IAClC,OAAO,IACX,CACD;IACD;IACA,OAAO;KACN,OAAO,SAAS,MAAM,KAAK;KAC3B,QAAQ,WACP,OAAO;MACN,eAAe,OAAO,KAAK;MAC3B,aAAa,OAAO,KAAK;KAC1B,CAAC,CAAC,CAAC,KACF,OAAO,UAAU,UAChB,eAAe,KAAK,EAAE,OAAO,MAAM,KAAK,KAAK,EAAE,CAAC,CACjD,GACA,OAAO,SAAS,YACf,SAAS,QAAQ,OAAO,KAAA,CAAS,CAAC,CAAC,KAClC,OAAO,QAAQ,QAAQ,OAAO,CAAC,CAChC,CACD,GACA,QAAQ,QAER,OAAO,QAAQ,SAAS,MAAM,GAAG,CAAC,CACnC;IACF;GACD,CAAC;EACF,CAAC;CACF,CAAC;AACF,CAAC"}
|
package/dist/runner/unix.d.ts
CHANGED
|
@@ -1,7 +1,12 @@
|
|
|
1
1
|
import { Schema } from "effect";
|
|
2
|
+
import { Graft, Plugin } from "@graftland/graft";
|
|
2
3
|
export declare const Config: Schema.Struct<{
|
|
3
4
|
readonly path: Schema.String;
|
|
4
5
|
}>;
|
|
5
|
-
declare const _default:
|
|
6
|
+
declare const _default: Plugin.Definition<{
|
|
7
|
+
readonly path: string;
|
|
8
|
+
}, {
|
|
9
|
+
readonly path: string;
|
|
10
|
+
}, Schema.SchemaError | Graft.ServiceConflict>;
|
|
6
11
|
export { _default as default };
|
|
7
12
|
//# sourceMappingURL=unix.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unix.d.ts","names":[],"sources":["../../src/runner/unix.ts"],"mappings":"
|
|
1
|
+
{"version":3,"file":"unix.d.ts","names":[],"sources":["../../src/runner/unix.ts"],"mappings":";;qBAYa,QAAM,OAAA"}
|
package/dist/runner/unix.js
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import { u as TransportError } from "../Errors-DYhsGZcZ.js";
|
|
5
|
-
import { t as bind } from "../websocketServer-NQhODlEt.js";
|
|
1
|
+
import { TransportError } from "../Errors.js";
|
|
2
|
+
import { bind } from "../internal/websocketServer.js";
|
|
3
|
+
import { Listener } from "../Transport.js";
|
|
6
4
|
import { Cause, Console, Effect, Option, Path, Schema } from "effect";
|
|
5
|
+
import { Graft, Plugin } from "@graftland/graft";
|
|
6
|
+
import { ConfigDirectory } from "@graftland/loader";
|
|
7
7
|
import { createServer } from "node:http";
|
|
8
|
-
//
|
|
8
|
+
// src/runner/unix.ts
|
|
9
9
|
const Config = Schema.Struct({ path: Schema.String });
|
|
10
10
|
const Listening = Schema.fromJsonString(Schema.Struct({
|
|
11
11
|
event: Schema.Literal("Listening"),
|
|
12
12
|
path: Schema.String
|
|
13
13
|
}));
|
|
14
|
-
var unix_default = make({
|
|
14
|
+
var unix_default = Plugin.make({
|
|
15
15
|
name: "remote-unix-listener",
|
|
16
16
|
config: Config,
|
|
17
17
|
inject: [Path.Path],
|
|
@@ -19,7 +19,7 @@ var unix_default = make({
|
|
|
19
19
|
const path = yield* Path.Path;
|
|
20
20
|
const directory = yield* ConfigDirectory;
|
|
21
21
|
const socket = path.resolve(Option.getOrElse(directory, () => "."), config.path);
|
|
22
|
-
yield* provide(Listener, {
|
|
22
|
+
yield* Graft.provide(Listener, {
|
|
23
23
|
properties: {
|
|
24
24
|
protocol: "unix",
|
|
25
25
|
encrypted: false,
|
|
@@ -40,3 +40,5 @@ var unix_default = make({
|
|
|
40
40
|
})
|
|
41
41
|
});
|
|
42
42
|
export { Config, unix_default as default };
|
|
43
|
+
|
|
44
|
+
//# sourceMappingURL=unix.js.map
|
package/dist/runner/unix.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unix.js","names":["Server.bind"],"sources":["../../src/runner/unix.ts"],"sourcesContent":["
|
|
1
|
+
{"version":3,"file":"unix.js","names":["Server.bind"],"sources":["../../src/runner/unix.ts"],"sourcesContent":["// @effect-diagnostics-next-line nodeBuiltinImport:off -- NodeHttpServer takes a factory for an HTTP/1.1 server on the Unix socket\nimport { createServer } from \"node:http\"\n\nimport { Cause, Console, Effect, Option, Path, Schema } from \"effect\"\n\nimport { Graft, Plugin } from \"@graftland/graft\"\nimport { ConfigDirectory } from \"@graftland/loader\"\n\nimport { TransportError } from \"../Errors\"\nimport * as Server from \"../internal/websocketServer\"\nimport { Listener } from \"../Transport\"\n\nexport const Config = Schema.Struct({ path: Schema.String })\nconst Listening = Schema.fromJsonString(\n\tSchema.Struct({ event: Schema.Literal(\"Listening\"), path: Schema.String }),\n)\nexport default Plugin.make({\n\tname: \"remote-unix-listener\",\n\tconfig: Config,\n\tinject: [Path.Path],\n\tapply: Effect.fnUntraced(function* (config) {\n\t\tconst path = yield* Path.Path\n\t\tconst directory = yield* ConfigDirectory\n\t\tconst socket = path.resolve(\n\t\t\tOption.getOrElse(directory, () => \".\"),\n\t\t\tconfig.path,\n\t\t)\n\t\tyield* Graft.provide(Listener, {\n\t\t\tproperties: {\n\t\t\t\tprotocol: \"unix\",\n\t\t\t\tencrypted: false,\n\t\t\t\tnetwork: false,\n\t\t\t\tcarries: [\"header\"],\n\t\t\t},\n\t\t\t// Node rejects an occupied path and removes its own socket file when the server closes.\n\t\t\tbind: () =>\n\t\t\t\tServer.bind(createServer, { path: socket }).pipe(\n\t\t\t\t\tEffect.mapBoth({\n\t\t\t\t\t\tonSuccess: (server) => ({\n\t\t\t\t\t\t\tserve: server.serve,\n\t\t\t\t\t\t\tready: server.ready.pipe(\n\t\t\t\t\t\t\t\tEffect.andThen(\n\t\t\t\t\t\t\t\t\tSchema.encodeEffect(Listening)({\n\t\t\t\t\t\t\t\t\t\tevent: \"Listening\",\n\t\t\t\t\t\t\t\t\t\tpath: socket,\n\t\t\t\t\t\t\t\t\t}).pipe(Effect.orDie, Effect.flatMap(Console.log)),\n\t\t\t\t\t\t\t\t),\n\t\t\t\t\t\t\t),\n\t\t\t\t\t\t}),\n\t\t\t\t\t\tonFailure: (error) =>\n\t\t\t\t\t\t\tTransportError.make({ cause: Cause.fail(error) }),\n\t\t\t\t\t}),\n\t\t\t\t),\n\t\t})\n\t}),\n})\n"],"mappings":";;;;;;;;AAYA,MAAa,SAAS,OAAO,OAAO,EAAE,MAAM,OAAO,OAAO,CAAC;AAC3D,MAAM,YAAY,OAAO,eACxB,OAAO,OAAO;CAAE,OAAO,OAAO,QAAQ,WAAW;CAAG,MAAM,OAAO;AAAO,CAAC,CAC1E;AACA,IAAA,eAAe,OAAO,KAAK;CAC1B,MAAM;CACN,QAAQ;CACR,QAAQ,CAAC,KAAK,IAAI;CAClB,OAAO,OAAO,WAAW,WAAW,QAAQ;EAC3C,MAAM,OAAO,OAAO,KAAK;EACzB,MAAM,YAAY,OAAO;EACzB,MAAM,SAAS,KAAK,QACnB,OAAO,UAAU,iBAAiB,GAAG,GACrC,OAAO,IACR;EACA,OAAO,MAAM,QAAQ,UAAU;GAC9B,YAAY;IACX,UAAU;IACV,WAAW;IACX,SAAS;IACT,SAAS,CAAC,QAAQ;GACnB;GAEA,YACCA,KAAY,cAAc,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAC3C,OAAO,QAAQ;IACd,YAAY,YAAY;KACvB,OAAO,OAAO;KACd,OAAO,OAAO,MAAM,KACnB,OAAO,QACN,OAAO,aAAa,SAAS,CAAC,CAAC;MAC9B,OAAO;MACP,MAAM;KACP,CAAC,CAAC,CAAC,KAAK,OAAO,OAAO,OAAO,QAAQ,QAAQ,GAAG,CAAC,CAClD,CACD;IACD;IACA,YAAY,UACX,eAAe,KAAK,EAAE,OAAO,MAAM,KAAK,KAAK,EAAE,CAAC;GAClD,CAAC,CACF;EACF,CAAC;CACF,CAAC;AACF,CAAC"}
|