@graftland/plugin-remote 0.2.0-beta.2 → 0.3.1

package/src/internal/credentials.ts

@@ -15,9 +15,11 @@ export type Source<A, D extends ReadonlyArray<Plugin.Dependency>, E = unknown> =
 				NoInfer<Plugin.Required<D>> | Scope.Scope
 			>
 	  }
-type Token<D extends ReadonlyArray<Plugin.Dependency>> =
+/** A token value, a file, or a credential effect with declared dependencies. */
+export type Token<D extends ReadonlyArray<Plugin.Dependency>> =
 	string | { readonly file: string } | Source<Redacted.Redacted<string>, D>
-type Authentication<D extends ReadonlyArray<Plugin.Dependency>> =
+/** Authentication configuration shared by TypeScript connection descriptions. */
+export type Authentication<D extends ReadonlyArray<Plugin.Dependency>> =
 	| { readonly name: string; readonly config?: unknown }
 	| { readonly none: { readonly identity?: string } }
 	| {
@@ -27,14 +29,15 @@ type Authentication<D extends ReadonlyArray<Plugin.Dependency>> =
 	  }
 	| { readonly bearer: { readonly token: Token<D> } }
 	| { readonly jwt: { readonly token: Token<D> } }
-type WithCredentials<C, D extends ReadonlyArray<Plugin.Dependency>> = C extends
-	| { readonly local: object }
-	| { readonly worker: object }
-	| { readonly command: ReadonlyArray<string> }
-	? C
-	: Omit<C, "auth"> & { readonly auth?: Authentication<D> }
 export type Connect<D extends ReadonlyArray<Plugin.Dependency> = readonly []> =
