@fdm-monster/server 2.0.0 → 2.0.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/.env.template +2 -0
- package/.yarn/install-state.gz +0 -0
- package/README.md +22 -3
- package/RELEASE_NOTES.MD +38 -0
- package/dist/constants/authorization.constants.js +12 -3
- package/dist/constants/authorization.constants.js.map +1 -1
- package/dist/constants/server-settings.constants.js +4 -2
- package/dist/constants/server-settings.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/file-storage.controller.js +90 -19
- package/dist/controllers/file-storage.controller.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/controllers/settings.controller.js +70 -2
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/controllers/slicer-compat.controller.js +4 -0
- package/dist/controllers/slicer-compat.controller.js.map +1 -1
- 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/entities/settings.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/middleware/slicer-api-key.middleware.js +29 -0
- package/dist/middleware/slicer-api-key.middleware.js.map +1 -0
- 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 +23 -3
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/file-storage.service.js +4 -3
- 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 +8 -2
- package/dist/services/orm/printer.service.js.map +1 -1
- package/dist/services/orm/settings.service.js +9 -2
- package/dist/services/orm/settings.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 +2 -3
- package/dist/services/validators/printer-service.validation.js.map +1 -1
- package/dist/services/validators/settings-service.validation.js +23 -4
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +2 -0
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/shared/runtime-settings.migration.js +10 -0
- package/dist/shared/runtime-settings.migration.js.map +1 -1
- package/dist/state/settings.store.js +38 -5
- package/dist/state/settings.store.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/install.sh +559 -0
- package/package.json +6 -6
|
@@ -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":";;;;+BAkBaA;;;eAAAA;;;+BAlBoC;iCACpB;yBACK;8BACO;wCACnB;8CACuB;+BACd;4BAED;iDAKvB;0CACiB;;;;;;;;;;AAIjB,MAAMA;;IACMC,OAAsB;IAEvC,YACEC,aAA6B,EAC7B,AAAiBC,4BAA0D,CAC3E;aADiBA,+BAAAA;QAEjB,IAAI,CAACF,MAAM,GAAGC,cAAcF,gCAAgCI,IAAI;IAClE;IAEA,MAGMC,KAAKC,GAAY,EAAEC,GAAa,EAAE;QACtC,MAAMC,QAAQ,MAAMC,IAAAA,yBAAa,EAACH,IAAIE,KAAK,EAAEE,8DAA6B;QAC1E,MAAMC,SAAS,MAAM,IAAI,CAACR,4BAA4B,CAACE,IAAI,CAACG;QAE5DD,IAAIK,IAAI,CAAC;YACPC,MAAMF,OAAOE,IAAI,CAACC,GAAG,CAAC,CAACC,MAAQ,IAAI,CAACZ,4BAA4B,CAACa,KAAK,CAACD;YACvEE,OAAON,OAAOM,KAAK;YACnBC,MAAMV,MAAMU,IAAI;YAChBC,UAAUX,MAAMW,QAAQ;QAC1B;IACF;IAEA,MAGMC,IAAId,GAAY,EAAEC,GAAa,EAAE;QACrC,MAAMc,QAAQf,IAAIgB,MAAM,CAACC,EAAE;QAC3B,MAAMR,MAAM,MAAM,IAAI,CAACZ,4BAA4B,CAACiB,GAAG,CAACC;QACxDd,IAAIK,IAAI,CAAC,IAAI,CAACT,4BAA4B,CAACa,KAAK,CAACD;IACnD;IAEA,MAGMS,qBAAqBlB,GAAY,EAAEC,GAAa,EAAE;QACtD,MAAMkB,YAAYnB,IAAIgB,MAAM,CAACG,SAAS;QACtC,MAAMV,MAAM,MAAM,IAAI,CAACZ,4BAA4B,CAACqB,oBAAoB,CAACC;QACzElB,IAAIK,IAAI,CAACG,MAAM,IAAI,CAACZ,4BAA4B,CAACa,KAAK,CAACD,OAAO;IAChE;IAEA,MAGMW,OAAOpB,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAMoB,OAAO,MAAMlB,IAAAA,yBAAa,EAACH,IAAIsB,IAAI,EAAEC,2DAA0B;QACrE,MAAMC,SAASxB,IAAIyB,IAAI,EAAER,MAAM;QAC/B,MAAMS,WAAW1B,IAAIyB,IAAI,EAAEC,YAAY;QAEvC,MAAMjB,MAAM,MAAM,IAAI,CAACZ,4BAA4B,CAACuB,MAAM,CAACC,MAAMG,QAAQE;QACzEzB,IAAIK,IAAI,CAAC,IAAI,CAACT,4BAA4B,CAACa,KAAK,CAACD;IACnD;IAEA,MAGMkB,SAAS3B,GAAY,EAAEC,GAAa,EAAE;QAC1C,MAAMc,QAAQf,IAAIgB,MAAM,CAACC,EAAE;QAC3B,MAAMI,OAAO,MAAMlB,IAAAA,yBAAa,EAACH,IAAIsB,IAAI,EAAEM,6DAA4B;QACvE,MAAMJ,SAASxB,IAAIyB,IAAI,EAAER,MAAM;QAC/B,MAAMS,WAAW1B,IAAIyB,IAAI,EAAEC,YAAY;QAEvC,MAAMjB,MAAM,MAAM,IAAI,CAACZ,4BAA4B,CAAC8B,QAAQ,CAACZ,OAAOM,MAAMG,QAAQE;QAClFzB,IAAIK,IAAI,CAAC,IAAI,CAACT,4BAA4B,CAACa,KAAK,CAACD;IACnD;IAEA,MAGMoB,OAAO7B,GAAY,EAAEC,GAAa,EAAE;QACxC,MAAMc,QAAQf,IAAIgB,MAAM,CAACC,EAAE;QAC3B,MAAM,IAAI,CAACpB,4BAA4B,CAACgC,MAAM,CAACd;QAC/Cd,IAAIK,IAAI,CAAC;YAAEwB,SAAS;QAAK;IAC3B;AACF;;;;;QAhEWC,IAAAA,wBAAU,EAACC,6BAAK,CAACC,qBAAqB,CAACC,IAAI;;;;;;;;;;;;;QAe3CH,IAAAA,wBAAU,EAACC,6BAAK,CAACC,qBAAqB,CAACE,GAAG;QAAGC,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QASrDL,IAAAA,wBAAU,EAACC,6BAAK,CAACC,qBAAqB,CAACE,GAAG;QAAGC,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QASrDL,IAAAA,wBAAU,EAACC,6BAAK,CAACC,qBAAqB,CAACI,MAAM;;;;;;;;;;;;;QAY7CN,IAAAA,wBAAU,EAACC,6BAAK,CAACC,qBAAqB,CAACK,QAAQ;QAAGF,IAAAA,iCAAO,EAAC;;;;;;;;;;;;;QAa1DL,IAAAA,wBAAU,EAACC,6BAAK,CAACC,qBAAqB,CAACM,MAAM;QAAGH,IAAAA,iCAAO,EAAC;;;;;;;;;;8BAxE5DI,6BAAY,CAACC,QAAQ,GAAG;;QACtBC,IAAAA,0BAAY"}
|
|
@@ -124,8 +124,8 @@ class SettingsController {
|
|
|
124
124
|
res.send(result);
|
|
125
125
|
}
|
|
126
126
|
async updateCredentialSettings(req, res) {
|
|
127
|
-
const validatedInput = await (0, _validators.validateInput)(req.body, _settingsservicevalidation.
|
|
128
|
-
await this.settingsStore.
|
|
127
|
+
const validatedInput = await (0, _validators.validateInput)(req.body, _settingsservicevalidation.credentialCoreSettingUpdateSchema);
|
|
128
|
+
await this.settingsStore.updateCoreCredentialSettings(validatedInput);
|
|
129
129
|
res.send();
|
|
130
130
|
}
|
|
131
131
|
async updateTimeoutSettings(req, res) {
|
|
@@ -133,6 +133,26 @@ class SettingsController {
|
|
|
133
133
|
const result = await this.settingsStore.updateTimeoutSettings(validatedInput);
|
|
134
134
|
res.send(result);
|
|
135
135
|
}
|
|
136
|
+
async getSlicerApiKey(req, res) {
|
|
137
|
+
const apiKey = this.settingsStore.getSlicerApiKey();
|
|
138
|
+
res.send({
|
|
139
|
+
slicerApiKey: apiKey
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
async regenerateSlicerApiKey(req, res) {
|
|
143
|
+
const newApiKey = await this.settingsStore.generateSlicerApiKey();
|
|
144
|
+
this.logger.log("Slicer API key regenerated");
|
|
145
|
+
res.send({
|
|
146
|
+
slicerApiKey: newApiKey
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
async deleteSlicerApiKey(req, res) {
|
|
150
|
+
await this.settingsStore.deleteSlicerApiKey();
|
|
151
|
+
this.logger.log("Slicer API key deleted");
|
|
152
|
+
res.send({
|
|
153
|
+
slicerApiKey: null
|
|
154
|
+
});
|
|
155
|
+
}
|
|
136
156
|
}
|
|
137
157
|
_ts_decorate([
|
|
138
158
|
(0, _awilixexpress.GET)(),
|
|
@@ -294,6 +314,54 @@ _ts_decorate([
|
|
|
294
314
|
]),
|
|
295
315
|
_ts_metadata("design:returntype", Promise)
|
|
296
316
|
], SettingsController.prototype, "updateTimeoutSettings", null);
|
|
317
|
+
_ts_decorate([
|
|
318
|
+
(0, _awilixexpress.GET)(),
|
|
319
|
+
(0, _awilixexpress.route)("/slicer-api-key"),
|
|
320
|
+
(0, _awilixexpress.before)([
|
|
321
|
+
(0, _authenticate.authorizeRoles)([
|
|
322
|
+
_authorizationconstants.ROLES.ADMIN
|
|
323
|
+
]),
|
|
324
|
+
_demomiddleware.demoUserNotAllowed
|
|
325
|
+
]),
|
|
326
|
+
_ts_metadata("design:type", Function),
|
|
327
|
+
_ts_metadata("design:paramtypes", [
|
|
328
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
329
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
330
|
+
]),
|
|
331
|
+
_ts_metadata("design:returntype", Promise)
|
|
332
|
+
], SettingsController.prototype, "getSlicerApiKey", null);
|
|
333
|
+
_ts_decorate([
|
|
334
|
+
(0, _awilixexpress.POST)(),
|
|
335
|
+
(0, _awilixexpress.route)("/slicer-api-key/regenerate"),
|
|
336
|
+
(0, _awilixexpress.before)([
|
|
337
|
+
(0, _authenticate.authorizeRoles)([
|
|
338
|
+
_authorizationconstants.ROLES.ADMIN
|
|
339
|
+
]),
|
|
340
|
+
_demomiddleware.demoUserNotAllowed
|
|
341
|
+
]),
|
|
342
|
+
_ts_metadata("design:type", Function),
|
|
343
|
+
_ts_metadata("design:paramtypes", [
|
|
344
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
345
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
346
|
+
]),
|
|
347
|
+
_ts_metadata("design:returntype", Promise)
|
|
348
|
+
], SettingsController.prototype, "regenerateSlicerApiKey", null);
|
|
349
|
+
_ts_decorate([
|
|
350
|
+
(0, _awilixexpress.DELETE)(),
|
|
351
|
+
(0, _awilixexpress.route)("/slicer-api-key"),
|
|
352
|
+
(0, _awilixexpress.before)([
|
|
353
|
+
(0, _authenticate.authorizeRoles)([
|
|
354
|
+
_authorizationconstants.ROLES.ADMIN
|
|
355
|
+
]),
|
|
356
|
+
_demomiddleware.demoUserNotAllowed
|
|
357
|
+
]),
|
|
358
|
+
_ts_metadata("design:type", Function),
|
|
359
|
+
_ts_metadata("design:paramtypes", [
|
|
360
|
+
typeof _express.Request === "undefined" ? Object : _express.Request,
|
|
361
|
+
typeof _express.Response === "undefined" ? Object : _express.Response
|
|
362
|
+
]),
|
|
363
|
+
_ts_metadata("design:returntype", Promise)
|
|
364
|
+
], SettingsController.prototype, "deleteSlicerApiKey", null);
|
|
297
365
|
SettingsController = _ts_decorate([
|
|
298
366
|
(0, _awilixexpress.route)(_serverconstants.AppConstants.apiRoute + "/settings"),
|
|
299
367
|
(0, _awilixexpress.before)([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/settings.controller.ts"],"names":["SettingsController","logger","loggerFactory","serverVersion","printerCache","printerService","settingsStore","printerThumbnailCache","name","getSettings","req","res","connection","clientIp","socket","remoteAddress","version","e","warn","settings","send","getSettingsSensitive","updateSentryDiagnosticsEnabled","enabled","validateInput","body","sentryDiagnosticsEnabledSchema","result","setSentryDiagnosticsEnabled","updateMoonrakerSupport","moonrakerSupportSchema","setExperimentalMoonrakerSupport","printers","listCachedPrinters","klipperPrinters","filter","p","printerType","MoonrakerType","printer","updateEnabled","id","updatePrusaLinkSupport","prusaLinkSupportSchema","setExperimentalPrusaLinkSupport","prusaLinkPrinters","PrusaLinkType","updateBambuSupport","bambuSupportSchema","setExperimentalBambuSupport","bambuPrinters","BambuType","updateFrontendSettings","validatedInput","frontendSettingsUpdateSchema","updateLoginRequiredSettings","loginRequired","loginRequiredSchema","setLoginRequired","updateRegistrationEnabledSettings","registrationEnabled","registrationEnabledSchema","setRegistrationEnabled","updateCredentialSettings","
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/settings.controller.ts"],"names":["SettingsController","logger","loggerFactory","serverVersion","printerCache","printerService","settingsStore","printerThumbnailCache","name","getSettings","req","res","connection","clientIp","socket","remoteAddress","version","e","warn","settings","send","getSettingsSensitive","updateSentryDiagnosticsEnabled","enabled","validateInput","body","sentryDiagnosticsEnabledSchema","result","setSentryDiagnosticsEnabled","updateMoonrakerSupport","moonrakerSupportSchema","setExperimentalMoonrakerSupport","printers","listCachedPrinters","klipperPrinters","filter","p","printerType","MoonrakerType","printer","updateEnabled","id","updatePrusaLinkSupport","prusaLinkSupportSchema","setExperimentalPrusaLinkSupport","prusaLinkPrinters","PrusaLinkType","updateBambuSupport","bambuSupportSchema","setExperimentalBambuSupport","bambuPrinters","BambuType","updateFrontendSettings","validatedInput","frontendSettingsUpdateSchema","updateLoginRequiredSettings","loginRequired","loginRequiredSchema","setLoginRequired","updateRegistrationEnabledSettings","registrationEnabled","registrationEnabledSchema","setRegistrationEnabled","updateCredentialSettings","credentialCoreSettingUpdateSchema","updateCoreCredentialSettings","updateTimeoutSettings","timeoutSettingsUpdateSchema","getSlicerApiKey","apiKey","slicerApiKey","regenerateSlicerApiKey","newApiKey","generateSlicerApiKey","log","deleteSlicerApiKey","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","AppConstants","apiRoute","authenticate"],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ const _fileanalysisservice = require("../services/file-analysis.service");
|
|
|
15
15
|
const _multerservice = require("../services/core/multer.service");
|
|
16
16
|
const _loggerfactory = require("../handlers/logger-factory");
|
|
17
17
|
const _serverconstants = require("../server.constants");
|
|
18
|
+
const _slicerapikeymiddleware = require("../middleware/slicer-api-key.middleware");
|
|
18
19
|
function _ts_decorate(decorators, target, key, desc) {
|
|
19
20
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
20
21
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -204,6 +205,9 @@ _ts_decorate([
|
|
|
204
205
|
], SlicerCompatController.prototype, "getServer", null);
|
|
205
206
|
SlicerCompatController = _ts_decorate([
|
|
206
207
|
(0, _awilixexpress.route)("/api"),
|
|
208
|
+
(0, _awilixexpress.before)([
|
|
209
|
+
(0, _slicerapikeymiddleware.slicerApiKeyAuth)()
|
|
210
|
+
]),
|
|
207
211
|
_ts_metadata("design:type", Function),
|
|
208
212
|
_ts_metadata("design:paramtypes", [
|
|
209
213
|
typeof _loggerfactory.ILoggerFactory === "undefined" ? Object : _loggerfactory.ILoggerFactory,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/slicer-compat.controller.ts"],"names":["SlicerCompatController","logger","loggerFactory","fileStorageService","fileAnalysisService","multerService","name","getVersion","req","res","send","api","server","text","uploadFile","files","acceptedExtensions","AppConstants","defaultAcceptedGcodeExtensions","defaultAcceptedBambuExtensions","multerLoadFileAsync","length","status","error","file","print","body","select","log","originalname","fileHash","calculateFileHash","path","fileStorageId","saveFile","filePath","getFilePath","metadata","thumbnails","analysisResult","analyzeFile","thumbnailMetadata","saveThumbnails","saveMetadata","analysisError","clearUploadedFile","e","local","origin","refs","resource","download","done","_fdmMonster","analyzed","Object","keys","thumbnailCount","printTime","gcodePrintTimeSeconds","filament","filamentUsedGrams","listFiles","listAllFiles","knownFiles","map","_originalFileName","fileName","type","typePath","fileFormat","gcodeAnalysis","estimatedPrintTime","tool0","filamentUsedMm","volume","filamentUsedCm3","undefined","date","Math","floor","createdAt","getTime","size","fileSize","free","total","getServer","version","safemode"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/slicer-compat.controller.ts"],"names":["SlicerCompatController","logger","loggerFactory","fileStorageService","fileAnalysisService","multerService","name","getVersion","req","res","send","api","server","text","uploadFile","files","acceptedExtensions","AppConstants","defaultAcceptedGcodeExtensions","defaultAcceptedBambuExtensions","multerLoadFileAsync","length","status","error","file","print","body","select","log","originalname","fileHash","calculateFileHash","path","fileStorageId","saveFile","filePath","getFilePath","metadata","thumbnails","analysisResult","analyzeFile","thumbnailMetadata","saveThumbnails","saveMetadata","analysisError","clearUploadedFile","e","local","origin","refs","resource","download","done","_fdmMonster","analyzed","Object","keys","thumbnailCount","printTime","gcodePrintTimeSeconds","filament","filamentUsedGrams","listFiles","listAllFiles","knownFiles","map","_originalFileName","fileName","type","typePath","fileFormat","gcodeAnalysis","estimatedPrintTime","tool0","filamentUsedMm","volume","filamentUsedCm3","undefined","date","Math","floor","createdAt","getTime","size","fileSize","free","total","getServer","version","safemode","slicerApiKeyAuth"],"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
|
});
|
package/dist/data-source.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/data-source.ts"],"names":["AppDataSource","process","env","NODE_ENV","dotenv","config","path","
|
|
1
|
+
{"version":3,"sources":["../src/data-source.ts"],"names":["AppDataSource","process","env","NODE_ENV","dotenv","config","path","ENV_FILE","join","quiet","DataSource","type","database","getDatabaseFilePath","synchronize","logging","entities","Floor","FloorPosition","Printer","Settings","User","CameraStream","Role","RefreshToken","UserRole","Tag","PrinterTag","PrintJob","PrinterMaintenanceLog","migrations","InitSqlite1706829146617","PrinterGroup1707494762198","ChangePrintCompletionDeletePrinterCascade1708465930665","ChangeRoleNameUnique1713300747465","RemovePrinterFile1720338804844","AddPrinterType1713897879622","AddPrinterUsernamePassword1745141688926","DropPermissions1766576698569","ChangeCameraPrinterOnDeleteSetNull1767278216516","DropCustomGcode1767279607392","DropPrintCompletions1767291804417","DropSettingsFileClean1767352862576","ChangeFloorNonUniqueOrder1767370191762","RenameGroupToTag1767432108916","AddPrintJob1767451444137","AddPrinterMaintenanceLog1767909428129","subscribers"],"mappings":";;;;+BA2CaA;;;eAAAA;;;QA3CN;yBACoB;+DACR;0BACE;yBACe;6BACd;qCACQ;+BACN;gCACC;0BAC2C;oCACvC;4BACR;gCACI;yCACe;kCACb;2BACP;2CACsB;wEAGnC;mDAC2C;gDACH;6CACH;yDACY;8CACX;iEAGtC;8CACsC;mDACK;oDACC;wDACI;+CACT;0CACL;uDACa;;;;;;AAEtD,IAAIC,QAAQC,GAAG,CAACC,QAAQ,KAAK,QAAQ;IACnCC,eAAM,CAACC,MAAM,CAAC;QACZC,MAAML,QAAQC,GAAG,CAACK,QAAQ,IAAIC,IAAAA,cAAI,EAAC;QACnCC,OAAO;IACT;AACF;AAEO,MAAMT,gBAAgB,IAAIU,mBAAU,CAAC;IAC1CC,MAAM;IACNC,UAAUC,IAAAA,4BAAmB;IAC7BC,aAAa;IACbC,SAAS;IACTC,UAAU;QACRC,kBAAK;QACLC,kCAAa;QACbC,sBAAO;QACPC,wBAAQ;QACRC,cAAI;QACJC,gCAAY;QACZC,gBAAI;QACJC,sBAAY;QACZC,wBAAQ;QACRC,cAAG;QACHC,4BAAU;QACVC,kBAAQ;QACRC,+BAAqB;KACtB;IACDC,YAAY;QACVC,gDAAuB;QACvBC,oDAAyB;QACzBC,8GAAsD;QACtDC,oEAAiC;QACjCC,8DAA8B;QAC9BC,wDAA2B;QAC3BC,gFAAuC;QACvCC,0DAA4B;QAC5BC,gGAA+C;QAC/CC,0DAA4B;QAC5BC,oEAAiC;QACjCC,sEAAkC;QAClCC,8EAAsC;QACtCC,4DAA6B;QAC7BC,kDAAwB;QACxBC,4EAAqC;KACtC;IACDC,aAAa,EAAE;AACjB"}
|
package/dist/entities/index.js
CHANGED
|
@@ -24,6 +24,9 @@ _export(exports, {
|
|
|
24
24
|
get Printer () {
|
|
25
25
|
return _printerentity.Printer;
|
|
26
26
|
},
|
|
27
|
+
get PrinterMaintenanceLog () {
|
|
28
|
+
return _printermaintenancelogentity.PrinterMaintenanceLog;
|
|
29
|
+
},
|
|
27
30
|
get PrinterTag () {
|
|
28
31
|
return _printertagentity.PrinterTag;
|
|
29
32
|
},
|
|
@@ -58,5 +61,6 @@ const _refreshtokenentity = require("./refresh-token.entity");
|
|
|
58
61
|
const _printertagentity = require("./printer-tag.entity");
|
|
59
62
|
const _tagentity = require("./tag.entity");
|
|
60
63
|
const _printjobentity = require("./print-job.entity");
|
|
64
|
+
const _printermaintenancelogentity = require("./printer-maintenance-log.entity");
|
|
61
65
|
|
|
62
66
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/entities/index.ts"],"names":["CameraStream","Floor","FloorPosition","PrintJob","Printer","PrinterTag","RefreshToken","Role","Settings","Tag","User","UserRole"],"mappings":";;;;;;;;;;;QACSA;eAAAA,gCAAY;;QACZC;eAAAA,kBAAK;;QACLC;eAAAA,kCAAa;;QAQbC;eAAAA,wBAAQ;;QAPRC;eAAAA,sBAAO;;
|
|
1
|
+
{"version":3,"sources":["../../src/entities/index.ts"],"names":["CameraStream","Floor","FloorPosition","PrintJob","Printer","PrinterMaintenanceLog","PrinterTag","RefreshToken","Role","Settings","Tag","User","UserRole"],"mappings":";;;;;;;;;;;QACSA;eAAAA,gCAAY;;QACZC;eAAAA,kBAAK;;QACLC;eAAAA,kCAAa;;QAQbC;eAAAA,wBAAQ;;QAPRC;eAAAA,sBAAO;;QAQPC;eAAAA,kDAAqB;;QAHrBC;eAAAA,4BAAU;;QADVC;eAAAA,gCAAY;;QAHZC;eAAAA,gBAAI;;QAEJC;eAAAA,wBAAQ;;QAGRC;eAAAA,cAAG;;QAVHC;eAAAA,gBAAI;;QAMJC;eAAAA,wBAAQ;;;4BANI;oCACQ;6BACP;qCACQ;+BACN;4BACH;gCACI;gCACA;oCACI;kCACF;2BACP;gCACK;6CACa"}
|
|
@@ -49,9 +49,13 @@ _ts_decorate([
|
|
|
49
49
|
], PrintJob.prototype, "id", void 0);
|
|
50
50
|
_ts_decorate([
|
|
51
51
|
(0, _typeorm.ManyToOne)(()=>_printerentity.Printer, {
|
|
52
|
+
nullable: true,
|
|
52
53
|
onDelete: "SET NULL"
|
|
53
54
|
}),
|
|
54
|
-
|
|
55
|
+
(0, _typeorm.JoinColumn)({
|
|
56
|
+
name: "printerId"
|
|
57
|
+
}),
|
|
58
|
+
_ts_metadata("design:type", typeof _typeorm.Relation === "undefined" ? Object : _typeorm.Relation)
|
|
55
59
|
], PrintJob.prototype, "printer", void 0);
|
|
56
60
|
_ts_decorate([
|
|
57
61
|
(0, _typeorm.Column)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/entities/print-job.entity.ts"],"names":["PrintJob","id","printer","printerId","printerName","fileName","fileStorageId","fileFormat","fileSize","fileHash","createdAt","updatedAt","analyzedAt","startedAt","endedAt","status","analysisState","statusReason","progress","metadata","statistics","queuePosition","queueGroup","Printer","onDelete","
|
|
1
|
+
{"version":3,"sources":["../../src/entities/print-job.entity.ts"],"names":["PrintJob","id","printer","printerId","printerName","fileName","fileStorageId","fileFormat","fileSize","fileHash","createdAt","updatedAt","analyzedAt","startedAt","endedAt","status","analysisState","statusReason","progress","metadata","statistics","queuePosition","queueGroup","Printer","nullable","onDelete","name","type","Date","default"],"mappings":";;;;+BAiKaA;;;eAAAA;;;yBAxJN;+BACiB;;;;;;;;;;AAuJjB,MAAMA;IAEXC,GAAW;IAIXC,QAA4B;IAE5BC,UAAyB;IAGzBC,YAA2B;IAI3BC,SAAiB;IAGjBC,cAA6B;IAG7BC,WAAkC;IAGlCC,SAAwB;IAGxBC,SAAwB;IAIxBC,UAAgB;IAGhBC,UAAgB;IAGhBC,WAAwB;IAGxBC,UAAuB;IAGvBC,QAAqB;IAIrBC,OAAuB;IAGvBC,cAA6B;IAG7BC,aAA4B;IAI5BC,SAAwB;IAIxBC,SAAkC;IAIlCC,WAAmC;IAInCC,cAA6B;IAG7BC,WAA0B;AAC5B;;;;;;gCArEmBC,sBAAO;QAAIC,UAAU;QAAMC,UAAU;;;QACxCC,MAAM;;;;;;QAEVF,UAAU;;;;;;QAGVG,MAAM;QAAWH,UAAU;;;;;;QAI3BG,MAAM;QAAWH,UAAU;;;;;;QAG3BG,MAAM;QAAWH,UAAU;;;;;;QAG3BG,MAAM;QAAWH,UAAU;;;;;;QAG3BG,MAAM;QAAOH,UAAU;;;;;;QAGvBG,MAAM;QAAWH,UAAU;;;;;;;;;;;;;;QAU3BG,MAAMC;QAAMJ,UAAU;;;;;;QAGtBG,MAAMC;QAAMJ,UAAU;;;;;;QAGtBG,MAAMC;QAAMJ,UAAU;;;;;;QAItBG,MAAM;QAAWH,UAAU;QAAOK,SAAS;;;;;;QAG3CF,MAAM;QAAWH,UAAU;QAAOK,SAAS;;;;;;QAG3CF,MAAM;QAAWH,UAAU;;;;;;QAI3BG,MAAM;QAASH,UAAU;;;;;;QAIzBG,MAAM;QAAQH,UAAU;;;;;;QAIxBG,MAAM;QAAQH,UAAU;;;;;;QAIxBG,MAAM;QAAOH,UAAU;;;;;;QAGvBG,MAAM;QAAWH,UAAU"}
|
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "PrinterMaintenanceLog", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return PrinterMaintenanceLog;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _typeorm = require("typeorm");
|
|
12
|
+
const _printerentity = require("./printer.entity");
|
|
13
|
+
const _userentity = require("./user.entity");
|
|
14
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
15
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
16
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
17
|
+
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;
|
|
18
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
19
|
+
}
|
|
20
|
+
function _ts_metadata(k, v) {
|
|
21
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
22
|
+
}
|
|
23
|
+
class PrinterMaintenanceLog {
|
|
24
|
+
id;
|
|
25
|
+
createdAt;
|
|
26
|
+
createdBy;
|
|
27
|
+
createdByUser;
|
|
28
|
+
createdByUserId;
|
|
29
|
+
printer;
|
|
30
|
+
printerId;
|
|
31
|
+
printerName;
|
|
32
|
+
printerUrl;
|
|
33
|
+
metadata;
|
|
34
|
+
completed;
|
|
35
|
+
completedAt;
|
|
36
|
+
completedByUser;
|
|
37
|
+
completedByUserId;
|
|
38
|
+
completedBy;
|
|
39
|
+
}
|
|
40
|
+
_ts_decorate([
|
|
41
|
+
(0, _typeorm.PrimaryGeneratedColumn)(),
|
|
42
|
+
_ts_metadata("design:type", Number)
|
|
43
|
+
], PrinterMaintenanceLog.prototype, "id", void 0);
|
|
44
|
+
_ts_decorate([
|
|
45
|
+
(0, _typeorm.CreateDateColumn)(),
|
|
46
|
+
_ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
|
|
47
|
+
], PrinterMaintenanceLog.prototype, "createdAt", void 0);
|
|
48
|
+
_ts_decorate([
|
|
49
|
+
(0, _typeorm.Column)({
|
|
50
|
+
nullable: false
|
|
51
|
+
}),
|
|
52
|
+
_ts_metadata("design:type", String)
|
|
53
|
+
], PrinterMaintenanceLog.prototype, "createdBy", void 0);
|
|
54
|
+
_ts_decorate([
|
|
55
|
+
(0, _typeorm.ManyToOne)(()=>_userentity.User, {
|
|
56
|
+
onDelete: "SET NULL",
|
|
57
|
+
nullable: true
|
|
58
|
+
}),
|
|
59
|
+
_ts_metadata("design:type", Object)
|
|
60
|
+
], PrinterMaintenanceLog.prototype, "createdByUser", void 0);
|
|
61
|
+
_ts_decorate([
|
|
62
|
+
(0, _typeorm.Column)({
|
|
63
|
+
nullable: true
|
|
64
|
+
}),
|
|
65
|
+
_ts_metadata("design:type", Object)
|
|
66
|
+
], PrinterMaintenanceLog.prototype, "createdByUserId", void 0);
|
|
67
|
+
_ts_decorate([
|
|
68
|
+
(0, _typeorm.ManyToOne)(()=>_printerentity.Printer, {
|
|
69
|
+
onDelete: "SET NULL",
|
|
70
|
+
nullable: true
|
|
71
|
+
}),
|
|
72
|
+
_ts_metadata("design:type", Object)
|
|
73
|
+
], PrinterMaintenanceLog.prototype, "printer", void 0);
|
|
74
|
+
_ts_decorate([
|
|
75
|
+
(0, _typeorm.Column)({
|
|
76
|
+
nullable: true
|
|
77
|
+
}),
|
|
78
|
+
_ts_metadata("design:type", Object)
|
|
79
|
+
], PrinterMaintenanceLog.prototype, "printerId", void 0);
|
|
80
|
+
_ts_decorate([
|
|
81
|
+
(0, _typeorm.Column)({
|
|
82
|
+
nullable: false
|
|
83
|
+
}),
|
|
84
|
+
_ts_metadata("design:type", String)
|
|
85
|
+
], PrinterMaintenanceLog.prototype, "printerName", void 0);
|
|
86
|
+
_ts_decorate([
|
|
87
|
+
(0, _typeorm.Column)({
|
|
88
|
+
nullable: false
|
|
89
|
+
}),
|
|
90
|
+
_ts_metadata("design:type", String)
|
|
91
|
+
], PrinterMaintenanceLog.prototype, "printerUrl", void 0);
|
|
92
|
+
_ts_decorate([
|
|
93
|
+
(0, _typeorm.Column)({
|
|
94
|
+
nullable: false,
|
|
95
|
+
type: "json",
|
|
96
|
+
default: "{}"
|
|
97
|
+
}),
|
|
98
|
+
_ts_metadata("design:type", Object)
|
|
99
|
+
], PrinterMaintenanceLog.prototype, "metadata", void 0);
|
|
100
|
+
_ts_decorate([
|
|
101
|
+
(0, _typeorm.Column)({
|
|
102
|
+
nullable: false,
|
|
103
|
+
default: false
|
|
104
|
+
}),
|
|
105
|
+
_ts_metadata("design:type", Boolean)
|
|
106
|
+
], PrinterMaintenanceLog.prototype, "completed", void 0);
|
|
107
|
+
_ts_decorate([
|
|
108
|
+
(0, _typeorm.Column)({
|
|
109
|
+
nullable: true
|
|
110
|
+
}),
|
|
111
|
+
_ts_metadata("design:type", typeof Date === "undefined" ? Object : Date)
|
|
112
|
+
], PrinterMaintenanceLog.prototype, "completedAt", void 0);
|
|
113
|
+
_ts_decorate([
|
|
114
|
+
(0, _typeorm.ManyToOne)(()=>_userentity.User, {
|
|
115
|
+
onDelete: "SET NULL",
|
|
116
|
+
nullable: true
|
|
117
|
+
}),
|
|
118
|
+
_ts_metadata("design:type", Object)
|
|
119
|
+
], PrinterMaintenanceLog.prototype, "completedByUser", void 0);
|
|
120
|
+
_ts_decorate([
|
|
121
|
+
(0, _typeorm.Column)({
|
|
122
|
+
nullable: true
|
|
123
|
+
}),
|
|
124
|
+
_ts_metadata("design:type", Object)
|
|
125
|
+
], PrinterMaintenanceLog.prototype, "completedByUserId", void 0);
|
|
126
|
+
_ts_decorate([
|
|
127
|
+
(0, _typeorm.Column)({
|
|
128
|
+
nullable: true
|
|
129
|
+
}),
|
|
130
|
+
_ts_metadata("design:type", String)
|
|
131
|
+
], PrinterMaintenanceLog.prototype, "completedBy", void 0);
|
|
132
|
+
PrinterMaintenanceLog = _ts_decorate([
|
|
133
|
+
(0, _typeorm.Entity)(),
|
|
134
|
+
(0, _typeorm.Index)([
|
|
135
|
+
"printerId"
|
|
136
|
+
], {
|
|
137
|
+
unique: true,
|
|
138
|
+
where: "completed = 0"
|
|
139
|
+
})
|
|
140
|
+
], PrinterMaintenanceLog);
|
|
141
|
+
|
|
142
|
+
//# sourceMappingURL=printer-maintenance-log.entity.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/entities/printer-maintenance-log.entity.ts"],"names":["PrinterMaintenanceLog","id","createdAt","createdBy","createdByUser","createdByUserId","printer","printerId","printerName","printerUrl","metadata","completed","completedAt","completedByUser","completedByUserId","completedBy","nullable","User","onDelete","Printer","type","default","unique","where"],"mappings":";;;;+BAaaA;;;eAAAA;;;yBANN;+BACiB;4BACH;;;;;;;;;;AAId,MAAMA;IAEXC,GAAW;IAGXC,UAAgB;IAEhBC,UAAkB;IAElBC,cAA2B;IAE3BC,gBAA+B;IAG/BC,QAAwB;IAExBC,UAAyB;IAEzBC,YAAoB;IAEpBC,WAAmB;IAGnBC,SAKE;IAGFC,UAAmB;IAEnBC,YAAmB;IAEnBC,gBAA6B;IAE7BC,kBAAiC;IAEjCC,YAAqB;AACvB;;;;;;;;;;;QAlCYC,UAAU;;;;;gCAEHC,gBAAI;QAAIC,UAAU;QAAYF,UAAU;;;;;;QAE/CA,UAAU;;;;;gCAGHG,sBAAO;QAAID,UAAU;QAAYF,UAAU;;;;;;QAElDA,UAAU;;;;;;QAEVA,UAAU;;;;;;QAEVA,UAAU;;;;;;QAGVA,UAAU;QAAOI,MAAM;QAAQC,SAAS;;;;;;QAQxCL,UAAU;QAAOK,SAAS;;;;;;QAE1BL,UAAU;;;;;gCAEHC,gBAAI;QAAIC,UAAU;QAAYF,UAAU;;;;;;QAE/CA,UAAU;;;;;;QAEVA,UAAU;;;;;;;QAvCd;;QAAgBM,QAAQ;QAAMC,OAAO"}
|
|
@@ -89,9 +89,10 @@ _ts_decorate([
|
|
|
89
89
|
], Printer.prototype, "enabled", void 0);
|
|
90
90
|
_ts_decorate([
|
|
91
91
|
(0, _typeorm.Column)({
|
|
92
|
+
type: "varchar",
|
|
92
93
|
nullable: true
|
|
93
94
|
}),
|
|
94
|
-
_ts_metadata("design:type",
|
|
95
|
+
_ts_metadata("design:type", Object)
|
|
95
96
|
], Printer.prototype, "disabledReason", void 0);
|
|
96
97
|
_ts_decorate([
|
|
97
98
|
(0, _typeorm.Column)({
|