@pwrdrvr/microapps-publish 0.3.5 → 0.4.0-alpha.2
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/dist/commands/publish-static.d.ts.map +1 -1
- package/dist/commands/publish-static.js +60 -26
- package/dist/commands/publish-static.js.map +1 -1
- package/dist/commands/publish.d.ts.map +1 -1
- package/dist/commands/publish.js +60 -26
- package/dist/commands/publish.js.map +1 -1
- package/dist/config/Application.js.map +1 -1
- package/dist/config/Config.js.map +1 -1
- package/dist/config/Deployer.js.map +1 -1
- package/dist/lib/DeployClient.d.ts +1 -1
- package/dist/lib/DeployClient.d.ts.map +1 -1
- package/dist/lib/S3TransferUtility.d.ts +2 -2
- package/dist/lib/S3TransferUtility.d.ts.map +1 -1
- package/dist/lib/S3TransferUtility.js +27 -8
- package/dist/lib/S3TransferUtility.js.map +1 -1
- package/dist/lib/S3Uploader.d.ts +1 -1
- package/dist/lib/S3Uploader.d.ts.map +1 -1
- package/dist/lib/S3Uploader.js +4 -3
- package/dist/lib/S3Uploader.js.map +1 -1
- package/package.json +3 -3
- package/src/commands/publish-static.ts +82 -40
- package/src/commands/publish.ts +82 -39
- package/src/lib/S3TransferUtility.spec.ts +15 -0
- package/src/lib/S3TransferUtility.ts +30 -12
- package/src/lib/S3Uploader.ts +2 -2
- package/src/lib/__snapshots__/S3TransferUtility.spec.ts.snap +12 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish-static.d.ts","sourceRoot":"","sources":["../../src/commands/publish-static.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAG1B,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"publish-static.d.ts","sourceRoot":"","sources":["../../src/commands/publish-static.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAG1B,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAmB/D,qBAAa,cAAe,SAAQ,OAAO;IACzC,MAAM,CAAC,WAAW,SAA+E;IAEjG,MAAM,CAAC,QAAQ,WAUb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;MAiDV;IAEF,OAAO,CAAC,eAAe,CAAY;IAE7B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAoR3B"}
|
|
@@ -6,14 +6,16 @@ require("reflect-metadata");
|
|
|
6
6
|
const s3 = tslib_1.__importStar(require("@aws-sdk/client-s3"));
|
|
7
7
|
const sts = tslib_1.__importStar(require("@aws-sdk/client-sts"));
|
|
8
8
|
const command_1 = require("@oclif/command");
|
|
9
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
10
|
+
const pMap = require('p-map');
|
|
9
11
|
const path = tslib_1.__importStar(require("path"));
|
|
10
12
|
const fs_extra_1 = require("fs-extra");
|
|
11
13
|
const listr2_1 = require("listr2");
|
|
12
14
|
const Versions_1 = require("../lib/Versions");
|
|
13
15
|
const Config_1 = require("../config/Config");
|
|
14
16
|
const DeployClient_1 = tslib_1.__importDefault(require("../lib/DeployClient"));
|
|
15
|
-
const S3Uploader_1 =
|
|
16
|
-
const S3TransferUtility_1 =
|
|
17
|
+
const S3Uploader_1 = require("../lib/S3Uploader");
|
|
18
|
+
const S3TransferUtility_1 = require("../lib/S3TransferUtility");
|
|
17
19
|
const lib_storage_1 = require("@aws-sdk/lib-storage");
|
|
18
20
|
const mime_types_1 = require("mime-types");
|
|
19
21
|
class PublishCommand extends command_1.Command {
|
|
@@ -109,27 +111,27 @@ class PublishCommand extends command_1.Command {
|
|
|
109
111
|
const origTitle = task.title;
|
|
110
112
|
task.title = RUNNING + origTitle;
|
|
111
113
|
// Copy files to local dir to be uploaded
|
|
112
|
-
await S3Uploader_1.
|
|
114
|
+
await S3Uploader_1.S3Uploader.CopyToUploadDir(config, ctx.preflightResult.response.s3UploadUrl);
|
|
113
115
|
task.title = origTitle;
|
|
114
116
|
},
|
|
115
117
|
},
|
|
116
118
|
{
|
|
117
119
|
// TODO: Disable this task if no static assets path
|
|
118
120
|
title: 'Enumerate Files to Upload to S3',
|
|
119
|
-
task:
|
|
121
|
+
task: (ctx, task) => {
|
|
120
122
|
const origTitle = task.title;
|
|
121
123
|
task.title = RUNNING + origTitle;
|
|
122
|
-
ctx.files =
|
|
124
|
+
ctx.files = S3TransferUtility_1.S3TransferUtility.GetFiles(S3Uploader_1.S3Uploader.TempDir);
|
|
123
125
|
task.title = origTitle;
|
|
124
126
|
},
|
|
125
127
|
},
|
|
126
128
|
{
|
|
127
129
|
// TODO: Disable this task if no static assets path
|
|
128
130
|
title: 'Upload Static Files to S3',
|
|
129
|
-
task: (ctx, task) => {
|
|
131
|
+
task: async (ctx, task) => {
|
|
130
132
|
const origTitle = task.title;
|
|
131
133
|
task.title = RUNNING + origTitle;
|
|
132
|
-
const { bucketName, destinationPrefix } = S3Uploader_1.
|
|
134
|
+
const { bucketName, destinationPrefix } = S3Uploader_1.S3Uploader.ParseUploadPath(ctx.preflightResult.response.s3UploadUrl);
|
|
133
135
|
// Use temp credentials for S3
|
|
134
136
|
const s3Client = new s3.S3Client({
|
|
135
137
|
maxAttempts: 16,
|
|
@@ -148,36 +150,68 @@ class PublishCommand extends command_1.Command {
|
|
|
148
150
|
: overwrite
|
|
149
151
|
? `max-age=${15 * 60}, public`
|
|
150
152
|
: `max-age=${24 * 60 * 60}, public`;
|
|
151
|
-
const pathWithoutAppAndVer = path.join(S3Uploader_1.
|
|
152
|
-
|
|
153
|
-
|
|
153
|
+
const pathWithoutAppAndVer = path.join(S3Uploader_1.S3Uploader.TempDir, destinationPrefix);
|
|
154
|
+
// Listr causes OOM if passes a list of, say, 5,000 to 20,000 files
|
|
155
|
+
if (ctx.files.length > 200) {
|
|
156
|
+
const fileCountMsgInterval = Math.floor(ctx.files.length / 10);
|
|
157
|
+
let filesPublished = 0;
|
|
158
|
+
await pMap(ctx.files, async (filePath) => {
|
|
159
|
+
// Can't use tasks for each file
|
|
154
160
|
const relFilePath = path.relative(pathWithoutAppAndVer, filePath);
|
|
155
|
-
|
|
156
|
-
|
|
161
|
+
if (ctx.files.length > 1000 &&
|
|
162
|
+
(filesPublished % fileCountMsgInterval === 0 ||
|
|
163
|
+
filesPublished === ctx.files.length)) {
|
|
164
|
+
task.output = `Uploaded ${filesPublished} of ${ctx.files.length} files`;
|
|
165
|
+
}
|
|
166
|
+
else if (ctx.files.length <= 1000) {
|
|
167
|
+
task.output = `Uploading ${relFilePath}`;
|
|
168
|
+
}
|
|
157
169
|
const upload = new lib_storage_1.Upload({
|
|
158
170
|
client: s3Client,
|
|
159
171
|
leavePartsOnError: false,
|
|
160
172
|
params: {
|
|
161
173
|
Bucket: bucketName,
|
|
162
|
-
Key: path.relative(S3Uploader_1.
|
|
174
|
+
Key: path.relative(S3Uploader_1.S3Uploader.TempDir, filePath),
|
|
163
175
|
Body: (0, fs_extra_1.createReadStream)(filePath),
|
|
164
176
|
ContentType: (0, mime_types_1.contentType)(path.basename(filePath)) || 'application/octet-stream',
|
|
165
177
|
CacheControl,
|
|
166
178
|
},
|
|
167
179
|
});
|
|
168
180
|
await upload.done();
|
|
169
|
-
|
|
170
|
-
},
|
|
171
|
-
}
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
+
filesPublished++;
|
|
182
|
+
}, { concurrency: 40 });
|
|
183
|
+
}
|
|
184
|
+
else {
|
|
185
|
+
const tasks = ctx.files.map((filePath) => ({
|
|
186
|
+
task: async (ctx, subtask) => {
|
|
187
|
+
const relFilePath = path.relative(pathWithoutAppAndVer, filePath);
|
|
188
|
+
const origTitle = relFilePath;
|
|
189
|
+
subtask.title = RUNNING + origTitle;
|
|
190
|
+
const upload = new lib_storage_1.Upload({
|
|
191
|
+
client: s3Client,
|
|
192
|
+
leavePartsOnError: false,
|
|
193
|
+
params: {
|
|
194
|
+
Bucket: bucketName,
|
|
195
|
+
Key: path.relative(S3Uploader_1.S3Uploader.TempDir, filePath),
|
|
196
|
+
Body: (0, fs_extra_1.createReadStream)(filePath),
|
|
197
|
+
ContentType: (0, mime_types_1.contentType)(path.basename(filePath)) || 'application/octet-stream',
|
|
198
|
+
CacheControl,
|
|
199
|
+
},
|
|
200
|
+
});
|
|
201
|
+
await upload.done();
|
|
202
|
+
subtask.title = origTitle;
|
|
203
|
+
},
|
|
204
|
+
}));
|
|
205
|
+
task.title = origTitle;
|
|
206
|
+
return task.newListr(tasks, {
|
|
207
|
+
concurrent: 8,
|
|
208
|
+
rendererOptions: {
|
|
209
|
+
clearOutput: false,
|
|
210
|
+
showErrorMessage: true,
|
|
211
|
+
showTimer: true,
|
|
212
|
+
},
|
|
213
|
+
});
|
|
214
|
+
}
|
|
181
215
|
},
|
|
182
216
|
},
|
|
183
217
|
{
|
|
@@ -217,7 +251,7 @@ class PublishCommand extends command_1.Command {
|
|
|
217
251
|
await tasks.run();
|
|
218
252
|
}
|
|
219
253
|
finally {
|
|
220
|
-
await S3Uploader_1.
|
|
254
|
+
await S3Uploader_1.S3Uploader.removeTempDirIfExists();
|
|
221
255
|
}
|
|
222
256
|
}
|
|
223
257
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish-static.js","sourceRoot":"","sources":["../../src/commands/publish-static.ts"],"names":[],"mappings":";;;;AAAA,4BAA0B;AAC1B,+DAAyC;AACzC,iEAA2C;AAC3C,4CAA+D;AAC/D,mDAA6B;AAC7B,uCAAwD;AACxD,mCAA0C;AAC1C,8CAA4D;AAC5D,6CAA0C;AAC1C,+EAAkF;AAClF,
|
|
1
|
+
{"version":3,"file":"publish-static.js","sourceRoot":"","sources":["../../src/commands/publish-static.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAK1B,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"publish.d.ts","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAK1B,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,gBAAgB,CAAC;AA2C/D,qBAAa,cAAe,SAAQ,OAAO;IACzC,MAAM,CAAC,WAAW,SAC6H;IAE/I,MAAM,CAAC,QAAQ,WAWb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;;;;MA4EV;IAEF,OAAO,CAAC,eAAe,CAAY;IAE7B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAuX1B;;;;;;OAMG;YACW,cAAc;CAkF7B"}
|
package/dist/commands/publish.js
CHANGED
|
@@ -8,14 +8,16 @@ const lambda = tslib_1.__importStar(require("@aws-sdk/client-lambda"));
|
|
|
8
8
|
const s3 = tslib_1.__importStar(require("@aws-sdk/client-s3"));
|
|
9
9
|
const sts = tslib_1.__importStar(require("@aws-sdk/client-sts"));
|
|
10
10
|
const command_1 = require("@oclif/command");
|
|
11
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
12
|
+
const pMap = require('p-map');
|
|
11
13
|
const path = tslib_1.__importStar(require("path"));
|
|
12
14
|
const fs_extra_1 = require("fs-extra");
|
|
13
15
|
const listr2_1 = require("listr2");
|
|
14
16
|
const Versions_1 = require("../lib/Versions");
|
|
15
17
|
const Config_1 = require("../config/Config");
|
|
16
18
|
const DeployClient_1 = tslib_1.__importDefault(require("../lib/DeployClient"));
|
|
17
|
-
const S3Uploader_1 =
|
|
18
|
-
const S3TransferUtility_1 =
|
|
19
|
+
const S3Uploader_1 = require("../lib/S3Uploader");
|
|
20
|
+
const S3TransferUtility_1 = require("../lib/S3TransferUtility");
|
|
19
21
|
const lib_storage_1 = require("@aws-sdk/lib-storage");
|
|
20
22
|
const mime_types_1 = require("mime-types");
|
|
21
23
|
const asyncSetTimeout = util.promisify(setTimeout);
|
|
@@ -196,27 +198,27 @@ class PublishCommand extends command_1.Command {
|
|
|
196
198
|
const origTitle = task.title;
|
|
197
199
|
task.title = RUNNING + origTitle;
|
|
198
200
|
// Copy files to local dir to be uploaded
|
|
199
|
-
await S3Uploader_1.
|
|
201
|
+
await S3Uploader_1.S3Uploader.CopyToUploadDir(config, ctx.preflightResult.response.s3UploadUrl);
|
|
200
202
|
task.title = origTitle;
|
|
201
203
|
},
|
|
202
204
|
},
|
|
203
205
|
{
|
|
204
206
|
enabled: () => !!config.app.staticAssetsPath,
|
|
205
207
|
title: 'Enumerate Files to Upload to S3',
|
|
206
|
-
task:
|
|
208
|
+
task: (ctx, task) => {
|
|
207
209
|
const origTitle = task.title;
|
|
208
210
|
task.title = RUNNING + origTitle;
|
|
209
|
-
ctx.files =
|
|
211
|
+
ctx.files = S3TransferUtility_1.S3TransferUtility.GetFiles(S3Uploader_1.S3Uploader.TempDir);
|
|
210
212
|
task.title = origTitle;
|
|
211
213
|
},
|
|
212
214
|
},
|
|
213
215
|
{
|
|
214
216
|
enabled: () => !!config.app.staticAssetsPath,
|
|
215
217
|
title: 'Upload Static Files to S3',
|
|
216
|
-
task: (ctx, task) => {
|
|
218
|
+
task: async (ctx, task) => {
|
|
217
219
|
const origTitle = task.title;
|
|
218
220
|
task.title = RUNNING + origTitle;
|
|
219
|
-
const { bucketName, destinationPrefix } = S3Uploader_1.
|
|
221
|
+
const { bucketName, destinationPrefix } = S3Uploader_1.S3Uploader.ParseUploadPath(ctx.preflightResult.response.s3UploadUrl);
|
|
220
222
|
// Use temp credentials for S3
|
|
221
223
|
const s3Client = new s3.S3Client({
|
|
222
224
|
maxAttempts: 16,
|
|
@@ -235,36 +237,68 @@ class PublishCommand extends command_1.Command {
|
|
|
235
237
|
: overwrite
|
|
236
238
|
? `max-age=${15 * 60}, public`
|
|
237
239
|
: `max-age=${24 * 60 * 60}, public`;
|
|
238
|
-
const pathWithoutAppAndVer = path.join(S3Uploader_1.
|
|
239
|
-
|
|
240
|
-
|
|
240
|
+
const pathWithoutAppAndVer = path.join(S3Uploader_1.S3Uploader.TempDir, destinationPrefix);
|
|
241
|
+
// Listr causes OOM if passes a list of, say, 5,000 to 20,000 files
|
|
242
|
+
if (ctx.files.length > 200) {
|
|
243
|
+
const fileCountMsgInterval = Math.floor(ctx.files.length / 10);
|
|
244
|
+
let filesPublished = 0;
|
|
245
|
+
await pMap(ctx.files, async (filePath) => {
|
|
246
|
+
// Can't use tasks for each file
|
|
241
247
|
const relFilePath = path.relative(pathWithoutAppAndVer, filePath);
|
|
242
|
-
|
|
243
|
-
|
|
248
|
+
if (ctx.files.length > 1000 &&
|
|
249
|
+
(filesPublished % fileCountMsgInterval === 0 ||
|
|
250
|
+
filesPublished === ctx.files.length)) {
|
|
251
|
+
task.output = `Uploaded ${filesPublished} of ${ctx.files.length} files`;
|
|
252
|
+
}
|
|
253
|
+
else if (ctx.files.length <= 1000) {
|
|
254
|
+
task.output = `Uploading ${relFilePath}`;
|
|
255
|
+
}
|
|
244
256
|
const upload = new lib_storage_1.Upload({
|
|
245
257
|
client: s3Client,
|
|
246
258
|
leavePartsOnError: false,
|
|
247
259
|
params: {
|
|
248
260
|
Bucket: bucketName,
|
|
249
|
-
Key: path.relative(S3Uploader_1.
|
|
261
|
+
Key: path.relative(S3Uploader_1.S3Uploader.TempDir, filePath),
|
|
250
262
|
Body: (0, fs_extra_1.createReadStream)(filePath),
|
|
251
263
|
ContentType: (0, mime_types_1.contentType)(path.basename(filePath)) || 'application/octet-stream',
|
|
252
264
|
CacheControl,
|
|
253
265
|
},
|
|
254
266
|
});
|
|
255
267
|
await upload.done();
|
|
256
|
-
|
|
257
|
-
},
|
|
258
|
-
}
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
+
filesPublished++;
|
|
269
|
+
}, { concurrency: 40 });
|
|
270
|
+
}
|
|
271
|
+
else {
|
|
272
|
+
const tasks = ctx.files.map((filePath) => ({
|
|
273
|
+
task: async (ctx, subtask) => {
|
|
274
|
+
const relFilePath = path.relative(pathWithoutAppAndVer, filePath);
|
|
275
|
+
const origTitle = relFilePath;
|
|
276
|
+
subtask.title = RUNNING + origTitle;
|
|
277
|
+
const upload = new lib_storage_1.Upload({
|
|
278
|
+
client: s3Client,
|
|
279
|
+
leavePartsOnError: false,
|
|
280
|
+
params: {
|
|
281
|
+
Bucket: bucketName,
|
|
282
|
+
Key: path.relative(S3Uploader_1.S3Uploader.TempDir, filePath),
|
|
283
|
+
Body: (0, fs_extra_1.createReadStream)(filePath),
|
|
284
|
+
ContentType: (0, mime_types_1.contentType)(path.basename(filePath)) || 'application/octet-stream',
|
|
285
|
+
CacheControl,
|
|
286
|
+
},
|
|
287
|
+
});
|
|
288
|
+
await upload.done();
|
|
289
|
+
subtask.title = origTitle;
|
|
290
|
+
},
|
|
291
|
+
}));
|
|
292
|
+
task.title = origTitle;
|
|
293
|
+
return task.newListr(tasks, {
|
|
294
|
+
concurrent: 20,
|
|
295
|
+
rendererOptions: {
|
|
296
|
+
clearOutput: false,
|
|
297
|
+
showErrorMessage: true,
|
|
298
|
+
showTimer: true,
|
|
299
|
+
},
|
|
300
|
+
});
|
|
301
|
+
}
|
|
268
302
|
},
|
|
269
303
|
},
|
|
270
304
|
{
|
|
@@ -322,7 +356,7 @@ class PublishCommand extends command_1.Command {
|
|
|
322
356
|
await tasks.run();
|
|
323
357
|
}
|
|
324
358
|
finally {
|
|
325
|
-
await S3Uploader_1.
|
|
359
|
+
await S3Uploader_1.S3Uploader.removeTempDirIfExists();
|
|
326
360
|
}
|
|
327
361
|
}
|
|
328
362
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../src/commands/publish.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Application.js","sourceRoot":"","sources":["../../src/config/Application.ts"],"names":[],"mappings":";;;;AAAA,iFAA+D;AAC/D,sDAAgC;AAChC,4DAAsC;
|
|
1
|
+
{"version":3,"file":"Application.js","sourceRoot":"","sources":["../../src/config/Application.ts"],"names":[],"mappings":";;;;AAAA,iFAA+D;AAC/D,sDAAgC;AAChC,4DAAsC;AAkC/B,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAE5B,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IACD,IAKW,IAAI,CAAC,KAAa;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IACnC,CAAC;IAiBD,IAKW,gBAAgB,CAAC,KAAa;QACvC,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;IACjC,CAAC;IACD,IAAW,gBAAgB;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;CAsBF,CAAA;AAxDC;IAAC,OAAO,CAAC,QAAQ,CAAC;QAChB,GAAG,EAAE,uBAAuB;QAC5B,OAAO,EAAE,EAAE;QACX,GAAG,EAAE,UAAU;KAChB,CAAC;;;6CAGD;AAED;IAAC,OAAO,CAAC,QAAQ,CAAC;QAChB,GAAG,EAAE,2CAA2C;QAChD,OAAO,EAAE,OAAO;QAChB,GAAG,EAAE,YAAY;KAClB,CAAC;;iDACoB;AAEtB;IAAC,OAAO,CAAC,QAAQ,CAAC;QAChB,GAAG,EAAE,gEAAgE;QACrE,OAAO,EAAE,EAAE;QACX,GAAG,EAAE,kBAAkB;KACxB,CAAC;;sDACyB;AAG3B;IAAC,OAAO,CAAC,QAAQ,CAAC;QAChB,GAAG,EAAE,kDAAkD;QACvD,OAAO,EAAE,EAAE;QACX,GAAG,EAAE,wBAAwB;KAC9B,CAAC;;;yDAGD;AAKD;IAAC,OAAO,CAAC,QAAQ,CAAC;QAChB,GAAG,EAAE,gDAAgD;QACrD,OAAO,EAAE,EAAE;QACX,GAAG,EAAE,iBAAiB;KACvB,CAAC;;qDACwB;AAE1B;IAAC,OAAO,CAAC,QAAQ,CAAC;QAChB,GAAG,EAAE,6BAA6B;QAClC,OAAO,EAAE,EAAE;QACX,GAAG,EAAE,gBAAgB;KACtB,CAAC;;uDAC0B;AAE5B;IAAC,OAAO,CAAC,QAAQ,CAAC;QAChB,GAAG,EAAE,yBAAyB;QAC9B,OAAO,EAAE,WAAW;QACpB,GAAG,EAAE,YAAY;KAClB,CAAC;;oDACuB;AA5Dd,iBAAiB;IAnB7B,OAAO,CAAC,MAAM,CAAC;QACd,+DAA+D;QAC/D,IAAI,EAAE,iBAAiB;QAEvB,+DAA+D;QAC/D,gBAAgB,EAAE,QAAQ;QAE1B,2CAA2C;QAC3C,MAAM,EAAE;YACN,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;YAC1B,KAAK,EAAE,IAAI,CAAC,IAAI;SACjB;QAED,6CAA6C;QAC7C,OAAO,EAAE;YACP,GAAG,EAAH,mCAAG;YACH,SAAS,EAAT,yCAAS;SACV;KACF,CAAC;GACW,iBAAiB,CA6D7B;AA7DY,8CAAiB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../src/config/Config.ts"],"names":[],"mappings":";;;;;AAAA,iFAA+D;AAC/D,sDAAgC;AAChC,4DAAsC;AACtC,2CAAuC;AACvC,kDAA+C;AAC/C,+CAAsE;AACtE,yCAA6D;
|
|
1
|
+
{"version":3,"file":"Config.js","sourceRoot":"","sources":["../../src/config/Config.ts"],"names":[],"mappings":";;;;;AAAA,iFAA+D;AAC/D,sDAAgC;AAChC,4DAAsC;AACtC,2CAAuC;AACvC,kDAA+C;AAC/C,+CAAsE;AACtE,yCAA6D;AA6BtD,IAAM,MAAM,cAAZ,MAAM,MAAM;IACV,MAAM,CAAC,WAAW;QACvB,MAAM,aAAa,GAAG;YACpB,kBAAkB;YAClB,iBAAiB;YACjB,eAAe,QAAM,CAAC,QAAQ,OAAO;YACrC,eAAe,QAAM,CAAC,QAAQ,MAAM;SACrC,CAAC;QACF,OAAO,uBAAU,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC;IACxD,CAAC;IAGM,MAAM,KAAK,QAAQ;QACxB,IAAI,QAAM,CAAC,SAAS,KAAK,SAAS,EAAE;YAClC,MAAM,YAAY,GAAG,IAAI,sBAAS,CAAS,QAAM,CAAC,CAAC;YACnD,QAAM,CAAC,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,QAAM,CAAC,WAAW,EAAE,CAAC,CAAC;SAC5D;QACD,OAAO,QAAM,CAAC,SAAS,CAAC;IAC1B,CAAC;IAEM,MAAM,KAAK,QAAQ;QACxB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,KAAK,CAAC;QAC9C,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC9B,OAAO,MAAM,CAAC;SACf;aAAM,IAAI,OAAO,KAAK,IAAI,EAAE;YAC3B,OAAO,IAAI,CAAC;SACb;aAAM,IAAI,OAAO,KAAK,OAAO,EAAE;YAC9B,OAAO,OAAO,CAAC;SAChB;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CAeF,CAAA;AALC;IAAC,OAAO,CAAC,QAAQ,CAAC,+BAAiB,CAAC;;mCACJ;AAEhC;IAAC,OAAO,CAAC,QAAQ,CAAC,yBAAc,CAAC;;wCACC;AA5CvB,MAAM;IAnBlB,OAAO,CAAC,MAAM,CAAC;QACd,+DAA+D;QAC/D,IAAI,EAAE,YAAY;QAElB,+DAA+D;QAC/D,gBAAgB,EAAE,QAAQ;QAE1B,2CAA2C;QAC3C,MAAM,EAAE;YACN,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;YAC1B,KAAK,EAAE,IAAI,CAAC,IAAI;SACjB;QAED,6CAA6C;QAC7C,OAAO,EAAE;YACP,GAAG,EAAH,mCAAG;YACH,SAAS,EAAT,yCAAS;SACV;KACF,CAAC;GACW,MAAM,CA6ClB;AA7CY,wBAAM"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Deployer.js","sourceRoot":"","sources":["../../src/config/Deployer.ts"],"names":[],"mappings":";;;;AAAA,2CAAsC;AAStC,MAAa,cAAc;CAO1B;
|
|
1
|
+
{"version":3,"file":"Deployer.js","sourceRoot":"","sources":["../../src/config/Deployer.ts"],"names":[],"mappings":";;;;AAAA,2CAAsC;AAStC,MAAa,cAAc;CAO1B;AANC;IAAC,IAAA,qBAAQ,EAAC;QACR,GAAG,EAAE,kCAAkC;QACvC,OAAO,EAAE,oBAAoB;QAC7B,GAAG,EAAE,sBAAsB;KAC5B,CAAC;;kDACyB;AAN7B,wCAOC"}
|
|
@@ -8,7 +8,7 @@ export interface IDeployVersionPreflightResult {
|
|
|
8
8
|
exists: boolean;
|
|
9
9
|
response: IDeployVersionPreflightResponse;
|
|
10
10
|
}
|
|
11
|
-
export
|
|
11
|
+
export type DeployVersionArgs = Parameters<typeof DeployClient.DeployVersionLite>;
|
|
12
12
|
export default class DeployClient {
|
|
13
13
|
static readonly _client: lambda.LambdaClient;
|
|
14
14
|
static readonly _decoder: TextDecoder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeployClient.d.ts","sourceRoot":"","sources":["../../src/lib/DeployClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AACjD,OAAO,KAAK,EAEV,iBAAiB,EAEjB,+BAA+B,EAI/B,oBAAoB,EACrB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,+BAA+B,CAAC;CAC3C;AAED,
|
|
1
|
+
{"version":3,"file":"DeployClient.d.ts","sourceRoot":"","sources":["../../src/lib/DeployClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { IDeployVersionPreflightResponse } from '@pwrdrvr/microapps-deployer-lib';
|
|
2
|
-
export
|
|
2
|
+
export declare class S3TransferUtility {
|
|
3
3
|
/**
|
|
4
4
|
* @deprecated 2021-11-27
|
|
5
5
|
*
|
|
@@ -14,6 +14,6 @@ export default class S3TransferUtility {
|
|
|
14
14
|
* @param dir
|
|
15
15
|
* @returns
|
|
16
16
|
*/
|
|
17
|
-
static GetFiles(dir: string):
|
|
17
|
+
static GetFiles(dir: string): string[];
|
|
18
18
|
}
|
|
19
19
|
//# sourceMappingURL=S3TransferUtility.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3TransferUtility.d.ts","sourceRoot":"","sources":["../../src/lib/S3TransferUtility.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,iCAAiC,CAAC;AAIvF,
|
|
1
|
+
{"version":3,"file":"S3TransferUtility.d.ts","sourceRoot":"","sources":["../../src/lib/S3TransferUtility.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,iCAAiC,CAAC;AAIvF,qBAAa,iBAAiB;IAC5B;;;;;;;OAOG;WACiB,SAAS,CAC3B,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,+BAA+B,GACjD,OAAO,CAAC,IAAI,CAAC;IAqDhB;;;;OAIG;WACW,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE;CA4B9C"}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
// From: https://stackoverflow.com/a/65862128/878903
|
|
4
4
|
//
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.S3TransferUtility = void 0;
|
|
6
7
|
const tslib_1 = require("tslib");
|
|
7
8
|
const fs_1 = require("fs");
|
|
8
9
|
const path = tslib_1.__importStar(require("path"));
|
|
@@ -30,7 +31,7 @@ class S3TransferUtility {
|
|
|
30
31
|
},
|
|
31
32
|
});
|
|
32
33
|
// console.log('Uploading files to S3');
|
|
33
|
-
const files =
|
|
34
|
+
const files = S3TransferUtility.GetFiles(s3Path);
|
|
34
35
|
// const pathWithoutAppAndVer = path.join(s3Path, destPrefixPath);
|
|
35
36
|
// for (const filePath of files) {
|
|
36
37
|
// const relFilePath = path.relative(pathWithoutAppAndVer, filePath);
|
|
@@ -62,14 +63,32 @@ class S3TransferUtility {
|
|
|
62
63
|
* @param dir
|
|
63
64
|
* @returns
|
|
64
65
|
*/
|
|
65
|
-
static
|
|
66
|
-
const dirents =
|
|
67
|
-
const files =
|
|
68
|
-
|
|
69
|
-
|
|
66
|
+
static GetFiles(dir) {
|
|
67
|
+
const dirents = (0, fs_1.readdirSync)(dir, { withFileTypes: true });
|
|
68
|
+
const files = [];
|
|
69
|
+
const toScan = dirents.map((dirent) => ({
|
|
70
|
+
path: path.resolve(dir, dirent.name),
|
|
71
|
+
isDirectory: dirent.isDirectory(),
|
|
70
72
|
}));
|
|
71
|
-
|
|
73
|
+
// Iteratively collect all the files in the directories
|
|
74
|
+
// Do not use function call recursion
|
|
75
|
+
while (toScan.length > 0) {
|
|
76
|
+
const dirOrFile = toScan.pop();
|
|
77
|
+
if (dirOrFile.isDirectory) {
|
|
78
|
+
const direntsChild = (0, fs_1.readdirSync)(dirOrFile.path, { withFileTypes: true });
|
|
79
|
+
const toScanChild = direntsChild.map((dirent) => ({
|
|
80
|
+
path: path.resolve(dirOrFile.path, dirent.name),
|
|
81
|
+
isDirectory: dirent.isDirectory(),
|
|
82
|
+
}));
|
|
83
|
+
Array.prototype.push.apply(toScan, toScanChild);
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
files.push(dirOrFile.path);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
// Reverse the array so that the files are in the same order as the original
|
|
90
|
+
return files.reverse();
|
|
72
91
|
}
|
|
73
92
|
}
|
|
74
|
-
exports.
|
|
93
|
+
exports.S3TransferUtility = S3TransferUtility;
|
|
75
94
|
//# sourceMappingURL=S3TransferUtility.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3TransferUtility.js","sourceRoot":"","sources":["../../src/lib/S3TransferUtility.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,oDAAoD;AACpD,EAAE
|
|
1
|
+
{"version":3,"file":"S3TransferUtility.js","sourceRoot":"","sources":["../../src/lib/S3TransferUtility.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/S3Uploader.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { IDeployVersionPreflightResponse } from '@pwrdrvr/microapps-deployer-lib';
|
|
2
2
|
import { IConfig } from '../config/Config';
|
|
3
|
-
export
|
|
3
|
+
export declare class S3Uploader {
|
|
4
4
|
/**
|
|
5
5
|
* Copy files to local upload directory
|
|
6
6
|
* @param config
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3Uploader.d.ts","sourceRoot":"","sources":["../../src/lib/S3Uploader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,iCAAiC,CAAC;AAEvF,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAG3C,
|
|
1
|
+
{"version":3,"file":"S3Uploader.d.ts","sourceRoot":"","sources":["../../src/lib/S3Uploader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,iCAAiC,CAAC;AAEvF,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAG3C,qBAAa,UAAU;IACrB;;;;;OAKG;WACiB,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAa3E,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG;QACnD,UAAU,EAAE,MAAM,CAAC;QACnB,iBAAiB,EAAE,MAAM,CAAC;KAC3B;IASD;;;;;;OAMG;WACiB,MAAM,CACxB,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,+BAA+B,GACjD,OAAO,CAAC,IAAI,CAAC;WA2BI,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAa1D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAuB;IACvD,WAAkB,OAAO,IAAI,MAAM,CAElC;CACF"}
|
package/dist/lib/S3Uploader.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.S3Uploader = void 0;
|
|
3
4
|
const tslib_1 = require("tslib");
|
|
4
5
|
const path = tslib_1.__importStar(require("path"));
|
|
5
6
|
const fs = tslib_1.__importStar(require("fs-extra"));
|
|
6
|
-
const S3TransferUtility_1 =
|
|
7
|
+
const S3TransferUtility_1 = require("./S3TransferUtility");
|
|
7
8
|
class S3Uploader {
|
|
8
9
|
/**
|
|
9
10
|
* Copy files to local upload directory
|
|
@@ -47,7 +48,7 @@ class S3Uploader {
|
|
|
47
48
|
// FIXME: Use p-map for controlled parallelism
|
|
48
49
|
await fs.copy(config.app.staticAssetsPath, tempUploadPath);
|
|
49
50
|
// Do the upload
|
|
50
|
-
await S3TransferUtility_1.
|
|
51
|
+
await S3TransferUtility_1.S3TransferUtility.UploadDir(this._tempDir, destinationPrefix, bucketName, preflightResponse);
|
|
51
52
|
}
|
|
52
53
|
finally {
|
|
53
54
|
// Delete the directory, now that it's uploaded or if we failed
|
|
@@ -71,6 +72,6 @@ class S3Uploader {
|
|
|
71
72
|
return S3Uploader._tempDir;
|
|
72
73
|
}
|
|
73
74
|
}
|
|
74
|
-
exports.
|
|
75
|
+
exports.S3Uploader = S3Uploader;
|
|
75
76
|
S3Uploader._tempDir = './deploytool-temp';
|
|
76
77
|
//# sourceMappingURL=S3Uploader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"S3Uploader.js","sourceRoot":"","sources":["../../src/lib/S3Uploader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"S3Uploader.js","sourceRoot":"","sources":["../../src/lib/S3Uploader.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAE7B,qDAA+B;AAE/B,2DAAwD;AAExD,MAAa,UAAU;IACrB;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,MAAe,EAAE,YAAoB;QACvE,MAAM,EAAE,iBAAiB,EAAE,GAAG,UAAU,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QAEvE,uCAAuC;QACvC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QACzE,MAAM,UAAU,CAAC,qBAAqB,EAAE,CAAC;QACzC,MAAM,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEpD,mDAAmD;QACnD,kEAAkE;QAClE,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;IAC7D,CAAC;IAEM,MAAM,CAAC,eAAe,CAAC,YAAoB;QAIhD,0BAA0B;QAC1B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;QAClC,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC;QAC5B,MAAM,iBAAiB,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAEhF,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAC3C,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,KAAK,CAAC,MAAM,CACxB,MAAe,EACf,YAAoB,EACpB,iBAAkD;QAElD,IAAI;YACF,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;YAEnF,uCAAuC;YACvC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;YACzE,MAAM,UAAU,CAAC,qBAAqB,EAAE,CAAC;YACzC,MAAM,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAEpD,mDAAmD;YACnD,kEAAkE;YAClE,8CAA8C;YAC9C,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;YAE3D,gBAAgB;YAChB,MAAM,qCAAiB,CAAC,SAAS,CAC/B,IAAI,CAAC,QAAQ,EACb,iBAAiB,EACjB,UAAU,EACV,iBAAiB,CAClB,CAAC;SACH;gBAAS;YACR,+DAA+D;YAC/D,MAAM,UAAU,CAAC,qBAAqB,EAAE,CAAC;SAC1C;IACH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,qBAAqB;QACvC,IAAI;YACF,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YACjD,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;gBACvB,MAAM,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;aACvD;SACF;QAAC,WAAM;YACN,aAAa;YACb,gDAAgD;YAChD,iDAAiD;SAClD;IACH,CAAC;IAGM,MAAM,KAAK,OAAO;QACvB,OAAO,UAAU,CAAC,QAAQ,CAAC;IAC7B,CAAC;;AAtFH,gCAuFC;AAJyB,mBAAQ,GAAG,mBAAmB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pwrdrvr/microapps-publish",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0-alpha.2",
|
|
4
4
|
"description": "Publish tool for deploying apps and updates",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"source": "src/index.ts",
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"mime-types": "^2.1.30",
|
|
54
54
|
"p-map": "^4.0.0",
|
|
55
55
|
"reflect-metadata": "^0.1.13",
|
|
56
|
-
"source-map-support": "
|
|
56
|
+
"source-map-support": "0.5.21",
|
|
57
57
|
"ts-convict": "^1.1.0",
|
|
58
58
|
"tslib": "^2.1.0"
|
|
59
59
|
},
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
"@types/fs-extra": "^9.0.11",
|
|
64
64
|
"@types/js-yaml": "^4.0.1",
|
|
65
65
|
"@types/mime-types": "^2.1.0",
|
|
66
|
-
"@types/source-map-support": "
|
|
66
|
+
"@types/source-map-support": "0.5.6",
|
|
67
67
|
"type-fest": "^0.20.2"
|
|
68
68
|
},
|
|
69
69
|
"oclif": {
|
|
@@ -2,14 +2,16 @@ import 'reflect-metadata';
|
|
|
2
2
|
import * as s3 from '@aws-sdk/client-s3';
|
|
3
3
|
import * as sts from '@aws-sdk/client-sts';
|
|
4
4
|
import { Command, flags as flagsParser } from '@oclif/command';
|
|
5
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
6
|
+
const pMap = require('p-map');
|
|
5
7
|
import * as path from 'path';
|
|
6
8
|
import { pathExists, createReadStream } from 'fs-extra';
|
|
7
9
|
import { Listr, ListrTask } from 'listr2';
|
|
8
10
|
import { createVersions, IVersions } from '../lib/Versions';
|
|
9
11
|
import { Config } from '../config/Config';
|
|
10
12
|
import DeployClient, { IDeployVersionPreflightResult } from '../lib/DeployClient';
|
|
11
|
-
import S3Uploader from '../lib/S3Uploader';
|
|
12
|
-
import S3TransferUtility from '../lib/S3TransferUtility';
|
|
13
|
+
import { S3Uploader } from '../lib/S3Uploader';
|
|
14
|
+
import { S3TransferUtility } from '../lib/S3TransferUtility';
|
|
13
15
|
import { Upload } from '@aws-sdk/lib-storage';
|
|
14
16
|
import { contentType } from 'mime-types';
|
|
15
17
|
|
|
@@ -198,11 +200,11 @@ export class PublishCommand extends Command {
|
|
|
198
200
|
{
|
|
199
201
|
// TODO: Disable this task if no static assets path
|
|
200
202
|
title: 'Enumerate Files to Upload to S3',
|
|
201
|
-
task:
|
|
203
|
+
task: (ctx, task) => {
|
|
202
204
|
const origTitle = task.title;
|
|
203
205
|
task.title = RUNNING + origTitle;
|
|
204
206
|
|
|
205
|
-
ctx.files =
|
|
207
|
+
ctx.files = S3TransferUtility.GetFiles(S3Uploader.TempDir);
|
|
206
208
|
|
|
207
209
|
task.title = origTitle;
|
|
208
210
|
},
|
|
@@ -210,7 +212,7 @@ export class PublishCommand extends Command {
|
|
|
210
212
|
{
|
|
211
213
|
// TODO: Disable this task if no static assets path
|
|
212
214
|
title: 'Upload Static Files to S3',
|
|
213
|
-
task: (ctx, task) => {
|
|
215
|
+
task: async (ctx, task) => {
|
|
214
216
|
const origTitle = task.title;
|
|
215
217
|
task.title = RUNNING + origTitle;
|
|
216
218
|
|
|
@@ -239,41 +241,81 @@ export class PublishCommand extends Command {
|
|
|
239
241
|
: `max-age=${24 * 60 * 60}, public`;
|
|
240
242
|
|
|
241
243
|
const pathWithoutAppAndVer = path.join(S3Uploader.TempDir, destinationPrefix);
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
}
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
244
|
+
// Listr causes OOM if passes a list of, say, 5,000 to 20,000 files
|
|
245
|
+
if (ctx.files.length > 200) {
|
|
246
|
+
const fileCountMsgInterval = Math.floor(ctx.files.length / 10);
|
|
247
|
+
let filesPublished = 0;
|
|
248
|
+
|
|
249
|
+
await pMap(
|
|
250
|
+
ctx.files,
|
|
251
|
+
async (filePath: string) => {
|
|
252
|
+
// Can't use tasks for each file
|
|
253
|
+
const relFilePath = path.relative(pathWithoutAppAndVer, filePath);
|
|
254
|
+
|
|
255
|
+
if (
|
|
256
|
+
ctx.files.length > 1000 &&
|
|
257
|
+
(filesPublished % fileCountMsgInterval === 0 ||
|
|
258
|
+
filesPublished === ctx.files.length)
|
|
259
|
+
) {
|
|
260
|
+
task.output = `Uploaded ${filesPublished} of ${ctx.files.length} files`;
|
|
261
|
+
} else if (ctx.files.length <= 1000) {
|
|
262
|
+
task.output = `Uploading ${relFilePath}`;
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
const upload = new Upload({
|
|
266
|
+
client: s3Client,
|
|
267
|
+
leavePartsOnError: false,
|
|
268
|
+
params: {
|
|
269
|
+
Bucket: bucketName,
|
|
270
|
+
Key: path.relative(S3Uploader.TempDir, filePath),
|
|
271
|
+
Body: createReadStream(filePath),
|
|
272
|
+
ContentType:
|
|
273
|
+
contentType(path.basename(filePath)) || 'application/octet-stream',
|
|
274
|
+
CacheControl,
|
|
275
|
+
},
|
|
276
|
+
});
|
|
277
|
+
await upload.done();
|
|
278
|
+
filesPublished++;
|
|
279
|
+
},
|
|
280
|
+
{ concurrency: 40 },
|
|
281
|
+
);
|
|
282
|
+
} else {
|
|
283
|
+
const tasks: ListrTask<IContext>[] = ctx.files.map((filePath) => ({
|
|
284
|
+
task: async (ctx: IContext, subtask) => {
|
|
285
|
+
const relFilePath = path.relative(pathWithoutAppAndVer, filePath);
|
|
286
|
+
|
|
287
|
+
const origTitle = relFilePath;
|
|
288
|
+
subtask.title = RUNNING + origTitle;
|
|
289
|
+
|
|
290
|
+
const upload = new Upload({
|
|
291
|
+
client: s3Client,
|
|
292
|
+
leavePartsOnError: false,
|
|
293
|
+
params: {
|
|
294
|
+
Bucket: bucketName,
|
|
295
|
+
Key: path.relative(S3Uploader.TempDir, filePath),
|
|
296
|
+
Body: createReadStream(filePath),
|
|
297
|
+
ContentType:
|
|
298
|
+
contentType(path.basename(filePath)) || 'application/octet-stream',
|
|
299
|
+
CacheControl,
|
|
300
|
+
},
|
|
301
|
+
});
|
|
302
|
+
await upload.done();
|
|
303
|
+
|
|
304
|
+
subtask.title = origTitle;
|
|
305
|
+
},
|
|
306
|
+
}));
|
|
307
|
+
|
|
308
|
+
task.title = origTitle;
|
|
309
|
+
|
|
310
|
+
return task.newListr(tasks, {
|
|
311
|
+
concurrent: 8,
|
|
312
|
+
rendererOptions: {
|
|
313
|
+
clearOutput: false,
|
|
314
|
+
showErrorMessage: true,
|
|
315
|
+
showTimer: true,
|
|
316
|
+
},
|
|
317
|
+
});
|
|
318
|
+
}
|
|
277
319
|
},
|
|
278
320
|
},
|
|
279
321
|
{
|
package/src/commands/publish.ts
CHANGED
|
@@ -4,14 +4,16 @@ import * as lambda from '@aws-sdk/client-lambda';
|
|
|
4
4
|
import * as s3 from '@aws-sdk/client-s3';
|
|
5
5
|
import * as sts from '@aws-sdk/client-sts';
|
|
6
6
|
import { Command, flags as flagsParser } from '@oclif/command';
|
|
7
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
8
|
+
const pMap = require('p-map');
|
|
7
9
|
import * as path from 'path';
|
|
8
10
|
import { pathExists, createReadStream } from 'fs-extra';
|
|
9
11
|
import { Listr, ListrTask } from 'listr2';
|
|
10
12
|
import { createVersions, IVersions } from '../lib/Versions';
|
|
11
13
|
import { Config, IConfig } from '../config/Config';
|
|
12
14
|
import DeployClient, { IDeployVersionPreflightResult } from '../lib/DeployClient';
|
|
13
|
-
import S3Uploader from '../lib/S3Uploader';
|
|
14
|
-
import S3TransferUtility from '../lib/S3TransferUtility';
|
|
15
|
+
import { S3Uploader } from '../lib/S3Uploader';
|
|
16
|
+
import { S3TransferUtility } from '../lib/S3TransferUtility';
|
|
15
17
|
import { Upload } from '@aws-sdk/lib-storage';
|
|
16
18
|
import { contentType } from 'mime-types';
|
|
17
19
|
import { TaskWrapper } from 'listr2/dist/lib/task-wrapper';
|
|
@@ -331,11 +333,11 @@ export class PublishCommand extends Command {
|
|
|
331
333
|
{
|
|
332
334
|
enabled: () => !!config.app.staticAssetsPath,
|
|
333
335
|
title: 'Enumerate Files to Upload to S3',
|
|
334
|
-
task:
|
|
336
|
+
task: (ctx, task) => {
|
|
335
337
|
const origTitle = task.title;
|
|
336
338
|
task.title = RUNNING + origTitle;
|
|
337
339
|
|
|
338
|
-
ctx.files =
|
|
340
|
+
ctx.files = S3TransferUtility.GetFiles(S3Uploader.TempDir);
|
|
339
341
|
|
|
340
342
|
task.title = origTitle;
|
|
341
343
|
},
|
|
@@ -343,7 +345,7 @@ export class PublishCommand extends Command {
|
|
|
343
345
|
{
|
|
344
346
|
enabled: () => !!config.app.staticAssetsPath,
|
|
345
347
|
title: 'Upload Static Files to S3',
|
|
346
|
-
task: (ctx, task) => {
|
|
348
|
+
task: async (ctx, task) => {
|
|
347
349
|
const origTitle = task.title;
|
|
348
350
|
task.title = RUNNING + origTitle;
|
|
349
351
|
|
|
@@ -373,40 +375,81 @@ export class PublishCommand extends Command {
|
|
|
373
375
|
|
|
374
376
|
const pathWithoutAppAndVer = path.join(S3Uploader.TempDir, destinationPrefix);
|
|
375
377
|
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
378
|
+
// Listr causes OOM if passes a list of, say, 5,000 to 20,000 files
|
|
379
|
+
if (ctx.files.length > 200) {
|
|
380
|
+
const fileCountMsgInterval = Math.floor(ctx.files.length / 10);
|
|
381
|
+
let filesPublished = 0;
|
|
382
|
+
|
|
383
|
+
await pMap(
|
|
384
|
+
ctx.files,
|
|
385
|
+
async (filePath: string) => {
|
|
386
|
+
// Can't use tasks for each file
|
|
387
|
+
const relFilePath = path.relative(pathWithoutAppAndVer, filePath);
|
|
388
|
+
|
|
389
|
+
if (
|
|
390
|
+
ctx.files.length > 1000 &&
|
|
391
|
+
(filesPublished % fileCountMsgInterval === 0 ||
|
|
392
|
+
filesPublished === ctx.files.length)
|
|
393
|
+
) {
|
|
394
|
+
task.output = `Uploaded ${filesPublished} of ${ctx.files.length} files`;
|
|
395
|
+
} else if (ctx.files.length <= 1000) {
|
|
396
|
+
task.output = `Uploading ${relFilePath}`;
|
|
397
|
+
}
|
|
398
|
+
|
|
399
|
+
const upload = new Upload({
|
|
400
|
+
client: s3Client,
|
|
401
|
+
leavePartsOnError: false,
|
|
402
|
+
params: {
|
|
403
|
+
Bucket: bucketName,
|
|
404
|
+
Key: path.relative(S3Uploader.TempDir, filePath),
|
|
405
|
+
Body: createReadStream(filePath),
|
|
406
|
+
ContentType:
|
|
407
|
+
contentType(path.basename(filePath)) || 'application/octet-stream',
|
|
408
|
+
CacheControl,
|
|
409
|
+
},
|
|
410
|
+
});
|
|
411
|
+
await upload.done();
|
|
412
|
+
filesPublished++;
|
|
413
|
+
},
|
|
414
|
+
{ concurrency: 40 },
|
|
415
|
+
);
|
|
416
|
+
} else {
|
|
417
|
+
const tasks: ListrTask<IContext>[] = ctx.files.map((filePath) => ({
|
|
418
|
+
task: async (ctx: IContext, subtask) => {
|
|
419
|
+
const relFilePath = path.relative(pathWithoutAppAndVer, filePath);
|
|
420
|
+
|
|
421
|
+
const origTitle = relFilePath;
|
|
422
|
+
subtask.title = RUNNING + origTitle;
|
|
423
|
+
|
|
424
|
+
const upload = new Upload({
|
|
425
|
+
client: s3Client,
|
|
426
|
+
leavePartsOnError: false,
|
|
427
|
+
params: {
|
|
428
|
+
Bucket: bucketName,
|
|
429
|
+
Key: path.relative(S3Uploader.TempDir, filePath),
|
|
430
|
+
Body: createReadStream(filePath),
|
|
431
|
+
ContentType:
|
|
432
|
+
contentType(path.basename(filePath)) || 'application/octet-stream',
|
|
433
|
+
CacheControl,
|
|
434
|
+
},
|
|
435
|
+
});
|
|
436
|
+
await upload.done();
|
|
437
|
+
|
|
438
|
+
subtask.title = origTitle;
|
|
439
|
+
},
|
|
440
|
+
}));
|
|
441
|
+
|
|
442
|
+
task.title = origTitle;
|
|
443
|
+
|
|
444
|
+
return task.newListr(tasks, {
|
|
445
|
+
concurrent: 20,
|
|
446
|
+
rendererOptions: {
|
|
447
|
+
clearOutput: false,
|
|
448
|
+
showErrorMessage: true,
|
|
449
|
+
showTimer: true,
|
|
450
|
+
},
|
|
451
|
+
});
|
|
452
|
+
}
|
|
410
453
|
},
|
|
411
454
|
},
|
|
412
455
|
{
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { S3TransferUtility } from './S3TransferUtility';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
|
|
4
|
+
describe('S3TransferUtility', () => {
|
|
5
|
+
it('collects the files', () => {
|
|
6
|
+
const testFilesRoot = path.join(__dirname, '../../tests/files');
|
|
7
|
+
const files = S3TransferUtility.GetFiles(path.join(__dirname, '../../tests/files'));
|
|
8
|
+
|
|
9
|
+
expect(files).toBeDefined();
|
|
10
|
+
expect(files).toHaveLength(6);
|
|
11
|
+
|
|
12
|
+
const relativeFiles = files.map((file) => path.relative(testFilesRoot, file));
|
|
13
|
+
expect(relativeFiles).toMatchSnapshot();
|
|
14
|
+
});
|
|
15
|
+
});
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// From: https://stackoverflow.com/a/65862128/878903
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import {
|
|
5
|
+
import { createReadStream, readdirSync } from 'fs';
|
|
6
6
|
import * as path from 'path';
|
|
7
7
|
import * as s3 from '@aws-sdk/client-s3';
|
|
8
8
|
import { Upload } from '@aws-sdk/lib-storage';
|
|
@@ -10,7 +10,7 @@ import type { IDeployVersionPreflightResponse } from '@pwrdrvr/microapps-deploye
|
|
|
10
10
|
import { contentType } from 'mime-types';
|
|
11
11
|
import pMap from 'p-map';
|
|
12
12
|
|
|
13
|
-
export
|
|
13
|
+
export class S3TransferUtility {
|
|
14
14
|
/**
|
|
15
15
|
* @deprecated 2021-11-27
|
|
16
16
|
*
|
|
@@ -36,7 +36,7 @@ export default class S3TransferUtility {
|
|
|
36
36
|
});
|
|
37
37
|
|
|
38
38
|
// console.log('Uploading files to S3');
|
|
39
|
-
const files =
|
|
39
|
+
const files = S3TransferUtility.GetFiles(s3Path);
|
|
40
40
|
// const pathWithoutAppAndVer = path.join(s3Path, destPrefixPath);
|
|
41
41
|
// for (const filePath of files) {
|
|
42
42
|
// const relFilePath = path.relative(pathWithoutAppAndVer, filePath);
|
|
@@ -82,14 +82,32 @@ export default class S3TransferUtility {
|
|
|
82
82
|
* @param dir
|
|
83
83
|
* @returns
|
|
84
84
|
*/
|
|
85
|
-
public static
|
|
86
|
-
const dirents =
|
|
87
|
-
const files =
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
85
|
+
public static GetFiles(dir: string): string[] {
|
|
86
|
+
const dirents = readdirSync(dir, { withFileTypes: true });
|
|
87
|
+
const files: string[] = [];
|
|
88
|
+
const toScan = dirents.map((dirent) => ({
|
|
89
|
+
path: path.resolve(dir, dirent.name),
|
|
90
|
+
isDirectory: dirent.isDirectory(),
|
|
91
|
+
}));
|
|
92
|
+
|
|
93
|
+
// Iteratively collect all the files in the directories
|
|
94
|
+
// Do not use function call recursion
|
|
95
|
+
while (toScan.length > 0) {
|
|
96
|
+
const dirOrFile = toScan.pop();
|
|
97
|
+
|
|
98
|
+
if (dirOrFile.isDirectory) {
|
|
99
|
+
const direntsChild = readdirSync(dirOrFile.path, { withFileTypes: true });
|
|
100
|
+
const toScanChild = direntsChild.map((dirent) => ({
|
|
101
|
+
path: path.resolve(dirOrFile.path, dirent.name),
|
|
102
|
+
isDirectory: dirent.isDirectory(),
|
|
103
|
+
}));
|
|
104
|
+
Array.prototype.push.apply(toScan, toScanChild);
|
|
105
|
+
} else {
|
|
106
|
+
files.push(dirOrFile.path);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
// Reverse the array so that the files are in the same order as the original
|
|
111
|
+
return files.reverse();
|
|
94
112
|
}
|
|
95
113
|
}
|
package/src/lib/S3Uploader.ts
CHANGED
|
@@ -2,9 +2,9 @@ import * as path from 'path';
|
|
|
2
2
|
import type { IDeployVersionPreflightResponse } from '@pwrdrvr/microapps-deployer-lib';
|
|
3
3
|
import * as fs from 'fs-extra';
|
|
4
4
|
import { IConfig } from '../config/Config';
|
|
5
|
-
import S3TransferUtility from './S3TransferUtility';
|
|
5
|
+
import { S3TransferUtility } from './S3TransferUtility';
|
|
6
6
|
|
|
7
|
-
export
|
|
7
|
+
export class S3Uploader {
|
|
8
8
|
/**
|
|
9
9
|
* Copy files to local upload directory
|
|
10
10
|
* @param config
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
|
2
|
+
|
|
3
|
+
exports[`S3TransferUtility collects the files 1`] = `
|
|
4
|
+
[
|
|
5
|
+
"dir1/.touch",
|
|
6
|
+
"dir2/dir21/dir211/some211-1.json",
|
|
7
|
+
"dir2/dir21/dir211/some211-2.json",
|
|
8
|
+
"dir2/dir21/some21.json",
|
|
9
|
+
"dir2/dir22/some22.json",
|
|
10
|
+
"some.json",
|
|
11
|
+
]
|
|
12
|
+
`;
|