@fdm-monster/server 1.6.0-rc1 → 1.6.0-rc3

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.
Files changed (168) hide show
  1. package/.gitattributes +2 -0
  2. package/.yarn/install-state.gz +0 -0
  3. package/.yarn/releases/yarn-4.1.0.cjs +893 -0
  4. package/.yarnrc.yml +4 -0
  5. package/README.md +1 -1
  6. package/dist/consoles/sqlite-torm.js +31 -0
  7. package/dist/consoles/sqlite-torm.js.map +1 -0
  8. package/dist/consoles/typeorm-generate.js +194 -0
  9. package/dist/consoles/typeorm-generate.js.map +1 -0
  10. package/dist/consoles/typeorm-migrate.js +48 -0
  11. package/dist/consoles/typeorm-migrate.js.map +1 -0
  12. package/dist/container.js +64 -19
  13. package/dist/container.js.map +1 -1
  14. package/dist/container.tokens.js +2 -0
  15. package/dist/container.tokens.js.map +1 -1
  16. package/dist/controllers/batch-call.controller.js +15 -5
  17. package/dist/controllers/batch-call.controller.js.map +1 -1
  18. package/dist/controllers/dto/update-client-dist.dto.js +38 -0
  19. package/dist/controllers/dto/update-client-dist.dto.js.map +1 -0
  20. package/dist/controllers/printer-files.controller.js +2 -8
  21. package/dist/controllers/printer-files.controller.js.map +1 -1
  22. package/dist/controllers/printer.controller.js +2 -1
  23. package/dist/controllers/printer.controller.js.map +1 -1
  24. package/dist/controllers/server-private.controller.js +25 -6
  25. package/dist/controllers/server-private.controller.js.map +1 -1
  26. package/dist/controllers/validation/batch-controller.validation.js +9 -0
  27. package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
  28. package/dist/data-source.js +66 -0
  29. package/dist/data-source.js.map +1 -0
  30. package/dist/entities/camera-stream.entity.js +94 -0
  31. package/dist/entities/camera-stream.entity.js.map +1 -0
  32. package/dist/entities/custom-gcode.entity.js +50 -0
  33. package/dist/entities/custom-gcode.entity.js.map +1 -0
  34. package/dist/entities/floor-position.entity.js +78 -0
  35. package/dist/entities/floor-position.entity.js.map +1 -0
  36. package/dist/entities/floor.entity.js +53 -0
  37. package/dist/entities/floor.entity.js.map +1 -0
  38. package/dist/entities/index.js +58 -0
  39. package/dist/entities/index.js.map +1 -0
  40. package/dist/entities/permission.entity.js +38 -0
  41. package/dist/entities/permission.entity.js.map +1 -0
  42. package/dist/entities/print-completion.entity.js +91 -0
  43. package/dist/entities/print-completion.entity.js.map +1 -0
  44. package/dist/entities/printer-file.entity.js +140 -0
  45. package/dist/entities/printer-file.entity.js.map +1 -0
  46. package/dist/entities/printer.entity.js +105 -0
  47. package/dist/entities/printer.entity.js.map +1 -0
  48. package/dist/entities/refresh-token.entity.js +70 -0
  49. package/dist/entities/refresh-token.entity.js.map +1 -0
  50. package/dist/entities/role.entity.js +46 -0
  51. package/dist/entities/role.entity.js.map +1 -0
  52. package/dist/entities/settings.entity.js +89 -0
  53. package/dist/entities/settings.entity.js.map +1 -0
  54. package/dist/entities/user-role.entity.js +70 -0
  55. package/dist/entities/user-role.entity.js.map +1 -0
  56. package/dist/entities/user.entity.js +90 -0
  57. package/dist/entities/user.entity.js.map +1 -0
  58. package/dist/middleware/exception.filter.js +2 -1
  59. package/dist/middleware/exception.filter.js.map +1 -1
  60. package/dist/middleware/passport.js.map +1 -1
  61. package/dist/migrations/1706829146617-InitSqlite.js +670 -0
  62. package/dist/migrations/1706829146617-InitSqlite.js.map +1 -0
  63. package/dist/models/Floor.js.map +1 -1
  64. package/dist/models/PrinterFile.js +4 -0
  65. package/dist/models/PrinterFile.js.map +1 -1
  66. package/dist/server.constants.js +4 -2
  67. package/dist/server.constants.js.map +1 -1
  68. package/dist/server.core.js +10 -1
  69. package/dist/server.core.js.map +1 -1
  70. package/dist/server.host.js +11 -3
  71. package/dist/server.host.js.map +1 -1
  72. package/dist/services/batch-call.service.js +67 -20
  73. package/dist/services/batch-call.service.js.map +1 -1
  74. package/dist/services/core/client-bundle.service.js +98 -27
  75. package/dist/services/core/client-bundle.service.js.map +1 -1
  76. package/dist/services/core/github.service.js +18 -14
  77. package/dist/services/core/github.service.js.map +1 -1
  78. package/dist/services/core/task-manager.service.js +1 -1
  79. package/dist/services/core/task-manager.service.js.map +1 -1
  80. package/dist/services/core/yaml.service.js.map +1 -1
  81. package/dist/services/floor.service.js +1 -1
  82. package/dist/services/floor.service.js.map +1 -1
  83. package/dist/services/interfaces/printer-file.dto.js +29 -3
  84. package/dist/services/interfaces/printer-file.dto.js.map +1 -1
  85. package/dist/services/octoprint/dto/connection-state.dto.js +0 -25
  86. package/dist/services/octoprint/dto/connection-state.dto.js.map +1 -1
  87. package/dist/services/octoprint/dto/connection.dto.js +6 -0
  88. package/dist/services/octoprint/dto/connection.dto.js.map +1 -0
  89. package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
  90. package/dist/services/octoprint/models/octoprint-file.dto.js +6 -0
  91. package/dist/services/octoprint/models/octoprint-file.dto.js.map +1 -0
  92. package/dist/services/octoprint/octoprint-api.routes.js +9 -3
  93. package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
  94. package/dist/services/octoprint/octoprint-api.service.js +17 -2
  95. package/dist/services/octoprint/octoprint-api.service.js.map +1 -1
  96. package/dist/services/octoprint/octoprint-sockio.adapter.js +53 -45
  97. package/dist/services/octoprint/octoprint-sockio.adapter.js.map +1 -1
  98. package/dist/services/octoprint/utils/file.utils.js +44 -0
  99. package/dist/services/octoprint/utils/file.utils.js.map +1 -0
  100. package/dist/services/orm/base.service.js +3 -0
  101. package/dist/services/orm/base.service.js.map +1 -1
  102. package/dist/services/orm/camera-stream.service.js +25 -0
  103. package/dist/services/orm/camera-stream.service.js.map +1 -0
  104. package/dist/services/orm/custom-gcode.service.js +42 -0
  105. package/dist/services/orm/custom-gcode.service.js.map +1 -0
  106. package/dist/services/orm/floor-position.service.js +55 -0
  107. package/dist/services/orm/floor-position.service.js.map +1 -0
  108. package/dist/services/orm/floor.service.js +122 -0
  109. package/dist/services/orm/floor.service.js.map +1 -0
  110. package/dist/services/orm/permission.service.js +77 -0
  111. package/dist/services/orm/permission.service.js.map +1 -0
  112. package/dist/services/orm/print-completion.service.js +90 -0
  113. package/dist/services/orm/print-completion.service.js.map +1 -0
  114. package/dist/services/orm/printer-files.service.js +123 -0
  115. package/dist/services/orm/printer-files.service.js.map +1 -0
  116. package/dist/services/orm/printer.service.js +145 -0
  117. package/dist/services/orm/printer.service.js.map +1 -0
  118. package/dist/services/orm/refresh-token.service.js +107 -0
  119. package/dist/services/orm/refresh-token.service.js.map +1 -0
  120. package/dist/services/orm/role.service.js +131 -0
  121. package/dist/services/orm/role.service.js.map +1 -0
  122. package/dist/services/orm/settings.service.js +208 -0
  123. package/dist/services/orm/settings.service.js.map +1 -0
  124. package/dist/services/orm/user-role.service.js +55 -0
  125. package/dist/services/orm/user-role.service.js.map +1 -0
  126. package/dist/services/orm/user.service.js +146 -0
  127. package/dist/services/orm/user.service.js.map +1 -0
  128. package/dist/services/orm-migration.service.js +20 -0
  129. package/dist/services/orm-migration.service.js.map +1 -0
  130. package/dist/services/printer-files.service.js +3 -0
  131. package/dist/services/printer-files.service.js.map +1 -1
  132. package/dist/services/typeorm/typeorm.service.js +48 -0
  133. package/dist/services/typeorm/typeorm.service.js.map +1 -0
  134. package/dist/state/file.cache.js +2 -9
  135. package/dist/state/file.cache.js.map +1 -1
  136. package/dist/state/printer-connection.cache.js +21 -0
  137. package/dist/state/printer-connection.cache.js.map +1 -0
  138. package/dist/state/printer-events.cache.js +16 -7
  139. package/dist/state/printer-events.cache.js.map +1 -1
  140. package/dist/state/printer-files.store.js +3 -4
  141. package/dist/state/printer-files.store.js.map +1 -1
  142. package/dist/state/printer-socket.store.js +3 -3
  143. package/dist/state/printer-socket.store.js.map +1 -1
  144. package/dist/state/printer.cache.js +3 -0
  145. package/dist/state/printer.cache.js.map +1 -1
  146. package/dist/state/settings.store.js +3 -0
  147. package/dist/state/settings.store.js.map +1 -1
  148. package/dist/state/test-printer-socket.store.js +1 -1
  149. package/dist/task.presets.js.map +1 -1
  150. package/dist/tasks/boot.task.js +30 -18
  151. package/dist/tasks/boot.task.js.map +1 -1
  152. package/dist/tasks/print-completion.socketio.task.js +15 -1
  153. package/dist/tasks/print-completion.socketio.task.js.map +1 -1
  154. package/dist/tasks/printer-file-clean.task.js +14 -0
  155. package/dist/tasks/printer-file-clean.task.js.map +1 -1
  156. package/dist/tasks/printer-state-update-poll.task.js +89 -0
  157. package/dist/tasks/printer-state-update-poll.task.js.map +1 -0
  158. package/dist/tasks/printer-websocket-restore.task.js +4 -3
  159. package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
  160. package/dist/tasks/printer-websocket.task.js +1 -1
  161. package/dist/tasks/printer-websocket.task.js.map +1 -1
  162. package/dist/tasks/socketio.task.js +1 -1
  163. package/dist/tasks/socketio.task.js.map +1 -1
  164. package/dist/tasks.js +2 -1
  165. package/dist/tasks.js.map +1 -1
  166. package/dist/utils/semver.utils.js +19 -4
  167. package/dist/utils/semver.utils.js.map +1 -1
  168. package/package.json +31 -30
