@mcma/core 0.13.24 → 0.13.29

package/dist/lib/logging/log-event.js

@@ -46,11 +46,11 @@ class LogEvent {
         try {
             return JSON.stringify(logEventEntry, null, 2);
         }
-        catch (_a) {
+        catch {
             try {
                 logEventEntry.message = util.inspect(logEventEntry.message);
             }
-            catch (_b) {
+            catch {
                 logEventEntry.message = logEventEntry.message + "";
             }
         }

package/dist/lib/model/job-assignment.d.ts

@@ -1,6 +1,6 @@
 import { JobBase, JobBaseProperties } from "./job-base";
-import { McmaTrackerProperties } from "./mcma-tracker";
-import { NotificationEndpointProperties } from "./notification-endpoint";
+import { McmaTracker, McmaTrackerProperties } from "./mcma-tracker";
+import { NotificationEndpoint, NotificationEndpointProperties } from "./notification-endpoint";
 export interface JobAssignmentProperties extends JobBaseProperties {
     jobId: string;
     tracker?: McmaTrackerProperties;
@@ -8,7 +8,7 @@ export interface JobAssignmentProperties extends JobBaseProperties {
 }
 export declare class JobAssignment extends JobBase<JobAssignmentProperties> implements JobAssignmentProperties {
     jobId: string;
-    tracker?: McmaTrackerProperties;
-    notificationEndpoint?: NotificationEndpointProperties;
+    tracker?: McmaTracker;
+    notificationEndpoint?: NotificationEndpoint;
     constructor(properties: JobAssignmentProperties);
 }

package/dist/lib/model/job-base.d.ts

@@ -1,11 +1,11 @@
-import { JobParameterBag } from "./job-parameter-bag";
+import { JobParameterBag, JobParameterBagProperties } from "./job-parameter-bag";
 import { McmaResource, McmaResourceProperties } from "./mcma-resource";
 import { ProblemDetail, ProblemDetailProperties } from "./problem-detail";
 import { JobStatus } from "./job-status";
 export interface JobBaseProperties extends McmaResourceProperties {
     status?: JobStatus;
     error?: ProblemDetailProperties;
-    jobOutput?: JobParameterBag;
+    jobOutput?: JobParameterBagProperties;
     progress?: number;
 }
 export declare abstract class JobBase<T extends JobBaseProperties> extends McmaResource implements JobBaseProperties {

package/dist/lib/model/job-parameter-bag.d.ts

@@ -1,5 +1,8 @@
-import { McmaObject } from "./mcma-object";
-export declare class JobParameterBag extends McmaObject {
+import { McmaObject, McmaObjectProperties } from "./mcma-object";
+export interface JobParameterBagProperties extends McmaObjectProperties {
+    [key: string]: any;
+}
+export declare class JobParameterBag extends McmaObject implements JobParameterBagProperties {
     [key: string]: any;
     constructor(properties?: {
         [key: string]: any;

package/dist/lib/model/job-profile.d.ts

@@ -1,10 +1,10 @@
 import { McmaResource, McmaResourceProperties } from "./mcma-resource";
-import { JobParameter } from "./job-parameter";
+import { JobParameter, JobParameterProperties } from "./job-parameter";
 export interface JobProfileProperties extends McmaResourceProperties {
     name: string;
-    inputParameters?: JobParameter[];
-    outputParameters?: JobParameter[];
-    optionalInputParameters?: JobParameter[];
+    inputParameters?: JobParameterProperties[];
+    outputParameters?: JobParameterProperties[];
+    optionalInputParameters?: JobParameterProperties[];
 }
 export declare class JobProfile extends McmaResource implements JobProfileProperties {
     name: string;

package/dist/lib/model/job-profile.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobProfile = void 0;
 const mcma_resource_1 = require("./mcma-resource");
+const job_parameter_1 = require("./job-parameter");
 class JobProfile extends mcma_resource_1.McmaResource {
     constructor(properties) {
         super("JobProfile", properties);
@@ -9,7 +10,15 @@ class JobProfile extends mcma_resource_1.McmaResource {
         this.checkProperty("inputParameters", "Array", false);
         this.checkProperty("outputParameters", "Array", false);
         this.checkProperty("optionalInputParameters", "Array", false);
-        this.checkProperty("customProperties", "object", false);
+        if (Array.isArray(this.inputParameters)) {
+            this.inputParameters = this.inputParameters.map(ip => new job_parameter_1.JobParameter(ip));
+        }
+        if (Array.isArray(this.optionalInputParameters)) {
+            this.optionalInputParameters = this.optionalInputParameters.map(ip => new job_parameter_1.JobParameter(ip));
+        }
+        if (Array.isArray(this.outputParameters)) {
+            this.outputParameters = this.outputParameters.map(ip => new job_parameter_1.JobParameter(ip));
+        }
     }
 }
 exports.JobProfile = JobProfile;

package/dist/lib/model/jobs/job.d.ts

@@ -1,13 +1,13 @@
 import { JobBase, JobBaseProperties } from "../job-base";
-import { JobParameterBag } from "../job-parameter-bag";
-import { McmaTrackerProperties } from "../mcma-tracker";
-import { NotificationEndpointProperties } from "../notification-endpoint";
+import { JobParameterBag, JobParameterBagProperties } from "../job-parameter-bag";
+import { McmaTracker, McmaTrackerProperties } from "../mcma-tracker";
+import { NotificationEndpoint, NotificationEndpointProperties } from "../notification-endpoint";
 export interface JobProperties extends JobBaseProperties {
     parentId?: string;
     jobProfileId: string;
-    jobInput?: JobParameterBag;
+    jobInput?: JobParameterBagProperties;
     timeout?: number;
-    deadline?: Date;
+    deadline?: Date | string;
     tracker?: McmaTrackerProperties;
     notificationEndpoint?: NotificationEndpointProperties;
 }
@@ -17,7 +17,7 @@ export declare class Job extends JobBase<JobProperties> implements JobProperties
     jobInput?: JobParameterBag;
     timeout?: number;
     deadline?: Date;
-    tracker?: McmaTrackerProperties;
-    notificationEndpoint?: NotificationEndpointProperties;
+    tracker?: McmaTracker;
+    notificationEndpoint?: NotificationEndpoint;
     constructor(type: string, properties: JobProperties);
 }

package/dist/lib/model/jobs/job.js

@@ -8,14 +8,14 @@ const notification_endpoint_1 = require("../notification-endpoint");
 class Job extends job_base_1.JobBase {
     constructor(type, properties) {
         super(type, properties);
-        this.checkProperty("parentId", "url", false);
+        this.checkProperty("parentId", "string", false);
         this.checkProperty("jobProfileId", "url", true);
         this.checkProperty("jobInput", "object", false);
         this.checkProperty("timeout", "number", false);
-        this.checkProperty("deadline", "object", false);
         this.checkProperty("tracker", "object", false);
         this.checkProperty("notificationEndpoint", "object", false);
         this.jobInput = new job_parameter_bag_1.JobParameterBag(properties.jobInput);
+        this.deadline = this.ensureValidDateOrUndefined(this.deadline);
         if (typeof this.notificationEndpoint === "object") {
             this.notificationEndpoint = new notification_endpoint_1.NotificationEndpoint(this.notificationEndpoint);
         }

package/dist/lib/model/service.d.ts

@@ -1,5 +1,5 @@
 import { McmaResource, McmaResourceProperties } from "./mcma-resource";
-import { ResourceEndpointProperties } from "./resource-endpoint";
+import { ResourceEndpoint, ResourceEndpointProperties } from "./resource-endpoint";
 export interface ServiceProperties extends McmaResourceProperties {
     name: string;
     resources: ResourceEndpointProperties[];
@@ -10,7 +10,7 @@ export interface ServiceProperties extends McmaResourceProperties {
 }
 export declare class Service extends McmaResource implements ServiceProperties {
     name: string;
-    resources: ResourceEndpointProperties[];
+    resources: ResourceEndpoint[];
     authType?: string;
     authContext?: any;
     jobType?: string;

package/dist/lib/model/service.js

@@ -16,7 +16,7 @@ class Service extends mcma_resource_1.McmaResource {
                 try {
                     this.authContext = JSON.parse(properties.authContext);
                 }
-                catch (_a) {
+                catch {
                     this.authContext = properties.authContext;
                 }
             }

package/dist/lib/utils.js

@@ -2,15 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Utils = void 0;
 const mcma_exception_1 = require("./mcma-exception");
-const validUrl = new RegExp("^(https?:\\/\\/)?" + // protocol
-    "((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|" + // domain name
-    "((\\d{1,3}\\.){3}\\d{1,3}))" + // OR ip (v4) address
-    "(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*" + // port and path
-    "(\\?[;&a-z\\d%_.~+=-]*)?" + // query string
-    "(\\#[-a-z\\d_]*)?$", "i" // fragment locator
-);
 function isValidUrl(url) {
-    return validUrl.test(url);
+    try {
+        new URL(url);
+        return true;
+    }
+    catch (error) {
+        return false;
+    }
 }
 function getTypeName(type) {
     if (typeof type === "function") {

package/package.json

@@ -1,9 +1,9 @@
 {
     "name": "@mcma/core",
-    "version": "0.13.24",
+    "version": "0.13.29",
     "description": "Node module with type definitions and helper utils for the EBU MCMA framework",
     "engines": {
-        "node": "^12.19.0"
+        "node": "^14.17.0"
     },
     "type": "commonjs",
     "main": "dist/index.js",
@@ -32,7 +32,7 @@
         "uuid": "^7.0.3"
     },
     "devDependencies": {
-        "@types/node": "^13.13.26",
+        "@types/node": "^14.17.22",
         "@types/uuid": "^7.0.4",
         "jasmine": "^3.4.0"
     }