@cascade-flow/backend-postgres 0.2.4 → 0.2.7

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.
Files changed (4) hide show
  1. package/dist/db.d.ts.map +1 -1
  2. package/dist/index.js +70 -16
  3. package/dist/index.js.map +3 -3
  4. package/package.json +1 -1
package/dist/db.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../src/db.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,EACV,KAAK,EACL,SAAS,EAET,gBAAgB,EAChB,cAAc,EAEf,MAAM,iCAAiC,CAAC;AAGzC,YAAY,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAE/B;;GAEG;AACH,qBAAa,cAAc;IAEvB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,MAAM;gBADN,IAAI,EAAE,EAAE,CAAC,IAAI,EACb,MAAM,EAAE,MAAM;IAGxB;;OAEG;IACH,OAAO,IAAI,EAAE,CAAC,IAAI;IAIlB;;OAEG;IACH,SAAS,IAAI,MAAM;IAInB;;;OAGG;IACG,WAAW,CACf,KAAK,EAAE,iBAAiB,GAAG,aAAa,EACxC,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,IAAI,CAAC;IAmHhB;;;OAGG;IACG,qBAAqB,CACzB,MAAM,EAAE,EAAE,CAAC,UAAU,EACrB,KAAK,EAAE,iBAAiB,GAAG,aAAa,EACxC,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,IAAI,CAAC;IA8GhB;;OAEG;IACG,UAAU,CACd,KAAK,EAAE,iBAAiB,GAAG,aAAa,EACxC,OAAO,EAAE;QACP,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,QAAQ,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC;QAC/B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;KAClB,GACA,OAAO,CAAC,KAAK,EAAE,CAAC;IA8CnB;;OAEG;IACG,gBAAgB,CACpB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,KAAK,EAAE,CAAC;IAoBnB;;;OAGG;IACG,kBAAkB,CACtB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,SAAS,GACtB,OAAO,CAAC,OAAO,CAAC;IA+FnB;;;OAGG;IACG,kBAAkB,CACtB,OAAO,CAAC,EAAE;QACR,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;QACzB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,GACA,OAAO,CAAC,KAAK,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IA6C1E;;;OAGG;IACG,cAAc,CAClB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,KAAK,CAAC;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAiC5F;;OAEG;IACG,cAAc,CAClB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,GAAG,GACV,OAAO,CAAC,IAAI,CAAC;IAehB;;OAEG;IACG,cAAc,CAClB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC;IAetB;;OAEG;IACG,sBAAsB,CAC1B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,eAAe,EAAE,GAAG,GAAG,SAAS,GAC/B,OAAO,CAAC,IAAI,CAAC;IAyBhB;;OAEG;IACG,oBAAoB,CACxB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IA6BhB;;OAEG;IACG,mBAAmB,CACvB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;IA0BnC;;OAEG;IACG,oBAAoB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAoBzD;;OAEG;IACG,gBAAgB,CACpB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,cAAc,EAAE,CAAC;IAsB5B;;OAEG;IACG,kBAAkB,CACtB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,MAAM,CAAC;IAkBlB;;OAEG;IACG,UAAU,CACd,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,EAAE,CAAC;IAkBpB;;OAEG;IACG,mBAAmB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAqB9C;;OAEG;IACG,SAAS,CACb,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,OAAO,CAAC;CAapB;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,gBAAgB,EAAE,MAAM,GAAG,EAAE,CAAC,IAAI,CAE5D"}
1
+ {"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../src/db.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -4797,19 +4797,33 @@ class DatabaseClient {
4797
4797
  let priority = null;
4798
4798
  let timeoutUs = null;
4799
4799
  let idempotencyKey = null;
4800
+ let versionId = null;
4800
4801
  if (we.type === "RunSubmitted") {
4801
4802
  availableAtUs = we.availableAtUs;
4802
4803
  priority = we.priority;
4803
4804
  timeoutUs = we.timeoutUs ?? null;
4804
4805
  idempotencyKey = we.idempotencyKey ?? null;
4806
+ versionId = we.versionId;
4805
4807
  } else if ("workflowAttemptNumber" in we) {
4806
4808
  workflowAttemptNumber = we.workflowAttemptNumber;
4807
4809
  }
4810
+ if (we.type === "WorkflowStarted") {
4811
+ versionId = we.versionId;
4812
+ }
4813
+ if (versionId === null) {
4814
+ const versionResult = await client.query(`SELECT version_id FROM ${this.schema}.workflow_events
4815
+ WHERE workflow_slug = $1 AND run_id = $2
4816
+ AND type IN ('WorkflowStarted', 'RunSubmitted')
4817
+ AND version_id IS NOT NULL
4818
+ ORDER BY timestamp_us DESC, event_id DESC
4819
+ LIMIT 1`, [we.workflowSlug, we.runId]);
4820
+ versionId = versionResult.rows[0]?.version_id ?? null;
4821
+ }
4808
4822
  await client.query(`INSERT INTO ${this.schema}.workflow_events (
4809
4823
  event_id, workflow_slug, run_id, timestamp_us, category, type, event_data,
4810
- workflow_attempt_number, available_at_us, priority, timeout_us, idempotency_key
4824
+ workflow_attempt_number, available_at_us, priority, timeout_us, idempotency_key, version_id
4811
4825
  )
4812
- VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)`, [
4826
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)`, [
4813
4827
  we.eventId,
4814
4828
  we.workflowSlug,
4815
4829
  we.runId,
@@ -4821,7 +4835,8 @@ class DatabaseClient {
4821
4835
  availableAtUs,
4822
4836
  priority,
4823
4837
  timeoutUs,
4824
- idempotencyKey
4838
+ idempotencyKey,
4839
+ versionId
4825
4840
  ]);
4826
4841
  } else {
4827
4842
  const se = event;
@@ -4853,13 +4868,20 @@ class DatabaseClient {
4853
4868
  errorStackNormalizedHash = se.errorFingerprints.stackNormalizedHash;
4854
4869
  errorStackPortableHash = se.errorFingerprints.stackPortableHash;
4855
4870
  }
4871
+ const versionResult = await client.query(`SELECT version_id FROM ${this.schema}.workflow_events
4872
+ WHERE workflow_slug = $1 AND run_id = $2
4873
+ AND type IN ('WorkflowStarted', 'RunSubmitted')
4874
+ AND version_id IS NOT NULL
4875
+ ORDER BY timestamp_us DESC, event_id DESC
4876
+ LIMIT 1`, [se.workflowSlug, se.runId]);
4877
+ const versionId = versionResult.rows[0]?.version_id ?? null;
4856
4878
  await client.query(`INSERT INTO ${this.schema}.step_events (
4857
4879
  event_id, workflow_slug, run_id, step_id, timestamp_us, category, type, event_data,
4858
4880
  worker_id, attempt_number, available_at_us, export_output,
4859
4881
  error_name_hash, error_message_hash, error_stack_exact_hash,
4860
- error_stack_normalized_hash, error_stack_portable_hash
4882
+ error_stack_normalized_hash, error_stack_portable_hash, version_id
4861
4883
  )
4862
- VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17)`, [
4884
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18)`, [
4863
4885
  se.eventId,
4864
4886
  se.workflowSlug,
4865
4887
  se.runId,
@@ -4876,7 +4898,8 @@ class DatabaseClient {
4876
4898
  errorMessageHash,
4877
4899
  errorStackExactHash,
4878
4900
  errorStackNormalizedHash,
4879
- errorStackPortableHash
4901
+ errorStackPortableHash,
4902
+ versionId
4880
4903
  ]);
4881
4904
  }
