@powersync/common 1.28.0 → 1.30.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/bundle.mjs +3 -3
- package/lib/client/AbstractPowerSyncDatabase.js +1 -4
- package/lib/client/sync/bucket/BucketStorageAdapter.d.ts +6 -0
- package/lib/client/sync/bucket/CrudEntry.d.ts +13 -1
- package/lib/client/sync/bucket/CrudEntry.js +16 -2
- package/lib/client/sync/bucket/SqliteBucketStorage.d.ts +2 -1
- package/lib/client/sync/bucket/SqliteBucketStorage.js +18 -3
- package/lib/client/sync/stream/AbstractStreamingSyncImplementation.d.ts +1 -0
- package/lib/client/sync/stream/AbstractStreamingSyncImplementation.js +40 -2
- package/lib/client/sync/stream/streaming-sync-types.d.ts +1 -1
- package/lib/db/crud/SyncProgress.d.ts +72 -0
- package/lib/db/crud/SyncProgress.js +60 -0
- package/lib/db/crud/SyncStatus.d.ts +20 -0
- package/lib/db/crud/SyncStatus.js +14 -0
- package/lib/db/schema/Schema.d.ts +4 -0
- package/lib/db/schema/Schema.js +1 -10
- package/lib/db/schema/Table.d.ts +34 -8
- package/lib/db/schema/Table.js +48 -9
- package/lib/index.d.ts +1 -0
- package/lib/index.js +1 -0
- package/package.json +1 -1
|
@@ -15,6 +15,7 @@ import { CrudBatch } from './sync/bucket/CrudBatch.js';
|
|
|
15
15
|
import { CrudEntry } from './sync/bucket/CrudEntry.js';
|
|
16
16
|
import { CrudTransaction } from './sync/bucket/CrudTransaction.js';
|
|
17
17
|
import { DEFAULT_CRUD_UPLOAD_THROTTLE_MS, DEFAULT_RETRY_DELAY_MS } from './sync/stream/AbstractStreamingSyncImplementation.js';
|
|
18
|
+
import { FULL_SYNC_PRIORITY } from '../db/crud/SyncProgress.js';
|
|
18
19
|
const POWERSYNC_TABLE_MATCH = /(^ps_data__|^ps_data_local__)/;
|
|
19
20
|
const DEFAULT_DISCONNECT_CLEAR_OPTIONS = {
|
|
20
21
|
clearLocal: true
|
|
@@ -42,10 +43,6 @@ export const DEFAULT_LOCK_TIMEOUT_MS = 120_000; // 2 mins
|
|
|
42
43
|
export const isPowerSyncDatabaseOptionsWithSettings = (test) => {
|
|
43
44
|
return typeof test == 'object' && isSQLOpenOptions(test.database);
|
|
44
45
|
};
|
|
45
|
-
/**
|
|
46
|
-
* The priority used by the core extension to indicate that a full sync was completed.
|
|
47
|
-
*/
|
|
48
|
-
const FULL_SYNC_PRIORITY = 2147483647;
|
|
49
46
|
export class AbstractPowerSyncDatabase extends BaseObserver {
|
|
50
47
|
options;
|
|
51
48
|
/**
|
|
@@ -27,6 +27,11 @@ export interface SyncLocalDatabaseResult {
|
|
|
27
27
|
checkpointValid: boolean;
|
|
28
28
|
checkpointFailures?: string[];
|
|
29
29
|
}
|
|
30
|
+
export type SavedProgress = {
|
|
31
|
+
atLast: number;
|
|
32
|
+
sinceLast: number;
|
|
33
|
+
};
|
|
34
|
+
export type BucketOperationProgress = Record<string, SavedProgress>;
|
|
30
35
|
export interface BucketChecksum {
|
|
31
36
|
bucket: string;
|
|
32
37
|
priority?: number;
|
|
@@ -56,6 +61,7 @@ export interface BucketStorageAdapter extends BaseObserver<BucketStorageListener
|
|
|
56
61
|
setTargetCheckpoint(checkpoint: Checkpoint): Promise<void>;
|
|
57
62
|
startSession(): void;
|
|
58
63
|
getBucketStates(): Promise<BucketState[]>;
|
|
64
|
+
getBucketOperationProgress(): Promise<BucketOperationProgress>;
|
|
59
65
|
syncLocalDatabase(checkpoint: Checkpoint, priority?: number): Promise<{
|
|
60
66
|
checkpointValid: boolean;
|
|
61
67
|
ready: boolean;
|
|
@@ -51,6 +51,11 @@ export declare class CrudEntry {
|
|
|
51
51
|
* Data associated with the change.
|
|
52
52
|
*/
|
|
53
53
|
opData?: Record<string, any>;
|
|
54
|
+
/**
|
|
55
|
+
* For tables where the `trackPreviousValues` option has been enabled, this tracks previous values for
|
|
56
|
+
* `UPDATE` and `DELETE` statements.
|
|
57
|
+
*/
|
|
58
|
+
previousValues?: Record<string, any>;
|
|
54
59
|
/**
|
|
55
60
|
* Table that contained the change.
|
|
56
61
|
*/
|
|
@@ -59,8 +64,15 @@ export declare class CrudEntry {
|
|
|
59
64
|
* Auto-incrementing transaction id. This is the same for all operations within the same transaction.
|
|
60
65
|
*/
|
|
61
66
|
transactionId?: number;
|
|
67
|
+
/**
|
|
68
|
+
* Client-side metadata attached with this write.
|
|
69
|
+
*
|
|
70
|
+
* This field is only available when the `trackMetadata` option was set to `true` when creating a table
|
|
71
|
+
* and the insert or update statement set the `_metadata` column.
|
|
72
|
+
*/
|
|
73
|
+
metadata?: string;
|
|
62
74
|
static fromRow(dbRow: CrudEntryJSON): CrudEntry;
|
|
63
|
-
constructor(clientId: number, op: UpdateType, table: string, id: string, transactionId?: number, opData?: Record<string, any
|
|
75
|
+
constructor(clientId: number, op: UpdateType, table: string, id: string, transactionId?: number, opData?: Record<string, any>, previousValues?: Record<string, any>, metadata?: string);
|
|
64
76
|
/**
|
|
65
77
|
* Converts the change to JSON format.
|
|
66
78
|
*/
|
|
@@ -30,6 +30,11 @@ export class CrudEntry {
|
|
|
30
30
|
* Data associated with the change.
|
|
31
31
|
*/
|
|
32
32
|
opData;
|
|
33
|
+
/**
|
|
34
|
+
* For tables where the `trackPreviousValues` option has been enabled, this tracks previous values for
|
|
35
|
+
* `UPDATE` and `DELETE` statements.
|
|
36
|
+
*/
|
|
37
|
+
previousValues;
|
|
33
38
|
/**
|
|
34
39
|
* Table that contained the change.
|
|
35
40
|
*/
|
|
@@ -38,17 +43,26 @@ export class CrudEntry {
|
|
|
38
43
|
* Auto-incrementing transaction id. This is the same for all operations within the same transaction.
|
|
39
44
|
*/
|
|
40
45
|
transactionId;
|
|
46
|
+
/**
|
|
47
|
+
* Client-side metadata attached with this write.
|
|
48
|
+
*
|
|
49
|
+
* This field is only available when the `trackMetadata` option was set to `true` when creating a table
|
|
50
|
+
* and the insert or update statement set the `_metadata` column.
|
|
51
|
+
*/
|
|
52
|
+
metadata;
|
|
41
53
|
static fromRow(dbRow) {
|
|
42
54
|
const data = JSON.parse(dbRow.data);
|
|
43
|
-
return new CrudEntry(parseInt(dbRow.id), data.op, data.type, data.id, dbRow.tx_id, data.data);
|
|
55
|
+
return new CrudEntry(parseInt(dbRow.id), data.op, data.type, data.id, dbRow.tx_id, data.data, data.old, data.metadata);
|
|
44
56
|
}
|
|
45
|
-
constructor(clientId, op, table, id, transactionId, opData) {
|
|
57
|
+
constructor(clientId, op, table, id, transactionId, opData, previousValues, metadata) {
|
|
46
58
|
this.clientId = clientId;
|
|
47
59
|
this.id = id;
|
|
48
60
|
this.op = op;
|
|
49
61
|
this.opData = opData;
|
|
50
62
|
this.table = table;
|
|
51
63
|
this.transactionId = transactionId;
|
|
64
|
+
this.previousValues = previousValues;
|
|
65
|
+
this.metadata = metadata;
|
|
52
66
|
}
|
|
53
67
|
/**
|
|
54
68
|
* Converts the change to JSON format.
|
|
@@ -2,7 +2,7 @@ import { Mutex } from 'async-mutex';
|
|
|
2
2
|
import { ILogger } from 'js-logger';
|
|
3
3
|
import { DBAdapter, Transaction } from '../../../db/DBAdapter.js';
|
|
4
4
|
import { BaseObserver } from '../../../utils/BaseObserver.js';
|
|
5
|
-
import { BucketState, BucketStorageAdapter, BucketStorageListener, Checkpoint, SyncLocalDatabaseResult } from './BucketStorageAdapter.js';
|
|
5
|
+
import { BucketOperationProgress, BucketState, BucketStorageAdapter, BucketStorageListener, Checkpoint, SyncLocalDatabaseResult } from './BucketStorageAdapter.js';
|
|
6
6
|
import { CrudBatch } from './CrudBatch.js';
|
|
7
7
|
import { CrudEntry } from './CrudEntry.js';
|
|
8
8
|
import { SyncDataBatch } from './SyncDataBatch.js';
|
|
@@ -30,6 +30,7 @@ export declare class SqliteBucketStorage extends BaseObserver<BucketStorageListe
|
|
|
30
30
|
*/
|
|
31
31
|
startSession(): void;
|
|
32
32
|
getBucketStates(): Promise<BucketState[]>;
|
|
33
|
+
getBucketOperationProgress(): Promise<BucketOperationProgress>;
|
|
33
34
|
saveSyncData(batch: SyncDataBatch): Promise<void>;
|
|
34
35
|
removeBuckets(buckets: string[]): Promise<void>;
|
|
35
36
|
/**
|
|
@@ -66,6 +66,10 @@ export class SqliteBucketStorage extends BaseObserver {
|
|
|
66
66
|
const result = await this.db.getAll("SELECT name as bucket, cast(last_op as TEXT) as op_id FROM ps_buckets WHERE pending_delete = 0 AND name != '$local'");
|
|
67
67
|
return result;
|
|
68
68
|
}
|
|
69
|
+
async getBucketOperationProgress() {
|
|
70
|
+
const rows = await this.db.getAll('SELECT name, count_at_last, count_since_last FROM ps_buckets');
|
|
71
|
+
return Object.fromEntries(rows.map((r) => [r.name, { atLast: r.count_at_last, sinceLast: r.count_since_last }]));
|
|
72
|
+
}
|
|
69
73
|
async saveSyncData(batch) {
|
|
70
74
|
await this.writeTransaction(async (tx) => {
|
|
71
75
|
let count = 0;
|
|
@@ -115,9 +119,9 @@ export class SqliteBucketStorage extends BaseObserver {
|
|
|
115
119
|
}
|
|
116
120
|
return { ready: false, checkpointValid: false, checkpointFailures: r.checkpointFailures };
|
|
117
121
|
}
|
|
118
|
-
|
|
122
|
+
let buckets = checkpoint.buckets;
|
|
119
123
|
if (priority !== undefined) {
|
|
120
|
-
buckets.filter((b) => hasMatchingPriority(priority, b));
|
|
124
|
+
buckets = buckets.filter((b) => hasMatchingPriority(priority, b));
|
|
121
125
|
}
|
|
122
126
|
const bucketNames = buckets.map((b) => b.bucket);
|
|
123
127
|
await this.writeTransaction(async (tx) => {
|
|
@@ -161,7 +165,18 @@ export class SqliteBucketStorage extends BaseObserver {
|
|
|
161
165
|
'sync_local',
|
|
162
166
|
arg
|
|
163
167
|
]);
|
|
164
|
-
|
|
168
|
+
if (result == 1) {
|
|
169
|
+
if (priority == null) {
|
|
170
|
+
const bucketToCount = Object.fromEntries(checkpoint.buckets.map((b) => [b.bucket, b.count]));
|
|
171
|
+
// The two parameters could be replaced with one, but: https://github.com/powersync-ja/better-sqlite3/pull/6
|
|
172
|
+
const jsonBucketCount = JSON.stringify(bucketToCount);
|
|
173
|
+
await tx.execute("UPDATE ps_buckets SET count_since_last = 0, count_at_last = ?->name WHERE name != '$local' AND ?->name IS NOT NULL", [jsonBucketCount, jsonBucketCount]);
|
|
174
|
+
}
|
|
175
|
+
return true;
|
|
176
|
+
}
|
|
177
|
+
else {
|
|
178
|
+
return false;
|
|
179
|
+
}
|
|
165
180
|
});
|
|
166
181
|
}
|
|
167
182
|
async validateChecksums(checkpoint, priority) {
|
|
@@ -139,6 +139,7 @@ export declare abstract class AbstractStreamingSyncImplementation extends BaseOb
|
|
|
139
139
|
streamingSync(signal?: AbortSignal, options?: PowerSyncConnectionOptions): Promise<void>;
|
|
140
140
|
private collectLocalBucketState;
|
|
141
141
|
protected streamingSyncIteration(signal: AbortSignal, options?: PowerSyncConnectionOptions): Promise<void>;
|
|
142
|
+
private updateSyncStatusForStartingCheckpoint;
|
|
142
143
|
private applyCheckpoint;
|
|
143
144
|
protected updateSyncStatus(options: SyncStatusOptions): void;
|
|
144
145
|
private delayRetry;
|
|
@@ -270,7 +270,8 @@ The next upload iteration will be delayed.`);
|
|
|
270
270
|
connected: false,
|
|
271
271
|
connecting: false,
|
|
272
272
|
dataFlow: {
|
|
273
|
-
downloading: false
|
|
273
|
+
downloading: false,
|
|
274
|
+
downloadProgress: null
|
|
274
275
|
}
|
|
275
276
|
});
|
|
276
277
|
});
|
|
@@ -409,6 +410,7 @@ The next upload iteration will be delayed.`);
|
|
|
409
410
|
bucketMap = newBuckets;
|
|
410
411
|
await this.options.adapter.removeBuckets([...bucketsToDelete]);
|
|
411
412
|
await this.options.adapter.setTargetCheckpoint(targetCheckpoint);
|
|
413
|
+
await this.updateSyncStatusForStartingCheckpoint(targetCheckpoint);
|
|
412
414
|
}
|
|
413
415
|
else if (isStreamingSyncCheckpointComplete(line)) {
|
|
414
416
|
const result = await this.applyCheckpoint(targetCheckpoint, signal);
|
|
@@ -472,6 +474,7 @@ The next upload iteration will be delayed.`);
|
|
|
472
474
|
write_checkpoint: diff.write_checkpoint
|
|
473
475
|
};
|
|
474
476
|
targetCheckpoint = newCheckpoint;
|
|
477
|
+
await this.updateSyncStatusForStartingCheckpoint(targetCheckpoint);
|
|
475
478
|
bucketMap = new Map();
|
|
476
479
|
newBuckets.forEach((checksum, name) => bucketMap.set(name, {
|
|
477
480
|
name: checksum.bucket,
|
|
@@ -486,9 +489,22 @@ The next upload iteration will be delayed.`);
|
|
|
486
489
|
}
|
|
487
490
|
else if (isStreamingSyncData(line)) {
|
|
488
491
|
const { data } = line;
|
|
492
|
+
const previousProgress = this.syncStatus.dataFlowStatus.downloadProgress;
|
|
493
|
+
let updatedProgress = null;
|
|
494
|
+
if (previousProgress) {
|
|
495
|
+
updatedProgress = { ...previousProgress };
|
|
496
|
+
const progressForBucket = updatedProgress[data.bucket];
|
|
497
|
+
if (progressForBucket) {
|
|
498
|
+
updatedProgress[data.bucket] = {
|
|
499
|
+
...progressForBucket,
|
|
500
|
+
sinceLast: progressForBucket.sinceLast + data.data.length
|
|
501
|
+
};
|
|
502
|
+
}
|
|
503
|
+
}
|
|
489
504
|
this.updateSyncStatus({
|
|
490
505
|
dataFlow: {
|
|
491
|
-
downloading: true
|
|
506
|
+
downloading: true,
|
|
507
|
+
downloadProgress: updatedProgress
|
|
492
508
|
}
|
|
493
509
|
});
|
|
494
510
|
await this.options.adapter.saveSyncData({ buckets: [SyncDataBucket.fromRow(data)] });
|
|
@@ -536,6 +552,27 @@ The next upload iteration will be delayed.`);
|
|
|
536
552
|
}
|
|
537
553
|
});
|
|
538
554
|
}
|
|
555
|
+
async updateSyncStatusForStartingCheckpoint(checkpoint) {
|
|
556
|
+
const localProgress = await this.options.adapter.getBucketOperationProgress();
|
|
557
|
+
const progress = {};
|
|
558
|
+
for (const bucket of checkpoint.buckets) {
|
|
559
|
+
const savedProgress = localProgress[bucket.bucket];
|
|
560
|
+
progress[bucket.bucket] = {
|
|
561
|
+
// The fallback priority doesn't matter here, but 3 is the one newer versions of the sync service
|
|
562
|
+
// will use by default.
|
|
563
|
+
priority: bucket.priority ?? 3,
|
|
564
|
+
atLast: savedProgress?.atLast ?? 0,
|
|
565
|
+
sinceLast: savedProgress?.sinceLast ?? 0,
|
|
566
|
+
targetCount: bucket.count ?? 0
|
|
567
|
+
};
|
|
568
|
+
}
|
|
569
|
+
this.updateSyncStatus({
|
|
570
|
+
dataFlow: {
|
|
571
|
+
downloading: true,
|
|
572
|
+
downloadProgress: progress
|
|
573
|
+
}
|
|
574
|
+
});
|
|
575
|
+
}
|
|
539
576
|
async applyCheckpoint(checkpoint, abort) {
|
|
540
577
|
let result = await this.options.adapter.syncLocalDatabase(checkpoint);
|
|
541
578
|
const pending = this.pendingCrudUpload;
|
|
@@ -565,6 +602,7 @@ The next upload iteration will be delayed.`);
|
|
|
565
602
|
lastSyncedAt: new Date(),
|
|
566
603
|
dataFlow: {
|
|
567
604
|
downloading: false,
|
|
605
|
+
downloadProgress: null,
|
|
568
606
|
downloadError: undefined
|
|
569
607
|
}
|
|
570
608
|
});
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
/** @internal */
|
|
2
|
+
export type InternalProgressInformation = Record<string, {
|
|
3
|
+
priority: number;
|
|
4
|
+
atLast: number;
|
|
5
|
+
sinceLast: number;
|
|
6
|
+
targetCount: number;
|
|
7
|
+
}>;
|
|
8
|
+
/**
|
|
9
|
+
* @internal The priority used by the core extension to indicate that a full sync was completed.
|
|
10
|
+
*/
|
|
11
|
+
export declare const FULL_SYNC_PRIORITY = 2147483647;
|
|
12
|
+
/**
|
|
13
|
+
* Information about a progressing download made by the PowerSync SDK.
|
|
14
|
+
*
|
|
15
|
+
* To obtain these values, use {@link SyncProgress}, available through
|
|
16
|
+
* {@link SyncStatus#downloadProgress}.
|
|
17
|
+
*/
|
|
18
|
+
export interface ProgressWithOperations {
|
|
19
|
+
/**
|
|
20
|
+
* The total amount of operations to download for the current sync iteration
|
|
21
|
+
* to complete.
|
|
22
|
+
*/
|
|
23
|
+
totalOperations: number;
|
|
24
|
+
/**
|
|
25
|
+
* The amount of operations that have already been downloaded.
|
|
26
|
+
*/
|
|
27
|
+
downloadedOperations: number;
|
|
28
|
+
/**
|
|
29
|
+
* Relative progress, as {@link downloadedOperations} of {@link totalOperations}.
|
|
30
|
+
*
|
|
31
|
+
* This will be a number between `0.0` and `1.0` (inclusive).
|
|
32
|
+
*
|
|
33
|
+
* When this number reaches `1.0`, all changes have been received from the sync service.
|
|
34
|
+
* Actually applying these changes happens before the `downloadProgress` field is cleared from
|
|
35
|
+
* {@link SyncStatus}, so progress can stay at `1.0` for a short while before completing.
|
|
36
|
+
*/
|
|
37
|
+
downloadedFraction: number;
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* Provides realtime progress on how PowerSync is downloading rows.
|
|
41
|
+
*
|
|
42
|
+
* The progress until the next complete sync is available through the fields on {@link ProgressWithOperations},
|
|
43
|
+
* which this class implements.
|
|
44
|
+
* Additionally, the {@link SyncProgress.untilPriority} method can be used to otbain progress towards
|
|
45
|
+
* a specific priority (instead of the progress for the entire download).
|
|
46
|
+
*
|
|
47
|
+
* The reported progress always reflects the status towards the end of a sync iteration (after
|
|
48
|
+
* which a consistent snapshot of all buckets is available locally).
|
|
49
|
+
*
|
|
50
|
+
* In rare cases (in particular, when a [compacting](https://docs.powersync.com/usage/lifecycle-maintenance/compacting-buckets)
|
|
51
|
+
* operation takes place between syncs), it's possible for the returned numbers to be slightly
|
|
52
|
+
* inaccurate. For this reason, {@link SyncProgress} should be seen as an approximation of progress.
|
|
53
|
+
* The information returned is good enough to build progress bars, but not exact enough to track
|
|
54
|
+
* individual download counts.
|
|
55
|
+
*
|
|
56
|
+
* Also note that data is downloaded in bulk, which means that individual counters are unlikely
|
|
57
|
+
* to be updated one-by-one.
|
|
58
|
+
*/
|
|
59
|
+
export declare class SyncProgress implements ProgressWithOperations {
|
|
60
|
+
protected internal: InternalProgressInformation;
|
|
61
|
+
totalOperations: number;
|
|
62
|
+
downloadedOperations: number;
|
|
63
|
+
downloadedFraction: number;
|
|
64
|
+
constructor(internal: InternalProgressInformation);
|
|
65
|
+
/**
|
|
66
|
+
* Returns download progress towards all data up until the specified priority being received.
|
|
67
|
+
*
|
|
68
|
+
* The returned {@link ProgressWithOperations} tracks the target amount of operations that need
|
|
69
|
+
* to be downloaded in total and how many of them have already been received.
|
|
70
|
+
*/
|
|
71
|
+
untilPriority(priority: number): ProgressWithOperations;
|
|
72
|
+
}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @internal The priority used by the core extension to indicate that a full sync was completed.
|
|
3
|
+
*/
|
|
4
|
+
export const FULL_SYNC_PRIORITY = 2147483647;
|
|
5
|
+
/**
|
|
6
|
+
* Provides realtime progress on how PowerSync is downloading rows.
|
|
7
|
+
*
|
|
8
|
+
* The progress until the next complete sync is available through the fields on {@link ProgressWithOperations},
|
|
9
|
+
* which this class implements.
|
|
10
|
+
* Additionally, the {@link SyncProgress.untilPriority} method can be used to otbain progress towards
|
|
11
|
+
* a specific priority (instead of the progress for the entire download).
|
|
12
|
+
*
|
|
13
|
+
* The reported progress always reflects the status towards the end of a sync iteration (after
|
|
14
|
+
* which a consistent snapshot of all buckets is available locally).
|
|
15
|
+
*
|
|
16
|
+
* In rare cases (in particular, when a [compacting](https://docs.powersync.com/usage/lifecycle-maintenance/compacting-buckets)
|
|
17
|
+
* operation takes place between syncs), it's possible for the returned numbers to be slightly
|
|
18
|
+
* inaccurate. For this reason, {@link SyncProgress} should be seen as an approximation of progress.
|
|
19
|
+
* The information returned is good enough to build progress bars, but not exact enough to track
|
|
20
|
+
* individual download counts.
|
|
21
|
+
*
|
|
22
|
+
* Also note that data is downloaded in bulk, which means that individual counters are unlikely
|
|
23
|
+
* to be updated one-by-one.
|
|
24
|
+
*/
|
|
25
|
+
export class SyncProgress {
|
|
26
|
+
internal;
|
|
27
|
+
totalOperations;
|
|
28
|
+
downloadedOperations;
|
|
29
|
+
downloadedFraction;
|
|
30
|
+
constructor(internal) {
|
|
31
|
+
this.internal = internal;
|
|
32
|
+
const untilCompletion = this.untilPriority(FULL_SYNC_PRIORITY);
|
|
33
|
+
this.totalOperations = untilCompletion.totalOperations;
|
|
34
|
+
this.downloadedOperations = untilCompletion.downloadedOperations;
|
|
35
|
+
this.downloadedFraction = untilCompletion.downloadedFraction;
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Returns download progress towards all data up until the specified priority being received.
|
|
39
|
+
*
|
|
40
|
+
* The returned {@link ProgressWithOperations} tracks the target amount of operations that need
|
|
41
|
+
* to be downloaded in total and how many of them have already been received.
|
|
42
|
+
*/
|
|
43
|
+
untilPriority(priority) {
|
|
44
|
+
let total = 0;
|
|
45
|
+
let downloaded = 0;
|
|
46
|
+
for (const progress of Object.values(this.internal)) {
|
|
47
|
+
// Include higher-priority buckets, which are represented by lower numbers.
|
|
48
|
+
if (progress.priority <= priority) {
|
|
49
|
+
downloaded += progress.sinceLast;
|
|
50
|
+
total += progress.targetCount - progress.atLast;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
let progress = total == 0 ? 0.0 : downloaded / total;
|
|
54
|
+
return {
|
|
55
|
+
totalOperations: total,
|
|
56
|
+
downloadedOperations: downloaded,
|
|
57
|
+
downloadedFraction: progress
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { InternalProgressInformation, SyncProgress } from './SyncProgress.js';
|
|
1
2
|
export type SyncDataFlowStatus = Partial<{
|
|
2
3
|
downloading: boolean;
|
|
3
4
|
uploading: boolean;
|
|
@@ -12,6 +13,12 @@ export type SyncDataFlowStatus = Partial<{
|
|
|
12
13
|
* Cleared on the next successful upload.
|
|
13
14
|
*/
|
|
14
15
|
uploadError?: Error;
|
|
16
|
+
/**
|
|
17
|
+
* Internal information about how far we are downloading operations in buckets.
|
|
18
|
+
*
|
|
19
|
+
* Please use the {@link SyncStatus#downloadProgress} property to track sync progress.
|
|
20
|
+
*/
|
|
21
|
+
downloadProgress: InternalProgressInformation | null;
|
|
15
22
|
}>;
|
|
16
23
|
export interface SyncPriorityStatus {
|
|
17
24
|
priority: number;
|
|
@@ -77,6 +84,12 @@ export declare class SyncStatus {
|
|
|
77
84
|
* Cleared on the next successful upload.
|
|
78
85
|
*/
|
|
79
86
|
uploadError?: Error;
|
|
87
|
+
/**
|
|
88
|
+
* Internal information about how far we are downloading operations in buckets.
|
|
89
|
+
*
|
|
90
|
+
* Please use the {@link SyncStatus#downloadProgress} property to track sync progress.
|
|
91
|
+
*/
|
|
92
|
+
downloadProgress: InternalProgressInformation | null;
|
|
80
93
|
}>;
|
|
81
94
|
/**
|
|
82
95
|
* Provides sync status information for all bucket priorities, sorted by priority (highest first).
|
|
@@ -85,6 +98,13 @@ export declare class SyncStatus {
|
|
|
85
98
|
* sorted with highest priorities (lower numbers) first.
|
|
86
99
|
*/
|
|
87
100
|
get priorityStatusEntries(): SyncPriorityStatus[];
|
|
101
|
+
/**
|
|
102
|
+
* A realtime progress report on how many operations have been downloaded and
|
|
103
|
+
* how many are necessary in total to complete the next sync iteration.
|
|
104
|
+
*
|
|
105
|
+
* This field is only set when {@link SyncDataFlowStatus#downloading} is also true.
|
|
106
|
+
*/
|
|
107
|
+
get downloadProgress(): SyncProgress | null;
|
|
88
108
|
/**
|
|
89
109
|
* Reports the sync status (a pair of {@link SyncStatus#hasSynced} and {@link SyncStatus#lastSyncedAt} fields)
|
|
90
110
|
* for a specific bucket priority level.
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { SyncProgress } from './SyncProgress.js';
|
|
1
2
|
export class SyncStatus {
|
|
2
3
|
options;
|
|
3
4
|
constructor(options) {
|
|
@@ -67,6 +68,19 @@ export class SyncStatus {
|
|
|
67
68
|
get priorityStatusEntries() {
|
|
68
69
|
return (this.options.priorityStatusEntries ?? []).slice().sort(SyncStatus.comparePriorities);
|
|
69
70
|
}
|
|
71
|
+
/**
|
|
72
|
+
* A realtime progress report on how many operations have been downloaded and
|
|
73
|
+
* how many are necessary in total to complete the next sync iteration.
|
|
74
|
+
*
|
|
75
|
+
* This field is only set when {@link SyncDataFlowStatus#downloading} is also true.
|
|
76
|
+
*/
|
|
77
|
+
get downloadProgress() {
|
|
78
|
+
const internalProgress = this.options.dataFlow?.downloadProgress;
|
|
79
|
+
if (internalProgress == null) {
|
|
80
|
+
return null;
|
|
81
|
+
}
|
|
82
|
+
return new SyncProgress(internalProgress);
|
|
83
|
+
}
|
|
70
84
|
/**
|
|
71
85
|
* Reports the sync status (a pair of {@link SyncStatus#hasSynced} and {@link SyncStatus#lastSyncedAt} fields)
|
|
72
86
|
* for a specific bucket priority level.
|
|
@@ -18,6 +18,10 @@ export declare class Schema<S extends SchemaType = SchemaType> {
|
|
|
18
18
|
view_name: string;
|
|
19
19
|
local_only: boolean;
|
|
20
20
|
insert_only: boolean;
|
|
21
|
+
include_old: any;
|
|
22
|
+
include_old_only_when_changed: boolean;
|
|
23
|
+
include_metadata: boolean;
|
|
24
|
+
ignore_empty_update: boolean;
|
|
21
25
|
columns: {
|
|
22
26
|
name: string;
|
|
23
27
|
type: import("./Column.js").ColumnType | undefined;
|
package/lib/db/schema/Schema.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Table } from './Table.js';
|
|
2
1
|
/**
|
|
3
2
|
* A schema is a collection of tables. It is used to define the structure of a database.
|
|
4
3
|
*/
|
|
@@ -41,15 +40,7 @@ export class Schema {
|
|
|
41
40
|
}
|
|
42
41
|
convertToClassicTables(props) {
|
|
43
42
|
return Object.entries(props).map(([name, table]) => {
|
|
44
|
-
|
|
45
|
-
name,
|
|
46
|
-
columns: table.columns,
|
|
47
|
-
indexes: table.indexes,
|
|
48
|
-
localOnly: table.localOnly,
|
|
49
|
-
insertOnly: table.insertOnly,
|
|
50
|
-
viewName: table.viewNameOverride || name
|
|
51
|
-
});
|
|
52
|
-
return convertedTable;
|
|
43
|
+
return table.copyWithName(name);
|
|
53
44
|
});
|
|
54
45
|
}
|
|
55
46
|
}
|
package/lib/db/schema/Table.d.ts
CHANGED
|
@@ -1,16 +1,32 @@
|
|
|
1
1
|
import { Column, ColumnsType, ColumnType, ExtractColumnValueType } from './Column.js';
|
|
2
2
|
import { Index } from './Index.js';
|
|
3
3
|
import { TableV2 } from './TableV2.js';
|
|
4
|
-
|
|
4
|
+
interface SharedTableOptions {
|
|
5
|
+
localOnly?: boolean;
|
|
6
|
+
insertOnly?: boolean;
|
|
7
|
+
viewName?: string;
|
|
8
|
+
trackPrevious?: boolean | TrackPreviousOptions;
|
|
9
|
+
trackMetadata?: boolean;
|
|
10
|
+
ignoreEmptyUpdates?: boolean;
|
|
11
|
+
}
|
|
12
|
+
/** Whether to include previous column values when PowerSync tracks local changes.
|
|
13
|
+
*
|
|
14
|
+
* Including old values may be helpful for some backend connector implementations, which is
|
|
15
|
+
* why it can be enabled on per-table or per-columm basis.
|
|
16
|
+
*/
|
|
17
|
+
export interface TrackPreviousOptions {
|
|
18
|
+
/** When defined, a list of column names for which old values should be tracked. */
|
|
19
|
+
columns?: string[];
|
|
20
|
+
/** When enabled, only include values that have actually been changed by an update. */
|
|
21
|
+
onlyWhenChanged?: boolean;
|
|
22
|
+
}
|
|
23
|
+
export interface TableOptions extends SharedTableOptions {
|
|
5
24
|
/**
|
|
6
25
|
* The synced table name, matching sync rules
|
|
7
26
|
*/
|
|
8
27
|
name: string;
|
|
9
28
|
columns: Column[];
|
|
10
29
|
indexes?: Index[];
|
|
11
|
-
localOnly?: boolean;
|
|
12
|
-
insertOnly?: boolean;
|
|
13
|
-
viewName?: string;
|
|
14
30
|
}
|
|
15
31
|
export type RowType<T extends TableV2<any>> = {
|
|
16
32
|
[K in keyof T['columnMap']]: ExtractColumnValueType<T['columnMap'][K]>;
|
|
@@ -18,16 +34,16 @@ export type RowType<T extends TableV2<any>> = {
|
|
|
18
34
|
id: string;
|
|
19
35
|
};
|
|
20
36
|
export type IndexShorthand = Record<string, string[]>;
|
|
21
|
-
export interface TableV2Options {
|
|
37
|
+
export interface TableV2Options extends SharedTableOptions {
|
|
22
38
|
indexes?: IndexShorthand;
|
|
23
|
-
localOnly?: boolean;
|
|
24
|
-
insertOnly?: boolean;
|
|
25
|
-
viewName?: string;
|
|
26
39
|
}
|
|
27
40
|
export declare const DEFAULT_TABLE_OPTIONS: {
|
|
28
41
|
indexes: never[];
|
|
29
42
|
insertOnly: boolean;
|
|
30
43
|
localOnly: boolean;
|
|
44
|
+
trackPrevious: boolean;
|
|
45
|
+
trackMetadata: boolean;
|
|
46
|
+
ignoreEmptyUpdates: boolean;
|
|
31
47
|
};
|
|
32
48
|
export declare const InvalidSQLCharacters: RegExp;
|
|
33
49
|
export declare class Table<Columns extends ColumnsType = ColumnsType> {
|
|
@@ -96,9 +112,11 @@ export declare class Table<Columns extends ColumnsType = ColumnsType> {
|
|
|
96
112
|
*```
|
|
97
113
|
*/
|
|
98
114
|
constructor(options: TableOptions);
|
|
115
|
+
copyWithName(name: string): Table;
|
|
99
116
|
private isTableV1;
|
|
100
117
|
private initTableV1;
|
|
101
118
|
private initTableV2;
|
|
119
|
+
private applyDefaultOptions;
|
|
102
120
|
get name(): string;
|
|
103
121
|
get viewNameOverride(): string | undefined;
|
|
104
122
|
get viewName(): string;
|
|
@@ -107,6 +125,9 @@ export declare class Table<Columns extends ColumnsType = ColumnsType> {
|
|
|
107
125
|
get indexes(): Index[];
|
|
108
126
|
get localOnly(): boolean;
|
|
109
127
|
get insertOnly(): boolean;
|
|
128
|
+
get trackPrevious(): boolean | TrackPreviousOptions;
|
|
129
|
+
get trackMetadata(): boolean;
|
|
130
|
+
get ignoreEmptyUpdates(): boolean;
|
|
110
131
|
get internalName(): string;
|
|
111
132
|
get validName(): boolean;
|
|
112
133
|
validate(): void;
|
|
@@ -115,6 +136,10 @@ export declare class Table<Columns extends ColumnsType = ColumnsType> {
|
|
|
115
136
|
view_name: string;
|
|
116
137
|
local_only: boolean;
|
|
117
138
|
insert_only: boolean;
|
|
139
|
+
include_old: any;
|
|
140
|
+
include_old_only_when_changed: boolean;
|
|
141
|
+
include_metadata: boolean;
|
|
142
|
+
ignore_empty_update: boolean;
|
|
118
143
|
columns: {
|
|
119
144
|
name: string;
|
|
120
145
|
type: ColumnType | undefined;
|
|
@@ -129,3 +154,4 @@ export declare class Table<Columns extends ColumnsType = ColumnsType> {
|
|
|
129
154
|
}[];
|
|
130
155
|
};
|
|
131
156
|
}
|
|
157
|
+
export {};
|