@fdm-monster/server 1.8.2 → 1.9.0-rc1

package/dist/utils/time.utils.js

@@ -2,25 +2,15 @@
 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, {
-    isValidDate: function() {
-        return isValidDate;
-    },
-    sleep: function() {
-        return sleep;
+Object.defineProperty(exports, "isParsableDate", {
+    enumerable: true,
+    get: function() {
+        return isParsableDate;
     }
 });
-async function sleep(ms = 2000) {
-    return new Promise((resolve)=>setTimeout(resolve, ms));
-}
-function isValidDate(date) {
-    return date instanceof Date && !isNaN(date);
+function isParsableDate(value) {
+    const timestamp = Date.parse(value);
+    return !isNaN(timestamp);
 }
 
 //# sourceMappingURL=time.utils.js.map

package/dist/utils/time.utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/time.utils.ts"],"names":["isValidDate","sleep","ms","Promise","resolve","setTimeout","date","Date","isNaN"],"mappings":";;;;;;;;;;;IAIgBA,WAAW;eAAXA;;IAJMC,KAAK;eAALA;;;AAAf,eAAeA,MAAMC,KAAK,IAAI;IACnC,OAAO,IAAIC,QAAQ,CAACC,UAAYC,WAAWD,SAASF;AACtD;AAEO,SAASF,YAAYM,IAAI;IAC9B,OAAOA,gBAAgBC,QAAQ,CAACC,MAAMF;AACxC"}
+{"version":3,"sources":["../../src/utils/time.utils.ts"],"names":["isParsableDate","value","timestamp","Date","parse","isNaN"],"mappings":";;;;+BAAgBA;;;eAAAA;;;AAAT,SAASA,eAAeC,KAAa;IAC1C,MAAMC,YAAYC,KAAKC,KAAK,CAACH;IAC7B,OAAO,CAACI,MAAMH;AAChB"}

package/dist/utils/url.utils.js

@@ -9,27 +9,24 @@ function _export(target, all) {
     });
 }
 _export(exports, {
+    defaultHttpProtocol: function() {
+        return defaultHttpProtocol;
+    },
     httpToWsUrl: function() {
         return httpToWsUrl;
-    },
-    normalizeURLWithProtocol: function() {
-        return normalizeURLWithProtocol;
     }
 });
+const _zod = require("zod");
 const _normalizeurl = require("./normalize-url");
+const defaultHttpProtocol = "https";
 function httpToWsUrl(url) {
-    const protocolNormalizedUrl = normalizeURLWithProtocol(url);
-    const wsUrl = new URL("/sockjs/websocket", protocolNormalizedUrl);
-    wsUrl.protocol = protocolNormalizedUrl.startsWith("https://") ? "wss" : "ws";
-    wsUrl.pathname = "/sockjs/websocket";
+    const validUrl = _zod.z.string().parse(url);
+    const protocolNormalizedAddress = (0, _normalizeurl.normalizeUrl)(validUrl, {
+        defaultProtocol: defaultHttpProtocol
+    });
+    const wsUrl = new URL(protocolNormalizedAddress);
+    wsUrl.protocol = wsUrl.protocol === "https:" ? "wss:" : "ws:";
     return wsUrl;
 }
-function normalizeURLWithProtocol(printerURL) {
-    if (!printerURL) return;
-    if (!printerURL.startsWith("http://") && !printerURL.startsWith("https://")) {
-        printerURL = `httpS://${printerURL}`;
-    }
-    return (0, _normalizeurl.normalizeUrl)(printerURL);
-}
 
 //# sourceMappingURL=url.utils.js.map

package/dist/utils/url.utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/url.utils.ts"],"names":["httpToWsUrl","normalizeURLWithProtocol","url","protocolNormalizedUrl","wsUrl","URL","protocol","startsWith","pathname","printerURL","normalizeUrl"],"mappings":";;;;;;;;;;;IAEgBA,WAAW;eAAXA;;IAQAC,wBAAwB;eAAxBA;;;8BAVa;AAEtB,SAASD,YAAYE,GAAW;IACrC,MAAMC,wBAAwBF,yBAAyBC;IACvD,MAAME,QAAQ,IAAIC,IAAI,qBAAqBF;IAC3CC,MAAME,QAAQ,GAAGH,sBAAsBI,UAAU,CAAC,cAAc,QAAQ;IACxEH,MAAMI,QAAQ,GAAG;IACjB,OAAOJ;AACT;AAEO,SAASH,yBAAyBQ,UAAkB;IACzD,IAAI,CAACA,YAAY;IAEjB,IAAI,CAACA,WAAWF,UAAU,CAAC,cAAc,CAACE,WAAWF,UAAU,CAAC,aAAa;QAC3EE,aAAa,CAAC,QAAQ,EAAEA,YAAY;IACtC;IAEA,OAAOC,IAAAA,0BAAY,EAACD;AACtB"}
+{"version":3,"sources":["../../src/utils/url.utils.ts"],"names":["defaultHttpProtocol","httpToWsUrl","url","validUrl","z","string","parse","protocolNormalizedAddress","normalizeUrl","defaultProtocol","wsUrl","URL","protocol"],"mappings":";;;;;;;;;;;IAGaA,mBAAmB;eAAnBA;;IAEGC,WAAW;eAAXA;;;qBALE;8BACW;AAEtB,MAAMD,sBAAsB;AAE5B,SAASC,YAAYC,GAAY;IACtC,MAAMC,WAAWC,MAAC,CAACC,MAAM,GAAGC,KAAK,CAACJ;IAElC,MAAMK,4BAA4BC,IAAAA,0BAAY,EAACL,UAAU;QAAEM,iBAAiBT;IAAoB;IAEhG,MAAMU,QAAQ,IAAIC,IAAIJ;IACtBG,MAAME,QAAQ,GAAGF,MAAME,QAAQ,KAAK,WAAW,SAAS;IACxD,OAAOF;AACT"}

package/package.json

@@ -6,7 +6,7 @@
   },
   "author": "David Zwart",
   "license": "AGPL-3.0-or-later",
