@kogeet/scapin-core-agent 0.1.6 → 0.1.7

package/bin/core/context.d.ts

@@ -1,5 +1,5 @@
-import type { RunParamModel } from '../models/run.model.js';
 import { type varType } from '../models/parameter.model.js';
+import type { RunParamModel } from '../models/run.model.js';
 /**
  * La classe **Context** stocke les variables utilisées lors du test
  */
@@ -11,7 +11,10 @@ export declare class Context {
     loadVariable(params: RunParamModel[]): void;
     valorize(param: RunParamModel): void;
     dump(): [string, varType][];
-    resetVariables(): void;
+    resetVariables(rVars?: {
+        name: string;
+        value: varType;
+    }[]): void;
 }
 export declare const context: Context;
 //# sourceMappingURL=context.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/core/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAgB,KAAK,OAAO,EAAC,MAAM,8BAA8B,CAAA;AAExE;;GAEG;AACH,qBAAa,OAAO;IACX,OAAO,EAAE,MAAM,CAAM;IAE5B,OAAO,CAAC,SAAS,CAA6B;IAEvC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIrC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAM3C,YAAY,CAAC,MAAM,EAAE,aAAa,EAAE;IAgBpC,QAAQ,CAAC,KAAK,EAAE,aAAa;IAiB7B,IAAI;IAIJ,cAAc;CAGtB;AAED,eAAO,MAAM,OAAO,SAAgB,CAAA"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/core/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,KAAK,OAAO,EAAC,MAAM,8BAA8B,CAAA;AACxE,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAE1D;;GAEG;AACH,qBAAa,OAAO;IACX,OAAO,EAAE,MAAM,CAAM;IAE5B,OAAO,CAAC,SAAS,CAA6B;IAEvC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIrC,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IAM3C,YAAY,CAAC,MAAM,EAAE,aAAa,EAAE;IAgBpC,QAAQ,CAAC,KAAK,EAAE,aAAa;IAiB7B,IAAI;IAIJ,cAAc,CAAC,KAAK,GAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,EAAO;CAMrE;AAED,eAAO,MAAM,OAAO,SAAgB,CAAA"}

package/bin/core/context.js

