@fdm-monster/server 1.5.4 → 1.6.0-rc2

package/package.json

@@ -6,27 +6,40 @@
   },
   "author": "David Zwart",
   "license": "AGPL-3.0-or-later",
-  "private": false,
-  "version": "1.5.4",
+  "version": "1.6.0-rc2",
+  "bin": {
+    "fdm-monster": "dist/index.js",
+    "fdmm": "dist/index.js"
+  },
   "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",
     "dev": "concurrently \"yarn build:watch\" \"yarn watch-dev\"",
     "watch-dev": "cross-env NODE_ENV=development nodemon --watch \"dist/**/*\" -e js ./dist/index.js",
-    "build": "swc src -d dist",
-    "build:watch": "swc src -w -d dist",
+    "console:torm": "yarn build && cross-env NODE_ENV=development nodemon --watch \"dist/**/*\" -e js ./dist/consoles/sqlite-torm.js",
+    "console:migrate": "yarn build && cross-env NODE_ENV=development nodemon --watch \"dist/**/*\" -e js ./dist/consoles/typeorm-migrate.js",
+    "console:generate": "yarn build && cross-env NODE_ENV=development node ./dist/consoles/typeorm-generate.js",
+    "build": "swc src -d dist --strip-leading-paths",
+    "build:watch": "swc src -w -d dist --strip-leading-paths",
     "start:dev": "ts-node src/index.ts",
     "start": "cross-env NODE_ENV=production node dist/index.js",
-    "migration:create": "migrate-mongo create printer-remove-settingsappearance",
+    "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\"",
     "swc": "swc",
     "tsc": "tsc --noEmit",
