drapcode-utility 1.1.7 → 1.1.9
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.d.ts +4 -0
- package/build/encryption/file.js +134 -0
- package/build/encryption/index.d.ts +5 -0
- package/build/encryption/index.js +44 -14
- package/build/encryption/model.d.ts +2 -2
- package/build/index.d.ts +1 -0
- package/build/index.js +2 -5
- 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 +8 -12
- package/build/utils/date-util.js +3 -3
- package/build/utils/query-parser.js +53 -57
- package/build/utils/query-paser-new.js +48 -52
- package/build/utils/s3-util.d.ts +28 -0
- package/build/utils/s3-util.js +170 -0
- package/build/utils/util.d.ts +1 -1
- package/build/utils/util.js +13 -13
- package/build/utils/uuid-generator.js +2 -2
- package/package.json +5 -1
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 (
|
|
17
|
+
while (_) 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 (
|
|
17
|
+
while (_) 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 = "" + start + key + end;
|
|
92
92
|
return key;
|
|
93
93
|
}
|
|
94
94
|
else {
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { Encryption } from "./model";
|
|
2
|
+
export declare const processFileEncryptionDecryption: (data: string, encryption: Encryption, decrypt: boolean) => Promise<string>;
|
|
3
|
+
export declare const encryptFile: (filePath: string, key: string) => Promise<string>;
|
|
4
|
+
export declare const decryptFile: (encryptedFilePath: string, key: string) => Promise<string>;
|
|
@@ -0,0 +1,134 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (_) try {
|
|
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
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
39
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
|
+
};
|
|
41
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
|
+
exports.decryptFile = exports.encryptFile = exports.processFileEncryptionDecryption = void 0;
|
|
43
|
+
var fs_1 = __importDefault(require("fs"));
|
|
44
|
+
var crypto_1 = __importDefault(require("crypto"));
|
|
45
|
+
var defaultAlgorithm = "aes-256-cbc";
|
|
46
|
+
var processFileEncryptionDecryption = function (data, encryption, decrypt) { return __awaiter(void 0, void 0, void 0, function () {
|
|
47
|
+
var encryptionType, dataKey, _a, result, _b;
|
|
48
|
+
return __generator(this, function (_c) {
|
|
49
|
+
switch (_c.label) {
|
|
50
|
+
case 0:
|
|
51
|
+
encryptionType = encryption.encryptionType, dataKey = encryption.dataKey;
|
|
52
|
+
if (!data)
|
|
53
|
+
return [2 /*return*/, data];
|
|
54
|
+
_a = encryptionType;
|
|
55
|
+
switch (_a) {
|
|
56
|
+
case "KMS": return [3 /*break*/, 1];
|
|
57
|
+
}
|
|
58
|
+
return [3 /*break*/, 6];
|
|
59
|
+
case 1:
|
|
60
|
+
if (!decrypt) return [3 /*break*/, 3];
|
|
61
|
+
return [4 /*yield*/, exports.decryptFile(data, dataKey)];
|
|
62
|
+
case 2:
|
|
63
|
+
_b = _c.sent();
|
|
64
|
+
return [3 /*break*/, 5];
|
|
65
|
+
case 3: return [4 /*yield*/, exports.encryptFile(data, dataKey)];
|
|
66
|
+
case 4:
|
|
67
|
+
_b = _c.sent();
|
|
68
|
+
_c.label = 5;
|
|
69
|
+
case 5:
|
|
70
|
+
result = _b;
|
|
71
|
+
return [2 /*return*/, result];
|
|
72
|
+
case 6: return [2 /*return*/, data];
|
|
73
|
+
}
|
|
74
|
+
});
|
|
75
|
+
}); };
|
|
76
|
+
exports.processFileEncryptionDecryption = processFileEncryptionDecryption;
|
|
77
|
+
var encryptFile = function (filePath, key) { return __awaiter(void 0, void 0, void 0, function () {
|
|
78
|
+
var iv, keyBuffer, fileContent, cipher, encryptedDataBuffer, encryptedFilePath, error_1;
|
|
79
|
+
return __generator(this, function (_a) {
|
|
80
|
+
switch (_a.label) {
|
|
81
|
+
case 0:
|
|
82
|
+
_a.trys.push([0, 3, , 4]);
|
|
83
|
+
iv = Buffer.from("i4mboZDwaNEC38YCzi77lw==", "base64");
|
|
84
|
+
keyBuffer = Buffer.from(key, "base64");
|
|
85
|
+
return [4 /*yield*/, fs_1.default.promises.readFile(filePath)];
|
|
86
|
+
case 1:
|
|
87
|
+
fileContent = _a.sent();
|
|
88
|
+
cipher = crypto_1.default.createCipheriv(defaultAlgorithm, keyBuffer, iv);
|
|
89
|
+
encryptedDataBuffer = cipher.update(fileContent);
|
|
90
|
+
encryptedDataBuffer = Buffer.concat([encryptedDataBuffer, cipher.final()]);
|
|
91
|
+
encryptedFilePath = filePath + ".enc";
|
|
92
|
+
return [4 /*yield*/, fs_1.default.promises.writeFile(encryptedFilePath, encryptedDataBuffer)];
|
|
93
|
+
case 2:
|
|
94
|
+
_a.sent();
|
|
95
|
+
console.log("File encrypted successfully.");
|
|
96
|
+
return [2 /*return*/, encryptedFilePath];
|
|
97
|
+
case 3:
|
|
98
|
+
error_1 = _a.sent();
|
|
99
|
+
console.log("\n Error: ", error_1);
|
|
100
|
+
throw error_1;
|
|
101
|
+
case 4: return [2 /*return*/];
|
|
102
|
+
}
|
|
103
|
+
});
|
|
104
|
+
}); };
|
|
105
|
+
exports.encryptFile = encryptFile;
|
|
106
|
+
var decryptFile = function (encryptedFilePath, key) { return __awaiter(void 0, void 0, void 0, function () {
|
|
107
|
+
var iv, keyBuffer, encryptedData, decipher, decryptedBuffer, decryptedFilePath, error_2;
|
|
108
|
+
return __generator(this, function (_a) {
|
|
109
|
+
switch (_a.label) {
|
|
110
|
+
case 0:
|
|
111
|
+
_a.trys.push([0, 3, , 4]);
|
|
112
|
+
iv = Buffer.from("i4mboZDwaNEC38YCzi77lw==", "base64");
|
|
113
|
+
keyBuffer = Buffer.from(key, "base64");
|
|
114
|
+
return [4 /*yield*/, fs_1.default.promises.readFile(encryptedFilePath)];
|
|
115
|
+
case 1:
|
|
116
|
+
encryptedData = _a.sent();
|
|
117
|
+
decipher = crypto_1.default.createDecipheriv(defaultAlgorithm, keyBuffer, iv);
|
|
118
|
+
decryptedBuffer = decipher.update(encryptedData);
|
|
119
|
+
decryptedBuffer = Buffer.concat([decryptedBuffer, decipher.final()]);
|
|
120
|
+
decryptedFilePath = encryptedFilePath.slice(0, -4) + ".dec";
|
|
121
|
+
return [4 /*yield*/, fs_1.default.promises.writeFile(decryptedFilePath, decryptedBuffer)];
|
|
122
|
+
case 2:
|
|
123
|
+
_a.sent();
|
|
124
|
+
console.log("File decrypted successfully.");
|
|
125
|
+
return [2 /*return*/, decryptedFilePath];
|
|
126
|
+
case 3:
|
|
127
|
+
error_2 = _a.sent();
|
|
128
|
+
console.log("Error:", error_2);
|
|
129
|
+
throw error_2;
|
|
130
|
+
case 4: return [2 /*return*/];
|
|
131
|
+
}
|
|
132
|
+
});
|
|
133
|
+
}); };
|
|
134
|
+
exports.decryptFile = decryptFile;
|
|
@@ -46,3 +46,8 @@ export declare const drapcodeEncryptDecrypt: (data: string, encrypt: boolean) =>
|
|
|
46
46
|
data: string;
|
|
47
47
|
message: string;
|
|
48
48
|
}>;
|
|
49
|
+
export declare const cryptFile: (filePath: any, encryption: Encryption, decrypt: boolean) => Promise<string | {
|
|
50
|
+
status: string;
|
|
51
|
+
data: string;
|
|
52
|
+
message: string;
|
|
53
|
+
}>;
|
|
@@ -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 (
|
|
17
|
+
while (_) 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]) {
|
|
@@ -36,8 +36,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
-
exports.drapcodeEncryptDecrypt = exports.decryptDataWithKMS = exports.encryptDataWithKMS = exports.createKMSDataKey = exports.processDataEncryptionDecryption = exports.processItemEncryptDecrypt = exports.crypt = void 0;
|
|
39
|
+
exports.cryptFile = exports.drapcodeEncryptDecrypt = exports.decryptDataWithKMS = exports.encryptDataWithKMS = exports.createKMSDataKey = exports.processDataEncryptionDecryption = exports.processItemEncryptDecrypt = exports.crypt = void 0;
|
|
40
40
|
var crypt_1 = require("./crypt");
|
|
41
|
+
var file_1 = require("./file");
|
|
41
42
|
var KMS_1 = require("./KMS");
|
|
42
43
|
var crypt = function (data, fields, encryption, decrypt) { return __awaiter(void 0, void 0, void 0, function () {
|
|
43
44
|
var _a, accessKeyId, secretAccessKey, region, config, plainTextData, promises;
|
|
@@ -51,7 +52,7 @@ var crypt = function (data, fields, encryption, decrypt) { return __awaiter(void
|
|
|
51
52
|
accessKeyId: accessKeyId,
|
|
52
53
|
secretAccessKey: secretAccessKey,
|
|
53
54
|
};
|
|
54
|
-
return [4 /*yield*/,
|
|
55
|
+
return [4 /*yield*/, KMS_1.processKMSDecryption(config, encryption.dataKey, {})];
|
|
55
56
|
case 1:
|
|
56
57
|
plainTextData = _b.sent();
|
|
57
58
|
if (plainTextData.status === "FAILED") {
|
|
@@ -62,13 +63,13 @@ var crypt = function (data, fields, encryption, decrypt) { return __awaiter(void
|
|
|
62
63
|
case 2:
|
|
63
64
|
if (!Array.isArray(data)) return [3 /*break*/, 4];
|
|
64
65
|
promises = data.map(function (item) {
|
|
65
|
-
return
|
|
66
|
+
return exports.processItemEncryptDecrypt(item, fields, encryption, decrypt);
|
|
66
67
|
});
|
|
67
68
|
return [4 /*yield*/, Promise.all(promises)];
|
|
68
69
|
case 3:
|
|
69
70
|
data = _b.sent();
|
|
70
71
|
return [3 /*break*/, 6];
|
|
71
|
-
case 4: return [4 /*yield*/,
|
|
72
|
+
case 4: return [4 /*yield*/, exports.processItemEncryptDecrypt(data, fields, encryption, decrypt)];
|
|
72
73
|
case 5:
|
|
73
74
|
data = _b.sent();
|
|
74
75
|
_b.label = 6;
|
|
@@ -92,7 +93,7 @@ var processItemEncryptDecrypt = function (item, fields, encryption, decrypt) { r
|
|
|
92
93
|
if (!(field && field.encrypted)) return [3 /*break*/, 2];
|
|
93
94
|
_c = item;
|
|
94
95
|
_d = fieldName;
|
|
95
|
-
return [4 /*yield*/,
|
|
96
|
+
return [4 /*yield*/, exports.processDataEncryptionDecryption(item[fieldName], encryption, decrypt)];
|
|
96
97
|
case 1:
|
|
97
98
|
_c[_d] = _e.sent();
|
|
98
99
|
_e.label = 2;
|
|
@@ -132,11 +133,11 @@ var processDataEncryptionDecryption = function (data, encryption, decrypt) { ret
|
|
|
132
133
|
return [3 /*break*/, 6];
|
|
133
134
|
case 1:
|
|
134
135
|
if (!decrypt) return [3 /*break*/, 3];
|
|
135
|
-
return [4 /*yield*/,
|
|
136
|
+
return [4 /*yield*/, crypt_1.decryptData(data, dataKey)];
|
|
136
137
|
case 2:
|
|
137
138
|
_b = _c.sent();
|
|
138
139
|
return [3 /*break*/, 5];
|
|
139
|
-
case 3: return [4 /*yield*/,
|
|
140
|
+
case 3: return [4 /*yield*/, crypt_1.encryptData(data, dataKey)];
|
|
140
141
|
case 4:
|
|
141
142
|
_b = _c.sent();
|
|
142
143
|
_c.label = 5;
|
|
@@ -159,7 +160,7 @@ var createKMSDataKey = function (config, arn) { return __awaiter(void 0, void 0,
|
|
|
159
160
|
var dataKeyRes;
|
|
160
161
|
return __generator(this, function (_a) {
|
|
161
162
|
switch (_a.label) {
|
|
162
|
-
case 0: return [4 /*yield*/,
|
|
163
|
+
case 0: return [4 /*yield*/, KMS_1.processKMSGenerateDataKey(config, arn)];
|
|
163
164
|
case 1:
|
|
164
165
|
dataKeyRes = _a.sent();
|
|
165
166
|
return [2 /*return*/, dataKeyRes];
|
|
@@ -180,7 +181,7 @@ var encryptDataWithKMS = function (config, arn, plainText, context) { return __a
|
|
|
180
181
|
var cryptData;
|
|
181
182
|
return __generator(this, function (_a) {
|
|
182
183
|
switch (_a.label) {
|
|
183
|
-
case 0: return [4 /*yield*/,
|
|
184
|
+
case 0: return [4 /*yield*/, KMS_1.processKMSEncryption(config, arn, plainText, context)];
|
|
184
185
|
case 1:
|
|
185
186
|
cryptData = _a.sent();
|
|
186
187
|
return [2 /*return*/, cryptData];
|
|
@@ -200,7 +201,7 @@ var decryptDataWithKMS = function (config, cipherText, context) { return __await
|
|
|
200
201
|
var plainTextData;
|
|
201
202
|
return __generator(this, function (_a) {
|
|
202
203
|
switch (_a.label) {
|
|
203
|
-
case 0: return [4 /*yield*/,
|
|
204
|
+
case 0: return [4 /*yield*/, KMS_1.processKMSDecryption(config, cipherText, context)];
|
|
204
205
|
case 1:
|
|
205
206
|
plainTextData = _a.sent();
|
|
206
207
|
return [2 /*return*/, plainTextData];
|
|
@@ -239,7 +240,7 @@ var drapcodeEncryptDecrypt = function (data, encrypt) { return __awaiter(void 0,
|
|
|
239
240
|
accessKeyId: accessKey,
|
|
240
241
|
secretAccessKey: secretKey,
|
|
241
242
|
};
|
|
242
|
-
return [4 /*yield*/,
|
|
243
|
+
return [4 /*yield*/, KMS_1.processKMSDecryption(config, privateDataKey, {})];
|
|
243
244
|
case 1:
|
|
244
245
|
plainTextData = _a.sent();
|
|
245
246
|
if (plainTextData.status === "FAILED") {
|
|
@@ -249,13 +250,13 @@ var drapcodeEncryptDecrypt = function (data, encrypt) { return __awaiter(void 0,
|
|
|
249
250
|
response = null;
|
|
250
251
|
if (!encrypt) return [3 /*break*/, 3];
|
|
251
252
|
console.log("Encrypting");
|
|
252
|
-
return [4 /*yield*/,
|
|
253
|
+
return [4 /*yield*/, crypt_1.encryptData(data, publicKey)];
|
|
253
254
|
case 2:
|
|
254
255
|
response = _a.sent();
|
|
255
256
|
return [3 /*break*/, 5];
|
|
256
257
|
case 3:
|
|
257
258
|
console.log("Decrypting");
|
|
258
|
-
return [4 /*yield*/,
|
|
259
|
+
return [4 /*yield*/, crypt_1.decryptData(data, publicKey)];
|
|
259
260
|
case 4:
|
|
260
261
|
response = _a.sent();
|
|
261
262
|
_a.label = 5;
|
|
@@ -264,3 +265,32 @@ var drapcodeEncryptDecrypt = function (data, encrypt) { return __awaiter(void 0,
|
|
|
264
265
|
});
|
|
265
266
|
}); };
|
|
266
267
|
exports.drapcodeEncryptDecrypt = drapcodeEncryptDecrypt;
|
|
268
|
+
var cryptFile = function (filePath, encryption, decrypt) { return __awaiter(void 0, void 0, void 0, function () {
|
|
269
|
+
var awsConfig, encryptionType, dataKey, accessKeyId, secretAccessKey, region, config, plainTextData, data;
|
|
270
|
+
return __generator(this, function (_a) {
|
|
271
|
+
switch (_a.label) {
|
|
272
|
+
case 0:
|
|
273
|
+
awsConfig = encryption.awsConfig, encryptionType = encryption.encryptionType, dataKey = encryption.dataKey;
|
|
274
|
+
if (!(encryptionType === "KMS")) return [3 /*break*/, 2];
|
|
275
|
+
accessKeyId = awsConfig.accessKeyId, secretAccessKey = awsConfig.secretAccessKey, region = awsConfig.region;
|
|
276
|
+
config = {
|
|
277
|
+
region: region,
|
|
278
|
+
accessKeyId: accessKeyId,
|
|
279
|
+
secretAccessKey: secretAccessKey,
|
|
280
|
+
};
|
|
281
|
+
return [4 /*yield*/, KMS_1.processKMSDecryption(config, dataKey, {})];
|
|
282
|
+
case 1:
|
|
283
|
+
plainTextData = _a.sent();
|
|
284
|
+
if (plainTextData.status === "FAILED") {
|
|
285
|
+
return [2 /*return*/, plainTextData];
|
|
286
|
+
}
|
|
287
|
+
encryption.dataKey = plainTextData.data;
|
|
288
|
+
_a.label = 2;
|
|
289
|
+
case 2: return [4 /*yield*/, file_1.processFileEncryptionDecryption(filePath, encryption, decrypt)];
|
|
290
|
+
case 3:
|
|
291
|
+
data = _a.sent();
|
|
292
|
+
return [2 /*return*/, data];
|
|
293
|
+
}
|
|
294
|
+
});
|
|
295
|
+
}); };
|
|
296
|
+
exports.cryptFile = cryptFile;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
export type AwsConfig = {
|
|
1
|
+
export declare type AwsConfig = {
|
|
2
2
|
accessKeyId: string;
|
|
3
3
|
secretAccessKey: string;
|
|
4
4
|
region: string;
|
|
5
5
|
};
|
|
6
|
-
export type Encryption = {
|
|
6
|
+
export declare type Encryption = {
|
|
7
7
|
encryptionType: string;
|
|
8
8
|
algorithm: string;
|
|
9
9
|
dataKey: string;
|
package/build/index.d.ts
CHANGED
|
@@ -13,5 +13,6 @@ export * from "./utils/util";
|
|
|
13
13
|
export * from "./utils/uuid-generator";
|
|
14
14
|
export * from "./utils/check-error";
|
|
15
15
|
export * from "./utils/prepare-query";
|
|
16
|
+
export * from "./utils/s3-util";
|
|
16
17
|
export * from "./encryption/index";
|
|
17
18
|
export * from "./format-fields/index";
|
package/build/index.js
CHANGED
|
@@ -1,11 +1,7 @@
|
|
|
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
|
-
|
|
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);
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
9
5
|
}) : (function(o, m, k, k2) {
|
|
10
6
|
if (k2 === undefined) k2 = k;
|
|
11
7
|
o[k2] = m[k];
|
|
@@ -29,5 +25,6 @@ __exportStar(require("./utils/util"), exports);
|
|
|
29
25
|
__exportStar(require("./utils/uuid-generator"), exports);
|
|
30
26
|
__exportStar(require("./utils/check-error"), exports);
|
|
31
27
|
__exportStar(require("./utils/prepare-query"), exports);
|
|
28
|
+
__exportStar(require("./utils/s3-util"), exports);
|
|
32
29
|
__exportStar(require("./encryption/index"), exports);
|
|
33
30
|
__exportStar(require("./format-fields/index"), exports);
|
|
@@ -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 =
|
|
36
|
-
PreviouseFilePath =
|
|
35
|
+
loggerPath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerDateFormat() + "/output";
|
|
36
|
+
PreviouseFilePath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
|
|
37
37
|
}
|
|
38
38
|
else if (projectId) {
|
|
39
|
-
loggerPath =
|
|
40
|
-
PreviouseFilePath =
|
|
39
|
+
loggerPath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerDateFormat() + "/output";
|
|
40
|
+
PreviouseFilePath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
|
|
41
41
|
}
|
|
42
42
|
else {
|
|
43
|
-
loggerPath =
|
|
44
|
-
PreviouseFilePath =
|
|
43
|
+
loggerPath = loggerPath + "/" + date_util_1.createLoggerDateFormat() + "/output";
|
|
44
|
+
PreviouseFilePath = loggerPath + "/" + 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 =
|
|
31
|
-
PreviouseFilePath =
|
|
30
|
+
loggerPath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerDateFormat() + "/output";
|
|
31
|
+
PreviouseFilePath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
|
|
32
32
|
}
|
|
33
33
|
else if (projectId) {
|
|
34
|
-
loggerPath =
|
|
35
|
-
PreviouseFilePath =
|
|
34
|
+
loggerPath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerDateFormat() + "/output";
|
|
35
|
+
PreviouseFilePath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerPreviouseDateFormat() + "/";
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
38
|
-
loggerPath =
|
|
39
|
-
PreviouseFilePath =
|
|
38
|
+
loggerPath = loggerPath + "/" + date_util_1.createLoggerDateFormat() + "/output";
|
|
39
|
+
PreviouseFilePath = loggerPath + "/" + 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 =
|
|
24
|
+
loggerPath = loggerPath + "/" + projectName + "/" + date_util_1.createLoggerDateFormat();
|
|
25
25
|
}
|
|
26
26
|
else if (projectId) {
|
|
27
|
-
loggerPath =
|
|
27
|
+
loggerPath = loggerPath + "/" + projectId + "/" + date_util_1.createLoggerDateFormat();
|
|
28
28
|
}
|
|
29
29
|
else {
|
|
30
|
-
loggerPath =
|
|
30
|
+
loggerPath = loggerPath + "/" + 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 (
|
|
17
|
+
while (_) 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 =
|
|
50
|
+
req.body = 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*/,
|
|
65
|
+
return [4 /*yield*/, 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*/,
|
|
71
|
+
return [4 /*yield*/, 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 (
|
|
17
|
+
while (_) 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,14 +35,10 @@ 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
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
ar[i] = from[i];
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
38
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
39
|
+
for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
|
|
40
|
+
to[j] = from[i];
|
|
41
|
+
return to;
|
|
46
42
|
};
|
|
47
43
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
48
44
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
@@ -118,7 +114,7 @@ var handleMultErrorConfig = function (error, result, status) {
|
|
|
118
114
|
var apiErrorMessage;
|
|
119
115
|
var apiErrorValue;
|
|
120
116
|
if (result && result !== "undefined" && result !== "null") {
|
|
121
|
-
console.log("handleMultErrorConfig result :>> "
|
|
117
|
+
console.log("handleMultErrorConfig result :>> " + Object.keys(result));
|
|
122
118
|
apiErrorMessage = lodash_1.default.get(result, message);
|
|
123
119
|
if (apiErrorMessage) {
|
|
124
120
|
console.log("*** utility 3 ***");
|
|
@@ -148,7 +144,7 @@ var handleMultErrorConfig = function (error, result, status) {
|
|
|
148
144
|
apiErrorValue = status;
|
|
149
145
|
}
|
|
150
146
|
console.log("apiErrorValue", apiErrorValue);
|
|
151
|
-
apiErrorValue = ""
|
|
147
|
+
apiErrorValue = "" + apiErrorValue;
|
|
152
148
|
console.log("apiErrorMessage", apiErrorMessage);
|
|
153
149
|
console.log("apiErrorValue", apiErrorValue);
|
|
154
150
|
if (value && apiErrorValue == value) {
|
|
@@ -185,7 +181,7 @@ var nestedValue = function (data, messages) {
|
|
|
185
181
|
messages.push(value);
|
|
186
182
|
}
|
|
187
183
|
else if (Array.isArray(value)) {
|
|
188
|
-
messages = __spreadArray(__spreadArray([], messages
|
|
184
|
+
messages = __spreadArray(__spreadArray([], messages), value);
|
|
189
185
|
}
|
|
190
186
|
else {
|
|
191
187
|
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
|
|
32
|
+
return 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
|
|
36
|
+
return 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 " + 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);
|