@remotion/lambda 3.0.0-lambda.135 → 3.0.0-lambda.151

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.
Files changed (210) hide show
  1. package/.prettierrc.js +15 -0
  2. package/dist/admin/make-layer-public.js +1 -12
  3. package/dist/admin/make-layer-public.js.map +1 -1
  4. package/dist/admin/replicate-binaries.d.ts +2 -0
  5. package/dist/admin/replicate-binaries.d.ts.map +1 -0
  6. package/dist/admin/replicate-binaries.js +50 -0
  7. package/dist/admin/replicate-binaries.js.map +1 -0
  8. package/dist/api/bucket-exists.d.ts +1 -1
  9. package/dist/api/bucket-exists.d.ts.map +1 -1
  10. package/dist/api/bundle-lambda.d.ts +2 -0
  11. package/dist/api/bundle-lambda.d.ts.map +1 -0
  12. package/dist/api/bundle-lambda.js +34 -0
  13. package/dist/api/bundle-lambda.js.map +1 -0
  14. package/dist/api/bundle-remotion.d.ts +6 -0
  15. package/dist/api/bundle-remotion.d.ts.map +1 -0
  16. package/dist/api/bundle-remotion.js +12 -0
  17. package/dist/api/bundle-remotion.js.map +1 -0
  18. package/dist/api/create-bucket.d.ts +1 -1
  19. package/dist/api/create-bucket.d.ts.map +1 -1
  20. package/dist/api/create-function.d.ts +1 -1
  21. package/dist/api/create-function.d.ts.map +1 -1
  22. package/dist/api/create-function.js +1 -0
  23. package/dist/api/create-function.js.map +1 -1
  24. package/dist/api/delete-site.d.ts +1 -1
  25. package/dist/api/delete-site.d.ts.map +1 -1
  26. package/dist/api/deploy-function.js +2 -2
  27. package/dist/api/deploy-function.js.map +1 -1
  28. package/dist/api/deploy-lambda.d.ts +7 -0
  29. package/dist/api/deploy-lambda.d.ts.map +1 -0
  30. package/dist/api/deploy-lambda.js +48 -0
  31. package/dist/api/deploy-lambda.js.map +1 -0
  32. package/dist/api/deploy-project.d.ts +28 -0
  33. package/dist/api/deploy-project.d.ts.map +1 -0
  34. package/dist/api/deploy-project.js +58 -0
  35. package/dist/api/deploy-project.js.map +1 -0
  36. package/dist/api/download-video.d.ts +2 -0
  37. package/dist/api/download-video.d.ts.map +1 -1
  38. package/dist/api/download-video.js +14 -25
  39. package/dist/api/download-video.js.map +1 -1
  40. package/dist/api/enable-s3-website.d.ts +1 -1
  41. package/dist/api/enable-s3-website.d.ts.map +1 -1
  42. package/dist/api/ensure-lambda-binaries.d.ts +11 -0
  43. package/dist/api/ensure-lambda-binaries.d.ts.map +1 -0
  44. package/dist/api/ensure-lambda-binaries.js +60 -0
  45. package/dist/api/ensure-lambda-binaries.js.map +1 -0
  46. package/dist/api/get-deployed-lambdas.d.ts +10 -0
  47. package/dist/api/get-deployed-lambdas.d.ts.map +1 -0
  48. package/dist/api/get-deployed-lambdas.js +31 -0
  49. package/dist/api/get-deployed-lambdas.js.map +1 -0
  50. package/dist/api/get-function-version.d.ts +7 -0
  51. package/dist/api/get-function-version.d.ts.map +1 -0
  52. package/dist/api/get-function-version.js +27 -0
  53. package/dist/api/get-function-version.js.map +1 -0
  54. package/dist/api/mock-functions.d.ts +1 -1
  55. package/dist/api/mock-functions.d.ts.map +1 -1
  56. package/dist/api/upload-dir.d.ts +1 -1
  57. package/dist/api/upload-dir.d.ts.map +1 -1
  58. package/dist/benchmark.d.ts +2 -0
  59. package/dist/benchmark.d.ts.map +1 -0
  60. package/dist/benchmark.js +30 -0
  61. package/dist/benchmark.js.map +1 -0
  62. package/dist/build-render/index.js +126181 -0
  63. package/dist/chunked-upload.d.ts +2 -0
  64. package/dist/chunked-upload.d.ts.map +1 -0
  65. package/dist/chunked-upload.js +34 -0
  66. package/dist/chunked-upload.js.map +1 -0
  67. package/dist/cli/cleanup.d.ts +3 -1
  68. package/dist/cli/cleanup.d.ts.map +1 -1
  69. package/dist/cli/cleanup.js +74 -0
  70. package/dist/cli/cleanup.js.map +1 -1
  71. package/dist/cli/commands/render/progress.d.ts +7 -3
  72. package/dist/cli/commands/render/progress.d.ts.map +1 -1
  73. package/dist/cli/commands/render/progress.js +9 -10
  74. package/dist/cli/commands/render/progress.js.map +1 -1
  75. package/dist/cli/commands/render/render.d.ts.map +1 -1
  76. package/dist/cli/commands/render/render.js +22 -8
  77. package/dist/cli/commands/render/render.js.map +1 -1
  78. package/dist/cli/commands/render.d.ts +3 -0
  79. package/dist/cli/commands/render.d.ts.map +1 -0
  80. package/dist/cli/commands/render.js +75 -0
  81. package/dist/cli/commands/render.js.map +1 -0
  82. package/dist/cli/commands/sites/upload.d.ts +3 -0
  83. package/dist/cli/commands/sites/upload.d.ts.map +1 -0
  84. package/dist/cli/commands/sites/upload.js +111 -0
  85. package/dist/cli/commands/sites/upload.js.map +1 -0
  86. package/dist/cli/deploy.d.ts +3 -0
  87. package/dist/cli/deploy.d.ts.map +1 -0
  88. package/dist/cli/deploy.js +13 -0
  89. package/dist/cli/deploy.js.map +1 -0
  90. package/dist/cli/get-aws-region.js +2 -2
  91. package/dist/cli/get-aws-region.js.map +1 -1
  92. package/dist/cli/policies.d.ts +3 -0
  93. package/dist/cli/policies.d.ts.map +1 -0
  94. package/dist/cli/policies.js +59 -0
  95. package/dist/cli/policies.js.map +1 -0
  96. package/dist/cli/render.d.ts +3 -0
  97. package/dist/cli/render.d.ts.map +1 -0
  98. package/dist/cli/render.js +96 -0
  99. package/dist/cli/render.js.map +1 -0
  100. package/dist/cli/upload.d.ts +3 -0
  101. package/dist/cli/upload.d.ts.map +1 -0
  102. package/dist/cli/upload.js +112 -0
  103. package/dist/cli/upload.js.map +1 -0
  104. package/dist/functions/chunk-optimization/write-profile.d.ts +8 -0
  105. package/dist/functions/chunk-optimization/write-profile.d.ts.map +1 -0
  106. package/dist/functions/chunk-optimization/write-profile.js +18 -0
  107. package/dist/functions/chunk-optimization/write-profile.js.map +1 -0
  108. package/dist/functions/get-progress.d.ts +27 -0
  109. package/dist/functions/get-progress.d.ts.map +1 -0
  110. package/dist/functions/get-progress.js +161 -0
  111. package/dist/functions/get-progress.js.map +1 -0
  112. package/dist/functions/helpers/calculate-chunk-times.js +5 -5
  113. package/dist/functions/helpers/calculate-chunk-times.js.map +1 -1
  114. package/dist/functions/helpers/clean-tmpdir.d.ts.map +1 -1
  115. package/dist/functions/helpers/clean-tmpdir.js +1 -0
  116. package/dist/functions/helpers/clean-tmpdir.js.map +1 -1
  117. package/dist/functions/helpers/concat-videos.d.ts.map +1 -1
  118. package/dist/functions/helpers/concat-videos.js +3 -5
  119. package/dist/functions/helpers/concat-videos.js.map +1 -1
  120. package/dist/functions/helpers/create-post-render-data.js +1 -1
  121. package/dist/functions/helpers/create-post-render-data.js.map +1 -1
  122. package/dist/functions/helpers/expected-out-name.d.ts.map +1 -1
  123. package/dist/functions/helpers/expected-out-name.js +2 -1
  124. package/dist/functions/helpers/expected-out-name.js.map +1 -1
  125. package/dist/functions/helpers/get-browser-instance.d.ts +2 -2
  126. package/dist/functions/helpers/get-browser-instance.d.ts.map +1 -1
  127. package/dist/functions/helpers/get-browser-instance.js +1 -1
  128. package/dist/functions/helpers/get-browser-instance.js.map +1 -1
  129. package/dist/functions/helpers/get-current-region.d.ts +1 -1
  130. package/dist/functions/helpers/get-current-region.d.ts.map +1 -1
  131. package/dist/functions/helpers/get-current-region.js +2 -2
  132. package/dist/functions/helpers/get-current-region.js.map +1 -1
  133. package/dist/functions/helpers/get-lambdas-invoked-stats.d.ts.map +1 -1
  134. package/dist/functions/helpers/get-lambdas-invoked-stats.js +3 -2
  135. package/dist/functions/helpers/get-lambdas-invoked-stats.js.map +1 -1
  136. package/dist/functions/helpers/read-with-progress.d.ts +15 -0
  137. package/dist/functions/helpers/read-with-progress.d.ts.map +1 -0
  138. package/dist/functions/helpers/read-with-progress.js +27 -0
  139. package/dist/functions/helpers/read-with-progress.js.map +1 -0
  140. package/dist/functions/helpers/validate-composition.d.ts +2 -2
  141. package/dist/functions/helpers/validate-composition.d.ts.map +1 -1
  142. package/dist/functions/helpers/validate-composition.js +1 -1
  143. package/dist/functions/helpers/validate-composition.js.map +1 -1
  144. package/dist/functions/launch.d.ts.map +1 -1
  145. package/dist/functions/launch.js +2 -1
  146. package/dist/functions/launch.js.map +1 -1
  147. package/dist/functions/renderer.d.ts.map +1 -1
  148. package/dist/functions/renderer.js +16 -48
  149. package/dist/functions/renderer.js.map +1 -1
  150. package/dist/functions/still.d.ts.map +1 -1
  151. package/dist/functions/still.js +0 -1
  152. package/dist/functions/still.js.map +1 -1
  153. package/dist/pricing/aws-regions.d.ts +1 -1
  154. package/dist/pricing/aws-regions.d.ts.map +1 -1
  155. package/dist/pricing/aws-regions.js +3 -14
  156. package/dist/pricing/aws-regions.js.map +1 -1
  157. package/dist/pricing/price-per-1-s.d.ts +8 -0
  158. package/dist/pricing/price-per-1-s.d.ts.map +1 -1
  159. package/dist/pricing/price-per-1-s.js +72 -190
  160. package/dist/pricing/price-per-1-s.js.map +1 -1
  161. package/dist/rendering/chunked-concatenation.d.ts +3 -0
  162. package/dist/rendering/chunked-concatenation.d.ts.map +1 -0
  163. package/dist/rendering/chunked-concatenation.js +38 -0
  164. package/dist/rendering/chunked-concatenation.js.map +1 -0
  165. package/dist/rendering/create-named-pipe.d.ts +8 -0
  166. package/dist/rendering/create-named-pipe.d.ts.map +1 -0
  167. package/dist/rendering/create-named-pipe.js +41 -0
  168. package/dist/rendering/create-named-pipe.js.map +1 -0
  169. package/dist/rendering/mount-tmp-fs.d.ts +2 -0
  170. package/dist/rendering/mount-tmp-fs.d.ts.map +1 -0
  171. package/dist/rendering/mount-tmp-fs.js +19 -0
  172. package/dist/rendering/mount-tmp-fs.js.map +1 -0
  173. package/dist/scripts2.d.ts +1 -0
  174. package/dist/scripts2.d.ts.map +1 -0
  175. package/dist/scripts2.js +2 -0
  176. package/dist/scripts2.js.map +1 -0
  177. package/dist/shared/constants.d.ts +3 -5
  178. package/dist/shared/constants.d.ts.map +1 -1
  179. package/dist/shared/constants.js +4 -6
  180. package/dist/shared/constants.js.map +1 -1
  181. package/dist/shared/download-with-progress.d.ts +1 -0
  182. package/dist/shared/download-with-progress.d.ts.map +1 -0
  183. package/dist/shared/download-with-progress.js +2 -0
  184. package/dist/shared/download-with-progress.js.map +1 -0
  185. package/dist/shared/hosted-layers.d.ts +1 -1
  186. package/dist/shared/hosted-layers.d.ts.map +1 -1
  187. package/dist/shared/hosted-layers.js +30 -184
  188. package/dist/shared/hosted-layers.js.map +1 -1
  189. package/dist/shared/parse-chunk-timing-key.d.ts +7 -0
  190. package/dist/shared/parse-chunk-timing-key.d.ts.map +1 -0
  191. package/dist/shared/parse-chunk-timing-key.js +17 -0
  192. package/dist/shared/parse-chunk-timing-key.js.map +1 -0
  193. package/dist/shared/parse-lambda-timings-key.d.ts +0 -1
  194. package/dist/shared/parse-lambda-timings-key.d.ts.map +1 -1
  195. package/dist/shared/parse-lambda-timings-key.js +1 -2
  196. package/dist/shared/parse-lambda-timings-key.js.map +1 -1
  197. package/package.json +12 -11
  198. package/remotionlambda.zip +0 -0
  199. package/dist/cli/helpers/__mocks__.d.ts +0 -2
  200. package/dist/cli/helpers/__mocks__.d.ts.map +0 -1
  201. package/dist/cli/helpers/__mocks__.js +0 -8
  202. package/dist/cli/helpers/__mocks__.js.map +0 -1
  203. package/dist/functions/helpers/upload-logs.d.ts +0 -1
  204. package/dist/functions/helpers/upload-logs.d.ts.map +0 -1
  205. package/dist/functions/helpers/upload-logs.js +0 -2
  206. package/dist/functions/helpers/upload-logs.js.map +0 -1
  207. package/dist/shared/normalize-serve-url.d.ts +0 -2
  208. package/dist/shared/normalize-serve-url.d.ts.map +0 -1
  209. package/dist/shared/normalize-serve-url.js +0 -20
  210. package/dist/shared/normalize-serve-url.js.map +0 -1
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=chunked-upload.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"chunked-upload.d.ts","sourceRoot":"","sources":["../src/chunked-upload.ts"],"names":[],"mappings":""}
@@ -0,0 +1,34 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ const execa_1 = __importDefault(require("execa"));
7
+ const xns_1 = __importDefault(require("xns"));
8
+ xns_1.default(async () => {
9
+ var _a;
10
+ // const pipes = await Promise.all(
11
+ // new Array(5).fill(true).map(async (p, i) => {
12
+ // await execa('mkfifo');
13
+ // return execa('ffmpeg', ['-i', `out${i + 1}.mp4`, '-c']);
14
+ // })
15
+ // );
16
+ const prom = execa_1.default('ffmpeg', [
17
+ '-f',
18
+ 'mpegts',
19
+ '-i',
20
+ '"concat:temp1|temp2"',
21
+ '-f',
22
+ 'h264',
23
+ '-c:v',
24
+ 'copy',
25
+ '-c:a',
26
+ 'aac',
27
+ '-',
28
+ ]);
29
+ (_a = prom.stdout) === null || _a === void 0 ? void 0 : _a.on('data', (d) => {
30
+ console.log({ d });
31
+ });
32
+ await prom;
33
+ });
34
+ //# sourceMappingURL=chunked-upload.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"chunked-upload.js","sourceRoot":"","sources":["../src/chunked-upload.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,8CAAsB;AAEtB,aAAG,CAAC,KAAK,IAAI,EAAE;;IACd,mCAAmC;IACnC,iDAAiD;IACjD,2BAA2B;IAC3B,6DAA6D;IAC7D,MAAM;IACN,KAAK;IACL,MAAM,IAAI,GAAG,eAAK,CAAC,QAAQ,EAAE;QAC5B,IAAI;QACJ,QAAQ;QACR,IAAI;QACJ,sBAAsB;QACtB,IAAI;QACJ,MAAM;QACN,MAAM;QACN,MAAM;QACN,MAAM;QACN,KAAK;QACL,GAAG;KACH,CAAC,CAAC;IAEH,MAAA,IAAI,CAAC,MAAM,0CAAE,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;QAC7B,OAAO,CAAC,GAAG,CAAC,EAAC,CAAC,EAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,MAAM,IAAI,CAAC;AACZ,CAAC,CAAC,CAAC"}
@@ -1,2 +1,4 @@
1
- export {};
1
+ export declare const CLEANUP_COMMAND = "cleanup";
2
+ export declare const CLEANUP_LAMBDAS_SUBCOMMAND = "lambdas";
3
+ export declare const cleanupCommand: (args: string[]) => Promise<void>;
2
4
  //# sourceMappingURL=cleanup.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"cleanup.d.ts","sourceRoot":"","sources":["../../src/cli/cleanup.ts"],"names":[],"mappings":""}
