@fdm-monster/server 2.0.1 → 2.0.4
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/.env.template +2 -1
- package/.yarn/install-state.gz +0 -0
- package/README.md +30 -13
- package/RELEASE_NOTES.MD +39 -0
- package/dist/consoles/mock-octoprint.server.js +1 -1
- package/dist/consoles/mock-octoprint.server.js.map +1 -1
- package/dist/constants/authorization.constants.js +12 -3
- package/dist/constants/authorization.constants.js.map +1 -1
- package/dist/container.js +2 -0
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +1 -0
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/printer-maintenance-log.controller.js +174 -0
- package/dist/controllers/printer-maintenance-log.controller.js.map +1 -0
- package/dist/data-source.js +8 -8
- package/dist/data-source.js.map +1 -1
- package/dist/entities/index.js +4 -0
- package/dist/entities/index.js.map +1 -1
- package/dist/entities/print-job.entity.js +5 -1
- package/dist/entities/print-job.entity.js.map +1 -1
- package/dist/entities/printer-maintenance-log.entity.js +142 -0
- package/dist/entities/printer-maintenance-log.entity.js.map +1 -0
- package/dist/entities/printer.entity.js +2 -1
- package/dist/entities/printer.entity.js.map +1 -1
- package/dist/handlers/logging/file-logging.transport.js +2 -2
- package/dist/handlers/logging/file-logging.transport.js.map +1 -1
- package/dist/index.js +11 -5
- package/dist/index.js.map +1 -1
- package/dist/migrations/1767909428129-AddPrinterMaintenanceLog.js +52 -0
- package/dist/migrations/1767909428129-AddPrinterMaintenanceLog.js.map +1 -0
- package/dist/server.constants.js +13 -9
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +7 -4
- package/dist/server.core.js.map +1 -1
- package/dist/server.env.js +13 -32
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +1 -1
- package/dist/server.host.js.map +1 -1
- package/dist/services/bambu/bambu-ftp.adapter.js +1 -1
- package/dist/services/bambu/bambu-ftp.adapter.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +10 -11
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/core/config.service.js +3 -5
- package/dist/services/core/config.service.js.map +1 -1
- package/dist/services/core/logs-manager.service.js +9 -10
- package/dist/services/core/logs-manager.service.js.map +1 -1
- package/dist/services/core/multer.service.js +2 -2
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +8 -5
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/file-storage.service.js +1 -1
- package/dist/services/file-storage.service.js.map +1 -1
- package/dist/services/interfaces/printer-maintenance-log.dto.js +6 -0
- package/dist/services/interfaces/printer-maintenance-log.dto.js.map +1 -0
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/orm/printer-maintenance-log.service.js +151 -0
- package/dist/services/orm/printer-maintenance-log.service.js.map +1 -0
- package/dist/services/orm/printer.service.js +15 -7
- package/dist/services/orm/printer.service.js.map +1 -1
- package/dist/services/typeorm/typeorm.service.js +5 -5
- package/dist/services/typeorm/typeorm.service.js.map +1 -1
- package/dist/services/validators/printer-maintenance-log.validation.js +41 -0
- package/dist/services/validators/printer-maintenance-log.validation.js.map +1 -0
- package/dist/services/validators/printer-service.validation.js +4 -5
- package/dist/services/validators/printer-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +6 -2
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +2 -2
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/tasks/print-job-analysis.task.js +0 -1
- package/dist/tasks/print-job-analysis.task.js.map +1 -1
- package/dist/utils/env.utils.js +5 -4
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/fs.utils.js +37 -11
- package/dist/utils/fs.utils.js.map +1 -1
- package/dist/utils/swagger/swagger.js +1 -1
- package/dist/utils/swagger/swagger.js.map +1 -1
- package/package.json +10 -11
package/.env.template
CHANGED
|
@@ -38,12 +38,13 @@ OVERRIDE_DEMO_ROLE=ADMIN
|
|
|
38
38
|
# Debug socket states
|
|
39
39
|
DEBUG_SOCKET_STATES=false
|
|
40
40
|
|
|
41
|
+
# Saves media (logs, files, file-uploads, log-zips, client-dist, client-dist-zips, etc)
|
|
42
|
+
MEDIA_PATH=./media
|
|
41
43
|
# Saves SQLite database to ./database/fdm-monster.sqlite
|
|
42
44
|
DATABASE_PATH=./database
|
|
43
45
|
# Optional, default: fdm-monster.sqlite
|
|
44
46
|
DATABASE_FILE=fdm-monster.sqlite
|
|
45
47
|
|
|
46
|
-
ENABLE_PROMETHEUS=false
|
|
47
48
|
ENABLE_LOKI=false
|
|
48
49
|
LOKI_ADDRESS=
|
|
49
50
|
ENABLE_PROMETHEUS_METRICS=false
|
package/.yarn/install-state.gz
CHANGED
|
Binary file
|
package/README.md
CHANGED
|
@@ -42,6 +42,13 @@ Here is a list of features that make FDM Monster stand out:
|
|
|
42
42
|
|
|
43
43
|
## Installation methods ⚙️
|
|
44
44
|
|
|
45
|
+
### Quick Install (Linux)
|
|
46
|
+
```bash
|
|
47
|
+
curl -fsSL https://raw.githubusercontent.com/fdm-monster/fdm-monster-scripts/main/install/linux/install.sh | bash
|
|
48
|
+
```
|
|
49
|
+
|
|
50
|
+
### Other Methods
|
|
51
|
+
|
|
45
52
|
- [Docker image](https://hub.docker.com/r/fdmmonster/fdm-monster)
|
|
46
53
|
- [Raspberry Pi image MonsterPi](https://docs.fdm-monster.net/guides/monsterpi)
|
|
47
54
|
- [Unraid Community App](https://unraid.net/community/apps?q=fdm+monster)
|
|
@@ -73,9 +80,21 @@ Please consider sponsoring FDM Monster to help this project! You can find the [G
|
|
|
73
80
|
|
|
74
81
|
Thanks to the following parties for their financial support:
|
|
75
82
|
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
83
|
+
### Tier 1
|
|
84
|
+
- (empty)
|
|
85
|
+
|
|
86
|
+
### Tier 2
|
|
87
|
+
- [thatguymendel](https://github.com/thatguymendel)
|
|
88
|
+
|
|
89
|
+
### Tier 3
|
|
90
|
+
- [MrHitchcock](https://github.com/MrHitchcock)
|
|
91
|
+
- [That Guy Jaysen](https://github.com/thatguy-jaysenodell)
|
|
92
|
+
|
|
93
|
+
### Tier 4
|
|
94
|
+
- [doucettom](https://github.com/doucettom)
|
|
95
|
+
|
|
96
|
+
### One Time
|
|
97
|
+
- [th3dstudio](https://github.com/th3dstudio)
|
|
79
98
|
|
|
80
99
|
|
|
81
100
|
## Contributors ✨
|
|
@@ -147,23 +166,21 @@ the [CONTRIBUTING](CONTRIBUTING.md) file.
|
|
|
147
166
|
|
|
148
167
|
### Development Progress
|
|
149
168
|
|
|
150
|
-
- [x] :rocket: Docker amd64 image
|
|
151
|
-
- [x] :rocket: Quick
|
|
169
|
+
- [x] :rocket: Docker amd64 and arm64 image
|
|
170
|
+
- [x] :rocket: Quick duplication of FDM Monster printers
|
|
152
171
|
- [x] 🛡️ Complete API test coverage
|
|
153
172
|
- [x] :rocket: Floor management
|
|
154
|
-
- [x]
|
|
155
|
-
- [x]
|
|
156
|
-
- [x] Printer completion/failure tracking (with statistics page)
|
|
173
|
+
- [x] :rocket: Linux 1-click install
|
|
174
|
+
- [x] Printer Job History
|
|
157
175
|
- [x] Printer placement using drag n drop
|
|
158
176
|
- [x] 🔌 Raspberry Pi image (https://github.com/fdm-monster/MonsterPi)
|
|
159
177
|
- [x] :rocket: Documentation (https://docs.fdm-monster.net)
|
|
160
|
-
- [x] 🛡️ Login and
|
|
178
|
+
- [x] 🛡️ Login and User management (with roles)
|
|
161
179
|
- [x] OctoFarm printer import
|
|
162
|
-
- [x] Klipper and Moonraker API integration
|
|
180
|
+
- [x] OctoPrint, Bambu, PrusaLink Klipper and Moonraker API integration
|
|
163
181
|
- [x] GCode Thumbnail support
|
|
164
|
-
- [x] `.bgcode` support
|
|
165
|
-
- [x]
|
|
166
|
-
- [x] History and statistics
|
|
182
|
+
- [x] `.gcode`, `.bgcode` and `.gcode.3mf` support
|
|
183
|
+
- [x] Modern UI layout and tile design
|
|
167
184
|
- [x] Print Queue
|
|
168
185
|
- [x] Extended webcam integration
|
|
169
186
|
- [ ] Spoolman integration
|
package/RELEASE_NOTES.MD
CHANGED
|
@@ -1,5 +1,44 @@
|
|
|
1
1
|
# Develop
|
|
2
2
|
|
|
3
|
+
# FDM Monster 2.0.4
|
|
4
|
+
|
|
5
|
+
## Feature
|
|
6
|
+
|
|
7
|
+
- Added mdns based Docker image for advanced users, who want to enable mDNS with Docker and a Docker bridge network connected to a MAC-VLAN.
|
|
8
|
+
|
|
9
|
+
## Fixes
|
|
10
|
+
|
|
11
|
+
- YAML import was too strict for printer properties: disabledReason, username and password. feedRate, flowRate and assignee are now also imported
|
|
12
|
+
|
|
13
|
+
## Chore
|
|
14
|
+
|
|
15
|
+
- Remove unnecessary debug logging for job analysis service when it had nothing to do
|
|
16
|
+
- Remove install.sh
|
|
17
|
+
|
|
18
|
+
# FDM Monster 2.0.3
|
|
19
|
+
|
|
20
|
+
Hotfix release
|
|
21
|
+
|
|
22
|
+
- Client wasn't updated to 2.2.0
|
|
23
|
+
|
|
24
|
+
# FDM Monster 2.0.2
|
|
25
|
+
|
|
26
|
+
## Features
|
|
27
|
+
|
|
28
|
+
- Printer maintenance log
|
|
29
|
+
- Added ENV_FILE env variable to override path for .env file
|
|
30
|
+
- Added MEDIA_PATH env variable to override media storage folder
|
|
31
|
+
|
|
32
|
+
## Fixes
|
|
33
|
+
|
|
34
|
+
- DATABASE_PATH env variable will now respect its value if set, instead of forcing it to be relative
|
|
35
|
+
|
|
36
|
+
## Chores
|
|
37
|
+
|
|
38
|
+
- Remove corepack from CICD as yarn is committed to repository
|
|
39
|
+
- Switch docker container base to node 24
|
|
40
|
+
- PrintJob entity printer relation improved
|
|
41
|
+
|
|
3
42
|
# FDM Monster 2.0.1
|
|
4
43
|
|
|
5
44
|
## Feat
|
|
@@ -393,7 +393,7 @@ app.post("/api/login", async (req, res)=>{
|
|
|
393
393
|
});
|
|
394
394
|
});
|
|
395
395
|
app.post("/api/files/local/:path(*)", _express.default.json(), (req, res)=>{
|
|
396
|
-
const filePath = req.params
|
|
396
|
+
const filePath = req.params["path(*)"];
|
|
397
397
|
const { command, print } = req.body;
|
|
398
398
|
_nodeconsole.log(`[PORT ${port}] POST /api/files/local/${filePath} - command: ${command}, print: ${print}`);
|
|
399
399
|
if (command === "select") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/consoles/mock-octoprint.server.ts"],"names":["isPrinting","isPaused","isFinished","currentPrintFile","printProgress","printStartTime","PRINT_DURATION","getCurrentMessage","updatePrintProgress","elapsedSeconds","Date","now","remainingSeconds","Math","max","stateText","fileName","finishedFileName","hasFile","current","state","text","flags","operational","printing","cancelling","pausing","resuming","finishing","closedOrError","error","paused","ready","sdReady","finished","job","file","name","path","display","origin","size","date","estimatedPrintTime","averagePrintTime","lastPrintTime","filament","tool0","length","volume","user","currentZ","floor","progress","completion","filepos","printTime","printTimeLeft","printTimeLeftOrigin","offsets","resends","count","transmitted","ratio","serverTime","temps","busyFiles","logs","messages","min","console","log","getJobResponse","hasJob","port","process","argv","Number","parseInt","uploadsDir","join","__dirname","toString","WS_MESSAGE_INTERVAL","fs","existsSync","mkdirSync","recursive","cleanupUploads","upload","multer","dest","app","express","server","http","createServer","wss","WebSocketServer","clients","Map","AuthSchema","z","object","command","literal","token","string","regex","on","ws","clientId","authenticated","messageInterval","message","msgString","includes","json","JSON","parse","close","parts","auth","split","set","setTimeout","send","stringify","fileError","setupMessageInterval","validationError","clearInterval","delete","baseInterval","getRandomizedInterval","baseMs","variationFactor","random","sendPeriodicMessage","readyState","OPEN","get","req","res","api","permissions","groups","method","toUpperCase","url","status","printerHistorySuccessResponse","connectionSuccessResponse","post","action","body","round","pausedProgress","filesSuccessResponse","_is_external_client","_login_mechanism","session","filePath","params","print","endsWith","single","originalname","mimetype","done","files","local","refs","resource","use","listen","exit","readdirSync","unlinkSync"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../src/consoles/mock-octoprint.server.ts"],"names":["isPrinting","isPaused","isFinished","currentPrintFile","printProgress","printStartTime","PRINT_DURATION","getCurrentMessage","updatePrintProgress","elapsedSeconds","Date","now","remainingSeconds","Math","max","stateText","fileName","finishedFileName","hasFile","current","state","text","flags","operational","printing","cancelling","pausing","resuming","finishing","closedOrError","error","paused","ready","sdReady","finished","job","file","name","path","display","origin","size","date","estimatedPrintTime","averagePrintTime","lastPrintTime","filament","tool0","length","volume","user","currentZ","floor","progress","completion","filepos","printTime","printTimeLeft","printTimeLeftOrigin","offsets","resends","count","transmitted","ratio","serverTime","temps","busyFiles","logs","messages","min","console","log","getJobResponse","hasJob","port","process","argv","Number","parseInt","uploadsDir","join","__dirname","toString","WS_MESSAGE_INTERVAL","fs","existsSync","mkdirSync","recursive","cleanupUploads","upload","multer","dest","app","express","server","http","createServer","wss","WebSocketServer","clients","Map","AuthSchema","z","object","command","literal","token","string","regex","on","ws","clientId","authenticated","messageInterval","message","msgString","includes","json","JSON","parse","close","parts","auth","split","set","setTimeout","send","stringify","fileError","setupMessageInterval","validationError","clearInterval","delete","baseInterval","getRandomizedInterval","baseMs","variationFactor","random","sendPeriodicMessage","readyState","OPEN","get","req","res","api","permissions","groups","method","toUpperCase","url","status","printerHistorySuccessResponse","connectionSuccessResponse","post","action","body","round","pausedProgress","filesSuccessResponse","_is_external_client","_login_mechanism","session","filePath","params","print","endsWith","single","originalname","mimetype","done","files","local","refs","resource","use","listen","exit","readdirSync","unlinkSync"],"mappings":"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"}
|
|
@@ -45,7 +45,8 @@ const PERM_GROUP = {
|
|
|
45
45
|
PrinterSettings: "PrinterSettings",
|
|
46
46
|
Jobs: "Jobs",
|
|
47
47
|
Floors: "Floors",
|
|
48
|
-
ServerInfo: "ServerInfo"
|
|
48
|
+
ServerInfo: "ServerInfo",
|
|
49
|
+
PrinterMaintenanceLog: "PrinterMaintenanceLog"
|
|
49
50
|
};
|
|
50
51
|
const PERMS = {
|
|
51
52
|
[PERM_GROUP.PrinterFiles]: {
|
|
@@ -75,6 +76,14 @@ const PERMS = {
|
|
|
75
76
|
[PERM_GROUP.ServerInfo]: {
|
|
76
77
|
Default: "ServerInfo.Default",
|
|
77
78
|
Get: "ServerInfo.Get"
|
|
79
|
+
},
|
|
80
|
+
[PERM_GROUP.PrinterMaintenanceLog]: {
|
|
81
|
+
Default: "PrinterMaintenanceLog.Default",
|
|
82
|
+
List: "PrinterMaintenanceLog.List",
|
|
83
|
+
Get: "PrinterMaintenanceLog.Get",
|
|
84
|
+
Create: "PrinterMaintenanceLog.Create",
|
|
85
|
+
Complete: "PrinterMaintenanceLog.Complete",
|
|
86
|
+
Delete: "PrinterMaintenanceLog.Delete"
|
|
78
87
|
}
|
|
79
88
|
};
|
|
80
89
|
function flattenPermissionDefinition() {
|
|
@@ -96,8 +105,8 @@ const ROLES = {
|
|
|
96
105
|
GUEST: "GUEST"
|
|
97
106
|
};
|
|
98
107
|
const ROLE_PERMS = {
|
|
99
|
-
[ROLES.ADMIN]: (0, _lodash.union)(allPerms(PERM_GROUP.Jobs), allPerms(PERM_GROUP.Floors), allPerms(PERM_GROUP.PrinterFiles), allPerms(PERM_GROUP.PrinterSettings), allPerms(PERM_GROUP.ServerInfo)),
|
|
100
|
-
[ROLES.OPERATOR]: (0, _lodash.union)(allPerms(PERM_GROUP.Jobs), allPerms(PERM_GROUP.Floors), allPerms(PERM_GROUP.PrinterFiles), allPerms(PERM_GROUP.PrinterSettings)),
|
|
108
|
+
[ROLES.ADMIN]: (0, _lodash.union)(allPerms(PERM_GROUP.Jobs), allPerms(PERM_GROUP.Floors), allPerms(PERM_GROUP.PrinterFiles), allPerms(PERM_GROUP.PrinterSettings), allPerms(PERM_GROUP.ServerInfo), allPerms(PERM_GROUP.PrinterMaintenanceLog)),
|
|
109
|
+
[ROLES.OPERATOR]: (0, _lodash.union)(allPerms(PERM_GROUP.Jobs), allPerms(PERM_GROUP.Floors), allPerms(PERM_GROUP.PrinterFiles), allPerms(PERM_GROUP.PrinterSettings), allPerms(PERM_GROUP.PrinterMaintenanceLog)),
|
|
101
110
|
[ROLES.GUEST]: []
|
|
102
111
|
};
|
|
103
112
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/constants/authorization.constants.ts"],"names":["AUTH_ERROR_REASON","PERMS","PERM_GROUP","ROLES","ROLE_PERMS","allPerms","flattenPermissionDefinition","IncorrectCredentials","InvalidOrExpiredRefreshToken","InvalidOrExpiredAuthToken","PasswordChangeRequired","LoginRequired","AccountNotVerified","PrinterFiles","PrinterSettings","Jobs","Floors","ServerInfo","Default","Get","Delete","Clear","Upload","Actions","List","Create","Update","permissions","key","Object","values","permissionName","push","group","Error","ADMIN","OPERATOR","GUEST","union"],"mappings":";;;;;;;;;;;QAEaA;eAAAA;;
|
|
1
|
+
{"version":3,"sources":["../../src/constants/authorization.constants.ts"],"names":["AUTH_ERROR_REASON","PERMS","PERM_GROUP","ROLES","ROLE_PERMS","allPerms","flattenPermissionDefinition","IncorrectCredentials","InvalidOrExpiredRefreshToken","InvalidOrExpiredAuthToken","PasswordChangeRequired","LoginRequired","AccountNotVerified","PrinterFiles","PrinterSettings","Jobs","Floors","ServerInfo","PrinterMaintenanceLog","Default","Get","Delete","Clear","Upload","Actions","List","Create","Update","Complete","permissions","key","Object","values","permissionName","push","group","Error","ADMIN","OPERATOR","GUEST","union"],"mappings":";;;;;;;;;;;QAEaA;eAAAA;;QAqBAC;eAAAA;;QAXAC;eAAAA;;QAqEAC;eAAAA;;QAQAC;eAAAA;;QAbGC;eAAAA;;QAVAC;eAAAA;;;wBAlEM;AAEf,MAAMN,oBAAoB;IAE/BO,sBAAsB;IACtBC,8BAA8B;IAC9BC,2BAA2B;IAC3BC,wBAAwB;IACxBC,eAAe;IACfC,oBAAoB;AACtB;AAEO,MAAMV,aAAa;IACxBW,cAAc;IACdC,iBAAiB;IACjBC,MAAM;IACNC,QAAQ;IACRC,YAAY;IACZC,uBAAuB;AACzB;AAIO,MAAMjB,QAAQ;IACnB,CAACC,WAAWW,YAAY,CAAC,EAAE;QACzBM,SAAS;QACTC,KAAK;QACLC,QAAQ;QACRC,OAAO;QACPC,QAAQ;QACRC,SAAS;IACX;IACA,CAACtB,WAAWa,IAAI,CAAC,EAAE;QACjBI,SAAS;QACTM,MAAM;IACR;IACA,CAACvB,WAAWc,MAAM,CAAC,EAAE;QACnBG,SAAS;QACTM,MAAM;QACNL,KAAK;QACLM,QAAQ;QACRC,QAAQ;QACRN,QAAQ;IACV;IACA,CAACnB,WAAWY,eAAe,CAAC,EAAE;QAC5BK,SAAS;QACTC,KAAK;IACP;IACA,CAAClB,WAAWe,UAAU,CAAC,EAAE;QACvBE,SAAS;QACTC,KAAK;IACP;IACA,CAAClB,WAAWgB,qBAAqB,CAAC,EAAE;QAClCC,SAAS;QACTM,MAAM;QACNL,KAAK;QACLM,QAAQ;QACRE,UAAU;QACVP,QAAQ;IACV;AACF;AAMO,SAASf;IACd,MAAMuB,cAAgC,EAAE;IACxC,KAAK,MAAMC,OAAOC,OAAOC,MAAM,CAAC9B,YAAa;QAC3C,KAAK,MAAM+B,kBAAkBF,OAAOC,MAAM,CAAC/B,KAAK,CAAC6B,IAAI,EAAG;YACtDD,YAAYK,IAAI,CAACD;QACnB;IACF;IACA,OAAOJ;AACT;AAEO,SAASxB,SAAS8B,KAAsB;IAC7C,IAAI,CAACA,SAAS,CAAClC,KAAK,CAACkC,MAAM,EAAE,MAAM,IAAIC,MAAM,CAAC,uBAAuB,EAAED,MAAM,eAAe,CAAC;IAC7F,OAAOJ,OAAOC,MAAM,CAAC/B,KAAK,CAACkC,MAAM;AACnC;AAEO,MAAMhC,QAAQ;IACnBkC,OAAO;IACPC,UAAU;IACVC,OAAO;AACT;AAIO,MAAMnC,aAAiD;IAC5D,CAACD,MAAMkC,KAAK,CAAC,EAAEG,IAAAA,aAAK,EAClBnC,SAASH,WAAWa,IAAI,GACxBV,SAASH,WAAWc,MAAM,GAC1BX,SAASH,WAAWW,YAAY,GAChCR,SAASH,WAAWY,eAAe,GACnCT,SAASH,WAAWe,UAAU,GAC9BZ,SAASH,WAAWgB,qBAAqB;IAE3C,CAACf,MAAMmC,QAAQ,CAAC,EAAEE,IAAAA,aAAK,EACrBnC,SAASH,WAAWa,IAAI,GACxBV,SAASH,WAAWc,MAAM,GAC1BX,SAASH,WAAWW,YAAY,GAChCR,SAASH,WAAWY,eAAe,GACnCT,SAASH,WAAWgB,qBAAqB;IAE3C,CAACf,MAAMoC,KAAK,CAAC,EAAE,EAAE;AACnB"}
|
package/dist/container.js
CHANGED
|
@@ -13,6 +13,7 @@ const _awilix = require("awilix");
|
|
|
13
13
|
const _toadscheduler = require("toad-scheduler");
|
|
14
14
|
const _containertokens = require("./container.tokens");
|
|
15
15
|
const _printerservice = require("./services/orm/printer.service");
|
|
16
|
+
const _printermaintenancelogservice = require("./services/orm/printer-maintenance-log.service");
|
|
16
17
|
const _settingsstore = require("./state/settings.store");
|
|
17
18
|
const _serverreleaseservice = require("./services/core/server-release.service");
|
|
18
19
|
const _taskmanagerservice = require("./services/task-manager.service");
|
|
@@ -104,6 +105,7 @@ function configureContainer() {
|
|
|
104
105
|
[di.floorPositionService]: (0, _awilix.asClass)(_floorpositionservice.FloorPositionService).singleton(),
|
|
105
106
|
[di.cameraStreamService]: (0, _awilix.asClass)(_camerastreamservice.CameraStreamService).singleton(),
|
|
106
107
|
[di.printerService]: (0, _awilix.asClass)(_printerservice.PrinterService),
|
|
108
|
+
[di.printerMaintenanceLogService]: (0, _awilix.asClass)(_printermaintenancelogservice.PrinterMaintenanceLogService),
|
|
107
109
|
[di.printerTagService]: (0, _awilix.asClass)(_printertagservice.PrinterTagService),
|
|
108
110
|
[di.refreshTokenService]: (0, _awilix.asClass)(_refreshtokenservice.RefreshTokenService).singleton(),
|
|
109
111
|
[di.userService]: (0, _awilix.asClass)(_userservice.UserService).singleton(),
|
package/dist/container.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/container.ts"],"names":["configureContainer","container","createContainer","injectionMode","InjectionMode","CLASSIC","di","DITokens","register","appDefaultRole","asValue","ROLES","GUEST","appDefaultRoleNoLogin","ADMIN","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","cradleService","asClass","CradleService","inject","socketFactory","SocketFactory","transient","typeormService","TypeormService","singleton","settingsService","SettingsService","floorService","FloorService","floorPositionService","FloorPositionService","cameraStreamService","CameraStreamService","printerService","PrinterService","printerTagService","PrinterTagService","refreshTokenService","RefreshTokenService","userService","UserService","userRoleService","UserRoleService","roleService","RoleService","permissionService","PermissionService","serverHost","ServerHost","exceptionFilter","ExceptionFilter","settingsStore","SettingsStore","configService","ConfigService","authService","AuthService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","githubService","GithubService","octokitService","CustomOctoKit","Octokit","plugin","throttling","auth","get","GITHUB_PAT","throttle","onRateLimit","_retryAfter","options","_octokit","_retryCount","logger","warn","method","url","onSecondaryRateLimit","clientBundleService","ClientBundleService","logDumpService","LogDumpService","httpClientFactory","HttpClientFactory","socketIoGateway","SocketIoGateway","multerService","MulterService","yamlService","YamlService","printerLogin","printerApiFactory","PrinterApiFactory","prusaLinkApi","PrusaLinkApi","prusaLinkPollingAdapter","PrusaLinkHttpPollingAdapter","octoprintApi","OctoprintApi","octoprintClient","OctoprintClient","octoPrintSockIoAdapter","OctoprintWebsocketAdapter","moonrakerApi","MoonrakerApi","moonrakerClient","MoonrakerClient","moonrakerWebsocketAdapter","MoonrakerWebsocketAdapter","bambuApi","BambuApi","bambuClient","BambuClient","bambuFtpAdapter","BambuFtpAdapter","bambuMqttAdapter","BambuMqttAdapter","batchCallService","BatchCallService","floorStore","FloorStore","printerThumbnailCache","PrinterThumbnailCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","printJobService","PrintJobService","printQueueService","PrintQueueService","fileStorageService","FileStorageService","fileAnalysisService","FileAnalysisService","printFileDownloaderService","PrintFileDownloaderService","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerFilesLoadTask","PrinterFilesLoadTask","printJobAnalysisTask","PrintJobAnalysisTask"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../src/container.ts"],"names":["configureContainer","container","createContainer","injectionMode","InjectionMode","CLASSIC","di","DITokens","register","appDefaultRole","asValue","ROLES","GUEST","appDefaultRoleNoLogin","ADMIN","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","cradleService","asClass","CradleService","inject","socketFactory","SocketFactory","transient","typeormService","TypeormService","singleton","settingsService","SettingsService","floorService","FloorService","floorPositionService","FloorPositionService","cameraStreamService","CameraStreamService","printerService","PrinterService","printerMaintenanceLogService","PrinterMaintenanceLogService","printerTagService","PrinterTagService","refreshTokenService","RefreshTokenService","userService","UserService","userRoleService","UserRoleService","roleService","RoleService","permissionService","PermissionService","serverHost","ServerHost","exceptionFilter","ExceptionFilter","settingsStore","SettingsStore","configService","ConfigService","authService","AuthService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","githubService","GithubService","octokitService","CustomOctoKit","Octokit","plugin","throttling","auth","get","GITHUB_PAT","throttle","onRateLimit","_retryAfter","options","_octokit","_retryCount","logger","warn","method","url","onSecondaryRateLimit","clientBundleService","ClientBundleService","logDumpService","LogDumpService","httpClientFactory","HttpClientFactory","socketIoGateway","SocketIoGateway","multerService","MulterService","yamlService","YamlService","printerLogin","printerApiFactory","PrinterApiFactory","prusaLinkApi","PrusaLinkApi","prusaLinkPollingAdapter","PrusaLinkHttpPollingAdapter","octoprintApi","OctoprintApi","octoprintClient","OctoprintClient","octoPrintSockIoAdapter","OctoprintWebsocketAdapter","moonrakerApi","MoonrakerApi","moonrakerClient","MoonrakerClient","moonrakerWebsocketAdapter","MoonrakerWebsocketAdapter","bambuApi","BambuApi","bambuClient","BambuClient","bambuFtpAdapter","BambuFtpAdapter","bambuMqttAdapter","BambuMqttAdapter","batchCallService","BatchCallService","floorStore","FloorStore","printerThumbnailCache","PrinterThumbnailCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","printJobService","PrintJobService","printQueueService","PrintQueueService","fileStorageService","FileStorageService","fileAnalysisService","FileAnalysisService","printFileDownloaderService","PrintFileDownloaderService","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerFilesLoadTask","PrinterFilesLoadTask","printJobAnalysisTask","PrintJobAnalysisTask"],"mappings":"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"}
|
package/dist/container.tokens.js
CHANGED
|
@@ -26,6 +26,7 @@ const DITokens = {
|
|
|
26
26
|
eventEmitter2: "eventEmitter2",
|
|
27
27
|
printerService: "printerService",
|
|
28
28
|
printerTagService: "printerTagService",
|
|
29
|
+
printerMaintenanceLogService: "printerMaintenanceLogService",
|
|
29
30
|
floorPositionService: "floorPositionService",
|
|
30
31
|
printJobService: "printJobService",
|
|
31
32
|
printQueueService: "printQueueService",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","cradleService","serverVersion","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","exceptionFilter","loggerFactory","httpClientFactory","socketIoGateway","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","printerService","printerTagService","floorPositionService","printJobService","printQueueService","fileStorageService","fileAnalysisService","printFileDownloaderService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","prusaLinkApi","octoprintApi","octoprintClient","moonrakerApi","moonrakerClient","bambuApi","bambuClient","bambuFtpAdapter","bambuMqttAdapter","cameraStreamService","socketFactory","printerApiFactory","printerLogin","batchCallService","influxDbV2BaseService","systemInfoBundleService","floorStore","settingsStore","printerSocketStore","testPrinterSocketStore","printerFilesStore","prusaLinkPollingAdapter","octoPrintSockIoAdapter","moonrakerWebsocketAdapter","printerCache","printerEventsCache","printerThumbnailCache","fileCache","fileUploadTrackerCache","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printerWebsocketTask","printerWebsocketRestoreTask","printerFilesLoadTask","printJobAnalysisTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IACtBC,eAAe;IAEfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,iBAAiB;IACjBC,eAAe;IACfC,mBAAmB;IACnBC,iBAAiB;IACjBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,mBAAmB;IACnBC,sBAAsB;IACtBC,iBAAiB;IACjBC,mBAAmB;IACnBC,oBAAoB;IACpBC,qBAAqB;IACrBC,4BAA4B;IAC5BC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,cAAc;IACdC,cAAc;IACdC,iBAAiB;IACjBC,cAAc;IACdC,iBAAiB;IACjBC,UAAU;IACVC,aAAa;IACbC,iBAAiB;IACjBC,kBAAkB;IAClBC,qBAAqB;IACrBC,eAAe;IACfC,mBAAmB;IACnBC,cAAc;IACdC,kBAAkB;IAClBC,uBAAuB;IACvBC,yBAAyB;IAEzBC,YAAY;IACZC,eAAe;IACfC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,yBAAyB;IACzBC,wBAAwB;IACxBC,2BAA2B;IAE3BC,cAAc;IACdC,oBAAoB;IACpBC,uBAAuB;IACvBC,WAAW;IACXC,wBAAwB;IAExBC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,sBAAsB;IACtBC,6BAA6B;IAC7BC,sBAAsB;IACtBC,sBAAsB;AACxB"}
|
|
1
|
+
{"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","cradleService","serverVersion","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","exceptionFilter","loggerFactory","httpClientFactory","socketIoGateway","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","printerService","printerTagService","printerMaintenanceLogService","floorPositionService","printJobService","printQueueService","fileStorageService","fileAnalysisService","printFileDownloaderService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","prusaLinkApi","octoprintApi","octoprintClient","moonrakerApi","moonrakerClient","bambuApi","bambuClient","bambuFtpAdapter","bambuMqttAdapter","cameraStreamService","socketFactory","printerApiFactory","printerLogin","batchCallService","influxDbV2BaseService","systemInfoBundleService","floorStore","settingsStore","printerSocketStore","testPrinterSocketStore","printerFilesStore","prusaLinkPollingAdapter","octoPrintSockIoAdapter","moonrakerWebsocketAdapter","printerCache","printerEventsCache","printerThumbnailCache","fileCache","fileUploadTrackerCache","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printerWebsocketTask","printerWebsocketRestoreTask","printerFilesLoadTask","printJobAnalysisTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IACtBC,eAAe;IAEfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,iBAAiB;IACjBC,eAAe;IACfC,mBAAmB;IACnBC,iBAAiB;IACjBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,mBAAmB;IACnBC,8BAA8B;IAC9BC,sBAAsB;IACtBC,iBAAiB;IACjBC,mBAAmB;IACnBC,oBAAoB;IACpBC,qBAAqB;IACrBC,4BAA4B;IAC5BC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,cAAc;IACdC,cAAc;IACdC,iBAAiB;IACjBC,cAAc;IACdC,iBAAiB;IACjBC,UAAU;IACVC,aAAa;IACbC,iBAAiB;IACjBC,kBAAkB;IAClBC,qBAAqB;IACrBC,eAAe;IACfC,mBAAmB;IACnBC,cAAc;IACdC,kBAAkB;IAClBC,uBAAuB;IACvBC,yBAAyB;IAEzBC,YAAY;IACZC,eAAe;IACfC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,yBAAyB;IACzBC,wBAAwB;IACxBC,2BAA2B;IAE3BC,cAAc;IACdC,oBAAoB;IACpBC,uBAAuB;IACvBC,WAAW;IACXC,wBAAwB;IAExBC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,sBAAsB;IACtBC,6BAA6B;IAC7BC,sBAAsB;IACtBC,sBAAsB;AACxB"}
|
|
@@ -0,0 +1,174 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "PrinterMaintenanceLogController", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return PrinterMaintenanceLogController;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _awilixexpress = require("awilix-express");
|
|
12
|
+
const _serverconstants = require("../server.constants");
|
|
13
|
+
const _express = require("express");
|
|
14
|
+
const _authenticate = require("../middleware/authenticate");
|
|
15
|
+
const _authorizationconstants = require("../constants/authorization.constants");
|
|
16
|
+
const _printermaintenancelogservice = require("../services/orm/printer-maintenance-log.service");
|
|
17
|
+
const _loggerfactory = require("../handlers/logger-factory");
|
|
18
|
+
const _validators = require("../handlers/validators");
|
|
19
|
+
const _printermaintenancelogvalidation = require("../services/validators/printer-maintenance-log.validation");
|
|
20
|
+
const _paramconvertermiddleware = require("../middleware/param-converter.middleware");
|
|
21
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
22
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
23
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
24
|
+
else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
25
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
26
|
+
}
|
|
27
|
+
function _ts_metadata(k, v) {
|
|
28
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
29
|
+
}
|
|
30
|
+
class PrinterMaintenanceLogController {
|
|
31
|
+
printerMaintenanceLogService;
|
|
32
|
+
logger;
|
|
33
|
+
constructor(loggerFactory, printerMaintenanceLogService){
|
|
34
|
+
this.printerMaintenanceLogService = printerMaintenanceLogService;
|
|
35
|
+
this.logger = loggerFactory(PrinterMaintenanceLogController.name);
|
|
36
|
+
}
|
|
37
|
+
async list(req, res) {
|
|
38
|
+
const query = await (0, _validators.validateInput)(req.query, _printermaintenancelogvalidation.getMaintenanceLogsQuerySchema);
|
|
39
|
+
const result = await this.printerMaintenanceLogService.list(query);
|
|
40
|
+
res.send({
|
|
41
|
+
logs: result.logs.map((log)=>this.printerMaintenanceLogService.toDto(log)),
|
|
42
|
+
total: result.total,
|
|
43
|
+
page: query.page,
|
|
44
|
+
pageSize: query.pageSize
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
async get(req, res) {
|
|
48
|
+
const logId = req.params.id;
|
|
49
|
+
const log = await this.printerMaintenanceLogService.get(logId);
|
|
50
|
+
res.send(this.printerMaintenanceLogService.toDto(log));
|
|
51
|
+
}
|
|
52
|
+
async getActiveByPrinterId(req, res) {
|
|
53
|
+
const printerId = req.params.printerId;
|
|
54
|
+
const log = await this.printerMaintenanceLogService.getActiveByPrinterId(printerId);
|
|
55
|
+
res.send(log ? this.printerMaintenanceLogService.toDto(log) : null);
|
|
56
|
+
}
|
|
57
|
+
async create(req, res) {
|
|
58
|
+
const data = await (0, _validators.validateInput)(req.body, _printermaintenancelogvalidation.createMaintenanceLogSchema);
|
|
59
|
+
const userId = req.user?.id ?? null;
|
|
60
|
+
const username = req.user?.username || "system";
|
|
61
|
+
const log = await this.printerMaintenanceLogService.create(data, userId, username);
|
|
62
|
+
res.send(this.printerMaintenanceLogService.toDto(log));
|
|
63
|
+
}
|
|
64
|
+
async complete(req, res) {
|
|
65
|
+
const logId = req.params.id;
|
|
66
|
+
const data = await (0, _validators.validateInput)(req.body, _printermaintenancelogvalidation.completeMaintenanceLogSchema);
|
|
67
|
+
const userId = req.user?.id ?? null;
|
|
68
|
+
const username = req.user?.username || "system";
|
|
69
|
+
const log = await this.printerMaintenanceLogService.complete(logId, data, userId, username);
|
|
70
|
+
res.send(this.printerMaintenanceLogService.toDto(log));
|
|
71
|
+
}
|
|
72
|
+
async delete(req, res) {
|
|
73
|
+
const logId = req.params.id;
|
|
74
|
+
await this.printerMaintenanceLogService.delete(logId);
|
|
75
|
+
res.send({
|
|
76
|
+
success: true
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
_ts_decorate([
|
|
81
|
+
(0, _awilixexpress.GET)(),
|
|
82
|
+
(0, _awilixexpress.route)("/"),
|
|
83
|
+
(0, _awilixexpress.before)([
|
|
84
|
+
(0, _authenticate.permission)(_authorizationconstants.PERMS.PrinterMaintenanceLog.List)
|
|
85
|
+
]),
|
|
86
|
+
_ts_metadata("design:type", Function),
|
|
87
|
+
_ts_metadata("design:paramtypes", [
|
|
88
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
89
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
90
|
+
]),
|
|
91
|
+
_ts_metadata("design:returntype", Promise)
|
|
92
|
+
], PrinterMaintenanceLogController.prototype, "list", null);
|
|
93
|
+
_ts_decorate([
|
|
94
|
+
(0, _awilixexpress.GET)(),
|
|
95
|
+
(0, _awilixexpress.route)("/:id"),
|
|
96
|
+
(0, _awilixexpress.before)([
|
|
97
|
+
(0, _authenticate.permission)(_authorizationconstants.PERMS.PrinterMaintenanceLog.Get),
|
|
98
|
+
(0, _paramconvertermiddleware.ParamId)("id")
|
|
99
|
+
]),
|
|
100
|
+
_ts_metadata("design:type", Function),
|
|
101
|
+
_ts_metadata("design:paramtypes", [
|
|
102
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
103
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
104
|
+
]),
|
|
105
|
+
_ts_metadata("design:returntype", Promise)
|
|
106
|
+
], PrinterMaintenanceLogController.prototype, "get", null);
|
|
107
|
+
_ts_decorate([
|
|
108
|
+
(0, _awilixexpress.GET)(),
|
|
109
|
+
(0, _awilixexpress.route)("/printer/:printerId/active"),
|
|
110
|
+
(0, _awilixexpress.before)([
|
|
111
|
+
(0, _authenticate.permission)(_authorizationconstants.PERMS.PrinterMaintenanceLog.Get),
|
|
112
|
+
(0, _paramconvertermiddleware.ParamId)("printerId")
|
|
113
|
+
]),
|
|
114
|
+
_ts_metadata("design:type", Function),
|
|
115
|
+
_ts_metadata("design:paramtypes", [
|
|
116
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
117
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
118
|
+
]),
|
|
119
|
+
_ts_metadata("design:returntype", Promise)
|
|
120
|
+
], PrinterMaintenanceLogController.prototype, "getActiveByPrinterId", null);
|
|
121
|
+
_ts_decorate([
|
|
122
|
+
(0, _awilixexpress.POST)(),
|
|
123
|
+
(0, _awilixexpress.route)("/"),
|
|
124
|
+
(0, _awilixexpress.before)([
|
|
125
|
+
(0, _authenticate.permission)(_authorizationconstants.PERMS.PrinterMaintenanceLog.Create)
|
|
126
|
+
]),
|
|
127
|
+
_ts_metadata("design:type", Function),
|
|
128
|
+
_ts_metadata("design:paramtypes", [
|
|
129
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
130
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
131
|
+
]),
|
|
132
|
+
_ts_metadata("design:returntype", Promise)
|
|
133
|
+
], PrinterMaintenanceLogController.prototype, "create", null);
|
|
134
|
+
_ts_decorate([
|
|
135
|
+
(0, _awilixexpress.POST)(),
|
|
136
|
+
(0, _awilixexpress.route)("/:id/complete"),
|
|
137
|
+
(0, _awilixexpress.before)([
|
|
138
|
+
(0, _authenticate.permission)(_authorizationconstants.PERMS.PrinterMaintenanceLog.Complete),
|
|
139
|
+
(0, _paramconvertermiddleware.ParamId)("id")
|
|
140
|
+
]),
|
|
141
|
+
_ts_metadata("design:type", Function),
|
|
142
|
+
_ts_metadata("design:paramtypes", [
|
|
143
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
144
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
145
|
+
]),
|
|
146
|
+
_ts_metadata("design:returntype", Promise)
|
|
147
|
+
], PrinterMaintenanceLogController.prototype, "complete", null);
|
|
148
|
+
_ts_decorate([
|
|
149
|
+
(0, _awilixexpress.DELETE)(),
|
|
150
|
+
(0, _awilixexpress.route)("/:id"),
|
|
151
|
+
(0, _awilixexpress.before)([
|
|
152
|
+
(0, _authenticate.permission)(_authorizationconstants.PERMS.PrinterMaintenanceLog.Delete),
|
|
153
|
+
(0, _paramconvertermiddleware.ParamId)("id")
|
|
154
|
+
]),
|
|
155
|
+
_ts_metadata("design:type", Function),
|
|
156
|
+
_ts_metadata("design:paramtypes", [
|
|
157
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
158
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
159
|
+
]),
|
|
160
|
+
_ts_metadata("design:returntype", Promise)
|
|
161
|
+
], PrinterMaintenanceLogController.prototype, "delete", null);
|
|
162
|
+
PrinterMaintenanceLogController = _ts_decorate([
|
|
163
|
+
(0, _awilixexpress.route)(_serverconstants.AppConstants.apiRoute + "/printer-maintenance-log"),
|
|
164
|
+
(0, _awilixexpress.before)([
|
|
165
|
+
(0, _authenticate.authenticate)()
|
|
166
|
+
]),
|
|
167
|
+
_ts_metadata("design:type", Function),
|
|
168
|
+
_ts_metadata("design:paramtypes", [
|
|
169
|
+
typeof _loggerfactory.ILoggerFactory === "undefined" ? Object : _loggerfactory.ILoggerFactory,
|
|
170
|
+
typeof _printermaintenancelogservice.PrinterMaintenanceLogService === "undefined" ? Object : _printermaintenancelogservice.PrinterMaintenanceLogService
|
|
171
|
+
])
|
|
172
|
+
], PrinterMaintenanceLogController);
|
|
173
|
+
|
|
174
|
+
//# sourceMappingURL=printer-maintenance-log.controller.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/printer-maintenance-log.controller.ts"],"names":["PrinterMaintenanceLogController","logger","loggerFactory","printerMaintenanceLogService","name","list","req","res","query","validateInput","getMaintenanceLogsQuerySchema","result","send","logs","map","log","toDto","total","page","pageSize","get","logId","params","id","getActiveByPrinterId","printerId","create","data","body","createMaintenanceLogSchema","userId","user","username","complete","completeMaintenanceLogSchema","delete","success","permission","PERMS","PrinterMaintenanceLog","List","Get","ParamId","Create","Complete","Delete","AppConstants","apiRoute","authenticate"],"mappings":"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"}
|
package/dist/data-source.js
CHANGED
|
@@ -12,7 +12,6 @@ require("reflect-metadata");
|
|
|
12
12
|
const _typeorm = require("typeorm");
|
|
13
13
|
const _dotenv = /*#__PURE__*/ _interop_require_default(require("dotenv"));
|
|
14
14
|
const _nodepath = require("node:path");
|
|
15
|
-
const _serverconstants = require("./server.constants");
|
|
16
15
|
const _fsutils = require("./utils/fs.utils");
|
|
17
16
|
const _floorentity = require("./entities/floor.entity");
|
|
18
17
|
const _floorpositionentity = require("./entities/floor-position.entity");
|
|
@@ -39,6 +38,7 @@ const _1767352862576DropSettingsFileClean = require("./migrations/1767352862576-
|
|
|
39
38
|
const _1767370191762ChangeFloorNonUniqueOrder = require("./migrations/1767370191762-ChangeFloorNonUniqueOrder");
|
|
40
39
|
const _1767432108916RenameGroupToTag = require("./migrations/1767432108916-RenameGroupToTag");
|
|
41
40
|
const _1767451444137AddPrintJob = require("./migrations/1767451444137-AddPrintJob");
|
|
41
|
+
const _1767909428129AddPrinterMaintenanceLog = require("./migrations/1767909428129-AddPrinterMaintenanceLog");
|
|
42
42
|
function _interop_require_default(obj) {
|
|
43
43
|
return obj && obj.__esModule ? obj : {
|
|
44
44
|
default: obj
|
|
@@ -46,15 +46,13 @@ function _interop_require_default(obj) {
|
|
|
46
46
|
}
|
|
47
47
|
if (process.env.NODE_ENV !== "test") {
|
|
48
48
|
_dotenv.default.config({
|
|
49
|
-
path: (0, _nodepath.join)(
|
|
49
|
+
path: process.env.ENV_FILE || (0, _nodepath.join)("../.env"),
|
|
50
|
+
quiet: true
|
|
50
51
|
});
|
|
51
52
|
}
|
|
52
|
-
const dbFolder = process.env[_serverconstants.AppConstants.DATABASE_PATH] ?? "./database";
|
|
53
|
-
const dbFile = process.env[_serverconstants.AppConstants.DATABASE_FILE] ?? "./fdm-monster.sqlite";
|
|
54
|
-
const dbName = dbFile === ":memory:" ? dbFile : (0, _nodepath.join)((0, _fsutils.superRootPath)(), dbFolder, dbFile);
|
|
55
53
|
const AppDataSource = new _typeorm.DataSource({
|
|
56
54
|
type: "better-sqlite3",
|
|
57
|
-
database:
|
|
55
|
+
database: (0, _fsutils.getDatabaseFilePath)(),
|
|
58
56
|
synchronize: false,
|
|
59
57
|
logging: false,
|
|
60
58
|
entities: [
|
|
@@ -69,7 +67,8 @@ const AppDataSource = new _typeorm.DataSource({
|
|
|
69
67
|
_userroleentity.UserRole,
|
|
70
68
|
_tagentity.Tag,
|
|
71
69
|
_printertagentity.PrinterTag,
|
|
72
|
-
_entities.PrintJob
|
|
70
|
+
_entities.PrintJob,
|
|
71
|
+
_entities.PrinterMaintenanceLog
|
|
73
72
|
],
|
|
74
73
|
migrations: [
|
|
75
74
|
_1706829146617InitSqlite.InitSqlite1706829146617,
|
|
@@ -86,7 +85,8 @@ const AppDataSource = new _typeorm.DataSource({
|
|
|
86
85
|
_1767352862576DropSettingsFileClean.DropSettingsFileClean1767352862576,
|
|
87
86
|
_1767370191762ChangeFloorNonUniqueOrder.ChangeFloorNonUniqueOrder1767370191762,
|
|
88
87
|
_1767432108916RenameGroupToTag.RenameGroupToTag1767432108916,
|
|
89
|
-
_1767451444137AddPrintJob.AddPrintJob1767451444137
|
|
88
|
+
_1767451444137AddPrintJob.AddPrintJob1767451444137,
|
|
89
|
+
_1767909428129AddPrinterMaintenanceLog.AddPrinterMaintenanceLog1767909428129
|
|
90
90
|
],
|
|
91
91
|
subscribers: []
|
|
92
92
|
});
|