@verdant-web/server 3.1.2 → 3.2.0-next.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.
Files changed (43) hide show
  1. package/dist/esm/ClientConnection.js +33 -10
  2. package/dist/esm/ClientConnection.js.map +1 -1
  3. package/dist/esm/ServerLibrary.js +19 -7
  4. package/dist/esm/ServerLibrary.js.map +1 -1
  5. package/dist/esm/storage/sql/SqlBaselines.js +6 -0
  6. package/dist/esm/storage/sql/SqlBaselines.js.map +1 -1
  7. package/dist/esm/storage/sql/SqlOperations.js +1 -0
  8. package/dist/esm/storage/sql/SqlOperations.js.map +1 -1
  9. package/dist/esm/storage/sql/migrations/v2.d.ts +3 -0
  10. package/dist/esm/storage/sql/migrations/v2.js +16 -0
  11. package/dist/esm/storage/sql/migrations/v2.js.map +1 -0
  12. package/dist/esm/storage/sql/migrations.d.ts +2 -0
  13. package/dist/esm/storage/sql/migrations.js +2 -1
  14. package/dist/esm/storage/sql/migrations.js.map +1 -1
  15. package/dist/esm/storage/sql/tables.d.ts +2 -0
  16. package/dist/esm/storage/sqlShard/SqlBaselines.js +6 -0
  17. package/dist/esm/storage/sqlShard/SqlBaselines.js.map +1 -1
  18. package/dist/esm/storage/sqlShard/SqlOperations.js +1 -0
  19. package/dist/esm/storage/sqlShard/SqlOperations.js.map +1 -1
  20. package/dist/esm/storage/sqlShard/_testData/unifiedData.d.ts +2 -0
  21. package/dist/esm/storage/sqlShard/_testData/unifiedData.js +2 -0
  22. package/dist/esm/storage/sqlShard/_testData/unifiedData.js.map +1 -1
  23. package/dist/esm/storage/sqlShard/migrations/v2.d.ts +3 -0
  24. package/dist/esm/storage/sqlShard/migrations/v2.js +16 -0
  25. package/dist/esm/storage/sqlShard/migrations/v2.js.map +1 -0
  26. package/dist/esm/storage/sqlShard/migrations.d.ts +2 -0
  27. package/dist/esm/storage/sqlShard/migrations.js +2 -1
  28. package/dist/esm/storage/sqlShard/migrations.js.map +1 -1
  29. package/dist/esm/storage/sqlShard/tables.d.ts +2 -0
  30. package/package.json +2 -2
  31. package/src/ClientConnection.ts +48 -12
  32. package/src/ServerLibrary.ts +23 -9
  33. package/src/storage/sql/SqlBaselines.ts +6 -0
  34. package/src/storage/sql/SqlOperations.ts +1 -0
  35. package/src/storage/sql/migrations/v2.ts +20 -0
  36. package/src/storage/sql/migrations.ts +2 -1
  37. package/src/storage/sql/tables.ts +2 -0
  38. package/src/storage/sqlShard/SqlBaselines.ts +6 -0
  39. package/src/storage/sqlShard/SqlOperations.ts +1 -0
  40. package/src/storage/sqlShard/_testData/unifiedData.ts +2 -0
  41. package/src/storage/sqlShard/migrations/v2.ts +20 -0
  42. package/src/storage/sqlShard/migrations.ts +2 -1
  43. package/src/storage/sqlShard/tables.ts +2 -0
