@zintrust/core 0.1.46 → 0.1.49

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 (78) hide show
  1. package/README.md +1 -1
  2. package/app/Controllers/AuthController.d.ts.map +1 -1
  3. package/app/Controllers/AuthController.js +26 -4
  4. package/app/Middleware/index.js +5 -5
  5. package/app/Types/controller.d.ts +2 -0
  6. package/app/Types/controller.d.ts.map +1 -1
  7. package/app/Types/controller.js +1 -1
  8. package/config/storage.d.ts.map +1 -1
  9. package/config/storage.js +1 -1
  10. package/package.json +1 -1
  11. package/routes/api.js +13 -6
  12. package/src/cli/CLI.d.ts.map +1 -1
  13. package/src/cli/CLI.js +2 -0
  14. package/src/cli/commands/AddCommand.js +2 -2
  15. package/src/cli/commands/BulletproofKeyGenerateCommand.d.ts +10 -0
  16. package/src/cli/commands/BulletproofKeyGenerateCommand.d.ts.map +1 -0
  17. package/src/cli/commands/BulletproofKeyGenerateCommand.js +139 -0
  18. package/src/cli/commands/JwtDevCommand.d.ts.map +1 -1
  19. package/src/cli/commands/JwtDevCommand.js +51 -32
  20. package/src/cli/scaffolding/ControllerGenerator.d.ts +1 -1
  21. package/src/cli/scaffolding/ControllerGenerator.d.ts.map +1 -1
  22. package/src/cli/scaffolding/ControllerGenerator.js +8 -79
  23. package/src/config/SecretsManager.d.ts +0 -1
  24. package/src/config/SecretsManager.d.ts.map +1 -1
  25. package/src/config/SecretsManager.js +0 -1
  26. package/src/config/middleware.d.ts +1 -0
  27. package/src/config/middleware.d.ts.map +1 -1
  28. package/src/config/middleware.js +3 -0
  29. package/src/http/error-pages/ErrorPageRenderer.js +7 -1
  30. package/src/index.d.ts +1 -0
  31. package/src/index.d.ts.map +1 -1
  32. package/src/index.js +4 -3
  33. package/src/middleware/BulletproofAuthMiddleware.d.ts +92 -0
  34. package/src/middleware/BulletproofAuthMiddleware.d.ts.map +1 -0
  35. package/src/middleware/BulletproofAuthMiddleware.js +421 -0
  36. package/src/middleware/CsrfMiddleware.d.ts +0 -1
  37. package/src/middleware/CsrfMiddleware.d.ts.map +1 -1
  38. package/src/middleware/CsrfMiddleware.js +8 -1
  39. package/src/middleware/JwtAuthMiddleware.d.ts.map +1 -1
  40. package/src/middleware/JwtAuthMiddleware.js +11 -5
  41. package/src/orm/Database.d.ts.map +1 -1
  42. package/src/orm/Database.js +48 -39
  43. package/src/orm/QueryBuilder.d.ts.map +1 -1
  44. package/src/orm/QueryBuilder.js +0 -2
  45. package/src/orm/adapters/MySQLProxyAdapter.d.ts.map +1 -1
  46. package/src/orm/adapters/MySQLProxyAdapter.js +54 -35
  47. package/src/orm/adapters/PostgreSQLProxyAdapter.d.ts.map +1 -1
  48. package/src/orm/adapters/PostgreSQLProxyAdapter.js +126 -103
  49. package/src/orm/adapters/SqlProxyHttpAdapterShared.d.ts +30 -0
  50. package/src/orm/adapters/SqlProxyHttpAdapterShared.d.ts.map +1 -0
  51. package/src/orm/adapters/SqlProxyHttpAdapterShared.js +64 -0
  52. package/src/orm/adapters/SqlServerProxyAdapter.d.ts.map +1 -1
  53. package/src/orm/adapters/SqlServerProxyAdapter.js +54 -37
  54. package/src/orm/migrations/MigrationStore.d.ts.map +1 -1
  55. package/src/orm/migrations/MigrationStore.js +22 -1
  56. package/src/routes/doc.js +1 -1
  57. package/src/routes/errorPages.d.ts.map +1 -1
  58. package/src/routes/errorPages.js +9 -2
  59. package/src/security/CsrfTokenManager.d.ts.map +1 -1
  60. package/src/security/CsrfTokenManager.js +57 -23
  61. package/src/security/JwtManager.d.ts +4 -1
  62. package/src/security/JwtManager.d.ts.map +1 -1
  63. package/src/security/JwtManager.js +24 -10
  64. package/src/security/JwtSessions.d.ts +12 -0
  65. package/src/security/JwtSessions.d.ts.map +1 -0
  66. package/src/security/JwtSessions.js +556 -0
  67. package/src/security/NonceReplay.d.ts +24 -0
  68. package/src/security/NonceReplay.d.ts.map +1 -0
  69. package/src/security/NonceReplay.js +42 -0
  70. package/src/security/TokenRevocation.d.ts.map +1 -1
  71. package/src/security/TokenRevocation.js +1 -0
  72. package/src/tools/http/Http.d.ts +5 -0
  73. package/src/tools/http/Http.d.ts.map +1 -1
  74. package/src/tools/http/Http.js +25 -9
  75. package/src/tools/queue/QueueReliabilityOrchestrator.d.ts.map +1 -1
  76. package/src/tools/queue/QueueReliabilityOrchestrator.js +18 -6
  77. package/src/validation/Validator.d.ts.map +1 -1
  78. package/src/validation/Validator.js +4 -2