1
+ {"version":3,"file":"cleanup.d.ts","sourceRoot":"","sources":["../../src/cli/cleanup.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,eAAe,YAAY,CAAC;AACzC,eAAO,MAAM,0BAA0B,YAAY,CAAC;AA4BpD,eAAO,MAAM,cAAc,SAAgB,MAAM,EAAE,kBAyElD,CAAC"}
@@ -1,3 +1,77 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.cleanupCommand = exports.CLEANUP_LAMBDAS_SUBCOMMAND = exports.CLEANUP_COMMAND = void 0;
4
+ const cli_1 = require("@remotion/cli");
5
+ const get_buckets_1 = require("../api/get-buckets");
6
+ const get_functions_1 = require("../api/get-functions");
7
+ const cleanup_lambdas_1 = require("../cleanup/cleanup-lambdas");
8
+ const s3_buckets_1 = require("../cleanup/s3-buckets");
9
+ const chunk_1 = require("../shared/chunk");
10
+ const constants_1 = require("../shared/constants");
11
+ const get_account_id_1 = require("../shared/get-account-id");
12
+ const get_aws_region_1 = require("./get-aws-region");
13
+ const log_1 = require("./log");
14
+ exports.CLEANUP_COMMAND = 'cleanup';
15
+ exports.CLEANUP_LAMBDAS_SUBCOMMAND = 'lambdas';
16
+ const CLEANUP_S3_BUCKETS_SUBCOMMAND = 'buckets';
17
+ const cleanupLambdaCommand = async (region) => {
18
+ await (0, cleanup_lambdas_1.cleanupLambdas)({
19
+ region,
20
+ onAfterDelete: (lambdaName) => log_1.Log.info(cli_1.CliInternals.chalk.blue(`Deleted ${lambdaName}`)),
21
+ });
22
+ log_1.Log.info('All Remotion-related lambdas deleted.');
23
+ };
24
+ const cleanupBucketsCommand = async (region) => {
25
+ await (0, s3_buckets_1.cleanUpBuckets)({
26
+ region,
27
+ onBeforeBucketDeleted: (bucketName) => {
28
+ log_1.Log.info(`Deleting items of ${bucketName}`);
29
+ },
30
+ onAfterItemDeleted: ({ itemName }) => {
31
+ log_1.Log.info(cli_1.CliInternals.chalk.gray(` Deleting item ${itemName}`));
32
+ },
33
+ onAfterBucketDeleted: (bucketName) => log_1.Log.info(cli_1.CliInternals.chalk.blue(`Deleted bucket ${bucketName}.`)),
34
+ expectedBucketOwner: await (0, get_account_id_1.getAccountId)({ region }),
35
+ });
36
+ log_1.Log.info('All Remotion-related buckets deleted.');
37
+ };
38
+ const cleanupCommand = async (args) => {
39
+ const region = (0, get_aws_region_1.getAwsRegion)();
40
+ if (args[0] === exports.CLEANUP_LAMBDAS_SUBCOMMAND) {
41
+ await cleanupLambdaCommand((0, get_aws_region_1.getAwsRegion)());
42
+ return;
43
+ }
44
+ if (args[0] === CLEANUP_S3_BUCKETS_SUBCOMMAND) {
45
+ await cleanupBucketsCommand((0, get_aws_region_1.getAwsRegion)());
46
+ return;
47
+ }
48
+ const fetching = cli_1.CliInternals.createOverwriteableCliOutput();
49
+ fetching.update('Fetching AWS account...');
50
+ const [{ remotionBuckets }, lambdas] = await Promise.all([
51
+ (0, get_buckets_1.getRemotionS3Buckets)(region),
52
+ (0, get_functions_1.getFunctions)({ region, compatibleOnly: false }),
53
+ ]);
54
+ if (remotionBuckets.length === 0 && lambdas.length === 0) {
55
+ fetching.update(`Your AWS account in ${region} contains no following Remotion-related resources.\n`);
56
+ return;
57
+ }
58
+ fetching.update(`Your AWS account in ${region} contains the following Remotion-related resources:\n\n`);
59
+ if (remotionBuckets.length !== 0) {
60
+ log_1.Log.info(`${remotionBuckets.length} ${remotionBuckets.length === 1 ? 'bucket' : 'buckets'}:`);
61
+ log_1.Log.info(`${(0, chunk_1.chunk)(remotionBuckets, 2)
62
+ .map((b) => cli_1.CliInternals.chalk.blue(b.map((a) => a.name.padEnd(40, ' ')).join(' ')))
63
+ .join('\n')}`);
64
+ log_1.Log.info(cli_1.CliInternals.chalk.gray(`Run \`${constants_1.BINARY_NAME} ${exports.CLEANUP_COMMAND} ${CLEANUP_S3_BUCKETS_SUBCOMMAND}\` to permanently delete S3 buckets`));
65
+ log_1.Log.info();
66
+ }
67
+ if (lambdas.length > 0) {
68
+ log_1.Log.info(`${lambdas.length} ${lambdas.length === 1 ? 'lambda' : 'lambdas'}:`);
69
+ log_1.Log.info(`${(0, chunk_1.chunk)(lambdas, 2)
70
+ .map((b) => cli_1.CliInternals.chalk.blue(b.map((a) => { var _a; return ((_a = a.functionName) !== null && _a !== void 0 ? _a : '').padEnd(40, ' '); }).join(' ')))
71
+ .join('\n')}`);
72
+ log_1.Log.info(cli_1.CliInternals.chalk.gray(`Run \`${constants_1.BINARY_NAME} ${exports.CLEANUP_COMMAND} ${exports.CLEANUP_LAMBDAS_SUBCOMMAND}\` to permanently delete lambdas`));
73
+ log_1.Log.info();
74
+ }
75
+ };
76
+ exports.cleanupCommand = cleanupCommand;
3
77
  //# sourceMappingURL=cleanup.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../src/cli/cleanup.ts"],"names":[],"mappings":""}
1
+ {"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../src/cli/cleanup.ts"],"names":[],"mappings":"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"}
@@ -18,11 +18,15 @@ export declare type MultiRenderProgress = {
18
18
  cleanupInfo: CleanupInfo | null;
19
19
  };
