velocious 1.0.504 → 1.0.506

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 (44) hide show
  1. package/build/configuration-types.js +2 -0
  2. package/build/configuration.js +11 -3
  3. package/build/database/drivers/sqlite/table-rebuilder.js +35 -0
  4. package/build/src/configuration-types.d.ts +10 -0
  5. package/build/src/configuration-types.d.ts.map +1 -1
  6. package/build/src/configuration-types.js +3 -1
  7. package/build/src/configuration.d.ts.map +1 -1
  8. package/build/src/configuration.js +12 -4
  9. package/build/src/database/drivers/sqlite/table-rebuilder.d.ts.map +1 -1
  10. package/build/src/database/drivers/sqlite/table-rebuilder.js +31 -1
  11. package/build/src/sync/query-scope.d.ts +6 -1
  12. package/build/src/sync/query-scope.d.ts.map +1 -1
  13. package/build/src/sync/query-scope.js +9 -3
  14. package/build/src/sync/sync-client-types.d.ts +18 -0
  15. package/build/src/sync/sync-client-types.d.ts.map +1 -1
  16. package/build/src/sync/sync-client-types.js +1 -1
  17. package/build/src/sync/sync-client.d.ts +61 -0
  18. package/build/src/sync/sync-client.d.ts.map +1 -1
  19. package/build/src/sync/sync-client.js +112 -2
  20. package/build/src/sync/sync-realtime-bridge.d.ts +20 -6
  21. package/build/src/sync/sync-realtime-bridge.d.ts.map +1 -1
  22. package/build/src/sync/sync-realtime-bridge.js +52 -18
  23. package/build/src/sync/sync-resource-base.d.ts +20 -0
  24. package/build/src/sync/sync-resource-base.d.ts.map +1 -1
  25. package/build/src/sync/sync-resource-base.js +19 -1
  26. package/build/src/sync/sync-websocket-channel.d.ts +32 -0
  27. package/build/src/sync/sync-websocket-channel.d.ts.map +1 -1
  28. package/build/src/sync/sync-websocket-channel.js +73 -2
  29. package/build/sync/query-scope.js +9 -2
  30. package/build/sync/sync-client-types.js +10 -0
  31. package/build/sync/sync-client.js +125 -1
  32. package/build/sync/sync-realtime-bridge.js +52 -17
  33. package/build/sync/sync-resource-base.js +21 -0
  34. package/build/sync/sync-websocket-channel.js +80 -1
  35. package/package.json +1 -1
  36. package/src/configuration-types.js +2 -0
  37. package/src/configuration.js +11 -3
  38. package/src/database/drivers/sqlite/table-rebuilder.js +35 -0
  39. package/src/sync/query-scope.js +9 -2
  40. package/src/sync/sync-client-types.js +10 -0
  41. package/src/sync/sync-client.js +125 -1
  42. package/src/sync/sync-realtime-bridge.js +52 -17
  43. package/src/sync/sync-resource-base.js +21 -0
  44. package/src/sync/sync-websocket-channel.js +80 -1
@@ -120,12 +120,83 @@ export default class SyncWebsocketChannel extends VelociousWebsocketChannel {
120
120
  }
121
121
  return true;
122
122
  }
123
+ /**
124
+ * Delivers a matched broadcast. Scoped subscriptions (with explicit
125
+ * conditions) already routed through {@link SyncWebsocketChannel#matches}, so
126
+ * the change is in scope and delivers unchanged. User-scope subscriptions
127
+ * (empty conditions, "everything my ability can see") match every broadcast
128
+ * of the resource type, so each published change is re-checked against the
129
+ * subscriber's ability at fan-out through the app sync resource's
130
+ * `changeDeliverable`; only accessible changes are delivered, and a broadcast
131
+ * with no accessible change is dropped.
132
+ * @param {import("../http-server/websocket-channel.js").WebsocketJsonValue} body - Broadcast body (sync envelope).
133
+ * @param {{eventId?: string}} [meta] - Optional event metadata.
134
+ * @returns {Promise<void>}
135
+ */
136
+ async deliverBroadcast(body, meta) {
137
+ if (!this._isUserScope()) {
138
+ this.sendMessage(body, meta);
139
+ return;
140
+ }
141
+ const deliverableBody = await this._userScopeDeliverableBody(body);
142
+ if (deliverableBody !== null)
143
+ this.sendMessage(deliverableBody, meta);
144
+ }
145
+ /**
146
+ * Whether this subscription is a user scope: authorized with empty conditions
147
+ * ("everything my ability can see").
148
+ * @returns {boolean} Whether the subscription is a user scope.
149
+ */
150
+ _isUserScope() {
151
+ return Boolean(this._scope) && Object.keys(/** @type {import("./sync-resource-base.js").SerializedChangesScope} */ (this._scope).conditions).length === 0;
152
+ }
153
+ /**
154
+ * Filters a user-scope broadcast to the sync entries the subscriber's ability
155
+ * can access, re-checking each through the app sync resource's
156
+ * `changeDeliverable`. Returns the broadcast narrowed to accessible entries,
157
+ * or null when none are accessible. Non-envelope bodies and entries without a
158
+ * resource id are dropped (fail closed).
159
+ * @param {import("../http-server/websocket-channel.js").WebsocketJsonValue} body - Broadcast body.
160
+ * @returns {Promise<import("../http-server/websocket-channel.js").WebsocketJsonValue | null>} Deliverable body, or null.
161
+ */
162
+ async _userScopeDeliverableBody(body) {
163
+ if (!body || typeof body !== "object" || Array.isArray(body))
164
+ return null;
165
+ const envelope = /** @type {Record<string, ?>} */ (body);
166
+ const scope = /** @type {import("./sync-resource-base.js").SerializedChangesScope} */ (this._scope);
167
+ const syncs = Array.isArray(envelope.syncs) ? envelope.syncs : [envelope];
168
+ const configuration = this.session.configuration;
169
+ /** @type {Array<Record<string, ?>>} */
170
+ const deliverableSyncs = [];
171
+ // Broadcast fan-out runs through `withoutCurrentConnectionContexts` (see
172
+ // Configuration#_broadcastToChannelLocal), so there is no ambient database
173
+ // connection here. Resolve the resource's ability and run the per-delivery
174
+ // access query inside a checked-out connection context, mirroring how other
175
+ // broadcast-time DB work (the frontend-model channel) obtains connections.
176
+ await configuration.ensureConnections({ name: `${VELOCIOUS_SYNC_CHANNEL} user-scope delivery access check` }, async () => {
177
+ const resource = await this.buildSyncResource();
178
+ for (const sync of syncs) {
179
+ const resourceId = sync?.resourceId;
180
+ const resourceType = sync?.resourceType ?? scope.resourceType;
181
+ if (resourceId === undefined || resourceId === null)
182
+ continue;
183
+ if (await resource.changeDeliverable({ params: this.params, scope, sync: { resourceId: String(resourceId), resourceType: String(resourceType) } })) {
184
+ deliverableSyncs.push(sync);
185
+ }
186
+ }
187
+ });
188
+ if (deliverableSyncs.length === 0)
189
+ return null;
190
+ if (Array.isArray(envelope.syncs))
191
+ return { ...envelope, syncs: deliverableSyncs };
192
+ return deliverableSyncs[0];
193
+ }
123
194
  /**
124
195
  * Returns the authorized scope for debug snapshots.
125
196
  * @returns {Record<string, ?>} Debug-safe subscription details.
126
197
  */
