Add typescript to project and prisma for db

Author: janzwiegers

README.md

@@ -4,6 +4,7 @@ This is a reworked version from the original, which was mainly written for test
 
 ## Status!
 Very much still a work in progress :)
+Add TypeScript & Prisma to the project
 
 ## Variants
 |Robot-T200|Robot-T201|Robot-T202|Robot-T203|
@@ -16,7 +17,6 @@ Very much still a work in progress :)
 * Robot-T420 QT application support
 
 ## Implementation Supported
-
 * Packer Terminals
 * Pallet Scales
 * Scanner Stations

config/robots.json

@@ -1,10 +1,9 @@
 {
 
   "robots" : [
-
     {
-      "tagName" : "SOLAS Station 2",
-      "macAddress" : "00:60:35:16:E4:06",
+      "tagName" : "Raspberry PI Station",
+      "macAddress" : "E4:5F:01:50:EC:E0",
       "message" : "SOLAS Scale Ready!",
       "type" : "AUTO",
       "config" : { 
@@ -13,7 +12,7 @@
           "highLimit" : "1100.0",
           "security" : "OPEN",
           "units" : "kg",
-          "serverURL" : "http://192.168.1.194:8086/api/robots/scale"
+          "serverURL" : "http://192.168.1.194:8080/api/robots/scale"
       },
       "labels" : [
         {"B1" : "RED APPLES x 1"},
@@ -25,20 +24,31 @@
     },
 
     {
-      "tagName" : "Label Print Station",
-      "macAddress" : "00:60:35:24:42:85",
-      "message" : "Label printer ready",
+      "tagName" : "Label Print PC Station",
+      "macAddress" : "74:D0:2B:C5:2A:04",
+      "message" : "PC Scale ready!",
       "type" : "AUTO",
       "config" : { 
-        "type" : "DUALSCAN",
+        "type" : "SCALE",
         "security" : "OPEN",
-        "serverURL" : "http://192.168.1.194:8086/api/robots/label"
+        "serverURL" : "http://192.168.1.194:8080/api/robots/scan"
       },
       "rpcList" : [
         { "REM-PAL" : "Remove pallet" },
         { "EMPTY-PAL" : "Empty pallet" },
         { "DISC-PAL" : "Discard pallet" }
       ]
+    },
+    {
+      "tagName" : "Term Station",
+      "macAddress" : "80:34:28:61:50:42",
+      "message" : "Terminal Station Ready",
+      "type" : "AUTO",
+      "config" : { 
+        "type" : "TERMINAL",
+        "security" : "OPEN",
+        "serverURL" : "http://192.168.1.194:8080/api/robots/term"
+      }
     }
 
 

config/server.json

@@ -1,6 +1,10 @@
 {
   "server" : {
     "ipAddress" : "192.168.1.194",
-    "port" : 8086
+    "port" : 8080,
+    "latency" : {
+      "max" : 1000,
+      "min" : 100
+    }
   }
 }

constants/ROBOT_APP_TYPES.js

@@ -1,7 +1,14 @@
 const ROBOT_APP_TYPES = {
+  APP_TYPE_DISABLED : 'DISABLED',
+  APP_TYPE_REDIRECT : 'REDIRECT',
   APP_TYPE_AUTO : 'AUTO',
-  APP_TYPE_SCALE : 'SOLAS-SCALE',
-   
+  APP_TYPE_TERMINAL : 'TERMINAL',
+  APP_TYPE_SCALE : 'SCALE',
+  APP_TYPE_SCANNER : 'SCANNER',
+  APP_TYPE_BINTIP : 'BINTIP',
+  APP_TYPE_FORKLIFT : 'FORKLIFT',
+  APP_TYPE_DUALSCAN : 'DUALSCAN',
+  APP_TYPE_LABELPRINT : 'LABELPRINT',
 };
 
 module.exports = ROBOT_APP_TYPES;

controllers/robotController.js

@@ -1,8 +1,13 @@
 
 const ROBOT_COMMANDS = require('../constants/ROBOT_COMMANDS');
 const robotServiceProcessor = require('../service/robots/RobotService');
+const { logd } = require('../utils/logger');
 
-const handleResponse = (res, data) => res.status(200).send(data);
+const TAG = "RobotController";
+
+const handleResponse = (res, data) => {
+  res.status(200).send(data);
+}
 
 const handleError = (res, err) => {
   const status = err?.status ?? 500;
@@ -33,7 +38,8 @@ const robotCntrlError = (req, res, next) => {
 
   try {
     const payload = req.body;
-    robotServiceProcessor({requestReset : { MAC : '00:00:00:00:00:00' }}, res, next);
+    const resMsg = robotServiceProcessor({requestReset : { MAC : '00:00:00:00:00:00' }}, res, next);
+    handleResponse(res, resMsg);
   }
   catch(error) {
     // error occured while handling the message
@@ -48,6 +54,7 @@ const robotCntrlSetupPost = (req, res, next) => {
     const payload = req.body;
     const resMsg = robotServiceProcessor(payload);
     if(resMsg) {
+      logd(TAG, "Setup Post", resMsg)
       handleResponse(res, resMsg);
     }
     else {
@@ -67,7 +74,21 @@ const robotCntrlSetupGet = (req, res, next) => {
 }
 
 const robotCntrlScanPost = (req, res, next) => {
-  res.json({});
+  try {
+    const payload = req.body;
+    const resMsg = robotServiceProcessor(payload);
+    if(resMsg) {
+      handleResponse(res, resMsg);
+    }
+    else {
+      // message not supported or not interpreted!
+      next();
+    }
+  }
+  catch(error) {
+    // server error, error occured while handling the message
+    handleError(res, error);
+  }
 }
 
 const robotCntrlScanGet = (req, res, next) => {
@@ -97,7 +118,21 @@ const robotCntrlLabelGet = (req, res, next) => {
 }
 
 const robotCntrlTerminalPost = (req, res, next) => {
-  res.json({});
+  try {
+    const payload = req.body;
+    const resMsg = robotServiceProcessor(payload);
+    if(resMsg) {
+      handleResponse(res, resMsg);
+    }
+    else {
+      // message not supported or not interpreted!
+      next();
+    }
+  }
+  catch(error) {
+    // server error, error occured while handling the message
+    handleError(res, error);
+  }
 }
 
 const robotCntrlTerminalGet = (req, res, next) => {
@@ -120,6 +155,24 @@ const robotCntrlForkliftPost = (req, res, next) => {
   res.json({});
 }
 
+const robotCntrlBootUrl = (req, res, next) => {
+  try {
+    const payload = req.body;
+    const resMsg = robotServiceProcessor(payload);
+    if(resMsg) {
+      handleResponse(res, resMsg);
+    }
+    else {
+      // message not supported or not interpreted!
+      next();
+    }
+  }
+  catch(error) {
+    // server error, error occured while handling the message
+    handleError(res, error);
+  }
+}
+
 
 module.exports = {
   robotCntrlPreProcess,
@@ -136,6 +189,7 @@ module.exports = {
   robotCntrlScaleGet,
   robotCntrlForkliftPost,
   robotCntrlForkliftSvrStatePost,
+  robotCntrlBootUrl,
   robotCntrlError
 }