@rocicorp/zero 0.19.2025041201 → 0.19.2025041402

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 (67) hide show
  1. package/out/{chunk-XXFMSZJU.js → chunk-JYQA7DID.js} +2 -2
  2. package/out/{chunk-WXO6HY3X.js → chunk-KD57S54B.js} +1 -1
  3. package/out/{chunk-WXO6HY3X.js.map → chunk-KD57S54B.js.map} +2 -2
  4. package/out/{chunk-UYUOQPYD.js → chunk-QONNL5HY.js} +23 -17
  5. package/out/{chunk-UYUOQPYD.js.map → chunk-QONNL5HY.js.map} +2 -2
  6. package/out/{inspector-KHFMOHCD.js → inspector-2LIZBIYB.js} +3 -3
  7. package/out/react.js +1 -1
  8. package/out/solid.js +3 -3
  9. package/out/z2s/src/compiler.d.ts +14 -3
  10. package/out/z2s/src/compiler.d.ts.map +1 -1
  11. package/out/z2s/src/compiler.js +34 -23
  12. package/out/z2s/src/compiler.js.map +1 -1
  13. package/out/zero-cache/src/server/main.js +1 -1
  14. package/out/zero-cache/src/server/main.js.map +1 -1
  15. package/out/zero-cache/src/server/syncer.d.ts.map +1 -1
  16. package/out/zero-cache/src/server/syncer.js +1 -3
  17. package/out/zero-cache/src/server/syncer.js.map +1 -1
  18. package/out/zero-cache/src/services/mutagen/pusher.d.ts +256 -14
  19. package/out/zero-cache/src/services/mutagen/pusher.d.ts.map +1 -1
  20. package/out/zero-cache/src/services/mutagen/pusher.js +105 -50
  21. package/out/zero-cache/src/services/mutagen/pusher.js.map +1 -1
  22. package/out/zero-cache/src/services/view-syncer/cvr-store.d.ts.map +1 -1
  23. package/out/zero-cache/src/services/view-syncer/cvr-store.js +2 -1
  24. package/out/zero-cache/src/services/view-syncer/cvr-store.js.map +1 -1
  25. package/out/zero-cache/src/services/view-syncer/pipeline-driver.d.ts +6 -2
  26. package/out/zero-cache/src/services/view-syncer/pipeline-driver.d.ts.map +1 -1
  27. package/out/zero-cache/src/services/view-syncer/pipeline-driver.js +5 -9
  28. package/out/zero-cache/src/services/view-syncer/pipeline-driver.js.map +1 -1
  29. package/out/zero-cache/src/services/view-syncer/view-syncer.d.ts.map +1 -1
  30. package/out/zero-cache/src/services/view-syncer/view-syncer.js +3 -6
  31. package/out/zero-cache/src/services/view-syncer/view-syncer.js.map +1 -1
  32. package/out/zero-cache/src/workers/connection.d.ts +3 -2
  33. package/out/zero-cache/src/workers/connection.d.ts.map +1 -1
  34. package/out/zero-cache/src/workers/connection.js +6 -2
  35. package/out/zero-cache/src/workers/connection.js.map +1 -1
  36. package/out/zero-cache/src/workers/syncer-ws-message-handler.d.ts +2 -2
  37. package/out/zero-cache/src/workers/syncer-ws-message-handler.d.ts.map +1 -1
  38. package/out/zero-cache/src/workers/syncer-ws-message-handler.js +39 -20
  39. package/out/zero-cache/src/workers/syncer-ws-message-handler.js.map +1 -1
  40. package/out/zero-cache/src/workers/syncer.d.ts +1 -1
  41. package/out/zero-cache/src/workers/syncer.d.ts.map +1 -1
  42. package/out/zero-cache/src/workers/syncer.js +2 -4
  43. package/out/zero-cache/src/workers/syncer.js.map +1 -1
  44. package/out/zero-client/src/client/mutation-tracker.d.ts +4 -0
  45. package/out/zero-client/src/client/mutation-tracker.d.ts.map +1 -1
  46. package/out/zero-client/src/client/options.d.ts +17 -1
  47. package/out/zero-client/src/client/options.d.ts.map +1 -1
  48. package/out/zero-client/src/client/zero.d.ts +1 -1
  49. package/out/zero-client/src/client/zero.d.ts.map +1 -1
  50. package/out/zero-pg/src/web.js +1 -1
  51. package/out/zero-pg/src/web.js.map +1 -1
  52. package/out/zero-protocol/src/connect.d.ts +10 -0
  53. package/out/zero-protocol/src/connect.d.ts.map +1 -1
  54. package/out/zero-protocol/src/connect.js +4 -0
  55. package/out/zero-protocol/src/connect.js.map +1 -1
  56. package/out/zero-protocol/src/protocol-version.d.ts +1 -1
  57. package/out/zero-protocol/src/protocol-version.d.ts.map +1 -1
  58. package/out/zero-protocol/src/protocol-version.js +2 -1
  59. package/out/zero-protocol/src/protocol-version.js.map +1 -1
  60. package/out/zero-protocol/src/up.d.ts +3 -0
  61. package/out/zero-protocol/src/up.d.ts.map +1 -1
  62. package/out/zero.js +3 -3
  63. package/out/zql/src/query/query-impl.d.ts.map +1 -1
  64. package/out/zql/src/query/query-impl.js.map +1 -1
  65. package/package.json +1 -1
  66. /package/out/{chunk-XXFMSZJU.js.map → chunk-JYQA7DID.js.map} +0 -0
  67. /package/out/{inspector-KHFMOHCD.js.map → inspector-2LIZBIYB.js.map} +0 -0