package/.yarnrc.yml ADDED
@@ -0,0 +1,4 @@
1
+ nodeLinker: node-modules
2
+
3
+ yarnPath: .yarn/releases/yarn-4.1.0.cjs
4
+ httpTimeout: 1000000
package/README.md CHANGED
@@ -40,7 +40,7 @@ This server is has been battle-tested in the field for 100+ printers, so give it
40
40
  - Import printers from OctoFarm
41
41
  - [Raspberry Pi image MonsterPi](https://docs.fdm-monster.net/guides/monsterpi)
42
42
 
43
- ![Image](docs/images/server-running.png)
43
+ ![docs/images/server-running.png](https://github.com/fdm-monster/fdm-monster-docs/blob/main/docs/images/server-running.png)
44
44
  _The FDM Monster grid after placing one OctoPrint instance._
45
45
 
46
46
  ## Getting started
@@ -0,0 +1,31 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", {
3
+ value: true
4
+ });
5
+ const _serverconstants = require("../server.constants");
6
+ const _datasource = require("../data-source");
7
+ const _printerentity = require("../entities/printer.entity");
8
+ process.env[_serverconstants.AppConstants.DATABASE_FILE] = ":memory:";
9
+ async function main() {
10
+ console.log("Running test sqlite with TypeORM");
11
+ const ds = await _datasource.AppDataSource.initialize();
12
+ const printerRepo = ds.getRepository(_printerentity.Printer);
13
+ const entity = printerRepo.create({
14
+ name: "Default Printer",
15
+ printerUrl: "http://localhost:3000",
16
+ apiKey: "1234567890"
17
+ });
18
+ await ds.transaction(async (manager)=>{
19
+ const result = await manager.save(entity);
20
+ const printer = await printerRepo.findOneByOrFail({
21
+ id: result.id
22
+ });
23
+ console.log("Printer found", printer.id, printer.name, printer.printerUrl, printer.apiKey);
24
+ });
25
+ }
26
+ main().then(()=>{
27
+ console.log("Done!");
28
+ process.exit(0);
29
+ });
30
+
31
+ //# sourceMappingURL=sqlite-torm.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../src/consoles/sqlite-torm.ts"],"names":["process","env","AppConstants","DATABASE_FILE","main","console","log","ds","AppDataSource","initialize","printerRepo","getRepository","Printer","entity","create","name","printerUrl","apiKey","transaction","manager","result","save","printer","findOneByOrFail","id","then","exit"],"mappings":";;;;iCAA6B;4BAIC;+BACN;AAHxBA,QAAQC,GAAG,CAACC,6BAAY,CAACC,aAAa,CAAC,GAAG;AAM1C,eAAeC;IACbC,QAAQC,GAAG,CAAC;IAEZ,MAAMC,KAAK,MAAMC,yBAAa,CAACC,UAAU;IAEzC,MAAMC,cAAcH,GAAGI,aAAa,CAACC,sBAAO;IAC5C,MAAMC,SAASH,YAAYI,MAAM,CAAC;QAChCC,MAAM;QACNC,YAAY;QACZC,QAAQ;IACV;IAEA,MAAMV,GAAGW,WAAW,CAAC,OAAOC;QAC1B,MAAMC,SAAS,MAAMD,QAAQE,IAAI,CAACR;QAClC,MAAMS,UAAU,MAAMZ,YAAYa,eAAe,CAAC;YAAEC,IAAIJ,OAAOI,EAAE;QAAC;QAClEnB,QAAQC,GAAG,CAAC,iBAAiBgB,QAAQE,EAAE,EAAEF,QAAQP,IAAI,EAAEO,QAAQN,UAAU,EAAEM,QAAQL,MAAM;IAC3F;AACF;AAEAb,OAAOqB,IAAI,CAAC;IACVpB,QAAQC,GAAG,CAAC;IAEZN,QAAQ0B,IAAI,CAAC;AACf"}
@@ -0,0 +1,194 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", {
3
+ value: true
4
+ });
5
+ const _PlatformTools = require("typeorm/platform/PlatformTools");
6
+ const _CommandUtils = require("typeorm/commands/CommandUtils");
7
+ const _path = _interop_require_default(require("path"));
8
+ const _chalk = _interop_require_default(require("chalk"));
9
+ const _StringUtils = require("typeorm/util/StringUtils");
10
+ const _sqlFormatter = require("@sqltools/formatter/lib/sqlFormatter");
11
+ const _readline = _interop_require_wildcard(require("readline"));
12
+ function _interop_require_default(obj) {
13
+ return obj && obj.__esModule ? obj : {
14
+ default: obj
15
+ };
16
+ }
17
+ function _getRequireWildcardCache(nodeInterop) {
18
+ if (typeof WeakMap !== "function") return null;
19
+ var cacheBabelInterop = new WeakMap();
20
+ var cacheNodeInterop = new WeakMap();
21
+ return (_getRequireWildcardCache = function(nodeInterop) {
22
+ return nodeInterop ? cacheNodeInterop : cacheBabelInterop;
23
+ })(nodeInterop);
24
+ }
25
+ function _interop_require_wildcard(obj, nodeInterop) {
26
+ if (!nodeInterop && obj && obj.__esModule) {
27
+ return obj;
28
+ }
29
+ if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
30
+ return {
31
+ default: obj
32
+ };
33
+ }
34
+ var cache = _getRequireWildcardCache(nodeInterop);
35
+ if (cache && cache.has(obj)) {
36
+ return cache.get(obj);
37
+ }
38
+ var newObj = {
39
+ __proto__: null
40
+ };
41
+ var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
42
+ for(var key in obj){
43
+ if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
44
+ var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
45
+ if (desc && (desc.get || desc.set)) {
46
+ Object.defineProperty(newObj, key, desc);
47
+ } else {
48
+ newObj[key] = obj[key];
49
+ }
50
+ }
51
+ }
52
+ newObj.default = obj;
53
+ if (cache) {
54
+ cache.set(obj, newObj);
55
+ }
56
+ return newObj;
57
+ }
58
+ function queryParams(parameters) {
59
+ if (!parameters || !parameters.length) {
60
+ return "";
61
+ }
62
+ return `, ${JSON.stringify(parameters)}`;
63
+ }
64
+ function getTemplate(name, timestamp, upSqls, downSqls) {
65
+ const migrationName = `${(0, _StringUtils.camelCase)(name, true)}${timestamp}`;
66
+ return `import { MigrationInterface, QueryRunner } from "typeorm";
67
+
68
+ export class ${migrationName} implements MigrationInterface {
69
+ name = '${migrationName}'
70
+
71
+ public async up(queryRunner: QueryRunner): Promise<void> {
72
+ ${upSqls.join(`
73
+ `)}
74
+ }
75
+
76
+ public async down(queryRunner: QueryRunner): Promise<void> {
77
+ ${downSqls.join(`
78
+ `)}
79
+ }
80
+
81
+ }
82
+ `;
83
+ }
84
+ function getJavascriptTemplate(name, timestamp, upSqls, downSqls) {
85
+ const migrationName = `${(0, _StringUtils.camelCase)(name, true)}${timestamp}`;
86
+ return `const { MigrationInterface, QueryRunner } = require("typeorm");
87
+
88
+ module.exports = class ${migrationName} {
89
+ name = '${migrationName}'
90
+
91
+ async up(queryRunner) {
92
+ ${upSqls.join(`
93
+ `)}
94
+ }
95
+
96
+ async down(queryRunner) {
97
+ ${downSqls.join(`
98
+ `)}
99
+ }
100
+ }
101
+ `;
102
+ }
103
+ function prettifyQuery(query) {
104
+ const formattedQuery = (0, _sqlFormatter.format)(query, {
105
+ indent: " "
106
+ });
107
+ return "\n" + formattedQuery.replace(/^/gm, " ") + "\n ";
108
+ }
109
+ async function confirm(question, hint) {
110
+ const line = _readline.createInterface({
111
+ input: process.stdin,
112
+ output: process.stdout
113
+ });
114
+ return new Promise((resolve)=>{
115
+ line.question(question, (response)=>{
116
+ line.close();
117
+ resolve(response);
118
+ });
119
+ line.write(hint);
120
+ });
121
+ }
122
+ async function main() {
123
+ const timestamp = _CommandUtils.CommandUtils.getTimestamp(Date.now());
124
+ const extension = ".ts";
125
+ let dataSource = undefined;
126
+ try {
127
+ dataSource = await _CommandUtils.CommandUtils.loadDataSource(_path.default.resolve(process.cwd(), "dist/data-source.js"));
128
+ dataSource.setOptions({
129
+ synchronize: false,
130
+ migrationsRun: false,
131
+ dropSchema: false,
132
+ logging: false
133
+ });
134
+ await dataSource.initialize();
135
+ const hasPendingMigrations = await dataSource.showMigrations();
136
+ if (hasPendingMigrations) {
137
+ console.log(_chalk.default.yellow(`ATTENTION: you have pending migrations (${_chalk.default.blue(hasPendingMigrations)}). Running those first, before generating a new migration.`));
138
+ await dataSource.runMigrations({
139
+ transaction: "each"
140
+ });
141
+ console.log(_chalk.default.green(`Migrations successfully executed.`));
142
+ }
143
+ const upSqls = [], downSqls = [];
144
+ try {
145
+ const sqlInMemory = await dataSource.driver.createSchemaBuilder().log();
146
+ if (true) {
147
+ sqlInMemory.upQueries.forEach((upQuery)=>{
148
+ upQuery.query = prettifyQuery(upQuery.query);
149
+ });
150
+ sqlInMemory.downQueries.forEach((downQuery)=>{
151
+ downQuery.query = prettifyQuery(downQuery.query);
152
+ });
153
+ }
154
+ sqlInMemory.upQueries.forEach((upQuery)=>{
155
+ upSqls.push(" await queryRunner.query(`" + upQuery.query.replace(new RegExp("`", "g"), "\\`") + "`" + queryParams(upQuery.parameters) + ");");
156
+ });
157
+ sqlInMemory.downQueries.forEach((downQuery)=>{
158
+ downSqls.push(" await queryRunner.query(`" + downQuery.query.replace(new RegExp("`", "g"), "\\`") + "`" + queryParams(downQuery.parameters) + ");");
159
+ });
160
+ } finally{
161
+ await dataSource.destroy();
162
+ }
163
+ if (!upSqls.length) {
164
+ console.log(_chalk.default.green(`No changes in database schema were found`));
165
+ process.exit(0);
166
+ }
167
+ console.log(_chalk.default.green(`Migration ready to be saved...`));
168
+ console.log(_chalk.default.blue(upSqls.map((s)=>s).join("\n")));
169
+ let name;
170
+ while(!name){
171
+ name = (await confirm("Please provide a name for the migration: ", "Change"))?.trim();
172
+ if (name) break;
173
+ console.log(_chalk.default.red(`Name is required, try again`));
174
+ process.exit(1);
175
+ }
176
+ const fullPath = _path.default.resolve(process.cwd(), `src/migrations/${name}`);
177
+ const filename = timestamp + "-" + _path.default.basename(fullPath) + extension;
178
+ const fileContent = false ? getJavascriptTemplate(_path.default.basename(fullPath), timestamp, upSqls, downSqls.reverse()) : getTemplate(_path.default.basename(fullPath), timestamp, upSqls, downSqls.reverse());
179
+ const migrationFileName = _path.default.dirname(fullPath) + "/" + filename;
180
+ await _CommandUtils.CommandUtils.createFile(migrationFileName, fileContent);
181
+ console.log(_chalk.default.green(`Migration ${_chalk.default.blue(migrationFileName)} has been generated successfully.`));
182
+ } catch (err) {
183
+ _PlatformTools.PlatformTools.logCmdErr("Error during migration generation:", err);
184
+ process.exit(1);
185
+ }
186
+ }
187
+ let start = new Date().getTime();
188
+ main().then(()=>{
189
+ let end = new Date().getTime();
190
+ console.log("done", end - start, "ms");
191
+ process.exit(0);
192
+ });
193
+
194
+ //# sourceMappingURL=typeorm-generate.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../src/consoles/typeorm-generate.ts"],"names":["queryParams","parameters","length","JSON","stringify","getTemplate","name","timestamp","upSqls","downSqls","migrationName","camelCase","join","getJavascriptTemplate","prettifyQuery","query","formattedQuery","format","indent","replace","confirm","question","hint","line","readline","createInterface","input","process","stdin","output","stdout","Promise","resolve","response","close","write","main","CommandUtils","getTimestamp","Date","now","extension","dataSource","undefined","loadDataSource","path","cwd","setOptions","synchronize","migrationsRun","dropSchema","logging","initialize","hasPendingMigrations","showMigrations","console","log","chalk","yellow","blue","runMigrations","transaction","green","sqlInMemory","driver","createSchemaBuilder","upQueries","forEach","upQuery","downQueries","downQuery","push","RegExp","destroy","exit","map","s","trim","red","fullPath","filename","basename","fileContent","reverse","migrationFileName","dirname","createFile","err","PlatformTools","logCmdErr","start","getTime","then","end"],"mappings":"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"}
@@ -0,0 +1,48 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", {
3
+ value: true
4
+ });
5
+ const _PlatformTools = require("typeorm/platform/PlatformTools");
6
+ const _CommandUtils = require("typeorm/commands/CommandUtils");
7
+ const _path = _interop_require_default(require("path"));
8
+ function _interop_require_default(obj) {
9
+ return obj && obj.__esModule ? obj : {
10
+ default: obj
11
+ };
12
+ }
13
+ async function main() {
14
+ let dataSource = undefined;
15
+ try {
16
+ dataSource = await _CommandUtils.CommandUtils.loadDataSource(_path.default.resolve(process.cwd(), "dist/data-source.js"));
17
+ dataSource.setOptions({
18
+ subscribers: [],
19
+ synchronize: false,
20
+ migrationsRun: false,
21
+ dropSchema: false,
22
+ logging: [
23
+ "query",
24
+ "error",
25
+ "schema"
26
+ ]
27
+ });
28
+ await dataSource.initialize();
29
+ const options = {
30
+ transaction: dataSource.options.migrationsTransactionMode ?? "all"
31
+ };
32
+ options.transaction = "all";
33
+ await dataSource.runMigrations(options);
34
+ await dataSource.destroy();
35
+ } catch (err) {
36
+ _PlatformTools.PlatformTools.logCmdErr("Error during migration run:", err);
37
+ if (dataSource && dataSource.isInitialized) await dataSource.destroy();
38
+ process.exit(1);
39
+ }
40
+ }
41
+ let start = new Date().getTime();
42
+ main().then(()=>{
43
+ let end = new Date().getTime();
44
+ console.log("done", end - start, "ms");
45
+ process.exit(0);
46
+ });
47
+
48
+ //# sourceMappingURL=typeorm-migrate.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../src/consoles/typeorm-migrate.ts"],"names":["main","dataSource","undefined","CommandUtils","loadDataSource","path","resolve","process","cwd","setOptions","subscribers","synchronize","migrationsRun","dropSchema","logging","initialize","options","transaction","migrationsTransactionMode","runMigrations","destroy","err","PlatformTools","logCmdErr","isInitialized","exit","start","Date","getTime","then","end","console","log"],"mappings":";;;;+BAC8B;8BACD;+CACZ;;;;;;AAEjB,eAAeA;IACb,IAAIC,aAAqCC;IACzC,IAAI;QACFD,aAAa,MAAME,0BAAY,CAACC,cAAc,CAACC,aAAI,CAACC,OAAO,CAACC,QAAQC,GAAG,IAAI;QAC3EP,WAAWQ,UAAU,CAAC;YACpBC,aAAa,EAAE;YACfC,aAAa;YACbC,eAAe;YACfC,YAAY;YACZC,SAAS;gBAAC;gBAAS;gBAAS;aAAS;QACvC;QACA,MAAMb,WAAWc,UAAU;QAE3B,MAAMC,UAAU;YACdC,aAAahB,WAAWe,OAAO,CAACE,yBAAyB,IAAK;QAEhE;QACAF,QAAQC,WAAW,GAAG;QAEtB,MAAMhB,WAAWkB,aAAa,CAACH;QAC/B,MAAMf,WAAWmB,OAAO;IAC1B,EAAE,OAAOC,KAAK;QACZC,4BAAa,CAACC,SAAS,CAAC,+BAA+BF;QAEvD,IAAIpB,cAAcA,WAAWuB,aAAa,EAAE,MAAMvB,WAAWmB,OAAO;QACpEb,QAAQkB,IAAI,CAAC;IACf;AACF;AAEA,IAAIC,QAAQ,IAAIC,OAAOC,OAAO;AAC9B5B,OAAO6B,IAAI,CAAC;IACV,IAAIC,MAAM,IAAIH,OAAOC,OAAO;IAC5BG,QAAQC,GAAG,CAAC,QAAQF,MAAMJ,OAAO;IAGjCnB,QAAQkB,IAAI,CAAC;AACf"}
package/dist/container.js CHANGED
@@ -2,9 +2,17 @@
2
2
  Object.defineProperty(exports, "__esModule", {
3
3
  value: true
4
4
  });
