@enbox/dwn-sdk-js 0.4.17 → 0.4.18

package/dist/types/src/utils/records.d.ts

@@ -65,11 +65,13 @@ export declare class Records {
      */
     static normalizeFilter(filter: RecordsFilter): RecordsFilter;
     /**
-     * Nested protocol-path queries must select the target path itself or one of
-     * its ancestor contexts. An omitted, malformed, or deeper context cannot
-     * identify a bounded subtree of the selected protocol path.
+     * Nested protocol-path collection requests must select one or more direct
+     * parents, the target path itself, or one of its ancestor contexts. A
+     * bounded path-wide subscription may omit that scope because its initial
+     * page is explicitly capped; record-limited results still project each
+     * direct-parent population independently.
      */
-    static validateNestedProtocolPathQueryScope(filter: RecordsFilter, errorCode: DwnErrorCode, operationName: string): void;
+    static validateNestedProtocolPathScope(filter: RecordsFilter, errorCode: DwnErrorCode, operationName: string, allowBoundedPathWideSelection?: boolean): void;
     static isStartsWithFilter(filter: RecordsWriteTagsFilter): filter is StartsWithFilter;
     /**
      * This will create individual keys for each of the tags that look like `tag.tag_property`
@@ -88,7 +90,6 @@ export declare class Records {
      * @returns {Filter} a generic Filter able to be used with MessageStore.
      */
     static convertFilter(filter: RecordsFilter, dateSort?: DateSort): Filter;
-    static buildUnpublishedControlRecordsFilter(filter: RecordsFilter, dateSort?: DateSort): Filter;
     static buildControlRecordsFilters(filters: Filter[]): Filter[];
     /**
      * Validates the referential integrity of both author-delegated grant and owner-delegated grant.
@@ -116,10 +117,6 @@ export declare class Records {
      * @returns a `MessageSort` for `MessageStore` sorting.
      */
     static convertDateSort(dateSort?: DateSort): MessageSort;
-    /**
-     * Determines if signature payload contains a protocolRole and should be authorized as such.
-     */
-    static shouldProtocolAuthorize(signaturePayload: GenericSignaturePayload): boolean;
     /**
      * Checks if the filter supports returning published records.
      */
@@ -140,21 +137,5 @@ export declare class Records {
      * replay, and replay must never admit a delete that admission would now reject.
      */
     static isDeleteBeatenByExistingTombstone(deleteToBePerformed: RecordsDeleteMessage, newestExistingMessage: GenericMessage): Promise<boolean>;
-    /**
-     * Checks whether or not the incoming records query filter should build an unpublished recipient MessageStore filter.
-     *
-     * @param filter The incoming RecordsFilter to evaluate against.
-     * @param recipient The recipient to check against the filter, typically the query/subscribe message author.
-     * @returns {boolean} True if the filter contains the recipient, or if the recipient filter is undefined/empty.
-     */
-    static shouldBuildUnpublishedRecipientFilter(filter: RecordsFilter, recipient: string): boolean;
-    /**
-     * Checks whether or not the incoming records query filter should build an unpublished author MessageStore filter.
-     *
-     * @param filter The incoming RecordsFilter to evaluate against.
-     * @param author The author to check against the filter, typically the query/subscribe message author.
-     * @returns {boolean} True if the filter contains the author, or if the author filter is undefined/empty.
-     */
-    static shouldBuildUnpublishedAuthorFilter(filter: RecordsFilter, author: string): boolean;
 }
 //# sourceMappingURL=records.d.ts.map

package/dist/types/src/utils/records.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"records.d.ts","sourceRoot":"","sources":["../../../../src/utils/records.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEjE,OAAO,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACnF,OAAO,KAAK,EAAE,cAAc,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACtG,OAAO,KAAK,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,aAAa,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAInQ,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AASrD,OAAO,EAAY,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAE9D,OAAO,EAAc,+BAA+B,EAAE,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAS,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGzD;;GAEG;AACH,qBAAa,OAAO;IAElB;;OAEG;WACW,cAAc,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,IAAI,mBAAmB;IAQrF;;OAEG;WACiB,qBAAqB,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC;IAM/G;;OAEG;WACiB,sBAAsB,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAQjH;;;OAGG;WACiB,OAAO,CACzB,YAAY,EAAE,mBAAmB,EACjC,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,cAAc,CAAC,UAAU,CAAC,GACvC,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;mBAoCjB,yBAAyB;IAkB9C,OAAO,CAAC,MAAM,CAAC,8BAA8B;IAqB7C;;OAEG;WACW,0BAA0B,CACtC,mBAAmB,EAAE,mBAAmB,GAAG,OAAO,+BAA+B,EACjF,mBAAmB,EAAE,mBAAmB,GACvC,MAAM,EAAE;IAiBX;;;;;;;OAOG;WACW,iDAAiD,CAAC,UAAU,EAAE,sBAAsB,GAAG,MAAM,EAAE;IAW7G;;;OAGG;WACiB,gBAAgB,CAAC,kBAAkB,EAAE,iBAAiB,EAAE,4BAA4B,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC;IAoBxI;;;OAGG;WACW,oDAAoD,CAChE,yBAAyB,EAAE,MAAM,EAAE,EACnC,2BAA2B,EAAE,MAAM,EAAE,GACpC,IAAI;IAYP;;OAEG;WACW,+BAA+B,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;IAkBhG;;;;;OAKG;WACW,eAAe,CAAC,MAAM,EAAE,aAAa,GAAG,aAAa;IAyBnE;;;;OAIG;WACW,oCAAoC,CAChD,MAAM,EAAE,aAAa,EACrB,SAAS,EAAE,YAAY,EACvB,aAAa,EAAE,MAAM,GACpB,IAAI;WA2BO,kBAAkB,CAAC,MAAM,EAAE,sBAAsB,GAAG,MAAM,IAAI,gBAAgB;IAI5F;;OAEG;WACW,eAAe,CAAC,IAAI,EAAE,gBAAgB,GAAG,SAAS;IAShE;;OAEG;WACW,iBAAiB,CAAE,IAAI,EAAE;QAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAC,GAAG,MAAM;IAS7F;;;;;OAKG;WACW,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM;WAwDjE,oCAAoC,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM;WAUxF,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAmBrE;;;;;;OAMG;WACiB,0CAA0C,CAC5D,OAAO,EAAE,mBAAmB,GAAG,kBAAkB,GAAG,mBAAmB,GAAG,mBAAmB,GAAG,oBAAoB,GAAG,uBAAuB,EAC9I,sBAAsB,EAAE,uBAAuB,GAAG,SAAS,EAC3D,qBAAqB,CAAC,EAAE,uBAAuB,GAAG,SAAS,GAC1D,OAAO,CAAC,IAAI,CAAC;IAOhB;;;OAGG;mBACkB,gDAAgD;IAiDrE;;;OAGG;mBACkB,+CAA+C;IAiDpE;;;;;;OAMG;WACW,eAAe,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,WAAW;IAmB/D;;OAEG;WACW,uBAAuB,CAAC,gBAAgB,EAAE,uBAAuB,GAAG,OAAO;IAIzF;;OAEG;WACW,8BAA8B,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO;IAK5E;;OAEG;WACW,gCAAgC,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO;IAQ9E;;;;;;;;;;OAUG;WACiB,iCAAiC,CACnD,mBAAmB,EAAE,oBAAoB,EACzC,qBAAqB,EAAE,cAAc,GACpC,OAAO,CAAC,OAAO,CAAC;IAenB;;;;;;OAMG;IACH,MAAM,CAAC,qCAAqC,CAAC,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO;IAQ/F;;;;;;OAMG;IACH,MAAM,CAAC,kCAAkC,CAAC,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;CAO1F"}
+{"version":3,"file":"records.d.ts","sourceRoot":"","sources":["../../../../src/utils/records.ts"],"names":[],"mappings":"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"}

package/dist/types/tests/features/records-nested-query-scope.spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"records-nested-query-scope.spec.d.ts","sourceRoot":"","sources":["../../../../tests/features/records-nested-query-scope.spec.ts"],"names":[],"mappings":"AAmBA,wBAAgB,2BAA2B,IAAI,IAAI,CAsZlD"}
+{"version":3,"file":"records-nested-query-scope.spec.d.ts","sourceRoot":"","sources":["../../../../tests/features/records-nested-query-scope.spec.ts"],"names":[],"mappings":"AAmBA,wBAAgB,2BAA2B,IAAI,IAAI,CAwalD"}

