fix: pass apify client down to output job log wherever possible (#839)

Author: vladfrangu

src/commands/actors/push.ts

@@ -300,7 +300,7 @@ Skipping push. Use --force to override.`,
 		});
 
 		try {
-			await outputJobLog(build, waitForFinishMillis);
+			await outputJobLog({ job: build, timeoutMillis: waitForFinishMillis, apifyClient });
 		} catch (err) {
 			warning({ message: 'Can not get log:' });
 			console.error(err);

src/commands/builds/create.ts

@@ -136,7 +136,7 @@ export class BuildsCreateCommand extends ApifyCommand<typeof BuildsCreateCommand
 
 		if (log) {
 			try {
-				await outputJobLog(build);
+				await outputJobLog({ job: build, apifyClient: client });
 			} catch (err) {
 				// This should never happen...
 				error({

src/commands/builds/log.ts

@@ -29,7 +29,7 @@ export class BuildLogCommand extends ApifyCommand<typeof BuildLogCommand> {
 		info({ message: `Log for build with ID "${buildId}":\n` });
 
 		try {
-			await outputJobLog(build);
+			await outputJobLog({ job: build, apifyClient });
 		} catch (err) {
 			// This should never happen...
 			error({

src/commands/runs/log.ts

@@ -29,7 +29,7 @@ export class RunsLogCommand extends ApifyCommand<typeof RunsLogCommand> {
 		info({ message: `Log for run with ID "${runId}":\n`, stdout: true });
 
 		try {
-			await outputJobLog(run);
+			await outputJobLog({ job: run, apifyClient });
 		} catch (err) {
 			// This should never happen...
 			error({ message: `Failed to get log for run with ID "${runId}": ${(err as Error).message}` });

src/lib/commands/run-on-cloud.ts

@@ -95,7 +95,7 @@ export async function* runActorOrTaskOnCloud(apifyClient: ApifyClient, options:
 
 	if (!silent && printRunLogs) {
 		try {
-			const res = await outputJobLog(run, waitForFinishMillis);
+			const res = await outputJobLog({ job: run, timeoutMillis: waitForFinishMillis, apifyClient });
 
 			if (res === 'timeouts') {
 				console.error(`\n${chalk.gray('Timeout for printing logs was hit, there may be future logs.')}\n`);

src/lib/utils.ts

@@ -390,25 +390,33 @@ export const purgeDefaultKeyValueStore = async () => {
 	await Promise.all(deletePromises);
 };
 
-export const outputJobLog = async (job: ActorRun | Build, timeout?: number) => {
+export const outputJobLog = async ({
+	job,
+	timeoutMillis,
+	apifyClient,
+}: {
+	job: ActorRun | Build;
+	timeoutMillis?: number;
+	apifyClient?: ApifyClient;
+}) => {
 	const { id: logId, status } = job;
-	const apifyClient = new ApifyClient({ baseUrl: process.env.APIFY_CLIENT_BASE_URL });
+	const client = apifyClient || new ApifyClient({ baseUrl: process.env.APIFY_CLIENT_BASE_URL });
 
 	// In case job was already done just output log
 	if (ACTOR_JOB_TERMINAL_STATUSES.includes(status as never)) {
 		if (process.env.APIFY_NO_LOGS_IN_TESTS) {
 			return;
 		}
 
-		const log = await apifyClient.log(logId).get();
+		const log = await client.log(logId).get();
 		process.stderr.write(log!);
 		return;
 	}
 
 	// In other case stream it to stderr
 	// eslint-disable-next-line no-async-promise-executor
 	return new Promise<'no-logs' | 'finished' | 'timeouts'>(async (resolve) => {
-		const stream = await apifyClient.log(logId).stream();
+		const stream = await client.log(logId).stream();
 
 		if (!stream) {
 			resolve('no-logs');
@@ -435,11 +443,11 @@ export const outputJobLog = async (job: ActorRun | Build, timeout?: number) => {
 			}
 		});
 
-		if (timeout) {
+		if (timeoutMillis) {
 			nodeTimeout = setTimeout(() => {
 				stream.destroy();
 				resolve('timeouts');
-			}, timeout);
+			}, timeoutMillis);
 		}
 	});
 };