@osaas/cli 0.3.0 → 0.5.0

package/dist/cli.js

@@ -31,6 +31,8 @@ const commander_1 = require("commander");
 const cmd_1 = __importDefault(require("./admin/cmd"));
 const cmdUser = __importStar(require("./user/cmd"));
 const cmd_2 = __importDefault(require("./transcode/cmd"));
+const cmd_3 = __importDefault(require("./vmaf/cmd"));
+const cmd_4 = __importDefault(require("./packager/cmd"));
 const cli = new commander_1.Command();
 cli
     .configureHelp({ showGlobalOptions: true })
@@ -40,5 +42,7 @@ cli.addCommand(cmdUser.cmdList());
 cli.addCommand(cmdUser.cmdCreate());
 cli.addCommand(cmdUser.cmdRemove());
 cli.addCommand((0, cmd_2.default)());
+cli.addCommand((0, cmd_4.default)());
+cli.addCommand((0, cmd_3.default)());
 cli.parse(process.argv);
 //# sourceMappingURL=cli.js.map

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,yCAAoC;AACpC,sDAAmC;AACnC,oDAAsC;AACtC,0DAA2C;AAE3C,MAAM,GAAG,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE1B,GAAG;KACA,aAAa,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;KAC1C,MAAM,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,CAAC;AACvD,GAAG,CAAC,UAAU,CAAC,IAAA,aAAQ,GAAE,CAAC,CAAC;AAC3B,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;AAClC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;AACpC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;AACpC,GAAG,CAAC,UAAU,CAAC,IAAA,aAAY,GAAE,CAAC,CAAC;AAC/B,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,yCAAoC;AACpC,sDAAmC;AACnC,oDAAsC;AACtC,0DAA2C;AAC3C,qDAAoC;AACpC,yDAAyC;AAEzC,MAAM,GAAG,GAAG,IAAI,mBAAO,EAAE,CAAC;AAE1B,GAAG;KACA,aAAa,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;KAC1C,MAAM,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,CAAC;AACvD,GAAG,CAAC,UAAU,CAAC,IAAA,aAAQ,GAAE,CAAC,CAAC;AAC3B,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;AAClC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;AACpC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;AACpC,GAAG,CAAC,UAAU,CAAC,IAAA,aAAY,GAAE,CAAC,CAAC;AAC/B,GAAG,CAAC,UAAU,CAAC,IAAA,aAAW,GAAE,CAAC,CAAC;AAC9B,GAAG,CAAC,UAAU,CAAC,IAAA,aAAU,GAAE,CAAC,CAAC;AAC7B,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC"}

package/dist/packager/cmd.d.ts

@@ -0,0 +1,3 @@
+import { Command } from 'commander';
+export default function cmdPackager(): Command;
+//# sourceMappingURL=cmd.d.ts.map

package/dist/packager/cmd.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/packager/cmd.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,CAAC,OAAO,UAAU,WAAW,YA4BlC"}

package/dist/packager/cmd.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const client_core_1 = require("@osaas/client-core");
+const client_transcode_1 = require("@osaas/client-transcode");
+const commander_1 = require("commander");
+function cmdPackager() {
+    const packager = new commander_1.Command('packager');
+    packager
+        .description('Create streaming package from ABR bundle on S3 and store on another S3 bucket')
+        .argument('<source>', 'Source Bucket URL (supported protocols: s3)')
+        .argument('<dest>', 'Destination URL (supported protocols: s3)')
+        .option('-v, --videos <videos...>', 'List of video files')
+        .option('-a, --audio <audio>', 'Audio file')
+        .action(async (source, dest, options, command) => {
+        try {
+            const globalOpts = command.optsWithGlobals();
+            const environment = globalOpts?.env || 'prod';
+            const ctx = new client_core_1.Context({ environment });
+            await (0, client_transcode_1.createStreamingPackage)(ctx, new URL(source), options.videos, options.audio, new URL(dest));
+        }
+        catch (err) {
+            console.log(err.message);
+        }
+    });
+    return packager;
+}
+exports.default = cmdPackager;
+//# sourceMappingURL=cmd.js.map