127
198
  debugSnapshot() {
128
- return { scope: this._scope };
199
+ return { scope: this._scope, userScope: this._isUserScope() };
129
200
  }
130
201
  }
131
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sync-websocket-channel.js","sourceRoot":"","sources":["../../../src/sync/sync-websocket-channel.js"],"names":[],"mappings":"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","sourcesContent":["// @ts-check\n\nimport VelociousWebsocketChannel from \"../http-server/websocket-channel.js\"\nimport {VELOCIOUS_SYNC_CHANNEL} from \"./sync-channel-name.js\"\n\n/** Configurations whose framework sync channel has already been registered. */\nconst registeredConfigurations = new WeakSet()\n\n/**\n * Framework-owned websocket channel for synced resources\n * ({@link VELOCIOUS_SYNC_CHANNEL}).\n *\n * Subscribe params mirror a declared pull scope — `{resourceType, conditions}`\n * plus the client-injected `authenticationToken` — and subscribe-time\n * authorization delegates to the app sync resource's existing\n * `authorizeChanges({params, scope})` (the `sync.api.resourceClass`), so apps\n * hook in through the authorization they already declared instead of writing\n * their own channel classes. Broadcast routing matches the publisher's\n * scoping params against the subscription's scope conditions.\n */\nexport default class SyncWebsocketChannel extends VelociousWebsocketChannel {\n  /**\n   * Scope the subscription was authorized for, set by {@link SyncWebsocketChannel#canSubscribe}.\n   * @type {import(\"./sync-resource-base.js\").SerializedChangesScope | null}\n   */\n  _scope = null\n\n  /**\n   * Registers the framework sync channel on a configuration declaring a\n   * `sync.api` block (guarded so repeated server boots with the same\n   * configuration register it only once). No-op without `sync.api` — the\n   * channel authorizes through the app's sync resource class.\n   * @param {import(\"../configuration.js\").default} configuration - Configuration instance.\n   * @returns {void}\n   */\n  static registerFromConfiguration(configuration) {\n    if (!configuration.getSyncConfiguration().api || registeredConfigurations.has(configuration)) return\n\n    registeredConfigurations.add(configuration)\n    configuration.registerWebsocketChannel(VELOCIOUS_SYNC_CHANNEL, this)\n  }\n\n  /**\n   * Authorizes the subscription through the app sync resource: the subscribe\n   * params are parsed into the same serialized scope the changes endpoint\n   * consumes and passed to the resource's `authorizeChanges({params, scope})`.\n   * Denials and malformed scopes throw, rejecting the subscription.\n   * @returns {Promise<boolean>} Whether the subscription is allowed.\n   */\n  async canSubscribe() {\n    const resource = await this.buildSyncResource()\n    const scope = resource.changesScope({scope: {conditions: this.params.conditions, resourceType: this.params.resourceType}})\n\n    await resource.authorizeChanges({params: this.params, scope})\n\n    this._scope = scope\n\n    return true\n  }\n\n  /**\n   * Builds the app sync resource authorizing this subscription, mirroring the\n   * sync transport controller's resource construction with the ability\n   * resolved from the subscribe params (which carry the client-injected\n   * authenticationToken).\n   * @returns {Promise<import(\"./sync-resource-base.js\").default>} App sync resource instance.\n   */\n  async buildSyncResource() {\n    const configuration = this.session.configuration\n    const api = configuration.getSyncConfiguration().api\n\n    if (!api) {\n      throw new Error(`The ${VELOCIOUS_SYNC_CHANNEL} channel requires a sync.api configuration block with the app's sync resource class`)\n    }\n\n    // Narrows the configured resource class to the sync resource contract\n    // (changesScope/authorizeChanges) the sync.api validation requires.\n    const ResourceClass = /** @type {typeof import(\"./sync-resource-base.js\").default} */ (api.resourceClass)\n    // Narrows the websocket subscribe params to the resource params contract.\n    const params = /** @type {import(\"../configuration-types.js\").VelociousParams} */ (/** @type {unknown} */ (this.params))\n    const request = this.session.upgradeRequest\n    const ability = await configuration.resolveAbility({params, request})\n\n    return new ResourceClass({\n      ability,\n      context: {\n        ...(ability?.getContext() || {}),\n        params,\n        request\n      },\n      locals: ability?.getLocals() || {},\n      modelClass: ResourceClass.ModelClass,\n      modelName: ResourceClass.ModelClass?.name,\n      params,\n      resourceConfiguration: /** @type {import(\"../configuration-types.js\").FrontendModelResourceConfiguration} */ ({\n        attributes: ResourceClass.attributes || {},\n        sync: {enabled: true}\n      })\n    })\n  }\n\n  /**\n   * Routes a publisher broadcast to this subscription when the published\n   * resource type equals the type the subscription was authorized for and the\n   * scoping params satisfy every scope condition: each condition key must be\n   * present in the broadcast params and match by string comparison (array\n   * conditions match by membership). Broadcasts without a resource type and\n   * conditions the publisher's scoping params do not carry never match, so a\n   * subscription cannot receive changes outside its authorized scope.\n   * @param {import(\"../http-server/websocket-channel.js\").WebsocketJsonValue} broadcastParams - Publisher scoping params (the published resourceType plus the change's scope-partition values).\n   * @returns {boolean} Whether the broadcast belongs to this subscription's scope.\n   */\n  matches(broadcastParams) {\n    const scope = this._scope\n\n    if (!scope) return false\n\n    const scopingParams = broadcastParams && typeof broadcastParams === \"object\" && !Array.isArray(broadcastParams)\n      ? /** @type {Record<string, ?>} */ (broadcastParams)\n      : {}\n\n    if (!Object.hasOwn(scopingParams, \"resourceType\") || String(scopingParams.resourceType) !== String(scope.resourceType)) return false\n\n    for (const [conditionName, conditionValue] of Object.entries(scope.conditions)) {\n      if (!Object.hasOwn(scopingParams, conditionName)) return false\n\n      const scopingValue = scopingParams[conditionName]\n\n      if (Array.isArray(conditionValue)) {\n        if (!conditionValue.some((value) => String(value) === String(scopingValue))) return false\n      } else if (String(conditionValue) !== String(scopingValue)) {\n        return false\n      }\n    }\n\n    return true\n  }\n\n  /**\n   * Returns the authorized scope for debug snapshots.\n   * @returns {Record<string, ?>} Debug-safe subscription details.\n   */\n  debugSnapshot() {\n    return {scope: this._scope}\n  }\n}\n"]}
202
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sync-websocket-channel.js","sourceRoot":"","sources":["../../../src/sync/sync-websocket-channel.js"],"names":[],"mappings":"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","sourcesContent":["// @ts-check\n\nimport VelociousWebsocketChannel from \"../http-server/websocket-channel.js\"\nimport {VELOCIOUS_SYNC_CHANNEL} from \"./sync-channel-name.js\"\n\n/** Configurations whose framework sync channel has already been registered. */\nconst registeredConfigurations = new WeakSet()\n\n/**\n * Framework-owned websocket channel for synced resources\n * ({@link VELOCIOUS_SYNC_CHANNEL}).\n *\n * Subscribe params mirror a declared pull scope — `{resourceType, conditions}`\n * plus the client-injected `authenticationToken` — and subscribe-time\n * authorization delegates to the app sync resource's existing\n * `authorizeChanges({params, scope})` (the `sync.api.resourceClass`), so apps\n * hook in through the authorization they already declared instead of writing\n * their own channel classes. Broadcast routing matches the publisher's\n * scoping params against the subscription's scope conditions.\n */\nexport default class SyncWebsocketChannel extends VelociousWebsocketChannel {\n  /**\n   * Scope the subscription was authorized for, set by {@link SyncWebsocketChannel#canSubscribe}.\n   * @type {import(\"./sync-resource-base.js\").SerializedChangesScope | null}\n   */\n  _scope = null\n\n  /**\n   * Registers the framework sync channel on a configuration declaring a\n   * `sync.api` block (guarded so repeated server boots with the same\n   * configuration register it only once). No-op without `sync.api` — the\n   * channel authorizes through the app's sync resource class.\n   * @param {import(\"../configuration.js\").default} configuration - Configuration instance.\n   * @returns {void}\n   */\n  static registerFromConfiguration(configuration) {\n    if (!configuration.getSyncConfiguration().api || registeredConfigurations.has(configuration)) return\n\n    registeredConfigurations.add(configuration)\n    configuration.registerWebsocketChannel(VELOCIOUS_SYNC_CHANNEL, this)\n  }\n\n  /**\n   * Authorizes the subscription through the app sync resource: the subscribe\n   * params are parsed into the same serialized scope the changes endpoint\n   * consumes and passed to the resource's `authorizeChanges({params, scope})`.\n   * Denials and malformed scopes throw, rejecting the subscription.\n   * @returns {Promise<boolean>} Whether the subscription is allowed.\n   */\n  async canSubscribe() {\n    const resource = await this.buildSyncResource()\n    const scope = resource.changesScope({scope: {conditions: this.params.conditions, resourceType: this.params.resourceType}})\n\n    await resource.authorizeChanges({params: this.params, scope})\n\n    this._scope = scope\n\n    return true\n  }\n\n  /**\n   * Builds the app sync resource authorizing this subscription, mirroring the\n   * sync transport controller's resource construction with the ability\n   * resolved from the subscribe params (which carry the client-injected\n   * authenticationToken).\n   * @returns {Promise<import(\"./sync-resource-base.js\").default>} App sync resource instance.\n   */\n  async buildSyncResource() {\n    const configuration = this.session.configuration\n    const api = configuration.getSyncConfiguration().api\n\n    if (!api) {\n      throw new Error(`The ${VELOCIOUS_SYNC_CHANNEL} channel requires a sync.api configuration block with the app's sync resource class`)\n    }\n\n    // Narrows the configured resource class to the sync resource contract\n    // (changesScope/authorizeChanges) the sync.api validation requires.\n    const ResourceClass = /** @type {typeof import(\"./sync-resource-base.js\").default} */ (api.resourceClass)\n    // Narrows the websocket subscribe params to the resource params contract.\n    const params = /** @type {import(\"../configuration-types.js\").VelociousParams} */ (/** @type {unknown} */ (this.params))\n    const request = this.session.upgradeRequest\n    const ability = await configuration.resolveAbility({params, request})\n\n    return new ResourceClass({\n      ability,\n      context: {\n        ...(ability?.getContext() || {}),\n        params,\n        request\n      },\n      locals: ability?.getLocals() || {},\n      modelClass: ResourceClass.ModelClass,\n      modelName: ResourceClass.ModelClass?.name,\n      params,\n      resourceConfiguration: /** @type {import(\"../configuration-types.js\").FrontendModelResourceConfiguration} */ ({\n        attributes: ResourceClass.attributes || {},\n        sync: {enabled: true}\n      })\n    })\n  }\n\n  /**\n   * Routes a publisher broadcast to this subscription when the published\n   * resource type equals the type the subscription was authorized for and the\n   * scoping params satisfy every scope condition: each condition key must be\n   * present in the broadcast params and match by string comparison (array\n   * conditions match by membership). Broadcasts without a resource type and\n   * conditions the publisher's scoping params do not carry never match, so a\n   * subscription cannot receive changes outside its authorized scope.\n   * @param {import(\"../http-server/websocket-channel.js\").WebsocketJsonValue} broadcastParams - Publisher scoping params (the published resourceType plus the change's scope-partition values).\n   * @returns {boolean} Whether the broadcast belongs to this subscription's scope.\n   */\n  matches(broadcastParams) {\n    const scope = this._scope\n\n    if (!scope) return false\n\n    const scopingParams = broadcastParams && typeof broadcastParams === \"object\" && !Array.isArray(broadcastParams)\n      ? /** @type {Record<string, ?>} */ (broadcastParams)\n      : {}\n\n    if (!Object.hasOwn(scopingParams, \"resourceType\") || String(scopingParams.resourceType) !== String(scope.resourceType)) return false\n\n    for (const [conditionName, conditionValue] of Object.entries(scope.conditions)) {\n      if (!Object.hasOwn(scopingParams, conditionName)) return false\n\n      const scopingValue = scopingParams[conditionName]\n\n      if (Array.isArray(conditionValue)) {\n        if (!conditionValue.some((value) => String(value) === String(scopingValue))) return false\n      } else if (String(conditionValue) !== String(scopingValue)) {\n        return false\n      }\n    }\n\n    return true\n  }\n\n  /**\n   * Delivers a matched broadcast. Scoped subscriptions (with explicit\n   * conditions) already routed through {@link SyncWebsocketChannel#matches}, so\n   * the change is in scope and delivers unchanged. User-scope subscriptions\n   * (empty conditions, \"everything my ability can see\") match every broadcast\n   * of the resource type, so each published change is re-checked against the\n   * subscriber's ability at fan-out through the app sync resource's\n   * `changeDeliverable`; only accessible changes are delivered, and a broadcast\n   * with no accessible change is dropped.\n   * @param {import(\"../http-server/websocket-channel.js\").WebsocketJsonValue} body - Broadcast body (sync envelope).\n   * @param {{eventId?: string}} [meta] - Optional event metadata.\n   * @returns {Promise<void>}\n   */\n  async deliverBroadcast(body, meta) {\n    if (!this._isUserScope()) {\n      this.sendMessage(body, meta)\n\n      return\n    }\n\n    const deliverableBody = await this._userScopeDeliverableBody(body)\n\n    if (deliverableBody !== null) this.sendMessage(deliverableBody, meta)\n  }\n\n  /**\n   * Whether this subscription is a user scope: authorized with empty conditions\n   * (\"everything my ability can see\").\n   * @returns {boolean} Whether the subscription is a user scope.\n   */\n  _isUserScope() {\n    return Boolean(this._scope) && Object.keys(/** @type {import(\"./sync-resource-base.js\").SerializedChangesScope} */ (this._scope).conditions).length === 0\n  }\n\n  /**\n   * Filters a user-scope broadcast to the sync entries the subscriber's ability\n   * can access, re-checking each through the app sync resource's\n   * `changeDeliverable`. Returns the broadcast narrowed to accessible entries,\n   * or null when none are accessible. Non-envelope bodies and entries without a\n   * resource id are dropped (fail closed).\n   * @param {import(\"../http-server/websocket-channel.js\").WebsocketJsonValue} body - Broadcast body.\n   * @returns {Promise<import(\"../http-server/websocket-channel.js\").WebsocketJsonValue | null>} Deliverable body, or null.\n   */\n  async _userScopeDeliverableBody(body) {\n    if (!body || typeof body !== \"object\" || Array.isArray(body)) return null\n\n    const envelope = /** @type {Record<string, ?>} */ (body)\n    const scope = /** @type {import(\"./sync-resource-base.js\").SerializedChangesScope} */ (this._scope)\n    const syncs = Array.isArray(envelope.syncs) ? envelope.syncs : [envelope]\n    const configuration = this.session.configuration\n    /** @type {Array<Record<string, ?>>} */\n    const deliverableSyncs = []\n\n    // Broadcast fan-out runs through `withoutCurrentConnectionContexts` (see\n    // Configuration#_broadcastToChannelLocal), so there is no ambient database\n    // connection here. Resolve the resource's ability and run the per-delivery\n    // access query inside a checked-out connection context, mirroring how other\n    // broadcast-time DB work (the frontend-model channel) obtains connections.\n    await configuration.ensureConnections({name: `${VELOCIOUS_SYNC_CHANNEL} user-scope delivery access check`}, async () => {\n      const resource = await this.buildSyncResource()\n\n      for (const sync of syncs) {\n        const resourceId = sync?.resourceId\n        const resourceType = sync?.resourceType ?? scope.resourceType\n\n        if (resourceId === undefined || resourceId === null) continue\n\n        if (await resource.changeDeliverable({params: this.params, scope, sync: {resourceId: String(resourceId), resourceType: String(resourceType)}})) {\n          deliverableSyncs.push(sync)\n        }\n      }\n    })\n\n    if (deliverableSyncs.length === 0) return null\n    if (Array.isArray(envelope.syncs)) return {...envelope, syncs: deliverableSyncs}\n\n    return deliverableSyncs[0]\n  }\n\n  /**\n   * Returns the authorized scope for debug snapshots.\n   * @returns {Record<string, ?>} Debug-safe subscription details.\n   */\n  debugSnapshot() {\n    return {scope: this._scope, userScope: this._isUserScope()}\n  }\n}\n"]}
@@ -44,12 +44,19 @@ export function serializedScopeFromQuery(query) {
44
44
  }