20
20
  export declare const makeMultiProgressFromStatus: (status: RenderProgress) => MultiRenderProgress;
21
- export declare const makeProgressString: ({ outName, progress, steps, isDownloaded, errors, retriesInfo, }: {
22
- outName: string | null;
21
+ declare type DownloadedInfo = {
22
+ totalSize: number;
23
+ downloaded: number;
24
+ doneIn: number | null;
25
+ };
26
+ export declare const makeProgressString: ({ progress, steps, downloadInfo, errors, retriesInfo, }: {
23
27
  progress: MultiRenderProgress;
24
28
  steps: number;
25
- isDownloaded: boolean;
29
+ downloadInfo: DownloadedInfo | null;
26
30
  errors: EnhancedErrorInfo[];
27
31
  retriesInfo: ChunkRetry[];
28
32
  }) => string;
@@ -1 +1 @@
1
- {"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/render/progress.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAE,gBAAgB,EAAE,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAAC,UAAU,EAAC,MAAM,4CAA4C,CAAC;AACtE,OAAO,EAAC,iBAAiB,EAAC,MAAM,+CAA+C,CAAC;AAEhF,aAAK,oBAAoB,GAAG;IAC3B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAEF,aAAK,aAAa,GAAG;IACpB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAEF,oBAAY,mBAAmB,GAAG;IACjC,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,aAAa,EAAE,aAAa,CAAC;IAC7B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;CAChC,CAAC;AAkHF,eAAO,MAAM,2BAA2B,WAC/B,cAAc,KACpB,mBAqBF,CAAC;AA2BF,eAAO,MAAM,kBAAkB;aAQrB,MAAM,GAAG,IAAI;cACZ,mBAAmB;WACtB,MAAM;kBACC,OAAO;YACb,iBAAiB,EAAE;iBACd,UAAU,EAAE;YAsBzB,CAAC"}
1
+ {"version":3,"file":"progress.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/render/progress.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,WAAW,EAAE,gBAAgB,EAAE,cAAc,EAAC,MAAM,mBAAmB,CAAC;AAChF,OAAO,EAAC,UAAU,EAAC,MAAM,4CAA4C,CAAC;AACtE,OAAO,EAAC,iBAAiB,EAAC,MAAM,+CAA+C,CAAC;AAGhF,aAAK,oBAAoB,GAAG;IAC3B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAEF,aAAK,aAAa,GAAG;IACpB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAEF,oBAAY,mBAAmB,GAAG;IACjC,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,aAAa,EAAE,aAAa,CAAC;IAC7B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,WAAW,EAAE,WAAW,GAAG,IAAI,CAAC;CAChC,CAAC;AAyHF,eAAO,MAAM,2BAA2B,WAC/B,cAAc,KACpB,mBAqBF,CAAC;AA2BF,aAAK,cAAc,GAAG;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,kBAAkB;cAOpB,mBAAmB;WACtB,MAAM;kBACC,cAAc,GAAG,IAAI;YAC3B,iBAAiB,EAAE;iBACd,UAAU,EAAE;YAoBzB,CAAC"}
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.makeProgressString = exports.makeMultiProgressFromStatus = void 0;
4
4
  const cli_1 = require("@remotion/cli");
5
5
  const remotion_1 = require("remotion");
6
+ const format_bytes_1 = require("../../helpers/format-bytes");
6
7
  const makeInvokeProgress = (invokeProgress, totalSteps, retriesInfo) => {
7
8
  const { lambdasInvoked, totalLambdas, doneIn } = invokeProgress;
8
9
  const progress = doneIn
@@ -73,15 +74,15 @@ const makeCleanupProgress = (cleanupInfo, totalSteps) => {
73
74
  : cli_1.CliInternals.chalk.gray(`${doneIn}ms`),
74
75
  ].join(' ');
75
76
  };
76
- const makeDownloadProgress = (totalSteps, downloadedYet) => {
77
+ const makeDownloadProgress = (downloadInfo, totalSteps) => {
77
78
  return [
78
79
  '💾',
79
80
  `(5/${totalSteps})`,
80
- // TODO: More granularly
81
- cli_1.CliInternals.makeProgressBar(Number(downloadedYet)),
82
- `${downloadedYet ? 'Downloaded' : 'Downloading'} video`,
83
- // TODO
84
- downloadedYet ? cli_1.CliInternals.chalk.gray('TODOms') : '0%',
81
+ cli_1.CliInternals.makeProgressBar(downloadInfo.downloaded / downloadInfo.totalSize),
82
+ `${downloadInfo.doneIn === null ? 'Downloading' : 'Downloaded'} video`,
83
+ downloadInfo.doneIn === null
84
+ ? `${(0, format_bytes_1.formatBytes)(downloadInfo.downloaded)}/${(0, format_bytes_1.formatBytes)(downloadInfo.totalSize)}`
85
+ : cli_1.CliInternals.chalk.gray(`${downloadInfo.doneIn}ms`),
85
86
  ].join(' ');
86
87
  };
87
88
  const makeMultiProgressFromStatus = (status) => {
@@ -127,7 +128,7 @@ const makeErrors = (errors) => {
127
128
  })
128
129
  .join('\n');
129
130
  };
130
- const makeProgressString = ({ outName, progress, steps, isDownloaded, errors, retriesInfo, }) => {
131
+ const makeProgressString = ({ progress, steps, downloadInfo, errors, retriesInfo, }) => {
131
132
  return [
132
133
  makeInvokeProgress(progress.lambdaInvokeProgress, steps, retriesInfo),
133
134
  makeChunkProgress({
@@ -142,9 +143,7 @@ const makeProgressString = ({ outName, progress, steps, isDownloaded, errors, re
142
143
  totalSteps: steps,
143
144
  }),
144
145
  makeCleanupProgress(progress.cleanupInfo, steps),
145
- outName && progress.encodingProgress.doneIn
146
- ? makeDownloadProgress(steps, isDownloaded)
147
- : null,
146
+ downloadInfo ? makeDownloadProgress(downloadInfo, steps) : null,
148
147
  ]
149
148
  .filter(remotion_1.Internals.truthy)
150
149
  .join('\n');
@@ -1 +1 @@
1
- {"version":3,"file":"progress.js","sourceRoot":"","sources":["../../../../src/cli/commands/render/progress.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"progress.js","sourceRoot":"","sources":["../../../../src/cli/commands/render/progress.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/render/render.ts"],"names":[],"mappings":"AAuBA,eAAO,MAAM,cAAc,WAAW,CAAC;AAEvC,eAAO,MAAM,aAAa,SAAgB,MAAM,EAAE,kBAqLjD,CAAC"}
1
+ {"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/render/render.ts"],"names":[],"mappings":"AAuBA,eAAO,MAAM,cAAc,WAAW,CAAC;AAEvC,eAAO,MAAM,aAAa,SAAgB,MAAM,EAAE,kBAqMjD,CAAC"}
@@ -86,10 +86,9 @@ const renderCommand = async (args) => {
86
86
  const multiProgress = (0, progress_1.makeMultiProgressFromStatus)(status);
87
87
  progressBar.update((0, progress_1.makeProgressString)({
88
88
  progress: multiProgress,
89
- outName,
90
89
  errors: status.errors,
91
90
  steps: totalSteps,
92
- isDownloaded: false,
91
+ downloadInfo: null,
93
92
  retriesInfo: status.retriesInfo,
94
93
  }));
95
94
  for (let i = 0; i < 3000; i++) {
@@ -102,37 +101,52 @@ const renderCommand = async (args) => {
102
101
  });
103
102
  const newProgress = (0, progress_1.makeMultiProgressFromStatus)(newStatus);
104
103
  progressBar.update((0, progress_1.makeProgressString)({
105
- outName,
106
104
  progress: newProgress,
107
105
  steps: totalSteps,
108
- isDownloaded: false,
109
106
  errors: newStatus.errors,
110
107
  retriesInfo: newStatus.retriesInfo,
108
+ downloadInfo: null,
111
109
  }));
112
110
  // Log.info(newStatus);
113
111
  if (newStatus.done) {
114
112
  progressBar.update((0, progress_1.makeProgressString)({
115
- outName,
116
113
  progress: newProgress,
117
114
  steps: totalSteps,
118
- isDownloaded: false,
115
+ downloadInfo: null,
119
116
  errors: newStatus.errors,
120
117
  retriesInfo: newStatus.retriesInfo,
121
118
  }));
122
119
  if (outName) {
120
+ const downloadStart = Date.now();
123
121
  const { outputPath, sizeInBytes } = await (0, download_video_1.downloadVideo)({
124
122
  bucketName: res.bucketName,
125
123
  outPath: outName,
126
124
  region: (0, get_aws_region_1.getAwsRegion)(),
127
125
  renderId: res.renderId,
126
+ onProgress: ({ downloaded, totalSize }) => {
127
+ progressBar.update((0, progress_1.makeProgressString)({
128
+ progress: newProgress,
129
+ steps: totalSteps,
130
+ errors: newStatus.errors,
131
+ retriesInfo: newStatus.retriesInfo,
132
+ downloadInfo: {
133
+ doneIn: null,
134
+ downloaded,
135
+ totalSize,
136
+ },
137
+ }));
138
+ },
128
139
  });
129
140
  progressBar.update((0, progress_1.makeProgressString)({
130
- outName,
131
141
  progress: newProgress,
132
142
  steps: totalSteps,
133
- isDownloaded: true,
134
143
  errors: newStatus.errors,
135
144
  retriesInfo: newStatus.retriesInfo,
145
+ downloadInfo: {
146
+ doneIn: Date.now() - downloadStart,
147
+ downloaded: sizeInBytes,
148
+ totalSize: sizeInBytes,
149
+ },
136
150
  }));
137
151
  log_1.Log.info();
138
152
  log_1.Log.info();
@@ -1 +1 @@
1
- {"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../src/cli/commands/render/render.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../src/cli/commands/render/render.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,3 @@
1
+ export declare const RENDER_COMMAND = "render";
2
+ export declare const renderCommand: (args: string[]) => Promise<void>;
3
+ //# sourceMappingURL=render.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/render.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,cAAc,WAAW,CAAC;AAEvC,eAAO,MAAM,aAAa,SAAgB,MAAM,EAAE,kBAmEjD,CAAC"}
@@ -0,0 +1,75 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.renderCommand = exports.RENDER_COMMAND = void 0;
4
+ const cli_1 = require("@remotion/cli");
5
+ const get_render_progress_1 = require("../../api/get-render-progress");
6
+ const render_video_on_lambda_1 = require("../../api/render-video-on-lambda");
7
+ const constants_1 = require("../../shared/constants");
8
+ const sleep_1 = require("../../shared/sleep");
9
+ const get_aws_region_1 = require("../get-aws-region");
10
+ const find_function_name_1 = require("../helpers/find-function-name");
11
+ const log_1 = require("../log");
12
+ exports.RENDER_COMMAND = 'render';
13
+ const renderCommand = async (args) => {
14
+ var _a, _b;
15
+ const serveUrl = args[0];
16
+ if (!serveUrl) {
17
+ log_1.Log.error('No serve URL passed.');
18
+ log_1.Log.info('Pass an additional argument specifying a URL where your Remotion project is hosted.');
19
+ log_1.Log.info();
20
+ log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.RENDER_COMMAND} <serve-url> <composition-id>`);
21
+ process.exit(1);
22
+ }
23
+ const composition = args[1];
24
+ if (!composition) {
25
+ log_1.Log.error('No composition ID passed.');
26
+ log_1.Log.info('Pass an additional argument specifying the composition ID.');
27
+ log_1.Log.info();
28
+ // TODO: Rename serveURL
29
+ log_1.Log.info(`${constants_1.BINARY_NAME} ${exports.RENDER_COMMAND} <serve-url> <composition-id>`);
30
+ process.exit(1);
31
+ }
32
+ // TODO: Further validate serveUrl
33
+ const cliOptions = await cli_1.CliInternals.getCliOptions({
34
+ type: 'series',
35
+ isLambda: true,
36
+ });
37
+ const functionName = await find_function_name_1.findFunctionName();
38
+ const res = await render_video_on_lambda_1.renderVideoOnLambda({
39
+ functionName,
40
+ serveUrl,
41
+ inputProps: cliOptions.inputProps,
42
+ codec: cliOptions.codec,
43
+ imageFormat: cliOptions.imageFormat,
44
+ crf: (_a = cliOptions.crf) !== null && _a !== void 0 ? _a : undefined,
45
+ envVariables: cliOptions.envVariables,
46
+ pixelFormat: cliOptions.pixelFormat,
47
+ proResProfile: cliOptions.proResProfile,
48
+ quality: cliOptions.quality,
49
+ region: get_aws_region_1.getAwsRegion(),
50
+ // TODO: Unhardcode retries
51
+ maxRetries: 3,
52
+ composition,
53
+ framesPerLambda: (_b = cliOptions.framesPerLambda) !== null && _b !== void 0 ? _b : constants_1.DEFAULT_FRAMES_PER_LAMBDA,
54
+ });
55
+ for (let i = 0; i < 3000; i++) {
56
+ await sleep_1.sleep(1000);
57
+ const status = await get_render_progress_1.getRenderProgress({
58
+ functionName,
59
+ bucketName: res.bucketName,
60
+ renderId: res.renderId,
61
+ region: get_aws_region_1.getAwsRegion(),
62
+ });
63
+ log_1.Log.info(status);
64
+ if (status.done) {
65
+ log_1.Log.info('Done! ' + res.bucketName);
66
+ process.exit(0);
67
+ }
68
+ if (status.fatalErrorEncountered) {
69
+ log_1.Log.error('Fatal error encountered. Exiting.');
70
+ process.exit(1);
71
+ }
72
+ }
73
+ };
74
+ exports.renderCommand = renderCommand;
75
+ //# sourceMappingURL=render.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/cli/commands/render.ts"],"names":[],"mappings":";;;AAAA,uCAA2C;AAC3C,uEAAgE;AAChE,6EAAqE;AACrE,sDAA8E;AAC9E,8CAAyC;AACzC,sDAA+C;AAC/C,sEAA+D;AAC/D,gCAA2B;AAEd,QAAA,cAAc,GAAG,QAAQ,CAAC;AAEhC,MAAM,aAAa,GAAG,KAAK,EAAE,IAAc,EAAE,EAAE;;IACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,IAAI,CAAC,QAAQ,EAAE;QACd,SAAG,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAClC,SAAG,CAAC,IAAI,CACP,qFAAqF,CACrF,CAAC;QACF,SAAG,CAAC,IAAI,EAAE,CAAC;QACX,SAAG,CAAC,IAAI,CAAC,GAAG,uBAAW,IAAI,sBAAc,+BAA+B,CAAC,CAAC;QAC1E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,CAAC,WAAW,EAAE;QACjB,SAAG,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;QACvC,SAAG,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;QACvE,SAAG,CAAC,IAAI,EAAE,CAAC;QACX,wBAAwB;QACxB,SAAG,CAAC,IAAI,CAAC,GAAG,uBAAW,IAAI,sBAAc,+BAA+B,CAAC,CAAC;QAC1E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;IAED,kCAAkC;IAElC,MAAM,UAAU,GAAG,MAAM,kBAAY,CAAC,aAAa,CAAC;QACnD,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,IAAI;KACd,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,qCAAgB,EAAE,CAAC;IAE9C,MAAM,GAAG,GAAG,MAAM,4CAAmB,CAAC;QACrC,YAAY;QACZ,QAAQ;QACR,UAAU,EAAE,UAAU,CAAC,UAAU;QACjC,KAAK,EAAE,UAAU,CAAC,KAA2C;QAC7D,WAAW,EAAE,UAAU,CAAC,WAAW;QACnC,GAAG,EAAE,MAAA,UAAU,CAAC,GAAG,mCAAI,SAAS;QAChC,YAAY,EAAE,UAAU,CAAC,YAAY;QACrC,WAAW,EAAE,UAAU,CAAC,WAAW;QACnC,aAAa,EAAE,UAAU,CAAC,aAAa;QACvC,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,MAAM,EAAE,6BAAY,EAAE;QACtB,2BAA2B;QAC3B,UAAU,EAAE,CAAC;QACb,WAAW;QACX,eAAe,EAAE,MAAA,UAAU,CAAC,eAAe,mCAAI,qCAAyB;KACxE,CAAC,CAAC;IACH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE;QAC9B,MAAM,aAAK,CAAC,IAAI,CAAC,CAAC;QAClB,MAAM,MAAM,GAAG,MAAM,uCAAiB,CAAC;YACtC,YAAY;YACZ,UAAU,EAAE,GAAG,CAAC,UAAU;YAC1B,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,MAAM,EAAE,6BAAY,EAAE;SACtB,CAAC,CAAC;QACH,SAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjB,IAAI,MAAM,CAAC,IAAI,EAAE;YAChB,SAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC;YACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAChB;QAED,IAAI,MAAM,CAAC,qBAAqB,EAAE;YACjC,SAAG,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;YAC/C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAChB;KACD;AACF,CAAC,CAAC;AAnEW,QAAA,aAAa,iBAmExB"}
@@ -0,0 +1,3 @@
1
+ export declare const SITES_CREATE_SUBCOMMAND = "create";
2
+ export declare const sitesCreateSubcommand: (args: string[]) => Promise<void>;
3
+ //# sourceMappingURL=upload.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/sites/upload.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAEhD,eAAO,MAAM,qBAAqB,SAAgB,MAAM,EAAE,kBAmHzD,CAAC"}
@@ -0,0 +1,111 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.sitesCreateSubcommand = exports.SITES_CREATE_SUBCOMMAND = void 0;
7
+ const cli_1 = require("@remotion/cli");
8
+ const fs_1 = require("fs");
9
+ const path_1 = __importDefault(require("path"));
10
+ const deploy_project_1 = require("../../../api/deploy-project");
11
+ const get_or_create_bucket_1 = require("../../../api/get-or-create-bucket");
12
+ const constants_1 = require("../../../shared/constants");
13
+ const get_aws_region_1 = require("../../get-aws-region");
14
+ const progress_bar_1 = require("../../helpers/progress-bar");
15
+ const log_1 = require("../../log");
16
+ exports.SITES_CREATE_SUBCOMMAND = 'create';
17
+ const sitesCreateSubcommand = async (args) => {
18
+ const fileName = args[0];
19
+ if (!fileName) {
20
+ log_1.Log.error('No entry file passed.');
21
+ log_1.Log.info('Pass an additional argument specifying the entry file of your Remotion project:');
22
+ log_1.Log.info();
23
+ log_1.Log.info(`${constants_1.BINARY_NAME} deploy <entry-file.ts>`);
24
+ process.exit(1);
25
+ }
26
+ const absoluteFile = path_1.default.join(process.cwd(), fileName);
27
+ if (!fs_1.existsSync(absoluteFile)) {
28
+ log_1.Log.error(`No file exists at ${absoluteFile}. Make sure the path exists and try again.`);
29
+ process.exit(1);
30
+ }
31
+ if (fs_1.lstatSync(absoluteFile).isDirectory()) {
32
+ log_1.Log.error(`You passed a path ${absoluteFile} but it is a directory. Pass a file instead.`);
33
+ process.exit(1);
34
+ }
35
+ const progressBar = cli_1.CliInternals.createOverwriteableCliOutput();
36
+ const multiProgress = {
37
+ bundleProgress: {
38
+ doneIn: null,
39
+ progress: 0,
40
+ },
41
+ bucketProgress: {
42
+ bucketCreated: false,
43
+ doneIn: null,
44
+ websiteEnabled: false,
45
+ },
46
+ deployProgress: {
47
+ doneIn: null,
48
+ totalSize: null,
49
+ sizeUploaded: 0,
50
+ },
51
+ };
52
+ const updateProgress = () => {
53
+ progressBar.update([
54
+ progress_bar_1.makeBundleProgress(multiProgress.bundleProgress),
55
+ progress_bar_1.makeBucketProgress(multiProgress.bucketProgress),
56
+ progress_bar_1.makeDeployProgressBar(multiProgress.deployProgress),
57
+ ].join('\n'));
58
+ };
59
+ const bucketName = await get_or_create_bucket_1.getOrCreateBucket({ region: get_aws_region_1.getAwsRegion() });
60
+ multiProgress.bucketProgress = {
61
+ bucketCreated: true,
62
+ doneIn: null,
63
+ websiteEnabled: false,
64
+ };
65
+ updateProgress();
66
+ const bundleStart = Date.now();
67
+ const bucketStart = Date.now();
68
+ const uploadStart = Date.now();
69
+ const { url } = await deploy_project_1.deployProject({
70
+ entryPoint: absoluteFile,
71
+ bucketName,
72
+ options: {
73
+ onBundleProgress: (progress) => {
74
+ multiProgress.bundleProgress = {
75
+ progress,
76
+ doneIn: progress === 100 ? Date.now() - bundleStart : null,
77
+ };
78
+ },
79
+ onUploadProgress: (p) => {
80
+ multiProgress.deployProgress = {
81
+ sizeUploaded: p.sizeUploaded,
82
+ totalSize: p.totalSize,
83
+ doneIn: null,
84
+ };
85
+ updateProgress();
86
+ },
87
+ onWebsiteActivated: () => {
88
+ multiProgress.bucketProgress = {
89
+ bucketCreated: true,
90
+ doneIn: Date.now() - bucketStart,
91
+ websiteEnabled: true,
92
+ };
93
+ updateProgress();
94
+ },
95
+ },
96
+ region: get_aws_region_1.getAwsRegion(),
97
+ });
98
+ const uploadDuration = Date.now() - uploadStart;
99
+ multiProgress.deployProgress = {
100
+ sizeUploaded: 1,
101
+ totalSize: 1,
102
+ doneIn: uploadDuration,
103
+ };
104
+ updateProgress();
105
+ log_1.Log.info();
106
+ log_1.Log.info();
107
+ log_1.Log.info('Deployed to S3!');
108
+ log_1.Log.info(url);
109
+ };
110
+ exports.sitesCreateSubcommand = sitesCreateSubcommand;
111
+ //# sourceMappingURL=upload.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../src/cli/commands/sites/upload.ts"],"names":[],"mappings":";;;;;;AAAA,uCAA2C;AAC3C,2BAAyC;AACzC,gDAAwB;AACxB,gEAA0D;AAC1D,4EAAoE;AACpE,yDAAsD;AACtD,yDAAkD;AAClD,6DAOoC;AACpC,mCAA8B;AAEjB,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AAEzC,MAAM,qBAAqB,GAAG,KAAK,EAAE,IAAc,EAAE,EAAE;IAC7D,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACzB,IAAI,CAAC,QAAQ,EAAE;QACd,SAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACnC,SAAG,CAAC,IAAI,CACP,iFAAiF,CACjF,CAAC;QACF,SAAG,CAAC,IAAI,EAAE,CAAC;QACX,SAAG,CAAC,IAAI,CAAC,GAAG,uBAAW,yBAAyB,CAAC,CAAC;QAClD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;IAED,MAAM,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;IACxD,IAAI,CAAC,eAAU,CAAC,YAAY,CAAC,EAAE;QAC9B,SAAG,CAAC,KAAK,CACR,qBAAqB,YAAY,4CAA4C,CAC7E,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;IAED,IAAI,cAAS,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,EAAE;QAC1C,SAAG,CAAC,KAAK,CACR,qBAAqB,YAAY,8CAA8C,CAC/E,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;IAED,MAAM,WAAW,GAAG,kBAAY,CAAC,4BAA4B,EAAE,CAAC;IAEhE,MAAM,aAAa,GAIf;QACH,cAAc,EAAE;YACf,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,CAAC;SACX;QACD,cAAc,EAAE;YACf,aAAa,EAAE,KAAK;YACpB,MAAM,EAAE,IAAI;YACZ,cAAc,EAAE,KAAK;SACrB;QACD,cAAc,EAAE;YACf,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,IAAI;YACf,YAAY,EAAE,CAAC;SACf;KACD,CAAC;IAEF,MAAM,cAAc,GAAG,GAAG,EAAE;QAC3B,WAAW,CAAC,MAAM,CACjB;YACC,iCAAkB,CAAC,aAAa,CAAC,cAAc,CAAC;YAChD,iCAAkB,CAAC,aAAa,CAAC,cAAc,CAAC;YAChD,oCAAqB,CAAC,aAAa,CAAC,cAAc,CAAC;SACnD,CAAC,IAAI,CAAC,IAAI,CAAC,CACZ,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM,wCAAiB,CAAC,EAAC,MAAM,EAAE,6BAAY,EAAE,EAAC,CAAC,CAAC;IACrE,aAAa,CAAC,cAAc,GAAG;QAC9B,aAAa,EAAE,IAAI;QACnB,MAAM,EAAE,IAAI;QACZ,cAAc,EAAE,KAAK;KACrB,CAAC;IAEF,cAAc,EAAE,CAAC;IAEjB,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC/B,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC/B,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE/B,MAAM,EAAC,GAAG,EAAC,GAAG,MAAM,8BAAa,CAAC;QACjC,UAAU,EAAE,YAAY;QACxB,UAAU;QACV,OAAO,EAAE;YACR,gBAAgB,EAAE,CAAC,QAAgB,EAAE,EAAE;gBACtC,aAAa,CAAC,cAAc,GAAG;oBAC9B,QAAQ;oBACR,MAAM,EAAE,QAAQ,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI;iBAC1D,CAAC;YACH,CAAC;YACD,gBAAgB,EAAE,CAAC,CAAC,EAAE,EAAE;gBACvB,aAAa,CAAC,cAAc,GAAG;oBAC9B,YAAY,EAAE,CAAC,CAAC,YAAY;oBAC5B,SAAS,EAAE,CAAC,CAAC,SAAS;oBACtB,MAAM,EAAE,IAAI;iBACZ,CAAC;gBACF,cAAc,EAAE,CAAC;YAClB,CAAC;YACD,kBAAkB,EAAE,GAAG,EAAE;gBACxB,aAAa,CAAC,cAAc,GAAG;oBAC9B,aAAa,EAAE,IAAI;oBACnB,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW;oBAChC,cAAc,EAAE,IAAI;iBACpB,CAAC;gBACF,cAAc,EAAE,CAAC;YAClB,CAAC;SACD;QACD,MAAM,EAAE,6BAAY,EAAE;KACtB,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,CAAC;IAChD,aAAa,CAAC,cAAc,GAAG;QAC9B,YAAY,EAAE,CAAC;QACf,SAAS,EAAE,CAAC;QACZ,MAAM,EAAE,cAAc;KACtB,CAAC;IACF,cAAc,EAAE,CAAC;IAEjB,SAAG,CAAC,IAAI,EAAE,CAAC;IACX,SAAG,CAAC,IAAI,EAAE,CAAC;IACX,SAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAE5B,SAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC,CAAC;AAnHW,QAAA,qBAAqB,yBAmHhC"}
@@ -0,0 +1,3 @@
1
+ export declare const DEPLOY_COMMAND = "deploy";
2
+ export declare const deployCommand: () => Promise<void>;
3
+ //# sourceMappingURL=deploy.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/cli/deploy.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,cAAc,WAAW,CAAC;AAEvC,eAAO,MAAM,aAAa,qBAGzB,CAAC"}
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.deployCommand = exports.DEPLOY_COMMAND = void 0;
4
+ const deploy_lambda_1 = require("../api/deploy-lambda");
5
+ const get_aws_region_1 = require("./get-aws-region");
6
+ const log_1 = require("./log");
7
+ exports.DEPLOY_COMMAND = 'deploy';
8
+ const deployCommand = async () => {
9
+ const { functionName } = await deploy_lambda_1.deployLambda({ region: get_aws_region_1.getAwsRegion() });
10
+ log_1.Log.info(`Deployed to ${functionName}`);
11
+ };
12
+ exports.deployCommand = deployCommand;
13
+ //# sourceMappingURL=deploy.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/cli/deploy.ts"],"names":[],"mappings":";;;AAAA,wDAAkD;AAClD,qDAA8C;AAC9C,+BAA0B;AAEb,QAAA,cAAc,GAAG,QAAQ,CAAC;AAEhC,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;IACvC,MAAM,EAAC,YAAY,EAAC,GAAG,MAAM,4BAAY,CAAC,EAAC,MAAM,EAAE,6BAAY,EAAE,EAAC,CAAC,CAAC;IACpE,SAAG,CAAC,IAAI,CAAC,eAAe,YAAY,EAAE,CAAC,CAAC;AACzC,CAAC,CAAC;AAHW,QAAA,aAAa,iBAGxB"}
@@ -2,11 +2,11 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getAwsRegion = void 0;
4
4
  const constants_1 = require("../shared/constants");
5
- const tmpdir_1 = require("../shared/tmpdir");
5
+ const is_in_lambda_1 = require("../shared/is-in-lambda");
6
6
  const validate_aws_region_1 = require("../shared/validate-aws-region");
7
7
  const args_1 = require("./args");
8
8
  const getAwsRegion = () => {
9
- if (tmpdir_1.isInLambda) {
9
+ if (is_in_lambda_1.isInLambda) {
10
10
  throw new Error('Should not call getAwsRegion() if in lambda');
11
11
  }
12
12
  if (args_1.parsedLambdaCli.region) {
@@ -1 +1 @@
1
- {"version":3,"file":"get-aws-region.js","sourceRoot":"","sources":["../../src/cli/get-aws-region.ts"],"names":[],"mappings":";;;AACA,mDAAmD;AACnD,6CAA4C;AAC5C,uEAAgE;AAChE,iCAAuC;AAEhC,MAAM,YAAY,GAAG,GAAc,EAAE;IAC3C,IAAI,mBAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;KAC/D;IAED,IAAI,sBAAe,CAAC,MAAM,EAAE;QAC3B,IAAA,uCAAiB,EAAC,sBAAe,CAAC,MAAM,CAAC,CAAC;QAC1C,OAAO,sBAAe,CAAC,MAAM,CAAC;KAC9B;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;IAC3C,IAAI,WAAW,EAAE;QAChB,IAAA,uCAAiB,EAAC,WAAW,CAAC,CAAC;QAC/B,OAAO,WAAW,CAAC;KACnB;IAED,OAAO,0BAAc,CAAC;AACvB,CAAC,CAAC;AAjBW,QAAA,YAAY,gBAiBvB"}
1
+ {"version":3,"file":"get-aws-region.js","sourceRoot":"","sources":["../../src/cli/get-aws-region.ts"],"names":[],"mappings":";;;AACA,mDAAmD;AACnD,yDAAkD;AAClD,uEAAgE;AAChE,iCAAuC;AAEhC,MAAM,YAAY,GAAG,GAAc,EAAE;IAC3C,IAAI,yBAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;KAC/D;IAED,IAAI,sBAAe,CAAC,MAAM,EAAE;QAC3B,IAAA,uCAAiB,EAAC,sBAAe,CAAC,MAAM,CAAC,CAAC;QAC1C,OAAO,sBAAe,CAAC,MAAM,CAAC;KAC9B;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;IAC3C,IAAI,WAAW,EAAE;QAChB,IAAA,uCAAiB,EAAC,WAAW,CAAC,CAAC;QAC/B,OAAO,WAAW,CAAC;KACnB;IAED,OAAO,0BAAc,CAAC;AACvB,CAAC,CAAC;AAjBW,QAAA,YAAY,gBAiBvB"}