@intuned/runtime-dev 1.7.0-dev-52-10 → 1.9.0-dev-52
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/.babelrc +2 -2
- package/dist/commands/api/run.js +2 -2
- package/dist/commands/cli-auth-sessions/create.js +1 -1
- package/dist/commands/cli-auth-sessions/utils.js +2 -1
- package/dist/commands/common/browserUtils.d.ts +1 -1
- package/dist/commands/common/browserUtils.js +1 -1
- package/dist/commands/common/getFirstLineNumber.js +4 -2
- package/dist/commands/deploy/utils.js +2 -1
- package/dist/commands/interface/run.js +6 -5
- package/dist/commands/run-api-cli/utils.js +6 -6
- package/dist/common/assets/browser_scripts.js +2143 -2509
- package/dist/common/contextStorageStateHelpers.d.ts +1 -1
- package/dist/common/contextStorageStateHelpers.js +1 -17
- package/dist/common/getPlaywrightConstructs.d.ts +1 -1
- package/dist/common/getPlaywrightConstructs.js +12 -4
- package/dist/common/jwtTokenManager.js +5 -3
- package/dist/common/runApi/errors.js +5 -4
- package/dist/common/runApi/index.d.ts +1 -1
- package/dist/common/runApi/index.js +11 -8
- package/dist/runtime/executionHelpers.test.js +4 -3
- package/dist/runtime/export.d.ts +0 -15
- package/dist/runtime/extendPayload.js +1 -1
- package/package.json +3 -2
package/.babelrc
CHANGED
package/dist/commands/api/run.js
CHANGED
|
@@ -96,7 +96,7 @@ async function executeCLI(apiName, mode, inputData, options) {
|
|
|
96
96
|
_Logger.logger.info("This will only take an effect if this API run was part of a job.");
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
|
-
_commander.program.description("run the user function in the cli for testing purposes").option("-i, --input [file]", "input json file").option("-j, --json [json]", "input json string").option("--cdpAddress <cdpAddress>", "CDP address", "http://localhost:9222").option("--authSessionPath <authSession>", "auth session to use when executing the api").option("--outputFileId <outputFileId>", "the output file id to save the result in").option("--proxy <proxy>", "proxy to use").option("--
|
|
99
|
+
_commander.program.description("run the user function in the cli for testing purposes").option("-i, --input [file]", "input json file").option("-j, --json [json]", "input json string").option("--cdpAddress <cdpAddress>", "CDP address", "http://localhost:9222").option("--authSessionPath <authSession>", "auth session to use when executing the api").option("--outputFileId <outputFileId>", "the output file id to save the result in").option("--proxy <proxy>", "proxy to use").option("--authSessionPath <authSessionParameters>", "parameters used to create the used auth session").argument("[apiName]", "name of the api", "default").allowUnknownOption().addArgument(new _commander.Argument("<mode>", "mode of execution").choices(["vanilla", "playwright", "playwright-standalone", "playwright-headless"]).default("playwright-standalone").argOptional()).action(async (apiName, mode, options) => {
|
|
100
100
|
let inputData = null;
|
|
101
101
|
if (options.input) {
|
|
102
102
|
inputData = await fs.readJSON(options.input);
|
|
@@ -106,7 +106,7 @@ _commander.program.description("run the user function in the cli for testing pur
|
|
|
106
106
|
inputData = {};
|
|
107
107
|
}
|
|
108
108
|
let authSessionParametersJson = undefined;
|
|
109
|
-
if (!(0, _isNil.default)(options
|
|
109
|
+
if (!(0, _isNil.default)(options === null || options === void 0 ? void 0 : options.authSessionParameters)) {
|
|
110
110
|
authSessionParametersJson = JSON.parse(options.authSessionParameters);
|
|
111
111
|
}
|
|
112
112
|
await (0, _asyncLocalStorage.runWithContext)({
|
|
@@ -32,7 +32,7 @@ _commander.program.description("Create an auth session").argument("[auth-session
|
|
|
32
32
|
if (!createApiExists) {
|
|
33
33
|
throw new Error("Auth session create API not implemented, please create it in the auth sessions specified directory");
|
|
34
34
|
}
|
|
35
|
-
const authSessionInput = (await (0, _utils2.loadParameters)(options
|
|
35
|
+
const authSessionInput = (await (0, _utils2.loadParameters)(options === null || options === void 0 ? void 0 : options.input)) ?? {};
|
|
36
36
|
const session = await (0, _utils.runCreateApi)(authSessionInput);
|
|
37
37
|
if (!session) {
|
|
38
38
|
console.error(_chalk.default.red("Failed to create auth session."));
|
|
@@ -32,8 +32,9 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
|
|
|
32
32
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
33
33
|
async function isAuthEnabled() {
|
|
34
34
|
try {
|
|
35
|
+
var _intunedJson$authSess;
|
|
35
36
|
const intunedJson = await fs.readJSON(_path.default.join(process.cwd(), "Intuned.json"));
|
|
36
|
-
return Boolean(intunedJson
|
|
37
|
+
return Boolean(intunedJson === null || intunedJson === void 0 || (_intunedJson$authSess = intunedJson.authSessions) === null || _intunedJson$authSess === void 0 ? void 0 : _intunedJson$authSess.enabled);
|
|
37
38
|
} catch (error) {
|
|
38
39
|
return false;
|
|
39
40
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BrowserContext } from "playwright";
|
|
1
|
+
import { BrowserContext } from "playwright-core";
|
|
2
2
|
export declare const REMOTE_DEBUGGING_PORT = 9222;
|
|
3
3
|
export declare const getChromiumLaunchArgs: () => string[];
|
|
4
4
|
export declare function startOrRestartBrowser(): Promise<void>;
|
|
@@ -9,7 +9,7 @@ exports.saveSession = saveSession;
|
|
|
9
9
|
exports.saveSessionFromOpenedBrowser = saveSessionFromOpenedBrowser;
|
|
10
10
|
exports.startOrRestartBrowser = startOrRestartBrowser;
|
|
11
11
|
var _child_process = require("child_process");
|
|
12
|
-
var playwright = _interopRequireWildcard(require("playwright"));
|
|
12
|
+
var playwright = _interopRequireWildcard(require("playwright-core"));
|
|
13
13
|
var fs = _interopRequireWildcard(require("fs-extra"));
|
|
14
14
|
var _fileUtils = require("./utils/fileUtils");
|
|
15
15
|
var _contextStorageStateHelpers = require("../../common/contextStorageStateHelpers");
|
|
@@ -32,9 +32,10 @@ function compileTypeScript(apiFilePath) {
|
|
|
32
32
|
};
|
|
33
33
|
}
|
|
34
34
|
function findFirstExecutableLine(sourceFile) {
|
|
35
|
+
var _defaultExportSymbol$;
|
|
35
36
|
let functionBody;
|
|
36
37
|
const defaultExportSymbol = sourceFile.getDefaultExportSymbol();
|
|
37
|
-
const defaultExportDeclaration = defaultExportSymbol
|
|
38
|
+
const defaultExportDeclaration = defaultExportSymbol === null || defaultExportSymbol === void 0 || (_defaultExportSymbol$ = defaultExportSymbol.getDeclarations()) === null || _defaultExportSymbol$ === void 0 ? void 0 : _defaultExportSymbol$[0];
|
|
38
39
|
if (defaultExportDeclaration) {
|
|
39
40
|
if (defaultExportDeclaration.getKind() === _tsMorph.ts.SyntaxKind.FunctionDeclaration) {
|
|
40
41
|
functionBody = defaultExportDeclaration.getBody();
|
|
@@ -44,8 +45,9 @@ function findFirstExecutableLine(sourceFile) {
|
|
|
44
45
|
const expression = exportAssignment.getExpression();
|
|
45
46
|
if (!expression) continue;
|
|
46
47
|
if (expression.getKind() === _tsMorph.ts.SyntaxKind.Identifier || expression.getKind() === _tsMorph.ts.SyntaxKind.FunctionExpression || expression.getKind() === _tsMorph.ts.SyntaxKind.ArrowFunction) {
|
|
48
|
+
var _sourceFile$getVariab;
|
|
47
49
|
const identifier = expression.getText();
|
|
48
|
-
const possiblyExportedFunction = sourceFile.getFunction(identifier) || sourceFile.getVariableStatement(identifier)
|
|
50
|
+
const possiblyExportedFunction = sourceFile.getFunction(identifier) || ((_sourceFile$getVariab = sourceFile.getVariableStatement(identifier)) === null || _sourceFile$getVariab === void 0 ? void 0 : _sourceFile$getVariab.getDescendants().find(node => node.getKind() === _tsMorph.ts.SyntaxKind.FunctionExpression || node.getKind() === _tsMorph.ts.SyntaxKind.ArrowFunction));
|
|
49
51
|
if (possiblyExportedFunction) {
|
|
50
52
|
functionBody = possiblyExportedFunction.getBody();
|
|
51
53
|
break;
|
|
@@ -228,12 +228,13 @@ const validateIntunedProject = async () => {
|
|
|
228
228
|
name: "package.json",
|
|
229
229
|
check: async () => {
|
|
230
230
|
try {
|
|
231
|
+
var _packageJson$dependen;
|
|
231
232
|
const packageJsonPath = path.join(currentDirectoryToDeploy, "package.json");
|
|
232
233
|
await fs.exists(packageJsonPath);
|
|
233
234
|
const packageJson = JSON.parse(await fs.readFile(packageJsonPath, {
|
|
234
235
|
encoding: "utf-8"
|
|
235
236
|
}));
|
|
236
|
-
const userCodePlaywrightVersion = packageJson.dependencies
|
|
237
|
+
const userCodePlaywrightVersion = (_packageJson$dependen = packageJson.dependencies) === null || _packageJson$dependen === void 0 ? void 0 : _packageJson$dependen.playwright;
|
|
237
238
|
if (userCodePlaywrightVersion !== _constants.CURRENT_PLAYWRIGHT_VERSION) {
|
|
238
239
|
return {
|
|
239
240
|
isValid: false,
|
|
@@ -29,8 +29,7 @@ const startRunApiSchema = _zod.default.object({
|
|
|
29
29
|
jobId: _zod.default.string().optional(),
|
|
30
30
|
jobRunId: _zod.default.string().optional(),
|
|
31
31
|
runId: _zod.default.string().optional(),
|
|
32
|
-
queueId: _zod.default.string().optional()
|
|
33
|
-
authSessionId: _zod.default.string().optional()
|
|
32
|
+
queueId: _zod.default.string().optional()
|
|
34
33
|
}).optional()
|
|
35
34
|
})
|
|
36
35
|
});
|
|
@@ -67,12 +66,14 @@ function runAutomationCLI(importFunction) {
|
|
|
67
66
|
let generator = null;
|
|
68
67
|
const abortController = new AbortController();
|
|
69
68
|
client.on("error", err => {
|
|
70
|
-
|
|
69
|
+
var _generator;
|
|
70
|
+
void ((_generator = generator) === null || _generator === void 0 ? void 0 : _generator.throw(err).catch(() => undefined));
|
|
71
71
|
});
|
|
72
72
|
const interruptSignalHandler = async () => {
|
|
73
|
+
var _generator2;
|
|
73
74
|
abortController.abort();
|
|
74
75
|
await (0, _promises.setTimeout)(60_000);
|
|
75
|
-
void generator
|
|
76
|
+
void ((_generator2 = generator) === null || _generator2 === void 0 ? void 0 : _generator2.throw(new Error("Interrupted")).catch(() => undefined));
|
|
76
77
|
client.end();
|
|
77
78
|
process.exit(1);
|
|
78
79
|
};
|
|
@@ -213,7 +214,7 @@ function runAutomationCLI(importFunction) {
|
|
|
213
214
|
_commander.program.parse(process.argv);
|
|
214
215
|
}
|
|
215
216
|
function getProxyUrlFromRunOptions(runOptions) {
|
|
216
|
-
if (runOptions
|
|
217
|
+
if ((runOptions === null || runOptions === void 0 ? void 0 : runOptions.environment) !== "standalone") return undefined;
|
|
217
218
|
const proxy = runOptions.proxy;
|
|
218
219
|
if (!proxy) return undefined;
|
|
219
220
|
const url = new URL(proxy.server);
|
|
@@ -62,10 +62,10 @@ async function writeResultToFile(runId, result, payloadToAppend) {
|
|
|
62
62
|
}
|
|
63
63
|
async function runApiViaCLI(apiName, inputData, options) {
|
|
64
64
|
let authSessionPathToUse = null;
|
|
65
|
-
if (options
|
|
65
|
+
if (options !== null && options !== void 0 && options.authSession) {
|
|
66
66
|
const {
|
|
67
67
|
authSessionInstanceStoragePath
|
|
68
|
-
} = await (0, _utils.retrieveAuthSessionInstance)(options
|
|
68
|
+
} = await (0, _utils.retrieveAuthSessionInstance)(options === null || options === void 0 ? void 0 : options.authSession, true);
|
|
69
69
|
authSessionPathToUse = authSessionInstanceStoragePath;
|
|
70
70
|
}
|
|
71
71
|
if (authSessionPathToUse) {
|
|
@@ -82,17 +82,17 @@ async function runApiViaCLI(apiName, inputData, options) {
|
|
|
82
82
|
}
|
|
83
83
|
const {
|
|
84
84
|
metadata
|
|
85
|
-
} = await (0, _utils.retrieveAuthSessionInstance)(options
|
|
86
|
-
if (metadata
|
|
85
|
+
} = await (0, _utils.retrieveAuthSessionInstance)(options === null || options === void 0 ? void 0 : options.authSession);
|
|
86
|
+
if ((metadata === null || metadata === void 0 ? void 0 : metadata.authSessionType) === "MANUAL") {
|
|
87
87
|
throw new Error("Expired Auth session is recorder-based, please provide a new one or refresh it manually");
|
|
88
88
|
}
|
|
89
|
-
const authSessionInput = metadata
|
|
89
|
+
const authSessionInput = (metadata === null || metadata === void 0 ? void 0 : metadata.authSessionInput) ?? {};
|
|
90
90
|
try {
|
|
91
91
|
const refresehAuthSessionInstance = await (0, _utils.runCreateApiViaCLI)(authSessionInput);
|
|
92
92
|
if (!refresehAuthSessionInstance) {
|
|
93
93
|
throw new Error("Failed to refresh auth session");
|
|
94
94
|
}
|
|
95
|
-
await (0, _utils.storeAuthSessionInstance)(refresehAuthSessionInstance, options
|
|
95
|
+
await (0, _utils.storeAuthSessionInstance)(refresehAuthSessionInstance, options === null || options === void 0 ? void 0 : options.authSession, authSessionInput);
|
|
96
96
|
const checkResult = await (0, _utils.runCheckApiViaCLI)(authSessionPathToUse);
|
|
97
97
|
if (!checkResult) {
|
|
98
98
|
throw new Error("Failed to refresh auth session");
|