-  "version": "1.8.2",
+  "version": "1.9.0-rc1",
   "bin": {
     "fdm-monster": "dist/index.js",
     "fdmm": "dist/index.js"
@@ -14,31 +14,33 @@
   "description": "FDM Monster is a bulk OctoPrint manager to set up, configure and monitor 3D printers. Our aim is to provide extremely optimized websocket performance and reliability.",
   "main": "dist/index.js",
   "scripts": {
-    "console:upload": "yarn build && cross-env NODE_ENV=development node ./dist/consoles/upload-test.js",
+    "build": "swc src -d dist --strip-leading-paths",
+    "build:watch": "swc src -w -d dist --strip-leading-paths",
     "dev": "yarn build:watch & yarn serve",
     "serve": "NODE_ENV=development node --enable-source-maps --watch dist/index.js",
     "start:dev": "ts-node src/index.ts",
     "start": "cross-env NODE_ENV=production node dist/index.js",
+    "console:http-file-servers": "node ./dist/consoles/http-file-receiver.console.js",
+    "console:many-http-file-receivers": "node ./dist/consoles/launch-http-servers.js",
     "console:github-releases": "yarn build && NODE_ENV=development node --watch --enable-source-maps ./dist/consoles/download-github-releases.js",
     "console:generate": "yarn build && NODE_ENV=development node --enable-source-maps ./dist/consoles/typeorm-generate.js",
-    "console:torm": "yarn build && NODE_ENV=development node --watch --enable-source-maps ./dist/consoles/sqlite-torm.js",
     "console:migrate": "yarn build && NODE_ENV=development node --watch --enable-source-maps ./dist/consoles/typeorm-migrate.js",
-    "build": "swc src -d dist --strip-leading-paths",
-    "build:watch": "swc src -w -d dist --strip-leading-paths",
+    "console:upload": "yarn build && cross-env NODE_ENV=development node ./dist/consoles/upload-test.js",
     "migration:create": "migrate-mongo create printer-files-simpler",
     "migration:up": "migrate-mongo up",
     "migration:down": "migrate-mongo down",
     "migration:status": "migrate-mongo status",
-    "format": "prettier --write \"src/**/*.js\" \"test/**/*.js\"",
+    "format": "biome format --write src test",
     "swc": "swc",
     "tsc": "tsc --noEmit",
+    "tsc:watch": "tsc --noEmit --watch",
     "test:mongodb": "cross-env MONGODB_MODE=true jest --forceExit  --maxConcurrency=8 --runInBand ",
     "test:sqlite": "cross-env MONGODB_MODE=false jest --forceExit  --maxConcurrency=8 --runInBand ",
     "test:cov-mongodb": "cross-env MONGODB_MODE=true jest --forceExit --coverage  --maxConcurrency=8 --runInBand ",
     "test:cov-sqlite": "cross-env MONGODB_MODE=false jest --forceExit --coverage  --maxConcurrency=8 --runInBand ",
     "cov:show": "./coverage/lcov-report/index.html",
     "torm": "ts-node --swc -r tsconfig-paths/register ./node_modules/typeorm/cli.js",
-    "typeorm:generate": "yarn torm migration:generate -d src/data-source.ts --pretty src/migrations/RemovePrinterFile",
+    "typeorm:generate": "yarn torm migration:generate -d src/data-source.ts --pretty src/migrations/AddPrinterUsernamePassword",
     "typeorm:migrate": "yarn torm migration:run -d src/data-source.ts",
     "typeorm:revert": "yarn torm migration:revert -d src/data-source.ts"
   },
@@ -46,106 +48,102 @@
     "fdm-monster",
     "fdm-connector",
     "octoprint",
+    "moonraker",
+    "prusalink",
     "fdm",
     "3d printing",
     "pi",
     "node",
     "vue"
   ],
