@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.
- package/.gitattributes +2 -0
- package/.yarn/install-state.gz +0 -0
- package/.yarn/releases/yarn-4.1.0.cjs +893 -0
- package/.yarnrc.yml +4 -0
- package/README.md +1 -1
- package/dist/consoles/sqlite-torm.js +31 -0
- package/dist/consoles/sqlite-torm.js.map +1 -0
- package/dist/consoles/typeorm-generate.js +194 -0
- package/dist/consoles/typeorm-generate.js.map +1 -0
- package/dist/consoles/typeorm-migrate.js +48 -0
- package/dist/consoles/typeorm-migrate.js.map +1 -0
- package/dist/container.js +64 -19
- package/dist/container.js.map +1 -1
- package/dist/container.tokens.js +2 -0
- package/dist/container.tokens.js.map +1 -1
- package/dist/controllers/batch-call.controller.js +15 -5
- package/dist/controllers/batch-call.controller.js.map +1 -1
- package/dist/controllers/dto/update-client-dist.dto.js +38 -0
- package/dist/controllers/dto/update-client-dist.dto.js.map +1 -0
- package/dist/controllers/printer-files.controller.js +2 -8
- package/dist/controllers/printer-files.controller.js.map +1 -1
- package/dist/controllers/printer.controller.js +2 -1
- package/dist/controllers/printer.controller.js.map +1 -1
- package/dist/controllers/server-private.controller.js +25 -6
- package/dist/controllers/server-private.controller.js.map +1 -1
- package/dist/controllers/validation/batch-controller.validation.js +9 -0
- package/dist/controllers/validation/batch-controller.validation.js.map +1 -1
- package/dist/data-source.js +66 -0
- package/dist/data-source.js.map +1 -0
- package/dist/entities/camera-stream.entity.js +94 -0
- package/dist/entities/camera-stream.entity.js.map +1 -0
- package/dist/entities/custom-gcode.entity.js +50 -0
- package/dist/entities/custom-gcode.entity.js.map +1 -0
- package/dist/entities/floor-position.entity.js +78 -0
- package/dist/entities/floor-position.entity.js.map +1 -0
- package/dist/entities/floor.entity.js +53 -0
- package/dist/entities/floor.entity.js.map +1 -0
- package/dist/entities/index.js +58 -0
- package/dist/entities/index.js.map +1 -0
- package/dist/entities/permission.entity.js +38 -0
- package/dist/entities/permission.entity.js.map +1 -0
- package/dist/entities/print-completion.entity.js +91 -0
- package/dist/entities/print-completion.entity.js.map +1 -0
- package/dist/entities/printer-file.entity.js +140 -0
- package/dist/entities/printer-file.entity.js.map +1 -0
- package/dist/entities/printer.entity.js +105 -0
- package/dist/entities/printer.entity.js.map +1 -0
- package/dist/entities/refresh-token.entity.js +70 -0
- package/dist/entities/refresh-token.entity.js.map +1 -0
- package/dist/entities/role.entity.js +46 -0
- package/dist/entities/role.entity.js.map +1 -0
- package/dist/entities/settings.entity.js +89 -0
- package/dist/entities/settings.entity.js.map +1 -0
- package/dist/entities/user-role.entity.js +70 -0
- package/dist/entities/user-role.entity.js.map +1 -0
- package/dist/entities/user.entity.js +90 -0
- package/dist/entities/user.entity.js.map +1 -0
- package/dist/middleware/exception.filter.js +2 -1
- package/dist/middleware/exception.filter.js.map +1 -1
- package/dist/middleware/passport.js.map +1 -1
- package/dist/migrations/1706829146617-InitSqlite.js +670 -0
- package/dist/migrations/1706829146617-InitSqlite.js.map +1 -0
- package/dist/models/Floor.js.map +1 -1
- package/dist/models/PrinterFile.js +4 -0
- package/dist/models/PrinterFile.js.map +1 -1
- package/dist/server.constants.js +4 -2
- package/dist/server.constants.js.map +1 -1
- package/dist/server.core.js +10 -1
- package/dist/server.core.js.map +1 -1
- package/dist/server.host.js +11 -3
- package/dist/server.host.js.map +1 -1
- package/dist/services/batch-call.service.js +67 -20
- package/dist/services/batch-call.service.js.map +1 -1
- package/dist/services/core/client-bundle.service.js +98 -27
- package/dist/services/core/client-bundle.service.js.map +1 -1
- package/dist/services/core/github.service.js +18 -14
- package/dist/services/core/github.service.js.map +1 -1
- package/dist/services/core/task-manager.service.js +1 -1
- package/dist/services/core/task-manager.service.js.map +1 -1
- package/dist/services/core/yaml.service.js.map +1 -1
- package/dist/services/floor.service.js +1 -1
- package/dist/services/floor.service.js.map +1 -1
- package/dist/services/interfaces/printer-file.dto.js +29 -3
- package/dist/services/interfaces/printer-file.dto.js.map +1 -1
- package/dist/services/octoprint/dto/connection-state.dto.js +0 -25
- package/dist/services/octoprint/dto/connection-state.dto.js.map +1 -1
- package/dist/services/octoprint/dto/connection.dto.js +6 -0
- package/dist/services/octoprint/dto/connection.dto.js.map +1 -0
- package/dist/services/octoprint/dto/octoprint-event.dto.js.map +1 -1
- package/dist/services/octoprint/models/octoprint-file.dto.js +6 -0
- package/dist/services/octoprint/models/octoprint-file.dto.js.map +1 -0
- package/dist/services/octoprint/octoprint-api.routes.js +9 -3
- package/dist/services/octoprint/octoprint-api.routes.js.map +1 -1
- package/dist/services/octoprint/octoprint-api.service.js +17 -2
- package/dist/services/octoprint/octoprint-api.service.js.map +1 -1
- package/dist/services/octoprint/octoprint-sockio.adapter.js +53 -45
- package/dist/services/octoprint/octoprint-sockio.adapter.js.map +1 -1
- package/dist/services/octoprint/utils/file.utils.js +44 -0
- package/dist/services/octoprint/utils/file.utils.js.map +1 -0
- package/dist/services/orm/base.service.js +3 -0
- package/dist/services/orm/base.service.js.map +1 -1
- package/dist/services/orm/camera-stream.service.js +25 -0
- package/dist/services/orm/camera-stream.service.js.map +1 -0
- package/dist/services/orm/custom-gcode.service.js +42 -0
- package/dist/services/orm/custom-gcode.service.js.map +1 -0
- package/dist/services/orm/floor-position.service.js +55 -0
- package/dist/services/orm/floor-position.service.js.map +1 -0
- package/dist/services/orm/floor.service.js +122 -0
- package/dist/services/orm/floor.service.js.map +1 -0
- package/dist/services/orm/permission.service.js +77 -0
- package/dist/services/orm/permission.service.js.map +1 -0
- package/dist/services/orm/print-completion.service.js +90 -0
- package/dist/services/orm/print-completion.service.js.map +1 -0
- package/dist/services/orm/printer-files.service.js +123 -0
- package/dist/services/orm/printer-files.service.js.map +1 -0
- package/dist/services/orm/printer.service.js +145 -0
- package/dist/services/orm/printer.service.js.map +1 -0
- package/dist/services/orm/refresh-token.service.js +107 -0
- package/dist/services/orm/refresh-token.service.js.map +1 -0
- package/dist/services/orm/role.service.js +131 -0
- package/dist/services/orm/role.service.js.map +1 -0
- package/dist/services/orm/settings.service.js +208 -0
- package/dist/services/orm/settings.service.js.map +1 -0
- package/dist/services/orm/user-role.service.js +55 -0
- package/dist/services/orm/user-role.service.js.map +1 -0
- package/dist/services/orm/user.service.js +146 -0
- package/dist/services/orm/user.service.js.map +1 -0
- package/dist/services/orm-migration.service.js +20 -0
- package/dist/services/orm-migration.service.js.map +1 -0
- package/dist/services/printer-files.service.js +3 -0
- package/dist/services/printer-files.service.js.map +1 -1
- package/dist/services/typeorm/typeorm.service.js +48 -0
- package/dist/services/typeorm/typeorm.service.js.map +1 -0
- package/dist/state/file.cache.js +2 -9
- package/dist/state/file.cache.js.map +1 -1
- package/dist/state/printer-connection.cache.js +21 -0
- package/dist/state/printer-connection.cache.js.map +1 -0
- package/dist/state/printer-events.cache.js +16 -7
- package/dist/state/printer-events.cache.js.map +1 -1
- package/dist/state/printer-files.store.js +3 -4
- package/dist/state/printer-files.store.js.map +1 -1
- package/dist/state/printer-socket.store.js +3 -3
- package/dist/state/printer-socket.store.js.map +1 -1
- package/dist/state/printer.cache.js +3 -0
- package/dist/state/printer.cache.js.map +1 -1
- package/dist/state/settings.store.js +3 -0
- package/dist/state/settings.store.js.map +1 -1
- package/dist/state/test-printer-socket.store.js +1 -1
- package/dist/task.presets.js.map +1 -1
- package/dist/tasks/boot.task.js +30 -18
- package/dist/tasks/boot.task.js.map +1 -1
- package/dist/tasks/print-completion.socketio.task.js +15 -1
- package/dist/tasks/print-completion.socketio.task.js.map +1 -1
- package/dist/tasks/printer-file-clean.task.js +14 -0
- package/dist/tasks/printer-file-clean.task.js.map +1 -1
- package/dist/tasks/printer-state-update-poll.task.js +89 -0
- package/dist/tasks/printer-state-update-poll.task.js.map +1 -0
- package/dist/tasks/printer-websocket-restore.task.js +4 -3
- package/dist/tasks/printer-websocket-restore.task.js.map +1 -1
- package/dist/tasks/printer-websocket.task.js +1 -1
- package/dist/tasks/printer-websocket.task.js.map +1 -1
- package/dist/tasks/socketio.task.js +1 -1
- package/dist/tasks/socketio.task.js.map +1 -1
- package/dist/tasks.js +2 -1
- package/dist/tasks.js.map +1 -1
- package/dist/utils/semver.utils.js +19 -4
- package/dist/utils/semver.utils.js.map +1 -1
- package/package.json +31 -30
|
@@ -74,6 +74,10 @@ const PrinterFileSchema = new _mongoose.Schema({
|
|
|
74
74
|
typePath: {
|
|
75
75
|
type: Array(String),
|
|
76
76
|
required: false
|
|
77
|
+
},
|
|
78
|
+
customData: {
|
|
79
|
+
type: Object,
|
|
80
|
+
required: true
|
|
77
81
|
}
|
|
78
82
|
});
|
|
79
83
|
const PrinterFile = (0, _mongoose.model)("PrinterFile", PrinterFileSchema);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/models/PrinterFile.ts"],"names":["PrinterFile","PrinterFileSchema","Schema","printerId","type","Types","ObjectId","required","name","String","date","Number","display","gcodeAnalysis","Object","default","hash","origin","path","prints","refs","size","statistics","typePath","Array","model"],"mappings":";;;;;;;;;;;
|
|
1
|
+
{"version":3,"sources":["../../src/models/PrinterFile.ts"],"names":["PrinterFile","PrinterFileSchema","Schema","printerId","type","Types","ObjectId","required","name","String","date","Number","display","gcodeAnalysis","Object","default","hash","origin","path","prints","refs","size","statistics","typePath","Array","customData","model"],"mappings":";;;;;;;;;;;IAsFaA,WAAW;eAAXA;;IAhEAC,iBAAiB;eAAjBA;;;0BAtBiB;AAsBvB,MAAMA,oBAAoB,IAAIC,gBAAM,CAAe;IACxDC,WAAW;QACTC,MAAMF,gBAAM,CAACG,KAAK,CAACC,QAAQ;QAC3BC,UAAU;IACZ;IACAC,MAAM;QACJJ,MAAMK;QACNF,UAAU;IACZ;IACAG,MAAM;QACJN,MAAMO;QACNJ,UAAU;IACZ;IACAK,SAAS;QACPR,MAAMK;QACNF,UAAU;IACZ;IACAM,eAAe;QACbT,MAAMU;QACNC,SAAS;QACTR,UAAU;IACZ;IACAS,MAAM;QACJZ,MAAMK;QACNF,UAAU;IACZ;IACAU,QAAQ;QACNb,MAAMK;QACNF,UAAU;IACZ;IACAW,MAAM;QACJd,MAAMK;QACNF,UAAU;IACZ;IACAY,QAAQ;QACNf,MAAMU;QACNP,UAAU;IACZ;IACAa,MAAM;QACJhB,MAAMU;QACNP,UAAU;IACZ;IACAc,MAAM;QACJjB,MAAMO;QACNJ,UAAU;IACZ;IACAe,YAAY;QACVlB,MAAMU;QACNP,UAAU;IACZ;IACAH,MAAM;QACJA,MAAMK;QACNF,UAAU;IACZ;IACAgB,UAAU;QACRnB,MAAMoB,MAAMf;QACZF,UAAU;IACZ;IACAkB,YAAY;QACVrB,MAAMU;QACNP,UAAU;IACZ;AACF;AAEO,MAAMP,cAAc0B,IAAAA,eAAK,EAAC,eAAezB"}
|
package/dist/server.constants.js
CHANGED
|
@@ -63,7 +63,7 @@ const AppConstants = {
|
|
|
63
63
|
serverRepoName: "fdm-monster",
|
|
64
64
|
orgName: "fdm-monster",
|
|
65
65
|
currentWizardVersion: 1,
|
|
66
|
-
defaultClientMinimum: "1.5.0-
|
|
66
|
+
defaultClientMinimum: "1.5.0-rc8",
|
|
67
67
|
influxUrl: "INFLUX_URL",
|
|
68
68
|
influxToken: "INFLUX_TOKEN",
|
|
69
69
|
influxOrg: "INFLUX_ORG",
|
|
@@ -72,6 +72,8 @@ const AppConstants = {
|
|
|
72
72
|
defaultSocketThrottleRate: 1,
|
|
73
73
|
debugSocketStatesKey: "DEBUG_SOCKET_STATES",
|
|
74
74
|
defaultDebugSocketStates: "false",
|
|
75
|
+
debugFileWritePrinterStatesKey: "DEBUG_FILE_WRITE_PRINTER_STATES",
|
|
76
|
+
defaultDebugFileWritePrinterStates: "false",
|
|
75
77
|
enableMqttAutoDiscoveryToken: "ENABLE_MQTT_AUTODISCOVERY",
|
|
76
78
|
enableMqttAutoDiscoveryDefault: "false",
|
|
77
79
|
mqttUrlToken: "MQTT_HOST",
|
|
@@ -83,7 +85,7 @@ const AppConstants = {
|
|
|
83
85
|
sentryCustomDsnToken: "SENTRY_CUSTOM_DSN",
|
|
84
86
|
sentryCustomDsnDefault: "https://164b8028a8a745bba3dbcab991b84ae7@o4503975545733120.ingest.sentry.io/4505101598261248",
|
|
85
87
|
debugRoutesKey: "DEBUG_ROUTES",
|
|
86
|
-
|
|
88
|
+
ENABLE_EXPERIMENTAL_TYPEORM: "ENABLE_EXPERIMENTAL_TYPEORM",
|
|
87
89
|
enableExperimentalTypeormDefault: "false"
|
|
88
90
|
};
|
|
89
91
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NON_NPM_MODE_KEY","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","clientPackageName","clientRepoName","serverRepoName","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","
|
|
1
|
+
{"version":3,"sources":["../src/server.constants.ts"],"names":["AppConstants","NON_NPM_MODE_KEY","NODE_ENV_KEY","VERSION_KEY","SERVER_PORT_KEY","MONGO_KEY","DATABASE_PATH","DATABASE_FILE","pm2ServiceName","logAppName","defaultFileStorageFolder","defaultLogsFolder","defaultLogZipsFolder","defaultClientBundleStorage","defaultClientBundleZipsStorage","defaultServerPort","defaultMongoStringUnauthenticated","apiRoute","enableClientDistAutoUpdateKey","ENABLE_EXPERIMENTAL_WHITELIST_SETTINGS","OVERRIDE_LOGIN_REQUIRED","OVERRIDE_REGISTRATION_ENABLED","DEFAULT_USERNAME_MINLEN","DEFAULT_PASSWORD_MINLEN","OVERRIDE_JWT_SECRET","OVERRIDE_JWT_EXPIRES_IN","DEFAULT_JWT_EXPIRES_IN","DEFAULT_REFRESH_TOKEN_ATTEMPTS","DEFAULT_REFRESH_TOKEN_EXPIRY","OVERRIDE_JWT_ISSUER","DEFAULT_JWT_ISSUER","OVERRIDE_JWT_AUDIENCE","DEFAULT_JWT_AUDIENCE","OVERRIDE_IS_DEMO_MODE","OVERRIDE_DEMO_USERNAME","DEFAULT_DEMO_USERNAME","OVERRIDE_DEMO_PASSWORD","DEFAULT_DEMO_PASSWORD","OVERRIDE_DEMO_ROLE","DEFAULT_DEMO_ROLE","defaultDevelopmentEnv","defaultTestEnv","defaultProductionEnv","knownEnvNames","GITHUB_PAT","serverPackageName","clientPackageName","clientRepoName","serverRepoName","orgName","currentWizardVersion","defaultClientMinimum","influxUrl","influxToken","influxOrg","influxBucket","defaultWebsocketHandshakeTimeout","defaultSocketThrottleRate","debugSocketStatesKey","defaultDebugSocketStates","debugFileWritePrinterStatesKey","defaultDebugFileWritePrinterStates","enableMqttAutoDiscoveryToken","enableMqttAutoDiscoveryDefault","mqttUrlToken","mqttPortToken","mqttPortDefault","mqttUsernameToken","mqttPasswordToken","monsterPiFilePath","sentryCustomDsnToken","sentryCustomDsnDefault","debugRoutesKey","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault"],"mappings":";;;;+BAAaA;;;eAAAA;;;AAAN,MAAMA,eAAe;IAC1BC,kBAAkB;IAClBC,cAAc;IACdC,aAAa;IACbC,iBAAiB;IACjBC,WAAW;IACXC,eAAe;IACfC,eAAe;IAEfC,gBAAgB;IAChBC,YAAY;IAGZC,0BAA0B;IAC1BC,mBAAmB;IACnBC,sBAAsB;IAEtBC,4BAA4B;IAC5BC,gCAAgC;IAChCC,mBAAmB;IACnBC,mCAAmC;IACnCC,UAAU;IACVC,+BAA+B;IAG/BC,wCAAwC;IAExCC,yBAAyB;IAEzBC,+BAA+B;IAE/BC,yBAAyB;IAEzBC,yBAAyB;IAEzBC,qBAAqB;IAErBC,yBAAyB;IACzBC,wBAAwB,KAAK;IAE7BC,gCAAgC,CAAC;IAEjCC,8BAA8B,KAAK,KAAK,KAAK;IAE7CC,qBAAqB;IACrBC,oBAAoB;IAEpBC,uBAAuB;IACvBC,sBAAsB;IAEtBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,wBAAwB;IACxBC,uBAAuB;IACvBC,oBAAoB;IACpBC,mBAAmB;IAEnBC,uBAAuB;IACvBC,gBAAgB;IAChBC,sBAAsB;IACtBC,eAAe;QAAC;QAAe;QAAc;KAAO;IACpDC,YAAY;IACZC,mBAAmB;IACnBC,mBAAmB;IACnBC,gBAAgB;IAChBC,gBAAgB;IAChBC,SAAS;IAETC,sBAAsB;IACtBC,sBAAsB;IAEtBC,WAAW;IACXC,aAAa;IACbC,WAAW;IACXC,cAAc;IAGdC,kCAAkC;IAClCC,2BAA2B;IAC3BC,sBAAsB;IACtBC,0BAA0B;IAC1BC,gCAAgC;IAChCC,oCAAoC;IAGpCC,8BAA8B;IAC9BC,gCAAgC;IAChCC,cAAc;IACdC,eAAe;IACfC,iBAAiB;IACjBC,mBAAmB;IACnBC,mBAAmB;IAGnBC,mBAAmB;IAGnBC,sBAAsB;IACtBC,wBAAwB;IAExBC,gBAAgB;IAEhBC,6BAA6B;IAC7BC,kCAAkC;AACpC"}
|
package/dist/server.core.js
CHANGED
|
@@ -18,6 +18,10 @@ const _container = require("./container");
|
|
|
18
18
|
const _database = require("./middleware/database");
|
|
19
19
|
const _globalmiddleware = require("./middleware/global.middleware");
|
|
20
20
|
const _passport1 = require("./middleware/passport");
|
|
21
|
+
const _serverconstants = require("./server.constants");
|
|
22
|
+
const _path = require("path");
|
|
23
|
+
const _fsutils = require("./utils/fs.utils");
|
|
24
|
+
const _envutils = require("./utils/env.utils");
|
|
21
25
|
function _interop_require_default(obj) {
|
|
22
26
|
return obj && obj.__esModule ? obj : {
|
|
23
27
|
default: obj
|
|
@@ -66,7 +70,12 @@ function _interop_require_wildcard(obj, nodeInterop) {
|
|
|
66
70
|
}
|
|
67
71
|
async function setupServer() {
|
|
68
72
|
const httpServer = (0, _express.default)();
|
|
69
|
-
const
|
|
73
|
+
const experimentalTypeormEnabled = (0, _envutils.getEnvOrDefault)(_serverconstants.AppConstants.ENABLE_EXPERIMENTAL_TYPEORM, _serverconstants.AppConstants.enableExperimentalTypeormDefault) === "true";
|
|
74
|
+
if (experimentalTypeormEnabled) {
|
|
75
|
+
const dbFolder = process.env[_serverconstants.AppConstants.DATABASE_PATH] || "./database";
|
|
76
|
+
(0, _fsutils.ensureDirExists)((0, _path.join)((0, _fsutils.superRootPath)(), dbFolder));
|
|
77
|
+
}
|
|
78
|
+
const container = (0, _container.configureContainer)(experimentalTypeormEnabled);
|
|
70
79
|
(0, _passport1.initializePassportStrategies)(_passport.default, container);
|
|
71
80
|
httpServer.use((0, _cors.default)({
|
|
72
81
|
origin: "*",
|
package/dist/server.core.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/server.core.ts"],"names":["setupServer","httpServer","express","container","configureContainer","initializePassportStrategies","passport","use","cors","origin","methods","helmet","contentSecurityPolicy","json","limit","cookieParser","urlencoded","extended","initialize","authenticate","session","scopePerRequest","interceptDatabaseError","validateWhitelistedIp","validateWizardCompleted","interceptRoles"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../src/server.core.ts"],"names":["setupServer","httpServer","express","experimentalTypeormEnabled","getEnvOrDefault","AppConstants","ENABLE_EXPERIMENTAL_TYPEORM","enableExperimentalTypeormDefault","dbFolder","process","env","DATABASE_PATH","ensureDirExists","join","superRootPath","container","configureContainer","initializePassportStrategies","passport","use","cors","origin","methods","helmet","contentSecurityPolicy","json","limit","cookieParser","urlencoded","extended","initialize","authenticate","session","scopePerRequest","interceptDatabaseError","validateWhitelistedIp","validateWizardCompleted","interceptRoles"],"mappings":";;;;+BAesBA;;;eAAAA;;;mDAfoB;uDACjB;mDACJ;+CACJ;iDACE;+BACa;2BACG;0BACI;kCACwC;2BAClC;iCAChB;sBACR;yBAC0B;0BACf;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzB,eAAeA;IACpB,MAAMC,aAAaC,IAAAA,gBAAO;IAC1B,MAAMC,6BACJC,IAAAA,yBAAe,EAACC,6BAAY,CAACC,2BAA2B,EAAED,6BAAY,CAACE,gCAAgC,MAAM;IAC/G,IAAIJ,4BAA4B;QAC9B,MAAMK,WAAWC,QAAQC,GAAG,CAACL,6BAAY,CAACM,aAAa,CAAC,IAAI;QAC5DC,IAAAA,wBAAe,EAACC,IAAAA,UAAI,EAACC,IAAAA,sBAAa,KAAIN;IACxC;IAEA,MAAMO,YAAYC,IAAAA,6BAAkB,EAACb;IACrCc,IAAAA,uCAA4B,EAACC,iBAAQ,EAAEH;IAEvCd,WACGkB,GAAG,CACFC,IAAAA,aAAI,EAAC;QACHC,QAAQ;QACRC,SAAS;IACX,IAEDH,GAAG,CACFI,IAAAA,eAAM,EAAC;QACLC,uBAAuB;IACzB,IAEDL,GAAG,CAACM,IAAAA,aAAI,EAAC;QAAEC,OAAO;IAAO,IACzBP,GAAG,CAACQ,IAAAA,qBAAY,KAChBR,GAAG,CAACS,IAAAA,mBAAU,EAAC;QAAEC,UAAU;IAAM,IACjCV,GAAG,CAACD,iBAAQ,CAACY,UAAU,IACvBX,GAAG,CAACD,iBAAQ,CAACa,YAAY,CAAC;QAAC;QAAO;KAAY,EAAE;QAAEC,SAAS;IAAM,IACjEb,GAAG,CAACc,IAAAA,8BAAe,EAAClB,YACpBI,GAAG,CAACe,gCAAsB,EAE1Bf,GAAG,CAACgB,uCAAqB,EACzBhB,GAAG,CAACiB,yCAAuB,EAC3BjB,GAAG,CAACkB,gCAAc;IAErB,OAAO;QACLpC;QACAc;IACF;AACF"}
|
package/dist/server.host.js
CHANGED
|
@@ -30,18 +30,22 @@ class ServerHost {
|
|
|
30
30
|
socketIoGateway;
|
|
31
31
|
appInstance = null;
|
|
32
32
|
configService;
|
|
33
|
+
typeormService;
|
|
33
34
|
isTypeormMode;
|
|
34
35
|
logger;
|
|
35
|
-
constructor({ loggerFactory, bootTask, taskManagerService, socketIoGateway, configService, isTypeormMode }){
|
|
36
|
+
constructor({ loggerFactory, bootTask, taskManagerService, socketIoGateway, configService, typeormService, isTypeormMode }){
|
|
36
37
|
this.logger = loggerFactory(ServerHost.name);
|
|
37
38
|
this.bootTask = bootTask;
|
|
38
39
|
this.taskManagerService = taskManagerService;
|
|
39
40
|
this.socketIoGateway = socketIoGateway;
|
|
40
41
|
this.configService = configService;
|
|
42
|
+
this.typeormService = typeormService;
|
|
41
43
|
this.isTypeormMode = isTypeormMode;
|
|
42
44
|
}
|
|
43
45
|
async boot(app, quick_boot = false, listenRequests = true) {
|
|
44
|
-
|
|
46
|
+
if (!this.isTypeormMode) {
|
|
47
|
+
_mongoose.default.set("strictQuery", true);
|
|
48
|
+
}
|
|
45
49
|
this.appInstance = app;
|
|
46
50
|
this.serveControllerRoutes(this.appInstance);
|
|
47
51
|
if (!quick_boot) {
|
|
@@ -50,7 +54,11 @@ class ServerHost {
|
|
|
50
54
|
if (listenRequests) return this.httpListen();
|
|
51
55
|
}
|
|
52
56
|
hasConnected() {
|
|
53
|
-
|
|
57
|
+
if (this.isTypeormMode) {
|
|
58
|
+
return this.typeormService.hasConnected();
|
|
59
|
+
} else {
|
|
60
|
+
return _mongoose.default.connections[0].readyState;
|
|
61
|
+
}
|
|
54
62
|
}
|
|
55
63
|
serveControllerRoutes(app) {
|
|
56
64
|
const routePath = "./controllers";
|
package/dist/server.host.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","bootTask","taskManagerService","socketIoGateway","appInstance","configService","isTypeormMode","logger","constructor","loggerFactory","name","boot","app","quick_boot","listenRequests","mongoose","set","serveControllerRoutes","runOnce","httpListen","hasConnected","connections","readyState","routePath","use","req","res","next","originalUrl","startsWith","history","loadControllers","cwd","__dirname","ignore","exceptionFilter","bundleDistPath","join","superRootPath","AppConstants","defaultClientBundleStorage","express","static","backupClientPath","clientPackageName","get","path","resource","endsWith","error","NotFoundException","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer"],"mappings":";;;;+
|
|
1
|
+
{"version":3,"sources":["../src/server.host.ts"],"names":["ServerHost","bootTask","taskManagerService","socketIoGateway","appInstance","configService","typeormService","isTypeormMode","logger","constructor","loggerFactory","name","boot","app","quick_boot","listenRequests","mongoose","set","serveControllerRoutes","runOnce","httpListen","hasConnected","connections","readyState","routePath","use","req","res","next","originalUrl","startsWith","history","loadControllers","cwd","__dirname","ignore","exceptionFilter","bundleDistPath","join","superRootPath","AppConstants","defaultClientBundleStorage","express","static","backupClientPath","clientPackageName","get","path","resource","endsWith","error","NotFoundException","port","fetchServerPort","isProductionEnvironment","debugRoutesKey","expressListRoutes","require","prefix","Number","isNaN","parseInt","Error","hostOrFqdn","server","listen","log","attachServer"],"mappings":"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"}
|
|
@@ -8,6 +8,12 @@ Object.defineProperty(exports, "BatchCallService", {
|
|
|
8
8
|
return BatchCallService;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
+
var ReprintState;
|
|
12
|
+
(function(ReprintState) {
|
|
13
|
+
ReprintState[ReprintState["PrinterNotAvailable"] = 0] = "PrinterNotAvailable";
|
|
14
|
+
ReprintState[ReprintState["NoLastPrint"] = 1] = "NoLastPrint";
|
|
15
|
+
ReprintState[ReprintState["LastPrintReady"] = 2] = "LastPrintReady";
|
|
16
|
+
})(ReprintState || (ReprintState = {}));
|
|
11
17
|
class BatchCallService {
|
|
12
18
|
octoPrintApiService;
|
|
13
19
|
printerSocketStore;
|
|
@@ -26,7 +32,7 @@ class BatchCallService {
|
|
|
26
32
|
async batchTogglePrintersEnabled(printerIds, enabled) {
|
|
27
33
|
const promises = [];
|
|
28
34
|
for (const printerId of printerIds){
|
|
29
|
-
let promise
|
|
35
|
+
let promise;
|
|
30
36
|
const printerDto = await this.printerCache.getValue(printerId);
|
|
31
37
|
if (!printerDto) continue;
|
|
32
38
|
const time = Date.now();
|
|
@@ -74,6 +80,30 @@ class BatchCallService {
|
|
|
74
80
|
this.printerSocketStore.reconnectOctoPrint(printerId);
|
|
75
81
|
}
|
|
76
82
|
}
|
|
83
|
+
async batchSettingsGet(printerIds) {
|
|
84
|
+
const promises = [];
|
|
85
|
+
for (const printerId of printerIds){
|
|
86
|
+
const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
|
|
87
|
+
const time = Date.now();
|
|
88
|
+
const promise = this.octoPrintApiService.getSettings(printerLogin).then((r)=>{
|
|
89
|
+
return {
|
|
90
|
+
success: true,
|
|
91
|
+
printerId,
|
|
92
|
+
time: Date.now() - time,
|
|
93
|
+
value: r
|
|
94
|
+
};
|
|
95
|
+
}).catch((e)=>{
|
|
96
|
+
return {
|
|
97
|
+
failure: true,
|
|
98
|
+
error: e.message,
|
|
99
|
+
printerId,
|
|
100
|
+
time: Date.now() - time
|
|
101
|
+
};
|
|
102
|
+
});
|
|
103
|
+
promises.push(promise);
|
|
104
|
+
}
|
|
105
|
+
return await Promise.all(promises);
|
|
106
|
+
}
|
|
77
107
|
async batchConnectUsb(printerIds) {
|
|
78
108
|
const promises = [];
|
|
79
109
|
for (const printerId of printerIds){
|
|
@@ -98,30 +128,47 @@ class BatchCallService {
|
|
|
98
128
|
}
|
|
99
129
|
return await Promise.all(promises);
|
|
100
130
|
}
|
|
101
|
-
async
|
|
131
|
+
async getBatchPrinterReprintFile(printerIds) {
|
|
102
132
|
const promises = [];
|
|
103
133
|
for (const printerId of printerIds){
|
|
104
|
-
const
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
134
|
+
const promise = new Promise(async (resolve, _)=>{
|
|
135
|
+
try {
|
|
136
|
+
const login = await this.printerCache.getLoginDtoAsync(printerId);
|
|
137
|
+
const files = (await this.octoPrintApiService.getLocalFiles(login, true)).filter((f)=>f?.prints?.last?.date);
|
|
138
|
+
const connected = await this.octoPrintApiService.getConnection(login);
|
|
139
|
+
const connectionState = connected.current?.state;
|
|
140
|
+
if (files?.length == 0) {
|
|
141
|
+
return resolve({
|
|
142
|
+
connectionState,
|
|
143
|
+
printerId,
|
|
144
|
+
reprintState: 1
|
|
145
|
+
});
|
|
146
|
+
}
|
|
147
|
+
return resolve({
|
|
148
|
+
connectionState,
|
|
149
|
+
file: files[0],
|
|
150
|
+
printerId,
|
|
151
|
+
reprintState: 2
|
|
152
|
+
});
|
|
153
|
+
} catch (e) {
|
|
154
|
+
return resolve({
|
|
155
|
+
connectionState: null,
|
|
156
|
+
printerId,
|
|
157
|
+
reprintState: 0
|
|
111
158
|
});
|
|
112
|
-
reprintPath = files[0].path;
|
|
113
|
-
}
|
|
114
|
-
if (!files?.length) {
|
|
115
|
-
promises.push(Promise.resolve({
|
|
116
|
-
failure: true,
|
|
117
|
-
error: "No file to reprint",
|
|
118
|
-
printerId
|
|
119
|
-
}));
|
|
120
|
-
continue;
|
|
121
159
|
}
|
|
122
|
-
}
|
|
160
|
+
});
|
|
161
|
+
promises.push(promise);
|
|
162
|
+
}
|
|
163
|
+
return await Promise.all(promises);
|
|
164
|
+
}
|
|
165
|
+
async batchReprintCalls(printerIdFileList) {
|
|
166
|
+
const promises = [];
|
|
167
|
+
for (const printerIdFile of printerIdFileList){
|
|
168
|
+
const { printerId, path } = printerIdFile;
|
|
169
|
+
const printerLogin = await this.printerCache.getLoginDtoAsync(printerId);
|
|
123
170
|
const time = Date.now();
|
|
124
|
-
const promise = this.octoPrintApiService.selectPrintFile(printerLogin,
|
|
171
|
+
const promise = this.octoPrintApiService.selectPrintFile(printerLogin, path, true).then(()=>{
|
|
125
172
|
return {
|
|
126
173
|
success: true,
|
|
127
174
|
printerId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/services/batch-call.service.ts"],"names":["BatchCallService","octoPrintApiService","printerSocketStore","printerCache","printerEventsCache","printerFilesStore","printerService","constructor","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","
|
|
1
|
+
{"version":3,"sources":["../../src/services/batch-call.service.ts"],"names":["BatchCallService","ReprintState","octoPrintApiService","printerSocketStore","printerCache","printerEventsCache","printerFilesStore","printerService","constructor","batchTogglePrintersEnabled","printerIds","enabled","promises","printerId","promise","printerDto","getValue","time","Date","now","disabledReason","length","updateEnabled","then","success","catch","e","failure","error","message","push","Promise","all","batchConnectSocket","reconnectOctoPrint","batchSettingsGet","printerLogin","getLoginDtoAsync","getSettings","r","value","batchConnectUsb","command","connectCommand","sendConnectionCommand","getBatchPrinterReprintFile","resolve","_","login","files","getLocalFiles","filter","f","prints","last","date","connected","getConnection","connectionState","current","state","reprintState","file","batchReprintCalls","printerIdFileList","printerIdFile","path","selectPrintFile"],"mappings":"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"}
|
|
@@ -15,6 +15,9 @@ const _promises = require("node:fs/promises");
|
|
|
15
15
|
const _fsutils = require("../../utils/fs.utils");
|
|
16
16
|
const _semverutils = require("../../utils/semver.utils");
|
|
17
17
|
const _serverconstants = require("../../server.constants");
|
|
18
|
+
const _semver = require("semver");
|
|
19
|
+
const _errorutils = require("../../utils/error.utils");
|
|
20
|
+
const _runtimeexceptions = require("../../exceptions/runtime.exceptions");
|
|
18
21
|
function _interop_require_default(obj) {
|
|
19
22
|
return obj && obj.__esModule ? obj : {
|
|
20
23
|
default: obj
|
|
@@ -38,59 +41,127 @@ class ClientBundleService {
|
|
|
38
41
|
async getReleases() {
|
|
39
42
|
const githubOwner = _serverconstants.AppConstants.orgName;
|
|
40
43
|
const githubRepo = _serverconstants.AppConstants.clientRepoName;
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
44
|
+
try {
|
|
45
|
+
const result = await this.githubService.getReleases(githubOwner, githubRepo);
|
|
46
|
+
const latestResult = await this.githubService.getLatestRelease(githubOwner, githubRepo);
|
|
47
|
+
return {
|
|
48
|
+
minimum: {
|
|
49
|
+
tag_name: _serverconstants.AppConstants.defaultClientMinimum
|
|
50
|
+
},
|
|
51
|
+
current: {
|
|
52
|
+
tag_name: this.getClientVersion()
|
|
53
|
+
},
|
|
54
|
+
latest: latestResult.data,
|
|
55
|
+
releases: result.data
|
|
56
|
+
};
|
|
57
|
+
} catch (e) {
|
|
58
|
+
this.logger.error(`Github OctoKit error ${(0, _errorutils.errorSummary)(e)}`);
|
|
59
|
+
throw new _runtimeexceptions.ExternalServiceError(e);
|
|
60
|
+
}
|
|
53
61
|
}
|
|
54
|
-
async shouldUpdateWithReason(overrideAutoUpdate, minimumVersion) {
|
|
62
|
+
async shouldUpdateWithReason(overrideAutoUpdate, minimumVersion, requestedVersion, allowDowngrade) {
|
|
55
63
|
const clientAutoUpdate = _serverconstants.AppConstants.enableClientDistAutoUpdateKey;
|
|
64
|
+
const existingClientVersion = this.getClientVersion();
|
|
56
65
|
if (!clientAutoUpdate && !overrideAutoUpdate) {
|
|
57
66
|
return {
|
|
58
67
|
shouldUpdate: false,
|
|
68
|
+
requestedVersion,
|
|
69
|
+
minimumVersion: _serverconstants.AppConstants.defaultClientMinimum,
|
|
70
|
+
currentVersion: existingClientVersion,
|
|
71
|
+
targetVersion: null,
|
|
59
72
|
reason: "Client auto-update disabled (ENABLE_CLIENT_DIST_AUTO_UPDATE), skipping"
|
|
60
73
|
};
|
|
61
74
|
}
|
|
62
|
-
|
|
63
|
-
if (!version) {
|
|
75
|
+
if (!existingClientVersion) {
|
|
64
76
|
return {
|
|
65
77
|
shouldUpdate: true,
|
|
78
|
+
requestedVersion,
|
|
79
|
+
currentVersion: existingClientVersion,
|
|
80
|
+
minimumVersion: _serverconstants.AppConstants.defaultClientMinimum,
|
|
81
|
+
targetVersion: (0, _semverutils.getMaximumOfVersionsSafe)(minimumVersion, requestedVersion),
|
|
66
82
|
reason: `Client package.json does not exist, downloading new release`
|
|
67
83
|
};
|
|
68
84
|
}
|
|
69
85
|
if (!this.doesClientIndexHtmlExist()) {
|
|
70
86
|
return {
|
|
71
87
|
shouldUpdate: true,
|
|
72
|
-
|
|
88
|
+
requestedVersion,
|
|
89
|
+
currentVersion: existingClientVersion,
|
|
90
|
+
minimumVersion: _serverconstants.AppConstants.defaultClientMinimum,
|
|
91
|
+
targetVersion: (0, _semverutils.getMaximumOfVersionsSafe)(minimumVersion, requestedVersion),
|
|
92
|
+
reason: `Client index.html could not be found, downloading new release`
|
|
73
93
|
};
|
|
74
94
|
}
|
|
75
|
-
const satisfiesMinimumVersion = (0, _semverutils.checkVersionSatisfiesMinimum)(
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
95
|
+
const satisfiesMinimumVersion = (0, _semverutils.checkVersionSatisfiesMinimum)(existingClientVersion, minimumVersion);
|
|
96
|
+
const clientOutdated = !satisfiesMinimumVersion;
|
|
97
|
+
const clientOutdatedResponse = {
|
|
98
|
+
shouldUpdate: true,
|
|
99
|
+
requestedVersion,
|
|
100
|
+
currentVersion: existingClientVersion,
|
|
101
|
+
minimumVersion: _serverconstants.AppConstants.defaultClientMinimum,
|
|
102
|
+
targetVersion: (0, _semverutils.getMaximumOfVersionsSafe)(minimumVersion, requestedVersion),
|
|
103
|
+
reason: `Client bundle release ${existingClientVersion} does not satisfy minimum version ${minimumVersion}, downloading new release`
|
|
104
|
+
};
|
|
105
|
+
if (!!requestedVersion) {
|
|
106
|
+
const minimumComparison = (0, _semver.compare)(requestedVersion, minimumVersion);
|
|
107
|
+
if (minimumComparison === -1) {
|
|
108
|
+
if (clientOutdated) return clientOutdatedResponse;
|
|
109
|
+
return {
|
|
110
|
+
shouldUpdate: false,
|
|
111
|
+
requestedVersion,
|
|
112
|
+
currentVersion: existingClientVersion,
|
|
113
|
+
minimumVersion: _serverconstants.AppConstants.defaultClientMinimum,
|
|
114
|
+
targetVersion: requestedVersion,
|
|
115
|
+
reason: `Requested version ${requestedVersion} is below minimum designed version ${minimumVersion}, skipping`
|
|
116
|
+
};
|
|
117
|
+
}
|
|
118
|
+
const newComparison = (0, _semver.compare)(requestedVersion, existingClientVersion);
|
|
119
|
+
const isDowngrade = newComparison === -1;
|
|
120
|
+
if (isDowngrade) {
|
|
121
|
+
if (!allowDowngrade && clientOutdated) return clientOutdatedResponse;
|
|
122
|
+
return {
|
|
123
|
+
shouldUpdate: allowDowngrade,
|
|
124
|
+
requestedVersion,
|
|
125
|
+
currentVersion: existingClientVersion,
|
|
126
|
+
minimumVersion: _serverconstants.AppConstants.defaultClientMinimum,
|
|
127
|
+
targetVersion: requestedVersion,
|
|
128
|
+
reason: allowDowngrade ? `Client bundle downgrade allowed (above ${minimumVersion}), downloading new release` : `Client bundle downgrade not allowed (even thought above ${minimumVersion}), skipping`
|
|
129
|
+
};
|
|
130
|
+
} else if (newComparison === 1) {
|
|
131
|
+
return {
|
|
132
|
+
shouldUpdate: true,
|
|
133
|
+
requestedVersion,
|
|
134
|
+
currentVersion: existingClientVersion,
|
|
135
|
+
minimumVersion: _serverconstants.AppConstants.defaultClientMinimum,
|
|
136
|
+
targetVersion: (0, _semverutils.getMaximumOfVersionsSafe)(minimumVersion, requestedVersion),
|
|
137
|
+
reason: `Client bundle release ${requestedVersion} is above existing version ${existingClientVersion}, downloading updated release`
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
if (!satisfiesMinimumVersion) {
|
|
142
|
+
return clientOutdatedResponse;
|
|
81
143
|
}
|
|
82
144
|
return {
|
|
83
|
-
shouldUpdate:
|
|
84
|
-
|
|
145
|
+
shouldUpdate: false,
|
|
146
|
+
requestedVersion,
|
|
147
|
+
currentVersion: existingClientVersion,
|
|
148
|
+
minimumVersion: _serverconstants.AppConstants.defaultClientMinimum,
|
|
149
|
+
targetVersion: (0, _semverutils.getMaximumOfVersionsSafe)(minimumVersion, requestedVersion),
|
|
150
|
+
reason: `Client already satisfies minimum version ${minimumVersion} and requested version is not an upgrade, skipping`
|
|
85
151
|
};
|
|
86
152
|
}
|
|
87
153
|
async downloadClientUpdate(releaseTag) {
|
|
88
154
|
const release = await this.getClientBundleRelease(releaseTag);
|
|
89
155
|
this.logger.log(`Retrieved ${release.assets.length} assets from release '${release.name}': ${release.assets.map((a)=>a.name)}`);
|
|
90
|
-
const
|
|
91
|
-
const
|
|
156
|
+
const assetName = `dist-client-${release.tag_name}.zip`;
|
|
157
|
+
const asset = release.assets.find((a)=>a.name === assetName);
|
|
158
|
+
if (!asset) {
|
|
159
|
+
throw new _runtimeexceptions.NotFoundException(`Release with tag ${release.tag_name} asset ${assetName} does not exist`);
|
|
160
|
+
}
|
|
161
|
+
const assetId = asset?.id;
|
|
92
162
|
const downloadPath = await this.downloadClientBundleZip(assetId, asset.name);
|
|
93
163
|
await this.extractClientBundleZip(downloadPath);
|
|
164
|
+
return release.tag_name;
|
|
94
165
|
}
|
|
95
166
|
async getClientBundleRelease(releaseTag) {
|
|
96
167
|
const githubOwner = _serverconstants.AppConstants.orgName;
|
|
@@ -110,8 +181,8 @@ class ClientBundleService {
|
|
|
110
181
|
return path;
|
|
111
182
|
}
|
|
112
183
|
async extractClientBundleZip(downloadedZipPath) {
|
|
113
|
-
const zip = new _admzip.default(downloadedZipPath);
|
|
114
184
|
const distPath = (0, _path.join)((0, _fsutils.superRootPath)(), _serverconstants.AppConstants.defaultClientBundleStorage);
|
|
185
|
+
const zip = new _admzip.default(downloadedZipPath);
|
|
115
186
|
(0, _fsutils.ensureDirExists)(distPath);
|
|
116
187
|
this.logger.debug(`Clearing contents of ${distPath}`);
|
|
117
188
|
for (const fileOrDir of (await (0, _promises.readdir)(distPath))){
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/client-bundle.service.ts"],"names":["ClientBundleService","githubService","configService","logger","constructor","loggerFactory","name","clientPackageJsonPath","join","superRootPath","AppConstants","defaultClientBundleStorage","clientIndexHtmlPath","getReleases","githubOwner","orgName","githubRepo","clientRepoName","result","latestResult","getLatestRelease","minimum","tag_name","defaultClientMinimum","current","getClientVersion","latest","data","releases","shouldUpdateWithReason","overrideAutoUpdate","minimumVersion","clientAutoUpdate","enableClientDistAutoUpdateKey","shouldUpdate","reason","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/client-bundle.service.ts"],"names":["ClientBundleService","githubService","configService","logger","constructor","loggerFactory","name","clientPackageJsonPath","join","superRootPath","AppConstants","defaultClientBundleStorage","clientIndexHtmlPath","getReleases","githubOwner","orgName","githubRepo","clientRepoName","result","latestResult","getLatestRelease","minimum","tag_name","defaultClientMinimum","current","getClientVersion","latest","data","releases","e","error","errorSummary","ExternalServiceError","shouldUpdateWithReason","overrideAutoUpdate","minimumVersion","requestedVersion","allowDowngrade","clientAutoUpdate","enableClientDistAutoUpdateKey","existingClientVersion","shouldUpdate","currentVersion","targetVersion","reason","getMaximumOfVersionsSafe","doesClientIndexHtmlExist","satisfiesMinimumVersion","checkVersionSatisfiesMinimum","clientOutdated","clientOutdatedResponse","minimumComparison","compare","newComparison","isDowngrade","downloadClientUpdate","releaseTag","release","getClientBundleRelease","log","assets","length","map","a","assetName","asset","find","NotFoundException","assetId","id","downloadPath","downloadClientBundleZip","extractClientBundleZip","getReleaseByTag","assetResult","requestAsset","dir","defaultClientBundleZipsStorage","ensureDirExists","path","writeFileSync","Buffer","from","downloadedZipPath","distPath","zip","AdmZip","debug","fileOrDir","readdir","rm","force","recursive","message","stack","extractAllTo","indexHtmlPath","existsSync","packageJsonPath","packageJsonFound","require","cache","undefined","json","version"],"mappings":"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"}
|
|
@@ -21,26 +21,30 @@ class GithubService {
|
|
|
21
21
|
return result?.type === "token";
|
|
22
22
|
}
|
|
23
23
|
async getLatestRelease(owner, repo) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
24
|
+
try {
|
|
25
|
+
return await this.octokitService.rest.repos.getLatestRelease({
|
|
26
|
+
owner,
|
|
27
|
+
repo
|
|
28
|
+
});
|
|
29
|
+
} catch (e) {
|
|
30
|
+
if (e?.name === "HttpError" && e.status == 404) {
|
|
31
|
+
throw new _runtimeexceptions.NotFoundException(`Could not find latest release`);
|
|
30
32
|
}
|
|
31
33
|
throw e;
|
|
32
|
-
}
|
|
34
|
+
}
|
|
33
35
|
}
|
|
34
36
|
async getReleases(owner, repo) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
37
|
+
try {
|
|
38
|
+
return await this.octokitService.rest.repos.listReleases({
|
|
39
|
+
owner,
|
|
40
|
+
repo
|
|
41
|
+
});
|
|
42
|
+
} catch (e) {
|
|
43
|
+
if (e?.name === "HttpError" && e.status == 404) {
|
|
44
|
+
throw new _runtimeexceptions.NotFoundException(`Could not find releases`);
|
|
41
45
|
}
|
|
42
46
|
throw e;
|
|
43
|
-
}
|
|
47
|
+
}
|
|
44
48
|
}
|
|
45
49
|
async getReleaseByTag(owner, repo, tag) {
|
|
46
50
|
return await this.octokitService.rest.repos.getReleaseByTag({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/services/core/github.service.ts"],"names":["GithubService","octokitService","logger","constructor","loggerFactory","name","wasAuthenticated","result","auth","type","getLatestRelease","owner","repo","rest","repos","
|
|
1
|
+
{"version":3,"sources":["../../../src/services/core/github.service.ts"],"names":["GithubService","octokitService","logger","constructor","loggerFactory","name","wasAuthenticated","result","auth","type","getLatestRelease","owner","repo","rest","repos","e","status","NotFoundException","getReleases","listReleases","getReleaseByTag","tag","catch","requestAsset","assetId","request","headers","Accept","asset_id"],"mappings":";;;;+BAMaA;;;eAAAA;;;mCANqB;AAM3B,MAAMA;IACXC,eAAwB;IACxBC,OAAsB;IAEtBC,YAAY,EAAEC,aAAa,EAAEH,cAAc,EAA8D,CAAE;QACzG,IAAI,CAACC,MAAM,GAAGE,cAAcJ,cAAcK,IAAI,EAAE;QAChD,IAAI,CAACJ,cAAc,GAAGA;IACxB;IAEA,MAAMK,mBAAmB;QACvB,MAAMC,SAAS,MAAM,IAAI,CAACN,cAAc,CAACO,IAAI;QAC7C,OAAOD,QAAQE,SAAS;IAC1B;IAEA,MAAMC,iBAAiBC,KAAa,EAAEC,IAAY,EAAE;QAClD,IAAI;YACF,OAAO,MAAM,IAAI,CAACX,cAAc,CAACY,IAAI,CAACC,KAAK,CAACJ,gBAAgB,CAAC;gBAC3DC;gBACAC;YACF;QACF,EAAE,OAAOG,GAAG;YACV,IAAIA,GAAGV,SAAS,eAAeU,EAAEC,MAAM,IAAI,KAAK;gBAC9C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,6BAA6B,CAAC;YAC7D;YAEA,MAAMF;QACR;IACF;IAEA,MAAMG,YAAYP,KAAa,EAAEC,IAAY,EAAE;QAC7C,IAAI;YACF,OAAO,MAAM,IAAI,CAACX,cAAc,CAACY,IAAI,CAACC,KAAK,CAACK,YAAY,CAAC;gBACvDR;gBACAC;YACF;QACF,EAAE,OAAOG,GAAG;YACV,IAAIA,GAAGV,SAAS,eAAeU,EAAEC,MAAM,IAAI,KAAK;gBAC9C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,uBAAuB,CAAC;YACvD;YAEA,MAAMF;QACR;IACF;IAEA,MAAMK,gBAAgBT,KAAa,EAAEC,IAAY,EAAES,GAAW,EAAE;QAC9D,OAAO,MAAM,IAAI,CAACpB,cAAc,CAACY,IAAI,CAACC,KAAK,CACxCM,eAAe,CAAC;YACfT;YACAC;YACAS;QACF,GACCC,KAAK,CAAC,CAACP;YACN,IAAIA,EAAEV,IAAI,KAAK,eAAeU,EAAEC,MAAM,IAAI,KAAK;gBAC7C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,gCAAgC,EAAEI,IAAI,CAAC;YACtE;YAEA,MAAMN;QACR;IACJ;IAEA,MAAMQ,aAAaZ,KAAa,EAAEC,IAAY,EAAEY,OAAY,EAAE;QAC5D,OAAO,MAAM,IAAI,CAACvB,cAAc,CAC7BwB,OAAO,CAAC,qDAAqD;YAC5DC,SAAS;gBACPC,QAAQ;YACV;YACAhB;YACAC;YACAgB,UAAUJ;QACZ,GACCF,KAAK,CAAC,CAACP;YACN,IAAIA,EAAEV,IAAI,KAAK,eAAeU,EAAEC,MAAM,IAAI,KAAK;gBAC7C,MAAM,IAAIC,oCAAiB,CAAC,CAAC,6BAA6B,EAAEO,QAAQ,CAAC;YACvE;YAEA,MAAMT;QACR;IACJ;AACF"}
|
|
@@ -122,7 +122,7 @@ class TaskManagerService {
|
|
|
122
122
|
}
|
|
123
123
|
runTimeoutTaskInstance(taskId, timeoutMs) {
|
|
124
124
|
const taskState = this.getTaskState(taskId);
|
|
125
|
-
this.logger.log(`Running delayed task ${taskId} in ${timeoutMs}ms`);
|
|
125
|
+
this.logger.log(`Running delayed task '${taskId}' in ${timeoutMs}ms`);
|
|
126
126
|
setTimeout(()=>taskState.timedTask.execute(), timeoutMs, taskId);
|
|
127
127
|
}
|
|
128
128
|
getSafeTimedTask(taskId, handler) {
|