@@ -1,17 +1,42 @@
1
+ import { authz } from '@verdant-web/common';
1
2
  class ClientConnection {
2
- constructor(key) {
3
+ constructor(key, info) {
3
4
  this.key = key;
5
+ this.info = info;
6
+ this.respond = (message) => {
7
+ this.handleMessage(this.processMessage(message));
8
+ };
9
+ this.processMessage = (message) => {
10
+ var _a;
11
+ switch (message.type) {
12
+ case 'op-re': {
13
+ return Object.assign(Object.assign({}, message), { operations: message.operations.filter(this.filterAuthorizedData), baselines: (_a = message.baselines) === null || _a === void 0 ? void 0 : _a.filter(this.filterAuthorizedData) });
14
+ }
15
+ case 'sync-resp': {
16
+ return Object.assign(Object.assign({}, message), { operations: message.operations.filter(this.filterAuthorizedData), baselines: message.baselines.filter(this.filterAuthorizedData) });
17
+ }
18
+ default:
19
+ return message;
20
+ }
21
+ };
22
+ this.filterAuthorizedData = (operation) => {
23
+ if (operation.authz) {
24
+ const decoded = authz.decode(operation.authz);
25
+ // TODO: support more authz operations and types
26
+ return decoded.subject === this.info.userId;
27
+ }
28
+ return true;
29
+ };
4
30
  }
5
31
  }
6
32
  class RequestClientConnection extends ClientConnection {
7
33
  constructor(key, req, res, info) {
8
- super(key);
34
+ super(key, info);
9
35
  this.req = req;
10
36
  this.res = res;
11
- this.info = info;
12
37
  this.type = 'request';
13
38
  this.responses = [];
14
- this.respond = (message) => {
39
+ this.handleMessage = (message) => {
15
40
  this.responses.push(message);
16
41
  };
17
42
  this.end = () => {
@@ -27,13 +52,12 @@ class RequestClientConnection extends ClientConnection {
27
52
  }
28
53
  class FetchClientConnection extends ClientConnection {
29
54
  constructor(key, req, info) {
30
- super(key);
55
+ super(key, info);
31
56
  this.req = req;
32
- this.info = info;
33
57
  this.type = 'fetch';
34
58
  this.responses = [];
35
59
  this.res = new Response('', { status: 200 });
36
- this.respond = (message) => {
60
+ this.handleMessage = (message) => {
37
61
  this.responses.push(message);
38
62
  };
39
63
  this.end = () => {
@@ -50,11 +74,10 @@ class FetchClientConnection extends ClientConnection {
50
74
  }
51
75
  class WebSocketClientConnection extends ClientConnection {
52
76
  constructor(key, ws, info) {
53
- super(key);
77
+ super(key, info);
54
78
  this.ws = ws;
55
- this.info = info;
56
79
  this.type = 'websocket';
57
- this.respond = (message) => {
80
+ this.handleMessage = (message) => {
58
81
  this.ws.send(JSON.stringify(message));
59
82
  };
60
83
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ClientConnection.js","sourceRoot":"","sources":["../../src/ClientConnection.ts"],"names":[],"mappings":"AAKA,MAAe,gBAAgB;IAC9B,YAAqB,GAAW;QAAX,QAAG,GAAH,GAAG,CAAQ;IAAG,CAAC;CAGpC;AAED,MAAM,uBAAwB,SAAQ,gBAAgB;IAKrD,YACC,GAAW,EACM,GAAoB,EACpB,GAAmB,EAC3B,IAAe;QAExB,KAAK,CAAC,GAAG,CAAC,CAAC;QAJM,QAAG,GAAH,GAAG,CAAiB;QACpB,QAAG,GAAH,GAAG,CAAgB;QAC3B,SAAI,GAAJ,IAAI,CAAW;QARhB,SAAI,GAAG,SAAS,CAAC;QAElB,cAAS,GAAoB,EAAE,CAAC;QAWxC,YAAO,GAAG,CAAC,OAAsB,EAAE,EAAE;YACpC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC,CAAC;QAEF,QAAG,GAAG,GAAG,EAAE;YACV,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE;gBACvB,cAAc,EAAE,kBAAkB;aAClC,CAAC,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,KAAK,CACb,IAAI,CAAC,SAAS,CAAC;gBACd,QAAQ,EAAE,IAAI,CAAC,SAAS;aACxB,CAAC,CACF,CAAC;YACF,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;QAChB,CAAC,CAAC;IAhBF,CAAC;CAiBD;AAED,MAAM,qBAAsB,SAAQ,gBAAgB;IAMnD,YACC,GAAW,EACM,GAAY,EACZ,IAAe;QAEhC,KAAK,CAAC,GAAG,CAAC,CAAC;QAHM,QAAG,GAAH,GAAG,CAAS;QACZ,SAAI,GAAJ,IAAI,CAAW;QARxB,SAAI,GAAG,OAAO,CAAC;QAEhB,cAAS,GAAoB,EAAE,CAAC;QACxC,QAAG,GAAG,IAAI,QAAQ,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QAUxC,YAAO,GAAG,CAAC,OAAsB,EAAE,EAAE;YACpC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC,CAAC;QAEF,QAAG,GAAG,GAAG,EAAE;YACV,IAAI,CAAC,GAAG,GAAG,IAAI,QAAQ,CACtB,IAAI,CAAC,SAAS,CAAC;gBACd,QAAQ,EAAE,IAAI,CAAC,SAAS;aACxB,CAAC,EACF;gBACC,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE;oBACR,cAAc,EAAE,kBAAkB;iBAClC;aACD,CACD,CAAC;QACH,CAAC,CAAC;IAlBF,CAAC;CAmBD;AAED,MAAM,yBAA0B,SAAQ,gBAAgB;IAGvD,YACC,GAAW,EACF,EAAa,EACb,IAAe;QAExB,KAAK,CAAC,GAAG,CAAC,CAAC;QAHF,OAAE,GAAF,EAAE,CAAW;QACb,SAAI,GAAJ,IAAI,CAAW;QALhB,SAAI,GAAG,WAAW,CAAC;QAU5B,YAAO,GAAG,CAAC,OAAsB,EAAE,EAAE;YACpC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC;IAJF,CAAC;CAKD;AAED,MAAM,OAAO,uBAAuB;IAApC;QACkB,gBAAW,GAC3B,EAAE,CAAC;QAEI,0BAAqB,GAAG,CAAC,SAAiB,EAAE,EAAE;YACrD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;gBAClC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,IAAI,GAAG,EAAE,CAAC;YACzC,CAAC;YACD,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,CAAE,CAAC;QACrC,CAAC,CAAC;QAEF,cAAS,GAAG,CACX,SAAiB,EACjB,GAAW,EACX,MAAiB,EACjB,IAAe,EACd,EAAE;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;YAElD,MAAM,UAAU,GAAG,IAAI,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;YAEpE,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAEzB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACvB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACjB,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,eAAU,GAAG,CACZ,SAAiB,EACjB,GAAW,EACX,OAAwB,EACxB,QAAwB,EACxB,IAAe,EACd,EAAE;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;YAElD,MAAM,UAAU,GAAG,IAAI,uBAAuB,CAC7C,GAAG,EACH,OAAO,EACP,QAAQ,EACR,IAAI,CACJ,CAAC;YAEF,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAEzB,OAAO,GAAG,EAAE;gBACX,UAAU,CAAC,GAAG,EAAE,CAAC;gBACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACjB,CAAC,CAAC;QACH,CAAC,CAAC;QAEF,aAAQ,GAAG,CACV,SAAiB,EACjB,GAAW,EACX,GAAY,EACZ,IAAe,EACI,EAAE;YACrB,MAAM,GAAG,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;YAElD,MAAM,UAAU,GAAG,IAAI,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YAE7D,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAEzB,OAAO,GAAG,EAAE;gBACX,UAAU,CAAC,GAAG,EAAE,CAAC;gBACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAChB,OAAO,UAAU,CAAC,GAAG,CAAC;YACvB,CAAC,CAAC;QACH,CAAC,CAAC;QAEF,WAAM,GAAG,CAAC,SAAiB,EAAE,GAAW,EAAE,EAAE;YAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;YAClD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC,CAAC;QAEF,YAAO,GAAG,CAAC,SAAiB,EAAE,GAAW,EAAE,OAAsB,EAAE,EAAE;YACpE,MAAM,GAAG,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;YAClD,MAAM,UAAU,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAChC,IAAI,UAAU,EAAE,CAAC;gBAChB,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC7B,CAAC;iBAAM,CAAC;gBACP,MAAM,IAAI,KAAK,CACd,mCAAmC,SAAS,SAAS,GAAG,EAAE,CAC1D,CAAC;YACH,CAAC;QACF,CAAC,CAAC;QAEF;;;WAGG;QACH,cAAS,GAAG,CACX,SAAiB,EACjB,OAAsB,EACtB,WAAqB,EAAE,EACtB,EAAE;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;YAClD,KAAK,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,IAAI,GAAG,EAAE,CAAC;gBACrC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC7B,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAC7B,CAAC;YACF,CAAC;QACF,CAAC,CAAC;QAEF,kBAAa,GAAG,CAAC,SAAiB,EAAE,EAAE;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;YAClD,KAAK,MAAM,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC;gBACvC,IAAI,UAAU,YAAY,yBAAyB,EAAE,CAAC;oBACrD,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;gBACvB,CAAC;YACF,CAAC;YACD,GAAG,CAAC,KAAK,EAAE,CAAC;QACb,CAAC,CAAC;IACH,CAAC;CAAA"}
1
+ {"version":3,"file":"ClientConnection.js","sourceRoot":"","sources":["../../src/ClientConnection.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { EventSubscriber, ReplicaType, applyOperations, isFileRef, isObjectRef, } from '@verdant-web/common';
1
+ import { EventSubscriber, ReplicaType, applyOperations, isFileRef, isObjectRef, rewriteAuthzOriginator, } from '@verdant-web/common';
2
2
  import { Presence } from './Presence.js';
3
3
  export class ServerLibrary extends EventSubscriber {
4
4
  constructor({ storage, sender, profiles, log = () => { }, disableRebasing, fileStorage, }) {
@@ -48,7 +48,13 @@ export class ServerLibrary extends EventSubscriber {
48
48
  this.log('Unknown message type', message.type);
49
49
  break;
50
50
  }
51
- await this.storage.replicas.updateLastSeen(info.libraryId, message.replicaId);
51
+ // a bit fragile - skipping presence-update since currently
52
+ // it's delivered before sync. in which case, sync always
53
+ // sees a recent last seen for the replica even if it was
54
+ // truant before the presence-update.
55
+ if (message.type !== 'presence-update') {
56
+ await this.storage.replicas.updateLastSeen(info.libraryId, message.replicaId);
57
+ }
52
58
  };
53
59
  this.remove = (libraryId, replicaId) => {
54
60
  this.presences.removeReplica(libraryId, replicaId);
@@ -133,8 +139,14 @@ export class ServerLibrary extends EventSubscriber {
133
139
  const isEmptyLibrary = changesSince === null && ops.length === 0 && baselines.length === 0;
134
140
  if (isEmptyLibrary) {
135
141
  this.log('info', 'Received sync from new library', replicaId);
142
+ // when initializing a new library, rewrite authz subjects to
143
+ // the current user ID (on a purely local replica, these authz
144
+ // subjects will be a generic "originator" constant value, because
145
+ // it doesnt know what user it is until it connects to the server)
146
+ rewriteAuthzOriginator(message, info.userId);
136
147
  }
137
- let overwriteLocalData = replicaShouldReset && !isEmptyLibrary;
148
+ // don't reset replica if library is empty...
149
+ let overwriteReplicaData = replicaShouldReset && !isEmptyLibrary;
138
150
  // if the local library is empty and the replica is new to us,
139
151
  // but the replica is providing a "since" timestamp, this
140
152
  // suggests the local data is incomplete or gone. we request
@@ -152,14 +164,14 @@ export class ServerLibrary extends EventSubscriber {
152
164
  // but the library already has data. the replica should
153
165
  // reset to the server version
154
166
  this.log('warn', 'Detected replica', replicaId, 'is providing a full history but the library already has data. Requesting replica reset.');
155
- overwriteLocalData = true;
167
+ overwriteReplicaData = true;
156
168
  }
157
- if (overwriteLocalData) {
169
+ if (overwriteReplicaData) {
158
170
  this.log('info', 'Overwriting local data for replica', replicaId, 'with', baselines.length, 'baselines and', ops.length, 'operations');
159
171
  }
160
172
  // only write incoming replica data to storage if
161
173
  // we are not overwriting the replica's data
162
- if (!overwriteLocalData) {
174
+ if (!overwriteReplicaData) {
163
175
  // store all incoming operations and baselines
164
176
  await this.storage.baselines.insertAll(info.libraryId, message.baselines);
165
177
  this.log('debug', 'Storing', message.baselines.length, 'baselines and', message.operations.length, 'operations');
@@ -194,7 +206,7 @@ export class ServerLibrary extends EventSubscriber {
194
206
  // only request the client to overwrite local data if a reset is requested
195
207
  // and there is data to overwrite it. otherwise the client may still
196
208
  // send its own history to us.
197
- overwriteLocalData,
209
+ overwriteLocalData: overwriteReplicaData,
198
210
  ackedTimestamp: message.timestamp,
199
211
  ackThisNonce,
200
212
  });
@@ -1 +1 @@
1
- {"version":3,"file":"ServerLibrary.js","sourceRoot":"","sources":["../../src/ServerLibrary.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ServerLibrary.js","sourceRoot":"","sources":["../../src/ServerLibrary.ts"],"names":[],"mappings":"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"}
@@ -44,10 +44,12 @@ export class SqlBaselines {
44
44
  oid: baseline.oid,
45
45
  snapshot: JSON.stringify(baseline.snapshot),
46
46
  timestamp: baseline.timestamp,
47
+ authz: baseline.authz,
47
48
  })
48
49
  .onConflict((cb) => cb.doUpdateSet({
49
50
  snapshot: JSON.stringify(baseline.snapshot),
50
51
  timestamp: baseline.timestamp,
52
+ authz: baseline.authz,
51
53
  }))
52
54
  .execute();
53
55
  };
@@ -73,10 +75,14 @@ export class SqlBaselines {
73
75
  snapshot: {},
74
76
  timestamp: operations[0].timestamp,
75
77
  libraryId,
78
+ authz: operations[0].authz,
76
79
  };
77
80
  }
78
81
  for (const operation of operations) {
79
82
  baseline.snapshot = applyPatch(baseline.snapshot, operation.data, deletedRefs);
83
+ if (operation.data.op === 'initialize') {
84
+ baseline.authz = operation.authz;
85
+ }
80
86
  }
81
87
  baseline.timestamp = operations[operations.length - 1].timestamp;
82
88
  await this.set(libraryId, baseline, { tx });
@@ -1 +1 @@
1
- {"version":3,"file":"SqlBaselines.js","sourceRoot":"","sources":["../../../../src/storage/sql/SqlBaselines.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SqlBaselines.js","sourceRoot":"","sources":["../../../../src/storage/sql/SqlBaselines.ts"],"names":[],"mappings":"AAGA,OAAO,EAAyB,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAGxE,MAAM,OAAO,YAAY;IACxB,YACS,EAAoB,EACpB,OAA8B;QAD9B,OAAE,GAAF,EAAE,CAAkB;QACpB,YAAO,GAAP,OAAO,CAAuB;QAGvC,QAAG,GAAG,KAAK,EACV,SAAiB,EACjB,GAAW,EACX,EAAE,EAAE,KAAgC,EAAE,EACK,EAAE;;YAC7C,MAAM,EAAE,GAAG,EAAE,aAAF,EAAE,cAAF,EAAE,GAAI,IAAI,CAAC,EAAE,CAAC;YACzB,MAAM,GAAG,GACR,MAAA,CAAC,MAAM,EAAE;iBACP,UAAU,CAAC,kBAAkB,CAAC;iBAC9B,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,SAAS,CAAC;iBAClC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC;iBACtB,SAAS,EAAE;iBACX,gBAAgB,EAAE,CAAC,mCAAI,IAAI,CAAC;YAC/B,IAAI,CAAC,GAAG;gBAAE,OAAO,IAAI,CAAC;YACtB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAClB,OAAO,GAAU,CAAC;QACnB,CAAC,CAAC;QAEF,WAAM,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;YACpC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE;iBACvB,UAAU,CAAC,kBAAkB,CAAC;iBAC9B,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,SAAS,CAAC;iBAClC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC;iBAC3B,SAAS,EAAE;iBACX,OAAO,EAAE,CAAC;YAEZ,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAE1B,OAAO,GAAU,CAAC;QACnB,CAAC,CAAC;QAEF,QAAG,GAAG,KAAK,EACV,SAAiB,EACjB,QAA0B,EAC1B,EACC,EAAE,GAGF,EACA,EAAE;YACH,MAAM,EAAE,GAAG,EAAE,aAAF,EAAE,cAAF,EAAE,GAAI,IAAI,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;gBACxB,MAAM,EAAE;qBACN,UAAU,CAAC,kBAAkB,CAAC;qBAC9B,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,SAAS,CAAC;qBAClC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC;qBAC/B,OAAO,EAAE,CAAC;gBACZ,OAAO;YACR,CAAC;YAED,MAAM,EAAE;iBACN,UAAU,CAAC,kBAAkB,CAAC;iBAC9B,MAAM,CAAC;gBACP,SAAS;gBACT,GAAG,EAAE,QAAQ,CAAC,GAAG;gBACjB,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAC3C,SAAS,EAAE,QAAQ,CAAC,SAAS;gBAC7B,KAAK,EAAE,QAAQ,CAAC,KAAK;aACrB,CAAC;iBACD,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAClB,EAAE,CAAC,WAAW,CAAC;gBACd,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC;gBAC3C,SAAS,EAAE,QAAQ,CAAC,SAAS;gBAC7B,KAAK,EAAE,QAAQ,CAAC,KAAK;aACrB,CAAC,CACF;iBACA,OAAO,EAAE,CAAC;QACb,CAAC,CAAC;QAEF,cAAS,GAAG,KAAK,EAAE,SAAiB,EAAE,SAA6B,EAAE,EAAE;YACtE,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBAChD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;oBAClC,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC7C,CAAC;YACF,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QAEM,YAAO,GAAG,CAAC,GAAwB,EAAE,EAAE;YAC9C,6DAA6D;YAC7D,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACzC,CAAC,CAAC;QAEF,oBAAe,GAAG,KAAK,EACtB,SAAiB,EACjB,GAAW,EACX,UAA6B,EAC7B,WAAmB,EAClB,EAAE;YACH,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO;YAEpC,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;gBAChD,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;gBACtD,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACf,QAAQ,GAAG;wBACV,GAAG;wBACH,QAAQ,EAAE,EAAE;wBACZ,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS;wBAClC,SAAS;wBACT,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK;qBAC1B,CAAC;gBACH,CAAC;gBACD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;oBACpC,QAAQ,CAAC,QAAQ,GAAG,UAAU,CAC7B,QAAQ,CAAC,QAAQ,EACjB,SAAS,CAAC,IAAI,EACd,WAAW,CACX,CAAC;oBACF,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,YAAY,EAAE,CAAC;wBACxC,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC;oBAClC,CAAC;gBACF,CAAC;gBACD,QAAQ,CAAC,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;gBACjE,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;QACJ,CAAC,CAAC;QAEF,cAAS,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;YACvC,MAAM,IAAI,CAAC,EAAE;iBACX,UAAU,CAAC,kBAAkB,CAAC;iBAC9B,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,SAAS,CAAC;iBAClC,OAAO,EAAE,CAAC;QACb,CAAC,CAAC;QAEF,aAAQ,GAAG,KAAK,EAAE,SAAiB,EAAE,EAAE;;YACtC,OAAO,CACN,MAAA,MAAA,CACC,MAAM,IAAI,CAAC,EAAE;iBACX,UAAU,CAAC,kBAAkB,CAAC;iBAC9B,KAAK,CAAC,WAAW,EAAE,GAAG,EAAE,SAAS,CAAC;iBAClC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAU,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;iBACrD,gBAAgB,EAAE,CACpB,0CAAE,KAAK,mCAAI,CAAC,CACb,CAAC;QACH,CAAC,CAAC;IAvIC,CAAC;CAwIJ"}
@@ -78,6 +78,7 @@ export class SqlOperations {
78
78
  timestamp: item.timestamp,
79
79
  replicaId,
80
80
  serverOrder: ++currentServerOrder,
81
+ authz: item.authz,
81
82
  })
82
83
  .onConflict((cb) => cb
83
84
  .columns(['libraryId', 'replicaId', 'oid', 'timestamp'])
@@ -1 +1 @@
1
- {"version":3,"file":"SqlOperations.js","sourceRoot":"","sources":["../../../../src/storage/sql/SqlOperations.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SqlOperations.js","sourceRoot":"","sources":["../../../../src/storage/sql/SqlOperations.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,3 @@
1
+ import { Kysely } from 'kysely';
2
+ export declare function up(db: Kysely<any>): Promise<void>;
3
+ export declare function down(db: Kysely<any>): Promise<void>;
@@ -0,0 +1,16 @@
1
+ export async function up(db) {
2
+ // add authz column to OperationHistory and DocumentBaseline
3
+ await db.schema
4
+ .alterTable('OperationHistory')
5
+ .addColumn('authz', 'text', (cb) => cb.defaultTo(null))
6
+ .execute();
7
+ await db.schema
8
+ .alterTable('DocumentBaseline')
9
+ .addColumn('authz', 'text', (cb) => cb.defaultTo(null))
10
+ .execute();
11
+ }
12
+ export async function down(db) {
13
+ await db.schema.alterTable('OperationHistory').dropColumn('authz').execute();
14
+ await db.schema.alterTable('DocumentBaseline').dropColumn('authz').execute();
15
+ }
16
+ //# sourceMappingURL=v2.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"v2.js","sourceRoot":"","sources":["../../../../../src/storage/sql/migrations/v2.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC,EAAe;IACvC,4DAA4D;IAC5D,MAAM,EAAE,CAAC,MAAM;SACb,UAAU,CAAC,kBAAkB,CAAC;SAC9B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SACtD,OAAO,EAAE,CAAC;IAEZ,MAAM,EAAE,CAAC,MAAM;SACb,UAAU,CAAC,kBAAkB,CAAC;SAC9B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SACtD,OAAO,EAAE,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,EAAe;IACzC,MAAM,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;IAE7E,MAAM,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;AAC9E,CAAC"}
@@ -1,5 +1,7 @@
1
1
  import * as v1 from './migrations/v1.js';
2
+ import * as v2 from './migrations/v2.js';
2
3
  declare const _default: {
3
4
  v1: typeof v1;
5
+ v2: typeof v2;
4
6
  };
5
7
  export default _default;
@@ -1,3 +1,4 @@
1
1
  import * as v1 from './migrations/v1.js';
2
- export default { v1 };
2
+ import * as v2 from './migrations/v2.js';
3
+ export default { v1, v2 };
3
4
  //# sourceMappingURL=migrations.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../../src/storage/sql/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEzC,eAAe,EAAE,EAAE,EAAE,CAAC"}
1
+ {"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../../src/storage/sql/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEzC,eAAe,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC"}
@@ -13,6 +13,7 @@ export interface OperationHistoryTable {
13
13
  serverOrder: number;
14
14
  replicaId: string;
15
15
  libraryId: string;
16
+ authz: string | null;
16
17
  }
17
18
  export type OperationHistoryRow = Selectable<OperationHistoryTable>;
18
19
  export interface DocumentBaselineTable {
@@ -20,6 +21,7 @@ export interface DocumentBaselineTable {
20
21
  snapshot: string;
21
22
  timestamp: string;
22
23
  libraryId: string;
24
+ authz: string | null;
23
25
  }
24
26
  export type DocumentBaselineRow = Selectable<DocumentBaselineTable>;
25
27
  export interface ReplicaInfoTable {
@@ -41,10 +41,12 @@ export class SqlBaselines {
41
41
  oid: baseline.oid,
42
42
  snapshot: JSON.stringify(baseline.snapshot),
43
43
  timestamp: baseline.timestamp,
44
+ authz: baseline.authz,
44
45
  })
45
46
  .onConflict((cb) => cb.doUpdateSet({
46
47
  snapshot: JSON.stringify(baseline.snapshot),
47
48
  timestamp: baseline.timestamp,
49
+ authz: baseline.authz,
48
50
  }))
49
51
  .execute();
50
52
  };
@@ -72,10 +74,14 @@ export class SqlBaselines {
72
74
  snapshot: {},
73
75
  timestamp: operations[0].timestamp,
74
76
  libraryId,
77
+ authz: operations[0].authz,
75
78
  };
76
79
  }
77
80
  for (const operation of operations) {
78
81
  baseline.snapshot = applyPatch(baseline.snapshot, operation.data, deletedRefs);
82
+ if (operation.data.op === 'initialize') {
83
+ baseline.authz = operation.authz;
84
+ }
79
85
  }
80
86
  baseline.timestamp = operations[operations.length - 1].timestamp;
81
87
  await this.set(libraryId, baseline, { tx });
@@ -1 +1 @@
1
- {"version":3,"file":"SqlBaselines.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/SqlBaselines.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SqlBaselines.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/SqlBaselines.ts"],"names":[],"mappings":"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"}
@@ -77,6 +77,7 @@ export class SqlOperations {
77
77
  timestamp: item.timestamp,
78
78
  replicaId,
79
79
  serverOrder: ++currentServerOrder,
80
+ authz: item.authz,
80
81
  })
81
82
  .onConflict((cb) => cb.columns(['replicaId', 'oid', 'timestamp']).doNothing())
82
83
  .execute();
@@ -1 +1 @@
1
- {"version":3,"file":"SqlOperations.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/SqlOperations.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SqlOperations.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/SqlOperations.ts"],"names":[],"mappings":"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"}
@@ -5,12 +5,14 @@ export declare function randomOperations(libraryId: string, count?: number): {
5
5
  serverOrder: number;
6
6
  replicaId: string;
7
7
  libraryId: string;
8
+ authz: null;
8
9
  }[];
9
10
  export declare function randomBaselines(libraryId: string, count?: number): {
10
11
  oid: string;
11
12
  snapshot: string;
12
13
  timestamp: string;
13
14
  libraryId: string;
15
+ authz: null;
14
16
  }[];
15
17
  export declare function randomFileMetadata(libraryId: string, count?: number): {
16
18
  libraryId: string;
@@ -9,6 +9,7 @@ export function randomOperations(libraryId, count = 10) {
9
9
  serverOrder: i,
10
10
  replicaId: `replicaId-${i}`,
11
11
  libraryId,
12
+ authz: null,
12
13
  }));
13
14
  }
14
15
  export function randomBaselines(libraryId, count = 10) {
@@ -17,6 +18,7 @@ export function randomBaselines(libraryId, count = 10) {
17
18
  snapshot: `snapshot-${i}-${random()}`,
18
19
  timestamp: `timestamp-${i}-${random()}`,
19
20
  libraryId,
21
+ authz: null,
20
22
  }));
21
23
  }
22
24
  export function randomFileMetadata(libraryId, count = 10) {
@@ -1 +1 @@
1
- {"version":3,"file":"unifiedData.js","sourceRoot":"","sources":["../../../../../src/storage/sqlShard/_testData/unifiedData.ts"],"names":[],"mappings":"AAAA,SAAS,MAAM;IACd,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,SAAiB,EAAE,KAAK,GAAG,EAAE;IAC7D,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/C,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,EAAE,EAAE;QAC3B,SAAS,EAAE,aAAa,CAAC,IAAI,MAAM,EAAE,EAAE;QACvC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,EAAE,EAAE;QAC7B,WAAW,EAAE,CAAC;QACd,SAAS,EAAE,aAAa,CAAC,EAAE;QAC3B,SAAS;KACT,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,SAAiB,EAAE,KAAK,GAAG,EAAE;IAC5D,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/C,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,EAAE,EAAE;QAC3B,QAAQ,EAAE,YAAY,CAAC,IAAI,MAAM,EAAE,EAAE;QACrC,SAAS,EAAE,aAAa,CAAC,IAAI,MAAM,EAAE,EAAE;QACvC,SAAS;KACT,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,SAAiB,EAAE,KAAK,GAAG,EAAE;IAC/D,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/C,SAAS;QACT,MAAM,EAAE,UAAU,CAAC,IAAI,MAAM,EAAE,EAAE;QACjC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,EAAE,EAAE;QAC7B,IAAI,EAAE,QAAQ,CAAC,EAAE;QACjB,eAAe,EAAE,CAAC;KAClB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,SAAiB,EAAE,KAAK,GAAG,EAAE;IAC9D,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/C,SAAS;QACT,EAAE,EAAE,aAAa,CAAC,EAAE;QACpB,QAAQ,EAAE,YAAY,CAAC,IAAI,MAAM,EAAE,EAAE;QACrC,qBAAqB,EAAE,CAAC;QACxB,gBAAgB,EAAE,oBAAoB,CAAC,IAAI,MAAM,EAAE,EAAE;QACrD,IAAI,EAAE,CAAC;QACP,gBAAgB,EAAE,CAAC;KACnB,CAAC,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"unifiedData.js","sourceRoot":"","sources":["../../../../../src/storage/sqlShard/_testData/unifiedData.ts"],"names":[],"mappings":"AAAA,SAAS,MAAM;IACd,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,SAAiB,EAAE,KAAK,GAAG,EAAE;IAC7D,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/C,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,EAAE,EAAE;QAC3B,SAAS,EAAE,aAAa,CAAC,IAAI,MAAM,EAAE,EAAE;QACvC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,EAAE,EAAE;QAC7B,WAAW,EAAE,CAAC;QACd,SAAS,EAAE,aAAa,CAAC,EAAE;QAC3B,SAAS;QACT,KAAK,EAAE,IAAI;KACX,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,SAAiB,EAAE,KAAK,GAAG,EAAE;IAC5D,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/C,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,EAAE,EAAE;QAC3B,QAAQ,EAAE,YAAY,CAAC,IAAI,MAAM,EAAE,EAAE;QACrC,SAAS,EAAE,aAAa,CAAC,IAAI,MAAM,EAAE,EAAE;QACvC,SAAS;QACT,KAAK,EAAE,IAAI;KACX,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,SAAiB,EAAE,KAAK,GAAG,EAAE;IAC/D,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/C,SAAS;QACT,MAAM,EAAE,UAAU,CAAC,IAAI,MAAM,EAAE,EAAE;QACjC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,EAAE,EAAE;QAC7B,IAAI,EAAE,QAAQ,CAAC,EAAE;QACjB,eAAe,EAAE,CAAC;KAClB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,SAAiB,EAAE,KAAK,GAAG,EAAE;IAC9D,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/C,SAAS;QACT,EAAE,EAAE,aAAa,CAAC,EAAE;QACpB,QAAQ,EAAE,YAAY,CAAC,IAAI,MAAM,EAAE,EAAE;QACrC,qBAAqB,EAAE,CAAC;QACxB,gBAAgB,EAAE,oBAAoB,CAAC,IAAI,MAAM,EAAE,EAAE;QACrD,IAAI,EAAE,CAAC;QACP,gBAAgB,EAAE,CAAC;KACnB,CAAC,CAAC,CAAC;AACL,CAAC"}
@@ -0,0 +1,3 @@
1
+ import { Kysely } from 'kysely';
2
+ export declare function up(db: Kysely<any>): Promise<void>;
3
+ export declare function down(db: Kysely<any>): Promise<void>;
@@ -0,0 +1,16 @@
1
+ export async function up(db) {
2
+ // add authz column to OperationHistory and DocumentBaseline
3
+ await db.schema
4
+ .alterTable('OperationHistory')
5
+ .addColumn('authz', 'text', (cb) => cb.defaultTo(null))
6
+ .execute();
7
+ await db.schema
8
+ .alterTable('DocumentBaseline')
9
+ .addColumn('authz', 'text', (cb) => cb.defaultTo(null))
10
+ .execute();
11
+ }
12
+ export async function down(db) {
13
+ await db.schema.alterTable('OperationHistory').dropColumn('authz').execute();
14
+ await db.schema.alterTable('DocumentBaseline').dropColumn('authz').execute();
15
+ }
16
+ //# sourceMappingURL=v2.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"v2.js","sourceRoot":"","sources":["../../../../../src/storage/sqlShard/migrations/v2.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,KAAK,UAAU,EAAE,CAAC,EAAe;IACvC,4DAA4D;IAC5D,MAAM,EAAE,CAAC,MAAM;SACb,UAAU,CAAC,kBAAkB,CAAC;SAC9B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SACtD,OAAO,EAAE,CAAC;IAEZ,MAAM,EAAE,CAAC,MAAM;SACb,UAAU,CAAC,kBAAkB,CAAC;SAC9B,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SACtD,OAAO,EAAE,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,EAAe;IACzC,MAAM,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;IAE7E,MAAM,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;AAC9E,CAAC"}
@@ -1,5 +1,7 @@
1
1
  import * as v1 from './migrations/v1.js';
2
+ import * as v2 from './migrations/v2.js';
2
3
  declare const _default: {
3
4
  v1: typeof v1;
5
+ v2: typeof v2;
4
6
  };
5
7
  export default _default;
@@ -1,3 +1,4 @@
1
1
  import * as v1 from './migrations/v1.js';
2
- export default { v1 };
2
+ import * as v2 from './migrations/v2.js';
3
+ export default { v1, v2 };
3
4
  //# sourceMappingURL=migrations.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEzC,eAAe,EAAE,EAAE,EAAE,CAAC"}
1
+ {"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../../../src/storage/sqlShard/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEzC,eAAe,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC"}
@@ -12,12 +12,14 @@ export interface OperationHistoryTable {
12
12
  data: string;
13
13
  serverOrder: number;
14
14
  replicaId: string;
15
+ authz: string | null;
15
16
  }
16
17
  export type OperationHistoryRow = Selectable<OperationHistoryTable>;
17
18
  export interface DocumentBaselineTable {
18
19
  oid: string;
19
20
  snapshot: string;
20
21
  timestamp: string;
22
+ authz: string | null;
21
23
  }
22
24
  export type DocumentBaselineRow = Selectable<DocumentBaselineTable>;
23
25
  export interface ReplicaInfoTable {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@verdant-web/server",
3
- "version": "3.1.2",
3
+ "version": "3.2.0-next.0",
4
4
  "access": "public",
5
5
  "type": "module",
6
6
  "bin": {
@@ -34,7 +34,7 @@
34
34
  "kysely-plugin-serialize": "^0.5.7",
35
35
  "minimist": "^1.2.8",
36
36
  "ws": "^8.9.0",
37
- "@verdant-web/common": "2.3.4"
37
+ "@verdant-web/common": "2.4.0-next.0"
38
38
  },
39
39
  "devDependencies": {
40
40
  "@types/async-lock": "^1.3.0",
@@ -1,12 +1,48 @@
1
- import { ServerMessage } from '@verdant-web/common';
1
+ import { authz, Operation, ServerMessage } from '@verdant-web/common';
2
2
  import { IncomingMessage, ServerResponse } from 'http';
3
3
  import { WebSocket } from 'ws';
4
4
  import { TokenInfo } from './TokenVerifier.js';
5
5
 
6
6
  abstract class ClientConnection {
7
- constructor(readonly key: string) {}
7
+ constructor(
8
+ readonly key: string,
9
+ protected readonly info: TokenInfo,
10
+ ) {}
11
+
12
+ abstract handleMessage(message: ServerMessage): void;
13
+ respond = (message: ServerMessage) => {
14
+ this.handleMessage(this.processMessage(message));
15
+ };
16
+
17
+ private processMessage = (message: ServerMessage): ServerMessage => {
18
+ switch (message.type) {
19
+ case 'op-re': {
20
+ return {
21
+ ...message,
22
+ operations: message.operations.filter(this.filterAuthorizedData),
23
+ baselines: message.baselines?.filter(this.filterAuthorizedData),
24
+ };
25
+ }
26
+ case 'sync-resp': {
27
+ return {
28
+ ...message,
29
+ operations: message.operations.filter(this.filterAuthorizedData),
30
+ baselines: message.baselines.filter(this.filterAuthorizedData),
31
+ };
32
+ }
33
+ default:
34
+ return message;
35
+ }
36
+ };
8
37
 
9
- abstract respond(message: ServerMessage): void;
38
+ private filterAuthorizedData = (operation: { authz?: string }) => {
39
+ if (operation.authz) {
40
+ const decoded = authz.decode(operation.authz);
41
+ // TODO: support more authz operations and types
42
+ return decoded.subject === this.info.userId;
43
+ }
44
+ return true;
45
+ };
10
46
  }
11
47
 
12
48
  class RequestClientConnection extends ClientConnection {
@@ -18,12 +54,12 @@ class RequestClientConnection extends ClientConnection {
18
54
  key: string,
19
55
  private readonly req: IncomingMessage,
20
56
  private readonly res: ServerResponse,
21
- readonly info: TokenInfo,
57
+ info: TokenInfo,
22
58
  ) {
23
- super(key);
59
+ super(key, info);
24
60
  }
25
61
 
26
- respond = (message: ServerMessage) => {
62
+ handleMessage = (message: ServerMessage) => {
27
63
  this.responses.push(message);
28
64
  };
29
65
 
@@ -49,12 +85,12 @@ class FetchClientConnection extends ClientConnection {
49
85
  constructor(
50
86
  key: string,
51
87
  private readonly req: Request,
52
- private readonly info: TokenInfo,
88
+ info: TokenInfo,
53
89
  ) {
54
- super(key);
90
+ super(key, info);
55
91
  }
56
92
 
57
- respond = (message: ServerMessage) => {
93
+ handleMessage = (message: ServerMessage) => {
58
94
  this.responses.push(message);
59
95
  };
60
96
 
@@ -79,12 +115,12 @@ class WebSocketClientConnection extends ClientConnection {
79
115
  constructor(
80
116
  key: string,
81
117
  readonly ws: WebSocket,
82
- readonly info: TokenInfo,
118
+ info: TokenInfo,
83
119
  ) {
84
- super(key);
120
+ super(key, info);
85
121
  }
86
122
 
87
- respond = (message: ServerMessage) => {
123
+ handleMessage = (message: ServerMessage) => {
88
124
  this.ws.send(JSON.stringify(message));
89
125
  };
90
126
  }
@@ -14,6 +14,7 @@ import {
14
14
  isFileRef,
15
15
  isObjectRef,
16
16
  omit,
17
+ rewriteAuthzOriginator,
17
18
  } from '@verdant-web/common';
18
19
  import { MessageSender } from './MessageSender.js';
19
20
  import { Presence } from './Presence.js';
@@ -131,10 +132,16 @@ export class ServerLibrary extends EventSubscriber<ServerLibraryEvents> {
131
132
  this.log('Unknown message type', (message as any).type);
132
133
  break;
133
134
  }
134
- await this.storage.replicas.updateLastSeen(
135
- info.libraryId,
136
- message.replicaId,
137
- );
135
+ // a bit fragile - skipping presence-update since currently
136
+ // it's delivered before sync. in which case, sync always
137
+ // sees a recent last seen for the replica even if it was
138
+ // truant before the presence-update.
139
+ if (message.type !== 'presence-update') {
140
+ await this.storage.replicas.updateLastSeen(
141
+ info.libraryId,
142
+ message.replicaId,
143
+ );
144
+ }
138
145
  };
139
146
 
140
147
  remove = (libraryId: string, replicaId: string) => {
@@ -286,9 +293,16 @@ export class ServerLibrary extends EventSubscriber<ServerLibraryEvents> {
286
293
  changesSince === null && ops.length === 0 && baselines.length === 0;
287
294
  if (isEmptyLibrary) {
288
295
  this.log('info', 'Received sync from new library', replicaId);
296
+
297
+ // when initializing a new library, rewrite authz subjects to
298
+ // the current user ID (on a purely local replica, these authz
299
+ // subjects will be a generic "originator" constant value, because
300
+ // it doesnt know what user it is until it connects to the server)
301
+ rewriteAuthzOriginator(message, info.userId);
289
302
  }
290
303
 
291
- let overwriteLocalData = replicaShouldReset && !isEmptyLibrary;
304
+ // don't reset replica if library is empty...
305
+ let overwriteReplicaData = replicaShouldReset && !isEmptyLibrary;
292
306
 
293
307
  // if the local library is empty and the replica is new to us,
294
308
  // but the replica is providing a "since" timestamp, this
@@ -315,10 +329,10 @@ export class ServerLibrary extends EventSubscriber<ServerLibraryEvents> {
315
329
  replicaId,
316
330
  'is providing a full history but the library already has data. Requesting replica reset.',
317
331
  );
318
- overwriteLocalData = true;
332
+ overwriteReplicaData = true;
319
333
  }
320
334
 
321
- if (overwriteLocalData) {
335
+ if (overwriteReplicaData) {
322
336
  this.log(
323
337
  'info',
324
338
  'Overwriting local data for replica',
@@ -333,7 +347,7 @@ export class ServerLibrary extends EventSubscriber<ServerLibraryEvents> {
333
347
 
334
348
  // only write incoming replica data to storage if
335
349
  // we are not overwriting the replica's data
336
- if (!overwriteLocalData) {
350
+ if (!overwriteReplicaData) {
337
351
  // store all incoming operations and baselines
338
352
  await this.storage.baselines.insertAll(info.libraryId, message.baselines);
339
353
 
@@ -403,7 +417,7 @@ export class ServerLibrary extends EventSubscriber<ServerLibraryEvents> {
403
417
  // only request the client to overwrite local data if a reset is requested
404
418
  // and there is data to overwrite it. otherwise the client may still
405
419
  // send its own history to us.
406
- overwriteLocalData,
420
+ overwriteLocalData: overwriteReplicaData,
407
421
  ackedTimestamp: message.timestamp,
408
422
  ackThisNonce,
409
423
  });
@@ -67,11 +67,13 @@ export class SqlBaselines implements BaselineStorage {
67
67
  oid: baseline.oid,
68
68
  snapshot: JSON.stringify(baseline.snapshot),
69
69
  timestamp: baseline.timestamp,
70
+ authz: baseline.authz,
70
71
  })
71
72
  .onConflict((cb) =>
72
73
  cb.doUpdateSet({
73
74
  snapshot: JSON.stringify(baseline.snapshot),
74
75
  timestamp: baseline.timestamp,
76
+ authz: baseline.authz,
75
77
  }),
76
78
  )
77
79
  .execute();
@@ -106,6 +108,7 @@ export class SqlBaselines implements BaselineStorage {
106
108
  snapshot: {},
107
109
  timestamp: operations[0].timestamp,
108
110
  libraryId,
111
+ authz: operations[0].authz,
109
112
  };
110
113
  }
111
114
  for (const operation of operations) {
@@ -114,6 +117,9 @@ export class SqlBaselines implements BaselineStorage {
114
117
  operation.data,
115
118
  deletedRefs,
116
119
  );
120
+ if (operation.data.op === 'initialize') {
121
+ baseline.authz = operation.authz;
122
+ }
117
123
  }
118
124
  baseline.timestamp = operations[operations.length - 1].timestamp;
119
125
  await this.set(libraryId, baseline, { tx });
@@ -115,6 +115,7 @@ export class SqlOperations implements OperationStorage {
115
115
  timestamp: item.timestamp,
116
116
  replicaId,
117
117
  serverOrder: ++currentServerOrder,
118
+ authz: item.authz,
118
119
  })
119
120
  .onConflict((cb) =>
120
121
  cb
@@ -0,0 +1,20 @@
1
+ import { Kysely } from 'kysely';
2
+
3
+ export async function up(db: Kysely<any>) {
4
+ // add authz column to OperationHistory and DocumentBaseline
5
+ await db.schema
6
+ .alterTable('OperationHistory')
7
+ .addColumn('authz', 'text', (cb) => cb.defaultTo(null))
8
+ .execute();
9
+
10
+ await db.schema
11
+ .alterTable('DocumentBaseline')
12
+ .addColumn('authz', 'text', (cb) => cb.defaultTo(null))
13
+ .execute();
14
+ }
15
+
16
+ export async function down(db: Kysely<any>) {
17
+ await db.schema.alterTable('OperationHistory').dropColumn('authz').execute();
18
+
19
+ await db.schema.alterTable('DocumentBaseline').dropColumn('authz').execute();
20
+ }
@@ -1,3 +1,4 @@
1
1
  import * as v1 from './migrations/v1.js';
2
+ import * as v2 from './migrations/v2.js';
2
3
 
3
- export default { v1 };
4
+ export default { v1, v2 };
@@ -15,6 +15,7 @@ export interface OperationHistoryTable {
15
15
  serverOrder: number;
16
16
  replicaId: string;
17
17
  libraryId: string;
18
+ authz: string | null;
18
19
  }
19
20
  export type OperationHistoryRow = Selectable<OperationHistoryTable>;
20
21
 
@@ -23,6 +24,7 @@ export interface DocumentBaselineTable {
23
24
  snapshot: string;
24
25
  timestamp: string;
25
26
  libraryId: string;
27
+ authz: string | null;
26
28
  }
27
29
  export type DocumentBaselineRow = Selectable<DocumentBaselineTable>;
28
30
 
@@ -65,11 +65,13 @@ export class SqlBaselines implements BaselineStorage {
65
65
  oid: baseline.oid,
66
66
  snapshot: JSON.stringify(baseline.snapshot),
67
67
  timestamp: baseline.timestamp,
68
+ authz: baseline.authz,
68
69
  })
69
70
  .onConflict((cb) =>
70
71
  cb.doUpdateSet({
71
72
  snapshot: JSON.stringify(baseline.snapshot),
72
73
  timestamp: baseline.timestamp,
74
+ authz: baseline.authz,
73
75
  }),
74
76
  )
75
77
  .execute();
@@ -107,6 +109,7 @@ export class SqlBaselines implements BaselineStorage {
107
109
  snapshot: {},
108
110
  timestamp: operations[0].timestamp,
109
111
  libraryId,
112
+ authz: operations[0].authz,
110
113
  };
111
114
  }
112
115
  for (const operation of operations) {
@@ -115,6 +118,9 @@ export class SqlBaselines implements BaselineStorage {
115
118
  operation.data,
116
119
  deletedRefs,
117
120
  );
121
+ if (operation.data.op === 'initialize') {
122
+ baseline.authz = operation.authz;
123
+ }
118
124
  }
119
125
  baseline.timestamp = operations[operations.length - 1].timestamp;
120
126
  await this.set(libraryId, baseline, { tx });
@@ -115,6 +115,7 @@ export class SqlOperations implements OperationStorage {
115
115
  timestamp: item.timestamp,
116
116
  replicaId,
117
117
  serverOrder: ++currentServerOrder,
118
+ authz: item.authz,
118
119
  })
119
120
  .onConflict((cb) =>
120
121
  cb.columns(['replicaId', 'oid', 'timestamp']).doNothing(),
@@ -10,6 +10,7 @@ export function randomOperations(libraryId: string, count = 10) {
10
10
  serverOrder: i,
11
11
  replicaId: `replicaId-${i}`,
12
12
  libraryId,
13
+ authz: null,
13
14
  }));
14
15
  }
15
16
 
@@ -19,6 +20,7 @@ export function randomBaselines(libraryId: string, count = 10) {
19
20
  snapshot: `snapshot-${i}-${random()}`,
20
21
  timestamp: `timestamp-${i}-${random()}`,
21
22
  libraryId,
23
+ authz: null,
22
24
  }));
23
25
  }
24
26
 
@@ -0,0 +1,20 @@
1
+ import { Kysely } from 'kysely';
2
+
3
+ export async function up(db: Kysely<any>) {
4
+ // add authz column to OperationHistory and DocumentBaseline
5
+ await db.schema
6
+ .alterTable('OperationHistory')
7
+ .addColumn('authz', 'text', (cb) => cb.defaultTo(null))
8
+ .execute();
9
+
10
+ await db.schema
11
+ .alterTable('DocumentBaseline')
12
+ .addColumn('authz', 'text', (cb) => cb.defaultTo(null))
13
+ .execute();
14
+ }
15
+
16
+ export async function down(db: Kysely<any>) {
17
+ await db.schema.alterTable('OperationHistory').dropColumn('authz').execute();
18
+
19
+ await db.schema.alterTable('DocumentBaseline').dropColumn('authz').execute();
20
+ }
@@ -1,3 +1,4 @@
1
1
  import * as v1 from './migrations/v1.js';
2
+ import * as v2 from './migrations/v2.js';
2
3
 
3
- export default { v1 };
4
+ export default { v1, v2 };
@@ -14,6 +14,7 @@ export interface OperationHistoryTable {
14
14
  data: string;
15
15
  serverOrder: number;
16
16
  replicaId: string;
17
+ authz: string | null;
17
18
  }
18
19
  export type OperationHistoryRow = Selectable<OperationHistoryTable>;
19
20
 
@@ -21,6 +22,7 @@ export interface DocumentBaselineTable {
21
22
  oid: string;
22
23
  snapshot: string;
23
24
  timestamp: string;
25
+ authz: string | null;
24
26
  }
25
27
  export type DocumentBaselineRow = Selectable<DocumentBaselineTable>;
26
28