@futo-org/backups-orchestrator-api 0.3.1 → 0.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/backends/backend.d.ts +2 -2
- package/dist/backends/backend.js +2 -5
- package/dist/backends/backend.js.map +1 -1
- package/dist/backends/local.backend.d.ts +1 -0
- package/dist/backends/local.backend.js +3 -0
- package/dist/backends/local.backend.js.map +1 -1
- package/dist/backends/s3.backend.d.ts +1 -0
- package/dist/backends/s3.backend.js +3 -0
- package/dist/backends/s3.backend.js.map +1 -1
- package/dist/backends/yucca.backend.d.ts +19 -3
- package/dist/backends/yucca.backend.js +47 -22
- package/dist/backends/yucca.backend.js.map +1 -1
- package/dist/const.d.ts +2 -1
- package/dist/const.js +3 -2
- package/dist/const.js.map +1 -1
- package/dist/controllers/onboarding.controller.d.ts +2 -0
- package/dist/controllers/onboarding.controller.js +18 -0
- package/dist/controllers/onboarding.controller.js.map +1 -1
- package/dist/dto/onboarding.dto.d.ts +4 -0
- package/dist/dto/onboarding.dto.js +16 -0
- package/dist/dto/onboarding.dto.js.map +1 -1
- package/dist/enum.d.ts +10 -0
- package/dist/enum.js +13 -1
- package/dist/enum.js.map +1 -1
- package/dist/interceptors/telemetry-error.interceptor.d.ts +8 -0
- package/dist/interceptors/telemetry-error.interceptor.js +47 -0
- package/dist/interceptors/telemetry-error.interceptor.js.map +1 -0
- package/dist/moduleConfig.d.ts +1 -1
- package/dist/orchestrationApi.module.d.ts +5 -3
- package/dist/orchestrationApi.module.js +13 -4
- package/dist/orchestrationApi.module.js.map +1 -1
- package/dist/repositories/backend.repository.d.ts +2 -0
- package/dist/repositories/backend.repository.js +8 -3
- package/dist/repositories/backend.repository.js.map +1 -1
- package/dist/repositories/bootstrap.repository.d.ts +9 -0
- package/dist/repositories/bootstrap.repository.js +33 -0
- package/dist/repositories/bootstrap.repository.js.map +1 -0
- package/dist/repositories/config.repository.d.ts +2 -0
- package/dist/repositories/config.repository.js +6 -0
- package/dist/repositories/config.repository.js.map +1 -1
- package/dist/repositories/restic.repository.d.ts +32 -3
- package/dist/repositories/restic.repository.js +3 -7
- package/dist/repositories/restic.repository.js.map +1 -1
- package/dist/schema/tables/backend.table.d.ts +1 -0
- package/dist/schema/tables/backend.table.js.map +1 -1
- package/dist/services/auth.service.d.ts +3 -1
- package/dist/services/auth.service.js +24 -7
- package/dist/services/auth.service.js.map +1 -1
- package/dist/services/backend.service.d.ts +3 -3
- package/dist/services/backend.service.js +12 -8
- package/dist/services/backend.service.js.map +1 -1
- package/dist/services/bootstrap.service.d.ts +3 -1
- package/dist/services/bootstrap.service.js +16 -6
- package/dist/services/bootstrap.service.js.map +1 -1
- package/dist/services/integrations.service.d.ts +3 -1
- package/dist/services/integrations.service.js +10 -2
- package/dist/services/integrations.service.js.map +1 -1
- package/dist/services/onboarding.service.d.ts +7 -1
- package/dist/services/onboarding.service.js +37 -2
- package/dist/services/onboarding.service.js.map +1 -1
- package/dist/services/repository.service.d.ts +3 -1
- package/dist/services/repository.service.js +188 -76
- package/dist/services/repository.service.js.map +1 -1
- package/dist/services/schedule.service.d.ts +3 -1
- package/dist/services/schedule.service.js +26 -2
- package/dist/services/schedule.service.js.map +1 -1
- package/dist/services/telemetry.service.d.ts +9 -0
- package/dist/services/telemetry.service.js +59 -0
- package/dist/services/telemetry.service.js.map +1 -0
- package/package.json +5 -4
|
@@ -11,9 +11,11 @@ export declare class BackendRepository {
|
|
|
11
11
|
getBackends(): Promise<{
|
|
12
12
|
id: string;
|
|
13
13
|
configuration: BackendConfiguration;
|
|
14
|
+
backend: import("../backends/local.backend").LocalBackend | import("../backends/s3.backend").S3Backend | import("../backends/yucca.backend").YuccaBackend;
|
|
14
15
|
}[]>;
|
|
15
16
|
getBackend(id: string): Promise<{
|
|
16
17
|
id: string;
|
|
17
18
|
configuration: BackendConfiguration;
|
|
19
|
+
backend: import("../backends/local.backend").LocalBackend | import("../backends/s3.backend").S3Backend | import("../backends/yucca.backend").YuccaBackend;
|
|
18
20
|
}>;
|
|
19
21
|
}
|
|
@@ -16,6 +16,7 @@ exports.BackendRepository = void 0;
|
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
17
|
const kysely_1 = require("kysely");
|
|
18
18
|
const nestjs_kysely_1 = require("nestjs-kysely");
|
|
19
|
+
const backend_1 = require("../backends/backend");
|
|
19
20
|
let BackendRepository = class BackendRepository {
|
|
20
21
|
db;
|
|
21
22
|
constructor(db) {
|
|
@@ -34,10 +35,12 @@ let BackendRepository = class BackendRepository {
|
|
|
34
35
|
}
|
|
35
36
|
async getBackends() {
|
|
36
37
|
const backends = await this.db.selectFrom('backends').selectAll('backends').execute();
|
|
37
|
-
return backends
|
|
38
|
+
return backends
|
|
39
|
+
.map(({ id, configuration }) => ({
|
|
38
40
|
id,
|
|
39
41
|
configuration: JSON.parse(configuration),
|
|
40
|
-
}))
|
|
42
|
+
}))
|
|
43
|
+
.map(({ id, configuration }) => ({ id, configuration, backend: backend_1.Backend.from(configuration) }));
|
|
41
44
|
}
|
|
42
45
|
async getBackend(id) {
|
|
43
46
|
const backend = await this.db
|
|
@@ -45,9 +48,11 @@ let BackendRepository = class BackendRepository {
|
|
|
45
48
|
.selectAll('backends')
|
|
46
49
|
.where('id', '=', id)
|
|
47
50
|
.executeTakeFirstOrThrow();
|
|
51
|
+
const configuration = JSON.parse(backend.configuration);
|
|
48
52
|
return {
|
|
49
53
|
id: backend.id,
|
|
50
|
-
configuration
|
|
54
|
+
configuration,
|
|
55
|
+
backend: backend_1.Backend.from(configuration),
|
|
51
56
|
};
|
|
52
57
|
}
|
|
53
58
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend.repository.js","sourceRoot":"","sources":["../../src/repositories/backend.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mCAAgC;AAChC,iDAA6C;
|
|
1
|
+
{"version":3,"file":"backend.repository.js","sourceRoot":"","sources":["../../src/repositories/backend.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mCAAgC;AAChC,iDAA6C;AAC7C,iDAA8C;AAKvC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IACsB;IAAlD,YAAkD,EAAc;QAAd,OAAE,GAAF,EAAE,CAAY;IAAG,CAAC;IAEpE,KAAK,CAAC,aAAa,CAAC,EAAU,EAAE,aAAmC;QACjE,OAAO,MAAM,IAAI,CAAC,EAAE;aACjB,UAAU,CAAC,UAAU,CAAC;aACtB,MAAM,CAAC;YACN,EAAE;YACF,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC;SAC7C,CAAC;aACD,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;aACpF,YAAY,EAAE;aACd,uBAAuB,EAAE,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC;QACtF,OAAO,QAAQ;aACZ,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,CAAC;YAC/B,EAAE;YACF,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,CAAyB;SACjE,CAAC,CAAC;aACF,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,iBAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC;IACnG,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU;QACzB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,EAAE;aAC1B,UAAU,CAAC,UAAU,CAAC;aACtB,SAAS,CAAC,UAAU,CAAC;aACrB,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC;aACpB,uBAAuB,EAAE,CAAC;QAE7B,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAyB,CAAC;QAEhF,OAAO;YACL,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,aAAa;YACb,OAAO,EAAE,iBAAO,CAAC,IAAI,CAAC,aAAa,CAAC;SACrC,CAAC;IACJ,CAAC;CACF,CAAA;AAxCY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;IAEE,WAAA,IAAA,4BAAY,EAAC,cAAc,CAAC,CAAA;qCAAa,eAAM;GADjD,iBAAiB,CAwC7B"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
+
exports.BootstrapRepository = void 0;
|
|
10
|
+
const common_1 = require("@nestjs/common");
|
|
11
|
+
const enum_1 = require("../enum");
|
|
12
|
+
let BootstrapRepository = class BootstrapRepository {
|
|
13
|
+
status = enum_1.BootstrapStatus.NotReady;
|
|
14
|
+
error;
|
|
15
|
+
markReady() {
|
|
16
|
+
this.status = enum_1.BootstrapStatus.Ready;
|
|
17
|
+
}
|
|
18
|
+
markFailed(error) {
|
|
19
|
+
this.status = enum_1.BootstrapStatus.Error;
|
|
20
|
+
this.error = error;
|
|
21
|
+
}
|
|
22
|
+
getStatus() {
|
|
23
|
+
return this.status;
|
|
24
|
+
}
|
|
25
|
+
getError() {
|
|
26
|
+
return this.error;
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
exports.BootstrapRepository = BootstrapRepository;
|
|
30
|
+
exports.BootstrapRepository = BootstrapRepository = __decorate([
|
|
31
|
+
(0, common_1.Injectable)()
|
|
32
|
+
], BootstrapRepository);
|
|
33
|
+
//# sourceMappingURL=bootstrap.repository.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bootstrap.repository.js","sourceRoot":"","sources":["../../src/repositories/bootstrap.repository.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAC5C,kCAA0C;AAGnC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IACtB,MAAM,GAAoB,sBAAe,CAAC,QAAQ,CAAC;IACnD,KAAK,CAAM;IAEnB,SAAS;QACP,IAAI,CAAC,MAAM,GAAG,sBAAe,CAAC,KAAK,CAAC;IACtC,CAAC;IAED,UAAU,CAAC,KAAU;QACnB,IAAI,CAAC,MAAM,GAAG,sBAAe,CAAC,KAAK,CAAC;QACpC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;CACF,CAAA;AApBY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;GACA,mBAAmB,CAoB/B"}
|
|
@@ -13,6 +13,8 @@ export declare class ConfigRepository {
|
|
|
13
13
|
importEncryptionKey(key: string): Promise<void>;
|
|
14
14
|
hasOnboardedKey(): Promise<boolean>;
|
|
15
15
|
confirmKeyOnboarded(): Promise<void>;
|
|
16
|
+
hasTelemetry(): Promise<boolean>;
|
|
17
|
+
enableTelemetry(): Promise<void>;
|
|
16
18
|
hasSkippedExtraConfig(): Promise<boolean>;
|
|
17
19
|
skipExtraConfig(): Promise<void>;
|
|
18
20
|
}
|
|
@@ -77,6 +77,12 @@ let ConfigRepository = class ConfigRepository {
|
|
|
77
77
|
async confirmKeyOnboarded() {
|
|
78
78
|
return this.set(enum_1.ConfigurationKey.OnboardedKey, '1');
|
|
79
79
|
}
|
|
80
|
+
async hasTelemetry() {
|
|
81
|
+
return this.has(enum_1.ConfigurationKey.Telemetry);
|
|
82
|
+
}
|
|
83
|
+
async enableTelemetry() {
|
|
84
|
+
return this.set(enum_1.ConfigurationKey.Telemetry, 'full');
|
|
85
|
+
}
|
|
80
86
|
async hasSkippedExtraConfig() {
|
|
81
87
|
return this.has(enum_1.ConfigurationKey.SkippedOnboardingExtraConfig);
|
|
82
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.repository.js","sourceRoot":"","sources":["../../src/repositories/config.repository.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.repository.js","sourceRoot":"","sources":["../../src/repositories/config.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,37 @@ import { RepositorySnapshotRestoreRequestDto } from '../dto/repository.dto';
|
|
|
3
3
|
import { RetentionPolicy } from '../utils/restic';
|
|
4
4
|
export declare class ResticRepository {
|
|
5
5
|
init(repository: string, key: Uint8Array): Promise<void>;
|
|
6
|
-
backup(repository: string, key: Uint8Array, paths: string[], logStream?: Writable, signal?: AbortSignal): Promise<
|
|
7
|
-
|
|
6
|
+
backup(repository: string, key: Uint8Array, paths: string[], logStream?: Writable, signal?: AbortSignal): Promise<{
|
|
7
|
+
message_type: "summary";
|
|
8
|
+
dry_run: boolean;
|
|
9
|
+
files_new: number;
|
|
10
|
+
files_changed: number;
|
|
11
|
+
files_unmodified: number;
|
|
12
|
+
dirs_new: number;
|
|
13
|
+
dirs_changed: number;
|
|
14
|
+
dirs_unmodified: number;
|
|
15
|
+
data_blobs: number;
|
|
16
|
+
tree_blobs: number;
|
|
17
|
+
data_added: number;
|
|
18
|
+
data_added_packed: number;
|
|
19
|
+
total_files_processed: number;
|
|
20
|
+
total_bytes_processed: number;
|
|
21
|
+
backup_start: Date;
|
|
22
|
+
backup_end: Date;
|
|
23
|
+
total_duration: number;
|
|
24
|
+
snapshot_id?: string | undefined;
|
|
25
|
+
}>;
|
|
26
|
+
restore(repository: string, key: Uint8Array, snapshotId: string, { include, target }: RepositorySnapshotRestoreRequestDto, logStream?: Writable, signal?: AbortSignal): Promise<{
|
|
27
|
+
message_type: "summary";
|
|
28
|
+
seconds_elapsed?: number | undefined;
|
|
29
|
+
total_files?: number | undefined;
|
|
30
|
+
files_restored?: number | undefined;
|
|
31
|
+
files_skipped?: number | undefined;
|
|
32
|
+
files_deleted?: number | undefined;
|
|
33
|
+
total_bytes?: number | undefined;
|
|
34
|
+
bytes_restored?: number | undefined;
|
|
35
|
+
bytes_skipped?: number | undefined;
|
|
36
|
+
}>;
|
|
8
37
|
ls(repository: string, key: Uint8Array, snapshotId: string, path: string): Promise<({
|
|
9
38
|
time: Date;
|
|
10
39
|
tree: string;
|
|
@@ -203,5 +232,5 @@ export declare class ResticRepository {
|
|
|
203
232
|
hostName: string;
|
|
204
233
|
created: Date;
|
|
205
234
|
}[]>;
|
|
206
|
-
unlockAll(repository: string, key: Uint8Array): Promise<
|
|
235
|
+
unlockAll(repository: string, key: Uint8Array): Promise<void>;
|
|
207
236
|
}
|
|
@@ -16,7 +16,7 @@ let ResticRepository = class ResticRepository {
|
|
|
16
16
|
}
|
|
17
17
|
async backup(repository, key, paths, logStream, signal) {
|
|
18
18
|
const write = (0, restic_1.createSampledLogWriter)(logStream);
|
|
19
|
-
await (0, restic_wrapper_1.backup)()
|
|
19
|
+
return await (0, restic_wrapper_1.backup)()
|
|
20
20
|
.repository(repository)
|
|
21
21
|
.password(Buffer.from(key).toString('hex'))
|
|
22
22
|
.addFile(...paths)
|
|
@@ -36,7 +36,7 @@ let ResticRepository = class ResticRepository {
|
|
|
36
36
|
if (include) {
|
|
37
37
|
command = command.include(...include);
|
|
38
38
|
}
|
|
39
|
-
await command.run();
|
|
39
|
+
return await command.run();
|
|
40
40
|
}
|
|
41
41
|
async ls(repository, key, snapshotId, path) {
|
|
42
42
|
return await (0, restic_wrapper_1.ls)()
|
|
@@ -82,11 +82,7 @@ let ResticRepository = class ResticRepository {
|
|
|
82
82
|
return await (0, restic_wrapper_1.keyList)().repository(repository).password(Buffer.from(key).toString('hex')).run();
|
|
83
83
|
}
|
|
84
84
|
async unlockAll(repository, key) {
|
|
85
|
-
return await (0, restic_wrapper_1.unlock)()
|
|
86
|
-
.removeAll()
|
|
87
|
-
.repository(repository)
|
|
88
|
-
.password(Buffer.from(key).toString('hex'))
|
|
89
|
-
.run();
|
|
85
|
+
return await (0, restic_wrapper_1.unlock)().removeAll().repository(repository).password(Buffer.from(key).toString('hex')).run();
|
|
90
86
|
}
|
|
91
87
|
};
|
|
92
88
|
exports.ResticRepository = ResticRepository;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restic.repository.js","sourceRoot":"","sources":["../../src/repositories/restic.repository.ts"],"names":[],"mappings":";;;;;;;;;AAAA,6DAAuH;AACvH,2CAA4C;AAG5C,4CAA0E;AAGnE,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,KAAK,CAAC,IAAI,CAAC,UAAkB,EAAE,GAAe;QAC5C,MAAM,IAAA,qBAAI,GAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;IACvF,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,UAAkB,EAAE,GAAe,EAAE,KAAe,EAAE,SAAoB,EAAE,MAAoB;QAC3G,MAAM,KAAK,GAAG,IAAA,+BAAsB,EAAC,SAAS,CAAC,CAAC;QAEhD,MAAM,IAAA,uBAAM,GAAE;
|
|
1
|
+
{"version":3,"file":"restic.repository.js","sourceRoot":"","sources":["../../src/repositories/restic.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend.table.js","sourceRoot":"","sources":["../../../src/schema/tables/backend.table.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"backend.table.js","sourceRoot":"","sources":["../../../src/schema/tables/backend.table.ts"],"names":[],"mappings":";;;AAwCA,MAAa,YAAY;IACvB,EAAE,CAAqB;IACvB,aAAa,CAAU;CACxB;AAHD,oCAGC"}
|
|
@@ -2,12 +2,14 @@ import { EventsGateway } from '../events/events.gateway';
|
|
|
2
2
|
import { BackendRepository } from '../repositories/backend.repository';
|
|
3
3
|
import { ConfigRepository } from '../repositories/config.repository';
|
|
4
4
|
import { ModuleConfigRepository } from '../repositories/moduleConfig.repository';
|
|
5
|
+
import { TelemetryService } from './telemetry.service';
|
|
5
6
|
export declare class AuthService {
|
|
6
7
|
readonly config: ConfigRepository;
|
|
7
8
|
readonly backend: BackendRepository;
|
|
8
9
|
readonly moduleConfig: ModuleConfigRepository;
|
|
9
10
|
readonly events: EventsGateway;
|
|
10
|
-
|
|
11
|
+
readonly telemetry: TelemetryService;
|
|
12
|
+
constructor(config: ConfigRepository, backend: BackendRepository, moduleConfig: ModuleConfigRepository, events: EventsGateway, telemetry: TelemetryService);
|
|
11
13
|
private waitForDeviceFlow;
|
|
12
14
|
oidcDeviceFlow(): Promise<{
|
|
13
15
|
userCode: string;
|
|
@@ -12,36 +12,44 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.AuthService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const eventsource_client_1 = require("eventsource-client");
|
|
15
|
+
const yucca_backend_1 = require("../backends/yucca.backend");
|
|
15
16
|
const const_1 = require("../const");
|
|
16
17
|
const enum_1 = require("../enum");
|
|
17
18
|
const events_gateway_1 = require("../events/events.gateway");
|
|
18
19
|
const backend_repository_1 = require("../repositories/backend.repository");
|
|
19
20
|
const config_repository_1 = require("../repositories/config.repository");
|
|
20
21
|
const moduleConfig_repository_1 = require("../repositories/moduleConfig.repository");
|
|
22
|
+
const telemetry_service_1 = require("./telemetry.service");
|
|
21
23
|
let AuthService = class AuthService {
|
|
22
24
|
config;
|
|
23
25
|
backend;
|
|
24
26
|
moduleConfig;
|
|
25
27
|
events;
|
|
26
|
-
|
|
28
|
+
telemetry;
|
|
29
|
+
constructor(config, backend, moduleConfig, events, telemetry) {
|
|
27
30
|
this.config = config;
|
|
28
31
|
this.backend = backend;
|
|
29
32
|
this.moduleConfig = moduleConfig;
|
|
30
33
|
this.events = events;
|
|
34
|
+
this.telemetry = telemetry;
|
|
31
35
|
}
|
|
32
|
-
async waitForDeviceFlow(events) {
|
|
36
|
+
async waitForDeviceFlow(events, url) {
|
|
33
37
|
for await (const { data } of events) {
|
|
34
38
|
const { type, accessToken } = JSON.parse(data);
|
|
35
39
|
switch (type) {
|
|
36
40
|
case 'SUCCESS': {
|
|
37
|
-
await this.backend.updateBackend(const_1.
|
|
41
|
+
await this.backend.updateBackend(const_1.REPOSITORY_DEFAULT_CLOUD_UUID, {
|
|
38
42
|
type: enum_1.BackendType.Yucca,
|
|
39
43
|
accessToken,
|
|
44
|
+
url,
|
|
45
|
+
});
|
|
46
|
+
this.telemetry.submitStructuredLog('Connected FUTO Backups backend', {
|
|
47
|
+
backendId: const_1.REPOSITORY_DEFAULT_CLOUD_UUID,
|
|
40
48
|
});
|
|
41
49
|
this.events.publish({
|
|
42
50
|
type: 'BackendCreate',
|
|
43
51
|
backend: {
|
|
44
|
-
id: const_1.
|
|
52
|
+
id: const_1.REPOSITORY_DEFAULT_CLOUD_UUID,
|
|
45
53
|
type: enum_1.BackendType.Yucca,
|
|
46
54
|
description: 'FUTO Backups',
|
|
47
55
|
isOnline: true,
|
|
@@ -50,6 +58,7 @@ let AuthService = class AuthService {
|
|
|
50
58
|
break;
|
|
51
59
|
}
|
|
52
60
|
case 'FAILURE': {
|
|
61
|
+
this.telemetry.submitStructuredLog('Device flow authentication failed', {});
|
|
53
62
|
this.events.publish({
|
|
54
63
|
type: 'DeviceFlowFailure',
|
|
55
64
|
});
|
|
@@ -60,13 +69,20 @@ let AuthService = class AuthService {
|
|
|
60
69
|
events.close();
|
|
61
70
|
}
|
|
62
71
|
async oidcDeviceFlow() {
|
|
72
|
+
const overrideEndpoint = this.moduleConfig.get().yuccaProductionApi;
|
|
73
|
+
const endpoint = overrideEndpoint ?? (await yucca_backend_1.yuccaWellKnown.getBaseUrl());
|
|
63
74
|
const events = (0, eventsource_client_1.createEventSource)({
|
|
64
|
-
url: new URL('/api/auth/oidc/device',
|
|
75
|
+
url: new URL('/api/auth/oidc/device', endpoint),
|
|
65
76
|
onDisconnect: () => events.close(),
|
|
66
77
|
});
|
|
78
|
+
const connectTimeout = setTimeout(() => events.close(), 10_000);
|
|
67
79
|
for await (const { data } of events) {
|
|
80
|
+
clearTimeout(connectTimeout);
|
|
68
81
|
const { userCode, verificationUri } = JSON.parse(data);
|
|
69
|
-
void this.waitForDeviceFlow(events).catch(() => {
|
|
82
|
+
void this.waitForDeviceFlow(events, overrideEndpoint).catch((error) => {
|
|
83
|
+
this.telemetry.submitStructuredLog('Device flow authentication errored', { error });
|
|
84
|
+
this.events.publish({ type: 'DeviceFlowFailure' });
|
|
85
|
+
});
|
|
70
86
|
return {
|
|
71
87
|
userCode,
|
|
72
88
|
verificationUri,
|
|
@@ -81,6 +97,7 @@ exports.AuthService = AuthService = __decorate([
|
|
|
81
97
|
__metadata("design:paramtypes", [config_repository_1.ConfigRepository,
|
|
82
98
|
backend_repository_1.BackendRepository,
|
|
83
99
|
moduleConfig_repository_1.ModuleConfigRepository,
|
|
84
|
-
events_gateway_1.EventsGateway
|
|
100
|
+
events_gateway_1.EventsGateway,
|
|
101
|
+
telemetry_service_1.TelemetryService])
|
|
85
102
|
], AuthService);
|
|
86
103
|
//# sourceMappingURL=auth.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/services/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA0E;AAC1E,2DAA0E;AAC1E,
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/services/auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { BackendResponseDto, BackendsResponseDto, CreateLocalBackendRequestDto } from '../dto/backend.dto';
|
|
2
2
|
import { EventsGateway } from '../events/events.gateway';
|
|
3
3
|
import { BackendRepository } from '../repositories/backend.repository';
|
|
4
|
-
import {
|
|
4
|
+
import { TelemetryService } from './telemetry.service';
|
|
5
5
|
export declare class BackendService {
|
|
6
|
-
private readonly moduleConfig;
|
|
7
6
|
private readonly repository;
|
|
8
7
|
private readonly events;
|
|
9
|
-
|
|
8
|
+
private readonly telemetry;
|
|
9
|
+
constructor(repository: BackendRepository, events: EventsGateway, telemetry: TelemetryService);
|
|
10
10
|
getBackends(): Promise<BackendsResponseDto>;
|
|
11
11
|
createLocalBackend(dto: CreateLocalBackendRequestDto): Promise<BackendResponseDto>;
|
|
12
12
|
}
|
|
@@ -16,19 +16,19 @@ const backend_1 = require("../backends/backend");
|
|
|
16
16
|
const enum_1 = require("../enum");
|
|
17
17
|
const events_gateway_1 = require("../events/events.gateway");
|
|
18
18
|
const backend_repository_1 = require("../repositories/backend.repository");
|
|
19
|
-
const
|
|
19
|
+
const telemetry_service_1 = require("./telemetry.service");
|
|
20
20
|
let BackendService = class BackendService {
|
|
21
|
-
moduleConfig;
|
|
22
21
|
repository;
|
|
23
22
|
events;
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
telemetry;
|
|
24
|
+
constructor(repository, events, telemetry) {
|
|
26
25
|
this.repository = repository;
|
|
27
26
|
this.events = events;
|
|
27
|
+
this.telemetry = telemetry;
|
|
28
28
|
}
|
|
29
29
|
async getBackends() {
|
|
30
30
|
const backends = await this.repository.getBackends();
|
|
31
|
-
const error = await Promise.all(backends.map((backend) => backend_1.Backend.from(backend.configuration
|
|
31
|
+
const error = await Promise.all(backends.map((backend) => backend_1.Backend.from(backend.configuration)
|
|
32
32
|
.checkOnline()
|
|
33
33
|
.then(() => void 0)
|
|
34
34
|
.catch((error) => error)));
|
|
@@ -57,6 +57,10 @@ let BackendService = class BackendService {
|
|
|
57
57
|
description: dto.path,
|
|
58
58
|
isOnline: true,
|
|
59
59
|
};
|
|
60
|
+
this.telemetry.submitStructuredLog('Created backend', {
|
|
61
|
+
backendId: id,
|
|
62
|
+
type: enum_1.BackendType.Local,
|
|
63
|
+
});
|
|
60
64
|
this.events.publish({
|
|
61
65
|
type: 'BackendCreate',
|
|
62
66
|
backend,
|
|
@@ -67,8 +71,8 @@ let BackendService = class BackendService {
|
|
|
67
71
|
exports.BackendService = BackendService;
|
|
68
72
|
exports.BackendService = BackendService = __decorate([
|
|
69
73
|
(0, common_1.Injectable)(),
|
|
70
|
-
__metadata("design:paramtypes", [
|
|
71
|
-
|
|
72
|
-
|
|
74
|
+
__metadata("design:paramtypes", [backend_repository_1.BackendRepository,
|
|
75
|
+
events_gateway_1.EventsGateway,
|
|
76
|
+
telemetry_service_1.TelemetryService])
|
|
73
77
|
], BackendService);
|
|
74
78
|
//# sourceMappingURL=backend.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backend.service.js","sourceRoot":"","sources":["../../src/services/backend.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAyC;AACzC,iDAA8C;AAE9C,kCAAsC;AACtC,6DAAyD;AACzD,2EAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"backend.service.js","sourceRoot":"","sources":["../../src/services/backend.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAyC;AACzC,iDAA8C;AAE9C,kCAAsC;AACtC,6DAAyD;AACzD,2EAAuE;AACvE,2DAAuD;AAGhD,IAAM,cAAc,GAApB,MAAM,cAAc;IAEN;IACA;IACA;IAHnB,YACmB,UAA6B,EAC7B,MAAqB,EACrB,SAA2B;QAF3B,eAAU,GAAV,UAAU,CAAmB;QAC7B,WAAM,GAAN,MAAM,CAAe;QACrB,cAAS,GAAT,SAAS,CAAkB;IAC3C,CAAC;IAEJ,KAAK,CAAC,WAAW;QACf,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;QAErD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CAC7B,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACvB,iBAAO,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;aAChC,WAAW,EAAE;aACb,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;aAClB,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAC3B,CACF,CAAC;QAEF,OAAO;YACL,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;gBACxC,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI;gBAChC,WAAW,EACT,OAAO,CAAC,aAAa,CAAC,IAAI,KAAK,kBAAW,CAAC,KAAK;oBAC9C,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,cAAc;oBAC7C,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,KAAK,kBAAW,CAAC,KAAK;wBAChD,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI;wBAC5B,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ;gBACtC,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,SAAS;gBAClC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC;aAClB,CAAC,CAAC;SACJ,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,GAAiC;QACxD,MAAM,EAAE,EAAE,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,IAAA,wBAAU,GAAE,EAAE;YAC/D,IAAI,EAAE,kBAAW,CAAC,KAAK;YACvB,IAAI,EAAE,GAAG,CAAC,IAAI;SACf,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG;YACd,IAAI,EAAE,kBAAW,CAAC,KAAK;YACvB,EAAE;YACF,WAAW,EAAE,GAAG,CAAC,IAAI;YACrB,QAAQ,EAAE,IAAI;SACf,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,iBAAiB,EAAE;YACpD,SAAS,EAAE,EAAE;YACb,IAAI,EAAE,kBAAW,CAAC,KAAK;SACxB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;YAClB,IAAI,EAAE,eAAe;YACrB,OAAO;SACR,CAAC,CAAC;QAEH,OAAO,EAAE,OAAO,EAAE,CAAC;IACrB,CAAC;CACF,CAAA;AA5DY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAGoB,sCAAiB;QACrB,8BAAa;QACV,oCAAgB;GAJnC,cAAc,CA4D1B"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { OnApplicationBootstrap } from '@nestjs/common';
|
|
2
|
+
import { BootstrapRepository } from '../repositories/bootstrap.repository';
|
|
2
3
|
import { ConfigRepository } from '../repositories/config.repository';
|
|
3
4
|
import { DatabaseRepository } from '../repositories/database.repository';
|
|
4
5
|
import { RunHistoryRepository } from '../repositories/runHistory.repository';
|
|
@@ -8,6 +9,7 @@ export declare class BootstrapService implements OnApplicationBootstrap {
|
|
|
8
9
|
private readonly config;
|
|
9
10
|
private readonly schedule;
|
|
10
11
|
private readonly runHistoryRepository;
|
|
11
|
-
|
|
12
|
+
private readonly bootstrap;
|
|
13
|
+
constructor(database: DatabaseRepository, config: ConfigRepository, schedule: ScheduleService, runHistoryRepository: RunHistoryRepository, bootstrap: BootstrapRepository);
|
|
12
14
|
onApplicationBootstrap(): Promise<void>;
|
|
13
15
|
}
|
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.BootstrapService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
|
+
const bootstrap_repository_1 = require("../repositories/bootstrap.repository");
|
|
14
15
|
const config_repository_1 = require("../repositories/config.repository");
|
|
15
16
|
const database_repository_1 = require("../repositories/database.repository");
|
|
16
17
|
const runHistory_repository_1 = require("../repositories/runHistory.repository");
|
|
@@ -20,17 +21,25 @@ let BootstrapService = class BootstrapService {
|
|
|
20
21
|
config;
|
|
21
22
|
schedule;
|
|
22
23
|
runHistoryRepository;
|
|
23
|
-
|
|
24
|
+
bootstrap;
|
|
25
|
+
constructor(database, config, schedule, runHistoryRepository, bootstrap) {
|
|
24
26
|
this.database = database;
|
|
25
27
|
this.config = config;
|
|
26
28
|
this.schedule = schedule;
|
|
27
29
|
this.runHistoryRepository = runHistoryRepository;
|
|
30
|
+
this.bootstrap = bootstrap;
|
|
28
31
|
}
|
|
29
32
|
async onApplicationBootstrap() {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
33
|
+
try {
|
|
34
|
+
await this.database.runMigrations();
|
|
35
|
+
await this.config.bootstrap();
|
|
36
|
+
await this.schedule.bootstrap();
|
|
37
|
+
await this.runHistoryRepository.markIncompleteAsFailed();
|
|
38
|
+
this.bootstrap.markReady();
|
|
39
|
+
}
|
|
40
|
+
catch (error) {
|
|
41
|
+
this.bootstrap.markFailed(error);
|
|
42
|
+
}
|
|
34
43
|
}
|
|
35
44
|
};
|
|
36
45
|
exports.BootstrapService = BootstrapService;
|
|
@@ -39,6 +48,7 @@ exports.BootstrapService = BootstrapService = __decorate([
|
|
|
39
48
|
__metadata("design:paramtypes", [database_repository_1.DatabaseRepository,
|
|
40
49
|
config_repository_1.ConfigRepository,
|
|
41
50
|
schedule_service_1.ScheduleService,
|
|
42
|
-
runHistory_repository_1.RunHistoryRepository
|
|
51
|
+
runHistory_repository_1.RunHistoryRepository,
|
|
52
|
+
bootstrap_repository_1.BootstrapRepository])
|
|
43
53
|
], BootstrapService);
|
|
44
54
|
//# sourceMappingURL=bootstrap.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.service.js","sourceRoot":"","sources":["../../src/services/bootstrap.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAoE;AACpE,yEAAqE;AACrE,6EAAyE;AACzE,iFAA6E;AAC7E,yDAAqD;AAG9C,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAER;IACA;IACA;IACA;
|
|
1
|
+
{"version":3,"file":"bootstrap.service.js","sourceRoot":"","sources":["../../src/services/bootstrap.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAoE;AACpE,+EAA2E;AAC3E,yEAAqE;AACrE,6EAAyE;AACzE,iFAA6E;AAC7E,yDAAqD;AAG9C,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAER;IACA;IACA;IACA;IACA;IALnB,YACmB,QAA4B,EAC5B,MAAwB,EACxB,QAAyB,EACzB,oBAA0C,EAC1C,SAA8B;QAJ9B,aAAQ,GAAR,QAAQ,CAAoB;QAC5B,WAAM,GAAN,MAAM,CAAkB;QACxB,aAAQ,GAAR,QAAQ,CAAiB;QACzB,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,cAAS,GAAT,SAAS,CAAqB;IAC9C,CAAC;IAEJ,KAAK,CAAC,sBAAsB;QAC1B,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC;YACpC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YAC9B,MAAM,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;YAChC,MAAM,IAAI,CAAC,oBAAoB,CAAC,sBAAsB,EAAE,CAAC;YAEzD,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;QAC7B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;CACF,CAAA;AArBY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAGkB,wCAAkB;QACpB,oCAAgB;QACd,kCAAe;QACH,4CAAoB;QAC/B,0CAAmB;GANtC,gBAAgB,CAqB5B"}
|
|
@@ -6,6 +6,7 @@ import { RepositoryIntegrationImmichRepository } from '../repositories/repositor
|
|
|
6
6
|
import { RepositoryPathRepository } from '../repositories/repositoryPath.repository';
|
|
7
7
|
import { RepositoryService } from './repository.service';
|
|
8
8
|
import { ScheduleService } from './schedule.service';
|
|
9
|
+
import { TelemetryService } from './telemetry.service';
|
|
9
10
|
export declare class IntegrationsService {
|
|
10
11
|
private readonly events;
|
|
11
12
|
private readonly moduleConfig;
|
|
@@ -13,7 +14,8 @@ export declare class IntegrationsService {
|
|
|
13
14
|
private readonly repositoryPath;
|
|
14
15
|
private readonly repositoryService;
|
|
15
16
|
private readonly scheduleService;
|
|
16
|
-
|
|
17
|
+
private readonly telemetry;
|
|
18
|
+
constructor(events: EventsGateway, moduleConfig: ModuleConfigRepository, repositoryIntegrationImmich: RepositoryIntegrationImmichRepository, repositoryPath: RepositoryPathRepository, repositoryService: RepositoryService, scheduleService: ScheduleService, telemetry: TelemetryService);
|
|
17
19
|
onModuleConfigUpdate(moduleConfig: ModuleConfig): Promise<void>;
|
|
18
20
|
getIntegrationsConfig(): Promise<IntegrationsResponseDto>;
|
|
19
21
|
configureImmichIntegration(dto: ConfigureImmichIntegrationRequestDto): Promise<void>;
|
|
@@ -20,6 +20,7 @@ const repositoryIntegrationImmich_repository_1 = require("../repositories/reposi
|
|
|
20
20
|
const repositoryPath_repository_1 = require("../repositories/repositoryPath.repository");
|
|
21
21
|
const repository_service_1 = require("./repository.service");
|
|
22
22
|
const schedule_service_1 = require("./schedule.service");
|
|
23
|
+
const telemetry_service_1 = require("./telemetry.service");
|
|
23
24
|
let IntegrationsService = class IntegrationsService {
|
|
24
25
|
events;
|
|
25
26
|
moduleConfig;
|
|
@@ -27,13 +28,15 @@ let IntegrationsService = class IntegrationsService {
|
|
|
27
28
|
repositoryPath;
|
|
28
29
|
repositoryService;
|
|
29
30
|
scheduleService;
|
|
30
|
-
|
|
31
|
+
telemetry;
|
|
32
|
+
constructor(events, moduleConfig, repositoryIntegrationImmich, repositoryPath, repositoryService, scheduleService, telemetry) {
|
|
31
33
|
this.events = events;
|
|
32
34
|
this.moduleConfig = moduleConfig;
|
|
33
35
|
this.repositoryIntegrationImmich = repositoryIntegrationImmich;
|
|
34
36
|
this.repositoryPath = repositoryPath;
|
|
35
37
|
this.repositoryService = repositoryService;
|
|
36
38
|
this.scheduleService = scheduleService;
|
|
39
|
+
this.telemetry = telemetry;
|
|
37
40
|
}
|
|
38
41
|
async onModuleConfigUpdate(moduleConfig) {
|
|
39
42
|
if (moduleConfig.immichIntegration) {
|
|
@@ -96,6 +99,10 @@ let IntegrationsService = class IntegrationsService {
|
|
|
96
99
|
};
|
|
97
100
|
await this.repositoryIntegrationImmich.upsert(repositoryId, scheduleId, configuration);
|
|
98
101
|
await this.syncImmichRepositoryPaths(repositoryId, configuration, immichIntegration);
|
|
102
|
+
this.telemetry.submitStructuredLog('Configured Immich integration', {
|
|
103
|
+
repositoryId,
|
|
104
|
+
scheduleId,
|
|
105
|
+
});
|
|
99
106
|
this.events.publish({
|
|
100
107
|
type: 'IntegrationUpdate',
|
|
101
108
|
integrations: await this.getIntegrationsConfig(),
|
|
@@ -153,6 +160,7 @@ exports.IntegrationsService = IntegrationsService = __decorate([
|
|
|
153
160
|
repositoryIntegrationImmich_repository_1.RepositoryIntegrationImmichRepository,
|
|
154
161
|
repositoryPath_repository_1.RepositoryPathRepository,
|
|
155
162
|
repository_service_1.RepositoryService,
|
|
156
|
-
schedule_service_1.ScheduleService
|
|
163
|
+
schedule_service_1.ScheduleService,
|
|
164
|
+
telemetry_service_1.TelemetryService])
|
|
157
165
|
], IntegrationsService);
|
|
158
166
|
//# sourceMappingURL=integrations.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integrations.service.js","sourceRoot":"","sources":["../../src/services/integrations.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAiE;AACjE,yDAAgD;AAChD,yCAAiC;AAEjC,kCAAwC;AACxC,6DAAyD;AAEzD,qFAAiF;AACjF,mHAA+G;AAC/G,yFAAqF;AAErF,6DAAyD;AACzD,yDAAqD;
|
|
1
|
+
{"version":3,"file":"integrations.service.js","sourceRoot":"","sources":["../../src/services/integrations.service.ts"],"names":[],"mappings":"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"}
|