@fdm-monster/server 1.6.2 → 1.6.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.1.1.cjs → yarn-4.3.0.cjs} +343 -342
- package/.yarnrc.yml +1 -1
- package/CONTRIBUTING.md +2 -2
- package/README.md +22 -16
- package/RELEASE_NOTES.MD +6 -1
- package/dist/container.js +2 -0
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +1 -0
- package/dist/container.tokens.js.map +1 -1
- package/dist/data-source.js +3 -1
- package/dist/data-source.js.map +1 -1
- package/dist/entities/role.entity.js +3 -1
- package/dist/entities/role.entity.js.map +1 -1
- package/dist/migrations/1713300747465-ChangeRoleNameUnique.js +104 -0
- package/dist/migrations/1713300747465-ChangeRoleNameUnique.js.map +1 -0
- package/dist/services/moonraker/constants/websocket.constants.js +27 -0
- package/dist/services/moonraker/constants/websocket.constants.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/json-rpc-event.dto.js +6 -0
- package/dist/services/moonraker/dto/websocket/json-rpc-event.dto.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/message.types.js +6 -0
- package/dist/services/moonraker/dto/websocket/message.types.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/methods.js +49 -0
- package/dist/services/moonraker/dto/websocket/methods.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/notify-active-spool-set.params.js +6 -0
- package/dist/services/moonraker/dto/websocket/notify-active-spool-set.params.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/notify-agent-event.params.js +6 -0
- package/dist/services/moonraker/dto/websocket/notify-agent-event.params.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/notify-announcement-update.params.js +6 -0
- package/dist/services/moonraker/dto/websocket/notify-announcement-update.params.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/notify-announcement.params.js +6 -0
- package/dist/services/moonraker/dto/websocket/notify-announcement.params.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/notify-button-event.params.js +6 -0
- package/dist/services/moonraker/dto/websocket/notify-button-event.params.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/notify-filelist-changed.params.js +22 -0
- package/dist/services/moonraker/dto/websocket/notify-filelist-changed.params.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/notify-history-changed.params.js +6 -0
- package/dist/services/moonraker/dto/websocket/notify-history-changed.params.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/notify-job-queue-changed.params.js +6 -0
- package/dist/services/moonraker/dto/websocket/notify-job-queue-changed.params.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/notify-proc-stat-update.params.js +6 -0
- package/dist/services/moonraker/dto/websocket/notify-proc-stat-update.params.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/notify-sensor-update.params.js +6 -0
- package/dist/services/moonraker/dto/websocket/notify-sensor-update.params.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/notify-service-state-changed.params.js +6 -0
- package/dist/services/moonraker/dto/websocket/notify-service-state-changed.params.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/notify-spoolman-status-changed.js +6 -0
- package/dist/services/moonraker/dto/websocket/notify-spoolman-status-changed.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/notify-sudo-alert.params.js +6 -0
- package/dist/services/moonraker/dto/websocket/notify-sudo-alert.params.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/notify-update-response.params.js +27 -0
- package/dist/services/moonraker/dto/websocket/notify-update-response.params.js.map +1 -0
- package/dist/services/moonraker/dto/websocket/notify-user-change.params.js +6 -0
- package/dist/services/moonraker/dto/websocket/notify-user-change.params.js.map +1 -0
- package/dist/services/moonraker/moonraker-websocket.adapter.js +143 -0
- package/dist/services/moonraker/moonraker-websocket.adapter.js.map +1 -0
- package/dist/services/octoprint/octoprint-api.routes.js +1 -0
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.service.js +7 -7
- package/dist/services/octoprint/octoprint-api.service.js.map +1 -1
- package/dist/services/octoprint/octoprint-sockio.adapter.js +20 -15
- package/dist/services/octoprint/octoprint-sockio.adapter.js.map +1 -1
- package/dist/services/orm/printer-files.service.js +8 -2
- package/dist/services/orm/printer-files.service.js.map +1 -1
- package/dist/services/print-completion.service.js +4 -0
- package/dist/services/print-completion.service.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +5 -5
- package/dist/state/test-printer-socket.store.js.map +1 -1
- package/package.json +26 -25
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-proc-stat-update.params.ts"],"names":[],"rangeMappings":"","mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-sensor-update.params.ts"],"names":[],"rangeMappings":"","mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-service-state-changed.params.ts"],"names":[],"rangeMappings":"","mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-spoolman-status-changed.ts"],"names":[],"rangeMappings":"","mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-sudo-alert.params.ts"],"names":[],"rangeMappings":"","mappings":""}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
function _export(target, all) {
|
|
6
|
+
for(var name in all)Object.defineProperty(target, name, {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: all[name]
|
|
9
|
+
});
|
|
10
|
+
}
|
|
11
|
+
_export(exports, {
|
|
12
|
+
applicationList: function() {
|
|
13
|
+
return applicationList;
|
|
14
|
+
},
|
|
15
|
+
applications: function() {
|
|
16
|
+
return applications;
|
|
17
|
+
}
|
|
18
|
+
});
|
|
19
|
+
const applications = {
|
|
20
|
+
moonraker: "moonraker",
|
|
21
|
+
klipper: "klipper",
|
|
22
|
+
system: "system",
|
|
23
|
+
client: "client"
|
|
24
|
+
};
|
|
25
|
+
const applicationList = Object.keys(applications);
|
|
26
|
+
|
|
27
|
+
//# sourceMappingURL=notify-update-response.params.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-update-response.params.ts"],"names":["applicationList","applications","moonraker","klipper","system","client","Object","keys"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;;;;;;;;IAMaA,eAAe;eAAfA;;IANAC,YAAY;eAAZA;;;AAAN,MAAMA,eAAe;IAC1BC,WAAW;IACXC,SAAS;IACTC,QAAQ;IACRC,QAAQ;AACV;AACO,MAAML,kBAAkBM,OAAOC,IAAI,CAACN"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../../../src/services/moonraker/dto/websocket/notify-user-change.params.ts"],"names":[],"rangeMappings":"","mappings":""}
|
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", {
|
|
3
|
+
value: true
|
|
4
|
+
});
|
|
5
|
+
Object.defineProperty(exports, "MoonrakerWebsocketAdapter", {
|
|
6
|
+
enumerable: true,
|
|
7
|
+
get: function() {
|
|
8
|
+
return MoonrakerWebsocketAdapter;
|
|
9
|
+
}
|
|
10
|
+
});
|
|
11
|
+
const _websocketadapter = require("../../shared/websocket.adapter");
|
|
12
|
+
const _serverconstants = require("../../server.constants");
|
|
13
|
+
const _normalizeurl = require("../../utils/normalize-url");
|
|
14
|
+
const _urlutils = require("../../utils/url.utils");
|
|
15
|
+
const _octoprintsockioadapter = require("../octoprint/octoprint-sockio.adapter");
|
|
16
|
+
const _websocketconstants = require("./constants/websocket.constants");
|
|
17
|
+
class MoonrakerWebsocketAdapter extends _websocketadapter.WebsocketAdapter {
|
|
18
|
+
printerType = 1;
|
|
19
|
+
moonrakerClient;
|
|
20
|
+
logger;
|
|
21
|
+
eventEmitter;
|
|
22
|
+
configService;
|
|
23
|
+
socketState = _octoprintsockioadapter.SOCKET_STATE.unopened;
|
|
24
|
+
lastMessageReceivedTimestamp = null;
|
|
25
|
+
stateUpdated = false;
|
|
26
|
+
stateUpdateTimestamp = null;
|
|
27
|
+
apiStateUpdated = false;
|
|
28
|
+
apiStateUpdateTimestamp = null;
|
|
29
|
+
apiState = _octoprintsockioadapter.API_STATE.unset;
|
|
30
|
+
loginDto;
|
|
31
|
+
socketURL;
|
|
32
|
+
sessionDto;
|
|
33
|
+
printerId;
|
|
34
|
+
username;
|
|
35
|
+
constructor({ moonrakerClient, loggerFactory, eventEmitter2, configService }){
|
|
36
|
+
super({
|
|
37
|
+
loggerFactory
|
|
38
|
+
});
|
|
39
|
+
this.moonrakerClient = moonrakerClient;
|
|
40
|
+
this.logger = loggerFactory(MoonrakerWebsocketAdapter.name);
|
|
41
|
+
this.eventEmitter = eventEmitter2;
|
|
42
|
+
this.configService = configService;
|
|
43
|
+
}
|
|
44
|
+
get _debugMode() {
|
|
45
|
+
return this.configService.get(_serverconstants.AppConstants.debugSocketStatesKey, _serverconstants.AppConstants.defaultDebugSocketStates) === "true";
|
|
46
|
+
}
|
|
47
|
+
needsReopen() {
|
|
48
|
+
return false;
|
|
49
|
+
}
|
|
50
|
+
needsSetup() {
|
|
51
|
+
return this.socketState === _octoprintsockioadapter.SOCKET_STATE.unopened;
|
|
52
|
+
}
|
|
53
|
+
needsReauth() {
|
|
54
|
+
return false;
|
|
55
|
+
}
|
|
56
|
+
registerCredentials(socketLogin) {
|
|
57
|
+
const { printerId, loginDto, protocol } = socketLogin;
|
|
58
|
+
this.printerId = printerId;
|
|
59
|
+
this.loginDto = loginDto;
|
|
60
|
+
const httpUrl = (0, _normalizeurl.normalizeUrl)(this.loginDto.printerURL);
|
|
61
|
+
const wsUrl = (0, _urlutils.httpToWsUrl)(httpUrl, protocol);
|
|
62
|
+
wsUrl.pathname = "/websocket";
|
|
63
|
+
this.socketURL = wsUrl;
|
|
64
|
+
}
|
|
65
|
+
open() {
|
|
66
|
+
if (this.socket) {
|
|
67
|
+
throw new Error(`Socket already exists by printerId, ignoring open request`);
|
|
68
|
+
}
|
|
69
|
+
super.open(this.socketURL);
|
|
70
|
+
}
|
|
71
|
+
close() {
|
|
72
|
+
super.close();
|
|
73
|
+
}
|
|
74
|
+
async setupSocketSession() {
|
|
75
|
+
const oneshot = await this.moonrakerClient.getAccessOneshotToken(this.loginDto);
|
|
76
|
+
this.logger.log(`Oneshot ${oneshot.data.result}`);
|
|
77
|
+
}
|
|
78
|
+
emitEventSync(event, payload) {
|
|
79
|
+
this.eventEmitter.emit((0, _websocketconstants.moonrakerEvent)(event), {
|
|
80
|
+
event,
|
|
81
|
+
payload,
|
|
82
|
+
printerId: this.printerId
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
resetSocketState() {
|
|
86
|
+
this.setSocketState("unopened");
|
|
87
|
+
this.setApiState("unset");
|
|
88
|
+
}
|
|
89
|
+
isClosedOrAborted() {
|
|
90
|
+
return this.socketState === _octoprintsockioadapter.SOCKET_STATE.closed || this.socketState === _octoprintsockioadapter.SOCKET_STATE.aborted;
|
|
91
|
+
}
|
|
92
|
+
async afterOpened(event) {
|
|
93
|
+
this.setSocketState("opened");
|
|
94
|
+
}
|
|
95
|
+
async onMessage(message) {
|
|
96
|
+
this.lastMessageReceivedTimestamp = Date.now();
|
|
97
|
+
if (this.socketState !== _octoprintsockioadapter.SOCKET_STATE.authenticated) {
|
|
98
|
+
this.setSocketState("authenticated");
|
|
99
|
+
}
|
|
100
|
+
const data = JSON.parse(message);
|
|
101
|
+
const eventName = data.method;
|
|
102
|
+
const payload = data.params?.length ? data.params[0] : undefined;
|
|
103
|
+
if (eventName === "notify_proc_stat_update") return;
|
|
104
|
+
await this.emitEvent(eventName, payload);
|
|
105
|
+
}
|
|
106
|
+
async afterClosed(event) {
|
|
107
|
+
this.setSocketState("closed");
|
|
108
|
+
delete this.socket;
|
|
109
|
+
await this.emitEvent(_octoprintsockioadapter.WsMessage.WS_CLOSED, "connection closed");
|
|
110
|
+
}
|
|
111
|
+
async onError(error) {
|
|
112
|
+
this.setSocketState("error");
|
|
113
|
+
await this.emitEvent(_octoprintsockioadapter.WsMessage.WS_ERROR, error?.length ? error : "connection error");
|
|
114
|
+
}
|
|
115
|
+
async emitEvent(event, payload) {
|
|
116
|
+
await this.eventEmitter.emitAsync((0, _websocketconstants.moonrakerEvent)(event), {
|
|
117
|
+
event,
|
|
118
|
+
payload,
|
|
119
|
+
printerId: this.printerId,
|
|
120
|
+
printerType: 1
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
setSocketState(state) {
|
|
124
|
+
this.socketState = state;
|
|
125
|
+
this.stateUpdated = true;
|
|
126
|
+
this.stateUpdateTimestamp = Date.now();
|
|
127
|
+
if (this._debugMode) {
|
|
128
|
+
this.logger.log(`${this.printerId} Socket state updated to: ` + state);
|
|
129
|
+
}
|
|
130
|
+
this.emitEventSync(_octoprintsockioadapter.WsMessage.WS_STATE_UPDATED, state);
|
|
131
|
+
}
|
|
132
|
+
setApiState(state) {
|
|
133
|
+
this.apiState = state;
|
|
134
|
+
this.apiStateUpdated = true;
|
|
135
|
+
this.apiStateUpdateTimestamp = Date.now();
|
|
136
|
+
if (this._debugMode) {
|
|
137
|
+
this.logger.log(`${this.printerId} API state updated to: ` + state);
|
|
138
|
+
}
|
|
139
|
+
this.emitEventSync(_octoprintsockioadapter.WsMessage.API_STATE_UPDATED, state);
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
//# sourceMappingURL=moonraker-websocket.adapter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../../src/services/moonraker/moonraker-websocket.adapter.ts"],"names":["MoonrakerWebsocketAdapter","WebsocketAdapter","printerType","moonrakerClient","logger","eventEmitter","configService","socketState","SOCKET_STATE","unopened","lastMessageReceivedTimestamp","stateUpdated","stateUpdateTimestamp","apiStateUpdated","apiStateUpdateTimestamp","apiState","API_STATE","unset","loginDto","socketURL","sessionDto","printerId","username","constructor","loggerFactory","eventEmitter2","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","needsSetup","needsReauth","registerCredentials","socketLogin","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","pathname","open","socket","Error","close","setupSocketSession","oneshot","getAccessOneshotToken","log","data","result","emitEventSync","event","payload","emit","moonrakerEvent","resetSocketState","setSocketState","setApiState","isClosedOrAborted","closed","aborted","afterOpened","onMessage","message","Date","now","authenticated","JSON","parse","eventName","method","params","length","undefined","emitEvent","afterClosed","WsMessage","WS_CLOSED","onError","error","WS_ERROR","emitAsync","state","WS_STATE_UPDATED","API_STATE_UPDATED"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
|
|
@@ -17,6 +17,7 @@ class OctoPrintRoutes {
|
|
|
17
17
|
apiBase = `${this.octoPrintBase}api`;
|
|
18
18
|
apiVersion = `${this.apiBase}/version`;
|
|
19
19
|
apiServer = `${this.apiBase}/server`;
|
|
20
|
+
apiCurrentUser = `${this.apiBase}/currentuser`;
|
|
20
21
|
apiSettingsPart = `${this.apiBase}/settings`;
|
|
21
22
|
apiFiles = `${this.apiBase}/files`;
|
|
22
23
|
apiFilesLocation = `${this.apiFiles}/local`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.routes.ts"],"names":["OctoPrintRoutes","octoPrintBase","apiBase","apiVersion","apiServer","apiSettingsPart","apiFiles","apiFilesLocation","apiConnection","apiJob","apiPrinter","apiPrinterHead","apiPrinterBed","apiPrinterCustomCommand","apiPrinterProfiles","apiSystem","apiSystemInfo","apiSystemCommands","apiSystemRestartCommand","apiUsers","apiLogin","apiPluginPiSupport","apiProfiles","apiTimelapse","apiPlugin","apiPluginManager","pluginsBase","pluginSoftwareUpdate","pluginSoftwareUpdateCheck","pluginSoftwareUpdateUpdate","pluginFirmwareUpdater","pluginFirmwareUpdaterStatus","pluginFirmwareUpdaterFlash","pluginBackupIndex","pluginBackupEndpoint","pluginBackupFile","filename","pluginBackupFileDownload","pluginBackupFileRestore","pluginManager","pluginManagerPlugins","pluginManagerExport","pluginManagerOrphans","settingsStore","timeouts","constructor","disconnectCommand","command","cancelJobCommand","pauseJobCommand","action","resumeJobCommand","connectCommand","getBedTargetCommand","targetTemperature","target","pluginManagerPlugin","pluginName","pluginManagerRepository","refresh","apiPrinterCurrent","history","limit","exclude","filter","e","length","excludeParam","join","limitParam","apiFile","path","apiGetFiles","recursive","apiSoftwareUpdateCheck","force","selectCommand","print","moveFileCommand","destination","printerNameSetting","name","appearance","gcodeAnalysisSetting","enabled","gcodeAnalysis","runAt","pluginFirmwareUpdaterSettings","subsettings","plugins","firmwareupdater","pluginManagerCommand","url","ensureTimeoutSettingsLoaded","serverSettings","getSettings","timeoutSettingKey","Error","prepareRequest","login","timeoutOverride","contentType","jsonContentType","apiKey","printerURL","validateLogin","headers","constructHeaders","timeout","apiTimeout","getDefaultTimeout","URL","normalizeUrl","href","options","prepareAnonymousRequest","contentTypeHeaderKey","prepareJsonRequest","data","serializedData","JSON","stringify","undefined"],"rangeMappings":"
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.routes.ts"],"names":["OctoPrintRoutes","octoPrintBase","apiBase","apiVersion","apiServer","apiCurrentUser","apiSettingsPart","apiFiles","apiFilesLocation","apiConnection","apiJob","apiPrinter","apiPrinterHead","apiPrinterBed","apiPrinterCustomCommand","apiPrinterProfiles","apiSystem","apiSystemInfo","apiSystemCommands","apiSystemRestartCommand","apiUsers","apiLogin","apiPluginPiSupport","apiProfiles","apiTimelapse","apiPlugin","apiPluginManager","pluginsBase","pluginSoftwareUpdate","pluginSoftwareUpdateCheck","pluginSoftwareUpdateUpdate","pluginFirmwareUpdater","pluginFirmwareUpdaterStatus","pluginFirmwareUpdaterFlash","pluginBackupIndex","pluginBackupEndpoint","pluginBackupFile","filename","pluginBackupFileDownload","pluginBackupFileRestore","pluginManager","pluginManagerPlugins","pluginManagerExport","pluginManagerOrphans","settingsStore","timeouts","constructor","disconnectCommand","command","cancelJobCommand","pauseJobCommand","action","resumeJobCommand","connectCommand","getBedTargetCommand","targetTemperature","target","pluginManagerPlugin","pluginName","pluginManagerRepository","refresh","apiPrinterCurrent","history","limit","exclude","filter","e","length","excludeParam","join","limitParam","apiFile","path","apiGetFiles","recursive","apiSoftwareUpdateCheck","force","selectCommand","print","moveFileCommand","destination","printerNameSetting","name","appearance","gcodeAnalysisSetting","enabled","gcodeAnalysis","runAt","pluginFirmwareUpdaterSettings","subsettings","plugins","firmwareupdater","pluginManagerCommand","url","ensureTimeoutSettingsLoaded","serverSettings","getSettings","timeoutSettingKey","Error","prepareRequest","login","timeoutOverride","contentType","jsonContentType","apiKey","printerURL","validateLogin","headers","constructHeaders","timeout","apiTimeout","getDefaultTimeout","URL","normalizeUrl","href","options","prepareAnonymousRequest","contentTypeHeaderKey","prepareJsonRequest","data","serializedData","JSON","stringify","undefined"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
|
|
@@ -171,14 +171,14 @@ class OctoPrintApiService extends _octoprintapiroutes.OctoPrintRoutes {
|
|
|
171
171
|
const response = await this.axiosClient.post(url, settingPatch, options);
|
|
172
172
|
return response?.data;
|
|
173
173
|
}
|
|
174
|
+
async getCurrentUser(login) {
|
|
175
|
+
const { url, options } = this.prepareRequest(login, this.apiCurrentUser);
|
|
176
|
+
const response = await this.axiosClient.get(url, options);
|
|
177
|
+
return response?.data;
|
|
178
|
+
}
|
|
174
179
|
async getAdminUserOrDefault(login) {
|
|
175
|
-
const
|
|
176
|
-
|
|
177
|
-
if (!!data?.users && Array.isArray(data.users)) {
|
|
178
|
-
const adminUser = data.users.find((user)=>!!user.admin);
|
|
179
|
-
if (!!adminUser) opAdminUserName = adminUser.name;
|
|
180
|
-
}
|
|
181
|
-
return opAdminUserName;
|
|
180
|
+
const currentUser = await this.getCurrentUser(login);
|
|
181
|
+
return currentUser?.name;
|
|
182
182
|
}
|
|
183
183
|
async getUsers(login) {
|
|
184
184
|
const { url, options } = this.prepareRequest(login, this.apiUsers);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.service.ts"],"names":["OctoPrintApiService","OctoPrintRoutes","eventEmitter2","axiosClient","logger","constructor","settingsStore","httpClient","loggerFactory","name","getVersion","login","timeout","url","options","prepareRequest","apiVersion","response","get","data","getServer","apiServer","apiLogin","post","sendConnectionCommand","commandData","prepareJsonRequest","apiConnection","sendPrintHeadJogCommand","amounts","axesToHome","x","y","z","command","sendPrintHeadCommand","sendPrintHeadHomeCommand","axes","apiPrinterHead","sendCustomGCodeCommand","commandString","apiPrinterCustomCommand","sendJobCommand","apiJob","sendBedTempCommand","targetTemp","apiPrinterBed","getBedTargetCommand","getSettings","apiSettingsPart","updatePrinterNameSetting","printerName","settingPatch","printerNameSetting","updateFirmwareUpdaterSettings","firmwareUpdateConfig","pluginFirmwareUpdaterSettings","setGCodeAnalysis","enabled","gcodeAnalysisSetting","getAdminUserOrDefault","getUsers","opAdminUserName","users","Array","isArray","adminUser","find","user","admin","apiUsers","getLocalFiles","recursive","apiGetFiles","files","filter","f","date","map","normalizePrinterFile","getFile","path","pathUrl","apiFile","e","captureException","error","createFolder","foldername","apiFilesLocation","formData","FormData","append","headers","getHeaders","getLengthSync","moveFileOrFolder","destination","moveFileCommand","selectPrintFile","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","postSystemRestartCommand","apiSystemRestartCommand","getSoftwareUpdateCheck","force","apiSoftwareUpdateCheck","getPluginPiSupport","apiPluginPiSupport","deleteTimeLapse","fileName","apiTimelapse","listUnrenderedTimeLapses","listProfiles","apiProfiles","getBackupOverview","pluginBackupIndex","getBackups","pluginBackupEndpoint","createBackup","excludeArray","getDownloadBackupStream","pluginBackupFileDownload","responseType","catch","forwardRestoreBackupFileStream","pluginBackupFileRestore","deleteBackup","pluginBackupFile"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/octoprint-api.service.ts"],"names":["OctoPrintApiService","OctoPrintRoutes","eventEmitter2","axiosClient","logger","constructor","settingsStore","httpClient","loggerFactory","name","getVersion","login","timeout","url","options","prepareRequest","apiVersion","response","get","data","getServer","apiServer","apiLogin","post","sendConnectionCommand","commandData","prepareJsonRequest","apiConnection","sendPrintHeadJogCommand","amounts","axesToHome","x","y","z","command","sendPrintHeadCommand","sendPrintHeadHomeCommand","axes","apiPrinterHead","sendCustomGCodeCommand","commandString","apiPrinterCustomCommand","sendJobCommand","apiJob","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","createFolder","foldername","apiFilesLocation","formData","FormData","append","headers","getHeaders","getLengthSync","moveFileOrFolder","destination","moveFileCommand","selectPrintFile","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","postSystemRestartCommand","apiSystemRestartCommand","getSoftwareUpdateCheck","force","apiSoftwareUpdateCheck","getPluginPiSupport","apiPluginPiSupport","deleteTimeLapse","fileName","apiTimelapse","listUnrenderedTimeLapses","listProfiles","apiProfiles","getBackupOverview","pluginBackupIndex","getBackups","pluginBackupEndpoint","createBackup","excludeArray","getDownloadBackupStream","pluginBackupFileDownload","responseType","catch","forwardRestoreBackupFileStream","pluginBackupFileRestore","deleteBackup","pluginBackupFile"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
|
|
@@ -12,8 +12,8 @@ _export(exports, {
|
|
|
12
12
|
API_STATE: function() {
|
|
13
13
|
return API_STATE;
|
|
14
14
|
},
|
|
15
|
-
|
|
16
|
-
return
|
|
15
|
+
OctoPrintMessage: function() {
|
|
16
|
+
return OctoPrintMessage;
|
|
17
17
|
},
|
|
18
18
|
OctoPrintSockIoAdapter: function() {
|
|
19
19
|
return OctoPrintSockIoAdapter;
|
|
@@ -21,6 +21,9 @@ _export(exports, {
|
|
|
21
21
|
SOCKET_STATE: function() {
|
|
22
22
|
return SOCKET_STATE;
|
|
23
23
|
},
|
|
24
|
+
WsMessage: function() {
|
|
25
|
+
return WsMessage;
|
|
26
|
+
},
|
|
24
27
|
octoPrintEvent: function() {
|
|
25
28
|
return octoPrintEvent;
|
|
26
29
|
}
|
|
@@ -32,7 +35,14 @@ const _urlutils = require("../../utils/url.utils");
|
|
|
32
35
|
const _normalizeurl = require("../../utils/normalize-url");
|
|
33
36
|
const _websocketadapter = require("../../shared/websocket.adapter");
|
|
34
37
|
const _nodefs = require("node:fs");
|
|
35
|
-
const
|
|
38
|
+
const WsMessage = {
|
|
39
|
+
WS_OPENED: "WS_OPENED",
|
|
40
|
+
WS_CLOSED: "WS_CLOSED",
|
|
41
|
+
WS_ERROR: "WS_ERROR",
|
|
42
|
+
API_STATE_UPDATED: "API_STATE_UPDATED",
|
|
43
|
+
WS_STATE_UPDATED: "WS_STATE_UPDATED"
|
|
44
|
+
};
|
|
45
|
+
const OctoPrintMessage = {
|
|
36
46
|
connected: "connected",
|
|
37
47
|
reauthRequired: "reauthRequired",
|
|
38
48
|
current: "current",
|
|
@@ -40,12 +50,7 @@ const Message = {
|
|
|
40
50
|
event: "event",
|
|
41
51
|
plugin: "plugin",
|
|
42
52
|
timelapse: "timelapse",
|
|
43
|
-
slicingProgress: "slicingProgress"
|
|
44
|
-
WS_OPENED: "WS_OPENED",
|
|
45
|
-
WS_CLOSED: "WS_CLOSED",
|
|
46
|
-
WS_ERROR: "WS_ERROR",
|
|
47
|
-
API_STATE_UPDATED: "API_STATE_UPDATED",
|
|
48
|
-
WS_STATE_UPDATED: "WS_STATE_UPDATED"
|
|
53
|
+
slicingProgress: "slicingProgress"
|
|
49
54
|
};
|
|
50
55
|
const SOCKET_STATE = {
|
|
51
56
|
unopened: "unopened",
|
|
@@ -225,10 +230,10 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
225
230
|
if (this._debugMode) {
|
|
226
231
|
this.logger.log(`RX Msg ${eventName} ${message.substring(0, 140)}...`);
|
|
227
232
|
}
|
|
228
|
-
if (eventName ===
|
|
233
|
+
if (eventName === OctoPrintMessage.reauthRequired) {
|
|
229
234
|
this.logger.log("Received 'reauthRequired', acting on it");
|
|
230
235
|
this.setReauthRequired();
|
|
231
|
-
} else if (eventName ===
|
|
236
|
+
} else if (eventName === OctoPrintMessage.current && this.configService.get(_serverconstants.AppConstants.debugFileWritePrinterStatesKey, _serverconstants.AppConstants.defaultDebugFileWritePrinterStates) === "true") {
|
|
232
237
|
(0, _nodefs.writeFileSync)(`websocket_current_${this.printerId}.txt`, JSON.stringify(payload, null, 2));
|
|
233
238
|
}
|
|
234
239
|
await this.emitEvent(eventName, payload);
|
|
@@ -236,11 +241,11 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
236
241
|
async afterClosed(event) {
|
|
237
242
|
this.setSocketState("closed");
|
|
238
243
|
delete this.socket;
|
|
239
|
-
await this.emitEvent(
|
|
244
|
+
await this.emitEvent(WsMessage.WS_CLOSED, "connection closed");
|
|
240
245
|
}
|
|
241
246
|
async onError(error) {
|
|
242
247
|
this.setSocketState("error");
|
|
243
|
-
await this.emitEvent(
|
|
248
|
+
await this.emitEvent(WsMessage.WS_ERROR, error?.length ? error : "connection error");
|
|
244
249
|
}
|
|
245
250
|
async emitEvent(event, payload) {
|
|
246
251
|
await this.eventEmitter.emitAsync(octoPrintEvent(event), {
|
|
@@ -262,7 +267,7 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
262
267
|
if (this._debugMode) {
|
|
263
268
|
this.logger.log(`${this.printerId} Socket state updated to: ` + state);
|
|
264
269
|
}
|
|
265
|
-
this.emitEventSync(
|
|
270
|
+
this.emitEventSync(WsMessage.WS_STATE_UPDATED, state);
|
|
266
271
|
}
|
|
267
272
|
setApiState(state) {
|
|
268
273
|
this.apiState = state;
|
|
@@ -271,7 +276,7 @@ class OctoPrintSockIoAdapter extends _websocketadapter.WebsocketAdapter {
|
|
|
271
276
|
if (this._debugMode) {
|
|
272
277
|
this.logger.log(`${this.printerId} API state updated to: ` + state);
|
|
273
278
|
}
|
|
274
|
-
this.emitEventSync(
|
|
279
|
+
this.emitEventSync(WsMessage.API_STATE_UPDATED, state);
|
|
275
280
|
}
|
|
276
281
|
}
|
|
277
282
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/octoprint/octoprint-sockio.adapter.ts"],"names":["API_STATE","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/octoprint/octoprint-sockio.adapter.ts"],"names":["API_STATE","OctoPrintMessage","OctoPrintSockIoAdapter","SOCKET_STATE","WsMessage","octoPrintEvent","WS_OPENED","WS_CLOSED","WS_ERROR","API_STATE_UPDATED","WS_STATE_UPDATED","connected","reauthRequired","current","history","event","plugin","timelapse","slicingProgress","unopened","opening","authenticating","opened","authenticated","aborted","error","closed","unset","noResponse","globalKey","authFail","responding","WebsocketAdapter","octoPrintApiService","printerId","stateUpdated","stateUpdateTimestamp","socketState","apiStateUpdated","apiStateUpdateTimestamp","apiState","lastMessageReceivedTimestamp","reauthRequiredTimestamp","loginDto","logger","eventEmitter","configService","socketURL","sessionDto","username","constructor","loggerFactory","eventEmitter2","name","_debugMode","get","AppConstants","debugSocketStatesKey","defaultDebugSocketStates","needsReopen","isApiOnline","needsSetup","needsReauth","isClosedOrAborted","registerCredentials","socketLogin","protocol","httpUrl","normalizeUrl","printerURL","wsUrl","httpToWsUrl","pathname","open","socket","Error","close","sendThrottle","throttle","defaultSocketThrottleRate","sendMessage","JSON","stringify","reauthSession","log","setupSocketSession","sendAuth","resetReauthRequired","resetSocketState","login","then","r","setApiState","setSocketState","ExternalServiceError","needs","group","warn","catch","e","response","status","getAdminUserOrDefault","HttpStatusCode","FORBIDDEN","BAD_GATEWAY","NOT_IMPLEMENTED","SERVICE_UNAVAILABLE","GATEWAY_TIMEOUT","includes","setReauthRequired","Date","now","emitEventSync","payload","emit","afterOpened","onMessage","message","data","parse","eventName","Object","keys","substring","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","writeFileSync","emitEvent","afterClosed","onError","length","emitAsync","auth","session","state"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
|
|
@@ -54,11 +54,14 @@ class PrinterFilesService extends (0, _baseservice.BaseService)(_printerfileenti
|
|
|
54
54
|
await this.deletePrinterFiles(printerId, deletableSavedFilePaths, false);
|
|
55
55
|
for (const newFile of newFiles){
|
|
56
56
|
try {
|
|
57
|
+
if (!newFile.hash?.length) {
|
|
58
|
+
this.logger.log(`Skipping folder ${newFile.path}`);
|
|
59
|
+
continue;
|
|
60
|
+
}
|
|
57
61
|
await this.appendOrReplaceFile(printerId, newFile);
|
|
58
62
|
} catch (e) {
|
|
59
63
|
(0, _node.captureException)(e);
|
|
60
|
-
this.logger.error(`Error appending file`);
|
|
61
|
-
throw e;
|
|
64
|
+
this.logger.error(`Error appending file, skipping it`);
|
|
62
65
|
}
|
|
63
66
|
}
|
|
64
67
|
return await this.getPrinterFiles(printerId);
|
|
@@ -69,6 +72,9 @@ class PrinterFilesService extends (0, _baseservice.BaseService)(_printerfileenti
|
|
|
69
72
|
if (!addedFile.customData) {
|
|
70
73
|
addedFile.customData = {};
|
|
71
74
|
}
|
|
75
|
+
if (!addedFile?.hash?.length) {
|
|
76
|
+
throw new Error("File without hash");
|
|
77
|
+
}
|
|
72
78
|
const foundFile = await this.getPrinterFile(printer.id, addedFile.path);
|
|
73
79
|
if (!foundFile) {
|
|
74
80
|
await this.create(addedFile);
|