@fdm-monster/server 1.8.1 → 1.8.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.yarn/install-state.gz +0 -0
- package/.yarn/releases/{yarn-4.5.3.cjs → yarn-4.7.0.cjs} +256 -255
- package/.yarnrc.yml +1 -1
- package/README.md +14 -4
- package/RELEASE_NOTES.MD +35 -4
- package/dist/consoles/http-file-receiver.console.js +81 -0
- package/dist/consoles/http-file-receiver.console.js.map +1 -0
- package/dist/constants/event.constants.js +8 -0
- package/dist/constants/event.constants.js.map +1 -1
- package/dist/container.js +2 -14
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +1 -3
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/plugin-firmware-update.controller.js +4 -6
- package/dist/controllers/plugin-firmware-update.controller.js.map +1 -1
- package/dist/controllers/printer-files.controller.js +19 -22
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer-settings.controller.js +3 -3
- package/dist/controllers/printer-settings.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +14 -8
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +2 -16
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +0 -2
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/handlers/validators.js +9 -6
- package/dist/handlers/validators.js.map +1 -1
- package/dist/server.constants.js +1 -2
- package/dist/server.constants.js.map +1 -1
- package/dist/server.env.js +3 -25
- package/dist/server.env.js.map +1 -1
- package/dist/server.host.js +3 -1
- package/dist/server.host.js.map +1 -1
- package/dist/services/core/http-client.factory.js +40 -0
- package/dist/services/core/http-client.factory.js.map +1 -0
- package/dist/services/core/logs-manager.service.js +4 -3
- package/dist/services/core/logs-manager.service.js.map +1 -1
- package/dist/services/core/multer.service.js +72 -22
- package/dist/services/core/multer.service.js.map +1 -1
- package/dist/services/interfaces/file-upload-tracker.interface.js +6 -0
- package/dist/services/interfaces/file-upload-tracker.interface.js.map +1 -0
- package/dist/services/interfaces/printer.dto.js +6 -0
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/mongoose/printer.service.js +10 -3
- package/dist/services/mongoose/printer.service.js.map +1 -1
- package/dist/services/moonraker/moonraker-websocket.adapter.js +6 -2
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -1
- package/dist/services/moonraker/moonraker.client.js +196 -156
- package/dist/services/moonraker/moonraker.client.js.map +1 -1
- package/dist/services/octoprint/dto/plugin.dto.js +6 -0
- package/dist/services/octoprint/dto/plugin.dto.js.map +1 -0
- package/dist/services/octoprint/octoprint-api.routes.js +0 -61
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-websocket.adapter.js +11 -5
- package/dist/services/octoprint/octoprint-websocket.adapter.js.map +1 -1
- package/dist/services/octoprint/octoprint.client.js +118 -201
- package/dist/services/octoprint/octoprint.client.js.map +1 -1
- package/dist/services/octoprint/plugin-base.service.js +15 -15
- package/dist/services/octoprint/plugin-base.service.js.map +1 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js +1 -1
- package/dist/services/octoprint/plugin-firmware-update.service.js.map +1 -1
- package/dist/services/octoprint/plugin-repository.cache.js +2 -1
- package/dist/services/octoprint/plugin-repository.cache.js.map +1 -1
- package/dist/services/octoprint/utils/octoprint-http-client.builder.js +31 -0
- package/dist/services/octoprint/utils/octoprint-http-client.builder.js.map +1 -0
- package/dist/services/octoprint.api.js +6 -4
- package/dist/services/octoprint.api.js.map +1 -1
- package/dist/services/orm/printer.service.js +8 -3
- package/dist/services/orm/printer.service.js.map +1 -1
- package/dist/shared/default-http-client.builder.js +94 -0
- package/dist/shared/default-http-client.builder.js.map +1 -0
- package/dist/shared/websocket.adapter.js.map +1 -1
- package/dist/state/file-upload-tracker.cache.js +30 -40
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/settings.store.js +4 -1
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/dist/state/validation/create-test-printer.validation.js +1 -0
- package/dist/state/validation/create-test-printer.validation.js.map +1 -1
- package/dist/tasks/boot.task.js +1 -2
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/printer-websocket-restore.task.js +1 -1
- package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
- package/dist/tasks/socketio.task.js +2 -2
- package/dist/tasks/socketio.task.js.map +1 -1
- package/dist/tasks.js.map +1 -1
- package/dist/utils/env.utils.js +0 -42
- package/dist/utils/env.utils.js.map +1 -1
- package/dist/utils/normalize-url.js +3 -1
- package/dist/utils/normalize-url.js.map +1 -1
- package/dist/utils/pretty-print.utils.js +1 -1
- package/dist/utils/pretty-print.utils.js.map +1 -1
- package/dist/utils/url.utils.js +12 -14
- package/dist/utils/url.utils.js.map +1 -1
- package/package.json +40 -55
- package/dist/services/core/server-update.service.js +0 -71
- package/dist/services/core/server-update.service.js.map +0 -1
- package/requests/moonraker/api_job.http +0 -5
- package/requests/moonraker/api_printer.http +0 -5
- package/requests/moonraker/api_settings.http +0 -5
- package/requests/moonraker/printer_info.http +0 -5
- package/requests/moonraker/printer_objects_list.http +0 -6
- package/requests/moonraker/printer_objects_pause_resume.http +0 -6
- package/requests/moonraker/printer_objects_print_stats.http +0 -6
- package/requests/moonraker/printer_objects_webhooks.http +0 -6
- package/requests/moonraker/server_info.http +0 -5
- package/requests/octoprint/octoprint-api-printer-current.http +0 -7
- package/requests/octoprint/octoprint-pluginmanager-plugins.http +0 -7
- package/requests/printer-file/get-partial-file-moonraker.http +0 -5
- package/requests/printer-file/get-thumbnails.http +0 -5
- package/requests/printer-file/reload-printer-thumbnails.http +0 -10
- package/requests/printer-file/testfile.gcode +0 -5665
- package/requests/printer-file/upload-file.http +0 -11
- package/requests/printer-file/upload-slicer-file.http +0 -11
- package/requests/printers/list.http +0 -5
|
@@ -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
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/server-update.service.ts"],"names":["ServerUpdateService","simpleGitService","logger","constructor","loggerFactory","name","restartServer","isPm2","isNodemon","InternalServerException","execSync","AppConstants","pm2ServiceName","timeout","checkGitUpdates","isValidGitRepo","checkIsRepo","ValidationException","fetch","localRepoStatus","status","result","gitFolderFound","updateCheckSuccess","commitsBehind","behind","commitsAhead","ahead","filesModified","modified","length","pullStatus","warn","pullDetails","pull"],"mappings":";;;;+BAQaA;;;eAAAA;;;0BARoB;iCACJ;+BACJ;mCACoC;AAKtD,MAAMA;IACHC,iBAA4B;IAC5BC,OAAsB;IAE9BC,YAAY,EAAEF,gBAAgB,EAAEG,aAAa,EAAkE,CAAE;QAC/G,IAAI,CAACH,gBAAgB,GAAGA;QACxB,IAAI,CAACC,MAAM,GAAGE,cAAcJ,oBAAoBK,IAAI;IACtD;IAEA,MAAMC,gBAAgB;QACpB,IAAI,CAACC,IAAAA,eAAK,OAAM,CAACC,IAAAA,mBAAS,KAAI;YAE5B,MAAM,IAAIC,0CAAuB,CAAC;QACpC;QAEA,IAAIF,IAAAA,eAAK,KAAI;YACXG,IAAAA,uBAAQ,EAAC,CAAC,YAAY,EAAEC,6BAAY,CAACC,cAAc,EAAE,EAAE;gBAAEC,SAAS;YAAK;YACvE,OAAO;QACT,OAAO,IAAIL,IAAAA,mBAAS,KAAI;YACtBE,IAAAA,uBAAQ,EAAC,qEAAqE;gBAC5EG,SAAS;YACX;YACA,OAAO;QACT;IACF;IAEA,MAAMC,kBAAkB;QACtB,IAAIC,iBAAiB,IAAI,CAACd,gBAAgB,CAACe,WAAW;QACtD,IAAI,CAACD,gBAAgB;YACnB,MAAM,IAAIE,sCAAmB,CAAC;QAChC;QAEA,MAAM,IAAI,CAAChB,gBAAgB,CAACiB,KAAK;QACjC,MAAMC,kBAAkB,MAAM,IAAI,CAAClB,gBAAgB,CAACmB,MAAM;QAE1D,IAAI,CAACD,iBAAiB;QAEtB,MAAME,SAAS;YACbC,gBAAgB;YAChBC,oBAAoB;YACpBC,eAAeL,gBAAgBM,MAAM;YACrCC,cAAcP,gBAAgBQ,KAAK;YACnCC,eAAeT,gBAAgBU,QAAQ,EAAEC;YACzCV,QAAQ;YACRW,YAAY;QACd;QAEA,IAAIZ,iBAAiBM,WAAW,GAAG;YACjCJ,OAAOD,MAAM,GAAG;YAChB,OAAOC;QACT;QAGA,IAAIF,iBAAiBU,UAAUC,SAAS,KAAKX,gBAAgBQ,KAAK,KAAK,GAAG;YACxEN,OAAOD,MAAM,GAAG;YAChB,OAAOC;QACT;QAEA,IAAI,CAACnB,MAAM,CAAC8B,IAAI,CAAC;QAEjB,MAAMC,cAAc,MAAM,IAAI,CAAChC,gBAAgB,CAACiC,IAAI;QACpDb,OAAOD,MAAM,GAAG;QAChBC,OAAOU,UAAU,GAAGE;QACpB,OAAOZ;IACT;AACF"}
|