@fdm-monster/server 1.9.4 → 2.0.0

package/dist/services/validators/settings-service.validation.js

@@ -12,15 +12,9 @@ _export(exports, {
     get bambuSupportSchema () {
         return bambuSupportSchema;
     },
-    get clientNextSchema () {
-        return clientNextSchema;
-    },
     get credentialSettingUpdateSchema () {
         return credentialSettingUpdateSchema;
     },
-    get fileCleanSettingsUpdateSchema () {
-        return fileCleanSettingsUpdateSchema;
-    },
     get frontendSettingsUpdateSchema () {
         return frontendSettingsUpdateSchema;
     },
@@ -39,9 +33,6 @@ _export(exports, {
     get serverSettingsUpdateSchema () {
         return serverSettingsUpdateSchema;
     },
-    get thumbnailSupportSchema () {
-        return thumbnailSupportSchema;
-    },
     get timeoutSettingsUpdateSchema () {
         return timeoutSettingsUpdateSchema;
     },
@@ -57,8 +48,6 @@ const serverSettingsUpdateSchema = _zod.z.object({
     experimentalMoonrakerSupport: _zod.z.boolean(),
     experimentalBambuSupport: _zod.z.boolean(),
     experimentalPrusaLinkSupport: _zod.z.boolean(),
-    experimentalThumbnailSupport: _zod.z.boolean(),
-    experimentalClientSupport: _zod.z.boolean(),
     sentryDiagnosticsEnabled: _zod.z.boolean()
 });
 const timeoutSettingsUpdateSchema = _zod.z.object({
@@ -84,11 +73,6 @@ const wizardUpdateSchema = _zod.z.object({
     wizardCompletedAt: _zod.z.date().nullable(),
     wizardVersion: _zod.z.number().int().min(0)
 });
-const fileCleanSettingsUpdateSchema = _zod.z.object({
-    autoRemoveOldFilesBeforeUpload: _zod.z.boolean(),
-    autoRemoveOldFilesAtBoot: _zod.z.boolean(),
-    autoRemoveOldFilesCriteriumDays: _zod.z.number().int().min(0)
-});
 const sentryDiagnosticsEnabledSchema = _zod.z.object({
     enabled: _zod.z.boolean()
 });
@@ -101,11 +85,5 @@ const prusaLinkSupportSchema = _zod.z.object({
 const bambuSupportSchema = _zod.z.object({
     enabled: _zod.z.boolean()
 });
-const thumbnailSupportSchema = _zod.z.object({
-    enabled: _zod.z.boolean()
-});
-const clientNextSchema = _zod.z.object({
-    enabled: _zod.z.boolean()
-});
 
 //# sourceMappingURL=settings-service.validation.js.map

package/dist/services/validators/settings-service.validation.js.map

@@ -1 +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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"}
+{"version":3,"sources":["../../../src/services/validators/settings-service.validation.ts"],"names":["bambuSupportSchema","credentialSettingUpdateSchema","frontendSettingsUpdateSchema","jwtSecretCredentialSettingUpdateSchema","moonrakerSupportSchema","prusaLinkSupportSchema","sentryDiagnosticsEnabledSchema","serverSettingsUpdateSchema","timeoutSettingsUpdateSchema","wizardUpdateSchema","z","object","registration","boolean","loginRequired","experimentalMoonrakerSupport","experimentalBambuSupport","experimentalPrusaLinkSupport","sentryDiagnosticsEnabled","apiTimeout","number","int","min","apiUploadTimeout","gridCols","gridRows","largeTiles","tilePreferCancelOverQuickStop","jwtSecret","string","jwtExpiresIn","isProductionEnvironment","max","Infinity","refreshTokenAttempts","refreshTokenExpiry","wizardCompleted","wizardCompletedAt","date","nullable","wizardVersion","enabled"],"mappings":";;;;;;;;;;;QA2DaA;eAAAA;;QA/BAC;eAAAA;;QAXAC;eAAAA;;QAOAC;eAAAA;;QA2BAC;eAAAA;;QAIAC;eAAAA;;QARAC;eAAAA;;QA5CAC;eAAAA;;QASAC;eAAAA;;QA6BAC;eAAAA;;;0BAzC2B;qBACtB;AAEX,MAAMF,6BAA6BG,MAAC,CAACC,MAAM,CAAC;IACjDC,cAAcF,MAAC,CAACG,OAAO;IACvBC,eAAeJ,MAAC,CAACG,OAAO;IACxBE,8BAA8BL,MAAC,CAACG,OAAO;IACvCG,0BAA0BN,MAAC,CAACG,OAAO;IACnCI,8BAA8BP,MAAC,CAACG,OAAO;IACvCK,0BAA0BR,MAAC,CAACG,OAAO;AACrC;AAEO,MAAML,8BAA8BE,MAAC,CAACC,MAAM,CAAC;IAClDQ,YAAYT,MAAC,CAACU,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC;IACjCC,kBAAkBb,MAAC,CAACU,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC;AACzC;AAEO,MAAMpB,+BAA+BQ,MAAC,CAACC,MAAM,CAAC;IACnDa,UAAUd,MAAC,CAACU,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC;IAC/BG,UAAUf,MAAC,CAACU,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC;IAC/BI,YAAYhB,MAAC,CAACG,OAAO;IACrBc,+BAA+BjB,MAAC,CAACG,OAAO;AAC1C;AAEO,MAAMV,yCAAyCO,MAAC,CAACC,MAAM,CAAC;IAC7DiB,WAAWlB,MAAC,CAACmB,MAAM,GAAGP,GAAG,CAAC;AAC5B;AAEO,MAAMrB,gCAAgCS,MAAC,CAACC,MAAM,CAAC;IACpDmB,cAAcpB,MAAC,CACZU,MAAM,GACNC,GAAG,GACHC,GAAG,CAACS,IAAAA,iCAAuB,MAAK,MAAM,GACtCC,GAAG,CAACD,IAAAA,iCAAuB,MAAK,OAAOE;IAC1CC,sBAAsBxB,MAAC,CAACU,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC,CAAC;IAC5Ca,oBAAoBzB,MAAC,CAClBU,MAAM,GACNC,GAAG,GACHC,GAAG,CAACS,IAAAA,iCAAuB,MAAK,MAAM;AAC3C;AAEO,MAAMtB,qBAAqBC,MAAC,CAACC,MAAM,CAAC;IACzCyB,iBAAiB1B,MAAC,CAACG,OAAO;IAC1BwB,mBAAmB3B,MAAC,CAAC4B,IAAI,GAAGC,QAAQ;IACpCC,eAAe9B,MAAC,CAACU,MAAM,GAAGC,GAAG,GAAGC,GAAG,CAAC;AACtC;AAEO,MAAMhB,iCAAiCI,MAAC,CAACC,MAAM,CAAC;IACrD8B,SAAS/B,MAAC,CAACG,OAAO;AACpB;AAEO,MAAMT,yBAAyBM,MAAC,CAACC,MAAM,CAAC;IAC7C8B,SAAS/B,MAAC,CAACG,OAAO;AACpB;AAEO,MAAMR,yBAAyBK,MAAC,CAACC,MAAM,CAAC;IAC7C8B,SAAS/B,MAAC,CAACG,OAAO;AACpB;AAEO,MAAMb,qBAAqBU,MAAC,CAACC,MAAM,CAAC;IACzC8B,SAAS/B,MAAC,CAACG,OAAO;AACpB"}

package/dist/services/validators/user-service.validation.js

@@ -18,16 +18,21 @@ _export(exports, {
 });
 const _zod = require("zod");
 const _serverconstants = require("../../server.constants");
-const _genericvalidation = require("../../controllers/validation/generic.validation");
-const registerUserSchema = (isSqlite)=>_zod.z.object({
-        username: _zod.z.string().min(_serverconstants.AppConstants.DEFAULT_USERNAME_MINLEN),
-        password: _zod.z.string().min(_serverconstants.AppConstants.DEFAULT_PASSWORD_MINLEN),
-        needsPasswordChange: _zod.z.boolean().optional(),
-        roles: _zod.z.array((0, _genericvalidation.idRuleV2)(isSqlite)),
-        isDemoUser: _zod.z.boolean().optional(),
-        isRootUser: _zod.z.boolean().optional(),
-        isVerified: _zod.z.boolean().optional()
-    });
+const _authorizationconstants = require("../../constants/authorization.constants");
+const roleNameSchema = _zod.z.enum([
+    _authorizationconstants.ROLES.ADMIN,
+    _authorizationconstants.ROLES.OPERATOR,
+    _authorizationconstants.ROLES.GUEST
+]);
+const registerUserSchema = _zod.z.object({
+    username: _zod.z.string().min(_serverconstants.AppConstants.DEFAULT_USERNAME_MINLEN),
+    password: _zod.z.string().min(_serverconstants.AppConstants.DEFAULT_PASSWORD_MINLEN),
+    needsPasswordChange: _zod.z.boolean().optional(),
+    roles: _zod.z.array(roleNameSchema),
+    isDemoUser: _zod.z.boolean().optional(),
+    isRootUser: _zod.z.boolean().optional(),
+    isVerified: _zod.z.boolean().optional()
+});
 const newPasswordSchema = _zod.z.object({
     password: _zod.z.string().min(_serverconstants.AppConstants.DEFAULT_PASSWORD_MINLEN)
 });

package/dist/services/validators/user-service.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/validators/user-service.validation.ts"],"names":["newPasswordSchema","registerUserSchema","isSqlite","z","object","username","string","min","AppConstants","DEFAULT_USERNAME_MINLEN","password","DEFAULT_PASSWORD_MINLEN","needsPasswordChange","boolean","optional","roles","array","idRuleV2","isDemoUser","isRootUser","isVerified"],"mappings":";;;;;;;;;;;QAeaA;eAAAA;;QAXAC;eAAAA;;;qBAJK;iCACW;mCACJ;AAElB,MAAMA,qBAAqB,CAACC,WACjCC,MAAC,CAACC,MAAM,CAAC;QACPC,UAAUF,MAAC,CAACG,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACC,uBAAuB;QAC7DC,UAAUP,MAAC,CAACG,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACG,uBAAuB;QAC7DC,qBAAqBT,MAAC,CAACU,OAAO,GAAGC,QAAQ;QACzCC,OAAOZ,MAAC,CAACa,KAAK,CAACC,IAAAA,2BAAQ,EAACf;QACxBgB,YAAYf,MAAC,CAACU,OAAO,GAAGC,QAAQ;QAChCK,YAAYhB,MAAC,CAACU,OAAO,GAAGC,QAAQ;QAChCM,YAAYjB,MAAC,CAACU,OAAO,GAAGC,QAAQ;IAClC;AAEK,MAAMd,oBAAoBG,MAAC,CAACC,MAAM,CAAC;IACxCM,UAAUP,MAAC,CAACG,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACG,uBAAuB;AAC/D"}
+{"version":3,"sources":["../../../src/services/validators/user-service.validation.ts"],"names":["newPasswordSchema","registerUserSchema","roleNameSchema","z","enum","ROLES","ADMIN","OPERATOR","GUEST","object","username","string","min","AppConstants","DEFAULT_USERNAME_MINLEN","password","DEFAULT_PASSWORD_MINLEN","needsPasswordChange","boolean","optional","roles","array","isDemoUser","isRootUser","isVerified"],"mappings":";;;;;;;;;;;QAgBaA;eAAAA;;QAVAC;eAAAA;;;qBANK;iCACW;wCACP;AAEtB,MAAMC,iBAAiBC,MAAC,CAACC,IAAI,CAAC;IAACC,6BAAK,CAACC,KAAK;IAAED,6BAAK,CAACE,QAAQ;IAAEF,6BAAK,CAACG,KAAK;CAAC;AAEjE,MAAMP,qBAAqBE,MAAC,CAACM,MAAM,CAAC;IACzCC,UAAUP,MAAC,CAACQ,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACC,uBAAuB;IAC7DC,UAAUZ,MAAC,CAACQ,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACG,uBAAuB;IAC7DC,qBAAqBd,MAAC,CAACe,OAAO,GAAGC,QAAQ;IACzCC,OAAOjB,MAAC,CAACkB,KAAK,CAACnB;IACfoB,YAAYnB,MAAC,CAACe,OAAO,GAAGC,QAAQ;IAChCI,YAAYpB,MAAC,CAACe,OAAO,GAAGC,QAAQ;IAChCK,YAAYrB,MAAC,CAACe,OAAO,GAAGC,QAAQ;AAClC;AAEO,MAAMnB,oBAAoBG,MAAC,CAACM,MAAM,CAAC;IACxCM,UAAUZ,MAAC,CAACQ,MAAM,GAAGC,GAAG,CAACC,6BAAY,CAACG,uBAAuB;AAC/D"}

package/dist/services/validators/yaml-service.validation.js

@@ -32,7 +32,8 @@ const exportPrintersFloorsYamlSchema = _zod.z.object({
     exportPrinters: _zod.z.boolean(),
     exportFloorGrid: _zod.z.boolean(),
     exportFloors: _zod.z.boolean(),
-    exportGroups: _zod.z.boolean(),
+    exportTags: _zod.z.boolean(),
+    exportGroups: _zod.z.boolean().optional(),
     exportSettings: _zod.z.boolean().default(false),
     exportUsers: _zod.z.boolean().default(false),
     printerComparisonStrategiesByPriority: _zod.z.array(_zod.z.string().refine((val)=>[
@@ -66,11 +67,12 @@ const importPrintersFloorsYamlSchema = _zod.z.object({
     databaseType: _zod.z.enum([
         "mongo",
         "sqlite"
-    ]).default("mongo"),
+    ]).default("sqlite"),
     config: _zod.z.object({
         exportPrinters: _zod.z.boolean(),
         exportFloorGrid: _zod.z.boolean(),
         exportFloors: _zod.z.boolean(),
+        exportTags: _zod.z.boolean().optional(),
         exportGroups: _zod.z.boolean().optional(),
         exportSettings: _zod.z.boolean().optional().default(false),
         exportUsers: _zod.z.boolean().optional().default(false),
@@ -99,13 +101,15 @@ const importPrintersFloorsYamlSchema = _zod.z.object({
     })).min(0).default([]),
     floors: _zod.z.array(_zod.z.object({
         id: numberOrStringIdValidator,
-        floor: _floorservicevalidation.floorLevelValidator,
+        order: _floorservicevalidation.floorOrderValidator,
+        floor: _floorservicevalidation.floorOrderValidator.optional(),
         name: _floorservicevalidation.floorNameValidator,
         printers: printerPositionsSchema
     })).min(0).default([]),
-    groups: _zod.z.array(_zod.z.object({
+    tags: _zod.z.array(_zod.z.object({
         id: numberOrStringIdValidator,
         name: _zod.z.string(),
+        color: _zod.z.string().optional(),
         printers: _zod.z.array(_zod.z.object({
             printerId: numberOrStringIdValidator
         }))
@@ -121,16 +125,6 @@ const importPrintersFloorsYamlSchema = _zod.z.object({
         passwordHash: _zod.z.string(),
         createdAt: _zod.z.date().optional(),
         roles: _zod.z.array(_zod.z.any()).optional()
-    })).optional().default([]),
-    roles: _zod.z.array(_zod.z.object({
-        id: numberOrStringIdValidator,
-        name: _zod.z.string()
-    })).optional().default([]),
-    user_roles: _zod.z.array(_zod.z.object({
-        id: numberOrStringIdValidator,
-        userId: numberOrStringIdValidator,
-        roleId: numberOrStringIdValidator,
-        createdAt: _zod.z.date().optional()
     })).optional().default([])
 });
 

package/dist/services/validators/yaml-service.validation.js.map

@@ -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","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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"}
+{"version":3,"sources":["../../../src/services/validators/yaml-service.validation.ts"],"names":["exportPrintersFloorsYamlSchema","importPrinterPositionsSchema","importPrintersFloorsYamlSchema","numberOrStringIdValidator","printerPositionsSchema","z","object","exportPrinters","boolean","exportFloorGrid","exportFloors","exportTags","exportGroups","optional","exportSettings","default","exportUsers","printerComparisonStrategiesByPriority","array","string","refine","val","includes","min","floorComparisonStrategiesByPriority","notes","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","order","floorOrderValidator","floor","floorNameValidator","tags","color","settings","any","users","username","isDemoUser","isRootUser","isVerified","needsPasswordChange","passwordHash","createdAt","roles"],"mappings":";;;;;;;;;;;QAeaA;eAAAA;;QA6BAC;eAAAA;;QAIAC;eAAAA;;QAjBAC;eAAAA;;QAEAC;eAAAA;;;qBAjCK;0CAOX;wCAMA;AAEA,MAAMJ,iCAAiCK,MAAC,CAACC,MAAM,CAAC;IACrDC,gBAAgBF,MAAC,CAACG,OAAO;IACzBC,iBAAiBJ,MAAC,CAACG,OAAO;IAC1BE,cAAcL,MAAC,CAACG,OAAO;IACvBG,YAAYN,MAAC,CAACG,OAAO;IAErBI,cAAcP,MAAC,CAACG,OAAO,GAAGK,QAAQ;IAClCC,gBAAgBT,MAAC,CAACG,OAAO,GAAGO,OAAO,CAAC;IACpCC,aAAaX,MAAC,CAACG,OAAO,GAAGO,OAAO,CAAC;IACjCE,uCAAuCZ,MAAC,CACrCa,KAAK,CAACb,MAAC,CAACc,MAAM,GAAGC,MAAM,CAAC,CAACC,MAAQ;YAAC;YAAQ;YAAO;SAAK,CAACC,QAAQ,CAACD,OAChEE,GAAG,CAAC;IACPC,qCAAqCnB,MAAC,CAACc,MAAM,GAAGC,MAAM,CAAC,CAACC,MAAQ;YAAC;YAAQ;YAAS;SAAK,CAACC,QAAQ,CAACD;IACjGI,OAAOpB,MAAC,CAACc,MAAM,GAAGN,QAAQ;AAC5B;AAEO,MAAMV,4BAA4BE,MAAC,CAACqB,KAAK,CAAC;IAACrB,MAAC,CAACsB,MAAM;IAAItB,MAAC,CAACc,MAAM;CAAG;AAElE,MAAMf,yBAAyBC,MAAC,CACpCa,KAAK,CACJb,MAAC,CAACC,MAAM,CAAC;IACPsB,WAAWzB;IACX0B,SAAS1B,0BAA0BU,QAAQ;IAC3CiB,GAAGC,kCAAU;IACbC,GAAGC,kCAAU;AACf,IAEDV,GAAG,CAAC;AAEA,MAAMtB,+BAA+BI,MAAC,CAACC,MAAM,CAAC;IACnD4B,UAAU9B,uBAAuBS,QAAQ;AAC3C;AAEO,MAAMX,iCAAiCG,MAAC,CAACC,MAAM,CAAC;IACrD6B,SAAS9B,MAAC,CAACc,MAAM,GAAGN,QAAQ;IAC5BuB,YAAY/B,MAAC,CAACgC,IAAI,GAAGxB,QAAQ;IAC7ByB,cAAcjC,MAAC,CAACkC,IAAI,CAAC;QAAC;QAAS;KAAS,EAAExB,OAAO,CAAC;IAClDyB,QAAQnC,MAAC,CAACC,MAAM,CAAC;QACfC,gBAAgBF,MAAC,CAACG,OAAO;QACzBC,iBAAiBJ,MAAC,CAACG,OAAO;QAC1BE,cAAcL,MAAC,CAACG,OAAO;QACvBG,YAAYN,MAAC,CAACG,OAAO,GAAGK,QAAQ;QAEhCD,cAAcP,MAAC,CAACG,OAAO,GAAGK,QAAQ;QAClCC,gBAAgBT,MAAC,CAACG,OAAO,GAAGK,QAAQ,GAAGE,OAAO,CAAC;QAC/CC,aAAaX,MAAC,CAACG,OAAO,GAAGK,QAAQ,GAAGE,OAAO,CAAC;QAC5CE,uCAAuCZ,MAAC,CACrCa,KAAK,CAACb,MAAC,CAACc,MAAM,GAAGC,MAAM,CAAC,CAACC,MAAQ;gBAAC;gBAAQ;gBAAO;aAAK,CAACC,QAAQ,CAACD,OAChEE,GAAG,CAAC;QACPC,qCAAqCnB,MAAC,CAACc,MAAM,GAAGC,MAAM,CAAC,CAACC,MAAQ;gBAAC;gBAAQ;gBAAS;aAAK,CAACC,QAAQ,CAACD;IACnG;IACAa,UAAU7B,MAAC,CACRa,KAAK,CACJb,MAAC,CAACC,MAAM,CAAC;QACPmC,IAAItC;QACJuC,YAAYC,6CAAmB;QAC/BC,aAAaC,8CAAoB;QACjCC,QAAQC,gDAAsB;QAC9BC,SAASC,iDAAuB;QAChCC,MAAMC,8CAAoB;QAE1BC,aAAa/C,MAAC,CAACc,MAAM,GAAGN,QAAQ;QAChCwC,oBAAoBhD,MAAC,CAClBC,MAAM,CAAC;YACN4C,MAAM7C,MAAC,CAACc,MAAM,GAAGN,QAAQ;QAC3B,GACCA,QAAQ;IACb,IAEDU,GAAG,CAAC,GACJR,OAAO,CAAC,EAAE;IACbuC,QAAQjD,MAAC,CACNa,KAAK,CACJb,MAAC,CAACC,MAAM,CAAC;QACPmC,IAAItC;QACJoD,OAAOC,2CAAmB;QAE1BC,OAAOD,2CAAmB,CAAC3C,QAAQ;QACnCqC,MAAMQ,0CAAkB;QACxBxB,UAAU9B;IACZ,IAEDmB,GAAG,CAAC,GACJR,OAAO,CAAC,EAAE;IACb4C,MAAMtD,MAAC,CACJa,KAAK,CACJb,MAAC,CAACC,MAAM,CAAC;QACPmC,IAAItC;QACJ+C,MAAM7C,MAAC,CAACc,MAAM;QACdyC,OAAOvD,MAAC,CAACc,MAAM,GAAGN,QAAQ;QAC1BqB,UAAU7B,MAAC,CAACa,KAAK,CACfb,MAAC,CAACC,MAAM,CAAC;YACPsB,WAAWzB;QACb;IAEJ,IAEDoB,GAAG,CAAC,GACJR,OAAO,CAAC,EAAE;IACb8C,UAAUxD,MAAC,CAACyD,GAAG,GAAGjD,QAAQ;IAC1BkD,OAAO1D,MAAC,CACLa,KAAK,CACJb,MAAC,CAACC,MAAM,CAAC;QACPmC,IAAItC;QACJ6D,UAAU3D,MAAC,CAACc,MAAM;QAClB8C,YAAY5D,MAAC,CAACG,OAAO,GAAGK,QAAQ;QAChCqD,YAAY7D,MAAC,CAACG,OAAO,GAAGK,QAAQ;QAChCsD,YAAY9D,MAAC,CAACG,OAAO,GAAGK,QAAQ;QAChCuD,qBAAqB/D,MAAC,CAACG,OAAO,GAAGK,QAAQ;QACzCwD,cAAchE,MAAC,CAACc,MAAM;QACtBmD,WAAWjE,MAAC,CAACgC,IAAI,GAAGxB,QAAQ;QAC5B0D,OAAOlE,MAAC,CAACa,KAAK,CAACb,MAAC,CAACyD,GAAG,IAAIjD,QAAQ;IAClC,IAEDA,QAAQ,GACRE,OAAO,CAAC,EAAE;AACf"}

package/dist/shared/load-controllers.js

@@ -13,7 +13,8 @@ const _path = require("path");
 const loadControllersFunc = ()=>(0, _awilixexpress.loadControllers)("./controllers/*.controller.*", {
         cwd: (0, _path.join)(__dirname, ".."),
         ignore: [
-            "**/*.map"
+            "**/*.map",
+            "**/*.d.ts"
         ]
     });
 

package/dist/shared/load-controllers.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/shared/load-controllers.ts"],"names":["loadControllersFunc","loadControllers","cwd","join","__dirname","ignore"],"mappings":";;;;+BAGaA;;;eAAAA;;;+BAHmB;sBACX;AAEd,MAAMA,sBAAsB,IACjCC,IAAAA,8BAAe,EAAC,gCAAgC;QAC9CC,KAAKC,IAAAA,UAAI,EAACC,WAAW;QACrBC,QAAQ;YAAC;SAAW;IACtB"}
+{"version":3,"sources":["../../src/shared/load-controllers.ts"],"names":["loadControllersFunc","loadControllers","cwd","join","__dirname","ignore"],"mappings":";;;;+BAGaA;;;eAAAA;;;+BAHmB;sBACX;AAEd,MAAMA,sBAAsB,IACjCC,IAAAA,8BAAe,EAAC,gCAAgC;QAC9CC,KAAKC,IAAAA,UAAI,EAACC,WAAW;QACrBC,QAAQ;YAAC;YAAY;SAAY;IACnC"}

package/dist/shared/runtime-settings.migration.js

@@ -27,25 +27,15 @@ function migrateSettingsRuntime(knownSettings) {
         ...(0, _serversettingsconstants.getDefaultCredentialSettings)(),
         jwtSecret: (0, _uuid.v4)()
     };
-    entity[_serversettingsconstants.printerFileCleanSettingKey] ??= (0, _serversettingsconstants.getDefaultFileCleanSettings)();
-    if (entity[_serversettingsconstants.printerFileCleanSettingKey]) {
-        entity[_serversettingsconstants.printerFileCleanSettingKey] = {
-            autoRemoveOldFilesBeforeUpload: entity[_serversettingsconstants.printerFileCleanSettingKey].autoRemoveOldFilesBeforeUpload,
-            autoRemoveOldFilesAtBoot: entity[_serversettingsconstants.printerFileCleanSettingKey].autoRemoveOldFilesBeforeUpload,
-            autoRemoveOldFilesCriteriumDays: entity[_serversettingsconstants.printerFileCleanSettingKey].autoRemoveOldFilesCriteriumDays
-        };
-    }
     if (entity[_serversettingsconstants.serverSettingsKey]) {
         const defaultServerSettings = (0, _serversettingsconstants.getDefaultServerSettings)();
         entity[_serversettingsconstants.serverSettingsKey] = {
             loginRequired: entity[_serversettingsconstants.serverSettingsKey].loginRequired ?? defaultServerSettings.loginRequired,
             registration: entity[_serversettingsconstants.serverSettingsKey].registration ?? defaultServerSettings.registration,
-            experimentalClientSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalClientSupport ?? defaultServerSettings.experimentalClientSupport,
             experimentalMoonrakerSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalMoonrakerSupport ?? defaultServerSettings.experimentalMoonrakerSupport,
             experimentalPrusaLinkSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalPrusaLinkSupport ?? defaultServerSettings.experimentalPrusaLinkSupport,
             experimentalBambuSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalBambuSupport ?? defaultServerSettings.experimentalBambuSupport,
-            sentryDiagnosticsEnabled: entity[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled ?? defaultServerSettings.sentryDiagnosticsEnabled,
-            experimentalThumbnailSupport: entity[_serversettingsconstants.serverSettingsKey].experimentalThumbnailSupport ?? defaultServerSettings.experimentalThumbnailSupport
+            sentryDiagnosticsEnabled: entity[_serversettingsconstants.serverSettingsKey].sentryDiagnosticsEnabled ?? defaultServerSettings.sentryDiagnosticsEnabled
         };
     }
     return entity;

package/dist/shared/runtime-settings.migration.js.map

@@ -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","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"}
+{"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","defaultServerSettings","loginRequired","registration","experimentalMoonrakerSupport","experimentalPrusaLinkSupport","experimentalBambuSupport","sentryDiagnosticsEnabled"],"mappings":";;;;+BAegBA;;;eAAAA;;;yCAJT;sBACsB;AAGtB,SAASA,uBAAuBC,aAAgC;IACrE,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;IAEA,IAAIf,MAAM,CAACQ,0CAAiB,CAAC,EAAE;QAC7B,MAAMQ,wBAAwBP,IAAAA,iDAAwB;QAGtDT,MAAM,CAACQ,0CAAiB,CAAC,GAAG;YAC1BS,eAAejB,MAAM,CAACQ,0CAAiB,CAAC,CAACS,aAAa,IAAID,sBAAsBC,aAAa;YAC7FC,cAAclB,MAAM,CAACQ,0CAAiB,CAAC,CAACU,YAAY,IAAIF,sBAAsBE,YAAY;YAC1FC,8BACEnB,MAAM,CAACQ,0CAAiB,CAAC,CAACW,4BAA4B,IAAIH,sBAAsBG,4BAA4B;YAC9GC,8BACEpB,MAAM,CAACQ,0CAAiB,CAAC,CAACY,4BAA4B,IAAIJ,sBAAsBI,4BAA4B;YAC9GC,0BACErB,MAAM,CAACQ,0CAAiB,CAAC,CAACa,wBAAwB,IAAIL,sBAAsBK,wBAAwB;YACtGC,0BACEtB,MAAM,CAACQ,0CAAiB,CAAC,CAACc,wBAAwB,IAAIN,sBAAsBM,wBAAwB;QACxG;IACF;IAEA,OAAOtB;AACT"}

package/dist/shared/websocket-rpc-extended.adapter.js

@@ -16,9 +16,7 @@ class WebsocketRpcExtendedAdapter extends _websocketadapter.WebsocketAdapter {
         this.logger = loggerFactory(WebsocketRpcExtendedAdapter.name);
         this.requestMap = new Map();
     }
-    sendRequest(request, options = {
-        timeout: 10000
-    }) {
+    sendRequest(request, options) {
         if (!this.socket) {
             throw new Error("Websocket was not created, cannot send request");
         }
@@ -28,7 +26,7 @@ class WebsocketRpcExtendedAdapter extends _websocketadapter.WebsocketAdapter {
             const timeout = setTimeout(()=>{
                 this.clearRequest(requestId);
                 reject(new Error(`Websocket RPC Request by ID ${requestId} timed out`));
-            }, Math.min(3000, options?.timeout) ?? 10000);
+            }, Math.min(3000, options?.timeout ?? 10000));
             this.requestMap.set(requestId, {
                 resolve,
                 reject,
@@ -63,6 +61,17 @@ class WebsocketRpcExtendedAdapter extends _websocketadapter.WebsocketAdapter {
             this.requestMap.delete(requestId);
         }
     }
+    clearAllRequests() {
+        for (const [, request] of this.requestMap.entries()){
+            clearTimeout(request.timeout);
+            request.reject(new Error("WebSocket adapter closed"));
+        }
+        this.requestMap.clear();
+    }
+    close() {
+        this.clearAllRequests();
+        super.close();
+    }
 }
 
 //# sourceMappingURL=websocket-rpc-extended.adapter.js.map

package/dist/shared/websocket-rpc-extended.adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/shared/websocket-rpc-extended.adapter.ts"],"names":["WebsocketRpcExtendedAdapter","WebsocketAdapter","requestMap","loggerFactory","logger","name","Map","sendRequest","request","options","timeout","socket","Error","id","requestId","promise","Promise","resolve","reject","setTimeout","clearRequest","Math","min","set","send","JSON","stringify","onMessage","message","response","parse","toString","event","onEventMessage","get","warn","clearTimeout","delete"],"mappings":";;;;+BAQsBA;;;eAAAA;;;kCARW;AAQ1B,MAAeA,oCAAoCC,kCAAgB;IAEhEC,WAON;IAEF,YAAsBC,aAA6B,CAAE;QACnD,KAAK,CAACA;QAEN,IAAI,CAACC,MAAM,GAAGD,cAAcH,4BAA4BK,IAAI;QAE5D,IAAI,CAACH,UAAU,GAAG,IAAII;IACxB;IAEAC,YAAwBC,OAA6B,EAAEC,UAAU;QAAEC,SAAS;IAAM,CAAC,EAAkC;QACnH,IAAI,CAAC,IAAI,CAACC,MAAM,EAAE;YAChB,MAAM,IAAIC,MAAM;QAClB;QAEAJ,QAAQK,EAAE,GAAGL,QAAQK,EAAE;QAGvB,MAAMC,YAAYN,QAAQK,EAAE;QAC5B,MAAME,UAAU,IAAIC,QAA+B,CAACC,SAASC;YAC3D,MAAMR,UAAUS,WAAW;gBACzB,IAAI,CAACC,YAAY,CAACN;gBAClBI,OAAO,IAAIN,MAAM,CAAC,4BAA4B,EAAEE,UAAU,UAAU,CAAC;YACvE,GAAGO,KAAKC,GAAG,CAAC,MAAMb,SAASC,YAAY;YAEvC,IAAI,CAACR,UAAU,CAACqB,GAAG,CAACT,WAAW;gBAAEG;gBAASC;gBAAQR;YAAQ;QAC5D;QAGA,IAAI,CAACC,MAAM,CAACa,IAAI,CAACC,KAAKC,SAAS,CAAClB;QAEhC,OAAOO;IACT;IASA,MAAgBY,UAAUC,OAAa,EAAiB;QACtD,MAAMC,WAAoCJ,KAAKK,KAAK,CAACF,QAAQG,QAAQ;QACrE,MAAMjB,YAAYe,SAAShB,EAAE;QAC7B,IAAI,CAACC,WAAW;YACd,MAAMkB,QAAQH;YACd,OAAO,MAAM,IAAI,CAACI,cAAc,CAACD;QACnC;QAEA,MAAMxB,UAAU,IAAI,CAACN,UAAU,CAACgC,GAAG,CAACpB;QACpC,IAAI,CAACN,SAAS;YACZ,IAAI,CAACJ,MAAM,CAAC+B,IAAI,CACd,CAAC,uDAAuD,EAAEN,SAAShB,EAAE,CAAC,yCAAyC,CAAC;YAElH;QACF;QAEA,IAAIL,SAAS;YACX4B,aAAa5B,QAAQE,OAAO;YAC5BF,QAAQS,OAAO,CAACY;YAChB,IAAI,CAAC3B,UAAU,CAACmC,MAAM,CAACvB;QACzB;IACF;IAEQM,aAAaN,SAAiB,EAAQ;QAC5C,MAAMN,UAAU,IAAI,CAACN,UAAU,CAACgC,GAAG,CAACpB;QACpC,IAAIN,SAAS;YACX4B,aAAa5B,QAAQE,OAAO;YAC5B,IAAI,CAACR,UAAU,CAACmC,MAAM,CAACvB;QACzB;IACF;AACF"}
+{"version":3,"sources":["../../src/shared/websocket-rpc-extended.adapter.ts"],"names":["WebsocketRpcExtendedAdapter","WebsocketAdapter","requestMap","loggerFactory","logger","name","Map","sendRequest","request","options","socket","Error","id","requestId","promise","Promise","resolve","reject","timeout","setTimeout","clearRequest","Math","min","set","send","JSON","stringify","onMessage","message","response","parse","toString","event","onEventMessage","get","warn","clearTimeout","delete","clearAllRequests","entries","clear","close"],"mappings":";;;;+BAQsBA;;;eAAAA;;;kCARW;AAQ1B,MAAeA,oCAAoCC,kCAAgB;IAEvDC,WAOf;IAEF,YAAsBC,aAA6B,CAAE;QACnD,KAAK,CAACA;QAEN,IAAI,CAACC,MAAM,GAAGD,cAAcH,4BAA4BK,IAAI;QAE5D,IAAI,CAACH,UAAU,GAAG,IAAII;IACxB;IAEAC,YAAwBC,OAA6B,EAAEC,OAA6B,EAAkC;QACpH,IAAI,CAAC,IAAI,CAACC,MAAM,EAAE;YAChB,MAAM,IAAIC,MAAM;QAClB;QAEAH,QAAQI,EAAE,GAAGJ,QAAQI,EAAE;QAGvB,MAAMC,YAAYL,QAAQI,EAAE;QAC5B,MAAME,UAAU,IAAIC,QAA+B,CAACC,SAASC;YAC3D,MAAMC,UAAUC,WAAW;gBACzB,IAAI,CAACC,YAAY,CAACP;gBAClBI,OAAO,IAAIN,MAAM,CAAC,4BAA4B,EAAEE,UAAU,UAAU,CAAC;YACvE,GAAGQ,KAAKC,GAAG,CAAC,MAAMb,SAASS,WAAW;YAEtC,IAAI,CAAChB,UAAU,CAACqB,GAAG,CAACV,WAAW;gBAAEG;gBAASC;gBAAQC;YAAQ;QAC5D;QAGA,IAAI,CAACR,MAAM,CAACc,IAAI,CAACC,KAAKC,SAAS,CAAClB;QAEhC,OAAOM;IACT;IASA,MAAgBa,UAAUC,OAAa,EAAiB;QACtD,MAAMC,WAAoCJ,KAAKK,KAAK,CAACF,QAAQG,QAAQ;QACrE,MAAMlB,YAAYgB,SAASjB,EAAE;QAC7B,IAAI,CAACC,WAAW;YACd,MAAMmB,QAAQH;YACd,OAAO,MAAM,IAAI,CAACI,cAAc,CAACD;QACnC;QAEA,MAAMxB,UAAU,IAAI,CAACN,UAAU,CAACgC,GAAG,CAACrB;QACpC,IAAI,CAACL,SAAS;YACZ,IAAI,CAACJ,MAAM,CAAC+B,IAAI,CACd,CAAC,uDAAuD,EAAEN,SAASjB,EAAE,CAAC,yCAAyC,CAAC;YAElH;QACF;QAEA,IAAIJ,SAAS;YACX4B,aAAa5B,QAAQU,OAAO;YAC5BV,QAAQQ,OAAO,CAACa;YAChB,IAAI,CAAC3B,UAAU,CAACmC,MAAM,CAACxB;QACzB;IACF;IAEQO,aAAaP,SAAiB,EAAQ;QAC5C,MAAML,UAAU,IAAI,CAACN,UAAU,CAACgC,GAAG,CAACrB;QACpC,IAAIL,SAAS;YACX4B,aAAa5B,QAAQU,OAAO;YAC5B,IAAI,CAAChB,UAAU,CAACmC,MAAM,CAACxB;QACzB;IACF;IAMQyB,mBAAyB;QAC/B,KAAK,MAAM,GAAG9B,QAAQ,IAAI,IAAI,CAACN,UAAU,CAACqC,OAAO,GAAI;YACnDH,aAAa5B,QAAQU,OAAO;YAC5BV,QAAQS,MAAM,CAAC,IAAIN,MAAM;QAC3B;QACA,IAAI,CAACT,UAAU,CAACsC,KAAK;IACvB;IAKAC,QAAc;QACZ,IAAI,CAACH,gBAAgB;QACrB,KAAK,CAACG;IACR;AACF"}

package/dist/shared/websocket.adapter.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/shared/websocket.adapter.ts"],"names":["WebsocketAdapter","socket","logger","eventEmittingAllowed","loggerFactory","name","isOpened","readyState","WebSocket","OPEN","close","allowEmittingEvents","disallowEmittingEvents","open","url","Error","handshakeTimeout","AppConstants","defaultWebsocketHandshakeTimeout","onopen","event","onOpen","onerror","error","onError","onclose","onClose","onmessage","message","onMessage","data","sendMessage","payload","Promise","resolve","reject","send","afterOpened","afterClosed"],"mappings":";;;;+BAOsBA;;;eAAAA;;;iCAPO;oBAC6C;AAMnE,MAAeA;IACpBC,OAAmB;IACTC,OAAsB;IAChCC,uBAAgC,KAAK;IAErC,YAAYC,aAA6B,CAAE;QACzC,IAAI,CAACF,MAAM,GAAGE,cAAcJ,iBAAiBK,IAAI;IACnD;IAEA,IAAIC,WAAW;QACb,OAAO,IAAI,CAACL,MAAM,EAAEM,eAAeC,aAAS,CAACC,IAAI;IACnD;IAEOC,QAAQ;QACb,IAAI,CAACT,MAAM,EAAES;QACb,OAAO,IAAI,CAACT,MAAM;IACpB;IAEOU,sBAAsB;QAC3B,IAAI,CAACR,oBAAoB,GAAG;IAC9B;IAEOS,yBAAyB;QAC9B,IAAI,CAACT,oBAAoB,GAAG;IAC9B;IASAU,KAAKC,GAAS,EAAQ;QACpB,IAAI,CAACA,KAAK;YACR,MAAM,IAAIC,MAAM;QAClB;QACA,IAAI,CAACd,MAAM,GAAG,IAAIO,aAAS,CAACM,KAAK;YAC/BE,kBAAkBC,6BAAY,CAACC,gCAAgC;QACjE;QACA,IAAI,CAACjB,MAAM,CAACkB,MAAM,GAAG,CAACC,QAAU,IAAI,CAACC,MAAM,CAACD;QAC5C,IAAI,CAACnB,MAAM,CAACqB,OAAO,GAAG,CAACC,QAAU,IAAI,CAACC,OAAO,CAACD;QAC9C,IAAI,CAACtB,MAAM,CAACwB,OAAO,GAAG,CAACL,QAAU,IAAI,CAACM,OAAO,CAACN;QAC9C,IAAI,CAACnB,MAAM,CAAC0B,SAAS,GAAG,CAACC,UAAY,IAAI,CAACC,SAAS,CAACD,QAAQE,IAAI;IAClE;IASA,MAAgBC,YAAYC,OAAe,EAAiB;QAC1D,IAAI,CAAC,IAAI,CAAC1B,QAAQ,IAAI,CAAC,IAAI,CAACL,MAAM,EAAE;YAClC,IAAI,CAACC,MAAM,CAACqB,KAAK,CAAC;YAClB;QACF;QACA,OAAO,MAAM,IAAIU,QAAQ,CAACC,SAASC;YACjC,IAAI,CAAClC,MAAM,CAAEmC,IAAI,CAACJ,SAAS,CAACT;gBAC1B,IAAIA,OAAOY,OAAOZ;gBAClBW;YACF;QACF;IACF;IA4CA,MAAcb,OAAOD,KAAc,EAAiB;QAClD,MAAM,IAAI,CAACiB,WAAW,CAACjB;IACzB;IAQA,MAAcM,QAAQN,KAAiB,EAAiB;QACtD,MAAM,IAAI,CAACkB,WAAW,CAAClB;IACzB;AACF"}
+{"version":3,"sources":["../../src/shared/websocket.adapter.ts"],"names":["WebsocketAdapter","socket","logger","eventEmittingAllowed","loggerFactory","name","isOpened","readyState","WebSocket","OPEN","close","allowEmittingEvents","disallowEmittingEvents","open","url","Error","handshakeTimeout","AppConstants","defaultWebsocketHandshakeTimeout","onopen","event","onOpen","onerror","error","onError","onclose","onClose","onmessage","message","onMessage","data","sendMessage","payload","Promise","resolve","reject","send","afterOpened","afterClosed"],"mappings":";;;;+BAKsBA;;;eAAAA;;;iCALO;oBAC6C;AAInE,MAAeA;IACpBC,OAAmB;IACTC,OAAsB;IAChCC,uBAAgC,KAAK;IAErC,YAAYC,aAA6B,CAAE;QACzC,IAAI,CAACF,MAAM,GAAGE,cAAcJ,iBAAiBK,IAAI;IACnD;IAEA,IAAIC,WAAW;QACb,OAAO,IAAI,CAACL,MAAM,EAAEM,eAAeC,aAAS,CAACC,IAAI;IACnD;IAEOC,QAAQ;QACb,IAAI,CAACT,MAAM,EAAES;QACb,OAAO,IAAI,CAACT,MAAM;IACpB;IAEOU,sBAAsB;QAC3B,IAAI,CAACR,oBAAoB,GAAG;IAC9B;IAEOS,yBAAyB;QAC9B,IAAI,CAACT,oBAAoB,GAAG;IAC9B;IASAU,KAAKC,GAAS,EAAQ;QACpB,IAAI,CAACA,KAAK;YACR,MAAM,IAAIC,MAAM;QAClB;QACA,IAAI,CAACd,MAAM,GAAG,IAAIO,aAAS,CAACM,KAAK;YAC/BE,kBAAkBC,6BAAY,CAACC,gCAAgC;QACjE;QACA,IAAI,CAACjB,MAAM,CAACkB,MAAM,GAAG,CAACC,QAAU,IAAI,CAACC,MAAM,CAACD;QAC5C,IAAI,CAACnB,MAAM,CAACqB,OAAO,GAAG,CAACC,QAAU,IAAI,CAACC,OAAO,CAACD;QAC9C,IAAI,CAACtB,MAAM,CAACwB,OAAO,GAAG,CAACL,QAAU,IAAI,CAACM,OAAO,CAACN;QAC9C,IAAI,CAACnB,MAAM,CAAC0B,SAAS,GAAG,CAACC,UAAY,IAAI,CAACC,SAAS,CAACD,QAAQE,IAAI;IAClE;IASA,MAAgBC,YAAYC,OAAe,EAAiB;QAC1D,IAAI,CAAC,IAAI,CAAC1B,QAAQ,IAAI,CAAC,IAAI,CAACL,MAAM,EAAE;YAClC,IAAI,CAACC,MAAM,CAACqB,KAAK,CAAC;YAClB;QACF;QACA,OAAO,MAAM,IAAIU,QAAQ,CAACC,SAASC;YACjC,IAAI,CAAClC,MAAM,CAAEmC,IAAI,CAACJ,SAAS,CAACT;gBAC1B,IAAIA,OAAOY,OAAOZ;gBAClBW;YACF;QACF;IACF;IA4CA,MAAcb,OAAOD,KAAc,EAAiB;QAClD,MAAM,IAAI,CAACiB,WAAW,CAACjB;IACzB;IAQA,MAAcM,QAAQN,KAAiB,EAAiB;QACtD,MAAM,IAAI,CAACkB,WAAW,CAAClB;IACzB;AACF"}

package/dist/state/file-upload-tracker.cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/file-upload-tracker.cache.ts"],"names":["FileUploadTrackerCache","currentUploads","logger","loggerFactory","eventEmitter2","name","on","uploadProgressEvent","token","progress","handleUploadProgress","uploadDoneEvent","handleUploadDone","uploadFailedEvent","reason","handleUploadFailed","getUploads","current","getUpload","correlationToken","find","cu","addUploadTracker","multerFile","printerId","generateCorrelationToken","log","push","startedAt","Date","now","completed","completedAt","success","event","upload","markUploadDone","trackedUploadIndex","findIndex","warn","trackedUpload"],"mappings":";;;;+BASaA;;;eAAAA;;;sCAT4B;gCAC+B;AAQjE,MAAMA;;IACMC,iBAAkC,EAAE,CAAC;IAErCC,OAAsB;IAEvC,YACEC,aAA6B,EAC7B,AAAiBC,aAA4B,CAC7C;aADiBA,gBAAAA;QAEjB,IAAI,CAACF,MAAM,GAAGC,cAAcH,uBAAuBK,IAAI;QAEvD,IAAI,CAACD,aAAa,CAACE,EAAE,CAACC,IAAAA,mCAAmB,EAAC,MAAM,CAACC,OAAOC,WAAa,IAAI,CAACC,oBAAoB,CAACF,OAAOC;QACtG,IAAI,CAACL,aAAa,CAACE,EAAE,CAACK,IAAAA,+BAAe,EAAC,MAAM,CAACH,QAAkB,IAAI,CAACI,gBAAgB,CAACJ;QACrF,IAAI,CAACJ,aAAa,CAACE,EAAE,CAACO,IAAAA,iCAAiB,EAAC,MAAM,CAACL,OAAeM,SAC5D,IAAI,CAACC,kBAAkB,CAACP,OAAOM;IAEnC;IAEAE,aAAa;QACX,OAAO;YACLC,SAAS,IAAI,CAAChB,cAAc;QAC9B;IACF;IAEAiB,UAAUC,gBAAwB,EAAE;QAClC,OAAO,IAAI,CAAClB,cAAc,CAACmB,IAAI,CAAC,CAACC,KAAOA,GAAGF,gBAAgB,KAAKA;IAClE;IAEAG,iBAAiBC,UAA+B,EAAEC,SAAiB,EAAE;QACnE,MAAML,mBAAmBM,IAAAA,8CAAwB;QACjD,IAAI,CAACvB,MAAM,CAACwB,GAAG,CAAC,CAAC,mCAAmC,EAAEP,kBAAkB;QAExE,IAAI,CAAClB,cAAc,CAAC0B,IAAI,CAAC;YACvBR;YACAK;YACAI,WAAWC,KAAKC,GAAG;YACnBP;YACAd,UAAU;YACVsB,WAAW;YACXC,aAAa;YACbC,SAAS;YACTnB,QAAQ;QACV;QAEA,OAAOK;IACT;IAEAT,qBAAqBF,KAAa,EAAE0B,KAAyB,EAAE;QAC7D,MAAMC,SAAS,IAAI,CAACjB,SAAS,CAACV;QAC9B,IAAI,CAAC2B,QAAQ;YACX;QACF;QACAA,OAAO1B,QAAQ,GAAGyB,MAAMzB,QAAQ,IAAI;IACtC;IAEAM,mBAAmBP,KAAa,EAAEM,MAAe,EAAE;QACjD,IAAI,CAACZ,MAAM,CAACwB,GAAG,CAAC,CAAC,eAAe,EAAElB,MAAM,uBAAuB,CAAC;QAChE,IAAI,CAAC4B,cAAc,CAAC5B,OAAO,OAAOM;IACpC;IAEAF,iBAAiBJ,KAAa,EAAE;QAC9B,IAAI,CAACN,MAAM,CAACwB,GAAG,CAAC,CAAC,eAAe,EAAElB,MAAM,uBAAuB,CAAC;QAChE,IAAI,CAAC4B,cAAc,CAAC5B,OAAO;IAC7B;IAEA4B,eAAe5B,KAAa,EAAEyB,OAAgB,EAAEnB,MAAe,EAAE;QAC/D,MAAMuB,qBAAqB,IAAI,CAACpC,cAAc,CAACqC,SAAS,CAAC,CAACjB,KAAOA,GAAGF,gBAAgB,KAAKX;QACzF,IAAI6B,uBAAuB,CAAC,GAAG;YAC7B,IAAI,CAACnC,MAAM,CAACqC,IAAI,CAAC,CAAC,sDAAsD,EAAE/B,MAAM,8BAA8B,CAAC;YAC/G;QACF;QAEA,MAAMgC,gBAAgB,IAAI,CAACvC,cAAc,CAACoC,mBAAmB;QAE7DG,cAAcT,SAAS,GAAG;QAC1BS,cAAcP,OAAO,GAAGA;QACxBO,cAAcR,WAAW,GAAGH,KAAKC,GAAG;QACpCU,cAAc1B,MAAM,GAAGA,UAAU;IACnC;AACF"}
+{"version":3,"sources":["../../src/state/file-upload-tracker.cache.ts"],"names":["FileUploadTrackerCache","currentUploads","logger","loggerFactory","eventEmitter2","name","on","uploadProgressEvent","token","progress","handleUploadProgress","uploadDoneEvent","handleUploadDone","uploadFailedEvent","reason","handleUploadFailed","getUploads","current","getUpload","correlationToken","find","cu","addUploadTracker","multerFile","printerId","generateCorrelationToken","log","push","startedAt","Date","now","completed","completedAt","success","event","upload","markUploadDone","trackedUploadIndex","findIndex","warn","trackedUpload"],"mappings":";;;;+BAQaA;;;eAAAA;;;sCAR4B;gCAC+B;AAOjE,MAAMA;;IACMC,iBAAkC,EAAE,CAAC;IAErCC,OAAsB;IAEvC,YACEC,aAA6B,EAC7B,AAAiBC,aAA4B,CAC7C;aADiBA,gBAAAA;QAEjB,IAAI,CAACF,MAAM,GAAGC,cAAcH,uBAAuBK,IAAI;QAEvD,IAAI,CAACD,aAAa,CAACE,EAAE,CAACC,IAAAA,mCAAmB,EAAC,MAAM,CAACC,OAAOC,WAAa,IAAI,CAACC,oBAAoB,CAACF,OAAOC;QACtG,IAAI,CAACL,aAAa,CAACE,EAAE,CAACK,IAAAA,+BAAe,EAAC,MAAM,CAACH,QAAkB,IAAI,CAACI,gBAAgB,CAACJ;QACrF,IAAI,CAACJ,aAAa,CAACE,EAAE,CAACO,IAAAA,iCAAiB,EAAC,MAAM,CAACL,OAAeM,SAC5D,IAAI,CAACC,kBAAkB,CAACP,OAAOM;IAEnC;IAEAE,aAAa;QACX,OAAO;YACLC,SAAS,IAAI,CAAChB,cAAc;QAC9B;IACF;IAEAiB,UAAUC,gBAAwB,EAAE;QAClC,OAAO,IAAI,CAAClB,cAAc,CAACmB,IAAI,CAAC,CAACC,KAAOA,GAAGF,gBAAgB,KAAKA;IAClE;IAEAG,iBAAiBC,UAA+B,EAAEC,SAAiB,EAAE;QACnE,MAAML,mBAAmBM,IAAAA,8CAAwB;QACjD,IAAI,CAACvB,MAAM,CAACwB,GAAG,CAAC,CAAC,mCAAmC,EAAEP,kBAAkB;QAExE,IAAI,CAAClB,cAAc,CAAC0B,IAAI,CAAC;YACvBR;YACAK;YACAI,WAAWC,KAAKC,GAAG;YACnBP;YACAd,UAAU;YACVsB,WAAW;YACXC,aAAa;YACbC,SAAS;YACTnB,QAAQ;QACV;QAEA,OAAOK;IACT;IAEAT,qBAAqBF,KAAa,EAAE0B,KAAyB,EAAE;QAC7D,MAAMC,SAAS,IAAI,CAACjB,SAAS,CAACV;QAC9B,IAAI,CAAC2B,QAAQ;YACX;QACF;QACAA,OAAO1B,QAAQ,GAAGyB,MAAMzB,QAAQ,IAAI;IACtC;IAEAM,mBAAmBP,KAAa,EAAEM,MAAe,EAAE;QACjD,IAAI,CAACZ,MAAM,CAACwB,GAAG,CAAC,CAAC,eAAe,EAAElB,MAAM,uBAAuB,CAAC;QAChE,IAAI,CAAC4B,cAAc,CAAC5B,OAAO,OAAOM;IACpC;IAEAF,iBAAiBJ,KAAa,EAAE;QAC9B,IAAI,CAACN,MAAM,CAACwB,GAAG,CAAC,CAAC,eAAe,EAAElB,MAAM,uBAAuB,CAAC;QAChE,IAAI,CAAC4B,cAAc,CAAC5B,OAAO;IAC7B;IAEA4B,eAAe5B,KAAa,EAAEyB,OAAgB,EAAEnB,MAAe,EAAE;QAC/D,MAAMuB,qBAAqB,IAAI,CAACpC,cAAc,CAACqC,SAAS,CAAC,CAACjB,KAAOA,GAAGF,gBAAgB,KAAKX;QACzF,IAAI6B,uBAAuB,CAAC,GAAG;YAC7B,IAAI,CAACnC,MAAM,CAACqC,IAAI,CAAC,CAAC,sDAAsD,EAAE/B,MAAM,8BAA8B,CAAC;YAC/G;QACF;QAEA,MAAMgC,gBAAgB,IAAI,CAACvC,cAAc,CAACoC,mBAAmB;QAE7DG,cAAcT,SAAS,GAAG;QAC1BS,cAAcP,OAAO,GAAGA;QACxBO,cAAcR,WAAW,GAAGH,KAAKC,GAAG;QACpCU,cAAc1B,MAAM,GAAGA,UAAU;IACnC;AACF"}

package/dist/state/file.cache.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "FileCache", {
 });
 const _runtimeexceptions = require("../exceptions/runtime.exceptions");
 class FileCache {
-    printerFileStorage = {};
+    printerFileStorage = new Map();
     totalFileCount = 0;
     logger;
     constructor(loggerFactory){
@@ -20,18 +20,18 @@ class FileCache {
         if (!printerId) {
             throw new Error("File Cache cant get a null/undefined printer id");
         }
-        this.printerFileStorage[printerId] = files;
+        this.printerFileStorage.set(printerId, files);
         this.updateCacheFileRefCount();
     }
     getPrinterFiles(printerId) {
         if (!printerId) {
             throw new Error("File Cache cant get a null/undefined printer id");
         }
-        return this.printerFileStorage[printerId];
+        return this.printerFileStorage.get(printerId);
     }
     updateCacheFileRefCount() {
         let totalFiles = 0;
-        for (const storage of Object.values(this.printerFileStorage)){
+        for (const storage of this.printerFileStorage.values()){
             totalFiles += storage?.length || 0;
         }
         if (totalFiles !== this.totalFileCount) {
@@ -44,12 +44,12 @@ class FileCache {
         if (!printerId) {
             throw new _runtimeexceptions.ValidationException("Parameter printerId was not provided.");
         }
-        const fileStorage = this.printerFileStorage[printerId];
+        const fileStorage = this.printerFileStorage.get(printerId);
         if (!fileStorage) {
             this.logger.warn("Did not remove printer File Storage as it was not found");
             return;
         }
-        delete this.printerFileStorage[printerId];
+        this.printerFileStorage.delete(printerId);
         this.logger.log(`Purged printer file cache`);
     }
     purgeFile(printerId, filePath) {

package/dist/state/file.cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/file.cache.ts"],"names":["FileCache","printerFileStorage","totalFileCount","logger","loggerFactory","name","cachePrinterFiles","printerId","files","Error","updateCacheFileRefCount","getPrinterFiles","totalFiles","storage","Object","values","length","log","purgePrinterId","ValidationException","fileStorage","warn","purgeFile","filePath","fileIndex","findIndex","f","path","splice"],"mappings":";;;;+BAMaA;;;eAAAA;;;mCANuB;AAM7B,MAAMA;IACHC,qBAAgD,CAAC,EAAE;IACnDC,iBAAiB,EAAE;IAEVC,OAAsB;IAEvC,YAAYC,aAA6B,CAAE;QACzC,IAAI,CAACD,MAAM,GAAGC,cAAcJ,UAAUK,IAAI;IAC5C;IAEAC,kBAAkBC,SAAiB,EAAEC,KAAgB,EAAE;QACrD,IAAI,CAACD,WAAW;YACd,MAAM,IAAIE,MAAM;QAClB;QACA,IAAI,CAACR,kBAAkB,CAACM,UAAU,GAAGC;QACrC,IAAI,CAACE,uBAAuB;IAC9B;IAEAC,gBAAgBJ,SAAiB,EAAE;QACjC,IAAI,CAACA,WAAW;YACd,MAAM,IAAIE,MAAM;QAClB;QACA,OAAO,IAAI,CAACR,kBAAkB,CAACM,UAAU;IAC3C;IAEAG,0BAA0B;QACxB,IAAIE,aAAa;QACjB,KAAK,MAAMC,WAAWC,OAAOC,MAAM,CAAC,IAAI,CAACd,kBAAkB,EAAG;YAC5DW,cAAcC,SAASG,UAAU;QACnC;QAEA,IAAIJ,eAAe,IAAI,CAACV,cAAc,EAAE;YACtC,IAAI,CAACA,cAAc,GAAGU;YACtB,IAAI,CAACT,MAAM,CAACc,GAAG,CAAC,CAAC,eAAe,EAAE,IAAI,CAACf,cAAc,CAAC,gCAAgC,CAAC;QACzF;QAEA,OAAOU;IACT;IAEAM,eAAeX,SAAiB,EAAE;QAChC,IAAI,CAACA,WAAW;YACd,MAAM,IAAIY,sCAAmB,CAAC;QAChC;QAEA,MAAMC,cAAc,IAAI,CAACnB,kBAAkB,CAACM,UAAU;QAEtD,IAAI,CAACa,aAAa;YAChB,IAAI,CAACjB,MAAM,CAACkB,IAAI,CAAC;YACjB;QACF;QAEA,OAAO,IAAI,CAACpB,kBAAkB,CAACM,UAAU;QAEzC,IAAI,CAACJ,MAAM,CAACc,GAAG,CAAC,CAAC,yBAAyB,CAAC;IAC7C;IAEAK,UAAUf,SAAiB,EAAEgB,QAAgB,EAAE;QAC7C,MAAMf,QAAQ,IAAI,CAACG,eAAe,CAACJ;QACnC,IAAI,CAACC,OAAO;QAEZ,MAAMgB,YAAYhB,MAAMiB,SAAS,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAKJ;QACpD,IAAIC,cAAc,CAAC,GAAG;YAEpB,IAAI,CAACrB,MAAM,CAACkB,IAAI,CACd,CAAC,6FAA6F,CAAC,EAC/FE;YAGF,OAAO,IAAI,CAACpB,MAAM,CAACc,GAAG,CAAC;QACzB;QAEAT,MAAMoB,MAAM,CAACJ,WAAW;QACxB,IAAI,CAACrB,MAAM,CAACc,GAAG,CAAC,CAAC,2BAA2B,CAAC;IAC/C;AACF"}
+{"version":3,"sources":["../../src/state/file.cache.ts"],"names":["FileCache","printerFileStorage","Map","totalFileCount","logger","loggerFactory","name","cachePrinterFiles","printerId","files","Error","set","updateCacheFileRefCount","getPrinterFiles","get","totalFiles","storage","values","length","log","purgePrinterId","ValidationException","fileStorage","warn","delete","purgeFile","filePath","fileIndex","findIndex","f","path","splice"],"mappings":";;;;+BAKaA;;;eAAAA;;;mCALuB;AAK7B,MAAMA;IACMC,qBAAqB,IAAIC,MAAyB;IAC3DC,iBAAiB,EAAE;IAEVC,OAAsB;IAEvC,YAAYC,aAA6B,CAAE;QACzC,IAAI,CAACD,MAAM,GAAGC,cAAcL,UAAUM,IAAI;IAC5C;IAEAC,kBAAkBC,SAAiB,EAAEC,KAAgB,EAAE;QACrD,IAAI,CAACD,WAAW;YACd,MAAM,IAAIE,MAAM;QAClB;QACA,IAAI,CAACT,kBAAkB,CAACU,GAAG,CAACH,WAAWC;QACvC,IAAI,CAACG,uBAAuB;IAC9B;IAEAC,gBAAgBL,SAAiB,EAAE;QACjC,IAAI,CAACA,WAAW;YACd,MAAM,IAAIE,MAAM;QAClB;QACA,OAAO,IAAI,CAACT,kBAAkB,CAACa,GAAG,CAACN;IACrC;IAEAI,0BAA0B;QACxB,IAAIG,aAAa;QACjB,KAAK,MAAMC,WAAW,IAAI,CAACf,kBAAkB,CAACgB,MAAM,GAAI;YACtDF,cAAcC,SAASE,UAAU;QACnC;QAEA,IAAIH,eAAe,IAAI,CAACZ,cAAc,EAAE;YACtC,IAAI,CAACA,cAAc,GAAGY;YACtB,IAAI,CAACX,MAAM,CAACe,GAAG,CAAC,CAAC,eAAe,EAAE,IAAI,CAAChB,cAAc,CAAC,gCAAgC,CAAC;QACzF;QAEA,OAAOY;IACT;IAEAK,eAAeZ,SAAiB,EAAE;QAChC,IAAI,CAACA,WAAW;YACd,MAAM,IAAIa,sCAAmB,CAAC;QAChC;QAEA,MAAMC,cAAc,IAAI,CAACrB,kBAAkB,CAACa,GAAG,CAACN;QAEhD,IAAI,CAACc,aAAa;YAChB,IAAI,CAAClB,MAAM,CAACmB,IAAI,CAAC;YACjB;QACF;QAEA,IAAI,CAACtB,kBAAkB,CAACuB,MAAM,CAAChB;QAE/B,IAAI,CAACJ,MAAM,CAACe,GAAG,CAAC,CAAC,yBAAyB,CAAC;IAC7C;IAEAM,UAAUjB,SAAiB,EAAEkB,QAAgB,EAAE;QAC7C,MAAMjB,QAAQ,IAAI,CAACI,eAAe,CAACL;QACnC,IAAI,CAACC,OAAO;QAEZ,MAAMkB,YAAYlB,MAAMmB,SAAS,CAAC,CAACC,IAAMA,EAAEC,IAAI,KAAKJ;QACpD,IAAIC,cAAc,CAAC,GAAG;YAEpB,IAAI,CAACvB,MAAM,CAACmB,IAAI,CACd,CAAC,6FAA6F,CAAC,EAC/FG;YAGF,OAAO,IAAI,CAACtB,MAAM,CAACe,GAAG,CAAC;QACzB;QAEAV,MAAMsB,MAAM,CAACJ,WAAW;QACxB,IAAI,CAACvB,MAAM,CAACe,GAAG,CAAC,CAAC,2BAA2B,CAAC;IAC/C;AACF"}

package/dist/state/floor.store.js

@@ -18,15 +18,8 @@ class FloorStore extends _keydiffcache.KeyDiffCache {
     }
     async loadStore() {
         const floors = await this.floorService.list();
-        if (!floors?.length) {
-            this.logger.log("Creating default floor as non existed");
-            const floor = await this.floorService.createDefaultFloor();
-            const floorDto = this.floorService.toDto(floor);
-            await this.setKeyValue(floor.id, floorDto, true);
-            return;
-        }
         const keyValues = floors.map((floor)=>({
-                key: floor.id.toString(),
+                key: floor.id,
                 value: this.floorService.toDto(floor)
             }));
         await this.setKeyValuesBatch(keyValues, true);
@@ -71,8 +64,8 @@ class FloorStore extends _keydiffcache.KeyDiffCache {
         await this.setKeyValue(floorId, floorDto, true);
         return floorDto;
     }
-    async updateFloorNumber(floorId, floorLevel) {
-        const floor = await this.floorService.updateLevel(floorId, floorLevel);
+    async updateFloorOrder(floorId, order) {
+        const floor = await this.floorService.updateOrder(floorId, order);
         const floorDto = this.floorService.toDto(floor);
         await this.setKeyValue(floorId, floorDto, true);
         return floorDto;

package/dist/state/floor.store.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/state/floor.store.ts"],"names":["FloorStore","KeyDiffCache","logger","floorService","loggerFactory","name","loadStore","floors","list","length","log","floor","createDefaultFloor","floorDto","toDto","setKeyValue","id","keyValues","map","key","toString","value","setKeyValuesBatch","listCache","getAllValues","create","input","delete","floorId","deleteKeyValue","getFloor","getValue","dbFloor","get","update","updateName","updateFloorNumber","floorLevel","updateLevel","addOrUpdatePrinter","position","removePrinter","printerId","removePrinterFromAnyFloor","deletePrinterFromAnyFloor"],"mappings":"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"}
+{"version":3,"sources":["../../src/state/floor.store.ts"],"names":["FloorStore","KeyDiffCache","logger","floorService","loggerFactory","name","loadStore","floors","list","keyValues","map","floor","key","id","value","toDto","setKeyValuesBatch","listCache","getAllValues","length","create","input","floorDto","setKeyValue","delete","floorId","deleteKeyValue","getFloor","getValue","dbFloor","get","update","updateName","updateFloorOrder","order","updateOrder","addOrUpdatePrinter","position","removePrinter","printerId","removePrinterFromAnyFloor","deletePrinterFromAnyFloor"],"mappings":"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"}