@graffiti-garden/implementation-decentralized 0.0.2 → 0.0.4

package/dist/esm/3-protocol/4-graffiti.js

@@ -21,6 +21,7 @@ import { Authorization } from "../1-services/1-authorization";
 import { StorageBuckets } from "../1-services/3-storage-buckets";
 import {
   Inboxes,
+  LABELED_MESSAGE_LABEL_KEY,
   LABELED_MESSAGE_MESSAGE_KEY,
   MESSAGE_METADATA_KEY,
   MESSAGE_OBJECT_KEY,
@@ -104,6 +105,7 @@ const MESSAGE_LABEL_UNLABELED = 0;
 const MESSAGE_LABEL_VALID = 1;
 const MESSAGE_LABEL_TRASH = 2;
 const MESSAGE_LABEL_INVALID = 3;
+const CONCURRENCY = 16;
 class GraffitiDecentralized {
   dids = new DecentralizedIdentifiers();
   authorization = new Authorization();
@@ -194,11 +196,7 @@ class GraffitiDecentralized {
         );
         input?.setAttribute("value", proposedHandle);
         input?.addEventListener("focus", () => input?.select());
-        new Promise((r) => {
-          setTimeout(() => r(), 0);
-        }).then(() => {
-          input?.focus();
-        });
+        setTimeout(() => input?.focus(), 0);
         template?.querySelector("#graffiti-login-handle-form")?.addEventListener("submit", async (e) => {
           e.preventDefault();
           input?.setAttribute("disabled", "true");
@@ -239,11 +237,12 @@ class GraffitiDecentralized {
           e.preventDefault();
           this.login_("");
         });
-        new Promise((r) => {
-          setTimeout(() => r(), 0);
-        }).then(() => {
-          template?.querySelector("#graffiti-login-new")?.focus();
-        });
+        setTimeout(
+          () => template?.querySelector(
+            "#graffiti-login-new"
+          )?.focus(),
+          0
+        );
       }
       const createUrl = new URL(this.identityCreatorEndpoint);
       createUrl.searchParams.set(
@@ -617,14 +616,14 @@ class GraffitiDecentralized {
       cursor: JSON.stringify({
         channels,
         cursors
-      }),
-      continue: (session2) => this.discoverMeta(channels, schema, cursors, session2)
+      })
     };
   }
   discover = (...args) => {
     const [channels, schema, session] = args;
     return this.discoverMeta(channels, schema, {}, session);
   };
