@fdm-monster/server 1.7.0 → 1.7.2

package/README.md

@@ -86,7 +86,7 @@ These are the people involved in the project. Find the meaning of the emoji keys
   <tbody>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/davidzwa"><img src="https://avatars.githubusercontent.com/u/6005355?v=4?s=80" width="80px;" alt="David Zwart"/><br /><sub><b>David Zwart</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Adavidzwa" title="Bug reports">🐛</a> <a href="https://github.com/fdm-monster/fdm-monster/commits?author=davidzwa" title="Code">💻</a> <a href="#maintenance-davidzwa" title="Maintenance">🚧</a> <a href="#userTesting-davidzwa" title="User Testing">📓</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://kevenaar.name"><img src="https://avatars.githubusercontent.com/u/834643?v=4?s=80" width="80px;" alt="Maurice Kevenaar"/><br /><sub><b>Maurice Kevenaar</b></sub></a><br /><a href="#security-mkevenaar" title="Security">🛡️</a> <a href="#maintenance-mkevenaar" title="Maintenance">🚧</a> <a href="#ideas-mkevenaar" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Amkevenaar" title="Bug reports">🐛</a> <a href="https://github.com/fdm-monster/fdm-monster/pulls?q=is%3Apr+reviewed-by%3Amkevenaar" title="Reviewed Pull Requests">👀</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://kevenaar.name"><img src="https://avatars.githubusercontent.com/u/834643?v=4?s=80" width="80px;" alt="Maurice Kevenaar"/><br /><sub><b>Maurice Kevenaar</b></sub></a><br /><a href="#security-mkevenaar" title="Security">🛡️</a> <a href="#maintenance-mkevenaar" title="Maintenance">🚧</a> <a href="#ideas-mkevenaar" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Amkevenaar" title="Bug reports">🐛</a> <a href="https://github.com/fdm-monster/fdm-monster/pulls?q=is%3Apr+reviewed-by%3Amkevenaar" title="Reviewed Pull Requests">👀</a> <a href="#infra-mkevenaar" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Tobikisss"><img src="https://avatars.githubusercontent.com/u/45754890?v=4?s=80" width="80px;" alt="Tobias"/><br /><sub><b>Tobias</b></sub></a><br /><a href="#ideas-Tobikisss" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-Tobikisss" title="Maintenance">🚧</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://tideline3d.com"><img src="https://avatars.githubusercontent.com/u/12903320?v=4?s=80" width="80px;" alt="tideline3d"/><br /><sub><b>tideline3d</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Atideline3d" title="Bug reports">🐛</a> <a href="#ideas-tideline3d" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/windarrow3d"><img src="https://avatars.githubusercontent.com/u/91099282?v=4?s=80" width="80px;" alt="WindArrow3d"/><br /><sub><b>WindArrow3d</b></sub></a><br /><a href="https://github.com/fdm-monster/fdm-monster/issues?q=author%3Awindarrow3d" title="Bug reports">🐛</a> <a href="#financial-windarrow3d" title="Financial">💵</a> <a href="#ideas-windarrow3d" title="Ideas, Planning, & Feedback">🤔</a> <a href="#userTesting-windarrow3d" title="User Testing">📓</a> <a href="#platform-windarrow3d" title="Packaging/porting to new platform">📦</a></td>

package/RELEASE_NOTES.MD

@@ -1,12 +1,36 @@
 # Develop
 
-# FDM Monster 01/11/2024 1.6.4
+# FDM Monster 11/11/2024 1.7.2
+
+## Fixes:
+
+- API & Service validators: adjust max length of apiKey property validation to 43 to allow new `secrets` based OctoPrint api keys
+
+# FDM Monster 04/11/2024 1.7.1
+
+## Changes:
+
+- Remove PrinterStateUpdatePollTask, it was slowing development down
+- Stopped pushing to old davidzwa dockerhub organization
+
+## Fixes:
+
+- Octoprint does not require api key, but moonraker does not. Adjust API validation.
+- Only printers which OctoPrint controlled need a USB silence check for restoring the websocket connectivity
+- ApiKey requiredNotIf validation does not work (?)
+- Batch service: missing implementation for batch get settings and batch connect
+- Batch service: get and submit moonraker reprint based on history and webhooks objects
+- Printer current state update task missed information about printer job and progress, caused null progress/job state
+- Test connection: Moonraker adapter would not hook required events for connectivity tests
+- Docker ARM64 release now tracks main instead of develop (and 1, 1.x and 1.x.y versions)
+
+# FDM Monster 01/11/2024 1.7.0
 
 ## Chore:
 
 - Workflows: upgrade github actions to node 20
 - Introduce nock to test everything (except for octokit based tests)
- 
+
 ## Features:
 
 - Setting: add experimental moonraker support setting to model, validation and API endpoints
@@ -34,7 +58,7 @@
 
 ## Fixes:
 
