@sixb/pg 0.2.1 → 0.2.3
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/README.md +9 -8
- package/dist/agents/computers.d.ts +8 -2
- package/dist/agents/computers.d.ts.map +1 -1
- package/dist/auth-storage/auth-storage.d.ts +2 -1
- package/dist/auth-storage/auth-storage.d.ts.map +1 -1
- package/dist/auth-storage/identities.d.ts +4 -0
- package/dist/auth-storage/identities.d.ts.map +1 -1
- package/dist/auth-storage/rows.d.ts +2 -1
- package/dist/auth-storage/rows.d.ts.map +1 -1
- package/dist/auth-storage/users.d.ts.map +1 -1
- package/dist/connector-connection-storage.d.ts.map +1 -1
- package/dist/index.d.ts +6 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2377 -428
- package/dist/index.js.map +37 -30
- package/dist/migrations.d.ts.map +1 -1
- package/dist/objects/conditional-reader.d.ts +7 -2
- package/dist/objects/conditional-reader.d.ts.map +1 -1
- package/dist/objects/partitions.d.ts.map +1 -1
- package/dist/objects/prepare-queries.d.ts.map +1 -1
- package/dist/objects/query-compiler.d.ts +14 -1
- package/dist/objects/query-compiler.d.ts.map +1 -1
- package/dist/objects/query-indexes.d.ts +13 -1
- package/dist/objects/query-indexes.d.ts.map +1 -1
- package/dist/objects/read-scope.d.ts.map +1 -1
- package/dist/objects/reader.d.ts +14 -1
- package/dist/objects/reader.d.ts.map +1 -1
- package/dist/objects/storage.d.ts +11 -1
- package/dist/objects/storage.d.ts.map +1 -1
- package/dist/objects/visibility-indexes.d.ts +22 -0
- package/dist/objects/visibility-indexes.d.ts.map +1 -0
- package/dist/objects/visibility-statistics.d.ts +26 -0
- package/dist/objects/visibility-statistics.d.ts.map +1 -0
- package/dist/objects/visibility.d.ts +34 -0
- package/dist/objects/visibility.d.ts.map +1 -0
- package/dist/ontology-storage/materialization-session.d.ts +5 -0
- package/dist/ontology-storage/materialization-session.d.ts.map +1 -1
- package/dist/ontology-storage/materialization-writer.d.ts +14 -0
- package/dist/ontology-storage/materialization-writer.d.ts.map +1 -1
- package/dist/ontology-storage/materializations.d.ts.map +1 -1
- package/dist/pg-artifact-storage.d.ts +14 -2
- package/dist/pg-artifact-storage.d.ts.map +1 -1
- package/dist/pg-client.d.ts.map +1 -1
- package/dist/pg-dataset-ingest-storage.d.ts +6 -0
- package/dist/pg-dataset-ingest-storage.d.ts.map +1 -0
- package/dist/pg-lake-retention-run-storage.d.ts +11 -0
- package/dist/pg-lake-retention-run-storage.d.ts.map +1 -0
- package/dist/pg-maintenance-heartbeat-storage.d.ts +11 -0
- package/dist/pg-maintenance-heartbeat-storage.d.ts.map +1 -0
- package/dist/pg-pipeline-run-storage.d.ts +5 -2
- package/dist/pg-pipeline-run-storage.d.ts.map +1 -1
- package/dist/pg-projection-run-storage.d.ts +5 -1
- package/dist/pg-projection-run-storage.d.ts.map +1 -1
- package/dist/pg-sync-run-storage.d.ts +6 -2
- package/dist/pg-sync-run-storage.d.ts.map +1 -1
- package/dist/pg-webhook-run-storage.d.ts +2 -1
- package/dist/pg-webhook-run-storage.d.ts.map +1 -1
- package/dist/pg-workflow-run-storage.d.ts +4 -3
- package/dist/pg-workflow-run-storage.d.ts.map +1 -1
- package/dist/run-claim-sql.d.ts +37 -0
- package/dist/run-claim-sql.d.ts.map +1 -0
- package/dist/share-session-storage.d.ts +2 -1
- package/dist/share-session-storage.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/agents/computers.ts +54 -5
- package/src/auth-storage/auth-storage.ts +66 -0
- package/src/auth-storage/identities.ts +15 -0
- package/src/auth-storage/rows.ts +3 -0
- package/src/auth-storage/users.ts +3 -0
- package/src/connector-connection-storage.ts +33 -16
- package/src/index.ts +15 -0
- package/src/migrations/087-agent-computer-background-commands.sql +4 -0
- package/src/migrations/088-web-search-model-kind.sql +12 -0
- package/src/migrations/089-maintenance-heartbeats.sql +10 -0
- package/src/migrations/090-lake-retention-runs.sql +8 -0
- package/src/migrations/091-dataset-ingest-inbox.sql +38 -0
- package/src/migrations/092-run-recovery.sql +23 -0
- package/src/migrations/093-webhook-and-projection-leases.sql +10 -0
- package/src/migrations/094-artifact-board-previews.sql +14 -0
- package/src/migrations/095-artifact-open-versions.sql +101 -0
- package/src/migrations/096-artifact-documents.sql +11 -0
- package/src/migrations/097-artifact-frame-files.sql +8 -0
- package/src/migrations/098-artifact-comments.sql +36 -0
- package/src/migrations/099-object-artifact-refs.sql +12 -0
- package/src/migrations/100-shared-link-guests.sql +17 -0
- package/src/migrations/101-connector-connection-owners.sql +38 -0
- package/src/migrations/102-user-suspension-source.sql +12 -0
- package/src/migrations.ts +46 -0
- package/src/objects/conditional-reader.ts +26 -4
- package/src/objects/partitions.ts +17 -4
- package/src/objects/prepare-queries.ts +8 -3
- package/src/objects/query-compiler.ts +64 -23
- package/src/objects/query-indexes.ts +93 -27
- package/src/objects/read-scope.ts +147 -77
- package/src/objects/reader.ts +46 -18
- package/src/objects/storage.ts +53 -0
- package/src/objects/visibility-indexes.ts +222 -0
- package/src/objects/visibility-statistics.ts +73 -0
- package/src/objects/visibility.ts +135 -0
- package/src/ontology-storage/materialization-session.ts +4 -0
- package/src/ontology-storage/materialization-writer.ts +68 -1
- package/src/ontology-storage/materializations.ts +6 -2
- package/src/pg-artifact-storage.ts +798 -137
- package/src/pg-client.ts +4 -0
- package/src/pg-dataset-ingest-storage.ts +305 -0
- package/src/pg-lake-retention-run-storage.ts +40 -0
- package/src/pg-maintenance-heartbeat-storage.ts +53 -0
- package/src/pg-pipeline-run-storage.ts +85 -42
- package/src/pg-projection-run-storage.ts +61 -2
- package/src/pg-sync-run-storage.ts +100 -37
- package/src/pg-webhook-run-storage.ts +37 -11
- package/src/pg-workflow-run-storage.ts +39 -100
- package/src/run-claim-sql.ts +173 -0
- package/src/share-session-storage.ts +20 -0
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ExecutionStorage, FinishSyncRunInput, ListLatestSyncRunsInput, ListLatestSyncRunsResult, ListSyncRunsInput, ListSyncRunsResult, QueueSyncRunInput,
|
|
1
|
+
import type { ClaimRunInput, ConfirmRunExecutionInput, ExecutionStorage, FinishSyncRunInput, ListLatestSyncRunsInput, ListLatestSyncRunsResult, ListLostRunsInput, ListSyncRunsInput, ListSyncRunsResult, PrepareSyncRunCommitInput, QueueSyncRunInput, ReleaseRunExecutionInput, RunClaim, SyncRunRecord, SyncRunStorage } from "@sixb/core/storage";
|
|
2
2
|
import { type PgStoreClient } from "./transactions";
|
|
3
3
|
export declare class PgSyncRunStorage implements SyncRunStorage {
|
|
4
4
|
private readonly sql;
|
|
@@ -6,7 +6,11 @@ export declare class PgSyncRunStorage implements SyncRunStorage {
|
|
|
6
6
|
constructor(sql: PgStoreClient, executions: ExecutionStorage);
|
|
7
7
|
queue(input: QueueSyncRunInput): Promise<SyncRunRecord>;
|
|
8
8
|
private requeueAfterEnqueueFailure;
|
|
9
|
-
|
|
9
|
+
startOrReclaim(input: ClaimRunInput): Promise<RunClaim<SyncRunRecord>>;
|
|
10
|
+
confirmExecutionOwnership(input: ConfirmRunExecutionInput): Promise<SyncRunRecord>;
|
|
11
|
+
listLost(input: ListLostRunsInput): Promise<readonly SyncRunRecord[]>;
|
|
12
|
+
releaseExecution(input: ReleaseRunExecutionInput): Promise<void>;
|
|
13
|
+
prepareCommit(input: PrepareSyncRunCommitInput): Promise<SyncRunRecord>;
|
|
10
14
|
finish(input: FinishSyncRunInput): Promise<SyncRunRecord>;
|
|
11
15
|
getById(params: {
|
|
12
16
|
projectId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-sync-run-storage.d.ts","sourceRoot":"","sources":["../src/pg-sync-run-storage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pg-sync-run-storage.d.ts","sourceRoot":"","sources":["../src/pg-sync-run-storage.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,aAAa,EACb,wBAAwB,EACxB,gBAAgB,EAChB,kBAAkB,EAClB,uBAAuB,EACvB,wBAAwB,EACxB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,yBAAyB,EACzB,iBAAiB,EACjB,wBAAwB,EACxB,QAAQ,EACR,aAAa,EACb,cAAc,EACf,MAAM,oBAAoB,CAAA;AAiB3B,OAAO,EAAoB,KAAK,aAAa,EAAoB,MAAM,gBAAgB,CAAA;AAWvF,qBAAa,gBAAiB,YAAW,cAAc;IAEnD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,GAAG,EAAE,aAAa,EAClB,UAAU,EAAE,gBAAgB;IAGzC,KAAK,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC;YAgD/C,0BAA0B;IA2BlC,cAAc,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAiBtE,yBAAyB,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,aAAa,CAAC;IAIlF,QAAQ,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,SAAS,aAAa,EAAE,CAAC;IAIrE,gBAAgB,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE,aAAa,CAAC,KAAK,EAAE,yBAAyB,GAAG,OAAO,CAAC,aAAa,CAAC;IAgBvE,MAAM,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,aAAa,CAAC;IA4DzD,OAAO,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IASjF,IAAI,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAwD3D,mBAAmB,CAAC,KAAK,EAAE,uBAAuB,GAAG,OAAO,CAAC,wBAAwB,CAAC;CAe7F"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ExecutionStorage, FinishWebhookRunInput, GetWebhookRunByDeliveryInput, ListWebhookRunsInput, ListWebhookRunsResult, RestartWebhookRunInput, StartWebhookRunInput, WebhookRunRecord, WebhookRunStorage } from "@sixb/core/storage";
|
|
1
|
+
import type { ExecutionStorage, FinishWebhookRunInput, GetWebhookRunByDeliveryInput, ListWebhookRunsInput, ListWebhookRunsResult, RenewWebhookRunInput, RestartWebhookRunInput, StartWebhookRunInput, WebhookRunRecord, WebhookRunStorage } from "@sixb/core/storage";
|
|
2
2
|
import { type PgStoreClient } from "./transactions";
|
|
3
3
|
export declare class PgWebhookRunStorage implements WebhookRunStorage {
|
|
4
4
|
private readonly sql;
|
|
@@ -6,6 +6,7 @@ export declare class PgWebhookRunStorage implements WebhookRunStorage {
|
|
|
6
6
|
constructor(sql: PgStoreClient, executions: ExecutionStorage);
|
|
7
7
|
start(input: StartWebhookRunInput): Promise<WebhookRunRecord>;
|
|
8
8
|
restart(input: RestartWebhookRunInput): Promise<WebhookRunRecord>;
|
|
9
|
+
renewLease(input: RenewWebhookRunInput): Promise<boolean>;
|
|
9
10
|
finish(input: FinishWebhookRunInput): Promise<WebhookRunRecord>;
|
|
10
11
|
getById(params: {
|
|
11
12
|
projectId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-webhook-run-storage.d.ts","sourceRoot":"","sources":["../src/pg-webhook-run-storage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAChB,qBAAqB,EACrB,4BAA4B,EAC5B,oBAAoB,EACpB,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,EACpB,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAAE,KAAK,aAAa,EAAoB,MAAM,gBAAgB,CAAA;AAErE,qBAAa,mBAAoB,YAAW,iBAAiB;IAEzD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,GAAG,EAAE,aAAa,EAClB,UAAU,EAAE,gBAAgB;IAGzC,KAAK,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"pg-webhook-run-storage.d.ts","sourceRoot":"","sources":["../src/pg-webhook-run-storage.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAChB,qBAAqB,EACrB,4BAA4B,EAC5B,oBAAoB,EACpB,qBAAqB,EACrB,oBAAoB,EACpB,sBAAsB,EACtB,oBAAoB,EACpB,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,oBAAoB,CAAA;AAK3B,OAAO,EAAE,KAAK,aAAa,EAAoB,MAAM,gBAAgB,CAAA;AAErE,qBAAa,mBAAoB,YAAW,iBAAiB;IAEzD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBADV,GAAG,EAAE,aAAa,EAClB,UAAU,EAAE,gBAAgB;IAGzC,KAAK,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAmC7D,OAAO,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAkCjE,UAAU,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IAUzD,MAAM,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAuC/D,OAAO,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAQpF,aAAa,CAAC,KAAK,EAAE,4BAA4B,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAWpF,IAAI,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAgCxE"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { CancelWorkflowAgentNodeRunInput, ConfirmWorkflowAgentNodeRunExecutionOwnershipInput, ConfirmWorkflowRunExecutionOwnershipInput, CreateWorkflowAgentNodeRunInput, ExecutionStorage, FinishWorkflowAgentNodeRunInput, FinishWorkflowNodeRunInput, FinishWorkflowRunInput, ListLatestWorkflowRunsInput, ListLatestWorkflowRunsResult, ListWorkflowAgentNodeRunsInput, ListWorkflowAgentNodeRunsResult, ListWorkflowNodeRunsInput, ListWorkflowNodeRunsResult, ListWorkflowRunsInput, ListWorkflowRunsResult, QueueWorkflowRunInput, ReclaimWorkflowAgentNodeRunInput,
|
|
1
|
+
import type { CancelWorkflowAgentNodeRunInput, ClaimRunInput, ConfirmWorkflowAgentNodeRunExecutionOwnershipInput, ConfirmWorkflowRunExecutionOwnershipInput, CreateWorkflowAgentNodeRunInput, ExecutionStorage, FinishWorkflowAgentNodeRunInput, FinishWorkflowNodeRunInput, FinishWorkflowRunInput, ListLatestWorkflowRunsInput, ListLatestWorkflowRunsResult, ListLostRunsInput, ListWorkflowAgentNodeRunsInput, ListWorkflowAgentNodeRunsResult, ListWorkflowNodeRunsInput, ListWorkflowNodeRunsResult, ListWorkflowRunsInput, ListWorkflowRunsResult, QueueWorkflowRunInput, ReclaimWorkflowAgentNodeRunInput, ReleaseRunExecutionInput, ResumeWorkflowRunInput, RunClaim, StartWorkflowAgentNodeRunInput, StartWorkflowNodeRunInput, WaitWorkflowNodeRunInput, WaitWorkflowRunInput, WorkflowAgentNodeRunRecord, WorkflowAgentNodeRunStorage, WorkflowNodeRunRecord, WorkflowNodeRunStorage, WorkflowRunRecord, WorkflowRunStorage } from "@sixb/core/storage";
|
|
2
2
|
import { type PgStoreClient } from "./transactions";
|
|
3
3
|
export declare class PgWorkflowRunStorage implements WorkflowRunStorage {
|
|
4
4
|
private readonly sql;
|
|
@@ -7,8 +7,9 @@ export declare class PgWorkflowRunStorage implements WorkflowRunStorage {
|
|
|
7
7
|
readonly agentNodes: PgWorkflowAgentNodeRunStorage;
|
|
8
8
|
constructor(sql: PgStoreClient, executions: ExecutionStorage);
|
|
9
9
|
queue(input: QueueWorkflowRunInput): Promise<WorkflowRunRecord>;
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
startOrReclaim(input: ClaimRunInput): Promise<RunClaim<WorkflowRunRecord>>;
|
|
11
|
+
listLost(input: ListLostRunsInput): Promise<readonly WorkflowRunRecord[]>;
|
|
12
|
+
releaseExecution(input: ReleaseRunExecutionInput): Promise<void>;
|
|
12
13
|
confirmExecutionOwnership(input: ConfirmWorkflowRunExecutionOwnershipInput): Promise<WorkflowRunRecord>;
|
|
13
14
|
finish(input: FinishWorkflowRunInput): Promise<WorkflowRunRecord>;
|
|
14
15
|
wait(input: WaitWorkflowRunInput): Promise<WorkflowRunRecord>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-workflow-run-storage.d.ts","sourceRoot":"","sources":["../src/pg-workflow-run-storage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pg-workflow-run-storage.d.ts","sourceRoot":"","sources":["../src/pg-workflow-run-storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { type ClaimableRun } from "@sixb/core/internal/storage";
|
|
2
|
+
import type { ClaimRunInput, ConfirmRunExecutionInput, ListLostRunsInput, ReleaseRunExecutionInput, RunClaim, RunExecution } from "@sixb/core/storage";
|
|
3
|
+
import type { PgStoreClient } from "./transactions";
|
|
4
|
+
/** The columns every recoverable run keeps, whichever table holds it. */
|
|
5
|
+
export interface PgRunExecutionColumns {
|
|
6
|
+
readonly attempt: number | string;
|
|
7
|
+
readonly execution_token: string | null;
|
|
8
|
+
readonly execution_queue_lease_expires_at: Date | string | null;
|
|
9
|
+
}
|
|
10
|
+
/** One table of recoverable runs. Only its name, and how a row reads, differ between primitives. */
|
|
11
|
+
export interface PgRunTable<TRow extends PgRunExecutionColumns, TRun> {
|
|
12
|
+
readonly name: "sync_runs" | "pipeline_runs" | "workflow_runs";
|
|
13
|
+
readonly returning: string;
|
|
14
|
+
toRun(row: TRow): TRun;
|
|
15
|
+
notFound(projectId: string, id: string): Error;
|
|
16
|
+
staleExecution(id: string): Error;
|
|
17
|
+
}
|
|
18
|
+
export declare function pgRunExecutionFields(row: PgRunExecutionColumns): {
|
|
19
|
+
readonly attempt: number;
|
|
20
|
+
readonly execution: RunExecution | undefined;
|
|
21
|
+
};
|
|
22
|
+
export declare function lockPgRun<TRow extends PgRunExecutionColumns, TRun>(tx: PgStoreClient, table: PgRunTable<TRow, TRun>, projectId: string, id: string): Promise<TRun>;
|
|
23
|
+
/** `sibling` is a run this one must not overlap, read in the same transaction. */
|
|
24
|
+
export declare function claimPgRun<TRow extends PgRunExecutionColumns, TRun extends ClaimableRun>(tx: PgStoreClient, table: PgRunTable<TRow, TRun>, input: ClaimRunInput, sibling?: ClaimableRun): Promise<RunClaim<TRun>>;
|
|
25
|
+
export declare function lockHeldPgRun<TRow extends PgRunExecutionColumns, TRun extends ClaimableRun>(tx: PgStoreClient, table: PgRunTable<TRow, TRun>, input: {
|
|
26
|
+
readonly projectId: string;
|
|
27
|
+
readonly id: string;
|
|
28
|
+
readonly executionToken: string;
|
|
29
|
+
}): Promise<TRun>;
|
|
30
|
+
export declare function confirmPgRunExecution<TRow extends PgRunExecutionColumns, TRun extends ClaimableRun>(tx: PgStoreClient, table: PgRunTable<TRow, TRun>, input: ConfirmRunExecutionInput): Promise<TRun>;
|
|
31
|
+
/**
|
|
32
|
+
* Starts from `(project_id, status, ...)`, where queued and running rows are few however long the
|
|
33
|
+
* table's history. Running runs come first, so queued ones waiting for a sibling starve nothing.
|
|
34
|
+
*/
|
|
35
|
+
export declare function listLostPgRuns<TRow extends PgRunExecutionColumns, TRun>(sql: PgStoreClient, table: PgRunTable<TRow, TRun>, input: ListLostRunsInput): Promise<readonly TRun[]>;
|
|
36
|
+
export declare function releasePgRun(sql: PgStoreClient, table: Pick<PgRunTable<never, never>, "name">, input: ReleaseRunExecutionInput): Promise<void>;
|
|
37
|
+
//# sourceMappingURL=run-claim-sql.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-claim-sql.d.ts","sourceRoot":"","sources":["../src/run-claim-sql.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { CreateShareSessionInput, GetShareSessionByIdInput, RenewShareSessionIfValidInput, RevokeShareSessionInput, ShareSessionRecord, ShareSessionStorage } from "@sixb/core/storage";
|
|
1
|
+
import type { CreateShareSessionInput, GetShareSessionByIdInput, RenewShareSessionIfValidInput, RevokeShareSessionInput, SetShareSessionGuestNameInput, ShareSessionRecord, ShareSessionStorage } from "@sixb/core/storage";
|
|
2
2
|
import type { PgStoreClient } from "./transactions";
|
|
3
3
|
export declare class PgShareSessionStorage implements ShareSessionStorage {
|
|
4
4
|
private readonly sql;
|
|
@@ -6,6 +6,7 @@ export declare class PgShareSessionStorage implements ShareSessionStorage {
|
|
|
6
6
|
create(input: CreateShareSessionInput): Promise<ShareSessionRecord>;
|
|
7
7
|
getById(input: GetShareSessionByIdInput): Promise<ShareSessionRecord | null>;
|
|
8
8
|
renewIfValid(input: RenewShareSessionIfValidInput): Promise<ShareSessionRecord | null>;
|
|
9
|
+
setGuestName(input: SetShareSessionGuestNameInput): Promise<ShareSessionRecord | null>;
|
|
9
10
|
revoke(input: RevokeShareSessionInput): Promise<ShareSessionRecord | null>;
|
|
10
11
|
}
|
|
11
12
|
//# sourceMappingURL=share-session-storage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"share-session-storage.d.ts","sourceRoot":"","sources":["../src/share-session-storage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"share-session-storage.d.ts","sourceRoot":"","sources":["../src/share-session-storage.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,uBAAuB,EACvB,wBAAwB,EACxB,6BAA6B,EAC7B,uBAAuB,EACvB,6BAA6B,EAC7B,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,oBAAoB,CAAA;AAG3B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAEnD,qBAAa,qBAAsB,YAAW,mBAAmB;IACnD,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,EAAE,aAAa;IAEzC,MAAM,CAAC,KAAK,EAAE,uBAAuB,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAiCnE,OAAO,CAAC,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAS5E,YAAY,CAAC,KAAK,EAAE,6BAA6B,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAkBtF,YAAY,CAAC,KAAK,EAAE,6BAA6B,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAgBtF,MAAM,CAAC,KAAK,EAAE,uBAAuB,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;CAgBjF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sixb/pg",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.3",
|
|
4
4
|
"description": "PostgreSQL storage provider for Sixb",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"sixb",
|
|
@@ -40,10 +40,10 @@
|
|
|
40
40
|
"postgres": "^3.4.5"
|
|
41
41
|
},
|
|
42
42
|
"peerDependencies": {
|
|
43
|
-
"@sixb/core": "0.2.
|
|
43
|
+
"@sixb/core": "0.2.3"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
|
-
"@sixb/core": "0.2.
|
|
46
|
+
"@sixb/core": "0.2.3",
|
|
47
47
|
"@types/bun": "latest",
|
|
48
48
|
"typescript": "^5.7.0"
|
|
49
49
|
},
|
package/src/agents/computers.ts
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
AGENT_COMPUTER_BACKGROUND_COMMANDS_MAX,
|
|
3
|
+
assertAgentBackgroundCommandRef,
|
|
4
|
+
assertAgentComputerSession,
|
|
5
|
+
} from "@sixb/core/internal/agent-run-storage-provider"
|
|
2
6
|
import type {
|
|
7
|
+
AgentBackgroundCommandRef,
|
|
8
|
+
AgentComputerBackgroundCommand,
|
|
3
9
|
AgentComputerSessionRecord,
|
|
4
10
|
AgentComputerSessionStore,
|
|
5
11
|
Principal,
|
|
@@ -15,30 +21,71 @@ interface AgentComputerSessionRow {
|
|
|
15
21
|
computer_name: string
|
|
16
22
|
folder: string
|
|
17
23
|
expires_at: Date | string
|
|
24
|
+
background_commands: readonly AgentComputerBackgroundCommand[]
|
|
25
|
+
stop_requests: readonly AgentBackgroundCommandRef[]
|
|
18
26
|
}
|
|
19
27
|
|
|
20
28
|
export class PgAgentComputerSessionStore implements AgentComputerSessionStore {
|
|
21
29
|
constructor(private readonly sql: PgStoreClient) {}
|
|
22
30
|
|
|
23
|
-
async hold(input: AgentComputerSessionRecord): Promise<void> {
|
|
31
|
+
async hold(input: Omit<AgentComputerSessionRecord, "stopRequests">): Promise<void> {
|
|
24
32
|
assertAgentComputerSession(input, "SixbPg")
|
|
33
|
+
const background = JSON.stringify(input.backgroundCommands ?? [])
|
|
25
34
|
await this.sql`
|
|
26
35
|
INSERT INTO agent_computer_sessions (
|
|
27
36
|
project_id, owner_principal_type, owner_principal_id, id,
|
|
28
|
-
computer_id, computer_name, folder, expires_at
|
|
37
|
+
computer_id, computer_name, folder, expires_at, background_commands
|
|
29
38
|
) VALUES (
|
|
30
39
|
${input.projectId}, ${input.ownerPrincipal.type}, ${input.ownerPrincipal.id}, ${input.id},
|
|
31
|
-
${input.computer.id}, ${input.computer.name}, ${input.computer.folder}, ${input.expiresAt}
|
|
40
|
+
${input.computer.id}, ${input.computer.name}, ${input.computer.folder}, ${input.expiresAt},
|
|
41
|
+
${background}::text::jsonb
|
|
32
42
|
)
|
|
33
43
|
ON CONFLICT (project_id, owner_principal_type, owner_principal_id, id)
|
|
34
44
|
DO UPDATE SET
|
|
35
45
|
computer_id = excluded.computer_id,
|
|
36
46
|
computer_name = excluded.computer_name,
|
|
37
47
|
folder = excluded.folder,
|
|
38
|
-
expires_at = excluded.expires_at
|
|
48
|
+
expires_at = excluded.expires_at,
|
|
49
|
+
background_commands = excluded.background_commands
|
|
39
50
|
`
|
|
40
51
|
}
|
|
41
52
|
|
|
53
|
+
async requestStop(input: {
|
|
54
|
+
readonly projectId: string
|
|
55
|
+
readonly id: string
|
|
56
|
+
readonly ownerPrincipal: Principal
|
|
57
|
+
readonly command: AgentBackgroundCommandRef
|
|
58
|
+
}): Promise<AgentComputerSessionRecord | null> {
|
|
59
|
+
assertAgentBackgroundCommandRef(input.command, "SixbPg")
|
|
60
|
+
const { threadId, id, startedAt } = input.command
|
|
61
|
+
const ref = JSON.stringify({ threadId, id, startedAt })
|
|
62
|
+
// Added once, at the end, keeping the newest: in one statement, as two stops may race.
|
|
63
|
+
const [row] = await this.sql<AgentComputerSessionRow[]>`
|
|
64
|
+
UPDATE agent_computer_sessions AS session
|
|
65
|
+
SET stop_requests = (
|
|
66
|
+
SELECT COALESCE(jsonb_agg(kept.value ORDER BY kept.position), '[]'::jsonb)
|
|
67
|
+
FROM (
|
|
68
|
+
SELECT request.value, request.position
|
|
69
|
+
FROM jsonb_array_elements(
|
|
70
|
+
CASE
|
|
71
|
+
WHEN session.stop_requests @> jsonb_build_array(${ref}::text::jsonb)
|
|
72
|
+
THEN session.stop_requests
|
|
73
|
+
ELSE session.stop_requests || jsonb_build_array(${ref}::text::jsonb)
|
|
74
|
+
END
|
|
75
|
+
) WITH ORDINALITY AS request(value, position)
|
|
76
|
+
ORDER BY request.position DESC
|
|
77
|
+
LIMIT ${AGENT_COMPUTER_BACKGROUND_COMMANDS_MAX}
|
|
78
|
+
) AS kept
|
|
79
|
+
)
|
|
80
|
+
WHERE project_id = ${input.projectId}
|
|
81
|
+
AND owner_principal_type = ${input.ownerPrincipal.type}
|
|
82
|
+
AND owner_principal_id = ${input.ownerPrincipal.id}
|
|
83
|
+
AND id = ${input.id}
|
|
84
|
+
RETURNING *
|
|
85
|
+
`
|
|
86
|
+
return row ? rowToSession(row) : null
|
|
87
|
+
}
|
|
88
|
+
|
|
42
89
|
async release(input: {
|
|
43
90
|
readonly projectId: string
|
|
44
91
|
readonly id: string
|
|
@@ -91,5 +138,7 @@ function rowToSession(row: AgentComputerSessionRow): AgentComputerSessionRecord
|
|
|
91
138
|
ownerPrincipal: { type: row.owner_principal_type, id: row.owner_principal_id },
|
|
92
139
|
computer: { id: row.computer_id, name: row.computer_name, folder: row.folder },
|
|
93
140
|
expiresAt: new Date(row.expires_at),
|
|
141
|
+
...(row.background_commands.length > 0 ? { backgroundCommands: row.background_commands } : {}),
|
|
142
|
+
...(row.stop_requests.length > 0 ? { stopRequests: row.stop_requests } : {}),
|
|
94
143
|
}
|
|
95
144
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type {
|
|
2
|
+
ApplyDirectoryVerdictInput,
|
|
2
3
|
AuthStorage,
|
|
3
4
|
CompleteDeviceAuthorizationInput,
|
|
4
5
|
CompleteDeviceAuthorizationResult,
|
|
@@ -431,6 +432,7 @@ export class PgAuthStorage implements AuthStorage {
|
|
|
431
432
|
display_name: user.displayName ?? null,
|
|
432
433
|
avatar_url: user.avatarUrl ?? null,
|
|
433
434
|
status: user.status,
|
|
435
|
+
suspension_source: null,
|
|
434
436
|
created_at: user.createdAt,
|
|
435
437
|
updated_at: user.updatedAt,
|
|
436
438
|
}
|
|
@@ -516,6 +518,7 @@ export class PgAuthStorage implements AuthStorage {
|
|
|
516
518
|
const [updated] = await tx<PgAuthUserRow[]>`
|
|
517
519
|
UPDATE auth_users
|
|
518
520
|
SET status = 'suspended',
|
|
521
|
+
suspension_source = 'manual',
|
|
519
522
|
updated_at = ${input.suspendedAt}
|
|
520
523
|
WHERE project_id = ${input.projectId}
|
|
521
524
|
AND id = ${input.userId}
|
|
@@ -532,6 +535,69 @@ export class PgAuthStorage implements AuthStorage {
|
|
|
532
535
|
})
|
|
533
536
|
}
|
|
534
537
|
|
|
538
|
+
async applyDirectoryVerdict(input: ApplyDirectoryVerdictInput): Promise<UpdateAuthUserResult> {
|
|
539
|
+
return runPgTransaction(this.sql, async (tx) => {
|
|
540
|
+
await lockAdvisoryKeys(tx, [authLockKey("sessions", input.projectId, input.userId)])
|
|
541
|
+
const existing = await getUserRowById(
|
|
542
|
+
tx,
|
|
543
|
+
{ projectId: input.projectId, id: input.userId },
|
|
544
|
+
{ forUpdate: true }
|
|
545
|
+
)
|
|
546
|
+
if (!existing) {
|
|
547
|
+
throw new AuthStorageError(
|
|
548
|
+
"missing_user",
|
|
549
|
+
`[Sixb] User '${input.userId}' not found for project '${input.projectId}'.`
|
|
550
|
+
)
|
|
551
|
+
}
|
|
552
|
+
|
|
553
|
+
const previousUser = rowToUserRecord(existing)
|
|
554
|
+
// Only the directory lifts its own suspensions; anyone else's stands.
|
|
555
|
+
if (existing.status === "suspended" && existing.suspension_source !== "directory") {
|
|
556
|
+
return { user: previousUser, previousUser }
|
|
557
|
+
}
|
|
558
|
+
|
|
559
|
+
if (input.verdict.status === "inactive") {
|
|
560
|
+
if (existing.status === "suspended") return { user: previousUser, previousUser }
|
|
561
|
+
const [suspended] = await tx<PgAuthUserRow[]>`
|
|
562
|
+
UPDATE auth_users
|
|
563
|
+
SET status = 'suspended',
|
|
564
|
+
suspension_source = 'directory',
|
|
565
|
+
updated_at = ${input.appliedAt}
|
|
566
|
+
WHERE project_id = ${input.projectId}
|
|
567
|
+
AND id = ${input.userId}
|
|
568
|
+
RETURNING *
|
|
569
|
+
`
|
|
570
|
+
await revokeActiveSessionsForUser(tx, {
|
|
571
|
+
projectId: input.projectId,
|
|
572
|
+
userId: input.userId,
|
|
573
|
+
revokedAt: input.appliedAt,
|
|
574
|
+
})
|
|
575
|
+
return { user: rowToUserRecord(suspended), previousUser }
|
|
576
|
+
}
|
|
577
|
+
|
|
578
|
+
let row = existing
|
|
579
|
+
if (existing.status === "suspended") {
|
|
580
|
+
;[row] = await tx<PgAuthUserRow[]>`
|
|
581
|
+
UPDATE auth_users
|
|
582
|
+
SET status = ${"active"},
|
|
583
|
+
suspension_source = NULL,
|
|
584
|
+
updated_at = ${input.appliedAt}
|
|
585
|
+
WHERE project_id = ${input.projectId}
|
|
586
|
+
AND id = ${input.userId}
|
|
587
|
+
RETURNING *
|
|
588
|
+
`
|
|
589
|
+
}
|
|
590
|
+
await this.syncDirectoryGroups(tx, {
|
|
591
|
+
completedAt: input.appliedAt,
|
|
592
|
+
existing: [],
|
|
593
|
+
groupIds: input.verdict.groupIds,
|
|
594
|
+
projectId: input.projectId,
|
|
595
|
+
userId: input.userId,
|
|
596
|
+
})
|
|
597
|
+
return { user: rowToUserRecord(row), previousUser }
|
|
598
|
+
})
|
|
599
|
+
}
|
|
600
|
+
|
|
535
601
|
private assertMagicLinkUsable(
|
|
536
602
|
projectId: string,
|
|
537
603
|
id: string,
|
|
@@ -82,4 +82,19 @@ export class PgAuthUserIdentityStore implements AuthUserIdentityStore {
|
|
|
82
82
|
|
|
83
83
|
return rows.map(rowToIdentityRecord)
|
|
84
84
|
}
|
|
85
|
+
|
|
86
|
+
async listForStrategy(params: {
|
|
87
|
+
readonly projectId: string
|
|
88
|
+
readonly strategyId: string
|
|
89
|
+
}): Promise<readonly UserIdentityRecord[]> {
|
|
90
|
+
const rows = await this.sql<PgAuthUserIdentityRow[]>`
|
|
91
|
+
SELECT *
|
|
92
|
+
FROM auth_user_identities
|
|
93
|
+
WHERE project_id = ${params.projectId}
|
|
94
|
+
AND strategy_id = ${params.strategyId}
|
|
95
|
+
ORDER BY subject COLLATE "C" ASC
|
|
96
|
+
`
|
|
97
|
+
|
|
98
|
+
return rows.map(rowToIdentityRecord)
|
|
99
|
+
}
|
|
85
100
|
}
|
package/src/auth-storage/rows.ts
CHANGED
|
@@ -15,6 +15,7 @@ import type {
|
|
|
15
15
|
UserIdentityRecord,
|
|
16
16
|
UserRecord,
|
|
17
17
|
UserStatus,
|
|
18
|
+
UserSuspensionSource,
|
|
18
19
|
} from "@sixb/core/storage"
|
|
19
20
|
|
|
20
21
|
type PgDate = Date | string
|
|
@@ -26,6 +27,7 @@ export interface PgAuthUserRow {
|
|
|
26
27
|
readonly display_name: string | null
|
|
27
28
|
readonly avatar_url: string | null
|
|
28
29
|
readonly status: UserStatus
|
|
30
|
+
readonly suspension_source: UserSuspensionSource | null
|
|
29
31
|
readonly created_at: PgDate
|
|
30
32
|
readonly updated_at: PgDate
|
|
31
33
|
}
|
|
@@ -177,6 +179,7 @@ export function rowToUserRecord(row: PgAuthUserRow): UserRecord {
|
|
|
177
179
|
displayName: row.display_name ?? undefined,
|
|
178
180
|
avatarUrl: row.avatar_url ?? undefined,
|
|
179
181
|
status: row.status,
|
|
182
|
+
...(row.suspension_source === null ? {} : { suspensionSource: row.suspension_source }),
|
|
180
183
|
createdAt: toDate(row.created_at),
|
|
181
184
|
updatedAt: toDate(row.updated_at),
|
|
182
185
|
}
|
|
@@ -58,6 +58,7 @@ export class PgAuthUserStore implements AuthUserStore {
|
|
|
58
58
|
display_name,
|
|
59
59
|
avatar_url,
|
|
60
60
|
status,
|
|
61
|
+
suspension_source,
|
|
61
62
|
created_at,
|
|
62
63
|
updated_at
|
|
63
64
|
) VALUES (
|
|
@@ -67,6 +68,7 @@ export class PgAuthUserStore implements AuthUserStore {
|
|
|
67
68
|
${input.displayName ?? null},
|
|
68
69
|
${input.avatarUrl ?? null},
|
|
69
70
|
${input.status ?? "active"},
|
|
71
|
+
${input.status === "suspended" ? "manual" : null},
|
|
70
72
|
${createdAt},
|
|
71
73
|
${updatedAt}
|
|
72
74
|
)
|
|
@@ -185,6 +187,7 @@ export class PgAuthUserStore implements AuthUserStore {
|
|
|
185
187
|
const [row] = await tx<PgAuthUserRow[]>`
|
|
186
188
|
UPDATE auth_users
|
|
187
189
|
SET status = ${input.status},
|
|
190
|
+
suspension_source = ${input.status === "suspended" ? "manual" : null},
|
|
188
191
|
updated_at = ${updatedAt}
|
|
189
192
|
WHERE project_id = ${input.projectId}
|
|
190
193
|
AND id = ${input.id}
|
|
@@ -2,13 +2,16 @@ import {
|
|
|
2
2
|
type ConnectorConnectionPersistence,
|
|
3
3
|
type ConnectorConnectionPersistenceBackend,
|
|
4
4
|
type ConnectorConnectionPersistenceScope,
|
|
5
|
+
connectorConnectionOwnerFromColumns,
|
|
5
6
|
DurableConnectorConnectionStorage,
|
|
7
|
+
connectorConnectionOwnerColumns as ownerColumns,
|
|
6
8
|
} from "@sixb/core/internal/connector-connection-storage-provider"
|
|
7
9
|
import type {
|
|
8
10
|
ConnectorAuthorizationAttemptRecord,
|
|
9
11
|
ConnectorAuthorizationRecord,
|
|
10
12
|
ConnectorConnectionRecord,
|
|
11
13
|
ConnectorConnectionRunRecord,
|
|
14
|
+
ConnectorConnectionSelector,
|
|
12
15
|
ConnectorCredentialMutation,
|
|
13
16
|
ConnectorStagedCredentials,
|
|
14
17
|
} from "@sixb/core/storage"
|
|
@@ -76,15 +79,17 @@ class PgConnectorConnectionPersistence implements ConnectorConnectionPersistence
|
|
|
76
79
|
}
|
|
77
80
|
|
|
78
81
|
async insertAuthorizationAttempt(record: ConnectorAuthorizationAttemptRecord): Promise<boolean> {
|
|
82
|
+
const owner = ownerColumns(record.owner)
|
|
79
83
|
try {
|
|
80
84
|
await this.sql`
|
|
81
85
|
INSERT INTO connector_authorization_attempts (
|
|
82
|
-
project_id, connector_id, id, slot, initiated_by_execution_id,
|
|
86
|
+
project_id, connector_id, id, owner_type, owner_id, slot, initiated_by_execution_id,
|
|
83
87
|
state_hash, code_verifier, redirect_uri, connection_run_id, return_to,
|
|
84
88
|
callback_binding_hash, reauthorization_id, reauthorization_revision,
|
|
85
89
|
reauthorization_connection_ids, created_at, expires_at
|
|
86
90
|
) VALUES (
|
|
87
|
-
${record.projectId}, ${record.connectorId}, ${record.id},
|
|
91
|
+
${record.projectId}, ${record.connectorId}, ${record.id},
|
|
92
|
+
${owner.ownerType}, ${owner.ownerId}, ${record.slot},
|
|
88
93
|
${record.initiatedByExecutionId}, ${record.stateHash},
|
|
89
94
|
${record.codeVerifier === undefined ? null : jsonParameter(this.sql, record.codeVerifier)}, ${record.redirectUri},
|
|
90
95
|
${record.connectionRunId ?? null}, ${record.returnTo ?? null},
|
|
@@ -158,13 +163,14 @@ class PgConnectorConnectionPersistence implements ConnectorConnectionPersistence
|
|
|
158
163
|
const values = runValues(record)
|
|
159
164
|
await this.sql`
|
|
160
165
|
INSERT INTO connector_connection_runs (
|
|
161
|
-
project_id, connector_id, id, kind, slot, initiated_by_execution_id,
|
|
166
|
+
project_id, connector_id, id, kind, owner_type, owner_id, slot, initiated_by_execution_id,
|
|
162
167
|
status, waiting_for, processing_id, callback_started_at,
|
|
163
168
|
expires_at, authorization_id, cleanup_authorization_id, connections, error,
|
|
164
169
|
created_at, updated_at, finished_at
|
|
165
170
|
) VALUES (
|
|
166
171
|
${record.projectId}, ${record.connectorId}, ${record.id}, ${values.kind},
|
|
167
|
-
${values.
|
|
172
|
+
${values.ownerType}, ${values.ownerId}, ${values.slot},
|
|
173
|
+
${values.initiatedByExecutionId}, ${values.status},
|
|
168
174
|
${values.waitingFor}, ${values.processingId},
|
|
169
175
|
${values.callbackStartedAt}, ${values.expiresAt}, ${values.authorizationId},
|
|
170
176
|
${values.cleanupAuthorizationId},
|
|
@@ -199,8 +205,8 @@ class PgConnectorConnectionPersistence implements ConnectorConnectionPersistence
|
|
|
199
205
|
const values = runValues(record)
|
|
200
206
|
const rows = await this.sql<{ readonly id: string }[]>`
|
|
201
207
|
UPDATE connector_connection_runs
|
|
202
|
-
SET kind = ${values.kind},
|
|
203
|
-
initiated_by_execution_id = ${values.initiatedByExecutionId}, status = ${values.status},
|
|
208
|
+
SET kind = ${values.kind}, owner_type = ${values.ownerType}, owner_id = ${values.ownerId},
|
|
209
|
+
slot = ${values.slot}, initiated_by_execution_id = ${values.initiatedByExecutionId}, status = ${values.status},
|
|
204
210
|
waiting_for = ${values.waitingFor},
|
|
205
211
|
processing_id = ${values.processingId}, callback_started_at = ${values.callbackStartedAt},
|
|
206
212
|
expires_at = ${values.expiresAt}, authorization_id = ${values.authorizationId},
|
|
@@ -292,14 +298,15 @@ class PgConnectorConnectionPersistence implements ConnectorConnectionPersistence
|
|
|
292
298
|
}
|
|
293
299
|
|
|
294
300
|
async insertConnection(record: ConnectorConnectionRecord): Promise<boolean> {
|
|
301
|
+
const owner = ownerColumns(record.owner)
|
|
295
302
|
try {
|
|
296
303
|
await this.sql`
|
|
297
304
|
INSERT INTO connector_connections (
|
|
298
|
-
project_id, connector_id, id, authorization_id, slot, account,
|
|
305
|
+
project_id, connector_id, id, authorization_id, owner_type, owner_id, slot, account,
|
|
299
306
|
account_id, status, disconnected_at, created_at, updated_at
|
|
300
307
|
) VALUES (
|
|
301
308
|
${record.projectId}, ${record.connectorId}, ${record.id}, ${record.authorizationId},
|
|
302
|
-
${record.slot}, ${jsonParameter(this.sql, record.account)},
|
|
309
|
+
${owner.ownerType}, ${owner.ownerId}, ${record.slot}, ${jsonParameter(this.sql, record.account)},
|
|
303
310
|
${record.account.id}, ${record.status}, ${record.disconnectedAt ?? null},
|
|
304
311
|
${record.createdAt}, ${record.updatedAt}
|
|
305
312
|
)
|
|
@@ -316,14 +323,15 @@ class PgConnectorConnectionPersistence implements ConnectorConnectionPersistence
|
|
|
316
323
|
return rows[0] ? connectionFromRow(rows[0]) : null
|
|
317
324
|
}
|
|
318
325
|
|
|
319
|
-
async getConnectionBySelector(
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
}): Promise<ConnectorConnectionRecord | null> {
|
|
326
|
+
async getConnectionBySelector(
|
|
327
|
+
input: ConnectorConnectionSelector
|
|
328
|
+
): Promise<ConnectorConnectionRecord | null> {
|
|
323
329
|
if (!this.scope.connectorId) return null
|
|
330
|
+
const owner = ownerColumns(input.owner)
|
|
324
331
|
const rows = await this.sql<PgConnectionRow[]>`
|
|
325
332
|
SELECT * FROM connector_connections
|
|
326
333
|
WHERE project_id = ${this.scope.projectId} AND connector_id = ${this.scope.connectorId}
|
|
334
|
+
AND owner_type = ${owner.ownerType} AND owner_id = ${owner.ownerId}
|
|
327
335
|
AND slot = ${input.slot}
|
|
328
336
|
${this.lockClause()}
|
|
329
337
|
`
|
|
@@ -365,9 +373,11 @@ class PgConnectorConnectionPersistence implements ConnectorConnectionPersistence
|
|
|
365
373
|
}
|
|
366
374
|
|
|
367
375
|
async updateConnection(record: ConnectorConnectionRecord): Promise<void> {
|
|
376
|
+
const owner = ownerColumns(record.owner)
|
|
368
377
|
const rows = await this.sql<{ readonly id: string }[]>`
|
|
369
378
|
UPDATE connector_connections
|
|
370
|
-
SET authorization_id = ${record.authorizationId},
|
|
379
|
+
SET authorization_id = ${record.authorizationId}, owner_type = ${owner.ownerType},
|
|
380
|
+
owner_id = ${owner.ownerId}, slot = ${record.slot},
|
|
371
381
|
account = ${jsonParameter(this.sql, record.account)},
|
|
372
382
|
account_id = ${record.account.id}, status = ${record.status},
|
|
373
383
|
disconnected_at = ${record.disconnectedAt ?? null}, updated_at = ${record.updatedAt}
|
|
@@ -435,7 +445,7 @@ function authorizationAttemptFromRow(
|
|
|
435
445
|
id: row.id,
|
|
436
446
|
projectId: row.project_id,
|
|
437
447
|
connectorId: row.connector_id,
|
|
438
|
-
owner:
|
|
448
|
+
owner: connectorConnectionOwnerFromColumns(row.owner_type, row.owner_id),
|
|
439
449
|
slot: row.slot,
|
|
440
450
|
initiatedByExecutionId: row.initiated_by_execution_id,
|
|
441
451
|
stateHash: row.state_hash,
|
|
@@ -461,6 +471,7 @@ function authorizationAttemptFromRow(
|
|
|
461
471
|
function runValues(record: ConnectorConnectionRunRecord) {
|
|
462
472
|
return {
|
|
463
473
|
kind: record.kind,
|
|
474
|
+
...ownerColumns(record.owner),
|
|
464
475
|
slot: record.slot,
|
|
465
476
|
initiatedByExecutionId: record.initiatedByExecutionId,
|
|
466
477
|
status: record.status,
|
|
@@ -489,7 +500,7 @@ function connectionRunFromRow(row: PgConnectionRunRow): ConnectorConnectionRunRe
|
|
|
489
500
|
projectId: row.project_id,
|
|
490
501
|
connectorId: row.connector_id,
|
|
491
502
|
kind: row.kind,
|
|
492
|
-
owner:
|
|
503
|
+
owner: connectorConnectionOwnerFromColumns(row.owner_type, row.owner_id),
|
|
493
504
|
slot: row.slot,
|
|
494
505
|
initiatedByExecutionId: row.initiated_by_execution_id,
|
|
495
506
|
createdAt: date(row.created_at),
|
|
@@ -635,7 +646,7 @@ function connectionFromRow(row: PgConnectionRow): ConnectorConnectionRecord {
|
|
|
635
646
|
projectId: row.project_id,
|
|
636
647
|
connectorId: row.connector_id,
|
|
637
648
|
authorizationId: row.authorization_id,
|
|
638
|
-
owner:
|
|
649
|
+
owner: connectorConnectionOwnerFromColumns(row.owner_type, row.owner_id),
|
|
639
650
|
slot: row.slot,
|
|
640
651
|
account: row.account,
|
|
641
652
|
status: row.status,
|
|
@@ -694,6 +705,8 @@ interface PgAuthorizationAttemptRow {
|
|
|
694
705
|
readonly project_id: string
|
|
695
706
|
readonly connector_id: string
|
|
696
707
|
readonly id: string
|
|
708
|
+
readonly owner_type: string
|
|
709
|
+
readonly owner_id: string
|
|
697
710
|
readonly slot: string
|
|
698
711
|
readonly initiated_by_execution_id: string
|
|
699
712
|
readonly state_hash: string
|
|
@@ -714,6 +727,8 @@ interface PgConnectionRunRow {
|
|
|
714
727
|
readonly connector_id: string
|
|
715
728
|
readonly id: string
|
|
716
729
|
readonly kind: ConnectorConnectionRunRecord["kind"]
|
|
730
|
+
readonly owner_type: string
|
|
731
|
+
readonly owner_id: string
|
|
717
732
|
readonly slot: string
|
|
718
733
|
readonly initiated_by_execution_id: string
|
|
719
734
|
readonly status: ConnectorConnectionRunRecord["status"]
|
|
@@ -761,6 +776,8 @@ interface PgConnectionRow {
|
|
|
761
776
|
readonly connector_id: string
|
|
762
777
|
readonly id: string
|
|
763
778
|
readonly authorization_id: string
|
|
779
|
+
readonly owner_type: string
|
|
780
|
+
readonly owner_id: string
|
|
764
781
|
readonly slot: string
|
|
765
782
|
readonly account: ConnectorConnectionRecord["account"]
|
|
766
783
|
readonly status: ConnectorConnectionRecord["status"]
|