@oomol-lab/open-connector 1.8.0 → 1.9.0

package/src/server/storage/connection-store.js

@@ -1,4 +1,5 @@
 import { HttpRequestError } from "../api/http-utils.js";
+import { initializeRetirement, lockRetirement, retirementMatches } from "./connection-retirement.js";
 import { queueSaasConnections, readSaasConnection } from "./saas-project-store.js";
 /** Connection writes share the request transaction so replacing/deleting remote references cannot lose cleanup work. */
 export class SqlConnectionStore {
@@ -34,17 +35,46 @@ export class SqlConnectionStore {
         ]);
         return Promise.all(rows.map((row) => this.read(row)));
     }
+    async getRetirementGeneration(service, connectionName) {
+        const [, [row]] = await this.transaction([
+            initializeRetirement(service, connectionName, crypto.randomUUID()),
+            {
+                sql: "select generation from connection_retirements where service = ? and connection_name = ?",
+                values: [service, connectionName],
+            },
+        ]);
+        return row.generation;
+    }
     async set(service, connectionName, credential) {
+        const stored = await this.writeCredential(service, connectionName, credential);
+        if (!stored)
+            throw new Error("Connection upsert did not return the stored row.");
+        return stored;
+    }
+    async setIfCurrentGeneration(service, connectionName, credential, retirementGeneration) {
+        return this.writeCredential(service, connectionName, credential, retirementGeneration);
+    }
+    async writeCredential(service, connectionName, credential, retirementGeneration) {
+        const fence = retirementGeneration === undefined
+            ? { sql: "1 = 1", values: [] }
+            : retirementMatches(service, connectionName, retirementGeneration);
         const value = await this.codec.encode(JSON.stringify(credential));
-        const [, , [row]] = await this.transaction([
+        const [[accepted], , , [row]] = await this.transaction([
+            retirementGeneration === undefined
+                ? { sql: "select 1", values: [] }
+                : lockRetirement(service, connectionName, retirementGeneration),
             {
                 sql: "update connections set revision = revision where service = ? and connection_name = ?",
                 values: [service, connectionName],
             },
-            queueSaasConnections("service = ? and connection_name = ?", [service, connectionName]),
+            queueSaasConnections(`service = ? and connection_name = ? and ${fence.sql}`, [
+                service,
+                connectionName,
+                ...fence.values,
+            ]),
             {
                 sql: `insert into connections (id, revision, service, connection_name, value, updated_at, provider_account_id)
-          values (?, ?, ?, ?, ?, ?, ?) on conflict (service, connection_name) do update set
+          select ?, ?, ?, ?, ?, ?, ? where ${fence.sql} on conflict (service, connection_name) do update set
           revision = excluded.revision, value = excluded.value, updated_at = excluded.updated_at,
           source = 'local', managed_project_id = null, provider_config_id = null, external_user_id = null,
           remote_account_id = null, local_request_id = null, provider_account_id = excluded.provider_account_id
@@ -60,9 +90,12 @@ export class SqlConnectionStore {
                     credential.authType !== "no_auth" && credential.metadata.providerAccountVerified === true
                         ? credential.profile.accountId
                         : null,
+                    ...fence.values,
                 ],
             },
         ]);
+        if (!accepted)
+            return undefined;
         if (!row)
             throw new HttpRequestError("connection_has_subscriptions", "Cancel or abandon remote Trigger subscriptions before replacing this connection.", 409);
         return { id: row.id, revision: row.revision, service, connectionName, credential };
@@ -97,7 +130,13 @@ export class SqlConnectionStore {
         return row !== undefined;
     }
     async delete(service, connectionName) {
-        const [, , , [remaining]] = await this.transaction([
+        const retired = "not exists (select 1 from connections where service = ? and connection_name = ?)";
+        const results = await this.transaction([
+            initializeRetirement(service, connectionName, crypto.randomUUID()),
+            {
+                sql: "update connection_retirements set generation = generation where service = ? and connection_name = ?",
+                values: [service, connectionName],
+            },
             {
                 sql: "update connections set revision = revision where service = ? and connection_name = ?",
                 values: [service, connectionName],
@@ -108,12 +147,26 @@ export class SqlConnectionStore {
         (select 1 from trigger_subscriptions where connection_id = connections.id and mode <> 'resource-set' and status in ('active', 'deleting'))`,
                 values: [service, connectionName],
             },
+            {
+                sql: `update connection_retirements set generation = ? where service = ? and connection_name = ? and ${retired}`,
+                values: [crypto.randomUUID(), service, connectionName, service, connectionName],
+            },
+            {
+                sql: `delete from oauth_states where service = ? and connection_name = ? and ${retired}`,
+                values: [service, connectionName, service, connectionName],
+            },
+            {
+                sql: `update connection_requests set phase = 'completed', status = 'failed', error_code = 'connection_retired',
+          error_message = 'The connection was disconnected during authorization.', value = null, updated_at = ?
+          where kind = 'local' and service = ? and connection_name = ? and phase in ('pending', 'processing') and ${retired}`,
+                values: [Date.now(), service, connectionName, service, connectionName],
+            },
             {
                 sql: "select id from connections where service = ? and connection_name = ?",
                 values: [service, connectionName],
             },
         ]);
-        if (remaining)
+        if (results.at(-1)[0])
             throw new HttpRequestError("connection_has_subscriptions", "Cancel or abandon remote Trigger subscriptions before disconnecting this connection.", 409);
     }
 }

package/src/server/storage/oauth-state-store.d.ts

@@ -0,0 +1,12 @@
+import type { IOAuthStateStore, OAuthAuthorizationState } from "../../oauth/oauth-flow-service.ts";
+import type { ISecretCodec } from "../secrets/secret-codec-core.ts";
+import type { RequestTransaction } from "./connection-request-store.ts";
+/** Pending OAuth state shares the same durable fence and transaction as credential retirement. */
+export declare class SqlOAuthStateStore implements IOAuthStateStore {
+    private readonly transaction;
+    private readonly codec;
+    constructor(transaction: RequestTransaction, codec: ISecretCodec);
+    deleteCreatedBefore(cutoff: string): Promise<void>;
+    set(state: OAuthAuthorizationState): Promise<void>;
+    take(state: string): Promise<OAuthAuthorizationState | undefined>;
+}

package/src/server/storage/oauth-state-store.js

@@ -0,0 +1,36 @@
+import { normalizeConnectionName } from "../../connection-service.js";
+import { initializeRetirement, lockRetirement, retirementMatches } from "./connection-retirement.js";
+/** Pending OAuth state shares the same durable fence and transaction as credential retirement. */
+export class SqlOAuthStateStore {
+    transaction;
+    codec;
+    constructor(transaction, codec) {
+        this.transaction = transaction;
+        this.codec = codec;
+    }
+    async deleteCreatedBefore(cutoff) {
+        await this.transaction([{ sql: "delete from oauth_states where created_at < ?", values: [cutoff] }]);
+    }
+    async set(state) {
+        const connectionName = normalizeConnectionName(state.connectionName);
+        const value = await this.codec.encode(JSON.stringify(state));
+        const fence = retirementMatches(state.service, connectionName, state.retirementGeneration);
+        await this.transaction([
+            initializeRetirement(state.service, connectionName, state.retirementGeneration),
+            lockRetirement(state.service, connectionName, state.retirementGeneration),
+            {
+                sql: `insert into oauth_states (state, value, created_at, service, connection_name)
+        select ?, ?, ?, ?, ? where ${fence.sql}
+        on conflict(state) do update set value = excluded.value, created_at = excluded.created_at,
+          service = excluded.service, connection_name = excluded.connection_name`,
+                values: [state.state, value, state.createdAt, state.service, connectionName, ...fence.values],
+            },
+        ]);
+    }
+    async take(state) {
+        const [[row]] = await this.transaction([
+            { sql: "delete from oauth_states where state = ? returning value", values: [state] },
+        ]);
+        return row ? JSON.parse(await this.codec.decode(row.value)) : undefined;
+    }
+}

package/src/server/storage/postgres/runtime-store.d.ts

@@ -2,7 +2,6 @@ import type { IConnectionStore } from "../../../connection-service.ts";
 import type { RuntimeLogger } from "../../../core/types.ts";
 import type { IMarketplaceStore } from "../../../marketplace/marketplace-service.ts";
 import type { IOAuthClientConfigStore } from "../../../oauth/oauth-client-config-service.ts";
-import type { IOAuthStateStore } from "../../../oauth/oauth-flow-service.ts";
 import type { ISecretCodec } from "../../secrets/secret-codec-core.ts";
 import type { IIdempotencyStore } from "../idempotency-store.ts";
 import type { MigrationSource } from "../migration-source.ts";
@@ -11,6 +10,7 @@ import type { IRuntimePolicyStore } from "../runtime-policy-store.ts";
 import type { IRunLogStore } from "../runtime-store.ts";
 import type { IRuntimeTokenStore } from "../runtime-token-service.ts";
 import { ConnectionRequestStore } from "../connection-request-store.ts";
+import { SqlOAuthStateStore } from "../oauth-state-store.ts";
 import { SaasProjectStore } from "../saas-project-store.ts";
 import { SqlTriggerStore } from "../trigger-store.ts";
 export interface PostgresRuntimeDatabaseOptions {
@@ -27,7 +27,7 @@ export declare class PostgresRuntimeDatabase implements RuntimeDatabase {
     readonly connectionStore: IConnectionStore;
     readonly triggerStore: SqlTriggerStore;
     readonly oauthClientConfigStore: IOAuthClientConfigStore;
-    readonly oauthStateStore: IOAuthStateStore;
+    readonly oauthStateStore: SqlOAuthStateStore;
     readonly runtimeTokenStore: IRuntimeTokenStore;
     readonly runtimePolicyStore: IRuntimePolicyStore;
     readonly runLogStore: IRunLogStore;

package/src/server/storage/postgres/runtime-store.js

@@ -3,6 +3,7 @@ import { parseRuntimeActionHttpResult } from "../../api/runtime-api.js";
 import { PlainTextSecretCodec } from "../../secrets/secret-codec-core.js";
 import { ConnectionRequestStore } from "../connection-request-store.js";
 import { SqlConnectionStore } from "../connection-store.js";
+import { SqlOAuthStateStore } from "../oauth-state-store.js";
 import { listRunLogs, parseJson, readRunLogRow, readRuntimePolicyRow, readRuntimeTokenRow, readString, runtimeTokenColumns, } from "../runtime-sql.js";
 import { DEFAULT_RUN_LIMIT } from "../runtime-store.js";
 import { SaasProjectStore } from "../saas-project-store.js";
@@ -40,7 +41,7 @@ export class PostgresRuntimeDatabase {
         this.triggerStore = new SqlTriggerStore(transaction, this.secretCodec);
         this.saasProjectStore = new SaasProjectStore(transaction, this.secretCodec);
         this.oauthClientConfigStore = new PostgresOAuthClientConfigStore(pool, this.secretCodec);
-        this.oauthStateStore = new PostgresOAuthStateStore(pool, this.secretCodec);
+        this.oauthStateStore = new SqlOAuthStateStore(transaction, this.secretCodec);
         this.runtimeTokenStore = new PostgresRuntimeTokenStore(pool);
         this.runtimePolicyStore = new PostgresRuntimePolicyStore(pool);
         this.runLogStore = new PostgresRunLogStore(pool, options.runLimit ?? DEFAULT_RUN_LIMIT);
@@ -72,6 +73,7 @@ export class PostgresRuntimeDatabase {
     async resetRuntimeData() {
         await runInTransaction(this.pool, async (client) => {
             await client.query("select pg_advisory_xact_lock(1326382671, 2)");
+            await client.query("update connection_retirements set generation = $1", [crypto.randomUUID()]);
             await client.query(`
         delete from oauth_sources;
         delete from saas_cleanup;
@@ -239,33 +241,6 @@ class PostgresOAuthClientConfigStore {
         return await Promise.all(result.rows.map(async (row) => parseJson(await this.secretCodec.decode(readString(row, "value")))));
     }
 }
-class PostgresOAuthStateStore {
-    pool;
-    secretCodec;
-    constructor(pool, secretCodec) {
-        this.pool = pool;
-        this.secretCodec = secretCodec;
-    }
-    async deleteCreatedBefore(cutoff) {
-        await this.pool.query("delete from oauth_states where created_at < $1", [cutoff]);
-    }
-    async set(state) {
-        await this.pool.query(`
-        insert into oauth_states (state, value, created_at)
-        values ($1, $2, $3)
-        on conflict(state) do update set value = excluded.value, created_at = excluded.created_at
-      `, [state.state, await this.secretCodec.encode(JSON.stringify(state)), state.createdAt]);
-    }
-    async take(state) {
-        const result = await this.pool.query("delete from oauth_states where state = $1 returning value", [
-            state,
-        ]);
-        const row = result.rows[0];
-        return row
-            ? parseJson(await this.secretCodec.decode(readString(row, "value")))
-            : undefined;
-    }
-}
 class PostgresRuntimeTokenStore {
     pool;
     constructor(pool) {

package/src/server/storage/sqlite/runtime-store.d.ts

@@ -2,7 +2,6 @@ import type { TokenPolicy } from "../../../core/action-policy.ts";
 import type { RuntimeLogger } from "../../../core/types.ts";
 import type { IMarketplaceStore, ProviderPreference, StoredMarketplaceConfig } from "../../../marketplace/marketplace-service.ts";
 import type { IOAuthClientConfigStore, OAuthClientConfig } from "../../../oauth/oauth-client-config-service.ts";
-import type { IOAuthStateStore, OAuthAuthorizationState } from "../../../oauth/oauth-flow-service.ts";
 import type { ISecretCodec } from "../../secrets/secret-codec-core.ts";
 import type { CompleteIdempotencyInput, IdempotencyClaimInput, IdempotencyClaimResult, IIdempotencyStore } from "../idempotency-store.ts";
 import type { MigrationSource } from "../migration-source.ts";
@@ -13,6 +12,7 @@ import type { IRuntimeTokenStore, RuntimeTokenRecord } from "../runtime-token-se
 import { DatabaseSync } from "node:sqlite";
 import { ConnectionRequestStore } from "../connection-request-store.ts";
 import { SqlConnectionStore } from "../connection-store.ts";
+import { SqlOAuthStateStore } from "../oauth-state-store.ts";
 import { SaasProjectStore } from "../saas-project-store.ts";
 import { SqlTriggerStore } from "../trigger-store.ts";
 export interface SqliteRuntimeDatabaseOptions {
@@ -30,7 +30,7 @@ export declare class SqliteRuntimeDatabase implements RuntimeDatabase {
     readonly connectionStore: SqlConnectionStore;
     readonly triggerStore: SqlTriggerStore;
     readonly oauthClientConfigStore: SqliteOAuthClientConfigStore;
-    readonly oauthStateStore: SqliteOAuthStateStore;
+    readonly oauthStateStore: SqlOAuthStateStore;
     readonly runtimeTokenStore: SqliteRuntimeTokenStore;
     readonly runtimePolicyStore: SqliteRuntimePolicyStore;
     readonly runLogStore: SqliteRunLogStore;
@@ -62,14 +62,6 @@ export declare class SqliteOAuthClientConfigStore implements IOAuthClientConfigS
     delete(service: string): Promise<void>;
     list(): Promise<OAuthClientConfig[]>;
 }
-export declare class SqliteOAuthStateStore implements IOAuthStateStore {
-    private readonly database;
-    private readonly secretCodec;
-    constructor(database: DatabaseSync, secretCodec: ISecretCodec);
-    deleteCreatedBefore(cutoff: string): Promise<void>;
-    set(state: OAuthAuthorizationState): Promise<void>;
-    take(state: string): Promise<OAuthAuthorizationState | undefined>;
-}
 export declare class SqliteRuntimeTokenStore implements IRuntimeTokenStore {
     private readonly database;
     private findByHashStatement?;

package/src/server/storage/sqlite/runtime-store.js

@@ -4,6 +4,7 @@ import { PlainTextSecretCodec } from "../../secrets/secret-codec-core.js";
 import { ConnectionRequestStore } from "../connection-request-store.js";
 import { SqlConnectionStore } from "../connection-store.js";
 import { defaultMigrationSource } from "../migration-source.js";
+import { SqlOAuthStateStore } from "../oauth-state-store.js";
 import { listRunLogs, parseJson, readRunLogRow, readRuntimePolicyRow, readRuntimeTokenRow, readString, runtimeTokenColumns, } from "../runtime-sql.js";
 import { DEFAULT_RUN_LIMIT } from "../runtime-store.js";
 import { SaasProjectStore } from "../saas-project-store.js";
@@ -35,7 +36,7 @@ export class SqliteRuntimeDatabase {
         this.triggerStore = new SqlTriggerStore(transaction, this.secretCodec);
         this.saasProjectStore = new SaasProjectStore(transaction, this.secretCodec);
         this.oauthClientConfigStore = new SqliteOAuthClientConfigStore(this.database, this.secretCodec);
-        this.oauthStateStore = new SqliteOAuthStateStore(this.database, this.secretCodec);
+        this.oauthStateStore = new SqlOAuthStateStore(transaction, this.secretCodec);
         this.runtimeTokenStore = new SqliteRuntimeTokenStore(this.database);
         this.runtimePolicyStore = new SqliteRuntimePolicyStore(this.database);
         this.runLogStore = new SqliteRunLogStore(this.database, options.runLimit ?? DEFAULT_RUN_LIMIT);
@@ -124,7 +125,9 @@ export class SqliteRuntimeDatabase {
         }
     }
     resetRuntimeData() {
-        runInTransaction(this.database, () => this.database.exec(`
+        runInTransaction(this.database, () => {
+            this.database.prepare("update connection_retirements set generation = ?").run(crypto.randomUUID());
+            this.database.exec(`
       delete from oauth_sources;
       delete from saas_cleanup;
       delete from managed_project;
@@ -139,7 +142,8 @@ export class SqliteRuntimeDatabase {
       delete from idempotency_records;
       delete from marketplace_config;
       delete from provider_preferences;
-    `));
+    `);
+        });
     }
     initialize(migrations, logger) {
         this.database.exec("pragma journal_mode = wal;");
@@ -212,33 +216,6 @@ export class SqliteOAuthClientConfigStore {
         return await Promise.all(rows.map(async (row) => parseJson(await this.secretCodec.decode(readString(row, "value")))));
     }
 }
-export class SqliteOAuthStateStore {
-    database;
-    secretCodec;
-    constructor(database, secretCodec) {
-        this.database = database;
-        this.secretCodec = secretCodec;
-    }
-    async deleteCreatedBefore(cutoff) {
-        this.database.prepare("delete from oauth_states where created_at < ?").run(cutoff);
-    }
-    async set(state) {
-        this.database
-            .prepare(`
-        insert into oauth_states (state, value, created_at)
-        values (?, ?, ?)
-        on conflict(state) do update set value = excluded.value, created_at = excluded.created_at
-      `)
-            .run(state.state, await this.secretCodec.encode(JSON.stringify(state)), state.createdAt);
-    }
-    async take(state) {
-        const row = this.database.prepare("select value from oauth_states where state = ?").get(state);
-        this.database.prepare("delete from oauth_states where state = ?").run(state);
-        return row
-            ? parseJson(await this.secretCodec.decode(readString(row, "value")))
-            : undefined;
-    }
-}
 export class SqliteRuntimeTokenStore {
     database;
     findByHashStatement;

package/src/triggers/trigger-runner.d.ts

@@ -1,11 +1,13 @@
 import type { CatalogStore } from "../catalog-store.ts";
 import type { ConnectionService } from "../connection-service.ts";
 import type { ActionPolicySnapshot } from "../core/action-policy.ts";
+import type { ProviderHttpDispatchOptions } from "../core/provider-http-dispatch.ts";
 import type { IProviderLoader } from "../providers/provider-loader.ts";
 import type { RuntimeGrant } from "../server/storage/runtime-token-service.ts";
 import type { TriggerRequest } from "./request.ts";
 import type { TriggerSubscription, TriggerStore } from "./store.ts";
 interface TriggerRunnerOptions {
+    providerHttpDispatch?: ProviderHttpDispatchOptions;
     catalog: CatalogStore;
     providerLoader: IProviderLoader;
     connections: ConnectionService;
@@ -25,10 +27,12 @@ export declare class TriggerRunner {
     private readonly options;
     constructor(options: TriggerRunnerOptions);
     run(input: RunTriggerInput): Promise<unknown>;
+    private runTrigger;
     cleanup(record: TriggerSubscription, save: () => Promise<void>, signal: AbortSignal): Promise<void>;
     abandonResource(record: TriggerSubscription, signal: AbortSignal): Promise<void>;
     private definition;
     private target;
     private providerOperation;
+    private runProviderOperation;
 }
 export {};

package/src/triggers/trigger-runner.js

@@ -1,5 +1,7 @@
 import { ConnectionError } from "../connection-service.js";
 import { optionalInteger, optionalRecord } from "../core/cast.js";
+import { withProviderHttpDispatch } from "../core/provider-http-dispatch.js";
+import { withProviderHttpDispatchResult } from "../providers/provider-runtime.js";
 import { HttpRequestError } from "../server/api/http-utils.js";
 import { mapConnectionErrorStatus } from "../server/api/runtime-api.js";
 import { resolveTriggerConfig } from "./common/config.js";
@@ -12,6 +14,10 @@ export class TriggerRunner {
         this.options = options;
     }
     async run(input) {
+        const provider = this.options.catalog.providers.find((candidate) => candidate.service === input.service);
+        return withProviderHttpDispatch({ operation: "trigger", service: provider?.service }, () => this.runTrigger(input), this.options.providerHttpDispatch);
+    }
+    async runTrigger(input) {
         const decision = input.policy.evaluateTrigger(input.triggerId);
         if (!decision.allowed)
             throw new HttpRequestError(decision.code, decision.message, 403);
@@ -24,11 +30,11 @@ export class TriggerRunner {
         if (request.operation === "receive") {
             if (definition.snapshot.type !== "integration" || ("eventSource" in definition && definition.eventSource))
                 throw new HttpRequestError("invalid_input", "This Trigger has no remote webhook.");
-            return this.providerOperation(() => executeSubscription(this.options.store, definition, { ...target.owner, tokenId: input.grant.tokenId, triggerId: input.triggerId }, request, target.proxy, input.signal));
+            return this.providerOperation(input.service, () => executeSubscription(this.options.store, definition, { ...target.owner, tokenId: input.grant.tokenId, triggerId: input.triggerId }, request, target.proxy, input.signal));
         }
         const config = resolveTriggerConfig(definition.snapshot.configInputs, request.config, request.operation === "options");
         const context = { config, connector: target.proxy, now: new Date(), signal: input.signal };
-        return this.providerOperation(async () => {
+        return this.providerOperation(input.service, async () => {
             switch (request.operation) {
                 case "options": {
                     if (!definition.configOptions ||
@@ -66,12 +72,12 @@ export class TriggerRunner {
         if (record.mode === "resource") {
             if (!definition.resources)
                 throw new HttpRequestError("trigger_not_supported", "Resource subscriptions are unavailable.", 501);
-            await this.providerOperation(() => executeResourceSubscriptionOperation(this.options.store, definition.resources, record, save, { operation: "resource", config: record.config, active: false, requestKey: record.requestKey }, target.proxy, signal));
+            await this.providerOperation(record.service, () => executeResourceSubscriptionOperation(this.options.store, definition.resources, record, save, { operation: "resource", config: record.config, active: false, requestKey: record.requestKey }, target.proxy, signal));
         }
         else {
             if (definition.snapshot.type !== "integration")
                 throw new HttpRequestError("trigger_not_found", "The remote Trigger definition is unavailable.", 404);
-            await this.providerOperation(() => executeSubscriptionOperation(record, save, definition, {
+            await this.providerOperation(record.service, () => executeSubscriptionOperation(record, save, definition, {
                 operation: "reconcile",
                 config: record.config,
                 endpointUrl: record.endpointUrl,
@@ -124,10 +130,15 @@ export class TriggerRunner {
             const proxy = {
                 execute: async (request, requestSignal) => {
                     signal.throwIfAborted();
-                    const result = await executor(request, {
+                    const result = await withProviderHttpDispatch({
+                        operation: "trigger",
+                        service,
+                        connectionId: stored.id,
+                        connectionName: stored.connectionName,
+                    }, () => executor(request, {
                         getCredential: target.getCredential,
                         signal: requestSignal ?? signal,
-                    });
+                    }), this.options.providerHttpDispatch);
                     if (result.ok)
                         return result.response;
                     const status = optionalInteger(optionalRecord(result.error.details)?.status) ?? 502;
@@ -150,7 +161,10 @@ export class TriggerRunner {
             throw error;
         }
     }
-    async providerOperation(run) {
+    async providerOperation(service, run) {
+        return withProviderHttpDispatchResult({ operation: "trigger", service }, () => this.runProviderOperation(run), this.options.providerHttpDispatch);
+    }
+    async runProviderOperation(run) {
         try {
             return await run();
         }