@asapjs/router 1.0.0-alpha.0 → 1.0.0-alpha.1
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/express/router.ts"],"names":[],"mappings":"AAAA,OAAU,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,WAAW,EAA0B,MAAM,eAAe,CAAC;AACpE,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/express/router.ts"],"names":[],"mappings":"AAAA,OAAU,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,WAAW,EAA0B,MAAM,eAAe,CAAC;AACpE,OAAO,EAAE,YAAY,EAAkB,MAAM,eAAe,CAAC;AAS7D,KAAK,eAAe,GAAG,kBAAkB,GAAG,qBAAqB,CAAC;AAClE,MAAM,WAAW,WAAW;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;IACxB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,MAAM,EAAE,GAAG,CAAC;CACZ;AAED,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAC;AAE3D,MAAM,WAAW,oBAAqB,SAAQ,WAAW;IACxD,MAAM,EAAE,UAAU,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACnB;AAUD,MAAM,CAAC,OAAO,OAAO,gBAAgB;IAC7B,QAAQ,SAAO;IAEf,aAAa,EAAE,aAAa,CAAC;;IAMpC,SAAS,CAAC,cAAc;IAaxB,OAAO,CAAC,mBAAmB,CAOxB;IAEH,OAAO,CAAC,oBAAoB,CASzB;IAEH,OAAO,CAAC,iBAAiB,CAmBvB;IAEF,OAAO,CAAC,kBAAkB,CAkBxB;IAEF,OAAO,CAAC,oBAAoB,CAuE1B;IAEF,OAAO,CAAC,0BAA0B,CA2IhC;IAEK,MAAM,GAAI,QAAQ,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,MAAM,SAAS,WAAW,UA+BlF;IAEK,MAAM;uBAjC4D,WAAW;wBAAX,WAAW;uBAAX,WAAW;0BAAX,WAAW;MAsClF;CACF;AAED,UAAU,aAAa,CAAC,CAAC;IACxB,QAAQ,CAAC,CAAC;CACV;AAED,KAAK,qBAAqB,GAAG,MAAM,GAAG,OAAO,CAAC;AAE9C,KAAK,oBAAoB,GACtB;IACA,IAAI,EAAE,qBAAqB,CAAC;IAC5B,IAAI,EAAE,GAAG,CAAC;CACT,GACD,SAAS,GACT,IAAI,CAAC;AAER,KAAK,cAAc,GAAG,MAAM,oBAAoB,CAAC;AAyBjD,eAAO,MAAM,WAAW,QApBlB,aAAa,CAAC,GAAG,CAAC,GAAG,IAAI,cAClB,qBAAqB,YACvB,OAAO,KACb,cAiB2C,CAAC;AACjD,eAAO,MAAM,YAAY,QArBnB,aAAa,CAAC,GAAG,CAAC,GAAG,IAAI,cAClB,qBAAqB,YACvB,OAAO,KACb,cAkB6C,CAAC"}
|
package/dist/express/router.js
CHANGED
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.responseType = exports.requestType = void 0;
|
|
7
7
|
const express_1 = require("express");
|
|
8
|
+
const error_1 = require("@asapjs/error");
|
|
8
9
|
const swagger_1 = require("../swagger");
|
|
9
10
|
const jwtVerification_1 = __importDefault(require("../middleware/jwtVerification"));
|
|
10
11
|
const wrapper_1 = __importDefault(require("../utils/wrapper"));
|
|
@@ -168,6 +169,11 @@ class RouterController {
|
|
|
168
169
|
const instance = new body();
|
|
169
170
|
if (typeof instance.swagger === 'function') {
|
|
170
171
|
const data = instance.swagger();
|
|
172
|
+
// DTO 기본 스키마를 components/schemas에 등록 (Swagger $ref 해결)
|
|
173
|
+
if ((data === null || data === void 0 ? void 0 : data.$ref) && typeof instance.generateScheme === 'function') {
|
|
174
|
+
const baseName = (0, getSchemeNameFromRef_1.default)(data.$ref);
|
|
175
|
+
(0, swagger_1.addScheme)({ name: baseName, data: instance.generateScheme() });
|
|
176
|
+
}
|
|
171
177
|
result.requestBody = this.generateRequestBody(this.generateDtoScheme(data, 'Body'), bodyContentType);
|
|
172
178
|
}
|
|
173
179
|
}
|
|
@@ -210,6 +216,11 @@ class RouterController {
|
|
|
210
216
|
const instance = new response();
|
|
211
217
|
if (typeof instance.swagger === 'function') {
|
|
212
218
|
const data = instance.swagger();
|
|
219
|
+
// DTO 기본 스키마를 components/schemas에 등록 (Swagger $ref 해결)
|
|
220
|
+
if ((data === null || data === void 0 ? void 0 : data.$ref) && typeof instance.generateScheme === 'function') {
|
|
221
|
+
const baseName = (0, getSchemeNameFromRef_1.default)(data.$ref);
|
|
222
|
+
(0, swagger_1.addScheme)({ name: baseName, data: instance.generateScheme() });
|
|
223
|
+
}
|
|
213
224
|
result.responses = this.generateResponseBody(this.generateDtoScheme(data, 'Response'));
|
|
214
225
|
}
|
|
215
226
|
}
|
|
@@ -257,8 +268,8 @@ class RouterController {
|
|
|
257
268
|
if (routes) {
|
|
258
269
|
for (const route of routes) {
|
|
259
270
|
this.excute(route.method)(Object.assign(Object.assign({}, route), {
|
|
260
|
-
// Call the method here.
|
|
261
|
-
excute: this[route.methodName].bind(this) }));
|
|
271
|
+
// Call the method here. wrapWithEffect: Effect 기반 실행/트레이싱 및 next(error) 전달
|
|
272
|
+
excute: (0, error_1.wrapWithEffect)(this[route.methodName].bind(this)) }));
|
|
262
273
|
}
|
|
263
274
|
}
|
|
264
275
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/express/router.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAqD;
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/express/router.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../src/utils/wrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../src/utils/wrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAG1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,KAAK,QAAQ,GAAG,CACf,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EACpC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,YAAY,KACd,OAAO,CAAC,OAAO,CAAC,CAAC;AAEtB,MAAM,WAAW,WAAW,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE;IAClD,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,QAAQ,CAAC;IACd,IAAI,CAAC,EAAE,CAAC,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAClC,KAAK,EAAE,CAAC,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAClC,IAAI,EAAE,CAAC,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACjC,KAAK,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAC/B,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,kBAAkB,CAAC;CAC3B;AAED,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,QAAQ,CAyCrF"}
|
package/dist/utils/wrapper.js
CHANGED
|
@@ -45,6 +45,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
45
45
|
exports.default = Wrapper;
|
|
46
46
|
const Sentry = __importStar(require("@sentry/node"));
|
|
47
47
|
const common_1 = require("@asapjs/common");
|
|
48
|
+
const error_1 = require("@asapjs/error");
|
|
48
49
|
function Wrapper(cb) {
|
|
49
50
|
return function _Wrapper(req, res, next) {
|
|
50
51
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -56,7 +57,7 @@ function Wrapper(cb) {
|
|
|
56
57
|
const paging = {
|
|
57
58
|
page,
|
|
58
59
|
limit,
|
|
59
|
-
offset: page * limit
|
|
60
|
+
offset: page * limit,
|
|
60
61
|
};
|
|
61
62
|
const args = {
|
|
62
63
|
req,
|
|
@@ -73,26 +74,17 @@ function Wrapper(cb) {
|
|
|
73
74
|
}
|
|
74
75
|
}
|
|
75
76
|
catch (err) {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
77
|
+
const isServerError = err == null ||
|
|
78
|
+
typeof err !== 'object' ||
|
|
79
|
+
err.status === 500 ||
|
|
80
|
+
err.status === undefined;
|
|
81
|
+
if (isServerError) {
|
|
82
|
+
common_1.logger.error('[SERVER ERROR]', err);
|
|
80
83
|
if ((0, common_1.getConfig)().sentry !== undefined) {
|
|
81
|
-
|
|
82
|
-
return res.status(status).json({
|
|
83
|
-
eventId,
|
|
84
|
-
message,
|
|
85
|
-
});
|
|
84
|
+
Sentry.captureException(err);
|
|
86
85
|
}
|
|
87
|
-
return res.status(status).json({
|
|
88
|
-
status,
|
|
89
|
-
message,
|
|
90
|
-
});
|
|
91
86
|
}
|
|
92
|
-
|
|
93
|
-
status: err.status,
|
|
94
|
-
message: err.message,
|
|
95
|
-
});
|
|
87
|
+
(0, error_1.errorToResponse)(err, res);
|
|
96
88
|
}
|
|
97
89
|
});
|
|
98
90
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../src/utils/wrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"wrapper.js","sourceRoot":"","sources":["../../src/utils/wrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuBA,0BAyCC;AAhED,qDAAuC;AAEvC,2CAAmD;AACnD,yCAAgD;AAoBhD,SAAwB,OAAO,CAAC,EAA2C;IAC1E,OAAO,SAAe,QAAQ,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;;YAC7E,IAAI,CAAC;gBACJ,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;gBACtB,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,CAAC,EAAE,KAAK,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;gBAChE,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC5C,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC9C,MAAM,MAAM,GAAuB;oBAClC,IAAI;oBACJ,KAAK;oBACL,MAAM,EAAE,IAAI,GAAG,KAAK;iBACpB,CAAC;gBACF,MAAM,IAAI,GAAgB;oBACzB,GAAG;oBACH,GAAG;oBACH,KAAK,EAAE,GAAG,CAAC,KAAK;oBAChB,IAAI,EAAE,GAAG,CAAC,MAAM;oBAChB,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,IAAI;oBACJ,MAAM;iBACN,CAAC;gBACF,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC;gBAC9B,IAAI,MAAM,EAAE,CAAC;oBACZ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC9B,CAAC;YACF,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,MAAM,aAAa,GAClB,GAAG,IAAI,IAAI;oBACX,OAAO,GAAG,KAAK,QAAQ;oBACtB,GAA2B,CAAC,MAAM,KAAK,GAAG;oBAC1C,GAA2B,CAAC,MAAM,KAAK,SAAS,CAAC;gBAEnD,IAAI,aAAa,EAAE,CAAC;oBACnB,eAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;oBACpC,IAAK,IAAA,kBAAS,GAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;wBAC/C,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;oBAC9B,CAAC;gBACF,CAAC;gBACD,IAAA,uBAAe,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAC3B,CAAC;QACF,CAAC;KAAA,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@asapjs/router",
|
|
3
|
-
"version": "1.0.0-alpha.
|
|
3
|
+
"version": "1.0.0-alpha.1",
|
|
4
4
|
"description": "Router and API layer for AsapJS",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -18,8 +18,8 @@
|
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
20
|
"@asapjs/common": "1.0.0-alpha.0",
|
|
21
|
-
"@asapjs/error": "1.0.0-alpha.
|
|
22
|
-
"@asapjs/sequelize": "1.0.0-alpha.
|
|
21
|
+
"@asapjs/error": "1.0.0-alpha.1",
|
|
22
|
+
"@asapjs/sequelize": "1.0.0-alpha.1",
|
|
23
23
|
"@asapjs/types": "1.0.0-alpha.0",
|
|
24
24
|
"@sentry/node": "^6.19.7",
|
|
25
25
|
"body-parser": "^1.19.2",
|
|
@@ -42,5 +42,5 @@
|
|
|
42
42
|
"@types/swagger-ui-express": "^4.1.3",
|
|
43
43
|
"typescript": "^5.8.3"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "84779254dfe56c6e01cfa219b6234058cae9aca8"
|
|
46
46
|
}
|