@overlordai/server 1.0.27 → 1.0.31
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/database/repositories/machine.repository.d.ts +2 -1
- package/dist/database/repositories/machine.repository.d.ts.map +1 -1
- package/dist/database/repositories/machine.repository.js +17 -5
- package/dist/database/repositories/machine.repository.js.map +1 -1
- package/dist/database/repositories/project-member.repository.d.ts +7 -0
- package/dist/database/repositories/project-member.repository.d.ts.map +1 -1
- package/dist/database/repositories/project-member.repository.js +31 -1
- package/dist/database/repositories/project-member.repository.js.map +1 -1
- package/dist/database/repositories/project.repository.d.ts +1 -0
- package/dist/database/repositories/project.repository.d.ts.map +1 -1
- package/dist/database/repositories/project.repository.js +5 -2
- package/dist/database/repositories/project.repository.js.map +1 -1
- package/dist/database/repositories/task.repository.d.ts +2 -0
- package/dist/database/repositories/task.repository.d.ts.map +1 -1
- package/dist/database/repositories/task.repository.js +15 -0
- package/dist/database/repositories/task.repository.js.map +1 -1
- package/dist/dispatcher/dispatcher.service.d.ts.map +1 -1
- package/dist/dispatcher/dispatcher.service.js +10 -1
- package/dist/dispatcher/dispatcher.service.js.map +1 -1
- package/dist/dispatcher/machine-selector.d.ts.map +1 -1
- package/dist/dispatcher/machine-selector.js +4 -0
- package/dist/dispatcher/machine-selector.js.map +1 -1
- package/dist/dispatcher/reconciler.d.ts +2 -0
- package/dist/dispatcher/reconciler.d.ts.map +1 -1
- package/dist/dispatcher/reconciler.js +7 -3
- package/dist/dispatcher/reconciler.js.map +1 -1
- package/dist/main.js +0 -0
- package/dist/web/admin/admin-machine.controller.d.ts +12 -1
- package/dist/web/admin/admin-machine.controller.d.ts.map +1 -1
- package/dist/web/admin/admin-machine.controller.js +71 -3
- package/dist/web/admin/admin-machine.controller.js.map +1 -1
- package/dist/web/admin/admin-project.controller.d.ts +2 -0
- package/dist/web/admin/admin-project.controller.d.ts.map +1 -1
- package/dist/web/admin/admin-project.controller.js +2 -1
- package/dist/web/admin/admin-project.controller.js.map +1 -1
- package/dist/web/machine.controller.d.ts +12 -0
- package/dist/web/machine.controller.d.ts.map +1 -1
- package/dist/web/machine.controller.js +7 -0
- package/dist/web/machine.controller.js.map +1 -1
- package/dist/web/project.controller.d.ts +34 -2
- package/dist/web/project.controller.d.ts.map +1 -1
- package/dist/web/project.controller.js +18 -3
- package/dist/web/project.controller.js.map +1 -1
- package/package.json +9 -9
- package/public/assets/{AccessTokensPage-DjXg_GcZ.js → AccessTokensPage-Beru3_uy.js} +1 -1
- package/public/assets/{AdminPage-LU3VU8sd.js → AdminPage-C9GCTLmr.js} +1 -1
- package/public/assets/{ApiReferencePage-BMDuk9em.js → ApiReferencePage-D-Fjl8KM.js} +1 -1
- package/public/assets/{AuditLogPage-BQnvLBUm.js → AuditLogPage-Bpgs5-4t.js} +1 -1
- package/public/assets/{BotManage-Is69ZQBf.js → BotManage-ByFUoMlI.js} +1 -1
- package/public/assets/CliReferencePage-CkOKnvml.js +8 -0
- package/public/assets/{DeveloperManage-Ma4FgQXQ.js → DeveloperManage-DX12zFgn.js} +1 -1
- package/public/assets/{EditProjectPage-C78aJ078.js → EditProjectPage-DlK_Ix-g.js} +2 -2
- package/public/assets/{EmptyState-BQ2BNVJS.js → EmptyState-B5qaL1Ft.js} +1 -1
- package/public/assets/HomePage-NfxPPkMz.js +1 -0
- package/public/assets/LandingPage-DWdKl5kd.js +36 -0
- package/public/assets/{LoginPage-CMyyf5ts.js → LoginPage-CjzZ3RX2.js} +1 -1
- package/public/assets/MachineDetailPage-2B713TKQ.js +1 -0
- package/public/assets/MachineListPage-DWiQXnAq.js +6 -0
- package/public/assets/{NotFoundPage-Ck2hYu_B.js → NotFoundPage-CXxb3Nk1.js} +1 -1
- package/public/assets/{PipelineEditorPage-hoXGXxtB.js → PipelineEditorPage-DzgL7Mbc.js} +1 -1
- package/public/assets/{ProfilePage-DQQh-J_f.js → ProfilePage-bdFIMKIC.js} +1 -1
- package/public/assets/ProjectDetailPage-ngZeWsrI.js +7 -0
- package/public/assets/ProjectListPage-BQC9noAd.js +6 -0
- package/public/assets/{QuickAuth-CoRuLOkE.js → QuickAuth-BHBoThUh.js} +1 -1
- package/public/assets/RemoveMemberConfirmDialog-CGkSeDTJ.js +6 -0
- package/public/assets/{Select-cAwdx-J1.js → Select-B2hs4bPZ.js} +2 -2
- package/public/assets/{SettingsPage-vlEdzALt.js → SettingsPage-CXxoYjb1.js} +1 -1
- package/public/assets/{Skeleton-DkwMPaZ1.js → Skeleton-CyWhQxlf.js} +1 -1
- package/public/assets/SkillPage-DlnLHNuI.js +1 -0
- package/public/assets/{TaskDetailPage-CSM2ew4E.js → TaskDetailPage-DUQWe5wB.js} +1 -1
- package/public/assets/{TaskListPage-Dr_IZ2vJ.js → TaskListPage-Cg1ETrwI.js} +1 -1
- package/public/assets/{TaskStatusBadge-B6pZ1mXD.js → TaskStatusBadge-D-fJDHQh.js} +1 -1
- package/public/assets/TokenManage-Bcru_MF_.js +1 -0
- package/public/assets/{TotpSetupPage-CedCLn9b.js → TotpSetupPage-XZCrdH2V.js} +1 -1
- package/public/assets/{WorkerSetupGuidePage-C-faBGTF.js → WorkerSetupGuidePage-B0a3heGA.js} +1 -1
- package/public/assets/{arrow-left-B701wpRZ.js → arrow-left-CxR172-I.js} +1 -1
- package/public/assets/{arrow-right-B4SWX5QX.js → arrow-right-Bxsjp0zK.js} +1 -1
- package/public/assets/{bot-BMG_Lak4.js → bot-LvDZi4g_.js} +1 -1
- package/public/assets/{chevron-right-Dv5NEUXH.js → chevron-right-CoYBbtaS.js} +1 -1
- package/public/assets/{copy-C0vNNRrm.js → copy-BOEo9gzs.js} +1 -1
- package/public/assets/{external-link-CVx7jdXb.js → external-link-DEXczFxv.js} +1 -1
- package/public/assets/index-BiwmRYQP.js +212 -0
- package/public/assets/index-MbPa7F7Y.css +1 -0
- package/public/assets/{key-OwB_ZR3T.js → key-BKYKn-II.js} +1 -1
- package/public/assets/{loader-circle-BN3eQzTt.js → loader-circle-CGl2dNxT.js} +1 -1
- package/public/assets/{pencil-BtnOFy3d.js → pencil-DJx3NobK.js} +1 -1
- package/public/assets/{plus-Cm_mqbAL.js → plus-B1evYZLw.js} +1 -1
- package/public/assets/protocol-C5uQmiiB.js +1 -0
- package/public/assets/{rotate-ccw-Di9lk9Jq.js → rotate-ccw-DIm7zEDs.js} +1 -1
- package/public/assets/{scroll-text-C8HTue-V.js → scroll-text-DXm8XEUQ.js} +1 -1
- package/public/assets/{settings-BxP_lYKz.js → settings-C0zveA0i.js} +1 -1
- package/public/assets/{task.store-CRByTXd0.js → task.store-BT1elMl0.js} +1 -1
- package/public/assets/{trash-2-Bzd6fyHf.js → trash-2-D_ao7mjo.js} +1 -1
- package/public/assets/{users-DmYD60pt.js → users-DNGcsSkr.js} +1 -1
- package/public/favicon.svg +2 -2
- package/public/index.html +3 -3
- package/public/assets/CliReferencePage-DpDJXb2B.js +0 -8
- package/public/assets/HomePage-Bl0KZPgn.js +0 -1
- package/public/assets/LandingPage-Bxv40luT.js +0 -26
- package/public/assets/MachineDetailPage-BARcjlVJ.js +0 -1
- package/public/assets/MachineListPage-C044mEFY.js +0 -6
- package/public/assets/ProjectDetailPage-7wHRY-_7.js +0 -7
- package/public/assets/ProjectListPage-Cpzf-qNq.js +0 -6
- package/public/assets/RemoveMemberConfirmDialog-C-UcPD2-.js +0 -6
- package/public/assets/TokenManage-TLgRE0QO.js +0 -1
- package/public/assets/index-BTxGPsOB.js +0 -207
- package/public/assets/index-v5rpOoDH.css +0 -1
- package/public/assets/protocol-C4f2G7mk.js +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machine-selector.js","sourceRoot":"","sources":["../../src/dispatcher/machine-selector.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"machine-selector.js","sourceRoot":"","sources":["../../src/dispatcher/machine-selector.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,8 @@ export declare class Reconciler implements OnModuleInit {
|
|
|
33
33
|
private sendCancelToWorker;
|
|
34
34
|
/** Send cleanup instruction to Worker for a specific task. */
|
|
35
35
|
private sendCleanupToWorker;
|
|
36
|
+
/** Check if a machine is unavailable (missing, offline, or decommissioned). */
|
|
37
|
+
private isMachineUnavailable;
|
|
36
38
|
/** Schedule workspace cleanup for a task that reached a terminal state. */
|
|
37
39
|
private scheduleWorkspaceCleanup;
|
|
38
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconciler.d.ts","sourceRoot":"","sources":["../../src/dispatcher/reconciler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAElE,OAAO,KAAK,EAGV,oBAAoB,EAIrB,MAAM,sBAAsB,CAAC;AAS9B,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,qBACa,UAAW,YAAW,YAAY;IAI3C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IAT1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+B;gBAGnC,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,iBAAiB,EAC9B,YAAY,EAAE,kBAAkB,EAChC,aAAa,EAAE,mBAAmB,EAClC,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,cAAc,EAC9B,uBAAuB,EAAE,uBAAuB;IAG7D,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAU7B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAyLvB,eAAe,CACnB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,oBAAoB,CAAC,OAAO,CAAC,GACnC,OAAO,CAAC,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAkGrD,OAAO,CAAC,qBAAqB;IAyP7B;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAqC5B,yDAAyD;IACzD,OAAO,CAAC,kBAAkB;IAS1B,8DAA8D;IAC9D,OAAO,CAAC,mBAAmB;IAW3B,2EAA2E;IAC3E,OAAO,CAAC,wBAAwB;CAcjC"}
|
|
1
|
+
{"version":3,"file":"reconciler.d.ts","sourceRoot":"","sources":["../../src/dispatcher/reconciler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAElE,OAAO,KAAK,EAGV,oBAAoB,EAIrB,MAAM,sBAAsB,CAAC;AAS9B,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,qBACa,UAAW,YAAW,YAAY;IAI3C,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IAT1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+B;gBAGnC,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,iBAAiB,EAC9B,YAAY,EAAE,kBAAkB,EAChC,aAAa,EAAE,mBAAmB,EAClC,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,cAAc,EAC9B,uBAAuB,EAAE,uBAAuB;IAG7D,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAU7B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAyLvB,eAAe,CACnB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,oBAAoB,CAAC,OAAO,CAAC,GACnC,OAAO,CAAC,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAkGrD,OAAO,CAAC,qBAAqB;IAyP7B;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAqC5B,yDAAyD;IACzD,OAAO,CAAC,kBAAkB;IAS1B,8DAA8D;IAC9D,OAAO,CAAC,mBAAmB;IAW3B,+EAA+E;IAC/E,OAAO,CAAC,oBAAoB;IAI5B,2EAA2E;IAC3E,OAAO,CAAC,wBAAwB;CAcjC"}
|
|
@@ -98,7 +98,7 @@ let Reconciler = Reconciler_1 = class Reconciler {
|
|
|
98
98
|
for (const task of assignedTasks) {
|
|
99
99
|
if (task.machineId) {
|
|
100
100
|
const machine = this.machineRepo.findById(task.machineId);
|
|
101
|
-
if (
|
|
101
|
+
if (this.isMachineUnavailable(machine)) {
|
|
102
102
|
this.updateTaskStatusSafe(task.id, protocol_1.TaskStatus.QUEUED, task.revision, {
|
|
103
103
|
machineId: null,
|
|
104
104
|
assignedAt: null,
|
|
@@ -132,7 +132,7 @@ let Reconciler = Reconciler_1 = class Reconciler {
|
|
|
132
132
|
continue;
|
|
133
133
|
}
|
|
134
134
|
const machine = this.machineRepo.findById(task.machineId);
|
|
135
|
-
if (
|
|
135
|
+
if (this.isMachineUnavailable(machine)) {
|
|
136
136
|
const lastHeartbeat = machine?.lastHeartbeat
|
|
137
137
|
? new Date(machine.lastHeartbeat).getTime()
|
|
138
138
|
: 0;
|
|
@@ -164,7 +164,7 @@ let Reconciler = Reconciler_1 = class Reconciler {
|
|
|
164
164
|
continue;
|
|
165
165
|
}
|
|
166
166
|
const machine = this.machineRepo.findById(task.machineId);
|
|
167
|
-
if (
|
|
167
|
+
if (this.isMachineUnavailable(machine)) {
|
|
168
168
|
const lastHeartbeat = machine?.lastHeartbeat
|
|
169
169
|
? new Date(machine.lastHeartbeat).getTime()
|
|
170
170
|
: 0;
|
|
@@ -530,6 +530,10 @@ let Reconciler = Reconciler_1 = class Reconciler {
|
|
|
530
530
|
};
|
|
531
531
|
this.workerConnectionManager.send(machineId, frame);
|
|
532
532
|
}
|
|
533
|
+
/** Check if a machine is unavailable (missing, offline, or decommissioned). */
|
|
534
|
+
isMachineUnavailable(machine) {
|
|
535
|
+
return !machine || machine.status === protocol_1.MachineStatus.OFFLINE || machine.status === protocol_1.MachineStatus.DECOMMISSIONED;
|
|
536
|
+
}
|
|
533
537
|
/** Schedule workspace cleanup for a task that reached a terminal state. */
|
|
534
538
|
scheduleWorkspaceCleanup(taskId, machineId) {
|
|
535
539
|
const workspace = this.workspaceRepo.findByTaskId(taskId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconciler.js","sourceRoot":"","sources":["../../src/dispatcher/reconciler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"reconciler.js","sourceRoot":"","sources":["../../src/dispatcher/reconciler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAkE;AAClE,oDAAsC;AAStC,mDAM8B;AAE9B,8EAA0E;AAC1E,oFAAgF;AAChF,wFAAmF;AACnF,wFAAoF;AAEpF,2DAAuD;AACvD,uDAAmD;AACnD,2EAAsE;AAG/D,IAAM,UAAU,kBAAhB,MAAM,UAAU;IAIF;IACA;IACA;IACA;IACA;IACA;IACA;IATF,MAAM,GAAG,IAAI,eAAM,CAAC,YAAU,CAAC,IAAI,CAAC,CAAC;IAEtD,YACmB,QAAwB,EACxB,WAA8B,EAC9B,YAAgC,EAChC,aAAkC,EAClC,gBAAkC,EAClC,cAA8B,EAC9B,uBAAgD;QANhD,aAAQ,GAAR,QAAQ,CAAgB;QACxB,gBAAW,GAAX,WAAW,CAAmB;QAC9B,iBAAY,GAAZ,YAAY,CAAoB;QAChC,kBAAa,GAAb,aAAa,CAAqB;QAClC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,4BAAuB,GAAvB,uBAAuB,CAAyB;IAChE,CAAC;IAEJ,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;QAClD,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QACpB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC;IAED,8EAA8E;IAC9E,kCAAkC;IAClC,8EAA8E;IAE9E,KAAK,CAAC,MAAM;QACV,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,eAAe,GAAG,CAAC,CAAC;QACxB,IAAI,gBAAgB,GAAG,CAAC,CAAC;QAEzB,gEAAgE;QAChE,qEAAqE;QACrE,wCAAwC;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,qBAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QACpE,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;YAC/B,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACjD,eAAe,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,4BAA4B,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QACzD,CAAC;QAED,mEAAmE;QACnE,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,qBAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;QACxE,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;YACjC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACnB,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC1D,IAAI,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;oBACvC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,qBAAU,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE;wBACnE,SAAS,EAAE,IAAI;wBACf,UAAU,EAAE,IAAI;qBACjB,CAAC,CAAC;oBACH,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACjD,eAAe,EAAE,CAAC;oBAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,wBAAwB,IAAI,CAAC,EAAE,uBAAuB,IAAI,CAAC,SAAS,WAAW,CAChF,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,0EAA0E;oBAC1E,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACjD,eAAe,EAAE,CAAC;gBACpB,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,wCAAwC;gBACxC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,qBAAU,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACrE,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACjD,eAAe,EAAE,CAAC;YACpB,CAAC;QACH,CAAC;QAED,6DAA6D;QAC7D,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,qBAAU,CAAC,OAAO,CAAC,CAAC,CAAC;QACtE,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;YAChC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACpB,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,qBAAU,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE;oBACnE,YAAY,EAAE,gDAAgD;oBAC9D,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBACtC,CAAC,CAAC;gBACH,gBAAgB,EAAE,CAAC;gBACnB,SAAS;YACX,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC1D,IAAI,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACvC,MAAM,aAAa,GAAG,OAAO,EAAE,aAAa;oBAC1C,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE;oBAC3C,CAAC,CAAC,CAAC,CAAC;gBAEN,IAAI,GAAG,GAAG,aAAa,GAAG,0BAAe,EAAE,CAAC;oBAC1C,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,qBAAU,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE;wBACnE,YAAY,EAAE,YAAY,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,SAAS,kCAAkC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,aAAa,CAAC,GAAG,IAAI,CAAC,IAAI;wBACvI,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;qBACtC,CAAC,CAAC;oBACH,IAAI,IAAI,CAAC,SAAS;wBAAE,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC3E,gBAAgB,EAAE,CAAC;oBACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,8BAA8B,IAAI,CAAC,EAAE,aAAa,IAAI,CAAC,SAAS,cAAc,0BAAe,GAAG,IAAI,IAAI,CACzG,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,yDAAyD;oBACzD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,qBAAU,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACxE,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,2BAA2B,IAAI,CAAC,EAAE,aAAa,IAAI,CAAC,SAAS,gCAAgC,CAC9F,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,qBAAU,CAAC,SAAS,CAAC,CAAC,CAAC;QAC1E,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;YAClC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACpB,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,qBAAU,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE;oBACnE,YAAY,EAAE,gDAAgD;oBAC9D,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBACtC,CAAC,CAAC;gBACH,gBAAgB,EAAE,CAAC;gBACnB,SAAS;YACX,CAAC;YAED,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC1D,IAAI,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACvC,MAAM,aAAa,GAAG,OAAO,EAAE,aAAa;oBAC1C,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE;oBAC3C,CAAC,CAAC,CAAC,CAAC;gBAEN,IAAI,GAAG,GAAG,aAAa,GAAG,0BAAe,EAAE,CAAC;oBAC1C,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,qBAAU,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE;wBACnE,YAAY,EAAE,YAAY,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,SAAS,+BAA+B;wBACxF,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;qBACtC,CAAC,CAAC;oBACH,IAAI,IAAI,CAAC,SAAS;wBAAE,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC3E,gBAAgB,EAAE,CAAC;oBACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,gCAAgC,IAAI,CAAC,EAAE,aAAa,IAAI,CAAC,SAAS,mBAAmB,CACtF,CAAC;gBACJ,CAAC;gBACD,sDAAsD;YACxD,CAAC;QACH,CAAC;QAED,uDAAuD;QACvD,6DAA6D;QAC7D,qEAAqE;QAErE,iFAAiF;QACjF,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QAC/C,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE,CAAC;YAClC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAClE,IAAI,OAAO,CAAC,WAAW,KAAK,WAAW,EAAE,CAAC;gBACxC,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;gBAC5D,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,YAAY,OAAO,CAAC,IAAI,6BAA6B,OAAO,CAAC,WAAW,MAAM,WAAW,EAAE,CAC5F,CAAC;YACJ,CAAC;QACH,CAAC;QAED,2BAA2B;QAC3B,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;QACtD,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;YACvB,MAAM,EAAE,sBAAsB;YAC9B,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC;gBACrB,UAAU,EAAE,eAAe;gBAC3B,WAAW,EAAE,gBAAgB;gBAC7B,iBAAiB;gBACjB,eAAe,EAAE,WAAW,CAAC,MAAM;aACpC,CAAC;SACH,CAAC,CAAC;QAEH,mFAAmF;QACnF,4EAA4E;QAC5E,gFAAgF;QAChF,MAAM,kBAAkB,GAAG,IAAI,CAAC,aAAa,CAAC,0BAA0B,EAAE,CAAC;QAC3E,IAAI,sBAAsB,GAAG,CAAC,CAAC;QAC/B,KAAK,MAAM,SAAS,IAAI,kBAAkB,EAAE,CAAC;YAC3C,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,CACvC,SAAS,CAAC,MAAM,EAChB,SAAS,CAAC,SAAS,EACnB,SAAS,CAAC,IAAI,EACd,CAAC,CACF,CAAC;gBACF,sBAAsB,EAAE,CAAC;gBACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,sCAAsC,SAAS,CAAC,EAAE,WAAW,SAAS,CAAC,MAAM,aAAa,SAAS,CAAC,SAAS,GAAG,CACjH,CAAC;YACJ,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,+CAA+C,SAAS,CAAC,EAAE,WAAW,SAAS,CAAC,MAAM,MACpF,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CACjD,EAAE,CACH,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,oCAAoC,eAAe,kBAAkB,gBAAgB,kBAAkB,iBAAiB,yBAAyB,sBAAsB,EAAE,CAC1K,CAAC;IACJ,CAAC;IAED,8EAA8E;IAC9E,uDAAuD;IACvD,EAAE;IACF,8BAA8B;IAC9B,6DAA6D;IAC7D,iDAAiD;IACjD,sDAAsD;IACtD,8CAA8C;IAC9C,sCAAsC;IACtC,6BAA6B;IAC7B,8EAA8E;IAE9E,KAAK,CAAC,eAAe,CACnB,SAAiB,EACjB,KAAoC;QAEpC,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,qCAAqC,SAAS,SAAS,KAAK,CAAC,MAAM,mBAAmB,CACvF,CAAC;QAEF,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACrD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kCAAkC,SAAS,YAAY,CAAC,CAAC;YAC1E,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,OAAO,GAA8C,EAAE,CAAC;QAC9D,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5D,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjE,6EAA6E;QAC7E,MAAM,kBAAkB,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,SAAS,EAAE;YAClE,qBAAU,CAAC,OAAO;YAClB,qBAAU,CAAC,SAAS;YACpB,qBAAU,CAAC,QAAQ;SACpB,CAAC,CAAC;QACH,MAAM,oBAAoB,GAAG,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,SAAS,EAAE;YACpE,qBAAU,CAAC,MAAM;YACjB,qBAAU,CAAC,SAAS;SACrB,CAAC,CAAC;QACH,MAAM,eAAe,GAAG,CAAC,GAAG,kBAAkB,EAAE,GAAG,oBAAoB,CAAC,CAAC;QAEzE,wDAAwD;QACxD,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE,CAAC;YACnC,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAE9C,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;gBACnE,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;YAC5C,CAAC;iBAAM,IACL,IAAI,CAAC,MAAM,KAAK,qBAAU,CAAC,OAAO;gBAClC,IAAI,CAAC,MAAM,KAAK,qBAAU,CAAC,SAAS,EACpC,CAAC;gBACD,gEAAgE;gBAChE,qEAAqE;gBACrE,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,qBAAU,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE;oBACnE,YAAY,EAAE,WAAW,OAAO,CAAC,IAAI,qEAAqE;oBAC1G,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;iBACtC,CAAC,CAAC;gBACH,IAAI,IAAI,CAAC,SAAS;oBAAE,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC3E,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;oBACvB,MAAM,EAAE,6BAA6B;oBACrC,QAAQ,EAAE,QAAQ,IAAI,CAAC,EAAE,EAAE;oBAC3B,MAAM,EAAE,gCAAgC,OAAO,CAAC,IAAI,oBAAoB;iBACzE,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,mBAAmB,EAAE,CAAC,CAAC;gBAC/D,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,SAAS,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,MAAM,yCAAyC,CAC1E,CAAC;YACJ,CAAC;iBAAM,IAAI,IAAI,CAAC,MAAM,KAAK,qBAAU,CAAC,QAAQ,EAAE,CAAC;gBAC/C,+DAA+D;gBAC/D,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,EAAE,qBAAU,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE;oBACnE,SAAS,EAAE,IAAI;oBACf,UAAU,EAAE,IAAI;iBACjB,CAAC,CAAC;gBACH,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACjD,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAC;gBAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,SAAS,IAAI,CAAC,EAAE,qDAAqD,CACtE,CAAC;YACJ,CAAC;QACH,CAAC;QAED,+EAA+E;QAC/E,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE,CAAC;YAC7B,IAAI,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,MAAM,CAAC;gBAAE,SAAS;YAEpE,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACrD,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,iCAAiC,QAAQ,CAAC,MAAM,sBAAsB,CACvE,CAAC;gBACF,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACrD,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAC;gBACrE,SAAS;YACX,CAAC;YAED,0EAA0E;YAC1E,MAAM,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;YACnE,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,wCAAwC,SAAS,KAAK,OAAO,CAAC,MAAM,kBAAkB,CACvF,CAAC;QAEF,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,8EAA8E;IAC9E,2DAA2D;IAC3D,8EAA8E;IAEtE,qBAAqB,CAC3B,OAAgB,EAChB,IAAU,EACV,QAA+C;QAE/C,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GACtE,QAAQ,CAAC;QAEX,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;YACpB,oEAAoE;YACpE,wDAAwD;YACxD,KAAK,qBAAU,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC1B,IAAI,WAAW,KAAK,eAAe,EAAE,CAAC;oBACpC,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;oBAChD,IAAI,WAAW,GAAG,+BAAoB,EAAE,CAAC;wBACvC,MAAM,KAAK,GAA4B,EAAE,CAAC;wBAC1C,IAAI,YAAY;4BAAE,KAAK,CAAC,cAAc,CAAC,GAAG,YAAY,CAAC;wBACvD,IAAI,CAAC,oBAAoB,CACvB,MAAM,EACN,qBAAU,CAAC,OAAO,EAClB,IAAI,CAAC,QAAQ,EACb,KAAK,CACN,CAAC;wBAEF,8BAA8B;wBAC9B,MAAM,WAAW,GAAoB;4BACnC,IAAI,EAAE,QAAQ;4BACd,KAAK,EAAE,MAAM,CAAC,UAAU,EAAE;4BAC1B,MAAM;yBACP,CAAC;wBACF,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;wBAE3D,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,SAAS,MAAM,iDAAiD,CACjE,CAAC;wBACF,OAAO,SAAS,CAAC;oBACnB,CAAC;oBACD,qCAAqC;oBACrC,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,SAAS,MAAM,+CAA+C,WAAW,IAAI,+BAAoB,GAAG,CACrG,CAAC;oBACF,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;wBACvB,MAAM,EAAE,6BAA6B;wBACrC,QAAQ,EAAE,QAAQ,MAAM,EAAE;wBAC1B,MAAM,EAAE,4CAA4C,WAAW,IAAI,+BAAoB,GAAG;qBAC3F,CAAC,CAAC;oBACH,OAAO,mBAAmB,CAAC;gBAC7B,CAAC;gBAED,IAAI,WAAW,KAAK,mBAAmB,EAAE,CAAC;oBACxC,MAAM,KAAK,GAA4B;wBACrC,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;qBACtC,CAAC;oBACF,IAAI,MAAM;wBAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;oBACrC,IAAI,KAAK;wBAAE,KAAK,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;oBAClC,IAAI,CAAC,oBAAoB,CACvB,MAAM,EACN,qBAAU,CAAC,SAAS,EACpB,IAAI,CAAC,QAAQ,EACb,KAAK,CACN,CAAC;oBACF,IAAI,IAAI,CAAC,SAAS;wBAAE,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC1E,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,SAAS,MAAM,uDAAuD,CACvE,CAAC;oBACF,OAAO,WAAW,CAAC;gBACrB,CAAC;gBAED,IAAI,WAAW,KAAK,gBAAgB,EAAE,CAAC;oBACrC,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,qBAAU,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE;wBAClE,YAAY,EACV,YAAY,IAAI,uCAAuC;wBACzD,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;qBACtC,CAAC,CAAC;oBACH,IAAI,IAAI,CAAC,SAAS;wBAAE,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC1E,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,SAAS,MAAM,iDAAiD,CACjE,CAAC;oBACF,OAAO,QAAQ,CAAC;gBAClB,CAAC;gBAED,OAAO,OAAO,CAAC;YACjB,CAAC;YAED,6DAA6D;YAC7D,gEAAgE;YAChE,KAAK,qBAAU,CAAC,MAAM,CAAC,CAAC,CAAC;gBACvB,IAAI,WAAW,KAAK,eAAe,EAAE,CAAC;oBACpC,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,SAAS,MAAM,sDAAsD,CACtE,CAAC;oBACF,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;oBAC5C,OAAO,aAAa,CAAC;gBACvB,CAAC;gBAED,IAAI,WAAW,KAAK,mBAAmB,EAAE,CAAC;oBACxC,MAAM,KAAK,GAA4B;wBACrC,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;wBACrC,YAAY,EAAE,IAAI;qBACnB,CAAC;oBACF,IAAI,MAAM;wBAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;oBACrC,IAAI,KAAK;wBAAE,KAAK,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;oBAElC,IAAI,CAAC,oBAAoB,CACvB,MAAM,EACN,qBAAU,CAAC,SAAS,EACpB,IAAI,CAAC,QAAQ,EACb,KAAK,CACN,CAAC;oBACF,IAAI,IAAI,CAAC,SAAS;wBAAE,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC1E,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;wBACvB,MAAM,EAAE,6BAA6B;wBACrC,QAAQ,EAAE,QAAQ,MAAM,EAAE;wBAC1B,MAAM,EACJ,sEAAsE;qBACzE,CAAC,CAAC;oBACH,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,SAAS,MAAM,6DAA6D,CAC7E,CAAC;oBACF,OAAO,oBAAoB,CAAC;gBAC9B,CAAC;gBAED,OAAO,OAAO,CAAC;YACjB,CAAC;YAED,gDAAgD;YAChD,KAAK,qBAAU,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC1B,IACE,WAAW,KAAK,eAAe;oBAC/B,WAAW,KAAK,mBAAmB,EACnC,CAAC;oBACD,+DAA+D;oBAC/D,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,SAAS,MAAM,sDAAsD,WAAW,GAAG,CACpF,CAAC;oBACF,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;oBAE5C,IAAI,WAAW,KAAK,mBAAmB,EAAE,CAAC;wBACxC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;4BACvB,MAAM,EAAE,mCAAmC;4BAC3C,QAAQ,EAAE,QAAQ,MAAM,EAAE;4BAC1B,MAAM,EACJ,2FAA2F;yBAC9F,CAAC,CAAC;oBACL,CAAC;oBACD,OAAO,aAAa,CAAC;gBACvB,CAAC;gBACD,OAAO,kBAAkB,CAAC;YAC5B,CAAC;YAED,uEAAuE;YACvE,KAAK,qBAAU,CAAC,OAAO,CAAC,CAAC,CAAC;gBACxB,IAAI,WAAW,KAAK,eAAe,EAAE,CAAC;oBACpC,IAAI,YAAY,IAAI,YAAY,KAAK,IAAI,CAAC,YAAY,EAAE,CAAC;wBACvD,IAAI,CAAC,oBAAoB,CACvB,MAAM,EACN,qBAAU,CAAC,OAAO,EAClB,IAAI,CAAC,QAAQ,EACb,EAAE,YAAY,EAAE,CACjB,CAAC;oBACJ,CAAC;oBACD,OAAO,OAAO,CAAC;gBACjB,CAAC;gBAED,IAAI,WAAW,KAAK,mBAAmB,EAAE,CAAC;oBACxC,MAAM,KAAK,GAA4B;wBACrC,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;qBACtC,CAAC;oBACF,IAAI,MAAM;wBAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;oBACrC,IAAI,KAAK;wBAAE,KAAK,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;oBAClC,IAAI,CAAC,oBAAoB,CACvB,MAAM,EACN,qBAAU,CAAC,SAAS,EACpB,IAAI,CAAC,QAAQ,EACb,KAAK,CACN,CAAC;oBACF,IAAI,IAAI,CAAC,SAAS;wBAAE,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC1E,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,SAAS,MAAM,qDAAqD,CACrE,CAAC;oBACF,OAAO,WAAW,CAAC;gBACrB,CAAC;gBAED,IAAI,WAAW,KAAK,gBAAgB,EAAE,CAAC;oBACrC,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,qBAAU,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE;wBAClE,YAAY,EACV,YAAY,IAAI,uCAAuC;wBACzD,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;qBACtC,CAAC,CAAC;oBACH,IAAI,IAAI,CAAC,SAAS;wBAAE,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC1E,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,SAAS,MAAM,+CAA+C,CAC/D,CAAC;oBACF,OAAO,QAAQ,CAAC;gBAClB,CAAC;gBAED,OAAO,OAAO,CAAC;YACjB,CAAC;YAED,yEAAyE;YACzE,KAAK,qBAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACzB,IAAI,WAAW,KAAK,eAAe,EAAE,CAAC;oBACpC,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,qBAAU,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE;wBACnE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;qBACpC,CAAC,CAAC;oBACH,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,SAAS,MAAM,qDAAqD,CACrE,CAAC;oBACF,OAAO,qBAAqB,CAAC;gBAC/B,CAAC;gBAED,IAAI,WAAW,KAAK,mBAAmB,EAAE,CAAC;oBACxC,MAAM,KAAK,GAA4B;wBACrC,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;wBACrC,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;qBACtD,CAAC;oBACF,IAAI,MAAM;wBAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;oBACrC,IAAI,KAAK;wBAAE,KAAK,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;oBAClC,IAAI,CAAC,oBAAoB,CACvB,MAAM,EACN,qBAAU,CAAC,SAAS,EACpB,IAAI,CAAC,QAAQ,EACb,KAAK,CACN,CAAC;oBACF,IAAI,IAAI,CAAC,SAAS;wBAAE,IAAI,CAAC,wBAAwB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC1E,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,SAAS,MAAM,4CAA4C,CAC5D,CAAC;oBACF,OAAO,WAAW,CAAC;gBACrB,CAAC;gBAED,OAAO,OAAO,CAAC;YACjB,CAAC;YAED,KAAK,qBAAU,CAAC,SAAS;gBACvB,OAAO,kBAAkB,CAAC;YAE5B;gBACE,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,SAAS,MAAM,cAAc,IAAI,CAAC,MAAM,6BAA6B,CACtE,CAAC;gBACF,OAAO,OAAO,CAAC;QACnB,CAAC;IACH,CAAC;IAED,8EAA8E;IAC9E,kBAAkB;IAClB,8EAA8E;IAE9E;;;OAGG;IACK,oBAAoB,CAC1B,MAAc,EACd,MAAkB,EAClB,eAAuB,EACvB,KAA+B;QAE/B,IAAI,QAAQ,GAAG,eAAe,CAAC;QAE/B,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,0BAAe,EAAE,OAAO,EAAE,EAAE,CAAC;YAC3D,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CACxC,MAAM,EACN,MAAM,EACN,QAAQ,EACR,KAAK,CACN,CAAC;YACF,IAAI,OAAO;gBAAE,OAAO,IAAI,CAAC;YAEzB,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACjD,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,SAAS,MAAM,gDAAgD,CAChE,CAAC;gBACF,OAAO,KAAK,CAAC;YACf,CAAC;YAED,qCAAqC;YACrC,IAAI,SAAS,CAAC,MAAM,KAAK,MAAM;gBAAE,OAAO,IAAI,CAAC;YAE7C,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QAChC,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,iCAAiC,MAAM,MAAM,MAAM,2BAA2B,0BAAe,YAAY,CAC1G,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,yDAAyD;IACjD,kBAAkB,CAAC,SAAiB,EAAE,MAAc;QAC1D,MAAM,KAAK,GAAoB;YAC7B,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,MAAM,CAAC,UAAU,EAAE;YAC1B,MAAM;SACP,CAAC;QACF,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;IAED,8DAA8D;IACtD,mBAAmB,CAAC,SAAiB,EAAE,MAAc;QAC3D,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC1D,MAAM,KAAK,GAA0B;YACnC,IAAI,EAAE,mBAAmB;YACzB,KAAK,EAAE,MAAM,CAAC,UAAU,EAAE;YAC1B,MAAM;YACN,aAAa,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE;SACrC,CAAC;QACF,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;IAED,+EAA+E;IACvE,oBAAoB,CAAC,OAAmC;QAC9D,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,wBAAa,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,wBAAa,CAAC,cAAc,CAAC;IACjH,CAAC;IAED,2EAA2E;IACnE,wBAAwB,CAAC,MAAc,EAAE,SAAiB;QAChE,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,SAAS,EAAE,CAAC;YACd,IAAI,CAAC,cAAc;iBAChB,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC;iBAClD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,wCAAwC,MAAM,KAC5C,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CACjD,EAAE,CACH,CAAC;YACJ,CAAC,CAAC,CAAC;QACP,CAAC;IACH,CAAC;CACF,CAAA;AAjoBY,gCAAU;qBAAV,UAAU;IADtB,IAAA,mBAAU,GAAE;qCAKkB,gCAAc;QACX,sCAAiB;QAChB,yCAAkB;QACjB,0CAAmB;QAChB,oCAAgB;QAClB,gCAAc;QACL,mDAAuB;GAVxD,UAAU,CAioBtB"}
|
package/dist/main.js
CHANGED
|
File without changes
|
|
@@ -2,6 +2,7 @@ import { MachineStatus } from '@overlordai/protocol';
|
|
|
2
2
|
import { MachineRepository } from '../../database/repositories/machine.repository';
|
|
3
3
|
import { TaskRepository } from '../../database/repositories/task.repository';
|
|
4
4
|
import { AuditLogRepository } from '../../database/repositories/audit-log.repository';
|
|
5
|
+
import { WorkerConnectionManager } from '../../dispatcher/worker-connection.manager';
|
|
5
6
|
interface AuthenticatedRequest {
|
|
6
7
|
user: {
|
|
7
8
|
sub: number;
|
|
@@ -13,8 +14,9 @@ export declare class AdminMachineController {
|
|
|
13
14
|
private readonly machineRepo;
|
|
14
15
|
private readonly taskRepo;
|
|
15
16
|
private readonly auditLogRepo;
|
|
17
|
+
private readonly connectionManager;
|
|
16
18
|
private readonly logger;
|
|
17
|
-
constructor(machineRepo: MachineRepository, taskRepo: TaskRepository, auditLogRepo: AuditLogRepository);
|
|
19
|
+
constructor(machineRepo: MachineRepository, taskRepo: TaskRepository, auditLogRepo: AuditLogRepository, connectionManager: WorkerConnectionManager);
|
|
18
20
|
listMachines(): {
|
|
19
21
|
id: string;
|
|
20
22
|
name: string;
|
|
@@ -36,7 +38,10 @@ export declare class AdminMachineController {
|
|
|
36
38
|
protocolVersion: string;
|
|
37
39
|
workerVersion: string | null;
|
|
38
40
|
lastHeartbeat: string | null;
|
|
41
|
+
sshUrl: string | null;
|
|
39
42
|
status: MachineStatus;
|
|
43
|
+
decommissionedAt: string | null;
|
|
44
|
+
decommissionedBy: number | null;
|
|
40
45
|
}[];
|
|
41
46
|
updateMachine(id: string, body: {
|
|
42
47
|
status?: MachineStatus;
|
|
@@ -61,7 +66,13 @@ export declare class AdminMachineController {
|
|
|
61
66
|
protocolVersion: string;
|
|
62
67
|
workerVersion: string | null;
|
|
63
68
|
lastHeartbeat: string | null;
|
|
69
|
+
sshUrl: string | null;
|
|
64
70
|
status: MachineStatus;
|
|
71
|
+
decommissionedAt: string | null;
|
|
72
|
+
decommissionedBy: number | null;
|
|
73
|
+
};
|
|
74
|
+
decommissionMachine(id: string, req: AuthenticatedRequest): {
|
|
75
|
+
success: boolean;
|
|
65
76
|
};
|
|
66
77
|
}
|
|
67
78
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin-machine.controller.d.ts","sourceRoot":"","sources":["../../../src/web/admin/admin-machine.controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"admin-machine.controller.d.ts","sourceRoot":"","sources":["../../../src/web/admin/admin-machine.controller.ts"],"names":[],"mappings":"AAaA,OAAO,EAAiB,aAAa,EAAc,MAAM,sBAAsB,CAAC;AAKhF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAC7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AACtF,OAAO,EAAE,uBAAuB,EAAE,MAAM,4CAA4C,CAAC;AAOrF,UAAU,oBAAoB;IAC5B,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CACnD;AAED,qBAGa,sBAAsB;IAI/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IANpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2C;gBAG/C,WAAW,EAAE,iBAAiB,EAC9B,QAAQ,EAAE,cAAc,EACxB,YAAY,EAAE,kBAAkB,EAChC,iBAAiB,EAAE,uBAAuB;IAI7D,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;IAKZ,aAAa,CACE,EAAE,EAAE,MAAM,EACf,IAAI,EAAE;QAAE,MAAM,CAAC,EAAE,aAAa,CAAA;KAAE,EACjC,GAAG,EAAE,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;IA2DlC,mBAAmB,CACJ,EAAE,EAAE,MAAM,EAChB,GAAG,EAAE,oBAAoB;;;CAgEnC"}
|
|
@@ -22,6 +22,7 @@ const roles_decorator_1 = require("../../auth/decorators/roles.decorator");
|
|
|
22
22
|
const machine_repository_1 = require("../../database/repositories/machine.repository");
|
|
23
23
|
const task_repository_1 = require("../../database/repositories/task.repository");
|
|
24
24
|
const audit_log_repository_1 = require("../../database/repositories/audit-log.repository");
|
|
25
|
+
const worker_connection_manager_1 = require("../../dispatcher/worker-connection.manager");
|
|
25
26
|
function stripMachineSecrets(machine) {
|
|
26
27
|
const { recoverySecretHash, ...safe } = machine;
|
|
27
28
|
return safe;
|
|
@@ -30,20 +31,25 @@ let AdminMachineController = AdminMachineController_1 = class AdminMachineContro
|
|
|
30
31
|
machineRepo;
|
|
31
32
|
taskRepo;
|
|
32
33
|
auditLogRepo;
|
|
34
|
+
connectionManager;
|
|
33
35
|
logger = new common_1.Logger(AdminMachineController_1.name);
|
|
34
|
-
constructor(machineRepo, taskRepo, auditLogRepo) {
|
|
36
|
+
constructor(machineRepo, taskRepo, auditLogRepo, connectionManager) {
|
|
35
37
|
this.machineRepo = machineRepo;
|
|
36
38
|
this.taskRepo = taskRepo;
|
|
37
39
|
this.auditLogRepo = auditLogRepo;
|
|
40
|
+
this.connectionManager = connectionManager;
|
|
38
41
|
}
|
|
39
42
|
listMachines() {
|
|
40
|
-
return this.machineRepo.findAll().map(stripMachineSecrets);
|
|
43
|
+
return this.machineRepo.findAll(true).map(stripMachineSecrets);
|
|
41
44
|
}
|
|
42
45
|
updateMachine(id, body, req) {
|
|
43
46
|
const machine = this.machineRepo.findById(id);
|
|
44
47
|
if (!machine) {
|
|
45
48
|
throw new common_1.NotFoundException(`Machine '${id}' not found`);
|
|
46
49
|
}
|
|
50
|
+
if (machine.status === protocol_1.MachineStatus.DECOMMISSIONED) {
|
|
51
|
+
throw new common_1.BadRequestException('Cannot update a decommissioned machine');
|
|
52
|
+
}
|
|
47
53
|
const validStatuses = ['online', 'offline', 'draining'];
|
|
48
54
|
if (body.status && !validStatuses.includes(body.status)) {
|
|
49
55
|
throw new common_1.BadRequestException(`Invalid status. Must be one of: ${validStatuses.join(', ')}`);
|
|
@@ -83,6 +89,59 @@ let AdminMachineController = AdminMachineController_1 = class AdminMachineContro
|
|
|
83
89
|
});
|
|
84
90
|
return stripMachineSecrets(this.machineRepo.findById(id));
|
|
85
91
|
}
|
|
92
|
+
decommissionMachine(id, req) {
|
|
93
|
+
const machine = this.machineRepo.findById(id);
|
|
94
|
+
if (!machine) {
|
|
95
|
+
throw new common_1.NotFoundException(`Machine '${id}' not found`);
|
|
96
|
+
}
|
|
97
|
+
if (machine.status === protocol_1.MachineStatus.DECOMMISSIONED) {
|
|
98
|
+
throw new common_1.BadRequestException('Machine is already decommissioned');
|
|
99
|
+
}
|
|
100
|
+
// Mark as decommissioned first to prevent dispatcher from re-assigning tasks
|
|
101
|
+
this.machineRepo.decommission(id, req.user.sub);
|
|
102
|
+
// Disconnect the worker if online
|
|
103
|
+
const ws = this.connectionManager.getConnection(id);
|
|
104
|
+
if (ws) {
|
|
105
|
+
ws.close(4010, 'Machine decommissioned');
|
|
106
|
+
this.connectionManager.unregister(id);
|
|
107
|
+
}
|
|
108
|
+
// Reconcile active tasks (including suspended — they are machine-bound)
|
|
109
|
+
const activeTasks = this.taskRepo.findByMachineId(id, [
|
|
110
|
+
protocol_1.TaskStatus.ASSIGNED,
|
|
111
|
+
protocol_1.TaskStatus.RUNNING,
|
|
112
|
+
protocol_1.TaskStatus.SUSPENDED,
|
|
113
|
+
]);
|
|
114
|
+
for (const task of activeTasks) {
|
|
115
|
+
if (task.status === protocol_1.TaskStatus.ASSIGNED) {
|
|
116
|
+
this.taskRepo.updateStatus(task.id, protocol_1.TaskStatus.QUEUED, task.revision, {
|
|
117
|
+
machineId: null,
|
|
118
|
+
assignedAt: null,
|
|
119
|
+
});
|
|
120
|
+
this.logger.warn(`Task #${task.id} re-queued: machine '${machine.name}' decommissioned`);
|
|
121
|
+
}
|
|
122
|
+
else if (task.status === protocol_1.TaskStatus.SUSPENDED) {
|
|
123
|
+
this.taskRepo.updateStatus(task.id, protocol_1.TaskStatus.FAILED, task.revision, {
|
|
124
|
+
errorMessage: `Machine '${machine.name}' decommissioned by administrator (execution context irrecoverable)`,
|
|
125
|
+
completedAt: new Date().toISOString(),
|
|
126
|
+
});
|
|
127
|
+
this.logger.warn(`Task #${task.id} marked FAILED: machine '${machine.name}' decommissioned (suspended, context irrecoverable)`);
|
|
128
|
+
}
|
|
129
|
+
else if (task.status === protocol_1.TaskStatus.RUNNING) {
|
|
130
|
+
this.taskRepo.updateStatus(task.id, protocol_1.TaskStatus.FAILED, task.revision, {
|
|
131
|
+
errorMessage: `Machine '${machine.name}' decommissioned by administrator`,
|
|
132
|
+
completedAt: new Date().toISOString(),
|
|
133
|
+
});
|
|
134
|
+
this.logger.warn(`Task #${task.id} marked FAILED: machine '${machine.name}' decommissioned`);
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
this.auditLogRepo.create({
|
|
138
|
+
userId: req.user.sub,
|
|
139
|
+
action: 'machine_decommission',
|
|
140
|
+
resource: `machine:${id}`,
|
|
141
|
+
detail: `Machine '${machine.name}' decommissioned`,
|
|
142
|
+
});
|
|
143
|
+
return { success: true };
|
|
144
|
+
}
|
|
86
145
|
};
|
|
87
146
|
exports.AdminMachineController = AdminMachineController;
|
|
88
147
|
__decorate([
|
|
@@ -100,12 +159,21 @@ __decorate([
|
|
|
100
159
|
__metadata("design:paramtypes", [String, Object, Object]),
|
|
101
160
|
__metadata("design:returntype", void 0)
|
|
102
161
|
], AdminMachineController.prototype, "updateMachine", null);
|
|
162
|
+
__decorate([
|
|
163
|
+
(0, common_1.Delete)(':id'),
|
|
164
|
+
__param(0, (0, common_1.Param)('id')),
|
|
165
|
+
__param(1, (0, common_1.Req)()),
|
|
166
|
+
__metadata("design:type", Function),
|
|
167
|
+
__metadata("design:paramtypes", [String, Object]),
|
|
168
|
+
__metadata("design:returntype", void 0)
|
|
169
|
+
], AdminMachineController.prototype, "decommissionMachine", null);
|
|
103
170
|
exports.AdminMachineController = AdminMachineController = AdminMachineController_1 = __decorate([
|
|
104
171
|
(0, common_1.Controller)('api/admin/machines'),
|
|
105
172
|
(0, common_1.UseGuards)(jwt_auth_guard_1.JwtAuthGuard, roles_guard_1.RolesGuard),
|
|
106
173
|
(0, roles_decorator_1.Roles)(protocol_1.DeveloperRole.ADMIN),
|
|
107
174
|
__metadata("design:paramtypes", [machine_repository_1.MachineRepository,
|
|
108
175
|
task_repository_1.TaskRepository,
|
|
109
|
-
audit_log_repository_1.AuditLogRepository
|
|
176
|
+
audit_log_repository_1.AuditLogRepository,
|
|
177
|
+
worker_connection_manager_1.WorkerConnectionManager])
|
|
110
178
|
], AdminMachineController);
|
|
111
179
|
//# sourceMappingURL=admin-machine.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin-machine.controller.js","sourceRoot":"","sources":["../../../src/web/admin/admin-machine.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"admin-machine.controller.js","sourceRoot":"","sources":["../../../src/web/admin/admin-machine.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ export declare class AdminProjectController {
|
|
|
24
24
|
id: number;
|
|
25
25
|
projectKey: string;
|
|
26
26
|
developerId: number;
|
|
27
|
+
developerName: string | null;
|
|
27
28
|
role: string;
|
|
28
29
|
createdAt: string;
|
|
29
30
|
}[];
|
|
@@ -34,6 +35,7 @@ export declare class AdminProjectController {
|
|
|
34
35
|
id: number;
|
|
35
36
|
projectKey: string;
|
|
36
37
|
developerId: number;
|
|
38
|
+
developerName: string | null;
|
|
37
39
|
role: string;
|
|
38
40
|
createdAt: string;
|
|
39
41
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin-project.controller.d.ts","sourceRoot":"","sources":["../../../src/web/admin/admin-project.controller.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAIjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,uDAAuD,CAAC;AAChG,OAAO,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AAEtF,UAAU,oBAAoB;IAC5B,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CACnD;AAED,qBAGa,sBAAsB;IAE/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,WAAW,EAAE,iBAAiB,EAC9B,iBAAiB,EAAE,uBAAuB,EAC1C,YAAY,EAAE,kBAAkB;IAInD,YAAY;IAKZ,aAAa,CACH,IAAI,EAAE,oBAAoB,EAC3B,GAAG,EAAE,oBAAoB;
|
|
1
|
+
{"version":3,"file":"admin-project.controller.d.ts","sourceRoot":"","sources":["../../../src/web/admin/admin-project.controller.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAIjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,uDAAuD,CAAC;AAChG,OAAO,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AAEtF,UAAU,oBAAoB;IAC5B,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CACnD;AAED,qBAGa,sBAAsB;IAE/B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,WAAW,EAAE,iBAAiB,EAC9B,iBAAiB,EAAE,uBAAuB,EAC1C,YAAY,EAAE,kBAAkB;IAInD,YAAY;IAKZ,aAAa,CACH,IAAI,EAAE,oBAAoB,EAC3B,GAAG,EAAE,oBAAoB;IA2BlC,aAAa,CACG,GAAG,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,GAAG,EAAE,oBAAoB;IAyBlC,aAAa,CACG,GAAG,EAAE,MAAM,EAClB,GAAG,EAAE,oBAAoB;;;IAoBlC,WAAW,CAAe,GAAG,EAAE,MAAM;;;;;;;;IASrC,SAAS,CACO,GAAG,EAAE,MAAM,EACjB,IAAI,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,EAC7C,GAAG,EAAE,oBAAoB;;;;;;;;IA8BlC,YAAY,CACI,GAAG,EAAE,MAAM,EACH,WAAW,EAAE,MAAM,EAClC,GAAG,EAAE,oBAAoB;;;CAyBnC"}
|
|
@@ -42,6 +42,7 @@ let AdminProjectController = class AdminProjectController {
|
|
|
42
42
|
key: body.key,
|
|
43
43
|
name: body.name,
|
|
44
44
|
repoUrl: body.repoUrl,
|
|
45
|
+
sshUrl: body.sshUrl ?? null,
|
|
45
46
|
gitPlatform: body.gitPlatform,
|
|
46
47
|
defaultBranch: body.defaultBranch,
|
|
47
48
|
});
|
|
@@ -58,7 +59,7 @@ let AdminProjectController = class AdminProjectController {
|
|
|
58
59
|
if (!project) {
|
|
59
60
|
throw new common_1.NotFoundException(`Project '${key}' not found`);
|
|
60
61
|
}
|
|
61
|
-
const allowed = ['name', 'repoUrl', 'defaultBranch', 'pipeline', 'setupCommands', 'agentType', 'agentEnv', 'agentCommand', 'workspaceRoot', 'testCommand', 'skillsPath', 'allowedTools', 'maxTurns', 'ptyOutputFilter', 'isDefault', 'aliases', 'gitPlatform'];
|
|
62
|
+
const allowed = ['name', 'repoUrl', 'sshUrl', 'defaultBranch', 'pipeline', 'setupCommands', 'agentType', 'agentEnv', 'agentCommand', 'workspaceRoot', 'testCommand', 'skillsPath', 'allowedTools', 'maxTurns', 'ptyOutputFilter', 'isDefault', 'aliases', 'gitPlatform'];
|
|
62
63
|
const sanitized = {};
|
|
63
64
|
for (const field of allowed) {
|
|
64
65
|
if (field in body)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin-project.controller.js","sourceRoot":"","sources":["../../../src/web/admin/admin-project.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAcwB;AACxB,mDAAqD;AAErD,qEAAgE;AAChE,+DAA2D;AAC3D,2EAA8D;AAC9D,uFAAmF;AACnF,qGAAgG;AAChG,2FAAsF;AAS/E,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAEd;IACA;IACA;IAHnB,YACmB,WAA8B,EAC9B,iBAA0C,EAC1C,YAAgC;QAFhC,gBAAW,GAAX,WAAW,CAAmB;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAyB;QAC1C,iBAAY,GAAZ,YAAY,CAAoB;IAChD,CAAC;IAGJ,YAAY;QACV,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;IACpC,CAAC;IAGD,aAAa,CACH,IAA0B,EAC3B,GAAyB;QAEhC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,IAAI,0BAAiB,CAAC,YAAY,IAAI,CAAC,GAAG,kBAAkB,CAAC,CAAC;QACtE,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;YACtC,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;QAEH,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC;YACvB,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG;YACpB,MAAM,EAAE,gBAAgB;YACxB,QAAQ,EAAE,WAAW,OAAO,CAAC,GAAG,EAAE;YAClC,MAAM,EAAE,oBAAoB,OAAO,CAAC,IAAI,GAAG;SAC5C,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACjB,CAAC;IAGD,aAAa,CACG,GAAW,EACjB,IAA6B,EAC9B,GAAyB;QAEhC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAChD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,0BAAiB,CAAC,YAAY,GAAG,aAAa,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,OAAO,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,eAAe,EAAE,UAAU,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAE,cAAc,EAAE,eAAe,EAAE,aAAa,EAAE,YAAY,EAAE,cAAc,EAAE,UAAU,EAAE,iBAAiB,EAAE,WAAW,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"admin-project.controller.js","sourceRoot":"","sources":["../../../src/web/admin/admin-project.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,10 @@ export declare class MachineController {
|
|
|
33
33
|
protocolVersion: string;
|
|
34
34
|
workerVersion: string | null;
|
|
35
35
|
lastHeartbeat: string | null;
|
|
36
|
+
sshUrl: string | null;
|
|
36
37
|
status: MachineStatus;
|
|
38
|
+
decommissionedAt: string | null;
|
|
39
|
+
decommissionedBy: number | null;
|
|
37
40
|
}[];
|
|
38
41
|
getMachine(id: string): {
|
|
39
42
|
id: string;
|
|
@@ -56,7 +59,10 @@ export declare class MachineController {
|
|
|
56
59
|
protocolVersion: string;
|
|
57
60
|
workerVersion: string | null;
|
|
58
61
|
lastHeartbeat: string | null;
|
|
62
|
+
sshUrl: string | null;
|
|
59
63
|
status: MachineStatus;
|
|
64
|
+
decommissionedAt: string | null;
|
|
65
|
+
decommissionedBy: number | null;
|
|
60
66
|
};
|
|
61
67
|
getMachineTasks(id: string, req: AuthenticatedRequest): import("@overlordai/protocol").Task[];
|
|
62
68
|
drainMachine(id: string): {
|
|
@@ -80,7 +86,10 @@ export declare class MachineController {
|
|
|
80
86
|
protocolVersion: string;
|
|
81
87
|
workerVersion: string | null;
|
|
82
88
|
lastHeartbeat: string | null;
|
|
89
|
+
sshUrl: string | null;
|
|
83
90
|
status: MachineStatus;
|
|
91
|
+
decommissionedAt: string | null;
|
|
92
|
+
decommissionedBy: number | null;
|
|
84
93
|
};
|
|
85
94
|
undrainMachine(id: string): {
|
|
86
95
|
id: string;
|
|
@@ -103,7 +112,10 @@ export declare class MachineController {
|
|
|
103
112
|
protocolVersion: string;
|
|
104
113
|
workerVersion: string | null;
|
|
105
114
|
lastHeartbeat: string | null;
|
|
115
|
+
sshUrl: string | null;
|
|
106
116
|
status: MachineStatus;
|
|
117
|
+
decommissionedAt: string | null;
|
|
118
|
+
decommissionedBy: number | null;
|
|
107
119
|
};
|
|
108
120
|
}
|
|
109
121
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machine.controller.d.ts","sourceRoot":"","sources":["../../src/web/machine.controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"machine.controller.d.ts","sourceRoot":"","sources":["../../src/web/machine.controller.ts"],"names":[],"mappings":"AAWA,OAAO,EAAiB,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAKpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAE1E,UAAU,oBAAoB;IAC5B,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CACnD;AAOD,qBAEa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBADR,WAAW,EAAE,iBAAiB,EAC9B,QAAQ,EAAE,cAAc;IAI3C,YAAY,CAAkB,MAAM,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;IAU7C,UAAU,CAAc,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;IASlC,eAAe,CAAc,EAAE,EAAE,MAAM,EAAS,GAAG,EAAE,oBAAoB;IAczE,YAAY,CAAc,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;IAcpC,cAAc,CAAc,EAAE,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;CAWvC"}
|
|
@@ -32,6 +32,7 @@ let MachineController = class MachineController {
|
|
|
32
32
|
this.taskRepo = taskRepo;
|
|
33
33
|
}
|
|
34
34
|
listMachines(status) {
|
|
35
|
+
// findAll() excludes decommissioned by default
|
|
35
36
|
const machines = this.machineRepo.findAll();
|
|
36
37
|
if (status) {
|
|
37
38
|
return machines.filter((m) => m.status === status).map(stripMachineSecrets);
|
|
@@ -61,6 +62,9 @@ let MachineController = class MachineController {
|
|
|
61
62
|
if (!machine) {
|
|
62
63
|
throw new common_1.NotFoundException(`Machine '${id}' not found`);
|
|
63
64
|
}
|
|
65
|
+
if (machine.status === protocol_1.MachineStatus.DECOMMISSIONED) {
|
|
66
|
+
throw new common_1.BadRequestException('Cannot drain a decommissioned machine');
|
|
67
|
+
}
|
|
64
68
|
this.machineRepo.updateStatus(id, protocol_1.MachineStatus.DRAINING);
|
|
65
69
|
return stripMachineSecrets(this.machineRepo.findById(id));
|
|
66
70
|
}
|
|
@@ -69,6 +73,9 @@ let MachineController = class MachineController {
|
|
|
69
73
|
if (!machine) {
|
|
70
74
|
throw new common_1.NotFoundException(`Machine '${id}' not found`);
|
|
71
75
|
}
|
|
76
|
+
if (machine.status === protocol_1.MachineStatus.DECOMMISSIONED) {
|
|
77
|
+
throw new common_1.BadRequestException('Cannot undrain a decommissioned machine');
|
|
78
|
+
}
|
|
72
79
|
this.machineRepo.updateStatus(id, protocol_1.MachineStatus.ONLINE);
|
|
73
80
|
return stripMachineSecrets(this.machineRepo.findById(id));
|
|
74
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machine.controller.js","sourceRoot":"","sources":["../../src/web/machine.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"machine.controller.js","sourceRoot":"","sources":["../../src/web/machine.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ProjectRepository } from '../database/repositories/project.repository';
|
|
2
2
|
import { ProjectMemberRepository } from '../database/repositories/project-member.repository';
|
|
3
3
|
import { DeveloperRepository } from '../database/repositories/developer.repository';
|
|
4
|
+
import { TaskRepository } from '../database/repositories/task.repository';
|
|
4
5
|
import { AuditLogRepository } from '../database/repositories/audit-log.repository';
|
|
5
6
|
interface AuthenticatedRequest {
|
|
6
7
|
user: {
|
|
@@ -13,9 +14,38 @@ export declare class ProjectController {
|
|
|
13
14
|
private readonly projectRepo;
|
|
14
15
|
private readonly projectMemberRepo;
|
|
15
16
|
private readonly developerRepo;
|
|
17
|
+
private readonly taskRepo;
|
|
16
18
|
private readonly auditLogRepo;
|
|
17
|
-
constructor(projectRepo: ProjectRepository, projectMemberRepo: ProjectMemberRepository, developerRepo: DeveloperRepository, auditLogRepo: AuditLogRepository);
|
|
18
|
-
listProjects():
|
|
19
|
+
constructor(projectRepo: ProjectRepository, projectMemberRepo: ProjectMemberRepository, developerRepo: DeveloperRepository, taskRepo: TaskRepository, auditLogRepo: AuditLogRepository);
|
|
20
|
+
listProjects(): {
|
|
21
|
+
taskCount: number;
|
|
22
|
+
memberCount: number;
|
|
23
|
+
members: {
|
|
24
|
+
id: number;
|
|
25
|
+
name: string;
|
|
26
|
+
}[];
|
|
27
|
+
lastActivity: string | null;
|
|
28
|
+
key: string;
|
|
29
|
+
name: string;
|
|
30
|
+
aliases: string[];
|
|
31
|
+
repoUrl: string;
|
|
32
|
+
sshUrl: string | null;
|
|
33
|
+
gitPlatform: import("@overlordai/protocol").GitPlatform;
|
|
34
|
+
defaultBranch: string;
|
|
35
|
+
workspaceRoot: string | null;
|
|
36
|
+
setupCommands: string | null;
|
|
37
|
+
testCommand: string | null;
|
|
38
|
+
agentType: import("@overlordai/protocol").AgentType;
|
|
39
|
+
agentCommand: string | null;
|
|
40
|
+
agentEnv: string | null;
|
|
41
|
+
skillsPath: string | null;
|
|
42
|
+
allowedTools: string | null;
|
|
43
|
+
maxTurns: number;
|
|
44
|
+
pipeline: string | null;
|
|
45
|
+
ptyOutputFilter: number;
|
|
46
|
+
isDefault: boolean;
|
|
47
|
+
createdAt: string;
|
|
48
|
+
}[];
|
|
19
49
|
listDevelopers(): {
|
|
20
50
|
id: number;
|
|
21
51
|
name: string;
|
|
@@ -28,6 +58,7 @@ export declare class ProjectController {
|
|
|
28
58
|
id: number;
|
|
29
59
|
projectKey: string;
|
|
30
60
|
developerId: number;
|
|
61
|
+
developerName: string | null;
|
|
31
62
|
role: string;
|
|
32
63
|
createdAt: string;
|
|
33
64
|
}[];
|
|
@@ -38,6 +69,7 @@ export declare class ProjectController {
|
|
|
38
69
|
id: number;
|
|
39
70
|
projectKey: string;
|
|
40
71
|
developerId: number;
|
|
72
|
+
developerName: string | null;
|
|
41
73
|
role: string;
|
|
42
74
|
createdAt: string;
|
|
43
75
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.controller.d.ts","sourceRoot":"","sources":["../../src/web/project.controller.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,uBAAuB,EAAE,MAAM,oDAAoD,CAAC;AAC7F,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AAEnF,UAAU,oBAAoB;IAC5B,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CACnD;AAED,qBAEa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,YAAY;
|
|
1
|
+
{"version":3,"file":"project.controller.d.ts","sourceRoot":"","sources":["../../src/web/project.controller.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,uBAAuB,EAAE,MAAM,oDAAoD,CAAC;AAC7F,OAAO,EAAE,mBAAmB,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AAEnF,UAAU,oBAAoB;IAC5B,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CACnD;AAED,qBAEa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAJZ,WAAW,EAAE,iBAAiB,EAC9B,iBAAiB,EAAE,uBAAuB,EAC1C,aAAa,EAAE,mBAAmB,EAClC,QAAQ,EAAE,cAAc,EACxB,YAAY,EAAE,kBAAkB;IAInD,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAkBZ,cAAc;;;;;;IAUd,UAAU,CAAe,GAAG,EAAE,MAAM;IAWpC,aAAa,CACU,GAAG,EAAE,MAAM,EACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,GAAG,EAAE,oBAAoB;IA2BlC,WAAW,CAAsB,GAAG,EAAE,MAAM;;;;;;;;IAW5C,SAAS,CACc,GAAG,EAAE,MAAM,EACxB,IAAI,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,EAC7C,GAAG,EAAE,oBAAoB;;;;;;;;IAwClC,YAAY,CACW,GAAG,EAAE,MAAM,EACV,WAAW,EAAE,MAAM,EAClC,GAAG,EAAE,oBAAoB;;;CAyBnC"}
|