Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions packages/backend/src/connectionManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import os from 'os';
import { Redis } from 'ioredis';
import { RepoData, compileGithubConfig, compileGitlabConfig, compileGiteaConfig, compileGerritConfig } from "./repoCompileUtils.js";
import { BackendError, BackendException } from "@sourcebot/error";
import { captureEvent } from "./posthog.js";

interface IConnectionManager {
scheduleConnectionSync: (connection: Connection) => Promise<void>;
Expand All@@ -22,6 +23,10 @@ type JobPayload = {
config: ConnectionConfig,
};

type JobResult = {
repoCount: number
}

export class ConnectionManager implements IConnectionManager {
private worker: Worker;
private queue: Queue<JobPayload>;
Expand DownExpand Up@@ -217,10 +222,14 @@ export class ConnectionManager implements IConnectionManager {
const totalUpsertDuration = performance.now() - totalUpsertStart;
this.logger.info(`Upserted ${repoData.length} repos in ${totalUpsertDuration}ms`);
});

return {
repoCount: repoData.length,
};
}


private async onSyncJobCompleted(job: Job<JobPayload>) {
private async onSyncJobCompleted(job: Job<JobPayload>, result: JobResult) {
this.logger.info(`Connection sync job ${job.id} completed`);
const { connectionId } = job.data;

Expand All@@ -233,14 +242,24 @@ export class ConnectionManager implements IConnectionManager {
syncedAt: new Date()
}
})

captureEvent('backend_connection_sync_job_completed', {
connectionId: connectionId,
repoCount: result.repoCount,
});
}

