jazz-run 0.17.14 → 0.18.1
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/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +43 -0
- package/dist/createWorkerAccount.js +3 -3
- package/dist/createWorkerAccount.js.map +1 -1
- package/dist/tests/startSyncServer.test.js +1 -1
- package/dist/tests/startSyncServer.test.js.map +1 -1
- package/dist/tests/startWorker.test.js +23 -17
- package/dist/tests/startWorker.test.js.map +1 -1
- package/package.json +5 -5
- package/src/createWorkerAccount.ts +3 -3
- package/src/tests/startSyncServer.test.ts +1 -1
- package/src/tests/startWorker.test.ts +24 -21
package/.turbo/turbo-build.log
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,48 @@
|
|
|
1
1
|
# jazz-run
|
|
2
2
|
|
|
3
|
+
## 0.18.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [af5fbe7]
|
|
8
|
+
- Updated dependencies [9837459]
|
|
9
|
+
- jazz-tools@0.18.1
|
|
10
|
+
- cojson@0.18.1
|
|
11
|
+
- cojson-storage-sqlite@0.18.1
|
|
12
|
+
- cojson-transport-ws@0.18.1
|
|
13
|
+
|
|
14
|
+
## 0.18.0
|
|
15
|
+
|
|
16
|
+
### Minor Changes
|
|
17
|
+
|
|
18
|
+
- f263856: Add `$jazz` field to CoValues:
|
|
19
|
+
- This field contains Jazz methods that cluttered CoValues' API, as well as Jazz internal properties. This field is not enumerable, to allow CoValues to behave similarly to JSON objects.
|
|
20
|
+
- Added a `$jazz.set` method to update a CoValue's fields. When updating collaborative fields, you can pass in JSON objects instead of CoValues and Jazz will create
|
|
21
|
+
the CoValues automatically (similarly to CoValue `create` methods).
|
|
22
|
+
- All CoMap methods have been moved into `$jazz`, to allow defining any arbitrary key in the CoMap (except for `$jazz`) without conflicts.
|
|
23
|
+
- For CoMaps created with `co.map`, fields are now `readonly` to prevent setting properties directly. Use the `$jazz.set` method instead.
|
|
24
|
+
- CoMaps created with class schemas don't get type errors on direct property assignments, but they get a runtime errors prompting indicating to use `$jazz.set`.
|
|
25
|
+
- the `delete` operator can no longer be used to delete CoRecord properties. Use `$jazz.delete` instead.
|
|
26
|
+
- CoList's array-mutation methods have been moved into `$jazz`, in order to prevent using methods
|
|
27
|
+
- CoLists are now readonly arrays. Trying to use any mutation method yields a type error.
|
|
28
|
+
- `$jazz.set` can be used in place of direct element assignments.
|
|
29
|
+
- Added two new utility methods: `$jazz.remove` and `$jazz.retain`. They allow editing a CoList in-place with a simpler API than `$jazz.splice`.
|
|
30
|
+
- `sort`, `reverse`, `fill` and `copyWithin` have been deprecated, given that they could behave inconsistently with CoLists. `$jazz` replacements may be introduced
|
|
31
|
+
in future releases.
|
|
32
|
+
- `.$jazz.owner` now always returns a Group (instead of a Group or an Account). We'll be migrating away of having Accounts as CoValue owners in future releases.
|
|
33
|
+
- Removed `castAs`, since it's an inherently unsafe operation that bypassed typechecking and enabled using CoValues in unsupported ways.
|
|
34
|
+
- Removed the `id` and `_type` fields from `toJSON()`'s output in Account, CoMap, CoFeed & FileStream, to make CoValues behave more similarly to JSON objects.
|
|
35
|
+
- Removed the `root` and `profile` fields from Group.
|
|
36
|
+
|
|
37
|
+
### Patch Changes
|
|
38
|
+
|
|
39
|
+
- Updated dependencies [b709494]
|
|
40
|
+
- Updated dependencies [f263856]
|
|
41
|
+
- cojson@0.18.0
|
|
42
|
+
- jazz-tools@0.18.0
|
|
43
|
+
- cojson-storage-sqlite@0.18.0
|
|
44
|
+
- cojson-transport-ws@0.18.0
|
|
45
|
+
|
|
3
46
|
## 0.17.14
|
|
4
47
|
|
|
5
48
|
### Patch Changes
|
|
@@ -17,10 +17,10 @@ export const createWorkerAccount = async ({ name, peer: peerAddr, }) => {
|
|
|
17
17
|
if (!isControlledAccount(account)) {
|
|
18
18
|
throw new Error("account is not a controlled account");
|
|
19
19
|
}
|
|
20
|
-
await account.waitForAllCoValuesSync({ timeout: 4000 });
|
|
20
|
+
await account.$jazz.waitForAllCoValuesSync({ timeout: 4000 });
|
|
21
21
|
return {
|
|
22
|
-
accountID: account.id,
|
|
23
|
-
agentSecret: account.
|
|
22
|
+
accountID: account.$jazz.id,
|
|
23
|
+
agentSecret: account.$jazz.localNode.getCurrentAgent().agentSecret,
|
|
24
24
|
};
|
|
25
25
|
};
|
|
26
26
|
//# sourceMappingURL=createWorkerAccount.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createWorkerAccount.js","sourceRoot":"","sources":["../src/createWorkerAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAE/B,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,EACxC,IAAI,EACJ,IAAI,EAAE,QAAQ,GAIf,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;IAEzC,MAAM,IAAI,GAAG,mBAAmB,CAAC;QAC/B,EAAE,EAAE,UAAU;QACd,SAAS,EAAE,IAAI,SAAS,CAAC,QAAQ,CAAC;QAClC,IAAI,EAAE,QAAQ;KACf,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;QACnC,aAAa,EAAE,EAAE,IAAI,EAAE;QACvB,eAAe,EAAE,CAAC,IAAI,CAAC;QACvB,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,OAAO,CAAC,sBAAsB,CAAC,EAAE,OAAO,EAAE,IAAK,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"createWorkerAccount.js","sourceRoot":"","sources":["../src/createWorkerAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAE/B,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,EACxC,IAAI,EACJ,IAAI,EAAE,QAAQ,GAIf,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC;IAEzC,MAAM,IAAI,GAAG,mBAAmB,CAAC;QAC/B,EAAE,EAAE,UAAU;QACd,SAAS,EAAE,IAAI,SAAS,CAAC,QAAQ,CAAC;QAClC,IAAI,EAAE,QAAQ;KACf,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC;QACnC,aAAa,EAAE,EAAE,IAAI,EAAE;QACvB,eAAe,EAAE,CAAC,IAAI,CAAC;QACvB,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,OAAO,CAAC,KAAK,CAAC,sBAAsB,CAAC,EAAE,OAAO,EAAE,IAAK,EAAE,CAAC,CAAC;IAE/D,OAAO;QACL,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE;QAC3B,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC,WAAW;KACnE,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -57,7 +57,7 @@ describe("startSyncServer", () => {
|
|
|
57
57
|
syncServer: syncServer2,
|
|
58
58
|
});
|
|
59
59
|
// Try to load the previously created map
|
|
60
|
-
const loadedMap = await TestMap.load(map.id, {});
|
|
60
|
+
const loadedMap = await TestMap.load(map.$jazz.id, {});
|
|
61
61
|
// Verify the data persisted
|
|
62
62
|
expect(loadedMap).not.toBe(null);
|
|
63
63
|
expect(loadedMap?.value).toBe("testValue");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startSyncServer.test.js","sourceRoot":"","sources":["../../src/tests/startSyncServer.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,EAAE,EAAE,CAAC,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,MAAM,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC;IACrB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;CAClB,CAAC,CAAC;AAEH,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,QAAQ,UAAU,EAAE,KAAK,CAAC,CAAC;AAEzD,QAAQ,CAAC,GAAG,EAAE;IACZ,UAAU,CAAC,MAAM,CAAC,CAAC;AACrB,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,IAAI,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;QACzE,8BAA8B;QAC9B,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC;YACpC,IAAI,EAAE,cAAc,CAAC,IAAI;YACzB,IAAI,EAAE,GAAG,EAAE,wBAAwB;YACnC,QAAQ,EAAE,KAAK;YACf,EAAE,EAAE,MAAM;SACX,CAAC,CAAC;QAEH,MAAM,IAAI,GAAI,OAAO,CAAC,OAAO,EAAU,CAAC,IAAI,CAAC;QAC7C,MAAM,UAAU,GAAG,kBAAkB,IAAI,EAAE,CAAC;QAE5C,+CAA+C;QAC/C,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,MAAM,mBAAmB,CAAC;YAC3D,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,UAAU;SACjB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC;YAChC,SAAS;YACT,aAAa,EAAE,WAAW;YAC1B,UAAU;SACX,CAAC,CAAC;QAEH,4BAA4B;QAC5B,MAAM,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;QAEnD,qBAAqB;QACrB,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,4CAA4C;QAC5C,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC;YACpC,IAAI,EAAE,cAAc,CAAC,IAAI;YACzB,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,KAAK;YACf,EAAE,EAAE,MAAM;SACX,CAAC,CAAC;QAEH,MAAM,KAAK,GAAI,OAAO,CAAC,OAAO,EAAU,CAAC,IAAI,CAAC;QAC9C,MAAM,WAAW,GAAG,kBAAkB,KAAK,EAAE,CAAC;QAE9C,wCAAwC;QACxC,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC;YAChC,SAAS;YACT,aAAa,EAAE,WAAW;YAC1B,UAAU,EAAE,WAAW;SACxB,CAAC,CAAC;QAEH,yCAAyC;QACzC,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"startSyncServer.test.js","sourceRoot":"","sources":["../../src/tests/startSyncServer.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,8 +65,10 @@ describe("startWorker integration", () => {
|
|
|
65
65
|
const map = TestMap.create({
|
|
66
66
|
value: "test",
|
|
67
67
|
}, { owner: group });
|
|
68
|
-
await map.waitForSync();
|
|
69
|
-
const mapOnWorker2 = await TestMap.load(map.id, {
|
|
68
|
+
await map.$jazz.waitForSync();
|
|
69
|
+
const mapOnWorker2 = await TestMap.load(map.$jazz.id, {
|
|
70
|
+
loadAs: worker2.worker,
|
|
71
|
+
});
|
|
70
72
|
expect(mapOnWorker2?.value).toBe("test");
|
|
71
73
|
await worker1.done();
|
|
72
74
|
await worker2.done();
|
|
@@ -82,29 +84,29 @@ describe("startWorker integration", () => {
|
|
|
82
84
|
profile: co.profile(),
|
|
83
85
|
})
|
|
84
86
|
.withMigration((account) => {
|
|
85
|
-
if (account.root
|
|
87
|
+
if (!account.$jazz.has("root")) {
|
|
86
88
|
if (shouldReloadPreviousAccount) {
|
|
87
89
|
throw new Error("Previous account not found");
|
|
88
90
|
}
|
|
89
91
|
shouldReloadPreviousAccount = true;
|
|
90
|
-
account.root
|
|
92
|
+
account.$jazz.set("root", {
|
|
91
93
|
value: "test",
|
|
92
|
-
}
|
|
94
|
+
});
|
|
93
95
|
}
|
|
94
96
|
});
|
|
95
97
|
const worker1 = await setup(CustomAccount);
|
|
96
|
-
const { root } = await worker1.worker.ensureLoaded({
|
|
98
|
+
const { root } = await worker1.worker.$jazz.ensureLoaded({
|
|
97
99
|
resolve: { root: true },
|
|
98
100
|
});
|
|
99
101
|
expect(root.value).toBe("test");
|
|
100
102
|
await worker1.done();
|
|
101
103
|
const worker2 = await startWorker({
|
|
102
|
-
accountID: worker1.worker.id,
|
|
103
|
-
accountSecret: worker1.worker.
|
|
104
|
+
accountID: worker1.worker.$jazz.id,
|
|
105
|
+
accountSecret: worker1.worker.$jazz.localNode.getCurrentAgent().agentSecret,
|
|
104
106
|
syncServer: worker1.syncServer,
|
|
105
107
|
AccountSchema: CustomAccount,
|
|
106
108
|
});
|
|
107
|
-
const { root: root2 } = await worker2.worker.ensureLoaded({
|
|
109
|
+
const { root: root2 } = await worker2.worker.$jazz.ensureLoaded({
|
|
108
110
|
resolve: { root: true },
|
|
109
111
|
});
|
|
110
112
|
expect(root2.value).toBe("test");
|
|
@@ -119,7 +121,9 @@ describe("startWorker integration", () => {
|
|
|
119
121
|
}, { owner: group });
|
|
120
122
|
await worker1.done();
|
|
121
123
|
const worker2 = await setupWorker(worker1.syncServer);
|
|
122
|
-
const mapOnWorker2 = await TestMap.load(map.id, {
|
|
124
|
+
const mapOnWorker2 = await TestMap.load(map.$jazz.id, {
|
|
125
|
+
loadAs: worker2.worker,
|
|
126
|
+
});
|
|
123
127
|
expect(mapOnWorker2?.value).toBe("test");
|
|
124
128
|
await worker2.done();
|
|
125
129
|
});
|
|
@@ -133,9 +137,9 @@ describe("startWorker integration", () => {
|
|
|
133
137
|
worker2.experimental.inbox.subscribe(TestMap, async (value) => {
|
|
134
138
|
return TestMap.create({
|
|
135
139
|
value: value.value + " Responded from the inbox",
|
|
136
|
-
}, { owner: value.
|
|
140
|
+
}, { owner: value.$jazz.owner });
|
|
137
141
|
});
|
|
138
|
-
const sender = await InboxSender.load(worker2.worker.id, worker1.worker);
|
|
142
|
+
const sender = await InboxSender.load(worker2.worker.$jazz.id, worker1.worker);
|
|
139
143
|
const resultId = await sender.sendMessage(map);
|
|
140
144
|
const result = await TestMap.load(resultId, { loadAs: worker2.worker });
|
|
141
145
|
expect(result?.value).toEqual("Hello! Responded from the inbox");
|
|
@@ -150,14 +154,14 @@ describe("startWorker integration", () => {
|
|
|
150
154
|
const map = TestMap.create({
|
|
151
155
|
value: "initial value",
|
|
152
156
|
}, { owner: group });
|
|
153
|
-
await map.waitForSync();
|
|
157
|
+
await map.$jazz.waitForSync();
|
|
154
158
|
// Close the sync server
|
|
155
159
|
worker1.server.close();
|
|
156
160
|
// Create a new value while server is down
|
|
157
161
|
const map2 = TestMap.create({
|
|
158
162
|
value: "created while offline",
|
|
159
163
|
}, { owner: group });
|
|
160
|
-
map.value
|
|
164
|
+
map.$jazz.set("value", "updated while offline");
|
|
161
165
|
// Start a new sync server on the same port
|
|
162
166
|
const newServer = await startSyncServer({
|
|
163
167
|
host: worker1.host,
|
|
@@ -165,10 +169,12 @@ describe("startWorker integration", () => {
|
|
|
165
169
|
inMemory: true,
|
|
166
170
|
db: "",
|
|
167
171
|
});
|
|
168
|
-
await worker1.worker.waitForAllCoValuesSync();
|
|
172
|
+
await worker1.worker.$jazz.waitForAllCoValuesSync();
|
|
169
173
|
// Verify both old and new values are synced
|
|
170
|
-
const mapOnWorker2 = await TestMap.load(map.id, {
|
|
171
|
-
|
|
174
|
+
const mapOnWorker2 = await TestMap.load(map.$jazz.id, {
|
|
175
|
+
loadAs: worker2.worker,
|
|
176
|
+
});
|
|
177
|
+
const map2OnWorker2 = await TestMap.load(map2.$jazz.id, {
|
|
172
178
|
loadAs: worker2.worker,
|
|
173
179
|
});
|
|
174
180
|
expect(mapOnWorker2?.value).toBe("updated while offline");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startWorker.test.js","sourceRoot":"","sources":["../../src/tests/startWorker.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"startWorker.test.js","sourceRoot":"","sources":["../../src/tests/startWorker.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"bin": "./dist/index.js",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"license": "MIT",
|
|
6
|
-
"version": "0.
|
|
6
|
+
"version": "0.18.1",
|
|
7
7
|
"exports": {
|
|
8
8
|
"./startSyncServer": {
|
|
9
9
|
"types": "./dist/startSyncServer.d.ts",
|
|
@@ -21,11 +21,11 @@
|
|
|
21
21
|
"@effect/printer-ansi": "^0.34.5",
|
|
22
22
|
"@effect/schema": "^0.71.1",
|
|
23
23
|
"@effect/typeclass": "^0.25.5",
|
|
24
|
-
"cojson": "0.
|
|
25
|
-
"cojson-storage-sqlite": "0.
|
|
26
|
-
"cojson-transport-ws": "0.
|
|
24
|
+
"cojson": "0.18.1",
|
|
25
|
+
"cojson-storage-sqlite": "0.18.1",
|
|
26
|
+
"cojson-transport-ws": "0.18.1",
|
|
27
27
|
"effect": "^3.6.5",
|
|
28
|
-
"jazz-tools": "0.
|
|
28
|
+
"jazz-tools": "0.18.1",
|
|
29
29
|
"ws": "^8.14.2"
|
|
30
30
|
},
|
|
31
31
|
"devDependencies": {
|
|
@@ -28,10 +28,10 @@ export const createWorkerAccount = async ({
|
|
|
28
28
|
throw new Error("account is not a controlled account");
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
await account.waitForAllCoValuesSync({ timeout: 4_000 });
|
|
31
|
+
await account.$jazz.waitForAllCoValuesSync({ timeout: 4_000 });
|
|
32
32
|
|
|
33
33
|
return {
|
|
34
|
-
accountID: account.id,
|
|
35
|
-
agentSecret: account.
|
|
34
|
+
accountID: account.$jazz.id,
|
|
35
|
+
agentSecret: account.$jazz.localNode.getCurrentAgent().agentSecret,
|
|
36
36
|
};
|
|
37
37
|
};
|
|
@@ -70,7 +70,7 @@ describe("startSyncServer", () => {
|
|
|
70
70
|
});
|
|
71
71
|
|
|
72
72
|
// Try to load the previously created map
|
|
73
|
-
const loadedMap = await TestMap.load(map.id, {});
|
|
73
|
+
const loadedMap = await TestMap.load(map.$jazz.id, {});
|
|
74
74
|
|
|
75
75
|
// Verify the data persisted
|
|
76
76
|
expect(loadedMap).not.toBe(null);
|
|
@@ -107,9 +107,11 @@ describe("startWorker integration", () => {
|
|
|
107
107
|
{ owner: group },
|
|
108
108
|
);
|
|
109
109
|
|
|
110
|
-
await map.waitForSync();
|
|
110
|
+
await map.$jazz.waitForSync();
|
|
111
111
|
|
|
112
|
-
const mapOnWorker2 = await TestMap.load(map.id, {
|
|
112
|
+
const mapOnWorker2 = await TestMap.load(map.$jazz.id, {
|
|
113
|
+
loadAs: worker2.worker,
|
|
114
|
+
});
|
|
113
115
|
|
|
114
116
|
expect(mapOnWorker2?.value).toBe("test");
|
|
115
117
|
|
|
@@ -130,25 +132,22 @@ describe("startWorker integration", () => {
|
|
|
130
132
|
profile: co.profile(),
|
|
131
133
|
})
|
|
132
134
|
.withMigration((account) => {
|
|
133
|
-
if (account.root
|
|
135
|
+
if (!account.$jazz.has("root")) {
|
|
134
136
|
if (shouldReloadPreviousAccount) {
|
|
135
137
|
throw new Error("Previous account not found");
|
|
136
138
|
}
|
|
137
139
|
|
|
138
140
|
shouldReloadPreviousAccount = true;
|
|
139
141
|
|
|
140
|
-
account.root
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
},
|
|
144
|
-
account,
|
|
145
|
-
);
|
|
142
|
+
account.$jazz.set("root", {
|
|
143
|
+
value: "test",
|
|
144
|
+
});
|
|
146
145
|
}
|
|
147
146
|
});
|
|
148
147
|
|
|
149
148
|
const worker1 = await setup(CustomAccount);
|
|
150
149
|
|
|
151
|
-
const { root } = await worker1.worker.ensureLoaded({
|
|
150
|
+
const { root } = await worker1.worker.$jazz.ensureLoaded({
|
|
152
151
|
resolve: { root: true },
|
|
153
152
|
});
|
|
154
153
|
|
|
@@ -157,14 +156,14 @@ describe("startWorker integration", () => {
|
|
|
157
156
|
await worker1.done();
|
|
158
157
|
|
|
159
158
|
const worker2 = await startWorker({
|
|
160
|
-
accountID: worker1.worker.id,
|
|
159
|
+
accountID: worker1.worker.$jazz.id,
|
|
161
160
|
accountSecret:
|
|
162
|
-
worker1.worker.
|
|
161
|
+
worker1.worker.$jazz.localNode.getCurrentAgent().agentSecret,
|
|
163
162
|
syncServer: worker1.syncServer,
|
|
164
163
|
AccountSchema: CustomAccount,
|
|
165
164
|
});
|
|
166
165
|
|
|
167
|
-
const { root: root2 } = await worker2.worker.ensureLoaded({
|
|
166
|
+
const { root: root2 } = await worker2.worker.$jazz.ensureLoaded({
|
|
168
167
|
resolve: { root: true },
|
|
169
168
|
});
|
|
170
169
|
|
|
@@ -190,7 +189,9 @@ describe("startWorker integration", () => {
|
|
|
190
189
|
|
|
191
190
|
const worker2 = await setupWorker(worker1.syncServer);
|
|
192
191
|
|
|
193
|
-
const mapOnWorker2 = await TestMap.load(map.id, {
|
|
192
|
+
const mapOnWorker2 = await TestMap.load(map.$jazz.id, {
|
|
193
|
+
loadAs: worker2.worker,
|
|
194
|
+
});
|
|
194
195
|
|
|
195
196
|
expect(mapOnWorker2?.value).toBe("test");
|
|
196
197
|
|
|
@@ -214,14 +215,14 @@ describe("startWorker integration", () => {
|
|
|
214
215
|
{
|
|
215
216
|
value: value.value + " Responded from the inbox",
|
|
216
217
|
},
|
|
217
|
-
{ owner: value.
|
|
218
|
+
{ owner: value.$jazz.owner },
|
|
218
219
|
);
|
|
219
220
|
});
|
|
220
221
|
|
|
221
222
|
const sender = await InboxSender.load<
|
|
222
223
|
Loaded<typeof TestMap>,
|
|
223
224
|
Loaded<typeof TestMap>
|
|
224
|
-
>(worker2.worker.id, worker1.worker);
|
|
225
|
+
>(worker2.worker.$jazz.id, worker1.worker);
|
|
225
226
|
|
|
226
227
|
const resultId = await sender.sendMessage(map);
|
|
227
228
|
|
|
@@ -247,7 +248,7 @@ describe("startWorker integration", () => {
|
|
|
247
248
|
{ owner: group },
|
|
248
249
|
);
|
|
249
250
|
|
|
250
|
-
await map.waitForSync();
|
|
251
|
+
await map.$jazz.waitForSync();
|
|
251
252
|
|
|
252
253
|
// Close the sync server
|
|
253
254
|
worker1.server.close();
|
|
@@ -260,7 +261,7 @@ describe("startWorker integration", () => {
|
|
|
260
261
|
{ owner: group },
|
|
261
262
|
);
|
|
262
263
|
|
|
263
|
-
map.value
|
|
264
|
+
map.$jazz.set("value", "updated while offline");
|
|
264
265
|
|
|
265
266
|
// Start a new sync server on the same port
|
|
266
267
|
const newServer = await startSyncServer({
|
|
@@ -270,11 +271,13 @@ describe("startWorker integration", () => {
|
|
|
270
271
|
db: "",
|
|
271
272
|
});
|
|
272
273
|
|
|
273
|
-
await worker1.worker.waitForAllCoValuesSync();
|
|
274
|
+
await worker1.worker.$jazz.waitForAllCoValuesSync();
|
|
274
275
|
|
|
275
276
|
// Verify both old and new values are synced
|
|
276
|
-
const mapOnWorker2 = await TestMap.load(map.id, {
|
|
277
|
-
|
|
277
|
+
const mapOnWorker2 = await TestMap.load(map.$jazz.id, {
|
|
278
|
+
loadAs: worker2.worker,
|
|
279
|
+
});
|
|
280
|
+
const map2OnWorker2 = await TestMap.load(map2.$jazz.id, {
|
|
278
281
|
loadAs: worker2.worker,
|
|
279
282
|
});
|
|
280
283
|
|