@ya-accelerators/web-backend-framework 0.0.37 → 0.0.39
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/app/server/index.d.ts +0 -2
- package/dist/app/server/index.js +48 -7
- package/dist/app/server/index.js.map +1 -1
- package/dist/app/trpc/server/index.d.ts +2 -4
- package/dist/app/trpc/server/index.js +25 -44
- package/dist/app/trpc/server/index.js.map +1 -1
- package/dist/env.d.ts +2 -0
- package/dist/env.js +7 -2
- package/dist/env.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/logger/index.d.ts +16 -0
- package/dist/logger/index.js +45 -0
- package/dist/logger/index.js.map +1 -0
- package/dist/prisma/index.d.ts +1 -1
- package/dist/prisma/index.js +27 -22
- package/dist/prisma/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -2,8 +2,6 @@ import type { ClientRequest, IncomingMessage } from 'node:http';
|
|
|
2
2
|
import type { NextFunction, Request, Response } from 'express';
|
|
3
3
|
import express from 'express';
|
|
4
4
|
export declare const createApp: (params: {
|
|
5
|
-
corsOrigin: string;
|
|
6
|
-
loggingEnabled?: boolean;
|
|
7
5
|
customRoutes?: (app: express.Express) => void;
|
|
8
6
|
middlewares?: ((req: Request, res: Response, next: NextFunction) => void)[];
|
|
9
7
|
proxyTarget?: {
|
package/dist/app/server/index.js
CHANGED
|
@@ -3,15 +3,38 @@ import cors from 'cors';
|
|
|
3
3
|
import express from 'express';
|
|
4
4
|
import { createProxyMiddleware } from 'http-proxy-middleware';
|
|
5
5
|
import { defaultEnv } from "../../env.js";
|
|
6
|
+
import { logger } from "../../logger/index.js";
|
|
6
7
|
import { Util } from "../../util/index.js";
|
|
7
8
|
import { getHeaderValue } from "../trpc/header/index.js";
|
|
8
9
|
let nonForwardableHeaders = new Set();
|
|
10
|
+
let processErrorHandlersRegistered = false;
|
|
11
|
+
// Routes process-level failures through `logger`. Preserves the default crash behavior
|
|
12
|
+
// (exit non-zero so the orchestrator restarts a clean container) while emitting a
|
|
13
|
+
// structured log first. Idempotent so repeated createApp calls register handlers once.
|
|
14
|
+
const registerProcessErrorHandlers = () => {
|
|
15
|
+
if (processErrorHandlersRegistered) {
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
processErrorHandlersRegistered = true;
|
|
19
|
+
process.on('uncaughtException', (error) => {
|
|
20
|
+
logger.error('uncaughtException', { message: error.message, stack: error.stack });
|
|
21
|
+
process.exit(1);
|
|
22
|
+
});
|
|
23
|
+
process.on('unhandledRejection', (reason) => {
|
|
24
|
+
logger.error('unhandledRejection', {
|
|
25
|
+
message: reason instanceof Error ? reason.message : String(reason),
|
|
26
|
+
stack: reason instanceof Error ? reason.stack : undefined,
|
|
27
|
+
});
|
|
28
|
+
process.exit(1);
|
|
29
|
+
});
|
|
30
|
+
};
|
|
9
31
|
export const createApp = (params) => {
|
|
10
|
-
const {
|
|
32
|
+
const { customRoutes, middlewares = [], proxyTarget, nonForwardableHeaders: nonForwardableHeadersParam = [] } = params;
|
|
33
|
+
registerProcessErrorHandlers();
|
|
11
34
|
nonForwardableHeaders = new Set(nonForwardableHeadersParam);
|
|
12
35
|
const app = express();
|
|
13
36
|
app.use(cors({
|
|
14
|
-
origin:
|
|
37
|
+
origin: defaultEnv.CORS_ORIGIN,
|
|
15
38
|
optionsSuccessStatus: 204,
|
|
16
39
|
}));
|
|
17
40
|
app.use((_req, res, next) => {
|
|
@@ -76,24 +99,31 @@ export const createApp = (params) => {
|
|
|
76
99
|
const body = [];
|
|
77
100
|
proxyRes.on('data', (chunk) => body.push(chunk));
|
|
78
101
|
proxyRes.on('end', () => {
|
|
79
|
-
if (
|
|
102
|
+
if ((proxyRes.statusCode ?? 500) >= 400) {
|
|
80
103
|
const message = Buffer.concat(body).toString();
|
|
81
104
|
if (!message.includes('UNAUTHORIZED') &&
|
|
82
105
|
!message.includes('NO_UPDATES_FOUND') &&
|
|
83
106
|
!message.includes('.me') &&
|
|
84
107
|
!message.includes('authentication.current')) {
|
|
85
108
|
try {
|
|
86
|
-
|
|
87
|
-
console.log(`${req.url} : ${defaultEnv.NODE_ENV === 'development' ? JSON.stringify(Util.sanitize(parsed), null, 2) : JSON.stringify(Util.sanitize(parsed))}`);
|
|
109
|
+
logger.warn('proxy', { url: req.url, response: JSON.parse(message) });
|
|
88
110
|
}
|
|
89
111
|
catch {
|
|
90
|
-
|
|
112
|
+
logger.warn('proxy', { url: req.url, response: message });
|
|
91
113
|
}
|
|
92
114
|
}
|
|
93
115
|
}
|
|
94
116
|
proxyTarget.onEnd?.(proxyRes);
|
|
95
117
|
});
|
|
96
118
|
},
|
|
119
|
+
// Fired when the downstream is unreachable (connection refused, timeout, DNS, etc.),
|
|
120
|
+
// so proxyRes never fires. Log it and return a clean 502 instead of leaking the raw error.
|
|
121
|
+
error: (error, req, res) => {
|
|
122
|
+
logger.error('proxy', { url: req.url, message: error.message, stack: error.stack });
|
|
123
|
+
if ('headersSent' in res && !res.headersSent) {
|
|
124
|
+
res.status(502).json({ error: 'Bad Gateway' });
|
|
125
|
+
}
|
|
126
|
+
},
|
|
97
127
|
};
|
|
98
128
|
if (proxyTarget.proxyReq) {
|
|
99
129
|
onHandlers.proxyReq = proxyTarget.proxyReq;
|
|
@@ -106,7 +136,18 @@ export const createApp = (params) => {
|
|
|
106
136
|
on: onHandlers,
|
|
107
137
|
}));
|
|
108
138
|
});
|
|
109
|
-
|
|
139
|
+
// Express error-handling middleware (4-arg signature). Catches errors from customRoutes
|
|
140
|
+
// and other non-tRPC paths, logs them, then delegates to Express's default handler for
|
|
141
|
+
// the response. tRPC errors are already handled by its own onError before reaching here.
|
|
142
|
+
app.use((err, req, _res, next) => {
|
|
143
|
+
logger.error('express', { url: req.url, method: req.method, message: err.message, stack: err.stack });
|
|
144
|
+
next(err);
|
|
145
|
+
});
|
|
146
|
+
const server = app.listen(defaultEnv.PORT, () => logger.banner(`[${defaultEnv.SERVICE}] Listening on port ${defaultEnv.PORT} on ${defaultEnv.NODE_ENV}`));
|
|
147
|
+
server.on('error', (error) => {
|
|
148
|
+
logger.error('startup', { port: defaultEnv.PORT, message: error.message, stack: error.stack });
|
|
149
|
+
process.exit(1);
|
|
150
|
+
});
|
|
110
151
|
};
|
|
111
152
|
const requestContextStorage = new AsyncLocalStorage();
|
|
112
153
|
const convertHeadersToRecord = (headers) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/app/server/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/app/server/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { type AnyTRPCRouter } from '@trpc/server';
|
|
2
2
|
import type express from 'express';
|
|
3
3
|
import superjson from 'superjson';
|
|
4
|
-
export declare function httpServerGenerator<TContext extends object = EmptyObject>(options
|
|
5
|
-
corsOrigin: string;
|
|
6
|
-
loggingEnabled?: boolean;
|
|
4
|
+
export declare function httpServerGenerator<TContext extends object = EmptyObject>(options?: {
|
|
7
5
|
customRoutes?: (app: express.Express) => void;
|
|
8
6
|
}): Generator<import("@trpc/server").TRPCRootObject<{
|
|
9
7
|
requestHeaders: import("node:http").IncomingHttpHeaders;
|
|
@@ -77,7 +75,7 @@ export declare function httpServerGenerator<TContext extends object = EmptyObjec
|
|
|
77
75
|
} & TContext extends infer T_2 ? T_2 extends {
|
|
78
76
|
requestHeaders: import("node:http").IncomingHttpHeaders;
|
|
79
77
|
ip: string | undefined;
|
|
80
|
-
} & TContext ? T_2 extends (...args: any[]) => object | Promise<object> ? import("@trpc/server/unstable-core-do-not-import").Unwrap<T_2> : T_2 : never : never, object,
|
|
78
|
+
} & TContext ? T_2 extends (...args: any[]) => object | Promise<object> ? import("@trpc/server/unstable-core-do-not-import").Unwrap<T_2> : T_2 : never : never, object, {}, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, import("@trpc/server").TRPCUnsetMarker, false>;
|
|
81
79
|
}, import("@trpc/server").TRPCRootObject<{
|
|
82
80
|
requestHeaders: import("node:http").IncomingHttpHeaders;
|
|
83
81
|
ip: string | undefined;
|
|
@@ -3,6 +3,7 @@ import { initTRPC } from '@trpc/server';
|
|
|
3
3
|
import * as trpcExpress from '@trpc/server/adapters/express';
|
|
4
4
|
import superjson from 'superjson';
|
|
5
5
|
import { defaultEnv } from "../../../env.js";
|
|
6
|
+
import { logger } from "../../../logger/index.js";
|
|
6
7
|
import { prisma } from "../../../prisma/index.js";
|
|
7
8
|
import { Util } from "../../../util/index.js";
|
|
8
9
|
import { createApp } from "../../server/index.js";
|
|
@@ -14,8 +15,8 @@ const createRequestContext = (opts) => {
|
|
|
14
15
|
ip: getHeaderValue(requestHeaders, 'x-forwarded-for') || opts.req.socket.remoteAddress,
|
|
15
16
|
};
|
|
16
17
|
};
|
|
17
|
-
export function* httpServerGenerator(options) {
|
|
18
|
-
const {
|
|
18
|
+
export function* httpServerGenerator(options = {}) {
|
|
19
|
+
const { customRoutes } = options;
|
|
19
20
|
const tprc = initTRPC.context().create({
|
|
20
21
|
transformer: superjson,
|
|
21
22
|
errorFormatter({ error, type, path, input, shape }) {
|
|
@@ -44,50 +45,35 @@ export function* httpServerGenerator(options) {
|
|
|
44
45
|
};
|
|
45
46
|
},
|
|
46
47
|
});
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
else {
|
|
68
|
-
console.log(`${defaultEnv.SERVICE ?? 'unknown'}:${JSON.stringify(Util.sanitize({
|
|
69
|
-
type: opts.type,
|
|
70
|
-
path: opts.path,
|
|
71
|
-
...contextWithTiming,
|
|
72
|
-
input: await opts.getRawInput(),
|
|
73
|
-
duration: Date.now() - startTime,
|
|
74
|
-
result: 'data' in result ? result.data : result,
|
|
75
|
-
}))}`);
|
|
76
|
-
}
|
|
77
|
-
return result;
|
|
78
|
-
});
|
|
79
|
-
}
|
|
48
|
+
const baseProcedure = tprc.procedure.use(async (opts) => {
|
|
49
|
+
const startTime = Date.now();
|
|
50
|
+
const contextWithTiming = opts.ctx;
|
|
51
|
+
contextWithTiming.startTime = startTime;
|
|
52
|
+
const result = await opts.next();
|
|
53
|
+
if (typeof result === 'object' && result !== null && 'error' in result && result.error instanceof Error) {
|
|
54
|
+
throw result.error;
|
|
55
|
+
}
|
|
56
|
+
if (logger.enabled('debug')) {
|
|
57
|
+
logger.debug('operation', {
|
|
58
|
+
type: opts.type,
|
|
59
|
+
path: opts.path,
|
|
60
|
+
...contextWithTiming,
|
|
61
|
+
input: await opts.getRawInput(),
|
|
62
|
+
duration: Date.now() - startTime,
|
|
63
|
+
result: 'data' in result ? result.data : result,
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
return result;
|
|
67
|
+
});
|
|
80
68
|
const enhancedTrpc = tprc;
|
|
81
69
|
enhancedTrpc.procedure = baseProcedure;
|
|
82
70
|
const router = yield enhancedTrpc;
|
|
83
71
|
createApp({
|
|
84
|
-
corsOrigin,
|
|
85
|
-
loggingEnabled,
|
|
86
72
|
customRoutes,
|
|
87
73
|
middlewares: [
|
|
88
74
|
trpcExpress.createExpressMiddleware({
|
|
89
75
|
router,
|
|
90
|
-
createContext: (opts) => prisma.run(async () => createRequestContext(opts)
|
|
76
|
+
createContext: (opts) => prisma.run(async () => createRequestContext(opts)),
|
|
91
77
|
onError: ({ error, type, path, input, ctx }) => {
|
|
92
78
|
const cause = error.cause;
|
|
93
79
|
const result = cause instanceof TRPCClientError
|
|
@@ -114,12 +100,7 @@ export function* httpServerGenerator(options) {
|
|
|
114
100
|
stack: error.stack,
|
|
115
101
|
...(result ? { result } : {}),
|
|
116
102
|
};
|
|
117
|
-
|
|
118
|
-
console.error(`Error: ${JSON.stringify(Util.sanitize(obj), null, 2)}`);
|
|
119
|
-
}
|
|
120
|
-
else {
|
|
121
|
-
console.error(`Error: ${JSON.stringify(Util.sanitize(obj))}`);
|
|
122
|
-
}
|
|
103
|
+
logger.error('error', obj);
|
|
123
104
|
},
|
|
124
105
|
}),
|
|
125
106
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/app/trpc/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAsB,QAAQ,EAAE,MAAM,cAAc,CAAA;AAC3D,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAA;AAE5D,OAAO,SAAS,MAAM,WAAW,CAAA;AAEjC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAA;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEnD,MAAM,oBAAoB,GAAG,CAAC,IAA6C,EAAE,EAAE;IAC7E,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAA;IACvC,OAAO;QACL,cAAc;QACd,EAAE,EAAE,cAAc,CAAC,cAAc,EAAE,iBAAiB,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa;KACvF,CAAA;AACH,CAAC,CAAA;AAGD,MAAM,SAAS,CAAC,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/app/trpc/server/index.ts"],"names":[],"mappings":"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"}
|
package/dist/env.d.ts
CHANGED
package/dist/env.js
CHANGED
|
@@ -4,6 +4,8 @@ export const defaultEnv = Util.createEnvProxy(z.object({
|
|
|
4
4
|
// common
|
|
5
5
|
NODE_ENV: z.enum(['development', 'production']).default('development'),
|
|
6
6
|
DEPLOY_ENV: z.enum(['dev', 'stg', 'prd']).default('dev'),
|
|
7
|
+
// When unset, the threshold defaults to debug on local dev and info on stg/prd (see logger).
|
|
8
|
+
LOG_LEVEL: z.enum(['debug', 'info', 'warn', 'error']).optional(),
|
|
7
9
|
// general
|
|
8
10
|
DATABASE_HOST: z.string().min(1),
|
|
9
11
|
DATABASE_PORT: z.string().min(1).transform(Number),
|
|
@@ -18,13 +20,15 @@ export const defaultEnv = Util.createEnvProxy(z.object({
|
|
|
18
20
|
.transform((val) => val === 'true'),
|
|
19
21
|
REDIS_HOST: z.string().min(1),
|
|
20
22
|
REDIS_PORT: z.string().min(1).transform(Number),
|
|
21
|
-
//
|
|
23
|
+
// package env
|
|
22
24
|
SERVICE: z.string().min(1),
|
|
23
25
|
PORT: z.string().min(1).transform(Number),
|
|
26
|
+
CORS_ORIGIN: z.string().min(1),
|
|
24
27
|
}), () => ({
|
|
25
28
|
// common
|
|
26
29
|
NODE_ENV: process.env.NODE_ENV,
|
|
27
30
|
DEPLOY_ENV: process.env.DEPLOY_ENV,
|
|
31
|
+
LOG_LEVEL: process.env.LOG_LEVEL,
|
|
28
32
|
// general
|
|
29
33
|
DATABASE_HOST: process.env.DATABASE_HOST,
|
|
30
34
|
DATABASE_PORT: process.env.DATABASE_PORT,
|
|
@@ -36,8 +40,9 @@ export const defaultEnv = Util.createEnvProxy(z.object({
|
|
|
36
40
|
REDIS_CLUSTER: process.env.REDIS_CLUSTER,
|
|
37
41
|
REDIS_HOST: process.env.REDIS_HOST,
|
|
38
42
|
REDIS_PORT: process.env.REDIS_PORT,
|
|
39
|
-
//
|
|
43
|
+
// package env
|
|
40
44
|
SERVICE: process.env.SERVICE,
|
|
41
45
|
PORT: process.env.PORT,
|
|
46
|
+
CORS_ORIGIN: process.env.CORS_ORIGIN,
|
|
42
47
|
}));
|
|
43
48
|
//# sourceMappingURL=env.js.map
|
package/dist/env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAEtC,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAC3C,CAAC,CAAC,MAAM,CAAC;IACP,SAAS;IACT,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC;IACtE,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IACxD,UAAU;IACV,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAChC,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC;IAClD,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACnC,gBAAgB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC;IACrD,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAChC,iBAAiB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACpC,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC3C,aAAa,EAAE,CAAC;SACb,MAAM,EAAE;SACR,OAAO,CAAC,OAAO,CAAC;SAChB,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,MAAM,CAAC;IACrC,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7B,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC;IAC/C,
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,UAAU,CAAA;AACxB,cAAc,mBAAmB,CAAA;AACjC,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,UAAU,CAAA;AACxB,cAAc,mBAAmB,CAAA;AACjC,cAAc,mBAAmB,CAAA;AACjC,cAAc,kBAAkB,CAAA;AAChC,cAAc,eAAe,CAAA;AAC7B,cAAc,iBAAiB,CAAA"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
declare const LEVEL_ORDER: {
|
|
2
|
+
readonly debug: 10;
|
|
3
|
+
readonly info: 20;
|
|
4
|
+
readonly warn: 30;
|
|
5
|
+
readonly error: 40;
|
|
6
|
+
};
|
|
7
|
+
type LogLevel = keyof typeof LEVEL_ORDER;
|
|
8
|
+
export declare const logger: {
|
|
9
|
+
enabled: (level: LogLevel) => boolean;
|
|
10
|
+
debug: (tag: string, payload: Record<string, unknown>) => void;
|
|
11
|
+
info: (tag: string, payload: Record<string, unknown>) => void;
|
|
12
|
+
warn: (tag: string, payload: Record<string, unknown>) => void;
|
|
13
|
+
error: (tag: string, payload: Record<string, unknown>) => void;
|
|
14
|
+
banner: (message: string) => void;
|
|
15
|
+
};
|
|
16
|
+
export {};
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import { defaultEnv } from "../env.js";
|
|
2
|
+
import { Util } from "../util/index.js";
|
|
3
|
+
const LEVEL_ORDER = { debug: 10, info: 20, warn: 30, error: 40 };
|
|
4
|
+
// LOG_LEVEL overrides; otherwise local dev shows everything (debug) and stg/prd
|
|
5
|
+
// (NODE_ENV=production) suppress the high-volume debug logs but keep info/warn/error.
|
|
6
|
+
const enabled = (level) => LEVEL_ORDER[level] >= LEVEL_ORDER[defaultEnv.LOG_LEVEL ?? (defaultEnv.NODE_ENV === 'development' ? 'debug' : 'info')];
|
|
7
|
+
const emit = (level, tag, payload) => {
|
|
8
|
+
if (!enabled(level)) {
|
|
9
|
+
return;
|
|
10
|
+
}
|
|
11
|
+
// dev (local) prints multi-line JSON for readability; stg/prd (ECS → CloudWatch) print
|
|
12
|
+
// single-line JSON so each log entry maps to one CloudWatch record.
|
|
13
|
+
const record = Util.sanitize({ level, service: defaultEnv.SERVICE ?? 'unknown', tag, ...payload });
|
|
14
|
+
const message = defaultEnv.NODE_ENV === 'development' ? JSON.stringify(record, null, 2) : JSON.stringify(record);
|
|
15
|
+
if (level === 'error') {
|
|
16
|
+
console.error(message);
|
|
17
|
+
}
|
|
18
|
+
else if (level === 'warn') {
|
|
19
|
+
console.warn(message);
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
console.log(message);
|
|
23
|
+
}
|
|
24
|
+
};
|
|
25
|
+
export const logger = {
|
|
26
|
+
enabled,
|
|
27
|
+
debug: (tag, payload) => {
|
|
28
|
+
emit('debug', tag, payload);
|
|
29
|
+
},
|
|
30
|
+
info: (tag, payload) => {
|
|
31
|
+
emit('info', tag, payload);
|
|
32
|
+
},
|
|
33
|
+
warn: (tag, payload) => {
|
|
34
|
+
emit('warn', tag, payload);
|
|
35
|
+
},
|
|
36
|
+
error: (tag, payload) => {
|
|
37
|
+
emit('error', tag, payload);
|
|
38
|
+
},
|
|
39
|
+
banner: (message) => {
|
|
40
|
+
if (enabled('info')) {
|
|
41
|
+
console.log(`✨✨✨✨ ${message} ✨✨✨✨`);
|
|
42
|
+
}
|
|
43
|
+
},
|
|
44
|
+
};
|
|
45
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logger/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AAEvC,MAAM,WAAW,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAW,CAAA;AAGzE,gFAAgF;AAChF,sFAAsF;AACtF,MAAM,OAAO,GAAG,CAAC,KAAe,EAAW,EAAE,CAC3C,WAAW,CAAC,KAAK,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,SAAS,IAAI,CAAC,UAAU,CAAC,QAAQ,KAAK,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;AAEvH,MAAM,IAAI,GAAG,CAAC,KAAe,EAAE,GAAW,EAAE,OAAgC,EAAE,EAAE;IAC9E,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,OAAM;IACR,CAAC;IACD,uFAAuF;IACvF,oEAAoE;IACpE,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,SAAS,EAAE,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC,CAAA;IAClG,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,KAAK,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAChH,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;QACtB,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACxB,CAAC;SAAM,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;QAC5B,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACvB,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;IACtB,CAAC;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,OAAO;IACP,KAAK,EAAE,CAAC,GAAW,EAAE,OAAgC,EAAE,EAAE;QACvD,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;IAC7B,CAAC;IACD,IAAI,EAAE,CAAC,GAAW,EAAE,OAAgC,EAAE,EAAE;QACtD,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;IAC5B,CAAC;IACD,IAAI,EAAE,CAAC,GAAW,EAAE,OAAgC,EAAE,EAAE;QACtD,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;IAC5B,CAAC;IACD,KAAK,EAAE,CAAC,GAAW,EAAE,OAAgC,EAAE,EAAE;QACvD,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;IAC7B,CAAC;IACD,MAAM,EAAE,CAAC,OAAe,EAAE,EAAE;QAC1B,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACpB,OAAO,CAAC,GAAG,CAAC,QAAQ,OAAO,OAAO,CAAC,CAAA;QACrC,CAAC;IACH,CAAC;CACF,CAAA"}
|
package/dist/prisma/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import 'dotenv/config';
|
|
2
2
|
type PrismaClientType = any;
|
|
3
3
|
export declare const prisma: {
|
|
4
|
-
run: <T>(fn: () => Promise<T
|
|
4
|
+
run: <T>(fn: () => Promise<T>) => Promise<T>;
|
|
5
5
|
client: <T extends unknown>(PrismaClientConstructor: new (optionsArg?: any) => T) => T & {
|
|
6
6
|
health: () => Promise<"OK" | "NG" | "INVALID">;
|
|
7
7
|
};
|
package/dist/prisma/index.js
CHANGED
|
@@ -3,13 +3,12 @@ import { PrismaMariaDb } from '@prisma/adapter-mariadb';
|
|
|
3
3
|
import { readReplicas } from '@prisma/extension-read-replicas';
|
|
4
4
|
import { AsyncLocalStorage } from 'async_hooks';
|
|
5
5
|
import { defaultEnv } from "../env.js";
|
|
6
|
-
import {
|
|
6
|
+
import { logger } from "../logger/index.js";
|
|
7
7
|
class Singleton {
|
|
8
8
|
static storage = new AsyncLocalStorage();
|
|
9
9
|
static instances = new Map();
|
|
10
10
|
static primaryInstances = new Map();
|
|
11
11
|
static replicaInstances = new Map();
|
|
12
|
-
static loggingEnabled = false;
|
|
13
12
|
static getContext() {
|
|
14
13
|
const context = this.storage.getStore();
|
|
15
14
|
if (!context) {
|
|
@@ -17,11 +16,8 @@ class Singleton {
|
|
|
17
16
|
}
|
|
18
17
|
return context;
|
|
19
18
|
}
|
|
20
|
-
static run(fn
|
|
21
|
-
|
|
22
|
-
this.loggingEnabled = loggingEnabled;
|
|
23
|
-
}
|
|
24
|
-
return this.storage.run({ loggingEnabled }, fn);
|
|
19
|
+
static run(fn) {
|
|
20
|
+
return this.storage.run({}, fn);
|
|
25
21
|
}
|
|
26
22
|
static getInstance(databaseName) {
|
|
27
23
|
const context = this.storage.getStore();
|
|
@@ -48,9 +44,6 @@ class Singleton {
|
|
|
48
44
|
static getReplicaInstance(databaseName) {
|
|
49
45
|
return this.replicaInstances.get(databaseName);
|
|
50
46
|
}
|
|
51
|
-
static getLoggingEnabled() {
|
|
52
|
-
return this.loggingEnabled;
|
|
53
|
-
}
|
|
54
47
|
static getTransaction() {
|
|
55
48
|
const context = this.storage.getStore();
|
|
56
49
|
return context?.transaction;
|
|
@@ -63,7 +56,7 @@ class Singleton {
|
|
|
63
56
|
}
|
|
64
57
|
}
|
|
65
58
|
export const prisma = {
|
|
66
|
-
run: (fn
|
|
59
|
+
run: (fn) => Singleton.run(fn),
|
|
67
60
|
client: (
|
|
68
61
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
69
62
|
PrismaClientConstructor) => {
|
|
@@ -73,7 +66,11 @@ export const prisma = {
|
|
|
73
66
|
return existingInstance;
|
|
74
67
|
}
|
|
75
68
|
const primary = new PrismaClientConstructor({
|
|
76
|
-
log: [
|
|
69
|
+
log: [
|
|
70
|
+
{ level: 'query', emit: 'event' },
|
|
71
|
+
{ level: 'warn', emit: 'event' },
|
|
72
|
+
{ level: 'error', emit: 'event' },
|
|
73
|
+
],
|
|
77
74
|
adapter: new PrismaMariaDb({
|
|
78
75
|
host: defaultEnv.DATABASE_HOST,
|
|
79
76
|
port: defaultEnv.DATABASE_PORT,
|
|
@@ -89,18 +86,20 @@ export const prisma = {
|
|
|
89
86
|
}),
|
|
90
87
|
});
|
|
91
88
|
primary.$on('query', (event) => {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
console.log(`RDS: ${JSON.stringify(Util.sanitize(event))}`);
|
|
100
|
-
}
|
|
89
|
+
logger.debug('rds', event);
|
|
90
|
+
});
|
|
91
|
+
primary.$on('warn', (event) => {
|
|
92
|
+
logger.warn('rds', event);
|
|
93
|
+
});
|
|
94
|
+
primary.$on('error', (event) => {
|
|
95
|
+
logger.error('rds', event);
|
|
101
96
|
});
|
|
102
97
|
const replica = new PrismaClientConstructor({
|
|
103
|
-
log: [
|
|
98
|
+
log: [
|
|
99
|
+
{ level: 'query', emit: 'event' },
|
|
100
|
+
{ level: 'warn', emit: 'event' },
|
|
101
|
+
{ level: 'error', emit: 'event' },
|
|
102
|
+
],
|
|
104
103
|
adapter: new PrismaMariaDb({
|
|
105
104
|
host: defaultEnv.DATABASE_RO_HOST,
|
|
106
105
|
port: defaultEnv.DATABASE_RO_PORT,
|
|
@@ -115,6 +114,12 @@ export const prisma = {
|
|
|
115
114
|
ssl: { rejectUnauthorized: defaultEnv.DEPLOY_ENV !== 'dev' },
|
|
116
115
|
}),
|
|
117
116
|
});
|
|
117
|
+
replica.$on('warn', (event) => {
|
|
118
|
+
logger.warn('rds', event);
|
|
119
|
+
});
|
|
120
|
+
replica.$on('error', (event) => {
|
|
121
|
+
logger.error('rds', event);
|
|
122
|
+
});
|
|
118
123
|
const instance = primary.$extends(readReplicas({
|
|
119
124
|
replicas: [replica],
|
|
120
125
|
}));
|
package/dist/prisma/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/prisma/index.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAA;AAEtB,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/prisma/index.ts"],"names":[],"mappings":"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"}
|