private async onSyncJobFailed(job: Job | undefined, err: unknown) {
this.logger.info(`Connection sync job failed with error: ${err}`);
if (job) {
const { connectionId } = job.data;

captureEvent('backend_connection_sync_job_failed', {
connectionId: connectionId,
error: err instanceof BackendException ? err.code : 'UNKNOWN',
});

// We may have pushed some metadata during the execution of the job, so we make sure to not overwrite the metadata here
const { connectionId } = job.data;
let syncStatusMetadata: Record<string, unknown> = (await this.db.connection.findUnique({
where: { id: connectionId },
select: { syncStatusMetadata: true }
Expand Down
19 changes: 11 additions & 8 deletions packages/backend/src/posthogEvents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,17 +5,20 @@ export type PosthogEventMap = {
vcs: string;
codeHost?: string;
},
repo_synced: {
vcs: string;
codeHost?: string;
fetchDuration_s?: number;
cloneDuration_s?: number;
indexDuration_s?: number;
},
repo_deleted: {
vcs: string;
codeHost?: string;
}
},
//////////////////////////////////////////////////////////////////
backend_connection_sync_job_failed: {
connectionId: number,
error: string,
},
backend_connection_sync_job_completed: {
connectionId: number,
repoCount: number,
},
//////////////////////////////////////////////////////////////////
}

export type PosthogEvent = keyof PosthogEventMap;
9 changes: 1 addition & 8 deletions packages/backend/src/repoManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { cloneRepository, fetchRepository } from "./git.js";
import { existsSync, rmSync, readdirSync } from 'fs';
import { indexGitRepository } from "./zoekt.js";
import os from 'os';
import { BackendException } from "@sourcebot/error";

interface IRepoManager {
blockingPollLoop: () => void;
Expand DownExpand Up@@ -308,14 +309,6 @@ export class RepoManager implements IRepoManager {
indexDuration_s = stats!.indexDuration_s;
fetchDuration_s = stats!.fetchDuration_s;
cloneDuration_s = stats!.cloneDuration_s;

captureEvent('repo_synced', {
vcs: 'git',
codeHost: repo.external_codeHostType,
indexDuration_s,
fetchDuration_s,
cloneDuration_s,
});
}

private async onIndexJobCompleted(job: Job<JobPayload>) {
Expand Down
17 changes: 15 additions & 2 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

import Ajv from "ajv";
import { auth } from "./auth";
import { notAuthenticated, notFound, ServiceError, unexpectedError, orgInvalidSubscription } from "@/lib/serviceError";
import { notAuthenticated, notFound, ServiceError, unexpectedError, orgInvalidSubscription, secretAlreadyExists } from "@/lib/serviceError";
import { prisma } from "@/prisma";
import { StatusCodes } from "http-status-codes";
import { ErrorCode } from "@/lib/errorCodes";
Expand All@@ -14,7 +14,7 @@ import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { GithubConnectionConfig, GitlabConnectionConfig, GiteaConnectionConfig, GerritConnectionConfig, ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { encrypt } from "@sourcebot/crypto"
import { getConnection, getLinkedRepos } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole, Connection, Repo, Org, RepoIndexingStatus, StripeSubscriptionStatus } from "@sourcebot/db";
import { ConnectionSyncStatus, Prisma, OrgRole, Connection, Repo, Org, RepoIndexingStatus, StripeSubscriptionStatus } from "@sourcebot/db";
import { headers } from "next/headers"
import { getStripe } from "@/lib/stripe"
import { getUser } from "@/data/user";
Expand DownExpand Up@@ -184,6 +184,19 @@ export const createSecret = async (key: string, value: string, domain: string):
withOrgMembership(session, domain, async ({ orgId }) => {
try {
const encrypted = encrypt(value);
const existingSecret = await prisma.secret.findUnique({
where: {
orgId_key: {
orgId,
key,
}
}
});

if (existingSecret) {
return secretAlreadyExists();
}

await prisma.secret.create({
data: {
orgId,
Expand Down
13 changes: 10 additions & 3 deletions packages/web/src/app/[domain]/components/configEditor.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,9 @@ import { Button } from "@/components/ui/button";
import { Separator } from "@/components/ui/separator";
import { Schema } from "ajv";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";

import useCaptureEvent from "@/hooks/useCaptureEvent";
import { PosthogEvent, PosthogEventMap } from "@/lib/posthogEvents";
import { CodeHostType } from "@/lib/utils";
export type QuickActionFn<T> = (previous: T) => T;
export type QuickAction<T> = {
name: string;
Expand All@@ -29,6 +31,7 @@ export type QuickAction<T> = {

interface ConfigEditorProps<T> {
value: string;
type: CodeHostType;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
onChange: (...event: any[]) => void;
actions: QuickAction<T>[],
Expand DownExpand Up@@ -102,8 +105,8 @@ export const isConfigValidJson = (config: string) => {
}

const ConfigEditor = <T,>(props: ConfigEditorProps<T>, forwardedRef: Ref<ReactCodeMirrorRef>) => {
const { value, onChange, actions, schema } = props;

const { value, type, onChange, actions, schema } = props;
const captureEvent = useCaptureEvent();
const editorRef = useRef<ReactCodeMirrorRef>(null);
useImperativeHandle(
forwardedRef,
Expand DownExpand Up@@ -159,6 +162,10 @@ const ConfigEditor = <T,>(props: ConfigEditorProps<T>, forwardedRef: Ref<ReactCo
disabled={!isConfigValidJson(value)}
onClick={(e) => {
e.preventDefault();
captureEvent('wa_config_editor_quick_action_pressed', {
name,
type,
});
if (editorRef.current?.view) {
onQuickAction(fn, value, editorRef.current.view, {
focusEditor: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ import githubPatCreation from "@/public/github_pat_creation.png"
import { CodeHostType } from "@/lib/utils";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
import { isDefined } from '@/lib/utils'

import useCaptureEvent from "@/hooks/useCaptureEvent";
interface SecretComboBoxProps {
isDisabled: boolean;
codeHostType: CodeHostType;
Expand All@@ -47,6 +47,7 @@ export const SecretCombobox = ({
const [searchFilter, setSearchFilter] = useState("");
const domain = useDomain();
const [isCreateSecretDialogOpen, setIsCreateSecretDialogOpen] = useState(false);
const captureEvent = useCaptureEvent();

const { data: secrets, isLoading, refetch } = useQuery({
queryKey: ["secrets"],
Expand DownExpand Up@@ -154,7 +155,12 @@ export const SecretCombobox = ({
<Button
variant="ghost"
size="sm"
onClick={() => setIsCreateSecretDialogOpen(true)}
onClick={() => {
setIsCreateSecretDialogOpen(true);
captureEvent('wa_secret_combobox_import_secret_pressed', {
type: codeHostType,
});
}}
className={cn(
"w-full justify-start gap-1.5 p-2",
secrets && !isServiceError(secrets) && secrets.length > 0 && "my-2"
Expand DownExpand Up@@ -187,10 +193,17 @@ const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHostType
const [showValue, setShowValue] = useState(false);
const domain = useDomain();
const { toast } = useToast();
const captureEvent = useCaptureEvent();

const formSchema = z.object({
key: z.string().min(1).refine(async (key) => {
const doesSecretExist = await checkIfSecretExists(key, domain);
if(!isServiceError(doesSecretExist)) {
captureEvent('wa_secret_combobox_import_secret_fail', {
type: codeHostType,
error: "A secret with this key already exists.",
});
}
return isServiceError(doesSecretExist) || !doesSecretExist;
}, "A secret with this key already exists."),
value: z.string().min(1),
Expand All@@ -211,15 +224,22 @@ const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHostType
toast({
description: `❌ Failed to create secret`
});
captureEvent('wa_secret_combobox_import_secret_fail', {
type: codeHostType,
error: response.message,
});
} else {
toast({
description: `✅ Secret created successfully!`
});
captureEvent('wa_secret_combobox_import_secret_success', {
type: codeHostType,
});
form.reset();
onOpenChange(false);
onSecretCreated(data.key);
}
}, [domain, toast, onOpenChange, onSecretCreated, form]);
}, [domain, toast, onOpenChange, onSecretCreated, form, codeHostType, captureEvent]);

const codeHostSpecificStep = useMemo(() => {
switch (codeHostType) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ import { Loader2 } from "lucide-react";
import { ReactCodeMirrorRef } from "@uiw/react-codemirror";
import { SecretCombobox } from "./secretCombobox";
import strings from "@/lib/strings";
import useCaptureEvent from "@/hooks/useCaptureEvent";

interface SharedConnectionCreationFormProps<T> {
type: CodeHostType;
Expand DownExpand Up@@ -51,7 +52,7 @@ export default function SharedConnectionCreationForm<T>({
const { toast } = useToast();
const domain = useDomain();
const editorRef = useRef<ReactCodeMirrorRef>(null);

const captureEvent = useCaptureEvent();
const formSchema = useMemo(() => {
return z.object({
name: z.string().min(1),
Expand All@@ -64,7 +65,7 @@ export default function SharedConnectionCreationForm<T>({
return checkIfSecretExists(secretKey, domain);
}, { message: "Secret not found" }),
});
}, [schema]);
}, [schema, domain]);

const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
Expand All@@ -78,13 +79,20 @@ export default function SharedConnectionCreationForm<T>({
toast({
description: `❌ Failed to create connection. Reason: ${response.message}`
});
captureEvent('wa_create_connection_fail', {
type: type,
error: response.message,
});
} else {
toast({
description: `✅ Connection created successfully.`
});
captureEvent('wa_create_connection_success', {
type: type,
});
onCreated?.(response.id);
}
}, [domain, toast, type, onCreated]);
}, [domain, toast, type, onCreated, captureEvent]);

const onConfigChange = useCallback((value: string) => {
form.setValue("config", value);
Expand DownExpand Up@@ -168,6 +176,9 @@ export default function SharedConnectionCreationForm<T>({
}
}
},
captureEvent,
"set-secret",
type,
form.getValues("config"),
view,
{
Expand All@@ -193,6 +204,7 @@ export default function SharedConnectionCreationForm<T>({
<FormControl>
<ConfigEditor<T>
ref={editorRef}
type={type}
value={value}
onChange={onConfigChange}
actions={quickActions ?? []}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions packages/backend/src/connectionManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import os from 'os';
import { Redis } from 'ioredis';
import { RepoData, compileGithubConfig, compileGitlabConfig, compileGiteaConfig, compileGerritConfig } from "./repoCompileUtils.js";
import { BackendError, BackendException } from "@sourcebot/error";
import { captureEvent } from "./posthog.js";

interface IConnectionManager {
scheduleConnectionSync: (connection: Connection) => Promise<void>;
Expand All@@ -22,6 +23,10 @@ type JobPayload = {
config: ConnectionConfig,
};

type JobResult = {
repoCount: number
}

export class ConnectionManager implements IConnectionManager {
private worker: Worker;
private queue: Queue<JobPayload>;
Expand DownExpand Up@@ -217,10 +222,14 @@ export class ConnectionManager implements IConnectionManager {
const totalUpsertDuration = performance.now() - totalUpsertStart;
this.logger.info(`Upserted ${repoData.length} repos in ${totalUpsertDuration}ms`);
});

return {
repoCount: repoData.length,
};
}


private async onSyncJobCompleted(job: Job<JobPayload>) {
private async onSyncJobCompleted(job: Job<JobPayload>, result: JobResult) {
this.logger.info(`Connection sync job ${job.id} completed`);
const { connectionId } = job.data;

Expand All@@ -233,14 +242,24 @@ export class ConnectionManager implements IConnectionManager {
syncedAt: new Date()
}
})

captureEvent('backend_connection_sync_job_completed', {
connectionId: connectionId,
repoCount: result.repoCount,
});
}

private async onSyncJobFailed(job: Job | undefined, err: unknown) {
this.logger.info(`Connection sync job failed with error: ${err}`);
if (job) {
const { connectionId } = job.data;

captureEvent('backend_connection_sync_job_failed', {
connectionId: connectionId,
error: err instanceof BackendException ? err.code : 'UNKNOWN',
});

// We may have pushed some metadata during the execution of the job, so we make sure to not overwrite the metadata here
const { connectionId } = job.data;
let syncStatusMetadata: Record<string, unknown> = (await this.db.connection.findUnique({
where: { id: connectionId },
select: { syncStatusMetadata: true }
Expand Down
19 changes: 11 additions & 8 deletions packages/backend/src/posthogEvents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,17 +5,20 @@ export type PosthogEventMap = {
vcs: string;
codeHost?: string;
},
repo_synced: {
vcs: string;
codeHost?: string;
fetchDuration_s?: number;
cloneDuration_s?: number;
indexDuration_s?: number;
},
repo_deleted: {
vcs: string;
codeHost?: string;
}
},
//////////////////////////////////////////////////////////////////
backend_connection_sync_job_failed: {
connectionId: number,
error: string,
},
backend_connection_sync_job_completed: {
connectionId: number,
repoCount: number,
},
//////////////////////////////////////////////////////////////////
}

export type PosthogEvent = keyof PosthogEventMap;
9 changes: 1 addition & 8 deletions packages/backend/src/repoManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { cloneRepository, fetchRepository } from "./git.js";
import { existsSync, rmSync, readdirSync } from 'fs';
import { indexGitRepository } from "./zoekt.js";
import os from 'os';
import { BackendException } from "@sourcebot/error";

interface IRepoManager {
blockingPollLoop: () => void;
Expand DownExpand Up@@ -308,14 +309,6 @@ export class RepoManager implements IRepoManager {
indexDuration_s = stats!.indexDuration_s;
fetchDuration_s = stats!.fetchDuration_s;
cloneDuration_s = stats!.cloneDuration_s;

captureEvent('repo_synced', {
vcs: 'git',
codeHost: repo.external_codeHostType,
indexDuration_s,
fetchDuration_s,
cloneDuration_s,
});
}

private async onIndexJobCompleted(job: Job<JobPayload>) {
Expand Down
17 changes: 15 additions & 2 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

import Ajv from "ajv";
import { auth } from "./auth";
import { notAuthenticated, notFound, ServiceError, unexpectedError, orgInvalidSubscription } from "@/lib/serviceError";
import { notAuthenticated, notFound, ServiceError, unexpectedError, orgInvalidSubscription, secretAlreadyExists } from "@/lib/serviceError";
import { prisma } from "@/prisma";
import { StatusCodes } from "http-status-codes";
import { ErrorCode } from "@/lib/errorCodes";
Expand All@@ -14,7 +14,7 @@ import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { GithubConnectionConfig, GitlabConnectionConfig, GiteaConnectionConfig, GerritConnectionConfig, ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { encrypt } from "@sourcebot/crypto"
import { getConnection, getLinkedRepos } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole, Connection, Repo, Org, RepoIndexingStatus, StripeSubscriptionStatus } from "@sourcebot/db";
import { ConnectionSyncStatus, Prisma, OrgRole, Connection, Repo, Org, RepoIndexingStatus, StripeSubscriptionStatus } from "@sourcebot/db";
import { headers } from "next/headers"
import { getStripe } from "@/lib/stripe"
import { getUser } from "@/data/user";
Expand DownExpand Up@@ -184,6 +184,19 @@ export const createSecret = async (key: string, value: string, domain: string):
withOrgMembership(session, domain, async ({ orgId }) => {
try {
const encrypted = encrypt(value);
const existingSecret = await prisma.secret.findUnique({
where: {
orgId_key: {
orgId,
key,
}
}
});

if (existingSecret) {
return secretAlreadyExists();
}

await prisma.secret.create({
data: {
orgId,
Expand Down
13 changes: 10 additions & 3 deletions packages/web/src/app/[domain]/components/configEditor.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,9 @@ import { Button } from "@/components/ui/button";
import { Separator } from "@/components/ui/separator";
import { Schema } from "ajv";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";

import useCaptureEvent from "@/hooks/useCaptureEvent";
import { PosthogEvent, PosthogEventMap } from "@/lib/posthogEvents";
import { CodeHostType } from "@/lib/utils";
export type QuickActionFn<T> = (previous: T) => T;
export type QuickAction<T> = {
name: string;
Expand All@@ -29,6 +31,7 @@ export type QuickAction<T> = {

interface ConfigEditorProps<T> {
value: string;
type: CodeHostType;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
onChange: (...event: any[]) => void;
actions: QuickAction<T>[],
Expand DownExpand Up@@ -102,8 +105,8 @@ export const isConfigValidJson = (config: string) => {
}

const ConfigEditor = <T,>(props: ConfigEditorProps<T>, forwardedRef: Ref<ReactCodeMirrorRef>) => {
const { value, onChange, actions, schema } = props;

const { value, type, onChange, actions, schema } = props;
const captureEvent = useCaptureEvent();
const editorRef = useRef<ReactCodeMirrorRef>(null);
useImperativeHandle(
forwardedRef,
Expand DownExpand Up@@ -159,6 +162,10 @@ const ConfigEditor = <T,>(props: ConfigEditorProps<T>, forwardedRef: Ref<ReactCo
disabled={!isConfigValidJson(value)}
onClick={(e) => {
e.preventDefault();
captureEvent('wa_config_editor_quick_action_pressed', {
name,
type,
});
if (editorRef.current?.view) {
onQuickAction(fn, value, editorRef.current.view, {
focusEditor: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ import githubPatCreation from "@/public/github_pat_creation.png"
import { CodeHostType } from "@/lib/utils";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
import { isDefined } from '@/lib/utils'

import useCaptureEvent from "@/hooks/useCaptureEvent";
interface SecretComboBoxProps {
isDisabled: boolean;
codeHostType: CodeHostType;
Expand All@@ -47,6 +47,7 @@ export const SecretCombobox = ({
const [searchFilter, setSearchFilter] = useState("");
const domain = useDomain();
const [isCreateSecretDialogOpen, setIsCreateSecretDialogOpen] = useState(false);
const captureEvent = useCaptureEvent();

const { data: secrets, isLoading, refetch } = useQuery({
queryKey: ["secrets"],
Expand DownExpand Up@@ -154,7 +155,12 @@ export const SecretCombobox = ({
<Button
variant="ghost"
size="sm"
onClick={() => setIsCreateSecretDialogOpen(true)}
onClick={() => {
setIsCreateSecretDialogOpen(true);
captureEvent('wa_secret_combobox_import_secret_pressed', {
type: codeHostType,
});
}}
className={cn(
"w-full justify-start gap-1.5 p-2",
secrets && !isServiceError(secrets) && secrets.length > 0 && "my-2"
Expand DownExpand Up@@ -187,10 +193,17 @@ const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHostType
const [showValue, setShowValue] = useState(false);
const domain = useDomain();
const { toast } = useToast();
const captureEvent = useCaptureEvent();

const formSchema = z.object({
key: z.string().min(1).refine(async (key) => {
const doesSecretExist = await checkIfSecretExists(key, domain);
if(!isServiceError(doesSecretExist)) {
captureEvent('wa_secret_combobox_import_secret_fail', {
type: codeHostType,
error: "A secret with this key already exists.",
});
}
return isServiceError(doesSecretExist) || !doesSecretExist;
}, "A secret with this key already exists."),
value: z.string().min(1),
Expand All@@ -211,15 +224,22 @@ const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHostType
toast({
description: `❌ Failed to create secret`
});
captureEvent('wa_secret_combobox_import_secret_fail', {
type: codeHostType,
error: response.message,
});
} else {
toast({
description: `✅ Secret created successfully!`
});
captureEvent('wa_secret_combobox_import_secret_success', {
type: codeHostType,
});
form.reset();
onOpenChange(false);
onSecretCreated(data.key);
}
}, [domain, toast, onOpenChange, onSecretCreated, form]);
}, [domain, toast, onOpenChange, onSecretCreated, form, codeHostType, captureEvent]);

const codeHostSpecificStep = useMemo(() => {
switch (codeHostType) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ import { Loader2 } from "lucide-react";
import { ReactCodeMirrorRef } from "@uiw/react-codemirror";
import { SecretCombobox } from "./secretCombobox";
import strings from "@/lib/strings";
import useCaptureEvent from "@/hooks/useCaptureEvent";

interface SharedConnectionCreationFormProps<T> {
type: CodeHostType;
Expand DownExpand Up@@ -51,7 +52,7 @@ export default function SharedConnectionCreationForm<T>({
const { toast } = useToast();
const domain = useDomain();
const editorRef = useRef<ReactCodeMirrorRef>(null);

const captureEvent = useCaptureEvent();
const formSchema = useMemo(() => {
return z.object({
name: z.string().min(1),
Expand All@@ -64,7 +65,7 @@ export default function SharedConnectionCreationForm<T>({
return checkIfSecretExists(secretKey, domain);
}, { message: "Secret not found" }),
});
}, [schema]);
}, [schema, domain]);

const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
Expand All@@ -78,13 +79,20 @@ export default function SharedConnectionCreationForm<T>({
toast({
description: `❌ Failed to create connection. Reason: ${response.message}`
});
captureEvent('wa_create_connection_fail', {
type: type,
error: response.message,
});
} else {
toast({
description: `✅ Connection created successfully.`
});
captureEvent('wa_create_connection_success', {
type: type,
});
onCreated?.(response.id);
}
}, [domain, toast, type, onCreated]);
}, [domain, toast, type, onCreated, captureEvent]);

const onConfigChange = useCallback((value: string) => {
form.setValue("config", value);
Expand DownExpand Up@@ -168,6 +176,9 @@ export default function SharedConnectionCreationForm<T>({
}
}
},
captureEvent,
"set-secret",
type,
form.getValues("config"),
view,
{
Expand All@@ -193,6 +204,7 @@ export default function SharedConnectionCreationForm<T>({
<FormControl>
<ConfigEditor<T>
ref={editorRef}
type={type}
value={value}
onChange={onConfigChange}
actions={quickActions ?? []}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions packages/backend/src/connectionManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import os from 'os';
import { Redis } from 'ioredis';
import { RepoData, compileGithubConfig, compileGitlabConfig, compileGiteaConfig, compileGerritConfig } from "./repoCompileUtils.js";
import { BackendError, BackendException } from "@sourcebot/error";
import { captureEvent } from "./posthog.js";

interface IConnectionManager {
scheduleConnectionSync: (connection: Connection) => Promise<void>;
Expand All@@ -22,6 +23,10 @@ type JobPayload = {
config: ConnectionConfig,
};

type JobResult = {
repoCount: number
}

export class ConnectionManager implements IConnectionManager {
private worker: Worker;
private queue: Queue<JobPayload>;
Expand DownExpand Up@@ -217,10 +222,14 @@ export class ConnectionManager implements IConnectionManager {
const totalUpsertDuration = performance.now() - totalUpsertStart;
this.logger.info(`Upserted ${repoData.length} repos in ${totalUpsertDuration}ms`);
});

return {
repoCount: repoData.length,
};
}


private async onSyncJobCompleted(job: Job<JobPayload>) {
private async onSyncJobCompleted(job: Job<JobPayload>, result: JobResult) {
this.logger.info(`Connection sync job ${job.id} completed`);
const { connectionId } = job.data;

Expand All@@ -233,14 +242,24 @@ export class ConnectionManager implements IConnectionManager {
syncedAt: new Date()
}
})

captureEvent('backend_connection_sync_job_completed', {
connectionId: connectionId,
repoCount: result.repoCount,
});
}

private async onSyncJobFailed(job: Job | undefined, err: unknown) {
this.logger.info(`Connection sync job failed with error: ${err}`);
if (job) {
const { connectionId } = job.data;

captureEvent('backend_connection_sync_job_failed', {
connectionId: connectionId,
error: err instanceof BackendException ? err.code : 'UNKNOWN',
});

// We may have pushed some metadata during the execution of the job, so we make sure to not overwrite the metadata here
const { connectionId } = job.data;
let syncStatusMetadata: Record<string, unknown> = (await this.db.connection.findUnique({
where: { id: connectionId },
select: { syncStatusMetadata: true }
Expand Down
19 changes: 11 additions & 8 deletions packages/backend/src/posthogEvents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,17 +5,20 @@ export type PosthogEventMap = {
vcs: string;
codeHost?: string;
},
repo_synced: {
vcs: string;
codeHost?: string;
fetchDuration_s?: number;
cloneDuration_s?: number;
indexDuration_s?: number;
},
repo_deleted: {
vcs: string;
codeHost?: string;
}
},
//////////////////////////////////////////////////////////////////
backend_connection_sync_job_failed: {
connectionId: number,
error: string,
},
backend_connection_sync_job_completed: {
connectionId: number,
repoCount: number,
},
//////////////////////////////////////////////////////////////////
}

export type PosthogEvent = keyof PosthogEventMap;
9 changes: 1 addition & 8 deletions packages/backend/src/repoManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { cloneRepository, fetchRepository } from "./git.js";
import { existsSync, rmSync, readdirSync } from 'fs';
import { indexGitRepository } from "./zoekt.js";
import os from 'os';
import { BackendException } from "@sourcebot/error";

interface IRepoManager {
blockingPollLoop: () => void;
Expand DownExpand Up@@ -308,14 +309,6 @@ export class RepoManager implements IRepoManager {
indexDuration_s = stats!.indexDuration_s;
fetchDuration_s = stats!.fetchDuration_s;
cloneDuration_s = stats!.cloneDuration_s;

captureEvent('repo_synced', {
vcs: 'git',
codeHost: repo.external_codeHostType,
indexDuration_s,
fetchDuration_s,
cloneDuration_s,
});
}

private async onIndexJobCompleted(job: Job<JobPayload>) {
Expand Down
17 changes: 15 additions & 2 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

import Ajv from "ajv";
import { auth } from "./auth";
import { notAuthenticated, notFound, ServiceError, unexpectedError, orgInvalidSubscription } from "@/lib/serviceError";
import { notAuthenticated, notFound, ServiceError, unexpectedError, orgInvalidSubscription, secretAlreadyExists } from "@/lib/serviceError";
import { prisma } from "@/prisma";
import { StatusCodes } from "http-status-codes";
import { ErrorCode } from "@/lib/errorCodes";
Expand All@@ -14,7 +14,7 @@ import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { GithubConnectionConfig, GitlabConnectionConfig, GiteaConnectionConfig, GerritConnectionConfig, ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { encrypt } from "@sourcebot/crypto"
import { getConnection, getLinkedRepos } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole, Connection, Repo, Org, RepoIndexingStatus, StripeSubscriptionStatus } from "@sourcebot/db";
import { ConnectionSyncStatus, Prisma, OrgRole, Connection, Repo, Org, RepoIndexingStatus, StripeSubscriptionStatus } from "@sourcebot/db";
import { headers } from "next/headers"
import { getStripe } from "@/lib/stripe"
import { getUser } from "@/data/user";
Expand DownExpand Up@@ -184,6 +184,19 @@ export const createSecret = async (key: string, value: string, domain: string):
withOrgMembership(session, domain, async ({ orgId }) => {
try {
const encrypted = encrypt(value);
const existingSecret = await prisma.secret.findUnique({
where: {
orgId_key: {
orgId,
key,
}
}
});

if (existingSecret) {
return secretAlreadyExists();
}

await prisma.secret.create({
data: {
orgId,
Expand Down
13 changes: 10 additions & 3 deletions packages/web/src/app/[domain]/components/configEditor.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,9 @@ import { Button } from "@/components/ui/button";
import { Separator } from "@/components/ui/separator";
import { Schema } from "ajv";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";

import useCaptureEvent from "@/hooks/useCaptureEvent";
import { PosthogEvent, PosthogEventMap } from "@/lib/posthogEvents";
import { CodeHostType } from "@/lib/utils";
export type QuickActionFn<T> = (previous: T) => T;
export type QuickAction<T> = {
name: string;
Expand All@@ -29,6 +31,7 @@ export type QuickAction<T> = {

interface ConfigEditorProps<T> {
value: string;
type: CodeHostType;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
onChange: (...event: any[]) => void;
actions: QuickAction<T>[],
Expand DownExpand Up@@ -102,8 +105,8 @@ export const isConfigValidJson = (config: string) => {
}

const ConfigEditor = <T,>(props: ConfigEditorProps<T>, forwardedRef: Ref<ReactCodeMirrorRef>) => {
const { value, onChange, actions, schema } = props;

const { value, type, onChange, actions, schema } = props;
const captureEvent = useCaptureEvent();
const editorRef = useRef<ReactCodeMirrorRef>(null);
useImperativeHandle(
forwardedRef,
Expand DownExpand Up@@ -159,6 +162,10 @@ const ConfigEditor = <T,>(props: ConfigEditorProps<T>, forwardedRef: Ref<ReactCo
disabled={!isConfigValidJson(value)}
onClick={(e) => {
e.preventDefault();
captureEvent('wa_config_editor_quick_action_pressed', {
name,
type,
});
if (editorRef.current?.view) {
onQuickAction(fn, value, editorRef.current.view, {
focusEditor: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ import githubPatCreation from "@/public/github_pat_creation.png"
import { CodeHostType } from "@/lib/utils";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
import { isDefined } from '@/lib/utils'

import useCaptureEvent from "@/hooks/useCaptureEvent";
interface SecretComboBoxProps {
isDisabled: boolean;
codeHostType: CodeHostType;
Expand All@@ -47,6 +47,7 @@ export const SecretCombobox = ({
const [searchFilter, setSearchFilter] = useState("");
const domain = useDomain();
const [isCreateSecretDialogOpen, setIsCreateSecretDialogOpen] = useState(false);
const captureEvent = useCaptureEvent();

const { data: secrets, isLoading, refetch } = useQuery({
queryKey: ["secrets"],
Expand DownExpand Up@@ -154,7 +155,12 @@ export const SecretCombobox = ({
<Button
variant="ghost"
size="sm"
onClick={() => setIsCreateSecretDialogOpen(true)}
onClick={() => {
setIsCreateSecretDialogOpen(true);
captureEvent('wa_secret_combobox_import_secret_pressed', {
type: codeHostType,
});
}}
className={cn(
"w-full justify-start gap-1.5 p-2",
secrets && !isServiceError(secrets) && secrets.length > 0 && "my-2"
Expand DownExpand Up@@ -187,10 +193,17 @@ const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHostType
const [showValue, setShowValue] = useState(false);
const domain = useDomain();
const { toast } = useToast();
const captureEvent = useCaptureEvent();

const formSchema = z.object({
key: z.string().min(1).refine(async (key) => {
const doesSecretExist = await checkIfSecretExists(key, domain);
if(!isServiceError(doesSecretExist)) {
captureEvent('wa_secret_combobox_import_secret_fail', {
type: codeHostType,
error: "A secret with this key already exists.",
});
}
return isServiceError(doesSecretExist) || !doesSecretExist;
}, "A secret with this key already exists."),
value: z.string().min(1),
Expand All@@ -211,15 +224,22 @@ const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHostType
toast({
description: `❌ Failed to create secret`
});
captureEvent('wa_secret_combobox_import_secret_fail', {
type: codeHostType,
error: response.message,
});
} else {
toast({
description: `✅ Secret created successfully!`
});
captureEvent('wa_secret_combobox_import_secret_success', {
type: codeHostType,
});
form.reset();
onOpenChange(false);
onSecretCreated(data.key);
}
}, [domain, toast, onOpenChange, onSecretCreated, form]);
}, [domain, toast, onOpenChange, onSecretCreated, form, codeHostType, captureEvent]);

const codeHostSpecificStep = useMemo(() => {
switch (codeHostType) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ import { Loader2 } from "lucide-react";
import { ReactCodeMirrorRef } from "@uiw/react-codemirror";
import { SecretCombobox } from "./secretCombobox";
import strings from "@/lib/strings";
import useCaptureEvent from "@/hooks/useCaptureEvent";

interface SharedConnectionCreationFormProps<T> {
type: CodeHostType;
Expand DownExpand Up@@ -51,7 +52,7 @@ export default function SharedConnectionCreationForm<T>({
const { toast } = useToast();
const domain = useDomain();
const editorRef = useRef<ReactCodeMirrorRef>(null);

const captureEvent = useCaptureEvent();
const formSchema = useMemo(() => {
return z.object({
name: z.string().min(1),
Expand All@@ -64,7 +65,7 @@ export default function SharedConnectionCreationForm<T>({
return checkIfSecretExists(secretKey, domain);
}, { message: "Secret not found" }),
});
}, [schema]);
}, [schema, domain]);

const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
Expand All@@ -78,13 +79,20 @@ export default function SharedConnectionCreationForm<T>({
toast({
description: `❌ Failed to create connection. Reason: ${response.message}`
});
captureEvent('wa_create_connection_fail', {
type: type,
error: response.message,
});
} else {
toast({
description: `✅ Connection created successfully.`
});
captureEvent('wa_create_connection_success', {
type: type,
});
onCreated?.(response.id);
}
}, [domain, toast, type, onCreated]);
}, [domain, toast, type, onCreated, captureEvent]);

const onConfigChange = useCallback((value: string) => {
form.setValue("config", value);
Expand DownExpand Up@@ -168,6 +176,9 @@ export default function SharedConnectionCreationForm<T>({
}
}
},
captureEvent,
"set-secret",
type,
form.getValues("config"),
view,
{
Expand All@@ -193,6 +204,7 @@ export default function SharedConnectionCreationForm<T>({
<FormControl>
<ConfigEditor<T>
ref={editorRef}
type={type}
value={value}
onChange={onConfigChange}
actions={quickActions ?? []}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions packages/backend/src/connectionManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import os from 'os';
import { Redis } from 'ioredis';
import { RepoData, compileGithubConfig, compileGitlabConfig, compileGiteaConfig, compileGerritConfig } from "./repoCompileUtils.js";
import { BackendError, BackendException } from "@sourcebot/error";
import { captureEvent } from "./posthog.js";

interface IConnectionManager {
scheduleConnectionSync: (connection: Connection) => Promise<void>;
Expand All@@ -22,6 +23,10 @@ type JobPayload = {
config: ConnectionConfig,
};

type JobResult = {
repoCount: number
}

export class ConnectionManager implements IConnectionManager {
private worker: Worker;
private queue: Queue<JobPayload>;
Expand DownExpand Up@@ -217,10 +222,14 @@ export class ConnectionManager implements IConnectionManager {
const totalUpsertDuration = performance.now() - totalUpsertStart;
this.logger.info(`Upserted ${repoData.length} repos in ${totalUpsertDuration}ms`);
});

return {
repoCount: repoData.length,
};
}


private async onSyncJobCompleted(job: Job<JobPayload>) {
private async onSyncJobCompleted(job: Job<JobPayload>, result: JobResult) {
this.logger.info(`Connection sync job ${job.id} completed`);
const { connectionId } = job.data;

Expand All@@ -233,14 +242,24 @@ export class ConnectionManager implements IConnectionManager {
syncedAt: new Date()
}
})

captureEvent('backend_connection_sync_job_completed', {
connectionId: connectionId,
repoCount: result.repoCount,
});
}

private async onSyncJobFailed(job: Job | undefined, err: unknown) {
this.logger.info(`Connection sync job failed with error: ${err}`);
if (job) {
const { connectionId } = job.data;

captureEvent('backend_connection_sync_job_failed', {
connectionId: connectionId,
error: err instanceof BackendException ? err.code : 'UNKNOWN',
});

// We may have pushed some metadata during the execution of the job, so we make sure to not overwrite the metadata here
const { connectionId } = job.data;
let syncStatusMetadata: Record<string, unknown> = (await this.db.connection.findUnique({
where: { id: connectionId },
select: { syncStatusMetadata: true }
Expand Down
19 changes: 11 additions & 8 deletions packages/backend/src/posthogEvents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,17 +5,20 @@ export type PosthogEventMap = {
vcs: string;
codeHost?: string;
},
repo_synced: {
vcs: string;
codeHost?: string;
fetchDuration_s?: number;
cloneDuration_s?: number;
indexDuration_s?: number;
},
repo_deleted: {
vcs: string;
codeHost?: string;
}
},
//////////////////////////////////////////////////////////////////
backend_connection_sync_job_failed: {
connectionId: number,
error: string,
},
backend_connection_sync_job_completed: {
connectionId: number,
repoCount: number,
},
//////////////////////////////////////////////////////////////////
}

export type PosthogEvent = keyof PosthogEventMap;
9 changes: 1 addition & 8 deletions packages/backend/src/repoManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { cloneRepository, fetchRepository } from "./git.js";
import { existsSync, rmSync, readdirSync } from 'fs';
import { indexGitRepository } from "./zoekt.js";
import os from 'os';
import { BackendException } from "@sourcebot/error";

interface IRepoManager {
blockingPollLoop: () => void;
Expand DownExpand Up@@ -308,14 +309,6 @@ export class RepoManager implements IRepoManager {
indexDuration_s = stats!.indexDuration_s;
fetchDuration_s = stats!.fetchDuration_s;
cloneDuration_s = stats!.cloneDuration_s;

captureEvent('repo_synced', {
vcs: 'git',
codeHost: repo.external_codeHostType,
indexDuration_s,
fetchDuration_s,
cloneDuration_s,
});
}

private async onIndexJobCompleted(job: Job<JobPayload>) {
Expand Down
17 changes: 15 additions & 2 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

import Ajv from "ajv";
import { auth } from "./auth";
import { notAuthenticated, notFound, ServiceError, unexpectedError, orgInvalidSubscription } from "@/lib/serviceError";
import { notAuthenticated, notFound, ServiceError, unexpectedError, orgInvalidSubscription, secretAlreadyExists } from "@/lib/serviceError";
import { prisma } from "@/prisma";
import { StatusCodes } from "http-status-codes";
import { ErrorCode } from "@/lib/errorCodes";
Expand All@@ -14,7 +14,7 @@ import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { GithubConnectionConfig, GitlabConnectionConfig, GiteaConnectionConfig, GerritConnectionConfig, ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { encrypt } from "@sourcebot/crypto"
import { getConnection, getLinkedRepos } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole, Connection, Repo, Org, RepoIndexingStatus, StripeSubscriptionStatus } from "@sourcebot/db";
import { ConnectionSyncStatus, Prisma, OrgRole, Connection, Repo, Org, RepoIndexingStatus, StripeSubscriptionStatus } from "@sourcebot/db";
import { headers } from "next/headers"
import { getStripe } from "@/lib/stripe"
import { getUser } from "@/data/user";
Expand DownExpand Up@@ -184,6 +184,19 @@ export const createSecret = async (key: string, value: string, domain: string):
withOrgMembership(session, domain, async ({ orgId }) => {
try {
const encrypted = encrypt(value);
const existingSecret = await prisma.secret.findUnique({
where: {
orgId_key: {
orgId,
key,
}
}
});

if (existingSecret) {
return secretAlreadyExists();
}

await prisma.secret.create({
data: {
orgId,
Expand Down
13 changes: 10 additions & 3 deletions packages/web/src/app/[domain]/components/configEditor.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,9 @@ import { Button } from "@/components/ui/button";
import { Separator } from "@/components/ui/separator";
import { Schema } from "ajv";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";

import useCaptureEvent from "@/hooks/useCaptureEvent";
import { PosthogEvent, PosthogEventMap } from "@/lib/posthogEvents";
import { CodeHostType } from "@/lib/utils";
export type QuickActionFn<T> = (previous: T) => T;
export type QuickAction<T> = {
name: string;
Expand All@@ -29,6 +31,7 @@ export type QuickAction<T> = {

interface ConfigEditorProps<T> {
value: string;
type: CodeHostType;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
onChange: (...event: any[]) => void;
actions: QuickAction<T>[],
Expand DownExpand Up@@ -102,8 +105,8 @@ export const isConfigValidJson = (config: string) => {
}

const ConfigEditor = <T,>(props: ConfigEditorProps<T>, forwardedRef: Ref<ReactCodeMirrorRef>) => {
const { value, onChange, actions, schema } = props;

const { value, type, onChange, actions, schema } = props;
const captureEvent = useCaptureEvent();
const editorRef = useRef<ReactCodeMirrorRef>(null);
useImperativeHandle(
forwardedRef,
Expand DownExpand Up@@ -159,6 +162,10 @@ const ConfigEditor = <T,>(props: ConfigEditorProps<T>, forwardedRef: Ref<ReactCo
disabled={!isConfigValidJson(value)}
onClick={(e) => {
e.preventDefault();
captureEvent('wa_config_editor_quick_action_pressed', {
name,
type,
});
if (editorRef.current?.view) {
onQuickAction(fn, value, editorRef.current.view, {
focusEditor: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ import githubPatCreation from "@/public/github_pat_creation.png"
import { CodeHostType } from "@/lib/utils";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
import { isDefined } from '@/lib/utils'

import useCaptureEvent from "@/hooks/useCaptureEvent";
interface SecretComboBoxProps {
isDisabled: boolean;
codeHostType: CodeHostType;
Expand All@@ -47,6 +47,7 @@ export const SecretCombobox = ({
const [searchFilter, setSearchFilter] = useState("");
const domain = useDomain();
const [isCreateSecretDialogOpen, setIsCreateSecretDialogOpen] = useState(false);
const captureEvent = useCaptureEvent();

const { data: secrets, isLoading, refetch } = useQuery({
queryKey: ["secrets"],
Expand DownExpand Up@@ -154,7 +155,12 @@ export const SecretCombobox = ({
<Button
variant="ghost"
size="sm"
onClick={() => setIsCreateSecretDialogOpen(true)}
onClick={() => {
setIsCreateSecretDialogOpen(true);
captureEvent('wa_secret_combobox_import_secret_pressed', {
type: codeHostType,
});
}}
className={cn(
"w-full justify-start gap-1.5 p-2",
secrets && !isServiceError(secrets) && secrets.length > 0 && "my-2"
Expand DownExpand Up@@ -187,10 +193,17 @@ const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHostType
const [showValue, setShowValue] = useState(false);
const domain = useDomain();
const { toast } = useToast();
const captureEvent = useCaptureEvent();

const formSchema = z.object({
key: z.string().min(1).refine(async (key) => {
const doesSecretExist = await checkIfSecretExists(key, domain);
if(!isServiceError(doesSecretExist)) {
captureEvent('wa_secret_combobox_import_secret_fail', {
type: codeHostType,
error: "A secret with this key already exists.",
});
}
return isServiceError(doesSecretExist) || !doesSecretExist;
}, "A secret with this key already exists."),
value: z.string().min(1),
Expand All@@ -211,15 +224,22 @@ const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHostType
toast({
description: `❌ Failed to create secret`
});
captureEvent('wa_secret_combobox_import_secret_fail', {
type: codeHostType,
error: response.message,
});
} else {
toast({
description: `✅ Secret created successfully!`
});
captureEvent('wa_secret_combobox_import_secret_success', {
type: codeHostType,
});
form.reset();
onOpenChange(false);
onSecretCreated(data.key);
}
}, [domain, toast, onOpenChange, onSecretCreated, form]);
}, [domain, toast, onOpenChange, onSecretCreated, form, codeHostType, captureEvent]);

const codeHostSpecificStep = useMemo(() => {
switch (codeHostType) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ import { Loader2 } from "lucide-react";
import { ReactCodeMirrorRef } from "@uiw/react-codemirror";
import { SecretCombobox } from "./secretCombobox";
import strings from "@/lib/strings";
import useCaptureEvent from "@/hooks/useCaptureEvent";

interface SharedConnectionCreationFormProps<T> {
type: CodeHostType;
Expand DownExpand Up@@ -51,7 +52,7 @@ export default function SharedConnectionCreationForm<T>({
const { toast } = useToast();
const domain = useDomain();
const editorRef = useRef<ReactCodeMirrorRef>(null);

const captureEvent = useCaptureEvent();
const formSchema = useMemo(() => {
return z.object({
name: z.string().min(1),
Expand All@@ -64,7 +65,7 @@ export default function SharedConnectionCreationForm<T>({
return checkIfSecretExists(secretKey, domain);
}, { message: "Secret not found" }),
});
}, [schema]);
}, [schema, domain]);

const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
Expand All@@ -78,13 +79,20 @@ export default function SharedConnectionCreationForm<T>({
toast({
description: `❌ Failed to create connection. Reason: ${response.message}`
});
captureEvent('wa_create_connection_fail', {
type: type,
error: response.message,
});
} else {
toast({
description: `✅ Connection created successfully.`
});
captureEvent('wa_create_connection_success', {
type: type,
});
onCreated?.(response.id);
}
}, [domain, toast, type, onCreated]);
}, [domain, toast, type, onCreated, captureEvent]);

const onConfigChange = useCallback((value: string) => {
form.setValue("config", value);
Expand DownExpand Up@@ -168,6 +176,9 @@ export default function SharedConnectionCreationForm<T>({
}
}
},
captureEvent,
"set-secret",
type,
form.getValues("config"),
view,
{
Expand All@@ -193,6 +204,7 @@ export default function SharedConnectionCreationForm<T>({
<FormControl>
<ConfigEditor<T>
ref={editorRef}
type={type}
value={value}
onChange={onConfigChange}
actions={quickActions ?? []}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions packages/backend/src/connectionManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import os from 'os';
import { Redis } from 'ioredis';
import { RepoData, compileGithubConfig, compileGitlabConfig, compileGiteaConfig, compileGerritConfig } from "./repoCompileUtils.js";
import { BackendError, BackendException } from "@sourcebot/error";
import { captureEvent } from "./posthog.js";

interface IConnectionManager {
scheduleConnectionSync: (connection: Connection) => Promise<void>;
Expand All@@ -22,6 +23,10 @@ type JobPayload = {
config: ConnectionConfig,
};

type JobResult = {
repoCount: number
}

export class ConnectionManager implements IConnectionManager {
private worker: Worker;
private queue: Queue<JobPayload>;
Expand DownExpand Up@@ -217,10 +222,14 @@ export class ConnectionManager implements IConnectionManager {
const totalUpsertDuration = performance.now() - totalUpsertStart;
this.logger.info(`Upserted ${repoData.length} repos in ${totalUpsertDuration}ms`);
});

return {
repoCount: repoData.length,
};
}


private async onSyncJobCompleted(job: Job<JobPayload>) {
private async onSyncJobCompleted(job: Job<JobPayload>, result: JobResult) {
this.logger.info(`Connection sync job ${job.id} completed`);
const { connectionId } = job.data;

Expand All@@ -233,14 +242,24 @@ export class ConnectionManager implements IConnectionManager {
syncedAt: new Date()
}
})

captureEvent('backend_connection_sync_job_completed', {
connectionId: connectionId,
repoCount: result.repoCount,
});
}

private async onSyncJobFailed(job: Job | undefined, err: unknown) {
this.logger.info(`Connection sync job failed with error: ${err}`);
if (job) {
const { connectionId } = job.data;

captureEvent('backend_connection_sync_job_failed', {
connectionId: connectionId,
error: err instanceof BackendException ? err.code : 'UNKNOWN',
});

// We may have pushed some metadata during the execution of the job, so we make sure to not overwrite the metadata here
const { connectionId } = job.data;
let syncStatusMetadata: Record<string, unknown> = (await this.db.connection.findUnique({
where: { id: connectionId },
select: { syncStatusMetadata: true }
Expand Down
19 changes: 11 additions & 8 deletions packages/backend/src/posthogEvents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,17 +5,20 @@ export type PosthogEventMap = {
vcs: string;
codeHost?: string;
},
repo_synced: {
vcs: string;
codeHost?: string;
fetchDuration_s?: number;
cloneDuration_s?: number;
indexDuration_s?: number;
},
repo_deleted: {
vcs: string;
codeHost?: string;
}
},
//////////////////////////////////////////////////////////////////
backend_connection_sync_job_failed: {
connectionId: number,
error: string,
},
backend_connection_sync_job_completed: {
connectionId: number,
repoCount: number,
},
//////////////////////////////////////////////////////////////////
}

export type PosthogEvent = keyof PosthogEventMap;
9 changes: 1 addition & 8 deletions packages/backend/src/repoManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { cloneRepository, fetchRepository } from "./git.js";
import { existsSync, rmSync, readdirSync } from 'fs';
import { indexGitRepository } from "./zoekt.js";
import os from 'os';
import { BackendException } from "@sourcebot/error";

interface IRepoManager {
blockingPollLoop: () => void;
Expand DownExpand Up@@ -308,14 +309,6 @@ export class RepoManager implements IRepoManager {
indexDuration_s = stats!.indexDuration_s;
fetchDuration_s = stats!.fetchDuration_s;
cloneDuration_s = stats!.cloneDuration_s;

captureEvent('repo_synced', {
vcs: 'git',
codeHost: repo.external_codeHostType,
indexDuration_s,
fetchDuration_s,
cloneDuration_s,
});
}

private async onIndexJobCompleted(job: Job<JobPayload>) {
Expand Down
17 changes: 15 additions & 2 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

import Ajv from "ajv";
import { auth } from "./auth";
import { notAuthenticated, notFound, ServiceError, unexpectedError, orgInvalidSubscription } from "@/lib/serviceError";
import { notAuthenticated, notFound, ServiceError, unexpectedError, orgInvalidSubscription, secretAlreadyExists } from "@/lib/serviceError";
import { prisma } from "@/prisma";
import { StatusCodes } from "http-status-codes";
import { ErrorCode } from "@/lib/errorCodes";
Expand All@@ -14,7 +14,7 @@ import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { GithubConnectionConfig, GitlabConnectionConfig, GiteaConnectionConfig, GerritConnectionConfig, ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { encrypt } from "@sourcebot/crypto"
import { getConnection, getLinkedRepos } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole, Connection, Repo, Org, RepoIndexingStatus, StripeSubscriptionStatus } from "@sourcebot/db";
import { ConnectionSyncStatus, Prisma, OrgRole, Connection, Repo, Org, RepoIndexingStatus, StripeSubscriptionStatus } from "@sourcebot/db";
import { headers } from "next/headers"
import { getStripe } from "@/lib/stripe"
import { getUser } from "@/data/user";
Expand DownExpand Up@@ -184,6 +184,19 @@ export const createSecret = async (key: string, value: string, domain: string):
withOrgMembership(session, domain, async ({ orgId }) => {
try {
const encrypted = encrypt(value);
const existingSecret = await prisma.secret.findUnique({
where: {
orgId_key: {
orgId,
key,
}
}
});

if (existingSecret) {
return secretAlreadyExists();
}

await prisma.secret.create({
data: {
orgId,
Expand Down
13 changes: 10 additions & 3 deletions packages/web/src/app/[domain]/components/configEditor.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,9 @@ import { Button } from "@/components/ui/button";
import { Separator } from "@/components/ui/separator";
import { Schema } from "ajv";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";

import useCaptureEvent from "@/hooks/useCaptureEvent";
import { PosthogEvent, PosthogEventMap } from "@/lib/posthogEvents";
import { CodeHostType } from "@/lib/utils";
export type QuickActionFn<T> = (previous: T) => T;
export type QuickAction<T> = {
name: string;
Expand All@@ -29,6 +31,7 @@ export type QuickAction<T> = {

interface ConfigEditorProps<T> {
value: string;
type: CodeHostType;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
onChange: (...event: any[]) => void;
actions: QuickAction<T>[],
Expand DownExpand Up@@ -102,8 +105,8 @@ export const isConfigValidJson = (config: string) => {
}

const ConfigEditor = <T,>(props: ConfigEditorProps<T>, forwardedRef: Ref<ReactCodeMirrorRef>) => {
const { value, onChange, actions, schema } = props;

const { value, type, onChange, actions, schema } = props;
const captureEvent = useCaptureEvent();
const editorRef = useRef<ReactCodeMirrorRef>(null);
useImperativeHandle(
forwardedRef,
Expand DownExpand Up@@ -159,6 +162,10 @@ const ConfigEditor = <T,>(props: ConfigEditorProps<T>, forwardedRef: Ref<ReactCo
disabled={!isConfigValidJson(value)}
onClick={(e) => {
e.preventDefault();
captureEvent('wa_config_editor_quick_action_pressed', {
name,
type,
});
if (editorRef.current?.view) {
onQuickAction(fn, value, editorRef.current.view, {
focusEditor: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ import githubPatCreation from "@/public/github_pat_creation.png"
import { CodeHostType } from "@/lib/utils";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
import { isDefined } from '@/lib/utils'

import useCaptureEvent from "@/hooks/useCaptureEvent";
interface SecretComboBoxProps {
isDisabled: boolean;
codeHostType: CodeHostType;
Expand All@@ -47,6 +47,7 @@ export const SecretCombobox = ({
const [searchFilter, setSearchFilter] = useState("");
const domain = useDomain();
const [isCreateSecretDialogOpen, setIsCreateSecretDialogOpen] = useState(false);
const captureEvent = useCaptureEvent();

const { data: secrets, isLoading, refetch } = useQuery({
queryKey: ["secrets"],
Expand DownExpand Up@@ -154,7 +155,12 @@ export const SecretCombobox = ({
<Button
variant="ghost"
size="sm"
onClick={() => setIsCreateSecretDialogOpen(true)}
onClick={() => {
setIsCreateSecretDialogOpen(true);
captureEvent('wa_secret_combobox_import_secret_pressed', {
type: codeHostType,
});
}}
className={cn(
"w-full justify-start gap-1.5 p-2",
secrets && !isServiceError(secrets) && secrets.length > 0 && "my-2"
Expand DownExpand Up@@ -187,10 +193,17 @@ const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHostType
const [showValue, setShowValue] = useState(false);
const domain = useDomain();
const { toast } = useToast();
const captureEvent = useCaptureEvent();

const formSchema = z.object({
key: z.string().min(1).refine(async (key) => {
const doesSecretExist = await checkIfSecretExists(key, domain);
if(!isServiceError(doesSecretExist)) {
captureEvent('wa_secret_combobox_import_secret_fail', {
type: codeHostType,
error: "A secret with this key already exists.",
});
}
return isServiceError(doesSecretExist) || !doesSecretExist;
}, "A secret with this key already exists."),
value: z.string().min(1),
Expand All@@ -211,15 +224,22 @@ const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHostType
toast({
description: `❌ Failed to create secret`
});
captureEvent('wa_secret_combobox_import_secret_fail', {
type: codeHostType,
error: response.message,
});
} else {
toast({
description: `✅ Secret created successfully!`
});
captureEvent('wa_secret_combobox_import_secret_success', {
type: codeHostType,
});
form.reset();
onOpenChange(false);
onSecretCreated(data.key);
}
}, [domain, toast, onOpenChange, onSecretCreated, form]);
}, [domain, toast, onOpenChange, onSecretCreated, form, codeHostType, captureEvent]);

const codeHostSpecificStep = useMemo(() => {
switch (codeHostType) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ import { Loader2 } from "lucide-react";
import { ReactCodeMirrorRef } from "@uiw/react-codemirror";
import { SecretCombobox } from "./secretCombobox";
import strings from "@/lib/strings";
import useCaptureEvent from "@/hooks/useCaptureEvent";

interface SharedConnectionCreationFormProps<T> {
type: CodeHostType;
Expand DownExpand Up@@ -51,7 +52,7 @@ export default function SharedConnectionCreationForm<T>({
const { toast } = useToast();
const domain = useDomain();
const editorRef = useRef<ReactCodeMirrorRef>(null);

const captureEvent = useCaptureEvent();
const formSchema = useMemo(() => {
return z.object({
name: z.string().min(1),
Expand All@@ -64,7 +65,7 @@ export default function SharedConnectionCreationForm<T>({
return checkIfSecretExists(secretKey, domain);
}, { message: "Secret not found" }),
});
}, [schema]);
}, [schema, domain]);

const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
Expand All@@ -78,13 +79,20 @@ export default function SharedConnectionCreationForm<T>({
toast({
description: `❌ Failed to create connection. Reason: ${response.message}`
});
captureEvent('wa_create_connection_fail', {
type: type,
error: response.message,
});
} else {
toast({
description: `✅ Connection created successfully.`
});
captureEvent('wa_create_connection_success', {
type: type,
});
onCreated?.(response.id);
}
}, [domain, toast, type, onCreated]);
}, [domain, toast, type, onCreated, captureEvent]);

const onConfigChange = useCallback((value: string) => {
form.setValue("config", value);
Expand DownExpand Up@@ -168,6 +176,9 @@ export default function SharedConnectionCreationForm<T>({
}
}
},
captureEvent,
"set-secret",
type,
form.getValues("config"),
view,
{
Expand All@@ -193,6 +204,7 @@ export default function SharedConnectionCreationForm<T>({
<FormControl>
<ConfigEditor<T>
ref={editorRef}
type={type}
value={value}
onChange={onConfigChange}
actions={quickActions ?? []}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions packages/backend/src/connectionManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import os from 'os';
import { Redis } from 'ioredis';
import { RepoData, compileGithubConfig, compileGitlabConfig, compileGiteaConfig, compileGerritConfig } from "./repoCompileUtils.js";
import { BackendError, BackendException } from "@sourcebot/error";
import { captureEvent } from "./posthog.js";

interface IConnectionManager {
scheduleConnectionSync: (connection: Connection) => Promise<void>;
Expand All@@ -22,6 +23,10 @@ type JobPayload = {
config: ConnectionConfig,
};

type JobResult = {
repoCount: number
}

export class ConnectionManager implements IConnectionManager {
private worker: Worker;
private queue: Queue<JobPayload>;
Expand DownExpand Up@@ -217,10 +222,14 @@ export class ConnectionManager implements IConnectionManager {
const totalUpsertDuration = performance.now() - totalUpsertStart;
this.logger.info(`Upserted ${repoData.length} repos in ${totalUpsertDuration}ms`);
});

return {
repoCount: repoData.length,
};
}


private async onSyncJobCompleted(job: Job<JobPayload>) {
private async onSyncJobCompleted(job: Job<JobPayload>, result: JobResult) {
this.logger.info(`Connection sync job ${job.id} completed`);
const { connectionId } = job.data;

Expand All@@ -233,14 +242,24 @@ export class ConnectionManager implements IConnectionManager {
syncedAt: new Date()
}
})

captureEvent('backend_connection_sync_job_completed', {
connectionId: connectionId,
repoCount: result.repoCount,
});
}

private async onSyncJobFailed(job: Job | undefined, err: unknown) {
this.logger.info(`Connection sync job failed with error: ${err}`);
if (job) {
const { connectionId } = job.data;

captureEvent('backend_connection_sync_job_failed', {
connectionId: connectionId,
error: err instanceof BackendException ? err.code : 'UNKNOWN',
});

// We may have pushed some metadata during the execution of the job, so we make sure to not overwrite the metadata here
const { connectionId } = job.data;
let syncStatusMetadata: Record<string, unknown> = (await this.db.connection.findUnique({
where: { id: connectionId },
select: { syncStatusMetadata: true }
Expand Down
19 changes: 11 additions & 8 deletions packages/backend/src/posthogEvents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,17 +5,20 @@ export type PosthogEventMap = {
vcs: string;
codeHost?: string;
},
repo_synced: {
vcs: string;
codeHost?: string;
fetchDuration_s?: number;
cloneDuration_s?: number;
indexDuration_s?: number;
},
repo_deleted: {
vcs: string;
codeHost?: string;
}
},
//////////////////////////////////////////////////////////////////
backend_connection_sync_job_failed: {
connectionId: number,
error: string,
},
backend_connection_sync_job_completed: {
connectionId: number,
repoCount: number,
},
//////////////////////////////////////////////////////////////////
}

export type PosthogEvent = keyof PosthogEventMap;
9 changes: 1 addition & 8 deletions packages/backend/src/repoManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { cloneRepository, fetchRepository } from "./git.js";
import { existsSync, rmSync, readdirSync } from 'fs';
import { indexGitRepository } from "./zoekt.js";
import os from 'os';
import { BackendException } from "@sourcebot/error";

interface IRepoManager {
blockingPollLoop: () => void;
Expand DownExpand Up@@ -308,14 +309,6 @@ export class RepoManager implements IRepoManager {
indexDuration_s = stats!.indexDuration_s;
fetchDuration_s = stats!.fetchDuration_s;
cloneDuration_s = stats!.cloneDuration_s;

captureEvent('repo_synced', {
vcs: 'git',
codeHost: repo.external_codeHostType,
indexDuration_s,
fetchDuration_s,
cloneDuration_s,
});
}

private async onIndexJobCompleted(job: Job<JobPayload>) {
Expand Down
17 changes: 15 additions & 2 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

import Ajv from "ajv";
import { auth } from "./auth";
import { notAuthenticated, notFound, ServiceError, unexpectedError, orgInvalidSubscription } from "@/lib/serviceError";
import { notAuthenticated, notFound, ServiceError, unexpectedError, orgInvalidSubscription, secretAlreadyExists } from "@/lib/serviceError";
import { prisma } from "@/prisma";
import { StatusCodes } from "http-status-codes";
import { ErrorCode } from "@/lib/errorCodes";
Expand All@@ -14,7 +14,7 @@ import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { GithubConnectionConfig, GitlabConnectionConfig, GiteaConnectionConfig, GerritConnectionConfig, ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { encrypt } from "@sourcebot/crypto"
import { getConnection, getLinkedRepos } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole, Connection, Repo, Org, RepoIndexingStatus, StripeSubscriptionStatus } from "@sourcebot/db";
import { ConnectionSyncStatus, Prisma, OrgRole, Connection, Repo, Org, RepoIndexingStatus, StripeSubscriptionStatus } from "@sourcebot/db";
import { headers } from "next/headers"
import { getStripe } from "@/lib/stripe"
import { getUser } from "@/data/user";
Expand DownExpand Up@@ -184,6 +184,19 @@ export const createSecret = async (key: string, value: string, domain: string):
withOrgMembership(session, domain, async ({ orgId }) => {
try {
const encrypted = encrypt(value);
const existingSecret = await prisma.secret.findUnique({
where: {
orgId_key: {
orgId,
key,
}
}
});

if (existingSecret) {
return secretAlreadyExists();
}

await prisma.secret.create({
data: {
orgId,
Expand Down
13 changes: 10 additions & 3 deletions packages/web/src/app/[domain]/components/configEditor.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,9 @@ import { Button } from "@/components/ui/button";
import { Separator } from "@/components/ui/separator";
import { Schema } from "ajv";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";

import useCaptureEvent from "@/hooks/useCaptureEvent";
import { PosthogEvent, PosthogEventMap } from "@/lib/posthogEvents";
import { CodeHostType } from "@/lib/utils";
export type QuickActionFn<T> = (previous: T) => T;
export type QuickAction<T> = {
name: string;
Expand All@@ -29,6 +31,7 @@ export type QuickAction<T> = {

interface ConfigEditorProps<T> {
value: string;
type: CodeHostType;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
onChange: (...event: any[]) => void;
actions: QuickAction<T>[],
Expand DownExpand Up@@ -102,8 +105,8 @@ export const isConfigValidJson = (config: string) => {
}

const ConfigEditor = <T,>(props: ConfigEditorProps<T>, forwardedRef: Ref<ReactCodeMirrorRef>) => {
const { value, onChange, actions, schema } = props;

const { value, type, onChange, actions, schema } = props;
const captureEvent = useCaptureEvent();
const editorRef = useRef<ReactCodeMirrorRef>(null);
useImperativeHandle(
forwardedRef,
Expand DownExpand Up@@ -159,6 +162,10 @@ const ConfigEditor = <T,>(props: ConfigEditorProps<T>, forwardedRef: Ref<ReactCo
disabled={!isConfigValidJson(value)}
onClick={(e) => {
e.preventDefault();
captureEvent('wa_config_editor_quick_action_pressed', {
name,
type,
});
if (editorRef.current?.view) {
onQuickAction(fn, value, editorRef.current.view, {
focusEditor: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ import githubPatCreation from "@/public/github_pat_creation.png"
import { CodeHostType } from "@/lib/utils";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
import { isDefined } from '@/lib/utils'

import useCaptureEvent from "@/hooks/useCaptureEvent";
interface SecretComboBoxProps {
isDisabled: boolean;
codeHostType: CodeHostType;
Expand All@@ -47,6 +47,7 @@ export const SecretCombobox = ({
const [searchFilter, setSearchFilter] = useState("");
const domain = useDomain();
const [isCreateSecretDialogOpen, setIsCreateSecretDialogOpen] = useState(false);
const captureEvent = useCaptureEvent();

const { data: secrets, isLoading, refetch } = useQuery({
queryKey: ["secrets"],
Expand DownExpand Up@@ -154,7 +155,12 @@ export const SecretCombobox = ({
<Button
variant="ghost"
size="sm"
onClick={() => setIsCreateSecretDialogOpen(true)}
onClick={() => {
setIsCreateSecretDialogOpen(true);
captureEvent('wa_secret_combobox_import_secret_pressed', {
type: codeHostType,
});
}}
className={cn(
"w-full justify-start gap-1.5 p-2",
secrets && !isServiceError(secrets) && secrets.length > 0 && "my-2"
Expand DownExpand Up@@ -187,10 +193,17 @@ const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHostType
const [showValue, setShowValue] = useState(false);
const domain = useDomain();
const { toast } = useToast();
const captureEvent = useCaptureEvent();

const formSchema = z.object({
key: z.string().min(1).refine(async (key) => {
const doesSecretExist = await checkIfSecretExists(key, domain);
if(!isServiceError(doesSecretExist)) {
captureEvent('wa_secret_combobox_import_secret_fail', {
type: codeHostType,
error: "A secret with this key already exists.",
});
}
return isServiceError(doesSecretExist) || !doesSecretExist;
}, "A secret with this key already exists."),
value: z.string().min(1),
Expand All@@ -211,15 +224,22 @@ const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHostType
toast({
description: `❌ Failed to create secret`
});
captureEvent('wa_secret_combobox_import_secret_fail', {
type: codeHostType,
error: response.message,
});
} else {
toast({
description: `✅ Secret created successfully!`
});
captureEvent('wa_secret_combobox_import_secret_success', {
type: codeHostType,
});
form.reset();
onOpenChange(false);
onSecretCreated(data.key);
}
}, [domain, toast, onOpenChange, onSecretCreated, form]);
}, [domain, toast, onOpenChange, onSecretCreated, form, codeHostType, captureEvent]);

const codeHostSpecificStep = useMemo(() => {
switch (codeHostType) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ import { Loader2 } from "lucide-react";
import { ReactCodeMirrorRef } from "@uiw/react-codemirror";
import { SecretCombobox } from "./secretCombobox";
import strings from "@/lib/strings";
import useCaptureEvent from "@/hooks/useCaptureEvent";

interface SharedConnectionCreationFormProps<T> {
type: CodeHostType;
Expand DownExpand Up@@ -51,7 +52,7 @@ export default function SharedConnectionCreationForm<T>({
const { toast } = useToast();
const domain = useDomain();
const editorRef = useRef<ReactCodeMirrorRef>(null);

const captureEvent = useCaptureEvent();
const formSchema = useMemo(() => {
return z.object({
name: z.string().min(1),
Expand All@@ -64,7 +65,7 @@ export default function SharedConnectionCreationForm<T>({
return checkIfSecretExists(secretKey, domain);
}, { message: "Secret not found" }),
});
}, [schema]);
}, [schema, domain]);

const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
Expand All@@ -78,13 +79,20 @@ export default function SharedConnectionCreationForm<T>({
toast({
description: `❌ Failed to create connection. Reason: ${response.message}`
});
captureEvent('wa_create_connection_fail', {
type: type,
error: response.message,
});
} else {
toast({
description: `✅ Connection created successfully.`
});
captureEvent('wa_create_connection_success', {
type: type,
});
onCreated?.(response.id);
}
}, [domain, toast, type, onCreated]);
}, [domain, toast, type, onCreated, captureEvent]);

const onConfigChange = useCallback((value: string) => {
form.setValue("config", value);
Expand DownExpand Up@@ -168,6 +176,9 @@ export default function SharedConnectionCreationForm<T>({
}
}
},
captureEvent,
"set-secret",
type,
form.getValues("config"),
view,
{
Expand All@@ -193,6 +204,7 @@ export default function SharedConnectionCreationForm<T>({
<FormControl>
<ConfigEditor<T>
ref={editorRef}
type={type}
value={value}
onChange={onConfigChange}
actions={quickActions ?? []}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions packages/backend/src/connectionManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import os from 'os';
import { Redis } from 'ioredis';
import { RepoData, compileGithubConfig, compileGitlabConfig, compileGiteaConfig, compileGerritConfig } from "./repoCompileUtils.js";
import { BackendError, BackendException } from "@sourcebot/error";
import { captureEvent } from "./posthog.js";

interface IConnectionManager {
scheduleConnectionSync: (connection: Connection) => Promise<void>;
Expand All@@ -22,6 +23,10 @@ type JobPayload = {
config: ConnectionConfig,
};

type JobResult = {
repoCount: number
}

export class ConnectionManager implements IConnectionManager {
private worker: Worker;
private queue: Queue<JobPayload>;
Expand DownExpand Up@@ -217,10 +222,14 @@ export class ConnectionManager implements IConnectionManager {
const totalUpsertDuration = performance.now() - totalUpsertStart;
this.logger.info(`Upserted ${repoData.length} repos in ${totalUpsertDuration}ms`);
});

return {
repoCount: repoData.length,
};
}


private async onSyncJobCompleted(job: Job<JobPayload>) {
private async onSyncJobCompleted(job: Job<JobPayload>, result: JobResult) {
this.logger.info(`Connection sync job ${job.id} completed`);
const { connectionId } = job.data;

Expand All@@ -233,14 +242,24 @@ export class ConnectionManager implements IConnectionManager {
syncedAt: new Date()
}
})

captureEvent('backend_connection_sync_job_completed', {
connectionId: connectionId,
repoCount: result.repoCount,
});
}

private async onSyncJobFailed(job: Job | undefined, err: unknown) {
this.logger.info(`Connection sync job failed with error: ${err}`);
if (job) {
const { connectionId } = job.data;

captureEvent('backend_connection_sync_job_failed', {
connectionId: connectionId,
error: err instanceof BackendException ? err.code : 'UNKNOWN',
});

// We may have pushed some metadata during the execution of the job, so we make sure to not overwrite the metadata here
const { connectionId } = job.data;
let syncStatusMetadata: Record<string, unknown> = (await this.db.connection.findUnique({
where: { id: connectionId },
select: { syncStatusMetadata: true }
Expand Down
19 changes: 11 additions & 8 deletions packages/backend/src/posthogEvents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,17 +5,20 @@ export type PosthogEventMap = {
vcs: string;
codeHost?: string;
},
repo_synced: {
vcs: string;
codeHost?: string;
fetchDuration_s?: number;
cloneDuration_s?: number;
indexDuration_s?: number;
},
repo_deleted: {
vcs: string;
codeHost?: string;
}
},
//////////////////////////////////////////////////////////////////
backend_connection_sync_job_failed: {
connectionId: number,
error: string,
},
backend_connection_sync_job_completed: {
connectionId: number,
repoCount: number,
},
//////////////////////////////////////////////////////////////////
}

export type PosthogEvent = keyof PosthogEventMap;
9 changes: 1 addition & 8 deletions packages/backend/src/repoManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { cloneRepository, fetchRepository } from "./git.js";
import { existsSync, rmSync, readdirSync } from 'fs';
import { indexGitRepository } from "./zoekt.js";
import os from 'os';
import { BackendException } from "@sourcebot/error";

interface IRepoManager {
blockingPollLoop: () => void;
Expand DownExpand Up@@ -308,14 +309,6 @@ export class RepoManager implements IRepoManager {
indexDuration_s = stats!.indexDuration_s;
fetchDuration_s = stats!.fetchDuration_s;
cloneDuration_s = stats!.cloneDuration_s;

captureEvent('repo_synced', {
vcs: 'git',
codeHost: repo.external_codeHostType,
indexDuration_s,
fetchDuration_s,
cloneDuration_s,
});
}

private async onIndexJobCompleted(job: Job<JobPayload>) {
Expand Down
17 changes: 15 additions & 2 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

import Ajv from "ajv";
import { auth } from "./auth";
import { notAuthenticated, notFound, ServiceError, unexpectedError, orgInvalidSubscription } from "@/lib/serviceError";
import { notAuthenticated, notFound, ServiceError, unexpectedError, orgInvalidSubscription, secretAlreadyExists } from "@/lib/serviceError";
import { prisma } from "@/prisma";
import { StatusCodes } from "http-status-codes";
import { ErrorCode } from "@/lib/errorCodes";
Expand All@@ -14,7 +14,7 @@ import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { GithubConnectionConfig, GitlabConnectionConfig, GiteaConnectionConfig, GerritConnectionConfig, ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { encrypt } from "@sourcebot/crypto"
import { getConnection, getLinkedRepos } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole, Connection, Repo, Org, RepoIndexingStatus, StripeSubscriptionStatus } from "@sourcebot/db";
import { ConnectionSyncStatus, Prisma, OrgRole, Connection, Repo, Org, RepoIndexingStatus, StripeSubscriptionStatus } from "@sourcebot/db";
import { headers } from "next/headers"
import { getStripe } from "@/lib/stripe"
import { getUser } from "@/data/user";
Expand DownExpand Up@@ -184,6 +184,19 @@ export const createSecret = async (key: string, value: string, domain: string):
withOrgMembership(session, domain, async ({ orgId }) => {
try {
const encrypted = encrypt(value);
const existingSecret = await prisma.secret.findUnique({
where: {
orgId_key: {
orgId,
key,
}
}
});

if (existingSecret) {
return secretAlreadyExists();
}

await prisma.secret.create({
data: {
orgId,
Expand Down
13 changes: 10 additions & 3 deletions packages/web/src/app/[domain]/components/configEditor.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,9 @@ import { Button } from "@/components/ui/button";
import { Separator } from "@/components/ui/separator";
import { Schema } from "ajv";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";

import useCaptureEvent from "@/hooks/useCaptureEvent";
import { PosthogEvent, PosthogEventMap } from "@/lib/posthogEvents";
import { CodeHostType } from "@/lib/utils";
export type QuickActionFn<T> = (previous: T) => T;
export type QuickAction<T> = {
name: string;
Expand All@@ -29,6 +31,7 @@ export type QuickAction<T> = {

interface ConfigEditorProps<T> {
value: string;
type: CodeHostType;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
onChange: (...event: any[]) => void;
actions: QuickAction<T>[],
Expand DownExpand Up@@ -102,8 +105,8 @@ export const isConfigValidJson = (config: string) => {
}

const ConfigEditor = <T,>(props: ConfigEditorProps<T>, forwardedRef: Ref<ReactCodeMirrorRef>) => {
const { value, onChange, actions, schema } = props;

const { value, type, onChange, actions, schema } = props;
const captureEvent = useCaptureEvent();
const editorRef = useRef<ReactCodeMirrorRef>(null);
useImperativeHandle(
forwardedRef,
Expand DownExpand Up@@ -159,6 +162,10 @@ const ConfigEditor = <T,>(props: ConfigEditorProps<T>, forwardedRef: Ref<ReactCo
disabled={!isConfigValidJson(value)}
onClick={(e) => {
e.preventDefault();
captureEvent('wa_config_editor_quick_action_pressed', {
name,
type,
});
if (editorRef.current?.view) {
onQuickAction(fn, value, editorRef.current.view, {
focusEditor: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ import githubPatCreation from "@/public/github_pat_creation.png"
import { CodeHostType } from "@/lib/utils";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
import { isDefined } from '@/lib/utils'

import useCaptureEvent from "@/hooks/useCaptureEvent";
interface SecretComboBoxProps {
isDisabled: boolean;
codeHostType: CodeHostType;
Expand All@@ -47,6 +47,7 @@ export const SecretCombobox = ({
const [searchFilter, setSearchFilter] = useState("");
const domain = useDomain();
const [isCreateSecretDialogOpen, setIsCreateSecretDialogOpen] = useState(false);
const captureEvent = useCaptureEvent();

const { data: secrets, isLoading, refetch } = useQuery({
queryKey: ["secrets"],
Expand DownExpand Up@@ -154,7 +155,12 @@ export const SecretCombobox = ({
<Button
variant="ghost"
size="sm"
onClick={() => setIsCreateSecretDialogOpen(true)}
onClick={() => {
setIsCreateSecretDialogOpen(true);
captureEvent('wa_secret_combobox_import_secret_pressed', {
type: codeHostType,
});
}}
className={cn(
"w-full justify-start gap-1.5 p-2",
secrets && !isServiceError(secrets) && secrets.length > 0 && "my-2"
Expand DownExpand Up@@ -187,10 +193,17 @@ const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHostType
const [showValue, setShowValue] = useState(false);
const domain = useDomain();
const { toast } = useToast();
const captureEvent = useCaptureEvent();

const formSchema = z.object({
key: z.string().min(1).refine(async (key) => {
const doesSecretExist = await checkIfSecretExists(key, domain);
if(!isServiceError(doesSecretExist)) {
captureEvent('wa_secret_combobox_import_secret_fail', {
type: codeHostType,
error: "A secret with this key already exists.",
});
}
return isServiceError(doesSecretExist) || !doesSecretExist;
}, "A secret with this key already exists."),
value: z.string().min(1),
Expand All@@ -211,15 +224,22 @@ const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHostType
toast({
description: `❌ Failed to create secret`
});
captureEvent('wa_secret_combobox_import_secret_fail', {
type: codeHostType,
error: response.message,
});
} else {
toast({
description: `✅ Secret created successfully!`
});
captureEvent('wa_secret_combobox_import_secret_success', {
type: codeHostType,
});
form.reset();
onOpenChange(false);
onSecretCreated(data.key);
}
}, [domain, toast, onOpenChange, onSecretCreated, form]);
}, [domain, toast, onOpenChange, onSecretCreated, form, codeHostType, captureEvent]);

const codeHostSpecificStep = useMemo(() => {
switch (codeHostType) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ import { Loader2 } from "lucide-react";
import { ReactCodeMirrorRef } from "@uiw/react-codemirror";
import { SecretCombobox } from "./secretCombobox";
import strings from "@/lib/strings";
import useCaptureEvent from "@/hooks/useCaptureEvent";

interface SharedConnectionCreationFormProps<T> {
type: CodeHostType;
Expand DownExpand Up@@ -51,7 +52,7 @@ export default function SharedConnectionCreationForm<T>({
const { toast } = useToast();
const domain = useDomain();
const editorRef = useRef<ReactCodeMirrorRef>(null);

const captureEvent = useCaptureEvent();
const formSchema = useMemo(() => {
return z.object({
name: z.string().min(1),
Expand All@@ -64,7 +65,7 @@ export default function SharedConnectionCreationForm<T>({
return checkIfSecretExists(secretKey, domain);
}, { message: "Secret not found" }),
});
}, [schema]);
}, [schema, domain]);

const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
Expand All@@ -78,13 +79,20 @@ export default function SharedConnectionCreationForm<T>({
toast({
description: `❌ Failed to create connection. Reason: ${response.message}`
});
captureEvent('wa_create_connection_fail', {
type: type,
error: response.message,
});
} else {
toast({
description: `✅ Connection created successfully.`
});
captureEvent('wa_create_connection_success', {
type: type,
});
onCreated?.(response.id);
}
}, [domain, toast, type, onCreated]);
}, [domain, toast, type, onCreated, captureEvent]);

const onConfigChange = useCallback((value: string) => {
form.setValue("config", value);
Expand DownExpand Up@@ -168,6 +176,9 @@ export default function SharedConnectionCreationForm<T>({
}
}
},
captureEvent,
"set-secret",
type,
form.getValues("config"),
view,
{
Expand All@@ -193,6 +204,7 @@ export default function SharedConnectionCreationForm<T>({
<FormControl>
<ConfigEditor<T>
ref={editorRef}
type={type}
value={value}
onChange={onConfigChange}
actions={quickActions ?? []}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions packages/backend/src/connectionManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import os from 'os';
import { Redis } from 'ioredis';
import { RepoData, compileGithubConfig, compileGitlabConfig, compileGiteaConfig, compileGerritConfig } from "./repoCompileUtils.js";
import { BackendError, BackendException } from "@sourcebot/error";
import { captureEvent } from "./posthog.js";

interface IConnectionManager {
scheduleConnectionSync: (connection: Connection) => Promise<void>;
Expand All@@ -22,6 +23,10 @@ type JobPayload = {
config: ConnectionConfig,
};

type JobResult = {
repoCount: number
}

export class ConnectionManager implements IConnectionManager {
private worker: Worker;
private queue: Queue<JobPayload>;
Expand DownExpand Up@@ -217,10 +222,14 @@ export class ConnectionManager implements IConnectionManager {
const totalUpsertDuration = performance.now() - totalUpsertStart;
this.logger.info(`Upserted ${repoData.length} repos in ${totalUpsertDuration}ms`);
});

return {
repoCount: repoData.length,
};
}


private async onSyncJobCompleted(job: Job<JobPayload>) {
private async onSyncJobCompleted(job: Job<JobPayload>, result: JobResult) {
this.logger.info(`Connection sync job ${job.id} completed`);
const { connectionId } = job.data;

Expand All@@ -233,14 +242,24 @@ export class ConnectionManager implements IConnectionManager {
syncedAt: new Date()
}
})

captureEvent('backend_connection_sync_job_completed', {
connectionId: connectionId,
repoCount: result.repoCount,
});
}

private async onSyncJobFailed(job: Job | undefined, err: unknown) {
this.logger.info(`Connection sync job failed with error: ${err}`);
if (job) {
const { connectionId } = job.data;

captureEvent('backend_connection_sync_job_failed', {
connectionId: connectionId,
error: err instanceof BackendException ? err.code : 'UNKNOWN',
});

// We may have pushed some metadata during the execution of the job, so we make sure to not overwrite the metadata here
const { connectionId } = job.data;
let syncStatusMetadata: Record<string, unknown> = (await this.db.connection.findUnique({
where: { id: connectionId },
select: { syncStatusMetadata: true }
Expand Down
19 changes: 11 additions & 8 deletions packages/backend/src/posthogEvents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,17 +5,20 @@ export type PosthogEventMap = {
vcs: string;
codeHost?: string;
},
repo_synced: {
vcs: string;
codeHost?: string;
fetchDuration_s?: number;
cloneDuration_s?: number;
indexDuration_s?: number;
},
repo_deleted: {
vcs: string;
codeHost?: string;
}
},
//////////////////////////////////////////////////////////////////
backend_connection_sync_job_failed: {
connectionId: number,
error: string,
},
backend_connection_sync_job_completed: {
connectionId: number,
repoCount: number,
},
//////////////////////////////////////////////////////////////////
}

export type PosthogEvent = keyof PosthogEventMap;
9 changes: 1 addition & 8 deletions packages/backend/src/repoManager.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { cloneRepository, fetchRepository } from "./git.js";
import { existsSync, rmSync, readdirSync } from 'fs';
import { indexGitRepository } from "./zoekt.js";
import os from 'os';
import { BackendException } from "@sourcebot/error";

interface IRepoManager {
blockingPollLoop: () => void;
Expand DownExpand Up@@ -308,14 +309,6 @@ export class RepoManager implements IRepoManager {
indexDuration_s = stats!.indexDuration_s;
fetchDuration_s = stats!.fetchDuration_s;
cloneDuration_s = stats!.cloneDuration_s;

captureEvent('repo_synced', {
vcs: 'git',
codeHost: repo.external_codeHostType,
indexDuration_s,
fetchDuration_s,
cloneDuration_s,
});
}

private async onIndexJobCompleted(job: Job<JobPayload>) {
Expand Down
17 changes: 15 additions & 2 deletions packages/web/src/actions.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,7 @@

import Ajv from "ajv";
import { auth } from "./auth";
import { notAuthenticated, notFound, ServiceError, unexpectedError, orgInvalidSubscription } from "@/lib/serviceError";
import { notAuthenticated, notFound, ServiceError, unexpectedError, orgInvalidSubscription, secretAlreadyExists } from "@/lib/serviceError";
import { prisma } from "@/prisma";
import { StatusCodes } from "http-status-codes";
import { ErrorCode } from "@/lib/errorCodes";
Expand All@@ -14,7 +14,7 @@ import { gerritSchema } from "@sourcebot/schemas/v3/gerrit.schema";
import { GithubConnectionConfig, GitlabConnectionConfig, GiteaConnectionConfig, GerritConnectionConfig, ConnectionConfig } from "@sourcebot/schemas/v3/connection.type";
import { encrypt } from "@sourcebot/crypto"
import { getConnection, getLinkedRepos } from "./data/connection";
import { ConnectionSyncStatus, Prisma, Invite, OrgRole, Connection, Repo, Org, RepoIndexingStatus, StripeSubscriptionStatus } from "@sourcebot/db";
import { ConnectionSyncStatus, Prisma, OrgRole, Connection, Repo, Org, RepoIndexingStatus, StripeSubscriptionStatus } from "@sourcebot/db";
import { headers } from "next/headers"
import { getStripe } from "@/lib/stripe"
import { getUser } from "@/data/user";
Expand DownExpand Up@@ -184,6 +184,19 @@ export const createSecret = async (key: string, value: string, domain: string):
withOrgMembership(session, domain, async ({ orgId }) => {
try {
const encrypted = encrypt(value);
const existingSecret = await prisma.secret.findUnique({
where: {
orgId_key: {
orgId,
key,
}
}
});

if (existingSecret) {
return secretAlreadyExists();
}

await prisma.secret.create({
data: {
orgId,
Expand Down
13 changes: 10 additions & 3 deletions packages/web/src/app/[domain]/components/configEditor.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,7 +19,9 @@ import { Button } from "@/components/ui/button";
import { Separator } from "@/components/ui/separator";
import { Schema } from "ajv";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";

import useCaptureEvent from "@/hooks/useCaptureEvent";
import { PosthogEvent, PosthogEventMap } from "@/lib/posthogEvents";
import { CodeHostType } from "@/lib/utils";
export type QuickActionFn<T> = (previous: T) => T;
export type QuickAction<T> = {
name: string;
Expand All@@ -29,6 +31,7 @@ export type QuickAction<T> = {

interface ConfigEditorProps<T> {
value: string;
type: CodeHostType;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
onChange: (...event: any[]) => void;
actions: QuickAction<T>[],
Expand DownExpand Up@@ -102,8 +105,8 @@ export const isConfigValidJson = (config: string) => {
}

const ConfigEditor = <T,>(props: ConfigEditorProps<T>, forwardedRef: Ref<ReactCodeMirrorRef>) => {
const { value, onChange, actions, schema } = props;

const { value, type, onChange, actions, schema } = props;
const captureEvent = useCaptureEvent();
const editorRef = useRef<ReactCodeMirrorRef>(null);
useImperativeHandle(
forwardedRef,
Expand DownExpand Up@@ -159,6 +162,10 @@ const ConfigEditor = <T,>(props: ConfigEditorProps<T>, forwardedRef: Ref<ReactCo
disabled={!isConfigValidJson(value)}
onClick={(e) => {
e.preventDefault();
captureEvent('wa_config_editor_quick_action_pressed', {
name,
type,
});
if (editorRef.current?.view) {
onQuickAction(fn, value, editorRef.current.view, {
focusEditor: true,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,7 @@ import githubPatCreation from "@/public/github_pat_creation.png"
import { CodeHostType } from "@/lib/utils";
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
import { isDefined } from '@/lib/utils'

import useCaptureEvent from "@/hooks/useCaptureEvent";
interface SecretComboBoxProps {
isDisabled: boolean;
codeHostType: CodeHostType;
Expand All@@ -47,6 +47,7 @@ export const SecretCombobox = ({
const [searchFilter, setSearchFilter] = useState("");
const domain = useDomain();
const [isCreateSecretDialogOpen, setIsCreateSecretDialogOpen] = useState(false);
const captureEvent = useCaptureEvent();

const { data: secrets, isLoading, refetch } = useQuery({
queryKey: ["secrets"],
Expand DownExpand Up@@ -154,7 +155,12 @@ export const SecretCombobox = ({
<Button
variant="ghost"
size="sm"
onClick={() => setIsCreateSecretDialogOpen(true)}
onClick={() => {
setIsCreateSecretDialogOpen(true);
captureEvent('wa_secret_combobox_import_secret_pressed', {
type: codeHostType,
});
}}
className={cn(
"w-full justify-start gap-1.5 p-2",
secrets && !isServiceError(secrets) && secrets.length > 0 && "my-2"
Expand DownExpand Up@@ -187,10 +193,17 @@ const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHostType
const [showValue, setShowValue] = useState(false);
const domain = useDomain();
const { toast } = useToast();
const captureEvent = useCaptureEvent();

const formSchema = z.object({
key: z.string().min(1).refine(async (key) => {
const doesSecretExist = await checkIfSecretExists(key, domain);
if(!isServiceError(doesSecretExist)) {
captureEvent('wa_secret_combobox_import_secret_fail', {
type: codeHostType,
error: "A secret with this key already exists.",
});
}
return isServiceError(doesSecretExist) || !doesSecretExist;
}, "A secret with this key already exists."),
value: z.string().min(1),
Expand All@@ -211,15 +224,22 @@ const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHostType
toast({
description: `❌ Failed to create secret`
});
captureEvent('wa_secret_combobox_import_secret_fail', {
type: codeHostType,
error: response.message,
});
} else {
toast({
description: `✅ Secret created successfully!`
});
captureEvent('wa_secret_combobox_import_secret_success', {
type: codeHostType,
});
form.reset();
onOpenChange(false);
onSecretCreated(data.key);
}
}, [domain, toast, onOpenChange, onSecretCreated, form]);
}, [domain, toast, onOpenChange, onSecretCreated, form, codeHostType, captureEvent]);

const codeHostSpecificStep = useMemo(() => {
switch (codeHostType) {
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ import { Loader2 } from "lucide-react";
import { ReactCodeMirrorRef } from "@uiw/react-codemirror";
import { SecretCombobox } from "./secretCombobox";
import strings from "@/lib/strings";
import useCaptureEvent from "@/hooks/useCaptureEvent";

interface SharedConnectionCreationFormProps<T> {
type: CodeHostType;
Expand DownExpand Up@@ -51,7 +52,7 @@ export default function SharedConnectionCreationForm<T>({
const { toast } = useToast();
const domain = useDomain();
const editorRef = useRef<ReactCodeMirrorRef>(null);

const captureEvent = useCaptureEvent();
const formSchema = useMemo(() => {
return z.object({
name: z.string().min(1),
Expand All@@ -64,7 +65,7 @@ export default function SharedConnectionCreationForm<T>({
return checkIfSecretExists(secretKey, domain);
}, { message: "Secret not found" }),
});
}, [schema]);
}, [schema, domain]);

const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
Expand All@@ -78,13 +79,20 @@ export default function SharedConnectionCreationForm<T>({
toast({
description: `❌ Failed to create connection. Reason: ${response.message}`
});
captureEvent('wa_create_connection_fail', {
type: type,
error: response.message,
});
} else {
toast({
description: `✅ Connection created successfully.`
});
captureEvent('wa_create_connection_success', {
type: type,
});
onCreated?.(response.id);
}
}, [domain, toast, type, onCreated]);
}, [domain, toast, type, onCreated, captureEvent]);

const onConfigChange = useCallback((value: string) => {
form.setValue("config", value);
Expand DownExpand Up@@ -168,6 +176,9 @@ export default function SharedConnectionCreationForm<T>({
}
}
},
captureEvent,
"set-secret",
type,
form.getValues("config"),
view,
{
Expand All@@ -193,6 +204,7 @@ export default function SharedConnectionCreationForm<T>({
<FormControl>
<ConfigEditor<T>
ref={editorRef}
type={type}
value={value}
onChange={onConfigChange}
actions={quickActions ?? []}
Expand Down
Loading