@peers-app/peers-device 0.7.25 → 0.7.26
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/connection-manager/connection-manager.js +13 -0
- package/dist/connection-manager/connection-manager.js.map +1 -1
- package/dist/json-diff.d.ts +13 -1
- package/dist/json-diff.js +157 -25
- package/dist/json-diff.js.map +1 -1
- package/dist/main.js +2 -1
- package/dist/main.js.map +1 -1
- package/dist/packages.tracked-data-source.d.ts +2 -2
- package/dist/packages.tracked-data-source.js.map +1 -1
- package/dist/pvars.tracked-data-source.d.ts +2 -2
- package/dist/pvars.tracked-data-source.js +16 -9
- package/dist/pvars.tracked-data-source.js.map +1 -1
- package/dist/sync-group.d.ts +8 -4
- package/dist/sync-group.js +37 -11
- package/dist/sync-group.js.map +1 -1
- package/dist/sync-group.test.js +150 -51
- package/dist/sync-group.test.js.map +1 -1
- package/dist/tracked-data-source.d.ts +41 -21
- package/dist/tracked-data-source.js +370 -252
- package/dist/tracked-data-source.js.map +1 -1
- package/dist/tracked-data-source.test.d.ts +3 -0
- package/dist/tracked-data-source.test.js +699 -781
- package/dist/tracked-data-source.test.js.map +1 -1
- package/package.json +3 -3
|
@@ -52,6 +52,19 @@ class ConnectionManager {
|
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
async pingAllConnections() {
|
|
55
|
+
// make sure all connections exist in `allConnections`
|
|
56
|
+
Array.from(this.connectionStates.keys()).forEach(connection => {
|
|
57
|
+
if (!this.allConnections[connection.remoteDeviceInfo.deviceId]) {
|
|
58
|
+
console.warn(`Found a connection in connectionStates that was not in allConnections, adding it`, { remoteDeviceId: connection.remoteDeviceInfo.deviceId });
|
|
59
|
+
this.allConnections[connection.remoteDeviceInfo.deviceId] = connection;
|
|
60
|
+
}
|
|
61
|
+
});
|
|
62
|
+
Array.from(this.deviceSyncConnections.values()).forEach(connection => {
|
|
63
|
+
if (!this.allConnections[connection.remoteDeviceInfo.deviceId]) {
|
|
64
|
+
console.error(`A connection exists in deviceSyncConnections that does not exist in allConnections or connectionStates`, { remoteDeviceId: connection.remoteDeviceInfo.deviceId });
|
|
65
|
+
}
|
|
66
|
+
// this.allConnections[connection.remoteDeviceInfo.deviceId] ??= connection;
|
|
67
|
+
});
|
|
55
68
|
const connections = Object.values(this.allConnections);
|
|
56
69
|
// Ping all connections in parallel
|
|
57
70
|
const pingPromises = connections.map(async (connection) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-manager.js","sourceRoot":"","sources":["../../src/connection-manager/connection-manager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"connection-manager.js","sourceRoot":"","sources":["../../src/connection-manager/connection-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/json-diff.d.ts
CHANGED
|
@@ -2,8 +2,20 @@ import { Operation } from 'fast-json-patch';
|
|
|
2
2
|
export type ITextPatchOp = {
|
|
3
3
|
op: 'patch-text';
|
|
4
4
|
path: string;
|
|
5
|
-
|
|
5
|
+
value: string;
|
|
6
6
|
};
|
|
7
7
|
export type IDiffOp = Operation | ITextPatchOp;
|
|
8
8
|
export declare function createJsonDiff(oldObj: any, newObj: any): IDiffOp[] | undefined;
|
|
9
9
|
export declare function applyJsonDiff(obj: any, patch: IDiffOp[] | undefined): any;
|
|
10
|
+
export declare function isChildPathOrSame(parentPath: string, childPath: string): boolean;
|
|
11
|
+
/**
|
|
12
|
+
* Convert a JSON Patch / JSON Pointer path into an array of object path segments.
|
|
13
|
+
* Example: "/a/b~1c/d~0e" -> ["a", "b/c", "d~e"]
|
|
14
|
+
*/
|
|
15
|
+
export declare function patchPathToObjectPathArray(path: string): string[];
|
|
16
|
+
/**
|
|
17
|
+
* Decode JSON Pointer escape sequences:
|
|
18
|
+
* "~1" -> "/"
|
|
19
|
+
* "~0" -> "~"
|
|
20
|
+
*/
|
|
21
|
+
export declare function unescapePointerToken(token: string): string;
|
package/dist/json-diff.js
CHANGED
|
@@ -35,16 +35,150 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.createJsonDiff = createJsonDiff;
|
|
37
37
|
exports.applyJsonDiff = applyJsonDiff;
|
|
38
|
+
exports.isChildPathOrSame = isChildPathOrSame;
|
|
39
|
+
exports.patchPathToObjectPathArray = patchPathToObjectPathArray;
|
|
40
|
+
exports.unescapePointerToken = unescapePointerToken;
|
|
38
41
|
const DiffMatchPatch = __importStar(require("diff-match-patch"));
|
|
39
42
|
const fast_json_patch_1 = require("fast-json-patch");
|
|
40
43
|
const lodash_1 = require("lodash");
|
|
41
44
|
const peers_sdk_1 = require("@peers-app/peers-sdk");
|
|
45
|
+
// export type IDiffOp = AddOperation<any> | RemoveOperation | ReplaceOperation<any> | TextPatchOperation;
|
|
42
46
|
function createJsonDiff(oldObj, newObj) {
|
|
47
|
+
if (typeof oldObj !== 'object' || typeof newObj !== 'object' || oldObj === null || newObj === null) {
|
|
48
|
+
throw new Error('Both oldObj and newObj must be non-null objects');
|
|
49
|
+
}
|
|
50
|
+
// Normalize to plain JSON first
|
|
51
|
+
const oldJson = (0, peers_sdk_1.toJSON)(oldObj);
|
|
52
|
+
const newJson = (0, peers_sdk_1.toJSON)(newObj);
|
|
53
|
+
// First get standard JSON Patch operations
|
|
54
|
+
const standardPatch = (0, fast_json_patch_1.compare)(oldJson, newJson);
|
|
55
|
+
if (standardPatch.length === 0) {
|
|
56
|
+
return undefined;
|
|
57
|
+
}
|
|
58
|
+
// Helper: given a JSON Pointer path, return the path of the array
|
|
59
|
+
// that this op is targeting, if any.
|
|
60
|
+
//
|
|
61
|
+
// Examples:
|
|
62
|
+
// "/ary/0" -> "/ary"
|
|
63
|
+
// "/foo/1/bar" -> "/foo"
|
|
64
|
+
// "/0" -> "/" (root array)
|
|
65
|
+
// "/foo/bar" -> null (no numeric segment)
|
|
66
|
+
function findArrayPath(path) {
|
|
67
|
+
// JSON Pointer segments: "/foo/0/bar" -> ["foo", "0", "bar"]
|
|
68
|
+
const segments = path.split('/').slice(1); // drop leading ""
|
|
69
|
+
for (let i = 0; i < segments.length; i++) {
|
|
70
|
+
const seg = segments[i];
|
|
71
|
+
if (/^\d+$/.test(seg)) {
|
|
72
|
+
// Numeric segment means "this index of an array"
|
|
73
|
+
if (i === 0) {
|
|
74
|
+
// Array at the root, e.g. "/0/..." => array path is "/"
|
|
75
|
+
return '/';
|
|
76
|
+
}
|
|
77
|
+
return '/' + segments.slice(0, i).join('/');
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
return null;
|
|
81
|
+
}
|
|
82
|
+
// 1) Collect all array paths that are touched by per-item ops
|
|
83
|
+
const arrayPaths = new Set();
|
|
84
|
+
for (const op of standardPatch) {
|
|
85
|
+
if (op.op === 'add' || op.op === 'remove' || op.op === 'replace') {
|
|
86
|
+
const arrayPath = findArrayPath(op.path);
|
|
87
|
+
if (arrayPath !== null) {
|
|
88
|
+
arrayPaths.add(arrayPath);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
// If no array children were touched, just return the standard patch
|
|
93
|
+
if (arrayPaths.size === 0) {
|
|
94
|
+
return standardPatch;
|
|
95
|
+
}
|
|
96
|
+
// 2) Build a new patch without per-item ops under those arrays
|
|
97
|
+
const newPatch = [];
|
|
98
|
+
for (const op of standardPatch) {
|
|
99
|
+
const arrayPath = findArrayPath(op.path);
|
|
100
|
+
if (arrayPath !== null && arrayPaths.has(arrayPath)) {
|
|
101
|
+
// This op targets (or is under) an array that we'll replace wholesale
|
|
102
|
+
continue;
|
|
103
|
+
}
|
|
104
|
+
newPatch.push(op);
|
|
105
|
+
}
|
|
106
|
+
// 3) For each array that changed at the item level, add a single replace on the whole array
|
|
107
|
+
for (const arrayPath of arrayPaths) {
|
|
108
|
+
const newArrayValue = (0, fast_json_patch_1.getValueByPointer)(newJson, arrayPath);
|
|
109
|
+
// If the array was deleted entirely, standardPatch should already contain
|
|
110
|
+
// a remove at the array path; we only add a replace when it exists.
|
|
111
|
+
if (typeof newArrayValue !== 'undefined') {
|
|
112
|
+
newPatch.push({
|
|
113
|
+
op: 'replace',
|
|
114
|
+
path: arrayPath,
|
|
115
|
+
value: newArrayValue,
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
// currently text patches are disabled
|
|
120
|
+
return newPatch;
|
|
121
|
+
}
|
|
122
|
+
function applyJsonDiff(obj, patch) {
|
|
123
|
+
if (!patch)
|
|
124
|
+
return obj;
|
|
125
|
+
// Make a copy of the object
|
|
126
|
+
const objCopy = (0, lodash_1.cloneDeep)(obj);
|
|
127
|
+
// Split standard operations from text patch operations
|
|
128
|
+
const standardOps = patch.filter(op => op.op !== 'patch-text');
|
|
129
|
+
const textPatchOps = patch.filter(op => op.op === 'patch-text');
|
|
130
|
+
// Apply standard JSON Patch operations
|
|
131
|
+
if (standardOps.length > 0) {
|
|
132
|
+
(0, fast_json_patch_1.applyPatch)(objCopy, standardOps);
|
|
133
|
+
}
|
|
134
|
+
// Apply text patches
|
|
135
|
+
const dmp = new DiffMatchPatch.default();
|
|
136
|
+
for (const op of textPatchOps) {
|
|
137
|
+
const currentText = objCopy[op.path] || '';
|
|
138
|
+
const patches = dmp.patch_fromText(op.value);
|
|
139
|
+
const [patchedText, _] = dmp.patch_apply(patches, currentText);
|
|
140
|
+
objCopy[op.path] = patchedText;
|
|
141
|
+
}
|
|
142
|
+
return (0, peers_sdk_1.fromJSON)(objCopy);
|
|
143
|
+
}
|
|
144
|
+
function isChildPathOrSame(parentPath, childPath) {
|
|
145
|
+
// Root supersedes everything
|
|
146
|
+
if (parentPath === '/')
|
|
147
|
+
return true;
|
|
148
|
+
// Exact same path
|
|
149
|
+
if (parentPath === childPath)
|
|
150
|
+
return true;
|
|
151
|
+
// laterPath is ancestor of earlierPath, respecting segment boundaries
|
|
152
|
+
return (childPath.length > parentPath.length &&
|
|
153
|
+
childPath[parentPath.length] === '/' &&
|
|
154
|
+
childPath.startsWith(parentPath));
|
|
155
|
+
}
|
|
156
|
+
/**
|
|
157
|
+
* Convert a JSON Patch / JSON Pointer path into an array of object path segments.
|
|
158
|
+
* Example: "/a/b~1c/d~0e" -> ["a", "b/c", "d~e"]
|
|
159
|
+
*/
|
|
160
|
+
function patchPathToObjectPathArray(path) {
|
|
161
|
+
if (!path || path === "/")
|
|
162
|
+
return [];
|
|
163
|
+
return path
|
|
164
|
+
.slice(1) // remove leading slash
|
|
165
|
+
.split("/") // split into pointer segments
|
|
166
|
+
.map(unescapePointerToken);
|
|
167
|
+
}
|
|
168
|
+
/**
|
|
169
|
+
* Decode JSON Pointer escape sequences:
|
|
170
|
+
* "~1" -> "/"
|
|
171
|
+
* "~0" -> "~"
|
|
172
|
+
*/
|
|
173
|
+
function unescapePointerToken(token) {
|
|
174
|
+
return token.replace(/~1/g, "/").replace(/~0/g, "~");
|
|
175
|
+
}
|
|
176
|
+
function old_createJsonDiff(oldObj, newObj) {
|
|
43
177
|
if (typeof oldObj !== 'object' || typeof newObj !== 'object') {
|
|
44
178
|
throw new Error('Both oldObj and newObj must be objects');
|
|
45
179
|
}
|
|
46
180
|
const allKeys = (0, lodash_1.uniq)([...Object.keys(oldObj), ...Object.keys(newObj)]);
|
|
47
|
-
// Remove keys that are undefined in either object so the result
|
|
181
|
+
// Remove keys that are undefined in either object so the result is a `replace` operation
|
|
48
182
|
for (const key of allKeys) {
|
|
49
183
|
if (oldObj[key] === undefined) {
|
|
50
184
|
delete oldObj[key];
|
|
@@ -57,11 +191,31 @@ function createJsonDiff(oldObj, newObj) {
|
|
|
57
191
|
newObj = (0, peers_sdk_1.toJSON)(newObj);
|
|
58
192
|
// First get standard JSON patch operations
|
|
59
193
|
const standardPatch = (0, fast_json_patch_1.compare)(oldObj, newObj);
|
|
194
|
+
// convert ops on array items to a replace op on the whole array
|
|
195
|
+
for (let i = standardPatch.length - 1; i >= 0; i--) {
|
|
196
|
+
const op = standardPatch[i];
|
|
197
|
+
if (op.op === 'add' || op.op === 'remove' || op.op === 'replace') {
|
|
198
|
+
if (op.path.match(/\/.+\/\d+/)) {
|
|
199
|
+
// it's an operation on an array item
|
|
200
|
+
const arrayPath = op.path.replace(/\/\d+$/, '');
|
|
201
|
+
const newArrayValue = (0, fast_json_patch_1.getValueByPointer)(newObj, arrayPath);
|
|
202
|
+
// remove all ops on this array path
|
|
203
|
+
for (let j = standardPatch.length - 1; j >= 0; j--) {
|
|
204
|
+
if (standardPatch[j].path.startsWith(arrayPath + '/')) {
|
|
205
|
+
standardPatch.splice(j, 1);
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
// add a single replace op for the whole array
|
|
209
|
+
standardPatch.push({ op: 'replace', path: arrayPath, value: newArrayValue });
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
// currently text patches are disabled
|
|
214
|
+
return standardPatch;
|
|
60
215
|
// TODO: this only works for top-level fields - keep an eye out for nested fields being regularly used
|
|
61
216
|
const longTextFieldPaths = allKeys.filter(key => {
|
|
62
217
|
const oldVal = oldObj[key];
|
|
63
218
|
const newVal = newObj[key];
|
|
64
|
-
return false; // currently text patches are disabled
|
|
65
219
|
if (typeof oldVal !== 'string' || typeof newVal !== 'string')
|
|
66
220
|
return false;
|
|
67
221
|
if (!oldVal.length || !newVal.length)
|
|
@@ -104,7 +258,7 @@ function createJsonDiff(oldObj, newObj) {
|
|
|
104
258
|
efficientPatch.push({
|
|
105
259
|
op: 'patch-text', // Custom operation
|
|
106
260
|
path: path,
|
|
107
|
-
|
|
261
|
+
value: textPatchStr
|
|
108
262
|
});
|
|
109
263
|
}
|
|
110
264
|
if (efficientPatch.length === 0) {
|
|
@@ -112,26 +266,4 @@ function createJsonDiff(oldObj, newObj) {
|
|
|
112
266
|
}
|
|
113
267
|
return efficientPatch;
|
|
114
268
|
}
|
|
115
|
-
function applyJsonDiff(obj, patch) {
|
|
116
|
-
if (!patch)
|
|
117
|
-
return obj;
|
|
118
|
-
// Make a copy of the object
|
|
119
|
-
const objCopy = (0, lodash_1.cloneDeep)(obj);
|
|
120
|
-
// Split standard operations from text patch operations
|
|
121
|
-
const standardOps = patch.filter(op => op.op !== 'patch-text');
|
|
122
|
-
const textPatchOps = patch.filter(op => op.op === 'patch-text');
|
|
123
|
-
// Apply standard JSON Patch operations
|
|
124
|
-
if (standardOps.length > 0) {
|
|
125
|
-
(0, fast_json_patch_1.applyPatch)(objCopy, standardOps);
|
|
126
|
-
}
|
|
127
|
-
// Apply text patches
|
|
128
|
-
const dmp = new DiffMatchPatch.default();
|
|
129
|
-
for (const op of textPatchOps) {
|
|
130
|
-
const currentText = objCopy[op.path] || '';
|
|
131
|
-
const patches = dmp.patch_fromText(op.textPatch);
|
|
132
|
-
const [patchedText, _] = dmp.patch_apply(patches, currentText);
|
|
133
|
-
objCopy[op.path] = patchedText;
|
|
134
|
-
}
|
|
135
|
-
return (0, peers_sdk_1.fromJSON)(objCopy);
|
|
136
|
-
}
|
|
137
269
|
//# sourceMappingURL=json-diff.js.map
|
package/dist/json-diff.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-diff.js","sourceRoot":"","sources":["../src/json-diff.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"json-diff.js","sourceRoot":"","sources":["../src/json-diff.ts"],"names":[],"mappings":"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"}
|
package/dist/main.js
CHANGED
|
@@ -52,7 +52,8 @@ async function initializePeerDevice(userId, dbConstructor, _setUserContext, file
|
|
|
52
52
|
else {
|
|
53
53
|
trackedDataSource = new tracked_data_source_1.TrackedDataSource(subscribableDataSource, changeTrackingTable);
|
|
54
54
|
}
|
|
55
|
-
|
|
55
|
+
// NOTE: This is very expensive, consider removing from startup and running it on demand
|
|
56
|
+
trackedDataSource.findAndTrackRecords();
|
|
56
57
|
return trackedDataSource;
|
|
57
58
|
};
|
|
58
59
|
const userContext = new peers_sdk_1.UserContext(userId, dataSourceFactory);
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;AAyCA,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DataContext,
|
|
1
|
+
import { DataContext, IChangeRecord, IPeerDevice, IPersistentVar } from "@peers-app/peers-sdk";
|
|
2
2
|
import { TrackedDataSource } from "./tracked-data-source";
|
|
3
3
|
export declare class PackagesTrackedDataSource extends TrackedDataSource<IPersistentVar> {
|
|
4
4
|
/**
|
|
@@ -6,5 +6,5 @@ export declare class PackagesTrackedDataSource extends TrackedDataSource<IPersis
|
|
|
6
6
|
* This is particularly important when a package includes a table schema which
|
|
7
7
|
* future changes may depend on being loaded first to sync correctly.
|
|
8
8
|
*/
|
|
9
|
-
applyChanges(changes:
|
|
9
|
+
applyChanges(changes: IChangeRecord[], remoteDevice?: IPeerDevice, dataContext?: DataContext): Promise<void>;
|
|
10
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packages.tracked-data-source.js","sourceRoot":"","sources":["../src/packages.tracked-data-source.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"packages.tracked-data-source.js","sourceRoot":"","sources":["../src/packages.tracked-data-source.ts"],"names":[],"mappings":";;;AAAA,oDAAyG;AACzG,+DAA0D;AAE1D,MAAa,yBAA0B,SAAQ,uCAAiC;IAE9E;;;;OAIG;IACI,KAAK,CAAC,YAAY,CAAC,OAAwB,EAAE,YAA0B,EAAE,WAAyB;QACvG,MAAM,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;QAC5C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC5C,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACvC,MAAM,GAAG,GAAG,MAAM,IAAA,oBAAQ,GAAE,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAClD,IAAI,GAAG,EAAE,CAAC;oBACR,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;oBAC7C,WAAW,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC/D,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;CACF;AArBD,8DAqBC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { IChangeRecord, IPeerDevice, IPersistentVar } from "@peers-app/peers-sdk";
|
|
2
2
|
import { TrackedDataSource } from "./tracked-data-source";
|
|
3
3
|
export declare class PVarsTrackedDataSource extends TrackedDataSource<IPersistentVar> {
|
|
4
|
-
applyChanges(changes:
|
|
4
|
+
applyChanges(changes: IChangeRecord[], remoteDevice?: IPeerDevice): Promise<void>;
|
|
5
5
|
}
|
|
@@ -14,7 +14,19 @@ class PVarsTrackedDataSource extends tracked_data_source_1.TrackedDataSource {
|
|
|
14
14
|
const varsById = {};
|
|
15
15
|
const varsByName = {};
|
|
16
16
|
for (const change of changes) {
|
|
17
|
-
|
|
17
|
+
// In V2, the value field contains the full record for path "/" operations
|
|
18
|
+
let record;
|
|
19
|
+
if (change.path === '/' && change.value && typeof change.value === 'object') {
|
|
20
|
+
record = change.value;
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
// For granular changes, we need to fetch the current record
|
|
24
|
+
record = varsById[change.recordId] || await (0, peers_sdk_1.PersistentVars)().get(change.recordId);
|
|
25
|
+
}
|
|
26
|
+
if (!record) {
|
|
27
|
+
// Skip if we can't determine the record
|
|
28
|
+
continue;
|
|
29
|
+
}
|
|
18
30
|
let varName = record.name;
|
|
19
31
|
let existingVar = varsByName[varName] ||
|
|
20
32
|
varsById[change.recordId] ||
|
|
@@ -34,15 +46,10 @@ class PVarsTrackedDataSource extends tracked_data_source_1.TrackedDataSource {
|
|
|
34
46
|
continue;
|
|
35
47
|
}
|
|
36
48
|
// ensure we're using the local persistentVarId
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
c.newRecord.persistentVarId = localVar.persistentVarId;
|
|
41
|
-
}
|
|
42
|
-
if (c.oldRecord) {
|
|
43
|
-
c.oldRecord.persistentVarId = localVar.persistentVarId;
|
|
49
|
+
change.recordId = localVar.persistentVarId;
|
|
50
|
+
if (change.path === '/' && change.value && typeof change.value === 'object') {
|
|
51
|
+
change.value.persistentVarId = localVar.persistentVarId;
|
|
44
52
|
}
|
|
45
|
-
// WARNING: not checking for persistentVarId in the `jsonDiff` - highly unlikely to be an issue
|
|
46
53
|
filteredChanges.push(change);
|
|
47
54
|
}
|
|
48
55
|
if (filteredChanges.length) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pvars.tracked-data-source.js","sourceRoot":"","sources":["../src/pvars.tracked-data-source.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"pvars.tracked-data-source.js","sourceRoot":"","sources":["../src/pvars.tracked-data-source.ts"],"names":[],"mappings":"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"}
|
package/dist/sync-group.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ChangeTrackingTable, DataContext, DataFilter, GroupMemberRole,
|
|
1
|
+
import { ChangeTrackingTable, DataContext, DataFilter, GroupMemberRole, IChangeRecord, IDataQueryParams, IDeviceConnection, IDeviceMessage, IDeviceSyncInfo, INetworkInfo, IPeerDevice, Table, TableContainer } from "@peers-app/peers-sdk";
|
|
2
2
|
export type IAddConnectionPromise = Promise<IDeviceConnection> & {
|
|
3
3
|
deviceConnection: IDeviceConnection;
|
|
4
4
|
};
|
|
@@ -22,6 +22,10 @@ export declare class SyncGroup implements IPeerDevice {
|
|
|
22
22
|
static getNetworkInfoCount: number;
|
|
23
23
|
static electPreferredConnectionsCount: number;
|
|
24
24
|
static syncWithRemoteDeviceCount: number;
|
|
25
|
+
static averageSyncTimeMs: {
|
|
26
|
+
count: number;
|
|
27
|
+
avgTimeMs: number;
|
|
28
|
+
};
|
|
25
29
|
private electionInterval;
|
|
26
30
|
private preferredDeviceIds;
|
|
27
31
|
private preferredByDeviceIds;
|
|
@@ -42,7 +46,7 @@ export declare class SyncGroup implements IPeerDevice {
|
|
|
42
46
|
getRemoteDevices(): IPeerDevice[];
|
|
43
47
|
private pendingChangeCount;
|
|
44
48
|
private pendingChangeTimeout;
|
|
45
|
-
onNewChange(
|
|
49
|
+
onNewChange(appliedAt: number): void;
|
|
46
50
|
notifyRemoteDevicesOfChanges(): Promise<void>;
|
|
47
51
|
notifyOfChanges(deviceId: string, timestampLastApplied: number): Promise<void>;
|
|
48
52
|
addConnection(remoteDevice: IPeerDevice, opts?: {
|
|
@@ -57,8 +61,8 @@ export declare class SyncGroup implements IPeerDevice {
|
|
|
57
61
|
networkInfo?: INetworkInfo;
|
|
58
62
|
}): Promise<void>;
|
|
59
63
|
private _syncWithRemoteDevice;
|
|
60
|
-
applyChanges(changes:
|
|
61
|
-
listChanges(filter?: DataFilter<
|
|
64
|
+
applyChanges(changes: IChangeRecord[], remoteDevice?: IPeerDevice): Promise<void>;
|
|
65
|
+
listChanges(filter?: DataFilter<IChangeRecord>, opts?: IDataQueryParams<IChangeRecord>): Promise<IChangeRecord[]>;
|
|
62
66
|
dispose(): Promise<void>;
|
|
63
67
|
getNetworkInfo(): Promise<INetworkInfo>;
|
|
64
68
|
private currentElectionPromise;
|