@yielded/agent-storage-cloudflare 0.1.0-beta.167 → 0.1.0-beta.169

package/src/DoSubscriptionStore.ts

@@ -1,5 +1,3 @@
-import { BrowserCrypto } from "@effect/platform-browser";
-import { upgradeV2Subscriptions } from "@yielded/agent-storage-sql/sql-storage-v2-upgrade";
 import { makeSqlSubscriptionStore } from "@yielded/agent-storage-sql/sql-subscription-store";
 import {
   SourcePartition,
@@ -66,7 +64,7 @@ const validate = <A, I>(schema: Schema.Codec<A, I>, value: unknown, code: string
 const decodeRows = <A, I>(schema: Schema.Codec<A, I>, rows: unknown, code: string) =>
   Schema.decodeUnknownEffect(Schema.Array(schema))(rows).pipe(Effect.mapError(() => corrupt(code)));
 
-const initializeDoSubscriptionStore = Effect.fn("DoSubscriptionStore.initialize")(function* () {
+const initializeDoSubscriptionStore = Effect.fnUntraced(function* () {
   const sql = yield* SqlClientService.SqlClient;
 
   const names = yield* sql<Record<string, unknown>>`
@@ -153,44 +151,6 @@ const initializeDoSubscriptionStore = Effect.fn("DoSubscriptionStore.initialize"
 
   const state = yield* decodeRows(StoreStateRow, rows, "read subscription storage version");
 
-  if (state.length === 1 && state[0].storage_version === 2) {
-    const failpoint = yield* SubscriptionFailpoint;
-
-    yield* sql
-      .withTransaction(
-        Effect.gen(function* () {
-          const current = yield* sql<{
-            storage_version: number;
-          }>`SELECT storage_version FROM effect_agent_subscription_store_state WHERE singleton=1`;
-
-          if (current.length === 1 && current[0].storage_version === 3) return;
-          if (current.length !== 1 || current[0].storage_version !== 2)
-            return yield* corrupt("subscription version changed during upgrade");
-          yield* upgradeV2Subscriptions(1_900_000);
-          yield* failpoint.hit("upgrade:before-version");
-          yield* sql`UPDATE effect_agent_subscription_store_state SET storage_version=3 WHERE singleton=1`;
-          yield* failpoint.hit("upgrade:after-version");
-        }),
-      )
-      .pipe(
-        Effect.provide(BrowserCrypto.layer),
-        Effect.catchTag("StorageUpgradeError", (error) =>
-          SubscriptionError.make({
-            reason: "corrupt",
-            code: "upgrade-v2-subscriptions",
-            cause: error,
-          }),
-        ),
-        Effect.catchTag("SqlError", () => unavailable("upgrade v2 subscriptions")),
-        Effect.catchTag("SchemaError", () => corrupt("upgrade v2 subscription encoding")),
-        Effect.catchTag("SubscriptionFailpointError", () =>
-          unavailable("upgrade v2 subscriptions failpoint"),
-        ),
-      );
-
-    return;
-  }
-
   if (state.length !== 1 || state[0].storage_version !== CURRENT_SUBSCRIPTION_STORE_VERSION)
     return yield* corrupt(
       state.length === 1
@@ -199,9 +159,7 @@ const initializeDoSubscriptionStore = Effect.fn("DoSubscriptionStore.initialize"
     );
 });
 
-const makeSubscriptionStore = Effect.fn("DoSubscriptionStore.make")(function* (
-  owned: SourcePartition,
-) {
+const makeSubscriptionStore = Effect.fnUntraced(function* (owned: SourcePartition) {
   const partition = yield* validate(SourcePartition, owned, "partition");
   const sql = yield* SqlClientService.SqlClient;
   const failpoint = yield* SubscriptionFailpoint;
@@ -214,7 +172,7 @@ const makeSubscriptionStore = Effect.fn("DoSubscriptionStore.make")(function* (
     code: string,
   ) => effect.pipe(Effect.mapError(() => unavailable(code)));
 
-  const readIndexedDeadline = Effect.fn("DoSubscriptionStore.readIndexedDeadline")(function* () {
+  const readIndexedDeadline = Effect.fnUntraced(function* () {
     const scanRows = yield* query(
       sql<Record<string, unknown>>`
       SELECT event_scan_cursor, delivery_scan_cursor, recovery_scan_cursor FROM effect_agent_subscription_sequences
@@ -262,7 +220,7 @@ const makeSubscriptionStore = Effect.fn("DoSubscriptionStore.make")(function* (
     return decoded[0].deadline;
   });
 
-  const replaceAlarm = Effect.fn("DoSubscriptionStore.replaceAlarm")(function* (
+  const replaceAlarm = Effect.fnUntraced(function* (
     replace: DoSubscriptionReplaceAlarm,
     deadlineAtMillis: number | null,
   ) {
@@ -299,7 +257,7 @@ const makeSubscriptionStore = Effect.fn("DoSubscriptionStore.make")(function* (
     transaction: transact,
   });
 
-  const prearm = Effect.fn("DoSubscriptionStore.prearm")(function* (deadlineAtMillis: number) {
+  const prearm = Effect.fnUntraced(function* (deadlineAtMillis: number) {
     yield* transactions.run((replace) => replaceAlarm(replace, deadlineAtMillis));
     yield* failpoint.hit("subscription:prearm:after");
   });