45
45
 
46
46
  /**
47
- * Returns a stable canonical key identifying a sync scope.
47
+ * Returns a stable canonical key identifying a sync scope. When an `owner` is
48
+ * present (the authenticated identity that declared the scope locally), it
49
+ * participates in the key so the same wire scope owned by a different user gets
50
+ * its own local identity and cursor — a user scope's empty-conditions cursor
51
+ * never leaks across accounts on a shared device, while the same user
52
+ * reconnecting keeps continuity. Owner-less scopes keep their pre-owner key.
48
53
  * @param {import("./sync-client-types.js").SerializedSyncScope} scope - Serialized sync scope.
49
54
  * @returns {string} Stable scope key.
50
55
  */
51
56
  export function scopeKey(scope) {
52
- return `${scope.resourceType}:${stableJsonStringify(scope.conditions)}`
57
+ const ownerPrefix = scope.owner === undefined || scope.owner === null ? "" : `owner=${stableJsonStringify(scope.owner)}|`
58
+
59
+ return `${ownerPrefix}${scope.resourceType}:${stableJsonStringify(scope.conditions)}`
53
60
  }
54
61
 
55
62
  /**
@@ -5,6 +5,7 @@
5
5
  * @typedef {object} SerializedSyncScope
6
6
  * @property {Record<string, ?>} conditions - Plain attribute conditions from the query.
7
7
  * @property {string} resourceType - Resource/model name the scope was declared for.
8
+ * @property {string} [owner] - Local partition key: the authenticated identity that declared the scope. Used only to partition the local scope/cursor store (never sent to the server as scope conditions), so a user scope's empty-conditions cursor does not leak across accounts on a shared device.
8
9
  */
