@kogeet/scapin-core-agent 0.1.8 → 0.2.1

package/bin/core/runsteps.d.ts

@@ -4,8 +4,8 @@ export declare class RunSteps {
     private runStep;
     private stepCtx;
     stop: boolean;
-    constructor(rData: RunDataStepModel[], rVars: Variable[]);
-    run(pos: number, end: number): Promise<void>;
+    constructor(data: RunDataStepModel[] | RunDataStepModel | undefined, rVars: Variable[]);
+    run(pos?: number, end?: number): Promise<void>;
     size(): number;
     close(): void;
     private runAStep;

package/bin/core/runsteps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runsteps.d.ts","sourceRoot":"","sources":["../../src/core/runsteps.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,gBAAgB,EAAE,QAAQ,EAAC,MAAM,wBAAwB,CAAA;AAEtE,qBAAa,QAAQ;IACnB,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,OAAO,CAA2B;IACnC,IAAI,EAAE,OAAO,CAAQ;gBAET,KAAK,EAAE,gBAAgB,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;IAKlD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAkBlC,IAAI;IAEJ,KAAK;YAKE,QAAQ;CAwBvB"}
+{"version":3,"file":"runsteps.d.ts","sourceRoot":"","sources":["../../src/core/runsteps.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,gBAAgB,EAAE,QAAQ,EAAC,MAAM,wBAAwB,CAAA;AAEtE,qBAAa,QAAQ;IACnB,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,OAAO,CAA2B;IACnC,IAAI,EAAE,OAAO,CAAQ;gBAET,IAAI,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,GAAG,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE;IAShF,GAAG,CAAC,GAAG,GAAE,MAAU,EAAE,GAAG,GAAE,MAA4B;IAkB5D,IAAI;IAIJ,KAAK;YAKE,QAAQ;CAwBvB"}

package/bin/core/runsteps.js

@@ -7,11 +7,16 @@ export class RunSteps {
     runStep = new RunStep();
     stepCtx = null;
     stop = false;
-    constructor(rData, rVars) {
-        this.runData = rData;
+    constructor(data, rVars) {
+        if (data) {
+            this.runData = !Array.isArray(data) ? [data] : data;
+        }
+        else {
+            this.runData = [];
+        }
         context.resetVariables(rVars);
     }
-    async run(pos, end) {
+    async run(pos = 0, end = this.runData.length) {
         if (this.runData.length != 0) {
             for (let i = pos; i < end; i++) {
                 if (i < this.runData.length) {
@@ -28,7 +33,9 @@ export class RunSteps {
             wSocketIo.end();
         }
     }
-    size() { return this.runData.length; }
+    size() {
+        return this.runData.length;
+    }
     close() {
         this.runData = [];
         context.resetVariables();

package/bin/core/step.context.js

@@ -49,7 +49,7 @@ export default class StepContext {
         // console.log('variables: ', [...ctxVars.map<string>(v => `${v.name}=${v.value}`)])
         this.params.map((param) => {
             // console.log('Parameter ', {...param})
-            if (param.value[0] === "=" && param.type) {
+            if (param.value && param.value[0] === "=" && param.type) {
                 let input = param.value;
                 if (input[0] === '=')
                     input = input.slice(1);

package/bin/core/wsocket.io.d.ts

@@ -11,10 +11,12 @@ declare class WsocketIo {
      */
     end(): void;
     private onError;
-    /** Réception des données d'exécution en mode Debug **/
-    private onDebugData;
+    private onRundataOldVersion;
+    /** Réception des données d'exécution **/
+    private onData;
     /** Ordre d'exécution en mode Debug**/
     private onDebugRun;
+    private onRun;
     private onDebugStop;
     /** Ordre d'exécution en mode Job **/
     private onRundata;

package/bin/core/wsocket.io.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wsocket.io.d.ts","sourceRoot":"","sources":["../../src/core/wsocket.io.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,MAAM,EAAC,MAAM,kBAAkB,CAAC;AAW5C,cAAM,SAAS;IACN,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IACrC,OAAO,CAAC,QAAQ,CAAwB;IACxC,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,MAAM,CAAa;IAEpB,KAAK;IAkDL,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAQjD;;OAEG;IACI,GAAG;IASV,OAAO,CAAC,OAAO,CAUd;IAED,uDAAuD;IACvD,OAAO,CAAC,WAAW,CAGlB;IAED,sCAAsC;IACtC,OAAO,CAAC,UAAU,CAYjB;IAED,OAAO,CAAC,WAAW,CAGlB;IAED,qCAAqC;IACrC,OAAO,CAAC,SAAS,CAGhB;IAED,OAAO,CAAC,QAAQ,CAIf;IAED,OAAO,CAAC,MAAM,CAGb;IAED,OAAO,CAAC,SAAS,CAOhB;CAEF;AAED,QAAA,MAAM,SAAS,WAAkB,CAAA;AACjC,eAAe,SAAS,CAAA"}
+{"version":3,"file":"wsocket.io.d.ts","sourceRoot":"","sources":["../../src/core/wsocket.io.ts"],"names":[],"mappings":"AAAA,OAAO,EAAK,MAAM,EAAC,MAAM,kBAAkB,CAAC;AAW5C,cAAM,SAAS;IACN,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAO;IACrC,OAAO,CAAC,QAAQ,CAAwB;IACxC,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,MAAM,CAAa;IAEpB,KAAK;IAoDL,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAQjD;;OAEG;IACI,GAAG;IASV,OAAO,CAAC,OAAO,CAUd;IAED,OAAO,CAAC,mBAAmB,CAU1B;IAED,yCAAyC;IACzC,OAAO,CAAC,MAAM,CAGb;IAED,sCAAsC;IACtC,OAAO,CAAC,UAAU,CAGjB;YAEa,KAAK;IAanB,OAAO,CAAC,WAAW,CAGlB;IAED,qCAAqC;IACrC,OAAO,CAAC,SAAS,CAIhB;IAED,OAAO,CAAC,QAAQ,CAIf;IAED,OAAO,CAAC,MAAM,CAGb;IAED,OAAO,CAAC,SAAS,CAOhB;CAEF;AAED,QAAA,MAAM,SAAS,WAAkB,CAAA;AACjC,eAAe,SAAS,CAAA"}

package/bin/core/wsocket.io.js

@@ -37,10 +37,12 @@ class WsocketIo {
             console.log(`Terminal ${scapinAgentId} is now connected to automation server!`);
         }));
         this.ioClient.on('connect_error', this.onError);
-        this.ioClient.on('data', this.onDebugData);
-        this.ioClient.on('run', this.onDebugRun);
-        this.ioClient.on('stop-debugger', this.onDebugStop);
-        this.ioClient.on('run-data', this.onRundata);
+        this.ioClient.on('data', this.onRundataOldVersion);
+        this.ioClient.on('rundata', this.onRundataOldVersion);
+        this.ioClient.on('debug-data', this.onData);
+        this.ioClient.on('debug-run', this.onDebugRun);
+        this.ioClient.on('debug-stop', this.onDebugStop);
+        this.ioClient.on('job-run-data', this.onRundata);
         this.ioClient.on('status', this.onStatus);
         this.ioClient.on('status-ping', this.onPing);
         this.ioClient.on('stop-run', this.onStopRun);
@@ -83,17 +85,32 @@ class WsocketIo {
             }
         }
     };
-    /** Réception des données d'exécution en mode Debug **/
-    onDebugData = (stepsData, runVar) => {
+    onRundataOldVersion = async (stepsdata) => {
+        // console.log(`Réception event 'data' :`, stepsdata)
+        this.runSteps = new RunSteps(stepsdata, []);
+        try {
+            await this.runSteps.run();
+            wSocketIo.end();
+        }
+        catch (e) {
+            console.log('Unexpected error : ' + e.message);
+            wSocketIo.end();
+        }
+    };
+    /** Réception des données d'exécution **/
+    onData = (stepsData, runVar) => {
         console.log(`Data of the run are: ${stepsData?.length || 0} steps and ${runVar?.length || 0} variables`);
         this.runSteps = stepsData && runVar ? new RunSteps(stepsData, runVar) : null;
     };
     /** Ordre d'exécution en mode Debug**/
     onDebugRun = async (pos, end) => {
         console.log(`Running in Debug mode from ${pos} to ${end}`);
-        if (this.runSteps && typeof pos === 'number' && typeof end === 'number') {
+        await this.onRun(pos, end);
+    };
+    async onRun(start, end) {
+        if (this.runSteps && typeof start === 'number' && typeof end === 'number') {
             try {
-                await this.runSteps.run(pos, end);
+                await this.runSteps.run(start, end);
             }
             catch (e) {
                 console.log('Unexpected error : ' + e.message);
@@ -103,15 +120,16 @@ class WsocketIo {
         else {
             console.log("Invalid executive data");
         }
-    };
+    }
     onDebugStop = () => {
         console.log("Arrêt du mode debug");
         wSocketIo.end();
     };
     /** Ordre d'exécution en mode Job **/
     onRundata = async (stepsData, runVars) => {
-        this.onDebugData(stepsData, runVars);
-        await this.onDebugRun(0, this.runSteps?.size() || 0);
+        this.onData(stepsData, runVars);
+        await this.onRun(0, this.runSteps?.size() || 0);
+        wSocketIo.end();
     };
     onStatus = () => {
         if (this.ioClient) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kogeet/scapin-core-agent",
-  "version": "0.1.8",
+  "version": "0.2.1",
   "description": "Scapin Core Agent",
   "author": "Loïc Griveau",
   "license": "MIT",