@@ -1 +1 @@
1
- {"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../src/orm/QueryBuilder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"QueryBuilder.d.ts","sourceRoot":"","sources":["../../../src/orm/QueryBuilder.ts"],"names":[],"mappings":"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"}
@@ -196,8 +196,6 @@ const buildSelectClause = (columns, dialect) => {
196
196
  const out = [];
197
197
  for (const c of columns) {
198
198
  const parsed = tryParseSelectExpr(String(c));
199
- if (parsed === null)
200
- continue;
201
199
  out.push(formatSelectExpr(parsed, dialect));
202
200
  }
203
201
  return out.join(', ');
@@ -1 +1 @@
1
- {"version":3,"file":"MySQLProxyAdapter.d.ts","sourceRoot":"","sources":["../../../../src/orm/adapters/MySQLProxyAdapter.ts"],"names":[],"mappings":"AACA;;;;GAIG;AAkBH,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAe,MAAM,sBAAsB,CAAC;AAiN1F,eAAO,MAAM,iBAAiB;oBACZ,cAAc,GAAG,gBAAgB;EAajD,CAAC;AAEH,eAAe,iBAAiB,CAAC"}
1
+ {"version":3,"file":"MySQLProxyAdapter.d.ts","sourceRoot":"","sources":["../../../../src/orm/adapters/MySQLProxyAdapter.ts"],"names":[],"mappings":"AACA;;;;GAIG;AAgBH,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAe,MAAM,sBAAsB,CAAC;AAuO1F,eAAO,MAAM,iBAAiB;oBACZ,cAAc,GAAG,gBAAgB;EAcjD,CAAC;AAEH,eAAe,iBAAiB,CAAC"}
@@ -4,54 +4,53 @@
4
4
  *
5
5
  * Used in Cloudflare Workers when MYSQL_PROXY_URL is configured.
6
6
  */
7
- import { Env } from '../../config/env.js';
8
7
  import { Logger } from '../../config/logger.js';
9
8
  import { ErrorFactory } from '../../exceptions/ZintrustError.js';
10
9
  import { AdaptersEnum } from '../../migrations/enum/index.js';
11
- import { ensureSignedSettings, isRecord, requestSignedProxy, } from '../adapters/SqlProxyAdapterUtils.js';
12
- import { createStatementPayload, getExecMetaWithLastRowId, resolveSqlProxyMode, } from '../adapters/SqlProxyRegistryMode.js';
10
+ import { ensureSignedSettings, isRecord, } from '../adapters/SqlProxyAdapterUtils.js';
11
+ import { SqlProxyHttpAdapterShared } from '../adapters/SqlProxyHttpAdapterShared.js';
12
+ import { createStatementPayload, getExecMetaWithLastRowId, } from '../adapters/SqlProxyRegistryMode.js';
13
13
  import { QueryBuilder } from '../QueryBuilder.js';
14
14
  const buildProxySettings = () => {
15
- const baseUrl = Env.MYSQL_PROXY_URL;
16
- const keyId = Env.MYSQL_PROXY_KEY_ID ?? '';
17
- const secret = Env.MYSQL_PROXY_SECRET ?? '';
18
- const timeoutMs = Env.MYSQL_PROXY_TIMEOUT_MS;
19
- return { baseUrl, keyId, secret, timeoutMs };
15
+ return SqlProxyHttpAdapterShared.buildProxySettingsFromEnv({
16
+ urlKey: 'MYSQL_PROXY_URL',
17
+ keyIdKey: 'MYSQL_PROXY_KEY_ID',
18
+ secretKey: 'MYSQL_PROXY_SECRET',
19
+ timeoutKey: 'MYSQL_PROXY_TIMEOUT_MS',
20
+ sharedKeyIdKey: 'ZT_PROXY_KEY_ID',
21
+ sharedSecretKey: 'ZT_PROXY_SECRET',
22
+ sharedTimeoutKey: 'ZT_PROXY_TIMEOUT_MS',
23
+ });
24
+ };
25
+ const buildSignedProxyConfig = (settings) => {
26
+ return SqlProxyHttpAdapterShared.buildStandardSignedProxyConfig({
27
+ settings,
28
+ label: 'MySQL',
29
+ urlKey: 'MYSQL_PROXY_URL',
30
+ keyIdKey: 'MYSQL_PROXY_KEY_ID',
31
+ secretKey: 'MYSQL_PROXY_SECRET',
32
+ });
20
33
  };
21
- const buildSignedProxyConfig = (settings) => ({
22
- settings,
23
- missingUrlMessage: 'MySQL proxy URL is missing (MYSQL_PROXY_URL)',
24
- missingCredentialsMessage: 'MySQL proxy signing credentials are missing (MYSQL_PROXY_KEY_ID / MYSQL_PROXY_SECRET)',
25
- messages: {
26
- unauthorized: 'MySQL proxy unauthorized',
27
- forbidden: 'MySQL proxy forbidden',
28
- rateLimited: 'MySQL proxy rate limited',
29
- rejected: 'MySQL proxy rejected request',
30
- error: 'MySQL proxy error',
31
- timedOut: 'MySQL proxy request timed out',
32
- },
33
- });
34
34
  const isQueryResponse = (value) => isRecord(value) && Array.isArray(value['rows']) && typeof value['rowCount'] === 'number';
35
35
  const isQueryOneResponse = (value) => isRecord(value) && 'row' in value;
36
- const requestProxy = async (settings, path, payload) => {
37
- const signedProxyConfig = buildSignedProxyConfig(settings);
36
+ const requestProxy = async (state, path, payload) => {
38
37
  try {
39
- return await requestSignedProxy(signedProxyConfig, path, payload);
38
+ return await SqlProxyHttpAdapterShared.requestProxy(state.signed, path, payload);
40
39
  }
41
40
  catch (error) {
42
41
  Logger.error('[MySQLProxyAdapter] Proxy request failed', {
43
42
  path,
44
- baseUrl: settings.baseUrl,
45
- timeoutMs: settings.timeoutMs,
46
- hasKeyId: (settings.keyId ?? '').trim() !== '',
47
- hasSecret: (settings.secret ?? '').trim() !== '',
43
+ baseUrl: state.settings.baseUrl,
44
+ timeoutMs: state.settings.timeoutMs,
45
+ hasKeyId: (state.settings.keyId ?? '').trim() !== '',
46
+ hasSecret: (state.settings.secret ?? '').trim() !== '',
48
47
  error: error instanceof Error ? error.message : String(error),
49
48
  });
50
49
  throw error;
51
50
  }
52
51
  };
53
52
  const resolveProxyMode = () => {
54
- return resolveSqlProxyMode('MYSQL_PROXY_MODE');
53
+ return SqlProxyHttpAdapterShared.resolveProxyModeFromEnv('MYSQL_PROXY_MODE');
55
54
  };
56
55
  const requireConnected = (state) => {
57
56
  if (!state.connected)
@@ -76,8 +75,8 @@ const createQuery = (state) => async (sql, parameters) => {
76
75
  requireConnected(state);
77
76
  const mode = resolveProxyMode();
78
77
  const out = mode === 'registry'
79
- ? await requestProxy(state.settings, '/zin/mysql/statement', await createStatementPayload(sql, parameters))
80
- : await requestProxy(state.settings, '/zin/mysql/query', {
78
+ ? await requestProxy(state, '/zin/mysql/statement', await createStatementPayload(sql, parameters))
79
+ : await requestProxy(state, '/zin/mysql/query', {
81
80
  sql,
82
81
  params: parameters,
83
82
  });
@@ -87,13 +86,13 @@ const createQueryOne = (state) => async (sql, parameters) => {
87
86
  requireConnected(state);
88
87
  const mode = resolveProxyMode();
89
88
  if (mode !== 'registry') {
90
- const out = await requestProxy(state.settings, '/zin/mysql/queryOne', {
89
+ const out = await requestProxy(state, '/zin/mysql/queryOne', {
91
90
  sql,
92
91
  params: parameters,
93
92
  });
94
93
  return out.row ?? null;
95
94
  }
96
- const out = await requestProxy(state.settings, '/zin/mysql/statement', await createStatementPayload(sql, parameters));
95
+ const out = await requestProxy(state, '/zin/mysql/statement', await createStatementPayload(sql, parameters));
97
96
  if (isQueryOneResponse(out))
98
97
  return out.row ?? null;
99
98
  if (isQueryResponse(out))
@@ -123,7 +122,7 @@ const createAdapter = (state) => {
123
122
  const ping = createPing(queryOne);
124
123
  const adapter = {
125
124
  async connect() {
126
- ensureSignedSettings(buildSignedProxyConfig(state.settings));
125
+ ensureSignedSettings(state.signed);
127
126
  state.connected = true;
128
127
  },
129
128
  async disconnect() {
@@ -134,6 +133,25 @@ const createAdapter = (state) => {
134
133
  ping,
135
134
  transaction: createTransaction(state, () => adapter),
136
135
  rawQuery: createRawQuery(state, query),
136
+ async ensureMigrationsTable() {
137
+ requireConnected(state);
138
+ try {
139
+ await query(`CREATE TABLE IF NOT EXISTS migrations (
140
+ id INTEGER PRIMARY KEY AUTO_INCREMENT,
141
+ name VARCHAR(255) NOT NULL,
142
+ scope VARCHAR(255) NOT NULL DEFAULT 'global',
143
+ service VARCHAR(255) NOT NULL DEFAULT '',
144
+ batch INTEGER NOT NULL,
145
+ status VARCHAR(255) NOT NULL,
146
+ applied_at DATETIME NULL,
147
+ created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
148
+ UNIQUE(name, scope, service)
149
+ )`, []);
150
+ }
151
+ catch (error) {
152
+ throw SqlProxyHttpAdapterShared.createProxyNotReachableCliError('MySQL proxy', state.settings.baseUrl, error);
153
+ }
154
+ },
137
155
  getType() {
138
156
  return AdaptersEnum.mysql;
139
157
  },
@@ -149,7 +167,8 @@ const createAdapter = (state) => {
149
167
  export const MySQLProxyAdapter = Object.freeze({
150
168
  create(_config) {
151
169
  const settings = buildProxySettings();
152
- const state = { connected: false, settings };
170
+ const signed = buildSignedProxyConfig(settings);
171
+ const state = { connected: false, settings, signed };
153
172
  Logger.info('[MySQLProxyAdapter] Created with runtime settings', {
154
173
  baseUrl: settings.baseUrl,
155
174
  timeoutMs: settings.timeoutMs,
@@ -1 +1 @@
1
- {"version":3,"file":"PostgreSQLProxyAdapter.d.ts","sourceRoot":"","sources":["../../../../src/orm/adapters/PostgreSQLProxyAdapter.ts"],"names":[],"mappings":"AACA;;;;GAIG;AAaH,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAe,MAAM,sBAAsB,CAAC;AAiH1F,eAAO,MAAM,sBAAsB;oBACjB,cAAc,GAAG,gBAAgB;EAwFjD,CAAC;AAEH,eAAe,sBAAsB,CAAC"}
1
+ {"version":3,"file":"PostgreSQLProxyAdapter.d.ts","sourceRoot":"","sources":["../../../../src/orm/adapters/PostgreSQLProxyAdapter.ts"],"names":[],"mappings":"AACA;;;;GAIG;AAWH,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAe,MAAM,sBAAsB,CAAC;AA4P1F,eAAO,MAAM,sBAAsB;oBACjB,cAAc,GAAG,gBAAgB;EAMjD,CAAC;AAEH,eAAe,sBAAsB,CAAC"}
@@ -4,40 +4,36 @@
4
4
  *
5
5
  * Used in Cloudflare Workers when POSTGRES_PROXY_URL is configured.
6
6
  */
7
- import { Env } from '../../config/env.js';
8
7
  import { ErrorFactory } from '../../exceptions/ZintrustError.js';
9
8
  import { AdaptersEnum } from '../../migrations/enum/index.js';
10
- import { ensureSignedSettings, isRecord, requestSignedProxy, } from '../adapters/SqlProxyAdapterUtils.js';
11
- import { createStatementPayload, resolveSqlProxyMode } from '../adapters/SqlProxyRegistryMode.js';
9
+ import { isRecord, } from '../adapters/SqlProxyAdapterUtils.js';
10
+ import { SqlProxyHttpAdapterShared } from '../adapters/SqlProxyHttpAdapterShared.js';
11
+ import { createStatementPayload } from '../adapters/SqlProxyRegistryMode.js';
12
12
  import { QueryBuilder } from '../QueryBuilder.js';
13
- const resolveBaseUrl = () => {
14
- const explicit = Env.POSTGRES_PROXY_URL.trim();
15
- if (explicit !== '')
16
- return explicit;
17
- const host = Env.POSTGRES_PROXY_HOST || '127.0.0.1';
18
- const port = Env.POSTGRES_PROXY_PORT;
19
- return `http://${host}:${port}`;
20
- };
21
13
  const buildProxySettings = () => {
22
- const baseUrl = resolveBaseUrl();
23
- const keyId = Env.POSTGRES_PROXY_KEY_ID ?? '';
24
- const secret = Env.POSTGRES_PROXY_SECRET ?? '';
25
- const timeoutMs = Env.POSTGRES_PROXY_TIMEOUT_MS;
26
- return { baseUrl, keyId, secret, timeoutMs };
14
+ return SqlProxyHttpAdapterShared.buildProxySettingsFromEnv({
15
+ urlKey: 'POSTGRES_PROXY_URL',
16
+ hostKey: 'POSTGRES_PROXY_HOST',
17
+ portKey: 'POSTGRES_PROXY_PORT',
18
+ defaultHost: '127.0.0.1',
19
+ defaultPort: 8790,
20
+ keyIdKey: 'POSTGRES_PROXY_KEY_ID',
21
+ secretKey: 'POSTGRES_PROXY_SECRET',
22
+ timeoutKey: 'POSTGRES_PROXY_TIMEOUT_MS',
23
+ sharedKeyIdKey: 'ZT_PROXY_KEY_ID',
24
+ sharedSecretKey: 'ZT_PROXY_SECRET',
25
+ sharedTimeoutKey: 'ZT_PROXY_TIMEOUT_MS',
26
+ });
27
+ };
28
+ const buildSignedProxyConfig = (settings) => {
29
+ return SqlProxyHttpAdapterShared.buildStandardSignedProxyConfig({
30
+ settings,
31
+ label: 'PostgreSQL',
32
+ urlKey: 'POSTGRES_PROXY_URL',
33
+ keyIdKey: 'POSTGRES_PROXY_KEY_ID',
34
+ secretKey: 'POSTGRES_PROXY_SECRET',
35
+ });
27
36
  };
28
- const buildSignedProxyConfig = (settings) => ({
29
- settings,
30
- missingUrlMessage: 'PostgreSQL proxy URL is missing (POSTGRES_PROXY_URL)',
31
- missingCredentialsMessage: 'PostgreSQL proxy signing credentials are missing (POSTGRES_PROXY_KEY_ID / POSTGRES_PROXY_SECRET)',
32
- messages: {
33
- unauthorized: 'PostgreSQL proxy unauthorized',
34
- forbidden: 'PostgreSQL proxy forbidden',
35
- rateLimited: 'PostgreSQL proxy rate limited',
36
- rejected: 'PostgreSQL proxy rejected request',
37
- error: 'PostgreSQL proxy error',
38
- timedOut: 'PostgreSQL proxy request timed out',
39
- },
40
- });
41
37
  const isQueryResponse = (value) => isRecord(value) && Array.isArray(value['rows']) && typeof value['rowCount'] === 'number';
42
38
  const isQueryOneResponse = (value) => isRecord(value) && 'row' in value;
43
39
  const normalizeLastInsertId = (value) => {
@@ -79,85 +75,112 @@ const toQueryResult = (out) => {
79
75
  const meta = getExecMeta(out);
80
76
  return { rows: [], rowCount: meta.changes };
81
77
  };
82
- const requestProxy = async (settings, path, payload) => {
83
- return requestSignedProxy(buildSignedProxyConfig(settings), path, payload);
84
- };
85
78
  const resolveProxyMode = () => {
86
- return resolveSqlProxyMode('POSTGRES_PROXY_MODE');
79
+ return SqlProxyHttpAdapterShared.resolveProxyModeFromEnv('POSTGRES_PROXY_MODE');
80
+ };
81
+ const requireConnected = (state) => {
82
+ if (!state.connected)
83
+ throw ErrorFactory.createConnectionError('Database not connected');
84
+ };
85
+ const createQuery = (state) => async (sql, parameters) => {
86
+ requireConnected(state);
87
+ const mode = resolveProxyMode();
88
+ const out = mode === 'registry'
89
+ ? await SqlProxyHttpAdapterShared.requestProxy(state.signed, '/zin/postgres/statement', await createStatementPayload(sql, parameters))
90
+ : await SqlProxyHttpAdapterShared.requestProxy(state.signed, '/zin/postgres/query', {
91
+ sql,
92
+ params: parameters,
93
+ });
94
+ return toQueryResult(out);
95
+ };
96
+ const createQueryOne = (state) => async (sql, parameters) => {
97
+ requireConnected(state);
98
+ const mode = resolveProxyMode();
99
+ if (mode !== 'registry') {
100
+ const out = await SqlProxyHttpAdapterShared.requestProxy(state.signed, '/zin/postgres/queryOne', {
101
+ sql,
102
+ params: parameters,
103
+ });
104
+ return out.row ?? null;
105
+ }
106
+ const out = await SqlProxyHttpAdapterShared.requestProxy(state.signed, '/zin/postgres/statement', await createStatementPayload(sql, parameters));
107
+ if (isQueryOneResponse(out))
108
+ return out.row ?? null;
109
+ if (isQueryResponse(out))
110
+ return out.rows[0] ?? null;
111
+ return null;
112
+ };
113
+ const createPing = (queryOne) => async () => {
114
+ await queryOne(QueryBuilder.create('').select('1').toSQL(), []);
115
+ };
116
+ const createTransaction = (state, getAdapter) => async (callback) => {
117
+ requireConnected(state);
118
+ try {
119
+ return await callback(getAdapter());
120
+ }
121
+ catch (error) {
122
+ throw ErrorFactory.createTryCatchError('PostgreSQL proxy transaction failed', error);
123
+ }
124
+ };
125
+ const createRawQuery = (state, query) => async (sql, parameters = []) => {
126
+ requireConnected(state);
127
+ const out = await query(sql, parameters);
128
+ return out.rows;
129
+ };
130
+ const createEnsureMigrationsTable = (state, query) => async () => {
131
+ requireConnected(state);
132
+ try {
133
+ await query(`CREATE TABLE IF NOT EXISTS migrations (
134
+ id SERIAL PRIMARY KEY,
135
+ name VARCHAR(255) NOT NULL,
136
+ scope VARCHAR(255) NOT NULL DEFAULT 'global',
137
+ service VARCHAR(255) NOT NULL DEFAULT '',
138
+ batch INTEGER NOT NULL,
139
+ status VARCHAR(255) NOT NULL,
140
+ applied_at TIMESTAMP NULL,
141
+ created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
142
+ UNIQUE(name, scope, service)
143
+ )`, []);
144
+ }
145
+ catch (error) {
146
+ throw SqlProxyHttpAdapterShared.createProxyNotReachableCliError('PostgreSQL proxy', state.settings.baseUrl, error);
147
+ }
148
+ };
149
+ const createAdapter = (state) => {
150
+ const query = createQuery(state);
151
+ const queryOne = createQueryOne(state);
152
+ const adapter = {
153
+ async connect() {
154
+ SqlProxyHttpAdapterShared.ensureSignedProxyConfig(state.signed);
155
+ state.connected = true;
156
+ },
157
+ async disconnect() {
158
+ state.connected = false;
159
+ },
160
+ query,
161
+ queryOne,
162
+ ping: createPing(queryOne),
163
+ transaction: createTransaction(state, () => adapter),
164
+ rawQuery: createRawQuery(state, query),
165
+ ensureMigrationsTable: createEnsureMigrationsTable(state, query),
166
+ getType() {
167
+ return AdaptersEnum.postgresql;
168
+ },
169
+ isConnected() {
170
+ return state.connected;
171
+ },
172
+ getPlaceholder(index) {
173
+ return `$${index}`;
174
+ },
175
+ };
176
+ return adapter;
87
177
  };
88
178
  export const PostgreSQLProxyAdapter = Object.freeze({
89
179
  create(_config) {
90
- let connected = true;
91
180
  const settings = buildProxySettings();
92
- return {
93
- async connect() {
94
- ensureSignedSettings(buildSignedProxyConfig(settings));
95
- connected = true;
96
- },
97
- async disconnect() {
98
- connected = true;
99
- },
100
- async query(sql, parameters) {
101
- if (!connected)
102
- throw ErrorFactory.createConnectionError('Database not connected');
103
- const mode = resolveProxyMode();
104
- const out = mode === 'registry'
105
- ? await requestProxy(settings, '/zin/postgres/statement', await createStatementPayload(sql, parameters))
106
- : await requestProxy(settings, '/zin/postgres/query', {
107
- sql,
108
- params: parameters,
109
- });
110
- return toQueryResult(out);
111
- },
112
- async queryOne(sql, parameters) {
113
- if (!connected)
114
- throw ErrorFactory.createConnectionError('Database not connected');
115
- const mode = resolveProxyMode();
116
- if (mode !== 'registry') {
117
- const out = await requestProxy(settings, '/zin/postgres/queryOne', {
118
- sql,
119
- params: parameters,
120
- });
121
- return out.row ?? null;
122
- }
123
- const out = await requestProxy(settings, '/zin/postgres/statement', await createStatementPayload(sql, parameters));
124
- if (isQueryOneResponse(out))
125
- return out.row ?? null;
126
- if (isQueryResponse(out))
127
- return out.rows[0] ?? null;
128
- return null;
129
- },
130
- async ping() {
131
- if (!connected)
132
- throw ErrorFactory.createConnectionError('Database not connected');
133
- await this.queryOne(QueryBuilder.create('').select('1').toSQL(), []);
134
- },
135
- async transaction(callback) {
136
- if (!connected)
137
- throw ErrorFactory.createConnectionError('Database not connected');
138
- try {
139
- return await callback(this);
140
- }
141
- catch (error) {
142
- throw ErrorFactory.createTryCatchError('PostgreSQL proxy transaction failed', error);
143
- }
144
- },
145
- async rawQuery(sql, parameters = []) {
146
- if (!connected)
147
- throw ErrorFactory.createConnectionError('Database not connected');
148
- const out = await this.query(sql, parameters);
149
- return out.rows;
150
- },
151
- getType() {
152
- return AdaptersEnum.postgresql;
153
- },
154
- isConnected() {
155
- return connected;
156
- },
157
- getPlaceholder(index) {
158
- return `$${index}`;
159
- },
160
- };
181
+ const signed = buildSignedProxyConfig(settings);
182
+ const state = { connected: false, settings, signed };
183
+ return createAdapter(state);
161
184
  },
162
185
  });
163
186
  export default PostgreSQLProxyAdapter;
@@ -0,0 +1,30 @@
1
+ import { type ProxySettings, type SignedProxyConfig } from '../adapters/SqlProxyAdapterUtils';
2
+ export type ProxyMode = 'sql' | 'registry';
3
+ export type ProxySettingsBuildInput = {
4
+ urlKey: string;
5
+ hostKey?: string;
6
+ portKey?: string;
7
+ defaultHost?: string;
8
+ defaultPort?: number;
9
+ keyIdKey: string;
10
+ secretKey: string;
11
+ timeoutKey: string;
12
+ sharedKeyIdKey?: string;
13
+ sharedSecretKey?: string;
14
+ sharedTimeoutKey?: string;
15
+ };
16
+ export declare const SqlProxyHttpAdapterShared: Readonly<{
17
+ buildProxySettingsFromEnv: (input: ProxySettingsBuildInput) => ProxySettings;
18
+ buildStandardSignedProxyConfig: (input: {
19
+ settings: ProxySettings;
20
+ label: string;
21
+ urlKey: string;
22
+ keyIdKey: string;
23
+ secretKey: string;
24
+ }) => SignedProxyConfig;
25
+ ensureSignedProxyConfig: (signed: SignedProxyConfig) => void;
26
+ requestProxy: <T>(signed: SignedProxyConfig, path: string, payload: Record<string, unknown>) => Promise<T>;
27
+ resolveProxyModeFromEnv: (envKey: string) => ProxyMode;
28
+ createProxyNotReachableCliError: (label: string, baseUrl: string, error: unknown) => Error;
29
+ }>;
30
+ //# sourceMappingURL=SqlProxyHttpAdapterShared.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"SqlProxyHttpAdapterShared.d.ts","sourceRoot":"","sources":["../../../../src/orm/adapters/SqlProxyHttpAdapterShared.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACvB,MAAM,oCAAoC,CAAC;AAG5C,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,CAAC;AAE3C,MAAM,MAAM,uBAAuB,GAAG;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAmFF,eAAO,MAAM,yBAAyB;uCA9DI,uBAAuB,KAAG,aAAa;4CAalC;QAC7C,QAAQ,EAAE,aAAa,CAAC;QACxB,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;KACnB,KAAG,iBAAiB;sCAmBoB,iBAAiB,KAAG,IAAI;mBAIrC,CAAC,UACnB,iBAAiB,QACnB,MAAM,WACH,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC/B,OAAO,CAAC,CAAC,CAAC;sCAI4B,MAAM,KAAG,SAAS;6CAIX,MAAM,WAAW,MAAM,SAAS,OAAO,KAAG,KAAK;EAe7F,CAAC"}
@@ -0,0 +1,64 @@
1
+ import { Env } from '../../config/env.js';
2
+ import { ErrorFactory } from '../../exceptions/ZintrustError.js';
3
+ import { ensureSignedSettings, requestSignedProxy, } from '../adapters/SqlProxyAdapterUtils.js';
4
+ import { resolveSqlProxyMode } from '../adapters/SqlProxyRegistryMode.js';
5
+ const resolveBaseUrl = (input) => {
6
+ const explicit = Env.get(input.urlKey, '').trim();
7
+ if (explicit !== '')
8
+ return explicit;
9
+ if (input.hostKey === undefined ||
10
+ input.portKey === undefined ||
11
+ input.defaultPort === undefined) {
12
+ return '';
13
+ }
14
+ const defaultHost = input.defaultHost ?? '127.0.0.1';
15
+ const rawHost = Env.get(input.hostKey, defaultHost);
16
+ const host = typeof rawHost === 'string' && rawHost.trim() !== '' ? rawHost : defaultHost;
17
+ const port = Env.getInt(input.portKey, input.defaultPort);
18
+ return `http://${host}:${port}`;
19
+ };
20
+ const buildProxySettingsFromEnv = (input) => {
21
+ const baseUrl = resolveBaseUrl(input);
22
+ const keyId = Env.get(input.keyIdKey, Env.get(input.sharedKeyIdKey ?? 'ZT_PROXY_KEY_ID', ''));
23
+ const secret = Env.get(input.secretKey, Env.get(input.sharedSecretKey ?? 'ZT_PROXY_SECRET', ''));
24
+ const timeoutMs = Env.getInt(input.timeoutKey, Env.getInt(input.sharedTimeoutKey ?? 'ZT_PROXY_TIMEOUT_MS', 30000));
25
+ return { baseUrl, keyId, secret, timeoutMs };
26
+ };
27
+ const buildStandardSignedProxyConfig = (input) => {
28
+ const { settings, label } = input;
29
+ const prefix = `${label} proxy`;
30
+ return {
31
+ settings,
32
+ missingUrlMessage: `${label} proxy URL is missing (${input.urlKey})`,
33
+ missingCredentialsMessage: `${label} proxy signing credentials are missing (${input.keyIdKey} / ${input.secretKey})`,
34
+ messages: {
35
+ unauthorized: `${prefix} unauthorized`,
36
+ forbidden: `${prefix} forbidden`,
37
+ rateLimited: `${prefix} rate limited`,
38
+ rejected: `${prefix} rejected request`,
39
+ error: `${prefix} error`,
40
+ timedOut: `${prefix} request timed out`,
41
+ },
42
+ };
43
+ };
44
+ const ensureSignedProxyConfig = (signed) => {
45
+ ensureSignedSettings(signed);
46
+ };
47
+ const requestProxy = async (signed, path, payload) => {
48
+ return requestSignedProxy(signed, path, payload);
49
+ };
50
+ const resolveProxyModeFromEnv = (envKey) => {
51
+ return resolveSqlProxyMode(envKey);
52
+ };
53
+ const createProxyNotReachableCliError = (label, baseUrl, error) => {
54
+ const msg = error instanceof Error ? error.message : String(error);
55
+ return ErrorFactory.createCliError(`${label} is enabled but the proxy server is not reachable at ${baseUrl}. Start the proxy stack (e.g. \`zin cp up\` or \`docker compose -f docker-compose.proxy.yml up -d\`) and re-run \`zin migrate\`.`, { error: msg, baseUrl });
56
+ };
57
+ export const SqlProxyHttpAdapterShared = Object.freeze({
58
+ buildProxySettingsFromEnv,
59
+ buildStandardSignedProxyConfig,
60
+ ensureSignedProxyConfig,
61
+ requestProxy,
62
+ resolveProxyModeFromEnv,
63
+ createProxyNotReachableCliError,
64
+ });
@@ -1 +1 @@
1
- {"version":3,"file":"SqlServerProxyAdapter.d.ts","sourceRoot":"","sources":["../../../../src/orm/adapters/SqlServerProxyAdapter.ts"],"names":[],"mappings":"AACA;;GAEG;AAKH,OAAO,KAAK,EAAE,gBAAgB,EAAe,MAAM,sBAAsB,CAAC;AAwO1E,wBAAgB,2BAA2B,IAAI,gBAAgB,CAI9D"}
1
+ {"version":3,"file":"SqlServerProxyAdapter.d.ts","sourceRoot":"","sources":["../../../../src/orm/adapters/SqlServerProxyAdapter.ts"],"names":[],"mappings":"AACA;;GAEG;AAIH,OAAO,KAAK,EAAE,gBAAgB,EAAe,MAAM,sBAAsB,CAAC;AA2P1E,wBAAgB,2BAA2B,IAAI,gBAAgB,CAK9D"}