@filoz/repair-cli 0.4.0 → 1.0.0

package/dist/src/commands/session-key.d.ts

@@ -1,18 +1,16 @@
 import { Cli, z } from 'incur';
 export declare const sessionKey: Cli.Cli<{}, z.ZodObject<{
-    indexerDb: z.ZodCustom<import("../types.ts").IndexerDatabase, import("../types.ts").IndexerDatabase>;
+    api: z.ZodCustom<import("../types.ts").IndexerApi, import("../types.ts").IndexerApi>;
     localDb: z.ZodCustom<import("../types.ts").LocalDatabase, import("../types.ts").LocalDatabase>;
     config: z.ZodCustom<import("iso-conf").Conf<z.ZodObject<{
         privateKey: z.ZodOptional<z.ZodString>;
-        indexerMainnetUrl: z.ZodOptional<z.ZodURL>;
-        indexerCalibrationUrl: z.ZodOptional<z.ZodURL>;
+        apiUrl: z.ZodOptional<z.ZodURL>;
         chainId: z.ZodOptional<z.ZodNumber>;
         dbPath: z.ZodOptional<z.ZodString>;
         source: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>, import("iso-conf").Conf<z.ZodObject<{
         privateKey: z.ZodOptional<z.ZodString>;
-        indexerMainnetUrl: z.ZodOptional<z.ZodURL>;
-        indexerCalibrationUrl: z.ZodOptional<z.ZodURL>;
+        apiUrl: z.ZodOptional<z.ZodURL>;
         chainId: z.ZodOptional<z.ZodNumber>;
         dbPath: z.ZodOptional<z.ZodString>;
         source: z.ZodOptional<z.ZodString>;

package/dist/src/commands/session-key.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-key.d.ts","sourceRoot":"","sources":["../../../src/commands/session-key.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,OAAO,CAAA;AAS9B,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;6BAGrB,CAAA"}
+{"version":3,"file":"session-key.d.ts","sourceRoot":"","sources":["../../../src/commands/session-key.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,OAAO,CAAA;AAS9B,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;6BAGrB,CAAA"}

package/dist/src/commands/setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/commands/setup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAK,MAAM,OAAO,CAAA;AAqB9B,eAAO,MAAM,KAAK;;;;;;;wBAqIhB,CAAA"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/commands/setup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAK,MAAM,OAAO,CAAA;AAgB9B,eAAO,MAAM,KAAK;;;;;;;wBAmHhB,CAAA"}

package/dist/src/commands/setup.js

@@ -2,19 +2,16 @@ import * as p from '@clack/prompts';
 import { Cli, z } from 'incur';
 import path from 'path';
 import { privateKeyToAccount } from 'viem/accounts';
+import { DEFAULT_API_URL } from "../api.js";
 import { config, createLocalDatabase, globalOptions, migrateLocalDatabase } from "../utils.js";
-function validatePostgresUrl(value) {
-    let url;
+function validateHttpUrl(value) {
     try {
-        url = new URL(value);
+        const url = new URL(value);
+        return url.protocol === 'http:' || url.protocol === 'https:';
     }
     catch {
         return false;
     }
-    if (url.protocol !== 'postgresql:' && url.protocol !== 'postgres:') {
-        return false;
-    }
-    return Boolean(url.hostname && url.username && url.password && url.pathname.length > 1);
 }
 export const setup = Cli.create('setup', {
     description: 'Setup the CLI',
@@ -38,34 +35,17 @@ export const setup = Cli.create('setup', {
                     retryable: false,
                 });
             }
-            const indexerMainnetUrl = await p.text({
-                message: 'Enter your Mainnet Indexer Postgres URL',
-                validate(value) {
-                    if (!value || !validatePostgresUrl(value)) {
-                        return `Invalid postgres URL!`;
-                    }
-                },
-                initialValue: config.get('indexerMainnetUrl'),
-                withGuide: false,
-            });
-            if (p.isCancel(indexerMainnetUrl)) {
-                return c.error({
-                    code: 'SETUP_CANCELLED',
-                    message: 'Setup cancelled',
-                    retryable: false,
-                });
-            }
-            const indexerCalibrationUrl = await p.text({
-                message: 'Enter your Calibration Indexer Postgres URL',
+            const apiUrl = await p.text({
+                message: 'Enter the Filecoin API URL',
                 validate(value) {
-                    if (!value || !validatePostgresUrl(value)) {
-                        return `Invalid postgres URL!`;
+                    if (!value || !validateHttpUrl(value)) {
+                        return `Invalid http(s) URL!`;
                     }
                 },
-                initialValue: config.get('indexerCalibrationUrl'),
+                initialValue: config.get('apiUrl') ?? DEFAULT_API_URL,
                 withGuide: false,
             });
-            if (p.isCancel(indexerCalibrationUrl)) {
+            if (p.isCancel(apiUrl)) {
                 return c.error({
                     code: 'SETUP_CANCELLED',
                     message: 'Setup cancelled',
@@ -115,8 +95,7 @@ export const setup = Cli.create('setup', {
                 });
             }
             config.set('privateKey', pk);
-            config.set('indexerMainnetUrl', indexerMainnetUrl);
-            config.set('indexerCalibrationUrl', indexerCalibrationUrl);
+            config.set('apiUrl', apiUrl);
             config.set('chainId', chainId);
             config.set('dbPath', dbPath);
             config.set('source', source);

package/dist/src/commands/setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/commands/setup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/commands/setup.ts"],"names":[],"mappings":"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"}

package/dist/src/commands/wallet.d.ts

@@ -1,18 +1,16 @@
 import { Cli, z } from 'incur';
 export declare const wallet: Cli.Cli<{}, z.ZodObject<{
-    indexerDb: z.ZodCustom<import("../types.ts").IndexerDatabase, import("../types.ts").IndexerDatabase>;
+    api: z.ZodCustom<import("../types.ts").IndexerApi, import("../types.ts").IndexerApi>;
     localDb: z.ZodCustom<import("../types.ts").LocalDatabase, import("../types.ts").LocalDatabase>;
     config: z.ZodCustom<import("iso-conf").Conf<z.ZodObject<{
         privateKey: z.ZodOptional<z.ZodString>;
-        indexerMainnetUrl: z.ZodOptional<z.ZodURL>;
-        indexerCalibrationUrl: z.ZodOptional<z.ZodURL>;
+        apiUrl: z.ZodOptional<z.ZodURL>;
         chainId: z.ZodOptional<z.ZodNumber>;
         dbPath: z.ZodOptional<z.ZodString>;
         source: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>, import("iso-conf").Conf<z.ZodObject<{
         privateKey: z.ZodOptional<z.ZodString>;
-        indexerMainnetUrl: z.ZodOptional<z.ZodURL>;
-        indexerCalibrationUrl: z.ZodOptional<z.ZodURL>;
+        apiUrl: z.ZodOptional<z.ZodURL>;
         chainId: z.ZodOptional<z.ZodNumber>;
         dbPath: z.ZodOptional<z.ZodString>;
         source: z.ZodOptional<z.ZodString>;

package/dist/src/commands/wallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../../src/commands/wallet.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,OAAO,CAAA;AAM9B,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;6BAGjB,CAAA"}
+{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../../src/commands/wallet.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,OAAO,CAAA;AAM9B,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;6BAGjB,CAAA"}

package/dist/src/db/dedupe-cids.d.ts

@@ -1,20 +1,19 @@
 import type { OperationSelect } from '../local-schema.ts';
-import type { IndexerDatabase, LocalDatabase } from '../types.ts';
-export type SyncPiecesOnchainOptions = {
-    indexerDb: IndexerDatabase;
+import type { LocalDatabase } from '../types.ts';
+export type DedupeCidsOptions = {
     localDb: LocalDatabase;
-    dataSetId: bigint;
+    existingCids: ReadonlySet<string>;
     operations: OperationSelect[];
 };
-export declare function dedupeCids({ indexerDb, localDb, dataSetId, operations }: SyncPiecesOnchainOptions): Promise<{
-    metadata: import("@filoz/synapse-core").MetadataObject;
-    cid: string;
+export declare function dedupeCids({ localDb, existingCids, operations }: DedupeCidsOptions): Promise<{
     id: number;
     status: import("../local-schema.ts").OperationStatus;
     createdAt: number;
     updatedAt: number;
     repairId: number;
     type: import("../local-schema.ts").OperationType;
+    cid: string;
+    metadata: import("@filoz/synapse-core").MetadataObject;
     alternateProvider: string;
     txHash: string | null;
     error: string | null;

package/dist/src/db/dedupe-cids.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dedupe-cids.d.ts","sourceRoot":"","sources":["../../../src/db/dedupe-cids.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAGjE,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,eAAe,CAAA;IAC1B,OAAO,EAAE,aAAa,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,eAAe,EAAE,CAAA;CAC9B,CAAA;AAMD,wBAAsB,UAAU,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,wBAAwB;;;;;;;;;;;;KAgCvG"}
+{"version":3,"file":"dedupe-cids.d.ts","sourceRoot":"","sources":["../../../src/db/dedupe-cids.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAGhD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,aAAa,CAAA;IAEtB,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IACjC,UAAU,EAAE,eAAe,EAAE,CAAA;CAC9B,CAAA;AAMD,wBAAsB,UAAU,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,iBAAiB;;;;;;;;;;;;KAgBxF"}

package/dist/src/db/dedupe-cids.js

@@ -1,18 +1,6 @@
-import { and, eq, inArray } from 'drizzle-orm';
 import { upsertOperations } from "./upsert-operations.js";
-export async function dedupeCids({ indexerDb, localDb, dataSetId, operations }) {
-    const cids = operations.map((operation) => operation.cid);
-    const schema = indexerDb._.fullSchema;
-    const rows = await indexerDb
-        .select({ cid: schema.pieces.cid })
-        .from(schema.pieces)
-        .where(and(eq(schema.pieces.dataSetId, dataSetId), eq(schema.pieces.removed, false), inArray(schema.pieces.cid, cids)));
-    const existingCids = new Set();
-    const completedOperations = [];
-    for (const row of rows) {
-        completedOperations.push(...operations.filter((operation) => operation.cid === row.cid));
-        existingCids.add(row.cid);
-    }
+export async function dedupeCids({ localDb, existingCids, operations }) {
+    const completedOperations = operations.filter((operation) => existingCids.has(operation.cid));
     if (completedOperations.length > 0) {
         await upsertOperations({
             localDb,

package/dist/src/db/dedupe-cids.js.map

@@ -1 +1 @@
-{"version":3,"file":"dedupe-cids.js","sourceRoot":"","sources":["../../../src/db/dedupe-cids.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAG9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAazD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAA4B;IACtG,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;IACzD,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,UAAU,CAAA;IAErC,MAAM,IAAI,GAAG,MAAM,SAAS;SACzB,MAAM,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;SAClC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;SACnB,KAAK,CACJ,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAChH,CAAA;IAEH,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAA;IACtC,MAAM,mBAAmB,GAAsB,EAAE,CAAA;IAEjD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,mBAAmB,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;QACxF,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAC3B,CAAC;IAED,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnC,MAAM,gBAAgB,CAAC;YACrB,OAAO;YACP,UAAU,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;gBAClD,GAAG,SAAS;gBACZ,MAAM,EAAE,WAAW;gBACnB,KAAK,EAAE,IAAI;aACZ,CAAC,CAAC;SACJ,CAAC,CAAA;IACJ,CAAC;IAGD,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;AAC3E,CAAC"}
+{"version":3,"file":"dedupe-cids.js","sourceRoot":"","sources":["../../../src/db/dedupe-cids.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAazD,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAqB;IACvF,MAAM,mBAAmB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;IAE7F,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnC,MAAM,gBAAgB,CAAC;YACrB,OAAO;YACP,UAAU,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;gBAClD,GAAG,SAAS;gBACZ,MAAM,EAAE,WAAW;gBACnB,KAAK,EAAE,IAAI;aACZ,CAAC,CAAC;SACJ,CAAC,CAAA;IACJ,CAAC;IAGD,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;AAC3E,CAAC"}

package/dist/src/db/find-repair-dataset.d.ts

@@ -1,10 +1,10 @@
 import type { Address } from 'viem';
-import type { IndexerDatabase } from '../types.ts';
+import type { IndexerApi } from '../types.ts';
 export type FindRepairDatasetOptions = {
-    indexerDb: IndexerDatabase;
+    api: IndexerApi;
     providerId: bigint;
     payer: Address;
     source: string;
 };
-export declare function findRepairDataset({ indexerDb, providerId, payer, source, }: FindRepairDatasetOptions): Promise<bigint | null>;
+export declare function findRepairDataset({ api, providerId, payer, source, }: FindRepairDatasetOptions): Promise<bigint | null>;
 //# sourceMappingURL=find-repair-dataset.d.ts.map

package/dist/src/db/find-repair-dataset.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find-repair-dataset.d.ts","sourceRoot":"","sources":["../../../src/db/find-repair-dataset.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AACnC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAElD,MAAM,MAAM,wBAAwB,GAAG;IACrC,SAAS,EAAE,eAAe,CAAA;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,OAAO,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAOD,wBAAsB,iBAAiB,CAAC,EACtC,SAAS,EACT,UAAU,EACV,KAAK,EACL,MAAM,GACP,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA2BnD"}
+{"version":3,"file":"find-repair-dataset.d.ts","sourceRoot":"","sources":["../../../src/db/find-repair-dataset.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAEnC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAE7C,MAAM,MAAM,wBAAwB,GAAG;IACrC,GAAG,EAAE,UAAU,CAAA;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,OAAO,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAOD,wBAAsB,iBAAiB,CAAC,EACtC,GAAG,EACH,UAAU,EACV,KAAK,EACL,MAAM,GACP,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAgBnD"}

package/dist/src/db/find-repair-dataset.js

@@ -1,17 +1,19 @@
-import { and, asc, eq, isNull } from 'drizzle-orm';
-export async function findRepairDataset({ indexerDb, providerId, payer, source, }) {
-    const schema = indexerDb._.fullSchema;
-    const result = await indexerDb
-        .select({
-        dataSetId: schema.dataSets.dataSetId,
-    })
-        .from(schema.dataSets)
-        .where(and(eq(schema.dataSets.providerId, providerId), eq(schema.dataSets.deleted, false), isNull(schema.dataSets.pdpEndEpoch), eq(schema.dataSets.payer, payer.toLowerCase()), eq(schema.dataSets.source, source), eq(schema.dataSets.withCdn, false), eq(schema.dataSets.withIpfsIndexing, true)))
-        .orderBy(asc(schema.dataSets.dataSetId))
-        .limit(1);
-    if (result.length === 0) {
-        return null;
+import { listDataSets } from "../api.js";
+export async function findRepairDataset({ api, providerId, payer, source, }) {
+    const dataSets = await listDataSets(api, {
+        owner: payer.toLowerCase(),
+        providerId,
+        deleted: false,
+        withCdn: false,
+    });
+    let dataSetId = null;
+    for (const dataSet of dataSets) {
+        if (dataSet.pdpEndEpoch != null || dataSet.source !== source || !dataSet.withIpfsIndexing)
+            continue;
+        const id = BigInt(dataSet.dataSetId);
+        if (dataSetId == null || id < dataSetId)
+            dataSetId = id;
     }
-    return result[0].dataSetId;
+    return dataSetId;
 }
 //# sourceMappingURL=find-repair-dataset.js.map

package/dist/src/db/find-repair-dataset.js.map

@@ -1 +1 @@
-{"version":3,"file":"find-repair-dataset.js","sourceRoot":"","sources":["../../../src/db/find-repair-dataset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAgBlD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACtC,SAAS,EACT,UAAU,EACV,KAAK,EACL,MAAM,GACmB;IACzB,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,UAAU,CAAA;IAErC,MAAM,MAAM,GAAG,MAAM,SAAS;SAC3B,MAAM,CAAC;QACN,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS;KACrC,CAAC;SACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;SACrB,KAAK,CACJ,GAAG,CACD,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,EAC1C,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,EAClC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,EACnC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,CAAC,EAC9C,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,EAClC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,EAClC,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAC3C,CACF;SACA,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;SACvC,KAAK,CAAC,CAAC,CAAC,CAAA;IAEX,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;AAC5B,CAAC"}
+{"version":3,"file":"find-repair-dataset.js","sourceRoot":"","sources":["../../../src/db/find-repair-dataset.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAexC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACtC,GAAG,EACH,UAAU,EACV,KAAK,EACL,MAAM,GACmB;IACzB,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE;QACvC,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE;QAC1B,UAAU;QACV,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;KACf,CAAC,CAAA;IAEF,IAAI,SAAS,GAAkB,IAAI,CAAA;IACnC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,OAAO,CAAC,WAAW,IAAI,IAAI,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB;YAAE,SAAQ;QACnG,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QACpC,IAAI,SAAS,IAAI,IAAI,IAAI,EAAE,GAAG,SAAS;YAAE,SAAS,GAAG,EAAE,CAAA;IACzD,CAAC;IAED,OAAO,SAAS,CAAA;AAClB,CAAC"}

package/dist/src/db/get-active-data-set-ids.d.ts

@@ -0,0 +1,9 @@
+import { type DataSet } from '../api.ts';
+import type { IndexerApi } from '../types.ts';
+export declare function isDataSetActiveAt(dataSet: Pick<DataSet, 'deleted' | 'pdpEndEpoch'>, blockNumber: bigint): boolean;
+export declare function getActiveDataSetIds({ api, providerId, blockNumber, }: {
+    api: IndexerApi;
+    providerId: bigint;
+    blockNumber: bigint;
+}): Promise<Set<string>>;
+//# sourceMappingURL=get-active-data-set-ids.d.ts.map

package/dist/src/db/get-active-data-set-ids.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-active-data-set-ids.d.ts","sourceRoot":"","sources":["../../../src/db/get-active-data-set-ids.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAgB,MAAM,WAAW,CAAA;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAO7C,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,aAAa,CAAC,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAEjH;AAKD,wBAAsB,mBAAmB,CAAC,EACxC,GAAG,EACH,UAAU,EACV,WAAW,GACZ,EAAE;IACD,GAAG,EAAE,UAAU,CAAA;IACf,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;CACpB,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAKvB"}

package/dist/src/db/get-active-data-set-ids.js

@@ -0,0 +1,9 @@
+import { listDataSets } from "../api.js";
+export function isDataSetActiveAt(dataSet, blockNumber) {
+    return !dataSet.deleted && (dataSet.pdpEndEpoch == null || BigInt(dataSet.pdpEndEpoch) > blockNumber);
+}
+export async function getActiveDataSetIds({ api, providerId, blockNumber, }) {
+    const dataSets = await listDataSets(api, { providerId, deleted: false });
+    return new Set(dataSets.filter((dataSet) => isDataSetActiveAt(dataSet, blockNumber)).map((dataSet) => dataSet.dataSetId));
+}
+//# sourceMappingURL=get-active-data-set-ids.js.map

package/dist/src/db/get-active-data-set-ids.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-active-data-set-ids.js","sourceRoot":"","sources":["../../../src/db/get-active-data-set-ids.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,YAAY,EAAE,MAAM,WAAW,CAAA;AAQtD,MAAM,UAAU,iBAAiB,CAAC,OAAiD,EAAE,WAAmB;IACtG,OAAO,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,WAAW,CAAC,CAAA;AACvG,CAAC;AAKD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,EACxC,GAAG,EACH,UAAU,EACV,WAAW,GAKZ;IACC,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAA;IACxE,OAAO,IAAI,GAAG,CACZ,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAC1G,CAAA;AACH,CAAC"}

package/dist/src/db/get-alternate-provider-urls.d.ts

@@ -0,0 +1,6 @@
+import type { IndexerApi } from '../types.ts';
+export declare function getAlternateProviderUrls({ api, repairProviderId, }: {
+    api: IndexerApi;
+    repairProviderId: bigint;
+}): Promise<string[]>;
+//# sourceMappingURL=get-alternate-provider-urls.d.ts.map

package/dist/src/db/get-alternate-provider-urls.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-alternate-provider-urls.d.ts","sourceRoot":"","sources":["../../../src/db/get-alternate-provider-urls.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAoB7C,wBAAsB,wBAAwB,CAAC,EAC7C,GAAG,EACH,gBAAgB,GACjB,EAAE;IACD,GAAG,EAAE,UAAU,CAAA;IACf,gBAAgB,EAAE,MAAM,CAAA;CACzB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAepB"}

package/dist/src/db/get-alternate-provider-urls.js

@@ -0,0 +1,24 @@
+import { listProviders } from "../api.js";
+function compareProviders(a, b) {
+    if (a.endorsed !== b.endorsed)
+        return a.endorsed ? -1 : 1;
+    if (a.approved !== b.approved)
+        return a.approved ? -1 : 1;
+    const x = BigInt(a.providerId);
+    const y = BigInt(b.providerId);
+    return x < y ? -1 : x > y ? 1 : 0;
+}
+export async function getAlternateProviderUrls({ api, repairProviderId, }) {
+    const providers = await listProviders(api);
+    const repairProviderUrl = providers.find((provider) => BigInt(provider.providerId) === repairProviderId)?.serviceUrl;
+    const urls = providers
+        .filter((provider) => (provider.approved || provider.endorsed) &&
+        provider.serviceUrl &&
+        BigInt(provider.providerId) !== repairProviderId)
+        .sort(compareProviders)
+        .map((provider) => provider.serviceUrl);
+    if (repairProviderUrl)
+        urls.push(repairProviderUrl);
+    return urls;
+}
+//# sourceMappingURL=get-alternate-provider-urls.js.map

package/dist/src/db/get-alternate-provider-urls.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-alternate-provider-urls.js","sourceRoot":"","sources":["../../../src/db/get-alternate-provider-urls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAiB,MAAM,WAAW,CAAA;AAIxD,SAAS,gBAAgB,CAAC,CAAW,EAAE,CAAW;IAChD,IAAI,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ;QAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACzD,IAAI,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ;QAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACzD,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;IAC9B,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;IAC9B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AACnC,CAAC;AAWD,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,EAC7C,GAAG,EACH,gBAAgB,GAIjB;IACC,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,GAAG,CAAC,CAAA;IAC1C,MAAM,iBAAiB,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,gBAAgB,CAAC,EAAE,UAAU,CAAA;IACpH,MAAM,IAAI,GAAG,SAAS;SACnB,MAAM,CACL,CAAC,QAAQ,EAAE,EAAE,CACX,CAAC,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC;QACxC,QAAQ,CAAC,UAAU;QACnB,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,gBAAgB,CACnD;SACA,IAAI,CAAC,gBAAgB,CAAC;SACtB,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAoB,CAAC,CAAA;IAEnD,IAAI,iBAAiB;QAAE,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;IACnD,OAAO,IAAI,CAAA;AACb,CAAC"}

package/dist/src/db/get-pieces.d.ts

@@ -1,39 +1,20 @@
 import type { OperationInsert } from '../local-schema.ts';
-import type { IndexerDatabase } from '../types.ts';
-export declare const DEFAULT_PIECES_PAGE_SIZE = 3000;
-export type GetPiecesPageOptions = {
-    indexerDb: IndexerDatabase;
+import type { IndexerApi } from '../types.ts';
+export type ForEachPiecesPageOptions = {
+    api: IndexerApi;
     providerId: bigint;
     repairId: number;
     blockNumber: bigint;
-    limit?: number;
-    offset?: number;
-    seenCids?: Set<string>;
 };
-export type GetPiecesPageResult = {
-    operations: OperationInsert[];
-    hasMore: boolean;
-    nextOffset: number;
-    seenCids: Set<string>;
-};
-export type ForEachPiecesPageOptions = Omit<GetPiecesPageOptions, 'offset' | 'seenCids'>;
-export type GetDataSetPiecesPageOptions = {
-    indexerDb: IndexerDatabase;
+export type ForEachDataSetPiecesPageOptions = {
+    api: IndexerApi;
     dataSetId: bigint;
     repairId: number;
     sourceProviderUrl: string;
-    limit?: number;
-    offset?: number;
 };
-export type GetDataSetPiecesPageResult = {
+export type PiecesPage = {
     operations: OperationInsert[];
-    hasMore: boolean;
-    nextOffset: number;
 };
-export type ForEachDataSetPiecesPageOptions = Omit<GetDataSetPiecesPageOptions, 'offset'>;
-export declare function emptySeenCids(): Set<string>;
-export declare function getPiecesPage({ indexerDb, providerId, repairId, blockNumber, limit, offset, seenCids, }: GetPiecesPageOptions): Promise<GetPiecesPageResult>;
-export declare function getDataSetPiecesPage({ indexerDb, dataSetId, repairId, sourceProviderUrl, limit, offset, }: GetDataSetPiecesPageOptions): Promise<GetDataSetPiecesPageResult>;
-export declare function forEachPiecesPage(options: ForEachPiecesPageOptions, onPage: (page: GetPiecesPageResult) => Promise<void>): Promise<void>;
-export declare function forEachDataSetPiecesPage(options: ForEachDataSetPiecesPageOptions, onPage: (page: GetDataSetPiecesPageResult) => Promise<void>): Promise<void>;
+export declare function forEachPiecesPage({ api, providerId, repairId, blockNumber }: ForEachPiecesPageOptions, onPage: (page: PiecesPage) => Promise<void>): Promise<void>;
+export declare function forEachDataSetPiecesPage({ api, dataSetId, repairId, sourceProviderUrl }: ForEachDataSetPiecesPageOptions, onPage: (page: PiecesPage) => Promise<void>): Promise<void>;
 //# sourceMappingURL=get-pieces.d.ts.map

package/dist/src/db/get-pieces.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-pieces.d.ts","sourceRoot":"","sources":["../../../src/db/get-pieces.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAIlD,eAAO,MAAM,wBAAwB,OAAO,CAAA;AAG5C,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,eAAe,CAAA;IAE1B,UAAU,EAAE,MAAM,CAAA;IAElB,QAAQ,EAAE,MAAM,CAAA;IAEhB,WAAW,EAAE,MAAM,CAAA;IAEnB,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd,MAAM,CAAC,EAAE,MAAM,CAAA;IAKf,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CACvB,CAAA;AAGD,MAAM,MAAM,mBAAmB,GAAG;IAEhC,UAAU,EAAE,eAAe,EAAE,CAAA;IAE7B,OAAO,EAAE,OAAO,CAAA;IAEhB,UAAU,EAAE,MAAM,CAAA;IAElB,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CACtB,CAAA;AAGD,MAAM,MAAM,wBAAwB,GAAG,IAAI,CAAC,oBAAoB,EAAE,QAAQ,GAAG,UAAU,CAAC,CAAA;AAGxF,MAAM,MAAM,2BAA2B,GAAG;IACxC,SAAS,EAAE,eAAe,CAAA;IAE1B,SAAS,EAAE,MAAM,CAAA;IAEjB,QAAQ,EAAE,MAAM,CAAA;IAEhB,iBAAiB,EAAE,MAAM,CAAA;IAEzB,KAAK,CAAC,EAAE,MAAM,CAAA;IAEd,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAGD,MAAM,MAAM,0BAA0B,GAAG;IAEvC,UAAU,EAAE,eAAe,EAAE,CAAA;IAE7B,OAAO,EAAE,OAAO,CAAA;IAEhB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAGD,MAAM,MAAM,+BAA+B,GAAG,IAAI,CAAC,2BAA2B,EAAE,QAAQ,CAAC,CAAA;AAQzF,wBAAgB,aAAa,IAAI,GAAG,CAAC,MAAM,CAAC,CAE3C;AAeD,wBAAsB,aAAa,CAAC,EAClC,SAAS,EACT,UAAU,EACV,QAAQ,EACR,WAAW,EACX,KAAgC,EAChC,MAAU,EACV,QAA0B,GAC3B,EAAE,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAgFrD;AAUD,wBAAsB,oBAAoB,CAAC,EACzC,SAAS,EACT,SAAS,EACT,QAAQ,EACR,iBAAiB,EACjB,KAAgC,EAChC,MAAU,GACX,EAAE,2BAA2B,GAAG,OAAO,CAAC,0BAA0B,CAAC,CA8BnE;AAUD,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,wBAAwB,EACjC,MAAM,EAAE,CAAC,IAAI,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,GACnD,OAAO,CAAC,IAAI,CAAC,CAkBf;AAUD,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,+BAA+B,EACxC,MAAM,EAAE,CAAC,IAAI,EAAE,0BAA0B,KAAK,OAAO,CAAC,IAAI,CAAC,GAC1D,OAAO,CAAC,IAAI,CAAC,CAef"}
+{"version":3,"file":"get-pieces.d.ts","sourceRoot":"","sources":["../../../src/db/get-pieces.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAK7C,MAAM,MAAM,wBAAwB,GAAG;IACrC,GAAG,EAAE,UAAU,CAAA;IAEf,UAAU,EAAE,MAAM,CAAA;IAElB,QAAQ,EAAE,MAAM,CAAA;IAEhB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAGD,MAAM,MAAM,+BAA+B,GAAG;IAC5C,GAAG,EAAE,UAAU,CAAA;IAEf,SAAS,EAAE,MAAM,CAAA;IAEjB,QAAQ,EAAE,MAAM,CAAA;IAEhB,iBAAiB,EAAE,MAAM,CAAA;CAC1B,CAAA;AAGD,MAAM,MAAM,UAAU,GAAG;IAEvB,UAAU,EAAE,eAAe,EAAE,CAAA;CAC9B,CAAA;AAmED,wBAAsB,iBAAiB,CACrC,EAAE,GAAG,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,wBAAwB,EACpE,MAAM,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,GAC1C,OAAO,CAAC,IAAI,CAAC,CAiBf;AAYD,wBAAsB,wBAAwB,CAC5C,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,iBAAiB,EAAE,EAAE,+BAA+B,EAChF,MAAM,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,GAC1C,OAAO,CAAC,IAAI,CAAC,CAsBf"}

package/dist/src/db/get-pieces.js

@@ -1,45 +1,17 @@
 import * as Piece from '@filoz/synapse-core/piece';
-import { and, asc, eq, isNull, lte, or } from 'drizzle-orm';
 import pMap from 'p-map';
-import { findProvidersByCid } from "./find-providers-by-cid.js";
-export const DEFAULT_PIECES_PAGE_SIZE = 3000;
-export function emptySeenCids() {
-    return new Set();
-}
-export async function getPiecesPage({ indexerDb, providerId, repairId, blockNumber, limit = DEFAULT_PIECES_PAGE_SIZE, offset = 0, seenCids = emptySeenCids(), }) {
-    const schema = indexerDb._.fullSchema;
-    const rows = await indexerDb
-        .select({
-        cid: schema.pieces.cid,
-        metadata: schema.pieces.metadata,
-    })
-        .from(schema.pieces)
-        .innerJoin(schema.dataSets, eq(schema.pieces.dataSetId, schema.dataSets.dataSetId))
-        .where(and(eq(schema.dataSets.providerId, providerId), eq(schema.dataSets.deleted, false), or(isNull(schema.dataSets.pdpEndEpoch), lte(schema.dataSets.pdpEndEpoch, blockNumber)), eq(schema.pieces.removed, false)))
-        .orderBy(asc(schema.pieces.dataSetId), asc(schema.pieces.pieceId))
-        .limit(limit)
-        .offset(offset);
+import { listDataSetPieces, MAX_PAGE_SIZE, providerPiecePages, toStringMetadata } from "../api.js";
+import { getActiveDataSetIds } from "./get-active-data-set-ids.js";
+import { getAlternateProviderUrls } from "./get-alternate-provider-urls.js";
+async function piecesToRepairOperations({ pieces, repairId, alternateProviderUrls, }) {
     const now = Date.now();
-    const pieces = [];
-    for (const { cid, metadata } of rows) {
-        if (seenCids.has(cid))
-            continue;
-        seenCids.add(cid);
-        pieces.push({ cid, metadata });
-    }
-    const providersByCid = await findProvidersByCid({
-        indexerDb,
-        cids: pieces.map((piece) => piece.cid),
-        blockNumber,
-    });
-    const operations = await pMap(pieces, async ({ cid, metadata }) => {
-        const alternateProviders = providersByCid[cid]?.map((provider) => provider.serviceUrl) ?? [];
+    return pMap(pieces, async ({ cid, metadata }) => {
         let skippedMessage = '';
         let validProvider;
-        if (alternateProviders.length > 0) {
-            validProvider = await Piece.findPieceOnProviders(alternateProviders, Piece.from(cid));
+        if (alternateProviderUrls.length > 0) {
+            validProvider = await Piece.findPieceOnProviders(alternateProviderUrls, Piece.from(cid));
             if (!validProvider) {
-                skippedMessage = `Found ${alternateProviders.length} alternate providers, but none are valid. ${alternateProviders.join(', ')}`;
+                skippedMessage = `Piece not found on any of ${alternateProviderUrls.length} probed providers`;
             }
         }
         else {
@@ -50,76 +22,51 @@ export async function getPiecesPage({ indexerDb, providerId, repairId, blockNumb
             type: 'add_piece',
             status: validProvider ? 'pending' : 'skipped',
             cid,
-            metadata: metadata ?? {},
+            metadata,
             alternateProvider: validProvider ?? '',
             error: validProvider ? undefined : skippedMessage,
             createdAt: now,
             updatedAt: now,
         };
     }, { concurrency: 20 });
-    return {
-        operations,
-        hasMore: rows.length === limit,
-        nextOffset: offset + rows.length,
-        seenCids,
-    };
-}
-export async function getDataSetPiecesPage({ indexerDb, dataSetId, repairId, sourceProviderUrl, limit = DEFAULT_PIECES_PAGE_SIZE, offset = 0, }) {
-    const schema = indexerDb._.fullSchema;
-    const rows = await indexerDb
-        .select({
-        cid: schema.pieces.cid,
-        metadata: schema.pieces.metadata,
-    })
-        .from(schema.pieces)
-        .where(and(eq(schema.pieces.dataSetId, dataSetId), eq(schema.pieces.removed, false)))
-        .orderBy(asc(schema.pieces.pieceId))
-        .limit(limit)
-        .offset(offset);
-    const now = Date.now();
-    const operations = rows.map(({ cid, metadata }) => ({
-        repairId,
-        type: 'add_piece',
-        status: 'pending',
-        cid,
-        metadata: metadata ?? {},
-        alternateProvider: sourceProviderUrl,
-        createdAt: now,
-        updatedAt: now,
-    }));
-    return {
-        operations,
-        hasMore: rows.length === limit,
-        nextOffset: offset + rows.length,
-    };
 }
-export async function forEachPiecesPage(options, onPage) {
-    let offset = 0;
-    let hasMore = true;
-    let seenCids = emptySeenCids();
-    while (hasMore) {
-        const page = await getPiecesPage({
-            ...options,
-            offset,
-            seenCids,
-        });
-        await onPage(page);
-        offset = page.nextOffset;
-        seenCids = page.seenCids;
-        hasMore = page.hasMore;
+export async function forEachPiecesPage({ api, providerId, repairId, blockNumber }, onPage) {
+    const activeDataSetIds = await getActiveDataSetIds({ api, providerId, blockNumber });
+    const alternateProviderUrls = await getAlternateProviderUrls({ api, repairProviderId: providerId });
+    const seenCids = new Set();
+    for await (const rows of providerPiecePages(api, providerId, { removed: false })) {
+        const pieces = [];
+        for (const { cid, metadata, dataSetId } of rows) {
+            if (!activeDataSetIds.has(dataSetId))
+                continue;
+            if (cid == null || seenCids.has(cid))
+                continue;
+            seenCids.add(cid);
+            pieces.push({ cid, metadata: toStringMetadata(metadata) });
+        }
+        await onPage({ operations: await piecesToRepairOperations({ pieces, repairId, alternateProviderUrls }) });
     }
 }
-export async function forEachDataSetPiecesPage(options, onPage) {
-    let offset = 0;
-    let hasMore = true;
-    while (hasMore) {
-        const page = await getDataSetPiecesPage({
-            ...options,
-            offset,
-        });
-        await onPage(page);
-        offset = page.nextOffset;
-        hasMore = page.hasMore;
+export async function forEachDataSetPiecesPage({ api, dataSetId, repairId, sourceProviderUrl }, onPage) {
+    const pieces = (await listDataSetPieces(api, dataSetId, { removed: false })).reverse();
+    const now = Date.now();
+    for (let offset = 0; offset < pieces.length; offset += MAX_PAGE_SIZE) {
+        const operations = [];
+        for (const { cid, metadata } of pieces.slice(offset, offset + MAX_PAGE_SIZE)) {
+            if (cid == null)
+                continue;
+            operations.push({
+                repairId,
+                type: 'add_piece',
+                status: 'pending',
+                cid,
+                metadata: toStringMetadata(metadata),
+                alternateProvider: sourceProviderUrl,
+                createdAt: now,
+                updatedAt: now,
+            });
+        }
+        await onPage({ operations });
     }
 }
 //# sourceMappingURL=get-pieces.js.map