@fdm-monster/server 1.8.0 → 1.8.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.yarn/install-state.gz +0 -0
- package/.yarn/releases/{yarn-4.5.3.cjs → yarn-4.6.0.cjs} +287 -287
- package/.yarnrc.yml +1 -1
- package/README.md +64 -60
- package/RELEASE_NOTES.MD +29 -0
- package/dist/container.js +0 -4
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +0 -2
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/server-private.controller.js +5 -17
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +0 -2
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/server.constants.js +1 -2
- package/dist/server.constants.js.map +1 -1
- package/dist/server.env.js +3 -25
- package/dist/server.env.js.map +1 -1
- package/dist/services/core/yaml.service.js +1 -1
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js +1 -1
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +1 -1
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/tasks/boot.task.js +1 -2
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/utils/env.utils.js +0 -42
- package/dist/utils/env.utils.js.map +1 -1
- package/package.json +26 -42
- package/dist/services/core/server-update.service.js +0 -71
- package/dist/services/core/server-update.service.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","printerGroupService","floorStore","floorService","printerService","printerCache","serverVersion","logger","isTypeormMode","constructor","loggerFactory","name","importPrintersAndFloors","yamlBuffer","importSpec","load","databaseTypeSqlite","databaseType","exportPrinters","exportFloorGrid","exportFloors","exportGroups","config","printer","printers","printerName","settingsAppearance","id","parseInt","OctoprintType","MoonrakerType","includes","printerType","floor","floors","printerId","importData","validateInput","importPrintersFloorsYamlRules","importPrinterPositionsRules","log","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","updateByNameGroups","insertGroups","analyseUpsertGroups","groups","length","printerIdMap","newPrinter","state","create","Error","JSON","stringify","updatePrinterSpec","updateId","updatedPrinter","value","originalPrinterId","update","floorIdMap","newFloor","originalFloorId","knownPrinterPositions","floorPosition","knownPrinterId","floorId","push","createdFloor","updateFloorSpec","updatedFloor","knownPrinters","loadStore","group","createdGroup","createGroup","addPrinterToGroup","updateGroupSpec","existingGroup","getGroupWithPrinters","groupId","existingPrinterIds","map","p","wantedTargetPrinterIds","filter","unwantedId","eid","removePrinterFromGroup","nonExistingNewId","upsertPrinters","comparisonStrategies","existingPrinters","list","names","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","comparedProperty","upsertGroups","existingGroups","listGroups","exportPrintersAndFloors","options","input","exportPrintersFloorsYamlRules","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","undefined","apiKey","getLoginDto","disabledReason","enabled","dateAdded","listCache","f","dumpedFloor","fPrinterId","x","y","g","dump"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/yaml.service.ts"],"names":["YamlService","printerGroupService","floorStore","floorService","printerService","printerCache","serverVersion","logger","isTypeormMode","constructor","loggerFactory","name","importPrintersAndFloors","yamlBuffer","importSpec","load","databaseTypeSqlite","databaseType","exportPrinters","exportFloorGrid","exportFloors","exportGroups","config","printer","printers","printerName","settingsAppearance","id","parseInt","OctoprintType","MoonrakerType","includes","printerType","floor","floors","printerId","importData","validateInput","importPrintersFloorsYamlRules","importPrinterPositionsRules","log","updateByPropertyPrinters","insertPrinters","analysePrintersUpsert","printerComparisonStrategiesByPriority","updateByPropertyFloors","insertFloors","analyseFloorsUpsert","floorComparisonStrategiesByPriority","updateByNameGroups","insertGroups","analyseUpsertGroups","groups","length","printerIdMap","newPrinter","state","create","Error","JSON","stringify","updatePrinterSpec","updateId","updatedPrinter","value","originalPrinterId","update","floorIdMap","newFloor","originalFloorId","knownPrinterPositions","floorPosition","knownPrinterId","floorId","push","createdFloor","updateFloorSpec","updatedFloor","knownPrinters","loadStore","group","createdGroup","createGroup","addPrinterToGroup","updateGroupSpec","existingGroup","getGroupWithPrinters","groupId","existingPrinterIds","map","p","wantedTargetPrinterIds","filter","unwantedId","eid","removePrinterFromGroup","nonExistingNewId","upsertPrinters","comparisonStrategies","existingPrinters","list","names","toLowerCase","urls","printerURL","ids","toString","strategy","comparedName","foundIndex","findIndex","n","upsertFloors","comparisonStrategy","existingFloors","floorLevels","comparedProperty","upsertGroups","existingGroups","listGroups","exportPrintersAndFloors","options","input","exportPrintersFloorsYamlRules","dumpedObject","version","process","env","npm_package_version","exportedAt","Date","undefined","apiKey","getLoginDto","disabledReason","enabled","dateAdded","listCache","f","dumpedFloor","fPrinterId","x","y","g","dump"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/moonraker/moonraker-websocket.adapter.ts"],"names":["MoonrakerWebsocketAdapter","WebsocketRpcExtendedAdapter","printerType","client","eventEmitter","configService","socketState","SOCKET_STATE","unopened","lastMessageReceivedTimestamp","stateUpdated","stateUpdateTimestamp","apiStateUpdated","apiStateUpdateTimestamp","apiState","API_STATE","unset","login","socketURL","printerId","serverVersion","refreshPrinterObjectsInterval","subscriptionObjects","pause_resume","idle_timeout","print_stats","heaters","heater_bed","extruder","display_status","webhooks","virtual_sdcard","gcode_move","stepper_enable","fan","motion_report","system_stats","printerObjects","eventtime","status","constructor","moonrakerClient","loggerFactory","eventEmitter2","logger","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","needsSetup","needsReauth","reauthSession","registerCredentials","socketLogin","loginDto","wsUrl","httpToWsUrl","printerURL","pathname","open","socket","Error","close","clearInterval","setupSocketSession","getApiVersion","setApiState","responding","updateCurrentStateSafely","setInterval","query","objects","getPrinterObjectsQuery","data","result","emitCurrentEvent","e","castError","isAxiosError","response","Date","now","error","noResponse","afterOpened","_","setSocketState","opened","sendRequest","jsonrpc","method","params","client_name","version","type","url","githubUrl","id","postSubscribePrinterObjects","connection_id","ae","warn","PP","message","onEventMessage","event","authenticated","eventName","log","JSON","stringify","substring","payload","length","undefined","serviceChanged","klipper","active_state","klipper_mcu","moonraker","substate","Object","keys","includes","merge","emitEvent","emitEventSync","eventEmittingAllowed","emit","moonrakerEvent","resetSocketState","isClosedOrAborted","closed","aborted","afterClosed","WsMessage","WS_CLOSED","onError","WS_ERROR","printerObject","originalKlipperObjects","flags","operational","printing","cancelling","pausing","paused","resuming","finishing","closedOrError","ready","sdReady","filename","printTime","stateText","state","systemState","printState","idleState","print_duration","toUpperCase","currentMessage","progress","completion","text","job","file","path","emitAsync","MoonrakerType","WS_STATE_UPDATED","globalKey","API_STATE_UPDATED"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../../src/services/moonraker/moonraker-websocket.adapter.ts"],"names":["MoonrakerWebsocketAdapter","WebsocketRpcExtendedAdapter","printerType","client","eventEmitter","configService","socketState","SOCKET_STATE","unopened","lastMessageReceivedTimestamp","stateUpdated","stateUpdateTimestamp","apiStateUpdated","apiStateUpdateTimestamp","apiState","API_STATE","unset","login","socketURL","printerId","serverVersion","refreshPrinterObjectsInterval","subscriptionObjects","pause_resume","idle_timeout","print_stats","heaters","heater_bed","extruder","display_status","webhooks","virtual_sdcard","gcode_move","stepper_enable","fan","motion_report","system_stats","printerObjects","eventtime","status","constructor","moonrakerClient","loggerFactory","eventEmitter2","logger","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","needsSetup","needsReauth","reauthSession","registerCredentials","socketLogin","loginDto","wsUrl","httpToWsUrl","printerURL","pathname","open","socket","Error","close","clearInterval","setupSocketSession","getApiVersion","setApiState","responding","updateCurrentStateSafely","setInterval","query","objects","getPrinterObjectsQuery","data","result","emitCurrentEvent","e","castError","isAxiosError","response","Date","now","error","noResponse","afterOpened","_","setSocketState","opened","sendRequest","jsonrpc","method","params","client_name","version","type","url","githubUrl","id","postSubscribePrinterObjects","connection_id","ae","warn","PP","message","onEventMessage","event","authenticated","eventName","log","JSON","stringify","substring","payload","length","undefined","serviceChanged","klipper","active_state","klipper_mcu","moonraker","substate","Object","keys","includes","merge","emitEvent","emitEventSync","eventEmittingAllowed","emit","moonrakerEvent","resetSocketState","isClosedOrAborted","closed","aborted","afterClosed","WsMessage","WS_CLOSED","onError","WS_ERROR","printerObject","originalKlipperObjects","flags","operational","printing","cancelling","pausing","paused","resuming","finishing","closedOrError","ready","sdReady","filename","printTime","stateText","state","systemState","printState","idleState","print_duration","toUpperCase","currentMessage","progress","completion","text","job","file","path","emitAsync","MoonrakerType","WS_STATE_UPDATED","globalKey","API_STATE_UPDATED"],"mappings":"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"}
|
|
@@ -189,7 +189,7 @@ class OctoprintClient extends _octoprintapiroutes.OctoprintRoutes {
|
|
|
189
189
|
async getLocalFiles(login, recursive = false) {
|
|
190
190
|
const { url, options } = this.prepareRequest(login, this.apiGetFiles(recursive));
|
|
191
191
|
const response = await this.httpClient.get(url, options);
|
|
192
|
-
return response?.data?.files?.filter((f)=>f.date).map((f)=>{
|
|
192
|
+
return response?.data?.files?.filter((f)=>f.date && f.type === "machinecode").map((f)=>{
|
|
193
193
|
return (0, _fileutils.normalizePrinterFile)(f);
|
|
194
194
|
}) || [];
|
|
195
195
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/octoprint.client.ts"],"names":["OctoprintClient","OctoprintRoutes","eventEmitter2","httpClient","logger","constructor","settingsStore","loggerFactory","name","getApiVersion","login","timeout","url","options","prepareRequest","apiVersion","get","getServer","apiServer","apiLogin","post","sendConnectionCommand","commandData","data","prepareJsonRequest","apiConnection","sendPrintHeadJogCommand","amounts","axesToHome","x","y","z","command","sendPrintHeadCommand","sendPrintHeadHomeCommand","axes","apiPrinterHead","response","sendCustomGCodeCommand","commandString","apiPrinterCustomCommand","getJob","apiJob","sendJobCommand","sendBedTempCommand","targetTemp","apiPrinterBed","getBedTargetCommand","getSettings","apiSettingsPart","updatePrinterNameSetting","printerName","settingPatch","printerNameSetting","updateFirmwareUpdaterSettings","firmwareUpdateConfig","pluginFirmwareUpdaterSettings","setGCodeAnalysis","enabled","gcodeAnalysisSetting","getCurrentUser","apiCurrentUser","getAdminUserOrDefault","currentUser","getUsers","apiUsers","getLocalFiles","recursive","apiGetFiles","files","filter","f","date","map","normalizePrinterFile","getFile","path","pathUrl","apiFile","e","captureException","error","downloadFile","downloadFileLocal","responseType","getFileChunk","filePath","startBytes","endBytes","headers","Range","createFolder","foldername","apiFilesLocal","formData","FormData","append","getHeaders","getLengthSync","moveFileOrFolder","destination","moveFileCommand","postSelectPrintFile","print","selectCommand","uploadFileAsMultiPart","multerFileOrBuffer","commands","token","multiPartContentType","select","source","buffer","isPhysicalFile","createReadStream","filename","originalname","result","Promise","resolve","reject","getLength","err","length","axios","method","onUploadProgress","p","emit","uploadProgressEvent","failed","JSON","parse","body","ExternalServiceError","message","statusCode","success","stack","deleteFileOrFolder","delete","getPrinterCurrent","history","limit","exclude","apiPrinterCurrent","getConnection","getPrinterProfiles","apiPrinterProfiles","postSoftwareUpdate","targets","pluginSoftwareUpdateUpdate","getPluginManagerPlugins","pluginManagerPlugins","getPluginManagerPlugin","pluginName","pluginManagerPlugin","postApiPluginManagerCommand","pluginCommand","pluginUrl","apiPluginManager","pluginManagerCommand","postPluginFirmwareUpdateFlash","currentPrinterId","firmwarePath","pluginFirmwareUpdaterFlash","basename","fileReadStream","fs","uploadProgress","firmwareFlashUploadEvent","getPluginFirmwareUpdateStatus","pluginFirmwareUpdaterStatus","fetchOctoPrintPlugins","prepareAnonymousRequest","pluginRepositoryUrl","getSystemInfo","apiSystemInfo","getSystemCommands","apiSystemCommands","postServerRestartCommand","apiServerRestartCommand","getSoftwareUpdateCheck","force","apiSoftwareUpdateCheck","getPluginPiSupport","apiPluginPiSupport","deleteTimeLapse","fileName","apiTimelapse","listUnrenderedTimeLapses","listProfiles","apiProfiles","getBackupOverview","pluginBackupIndex","getBackups","pluginBackupEndpoint","createBackup","excludeArray","getDownloadBackupStream","pluginBackupFileDownload","catch","forwardRestoreBackupFileStream","pluginBackupFileRestore","deleteBackup","pluginBackupFile"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/octoprint.client.ts"],"names":["OctoprintClient","OctoprintRoutes","eventEmitter2","httpClient","logger","constructor","settingsStore","loggerFactory","name","getApiVersion","login","timeout","url","options","prepareRequest","apiVersion","get","getServer","apiServer","apiLogin","post","sendConnectionCommand","commandData","data","prepareJsonRequest","apiConnection","sendPrintHeadJogCommand","amounts","axesToHome","x","y","z","command","sendPrintHeadCommand","sendPrintHeadHomeCommand","axes","apiPrinterHead","response","sendCustomGCodeCommand","commandString","apiPrinterCustomCommand","getJob","apiJob","sendJobCommand","sendBedTempCommand","targetTemp","apiPrinterBed","getBedTargetCommand","getSettings","apiSettingsPart","updatePrinterNameSetting","printerName","settingPatch","printerNameSetting","updateFirmwareUpdaterSettings","firmwareUpdateConfig","pluginFirmwareUpdaterSettings","setGCodeAnalysis","enabled","gcodeAnalysisSetting","getCurrentUser","apiCurrentUser","getAdminUserOrDefault","currentUser","getUsers","apiUsers","getLocalFiles","recursive","apiGetFiles","files","filter","f","date","type","map","normalizePrinterFile","getFile","path","pathUrl","apiFile","e","captureException","error","downloadFile","downloadFileLocal","responseType","getFileChunk","filePath","startBytes","endBytes","headers","Range","createFolder","foldername","apiFilesLocal","formData","FormData","append","getHeaders","getLengthSync","moveFileOrFolder","destination","moveFileCommand","postSelectPrintFile","print","selectCommand","uploadFileAsMultiPart","multerFileOrBuffer","commands","token","multiPartContentType","select","source","buffer","isPhysicalFile","createReadStream","filename","originalname","result","Promise","resolve","reject","getLength","err","length","axios","method","onUploadProgress","p","emit","uploadProgressEvent","failed","JSON","parse","body","ExternalServiceError","message","statusCode","success","stack","deleteFileOrFolder","delete","getPrinterCurrent","history","limit","exclude","apiPrinterCurrent","getConnection","getPrinterProfiles","apiPrinterProfiles","postSoftwareUpdate","targets","pluginSoftwareUpdateUpdate","getPluginManagerPlugins","pluginManagerPlugins","getPluginManagerPlugin","pluginName","pluginManagerPlugin","postApiPluginManagerCommand","pluginCommand","pluginUrl","apiPluginManager","pluginManagerCommand","postPluginFirmwareUpdateFlash","currentPrinterId","firmwarePath","pluginFirmwareUpdaterFlash","basename","fileReadStream","fs","uploadProgress","firmwareFlashUploadEvent","getPluginFirmwareUpdateStatus","pluginFirmwareUpdaterStatus","fetchOctoPrintPlugins","prepareAnonymousRequest","pluginRepositoryUrl","getSystemInfo","apiSystemInfo","getSystemCommands","apiSystemCommands","postServerRestartCommand","apiServerRestartCommand","getSoftwareUpdateCheck","force","apiSoftwareUpdateCheck","getPluginPiSupport","apiPluginPiSupport","deleteTimeLapse","fileName","apiTimelapse","listUnrenderedTimeLapses","listProfiles","apiProfiles","getBackupOverview","pluginBackupIndex","getBackups","pluginBackupEndpoint","createBackup","excludeArray","getDownloadBackupStream","pluginBackupFileDownload","catch","forwardRestoreBackupFileStream","pluginBackupFileRestore","deleteBackup","pluginBackupFile"],"mappings":"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"}
|
|
@@ -44,7 +44,7 @@ const importPrintersFloorsYamlRules = (importPrinters, importFloorGrid, importFl
|
|
|
44
44
|
"config.floorComparisonStrategiesByPriority": "required|string|in:name,floor,id",
|
|
45
45
|
printers: `${!!importPrinters ? "array|minLength:0" : "not"}`,
|
|
46
46
|
"printers.*.id": "required",
|
|
47
|
-
"printers.*.apiKey": `
|
|
47
|
+
"printers.*.apiKey": `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.apiKeyLengthMaxDefault},${_serviceconstants.apiKeyLengthMinDefault}|alphaDash`,
|
|
48
48
|
"printers.*.printerURL": "required|httpurl",
|
|
49
49
|
"printers.*.enabled": "boolean",
|
|
50
50
|
"printers.*.printerType": `integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlRules","importPrinterPositionsRules","importPrintersFloorsYamlRules","exportPrinters","exportFloorGrid","exportFloors","exportGroups","printerComparisonStrategiesByPriority","floorComparisonStrategiesByPriority","notes","importPrinters","importFloorGrid","importFloors","importGroups","version","config","printers","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlRules","importPrinterPositionsRules","importPrintersFloorsYamlRules","exportPrinters","exportFloorGrid","exportFloors","exportGroups","printerComparisonStrategiesByPriority","floorComparisonStrategiesByPriority","notes","importPrinters","importFloorGrid","importFloors","importGroups","version","config","printers","OctoprintType","apiKeyLengthMaxDefault","apiKeyLengthMinDefault","MoonrakerType","floors","groups","isTypeormMode"],"mappings":";;;;;;;;;;;IAGaA,6BAA6B;eAA7BA;;IAsDAC,2BAA2B;eAA3BA;;IApCAC,6BAA6B;eAA7BA;;;kCArBkD;qCAClB;AAEtC,MAAMF,gCAAgC;IAE3CG,gBAAgB;IAChBC,iBAAiB;IACjBC,cAAc;IAEdC,cAAc;IAEdC,uCAAuC;IACvC,2CAA2C;IAC3CC,qCAAqC;IAErCC,OAAO;AAIT;AAEO,MAAMP,gCAAgC,CAC3CQ,gBACAC,iBACAC,cACAC;IAEA,OAAO;QACLC,SAAS;QACTC,QAAQ;QACR,yBAAyB;QACzB,0BAA0B;QAC1B,uBAAuB;QACvB,uBAAuB;QACvB,gDAAgD;QAChD,kDAAkD;QAClD,8CAA8C;QAC9CC,UAAU,GAAG,CAAC,CAACN,iBAAiB,sBAAsB,OAAO;QAC7D,iBAAiB;QACjB,qBAAqB,CAAC,uBAAuB,EAAEO,kCAAa,CAAC,QAAQ,EAAEC,wCAAsB,CAAC,CAAC,EAAEC,wCAAsB,CAAC,UAAU,CAAC;QACnI,yBAAyB;QACzB,sBAAsB;QACtB,0BAA0B,CAAC,WAAW,EAAEF,kCAAa,CAAC,CAAC,EAAEG,kCAAa,EAAE;QACxE,mBAAmB;QACnBC,QAAQ,GAAG,CAAC,CAACT,eAAe,sBAAsB,OAAO;QACzD,eAAe;QACf,kBAAkB;QAClB,iBAAiB;QAEjBU,QAAQ,GAAG,CAAC,CAACT,eAAe,sBAAsB,OAAO;QACzD,eAAe;QACf,iBAAiB;IAGnB;AACF;AAEO,MAAMZ,8BAA8B,CAACsB,gBAA4B,CAAA;QACtEP,UAAU;QACV,wBAAwB;QAExB,gBAAgB;QAChB,gBAAgB;IAClB,CAAA"}
|
package/dist/tasks/boot.task.js
CHANGED
|
@@ -73,7 +73,7 @@ class BootTask {
|
|
|
73
73
|
isTypeormMode;
|
|
74
74
|
typeormService;
|
|
75
75
|
printerThumbnailCache;
|
|
76
|
-
constructor({ loggerFactory, serverTasks, settingsService, settingsStore, multerService, printerSocketStore, printerFilesStore, permissionService, roleService, userService, taskManagerService, pluginRepositoryCache, floorStore,
|
|
76
|
+
constructor({ loggerFactory, serverTasks, settingsService, settingsStore, multerService, printerSocketStore, printerFilesStore, permissionService, roleService, userService, taskManagerService, pluginRepositoryCache, floorStore, clientBundleService, configService, typeormService, isTypeormMode, printerThumbnailCache }){
|
|
77
77
|
this.isTypeormMode = isTypeormMode;
|
|
78
78
|
this.logger = loggerFactory(BootTask.name);
|
|
79
79
|
this.serverTasks = serverTasks;
|
|
@@ -88,7 +88,6 @@ class BootTask {
|
|
|
88
88
|
this.taskManagerService = taskManagerService;
|
|
89
89
|
this.pluginRepositoryCache = pluginRepositoryCache;
|
|
90
90
|
this.floorStore = floorStore;
|
|
91
|
-
this.pluginFirmwareUpdateService = pluginFirmwareUpdateService;
|
|
92
91
|
this.clientBundleService = clientBundleService;
|
|
93
92
|
this.configService = configService;
|
|
94
93
|
this.typeormService = typeormService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","taskManagerService","serverTasks","settingsStore","settingsService","multerService","printerSocketStore","printerFilesStore","permissionService","roleService","userService","pluginRepositoryCache","floorStore","pluginFirmwareUpdateService","clientBundleService","configService","isTypeormMode","typeormService","printerThumbnailCache","constructor","loggerFactory","name","runOnce","registerJobOrTask","SERVER_BOOT_TASK","log","run","createConnection","migrateDatabase","e","mongoose","Error","message","includes","error","scheduleDisabledJob","DITokens","bootTask","loadSettings","syncPermissions","syncRoles","isDemoMode","warn","AppConstants","OVERRIDE_IS_DEMO_MODE","createOrUpdateDemoAccount","setLoginRequired","setRegistrationEnabled","loginRequired","get","OVERRIDE_LOGIN_REQUIRED","registrationEnabled","OVERRIDE_REGISTRATION_ENABLED","overrideJwtSecret","OVERRIDE_JWT_SECRET","undefined","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadFilesStore","loadStore","loadCache","length","getAllValues","process","env","SAFEMODE_ENABLED","BOOT_TASKS","forEach","task","disableJob","demoUsername","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","demoPassword","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","demoRole","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","adminRole","getRoleByName","demoUserId","getDemoUserId","register","username","password","isDemoUser","isVerified","isRootUser","needsPasswordChange","roles","id","setVerifiedById","setIsRootUserById","updatePasswordUnsafeByUsername","setUserRoleIds","envUrl","fetchMongoDBConnectionString","connect","serverSelectionTimeoutMS","syncIndexes","runMigrations","connection","db","getClient"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","taskManagerService","serverTasks","settingsStore","settingsService","multerService","printerSocketStore","printerFilesStore","permissionService","roleService","userService","pluginRepositoryCache","floorStore","pluginFirmwareUpdateService","clientBundleService","configService","isTypeormMode","typeormService","printerThumbnailCache","constructor","loggerFactory","name","runOnce","registerJobOrTask","SERVER_BOOT_TASK","log","run","createConnection","migrateDatabase","e","mongoose","Error","message","includes","error","scheduleDisabledJob","DITokens","bootTask","loadSettings","syncPermissions","syncRoles","isDemoMode","warn","AppConstants","OVERRIDE_IS_DEMO_MODE","createOrUpdateDemoAccount","setLoginRequired","setRegistrationEnabled","loginRequired","get","OVERRIDE_LOGIN_REQUIRED","registrationEnabled","OVERRIDE_REGISTRATION_ENABLED","overrideJwtSecret","OVERRIDE_JWT_SECRET","undefined","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadFilesStore","loadStore","loadCache","length","getAllValues","process","env","SAFEMODE_ENABLED","BOOT_TASKS","forEach","task","disableJob","demoUsername","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","demoPassword","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","demoRole","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","adminRole","getRoleByName","demoUserId","getDemoUserId","register","username","password","isDemoUser","isVerified","isRootUser","needsPasswordChange","roles","id","setVerifiedById","setIsRootUserById","updatePasswordUnsafeByUsername","setUserRoleIds","envUrl","fetchMongoDBConnectionString","connect","serverSelectionTimeoutMS","syncIndexes","runMigrations","connection","db","getClient"],"mappings":"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"}
|
package/dist/utils/env.utils.js
CHANGED
|
@@ -18,31 +18,15 @@ _export(exports, {
|
|
|
18
18
|
isNode: function() {
|
|
19
19
|
return isNode;
|
|
20
20
|
},
|
|
21
|
-
isNodemon: function() {
|
|
22
|
-
return isNodemon;
|
|
23
|
-
},
|
|
24
|
-
isPm2: function() {
|
|
25
|
-
return isPm2;
|
|
26
|
-
},
|
|
27
21
|
isProductionEnvironment: function() {
|
|
28
22
|
return isProductionEnvironment;
|
|
29
23
|
},
|
|
30
24
|
isTestEnvironment: function() {
|
|
31
25
|
return isTestEnvironment;
|
|
32
|
-
},
|
|
33
|
-
verifyPackageJsonRequirements: function() {
|
|
34
|
-
return verifyPackageJsonRequirements;
|
|
35
26
|
}
|
|
36
27
|
});
|
|
37
|
-
const _fs = /*#__PURE__*/ _interop_require_default(require("fs"));
|
|
38
28
|
const _logger = require("../handlers/logger");
|
|
39
29
|
const _serverconstants = require("../server.constants");
|
|
40
|
-
const _path = require("path");
|
|
41
|
-
function _interop_require_default(obj) {
|
|
42
|
-
return obj && obj.__esModule ? obj : {
|
|
43
|
-
default: obj
|
|
44
|
-
};
|
|
45
|
-
}
|
|
46
30
|
const logger = new _logger.LoggerService("Utils-Env", false);
|
|
47
31
|
function getEnvOrDefault(key, defaultVal) {
|
|
48
32
|
const val = process.env[key];
|
|
@@ -58,34 +42,8 @@ function isTestEnvironment() {
|
|
|
58
42
|
function isProductionEnvironment() {
|
|
59
43
|
return process.env.NODE_ENV === _serverconstants.AppConstants.defaultProductionEnv;
|
|
60
44
|
}
|
|
61
|
-
function isPm2() {
|
|
62
|
-
return "PM2_HOME" in process.env || "PM2_JSON_PROCESSING" in process.env || "PM2_CLI" in process.env;
|
|
63
|
-
}
|
|
64
|
-
function isNodemon() {
|
|
65
|
-
return "npm_lifecycle_script" in process.env && process.env.npm_lifecycle_script.includes("nodemon");
|
|
66
|
-
}
|
|
67
45
|
function isNode() {
|
|
68
46
|
return "NODE" in process.env;
|
|
69
47
|
}
|
|
70
|
-
function verifyPackageJsonRequirements(rootPath) {
|
|
71
|
-
const dirConts = _fs.default.readdirSync(rootPath);
|
|
72
|
-
const hasPackageJson = dirConts.includes("package.json");
|
|
73
|
-
if (!hasPackageJson) {
|
|
74
|
-
logger.error(`FAILURE. Could not find 'package.json' in root folder ${rootPath}`);
|
|
75
|
-
return false;
|
|
76
|
-
}
|
|
77
|
-
logger.debug("✓ found 'package.json'");
|
|
78
|
-
const packageName = require((0, _path.join)(rootPath, "package.json")).name;
|
|
79
|
-
if (!packageName) {
|
|
80
|
-
logger.error("X Could not find 'name' property in package.json file. Aborting FDM Server.");
|
|
81
|
-
return false;
|
|
82
|
-
}
|
|
83
|
-
if (packageName.toLowerCase() !== _serverconstants.AppConstants.serverPackageName) {
|
|
84
|
-
logger.error(`X property 'name' in package.json file didnt equal 'fdm-monster' (found: ${packageName.toLowerCase()}). Aborting FDM Server.`);
|
|
85
|
-
return false;
|
|
86
|
-
}
|
|
87
|
-
logger.debug("✓ Correctly validated FDM package.json file!");
|
|
88
|
-
return true;
|
|
89
|
-
}
|
|
90
48
|
|
|
91
49
|
//# sourceMappingURL=env.utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","
|
|
1
|
+
{"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","isProductionEnvironment","isTestEnvironment","logger","LoggerService","key","defaultVal","val","process","env","length","NODE_ENV","AppConstants","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv"],"mappings":";;;;;;;;;;;IAOgBA,eAAe;eAAfA;;IAMAC,wBAAwB;eAAxBA;;IAYAC,MAAM;eAANA;;IAJAC,uBAAuB;eAAvBA;;IAJAC,iBAAiB;eAAjBA;;;wBAhBc;iCACD;AAG7B,MAAMC,SAAS,IAAIC,qBAAa,CAAC,aAAa;AAEvC,SAASN,gBAAgBO,GAAQ,EAAEC,UAAe;IACvD,MAAMC,MAAMC,QAAQC,GAAG,CAACJ,IAAI;IAC5B,IAAI,CAACE,KAAKG,QAAQ,OAAOJ;IACzB,OAAOC;AACT;AAEO,SAASR;IACd,OAAOS,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACC,qBAAqB;AACpE;AAEO,SAASX;IACd,OAAOM,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACE,cAAc;AAC7D;AAEO,SAASb;IACd,OAAOO,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACG,oBAAoB;AACnE;AAEO,SAASf;IACd,OAAO,UAAUQ,QAAQC,GAAG;AAC9B"}
|
package/package.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
},
|
|
7
7
|
"author": "David Zwart",
|
|
8
8
|
"license": "AGPL-3.0-or-later",
|
|
9
|
-
"version": "1.8.
|
|
9
|
+
"version": "1.8.2",
|
|
10
10
|
"bin": {
|
|
11
11
|
"fdm-monster": "dist/index.js",
|
|
12
12
|
"fdmm": "dist/index.js"
|
|
@@ -15,16 +15,16 @@
|
|
|
15
15
|
"main": "dist/index.js",
|
|
16
16
|
"scripts": {
|
|
17
17
|
"console:upload": "yarn build && cross-env NODE_ENV=development node ./dist/consoles/upload-test.js",
|
|
18
|
-
"dev": "
|
|
19
|
-
"
|
|
20
|
-
"console:github-releases": "yarn build && cross-env NODE_ENV=development nodemon --watch \"dist/**/*\" -e js ./dist/consoles/download-github-releases.js",
|
|
21
|
-
"console:generate": "yarn build && cross-env NODE_ENV=development node ./dist/consoles/typeorm-generate.js",
|
|
22
|
-
"console:torm": "yarn build && cross-env NODE_ENV=development nodemon --watch \"dist/**/*\" -e js ./dist/consoles/sqlite-torm.js",
|
|
23
|
-
"console:migrate": "yarn build && cross-env NODE_ENV=development nodemon --watch \"dist/**/*\" -e js ./dist/consoles/typeorm-migrate.js",
|
|
24
|
-
"build": "swc src -d dist --strip-leading-paths",
|
|
25
|
-
"build:watch": "swc src -w -d dist --strip-leading-paths",
|
|
18
|
+
"dev": "yarn build:watch & yarn serve",
|
|
19
|
+
"serve": "NODE_ENV=development node --enable-source-maps --watch dist/index.js",
|
|
26
20
|
"start:dev": "ts-node src/index.ts",
|
|
27
21
|
"start": "cross-env NODE_ENV=production node dist/index.js",
|
|
22
|
+
"console:github-releases": "yarn build && NODE_ENV=development node --watch --enable-source-maps ./dist/consoles/download-github-releases.js",
|
|
23
|
+
"console:generate": "yarn build && NODE_ENV=development node --enable-source-maps ./dist/consoles/typeorm-generate.js",
|
|
24
|
+
"console:torm": "yarn build && NODE_ENV=development node --watch --enable-source-maps ./dist/consoles/sqlite-torm.js",
|
|
25
|
+
"console:migrate": "yarn build && NODE_ENV=development node --watch --enable-source-maps ./dist/consoles/typeorm-migrate.js",
|
|
26
|
+
"build": "swc src -d dist --strip-leading-paths",
|
|
27
|
+
"build:watch": "swc src -w -d dist --strip-leading-paths",
|
|
28
28
|
"migration:create": "migrate-mongo create printer-files-simpler",
|
|
29
29
|
"migration:up": "migrate-mongo up",
|
|
30
30
|
"migration:down": "migrate-mongo down",
|
|
@@ -53,25 +53,25 @@
|
|
|
53
53
|
"vue"
|
|
54
54
|
],
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@fdm-monster/client": "1.8.
|
|
57
|
-
"@fdm-monster/client-next": "0.0.
|
|
56
|
+
"@fdm-monster/client": "1.8.8",
|
|
57
|
+
"@fdm-monster/client-next": "0.0.16",
|
|
58
58
|
"@octokit/plugin-throttling": "8.2.0",
|
|
59
|
-
"@sentry/node": "8.
|
|
59
|
+
"@sentry/node": "8.47.0",
|
|
60
60
|
"adm-zip": "0.5.16",
|
|
61
|
-
"awilix": "12.0.
|
|
62
|
-
"awilix-express": "9.0.
|
|
63
|
-
"axios": "1.7.
|
|
61
|
+
"awilix": "12.0.4",
|
|
62
|
+
"awilix-express": "9.0.2",
|
|
63
|
+
"axios": "1.7.9",
|
|
64
64
|
"bcryptjs": "2.4.3",
|
|
65
|
-
"better-sqlite3": "11.
|
|
66
|
-
"cache-manager": "6.2
|
|
65
|
+
"better-sqlite3": "11.7.0",
|
|
66
|
+
"cache-manager": "6.3.2",
|
|
67
67
|
"class-validator": "0.14.1",
|
|
68
68
|
"connect-history-api-fallback": "2.0.0",
|
|
69
69
|
"cookie-parser": "1.4.7",
|
|
70
70
|
"cors": "2.8.5",
|
|
71
71
|
"cross-env": "7.0.3",
|
|
72
|
-
"dotenv": "16.4.
|
|
72
|
+
"dotenv": "16.4.7",
|
|
73
73
|
"eventemitter2": "6.4.9",
|
|
74
|
-
"express": "4.21.
|
|
74
|
+
"express": "4.21.2",
|
|
75
75
|
"form-data": "4.0.1",
|
|
76
76
|
"helmet": "8.0.0",
|
|
77
77
|
"js-yaml": "4.1.0",
|
|
@@ -82,14 +82,12 @@
|
|
|
82
82
|
"mongoose": "6.13.5",
|
|
83
83
|
"multer": "1.4.5-lts.1",
|
|
84
84
|
"node-input-validator": "4.5.1",
|
|
85
|
-
"nodemon": "3.1.7",
|
|
86
85
|
"octokit": "3.2.1",
|
|
87
86
|
"passport": "0.7.0",
|
|
88
87
|
"passport-anonymous": "1.0.1",
|
|
89
88
|
"passport-jwt": "4.0.1",
|
|
90
89
|
"reflect-metadata": "0.2.2",
|
|
91
90
|
"semver": "7.6.3",
|
|
92
|
-
"simple-git": "3.27.0",
|
|
93
91
|
"socket.io": "4.8.1",
|
|
94
92
|
"toad-scheduler": "3.0.1",
|
|
95
93
|
"typeorm": "0.3.20",
|
|
@@ -101,7 +99,7 @@
|
|
|
101
99
|
"@lcov-viewer/cli": "1.3.0",
|
|
102
100
|
"@lcov-viewer/istanbul-report": "1.4.0",
|
|
103
101
|
"@swc/cli": "0.5.2",
|
|
104
|
-
"@swc/core": "1.
|
|
102
|
+
"@swc/core": "1.10.4",
|
|
105
103
|
"@swc/jest": "0.2.37",
|
|
106
104
|
"@types/adm-zip": "0.5.7",
|
|
107
105
|
"@types/bcryptjs": "2.4.6",
|
|
@@ -116,27 +114,26 @@
|
|
|
116
114
|
"@types/luxon": "3.4.2",
|
|
117
115
|
"@types/migrate-mongo": "10.0.5",
|
|
118
116
|
"@types/multer": "1.4.12",
|
|
119
|
-
"@types/node": "22.10.
|
|
117
|
+
"@types/node": "22.10.5",
|
|
120
118
|
"@types/passport-anonymous": "1.0.5",
|
|
121
119
|
"@types/passport-jwt": "4.0.1",
|
|
122
120
|
"@types/semver": "7.5.8",
|
|
123
121
|
"@types/supertest": "6.0.2",
|
|
124
122
|
"@types/uuid": "10.0.0",
|
|
125
123
|
"@types/ws": "8.5.13",
|
|
126
|
-
"chokidar": "4.0.
|
|
127
|
-
"
|
|
128
|
-
"eslint": "9.16.0",
|
|
124
|
+
"chokidar": "4.0.3",
|
|
125
|
+
"eslint": "9.17.0",
|
|
129
126
|
"eslint-config-airbnb-base": "15.0.0",
|
|
130
127
|
"eslint-config-prettier": "9.1.0",
|
|
131
128
|
"eslint-config-standard": "17.1.0",
|
|
132
129
|
"eslint-plugin-import": "2.31.0",
|
|
133
|
-
"eslint-plugin-n": "17.
|
|
130
|
+
"eslint-plugin-n": "17.15.1",
|
|
134
131
|
"eslint-plugin-prettier": "4.2.1",
|
|
135
132
|
"eslint-plugin-promise": "7.2.1",
|
|
136
133
|
"express-list-routes": "1.2.4",
|
|
137
134
|
"jest": "29.7.0",
|
|
138
135
|
"jest-27-expect-message": "1.1.0",
|
|
139
|
-
"mongodb-memory-server": "10.1.
|
|
136
|
+
"mongodb-memory-server": "10.1.3",
|
|
140
137
|
"nock": "13.5.6",
|
|
141
138
|
"prettier": "2.8.8",
|
|
142
139
|
"supertest": "7.0.0",
|
|
@@ -150,18 +147,5 @@
|
|
|
150
147
|
"npm": ">= 8.1.4",
|
|
151
148
|
"yarn": ">= 1.22.10"
|
|
152
149
|
},
|
|
153
|
-
"
|
|
154
|
-
"verbose": false,
|
|
155
|
-
"ignore": [
|
|
156
|
-
".github/*",
|
|
157
|
-
"database/*",
|
|
158
|
-
"docs/*",
|
|
159
|
-
"docker/*",
|
|
160
|
-
"installations/*",
|
|
161
|
-
"media",
|
|
162
|
-
"test/*"
|
|
163
|
-
],
|
|
164
|
-
"delay": 100
|
|
165
|
-
},
|
|
166
|
-
"packageManager": "yarn@4.5.3"
|
|
150
|
+
"packageManager": "yarn@4.6.0"
|
|
167
151
|
}
|
|
@@ -1,71 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", {
|
|
3
|
-
value: true
|
|
4
|
-
});
|
|
5
|
-
Object.defineProperty(exports, "ServerUpdateService", {
|
|
6
|
-
enumerable: true,
|
|
7
|
-
get: function() {
|
|
8
|
-
return ServerUpdateService;
|
|
9
|
-
}
|
|
10
|
-
});
|
|
11
|
-
const _envutils = require("../../utils/env.utils");
|
|
12
|
-
const _serverconstants = require("../../server.constants");
|
|
13
|
-
const _child_process = require("child_process");
|
|
14
|
-
const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
|
|
15
|
-
class ServerUpdateService {
|
|
16
|
-
simpleGitService;
|
|
17
|
-
logger;
|
|
18
|
-
constructor({ simpleGitService, loggerFactory }){
|
|
19
|
-
this.simpleGitService = simpleGitService;
|
|
20
|
-
this.logger = loggerFactory(ServerUpdateService.name);
|
|
21
|
-
}
|
|
22
|
-
async restartServer() {
|
|
23
|
-
if (!(0, _envutils.isPm2)() && !(0, _envutils.isNodemon)()) {
|
|
24
|
-
throw new _runtimeexceptions.InternalServerException("Restart requested, but no daemon was available to perform this action");
|
|
25
|
-
}
|
|
26
|
-
if ((0, _envutils.isPm2)()) {
|
|
27
|
-
(0, _child_process.execSync)(`pm2 restart ${_serverconstants.AppConstants.pm2ServiceName}`, {
|
|
28
|
-
timeout: 5000
|
|
29
|
-
});
|
|
30
|
-
return true;
|
|
31
|
-
} else if ((0, _envutils.isNodemon)()) {
|
|
32
|
-
(0, _child_process.execSync)("echo '// Restart file for nodemon' > ./nodemon_restart_trigger.js", {
|
|
33
|
-
timeout: 5000
|
|
34
|
-
});
|
|
35
|
-
return true;
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
async checkGitUpdates() {
|
|
39
|
-
let isValidGitRepo = this.simpleGitService.checkIsRepo();
|
|
40
|
-
if (!isValidGitRepo) {
|
|
41
|
-
throw new _runtimeexceptions.ValidationException("Server update could not proceed as the server had no .git repository folder");
|
|
42
|
-
}
|
|
43
|
-
await this.simpleGitService.fetch();
|
|
44
|
-
const localRepoStatus = await this.simpleGitService.status();
|
|
45
|
-
if (!localRepoStatus) return;
|
|
46
|
-
const result = {
|
|
47
|
-
gitFolderFound: true,
|
|
48
|
-
updateCheckSuccess: true,
|
|
49
|
-
commitsBehind: localRepoStatus.behind,
|
|
50
|
-
commitsAhead: localRepoStatus.ahead,
|
|
51
|
-
filesModified: localRepoStatus.modified?.length,
|
|
52
|
-
status: "",
|
|
53
|
-
pullStatus: null
|
|
54
|
-
};
|
|
55
|
-
if (localRepoStatus?.behind === 0) {
|
|
56
|
-
result.status = "No commits to pull";
|
|
57
|
-
return result;
|
|
58
|
-
}
|
|
59
|
-
if (localRepoStatus?.modified?.length > 0 || localRepoStatus.ahead !== 0) {
|
|
60
|
-
result.status = "Files were modified or the repo was commits ahead - cannot pull safely";
|
|
61
|
-
return result;
|
|
62
|
-
}
|
|
63
|
-
this.logger.warn("Pulling git to get the latest server updates");
|
|
64
|
-
const pullDetails = await this.simpleGitService.pull();
|
|
65
|
-
result.status = "Pull action completed";
|
|
66
|
-
result.pullStatus = pullDetails;
|
|
67
|
-
return result;
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
//# sourceMappingURL=server-update.service.js.map
|