dids for commits

Author: joepio

browser/lib/src/resource.ts

@@ -117,7 +117,7 @@ export class Resource<C extends OptionalClass = any> {
 
       throw new Error(
         'Invalid subject given to resource, must be a string, found ' +
-        typeof subject,
+          typeof subject,
       );
     }
 
@@ -547,9 +547,10 @@ export class Resource<C extends OptionalClass = any> {
   public getCommitsCollectionSubject(): string {
     // For DID subjects (or other non-HTTP URIs) we can't derive the server
     // origin from the subject itself — use the store's server URL instead.
-    const base = this.subject.startsWith('did:') || this.subject.startsWith('_')
-      ? this.store.getServerUrl()
-      : this.subject;
+    const base =
+      this.subject.startsWith('did:') || this.subject.startsWith('_')
+        ? this.store.getServerUrl()
+        : this.subject;
     const url = new URL('/commits', base);
     url.searchParams.append('property', commits.properties.subject);
     url.searchParams.append('value', this.subject);
@@ -599,9 +600,8 @@ export class Resource<C extends OptionalClass = any> {
     const commitsCollection = await this.store.fetchResourceFromServer(
       this.getCommitsCollectionSubject(),
     );
-    const commitList = (commitsCollection.get(
-      collections.properties.members,
-    ) ?? []) as string[];
+    const commitList = (commitsCollection.get(collections.properties.members) ??
+      []) as string[];
 
     const builtVersions: Version[] = [];
 
@@ -841,7 +841,7 @@ export class Resource<C extends OptionalClass = any> {
       // the serialization signed here matches what the server will produce when
       // it verifies the signature.  The server stores commit resources at
       // `{origin}/commits/{signature}`.
-      const commitUrl = `${this.store.getServerUrl()}/commits/${this._lastLocalSignature}`;
+      const commitUrl = `did:ad:commit:${this._lastLocalSignature}`;
       this.commitBuilder.setPreviousCommit(commitUrl);
     } else {
       const lastCommit = this.get(properties.commit.lastCommit)?.toString();
@@ -895,7 +895,9 @@ export class Resource<C extends OptionalClass = any> {
     }
 
     const endpoint = this.getCommitEndpoint();
-    const wasNew = this._pendingCommits.length > 0 && this._pendingCommits[0].previousCommit === undefined;
+    const wasNew =
+      this._pendingCommits.length > 0 &&
+      this._pendingCommits[0].previousCommit === undefined;
 
     let lastCommitId: string | undefined;
 
@@ -1000,7 +1002,9 @@ export class Resource<C extends OptionalClass = any> {
     });
 
     // Keep a backup of the commit builder in case push fails.
-    const oldCommitBuilder = hasChanges ? this.commitBuilder.clone() : undefined;
+    const oldCommitBuilder = hasChanges
+      ? this.commitBuilder.clone()
+      : undefined;
     const wasNew = this.new;
 
     try {

lib/src/commit.rs

@@ -378,10 +378,9 @@ impl Commit {
                             .unwrap_or_default();
                         if !writers.contains(&commit.signer) {
                             writers.push(commit.signer.clone());
-                            applied.resource_new.set_unsafe(
-                                urls::WRITE.into(),
-                                writers.into(),
-                            );
+                            applied
+                                .resource_new
+                                .set_unsafe(urls::WRITE.into(), writers.into());
                         }
                     }
                 }
@@ -625,7 +624,7 @@ impl Commit {
     #[tracing::instrument(skip(store))]
     pub async fn into_resource(&self, store: &impl Storelike) -> AtomicResult<Resource> {
         let commit_subject = match self.signature.as_ref() {
-            Some(sig) => format!("internal:/commits/{}", sig),
+            Some(sig) => format!("did:ad:commit:{}", sig),
             None => {
                 let now = crate::utils::now();
                 format!("internal:/commitsUnsigned/{}", now)

lib/src/parse.rs

@@ -233,7 +233,7 @@ pub async fn parse_json_ad_commit_resource(
     };
 
     // Incoming commits do not have an @id field, we generate that from the signature.
-    let commit_subject = format!("internal:/commits/{}", signature);
+    let commit_subject = format!("did:ad:commit:{}", signature);
 
     let resource =
         parse_json_ad_map_to_resource(json, store, Some(commit_subject), &ParseOpts::default())

lib/src/subject.rs

@@ -4,6 +4,9 @@ use url::Url;
 /// The prefix for Agent DIDs: `did:ad:agent:`
 pub const DID_AD_AGENT_PREFIX: &str = "did:ad:agent:";
 
+/// The prefix for Commit DIDs: `did:ad:commit:`
+pub const DID_AD_COMMIT_PREFIX: &str = "did:ad:commit:";
+
 /// The Subject of a Resource.
 ///
 /// In Atomic Data, every subject is a URI.

server/src/search.rs

@@ -87,7 +87,7 @@ impl SearchState {
 
         let resources = store
             .all_resources(true)
-            .filter(|resource| !resource.get_subject().as_str().contains("/commits/"));
+            .filter(|resource| !resource.get_subject().as_str().contains("/commits/") && !resource.get_subject().as_str().starts_with("did:ad:commit:"));
 
         for resource in resources {
             self.add_resource(&resource, store).await.map_err(|e| {