9
10
 
10
11
  /**
@@ -58,6 +59,13 @@
58
59
  * @typedef {boolean | ModelSyncDeclarationConfig<TModel>} ModelSyncDeclaration
59
60
  */
60
61
 
62
+ /**
63
+ * Shared app-lifetime websocket connection all sync traffic rides. Matches the
64
+ * realtime websocket client contract; the sync client rides it without owning
65
+ * its connect/disconnect lifecycle.
66
+ * @typedef {import("../configuration-types.js").VelociousSyncRealtimeWebsocketClient} SyncClientSharedConnection
67
+ */
68
+
61
69
  /**
62
70
  * Options for building a sync client. Everything else — resources, transport
63
71
  * POSTers, auth, connectivity, batch size — is derived from the configuration's
@@ -84,6 +92,8 @@
84
92
  * @property {import("../configuration-types.js").VelociousSyncClientRealtimeConfiguration} [realtime] - Realtime push configuration consumed by `subscribeRealtime(...)`.
85
93
  * @property {Record<string, SyncClientResourceConfig>} resources - Derived resource policies keyed by resource/model name.
86
94
  * @property {?} syncModel - Local pending-sync model class.
95
+ * @property {SyncClientSharedConnection} [websocketClient] - Shared app-lifetime websocket client instance (the low-level shared-connection form).
96
+ * @property {string | (() => string | null | undefined)} [websocketUrl] - Shared app-lifetime websocket URL the framework builds a client from.
87
97
  */