4882
4905
  } finally {
@@ -4891,19 +4914,33 @@ class DatabaseClient {
4891
4914
  let priority = null;
4892
4915
  let timeoutUs = null;
4893
4916
  let idempotencyKey = null;
4917
+ let versionId = null;
4894
4918
  if (we.type === "RunSubmitted") {
4895
4919
  availableAtUs = we.availableAtUs;
4896
4920
  priority = we.priority;
4897
4921
  timeoutUs = we.timeoutUs ?? null;
4898
4922
  idempotencyKey = we.idempotencyKey ?? null;
4923
+ versionId = we.versionId;
4899
4924
  } else if ("workflowAttemptNumber" in we) {
4900
4925
  workflowAttemptNumber = we.workflowAttemptNumber;
4901
4926
  }
4927
+ if (we.type === "WorkflowStarted") {
4928
+ versionId = we.versionId;
4929
+ }
4930
+ if (versionId === null) {
4931
+ const versionResult = await client.query(`SELECT version_id FROM ${this.schema}.workflow_events
4932
+ WHERE workflow_slug = $1 AND run_id = $2
4933
+ AND type IN ('WorkflowStarted', 'RunSubmitted')
4934
+ AND version_id IS NOT NULL
4935
+ ORDER BY timestamp_us DESC, event_id DESC
4936
+ LIMIT 1`, [we.workflowSlug, we.runId]);
4937
+ versionId = versionResult.rows[0]?.version_id ?? null;
4938
+ }
4902
4939
  await client.query(`INSERT INTO ${this.schema}.workflow_events (
4903
4940
  event_id, workflow_slug, run_id, timestamp_us, category, type, event_data,
4904
- workflow_attempt_number, available_at_us, priority, timeout_us, idempotency_key
4941
+ workflow_attempt_number, available_at_us, priority, timeout_us, idempotency_key, version_id
4905
4942
  )
4906
- VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)`, [
4943
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)`, [
4907
4944
  we.eventId,
4908
4945
  we.workflowSlug,
4909
4946
  we.runId,
@@ -4915,7 +4952,8 @@ class DatabaseClient {
4915
4952
  availableAtUs,
4916
4953
  priority,
4917
4954
  timeoutUs,
4918
- idempotencyKey
4955
+ idempotencyKey,
4956
+ versionId
4919
4957
  ]);
4920
4958
  } else {
4921
4959
  const se = event;
@@ -4947,13 +4985,20 @@ class DatabaseClient {
4947
4985
  errorStackNormalizedHash = se.errorFingerprints.stackNormalizedHash;
4948
4986
  errorStackPortableHash = se.errorFingerprints.stackPortableHash;
4949
4987
  }
4988
+ const versionResult = await client.query(`SELECT version_id FROM ${this.schema}.workflow_events
4989
+ WHERE workflow_slug = $1 AND run_id = $2
4990
+ AND type IN ('WorkflowStarted', 'RunSubmitted')
4991
+ AND version_id IS NOT NULL
4992
+ ORDER BY timestamp_us DESC, event_id DESC
4993
+ LIMIT 1`, [se.workflowSlug, se.runId]);
4994
+ const versionId = versionResult.rows[0]?.version_id ?? null;
4950
4995
  await client.query(`INSERT INTO ${this.schema}.step_events (
4951
4996
  event_id, workflow_slug, run_id, step_id, timestamp_us, category, type, event_data,
4952
4997
  worker_id, attempt_number, available_at_us, export_output,
4953
4998
  error_name_hash, error_message_hash, error_stack_exact_hash,
4954
- error_stack_normalized_hash, error_stack_portable_hash
4999
+ error_stack_normalized_hash, error_stack_portable_hash, version_id
4955
5000
  )
4956
- VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17)`, [
5001
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18)`, [
4957
5002
  se.eventId,
4958
5003
  se.workflowSlug,
4959
5004
  se.runId,
@@ -4970,7 +5015,8 @@ class DatabaseClient {
4970
5015
  errorMessageHash,
4971
5016
  errorStackExactHash,
4972
5017
  errorStackNormalizedHash,
4973
- errorStackPortableHash
5018
+ errorStackPortableHash,
5019
+ versionId
4974
5020
  ]);
4975
5021
  }
4976
5022
  }
