@rudderhq/server 0.2.0-canary.20 → 0.2.0-canary.21
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/bundled-plugins/plugin-linear/dist/worker.js +31 -2
- package/dist/bundled-plugins/plugin-linear/dist/worker.js.map +2 -2
- package/dist/routes/instance-settings.d.ts.map +1 -1
- package/dist/routes/instance-settings.js +68 -1
- package/dist/routes/instance-settings.js.map +1 -1
- package/dist/services/activity.d.ts.map +1 -1
- package/dist/services/activity.js +32 -1
- package/dist/services/activity.js.map +1 -1
- package/dist/services/instance-settings.d.ts +8 -1
- package/dist/services/instance-settings.d.ts.map +1 -1
- package/dist/services/instance-settings.js +139 -16
- package/dist/services/instance-settings.js.map +1 -1
- package/dist/services/messenger.d.ts.map +1 -1
- package/dist/services/messenger.js +42 -4
- package/dist/services/messenger.js.map +1 -1
- package/dist/services/runtime-kernel/heartbeat.d.ts.map +1 -1
- package/dist/services/runtime-kernel/heartbeat.js +21 -0
- package/dist/services/runtime-kernel/heartbeat.js.map +1 -1
- package/dist/services/workspace-runtime.d.ts +2 -0
- package/dist/services/workspace-runtime.d.ts.map +1 -1
- package/dist/services/workspace-runtime.js +3 -1
- package/dist/services/workspace-runtime.js.map +1 -1
- package/package.json +13 -13
- package/ui-dist/assets/{_basePickBy-DxQ45mjD.js → _basePickBy-C45AEYYu.js} +1 -1
- package/ui-dist/assets/{_baseUniq-CaTQw1Nc.js → _baseUniq-BJpCpwRa.js} +1 -1
- package/ui-dist/assets/{arc-Bfla4m-g.js → arc-D3Nqvz2N.js} +1 -1
- package/ui-dist/assets/{architectureDiagram-2XIMDMQ5-D3S6Lrog.js → architectureDiagram-2XIMDMQ5-Do23wIQ4.js} +1 -1
- package/ui-dist/assets/{blockDiagram-WCTKOSBZ-Bu7rCPFA.js → blockDiagram-WCTKOSBZ-C2ngwYU8.js} +1 -1
- package/ui-dist/assets/{c4Diagram-IC4MRINW-DOx9OJeh.js → c4Diagram-IC4MRINW-BYIobdwJ.js} +1 -1
- package/ui-dist/assets/channel-Dv2zwH0L.js +1 -0
- package/ui-dist/assets/{chunk-4BX2VUAB-DVDz2ZwY.js → chunk-4BX2VUAB-C44gRPzE.js} +1 -1
- package/ui-dist/assets/{chunk-55IACEB6-BMkexEd-.js → chunk-55IACEB6-B-6fN77J.js} +1 -1
- package/ui-dist/assets/{chunk-FMBD7UC4-OVKEIcK_.js → chunk-FMBD7UC4-DTY1cUtM.js} +1 -1
- package/ui-dist/assets/{chunk-JSJVCQXG-BpogLGb8.js → chunk-JSJVCQXG-D_6UsK-t.js} +1 -1
- package/ui-dist/assets/{chunk-KX2RTZJC-CQrQsn3N.js → chunk-KX2RTZJC-Yb0NUpEi.js} +1 -1
- package/ui-dist/assets/{chunk-NQ4KR5QH-C9xalCaW.js → chunk-NQ4KR5QH-DlCH22us.js} +1 -1
- package/ui-dist/assets/{chunk-QZHKN3VN-qX0v_tgV.js → chunk-QZHKN3VN-Bh-_IRDv.js} +1 -1
- package/ui-dist/assets/{chunk-WL4C6EOR-C2wIrLvc.js → chunk-WL4C6EOR-C785VNuy.js} +1 -1
- package/ui-dist/assets/classDiagram-VBA2DB6C-BBRYwJo_.js +1 -0
- package/ui-dist/assets/classDiagram-v2-RAHNMMFH-BBRYwJo_.js +1 -0
- package/ui-dist/assets/clone-D0Qr-ZBI.js +1 -0
- package/ui-dist/assets/{cose-bilkent-S5V4N54A-DRQRG50q.js → cose-bilkent-S5V4N54A-Bo3jHr7N.js} +1 -1
- package/ui-dist/assets/{dagre-KLK3FWXG-COhwnHr2.js → dagre-KLK3FWXG-YYooZOSE.js} +1 -1
- package/ui-dist/assets/{diagram-E7M64L7V-DJuXEGqB.js → diagram-E7M64L7V-DTEesXx5.js} +1 -1
- package/ui-dist/assets/{diagram-IFDJBPK2-titLtyJR.js → diagram-IFDJBPK2-BXnhNPS7.js} +1 -1
- package/ui-dist/assets/{diagram-P4PSJMXO-BqZo0yNu.js → diagram-P4PSJMXO-CWzB3Cgn.js} +1 -1
- package/ui-dist/assets/{erDiagram-INFDFZHY-DfdFm3vQ.js → erDiagram-INFDFZHY-C4XOm35N.js} +1 -1
- package/ui-dist/assets/{flowDiagram-PKNHOUZH-CdCdirQk.js → flowDiagram-PKNHOUZH-CFCXtb2O.js} +1 -1
- package/ui-dist/assets/{ganttDiagram-A5KZAMGK-DHkK9kHo.js → ganttDiagram-A5KZAMGK-8w-5QNh7.js} +1 -1
- package/ui-dist/assets/{gitGraphDiagram-K3NZZRJ6-Gih-QSTg.js → gitGraphDiagram-K3NZZRJ6-qbWDXQfA.js} +1 -1
- package/ui-dist/assets/{graph-C9C9wypH.js → graph-qUSZM8PJ.js} +1 -1
- package/ui-dist/assets/{index-Car_4Jit.js → index-B267ejd6.js} +336 -336
- package/ui-dist/assets/{index-CQj-qZm4.js → index-BQqyX69f.js} +1 -1
- package/ui-dist/assets/{index-BJcByu_c.js → index-BZCnBfim.js} +1 -1
- package/ui-dist/assets/{index-D4C3HMmp.js → index-BcUKDwkj.js} +1 -1
- package/ui-dist/assets/{index-BHAWyI-_.js → index-BebFet7E.js} +1 -1
- package/ui-dist/assets/{index-DaLjrtrB.js → index-Bgr9D6Ra.js} +1 -1
- package/ui-dist/assets/{index-5zuV8C-T.js → index-BnxD8kOC.js} +1 -1
- package/ui-dist/assets/{index-C9VbXqkW.js → index-Bu89fEqp.js} +1 -1
- package/ui-dist/assets/{index-BK6MJsfu.js → index-Bukq8O5h.js} +1 -1
- package/ui-dist/assets/index-Bxh03544.css +1 -0
- package/ui-dist/assets/{index-DKDpbtDA.js → index-C6xe1iRe.js} +1 -1
- package/ui-dist/assets/{index-Bid9ADBU.js → index-COE6bbkv.js} +1 -1
- package/ui-dist/assets/{index-rFPIi4uq.js → index-Cb8FAw75.js} +1 -1
- package/ui-dist/assets/{index-X6BSuH9a.js → index-CnkyHiZz.js} +1 -1
- package/ui-dist/assets/{index-CsJotpyV.js → index-CxlDyxOU.js} +1 -1
- package/ui-dist/assets/{index-U4t2WLDk.js → index-D5hyFscs.js} +1 -1
- package/ui-dist/assets/{index-C74sx8dp.js → index-DGEmNL-F.js} +1 -1
- package/ui-dist/assets/{index-EYo47Qzq.js → index-D_pLgR1n.js} +1 -1
- package/ui-dist/assets/{index-DxllX9GE.js → index-DzeNxu5i.js} +1 -1
- package/ui-dist/assets/{index-B0HPbB7i.js → index-GjLZxTWd.js} +1 -1
- package/ui-dist/assets/{index-CJ3fYmn1.js → index-L9e7v8cx.js} +1 -1
- package/ui-dist/assets/{index-BWc_-dta.js → index-UyuvF9uZ.js} +1 -1
- package/ui-dist/assets/{index-C76fcs37.js → index-Z090t1c3.js} +1 -1
- package/ui-dist/assets/{index-Cg8Q84fO.js → index-p9EItORI.js} +1 -1
- package/ui-dist/assets/{infoDiagram-LFFYTUFH-CI-KSyjC.js → infoDiagram-LFFYTUFH-or6GdoQj.js} +1 -1
- package/ui-dist/assets/{ishikawaDiagram-PHBUUO56-B1UzopzQ.js → ishikawaDiagram-PHBUUO56-CiJce1C4.js} +1 -1
- package/ui-dist/assets/{journeyDiagram-4ABVD52K-BPN091W_.js → journeyDiagram-4ABVD52K-BSgSZtvu.js} +1 -1
- package/ui-dist/assets/{kanban-definition-K7BYSVSG-bS5eGHx5.js → kanban-definition-K7BYSVSG-Dz-9iEDp.js} +1 -1
- package/ui-dist/assets/{layout-CxAvLJl4.js → layout-BX7Dy_7p.js} +1 -1
- package/ui-dist/assets/{linear-DS8rXF-o.js → linear-S43utJWr.js} +1 -1
- package/ui-dist/assets/{mermaid.core-Cwmb8_Pt.js → mermaid.core-BbRXh3sM.js} +4 -4
- package/ui-dist/assets/{mindmap-definition-YRQLILUH-CBBHsY9B.js → mindmap-definition-YRQLILUH-BuzgDaXx.js} +1 -1
- package/ui-dist/assets/{pieDiagram-SKSYHLDU-QzgzWR8z.js → pieDiagram-SKSYHLDU-CDfbASTn.js} +1 -1
- package/ui-dist/assets/{quadrantDiagram-337W2JSQ-BVCfo5hs.js → quadrantDiagram-337W2JSQ-nz3dRx2X.js} +1 -1
- package/ui-dist/assets/{requirementDiagram-Z7DCOOCP-ByWZKfT-.js → requirementDiagram-Z7DCOOCP-BYawIpQl.js} +1 -1
- package/ui-dist/assets/{sankeyDiagram-WA2Y5GQK-DtwW6hrb.js → sankeyDiagram-WA2Y5GQK-DeTjkIc7.js} +1 -1
- package/ui-dist/assets/{sequenceDiagram-2WXFIKYE-pbHP6_i8.js → sequenceDiagram-2WXFIKYE-30zXKF2p.js} +1 -1
- package/ui-dist/assets/{stateDiagram-RAJIS63D-B2yd1eoK.js → stateDiagram-RAJIS63D-BRYhvfgF.js} +1 -1
- package/ui-dist/assets/stateDiagram-v2-FVOUBMTO-BTX-x4pr.js +1 -0
- package/ui-dist/assets/{timeline-definition-YZTLITO2-CEpYoow6.js → timeline-definition-YZTLITO2-CqeKIDK2.js} +1 -1
- package/ui-dist/assets/{treemap-KZPCXAKY-ByqNFxlg.js → treemap-KZPCXAKY-D7WLACiN.js} +1 -1
- package/ui-dist/assets/{vennDiagram-LZ73GAT5-Cw-HlrA5.js → vennDiagram-LZ73GAT5-4TiMQaNo.js} +1 -1
- package/ui-dist/assets/{xychartDiagram-JWTSCODW-DtpfVmNd.js → xychartDiagram-JWTSCODW-BVKw66VX.js} +1 -1
- package/ui-dist/index.html +2 -2
- package/ui-dist/assets/channel-CiCjQgKG.js +0 -1
- package/ui-dist/assets/classDiagram-VBA2DB6C-DWXTEiLK.js +0 -1
- package/ui-dist/assets/classDiagram-v2-RAHNMMFH-DWXTEiLK.js +0 -1
- package/ui-dist/assets/clone-Y-psJv3u.js +0 -1
- package/ui-dist/assets/index-UmhZI_P5.css +0 -1
- package/ui-dist/assets/stateDiagram-v2-FVOUBMTO-C9YgmQrg.js +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-settings.d.ts","sourceRoot":"","sources":["../../src/routes/instance-settings.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"instance-settings.d.ts","sourceRoot":"","sources":["../../src/routes/instance-settings.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAEvC,OAAO,EAUL,KAAK,cAAc,EACpB,MAAM,kBAAkB,CAAC;AAyH1B,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,EAAE,EACN,IAAI,EAAE;IAAE,cAAc,EAAE,cAAc,CAAA;CAAE,8CA+PzC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Router } from "express";
|
|
2
|
-
import {
|
|
2
|
+
import { isUnsafeGitIdentityEmail } from "@rudderhq/agent-runtime-utils/git-identity";
|
|
3
|
+
import { patchInstanceGeneralSettingsSchema, patchInstanceGitIdentitySettingsSchema, patchInstanceLangfuseSettingsSchema, patchInstanceNotificationSettingsSchema, patchOperatorProfileSettingsSchema, instancePathPickerRequestSchema, } from "@rudderhq/shared";
|
|
3
4
|
import { conflict, forbidden, unprocessable } from "../errors.js";
|
|
4
5
|
import { validate } from "../middleware/validate.js";
|
|
5
6
|
import { boardAuthService, instanceSettingsService, logActivity, operatorProfileService, } from "../services/index.js";
|
|
@@ -30,6 +31,11 @@ function assertLocalLangfuseSettings(deploymentMode) {
|
|
|
30
31
|
throw unprocessable("Langfuse settings are only available in local_trusted mode.");
|
|
31
32
|
}
|
|
32
33
|
}
|
|
34
|
+
function assertLocalGitIdentitySettings(deploymentMode) {
|
|
35
|
+
if (deploymentMode !== "local_trusted") {
|
|
36
|
+
throw unprocessable("Git identity settings are only available in local_trusted mode.");
|
|
37
|
+
}
|
|
38
|
+
}
|
|
33
39
|
function isLangfuseManagedByEnv() {
|
|
34
40
|
return LANGFUSE_ENV_KEYS.some((key) => process.env[key] !== undefined);
|
|
35
41
|
}
|
|
@@ -49,6 +55,23 @@ function getLangfuseSettings() {
|
|
|
49
55
|
managedByEnv: isLangfuseManagedByEnv(),
|
|
50
56
|
};
|
|
51
57
|
}
|
|
58
|
+
function buildGitIdentityFromPatch(patch, source) {
|
|
59
|
+
const name = trimOptionalString(patch.name);
|
|
60
|
+
const email = trimOptionalString(patch.email);
|
|
61
|
+
if (!name || !email) {
|
|
62
|
+
throw unprocessable("Git identity name and email are required.");
|
|
63
|
+
}
|
|
64
|
+
if (isUnsafeGitIdentityEmail(email)) {
|
|
65
|
+
throw unprocessable("Git identity email must be a valid non-local email address.");
|
|
66
|
+
}
|
|
67
|
+
return {
|
|
68
|
+
name,
|
|
69
|
+
email,
|
|
70
|
+
confirmed: true,
|
|
71
|
+
source,
|
|
72
|
+
lastDetectedAt: source === "detected_global" ? new Date().toISOString() : null,
|
|
73
|
+
};
|
|
74
|
+
}
|
|
52
75
|
function applyLangfusePatch(current, patch) {
|
|
53
76
|
const nextEnabled = patch.enabled ?? current?.enabled ?? false;
|
|
54
77
|
const nextBaseUrl = (Object.prototype.hasOwnProperty.call(patch, "baseUrl")
|
|
@@ -132,6 +155,50 @@ export function instanceSettingsRoutes(db, opts) {
|
|
|
132
155
|
})));
|
|
133
156
|
res.json(updated.notifications);
|
|
134
157
|
});
|
|
158
|
+
router.get("/instance/settings/git-identity", async (req, res) => {
|
|
159
|
+
assertCanManageInstanceSettings(req);
|
|
160
|
+
assertLocalGitIdentitySettings(opts.deploymentMode);
|
|
161
|
+
res.json(await svc.getGitIdentity());
|
|
162
|
+
});
|
|
163
|
+
router.patch("/instance/settings/git-identity", validate(patchInstanceGitIdentitySettingsSchema), async (req, res) => {
|
|
164
|
+
assertCanManageInstanceSettings(req);
|
|
165
|
+
assertLocalGitIdentitySettings(opts.deploymentMode);
|
|
166
|
+
const patch = req.body;
|
|
167
|
+
const updated = await (async () => {
|
|
168
|
+
if (patch.clear === true) {
|
|
169
|
+
return svc.clearGitIdentity();
|
|
170
|
+
}
|
|
171
|
+
if (patch.confirmDetected === true) {
|
|
172
|
+
const detected = await svc.detectGitIdentity();
|
|
173
|
+
if (!detected || detected.unsafe) {
|
|
174
|
+
throw unprocessable("No safe host Git identity is available to confirm.");
|
|
175
|
+
}
|
|
176
|
+
return svc.updateGitIdentity(buildGitIdentityFromPatch({
|
|
177
|
+
name: detected.name,
|
|
178
|
+
email: detected.email,
|
|
179
|
+
}, "detected_global"));
|
|
180
|
+
}
|
|
181
|
+
return svc.updateGitIdentity(buildGitIdentityFromPatch(patch, "override"));
|
|
182
|
+
})();
|
|
183
|
+
const actor = getActorInfo(req);
|
|
184
|
+
const orgIds = await svc.listCompanyIds();
|
|
185
|
+
await Promise.all(orgIds.map((orgId) => logActivity(db, {
|
|
186
|
+
orgId,
|
|
187
|
+
actorType: actor.actorType,
|
|
188
|
+
actorId: actor.actorId,
|
|
189
|
+
agentId: actor.agentId,
|
|
190
|
+
runId: actor.runId,
|
|
191
|
+
action: "instance.settings.git_identity_updated",
|
|
192
|
+
entityType: "instance_settings",
|
|
193
|
+
entityId: "git_identity",
|
|
194
|
+
details: {
|
|
195
|
+
status: updated.status,
|
|
196
|
+
source: updated.saved?.source ?? null,
|
|
197
|
+
changedKeys: Object.keys(req.body).sort(),
|
|
198
|
+
},
|
|
199
|
+
})));
|
|
200
|
+
res.json(updated);
|
|
201
|
+
});
|
|
135
202
|
router.get("/instance/settings/langfuse", async (req, res) => {
|
|
136
203
|
assertCanManageInstanceSettings(req);
|
|
137
204
|
assertLocalLangfuseSettings(opts.deploymentMode);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-settings.js","sourceRoot":"","sources":["../../src/routes/instance-settings.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"instance-settings.js","sourceRoot":"","sources":["../../src/routes/instance-settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity.d.ts","sourceRoot":"","sources":["../../src/services/activity.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,WAAW,EAA8D,MAAM,cAAc,CAAC;AAEvG,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;
|
|
1
|
+
{"version":3,"file":"activity.d.ts","sourceRoot":"","sources":["../../src/services/activity.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,WAAW,EAA8D,MAAM,cAAc,CAAC;AAEvG,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAkCD,wBAAgB,eAAe,CAAC,EAAE,EAAE,EAAE;oBAIlB,eAAe;;;;;;;;;;;;;wBAqCL,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAuEV,MAAM,WAAW,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0BAkCjB,MAAM;;;;;;;mBA6DnB,OAAO,WAAW,CAAC,YAAY;;;;;;;;;;;;;EAOjD"}
|
|
@@ -1,5 +1,36 @@
|
|
|
1
1
|
import { and, desc, eq, isNotNull, isNull, ne, or, sql } from "drizzle-orm";
|
|
2
2
|
import { activityLog, chatContextLinks, chatConversations, heartbeatRuns, issues } from "@rudderhq/db";
|
|
3
|
+
const ISSUE_UPDATE_METADATA_KEYS = new Set([
|
|
4
|
+
"identifier",
|
|
5
|
+
"issueIdentifier",
|
|
6
|
+
"_previous",
|
|
7
|
+
"source",
|
|
8
|
+
"reopened",
|
|
9
|
+
"reopenedFrom",
|
|
10
|
+
"normalizedFromStatus",
|
|
11
|
+
"normalizedReason",
|
|
12
|
+
]);
|
|
13
|
+
function isRecord(value) {
|
|
14
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
15
|
+
}
|
|
16
|
+
function issueUpdatedChangedKeys(details) {
|
|
17
|
+
if (!isRecord(details))
|
|
18
|
+
return [];
|
|
19
|
+
return Object.keys(details).filter((key) => !ISSUE_UPDATE_METADATA_KEYS.has(key));
|
|
20
|
+
}
|
|
21
|
+
function isDescriptionOnlyIssueUpdate(event) {
|
|
22
|
+
if (event.action !== "issue.updated")
|
|
23
|
+
return false;
|
|
24
|
+
const changedKeys = issueUpdatedChangedKeys(event.details);
|
|
25
|
+
return changedKeys.length === 1 && changedKeys[0] === "description";
|
|
26
|
+
}
|
|
27
|
+
function shouldShowIssueActivity(event) {
|
|
28
|
+
if (event.action === "issue.document_updated")
|
|
29
|
+
return false;
|
|
30
|
+
if (isDescriptionOnlyIssueUpdate(event))
|
|
31
|
+
return false;
|
|
32
|
+
return true;
|
|
33
|
+
}
|
|
3
34
|
export function activityService(db) {
|
|
4
35
|
const issueIdAsText = sql `${issues.id}::text`;
|
|
5
36
|
const conversationIdAsText = sql `${chatConversations.id}::text`;
|
|
@@ -43,7 +74,7 @@ export function activityService(db) {
|
|
|
43
74
|
.orderBy(desc(activityLog.createdAt)),
|
|
44
75
|
]);
|
|
45
76
|
const merged = [
|
|
46
|
-
...issueEvents,
|
|
77
|
+
...issueEvents.filter(shouldShowIssueActivity),
|
|
47
78
|
...relatedChatEvents.map(({ activityLog: event, conversationTitle }) => ({
|
|
48
79
|
...event,
|
|
49
80
|
details: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../src/services/activity.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"activity.js","sourceRoot":"","sources":["../../src/services/activity.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,19 @@
|
|
|
1
1
|
import type { Db } from "@rudderhq/db";
|
|
2
|
-
import { type InstanceGeneralSettings, type InstanceLocale, type InstanceNotificationSettings, type PatchInstanceGeneralSettings, type PatchInstanceNotificationSettings, type InstanceSettings } from "@rudderhq/shared";
|
|
2
|
+
import { type InstanceDetectedGitIdentity, type InstanceGeneralSettings, type InstanceGitIdentitySettings, type InstanceGitIdentityState, type InstanceLocale, type InstanceNotificationSettings, type PatchInstanceGeneralSettings, type PatchInstanceNotificationSettings, type InstanceSettings } from "@rudderhq/shared";
|
|
3
3
|
export declare function normalizeInstanceLocale(raw: unknown): InstanceLocale;
|
|
4
|
+
declare function detectHostGlobalGitIdentity(): Promise<InstanceDetectedGitIdentity | null>;
|
|
4
5
|
export declare function instanceSettingsService(db: Db): {
|
|
5
6
|
get: () => Promise<InstanceSettings>;
|
|
6
7
|
getGeneral: () => Promise<InstanceGeneralSettings>;
|
|
7
8
|
getNotifications: () => Promise<InstanceNotificationSettings>;
|
|
9
|
+
detectGitIdentity: typeof detectHostGlobalGitIdentity;
|
|
10
|
+
getGitIdentity: () => Promise<InstanceGitIdentityState>;
|
|
11
|
+
getConfirmedGitIdentity: () => Promise<InstanceGitIdentitySettings | null>;
|
|
12
|
+
updateGitIdentity: (identity: InstanceGitIdentitySettings) => Promise<InstanceGitIdentityState>;
|
|
13
|
+
clearGitIdentity: () => Promise<InstanceGitIdentityState>;
|
|
8
14
|
updateGeneral: (patch: PatchInstanceGeneralSettings) => Promise<InstanceSettings>;
|
|
9
15
|
updateNotifications: (patch: PatchInstanceNotificationSettings) => Promise<InstanceSettings>;
|
|
10
16
|
listCompanyIds: () => Promise<string[]>;
|
|
11
17
|
};
|
|
18
|
+
export {};
|
|
12
19
|
//# sourceMappingURL=instance-settings.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-settings.d.ts","sourceRoot":"","sources":["../../src/services/instance-settings.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"instance-settings.d.ts","sourceRoot":"","sources":["../../src/services/instance-settings.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAGvC,OAAO,EAGL,KAAK,2BAA2B,EAChC,KAAK,uBAAuB,EAC5B,KAAK,2BAA2B,EAChC,KAAK,wBAAwB,EAC7B,KAAK,cAAc,EAEnB,KAAK,4BAA4B,EACjC,KAAK,4BAA4B,EACjC,KAAK,iCAAiC,EACtC,KAAK,gBAAgB,EACtB,MAAM,kBAAkB,CAAC;AAqB1B,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,cAAc,CAEpE;AAoDD,iBAAe,2BAA2B,IAAI,OAAO,CAAC,2BAA2B,GAAG,IAAI,CAAC,CAYxF;AAuED,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,EAAE;eAiD3B,OAAO,CAAC,gBAAgB,CAAC;sBAElB,OAAO,CAAC,uBAAuB,CAAC;4BAK1B,OAAO,CAAC,4BAA4B,CAAC;;0BAOvC,OAAO,CAAC,wBAAwB,CAAC;mCAOxB,OAAO,CAAC,2BAA2B,GAAG,IAAI,CAAC;kCAM1C,2BAA2B,KAAG,OAAO,CAAC,wBAAwB,CAAC;4BAOvE,OAAO,CAAC,wBAAwB,CAAC;2BAMhC,4BAA4B,KAAG,OAAO,CAAC,gBAAgB,CAAC;iCAIlD,iCAAiC,KAAG,OAAO,CAAC,gBAAgB,CAAC;0BA6BtE,OAAO,CAAC,MAAM,EAAE,CAAC;EAM9C"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { spawn } from "node:child_process";
|
|
1
2
|
import { organizations, instanceSettings } from "@rudderhq/db";
|
|
2
|
-
import {
|
|
3
|
+
import { isUnsafeGitIdentityEmail } from "@rudderhq/agent-runtime-utils/git-identity";
|
|
4
|
+
import { instanceGeneralSettingsSchema, instanceGitIdentitySettingsSchema, instanceNotificationSettingsSchema, } from "@rudderhq/shared";
|
|
3
5
|
import { eq } from "drizzle-orm";
|
|
4
6
|
const DEFAULT_SINGLETON_KEY = "default";
|
|
5
7
|
function normalizeGeneralSettings(raw) {
|
|
@@ -8,11 +10,13 @@ function normalizeGeneralSettings(raw) {
|
|
|
8
10
|
return {
|
|
9
11
|
censorUsernameInLogs: parsed.data.censorUsernameInLogs ?? false,
|
|
10
12
|
locale: parsed.data.locale ?? "en",
|
|
13
|
+
gitIdentity: parsed.data.gitIdentity ?? null,
|
|
11
14
|
};
|
|
12
15
|
}
|
|
13
16
|
return {
|
|
14
17
|
censorUsernameInLogs: false,
|
|
15
18
|
locale: "en",
|
|
19
|
+
gitIdentity: null,
|
|
16
20
|
};
|
|
17
21
|
}
|
|
18
22
|
export function normalizeInstanceLocale(raw) {
|
|
@@ -45,6 +49,99 @@ function toInstanceSettings(row) {
|
|
|
45
49
|
updatedAt: row.updatedAt,
|
|
46
50
|
};
|
|
47
51
|
}
|
|
52
|
+
function nonEmpty(value) {
|
|
53
|
+
const normalized = value?.trim() ?? "";
|
|
54
|
+
return normalized.length > 0 ? normalized : null;
|
|
55
|
+
}
|
|
56
|
+
function runGitConfigGet(key) {
|
|
57
|
+
return new Promise((resolve) => {
|
|
58
|
+
const child = spawn("git", ["config", "--global", "--get", key], {
|
|
59
|
+
env: process.env,
|
|
60
|
+
stdio: ["ignore", "pipe", "ignore"],
|
|
61
|
+
});
|
|
62
|
+
let stdout = "";
|
|
63
|
+
child.stdout?.on("data", (chunk) => {
|
|
64
|
+
stdout += String(chunk);
|
|
65
|
+
});
|
|
66
|
+
child.on("error", () => resolve(null));
|
|
67
|
+
child.on("close", (code) => resolve(code === 0 ? nonEmpty(stdout) : null));
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
async function detectHostGlobalGitIdentity() {
|
|
71
|
+
const [name, email] = await Promise.all([
|
|
72
|
+
runGitConfigGet("user.name"),
|
|
73
|
+
runGitConfigGet("user.email"),
|
|
74
|
+
]);
|
|
75
|
+
if (!name && !email)
|
|
76
|
+
return null;
|
|
77
|
+
return {
|
|
78
|
+
name: name ?? "",
|
|
79
|
+
email: email ?? "",
|
|
80
|
+
source: "host_global",
|
|
81
|
+
unsafe: !name || isUnsafeGitIdentityEmail(email),
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
function savedIdentityIsSafe(identity) {
|
|
85
|
+
return Boolean(identity?.confirmed === true &&
|
|
86
|
+
nonEmpty(identity.name) &&
|
|
87
|
+
nonEmpty(identity.email) &&
|
|
88
|
+
!isUnsafeGitIdentityEmail(identity.email));
|
|
89
|
+
}
|
|
90
|
+
function buildGitIdentityState(saved, detected) {
|
|
91
|
+
if (savedIdentityIsSafe(saved)) {
|
|
92
|
+
return {
|
|
93
|
+
saved,
|
|
94
|
+
detected,
|
|
95
|
+
effective: saved,
|
|
96
|
+
status: "confirmed",
|
|
97
|
+
warning: null,
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
if (saved && !savedIdentityIsSafe(saved)) {
|
|
101
|
+
return {
|
|
102
|
+
saved,
|
|
103
|
+
detected,
|
|
104
|
+
effective: null,
|
|
105
|
+
status: "unsafe",
|
|
106
|
+
warning: "The saved Git identity is incomplete or unsafe. Update it before local agents create commits.",
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
if (detected) {
|
|
110
|
+
if (detected.unsafe) {
|
|
111
|
+
return {
|
|
112
|
+
saved: null,
|
|
113
|
+
detected,
|
|
114
|
+
effective: null,
|
|
115
|
+
status: "unsafe",
|
|
116
|
+
warning: "The detected host Git identity is missing a name/email or uses an unsafe local email.",
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
return {
|
|
120
|
+
saved: null,
|
|
121
|
+
detected,
|
|
122
|
+
effective: detected,
|
|
123
|
+
status: "detected",
|
|
124
|
+
warning: "Confirm this detected host Git identity before Rudder uses it as the managed runtime identity.",
|
|
125
|
+
};
|
|
126
|
+
}
|
|
127
|
+
return {
|
|
128
|
+
saved: null,
|
|
129
|
+
detected: null,
|
|
130
|
+
effective: null,
|
|
131
|
+
status: "missing",
|
|
132
|
+
warning: "No safe host Git identity was detected. Configure user.name and user.email or save an override.",
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
function normalizeGitIdentityForStorage(identity) {
|
|
136
|
+
const parsed = instanceGitIdentitySettingsSchema.parse(identity);
|
|
137
|
+
return {
|
|
138
|
+
name: parsed.name,
|
|
139
|
+
email: parsed.email,
|
|
140
|
+
confirmed: parsed.confirmed,
|
|
141
|
+
source: parsed.source,
|
|
142
|
+
lastDetectedAt: parsed.lastDetectedAt,
|
|
143
|
+
};
|
|
144
|
+
}
|
|
48
145
|
export function instanceSettingsService(db) {
|
|
49
146
|
async function getOrCreateRow() {
|
|
50
147
|
const existing = await db
|
|
@@ -73,6 +170,23 @@ export function instanceSettingsService(db) {
|
|
|
73
170
|
.returning();
|
|
74
171
|
return created;
|
|
75
172
|
}
|
|
173
|
+
async function updateGeneralJson(patch) {
|
|
174
|
+
const current = await getOrCreateRow();
|
|
175
|
+
const nextGeneral = normalizeGeneralSettings({
|
|
176
|
+
...normalizeGeneralSettings(current.general),
|
|
177
|
+
...patch,
|
|
178
|
+
});
|
|
179
|
+
const now = new Date();
|
|
180
|
+
const [updated] = await db
|
|
181
|
+
.update(instanceSettings)
|
|
182
|
+
.set({
|
|
183
|
+
general: { ...nextGeneral },
|
|
184
|
+
updatedAt: now,
|
|
185
|
+
})
|
|
186
|
+
.where(eq(instanceSettings.id, current.id))
|
|
187
|
+
.returning();
|
|
188
|
+
return toInstanceSettings(updated ?? current);
|
|
189
|
+
}
|
|
76
190
|
return {
|
|
77
191
|
get: async () => toInstanceSettings(await getOrCreateRow()),
|
|
78
192
|
getGeneral: async () => {
|
|
@@ -83,22 +197,31 @@ export function instanceSettingsService(db) {
|
|
|
83
197
|
const row = await getOrCreateRow();
|
|
84
198
|
return normalizeNotificationSettings(row.notifications);
|
|
85
199
|
},
|
|
200
|
+
detectGitIdentity: detectHostGlobalGitIdentity,
|
|
201
|
+
getGitIdentity: async () => {
|
|
202
|
+
const row = await getOrCreateRow();
|
|
203
|
+
const general = normalizeGeneralSettings(row.general);
|
|
204
|
+
const detected = await detectHostGlobalGitIdentity();
|
|
205
|
+
return buildGitIdentityState(general.gitIdentity, detected);
|
|
206
|
+
},
|
|
207
|
+
getConfirmedGitIdentity: async () => {
|
|
208
|
+
const row = await getOrCreateRow();
|
|
209
|
+
const identity = normalizeGeneralSettings(row.general).gitIdentity;
|
|
210
|
+
return savedIdentityIsSafe(identity) ? identity : null;
|
|
211
|
+
},
|
|
212
|
+
updateGitIdentity: async (identity) => {
|
|
213
|
+
const normalized = normalizeGitIdentityForStorage(identity);
|
|
214
|
+
const updated = await updateGeneralJson({ gitIdentity: normalized });
|
|
215
|
+
const detected = await detectHostGlobalGitIdentity();
|
|
216
|
+
return buildGitIdentityState(updated.general.gitIdentity, detected);
|
|
217
|
+
},
|
|
218
|
+
clearGitIdentity: async () => {
|
|
219
|
+
const updated = await updateGeneralJson({ gitIdentity: null });
|
|
220
|
+
const detected = await detectHostGlobalGitIdentity();
|
|
221
|
+
return buildGitIdentityState(updated.general.gitIdentity, detected);
|
|
222
|
+
},
|
|
86
223
|
updateGeneral: async (patch) => {
|
|
87
|
-
|
|
88
|
-
const nextGeneral = normalizeGeneralSettings({
|
|
89
|
-
...normalizeGeneralSettings(current.general),
|
|
90
|
-
...patch,
|
|
91
|
-
});
|
|
92
|
-
const now = new Date();
|
|
93
|
-
const [updated] = await db
|
|
94
|
-
.update(instanceSettings)
|
|
95
|
-
.set({
|
|
96
|
-
general: { ...nextGeneral },
|
|
97
|
-
updatedAt: now,
|
|
98
|
-
})
|
|
99
|
-
.where(eq(instanceSettings.id, current.id))
|
|
100
|
-
.returning();
|
|
101
|
-
return toInstanceSettings(updated ?? current);
|
|
224
|
+
return updateGeneralJson(patch);
|
|
102
225
|
},
|
|
103
226
|
updateNotifications: async (patch) => {
|
|
104
227
|
const current = await getOrCreateRow();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-settings.js","sourceRoot":"","sources":["../../src/services/instance-settings.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"instance-settings.js","sourceRoot":"","sources":["../../src/services/instance-settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messenger.d.ts","sourceRoot":"","sources":["../../src/services/messenger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAavC,OAAO,EASL,KAAK,2BAA2B,EAChC,KAAK,yBAAyB,EAE9B,KAAK,+BAA+B,EACpC,KAAK,wBAAwB,EAC7B,KAAK,8BAA8B,EACnC,KAAK,yBAAyB,EAG9B,KAAK,sBAAsB,EAC5B,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"messenger.d.ts","sourceRoot":"","sources":["../../src/services/messenger.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAavC,OAAO,EASL,KAAK,2BAA2B,EAChC,KAAK,yBAAyB,EAE9B,KAAK,+BAA+B,EACpC,KAAK,wBAAwB,EAC7B,KAAK,8BAA8B,EACnC,KAAK,yBAAyB,EAG9B,KAAK,sBAAsB,EAC5B,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AA8BzC,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,IAAI,CAAC;CAClB,CAAC;AAqHF,KAAK,mBAAmB,GAAG,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAC/F,KAAK,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AA4dlG,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,EAAE;iCAybK,MAAM,UAAU,MAAM;oCAmDnB,MAAM,UAAU,MAAM;sBAKjC,mBAAmB;kBAC3B,cAAc,EAAE;;6BA3BJ,MAAM,UAAU,MAAM;;;;;;;;;;;;;;;;;gCAInB,MAAM,UAAU,MAAM;;;;;;;;;;;;;;;;;6BAIzB,MAAM,UAAU,MAAM,cAAc,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAuB9D,MAAM,UAAU,MAAM,aAAa,MAAM;;;;;;;;;4BAQzC,MAAM,UAAU,MAAM,aAAa,MAAM;2BAAzC,MAAM,UAAU,MAAM,aAAa,MAAM;EA+C/E"}
|
|
@@ -18,6 +18,32 @@ const ISSUE_ACTIVITY_ACTIONS = [
|
|
|
18
18
|
"heartbeat.retried",
|
|
19
19
|
];
|
|
20
20
|
const ACTIONABLE_APPROVAL_STATUSES = new Set(["pending", "revision_requested"]);
|
|
21
|
+
const ISSUE_UPDATE_METADATA_KEYS = new Set([
|
|
22
|
+
"identifier",
|
|
23
|
+
"issueIdentifier",
|
|
24
|
+
"_previous",
|
|
25
|
+
"source",
|
|
26
|
+
"reopened",
|
|
27
|
+
"reopenedFrom",
|
|
28
|
+
"normalizedFromStatus",
|
|
29
|
+
"normalizedReason",
|
|
30
|
+
]);
|
|
31
|
+
function issueUpdatedChangedKeys(details) {
|
|
32
|
+
if (!details)
|
|
33
|
+
return [];
|
|
34
|
+
return Object.keys(details).filter((key) => !ISSUE_UPDATE_METADATA_KEYS.has(key));
|
|
35
|
+
}
|
|
36
|
+
function isDescriptionOnlyIssueUpdate(activity) {
|
|
37
|
+
if (activity.action !== "issue.updated")
|
|
38
|
+
return false;
|
|
39
|
+
const changedKeys = issueUpdatedChangedKeys(activity.details);
|
|
40
|
+
return changedKeys.length === 1 && changedKeys[0] === "description";
|
|
41
|
+
}
|
|
42
|
+
function shouldNotifyIssueActivity(activity) {
|
|
43
|
+
if (isDescriptionOnlyIssueUpdate(activity))
|
|
44
|
+
return false;
|
|
45
|
+
return true;
|
|
46
|
+
}
|
|
21
47
|
function truncate(value, max = 140) {
|
|
22
48
|
return formatMessengerPreview(value, { max });
|
|
23
49
|
}
|
|
@@ -504,7 +530,14 @@ export function messengerService(db) {
|
|
|
504
530
|
}
|
|
505
531
|
const latestActivityByIssue = new Map();
|
|
506
532
|
const latestExternalActivityByIssue = new Map();
|
|
533
|
+
const latestSuppressedActivityByIssue = new Map();
|
|
507
534
|
for (const row of activityRows) {
|
|
535
|
+
if (!shouldNotifyIssueActivity(row)) {
|
|
536
|
+
if (!latestSuppressedActivityByIssue.has(row.entityId)) {
|
|
537
|
+
latestSuppressedActivityByIssue.set(row.entityId, row);
|
|
538
|
+
}
|
|
539
|
+
continue;
|
|
540
|
+
}
|
|
508
541
|
if (!latestActivityByIssue.has(row.entityId)) {
|
|
509
542
|
latestActivityByIssue.set(row.entityId, row);
|
|
510
543
|
}
|
|
@@ -531,11 +564,16 @@ export function messengerService(db) {
|
|
|
531
564
|
const latestExternalComment = latestExternalCommentByIssue.get(issue.id) ?? null;
|
|
532
565
|
const latestExternalActivity = latestExternalActivityByIssue.get(issue.id) ?? null;
|
|
533
566
|
const latestExternalCommentAt = normalizeDate(latestExternalComment?.createdAt ?? null);
|
|
534
|
-
const
|
|
535
|
-
|
|
567
|
+
const latestSuppressedActivityAt = normalizeDate(latestSuppressedActivityByIssue.get(issue.id)?.createdAt ?? null);
|
|
568
|
+
const issueUpdatedAt = normalizeDate(issue.updatedAt);
|
|
569
|
+
const suppressedActivityMatchesIssueUpdate = Boolean(latestSuppressedActivityAt &&
|
|
570
|
+
issueUpdatedAt &&
|
|
571
|
+
latestSuppressedActivityAt.getTime() >= issueUpdatedAt.getTime() - 5_000);
|
|
572
|
+
const fallbackAssignedActivityAt = issue.assigneeUserId === userId && !latestActivityByIssue.has(issue.id) && !suppressedActivityMatchesIssueUpdate
|
|
573
|
+
? issueUpdatedAt
|
|
536
574
|
: null;
|
|
537
|
-
const fallbackReviewerActivityAt = issue.reviewerUserId === userId && issue.status === "in_review" && !latestActivityByIssue.has(issue.id)
|
|
538
|
-
?
|
|
575
|
+
const fallbackReviewerActivityAt = issue.reviewerUserId === userId && issue.status === "in_review" && !latestActivityByIssue.has(issue.id) && !suppressedActivityMatchesIssueUpdate
|
|
576
|
+
? issueUpdatedAt
|
|
539
577
|
: null;
|
|
540
578
|
const attentionActivityAt = maxDate(latestExternalCommentAt, latestExternalActivity?.createdAt, fallbackAssignedActivityAt, fallbackReviewerActivityAt);
|
|
541
579
|
const attentionPreview = latestExternalCommentAt &&
|