-    "test": "jest --forceExit  --maxConcurrency=8 --runInBand ",
-    "test:cov": "jest --forceExit --coverage  --maxConcurrency=8 --runInBand ",
-    "cov:show": "./coverage/lcov-report/index.html"
+    "test": "cross-env SQLITE_MODE=false jest --forceExit  --maxConcurrency=8 --runInBand ",
+    "test:sqlite": "cross-env SQLITE_MODE=true jest --forceExit  --maxConcurrency=8 --runInBand ",
+    "test:cov": "cross-env SQLITE_MODE=false jest --forceExit --coverage  --maxConcurrency=8 --runInBand ",
+    "test:cov-sqlite": "cross-env SQLITE_MODE=true 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/CustomGCode",
+    "typeorm:migrate": "yarn torm migration:run -d src/data-source.ts",
+    "typeorm:revert": "yarn torm migration:revert -d src/data-source.ts"
   },
   "keywords": [
     "fdm-monster",
@@ -39,25 +52,26 @@
     "vue"
   ],
   "dependencies": {
-    "@fdm-monster/client": "1.4.4",
+    "@fdm-monster/client": "1.5.0-rc5",
     "@influxdata/influxdb-client": "1.33.2",
-    "@sentry/node": "7.82.0",
+    "@octokit/plugin-throttling": "8.1.3",
+    "@sentry/node": "7.99.0",
     "adm-zip": "0.5.10",
-    "awilix": "9.0.0",
-    "awilix-express": "8.0.0",
-    "axios": "1.6.2",
+    "awilix": "10.0.1",
+    "awilix-express": "9.0.1",
+    "axios": "1.6.7",
     "bcryptjs": "2.4.3",
+    "better-sqlite3": "9.3.0",
     "cache-manager": "4.1.0",
-    "class-validator": "0.14.0",
+    "class-validator": "0.14.1",
     "connect-history-api-fallback": "2.0.0",
     "cookie-parser": "1.4.6",
     "cors": "2.8.5",
     "cross-env": "7.0.3",
-    "dotenv": "16.3.1",
+    "dotenv": "16.4.1",
     "eventemitter2": "6.4.9",
     "express": "4.18.2",
     "form-data": "4.0.0",
-    "got": "11.8.6",
     "helmet": "7.1.0",
     "ip": "1.1.8",
     "js-yaml": "4.1.0",
@@ -65,72 +79,68 @@
     "lodash": "4.17.21",
     "luxon": "3.4.4",
     "migrate-mongo": "11.0.0",
-    "mongoose": "6.12.3",
-    "mqtt": "5.3.0",
+    "mongoose": "6.12.6",
     "multer": "1.4.5-lts.1",
     "node-input-validator": "4.5.1",
-    "nodemon": "3.0.1",
+    "nodemon": "3.0.3",
     "octokit": "3.1.2",
-    "passport": "0.6.0",
+    "passport": "0.7.0",
     "passport-anonymous": "1.0.1",
     "passport-jwt": "4.0.1",
-    "reflect-metadata": "0.1.13",
+    "reflect-metadata": "0.2.1",
     "semver": "7.5.4",
-    "simple-git": "3.21.0",
-    "socket.io": "4.7.2",
-    "toad-scheduler": "3.0.0",
+    "simple-git": "3.22.0",
+    "socket.io": "4.7.4",
+    "toad-scheduler": "3.0.1",
+    "typeorm": "0.3.20",
     "uuid": "9.0.1",
     "winston": "3.11.0",
-    "ws": "8.14.2"
+    "ws": "8.16.0"
   },
   "devDependencies": {
     "@lcov-viewer/cli": "1.3.0",
     "@lcov-viewer/istanbul-report": "1.4.0",
-    "@swc/cli": "0.1.63",
-    "@swc/core": "1.3.99",
-    "@swc/jest": "0.2.29",
+    "@swc/cli": "0.3.6",
+    "@swc/core": "1.3.107",
+    "@swc/jest": "0.2.34",
     "@types/adm-zip": "0.5.5",
     "@types/bcryptjs": "2.4.6",
     "@types/cache-manager": "4.0.6",
     "@types/connect-history-api-fallback": "1.5.4",
     "@types/cookie-parser": "1.4.6",
     "@types/express": "4.17.21",
-    "@types/express-session": "1.17.10",
     "@types/ip": "1.1.3",
-    "@types/jest": "29.5.10",
+    "@types/jest": "29.5.12",
     "@types/js-yaml": "4.0.9",
     "@types/lodash": "4.14.202",
-    "@types/luxon": "3.3.5",
+    "@types/luxon": "3.4.2",
     "@types/migrate-mongo": "10.0.4",
     "@types/multer": "1.4.11",
-    "@types/node": "20.10.0",
+    "@types/node": "20.11.16",
     "@types/passport-anonymous": "1.0.5",
-    "@types/passport-jwt": "3.0.13",
+    "@types/passport-jwt": "4.0.1",
     "@types/semver": "7.5.6",
-    "@types/supertest": "2.0.16",
-    "@types/uuid": "9.0.7",
+    "@types/supertest": "6.0.2",
+    "@types/uuid": "9.0.8",
     "chokidar": "3.5.3",
     "concurrently": "8.2.2",
-    "eslint": "8.54.0",
+    "eslint": "8.56.0",
     "eslint-config-airbnb-base": "15.0.0",
-    "eslint-config-prettier": "9.0.0",
+    "eslint-config-prettier": "9.1.0",
     "eslint-config-standard": "17.1.0",
-    "eslint-plugin-import": "2.29.0",
+    "eslint-plugin-import": "2.29.1",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-promise": "6.1.1",
     "express-list-routes": "1.1.9",
     "jest": "29.7.0",
     "jest-27-expect-message": "1.1.0",
-    "mongodb-memory-server": "9.1.1",
-    "nock": "13.4.0",
+    "mongodb-memory-server": "9.1.6",
+    "nock": "13.5.1",
     "prettier": "2.8.8",
-    "supertest": "6.3.3",
-    "ts-node": "10.9.1",
-    "typescript": "5.3.2"
-  },
-  "resolutions": {
-    "got": "11.8.6"
+    "supertest": "6.3.4",
+    "ts-node": "10.9.2",
+    "typescript": "5.3.3"
   },
   "ignore-engines": false,
   "engine-strict": true,
@@ -150,5 +160,6 @@
       "docker/*"
     ],
     "delay": 100
-  }
+  },
+  "packageManager": "yarn@4.1.0"
 }

package/dist/utils/find-predicate.utils.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "findFileIndex", {
-    enumerable: true,
-    get: function() {
-        return findFileIndex;
-    }
-});
-const _lodash = require("lodash");
-const findFileIndex = (fileList, filePath)=>{
-    return (0, _lodash.findIndex)(fileList.files, (f)=>{
-        return f.path === filePath;
-    });
-};
-
-//# sourceMappingURL=find-predicate.utils.js.map

