drapcode-utility 1.2.2 → 1.2.3
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/build/encryption/KMS.js +1 -1
- package/build/encryption/crypt.js +2 -2
- package/build/encryption/file.js +4 -4
- package/build/encryption/index.js +14 -14
- package/build/encryption/model.d.ts +2 -2
- package/build/index.js +5 -1
- package/build/middlewares/error-logger.js +6 -6
- package/build/middlewares/interceptor-logger-new.js +6 -6
- package/build/middlewares/interceptor-logger.js +3 -3
- package/build/middlewares/redis/request-log.js +4 -4
- package/build/utils/check-error.js +12 -8
- package/build/utils/date-util.js +3 -3
- package/build/utils/query-parser.js +58 -54
- package/build/utils/query-paser-new.js +53 -49
- package/build/utils/s3-util.js +22 -19
- package/build/utils/util.d.ts +1 -1
- package/build/utils/util.js +26 -22
- package/build/utils/uuid-generator.js +2 -2
- package/package.json +3 -3
package/build/encryption/KMS.js
CHANGED
|
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
14
14
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
15
|
function step(op) {
|
|
16
16
|
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (_) try {
|
|
17
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
18
|
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
19
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
20
|
switch (op[0]) {
|
|
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
14
14
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
15
|
function step(op) {
|
|
16
16
|
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (_) try {
|
|
17
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
18
|
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
19
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
20
|
switch (op[0]) {
|
|
@@ -88,7 +88,7 @@ var handleExtraString = function (key, append) {
|
|
|
88
88
|
if (append) {
|
|
89
89
|
var start = crypto_1.default.randomBytes(2).toString("hex");
|
|
90
90
|
var end = crypto_1.default.randomBytes(2).toString("hex");
|
|
91
|
-
key = ""
|
|
91
|
+
key = "".concat(start).concat(key).concat(end);
|
|
92
92
|
return key;
|
|
93
93
|
}
|
|
94
94
|
else {
|
package/build/encryption/file.js
CHANGED
|
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
14
14
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
15
|
function step(op) {
|
|
16
16
|
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (_) try {
|
|
17
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
18
|
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
19
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
20
|
switch (op[0]) {
|
|
@@ -58,11 +58,11 @@ var processFileEncryptionDecryption = function (data, encryption, decrypt) { ret
|
|
|
58
58
|
return [3 /*break*/, 6];
|
|
59
59
|
case 1:
|
|
60
60
|
if (!decrypt) return [3 /*break*/, 3];
|
|
61
|
-
return [4 /*yield*/, exports.decryptFile(data, dataKey)];
|
|
61
|
+
return [4 /*yield*/, (0, exports.decryptFile)(data, dataKey)];
|
|
62
62
|
case 2:
|
|
63
63
|
_b = _c.sent();
|
|
64
64
|
return [3 /*break*/, 5];
|
|
65
|
-
case 3: return [4 /*yield*/, exports.encryptFile(data, dataKey)];
|
|
65
|
+
case 3: return [4 /*yield*/, (0, exports.encryptFile)(data, dataKey)];
|
|
66
66
|
case 4:
|
|
67
67
|
_b = _c.sent();
|
|
68
68
|
_c.label = 5;
|
|
@@ -117,7 +117,7 @@ var decryptFile = function (encryptedFilePath, key) { return __awaiter(void 0, v
|
|
|
117
117
|
decipher = crypto_1.default.createDecipheriv(defaultAlgorithm, keyBuffer, iv);
|
|
118
118
|
decryptedBuffer = decipher.update(encryptedData);
|
|
119
119
|
decryptedBuffer = Buffer.concat([decryptedBuffer, decipher.final()]);
|
|
120
|
-
decryptedFilePath = encryptedFilePath.slice(0, -4)
|
|
120
|
+
decryptedFilePath = "".concat(encryptedFilePath.slice(0, -4), ".dec");
|
|
121
121
|
return [4 /*yield*/, fs_1.default.promises.writeFile(decryptedFilePath, decryptedBuffer)];
|
|
122
122
|
case 2:
|
|
123
123
|
_a.sent();
|
|
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
14
14
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
15
|
function step(op) {
|
|
16
16
|
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (_) try {
|
|
17
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
18
|
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
19
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
20
|
switch (op[0]) {
|
|
@@ -53,7 +53,7 @@ var crypt = function (data, fields, encryption, decrypt) { return __awaiter(void
|
|
|
53
53
|
accessKeyId: accessKeyId,
|
|
54
54
|
secretAccessKey: secretAccessKey,
|
|
55
55
|
};
|
|
56
|
-
return [4 /*yield*/, exports.processKMSDecryption(config, encryption.dataKey, {})];
|
|
56
|
+
return [4 /*yield*/, (0, exports.processKMSDecryption)(config, encryption.dataKey, {})];
|
|
57
57
|
case 1:
|
|
58
58
|
plainTextData = _b.sent();
|
|
59
59
|
if (plainTextData.status === "FAILED") {
|
|
@@ -64,13 +64,13 @@ var crypt = function (data, fields, encryption, decrypt) { return __awaiter(void
|
|
|
64
64
|
case 2:
|
|
65
65
|
if (!Array.isArray(data)) return [3 /*break*/, 4];
|
|
66
66
|
promises = data.map(function (item) {
|
|
67
|
-
return exports.processItemEncryptDecrypt(item, fields, encryption, decrypt);
|
|
67
|
+
return (0, exports.processItemEncryptDecrypt)(item, fields, encryption, decrypt);
|
|
68
68
|
});
|
|
69
69
|
return [4 /*yield*/, Promise.all(promises)];
|
|
70
70
|
case 3:
|
|
71
71
|
data = _b.sent();
|
|
72
72
|
return [3 /*break*/, 6];
|
|
73
|
-
case 4: return [4 /*yield*/, exports.processItemEncryptDecrypt(data, fields, encryption, decrypt)];
|
|
73
|
+
case 4: return [4 /*yield*/, (0, exports.processItemEncryptDecrypt)(data, fields, encryption, decrypt)];
|
|
74
74
|
case 5:
|
|
75
75
|
data = _b.sent();
|
|
76
76
|
_b.label = 6;
|
|
@@ -94,7 +94,7 @@ var processItemEncryptDecrypt = function (item, fields, encryption, decrypt) { r
|
|
|
94
94
|
if (!(field && field.encrypted)) return [3 /*break*/, 2];
|
|
95
95
|
_c = item;
|
|
96
96
|
_d = fieldName;
|
|
97
|
-
return [4 /*yield*/, exports.processDataEncryptionDecryption(item[fieldName], encryption, decrypt)];
|
|
97
|
+
return [4 /*yield*/, (0, exports.processDataEncryptionDecryption)(item[fieldName], encryption, decrypt)];
|
|
98
98
|
case 1:
|
|
99
99
|
_c[_d] = _e.sent();
|
|
100
100
|
_e.label = 2;
|
|
@@ -134,11 +134,11 @@ var processDataEncryptionDecryption = function (data, encryption, decrypt) { ret
|
|
|
134
134
|
return [3 /*break*/, 6];
|
|
135
135
|
case 1:
|
|
136
136
|
if (!decrypt) return [3 /*break*/, 3];
|
|
137
|
-
return [4 /*yield*/, crypt_1.decryptData(data, dataKey)];
|
|
137
|
+
return [4 /*yield*/, (0, crypt_1.decryptData)(data, dataKey)];
|
|
138
138
|
case 2:
|
|
139
139
|
_b = _c.sent();
|
|
140
140
|
return [3 /*break*/, 5];
|
|
141
|
-
case 3: return [4 /*yield*/, crypt_1.encryptData(data, dataKey)];
|
|
141
|
+
case 3: return [4 /*yield*/, (0, crypt_1.encryptData)(data, dataKey)];
|
|
142
142
|
case 4:
|
|
143
143
|
_b = _c.sent();
|
|
144
144
|
_c.label = 5;
|
|
@@ -161,7 +161,7 @@ var createKMSDataKey = function (config, arn) { return __awaiter(void 0, void 0,
|
|
|
161
161
|
var dataKeyRes;
|
|
162
162
|
return __generator(this, function (_a) {
|
|
163
163
|
switch (_a.label) {
|
|
164
|
-
case 0: return [4 /*yield*/, KMS_1.processKMSGenerateDataKey(config, arn)];
|
|
164
|
+
case 0: return [4 /*yield*/, (0, KMS_1.processKMSGenerateDataKey)(config, arn)];
|
|
165
165
|
case 1:
|
|
166
166
|
dataKeyRes = _a.sent();
|
|
167
167
|
return [2 /*return*/, dataKeyRes];
|
|
@@ -182,7 +182,7 @@ var encryptDataWithKMS = function (config, arn, plainText, context) { return __a
|
|
|
182
182
|
var cryptData;
|
|
183
183
|
return __generator(this, function (_a) {
|
|
184
184
|
switch (_a.label) {
|
|
185
|
-
case 0: return [4 /*yield*/, KMS_1.processKMSEncryption(config, arn, plainText, context)];
|
|
185
|
+
case 0: return [4 /*yield*/, (0, KMS_1.processKMSEncryption)(config, arn, plainText, context)];
|
|
186
186
|
case 1:
|
|
187
187
|
cryptData = _a.sent();
|
|
188
188
|
return [2 /*return*/, cryptData];
|
|
@@ -202,7 +202,7 @@ var decryptDataWithKMS = function (config, cipherText, context) { return __await
|
|
|
202
202
|
var plainTextData;
|
|
203
203
|
return __generator(this, function (_a) {
|
|
204
204
|
switch (_a.label) {
|
|
205
|
-
case 0: return [4 /*yield*/, exports.processKMSDecryption(config, cipherText, context)];
|
|
205
|
+
case 0: return [4 /*yield*/, (0, exports.processKMSDecryption)(config, cipherText, context)];
|
|
206
206
|
case 1:
|
|
207
207
|
plainTextData = _a.sent();
|
|
208
208
|
return [2 /*return*/, plainTextData];
|
|
@@ -241,7 +241,7 @@ var drapcodeEncryptDecrypt = function (data, encrypt) { return __awaiter(void 0,
|
|
|
241
241
|
accessKeyId: accessKey,
|
|
242
242
|
secretAccessKey: secretKey,
|
|
243
243
|
};
|
|
244
|
-
return [4 /*yield*/, exports.processKMSDecryption(config, privateDataKey, {})];
|
|
244
|
+
return [4 /*yield*/, (0, exports.processKMSDecryption)(config, privateDataKey, {})];
|
|
245
245
|
case 1:
|
|
246
246
|
plainTextData = _a.sent();
|
|
247
247
|
if (plainTextData.status === "FAILED") {
|
|
@@ -251,13 +251,13 @@ var drapcodeEncryptDecrypt = function (data, encrypt) { return __awaiter(void 0,
|
|
|
251
251
|
response = null;
|
|
252
252
|
if (!encrypt) return [3 /*break*/, 3];
|
|
253
253
|
console.log("Encrypting");
|
|
254
|
-
return [4 /*yield*/, crypt_1.encryptData(data, publicKey)];
|
|
254
|
+
return [4 /*yield*/, (0, crypt_1.encryptData)(data, publicKey)];
|
|
255
255
|
case 2:
|
|
256
256
|
response = _a.sent();
|
|
257
257
|
return [3 /*break*/, 5];
|
|
258
258
|
case 3:
|
|
259
259
|
console.log("Decrypting");
|
|
260
|
-
return [4 /*yield*/, crypt_1.decryptData(data, publicKey)];
|
|
260
|
+
return [4 /*yield*/, (0, crypt_1.decryptData)(data, publicKey)];
|
|
261
261
|
case 4:
|
|
262
262
|
response = _a.sent();
|
|
263
263
|
_a.label = 5;
|
|
@@ -270,7 +270,7 @@ var cryptFile = function (filePath, encryption, decrypt) { return __awaiter(void
|
|
|
270
270
|
var data;
|
|
271
271
|
return __generator(this, function (_a) {
|
|
272
272
|
switch (_a.label) {
|
|
273
|
-
case 0: return [4 /*yield*/, file_1.processFileEncryptionDecryption(filePath, encryption, decrypt)];
|
|
273
|
+
case 0: return [4 /*yield*/, (0, file_1.processFileEncryptionDecryption)(filePath, encryption, decrypt)];
|
|
274
274
|
case 1:
|
|
275
275
|
data = _a.sent();
|
|
276
276
|
return [2 /*return*/, data];
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
export
|
|
1
|
+
export type AwsConfig = {
|
|
2
2
|
accessKeyId: string;
|
|
3
3
|
secretAccessKey: string;
|
|
4
4
|
region: string;
|
|
5
5
|
};
|
|
6
|
-
export
|
|
6
|
+
export type Encryption = {
|
|
7
7
|
encryptionType: string;
|
|
8
8
|
algorithm: string;
|
|
9
9
|
dataKey: string;
|
package/build/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -32,16 +32,16 @@ var errorLogger = function (err, req, res, next) {
|
|
|
32
32
|
var originalUrl = req.originalUrl, method = req.method, body = req.body, params = req.params, query = req.query, db = req.db, projectName = req.projectName, projectId = req.projectId, ip = req.ip;
|
|
33
33
|
var PreviouseFilePath;
|
|
34
34
|
if (projectName) {
|
|
35
|
-
loggerPath = loggerPath
|
|
36
|
-
PreviouseFilePath = loggerPath
|
|
35
|
+
loggerPath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
|
|
36
|
+
PreviouseFilePath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
|
|
37
37
|
}
|
|
38
38
|
else if (projectId) {
|
|
39
|
-
loggerPath = loggerPath
|
|
40
|
-
PreviouseFilePath = loggerPath
|
|
39
|
+
loggerPath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
|
|
40
|
+
PreviouseFilePath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
|
|
41
41
|
}
|
|
42
42
|
else {
|
|
43
|
-
loggerPath = loggerPath
|
|
44
|
-
PreviouseFilePath = loggerPath
|
|
43
|
+
loggerPath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
|
|
44
|
+
PreviouseFilePath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
|
|
45
45
|
}
|
|
46
46
|
if (fs_1.default.existsSync(PreviouseFilePath)) {
|
|
47
47
|
fs_1.default.rmSync(PreviouseFilePath, { recursive: true, force: true });
|
|
@@ -27,16 +27,16 @@ var interceptLoggerNew = function (req, res, next) {
|
|
|
27
27
|
}
|
|
28
28
|
var PreviouseFilePath;
|
|
29
29
|
if (projectName) {
|
|
30
|
-
loggerPath = loggerPath
|
|
31
|
-
PreviouseFilePath = loggerPath
|
|
30
|
+
loggerPath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
|
|
31
|
+
PreviouseFilePath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
|
|
32
32
|
}
|
|
33
33
|
else if (projectId) {
|
|
34
|
-
loggerPath = loggerPath
|
|
35
|
-
PreviouseFilePath = loggerPath
|
|
34
|
+
loggerPath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
|
|
35
|
+
PreviouseFilePath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
38
|
-
loggerPath = loggerPath
|
|
39
|
-
PreviouseFilePath = loggerPath
|
|
38
|
+
loggerPath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
|
|
39
|
+
PreviouseFilePath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
|
|
40
40
|
}
|
|
41
41
|
if (fs_1.default.existsSync(PreviouseFilePath)) {
|
|
42
42
|
fs_1.default.rmSync(PreviouseFilePath, { recursive: true, force: true });
|
|
@@ -21,13 +21,13 @@ var interceptLogger = function (req, res, next) {
|
|
|
21
21
|
reqObject["dbName"] = db.name;
|
|
22
22
|
}
|
|
23
23
|
if (projectName) {
|
|
24
|
-
loggerPath = loggerPath
|
|
24
|
+
loggerPath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerDateFormat)());
|
|
25
25
|
}
|
|
26
26
|
else if (projectId) {
|
|
27
|
-
loggerPath = loggerPath
|
|
27
|
+
loggerPath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerDateFormat)());
|
|
28
28
|
}
|
|
29
29
|
else {
|
|
30
|
-
loggerPath = loggerPath
|
|
30
|
+
loggerPath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerDateFormat)());
|
|
31
31
|
}
|
|
32
32
|
var logger = new drapcode_logger_1.FileLogger(loggerPath).createLogger();
|
|
33
33
|
var oldSend = res.send;
|
|
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
14
14
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
15
|
function step(op) {
|
|
16
16
|
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (_) try {
|
|
17
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
18
|
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
19
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
20
|
switch (op[0]) {
|
|
@@ -47,7 +47,7 @@ var saveRequest = function (req, res) {
|
|
|
47
47
|
return __generator(this, function (_a) {
|
|
48
48
|
switch (_a.label) {
|
|
49
49
|
case 0:
|
|
50
|
-
req.body = util_1.isEmpty(req.body) ? req.query : req.body;
|
|
50
|
+
req.body = (0, util_1.isEmpty)(req.body) ? req.query : req.body;
|
|
51
51
|
ip = req.headers["x-forwarded-for"] ||
|
|
52
52
|
req.connection.remoteAddress ||
|
|
53
53
|
req.socket.remoteAddress ||
|
|
@@ -62,13 +62,13 @@ var saveRequest = function (req, res) {
|
|
|
62
62
|
response: JSON.stringify(res),
|
|
63
63
|
ipAddress: ip,
|
|
64
64
|
};
|
|
65
|
-
return [4 /*yield*/, drapcode_redis_1.redis_get_method("requestLog")];
|
|
65
|
+
return [4 /*yield*/, (0, drapcode_redis_1.redis_get_method)("requestLog")];
|
|
66
66
|
case 1:
|
|
67
67
|
redisData = _a.sent();
|
|
68
68
|
if (!redisData)
|
|
69
69
|
redisData = [];
|
|
70
70
|
redisData.push(respObj);
|
|
71
|
-
return [4 /*yield*/, drapcode_redis_1.redis_set_method("requestLog", redisData)];
|
|
71
|
+
return [4 /*yield*/, (0, drapcode_redis_1.redis_set_method)("requestLog", redisData)];
|
|
72
72
|
case 2:
|
|
73
73
|
_a.sent();
|
|
74
74
|
return [2 /*return*/];
|
|
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
14
14
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
15
|
function step(op) {
|
|
16
16
|
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (_) try {
|
|
17
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
18
|
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
19
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
20
|
switch (op[0]) {
|
|
@@ -35,10 +35,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
35
35
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
39
|
-
for (var i = 0,
|
|
40
|
-
|
|
41
|
-
|
|
38
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
39
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
40
|
+
if (ar || !(i in from)) {
|
|
41
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
42
|
+
ar[i] = from[i];
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
42
46
|
};
|
|
43
47
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
44
48
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
@@ -114,7 +118,7 @@ var handleMultErrorConfig = function (error, result, status) {
|
|
|
114
118
|
var apiErrorMessage;
|
|
115
119
|
var apiErrorValue;
|
|
116
120
|
if (result && result !== "undefined" && result !== "null") {
|
|
117
|
-
console.log("handleMultErrorConfig result :>> "
|
|
121
|
+
console.log("handleMultErrorConfig result :>> ".concat(Object.keys(result)));
|
|
118
122
|
apiErrorMessage = lodash_1.default.get(result, message);
|
|
119
123
|
if (apiErrorMessage) {
|
|
120
124
|
console.log("*** utility 3 ***");
|
|
@@ -144,7 +148,7 @@ var handleMultErrorConfig = function (error, result, status) {
|
|
|
144
148
|
apiErrorValue = status;
|
|
145
149
|
}
|
|
146
150
|
console.log("apiErrorValue", apiErrorValue);
|
|
147
|
-
apiErrorValue = ""
|
|
151
|
+
apiErrorValue = "".concat(apiErrorValue);
|
|
148
152
|
console.log("apiErrorMessage", apiErrorMessage);
|
|
149
153
|
console.log("apiErrorValue", apiErrorValue);
|
|
150
154
|
if (value && apiErrorValue == value) {
|
|
@@ -181,7 +185,7 @@ var nestedValue = function (data, messages) {
|
|
|
181
185
|
messages.push(value);
|
|
182
186
|
}
|
|
183
187
|
else if (Array.isArray(value)) {
|
|
184
|
-
messages = __spreadArray(__spreadArray([], messages), value);
|
|
188
|
+
messages = __spreadArray(__spreadArray([], messages, true), value, true);
|
|
185
189
|
}
|
|
186
190
|
else {
|
|
187
191
|
if (Object.keys(value).length) {
|
package/build/utils/date-util.js
CHANGED
|
@@ -29,11 +29,11 @@ exports.createLogsDateFormat = createLogsDateFormat;
|
|
|
29
29
|
var getDateValue = function (value, timezone) {
|
|
30
30
|
if (timezone === void 0) { timezone = ""; }
|
|
31
31
|
if (!value)
|
|
32
|
-
return exports.createLogsDateFormat(timezone);
|
|
32
|
+
return (0, exports.createLogsDateFormat)(timezone);
|
|
33
33
|
var dateFormat = "YYYY-MM-DDTHH:mm:ss.SSS";
|
|
34
34
|
var _a = value.split(":"), type = _a[0], number = _a[1], unit = _a[2];
|
|
35
35
|
if (!["ADD", "SUB"].includes(type))
|
|
36
|
-
return exports.createLogsDateFormat(timezone);
|
|
36
|
+
return (0, exports.createLogsDateFormat)(timezone);
|
|
37
37
|
var dateUnit = getDateUnit(unit);
|
|
38
38
|
var result;
|
|
39
39
|
if (type === "ADD") {
|
|
@@ -80,7 +80,7 @@ var timezoneDateParse = function (value, nextDay, prevDay) {
|
|
|
80
80
|
if (prevDay && value.length <= 10) {
|
|
81
81
|
timeZoneDate = timeZoneDate.subtract(1, "days");
|
|
82
82
|
}
|
|
83
|
-
console.log("If it was for end date "
|
|
83
|
+
console.log("If it was for end date ".concat(nextDay, " then"), timeZoneDate);
|
|
84
84
|
timeZoneDate = timeZoneDate.format("YYYY-MM-DDTHH:mm:ss");
|
|
85
85
|
console.log("Format Date into date string", timeZoneDate);
|
|
86
86
|
return new Date(timeZoneDate);
|