@gholl-studio/pier-connector 0.2.6 → 0.2.7

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@gholl-studio/pier-connector",
     "author": "gholl",
-    "version": "0.2.6",
+    "version": "0.2.7",
     "description": "OpenClaw plugin that connects to the Pier job marketplace. Automatically fetches, executes, and reports distributed tasks for rewards.",
     "type": "module",
     "main": "src/index.js",

package/src/index.js

@@ -477,24 +477,26 @@ export default function register(api) {
                 // 5. Subscribe to Subjects
                 const publicSubject = config.subject;
                 const privateSubject = `jobs.node.${config.nodeId}`;
-
                 // 5a. Restore active job subscriptions (BUG-32)
                 try {
-                    logger.info(`[pier-connector] 🔍 Checking for active jobs to restore for node ${config.nodeId}...`);
-                    const jobsResp = await fetch(`${config.apiBase}/jobs?assigned_node_id=${config.nodeId}&limit=50`);
-                    if (jobsResp.ok) {
-                        const jobsList = await jobsResp.json();
-                        const activeJobs = (jobsList || []).filter(j => j.status === 'PENDING' || j.status === 'PROCESSING');
-                        if (activeJobs.length > 0) {
-                            logger.info(`[pier-connector] ♻️  Restoring ${activeJobs.length} active job subscriptions...`);
-                            for (const job of activeJobs) {
-                                if (!jobSubscriptions.has(job.id)) {
-                                    activeNodeJobs.set(job.id, { pierJobId: job.id });
-                                    await subscribeToJobMessages(job.id);
+                    const activeConfig = getActiveConfig();
+                    if (activeConfig.apiBase) {
+                        logger.info(`[pier-connector] 🔍 Checking for active jobs to restore for node ${config.nodeId}...`);
+                        const jobsResp = await fetch(`${activeConfig.apiBase}/jobs?assigned_node_id=${config.nodeId}&limit=50`);
+                        if (jobsResp.ok) {
+                            const jobsList = await jobsResp.json();
+                            const activeJobs = (jobsList || []).filter(j => j.status === 'PENDING' || j.status === 'PROCESSING');
+                            if (activeJobs.length > 0) {
+                                logger.info(`[pier-connector] ♻️  Restoring ${activeJobs.length} active job subscriptions...`);
+                                for (const job of activeJobs) {
+                                    if (!jobSubscriptions.has(job.id)) {
+                                        activeNodeJobs.set(job.id, { pierJobId: job.id });
+                                        await subscribeToJobMessages(job.id);
+                                    }
                                 }
+                            } else {
+                                logger.info('[pier-connector] No active jobs found to restore.');
                             }
-                        } else {
-                            logger.info('[pier-connector] No active jobs found to restore.');
                         }
                     }
                 } catch (err) {
@@ -617,14 +619,20 @@ export default function register(api) {
                         // Use a unique durable name per node and job to avoid replaying acknowledged messages
                         const durableName = `pier_chat_${config.nodeId.replace(/[^a-zA-Z0-9]/g, '_')}_${jobId.replace(/[^a-zA-Z0-9]/g, '_')}`;
                         
-                        const cInfo = await jsm.consumers.add(streamName, {
-                            durable_name: durableName,
-                            filter_subject: msgSubject,
-                            deliver_policy: DeliverPolicy.New, // Reverted to New to stop message storms (BUG-27)
-                            ack_policy: AckPolicy.Explicit, // Explicit ACK is crucial for deduplication
-                            ack_wait: 1000 * 60 * 60, // 1 hour ACK wait to allow for long processing (BUG-30)
-                        });
-                        const consumer = await js.consumers.get(streamName, cInfo.name);
+                        let consumer;
+                        try {
+                            consumer = await js.consumers.get(streamName, durableName);
+                        } catch (err) {
+                            // Only add if it doesn't exist
+                            await jsm.consumers.add(streamName, {
+                                durable_name: durableName,
+                                filter_subject: msgSubject,
+                                deliver_policy: DeliverPolicy.New, // Reverted to New to stop message storms (BUG-27)
+                                ack_policy: AckPolicy.Explicit, // Explicit ACK is crucial for deduplication
+                                ack_wait: 1000 * 60 * 60, // 1 hour ACK wait to allow for long processing (BUG-30)
+                            });
+                            consumer = await js.consumers.get(streamName, durableName);
+                        }
 
                         const iter = await consumer.consume();
                         jobSubscriptions.set(jobId, iter);
@@ -808,11 +816,10 @@ export default function register(api) {
 
                         // Trigger agent run
                         await receiveIncoming(inbound, job.id);
-                        
                     } catch (err) {
                         jobsFailed++;
                         safeRespond(msg, createErrorPayload({
-                            id: job.id,
+                            id: (job && job.id) || 'unknown',
                             errorCode: 'EXECUTION_FAILED',
                             errorMessage: err.message,
                             workerId: config.nodeId,
@@ -831,6 +838,7 @@ export default function register(api) {
                         logger.info('[pier-connector] NATS connection closed gracefully');
                     }
                 });
+
             } catch (err) {
                 connectionStatus = 'error';
                 if (heartbeatTimer) clearInterval(heartbeatTimer);
@@ -843,13 +851,10 @@ export default function register(api) {
             logger.info('[pier-connector] 🛑 Stopping background service …');
             connectionStatus = 'stopping';
 
-            if (subscription) {
-                subscription.unsubscribe();
-                subscription = null;
+            if (nc) {
+                await drainConnection(nc, logger);
+                nc = null;
             }
-
-            await drainConnection(nc, logger);
-            nc = null;
             connectionStatus = 'disconnected';
 
             logger.info('[pier-connector] ✔ Background service stopped');