@osaas/cli 4.19.2 → 4.20.1
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/vod/cmd.d.ts.map +1 -1
- package/dist/vod/cmd.js +13 -4
- package/dist/vod/cmd.js.map +1 -1
- package/package.json +3 -3
- package/src/vod/cmd.ts +12 -4
package/dist/vod/cmd.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/vod/cmd.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/vod/cmd.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,wBAAgB,MAAM,YA8DrB"}
|
package/dist/vod/cmd.js
CHANGED
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.cmdVod = void 0;
|
|
4
4
|
const client_core_1 = require("@osaas/client-core");
|
|
5
5
|
const client_transcode_1 = require("@osaas/client-transcode");
|
|
6
|
+
const vodpipeline_1 = require("@osaas/client-transcode/lib/vodpipeline");
|
|
6
7
|
const commander_1 = require("commander");
|
|
7
8
|
function cmdVod() {
|
|
8
9
|
const vod = new commander_1.Command('vod');
|
|
@@ -20,14 +21,22 @@ function cmdVod() {
|
|
|
20
21
|
const globalOpts = command.optsWithGlobals();
|
|
21
22
|
const environment = globalOpts?.env || 'prod';
|
|
22
23
|
const ctx = new client_core_1.Context({ environment });
|
|
23
|
-
|
|
24
|
-
const pipeline = await (0, client_transcode_1.createVodPipeline)(name, ctx, {
|
|
24
|
+
const opts = {
|
|
25
25
|
outputBucketName: options.outputBucketName,
|
|
26
26
|
accessKeyId: options.accessKeyId,
|
|
27
27
|
secretAccessKey: options.secretAccessKey,
|
|
28
28
|
endpoint: options.endpoint
|
|
29
|
-
}
|
|
30
|
-
(0,
|
|
29
|
+
};
|
|
30
|
+
let pipeline = await (0, vodpipeline_1.getPipeline)(name, ctx, opts);
|
|
31
|
+
if (!pipeline) {
|
|
32
|
+
(0, client_core_1.Log)().info('Creating VOD pipeline');
|
|
33
|
+
pipeline = await (0, client_transcode_1.createVodPipeline)(name, ctx, opts);
|
|
34
|
+
(0, client_core_1.Log)().info('VOD pipeline created, starting job to create VOD');
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
(0, client_core_1.Log)().info('Using existing VOD pipeline, starting job to create VOD');
|
|
38
|
+
(0, client_core_1.Log)().debug(pipeline);
|
|
39
|
+
}
|
|
31
40
|
const job = await (0, client_transcode_1.createVod)(pipeline, source, ctx);
|
|
32
41
|
if (job) {
|
|
33
42
|
(0, client_core_1.Log)().info('Created VOD will be available at: ' + job.vodUrl);
|
package/dist/vod/cmd.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cmd.js","sourceRoot":"","sources":["../../src/vod/cmd.ts"],"names":[],"mappings":";;;AAAA,oDAAkD;AAClD,8DAIiC;AACjC,yCAAoC;AAEpC,SAAgB,MAAM;IACpB,MAAM,GAAG,GAAG,IAAI,mBAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,GAAG;SACA,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CACV,oFAAoF,CACrF;SACA,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,CAAC;SAC1C,QAAQ,CAAC,UAAU,EAAE,YAAY,CAAC;SAClC,MAAM,CAAC,6BAA6B,EAAE,gCAAgC,CAAC;SACvE,MAAM,CAAC,sBAAsB,EAAE,0CAA0C,CAAC;SAC1E,MAAM,CACL,2BAA2B,EAC3B,8CAA8C,CAC/C;SACA,MAAM,CAAC,kBAAkB,EAAE,yCAAyC,CAAC;SACrE,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QAC/C,IAAI;YACF,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;YAC7C,MAAM,WAAW,GAAG,UAAU,EAAE,GAAG,IAAI,MAAM,CAAC;YAC9C,MAAM,GAAG,GAAG,IAAI,qBAAO,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;YACzC,
|
|
1
|
+
{"version":3,"file":"cmd.js","sourceRoot":"","sources":["../../src/vod/cmd.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@osaas/cli",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.20.1",
|
|
4
4
|
"description": "Open Source Cloud CLI",
|
|
5
5
|
"author": "Eyevinn Open Source Cloud <osc@eyevinn.se>",
|
|
6
6
|
"homepage": "https://www.osaas.io",
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
"@osaas/client-core": "^0.19.0",
|
|
26
26
|
"@osaas/client-db": "^0.6.5",
|
|
27
27
|
"@osaas/client-intercom": "^0.3.4",
|
|
28
|
-
"@osaas/client-transcode": "^0.
|
|
28
|
+
"@osaas/client-transcode": "^0.25.0",
|
|
29
29
|
"@osaas/client-web": "^0.5.9",
|
|
30
30
|
"@types/promptly": "^3.0.5",
|
|
31
31
|
"chalk": "4.1.2",
|
|
@@ -37,5 +37,5 @@
|
|
|
37
37
|
"publishConfig": {
|
|
38
38
|
"access": "public"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "b3681fafe3aaa7b1e0e9a89b065b09b87989eb26"
|
|
41
41
|
}
|
package/src/vod/cmd.ts
CHANGED
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
createVodPipeline,
|
|
5
5
|
removeVodPipeline
|
|
6
6
|
} from '@osaas/client-transcode';
|
|
7
|
+
import { getPipeline } from '@osaas/client-transcode/lib/vodpipeline';
|
|
7
8
|
import { Command } from 'commander';
|
|
8
9
|
|
|
9
10
|
export function cmdVod() {
|
|
@@ -27,14 +28,21 @@ export function cmdVod() {
|
|
|
27
28
|
const globalOpts = command.optsWithGlobals();
|
|
28
29
|
const environment = globalOpts?.env || 'prod';
|
|
29
30
|
const ctx = new Context({ environment });
|
|
30
|
-
|
|
31
|
-
const pipeline = await createVodPipeline(name, ctx, {
|
|
31
|
+
const opts = {
|
|
32
32
|
outputBucketName: options.outputBucketName,
|
|
33
33
|
accessKeyId: options.accessKeyId,
|
|
34
34
|
secretAccessKey: options.secretAccessKey,
|
|
35
35
|
endpoint: options.endpoint
|
|
36
|
-
}
|
|
37
|
-
|
|
36
|
+
};
|
|
37
|
+
let pipeline = await getPipeline(name, ctx, opts);
|
|
38
|
+
if (!pipeline) {
|
|
39
|
+
Log().info('Creating VOD pipeline');
|
|
40
|
+
pipeline = await createVodPipeline(name, ctx, opts);
|
|
41
|
+
Log().info('VOD pipeline created, starting job to create VOD');
|
|
42
|
+
} else {
|
|
43
|
+
Log().info('Using existing VOD pipeline, starting job to create VOD');
|
|
44
|
+
Log().debug(pipeline);
|
|
45
|
+
}
|
|
38
46
|
const job = await createVod(pipeline, source, ctx);
|
|
39
47
|
if (job) {
|
|
40
48
|
Log().info('Created VOD will be available at: ' + job.vodUrl);
|