-- Print completion service would throw exception that correlationId was not provided (SQLite didnt like that). This error is prevented.
+- Print completion service would throw exception that correlationId was not provided (SQLite didn't like that). This error is prevented.
 - Moonraker type printers will resort to OctoPrint implementation (edge case in development)
 - Yaml import service will not assume printerType is provided, therefore defaulting to OctoprintType for older FDM Monster versions
 - Reprint will now take selected job instead of scanning the unreliable file list for latest print date

package/dist/consoles/check-ports.js

@@ -0,0 +1,170 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    checkPort: function() {
+        return checkPort;
+    },
+    scanPortRange: function() {
+        return scanPortRange;
+    }
+});
+const _net = /*#__PURE__*/ _interop_require_default(require("net"));
+const _cluster = /*#__PURE__*/ _interop_require_default(require("cluster"));
+const _os = require("os");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+const numCPUs = (0, _os.cpus)().length;
+const commonServices = {
+    80: "HTTP",
+    443: "HTTPS",
+    22: "SSH",
+    21: "FTP",
+    3306: "MySQL",
+    5432: "PostgreSQL",
+    27017: "MongoDB",
+    6379: "Redis",
+    8080: "HTTP-Alternate",
+    8443: "HTTPS-Alternate"
+};
+async function checkPort(host, port) {
+    console.log("Worker defined " + host + ":" + port);
+    return new Promise((resolve)=>{
+        const socket = new _net.default.Socket();
+        const timeout = 1000;
+        socket.setTimeout(timeout);
+        socket.on("connect", ()=>{
+            socket.destroy();
+            resolve({
+                port,
+                status: "open",
+                service: commonServices[port]
+            });
+        });
+        socket.on("timeout", ()=>{
+            socket.destroy();
+            resolve({
+                port,
+                status: "closed"
+            });
+        });
+        socket.on("error", ()=>{
+            socket.destroy();
+            resolve({
+                port,
+                status: "closed"
+            });
+        });
+        socket.connect(port, host);
+    });
+}
+async function scanPortRange(host, start, end, specificPorts = []) {
+    const portsToScan = [
+        ...Array.from({
+            length: end - start + 1
+        }, (_, i)=>start + i),
+        ...specificPorts
+    ].filter((value, index, self)=>self.indexOf(value) === index);
+    const chunkSize = Math.ceil(portsToScan.length / numCPUs);
+    const chunks = Array.from({
+        length: numCPUs
+    }, (_, i)=>portsToScan.slice(i * chunkSize, (i + 1) * chunkSize));
+    if (_cluster.default.isPrimary) {
+        console.log(`Primary ${process.pid} is running`);
+        console.log(`Starting scan on ${host} for ports ${start}-${end} and specific ports: ${specificPorts.join(", ")}`);
+        console.log(`Number of CPU cores: ${numCPUs}`);
+        const results = [];
+        const workers = new Set();
+        _cluster.default.on("exit", (worker, code, signal)=>{
+            console.log(`Worker ${worker.process.pid} died. Signal: ${signal}. Code: ${code}`);
+            workers.delete(worker);
+            if (workers.size === 0) {
+                console.log("All workers completed");
+                process.emit("allWorkersCompleted", results);
+            }
+        });
+        return new Promise((resolve, reject)=>{
+            const timeout = setTimeout(()=>{
+                for (const worker of workers){
+                    worker.kill();
+                }
+                reject(new Error("Scan timeout after 30 seconds"));
+            }, 30000);
+            process.once("allWorkersCompleted", (finalResults)=>{
+                clearTimeout(timeout);
+                resolve(finalResults.sort((a, b)=>a.port - b.port));
+            });
+            chunks.forEach((chunk, index)=>{
+                try {
+                    const worker = _cluster.default.fork();
+                    workers.add(worker);
+                    console.log(`Created worker ${worker.process.pid} for chunk ${index + 1}/${chunks.length}`);
+                    worker.on("message", (msg)=>{
+                        console.log(`Received results from worker ${worker.process.pid}: ${msg.length} ports`);
+                        results.push(...msg);
+                    });
+                    worker.on("error", (error)=>{
+                        console.error(`Worker ${worker.process.pid} error:`, error);
+                    });
+                    worker.send({
+                        host,
+                        ports: chunk
+                    });
+                } catch (error) {
+                    console.error("Error creating worker:", error);
+                }
+            });
+        });
+    } else {
+        console.log(`Worker ${process.pid} started`);
+        return new Promise((resolve)=>{
+            process.on("message", async (msg)=>{
+                try {
+                    console.log(`Worker ${process.pid} received ${msg.ports.length} ports to scan`);
+                    const results = [];
+                    const promises = msg.ports.map((port)=>checkPort(msg.host, port));
+                    const workerResults = await Promise.all(promises);
+                    results.push(...workerResults);
+                    if (process.send) {
+                        process.send(results);
+                        console.log(`Worker ${process.pid} completed scanning`);
+                    }
+                    process.exit(0);
+                } catch (error) {
+                    console.error(`Worker ${process.pid} error:`, error);
+                    process.exit(1);
+                }
+            });
+        });
+    }
+}
+if (require.main === module) {
+    const host = process.argv[2] || "localhost";
+    scanPortRange(host, 80, 8888, [
+        27017
+    ]).then((results)=>{
+        console.log("\nScan Results:");
+        const openPorts = results.filter((r)=>r.status === "open");
+        if (openPorts.length === 0) {
+            console.log("No open ports found");
+        } else {
+            console.table(openPorts);
+        }
+        process.exit(0);
+    }).catch((error)=>{
+        console.error("Error during scan:", error);
+        process.exit(1);
+    });
+}
+
+//# sourceMappingURL=check-ports.js.map

package/dist/consoles/check-ports.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/consoles/check-ports.ts"],"names":["checkPort","scanPortRange","numCPUs","cpus","length","commonServices","host","port","console","log","Promise","resolve","socket","net","Socket","timeout","setTimeout","on","destroy","status","service","connect","start","end","specificPorts","portsToScan","Array","from","_","i","filter","value","index","self","indexOf","chunkSize","Math","ceil","chunks","slice","cluster","isPrimary","process","pid","join","results","workers","Set","worker","code","signal","delete","size","emit","reject","kill","Error","once","finalResults","clearTimeout","sort","a","b","forEach","chunk","fork","add","msg","push","error","send","ports","promises","map","workerResults","all","exit","require","main","module","argv","then","openPorts","r","table","catch"],"mappings":"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"}