-	WithCredentials<typeof Configuration.Connect.Encoded, D>
+	typeof Configuration.Connect.Encoded extends infer C
+		? C extends
+				| { readonly local: object }
+				| { readonly worker: object }
+				| { readonly command: ReadonlyArray<string> }
+			? C
+			: Omit<C, "auth"> & { readonly auth?: Authentication<D> }
+		: never
 
 const provider = <A, E, D extends ReadonlyArray<Plugin.Dependency>>(
 	source: Source<A, D, E>,

package/src/internal/entry.ts

@@ -12,7 +12,7 @@ import {
 } from "effect"
 import { ChildProcessSpawner } from "effect/process"
 import * as Contract from "../Contract"
-import { MissingInstance } from "../Errors"
+import { MissingInstance, RemoteEntryError as EntryError } from "../Errors"
 import { LocalTransport, WorkerTransport } from "./directTransport"
 import * as Configuration from "./entryConfig"
 import * as Assembly from "./assembly"
@@ -25,19 +25,6 @@ import type { ExecutionOptions } from "./execution"
 import * as Importer from "./importer"
 import { SecureRandom } from "effect/crypto"
 
-export class EntryError extends Schema.TaggedError<
-	EntryError,
-	{ readonly brand: unique symbol }
->()("RemoteEntryError", {
-	entry: Schema.Option(Schema.String),
-	directory: Schema.Option(Schema.String),
-	field: Schema.String,
-	cause: Schema.Cause(Schema.Unknown, Schema.Unknown),
-}) {
-	override get message() {
-		return `Remote entry ${Option.getOrElse(this.entry, () => "<programmatic>")} failed at ${this.field}`
-	}
-}
 export const boundary = Effect.fnUntraced(function* (field: string) {
 	const entry = yield* Entry.CurrentId
 	const directory = yield* ConfigDirectory

package/src/internal/execution.ts

@@ -15,6 +15,7 @@ import * as Host from "./host"
 import { RemoteWithdrawn, RemoteError, MissingInstance } from "../Errors"
 import * as Contract from "../Contract"
 import * as Control from "./control"
+import { prepare } from "./contract"
 
 export interface ExecutionOptions {
 	readonly contractModule: string
@@ -65,6 +66,7 @@ export const executionPlugin = <
 		config: Schema.toEncoded(contract.config),
 		apply: (input) =>
 			Effect.gen(function* () {
+				const prepared = prepare(contract)
 				const random = yield* SecureRandom.SecureRandom
 				const session = yield* random.uuidV4()
 				const active = yield* Connection.acquire(
@@ -75,10 +77,10 @@ export const executionPlugin = <
 						serve: Services.endpoints(contract.inject),
 						call: {
 							...Services.endpoints(contract.provides),
-							[Control.endpoint]: contract.control,
+							[Control.endpoint]: prepared.control,
 						},
 					},
-					Host.initialize(contract),
+					Host.initialize(prepared),
 					Host.dispose,
 					options.shutdownTimeout ?? "5 seconds",
 				)

package/src/internal/host.ts

@@ -16,15 +16,16 @@ import { RemoteWithdrawn } from "../Errors"
 import * as Control from "./control"
 import { cleanupCause } from "./cleanup"
 import { Connection } from "./runner/Connection"
-import type { Service } from "./services"
+import type { Service } from "../Contract"
+import type { ChildFailure } from "./childErrors"
+import type { prepare } from "./contract"
 
 type ErrorSchema = Schema.Top & {
 	readonly DecodingServices: never
 	readonly EncodingServices: never
 }
-type ControlGroup<E extends ErrorSchema> = ContractModule.Contract<
-	Schema.Codec<unknown, Schema.Json>,
-	E
+type ControlGroup<E extends ErrorSchema> = ReturnType<
+	typeof prepare<Schema.Codec<unknown, Schema.Json>, E>
 >["control"]
 interface Contract<E extends ErrorSchema> {
 	readonly control: ControlGroup<E>
@@ -32,9 +33,7 @@ interface Contract<E extends ErrorSchema> {
 	readonly decodeCause: (
 		input: unknown,
 	) => Effect.Effect<
-		Cause.Cause<
-			E["Type"] | ContractModule.UndeclaredFailure | ContractModule.ChildFailure
-		>,
+		Cause.Cause<E["Type"] | ContractModule.UndeclaredFailure | ChildFailure>,
 		Schema.SchemaError
 	>
 }
@@ -57,7 +56,7 @@ const forwardEvents = <E extends ErrorSchema>(
 		const remoteFailure = yield* FailureGroup.make<
 			| E["Type"]
 			| ContractModule.UndeclaredFailure
-			| ContractModule.ChildFailure
+			| ChildFailure
 			| RemoteWithdrawn
 		>()
 		const events = yield* race(
@@ -179,9 +178,7 @@ export const load = <E extends ErrorSchema>(
 						(
 							cause,
 						): cause is Cause.Cause<
-							| E["Type"]
-							| ContractModule.UndeclaredFailure
-							| ContractModule.ChildFailure
+							E["Type"] | ContractModule.UndeclaredFailure | ChildFailure
 						> => Cause.isCause(cause),
 						Effect.failCause,
 					),

package/src/internal/services.ts

@@ -1,27 +1,9 @@
 import { Array, Context, Effect, Record } from "effect"
 import { Graft } from "@graftland/graft"
 import { RpcClient, RpcServer } from "effect/rpc"
-import type { Scope } from "effect"
 import type { Rpc, RpcClientError, RpcGroup } from "effect/rpc"
-import type * as Port from "./port"
+import type { Service } from "../Contract"
 
-type Peer = Port.Port
-
-/** RPC types stay inside the descriptor; Graft supplies its dynamic activation context. */
-export interface Service<R = never, ClientR = never> {
-	readonly key: Context.Key<unknown, unknown>
-	readonly group: Pick<RpcGroup.RpcGroup<Rpc.Any>, "requests">
-	readonly serve: (
-		port: Pick<Peer, "serverProtocol">,
-	) => Effect.Effect<never, never, R>
-	readonly publish: (
-		port: Pick<Peer, "clientProtocol">,
-	) => Effect.Effect<
-		void,
-		Graft.ServiceConflict,
-		Graft.Graft | Scope.Scope | ClientR
-	>
-}
 export const service = <
 	I,
 	S,

package/dist/connectionEnded-DUgcobEd.js

@@ -1,9 +0,0 @@
-import { c as TransportError } from "./Errors-oPsTLY7l.js";
-import { t as EndOfStream } from "./Framing-zaYdOJnT.js";
-import { t as Peer } from "./Peer-IJgFK6mD.js";
-import { Array, Cause, Effect, Schema } from "effect";
-import { Socket } from "effect/socket";
-// packages/remote/src/internal/runner/connectionEnded.ts
-const closedNormally = (cause) => cause.reasons.length > 0 && Array.every(cause.reasons, (reason) => reason._tag === "Fail" && (Schema.is(TransportError)(reason.error) ? closedNormally(reason.error.cause) : Schema.is(EndOfStream)(reason.error) || Socket.isSocketError(reason.error) && reason.error.reason._tag === "SocketCloseError" && reason.error.reason.code === 1e3));
-const connectionEnded = (cause) => Cause.hasInterruptsOnly(cause) || closedNormally(cause) ? Effect.void : Effect.flatMap(Peer, (identity) => Effect.logWarning("Remote host connection failed", cause).pipe(Effect.annotateLogs({ "remote.peer": identity })));
-export { connectionEnded as n, closedNormally as t };

package/dist/internal/childErrors.d.ts

@@ -1,33 +0,0 @@
-import { Schema } from "effect";
-declare const AlreadyLoaded_base: Schema.Class<AlreadyLoaded, Schema.TaggedStruct<"AlreadyLoaded", {}>, import("effect/Cause").YieldableError & {
-  readonly brand: unique symbol;
-}>;
-export declare class AlreadyLoaded extends AlreadyLoaded_base {}
-declare const ContractNotFound_base: Schema.Class<ContractNotFound, Schema.TaggedStruct<"ContractNotFound", {
-  readonly module: Schema.String;
-}>, import("effect/Cause").YieldableError & {
-  readonly brand: unique symbol;
-}>;
-export declare class ContractNotFound extends ContractNotFound_base {
-  get message(): string;
-}
-declare const ModuleImportFailed_base: Schema.Class<ModuleImportFailed, Schema.TaggedStruct<"ModuleImportFailed", {
-  readonly module: Schema.String;
-  readonly cause: Schema.Defect;
-}>, import("effect/Cause").YieldableError & {
-  readonly brand: unique symbol;
-}>;
-export declare class ModuleImportFailed extends ModuleImportFailed_base {}
-declare const ActivationFailed_base: Schema.Class<ActivationFailed, Schema.TaggedStruct<"ActivationFailed", {
-  readonly detail: Schema.String;
-  readonly cause: Schema.optionalKey<Schema.Cause<Schema.Defect, Schema.Defect>>;
-}>, import("effect/Cause").YieldableError & {
-  readonly brand: unique symbol;
-}>;
-export declare class ActivationFailed extends ActivationFailed_base {
-  get message(): string;
-}
-export declare const ChildFailure: Schema.Union<readonly [typeof AlreadyLoaded, typeof ContractNotFound, typeof ModuleImportFailed, typeof ActivationFailed]>;
-export type ChildFailure = typeof ChildFailure.Type;
-export {};
-//# sourceMappingURL=childErrors.d.ts.map

package/dist/internal/childErrors.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"childErrors.d.ts","names":[],"sources":["../../src/internal/childErrors.ts"],"mappings":";;WAImB;;qBAFN,sBAAsB;;;;WAMhB;;qBAFN,yBAAyB;MAIxB;;;;;;WAMK;;qBAFN,2BAA2B;;;;;WASrB;;qBAFN,yBAAyB;MAYxB;;qBAID,cAAY,OAAA,uBAAA,sBAAA,yBAAA,2BAAA;YAMb,sBAAsB,aAAa"}

package/dist/internal/port.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"port.d.ts","names":[],"sources":["../../src/internal/port.ts"],"mappings":";;;;;iBAgDiB;WACP,iBAAiB,qBAAqB,UAAU;WAChD,iBAAiB,qBAAqB,UAAU;WAChD,OAAO,OAAO,cAAc;WAC5B,OAAO,OAAO,mBAAmB,OAAO;WACxC,KAAK,OAAO,aAAa"}

package/dist/internal/runner/Framing.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Framing.d.ts","names":[],"sources":["../../../src/internal/runner/Framing.ts"],"mappings":";;;;WAImB;;qBAFN,mBAAmB;MAIlB"}