Skip to content

Commit a74ebe7

Browse files
committed
refactor(relay): preserve FCM service module namespaces
1 parent de997b4 commit a74ebe7

3 files changed

Lines changed: 27 additions & 23 deletions

File tree

‎infra/relay/scripts/android-push-smoke.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import * as Redacted from "effect/Redacted";
88
import * as Schema from "effect/Schema";
99
import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
1010

11-
import { RelayConfiguration } from "../src/Config.ts";
12-
import { FcmClient, layer } from "../src/agentActivity/FcmClient.ts";
11+
import * as RelayConfiguration from "../src/Config.ts";
12+
import * as FcmClient from "../src/agentActivity/FcmClient.ts";
1313

1414
const Device = Schema.Struct({
1515
token: Schema.NonEmptyString,
@@ -54,7 +54,7 @@ const main = Effect.gen(function* () {
5454
: null;
5555
const active = phase === "running" || phase === "approval" || phase === "input";
5656
const now = yield* Clock.currentTimeMillis;
57-
const config: RelayConfiguration["Service"] = {
57+
const config: RelayConfiguration.RelayConfiguration["Service"] = {
5858
relayIssuer: "http://localhost",
5959
fcmServiceAccount: Redacted.make(credentials),
6060
apns: null,
@@ -67,7 +67,7 @@ const main = Effect.gen(function* () {
6767
managedEndpointBaseDomain: undefined,
6868
managedEndpointNamespace: undefined,
6969
};
70-
const result = yield* FcmClient.pipe(
70+
const result = yield* FcmClient.FcmClient.pipe(
7171
Effect.flatMap((client) =>
7272
client.send({
7373
token: device.token,
@@ -101,9 +101,12 @@ const main = Effect.gen(function* () {
101101
}),
102102
),
103103
Effect.provide(
104-
layer.pipe(
104+
FcmClient.layer.pipe(
105105
Layer.provide(
106-
Layer.mergeAll(Layer.succeed(RelayConfiguration, config), FetchHttpClient.layer),
106+
Layer.mergeAll(
107+
Layer.succeed(RelayConfiguration.RelayConfiguration, config),
108+
FetchHttpClient.layer,
109+
),
107110
),
108111
),
109112
),

‎infra/relay/scripts/android-push-watch.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
2121
import { RpcClient, RpcSerialization } from "effect/unstable/rpc";
2222
import * as Socket from "effect/unstable/socket/Socket";
2323

24-
import { RelayConfiguration } from "../src/Config.ts";
24+
import * as RelayConfiguration from "../src/Config.ts";
2525
import { androidActivityData, fitFcmData } from "../src/agentActivity/fcmPayloads.ts";
26-
import { FcmClient, layer as fcmLayer } from "../src/agentActivity/FcmClient.ts";
26+
import * as FcmClient from "../src/agentActivity/FcmClient.ts";
2727
import { androidAlertForState } from "../src/agentActivity/FcmDeliveries.ts";
2828
import { makeAggregateState } from "../src/agentActivity/agentActivityAggregate.ts";
2929

@@ -76,11 +76,11 @@ const main = Effect.gen(function* () {
7676
Layer.provide(Socket.layerWebSocket(connection.wsUrl).pipe(Layer.provide(socketConstructor))),
7777
Layer.provide(RpcSerialization.layerJson),
7878
);
79-
const fcm = fcmLayer.pipe(
79+
const fcm = FcmClient.layer.pipe(
8080
Layer.provide(
8181
Layer.mergeAll(
8282
FetchHttpClient.layer,
83-
Layer.succeed(RelayConfiguration, {
83+
Layer.succeed(RelayConfiguration.RelayConfiguration, {
8484
relayIssuer: "http://localhost",
8585
apns: null,
8686
fcmServiceAccount: Redacted.make(credentials),
@@ -98,7 +98,7 @@ const main = Effect.gen(function* () {
9898
);
9999
yield* Effect.gen(function* () {
100100
const rpc = yield* RpcClient.make(WsRpcGroup);
101-
const sender = yield* FcmClient;
101+
const sender = yield* FcmClient.FcmClient;
102102
const config = yield* rpc[WS_METHODS.serverGetConfig]({});
103103
const projects = new Map<string, OrchestrationProjectShell>();
104104
const threads = new Map<string, OrchestrationThreadShell>();

‎infra/relay/src/agentActivity/FcmDeliveries.ts‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ import * as Layer from "effect/Layer";
1414
import * as Option from "effect/Option";
1515
import * as Schema from "effect/Schema";
1616

17-
import { RelayConfiguration } from "../Config.ts";
18-
import { RelayDb } from "../db.ts";
17+
import * as RelayConfiguration from "../Config.ts";
18+
import * as RelayDb from "../db.ts";
1919
import { relayMobileDevices } from "../persistence/schema.ts";
20-
import { EnvironmentLinks } from "../environments/EnvironmentLinks.ts";
21-
import { AgentActivityRows } from "./AgentActivityRows.ts";
22-
import { LiveActivities, type TargetRow } from "./LiveActivities.ts";
23-
import { FcmClient } from "./FcmClient.ts";
20+
import * as EnvironmentLinks from "../environments/EnvironmentLinks.ts";
21+
import * as AgentActivityRows from "./AgentActivityRows.ts";
22+
import * as LiveActivities from "./LiveActivities.ts";
23+
import type { TargetRow } from "./LiveActivities.ts";
24+
import * as FcmClient from "./FcmClient.ts";
2425
import { androidActivityData, androidActivityHero, fitFcmData } from "./fcmPayloads.ts";
2526
import { makeAggregateState, statusForPhase } from "./agentActivityAggregate.ts";
2627
import { isExpiredAgentActivityState, notificationForActivity } from "./agentActivityPayloads.ts";
@@ -139,13 +140,13 @@ export function androidAlertForAggregate(input: {
139140
}
140141

141142
export const make = Effect.gen(function* () {
142-
const config = yield* RelayConfiguration;
143+
const config = yield* RelayConfiguration.RelayConfiguration;
143144
const sender = yield* FcmDeliveryQueueSender;
144-
const client = yield* FcmClient;
145-
const devices = yield* LiveActivities;
146-
const rows = yield* AgentActivityRows;
147-
const links = yield* EnvironmentLinks;
148-
const db = yield* RelayDb;
145+
const client = yield* FcmClient.FcmClient;
146+
const devices = yield* LiveActivities.LiveActivities;
147+
const rows = yield* AgentActivityRows.AgentActivityRows;
148+
const links = yield* EnvironmentLinks.EnvironmentLinks;
149+
const db = yield* RelayDb.RelayDb;
149150

150151
return FcmDeliveries.of({
151152
enqueue: Effect.fn("relay.fcm.enqueue")(function* (input) {

0 commit comments

Comments
 (0)