@n8n/instance-ai 1.12.4 → 1.13.1

package/dist/tools/workflows/resolve-credentials.js

@@ -20,8 +20,6 @@ async function resolveCredentials(json, workflowId, ctx, availableCredentials) {
     const mockedNodeNames = [];
     const mockedCredentialTypesSet = new Set();
     const mockedCredentialsByNode = {};
-    const verificationPinData = {};
-    let usesWorkflowPinDataForVerification = false;
     const existingCredsByNode = new Map();
     if (workflowId) {
         try {
@@ -57,15 +55,6 @@ async function resolveCredentials(json, workflowId, ctx, availableCredentials) {
                 if (nodeName) {
                     mockedCredentialsByNode[nodeName] ??= [];
                     mockedCredentialsByNode[nodeName].push(key);
-                    if (json.pinData && nodeName in json.pinData) {
-                        usesWorkflowPinDataForVerification = true;
-                    }
-                    else {
-                        verificationPinData[nodeName] ??= [];
-                        if (verificationPinData[nodeName].length === 0) {
-                            verificationPinData[nodeName].push({ _mockedCredential: key });
-                        }
-                    }
                 }
             };
             if (value !== undefined && value !== null) {
@@ -99,8 +88,6 @@ async function resolveCredentials(json, workflowId, ctx, availableCredentials) {
         mockedNodeNames,
         mockedCredentialTypes: [...mockedCredentialTypesSet],
         mockedCredentialsByNode,
-        verificationPinData,
-        usesWorkflowPinDataForVerification,
     };
 }
 function getCredentialId(value) {

package/dist/tools/workflows/resolve-credentials.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolve-credentials.js","sourceRoot":"","sources":["../../../src/tools/workflows/resolve-credentials.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"resolve-credentials.js","sourceRoot":"","sources":["../../../src/tools/workflows/resolve-credentials.ts"],"names":[],"mappings":"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"}

package/dist/tools/workflows/setup-workflow.service.js

@@ -40,7 +40,7 @@ async function getValidCredentialTypes(context, node) {
                 types.add(t);
         }
         catch (error) {
-            context.logger?.warn('[setup-workflow] getNodeCredentialTypes threw during credential validation', {
+            context.logger.warn('[setup-workflow] getNodeCredentialTypes threw during credential validation', {
                 nodeType: node.type,
                 typeVersion,
                 error: error instanceof Error ? error.message : String(error),
@@ -86,21 +86,7 @@ async function stripStaleCredentialsFromNode(context, node, preserveTypes) {
 async function stripStaleCredentialsFromWorkflow(context, json) {
     await Promise.all((json.nodes ?? []).map(async (node) => await stripStaleCredentialsFromNode(context, node)));
 }
-async function buildSetupRequests(context, node, triggerTestResult, cache, workflowId) {
-    if (!node.name)
-        return [];
-    if (node.disabled)
-        return [];
-    const typeVersion = node.typeVersion ?? 1;
-    const parameters = node.parameters ?? {};
-    const nodeDesc = await context.nodeService
-        .getDescription(node.type, typeVersion)
-        .catch(() => undefined);
-    const isTrigger = nodeDesc?.group?.includes('trigger') ?? false;
-    const isTestable = isTrigger &&
-        ((nodeDesc?.webhooks !== undefined && nodeDesc.webhooks.length > 0) ||
-            nodeDesc?.polling === true ||
-            nodeDesc?.triggerPanel !== undefined);
+async function computeParameterIssues(context, node, parameters, typeVersion) {
     let parameterIssues = {};
     if (context.nodeService.getParameterIssues) {
         parameterIssues = await context.nodeService
@@ -119,27 +105,32 @@ async function buildSetupRequests(context, node, triggerTestResult, cache, workf
             }
         }
     }
-    let editableParameters;
-    if (Object.keys(parameterIssues).length > 0 && nodeDesc?.properties) {
-        editableParameters = [];
-        for (const paramName of Object.keys(parameterIssues)) {
-            const prop = nodeDesc.properties.find((p) => p.name === paramName);
-            if (!prop)
-                continue;
-            editableParameters.push({
-                name: prop.name,
-                displayName: prop.displayName,
-                type: prop.type,
-                ...(prop.required !== undefined ? { required: prop.required } : {}),
-                ...(prop.default !== undefined ? { default: prop.default } : {}),
-                ...(prop.options
-                    ? {
-                        options: prop.options,
-                    }
-                    : {}),
-            });
-        }
+    return parameterIssues;
+}
+function buildEditableParameters(parameterIssues, nodeDesc) {
+    if (Object.keys(parameterIssues).length === 0 || !nodeDesc?.properties)
+        return undefined;
+    const editableParameters = [];
+    for (const paramName of Object.keys(parameterIssues)) {
+        const prop = nodeDesc.properties.find((p) => p.name === paramName);
+        if (!prop)
+            continue;
+        editableParameters.push({
+            name: prop.name,
+            displayName: prop.displayName,
+            type: prop.type,
+            ...(prop.required !== undefined ? { required: prop.required } : {}),
+            ...(prop.default !== undefined ? { default: prop.default } : {}),
+            ...(prop.options
+                ? {
+                    options: prop.options,
+                }
+                : {}),
+        });
     }
+    return editableParameters;
+}
+async function resolveCredentialTypes(context, node, parameters, typeVersion, nodeDesc) {
     let credentialTypes = [];
     if (context.nodeService.getNodeCredentialTypes) {
         credentialTypes = await context.nodeService
@@ -167,156 +158,202 @@ async function buildSetupRequests(context, node, triggerTestResult, cache, workf
             credentialTypes = [parameters.nodeCredentialType];
         }
     }
+    return credentialTypes;
+}
+async function resolveCredentialState(context, node, credentialType, cache, workflowId) {
+    const cacheKey = listCacheKey(workflowId, credentialType);
+    let listPromise = cache?.lists.get(cacheKey);
+    if (!listPromise) {
+        listPromise = context.credentialService
+            .list({ type: credentialType, ...(workflowId ? { workflowId } : {}) })
+            .then((creds) => creds.map((c) => ({ id: c.id, name: c.name })));
+        cache?.lists.set(cacheKey, listPromise);
+    }
+    const sortedCreds = await listPromise;
+    const existingCredentials = sortedCreds.map((c) => ({ id: c.id, name: c.name }));
+    const existingOnNode = node.credentials?.[credentialType];
+    const isAutoApplied = !existingOnNode?.id && existingCredentials.length === 1;
+    const credToTest = existingOnNode?.id ?? (isAutoApplied ? existingCredentials[0]?.id : undefined);
+    if (!credToTest)
+        return { existingCredentials, isAutoApplied };
+    let testabilityPromise = cache?.testability.get(credentialType);
+    if (!testabilityPromise) {
+        testabilityPromise = context.credentialService.isTestable
+            ? context.credentialService.isTestable(credentialType).catch(() => true)
+            : Promise.resolve(true);
+        cache?.testability.set(credentialType, testabilityPromise);
+    }
+    const canTest = await testabilityPromise;
+    if (!canTest)
+        return { existingCredentials, isAutoApplied };
+    let testPromise = cache?.tests.get(credToTest);
+    if (!testPromise) {
+        testPromise = context.credentialService.test(credToTest).catch((testError) => ({
+            success: false,
+            message: testError instanceof Error ? testError.message : 'Test failed',
+        }));
+        cache?.tests.set(credToTest, testPromise);
+    }
+    const credentialTestResult = await testPromise;
+    return { existingCredentials, isAutoApplied, credentialTestResult };
+}
+function buildRequestCredentials(nodeCredentials, isAutoApplied, credentialType, existingCredentials) {
+    const autoCredential = isAutoApplied && credentialType && existingCredentials.length > 0
+        ? { [credentialType]: { id: existingCredentials[0].id, name: existingCredentials[0].name } }
+        : undefined;
+    if (nodeCredentials && Object.keys(nodeCredentials).length > 0) {
+        return {
+            credentials: (autoCredential
+                ? { ...nodeCredentials, ...autoCredential }
+                : nodeCredentials),
+        };
+    }
+    return autoCredential ? { credentials: autoCredential } : {};
+}
+async function resolveAppliedCredentialState(context, node, credentialType, cache, workflowId, nodeCredentials) {
+    if (!credentialType) {
+        return { existingCredentials: [], isAutoApplied: false };
+    }
+    const state = await resolveCredentialState(context, node, credentialType, cache, workflowId);
+    if (state.isAutoApplied && nodeCredentials) {
+        nodeCredentials[credentialType] = {
+            id: state.existingCredentials[0].id,
+            name: state.existingCredentials[0].name,
+        };
+    }
+    return state;
+}
+async function buildRequestForCredentialType(context, node, credentialType, cache, workflowId, nodeCtx) {
+    const nodeCredentials = node.credentials
+        ? Object.fromEntries(Object.entries(node.credentials)
+            .filter(([, v]) => v.id !== undefined)
+            .map(([k, v]) => [k, { id: v.id, name: v.name }]))
+        : undefined;
+    const { existingCredentials, isAutoApplied, credentialTestResult } = await resolveAppliedCredentialState(context, node, credentialType, cache, workflowId, nodeCredentials);
+    const { isTrigger, isTestable, hasParamIssues } = nodeCtx;
+    if (!credentialType && !isTrigger && !hasParamIssues)
+        return null;
+    if (!credentialType && isTrigger && !isTestable && !hasParamIssues)
+        return null;
+    let needsAction = false;
+    if (credentialType) {
+        const existingOnNode = node.credentials?.[credentialType];
+        const hasValidCredential = existingOnNode?.id !== undefined &&
+            (credentialTestResult === undefined || credentialTestResult.success);
+        needsAction = !hasValidCredential;
+    }
+    if (hasParamIssues) {
+        needsAction = true;
+    }
+    return {
+        node: {
+            name: nodeCtx.nodeName,
+            type: node.type,
+            typeVersion: nodeCtx.typeVersion,
+            parameters: nodeCtx.parameters,
+            position: nodeCtx.nodePosition,
+            id: nodeCtx.nodeId,
+            ...buildRequestCredentials(nodeCredentials, isAutoApplied, credentialType, existingCredentials),
+        },
+        ...(credentialType ? { credentialType } : {}),
+        ...(existingCredentials.length > 0 ? { existingCredentials } : {}),
+        isTrigger,
+        ...(isTestable ? { isTestable } : {}),
+        ...(isAutoApplied ? { isAutoApplied } : {}),
+        ...(credentialTestResult ? { credentialTestResult } : {}),
+        ...(nodeCtx.triggerTestResult ? { triggerTestResult: nodeCtx.triggerTestResult } : {}),
+        ...(hasParamIssues ? { parameterIssues: nodeCtx.parameterIssues } : {}),
+        ...(nodeCtx.editableParameters && nodeCtx.editableParameters.length > 0
+            ? { editableParameters: nodeCtx.editableParameters }
+            : {}),
+        needsAction,
+    };
+}
+async function buildSetupRequests(context, node, triggerTestResult, cache, workflowId) {
+    if (!node.name)
+        return [];
+    if (node.disabled)
+        return [];
+    const typeVersion = node.typeVersion ?? 1;
+    const parameters = node.parameters ?? {};
+    const nodeDesc = await context.nodeService
+        .getDescription(node.type, typeVersion)
+        .catch(() => undefined);
+    const isTrigger = nodeDesc?.group?.includes('trigger') ?? false;
+    const isTestable = isTrigger &&
+        ((nodeDesc?.webhooks !== undefined && nodeDesc.webhooks.length > 0) ||
+            nodeDesc?.polling === true ||
+            nodeDesc?.triggerPanel !== undefined);
+    const parameterIssues = await computeParameterIssues(context, node, parameters, typeVersion);
+    const editableParameters = buildEditableParameters(parameterIssues, nodeDesc);
+    const credentialTypes = await resolveCredentialTypes(context, node, parameters, typeVersion, nodeDesc);
     const nodeId = node.id ?? (0, nanoid_1.nanoid)();
     const nodePosition = node.position ?? [0, 0];
     const hasParamIssues = Object.keys(parameterIssues).length > 0;
     const requests = [];
     const processedCredTypes = credentialTypes.length > 0 ? credentialTypes : [undefined];
+    const nodeCtx = {
+        nodeName: node.name,
+        isTrigger,
+        isTestable,
+        hasParamIssues,
+        parameterIssues,
+        editableParameters,
+        triggerTestResult,
+        nodeId,
+        nodePosition,
+        typeVersion,
+        parameters,
+    };
     for (const credentialType of processedCredTypes) {
-        let existingCredentials = [];
-        let isAutoApplied = false;
-        let credentialTestResult;
-        const nodeCredentials = node.credentials
-            ? Object.fromEntries(Object.entries(node.credentials)
-                .filter(([, v]) => v.id !== undefined)
-                .map(([k, v]) => [k, { id: v.id, name: v.name }]))
-            : undefined;
-        if (credentialType) {
-            const cacheKey = listCacheKey(workflowId, credentialType);
-            let listPromise = cache?.lists.get(cacheKey);
-            if (!listPromise) {
-                listPromise = context.credentialService
-                    .list({ type: credentialType, ...(workflowId ? { workflowId } : {}) })
-                    .then((creds) => creds.map((c) => ({ id: c.id, name: c.name })));
-                cache?.lists.set(cacheKey, listPromise);
-            }
-            const sortedCreds = await listPromise;
-            existingCredentials = sortedCreds.map((c) => ({ id: c.id, name: c.name }));
-            const existingOnNode = node.credentials?.[credentialType];
-            if (!existingOnNode?.id && existingCredentials.length === 1) {
-                isAutoApplied = true;
-                if (nodeCredentials) {
-                    nodeCredentials[credentialType] = {
-                        id: existingCredentials[0].id,
-                        name: existingCredentials[0].name,
-                    };
-                }
-            }
-            const credToTest = existingOnNode?.id ?? (isAutoApplied ? existingCredentials[0]?.id : undefined);
-            if (credToTest) {
-                let testabilityPromise = cache?.testability.get(credentialType);
-                if (!testabilityPromise) {
-                    testabilityPromise = context.credentialService.isTestable
-                        ? context.credentialService.isTestable(credentialType).catch(() => true)
-                        : Promise.resolve(true);
-                    cache?.testability.set(credentialType, testabilityPromise);
-                }
-                const canTest = await testabilityPromise;
-                if (canTest) {
-                    let testPromise = cache?.tests.get(credToTest);
-                    if (!testPromise) {
-                        testPromise = context.credentialService.test(credToTest).catch((testError) => ({
-                            success: false,
-                            message: testError instanceof Error ? testError.message : 'Test failed',
-                        }));
-                        cache?.tests.set(credToTest, testPromise);
-                    }
-                    credentialTestResult = await testPromise;
-                }
-            }
-        }
-        if (!credentialType && !isTrigger && !hasParamIssues)
-            continue;
-        if (!credentialType && isTrigger && !isTestable && !hasParamIssues)
+        const request = await buildRequestForCredentialType(context, node, credentialType, cache, workflowId, nodeCtx);
+        if (request)
+            requests.push(request);
+    }
+    return requests;
+}
+function addConnectionEdge(mainOutgoing, nonMainIncoming, sourceName, connType, conn) {
+    if (typeof conn !== 'object' || conn === null || !('node' in conn))
+        return;
+    const destName = conn.node;
+    if (connType === 'main') {
+        const existing = mainOutgoing.get(sourceName) ?? [];
+        if (!existing.includes(destName))
+            existing.push(destName);
+        mainOutgoing.set(sourceName, existing);
+    }
+    else {
+        const existing = nonMainIncoming.get(destName) ?? [];
+        if (!existing.includes(sourceName))
+            existing.push(sourceName);
+        nonMainIncoming.set(destName, existing);
+    }
+}
+function addSourceConnections(sourceName, nodeConns, mainOutgoing, nonMainIncoming) {
+    for (const [connType, outputs] of Object.entries(nodeConns)) {
+        if (!Array.isArray(outputs))
             continue;
-        let needsAction = false;
-        if (credentialType) {
-            const existingOnNode = node.credentials?.[credentialType];
-            const hasValidCredential = existingOnNode?.id !== undefined &&
-                (credentialTestResult === undefined || credentialTestResult.success);
-            needsAction = !hasValidCredential;
-        }
-        if (hasParamIssues) {
-            needsAction = true;
+        for (const slot of outputs) {
+            if (!Array.isArray(slot))
+                continue;
+            for (const conn of slot) {
+                addConnectionEdge(mainOutgoing, nonMainIncoming, sourceName, connType, conn);
+            }
         }
-        const request = {
-            node: {
-                name: node.name,
-                type: node.type,
-                typeVersion,
-                parameters,
-                position: nodePosition,
-                id: nodeId,
-                ...(nodeCredentials && Object.keys(nodeCredentials).length > 0
-                    ? {
-                        credentials: isAutoApplied && credentialType && existingCredentials.length > 0
-                            ? {
-                                ...nodeCredentials,
-                                [credentialType]: {
-                                    id: existingCredentials[0].id,
-                                    name: existingCredentials[0].name,
-                                },
-                            }
-                            : nodeCredentials,
-                    }
-                    : isAutoApplied && credentialType && existingCredentials.length > 0
-                        ? {
-                            credentials: {
-                                [credentialType]: {
-                                    id: existingCredentials[0].id,
-                                    name: existingCredentials[0].name,
-                                },
-                            },
-                        }
-                        : {}),
-            },
-            ...(credentialType ? { credentialType } : {}),
-            ...(existingCredentials.length > 0 ? { existingCredentials } : {}),
-            isTrigger,
-            ...(isTestable ? { isTestable } : {}),
-            ...(isAutoApplied ? { isAutoApplied } : {}),
-            ...(credentialTestResult ? { credentialTestResult } : {}),
-            ...(triggerTestResult ? { triggerTestResult } : {}),
-            ...(hasParamIssues ? { parameterIssues } : {}),
-            ...(editableParameters && editableParameters.length > 0 ? { editableParameters } : {}),
-            needsAction,
-        };
-        requests.push(request);
     }
-    return requests;
 }
-function sortByExecutionOrder(requests, connections) {
+function buildConnectionAdjacency(connections) {
     const mainOutgoing = new Map();
     const nonMainIncoming = new Map();
     for (const [sourceName, nodeConns] of Object.entries(connections)) {
         if (typeof nodeConns !== 'object' || nodeConns === null)
             continue;
-        for (const [connType, outputs] of Object.entries(nodeConns)) {
-            if (!Array.isArray(outputs))
-                continue;
-            for (const slot of outputs) {
-                if (!Array.isArray(slot))
-                    continue;
-                for (const conn of slot) {
-                    if (typeof conn !== 'object' || conn === null || !('node' in conn))
-                        continue;
-                    const destName = conn.node;
-                    if (connType === 'main') {
-                        const existing = mainOutgoing.get(sourceName) ?? [];
-                        if (!existing.includes(destName))
-                            existing.push(destName);
-                        mainOutgoing.set(sourceName, existing);
-                    }
-                    else {
-                        const existing = nonMainIncoming.get(destName) ?? [];
-                        if (!existing.includes(sourceName))
-                            existing.push(sourceName);
-                        nonMainIncoming.set(destName, existing);
-                    }
-                }
-            }
-        }
+        addSourceConnections(sourceName, nodeConns, mainOutgoing, nonMainIncoming);
     }
+    return { mainOutgoing, nonMainIncoming };
+}
+function sortByExecutionOrder(requests, connections) {
+    const { mainOutgoing, nonMainIncoming } = buildConnectionAdjacency(connections);
     const triggerRequests = requests
         .filter((r) => r.isTrigger)
         .sort((a, b) => a.node.position[0] - b.node.position[0]);
@@ -441,6 +478,51 @@ async function applyNodeParameters(context, workflowId, nodeParameters) {
     }
     return result;
 }
+async function applyCredentialsToNode(context, node, nodeName, credsMap, result) {
+    let nodeSucceeded = true;
+    for (const [credType, credId] of Object.entries(credsMap)) {
+        try {
+            const cred = await context.credentialService.get(credId);
+            if (cred) {
+                node.credentials = {
+                    ...node.credentials,
+                    [credType]: { id: cred.id, name: cred.name },
+                };
+            }
+            else {
+                nodeSucceeded = false;
+                result.failed.push({
+                    nodeName,
+                    error: `Credential ${credId} (type: ${credType}) not found — it may have been deleted`,
+                });
+            }
+        }
+        catch (error) {
+            nodeSucceeded = false;
+            result.failed.push({
+                nodeName,
+                error: `Failed to resolve credential ${credId} (type: ${credType}): ${error instanceof Error ? error.message : 'Unknown error'}`,
+            });
+        }
+    }
+    return nodeSucceeded;
+}
+function applyParametersToNode(node, nodeName, params, result) {
+    try {
+        node.parameters = {
+            ...(node.parameters ?? {}),
+            ...params,
+        };
+        return true;
+    }
+    catch (error) {
+        result.failed.push({
+            nodeName,
+            error: `Failed to merge parameters: ${error instanceof Error ? error.message : 'Unknown error'}`,
+        });
+        return false;
+    }
+}
 async function applyNodeChanges(context, workflowId, nodeCredentials, nodeParameters) {
     const result = { applied: [], failed: [] };
     const workflowJson = await context.workflowService.getAsWorkflowJSON(workflowId);
@@ -448,52 +530,14 @@ async function applyNodeChanges(context, workflowId, nodeCredentials, nodeParame
     for (const node of workflowJson.nodes) {
         if (!node.name)
             continue;
-        const credsMap = nodeCredentials?.[node.name];
-        if (credsMap) {
-            let nodeSucceeded = true;
-            for (const [credType, credId] of Object.entries(credsMap)) {
-                try {
-                    const cred = await context.credentialService.get(credId);
-                    if (cred) {
-                        node.credentials = {
-                            ...node.credentials,
-                            [credType]: { id: cred.id, name: cred.name },
-                        };
-                    }
-                    else {
-                        nodeSucceeded = false;
-                        result.failed.push({
-                            nodeName: node.name,
-                            error: `Credential ${credId} (type: ${credType}) not found — it may have been deleted`,
-                        });
-                    }
-                }
-                catch (error) {
-                    nodeSucceeded = false;
-                    result.failed.push({
-                        nodeName: node.name,
-                        error: `Failed to resolve credential ${credId} (type: ${credType}): ${error instanceof Error ? error.message : 'Unknown error'}`,
-                    });
-                }
-            }
-            if (nodeSucceeded)
-                appliedNodes.add(node.name);
+        const nodeName = node.name;
+        const credsMap = nodeCredentials?.[nodeName];
+        if (credsMap && (await applyCredentialsToNode(context, node, nodeName, credsMap, result))) {
+            appliedNodes.add(nodeName);
         }
-        const params = nodeParameters?.[node.name];
-        if (params) {
-            try {
-                node.parameters = {
-                    ...(node.parameters ?? {}),
-                    ...params,
-                };
-                appliedNodes.add(node.name);
-            }
-            catch (error) {
-                result.failed.push({
-                    nodeName: node.name,
-                    error: `Failed to merge parameters: ${error instanceof Error ? error.message : 'Unknown error'}`,
-                });
-            }
+        const params = nodeParameters?.[nodeName];
+        if (params && applyParametersToNode(node, nodeName, params, result)) {
+            appliedNodes.add(nodeName);
         }
         const appliedTypes = new Set(credsMap ? Object.keys(credsMap) : []);
         await stripStaleCredentialsFromNode(context, node, appliedTypes);