@fdm-monster/server 1.8.1 → 1.8.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.yarn/install-state.gz +0 -0
- package/.yarn/releases/{yarn-4.5.3.cjs → yarn-4.7.0.cjs} +256 -255
- package/.yarnrc.yml +1 -1
- package/README.md +14 -4
- package/RELEASE_NOTES.MD +35 -4
- package/dist/consoles/http-file-receiver.console.js +81 -0
- package/dist/consoles/http-file-receiver.console.js.map +1 -0
- package/dist/constants/event.constants.js +8 -0
- package/dist/constants/event.constants.js.map +1 -1
- package/dist/container.js +2 -14
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +1 -3
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/plugin-firmware-update.controller.js +4 -6
- package/dist/controllers/plugin-firmware-update.controller.js.map +1 -1
- package/dist/controllers/printer-files.controller.js +19 -22
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer-settings.controller.js +3 -3
- package/dist/controllers/printer-settings.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +14 -8
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +2 -16
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +0 -2
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/handlers/validators.js +9 -6
- package/dist/handlers/validators.js.map +1 -1
- package/dist/server.constants.js +1 -2
- package/dist/server.constants.js.map +1 -1
- package/dist/server.env.js +3 -25
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +3 -1
- package/dist/server.host.js.map +1 -1
- package/dist/services/core/http-client.factory.js +40 -0
- package/dist/services/core/http-client.factory.js.map +1 -0
- package/dist/services/core/logs-manager.service.js +4 -3
- package/dist/services/core/logs-manager.service.js.map +1 -1
- package/dist/services/core/multer.service.js +72 -22
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/interfaces/file-upload-tracker.interface.js +6 -0
- package/dist/services/interfaces/file-upload-tracker.interface.js.map +1 -0
- package/dist/services/interfaces/printer.dto.js +6 -0
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/mongoose/printer.service.js +10 -3
- package/dist/services/mongoose/printer.service.js.map +1 -1
- package/dist/services/moonraker/moonraker-websocket.adapter.js +6 -2
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js +196 -156
- package/dist/services/moonraker/moonraker.client.js.map +1 -1
- package/dist/services/octoprint/dto/plugin.dto.js +6 -0
- package/dist/services/octoprint/dto/plugin.dto.js.map +1 -0
- package/dist/services/octoprint/octoprint-api.routes.js +0 -61
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-websocket.adapter.js +11 -5
- package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js +118 -201
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/octoprint/plugin-base.service.js +15 -15
- package/dist/services/octoprint/plugin-base.service.js.map +1 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js +1 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js.map +1 -1
- package/dist/services/octoprint/plugin-repository.cache.js +2 -1
- package/dist/services/octoprint/plugin-repository.cache.js.map +1 -1
- package/dist/services/octoprint/utils/octoprint-http-client.builder.js +31 -0
- package/dist/services/octoprint/utils/octoprint-http-client.builder.js.map +1 -0
- package/dist/services/octoprint.api.js +6 -4
- package/dist/services/octoprint.api.js.map +1 -1
- package/dist/services/orm/printer.service.js +8 -3
- package/dist/services/orm/printer.service.js.map +1 -1
- package/dist/shared/default-http-client.builder.js +94 -0
- package/dist/shared/default-http-client.builder.js.map +1 -0
- package/dist/shared/websocket.adapter.js.map +1 -1
- package/dist/state/file-upload-tracker.cache.js +30 -40
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/settings.store.js +4 -1
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/state/validation/create-test-printer.validation.js +1 -0
- package/dist/state/validation/create-test-printer.validation.js.map +1 -1
- package/dist/tasks/boot.task.js +1 -2
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/printer-websocket-restore.task.js +1 -1
- package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
- package/dist/tasks/socketio.task.js +2 -2
- package/dist/tasks/socketio.task.js.map +1 -1
- package/dist/tasks.js.map +1 -1
- package/dist/utils/env.utils.js +0 -42
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/normalize-url.js +3 -1
- package/dist/utils/normalize-url.js.map +1 -1
- package/dist/utils/pretty-print.utils.js +1 -1
- package/dist/utils/pretty-print.utils.js.map +1 -1
- package/dist/utils/url.utils.js +12 -14
- package/dist/utils/url.utils.js.map +1 -1
- package/package.json +40 -55
- package/dist/services/core/server-update.service.js +0 -71
- package/dist/services/core/server-update.service.js.map +0 -1
- package/requests/moonraker/api_job.http +0 -5
- package/requests/moonraker/api_printer.http +0 -5
- package/requests/moonraker/api_settings.http +0 -5
- package/requests/moonraker/printer_info.http +0 -5
- package/requests/moonraker/printer_objects_list.http +0 -6
- package/requests/moonraker/printer_objects_pause_resume.http +0 -6
- package/requests/moonraker/printer_objects_print_stats.http +0 -6
- package/requests/moonraker/printer_objects_webhooks.http +0 -6
- package/requests/moonraker/server_info.http +0 -5
- package/requests/octoprint/octoprint-api-printer-current.http +0 -7
- package/requests/octoprint/octoprint-pluginmanager-plugins.http +0 -7
- package/requests/printer-file/get-partial-file-moonraker.http +0 -5
- package/requests/printer-file/get-thumbnails.http +0 -5
- package/requests/printer-file/reload-printer-thumbnails.http +0 -10
- package/requests/printer-file/testfile.gcode +0 -5665
- package/requests/printer-file/upload-file.http +0 -11
- package/requests/printer-file/upload-slicer-file.http +0 -11
- package/requests/printers/list.http +0 -5
|
@@ -9,7 +9,6 @@ Object.defineProperty(exports, "PrinterController", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
const _awilixexpress = require("awilix-express");
|
|
12
|
-
const _urlutils = require("../utils/url.utils");
|
|
13
12
|
const _authenticate = require("../middleware/authenticate");
|
|
14
13
|
const _validators = require("../handlers/validators");
|
|
15
14
|
const _printercontrollervalidation = require("./validation/printer-controller.validation");
|
|
@@ -21,6 +20,8 @@ const _express = require("express");
|
|
|
21
20
|
const _axios = require("axios");
|
|
22
21
|
const _faileddependencyexception = require("../exceptions/failed-dependency.exception");
|
|
23
22
|
const _runtimeexceptions = require("../exceptions/runtime.exceptions");
|
|
23
|
+
const _normalizeurl = require("../utils/normalize-url");
|
|
24
|
+
const _urlutils = require("../utils/url.utils");
|
|
24
25
|
function _ts_decorate(decorators, target, key, desc) {
|
|
25
26
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
26
27
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -137,7 +138,9 @@ class PrinterController {
|
|
|
137
138
|
}
|
|
138
139
|
async testConnection(req, res) {
|
|
139
140
|
if (req.body.printerURL?.length) {
|
|
140
|
-
req.body.printerURL = (0,
|
|
141
|
+
req.body.printerURL = (0, _normalizeurl.normalizeUrl)(req.body.printerURL, {
|
|
142
|
+
defaultProtocol: _urlutils.defaultHttpProtocol
|
|
143
|
+
});
|
|
141
144
|
}
|
|
142
145
|
const newPrinter = await (0, _validators.validateMiddleware)(req, _printercontrollervalidation.testPrinterApiRules);
|
|
143
146
|
newPrinter.correlationToken = (0, _correlationtokenutil.generateCorrelationToken)();
|
|
@@ -246,24 +249,24 @@ class PrinterController {
|
|
|
246
249
|
}
|
|
247
250
|
async getPrinterPluginList(req, res) {
|
|
248
251
|
const { printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
249
|
-
const
|
|
250
|
-
res.send(
|
|
252
|
+
const pluginListResponse = await this.octoprintClient.getPluginManagerPlugins(printerLogin);
|
|
253
|
+
res.send(pluginListResponse.data);
|
|
251
254
|
}
|
|
252
255
|
async getOctoPrintBackupOverview(req, res) {
|
|
253
256
|
const { printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
254
257
|
const backupOverview = await this.octoprintClient.getBackupOverview(printerLogin);
|
|
255
|
-
res.send(backupOverview);
|
|
258
|
+
res.send(backupOverview.data);
|
|
256
259
|
}
|
|
257
260
|
async listOctoPrintBackups(req, res) {
|
|
258
261
|
const { printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
259
262
|
const backupOverview = await this.octoprintClient.getBackups(printerLogin);
|
|
260
|
-
res.send(backupOverview);
|
|
263
|
+
res.send(backupOverview.data);
|
|
261
264
|
}
|
|
262
265
|
async createOctoPrintBackup(req, res) {
|
|
263
266
|
const { printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
264
267
|
const { exclude } = await (0, _validators.validateMiddleware)(req, _printercontrollervalidation.createOctoPrintBackupRules);
|
|
265
268
|
const response = await this.octoprintClient.createBackup(printerLogin, exclude);
|
|
266
|
-
res.send(response);
|
|
269
|
+
res.send(response.data);
|
|
267
270
|
}
|
|
268
271
|
async downloadOctoPrintBackup(req, res) {
|
|
269
272
|
const { printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
@@ -274,6 +277,9 @@ class PrinterController {
|
|
|
274
277
|
async restoreOctoPrintBackup(req, res) {
|
|
275
278
|
const { printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
276
279
|
const files = await this.multerService.multerLoadFileAsync(req, res, null, false);
|
|
280
|
+
if (!files?.length) {
|
|
281
|
+
throw new _runtimeexceptions.BadRequestException("No files uploaded.");
|
|
282
|
+
}
|
|
277
283
|
const response = await this.octoprintClient.forwardRestoreBackupFileStream(printerLogin, files[0].buffer);
|
|
278
284
|
res.send(response.data);
|
|
279
285
|
}
|
|
@@ -281,7 +287,7 @@ class PrinterController {
|
|
|
281
287
|
const { printerLogin } = (0, _validators.getScopedPrinter)(req);
|
|
282
288
|
const { fileName } = await (0, _validators.validateMiddleware)(req, _printercontrollervalidation.getOctoPrintBackupRules);
|
|
283
289
|
const response = await this.octoprintClient.deleteBackup(printerLogin, fileName);
|
|
284
|
-
res.send(response);
|
|
290
|
+
res.send(response.data);
|
|
285
291
|
}
|
|
286
292
|
}
|
|
287
293
|
_ts_decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/printer.controller.ts"],"names":["PrinterController","printerApiFactory","printerSocketStore","testPrinterSocketStore","printerService","printerCache","printerEventsCache","taskManagerService","printerApi","octoprintClient","moonrakerClient","pluginRepositoryCache","floorStore","multerService","logger","constructor","loggerFactory","name","list","req","res","send","listCachedPrinters","create","newPrinter","body","query","forceSave","testPrintApiConnection","createdPrinter","getCachedPrinterOrThrowAsync","id","createBatch","importResult","batchImport","getPluginList","pluginList","getCache","getPrinter","currentPrinterId","getScopedPrinter","getPrinterSocketInfo","getPrinterSocketEvents","update","updatedPrinter","delete","result","removePrinterFromAnyFloor","updateEnabled","data","validateMiddleware","updatePrinterEnabledRule","enabled","updatePrinterDisabledReason","updatePrinterDisabledReasonRules","updateDisabledReason","disabledReason","updateConnectionSettings","inputData","updatePrinterConnectionSettingRules","newEntity","printerURL","apiKey","printerType","refreshPrinterSocket","reconnectOctoPrint","deletePrinterSocketEvents","testConnection","length","normalizeURLWithProtocol","testPrinterApiRules","correlationToken","generateCorrelationToken","log","setupTestPrinter","e","failure","error","toString","getPrinterLoginDetails","printerLogin","sendSerialConnectCommand","connect","sendSerialDisconnectCommand","disconnect","movePrintHead","homeAxes","pausePrint","resumePrint","cancelPrint","restartServer","inputLoginDto","validateInput","getVersion","AxiosError","debug","message","status","response","FailedDependencyException","code","InternalServerException","stack","setFeedRate","feedRateRules","updateFeedRate","feedRate","setFlowRate","flowRateRules","updateFlowRate","flowRate","getPrinterPluginList","getPluginManagerPlugins","getOctoPrintBackupOverview","backupOverview","getBackupOverview","listOctoPrintBackups","getBackups","createOctoPrintBackup","exclude","createOctoPrintBackupRules","createBackup","downloadOctoPrintBackup","fileName","getOctoPrintBackupRules","dataStream","getDownloadBackupStream","pipe","restoreOctoPrintBackup","files","multerLoadFileAsync","forwardRestoreBackupFileStream","buffer","deleteOctoPrintBackup","deleteBackup","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/printer.controller.ts"],"names":["PrinterController","printerApiFactory","printerSocketStore","testPrinterSocketStore","printerService","printerCache","printerEventsCache","taskManagerService","printerApi","octoprintClient","moonrakerClient","pluginRepositoryCache","floorStore","multerService","logger","constructor","loggerFactory","name","list","req","res","send","listCachedPrinters","create","newPrinter","body","query","forceSave","testPrintApiConnection","createdPrinter","getCachedPrinterOrThrowAsync","id","createBatch","importResult","batchImport","getPluginList","pluginList","getCache","getPrinter","currentPrinterId","getScopedPrinter","getPrinterSocketInfo","getPrinterSocketEvents","update","updatedPrinter","delete","result","removePrinterFromAnyFloor","updateEnabled","data","validateMiddleware","updatePrinterEnabledRule","enabled","updatePrinterDisabledReason","updatePrinterDisabledReasonRules","updateDisabledReason","disabledReason","updateConnectionSettings","inputData","updatePrinterConnectionSettingRules","newEntity","printerURL","apiKey","printerType","refreshPrinterSocket","reconnectOctoPrint","deletePrinterSocketEvents","testConnection","length","normalizeUrl","defaultProtocol","defaultHttpProtocol","testPrinterApiRules","correlationToken","generateCorrelationToken","log","setupTestPrinter","e","failure","error","toString","getPrinterLoginDetails","printerLogin","sendSerialConnectCommand","connect","sendSerialDisconnectCommand","disconnect","movePrintHead","homeAxes","pausePrint","resumePrint","cancelPrint","restartServer","inputLoginDto","validateInput","getVersion","AxiosError","debug","message","status","response","FailedDependencyException","code","InternalServerException","stack","setFeedRate","feedRateRules","updateFeedRate","feedRate","setFlowRate","flowRateRules","updateFlowRate","flowRate","getPrinterPluginList","pluginListResponse","getPluginManagerPlugins","getOctoPrintBackupOverview","backupOverview","getBackupOverview","listOctoPrintBackups","getBackups","createOctoPrintBackup","exclude","createOctoPrintBackupRules","createBackup","downloadOctoPrintBackup","fileName","getOctoPrintBackupRules","dataStream","getDownloadBackupStream","pipe","restoreOctoPrintBackup","files","multerLoadFileAsync","BadRequestException","forwardRestoreBackupFileStream","buffer","deleteOctoPrintBackup","deleteBackup","AppConstants","apiRoute","authenticate","authorizeRoles","ROLES","OPERATOR","ADMIN","printerResolveMiddleware"],"mappings":"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"}
|
|
@@ -22,7 +22,6 @@ const _authenticate = require("../middleware/authenticate");
|
|
|
22
22
|
const _logger = require("../handlers/logger");
|
|
23
23
|
const _serverconstants = require("../server.constants");
|
|
24
24
|
const _authorizationconstants = require("../constants/authorization.constants");
|
|
25
|
-
const _envutils = require("../utils/env.utils");
|
|
26
25
|
const _validators = require("../handlers/validators");
|
|
27
26
|
const _demomiddleware = require("../middleware/demo.middleware");
|
|
28
27
|
class ServerPrivateController {
|
|
@@ -35,11 +34,9 @@ class ServerPrivateController {
|
|
|
35
34
|
multerService;
|
|
36
35
|
logDumpService;
|
|
37
36
|
logger = new _logger.LoggerService(ServerPrivateController.name);
|
|
38
|
-
serverUpdateService;
|
|
39
37
|
serverReleaseService;
|
|
40
|
-
constructor({
|
|
38
|
+
constructor({ serverReleaseService, printerCache, printerService, clientBundleService, githubService, logDumpService, printerSocketStore, yamlService, multerService }){
|
|
41
39
|
this.serverReleaseService = serverReleaseService;
|
|
42
|
-
this.serverUpdateService = serverUpdateService;
|
|
43
40
|
this.clientBundleService = clientBundleService;
|
|
44
41
|
this.githubService = githubService;
|
|
45
42
|
this.logDumpService = logDumpService;
|
|
@@ -92,17 +89,6 @@ class ServerPrivateController {
|
|
|
92
89
|
const updateState = this.serverReleaseService.getState();
|
|
93
90
|
res.send(updateState);
|
|
94
91
|
}
|
|
95
|
-
async pullGitUpdates(req, res) {
|
|
96
|
-
const result = await this.serverUpdateService.checkGitUpdates();
|
|
97
|
-
res.send(result);
|
|
98
|
-
}
|
|
99
|
-
async restartServer(req, res) {
|
|
100
|
-
if (!(0, _envutils.isTestEnvironment)()) {
|
|
101
|
-
this.logger.warn("Server restart command fired. Expect the server to be unavailable for a moment");
|
|
102
|
-
}
|
|
103
|
-
const result = await this.serverUpdateService.restartServer();
|
|
104
|
-
res.send(result);
|
|
105
|
-
}
|
|
106
92
|
async importPrintersAndFloorsYaml(req, res) {
|
|
107
93
|
const files = await this.multerService.multerLoadFileAsync(req, res, [
|
|
108
94
|
".yaml"
|
|
@@ -145,6 +131,6 @@ const _default = (0, _awilixexpress.createController)(ServerPrivateController).p
|
|
|
145
131
|
_authorizationconstants.ROLES.ADMIN
|
|
146
132
|
]),
|
|
147
133
|
_demomiddleware.demoUserNotAllowed
|
|
148
|
-
]).get("/", "getReleaseStateInfo").get("/client-releases", "getClientReleases").get("/github-rate-limit", "getGithubRateLimit").post("/update-client-bundle-github", "updateClientBundleGithub").post("/export-printers-floors-yaml", "exportPrintersAndFloorsYaml").post("/import-printers-floors-yaml", "importPrintersAndFloorsYaml").
|
|
134
|
+
]).get("/", "getReleaseStateInfo").get("/client-releases", "getClientReleases").get("/github-rate-limit", "getGithubRateLimit").post("/update-client-bundle-github", "updateClientBundleGithub").post("/export-printers-floors-yaml", "exportPrintersAndFloorsYaml").post("/import-printers-floors-yaml", "importPrintersAndFloorsYaml").get("/dump-fdm-monster-logs", "dumpLogZips").post("/dump-fdm-monster-logs", "dumpLogZips").delete("/clear-outdated-fdm-monster-logs", "clearLogs").delete("/delete-all-printers", "deleteAllPrinters");
|
|
149
135
|
|
|
150
136
|
//# sourceMappingURL=server-private.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/controllers/server-private.controller.ts"],"names":["ServerPrivateController","clientBundleService","printerCache","printerService","printerSocketStore","githubService","yamlService","multerService","logDumpService","logger","Logger","name","
|
|
1
|
+
{"version":3,"sources":["../../src/controllers/server-private.controller.ts"],"names":["ServerPrivateController","clientBundleService","printerCache","printerService","printerSocketStore","githubService","yamlService","multerService","logDumpService","logger","Logger","name","serverReleaseService","constructor","getClientReleases","req","res","releaseSpec","getReleases","send","updateClientBundleGithub","inputRules","downloadRelease","allowDowngrade","updateDto","validateMiddleware","willExecute","shouldUpdateWithReason","AppConstants","defaultClientMinimum","log","shouldUpdate","reason","executed","requestedVersion","currentVersion","minimumVersion","targetVersion","tag_name","downloadClientUpdate","getGithubRateLimit","rateLimitResponse","getRateLimit","data","getReleaseStateInfo","syncLatestRelease","updateState","getState","importPrintersAndFloorsYaml","files","multerLoadFileAsync","firstFile","spec","importPrintersAndFloors","buffer","toString","success","exportPrintersAndFloorsYaml","yaml","exportPrintersAndFloors","body","fileContents","Buffer","from","readStream","PassThrough","end","fileName","serverRepoName","Date","now","set","pipe","deleteAllPrinters","printers","listCachedPrinters","printerIds","map","p","id","deleteMany","clearLogs","counts","deleteOlderThanWeekAndMismatchingLogFiles","dumpLogZips","filePath","dumpZip","sendFile","createController","prefix","apiRoute","before","authenticate","authorizeRoles","ROLES","ADMIN","demoUserNotAllowed","get","post","delete"],"mappings":"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"}
|
|
@@ -130,9 +130,7 @@ class ServerPublicController {
|
|
|
130
130
|
res.json({
|
|
131
131
|
version: this.serverVersion,
|
|
132
132
|
isDockerContainer: (0, _isdocker.isDocker)(),
|
|
133
|
-
isNodemon: (0, _envutils.isNodemon)(),
|
|
134
133
|
isNode: (0, _envutils.isNode)(),
|
|
135
|
-
isPm2: (0, _envutils.isPm2)(),
|
|
136
134
|
os: process.env.OS,
|
|
137
135
|
monsterPi: monsterPiVersion,
|
|
138
136
|
update: {
|
|
@@ -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","getServerSettings","moonrakerEnabled","experimentalMoonrakerSupport","batchReprintCalls","available","version","batchConnectSocketCalls","batchConnectUsbCalls","newSockets","anonymousDiagnosticsToggle","pauseResumePrinterCommand","logDumpZip","clearLogFiles","batchTogglePrinterEnabled","cameraStream","subFeatures","printerGroupsApi","printerControlApi","githubRateLimitApi","multiplePrinterServices","types","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isDockerContainer","isDocker","
|
|
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","getServerSettings","moonrakerEnabled","experimentalMoonrakerSupport","batchReprintCalls","available","version","batchConnectSocketCalls","batchConnectUsbCalls","newSockets","anonymousDiagnosticsToggle","pauseResumePrinterCommand","logDumpZip","clearLogFiles","batchTogglePrinterEnabled","cameraStream","subFeatures","printerGroupsApi","printerControlApi","githubRateLimitApi","multiplePrinterServices","types","getVersion","updateState","getState","monsterPiVersion","getMonsterPiVersionSafe","json","isDockerContainer","isDocker","isNode","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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"}
|
|
@@ -26,6 +26,7 @@ const _runtimeexceptions = require("../exceptions/runtime.exceptions");
|
|
|
26
26
|
const _printer = require("../middleware/printer");
|
|
27
27
|
const _normalizeurl = require("../utils/normalize-url");
|
|
28
28
|
const _nodeinputvalidator = /*#__PURE__*/ _interop_require_wildcard(require("node-input-validator"));
|
|
29
|
+
const _urlutils = require("../utils/url.utils");
|
|
29
30
|
function _getRequireWildcardCache(nodeInterop) {
|
|
30
31
|
if (typeof WeakMap !== "function") return null;
|
|
31
32
|
var cacheBabelInterop = new WeakMap();
|
|
@@ -71,8 +72,10 @@ function getExtendedValidator() {
|
|
|
71
72
|
(0, _nodeinputvalidator.extend)("wsurl", ({ value, args }, validator)=>{
|
|
72
73
|
if (!value) return false;
|
|
73
74
|
try {
|
|
74
|
-
const url = (0, _normalizeurl.normalizeUrl)(value
|
|
75
|
-
|
|
75
|
+
const url = new URL((0, _normalizeurl.normalizeUrl)(value, {
|
|
76
|
+
defaultProtocol: "wss"
|
|
77
|
+
}));
|
|
78
|
+
return url.protocol === "ws:" || url.protocol === "wss:";
|
|
76
79
|
} catch (e) {
|
|
77
80
|
return false;
|
|
78
81
|
}
|
|
@@ -80,10 +83,10 @@ function getExtendedValidator() {
|
|
|
80
83
|
(0, _nodeinputvalidator.extend)("httpurl", ({ value, args }, validator)=>{
|
|
81
84
|
if (!value) return false;
|
|
82
85
|
try {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
}
|
|
86
|
-
return
|
|
86
|
+
const url = new URL((0, _normalizeurl.normalizeUrl)(value, {
|
|
87
|
+
defaultProtocol: _urlutils.defaultHttpProtocol
|
|
88
|
+
}));
|
|
89
|
+
return url.protocol === "http:" || url.protocol === "https:";
|
|
87
90
|
} catch (e) {
|
|
88
91
|
return false;
|
|
89
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/handlers/validators.ts"],"names":["getExtendedValidator","getScopedPrinter","validateInput","validateMiddleware","extend","value","args","validator","url","normalizeUrl","
|
|
1
|
+
{"version":3,"sources":["../../src/handlers/validators.ts"],"names":["getExtendedValidator","getScopedPrinter","validateInput","validateMiddleware","extend","value","args","validator","url","URL","normalizeUrl","defaultProtocol","protocol","e","defaultHttpProtocol","extendMessages","not","nodeInputValidator","req","tokens","printerApiToken","printerLoginToken","currentPrinterToken","printerIdToken","resolvedDependencies","errors","forEach","t","dependency","container","resolve","push","InternalServerException","length","ValidationException","data","rules","localNIV","v","Validator","matched","check","inputs","body"],"mappings":";;;;;;;;;;;IAWgBA,oBAAoB;eAApBA;;IAkCAC,gBAAgB;eAAhBA;;IAiCMC,aAAa;eAAbA;;IAeAC,kBAAkB;eAAlBA;;;mCA5FuC;yBAC2B;8BAC3D;4EAC8B;0BAKvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE7B,SAASH;IACdI,IAAAA,0BAAM,EAAC,SAAS,CAAC,EAAEC,KAAK,EAAEC,IAAI,EAA6B,EAAEC;QAC3D,IAAI,CAACF,OAAO,OAAO;QAEnB,IAAI;YACF,MAAMG,MAAM,IAAIC,IAAIC,IAAAA,0BAAY,EAACL,OAAO;gBAAEM,iBAAiB;YAAM;YACjE,OAAOH,IAAII,QAAQ,KAAK,SAASJ,IAAII,QAAQ,KAAK;QACpD,EAAE,OAAOC,GAAG;YACV,OAAO;QACT;IACF;IAEAT,IAAAA,0BAAM,EAAC,WAAW,CAAC,EAAEC,KAAK,EAAEC,IAAI,EAA6B,EAAEC;QAC7D,IAAI,CAACF,OAAO,OAAO;QAEnB,IAAI;YACF,MAAMG,MAAM,IAAIC,IAAIC,IAAAA,0BAAY,EAACL,OAAO;gBAAEM,iBAAiBG,6BAAmB;YAAC;YAC/E,OAAON,IAAII,QAAQ,KAAK,WAAWJ,IAAII,QAAQ,KAAK;QACtD,EAAE,OAAOC,GAAG;YACV,OAAO;QACT;IACF;IAEAT,IAAAA,0BAAM,EAAC,OAAO,CAAC,EAAEC,KAAK,EAAEC,IAAI,EAA6B,EAAEC;QACzD,OAAO,CAACF,SAASA,UAAU;IAC7B;IAEAU,IAAAA,kCAAc,EAAC;QACbC,KAAK;IACP;IAEA,OAAOC,2BAAkB;AAC3B;AAEO,SAAShB,iBAAiBiB,GAAY;IAC3C,MAAMC,SAAS;QAACC,wBAAe;QAAEC,0BAAiB;QAAEC,4BAAmB;QAAEC,uBAAc;KAAC;IACxF,IAAIC,uBAKA,CAAC;IACL,IAAIC,SAAgB,EAAE;IACtBN,OAAOO,OAAO,CAAC,CAACC;QACd,IAAI;YACF,MAAMC,aAAaV,IAAIW,SAAS,CAACC,OAAO,CAACH;YACzC,IAAI,CAACC,YAAY;gBACfH,OAAOM,IAAI,CACT,CAAC,mBAAmB,EAAEJ,EAAE,gGAAgG,CAAC;YAE7H;YACAH,oBAAoB,CAACG,EAAE,GAAGC;QAC5B,EAAE,OAAOf,GAAG;YACV,MAAM,IAAImB,0CAAuB,CAAC,CAAC,WAAW,EAAEL,EAAE,wCAAwC,CAAC;QAC7F;IACF;IAEA,IAAIF,OAAOQ,MAAM,GAAG,GAAG;QACrB,MAAM,IAAIC,sCAAmB,CAACT;IAChC;IAEA,OAAOD;AACT;AAKO,eAAetB,cAAiBiC,IAAS,EAAEC,KAAQ;IACxD,MAAMC,WAAWrC;IAEjB,MAAMsC,IAAI,IAAID,SAASE,SAAS,CAACJ,MAAMC;IAEvC,MAAMI,UAAU,MAAMF,EAAEG,KAAK;IAC7B,IAAI,CAACD,SAAS;QACZ,MAAM,IAAIN,sCAAmB,CAACI,EAAEb,MAAM;IACxC;IACA,OAAOa,EAAEI,MAAM;AACjB;AAKO,eAAevC,mBAAsBe,GAAY,EAAEkB,KAAQ;IAChE,OAAOlC,cAAcgB,IAAIyB,IAAI,EAAEP;AACjC"}
|
package/dist/server.constants.js
CHANGED
|
@@ -9,7 +9,6 @@ Object.defineProperty(exports, "AppConstants", {
|
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
11
|
const AppConstants = {
|
|
12
|
-
NON_NPM_MODE_KEY: "NON_NPM_MODE",
|
|
13
12
|
NODE_ENV_KEY: "NODE_ENV",
|
|
14
13
|
VERSION_KEY: "npm_package_version",
|
|
15
14
|
SERVER_PORT_KEY: "SERVER_PORT",
|
|
@@ -71,7 +70,7 @@ const AppConstants = {
|
|
|
71
70
|
githubUrl: "https://github.com/fdm-monster/fdm-monster",
|
|
72
71
|
orgName: "fdm-monster",
|
|
73
72
|
currentWizardVersion: 1,
|
|
74
|
-
defaultClientMinimum: "1.
|
|
73
|
+
defaultClientMinimum: "1.9.0",
|
|
75
74
|
influxUrl: "INFLUX_URL",
|
|
76
75
|
influxToken: "INFLUX_TOKEN",
|
|
77
76
|
influxOrg: "INFLUX_ORG",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","
|
|
1
|
+
{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultPrinterThumbnailsStorage","defaultFileUploadsStorage","defaultAcceptedGcodeExtensions","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","serverRepoName","clientPackageName","clientRepoName","clientNextPackageName","clientNextRepoName","githubUrl","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,iCAAiC;IACjCC,2BAA2B;IAC3BC,gCAAgC;QAAC;QAAU;KAAU;IACrDC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,gBAAgB;IAChBC,mBAAmB;IACnBC,gBAAgB;IAChBC,uBAAuB;IACvBC,oBAAoB;IACpBC,WAAW;IACXC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAC1BC,gCAAgC;IAChCC,oCAAoC;IAGpCC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBAAwB;IAExBC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;AACpC"}
|
package/dist/server.env.js
CHANGED
|
@@ -36,7 +36,6 @@ _export(exports, {
|
|
|
36
36
|
});
|
|
37
37
|
const _migratemongo = require("migrate-mongo");
|
|
38
38
|
const _path = require("path");
|
|
39
|
-
const _child_process = require("child_process");
|
|
40
39
|
const _node = /*#__PURE__*/ _interop_require_wildcard(require("@sentry/node"));
|
|
41
40
|
const _dotenv = require("dotenv");
|
|
42
41
|
const _serverconstants = require("./server.constants");
|
|
@@ -105,32 +104,12 @@ function ensureNodeEnvSet() {
|
|
|
105
104
|
logger.log(`✓ NODE_ENV variable correctly set (${environment})!`);
|
|
106
105
|
}
|
|
107
106
|
}
|
|
108
|
-
function
|
|
107
|
+
function ensurePackageVersionSet() {
|
|
109
108
|
const packageJsonVersion = require(packageJsonPath).version;
|
|
110
109
|
if (!process.env[_serverconstants.AppConstants.VERSION_KEY]) {
|
|
111
110
|
process.env[_serverconstants.AppConstants.VERSION_KEY] = packageJsonVersion;
|
|
112
|
-
process.env[_serverconstants.AppConstants.NON_NPM_MODE_KEY] = "true";
|
|
113
|
-
logger.log(`✓ Running server version ${process.env[_serverconstants.AppConstants.VERSION_KEY]} in non-NPM mode!`);
|
|
114
|
-
} else {
|
|
115
|
-
logger.debug(`✓ Running server version ${process.env[_serverconstants.AppConstants.VERSION_KEY]} in NPM mode!`);
|
|
116
|
-
}
|
|
117
|
-
if (process.env[_serverconstants.AppConstants.VERSION_KEY] !== packageJsonVersion) {
|
|
118
|
-
process.env[_serverconstants.AppConstants.VERSION_KEY] = packageJsonVersion;
|
|
119
|
-
logger.debug(`~ Had to synchronize FDM version to '${packageJsonVersion}' as it was outdated.`);
|
|
120
|
-
}
|
|
121
|
-
}
|
|
122
|
-
function removePm2Service(reason) {
|
|
123
|
-
logger.error(`Removing PM2 service as Server failed to start: ${reason}`);
|
|
124
|
-
(0, _child_process.execSync)(`pm2 delete ${_serverconstants.AppConstants.pm2ServiceName}`);
|
|
125
|
-
}
|
|
126
|
-
function setupPackageJsonVersionOrThrow() {
|
|
127
|
-
const result = (0, _envutils.verifyPackageJsonRequirements)((0, _fsutils.superRootPath)());
|
|
128
|
-
if (!result) {
|
|
129
|
-
if ((0, _envutils.isPm2)()) {
|
|
130
|
-
removePm2Service("didnt pass startup validation (package.json)");
|
|
131
|
-
}
|
|
132
|
-
throw new Error("Aborting server.");
|
|
133
111
|
}
|
|
112
|
+
logger.log(`✓ Running server version ${process.env[_serverconstants.AppConstants.VERSION_KEY]}`);
|
|
134
113
|
}
|
|
135
114
|
function printInstructionsURL() {
|
|
136
115
|
logger.log(`Please make sure to read ${instructionsReferralURL} for more information.`);
|
|
@@ -190,8 +169,7 @@ function setupEnvConfig(skipDotEnv = false) {
|
|
|
190
169
|
logger.log("✓ Parsed environment and (optional) .env file");
|
|
191
170
|
}
|
|
192
171
|
ensureNodeEnvSet();
|
|
193
|
-
|
|
194
|
-
ensureEnvNpmVersionSet();
|
|
172
|
+
ensurePackageVersionSet();
|
|
195
173
|
setupSentry();
|
|
196
174
|
ensureMongoDBConnectionStringSet();
|
|
197
175
|
ensurePortSet();
|
package/dist/server.env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/server.env.ts"],"names":["ensureMongoDBConnectionStringSet","ensurePortSet","fetchMongoDBConnectionString","fetchServerPort","isEnvProd","runMigrations","setupEnvConfig","setupSentry","logger","Logger","instructionsReferralURL","packageJsonPath","join","superRootPath","dotEnvPath","isEnvTest","process","env","AppConstants","NODE_ENV_KEY","defaultTestEnv","defaultProductionEnv","ensureNodeEnvSet","environment","knownEnvNames","includes","newEnvName","warn","log","
|
|
1
|
+
{"version":3,"sources":["../src/server.env.ts"],"names":["ensureMongoDBConnectionStringSet","ensurePortSet","fetchMongoDBConnectionString","fetchServerPort","isEnvProd","runMigrations","setupEnvConfig","setupSentry","logger","Logger","instructionsReferralURL","packageJsonPath","join","superRootPath","dotEnvPath","isEnvTest","process","env","AppConstants","NODE_ENV_KEY","defaultTestEnv","defaultProductionEnv","ensureNodeEnvSet","environment","knownEnvNames","includes","newEnvName","warn","log","ensurePackageVersionSet","packageJsonVersion","require","version","VERSION_KEY","printInstructionsURL","MONGO_KEY","debug","defaultMongoStringUnauthenticated","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","dbConnectionString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","error","captureException","skipDotEnv","config","path","db","client","migrationsStatus","status","pendingMigrations","filter","m","appliedAt","length","migrationResult","up"],"mappings":"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"}
|
package/dist/server.host.js
CHANGED
|
@@ -72,7 +72,9 @@ class ServerHost {
|
|
|
72
72
|
}
|
|
73
73
|
}).use((0, _awilixexpress.loadControllers)(`${routePath}/*.controller.*`, {
|
|
74
74
|
cwd: __dirname,
|
|
75
|
-
ignore:
|
|
75
|
+
ignore: [
|
|
76
|
+
"**/*.map"
|
|
77
|
+
]
|
|
76
78
|
})).use(_exceptionfilter.exceptionFilter);
|
|
77
79
|
const nextClientPath = (0, _path.join)((0, _fsutils.superRootPath)(), "node_modules", _serverconstants.AppConstants.clientNextPackageName, "dist");
|
|
78
80
|
const bundleDistPath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultClientBundleStorage, "dist");
|
package/dist/server.host.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","bootTask","taskManagerService","socketIoGateway","appInstance","configService","typeormService","settingsStore","isTypeormMode","logger","constructor","loggerFactory","name","boot","app","quick_boot","listenRequests","mongoose","set","serveControllerRoutes","runOnce","httpListen","hasConnected","connections","readyState","routePath","use","req","res","next","originalUrl","startsWith","history","loadControllers","cwd","__dirname","ignore","exceptionFilter","nextClientPath","join","superRootPath","AppConstants","clientNextPackageName","bundleDistPath","defaultClientBundleStorage","backupClientPath","clientPackageName","isClientNextEnabled","express","static","get","path","resource","endsWith","error","NotFoundException","settings","getServerSettings","experimentalClientSupport","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer"],"mappings":";;;;+BAoBaA;;;eAAAA;;;gEApBwB;iEAChB;kFACD;+BAEY;sBACX;iCACW;2BACA;mCACE;iCACL;yBACC;0BAIU;;;;;;AAMjC,MAAMA;IACXC,SAAmB;IACnBC,mBAAuC;IACvCC,gBAAiC;IACjCC,cAAkC,KAAK;IACvCC,cAA6B;IAC7BC,eAA+B;IAC/BC,cAA6B;IACZC,cAAuB;IAChCC,OAAsB;IAE9BC,YAAY,EACVC,aAAa,EACbV,QAAQ,EACRC,kBAAkB,EAClBC,eAAe,EACfE,aAAa,EACbC,cAAc,EACdE,aAAa,EACbD,aAAa,EAUd,CAAE;QACD,IAAI,CAACE,MAAM,GAAGE,cAAcX,WAAWY,IAAI;QAC3C,IAAI,CAACX,QAAQ,GAAGA;QAChB,IAAI,CAACC,kBAAkB,GAAGA;QAC1B,IAAI,CAACC,eAAe,GAAGA;QACvB,IAAI,CAACE,aAAa,GAAGA;QACrB,IAAI,CAACC,cAAc,GAAGA;QACtB,IAAI,CAACC,aAAa,GAAGA;QACrB,IAAI,CAACC,aAAa,GAAGA;IACvB;IAEA,MAAMK,KAAKC,GAAgB,EAAEC,aAAa,KAAK,EAAEC,iBAAiB,IAAI,EAAE;QACtE,IAAI,CAAC,IAAI,CAACR,aAAa,EAAE;YAEvBS,iBAAQ,CAACC,GAAG,CAAC,eAAe;QAC9B;QAEA,IAAI,CAACd,WAAW,GAAGU;QACnB,IAAI,CAACK,qBAAqB,CAAC,IAAI,CAACf,WAAW;QAE3C,IAAI,CAACW,YAAY;YACf,MAAM,IAAI,CAACd,QAAQ,CAACmB,OAAO;QAC7B;QAEA,IAAIJ,gBAAgB,OAAO,IAAI,CAACK,UAAU;IAC5C;IAEAC,eAAe;QACb,IAAI,IAAI,CAACd,aAAa,EAAE;YACtB,OAAO,IAAI,CAACF,cAAc,CAACgB,YAAY;QACzC,OAAO;YACL,OAAOL,iBAAQ,CAACM,WAAW,CAAC,EAAE,CAACC,UAAU;QAC3C;IACF;IAEAL,sBAAsBL,GAAgB,EAAE;QACtC,MAAMW,YAAY;QAGlBX,IACGY,GAAG,CAAC,CAACC,KAAKC,KAAKC;YACd,IAAI,CAACF,IAAIG,WAAW,CAACC,UAAU,CAAC,WAAW,CAACJ,IAAIG,WAAW,CAACC,UAAU,CAAC,eAAe;gBACpFC,IAAAA,kCAAO,IAAGL,KAAKC,KAAKC;YACtB,OAAO;gBACLA;YACF;QACF,GACCH,GAAG,CAACO,IAAAA,8BAAe,EAAC,GAAGR,UAAU,eAAe,CAAC,EAAE;YAAES,KAAKC;YAAWC,QAAQ;
|
|
1
|
+
{"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","bootTask","taskManagerService","socketIoGateway","appInstance","configService","typeormService","settingsStore","isTypeormMode","logger","constructor","loggerFactory","name","boot","app","quick_boot","listenRequests","mongoose","set","serveControllerRoutes","runOnce","httpListen","hasConnected","connections","readyState","routePath","use","req","res","next","originalUrl","startsWith","history","loadControllers","cwd","__dirname","ignore","exceptionFilter","nextClientPath","join","superRootPath","AppConstants","clientNextPackageName","bundleDistPath","defaultClientBundleStorage","backupClientPath","clientPackageName","isClientNextEnabled","express","static","get","path","resource","endsWith","error","NotFoundException","settings","getServerSettings","experimentalClientSupport","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer"],"mappings":"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"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "HttpClientFactory", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return HttpClientFactory;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _defaulthttpclientbuilder = require("../../shared/default-http-client.builder");
|
|
12
|
+
class HttpClientFactory {
|
|
13
|
+
settingsStore;
|
|
14
|
+
constructor({ settingsStore }){
|
|
15
|
+
this.settingsStore = settingsStore;
|
|
16
|
+
}
|
|
17
|
+
createClient(base, buildFluentOptions) {
|
|
18
|
+
base.withMaxBodyLength(1000 * 1000 * 1000);
|
|
19
|
+
base.withMaxContentLength(1000 * 1000 * 1000);
|
|
20
|
+
base.withTimeout(this.settingsStore.getTimeoutSettings().apiTimeout);
|
|
21
|
+
if (buildFluentOptions) {
|
|
22
|
+
buildFluentOptions(base);
|
|
23
|
+
}
|
|
24
|
+
return base.build();
|
|
25
|
+
}
|
|
26
|
+
createDefaultClient(buildFluentOptions) {
|
|
27
|
+
const builder = new _defaulthttpclientbuilder.DefaultHttpClientBuilder();
|
|
28
|
+
return this.createClient(builder, buildFluentOptions);
|
|
29
|
+
}
|
|
30
|
+
createClientWithBaseUrl(base, baseAddress, buildFluentOptions) {
|
|
31
|
+
return this.createClient(base, (builder)=>{
|
|
32
|
+
builder.withBaseUrl(baseAddress);
|
|
33
|
+
if (buildFluentOptions) {
|
|
34
|
+
buildFluentOptions(base);
|
|
35
|
+
}
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
//# sourceMappingURL=http-client.factory.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/http-client.factory.ts"],"names":["HttpClientFactory","settingsStore","constructor","createClient","base","buildFluentOptions","withMaxBodyLength","withMaxContentLength","withTimeout","getTimeoutSettings","apiTimeout","build","createDefaultClient","builder","DefaultHttpClientBuilder","createClientWithBaseUrl","baseAddress","withBaseUrl"],"mappings":";;;;+BAIaA;;;eAAAA;;;0CAJ4B;AAIlC,MAAMA;IACHC,cAA6B;IAErCC,YAAY,EAAED,aAAa,EAAoC,CAAE;QAC/D,IAAI,CAACA,aAAa,GAAGA;IACvB;IAEAE,aAAiDC,IAAO,EAAEC,kBAAsC,EAAE;QAChGD,KAAKE,iBAAiB,CAAC,OAAO,OAAO;QACrCF,KAAKG,oBAAoB,CAAC,OAAO,OAAO;QACxCH,KAAKI,WAAW,CAAC,IAAI,CAACP,aAAa,CAACQ,kBAAkB,GAAGC,UAAU;QAEnE,IAAIL,oBAAoB;YACtBA,mBAAmBD;QACrB;QAEA,OAAOA,KAAKO,KAAK;IACnB;IAMAC,oBAAoBP,kBAA6D,EAAE;QACjF,MAAMQ,UAAU,IAAIC,kDAAwB;QAC5C,OAAO,IAAI,CAACX,YAAY,CAACU,SAASR;IACpC;IAEAU,wBACEX,IAAO,EACPY,WAAmB,EACnBX,kBAAsC,EACvB;QACf,OAAO,IAAI,CAACF,YAAY,CAACC,MAAM,CAACS;YAC9BA,QAAQI,WAAW,CAACD;YAEpB,IAAIX,oBAAoB;gBACtBA,mBAAmBD;YACrB;QACF;IACF;AACF"}
|
|
@@ -14,6 +14,7 @@ const _fs = require("fs");
|
|
|
14
14
|
const _fsutils = require("../../utils/fs.utils");
|
|
15
15
|
const _serverconstants = require("../../server.constants");
|
|
16
16
|
const _timeutils = require("../../utils/time.utils");
|
|
17
|
+
const _nodefs = require("node:fs");
|
|
17
18
|
function _interop_require_default(obj) {
|
|
18
19
|
return obj && obj.__esModule ? obj : {
|
|
19
20
|
default: obj
|
|
@@ -51,7 +52,7 @@ class LogDumpService {
|
|
|
51
52
|
let removedWrongFormatFilesCount = 0;
|
|
52
53
|
for (const file of removedFilesNotInFormat){
|
|
53
54
|
try {
|
|
54
|
-
(0,
|
|
55
|
+
(0, _nodefs.rmSync)((0, _path.join)(path, file));
|
|
55
56
|
removedWrongFormatFilesCount++;
|
|
56
57
|
} catch (err) {
|
|
57
58
|
this.logger.warn(`Failed to delete log file`);
|
|
@@ -60,7 +61,7 @@ class LogDumpService {
|
|
|
60
61
|
let removedOutdatedFilesCount = 0;
|
|
61
62
|
for (const file of removedFilesOutdated){
|
|
62
63
|
try {
|
|
63
|
-
(0,
|
|
64
|
+
(0, _nodefs.rmSync)((0, _path.join)(path, file));
|
|
64
65
|
removedOutdatedFilesCount++;
|
|
65
66
|
} catch (err) {
|
|
66
67
|
this.logger.warn(`Failed to delete log file`);
|
|
@@ -76,7 +77,7 @@ class LogDumpService {
|
|
|
76
77
|
this.logger.log("Dumping logs as ZIP");
|
|
77
78
|
const zip = new _admzip.default();
|
|
78
79
|
const path = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultLogsFolder);
|
|
79
|
-
zip.addLocalFolder(path, "/logs", "
|
|
80
|
+
zip.addLocalFolder(path, "/logs", (filename)=>filename.endsWith(".log"));
|
|
80
81
|
const outputPath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultLogZipsFolder, `logs-${_serverconstants.AppConstants.serverRepoName}.zip`);
|
|
81
82
|
zip.writeZip(outputPath);
|
|
82
83
|
return outputPath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/logs-manager.service.ts"],"names":["LogDumpService","logger","constructor","loggerFactory","name","deleteOlderThanWeekAndMismatchingLogFiles","log","path","join","superRootPath","AppConstants","defaultLogsFolder","dirEntries","readdirSync","withFileTypes","files","filter","dirent","isFile","map","startingFormat","logAppName","removedFilesNotInFormat","f","endsWith","startsWith","removedFilesOutdated","matchesFormat","strippedFilename","replace","date","Date","isValidDate","warn","now","diff","getTime","diffDays","length","removedWrongFormatFilesCount","file","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/logs-manager.service.ts"],"names":["LogDumpService","logger","constructor","loggerFactory","name","deleteOlderThanWeekAndMismatchingLogFiles","log","path","join","superRootPath","AppConstants","defaultLogsFolder","dirEntries","readdirSync","withFileTypes","files","filter","dirent","isFile","map","startingFormat","logAppName","removedFilesNotInFormat","f","endsWith","startsWith","removedFilesOutdated","matchesFormat","strippedFilename","replace","date","Date","isValidDate","warn","now","diff","getTime","diffDays","length","removedWrongFormatFilesCount","file","rmSync","err","removedOutdatedFilesCount","dumpZip","zip","AdmZip","addLocalFolder","filename","outputPath","defaultLogZipsFolder","serverRepoName","writeZip"],"mappings":"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"}
|