cerevox 0.1.2 → 0.2.0
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/README.md +162 -2
- package/dist/cli/cerevox-run.d.ts.map +1 -1
- package/dist/cli/cerevox-run.js +12 -5
- package/dist/cli/cerevox-run.js.map +1 -1
- package/dist/core/ai.d.ts +24 -0
- package/dist/core/ai.d.ts.map +1 -0
- package/dist/core/ai.js +140 -0
- package/dist/core/ai.js.map +1 -0
- package/dist/core/browser.d.ts +3 -2
- package/dist/core/browser.d.ts.map +1 -1
- package/dist/core/browser.js +7 -5
- package/dist/core/browser.js.map +1 -1
- package/dist/core/cerevox.d.ts +5 -1
- package/dist/core/cerevox.d.ts.map +1 -1
- package/dist/core/cerevox.js +29 -3
- package/dist/core/cerevox.js.map +1 -1
- package/dist/core/code-runner.d.ts +3 -1
- package/dist/core/code-runner.d.ts.map +1 -1
- package/dist/core/code-runner.js +18 -4
- package/dist/core/code-runner.js.map +1 -1
- package/dist/core/file-system.d.ts.map +1 -1
- package/dist/core/file-system.js +2 -1
- package/dist/core/file-system.js.map +1 -1
- package/dist/core/session.d.ts +2 -0
- package/dist/core/session.d.ts.map +1 -1
- package/dist/core/session.js +25 -5
- package/dist/core/session.js.map +1 -1
- package/dist/core/terminal.d.ts.map +1 -1
- package/dist/core/terminal.js +5 -4
- package/dist/core/terminal.js.map +1 -1
- package/dist/mcp/servers/browser-use.d.ts +3 -0
- package/dist/mcp/servers/browser-use.d.ts.map +1 -0
- package/dist/{cli/cerevox-mcp.js → mcp/servers/browser-use.js} +24 -40
- package/dist/mcp/servers/browser-use.js.map +1 -0
- package/dist/utils/constants.d.ts +1 -0
- package/dist/utils/constants.d.ts.map +1 -1
- package/dist/utils/constants.js +3 -1
- package/dist/utils/constants.js.map +1 -1
- package/dist/utils/detect-code.d.ts +2 -2
- package/dist/utils/detect-code.d.ts.map +1 -1
- package/dist/utils/detect-code.js +5 -1
- package/dist/utils/detect-code.js.map +1 -1
- package/package.json +1 -1
- package/dist/cli/cerevox-mcp.d.ts +0 -3
- package/dist/cli/cerevox-mcp.d.ts.map +0 -1
- package/dist/cli/cerevox-mcp.js.map +0 -1
package/dist/core/cerevox.js
CHANGED
|
@@ -12,6 +12,7 @@ const promises_1 = require("node:timers/promises");
|
|
|
12
12
|
const session_2 = require("./session");
|
|
13
13
|
require("dotenv/config");
|
|
14
14
|
const auth_1 = require("../utils/auth");
|
|
15
|
+
const logger_1 = require("../utils/logger");
|
|
15
16
|
class Cerevox {
|
|
16
17
|
constructor(options = {}) {
|
|
17
18
|
this.token = '';
|
|
@@ -21,6 +22,7 @@ class Cerevox {
|
|
|
21
22
|
this.debug = !!options.debug;
|
|
22
23
|
// 当 debug 为 true 时默认值为 debug，否则默认值为 error
|
|
23
24
|
this.logLevel = options.logLevel || (this.debug ? 'debug' : 'error');
|
|
25
|
+
this.logger = (0, logger_1.createClassLogger)('Cerevox', {}, this.logLevel);
|
|
24
26
|
}
|
|
25
27
|
async getToken() {
|
|
26
28
|
if (this.token) {
|
|
@@ -56,7 +58,25 @@ class Cerevox {
|
|
|
56
58
|
});
|
|
57
59
|
}
|
|
58
60
|
}
|
|
59
|
-
async
|
|
61
|
+
async waitForHttpServerReady(session) {
|
|
62
|
+
const host = session.getHost();
|
|
63
|
+
const interval = 50;
|
|
64
|
+
const maxTries = 1000;
|
|
65
|
+
let tries = 0;
|
|
66
|
+
while (tries++ < maxTries) {
|
|
67
|
+
await (0, promises_1.setTimeout)(interval);
|
|
68
|
+
try {
|
|
69
|
+
const response = await fetch(`https://${host}/health`);
|
|
70
|
+
if (response.ok) {
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
catch (error) {
|
|
75
|
+
/* empty */
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
async waitForBrowserReady(session) {
|
|
60
80
|
const host = session.getHost();
|
|
61
81
|
const interval = 50;
|
|
62
82
|
const maxTries = 1000;
|
|
@@ -85,6 +105,9 @@ class Cerevox {
|
|
|
85
105
|
}
|
|
86
106
|
throw new Error('CDP server failed to become ready within timeout');
|
|
87
107
|
}
|
|
108
|
+
getLogger() {
|
|
109
|
+
return this.logger;
|
|
110
|
+
}
|
|
88
111
|
async connect(sandboxId) {
|
|
89
112
|
if (session_2.sessions[sandboxId]) {
|
|
90
113
|
return session_2.sessions[sandboxId];
|
|
@@ -99,7 +122,8 @@ class Cerevox {
|
|
|
99
122
|
},
|
|
100
123
|
logLevel: this.logLevel,
|
|
101
124
|
});
|
|
102
|
-
this.
|
|
125
|
+
await this.waitForHttpServerReady(session);
|
|
126
|
+
this.waitForBrowserReady(session); // 不需要 await
|
|
103
127
|
return session;
|
|
104
128
|
}
|
|
105
129
|
async launch(config = {}) {
|
|
@@ -140,6 +164,7 @@ class Cerevox {
|
|
|
140
164
|
ENABLE_WEBGL: browserConfig.webgl.toString(),
|
|
141
165
|
BROWSER_ARGS: JSON.stringify(browserConfig.args),
|
|
142
166
|
CEREVOX_DOMAIN: 'cerevox.io',
|
|
167
|
+
PW_TEST_SCREENSHOT_NO_FONTS_READY: '1', // 避免 page.screenshot 崩溃
|
|
143
168
|
},
|
|
144
169
|
});
|
|
145
170
|
const session = new session_1.Session(sandbox, {
|
|
@@ -149,7 +174,8 @@ class Cerevox {
|
|
|
149
174
|
logLevel: this.logLevel,
|
|
150
175
|
});
|
|
151
176
|
await this.createSession(session, browserConfig.headless);
|
|
152
|
-
this.
|
|
177
|
+
await this.waitForHttpServerReady(session);
|
|
178
|
+
this.waitForBrowserReady(session); // 不需要 await
|
|
153
179
|
return session;
|
|
154
180
|
}
|
|
155
181
|
}
|
package/dist/core/cerevox.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cerevox.js","sourceRoot":"","sources":["../../src/core/cerevox.ts"],"names":[],"mappings":";;;;;;AAAA,8CAA0B;AAC1B,uCAAoC;AACpC,qCAAqC;AACrC,0DAA6B;AAC7B,mDAAkD;AAClD,uCAAqC;AACrC,yBAAuB;AACvB,wCAAuC;
|
|
1
|
+
{"version":3,"file":"cerevox.js","sourceRoot":"","sources":["../../src/core/cerevox.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code-runner.d.ts","sourceRoot":"","sources":["../../src/core/code-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,SAAS,EAAU,MAAM,QAAQ,CAAC;AAI3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"code-runner.d.ts","sourceRoot":"","sources":["../../src/core/code-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,SAAS,EAAU,MAAM,QAAQ,CAAC;AAI3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,qBACa,UAAW,SAAQ,SAAS;IACvC,OAAO,CAAC,QAAQ,CAAW;IAC3B,OAAO,CAAC,OAAO,CAAU;IAEzB;;;;;OAKG;gBACS,OAAO,EAAE,OAAO;YASd,UAAU;IAuGlB,GAAG,CACP,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAO,GACrE,OAAO,CAAC,aAAa,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAmChD"}
|
package/dist/core/code-runner.js
CHANGED
|
@@ -8,12 +8,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.CodeRunner = void 0;
|
|
13
16
|
const base_1 = require("./base");
|
|
14
17
|
const uuid_1 = require("uuid");
|
|
15
18
|
const detect_code_1 = require("../utils/detect-code");
|
|
16
19
|
const session_1 = require("./session");
|
|
20
|
+
const constants_1 = require("../utils/constants");
|
|
21
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
17
22
|
let CodeRunner = class CodeRunner extends base_1.BaseClass {
|
|
18
23
|
/**
|
|
19
24
|
* 创建 CodeRunner 实例
|
|
@@ -91,7 +96,7 @@ let CodeRunner = class CodeRunner extends base_1.BaseClass {
|
|
|
91
96
|
}
|
|
92
97
|
async run(code, options = {}) {
|
|
93
98
|
const type = (0, detect_code_1.detectCodeType)(code);
|
|
94
|
-
if (options.inject) {
|
|
99
|
+
if (options.inject && type !== 'sh') {
|
|
95
100
|
code = await this.injectCode(code, type);
|
|
96
101
|
}
|
|
97
102
|
const scriptId = (0, uuid_1.v4)();
|
|
@@ -102,20 +107,29 @@ let CodeRunner = class CodeRunner extends base_1.BaseClass {
|
|
|
102
107
|
const terminal = this.terminal;
|
|
103
108
|
const timeout = options.timeout || 300000;
|
|
104
109
|
const syncDir = options.syncDir || './cerevox-output';
|
|
105
|
-
|
|
110
|
+
let cmd;
|
|
111
|
+
if (type === 'sh') {
|
|
112
|
+
cmd = `cd ${workDir} && chmod +x ${scriptFile} && ${scriptFile}`;
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
cmd = `cd ${workDir} && ${type === 'py' ? 'python3' : 'node'} ${scriptFile}`;
|
|
116
|
+
}
|
|
106
117
|
const ret = await terminal.run(cmd, { timeoutMs: timeout });
|
|
107
118
|
ret.stdout.pipe(process.stdout);
|
|
108
119
|
ret.stderr.pipe(process.stderr);
|
|
109
120
|
return ret.json().then(async (result) => {
|
|
110
121
|
// fs.rmSync('./cerevox-output', { recursive: true });
|
|
111
122
|
await this.session.files.syncDownloadsDirectory(syncDir, workDir);
|
|
112
|
-
return
|
|
123
|
+
return {
|
|
124
|
+
...result,
|
|
125
|
+
syncDir: node_path_1.default.resolve(syncDir),
|
|
126
|
+
};
|
|
113
127
|
});
|
|
114
128
|
}
|
|
115
129
|
};
|
|
116
130
|
exports.CodeRunner = CodeRunner;
|
|
117
131
|
exports.CodeRunner = CodeRunner = __decorate([
|
|
118
|
-
(0, base_1.Logger)({
|
|
132
|
+
(0, base_1.Logger)({ VERSION: constants_1.VERSION }),
|
|
119
133
|
__metadata("design:paramtypes", [session_1.Session])
|
|
120
134
|
], CodeRunner);
|
|
121
135
|
//# sourceMappingURL=code-runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code-runner.js","sourceRoot":"","sources":["../../src/core/code-runner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"code-runner.js","sourceRoot":"","sources":["../../src/core/code-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-system.d.ts","sourceRoot":"","sources":["../../src/core/file-system.ts"],"names":[],"mappings":"AAEA,OAAO,OAA0B,MAAM,KAAK,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAU,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"file-system.d.ts","sourceRoot":"","sources":["../../src/core/file-system.ts"],"names":[],"mappings":"AAEA,OAAO,OAA0B,MAAM,KAAK,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAU,MAAM,QAAQ,CAAC;AAG3C;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,qBACa,UAAW,SAAQ,SAAS;IACvC;;;;OAIG;gBAED,OAAO,EAAE,OAAO,EAChB,OAAO,CAAC,EAAE;QACR,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;KAC1D;IAMH;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAmCpB;;;;;OAKG;IACH,OAAO,CAAC,0BAA0B;IAgClC;;;;;;OAMG;IACH,OAAO,CAAC,aAAa;IAYrB;;;;;OAKG;IACG,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAkChD;;;;;OAKG;IACG,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBjD,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxC;;;;;;OAMG;YACW,sBAAsB;IA6DpC;;;;OAIG;IACG,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAWvE;;;;;OAKG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,CAAA;KAAO,GACxD,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;IAyB3B;;;;OAIG;IACG,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBlE;;;;OAIG;IACG,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYpE;;;;;;OAMG;IACU,sBAAsB,CACjC,IAAI,GAAE,MAAiC,EACvC,GAAG,GAAE,MAA+B,GACnC,OAAO,CAAC,MAAM,CAAC;CAwDnB"}
|
package/dist/core/file-system.js
CHANGED
|
@@ -17,6 +17,7 @@ const promises_1 = __importDefault(require("node:fs/promises"));
|
|
|
17
17
|
const node_path_1 = __importDefault(require("node:path"));
|
|
18
18
|
const e2b_1 = __importDefault(require("e2b"));
|
|
19
19
|
const base_1 = require("./base");
|
|
20
|
+
const constants_1 = require("../utils/constants");
|
|
20
21
|
/**
|
|
21
22
|
* FileSystem 类 - 提供沙箱环境中的文件系统操作功能
|
|
22
23
|
*
|
|
@@ -388,7 +389,7 @@ let FileSystem = class FileSystem extends base_1.BaseClass {
|
|
|
388
389
|
};
|
|
389
390
|
exports.FileSystem = FileSystem;
|
|
390
391
|
exports.FileSystem = FileSystem = __decorate([
|
|
391
|
-
(0, base_1.Logger)({
|
|
392
|
+
(0, base_1.Logger)({ VERSION: constants_1.VERSION }),
|
|
392
393
|
__metadata("design:paramtypes", [e2b_1.default, Object])
|
|
393
394
|
], FileSystem);
|
|
394
395
|
//# sourceMappingURL=file-system.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-system.js","sourceRoot":"","sources":["../../src/core/file-system.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gEAAkC;AAClC,0DAA6B;AAC7B,8CAA6C;AAC7C,iCAA2C;
|
|
1
|
+
{"version":3,"file":"file-system.js","sourceRoot":"","sources":["../../src/core/file-system.ts"],"names":[],"mappings":"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"}
|
package/dist/core/session.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ import { StreamableCommandResponse, Terminal } from './terminal';
|
|
|
4
4
|
import { CodeRunner } from './code-runner';
|
|
5
5
|
import { FileSystem } from './file-system';
|
|
6
6
|
import { Browser } from './browser';
|
|
7
|
+
import { AI } from './ai';
|
|
7
8
|
export declare const sessions: Record<string, Session>;
|
|
8
9
|
export declare class Session extends BaseClass {
|
|
9
10
|
readonly terminal: Terminal;
|
|
@@ -15,6 +16,7 @@ export declare class Session extends BaseClass {
|
|
|
15
16
|
private ws;
|
|
16
17
|
private isClosed;
|
|
17
18
|
private keepAliveTimer;
|
|
19
|
+
readonly ai: AI;
|
|
18
20
|
constructor(sandbox: Sandbox, options?: {
|
|
19
21
|
envs?: Record<string, string>;
|
|
20
22
|
logLevel?: 'debug' | 'info' | 'warn' | 'error' | 'fatal';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAU,MAAM,QAAQ,CAAC;AAC3C,OAAO,EAAE,yBAAyB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,CAAC;AAEpD,qBACa,OAAQ,SAAQ,SAAS;IACpC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,yBAAyB,GAAG,IAAI,CAAQ;IACxD,OAAO,CAAC,kBAAkB,CAA8B;IACxD,OAAO,CAAC,EAAE,CAA0B;IACpC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,cAAc,CAA+B;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,KAAK,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAU,MAAM,QAAQ,CAAC;AAC3C,OAAO,EAAE,yBAAyB,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAE1B,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,CAAC;AAEpD,qBACa,OAAQ,SAAQ,SAAS;IACpC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,yBAAyB,GAAG,IAAI,CAAQ;IACxD,OAAO,CAAC,kBAAkB,CAA8B;IACxD,OAAO,CAAC,EAAE,CAA0B;IACpC,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,cAAc,CAA+B;IACrD,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC;gBAGd,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE;QACP,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;KACrD;IAaR,UAAU;IAIV,OAAO,CAAC,SAAS;IAejB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAiCjD,SAAS;IAIf,IAAI,EAAE,WAEL;IAED,SAAS;IAIT,OAAO,CAAC,IAAI,GAAE,MAAa;IAMrB,UAAU,CAAC,EAAE,EAAE,MAAM;IAIrB,KAAK,CAAC,WAAW,UAAQ;CAgChC"}
|
package/dist/core/session.js
CHANGED
|
@@ -20,6 +20,8 @@ const code_runner_1 = require("./code-runner");
|
|
|
20
20
|
const file_system_1 = require("./file-system");
|
|
21
21
|
const ws_1 = __importDefault(require("ws"));
|
|
22
22
|
const browser_1 = require("./browser");
|
|
23
|
+
const ai_1 = require("./ai");
|
|
24
|
+
const constants_1 = require("../utils/constants");
|
|
23
25
|
exports.sessions = {};
|
|
24
26
|
let Session = class Session extends base_1.BaseClass {
|
|
25
27
|
constructor(sandbox, options = {}) {
|
|
@@ -33,7 +35,8 @@ let Session = class Session extends base_1.BaseClass {
|
|
|
33
35
|
this.files = new file_system_1.FileSystem(sandbox, {
|
|
34
36
|
logLevel: options.logLevel,
|
|
35
37
|
});
|
|
36
|
-
this.browser = new browser_1.Browser(
|
|
38
|
+
this.browser = new browser_1.Browser(this);
|
|
39
|
+
this.ai = new ai_1.AI(this);
|
|
37
40
|
this.codeRunner = new code_runner_1.CodeRunner(this);
|
|
38
41
|
exports.sessions[sandbox.sandboxId] = this;
|
|
39
42
|
}
|
|
@@ -106,14 +109,31 @@ let Session = class Session extends base_1.BaseClass {
|
|
|
106
109
|
async close(forceToKill = false) {
|
|
107
110
|
if (this.ws?.readyState === ws_1.default.OPEN) {
|
|
108
111
|
this.ws?.close();
|
|
112
|
+
clearInterval(this.keepAliveTimer);
|
|
113
|
+
if (this.process) {
|
|
114
|
+
// 主进程，关掉 sandbox
|
|
115
|
+
try {
|
|
116
|
+
this.process.kill();
|
|
117
|
+
if (await this.sandbox.isRunning()) {
|
|
118
|
+
await this.sandbox.kill();
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
catch (error) {
|
|
122
|
+
/* empty */
|
|
123
|
+
}
|
|
124
|
+
}
|
|
109
125
|
}
|
|
110
126
|
this.isClosed = true;
|
|
111
127
|
if (forceToKill) {
|
|
112
128
|
// 主进程
|
|
113
129
|
// await this.process?.kill();
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
130
|
+
try {
|
|
131
|
+
if (await this.sandbox.isRunning()) {
|
|
132
|
+
await this.sandbox.kill();
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
catch (error) {
|
|
136
|
+
/* empty */
|
|
117
137
|
}
|
|
118
138
|
}
|
|
119
139
|
delete exports.sessions[this.id];
|
|
@@ -122,7 +142,7 @@ let Session = class Session extends base_1.BaseClass {
|
|
|
122
142
|
};
|
|
123
143
|
exports.Session = Session;
|
|
124
144
|
exports.Session = Session = __decorate([
|
|
125
|
-
(0, base_1.Logger)({
|
|
145
|
+
(0, base_1.Logger)({ VERSION: constants_1.VERSION }),
|
|
126
146
|
__metadata("design:paramtypes", [e2b_1.default, Object])
|
|
127
147
|
], Session);
|
|
128
148
|
//# sourceMappingURL=session.js.map
|
package/dist/core/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAA0B;AAC1B,iCAA2C;AAC3C,yCAAiE;AACjE,+CAA2C;AAC3C,+CAA2C;AAC3C,4CAA2B;AAC3B,uCAAoC;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../src/core/terminal.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAU,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"terminal.d.ts","sourceRoot":"","sources":["../../src/core/terminal.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAU,MAAM,QAAQ,CAAC;AAE3C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC;;;GAGG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,YAAY;IACZ,MAAM,EAAE,QAAQ,CAAC;IACjB,YAAY;IACZ,MAAM,EAAE,QAAQ,CAAC;IACjB,eAAe;IACf,GAAG,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,aAAa;IACb,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,wBAAwB;IACxB,IAAI,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC;CACpC,CAAC;AAEF;;GAEG;AACH,KAAK,WAAW,GAAG;IACjB,WAAW;IACX,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,WAAW;IACX,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,eAAe;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,qBACa,QAAS,SAAQ,SAAS;IACrC,aAAa;IACb,OAAO,CAAC,GAAG,CAAc;IACzB,WAAW;IACX,OAAO,CAAC,IAAI,CAA8B;IAC1C,cAAc;IACd,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;gBAED,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE;QACP,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9B,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;KACrD;IAWR;;;OAGG;IACG,MAAM;IAMZ;;;;OAIG;YACW,SAAS;IAcvB;;;OAGG;IACH,MAAM;IAeN;;;;;OAKG;IACG,GAAG,CACP,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,WAAW,GACjB,OAAO,CAAC,yBAAyB,CAAC;CA+FtC"}
|
package/dist/core/terminal.js
CHANGED
|
@@ -16,6 +16,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
16
16
|
exports.Terminal = void 0;
|
|
17
17
|
const e2b_1 = __importDefault(require("e2b"));
|
|
18
18
|
const base_1 = require("./base");
|
|
19
|
+
const constants_1 = require("../utils/constants");
|
|
19
20
|
const node_stream_1 = require("node:stream");
|
|
20
21
|
const uuid_1 = require("uuid");
|
|
21
22
|
/**
|
|
@@ -167,13 +168,13 @@ let Terminal = Terminal_1 = class Terminal extends base_1.BaseClass {
|
|
|
167
168
|
stderr: stderrStream,
|
|
168
169
|
end: async () => {
|
|
169
170
|
this.logger.debug('等待命令完成', { terminalId: this.id });
|
|
170
|
-
await res.wait();
|
|
171
|
+
await res.wait().catch(ex => ex.result);
|
|
171
172
|
await this.updateCwd();
|
|
172
173
|
this.logger.debug('命令执行完成', { terminalId: this.id });
|
|
173
174
|
},
|
|
174
175
|
json: async () => {
|
|
175
176
|
this.logger.debug('获取命令执行结果', { terminalId: this.id });
|
|
176
|
-
const ret = await res.wait();
|
|
177
|
+
const ret = await res.wait().catch(ex => ex.result);
|
|
177
178
|
await this.updateCwd();
|
|
178
179
|
this.logger.debug('命令执行结果', {
|
|
179
180
|
terminalId: this.id,
|
|
@@ -184,7 +185,7 @@ let Terminal = Terminal_1 = class Terminal extends base_1.BaseClass {
|
|
|
184
185
|
},
|
|
185
186
|
kill: async () => {
|
|
186
187
|
this.logger.debug('终止命令执行', { terminalId: this.id });
|
|
187
|
-
await res.kill();
|
|
188
|
+
await res.kill().catch(ex => ex.result);
|
|
188
189
|
stdoutStream.push(null);
|
|
189
190
|
stderrStream.push(null);
|
|
190
191
|
this.logger.debug('命令已被终止', { terminalId: this.id });
|
|
@@ -203,7 +204,7 @@ let Terminal = Terminal_1 = class Terminal extends base_1.BaseClass {
|
|
|
203
204
|
};
|
|
204
205
|
exports.Terminal = Terminal;
|
|
205
206
|
exports.Terminal = Terminal = Terminal_1 = __decorate([
|
|
206
|
-
(0, base_1.Logger)({
|
|
207
|
+
(0, base_1.Logger)({ VERSION: constants_1.VERSION }),
|
|
207
208
|
__metadata("design:paramtypes", [e2b_1.default, Object])
|
|
208
209
|
], Terminal);
|
|
209
210
|
//# sourceMappingURL=terminal.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../src/core/terminal.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"terminal.js","sourceRoot":"","sources":["../../src/core/terminal.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browser-use.d.ts","sourceRoot":"","sources":["../../../src/mcp/servers/browser-use.ts"],"names":[],"mappings":""}
|
|
@@ -10,16 +10,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
10
10
|
const mcp_js_1 = require("@modelcontextprotocol/sdk/server/mcp.js");
|
|
11
11
|
const stdio_js_1 = require("@modelcontextprotocol/sdk/server/stdio.js");
|
|
12
12
|
const zod_1 = require("zod");
|
|
13
|
-
const index_1 = __importDefault(require("
|
|
13
|
+
const index_1 = __importDefault(require("../../index"));
|
|
14
14
|
const open_1 = __importDefault(require("open"));
|
|
15
15
|
/* Configuration
|
|
16
16
|
{
|
|
17
17
|
"mcpServers": {
|
|
18
|
-
"cerevox-
|
|
18
|
+
"cerevox-browser-use": {
|
|
19
19
|
"command": "npx",
|
|
20
|
-
"args": ["-y", "cerevox-
|
|
20
|
+
"args": ["-y", "cerevox-browser-use"],
|
|
21
21
|
"env": {
|
|
22
|
-
"CEREVOX_API_KEY": "ck-**************"
|
|
22
|
+
"CEREVOX_API_KEY": "ck-**************",
|
|
23
|
+
"CEREVOX_SYNC_DIR": "${workspaceFolder}/cerevox-output"
|
|
23
24
|
}
|
|
24
25
|
},
|
|
25
26
|
}
|
|
@@ -153,7 +154,7 @@ browser.close();`;
|
|
|
153
154
|
};
|
|
154
155
|
});
|
|
155
156
|
// 共享的代码执行函数
|
|
156
|
-
async function executePlaywrightCode(code) {
|
|
157
|
+
async function executePlaywrightCode(code, syncDir = process.env.CEREVOX_SYNC_DIR || './cerevox-output') {
|
|
157
158
|
try {
|
|
158
159
|
// 执行传入的 Playwright 代码
|
|
159
160
|
if (!session) {
|
|
@@ -169,33 +170,10 @@ async function executePlaywrightCode(code) {
|
|
|
169
170
|
}
|
|
170
171
|
const result = await codeRunner.run(code, {
|
|
171
172
|
inject: true,
|
|
172
|
-
syncDir
|
|
173
|
+
syncDir,
|
|
173
174
|
});
|
|
174
|
-
// 构建返回结果
|
|
175
|
-
let responseText = '';
|
|
176
|
-
if (result.exitCode === 0) {
|
|
177
|
-
responseText += '✅ 代码执行成功\n\n';
|
|
178
|
-
if (result.stdout) {
|
|
179
|
-
responseText += '📤 标准输出:\n```\n' + result.stdout + '\n```\n\n';
|
|
180
|
-
}
|
|
181
|
-
if (result.stderr) {
|
|
182
|
-
responseText += '⚠️ 警告信息:\n```\n' + result.stderr + '\n```\n\n';
|
|
183
|
-
}
|
|
184
|
-
}
|
|
185
|
-
else {
|
|
186
|
-
responseText += '❌ 代码执行失败\n\n';
|
|
187
|
-
if (result.error) {
|
|
188
|
-
responseText += '🚨 错误信息:\n```\n' + result.error + '\n```\n\n';
|
|
189
|
-
}
|
|
190
|
-
if (result.stdout) {
|
|
191
|
-
responseText += '📤 标准输出:\n```\n' + result.stdout + '\n```\n\n';
|
|
192
|
-
}
|
|
193
|
-
if (result.stderr) {
|
|
194
|
-
responseText += '⚠️ 警告信息:\n```\n' + result.stderr + '\n```\n\n';
|
|
195
|
-
}
|
|
196
|
-
}
|
|
197
175
|
return {
|
|
198
|
-
content: [{ type: 'text', text:
|
|
176
|
+
content: [{ type: 'text', text: JSON.stringify(result) }],
|
|
199
177
|
};
|
|
200
178
|
}
|
|
201
179
|
catch (error) {
|
|
@@ -249,15 +227,18 @@ server.tool('cerevox-code-plan', `Execute Playwright code for strategic analysis
|
|
|
249
227
|
Focus on systematic exploration and strategic analysis to formulate actionable plans.
|
|
250
228
|
The code should gather comprehensive intelligence, analyze element patterns, and develop
|
|
251
229
|
robust strategies for subsequent automation actions.
|
|
252
|
-
|
|
253
|
-
|
|
230
|
+
|
|
231
|
+
**Screenshot Guidelines:**
|
|
232
|
+
- Only take screenshots when necessary for analysis or documentation
|
|
233
|
+
- Always use optimized parameters: \`{ path: 'filename.jpg', type: 'jpeg', quality: 70 }\`
|
|
234
|
+
- This prevents large image files that could cause browser crashes
|
|
254
235
|
|
|
255
236
|
Strategic planning patterns:
|
|
256
237
|
|
|
257
238
|
Example 1 - Page structure analysis:
|
|
258
239
|
\`\`\`typescript
|
|
259
240
|
import { chromium } from 'playwright';
|
|
260
|
-
|
|
241
|
+
|
|
261
242
|
const browser = await chromium.launch();
|
|
262
243
|
const page = await browser.newPage();
|
|
263
244
|
await page.goto('https://example.com');
|
|
@@ -272,8 +253,8 @@ server.tool('cerevox-code-plan', `Execute Playwright code for strategic analysis
|
|
|
272
253
|
console.log('Forms found:', forms.length);
|
|
273
254
|
console.log('Buttons found:', buttons.length);
|
|
274
255
|
|
|
275
|
-
// Take screenshot for visual analysis
|
|
276
|
-
await page.screenshot({ path: '
|
|
256
|
+
// Take screenshot only if needed for visual analysis
|
|
257
|
+
await page.screenshot({ path: 'page_analysis.jpg', type: 'jpeg', quality: 70 });
|
|
277
258
|
|
|
278
259
|
await browser.close();
|
|
279
260
|
\`\`\`
|
|
@@ -348,8 +329,11 @@ server.tool('cerevox-code-action', `Execute Playwright code to perform precise a
|
|
|
348
329
|
The code should implement the strategic plan developed in the planning phase,
|
|
349
330
|
executing precise actions with confidence and handling edge cases effectively.
|
|
350
331
|
Focus on goal achievement and robust execution based on gathered intelligence.
|
|
351
|
-
|
|
352
|
-
|
|
332
|
+
|
|
333
|
+
**Screenshot Guidelines:**
|
|
334
|
+
- Only take screenshots when necessary for verification or documentation
|
|
335
|
+
- Always use optimized parameters: \`{ path: 'filename.jpg', type: 'jpeg', quality: 70 }\`
|
|
336
|
+
- This prevents large image files that could cause browser crashes
|
|
353
337
|
|
|
354
338
|
Strategic execution patterns:
|
|
355
339
|
|
|
@@ -366,9 +350,9 @@ server.tool('cerevox-code-action', `Execute Playwright code to perform precise a
|
|
|
366
350
|
await page.fill('input[name="password"]', 'password123');
|
|
367
351
|
await page.click('button[type="submit"]');
|
|
368
352
|
|
|
369
|
-
// Wait for result and capture
|
|
353
|
+
// Wait for result and capture only if needed
|
|
370
354
|
await page.waitForNavigation();
|
|
371
|
-
await page.screenshot({ path: '
|
|
355
|
+
await page.screenshot({ path: 'result.jpg', type: 'jpeg', quality: 70 });
|
|
372
356
|
|
|
373
357
|
const result = await page.textContent('.success-message');
|
|
374
358
|
console.log('Action result:', result);
|
|
@@ -411,4 +395,4 @@ async function main() {
|
|
|
411
395
|
console.log('Server started');
|
|
412
396
|
}
|
|
413
397
|
main();
|
|
414
|
-
//# sourceMappingURL=
|
|
398
|
+
//# sourceMappingURL=browser-use.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browser-use.js","sourceRoot":"","sources":["../../../src/mcp/servers/browser-use.ts"],"names":[],"mappings":"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"}
|