@@ -47,8 +47,11 @@ export class Context {
     dump() {
         return [...this.variables.entries()];
     }
-    resetVariables() {
+    resetVariables(rVars = []) {
         this.variables.clear();
+        rVars.forEach((v) => {
+            this.setVariable(v.name, v.value);
+        });
     }
 }
 export const context = new Context();

package/bin/core/runsteps.d.ts

@@ -1,9 +1,12 @@
-import type { RunDataStepModel } from '../models/run.model.js';
+import type { RunDataStepModel, Variable } from '../models/run.model.js';
 export declare class RunSteps {
+    private runData;
     private runstep;
     private stepCtx;
     stop: boolean;
-    run(data: RunDataStepModel[] | RunDataStepModel | undefined): Promise<void>;
+    constructor(rData: RunDataStepModel[], rVars: Variable[]);
+    run(pos: number, end: number): Promise<void>;
+    size(): number;
     private runAStep;
 }
 //# sourceMappingURL=runsteps.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"runsteps.d.ts","sourceRoot":"","sources":["../../src/core/runsteps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,wBAAwB,CAAA;AAM5D,qBAAa,QAAQ;IACnB,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,OAAO,CAA2B;IACnC,IAAI,EAAE,OAAO,CAAQ;IAEf,GAAG,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,GAAG,SAAS;YAoB1D,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,CAAU;IACzB,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;IAgBlC,IAAI;YAEG,QAAQ;CAwBvB"}

package/bin/core/runsteps.js

@@ -1,29 +1,32 @@
-import RunStep from './runstep.js';
-import StepContext from './step.context.js';
 import wSocketIo from './wsocket.io.js';
 import { context, report } from "../index.js";
+import StepContext from './step.context.js';
+import RunStep from './runstep.js';
 export class RunSteps {
+    runData;
     runstep;
     stepCtx = null;
     stop = false;
-    async run(data) {
-        this.runstep = new RunStep();
-        if (data) {
-            const rundata = !Array.isArray(data) ? [data] : data;
-            context.resetVariables();
-            for (const step of rundata) {
+    constructor(rData, rVars) {
+        this.runData = rData;
+        context.resetVariables(rVars);
+    }
+    async run(pos, end) {
+        if (this.runData.length != 0 && pos != end) {
+            for (let i = pos; i < end; i++) {
+                const step = this.runData[i];
                 await this.runAStep(step);
                 if (this.stop) {
                     break;
                 }
             }
-            wSocketIo.end();
         }
         else {
             report.error('No steps data found');
             wSocketIo.end();
         }
     }
+    size() { return this.runData.length; }
     async runAStep(step) {
         let stepResult;
         report.stepStart(step.pos);

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

@@ -1,7 +1,7 @@
 import { Socket } from "socket.io-client";
 declare class WsocketIo {
     ioClient: Socket | null;
-    private runsteps;
+    private runSteps;
     private connected;
     private termId;
     start(): void;
@@ -11,6 +11,11 @@ declare class WsocketIo {
      */
     end(): void;
     private onError;
+    /** Réception des données d'exécution en mode Debug **/
+    private onDebugData;
+    /** Ordre d'exécution en mode Debug**/
+    private onDebugRun;
+    /** Ordre d'exécution en mode Job **/
     private onRundata;
     private onStatus;
     private onPing;

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;IAgDL,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAQjD;;OAEG;IACI,GAAG;IAQV,OAAO,CAAC,OAAO,CAUd;IAED,OAAO,CAAC,SAAS,CAQhB;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;IAiDL,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAQjD;;OAEG;IACI,GAAG;IAQV,OAAO,CAAC,OAAO,CAUd;IAED,uDAAuD;IACvD,OAAO,CAAC,WAAW,CAGlB;IAED,sCAAsC;IACtC,OAAO,CAAC,UAAU,CAWjB;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"}

package/bin/core/wsocket.io.js

@@ -1,11 +1,11 @@
 import { io, Socket } from "socket.io-client";
-import { RunSteps } from './runsteps.js';
 import { report } from "../index.js";
+import { RunSteps } from './runsteps.js';
 const url = process.env.ScapinServerURL || 'https://scapin.loicg.com';
 const scapinAgentId = process.env.ScapinAgentId;
 class WsocketIo {
     ioClient = null;
-    runsteps = null;
+    runSteps = null;
     connected = true;
     termId = '';
     start() {
@@ -37,11 +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.onRundata);
-        this.ioClient.on('rundata', this.onRundata);
+        this.ioClient.on('data', this.onDebugData);
+        this.ioClient.on('run', this.onDebugRun);
+        this.ioClient.on('run-data', this.onRundata);
         this.ioClient.on('status', this.onStatus);
         this.ioClient.on('status-ping', this.onPing);
-        this.ioClient.on('stoprun', this.onStopRun);
+        this.ioClient.on('stop-run', this.onStopRun);
         // this.ioClient.on('reconnect_attempt', (n: number) => { console.log(`${n} tentative de reconnexion`)})
         this.ioClient.on('reconnect', (n) => {
             console.log(`${n} reconnexion réussies`);
@@ -65,7 +66,7 @@ class WsocketIo {
         if (this.ioClient) {
             this.ioClient.emit('end');
         }
-        this.runsteps = null;
+        this.runSteps = null;
         report.clearStepLog();
     }
     onError = (err) => {
@@ -80,19 +81,33 @@ class WsocketIo {
             }
         }
     };
-    onRundata = async (stepsdata) => {
-        this.runsteps = new RunSteps();
-        try {
-            await this.runsteps.run(stepsdata);
+    /** Réception des données d'exécution en mode Debug **/
+    onDebugData = (stepsData, runVar) => {
+        this.runSteps = stepsData && runVar ? new RunSteps(stepsData, runVar) : null;
+    };
+    /** Ordre d'exécution en mode Debug**/
+    onDebugRun = async (pos, end) => {
+        if (this.runSteps && pos && end) {
+            try {
+                await this.runSteps.run(pos, end);
+            }
+            catch (e) {
+                console.log('Unexpected error : ' + e.message);
+                wSocketIo.end();
+            }
         }
-        catch (e) {
-            console.log('Unexpected error : ' + e.message);
-            wSocketIo.end();
+        else {
+            console.log("Invalid executive data");
         }
     };
+    /** Ordre d'exécution en mode Job **/
+    onRundata = async (stepsData, runVars) => {
+        this.onDebugData(stepsData, runVars);
+        await this.onDebugRun(0, this.runSteps?.size() || 0);
+    };
     onStatus = () => {
         if (this.ioClient) {
-            this.ioClient.emit('status', this.runsteps ? 'busy' : 'available');
+            this.ioClient.emit('status', this.runSteps ? 'busy' : 'available');
         }
     };
     onPing = (ack) => {
@@ -101,10 +116,10 @@ class WsocketIo {
     };
     onStopRun = () => {
         console.log('onStopRun');
-        if (this.runsteps) {
-            this.runsteps.stop = true;
+        if (this.runSteps) {
+            this.runSteps.stop = true;
         }
-        this.runsteps = null;
+        this.runSteps = null;
         report.clearStepLog();
     };
 }

package/bin/models/run.model.d.ts

@@ -54,4 +54,8 @@ export declare const logLevel: Readonly<{
     error: 2;
     toString(n: number | undefined): "error" | "" | "info" | "warning";
 }>;
+export interface Variable {
+    name: string;
+    value: string;
+}
 //# sourceMappingURL=run.model.d.ts.map

package/bin/models/run.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.model.d.ts","sourceRoot":"","sources":["../../src/models/run.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAE,KAAK,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAEjE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,aAAa,CAAA;IACnB,GAAG,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IACxB,MAAM,EAAE,aAAa,EAAE,CAAA;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,aAAa,EAAE,CAAC;IAG5B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CACnB;AAED;;;;;GAKG;AACH,MAAM,WAAW,MAAM;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CACpB;AAED,eAAO,MAAM,UAAU;;;;gBAIT,MAAM,GAAG,SAAS;EAQ9B,CAAA;AAEF,eAAO,MAAM,QAAQ;;;;gBAIP,MAAM,GAAG,SAAS;EAQ9B,CAAA"}
+{"version":3,"file":"run.model.d.ts","sourceRoot":"","sources":["../../src/models/run.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAE,KAAK,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAEjE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,aAAa,CAAA;IACnB,GAAG,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IACxB,MAAM,EAAE,aAAa,EAAE,CAAA;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,aAAa,EAAE,CAAC;IAG5B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CACnB;AAED;;;;;GAKG;AACH,MAAM,WAAW,MAAM;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;CACpB;AAED,eAAO,MAAM,UAAU;;;;gBAIT,MAAM,GAAG,SAAS;EAW9B,CAAA;AAEF,eAAO,MAAM,QAAQ;;;;gBAIP,MAAM,GAAG,SAAS;EAW9B,CAAA;AAEF,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAA;CACd"}

package/bin/models/run.model.js

@@ -5,9 +5,12 @@ export const stepStatus = Object.freeze({
     fail: 2,
     toString(n) {
         switch (n) {
-            case 0: return 'cancel';
-            case 1: return 'pass';
-            case 2: return 'fail';
+            case 0:
+                return 'cancel';
+            case 1:
+                return 'pass';
+            case 2:
+                return 'fail';
         }
         return '';
     },
@@ -18,9 +21,12 @@ export const logLevel = Object.freeze({
     error: 2,
     toString(n) {
         switch (n) {
-            case 0: return 'info';
-            case 1: return 'warning';
-            case 2: return 'error';
+            case 0:
+                return 'info';
+            case 1:
+                return 'warning';
+            case 2:
+                return 'error';
         }
         return '';
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kogeet/scapin-core-agent",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Scapin Core Agent",
   "author": "Loïc Griveau",
   "license": "MIT",
@@ -17,15 +17,15 @@
     "np": "np --no-tests --message=core-agent-%s"
   },
   "devDependencies": {
-    "@types/node": "^20.8.8",
-    "@typescript-eslint/eslint-plugin": "^6.8.0",
-    "@typescript-eslint/parser": "^6.8.0",
-    "eslint": "^8.51.0",
-    "typescript": "^5.2.2"
+    "@types/node": "^25.3.3",
+    "@typescript-eslint/eslint-plugin": "^8.56.1",
+    "@typescript-eslint/parser": "^8.56.1",
+    "eslint": "^9.39.3",
+    "typescript": "^5.9.3"
   },
   "dependencies": {
     "jison": "^0.4.18",
-    "socket.io-client": "^4.7.2"
+    "socket.io-client": "^4.8.3"
   },
   "type": "module"
 }