package/dist/constants/service.constants.js

@@ -9,18 +9,18 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-    UUID_LENGTH: function() {
-        return UUID_LENGTH;
+    apiKeyLengthMaxDefault: function() {
+        return apiKeyLengthMaxDefault;
     },
-    apiKeyLengthMinimumDefault: function() {
-        return apiKeyLengthMinimumDefault;
+    apiKeyLengthMinDefault: function() {
+        return apiKeyLengthMinDefault;
     },
     minFloorNameLength: function() {
         return minFloorNameLength;
     }
 });
-const UUID_LENGTH = 32;
 const minFloorNameLength = 3;
-const apiKeyLengthMinimumDefault = 32;
+const apiKeyLengthMinDefault = 32;
+const apiKeyLengthMaxDefault = 43;
 
 //# sourceMappingURL=service.constants.js.map

package/dist/constants/service.constants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/constants/service.constants.ts"],"names":["UUID_LENGTH","apiKeyLengthMinimumDefault","minFloorNameLength"],"mappings":";;;;;;;;;;;IAAaA,WAAW;eAAXA;;IAGAC,0BAA0B;eAA1BA;;IAFAC,kBAAkB;eAAlBA;;;AADN,MAAMF,cAAc;AACpB,MAAME,qBAAqB;AAE3B,MAAMD,6BAA6B"}
+{"version":3,"sources":["../../src/constants/service.constants.ts"],"names":["apiKeyLengthMaxDefault","apiKeyLengthMinDefault","minFloorNameLength"],"mappings":";;;;;;;;;;;IAGaA,sBAAsB;eAAtBA;;IADAC,sBAAsB;eAAtBA;;IAFAC,kBAAkB;eAAlBA;;;AAAN,MAAMA,qBAAqB;AAE3B,MAAMD,yBAAyB;AAC/B,MAAMD,yBAAyB"}

package/dist/container.js

@@ -83,7 +83,6 @@ const _jwtservice = require("./services/authentication/jwt.service");
 const _authservice = require("./services/authentication/auth.service");
 const _refreshtokenservice = require("./services/authentication/refresh-token.service");
 const _pluginthrottling = require("@octokit/plugin-throttling");
-const _printerstateupdatepolltask = require("./tasks/printer-state-update-poll.task");
 const _refreshtokenservice1 = require("./services/orm/refresh-token.service");
 const _settingsservice1 = require("./services/orm/settings.service");
 const _floorservice1 = require("./services/orm/floor.service");
@@ -203,7 +202,6 @@ function configureContainer(isSqlite = false) {
         [di.printCompletionSocketIoTask]: (0, _awilix.asClass)(_printcompletionsocketiotask.PrintCompletionSocketIoTask).singleton(),
         [di.printerWebsocketTask]: (0, _awilix.asClass)(_printerwebsockettask.PrinterWebsocketTask).singleton(),
         [di.printerWebsocketRestoreTask]: (0, _awilix.asClass)(_printerwebsocketrestoretask.PrinterWebsocketRestoreTask).singleton(),
-        [di.printerStateUpdatePollTask]: (0, _awilix.asClass)(_printerstateupdatepolltask.PrinterStateUpdatePollTask).singleton(),
         [di.printerFileCleanTask]: (0, _awilix.asClass)(_printerfilecleantask.PrinterFileCleanTask).singleton()
     });
     return container;