+  // @ts-ignore
   continueDiscover = (...args) => {
     const [cursor, session] = args;
     let channels;
@@ -771,150 +770,210 @@ class GraffitiDecentralized {
       queryArguments.cursor,
       inboxToken
     );
+    const inFlight = [];
+    let doneValue = null;
     while (true) {
-      const itResult = await iterator.next();
-      if (itResult.done) return itResult.value;
-      const result = itResult.value;
-      const label = result.l;
-      if (label !== MESSAGE_LABEL_VALID && label !== MESSAGE_LABEL_UNLABELED)
-        continue;
-      const messageId = result.id;
-      const { o: object, m: metadataBytes, t: receivedTags } = result.m;
-      let metadata;
-      try {
-        const metadataRaw = dagCborDecode(metadataBytes);
-        metadata = MessageMetadataSchema.parse(metadataRaw);
-      } catch (e) {
+      while (doneValue === null && inFlight.length < CONCURRENCY) {
+        const itResult = await iterator.next();
+        if (itResult.done) {
+          doneValue = itResult.value;
+          break;
+        }
+        const processPromise = this.processOneLabeledMessage(
+          inboxEndpoint,
+          itResult.value,
+          inboxToken,
+          recipient
+        ).catch((e) => {
+          throw e;
+        });
+        inFlight.push(processPromise);
+      }
+      const nextProcessedPromise = inFlight.shift();
+      if (!nextProcessedPromise) {
+        if (doneValue !== null) return doneValue;
+        throw new Error("Process queue empty but no return value");
+      }
+      const processed = await nextProcessedPromise;
+      if (processed) yield processed;
+    }
+  }
+  async processOneLabeledMessage(inboxEndpoint, result, inboxToken, recipient) {
+    const label = result.l;
+    if (label !== MESSAGE_LABEL_VALID && label !== MESSAGE_LABEL_UNLABELED && label !== MESSAGE_LABEL_TRASH)
+      return;
+    const messageId = result.id;
+    const { o: object, m: metadataBytes, t: receivedTags } = result.m;
+    let metadata;
+    try {
+      const metadataRaw = dagCborDecode(metadataBytes);
+      metadata = MessageMetadataSchema.parse(metadataRaw);
+    } catch (e) {
+      this.inboxes.label(
+        inboxEndpoint,
+        messageId,
+        MESSAGE_LABEL_INVALID,
+        inboxToken
+      );
+      return;
+    }
+    const {
+      [MESSAGE_DATA_STORAGE_BUCKET_KEY]: storageBucketKey,
+      [MESSAGE_DATA_TOMBSTONED_MESSAGE_ID_KEY]: tombstonedMessageId
+    } = metadata;
+    const allowedTickets = MESSAGE_DATA_ALLOWED_TICKETS_KEY in metadata ? metadata[MESSAGE_DATA_ALLOWED_TICKETS_KEY] : void 0;
+    const announcements = MESSAGE_DATA_ANNOUNCEMENTS_KEY in metadata ? metadata[MESSAGE_DATA_ANNOUNCEMENTS_KEY] : void 0;
+    if (label === MESSAGE_LABEL_VALID) {
+      return {
+        messageId,
+        object,
+        storageBucketKey,
+        allowedTickets,
+        tags: receivedTags,
+        announcements
+      };
+    } else if (label === MESSAGE_LABEL_TRASH) {
+      if (!tombstonedMessageId) return;
+      const past = await this.inboxes.get(
+        inboxEndpoint,
+        tombstonedMessageId,
+        inboxToken
+      );
+      if (!past || past[LABELED_MESSAGE_MESSAGE_KEY][MESSAGE_OBJECT_KEY].url !== object.url)
+        return;
+      if (past[LABELED_MESSAGE_LABEL_KEY] !== MESSAGE_LABEL_TRASH) {
         this.inboxes.label(
           inboxEndpoint,
-          messageId,
-          MESSAGE_LABEL_INVALID,
+          tombstonedMessageId,
+          MESSAGE_LABEL_TRASH,
           inboxToken
         );
-        continue;
-      }
-      const {
-        [MESSAGE_DATA_STORAGE_BUCKET_KEY]: storageBucketKey,
-        [MESSAGE_DATA_TOMBSTONED_MESSAGE_ID_KEY]: tombstonedMessageId
-      } = metadata;
-      const allowedTickets = MESSAGE_DATA_ALLOWED_TICKETS_KEY in metadata ? metadata[MESSAGE_DATA_ALLOWED_TICKETS_KEY] : void 0;
-      const announcements = MESSAGE_DATA_ANNOUNCEMENTS_KEY in metadata ? metadata[MESSAGE_DATA_ANNOUNCEMENTS_KEY] : void 0;
-      if (label === MESSAGE_LABEL_VALID) {
-        yield {
-          messageId,
-          object,
-          storageBucketKey,
-          allowedTickets,
-          tags: receivedTags,
-          announcements
-        };
-        continue;
       }
-      let validationError = void 0;
-      try {
-        const actor = object.actor;
-        const actorDocument = await this.dids.resolve(actor);
-        const storageBucketService = actorDocument?.service?.find(
-          (service) => service.id === DID_SERVICE_ID_GRAFFITI_STORAGE_BUCKET && service.type === DID_SERVICE_TYPE_GRAFFITI_STORAGE_BUCKET
+      return {
+        messageId,
+        tombstone: true,
+        object,
+        storageBucketKey,
+        allowedTickets,
+        tags: receivedTags,
+        announcements
+      };
+    }
+    let validationError = void 0;
+    try {
+      const actor = object.actor;
+      const actorDocument = await this.dids.resolve(actor);
+      const storageBucketService = actorDocument?.service?.find(
+        (service) => service.id === DID_SERVICE_ID_GRAFFITI_STORAGE_BUCKET && service.type === DID_SERVICE_TYPE_GRAFFITI_STORAGE_BUCKET
+      );
+      if (!storageBucketService) {
+        throw new GraffitiErrorNotFound(
+          `Actor ${actor} has no storage bucket service`
         );
-        if (!storageBucketService) {
-          throw new GraffitiErrorNotFound(
-            `Actor ${actor} has no storage bucket service`
-          );
-        }
-        if (typeof storageBucketService.serviceEndpoint !== "string") {
-          throw new GraffitiErrorNotFound(
-            `Actor ${actor} does not have a valid storage bucket endpoint`
-          );
-        }
-        const storageBucketEndpoint = storageBucketService.serviceEndpoint;
-        const objectBytes = await this.storageBuckets.get(
-          storageBucketEndpoint,
-          storageBucketKey,
-          MAX_OBJECT_SIZE_BYTES
+      }
+      if (typeof storageBucketService.serviceEndpoint !== "string") {
+        throw new GraffitiErrorNotFound(
+          `Actor ${actor} does not have a valid storage bucket endpoint`
         );
-        if (MESSAGE_DATA_ALLOWED_TICKET_KEY in metadata && !recipient) {
-          throw new GraffitiErrorForbidden(
-            `Recipient is required when allowed ticket is present`
-          );
-        }
-        const privateObjectInfo = allowedTickets ? { allowedTickets } : MESSAGE_DATA_ALLOWED_TICKET_KEY in metadata ? {
-          recipient: recipient ?? "null",
-          allowedTicket: metadata[MESSAGE_DATA_ALLOWED_TICKET_KEY],
-          allowedIndex: metadata[MESSAGE_DATA_ALLOWED_TICKET_INDEX_KEY]
-        } : void 0;
-        await this.objectEncoding.validate(
-          object,
-          receivedTags,
-          objectBytes,
-          privateObjectInfo
+      }
+      const storageBucketEndpoint = storageBucketService.serviceEndpoint;
+      const objectBytes = await this.storageBuckets.get(
+        storageBucketEndpoint,
+        storageBucketKey,
+        MAX_OBJECT_SIZE_BYTES
+      );
+      if (MESSAGE_DATA_ALLOWED_TICKET_KEY in metadata && !recipient) {
+        throw new GraffitiErrorForbidden(
+          `Recipient is required when allowed ticket is present`
         );
-      } catch (e) {
-        validationError = e;
       }
-      if (tombstonedMessageId) {
-        if (validationError instanceof GraffitiErrorNotFound) {
-          this.inboxes.get(inboxEndpoint, tombstonedMessageId, inboxToken).then((result2) => {
-            if (result2 && result2[LABELED_MESSAGE_MESSAGE_KEY][MESSAGE_OBJECT_KEY].url === object.url) {
-              this.inboxes.label(
-                inboxEndpoint,
-                tombstonedMessageId,
-                MESSAGE_LABEL_TRASH,
-                inboxToken
-              );
-            }
+      const privateObjectInfo = allowedTickets ? { allowedTickets } : MESSAGE_DATA_ALLOWED_TICKET_KEY in metadata ? {
+        recipient: recipient ?? "null",
+        allowedTicket: metadata[MESSAGE_DATA_ALLOWED_TICKET_KEY],
+        allowedIndex: metadata[MESSAGE_DATA_ALLOWED_TICKET_INDEX_KEY]
+      } : void 0;
+      await this.objectEncoding.validate(
+        object,
+        receivedTags,
+        objectBytes,
+        privateObjectInfo
+      );
+    } catch (e) {
+      validationError = e;
+    }
+    if (tombstonedMessageId) {
+      if (validationError instanceof GraffitiErrorNotFound) {
+        this.inboxes.get(inboxEndpoint, tombstonedMessageId, inboxToken).then((result2) => {
+          if (
+            // Make sure that it actually references the object being deleted
+            result2 && result2[LABELED_MESSAGE_MESSAGE_KEY][MESSAGE_OBJECT_KEY].url === object.url && // And that the object is not already marked as trash
+            result2[LABELED_MESSAGE_LABEL_KEY] !== MESSAGE_LABEL_TRASH
+          ) {
             this.inboxes.label(
               inboxEndpoint,
-              messageId,
+              tombstonedMessageId,
               MESSAGE_LABEL_TRASH,
               inboxToken
             );
-          });
-          yield {
-            messageId,
-            tombstone: true,
-            object,
-            storageBucketKey,
-            allowedTickets,
-            tags: receivedTags,
-            announcements
-          };
-        } else {
-          console.error("Recieved an incorrect object");
-          console.error(validationError);
+          }
           this.inboxes.label(
             inboxEndpoint,
             messageId,
-            MESSAGE_LABEL_INVALID,
+            MESSAGE_LABEL_TRASH,
             inboxToken
           );
-        }
+        });
+        return {
+          messageId,
+          tombstone: true,
+          object,
+          storageBucketKey,
+          allowedTickets,
+          tags: receivedTags,
+          announcements
+        };
       } else {
-        if (validationError === void 0) {
-          this.inboxes.label(
-            inboxEndpoint,
-            messageId,
-            MESSAGE_LABEL_VALID,
-            inboxToken
-          );
-          yield {
-            messageId,
-            object,
-            storageBucketKey,
-            tags: receivedTags,
-            allowedTickets,
-            announcements
-          };
-        } else {
-          console.error("Recieved an incorrect object");
-          console.error(validationError);
-          this.inboxes.label(
-            inboxEndpoint,
-            messageId,
-            MESSAGE_LABEL_INVALID,
-            inboxToken
-          );
-        }
+        console.error("Recieved an incorrect tombstone object");
+        console.error(validationError);
+        this.inboxes.label(
+          inboxEndpoint,
+          messageId,
+          MESSAGE_LABEL_INVALID,
+          inboxToken
+        );
+      }
+    } else {
+      if (validationError === void 0) {
+        this.inboxes.label(
+          inboxEndpoint,
+          messageId,
+          MESSAGE_LABEL_VALID,
+          inboxToken
+        );
+        return {
+          messageId,
+          object,
+          storageBucketKey,
+          tags: receivedTags,
+          allowedTickets,
+          announcements
+        };
+      } else if (validationError instanceof GraffitiErrorNotFound) {
+        this.inboxes.label(
+          inboxEndpoint,
+          messageId,
+          MESSAGE_LABEL_TRASH,
+          inboxToken
+        );
+      } else {
+        console.error("Recieved an incorrect object");
+        console.error(validationError);
+        this.inboxes.label(
+          inboxEndpoint,
+          messageId,
+          MESSAGE_LABEL_INVALID,
+          inboxToken
+        );
       }
     }
   }