@happyvertical/smrt-messages 0.30.0 → 0.31.1

package/dist/index.js

@@ -673,6 +673,13 @@ let Message = class extends SmrtObject {
    * Send this message via its account's sender
    */
   async send(options) {
+    if (this.sendStatus === "sending" || this.sendStatus === "sent") {
+      return {
+        success: false,
+        error: `Cannot send: message is already '${this.sendStatus}'`,
+        sentAt: /* @__PURE__ */ new Date()
+      };
+    }
     const account = await this.getAccount();
     if (!account) {
       const result = {
@@ -687,9 +694,27 @@ let Message = class extends SmrtObject {
       return result;
     }
     const sender = await account.createSender();
-    this.sendStatus = "sending";
-    this.updatedAt = /* @__PURE__ */ new Date();
-    await this.save();
+    const claimFromStatus = this.sendStatus;
+    if (this.isPersisted && this.id) {
+      const claim = await this.db.update(
+        this.tableName,
+        { id: this.id, send_status: claimFromStatus },
+        { send_status: "sending", updated_at: /* @__PURE__ */ new Date() }
+      );
+      if (!claim || claim.affected < 1) {
+        return {
+          success: false,
+          error: "Cannot send: message is already being sent",
+          sentAt: /* @__PURE__ */ new Date()
+        };
+      }
+      this.sendStatus = "sending";
+      this.updatedAt = /* @__PURE__ */ new Date();
+    } else {
+      this.sendStatus = "sending";
+      this.updatedAt = /* @__PURE__ */ new Date();
+      await this.save();
+    }
     try {
       const result = await sender.send(this, options);
       if (result.success) {
@@ -739,12 +764,29 @@ let Message = class extends SmrtObject {
     await this.save();
     return this.send(options);
   }
+  /**
+   * Options for a derived draft (reply/forward) built from this message. Carries
+   * the DB connection + tenant context from `this.options`, but strips this
+   * message's own identity fields. When this message was hydrated from the DB,
+   * `this.options` holds the row's `id`/`slug`/`context`/`_skipLoad`; spreading
+   * those into a new draft would make `draft.save()` upsert onto the natural-key
+   * conflict columns (`slug`/`context`/`_meta_type`) and overwrite the ORIGINAL
+   * message instead of inserting a new row. See EmailAccount.childOptions().
+   */
+  draftOptions() {
+    const rest = { ...this.options };
+    delete rest.id;
+    delete rest.slug;
+    delete rest.context;
+    delete rest._skipLoad;
+    return rest;
+  }
   /**
    * Create a reply to this message (returns unsaved draft)
    */
   createReply(_options) {
     const reply = new this.constructor({
-      ...this.options,
+      ...this.draftOptions(),
       id: void 0,
       accountId: this.accountId,
       threadId: this.threadId || this.id || "",
@@ -769,7 +811,7 @@ let Message = class extends SmrtObject {
    */
   createForward() {
     const forward = new this.constructor({
-      ...this.options,
+      ...this.draftOptions(),
       id: void 0,
       accountId: this.accountId,
       threadId: "",
@@ -1776,7 +1818,7 @@ let Email = class extends Message {
    */
   createReply(options) {
     const reply = new Email({
-      ...this.options,
+      ...this.draftOptions(),
       id: void 0,
       accountId: this.accountId,
       threadId: this.threadId || this.id || void 0,
@@ -1826,7 +1868,7 @@ let Email = class extends Message {
   createForward() {
     const forwardBody = this.buildForwardBody();
     const forward = new Email({
-      ...this.options,
+      ...this.draftOptions(),
       id: void 0,
       accountId: this.accountId,
       threadId: "",