package/dist/container.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/container.ts"],"names":["config","configureContainer","key","experimentalMode","serviceTypeorm","serviceMongoose","isSqlite","container","createContainer","injectionMode","InjectionMode","PROXY","di","DITokens","register","serverTasks","asValue","ServerTasks","isTypeormMode","appDefaultRole","ROLES","GUEST","appDefaultRoleNoLogin","ADMIN","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","socketFactory","asClass","SocketFactory","transient","typeormService","TypeormService","singleton","settingsService","SettingsService2","SettingsService","floorService","FloorService2","FloorService","floorPositionService","FloorPositionService","cameraStreamService","CameraService2","CameraService","printerService","PrinterService2","PrinterService","printerGroupService","PrinterGroupService","refreshTokenService","RefreshToken2","RefreshTokenService","userService","UserService2","UserService","userRoleService","UserRoleService","roleService","RoleService2","RoleService","permissionService","PermissionService2","PermissionService","customGCodeService","CustomGcodeService2","CustomGcodeService","printCompletionService","PrintCompletionService2","PrintCompletionService","serverHost","ServerHost","settingsStore","SettingsStore","configService","ConfigService","authService","AuthService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","cacheManager","configureCacheManager","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","serverUpdateService","ServerUpdateService","githubService","GithubService","octokitService","cradle","CustomOctoKit","Octokit","plugin","throttling","auth","get","GITHUB_PAT","throttle","onRateLimit","retryAfter","options","octokit","retryCount","logger","warn","method","url","onSecondaryRateLimit","clientBundleService","ClientBundleService","logDumpService","LogDumpService","simpleGitService","simpleGit","httpClient","axios","create","maxBodyLength","maxContentLength","socketIoGateway","SocketIoGateway","multerService","MulterService","yamlService","YamlService","printerLogin","printerApiFactory","PrinterApiFactory","octoprintApi","OctoprintApi","octoprintClient","OctoprintClient","octoPrintSockIoAdapter","OctoprintWebsocketAdapter","moonrakerApi","MoonrakerApi","moonrakerClient","MoonrakerClient","moonrakerWebsocketAdapter","MoonrakerWebsocketAdapter","batchCallService","BatchCallService","pluginFirmwareUpdateService","PluginFirmwareUpdateService","floorStore","FloorStore","pluginRepositoryCache","PluginRepositoryCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","influxDbV2BaseService","InfluxDbV2BaseService","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printCompletionSocketIoTask","PrintCompletionSocketIoTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerStateUpdatePollTask","PrinterStateUpdatePollTask","printerFileCleanTask","PrinterFileCleanTask"],"mappings":"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"}
+{"version":3,"sources":["../src/container.ts"],"names":["config","configureContainer","key","experimentalMode","serviceTypeorm","serviceMongoose","isSqlite","container","createContainer","injectionMode","InjectionMode","PROXY","di","DITokens","register","serverTasks","asValue","ServerTasks","isTypeormMode","appDefaultRole","ROLES","GUEST","appDefaultRoleNoLogin","ADMIN","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","socketFactory","asClass","SocketFactory","transient","typeormService","TypeormService","singleton","settingsService","SettingsService2","SettingsService","floorService","FloorService2","FloorService","floorPositionService","FloorPositionService","cameraStreamService","CameraService2","CameraService","printerService","PrinterService2","PrinterService","printerGroupService","PrinterGroupService","refreshTokenService","RefreshToken2","RefreshTokenService","userService","UserService2","UserService","userRoleService","UserRoleService","roleService","RoleService2","RoleService","permissionService","PermissionService2","PermissionService","customGCodeService","CustomGcodeService2","CustomGcodeService","printCompletionService","PrintCompletionService2","PrintCompletionService","serverHost","ServerHost","settingsStore","SettingsStore","configService","ConfigService","authService","AuthService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","cacheManager","configureCacheManager","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","serverUpdateService","ServerUpdateService","githubService","GithubService","octokitService","cradle","CustomOctoKit","Octokit","plugin","throttling","auth","get","GITHUB_PAT","throttle","onRateLimit","retryAfter","options","octokit","retryCount","logger","warn","method","url","onSecondaryRateLimit","clientBundleService","ClientBundleService","logDumpService","LogDumpService","simpleGitService","simpleGit","httpClient","axios","create","maxBodyLength","maxContentLength","socketIoGateway","SocketIoGateway","multerService","MulterService","yamlService","YamlService","printerLogin","printerApiFactory","PrinterApiFactory","octoprintApi","OctoprintApi","octoprintClient","OctoprintClient","octoPrintSockIoAdapter","OctoprintWebsocketAdapter","moonrakerApi","MoonrakerApi","moonrakerClient","MoonrakerClient","moonrakerWebsocketAdapter","MoonrakerWebsocketAdapter","batchCallService","BatchCallService","pluginFirmwareUpdateService","PluginFirmwareUpdateService","floorStore","FloorStore","pluginRepositoryCache","PluginRepositoryCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","influxDbV2BaseService","InfluxDbV2BaseService","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printCompletionSocketIoTask","PrintCompletionSocketIoTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerFileCleanTask","PrinterFileCleanTask"],"mappings":"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"}

package/dist/container.tokens.js

@@ -79,7 +79,6 @@ const DITokens = {
     socketIoTask: "socketIoTask",
     printCompletionSocketIoTask: "printCompletionSocketIoTask",
     printerWebsocketTask: "printerWebsocketTask",
-    printerStateUpdatePollTask: "printerStateUpdatePollTask",
     printerWebsocketRestoreTask: "printerWebsocketRestoreTask",
     printerFileCleanTask: "printerFileCleanTask"
 };

