| 104 | - | 30 | +19 | let id = '' + (msg.ent.id || msg.ent.id$ || generate_id(msg.ent)); | 133 | |
| 105 | - | 30 | +19 | let d = msg.ent.data$(); | 134 | |
| 106 | - | 30 | +19 | d.id = id; | 135 | |
| 107 | - | 30 | +19 | let entSpec = options.ent[canon]; | 137 | |
| 110 | - | 30 | +19 | let s3id = make_s3id(id, msg.ent, options, bin); | 141 | |
| 111 | - | 30 | +19 | let Body = undefined; | 142 | |
| 112 | - | 30 | +19 | if (entSpec || jsonl || bin) { | 144 | |
| 115 | - | 5 | +4 | let arr = msg.ent[jsonl]; | 147 | |
| 119 | - | 5 | +4 | let content = arr.map((n) => JSON.stringify(n)).join('\n') + '\n'; | 154 | |
| 120 | - | 5 | +4 | Body = Buffer.from(content); | 155 | |
| 124 | - | 5 | +4 | let dataRef = msg.ent[bin]; | 160 | |
| 128 | - | 5 | +4 | let data = dataRef; | 167 | |
| 133 | - | 5 | +4 | Body = Buffer.from(data); | 174 | |
| 136 | - | 30 | +19 | if (null == Body) { | 178 | |
| 137 | - | 20 | +11 | let dj = JSON.stringify(d); | 179 | |
| 138 | - | 20 | +11 | Body = Buffer.from(dj); | 180 | |
| 140 | - | 30 | +19 | let ento = msg.ent.make$().data$(d); | 183 | |
| 142 | - | 30 | +19 | if (options.local.active) { | 186 | |
| 164 | - | 15 | +4 | const s3cmd = new client_s3_1.PutObjectCommand({ | 211 | |
| 169 | - | 15 | +4 | aws_s3 | 217 | |
| .then((_res) => { | 219 | -|||||
| 172 | - | reply(null, ento); | +reply(null, ento); |
220 | ||
| 173 | @@ -1767,11 +1774,11 @@.catch((err) => { | 222 | -||||
| 175 | - | reply(err); |
+ reply(err); | 223 | ||
| 176 | @@ -1806,25 +1813,25 @@||||||
| 181 | - | 54 | +29 | let qent = msg.qent; | 230 | |
| 182 | - | 54 | +29 | let id = '' + msg.q.id; | 231 | |
| 183 | - | 54 | +29 | let entSpec = options.ent[canon]; | 232 | |
| 184 | - | 54 | +29 | let output = 'ent'; | 233 | |
| 188 | - | 54 | +29 | let s3id = make_s3id(id, msg.ent, options, bin); | 238 | |
| 189 | - | 54 | +29 | output = jsonl && '' != jsonl ? 'jsonl' : bin && '' != bin ? 'bin' : 'ent'; | 240 | |
| 191 | - | 42 | +21 | let entdata = {}; | 243 | |
| 192 | - | 42 | +21 | if (null != body) { | 245 | |
| 193 | - | 40 | +20 | if ('bin' !== output) { | 246 | |
| 194 | - | 35 | +17 | body = body.toString('utf-8'); | 247 | |
| 196 | - | 40 | +20 | if ('jsonl' === output) { | 250 | |
| 197 | - | 5 | +2 | entdata[jsonl] = body | 251 | |
| 202 | - | 35 | +18 | else if ('bin' === output) { | 255 | |
| 203 | - | 5 | +3 | entdata[bin] = body; | 256 | |
| 206 | - | 30 | +15 | entdata = JSON.parse(body); | 258 | |
| 209 | - | 42 | +21 | entdata.id = id; | 262 | |
| 210 | - | 42 | +21 | let ento = qent.make$().data$(entdata); | 264 | |
| 211 | - | 42 | +21 | reply(null, ento); | 265 | |
| 214 | - | 54 | +29 | if (options.local.active) { | 269 | |
| else { | 302 | -|||||
| 246 | - | 27 | -if (exists) { | ++ | if ( exists ) { |
303 | -
| 247 | - | 2 | -const s3cmd = new client_s3_1.HeadObjectCommand({ | ++ | const s3cmd = new client_s3_1.HeadObjectCommand({ | 304 |
| 248 | @@ -2223,11 +2230,11 @@}); | 307 | -||||
| 251 | - | 2 | -aws_s3 | ++ | aws_s3 | 309 |
| 252 | @@ -2241,11 +2248,11 @@.then(() => { | 311 | -||||
| 254 | - | replyEnt(null); | +replyEnt(null); |
312 | ||
| 255 | @@ -2263,19 +2270,19 @@257 | - | if ( 'NotFound' === err.name ) { |
+ if ('NotFound' === err.name) { |
315 | -|
| 258 | - | 1 | -return reply(); | ++ | return reply(); | 316 | -
| 259 | - | } | + } |
317 | ||
| 260 | @@ -2304,7 +2311,7 @@||||||
| 264 | - | 25 | +2 | const s3cmd = new client_s3_1.GetObjectCommand({ | 322 | |
| 268 | - | 25 | +2 | aws_s3 | 327 | |
| .then((res) => { | 329 | -|||||
| 271 | - | destream(output, res.Body) | +destream(output, res.Body) |
330 | ||
| 272 | @@ -2355,11 +2362,11 @@.then((body) => { | 331 | -||||
| 273 | - | replyEnt(body); | +replyEnt(body); |
332 | ||
| 274 | @@ -2371,7 +2378,7 @@275 | - | .catch((err) => reply(err) ); |
+ .catch((err) => reply(err)); |
334 | |
| 276 | @@ -2389,13 +2396,13 @@278 | - | if ( 'NoSuchKey' === err.Code ) { |
+ if ( 'NoSuchKey' === err.Code ) { |
337 | -|
| 279 | - | 5 | -return reply(); | ++ | return reply(); | 338 |
| 280 | @@ -2403,11 +2410,11 @@} | 339 | -||||
| 281 | - | - | reply(err); | +2 | +reply(err); | 341 |
| 282 | @@ -2472,13 +2479,13 @@||||||
| 292 | - | 6 | +4 | let id = '' + msg.q.id; | 354 | |
| 293 | - | 6 | +4 | let entSpec = options.ent[canon]; | 355 | |
| 295 | - | 6 | +4 | let s3id = make_s3id(id, msg.ent, options, bin); | 358 | |
| 297 | - | 6 | +4 | if (options.local.active) { | 361 | |
| 311 | - | 3 | +1 | const s3cmd = new client_s3_1.DeleteObjectCommand({ | 375 | |
| 315 | - | 3 | +1 | aws_s3 | 380 | |
| .then((_res) => { | 382 | -|||||
| 318 | - | reply(); | +reply(); |
383 | ||
| 319 | @@ -2647,7 +2654,7 @@321 | - | if ('NoSuchKey' === err.Code) { |
+ if ( 'NoSuchKey' === err.Code ) { |
386 | |
| 322 | @@ -2655,17 +2662,17 @@return reply(); | 387 | -||||
| 323 | - | } |
+ } | 388 | -||
| 324 | - | - | reply(err); | +1 | +reply(err); | 390 |
| 325 | @@ -3210,7 +3217,7 @@||||||
| 415 | - | 90 | +52 | return s3id; | 508 | |
| async function destream(output, stream) { | 511 | -|||||
| 418 | - | 20 | -return new Promise((resolve, reject) => { | ++ | return new Promise((resolve, reject) => { | 512 | -
| 419 | - | const chunks = []; | +const chunks = []; |
513 | -||
| 420 | - | 20 | -stream.on('data', (chunk) => chunks.push(chunk)); | ++ | stream.on('data', (chunk) => chunks.push(chunk)); | 514 | -
| 421 | - | 20 | -stream.on('error', reject); | ++ | stream.on('error', reject); | 515 | -
| 422 | - | 20 | -stream.on('end', () => { | ++ | stream.on('end', () => { | 516 | -
| 423 | - | let buffer = Buffer.concat(chunks); | +let buffer = Buffer.concat(chunks); |
517 | -||
| 424 | - | 20 | -if ('bin' === output) { | ++ | if ('bin' === output) { | 518 | -
| 425 | - | 2 | -resolve(buffer); | ++ | resolve(buffer); | 519 |
| 426 | @@ -3285,11 +3292,11 @@else { | 520 | -||||
| 428 | - | 18 | -resolve(buffer.toString('utf-8')); | ++ | resolve(buffer.toString('utf-8')); | 521 |
| 429 |