@fdm-monster/server 1.8.2 → 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.6.0.cjs → yarn-4.7.0.cjs} +292 -291
- package/.yarnrc.yml +1 -1
- package/RELEASE_NOTES.MD +19 -6
- 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 -10
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +1 -1
- 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/handlers/validators.js +9 -6
- package/dist/handlers/validators.js.map +1 -1
- package/dist/server.constants.js +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 +117 -200
- 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.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/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 +30 -29
- 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
|
@@ -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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"}
|
|
@@ -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
|
@@ -70,7 +70,7 @@ const AppConstants = {
|
|
|
70
70
|
githubUrl: "https://github.com/fdm-monster/fdm-monster",
|
|
71
71
|
orgName: "fdm-monster",
|
|
72
72
|
currentWizardVersion: 1,
|
|
73
|
-
defaultClientMinimum: "1.
|
|
73
|
+
defaultClientMinimum: "1.9.0",
|
|
74
74
|
influxUrl: "INFLUX_URL",
|
|
75
75
|
influxToken: "INFLUX_TOKEN",
|
|
76
76
|
influxOrg: "INFLUX_ORG",
|
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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"}
|
|
@@ -8,28 +8,65 @@ Object.defineProperty(exports, "MulterService", {
|
|
|
8
8
|
return MulterService;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
const _multer = /*#__PURE__*/
|
|
11
|
+
const _multer = /*#__PURE__*/ _interop_require_wildcard(require("multer"));
|
|
12
12
|
const _path = require("path");
|
|
13
13
|
const _fs = require("fs");
|
|
14
14
|
const _fsutils = require("../../utils/fs.utils");
|
|
15
15
|
const _serverconstants = require("../../server.constants");
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
const _nodefs = require("node:fs");
|
|
17
|
+
const _errorutils = require("../../utils/error.utils");
|
|
18
|
+
function _getRequireWildcardCache(nodeInterop) {
|
|
19
|
+
if (typeof WeakMap !== "function") return null;
|
|
20
|
+
var cacheBabelInterop = new WeakMap();
|
|
21
|
+
var cacheNodeInterop = new WeakMap();
|
|
22
|
+
return (_getRequireWildcardCache = function(nodeInterop) {
|
|
23
|
+
return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
|
|
24
|
+
})(nodeInterop);
|
|
25
|
+
}
|
|
26
|
+
function _interop_require_wildcard(obj, nodeInterop) {
|
|
27
|
+
if (!nodeInterop && obj && obj.__esModule) {
|
|
28
|
+
return obj;
|
|
29
|
+
}
|
|
30
|
+
if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
|
|
31
|
+
return {
|
|
32
|
+
default: obj
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
var cache = _getRequireWildcardCache(nodeInterop);
|
|
36
|
+
if (cache && cache.has(obj)) {
|
|
37
|
+
return cache.get(obj);
|
|
38
|
+
}
|
|
39
|
+
var newObj = {
|
|
40
|
+
__proto__: null
|
|
19
41
|
};
|
|
42
|
+
var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
|
|
43
|
+
for(var key in obj){
|
|
44
|
+
if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
|
|
45
|
+
var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
|
|
46
|
+
if (desc && (desc.get || desc.set)) {
|
|
47
|
+
Object.defineProperty(newObj, key, desc);
|
|
48
|
+
} else {
|
|
49
|
+
newObj[key] = obj[key];
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
newObj.default = obj;
|
|
54
|
+
if (cache) {
|
|
55
|
+
cache.set(obj, newObj);
|
|
56
|
+
}
|
|
57
|
+
return newObj;
|
|
20
58
|
}
|
|
21
59
|
class MulterService {
|
|
22
60
|
fileUploadTrackerCache;
|
|
23
|
-
|
|
24
|
-
|
|
61
|
+
httpClientFactory;
|
|
62
|
+
logger;
|
|
63
|
+
constructor({ fileUploadTrackerCache, httpClientFactory, loggerFactory }){
|
|
25
64
|
this.fileUploadTrackerCache = fileUploadTrackerCache;
|
|
26
|
-
this.
|
|
65
|
+
this.httpClientFactory = httpClientFactory;
|
|
66
|
+
this.logger = loggerFactory(MulterService.name);
|
|
27
67
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
const files = this.orderRecentFiles(dirPath);
|
|
31
|
-
const latestFile = files.length ? files[0] : undefined;
|
|
32
|
-
return latestFile ? (0, _path.join)(dirPath, latestFile.file) : undefined;
|
|
68
|
+
startTrackingSession(multerFile, printerId) {
|
|
69
|
+
return this.fileUploadTrackerCache.addUploadTracker(multerFile, printerId);
|
|
33
70
|
}
|
|
34
71
|
clearUploadsFolder() {
|
|
35
72
|
const fileStoragePath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder);
|
|
@@ -38,11 +75,26 @@ class MulterService {
|
|
|
38
75
|
withFileTypes: true
|
|
39
76
|
}).filter((item)=>!item.isDirectory()).map((item)=>item.name);
|
|
40
77
|
for (const file of files){
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
})
|
|
78
|
+
try {
|
|
79
|
+
(0, _nodefs.rmSync)((0, _path.join)(fileStoragePath, file));
|
|
80
|
+
} catch (error) {
|
|
81
|
+
this.logger.error(`Could not clear upload file in temporary folder ${(0, _errorutils.errorSummary)(error)}`);
|
|
82
|
+
}
|
|
44
83
|
}
|
|
45
84
|
}
|
|
85
|
+
clearUploadedFile(multerFile) {
|
|
86
|
+
if ((0, _fs.existsSync)(multerFile.path)) {
|
|
87
|
+
(0, _nodefs.rmSync)(multerFile.path);
|
|
88
|
+
} else {
|
|
89
|
+
this.logger.warn("Cannot unlink temporarily uploaded file as it was not found");
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
getNewestFile(collection) {
|
|
93
|
+
const dirPath = this.collectionPath(collection);
|
|
94
|
+
const files = this.orderRecentFiles(dirPath);
|
|
95
|
+
const latestFile = files.length ? files[0] : undefined;
|
|
96
|
+
return latestFile ? (0, _path.join)(dirPath, latestFile.file) : undefined;
|
|
97
|
+
}
|
|
46
98
|
fileExists(downloadFilename, collection) {
|
|
47
99
|
const downloadPath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder, collection, downloadFilename);
|
|
48
100
|
return (0, _fs.existsSync)(downloadPath);
|
|
@@ -56,7 +108,8 @@ class MulterService {
|
|
|
56
108
|
}
|
|
57
109
|
const downloadPath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder, collection, downloadFilename);
|
|
58
110
|
const fileStream = (0, _fs.createWriteStream)(downloadPath);
|
|
59
|
-
const
|
|
111
|
+
const defaultHttpClient = this.httpClientFactory.createDefaultClient();
|
|
112
|
+
const res = await defaultHttpClient.get(downloadUrl);
|
|
60
113
|
return await new Promise((resolve, reject)=>{
|
|
61
114
|
fileStream.write(res.data);
|
|
62
115
|
fileStream.on("error", (err)=>{
|
|
@@ -84,14 +137,14 @@ class MulterService {
|
|
|
84
137
|
}
|
|
85
138
|
getMulterFileFilter(fileExtensions, storeAsFile = true) {
|
|
86
139
|
return (0, _multer.default)({
|
|
87
|
-
storage: storeAsFile ? _multer.
|
|
140
|
+
storage: storeAsFile ? (0, _multer.diskStorage)({
|
|
88
141
|
destination: (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultFileStorageFolder)
|
|
89
|
-
}) : _multer.
|
|
142
|
+
}) : (0, _multer.memoryStorage)(),
|
|
90
143
|
fileFilter: this.multerFileFilter(fileExtensions)
|
|
91
144
|
}).any();
|
|
92
145
|
}
|
|
93
146
|
multerFileFilter(extensions) {
|
|
94
|
-
return (
|
|
147
|
+
return (_, file, callback)=>{
|
|
95
148
|
const ext = (0, _path.extname)(file.originalname);
|
|
96
149
|
if (extensions?.length && !extensions.includes(ext?.toLowerCase())) {
|
|
97
150
|
return callback(new Error(`Only files with extensions ${extensions} are allowed`));
|
|
@@ -99,9 +152,6 @@ class MulterService {
|
|
|
99
152
|
return callback(null, true);
|
|
100
153
|
};
|
|
101
154
|
}
|
|
102
|
-
startTrackingSession(multerFile) {
|
|
103
|
-
return this.fileUploadTrackerCache.addUploadTracker(multerFile);
|
|
104
|
-
}
|
|
105
155
|
getSessions() {
|
|
106
156
|
return this.fileUploadTrackerCache.getUploads();
|
|
107
157
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","fileUploadTrackerCache","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/multer.service.ts"],"names":["MulterService","fileUploadTrackerCache","httpClientFactory","logger","constructor","loggerFactory","name","startTrackingSession","multerFile","printerId","addUploadTracker","clearUploadsFolder","fileStoragePath","join","superRootPath","AppConstants","defaultFileStorageFolder","existsSync","files","readdirSync","withFileTypes","filter","item","isDirectory","map","file","rmSync","error","errorSummary","clearUploadedFile","path","warn","getNewestFile","collection","dirPath","collectionPath","orderRecentFiles","latestFile","length","undefined","fileExists","downloadFilename","downloadPath","downloadFile","downloadUrl","downloadFolder","mkdirSync","recursive","fileStream","createWriteStream","defaultHttpClient","createDefaultClient","res","get","Promise","resolve","reject","write","data","on","err","getMulterGCodeFileFilter","storeAsFile","getMulterFileFilter","defaultAcceptedGcodeExtensions","multerLoadFileAsync","req","fileExtensions","multer","storage","diskStorage","destination","memoryStorage","fileFilter","multerFileFilter","any","extensions","_","callback","ext","extname","originalname","includes","toLowerCase","Error","getSessions","getUploads","dir","lstatSync","isFile","mtime","sort","a","b","getTime"],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/file-upload-tracker.interface.ts"],"names":[],"mappings":""}
|
|
@@ -14,6 +14,9 @@ _export(exports, {
|
|
|
14
14
|
},
|
|
15
15
|
PrinterUnsafeDto: function() {
|
|
16
16
|
return PrinterUnsafeDto;
|
|
17
|
+
},
|
|
18
|
+
PrinterUnsafeWithCorrelationDto: function() {
|
|
19
|
+
return PrinterUnsafeWithCorrelationDto;
|
|
17
20
|
}
|
|
18
21
|
});
|
|
19
22
|
const _sharedconstants = require("../../shared.constants");
|
|
@@ -28,5 +31,8 @@ class PrinterUnsafeDto extends PrinterDto {
|
|
|
28
31
|
printerURL;
|
|
29
32
|
printerType;
|
|
30
33
|
}
|
|
34
|
+
class PrinterUnsafeWithCorrelationDto extends PrinterUnsafeDto {
|
|
35
|
+
correlationToken;
|
|
36
|
+
}
|
|
31
37
|
|
|
32
38
|
//# sourceMappingURL=printer.dto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/interfaces/printer.dto.ts"],"names":["PrinterDto","PrinterUnsafeDto","IdDto","name","enabled","disabledReason","dateAdded","apiKey","printerURL","printerType"],"mappings":";;;;;;;;;;;IAEaA,UAAU;eAAVA;;IAOAC,gBAAgB;eAAhBA;;;
|
|
1
|
+
{"version":3,"sources":["../../../src/services/interfaces/printer.dto.ts"],"names":["PrinterDto","PrinterUnsafeDto","PrinterUnsafeWithCorrelationDto","IdDto","name","enabled","disabledReason","dateAdded","apiKey","printerURL","printerType","correlationToken"],"mappings":";;;;;;;;;;;IAEaA,UAAU;eAAVA;;IAOAC,gBAAgB;eAAhBA;;IAMAC,+BAA+B;eAA/BA;;;iCAfS;AAEf,MAAMF,mBAA4BG,sBAAK;IAC5CC,KAAa;IACbC,QAAiB;IACjBC,eAAuB;IACvBC,UAAkB;AACpB;AAEO,MAAMN,yBAAkCD;IAC7CQ,OAAe;IACfC,WAAmB;IACnBC,YAAoB;AACtB;AAEO,MAAMR,wCAAiDD;IAC5DU,iBAAyB;AAC3B"}
|
|
@@ -13,6 +13,7 @@ const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
|
|
|
13
13
|
const _validators = require("../../handlers/validators");
|
|
14
14
|
const _printerservicevalidation = require("../validators/printer-service.validation");
|
|
15
15
|
const _eventconstants = require("../../constants/event.constants");
|
|
16
|
+
const _normalizeurl = require("../../utils/normalize-url");
|
|
16
17
|
const _urlutils = require("../../utils/url.utils");
|
|
17
18
|
class PrinterService {
|
|
18
19
|
eventEmitter2;
|
|
@@ -69,7 +70,9 @@ class PrinterService {
|
|
|
69
70
|
}
|
|
70
71
|
async update(printerId, updateData) {
|
|
71
72
|
const printer = await this.get(printerId);
|
|
72
|
-
updateData.printerURL = (0,
|
|
73
|
+
updateData.printerURL = (0, _normalizeurl.normalizeUrl)(updateData.printerURL, {
|
|
74
|
+
defaultProtocol: _urlutils.defaultHttpProtocol
|
|
75
|
+
});
|
|
73
76
|
const { printerURL, apiKey, enabled, name, printerType } = await (0, _validators.validateInput)(updateData, _printerservicevalidation.createMongoPrinterRules);
|
|
74
77
|
printer.printerURL = printerURL;
|
|
75
78
|
printer.apiKey = apiKey;
|
|
@@ -156,7 +159,9 @@ class PrinterService {
|
|
|
156
159
|
}
|
|
157
160
|
async updateConnectionSettings(printerId, { printerURL, apiKey, printerType }) {
|
|
158
161
|
const update = {
|
|
159
|
-
printerURL: (0,
|
|
162
|
+
printerURL: (0, _normalizeurl.normalizeUrl)(printerURL, {
|
|
163
|
+
defaultProtocol: _urlutils.defaultHttpProtocol
|
|
164
|
+
}),
|
|
160
165
|
apiKey,
|
|
161
166
|
printerType
|
|
162
167
|
};
|
|
@@ -212,7 +217,9 @@ class PrinterService {
|
|
|
212
217
|
...printer
|
|
213
218
|
};
|
|
214
219
|
if (mergedPrinter.printerURL?.length) {
|
|
215
|
-
mergedPrinter.printerURL = (0,
|
|
220
|
+
mergedPrinter.printerURL = (0, _normalizeurl.normalizeUrl)(mergedPrinter.printerURL, {
|
|
221
|
+
defaultProtocol: _urlutils.defaultHttpProtocol
|
|
222
|
+
});
|
|
216
223
|
}
|
|
217
224
|
return await (0, _validators.validateInput)(mergedPrinter, _printerservicevalidation.createMongoPrinterRules);
|
|
218
225
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/mongoose/printer.service.ts"],"names":["PrinterService","eventEmitter2","logger","constructor","loggerFactory","name","toUnsafeDto","entity","toDto","apiKey","printerURL","printerType","id","enabled","disabledReason","dateAdded","list","Printer","find","sort","get","printerId","filter","_id","printer","findOne","NotFoundException","create","newPrinter","emitEvent","Error","mergedPrinter","validateAndDefault","Date","now","emit","printerEvents","printerCreated","update","updateData","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/mongoose/printer.service.ts"],"names":["PrinterService","eventEmitter2","logger","constructor","loggerFactory","name","toUnsafeDto","entity","toDto","apiKey","printerURL","printerType","id","enabled","disabledReason","dateAdded","list","Printer","find","sort","get","printerId","filter","_id","printer","findOne","NotFoundException","create","newPrinter","emitEvent","Error","mergedPrinter","validateAndDefault","Date","now","emit","printerEvents","printerCreated","update","updateData","normalizeUrl","defaultProtocol","defaultHttpProtocol","validateInput","createMongoPrinterRules","undefined","save","printerUpdated","deleteMany","printerIds","$in","printersDeleted","delete","findOneAndDelete","batchImport","printers","length","log","newPrinters","createdPrinter","push","batchPrinterCreated","updateFlowRate","flowRate","findByIdAndUpdate","new","useFindAndModify","updateFeedRate","feedRate","updateConnectionSettings","updateEnabled","updatePrinterEnabledRule","updateDisabledReason","updatePrinterDisabledReasonRule"],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ const _prettyprintutils = require("../../utils/pretty-print.utils");
|
|
|
18
18
|
const _lodash = /*#__PURE__*/ _interop_require_default(require("lodash"));
|
|
19
19
|
const _websocketrpcextendedadapter = require("../../shared/websocket-rpc-extended.adapter");
|
|
20
20
|
const _printerapiinterface = require("../printer-api.interface");
|
|
21
|
+
const _normalizeurl = require("../../utils/normalize-url");
|
|
21
22
|
function _interop_require_default(obj) {
|
|
22
23
|
return obj && obj.__esModule ? obj : {
|
|
23
24
|
default: obj
|
|
@@ -89,8 +90,11 @@ class MoonrakerWebsocketAdapter extends _websocketrpcextendedadapter.WebsocketRp
|
|
|
89
90
|
const { printerId, loginDto } = socketLogin;
|
|
90
91
|
this.printerId = printerId;
|
|
91
92
|
this.login = loginDto;
|
|
92
|
-
const
|
|
93
|
-
|
|
93
|
+
const httpUrlString = (0, _normalizeurl.normalizeUrl)(this.login.printerURL);
|
|
94
|
+
const httpUrl = new URL(httpUrlString);
|
|
95
|
+
const httpUrlPath = httpUrl.pathname;
|
|
96
|
+
const wsUrl = (0, _urlutils.httpToWsUrl)(httpUrlString);
|
|
97
|
+
wsUrl.pathname = (httpUrlPath ?? "/") + "websocket";
|
|
94
98
|
this.socketURL = wsUrl;
|
|
95
99
|
}
|
|
96
100
|
open() {
|