package/dist/packager/cmd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cmd.js","sourceRoot":"","sources":["../../src/packager/cmd.ts"],"names":[],"mappings":";;AAAA,oDAA6C;AAC7C,8DAAiE;AACjE,yCAAoC;AAEpC,SAAwB,WAAW;IACjC,MAAM,QAAQ,GAAG,IAAI,mBAAO,CAAC,UAAU,CAAC,CAAC;IAEzC,QAAQ;SACL,WAAW,CACV,+EAA+E,CAChF;SACA,QAAQ,CAAC,UAAU,EAAE,6CAA6C,CAAC;SACnE,QAAQ,CAAC,QAAQ,EAAE,2CAA2C,CAAC;SAC/D,MAAM,CAAC,0BAA0B,EAAE,qBAAqB,CAAC;SACzD,MAAM,CAAC,qBAAqB,EAAE,YAAY,CAAC;SAC3C,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,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,MAAM,IAAA,yCAAsB,EAC1B,GAAG,EACH,IAAI,GAAG,CAAC,MAAM,CAAC,EACf,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,KAAK,EACb,IAAI,GAAG,CAAC,IAAI,CAAC,CACd,CAAC;SACH;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,GAAG,CAAE,GAAa,CAAC,OAAO,CAAC,CAAC;SACrC;IACH,CAAC,CAAC,CAAC;IACL,OAAO,QAAQ,CAAC;AAClB,CAAC;AA5BD,8BA4BC"}

package/dist/vmaf/cmd.d.ts

@@ -0,0 +1,3 @@
+import { Command } from 'commander';
+export default function cmdCompare(): Command;
+//# sourceMappingURL=cmd.d.ts.map

package/dist/vmaf/cmd.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cmd.d.ts","sourceRoot":"","sources":["../../src/vmaf/cmd.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,CAAC,OAAO,UAAU,UAAU,YAmCjC"}

package/dist/vmaf/cmd.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const client_core_1 = require("@osaas/client-core");
+const client_transcode_1 = require("@osaas/client-transcode");
+const commander_1 = require("commander");
+function cmdCompare() {
+    const compare = new commander_1.Command('compare');
+    compare
+        .command('vmaf')
+        .description('Compare two video files using VMAF')
+        .argument('<reference>', 'URL to reference video file (supported protocols: s3)')
+        .argument('<distorted>', 'URL to distorted video file (supported protocols: s3)')
+        .argument('<result>', 'URL where to store the result (supported protocols: s3)')
+        .action(async (reference, distorted, result, options, command) => {
+        try {
+            const globalOpts = command.optsWithGlobals();
+            const environment = globalOpts?.env || 'prod';
+            const ctx = new client_core_1.Context({ environment });
+            const resultUrl = await (0, client_transcode_1.vmafCompare)(ctx, new URL(reference), new URL(distorted), new URL(result));
+            (0, client_core_1.Log)().info(`VMAF comparison result stored at ${resultUrl.toString()}`);
+        }
+        catch (err) {
+            console.log(err.message);
+        }
+    });
+    return compare;
+}
+exports.default = cmdCompare;
+//# sourceMappingURL=cmd.js.map

package/dist/vmaf/cmd.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cmd.js","sourceRoot":"","sources":["../../src/vmaf/cmd.ts"],"names":[],"mappings":";;AAAA,oDAAkD;AAClD,8DAAsD;AACtD,yCAAoC;AAEpC,SAAwB,UAAU;IAChC,MAAM,OAAO,GAAG,IAAI,mBAAO,CAAC,SAAS,CAAC,CAAC;IAEvC,OAAO;SACJ,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,oCAAoC,CAAC;SACjD,QAAQ,CACP,aAAa,EACb,uDAAuD,CACxD;SACA,QAAQ,CACP,aAAa,EACb,uDAAuD,CACxD;SACA,QAAQ,CACP,UAAU,EACV,yDAAyD,CAC1D;SACA,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;QAC/D,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,MAAM,SAAS,GAAG,MAAM,IAAA,8BAAW,EACjC,GAAG,EACH,IAAI,GAAG,CAAC,SAAS,CAAC,EAClB,IAAI,GAAG,CAAC,SAAS,CAAC,EAClB,IAAI,GAAG,CAAC,MAAM,CAAC,CAChB,CAAC;YACF,IAAA,iBAAG,GAAE,CAAC,IAAI,CAAC,oCAAoC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SACxE;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,GAAG,CAAE,GAAa,CAAC,OAAO,CAAC,CAAC;SACrC;IACH,CAAC,CAAC,CAAC;IACL,OAAO,OAAO,CAAC;AACjB,CAAC;AAnCD,6BAmCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osaas/cli",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "Open Source Cloud CLI",
   "author": "Eyevinn Technology <work@eyevinn.se>",
   "homepage": "https://www.osaas.io",
@@ -21,8 +21,8 @@
     "test": "jest --pass-with-no-tests"
   },
   "dependencies": {
-    "@osaas/client-core": "^0.5.0",
-    "@osaas/client-transcode": "^0.2.0",
+    "@osaas/client-core": "^0.5.1",
+    "@osaas/client-transcode": "^0.4.0",
     "chalk": "4.1.2",
     "commander": "^12.1.0",
     "fast-jwt": "^4.0.1"
@@ -30,5 +30,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "96572cd1b9ef95cb64a743fa8dd35e2bad41e24d"
+  "gitHead": "1cd9bcf9e53033687345cbffa58d61853ade3a1f"
 }