@@ -5068,13 +5114,20 @@ class DatabaseClient {
5068
5114
  errorStackNormalizedHash = eventToWrite.errorFingerprints.stackNormalizedHash;
5069
5115
  errorStackPortableHash = eventToWrite.errorFingerprints.stackPortableHash;
5070
5116
  }
5117
+ const versionResult = await client.query(`SELECT version_id FROM ${this.schema}.workflow_events
5118
+ WHERE workflow_slug = $1 AND run_id = $2
5119
+ AND type IN ('WorkflowStarted', 'RunSubmitted')
5120
+ AND version_id IS NOT NULL
5121
+ ORDER BY timestamp_us DESC, event_id DESC
5122
+ LIMIT 1`, [eventToWrite.workflowSlug, eventToWrite.runId]);
5123
+ const versionId = versionResult.rows[0]?.version_id ?? null;
5071
5124
  await client.query(`INSERT INTO ${this.schema}.step_events (
5072
5125
  event_id, workflow_slug, run_id, step_id, timestamp_us, category, type, event_data,
5073
5126
  worker_id, attempt_number, available_at_us, export_output,
5074
5127
  error_name_hash, error_message_hash, error_stack_exact_hash,
5075
- error_stack_normalized_hash, error_stack_portable_hash
5128
+ error_stack_normalized_hash, error_stack_portable_hash, version_id
5076
5129
  )
5077
- VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17)`, [
5130
+ VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18)`, [
5078
5131
  eventToWrite.eventId,
5079
5132
  eventToWrite.workflowSlug,
5080
5133
  eventToWrite.runId,
@@ -5091,7 +5144,8 @@ class DatabaseClient {
5091
5144
  errorMessageHash,
5092
5145
  errorStackExactHash,
5093
5146
  errorStackNormalizedHash,
5094
- errorStackPortableHash
5147
+ errorStackPortableHash,
5148
+ versionId
5095
5149
  ]);
5096
5150
  await client.query("COMMIT");
5097
5151
  return true;
@@ -6771,4 +6825,4 @@ export {
6771
6825
  PostgresBackend
6772
6826
  };
6773
6827
 
6774
- //# debugId=9ABA79C867582FE764756E2164756E21
6828
+ //# debugId=A0E144781C28BCEA64756E2164756E21