mielk-api 1.3.3 → 1.3.5
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/db/pg/connection/pool.js +5 -8
- package/dist/http/apiResponse/apiResponse.d.ts +3 -3
- package/dist/http/apiResponse/apiResponse.js +3 -3
- package/dist/middlewares/requestAuth/auth.middleware.d.ts +1 -1
- package/dist/middlewares/requestAuth/auth.middleware.js +1 -1
- package/dist/middlewares/zod/validate.d.ts +2 -2
- package/dist/middlewares/zod/validate.js +2 -2
- package/dist/routing/controllers/db.controller.d.ts +2 -2
- package/dist/routing/controllers/health.controller.d.ts +2 -2
- package/package.json +3 -3
|
@@ -9,8 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import { Msg } from '../../../internal/messaging/messageTags.js';
|
|
11
11
|
import { Pool } from 'pg';
|
|
12
|
-
import { openSshTunnel } from './tunnel.js';
|
|
13
|
-
import { isProd } from '../../../routing/express.js';
|
|
14
12
|
let pool = null;
|
|
15
13
|
let config = null;
|
|
16
14
|
export const initDb = (dbConfig) => {
|
|
@@ -22,12 +20,11 @@ export function getPool() {
|
|
|
22
20
|
return pool;
|
|
23
21
|
if (config === null)
|
|
24
22
|
throw new Error(Msg.connection.notInitialized);
|
|
25
|
-
if (!isProd()) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
}
|
|
23
|
+
// if (!isProd()) {
|
|
24
|
+
// if (!config.ssh) throw new Error(Msg.connection.sshOptionsNotSpecified)
|
|
25
|
+
// const port: number = await openSshTunnel(config.ssh, config.port);
|
|
26
|
+
// config.port = port;
|
|
27
|
+
// }
|
|
31
28
|
pool = new Pool(config);
|
|
32
29
|
pool.on('error', (err) => {
|
|
33
30
|
console.error(Msg.connection.postgreConnectionError, err);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Response } from 'express';
|
|
2
2
|
import { HttpStatus } from '../types/HttpStatus.js';
|
|
3
3
|
import { ApiErrorDetails } from '../types/ApiResponse.js';
|
|
4
|
-
export declare function success<T>(res: Response, status: HttpStatus, data: T):
|
|
5
|
-
export declare function failure(res: Response, status: HttpStatus, details: string | ApiErrorDetails):
|
|
6
|
-
export declare function serverError(res: Response, err: Error):
|
|
4
|
+
export declare function success<T>(res: Response, status: HttpStatus, data: T): Response<Record<string, any>>;
|
|
5
|
+
export declare function failure(res: Response, status: HttpStatus, details: string | ApiErrorDetails): Response<Record<string, any>>;
|
|
6
|
+
export declare function serverError(res: Response, err: Error): Response<Record<string, any>>;
|
|
@@ -6,7 +6,7 @@ export function success(res, status, data) {
|
|
|
6
6
|
success: true,
|
|
7
7
|
data,
|
|
8
8
|
};
|
|
9
|
-
res.status(status.code).json(apiResponse);
|
|
9
|
+
return res.status(status.code).json(apiResponse);
|
|
10
10
|
}
|
|
11
11
|
export function failure(res, status, details) {
|
|
12
12
|
const message = isPrimitive(details) ? details : (details === null || details === void 0 ? void 0 : details.message) || status.defaultMessageTag;
|
|
@@ -15,7 +15,7 @@ export function failure(res, status, details) {
|
|
|
15
15
|
message,
|
|
16
16
|
params: isObject(details) ? details.params : undefined
|
|
17
17
|
};
|
|
18
|
-
res.status(status.code).json(apiError);
|
|
18
|
+
return res.status(status.code).json(apiError);
|
|
19
19
|
}
|
|
20
20
|
export function serverError(res, err) {
|
|
21
21
|
var _a;
|
|
@@ -24,5 +24,5 @@ export function serverError(res, err) {
|
|
|
24
24
|
success: false,
|
|
25
25
|
message: isProd() ? status.defaultMessageTag : `message: ${err.message} | stack: ${(_a = err.stack) === null || _a === void 0 ? void 0 : _a.toString()}`,
|
|
26
26
|
};
|
|
27
|
-
res.status(status.code).json(apiError);
|
|
27
|
+
return res.status(status.code).json(apiError);
|
|
28
28
|
}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { Request, Response, NextFunction } from 'express';
|
|
2
|
-
export declare function apiKeyAuthorization(req: Request, res: Response, next: NextFunction): void
|
|
2
|
+
export declare function apiKeyAuthorization(req: Request, res: Response, next: NextFunction): void | Response<Record<string, any>, Record<string, any>>;
|
|
@@ -10,7 +10,7 @@ export function apiKeyAuthorization(req, res, next) {
|
|
|
10
10
|
}
|
|
11
11
|
const key = (_a = req.headers['authorization']) === null || _a === void 0 ? void 0 : _a.split(' ')[1]; // Bearer <key>
|
|
12
12
|
if (!apiKey && (!key || key !== apiKey)) {
|
|
13
|
-
failure(res, HttpResponseStatus.UNAUTHORIZED, Msg.connection.unauthorizedRequest);
|
|
13
|
+
return failure(res, HttpResponseStatus.UNAUTHORIZED, Msg.connection.unauthorizedRequest);
|
|
14
14
|
}
|
|
15
15
|
next();
|
|
16
16
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Request, Response, NextFunction } from 'express';
|
|
2
2
|
import { ZodType } from 'zod';
|
|
3
|
-
export declare const validateQueryParams: (schema: ZodType) => (req: Request, res: Response, next: NextFunction) =>
|
|
4
|
-
export declare const validateBodyJson: (schema: ZodType) => (req: Request, res: Response, next: NextFunction) =>
|
|
3
|
+
export declare const validateQueryParams: (schema: ZodType) => (req: Request, res: Response, next: NextFunction) => Response<Record<string, any>, Record<string, any>> | undefined;
|
|
4
|
+
export declare const validateBodyJson: (schema: ZodType) => (req: Request, res: Response, next: NextFunction) => Response<Record<string, any>, Record<string, any>> | undefined;
|
|
@@ -8,7 +8,7 @@ export const validateQueryParams = (schema) => (req, res, next) => {
|
|
|
8
8
|
if (!result.success) {
|
|
9
9
|
const issue = result.error.issues[0];
|
|
10
10
|
const { message } = issue;
|
|
11
|
-
failure(res, HttpResponseStatus.BAD_REQUEST, { message });
|
|
11
|
+
return failure(res, HttpResponseStatus.BAD_REQUEST, { message });
|
|
12
12
|
}
|
|
13
13
|
else {
|
|
14
14
|
const data = result.data;
|
|
@@ -25,7 +25,7 @@ export const validateBodyJson = (schema) => (req, res, next) => {
|
|
|
25
25
|
const result = schema.safeParse(req.body);
|
|
26
26
|
if (!result.success) {
|
|
27
27
|
const message = result.error.issues.map(i => i.message).join('; ');
|
|
28
|
-
failure(res, HttpResponseStatus.BAD_REQUEST, { message });
|
|
28
|
+
return failure(res, HttpResponseStatus.BAD_REQUEST, { message });
|
|
29
29
|
}
|
|
30
30
|
else {
|
|
31
31
|
req.body = result.data;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { Request, Response } from 'express';
|
|
2
|
-
export declare const getDbTest: (_req: Request, res: Response) => Promise<
|
|
3
|
-
export declare function getDbVersion(_req: Request, res: Response): Promise<
|
|
2
|
+
export declare const getDbTest: (_req: Request, res: Response) => Promise<Response<Record<string, any>, Record<string, any>>>;
|
|
3
|
+
export declare function getDbVersion(_req: Request, res: Response): Promise<Response<Record<string, any>, Record<string, any>>>;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { Request, Response } from 'express';
|
|
2
|
-
export declare const getHealth: (_req: Request, res: Response) =>
|
|
3
|
-
export declare const getEnv: (_req: Request, res: Response) =>
|
|
2
|
+
export declare const getHealth: (_req: Request, res: Response) => Response<Record<string, any>, Record<string, any>>;
|
|
3
|
+
export declare const getEnv: (_req: Request, res: Response) => Response<Record<string, any>, Record<string, any>>;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "mielk-api",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.5",
|
|
4
4
|
"keywords": [],
|
|
5
5
|
"author": "mielk",
|
|
6
6
|
"description": "Wrapper for API operations",
|
|
@@ -44,9 +44,9 @@
|
|
|
44
44
|
"license": "MIT",
|
|
45
45
|
"repository": {
|
|
46
46
|
"type": "git",
|
|
47
|
-
"url": "git+https://github.com/mielk/mielk-api
|
|
47
|
+
"url": "git+https://github.com/mielk/mielk-api.git"
|
|
48
48
|
},
|
|
49
|
-
"homepage": "https://mielk.github.io/mielk-api
|
|
49
|
+
"homepage": "https://mielk.github.io/mielk-api/",
|
|
50
50
|
"devDependencies": {
|
|
51
51
|
"@babel/cli": "^7.25.7",
|
|
52
52
|
"@babel/core": "^7.25.8",
|