@fdm-monster/server 1.6.0-rc2 → 1.6.0
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/README.md +1 -1
- package/dist/container.js +2 -0
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +1 -0
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/batch-call.controller.js +6 -1
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer-group.controller.js +70 -0
- package/dist/controllers/printer-group.controller.js.map +1 -0
- package/dist/controllers/printer.controller.js +1 -0
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-public.controller.js +8 -1
- package/dist/controllers/server-public.controller.js.map +1 -1
- package/dist/data-source.js +8 -2
- package/dist/data-source.js.map +1 -1
- package/dist/entities/floor-position.entity.js +1 -1
- package/dist/entities/floor-position.entity.js.map +1 -1
- package/dist/entities/group.entity.js +35 -0
- package/dist/entities/group.entity.js.map +1 -0
- package/dist/entities/printer-group.entity.js +66 -0
- package/dist/entities/printer-group.entity.js.map +1 -0
- package/dist/entities/printer.entity.js +6 -0
- package/dist/entities/printer.entity.js.map +1 -1
- package/dist/migrations/1707494762198-PrinterGroup.js +85 -0
- package/dist/migrations/1707494762198-PrinterGroup.js.map +1 -0
- package/dist/server.constants.js +1 -1
- package/dist/services/batch-call.service.js +24 -0
- package/dist/services/batch-call.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +6 -2
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/interfaces/group.dto.js +6 -0
- package/dist/services/interfaces/group.dto.js.map +1 -0
- package/dist/services/interfaces/printer-group.dto.js +41 -0
- package/dist/services/interfaces/printer-group.dto.js.map +1 -0
- package/dist/services/interfaces/printer-group.service.interface.js +6 -0
- package/dist/services/interfaces/printer-group.service.interface.js.map +1 -0
- package/dist/services/octoprint/octoprint-api.service.js.map +1 -1
- package/dist/services/orm/printer-group.service.js +114 -0
- package/dist/services/orm/printer-group.service.js.map +1 -0
- package/dist/state/file-upload-tracker.cache.js +1 -1
- package/dist/state/file-upload-tracker.cache.js.map +1 -1
- package/dist/state/printer-events.cache.js +3 -0
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/tasks/boot.task.js +4 -3
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/socketio.task.js +1 -1
- package/dist/tasks/socketio.task.js.map +1 -1
- package/package.json +16 -16
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","taskManagerService","serverTasks","settingsStore","settingsService","multerService","printerSocketStore","printerFilesStore","permissionService","roleService","userService","pluginRepositoryCache","floorStore","pluginFirmwareUpdateService","clientBundleService","configService","isTypeormMode","typeormService","constructor","loggerFactory","name","runOnce","registerJobOrTask","SERVER_BOOT_TASK","log","run","createConnection","migrateDatabase","e","mongoose","Error","message","includes","error","scheduleDisabledJob","DITokens","bootTask","loadSettings","syncPermissions","syncRoles","isDemoMode","warn","AppConstants","OVERRIDE_IS_DEMO_MODE","createOrUpdateDemoAccount","setLoginRequired","setRegistrationEnabled","loginRequired","get","OVERRIDE_LOGIN_REQUIRED","registrationEnabled","OVERRIDE_REGISTRATION_ENABLED","overrideJwtSecret","OVERRIDE_JWT_SECRET","undefined","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadFilesStore","loadStore","process","env","SAFEMODE_ENABLED","BOOT_TASKS","forEach","task","disableJob","demoUsername","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","demoPassword","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","demoRole","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","adminRole","getRoleByName","demoUserId","getDemoUserId","register","username","password","isDemoUser","isVerified","isRootUser","needsPasswordChange","roles","id","setVerifiedById","setIsRootUserById","updatePasswordUnsafeByUsername","setUserRoleIds","setWizardCompleted","
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/boot.task.ts"],"names":["BootTask","logger","taskManagerService","serverTasks","settingsStore","settingsService","multerService","printerSocketStore","printerFilesStore","permissionService","roleService","userService","pluginRepositoryCache","floorStore","pluginFirmwareUpdateService","clientBundleService","configService","isTypeormMode","typeormService","constructor","loggerFactory","name","runOnce","registerJobOrTask","SERVER_BOOT_TASK","log","run","createConnection","migrateDatabase","e","mongoose","Error","message","includes","error","scheduleDisabledJob","DITokens","bootTask","loadSettings","syncPermissions","syncRoles","isDemoMode","warn","AppConstants","OVERRIDE_IS_DEMO_MODE","createOrUpdateDemoAccount","setLoginRequired","setRegistrationEnabled","loginRequired","get","OVERRIDE_LOGIN_REQUIRED","registrationEnabled","OVERRIDE_REGISTRATION_ENABLED","overrideJwtSecret","OVERRIDE_JWT_SECRET","undefined","overrideJwtExpiresIn","OVERRIDE_JWT_EXPIRES_IN","persistOptionalCredentialSettings","clearUploadsFolder","loadPrinterSockets","loadFilesStore","loadStore","process","env","SAFEMODE_ENABLED","BOOT_TASKS","forEach","task","disableJob","demoUsername","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","demoPassword","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","demoRole","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","adminRole","getRoleByName","demoUserId","getDemoUserId","register","username","password","isDemoUser","isVerified","isRootUser","needsPasswordChange","roles","id","setVerifiedById","setIsRootUserById","updatePasswordUnsafeByUsername","setUserRoleIds","setWizardCompleted","envUrl","fetchMongoDBConnectionString","connect","serverSelectionTimeoutMS","syncIndexes","runMigrations","connection","db","getClient"],"mappings":"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"}
|
|
@@ -55,7 +55,7 @@ class SocketIoTask {
|
|
|
55
55
|
printerEvents,
|
|
56
56
|
trackedUploads
|
|
57
57
|
};
|
|
58
|
-
if (this.settingsStore.
|
|
58
|
+
if (this.settingsStore.getDebugSettingsSensitive()?.debugSocketIoBandwidth) {
|
|
59
59
|
const kbDataString = Object.entries(socketIoData).map(([id, state])=>{
|
|
60
60
|
return `${id} ${(0, _metricutils.formatKB)(state)}`;
|
|
61
61
|
}).join(" ");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/tasks/socketio.task.ts"],"names":["SocketIoTask","socketIoGateway","printerSocketStore","printerEventsCache","floorStore","fileUploadTrackerCache","eventEmitter2","printerCache","logger","settingsStore","aggregateSizeCounter","aggregateWindowLength","aggregateSizes","rounding","constructor","loggerFactory","name","on","socketIoConnectedEvent","sendUpdate","run","floors","listCache","printers","listCachedPrinters","socketStates","getSocketStatesById","printerEvents","getAllKeyValues","trackedUploads","getUploads","socketIoData","
|
|
1
|
+
{"version":3,"sources":["../../src/tasks/socketio.task.ts"],"names":["SocketIoTask","socketIoGateway","printerSocketStore","printerEventsCache","floorStore","fileUploadTrackerCache","eventEmitter2","printerCache","logger","settingsStore","aggregateSizeCounter","aggregateWindowLength","aggregateSizes","rounding","constructor","loggerFactory","name","on","socketIoConnectedEvent","sendUpdate","run","floors","listCache","printers","listCachedPrinters","socketStates","getSocketStatesById","printerEvents","getAllKeyValues","trackedUploads","getUploads","socketIoData","getDebugSettingsSensitive","debugSocketIoBandwidth","kbDataString","Object","entries","map","id","state","formatKB","join","log","serializedData","JSON","stringify","transportDataSize","sizeKB","updateAggregator","send","IO_MESSAGES","LegacyUpdate","transportDataLength","summedPayloadSize","reduce","t","n","averagePayloadSize","toFixed","push"],"mappings":"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"}
|
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": "1.6.0
|
|
9
|
+
"version": "1.6.0",
|
|
10
10
|
"bin": {
|
|
11
11
|
"fdm-monster": "dist/index.js",
|
|
12
12
|
"fdmm": "dist/index.js"
|
|
@@ -31,10 +31,10 @@
|
|
|
31
31
|
"format": "prettier --write \"src/**/*.js\" \"test/**/*.js\"",
|
|
32
32
|
"swc": "swc",
|
|
33
33
|
"tsc": "tsc --noEmit",
|
|
34
|
-
"test": "cross-env
|
|
35
|
-
"test:sqlite": "cross-env
|
|
36
|
-
"test:cov": "cross-env
|
|
37
|
-
"test:cov-sqlite": "cross-env
|
|
34
|
+
"test:mongodb": "cross-env MONGODB_MODE=true jest --forceExit --maxConcurrency=8 --runInBand ",
|
|
35
|
+
"test:sqlite": "cross-env MONGODB_MODE=false jest --forceExit --maxConcurrency=8 --runInBand ",
|
|
36
|
+
"test:cov-mongodb": "cross-env MONGODB_MODE=true jest --forceExit --coverage --maxConcurrency=8 --runInBand ",
|
|
37
|
+
"test:cov-sqlite": "cross-env MONGODB_MODE=false jest --forceExit --coverage --maxConcurrency=8 --runInBand ",
|
|
38
38
|
"cov:show": "./coverage/lcov-report/index.html",
|
|
39
39
|
"torm": "ts-node --swc -r tsconfig-paths/register ./node_modules/typeorm/cli.js",
|
|
40
40
|
"typeorm:generate": "yarn torm migration:generate -d src/data-source.ts --pretty src/migrations/CustomGCode",
|
|
@@ -52,23 +52,23 @@
|
|
|
52
52
|
"vue"
|
|
53
53
|
],
|
|
54
54
|
"dependencies": {
|
|
55
|
-
"@fdm-monster/client": "1.5.0
|
|
55
|
+
"@fdm-monster/client": "1.5.0",
|
|
56
56
|
"@influxdata/influxdb-client": "1.33.2",
|
|
57
57
|
"@octokit/plugin-throttling": "8.1.3",
|
|
58
|
-
"@sentry/node": "7.
|
|
58
|
+
"@sentry/node": "7.100.1",
|
|
59
59
|
"adm-zip": "0.5.10",
|
|
60
60
|
"awilix": "10.0.1",
|
|
61
61
|
"awilix-express": "9.0.1",
|
|
62
62
|
"axios": "1.6.7",
|
|
63
63
|
"bcryptjs": "2.4.3",
|
|
64
|
-
"better-sqlite3": "9.
|
|
64
|
+
"better-sqlite3": "9.4.1",
|
|
65
65
|
"cache-manager": "4.1.0",
|
|
66
66
|
"class-validator": "0.14.1",
|
|
67
67
|
"connect-history-api-fallback": "2.0.0",
|
|
68
68
|
"cookie-parser": "1.4.6",
|
|
69
69
|
"cors": "2.8.5",
|
|
70
70
|
"cross-env": "7.0.3",
|
|
71
|
-
"dotenv": "16.4.
|
|
71
|
+
"dotenv": "16.4.2",
|
|
72
72
|
"eventemitter2": "6.4.9",
|
|
73
73
|
"express": "4.18.2",
|
|
74
74
|
"form-data": "4.0.0",
|
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
"passport-anonymous": "1.0.1",
|
|
89
89
|
"passport-jwt": "4.0.1",
|
|
90
90
|
"reflect-metadata": "0.2.1",
|
|
91
|
-
"semver": "7.
|
|
91
|
+
"semver": "7.6.0",
|
|
92
92
|
"simple-git": "3.22.0",
|
|
93
93
|
"socket.io": "4.7.4",
|
|
94
94
|
"toad-scheduler": "3.0.1",
|
|
@@ -100,9 +100,9 @@
|
|
|
100
100
|
"devDependencies": {
|
|
101
101
|
"@lcov-viewer/cli": "1.3.0",
|
|
102
102
|
"@lcov-viewer/istanbul-report": "1.4.0",
|
|
103
|
-
"@swc/cli": "0.3.
|
|
104
|
-
"@swc/core": "1.
|
|
105
|
-
"@swc/jest": "0.2.
|
|
103
|
+
"@swc/cli": "0.3.9",
|
|
104
|
+
"@swc/core": "1.4.0",
|
|
105
|
+
"@swc/jest": "0.2.36",
|
|
106
106
|
"@types/adm-zip": "0.5.5",
|
|
107
107
|
"@types/bcryptjs": "2.4.6",
|
|
108
108
|
"@types/cache-manager": "4.0.6",
|
|
@@ -116,13 +116,13 @@
|
|
|
116
116
|
"@types/luxon": "3.4.2",
|
|
117
117
|
"@types/migrate-mongo": "10.0.4",
|
|
118
118
|
"@types/multer": "1.4.11",
|
|
119
|
-
"@types/node": "20.11.
|
|
119
|
+
"@types/node": "20.11.17",
|
|
120
120
|
"@types/passport-anonymous": "1.0.5",
|
|
121
121
|
"@types/passport-jwt": "4.0.1",
|
|
122
|
-
"@types/semver": "7.5.
|
|
122
|
+
"@types/semver": "7.5.7",
|
|
123
123
|
"@types/supertest": "6.0.2",
|
|
124
124
|
"@types/uuid": "9.0.8",
|
|
125
|
-
"chokidar": "3.
|
|
125
|
+
"chokidar": "3.6.0",
|
|
126
126
|
"concurrently": "8.2.2",
|
|
127
127
|
"eslint": "8.56.0",
|
|
128
128
|
"eslint-config-airbnb-base": "15.0.0",
|