package/dist/container.tokens.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","serverVersion","isTypeormMode","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","loggerFactory","httpClient","socketIoGateway","simpleGitService","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","cacheManager","printerService","printerGroupService","floorPositionService","printCompletionService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","serverUpdateService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","octoprintApi","octoprintClient","moonrakerApi","moonrakerClient","cameraStreamService","socketFactory","printerApiFactory","printerLogin","batchCallService","pluginRepositoryCache","pluginFirmwareUpdateService","influxDbV2BaseService","systemInfoBundleService","customGCodeService","settingsStore","printerCache","printerEventsCache","printerSocketStore","testPrinterSocketStore","printerFilesStore","octoPrintSockIoAdapter","moonrakerWebsocketAdapter","floorStore","fileCache","fileUploadTrackerCache","serverTasks","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerStateUpdatePollTask","printerWebsocketRestoreTask","printerFileCleanTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IAEtBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,eAAe;IACfC,YAAY;IACZC,iBAAiB;IACjBC,kBAAkB;IAClBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,cAAc;IACdC,gBAAgB;IAChBC,qBAAqB;IACrBC,sBAAsB;IACtBC,wBAAwB;IACxBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,qBAAqB;IACrBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,cAAc;IACdC,iBAAiB;IACjBC,cAAc;IACdC,iBAAiB;IACjBC,qBAAqB;IACrBC,eAAe;IACfC,mBAAmB;IACnBC,cAAc;IACdC,kBAAkB;IAClBC,uBAAuB;IACvBC,6BAA6B;IAC7BC,uBAAuB;IACvBC,yBAAyB;IACzBC,oBAAoB;IAEpBC,eAAe;IACfC,cAAc;IACdC,oBAAoB;IACpBC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,wBAAwB;IACxBC,2BAA2B;IAE3BC,YAAY;IACZC,WAAW;IACXC,wBAAwB;IAExBC,aAAa;IACbC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,6BAA6B;IAC7BC,sBAAsB;IACtBC,4BAA4B;IAC5BC,6BAA6B;IAC7BC,sBAAsB;AACxB"}
+{"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","serverVersion","isTypeormMode","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","loggerFactory","httpClient","socketIoGateway","simpleGitService","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","cacheManager","printerService","printerGroupService","floorPositionService","printCompletionService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","serverUpdateService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","octoprintApi","octoprintClient","moonrakerApi","moonrakerClient","cameraStreamService","socketFactory","printerApiFactory","printerLogin","batchCallService","pluginRepositoryCache","pluginFirmwareUpdateService","influxDbV2BaseService","systemInfoBundleService","customGCodeService","settingsStore","printerCache","printerEventsCache","printerSocketStore","testPrinterSocketStore","printerFilesStore","octoPrintSockIoAdapter","moonrakerWebsocketAdapter","floorStore","fileCache","fileUploadTrackerCache","serverTasks","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerWebsocketRestoreTask","printerFileCleanTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IAEtBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,eAAe;IACfC,YAAY;IACZC,iBAAiB;IACjBC,kBAAkB;IAClBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,cAAc;IACdC,gBAAgB;IAChBC,qBAAqB;IACrBC,sBAAsB;IACtBC,wBAAwB;IACxBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,qBAAqB;IACrBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,cAAc;IACdC,iBAAiB;IACjBC,cAAc;IACdC,iBAAiB;IACjBC,qBAAqB;IACrBC,eAAe;IACfC,mBAAmB;IACnBC,cAAc;IACdC,kBAAkB;IAClBC,uBAAuB;IACvBC,6BAA6B;IAC7BC,uBAAuB;IACvBC,yBAAyB;IACzBC,oBAAoB;IAEpBC,eAAe;IACfC,cAAc;IACdC,oBAAoB;IACpBC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,wBAAwB;IACxBC,2BAA2B;IAE3BC,YAAY;IACZC,WAAW;IACXC,wBAAwB;IAExBC,aAAa;IACbC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,6BAA6B;IAC7BC,sBAAsB;IACtBC,6BAA6B;IAC7BC,sBAAsB;AACxB"}

package/dist/controllers/validation/printer-controller.validation.js

