@vrplatform/kysely 1.3.45-437 → 1.3.45-44053902920
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/build/.data.tar +2 -2
- package/build/main/camel-case/index.d.ts +4 -4
- package/build/main/camel-case/index.js +2 -1
- package/build/main/camel-case/index.js.map +1 -1
- package/build/main/connect-handoff.d.ts +12 -0
- package/build/main/connect-handoff.js +73 -0
- package/build/main/connect-handoff.js.map +1 -0
- package/build/main/control-plane/index.d.ts +62 -1
- package/build/main/control-plane/index.js +10 -0
- package/build/main/control-plane/index.js.map +1 -1
- package/build/main/error.d.ts +2 -2
- package/build/main/error.js.map +1 -1
- package/build/main/index.d.ts +50 -4
- package/build/main/index.js +389 -63
- package/build/main/index.js.map +1 -1
- package/build/main/isomorphic.d.ts +1 -1
- package/build/main/isomorphic.js +3 -1
- package/build/main/isomorphic.js.map +1 -1
- package/build/main/local/digest.js.map +1 -1
- package/build/main/local/generate.js +4 -3
- package/build/main/local/generate.js.map +1 -1
- package/build/main/local/index.js +34 -10
- package/build/main/local/index.js.map +1 -1
- package/build/main/local/prune-pulled-schema.js.map +1 -1
- package/build/main/migration-source.d.ts +4 -0
- package/build/main/migration-source.js +45 -0
- package/build/main/migration-source.js.map +1 -0
- package/build/main/migration.d.ts +5 -5
- package/build/main/pganalyze-comment-plugin/comment-transformer.js +3 -1
- package/build/main/pganalyze-comment-plugin/comment-transformer.js.map +1 -1
- package/build/main/pganalyze-comment-plugin/index.js.map +1 -1
- package/build/main/plugins.js.map +1 -1
- package/build/main/postgres-error.d.ts +1 -0
- package/build/main/postgres-error.js +12 -6
- package/build/main/postgres-error.js.map +1 -1
- package/build/main/query/listing/status.d.ts +2 -2
- package/build/main/query/listing/status.js +6 -2
- package/build/main/query/listing/status.js.map +1 -1
- package/build/main/query/tenant/billing-partner.js.map +1 -1
- package/build/main/query/tenant/feature-enabled.d.ts +6 -0
- package/build/main/query/tenant/feature-enabled.js +30 -0
- package/build/main/query/tenant/feature-enabled.js.map +1 -0
- package/build/main/query/tenant/index.d.ts +2 -0
- package/build/main/query/tenant/index.js +2 -0
- package/build/main/query/tenant/index.js.map +1 -1
- package/build/main/query/tenant/status.d.ts +1 -6
- package/build/main/query/tenant/status.js +4 -12
- package/build/main/query/tenant/status.js.map +1 -1
- package/build/main/query/tenant/where-uuid-in.d.ts +2 -0
- package/build/main/query/tenant/where-uuid-in.js +14 -0
- package/build/main/query/tenant/where-uuid-in.js.map +1 -0
- package/build/main/regional.d.ts +2 -1
- package/build/main/regional.js +1 -0
- package/build/main/regional.js.map +1 -1
- package/build/main/test/index.d.ts +7 -9
- package/build/main/test/index.js +11 -14
- package/build/main/test/index.js.map +1 -1
- package/build/main/transaction.js.map +1 -1
- package/build/main/v1.generated.d.ts +596 -70
- package/build/main/v1.generated.js.map +1 -1
- package/build/migrations-v2/0000000000033-plaid-connect-session-telemetry.ts +31 -0
- package/build/migrations-v2/0000000000050-connection-oauth-state.ts +43 -0
- package/build/migrations-v2/0000000000051-owner-statement-email-delivery.ts +134 -0
- package/build/migrations-v2/0000000000052-fee-journal-lock-skip-operations.ts +59 -0
- package/build/migrations-v2/0000000000053-fee-journal-lock-skip-null-attempt.ts +44 -0
- package/build/migrations-v2/0000000000054-journal-refresh-issue-codes.ts +16 -0
- package/build/migrations-v2/0000000000055-tenant-billing-subscription.ts +8 -0
- package/build/migrations-v2/0000000000056-journal-operation-failure-precedence.ts +306 -0
- package/build/migrations-v2/0000000000057-journal-invalidation-failure-code.ts +28 -0
- package/build/migrations-v2/0000000000058-journal-invalidation-locked-failure.ts +16 -0
- package/build/migrations-v2/0000000000059-billing-active-listing-cross-region-partner.ts +135 -0
- package/build/migrations-v2/0000000000060-accounting-integrity-change-driven.ts +99 -0
- package/build/migrations-v2/0000000000061-tenant-pending-onboarding-status.ts +37 -0
- package/build/migrations-v2/0000000000062-statement-payout-operations.ts +16 -0
- package/build/migrations-v2/0000000000063-missing-account-assignments-issue-code.ts +13 -0
- package/build/migrations-v2/0000000000064-journal-invalidation-source-lookup-index.ts +26 -0
- package/build/migrations-v2/0000000000065-hasura-connection-event-credentials.ts +42 -0
- package/build/migrations-v2/0000000000066-recurring-fee-listing-subscription-match-by.ts +51 -0
- package/build/migrations-v2/0000000000067-connection-credential-metadata.ts +60 -0
- package/build/migrations-v2/0000000000068-connection-credential-version.ts +34 -0
- package/build/migrations-v2/0000000000069-owner-statement-contact-email-delivery.ts +84 -0
- package/build/migrations-v2/0000000000070-payment-writer-compatibility.ts +69 -0
- package/build/migrations-v2/0000000000071-payments.ts +532 -0
- package/build/migrations-v2/0000000000072-journal-entry-payment-index.ts +21 -0
- package/build/migrations-v2/0000000000073-batch-invalidation-operation-registration.ts +74 -0
- package/build/migrations-v2/0000000000074-owner-statement-email-history.ts +34 -0
- package/build/migrations-v2/0000000000075-tenant-deletion-lookup-indexes.ts +46 -0
- package/build/migrations-v2/0000000000076-tenant-onboarding-not-null.ts +23 -0
- package/build/migrations-v2/0000000000077-payment-writer-statement-attachment.ts +92 -0
- package/build/migrations-v2/0000000000078-trigger-timeout-indexes.ts +44 -0
- package/build/migrations-v2/0000000000079-core-change-tenant-statistics.ts +26 -0
- package/build/migrations-v2/0000000000080-drop-legacy-tracking-event.ts +60 -0
- package/build/migrations-v2/0000000000081-recurring-fee-planner-operation-status.ts +35 -0
- package/build/migrations-v2/0000000000082-reservation-search-trigram-indexes.ts +54 -0
- package/build/migrations-v2/0000000000083-journal-entry-deposit-lookup-index.ts +31 -0
- package/build/migrations-v2/0000000000084-journal-entry-reservation-revenue-indexes.ts +57 -0
- package/build/migrations-v2/0000000000085-owner-statement-link-email-template.ts +23 -0
- package/build/migrations-v2/0000000000086-contact-payment-setup.ts +72 -0
- package/build/migrations-v2/0000000000087-address-delete-fk-indexes.ts +30 -0
- package/build/migrations-v2/0000000000088-owner-statement-email-switch.ts +76 -0
- package/build/migrations-v2/0000000000089-contact-bank-details-requested-at.ts +21 -0
- package/build/migrations-v2/0000000000090-contact-bank-account-api-key.ts +22 -0
- package/build/migrations-v2/0000000000091-contact-bank-details-request.ts +78 -0
- package/build/migrations-v2/0000000000092-payment-provider-reference.ts +22 -0
- package/build/migrations-v2/0000000000093-payment-reversal-offline-undo.ts +18 -0
- package/build/migrations-v2/0000000000094-reservation-status-checkout-index.ts +37 -0
- package/build/migrations-v2/0000000000095-payment-batches.ts +196 -0
- package/build/migrations-v2/0000000000096-guide-ongoing-tasks-issue-codes.ts +26 -0
- package/build/migrations-v2/0000000000097-reservation-line-mapping-suggestions.ts +53 -0
- package/build/migrations-v2/0000000000098-cancelled-reservation-balances-issue-code.ts +13 -0
- package/build/migrations-v2/0000000000099-contact-bank-account-request-source.ts +28 -0
- package/build/migrations-v2/0000000000100-drop-regional-feature-flags.ts +105 -0
- package/build/migrations-v2/0000000000101-bank-record-match-source.ts +45 -0
- package/build/migrations-v2/0000000000102-owner-statement-email-one-template.ts +63 -0
- package/build/migrations-v2/0000000000103-reservation-line-mapping-update-operation.ts +10 -0
- package/build/migrations-v2/0000000000104-export-job-payment-batch-pdf.ts +12 -0
- package/build/migrations-v2/0000000000105-drop-regional-token.ts +60 -0
- package/build/migrations-v2/0000000000106-incremental-audit-action-source.ts +158 -0
- package/build/migrations-v2/0000000000107-audit-mutation-transaction-insert-index.ts +44 -0
- package/build/migrations-v2/0000000000108-reservation-stay-type.ts +24 -0
- package/build/migrations-v2/0000000000109-long-term-liabilities-category-order.ts +21 -0
- package/build/migrations-v2/0000000000110-pms-sync-failures-issue-code.ts +13 -0
- package/build/migrations-v2/0000000000110-reservation-line-type-taxable.ts +21 -0
- package/build/migrations-v2/0000000000111-reservation-line-type-suggestion-taxable.ts +20 -0
- package/build/migrations-v2/0000000000112-contact-payment-method-outside-default.ts +44 -0
- package/build/migrations-v2/0000000000113-merchant-fee-reference-assignment.ts +25 -0
- package/build/migrations-v2/0000000000114-recurring-fee-nights-filter.ts +32 -0
- package/build/migrations-v2/0000000000115-bank-records-with-suggested-rule-issue-code.ts +13 -0
- package/build/migrations-v2/0000000000116-guest-review.ts +45 -0
- package/build/migrations-v2/0000000000117-ramp-external-funding-accounts.ts +91 -0
- package/build/migrations-v2/0000000000118-pm-payout-assignment.ts +25 -0
- package/build/migrations-v2/0000000000119-chart-of-accounts-classifications.ts +46 -0
- package/build/migrations-v2/0000000000120-feedback.ts +41 -0
- package/build/migrations-v2/0000000000121-source-owner-block-calendar-index.ts +43 -0
- package/build/migrations-v2/0000000000122-recurring-fee-stay-types-filter.ts +20 -0
- package/build/migrations-v2/0000000000123-reservation-owner-stay-type-index.ts +40 -0
- package/build/migrations-v2/0000000000124-remove-tenant-test-and-billable-columns.ts +63 -0
- package/build/migrations-v2/0000000000125-ramp-application.ts +56 -0
- package/build/migrations-v2/0000000000126-advanced-deposits-update-operation.ts +10 -0
- package/build/migrations-v2/0000000000127-contact-1099-tax-details.ts +46 -0
- package/build/migrations-v2/0000000000128-tax-1099-email-templates.ts +36 -0
- package/build/migrations-v2/0000000000129-tenant-locked-at.ts +18 -0
- package/build/migrations-v2/0000000000130-second-factor-reset.ts +65 -0
- package/build/migrations-v2/0000000000131-payout-hold.ts +49 -0
- package/build/migrations-v2/0000000000132-member-invite-approval.ts +62 -0
- package/build/migrations-v2/0000000000133-audit-action-client-ip.ts +38 -0
- package/build/migrations-v2/0000000000134-drop-orphaned-hasura-triggers.ts +39 -0
- package/build/migrations-v2/0000000000135-drop-orphaned-hasura-triggers-literal.ts +42 -0
- package/build/migrations-v2/0000000000136-drop-all-hasura-triggers.ts +43 -0
- package/build/migrations-v2/0000000000137-webhook-event.ts +57 -0
- package/build/migrations-v2/0000000000138-contact-tax-details-requested-at.ts +24 -0
- package/build/migrations-v2/0000000000139-tax-statement-1099.ts +140 -0
- package/build/migrations-v2/0000000000140-owner-payment-settings.ts +53 -0
- package/build/migrations-v2/0000000000141-owner-payment-requests.ts +100 -0
- package/build/module/camel-case/index.d.ts +4 -4
- package/build/module/camel-case/index.js +3 -2
- package/build/module/camel-case/index.js.map +1 -1
- package/build/module/connect-handoff.d.ts +12 -0
- package/build/module/connect-handoff.js +70 -0
- package/build/module/connect-handoff.js.map +1 -0
- package/build/module/control-plane/index.d.ts +62 -1
- package/build/module/control-plane/index.js +9 -0
- package/build/module/control-plane/index.js.map +1 -1
- package/build/module/error.d.ts +2 -2
- package/build/module/error.js.map +1 -1
- package/build/module/index.d.ts +50 -4
- package/build/module/index.js +387 -63
- package/build/module/index.js.map +1 -1
- package/build/module/isomorphic.d.ts +1 -1
- package/build/module/isomorphic.js +1 -1
- package/build/module/isomorphic.js.map +1 -1
- package/build/module/local/generate.js +4 -3
- package/build/module/local/generate.js.map +1 -1
- package/build/module/local/index.js +34 -10
- package/build/module/local/index.js.map +1 -1
- package/build/module/local/prune-pulled-schema.js.map +1 -1
- package/build/module/migration-source.d.ts +4 -0
- package/build/module/migration-source.js +42 -0
- package/build/module/migration-source.js.map +1 -0
- package/build/module/migration.d.ts +5 -5
- package/build/module/pganalyze-comment-plugin/comment-transformer.js +3 -1
- package/build/module/pganalyze-comment-plugin/comment-transformer.js.map +1 -1
- package/build/module/postgres-error.d.ts +1 -0
- package/build/module/postgres-error.js +11 -6
- package/build/module/postgres-error.js.map +1 -1
- package/build/module/query/listing/status.d.ts +2 -2
- package/build/module/query/listing/status.js +6 -2
- package/build/module/query/listing/status.js.map +1 -1
- package/build/module/query/tenant/feature-enabled.d.ts +6 -0
- package/build/module/query/tenant/feature-enabled.js +27 -0
- package/build/module/query/tenant/feature-enabled.js.map +1 -0
- package/build/module/query/tenant/index.d.ts +2 -0
- package/build/module/query/tenant/index.js +2 -0
- package/build/module/query/tenant/index.js.map +1 -1
- package/build/module/query/tenant/status.d.ts +1 -6
- package/build/module/query/tenant/status.js +4 -11
- package/build/module/query/tenant/status.js.map +1 -1
- package/build/module/query/tenant/where-uuid-in.d.ts +2 -0
- package/build/module/query/tenant/where-uuid-in.js +11 -0
- package/build/module/query/tenant/where-uuid-in.js.map +1 -0
- package/build/module/regional.d.ts +2 -1
- package/build/module/regional.js +1 -0
- package/build/module/regional.js.map +1 -1
- package/build/module/test/index.d.ts +7 -9
- package/build/module/test/index.js +11 -14
- package/build/module/test/index.js.map +1 -1
- package/build/module/v1.generated.d.ts +596 -70
- package/build/module/v1.generated.js.map +1 -1
- package/package.json +10 -8
package/build/main/index.js
CHANGED
|
@@ -17,10 +17,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
17
17
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
18
18
|
};
|
|
19
19
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
|
+
exports.retryPostgresLockFailure = retryPostgresLockFailure;
|
|
21
|
+
exports.retryPostgresConnectionLoss = retryPostgresConnectionLoss;
|
|
20
22
|
exports.useKysely = useKysely;
|
|
23
|
+
exports.usePostgres = usePostgres;
|
|
21
24
|
exports.useAsyncPostgres = useAsyncPostgres;
|
|
22
25
|
exports.useAsyncKysely = useAsyncKysely;
|
|
23
26
|
exports.useAsyncNeonWebSocketKysely = useAsyncNeonWebSocketKysely;
|
|
27
|
+
exports.useControlPlaneKysely = useControlPlaneKysely;
|
|
24
28
|
exports.useAsyncControlPlaneKysely = useAsyncControlPlaneKysely;
|
|
25
29
|
exports.forceCloseAllPostgres = forceCloseAllPostgres;
|
|
26
30
|
const exponential_backoff_1 = require("exponential-backoff");
|
|
@@ -31,6 +35,8 @@ const postgres_1 = __importDefault(require("postgres"));
|
|
|
31
35
|
const control_plane_1 = require("./control-plane");
|
|
32
36
|
const error_1 = require("./error");
|
|
33
37
|
const plugins_1 = require("./plugins");
|
|
38
|
+
const postgres_error_1 = require("./postgres-error");
|
|
39
|
+
__exportStar(require("./connect-handoff"), exports);
|
|
34
40
|
__exportStar(require("./error"), exports);
|
|
35
41
|
__exportStar(require("./isomorphic"), exports);
|
|
36
42
|
__exportStar(require("./postgres-error"), exports);
|
|
@@ -43,27 +49,204 @@ const retryableMessages = [
|
|
|
43
49
|
'CONNECT_TIMEOUT',
|
|
44
50
|
'Idle connection closed by Hyperdrive.',
|
|
45
51
|
'server_login_retry',
|
|
52
|
+
'Timed out while creating a new server connection.',
|
|
53
|
+
// Neon rejects the login before any statement runs (PRO-19169).
|
|
54
|
+
'Failed to acquire permit to connect to the database',
|
|
46
55
|
];
|
|
47
56
|
const postgresRetryAttempts = 3;
|
|
57
|
+
/**
|
|
58
|
+
* Parameter types PostgreSQL described per statement signature (PRO-18871).
|
|
59
|
+
* Postgres.js describes a statement in a round trip of its own before it can
|
|
60
|
+
* execute it when a parameter type is unknown, and a Worker request always
|
|
61
|
+
* starts on new connections. The patched driver reads and fills this map
|
|
62
|
+
* through its `statement_types` option and then parses, describes, binds and
|
|
63
|
+
* executes a known statement in one round trip. It forgets a statement's
|
|
64
|
+
* types when the statement fails, so a schema change is described again.
|
|
65
|
+
*/
|
|
66
|
+
class StatementTypes extends Map {
|
|
67
|
+
set(signature, types) {
|
|
68
|
+
if (!this.has(signature) && this.size >= 2000) {
|
|
69
|
+
this.delete(this.keys().next().value);
|
|
70
|
+
}
|
|
71
|
+
return super.set(signature, types);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* Named prepared statements one reserved Hyperdrive connection may hold (PRO-19814).
|
|
76
|
+
* Hyperdrive drops a connection that holds about 105: with a limit of 108 or more
|
|
77
|
+
* the paid payout move answered 503 on staging, with 104 or less it passed. A
|
|
78
|
+
* transaction pins its connection, so a statement past the limit runs unnamed
|
|
79
|
+
* there, without the cross-connection mismatch of PRO-17965; one already named
|
|
80
|
+
* stays named. The margin covers statements earlier reservations named on the
|
|
81
|
+
* same connection.
|
|
82
|
+
*/
|
|
83
|
+
const hyperdriveNamedStatementLimit = 64;
|
|
84
|
+
/**
|
|
85
|
+
* Statement types and array types, kept for the isolate's lifetime per
|
|
86
|
+
* database: the control plane, and the regional database of each data region
|
|
87
|
+
* (`''` for the Worker's own). Enum type OIDs differ between databases.
|
|
88
|
+
*
|
|
89
|
+
* Array types map element type OIDs to their array type OIDs. Postgres.js looks
|
|
90
|
+
* them up on every new connection, an origin round trip each, about 100 ms
|
|
91
|
+
* from Frankfurt and 220 ms from Singapore to the control plane (PRO-19580).
|
|
92
|
+
* The first connection fills the map and later connections reuse it. A
|
|
93
|
+
* migration that adds an enum reaches an isolate when it restarts; until then
|
|
94
|
+
* arrays of that enum are neither parsed nor serialized.
|
|
95
|
+
*/
|
|
96
|
+
const hyperdriveTypes = new Map();
|
|
48
97
|
function isRetryableConnectionError(error) {
|
|
49
98
|
const message = error instanceof Error ? error.message : String(error);
|
|
50
99
|
return retryableMessages.some((retryable) => message.includes(retryable));
|
|
51
100
|
}
|
|
101
|
+
function isNodeShuttingDown(error) {
|
|
102
|
+
return (error instanceof Error &&
|
|
103
|
+
(error.message === 'Node shutting down' ||
|
|
104
|
+
error.message === 'Node shutting down.' ||
|
|
105
|
+
error.message === 'shutting down'));
|
|
106
|
+
}
|
|
52
107
|
function isConnectionReset(error) {
|
|
53
108
|
return (error instanceof Error && 'code' in error && error.code === 'ECONNRESET');
|
|
54
109
|
}
|
|
55
|
-
function
|
|
56
|
-
return (
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
110
|
+
function isRetryableConnectionAcquisitionError(error) {
|
|
111
|
+
return (isRetryableConnectionError(error) ||
|
|
112
|
+
isConnectionReset(error) ||
|
|
113
|
+
// Hyperdrive refuses any new connection while its node shuts down
|
|
114
|
+
// (PRO-19168).
|
|
115
|
+
isNodeShuttingDown(error) ||
|
|
116
|
+
(error instanceof Error &&
|
|
117
|
+
(error.message === 'connection attempt failed' ||
|
|
118
|
+
// Opening a connection happens before any statement runs, so the
|
|
119
|
+
// open is safe to retry (PRO-18866).
|
|
120
|
+
error.message === 'Egress connection severed outside of Hyperdrive' ||
|
|
121
|
+
error.message === 'Network connection lost.' ||
|
|
122
|
+
('code' in error && error.code === 'CONNECTION_DESTROYED'))));
|
|
123
|
+
}
|
|
124
|
+
/**
|
|
125
|
+
* Postgres.js closes a reserved connection when its socket dies, whether the
|
|
126
|
+
* statement in flight fails with `CONNECTION_CLOSED` or with the socket error.
|
|
127
|
+
* A statement sent to it afterwards is never answered: it throws in a timer
|
|
128
|
+
* callback or is silently never written (PRO-17710). A destroyed connection
|
|
129
|
+
* rejects at once, so it needs no guard.
|
|
130
|
+
*/
|
|
131
|
+
function isConnectionClosed(error) {
|
|
132
|
+
return (isConnectionReset(error) ||
|
|
133
|
+
(error instanceof Error &&
|
|
134
|
+
'code' in error &&
|
|
135
|
+
(error.code === 'CONNECTION_CLOSED' ||
|
|
136
|
+
error.code === 'EPIPE' ||
|
|
137
|
+
error.code === 'ETIMEDOUT')));
|
|
138
|
+
}
|
|
139
|
+
function isQueryRetryDiagnosticError(error) {
|
|
140
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
141
|
+
return (isRetryableConnectionError(error) ||
|
|
142
|
+
isConnectionReset(error) ||
|
|
143
|
+
message === 'Egress connection severed outside of Hyperdrive' ||
|
|
144
|
+
message === 'Network connection lost.' ||
|
|
145
|
+
isNodeShuttingDown(error));
|
|
146
|
+
}
|
|
147
|
+
async function retryPostgres(operation, retry, diagnostic) {
|
|
148
|
+
let attemptCount = 0;
|
|
149
|
+
let retried = false;
|
|
150
|
+
let lastError;
|
|
151
|
+
const emitDiagnostic = (outcome) => {
|
|
152
|
+
if (!diagnostic)
|
|
153
|
+
return;
|
|
154
|
+
diagnostic.emit({
|
|
155
|
+
attemptCount,
|
|
156
|
+
dataRegion: diagnostic.dataRegion,
|
|
157
|
+
errorClass: lastError instanceof Error
|
|
158
|
+
? 'code' in lastError && typeof lastError.code === 'string'
|
|
159
|
+
? lastError.code
|
|
160
|
+
: lastError.constructor.name
|
|
161
|
+
: 'unknown',
|
|
162
|
+
operationKind: diagnostic.operationKind,
|
|
163
|
+
outcome,
|
|
164
|
+
repositoryName: diagnostic.repositoryName,
|
|
165
|
+
});
|
|
166
|
+
};
|
|
167
|
+
try {
|
|
168
|
+
return await (0, exponential_backoff_1.backOff)(async () => {
|
|
169
|
+
attemptCount++;
|
|
170
|
+
return await operation();
|
|
171
|
+
}, {
|
|
172
|
+
numOfAttempts: postgresRetryAttempts,
|
|
173
|
+
startingDelay: (0, utils_1.parseDuration)('1s'),
|
|
174
|
+
maxDelay: (0, utils_1.parseDuration)('5s'),
|
|
175
|
+
// Scheduled chunk fan-outs open many connections at once; full jitter
|
|
176
|
+
// keeps their retries from reconnecting in lockstep.
|
|
177
|
+
jitter: 'full',
|
|
178
|
+
async retry(error, attemptNumber) {
|
|
179
|
+
lastError = error;
|
|
180
|
+
const shouldRetry = attemptNumber < postgresRetryAttempts &&
|
|
181
|
+
(await retry(error, attemptNumber));
|
|
182
|
+
if (shouldRetry && diagnostic) {
|
|
183
|
+
retried = true;
|
|
184
|
+
emitDiagnostic('retrying');
|
|
185
|
+
}
|
|
186
|
+
return shouldRetry;
|
|
187
|
+
},
|
|
188
|
+
});
|
|
189
|
+
}
|
|
190
|
+
catch (error) {
|
|
191
|
+
lastError = error;
|
|
192
|
+
if (diagnostic?.shouldEmit(error)) {
|
|
193
|
+
emitDiagnostic(retried && attemptCount === postgresRetryAttempts
|
|
194
|
+
? 'exhausted'
|
|
195
|
+
: 'notRetryable');
|
|
196
|
+
}
|
|
197
|
+
throw error;
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
/**
|
|
201
|
+
* Replays a complete database operation after a PostgreSQL deadlock (40P01)
|
|
202
|
+
* or lock timeout (55P03), using the same three-attempt jittered budget as
|
|
203
|
+
* connection retries. The operation must own its transaction and must not
|
|
204
|
+
* contain external side effects such as partner API writes.
|
|
205
|
+
*/
|
|
206
|
+
function retryPostgresLockFailure(operation) {
|
|
207
|
+
return retryPostgres(operation, (error) => (0, postgres_error_1.isPostgresError)(error, { code: '40P01' }) ||
|
|
208
|
+
(0, postgres_error_1.isPostgresError)(error, { code: '55P03' }));
|
|
209
|
+
}
|
|
210
|
+
/**
|
|
211
|
+
* Replays a complete database operation whose connection dropped mid-way, such as a Hyperdrive
|
|
212
|
+
* `CONNECTION_CLOSED`, with the same three-attempt jittered budget. The operation must own its
|
|
213
|
+
* transaction, be safe to replay after a commit whose response was lost, and keep external side
|
|
214
|
+
* effects after its commit.
|
|
215
|
+
*/
|
|
216
|
+
function retryPostgresConnectionLoss(operation) {
|
|
217
|
+
return retryPostgres(operation, (error) => isConnectionClosed(error) || isRetryableConnectionError(error));
|
|
62
218
|
}
|
|
63
219
|
class RetryingPostgresJSDialect extends kysely_postgres_js_1.PostgresJSDialect {
|
|
64
|
-
constructor(config) {
|
|
220
|
+
constructor(config, retryDiagnostic, closeOnScriptTimeout) {
|
|
65
221
|
super(config);
|
|
66
222
|
this.config = config;
|
|
223
|
+
this.retryDiagnostic = retryDiagnostic;
|
|
224
|
+
this.closeOnScriptTimeout = closeOnScriptTimeout;
|
|
225
|
+
}
|
|
226
|
+
/** Ends the run when a script's database operation gets no answer (PRO-19037). */
|
|
227
|
+
async withScriptDeadline(operation) {
|
|
228
|
+
if (!this.closeOnScriptTimeout)
|
|
229
|
+
return await operation();
|
|
230
|
+
let timer;
|
|
231
|
+
try {
|
|
232
|
+
return await Promise.race([
|
|
233
|
+
operation(),
|
|
234
|
+
new Promise((_, reject) => {
|
|
235
|
+
timer = setTimeout(() => {
|
|
236
|
+
console.error('Postgres operation timed out', {
|
|
237
|
+
timeoutMs: scriptQueryTimeoutMs,
|
|
238
|
+
});
|
|
239
|
+
this.closeOnScriptTimeout?.();
|
|
240
|
+
reject(new error_1.KyselyError('Postgres operation timed out', {
|
|
241
|
+
timeoutMs: scriptQueryTimeoutMs,
|
|
242
|
+
}));
|
|
243
|
+
}, scriptQueryTimeoutMs);
|
|
244
|
+
}),
|
|
245
|
+
]);
|
|
246
|
+
}
|
|
247
|
+
finally {
|
|
248
|
+
clearTimeout(timer);
|
|
249
|
+
}
|
|
67
250
|
}
|
|
68
251
|
createDriver() {
|
|
69
252
|
const driver = new kysely_postgres_js_1.PostgresJSDriver(this.config);
|
|
@@ -82,22 +265,46 @@ class RetryingPostgresJSDialect extends kysely_postgres_js_1.PostgresJSDialect {
|
|
|
82
265
|
inTransaction: false,
|
|
83
266
|
};
|
|
84
267
|
const connection = {
|
|
85
|
-
executeQuery: (compiledQuery) =>
|
|
86
|
-
const
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
268
|
+
executeQuery: (compiledQuery) => this.withScriptDeadline(() => {
|
|
269
|
+
const operationKind = state.inTransaction
|
|
270
|
+
? 'transaction'
|
|
271
|
+
: compiledQuery.query.kind === 'SelectQueryNode'
|
|
272
|
+
? 'select'
|
|
273
|
+
: 'mutation';
|
|
274
|
+
return retryPostgres(() => {
|
|
275
|
+
if (state.lost)
|
|
276
|
+
return Promise.reject(state.lost);
|
|
277
|
+
return state.connection
|
|
278
|
+
.executeQuery(compiledQuery)
|
|
279
|
+
.catch((error) => {
|
|
280
|
+
if (isConnectionClosed(error))
|
|
281
|
+
state.lost = error;
|
|
282
|
+
throw error;
|
|
283
|
+
});
|
|
284
|
+
}, async (error) => {
|
|
285
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
286
|
+
if (state.inTransaction ||
|
|
287
|
+
(!isRetryableConnectionError(error) &&
|
|
288
|
+
(compiledQuery.query.kind !== 'SelectQueryNode' ||
|
|
289
|
+
(!isConnectionReset(error) &&
|
|
290
|
+
message !==
|
|
291
|
+
'Egress connection severed outside of Hyperdrive' &&
|
|
292
|
+
message !== 'Network connection lost.' &&
|
|
293
|
+
!isNodeShuttingDown(error))))) {
|
|
294
|
+
return false;
|
|
295
|
+
}
|
|
296
|
+
// Postgres.js already ejects a severed reserved connection.
|
|
297
|
+
// Acquire a new reservation before replaying the safe read.
|
|
298
|
+
state.connection = await driver.acquireConnection();
|
|
299
|
+
state.lost = undefined;
|
|
300
|
+
return true;
|
|
301
|
+
}, this.retryDiagnostic
|
|
302
|
+
? {
|
|
303
|
+
...this.retryDiagnostic,
|
|
304
|
+
operationKind,
|
|
305
|
+
shouldEmit: isQueryRetryDiagnosticError,
|
|
306
|
+
}
|
|
307
|
+
: undefined);
|
|
101
308
|
}),
|
|
102
309
|
streamQuery: (compiledQuery, chunkSize) => {
|
|
103
310
|
if (chunkSize === undefined) {
|
|
@@ -113,17 +320,21 @@ class RetryingPostgresJSDialect extends kysely_postgres_js_1.PostgresJSDialect {
|
|
|
113
320
|
const state = getConnection(connection);
|
|
114
321
|
state.inTransaction = true;
|
|
115
322
|
try {
|
|
116
|
-
await driver.beginTransaction(state.connection, settings);
|
|
323
|
+
await this.withScriptDeadline(() => driver.beginTransaction(state.connection, settings));
|
|
117
324
|
}
|
|
118
325
|
catch (error) {
|
|
119
326
|
state.inTransaction = false;
|
|
327
|
+
if (isConnectionClosed(error))
|
|
328
|
+
state.lost = error;
|
|
120
329
|
throw error;
|
|
121
330
|
}
|
|
122
331
|
},
|
|
123
332
|
commitTransaction: async (connection) => {
|
|
124
333
|
const state = getConnection(connection);
|
|
125
334
|
try {
|
|
126
|
-
|
|
335
|
+
if (state.lost)
|
|
336
|
+
throw state.lost;
|
|
337
|
+
await this.withScriptDeadline(() => driver.commitTransaction(state.connection));
|
|
127
338
|
}
|
|
128
339
|
finally {
|
|
129
340
|
state.inTransaction = false;
|
|
@@ -132,18 +343,44 @@ class RetryingPostgresJSDialect extends kysely_postgres_js_1.PostgresJSDialect {
|
|
|
132
343
|
rollbackTransaction: async (connection) => {
|
|
133
344
|
const state = getConnection(connection);
|
|
134
345
|
try {
|
|
135
|
-
|
|
346
|
+
// PostgreSQL rolls the transaction back when its session ends, and a
|
|
347
|
+
// statement on the closed connection would never be answered.
|
|
348
|
+
if (state.lost)
|
|
349
|
+
return;
|
|
350
|
+
await this.withScriptDeadline(() => driver.rollbackTransaction(state.connection));
|
|
136
351
|
}
|
|
137
352
|
finally {
|
|
138
353
|
state.inTransaction = false;
|
|
139
354
|
}
|
|
140
355
|
},
|
|
141
|
-
savepoint: (connection, savepointName, compileQuery) =>
|
|
142
|
-
|
|
143
|
-
|
|
356
|
+
savepoint: (connection, savepointName, compileQuery) => this.withScriptDeadline(() => {
|
|
357
|
+
const state = getConnection(connection);
|
|
358
|
+
if (state.lost)
|
|
359
|
+
throw state.lost;
|
|
360
|
+
return driver.savepoint(state.connection, savepointName, compileQuery);
|
|
361
|
+
}),
|
|
362
|
+
rollbackToSavepoint: (connection, savepointName, compileQuery) => this.withScriptDeadline(() => {
|
|
363
|
+
const state = getConnection(connection);
|
|
364
|
+
if (state.lost)
|
|
365
|
+
throw state.lost;
|
|
366
|
+
return driver.rollbackToSavepoint(state.connection, savepointName, compileQuery);
|
|
367
|
+
}),
|
|
368
|
+
releaseSavepoint: (connection, savepointName, compileQuery) => this.withScriptDeadline(() => {
|
|
369
|
+
const state = getConnection(connection);
|
|
370
|
+
if (state.lost)
|
|
371
|
+
throw state.lost;
|
|
372
|
+
return driver.releaseSavepoint(state.connection, savepointName, compileQuery);
|
|
373
|
+
}),
|
|
144
374
|
releaseConnection: async (connection) => {
|
|
145
|
-
|
|
375
|
+
const state = getConnection(connection);
|
|
146
376
|
connections.delete(connection);
|
|
377
|
+
// Releasing a closed connection would put it back in the open pool,
|
|
378
|
+
// and the next statement on it would hang. Postgres.js reconnects
|
|
379
|
+
// from the closed pool on demand, and a failed reconnect is a
|
|
380
|
+
// retryable CONNECT_TIMEOUT.
|
|
381
|
+
if (state.lost)
|
|
382
|
+
return;
|
|
383
|
+
await driver.releaseConnection(state.connection);
|
|
147
384
|
},
|
|
148
385
|
destroy: () => driver.destroy(),
|
|
149
386
|
};
|
|
@@ -151,19 +388,44 @@ class RetryingPostgresJSDialect extends kysely_postgres_js_1.PostgresJSDialect {
|
|
|
151
388
|
}
|
|
152
389
|
function useKysely(postgres, options) {
|
|
153
390
|
console.debug('Creating Kysely instance');
|
|
391
|
+
const emitRetryDiagnostic = options?.onRetryDiagnostic ??
|
|
392
|
+
(options?.repositoryName
|
|
393
|
+
? (diagnostic) => console.warn('Postgres operation retry diagnostic', diagnostic)
|
|
394
|
+
: undefined);
|
|
154
395
|
const reserveConnection = postgres.reserve.bind(postgres);
|
|
155
396
|
postgres.reserve = async () => {
|
|
156
|
-
const connection = await retryPostgres(reserveConnection,
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
397
|
+
const connection = await retryPostgres(reserveConnection, isRetryableConnectionAcquisitionError, emitRetryDiagnostic
|
|
398
|
+
? {
|
|
399
|
+
dataRegion: options?.dataRegion,
|
|
400
|
+
emit: emitRetryDiagnostic,
|
|
401
|
+
operationKind: 'acquisition',
|
|
402
|
+
repositoryName: options?.repositoryName,
|
|
403
|
+
shouldEmit: isRetryableConnectionAcquisitionError,
|
|
404
|
+
}
|
|
405
|
+
: undefined);
|
|
160
406
|
if (options?.hyperdrive) {
|
|
161
407
|
const unsafe = connection.unsafe;
|
|
162
|
-
|
|
408
|
+
const named = new Set();
|
|
409
|
+
connection.unsafe = (query, parameters, queryOptions) => {
|
|
410
|
+
// A statement past the limit runs unnamed; one already named stays named.
|
|
411
|
+
const prepare = named.has(query) || named.size < hyperdriveNamedStatementLimit;
|
|
412
|
+
if (prepare)
|
|
413
|
+
named.add(query);
|
|
414
|
+
return unsafe(query, parameters, { ...queryOptions, prepare });
|
|
415
|
+
};
|
|
163
416
|
}
|
|
164
417
|
return connection;
|
|
165
418
|
};
|
|
166
|
-
const kysely = (0, plugins_1.getKysely)(new RetryingPostgresJSDialect({ postgres }
|
|
419
|
+
const kysely = (0, plugins_1.getKysely)(new RetryingPostgresJSDialect({ postgres }, emitRetryDiagnostic
|
|
420
|
+
? {
|
|
421
|
+
dataRegion: options?.dataRegion,
|
|
422
|
+
emit: emitRetryDiagnostic,
|
|
423
|
+
repositoryName: options?.repositoryName,
|
|
424
|
+
shouldEmit: isQueryRetryDiagnosticError,
|
|
425
|
+
}
|
|
426
|
+
: undefined, options?.script
|
|
427
|
+
? () => void postgres.end({ timeout: 0 }).catch(() => undefined)
|
|
428
|
+
: undefined), {
|
|
167
429
|
repositoryName: options?.repositoryName,
|
|
168
430
|
log: options?.log,
|
|
169
431
|
});
|
|
@@ -176,46 +438,103 @@ function useKysely(postgres, options) {
|
|
|
176
438
|
};
|
|
177
439
|
return kysely;
|
|
178
440
|
}
|
|
441
|
+
const scriptQueryTimeoutMs = (0, utils_1.parseDuration)('1h');
|
|
179
442
|
let _connections = [];
|
|
443
|
+
function usePostgres(connectionString, opt) {
|
|
444
|
+
const ssl = opt?.forceDisableSSL !== true && !opt?.hyperdrive;
|
|
445
|
+
const typesKey = opt?.hyperdrive === 'regional'
|
|
446
|
+
? `regional/${opt.dataRegion ?? ''}`
|
|
447
|
+
: opt?.hyperdrive;
|
|
448
|
+
let types = typesKey ? hyperdriveTypes.get(typesKey) : undefined;
|
|
449
|
+
if (typesKey && !types) {
|
|
450
|
+
types = { arrays: new Map(), statements: new StatementTypes() };
|
|
451
|
+
hyperdriveTypes.set(typesKey, types);
|
|
452
|
+
}
|
|
453
|
+
const sql = (0, postgres_1.default)(connectionString, {
|
|
454
|
+
ssl: ssl ? 'require' : false,
|
|
455
|
+
// Named prepared statements: PRO-17965 (Hyperdrive and Crunchy PgBouncer).
|
|
456
|
+
prepare: true,
|
|
457
|
+
...(opt?.hyperdrive && types
|
|
458
|
+
? {
|
|
459
|
+
max: 5,
|
|
460
|
+
// Retire idle clients before Hyperdrive can close them asynchronously.
|
|
461
|
+
idle_timeout: 10,
|
|
462
|
+
statement_types: types.statements,
|
|
463
|
+
array_types: types.arrays,
|
|
464
|
+
// PRO-19758: Hyperdrive forwards this name to the origin. A
|
|
465
|
+
// constant, because Hyperdrive pools origin connections across
|
|
466
|
+
// requests, so a route name would be wrong.
|
|
467
|
+
connection: { application_name: `hyperdrive/${opt.hyperdrive}` },
|
|
468
|
+
// No read-write check (PRO-17156): Hyperdrive pools by transaction,
|
|
469
|
+
// so it covered one origin connection, not the ones later statements
|
|
470
|
+
// run on, and cost an origin round trip per connection (PRO-19580).
|
|
471
|
+
}
|
|
472
|
+
: {
|
|
473
|
+
...(opt?.max ? { max: opt.max } : {}),
|
|
474
|
+
target_session_attrs: 'read-write',
|
|
475
|
+
connect_timeout: 10,
|
|
476
|
+
idle_timeout: 60,
|
|
477
|
+
// PRO-19758: pg_stat_activity shows which client holds a direct
|
|
478
|
+
// connection.
|
|
479
|
+
...(opt?.repositoryName
|
|
480
|
+
? {
|
|
481
|
+
connection: {
|
|
482
|
+
application_name: `${opt.script ? 'script:' : ''}${opt.repositoryName}`.slice(0, 63),
|
|
483
|
+
},
|
|
484
|
+
}
|
|
485
|
+
: {}),
|
|
486
|
+
...(opt?.script ? { keep_alive: 10 } : {}),
|
|
487
|
+
}),
|
|
488
|
+
});
|
|
489
|
+
if (opt?.onReserve) {
|
|
490
|
+
const { onReserve } = opt;
|
|
491
|
+
const reserve = sql.reserve.bind(sql);
|
|
492
|
+
// Innermost wrapper: it times each open or reuse of a connection, the
|
|
493
|
+
// startup probe too, and is not part of the retry loop (PRO-18952).
|
|
494
|
+
sql.reserve = async () => {
|
|
495
|
+
const startedAtEpochMs = Date.now();
|
|
496
|
+
const startedAt = performance.now();
|
|
497
|
+
try {
|
|
498
|
+
return await reserve();
|
|
499
|
+
}
|
|
500
|
+
finally {
|
|
501
|
+
onReserve({
|
|
502
|
+
durationMs: performance.now() - startedAt,
|
|
503
|
+
startedAtEpochMs,
|
|
504
|
+
});
|
|
505
|
+
}
|
|
506
|
+
};
|
|
507
|
+
}
|
|
508
|
+
// statement_timeout/lock_timeout are role-level settings on the cluster
|
|
509
|
+
// (ALTER ROLE application SET ...) so they cover every pooled
|
|
510
|
+
// connection; per-session SETs here only ever applied to one of them
|
|
511
|
+
_connections.push(sql);
|
|
512
|
+
return sql;
|
|
513
|
+
}
|
|
180
514
|
async function useAsyncPostgres(connectionString, opt) {
|
|
181
515
|
const delayMs = 2500;
|
|
182
516
|
const probe = opt?.probe === true;
|
|
183
517
|
const retries = probe ? (opt?.retries === false ? 0 : opt?.retries || 3) : 1;
|
|
184
|
-
const ssl = opt?.forceDisableSSL !== true && opt?.hyperdrive !== true;
|
|
185
518
|
const url = new URL(connectionString);
|
|
186
|
-
console.debug(`Creating Postgres connection with probe=${probe}, ${retries} attempts, ssl=${
|
|
519
|
+
console.debug(`Creating Postgres connection with probe=${probe}, ${retries} attempts, ssl=${opt?.forceDisableSSL !== true && !opt?.hyperdrive}, and port=${url.port}`);
|
|
187
520
|
if (_connections.length > 0)
|
|
188
521
|
console.warn(`We already have ${_connections.length} Postgres connections`);
|
|
189
522
|
for (let attempt = 1; attempt <= retries; attempt++) {
|
|
190
523
|
let sql;
|
|
191
524
|
try {
|
|
192
|
-
sql = (
|
|
193
|
-
ssl: ssl ? 'require' : false,
|
|
194
|
-
target_session_attrs: 'read-write',
|
|
195
|
-
// enable prepare statements, pgbouncer on crunchy allows for prepared statements
|
|
196
|
-
prepare: true,
|
|
197
|
-
...(opt?.hyperdrive
|
|
198
|
-
? {
|
|
199
|
-
max: 5,
|
|
200
|
-
// Retire idle clients before Hyperdrive can close them asynchronously.
|
|
201
|
-
idle_timeout: 10,
|
|
202
|
-
}
|
|
203
|
-
: {
|
|
204
|
-
connect_timeout: 10,
|
|
205
|
-
idle_timeout: 60,
|
|
206
|
-
}),
|
|
207
|
-
});
|
|
525
|
+
sql = usePostgres(connectionString, opt);
|
|
208
526
|
if (probe) {
|
|
209
|
-
|
|
527
|
+
// Opening a direct connection already checks that the session is
|
|
528
|
+
// writable; a probe query would add a round trip.
|
|
529
|
+
(await sql.reserve()).release();
|
|
210
530
|
}
|
|
211
|
-
// statement_timeout/lock_timeout are role-level settings on the cluster
|
|
212
|
-
// (ALTER ROLE application SET ...) so they cover every pooled
|
|
213
|
-
// connection; per-session SETs here only ever applied to one of them
|
|
214
|
-
_connections.push(sql);
|
|
215
531
|
return sql;
|
|
216
532
|
}
|
|
217
533
|
catch (err) {
|
|
218
|
-
|
|
534
|
+
if (sql) {
|
|
535
|
+
await sql.end({ timeout: 0 }).catch(() => undefined);
|
|
536
|
+
_connections.splice(_connections.indexOf(sql), 1);
|
|
537
|
+
}
|
|
219
538
|
if (attempt === retries)
|
|
220
539
|
throw err;
|
|
221
540
|
console.warn(`Postgres connection failed (attempt ${attempt}), retrying...`);
|
|
@@ -240,9 +559,16 @@ async function useAsyncNeonWebSocketKysely(connectionString, opt) {
|
|
|
240
559
|
await pool.query('select 1');
|
|
241
560
|
return kysely;
|
|
242
561
|
}
|
|
562
|
+
function useControlPlaneKysely(postgres, options) {
|
|
563
|
+
const kysely = useKysely(postgres, options);
|
|
564
|
+
const controlPlaneKysely = (0, control_plane_1.withControlPlaneSchema)(kysely, 'public');
|
|
565
|
+
// `withPlugin` returns a new instance without the `destroy` that removes
|
|
566
|
+
// this client from `_connections` (PRO-20691).
|
|
567
|
+
controlPlaneKysely.destroy = kysely.destroy;
|
|
568
|
+
return controlPlaneKysely;
|
|
569
|
+
}
|
|
243
570
|
async function useAsyncControlPlaneKysely(connectionString, opt) {
|
|
244
|
-
|
|
245
|
-
return (0, control_plane_1.withControlPlaneSchema)(useKysely(sql, opt), 'public');
|
|
571
|
+
return useControlPlaneKysely(await useAsyncPostgres(connectionString, opt), opt);
|
|
246
572
|
}
|
|
247
573
|
async function forceCloseAllPostgres(timeoutMs = 5000) {
|
|
248
574
|
await Promise.race([
|