@filoz/repair-cli 0.3.0 → 1.0.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/dist/package.json +3 -3
- package/dist/src/api.d.ts +35 -0
- package/dist/src/api.d.ts.map +1 -0
- package/dist/src/api.js +118 -0
- package/dist/src/api.js.map +1 -0
- package/dist/src/cli.js +2 -0
- package/dist/src/cli.js.map +1 -1
- package/dist/src/commands/datasets.d.ts +3 -5
- package/dist/src/commands/datasets.d.ts.map +1 -1
- package/dist/src/commands/datasets.js +24 -33
- package/dist/src/commands/datasets.js.map +1 -1
- package/dist/src/commands/providers.d.ts +3 -5
- package/dist/src/commands/providers.d.ts.map +1 -1
- package/dist/src/commands/providers.js +32 -33
- package/dist/src/commands/providers.js.map +1 -1
- package/dist/src/commands/repair.d.ts +3 -5
- package/dist/src/commands/repair.d.ts.map +1 -1
- package/dist/src/commands/repair.js +3 -3
- package/dist/src/commands/repair.js.map +1 -1
- package/dist/src/commands/replicate.d.ts +3 -5
- package/dist/src/commands/replicate.d.ts.map +1 -1
- package/dist/src/commands/replicate.js +3 -3
- package/dist/src/commands/replicate.js.map +1 -1
- package/dist/src/commands/second-copy.d.ts +23 -0
- package/dist/src/commands/second-copy.d.ts.map +1 -0
- package/dist/src/commands/second-copy.js +175 -0
- package/dist/src/commands/second-copy.js.map +1 -0
- package/dist/src/commands/session-key.d.ts +3 -5
- package/dist/src/commands/session-key.d.ts.map +1 -1
- package/dist/src/commands/setup.d.ts.map +1 -1
- package/dist/src/commands/setup.js +11 -32
- package/dist/src/commands/setup.js.map +1 -1
- package/dist/src/commands/wallet.d.ts +3 -5
- package/dist/src/commands/wallet.d.ts.map +1 -1
- package/dist/src/db/dedupe-cids.d.ts +6 -7
- package/dist/src/db/dedupe-cids.d.ts.map +1 -1
- package/dist/src/db/dedupe-cids.js +2 -14
- package/dist/src/db/dedupe-cids.js.map +1 -1
- package/dist/src/db/find-repair-dataset.d.ts +3 -3
- package/dist/src/db/find-repair-dataset.d.ts.map +1 -1
- package/dist/src/db/find-repair-dataset.js +16 -14
- package/dist/src/db/find-repair-dataset.js.map +1 -1
- package/dist/src/db/get-active-data-set-ids.d.ts +9 -0
- package/dist/src/db/get-active-data-set-ids.d.ts.map +1 -0
- package/dist/src/db/get-active-data-set-ids.js +9 -0
- package/dist/src/db/get-active-data-set-ids.js.map +1 -0
- package/dist/src/db/get-alternate-provider-urls.d.ts +6 -0
- package/dist/src/db/get-alternate-provider-urls.d.ts.map +1 -0
- package/dist/src/db/get-alternate-provider-urls.js +24 -0
- package/dist/src/db/get-alternate-provider-urls.js.map +1 -0
- package/dist/src/db/get-pieces.d.ts +8 -27
- package/dist/src/db/get-pieces.d.ts.map +1 -1
- package/dist/src/db/get-pieces.js +44 -97
- package/dist/src/db/get-pieces.js.map +1 -1
- package/dist/src/db/get-repair-provider.d.ts +2 -2
- package/dist/src/db/get-repair-provider.d.ts.map +1 -1
- package/dist/src/db/get-repair-provider.js +8 -20
- package/dist/src/db/get-repair-provider.js.map +1 -1
- package/dist/src/db/repair-create.d.ts.map +1 -1
- package/dist/src/db/repair-create.js +5 -3
- package/dist/src/db/repair-create.js.map +1 -1
- package/dist/src/db/replicate-create.d.ts.map +1 -1
- package/dist/src/db/replicate-create.js +15 -21
- package/dist/src/db/replicate-create.js.map +1 -1
- package/dist/src/db/second-copy-create.d.ts +10 -0
- package/dist/src/db/second-copy-create.d.ts.map +1 -0
- package/dist/src/db/second-copy-create.js +104 -0
- package/dist/src/db/second-copy-create.js.map +1 -0
- package/dist/src/local-schema.d.ts +41 -1
- package/dist/src/local-schema.d.ts.map +1 -1
- package/dist/src/local-schema.js +2 -0
- package/dist/src/local-schema.js.map +1 -1
- package/dist/src/middleware.d.ts +7 -11
- package/dist/src/middleware.d.ts.map +1 -1
- package/dist/src/middleware.js +6 -10
- package/dist/src/middleware.js.map +1 -1
- package/dist/src/pipeline/add-pieces.d.ts +3 -3
- package/dist/src/pipeline/add-pieces.d.ts.map +1 -1
- package/dist/src/pipeline/add-pieces.js +15 -7
- package/dist/src/pipeline/add-pieces.js.map +1 -1
- package/dist/src/pipeline/create-datasets.d.ts +4 -4
- package/dist/src/pipeline/create-datasets.d.ts.map +1 -1
- package/dist/src/pipeline/create-datasets.js +7 -14
- package/dist/src/pipeline/create-datasets.js.map +1 -1
- package/dist/src/types.d.ts +6 -7
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/utils.d.ts +7 -10
- package/dist/src/utils.d.ts.map +1 -1
- package/dist/src/utils.js +21 -2
- package/dist/src/utils.js.map +1 -1
- package/package.json +3 -3
- package/readme.md +98 -13
- package/src/api.ts +220 -0
- package/src/cli.ts +2 -0
- package/src/commands/datasets.ts +24 -36
- package/src/commands/providers.ts +34 -42
- package/src/commands/repair.ts +3 -3
- package/src/commands/replicate.ts +3 -3
- package/src/commands/second-copy.ts +187 -0
- package/src/commands/setup.ts +12 -35
- package/src/db/dedupe-cids.ts +7 -24
- package/src/db/find-repair-dataset.ts +17 -28
- package/src/db/get-active-data-set-ids.ts +29 -0
- package/src/db/get-alternate-provider-urls.ts +43 -0
- package/src/db/get-pieces.ts +82 -214
- package/src/db/get-repair-provider.ts +10 -30
- package/src/db/repair-create.ts +5 -3
- package/src/db/replicate-create.ts +15 -21
- package/src/db/second-copy-create.ts +147 -0
- package/src/local-schema.ts +3 -0
- package/src/middleware.ts +7 -11
- package/src/pipeline/add-pieces.ts +21 -11
- package/src/pipeline/create-datasets.ts +9 -29
- package/src/types.ts +9 -7
- package/src/utils.ts +22 -4
- package/dist/src/db/find-providers-by-cid.d.ts +0 -9
- package/dist/src/db/find-providers-by-cid.d.ts.map +0 -1
- package/dist/src/db/find-providers-by-cid.js +0 -43
- package/dist/src/db/find-providers-by-cid.js.map +0 -1
- package/dist/src/indexer-schema.d.ts +0 -549
- package/dist/src/indexer-schema.d.ts.map +0 -1
- package/dist/src/indexer-schema.js +0 -56
- package/dist/src/indexer-schema.js.map +0 -1
- package/src/db/find-providers-by-cid.ts +0 -70
- package/src/indexer-schema.ts +0 -77
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import { readFile } from 'node:fs/promises';
|
|
2
|
+
import { taskLog } from '@clack/prompts';
|
|
3
|
+
import { getBlockNumber } from 'viem/actions';
|
|
4
|
+
import { NoAlternateProviderError, RepairCreationError } from "../error.js";
|
|
5
|
+
import { getRepairProvider } from "./get-repair-provider.js";
|
|
6
|
+
const OPERATIONS_INSERT_BATCH_SIZE = 500;
|
|
7
|
+
export function normalizeProviderUrl(url) {
|
|
8
|
+
let parsed;
|
|
9
|
+
try {
|
|
10
|
+
parsed = new URL(url);
|
|
11
|
+
}
|
|
12
|
+
catch {
|
|
13
|
+
throw new RepairCreationError(`Invalid source provider URL: ${url}`);
|
|
14
|
+
}
|
|
15
|
+
if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:') {
|
|
16
|
+
throw new RepairCreationError(`Source provider URL must be http(s): ${url}`);
|
|
17
|
+
}
|
|
18
|
+
return parsed.toString().replace(/\/$/, '');
|
|
19
|
+
}
|
|
20
|
+
export async function parsePieceCidsFromFile(piecesFile) {
|
|
21
|
+
let raw;
|
|
22
|
+
try {
|
|
23
|
+
raw = JSON.parse(await readFile(piecesFile, 'utf8'));
|
|
24
|
+
}
|
|
25
|
+
catch (error) {
|
|
26
|
+
throw new RepairCreationError(error instanceof Error ? `Failed to read pieces file: ${error.message}` : 'Failed to read pieces file');
|
|
27
|
+
}
|
|
28
|
+
if (raw == null || typeof raw !== 'object' || !Array.isArray(raw.aggregates)) {
|
|
29
|
+
throw new RepairCreationError('Pieces file must contain an "aggregates" array');
|
|
30
|
+
}
|
|
31
|
+
const cids = new Set();
|
|
32
|
+
for (const aggregate of raw.aggregates) {
|
|
33
|
+
if (typeof aggregate?.piece_cid !== 'string' || aggregate.piece_cid.length === 0) {
|
|
34
|
+
throw new RepairCreationError('Each aggregate must include a non-empty "piece_cid" string');
|
|
35
|
+
}
|
|
36
|
+
cids.add(aggregate.piece_cid);
|
|
37
|
+
}
|
|
38
|
+
if (cids.size === 0) {
|
|
39
|
+
throw new RepairCreationError('Pieces file contains no piece CIDs');
|
|
40
|
+
}
|
|
41
|
+
return [...cids];
|
|
42
|
+
}
|
|
43
|
+
export async function secondCopyCreate(options) {
|
|
44
|
+
const { api, localDb, piecesFile, sourceProviderUrl, targetProviderId, client } = options;
|
|
45
|
+
const localSchema = localDb._.fullSchema;
|
|
46
|
+
const now = Date.now();
|
|
47
|
+
const blockNumber = await getBlockNumber(client);
|
|
48
|
+
const normalizedSourceUrl = normalizeProviderUrl(sourceProviderUrl);
|
|
49
|
+
const log = taskLog({
|
|
50
|
+
title: 'Creating second-copy',
|
|
51
|
+
limit: 10,
|
|
52
|
+
retainLog: true,
|
|
53
|
+
});
|
|
54
|
+
const targetProvider = await getRepairProvider({
|
|
55
|
+
api,
|
|
56
|
+
providerId: targetProviderId,
|
|
57
|
+
});
|
|
58
|
+
if (!targetProvider) {
|
|
59
|
+
throw new NoAlternateProviderError(targetProviderId);
|
|
60
|
+
}
|
|
61
|
+
const normalizedTargetUrl = normalizeProviderUrl(targetProvider.serviceUrl);
|
|
62
|
+
if (normalizedSourceUrl === normalizedTargetUrl) {
|
|
63
|
+
throw new RepairCreationError('Source provider URL must differ from the target provider URL');
|
|
64
|
+
}
|
|
65
|
+
const pieceCids = await parsePieceCidsFromFile(piecesFile);
|
|
66
|
+
log.message(`Loaded ${pieceCids.length} unique piece CIDs from ${piecesFile}`);
|
|
67
|
+
const [repair] = await localDb
|
|
68
|
+
.insert(localSchema.repairs)
|
|
69
|
+
.values({
|
|
70
|
+
kind: 'second_copy',
|
|
71
|
+
repairProviderId: 0n,
|
|
72
|
+
repairDataSetId: null,
|
|
73
|
+
sourceProviderUrl: normalizedSourceUrl,
|
|
74
|
+
targetProviderId: targetProvider.providerId,
|
|
75
|
+
targetProviderUrl: targetProvider.serviceUrl,
|
|
76
|
+
targetDataSetId: null,
|
|
77
|
+
blockNumber,
|
|
78
|
+
createdAt: now,
|
|
79
|
+
updatedAt: now,
|
|
80
|
+
})
|
|
81
|
+
.returning({ id: localSchema.repairs.id });
|
|
82
|
+
if (!repair)
|
|
83
|
+
throw new RepairCreationError('Failed to create second-copy row');
|
|
84
|
+
let totalOperations = 0;
|
|
85
|
+
for (let offset = 0; offset < pieceCids.length; offset += OPERATIONS_INSERT_BATCH_SIZE) {
|
|
86
|
+
const batchCids = pieceCids.slice(offset, offset + OPERATIONS_INSERT_BATCH_SIZE);
|
|
87
|
+
const operations = batchCids.map((cid) => ({
|
|
88
|
+
repairId: repair.id,
|
|
89
|
+
type: 'add_piece',
|
|
90
|
+
status: 'pending',
|
|
91
|
+
cid,
|
|
92
|
+
metadata: {},
|
|
93
|
+
alternateProvider: normalizedSourceUrl,
|
|
94
|
+
createdAt: now,
|
|
95
|
+
updatedAt: now,
|
|
96
|
+
}));
|
|
97
|
+
await localDb.insert(localSchema.operations).values(operations);
|
|
98
|
+
totalOperations += operations.length;
|
|
99
|
+
log.message(`Inserted ${operations.length} operations (${totalOperations}/${pieceCids.length})`);
|
|
100
|
+
}
|
|
101
|
+
log.success(`Created second-copy ${repair.id} with ${totalOperations} operations`, { showLog: true });
|
|
102
|
+
return repair.id;
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=second-copy-create.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"second-copy-create.js","sourceRoot":"","sources":["../../../src/db/second-copy-create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { MetadataObject } from '@filoz/synapse-core';
|
|
2
2
|
import * as t from 'drizzle-orm/sqlite-core';
|
|
3
3
|
export type RepairStatus = 'pending' | 'completed' | 'failed';
|
|
4
|
+
export type RepairKind = 'repair' | 'replicate' | 'second_copy';
|
|
4
5
|
export type OperationStatus = 'pending' | 'completed' | 'failed' | 'skipped';
|
|
5
6
|
export type OperationType = 'create_dataset' | 'add_piece';
|
|
6
7
|
export declare const jsonType: {
|
|
@@ -99,6 +100,26 @@ export declare const repairs: t.SQLiteTableWithColumns<{
|
|
|
99
100
|
length: undefined;
|
|
100
101
|
$type: RepairStatus;
|
|
101
102
|
}>;
|
|
103
|
+
kind: t.SQLiteColumn<{
|
|
104
|
+
name: "kind";
|
|
105
|
+
tableName: "repairs";
|
|
106
|
+
dataType: "string";
|
|
107
|
+
columnType: "SQLiteText";
|
|
108
|
+
data: RepairKind;
|
|
109
|
+
driverParam: string;
|
|
110
|
+
notNull: true;
|
|
111
|
+
hasDefault: true;
|
|
112
|
+
isPrimaryKey: false;
|
|
113
|
+
isAutoincrement: false;
|
|
114
|
+
hasRuntimeDefault: false;
|
|
115
|
+
enumValues: [string, ...string[]];
|
|
116
|
+
baseColumn: never;
|
|
117
|
+
identity: undefined;
|
|
118
|
+
generated: undefined;
|
|
119
|
+
}, {}, {
|
|
120
|
+
length: undefined;
|
|
121
|
+
$type: RepairKind;
|
|
122
|
+
}>;
|
|
102
123
|
repairProviderId: t.SQLiteColumn<{
|
|
103
124
|
name: "repair_provider_id";
|
|
104
125
|
tableName: "repairs";
|
|
@@ -137,6 +158,25 @@ export declare const repairs: t.SQLiteTableWithColumns<{
|
|
|
137
158
|
}, {}, {
|
|
138
159
|
sqliteColumnBuilderBrand: "SQLiteCustomColumnBuilderBrand";
|
|
139
160
|
}>;
|
|
161
|
+
sourceProviderUrl: t.SQLiteColumn<{
|
|
162
|
+
name: "source_provider_url";
|
|
163
|
+
tableName: "repairs";
|
|
164
|
+
dataType: "string";
|
|
165
|
+
columnType: "SQLiteText";
|
|
166
|
+
data: string;
|
|
167
|
+
driverParam: string;
|
|
168
|
+
notNull: false;
|
|
169
|
+
hasDefault: false;
|
|
170
|
+
isPrimaryKey: false;
|
|
171
|
+
isAutoincrement: false;
|
|
172
|
+
hasRuntimeDefault: false;
|
|
173
|
+
enumValues: [string, ...string[]];
|
|
174
|
+
baseColumn: never;
|
|
175
|
+
identity: undefined;
|
|
176
|
+
generated: undefined;
|
|
177
|
+
}, {}, {
|
|
178
|
+
length: number | undefined;
|
|
179
|
+
}>;
|
|
140
180
|
targetProviderId: t.SQLiteColumn<{
|
|
141
181
|
name: "target_provider_id";
|
|
142
182
|
tableName: "repairs";
|
|
@@ -366,8 +406,8 @@ export declare const operations: t.SQLiteTableWithColumns<{
|
|
|
366
406
|
identity: undefined;
|
|
367
407
|
generated: undefined;
|
|
368
408
|
}, {}, {
|
|
369
|
-
$type: MetadataObject;
|
|
370
409
|
sqliteColumnBuilderBrand: "SQLiteCustomColumnBuilderBrand";
|
|
410
|
+
$type: MetadataObject;
|
|
371
411
|
}>;
|
|
372
412
|
alternateProvider: t.SQLiteColumn<{
|
|
373
413
|
name: "alternate_provider";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-schema.d.ts","sourceRoot":"","sources":["../../src/local-schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAGzD,OAAO,KAAK,CAAC,MAAM,yBAAyB,CAAA;AAI5C,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAA;AAC7D,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAA;AAC5E,MAAM,MAAM,aAAa,GAAG,gBAAgB,GAAG,WAAW,CAAA;AAM1D,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;CAUnB,CAAA;AAEF,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;CAUrB,CAAA;AAEF,MAAM,MAAM,YAAY,GAAG,OAAO,OAAO,CAAC,YAAY,CAAA;AACtD,MAAM,MAAM,YAAY,GAAG,OAAO,OAAO,CAAC,YAAY,CAAA;AACtD,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;AAEhD,eAAO,MAAM,OAAO
|
|
1
|
+
{"version":3,"file":"local-schema.d.ts","sourceRoot":"","sources":["../../src/local-schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAGzD,OAAO,KAAK,CAAC,MAAM,yBAAyB,CAAA;AAI5C,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAA;AAC7D,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,WAAW,GAAG,aAAa,CAAA;AAC/D,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAA;AAC5E,MAAM,MAAM,aAAa,GAAG,gBAAgB,GAAG,WAAW,CAAA;AAM1D,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;CAUnB,CAAA;AAEF,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;CAUrB,CAAA;AAEF,MAAM,MAAM,YAAY,GAAG,OAAO,OAAO,CAAC,YAAY,CAAA;AACtD,MAAM,MAAM,YAAY,GAAG,OAAO,OAAO,CAAC,YAAY,CAAA;AACtD,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAAA;AAEhD,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAalB,CAAA;AAEF,MAAM,MAAM,eAAe,GAAG,OAAO,UAAU,CAAC,YAAY,CAAA;AAC5D,MAAM,MAAM,eAAe,GAAG,OAAO,UAAU,CAAC,YAAY,CAAA;AAE5D,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAerB,CAAA;AAEF,eAAO,MAAM,eAAe;;EAEzB,CAAA;AAEH,eAAO,MAAM,kBAAkB;;EAK5B,CAAA"}
|
package/dist/src/local-schema.js
CHANGED
|
@@ -27,8 +27,10 @@ export const bigintType = customType({
|
|
|
27
27
|
export const repairs = table('repairs', {
|
|
28
28
|
id: t.int().primaryKey({ autoIncrement: true }),
|
|
29
29
|
status: t.text().$type().notNull().default('pending'),
|
|
30
|
+
kind: t.text().$type().notNull().default('repair'),
|
|
30
31
|
repairProviderId: bigintType('repair_provider_id').notNull(),
|
|
31
32
|
repairDataSetId: bigintType('repair_data_set_id'),
|
|
33
|
+
sourceProviderUrl: t.text('source_provider_url'),
|
|
32
34
|
targetProviderId: bigintType('target_provider_id').notNull(),
|
|
33
35
|
targetProviderUrl: t.text('target_provider_url').notNull(),
|
|
34
36
|
targetDataSetId: bigintType('target_data_set_id'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-schema.js","sourceRoot":"","sources":["../../src/local-schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,OAAO,KAAK,CAAC,MAAM,yBAAyB,CAAA;AAC5C,OAAO,EAAE,UAAU,EAAE,WAAW,IAAI,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAC1E,OAAO,KAAK,IAAI,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"local-schema.js","sourceRoot":"","sources":["../../src/local-schema.ts"],"names":[],"mappings":"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"}
|
package/dist/src/middleware.d.ts
CHANGED
|
@@ -1,21 +1,19 @@
|
|
|
1
1
|
import type { Chain } from '@filoz/synapse-core/chains';
|
|
2
2
|
import { z } from 'incur';
|
|
3
3
|
import type { Account, Client, Transport } from 'viem';
|
|
4
|
-
import type {
|
|
4
|
+
import type { IndexerApi, LocalDatabase } from './types.ts';
|
|
5
5
|
export declare const contextSchema: z.ZodObject<{
|
|
6
|
-
|
|
6
|
+
api: z.ZodCustom<IndexerApi, IndexerApi>;
|
|
7
7
|
localDb: z.ZodCustom<LocalDatabase, LocalDatabase>;
|
|
8
8
|
config: z.ZodCustom<import("iso-conf").Conf<z.ZodObject<{
|
|
9
9
|
privateKey: z.ZodOptional<z.ZodString>;
|
|
10
|
-
|
|
11
|
-
indexerCalibrationUrl: z.ZodOptional<z.ZodURL>;
|
|
10
|
+
apiUrl: z.ZodOptional<z.ZodURL>;
|
|
12
11
|
chainId: z.ZodOptional<z.ZodNumber>;
|
|
13
12
|
dbPath: z.ZodOptional<z.ZodString>;
|
|
14
13
|
source: z.ZodOptional<z.ZodString>;
|
|
15
14
|
}, z.core.$strip>>, import("iso-conf").Conf<z.ZodObject<{
|
|
16
15
|
privateKey: z.ZodOptional<z.ZodString>;
|
|
17
|
-
|
|
18
|
-
indexerCalibrationUrl: z.ZodOptional<z.ZodURL>;
|
|
16
|
+
apiUrl: z.ZodOptional<z.ZodURL>;
|
|
19
17
|
chainId: z.ZodOptional<z.ZodNumber>;
|
|
20
18
|
dbPath: z.ZodOptional<z.ZodString>;
|
|
21
19
|
source: z.ZodOptional<z.ZodString>;
|
|
@@ -26,19 +24,17 @@ export declare const contextSchema: z.ZodObject<{
|
|
|
26
24
|
isInteractive: z.ZodBoolean;
|
|
27
25
|
}, z.core.$strip>;
|
|
28
26
|
export declare const contextMiddleware: import("incur").MiddlewareHandler<z.ZodObject<{
|
|
29
|
-
|
|
27
|
+
api: z.ZodCustom<IndexerApi, IndexerApi>;
|
|
30
28
|
localDb: z.ZodCustom<LocalDatabase, LocalDatabase>;
|
|
31
29
|
config: z.ZodCustom<import("iso-conf").Conf<z.ZodObject<{
|
|
32
30
|
privateKey: z.ZodOptional<z.ZodString>;
|
|
33
|
-
|
|
34
|
-
indexerCalibrationUrl: z.ZodOptional<z.ZodURL>;
|
|
31
|
+
apiUrl: z.ZodOptional<z.ZodURL>;
|
|
35
32
|
chainId: z.ZodOptional<z.ZodNumber>;
|
|
36
33
|
dbPath: z.ZodOptional<z.ZodString>;
|
|
37
34
|
source: z.ZodOptional<z.ZodString>;
|
|
38
35
|
}, z.core.$strip>>, import("iso-conf").Conf<z.ZodObject<{
|
|
39
36
|
privateKey: z.ZodOptional<z.ZodString>;
|
|
40
|
-
|
|
41
|
-
indexerCalibrationUrl: z.ZodOptional<z.ZodURL>;
|
|
37
|
+
apiUrl: z.ZodOptional<z.ZodURL>;
|
|
42
38
|
chainId: z.ZodOptional<z.ZodNumber>;
|
|
43
39
|
dbPath: z.ZodOptional<z.ZodString>;
|
|
44
40
|
source: z.ZodOptional<z.ZodString>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,EAAc,CAAC,EAAE,MAAM,OAAO,CAAA;AACrC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAEtD,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAG3D,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;iBAQxB,CAAA;AAEF,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;6BAyB5B,CAAA"}
|
package/dist/src/middleware.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import { drizzle as drizzlePostgres } from 'drizzle-orm/node-postgres';
|
|
2
1
|
import { middleware, z } from 'incur';
|
|
3
|
-
import
|
|
2
|
+
import { createIndexerApi } from "./api.js";
|
|
4
3
|
import { config, createLocalDatabase, getClient } from "./utils.js";
|
|
5
4
|
export const contextSchema = z.object({
|
|
6
|
-
|
|
5
|
+
api: z.custom(),
|
|
7
6
|
localDb: z.custom(),
|
|
8
7
|
config: z.custom(),
|
|
9
8
|
client: z.custom(),
|
|
@@ -12,8 +11,8 @@ export const contextSchema = z.object({
|
|
|
12
11
|
isInteractive: z.boolean(),
|
|
13
12
|
});
|
|
14
13
|
export const contextMiddleware = middleware(async (c, next) => {
|
|
15
|
-
const { dbPath, chainId,
|
|
16
|
-
if (!dbPath || !chainId || !
|
|
14
|
+
const { dbPath, chainId, apiUrl, source } = config.store;
|
|
15
|
+
if (!dbPath || !chainId || !source) {
|
|
17
16
|
return c.error({
|
|
18
17
|
code: 'CONFIG_NOT_SET',
|
|
19
18
|
message: 'Config not set. Please run `repair setup` first.',
|
|
@@ -21,12 +20,10 @@ export const contextMiddleware = middleware(async (c, next) => {
|
|
|
21
20
|
});
|
|
22
21
|
}
|
|
23
22
|
const localDb = await createLocalDatabase(dbPath);
|
|
24
|
-
const
|
|
25
|
-
schema: indexerSchema,
|
|
26
|
-
});
|
|
23
|
+
const api = createIndexerApi({ baseUrl: apiUrl, chainId });
|
|
27
24
|
const { client, chain } = getClient(chainId);
|
|
28
25
|
c.set('localDb', localDb);
|
|
29
|
-
c.set('
|
|
26
|
+
c.set('api', api);
|
|
30
27
|
c.set('config', config);
|
|
31
28
|
c.set('client', client);
|
|
32
29
|
c.set('chain', chain);
|
|
@@ -34,6 +31,5 @@ export const contextMiddleware = middleware(async (c, next) => {
|
|
|
34
31
|
c.set('isInteractive', !c.agent && !c.formatExplicit);
|
|
35
32
|
await next();
|
|
36
33
|
localDb.$client.close();
|
|
37
|
-
await indexerDb.$client.end();
|
|
38
34
|
});
|
|
39
35
|
//# sourceMappingURL=middleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,CAAC,EAAE,MAAM,OAAO,CAAA;AAErC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEnE,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAc;IAC3B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAiB;IAClC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAiB;IACjC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAqC;IACrD,KAAK,EAAE,CAAC,CAAC,MAAM,EAAS;IACxB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,aAAa,EAAE,CAAC,CAAC,OAAO,EAAE;CAC3B,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,UAAU,CAAuB,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;IAClF,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAA;IAExD,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;QACnC,OAAO,CAAC,CAAC,KAAK,CAAC;YACb,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,kDAAkD;YAC3D,SAAS,EAAE,KAAK;SACjB,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,MAAM,CAAC,CAAA;IACjD,MAAM,GAAG,GAAG,gBAAgB,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;IAE1D,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC,CAAA;IAC5C,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;IACzB,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IACjB,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IACvB,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IACvB,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IACrB,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;IACvB,CAAC,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,CAAA;IACrD,MAAM,IAAI,EAAE,CAAA;IAEZ,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,CAAA;AACzB,CAAC,CAAC,CAAA"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import type { RepairSelect } from '../local-schema.ts';
|
|
2
|
-
import type {
|
|
2
|
+
import type { IndexerApi, LocalDatabase, WalletClient } from '../types.ts';
|
|
3
3
|
export type RunPullPiecesPhaseOptions = {
|
|
4
4
|
localDb: LocalDatabase;
|
|
5
|
-
|
|
5
|
+
api: IndexerApi;
|
|
6
6
|
repair: RepairSelect;
|
|
7
7
|
concurrency: number;
|
|
8
8
|
batchSize: number;
|
|
9
9
|
client: WalletClient;
|
|
10
10
|
};
|
|
11
|
-
export declare function runAddPieces({ localDb,
|
|
11
|
+
export declare function runAddPieces({ localDb, api, repair, concurrency, batchSize, client, }: RunPullPiecesPhaseOptions): Promise<void>;
|
|
12
12
|
//# sourceMappingURL=add-pieces.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-pieces.d.ts","sourceRoot":"","sources":["../../../src/pipeline/add-pieces.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"add-pieces.d.ts","sourceRoot":"","sources":["../../../src/pipeline/add-pieces.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAG1E,MAAM,MAAM,yBAAyB,GAAG;IACtC,OAAO,EAAE,aAAa,CAAA;IACtB,GAAG,EAAE,UAAU,CAAA;IACf,MAAM,EAAE,YAAY,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,YAAY,CAAA;CACrB,CAAA;AA2ID,wBAAsB,YAAY,CAAC,EACjC,OAAO,EACP,GAAG,EACH,MAAM,EACN,WAAW,EACX,SAAS,EACT,MAAM,GACP,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyE3C"}
|
|
@@ -3,22 +3,22 @@ import * as Piece from '@filoz/synapse-core/piece';
|
|
|
3
3
|
import * as SP from '@filoz/synapse-core/sp';
|
|
4
4
|
import { and, asc, eq, gt, inArray } from 'drizzle-orm';
|
|
5
5
|
import PQueue from 'p-queue';
|
|
6
|
+
import { listDataSetPieces } from "../api.js";
|
|
6
7
|
import { dedupeCids } from "../db/dedupe-cids.js";
|
|
7
8
|
import { getTargetDataset } from "../db/get-target-dataset.js";
|
|
8
9
|
import { repairUpdate } from "../db/repair-update.js";
|
|
9
10
|
import { upsertOperations } from "../db/upsert-operations.js";
|
|
10
11
|
import { completeConfirmedOperations, excludeOperationsByCid, hashLink, operationsToPullPieces } from "../utils.js";
|
|
11
|
-
function createAddPiecesWorker({ localDb,
|
|
12
|
+
function createAddPiecesWorker({ localDb, targetCids, repair, client, state, log }) {
|
|
12
13
|
return async (options) => {
|
|
13
14
|
let completedOps = 0;
|
|
14
15
|
let failedOps = 0;
|
|
15
16
|
let operations = options.operations;
|
|
16
|
-
const isRepair = repair.repairDataSetId == null;
|
|
17
17
|
const group = log.group(`Batch ${options.batchNumber}/${state.totalBatches}`);
|
|
18
18
|
try {
|
|
19
19
|
const dataset = await getTargetDataset({ localDb, repairId: repair.id, client });
|
|
20
|
-
if (
|
|
21
|
-
operations = await dedupeCids({
|
|
20
|
+
if (targetCids) {
|
|
21
|
+
operations = await dedupeCids({ localDb, existingCids: targetCids, operations });
|
|
22
22
|
}
|
|
23
23
|
const operationsBeforeConfirmationCheck = operations.length;
|
|
24
24
|
operations = await completeConfirmedOperations({ localDb, client, operations });
|
|
@@ -67,7 +67,7 @@ function createAddPiecesWorker({ localDb, indexerDb, repair, client, state, log
|
|
|
67
67
|
clientDataSetId: dataset.clientDataSetId,
|
|
68
68
|
pieces: operations.map((operation) => ({
|
|
69
69
|
pieceCid: Piece.from(operation.cid),
|
|
70
|
-
metadata:
|
|
70
|
+
metadata: targetCids ? undefined : operation.metadata,
|
|
71
71
|
})),
|
|
72
72
|
});
|
|
73
73
|
await upsertOperations({
|
|
@@ -81,6 +81,8 @@ function createAddPiecesWorker({ localDb, indexerDb, repair, client, state, log
|
|
|
81
81
|
const waitForAddPieces = await SP.waitForAddPieces(addPiecesResult);
|
|
82
82
|
state.completedOperations += operations.length;
|
|
83
83
|
completedOps += operations.length;
|
|
84
|
+
for (const operation of operations)
|
|
85
|
+
targetCids?.add(operation.cid);
|
|
84
86
|
await upsertOperations({
|
|
85
87
|
localDb,
|
|
86
88
|
operations: operations.map((operation) => ({
|
|
@@ -108,7 +110,7 @@ function createAddPiecesWorker({ localDb, indexerDb, repair, client, state, log
|
|
|
108
110
|
}
|
|
109
111
|
};
|
|
110
112
|
}
|
|
111
|
-
export async function runAddPieces({ localDb,
|
|
113
|
+
export async function runAddPieces({ localDb, api, repair, concurrency, batchSize, client, }) {
|
|
112
114
|
const localSchema = localDb._.fullSchema;
|
|
113
115
|
let cursor = 0;
|
|
114
116
|
const totalOperations = await localDb.$count(localSchema.operations, and(eq(localSchema.operations.repairId, repair.id), eq(localSchema.operations.type, 'add_piece'), inArray(localSchema.operations.status, ['pending', 'failed'])));
|
|
@@ -123,6 +125,12 @@ export async function runAddPieces({ localDb, indexerDb, repair, concurrency, ba
|
|
|
123
125
|
title: 'Adding pieces',
|
|
124
126
|
limit: 1,
|
|
125
127
|
});
|
|
128
|
+
let targetCids;
|
|
129
|
+
if (repair.repairDataSetId == null && totalOperations > 0) {
|
|
130
|
+
const dataset = await getTargetDataset({ localDb, repairId: repair.id, client });
|
|
131
|
+
const pieces = await listDataSetPieces(api, dataset.dataSetId, { removed: false });
|
|
132
|
+
targetCids = new Set(pieces.flatMap((piece) => (piece.cid == null ? [] : [piece.cid])));
|
|
133
|
+
}
|
|
126
134
|
async function getNextBatch() {
|
|
127
135
|
const operations = await localDb.query.operations.findMany({
|
|
128
136
|
where: and(eq(localSchema.operations.repairId, repair.id), eq(localSchema.operations.type, 'add_piece'), inArray(localSchema.operations.status, ['pending', 'failed']), gt(localSchema.operations.id, cursor)),
|
|
@@ -135,7 +143,7 @@ export async function runAddPieces({ localDb, indexerDb, repair, concurrency, ba
|
|
|
135
143
|
cursor = operations.at(-1)?.id ?? cursor;
|
|
136
144
|
return operations;
|
|
137
145
|
}
|
|
138
|
-
const addPiecesJob = createAddPiecesWorker({ localDb,
|
|
146
|
+
const addPiecesJob = createAddPiecesWorker({ localDb, targetCids, repair, client, state, log });
|
|
139
147
|
const queue = new PQueue({ concurrency });
|
|
140
148
|
while (true) {
|
|
141
149
|
await queue.onSizeLessThan(concurrency);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-pieces.js","sourceRoot":"","sources":["../../../src/pipeline/add-pieces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACxC,OAAO,KAAK,KAAK,MAAM,2BAA2B,CAAA;AAClD,OAAO,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AACvD,OAAO,MAAM,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAG7D,OAAO,EAAE,2BAA2B,EAAE,sBAAsB,EAAE,QAAQ,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"add-pieces.js","sourceRoot":"","sources":["../../../src/pipeline/add-pieces.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import type { Address } from 'viem';
|
|
2
2
|
import type { RepairSelect } from '../local-schema.ts';
|
|
3
|
-
import type {
|
|
3
|
+
import type { IndexerApi, LocalDatabase, WalletClient } from '../types.ts';
|
|
4
4
|
export type EnsureRepairDatasetOptions = {
|
|
5
5
|
source: string;
|
|
6
6
|
localDb: LocalDatabase;
|
|
7
|
-
|
|
7
|
+
api: IndexerApi;
|
|
8
8
|
client: WalletClient;
|
|
9
9
|
repair: RepairSelect;
|
|
10
10
|
payer: Address;
|
|
11
11
|
};
|
|
12
|
-
export declare function ensureRepairDataset({ source, localDb,
|
|
13
|
-
export declare function ensureReplicateDataset({ localDb,
|
|
12
|
+
export declare function ensureRepairDataset({ source, localDb, api, client, repair, payer }: EnsureRepairDatasetOptions): Promise<bigint>;
|
|
13
|
+
export declare function ensureReplicateDataset({ localDb, api, client, repair, payer }: EnsureRepairDatasetOptions): Promise<bigint>;
|
|
14
14
|
//# sourceMappingURL=create-datasets.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-datasets.d.ts","sourceRoot":"","sources":["../../../src/pipeline/create-datasets.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create-datasets.d.ts","sourceRoot":"","sources":["../../../src/pipeline/create-datasets.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAInC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAG1E,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,aAAa,CAAA;IACtB,GAAG,EAAE,UAAU,CAAA;IACf,MAAM,EAAE,YAAY,CAAA;IACpB,MAAM,EAAE,YAAY,CAAA;IACpB,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAOD,wBAAsB,mBAAmB,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,0BAA0B,mBA8CpH;AAOD,wBAAsB,sBAAsB,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,0BAA0B,mBA8C/G"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import * as p from '@clack/prompts';
|
|
2
2
|
import * as SP from '@filoz/synapse-core/sp';
|
|
3
3
|
import { getPDPProvider } from '@filoz/synapse-core/sp-registry';
|
|
4
|
-
import {
|
|
4
|
+
import { getDataSet, toStringMetadata } from "../api.js";
|
|
5
5
|
import { findRepairDataset } from "../db/find-repair-dataset.js";
|
|
6
6
|
import { repairUpdate } from "../db/repair-update.js";
|
|
7
7
|
import { hashLink } from "../utils.js";
|
|
8
|
-
export async function ensureRepairDataset({ source, localDb,
|
|
8
|
+
export async function ensureRepairDataset({ source, localDb, api, client, repair, payer }) {
|
|
9
9
|
const log = p.taskLog({
|
|
10
10
|
title: 'Ensuring repair dataset',
|
|
11
11
|
});
|
|
@@ -16,7 +16,7 @@ export async function ensureRepairDataset({ source, localDb, indexerDb, client,
|
|
|
16
16
|
throw new Error(`Target provider ${repair.targetProviderId} not found or inactive`);
|
|
17
17
|
let datasetId = null;
|
|
18
18
|
const existingDatasetId = await findRepairDataset({
|
|
19
|
-
|
|
19
|
+
api,
|
|
20
20
|
providerId: repair.targetProviderId,
|
|
21
21
|
payer,
|
|
22
22
|
source,
|
|
@@ -50,7 +50,7 @@ export async function ensureRepairDataset({ source, localDb, indexerDb, client,
|
|
|
50
50
|
});
|
|
51
51
|
return datasetId;
|
|
52
52
|
}
|
|
53
|
-
export async function ensureReplicateDataset({ localDb,
|
|
53
|
+
export async function ensureReplicateDataset({ localDb, api, client, repair, payer }) {
|
|
54
54
|
const log = p.taskLog({
|
|
55
55
|
title: 'Ensuring replication dataset',
|
|
56
56
|
});
|
|
@@ -66,14 +66,7 @@ export async function ensureReplicateDataset({ localDb, indexerDb, client, repai
|
|
|
66
66
|
log.success(`Data set #${repair.targetDataSetId} already exists at ${provider.pdp.serviceURL}`);
|
|
67
67
|
return repair.targetDataSetId;
|
|
68
68
|
}
|
|
69
|
-
const
|
|
70
|
-
const sourceDataSet = await indexerDb.query.dataSets.findFirst({
|
|
71
|
-
where: eq(schema.dataSets.dataSetId, repair.repairDataSetId),
|
|
72
|
-
columns: {
|
|
73
|
-
metadata: true,
|
|
74
|
-
withCdn: true,
|
|
75
|
-
},
|
|
76
|
-
});
|
|
69
|
+
const sourceDataSet = await getDataSet(api, repair.repairDataSetId);
|
|
77
70
|
if (!sourceDataSet) {
|
|
78
71
|
throw new Error(`Source dataset ${repair.repairDataSetId} not found`);
|
|
79
72
|
}
|
|
@@ -81,8 +74,8 @@ export async function ensureReplicateDataset({ localDb, indexerDb, client, repai
|
|
|
81
74
|
payee: provider.payee,
|
|
82
75
|
serviceURL: provider.pdp.serviceURL,
|
|
83
76
|
payer,
|
|
84
|
-
cdn: sourceDataSet.withCdn,
|
|
85
|
-
metadata: sourceDataSet.metadata
|
|
77
|
+
cdn: sourceDataSet.withCdn ?? false,
|
|
78
|
+
metadata: sourceDataSet.metadata ? toStringMetadata(sourceDataSet.metadata) : undefined,
|
|
86
79
|
});
|
|
87
80
|
log.message(`Waiting for data to be created at ${provider.pdp.serviceURL} ${hashLink(txHash, client.chain)}...`);
|
|
88
81
|
const waitForResult = await SP.waitForCreateDataSet({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-datasets.js","sourceRoot":"","sources":["../../../src/pipeline/create-datasets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAA;AACnC,OAAO,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;
|
|
1
|
+
{"version":3,"file":"create-datasets.js","sourceRoot":"","sources":["../../../src/pipeline/create-datasets.ts"],"names":[],"mappings":"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"}
|
package/dist/src/types.d.ts
CHANGED
|
@@ -1,23 +1,22 @@
|
|
|
1
|
+
import type { ApiClient } from '@filecoin-project/api-client';
|
|
1
2
|
import type { Chain } from '@filoz/synapse-core/chains';
|
|
2
3
|
import type { Client } from '@libsql/client';
|
|
3
4
|
import type { LibSQLDatabase } from 'drizzle-orm/libsql';
|
|
4
|
-
import type { NodePgDatabase } from 'drizzle-orm/node-postgres';
|
|
5
5
|
import type { z } from 'incur';
|
|
6
|
-
import type { Pool } from 'pg';
|
|
7
6
|
import type { Account, Address, Hex, Transport, Client as ViemClient } from 'viem';
|
|
8
|
-
import type
|
|
7
|
+
import type { Network } from './api.ts';
|
|
9
8
|
import type * as localSchema from './local-schema.ts';
|
|
10
9
|
import type { contextSchema } from './middleware.ts';
|
|
11
10
|
export type LocalDatabase = LibSQLDatabase<typeof localSchema> & {
|
|
12
11
|
$client: Client;
|
|
13
12
|
};
|
|
14
|
-
export type
|
|
15
|
-
|
|
13
|
+
export type IndexerApi = {
|
|
14
|
+
client: ApiClient;
|
|
15
|
+
network: Network;
|
|
16
16
|
};
|
|
17
17
|
export interface Config {
|
|
18
18
|
privateKey: Hex;
|
|
19
|
-
|
|
20
|
-
indexerCalibrationUrl: string;
|
|
19
|
+
apiUrl: string;
|
|
21
20
|
chainId: number;
|
|
22
21
|
dbPath: string;
|
|
23
22
|
}
|
package/dist/src/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AAC7D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,OAAO,CAAA;AAC9B,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,MAAM,CAAA;AAClF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,KAAK,KAAK,WAAW,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AACpD,MAAM,MAAM,aAAa,GAAG,cAAc,CAAC,OAAO,WAAW,CAAC,GAAG;IAC/D,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAKD,MAAM,MAAM,UAAU,GAAG;IACvB,MAAM,EAAE,SAAS,CAAA;IACjB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,WAAW,MAAM;IACrB,UAAU,EAAE,GAAG,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,MAAM,YAAY,GAAG,UAAU,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;AAEhE,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,aAAa,CAAC,CAAA;AAKnD,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE,OAAO,CAAA;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,OAAO,CAAA;IACjB,QAAQ,EAAE,OAAO,CAAA;CAClB,CAAA"}
|