@kumori/aurora-backend-handler 1.0.82 → 1.0.84
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/helpers/service-helper.ts +17 -23
- package/package.json +1 -1
- package/websocket-manager.ts +8 -5
|
@@ -210,30 +210,24 @@ export const handleServiceEvent = ({
|
|
|
210
210
|
updatedPendingRevisionErrors.splice(pendingErrorIndex, 1);
|
|
211
211
|
}
|
|
212
212
|
|
|
213
|
-
const currentRevisionId =
|
|
214
|
-
eventData.status.revision ||
|
|
215
|
-
(serviceRevisions.length > 0
|
|
216
|
-
? Math.max(...serviceRevisions.map((r) => Number(r.id))).toString()
|
|
217
|
-
: "");
|
|
218
|
-
|
|
219
213
|
const baseServiceData = {
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
214
|
+
tenant: serviceTenantId,
|
|
215
|
+
account: eventData.spec.metadata.targetAccount || pathParts.account,
|
|
216
|
+
environment:
|
|
217
|
+
eventData.spec.metadata.targetEnvironment || pathParts.environment,
|
|
218
|
+
name: entityId,
|
|
219
|
+
revisions: [...serviceRevisions].sort(
|
|
220
|
+
(a, b) => Number(b.id) - Number(a.id),
|
|
221
|
+
),
|
|
222
|
+
status: finalStatus || eventData.status.state,
|
|
223
|
+
error: finalError,
|
|
224
|
+
role: serviceRoles.length > 0 ? serviceRoles : existingService?.role || [],
|
|
225
|
+
usage: serviceUsage,
|
|
226
|
+
lastDeployed: eventData.spec.ctstamp,
|
|
227
|
+
project: projectLabel || existingService?.project || "",
|
|
228
|
+
currentRevision: String(eventData.spec.ctstamp || eventData.status.revision || ""),
|
|
229
|
+
startedAt: currentRevision?.createdAt || existingService?.startedAt || "",
|
|
230
|
+
};
|
|
237
231
|
|
|
238
232
|
let newService: Service;
|
|
239
233
|
|
package/package.json
CHANGED
package/websocket-manager.ts
CHANGED
|
@@ -683,9 +683,13 @@ const handleEvent = async (message: WSMessage) => {
|
|
|
683
683
|
if (revisionResult.roles.length > 0) {
|
|
684
684
|
roleMap.set(revisionResult.serviceId, revisionResult.roles);
|
|
685
685
|
}
|
|
686
|
+
|
|
687
|
+
let resolvedRevisionService: Service | null = null;
|
|
686
688
|
if (revisionResult.updatedService) {
|
|
687
|
-
|
|
688
|
-
|
|
689
|
+
resolvedRevisionService = resolveServiceStatus(
|
|
690
|
+
revisionResult.updatedService,
|
|
691
|
+
);
|
|
692
|
+
servicesMap.set(revisionResult.serviceId, resolvedRevisionService);
|
|
689
693
|
}
|
|
690
694
|
if (revisionResult.updatedEnvironment) {
|
|
691
695
|
const envId = revisionResult.updatedService?.environment;
|
|
@@ -701,12 +705,11 @@ const handleEvent = async (message: WSMessage) => {
|
|
|
701
705
|
}
|
|
702
706
|
if (
|
|
703
707
|
revisionResult.serviceDeploymentErrorEvent &&
|
|
708
|
+
resolvedRevisionService &&
|
|
704
709
|
String(entityId) ===
|
|
705
710
|
String(revisionResult.updatedService?.currentRevision)
|
|
706
711
|
) {
|
|
707
|
-
eventHelper.service.publish.deploymentError(
|
|
708
|
-
revisionResult.serviceDeploymentErrorEvent,
|
|
709
|
-
);
|
|
712
|
+
eventHelper.service.publish.deploymentError(resolvedRevisionService);
|
|
710
713
|
}
|
|
711
714
|
if (
|
|
712
715
|
revisionResult.shouldFetchChannels &&
|