refactoring scripts

DApp/README.md

@@ -88,29 +88,54 @@ You can verify if your wallet was successfully configured with the command:
 The DAPP in DESMO-LD project will be used by the Iexec worker pool, it needs to be dockerized, published on docker-hub, and finally registered on iexec.
 
 ```bash
-docker build . --tag desmo-dapp
+npm run clean
 ```
-Now you can run the DApp locally.
+Build the TS code
 ```bash
-./scripts/runLocally.bat
+npm run build
 ```
-If you want to change the argument passed to the DApp, you can edit the `runLocally.bat` file.
+Now you can run the DApp locally with a test query.
+```bash
+npm start
+```
+If you want to change the argument passed to the DApp, you can edit the `package.json` file.
 The first argument is the RequestID (used in the DApp to get the list of Directory from the chain). The second one is the query that the DApp needs to resolve, the query is a stringify json with some replacements: you must use `__!_` instead of the double quotes `"` and `--#-` instead of the single quote `'`.
 
+Build the docker image
+```bash
+npm run docker_build
+```
 
 Publish the DApp on docker-hub.
 ```bash
-dockerPush.bat
+docker tag desmo-dapp <your_docker_username>/desmo-dapp:1.0.0
+docker push <your_docker_username>/desmo-dapp:1.0.0
 ```
+
+You can check if the image work, running it locally
+```bash
+npm run docker_run
+```
+
 Copy the checksum of the docker image in the file `iexec.json` under `app.checksumm`.
 Check the `app.multiaddr` and `app.owner`  of the same file.
 
 Register the DApp on IExec.
 ```bash
-./scripts/onChainDeploy.bat
+npm run onchain_deploy
 ```
-With that script will be shown the chain that you are using, make sure to use Viviani which is the free one.
-​
+
+Make sure to use Viviani which is the free chain.
+​```bash
+iexec app show --chain viviani
+iexec account show --chain viviani
+```
+
+Tun the Dapp on a workerpool
+```bash
+npm run onchain_run
+```
+
 If you want that others can run your application you must create an app order. For this run the following command: 
 ​
 ```bash

DApp/package.json

@@ -6,8 +6,14 @@
   "scripts": { 
     "clean": "rimraf build",
     "build": "tsc",
-    "test":"npx jest /tests",
-    "lint": "eslint . --ext .ts"
+    "start":"node build/app.js \"0x000000000000000000000000000000000000000000000000000000000000000b\" \"{__!_prefixList__!_:[{__!_abbreviation__!_:__!_desmo__!_,__!_completeURI__!_:__!_https://desmo.vaimee.it/__!_},{__!_abbreviation__!_:__!_qudt__!_,__!_completeURI__!_:__!_http://qudt.org/schema/qudt/__!_},{__!_abbreviation__!_:__!_xsd__!_,__!_completeURI__!_:__!_http://www.w3.org/2001/XMLSchema/__!_},{__!_abbreviation__!_:__!_monas__!_,__!_completeURI__!_:__!_https://pod.dasibreaker.vaimee.it/monas/__!_}],__!_property__!_:{__!_identifier__!_:__!_value__!_,__!_unit__!_:__!_qudt:DEG_C__!_,__!_datatype__!_:1},__!_staticFilter__!_:__!_$[?(@[--#-type--#-]==--#-Sensor--#-)]__!_}\"",
+    "test":"cd tests && npx jest",
+    "lint": "eslint . --ext .ts",
+    "docker_build": "docker build . --tag desmo-dapp",
+    "docker_run": "docker run --rm -v %CD%/mount/iexec_in:/iexec_in -v %CD%/mount/iexec_out:/iexec_out -e IEXEC_IN=/iexec_in -e IEXEC_OUT=/iexec_out desmo-dapp \"0x000000000000000000000000000000000000000000000000000000000000000b\" \"{__!_prefixList__!_:[{__!_abbreviation__!_:__!_desmo__!_,__!_completeURI__!_:__!_https://desmo.vaimee.it/__!_},{__!_abbreviation__!_:__!_qudt__!_,__!_completeURI__!_:__!_http://qudt.org/schema/qudt/__!_},{__!_abbreviation__!_:__!_xsd__!_,__!_completeURI__!_:__!_http://www.w3.org/2001/XMLSchema/__!_},{__!_abbreviation__!_:__!_monas__!_,__!_completeURI__!_:__!_https://pod.dasibreaker.vaimee.it/monas/__!_}],__!_property__!_:{__!_identifier__!_:__!_value__!_,__!_unit__!_:__!_qudt:DEG_C__!_,__!_datatype__!_:1},__!_staticFilter__!_:__!_$[?(@[--#-type--#-]==--#-Sensor--#-)]__!_}\"",
+    "onchain_deploy":"iexec app deploy --chain viviani",
+    "onchain_run":"iexec app run --watch --chain viviani"
+
   },
   "repository": {
     "type": "git",

DApp/src/model/WotSource.ts

@@ -29,7 +29,7 @@ export default class WotSource implements ISource {
         try {
             const reader = await this.thing.readProperty(this.propertyName);
             const ris = await reader.value();
-            Logger.getInstance().addLog(componentName, "Ask for a velue, response: " + ris);
+            Logger.getInstance().addLog(componentName, "Ask for a value, response: " + ris);
 
             if (ris === null) {
                 Logger.getInstance().addLog(componentName, "Not valid value getted by source: " + this.index, true);

DApp/tsconfig.json

@@ -102,8 +102,11 @@
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
     "skipLibCheck": true,                                 /* Skip type checking all .d.ts files. */
     "paths": {
-      "$/*": ["./src/*"],
-      "$test/*": ["./test/*"]
+      "src/": ["./src/*"]
     }
-  }
+  },
+  "exclude": [
+    "support",
+    "tests"
+  ]
 }