@fdm-monster/server 1.6.0 → 1.6.1
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/README.md +3 -2
- package/dist/controllers/printer.controller.js +11 -9
- package/dist/controllers/printer.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/data-source.js +3 -1
- package/dist/data-source.js.map +1 -1
- package/dist/entities/print-completion.entity.js +1 -1
- package/dist/entities/print-completion.entity.js.map +1 -1
- package/dist/migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade.js +182 -0
- package/dist/migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade.js.map +1 -0
- package/dist/server.constants.js +1 -1
- package/dist/services/batch-call.service.js +11 -2
- package/dist/services/batch-call.service.js.map +1 -1
- package/dist/services/core/yaml.service.js +146 -26
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.routes.js +1 -0
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.service.js +35 -0
- package/dist/services/octoprint/octoprint-api.service.js.map +1 -1
- package/dist/services/octoprint/octoprint-sockio.adapter.js +4 -4
- package/dist/services/octoprint/octoprint-sockio.adapter.js.map +1 -1
- package/dist/services/orm/floor-position.service.js +1 -1
- package/dist/services/orm/floor-position.service.js.map +1 -1
- package/dist/services/orm/floor.service.js +2 -2
- package/dist/services/orm/floor.service.js.map +1 -1
- package/dist/services/orm/printer.service.js +15 -0
- package/dist/services/orm/printer.service.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +10 -5
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/state/printer-connection.cache.js +13 -0
- package/dist/state/printer-connection.cache.js.map +1 -1
- package/dist/state/printer-socket.store.js +15 -14
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +39 -21
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/package.json +9 -8
package/.yarn/install-state.gz
CHANGED
|
Binary file
|
package/README.md
CHANGED
|
@@ -61,7 +61,7 @@ Please join the discord, but stay professional and proactive!
|
|
|
61
61
|
These are the people involved in the project. Find the meaning of the emoji keys [here](https://allcontributors.org/docs/en/emoji-key).
|
|
62
62
|
|
|
63
63
|
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
|
|
64
|
-
[](#contributors-)
|
|
65
65
|
<!-- ALL-CONTRIBUTORS-BADGE:END -->
|
|
66
66
|
|
|
67
67
|
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
|
|
@@ -74,7 +74,7 @@ These are the people involved in the project. Find the meaning of the emoji keys
|
|
|
74
74
|
<td align="center" valign="top" width="14.28%"><a href="https://kevenaar.name"><img src="https://avatars.githubusercontent.com/u/834643?v=4?s=80" width="80px;" alt="Maurice Kevenaar"/><br /><sub><b>Maurice Kevenaar</b></sub></a><br /><a href="#security-mkevenaar" title="Security">🛡️</a> <a href="#maintenance-mkevenaar" title="Maintenance">🚧</a> <a href="#ideas-mkevenaar" title="Ideas, Planning, & Feedback">🤔</a></td>
|
|
75
75
|
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Tobikisss"><img src="https://avatars.githubusercontent.com/u/45754890?v=4?s=80" width="80px;" alt="Tobias"/><br /><sub><b>Tobias</b></sub></a><br /><a href="#ideas-Tobikisss" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-Tobikisss" title="Maintenance">🚧</a></td>
|
|
76
76
|
<td align="center" valign="top" width="14.28%"><a href="https://tideline3d.com"><img src="https://avatars.githubusercontent.com/u/12903320?v=4?s=80" width="80px;" alt="tideline3d"/><br /><sub><b>tideline3d</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Atideline3d" title="Bug reports">🐛</a> <a href="#ideas-tideline3d" title="Ideas, Planning, & Feedback">🤔</a></td>
|
|
77
|
-
<td align="center" valign="top" width="14.28%"><a href="https://github.com/windarrow3d"><img src="https://avatars.githubusercontent.com/u/91099282?v=4?s=80" width="80px;" alt="WindArrow3d"/><br /><sub><b>WindArrow3d</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Awindarrow3d" title="Bug reports">🐛</a> <a href="#financial-windarrow3d" title="Financial">💵</a> <a href="#ideas-windarrow3d" title="Ideas, Planning, & Feedback">🤔</a> <a href="#userTesting-windarrow3d" title="User Testing">📓</a></td>
|
|
77
|
+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/windarrow3d"><img src="https://avatars.githubusercontent.com/u/91099282?v=4?s=80" width="80px;" alt="WindArrow3d"/><br /><sub><b>WindArrow3d</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Awindarrow3d" title="Bug reports">🐛</a> <a href="#financial-windarrow3d" title="Financial">💵</a> <a href="#ideas-windarrow3d" title="Ideas, Planning, & Feedback">🤔</a> <a href="#userTesting-windarrow3d" title="User Testing">📓</a> <a href="#platform-windarrow3d" title="Packaging/porting to new platform">📦</a></td>
|
|
78
78
|
<td align="center" valign="top" width="14.28%"><a href="http://lucianchapar.com"><img src="https://avatars.githubusercontent.com/u/33263520?v=4?s=80" width="80px;" alt="Lucian Chapar"/><br /><sub><b>Lucian Chapar</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Alucian151" title="Bug reports">🐛</a></td>
|
|
79
79
|
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Dumnersm580"><img src="https://avatars.githubusercontent.com/u/80608783?v=4?s=80" width="80px;" alt="Dumnersm580"/><br /><sub><b>Dumnersm580</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/commits?author=Dumnersm580" title="Documentation">📖</a> <a href="#ideas-Dumnersm580" title="Ideas, Planning, & Feedback">🤔</a></td>
|
|
80
80
|
</tr>
|
|
@@ -83,6 +83,7 @@ These are the people involved in the project. Find the meaning of the emoji keys
|
|
|
83
83
|
<td align="center" valign="top" width="14.28%"><a href="https://github.com/rmhenn"><img src="https://avatars.githubusercontent.com/u/22482801?v=4?s=80" width="80px;" alt="rmhenn"/><br /><sub><b>rmhenn</b></sub></a><br /><a href="#ideas-rmhenn" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Armhenn" title="Bug reports">🐛</a></td>
|
|
84
84
|
<td align="center" valign="top" width="14.28%"><a href="https://github.com/cyrixdx4"><img src="https://avatars.githubusercontent.com/u/62126724?v=4?s=80" width="80px;" alt="cyrixdx4"/><br /><sub><b>cyrixdx4</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Acyrixdx4" title="Bug reports">🐛</a></td>
|
|
85
85
|
<td align="center" valign="top" width="14.28%"><a href="https://github.com/doucettom"><img src="https://avatars.githubusercontent.com/u/6595645?v=4?s=80" width="80px;" alt="doucettom"/><br /><sub><b>doucettom</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Adoucettom" title="Bug reports">🐛</a> <a href="#ideas-doucettom" title="Ideas, Planning, & Feedback">🤔</a></td>
|
|
86
|
+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ZombiesLoveMe"><img src="https://avatars.githubusercontent.com/u/35661391?v=4?s=80" width="80px;" alt="Callum"/><br /><sub><b>Callum</b></sub></a><br /><a href="#ideas-ZombiesLoveMe" title="Ideas, Planning, & Feedback">🤔</a></td>
|
|
86
87
|
</tr>
|
|
87
88
|
</tbody>
|
|
88
89
|
</table>
|
|
@@ -25,7 +25,6 @@ const _serverconstants = require("../server.constants");
|
|
|
25
25
|
const _printer = require("../middleware/printer");
|
|
26
26
|
const _correlationtokenutil = require("../utils/correlation-token.util");
|
|
27
27
|
const _authorizationconstants = require("../constants/authorization.constants");
|
|
28
|
-
const _models = require("../models");
|
|
29
28
|
class PrinterController {
|
|
30
29
|
printerSocketStore;
|
|
31
30
|
testPrinterSocketStore;
|
|
@@ -55,13 +54,6 @@ class PrinterController {
|
|
|
55
54
|
const printers = await this.printerCache.listCachedPrinters(true);
|
|
56
55
|
res.send(printers);
|
|
57
56
|
}
|
|
58
|
-
async listPrinterFloors(req, res) {
|
|
59
|
-
const { currentPrinterId } = (0, _validators.getScopedPrinter)(req);
|
|
60
|
-
const results = await _models.Floor.find({
|
|
61
|
-
"printers.printerId": currentPrinterId
|
|
62
|
-
});
|
|
63
|
-
res.send(results);
|
|
64
|
-
}
|
|
65
57
|
async getPrinter(req, res) {
|
|
66
58
|
const { currentPrinterId } = (0, _validators.getScopedPrinter)(req);
|
|
67
59
|
const foundPrinter = await this.printerCache.getCachedPrinterOrThrowAsync(currentPrinterId);
|
|
@@ -98,6 +90,16 @@ class PrinterController {
|
|
|
98
90
|
await this.octoPrintApiService.sendConnectionCommand(printerLogin, command);
|
|
99
91
|
res.send({});
|
|
100
92
|
}
|
|
93
|
+
async sendPrintHeadJogCommand(req, res) {
|
|
94
|
+
const { printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
95
|
+
await this.octoPrintApiService.sendPrintHeadJogCommand(printerLogin, req.body);
|
|
96
|
+
res.send({});
|
|
97
|
+
}
|
|
98
|
+
async sendPrintHeadHomeCommand(req, res) {
|
|
99
|
+
const { printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
100
|
+
await this.octoPrintApiService.sendPrintHeadHomeCommand(printerLogin, req.body);
|
|
101
|
+
res.send({});
|
|
102
|
+
}
|
|
101
103
|
async pausePrintJob(req, res) {
|
|
102
104
|
const { printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
103
105
|
const command = this.octoPrintApiService.pauseJobCommand;
|
|
@@ -253,6 +255,6 @@ const _default = (0, _awilixexpress.createController)(PrinterController).prefix(
|
|
|
253
255
|
_authorizationconstants.ROLES.ADMIN
|
|
254
256
|
]),
|
|
255
257
|
(0, _printer.printerResolveMiddleware)()
|
|
256
|
-
]).get("/", "list").post("/", "create").post("/batch", "importBatch").post("/test-connection", "testConnection").get("/plugin-list", "getPluginList").get("/:id", "getPrinter").get("/:id/socket", "getPrinterSocketInfo").patch("/:id", "update").delete("/:id", "delete").get("/:id/login-details", "getPrinterLoginDetails").post("/:id/serial-connect", "sendSerialConnectCommand").post("/:id/serial-disconnect", "sendSerialDisconnectCommand").post("/:id/job/stop", "stopPrintJob").post("/:id/job/pause", "pausePrintJob").post("/:id/job/resume", "resumePrintJob").post("/:id/refresh-socket", "refreshPrinterSocket").patch("/:id/enabled", "updateEnabled").patch("/:id/connection", "updateConnectionSettings").patch("/:id/flow-rate", "setFlowRate").patch("/:id/feed-rate", "setFeedRate").patch("/:id/disabled-reason", "updatePrinterDisabledReason").get("/:id/
|
|
258
|
+
]).get("/", "list").post("/", "create").post("/batch", "importBatch").post("/test-connection", "testConnection").get("/plugin-list", "getPluginList").get("/:id", "getPrinter").get("/:id/socket", "getPrinterSocketInfo").patch("/:id", "update").delete("/:id", "delete").get("/:id/login-details", "getPrinterLoginDetails").post("/:id/serial-connect", "sendSerialConnectCommand").post("/:id/serial-disconnect", "sendSerialDisconnectCommand").post("/:id/jog", "sendPrintHeadJogCommand").post("/:id/home", "sendPrintHeadHomeCommand").post("/:id/job/stop", "stopPrintJob").post("/:id/job/pause", "pausePrintJob").post("/:id/job/resume", "resumePrintJob").post("/:id/refresh-socket", "refreshPrinterSocket").patch("/:id/enabled", "updateEnabled").patch("/:id/connection", "updateConnectionSettings").patch("/:id/flow-rate", "setFlowRate").patch("/:id/feed-rate", "setFeedRate").patch("/:id/disabled-reason", "updatePrinterDisabledReason").get("/:id/plugin-list", "getPrinterPluginList").get("/:id/octoprint/system/", "octoPrintListCommands").post("/:id/octoprint/system/restart", "octoPrintSystemRestart").get("/:id/octoprint/backup", "getOctoPrintBackupOverview").get("/:id/octoprint/backup/list", "listOctoPrintBackups").post("/:id/octoprint/backup/download", "downloadOctoPrintBackup").post("/:id/octoprint/backup/restore", "restoreOctoPrintBackup").post("/:id/octoprint/backup/create", "createOctoPrintBackup").delete("/:id/octoprint/backup/delete", "deleteOctoPrintBackup");
|
|
257
259
|
|
|
258
260
|
//# sourceMappingURL=printer.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/printer.controller.ts"],"names":["PrinterController","printerSocketStore","testPrinterSocketStore","printerService","printerCache","printerEventsCache","taskManagerService","octoPrintApiService","pluginRepositoryCache","floorStore","multerService","logger","constructor","loggerFactory","name","list","req","res","printers","listCachedPrinters","send","listPrinterFloors","currentPrinterId","getScopedPrinter","results","Floor","find","getPrinter","foundPrinter","getCachedPrinterOrThrowAsync","getPrinterSocketInfo","getPrinterSocketEvents","getPrinterLoginDetails","printerLogin","octoPrintListCommands","commands","getSystemCommands","octoPrintSystemRestart","result","postSystemRestartCommand","sendSerialConnectCommand","command","connectCommand","sendConnectionCommand","sendSerialDisconnectCommand","disconnectCommand","pausePrintJob","pauseJobCommand","sendJobCommand","resumePrintJob","resumeJobCommand","stopPrintJob","cancelJobCommand","create","newPrinter","body","createdPrinter","printer","id","log","correlationToken","importBatch","importResult","batchImport","delete","removePrinterFromAnyFloor","update","updatedPrinter","updateConnectionSettings","inputData","validateMiddleware","updatePrinterConnectionSettingRules","newEntity","printerURL","apiKey","updateEnabled","data","updatePrinterEnabledRule","JSON","stringify","enabled","updatePrinterDisabledReason","updatePrinterDisabledReasonRules","updateDisabledReason","disabledReason","setFeedRate","feedRateRules","updateFeedRate","feedRate","setFlowRate","flowRateRules","updateFlowRate","flowRate","getPluginList","pluginList","getCache","getPrinterPluginList","getPluginManagerPlugins","testConnection","length","normalizeURLWithProtocol","testPrinterApiRules","generateCorrelationToken","setupTestPrinter","e","failure","error","toString","refreshPrinterSocket","reconnectOctoPrint","deletePrinterSocketEvents","getOctoPrintBackupOverview","backupOverview","getBackupOverview","listOctoPrintBackups","getBackups","createOctoPrintBackup","exclude","createOctoPrintBackupRules","response","createBackup","downloadOctoPrintBackup","fileName","getOctoPrintBackupRules","dataStream","getDownloadBackupStream","pipe","restoreOctoPrintBackup","files","multerLoadFileAsync","forwardRestoreBackupFileStream","buffer","deleteOctoPrintBackup","deleteBackup","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware","get","post","patch"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/printer.controller.ts"],"names":["PrinterController","printerSocketStore","testPrinterSocketStore","printerService","printerCache","printerEventsCache","taskManagerService","octoPrintApiService","pluginRepositoryCache","floorStore","multerService","logger","constructor","loggerFactory","name","list","req","res","printers","listCachedPrinters","send","getPrinter","currentPrinterId","getScopedPrinter","foundPrinter","getCachedPrinterOrThrowAsync","getPrinterSocketInfo","getPrinterSocketEvents","getPrinterLoginDetails","printerLogin","octoPrintListCommands","commands","getSystemCommands","octoPrintSystemRestart","result","postSystemRestartCommand","sendSerialConnectCommand","command","connectCommand","sendConnectionCommand","sendSerialDisconnectCommand","disconnectCommand","sendPrintHeadJogCommand","body","sendPrintHeadHomeCommand","pausePrintJob","pauseJobCommand","sendJobCommand","resumePrintJob","resumeJobCommand","stopPrintJob","cancelJobCommand","create","newPrinter","createdPrinter","printer","id","log","correlationToken","importBatch","importResult","batchImport","delete","removePrinterFromAnyFloor","update","updatedPrinter","updateConnectionSettings","inputData","validateMiddleware","updatePrinterConnectionSettingRules","newEntity","printerURL","apiKey","updateEnabled","data","updatePrinterEnabledRule","JSON","stringify","enabled","updatePrinterDisabledReason","updatePrinterDisabledReasonRules","updateDisabledReason","disabledReason","setFeedRate","feedRateRules","updateFeedRate","feedRate","setFlowRate","flowRateRules","updateFlowRate","flowRate","getPluginList","pluginList","getCache","getPrinterPluginList","getPluginManagerPlugins","testConnection","length","normalizeURLWithProtocol","testPrinterApiRules","generateCorrelationToken","setupTestPrinter","e","failure","error","toString","refreshPrinterSocket","reconnectOctoPrint","deletePrinterSocketEvents","getOctoPrintBackupOverview","backupOverview","getBackupOverview","listOctoPrintBackups","getBackups","createOctoPrintBackup","exclude","createOctoPrintBackupRules","response","createBackup","downloadOctoPrintBackup","fileName","getOctoPrintBackupRules","dataStream","getDownloadBackupStream","pipe","restoreOctoPrintBackup","files","multerLoadFileAsync","forwardRestoreBackupFileStream","buffer","deleteOctoPrintBackup","deleteBackup","createController","prefix","AppConstants","apiRoute","before","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware","get","post","patch"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","serverVersion","settingsStore","printerSocketStore","serverReleaseService","monsterPiService","userService","roleService","isTypeormMode","constructor","welcome","req","res","serverSettings","getSettings","getLoginRequired","send","message","getFeatures","batchReprintCalls","available","version","batchConnectSocketCalls","batchConnectUsbCalls","newSockets","anonymousDiagnosticsToggle","pauseResumePrinterCommand","logDumpZip","clearLogFiles","batchTogglePrinterEnabled","cameraStream","subFeatures","printerGroupsApi","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isDockerContainer","isDocker","isNodemon","isNode","isPm2","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","createController","prefix","AppConstants","apiRoute","get","before","authenticate","authorizePermission","PERMS","ServerInfo","Get"],"mappings":";;;;;;;;;;;IAcaA,sBAAsB;eAAtBA;;
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/server-public.controller.ts"],"names":["ServerPublicController","serverVersion","settingsStore","printerSocketStore","serverReleaseService","monsterPiService","userService","roleService","isTypeormMode","constructor","welcome","req","res","serverSettings","getSettings","getLoginRequired","send","message","getFeatures","batchReprintCalls","available","version","batchConnectSocketCalls","batchConnectUsbCalls","newSockets","anonymousDiagnosticsToggle","pauseResumePrinterCommand","logDumpZip","clearLogFiles","batchTogglePrinterEnabled","cameraStream","subFeatures","printerGroupsApi","printerControlApi","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isDockerContainer","isDocker","isNodemon","isNode","isPm2","os","process","env","OS","monsterPi","update","synced","updateAvailable","airGapped","test","createController","prefix","AppConstants","apiRoute","get","before","authenticate","authorizePermission","PERMS","ServerInfo","Get"],"mappings":"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"}
|
package/dist/data-source.js
CHANGED
|
@@ -28,6 +28,7 @@ const _1706829146617InitSqlite = require("./migrations/1706829146617-InitSqlite"
|
|
|
28
28
|
const _printergroupentity = require("./entities/printer-group.entity");
|
|
29
29
|
const _groupentity = require("./entities/group.entity");
|
|
30
30
|
const _1707494762198PrinterGroup = require("./migrations/1707494762198-PrinterGroup");
|
|
31
|
+
const _1708465930665ChangePrintCompletionDeletePrinterCascade = require("./migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade");
|
|
31
32
|
function _interop_require_default(obj) {
|
|
32
33
|
return obj && obj.__esModule ? obj : {
|
|
33
34
|
default: obj
|
|
@@ -64,7 +65,8 @@ const AppDataSource = new _typeorm.DataSource({
|
|
|
64
65
|
],
|
|
65
66
|
migrations: [
|
|
66
67
|
_1706829146617InitSqlite.InitSqlite1706829146617,
|
|
67
|
-
_1707494762198PrinterGroup.PrinterGroup1707494762198
|
|
68
|
+
_1707494762198PrinterGroup.PrinterGroup1707494762198,
|
|
69
|
+
_1708465930665ChangePrintCompletionDeletePrinterCascade.ChangePrintCompletionDeletePrinterCascade1708465930665
|
|
68
70
|
],
|
|
69
71
|
subscribers: []
|
|
70
72
|
});
|
package/dist/data-source.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/data-source.ts"],"names":["AppDataSource","dotenv","config","path","join","superRootPath","dbFolder","process","env","AppConstants","DATABASE_PATH","dbFile","DATABASE_FILE","isMemoryDb","dbName","DataSource","type","database","synchronize","logging","entities","Floor","FloorPosition","Printer","PrinterFile","Settings","User","CameraStream","CustomGcode","Role","Permission","RefreshToken","PrintCompletion","UserRole","Group","PrinterGroup","migrations","InitSqlite1706829146617","PrinterGroup1707494762198","subscribers"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../src/data-source.ts"],"names":["AppDataSource","dotenv","config","path","join","superRootPath","dbFolder","process","env","AppConstants","DATABASE_PATH","dbFile","DATABASE_FILE","isMemoryDb","dbName","DataSource","type","database","synchronize","logging","entities","Floor","FloorPosition","Printer","PrinterFile","Settings","User","CameraStream","CustomGcode","Role","Permission","RefreshToken","PrintCompletion","UserRole","Group","PrinterGroup","migrations","InitSqlite1706829146617","PrinterGroup1707494762198","ChangePrintCompletionDeletePrinterCascade1708465930665","subscribers"],"mappings":";;;;+BAkCaA;;;eAAAA;;;QAlCN;yBACoB;iDACR;sBACE;iCACQ;yBACC;6BACR;qCACQ;+BACN;gCACC;0BACuC;oCACnC;mCACD;4BACP;mCACO;gCACH;yCACe;oCACX;6BACP;2CACoB;wEAC6B;;;;;;AAEvEC,eAAM,CAACC,MAAM,CAAC;IACZC,MAAMC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAI;AAC9B;AAEA,MAAMC,WAAWC,QAAQC,GAAG,CAACC,6BAAY,CAACC,aAAa,CAAC,IAAI;AAC5D,MAAMC,SAASJ,QAAQC,GAAG,CAACC,6BAAY,CAACG,aAAa,CAAC,IAAI;AAC1D,MAAMC,aAAaF,WAAW;AAC9B,MAAMG,SAASD,aAAaF,SAASP,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIC,UAAUK;AAK9D,MAAMX,gBAAgB,IAAIe,mBAAU,CAAC;IAC1CC,MAAM;IACNC,UAAUH;IACVI,aAAa;IACbC,SAAS;IACTC,UAAU;QACRC,kBAAK;QACLC,kCAAa;QACbC,sBAAO;QACPC,8BAAW;QACXC,wBAAQ;QACRC,cAAI;QACJC,gCAAY;QACZC,8BAAW;QACXC,gBAAI;QACJC,oBAAU;QACVC,sBAAY;QACZC,yBAAe;QACfC,wBAAQ;QACRC,kBAAK;QACLC,gCAAY;KACb;IACDC,YAAY;QAACC,gDAAuB;QAAEC,oDAAyB;QAAEC,8GAAsD;KAAC;IACxHC,aAAa,EAAE;AACjB"}
|
|
@@ -52,7 +52,7 @@ _ts_decorate([
|
|
|
52
52
|
], PrintCompletion.prototype, "status", void 0);
|
|
53
53
|
_ts_decorate([
|
|
54
54
|
(0, _typeorm.ManyToOne)(()=>_printerentity.Printer, (p)=>p.printCompletions, {
|
|
55
|
-
onDelete: "
|
|
55
|
+
onDelete: "CASCADE"
|
|
56
56
|
}),
|
|
57
57
|
(0, _typeorm.JoinColumn)({
|
|
58
58
|
name: "printerId"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/entities/print-completion.entity.ts"],"names":["PrintCompletion","BaseEntity","id","fileName","createdAt","status","printer","printerId","printerReference","completionLog","context","PrimaryGeneratedColumn","Column","CreateDateColumn","type","ManyToOne","Printer","p","printCompletions","onDelete","JoinColumn","name","nullable","Entity"],"mappings":";;;;+BAMaA;;;eAAAA;;;yBAN6F;+BAClF;4BACG;2CACe;;;;;;;;;;AAGnC,MAAMA,wBAAwBC,sBAAU;IAE7CC,GAAY;IAGZC,SAAkB;IAGlBC,UAAmB;IAGnBC,OAAgB;IAIhBC,QAA4B;IAG5BC,UAAmB;IAGnBC,iBAA0B;IAG1BC,cAAuB;IAGvBC,QAAoC;AACtC;;IA3BGC,IAAAA,+BAAsB;;GADZX;;IAIVY,IAAAA,eAAM;;GAJIZ;;IAOVa,IAAAA,yBAAgB,EAAC;QAAEC,MAAM;IAAM;;GAPrBd;;IAUVY,IAAAA,eAAM;;GAVIZ;;IAaVe,IAAAA,kBAAS,EAAC,IAAMC,sBAAO,EAAE,CAACC,IAAMA,EAAEC,gBAAgB,EAAE;QAAEC,UAAU;
|
|
1
|
+
{"version":3,"sources":["../../src/entities/print-completion.entity.ts"],"names":["PrintCompletion","BaseEntity","id","fileName","createdAt","status","printer","printerId","printerReference","completionLog","context","PrimaryGeneratedColumn","Column","CreateDateColumn","type","ManyToOne","Printer","p","printCompletions","onDelete","JoinColumn","name","nullable","Entity"],"mappings":";;;;+BAMaA;;;eAAAA;;;yBAN6F;+BAClF;4BACG;2CACe;;;;;;;;;;AAGnC,MAAMA,wBAAwBC,sBAAU;IAE7CC,GAAY;IAGZC,SAAkB;IAGlBC,UAAmB;IAGnBC,OAAgB;IAIhBC,QAA4B;IAG5BC,UAAmB;IAGnBC,iBAA0B;IAG1BC,cAAuB;IAGvBC,QAAoC;AACtC;;IA3BGC,IAAAA,+BAAsB;;GADZX;;IAIVY,IAAAA,eAAM;;GAJIZ;;IAOVa,IAAAA,yBAAgB,EAAC;QAAEC,MAAM;IAAM;;GAPrBd;;IAUVY,IAAAA,eAAM;;GAVIZ;;IAaVe,IAAAA,kBAAS,EAAC,IAAMC,sBAAO,EAAE,CAACC,IAAMA,EAAEC,gBAAgB,EAAE;QAAEC,UAAU;IAAU;IAC1EC,IAAAA,mBAAU,EAAC;QAAEC,MAAM;IAAY;uCACtB,iBAAQ,4BAAR,iBAAQ;GAfPrB;;IAiBVY,IAAAA,eAAM,EAAC;QAAEU,UAAU;IAAM;;GAjBftB;;IAoBVY,IAAAA,eAAM,EAAC;QAAEU,UAAU;IAAK;;GApBdtB;;IAuBVY,IAAAA,eAAM,EAAC;QAAEU,UAAU;IAAK;;GAvBdtB;;IA0BVY,IAAAA,eAAM,EAAC;QAAEE,MAAM;QAAeQ,UAAU;IAAK;uCACpC,oDAAyB,4BAAzB,oDAAyB;GA3BxBtB;AAAAA;IADZuB,IAAAA,eAAM;GACMvB"}
|
|
@@ -0,0 +1,182 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "ChangePrintCompletionDeletePrinterCascade1708465930665", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return ChangePrintCompletionDeletePrinterCascade1708465930665;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
class ChangePrintCompletionDeletePrinterCascade1708465930665 {
|
|
12
|
+
name = 'ChangePrintCompletionDeletePrinterCascade1708465930665';
|
|
13
|
+
async up(queryRunner) {
|
|
14
|
+
await queryRunner.query(`
|
|
15
|
+
CREATE TABLE "temporary_print_completion" (
|
|
16
|
+
"id" integer PRIMARY KEY AUTOINCREMENT NOT NULL,
|
|
17
|
+
"fileName" varchar NOT NULL,
|
|
18
|
+
"createdAt" integer NOT NULL DEFAULT (datetime('now')),
|
|
19
|
+
"status" varchar NOT NULL,
|
|
20
|
+
"printerId" integer NOT NULL,
|
|
21
|
+
"printerReference" varchar,
|
|
22
|
+
"completionLog" varchar,
|
|
23
|
+
"context" text
|
|
24
|
+
)
|
|
25
|
+
`);
|
|
26
|
+
await queryRunner.query(`
|
|
27
|
+
INSERT INTO "temporary_print_completion"(
|
|
28
|
+
"id",
|
|
29
|
+
"fileName",
|
|
30
|
+
"createdAt",
|
|
31
|
+
"status",
|
|
32
|
+
"printerId",
|
|
33
|
+
"printerReference",
|
|
34
|
+
"completionLog",
|
|
35
|
+
"context"
|
|
36
|
+
)
|
|
37
|
+
SELECT "id",
|
|
38
|
+
"fileName",
|
|
39
|
+
"createdAt",
|
|
40
|
+
"status",
|
|
41
|
+
"printerId",
|
|
42
|
+
"printerReference",
|
|
43
|
+
"completionLog",
|
|
44
|
+
"context"
|
|
45
|
+
FROM "print_completion"
|
|
46
|
+
`);
|
|
47
|
+
await queryRunner.query(`
|
|
48
|
+
DROP TABLE "print_completion"
|
|
49
|
+
`);
|
|
50
|
+
await queryRunner.query(`
|
|
51
|
+
ALTER TABLE "temporary_print_completion"
|
|
52
|
+
RENAME TO "print_completion"
|
|
53
|
+
`);
|
|
54
|
+
await queryRunner.query(`
|
|
55
|
+
CREATE TABLE "temporary_print_completion" (
|
|
56
|
+
"id" integer PRIMARY KEY AUTOINCREMENT NOT NULL,
|
|
57
|
+
"fileName" varchar NOT NULL,
|
|
58
|
+
"createdAt" integer NOT NULL DEFAULT (datetime('now')),
|
|
59
|
+
"status" varchar NOT NULL,
|
|
60
|
+
"printerId" integer NOT NULL,
|
|
61
|
+
"printerReference" varchar,
|
|
62
|
+
"completionLog" varchar,
|
|
63
|
+
"context" text,
|
|
64
|
+
CONSTRAINT "FK_c078b1dfe5f87f79f131520d856" FOREIGN KEY ("printerId") REFERENCES "printer" ("id") ON DELETE CASCADE ON UPDATE NO ACTION
|
|
65
|
+
)
|
|
66
|
+
`);
|
|
67
|
+
await queryRunner.query(`
|
|
68
|
+
INSERT INTO "temporary_print_completion"(
|
|
69
|
+
"id",
|
|
70
|
+
"fileName",
|
|
71
|
+
"createdAt",
|
|
72
|
+
"status",
|
|
73
|
+
"printerId",
|
|
74
|
+
"printerReference",
|
|
75
|
+
"completionLog",
|
|
76
|
+
"context"
|
|
77
|
+
)
|
|
78
|
+
SELECT "id",
|
|
79
|
+
"fileName",
|
|
80
|
+
"createdAt",
|
|
81
|
+
"status",
|
|
82
|
+
"printerId",
|
|
83
|
+
"printerReference",
|
|
84
|
+
"completionLog",
|
|
85
|
+
"context"
|
|
86
|
+
FROM "print_completion"
|
|
87
|
+
`);
|
|
88
|
+
await queryRunner.query(`
|
|
89
|
+
DROP TABLE "print_completion"
|
|
90
|
+
`);
|
|
91
|
+
await queryRunner.query(`
|
|
92
|
+
ALTER TABLE "temporary_print_completion"
|
|
93
|
+
RENAME TO "print_completion"
|
|
94
|
+
`);
|
|
95
|
+
}
|
|
96
|
+
async down(queryRunner) {
|
|
97
|
+
await queryRunner.query(`
|
|
98
|
+
ALTER TABLE "print_completion"
|
|
99
|
+
RENAME TO "temporary_print_completion"
|
|
100
|
+
`);
|
|
101
|
+
await queryRunner.query(`
|
|
102
|
+
CREATE TABLE "print_completion" (
|
|
103
|
+
"id" integer PRIMARY KEY AUTOINCREMENT NOT NULL,
|
|
104
|
+
"fileName" varchar NOT NULL,
|
|
105
|
+
"createdAt" integer NOT NULL DEFAULT (datetime('now')),
|
|
106
|
+
"status" varchar NOT NULL,
|
|
107
|
+
"printerId" integer NOT NULL,
|
|
108
|
+
"printerReference" varchar,
|
|
109
|
+
"completionLog" varchar,
|
|
110
|
+
"context" text
|
|
111
|
+
)
|
|
112
|
+
`);
|
|
113
|
+
await queryRunner.query(`
|
|
114
|
+
INSERT INTO "print_completion"(
|
|
115
|
+
"id",
|
|
116
|
+
"fileName",
|
|
117
|
+
"createdAt",
|
|
118
|
+
"status",
|
|
119
|
+
"printerId",
|
|
120
|
+
"printerReference",
|
|
121
|
+
"completionLog",
|
|
122
|
+
"context"
|
|
123
|
+
)
|
|
124
|
+
SELECT "id",
|
|
125
|
+
"fileName",
|
|
126
|
+
"createdAt",
|
|
127
|
+
"status",
|
|
128
|
+
"printerId",
|
|
129
|
+
"printerReference",
|
|
130
|
+
"completionLog",
|
|
131
|
+
"context"
|
|
132
|
+
FROM "temporary_print_completion"
|
|
133
|
+
`);
|
|
134
|
+
await queryRunner.query(`
|
|
135
|
+
DROP TABLE "temporary_print_completion"
|
|
136
|
+
`);
|
|
137
|
+
await queryRunner.query(`
|
|
138
|
+
ALTER TABLE "print_completion"
|
|
139
|
+
RENAME TO "temporary_print_completion"
|
|
140
|
+
`);
|
|
141
|
+
await queryRunner.query(`
|
|
142
|
+
CREATE TABLE "print_completion" (
|
|
143
|
+
"id" integer PRIMARY KEY AUTOINCREMENT NOT NULL,
|
|
144
|
+
"fileName" varchar NOT NULL,
|
|
145
|
+
"createdAt" integer NOT NULL DEFAULT (datetime('now')),
|
|
146
|
+
"status" varchar NOT NULL,
|
|
147
|
+
"printerId" integer NOT NULL,
|
|
148
|
+
"printerReference" varchar,
|
|
149
|
+
"completionLog" varchar,
|
|
150
|
+
"context" text,
|
|
151
|
+
CONSTRAINT "FK_c078b1dfe5f87f79f131520d856" FOREIGN KEY ("printerId") REFERENCES "printer" ("id") ON DELETE
|
|
152
|
+
SET NULL ON UPDATE NO ACTION
|
|
153
|
+
)
|
|
154
|
+
`);
|
|
155
|
+
await queryRunner.query(`
|
|
156
|
+
INSERT INTO "print_completion"(
|
|
157
|
+
"id",
|
|
158
|
+
"fileName",
|
|
159
|
+
"createdAt",
|
|
160
|
+
"status",
|
|
161
|
+
"printerId",
|
|
162
|
+
"printerReference",
|
|
163
|
+
"completionLog",
|
|
164
|
+
"context"
|
|
165
|
+
)
|
|
166
|
+
SELECT "id",
|
|
167
|
+
"fileName",
|
|
168
|
+
"createdAt",
|
|
169
|
+
"status",
|
|
170
|
+
"printerId",
|
|
171
|
+
"printerReference",
|
|
172
|
+
"completionLog",
|
|
173
|
+
"context"
|
|
174
|
+
FROM "temporary_print_completion"
|
|
175
|
+
`);
|
|
176
|
+
await queryRunner.query(`
|
|
177
|
+
DROP TABLE "temporary_print_completion"
|
|
178
|
+
`);
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
|
|
182
|
+
//# sourceMappingURL=1708465930665-ChangePrintCompletionDeletePrinterCascade.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/migrations/1708465930665-ChangePrintCompletionDeletePrinterCascade.ts"],"names":["ChangePrintCompletionDeletePrinterCascade1708465930665","name","up","queryRunner","query","down"],"mappings":";;;;+BAEaA;;;eAAAA;;;AAAN,MAAMA;IACTC,OAAO,yDAAwD;IAE/D,MAAaC,GAAGC,WAAwB,EAAiB;QACrD,MAAMA,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;QAWzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;QAoBzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;QAEzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;QAGzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;QAYzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;QAoBzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;QAEzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;QAGzB,CAAC;IACL;IAEA,MAAaC,KAAKF,WAAwB,EAAiB;QACvD,MAAMA,YAAYC,KAAK,CAAC,CAAC;;;QAGzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;QAWzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;QAoBzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;QAEzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;QAGzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;QAazB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;QAoBzB,CAAC;QACD,MAAMD,YAAYC,KAAK,CAAC,CAAC;;QAEzB,CAAC;IACL;AAEJ"}
|
package/dist/server.constants.js
CHANGED
|
@@ -63,7 +63,7 @@ const AppConstants = {
|
|
|
63
63
|
serverRepoName: "fdm-monster",
|
|
64
64
|
orgName: "fdm-monster",
|
|
65
65
|
currentWizardVersion: 1,
|
|
66
|
-
defaultClientMinimum: "1.5.
|
|
66
|
+
defaultClientMinimum: "1.5.6",
|
|
67
67
|
influxUrl: "INFLUX_URL",
|
|
68
68
|
influxToken: "INFLUX_TOKEN",
|
|
69
69
|
influxOrg: "INFLUX_ORG",
|
|
@@ -8,6 +8,8 @@ Object.defineProperty(exports, "BatchCallService", {
|
|
|
8
8
|
return BatchCallService;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
+
const _node = require("@sentry/node");
|
|
12
|
+
const _errorutils = require("../utils/error.utils");
|
|
11
13
|
var ReprintState;
|
|
12
14
|
(function(ReprintState) {
|
|
13
15
|
ReprintState[ReprintState["PrinterNotAvailable"] = 0] = "PrinterNotAvailable";
|
|
@@ -21,13 +23,15 @@ class BatchCallService {
|
|
|
21
23
|
printerEventsCache;
|
|
22
24
|
printerFilesStore;
|
|
23
25
|
printerService;
|
|
24
|
-
|
|
26
|
+
logger;
|
|
27
|
+
constructor({ octoPrintApiService, printerCache, printerEventsCache, printerSocketStore, printerFilesStore, printerService, loggerFactory }){
|
|
25
28
|
this.octoPrintApiService = octoPrintApiService;
|
|
26
29
|
this.printerCache = printerCache;
|
|
27
30
|
this.printerEventsCache = printerEventsCache;
|
|
28
31
|
this.printerSocketStore = printerSocketStore;
|
|
29
32
|
this.printerFilesStore = printerFilesStore;
|
|
30
33
|
this.printerService = printerService;
|
|
34
|
+
this.logger = loggerFactory(BatchCallService.name);
|
|
31
35
|
}
|
|
32
36
|
async batchTogglePrintersEnabled(printerIds, enabled) {
|
|
33
37
|
const promises = [];
|
|
@@ -77,7 +81,12 @@ class BatchCallService {
|
|
|
77
81
|
}
|
|
78
82
|
batchConnectSocket(printerIds) {
|
|
79
83
|
for (const printerId of printerIds){
|
|
80
|
-
|
|
84
|
+
try {
|
|
85
|
+
this.printerSocketStore.reconnectOctoPrint(printerId);
|
|
86
|
+
} catch (e) {
|
|
87
|
+
(0, _node.captureException)(e);
|
|
88
|
+
this.logger.error(`Error setting socket to reconnect ${(0, _errorutils.errorSummary)(e)}`);
|
|
89
|
+
}
|
|
81
90
|
}
|
|
82
91
|
}
|
|
83
92
|
async batchSettingsGet(printerIds) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/batch-call.service.ts"],"names":["BatchCallService","ReprintState","octoPrintApiService","printerSocketStore","printerCache","printerEventsCache","printerFilesStore","printerService","constructor","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","push","Promise","all","batchConnectSocket","reconnectOctoPrint","batchSettingsGet","printerLogin","getLoginDtoAsync","getSettings","r","value","batchConnectUsb","command","connectCommand","sendConnectionCommand","getBatchPrinterReprintFile","resolve","_","login","files","getLocalFiles","filter","f","prints","last","date","connected","getConnection","connectionState","current","state","reprintState","file","batchReprintCalls","printerIdFileList","printerIdFile","path","selectPrintFile"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../src/services/batch-call.service.ts"],"names":["BatchCallService","ReprintState","octoPrintApiService","printerSocketStore","printerCache","printerEventsCache","printerFilesStore","printerService","logger","constructor","loggerFactory","name","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","push","Promise","all","batchConnectSocket","reconnectOctoPrint","captureException","errorSummary","batchSettingsGet","printerLogin","getLoginDtoAsync","getSettings","r","value","batchConnectUsb","command","connectCommand","sendConnectionCommand","getBatchPrinterReprintFile","resolve","_","login","files","getLocalFiles","filter","f","prints","last","date","connected","getConnection","connectionState","current","state","reprintState","file","batchReprintCalls","printerIdFileList","printerIdFile","path","selectPrintFile"],"mappings":"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"}
|