@fdm-monster/server 1.5.0-rc1 → 1.5.0-rc2

package/dist/utils/env.utils.js

@@ -12,6 +12,9 @@ _export(exports, {
     getEnvOrDefault: function() {
         return getEnvOrDefault;
     },
+    isDevelopmentEnvironment: function() {
+        return isDevelopmentEnvironment;
+    },
     isNode: function() {
         return isNode;
     },
@@ -46,6 +49,9 @@ function getEnvOrDefault(key, defaultVal) {
     if (!val?.length) return defaultVal;
     return val;
 }
+function isDevelopmentEnvironment() {
+    return process.env.NODE_ENV === _serverconstants.AppConstants.defaultDevelopmentEnv;
+}
 function isTestEnvironment() {
     return process.env.NODE_ENV === _serverconstants.AppConstants.defaultTestEnv;
 }

package/dist/utils/env.utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isNode","isNodemon","isPm2","isProductionEnvironment","isTestEnvironment","verifyPackageJsonRequirements","logger","LoggerService","key","defaultVal","val","process","env","length","NODE_ENV","AppConstants","defaultTestEnv","defaultProductionEnv","npm_lifecycle_script","includes","stringifyDotEnv","obj","result","value","Object","entries","line","String","rootPath","dirConts","fs","readdirSync","hasPackageJson","error","debug","packageName","require","join","name","toLowerCase","serverPackageName"],"mappings":";;;;;;;;;;;IAOgBA,eAAe;eAAfA;;IAsBAC,MAAM;eAANA;;IAJAC,SAAS;eAATA;;IAJAC,KAAK;eAALA;;IAJAC,uBAAuB;eAAvBA;;IAJAC,iBAAiB;eAAjBA;;IAmCAC,6BAA6B;eAA7BA;;;2DAhDD;wBACe;iCACD;sBACR;;;;;;AAErB,MAAMC,SAAS,IAAIC,qBAAa,CAAC,aAAa;AAEvC,SAASR,gBAAgBS,GAAQ,EAAEC,UAAe;IACvD,MAAMC,MAAMC,QAAQC,GAAG,CAACJ,IAAI;IAC5B,IAAI,CAACE,KAAKG,QAAQ,OAAOJ;IACzB,OAAOC;AACT;AAEO,SAASN;IACd,OAAOO,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACC,cAAc;AAC7D;AAEO,SAASb;IACd,OAAOQ,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACE,oBAAoB;AACnE;AAEO,SAASf;IACd,OAAO,cAAcS,QAAQC,GAAG,IAAI,yBAAyBD,QAAQC,GAAG,IAAI,aAAaD,QAAQC,GAAG;AACtG;AAEO,SAASX;IACd,OAAO,0BAA0BU,QAAQC,GAAG,IAAID,QAAQC,GAAG,CAACM,oBAAoB,CAAEC,QAAQ,CAAC;AAC7F;AAEO,SAASnB;IACd,OAAO,UAAUW,QAAQC,GAAG;AAC9B;AAEA;;;CAGC,GACD,SAASQ,gBAAgBC,GAAQ;IAC/B,IAAIC,SAAS;IACb,KAAK,MAAM,CAACd,KAAKe,MAAM,IAAIC,OAAOC,OAAO,CAACJ,KAAM;QAC9C,IAAIb,KAAK;YACP,MAAMkB,OAAO,CAAC,EAAElB,IAAI,CAAC,EAAEmB,OAAOJ,OAAO,CAAC;YACtCD,UAAUI,OAAO;QACnB;IACF;IACA,OAAOJ;AACT;AAEO,SAASjB,8BAA8BuB,QAAgB;IAC5D,MAAMC,WAAWC,WAAE,CAACC,WAAW,CAACH;IAChC,MAAMI,iBAAiBH,SAASV,QAAQ,CAAC;IACzC,IAAI,CAACa,gBAAgB;QACnB1B,OAAO2B,KAAK,CAAC,CAAC,sDAAsD,EAAEL,SAAS,CAAC;QAChF,OAAO;IACT;IAEAtB,OAAO4B,KAAK,CAAC;IACb,MAAMC,cAAcC,QAAQC,IAAAA,UAAI,EAACT,UAAU,iBAAiBU,IAAI;IAChE,IAAI,CAACH,aAAa;QAChB7B,OAAO2B,KAAK,CAAC;QACb,OAAO;IACT;IAEA,IAAIE,YAAYI,WAAW,OAAOxB,6BAAY,CAACyB,iBAAiB,EAAE;QAChElC,OAAO2B,KAAK,CACV,CAAC,yEAAyE,EAAEE,YAAYI,WAAW,GAAG,uBAAuB,CAAC;QAEhI,OAAO;IACT;IAEAjC,OAAO4B,KAAK,CAAC;IACb,OAAO;AACT"}
+{"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","isNodemon","isPm2","isProductionEnvironment","isTestEnvironment","verifyPackageJsonRequirements","logger","LoggerService","key","defaultVal","val","process","env","length","NODE_ENV","AppConstants","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","npm_lifecycle_script","includes","stringifyDotEnv","obj","result","value","Object","entries","line","String","rootPath","dirConts","fs","readdirSync","hasPackageJson","error","debug","packageName","require","join","name","toLowerCase","serverPackageName"],"mappings":";;;;;;;;;;;IAOgBA,eAAe;eAAfA;;IAMAC,wBAAwB;eAAxBA;;IAoBAC,MAAM;eAANA;;IAJAC,SAAS;eAATA;;IAJAC,KAAK;eAALA;;IAJAC,uBAAuB;eAAvBA;;IAJAC,iBAAiB;eAAjBA;;IAmCAC,6BAA6B;eAA7BA;;;2DApDD;wBACe;iCACD;sBACR;;;;;;AAErB,MAAMC,SAAS,IAAIC,qBAAa,CAAC,aAAa;AAEvC,SAAST,gBAAgBU,GAAQ,EAAEC,UAAe;IACvD,MAAMC,MAAMC,QAAQC,GAAG,CAACJ,IAAI;IAC5B,IAAI,CAACE,KAAKG,QAAQ,OAAOJ;IACzB,OAAOC;AACT;AAEO,SAASX;IACd,OAAOY,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACC,qBAAqB;AACpE;AAEO,SAASZ;IACd,OAAOO,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACE,cAAc;AAC7D;AAEO,SAASd;IACd,OAAOQ,QAAQC,GAAG,CAACE,QAAQ,KAAKC,6BAAY,CAACG,oBAAoB;AACnE;AAEO,SAAShB;IACd,OAAO,cAAcS,QAAQC,GAAG,IAAI,yBAAyBD,QAAQC,GAAG,IAAI,aAAaD,QAAQC,GAAG;AACtG;AAEO,SAASX;IACd,OAAO,0BAA0BU,QAAQC,GAAG,IAAID,QAAQC,GAAG,CAACO,oBAAoB,CAAEC,QAAQ,CAAC;AAC7F;AAEO,SAASpB;IACd,OAAO,UAAUW,QAAQC,GAAG;AAC9B;AAEA;;;CAGC,GACD,SAASS,gBAAgBC,GAAQ;IAC/B,IAAIC,SAAS;IACb,KAAK,MAAM,CAACf,KAAKgB,MAAM,IAAIC,OAAOC,OAAO,CAACJ,KAAM;QAC9C,IAAId,KAAK;YACP,MAAMmB,OAAO,CAAC,EAAEnB,IAAI,CAAC,EAAEoB,OAAOJ,OAAO,CAAC;YACtCD,UAAUI,OAAO;QACnB;IACF;IACA,OAAOJ;AACT;AAEO,SAASlB,8BAA8BwB,QAAgB;IAC5D,MAAMC,WAAWC,WAAE,CAACC,WAAW,CAACH;IAChC,MAAMI,iBAAiBH,SAASV,QAAQ,CAAC;IACzC,IAAI,CAACa,gBAAgB;QACnB3B,OAAO4B,KAAK,CAAC,CAAC,sDAAsD,EAAEL,SAAS,CAAC;QAChF,OAAO;IACT;IAEAvB,OAAO6B,KAAK,CAAC;IACb,MAAMC,cAAcC,QAAQC,IAAAA,UAAI,EAACT,UAAU,iBAAiBU,IAAI;IAChE,IAAI,CAACH,aAAa;QAChB9B,OAAO4B,KAAK,CAAC;QACb,OAAO;IACT;IAEA,IAAIE,YAAYI,WAAW,OAAOzB,6BAAY,CAAC0B,iBAAiB,EAAE;QAChEnC,OAAO4B,KAAK,CACV,CAAC,yEAAyE,EAAEE,YAAYI,WAAW,GAAG,uBAAuB,CAAC;QAEhI,OAAO;IACT;IAEAlC,OAAO6B,KAAK,CAAC;IACb,OAAO;AACT"}

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@fdm-monster/server",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/fdm-monster/fdm-monster"
+  },
   "author": "David Zwart",
   "license": "AGPL-3.0-or-later",
   "private": false,