package/readme.md

@@ -28,7 +28,10 @@ Commands:
   list <serviceId>                     List all my service instances
   create [options] <serviceId> <name>  Create a service instance
   remove <serviceId> <name>            Remove a service instance
+  transcode [options] <source> <dest>  Transcode file to ABR fileset and store on S3 bucket
+  compare
   help [command]                       display help for command
+
 ```
 
 To display help for subcommand `admin` you enter
@@ -74,6 +77,22 @@ Commands:
 % osc remove channel-engine clidemo
 ```
 
+### Create ABR files for VOD using SVT Encore
+
+```
+osc transcode \
+  https://testcontent.eyevinn.technology/mp4/stswe-tvplus-promo.mp4 \
+  s3://lab-testcontent-store/birme/
+```
+
+### Compare two video files using VMAF
+
+```
+% osc compare vmaf s3://lab-testcontent-store/birme/snaxax_x264_3100.mp4 \
+    s3://lab-testcontent-store/birme/snaxax_x264_324.mp4 \
+    s3://lab-testcontent-store/birme/
+```
+
 ### List all channel-engine instance for tenant `eyevinn` as an OSC super admin
 
 ```

package/src/cli.ts

@@ -4,6 +4,8 @@ import { Command } from 'commander';
 import cmdAdmin from './admin/cmd';
 import * as cmdUser from './user/cmd';
 import cmdTranscode from './transcode/cmd';
+import cmdCompare from './vmaf/cmd';
+import cmdPackager from './packager/cmd';
 
 const cli = new Command();
 
@@ -15,4 +17,6 @@ cli.addCommand(cmdUser.cmdList());
 cli.addCommand(cmdUser.cmdCreate());
 cli.addCommand(cmdUser.cmdRemove());
 cli.addCommand(cmdTranscode());
+cli.addCommand(cmdPackager());
+cli.addCommand(cmdCompare());
 cli.parse(process.argv);

package/src/packager/cmd.ts

@@ -0,0 +1,33 @@
+import { Context } from '@osaas/client-core';
+import { createStreamingPackage } from '@osaas/client-transcode';
+import { Command } from 'commander';
+
+export default function cmdPackager() {
+  const packager = new Command('packager');
+
+  packager
+    .description(
+      'Create streaming package from ABR bundle on S3 and store on another S3 bucket'
+    )
+    .argument('<source>', 'Source Bucket URL (supported protocols: s3)')
+    .argument('<dest>', 'Destination URL (supported protocols: s3)')
+    .option('-v, --videos <videos...>', 'List of video files')
+    .option('-a, --audio <audio>', 'Audio file')
+    .action(async (source, dest, options, command) => {
+      try {
+        const globalOpts = command.optsWithGlobals();
+        const environment = globalOpts?.env || 'prod';
+        const ctx = new Context({ environment });
+        await createStreamingPackage(
+          ctx,
+          new URL(source),
+          options.videos,
+          options.audio,
+          new URL(dest)
+        );
+      } catch (err) {
+        console.log((err as Error).message);
+      }
+    });
+  return packager;
+}

package/src/vmaf/cmd.ts

@@ -0,0 +1,40 @@
+import { Context, Log } from '@osaas/client-core';
+import { vmafCompare } from '@osaas/client-transcode';
+import { Command } from 'commander';
+
+export default function cmdCompare() {
+  const compare = new Command('compare');
+
+  compare
+    .command('vmaf')
+    .description('Compare two video files using VMAF')
+    .argument(
+      '<reference>',
+      'URL to reference video file (supported protocols: s3)'
+    )
+    .argument(
+      '<distorted>',
+      'URL to distorted video file (supported protocols: s3)'
+    )
+    .argument(
+      '<result>',
+      'URL where to store the result (supported protocols: s3)'
+    )
+    .action(async (reference, distorted, result, options, command) => {
+      try {
+        const globalOpts = command.optsWithGlobals();
+        const environment = globalOpts?.env || 'prod';
+        const ctx = new Context({ environment });
+        const resultUrl = await vmafCompare(
+          ctx,
+          new URL(reference),
+          new URL(distorted),
+          new URL(result)
+        );
+        Log().info(`VMAF comparison result stored at ${resultUrl.toString()}`);
+      } catch (err) {
+        console.log((err as Error).message);
+      }
+    });
+  return compare;
+}