@fdm-monster/server 1.9.0-rc1 → 1.9.0
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 +1 -1
- package/.yarn/install-state.gz +0 -0
- package/README.md +2 -2
- package/RELEASE_NOTES.MD +19 -0
- package/dist/constants/server-settings.constants.js +2 -1
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/controllers/printer-files.controller.js +3 -1
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +8 -4
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/validation/printer-files-controller.validation.js +9 -0
- package/dist/controllers/validation/printer-files-controller.validation.js.map +1 -1
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/handlers/logger-factory.js +2 -2
- package/dist/handlers/logger-factory.js.map +1 -1
- package/dist/handlers/logger.js +9 -151
- package/dist/handlers/logger.js.map +1 -1
- package/dist/handlers/logging/file-logging.transport.js +35 -0
- package/dist/handlers/logging/file-logging.transport.js.map +1 -0
- package/dist/handlers/logging/loki-logging.transport.js +55 -0
- package/dist/handlers/logging/loki-logging.transport.js.map +1 -0
- package/dist/handlers/logging/static.logger.js +134 -0
- package/dist/handlers/logging/static.logger.js.map +1 -0
- package/dist/index.js +13 -0
- package/dist/index.js.map +1 -1
- package/dist/middleware/socketio.middleware.js +11 -3
- package/dist/middleware/socketio.middleware.js.map +1 -1
- package/dist/models/Settings.js +6 -1
- package/dist/models/Settings.js.map +1 -1
- package/dist/server.constants.js +2 -1
- package/dist/server.constants.js.map +1 -1
- package/dist/server.env.js +9 -10
- package/dist/server.env.js.map +1 -1
- package/dist/services/core/github.service.js +1 -1
- package/dist/services/core/github.service.js.map +1 -1
- package/dist/services/moonraker/moonraker-websocket.adapter.js +11 -6
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js +8 -4
- package/dist/services/moonraker/moonraker.client.js.map +1 -1
- package/dist/services/moonraker.api.js +2 -2
- package/dist/services/moonraker.api.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.routes.js +1 -1
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js +9 -9
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/octoprint/utils/octoprint-http-client.builder.js.map +1 -1
- package/dist/services/octoprint.api.js +2 -5
- package/dist/services/octoprint.api.js.map +1 -1
- package/dist/services/prusa-link/prusa-link.api.js +6 -4
- package/dist/services/prusa-link/prusa-link.api.js.map +1 -1
- package/dist/services/validators/settings-service.validation.js +2 -1
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/shared/runtime-settings.migration.js +7 -0
- package/dist/shared/runtime-settings.migration.js.map +1 -1
- package/dist/state/socket-io.gateway.js +1 -1
- package/dist/state/socket-io.gateway.js.map +1 -1
- package/package.json +11 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/moonraker/moonraker.client.ts"],"names":["MoonrakerClient","logger","constructor","loggerFactory","httpClientFactory","eventEmitter2","name","getServerInfo","login","createClient","get","getServerConfig","getTemperatureStore","includeMonitors","getGcodeStore","count","postRolloverLogs","application","post","postRestartServer","postJsonRpc","method","params","id","jsonrpc","getPrinterInfo","postQuickStop","postHostRestart","postFirmwareRestart","getPrinterObjectsList","getPrinterObjectsQuery","query","queryString","convertToQueryString","postSubscribePrinterObjects","connectionId","getPrinterQueryEndstops","postGcodeScript","script","getGcodeHelp","postPrintStart","filename","postPrintPause","postPrintResume","postPrintCancel","getMachineSystemInfo","postMachineShutdown","postMachineReboot","postMachineRestartService","service","postMachineStartService","postMachineProcessStats","getMachineSudoInfo","checkAccess","postMachineSetSudoPassword","password","getMachineListPeripheralsUsb","getMachineListPeripheralsSerial","getMachineListPeripheralsVideo","getMachineListPeripheralsCanbus","canInterface","getServerFilesList","rootFolder","paramString","length","getServerFilesRoots","getServerFileMetadata","getServerFileMetadataScan","getServerFilesThumbnails","getServerFilesDirectoryInfo","path","extended","postServerFilesDirectory","deleteServerFilesDirectory","force","delete","postServerFilesMove","source","dest","postServerFilesCopy","postServerFilesZip","items","store_only","getServerFilesDownload","root","responseType","getServerFilesDownloadChunk","startBytes","endBytes","headers","Range","postServerFileUpload","multerFileOrBuffer","progressToken","checksum","formData","FormData","append","fileBuffer","buffer","originalname","log","filePath","fileStream","createReadStream","result","Promise","resolve","reject","getLength","err","Error","response","b","withMultiPartFormData","withHeaders","getHeaders","toString","withOnUploadProgress","p","emit","uploadProgressEvent","uploadDoneEvent","data","e","uploadFailedEvent","message","JSON","parse","body","ExternalServiceError","error","statusCode","success","stack","deleteServerFile","url","getServerFileKlippyLogDownload","getServerFileMoonrakerLogDownload","postAccessLoginUser","username","postAccessLogoutUser","getAccessUser","postAccessCreateUser","deleteAccessUser","listAccessUsers","postAccessResetPassword","refresh_token","getAccessOneshotToken","getAccessInfo","getAccessApiKey","postAccessApiKeyCreate","getDatabaseNamespaceList","getDatabaseNamespaceItem","namespace","key","postDatabaseNamespaceItem","value","typeHint","typeHintParam","deleteDatabaseNamespaceItem","getJobQueueStatus","postJobQueueJob","filenames","reset","deleteJobQueueJob","jobIds","all","base","join","postJobQueuePause","postJobQueueStart","postJobQueueJump","jobId","getAnnouncementsList","includeDismissed","postAnnouncementsUpdate","postAnnouncementsDismiss","entryId","wakeTime","encodeURIComponent","getAnnouncementsFeeds","postAnnouncementsFeedAdd","deleteAnnouncementsFeedRemove","getWebcamList","getWebcamItem","uid","postWebcamItemUpdate","webcam","deleteWebcamItem","postWebcamTest","getNotifierList","postMachineUpdateStatus","postMachineUpdateRefresh","postMachineUpdateFull","postMachineUpdateMoonraker","postMachineUpdateKlipper","postMachineUpdateClient","postMachineUpdateSystem","postMachineUpdateRecover","hard","postMachineUpdateRollback","getMachineDevicePowerDevices","getMachineDevicePowerDeviceState","device","postMachineDevicePowerDeviceState","action","getMachineDevicePowerBatchDeviceState","devices","postMachineDevicePowerBatchPowerOn","postMachineDevicePowerBatchPowerOff","getMachineWledStrips","getMachineWledStatuses","strips","postMachineWledPowerOn","postMachineWledPowerOff","postMachineWledPowerStripAction","getMachineWledStripAction","strip","controlParams","queryParams","Object","entries","map","k","v","getServerSensorsList","getServerSensorItem","sensor","getServerSensorMeasurements","getServerSensorMeasurementsBatch","getServerSpoolmanStatus","postServerSpoolmanActiveSpool","spoolId","spool_id","getServerSpoolmanActiveSpool","postServerSpoolmanProxyRequest","getApiVersion","getServerVersion","getApiLogin","getApiSettings","getApiJob","getApiPrinter","postApiPrinterCommand","commands","getApiProfiles","getServerHistoryList","limit","start","since","before","order","getServerHistoryTotals","postServerHistoryResetTotals","getServerHistoryJob","deleteServerHistoryJob","reduce","acc","push","buildFluentOptions","baseAddress","printerURL","createAnonymousClient","o","builder","DefaultHttpClientBuilder","createClientWithBaseUrl"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../../src/services/moonraker/moonraker.client.ts"],"names":["MoonrakerClient","logger","constructor","loggerFactory","httpClientFactory","eventEmitter2","settingsStore","name","getServerInfo","login","createClient","get","getServerConfig","getTemperatureStore","includeMonitors","getGcodeStore","count","postRolloverLogs","application","post","postRestartServer","postJsonRpc","method","params","id","jsonrpc","getPrinterInfo","postQuickStop","postHostRestart","postFirmwareRestart","getPrinterObjectsList","getPrinterObjectsQuery","query","queryString","convertToQueryString","postSubscribePrinterObjects","connectionId","getPrinterQueryEndstops","postGcodeScript","script","getGcodeHelp","postPrintStart","filename","postPrintPause","postPrintResume","postPrintCancel","getMachineSystemInfo","postMachineShutdown","postMachineReboot","postMachineRestartService","service","postMachineStartService","postMachineProcessStats","getMachineSudoInfo","checkAccess","postMachineSetSudoPassword","password","getMachineListPeripheralsUsb","getMachineListPeripheralsSerial","getMachineListPeripheralsVideo","getMachineListPeripheralsCanbus","canInterface","getServerFilesList","rootFolder","paramString","length","getServerFilesRoots","getServerFileMetadata","getServerFileMetadataScan","getServerFilesThumbnails","getServerFilesDirectoryInfo","path","extended","postServerFilesDirectory","deleteServerFilesDirectory","force","delete","postServerFilesMove","source","dest","postServerFilesCopy","postServerFilesZip","items","store_only","getServerFilesDownload","root","responseType","getServerFilesDownloadChunk","startBytes","endBytes","headers","Range","postServerFileUpload","multerFileOrBuffer","startPrint","progressToken","checksum","formData","FormData","append","fileBuffer","buffer","originalname","log","filePath","fileStream","createReadStream","result","Promise","resolve","reject","getLength","err","Error","response","b","withMultiPartFormData","withTimeout","getTimeoutSettings","apiUploadTimeout","withHeaders","getHeaders","toString","withOnUploadProgress","p","emit","uploadProgressEvent","uploadDoneEvent","data","e","uploadFailedEvent","message","JSON","parse","body","ExternalServiceError","error","statusCode","success","stack","deleteServerFile","url","getServerFileKlippyLogDownload","getServerFileMoonrakerLogDownload","postAccessLoginUser","username","postAccessLogoutUser","getAccessUser","postAccessCreateUser","deleteAccessUser","listAccessUsers","postAccessResetPassword","refresh_token","getAccessOneshotToken","getAccessInfo","getAccessApiKey","postAccessApiKeyCreate","getDatabaseNamespaceList","getDatabaseNamespaceItem","namespace","key","postDatabaseNamespaceItem","value","typeHint","typeHintParam","deleteDatabaseNamespaceItem","getJobQueueStatus","postJobQueueJob","filenames","reset","deleteJobQueueJob","jobIds","all","base","join","postJobQueuePause","postJobQueueStart","postJobQueueJump","jobId","getAnnouncementsList","includeDismissed","postAnnouncementsUpdate","postAnnouncementsDismiss","entryId","wakeTime","encodeURIComponent","getAnnouncementsFeeds","postAnnouncementsFeedAdd","deleteAnnouncementsFeedRemove","getWebcamList","getWebcamItem","uid","postWebcamItemUpdate","webcam","deleteWebcamItem","postWebcamTest","getNotifierList","postMachineUpdateStatus","postMachineUpdateRefresh","postMachineUpdateFull","postMachineUpdateMoonraker","postMachineUpdateKlipper","postMachineUpdateClient","postMachineUpdateSystem","postMachineUpdateRecover","hard","postMachineUpdateRollback","getMachineDevicePowerDevices","getMachineDevicePowerDeviceState","device","postMachineDevicePowerDeviceState","action","getMachineDevicePowerBatchDeviceState","devices","postMachineDevicePowerBatchPowerOn","postMachineDevicePowerBatchPowerOff","getMachineWledStrips","getMachineWledStatuses","strips","postMachineWledPowerOn","postMachineWledPowerOff","postMachineWledPowerStripAction","getMachineWledStripAction","strip","controlParams","queryParams","Object","entries","map","k","v","getServerSensorsList","getServerSensorItem","sensor","getServerSensorMeasurements","getServerSensorMeasurementsBatch","getServerSpoolmanStatus","postServerSpoolmanActiveSpool","spoolId","spool_id","getServerSpoolmanActiveSpool","postServerSpoolmanProxyRequest","getApiVersion","getServerVersion","getApiLogin","getApiSettings","getApiJob","getApiPrinter","postApiPrinterCommand","commands","getApiProfiles","getServerHistoryList","limit","start","since","before","order","getServerHistoryTotals","postServerHistoryResetTotals","getServerHistoryJob","deleteServerHistoryJob","reduce","acc","push","buildFluentOptions","baseAddress","printerURL","createAnonymousClient","o","builder","DefaultHttpClientBuilder","createClientWithBaseUrl"],"mappings":"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"}
|
|
@@ -116,8 +116,8 @@ class MoonrakerApi {
|
|
|
116
116
|
async getFileChunk(path, startBytes, endBytes) {
|
|
117
117
|
return await this.client.getServerFilesDownloadChunk(this.login, "gcodes", path, startBytes, endBytes);
|
|
118
118
|
}
|
|
119
|
-
async uploadFile(fileOrBuffer, uploadToken) {
|
|
120
|
-
await this.client.postServerFileUpload(this.login, fileOrBuffer, uploadToken);
|
|
119
|
+
async uploadFile(fileOrBuffer, startPrint, uploadToken) {
|
|
120
|
+
await this.client.postServerFileUpload(this.login, fileOrBuffer, startPrint, uploadToken);
|
|
121
121
|
}
|
|
122
122
|
async deleteFile(path) {
|
|
123
123
|
await this.client.deleteServerFile(this.login, "gcodes", path);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/moonraker.api.ts"],"names":["MoonrakerApi","client","constructor","moonrakerClient","printerLogin","type","MoonrakerType","login","getVersion","result","getApiVersion","data","server","connect","NotImplementedException","disconnect","restartServer","postRestartServer","restartHost","postHostRestart","restartPrinterFirmware","postFirmwareRestart","startPrint","filename","postPrintStart","pausePrint","postPrintPause","resumePrint","postPrintResume","cancelPrint","postPrintCancel","sendGcode","script","postGcodeScript","quickStop","postQuickStop","movePrintHead","amounts","setSpeed","speed","g1CommandAxes","Number","isNaN","x","y","z","getFile","path","metadata","getServerFileMetadata","file","size","date","modified","getFiles","files","getServerFilesList","map","f","homeAxes","axes","homeCommand","downloadFile","getServerFilesDownload","getFileChunk","startBytes","endBytes","getServerFilesDownloadChunk","uploadFile","fileOrBuffer","uploadToken","postServerFileUpload","deleteFile","deleteServerFile","deleteFolder","deleteServerFilesDirectory","getSettings","getServerConfig","getReprintState","response","getPrinterObjectsQuery","print_stats","webhooks","operational","status","state","response2","getServerHistoryList","jobs","sort","a","b","start_time","length","connectionState","reprintState","ReprintState","NoLastPrint","job","LastPrintReady"],"mappings":"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
|
|
1
|
+
{"version":3,"sources":["../../src/services/moonraker.api.ts"],"names":["MoonrakerApi","client","constructor","moonrakerClient","printerLogin","type","MoonrakerType","login","getVersion","result","getApiVersion","data","server","connect","NotImplementedException","disconnect","restartServer","postRestartServer","restartHost","postHostRestart","restartPrinterFirmware","postFirmwareRestart","startPrint","filename","postPrintStart","pausePrint","postPrintPause","resumePrint","postPrintResume","cancelPrint","postPrintCancel","sendGcode","script","postGcodeScript","quickStop","postQuickStop","movePrintHead","amounts","setSpeed","speed","g1CommandAxes","Number","isNaN","x","y","z","getFile","path","metadata","getServerFileMetadata","file","size","date","modified","getFiles","files","getServerFilesList","map","f","homeAxes","axes","homeCommand","downloadFile","getServerFilesDownload","getFileChunk","startBytes","endBytes","getServerFilesDownloadChunk","uploadFile","fileOrBuffer","uploadToken","postServerFileUpload","deleteFile","deleteServerFile","deleteFolder","deleteServerFilesDirectory","getSettings","getServerConfig","getReprintState","response","getPrinterObjectsQuery","print_stats","webhooks","operational","status","state","response2","getServerHistoryList","jobs","sort","a","b","start_time","length","connectionState","reprintState","ReprintState","NoLastPrint","job","LastPrintReady"],"mappings":";;;;+BAmBaA;;;eAAAA;;;qCAZN;mCAGiC;AASjC,MAAMA;;IACMC,OAAwB;IAEzCC,YACEC,eAAgC,EAChC,AAAQC,YAAsB,CAC9B;aADQA,eAAAA;QAER,IAAI,CAACH,MAAM,GAAGE;IAChB;IAEA,IAAIE,OAAoB;QACtB,OAAOC,kCAAa;IACtB;IAMA,IAAIC,MAAMA,KAAe,EAAE;QACzB,IAAI,CAACH,YAAY,GAAGG;IACtB;IAEA,IAAIA,QAAQ;QACV,OAAO,IAAI,CAACH,YAAY;IAC1B;IAEA,MAAMI,aAAa;QACjB,MAAMC,SAAS,MAAM,IAAI,CAACR,MAAM,CAACS,aAAa,CAAC,IAAI,CAACH,KAAK;QACzD,OAAOE,OAAOE,IAAI,EAAEC;IACtB;IAEA,MAAMC,UAAU;QAEd,MAAM,IAAIC,0CAAuB;IACnC;IAEA,MAAMC,aAAa;QAEjB,MAAM,IAAID,0CAAuB;IACnC;IAEA,MAAME,gBAAgB;QACpB,MAAM,IAAI,CAACf,MAAM,CAACgB,iBAAiB,CAAC,IAAI,CAACV,KAAK;IAChD;IAEA,MAAMW,cAAc;QAClB,MAAM,IAAI,CAACjB,MAAM,CAACkB,eAAe,CAAC,IAAI,CAACZ,KAAK;IAC9C;IAEA,MAAMa,yBAAyB;QAC7B,MAAM,IAAI,CAACnB,MAAM,CAACoB,mBAAmB,CAAC,IAAI,CAACd,KAAK;IAClD;IAEA,MAAMe,WAAWC,QAAgB,EAAE;QACjC,MAAM,IAAI,CAACtB,MAAM,CAACuB,cAAc,CAAC,IAAI,CAACjB,KAAK,EAAEgB;IAC/C;IAEA,MAAME,aAA4B;QAChC,MAAM,IAAI,CAACxB,MAAM,CAACyB,cAAc,CAAC,IAAI,CAACnB,KAAK;IAC7C;IAEA,MAAMoB,cAA6B;QACjC,MAAM,IAAI,CAAC1B,MAAM,CAAC2B,eAAe,CAAC,IAAI,CAACrB,KAAK;IAC9C;IAEA,MAAMsB,cAA6B;QACjC,MAAM,IAAI,CAAC5B,MAAM,CAAC6B,eAAe,CAAC,IAAI,CAACvB,KAAK;IAC9C;IAEA,MAAMwB,UAAUC,MAAc,EAAiB;QAC7C,MAAM,IAAI,CAAC/B,MAAM,CAACgC,eAAe,CAAC,IAAI,CAAC1B,KAAK,EAAEyB;IAChD;IAEA,MAAME,YAA2B;QAC/B,MAAM,IAAI,CAACjC,MAAM,CAACkC,aAAa,CAAC,IAAI,CAAC5B,KAAK;IAC5C;IAEA,MAAM6B,cAAcC,OAA+D,EAAE;QAGnF,MAAMC,WAAW,CAAC,CAACD,QAAQE,KAAK,GAAGF,QAAQE,KAAK,GAAG;QACnD,IAAIC,gBAAgB;QACpB,IAAI,CAACC,OAAOC,KAAK,CAACL,QAAQM,CAAC,GAAG;YAC5BH,iBAAiB,CAAC,EAAE,EAAEH,QAAQM,CAAC,EAAE;QACnC;QACA,IAAI,CAACF,OAAOC,KAAK,CAACL,QAAQO,CAAC,GAAG;YAC5BJ,iBAAiB,CAAC,EAAE,EAAEH,QAAQO,CAAC,EAAE;QACnC;QACA,IAAI,CAACH,OAAOC,KAAK,CAACL,QAAQQ,CAAC,GAAG;YAC5BL,iBAAiB,CAAC,EAAE,EAAEH,QAAQQ,CAAC,EAAE;QACnC;QAEA,MAAM,IAAI,CAAC5C,MAAM,CAACgC,eAAe,CAC/B,IAAI,CAAC1B,KAAK,EACV,CAAC;;SAEE,EAAEiC,cAAc,EAAE,EAAEF,SAAS;SAC7B,CAAC;IAER;IAEA,MAAMQ,QAAQC,IAAY,EAAoB;QAC5C,MAAMC,WAAW,MAAM,IAAI,CAAC/C,MAAM,CAACgD,qBAAqB,CAAC,IAAI,CAAC1C,KAAK,EAAEwC;QACrE,MAAMG,OAAOF,SAASrC,IAAI,CAACF,MAAM;QACjC,OAAO;YAAE0C,MAAMD,KAAKC,IAAI;YAAEJ;YAAMK,MAAMF,KAAKG,QAAQ;QAAC;IACtD;IAEA,MAAMC,WAA+B;QACnC,MAAMC,QAAQ,MAAM,IAAI,CAACtD,MAAM,CAACuD,kBAAkB,CAAC,IAAI,CAACjD,KAAK;QAC7D,OAAOgD,MAAM5C,IAAI,CAACF,MAAM,CAACgD,GAAG,CAAC,CAACC,IAAO,CAAA;gBAAEP,MAAMO,EAAEP,IAAI;gBAAEJ,MAAMW,EAAEX,IAAI;gBAAEK,MAAMM,EAAEL,QAAQ;YAAC,CAAA;IACtF;IAEA,MAAMM,SAASC,IAA+C,EAAiB;QAE7E,IAAIC,cAAc,CAAC,GAAG,CAAC;QACvB,IAAI,CAAC,CAACD,KAAKjB,CAAC,EAAE;YACZkB,eAAe,CAAC,EAAE,CAAC;QACrB;QACA,IAAI,CAAC,CAACD,KAAKhB,CAAC,EAAE;YACZiB,eAAe,CAAC,EAAE,CAAC;QACrB;QACA,IAAI,CAAC,CAACD,KAAKf,CAAC,EAAE;YACZgB,eAAe,CAAC,EAAE,CAAC;QACrB;QAEA,MAAM,IAAI,CAAC5D,MAAM,CAACgC,eAAe,CAAC,IAAI,CAAC1B,KAAK,EAAEsD;IAChD;IAEA,MAAMC,aAAaf,IAAY,EAAuC;QACpE,OAAO,MAAM,IAAI,CAAC9C,MAAM,CAAC8D,sBAAsB,CAAC,IAAI,CAACxD,KAAK,EAAE,UAAUwC;IACxE;IAEA,MAAMiB,aAAajB,IAAY,EAAEkB,UAAkB,EAAEC,QAAgB,EAAwB;QAC3F,OAAO,MAAM,IAAI,CAACjE,MAAM,CAACkE,2BAA2B,CAAC,IAAI,CAAC5D,KAAK,EAAE,UAAUwC,MAAMkB,YAAYC;IAC/F;IAEA,MAAME,WAAWC,YAA0C,EAAE/C,UAAmB,EAAEgD,WAAoB,EAAE;QACtG,MAAM,IAAI,CAACrE,MAAM,CAACsE,oBAAoB,CAAC,IAAI,CAAChE,KAAK,EAAE8D,cAAc/C,YAAYgD;IAC/E;IAEA,MAAME,WAAWzB,IAAY,EAAE;QAC7B,MAAM,IAAI,CAAC9C,MAAM,CAACwE,gBAAgB,CAAC,IAAI,CAAClE,KAAK,EAAE,UAAUwC;IAC3D;IAEA,MAAM2B,aAAa3B,IAAY,EAAE;QAC/B,MAAM,IAAI,CAAC9C,MAAM,CAAC0E,0BAA0B,CAAC,IAAI,CAACpE,KAAK,EAAEwC,MAAM;IACjE;IAEA,MAAM6B,cAAc;QAClB,MAAMnE,SAAS,MAAM,IAAI,CAACR,MAAM,CAAC4E,eAAe,CAAC,IAAI,CAACtE,KAAK;QAC3D,OAAOE,OAAOE,IAAI,EAAEF;IACtB;IAEA,MAAMqE,kBAAkD;QACtD,MAAMC,WAAW,MAAM,IAAI,CAAC9E,MAAM,CAAC+E,sBAAsB,CAEvD,IAAI,CAACzE,KAAK,EAAE;YACZ0E,aAAa,EAAE;YACfC,UAAU,EAAE;QACd;QAEA,MAAMzE,SAASsE,SAASpE,IAAI,CAACF,MAAM;QACnC,MAAM0E,cAAc1E,OAAO2E,MAAM,CAACF,QAAQ,CAACG,KAAK,KAAK;QAErD,MAAMC,YAAY,MAAM,IAAI,CAACrF,MAAM,CAACsF,oBAAoB,CAAC,IAAI,CAAChF,KAAK,EAAE,GAAG;QACxE,MAAMiF,OAAO,AAACF,CAAAA,UAAU3E,IAAI,EAAEF,OAAO+E,QAAQ,EAAE,AAAD,EAAGC,IAAI,CAAC,CAACC,GAAGC,IAAOD,EAAEE,UAAU,GAAGD,EAAEC,UAAU,GAAG,IAAI;QAEnG,IAAIJ,KAAKK,MAAM,KAAK,KAAK,CAACV,aAAa;YACrC,OAAO;gBACLW,iBAAiBX,cAAc,gBAAgB;gBAC/CY,cAAcC,iCAAY,CAACC,WAAW;YACxC;QACF;QAEA,MAAMC,MAAMV,IAAI,CAAC,EAAE;QACnB,OAAO;YACLM,iBAAiB;YACjBC,cAAcC,iCAAY,CAACG,cAAc;YACzCjD,MAAM;gBACJE,MAAM8C,IAAIN,UAAU;gBACpB7C,MAAMmD,IAAI3E,QAAQ;gBAClB4B,MAAM+C,IAAIlD,QAAQ,CAACG,IAAI;YACzB;QACF;IACF;AACF"}
|
|
@@ -29,7 +29,7 @@ class OctoprintRoutes {
|
|
|
29
29
|
apiSystemCommands = `${this.apiSystem}/commands`;
|
|
30
30
|
apiServerRestartCommand = `${this.apiSystemCommands}/core/restart`;
|
|
31
31
|
apiUsers = `${this.apiBase}/users`;
|
|
32
|
-
apiLogin = `${this.apiBase}/login
|
|
32
|
+
apiLogin = `${this.apiBase}/login`;
|
|
33
33
|
get disconnectCommand() {
|
|
34
34
|
return {
|
|
35
35
|
command: "disconnect"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.routes.ts"],"names":["OctoprintRoutes","octoPrintBase","apiBase","apiVersion","apiServer","apiCurrentUser","apiSettingsPart","apiFiles","apiFilesLocal","apiConnection","apiJob","apiPrinter","apiPrinterHead","apiPrinterBed","apiPrinterCustomCommand","apiPrinterProfiles","apiSystem","apiSystemInfo","apiSystemCommands","apiServerRestartCommand","apiUsers","apiLogin","disconnectCommand","command","cancelJobCommand","pauseJobCommand","action","resumeJobCommand","connectCommand","getBedTargetCommand","targetTemperature","target","apiPrinterCurrent","history","limit","exclude","filter","e","length","excludeParam","join","limitParam","apiFile","path","downloadFileLocal","apiGetFiles","recursive","selectCommand","print","moveFileCommand","destination","printerNameSetting","name","appearance","gcodeAnalysisSetting","enabled","gcodeAnalysis","runAt"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA;IACXC,gBAAgB,IAAI;IACpBC,UAAU,GAAG,IAAI,CAACD,aAAa,CAAC,GAAG,CAAC,CAAC;IACrCE,aAAa,GAAG,IAAI,CAACD,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvCE,YAAY,GAAG,IAAI,CAACF,OAAO,CAAC,OAAO,CAAC,CAAC;IACrCG,iBAAiB,GAAG,IAAI,CAACH,OAAO,CAAC,YAAY,CAAC,CAAC;IAC/CI,kBAAkB,GAAG,IAAI,CAACJ,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7CK,WAAW,GAAG,IAAI,CAACL,OAAO,CAAC,MAAM,CAAC,CAAC;IACnCM,gBAAgB,GAAG,IAAI,CAACD,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzCE,gBAAgB,GAAG,IAAI,CAACP,OAAO,CAAC,WAAW,CAAC,CAAC;IAC7CQ,SAAS,GAAG,IAAI,CAACR,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/BS,aAAa,GAAG,IAAI,CAACT,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvCU,iBAAiB,GAAG,IAAI,CAACV,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACrDW,gBAAgB,GAAG,IAAI,CAACF,UAAU,CAAC,IAAI,CAAC,CAAC;IACzCG,0BAA0B,GAAG,IAAI,CAACH,UAAU,CAAC,QAAQ,CAAC,CAAC;IACvDI,qBAAqB,GAAG,IAAI,CAACb,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACvDc,YAAY,GAAG,IAAI,CAACd,OAAO,CAAC,OAAO,CAAC,CAAC;IACrCe,gBAAgB,GAAG,IAAI,CAACD,SAAS,CAAC,KAAK,CAAC,CAAC;IACzCE,oBAAoB,GAAG,IAAI,CAACF,SAAS,CAAC,SAAS,CAAC,CAAC;IACjDG,0BAA0B,GAAG,IAAI,CAACD,iBAAiB,CAAC,aAAa,CAAC,CAAC;IACnEE,WAAW,GAAG,IAAI,CAAClB,OAAO,CAAC,MAAM,CAAC,CAAC;IACnCmB,WAAW,GAAG,IAAI,CAACnB,OAAO,CAAC,
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.routes.ts"],"names":["OctoprintRoutes","octoPrintBase","apiBase","apiVersion","apiServer","apiCurrentUser","apiSettingsPart","apiFiles","apiFilesLocal","apiConnection","apiJob","apiPrinter","apiPrinterHead","apiPrinterBed","apiPrinterCustomCommand","apiPrinterProfiles","apiSystem","apiSystemInfo","apiSystemCommands","apiServerRestartCommand","apiUsers","apiLogin","disconnectCommand","command","cancelJobCommand","pauseJobCommand","action","resumeJobCommand","connectCommand","getBedTargetCommand","targetTemperature","target","apiPrinterCurrent","history","limit","exclude","filter","e","length","excludeParam","join","limitParam","apiFile","path","downloadFileLocal","apiGetFiles","recursive","selectCommand","print","moveFileCommand","destination","printerNameSetting","name","appearance","gcodeAnalysisSetting","enabled","gcodeAnalysis","runAt"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA;IACXC,gBAAgB,IAAI;IACpBC,UAAU,GAAG,IAAI,CAACD,aAAa,CAAC,GAAG,CAAC,CAAC;IACrCE,aAAa,GAAG,IAAI,CAACD,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvCE,YAAY,GAAG,IAAI,CAACF,OAAO,CAAC,OAAO,CAAC,CAAC;IACrCG,iBAAiB,GAAG,IAAI,CAACH,OAAO,CAAC,YAAY,CAAC,CAAC;IAC/CI,kBAAkB,GAAG,IAAI,CAACJ,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7CK,WAAW,GAAG,IAAI,CAACL,OAAO,CAAC,MAAM,CAAC,CAAC;IACnCM,gBAAgB,GAAG,IAAI,CAACD,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzCE,gBAAgB,GAAG,IAAI,CAACP,OAAO,CAAC,WAAW,CAAC,CAAC;IAC7CQ,SAAS,GAAG,IAAI,CAACR,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/BS,aAAa,GAAG,IAAI,CAACT,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvCU,iBAAiB,GAAG,IAAI,CAACV,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACrDW,gBAAgB,GAAG,IAAI,CAACF,UAAU,CAAC,IAAI,CAAC,CAAC;IACzCG,0BAA0B,GAAG,IAAI,CAACH,UAAU,CAAC,QAAQ,CAAC,CAAC;IACvDI,qBAAqB,GAAG,IAAI,CAACb,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACvDc,YAAY,GAAG,IAAI,CAACd,OAAO,CAAC,OAAO,CAAC,CAAC;IACrCe,gBAAgB,GAAG,IAAI,CAACD,SAAS,CAAC,KAAK,CAAC,CAAC;IACzCE,oBAAoB,GAAG,IAAI,CAACF,SAAS,CAAC,SAAS,CAAC,CAAC;IACjDG,0BAA0B,GAAG,IAAI,CAACD,iBAAiB,CAAC,aAAa,CAAC,CAAC;IACnEE,WAAW,GAAG,IAAI,CAAClB,OAAO,CAAC,MAAM,CAAC,CAAC;IACnCmB,WAAW,GAAG,IAAI,CAACnB,OAAO,CAAC,MAAM,CAAC,CAAC;IAEnC,IAAIoB,oBAAoB;QACtB,OAAO;YAAEC,SAAS;QAAa;IACjC;IAEA,IAAIC,mBAAmB;QACrB,OAAO;YAAED,SAAS;QAAS;IAC7B;IAEA,IAAIE,kBAAkB;QACpB,OAAO;YAAEF,SAAS;YAASG,QAAQ;QAAQ;IAC7C;IAEA,IAAIC,mBAAmB;QACrB,OAAO;YAAEJ,SAAS;YAASG,QAAQ;QAAS;IAC9C;IAEA,IAAIE,iBAAiB;QACnB,OAAO;YAAEL,SAAS;QAAU;IAC9B;IAEAM,oBAAoBC,iBAAyB,EAAE;QAC7C,OAAO;YAAEP,SAAS;YAAUQ,QAAQD;QAAkB;IACxD;IAEAE,oBAAoB,CAACC,SAAmBC,OAAgBC;QACtDA,UAAUA,SAASC,OAAO,CAACC,IAAM,CAAC,CAACA,EAAEC,MAAM;QAC3C,MAAMC,eAAeJ,SAASG,SAAS,CAAC,SAAS,EAAEH,SAASK,KAAK,MAAM,GAAG;QAC1E,MAAMC,aAAa,CAAC,CAACP,QAAQ,CAAC,OAAO,EAAEA,OAAO,GAAG;QACjD,OAAO,GAAG,IAAI,CAACvB,UAAU,CAAC,SAAS,EAAE,CAAC,CAACsB,UAAUQ,aAAaF,cAAc;IAC9E,EAAE;IAEFG,UAAU,CAACC,OAAiB,GAAG,IAAI,CAACnC,aAAa,CAAC,CAAC,EAAEmC,MAAM,CAAC;IAE5DC,oBAAoB,CAACD,OAAiB,GAAG,IAAI,CAAC1C,aAAa,CAAC,sBAAsB,EAAE0C,MAAM,CAAC;IAE3FE,cAAc,CAACC,YAAY,KAAK,GAAK,GAAG,IAAI,CAACvC,QAAQ,CAAC,iBAAiB,EAAEuC,WAAW,CAAC;IAErFC,cAAcC,QAAQ,KAAK,EAAE;QAC3B,OAAO;YAAEzB,SAAS;YAAUyB;QAAM;IACpC;IAEAC,gBAAgBC,WAAmB,EAAE;QACnC,OAAO;YAAE3B,SAAS;YAAQ2B;QAAY;IACxC;IAEAC,mBAAmBC,IAAY,EAAE;QAC/B,OAAO;YACLC,YAAY;gBACVD,MAAMA;YACR;QACF;IACF;IAEAE,qBAAqBC,OAAgB,EAAE;QACrC,OAAO;YACLC,eAAe;gBACbC,OAAOF,UAAU,SAAS;YAC5B;QACF;IACF;AACF"}
|
|
@@ -23,9 +23,10 @@ function _interop_require_default(obj) {
|
|
|
23
23
|
class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
|
|
24
24
|
httpClientFactory;
|
|
25
25
|
eventEmitter2;
|
|
26
|
+
settingsStore;
|
|
26
27
|
logger;
|
|
27
|
-
constructor(loggerFactory, httpClientFactory, eventEmitter2){
|
|
28
|
-
super(), this.httpClientFactory = httpClientFactory, this.eventEmitter2 = eventEmitter2;
|
|
28
|
+
constructor(loggerFactory, httpClientFactory, eventEmitter2, settingsStore){
|
|
29
|
+
super(), this.httpClientFactory = httpClientFactory, this.eventEmitter2 = eventEmitter2, this.settingsStore = settingsStore;
|
|
29
30
|
this.logger = loggerFactory(OctoprintClient.name);
|
|
30
31
|
}
|
|
31
32
|
async getApiVersion(login) {
|
|
@@ -35,7 +36,9 @@ class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
|
|
|
35
36
|
return await this.createClient(login).get(this.apiServer);
|
|
36
37
|
}
|
|
37
38
|
async login(login) {
|
|
38
|
-
return await this.createClient(login).post(this.apiLogin
|
|
39
|
+
return await this.createClient(login).post(this.apiLogin, {
|
|
40
|
+
passive: true
|
|
41
|
+
});
|
|
39
42
|
}
|
|
40
43
|
async sendConnectionCommand(login, commandData) {
|
|
41
44
|
await this.createClient(login).post(this.apiConnection, commandData);
|
|
@@ -150,13 +153,10 @@ class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
|
|
|
150
153
|
const command = this.selectCommand(print);
|
|
151
154
|
await this.createClient(login).post(this.apiFile(path), command);
|
|
152
155
|
}
|
|
153
|
-
async uploadFileAsMultiPart(login, multerFileOrBuffer,
|
|
156
|
+
async uploadFileAsMultiPart(login, multerFileOrBuffer, startPrint, progressToken) {
|
|
154
157
|
const urlPath = this.apiFilesLocal;
|
|
155
158
|
const formData = new _formdata.default();
|
|
156
|
-
if (
|
|
157
|
-
formData.append("select", "true");
|
|
158
|
-
}
|
|
159
|
-
if (commands.print) {
|
|
159
|
+
if (startPrint) {
|
|
160
160
|
formData.append("print", "true");
|
|
161
161
|
}
|
|
162
162
|
let fileBuffer = multerFileOrBuffer.buffer;
|
|
@@ -181,7 +181,7 @@ class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
|
|
|
181
181
|
});
|
|
182
182
|
});
|
|
183
183
|
try {
|
|
184
|
-
const response = await this.createClient(login, (builder)=>builder.withMultiPartFormData().withHeaders({
|
|
184
|
+
const response = await this.createClient(login, (builder)=>builder.withMultiPartFormData().withTimeout(this.settingsStore.getTimeoutSettings().apiUploadTimeout).withHeaders({
|
|
185
185
|
...formData.getHeaders(),
|
|
186
186
|
"Content-Length": result.toString()
|
|
187
187
|
}).withOnUploadProgress((p)=>{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/octoprint.client.ts"],"names":["OctoprintClient","OctoprintRoutes","logger","constructor","loggerFactory","httpClientFactory","eventEmitter2","name","getApiVersion","login","createClient","get","apiVersion","getServer","apiServer","post","apiLogin","sendConnectionCommand","commandData","apiConnection","sendPrintHeadJogCommand","amounts","axesToHome","x","y","z","command","sendPrintHeadCommand","sendPrintHeadHomeCommand","axes","apiPrinterHead","sendCustomGCodeCommand","commandString","apiPrinterCustomCommand","getJob","apiJob","sendJobCommand","sendBedTempCommand","targetTemp","data","getBedTargetCommand","apiPrinterBed","getSettings","apiSettingsPart","updatePrinterNameSetting","printerName","settingPatch","printerNameSetting","setGCodeAnalysis","enabled","gcodeAnalysisSetting","getCurrentUser","apiCurrentUser","getAdminUserOrDefault","currentUserResponse","getUsers","apiUsers","getLocalFiles","recursive","response","apiGetFiles","files","filter","f","date","type","map","normalizePrinterFile","getFile","path","urlPath","apiFile","downloadFile","downloadFileLocal","responseType","getFileChunk","filePath","startBytes","endBytes","pathUrl","o","withHeaders","Range","createFolder","foldername","formData","FormData","append","headers","getHeaders","getLengthSync","toString","apiFilesLocal","moveFileOrFolder","destination","moveFileCommand","postSelectPrintFile","print","selectCommand","uploadFileAsMultiPart","multerFileOrBuffer","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/octoprint.client.ts"],"names":["OctoprintClient","OctoprintRoutes","logger","constructor","loggerFactory","httpClientFactory","eventEmitter2","settingsStore","name","getApiVersion","login","createClient","get","apiVersion","getServer","apiServer","post","apiLogin","passive","sendConnectionCommand","commandData","apiConnection","sendPrintHeadJogCommand","amounts","axesToHome","x","y","z","command","sendPrintHeadCommand","sendPrintHeadHomeCommand","axes","apiPrinterHead","sendCustomGCodeCommand","commandString","apiPrinterCustomCommand","getJob","apiJob","sendJobCommand","sendBedTempCommand","targetTemp","data","getBedTargetCommand","apiPrinterBed","getSettings","apiSettingsPart","updatePrinterNameSetting","printerName","settingPatch","printerNameSetting","setGCodeAnalysis","enabled","gcodeAnalysisSetting","getCurrentUser","apiCurrentUser","getAdminUserOrDefault","currentUserResponse","getUsers","apiUsers","getLocalFiles","recursive","response","apiGetFiles","files","filter","f","date","type","map","normalizePrinterFile","getFile","path","urlPath","apiFile","downloadFile","downloadFileLocal","responseType","getFileChunk","filePath","startBytes","endBytes","pathUrl","o","withHeaders","Range","createFolder","foldername","formData","FormData","append","headers","getHeaders","getLengthSync","toString","apiFilesLocal","moveFileOrFolder","destination","moveFileCommand","postSelectPrintFile","print","selectCommand","uploadFileAsMultiPart","multerFileOrBuffer","startPrint","progressToken","fileBuffer","buffer","filename","originalname","log","fileStream","createReadStream","result","Promise","resolve","reject","getLength","err","length","Error","builder","withMultiPartFormData","withTimeout","getTimeoutSettings","apiUploadTimeout","withOnUploadProgress","p","emit","uploadProgressEvent","uploadDoneEvent","e","uploadFailedEvent","message","JSON","parse","body","ExternalServiceError","error","statusCode","success","stack","deleteFileOrFolder","delete","getPrinterCurrent","history","limit","exclude","apiPrinterCurrent","getConnection","getPrinterProfiles","apiPrinterProfiles","getSystemInfo","apiSystemInfo","getSystemCommands","apiSystemCommands","postServerRestartCommand","apiServerRestartCommand","buildFluentOptions","baseAddress","printerURL","createAnonymousClient","withXApiKeyHeader","apiKey","OctoprintHttpClientBuilder","createClientWithBaseUrl","b"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/services/octoprint/utils/octoprint-http-client.builder.ts"],"names":["OctoprintHttpClientBuilder","DefaultHttpClientBuilder","build","axiosOptions","baseURL","Error","withXApiKeyHeader","apiKey","length","withHeaders","apiKeyHeaderKey"],"mappings":";;;;+BAIaA;;;eAAAA;;;0CAJ4B;2CACT;AAGzB,MAAMA,mCAAmCC,kDAAwB;IACtDC,QAAgC;QAC9C,IAAI,CAAC,IAAI,CAACC,YAAY,CAACC,OAAO,EAAE;YAC9B,MAAM,IAAIC,MAAM;QAClB;QAEA,OAAO,KAAK,CAACH;IACf;IAEOI,kBAAkBC,MAAe,
|
|
1
|
+
{"version":3,"sources":["../../../../src/services/octoprint/utils/octoprint-http-client.builder.ts"],"names":["OctoprintHttpClientBuilder","DefaultHttpClientBuilder","build","axiosOptions","baseURL","Error","withXApiKeyHeader","apiKey","length","withHeaders","apiKeyHeaderKey"],"mappings":";;;;+BAIaA;;;eAAAA;;;0CAJ4B;2CACT;AAGzB,MAAMA,mCAAmCC,kDAAwB;IACtDC,QAAgC;QAC9C,IAAI,CAAC,IAAI,CAACC,YAAY,CAACC,OAAO,EAAE;YAC9B,MAAM,IAAIC,MAAM;QAClB;QAEA,OAAO,KAAK,CAACH;IACf;IAEOI,kBAAkBC,MAAe,EAAQ;QAC9C,IAAI,CAACA,QAAQC,QAAQ;YACnB,MAAM,IAAIH,MAAM;QAClB;QAEA,IAAI,CAACI,WAAW,CAAC;YAAE,CAACC,0CAAe,CAAC,EAAEH;QAAO;QAE7C,OAAO,IAAI;IACb;AACF"}
|
|
@@ -86,11 +86,8 @@ class OctoprintApi {
|
|
|
86
86
|
async getFileChunk(path, startBytes, endBytes) {
|
|
87
87
|
return await this.client.getFileChunk(this.login, path, startBytes, endBytes);
|
|
88
88
|
}
|
|
89
|
-
async uploadFile(fileOrBuffer, uploadToken) {
|
|
90
|
-
await this.client.uploadFileAsMultiPart(this.login, fileOrBuffer,
|
|
91
|
-
select: true,
|
|
92
|
-
print: true
|
|
93
|
-
}, uploadToken);
|
|
89
|
+
async uploadFile(fileOrBuffer, startPrint, uploadToken) {
|
|
90
|
+
await this.client.uploadFileAsMultiPart(this.login, fileOrBuffer, startPrint, uploadToken);
|
|
94
91
|
}
|
|
95
92
|
async deleteFile(path) {
|
|
96
93
|
await this.client.deleteFileOrFolder(this.login, path);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/octoprint.api.ts"],"names":["OctoprintApi","client","constructor","octoprintClient","printerLogin","type","OctoprintType","login","getVersion","result","getApiVersion","data","server","connect","sendConnectionCommand","connectCommand","disconnect","disconnectCommand","restartServer","postServerRestartCommand","restartHost","NotImplementedException","restartPrinterFirmware","startPrint","filePath","postSelectPrintFile","pausePrint","sendJobCommand","pauseJobCommand","resumePrint","resumeJobCommand","cancelPrint","cancelJobCommand","sendGcode","script","sendCustomGCodeCommand","quickStop","movePrintHead","amounts","sendPrintHeadJogCommand","homeAxes","axes","sendPrintHeadHomeCommand","getFile","path","getFiles","files","getLocalFiles","map","f","size","date","downloadFile","getFileChunk","startBytes","endBytes","uploadFile","fileOrBuffer","uploadToken","uploadFileAsMultiPart","
|
|
1
|
+
{"version":3,"sources":["../../src/services/octoprint.api.ts"],"names":["OctoprintApi","client","constructor","octoprintClient","printerLogin","type","OctoprintType","login","getVersion","result","getApiVersion","data","server","connect","sendConnectionCommand","connectCommand","disconnect","disconnectCommand","restartServer","postServerRestartCommand","restartHost","NotImplementedException","restartPrinterFirmware","startPrint","filePath","postSelectPrintFile","pausePrint","sendJobCommand","pauseJobCommand","resumePrint","resumeJobCommand","cancelPrint","cancelJobCommand","sendGcode","script","sendCustomGCodeCommand","quickStop","movePrintHead","amounts","sendPrintHeadJogCommand","homeAxes","axes","sendPrintHeadHomeCommand","getFile","path","getFiles","files","getLocalFiles","map","f","size","date","downloadFile","getFileChunk","startBytes","endBytes","uploadFile","fileOrBuffer","uploadToken","uploadFileAsMultiPart","deleteFile","deleteFileOrFolder","deleteFolder","getSettings","response","getReprintState","connectedResponse","getConnection","connectionState","current","state","selectedJobResponse","getJob","selectedJob","currentJobFile","job","file","reprintState","ReprintState","NoLastPrint","LastPrintReady"],"mappings":"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"}
|
|
@@ -19,12 +19,14 @@ const defaultLog = {
|
|
|
19
19
|
class PrusaLinkApi {
|
|
20
20
|
eventEmitter2;
|
|
21
21
|
httpClientFactory;
|
|
22
|
+
settingsStore;
|
|
22
23
|
printerLogin;
|
|
23
24
|
logger;
|
|
24
25
|
authHeader;
|
|
25
|
-
constructor(loggerFactory, eventEmitter2, httpClientFactory, printerLogin){
|
|
26
|
+
constructor(loggerFactory, eventEmitter2, httpClientFactory, settingsStore, printerLogin){
|
|
26
27
|
this.eventEmitter2 = eventEmitter2;
|
|
27
28
|
this.httpClientFactory = httpClientFactory;
|
|
29
|
+
this.settingsStore = settingsStore;
|
|
28
30
|
this.printerLogin = printerLogin;
|
|
29
31
|
this.authHeader = null;
|
|
30
32
|
this.logger = loggerFactory(PrusaLinkApi.name);
|
|
@@ -139,7 +141,7 @@ class PrusaLinkApi {
|
|
|
139
141
|
Range: `bytes=${startBytes}-${endBytes}`
|
|
140
142
|
})).get(pathUrl);
|
|
141
143
|
}
|
|
142
|
-
async uploadFile(multerFileOrBuffer, progressToken) {
|
|
144
|
+
async uploadFile(multerFileOrBuffer, startPrint, progressToken) {
|
|
143
145
|
try {
|
|
144
146
|
let fileBuffer;
|
|
145
147
|
const filename = multerFileOrBuffer.originalname;
|
|
@@ -156,8 +158,8 @@ class PrusaLinkApi {
|
|
|
156
158
|
b.withHeaders({
|
|
157
159
|
"Content-Length": contentLength.toString(),
|
|
158
160
|
"Overwrite": "?1",
|
|
159
|
-
"Print-After-Upload": "?1"
|
|
160
|
-
}).withOnUploadProgress((p)=>{
|
|
161
|
+
"Print-After-Upload": startPrint ? "?1" : "?0"
|
|
162
|
+
}).withTimeout(this.settingsStore.getTimeoutSettings().apiUploadTimeout).withOnUploadProgress((p)=>{
|
|
161
163
|
if (progressToken) {
|
|
162
164
|
this.eventEmitter2.emit(`${(0, _eventconstants.uploadProgressEvent)(progressToken)}`, progressToken, p);
|
|
163
165
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/prusa-link/prusa-link.api.ts"],"names":["PrusaLinkApi","defaultLog","adapter","logger","authHeader","constructor","loggerFactory","eventEmitter2","httpClientFactory","printerLogin","name","debug","logMeta","type","PrusaLinkType","login","client","createClient","getVersion","response","get","data","server","getFiles","files","filter","dir","path","children","map","f","display","date","size","getFile","getFileRaw","getStatus","getPrinterState","getJobState","connect","Error","disconnect","restartServer","restartHost","restartPrinterFirmware","startPrint","post","pausePrint","jobId","getCurrentJobId","warn","put","resumePrint","cancelPrint","delete","quickStop","sendGcode","script","movePrintHead","amounts","homeAxes","axes","downloadFile","fileReference","pathUrl","refs","download","responseType","getFileChunk","startBytes","endBytes","o","withHeaders","Range","uploadFile","multerFileOrBuffer","progressToken","fileBuffer","filename","originalname","Buffer","isBuffer","log","filePath","readFileSync","contentLength","length","b","toString","withOnUploadProgress","p","emit","uploadProgressEvent","encodeURIComponent","uploadDoneEvent","e","uploadFailedEvent","message","JSON","parse","body","ExternalServiceError","error","statusCode","success","stack","deleteFile","deleteFolder","getSettings","getReprintState","status","job","id","buildFluentOptions","builder","PrusaLinkHttpClientBuilder","createClientWithBaseUrl","printerURL","withDigestAuth","username","password","attemptCount","config","method","toUpperCase","url","withAuthHeader"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../../src/services/prusa-link/prusa-link.api.ts"],"names":["PrusaLinkApi","defaultLog","adapter","logger","authHeader","constructor","loggerFactory","eventEmitter2","httpClientFactory","settingsStore","printerLogin","name","debug","logMeta","type","PrusaLinkType","login","client","createClient","getVersion","response","get","data","server","getFiles","files","filter","dir","path","children","map","f","display","date","size","getFile","getFileRaw","getStatus","getPrinterState","getJobState","connect","Error","disconnect","restartServer","restartHost","restartPrinterFirmware","startPrint","post","pausePrint","jobId","getCurrentJobId","warn","put","resumePrint","cancelPrint","delete","quickStop","sendGcode","script","movePrintHead","amounts","homeAxes","axes","downloadFile","fileReference","pathUrl","refs","download","responseType","getFileChunk","startBytes","endBytes","o","withHeaders","Range","uploadFile","multerFileOrBuffer","progressToken","fileBuffer","filename","originalname","Buffer","isBuffer","log","filePath","readFileSync","contentLength","length","b","toString","withTimeout","getTimeoutSettings","apiUploadTimeout","withOnUploadProgress","p","emit","uploadProgressEvent","encodeURIComponent","uploadDoneEvent","e","uploadFailedEvent","message","JSON","parse","body","ExternalServiceError","error","statusCode","success","stack","deleteFile","deleteFolder","getSettings","getReprintState","status","job","id","buildFluentOptions","builder","PrusaLinkHttpClientBuilder","createClientWithBaseUrl","printerURL","withDigestAuth","username","password","attemptCount","config","method","toUpperCase","url","withAuthHeader"],"mappings":"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"}
|
|
@@ -58,7 +58,8 @@ const serverSettingsUpdateSchema = _zod.z.object({
|
|
|
58
58
|
sentryDiagnosticsEnabled: _zod.z.boolean()
|
|
59
59
|
});
|
|
60
60
|
const timeoutSettingsUpdateSchema = _zod.z.object({
|
|
61
|
-
apiTimeout: _zod.z.number().int().min(1000)
|
|
61
|
+
apiTimeout: _zod.z.number().int().min(1000),
|
|
62
|
+
apiUploadTimeout: _zod.z.number().int().min(10000)
|
|
62
63
|
});
|
|
63
64
|
const frontendSettingsUpdateSchema = _zod.z.object({
|
|
64
65
|
gridCols: _zod.z.number().int().min(1),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/validators/settings-service.validation.ts"],"names":["clientNextSchema","credentialSettingUpdateSchema","fileCleanSettingsUpdateSchema","frontendSettingsUpdateSchema","jwtSecretCredentialSettingUpdateSchema","moonrakerSupportSchema","prusaLinkSupportSchema","sentryDiagnosticsEnabledSchema","serverSettingsUpdateSchema","thumbnailSupportSchema","timeoutSettingsUpdateSchema","wizardUpdateSchema","z","object","registration","boolean","loginRequired","experimentalMoonrakerSupport","experimentalThumbnailSupport","experimentalClientSupport","experimentalPrusaLinkSupport","sentryDiagnosticsEnabled","apiTimeout","number","int","min","gridCols","gridRows","largeTiles","tilePreferCancelOverQuickStop","jwtSecret","string","jwtExpiresIn","isProductionEnvironment","max","Infinity","refreshTokenAttempts","refreshTokenExpiry","wizardCompleted","wizardCompletedAt","date","nullable","wizardVersion","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","enabled"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../../src/services/validators/settings-service.validation.ts"],"names":["clientNextSchema","credentialSettingUpdateSchema","fileCleanSettingsUpdateSchema","frontendSettingsUpdateSchema","jwtSecretCredentialSettingUpdateSchema","moonrakerSupportSchema","prusaLinkSupportSchema","sentryDiagnosticsEnabledSchema","serverSettingsUpdateSchema","thumbnailSupportSchema","timeoutSettingsUpdateSchema","wizardUpdateSchema","z","object","registration","boolean","loginRequired","experimentalMoonrakerSupport","experimentalThumbnailSupport","experimentalClientSupport","experimentalPrusaLinkSupport","sentryDiagnosticsEnabled","apiTimeout","number","int","min","apiUploadTimeout","gridCols","gridRows","largeTiles","tilePreferCancelOverQuickStop","jwtSecret","string","jwtExpiresIn","isProductionEnvironment","max","Infinity","refreshTokenAttempts","refreshTokenExpiry","wizardCompleted","wizardCompletedAt","date","nullable","wizardVersion","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","enabled"],"mappings":"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"}
|
|
@@ -14,6 +14,13 @@ function migrateSettingsRuntime(knownSettings) {
|
|
|
14
14
|
const entity = knownSettings;
|
|
15
15
|
entity[_serversettingsconstants.wizardSettingKey] ??= (0, _serversettingsconstants.getDefaultWizardSettings)();
|
|
16
16
|
entity[_serversettingsconstants.timeoutSettingKey] ??= (0, _serversettingsconstants.getDefaultTimeout)();
|
|
17
|
+
if (entity[_serversettingsconstants.timeoutSettingKey]) {
|
|
18
|
+
const defaultTimeoutSettings = (0, _serversettingsconstants.getDefaultTimeout)();
|
|
19
|
+
entity[_serversettingsconstants.timeoutSettingKey] = {
|
|
20
|
+
apiTimeout: entity[_serversettingsconstants.timeoutSettingKey].apiTimeout ?? defaultTimeoutSettings.apiTimeout,
|
|
21
|
+
apiUploadTimeout: entity[_serversettingsconstants.timeoutSettingKey].apiUploadTimeout ?? defaultTimeoutSettings.apiUploadTimeout
|
|
22
|
+
};
|
|
23
|
+
}
|
|
17
24
|
entity[_serversettingsconstants.serverSettingsKey] ??= (0, _serversettingsconstants.getDefaultServerSettings)();
|
|
18
25
|
entity[_serversettingsconstants.frontendSettingKey] ??= (0, _serversettingsconstants.getDefaultFrontendSettings)();
|
|
19
26
|
entity[_serversettingsconstants.credentialSettingsKey] ??= {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/shared/runtime-settings.migration.ts"],"names":["migrateSettingsRuntime","knownSettings","entity","wizardSettingKey","getDefaultWizardSettings","timeoutSettingKey","getDefaultTimeout","serverSettingsKey","getDefaultServerSettings","frontendSettingKey","getDefaultFrontendSettings","credentialSettingsKey","getDefaultCredentialSettings","jwtSecret","uuidv4","printerFileCleanSettingKey","getDefaultFileCleanSettings","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","defaultServerSettings","loginRequired","registration","experimentalClientSupport","experimentalMoonrakerSupport","experimentalPrusaLinkSupport","sentryDiagnosticsEnabled","experimentalThumbnailSupport"],"mappings":";;;;+BAkBgBA;;;eAAAA;;;yCAHT;sBACsB;AAEtB,SAASA,uBACdC,aAA0C;IAE1C,MAAMC,SAASD;IAEfC,MAAM,CAACC,yCAAgB,CAAC,KAAKC,IAAAA,iDAAwB;IACrDF,MAAM,CAACG,0CAAiB,CAAC,KAAKC,IAAAA,0CAAiB;
|
|
1
|
+
{"version":3,"sources":["../../src/shared/runtime-settings.migration.ts"],"names":["migrateSettingsRuntime","knownSettings","entity","wizardSettingKey","getDefaultWizardSettings","timeoutSettingKey","getDefaultTimeout","defaultTimeoutSettings","apiTimeout","apiUploadTimeout","serverSettingsKey","getDefaultServerSettings","frontendSettingKey","getDefaultFrontendSettings","credentialSettingsKey","getDefaultCredentialSettings","jwtSecret","uuidv4","printerFileCleanSettingKey","getDefaultFileCleanSettings","autoRemoveOldFilesBeforeUpload","autoRemoveOldFilesAtBoot","autoRemoveOldFilesCriteriumDays","defaultServerSettings","loginRequired","registration","experimentalClientSupport","experimentalMoonrakerSupport","experimentalPrusaLinkSupport","sentryDiagnosticsEnabled","experimentalThumbnailSupport"],"mappings":";;;;+BAkBgBA;;;eAAAA;;;yCAHT;sBACsB;AAEtB,SAASA,uBACdC,aAA0C;IAE1C,MAAMC,SAASD;IAEfC,MAAM,CAACC,yCAAgB,CAAC,KAAKC,IAAAA,iDAAwB;IACrDF,MAAM,CAACG,0CAAiB,CAAC,KAAKC,IAAAA,0CAAiB;IAE/C,IAAIJ,MAAM,CAACG,0CAAiB,CAAC,EAAE;QAC7B,MAAME,yBAAyBD,IAAAA,0CAAiB;QAChDJ,MAAM,CAACG,0CAAiB,CAAC,GAAG;YAC1BG,YAAYN,MAAM,CAACG,0CAAiB,CAAC,CAACG,UAAU,IAAID,uBAAuBC,UAAU;YACrFC,kBAAkBP,MAAM,CAACG,0CAAiB,CAAC,CAACI,gBAAgB,IAAIF,uBAAuBE,gBAAgB;QACzG;IACF;IAEAP,MAAM,CAACQ,0CAAiB,CAAC,KAAKC,IAAAA,iDAAwB;IACtDT,MAAM,CAACU,2CAAkB,CAAC,KAAKC,IAAAA,mDAA0B;IACzDX,MAAM,CAACY,8CAAqB,CAAC,KAAK;QAChC,GAAGC,IAAAA,qDAA4B,GAAE;QAEjCC,WAAWC,IAAAA,QAAM;IACnB;IACAf,MAAM,CAACgB,mDAA0B,CAAC,KAAKC,IAAAA,oDAA2B;IAElE,IAAIjB,MAAM,CAACgB,mDAA0B,CAAC,EAAE;QAEtChB,MAAM,CAACgB,mDAA0B,CAAC,GAAG;YACnCE,gCAAgClB,MAAM,CAACgB,mDAA0B,CAAC,CAACE,8BAA8B;YACjGC,0BAA0BnB,MAAM,CAACgB,mDAA0B,CAAC,CAACE,8BAA8B;YAC3FE,iCAAiCpB,MAAM,CAACgB,mDAA0B,CAAC,CAACI,+BAA+B;QACrG;IACF;IAEA,IAAIpB,MAAM,CAACQ,0CAAiB,CAAC,EAAE;QAC7B,MAAMa,wBAAwBZ,IAAAA,iDAAwB;QAGtDT,MAAM,CAACQ,0CAAiB,CAAC,GAAG;YAC1Bc,eAAetB,MAAM,CAACQ,0CAAiB,CAAC,CAACc,aAAa,IAAID,sBAAsBC,aAAa;YAC7FC,cAAcvB,MAAM,CAACQ,0CAAiB,CAAC,CAACe,YAAY,IAAIF,sBAAsBE,YAAY;YAC1FC,2BAA2BxB,MAAM,CAACQ,0CAAiB,CAAC,CAACgB,yBAAyB,IAAIH,sBAAsBG,yBAAyB;YACjIC,8BAA8BzB,MAAM,CAACQ,0CAAiB,CAAC,CAACiB,4BAA4B,IAAIJ,sBAAsBI,4BAA4B;YAC1IC,8BAA8B1B,MAAM,CAACQ,0CAAiB,CAAC,CAACkB,4BAA4B,IAAIL,sBAAsBK,4BAA4B;YAC1IC,0BAA0B3B,MAAM,CAACQ,0CAAiB,CAAC,CAACmB,wBAAwB,IAAIN,sBAAsBM,wBAAwB;YAC9HC,8BAA8B5B,MAAM,CAACQ,0CAAiB,CAAC,CAACoB,4BAA4B,IAAIP,sBAAsBO,4BAA4B;QAC5I;IACF;IAEA,OAAO5B;AACT"}
|
|
@@ -58,7 +58,7 @@ class SocketIoGateway {
|
|
|
58
58
|
}
|
|
59
59
|
});
|
|
60
60
|
const opts = (0, _passport.getPassportJwtOptions)(this.settingsStore, this.configService, (value)=>value.handshake.auth.token);
|
|
61
|
-
this.io.use((0, _socketiomiddleware.authorize)(this.settingsStore, opts, (0, _passport.verifyUserCallback)(this.userService)));
|
|
61
|
+
this.io.use((0, _socketiomiddleware.authorize)(this.settingsStore, opts, this.logger, (0, _passport.verifyUserCallback)(this.userService)));
|
|
62
62
|
this.io.on("connection", (socket)=>this.onConnect.bind(this)(socket));
|
|
63
63
|
}
|
|
64
64
|
onConnect(socket) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","socketIoGatewaySessions","Gauge","name","help","socketIoGatewayDisconnects","Counter","socketIoGatewayMessagesSent","socketIoGatewayMessageSentSize","logger","io","constructor","loggerFactory","eventEmitter2","settingsStore","userService","configService","attachServer","httpServer","Server","cors","origin","opts","getPassportJwtOptions","value","handshake","auth","token","use","authorize","verifyUserCallback","on","socket","onConnect","bind","debug","socketId","id","emit","socketIoConnectedEvent","inc","dec","send","event","data","payload","JSON","stringify","sizeInBytes","Buffer","byteLength","set","LegacyUpdate"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/state/socket-io.gateway.ts"],"names":["IO_MESSAGES","SocketIoGateway","socketIoGatewaySessions","Gauge","name","help","socketIoGatewayDisconnects","Counter","socketIoGatewayMessagesSent","socketIoGatewayMessageSentSize","logger","io","constructor","loggerFactory","eventEmitter2","settingsStore","userService","configService","attachServer","httpServer","Server","cors","origin","opts","getPassportJwtOptions","value","handshake","auth","token","use","authorize","verifyUserCallback","on","socket","onConnect","bind","debug","socketId","id","emit","socketIoConnectedEvent","inc","dec","send","event","data","payload","JSON","stringify","sizeInBytes","Buffer","byteLength","set","LegacyUpdate"],"mappings":";;;;;;;;;;;IAsFaA,WAAW;eAAXA;;IArDAC,eAAe;eAAfA;;;0BAjCkB;gCACQ;0BAMmB;oCAGhC;4BACK;AAE/B,MAAMC,0BAA0B,IAAIC,iBAAK,CAAC;IACxCC,MAAM;IACNC,MAAM;AACR;AAEA,MAAMC,6BAA6B,IAAIC,mBAAO,CAAC;IAC7CH,MAAM;IACNC,MAAM;AACR;AAEA,MAAMG,8BAA8B,IAAID,mBAAO,CAAC;IAC9CH,MAAM;IACNC,MAAM;AACR;AAEA,MAAMI,iCAAiC,IAAIN,iBAAK,CAAC;IAC/CC,MAAM;IACNC,MAAM;AACR;AAEO,MAAMJ;;;;;IACXS,OAAsB;IAEtBC,GAAW;IAEXC,YACEC,aAA6B,EAC7B,AAAiBC,aAA4B,EAC7C,AAAiBC,aAA4B,EAC7C,AAAiBC,WAAyB,EAC1C,AAAiBC,aAA6B,CAC9C;aAJiBH,gBAAAA;aACAC,gBAAAA;aACAC,cAAAA;aACAC,gBAAAA;QAEjB,IAAI,CAACP,MAAM,GAAGG,cAAcZ,gBAAgBG,IAAI;IAClD;IAEAc,aAAaC,UAAsB,EAAE;QACnC,IAAI,CAACR,EAAE,GAAG,IAAIS,gBAAM,CAACD,YAAY;YAAEE,MAAM;gBAAEC,QAAQ;YAAI;QAAE;QACzD,MAAMC,OAAOC,IAAAA,+BAAqB,EAChC,IAAI,CAACT,aAAa,EAClB,IAAI,CAACE,aAAa,EAClB,CAACQ,QAAkBA,MAAMC,SAAS,CAACC,IAAI,CAACC,KAAK;QAE/C,IAAI,CAACjB,EAAE,CAACkB,GAAG,CAACC,IAAAA,6BAAS,EAAC,IAAI,CAACf,aAAa,EAAEQ,MAAM,IAAI,CAACb,MAAM,EAAEqB,IAAAA,4BAAkB,EAAC,IAAI,CAACf,WAAW;QAChG,IAAI,CAACL,EAAE,CAACqB,EAAE,CAAC,cAAc,CAACC,SAAW,IAAI,CAACC,SAAS,CAACC,IAAI,CAAC,IAAI,EAAEF;IACjE;IAEAC,UAAUD,MAAc,EAAE;QACxB,IAAI,CAACvB,MAAM,CAAC0B,KAAK,CAAC,6BAA6B;YAAEC,UAAUJ,OAAOK,EAAE;QAAC;QACrE,IAAI,CAACxB,aAAa,CAACyB,IAAI,CAACC,sCAAsB,EAAEP,OAAOK,EAAE;QACzDpC,wBAAwBuC,GAAG;QAE3BR,OAAOD,EAAE,CAAC,cAAc;YACtB,IAAI,CAACtB,MAAM,CAAC0B,KAAK,CAAC,gCAAgC;gBAAEC,UAAUJ,OAAOK,EAAE;YAAC;YACxEpC,wBAAwBwC,GAAG,CAAC;YAC5BpC,2BAA2BmC,GAAG;QAChC;IACF;IAEAE,KAAQC,KAAa,EAAEC,IAAO,EAAE;QAC9B,IAAI,CAAC,IAAI,CAAClC,EAAE,EAAE;YACZ,IAAI,CAACD,MAAM,CAAC0B,KAAK,CAAC,CAAC,gBAAgB,EAAEQ,MAAM,wCAAwC,CAAC;YACpF;QACF;QAEA,IAAI,CAACjC,EAAE,CAAC4B,IAAI,CAACK,OAAOC;QACpBrC,4BAA4BiC,GAAG;QAE/B,MAAMK,UAAUC,KAAKC,SAAS,CAACH;QAC/B,MAAMI,cAAcC,OAAOC,UAAU,CAACL;QACtCrC,+BAA+B2C,GAAG,CAACH;IACrC;AACF;AAEO,MAAMjD,cAAc;IACzBqD,cAAc;AAChB"}
|