package/dist/types/tests/features/records-record-limit.spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"records-record-limit.spec.d.ts","sourceRoot":"","sources":["../../../../tests/features/records-record-limit.spec.ts"],"names":[],"mappings":"AA4BA,wBAAgB,sBAAsB,IAAI,IAAI,CAoiC7C"}
+{"version":3,"file":"records-record-limit.spec.d.ts","sourceRoot":"","sources":["../../../../tests/features/records-record-limit.spec.ts"],"names":[],"mappings":"AA4BA,wBAAgB,sBAAsB,IAAI,IAAI,CAoqC7C"}

package/dist/types/tests/handlers/records-count.spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"records-count.spec.d.ts","sourceRoot":"","sources":["../../../../tests/handlers/records-count.spec.ts"],"names":[],"mappings":"AAyBA,wBAAgB,uBAAuB,IAAI,IAAI,CA2zB9C"}
+{"version":3,"file":"records-count.spec.d.ts","sourceRoot":"","sources":["../../../../tests/handlers/records-count.spec.ts"],"names":[],"mappings":"AA0BA,wBAAgB,uBAAuB,IAAI,IAAI,CAy3B9C"}

package/dist/types/tests/handlers/records-subscribe.spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"records-subscribe.spec.d.ts","sourceRoot":"","sources":["../../../../tests/handlers/records-subscribe.spec.ts"],"names":[],"mappings":"AAkCA,wBAAgB,2BAA2B,IAAI,IAAI,CAupDlD"}
+{"version":3,"file":"records-subscribe.spec.d.ts","sourceRoot":"","sources":["../../../../tests/handlers/records-subscribe.spec.ts"],"names":[],"mappings":"AAkCA,wBAAgB,2BAA2B,IAAI,IAAI,CAwvDlD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enbox/dwn-sdk-js",
-  "version": "0.4.17",
+  "version": "0.4.18",
   "description": "A reference implementation of https://identity.foundation/decentralized-web-node/spec/",
   "repository": {
     "type": "git",

package/src/handlers/records-collection.ts

@@ -0,0 +1,269 @@
+import type { HandlerDependencies } from '../types/method-handler.js';
+import type { RecordsCount } from '../interfaces/records-count.js';
+import type { RecordsQuery } from '../interfaces/records-query.js';
+import type { RecordsSubscribe } from '../interfaces/records-subscribe.js';
+import type { Filter, PaginationCursor } from '../types/query-types.js';
+import type { RecordsFilter, RecordsQueryReplyEntry } from '../types/records-types.js';
+
+import { authenticate } from '../core/auth.js';
+import { DateSort } from '../types/records-types.js';
+import { EncryptionControl } from '../core/encryption-control.js';
+import { Message } from '../core/message.js';
+import { ProtocolAuthorization } from '../core/protocol-authorization.js';
+import { Records } from '../utils/records.js';
+import { RecordsGrantAuthorization } from '../core/records-grant-authorization.js';
+import { DwnInterfaceName, DwnMethodName } from '../enums/dwn-interface-method.js';
+import { queryRecordsWithRecordLimitOccupancy, resolveRecordLimitOccupancy } from '../utils/record-limit-occupancy.js';
+
+type RecordsCollectionRequest = RecordsCount | RecordsQuery | RecordsSubscribe;
+
+export type RecordsCollectionVisibility = 'nonOwner' | 'owner' | 'published';
+
+/**
+ * Resolves the visible population for a Records collection request, authenticating and
+ * authorizing every request that is not an anonymous published-records read.
+ */
+export async function resolveRecordsCollectionVisibility(
+  tenant: string,
+  request: RecordsCollectionRequest,
+  deps: HandlerDependencies,
+): Promise<RecordsCollectionVisibility> {
+  const recordsFilter = request.message.descriptor.filter;
+  if (Records.filterIncludesPublishedRecords(recordsFilter) && request.author === undefined) {
+    return 'published';
+  }
+
+  await authenticate(request.message.authorization!, deps.didResolver);
+
+  if (Message.isSignedByAuthorDelegate(request.message) && !EncryptionControl.filterTargetsOnlyControlRecords(recordsFilter)) {
+    await request.authorizeDelegate(deps.validationStateReader);
+  } else if (EncryptionControl.filterTargetsOnlyControlRecords(recordsFilter)) {
+    await EncryptionControl.authorizeControlReadRequest({
+      tenant,
+      incomingMessage       : request.message,
+      requester             : Message.getRequester(request.message),
+      validationStateReader : deps.validationStateReader,
+    });
+  }
+
+  const permissionGrantId = Message.getPermissionGrantId(request.signaturePayload!);
+  if (permissionGrantId !== undefined) {
+    const permissionGrant = await deps.validationStateReader.fetchGrant(tenant, permissionGrantId);
+    await RecordsGrantAuthorization.authorizeQueryOrSubscribe({
+      incomingMessage       : request.message,
+      expectedGrantor       : tenant,
+      expectedGrantee       : request.author!,
+      permissionGrant,
+      validationStateReader : deps.validationStateReader,
+    });
+  } else if (invokesProtocolRole(request)) {
+    // A protocol filter alone does not require protocol authorization because unauthorized
+    // records are removed by the visibility filters. An invoked protocol role does.
+    await ProtocolAuthorization.authorizeQueryOrSubscribe(tenant, request, deps.validationStateReader);
+  }
+
+  return request.author === tenant ? 'owner' : 'nonOwner';
+}
+
+/** Builds latest-write filters shared by Records Query, Count, and Subscribe snapshots. */
+export function buildRecordsSnapshotFilters(
+  request: RecordsCollectionRequest,
+  visibility: RecordsCollectionVisibility,
+): Filter[] {
+  const descriptor = request.message.descriptor;
+  const dateSort = 'dateSort' in descriptor ? descriptor.dateSort : undefined;
+  return buildRecordsVisibilityFilters({
+    request,
+    visibility,
+    filter  : descriptor.filter,
+    purpose : 'snapshot',
+    dateSort,
+  });
+}
+
+/** Builds Write-and-Delete filters for Records Subscribe event delivery. */
+export function buildRecordsEventFilters(
+  request: RecordsSubscribe,
+  visibility: RecordsCollectionVisibility,
+): Filter[] {
+  return buildRecordsVisibilityFilters({
+    request,
+    visibility,
+    filter  : request.message.descriptor.filter,
+    purpose : 'event',
+  });
+}
+
+/**
+ * Queries one visible Records page after applying record-limit occupancy, current-audience
+ * projection, and encryption-control authorization in their required order.
+ */
+export async function queryVisibleRecordsPage(input: {
+  deps: HandlerDependencies;
+  request: RecordsQuery | RecordsSubscribe;
+  tenant: string;
+  visibility: RecordsCollectionVisibility;
+}): Promise<{ messages: RecordsQueryReplyEntry[]; cursor?: PaginationCursor }> {
+  const { deps, request, tenant, visibility } = input;
+  const { dateSort, filter, messageTimestamp, pagination } = request.message.descriptor;
+  const filters = buildRecordsSnapshotFilters(request, visibility);
+  const recordLimit = await resolveRecordLimitOccupancy({
+    validationStateReader : deps.validationStateReader,
+    tenant,
+    recordsFilter         : filter,
+    messageTimestamp,
+  });
+  const controlFilters = Records.buildControlRecordsFilters(filters);
+  const currentAudienceRecordIdCache = new Map<string, string | undefined>();
+  const requester = Message.getRequester(request.message);
+  const messageSort = Records.convertDateSort(dateSort ?? DateSort.CreatedAscending);
+
+  const queryProjectedPage = async (page = pagination): Promise<{
+    messages: RecordsQueryReplyEntry[];
+    cursor?: PaginationCursor;
+  }> => {
+    const result = await queryRecordsWithRecordLimitOccupancy({
+      messageStore : deps.messageStore,
+      tenant,
+      filters,
+      recordLimit,
+      messageSort,
+      pagination   : page,
+    });
+    return EncryptionControl.projectCurrentAudienceRecordPage({
+      messageStore: deps.messageStore,
+      tenant,
+      filters,
+      currentAudienceRecordIdCache,
+      result,
+    });
+  };
+
+  const filterVisibleControlRecords = (messages: RecordsQueryReplyEntry[]): Promise<RecordsQueryReplyEntry[]> =>
+    EncryptionControl.filterVisibleControlRecords({
+      tenant,
+      incomingMessage       : request.message,
+      requester,
+      recordsWriteMessages  : messages,
+      validationStateReader : deps.validationStateReader,
+    });
+
+  if (controlFilters.length === 0) {
+    return queryProjectedPage();
+  }
+
+  if (pagination?.limit === undefined || pagination.limit <= 0) {
+    const result = await queryProjectedPage();
+    return {
+      messages : await filterVisibleControlRecords(result.messages),
+      cursor   : result.cursor,
+    };
+  }
+
+  const visibleMessages: RecordsQueryReplyEntry[] = [];
+  let cursor = pagination.cursor;
+  let nextCursor: PaginationCursor | undefined;
+  // Keeps visible-page pagination stable until #1100 moves control visibility into indexed store filters.
+  do {
+    const remainingLimit = pagination.limit - visibleMessages.length;
+    const result = await queryProjectedPage({ ...pagination, cursor, limit: remainingLimit });
+    visibleMessages.push(...await filterVisibleControlRecords(result.messages));
+    nextCursor = result.cursor;
+    cursor = result.cursor;
+  } while (visibleMessages.length < pagination.limit && cursor !== undefined);
+
+  return { messages: visibleMessages, cursor: nextCursor };
+}
+
+function buildRecordsVisibilityFilters(input: {
+  dateSort?: DateSort;
+  filter: RecordsFilter;
+  purpose: 'event' | 'snapshot';
+  request: RecordsCollectionRequest;
+  visibility: RecordsCollectionVisibility;
+}): Filter[] {
+  const { dateSort, filter, purpose, request, visibility } = input;
+  if (visibility === 'owner') {
+    return [buildRecordsFilter({ dateSort, filter, purpose })];
+  }
+
+  if (visibility === 'published') {
+    return [buildRecordsFilter({ dateSort, filter, purpose, published: true })];
+  }
+
+  const filters: Filter[] = [];
+  if (Records.filterIncludesPublishedRecords(filter)) {
+    filters.push(buildRecordsFilter({ dateSort, filter, purpose, published: true }));
+  }
+
+  if (!Records.filterIncludesUnpublishedRecords(filter)) {
+    return filters;
+  }
+
+  if (EncryptionControl.isExactAudienceFilter(filter)) {
+    filters.push(buildRecordsFilter({ dateSort, filter, purpose, published: false }));
+  }
+
+  if (shouldBuildUnpublishedAuthorFilter(filter, request.author!)) {
+    filters.push(buildRecordsFilter({ author: request.author, dateSort, filter, purpose, published: false }));
+  }
+
+  if (invokesProtocolRole(request) || Message.getPermissionGrantId(request.signaturePayload!) !== undefined) {
+    filters.push(buildRecordsFilter({ dateSort, filter, purpose, published: false }));
+  }
+
+  if (shouldBuildUnpublishedRecipientFilter(filter, request.author!)) {
+    filters.push(buildRecordsFilter({ dateSort, filter, purpose, published: false, recipient: request.author }));
+  }
+
+  return filters;
+}
+
+function buildRecordsFilter(input: {
+  author?: string;
+  dateSort?: DateSort;
+  filter: RecordsFilter;
+  purpose: 'event' | 'snapshot';
+  published?: boolean;
+  recipient?: string;
+}): Filter {
+  const { author, dateSort, filter, purpose, published, recipient } = input;
+  const result: Filter = {
+    ...Records.convertFilter(filter, purpose === 'snapshot' ? dateSort : undefined),
+    interface : DwnInterfaceName.Records,
+    method    : purpose === 'snapshot' ? DwnMethodName.Write : [DwnMethodName.Write, DwnMethodName.Delete],
+  };
+
+  if (purpose === 'snapshot') {
+    result.isLatestBaseState = true;
+  }
+  if (author !== undefined) {
+    result.author = author;
+  }
+  if (published !== undefined) {
+    result.published = published;
+  }
+  if (recipient !== undefined) {
+    result.recipient = recipient;
+  }
+
+  return result;
+}
+
+function invokesProtocolRole(request: RecordsCollectionRequest): boolean {
+  return request.signaturePayload?.protocolRole !== undefined;
+}
+
+function shouldBuildUnpublishedRecipientFilter(filter: RecordsFilter, recipient: string): boolean {
+  const { recipient: recipientFilter } = filter;
+  return Array.isArray(recipientFilter)
+    ? recipientFilter.length === 0 || recipientFilter.includes(recipient)
+    : recipientFilter === undefined || recipientFilter === recipient;
+}
+
+function shouldBuildUnpublishedAuthorFilter(filter: RecordsFilter, author: string): boolean {
+  const { author: authorFilter } = filter;
+  return Array.isArray(authorFilter)
+    ? authorFilter.length === 0 || authorFilter.includes(author)
+    : authorFilter === undefined || authorFilter === author;
+}

package/src/handlers/records-count.ts

@@ -1,22 +1,20 @@
 import type { Filter } from '../types/query-types.js';
 import type { RecordLimitOccupancy } from '../types/message-store.js';
+import type { RecordsCollectionVisibility } from './records-collection.js';
 import type { HandlerDependencies, MethodHandler } from '../types/method-handler.js';
 import type { RecordsCountMessage, RecordsCountReply } from '../types/records-types.js';
 
-import { authenticate } from '../core/auth.js';
 import { EncryptionControl } from '../core/encryption-control.js';
 import { Message } from '../core/message.js';
 import { messageReplyFromError } from '../core/message-reply.js';
-import { ProtocolAuthorization } from '../core/protocol-authorization.js';
 import { Records } from '../utils/records.js';
 import { RecordsCount } from '../interfaces/records-count.js';
-import { RecordsGrantAuthorization } from '../core/records-grant-authorization.js';
+import { buildRecordsSnapshotFilters, resolveRecordsCollectionVisibility } from './records-collection.js';
 import {
   countRecordsWithRecordLimitOccupancy,
   queryRecordsWithRecordLimitOccupancy,
   resolveRecordLimitOccupancy,
 } from '../utils/record-limit-occupancy.js';
-import { DwnInterfaceName, DwnMethodName } from '../enums/dwn-interface-method.js';
 
 export class RecordsCountHandler implements MethodHandler {
 
@@ -29,34 +27,29 @@ export class RecordsCountHandler implements MethodHandler {
     let recordsCount: RecordsCount;
     try {
       recordsCount = await RecordsCount.parse(message);
-    } catch (e) {
-      return messageReplyFromError(e, 400);
+    } catch (error) {
+      return messageReplyFromError(error, 400);
     }
 
-    let count: number;
     const requester = Message.getRequester(recordsCount.message);
+    let visibility: RecordsCollectionVisibility;
+    try {
+      visibility = await resolveRecordsCollectionVisibility(tenant, recordsCount, this.deps);
+    } catch (error) {
+      return messageReplyFromError(error, 401);
+    }
 
-    // if this is an anonymous count and the filter supports published records, count only published records
-    if (Records.filterIncludesPublishedRecords(recordsCount.message.descriptor.filter) && recordsCount.author === undefined) {
-      count = await this.countPublishedRecords(tenant, recordsCount, requester);
-    } else {
-      // authentication and authorization
-      try {
-        await authenticate(message.authorization!, this.deps.didResolver);
-
-        await RecordsCountHandler.authorizeRecordsCount(tenant, recordsCount, this.deps);
-      } catch (e) {
-        return messageReplyFromError(e, 401);
-      }
+    const filters = buildRecordsSnapshotFilters(recordsCount, visibility);
+    const recordLimit = await resolveRecordLimitOccupancy({
+      validationStateReader : this.deps.validationStateReader,
+      tenant,
+      recordsFilter         : recordsCount.message.descriptor.filter,
+      messageTimestamp      : recordsCount.message.descriptor.messageTimestamp,
+    });
 
-      if (recordsCount.author === tenant && requester === tenant) {
-        count = await this.countRecordsAsOwner(tenant, recordsCount);
-      } else if (recordsCount.author === tenant) {
-        count = await this.countRecordsAsOwnerDelegate(tenant, recordsCount, requester);
-      } else {
-        count = await this.countRecordsAsNonOwner(tenant, recordsCount, requester);
-      }
-    }
+    const count = recordsCount.author === tenant && requester === tenant
+      ? await this.countProjectedRecords(tenant, filters, recordLimit)
+      : await this.countProjectedRecordsForRequester(tenant, recordsCount, requester, filters, recordLimit);
 
     return {
       status: { code: 200, detail: 'OK' },
@@ -64,90 +57,6 @@ export class RecordsCountHandler implements MethodHandler {
     };
   }
 
-  /**
-   * Counts records as the owner of the DWN with no additional filtering.
-   */
-  private async countRecordsAsOwner(tenant: string, recordsCount: RecordsCount): Promise<number> {
-    const { filter } = recordsCount.message.descriptor;
-    const countFilter = {
-      ...Records.convertFilter(filter),
-      interface         : DwnInterfaceName.Records,
-      method            : DwnMethodName.Write,
-      isLatestBaseState : true
-    };
-
-    const recordLimit = await this.resolveRecordLimit(tenant, recordsCount);
-    return this.countProjectedRecords(tenant, [countFilter], recordLimit);
-  }
-
-  private async countRecordsAsOwnerDelegate(
-    tenant: string,
-    recordsCount: RecordsCount,
-    requester: string | undefined,
-  ): Promise<number> {
-    const { filter } = recordsCount.message.descriptor;
-    const countFilter = {
-      ...Records.convertFilter(filter),
-      interface         : DwnInterfaceName.Records,
-      method            : DwnMethodName.Write,
-      isLatestBaseState : true
-    };
-
-    return this.countProjectedRecordsForRequester(tenant, recordsCount, requester, [countFilter]);
-  }
-
-  /**
-   * Counts records as a non-owner, applying the same filter logic as RecordsQuery.
-   */
-  private async countRecordsAsNonOwner(
-    tenant: string,
-    recordsCount: RecordsCount,
-    requester: string | undefined,
-  ): Promise<number> {
-    const { filter } = recordsCount.message.descriptor;
-    const filters: Filter[] = [];
-
-    if (Records.filterIncludesPublishedRecords(filter)) {
-      filters.push(RecordsCountHandler.buildPublishedRecordsFilter(recordsCount));
-    }
-
-    if (Records.filterIncludesUnpublishedRecords(filter)) {
-      if (EncryptionControl.isExactAudienceFilter(filter)) {
-        filters.push(Records.buildUnpublishedControlRecordsFilter(filter));
-      }
-
-      if (Records.shouldBuildUnpublishedAuthorFilter(filter, recordsCount.author!)) {
-        filters.push(RecordsCountHandler.buildUnpublishedRecordsByCountAuthorFilter(recordsCount));
-      }
-
-      if (Records.shouldProtocolAuthorize(recordsCount.signaturePayload!)) {
-        filters.push(RecordsCountHandler.buildUnpublishedProtocolAuthorizedRecordsFilter(recordsCount));
-      }
-
-      if (Message.getPermissionGrantId(recordsCount.signaturePayload!) !== undefined) {
-        filters.push(RecordsCountHandler.buildUnpublishedPermissionGrantAuthorizedRecordsFilter(recordsCount));
-      }
-
-      if (Records.shouldBuildUnpublishedRecipientFilter(filter, recordsCount.author!)) {
-        filters.push(RecordsCountHandler.buildUnpublishedRecordsForCountAuthorFilter(recordsCount));
-      }
-    }
-
-    return this.countProjectedRecordsForRequester(tenant, recordsCount, requester, filters);
-  }
-
-  /**
-   * Counts only published records.
-   */
-  private async countPublishedRecords(
-    tenant: string,
-    recordsCount: RecordsCount,
-    requester: string | undefined,
-  ): Promise<number> {
-    const filter = RecordsCountHandler.buildPublishedRecordsFilter(recordsCount);
-    return this.countProjectedRecordsForRequester(tenant, recordsCount, requester, [filter]);
-  }
-
   private async countProjectedRecords(
     tenant: string,
     filters: Filter[],
@@ -186,8 +95,8 @@ export class RecordsCountHandler implements MethodHandler {
     recordsCount: RecordsCount,
     requester: string | undefined,
     filters: Filter[],
+    recordLimit: RecordLimitOccupancy | undefined,
   ): Promise<number> {
-    const recordLimit = await this.resolveRecordLimit(tenant, recordsCount);
     const controlFilters = Records.buildControlRecordsFilters(filters);
     if (controlFilters.length === 0) {
       return this.countProjectedRecords(tenant, filters, recordLimit);
@@ -220,128 +129,4 @@ export class RecordsCountHandler implements MethodHandler {
     });
     return totalCount - controlCount + visibleMessages.length;
   }
-
-  private async resolveRecordLimit(
-    tenant: string,
-    recordsCount: RecordsCount,
-  ): Promise<RecordLimitOccupancy | undefined> {
-    return resolveRecordLimitOccupancy({
-      validationStateReader : this.deps.validationStateReader,
-      tenant,
-      recordsFilter         : recordsCount.message.descriptor.filter,
-      messageTimestamp      : recordsCount.message.descriptor.messageTimestamp,
-    });
-  }
-
-  private static buildPublishedRecordsFilter(recordsCount: RecordsCount): Filter {
-    const { filter } = recordsCount.message.descriptor;
-    return {
-      ...Records.convertFilter(filter),
-      interface         : DwnInterfaceName.Records,
-      method            : DwnMethodName.Write,
-      published         : true,
-      isLatestBaseState : true
-    };
-  }
-
-  /**
-   * Creates a filter for unpublished records that are intended for the count author (where `recipient` is the author).
-   */
-  private static buildUnpublishedRecordsForCountAuthorFilter(recordsCount: RecordsCount): Filter {
-    const { filter } = recordsCount.message.descriptor;
-    return {
-      ...Records.convertFilter(filter),
-      interface         : DwnInterfaceName.Records,
-      method            : DwnMethodName.Write,
-      recipient         : recordsCount.author!,
-      isLatestBaseState : true,
-      published         : false
-    };
-  }
-
-  /**
-   * Creates a filter for unpublished records that are within the specified protocol.
-   */
-  private static buildUnpublishedProtocolAuthorizedRecordsFilter(recordsCount: RecordsCount): Filter {
-    const { filter } = recordsCount.message.descriptor;
-    return {
-      ...Records.convertFilter(filter),
-      interface         : DwnInterfaceName.Records,
-      method            : DwnMethodName.Write,
-      isLatestBaseState : true,
-      published         : false
-    };
-  }
-
-  /**
-   * Creates a filter for unpublished records authorized by a permission grant.
-   */
-  private static buildUnpublishedPermissionGrantAuthorizedRecordsFilter(recordsCount: RecordsCount): Filter {
-    const { filter } = recordsCount.message.descriptor;
-    return {
-      ...Records.convertFilter(filter),
-      interface         : DwnInterfaceName.Records,
-      method            : DwnMethodName.Write,
-      isLatestBaseState : true,
-      published         : false
-    };
-  }
-
-  /**
-   * Creates a filter for only unpublished records where the author is the same as the count author.
-   */
-  private static buildUnpublishedRecordsByCountAuthorFilter(recordsCount: RecordsCount): Filter {
-    const { filter } = recordsCount.message.descriptor;
-    return {
-      ...Records.convertFilter(filter),
-      author            : recordsCount.author!,
-      interface         : DwnInterfaceName.Records,
-      method            : DwnMethodName.Write,
-      isLatestBaseState : true,
-      published         : false
-    };
-  }
-
-  /**
-   * @param messageStore Used to check if the grant has been revoked.
-   */
-  private static async authorizeRecordsCount(
-    tenant: string,
-    recordsCount: RecordsCount,
-    deps: HandlerDependencies,
-  ): Promise<void> {
-
-    if (Message.isSignedByAuthorDelegate(recordsCount.message) &&
-        !EncryptionControl.filterTargetsOnlyControlRecords(recordsCount.message.descriptor.filter)) {
-      await recordsCount.authorizeDelegate(deps.validationStateReader);
-    } else if (EncryptionControl.filterTargetsOnlyControlRecords(recordsCount.message.descriptor.filter)) {
-      await EncryptionControl.authorizeControlReadRequest({
-        tenant,
-        incomingMessage       : recordsCount.message,
-        requester             : Message.getRequester(recordsCount.message),
-        validationStateReader : deps.validationStateReader,
-      });
-    }
-
-    const permissionGrantId = Message.getPermissionGrantId(recordsCount.signaturePayload!);
-    if (permissionGrantId !== undefined) {
-      const permissionGrant = await deps.validationStateReader.fetchGrant(tenant, permissionGrantId);
-      await RecordsGrantAuthorization.authorizeQueryOrSubscribe({
-        incomingMessage       : recordsCount.message,
-        expectedGrantor       : tenant,
-        expectedGrantee       : recordsCount.author!,
-        permissionGrant,
-        validationStateReader : deps.validationStateReader,
-      });
-      return;
-    }
-
-    // NOTE: not all RecordsCount messages require protocol authorization even if the filter includes protocol-related fields,
-    // this is because we dynamically filter out records that the caller is not authorized to see.
-    // Currently only run protocol authorization if message deliberately invokes a protocol role.
-    if (Records.shouldProtocolAuthorize(recordsCount.signaturePayload!)) {
-      await ProtocolAuthorization.authorizeQueryOrSubscribe(tenant, recordsCount, deps.validationStateReader);
-    }
-  }
-
 }