-  "version": "1.5.0-rc1",
+  "version": "1.5.0-rc2",
   "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": "src/index.ts",
   "scripts": {
@@ -24,7 +28,6 @@
     "test:cov": "jest --forceExit --coverage",
     "cov:show": "./coverage/lcov-report/index.html"
   },
-  "repository": "https://github.com/fdm-monster/fdm-monster",
   "keywords": [
     "fdm-monster",
     "fdm-connector",
@@ -36,11 +39,11 @@
     "vue"
   ],
   "dependencies": {
-    "@fdm-monster/client": "1.3.7",
+    "@fdm-monster/client": "1.3.11",
     "@influxdata/influxdb-client": "1.33.2",
-    "@sentry/node": "7.73.0",
+    "@sentry/node": "7.74.0",
     "adm-zip": "0.5.10",
-    "awilix": "8.0.1",
+    "awilix": "9.0.0",
     "awilix-express": "8.0.0",
     "axios": "1.5.1",
     "bcryptjs": "2.4.3",
@@ -55,13 +58,14 @@
     "form-data": "4.0.0",
     "got": "11.8.6",
     "helmet": "7.0.0",
+    "ip": "1.1.8",
     "js-yaml": "4.1.0",
     "jsonwebtoken": "9.0.2",
     "lodash": "4.17.21",
     "luxon": "3.4.3",
     "migrate-mongo": "11.0.0",
-    "mongoose": "6.12.0",
-    "mqtt": "5.1.0",
+    "mongoose": "6.12.1",
+    "mqtt": "5.1.2",
     "multer": "1.4.5-lts.1",
     "node-input-validator": "4.5.1",
     "nodemon": "3.0.1",
@@ -82,22 +86,23 @@
     "@lcov-viewer/cli": "1.3.0",
     "@lcov-viewer/istanbul-report": "1.4.0",
     "@swc/cli": "0.1.62",
-    "@swc/core": "1.3.92",
+    "@swc/core": "1.3.93",
     "@swc/jest": "0.2.29",
     "@types/adm-zip": "0.5.2",
     "@types/bcryptjs": "2.4.4",
     "@types/cache-manager": "4.0.3",
     "@types/connect-history-api-fallback": "1.5.1",
     "@types/cookie-parser": "1.4.4",
-    "@types/express": "4.17.18",
+    "@types/express": "4.17.19",
     "@types/express-session": "1.17.8",
+    "@types/ip": "1.1.1",
     "@types/jest": "29.5.5",
-    "@types/js-yaml": "4.0.6",
+    "@types/js-yaml": "4.0.7",
     "@types/lodash": "4.14.199",
     "@types/luxon": "3.3.2",
     "@types/migrate-mongo": "10.0.2",
     "@types/multer": "1.4.8",
-    "@types/node": "20.8.3",
+    "@types/node": "20.8.6",
     "@types/passport-anonymous": "1.0.3",
     "@types/passport-jwt": "3.0.10",
     "@types/semver": "7.5.3",
@@ -117,8 +122,8 @@
     "express-list-routes": "1.1.5",
     "jest": "29.7.0",
     "jest-27-expect-message": "1.1.0",
-    "mongodb-memory-server": "9.0.0",
-    "nock": "13.3.3",
+    "mongodb-memory-server": "9.0.1",
+    "nock": "13.3.4",
     "prettier": "2.8.8",
     "supertest": "6.3.3",
     "ts-node": "10.9.1",

package/.env

@@ -1,19 +0,0 @@
-MONGO=mongodb://127.0.0.1:27017/fdm-monster
-SERVER_PORT=4000
-DEBUG_ROUTES=false
-
-# Enables TypeORM with SQLite
-ENABLE_EXPERIMENTAL_TYPEORM=true
-# Saves SQLite database to ./database/fdm-monster.sqlite
-DATABASE_PATH=./database
-# Optional, default: fdm-monster.sqlite
-DATABASE_FILE=fdm-monster.sqlite
-
-# DEMO
-OVERRIDE_IS_DEMO_MODE=true
-# Optional, default: demo
-OVERRIDE_DEMO_USERNAME=demo
-# Optional, default: demo2023
-OVERRIDE_DEMO_PASSWORD=demo2023
-# Optional, default: ADMIN, logical values: "ADMIN", "OPERATOR"
-OVERRIDE_DEMO_ROLE=ADMIN

package/.idea/codeStyles/Project.xml

@@ -1,85 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <DBN-PSQL>
-      <case-options enabled="true">
-        <option name="KEYWORD_CASE" value="lower" />
-        <option name="FUNCTION_CASE" value="lower" />
-        <option name="PARAMETER_CASE" value="lower" />
-        <option name="DATATYPE_CASE" value="lower" />
-        <option name="OBJECT_CASE" value="preserve" />
-      </case-options>
-      <formatting-settings enabled="false" />
-    </DBN-PSQL>
-    <DBN-SQL>
-      <case-options enabled="true">
-        <option name="KEYWORD_CASE" value="lower" />
-        <option name="FUNCTION_CASE" value="lower" />
-        <option name="PARAMETER_CASE" value="lower" />
-        <option name="DATATYPE_CASE" value="lower" />
-        <option name="OBJECT_CASE" value="preserve" />
-      </case-options>
-      <formatting-settings enabled="false">
-        <option name="STATEMENT_SPACING" value="one_line" />
-        <option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
-        <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
-      </formatting-settings>
-    </DBN-SQL>
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-      <option name="HTML_ENFORCE_QUOTES" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="RIGHT_MARGIN" value="120" />
-      <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="80" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>