@fdm-monster/server 1.9.2 → 1.9.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.yarn/install-state.gz +0 -0
- package/RELEASE_NOTES.MD +9 -0
- package/dist/consoles/mock-bambu.server.js +2 -2
- package/dist/consoles/mock-bambu.server.js.map +1 -1
- package/dist/server.constants.js +0 -7
- package/dist/server.constants.js.map +1 -1
- package/dist/services/bambu/bambu-mqtt.adapter.js +1 -1
- package/package.json +6 -6
package/.yarn/install-state.gz
CHANGED
|
Binary file
|
package/RELEASE_NOTES.MD
CHANGED
|
@@ -1,7 +1,16 @@
|
|
|
1
1
|
# Develop
|
|
2
2
|
|
|
3
|
+
# FDM Monster 1.9.3
|
|
4
|
+
|
|
5
|
+
## Fixes
|
|
6
|
+
|
|
7
|
+
- Bambu port was 1883 in code instead of 8883
|
|
8
|
+
- Removed confusing app constants wrongly suggesting mqtt configuration is an option
|
|
9
|
+
|
|
3
10
|
# FDM Monster 1.9.2
|
|
4
11
|
|
|
12
|
+
## Features
|
|
13
|
+
|
|
5
14
|
- Full yaml export with users, roles, settings
|
|
6
15
|
- Full yaml import (especially when getting started)
|
|
7
16
|
- Experimental bambu lab support (tested with mock bambu server)
|
|
@@ -16,7 +16,7 @@ function _interop_require_default(obj) {
|
|
|
16
16
|
};
|
|
17
17
|
}
|
|
18
18
|
const DEFAULT_PORT = 990;
|
|
19
|
-
const DEFAULT_MQTT_PORT =
|
|
19
|
+
const DEFAULT_MQTT_PORT = 8883;
|
|
20
20
|
const DEFAULT_SERIAL = "01P00A000000001";
|
|
21
21
|
const DEFAULT_ACCESS_CODE = "12345678";
|
|
22
22
|
const MESSAGE_INTERVAL = 1000;
|
|
@@ -31,7 +31,7 @@ console.log(`[BAMBU MOCK] Embedded MQTT Broker: localhost:${mqttPort}`);
|
|
|
31
31
|
console.log(`[BAMBU MOCK] Serial: ${serial}`);
|
|
32
32
|
console.log(`[BAMBU MOCK] Access Code: ${accessCode}`);
|
|
33
33
|
console.log(`[BAMBU MOCK] Username: bblp`);
|
|
34
|
-
const aedes = new _aedes.default();
|
|
34
|
+
const aedes = new _aedes.default({});
|
|
35
35
|
const mqttServer = (0, _nodenet.createServer)(aedes.handle);
|
|
36
36
|
mqttServer.listen(mqttPort, ()=>{
|
|
37
37
|
console.log(`[BAMBU MOCK MQTT] Embedded MQTT broker started on port ${mqttPort}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/consoles/mock-bambu.server.ts"],"names":["DEFAULT_PORT","DEFAULT_MQTT_PORT","DEFAULT_SERIAL","DEFAULT_ACCESS_CODE","MESSAGE_INTERVAL","port","process","argv","Number","parseInt","mqttPort","serial","accessCode","console","log","aedes","Aedes","mqttServer","createServer","handle","listen","on","client","id","packet","topic","startsWith","ftpDir","path","join","os","tmpdir","sdcardDir","fs","existsSync","mkdirSync","recursive","generateSelfSignedCert","attrs","name","value","options","days","algorithm","keySize","pems","selfsigned","generate","key","private","cert","minVersion","ciphers","isPrinting","currentPrintFile","printProgress","isPaused","nozzleTemp","bedTemp","printStartTime","PRINT_DURATION","tlsCerts","ftpServer","FtpSrv","url","pasv_url","pasv_min","pasv_max","tls","anonymous","greeting","connection","username","password","resolve","reject","root","Error","context","error","then","mqttClient","mqtt","connect","clientId","Date","now","reportTopic","requestTopic","subscribe","err","publishState","elapsedSeconds","Math","min","max","state","print","nozzle_temper","round","nozzle_target_temper","bed_temper","bed_target_temper","chamber_temper","mc_percent","mc_remaining_time","mc_print_stage","gcode_state","gcode_file","wifi_signal","layer_num","floor","total_layer_num","subtask_name","heatbreak_fan_speed","cooling_fan_speed","big_fan1_speed","big_fan2_speed","spd_lvl","spd_mag","print_error","lifecycle","command","msg","sequence_id","String","publish","JSON","stringify","qos","setInterval","message","payload","parse","toString","filename","param","endsWith","pausedProgress","connected","endAsync","Promise","close","exit","catch"],"mappings":";;;;+DAwCmB;6DACF;iEACA;+DACF;+DACA;mEACQ;8DAEL;yBACW;;;;;;AAE7B,MAAMA,eAAe;AACrB,MAAMC,oBAAoB;AAC1B,MAAMC,iBAAiB;AACvB,MAAMC,sBAAsB;AAC5B,MAAMC,mBAAmB;AAEzB,MAAMC,OAAOC,QAAQC,IAAI,CAAC,EAAE,GAAGC,OAAOC,QAAQ,CAACH,QAAQC,IAAI,CAAC,EAAE,IAAIP;AAClE,MAAMU,WAAWJ,QAAQC,IAAI,CAAC,EAAE,GAAGC,OAAOC,QAAQ,CAACH,QAAQC,IAAI,CAAC,EAAE,IAAIN;AACtE,MAAMU,SAASL,QAAQC,IAAI,CAAC,EAAE,IAAIL;AAClC,MAAMU,aAAaN,QAAQC,IAAI,CAAC,EAAE,IAAIJ;AAEtCU,QAAQC,GAAG,CAAC,CAAC,2CAA2C,CAAC;AACzDD,QAAQC,GAAG,CAAC,CAAC,2BAA2B,CAAC;AACzCD,QAAQC,GAAG,CAAC,CAAC,yBAAyB,EAAET,MAAM;AAC9CQ,QAAQC,GAAG,CAAC,CAAC,+CAA+C,EAAEJ,UAAU;AACxEG,QAAQC,GAAG,CAAC,CAAC,uBAAuB,EAAEH,QAAQ;AAC9CE,QAAQC,GAAG,CAAC,CAAC,4BAA4B,EAAEF,YAAY;AACvDC,QAAQC,GAAG,CAAC,CAAC,6BAA6B,CAAC;AAG3C,MAAMC,QAAQ,IAAIC,cAAK;
|
|
1
|
+
{"version":3,"sources":["../../src/consoles/mock-bambu.server.ts"],"names":["DEFAULT_PORT","DEFAULT_MQTT_PORT","DEFAULT_SERIAL","DEFAULT_ACCESS_CODE","MESSAGE_INTERVAL","port","process","argv","Number","parseInt","mqttPort","serial","accessCode","console","log","aedes","Aedes","mqttServer","createServer","handle","listen","on","client","id","packet","topic","startsWith","ftpDir","path","join","os","tmpdir","sdcardDir","fs","existsSync","mkdirSync","recursive","generateSelfSignedCert","attrs","name","value","options","days","algorithm","keySize","pems","selfsigned","generate","key","private","cert","minVersion","ciphers","isPrinting","currentPrintFile","printProgress","isPaused","nozzleTemp","bedTemp","printStartTime","PRINT_DURATION","tlsCerts","ftpServer","FtpSrv","url","pasv_url","pasv_min","pasv_max","tls","anonymous","greeting","connection","username","password","resolve","reject","root","Error","context","error","then","mqttClient","mqtt","connect","clientId","Date","now","reportTopic","requestTopic","subscribe","err","publishState","elapsedSeconds","Math","min","max","state","print","nozzle_temper","round","nozzle_target_temper","bed_temper","bed_target_temper","chamber_temper","mc_percent","mc_remaining_time","mc_print_stage","gcode_state","gcode_file","wifi_signal","layer_num","floor","total_layer_num","subtask_name","heatbreak_fan_speed","cooling_fan_speed","big_fan1_speed","big_fan2_speed","spd_lvl","spd_mag","print_error","lifecycle","command","msg","sequence_id","String","publish","JSON","stringify","qos","setInterval","message","payload","parse","toString","filename","param","endsWith","pausedProgress","connected","endAsync","Promise","close","exit","catch"],"mappings":"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"}
|
package/dist/server.constants.js
CHANGED
|
@@ -80,13 +80,6 @@ const AppConstants = {
|
|
|
80
80
|
defaultSocketThrottleRate: 1,
|
|
81
81
|
debugSocketStatesKey: "DEBUG_SOCKET_STATES",
|
|
82
82
|
defaultDebugSocketStates: "false",
|
|
83
|
-
enableMqttAutoDiscoveryToken: "ENABLE_MQTT_AUTODISCOVERY",
|
|
84
|
-
enableMqttAutoDiscoveryDefault: "false",
|
|
85
|
-
mqttUrlToken: "MQTT_HOST",
|
|
86
|
-
mqttPortToken: "MQTT_PORT",
|
|
87
|
-
mqttPortDefault: 1883,
|
|
88
|
-
mqttUsernameToken: "MQTT_USERNAME",
|
|
89
|
-
mqttPasswordToken: "MQTT_PASSWORD",
|
|
90
83
|
monsterPiFilePath: "/etc/monsterpi_version",
|
|
91
84
|
sentryCustomDsnToken: "SENTRY_CUSTOM_DSN",
|
|
92
85
|
sentryCustomDsnDefault: "https://164b8028a8a745bba3dbcab991b84ae7@o4503975545733120.ingest.sentry.io/4505101598261248",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultPrinterThumbnailsStorage","defaultFileUploadsStorage","defaultAcceptedGcodeExtensions","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","ENABLE_COLORED_LOGS_KEY","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","serverRepoName","clientPackageName","clientRepoName","clientNextPackageName","clientNextRepoName","githubUrl","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","
|
|
1
|
+
{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultPrinterThumbnailsStorage","defaultFileUploadsStorage","defaultAcceptedGcodeExtensions","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","ENABLE_COLORED_LOGS_KEY","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","serverRepoName","clientPackageName","clientRepoName","clientNextPackageName","clientNextRepoName","githubUrl","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault","ENABLE_PROMETHEUS_METRICS","ENABLE_LOKI_LOGGING","LOKI_ADDRESS","LOKI_TIMEOUT_SECONDS","LOKI_INTERVAL"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,iCAAiC;IACjCC,2BAA2B;IAC3BC,gCAAgC;QAAC;QAAU;KAAU;IACrDC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,yBAAyB;IACzBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,gBAAgB;IAChBC,mBAAmB;IACnBC,gBAAgB;IAChBC,uBAAuB;IACvBC,oBAAoB;IACpBC,WAAW;IACXC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAG1BC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBACE;IAEFC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;IAClCC,2BAA2B;IAC3BC,qBAAqB;IACrBC,cAAc;IACdC,sBAAsB;IACtBC,eAAe;AACjB"}
|
|
@@ -115,7 +115,7 @@ class BambuMqttAdapter {
|
|
|
115
115
|
this.serial = serial;
|
|
116
116
|
this.isConnecting = true;
|
|
117
117
|
this.socketState = _socketstatetype.SOCKET_STATE.opening;
|
|
118
|
-
const mqttUrl = `mqtt://${host}:
|
|
118
|
+
const mqttUrl = `mqtt://${host}:8883`;
|
|
119
119
|
const timeout = this.settingsStore.getTimeoutSettings().apiTimeout;
|
|
120
120
|
this.logger.log(`Connecting to Bambu MQTT at ${mqttUrl}`);
|
|
121
121
|
return new Promise((resolve, reject)=>{
|
package/package.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
},
|
|
7
7
|
"author": "David Zwart",
|
|
8
8
|
"license": "AGPL-3.0-or-later",
|
|
9
|
-
"version": "1.9.
|
|
9
|
+
"version": "1.9.3",
|
|
10
10
|
"bin": {
|
|
11
11
|
"fdm-monster": "dist/index.js",
|
|
12
12
|
"fdmm": "dist/index.js"
|
|
@@ -63,8 +63,8 @@
|
|
|
63
63
|
"tr46": "6.0.0"
|
|
64
64
|
},
|
|
65
65
|
"dependencies": {
|
|
66
|
-
"@fdm-monster/client": "1.12.
|
|
67
|
-
"@fdm-monster/client-next": "0.0.
|
|
66
|
+
"@fdm-monster/client": "1.12.2",
|
|
67
|
+
"@fdm-monster/client-next": "0.0.25",
|
|
68
68
|
"@octokit/plugin-throttling": "8.2.0",
|
|
69
69
|
"@sentry/node": "10.32.1",
|
|
70
70
|
"adm-zip": "0.5.16",
|
|
@@ -99,7 +99,7 @@
|
|
|
99
99
|
"prom-client": "15.1.3",
|
|
100
100
|
"reflect-metadata": "0.2.2",
|
|
101
101
|
"semver": "7.7.3",
|
|
102
|
-
"socket.io": "4.8.
|
|
102
|
+
"socket.io": "4.8.3",
|
|
103
103
|
"toad-scheduler": "3.1.0",
|
|
104
104
|
"typeorm": "0.3.28",
|
|
105
105
|
"uuid": "11.1.0",
|
|
@@ -139,9 +139,9 @@
|
|
|
139
139
|
"ftp-srv": "4.6.3",
|
|
140
140
|
"jest": "29.7.0",
|
|
141
141
|
"jest-27-expect-message": "1.1.0",
|
|
142
|
-
"mongodb-memory-server": "11.0.
|
|
142
|
+
"mongodb-memory-server": "11.0.1",
|
|
143
143
|
"nock": "13.5.6",
|
|
144
|
-
"selfsigned": "5.
|
|
144
|
+
"selfsigned": "5.4.0",
|
|
145
145
|
"supertest": "7.1.4",
|
|
146
146
|
"ts-node": "10.9.2",
|
|
147
147
|
"typescript": "5.9.3"
|