@@ -44,7 +44,7 @@ const feedRateRules = {
 };
 const testPrinterApiRules = {
     printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
-    apiKey: `required|length:${_serviceconstants.UUID_LENGTH},${_serviceconstants.UUID_LENGTH}|alphaNumeric`,
+    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.apiKeyLengthMaxDefault},${_serviceconstants.apiKeyLengthMinDefault}|alphaDash`,
     printerURL: "required|httpurl"
 };
 const updatePrinterDisabledReasonRules = {
@@ -56,7 +56,7 @@ const updatePrinterEnabledRule = {
 const updatePrinterConnectionSettingRules = {
     printerType: `required|integer|in:${_printerapiinterface.OctoprintType},${_printerapiinterface.MoonrakerType}`,
     printerURL: "required|httpurl",
-    apiKey: `required|minLength:${_serviceconstants.UUID_LENGTH}|maxLength:${_serviceconstants.UUID_LENGTH}`
+    apiKey: `requiredIf:printerType,${_printerapiinterface.OctoprintType}|length:${_serviceconstants.apiKeyLengthMaxDefault},${_serviceconstants.apiKeyLengthMinDefault}|alphaDash`
 };
 const createOctoPrintBackupRules = {
     exclude: "array",

package/dist/controllers/validation/printer-controller.validation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/controllers/validation/printer-controller.validation.ts"],"names":["createOctoPrintBackupRules","feedRateRules","flowRateRules","getOctoPrintBackupRules","testPrinterApiRules","updatePrinterConnectionSettingRules","updatePrinterDisabledReasonRules","updatePrinterEnabledRule","flowRate","feedRate","printerType","OctoprintType","MoonrakerType","apiKey","UUID_LENGTH","printerURL","disabledReason","enabled","exclude","fileName"],"mappings":";;;;;;;;;;;IA+BaA,0BAA0B;eAA1BA;;IAxBAC,aAAa;eAAbA;;IAJAC,aAAa;eAAbA;;IAiCAC,uBAAuB;eAAvBA;;IAzBAC,mBAAmB;eAAnBA;;IAcAC,mCAAmC;eAAnCA;;IARAC,gCAAgC;eAAhCA;;IAIAC,wBAAwB;eAAxBA;;;kCArBe;qCACiB;AAEtC,MAAML,gBAAgB;IAC3BM,UAAU;AACZ;AAEO,MAAMP,gBAAgB;IAC3BQ,UAAU;AACZ;AAEO,MAAML,sBAAsB;IACjCM,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,QAAQ,CAAC,gBAAgB,EAAEC,6BAAW,CAAC,CAAC,EAAEA,6BAAW,CAAC,aAAa,CAAC;IACpEC,YAAY;AACd;AAEO,MAAMT,mCAAmC;IAC9CU,gBAAgB;AAClB;AAEO,MAAMT,2BAA2B;IACtCU,SAAS;AACX;AAEO,MAAMZ,sCAAsC;IACjDK,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEG,YAAY;IACZF,QAAQ,CAAC,mBAAmB,EAAEC,6BAAW,CAAC,WAAW,EAAEA,6BAAW,EAAE;AACtE;AAEO,MAAMd,6BAA6B;IACxCkB,SAAS;IACT,aAAa;AACf;AAEO,MAAMf,0BAA0B;IACrCgB,UAAU;AACZ"}
+{"version":3,"sources":["../../../src/controllers/validation/printer-controller.validation.ts"],"names":["createOctoPrintBackupRules","feedRateRules","flowRateRules","getOctoPrintBackupRules","testPrinterApiRules","updatePrinterConnectionSettingRules","updatePrinterDisabledReasonRules","updatePrinterEnabledRule","flowRate","feedRate","printerType","OctoprintType","MoonrakerType","apiKey","apiKeyLengthMaxDefault","apiKeyLengthMinDefault","printerURL","disabledReason","enabled","exclude","fileName"],"mappings":";;;;;;;;;;;IA+BaA,0BAA0B;eAA1BA;;IAxBAC,aAAa;eAAbA;;IAJAC,aAAa;eAAbA;;IAiCAC,uBAAuB;eAAvBA;;IAzBAC,mBAAmB;eAAnBA;;IAcAC,mCAAmC;eAAnCA;;IARAC,gCAAgC;eAAhCA;;IAIAC,wBAAwB;eAAxBA;;;kCArBkD;qCAClB;AAEtC,MAAML,gBAAgB;IAC3BM,UAAU;AACZ;AAEO,MAAMP,gBAAgB;IAC3BQ,UAAU;AACZ;AAEO,MAAML,sBAAsB;IACjCM,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEC,QAAQ,CAAC,uBAAuB,EAAEF,kCAAa,CAAC,QAAQ,EAAEG,wCAAsB,CAAC,CAAC,EAAEC,wCAAsB,CAAC,UAAU,CAAC;IACtHC,YAAY;AACd;AAEO,MAAMV,mCAAmC;IAC9CW,gBAAgB;AAClB;AAEO,MAAMV,2BAA2B;IACtCW,SAAS;AACX;AAEO,MAAMb,sCAAsC;IACjDK,aAAa,CAAC,oBAAoB,EAAEC,kCAAa,CAAC,CAAC,EAAEC,kCAAa,EAAE;IACpEI,YAAY;IACZH,QAAQ,CAAC,uBAAuB,EAAEF,kCAAa,CAAC,QAAQ,EAAEG,wCAAsB,CAAC,CAAC,EAAEC,wCAAsB,CAAC,UAAU,CAAC;AACxH;AAEO,MAAMf,6BAA6B;IACxCmB,SAAS;IACT,aAAa;AACf;AAEO,MAAMhB,0BAA0B;IACrCiB,UAAU;AACZ"}

package/dist/entities/printer.entity.js

@@ -58,7 +58,9 @@ _ts_decorate([
     _ts_metadata("design:type", Number)
 ], Printer.prototype, "printerType", void 0);
 _ts_decorate([
-    (0, _typeorm.Column)(),
+    (0, _typeorm.Column)({
+        default: ""
+    }),
     (0, _classvalidator.IsAlphanumeric)(),
     _ts_metadata("design:type", String)
 ], Printer.prototype, "apiKey", void 0);

package/dist/entities/printer.entity.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/entities/printer.entity.ts"],"names":["Printer","BaseEntity","id","name","printerURL","printerType","apiKey","enabled","disabledReason","assignee","printCompletions","printerGroups","dateAdded","feedRate","flowRate","default","OctoprintType","nullable","PrintCompletion","pc","printer","PrinterGroup","type"],"mappings":";;;;+BAQaA;;;eAAAA;;;gCARkB;yBAC+D;uCAC9D;4BACL;oCACE;qCACC;;;;;;;;;;AAGvB,MAAMA,gBAAgBC,sBAAU;IAErCC,GAAY;IAGZC,KAAc;IAGdC,WAAoB;IAGpBC,YAAqB;IAIrBC,OAAgB;IAMhBC,UAAmB,KAAK;IAKxBC,eAAwB;IAKxBC,SAAkB;IAGlBC,iBAA+C;IAG/CC,cAAyC;IAGzCC,UAAmB;IAGnBC,SAAkB;IAGlBC,SAAkB;AACpB;;;;;;;;;;;;;;;QArCYC,SAASC,kCAAa;QAAEC,UAAU;;;;;;;;;;;QAQ1CA,UAAU;QACVF,SAAS;;;;;;QAKTE,UAAU;;;;;;QAKVA,UAAU;;;;;gCAIKC,sCAAe,GAAGC,KAAOA,GAAGC,OAAO;;;;gCAGnCC,gCAAY,GAAGF,KAAOA,GAAGC,OAAO;;;;;QAG7BE,MAAM;;;;;;QAGhBL,UAAU;;;;;;QAGVA,UAAU"}
+{"version":3,"sources":["../../src/entities/printer.entity.ts"],"names":["Printer","BaseEntity","id","name","printerURL","printerType","apiKey","enabled","disabledReason","assignee","printCompletions","printerGroups","dateAdded","feedRate","flowRate","default","OctoprintType","nullable","PrintCompletion","pc","printer","PrinterGroup","type"],"mappings":";;;;+BAQaA;;;eAAAA;;;gCARkB;yBAC+D;uCAC9D;4BACL;oCACE;qCACC;;;;;;;;;;AAGvB,MAAMA,gBAAgBC,sBAAU;IAErCC,GAAY;IAGZC,KAAc;IAGdC,WAAoB;IAGpBC,YAAqB;IAIrBC,OAAgB;IAMhBC,UAAmB,KAAK;IAKxBC,eAAwB;IAKxBC,SAAkB;IAGlBC,iBAA+C;IAG/CC,cAAyC;IAGzCC,UAAmB;IAGnBC,SAAkB;IAGlBC,SAAkB;AACpB;;;;;;;;;;;;;;;QArCYC,SAASC,kCAAa;QAAEC,UAAU;;;;;;QAGlCF,SAAS;;;;;;;QAKjBE,UAAU;QACVF,SAAS;;;;;;QAKTE,UAAU;;;;;;QAKVA,UAAU;;;;;gCAIKC,sCAAe,GAAGC,KAAOA,GAAGC,OAAO;;;;gCAGnCC,gCAAY,GAAGF,KAAOA,GAAGC,OAAO;;;;;QAG7BE,MAAM;;;;;;QAGhBL,UAAU;;;;;;QAGVA,UAAU"}

package/dist/models/Printer.js

@@ -21,7 +21,7 @@ const _printerapiinterface = require("../services/printer-api.interface");
 const PrinterSchema = new _mongoose.Schema({
     apiKey: {
         type: String,
-        required: true
+        default: ""
     },
     printerURL: {
         type: String,

package/dist/models/Printer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/models/Printer.ts"],"names":["Printer","PrinterSchema","Schema","apiKey","type","String","required","printerURL","printerType","Number","default","OctoprintType","enabled","Boolean","disabledReason","assignee","name","currentUser","dateAdded","feedRate","flowRate","model"],"mappings":";;;;;;;;;;;IAoEaA,OAAO;eAAPA;;IAlDAC,aAAa;eAAbA;;;0BAlBiB;qCACA;AAiBvB,MAAMA,gBAAgB,IAAIC,gBAAM,CAAW;IAChDC,QAAQ;QACNC,MAAMC;QACNC,UAAU;IACZ;IACAC,YAAY;QACVH,MAAMC;QACNC,UAAU;IACZ;IACAE,aAAa;QACXJ,MAAMK;QACNH,UAAU;QACVI,SAASC,kCAAa;IACxB;IACAC,SAAS;QACPR,MAAMS;QACNP,UAAU;QACVI,SAAS;IACX;IACAI,gBAAgB;QACdV,MAAMC;QACNC,UAAU;IACZ;IACAS,UAAU;QACRX,MAAMC;QACNC,UAAU;IACZ;IACAU,MAAM;QACJZ,MAAMC;QACNC,UAAU;IACZ;IAEAW,aAAa;QACXb,MAAMC;QACNC,UAAU;IACZ;IACAY,WAAW;QACTd,MAAMK;QACNH,UAAU;IACZ;IACAa,UAAU;QACRf,MAAMK;QACNH,UAAU;IACZ;IACAc,UAAU;QACRhB,MAAMK;QACNH,UAAU;IACZ;AACF;AAEO,MAAMN,UAAUqB,IAAAA,eAAK,EAAC,WAAWpB"}
+{"version":3,"sources":["../../src/models/Printer.ts"],"names":["Printer","PrinterSchema","Schema","apiKey","type","String","default","printerURL","required","printerType","Number","OctoprintType","enabled","Boolean","disabledReason","assignee","name","currentUser","dateAdded","feedRate","flowRate","model"],"mappings":";;;;;;;;;;;IAoEaA,OAAO;eAAPA;;IAlDAC,aAAa;eAAbA;;;0BAlBiB;qCACA;AAiBvB,MAAMA,gBAAgB,IAAIC,gBAAM,CAAW;IAChDC,QAAQ;QACNC,MAAMC;QACNC,SAAS;IACX;IACAC,YAAY;QACVH,MAAMC;QACNG,UAAU;IACZ;IACAC,aAAa;QACXL,MAAMM;QACNF,UAAU;QACVF,SAASK,kCAAa;IACxB;IACAC,SAAS;QACPR,MAAMS;QACNL,UAAU;QACVF,SAAS;IACX;IACAQ,gBAAgB;QACdV,MAAMC;QACNG,UAAU;IACZ;IACAO,UAAU;QACRX,MAAMC;QACNG,UAAU;IACZ;IACAQ,MAAM;QACJZ,MAAMC;QACNG,UAAU;IACZ;IAEAS,aAAa;QACXb,MAAMC;QACNG,UAAU;IACZ;IACAU,WAAW;QACTd,MAAMM;QACNF,UAAU;IACZ;IACAW,UAAU;QACRf,MAAMM;QACNF,UAAU;IACZ;IACAY,UAAU;QACRhB,MAAMM;QACNF,UAAU;IACZ;AACF;AAEO,MAAMR,UAAUqB,IAAAA,eAAK,EAAC,WAAWpB"}

package/dist/server.constants.js

@@ -66,7 +66,7 @@ const AppConstants = {
     githubUrl: "https://github.com/fdm-monster/fdm-monster",
     orgName: "fdm-monster",
     currentWizardVersion: 1,
-    defaultClientMinimum: "1.6.5",
+    defaultClientMinimum: "1.6.8",
     influxUrl: "INFLUX_URL",
     influxToken: "INFLUX_TOKEN",
     influxOrg: "INFLUX_ORG",

package/dist/services/core/batch-call.service.js

@@ -10,22 +10,17 @@ Object.defineProperty(exports, "BatchCallService", {
 });
 const _node = require("@sentry/node");
 const _errorutils = require("../../utils/error.utils");
-var ReprintState = /*#__PURE__*/ function(ReprintState) {
-    ReprintState[ReprintState["PrinterNotAvailable"] = 0] = "PrinterNotAvailable";
-    ReprintState[ReprintState["NoLastPrint"] = 1] = "NoLastPrint";
-    ReprintState[ReprintState["LastPrintReady"] = 2] = "LastPrintReady";
-    return ReprintState;
-}(ReprintState || {});
+const _printerapiinterface = require("../printer-api.interface");
 class BatchCallService {
-    octoprintClient;
+    printerApiFactory;
     printerSocketStore;
     printerCache;
     printerEventsCache;
     printerFilesStore;
     printerService;
     logger;
-    constructor({ octoprintClient, printerCache, printerEventsCache, printerSocketStore, printerFilesStore, printerService, loggerFactory }){
-        this.octoprintClient = octoprintClient;
+    constructor({ printerApiFactory, printerCache, printerEventsCache, printerSocketStore, printerFilesStore, printerService, loggerFactory }){
+        this.printerApiFactory = printerApiFactory;
         this.printerCache = printerCache;
         this.printerEventsCache = printerEventsCache;
         this.printerSocketStore = printerSocketStore;
@@ -33,6 +28,9 @@ class BatchCallService {
         this.printerService = printerService;
         this.logger = loggerFactory(BatchCallService.name);
     }
+    getPrinter(login) {
+        return this.printerApiFactory.getScopedPrinter(login);
+    }
     async batchTogglePrintersEnabled(printerIds, enabled) {
         const promises = [];
         for (const printerId of printerIds){
@@ -92,9 +90,10 @@ class BatchCallService {
     async batchSettingsGet(printerIds) {
         const promises = [];
         for (const printerId of printerIds){
-            const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
+            const login = await this.printerCache.getLoginDtoAsync(printerId);
             const time = Date.now();
-            const promise = this.octoprintClient.getSettings(printerLogin).then((r)=>{
+            const client = this.getPrinter(login);
+            const promise = client.getSettings().then((r)=>{
                 return {
                     success: true,
                     printerId,
@@ -116,10 +115,10 @@ class BatchCallService {
     async batchConnectUsb(printerIds) {
         const promises = [];
         for (const printerId of printerIds){
-            const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
+            const login = await this.printerCache.getLoginDtoAsync(printerId);
             const time = Date.now();
-            const command = this.octoprintClient.connectCommand;
-            const promise = this.octoprintClient.sendConnectionCommand(printerLogin, command).then(()=>{
+            const client = this.getPrinter(login);
+            const promise = client.connect().then(()=>{
                 return {
                     success: true,
                     printerId,
@@ -143,29 +142,18 @@ class BatchCallService {
             const promise = new Promise(async (resolve, _)=>{
                 try {
                     const login = await this.printerCache.getLoginDtoAsync(printerId);
-                    const connected = await this.octoprintClient.getConnection(login);
-                    const connectionState = connected.current?.state;
-                    const selectedJob = await this.octoprintClient.getJob(login);
-                    const currentJobFile = selectedJob?.job?.file;
-                    if (!currentJobFile?.name) {
-                        return resolve({
-                            connectionState,
-                            printerId,
-                            reprintState: 1
-                        });
-                    }
+                    const client = this.getPrinter(login);
+                    const partialReprintState = await client.getReprintState();
                     return resolve({
-                        connectionState,
-                        file: currentJobFile,
-                        printerId,
-                        reprintState: 2
+                        ...partialReprintState,
+                        printerId
                     });
                 } catch (e) {
                     (0, _node.captureException)(e);
                     return resolve({
                         connectionState: null,
                         printerId,
-                        reprintState: 0
+                        reprintState: _printerapiinterface.ReprintState.PrinterNotAvailable
                     });
                 }
             });
@@ -177,9 +165,10 @@ class BatchCallService {
         const promises = [];
         for (const printerIdFile of printerIdFileList){
             const { printerId, path } = printerIdFile;
-            const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
+            const login = await this.printerCache.getLoginDtoAsync(printerId);
             const time = Date.now();
-            const promise = this.octoprintClient.postSelectPrintFile(printerLogin, path, true).then(()=>{
+            const client = this.getPrinter(login);
+            const promise = client.startPrint(path).then(()=>{
                 return {
                     success: true,
                     printerId,

package/dist/services/core/batch-call.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/services/core/batch-call.service.ts"],"names":["BatchCallService","ReprintState","octoprintClient","printerSocketStore","printerCache","printerEventsCache","printerFilesStore","printerService","logger","constructor","loggerFactory","name","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","push","Promise","all","batchConnectSocket","reconnectOctoPrint","captureException","errorSummary","batchSettingsGet","printerLogin","getLoginDtoAsync","getSettings","r","value","batchConnectUsb","command","connectCommand","sendConnectionCommand","getBatchPrinterReprintFile","resolve","_","login","connected","getConnection","connectionState","current","state","selectedJob","getJob","currentJobFile","job","file","reprintState","batchReprintCalls","printerIdFileList","printerIdFile","path","postSelectPrintFile"],"mappings":"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"}
+{"version":3,"sources":["../../../src/services/core/batch-call.service.ts"],"names":["BatchCallService","printerApiFactory","printerSocketStore","printerCache","printerEventsCache","printerFilesStore","printerService","logger","constructor","loggerFactory","name","getPrinter","login","getScopedPrinter","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","push","Promise","all","batchConnectSocket","reconnectOctoPrint","captureException","errorSummary","batchSettingsGet","getLoginDtoAsync","client","getSettings","r","value","batchConnectUsb","connect","getBatchPrinterReprintFile","resolve","_","partialReprintState","getReprintState","connectionState","reprintState","ReprintState","PrinterNotAvailable","batchReprintCalls","printerIdFileList","printerIdFile","path","startPrint"],"mappings":"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"}