@@ -8,13 +8,13 @@ import {
8
8
  nanoid,
9
9
  readFromHash,
10
10
  withRead
11
- } from "./chunk-XXFMSZJU.js";
11
+ } from "./chunk-JYQA7DID.js";
12
12
  import {
13
13
  SUBQ_PREFIX,
14
14
  normalizeTTL,
15
15
  test,
16
16
  valita_exports
17
- } from "./chunk-WXO6HY3X.js";
17
+ } from "./chunk-KD57S54B.js";
18
18
  import {
19
19
  assert,
20
20
  must,
@@ -390,4 +390,4 @@ var Query = class {
390
390
  export {
391
391
  newInspector
392
392
  };
393
- //# sourceMappingURL=inspector-KHFMOHCD.js.map
393
+ //# sourceMappingURL=inspector-2LIZBIYB.js.map
package/out/react.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import {
2
2
  DEFAULT_TTL,
3
3
  hasOwn
4
- } from "./chunk-WXO6HY3X.js";
4
+ } from "./chunk-KD57S54B.js";
5
5
  import "./chunk-SKR5JO2A.js";
6
6
 
7
7
  // ../zero-react/src/use-query.tsx
package/out/solid.js CHANGED
@@ -1,10 +1,10 @@
1
1
  import {
2
2
  Zero
3
- } from "./chunk-UYUOQPYD.js";
4
- import "./chunk-XXFMSZJU.js";
3
+ } from "./chunk-QONNL5HY.js";
4
+ import "./chunk-JYQA7DID.js";
5
5
  import {
6
6
  DEFAULT_TTL
7
- } from "./chunk-WXO6HY3X.js";
7
+ } from "./chunk-KD57S54B.js";
8
8
  import {
9
9
  applyChange,
10
10
  must
@@ -23,9 +23,20 @@ export declare class Compiler {
23
23
  select(ast: AST, format: Format | undefined, correlation: SQLQuery | undefined): SQLQuery;
24
24
  orderBy(orderBy: Ordering | undefined, table: string): SQLQuery;
25
25
  limit(limit: number | undefined): SQLQuery;
26
- related(relationships: readonly CorrelatedSubquery[], format: Format | undefined, parentTable: string): SQLQuery[];
27
- relationshipSubquery(relationship: CorrelatedSubquery, format: Format | undefined, parentTable: string): SQLQuery;
28
- pullTablesForJunction(relationship: CorrelatedSubquery, tables?: [string, Correlation, number | undefined][]): [string, Correlation, number | undefined][];
26
+ related(relationships: readonly CorrelatedSubquery[], format: Format | undefined, parentTable: string, parentTableAlias?: string | undefined): SQLQuery[];
27
+ relationshipSubquery(relationship: CorrelatedSubquery, format: Format | undefined, parentTable: string, parentTableAlias?: string | undefined): SQLQuery;
28
+ pullTablesForJunction(relationship: CorrelatedSubquery): [
29
+ [
30
+ string,
31
+ Correlation,
32
+ number | undefined
33
+ ],
34
+ [
35
+ string,
36
+ Correlation,
37
+ number | undefined
38
+ ]
39
+ ];
29
40
  makeJunctionJoin(relationship: CorrelatedSubquery): [
30
41
  join: SQLQuery,
31
42
  lastAlis: string,
@@ -1 +1 @@
1
- {"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../../z2s/src/compiler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../../z2s/src/compiler.ts"],"names":[],"mappings":"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"}
@@ -125,41 +125,52 @@ export class Compiler {
125
125
  }
126
126
  return sql `LIMIT ${sqlConvertSingularLiteralArg(limit)}`;
127
127
  }
128
- related(relationships, format, parentTable) {
129
- return relationships.map(relationship => this.relationshipSubquery(relationship, format?.relationships[must(relationship.subquery.alias)], parentTable));
128
+ related(relationships, format, parentTable, parentTableAlias) {
129
+ return relationships.map(relationship => this.relationshipSubquery(relationship, format?.relationships[must(relationship.subquery.alias)], parentTable, parentTableAlias));
130
130
  }
131
- relationshipSubquery(relationship, format, parentTable) {
131
+ relationshipSubquery(relationship, format, parentTable, parentTableAlias) {
132
+ const innerAlias = `inner_${relationship.subquery.alias}`;
132
133
  if (relationship.hidden) {
133
134
  const [join, lastAlias, lastLimit, lastTable] = this.makeJunctionJoin(relationship);
134
- const lastClientColumns = Object.keys(this.#tables[lastTable].columns);
135
- /**
136
- * This aggregates the relationship subquery into an array of objects.
137
- * This looks roughly like:
138
- *
139
- * SELECT COALESCE(json_agg(row_to_json("inner_owner")) , '[]'::json) FROM
140
- * (SELECT mytable.col as client_col, mytable.col2 as client_col2 FROM mytable) inner_mytable
141
- */
135
+ assert(relationship.subquery.related, 'hidden relationship must be a junction');
136
+ const nestedAst = relationship.subquery.related[0].subquery;
137
+ const selectionSet = this.related(nestedAst.related ?? [], format, lastTable, lastAlias);
138
+ const tableSchema = this.#tables[nestedAst.table];
139
+ for (const column of Object.keys(tableSchema.columns)) {
140
+ selectionSet.push(this.#selectCol(nestedAst.table, column, lastAlias));
141
+ }
142
142
  return sql `(
143
- SELECT ${this.#toJSON(`inner_${relationship.subquery.alias}`, format?.singular)} FROM (SELECT ${sql.join(lastClientColumns.map(c => sql `${sql.ident(lastAlias)}.${this.#mapColumn(lastTable, c)}`), ',')} FROM ${join} WHERE (${this.correlate(parentTable, parentTable, relationship.correlation.parentField, relationship.subquery.table, relationship.subquery.table, relationship.correlation.childField)}) ${relationship.subquery.where
143
+ SELECT ${this.#toJSON(innerAlias, format?.singular)} FROM (SELECT ${sql.join(selectionSet, ',')} FROM ${join} WHERE (${this.correlate(parentTable, parentTableAlias ?? parentTable, relationship.correlation.parentField, relationship.subquery.table, relationship.subquery.table, relationship.correlation.childField)}) ${relationship.subquery.where
144
144
  ? sql `AND ${this.where(relationship.subquery.where, relationship.subquery.table)}`
145
- : sql ``} ${this.orderBy(relationship.subquery.orderBy, relationship.subquery.table)} ${format?.singular ? this.limit(1) : this.limit(lastLimit)} ) ${sql.ident(`inner_${relationship.subquery.alias}`)}
145
+ : sql ``} ${this.orderBy(relationship.subquery.orderBy, relationship.subquery.table)} ${format?.singular ? this.limit(1) : this.limit(lastLimit)} ) ${sql.ident(innerAlias)}
146
146
  ) as ${sql.ident(relationship.subquery.alias)}`;
147
147
  }
148
148
  return sql `(
149
- SELECT ${format?.singular ? sql `` : sql `COALESCE(json_agg`}(row_to_json(${sql.ident(`inner_${relationship.subquery.alias}`)})) ${format?.singular ? sql `` : sql `, '[]'::json)`} FROM (${this.select(relationship.subquery, format, this.correlate(parentTable, parentTable, relationship.correlation.parentField, relationship.subquery.table, relationship.subquery.table, relationship.correlation.childField))}) ${sql.ident(`inner_${relationship.subquery.alias}`)}
149
+ SELECT ${this.#toJSON(innerAlias, format?.singular)} FROM (${this.select(relationship.subquery, format, this.correlate(parentTable, parentTableAlias ?? parentTable, relationship.correlation.parentField, relationship.subquery.table, relationship.subquery.table, relationship.correlation.childField))}) ${sql.ident(innerAlias)}
150
150
  ) as ${sql.ident(relationship.subquery.alias)}`;
151
151
  }
152
- pullTablesForJunction(relationship, tables = []) {
152
+ pullTablesForJunction(relationship) {
153
+ const tables = [];
153
154
  tables.push([
154
155
  relationship.subquery.table,
155
156
  relationship.correlation,
156
157
  relationship.subquery.limit,
157
158
  ]);
158
- assert(relationship.subquery.related?.length || 0 <= 1, 'Too many related tables for a junction edge');
159
- for (const subRelationship of relationship.subquery.related ?? []) {
160
- this.pullTablesForJunction(subRelationship, tables);
161
- }
162
- return tables;
159
+ assert(relationship.subquery.related?.length === 1, 'Too many related tables for a junction edge');
160
+ const otherRelationship = relationship.subquery.related[0];
161
+ assert(!otherRelationship.hidden);
162
+ return [
163
+ [
164
+ relationship.subquery.table,
165
+ relationship.correlation,
166
+ relationship.subquery.limit,
167
+ ],
168
+ [
169
+ otherRelationship.subquery.table,
170
+ otherRelationship.correlation,
171
+ otherRelationship.subquery.limit,
172
+ ],
173
+ ];
163
174
  }
164
175
  makeJunctionJoin(relationship) {
165
176
  const participatingTables = this.pullTablesForJunction(relationship);
@@ -321,7 +332,7 @@ export class Compiler {
321
332
  const mapped = this.#nameMapper.tableName(table);
322
333
  return sql.ident(mapped);
323
334
  }
324
- #selectCol(table, column) {
335
+ #selectCol(table, column, tableAlias) {
325
336
  const serverColumnSchema = this.#serverSchema[this.#nameMapper.tableName(table)][this.#nameMapper.columnName(table, column)];
326
337
  const serverType = serverColumnSchema.type;
327
338
  if (!serverColumnSchema.isEnum &&
@@ -330,9 +341,9 @@ export class Compiler {
330
341
  serverType === 'timestamp without time zone' ||
331
342
  serverType === 'timestamptz' ||
332
343
  serverType === 'timestamp with time zone')) {
333
- return sql `EXTRACT(EPOCH FROM ${sql.ident(table)}.${this.#mapColumnNoAlias(table, column)}) * 1000 as ${sql.ident(column)}`;
344
+ return sql `EXTRACT(EPOCH FROM ${sql.ident(tableAlias ?? table)}.${this.#mapColumnNoAlias(table, column)}) * 1000 as ${sql.ident(column)}`;
334
345
  }
335
- return sql `${sql.ident(table)}.${this.#mapColumn(table, column)}`;
346
+ return sql `${sql.ident(tableAlias ?? table)}.${this.#mapColumn(table, column)}`;
336
347
  }
337
348
  #toJSON(table, singular = false) {
338
349
  return sql `${singular ? sql `` : sql `COALESCE(json_agg`}(row_to_json(${sql.ident(table)}))${singular ? sql `` : sql `, '[]'::json)`}`;
@@ -1 +1 @@
1
- {"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../../../z2s/src/compiler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"compiler.js","sourceRoot":"","sources":["../../../../z2s/src/compiler.ts"],"names":[],"mappings":"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"}
@@ -113,7 +113,7 @@ export default async function runWorker(parent, env) {
113
113
  syncers.forEach(syncer => handleSubscriptionsFrom(lc, syncer, notifier));
114
114
  }
115
115
  let mutator;
116
- if (config.push.url !== undefined && clientConnectionBifurcated) {
116
+ if (clientConnectionBifurcated) {
117
117
  mutator = loadWorker('./server/mutator.ts', 'supporting', 'mutator');
118
118
  }
119
119
  lc.info?.('waiting for workers to be ready ...');
@@ -1 +1 @@
1
- {"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/main.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"syncer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"AA4BA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAW/B,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CA0Hf"}
1
+ {"version":3,"file":"syncer.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"AA4BA,OAAO,EAGL,KAAK,MAAM,EACZ,MAAM,uBAAuB,CAAC;AAW/B,MAAM,CAAC,OAAO,UAAU,SAAS,CAC/B,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,GAAG,IAAI,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,IAAI,CAAC,CAuHf"}
@@ -83,9 +83,7 @@ export default function runWorker(parent, env, ...args) {
83
83
  return new ViewSyncerService(logger, shard, must(config.taskID, 'main must set --task-id'), id, cvrDB, new PipelineDriver(logger, config.log, new Snapshotter(logger, replicaFile, shard), shard, operatorStorage.createClientGroupStorage(id), id), sub, drainCoordinator, config.log.slowHydrateThreshold, undefined, config.targetClientRowCount);
84
84
  };
85
85
  const mutagenFactory = (id) => new MutagenService(lc.withContext('component', 'mutagen').withContext('clientGroupID', id), shard, id, upstreamDB, config);
86
- const pusherFactory = config.push.url === undefined
87
- ? undefined
88
- : (id) => new PusherService(config, lc.withContext('clientGroupID', id), id, must(config.push.url), config.push.apiKey);
86
+ const pusherFactory = (id) => new PusherService(config, lc.withContext('clientGroupID', id), id, config.push.url, config.push.apiKey);
89
87
  const syncer = new Syncer(lc, config, viewSyncerFactory, mutagenFactory, pusherFactory, parent);
90
88
  void dbWarmup.then(() => parent.send(['ready', { ready: true }]));
91
89
  return runUntilKilled(lc, parent, syncer);
@@ -1 +1 @@
1
- {"version":3,"file":"syncer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"syncer.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/syncer.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,16 @@
1
1
  import type { LogContext } from '@rocicorp/logger';
2
+ import type { Downstream } from '../../../../zero-protocol/src/down.ts';
2
3
  import { type PushBody } from '../../../../zero-protocol/src/push.ts';
3
4
  import { type ZeroConfig } from '../../config/zero-config.ts';
4
- import type { HandlerResult } from '../../workers/connection.ts';
5
+ import { Subscription } from '../../types/subscription.ts';
6
+ import type { HandlerResult, StreamResult } from '../../workers/connection.ts';
5
7
  import type { Service } from '../service.ts';
8
+ import type { UserPushParams } from '../../../../zero-protocol/src/connect.ts';
9
+ import type { Source } from '../../types/streams.ts';
6
10
  export interface Pusher {
7
- enqueuePush(clientID: string, wsID: string, push: PushBody, jwt: string | undefined): HandlerResult;
11
+ readonly pushURL: string | undefined;
12
+ enqueuePush(clientID: string, push: PushBody, jwt: string | undefined): HandlerResult;
13
+ initConnection(clientID: string, wsID: string, userPushParams: UserPushParams | undefined): Source<Downstream>;
8
14
  }
9
15
  type Config = Pick<ZeroConfig, 'app' | 'shard'>;
10
16
  /**
@@ -23,28 +29,264 @@ type Config = Pick<ZeroConfig, 'app' | 'shard'>;
23
29
  export declare class PusherService implements Service, Pusher {
24
30
  #private;
25
31
  readonly id: string;
26
- constructor(config: Config, lc: LogContext, clientGroupID: string, pushUrl: string, apiKey: string | undefined);
27
- enqueuePush(clientID: string, wsID: string, push: PushBody, jwt: string | undefined): HandlerResult;
32
+ constructor(config: Config, lc: LogContext, clientGroupID: string, pushURL: string | undefined, apiKey: string | undefined);
33
+ get pushURL(): string | undefined;
34
+ initConnection(clientID: string, wsID: string, userPushParams: UserPushParams | undefined): Subscription<["deleteClients", {
35
+ readonly clientIDs?: readonly string[] | undefined;
36
+ readonly clientGroupIDs?: readonly string[] | undefined;
37
+ }] | ["connected", {
38
+ timestamp?: number | undefined;
39
+ wsid: string;
40
+ }] | ["pushResponse", {
41
+ mutationIDs?: {
42
+ id: number;
43
+ clientID: string;
44
+ }[] | undefined;
45
+ error: "unsupportedPushVersion";
46
+ } | {
47
+ mutationIDs?: {
48
+ id: number;
49
+ clientID: string;
50
+ }[] | undefined;
51
+ error: "unsupportedSchemaVersion";
52
+ } | {
53
+ mutationIDs?: {
54
+ id: number;
55
+ clientID: string;
56
+ }[] | undefined;
57
+ error: "http";
58
+ status: number;
59
+ details: string;
60
+ } | {
61
+ mutationIDs?: {
62
+ id: number;
63
+ clientID: string;
64
+ }[] | undefined;
65
+ error: "zeroPusher";
66
+ details: string;
67
+ } | {
68
+ mutations: {
69
+ id: {
70
+ id: number;
71
+ clientID: string;
72
+ };
73
+ result: {
74
+ details?: import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined;
75
+ error: "app";
76
+ } | {
77
+ details?: import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined;
78
+ error: "oooMutation";
79
+ } | {
80
+ data?: import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined;
81
+ };
82
+ }[];
83
+ }] | import("../../../../zero-protocol/src/error.ts").ErrorMessage | ["inspect", {
84
+ op: "queries";
85
+ id: string;
86
+ value: {
87
+ clientID: string;
88
+ queryID: string;
89
+ ast: import("../../../../zero-protocol/src/ast.ts").AST;
90
+ got: boolean;
91
+ deleted: boolean;
92
+ ttl: number;
93
+ inactivatedAt: number | null;
94
+ rowCount: number;
95
+ }[];
96
+ }] | ["pokeStart", {
97
+ schemaVersions?: {
98
+ minSupportedVersion: number;
99
+ maxSupportedVersion: number;
100
+ } | undefined;
101
+ timestamp?: number | undefined;
102
+ pokeID: string;
103
+ baseCookie: string | null;
104
+ }] | ["pokePart", {
105
+ lastMutationIDChanges?: Record<string, number> | undefined;
106
+ desiredQueriesPatches?: Record<string, ({
107
+ ttl?: number | undefined;
108
+ op: "put";
109
+ hash: string;
110
+ ast: import("../../../../zero-protocol/src/ast.ts").AST;
111
+ } | {
112
+ op: "del";
113
+ hash: string;
114
+ } | {
115
+ op: "clear";
116
+ })[]> | undefined;
117
+ gotQueriesPatch?: ({
118
+ ttl?: number | undefined;
119
+ op: "put";
120
+ hash: string;
121
+ ast: import("../../../../zero-protocol/src/ast.ts").AST;
122
+ } | {
123
+ op: "del";
124
+ hash: string;
125
+ } | {
126
+ op: "clear";
127
+ })[] | undefined;
128
+ rowsPatch?: ({
129
+ op: "put";
130
+ tableName: string;
131
+ value: Readonly<Record<string, import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined>>;
132
+ } | {
133
+ merge?: import("../../../../shared/src/json.ts").ReadonlyJSONObject | undefined;
134
+ constrain?: string[] | undefined;
135
+ op: "update";
136
+ tableName: string;
137
+ id: Readonly<Record<string, string | number | boolean>>;
138
+ } | {
139
+ op: "del";
140
+ tableName: string;
141
+ id: Readonly<Record<string, string | number | boolean>>;
142
+ } | {
143
+ op: "clear";
144
+ })[] | undefined;
145
+ pokeID: string;
146
+ }] | ["pokeEnd", {
147
+ cancel?: boolean | undefined;
148
+ pokeID: string;
149
+ cookie: string;
150
+ }] | ["pong", {}] | ["pull", {
151
+ cookie: string;
152
+ requestID: string;
153
+ lastMutationIDChanges: Record<string, number>;
154
+ }], ["deleteClients", {
155
+ readonly clientIDs?: readonly string[] | undefined;
156
+ readonly clientGroupIDs?: readonly string[] | undefined;
157
+ }] | ["connected", {
158
+ timestamp?: number | undefined;
159
+ wsid: string;
160
+ }] | ["pushResponse", {
161
+ mutationIDs?: {
162
+ id: number;
163
+ clientID: string;
164
+ }[] | undefined;
165
+ error: "unsupportedPushVersion";
166
+ } | {
167
+ mutationIDs?: {
168
+ id: number;
169
+ clientID: string;
170
+ }[] | undefined;
171
+ error: "unsupportedSchemaVersion";
172
+ } | {
173
+ mutationIDs?: {
174
+ id: number;
175
+ clientID: string;
176
+ }[] | undefined;
177
+ error: "http";
178
+ status: number;
179
+ details: string;
180
+ } | {
181
+ mutationIDs?: {
182
+ id: number;
183
+ clientID: string;
184
+ }[] | undefined;
185
+ error: "zeroPusher";
186
+ details: string;
187
+ } | {
188
+ mutations: {
189
+ id: {
190
+ id: number;
191
+ clientID: string;
192
+ };
193
+ result: {
194
+ details?: import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined;
195
+ error: "app";
196
+ } | {
197
+ details?: import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined;
198
+ error: "oooMutation";
199
+ } | {
200
+ data?: import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined;
201
+ };
202
+ }[];
203
+ }] | import("../../../../zero-protocol/src/error.ts").ErrorMessage | ["inspect", {
204
+ op: "queries";
205
+ id: string;
206
+ value: {
207
+ clientID: string;
208
+ queryID: string;
209
+ ast: import("../../../../zero-protocol/src/ast.ts").AST;
210
+ got: boolean;
211
+ deleted: boolean;
212
+ ttl: number;
213
+ inactivatedAt: number | null;
214
+ rowCount: number;
215
+ }[];
216
+ }] | ["pokeStart", {
217
+ schemaVersions?: {
218
+ minSupportedVersion: number;
219
+ maxSupportedVersion: number;
220
+ } | undefined;
221
+ timestamp?: number | undefined;
222
+ pokeID: string;
223
+ baseCookie: string | null;
224
+ }] | ["pokePart", {
225
+ lastMutationIDChanges?: Record<string, number> | undefined;
226
+ desiredQueriesPatches?: Record<string, ({
227
+ ttl?: number | undefined;
228
+ op: "put";
229
+ hash: string;
230
+ ast: import("../../../../zero-protocol/src/ast.ts").AST;
231
+ } | {
232
+ op: "del";
233
+ hash: string;
234
+ } | {
235
+ op: "clear";
236
+ })[]> | undefined;
237
+ gotQueriesPatch?: ({
238
+ ttl?: number | undefined;
239
+ op: "put";
240
+ hash: string;
241
+ ast: import("../../../../zero-protocol/src/ast.ts").AST;
242
+ } | {
243
+ op: "del";
244
+ hash: string;
245
+ } | {
246
+ op: "clear";
247
+ })[] | undefined;
248
+ rowsPatch?: ({
249
+ op: "put";
250
+ tableName: string;
251
+ value: Readonly<Record<string, import("../../../../shared/src/json.ts").ReadonlyJSONValue | undefined>>;
252
+ } | {
253
+ merge?: import("../../../../shared/src/json.ts").ReadonlyJSONObject | undefined;
254
+ constrain?: string[] | undefined;
255
+ op: "update";
256
+ tableName: string;
257
+ id: Readonly<Record<string, string | number | boolean>>;
258
+ } | {
259
+ op: "del";
260
+ tableName: string;
261
+ id: Readonly<Record<string, string | number | boolean>>;
262
+ } | {
263
+ op: "clear";
264
+ })[] | undefined;
265
+ pokeID: string;
266
+ }] | ["pokeEnd", {
267
+ cancel?: boolean | undefined;
268
+ pokeID: string;
269
+ cookie: string;
270
+ }] | ["pong", {}] | ["pull", {
271
+ cookie: string;
272
+ requestID: string;
273
+ lastMutationIDChanges: Record<string, number>;
274
+ }]>;
275
+ enqueuePush(clientID: string, push: PushBody, jwt: string | undefined): Exclude<HandlerResult, StreamResult>;
28
276
  run(): Promise<void>;
29
277
  stop(): Promise<void>;
30
278
  }
31
279
  type PusherEntry = {
32
280
  push: PushBody;
33
281
  jwt: string | undefined;
282
+ clientID: string;
34
283
  };
35
284
  type PusherEntryOrStop = PusherEntry | 'stop';
36
285
  /**
37
- * Scans over the array of pushes and puts consecutive pushes with the same JWT
38
- * into a single push.
286
+ * Pushes for different clientIDs could theoretically be interleaved.
39
287
  *
40
- * If a 'stop' is encountered, the function returns the accumulated pushes up
41
- * to that point and a boolean indicating that the pusher should stop.
42
- *
43
- * Exported for testing.
44
- *
45
- * Future optimization: every unique clientID will have the same JWT for all of its
46
- * pushes. Given that, we could combine pushes across clientIDs which would
47
- * create less fragmentation in the case where mutations among clients are interleaved.
288
+ * In order to do efficient batching to the user's API server,
289
+ * we collect all pushes for the same clientID into a single push.
48
290
  */
49
291
  export declare function combinePushes(entries: readonly (PusherEntryOrStop | undefined)[]): [PusherEntry[], boolean];
50
292
  export {};