@gholl-studio/pier-connector 0.1.0 → 0.1.2

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@gholl-studio/pier-connector",
     "author": "gholl",
-    "version": "0.1.0",
+    "version": "0.1.2",
     "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

@@ -42,14 +42,15 @@ export default function register(api) {
 
     /** Connection status for the /pier command */
     let connectionStatus = 'disconnected';
+    const jobSubscriptions = new Map();
+    const jobStopTimeouts = new Map();
+    const activeNodeJobs = new Map();
+
     let jobsReceived = 0;
     let jobsCompleted = 0;
     let jobsFailed = 0;
     let connectedAt = null;
-    
-    /** @type {Map<string, import('@nats-io/transport-node').Subscription>} */
-    const jobSubscriptions = new Map();
-const jobStopTimeouts = new Map();
+    let lastHeartbeatError = null;
 
     // ── resolve plugin config ──────────────────────────────────────────
 
@@ -117,8 +118,10 @@ const jobStopTimeouts = new Map();
             }
 
             const data = await resp.json();
+            lastHeartbeatError = null;
             return data.nats_config || null;
         } catch (err) {
+            lastHeartbeatError = err.message;
             logger.warn(`[pier-connector] Heartbeat failed: ${err.message}`);
             return null;
         }
@@ -148,15 +151,10 @@ const jobStopTimeouts = new Map();
                 accountId: accountId ?? 'default',
                 enabled: true,
             },
+            isConfigured: (account) => Boolean(account.nodeId && account.secretKey) || Boolean(account.privateKey),
         },
         
         setup: {
-            checkAccountStatus: async ({ accountId }) => {
-                if (connectionStatus === 'connected') return { status: 'connected' };
-                if (connectionStatus === 'error') return { status: 'error', details: 'NATS connection error' };
-                if (connectionStatus === 'connecting') return { status: 'connecting' };
-                return { status: 'disconnected', details: connectionStatus };
-            },
             applyAccountConfig: ({ cfg, accountId, input }) => {
                 const draft = structuredClone(cfg);
                 draft.channels = draft.channels || {};
@@ -188,7 +186,15 @@ const jobStopTimeouts = new Map();
              * Send a reply text back through the NATS response.
              * This is called by OpenClaw's agent after processing a job.
              */
-            sendText: async ({ text, metadata }) => {
+            sendText: async (ctx) => {
+                const text = ctx.text;
+                let metadata = ctx.metadata;
+                
+                if (!metadata && ctx.to) {
+                    const toId = ctx.to.replace(/^pier:/, '');
+                    metadata = activeNodeJobs.get(toId);
+                }
+
                 const jobId = metadata?.pierJobId;
                 const msg = metadata?.pierNatsMsg;
                 const isRealtimeMsg = metadata?.isRealtimeMsg;
@@ -244,7 +250,7 @@ const jobStopTimeouts = new Map();
                                 jobSubscriptions.delete(jobId);
                                 jobStopTimeouts.delete(jobId);
                             }
-                        }, 60000); // 60s grace period
+                        }, 3600000); // 1 hour inactivity timeout
                         
                         jobStopTimeouts.set(jobId, timeout);
                     }
@@ -253,6 +259,25 @@ const jobStopTimeouts = new Map();
                 return { ok: true };
             },
         },
+
+        status: {
+            defaultRuntime: {
+                accountId: 'default',
+                running: false,
+                connected: false,
+            },
+            buildAccountSnapshot: ({ account }) => {
+                return {
+                    accountId: account.accountId,
+                    name: account.name,
+                    enabled: account.enabled,
+                    configured: Boolean(account.nodeId && account.secretKey) || Boolean(account.privateKey),
+                    running: connectionStatus === 'connected' || connectionStatus === 'connecting',
+                    connected: connectionStatus === 'connected' && !lastHeartbeatError,
+                    lastError: lastHeartbeatError,
+                };
+            }
+        },
     };
 
     api.registerChannel({ plugin: pierChannel });
@@ -473,15 +498,18 @@ const jobStopTimeouts = new Map();
                             const content = msgPayload.content;
                             logger.info(`[pier-connector] 💬 Message for job ${jobId}: "${truncate(content, 40)}"`);
                             
+                            const senderCore = msgPayload.sender_id;
+                            
+                            activeNodeJobs.set(senderCore, {
+                                pierJobId: jobId,
+                                isRealtimeMsg: true
+                            });
+
                             await api.runtime.sendIncoming({
                                 channelId: 'pier',
                                 accountId: config.accountId || 'default',
-                                senderId: `pier:${msgPayload.sender_id}`,
+                                senderId: `pier:${senderCore}`,
                                 text: content,
-                                metadata: {
-                                    pierJobId: jobId,
-                                    isRealtimeMsg: true
-                                }
                             });
                         }
                     } catch (err) {
@@ -537,18 +565,22 @@ const jobStopTimeouts = new Map();
                     logger.info(`[pier-connector] 📥 Received job ${job.id}: "${truncate(job.task, 60)}"`);
 
                     try {
+                        const senderCore = job.meta?.sender ?? 'anonymous';
+                        
+                        activeNodeJobs.set(senderCore, {
+                            pierJobId: job.id,
+                            pierNatsMsg: msg,
+                            pierStartTime: startTime,
+                            pierMeta: job.meta,
+                            isRealtimeMsg: false
+                        });
+
                         const inbound = {
                             channelId: 'pier',
                             accountId: config.accountId || 'default',
-                            senderId: `pier:${job.meta?.sender ?? 'anonymous'}`,
+                            senderId: `pier:${senderCore}`,
                             text: job.task,
                             assignedAgentId: config.agentId || undefined,
-                            metadata: {
-                                pierJobId: job.id,
-                                pierNatsMsg: msg,
-                                pierStartTime: startTime,
-                                pierMeta: job.meta,
-                            },
                         };
 
                         if (job.systemPrompt) inbound.systemPrompt = job.systemPrompt;
@@ -786,6 +818,7 @@ const jobStopTimeouts = new Map();
                     `• Publish: ${config.publishSubject}`,
                     `• Uptime: ${uptime}`,
                     `• Jobs: ${jobsReceived} received, ${jobsCompleted} completed, ${jobsFailed} failed`,
+                    lastHeartbeatError ? `• \x1b[31mHeartbeat Error: ${lastHeartbeatError}\x1b[0m` : `• Heartbeat: OK`,
                 ].join('\n'),
             };
         },