überlegung windows

This commit is contained in:
chk
2026-04-26 20:38:21 +02:00
parent 355925ebb4
commit ad1fc58186
6 changed files with 1573 additions and 20 deletions

View File

@@ -1,8 +1,8 @@
G90 G1 x0 y300 z0 a90.00 b-90.00 c0.00 e0.00 t176148132360 f1000 G90 G1 x0 y300 z0 a90.00 b-90.00 c0.00 e0.00 t176148132360 f1000
G90 G1 x-50 y300 z0 a131.25 b-90.00 c0.00 e0.00 t176148136260 f1000 G90 G1 x-50 y300 z0 a131.25 b-90.00 c0.00 e0.00 t176148136260 f1000
G90 G1 x-128.5 y410 z-11 a134.11 b-90.00 c9.74 e-57.30 t176148145060 f1000 G90 G1 x-128.5 y410 z-11 a134.11 b-90.00 c9.74 e-57.30 t176148145060 f1000
G90 G1 x-128.5 y410 z-11 a134.11 b-90.00 c9.74 e62.45 t176148148860 f1000;! G90 G1 x-128.5 y410 z-11 a134.11 b-90.00 c9.74 e62.45 t176148148860 f1000
G90 G1 x-128.5 y410 z35 a134.11 b-90.00 c9.74 e62.45 t176148149240 f1000 G90 G1 x-128.5 y410 z35 a134.11 b-90.00 c9.74 e62.45 t176148149240 f1000;!
G90 G1 x-128.5 y410 z35 a163.90 b-90.00 c9.74 e62.45 t176148149980 f1000 G90 G1 x-128.5 y410 z35 a163.90 b-90.00 c9.74 e62.45 t176148149980 f1000
G90 G1 x-128.5 y410 z35 a84.84 b-90.00 c9.74 e62.45 t176148150690 f1000 G90 G1 x-128.5 y410 z35 a84.84 b-90.00 c9.74 e62.45 t176148150690 f1000
G90 G1 x-128.5 y410 z-21 a84.84 b-88.85 c9.74 e62.45 t176148152270 f1000 G90 G1 x-128.5 y410 z-21 a84.84 b-88.85 c9.74 e62.45 t176148152270 f1000

94
docker-compose-win.yaml Normal file
View File

@@ -0,0 +1,94 @@
services:
appRobotGuacamole:
image: abesnier/guacamole:latest
container_name: appRobot_guacamole
ports:
- "9080:8080"
volumes:
- C:/Users/kech/SynologyDrive/2026-AppServer-AppRobot/guacamole/guacamole/config:/config/guacamole
- C:/Users/kech/SynologyDrive/2026-AppServer-AppRobot/guacamole/postgres:/config/postgres
restart: unless-stopped
extra_hosts:
- "host.docker.internal:host-gateway"
networks:
- default
appRobotDriver:
container_name: appRobot_Driver
image: node:24-alpine
working_dir: /usr/src/app
volumes:
- C:/Users/kech/SynologyDrive/2026-AppServer-AppRobot/appRobotDriver:/usr/src/app
command: npm start
restart: unless-stopped
environment:
- GRBL_BASE_IP=192.168.0.183
- GRBL_ELLBOW_IP=192.168.0.202
- GRBL_HAND_IP=192.168.0.250
ports:
- "2096:2095"
- "2098:2098"
expose:
- "2095"
networks:
- default
appRobotSimulation:
container_name: appRobot_Simulation
image: node:24-alpine
working_dir: /usr/src/app
volumes:
- C:/Users/kech/SynologyDrive/2026-AppServer-AppRobot/appRobotSimulation:/usr/src/app
environment:
- TARGET_SERVER=wss://appRobot_Driver:2095
command: npm start
restart: unless-stopped
ports:
- "1003:1003"
networks:
- default
appRobotControl:
image: node:24-alpine
container_name: appRobot_Control
working_dir: /app
command: sh -c "npm install && node 3DInput.js"
ports:
- "10010:10010"
volumes:
- C:/Users/kech/SynologyDrive/2026-AppServer-AppRobot/appRobotControl:/app
environment:
- NODE_ENV=production
- TARGET_SERVER=wss://appRobot_Driver:2095
depends_on:
- appRobotDriver
restart: unless-stopped
appRobotHoming:
image: node:24-alpine
container_name: appRobot_Homing
working_dir: /app
volumes:
- C:/Users/kech/SynologyDrive/2026-AppServer-AppRobot/appRobotHoming:/app
- C:/Users/kech/SynologyDrive/2026-AppServer-AppRobot/AppRobotVideo/public/snapshots:/app/public/snapshots
environment:
- WSS_VIDEO_DRIVER=wss://localhost:8448
- WSS_URL=wss://appRobot_Driver:2095
- HTTPS_PORT=2093
ports:
- "2093:2093"
depends_on:
- appRobotDriver
command: >
/bin/sh -lc "npm ci || npm install && node server/server.js"
networks:
- default
restart: unless-stopped
networks:
default:
driver: bridge

