n8n 2.29.1 → 2.29.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/build.tsbuildinfo +1 -1
- package/dist/modules/instance-ai/browser/instance-ai-browser-session.service.d.ts +3 -1
- package/dist/modules/instance-ai/browser/instance-ai-browser-session.service.js +6 -2
- package/dist/modules/instance-ai/browser/instance-ai-browser-session.service.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai-credit.service.js +10 -6
- package/dist/modules/instance-ai/instance-ai-credit.service.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai-model.service.js +2 -2
- package/dist/modules/instance-ai/instance-ai-model.service.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai.service.js +3 -1
- package/dist/modules/instance-ai/instance-ai.service.js.map +1 -1
- package/dist/modules/instance-ai/sandbox/instance-ai-sandbox.service.d.ts +1 -1
- package/dist/modules/instance-ai/sandbox/instance-ai-sandbox.service.js +1 -1
- package/dist/modules/instance-ai/sandbox/instance-ai-sandbox.service.js.map +1 -1
- package/dist/modules/instance-ai/tracing/instance-ai-tracing.service.js +1 -1
- package/dist/modules/instance-ai/tracing/instance-ai-tracing.service.js.map +1 -1
- package/dist/security-audit/security-audit.service.js.map +1 -1
- package/dist/workflows/publication/publication-result.d.ts +16 -3
- package/dist/workflows/publication/publication-status-reporter.d.ts +4 -2
- package/dist/workflows/publication/publication-status-reporter.js +41 -17
- package/dist/workflows/publication/publication-status-reporter.js.map +1 -1
- package/dist/workflows/publication/workflow-publication-applier.d.ts +1 -0
- package/dist/workflows/publication/workflow-publication-applier.js +36 -14
- package/dist/workflows/publication/workflow-publication-applier.js.map +1 -1
- package/dist/workflows/triggers/workflow-trigger-activator.js +7 -1
- package/dist/workflows/triggers/workflow-trigger-activator.js.map +1 -1
- package/package.json +28 -28
|
@@ -5,6 +5,7 @@ import { UserRepository } from '@n8n/db';
|
|
|
5
5
|
import { CredentialsService } from '../../../credentials/credentials.service';
|
|
6
6
|
import { Push } from '../../../push';
|
|
7
7
|
import { UrlService } from '../../../services/url.service';
|
|
8
|
+
import { Telemetry } from '../../../telemetry';
|
|
8
9
|
import { BrowserLocalMcpServer } from './browser-local-mcp-server';
|
|
9
10
|
import { type BrowserUseUpgradeRequest } from './browser-use-ws.constants';
|
|
10
11
|
export declare class InstanceAiBrowserSessionService {
|
|
@@ -13,10 +14,11 @@ export declare class InstanceAiBrowserSessionService {
|
|
|
13
14
|
private readonly userRepository;
|
|
14
15
|
private readonly credentialsService;
|
|
15
16
|
private readonly globalConfig;
|
|
17
|
+
private readonly telemetry;
|
|
16
18
|
private readonly sessions;
|
|
17
19
|
private readonly sessionsBySessionId;
|
|
18
20
|
private readonly logger;
|
|
19
|
-
constructor(logger: Logger, urlService: UrlService, push: Push, userRepository: UserRepository, credentialsService: CredentialsService, globalConfig: GlobalConfig);
|
|
21
|
+
constructor(logger: Logger, urlService: UrlService, push: Push, userRepository: UserRepository, credentialsService: CredentialsService, globalConfig: GlobalConfig, telemetry: Telemetry);
|
|
20
22
|
createLink(userId: string): Promise<InstanceAiBrowserCreateLinkResponse>;
|
|
21
23
|
getStatus(userId: string): InstanceAiBrowserStatusResponse;
|
|
22
24
|
disconnect(userId: string): Promise<void>;
|
|
@@ -56,17 +56,19 @@ const node_path_1 = require("node:path");
|
|
|
56
56
|
const credentials_service_1 = require("../../../credentials/credentials.service");
|
|
57
57
|
const push_1 = require("../../../push");
|
|
58
58
|
const url_service_1 = require("../../../services/url.service");
|
|
59
|
+
const telemetry_1 = require("../../../telemetry");
|
|
59
60
|
const browser_local_mcp_server_1 = require("./browser-local-mcp-server");
|
|
60
61
|
const browser_use_ws_constants_1 = require("./browser-use-ws.constants");
|
|
61
62
|
const CONNECT_TOKEN_TTL_MS = 5 * 60 * 1000;
|
|
62
63
|
const LOOPBACK_ADDRESSES = new Set(['127.0.0.1', '::1', '::ffff:127.0.0.1']);
|
|
63
64
|
let InstanceAiBrowserSessionService = class InstanceAiBrowserSessionService {
|
|
64
|
-
constructor(logger, urlService, push, userRepository, credentialsService, globalConfig) {
|
|
65
|
+
constructor(logger, urlService, push, userRepository, credentialsService, globalConfig, telemetry) {
|
|
65
66
|
this.urlService = urlService;
|
|
66
67
|
this.push = push;
|
|
67
68
|
this.userRepository = userRepository;
|
|
68
69
|
this.credentialsService = credentialsService;
|
|
69
70
|
this.globalConfig = globalConfig;
|
|
71
|
+
this.telemetry = telemetry;
|
|
70
72
|
this.sessions = new Map();
|
|
71
73
|
this.sessionsBySessionId = new Map();
|
|
72
74
|
this.logger = logger.scoped('instance-ai');
|
|
@@ -199,6 +201,7 @@ let InstanceAiBrowserSessionService = class InstanceAiBrowserSessionService {
|
|
|
199
201
|
name: 'browser_connect',
|
|
200
202
|
arguments: {},
|
|
201
203
|
});
|
|
204
|
+
this.telemetry.track('Instance AI Browser connected', { user_id: userId });
|
|
202
205
|
this.logger.info('Browser Use extension connected', { userId });
|
|
203
206
|
this.pushState(userId);
|
|
204
207
|
}
|
|
@@ -276,7 +279,8 @@ exports.InstanceAiBrowserSessionService = InstanceAiBrowserSessionService = __de
|
|
|
276
279
|
push_1.Push,
|
|
277
280
|
db_1.UserRepository,
|
|
278
281
|
credentials_service_1.CredentialsService,
|
|
279
|
-
config_1.GlobalConfig
|
|
282
|
+
config_1.GlobalConfig,
|
|
283
|
+
telemetry_1.Telemetry])
|
|
280
284
|
], InstanceAiBrowserSessionService);
|
|
281
285
|
function createInMemorySecretsBuffer() {
|
|
282
286
|
const store = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-ai-browser-session.service.js","sourceRoot":"","sources":["../../../../src/modules/instance-ai/browser/instance-ai-browser-session.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,wDAA6C;AAC7C,wCAA2C;AAC3C,gCAAyC;AACzC,gCAAkC;AAQlC,+CAA+C;AAC/C,mCAAgC;AAChC,6CAA8C;AAC9C,+CAAyC;AACzC,qCAAiC;AACjC,yCAAiC;AAEjC,2EAAuE;AACvE,iCAA8B;AAC9B,wDAAoD;
|
|
1
|
+
{"version":3,"file":"instance-ai-browser-session.service.js","sourceRoot":"","sources":["../../../../src/modules/instance-ai/browser/instance-ai-browser-session.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,7 +56,7 @@ let InstanceAiCreditService = InstanceAiCreditService_1 = class InstanceAiCredit
|
|
|
56
56
|
this.logger.debug('Claiming Instance AI credits', { threadId, dedupeId, status, usage });
|
|
57
57
|
let result;
|
|
58
58
|
try {
|
|
59
|
-
result = await this.claimTokensWithRetry(user, dedupeId, usage);
|
|
59
|
+
result = await this.claimTokensWithRetry(user, threadId, dedupeId, usage);
|
|
60
60
|
}
|
|
61
61
|
catch (error) {
|
|
62
62
|
this.claimedRunIds.delete(dedupeId);
|
|
@@ -136,21 +136,25 @@ let InstanceAiCreditService = InstanceAiCreditService_1 = class InstanceAiCredit
|
|
|
136
136
|
}
|
|
137
137
|
async getProxyAuth(user) {
|
|
138
138
|
const client = await this.aiService.getClient();
|
|
139
|
-
const token = await client.
|
|
139
|
+
const token = await client.getInstanceAiApiProxyToken({ id: user.id }, { userMessageId: (0, nanoid_1.nanoid)() });
|
|
140
140
|
return {
|
|
141
141
|
client,
|
|
142
142
|
headers: { Authorization: `${token.tokenType} ${token.accessToken}` },
|
|
143
143
|
};
|
|
144
144
|
}
|
|
145
|
-
async claimTokens(user, dedupeId, usage) {
|
|
145
|
+
async claimTokens(user, threadId, dedupeId, usage) {
|
|
146
146
|
const { client, headers } = await this.getProxyAuth(user);
|
|
147
|
-
return await client.
|
|
147
|
+
return await client.markInstanceAiTokenUsage({ id: user.id }, headers, {
|
|
148
|
+
dedupeId,
|
|
149
|
+
usage,
|
|
150
|
+
threadId,
|
|
151
|
+
});
|
|
148
152
|
}
|
|
149
|
-
async claimTokensWithRetry(user, dedupeId, usage) {
|
|
153
|
+
async claimTokensWithRetry(user, threadId, dedupeId, usage) {
|
|
150
154
|
let lastError;
|
|
151
155
|
for (let attempt = 1; attempt <= InstanceAiCreditService_1.CLAIM_MAX_ATTEMPTS; attempt++) {
|
|
152
156
|
try {
|
|
153
|
-
return await this.claimTokens(user, dedupeId, usage);
|
|
157
|
+
return await this.claimTokens(user, threadId, dedupeId, usage);
|
|
154
158
|
}
|
|
155
159
|
catch (error) {
|
|
156
160
|
lastError = error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-ai-credit.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-credit.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,wDAA6C;AAE7C,gCAAkC;AAElC,uCAA4C;AAC5C,+CAAsD;AACtD,mCAAgC;AAEhC,iCAA8B;AAC9B,sDAAkD;AAClD,2CAAwC;AAExC,gGAA0F;AAE1F,SAAS,eAAe,CAAC,KAAc;IACtC,OAAO,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC/D,CAAC;AAcM,IAAM,uBAAuB,+BAA7B,MAAM,uBAAuB;IAiBnC,YACC,MAAc,EACG,SAAoB,EACpB,SAAoB,EACpB,gBAAkC,EAClC,IAAU,EACV,UAAsC;QAJtC,cAAS,GAAT,SAAS,CAAW;QACpB,cAAS,GAAT,SAAS,CAAW;QACpB,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,SAAI,GAAJ,IAAI,CAAM;QACV,eAAU,GAAV,UAAU,CAA4B;QAdvC,kBAAa,GAAG,IAAI,GAAG,EAAU,CAAC;QAgBlD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC5C,CAAC;IAcD,KAAK,CAAC,aAAa,CAClB,IAAU,EACV,QAAgB,EAChB,QAAgB,EAChB,KAAyB,EACzB,MAAmB;QAEnB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,EAAE,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mDAAmD,EAAE;gBACtE,QAAQ;gBACR,QAAQ;aACR,CAAC,CAAC;YACH,OAAO;QACR,CAAC;QACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;YACzF,OAAO;QACR,CAAC;QACD,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oDAAoD,EAAE;gBACvE,QAAQ;gBACR,QAAQ;aACR,CAAC,CAAC;YACH,OAAO;QACR,CAAC;QAED,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QAKzF,IAAI,MAAoD,CAAC;QACzD,IAAI,CAAC;YACJ,MAAM,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"instance-ai-credit.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-credit.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,7 +66,7 @@ let InstanceAiModelService = class InstanceAiModelService {
|
|
|
66
66
|
const client = await this.aiService.getClient();
|
|
67
67
|
const proxyBaseUrl = client.getApiProxyBaseUrl();
|
|
68
68
|
const tokenManager = new proxy_token_manager_1.ProxyTokenManager(async () => {
|
|
69
|
-
return await client.
|
|
69
|
+
return await client.getInstanceAiApiProxyToken({ id: user.id }, { userMessageId: (0, nanoid_1.nanoid)() });
|
|
70
70
|
});
|
|
71
71
|
return await this.resolveProxyModel(user, proxyBaseUrl, tokenManager);
|
|
72
72
|
}
|
|
@@ -122,7 +122,7 @@ let InstanceAiModelService = class InstanceAiModelService {
|
|
|
122
122
|
return { creditsQuota: api_types_1.UNLIMITED_CREDITS, creditsClaimed: 0 };
|
|
123
123
|
}
|
|
124
124
|
const client = await this.aiService.getClient();
|
|
125
|
-
return await client.
|
|
125
|
+
return await client.getInstanceAiCredits({ id: user.id });
|
|
126
126
|
}
|
|
127
127
|
};
|
|
128
128
|
exports.InstanceAiModelService = InstanceAiModelService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-ai-model.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-model.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAsE;AACtE,0DAAoD;AAEpD,gCAAkC;AAElC,mCAAgC;AAEhC,2CAA0C;AAC1C,sDAAkD;AAClD,wEAAmE;AACnE,2DAA4D;AAE5D,iFAA2E;AAmBpE,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAClC,YACkB,eAA0C,EAC1C,SAAoB,EACpB,YAA0B;QAF1B,oBAAe,GAAf,eAAe,CAA2B;QAC1C,cAAS,GAAT,SAAS,CAAW;QACpB,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAGJ,cAAc;QACb,OAAO,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,CAAC;IACxC,CAAC;IAaD,KAAK,CAAC,uBAAuB,CAAC,IAAU;QACvC,IAAI,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;YAChD,MAAM,YAAY,GAAG,MAAM,CAAC,kBAAkB,EAAE,CAAC;YACjD,MAAM,YAAY,GAAG,IAAI,uCAAiB,CAAC,KAAK,IAAI,EAAE;gBACrD,OAAO,MAAM,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"instance-ai-model.service.js","sourceRoot":"","sources":["../../../src/modules/instance-ai/instance-ai-model.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -402,7 +402,7 @@ let InstanceAiService = class InstanceAiService {
|
|
|
402
402
|
const client = await this.aiService.getClient();
|
|
403
403
|
const proxyBaseUrl = client.getApiProxyBaseUrl();
|
|
404
404
|
const tokenManager = new proxy_token_manager_1.ProxyTokenManager(async () => {
|
|
405
|
-
return await client.
|
|
405
|
+
return await client.getInstanceAiApiProxyToken({ id: user.id }, { userMessageId: (0, nanoid_1.nanoid)() });
|
|
406
406
|
});
|
|
407
407
|
const featureHeaders = (0, api_types_1.buildProxyHeaders)({
|
|
408
408
|
feature: 'instance-ai',
|
|
@@ -2165,6 +2165,7 @@ let InstanceAiService = class InstanceAiService {
|
|
|
2165
2165
|
checkpointKey: result.agentRunId,
|
|
2166
2166
|
checkpointTaskId: checkpoint?.checkpointTaskId,
|
|
2167
2167
|
});
|
|
2168
|
+
void this.creditService.claimRunUsage(user, threadId, `${result.agentRunId || runId}:${result.suspension.requestId}`, result.usage?.usage ?? [], 'suspended');
|
|
2168
2169
|
}
|
|
2169
2170
|
const intermediateText = await (result.text ?? Promise.resolve(''));
|
|
2170
2171
|
if (intermediateText) {
|
|
@@ -2818,6 +2819,7 @@ let InstanceAiService = class InstanceAiService {
|
|
|
2818
2819
|
checkpointKey: result.agentRunId,
|
|
2819
2820
|
checkpointTaskId: opts.checkpoint?.checkpointTaskId,
|
|
2820
2821
|
});
|
|
2822
|
+
void this.creditService.claimRunUsage(opts.user, opts.threadId, `${result.agentRunId || opts.runId}:${result.suspension.requestId}`, result.usage?.usage ?? [], 'suspended');
|
|
2821
2823
|
}
|
|
2822
2824
|
const intermediateText = await (result.text ?? Promise.resolve(''));
|
|
2823
2825
|
if (intermediateText) {
|