@noosphere/agent-core 0.1.0-alpha.7 → 0.1.0-alpha.9

package/dist/index.cjs

@@ -495,14 +495,19 @@ var ContainerManager = class {
     console.log(`
 \u{1F680} Preparing ${containers.size} containers...`);
     const pullAndStartPromises = Array.from(containers.entries()).map(async ([id, container]) => {
+      const imageTag = `${container.image}:${container.tag || "latest"}`;
       try {
-        const imageTag = `${container.image}:${container.tag || "latest"}`;
         console.log(`  Pulling ${imageTag}...`);
         await this.pullImage(container.image, container.tag || "latest");
         console.log(`  \u2713 ${imageTag} ready`);
+      } catch (error) {
+        console.error(`  \u274C Failed to pull ${imageTag}:`, error.message);
+        return;
+      }
+      try {
         await this.startPersistentContainer(id, container);
       } catch (error) {
-        console.error(`  \u274C Failed to prepare ${container.image}:`, error.message);
+        console.error(`  \u274C Failed to start ${container.name || container.image}:`, error.message);
       }
     });
     await Promise.all(pullAndStartPromises);
@@ -514,21 +519,23 @@ var ContainerManager = class {
   async startPersistentContainer(containerId, metadata) {
     const containerName = `noosphere-${metadata.name}`;
     const imageTag = `${metadata.image}:${metadata.tag || "latest"}`;
+    const existingContainer = this.docker.getContainer(containerName);
     try {
-      const existingContainer = this.docker.getContainer(containerName);
-      try {
-        const inspect = await existingContainer.inspect();
-        if (inspect.State.Running) {
-          console.log(`  \u2713 Container ${containerName} already running`);
-          this.persistentContainers.set(containerId, existingContainer);
-          return;
-        } else {
+      const inspect = await existingContainer.inspect();
+      if (inspect.State.Running) {
+        console.log(`  \u2713 Container ${containerName} already running`);
+        this.persistentContainers.set(containerId, existingContainer);
+        return;
+      } else {
+        try {
           await existingContainer.start();
           console.log(`  \u2713 Started existing container ${containerName}`);
           this.persistentContainers.set(containerId, existingContainer);
           return;
+        } catch (startErr) {
+          console.log(`  Removing stopped container ${containerName} to recreate...`);
+          await existingContainer.remove({ force: true });
         }
-      } catch (err) {
       }
     } catch (err) {
     }
@@ -1666,6 +1673,7 @@ var NoosphereAgent = class _NoosphereAgent {
       console.warn(`  Could not verify interval currency:`, error.message);
     }
     this.scheduler.markIntervalCommitted(BigInt(event.subscriptionId), BigInt(event.interval));
+    let sentTxHash;
     try {
       await this.waitForPriority(event);
       if (this.options.onRequestProcessing) {
@@ -1778,6 +1786,7 @@ var NoosphereAgent = class _NoosphereAgent {
         commitmentData,
         nodeWallet
       );
+      sentTxHash = tx.hash;
       console.log(`  \u{1F4E4} Transaction sent: ${tx.hash}`);
       const receipt = await tx.wait();
       if (receipt.status === 1) {
@@ -1812,7 +1821,7 @@ var NoosphereAgent = class _NoosphereAgent {
       }
       console.error(`  \u274C Error processing request:`, error);
       if (this.options.onRequestFailed) {
-        this.options.onRequestFailed(event.requestId, errorMessage);
+        this.options.onRequestFailed(event.requestId, errorMessage, sentTxHash);
       }
     } finally {
       this.processingRequests.delete(event.requestId);