camofox-browser 2.1.0 → 2.4.1
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/CHANGELOG.md +126 -0
- package/README.md +304 -33
- package/dist/src/cli/commands/content.d.ts.map +1 -1
- package/dist/src/cli/commands/content.js +37 -0
- package/dist/src/cli/commands/content.js.map +1 -1
- package/dist/src/cli/commands/core.d.ts.map +1 -1
- package/dist/src/cli/commands/core.js +21 -4
- package/dist/src/cli/commands/core.js.map +1 -1
- package/dist/src/cli/commands/interaction.d.ts.map +1 -1
- package/dist/src/cli/commands/interaction.js +5 -14
- package/dist/src/cli/commands/interaction.js.map +1 -1
- package/dist/src/cli/commands/navigation.d.ts.map +1 -1
- package/dist/src/cli/commands/navigation.js +12 -6
- package/dist/src/cli/commands/navigation.js.map +1 -1
- package/dist/src/cli/commands/server.d.ts.map +1 -1
- package/dist/src/cli/commands/server.js +9 -3
- package/dist/src/cli/commands/server.js.map +1 -1
- package/dist/src/cli/commands/session.d.ts.map +1 -1
- package/dist/src/cli/commands/session.js +23 -5
- package/dist/src/cli/commands/session.js.map +1 -1
- package/dist/src/cli/server/manager.d.ts +1 -0
- package/dist/src/cli/server/manager.d.ts.map +1 -1
- package/dist/src/cli/server/manager.js +7 -12
- package/dist/src/cli/server/manager.js.map +1 -1
- package/dist/src/middleware/lifecycle-activity.d.ts +9 -0
- package/dist/src/middleware/lifecycle-activity.d.ts.map +1 -0
- package/dist/src/middleware/lifecycle-activity.js +21 -0
- package/dist/src/middleware/lifecycle-activity.js.map +1 -0
- package/dist/src/openapi/spec.d.ts +4 -0
- package/dist/src/openapi/spec.d.ts.map +1 -0
- package/dist/src/openapi/spec.js +730 -0
- package/dist/src/openapi/spec.js.map +1 -0
- package/dist/src/routes/core.d.ts.map +1 -1
- package/dist/src/routes/core.js +428 -53
- package/dist/src/routes/core.js.map +1 -1
- package/dist/src/routes/docs.d.ts +3 -0
- package/dist/src/routes/docs.d.ts.map +1 -0
- package/dist/src/routes/docs.js +23 -0
- package/dist/src/routes/docs.js.map +1 -0
- package/dist/src/routes/openclaw.d.ts.map +1 -1
- package/dist/src/routes/openclaw.js +244 -90
- package/dist/src/routes/openclaw.js.map +1 -1
- package/dist/src/server.js +55 -4
- package/dist/src/server.js.map +1 -1
- package/dist/src/services/context-pool.d.ts +19 -3
- package/dist/src/services/context-pool.d.ts.map +1 -1
- package/dist/src/services/context-pool.js +248 -65
- package/dist/src/services/context-pool.js.map +1 -1
- package/dist/src/services/download.d.ts +2 -0
- package/dist/src/services/download.d.ts.map +1 -1
- package/dist/src/services/download.js +110 -80
- package/dist/src/services/download.js.map +1 -1
- package/dist/src/services/lifecycle-controller.d.ts +40 -0
- package/dist/src/services/lifecycle-controller.d.ts.map +1 -0
- package/dist/src/services/lifecycle-controller.js +106 -0
- package/dist/src/services/lifecycle-controller.js.map +1 -0
- package/dist/src/services/resource-extractor.d.ts +1 -0
- package/dist/src/services/resource-extractor.d.ts.map +1 -1
- package/dist/src/services/resource-extractor.js +7 -0
- package/dist/src/services/resource-extractor.js.map +1 -1
- package/dist/src/services/session.d.ts +84 -2
- package/dist/src/services/session.d.ts.map +1 -1
- package/dist/src/services/session.js +349 -47
- package/dist/src/services/session.js.map +1 -1
- package/dist/src/services/structured-extractor.d.ts +39 -0
- package/dist/src/services/structured-extractor.d.ts.map +1 -0
- package/dist/src/services/structured-extractor.js +487 -0
- package/dist/src/services/structured-extractor.js.map +1 -0
- package/dist/src/services/tab.d.ts +30 -3
- package/dist/src/services/tab.d.ts.map +1 -1
- package/dist/src/services/tab.js +877 -124
- package/dist/src/services/tab.js.map +1 -1
- package/dist/src/services/tracing.d.ts +7 -0
- package/dist/src/services/tracing.d.ts.map +1 -1
- package/dist/src/services/tracing.js +162 -19
- package/dist/src/services/tracing.js.map +1 -1
- package/dist/src/services/vnc.d.ts.map +1 -1
- package/dist/src/services/vnc.js +5 -3
- package/dist/src/services/vnc.js.map +1 -1
- package/dist/src/services/youtube.js +1 -1
- package/dist/src/services/youtube.js.map +1 -1
- package/dist/src/types.d.ts +71 -1
- package/dist/src/types.d.ts.map +1 -1
- package/dist/src/utils/config.d.ts +79 -3
- package/dist/src/utils/config.d.ts.map +1 -1
- package/dist/src/utils/config.js +145 -3
- package/dist/src/utils/config.js.map +1 -1
- package/dist/src/utils/presets.d.ts.map +1 -1
- package/dist/src/utils/presets.js +3 -1
- package/dist/src/utils/presets.js.map +1 -1
- package/dist/src/utils/proxy-profiles.d.ts +18 -0
- package/dist/src/utils/proxy-profiles.d.ts.map +1 -0
- package/dist/src/utils/proxy-profiles.js +197 -0
- package/dist/src/utils/proxy-profiles.js.map +1 -0
- package/dist/src/utils/sidecar-version.d.ts +12 -0
- package/dist/src/utils/sidecar-version.d.ts.map +1 -0
- package/dist/src/utils/sidecar-version.js +63 -0
- package/dist/src/utils/sidecar-version.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/openclaw.plugin.json +39 -0
- package/package.json +16 -4
- package/plugin.ts +949 -0
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.registerContentCommands = registerContentCommands;
|
|
4
|
+
const node_fs_1 = require("node:fs");
|
|
4
5
|
const command_helpers_1 = require("../utils/command-helpers");
|
|
5
6
|
const session_resolver_1 = require("../utils/session-resolver");
|
|
6
7
|
const http_1 = require("../transport/http");
|
|
@@ -53,7 +54,43 @@ function toSearchUrl(engine, query) {
|
|
|
53
54
|
return `https://www.google.com/search?q=${encoded}`;
|
|
54
55
|
}
|
|
55
56
|
}
|
|
57
|
+
function parseStructuredSchemaArg(input) {
|
|
58
|
+
let raw = input;
|
|
59
|
+
if (input.startsWith('@')) {
|
|
60
|
+
try {
|
|
61
|
+
raw = (0, node_fs_1.readFileSync)(input.slice(1), 'utf8');
|
|
62
|
+
}
|
|
63
|
+
catch (error) {
|
|
64
|
+
throw new Error(`Cannot load structured schema from file: ${error instanceof Error ? error.message : String(error)}`);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
try {
|
|
68
|
+
return JSON.parse(raw);
|
|
69
|
+
}
|
|
70
|
+
catch (error) {
|
|
71
|
+
throw new Error(`Invalid structured schema JSON: ${error instanceof Error ? error.message : String(error)}`);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
56
74
|
function registerContentCommands(program, context) {
|
|
75
|
+
program
|
|
76
|
+
.command('extract-structured')
|
|
77
|
+
.argument('<schemaOrFile>', 'JSON schema string or @path/to/schema.json')
|
|
78
|
+
.argument('[tabId]', 'tab id (defaults to active tab)')
|
|
79
|
+
.option('--user <user>', 'user id')
|
|
80
|
+
.action(async (schemaOrFile, tabIdArg, options, command) => {
|
|
81
|
+
try {
|
|
82
|
+
const userId = (0, command_helpers_1.resolveCommandUser)({ command, user: options.user });
|
|
83
|
+
const tabId = (0, command_helpers_1.requireTabId)((0, session_resolver_1.resolveTabId)({ tabId: tabIdArg }), options);
|
|
84
|
+
const schema = parseStructuredSchemaArg(schemaOrFile);
|
|
85
|
+
const response = await context
|
|
86
|
+
.getTransport()
|
|
87
|
+
.post(`/tabs/${encodeURIComponent(tabId)}/extract-structured`, { userId, schema });
|
|
88
|
+
context.print(command, response.data);
|
|
89
|
+
}
|
|
90
|
+
catch (error) {
|
|
91
|
+
context.handleError(error);
|
|
92
|
+
}
|
|
93
|
+
});
|
|
57
94
|
program
|
|
58
95
|
.command('get-text')
|
|
59
96
|
.argument('[tabId]', 'tab id (defaults to active tab)')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content.js","sourceRoot":"","sources":["../../../../src/cli/commands/content.ts"],"names":[],"mappings":";;AAqEA,0DA0RC;AA7VD,8DAA4E;AAC5E,gEAAyD;AACzD,4CAA8C;AAa9C,MAAM,cAAc,GAA4B;IAC/C,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,MAAM;IACN,QAAQ;IACR,YAAY;IACZ,QAAQ;IACR,eAAe;CACf,CAAC;AAEF,SAAS,YAAY,CAAC,KAAyB;IAC9C,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAC/E,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,SAAS,WAAW,CAAC,KAAyB;IAC7C,MAAM,MAAM,GAAG,CAAC,KAAK,IAAI,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;IACjD,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAsB,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,KAAK,CAAC,4CAA4C,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3F,CAAC;IACD,OAAO,MAAsB,CAAC;AAC/B,CAAC;AAED,SAAS,WAAW,CAAC,MAAoB,EAAE,KAAa;IACvD,MAAM,OAAO,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC1C,QAAQ,MAAM,EAAE,CAAC;QAChB,KAAK,QAAQ;YACZ,OAAO,mCAAmC,OAAO,EAAE,CAAC;QACrD,KAAK,SAAS;YACb,OAAO,gDAAgD,OAAO,EAAE,CAAC;QAClE,KAAK,QAAQ;YACZ,OAAO,8BAA8B,OAAO,EAAE,CAAC;QAChD,KAAK,MAAM;YACV,OAAO,iCAAiC,OAAO,EAAE,CAAC;QACnD,KAAK,QAAQ;YACZ,OAAO,mCAAmC,OAAO,EAAE,CAAC;QACrD,KAAK,YAAY;YAChB,OAAO,6BAA6B,OAAO,EAAE,CAAC;QAC/C,KAAK,QAAQ;YACZ,OAAO,+BAA+B,OAAO,EAAE,CAAC;QACjD,KAAK,eAAe;YACnB,OAAO,sCAAsC,OAAO,EAAE,CAAC;QACxD;YACC,OAAO,mCAAmC,OAAO,EAAE,CAAC;IACtD,CAAC;AACF,CAAC;AAED,SAAgB,uBAAuB,CAAC,OAAgB,EAAE,OAAmB;IAC5E,OAAO;SACL,OAAO,CAAC,UAAU,CAAC;SACnB,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;SACtD,MAAM,CAAC,uBAAuB,EAAE,mCAAmC,CAAC;SACpE,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;SAClC,MAAM,CAAC,KAAK,EAAE,QAA4B,EAAE,OAA6C,EAAE,OAAgB,EAAE,EAAE;QAC/G,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,IAAA,oCAAkB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACnE,MAAM,KAAK,GAAG,IAAA,8BAAY,EAAC,IAAA,+BAAY,EAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YACvE,MAAM,IAAI,GAA4B,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;YACxD,IAAI,OAAO,CAAC,QAAQ;gBAAE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;YAEvD,IAAI,IAAa,CAAC;YAClB,IAAI,CAAC;gBACJ,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBACtE,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,CAAC,KAAK,YAAY,gBAAS,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC3D,MAAM,KAAK,CAAC;gBACb,CAAC;gBACD,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC;gBAC/D,MAAM,IAAI,GAAG,kDAAkD,WAAW,yDAAyD,CAAC;gBACpI,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CACrD,SAAS,kBAAkB,CAAC,KAAK,CAAC,WAAW,EAC7C,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,CAC5B,CAAC;gBACF,MAAM,OAAO,GAAG,YAAY,CAAC,IAA6C,CAAC;gBAC3E,IAAI,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC;YACnD,CAAC;YAED,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CAAC,CAAC;IAEJ,OAAO;SACL,OAAO,CAAC,SAAS,CAAC;SAClB,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;SACtD,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;SAClC,MAAM,CAAC,KAAK,EAAE,QAA4B,EAAE,OAA0B,EAAE,OAAgB,EAAE,EAAE;QAC5F,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,IAAA,oCAAkB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACnE,MAAM,KAAK,GAAG,IAAA,8BAAY,EAAC,IAAA,+BAAY,EAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YACvE,IAAI,IAAa,CAAC;YAElB,IAAI,CAAC;gBACJ,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;gBAClF,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,CAAC,KAAK,YAAY,gBAAS,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC3D,MAAM,KAAK,CAAC;gBACb,CAAC;gBACD,MAAM,KAAK,GAAG,MAAM,OAAO;qBACzB,YAAY,EAAE;qBACd,GAAG,CAAmB,SAAS,kBAAkB,CAAC,KAAK,CAAC,iBAAiB,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACzG,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC;YACrC,CAAC;YAED,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAC1C,IAAI,MAAM,KAAK,OAAO,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACpD,MAAM,GAAG,GAAI,IAA0B,EAAE,GAAG,CAAC;gBAC7C,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBAC7D,OAAO;YACR,CAAC;YACD,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CAAC,CAAC;IAEJ,OAAO;SACL,OAAO,CAAC,WAAW,CAAC;SACpB,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;SACtD,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;SAClC,MAAM,CAAC,KAAK,EAAE,QAA4B,EAAE,OAA0B,EAAE,OAAgB,EAAE,EAAE;QAC5F,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,IAAA,oCAAkB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACnE,MAAM,KAAK,GAAG,IAAA,8BAAY,EAAC,IAAA,+BAAY,EAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YAEvE,IAAI,IAAa,CAAC;YAClB,IAAI,CAAC;gBACJ,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;gBACpF,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,CAAC,KAAK,YAAY,gBAAS,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC3D,MAAM,KAAK,CAAC;gBACb,CAAC;gBACD,MAAM,QAAQ,GAAG,MAAM,OAAO;qBAC5B,YAAY,EAAE;qBACd,GAAG,CACH,SAAS,kBAAkB,CAAC,KAAK,CAAC,iBAAiB,kBAAkB,CAAC,MAAM,CAAC,sBAAsB,CACnG,CAAC;gBACH,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAED,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAC1C,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;gBACxB,MAAM,KAAK,GACV,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;oBACnB,CAAC,CAAC,IAAI;oBACN,CAAC,CAAE,IAAiD,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;gBACrE,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBAChC,IAAI,OAAO,IAAI,KAAK,QAAQ;wBAAE,OAAO,IAAI,CAAC;oBAC1C,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;wBACtC,MAAM,MAAM,GAAG,IAAyC,CAAC;wBACzD,IAAI,OAAO,MAAM,CAAC,GAAG,KAAK,QAAQ;4BAAE,OAAO,MAAM,CAAC,GAAG,CAAC;wBACtD,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ;4BAAE,OAAO,MAAM,CAAC,IAAI,CAAC;oBACzD,CAAC;oBACD,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;gBACrB,CAAC,CAAC,CAAC;gBACH,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzC,OAAO;YACR,CAAC;YAED,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CAAC,CAAC;IAEJ,OAAO;SACL,OAAO,CAAC,UAAU,CAAC;SACnB,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;SAClC,MAAM,CAAC,KAAK,EAAE,OAA0B,EAAE,OAAgB,EAAE,EAAE;QAC9D,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,IAAA,oCAAkB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACnE,IAAI,IAAa,CAAC;YAElB,IAAI,CAAC;gBACJ,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC5E,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,CAAC,KAAK,YAAY,gBAAS,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC3D,MAAM,KAAK,CAAC;gBACb,CAAC;gBACD,MAAM,QAAQ,GAAG,MAAM,OAAO;qBAC5B,YAAY,EAAE;qBACd,GAAG,CAAuB,gBAAgB,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC1E,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAED,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CAAC,CAAC;IAEJ,OAAO;SACL,OAAO,CAAC,MAAM,CAAC;SACf,QAAQ,CAAC,cAAc,EAAE,mDAAmD,CAAC;SAC7E,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;SACtD,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;SAClC,MAAM,CAAC,KAAK,EAAE,UAAkB,EAAE,QAA4B,EAAE,OAA0B,EAAE,OAAgB,EAAE,EAAE;QAChH,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,IAAA,oCAAkB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACnE,MAAM,KAAK,GAAG,IAAA,8BAAY,EAAC,IAAA,+BAAY,EAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YAEvE,IAAI,IAAa,CAAC;YAClB,IAAI,CAAC;gBACJ,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE;oBAC/D,KAAK;oBACL,MAAM;oBACN,UAAU;iBACV,CAAC,CAAC;gBACH,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,CAAC,KAAK,YAAY,gBAAS,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC3D,MAAM,KAAK,CAAC;gBACb,CAAC;gBACD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,SAAS,kBAAkB,CAAC,KAAK,CAAC,WAAW,EAAE;oBACjG,MAAM;oBACN,UAAU;iBACV,CAAC,CAAC;gBACH,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAED,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CAAC,CAAC;IAEJ,OAAO;SACL,OAAO,CAAC,MAAM,CAAC;SACf,QAAQ,CAAC,aAAa,EAAE,sCAAsC,CAAC;SAC/D,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;SACtD,MAAM,CAAC,gBAAgB,EAAE,yBAAyB,CAAC;SACnD,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;SAClC,MAAM,CACN,KAAK,EACJ,SAAiB,EACjB,QAA4B,EAC5B,OAA4C,EAC5C,OAAgB,EACf,EAAE;QACH,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,IAAA,oCAAkB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACnE,MAAM,KAAK,GAAG,IAAA,8BAAY,EAAC,IAAA,+BAAY,EAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YACvE,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC9C,MAAM,WAAW,GAAG,CAAC,OAAO,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC;YAC9C,MAAM,IAAI,GAA4B,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;YACnE,IAAI,OAAO,KAAK,SAAS;gBAAE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YAElD,IAAI,CAAC;gBACJ,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;YAClF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,CAAC,KAAK,YAAY,gBAAS,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC3D,MAAM,KAAK,CAAC;gBACb,CAAC;gBAED,MAAM,UAAU,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;gBAC3C,IAAI,UAAU,KAAK,YAAY,IAAI,UAAU,KAAK,aAAa,EAAE,CAAC;oBACjE,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,SAAS,kBAAkB,CAAC,KAAK,CAAC,OAAO,EAAE;wBAC5E,MAAM;wBACN,OAAO;wBACP,cAAc,EAAE,UAAU,KAAK,aAAa;qBAC5C,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;gBAChC,CAAC;qBAAM,CAAC;oBACP,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;oBAC/C,MAAM,SAAS,GAAG,OAAO,IAAI,KAAK,CAAC;oBACnC,MAAM,UAAU,GAAG,0DAA0D,YAAY,sCAAsC,SAAS,kQAAkQ,CAAC;oBAC3Y,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,SAAS,kBAAkB,CAAC,KAAK,CAAC,WAAW,EAAE;wBAChF,MAAM;wBACN,UAAU;wBACV,OAAO,EAAE,SAAS,GAAG,IAAI;qBACzB,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;gBAChC,CAAC;YACF,CAAC;YAED,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QACjD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CACD,CAAC;IAEH,OAAO;SACL,OAAO,CAAC,QAAQ,CAAC;SACjB,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;SACnC,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;SACtD,MAAM,CAAC,mBAAmB,EAAE,mEAAmE,EAAE,QAAQ,CAAC;SAC1G,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;SAClC,MAAM,CACN,KAAK,EACJ,KAAa,EACb,QAA4B,EAC5B,OAA2C,EAC3C,OAAgB,EACf,EAAE;QACH,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,IAAA,oCAAkB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACnE,MAAM,KAAK,GAAG,IAAA,8BAAY,EAAC,IAAA,+BAAY,EAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YACvE,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAE3C,IAAI,IAAa,CAAC;YAClB,IAAI,CAAC;gBACJ,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE;oBACjE,KAAK;oBACL,MAAM;oBACN,KAAK;oBACL,MAAM;iBACN,CAAC,CAAC;gBACH,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,CAAC,KAAK,YAAY,gBAAS,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC3D,MAAM,KAAK,CAAC;gBACb,CAAC;gBACD,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBACvC,MAAM,QAAQ,GAAG,MAAM,OAAO;qBAC5B,YAAY,EAAE;qBACd,IAAI,CAAC,SAAS,kBAAkB,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;gBACvE,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAED,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CACD,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"content.js","sourceRoot":"","sources":["../../../../src/cli/commands/content.ts"],"names":[],"mappings":";;AAyFA,0DAoTC;AA7YD,qCAAuC;AAIvC,8DAA4E;AAC5E,gEAAyD;AACzD,4CAA8C;AAa9C,MAAM,cAAc,GAA4B;IAC/C,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,MAAM;IACN,QAAQ;IACR,YAAY;IACZ,QAAQ;IACR,eAAe;CACf,CAAC;AAEF,SAAS,YAAY,CAAC,KAAyB;IAC9C,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;IAC/E,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,SAAS,WAAW,CAAC,KAAyB;IAC7C,MAAM,MAAM,GAAG,CAAC,KAAK,IAAI,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;IACjD,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAsB,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,KAAK,CAAC,4CAA4C,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3F,CAAC;IACD,OAAO,MAAsB,CAAC;AAC/B,CAAC;AAED,SAAS,WAAW,CAAC,MAAoB,EAAE,KAAa;IACvD,MAAM,OAAO,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC1C,QAAQ,MAAM,EAAE,CAAC;QAChB,KAAK,QAAQ;YACZ,OAAO,mCAAmC,OAAO,EAAE,CAAC;QACrD,KAAK,SAAS;YACb,OAAO,gDAAgD,OAAO,EAAE,CAAC;QAClE,KAAK,QAAQ;YACZ,OAAO,8BAA8B,OAAO,EAAE,CAAC;QAChD,KAAK,MAAM;YACV,OAAO,iCAAiC,OAAO,EAAE,CAAC;QACnD,KAAK,QAAQ;YACZ,OAAO,mCAAmC,OAAO,EAAE,CAAC;QACrD,KAAK,YAAY;YAChB,OAAO,6BAA6B,OAAO,EAAE,CAAC;QAC/C,KAAK,QAAQ;YACZ,OAAO,+BAA+B,OAAO,EAAE,CAAC;QACjD,KAAK,eAAe;YACnB,OAAO,sCAAsC,OAAO,EAAE,CAAC;QACxD;YACC,OAAO,mCAAmC,OAAO,EAAE,CAAC;IACtD,CAAC;AACF,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAa;IAC9C,IAAI,GAAG,GAAG,KAAK,CAAC;IAChB,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3B,IAAI,CAAC;YACJ,GAAG,GAAG,IAAA,sBAAY,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CACd,4CAA4C,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CACpG,CAAC;QACH,CAAC;IACF,CAAC;IACD,IAAI,CAAC;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAY,CAAC;IACnC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,mCAAmC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAC9G,CAAC;AACF,CAAC;AAED,SAAgB,uBAAuB,CAAC,OAAgB,EAAE,OAAmB;IAC5E,OAAO;SACL,OAAO,CAAC,oBAAoB,CAAC;SAC7B,QAAQ,CAAC,gBAAgB,EAAE,4CAA4C,CAAC;SACxE,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;SACtD,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;SAClC,MAAM,CACN,KAAK,EACJ,YAAoB,EACpB,QAA4B,EAC5B,OAA0B,EAC1B,OAAgB,EACf,EAAE;QACH,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,IAAA,oCAAkB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACnE,MAAM,KAAK,GAAG,IAAA,8BAAY,EAAC,IAAA,+BAAY,EAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YACvE,MAAM,MAAM,GAAG,wBAAwB,CAAC,YAAY,CAAC,CAAC;YACtD,MAAM,QAAQ,GAAG,MAAM,OAAO;iBAC5B,YAAY,EAAE;iBACd,IAAI,CAAC,SAAS,kBAAkB,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;YACpF,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CACD,CAAC;IAEH,OAAO;SACL,OAAO,CAAC,UAAU,CAAC;SACnB,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;SACtD,MAAM,CAAC,uBAAuB,EAAE,mCAAmC,CAAC;SACpE,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;SAClC,MAAM,CAAC,KAAK,EAAE,QAA4B,EAAE,OAA6C,EAAE,OAAgB,EAAE,EAAE;QAC/G,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,IAAA,oCAAkB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACnE,MAAM,KAAK,GAAG,IAAA,8BAAY,EAAC,IAAA,+BAAY,EAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YACvE,MAAM,IAAI,GAA4B,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;YACxD,IAAI,OAAO,CAAC,QAAQ;gBAAE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;YAEvD,IAAI,IAAa,CAAC;YAClB,IAAI,CAAC;gBACJ,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gBACtE,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,CAAC,KAAK,YAAY,gBAAS,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC3D,MAAM,KAAK,CAAC;gBACb,CAAC;gBACD,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC;gBAC/D,MAAM,IAAI,GAAG,kDAAkD,WAAW,yDAAyD,CAAC;gBACpI,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CACrD,SAAS,kBAAkB,CAAC,KAAK,CAAC,WAAW,EAC7C,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,CAC5B,CAAC;gBACF,MAAM,OAAO,GAAG,YAAY,CAAC,IAA6C,CAAC;gBAC3E,IAAI,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC;YACnD,CAAC;YAED,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CAAC,CAAC;IAEJ,OAAO;SACL,OAAO,CAAC,SAAS,CAAC;SAClB,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;SACtD,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;SAClC,MAAM,CAAC,KAAK,EAAE,QAA4B,EAAE,OAA0B,EAAE,OAAgB,EAAE,EAAE;QAC5F,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,IAAA,oCAAkB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACnE,MAAM,KAAK,GAAG,IAAA,8BAAY,EAAC,IAAA,+BAAY,EAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YACvE,IAAI,IAAa,CAAC;YAElB,IAAI,CAAC;gBACJ,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;gBAClF,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,CAAC,KAAK,YAAY,gBAAS,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC3D,MAAM,KAAK,CAAC;gBACb,CAAC;gBACD,MAAM,KAAK,GAAG,MAAM,OAAO;qBACzB,YAAY,EAAE;qBACd,GAAG,CAAmB,SAAS,kBAAkB,CAAC,KAAK,CAAC,iBAAiB,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACzG,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC;YACrC,CAAC;YAED,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAC1C,IAAI,MAAM,KAAK,OAAO,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACpD,MAAM,GAAG,GAAI,IAA0B,EAAE,GAAG,CAAC;gBAC7C,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBAC7D,OAAO;YACR,CAAC;YACD,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CAAC,CAAC;IAEJ,OAAO;SACL,OAAO,CAAC,WAAW,CAAC;SACpB,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;SACtD,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;SAClC,MAAM,CAAC,KAAK,EAAE,QAA4B,EAAE,OAA0B,EAAE,OAAgB,EAAE,EAAE;QAC5F,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,IAAA,oCAAkB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACnE,MAAM,KAAK,GAAG,IAAA,8BAAY,EAAC,IAAA,+BAAY,EAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YAEvE,IAAI,IAAa,CAAC;YAClB,IAAI,CAAC;gBACJ,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;gBACpF,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,CAAC,KAAK,YAAY,gBAAS,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC3D,MAAM,KAAK,CAAC;gBACb,CAAC;gBACD,MAAM,QAAQ,GAAG,MAAM,OAAO;qBAC5B,YAAY,EAAE;qBACd,GAAG,CACH,SAAS,kBAAkB,CAAC,KAAK,CAAC,iBAAiB,kBAAkB,CAAC,MAAM,CAAC,sBAAsB,CACnG,CAAC;gBACH,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAED,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAC1C,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;gBACxB,MAAM,KAAK,GACV,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;oBACnB,CAAC,CAAC,IAAI;oBACN,CAAC,CAAE,IAAiD,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;gBACrE,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBAChC,IAAI,OAAO,IAAI,KAAK,QAAQ;wBAAE,OAAO,IAAI,CAAC;oBAC1C,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;wBACtC,MAAM,MAAM,GAAG,IAAyC,CAAC;wBACzD,IAAI,OAAO,MAAM,CAAC,GAAG,KAAK,QAAQ;4BAAE,OAAO,MAAM,CAAC,GAAG,CAAC;wBACtD,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ;4BAAE,OAAO,MAAM,CAAC,IAAI,CAAC;oBACzD,CAAC;oBACD,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;gBACrB,CAAC,CAAC,CAAC;gBACH,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzC,OAAO;YACR,CAAC;YAED,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CAAC,CAAC;IAEJ,OAAO;SACL,OAAO,CAAC,UAAU,CAAC;SACnB,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;SAClC,MAAM,CAAC,KAAK,EAAE,OAA0B,EAAE,OAAgB,EAAE,EAAE;QAC9D,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,IAAA,oCAAkB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACnE,IAAI,IAAa,CAAC;YAElB,IAAI,CAAC;gBACJ,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC5E,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,CAAC,KAAK,YAAY,gBAAS,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC3D,MAAM,KAAK,CAAC;gBACb,CAAC;gBACD,MAAM,QAAQ,GAAG,MAAM,OAAO;qBAC5B,YAAY,EAAE;qBACd,GAAG,CAAuB,gBAAgB,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAC1E,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAED,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CAAC,CAAC;IAEJ,OAAO;SACL,OAAO,CAAC,MAAM,CAAC;SACf,QAAQ,CAAC,cAAc,EAAE,mDAAmD,CAAC;SAC7E,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;SACtD,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;SAClC,MAAM,CAAC,KAAK,EAAE,UAAkB,EAAE,QAA4B,EAAE,OAA0B,EAAE,OAAgB,EAAE,EAAE;QAChH,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,IAAA,oCAAkB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACnE,MAAM,KAAK,GAAG,IAAA,8BAAY,EAAC,IAAA,+BAAY,EAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YAEvE,IAAI,IAAa,CAAC;YAClB,IAAI,CAAC;gBACJ,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE;oBAC/D,KAAK;oBACL,MAAM;oBACN,UAAU;iBACV,CAAC,CAAC;gBACH,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,CAAC,KAAK,YAAY,gBAAS,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC3D,MAAM,KAAK,CAAC;gBACb,CAAC;gBACD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,SAAS,kBAAkB,CAAC,KAAK,CAAC,WAAW,EAAE;oBACjG,MAAM;oBACN,UAAU;iBACV,CAAC,CAAC;gBACH,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAED,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CAAC,CAAC;IAEJ,OAAO;SACL,OAAO,CAAC,MAAM,CAAC;SACf,QAAQ,CAAC,aAAa,EAAE,sCAAsC,CAAC;SAC/D,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;SACtD,MAAM,CAAC,gBAAgB,EAAE,yBAAyB,CAAC;SACnD,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;SAClC,MAAM,CACN,KAAK,EACJ,SAAiB,EACjB,QAA4B,EAC5B,OAA4C,EAC5C,OAAgB,EACf,EAAE;QACH,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,IAAA,oCAAkB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACnE,MAAM,KAAK,GAAG,IAAA,8BAAY,EAAC,IAAA,+BAAY,EAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YACvE,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC9C,MAAM,WAAW,GAAG,CAAC,OAAO,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC;YAC9C,MAAM,IAAI,GAA4B,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;YACnE,IAAI,OAAO,KAAK,SAAS;gBAAE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YAElD,IAAI,CAAC;gBACJ,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;YAClF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,CAAC,KAAK,YAAY,gBAAS,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC3D,MAAM,KAAK,CAAC;gBACb,CAAC;gBAED,MAAM,UAAU,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;gBAC3C,IAAI,UAAU,KAAK,YAAY,IAAI,UAAU,KAAK,aAAa,EAAE,CAAC;oBACjE,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,SAAS,kBAAkB,CAAC,KAAK,CAAC,OAAO,EAAE;wBAC5E,MAAM;wBACN,OAAO;wBACP,cAAc,EAAE,UAAU,KAAK,aAAa;qBAC5C,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;gBAChC,CAAC;qBAAM,CAAC;oBACP,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;oBAC/C,MAAM,SAAS,GAAG,OAAO,IAAI,KAAK,CAAC;oBACnC,MAAM,UAAU,GAAG,0DAA0D,YAAY,sCAAsC,SAAS,kQAAkQ,CAAC;oBAC3Y,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,SAAS,kBAAkB,CAAC,KAAK,CAAC,WAAW,EAAE;wBAChF,MAAM;wBACN,UAAU;wBACV,OAAO,EAAE,SAAS,GAAG,IAAI;qBACzB,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;gBAChC,CAAC;YACF,CAAC;YAED,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QACjD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CACD,CAAC;IAEH,OAAO;SACL,OAAO,CAAC,QAAQ,CAAC;SACjB,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;SACnC,QAAQ,CAAC,SAAS,EAAE,iCAAiC,CAAC;SACtD,MAAM,CAAC,mBAAmB,EAAE,mEAAmE,EAAE,QAAQ,CAAC;SAC1G,MAAM,CAAC,eAAe,EAAE,SAAS,CAAC;SAClC,MAAM,CACN,KAAK,EACJ,KAAa,EACb,QAA4B,EAC5B,OAA2C,EAC3C,OAAgB,EACf,EAAE;QACH,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,IAAA,oCAAkB,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;YACnE,MAAM,KAAK,GAAG,IAAA,8BAAY,EAAC,IAAA,+BAAY,EAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YACvE,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAE3C,IAAI,IAAa,CAAC;YAClB,IAAI,CAAC;gBACJ,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE;oBACjE,KAAK;oBACL,MAAM;oBACN,KAAK;oBACL,MAAM;iBACN,CAAC,CAAC;gBACH,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,CAAC,KAAK,YAAY,gBAAS,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;oBAC3D,MAAM,KAAK,CAAC;gBACb,CAAC;gBACD,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBACvC,MAAM,QAAQ,GAAG,MAAM,OAAO;qBAC5B,YAAY,EAAE;qBACd,IAAI,CAAC,SAAS,kBAAkB,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;gBACvE,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;YACtB,CAAC;YAED,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACF,CAAC,CACD,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAW3C,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAW3C,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CAiJhF"}
|
|
@@ -21,16 +21,33 @@ function registerCoreCommands(program, context) {
|
|
|
21
21
|
.option('--user <user>', 'user id')
|
|
22
22
|
.option('--viewport <WxH>', 'viewport like 1280x720')
|
|
23
23
|
.option('--geo <preset>', 'geo preset name')
|
|
24
|
+
.option('--proxy-profile <name>', 'named proxy profile')
|
|
25
|
+
.option('--proxy-host <host>', 'session-level proxy host')
|
|
26
|
+
.option('--proxy-port <port>', 'session-level proxy port')
|
|
27
|
+
.option('--proxy-username <user>', 'session-level proxy username')
|
|
28
|
+
.option('--proxy-password <pass>', 'session-level proxy password')
|
|
29
|
+
.option('--geo-mode <mode>', 'explicit-wins or proxy-locked')
|
|
24
30
|
.action(async (url, options, command) => {
|
|
25
31
|
try {
|
|
26
32
|
const userId = (0, command_helpers_1.resolveCommandUser)({ command, user: options.user });
|
|
27
33
|
const viewport = parseViewport(options.viewport);
|
|
28
|
-
const
|
|
34
|
+
const proxy = options.proxyHost && options.proxyPort
|
|
35
|
+
? {
|
|
36
|
+
host: options.proxyHost,
|
|
37
|
+
port: parseInt(options.proxyPort, 10),
|
|
38
|
+
username: options.proxyUsername,
|
|
39
|
+
password: options.proxyPassword,
|
|
40
|
+
}
|
|
41
|
+
: undefined;
|
|
42
|
+
const response = await context.getTransport().post('/tabs', {
|
|
29
43
|
url,
|
|
30
44
|
userId,
|
|
31
|
-
|
|
45
|
+
sessionKey: 'default',
|
|
32
46
|
viewport,
|
|
33
|
-
|
|
47
|
+
preset: options.geo,
|
|
48
|
+
proxyProfile: options.proxyProfile,
|
|
49
|
+
proxy,
|
|
50
|
+
geoMode: options.geoMode,
|
|
34
51
|
});
|
|
35
52
|
const tabId = response.data.tabId ?? response.data.targetId;
|
|
36
53
|
if (!tabId) {
|
|
@@ -44,7 +61,7 @@ function registerCoreCommands(program, context) {
|
|
|
44
61
|
context.handleError(error);
|
|
45
62
|
}
|
|
46
63
|
})
|
|
47
|
-
.addHelpText('after', `\nExamples:\n $ camofox open https://google.com\n $ camofox open https://gmail.com --user myaccount\n`);
|
|
64
|
+
.addHelpText('after', `\nExamples:\n $ camofox open https://google.com\n $ camofox open https://gmail.com --user myaccount\n $ camofox open https://example.com --proxy-profile tokyo-exit\n $ camofox open https://example.com --proxy-host proxy.example.com --proxy-port 8080\n`);
|
|
48
65
|
program
|
|
49
66
|
.command('close')
|
|
50
67
|
.description('Close tab')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../../src/cli/commands/core.ts"],"names":[],"mappings":";;AAgBA,
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../../src/cli/commands/core.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interaction.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/interaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAsD3C,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"interaction.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/interaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAsD3C,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CA+LvF"}
|
|
@@ -112,20 +112,11 @@ function registerInteractionCommands(program, context) {
|
|
|
112
112
|
if (!(error instanceof http_1.HttpError) || error.status !== 404) {
|
|
113
113
|
throw error;
|
|
114
114
|
}
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
});
|
|
121
|
-
}
|
|
122
|
-
else {
|
|
123
|
-
await context.getTransport().post(`/tabs/${encodeURIComponent(tabId)}/scroll`, {
|
|
124
|
-
userId,
|
|
125
|
-
direction,
|
|
126
|
-
amount,
|
|
127
|
-
});
|
|
128
|
-
}
|
|
115
|
+
await context.getTransport().post(`/tabs/${encodeURIComponent(tabId)}/scroll`, {
|
|
116
|
+
userId,
|
|
117
|
+
direction,
|
|
118
|
+
amount,
|
|
119
|
+
});
|
|
129
120
|
}
|
|
130
121
|
context.print(command, { ok: true, direction, amount: amount ?? null });
|
|
131
122
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interaction.js","sourceRoot":"","sources":["../../../../src/cli/commands/interaction.ts"],"names":[],"mappings":";;AA2DA,
|
|
1
|
+
{"version":3,"file":"interaction.js","sourceRoot":"","sources":["../../../../src/cli/commands/interaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/navigation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAY3C,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/navigation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAY3C,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CA4GtF"}
|
|
@@ -25,18 +25,24 @@ function registerNavigationCommands(program, context) {
|
|
|
25
25
|
try {
|
|
26
26
|
const userId = (0, command_helpers_1.resolveCommandUser)({ command, user: options.user });
|
|
27
27
|
const tabId = (0, command_helpers_1.requireTabId)((0, session_resolver_1.resolveTabId)({ tabId: tabIdArg }), options);
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
url,
|
|
32
|
-
|
|
28
|
+
let body;
|
|
29
|
+
if (url.startsWith('@')) {
|
|
30
|
+
const spaceIdx = url.indexOf(' ');
|
|
31
|
+
const macro = spaceIdx === -1 ? url : url.slice(0, spaceIdx);
|
|
32
|
+
const query = spaceIdx === -1 ? '' : url.slice(spaceIdx + 1);
|
|
33
|
+
body = { targetId: tabId, userId, macro, query };
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
body = { targetId: tabId, userId, url };
|
|
37
|
+
}
|
|
38
|
+
await context.getTransport().post('/navigate', body);
|
|
33
39
|
context.print(command, { ok: true, tabId, url });
|
|
34
40
|
}
|
|
35
41
|
catch (error) {
|
|
36
42
|
context.handleError(error);
|
|
37
43
|
}
|
|
38
44
|
})
|
|
39
|
-
.addHelpText('after', `\nExamples:\n $ camofox navigate https://example.com\n $ camofox
|
|
45
|
+
.addHelpText('after', `\nExamples:\n $ camofox navigate https://example.com\n $ camofox navigate "@google_search weather today"\n`);
|
|
40
46
|
program
|
|
41
47
|
.command('screenshot')
|
|
42
48
|
.description('Take screenshot')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigation.js","sourceRoot":"","sources":["../../../../src/cli/commands/navigation.ts"],"names":[],"mappings":";;AAoBA,
|
|
1
|
+
{"version":3,"file":"navigation.js","sourceRoot":"","sources":["../../../../src/cli/commands/navigation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/server.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAOxD,KAAK,UAAU,GAAG;IACjB,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,YAAY,CAAC;IAC9C,KAAK,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IACjD,WAAW,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,KAAK,CAAC;CACvC,CAAC;AAWF,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CAyFlF"}
|
|
@@ -5,6 +5,7 @@ const node_child_process_1 = require("node:child_process");
|
|
|
5
5
|
const node_path_1 = require("node:path");
|
|
6
6
|
const command_helpers_1 = require("../utils/command-helpers");
|
|
7
7
|
const manager_1 = require("../server/manager");
|
|
8
|
+
const config_1 = require("../../utils/config");
|
|
8
9
|
const SERVER_BIN_PATH = (0, node_path_1.resolve)(__dirname, '../../../../bin/camofox-browser.js');
|
|
9
10
|
function parseIdleTimeoutMinutes(input) {
|
|
10
11
|
if (!input)
|
|
@@ -22,18 +23,22 @@ function registerServerCommands(program, context) {
|
|
|
22
23
|
.option('--port <port>', 'server port')
|
|
23
24
|
.option('--background', 'start daemon in background')
|
|
24
25
|
.option('--idle-timeout <minutes>', 'idle timeout in minutes')
|
|
26
|
+
.option('--idle-exit-timeout <minutes>', 'daemon exit timeout in minutes after cleanup stage')
|
|
25
27
|
.action(async (options, command) => {
|
|
26
28
|
try {
|
|
29
|
+
const cfg = (0, config_1.loadConfig)();
|
|
27
30
|
const port = options.port ? (0, command_helpers_1.parsePort)(options.port) : undefined;
|
|
28
31
|
const idleTimeoutMinutes = parseIdleTimeoutMinutes(options.idleTimeout);
|
|
29
32
|
const idleTimeoutMs = idleTimeoutMinutes ? Math.floor(idleTimeoutMinutes * 60_000) : undefined;
|
|
33
|
+
const idleExitTimeoutMinutes = parseIdleTimeoutMinutes(options.idleExitTimeout);
|
|
34
|
+
const idleExitTimeoutMs = idleExitTimeoutMinutes ? Math.floor(idleExitTimeoutMinutes * 60_000) : undefined;
|
|
30
35
|
const manager = new manager_1.ServerManager(port);
|
|
31
36
|
if (await manager.isRunning()) {
|
|
32
37
|
context.print(command, `Server already running on port ${manager_1.ServerManager.getPort(port)}`);
|
|
33
38
|
return;
|
|
34
39
|
}
|
|
35
40
|
if (options.background) {
|
|
36
|
-
await manager.startDaemon({ port, idleTimeoutMs });
|
|
41
|
+
await manager.startDaemon({ port, idleTimeoutMs, idleExitTimeoutMs });
|
|
37
42
|
await manager.waitForReady();
|
|
38
43
|
context.print(command, { ok: true, mode: 'background', port: manager_1.ServerManager.getPort(port) });
|
|
39
44
|
return;
|
|
@@ -41,9 +46,10 @@ function registerServerCommands(program, context) {
|
|
|
41
46
|
const child = (0, node_child_process_1.spawn)(process.execPath, [SERVER_BIN_PATH, 'serve'], {
|
|
42
47
|
stdio: 'inherit',
|
|
43
48
|
env: {
|
|
44
|
-
...
|
|
49
|
+
...cfg.serverEnv,
|
|
45
50
|
PORT: String(manager_1.ServerManager.getPort(port)),
|
|
46
|
-
CAMOFOX_IDLE_TIMEOUT_MS: String(idleTimeoutMs ??
|
|
51
|
+
CAMOFOX_IDLE_TIMEOUT_MS: String(idleTimeoutMs ?? cfg.idleTimeoutMs),
|
|
52
|
+
CAMOFOX_IDLE_EXIT_TIMEOUT_MS: String(idleExitTimeoutMs ?? cfg.idleExitTimeoutMs),
|
|
47
53
|
},
|
|
48
54
|
});
|
|
49
55
|
child.on('exit', (code, signal) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/cli/commands/server.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/cli/commands/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/session.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/session.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AA8H3C,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CAwJnF"}
|
|
@@ -52,19 +52,35 @@ async function getCookiesForTab(context, tabId, userId) {
|
|
|
52
52
|
function readSessionFile(sessionName) {
|
|
53
53
|
ensureSessionsDir();
|
|
54
54
|
const filePath = getSessionFilePath(sessionName);
|
|
55
|
-
const
|
|
56
|
-
|
|
57
|
-
|
|
55
|
+
const content = (0, node_fs_1.readFileSync)(filePath, 'utf8');
|
|
56
|
+
let raw;
|
|
57
|
+
try {
|
|
58
|
+
raw = JSON.parse(content);
|
|
59
|
+
}
|
|
60
|
+
catch (err) {
|
|
61
|
+
throw new Error(`Corrupt session file "${sessionName}": ${err instanceof Error ? err.message : String(err)}. Delete ${filePath} to reset.`);
|
|
62
|
+
}
|
|
63
|
+
if (Array.isArray(raw)) {
|
|
58
64
|
return {
|
|
65
|
+
version: 1,
|
|
59
66
|
sessionName,
|
|
60
67
|
userId: '',
|
|
61
68
|
tabId: '',
|
|
62
69
|
savedAt: new Date().toISOString(),
|
|
63
|
-
cookies:
|
|
70
|
+
cookies: raw,
|
|
64
71
|
};
|
|
65
72
|
}
|
|
73
|
+
if (!raw || typeof raw !== 'object') {
|
|
74
|
+
throw new Error(`Invalid session file "${sessionName}": expected JSON object or array. Delete ${filePath} to reset.`);
|
|
75
|
+
}
|
|
76
|
+
const data = raw;
|
|
77
|
+
const version = typeof data.version === 'number' ? data.version : 0;
|
|
78
|
+
if (version > 1) {
|
|
79
|
+
throw new Error(`Session file "${sessionName}" uses version ${version}, but this build only supports up to version 1. Upgrade camofox-browser or delete ${filePath} to reset.`);
|
|
80
|
+
}
|
|
66
81
|
const cookies = Array.isArray(data.cookies) ? data.cookies : [];
|
|
67
82
|
return {
|
|
83
|
+
version: 1,
|
|
68
84
|
sessionName,
|
|
69
85
|
userId: typeof data.userId === 'string' ? data.userId : '',
|
|
70
86
|
tabId: typeof data.tabId === 'string' ? data.tabId : '',
|
|
@@ -77,7 +93,8 @@ function readSessionFile(sessionName) {
|
|
|
77
93
|
function writeSessionFile(payload) {
|
|
78
94
|
ensureSessionsDir();
|
|
79
95
|
const filePath = getSessionFilePath(payload.sessionName);
|
|
80
|
-
|
|
96
|
+
const withVersion = { ...payload, version: 1 };
|
|
97
|
+
(0, fs_helpers_1.atomicWrite)(filePath, `${JSON.stringify(withVersion, null, 2)}\n`, { mode: 0o600 });
|
|
81
98
|
return filePath;
|
|
82
99
|
}
|
|
83
100
|
function isErrnoException(error) {
|
|
@@ -98,6 +115,7 @@ function registerSessionCommands(program, context) {
|
|
|
98
115
|
const cookies = await getCookiesForTab(context, tabId, userId);
|
|
99
116
|
const savedAt = new Date().toISOString();
|
|
100
117
|
const filePath = writeSessionFile({
|
|
118
|
+
version: 1,
|
|
101
119
|
sessionName,
|
|
102
120
|
userId,
|
|
103
121
|
tabId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../src/cli/commands/session.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../src/cli/commands/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../src/cli/server/manager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../src/cli/server/manager.ts"],"names":[],"mappings":"AAQA,MAAM,WAAW,YAAY;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;CAClB;AAID,qBAAa,aAAa;IACzB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;gBAEzB,IAAI,CAAC,EAAE,MAAM;WAOX,OAAO,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM;IAOvC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ9B,WAAW,CAAC,OAAO,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmC3G,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAuB3B,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC;IAqB/B,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAkB7B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;YAe5B,WAAW;IAQzB,OAAO,CAAC,iBAAiB;IAKzB,OAAO,CAAC,OAAO;IAUf,OAAO,CAAC,kBAAkB;IAO1B,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,UAAU;YASJ,KAAK;YAOL,WAAW;IAoBzB,OAAO,CAAC,MAAM,CAAC,WAAW;CAG1B"}
|
|
@@ -5,9 +5,8 @@ const node_fs_1 = require("node:fs");
|
|
|
5
5
|
const node_os_1 = require("node:os");
|
|
6
6
|
const node_path_1 = require("node:path");
|
|
7
7
|
const node_child_process_1 = require("node:child_process");
|
|
8
|
+
const config_1 = require("../../utils/config");
|
|
8
9
|
const node_net_1 = require("node:net");
|
|
9
|
-
const DEFAULT_PORT = 9377;
|
|
10
|
-
const DEFAULT_IDLE_TIMEOUT_MS = 30 * 60 * 1000;
|
|
11
10
|
const SERVER_BIN_PATH = (0, node_path_1.resolve)(__dirname, '../../../../bin/camofox-browser.js');
|
|
12
11
|
class ServerManager {
|
|
13
12
|
port;
|
|
@@ -24,14 +23,7 @@ class ServerManager {
|
|
|
24
23
|
if (typeof overridePort === 'number' && ServerManager.isValidPort(overridePort)) {
|
|
25
24
|
return overridePort;
|
|
26
25
|
}
|
|
27
|
-
|
|
28
|
-
if (envPort) {
|
|
29
|
-
const parsed = Number(envPort);
|
|
30
|
-
if (ServerManager.isValidPort(parsed)) {
|
|
31
|
-
return parsed;
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
return DEFAULT_PORT;
|
|
26
|
+
return (0, config_1.loadConfig)().port;
|
|
35
27
|
}
|
|
36
28
|
async ensureRunning() {
|
|
37
29
|
const running = await this.isRunning();
|
|
@@ -48,13 +40,16 @@ class ServerManager {
|
|
|
48
40
|
}
|
|
49
41
|
const logFd = (0, node_fs_1.openSync)(this.logFilePath, 'a');
|
|
50
42
|
try {
|
|
43
|
+
const cfg = (0, config_1.loadConfig)();
|
|
51
44
|
const child = (0, node_child_process_1.spawn)(process.execPath, [SERVER_BIN_PATH], {
|
|
52
45
|
detached: true,
|
|
53
46
|
stdio: ['ignore', logFd, logFd],
|
|
54
47
|
env: {
|
|
55
|
-
...
|
|
48
|
+
...cfg.serverEnv,
|
|
56
49
|
PORT: String(targetPort),
|
|
57
|
-
CAMOFOX_IDLE_TIMEOUT_MS: String(options?.idleTimeoutMs ??
|
|
50
|
+
CAMOFOX_IDLE_TIMEOUT_MS: String(options?.idleTimeoutMs ?? cfg.idleTimeoutMs),
|
|
51
|
+
CAMOFOX_IDLE_EXIT_TIMEOUT_MS: String(options?.idleExitTimeoutMs ?? cfg.idleExitTimeoutMs),
|
|
52
|
+
CAMOFOX_SERVER_PID_FILE: this.pidFilePath,
|
|
58
53
|
},
|
|
59
54
|
});
|
|
60
55
|
if (!child.pid) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../src/cli/server/manager.ts"],"names":[],"mappings":";;;AAAA,qCAA0G;AAC1G,qCAAkC;AAClC,yCAA0C;AAC1C,2DAA2C;
|
|
1
|
+
{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../src/cli/server/manager.ts"],"names":[],"mappings":"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"}
|