package/dist/utils/find-predicate.utils.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/utils/find-predicate.utils.ts"],"names":["findFileIndex","fileList","filePath","findIndex","files","f","path"],"mappings":";;;;+BAEaA;;;eAAAA;;;wBAFa;AAEnB,MAAMA,gBAAgB,CAACC,UAAUC;IACtC,OAAOC,IAAAA,iBAAS,EAACF,SAASG,KAAK,EAAE,CAACC;QAChC,OAAOA,EAAEC,IAAI,KAAKJ;IACpB;AACF"}

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

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/utils/websocket.adapter.ts"],"names":["WebsocketAdapter","socket","logger","constructor","loggerFactory","name","isOpened","readyState","WebSocket","OPEN","close","open","url","handshakeTimeout","AppConstants","defaultWebsocketHandshakeTimeout","onopen","event","onOpen","onerror","error","onError","onclose","onClose","onmessage","message","onMessage","data","sendMessage","payload","Promise","resolve","reject","send","afterOpened","afterClosed"],"mappings":";;;;+BAKaA;;;eAAAA;;;iCALgB;oBAC6C;AAInE,MAAMA;IACXC,OAAmB;IACnB,CAACC,MAAM,CAAgB;IAEvBC,YAAY,EAAEC,aAAa,EAAqC,CAAE;QAChE,IAAI,CAAC,CAACF,MAAM,GAAGE,cAAcJ,iBAAiBK,IAAI;IACpD;IAEA,IAAIC,WAAW;QACb,OAAO,IAAI,CAACL,MAAM,EAAEM,eAAeC,aAAS,CAACC,IAAI;IACnD;IAEAC,QAAQ;QACN,IAAI,CAACT,MAAM,EAAES;QACb,OAAO,IAAI,CAACT,MAAM;IACpB;IASAU,KAAKC,GAAiB,EAAQ;QAC5B,IAAI,CAACX,MAAM,GAAG,IAAIO,aAAS,CAACI,KAAK;YAAEC,kBAAkBC,6BAAY,CAACC,gCAAgC;QAAC;QACnG,IAAI,CAACd,MAAM,CAACe,MAAM,GAAG,CAACC,QAAU,IAAI,CAACC,MAAM,CAACD;QAC5C,IAAI,CAAChB,MAAM,CAACkB,OAAO,GAAG,CAACC,QAAU,IAAI,CAACC,OAAO,CAACD;QAC9C,IAAI,CAACnB,MAAM,CAACqB,OAAO,GAAG,CAACL,QAAU,IAAI,CAACM,OAAO,CAACN;QAC9C,IAAI,CAAChB,MAAM,CAACuB,SAAS,GAAG,CAACC,UAAY,IAAI,CAACC,SAAS,CAACD,QAAQE,IAAI;IAClE;IASA,MAAMC,YAAYC,OAAe,EAAiB;QAChD,IAAI,CAAC,IAAI,CAACvB,QAAQ,IAAI,CAAC,IAAI,CAACL,MAAM,EAAE;YAClC,IAAI,CAAC,CAACC,MAAM,CAACkB,KAAK,CAAC;YACnB;QACF;QACA,OAAO,MAAM,IAAIU,QAAQ,CAACC,SAASC;YACjC,IAAI,CAAC/B,MAAM,CAAEgC,IAAI,CAACJ,SAAS,CAACT;gBAC1B,IAAIA,OAAOY,OAAOZ;gBAClBW;YACF;QACF;IACF;IASAV,QAAQD,KAAiB,EAAwB,CAAC;IASlDc,YAAYjB,KAAc,EAAwB,CAAC;IASnDkB,YAAYlB,KAAiB,EAAwB,CAAC;IAStDS,UAAUT,KAAW,EAAwB,CAAC;IAQ9C,MAAMC,OAAOD,KAAc,EAAiB;QAC1C,MAAM,IAAI,CAACiB,WAAW,CAACjB;IACzB;IAQA,MAAMM,QAAQN,KAAiB,EAAiB;QAC9C,MAAM,IAAI,CAACkB,WAAW,CAAClB;IACzB;AACF"}