88
98
 
89
99
  export {}
@@ -4,6 +4,7 @@ import Configuration from "../configuration.js"
4
4
  import {isBooleanColumnType} from "../database/column-types.js"
5
5
  import Logger from "../logger.js"
6
6
  import restArgsError from "../utils/rest-args-error.js"
7
+ import VelociousWebsocketClient from "../http-client/websocket-client.js"
7
8
 
8
9
  import {serializedScopeFromQuery} from "./query-scope.js"
9
10
  import SyncApiClient from "./sync-api-client.js"
@@ -99,11 +100,19 @@ export default class SyncClient {
99
100
  postReplay: transportPoster({path: `${clientConfiguration.mountPath}/replay`, transport: clientConfiguration.transport}),
100
101
  realtime: clientConfiguration.realtime,
101
102
  resources,
102
- syncModel: resolvedSyncModel
103
+ syncModel: resolvedSyncModel,
104
+ websocketClient: clientConfiguration.websocketClient,
105
+ websocketUrl: clientConfiguration.websocketUrl
103
106
  }
104
107
  this._clientNumber = ++clientCounter
105
108
  /** @type {SyncRealtimeBridge | null} */
106
109
  this._realtimeBridge = null
110
+ /** @type {import("./sync-client-types.js").SyncClientSharedConnection | null | undefined} Shared app-lifetime websocket connection (undefined until first resolved, null when none is configured). */
111
+ this._syncConnection = undefined
112
+ /** @type {Promise<void> | null} */
113
+ this._subscribeUserScopePromise = null
114
+ /** @type {"subscribed" | "subscribing" | "unsubscribed"} */
115
+ this._userScopeState = "unsubscribed"
107
116
  /** @type {import("./sync-scope-store.js").default | null} */
108
117
  this._scopeStore = scopeStore || null
109
118
  /** @type {Promise<void> | null} */
@@ -449,6 +458,33 @@ export default class SyncClient {
449
458
  }
450
459
  }
451
460
 