+  "resolutions": {
+    "tr46": "5.1.1"
+  },
   "dependencies": {
-    "@fdm-monster/client": "1.8.8",
-    "@fdm-monster/client-next": "0.0.16",
+    "@fdm-monster/client": "1.10.1",
+    "@fdm-monster/client-next": "0.0.19",
     "@octokit/plugin-throttling": "8.2.0",
-    "@sentry/node": "8.47.0",
+    "@sentry/node": "9.17.0",
     "adm-zip": "0.5.16",
-    "awilix": "12.0.4",
+    "awilix": "12.0.5",
     "awilix-express": "9.0.2",
-    "axios": "1.7.9",
-    "bcryptjs": "2.4.3",
-    "better-sqlite3": "11.7.0",
-    "cache-manager": "6.3.2",
-    "class-validator": "0.14.1",
+    "axios": "1.9.0",
+    "bcryptjs": "3.0.2",
+    "better-sqlite3": "11.10.0",
+    "class-validator": "0.14.2",
     "connect-history-api-fallback": "2.0.0",
     "cookie-parser": "1.4.7",
     "cors": "2.8.5",
     "cross-env": "7.0.3",
-    "dotenv": "16.4.7",
+    "dotenv": "16.5.0",
     "eventemitter2": "6.4.9",
     "express": "4.21.2",
-    "form-data": "4.0.1",
-    "helmet": "8.0.0",
+    "form-data": "4.0.2",
+    "helmet": "8.1.0",
     "js-yaml": "4.1.0",
     "jsonwebtoken": "9.0.2",
     "lodash": "4.17.21",
-    "luxon": "3.5.0",
+    "luxon": "3.6.1",
     "migrate-mongo": "11.0.0",
-    "mongoose": "6.13.5",
-    "multer": "1.4.5-lts.1",
-    "node-input-validator": "4.5.1",
+    "mongoose": "6.13.8",
+    "multer": "1.4.5-lts.2",
     "octokit": "3.2.1",
     "passport": "0.7.0",
     "passport-anonymous": "1.0.1",
     "passport-jwt": "4.0.1",
+    "prom-client": "15.1.3",
     "reflect-metadata": "0.2.2",
-    "semver": "7.6.3",
+    "semver": "7.7.1",
     "socket.io": "4.8.1",
-    "toad-scheduler": "3.0.1",
-    "typeorm": "0.3.20",
-    "uuid": "11.0.3",
+    "toad-scheduler": "3.1.0",
+    "typeorm": "0.3.23",
+    "uuid": "11.1.0",
     "winston": "3.17.0",
-    "ws": "8.18.0"
+    "winston-loki": "6.1.3",
+    "ws": "8.18.2",
+    "zod": "3.24.4"
   },
   "devDependencies": {
+    "@biomejs/biome": "1.9.4",
     "@lcov-viewer/cli": "1.3.0",
     "@lcov-viewer/istanbul-report": "1.4.0",
-    "@swc/cli": "0.5.2",
-    "@swc/core": "1.10.4",
-    "@swc/jest": "0.2.37",
+    "@swc/cli": "0.7.5",
+    "@swc/core": "1.11.24",
+    "@swc/jest": "0.2.38",
     "@types/adm-zip": "0.5.7",
-    "@types/bcryptjs": "2.4.6",
-    "@types/cache-manager": "4.0.6",
     "@types/connect-history-api-fallback": "1.5.4",
     "@types/cookie-parser": "1.4.8",
-    "@types/express": "5.0.0",
+    "@types/express": "5.0.1",
     "@types/ip": "1.1.3",
     "@types/jest": "29.5.14",
     "@types/js-yaml": "4.0.9",
-    "@types/lodash": "4.17.13",
-    "@types/luxon": "3.4.2",
+    "@types/lodash": "4.17.16",
+    "@types/luxon": "3.6.2",
     "@types/migrate-mongo": "10.0.5",
     "@types/multer": "1.4.12",
-    "@types/node": "22.10.5",
+    "@types/node": "22.15.17",
     "@types/passport-anonymous": "1.0.5",
     "@types/passport-jwt": "4.0.1",
-    "@types/semver": "7.5.8",
-    "@types/supertest": "6.0.2",
+    "@types/semver": "7.7.0",
+    "@types/supertest": "6.0.3",
     "@types/uuid": "10.0.0",
-    "@types/ws": "8.5.13",
+    "@types/ws": "8.18.1",
     "chokidar": "4.0.3",
-    "eslint": "9.17.0",
-    "eslint-config-airbnb-base": "15.0.0",
-    "eslint-config-prettier": "9.1.0",
-    "eslint-config-standard": "17.1.0",
-    "eslint-plugin-import": "2.31.0",
-    "eslint-plugin-n": "17.15.1",
-    "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-promise": "7.2.1",
     "express-list-routes": "1.2.4",
     "jest": "29.7.0",
     "jest-27-expect-message": "1.1.0",
-    "mongodb-memory-server": "10.1.3",
+    "mongodb-memory-server": "10.1.4",
     "nock": "13.5.6",
-    "prettier": "2.8.8",
-    "supertest": "7.0.0",
+    "supertest": "7.1.0",
     "ts-node": "10.9.2",
-    "typescript": "5.7.2"
+    "typescript": "5.8.3"
   },
   "ignore-engines": false,
   "engine-strict": true,
   "engines": {
-    "node": ">= 18.0.0",
+    "node": ">= 20.0.0",
     "npm": ">= 8.1.4",
-    "yarn": ">= 1.22.10"
+    "yarn": ">= 4.8.0"
   },
-  "packageManager": "yarn@4.6.0"
+  "packageManager": "yarn@4.9.1"
 }

package/tsconfig.json

@@ -9,6 +9,8 @@
     "sourceMap": true,
     "outDir": "dist",
     "strict": true,
+    "strictNullChecks": true,
+    "strictPropertyInitialization": false,
     "lib": ["es2022"],
     "baseUrl": "./src",
     "forceConsistentCasingInFileNames": true,
@@ -17,7 +19,6 @@
     "emitDecoratorMetadata": true,
     "moduleResolution": "Node",
     "skipLibCheck": true,
-    "strictNullChecks": false,
     "noImplicitAny": true,
     "paths": {
       "@/*": ["./*"]