View File

@@ -10145,3 +10145,14 @@
2026-04-23T18:26:19.000Z ::ffff:172.21.0.6: G91 G1 Y-10 F1000 2026-04-23T18:26:19.000Z ::ffff:172.21.0.6: G91 G1 Y-10 F1000
2026-04-23T18:26:19.159Z ::ffff:172.21.0.6: G91 G1 Y-10 F1000 2026-04-23T18:26:19.159Z ::ffff:172.21.0.6: G91 G1 Y-10 F1000
2026-04-23T18:26:19.536Z ::ffff:172.21.0.6: G91 G1 Y-10 F1000 2026-04-23T18:26:19.536Z ::ffff:172.21.0.6: G91 G1 Y-10 F1000
2026-04-25T05:25:32.220Z ::ffff:172.19.0.5: FShow
2026-04-25T05:26:34.909Z ::ffff:172.19.0.5: FPlus
2026-04-25T06:08:07.648Z ::ffff:172.19.0.5: FShow
2026-04-25T06:32:03.748Z ::ffff:172.19.0.5: FShow
2026-04-25T21:13:52.618Z ::ffff:172.19.0.5: FShow
2026-04-25T21:20:17.483Z ::ffff:172.19.0.5: FShow
2026-04-25T21:24:31.067Z ::ffff:172.19.0.5: FShow
2026-04-26T15:22:42.831Z ::ffff:172.19.0.5: FShow
2026-04-26T15:31:01.738Z ::ffff:172.19.0.5: FShow
2026-04-26T15:31:13.510Z ::ffff:172.19.0.5: FShow
2026-04-26T15:31:51.957Z ::ffff:172.19.0.5: FShow

File diff suppressed because it is too large Load Diff

View File

@@ -74,9 +74,9 @@ function logCommand(state, ip, message) {
function logPing(state, ip) { function logPing(state, ip) {
fs.appendFileSync( fs.appendFileSync(
'./logs/pings.log', './logs/pings.log',
`${new Date().toISOString()} ${ip}: Ping\n` `${new Date().toISOString()} ${ip} : Ping\n`
); );
state.lastPings.push(`${new Date().toISOString()}: Ping`); state.lastPings.push(`${new Date().toISOString()} ${ip} : Ping`);
if (state.lastPings.length > 10) state.lastPings.shift(); if (state.lastPings.length > 10) state.lastPings.shift();
} }

View File

@@ -1,38 +1,33 @@
const fs = require('fs'); const fs = require('fs');
const https = require('https'); const https = require('https');
const Robot = require('./robot/Robot'); const Robot = require('./robot/Robot');
const GCode = require('./robot/GCode'); const GCode = require('./robot/GCode');
const TenetSender = require('./robot/TelnetSenderGRBL');
const robot = new Robot(250, 264, 100);
const initInputWS = require('./server/InputWS'); const initInputWS = require('./server/InputWS');
const createInfoServer = require('./server/InfoServer'); const createInfoServer = require('./server/InfoServer');
const TenetSender = require('./robot/TelnetSenderGRBL'); /* ---------- HTTPS Server to connect to---------- */
/* ---------- Robot ---------- */
const robot = new Robot(250, 264, 100);
/* ---------- Shared State ---------- */
const sharedState = {
connectedClients: [],
lastCommands: [],
lastPings: []
};
/* ---------- HTTPS ---------- */
const httpsOptions = { const httpsOptions = {
enable: true, enable: true,
key: fs.readFileSync('https/localhost.key'), key: fs.readFileSync('https/localhost.key'),
cert: fs.readFileSync('https/localhost.pem'), cert: fs.readFileSync('https/localhost.pem'),
passphrase: 'abcd' passphrase: 'abcd'
}; };
const httpsServer = https.createServer(httpsOptions); const httpsServer = https.createServer(httpsOptions);
/* ---------- WebSocket Input ---------- */ /* ---------- WebSocket Input ---------- */
const sharedState = {
connectedClients: [],
lastCommands: [],
lastPings: []
};
initInputWS(httpsServer, robot, GCode, sharedState); initInputWS(httpsServer, robot, GCode, sharedState);
/* ---------- GRBL Sender ---------- */ /* ---------- GRBL Sender take commands from robot to FluidNC or Hardware---------- */
const baseIP = process.env.GRBL_BASE_IP ?? "fluidNcBase.local"; const baseIP = process.env.GRBL_BASE_IP ?? "fluidNcBase.local";
const elbowIP= process.env.GRBL_ELLBOW_IP ?? "fluidNcEllbow.local"; const elbowIP= process.env.GRBL_ELLBOW_IP ?? "fluidNcEllbow.local";
const handIP = process.env.GRBL_HAND_IP ?? "fluidNcHand.local"; const handIP = process.env.GRBL_HAND_IP ?? "fluidNcHand.local";