lemon-core 3.2.5 → 3.2.7
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/README.md +2 -1
- package/dist/cores/aws/aws-s3-service.d.ts +99 -4
- package/dist/cores/aws/aws-s3-service.js +126 -19
- package/dist/cores/aws/aws-s3-service.js.map +1 -1
- package/dist/cores/dynamo/dynamo-query-service.d.ts +5 -0
- package/dist/cores/dynamo/dynamo-query-service.js +44 -29
- package/dist/cores/dynamo/dynamo-query-service.js.map +1 -1
- package/dist/cores/dynamo/dynamo-scan-service.js +4 -2
- package/dist/cores/dynamo/dynamo-scan-service.js.map +1 -1
- package/dist/tools/express.js +2 -1
- package/dist/tools/express.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
[](https://travis-ci.org/lemoncloud-io/lemon-core)
|
|
2
1
|
[](https://codecov.io/gh/lemoncloud-io/lemon-core)
|
|
3
2
|
[](https://badge.fury.io/js/lemon-core)
|
|
4
3
|
[](https://badge.fury.io/gh/lemoncloud-io%2Flemon-core)
|
|
@@ -75,6 +74,8 @@ See [CODE_OF_CONDUCT](CODE_OF_CONDUCT.md)
|
|
|
75
74
|
|
|
76
75
|
| Version | Description
|
|
77
76
|
|-- |--
|
|
77
|
+
| 3.2.7 | cleanup log message in `AWSS3Service`, and optimized.
|
|
78
|
+
| 3.2.6 | improve `listObjects()` in `AWSS3Service` w/ prefix.
|
|
78
79
|
| 3.2.5 | improve `doReportError` in `lambda-web-handler`.
|
|
79
80
|
| 3.2.4 | updated with `lemon-model@1.0.2`.
|
|
80
81
|
| 3.2.3 | support `ES7.10`, and improve sync to elastic.
|
|
@@ -7,24 +7,93 @@ import { Body } from 'aws-sdk/clients/s3';
|
|
|
7
7
|
* Core Types.
|
|
8
8
|
** ****************************************************************************************************************/
|
|
9
9
|
export declare type Metadata = AWS.S3.Metadata;
|
|
10
|
+
export declare type S3Object = AWS.S3.Object;
|
|
10
11
|
export interface TagSet {
|
|
11
12
|
[key: string]: string;
|
|
12
13
|
}
|
|
14
|
+
/**
|
|
15
|
+
* type: `HeadObjectResult`
|
|
16
|
+
* - some properties of `HeadObjectOutput`
|
|
17
|
+
*/
|
|
18
|
+
export interface HeadObjectResult {
|
|
19
|
+
ContentType: string;
|
|
20
|
+
ContentLength: number;
|
|
21
|
+
Metadata: Metadata;
|
|
22
|
+
ETag: string;
|
|
23
|
+
LastModified: string;
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* type: `PutObjectResult`
|
|
27
|
+
* - only some properties from origin-result.
|
|
28
|
+
*/
|
|
13
29
|
export interface PutObjectResult {
|
|
14
30
|
Location: string;
|
|
15
|
-
ETag: string;
|
|
16
31
|
Bucket: string;
|
|
17
32
|
Key: string;
|
|
33
|
+
/**
|
|
34
|
+
* An ETag is an opaque identifier assigned by a web server to a specific version of a resource found at a URL.
|
|
35
|
+
*/
|
|
36
|
+
ETag: string;
|
|
37
|
+
/**
|
|
38
|
+
* Size of the body in bytes.
|
|
39
|
+
*/
|
|
18
40
|
ContentLength?: number;
|
|
41
|
+
/**
|
|
42
|
+
* A standard MIME type describing the format of the object data.
|
|
43
|
+
*/
|
|
19
44
|
ContentType?: string;
|
|
45
|
+
/**
|
|
46
|
+
* A map of metadata to store with the object in S3.
|
|
47
|
+
*/
|
|
20
48
|
Metadata?: Metadata;
|
|
21
49
|
}
|
|
50
|
+
/**
|
|
51
|
+
* type: `GetObjectResult`
|
|
52
|
+
* - only some properties from origin-result.
|
|
53
|
+
*/
|
|
22
54
|
export interface GetObjectResult {
|
|
23
|
-
|
|
55
|
+
/**
|
|
56
|
+
* Size of the body in bytes.
|
|
57
|
+
*/
|
|
24
58
|
ContentLength?: number;
|
|
59
|
+
/**
|
|
60
|
+
* A standard MIME type describing the format of the object data.
|
|
61
|
+
*/
|
|
25
62
|
ContentType?: string;
|
|
63
|
+
/**
|
|
64
|
+
* A map of metadata to store with the object in S3.
|
|
65
|
+
*/
|
|
26
66
|
Metadata?: Metadata;
|
|
67
|
+
/**
|
|
68
|
+
* Object data.
|
|
69
|
+
*/
|
|
27
70
|
Body?: Body;
|
|
71
|
+
/**
|
|
72
|
+
* An ETag is an opaque identifier assigned by a web server to a specific version of a resource found at a URL.
|
|
73
|
+
*/
|
|
74
|
+
ETag: string;
|
|
75
|
+
/**
|
|
76
|
+
* The number of tags, if any, on the object.
|
|
77
|
+
*/
|
|
78
|
+
TagCount?: number;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* type: `ListObjectResult`
|
|
82
|
+
* - only some properties from origin-result.
|
|
83
|
+
*/
|
|
84
|
+
export interface ListObjectResult {
|
|
85
|
+
/** list of object infor */
|
|
86
|
+
Contents: S3Object[];
|
|
87
|
+
/** limit of each request */
|
|
88
|
+
MaxKeys: number;
|
|
89
|
+
/** total key-count read */
|
|
90
|
+
KeyCount: number;
|
|
91
|
+
/** flag to have more */
|
|
92
|
+
IsTruncated?: boolean;
|
|
93
|
+
/** valid only if truncated, and has more */
|
|
94
|
+
NextContinuationToken?: string;
|
|
95
|
+
/** internal error-string */
|
|
96
|
+
error?: string;
|
|
28
97
|
}
|
|
29
98
|
export interface CoreS3Service extends CoreServices {
|
|
30
99
|
bucket: (target?: string) => string;
|
|
@@ -34,11 +103,17 @@ export interface CoreS3Service extends CoreServices {
|
|
|
34
103
|
getObjectTagging: (key: string) => Promise<TagSet>;
|
|
35
104
|
deleteObject: (key: string) => Promise<void>;
|
|
36
105
|
}
|
|
106
|
+
/**
|
|
107
|
+
* main service implement.
|
|
108
|
+
*/
|
|
37
109
|
export declare class AWSS3Service implements CoreS3Service {
|
|
38
110
|
/**
|
|
39
|
-
* environ name
|
|
111
|
+
* environ name to use `bucket`
|
|
40
112
|
*/
|
|
41
113
|
static ENV_S3_NAME: string;
|
|
114
|
+
/**
|
|
115
|
+
* default `bucket` name
|
|
116
|
+
*/
|
|
42
117
|
static DEF_S3_BUCKET: string;
|
|
43
118
|
/**
|
|
44
119
|
* get name of this
|
|
@@ -54,10 +129,11 @@ export declare class AWSS3Service implements CoreS3Service {
|
|
|
54
129
|
bucket: (target?: string) => string;
|
|
55
130
|
/**
|
|
56
131
|
* retrieve metadata without returning the object
|
|
132
|
+
*
|
|
57
133
|
* @param {string} key
|
|
58
134
|
* @return metadata object / null if not exists
|
|
59
135
|
*/
|
|
60
|
-
headObject: (key: string) => Promise<
|
|
136
|
+
headObject: (key: string) => Promise<HeadObjectResult>;
|
|
61
137
|
/**
|
|
62
138
|
* upload a file to S3 Bucket
|
|
63
139
|
*
|
|
@@ -92,12 +168,31 @@ export declare class AWSS3Service implements CoreS3Service {
|
|
|
92
168
|
getDecodedObject: <T = object>(key: string) => Promise<T>;
|
|
93
169
|
/**
|
|
94
170
|
* get tag-set of object
|
|
171
|
+
*
|
|
95
172
|
* @param {string} key
|
|
96
173
|
*/
|
|
97
174
|
getObjectTagging: (key: string) => Promise<TagSet>;
|
|
98
175
|
/**
|
|
99
176
|
* delete object from bucket
|
|
177
|
+
*
|
|
100
178
|
* @param {string} key
|
|
101
179
|
*/
|
|
102
180
|
deleteObject: (key: string) => Promise<void>;
|
|
181
|
+
/**
|
|
182
|
+
* list objects in bucket
|
|
183
|
+
*/
|
|
184
|
+
listObjects: (options?: {
|
|
185
|
+
/** keys that begin with the specified prefix. */
|
|
186
|
+
prefix?: string;
|
|
187
|
+
/** use to group keys */
|
|
188
|
+
delimiter?: string;
|
|
189
|
+
/** maximum number of keys returned in single request (default 10, max 1000) */
|
|
190
|
+
limit?: number;
|
|
191
|
+
/** flag to read all keys (each request contains `limit`) */
|
|
192
|
+
unlimited?: boolean;
|
|
193
|
+
/** same as NextContinuationToken */
|
|
194
|
+
nextToken?: string;
|
|
195
|
+
/** (optional) flag to throw error if error, or see `.error` in result */
|
|
196
|
+
throwable?: boolean;
|
|
197
|
+
}) => Promise<ListObjectResult>;
|
|
103
198
|
}
|
|
@@ -21,6 +21,7 @@ exports.AWSS3Service = void 0;
|
|
|
21
21
|
* @author Steve Jung <steve@lemoncloud.io>
|
|
22
22
|
* @date 2019-07-19 initial version
|
|
23
23
|
* @date 2019-11-26 cleanup and optimized for `lemon-core#v2`
|
|
24
|
+
* @date 2023-02-08 support of `listObject()`
|
|
24
25
|
*
|
|
25
26
|
* @copyright (C) lemoncloud.io 2019 - All Rights Reserved.
|
|
26
27
|
*/
|
|
@@ -34,6 +35,7 @@ const path_1 = __importDefault(require("path"));
|
|
|
34
35
|
const aws_sdk_1 = __importDefault(require("aws-sdk"));
|
|
35
36
|
const mime_types_1 = __importDefault(require("mime-types"));
|
|
36
37
|
const uuid_1 = require("uuid");
|
|
38
|
+
const test_helper_1 = require("../../common/test-helper");
|
|
37
39
|
/** ****************************************************************************************************************
|
|
38
40
|
* Public Instance Exported.
|
|
39
41
|
** ****************************************************************************************************************/
|
|
@@ -56,7 +58,9 @@ const instance = () => {
|
|
|
56
58
|
const config = { region: _region };
|
|
57
59
|
return new aws_sdk_1.default.S3(config); // SQS Instance. shared one???
|
|
58
60
|
};
|
|
59
|
-
|
|
61
|
+
/**
|
|
62
|
+
* main service implement.
|
|
63
|
+
*/
|
|
60
64
|
class AWSS3Service {
|
|
61
65
|
constructor() {
|
|
62
66
|
/**
|
|
@@ -73,20 +77,38 @@ class AWSS3Service {
|
|
|
73
77
|
this.bucket = (target) => environ(target, AWSS3Service.ENV_S3_NAME, AWSS3Service.DEF_S3_BUCKET);
|
|
74
78
|
/**
|
|
75
79
|
* retrieve metadata without returning the object
|
|
80
|
+
*
|
|
76
81
|
* @param {string} key
|
|
77
82
|
* @return metadata object / null if not exists
|
|
78
83
|
*/
|
|
79
84
|
this.headObject = (key) => __awaiter(this, void 0, void 0, function* () {
|
|
80
85
|
if (!key)
|
|
81
|
-
throw new Error(
|
|
86
|
+
throw new Error(`@key (string) is required - headObject(${key !== null && key !== void 0 ? key : ''})`);
|
|
82
87
|
const Bucket = this.bucket();
|
|
83
88
|
const params = { Bucket, Key: key };
|
|
84
|
-
|
|
89
|
+
// call s3.headObject.
|
|
85
90
|
const s3 = instance();
|
|
86
91
|
try {
|
|
87
92
|
const data = yield s3.headObject(params).promise();
|
|
88
|
-
(0, engine_1._log)(NS, '> data =', engine_1.$U.json(data));
|
|
89
|
-
|
|
93
|
+
(0, engine_1._log)(NS, '> data =', engine_1.$U.json(Object.assign(Object.assign({}, data), { Contents: undefined })));
|
|
94
|
+
// const sample = {
|
|
95
|
+
// AcceptRanges: 'bytes',
|
|
96
|
+
// ContentLength: 47,
|
|
97
|
+
// ContentType: 'application/json; charset=utf-8',
|
|
98
|
+
// ETag: '"51f209a54902230ac3395826d7fa1851"',
|
|
99
|
+
// Expiration: 'expiry-date="Mon, 10 Apr 2023 00:00:00 GMT", rule-id="delete-old-json"',
|
|
100
|
+
// LastModified: '2023-02-08T14:53:12.000Z',
|
|
101
|
+
// Metadata: { contenttype: 'application/json; charset=utf8', md5: '51f209a54902230ac3395826d7fa1851' },
|
|
102
|
+
// ServerSideEncryption: 'AES256',
|
|
103
|
+
// };
|
|
104
|
+
const result = {
|
|
105
|
+
ContentType: data.ContentType,
|
|
106
|
+
ContentLength: data.ContentLength,
|
|
107
|
+
Metadata: data.Metadata,
|
|
108
|
+
ETag: data.ETag,
|
|
109
|
+
LastModified: engine_1.$U.ts(data.LastModified),
|
|
110
|
+
};
|
|
111
|
+
return result;
|
|
90
112
|
}
|
|
91
113
|
catch (e) {
|
|
92
114
|
if (e.statusCode == 404)
|
|
@@ -116,7 +138,7 @@ class AWSS3Service {
|
|
|
116
138
|
*/
|
|
117
139
|
this.putObject = (content, key, metadata, tags) => __awaiter(this, void 0, void 0, function* () {
|
|
118
140
|
if (!content)
|
|
119
|
-
throw new Error(
|
|
141
|
+
throw new Error(`@content (buffer) is required - putObject()`);
|
|
120
142
|
const paramBuilder = new S3PutObjectRequestBuilder(this.bucket(), content);
|
|
121
143
|
key && paramBuilder.setKey(key);
|
|
122
144
|
metadata && paramBuilder.setMetadata(metadata);
|
|
@@ -132,7 +154,16 @@ class AWSS3Service {
|
|
|
132
154
|
const data = yield s3.upload(params).promise();
|
|
133
155
|
delete data.key; // NOTE: remove undeclared property 'key' returned from aws-sdk
|
|
134
156
|
(0, engine_1._log)(NS, `> data[${data.Bucket}].Location =`, engine_1.$U.json(data.Location));
|
|
135
|
-
|
|
157
|
+
const result = {
|
|
158
|
+
Bucket: data.Bucket,
|
|
159
|
+
Location: data.Location,
|
|
160
|
+
Key: data.Key,
|
|
161
|
+
ETag: data.ETag,
|
|
162
|
+
ContentType: params.ContentType,
|
|
163
|
+
ContentLength: params.ContentLength,
|
|
164
|
+
Metadata: params.Metadata,
|
|
165
|
+
};
|
|
166
|
+
return result;
|
|
136
167
|
}
|
|
137
168
|
catch (e) {
|
|
138
169
|
(0, engine_1._err)(NS, `! err[${params.Bucket}] =`, e);
|
|
@@ -146,16 +177,19 @@ class AWSS3Service {
|
|
|
146
177
|
*/
|
|
147
178
|
this.getObject = (key) => __awaiter(this, void 0, void 0, function* () {
|
|
148
179
|
if (!key)
|
|
149
|
-
throw new Error(
|
|
180
|
+
throw new Error(`@key (string) is required - getObject(${key !== null && key !== void 0 ? key : ''})`);
|
|
150
181
|
const Bucket = this.bucket();
|
|
151
182
|
const params = { Bucket, Key: key };
|
|
152
|
-
|
|
183
|
+
//* call s3.getObject.
|
|
153
184
|
const s3 = instance();
|
|
154
185
|
try {
|
|
155
186
|
const data = yield s3.getObject(params).promise();
|
|
156
187
|
(0, engine_1._log)(NS, '> data.type =', typeof data);
|
|
157
|
-
const { ContentType, ContentLength, Body, ETag, Metadata } = data;
|
|
158
|
-
|
|
188
|
+
const { ContentType, ContentLength, Body, ETag, Metadata, TagCount } = data;
|
|
189
|
+
const result = { ContentType, ContentLength, Body, ETag, Metadata };
|
|
190
|
+
if (TagCount)
|
|
191
|
+
result.TagCount = TagCount;
|
|
192
|
+
return result;
|
|
159
193
|
}
|
|
160
194
|
catch (e) {
|
|
161
195
|
(0, engine_1._err)(NS, '! err=', e);
|
|
@@ -169,10 +203,10 @@ class AWSS3Service {
|
|
|
169
203
|
*/
|
|
170
204
|
this.getDecodedObject = (key) => __awaiter(this, void 0, void 0, function* () {
|
|
171
205
|
if (!key)
|
|
172
|
-
throw new Error(
|
|
206
|
+
throw new Error(`@key (string) is required - getDecodedObject(${key !== null && key !== void 0 ? key : ''})`);
|
|
173
207
|
const Bucket = this.bucket();
|
|
174
208
|
const params = { Bucket, Key: key };
|
|
175
|
-
|
|
209
|
+
//* call s3.getObject.
|
|
176
210
|
const s3 = instance();
|
|
177
211
|
try {
|
|
178
212
|
const data = yield s3.getObject(params).promise();
|
|
@@ -187,17 +221,21 @@ class AWSS3Service {
|
|
|
187
221
|
});
|
|
188
222
|
/**
|
|
189
223
|
* get tag-set of object
|
|
224
|
+
*
|
|
190
225
|
* @param {string} key
|
|
191
226
|
*/
|
|
192
227
|
this.getObjectTagging = (key) => __awaiter(this, void 0, void 0, function* () {
|
|
228
|
+
var _a;
|
|
229
|
+
if (!key)
|
|
230
|
+
throw new Error(`@key (string) is required - getObjectTagging(${key !== null && key !== void 0 ? key : ''})`);
|
|
193
231
|
const Bucket = this.bucket();
|
|
194
232
|
const params = { Bucket, Key: key };
|
|
195
|
-
|
|
233
|
+
//* call s3.getObjectTagging.
|
|
196
234
|
const s3 = instance();
|
|
197
235
|
try {
|
|
198
236
|
const data = yield s3.getObjectTagging(params).promise();
|
|
199
|
-
(0, engine_1._log)(NS, `> data =`, data);
|
|
200
|
-
return data.TagSet.reduce((tagSet, tag) => {
|
|
237
|
+
(0, engine_1._log)(NS, `> data =`, engine_1.$U.json(data));
|
|
238
|
+
return (_a = data === null || data === void 0 ? void 0 : data.TagSet) === null || _a === void 0 ? void 0 : _a.reduce((tagSet, tag) => {
|
|
201
239
|
const { Key, Value } = tag;
|
|
202
240
|
tagSet[Key] = Value;
|
|
203
241
|
return tagSet;
|
|
@@ -210,14 +248,15 @@ class AWSS3Service {
|
|
|
210
248
|
});
|
|
211
249
|
/**
|
|
212
250
|
* delete object from bucket
|
|
251
|
+
*
|
|
213
252
|
* @param {string} key
|
|
214
253
|
*/
|
|
215
254
|
this.deleteObject = (key) => __awaiter(this, void 0, void 0, function* () {
|
|
216
255
|
if (!key)
|
|
217
|
-
throw new Error(
|
|
256
|
+
throw new Error(`@key (string) is required - deleteObject(${key !== null && key !== void 0 ? key : ''})`);
|
|
218
257
|
const Bucket = this.bucket();
|
|
219
258
|
const params = { Bucket, Key: key };
|
|
220
|
-
|
|
259
|
+
//* call s3.deleteObject.
|
|
221
260
|
const s3 = instance();
|
|
222
261
|
try {
|
|
223
262
|
const data = yield s3.deleteObject(params).promise();
|
|
@@ -228,13 +267,81 @@ class AWSS3Service {
|
|
|
228
267
|
throw e;
|
|
229
268
|
}
|
|
230
269
|
});
|
|
270
|
+
/**
|
|
271
|
+
* list objects in bucket
|
|
272
|
+
*/
|
|
273
|
+
this.listObjects = (options) => __awaiter(this, void 0, void 0, function* () {
|
|
274
|
+
var _b, _c, _d, _e, _f, _g;
|
|
275
|
+
// if (!key) throw new Error('@key is required!');
|
|
276
|
+
const Prefix = (_b = options === null || options === void 0 ? void 0 : options.prefix) !== null && _b !== void 0 ? _b : '';
|
|
277
|
+
const Delimiter = (_c = options === null || options === void 0 ? void 0 : options.delimiter) !== null && _c !== void 0 ? _c : '/';
|
|
278
|
+
const MaxKeys = Math.min((_d = options === null || options === void 0 ? void 0 : options.limit) !== null && _d !== void 0 ? _d : 10, 1000);
|
|
279
|
+
const unlimited = (_e = options === null || options === void 0 ? void 0 : options.unlimited) !== null && _e !== void 0 ? _e : false;
|
|
280
|
+
const nextToken = options === null || options === void 0 ? void 0 : options.nextToken;
|
|
281
|
+
const throwable = (_f = options === null || options === void 0 ? void 0 : options.throwable) !== null && _f !== void 0 ? _f : true;
|
|
282
|
+
//* build the req-params.
|
|
283
|
+
const Bucket = this.bucket();
|
|
284
|
+
const params = {
|
|
285
|
+
Bucket,
|
|
286
|
+
Prefix,
|
|
287
|
+
Delimiter,
|
|
288
|
+
MaxKeys,
|
|
289
|
+
};
|
|
290
|
+
if (nextToken)
|
|
291
|
+
params.ContinuationToken = nextToken;
|
|
292
|
+
//* call s3.listObjectsV2.
|
|
293
|
+
const s3 = instance();
|
|
294
|
+
const result = {
|
|
295
|
+
Contents: null,
|
|
296
|
+
MaxKeys,
|
|
297
|
+
KeyCount: 0,
|
|
298
|
+
};
|
|
299
|
+
try {
|
|
300
|
+
const data = yield s3.listObjectsV2(params).promise();
|
|
301
|
+
//INFO! - minimize log output....
|
|
302
|
+
(0, engine_1._log)(NS, '> data =', engine_1.$U.json(Object.assign(Object.assign({}, data), { Contents: undefined })));
|
|
303
|
+
(0, engine_1._log)(NS, '> data[0] =', engine_1.$U.json((_g = data === null || data === void 0 ? void 0 : data.Contents) === null || _g === void 0 ? void 0 : _g[0]));
|
|
304
|
+
if (data) {
|
|
305
|
+
result.Contents = data.Contents;
|
|
306
|
+
result.MaxKeys = data.MaxKeys;
|
|
307
|
+
result.KeyCount = data.KeyCount;
|
|
308
|
+
result.IsTruncated = data.IsTruncated;
|
|
309
|
+
result.NextContinuationToken = data.NextContinuationToken;
|
|
310
|
+
}
|
|
311
|
+
//* list all keys.
|
|
312
|
+
if (unlimited) {
|
|
313
|
+
while (result.IsTruncated) {
|
|
314
|
+
//* fetch next list.
|
|
315
|
+
const res2 = yield s3
|
|
316
|
+
.listObjectsV2(Object.assign(Object.assign({}, params), { ContinuationToken: result.NextContinuationToken }))
|
|
317
|
+
.promise();
|
|
318
|
+
//* update contents.
|
|
319
|
+
result.Contents = result.Contents.concat(0 ? res2.Contents.slice(1) : res2.Contents);
|
|
320
|
+
result.IsTruncated = res2.IsTruncated;
|
|
321
|
+
result.KeyCount += engine_1.$U.N(res2.KeyCount, 0);
|
|
322
|
+
result.NextContinuationToken = res2.NextContinuationToken;
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
}
|
|
326
|
+
catch (e) {
|
|
327
|
+
(0, engine_1._err)(NS, '! err=', e);
|
|
328
|
+
if (throwable)
|
|
329
|
+
throw e;
|
|
330
|
+
result.error = (0, test_helper_1.GETERR)(e);
|
|
331
|
+
}
|
|
332
|
+
// returns.
|
|
333
|
+
return result;
|
|
334
|
+
});
|
|
231
335
|
}
|
|
232
336
|
}
|
|
233
337
|
exports.AWSS3Service = AWSS3Service;
|
|
234
338
|
/**
|
|
235
|
-
* environ name
|
|
339
|
+
* environ name to use `bucket`
|
|
236
340
|
*/
|
|
237
341
|
AWSS3Service.ENV_S3_NAME = 'MY_S3_BUCKET';
|
|
342
|
+
/**
|
|
343
|
+
* default `bucket` name
|
|
344
|
+
*/
|
|
238
345
|
AWSS3Service.DEF_S3_BUCKET = 'lemon-hello-www';
|
|
239
346
|
/**
|
|
240
347
|
* class `S3PutObjectRequestBuilder`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aws-s3-service.js","sourceRoot":"","sources":["../../../src/cores/aws/aws-s3-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"aws-s3-service.js","sourceRoot":"","sources":["../../../src/cores/aws/aws-s3-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,4 +49,9 @@ export declare class DynamoQueryService<T extends GeneralItem> implements Dynamo
|
|
|
49
49
|
* NOTE - `dynamodb`의 일부 코드를 이용하여, 간단버전으로 지원함.
|
|
50
50
|
*/
|
|
51
51
|
queryRangeBy(pkey: string, from: number, to: number, limit?: number, last?: number, isDesc?: boolean): Promise<DynamoQueryResult<T>>;
|
|
52
|
+
/**
|
|
53
|
+
* query by range of sort-key.
|
|
54
|
+
* NOTE - `dynamodb`의 일부 코드를 이용하여, 간단버전으로 지원함.
|
|
55
|
+
*/
|
|
56
|
+
buildQuery(pkey: string, from: number, to: number, limit?: number, last?: number, isDesc?: boolean): any;
|
|
52
57
|
}
|
|
@@ -67,35 +67,8 @@ class DynamoQueryService {
|
|
|
67
67
|
queryRangeBy(pkey, from, to, limit, last, isDesc) {
|
|
68
68
|
return __awaiter(this, void 0, void 0, function* () {
|
|
69
69
|
(0, engine_1._log)(NS, `queryRangeBy(${pkey}, ${from}, ${to})...`);
|
|
70
|
-
|
|
71
|
-
const
|
|
72
|
-
const query = new query_1.default(pkey, { schema: { hashKey: idName, rangeKey: sortName }, tableName: () => tableName }, serializer_1.default);
|
|
73
|
-
// _log(NS, '> query =', query);
|
|
74
|
-
//! build query with builder.
|
|
75
|
-
if (sortName) {
|
|
76
|
-
const keyCondition = query.where(sortName);
|
|
77
|
-
from !== -1 && to !== -1 ? keyCondition.between(from, to) : keyCondition.gte(0);
|
|
78
|
-
}
|
|
79
|
-
isDesc ? query.descending() : query.ascending();
|
|
80
|
-
if (limit !== undefined)
|
|
81
|
-
query.limit(limit);
|
|
82
|
-
query.addKeyCondition(query.buildKey());
|
|
83
|
-
if (last) {
|
|
84
|
-
query.startKey(pkey, last);
|
|
85
|
-
}
|
|
86
|
-
//TODO - replace '@' prefix of properties.
|
|
87
|
-
const payload = query.buildRequest();
|
|
88
|
-
const filter = (N) => Object.keys(N).reduce((O, key) => {
|
|
89
|
-
const val = N[key];
|
|
90
|
-
key = key.startsWith('#@') ? '#_' + key.substring(2) : key;
|
|
91
|
-
key = key.startsWith(':@') ? ':_' + key.substring(2) : key;
|
|
92
|
-
O[key] = val;
|
|
93
|
-
return O;
|
|
94
|
-
}, {});
|
|
95
|
-
payload.ExpressionAttributeNames = filter(payload.ExpressionAttributeNames);
|
|
96
|
-
payload.ExpressionAttributeValues = filter(payload.ExpressionAttributeValues);
|
|
97
|
-
payload.KeyConditionExpression = payload.KeyConditionExpression.replace(/([\#\:])@/g, '$1_');
|
|
98
|
-
(0, engine_1._log)(NS, `> payload[${pkey}] =`, engine_1.$U.json(payload));
|
|
70
|
+
const { sortName } = this.options;
|
|
71
|
+
const payload = this.buildQuery(pkey, from, to, limit, last, isDesc);
|
|
99
72
|
//! get instance of dynamodoc, and execute query().
|
|
100
73
|
const { dynamodoc } = dynamo_service_1.DynamoService.instance();
|
|
101
74
|
const res = yield dynamodoc.query(payload).promise();
|
|
@@ -122,6 +95,48 @@ class DynamoQueryService {
|
|
|
122
95
|
return { list: [] };
|
|
123
96
|
});
|
|
124
97
|
}
|
|
98
|
+
/**
|
|
99
|
+
* query by range of sort-key.
|
|
100
|
+
* NOTE - `dynamodb`의 일부 코드를 이용하여, 간단버전으로 지원함.
|
|
101
|
+
*/
|
|
102
|
+
buildQuery(pkey, from, to, limit, last, isDesc) {
|
|
103
|
+
(0, engine_1._log)(NS, `buildQuery(${pkey}, ${from}, ${to})...`);
|
|
104
|
+
//! load table information..
|
|
105
|
+
const { tableName, idName, sortName, idType, sortType } = this.options;
|
|
106
|
+
const query = new query_1.default(pkey, {
|
|
107
|
+
schema: {
|
|
108
|
+
hashKey: idName,
|
|
109
|
+
rangeKey: sortName,
|
|
110
|
+
},
|
|
111
|
+
tableName: () => tableName,
|
|
112
|
+
}, serializer_1.default);
|
|
113
|
+
// _log(NS, '> query =', query);
|
|
114
|
+
//* build query with builder.
|
|
115
|
+
if (sortName) {
|
|
116
|
+
const keyCondition = query.where(sortName);
|
|
117
|
+
from !== -1 && to !== -1 ? keyCondition.between(from, to) : keyCondition.gte(0);
|
|
118
|
+
}
|
|
119
|
+
isDesc ? query.descending() : query.ascending();
|
|
120
|
+
if (limit !== undefined)
|
|
121
|
+
query.limit(limit);
|
|
122
|
+
query.addKeyCondition(query.buildKey());
|
|
123
|
+
if (last)
|
|
124
|
+
query.startKey(pkey, last);
|
|
125
|
+
//TODO - replace '@' prefix of properties.
|
|
126
|
+
const payload = query.buildRequest();
|
|
127
|
+
const filter = (N) => Object.keys(N).reduce((O, key) => {
|
|
128
|
+
const val = N[key];
|
|
129
|
+
key = key.startsWith('#@') ? '#_' + key.substring(2) : key;
|
|
130
|
+
key = key.startsWith(':@') ? ':_' + key.substring(2) : key;
|
|
131
|
+
O[key] = val;
|
|
132
|
+
return O;
|
|
133
|
+
}, {});
|
|
134
|
+
payload.ExpressionAttributeNames = filter(payload.ExpressionAttributeNames);
|
|
135
|
+
payload.ExpressionAttributeValues = filter(payload.ExpressionAttributeValues);
|
|
136
|
+
payload.KeyConditionExpression = payload.KeyConditionExpression.replace(/([\#\:])@/g, '$1_');
|
|
137
|
+
(0, engine_1._log)(NS, `> payload[${pkey}] =`, engine_1.$U.json(payload));
|
|
138
|
+
return payload;
|
|
139
|
+
}
|
|
125
140
|
}
|
|
126
141
|
exports.DynamoQueryService = DynamoQueryService;
|
|
127
142
|
//# sourceMappingURL=dynamo-query-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamo-query-service.js","sourceRoot":"","sources":["../../../src/cores/dynamo/dynamo-query-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;GASG;AACH,6DAA6D;AAC7D,0CAAqD;AAErD,qDAA+D;AAC/D,MAAM,EAAE,GAAG,WAAE,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,2BAA2B;AAuC9D;;qHAEqH;AACrH,mEAA2C;AAC3C,6EAAqD;AAErD;;;GAGG;AACH,MAAa,kBAAkB;IAE3B,YAAmB,OAAqB;QAQxC;;WAEG;QACI,UAAK,GAAG,GAAG,EAAE,CAAC,wBAAwB,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QAVlE,6CAA6C;QAC7C,IAAA,aAAI,EAAC,EAAE,EAAE,sBAAsB,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,MAAM,CAAC,CAAC;QACjI,IAAI,CAAC,OAAO,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAClE,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC5D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAOY,QAAQ,CAAC,IAAY,EAAE,KAAc,EAAE,MAAgB;;YAChE,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAChE,CAAC;KAAA;IAEY,UAAU,CACnB,IAAY,EACZ,IAAY,EACZ,EAAU,EACV,KAAc,EACd,IAAa;;YAEb,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACjE,CAAC;KAAA;IAED;;;OAGG;IACU,YAAY,CACrB,IAAY,EACZ,IAAY,EACZ,EAAU,EACV,KAAc,EACd,IAAa,EACb,MAAgB;;YAEhB,IAAA,aAAI,EAAC,EAAE,EAAE,gBAAgB,IAAI,KAAK,IAAI,KAAK,EAAE,MAAM,CAAC,CAAC;YAErD,
|
|
1
|
+
{"version":3,"file":"dynamo-query-service.js","sourceRoot":"","sources":["../../../src/cores/dynamo/dynamo-query-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,6 +62,7 @@ class DynamoScanService {
|
|
|
62
62
|
this.options = options;
|
|
63
63
|
}
|
|
64
64
|
scan(limit, last, filter) {
|
|
65
|
+
var _a;
|
|
65
66
|
return __awaiter(this, void 0, void 0, function* () {
|
|
66
67
|
(0, engine_1._log)(NS, `scan()...`);
|
|
67
68
|
//! build scan input payload
|
|
@@ -70,13 +71,14 @@ class DynamoScanService {
|
|
|
70
71
|
//! get instance of dynamodoc, and execute query().
|
|
71
72
|
const { dynamodoc } = dynamo_service_1.DynamoService.instance();
|
|
72
73
|
const res = yield dynamodoc.scan(payload).promise();
|
|
73
|
-
(0, engine_1._log)(NS, `> scan.res =`, engine_1.$U.json(res));
|
|
74
|
+
(0, engine_1._log)(NS, `> scan.res =`, engine_1.$U.json(Object.assign(Object.assign({}, res), { Items: undefined })));
|
|
75
|
+
(res === null || res === void 0 ? void 0 : res.Items) && (0, engine_1._log)(NS, `> scan[0] =`, engine_1.$U.json((_a = res === null || res === void 0 ? void 0 : res.Items) === null || _a === void 0 ? void 0 : _a[0]));
|
|
74
76
|
const items = res.Items || [];
|
|
75
77
|
const count = res.Count;
|
|
76
78
|
const scannedCount = res.ScannedCount;
|
|
77
79
|
const $lek = res.LastEvaluatedKey || {};
|
|
78
|
-
(0, engine_1._log)(NS, `> scan.items.len =`, items.length);
|
|
79
80
|
(0, engine_1._log)(NS, `> scan.count =`, count);
|
|
81
|
+
(0, engine_1._log)(NS, `> scan.items.len =`, items.length);
|
|
80
82
|
(0, engine_1._log)(NS, `> scan.scannedCount =`, scannedCount);
|
|
81
83
|
(0, engine_1._log)(NS, `> scan.last =`, $lek);
|
|
82
84
|
//! return result-set
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamo-scan-service.js","sourceRoot":"","sources":["../../../src/cores/dynamo/dynamo-scan-service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;;;;;;;;GASG;AACH,0CAA+C;AAE/C,qDAA+D;AAC/D,MAAM,EAAE,GAAG,WAAE,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,2BAA2B;AAS9D,SAAS,qBAAqB,CAAC,CAAY;IACvC,OAAO,YAAY,IAAI,CAAC,CAAC;AAC7B,CAAC;AAQD,SAAS,kBAAkB,CAAC,CAAY;IACpC,OAAO,MAAM,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;AACpC,CAAC;AAOD,SAAS,oBAAoB,CAAC,CAAY;IACtC,OAAO,QAAQ,IAAI,CAAC,CAAC;AACzB,CAAC;AAQD,SAAS,iBAAiB,CAAC,CAAY;IACnC,OAAO,UAAU,IAAI,CAAC,CAAC;AAC3B,CAAC;AAsCD;;qHAEqH;AACrH,iEAAyC;AACzC,6EAAqD;AAErD;;;GAGG;AACH,MAAa,iBAAiB;IAG1B,YAAmB,OAAqB;QAQxC;;WAEG;QACI,UAAK,GAAG,GAAG,EAAE,CAAC,uBAAuB,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QAVjE,6CAA6C;QAC7C,IAAA,aAAI,EAAC,EAAE,EAAE,qBAAqB,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,MAAM,CAAC,CAAC;QAChI,IAAI,CAAC,OAAO,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAClE,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC5D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAOY,IAAI,CAAC,KAAc,EAAE,IAAU,EAAE,MAAyB
|
|
1
|
+
{"version":3,"file":"dynamo-scan-service.js","sourceRoot":"","sources":["../../../src/cores/dynamo/dynamo-scan-service.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/express.js
CHANGED
|
@@ -255,7 +255,8 @@ const buildExpress = ($engine, $web, options) => {
|
|
|
255
255
|
};
|
|
256
256
|
//! register automatically endpont.
|
|
257
257
|
const RESERVES = 'id,log,inf,err,extend,ts,dt,environ'.split(',');
|
|
258
|
-
|
|
258
|
+
// support single char path.
|
|
259
|
+
const isValidName = (name) => /^[a-z][a-z0-9\-_]*$/.test(name) && RESERVES.indexOf(name) < 0;
|
|
259
260
|
const $map = $web.getHandlerDecoders();
|
|
260
261
|
const keys = Object.keys($map);
|
|
261
262
|
// _inf(NS, '! express.keys =', keys);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express.js","sourceRoot":"","sources":["../../src/tools/express.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"express.js","sourceRoot":"","sources":["../../src/tools/express.ts"],"names":[],"mappings":"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"}
|