piece-signal-cli-rest-api 0.2.13 → 0.2.15

package/package.json

@@ -1,6 +1,10 @@
 {
   "name": "piece-signal-cli-rest-api",
-  "version": "0.2.13",
+  "version": "0.2.15",
+  "scripts": {
+    "build": "echo \"piece-signal-cli-rest-api: kein zusätzlicher Build-Schritt erforderlich (bereits als JS ausgeliefert)\"",
+    "publish:npm": "npm publish --access public"
+  },
   "dependencies": {
     "@sinclair/typebox": "0.34.11",
     "ai": "5.0.104",
@@ -26,4 +30,4 @@
   "types": "./src/index.d.ts",
   "main": "./src/index.js",
   "type": "commonjs"
-}
+}

package/src/lib/actions/request-approval-message.js

@@ -28,11 +28,11 @@ exports.requestApprovalMessage = (0, pieces_framework_1.createAction)({
             options: {
                 options: [
                     { label: 'Emoji Reactions', value: 'emoji' },
-                    { label: 'Text Replies', value: 'text' },
-                    { label: 'Both', value: 'both' }
+                    { label: 'Text Replies (Quote)', value: 'text' },
+                    { label: 'Direct Messages (1:1 only)', value: 'direct' }
                 ]
             },
-            defaultValue: ['both']
+            defaultValue: ['text']
         }),
         timeout_seconds: pieces_framework_1.Property.Number({
             displayName: 'Timeout (seconds)',
@@ -44,7 +44,7 @@ exports.requestApprovalMessage = (0, pieces_framework_1.createAction)({
     run(context) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (context.executionType === shared_1.ExecutionType.BEGIN) {
-                const { number, recipients, message, accept_reaction_modes = ['both'], timeout_seconds = 86400 } = context.propsValue;
+                const { number, recipients, message, accept_reaction_modes = ['text'], timeout_seconds = 86400 } = context.propsValue;
                 (0, shared_2.assertNotNullOrUndefined)(message, 'message');
                 (0, shared_2.assertNotNullOrUndefined)(recipients, 'recipients');
                 const apiClient = new api_client_1.SignalCliApiClient(context.auth.props);
@@ -83,7 +83,9 @@ exports.requestApprovalMessage = (0, pieces_framework_1.createAction)({
                 const targetAuthor = formattedNumber;
                 const createdAt = Math.floor(Date.now() / 1000); // Unix timestamp in seconds
                 // Create store key using milliseconds for precise matching
-                const storeKey = `approval:${messageTimestampMs}:${targetAuthor}`;
+                // Store-Key mit Timestamp + eindeutiger Flow-Run-ID
+                // flowRunId ist pro Flow-Ausführung eindeutig, verhindert Kollisionen
+                const storeKey = `approval:${messageTimestampMs}:${context.run.id}`;
                 // DEBUG: Log storing approval mapping
                 console.log('[RequestApprovalMessage] DEBUG - Storing approval mapping:', {
                     storeKey,
@@ -105,6 +107,7 @@ exports.requestApprovalMessage = (0, pieces_framework_1.createAction)({
                     messageTimestampMs: messageTimestampMs,
                     messageTimestamp: messageTimestamp,
                     targetAuthor: targetAuthor,
+                    recipients: recipients,
                     acceptReactionModes: accept_reaction_modes,
                     timeoutSeconds: timeout_seconds,
                     createdAt: createdAt,

package/src/lib/common/message-utils.js

@@ -9,6 +9,8 @@ const pieces_framework_1 = require("@activepieces/pieces-framework");
 const pieces_common_1 = require("@activepieces/pieces-common");
 const ws_1 = tslib_1.__importDefault(require("ws"));
 // Function to cleanup expired approval mappings
+// Diese Funktion ist die EINZIGE Stelle, an der entschieden wird, ob ein Approval abgelaufen ist.
+// Alle abgelaufenen Approvals werden hier gelöscht, bevor das Matching stattfindet.
 function cleanupExpiredApprovals(store) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const keysListKey = 'approval:keys';
@@ -50,17 +52,25 @@ function tryResumeApprovalFlow(message, store, apiUrl) {
         if (!dataMessage) {
             return { resumed: false };
         }
+        // Check if it's a group message
+        const isGroupMessage = !!dataMessage.groupInfo;
+        
         // Check if it's a reaction or a quote (text reply)
         const isReaction = !!dataMessage.reaction;
         const isTextReply = !!dataMessage.quote;
-        if (!isReaction && !isTextReply) {
+        
+        // If it's neither a reaction nor a quote, and it's a group message, ignore it
+        if (!isReaction && !isTextReply && isGroupMessage) {
             return { resumed: false };
         }
         console.log('[ReceiveMessages] DEBUG - Processing message:', {
             hasReaction: isReaction,
             hasQuote: isTextReply,
+            isGroupMessage: isGroupMessage,
         });
         // Cleanup expired approvals
+        // WICHTIG: cleanupExpiredApprovals ist die EINZIGE Stelle für Timeout-Entscheidungen.
+        // Alle nachfolgenden Matching-Schritte arbeiten nur auf bereits gefilterten (nicht abgelaufenen) Approvals.
         yield cleanupExpiredApprovals(store);
         const keysListKey = 'approval:keys';
         const existingKeys = (yield store.get(keysListKey, pieces_framework_1.StoreScope.PROJECT)) || [];
@@ -77,19 +87,72 @@ function tryResumeApprovalFlow(message, store, apiUrl) {
             // signal-cli returns timestamps in SECONDS, convert to milliseconds for matching
             const targetTimestampSeconds = reaction.targetSentTimestamp || reaction.targetTimestamp;
             const targetTimestampMs = targetTimestampSeconds * 1000;
-            const targetAuthor = reaction.targetAuthor;
             const reactionEmoji = reaction.emoji;
-            storeKey = `approval:${targetTimestampMs}:${targetAuthor}`;
-            mapping = yield store.get(storeKey, pieces_framework_1.StoreScope.PROJECT);
-            if (mapping) {
-                const acceptModes = mapping.acceptReactionModes || ['both'];
-                if (acceptModes.includes('emoji') || acceptModes.includes('both')) {
-                    responseContent = reactionEmoji; // Return the emoji directly
-                    reactionType = 'emoji';
+            const messageSource = message.envelope.source;
+            
+            console.log('[ReceiveMessages] DEBUG - Processing emoji reaction:', {
+                targetTimestampMs,
+                targetTimestampSeconds,
+                reactionEmoji,
+                messageSource,
+                isGroupMessage,
+            });
+            
+            // Alle Approvals durchsuchen: Exakter Timestamp-Match + Empfänger-Validierung
+            for (const key of existingKeys) {
+                const candidateMapping = yield store.get(key, pieces_framework_1.StoreScope.PROJECT);
+                if (!candidateMapping) continue;
+                
+                // Exakter Timestamp-Match (beide vom Signal-Netzwerk, müssen identisch sein)
+                if (candidateMapping.messageTimestampMs !== targetTimestampMs) continue;
+                
+                console.log('[ReceiveMessages] DEBUG - Timestamp match found, checking recipient:', {
+                    key,
+                    candidateTimestampMs: candidateMapping.messageTimestampMs,
+                    recipients: candidateMapping.recipients,
+                });
+                
+                // Empfänger-Validierung (1:1 vs. Gruppe)
+                const recipients = candidateMapping.recipients || [];
+                let isValidRecipient = false;
+                
+                if (isGroupMessage) {
+                    // Bei Gruppen: Prüfe Gruppen-ID
+                    const groupId = dataMessage.groupInfo.groupId;
+                    isValidRecipient = Array.isArray(recipients) && recipients.includes(groupId);
+                    console.log('[ReceiveMessages] DEBUG - Group recipient check:', {
+                        groupId,
+                        isValidRecipient,
+                    });
+                } else {
+                    // Bei 1:1: Prüfe, ob Absender in recipients-Liste steht
+                    isValidRecipient = Array.isArray(recipients) && recipients.includes(messageSource);
+                    console.log('[ReceiveMessages] DEBUG - 1:1 recipient check:', {
+                        messageSource,
+                        isValidRecipient,
+                    });
                 }
-                else {
-                    // Mapping found but emoji mode not allowed
-                    mapping = null;
+                
+                if (!isValidRecipient) continue;
+                
+                // Prüfe, ob Emoji-Modus erlaubt ist
+                const acceptModes = candidateMapping.acceptReactionModes || [];
+                if (acceptModes.includes('emoji')) {
+                    mapping = candidateMapping;
+                    storeKey = key;
+                    responseContent = reactionEmoji;
+                    reactionType = 'emoji';
+                    console.log('[ReceiveMessages] DEBUG - Emoji reaction match found:', {
+                        key,
+                        flowRunId: mapping.flowRunId,
+                        reactionEmoji,
+                    });
+                    break; // Gefunden, Suche beenden
+                } else {
+                    console.log('[ReceiveMessages] DEBUG - Emoji mode not allowed for this approval:', {
+                        key,
+                        acceptModes,
+                    });
                 }
             }
         }
@@ -99,20 +162,111 @@ function tryResumeApprovalFlow(message, store, apiUrl) {
             // signal-cli returns timestamps in SECONDS, convert to milliseconds for matching
             const quoteTimestampSeconds = quote.id || quote.timestamp;
             const quoteTimestampMs = quoteTimestampSeconds * 1000;
-            const quoteAuthor = quote.author;
             const replyText = dataMessage.message || '';
-            // Try to find mapping by quote timestamp
-            storeKey = `approval:${quoteTimestampMs}:${quoteAuthor}`;
-            mapping = yield store.get(storeKey, pieces_framework_1.StoreScope.PROJECT);
-            if (mapping) {
-                const acceptModes = mapping.acceptReactionModes || ['both'];
-                if (acceptModes.includes('text') || acceptModes.includes('both')) {
-                    responseContent = replyText; // Return the text directly
+            const messageSource = message.envelope.source;
+            
+            console.log('[ReceiveMessages] DEBUG - Processing text reply (quote):', {
+                quoteTimestampMs,
+                quoteTimestampSeconds,
+                replyText: replyText.substring(0, 50), // First 50 chars for logging
+                messageSource,
+                isGroupMessage,
+            });
+            
+            // Alle Approvals durchsuchen: Exakter Timestamp-Match + Empfänger-Validierung
+            for (const key of existingKeys) {
+                const candidateMapping = yield store.get(key, pieces_framework_1.StoreScope.PROJECT);
+                if (!candidateMapping) continue;
+                
+                // Exakter Timestamp-Match (beide vom Signal-Netzwerk, müssen identisch sein)
+                if (candidateMapping.messageTimestampMs !== quoteTimestampMs) continue;
+                
+                console.log('[ReceiveMessages] DEBUG - Timestamp match found, checking recipient:', {
+                    key,
+                    candidateTimestampMs: candidateMapping.messageTimestampMs,
+                    recipients: candidateMapping.recipients,
+                });
+                
+                // Empfänger-Validierung (1:1 vs. Gruppe)
+                const recipients = candidateMapping.recipients || [];
+                let isValidRecipient = false;
+                
+                if (isGroupMessage) {
+                    // Bei Gruppen: Prüfe Gruppen-ID
+                    const groupId = dataMessage.groupInfo.groupId;
+                    isValidRecipient = Array.isArray(recipients) && recipients.includes(groupId);
+                    console.log('[ReceiveMessages] DEBUG - Group recipient check:', {
+                        groupId,
+                        isValidRecipient,
+                    });
+                } else {
+                    // Bei 1:1: Prüfe, ob Absender in recipients-Liste steht
+                    isValidRecipient = Array.isArray(recipients) && recipients.includes(messageSource);
+                    console.log('[ReceiveMessages] DEBUG - 1:1 recipient check:', {
+                        messageSource,
+                        isValidRecipient,
+                    });
+                }
+                
+                if (!isValidRecipient) continue;
+                
+                // Prüfe, ob Text-Modus erlaubt ist
+                const acceptModes = candidateMapping.acceptReactionModes || [];
+                if (acceptModes.includes('text')) {
+                    mapping = candidateMapping;
+                    storeKey = key;
+                    responseContent = replyText;
                     reactionType = 'text';
+                    console.log('[ReceiveMessages] DEBUG - Text reply match found:', {
+                        key,
+                        flowRunId: mapping.flowRunId,
+                        replyText: replyText.substring(0, 50),
+                    });
+                    break; // Gefunden, Suche beenden
+                } else {
+                    console.log('[ReceiveMessages] DEBUG - Text mode not allowed for this approval:', {
+                        key,
+                        acceptModes,
+                    });
                 }
-                else {
-                    // Mapping found but text mode not allowed
-                    mapping = null;
+            }
+        }
+        // Handle Direct Messages (1:1 only) - if no reaction/quote found
+        if (!mapping && !isGroupMessage) {
+            const messageText = dataMessage.message || '';
+            const messageSource = message.envelope.source;
+            
+            console.log('[ReceiveMessages] DEBUG - Processing direct message:', {
+                messageText: messageText.substring(0, 50), // First 50 chars for logging
+                messageSource,
+            });
+            
+            // Iterate through all approval keys to find a match
+            // Keine Timeout-Prüfung mehr - cleanupExpiredApprovals hat bereits alle abgelaufenen entfernt
+            for (const key of existingKeys) {
+                const candidateMapping = yield store.get(key, pieces_framework_1.StoreScope.PROJECT);
+                if (!candidateMapping) continue;
+                
+                // Check if direct mode is enabled
+                const acceptModes = candidateMapping.acceptReactionModes || [];
+                if (!acceptModes.includes('direct')) {
+                    continue; // Direct mode not enabled for this approval
+                }
+                
+                // Check if the message source is one of the recipients
+                const recipients = candidateMapping.recipients || [];
+                if (Array.isArray(recipients) && recipients.includes(messageSource)) {
+                    // Found a match! This is a 1:1 conversation response
+                    mapping = candidateMapping;
+                    storeKey = key;
+                    responseContent = messageText; // Use the message text as response
+                    reactionType = 'direct';
+                    console.log('[ReceiveMessages] DEBUG - Direct message match found:', {
+                        key,
+                        flowRunId: mapping.flowRunId,
+                        messageText: messageText.substring(0, 50),
+                    });
+                    break; // Found a match, stop searching
                 }
             }
         }
@@ -128,19 +282,7 @@ function tryResumeApprovalFlow(message, store, apiUrl) {
             reactionType,
             responseContent,
         });
-        // Check if expired
-        const ageInSeconds = currentTimestamp - mapping.createdAt;
-        const isExpired = ageInSeconds > mapping.timeoutSeconds;
-        if (isExpired) {
-            // Expired - delete and return
-            yield store.delete(storeKey, pieces_framework_1.StoreScope.PROJECT);
-            const flowRunMappingKey = `approval:flowRun:${mapping.flowRunId}`;
-            yield store.delete(flowRunMappingKey, pieces_framework_1.StoreScope.PROJECT);
-            const updatedKeys = existingKeys.filter(key => key !== storeKey);
-            yield store.put(keysListKey, updatedKeys, pieces_framework_1.StoreScope.PROJECT);
-            console.log('[ReceiveMessages] DEBUG - Approval expired');
-            return { resumed: false };
-        }
+        // Keine Timeout-Prüfung mehr - cleanupExpiredApprovals hat bereits alle abgelaufenen entfernt
         // Resume the flow with responseContent
         const resumeUrl = `${apiUrl}v1/flow-runs/${mapping.flowRunId}/requests/${mapping.requestId}?responseContent=${encodeURIComponent(responseContent)}&reactionType=${reactionType}&responder=${encodeURIComponent(responder || '')}`;
         console.log('[ReceiveMessages] DEBUG - Attempting resume:', {