461
+ /**
462
+ * Resolves the shared app-lifetime websocket connection all sync traffic
463
+ * rides, or null when none is configured. Built once and memoized (per
464
+ * client): an app-provided `sync.client.websocketClient` instance wins (the
465
+ * frontend-model transport can pass its own client so one socket carries
466
+ * everything), else a framework-owned reconnecting {@link VelociousWebsocketClient}
467
+ * built from `sync.client.websocketUrl`. The realtime bridge rides this
468
+ * connection without owning its lifecycle; when neither is configured the
469
+ * bridge falls back to the deprecated per-cycle `realtime.createClient`.
470
+ * @returns {import("./sync-client-types.js").SyncClientSharedConnection | null} Shared websocket connection, or null.
471
+ */
472
+ syncConnection() {
473
+ if (this._syncConnection !== undefined) return this._syncConnection
474
+
475
+ if (this.config.websocketClient) {
476
+ this._syncConnection = this.config.websocketClient
477
+ } else if (this.config.websocketUrl) {
478
+ const url = typeof this.config.websocketUrl === "function" ? this.config.websocketUrl() : this.config.websocketUrl
479
+
480
+ this._syncConnection = url ? new VelociousWebsocketClient({url}) : null
481
+ } else {
482
+ this._syncConnection = null
483
+ }
484
+
485
+ return this._syncConnection
486
+ }
487
+
452
488
  /**
453
489
  * Subscribes the derived realtime channels so pushed websocket changes apply
454
490
  * through the same derived applier as pulls (idempotent, single-flighted).
@@ -459,6 +495,94 @@ export default class SyncClient {
459
495
  await this.realtimeBridge().subscribe(context)
460
496
  }
461
497
 
498
+ /**
499
+ * Subscribes the server-enumerated user scope: "everything my ability can
500
+ * see". Declares a user scope (empty conditions) for every pullable synced
501
+ * resource type, subscribes realtime so their framework sync channel
502
+ * subscriptions go live, and pulls so the device catches up. The server
503
+ * authorizes each empty-conditions scope through the app sync resource's
504
+ * `authorizeChanges` and re-checks record access per delivery, so the client
505
+ * subscribes with just its token and the server decides membership.
506
+ * Idempotent and single-flighted like {@link SyncClient#subscribeRealtime}.
507
+ * @returns {Promise<void>}
508
+ */
509
+ async subscribeUserScope() {
510
+ if (this._userScopeState === "subscribed") return
511
+
512
+ if (!this._subscribeUserScopePromise) {
513
+ this._subscribeUserScopePromise = this._subscribeUserScope().finally(() => {
514
+ this._subscribeUserScopePromise = null
515
+ })
516
+ }
517
+
518
+ await this._subscribeUserScopePromise
519
+ }
520
+
521
+ /**
522
+ * Declares and activates the user scope for every pullable resource, then
523
+ * subscribes realtime and pulls.
524
+ * @returns {Promise<void>}
525
+ */
526
+ async _subscribeUserScope() {
527
+ this._userScopeState = "subscribing"
528
+
529
+ const scopeStore = this.scopeStore()
530
+ const owner = await this.userScopeOwner()
531
+
532
+ for (const resourceType of this.userScopeResourceTypes()) {
533
+ await scopeStore.findOrCreateScope({conditions: {}, owner, resourceType})
534
+ }
535
+
536
+ await this.subscribeRealtime()
537
+ await this.pull()
538
+
539
+ this._userScopeState = "subscribed"
540
+ }
541
+
542
+ /**
543
+ * Unsubscribes the user scope: deactivates the per-resource user scopes and
544
+ * closes the realtime channel subscriptions. The shared websocket connection
545
+ * stays open when one is configured (sign-out drops subscriptions without
546
+ * disconnecting), so a subsequent sign-in resubscribes over the same socket.
547
+ * @returns {Promise<void>}
548
+ */
549
+ async unsubscribeUserScope() {
550
+ const scopeStore = this.scopeStore()
551
+ const owner = await this.userScopeOwner()
552
+
553
+ for (const resourceType of this.userScopeResourceTypes()) {
554
+ await scopeStore.deactivate({conditions: {}, owner, resourceType})
555
+ }
556
+
557
+ await this.unsubscribeRealtime()
558
+
559
+ this._userScopeState = "unsubscribed"
560
+ this._subscribeUserScopePromise = null
561
+ }
562
+
563
+ /**
564
+ * The resource types a user scope covers: every declared resource that
565
+ * receives pulled changes (has pull `attributes`).
566
+ * @returns {string[]} Pullable resource type names.
567
+ */
568
+ userScopeResourceTypes() {
569
+ return Object.keys(this.pullResourceConfigs())
570
+ }
571
+
572
+ /**
573
+ * Resolves the local partition key for the user scope: the currently
574
+ * configured authenticated identity (the sync auth token). Partitioning the
575
+ * user scope's local scope/cursor rows by this owner keeps the
576
+ * empty-conditions cursor from leaking across accounts on a shared device
577
+ * (account B signing in after account A gets a fresh cursor) while the same
578
+ * account reconnecting keeps its cursor continuity. The owner is a local
579
+ * partition key only — pulls still post empty conditions to the server.
580
+ * @returns {Promise<string>} User-scope owner partition key.
581
+ */
582
+ async userScopeOwner() {
583
+ return String(await this.config.authenticationToken())
584
+ }
585
+
462
586
  /**
463
587
  * Unsubscribes the realtime channels and disconnects the websocket client (idempotent).
464
588
  * @returns {Promise<void>}
@@ -30,6 +30,8 @@ export default class SyncRealtimeBridge {
30
30
  this._channels = []
31
31
  /** @type {VelociousSyncRealtimeWebsocketClient | null} */
32
32
  this._client = null
33
+ /** @type {boolean} Whether the bridge created its own client (deprecated per-cycle path) and must disconnect it on unsubscribe. A shared connection is never owned. */
34
+ this._ownsClient = false
33
35
  /** @type {Promise<void>} */
34
36
  this._applyPromise = Promise.resolve()
35
37
  /** @type {number} Subscription generation - bumped by unsubscribe so in-flight subscribes detect they became stale. */
