@konker.dev/middleware-fp 0.9.0 → 0.10.0
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/dist/http/contrib/sqlClientInitPg/index.d.ts +3 -2
- package/dist/http/contrib/sqlClientInitPg/index.d.ts.map +1 -1
- package/dist/http/contrib/sqlClientInitPg/index.js +3 -3
- package/dist/http/contrib/sqlClientInitPg/index.js.map +1 -1
- package/dist/http/contrib/sqlClientInitPg/index.test.d.ts.map +1 -1
- package/dist/http/contrib/sqlClientInitPg/index.test.js +23 -3
- package/dist/http/contrib/sqlClientInitPg/index.test.js.map +1 -1
- package/dist/http/contrib/sqlClientInitPg/lib.d.ts +5 -2
- package/dist/http/contrib/sqlClientInitPg/lib.d.ts.map +1 -1
- package/dist/http/contrib/sqlClientInitPg/lib.js +12 -4
- package/dist/http/contrib/sqlClientInitPg/lib.js.map +1 -1
- package/dist/http/contrib/sqlClientInitPg/lib.test.js +12 -1
- package/dist/http/contrib/sqlClientInitPg/lib.test.js.map +1 -1
- package/package.json +4 -4
|
@@ -3,7 +3,8 @@ import type { SqlClient } from '@effect/sql/SqlClient';
|
|
|
3
3
|
import type { SqlError } from '@effect/sql/SqlError';
|
|
4
4
|
import { type ConfigError, type Layer } from 'effect';
|
|
5
5
|
import type { Rec, RequestResponseHandler } from '../../index.js';
|
|
6
|
+
import { type CheckServerIdentityFunction } from './lib.js';
|
|
6
7
|
export type Adapted<R> = Exclude<R, SqlClient> | FileSystem.FileSystem;
|
|
7
|
-
export { SslConfigSchema, type SslConfig } from './lib.js';
|
|
8
|
-
export declare const middleware: (caBundleFilePath?: string, pgSqlClientLayer?: Layer.Layer<SqlClient, ConfigError.ConfigError | SqlError>) => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I, O, E, R | SqlClient>) => RequestResponseHandler<I, O, E | ConfigError.ConfigError | SqlError, Adapted<R>>;
|
|
8
|
+
export { type CheckServerIdentityFunction, ignoreCheckServerIdentity, SslConfigSchema, type SslConfig } from './lib.js';
|
|
9
|
+
export declare const middleware: (caBundleFilePath?: string, checkServerIdentityFunction?: CheckServerIdentityFunction, pgSqlClientLayer?: Layer.Layer<SqlClient, ConfigError.ConfigError | SqlError>) => <I extends Rec, O extends Rec, E, R>(wrapped: RequestResponseHandler<I, O, E, R | SqlClient>) => RequestResponseHandler<I, O, E | ConfigError.ConfigError | SqlError, Adapted<R>>;
|
|
9
10
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,KAAK,EAAQ,MAAM,QAAQ,CAAC;AAG5D,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,KAAK,EAAQ,MAAM,QAAQ,CAAC;AAG5D,OAAO,KAAK,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAElE,OAAO,EAAE,KAAK,2BAA2B,EAAiC,MAAM,UAAU,CAAC;AAI3F,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,GAAG,UAAU,CAAC,UAAU,CAAC;AAEvE,OAAO,EAAE,KAAK,2BAA2B,EAAE,yBAAyB,EAAE,eAAe,EAAE,KAAK,SAAS,EAAE,MAAM,UAAU,CAAC;AAExH,eAAO,MAAM,UAAU,GAEnB,mBAAmB,MAAM,EACzB,8BAA8B,2BAA2B,EACzD,mBAAmB,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,WAAW,CAAC,WAAW,GAAG,QAAQ,CAAC,MAE9E,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC,EACjC,SAAS,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,KACtD,sBAAsB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,WAAW,GAAG,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,CAWjF,CAAC"}
|
|
@@ -2,11 +2,11 @@ import { pipe } from 'effect';
|
|
|
2
2
|
import * as Effect from 'effect/Effect';
|
|
3
3
|
import { createDefaultPgSqlClientLayer } from './lib.js';
|
|
4
4
|
const TAG = 'sqlClientInitPg';
|
|
5
|
-
export { SslConfigSchema } from './lib.js';
|
|
6
|
-
export const middleware = (caBundleFilePath, pgSqlClientLayer) => (wrapped) => (i) => {
|
|
5
|
+
export { ignoreCheckServerIdentity, SslConfigSchema } from './lib.js';
|
|
6
|
+
export const middleware = (caBundleFilePath, checkServerIdentityFunction, pgSqlClientLayer) => (wrapped) => (i) => {
|
|
7
7
|
if (pgSqlClientLayer) {
|
|
8
8
|
return pipe(wrapped(i), Effect.provide(pgSqlClientLayer), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
|
|
9
9
|
}
|
|
10
|
-
return pipe(wrapped(i), Effect.provide(createDefaultPgSqlClientLayer(caBundleFilePath)), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
|
|
10
|
+
return pipe(wrapped(i), Effect.provide(createDefaultPgSqlClientLayer(caBundleFilePath, checkServerIdentityFunction)), Effect.tap(Effect.logDebug(`[${TAG}] OUT`)));
|
|
11
11
|
};
|
|
12
12
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgC,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC5D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAgC,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC5D,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,EAAoC,6BAA6B,EAAE,MAAM,UAAU,CAAC;AAE3F,MAAM,GAAG,GAAG,iBAAiB,CAAC;AAI9B,OAAO,EAAoC,yBAAyB,EAAE,eAAe,EAAkB,MAAM,UAAU,CAAC;AAExH,MAAM,CAAC,MAAM,UAAU,GACrB,CACE,gBAAyB,EACzB,2BAAyD,EACzD,gBAA6E,EAC7E,EAAE,CACJ,CACE,OAAuD,EAC2B,EAAE,CACtF,CAAC,CAAc,EAAE,EAAE;IACjB,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACzG,CAAC;IAED,OAAO,IAAI,CACT,OAAO,CAAC,CAAC,CAAC,EACV,MAAM,CAAC,OAAO,CAAC,6BAA6B,CAAC,gBAAgB,EAAE,2BAA2B,CAAC,CAAC,EAC5F,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,CAAC,CAC5C,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAQ,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.test.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAQ,MAAM,QAAQ,CAAC;AAWrC,eAAO,MAAM,oBAAoB,sCAAsC,CAAC"}
|
|
@@ -7,6 +7,7 @@ import { echoCoreIn200W } from '../../../test/test-common.js';
|
|
|
7
7
|
import { EMPTY_REQUEST_W } from '../../RequestW.js';
|
|
8
8
|
import * as unit from './index.js';
|
|
9
9
|
import * as unitLib from './lib.js';
|
|
10
|
+
import { ignoreCheckServerIdentity } from './lib.js';
|
|
10
11
|
// Create a mock PgDrizzle layer for testing
|
|
11
12
|
export const MockPgSqlClientLayer = Layer.succeed(SqlClient, {});
|
|
12
13
|
describe('middleware/sql-client-pg-init', () => {
|
|
@@ -15,7 +16,7 @@ describe('middleware/sql-client-pg-init', () => {
|
|
|
15
16
|
vi.restoreAllMocks();
|
|
16
17
|
});
|
|
17
18
|
it('should work as expected with custom layer', async () => {
|
|
18
|
-
const egHandler = pipe(echoCoreIn200W, unit.middleware(undefined, MockPgSqlClientLayer));
|
|
19
|
+
const egHandler = pipe(echoCoreIn200W, unit.middleware(undefined, undefined, MockPgSqlClientLayer));
|
|
19
20
|
const result = await pipe(egHandler(EMPTY_REQUEST_W), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
|
|
20
21
|
expect(result).toMatchObject({
|
|
21
22
|
body: 'OK',
|
|
@@ -35,7 +36,7 @@ describe('middleware/sql-client-pg-init', () => {
|
|
|
35
36
|
const egHandler = pipe(echoCoreIn200W, unit.middleware());
|
|
36
37
|
const result = await pipe(egHandler(EMPTY_REQUEST_W), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
|
|
37
38
|
expect(spy).toHaveBeenCalledTimes(1);
|
|
38
|
-
expect(spy).toHaveBeenCalledWith(undefined);
|
|
39
|
+
expect(spy).toHaveBeenCalledWith(undefined, undefined);
|
|
39
40
|
expect(result).toMatchObject({
|
|
40
41
|
body: 'OK',
|
|
41
42
|
headers: {},
|
|
@@ -54,7 +55,26 @@ describe('middleware/sql-client-pg-init', () => {
|
|
|
54
55
|
const egHandler = pipe(echoCoreIn200W, unit.middleware('/path/to/ca-bundle.pem'));
|
|
55
56
|
const result = await pipe(egHandler(EMPTY_REQUEST_W), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
|
|
56
57
|
expect(spy).toHaveBeenCalledTimes(1);
|
|
57
|
-
expect(spy).toHaveBeenCalledWith('/path/to/ca-bundle.pem');
|
|
58
|
+
expect(spy).toHaveBeenCalledWith('/path/to/ca-bundle.pem', undefined);
|
|
59
|
+
expect(result).toMatchObject({
|
|
60
|
+
body: 'OK',
|
|
61
|
+
headers: {},
|
|
62
|
+
in: {
|
|
63
|
+
url: '/',
|
|
64
|
+
headers: {},
|
|
65
|
+
method: 'GET',
|
|
66
|
+
pathParameters: {},
|
|
67
|
+
queryStringParameters: {},
|
|
68
|
+
},
|
|
69
|
+
statusCode: 200,
|
|
70
|
+
});
|
|
71
|
+
});
|
|
72
|
+
it('should work as expected with ca bundle file path and CheckServerIdentityFunction', async () => {
|
|
73
|
+
const spy = vi.spyOn(unitLib, 'createDefaultPgSqlClientLayer').mockReturnValue(MockPgSqlClientLayer);
|
|
74
|
+
const egHandler = pipe(echoCoreIn200W, unit.middleware('/path/to/ca-bundle.pem', ignoreCheckServerIdentity));
|
|
75
|
+
const result = await pipe(egHandler(EMPTY_REQUEST_W), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
|
|
76
|
+
expect(spy).toHaveBeenCalledTimes(1);
|
|
77
|
+
expect(spy).toHaveBeenCalledWith('/path/to/ca-bundle.pem', ignoreCheckServerIdentity);
|
|
58
78
|
expect(result).toMatchObject({
|
|
59
79
|
body: 'OK',
|
|
60
80
|
headers: {},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,IAAI,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,OAAO,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/index.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { PeerCertificate } from 'node:tls';
|
|
1
2
|
import { FileSystem } from '@effect/platform';
|
|
2
3
|
import type { SqlClient } from '@effect/sql/SqlClient';
|
|
3
4
|
import type { SqlError } from '@effect/sql/SqlError';
|
|
@@ -7,7 +8,9 @@ export declare const SslConfigSchema: Schema.transform<Schema.SchemaClass<unknow
|
|
|
7
8
|
ca: typeof Schema.String;
|
|
8
9
|
}>, Schema.Record$<typeof Schema.String, typeof Schema.Unknown>]>>;
|
|
9
10
|
export type SslConfig = typeof SslConfigSchema.Type;
|
|
11
|
+
export type CheckServerIdentityFunction = (_hostname: string, _cert: PeerCertificate) => Error | undefined;
|
|
12
|
+
export declare function ignoreCheckServerIdentity(_hostname: string, _cert: PeerCertificate): Error | undefined;
|
|
10
13
|
export declare function resolveSslConfigDirect(defaultValue: SslConfig): Effect.Effect<Config.Config<SslConfig>, ConfigError.ConfigError>;
|
|
11
|
-
export declare function resolveSslConfigCaBundle(caBundleFilePath: string): Effect.Effect<Config.Config<SslConfig>, ConfigError.ConfigError, FileSystem.FileSystem>;
|
|
12
|
-
export declare function createDefaultPgSqlClientLayer(caBundleFilePath?: string): Layer.Layer<SqlClient | PgClient.PgClient, SqlError | ConfigError.ConfigError, FileSystem.FileSystem>;
|
|
14
|
+
export declare function resolveSslConfigCaBundle(caBundleFilePath: string, checkServerIdentityFunction?: CheckServerIdentityFunction): Effect.Effect<Config.Config<SslConfig>, ConfigError.ConfigError, FileSystem.FileSystem>;
|
|
15
|
+
export declare function createDefaultPgSqlClientLayer(caBundleFilePath?: string, checkServerIdentityFunction?: CheckServerIdentityFunction): Layer.Layer<SqlClient | PgClient.PgClient, SqlError | ConfigError.ConfigError, FileSystem.FileSystem>;
|
|
13
16
|
//# sourceMappingURL=lib.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAU,KAAK,EAAQ,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIlF,eAAO,MAAM,eAAe;;kEAM3B,CAAC;AACF,MAAM,MAAM,SAAS,GAAG,OAAO,eAAe,CAAC,IAAI,CAAC;AAGpD,MAAM,MAAM,2BAA2B,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,KAAK,KAAK,GAAG,SAAS,CAAC;AAE3G,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,GAAG,KAAK,GAAG,SAAS,CAEtG;AAGD,wBAAgB,sBAAsB,CACpC,YAAY,EAAE,SAAS,GACtB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,WAAW,CAAC,WAAW,CAAC,CAelE;AAGD,wBAAgB,wBAAwB,CACtC,gBAAgB,EAAE,MAAM,EACxB,2BAA2B,CAAC,EAAE,2BAA2B,GACxD,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,WAAW,CAAC,WAAW,EAAE,UAAU,CAAC,UAAU,CAAC,CAYzF;AAGD,wBAAgB,6BAA6B,CAC3C,gBAAgB,CAAC,EAAE,MAAM,EACzB,2BAA2B,CAAC,EAAE,2BAA2B,GACxD,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,WAAW,CAAC,WAAW,EAAE,UAAU,CAAC,UAAU,CAAC,CAiBvG"}
|
|
@@ -4,6 +4,9 @@ import { Config, ConfigError, Effect, Either, Layer, pipe, Schema } from 'effect
|
|
|
4
4
|
import { TreeFormatter } from 'effect/ParseResult';
|
|
5
5
|
// --------------------------------------------------------------------------
|
|
6
6
|
export const SslConfigSchema = Schema.parseJson(Schema.Union(Schema.Boolean, Schema.Struct({ ca: Schema.String }), Schema.Record({ key: Schema.String, value: Schema.Unknown })));
|
|
7
|
+
export function ignoreCheckServerIdentity(_hostname, _cert) {
|
|
8
|
+
return undefined;
|
|
9
|
+
}
|
|
7
10
|
// --------------------------------------------------------------------------
|
|
8
11
|
export function resolveSslConfigDirect(defaultValue) {
|
|
9
12
|
return Config.string('DATABASE_SSL')
|
|
@@ -12,12 +15,17 @@ export function resolveSslConfigDirect(defaultValue) {
|
|
|
12
15
|
.pipe(Effect.succeed);
|
|
13
16
|
}
|
|
14
17
|
// --------------------------------------------------------------------------
|
|
15
|
-
export function resolveSslConfigCaBundle(caBundleFilePath) {
|
|
16
|
-
return pipe(FileSystem.FileSystem, Effect.flatMap((fs) => fs.readFileString(caBundleFilePath, 'utf8')), Effect.mapError((err) => ConfigError.InvalidData([], err.message)), Effect.map((ca) => Config.succeed({
|
|
18
|
+
export function resolveSslConfigCaBundle(caBundleFilePath, checkServerIdentityFunction) {
|
|
19
|
+
return pipe(FileSystem.FileSystem, Effect.flatMap((fs) => fs.readFileString(caBundleFilePath, 'utf8')), Effect.mapError((err) => ConfigError.InvalidData([], err.message)), Effect.map((ca) => Config.succeed({
|
|
20
|
+
ca,
|
|
21
|
+
checkServerIdentity: checkServerIdentityFunction,
|
|
22
|
+
})));
|
|
17
23
|
}
|
|
18
24
|
// --------------------------------------------------------------------------
|
|
19
|
-
export function createDefaultPgSqlClientLayer(caBundleFilePath) {
|
|
20
|
-
const sslConfigEffect = caBundleFilePath
|
|
25
|
+
export function createDefaultPgSqlClientLayer(caBundleFilePath, checkServerIdentityFunction) {
|
|
26
|
+
const sslConfigEffect = caBundleFilePath
|
|
27
|
+
? resolveSslConfigCaBundle(caBundleFilePath, checkServerIdentityFunction)
|
|
28
|
+
: resolveSslConfigDirect(false);
|
|
21
29
|
return Layer.unwrapEffect(Effect.map(sslConfigEffect, (sslConfig) => PgClient.layerConfig({
|
|
22
30
|
host: Config.string('DATABASE_HOST'),
|
|
23
31
|
port: Config.number('DATABASE_PORT'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,14 @@ import { NodeFileSystem } from '@effect/platform-node';
|
|
|
2
2
|
import { Effect, Layer, pipe } from 'effect';
|
|
3
3
|
import { afterAll, afterEach, beforeAll, describe, expect, it } from 'vitest';
|
|
4
4
|
import * as unit from './lib.js';
|
|
5
|
+
import { ignoreCheckServerIdentity } from './lib.js';
|
|
5
6
|
describe('middleware/sql-client-pg-init/lib', () => {
|
|
7
|
+
describe('ignoreCheckServerIdentity', () => {
|
|
8
|
+
it('should always return undefined', async () => {
|
|
9
|
+
const actual = unit.ignoreCheckServerIdentity('test-host', 'test-cert');
|
|
10
|
+
expect(actual).toStrictEqual(undefined);
|
|
11
|
+
});
|
|
12
|
+
});
|
|
6
13
|
describe('resolveSslConfigDirect', () => {
|
|
7
14
|
let _oldEnv;
|
|
8
15
|
beforeAll(() => {
|
|
@@ -38,7 +45,11 @@ describe('middleware/sql-client-pg-init/lib', () => {
|
|
|
38
45
|
describe('resolveSslConfigCaBundle', () => {
|
|
39
46
|
it('should work as expected with a valid file path', async () => {
|
|
40
47
|
const actual = await pipe(unit.resolveSslConfigCaBundle(`${__dirname}/fixtures/test-ca-bundle.pem`), Effect.flatMap((config) => config), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
|
|
41
|
-
expect(actual).toStrictEqual({ ca: 'test-ca-bundle-content' });
|
|
48
|
+
expect(actual).toStrictEqual({ ca: 'test-ca-bundle-content', checkServerIdentity: undefined });
|
|
49
|
+
});
|
|
50
|
+
it('should work as expected with a valid file path and a checkServerIdentity function', async () => {
|
|
51
|
+
const actual = await pipe(unit.resolveSslConfigCaBundle(`${__dirname}/fixtures/test-ca-bundle.pem`, ignoreCheckServerIdentity), Effect.flatMap((config) => config), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
|
|
52
|
+
expect(actual).toStrictEqual({ ca: 'test-ca-bundle-content', checkServerIdentity: ignoreCheckServerIdentity });
|
|
42
53
|
});
|
|
43
54
|
it('should fail with a non-existent file path', async () => {
|
|
44
55
|
const actual = async () => pipe(unit.resolveSslConfigCaBundle('/non-existent-path/ca-bundle.pem'), Effect.flatMap((config) => config), Effect.provide(NodeFileSystem.layer), Effect.runPromise);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.test.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9E,OAAO,KAAK,IAAI,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"lib.test.js","sourceRoot":"","sources":["../../../../src/http/contrib/sqlClientInitPg/lib.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@konker.dev/middleware-fp",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.10.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"author": "Konrad Markus <mail@konker.dev>",
|
|
6
6
|
"license": "ISC",
|
|
@@ -249,10 +249,10 @@
|
|
|
249
249
|
"effect": "^3.19.14",
|
|
250
250
|
"lesslog": "^1.0.2",
|
|
251
251
|
"@konker.dev/momento-cache-client-effect": "0.1.12",
|
|
252
|
-
"@konker.dev/tiny-auth-utils-fp": "0.1.12",
|
|
253
|
-
"@konker.dev/tiny-cache-fp": "0.1.13",
|
|
254
252
|
"@konker.dev/tiny-error-fp": "0.1.12",
|
|
255
|
-
"@konker.dev/tiny-
|
|
253
|
+
"@konker.dev/tiny-cache-fp": "0.1.13",
|
|
254
|
+
"@konker.dev/tiny-utils-fp": "0.1.13",
|
|
255
|
+
"@konker.dev/tiny-auth-utils-fp": "0.1.12"
|
|
256
256
|
},
|
|
257
257
|
"devDependencies": {
|
|
258
258
|
"@arethetypeswrong/cli": "^0.18.2",
|