5
- Object.defineProperty(exports, "configureContainer", {
6
- enumerable: true,
7
- get: function() {
5
+ function _export(target, all) {
6
+ for(var name in all)Object.defineProperty(target, name, {
7
+ enumerable: true,
8
+ get: all[name]
9
+ });
10
+ }
11
+ _export(exports, {
12
+ config: function() {
13
+ return config;
14
+ },
15
+ configureContainer: function() {
8
16
  return configureContainer;
9
17
  }
10
18
  });
@@ -15,6 +23,7 @@ const _awilix = require("awilix");
15
23
  const _toadscheduler = require("toad-scheduler");
16
24
  const _containertokens = require("./container.tokens");
17
25
  const _printerservice = require("./services/printer.service");
26
+ const _printerservice1 = require("./services/orm/printer.service");
18
27
  const _settingsstore = require("./state/settings.store");
19
28
  const _settingsservice = require("./services/settings.service");
20
29
  const _serverreleaseservice = require("./services/core/server-release.service");
@@ -30,6 +39,7 @@ const _printerfilesstore = require("./state/printer-files.store");
30
39
  const _eventemitter = require("./handlers/event-emitter");
31
40
  const _serverconstants = require("./server.constants");
32
41
  const _printerfilesservice = require("./services/printer-files.service");
42
+ const _printerfilesservice1 = require("./services/orm/printer-files.service");
33
43
  const _softwareupdatetask = require("./tasks/software-update.task");
34
44
  const _loggerfactory = require("./handlers/logger-factory");
35
45
  const _multerservice = require("./services/core/multer.service");
@@ -37,12 +47,16 @@ const _fileuploadtrackercache = require("./state/file-upload-tracker.cache");
37
47
  const _serverhost = require("./server.host");
38
48
  const _boottask = require("./tasks/boot.task");
39
49
  const _userservice = require("./services/authentication/user.service");
50
+ const _userservice1 = require("./services/orm/user.service");
40
51
  const _roleservice = require("./services/authentication/role.service");
52
+ const _roleservice1 = require("./services/orm/role.service");
41
53
  const _tasks = require("./tasks");
42
54
  const _permissionservice = require("./services/authentication/permission.service");
55
+ const _permissionservice1 = require("./services/orm/permission.service");
43
56
  const _printerfilecleantask = require("./tasks/printer-file-clean.task");
44
57
  const _authorizationconstants = require("./constants/authorization.constants");
45
58
  const _customgcodeservice = require("./services/custom-gcode.service");
59
+ const _customgcodeservice1 = require("./services/orm/custom-gcode.service");
46
60
  const _printerwebsocketrestoretask = require("./tasks/printer-websocket-restore.task");
47
61
  const _pluginfirmwareupdateservice = require("./services/octoprint/plugin-firmware-update.service");
48
62
  const _pluginrepositorycache = require("./services/octoprint/plugin-repository.cache");
@@ -51,6 +65,7 @@ const _influxdbv2baseservice = require("./services/influxdb-v2/influx-db-v2-base
51
65
  const _configservice = require("./services/core/config.service");
52
66
  const _printcompletionsocketiotask = require("./tasks/print-completion.socketio.task");
53
67
  const _printcompletionservice = require("./services/print-completion.service");
68
+ const _printcompletionservice1 = require("./services/orm/print-completion.service");
54
69
  const _socketiogateway = require("./state/socket-io.gateway");
55
70
  const _clientbundleservice = require("./services/core/client-bundle.service");
56
71
  const _floorservice = require("./services/floor.service");
@@ -66,38 +81,61 @@ const _testprintersocketstore = require("./state/test-printer-socket.store");
66
81
  const _printereventscache = require("./state/printer-events.cache");
67
82
  const _logsmanagerservice = require("./services/core/logs-manager.service");
68
83
  const _camerastreamservice = require("./services/camera-stream.service");
84
+ const _camerastreamservice1 = require("./services/orm/camera-stream.service");
69
85
  const _jwtservice = require("./services/authentication/jwt.service");
70
86
  const _authservice = require("./services/authentication/auth.service");
71
87
  const _refreshtokenservice = require("./services/authentication/refresh-token.service");
88
+ const _pluginthrottling = require("@octokit/plugin-throttling");
89
+ const _printerstateupdatepolltask = require("./tasks/printer-state-update-poll.task");
90
+ const _printerconnectioncache = require("./state/printer-connection.cache");
91
+ const _refreshtokenservice1 = require("./services/orm/refresh-token.service");
92
+ const _settingsservice1 = require("./services/orm/settings.service");
93
+ const _floorservice1 = require("./services/orm/floor.service");
94
+ const _floorpositionservice = require("./services/orm/floor-position.service");
95
+ const _typeormservice = require("./services/typeorm/typeorm.service");
96
+ const _userroleservice = require("./services/orm/user-role.service");
72
97
  function _interop_require_default(obj) {
73
98
  return obj && obj.__esModule ? obj : {
74
99
  default: obj
75
100
  };
76
101
  }
77
- function configureContainer() {
102
+ function config(key, experimentalMode, serviceTypeorm, serviceMongoose) {
103
+ return {
104
+ [key]: experimentalMode ? serviceTypeorm : serviceMongoose
105
+ };
106
+ }
107
+ function configureContainer(isSqlite = false) {
78
108
  const container = (0, _awilix.createContainer)({
79
109
  injectionMode: _awilix.InjectionMode.PROXY
80
110
  });
81
- const isSqlite = false;
82
111
  const di = _containertokens.DITokens;
83
112
  container.register({
84
113
  [di.serverTasks]: (0, _awilix.asValue)(_tasks.ServerTasks),
85
114
  [di.isTypeormMode]: (0, _awilix.asValue)(isSqlite),
86
- [di.appDefaultRole]: (0, _awilix.asValue)(_authorizationconstants.ROLES.ADMIN),
115
+ [di.appDefaultRole]: (0, _awilix.asValue)(_authorizationconstants.ROLES.GUEST),
87
116
  [di.appDefaultRoleNoLogin]: (0, _awilix.asValue)(_authorizationconstants.ROLES.ADMIN),
88
117
  [di.serverVersion]: (0, _awilix.asFunction)(()=>{
89
118
  return process.env[_serverconstants.AppConstants.VERSION_KEY];
90
119
  }),
91
120
  [di.socketFactory]: (0, _awilix.asClass)(_socketfactory.SocketFactory).transient(),
121
+ ...config(di.typeormService, isSqlite, (0, _awilix.asClass)(_typeormservice.TypeormService).singleton(), (0, _awilix.asValue)(null)),
122
+ ...config(di.settingsService, isSqlite, (0, _awilix.asClass)(_settingsservice1.SettingsService2), (0, _awilix.asClass)(_settingsservice.SettingsService)),
123
+ ...config(di.floorService, isSqlite, (0, _awilix.asClass)(_floorservice1.FloorService).singleton(), (0, _awilix.asClass)(_floorservice.FloorService).singleton()),
124
+ ...config(di.floorPositionService, isSqlite, (0, _awilix.asClass)(_floorpositionservice.FloorPositionService).singleton(), (0, _awilix.asValue)(null)),
125
+ ...config(di.cameraStreamService, isSqlite, (0, _awilix.asClass)(_camerastreamservice1.CameraStreamService).singleton(), (0, _awilix.asClass)(_camerastreamservice.CameraStreamService).singleton()),
126
+ ...config(di.printerService, isSqlite, (0, _awilix.asClass)(_printerservice1.PrinterService), (0, _awilix.asClass)(_printerservice.PrinterService)),
127
+ ...config(di.printerFilesService, isSqlite, (0, _awilix.asClass)(_printerfilesservice1.PrinterFilesService), (0, _awilix.asClass)(_printerfilesservice.PrinterFilesService)),
128
+ ...config(di.refreshTokenService, isSqlite, (0, _awilix.asClass)(_refreshtokenservice1.RefreshTokenService).singleton(), (0, _awilix.asClass)(_refreshtokenservice.RefreshTokenService).singleton()),
129
+ ...config(di.userService, isSqlite, (0, _awilix.asClass)(_userservice1.UserService).singleton(), (0, _awilix.asClass)(_userservice.UserService).singleton()),
130
+ ...config(di.userRoleService, isSqlite, (0, _awilix.asClass)(_userroleservice.UserRoleService).singleton(), (0, _awilix.asValue)(null)),
131
+ ...config(di.roleService, isSqlite, (0, _awilix.asClass)(_roleservice1.RoleService).singleton(), (0, _awilix.asClass)(_roleservice.RoleService).singleton()),
132
+ ...config(di.permissionService, isSqlite, (0, _awilix.asClass)(_permissionservice1.PermissionService).singleton(), (0, _awilix.asClass)(_permissionservice.PermissionService).singleton()),
133
+ ...config(di.customGCodeService, isSqlite, (0, _awilix.asClass)(_customgcodeservice1.CustomGcodeService).singleton(), (0, _awilix.asClass)(_customgcodeservice.CustomGcodeService).singleton()),
134
+ ...config(di.printCompletionService, isSqlite, (0, _awilix.asClass)(_printcompletionservice1.PrintCompletionService).singleton(), (0, _awilix.asClass)(_printcompletionservice.PrintCompletionService).singleton()),
92
135
  [di.serverHost]: (0, _awilix.asClass)(_serverhost.ServerHost).singleton(),
93
136
  [di.settingsStore]: (0, _awilix.asClass)(_settingsstore.SettingsStore).singleton(),
94
- [di.settingsService]: (0, _awilix.asClass)(_settingsservice.SettingsService),
95
137
  [di.configService]: (0, _awilix.asClass)(_configservice.ConfigService),
96
138
  [di.authService]: (0, _awilix.asClass)(_authservice.AuthService).singleton(),
97
- [di.refreshTokenService]: (0, _awilix.asClass)(_refreshtokenservice.RefreshTokenService).singleton(),
98
- [di.userService]: (0, _awilix.asClass)(_userservice.UserService),
99
- [di.roleService]: (0, _awilix.asClass)(_roleservice.RoleService).singleton(),
100
- [di.permissionService]: (0, _awilix.asClass)(_permissionservice.PermissionService).singleton(),
101
139
  [di.jwtService]: (0, _awilix.asClass)(_jwtservice.JwtService).singleton(),
102
140
  [di.loggerFactory]: (0, _awilix.asFunction)(_loggerfactory.LoggerFactory).transient(),
103
141
  [di.taskManagerService]: (0, _awilix.asClass)(_taskmanagerservice.TaskManagerService).singleton(),
@@ -110,8 +148,19 @@ function configureContainer() {
110
148
  [di.githubService]: (0, _awilix.asClass)(_githubservice.GithubService),
111
149
  [di.octokitService]: (0, _awilix.asFunction)((cradle)=>{
112
150
  const config = cradle.configService;
113
- return new _octokit.Octokit({
114
- auth: config.get(_serverconstants.AppConstants.GITHUB_PAT)
151
+ const CustomOctoKit = _octokit.Octokit.plugin(_pluginthrottling.throttling);
152
+ return new CustomOctoKit({
153
+ auth: config.get(_serverconstants.AppConstants.GITHUB_PAT),
154
+ throttle: {
155
+ onRateLimit: (retryAfter, options, octokit, retryCount)=>{
156
+ const logger = (0, _loggerfactory.LoggerFactory)()("OctoKitThrottle");
157
+ logger.warn(`Request quota exhaustedd for request ${options.method} ${options.url}`);
158
+ },
159
+ onSecondaryRateLimit: (retryAfter, options, octokit)=>{
160
+ const logger = (0, _loggerfactory.LoggerFactory)()("OctoKitThrottle");
161
+ logger.warn(`SecondaryRateLimit detected for request ${options.method} ${options.url}`);
162
+ }
163
+ }
115
164
  });
116
165
  }),
117
166
  [di.clientBundleService]: (0, _awilix.asClass)(_clientbundleservice.ClientBundleService),
@@ -123,13 +172,8 @@ function configureContainer() {
123
172
  })),
124
173
  [di.socketIoGateway]: (0, _awilix.asClass)(_socketiogateway.SocketIoGateway).singleton(),
125
174
  [di.multerService]: (0, _awilix.asClass)(_multerservice.MulterService).singleton(),
126
- [di.printerService]: (0, _awilix.asClass)(_printerservice.PrinterService),
127
- [di.printerFilesService]: (0, _awilix.asClass)(_printerfilesservice.PrinterFilesService),
128
- [di.floorService]: (0, _awilix.asClass)(_floorservice.FloorService).singleton(),
129
175
  [di.yamlService]: (0, _awilix.asClass)(_yamlservice.YamlService),
130
- [di.printCompletionService]: (0, _awilix.asClass)(_printcompletionservice.PrintCompletionService).singleton(),
131
176
  [di.octoPrintApiService]: (0, _awilix.asClass)(_octoprintapiservice.OctoPrintApiService).singleton(),
132
- [di.cameraStreamService]: (0, _awilix.asClass)(_camerastreamservice.CameraStreamService),
133
177
  [di.batchCallService]: (0, _awilix.asClass)(_batchcallservice.BatchCallService).singleton(),
134
178
  [di.pluginFirmwareUpdateService]: (0, _awilix.asClass)(_pluginfirmwareupdateservice.PluginFirmwareUpdateService).singleton(),
135
179
  [di.octoPrintSockIoAdapter]: (0, _awilix.asClass)(_octoprintsockioadapter.OctoPrintSockIoAdapter).transient(),
@@ -139,10 +183,10 @@ function configureContainer() {
139
183
  [di.fileUploadTrackerCache]: (0, _awilix.asClass)(_fileuploadtrackercache.FileUploadTrackerCache).singleton(),
140
184
  [di.printerFilesStore]: (0, _awilix.asClass)(_printerfilesstore.PrinterFilesStore).singleton(),
141
185
  [di.printerCache]: (0, _awilix.asClass)(_printercache.PrinterCache).singleton(),
186
+ [di.printerConnectionCache]: (0, _awilix.asClass)(_printerconnectioncache.PrinterConnectionCache).singleton(),
142
187
  [di.printerEventsCache]: (0, _awilix.asClass)(_printereventscache.PrinterEventsCache).singleton(),
143
188
  [di.printerSocketStore]: (0, _awilix.asClass)(_printersocketstore.PrinterSocketStore).singleton(),
144
189
  [di.testPrinterSocketStore]: (0, _awilix.asClass)(_testprintersocketstore.TestPrinterSocketStore).singleton(),
145
- [di.customGCodeService]: (0, _awilix.asClass)(_customgcodeservice.CustomGcodeService),
146
190
  [di.influxDbV2BaseService]: (0, _awilix.asClass)(_influxdbv2baseservice.InfluxDbV2BaseService),
147
191
  [di.bootTask]: (0, _awilix.asClass)(_boottask.BootTask),
148
192
  [di.softwareUpdateTask]: (0, _awilix.asClass)(_softwareupdatetask.SoftwareUpdateTask),
@@ -151,6 +195,7 @@ function configureContainer() {
151
195
  [di.printCompletionSocketIoTask]: (0, _awilix.asClass)(_printcompletionsocketiotask.PrintCompletionSocketIoTask).singleton(),
152
196
  [di.printerWebsocketTask]: (0, _awilix.asClass)(_printerwebsockettask.PrinterWebsocketTask).singleton(),
153
197
  [di.printerWebsocketRestoreTask]: (0, _awilix.asClass)(_printerwebsocketrestoretask.PrinterWebsocketRestoreTask).singleton(),
198
+ [di.printerStateUpdatePollTask]: (0, _awilix.asClass)(_printerstateupdatepolltask.PrinterStateUpdatePollTask).singleton(),
154
199
  [di.printerFileCleanTask]: (0, _awilix.asClass)(_printerfilecleantask.PrinterFileCleanTask).singleton()
155
200
  });
156
201
  return container;
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/container.ts"],"names":["configureContainer","container","createContainer","injectionMode","InjectionMode","PROXY","isSqlite","di","DITokens","register","serverTasks","asValue","ServerTasks","isTypeormMode","appDefaultRole","ROLES","ADMIN","appDefaultRoleNoLogin","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","socketFactory","asClass","SocketFactory","transient","serverHost","ServerHost","singleton","settingsStore","SettingsStore","settingsService","SettingsService","configService","ConfigService","authService","AuthService","refreshTokenService","RefreshTokenService","userService","UserService","roleService","RoleService","permissionService","PermissionService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","cacheManager","configureCacheManager","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","serverUpdateService","ServerUpdateService","githubService","GithubService","octokitService","cradle","config","Octokit","auth","get","GITHUB_PAT","clientBundleService","ClientBundleService","logDumpService","LogDumpService","simpleGitService","simpleGit","httpClient","axios","create","maxBodyLength","maxContentLength","socketIoGateway","SocketIoGateway","multerService","MulterService","printerService","PrinterService","printerFilesService","PrinterFilesService","floorService","FloorService","yamlService","YamlService","printCompletionService","PrintCompletionService","octoPrintApiService","OctoPrintApiService","cameraStreamService","CameraStreamService","batchCallService","BatchCallService","pluginFirmwareUpdateService","PluginFirmwareUpdateService","octoPrintSockIoAdapter","OctoPrintSockIoAdapter","floorStore","FloorStore","pluginRepositoryCache","PluginRepositoryCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","customGCodeService","CustomGcodeService","influxDbV2BaseService","InfluxDbV2BaseService","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printCompletionSocketIoTask","PrintCompletionSocketIoTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerFileCleanTask","PrinterFileCleanTask"],"mappings":"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"}
1
+ {"version":3,"sources":["../src/container.ts"],"names":["config","configureContainer","key","experimentalMode","serviceTypeorm","serviceMongoose","isSqlite","container","createContainer","injectionMode","InjectionMode","PROXY","di","DITokens","register","serverTasks","asValue","ServerTasks","isTypeormMode","appDefaultRole","ROLES","GUEST","appDefaultRoleNoLogin","ADMIN","serverVersion","asFunction","process","env","AppConstants","VERSION_KEY","socketFactory","asClass","SocketFactory","transient","typeormService","TypeormService","singleton","settingsService","SettingsService2","SettingsService","floorService","FloorService2","FloorService","floorPositionService","FloorPositionService","cameraStreamService","CameraService2","CameraService","printerService","PrinterService2","PrinterService","printerFilesService","PrinterFilesService2","PrinterFilesService","refreshTokenService","RefreshToken2","RefreshTokenService","userService","UserService2","UserService","userRoleService","UserRoleService","roleService","RoleService2","RoleService","permissionService","PermissionService2","PermissionService","customGCodeService","CustomGcodeService2","CustomGcodeService","printCompletionService","PrintCompletionService2","PrintCompletionService","serverHost","ServerHost","settingsStore","SettingsStore","configService","ConfigService","authService","AuthService","jwtService","JwtService","loggerFactory","LoggerFactory","taskManagerService","TaskManagerService","toadScheduler","ToadScheduler","eventEmitter2","configureEventEmitter","cacheManager","configureCacheManager","serverReleaseService","ServerReleaseService","monsterPiService","MonsterPiService","serverUpdateService","ServerUpdateService","githubService","GithubService","octokitService","cradle","CustomOctoKit","Octokit","plugin","throttling","auth","get","GITHUB_PAT","throttle","onRateLimit","retryAfter","options","octokit","retryCount","logger","warn","method","url","onSecondaryRateLimit","clientBundleService","ClientBundleService","logDumpService","LogDumpService","simpleGitService","simpleGit","httpClient","axios","create","maxBodyLength","maxContentLength","socketIoGateway","SocketIoGateway","multerService","MulterService","yamlService","YamlService","octoPrintApiService","OctoPrintApiService","batchCallService","BatchCallService","pluginFirmwareUpdateService","PluginFirmwareUpdateService","octoPrintSockIoAdapter","OctoPrintSockIoAdapter","floorStore","FloorStore","pluginRepositoryCache","PluginRepositoryCache","fileCache","FileCache","fileUploadTrackerCache","FileUploadTrackerCache","printerFilesStore","PrinterFilesStore","printerCache","PrinterCache","printerConnectionCache","PrinterConnectionCache","printerEventsCache","PrinterEventsCache","printerSocketStore","PrinterSocketStore","testPrinterSocketStore","TestPrinterSocketStore","influxDbV2BaseService","InfluxDbV2BaseService","bootTask","BootTask","softwareUpdateTask","SoftwareUpdateTask","socketIoTask","SocketIoTask","clientDistDownloadTask","ClientDistDownloadTask","printCompletionSocketIoTask","PrintCompletionSocketIoTask","printerWebsocketTask","PrinterWebsocketTask","printerWebsocketRestoreTask","PrinterWebsocketRestoreTask","printerStateUpdatePollTask","PrinterStateUpdatePollTask","printerFileCleanTask","PrinterFileCleanTask"],"mappings":"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"}
@@ -58,6 +58,7 @@ const DITokens = {
58
58
  customGCodeService: "customGCodeService",
59
59
  settingsStore: "settingsStore",
60
60
  printerCache: "printerCache",
61
+ printerConnectionCache: "printerConnectionCache",
61
62
  printerEventsCache: "printerEventsCache",
62
63
  printerSocketStore: "printerSocketStore",
63
64
  testPrinterSocketStore: "testPrinterSocketStore",
@@ -73,6 +74,7 @@ const DITokens = {
73
74
  socketIoTask: "socketIoTask",
74
75
  printCompletionSocketIoTask: "printCompletionSocketIoTask",
75
76
  printerWebsocketTask: "printerWebsocketTask",
77
+ printerStateUpdatePollTask: "printerStateUpdatePollTask",
76
78
  printerWebsocketRestoreTask: "printerWebsocketRestoreTask",
77
79
  printerFileCleanTask: "printerFileCleanTask"
78
80
  };
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","serverVersion","isTypeormMode","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","loggerFactory","httpClient","socketIoGateway","simpleGitService","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","cacheManager","printerService","floorPositionService","printCompletionService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","serverUpdateService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","octoPrintApiService","cameraStreamService","socketFactory","batchCallService","pluginRepositoryCache","pluginFirmwareUpdateService","influxDbV2BaseService","systemInfoBundleService","printerFilesService","customGCodeService","settingsStore","printerCache","printerEventsCache","printerSocketStore","testPrinterSocketStore","printerFilesStore","octoPrintSockIoAdapter","floorStore","fileCache","fileUploadTrackerCache","serverTasks","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerWebsocketRestoreTask","printerFileCleanTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IAEtBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,eAAe;IACfC,YAAY;IACZC,iBAAiB;IACjBC,kBAAkB;IAClBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,cAAc;IACdC,gBAAgB;IAChBC,sBAAsB;IACtBC,wBAAwB;IACxBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,qBAAqB;IACrBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,qBAAqB;IACrBC,qBAAqB;IACrBC,eAAe;IACfC,kBAAkB;IAClBC,uBAAuB;IACvBC,6BAA6B;IAC7BC,uBAAuB;IACvBC,yBAAyB;IACzBC,qBAAqB;IACrBC,oBAAoB;IAEpBC,eAAe;IACfC,cAAc;IACdC,oBAAoB;IACpBC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,wBAAwB;IAExBC,YAAY;IACZC,WAAW;IACXC,wBAAwB;IAExBC,aAAa;IACbC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,6BAA6B;IAC7BC,sBAAsB;IACtBC,6BAA6B;IAC7BC,sBAAsB;AACxB"}
1
+ {"version":3,"sources":["../src/container.tokens.ts"],"names":["DITokens","serverVersion","isTypeormMode","appDefaultRole","appDefaultRoleNoLogin","typeormService","serverHost","loggerFactory","httpClient","socketIoGateway","simpleGitService","multerService","configService","taskManagerService","toadScheduler","eventEmitter2","cacheManager","printerService","floorPositionService","printCompletionService","floorService","yamlService","settingsService","serverReleaseService","monsterPiService","serverUpdateService","githubService","octokitService","clientBundleService","logDumpService","userTokenService","authService","refreshTokenService","userService","userRoleService","permissionService","jwtService","roleService","octoPrintApiService","cameraStreamService","socketFactory","batchCallService","pluginRepositoryCache","pluginFirmwareUpdateService","influxDbV2BaseService","systemInfoBundleService","printerFilesService","customGCodeService","settingsStore","printerCache","printerConnectionCache","printerEventsCache","printerSocketStore","testPrinterSocketStore","printerFilesStore","octoPrintSockIoAdapter","floorStore","fileCache","fileUploadTrackerCache","serverTasks","bootTask","softwareUpdateTask","clientDistDownloadTask","socketIoTask","printCompletionSocketIoTask","printerWebsocketTask","printerStateUpdatePollTask","printerWebsocketRestoreTask","printerFileCleanTask"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,WAAW;IAEtBC,eAAe;IACfC,eAAe;IACfC,gBAAgB;IAChBC,uBAAuB;IACvBC,gBAAgB;IAEhBC,YAAY;IACZC,eAAe;IACfC,YAAY;IACZC,iBAAiB;IACjBC,kBAAkB;IAClBC,eAAe;IACfC,eAAe;IACfC,oBAAoB;IACpBC,eAAe;IACfC,eAAe;IACfC,cAAc;IACdC,gBAAgB;IAChBC,sBAAsB;IACtBC,wBAAwB;IACxBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,sBAAsB;IACtBC,kBAAkB;IAClBC,qBAAqB;IACrBC,eAAe;IACfC,gBAAgB;IAChBC,qBAAqB;IACrBC,gBAAgB;IAChBC,kBAAkB;IAClBC,aAAa;IACbC,qBAAqB;IACrBC,aAAa;IACbC,iBAAiB;IACjBC,mBAAmB;IACnBC,YAAY;IACZC,aAAa;IACbC,qBAAqB;IACrBC,qBAAqB;IACrBC,eAAe;IACfC,kBAAkB;IAClBC,uBAAuB;IACvBC,6BAA6B;IAC7BC,uBAAuB;IACvBC,yBAAyB;IACzBC,qBAAqB;IACrBC,oBAAoB;IAEpBC,eAAe;IACfC,cAAc;IACdC,wBAAwB;IACxBC,oBAAoB;IACpBC,oBAAoB;IACpBC,wBAAwB;IACxBC,mBAAmB;IACnBC,wBAAwB;IAExBC,YAAY;IACZC,WAAW;IACXC,wBAAwB;IAExBC,aAAa;IACbC,UAAU;IACVC,oBAAoB;IACpBC,wBAAwB;IACxBC,cAAc;IACdC,6BAA6B;IAC7BC,sBAAsB;IACtBC,4BAA4B;IAC5BC,6BAA6B;IAC7BC,sBAAsB;AACxB"}
@@ -29,6 +29,11 @@ class BatchCallController {
29
29
  this.batchCallService = batchCallService;
30
30
  this.isTypeormMode = isTypeormMode;
31
31
  }
32
+ async batchSettingsGet(req, res) {
33
+ const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrinterRules)(this.isTypeormMode));
34
+ const results = await this.batchCallService.batchSettingsGet(printerIds);
35
+ res.send(results);
36
+ }
32
37
  async batchConnectUsb(req, res) {
33
38
  const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrinterRules)(this.isTypeormMode));
34
39
  const results = await this.batchCallService.batchConnectUsb(printerIds);
@@ -36,13 +41,18 @@ class BatchCallController {
36
41
  }
37
42
  async batchConnectSocket(req, res) {
38
43
  const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrinterRules)(this.isTypeormMode));
39
- await this.batchCallService.batchConnectSocket(printerIds);
44
+ this.batchCallService.batchConnectSocket(printerIds);
40
45
  res.send({});
41
46
  }
42
- async batchReprintFiles(req, res) {
47
+ async getLastPrintedFiles(req, res) {
43
48
  const { printerIds } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrinterRules)(this.isTypeormMode));
44
- const results = await this.batchCallService.batchReprintCalls(printerIds);
45
- res.send(results);
49
+ const files = await this.batchCallService.getBatchPrinterReprintFile(printerIds);
50
+ res.send(files);
51
+ }
52
+ async batchReprintFiles(req, res) {
53
+ const { prints } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.executeBatchRePrinterRule)(this.isTypeormMode));
54
+ const files = await this.batchCallService.batchReprintCalls(prints);
55
+ res.send(files);
46
56
  }
47
57
  async batchTogglePrintersEnabled(req, res) {
48
58
  const { printerIds, enabled } = await (0, _validators.validateInput)(req.body, (0, _batchcontrollervalidation.batchPrintersEnabledRules)(this.isTypeormMode));
@@ -56,6 +66,6 @@ const _default = (0, _awilixexpress.createController)(BatchCallController).prefi
56
66
  _authorizationconstants.ROLES.ADMIN,
57
67
  _authorizationconstants.ROLES.OPERATOR
58
68
  ])
59
- ]).post("/connect/usb", "batchConnectUsb").post("/connect/socket", "batchConnectSocket").post("/reprint", "batchReprintFiles").post("/toggle-enabled", "batchTogglePrintersEnabled");
69
+ ]).post("/settings/get", "batchSettingsGet").post("/connect/usb", "batchConnectUsb").post("/connect/socket", "batchConnectSocket").post("/reprint/list", "getLastPrintedFiles").post("/reprint/execute", "batchReprintFiles").post("/toggle-enabled", "batchTogglePrintersEnabled");
60
70
 
61
71
  //# sourceMappingURL=batch-call.controller.js.map