@fdm-monster/server 1.9.1 → 1.9.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.10.3.cjs → yarn-4.12.0.cjs} +300 -300
- package/.yarnrc.yml +1 -1
- package/README.md +3 -2
- package/RELEASE_NOTES.MD +11 -0
- package/dist/consoles/mock-bambu.server.js +305 -0
- package/dist/consoles/mock-bambu.server.js.map +1 -0
- package/dist/constants/server-settings.constants.js +1 -0
- package/dist/constants/server-settings.constants.js.map +1 -1
- package/dist/container.js +8 -0
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +4 -0
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/first-time-setup.controller.js +33 -2
- package/dist/controllers/first-time-setup.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +10 -10
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +4 -0
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/controllers/settings.controller.js +22 -0
- package/dist/controllers/settings.controller.js.map +1 -1
- package/dist/entities/settings.entity.js.map +1 -1
- package/dist/middleware/global.middleware.js +1 -0
- package/dist/middleware/global.middleware.js.map +1 -1
- package/dist/middleware/printer.js +11 -0
- package/dist/middleware/printer.js.map +1 -1
- package/dist/models/Settings.js +5 -0
- package/dist/models/Settings.js.map +1 -1
- package/dist/server.constants.js +1 -1
- package/dist/services/bambu/bambu-ftp.adapter.js +204 -0
- package/dist/services/bambu/bambu-ftp.adapter.js.map +1 -0
- package/dist/services/bambu/bambu-mqtt.adapter.js +387 -0
- package/dist/services/bambu/bambu-mqtt.adapter.js.map +1 -0
- package/dist/services/bambu/bambu.client.js +67 -0
- package/dist/services/bambu/bambu.client.js.map +1 -0
- package/dist/services/bambu/mqtt-message.types.js +6 -0
- package/dist/services/bambu/mqtt-message.types.js.map +1 -0
- package/dist/services/bambu.api.js +221 -0
- package/dist/services/bambu.api.js.map +1 -0
- package/dist/services/core/yaml.service.js +123 -37
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/interfaces/printer.dto.js.map +1 -1
- package/dist/services/interfaces/settings.dto.js.map +1 -1
- package/dist/services/mongoose/floor.service.js +1 -1
- package/dist/services/mongoose/floor.service.js.map +1 -1
- package/dist/services/mongoose/settings.service.js.map +1 -1
- package/dist/services/mongoose/user.service.js +7 -0
- package/dist/services/mongoose/user.service.js.map +1 -1
- package/dist/services/orm/floor.service.js +1 -1
- package/dist/services/orm/settings.service.js +0 -4
- package/dist/services/orm/settings.service.js.map +1 -1
- package/dist/services/orm/user.service.js +8 -0
- package/dist/services/orm/user.service.js.map +1 -1
- package/dist/services/printer-api.factory.js +7 -1
- package/dist/services/printer-api.factory.js.map +1 -1
- package/dist/services/printer-api.interface.js +5 -0
- package/dist/services/printer-api.interface.js.map +1 -1
- package/dist/services/socket.factory.js +3 -0
- package/dist/services/socket.factory.js.map +1 -1
- package/dist/services/validators/printer-service.validation.js +1 -1
- package/dist/services/validators/printer-service.validation.js.map +1 -1
- package/dist/services/validators/settings-service.validation.js +8 -1
- package/dist/services/validators/settings-service.validation.js.map +1 -1
- package/dist/services/validators/yaml-service.validation.js +27 -1
- package/dist/services/validators/yaml-service.validation.js.map +1 -1
- package/dist/shared/runtime-settings.migration.js +1 -0
- package/dist/shared/runtime-settings.migration.js.map +1 -1
- package/dist/state/printer-events.cache.js +13 -0
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/settings.store.js +13 -4
- package/dist/state/settings.store.js.map +1 -1
- package/package.json +32 -25
- package/dist/utils/printer-type.utils.js +0 -32
- package/dist/utils/printer-type.utils.js.map +0 -1
|
@@ -128,6 +128,13 @@ class UserService {
|
|
|
128
128
|
user.needsPasswordChange = false;
|
|
129
129
|
return await user.save();
|
|
130
130
|
}
|
|
131
|
+
async updatePasswordHashUnsafeByUsername(username, passwordHash) {
|
|
132
|
+
const user = await this.findRawByUsername(username);
|
|
133
|
+
if (!user) throw new _runtimeexceptions.NotFoundException("User not found");
|
|
134
|
+
user.passwordHash = passwordHash;
|
|
135
|
+
user.needsPasswordChange = false;
|
|
136
|
+
return await user.save();
|
|
137
|
+
}
|
|
131
138
|
async setIsRootUserById(userId, isRootUser) {
|
|
132
139
|
const user = await _models.User.findById(userId);
|
|
133
140
|
if (!user) throw new _runtimeexceptions.NotFoundException("User not found");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/mongoose/user.service.ts"],"names":["UserService","roleService","toDto","user","id","createdAt","isVerified","isDemoUser","isRootUser","username","needsPasswordChange","roles","map","r","toString","listUsers","limit","User","find","findUsersByRoleId","roleId","$in","findVerifiedUsers","isUserRootUser","userId","entity","getUser","findRootUsers","getDemoUserId","findOne","findRawByUsername","findById","NotFoundException","getUserRoleIds","setUserRoleIds","roleIds","getManyRoles","Array","from","Set","save","deleteUser","InternalServerException","role","getRoleByName","ROLES","ADMIN","includes","administrators","length","findByIdAndDelete","updateUsernameById","newUsername","updatePasswordById","oldPassword","newPassword","comparePasswordHash","passwordHash","password","validateInput","newPasswordSchema","hashPassword","updatePasswordUnsafeByUsername","setIsRootUserById","rootUsers","setVerifiedById","verifiedUsers","register","input","registerUserSchema","create"],"mappings":"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
|
|
1
|
+
{"version":3,"sources":["../../../src/services/mongoose/user.service.ts"],"names":["UserService","roleService","toDto","user","id","createdAt","isVerified","isDemoUser","isRootUser","username","needsPasswordChange","roles","map","r","toString","listUsers","limit","User","find","findUsersByRoleId","roleId","$in","findVerifiedUsers","isUserRootUser","userId","entity","getUser","findRootUsers","getDemoUserId","findOne","findRawByUsername","findById","NotFoundException","getUserRoleIds","setUserRoleIds","roleIds","getManyRoles","Array","from","Set","save","deleteUser","InternalServerException","role","getRoleByName","ROLES","ADMIN","includes","administrators","length","findByIdAndDelete","updateUsernameById","newUsername","updatePasswordById","oldPassword","newPassword","comparePasswordHash","passwordHash","password","validateInput","newPasswordSchema","hashPassword","updatePasswordUnsafeByUsername","updatePasswordHashUnsafeByUsername","setIsRootUserById","rootUsers","setVerifiedById","verifiedUsers","register","input","registerUserSchema","create"],"mappings":"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"}
|
|
@@ -38,10 +38,6 @@ class SettingsService extends (0, _baseservice.BaseService)(_entities.Settings,
|
|
|
38
38
|
return await this.update(settingsId, settings);
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
|
-
async getServerSettings() {
|
|
42
|
-
const settings = await this.getOrCreate();
|
|
43
|
-
return settings[_serversettingsconstants.serverSettingsKey];
|
|
44
|
-
}
|
|
45
41
|
async updateServerSettings(update) {
|
|
46
42
|
const validatedInput = await (0, _validators.validateInput)(update, _settingsservicevalidation.serverSettingsUpdateSchema);
|
|
47
43
|
const entity = await this.getOrCreate();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService","BaseService","Settings","SettingsDto","toDto","entity","serverSettingsKey","experimentalTypeormSupport","frontendSettingKey","printerFileCleanSettingKey","wizardSettingKey","timeoutSettingKey","getOrCreate","settings","getOptional","create","getDefaultSettings","migrateSettingsRuntime","settingsId","id","update","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/settings.service.ts"],"names":["SettingsService","BaseService","Settings","SettingsDto","toDto","entity","serverSettingsKey","experimentalTypeormSupport","frontendSettingKey","printerFileCleanSettingKey","wizardSettingKey","timeoutSettingKey","getOrCreate","settings","getOptional","create","getDefaultSettings","migrateSettingsRuntime","settingsId","id","update","updateServerSettings","validatedInput","validateInput","serverSettingsUpdateSchema","updateJwtSecretCredentialSetting","jwtSecretCredentialSettingUpdateSchema","credentialSettingsKey","jwtSecret","updateCredentialSettings","credentialSettingUpdateSchema","refreshTokenExpiry","refreshTokenAttempts","jwtExpiresIn","updateFileCleanSettings","fileCleanSettingsUpdateSchema","updateFrontendSettings","frontendSettingsUpdateSchema","updateTimeoutSettings","timeoutSettingsUpdateSchema","updateWizardSettings","wizardUpdateSchema","settingsList","repository","find","take","length"],"mappings":"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"}
|
|
@@ -155,6 +155,14 @@ class UserService extends (0, _baseservice.BaseService)(_entities.User, _userdto
|
|
|
155
155
|
needsPasswordChange: false
|
|
156
156
|
});
|
|
157
157
|
}
|
|
158
|
+
async updatePasswordHashUnsafeByUsername(username, passwordHash) {
|
|
159
|
+
const user = await this.findRawByUsername(username);
|
|
160
|
+
if (!user) throw new _runtimeexceptions.NotFoundException("User not found");
|
|
161
|
+
return await this.update(user.id, {
|
|
162
|
+
passwordHash,
|
|
163
|
+
needsPasswordChange: false
|
|
164
|
+
});
|
|
165
|
+
}
|
|
158
166
|
updateUsernameById(userId, newUsername) {
|
|
159
167
|
return this.update(userId, {
|
|
160
168
|
username: newUsername
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/orm/user.service.ts"],"names":["UserService","BaseService","User","UserDto","typeormService","userRoleService","roleService","toDto","user","id","createdAt","isVerified","isDemoUser","isRootUser","username","needsPasswordChange","roles","map","r","roleId","listUsers","limit","list","take","getUser","userId","get","getUserRoleIds","userRoles","listUserRoles","ur","findRootUsers","repository","findBy","findUsersByRoleId","listByRoleId","ids","u","In","findVerifiedUsers","isUserRootUser","entity","deleteUser","InternalServerException","length","role","getRoleByName","ROLES","ADMIN","find","administrators","delete","findRawByUsername","findOneBy","getDemoUserId","setIsRootUserById","NotFoundException","rootUsers","update","setUserRoleIds","roleIds","setUserRoles","setVerifiedById","verifiedUsers","updatePasswordById","oldPassword","newPassword","comparePasswordHash","passwordHash","password","validateInput","newPasswordSchema","hashPassword","updatePasswordUnsafeByUsername","updateUsernameById","newUsername","register","input","registerUserSchema","result","create"],"mappings":"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
|
|
1
|
+
{"version":3,"sources":["../../../src/services/orm/user.service.ts"],"names":["UserService","BaseService","User","UserDto","typeormService","userRoleService","roleService","toDto","user","id","createdAt","isVerified","isDemoUser","isRootUser","username","needsPasswordChange","roles","map","r","roleId","listUsers","limit","list","take","getUser","userId","get","getUserRoleIds","userRoles","listUserRoles","ur","findRootUsers","repository","findBy","findUsersByRoleId","listByRoleId","ids","u","In","findVerifiedUsers","isUserRootUser","entity","deleteUser","InternalServerException","length","role","getRoleByName","ROLES","ADMIN","find","administrators","delete","findRawByUsername","findOneBy","getDemoUserId","setIsRootUserById","NotFoundException","rootUsers","update","setUserRoleIds","roleIds","setUserRoles","setVerifiedById","verifiedUsers","updatePasswordById","oldPassword","newPassword","comparePasswordHash","passwordHash","password","validateInput","newPasswordSchema","hashPassword","updatePasswordUnsafeByUsername","updatePasswordHashUnsafeByUsername","updateUsernameById","newUsername","register","input","registerUserSchema","result","create"],"mappings":"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"}
|
|
@@ -18,7 +18,11 @@ class PrinterApiFactory {
|
|
|
18
18
|
getById(id) {
|
|
19
19
|
const printerCache = this.cradleService.resolve(_containertokens.DITokens.printerCache);
|
|
20
20
|
const login = printerCache.getLoginDto(id);
|
|
21
|
-
|
|
21
|
+
const printerApi = this.getScopedPrinter(login);
|
|
22
|
+
if (login.printerType === _printerapiinterface.BambuType && 'setPrinterId' in printerApi) {
|
|
23
|
+
printerApi.setPrinterId(id);
|
|
24
|
+
}
|
|
25
|
+
return printerApi;
|
|
22
26
|
}
|
|
23
27
|
getScopedPrinter(login) {
|
|
24
28
|
let printerApi;
|
|
@@ -28,6 +32,8 @@ class PrinterApiFactory {
|
|
|
28
32
|
printerApi = this.cradleService.resolve(_containertokens.DITokens.moonrakerApi);
|
|
29
33
|
} else if (login.printerType === _printerapiinterface.PrusaLinkType) {
|
|
30
34
|
printerApi = this.cradleService.resolve(_containertokens.DITokens.prusaLinkApi);
|
|
35
|
+
} else if (login.printerType === _printerapiinterface.BambuType) {
|
|
36
|
+
printerApi = this.cradleService.resolve(_containertokens.DITokens.bambuApi);
|
|
31
37
|
} else {
|
|
32
38
|
throw new Error("PrinterType is unknown, cant pick the right socket adapter");
|
|
33
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/printer-api.factory.ts"],"names":["PrinterApiFactory","cradleService","getById","id","printerCache","resolve","DITokens","login","getLoginDto","
|
|
1
|
+
{"version":3,"sources":["../../src/services/printer-api.factory.ts"],"names":["PrinterApiFactory","cradleService","getById","id","printerCache","resolve","DITokens","login","getLoginDto","printerApi","getScopedPrinter","printerType","BambuType","setPrinterId","OctoprintType","octoprintApi","MoonrakerType","moonrakerApi","PrusaLinkType","prusaLinkApi","bambuApi","Error"],"mappings":";;;;+BAOaA;;;eAAAA;;;qCAPuE;iCAC3D;AAMlB,MAAMA;;IACX,YACE,AAAiBC,aAA4B,CAC7C;aADiBA,gBAAAA;IAEnB;IAEAC,QAAQC,EAAU,EAAe;QAC/B,MAAMC,eAAe,IAAI,CAACH,aAAa,CAACI,OAAO,CAAeC,yBAAQ,CAACF,YAAY;QACnF,MAAMG,QAAQH,aAAaI,WAAW,CAACL;QACvC,MAAMM,aAAa,IAAI,CAACC,gBAAgB,CAACH;QAGzC,IAAIA,MAAMI,WAAW,KAAKC,8BAAS,IAAI,kBAAkBH,YAAY;YAClEA,WAAmBI,YAAY,CAACV;QACnC;QAEA,OAAOM;IACT;IAEAC,iBAAiBH,KAAe,EAAe;QAC7C,IAAIE;QACJ,IAAIF,MAAMI,WAAW,KAAKG,kCAAa,EAAE;YACvCL,aAAa,IAAI,CAACR,aAAa,CAACI,OAAO,CAAcC,yBAAQ,CAACS,YAAY;QAC5E,OAAO,IAAIR,MAAMI,WAAW,KAAKK,kCAAa,EAAE;YAC9CP,aAAa,IAAI,CAACR,aAAa,CAACI,OAAO,CAAcC,yBAAQ,CAACW,YAAY;QAC5E,OAAO,IAAIV,MAAMI,WAAW,KAAKO,kCAAa,EAAE;YAC9CT,aAAa,IAAI,CAACR,aAAa,CAACI,OAAO,CAAcC,yBAAQ,CAACa,YAAY;QAC5E,OAAO,IAAIZ,MAAMI,WAAW,KAAKC,8BAAS,EAAE;YAC1CH,aAAa,IAAI,CAACR,aAAa,CAACI,OAAO,CAAcC,yBAAQ,CAACc,QAAQ;QACxE,OAAO;YACL,MAAM,IAAIC,MAAM;QAClB;QAEAZ,WAAWF,KAAK,GAAGA;QACnB,OAAOE;IACT;AACF"}
|
|
@@ -9,6 +9,9 @@ function _export(target, all) {
|
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
_export(exports, {
|
|
12
|
+
get BambuType () {
|
|
13
|
+
return BambuType;
|
|
14
|
+
},
|
|
12
15
|
get MoonrakerType () {
|
|
13
16
|
return MoonrakerType;
|
|
14
17
|
},
|
|
@@ -28,10 +31,12 @@ _export(exports, {
|
|
|
28
31
|
const OctoprintType = 0;
|
|
29
32
|
const MoonrakerType = 1;
|
|
30
33
|
const PrusaLinkType = 2;
|
|
34
|
+
const BambuType = 3;
|
|
31
35
|
var PrinterTypesEnum = /*#__PURE__*/ function(PrinterTypesEnum) {
|
|
32
36
|
PrinterTypesEnum[PrinterTypesEnum["Octoprint"] = 0] = "Octoprint";
|
|
33
37
|
PrinterTypesEnum[PrinterTypesEnum["Moonraker"] = 1] = "Moonraker";
|
|
34
38
|
PrinterTypesEnum[PrinterTypesEnum["PrusaLink"] = 2] = "PrusaLink";
|
|
39
|
+
PrinterTypesEnum[PrinterTypesEnum["Bambu"] = 3] = "Bambu";
|
|
35
40
|
return PrinterTypesEnum;
|
|
36
41
|
}({});
|
|
37
42
|
var ReprintState = /*#__PURE__*/ function(ReprintState) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/printer-api.interface.ts"],"names":["MoonrakerType","OctoprintType","PrinterTypesEnum","PrusaLinkType","ReprintState"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/services/printer-api.interface.ts"],"names":["BambuType","MoonrakerType","OctoprintType","PrinterTypesEnum","PrusaLinkType","ReprintState"],"mappings":";;;;;;;;;;;QAWaA;eAAAA;;QAFAC;eAAAA;;QADAC;eAAAA;;QAKDC;eAAAA;;QAHCC;eAAAA;;QA6CDC;eAAAA;;;AA/CL,MAAMH,gBAAgB;AACtB,MAAMD,gBAAgB;AACtB,MAAMG,gBAAgB;AACtB,MAAMJ,YAAY;AAElB,IAAA,AAAKG,0CAAAA;;;;;WAAAA;;AA0CL,IAAA,AAAKE,sCAAAA;;;;WAAAA"}
|
|
@@ -20,12 +20,15 @@ class SocketFactory {
|
|
|
20
20
|
const serverSettings = settingsStore.getServerSettings();
|
|
21
21
|
const moonrakerSupport = serverSettings.experimentalMoonrakerSupport;
|
|
22
22
|
const prusaLinkSupport = serverSettings.experimentalPrusaLinkSupport;
|
|
23
|
+
const bambuSupport = serverSettings.experimentalBambuSupport;
|
|
23
24
|
if (printerType === _printerapiinterface.OctoprintType) {
|
|
24
25
|
return this.cradleService.resolve(_containertokens.DITokens.octoPrintSockIoAdapter);
|
|
25
26
|
} else if (moonrakerSupport && printerType === _printerapiinterface.MoonrakerType) {
|
|
26
27
|
return this.cradleService.resolve(_containertokens.DITokens.moonrakerWebsocketAdapter);
|
|
27
28
|
} else if (prusaLinkSupport && printerType === _printerapiinterface.PrusaLinkType) {
|
|
28
29
|
return this.cradleService.resolve(_containertokens.DITokens.prusaLinkPollingAdapter);
|
|
30
|
+
} else if (bambuSupport && printerType === _printerapiinterface.BambuType) {
|
|
31
|
+
return this.cradleService.resolve(_containertokens.DITokens.bambuMqttAdapter);
|
|
29
32
|
} else {
|
|
30
33
|
throw new Error("PrinterType is unknown, cant pick the right socket adapter");
|
|
31
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/socket.factory.ts"],"names":["SocketFactory","cradleService","createInstance","printerType","settingsStore","resolve","DITokens","serverSettings","getServerSettings","moonrakerSupport","experimentalMoonrakerSupport","prusaLinkSupport","experimentalPrusaLinkSupport","OctoprintType","octoPrintSockIoAdapter","MoonrakerType","moonrakerWebsocketAdapter","PrusaLinkType","prusaLinkPollingAdapter","Error"],"mappings":";;;;+BAMaA;;;eAAAA;;;iCANY;
|
|
1
|
+
{"version":3,"sources":["../../src/services/socket.factory.ts"],"names":["SocketFactory","cradleService","createInstance","printerType","settingsStore","resolve","DITokens","serverSettings","getServerSettings","moonrakerSupport","experimentalMoonrakerSupport","prusaLinkSupport","experimentalPrusaLinkSupport","bambuSupport","experimentalBambuSupport","OctoprintType","octoPrintSockIoAdapter","MoonrakerType","moonrakerWebsocketAdapter","PrusaLinkType","prusaLinkPollingAdapter","BambuType","bambuMqttAdapter","Error"],"mappings":";;;;+BAMaA;;;eAAAA;;;iCANY;qCAC8C;AAKhE,MAAMA;;IACX,YAAY,AAAiBC,aAA4B,CAAE;aAA9BA,gBAAAA;IAA+B;IAE5DC,eAAeC,WAAmB,EAAqB;QACrD,MAAMC,gBAAgB,IAAI,CAACH,aAAa,CAACI,OAAO,CAAgBC,yBAAQ,CAACF,aAAa;QACtF,MAAMG,iBAAiBH,cAAcI,iBAAiB;QACtD,MAAMC,mBAAmBF,eAAeG,4BAA4B;QACpE,MAAMC,mBAAmBJ,eAAeK,4BAA4B;QACpE,MAAMC,eAAeN,eAAeO,wBAAwB;QAE5D,IAAIX,gBAAgBY,kCAAa,EAAE;YACjC,OAAO,IAAI,CAACd,aAAa,CAACI,OAAO,CAACC,yBAAQ,CAACU,sBAAsB;QACnE,OAAO,IAAIP,oBAAoBN,gBAAgBc,kCAAa,EAAE;YAC5D,OAAO,IAAI,CAAChB,aAAa,CAACI,OAAO,CAACC,yBAAQ,CAACY,yBAAyB;QACtE,OAAO,IAAIP,oBAAoBR,gBAAgBgB,kCAAa,EAAE;YAC5D,OAAO,IAAI,CAAClB,aAAa,CAACI,OAAO,CAACC,yBAAQ,CAACc,uBAAuB;QACpE,OAAO,IAAIP,gBAAgBV,gBAAgBkB,8BAAS,EAAE;YACpD,OAAO,IAAI,CAACpB,aAAa,CAACI,OAAO,CAACC,yBAAQ,CAACgB,gBAAgB;QAC7D,OAAO;YACL,MAAM,IAAIC,MAAM;QAClB;IACF;AACF"}
|
|
@@ -96,7 +96,7 @@ const refineApiKeyValidator = (data, ctx)=>{
|
|
|
96
96
|
});
|
|
97
97
|
});
|
|
98
98
|
}
|
|
99
|
-
} else if (data.printerType === _printerapiinterface.PrusaLinkType) {
|
|
99
|
+
} else if (data.printerType === _printerapiinterface.PrusaLinkType || data.printerType === _printerapiinterface.BambuType) {
|
|
100
100
|
const result = prusaLinkAuthSchema.safeParse({
|
|
101
101
|
username: data.username,
|
|
102
102
|
password: data.password
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createPrinterSchema","printerApiKeyValidator","printerDateAddedValidator","printerDisabledReasonValidator","printerEnabledValidator","printerNameValidator","printerPasswordValidator","printerTypeValidator","printerUrlValidator","printerUsernameValidator","refineApiKeyValidator","updatePrinterDisabledReasonSchema","updatePrinterEnabledSchema","octoPrintApiKeySchema","z","string","min","apiKeyLengthMinDefault","max","apiKeyLengthMaxDefault","regex","optional","boolean","url","nativeEnum","PrinterTypesEnum","number","prusaLinkAuthSchema","object","username","password","basePrinterSchema","dateAdded","printerURL","printerType","apiKey","enabled","name","strip","apiKeyPrinterTypeSchema","data","ctx","OctoprintType","result","safeParse","success","error","issues","forEach","issue","addIssue","path","PrusaLinkType","superRefine","disabledReason"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../../src/services/validators/printer-service.validation.ts"],"names":["createPrinterSchema","printerApiKeyValidator","printerDateAddedValidator","printerDisabledReasonValidator","printerEnabledValidator","printerNameValidator","printerPasswordValidator","printerTypeValidator","printerUrlValidator","printerUsernameValidator","refineApiKeyValidator","updatePrinterDisabledReasonSchema","updatePrinterEnabledSchema","octoPrintApiKeySchema","z","string","min","apiKeyLengthMinDefault","max","apiKeyLengthMaxDefault","regex","optional","boolean","url","nativeEnum","PrinterTypesEnum","number","prusaLinkAuthSchema","object","username","password","basePrinterSchema","dateAdded","printerURL","printerType","apiKey","enabled","name","strip","apiKeyPrinterTypeSchema","data","ctx","OctoprintType","result","safeParse","success","error","issues","forEach","issue","addIssue","path","PrusaLinkType","BambuType","superRefine","disabledReason"],"mappings":"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"}
|
|
@@ -9,6 +9,9 @@ function _export(target, all) {
|
|
|
9
9
|
});
|
|
10
10
|
}
|
|
11
11
|
_export(exports, {
|
|
12
|
+
get bambuSupportSchema () {
|
|
13
|
+
return bambuSupportSchema;
|
|
14
|
+
},
|
|
12
15
|
get clientNextSchema () {
|
|
13
16
|
return clientNextSchema;
|
|
14
17
|
},
|
|
@@ -52,9 +55,10 @@ const serverSettingsUpdateSchema = _zod.z.object({
|
|
|
52
55
|
registration: _zod.z.boolean(),
|
|
53
56
|
loginRequired: _zod.z.boolean(),
|
|
54
57
|
experimentalMoonrakerSupport: _zod.z.boolean(),
|
|
58
|
+
experimentalBambuSupport: _zod.z.boolean(),
|
|
59
|
+
experimentalPrusaLinkSupport: _zod.z.boolean(),
|
|
55
60
|
experimentalThumbnailSupport: _zod.z.boolean(),
|
|
56
61
|
experimentalClientSupport: _zod.z.boolean(),
|
|
57
|
-
experimentalPrusaLinkSupport: _zod.z.boolean(),
|
|
58
62
|
sentryDiagnosticsEnabled: _zod.z.boolean()
|
|
59
63
|
});
|
|
60
64
|
const timeoutSettingsUpdateSchema = _zod.z.object({
|
|
@@ -94,6 +98,9 @@ const moonrakerSupportSchema = _zod.z.object({
|
|
|
94
98
|
const prusaLinkSupportSchema = _zod.z.object({
|
|
95
99
|
enabled: _zod.z.boolean()
|
|
96
100
|
});
|
|
101
|
+
const bambuSupportSchema = _zod.z.object({
|
|
102
|
+
enabled: _zod.z.boolean()
|
|
103
|
+
});
|
|
97
104
|
const thumbnailSupportSchema = _zod.z.object({
|
|
98
105
|
enabled: _zod.z.boolean()
|
|
99
106
|
});
|
|
@@ -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","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/validators/settings-service.validation.ts"],"names":["bambuSupportSchema","clientNextSchema","credentialSettingUpdateSchema","fileCleanSettingsUpdateSchema","frontendSettingsUpdateSchema","jwtSecretCredentialSettingUpdateSchema","moonrakerSupportSchema","prusaLinkSupportSchema","sentryDiagnosticsEnabledSchema","serverSettingsUpdateSchema","thumbnailSupportSchema","timeoutSettingsUpdateSchema","wizardUpdateSchema","z","object","registration","boolean","loginRequired","experimentalMoonrakerSupport","experimentalBambuSupport","experimentalPrusaLinkSupport","experimentalThumbnailSupport","experimentalClientSupport","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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"}
|
|
@@ -33,6 +33,8 @@ const exportPrintersFloorsYamlSchema = _zod.z.object({
|
|
|
33
33
|
exportFloorGrid: _zod.z.boolean(),
|
|
34
34
|
exportFloors: _zod.z.boolean(),
|
|
35
35
|
exportGroups: _zod.z.boolean(),
|
|
36
|
+
exportSettings: _zod.z.boolean().default(false),
|
|
37
|
+
exportUsers: _zod.z.boolean().default(false),
|
|
36
38
|
printerComparisonStrategiesByPriority: _zod.z.array(_zod.z.string().refine((val)=>[
|
|
37
39
|
"name",
|
|
38
40
|
"url",
|
|
@@ -70,6 +72,8 @@ const importPrintersFloorsYamlSchema = _zod.z.object({
|
|
|
70
72
|
exportFloorGrid: _zod.z.boolean(),
|
|
71
73
|
exportFloors: _zod.z.boolean(),
|
|
72
74
|
exportGroups: _zod.z.boolean().optional(),
|
|
75
|
+
exportSettings: _zod.z.boolean().optional().default(false),
|
|
76
|
+
exportUsers: _zod.z.boolean().optional().default(false),
|
|
73
77
|
printerComparisonStrategiesByPriority: _zod.z.array(_zod.z.string().refine((val)=>[
|
|
74
78
|
"name",
|
|
75
79
|
"url",
|
|
@@ -105,7 +109,29 @@ const importPrintersFloorsYamlSchema = _zod.z.object({
|
|
|
105
109
|
printers: _zod.z.array(_zod.z.object({
|
|
106
110
|
printerId: numberOrStringIdValidator
|
|
107
111
|
}))
|
|
108
|
-
})).min(0).default([])
|
|
112
|
+
})).min(0).default([]),
|
|
113
|
+
settings: _zod.z.any().optional(),
|
|
114
|
+
users: _zod.z.array(_zod.z.object({
|
|
115
|
+
id: numberOrStringIdValidator,
|
|
116
|
+
username: _zod.z.string(),
|
|
117
|
+
isDemoUser: _zod.z.boolean().optional(),
|
|
118
|
+
isRootUser: _zod.z.boolean().optional(),
|
|
119
|
+
isVerified: _zod.z.boolean().optional(),
|
|
120
|
+
needsPasswordChange: _zod.z.boolean().optional(),
|
|
121
|
+
passwordHash: _zod.z.string(),
|
|
122
|
+
createdAt: _zod.z.date().optional(),
|
|
123
|
+
roles: _zod.z.array(_zod.z.any()).optional()
|
|
124
|
+
})).optional().default([]),
|
|
125
|
+
roles: _zod.z.array(_zod.z.object({
|
|
126
|
+
id: numberOrStringIdValidator,
|
|
127
|
+
name: _zod.z.string()
|
|
128
|
+
})).optional().default([]),
|
|
129
|
+
user_roles: _zod.z.array(_zod.z.object({
|
|
130
|
+
id: numberOrStringIdValidator,
|
|
131
|
+
userId: numberOrStringIdValidator,
|
|
132
|
+
roleId: numberOrStringIdValidator,
|
|
133
|
+
createdAt: _zod.z.date().optional()
|
|
134
|
+
})).optional().default([])
|
|
109
135
|
});
|
|
110
136
|
|
|
111
137
|
//# sourceMappingURL=yaml-service.validation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlSchema","importPrinterPositionsSchema","importPrintersFloorsYamlSchema","numberOrStringIdValidator","printerPositionsSchema","z","object","exportPrinters","boolean","exportFloorGrid","exportFloors","exportGroups","printerComparisonStrategiesByPriority","array","string","refine","val","includes","min","floorComparisonStrategiesByPriority","notes","optional","union","number","printerId","floorId","x","xValidator","y","yValidator","printers","version","exportedAt","date","databaseType","enum","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlSchema","importPrinterPositionsSchema","importPrintersFloorsYamlSchema","numberOrStringIdValidator","printerPositionsSchema","z","object","exportPrinters","boolean","exportFloorGrid","exportFloors","exportGroups","exportSettings","default","exportUsers","printerComparisonStrategiesByPriority","array","string","refine","val","includes","min","floorComparisonStrategiesByPriority","notes","optional","union","number","printerId","floorId","x","xValidator","y","yValidator","printers","version","exportedAt","date","databaseType","enum","config","id","printerURL","printerUrlValidator","printerType","printerTypeValidator","apiKey","printerApiKeyValidator","enabled","printerEnabledValidator","name","printerNameValidator","printerName","settingsAppearance","floors","floor","floorLevelValidator","floorNameValidator","groups","settings","any","users","username","isDemoUser","isRootUser","isVerified","needsPasswordChange","passwordHash","createdAt","roles","user_roles","userId","roleId"],"mappings":"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"}
|
|
@@ -43,6 +43,7 @@ function migrateSettingsRuntime(knownSettings) {
|
|
|
43
43
|
experimentalClientSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalClientSupport ?? defaultServerSettings.experimentalClientSupport,
|
|
44
44
|
experimentalMoonrakerSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport ?? defaultServerSettings.experimentalMoonrakerSupport,
|
|
45
45
|
experimentalPrusaLinkSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalPrusaLinkSupport ?? defaultServerSettings.experimentalPrusaLinkSupport,
|
|
46
|
+
experimentalBambuSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalBambuSupport ?? defaultServerSettings.experimentalBambuSupport,
|
|
46
47
|
sentryDiagnosticsEnabled: entity[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled ?? defaultServerSettings.sentryDiagnosticsEnabled,
|
|
47
48
|
experimentalThumbnailSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalThumbnailSupport ?? defaultServerSettings.experimentalThumbnailSupport
|
|
48
49
|
};
|
|
@@ -1 +1 @@
|
|
|
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,
|
|
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","experimentalBambuSupport","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,0BAA0B5B,MAAM,CAACQ,0CAAiB,CAAC,CAACoB,wBAAwB,IAAIP,sBAAsBO,wBAAwB;YAC9HC,8BAA8B7B,MAAM,CAACQ,0CAAiB,CAAC,CAACqB,4BAA4B,IAAIR,sBAAsBQ,4BAA4B;QAC5I;IACF;IAEA,OAAO7B;AACT"}
|
|
@@ -13,6 +13,7 @@ const _eventconstants = require("../constants/event.constants");
|
|
|
13
13
|
const _octoprintwebsocketadapter = require("../services/octoprint/octoprint-websocket.adapter");
|
|
14
14
|
const _moonrakerconstants = require("../services/moonraker/constants/moonraker.constants");
|
|
15
15
|
const _prusalinkconstants = require("../services/prusa-link/constants/prusalink.constants");
|
|
16
|
+
const _bambumqttadapter = require("../services/bambu/bambu-mqtt.adapter");
|
|
16
17
|
class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
|
|
17
18
|
eventEmitter2;
|
|
18
19
|
logger;
|
|
@@ -72,6 +73,7 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
|
|
|
72
73
|
this.eventEmitter2.on((0, _octoprintwebsocketadapter.octoPrintEvent)("*"), (e)=>this.onOctoPrintSocketMessage(e));
|
|
73
74
|
this.eventEmitter2.on((0, _moonrakerconstants.moonrakerEvent)("*"), (e)=>this.onMoonrakerSocketMessage(e));
|
|
74
75
|
this.eventEmitter2.on((0, _prusalinkconstants.prusaLinkEvent)("*"), (e)=>this.onPrusaLinkPollMessage(e));
|
|
76
|
+
this.eventEmitter2.on((0, _bambumqttadapter.bambuEvent)("*"), (e)=>this.onBambuSocketMessage(e));
|
|
75
77
|
this.eventEmitter2.on(_eventconstants.printerEvents.printersDeleted, this.handlePrintersDeleted.bind(this));
|
|
76
78
|
}
|
|
77
79
|
async onOctoPrintSocketMessage(e) {
|
|
@@ -100,6 +102,17 @@ class PrinterEventsCache extends _keydiffcache.KeyDiffCache {
|
|
|
100
102
|
await this.setEvent(printerId, e.event, e.payload);
|
|
101
103
|
}
|
|
102
104
|
}
|
|
105
|
+
async onBambuSocketMessage(e) {
|
|
106
|
+
const printerId = e.printerId;
|
|
107
|
+
if (!printerId) {
|
|
108
|
+
this.logger.warn("Received Bambu event without printerId", e);
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
this.logger.debug(`Received Bambu event ${e.event}, printerId ${printerId}`);
|
|
112
|
+
if (e.event === "current") {
|
|
113
|
+
await this.setEvent(printerId, e.event, e.payload);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
103
116
|
pruneHistoryPayload(payload) {
|
|
104
117
|
const { logs, temps, messages, plugins, ...prunedPayload } = payload;
|
|
105
118
|
return prunedPayload;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","loggerFactory","name","subscribeToEvents","deletePrinterSocketEvents","id","deleteKeyValue","getPrinterSocketEvents","keyValueStore","getOrCreateEvents","printerId","ref","getValue","connected","reauthRequired","notify_status_update","current","history","API_STATE_UPDATED","WS_CLOSED","WS_ERROR","WS_OPENED","WS_STATE_UPDATED","setKeyValue","setEvent","label","payload","receivedAt","Date","now","setSubState","substateName","handlePrintersDeleted","event","deleteKeysBatch","printerIds","on","octoPrintEvent","e","onOctoPrintSocketMessage","moonrakerEvent","onMoonrakerSocketMessage","prusaLinkEvent","onPrusaLinkPollMessage","printerEvents","printersDeleted","bind","includes","pruneHistoryPayload","eventType","debug","logs","temps","messages","plugins","prunedPayload"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../../src/state/printer-events.cache.ts"],"names":["PrinterEventsCache","KeyDiffCache","logger","eventEmitter2","loggerFactory","name","subscribeToEvents","deletePrinterSocketEvents","id","deleteKeyValue","getPrinterSocketEvents","keyValueStore","getOrCreateEvents","printerId","ref","getValue","connected","reauthRequired","notify_status_update","current","history","API_STATE_UPDATED","WS_CLOSED","WS_ERROR","WS_OPENED","WS_STATE_UPDATED","setKeyValue","setEvent","label","payload","receivedAt","Date","now","setSubState","substateName","handlePrintersDeleted","event","deleteKeysBatch","printerIds","on","octoPrintEvent","e","onOctoPrintSocketMessage","moonrakerEvent","onMoonrakerSocketMessage","prusaLinkEvent","onPrusaLinkPollMessage","bambuEvent","onBambuSocketMessage","printerEvents","printersDeleted","bind","includes","pruneHistoryPayload","eventType","debug","warn","logs","temps","messages","plugins","prunedPayload"],"mappings":"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"}
|
|
@@ -33,6 +33,7 @@ class SettingsStore {
|
|
|
33
33
|
sentryDiagnosticsEnabled: settings[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled,
|
|
34
34
|
experimentalMoonrakerSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
|
|
35
35
|
experimentalPrusaLinkSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalPrusaLinkSupport,
|
|
36
|
+
experimentalBambuSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalBambuSupport,
|
|
36
37
|
experimentalTypeormSupport: this.isTypeormMode,
|
|
37
38
|
experimentalClientSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalClientSupport,
|
|
38
39
|
experimentalThumbnailSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalThumbnailSupport
|
|
@@ -54,6 +55,8 @@ class SettingsStore {
|
|
|
54
55
|
},
|
|
55
56
|
[_serversettingsconstants.serverSettingsKey]: {
|
|
56
57
|
experimentalMoonrakerSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport,
|
|
58
|
+
experimentalPrusaLinkSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalPrusaLinkSupport,
|
|
59
|
+
experimentalBambuSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalBambuSupport,
|
|
57
60
|
experimentalTypeormSupport: this.isTypeormMode,
|
|
58
61
|
experimentalClientSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalClientSupport,
|
|
59
62
|
experimentalThumbnailSupport: settings[_serversettingsconstants.serverSettingsKey].experimentalThumbnailSupport
|
|
@@ -187,15 +190,21 @@ class SettingsStore {
|
|
|
187
190
|
this.settings = await this.settingsService.updateServerSettings(this.settings[_serversettingsconstants.serverSettingsKey]);
|
|
188
191
|
return this.getSettings();
|
|
189
192
|
}
|
|
190
|
-
async
|
|
193
|
+
async setExperimentalPrusaLinkSupport(experimentalPrusaLinkSupport) {
|
|
191
194
|
this.throwIfSettingsUnset();
|
|
192
|
-
this.settings[_serversettingsconstants.serverSettingsKey].
|
|
195
|
+
this.settings[_serversettingsconstants.serverSettingsKey].experimentalPrusaLinkSupport = experimentalPrusaLinkSupport;
|
|
193
196
|
this.settings = await this.settingsService.updateServerSettings(this.settings[_serversettingsconstants.serverSettingsKey]);
|
|
194
197
|
return this.getSettings();
|
|
195
198
|
}
|
|
196
|
-
async
|
|
199
|
+
async setExperimentalBambuSupport(experimentalBambuSupport) {
|
|
197
200
|
this.throwIfSettingsUnset();
|
|
198
|
-
this.settings[_serversettingsconstants.serverSettingsKey].
|
|
201
|
+
this.settings[_serversettingsconstants.serverSettingsKey].experimentalBambuSupport = experimentalBambuSupport;
|
|
202
|
+
this.settings = await this.settingsService.updateServerSettings(this.settings[_serversettingsconstants.serverSettingsKey]);
|
|
203
|
+
return this.getSettings();
|
|
204
|
+
}
|
|
205
|
+
async setExperimentalThumbnailSupport(experimentalThumbnailSupport) {
|
|
206
|
+
this.throwIfSettingsUnset();
|
|
207
|
+
this.settings[_serversettingsconstants.serverSettingsKey].experimentalThumbnailSupport = experimentalThumbnailSupport;
|
|
199
208
|
this.settings = await this.settingsService.updateServerSettings(this.settings[_serversettingsconstants.serverSettingsKey]);
|
|
200
209
|
return this.getSettings();
|
|
201
210
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","logger","settings","loggerFactory","settingsService","isTypeormMode","name","getSettings","throwIfSettingsUnset","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","experimentalMoonrakerSupport","experimentalPrusaLinkSupport","experimentalTypeormSupport","experimentalClientSupport","experimentalThumbnailSupport","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","credentialSettings","length","updateJwtSecretCredentialSetting","jwtSecret","updateCredentialSettings","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","isThumbnailSupportEnabled","getServerSettings","getTimeoutSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","updateWizardSettings","wizardCompletedAt","Date","getLoginRequired","setLoginRequired","updateServerSettings","setRegistrationEnabled","serverSettings","updateTimeoutSettings","timeoutSettings","updateFileCleanSettings","fileClean","setRefreshTokenSettings","setSentryDiagnosticsEnabled","setExperimentalMoonrakerSupport","
|
|
1
|
+
{"version":3,"sources":["../../src/state/settings.store.ts"],"names":["SettingsStore","logger","settings","loggerFactory","settingsService","isTypeormMode","name","getSettings","throwIfSettingsUnset","Object","freeze","serverSettingsKey","loginRequired","registration","sentryDiagnosticsEnabled","experimentalMoonrakerSupport","experimentalPrusaLinkSupport","experimentalBambuSupport","experimentalTypeormSupport","experimentalClientSupport","experimentalThumbnailSupport","wizardSettingKey","frontendSettingKey","printerFileCleanSettingKey","timeoutSettingKey","getSettingsSensitive","credentialSettingsKey","jwtExpiresIn","refreshTokenAttempts","refreshTokenExpiry","loadSettings","getOrCreate","processSentryEnabled","getCredentialSettings","getAnonymousDiagnosticsEnabled","persistOptionalCredentialSettings","overrideJwtSecret","overrideJwtExpiresIn","credentialSettings","length","updateJwtSecretCredentialSetting","jwtSecret","updateCredentialSettings","parseInt","getWizardState","wizardCompleted","wizardVersion","latestWizardVersion","AppConstants","currentWizardVersion","isWizardCompleted","getWizardSettings","isRegistrationEnabled","isThumbnailSupportEnabled","getServerSettings","getTimeoutSettings","getFrontendSettings","getFileCleanSettings","isPreUploadFileCleanEnabled","autoRemoveOldFilesBeforeUpload","setWizardCompleted","version","updateWizardSettings","wizardCompletedAt","Date","getLoginRequired","setLoginRequired","updateServerSettings","setRegistrationEnabled","serverSettings","updateTimeoutSettings","timeoutSettings","updateFileCleanSettings","fileClean","setRefreshTokenSettings","setSentryDiagnosticsEnabled","setExperimentalMoonrakerSupport","setExperimentalPrusaLinkSupport","setExperimentalBambuSupport","setExperimentalThumbnailSupport","setExperimentalClientSupport","updateFrontendSettings","frontendSettings","InternalServerException","sentryEnabled","log","isTestEnvironment","client","getClient","warn","getOptions","enabled"],"mappings":"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"}
|