Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@melt-ui/svelte": "^0.86.5",
"@playwright/test": "^1.55.1",
"@sveltejs/adapter-static": "^3.0.8",
"@sveltejs/kit": "^2.42.1",
"@sveltejs/kit": "^2.49.5",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why the bump?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

audit's failing

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Screenshot 2026-01-16 at 3 18 55 PM

"@sveltejs/vite-plugin-svelte": "^5.0.3",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.6.3",
Expand Down
79 changes: 44 additions & 35 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/lib/helpers/buildTimeout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function isBuildTimedOut(createdAt: string, status: string, timeoutSeconds: numb
const created = new Date(createdAt);
const elapsedSeconds = Math.floor((Date.now() - created.getTime()) / 1000);

return elapsedSeconds > timeoutSeconds;
return elapsedSeconds >= timeoutSeconds;
}

/**
Expand Down
37 changes: 37 additions & 0 deletions src/lib/helpers/executionTimeout.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import type { Models } from '@appwrite.io/console';

/**
* Checks if an execution has exceeded the maximum execution timeout duration
*/
function isExecutionTimedOut(createdAt: string, status: string, timeoutSeconds: number): boolean {
if (!['waiting', 'processing'].includes(status)) {
return false;
}

if (!timeoutSeconds || timeoutSeconds <= 0) {
return false;
}

const created = new Date(createdAt);
const elapsedSeconds = Math.floor((Date.now() - created.getTime()) / 1000);

return elapsedSeconds >= timeoutSeconds;
}

/**
* Gets the effective status for an execution, considering timeout
*/
export function getEffectiveExecutionStatus(
execution: Models.Execution,
func: Models.Function
): string {
const originalStatus = execution.status;
const createdAt = execution.$createdAt;

const timeoutSeconds = func.timeout;
if (isExecutionTimedOut(createdAt, originalStatus, timeoutSeconds)) {
return 'failed';
}

return originalStatus;
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import { logStatusConverter } from './store';
import { LogsRequest, LogsResponse } from '$lib/components/logs';
import { timer } from '$lib/actions/timer';
import { getEffectiveExecutionStatus } from '$lib/helpers/executionTimeout';
import { func } from '../store';

export let selectedLogId: string;
export let logs: Models.Execution[];
Expand All @@ -47,6 +49,7 @@
}

$: selectedLog = logs?.find((log) => log.$id === selectedLogId);
$: effectiveStatus = selectedLog ? getEffectiveExecutionStatus(selectedLog, $func) : null;
$: isFirstLog = logs.findIndex((log) => log.$id === selectedLogId) === 0;
$: isLastLog = logs.findIndex((log) => log.$id === selectedLogId) === logs.length - 1;

Expand Down Expand Up @@ -113,12 +116,12 @@

<Tooltip
disabled={!selectedLog?.scheduledAt ||
selectedLog.status !== ExecutionStatus.Scheduled}
effectiveStatus !== ExecutionStatus.Scheduled}
maxWidth="400px">
<div>
<Status
status={logStatusConverter(selectedLog.status)}
label={capitalize(selectedLog.status)}>
status={logStatusConverter(effectiveStatus)}
label={capitalize(effectiveStatus)}>
</Status>
</div>
<span slot="tooltip">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import DualTimeView from '$lib/components/dualTimeView.svelte';
import { func } from '../store';
import { sdk } from '$lib/stores/sdk';
import { getEffectiveExecutionStatus } from '$lib/helpers/executionTimeout';
import { page } from '$app/state';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
import { invalidate } from '$app/navigation';
Expand Down Expand Up @@ -66,6 +67,7 @@

{#snippet children(root)}
{#each executions.executions as log (log.$id)}
{@const effectiveStatus = getEffectiveExecutionStatus(log, $func)}
<Table.Row.Button
{root}
id={log.$id}
Expand Down Expand Up @@ -100,14 +102,14 @@
{:else if column.id === 'trigger'}
{capitalize(log.trigger)}
{:else if column.id === 'status'}
{@const status = log.status}
<Tooltip
disabled={!log?.scheduledAt || status !== ExecutionStatus.Scheduled}
disabled={!log?.scheduledAt ||
effectiveStatus !== ExecutionStatus.Scheduled}
maxWidth="400px">
<div>
<Status
status={logStatusConverter(status)}
label={capitalize(status)}>
status={logStatusConverter(effectiveStatus)}
label={capitalize(effectiveStatus)}>
</Status>
</div>
<span slot="tooltip">
Expand Down