@fdm-monster/server 2.0.4 → 2.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.yarn/install-state.gz +0 -0
- package/RELEASE_NOTES.MD +6 -0
- package/dist/data-source.js +2 -14
- package/dist/data-source.js.map +1 -1
- package/dist/index.js +0 -12
- package/dist/index.js.map +1 -1
- package/dist/server.constants.js +1 -1
- package/dist/server.env.js +1 -1
- package/dist/server.env.js.map +1 -1
- package/dist/utils/env.utils.js +13 -0
- package/dist/utils/env.utils.js.map +1 -1
- package/package.json +3 -3
package/.yarn/install-state.gz
CHANGED
|
Binary file
|
package/RELEASE_NOTES.MD
CHANGED
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
|
|
3
3
|
# FDM Monster 2.0.4
|
|
4
4
|
|
|
5
|
+
## Hotfix
|
|
6
|
+
|
|
7
|
+
- DATABASE_FILE and DATABASE_PATH weren't picked up from .env as dotenv path was wrong
|
|
8
|
+
|
|
9
|
+
# FDM Monster 2.0.4
|
|
10
|
+
|
|
5
11
|
## Feature
|
|
6
12
|
|
|
7
13
|
- Added mdns based Docker image for advanced users, who want to enable mDNS with Docker and a Docker bridge network connected to a MAC-VLAN.
|
package/dist/data-source.js
CHANGED
|
@@ -10,8 +10,6 @@ Object.defineProperty(exports, "AppDataSource", {
|
|
|
10
10
|
});
|
|
11
11
|
require("reflect-metadata");
|
|
12
12
|
const _typeorm = require("typeorm");
|
|
13
|
-
const _dotenv = /*#__PURE__*/ _interop_require_default(require("dotenv"));
|
|
14
|
-
const _nodepath = require("node:path");
|
|
15
13
|
const _fsutils = require("./utils/fs.utils");
|
|
16
14
|
const _floorentity = require("./entities/floor.entity");
|
|
17
15
|
const _floorpositionentity = require("./entities/floor-position.entity");
|
|
@@ -39,20 +37,10 @@ const _1767370191762ChangeFloorNonUniqueOrder = require("./migrations/1767370191
|
|
|
39
37
|
const _1767432108916RenameGroupToTag = require("./migrations/1767432108916-RenameGroupToTag");
|
|
40
38
|
const _1767451444137AddPrintJob = require("./migrations/1767451444137-AddPrintJob");
|
|
41
39
|
const _1767909428129AddPrinterMaintenanceLog = require("./migrations/1767909428129-AddPrinterMaintenanceLog");
|
|
42
|
-
|
|
43
|
-
return obj && obj.__esModule ? obj : {
|
|
44
|
-
default: obj
|
|
45
|
-
};
|
|
46
|
-
}
|
|
47
|
-
if (process.env.NODE_ENV !== "test") {
|
|
48
|
-
_dotenv.default.config({
|
|
49
|
-
path: process.env.ENV_FILE || (0, _nodepath.join)("../.env"),
|
|
50
|
-
quiet: true
|
|
51
|
-
});
|
|
52
|
-
}
|
|
40
|
+
const databaseFilePath = (0, _fsutils.getDatabaseFilePath)();
|
|
53
41
|
const AppDataSource = new _typeorm.DataSource({
|
|
54
42
|
type: "better-sqlite3",
|
|
55
|
-
database:
|
|
43
|
+
database: databaseFilePath,
|
|
56
44
|
synchronize: false,
|
|
57
45
|
logging: false,
|
|
58
46
|
entities: [
|
package/dist/data-source.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/data-source.ts"],"names":["AppDataSource","
|
|
1
|
+
{"version":3,"sources":["../src/data-source.ts"],"names":["AppDataSource","databaseFilePath","getDatabaseFilePath","DataSource","type","database","synchronize","logging","entities","Floor","FloorPosition","Printer","Settings","User","CameraStream","Role","RefreshToken","UserRole","Tag","PrinterTag","PrintJob","PrinterMaintenanceLog","migrations","InitSqlite1706829146617","PrinterGroup1707494762198","ChangePrintCompletionDeletePrinterCascade1708465930665","ChangeRoleNameUnique1713300747465","RemovePrinterFile1720338804844","AddPrinterType1713897879622","AddPrinterUsernamePassword1745141688926","DropPermissions1766576698569","ChangeCameraPrinterOnDeleteSetNull1767278216516","DropCustomGcode1767279607392","DropPrintCompletions1767291804417","DropSettingsFileClean1767352862576","ChangeFloorNonUniqueOrder1767370191762","RenameGroupToTag1767432108916","AddPrintJob1767451444137","AddPrinterMaintenanceLog1767909428129","subscribers"],"mappings":";;;;+BAoCaA;;;eAAAA;;;QApCN;yBACoB;yBACS;6BACd;qCACQ;+BACN;gCACC;0BAC2C;oCACvC;4BACR;gCACI;yCACe;kCACb;2BACP;2CACsB;wEAGnC;mDAC2C;gDACH;6CACH;yDACY;8CACX;iEAGtC;8CACsC;mDACK;oDACC;wDACI;+CACT;0CACL;uDACa;AAEtD,MAAMC,mBAAmBC,IAAAA,4BAAmB;AAErC,MAAMF,gBAAgB,IAAIG,mBAAU,CAAC;IAC1CC,MAAM;IACNC,UAAUJ;IACVK,aAAa;IACbC,SAAS;IACTC,UAAU;QACRC,kBAAK;QACLC,kCAAa;QACbC,sBAAO;QACPC,wBAAQ;QACRC,cAAI;QACJC,gCAAY;QACZC,gBAAI;QACJC,sBAAY;QACZC,wBAAQ;QACRC,cAAG;QACHC,4BAAU;QACVC,kBAAQ;QACRC,+BAAqB;KACtB;IACDC,YAAY;QACVC,gDAAuB;QACvBC,oDAAyB;QACzBC,8GAAsD;QACtDC,oEAAiC;QACjCC,8DAA8B;QAC9BC,wDAA2B;QAC3BC,gFAAuC;QACvCC,0DAA4B;QAC5BC,gGAA+C;QAC/CC,0DAA4B;QAC5BC,oEAAiC;QACjCC,sEAAkC;QAClCC,8EAAsC;QACtCC,4DAA6B;QAC7BC,kDAAwB;QACxBC,4EAAqC;KACtC;IACDC,aAAa,EAAE;AACjB"}
|
package/dist/index.js
CHANGED
|
@@ -2,24 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", {
|
|
3
3
|
value: true
|
|
4
4
|
});
|
|
5
|
-
const _dotenv = /*#__PURE__*/ _interop_require_default(require("dotenv"));
|
|
6
|
-
const _nodepath = require("node:path");
|
|
7
5
|
const _node = require("@sentry/node");
|
|
8
6
|
const _serverenv = require("./server.env");
|
|
9
7
|
const _servercore = require("./server.core");
|
|
10
8
|
const _containertokens = require("./container.tokens");
|
|
11
9
|
const _logger = require("./handlers/logger");
|
|
12
10
|
const _staticlogger = require("./handlers/logging/static.logger");
|
|
13
|
-
const _fsutils = require("./utils/fs.utils");
|
|
14
|
-
function _interop_require_default(obj) {
|
|
15
|
-
return obj && obj.__esModule ? obj : {
|
|
16
|
-
default: obj
|
|
17
|
-
};
|
|
18
|
-
}
|
|
19
|
-
_dotenv.default.config({
|
|
20
|
-
path: process.env.ENV_FILE || (0, _nodepath.join)((0, _fsutils.superRootPath)(), ".env"),
|
|
21
|
-
quiet: true
|
|
22
|
-
});
|
|
23
11
|
(0, _staticlogger.createStaticLogger)({
|
|
24
12
|
enableFileLogs: true
|
|
25
13
|
});
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.ts"],"names":["
|
|
1
|
+
{"version":3,"sources":["../src/index.ts"],"names":["createStaticLogger","enableFileLogs","logger","Logger","log","setupEnvConfig","process","on","err","error","reason","setupServer","then","httpServer","container","resolve","DITokens","serverHost","boot","catch","e","console","captureException","flush","exit"],"mappings":";;;;sBAEwC;2BACT;4BACH;iCACH;wBAEe;8BACL;AAGnCA,IAAAA,gCAAkB,EAAC;IAAEC,gBAAgB;AAAK;AAC1C,MAAMC,SAAS,IAAIC,qBAAM,CAAC;AAC1BD,OAAOE,GAAG,CAAC;AAEXC,IAAAA,yBAAc;AAEdC,QAAQC,EAAE,CAAC,qBAAqB,CAACC;IAC/BN,OAAOO,KAAK,CAAC,sBAAsBD;AACrC;AAEAF,QAAQC,EAAE,CAAC,sBAAsB,CAACG;IAChCR,OAAOO,KAAK,CAAC,+BAA+BC;AAC9C;AAEAC,IAAAA,uBAAW,IAAGC,IAAI,CAAC,CAAC,EAAEC,UAAU,EAAEC,SAAS,EAAE;IAC3CA,UACGC,OAAO,CAAaC,yBAAQ,CAACC,UAAU,EACvCC,IAAI,CAACL,YACLM,KAAK,CAAC,OAAOC;QACZC,QAAQZ,KAAK,CAAC,2DAA2DW;QAEzEE,IAAAA,sBAAgB,EAACF;QACjB,MAAMG,IAAAA,WAAK,EAAC;QACZjB,QAAQkB,IAAI,CAAC;IACf;AACJ"}
|
package/dist/server.constants.js
CHANGED
|
@@ -76,7 +76,7 @@ const AppConstants = {
|
|
|
76
76
|
docsUrl: "https://docs.fdm-monster.net",
|
|
77
77
|
orgName: "fdm-monster",
|
|
78
78
|
currentWizardVersion: 1,
|
|
79
|
-
defaultClientMinimum: "2.2.
|
|
79
|
+
defaultClientMinimum: "2.2.4",
|
|
80
80
|
defaultWebsocketHandshakeTimeout: 3000,
|
|
81
81
|
defaultSocketThrottleRate: 1,
|
|
82
82
|
debugSocketStatesKey: "DEBUG_SOCKET_STATES",
|
package/dist/server.env.js
CHANGED
|
@@ -78,7 +78,7 @@ function setupEnvConfig() {
|
|
|
78
78
|
process.env[_serverconstants.AppConstants.NODE_ENV_KEY] = newEnvName;
|
|
79
79
|
logger.warn(`NODE_ENV=${environment} was not set, or not known. Defaulting to NODE_ENV=${newEnvName}`);
|
|
80
80
|
} else {
|
|
81
|
-
logger.log(`✓ NODE_ENV variable correctly set (${environment})
|
|
81
|
+
logger.log(`✓ NODE_ENV variable correctly set (${environment})`);
|
|
82
82
|
}
|
|
83
83
|
ensurePackageVersionSet();
|
|
84
84
|
setupSentry();
|
package/dist/server.env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/server.env.ts"],"names":["ensurePortSet","fetchServerPort","setupEnvConfig","setupSentry","logger","Logger","environment","process","env","AppConstants","NODE_ENV_KEY","knownEnvNames","includes","newEnvName","defaultProductionEnv","warn","log","ensurePackageVersionSet","ENABLE_PROMETHEUS_METRICS","collectDefaultMetrics","register","removeSingleMetric","packageJsonVersion","require","packageJsonPath","version","VERSION_KEY","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","isTestEnvironment","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","error","captureException","docsUrl"],"mappings":";;;;;;;;;;;QAsEgBA;eAAAA;;QA/BAC;eAAAA;;QA/BAC;eAAAA;;QAyCAC;eAAAA;;;8DAjDQ;iCACK;wBACW;0BACoC;4BAC/C;yBACG;4BACgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzC,SAASD;IACd,MAAME,SAAS,IAAIC,qBAAM,CAAC;IAC1B,MAAMC,cAAcC,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC;IAC1D,IAAI,CAACJ,eAAe,CAACG,6BAAY,CAACE,aAAa,CAACC,QAAQ,CAACN,cAAc;QACrE,MAAMO,aAAaJ,6BAAY,CAACK,oBAAoB;QACpDP,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC,GAAGG;QACzCT,OAAOW,IAAI,CAAC,CAAC,SAAS,EAAGT,YAAa,mDAAmD,EAAGO,YAAa;IAC3G,OAAO;QACLT,OAAOY,GAAG,CAAC,CAAC,mCAAmC,EAAGV,YAAa,
|
|
1
|
+
{"version":3,"sources":["../src/server.env.ts"],"names":["ensurePortSet","fetchServerPort","setupEnvConfig","setupSentry","logger","Logger","environment","process","env","AppConstants","NODE_ENV_KEY","knownEnvNames","includes","newEnvName","defaultProductionEnv","warn","log","ensurePackageVersionSet","ENABLE_PROMETHEUS_METRICS","collectDefaultMetrics","register","removeSingleMetric","packageJsonVersion","require","packageJsonPath","version","VERSION_KEY","port","SERVER_PORT_KEY","Number","isNaN","parseInt","defaultServerPort","toString","sentryDsnToken","getEnvOrDefault","sentryCustomDsnToken","sentryCustomDsnDefault","Sentry","init","dsn","NODE_ENV","release","npm_package_version","enabled","isTestEnvironment","tracesSampleRate","isProductionEnvironment","on","e","message","errorSummary","error","captureException","docsUrl"],"mappings":";;;;;;;;;;;QAsEgBA;eAAAA;;QA/BAC;eAAAA;;QA/BAC;eAAAA;;QAyCAC;eAAAA;;;8DAjDQ;iCACK;wBACW;0BACoC;4BAC/C;yBACG;4BACgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzC,SAASD;IACd,MAAME,SAAS,IAAIC,qBAAM,CAAC;IAC1B,MAAMC,cAAcC,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC;IAC1D,IAAI,CAACJ,eAAe,CAACG,6BAAY,CAACE,aAAa,CAACC,QAAQ,CAACN,cAAc;QACrE,MAAMO,aAAaJ,6BAAY,CAACK,oBAAoB;QACpDP,QAAQC,GAAG,CAACC,6BAAY,CAACC,YAAY,CAAC,GAAGG;QACzCT,OAAOW,IAAI,CAAC,CAAC,SAAS,EAAGT,YAAa,mDAAmD,EAAGO,YAAa;IAC3G,OAAO;QACLT,OAAOY,GAAG,CAAC,CAAC,mCAAmC,EAAGV,YAAa,CAAC,CAAC;IACnE;IAEAW;IACAd;IACAH;IAGA,IAAIO,QAAQC,GAAG,CAACC,6BAAY,CAACS,yBAAyB,CAAC,KAAK,QAAQ;QAClEC,IAAAA,iCAAqB,EAAC;YAAEC,UAAAA,oBAAQ;QAAC;QACjCA,oBAAQ,CAACC,kBAAkB,CAAC;IAC9B;AACF;AAEA,SAASJ;IACP,MAAMb,SAAS,IAAIC,qBAAM,CAAC;IAC1B,MAAMiB,qBAAqBC,QAAQC,IAAAA,wBAAe,KAAIC,OAAO;IAC7DlB,QAAQC,GAAG,CAACC,6BAAY,CAACiB,WAAW,CAAC,KAAKJ;IAE1ClB,OAAOY,GAAG,CAAC,CAAC,yBAAyB,EAAGT,QAAQC,GAAG,CAACC,6BAAY,CAACiB,WAAW,CAAC,EAAG;AAClF;AAGO,SAASzB;IACd,IAAI0B,OAAOpB,QAAQC,GAAG,CAACC,6BAAY,CAACmB,eAAe,CAAC;IACpD,IAAIC,OAAOC,KAAK,CAACD,OAAOE,QAAQ,CAACJ,QAAS;QAExCpB,QAAQC,GAAG,CAACC,6BAAY,CAACmB,eAAe,CAAC,GAAGnB,6BAAY,CAACuB,iBAAiB,CAACC,QAAQ;QACnFN,OAAOpB,QAAQC,GAAG,CAACC,6BAAY,CAACmB,eAAe,CAAC;IAClD;IACA,OAAOD;AACT;AAEO,SAASxB;IACd,MAAMC,SAAS,IAAIC,qBAAM,CAAC;IAC1B,MAAM6B,iBAAiBC,IAAAA,yBAAe,EAAC1B,6BAAY,CAAC2B,oBAAoB,EAAE3B,6BAAY,CAAC4B,sBAAsB;IAE7GC,MAAOC,IAAI,CAAC;QACVC,KAAKN;QACL5B,aAAaC,QAAQC,GAAG,CAACiC,QAAQ;QACjCC,SAASnC,QAAQC,GAAG,CAACmC,mBAAmB;QACxCC,SAAS,CAACC,IAAAA,2BAAiB;QAC3BC,kBAAkBC,IAAAA,iCAAuB,MAAK,OAAO;IACvD;IAEAxC,QAAQyC,EAAE,CAAC,sBAAsB,CAACC;QAChC,MAAMC,UAAU,CAAC,4BAA4B,EAAGC,IAAAA,wBAAY,EAACF,IAAK;QAClE7C,OAAOgD,KAAK,CAACF;QAGbZ,MAAOe,gBAAgB,CAACJ;IAC1B;AACF;AAEO,SAASjD;IACd,MAAMI,SAAS,IAAIC,qBAAM,CAAC;IAC1BJ;IAEA,IAAI,CAACM,QAAQC,GAAG,CAACC,6BAAY,CAACmB,eAAe,CAAC,EAAE;QAC9CxB,OAAOY,GAAG,CAAC,CAAC,EAAE,EAAGP,6BAAY,CAACmB,eAAe,CAAE,gCAAgC,CAAC;QAChFxB,OAAOY,GAAG,CAAC,CAAC,yBAAyB,EAAGP,6BAAY,CAAC6C,OAAO,CAAE,sBAAsB,CAAC;QACrF/C,QAAQC,GAAG,CAACC,6BAAY,CAACmB,eAAe,CAAC,GAAGnB,6BAAY,CAACuB,iBAAiB,CAACC,QAAQ;IACrF;AACF"}
|
package/dist/utils/env.utils.js
CHANGED
|
@@ -26,6 +26,19 @@ _export(exports, {
|
|
|
26
26
|
}
|
|
27
27
|
});
|
|
28
28
|
const _serverconstants = require("../server.constants");
|
|
29
|
+
const _dotenv = /*#__PURE__*/ _interop_require_default(require("dotenv"));
|
|
30
|
+
const _nodepath = require("node:path");
|
|
31
|
+
const _fsutils = require("./fs.utils");
|
|
32
|
+
function _interop_require_default(obj) {
|
|
33
|
+
return obj && obj.__esModule ? obj : {
|
|
34
|
+
default: obj
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
if (process.env.NODE_ENV !== "test") {
|
|
38
|
+
_dotenv.default.config({
|
|
39
|
+
path: process.env.ENV_FILE || (0, _nodepath.join)((0, _fsutils.superRootPath)(), ".env")
|
|
40
|
+
});
|
|
41
|
+
}
|
|
29
42
|
function getEnvOrDefault(key, defaultValue) {
|
|
30
43
|
if (!Object.keys(process.env).includes(key) || !process.env[key]?.length) {
|
|
31
44
|
return defaultValue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","isProductionEnvironment","isTestEnvironment","
|
|
1
|
+
{"version":3,"sources":["../../src/utils/env.utils.ts"],"names":["getEnvOrDefault","isDevelopmentEnvironment","isNode","isProductionEnvironment","isTestEnvironment","process","env","NODE_ENV","dotenv","config","path","ENV_FILE","join","superRootPath","key","defaultValue","Object","keys","includes","length","AppConstants","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv"],"mappings":";;;;;;;;;;;QAWgBA;eAAAA;;QAOAC;eAAAA;;QAYAC;eAAAA;;QAJAC;eAAAA;;QAJAC;eAAAA;;;iCAtBa;+DACV;0BACE;yBACS;;;;;;AAE9B,IAAIC,QAAQC,GAAG,CAACC,QAAQ,KAAK,QAAQ;IACnCC,eAAM,CAACC,MAAM,CAAC;QACZC,MAAML,QAAQC,GAAG,CAACK,QAAQ,IAAIC,IAAAA,cAAI,EAACC,IAAAA,sBAAa,KAAI;IACtD;AACF;AAEO,SAASb,gBAAmBc,GAAW,EAAEC,YAAe;IAC7D,IAAI,CAACC,OAAOC,IAAI,CAACZ,QAAQC,GAAG,EAAEY,QAAQ,CAACJ,QAAQ,CAACT,QAAQC,GAAG,CAACQ,IAAI,EAAEK,QAAQ;QACxE,OAAOJ;IACT;IACA,OAAOV,QAAQC,GAAG,CAACQ,IAAI;AACzB;AAEO,SAASb;IACd,OAAOI,QAAQC,GAAG,CAACC,QAAQ,KAAKa,6BAAY,CAACC,qBAAqB;AACpE;AAEO,SAASjB;IACd,OAAOC,QAAQC,GAAG,CAACC,QAAQ,KAAKa,6BAAY,CAACE,cAAc;AAC7D;AAEO,SAASnB;IACd,OAAOE,QAAQC,GAAG,CAACC,QAAQ,KAAKa,6BAAY,CAACG,oBAAoB;AACnE;AAEO,SAASrB;IACd,OAAO,UAAUG,QAAQC,GAAG;AAC9B"}
|
package/package.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
},
|
|
7
7
|
"author": "David Zwart",
|
|
8
8
|
"license": "AGPL-3.0-or-later",
|
|
9
|
-
"version": "2.0.
|
|
9
|
+
"version": "2.0.5",
|
|
10
10
|
"bin": {
|
|
11
11
|
"fdm-monster-server": "dist/index.js",
|
|
12
12
|
"fdmm-server": "dist/index.js"
|
|
@@ -59,9 +59,9 @@
|
|
|
59
59
|
"tr46": "6.0.0"
|
|
60
60
|
},
|
|
61
61
|
"dependencies": {
|
|
62
|
-
"@fdm-monster/client-next": "2.2.
|
|
62
|
+
"@fdm-monster/client-next": "2.2.4",
|
|
63
63
|
"@octokit/plugin-throttling": "8.2.0",
|
|
64
|
-
"@sentry/node": "10.
|
|
64
|
+
"@sentry/node": "10.34.0",
|
|
65
65
|
"adm-zip": "0.5.16",
|
|
66
66
|
"awilix": "12.0.5",
|
|
67
67
|
"awilix-express": "9.0.2",
|