@@ -80,8 +82,13 @@ export default class SyncRealtimeBridge {
80
82
  const channels = []
81
83
  /** @type {VelociousSyncRealtimeWebsocketClient | null} */
82
84
  let client = null
85
+ /** @type {boolean} Whether this attempt created its own client and must disconnect it on teardown. */
86
+ let ownsClient = false
83
87
  /**
84
- * Tears down everything this stale/failed subscribe attempt created itself.
88
+ * Tears down everything this stale/failed subscribe attempt created itself:
89
+ * always closes its channel subscriptions, and disconnects the websocket
90
+ * only when the bridge owns it (deprecated per-cycle path); a shared
91
+ * connection stays open.
85
92
  * @returns {Promise<void>}
86
93
  */
87
94
  const teardown = async () => {
@@ -89,18 +96,28 @@ export default class SyncRealtimeBridge {
89
96
  subscription.close()
90
97
  }
91
98
 
92
- if (client) await client.disconnectAndStopReconnect()
99
+ if (client && ownsClient) await client.disconnectAndStopReconnect()
93
100
  }
94
101
 
95
102
  try {
96
- const realtime = this.realtimeConfiguration()
103
+ const sharedClient = this.syncClient.syncConnection()
104
+ const realtime = this.requireClientSource(sharedClient)
97
105
  const channelDescriptors = await this.channelDescriptors(context)
98
106
 
99
107
  if (generation !== this._generation) return
100
108
 
101
- client = await realtime.createClient()
109
+ if (sharedClient) {
110
+ client = sharedClient
111
+ } else {
112
+ // requireClientSource guaranteed realtime.createClient when there is no shared connection.
113
+ client = await /** @type {import("../configuration-types.js").VelociousSyncClientRealtimeConfiguration} */ (realtime).createClient()
114
+ ownsClient = true
115
+ }
102
116
 
103
- if (generation !== this._generation) return
117
+ if (generation !== this._generation) {
118
+ await teardown()
119
+ return
120
+ }
104
121
 
105
122
  await client.connect()
106
123
 
@@ -140,6 +157,7 @@ export default class SyncRealtimeBridge {
140
157
 
141
158
  this._channels = channels
142
159
  this._client = client
160
+ this._ownsClient = ownsClient
143
161
  this._state = "subscribed"
144
162
  this.schedulePull()
145
163
  } catch (error) {
@@ -152,9 +170,12 @@ export default class SyncRealtimeBridge {
152
170
  }
153
171
 
154
172
  /**
155
- * Closes every channel subscription and disconnects the websocket client
156
- * (idempotent). Also marks any in-flight subscribe attempt stale so it tears
157
- * itself down instead of finishing the subscription afterwards.
173
+ * Closes every channel subscription (idempotent). The websocket is
174
+ * disconnected only when the bridge owns it (deprecated per-cycle
175
+ * `realtime.createClient` path); a shared app-lifetime connection stays open
176
+ * so unsubscribing drops subscriptions without tearing down the socket. Also
177
+ * marks any in-flight subscribe attempt stale so it tears itself down instead
178
+ * of finishing the subscription afterwards.
158
179
  * @returns {Promise<void>}
159
180
  */
160
181
  async unsubscribe() {
@@ -162,16 +183,18 @@ export default class SyncRealtimeBridge {
162
183
 
163
184
  const channels = this._channels
164
185
  const client = this._client
186
+ const ownsClient = this._ownsClient
165
187
 
166
188
  this._channels = []
167
189
  this._client = null
190
+ this._ownsClient = false
168
191
  this._state = "unsubscribed"
169
192
 
170
193
  for (const {subscription} of channels) {
171
194
  subscription.close()
172
195
  }
173
196
 
174
- if (client) await client.disconnectAndStopReconnect()
197
+ if (client && ownsClient) await client.disconnectAndStopReconnect()
175
198
  }
176
199
 
177
200
  /**
@@ -195,14 +218,26 @@ export default class SyncRealtimeBridge {
195
218
  }
196
219
 
197
220
  /**
198
- * Resolves the realtime configuration, failing loudly when it is missing.
199
- * @returns {import("../configuration-types.js").VelociousSyncClientRealtimeConfiguration} Realtime configuration.
221
+ * Resolves the realtime configuration block, or null when the app declared
222
+ * none (valid when a shared connection is configured).
223
+ * @returns {import("../configuration-types.js").VelociousSyncClientRealtimeConfiguration | null} Realtime configuration, or null.
200
224
  */
201
225
  realtimeConfiguration() {
202
- const realtime = this.syncClient.config.realtime
226
+ return this.syncClient.config.realtime || null
227
+ }
228
+
229
+ /**
230
+ * Resolves the realtime configuration and asserts a websocket client source
231
+ * exists: a shared connection rides its own lifecycle, otherwise the
232
+ * deprecated per-cycle `realtime.createClient` must be configured.
233
+ * @param {import("../configuration-types.js").VelociousSyncRealtimeWebsocketClient | null} sharedClient - Shared connection, or null.
234
+ * @returns {import("../configuration-types.js").VelociousSyncClientRealtimeConfiguration | null} Realtime configuration, or null.
235
+ */
236
+ requireClientSource(sharedClient) {
237
+ const realtime = this.realtimeConfiguration()
203
238
 
204
- if (!realtime) {
205
- throw new Error("subscribeRealtime requires a sync.client.realtime configuration block with a createClient callback")
239
+ if (!sharedClient && typeof realtime?.createClient !== "function") {
240
+ throw new Error("subscribeRealtime requires a shared connection (sync.client.websocketUrl or sync.client.websocketClient) or the deprecated sync.client.realtime.createClient callback")
206
241
  }
207
242
 
208
243
  return realtime
@@ -235,7 +270,7 @@ export default class SyncRealtimeBridge {
235
270
  channelDescriptors.push({channel: resourceConfig.realtime.channel, params: resourceConfig.realtime.params, resourceType})
236
271
  }
237
272
 
238
- if (realtime.channels) {
273
+ if (realtime?.channels) {
239
274
  channelDescriptors.push(...await realtime.channels(context))
240
275
  }
241
276
 
@@ -306,7 +341,7 @@ export default class SyncRealtimeBridge {
306
341
 
307
342
  const realtime = this.realtimeConfiguration()
308
343
 
309
- if (realtime.localOrigin && body.echoOrigin !== undefined && body.echoOrigin !== null) {
344
+ if (realtime?.localOrigin && body.echoOrigin !== undefined && body.echoOrigin !== null) {
310
345
  const localOrigin = String(await realtime.localOrigin())
311
346
 
312
347
  if (String(body.echoOrigin) === localOrigin) return
@@ -329,7 +364,7 @@ export default class SyncRealtimeBridge {
329
364
  * @returns {void}
330
365
  */
331
366
  schedulePull() {
332
- if (this.realtimeConfiguration().pullOnReconnect === false) return
367
+ if (this.realtimeConfiguration()?.pullOnReconnect === false) return
333
368
 
334
369
  this._scheduledPull ||= (async () => {
335
370
  try {
@@ -215,6 +215,27 @@ export default class SyncResourceBase extends FrontendModelBaseResource {
215
215
  throw new Error("SyncResourceBase#scopeChangesQuery must be implemented")
216
216
  }
217
217
 
218
+ /**
219
+ * Decides whether one published change is deliverable to a user-scope
220
+ * subscription (the framework sync channel's per-delivery access re-check).
221
+ * The default reuses the app's ability scoping: it applies
222
+ * {@link SyncResourceBase#scopeChangesQuery} to the change-feed model — which
223
+ * for an empty-conditions user scope falls back to ability scoping — and
224
+ * checks whether the published change's feed row is visible within that
225
+ * scope. Apps get this for free from the scoping they already declared;
226
+ * override only for custom per-delivery rules.
227
+ * @param {{params: Record<string, ?>, scope: SerializedChangesScope | null, sync: {resourceId: string, resourceType: string}}} args - Request params, subscription scope, and the published change's identity.
228
+ * @returns {Promise<boolean>} Whether the change may be delivered to this subscription.
229
+ */
230
+ async changeDeliverable({params, scope, sync}) {
231
+ const query = this.syncModelClass().where({})
232
+
233
+ this.scopeChangesQuery({params, query, scope})
234
+ query.where({resource_id: String(sync.resourceId), resource_type: String(sync.resourceType)})
235
+
236
+ return Boolean(await query.first())
237
+ }
238
+
218
239
  /**
219
240
  * Resolves the replay service class handling replay mutations: the
220
241
  * declarative {@link SyncResourceBase.ReplayServiceClass} static (shared
@@ -136,11 +136,90 @@ export default class SyncWebsocketChannel extends VelociousWebsocketChannel {
136
136
  return true
137
137
  }
138
138
 
139
+ /**
140
+ * Delivers a matched broadcast. Scoped subscriptions (with explicit
141
+ * conditions) already routed through {@link SyncWebsocketChannel#matches}, so
142
+ * the change is in scope and delivers unchanged. User-scope subscriptions
143
+ * (empty conditions, "everything my ability can see") match every broadcast
144
+ * of the resource type, so each published change is re-checked against the
145
+ * subscriber's ability at fan-out through the app sync resource's
146
+ * `changeDeliverable`; only accessible changes are delivered, and a broadcast
147
+ * with no accessible change is dropped.
148
+ * @param {import("../http-server/websocket-channel.js").WebsocketJsonValue} body - Broadcast body (sync envelope).
149
+ * @param {{eventId?: string}} [meta] - Optional event metadata.
150
+ * @returns {Promise<void>}
151
+ */
152
+ async deliverBroadcast(body, meta) {
153
+ if (!this._isUserScope()) {
154
+ this.sendMessage(body, meta)
155
+
156
+ return
157
+ }
158
+
159
+ const deliverableBody = await this._userScopeDeliverableBody(body)
160
+
161
+ if (deliverableBody !== null) this.sendMessage(deliverableBody, meta)
162
+ }
163
+
164
+ /**
165
+ * Whether this subscription is a user scope: authorized with empty conditions
166
+ * ("everything my ability can see").
167
+ * @returns {boolean} Whether the subscription is a user scope.
168
+ */
169
+ _isUserScope() {
170
+ return Boolean(this._scope) && Object.keys(/** @type {import("./sync-resource-base.js").SerializedChangesScope} */ (this._scope).conditions).length === 0
171
+ }
172
+
173
+ /**
174
+ * Filters a user-scope broadcast to the sync entries the subscriber's ability
175
+ * can access, re-checking each through the app sync resource's
176
+ * `changeDeliverable`. Returns the broadcast narrowed to accessible entries,
177
+ * or null when none are accessible. Non-envelope bodies and entries without a
178
+ * resource id are dropped (fail closed).
179
+ * @param {import("../http-server/websocket-channel.js").WebsocketJsonValue} body - Broadcast body.
180
+ * @returns {Promise<import("../http-server/websocket-channel.js").WebsocketJsonValue | null>} Deliverable body, or null.
181
+ */
182
+ async _userScopeDeliverableBody(body) {
183
+ if (!body || typeof body !== "object" || Array.isArray(body)) return null
184
+
185
+ const envelope = /** @type {Record<string, ?>} */ (body)
186
+ const scope = /** @type {import("./sync-resource-base.js").SerializedChangesScope} */ (this._scope)
187
+ const syncs = Array.isArray(envelope.syncs) ? envelope.syncs : [envelope]
188
+ const configuration = this.session.configuration
189
+ /** @type {Array<Record<string, ?>>} */
190
+ const deliverableSyncs = []
191
+
192
+ // Broadcast fan-out runs through `withoutCurrentConnectionContexts` (see
193
+ // Configuration#_broadcastToChannelLocal), so there is no ambient database
194
+ // connection here. Resolve the resource's ability and run the per-delivery
195
+ // access query inside a checked-out connection context, mirroring how other
196
+ // broadcast-time DB work (the frontend-model channel) obtains connections.
197
+ await configuration.ensureConnections({name: `${VELOCIOUS_SYNC_CHANNEL} user-scope delivery access check`}, async () => {
198
+ const resource = await this.buildSyncResource()
199
+
200
+ for (const sync of syncs) {
201
+ const resourceId = sync?.resourceId
202
+ const resourceType = sync?.resourceType ?? scope.resourceType
203
+
204
+ if (resourceId === undefined || resourceId === null) continue
205
+
206
+ if (await resource.changeDeliverable({params: this.params, scope, sync: {resourceId: String(resourceId), resourceType: String(resourceType)}})) {
207
+ deliverableSyncs.push(sync)
208
+ }
209
+ }
210
+ })
211
+
212
+ if (deliverableSyncs.length === 0) return null
213
+ if (Array.isArray(envelope.syncs)) return {...envelope, syncs: deliverableSyncs}
214
+
215
+ return deliverableSyncs[0]
216
+ }
217
+
139
218
  /**
140
219
  * Returns the authorized scope for debug snapshots.
141
220
  * @returns {Record<string, ?>} Debug-safe subscription details.
142
221
  */
143
222
  debugSnapshot() {
144
- return {scope: this._scope}
223
+ return {scope: this._scope, userScope: this._isUserScope()}
145
224
  }
146
225
  }
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "velocious": "build/bin/velocious.js"
4
4
  },
5
5
  "name": "velocious",
6
- "version": "1.0.504",
6
+ "version": "1.0.506",
7
7
  "main": "build/index.js",
8
8
  "types": "build/index.d.ts",
9
9
  "files": [