@fdm-monster/server 1.9.1 → 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/.yarn/releases/{yarn-4.10.3.cjs → yarn-4.12.0.cjs} +300 -300
- package/.yarnrc.yml +1 -1
- package/README.md +3 -2
- package/RELEASE_NOTES.MD +20 -0
- package/dist/consoles/mock-bambu.server.js +305 -0
- package/dist/consoles/mock-bambu.server.js.map +1 -0
- package/dist/constants/server-settings.constants.js +1 -0
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/container.js +8 -0
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +4 -0
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/first-time-setup.controller.js +33 -2
- package/dist/controllers/first-time-setup.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +10 -10
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +4 -0
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +22 -0
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/middleware/global.middleware.js +1 -0
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/middleware/printer.js +11 -0
- package/dist/middleware/printer.js.map +1 -1
- package/dist/models/Settings.js +5 -0
- package/dist/models/Settings.js.map +1 -1
- package/dist/server.constants.js +1 -8
- package/dist/server.constants.js.map +1 -1
- package/dist/services/bambu/bambu-ftp.adapter.js +204 -0
- package/dist/services/bambu/bambu-ftp.adapter.js.map +1 -0
- package/dist/services/bambu/bambu-mqtt.adapter.js +387 -0
- package/dist/services/bambu/bambu-mqtt.adapter.js.map +1 -0
- package/dist/services/bambu/bambu.client.js +67 -0
- package/dist/services/bambu/bambu.client.js.map +1 -0
- package/dist/services/bambu/mqtt-message.types.js +6 -0
- package/dist/services/bambu/mqtt-message.types.js.map +1 -0
- package/dist/services/bambu.api.js +221 -0
- package/dist/services/bambu.api.js.map +1 -0
- package/dist/services/core/yaml.service.js +123 -37
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/mongoose/floor.service.js +1 -1
- package/dist/services/mongoose/floor.service.js.map +1 -1
- package/dist/services/mongoose/settings.service.js.map +1 -1
- package/dist/services/mongoose/user.service.js +7 -0
- package/dist/services/mongoose/user.service.js.map +1 -1
- package/dist/services/orm/floor.service.js +1 -1
- package/dist/services/orm/settings.service.js +0 -4
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/orm/user.service.js +8 -0
- package/dist/services/orm/user.service.js.map +1 -1
- package/dist/services/printer-api.factory.js +7 -1
- package/dist/services/printer-api.factory.js.map +1 -1
- package/dist/services/printer-api.interface.js +5 -0
- package/dist/services/printer-api.interface.js.map +1 -1
- package/dist/services/socket.factory.js +3 -0
- package/dist/services/socket.factory.js.map +1 -1
- package/dist/services/validators/printer-service.validation.js +1 -1
- package/dist/services/validators/printer-service.validation.js.map +1 -1
- package/dist/services/validators/settings-service.validation.js +8 -1
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +27 -1
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/shared/runtime-settings.migration.js +1 -0
- package/dist/shared/runtime-settings.migration.js.map +1 -1
- package/dist/state/printer-events.cache.js +13 -0
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/settings.store.js +13 -4
- package/dist/state/settings.store.js.map +1 -1
- package/package.json +34 -27
- package/dist/utils/printer-type.utils.js +0 -32
- package/dist/utils/printer-type.utils.js.map +0 -1
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"
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"build": "swc src -d dist --strip-leading-paths",
|
|
18
18
|
"build:watch": "swc src -w -d dist --strip-leading-paths",
|
|
19
19
|
"dev": "yarn build:watch & yarn serve",
|
|
20
|
-
"serve": "NODE_ENV=development node --enable-source-maps --watch dist/index.js",
|
|
20
|
+
"serve": "NODE_ENV=development node --enable-source-maps --watch-path=dist dist/index.js",
|
|
21
21
|
"start:dev": "ts-node src/index.ts",
|
|
22
22
|
"start": "cross-env NODE_ENV=production node dist/index.js",
|
|
23
23
|
"console:http-file-servers": "node ./dist/consoles/http-file-receiver.console.js",
|
|
@@ -26,6 +26,7 @@
|
|
|
26
26
|
"console:generate": "yarn build && NODE_ENV=development node --enable-source-maps ./dist/consoles/typeorm-generate.js",
|
|
27
27
|
"console:migrate": "yarn build && NODE_ENV=development node --watch --enable-source-maps ./dist/consoles/typeorm-migrate.js",
|
|
28
28
|
"console:upload": "yarn build && cross-env NODE_ENV=development node ./dist/consoles/upload-test.js",
|
|
29
|
+
"console:mock-bambu": "yarn build && NODE_ENV=development node --enable-source-maps ./dist/consoles/mock-bambu.server.js",
|
|
29
30
|
"migration:create": "migrate-mongo create printer-files-simpler",
|
|
30
31
|
"migration:up": "migrate-mongo up",
|
|
31
32
|
"migration:down": "migrate-mongo down",
|
|
@@ -50,6 +51,7 @@
|
|
|
50
51
|
"octoprint",
|
|
51
52
|
"moonraker",
|
|
52
53
|
"klipper",
|
|
54
|
+
"bambu",
|
|
53
55
|
"prusalink",
|
|
54
56
|
"fdm",
|
|
55
57
|
"3d printing",
|
|
@@ -61,32 +63,34 @@
|
|
|
61
63
|
"tr46": "6.0.0"
|
|
62
64
|
},
|
|
63
65
|
"dependencies": {
|
|
64
|
-
"@fdm-monster/client": "1.
|
|
65
|
-
"@fdm-monster/client-next": "0.0.
|
|
66
|
+
"@fdm-monster/client": "1.12.2",
|
|
67
|
+
"@fdm-monster/client-next": "0.0.25",
|
|
66
68
|
"@octokit/plugin-throttling": "8.2.0",
|
|
67
|
-
"@sentry/node": "10.
|
|
69
|
+
"@sentry/node": "10.32.1",
|
|
68
70
|
"adm-zip": "0.5.16",
|
|
69
71
|
"awilix": "12.0.5",
|
|
70
72
|
"awilix-express": "9.0.2",
|
|
71
|
-
"axios": "1.
|
|
72
|
-
"
|
|
73
|
-
"
|
|
74
|
-
"
|
|
73
|
+
"axios": "1.13.2",
|
|
74
|
+
"basic-ftp": "5.0.5",
|
|
75
|
+
"bcryptjs": "3.0.3",
|
|
76
|
+
"better-sqlite3": "12.5.0",
|
|
77
|
+
"class-validator": "0.14.3",
|
|
75
78
|
"connect-history-api-fallback": "2.0.0",
|
|
76
79
|
"cookie-parser": "1.4.7",
|
|
77
80
|
"cors": "2.8.5",
|
|
78
81
|
"cross-env": "10.1.0",
|
|
79
82
|
"dotenv": "17.2.3",
|
|
80
83
|
"eventemitter2": "6.4.9",
|
|
81
|
-
"express": "4.
|
|
82
|
-
"form-data": "4.0.
|
|
84
|
+
"express": "4.22.1",
|
|
85
|
+
"form-data": "4.0.5",
|
|
83
86
|
"helmet": "8.1.0",
|
|
84
|
-
"js-yaml": "4.1.
|
|
85
|
-
"jsonwebtoken": "9.0.
|
|
87
|
+
"js-yaml": "4.1.1",
|
|
88
|
+
"jsonwebtoken": "9.0.3",
|
|
86
89
|
"lodash": "4.17.21",
|
|
87
90
|
"luxon": "3.7.2",
|
|
88
91
|
"migrate-mongo": "11.0.0",
|
|
89
92
|
"mongoose": "6.13.8",
|
|
93
|
+
"mqtt": "5.14.1",
|
|
90
94
|
"multer": "2.0.2",
|
|
91
95
|
"octokit": "3.2.2",
|
|
92
96
|
"passport": "0.7.0",
|
|
@@ -95,46 +99,49 @@
|
|
|
95
99
|
"prom-client": "15.1.3",
|
|
96
100
|
"reflect-metadata": "0.2.2",
|
|
97
101
|
"semver": "7.7.3",
|
|
98
|
-
"socket.io": "4.8.
|
|
102
|
+
"socket.io": "4.8.3",
|
|
99
103
|
"toad-scheduler": "3.1.0",
|
|
100
|
-
"typeorm": "0.3.
|
|
104
|
+
"typeorm": "0.3.28",
|
|
101
105
|
"uuid": "11.1.0",
|
|
102
|
-
"winston": "3.
|
|
106
|
+
"winston": "3.19.0",
|
|
103
107
|
"winston-loki": "6.1.3",
|
|
104
108
|
"ws": "8.18.3",
|
|
105
109
|
"zod": "3.25.76"
|
|
106
110
|
},
|
|
107
111
|
"devDependencies": {
|
|
108
|
-
"@biomejs/biome": "2.
|
|
112
|
+
"@biomejs/biome": "2.3.10",
|
|
109
113
|
"@lcov-viewer/cli": "1.3.0",
|
|
110
114
|
"@lcov-viewer/istanbul-report": "1.4.0",
|
|
111
|
-
"@swc/cli": "0.7.
|
|
112
|
-
"@swc/core": "1.
|
|
115
|
+
"@swc/cli": "0.7.9",
|
|
116
|
+
"@swc/core": "1.15.7",
|
|
113
117
|
"@swc/jest": "0.2.39",
|
|
114
118
|
"@types/adm-zip": "0.5.7",
|
|
115
119
|
"@types/connect-history-api-fallback": "1.5.4",
|
|
116
|
-
"@types/cookie-parser": "1.4.
|
|
120
|
+
"@types/cookie-parser": "1.4.10",
|
|
117
121
|
"@types/express": "5.0.1",
|
|
118
122
|
"@types/ip": "1.1.3",
|
|
119
123
|
"@types/jest": "29.5.14",
|
|
120
124
|
"@types/js-yaml": "4.0.9",
|
|
121
|
-
"@types/lodash": "4.17.
|
|
125
|
+
"@types/lodash": "4.17.21",
|
|
122
126
|
"@types/luxon": "3.7.1",
|
|
123
|
-
"@types/migrate-mongo": "10.0.
|
|
127
|
+
"@types/migrate-mongo": "10.0.6",
|
|
124
128
|
"@types/multer": "2.0.0",
|
|
125
|
-
"@types/node": "
|
|
129
|
+
"@types/node": "24.10.4",
|
|
126
130
|
"@types/passport-anonymous": "1.0.5",
|
|
127
131
|
"@types/passport-jwt": "4.0.1",
|
|
128
132
|
"@types/semver": "7.7.1",
|
|
129
133
|
"@types/supertest": "6.0.3",
|
|
130
134
|
"@types/uuid": "10.0.0",
|
|
131
135
|
"@types/ws": "8.18.1",
|
|
132
|
-
"
|
|
133
|
-
"
|
|
136
|
+
"aedes": "0.51.3",
|
|
137
|
+
"chokidar": "5.0.0",
|
|
138
|
+
"express-list-routes": "1.3.2",
|
|
139
|
+
"ftp-srv": "4.6.3",
|
|
134
140
|
"jest": "29.7.0",
|
|
135
141
|
"jest-27-expect-message": "1.1.0",
|
|
136
|
-
"mongodb-memory-server": "
|
|
142
|
+
"mongodb-memory-server": "11.0.1",
|
|
137
143
|
"nock": "13.5.6",
|
|
144
|
+
"selfsigned": "5.4.0",
|
|
138
145
|
"supertest": "7.1.4",
|
|
139
146
|
"ts-node": "10.9.2",
|
|
140
147
|
"typescript": "5.9.3"
|
|
@@ -146,5 +153,5 @@
|
|
|
146
153
|
"npm": ">= 8.1.4",
|
|
147
154
|
"yarn": ">= 4.8.0"
|
|
148
155
|
},
|
|
149
|
-
"packageManager": "yarn@4.
|
|
156
|
+
"packageManager": "yarn@4.12.0"
|
|
150
157
|
}
|
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", {
|
|
3
|
-
value: true
|
|
4
|
-
});
|
|
5
|
-
function _export(target, all) {
|
|
6
|
-
for(var name in all)Object.defineProperty(target, name, {
|
|
7
|
-
enumerable: true,
|
|
8
|
-
get: Object.getOwnPropertyDescriptor(all, name).get
|
|
9
|
-
});
|
|
10
|
-
}
|
|
11
|
-
_export(exports, {
|
|
12
|
-
get getServiceName () {
|
|
13
|
-
return getServiceName;
|
|
14
|
-
},
|
|
15
|
-
get isMoonrakerType () {
|
|
16
|
-
return isMoonrakerType;
|
|
17
|
-
},
|
|
18
|
-
get isOctoPrintType () {
|
|
19
|
-
return isOctoPrintType;
|
|
20
|
-
}
|
|
21
|
-
});
|
|
22
|
-
function isOctoPrintType(printerType) {
|
|
23
|
-
return printerType === 0;
|
|
24
|
-
}
|
|
25
|
-
function isMoonrakerType(printerType) {
|
|
26
|
-
return printerType === 1;
|
|
27
|
-
}
|
|
28
|
-
function getServiceName(printerType) {
|
|
29
|
-
return isOctoPrintType(printerType) ? "OctoPrint" : isMoonrakerType(printerType) ? "Moonraker" : "Unknown";
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
//# sourceMappingURL=printer-type.utils.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/utils/printer-type.utils.ts"],"names":["getServiceName","isMoonrakerType","isOctoPrintType","printerType"],"mappings":";;;;;;;;;;;QAQgBA;eAAAA;;QAJAC;eAAAA;;QAJAC;eAAAA;;;AAAT,SAASA,gBAAgBC,WAAoB;IAClD,OAAOA,gBAAgB;AACzB;AAEO,SAASF,gBAAgBE,WAAoB;IAClD,OAAOA,gBAAgB;AACzB;AAEO,SAASH,eAAeG,WAAoB;IACjD,OAAOD,gBAAgBC,eAAe,cAAcF,gBAAgBE,eAAe,cAAc;AACnG"}
|