Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

refactor: Generalize trpc client (#3010)

Ivan Starkov895779297344
diff --git a/apps/builder/app/builder/features/project-settings/section-marketplace.tsx b/apps/builder/app/builder/features/project-settings/section-marketplace.tsx
index 62773c3a28..1c74c31c6f 100644
--- a/apps/builder/app/builder/features/project-settings/section-marketplace.tsx
+++ b/apps/builder/app/builder/features/project-settings/section-marketplace.tsx
@@ -17,12 +17,7 @@ import {
rawTheme,
} from "@webstudio-is/design-system";
import { ImageControl } from "./image-control";
-import {
- $assets,
- $authToken,
- $marketplaceProduct,
- $project,
-} from "~/shared/nano-states";
+import { $assets, $marketplaceProduct, $project } from "~/shared/nano-states";
import env from "~/shared/env";
import { Image, createImageLoader } from "@webstudio-is/image";
import { useIds } from "~/shared/form-utils";
@@ -32,12 +27,8 @@ import {
marketplaceCategories,
} from "@webstudio-is/project-build";
import { serverSyncStore } from "~/shared/sync";
-import { createTrpcRemixProxy } from "~/shared/remix/trpc-remix-proxy";
-import {
- MarketplaceApprovalStatus,
- type ProjectRouter,
-} from "@webstudio-is/project";
-import { projectsPath } from "~/shared/router-utils";
+import { MarketplaceApprovalStatus } from "@webstudio-is/project";
+import { trpcClient } from "~/shared/trpc/trpc-client";
const thumbnailStyle = css({
borderRadius: theme.borderRadius[4],
@@ -61,10 +52,6 @@ const defaultMarketplaceProduct: Partial<MarketplaceProduct> = {
category: "sectionTemplates",
};
-const trpc = createTrpcRemixProxy<ProjectRouter>((method) =>
- projectsPath(method, { authToken: $authToken.get() })
-);
-
const validate = (data: MarketplaceProduct) => {
const parsedResult = MarketplaceProduct.safeParse(data);
if (parsedResult.success === false) {
@@ -73,7 +60,8 @@ const validate = (data: MarketplaceProduct) => {
};
const useMarketplaceApprovalStatus = () => {
- const { send, data, state } = trpc.setMarketplaceApprovalStatus.useMutation();
+ const { send, data, state } =
+ trpcClient.project.setMarketplaceApprovalStatus.useMutation();
const project = useStore($project);
const status =
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/marketplace.tsx b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/marketplace.tsx
index 1e59858217..8cdcf5f25f 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/marketplace.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/marketplace.tsx
@@ -4,17 +4,13 @@ import type { TabContentProps } from "../../types";
import { Header, CloseButton, Root } from "../../shared/panel";
import { Overview } from "./overview";
import { Templates } from "./templates";
-import { marketplacePath } from "~/shared/router-utils";
import { useEffect, useState } from "react";
import { toWebstudioData } from "./utils";
import type { MarketplaceOverviewItem } from "~/shared/marketplace/types";
-import type { MarketplaceRouter } from "~/shared/marketplace/router";
-import { createTrpcFetchProxy } from "~/shared/remix/trpc-remix-proxy";
import type { Project } from "@webstudio-is/project";
import { ExtendedPanel } from "../../shared/extended-panel";
import { About } from "./about";
-
-const trpc = createTrpcFetchProxy<MarketplaceRouter>(marketplacePath);
+import { trpcClient } from "~/shared/trpc/trpc-client";
export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
const [activeOverviewItem, setAciveOverviewItem] =
@@ -25,9 +21,10 @@ export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
load: getItems,
data: items,
state: itemsLoadingState,
- } = trpc.getItems.useQuery();
+ } = trpcClient.marketplace.getItems.useQuery();
- const { load: getBuildData, data: buildData } = trpc.getBuildData.useQuery();
+ const { load: getBuildData, data: buildData } =
+ trpcClient.marketplace.getBuildData.useQuery();
useEffect(() => {
getItems();
diff --git a/apps/builder/app/builder/features/topbar/add-domain.tsx b/apps/builder/app/builder/features/topbar/add-domain.tsx
index 44fcc63c9c..c512e7eda6 100644
--- a/apps/builder/app/builder/features/topbar/add-domain.tsx
+++ b/apps/builder/app/builder/features/topbar/add-domain.tsx
@@ -8,15 +8,11 @@ import {
Text,
Grid,
} from "@webstudio-is/design-system";
-import type { DomainRouter } from "@webstudio-is/domain/index.server";
import { validateDomain } from "@webstudio-is/domain";
import type { Project } from "@webstudio-is/project";
import { useId, useState } from "react";
-import { createTrpcFetchProxy } from "~/shared/remix/trpc-remix-proxy";
-import { builderDomainsPath } from "~/shared/router-utils";
import { CustomCodeIcon } from "@webstudio-is/icons";
-
-const trpc = createTrpcFetchProxy<DomainRouter>(builderDomainsPath);
+import { trpcClient } from "~/shared/trpc/trpc-client";
type DomainsAddProps = {
projectId: Project["id"];
@@ -43,7 +39,7 @@ export const AddDomain = ({
send: create,
state: сreateState,
error: сreateSystemError,
- } = trpc.create.useMutation();
+ } = trpcClient.domain.create.useMutation();
const [isOpen, setIsOpen] = useState(false);
const [domain, setDomain] = useState("");
const [error, setError] = useState<string>();
diff --git a/apps/builder/app/builder/features/topbar/domains.tsx b/apps/builder/app/builder/features/topbar/domains.tsx
index c19836e1c4..c21dbe11a3 100644
--- a/apps/builder/app/builder/features/topbar/domains.tsx
+++ b/apps/builder/app/builder/features/topbar/domains.tsx
@@ -11,10 +11,7 @@ import {
NestedInputButton,
Separator,
} from "@webstudio-is/design-system";
-import type { DomainRouter } from "@webstudio-is/domain/index.server";
import type { Project } from "@webstudio-is/project";
-import { createTrpcFetchProxy } from "~/shared/remix/trpc-remix-proxy";
-import { builderDomainsPath } from "~/shared/router-utils";
import {
AlertIcon,
CheckCircleIcon,
@@ -29,8 +26,7 @@ import type { PublishStatus } from "@webstudio-is/prisma-client";
// eslint-disable-next-line import/no-internal-modules
import formatDistance from "date-fns/formatDistance";
import { Entri } from "./entri";
-
-const trpc = createTrpcFetchProxy<DomainRouter>(builderDomainsPath);
+import { trpcClient } from "~/shared/trpc/trpc-client";
export type Domain = {
projectId: Project["id"];
@@ -212,21 +208,21 @@ const DomainItem = (props: {
state: verifyState,
data: verifyData,
error: verifySystemError,
- } = trpc.verify.useMutation();
+ } = trpcClient.domain.verify.useMutation();
const {
send: remove,
state: removeState,
data: removeData,
error: removeSystemError,
- } = trpc.remove.useMutation();
+ } = trpcClient.domain.remove.useMutation();
const {
send: updateStatus,
state: updateStatusState,
data: updateStatusData,
error: updateStatusError,
- } = trpc.updateStatus.useMutation();
+ } = trpcClient.domain.updateStatus.useMutation();
const [isStatusLoading, setIsStatusLoading] = useState(true);
diff --git a/apps/builder/app/builder/features/topbar/publish.tsx b/apps/builder/app/builder/features/topbar/publish.tsx
index bef9b7a0e2..dd84ee098c 100644
--- a/apps/builder/app/builder/features/topbar/publish.tsx
+++ b/apps/builder/app/builder/features/topbar/publish.tsx
@@ -48,13 +48,9 @@ import {
AlertIcon,
CopyIcon,
} from "@webstudio-is/icons";
-import { createTrpcFetchProxy } from "~/shared/remix/trpc-remix-proxy";
-import { builderDomainsPath } from "~/shared/router-utils";
-import type { DomainRouter } from "@webstudio-is/domain/index.server";
import { AddDomain } from "./add-domain";
import { humanizeString } from "~/shared/string-utils";
-
-const trpc = createTrpcFetchProxy<DomainRouter>(builderDomainsPath);
+import { trpcClient } from "~/shared/trpc/trpc-client";
type ProjectData =
| {
@@ -90,7 +86,7 @@ const ChangeProjectDomain = ({
send: updateProjectDomain,
state: updateProjectDomainState,
error: updateProjectSystemError,
- } = trpc.updateProjectDomain.useMutation();
+ } = trpcClient.domain.updateProjectDomain.useMutation();
const [domain, setDomain] = useState(project.domain);
const [error, setError] = useState<string>();
@@ -254,7 +250,7 @@ const Publish = ({
state: publishState,
data: publishData,
error: publishSystemError,
- } = trpc.publish.useMutation();
+ } = trpcClient.domain.publish.useMutation();
useEffect(() => {
if (isPublishing) {
@@ -352,7 +348,7 @@ const ErrorText = ({ children }: { children: string }) => (
);
const useCanAddDomain = () => {
- const { load, data } = trpc.countTotalDomains.useQuery();
+ const { load, data } = trpcClient.domain.countTotalDomains.useQuery();
const { maxDomainsAllowedPerUser, hasProPlan } = useStore($userPlanFeatures);
useEffect(() => {
load();
@@ -374,14 +370,14 @@ const Content = (props: {
load: domainRefresh,
state: domainState,
error: domainSystemError,
- } = trpc.findMany.useQuery();
+ } = trpcClient.domain.findMany.useQuery();
const {
load: projectLoad,
data: projectData,
state: projectState,
error: projectSystemError,
- } = trpc.project.useQuery();
+ } = trpcClient.domain.project.useQuery();
useEffect(() => {
projectLoad({ projectId: props.projectId });
diff --git a/apps/builder/app/dashboard/projects/project-dialogs.tsx b/apps/builder/app/dashboard/projects/project-dialogs.tsx
index 627c6547a1..82d116b4ed 100644
--- a/apps/builder/app/dashboard/projects/project-dialogs.tsx
+++ b/apps/builder/app/dashboard/projects/project-dialogs.tsx
@@ -1,6 +1,5 @@
import { useEffect, useState } from "react";
import { useNavigate } from "@remix-run/react";
-import type { DashboardProjectRouter } from "@webstudio-is/dashboard";
import {
Box,
Button,
@@ -20,9 +19,10 @@ import {
import { PlusIcon } from "@webstudio-is/icons";
import type { DashboardProject } from "@webstudio-is/prisma-client";
import { Title } from "@webstudio-is/project";
-import { dashboardProjectsPath, builderPath } from "~/shared/router-utils";
-import { createTrpcRemixProxy } from "~/shared/remix/trpc-remix-proxy";
+import { builderPath } from "~/shared/router-utils";
import { ShareProjectContainer } from "~/shared/share-project";
+import { trpcClient } from "~/shared/trpc/trpc-client";
+import { useRevalidator } from "@remix-run/react";
type DialogProps = {
title: string;
@@ -118,14 +118,11 @@ const DialogContent = ({
);
};
-const trpc = createTrpcRemixProxy<DashboardProjectRouter>(
- dashboardProjectsPath
-);
-
const useCreateProject = () => {
const navigate = useNavigate();
- const { send, state } = trpc.create.useMutation();
+ const { send, state } = trpcClient.dashboardProject.create.useMutation();
const [errors, setErrors] = useState<string>();
+ const revalidator = useRevalidator();
const handleSubmit = ({ title }: { title: string }) => {
const parsed = Title.safeParse(title);
@@ -136,6 +133,7 @@ const useCreateProject = () => {
setErrors(errors);
if (parsed.success) {
send({ title }, (data) => {
+ revalidator.revalidate();
if (data?.id) {
navigate(builderPath({ projectId: data.id }));
}
@@ -193,8 +191,9 @@ const useRenameProject = ({
projectId: DashboardProject["id"];
onOpenChange: (isOpen: boolean) => void;
}) => {
- const { send, state } = trpc.rename.useMutation();
+ const { send, state } = trpcClient.dashboardProject.rename.useMutation();
const [errors, setErrors] = useState<string>();
+ const revalidator = useRevalidator();
const handleSubmit = ({ title }: { title: string }) => {
const parsed = Title.safeParse(title);
@@ -204,7 +203,9 @@ const useRenameProject = ({
: undefined;
setErrors(errors);
if (parsed.success) {
- send({ projectId, title });
+ send({ projectId, title }, () => {
+ revalidator.revalidate();
+ });
onOpenChange(false);
}
};
@@ -262,9 +263,11 @@ const useDeleteProject = ({
onOpenChange: (isOpen: boolean) => void;
onHiddenChange: (isHidden: boolean) => void;
}) => {
- const { send, data, state } = trpc.delete.useMutation();
+ const { send, data, state } =
+ trpcClient.dashboardProject.delete.useMutation();
const [isMatch, setIsMatch] = useState(false);
const errors = data && "errors" in data ? data.errors : undefined;
+ const revalidator = useRevalidator();
useEffect(() => {
if (errors) {
@@ -274,7 +277,9 @@ const useDeleteProject = ({
}, [errors, onOpenChange, onHiddenChange]);
const handleSubmit = () => {
- send({ projectId });
+ send({ projectId }, () => {
+ revalidator.revalidate();
+ });
onHiddenChange(true);
onOpenChange(false);
};
@@ -354,9 +359,13 @@ export const DeleteProjectDialog = ({
};
export const useCloneProject = (projectId: DashboardProject["id"]) => {
- const { send } = trpc.clone.useMutation();
+ const { send } = trpcClient.dashboardProject.clone.useMutation();
+ const revalidator = useRevalidator();
+
return () => {
- send({ projectId });
+ send({ projectId }, () => {
+ revalidator.revalidate();
+ });
};
};
diff --git a/apps/builder/app/routes/builder.domains.$method.ts b/apps/builder/app/routes/builder.domains.$method.ts
deleted file mode 100644
index 5948300a75..0000000000
--- a/apps/builder/app/routes/builder.domains.$method.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { ActionArgs } from "@remix-run/node";
-import { domainRouter } from "@webstudio-is/domain/index.server";
-import { createContext } from "~/shared/context.server";
-import { handleTrpcRemixAction } from "~/shared/remix/trpc-remix-request.server";
-
-export const action = async ({ request, params }: ActionArgs) => {
- const context = await createContext(request);
-
- return await handleTrpcRemixAction({
- request,
- params,
- router: domainRouter,
- context,
- });
-};
-
-export const loader = action;
diff --git a/apps/builder/app/routes/builder.marketplace.$method.tsx b/apps/builder/app/routes/builder.marketplace.$method.tsx
deleted file mode 100644
index 9f1e65bb34..0000000000
--- a/apps/builder/app/routes/builder.marketplace.$method.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { ActionArgs } from "@remix-run/node";
-import { findAuthenticatedUser } from "~/services/auth.server";
-import { createContext } from "~/shared/context.server";
-import { marketplaceRouter } from "~/shared/marketplace/router";
-import { handleTrpcRemixAction } from "~/shared/remix/trpc-remix-request.server";
-
-export const action = async ({ request, params }: ActionArgs) => {
- const authenticatedUser = await findAuthenticatedUser(request);
- if (authenticatedUser === null) {
- throw new Error("Not authenticated");
- }
- const context = await createContext(request);
-
- return await handleTrpcRemixAction({
- request,
- params,
- router: marketplaceRouter,
- context,
- });
-};
-
-export const loader = action;
diff --git a/apps/builder/app/routes/dashboard.projects.$method.ts b/apps/builder/app/routes/dashboard.projects.$method.ts
deleted file mode 100644
index 419b8ea4de..0000000000
--- a/apps/builder/app/routes/dashboard.projects.$method.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { ActionArgs } from "@remix-run/node";
-import { dashboardProjectRouter } from "@webstudio-is/dashboard/index.server";
-import { findAuthenticatedUser } from "~/services/auth.server";
-import { createContext } from "~/shared/context.server";
-import { handleTrpcRemixAction } from "~/shared/remix/trpc-remix-request.server";
-
-export const action = async ({ request, params }: ActionArgs) => {
- const authenticatedUser = await findAuthenticatedUser(request);
- if (authenticatedUser === null) {
- throw new Error("Not authenticated");
- }
-
- const context = await createContext(request);
-
- return await handleTrpcRemixAction({
- request,
- params,
- router: dashboardProjectRouter,
- context,
- });
-};
diff --git a/apps/builder/app/routes/rest.authorization-token.$method.ts b/apps/builder/app/routes/rest.authorization-token.$method.ts
deleted file mode 100644
index d9112c35c2..0000000000
--- a/apps/builder/app/routes/rest.authorization-token.$method.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { ActionArgs } from "@remix-run/node";
-import { authorizationTokenRouter } from "@webstudio-is/authorization-token/index.server";
-import { findAuthenticatedUser } from "~/services/auth.server";
-import { createContext } from "~/shared/context.server";
-import { handleTrpcRemixAction } from "~/shared/remix/trpc-remix-request.server";
-
-export const action = async ({ request, params }: ActionArgs) => {
- const authenticatedUser = await findAuthenticatedUser(request);
- if (authenticatedUser === null) {
- throw new Error("Not authenticated");
- }
-
- const context = await createContext(request);
-
- return await handleTrpcRemixAction({
- request,
- params,
- router: authorizationTokenRouter,
- context,
- });
-};
-
-export const loader = action;
diff --git a/apps/builder/app/routes/rest.projects.$method.ts b/apps/builder/app/routes/rest.projects.$method.ts
deleted file mode 100644
index d44483af50..0000000000
--- a/apps/builder/app/routes/rest.projects.$method.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { ActionArgs } from "@remix-run/node";
-import { projectRouter } from "@webstudio-is/project/index.server";
-import { findAuthenticatedUser } from "~/services/auth.server";
-import { createContext } from "~/shared/context.server";
-import { handleTrpcRemixAction } from "~/shared/remix/trpc-remix-request.server";
-
-export const action = async ({ request, params }: ActionArgs) => {
- const authenticatedUser = await findAuthenticatedUser(request);
- if (authenticatedUser === null) {
- throw new Error("Not authenticated");
- }
-
- const context = await createContext(request);
-
- return await handleTrpcRemixAction({
- request,
- params,
- router: projectRouter,
- context,
- });
-};
diff --git a/apps/builder/app/routes/trpc.$.ts b/apps/builder/app/routes/trpc.$.ts
new file mode 100644
index 0000000000..0b7375d0f4
--- /dev/null
+++ b/apps/builder/app/routes/trpc.$.ts
@@ -0,0 +1,35 @@
+// eslint-disable-next-line import/no-internal-modules
+import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
+import type { ActionArgs } from "@remix-run/node";
+import { findAuthenticatedUser } from "~/services/auth.server";
+import { createContext } from "~/shared/context.server";
+import { appRouter } from "~/services/trcp-router.server";
+
+export const action = async ({ request }: ActionArgs) => {
+ const authenticatedUser = await findAuthenticatedUser(request);
+
+ if (authenticatedUser === null) {
+ throw new Error("Not authenticated");
+ }
+
+ // https://trpc.io/docs/server/adapters/fetch
+ const response = await fetchRequestHandler({
+ req: request,
+ router: appRouter,
+ endpoint: "/trpc",
+ batching: { enabled: true },
+ responseMeta(opts) {
+ const { paths, errors, type } = opts;
+ // @todo: Add caching headers if cacheMiddleware is not used
+ console.info("responseMeta", { paths, errors, type });
+ return {};
+ },
+ async createContext(opts) {
+ return await createContext(opts.req);
+ },
+ });
+
+ return response;
+};
+
+export const loader = action;
diff --git a/apps/builder/app/services/trcp-router.server.ts b/apps/builder/app/services/trcp-router.server.ts
index e69de29bb2..1a9dcba255 100644
--- a/apps/builder/app/services/trcp-router.server.ts
+++ b/apps/builder/app/services/trcp-router.server.ts
@@ -0,0 +1,16 @@
+import { router } from "@webstudio-is/trpc-interface/index.server";
+import { marketplaceRouter } from "../shared/marketplace/router.server";
+import { domainRouter } from "@webstudio-is/domain/index.server";
+import { projectRouter } from "@webstudio-is/project/index.server";
+import { authorizationTokenRouter } from "@webstudio-is/authorization-token/index.server";
+import { dashboardProjectRouter } from "@webstudio-is/dashboard/index.server";
+
+export const appRouter = router({
+ marketplace: marketplaceRouter,
+ domain: domainRouter,
+ project: projectRouter,
+ authorizationToken: authorizationTokenRouter,
+ dashboardProject: dashboardProjectRouter,
+});
+
+export type AppRouter = typeof appRouter;
diff --git a/apps/builder/app/services/trpc.server.ts b/apps/builder/app/services/trpc.server.ts
index e0a2ae3fc4..6a9f221a8b 100644
--- a/apps/builder/app/services/trpc.server.ts
+++ b/apps/builder/app/services/trpc.server.ts
@@ -5,7 +5,7 @@ const TRPC_SERVER_URL = env.TRPC_SERVER_URL ?? "";
const TRPC_SERVER_API_TOKEN = env.TRPC_SERVER_API_TOKEN ?? "";
const BRANCH_NAME = env.BRANCH_NAME;
-export const trpcClient = createTrpcProxyServiceClient(
+export const trpcSharedClient = createTrpcProxyServiceClient(
TRPC_SERVER_URL !== "" && TRPC_SERVER_API_TOKEN !== ""
? {
url: TRPC_SERVER_URL,
diff --git a/apps/builder/app/shared/clone-project.tsx b/apps/builder/app/shared/clone-project.tsx
index a6b845a3f4..8182d3596b 100644
--- a/apps/builder/app/shared/clone-project.tsx
+++ b/apps/builder/app/shared/clone-project.tsx
@@ -1,5 +1,5 @@
import { useState } from "react";
-import { useNavigate } from "@remix-run/react";
+import { useNavigate, useRevalidator } from "@remix-run/react";
import {
Box,
Button,
@@ -14,14 +14,9 @@ import {
Dialog,
DialogActions,
} from "@webstudio-is/design-system";
-import { Title, type ProjectRouter, Project } from "@webstudio-is/project";
-import { projectsPath, builderPath } from "~/shared/router-utils";
-import { createTrpcRemixProxy } from "~/shared/remix/trpc-remix-proxy";
-import { $authToken } from "./nano-states";
-
-const trpc = createTrpcRemixProxy<ProjectRouter>((method) =>
- projectsPath(method, { authToken: $authToken.get() })
-);
+import { Title, Project } from "@webstudio-is/project";
+import { builderPath } from "~/shared/router-utils";
+import { trpcClient } from "./trpc/trpc-client";
const useCloneProject = ({
projectId,
@@ -30,8 +25,9 @@ const useCloneProject = ({
projectId: Project["id"];
onOpenChange: (isOpen: boolean) => void;
}) => {
+ const revalidator = useRevalidator();
const navigate = useNavigate();
- const { send, state } = trpc.clone.useMutation();
+ const { send, state } = trpcClient.project.clone.useMutation();
const [errors, setErrors] = useState<string>();
const handleSubmit = ({ title }: { title: string }) => {
@@ -45,6 +41,7 @@ const useCloneProject = ({
if (parsed.success) {
send({ projectId, title }, (data) => {
+ revalidator.revalidate();
if (data?.id) {
navigate(builderPath({ projectId: data.id }));
onOpenChange(false);
diff --git a/apps/builder/app/shared/context.server.ts b/apps/builder/app/shared/context.server.ts
index 12a3bc7da8..0624325042 100644
--- a/apps/builder/app/shared/context.server.ts
+++ b/apps/builder/app/shared/context.server.ts
@@ -1,7 +1,7 @@
import type { AppContext } from "@webstudio-is/trpc-interface/index.server";
import env from "~/env/env.server";
import { authenticator } from "~/services/auth.server";
-import { trpcClient } from "~/services/trpc.server";
+import { trpcSharedClient } from "~/services/trpc.server";
import { entryApi } from "./entri/entri-api.server";
import {
getTokenPlanFeatures,
@@ -14,7 +14,10 @@ const createAuthorizationContext = async (
): Promise<AppContext["authorization"]> => {
const url = new URL(request.url);
- const authToken = url.searchParams.get("authToken") ?? url.hostname;
+ const authToken =
+ url.searchParams.get("authToken") ??
+ request.headers.get("x-auth-token") ??
+ url.hostname;
const user = await authenticator.isAuthenticated(request);
const marketplaceProjectIds = await getAllApprovedProjectIds();
@@ -28,7 +31,7 @@ const createAuthorizationContext = async (
authToken,
isServiceCall,
marketplaceProjectIds,
- authorizeTrpc: trpcClient.authorize,
+ authorizeTrpc: trpcSharedClient.authorize,
};
return context;
@@ -36,7 +39,7 @@ const createAuthorizationContext = async (
const createDomainContext = (request: Request) => {
const context: AppContext["domain"] = {
- domainTrpc: trpcClient.domain,
+ domainTrpc: trpcSharedClient.domain,
};
return context;
@@ -46,7 +49,7 @@ const createDeploymentContext = (request: Request) => {
const url = new URL(request.url);
const context: AppContext["deployment"] = {
- deploymentTrpc: trpcClient.deployment,
+ deploymentTrpc: trpcSharedClient.deployment,
env: {
BUILDER_ORIGIN: url.origin,
BRANCH_NAME: env.BRANCH_NAME ?? "main",
diff --git a/apps/builder/app/shared/entri/entri.ts b/apps/builder/app/shared/entri/entri.ts
index 8a7c6e50f9..eac003e12f 100644
--- a/apps/builder/app/shared/entri/entri.ts
+++ b/apps/builder/app/shared/entri/entri.ts
@@ -1,11 +1,7 @@
import useScript from "react-script-hook";
-import type { DomainRouter } from "@webstudio-is/domain/index.server";
-import { createTrpcFetchProxy } from "~/shared/remix/trpc-remix-proxy";
-import { builderDomainsPath } from "~/shared/router-utils";
import { globalCss } from "@webstudio-is/design-system";
import { useCallback, useEffect, useRef, useState } from "react";
-
-const trpc = createTrpcFetchProxy<DomainRouter>(builderDomainsPath);
+import { trpcClient } from "../trpc/trpc-client";
const scriptAttributes = {
async: true,
@@ -88,7 +84,7 @@ export const useEntri = ({ domain, dnsRecords, onClose }: UseEntriProps) => {
load: entriTokenLoad,
data: entriTokenData,
error: entriTokenSystemError,
- } = trpc.getEntriToken.useQuery();
+ } = trpcClient.domain.getEntriToken.useQuery();
useEffect(() => {
const handleOnEntriClose = (event: CustomEvent<EntriCloseDetail>) => {
diff --git a/apps/builder/app/shared/marketplace/router.ts b/apps/builder/app/shared/marketplace/router.server.ts
similarity index 89%
rename from apps/builder/app/shared/marketplace/router.ts
rename to apps/builder/app/shared/marketplace/router.server.ts
index 4f165a2028..1d0ff92f96 100644
--- a/apps/builder/app/shared/marketplace/router.ts
+++ b/apps/builder/app/shared/marketplace/router.server.ts
@@ -16,5 +16,3 @@ export const marketplaceRouter = router({
return await getBuildProdData(input, ctx);
}),
});
-
-export type MarketplaceRouter = typeof marketplaceRouter;
diff --git a/apps/builder/app/shared/remix/trpc-remix-proxy.ts b/apps/builder/app/shared/remix/trpc-remix-proxy.ts
deleted file mode 100644
index 286187d11a..0000000000
--- a/apps/builder/app/shared/remix/trpc-remix-proxy.ts
+++ /dev/null
@@ -1,196 +0,0 @@
-import { useFetcher } from "@remix-run/react";
-import type {
- AnyMutationProcedure,
- AnyRouter,
- inferRouterInputs,
- inferRouterOutputs,
-} from "@trpc/server";
-// eslint-disable-next-line import/no-internal-modules
-import { createRecursiveProxy } from "@trpc/server/shared";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-
-export const createTrpcRemixProxy = <Router extends AnyRouter>(
- getPath: (method: string) => string
-): {
- [Procedure in keyof Router["_def"]["record"]]: Router["_def"]["record"][Procedure] extends AnyMutationProcedure
- ? {
- useMutation: () => {
- send: (
- input: inferRouterInputs<Router>[Procedure],
- onSuccess?: (data: inferRouterOutputs<Router>[Procedure]) => void
- ) => void;
- data?: inferRouterOutputs<Router>[Procedure];
- state: "idle" | "loading" | "submitting";
- };
- }
- : {
- useQuery: () => {
- load: (
- input: inferRouterInputs<Router>[Procedure],
- onSuccess?: (data: inferRouterOutputs<Router>[Procedure]) => void
- ) => void;
- data?: inferRouterOutputs<Router>[Procedure];
- state: "idle" | "loading" | "submitting";
- };
- };
-} =>
- createRecursiveProxy((options) => {
- const path = [...options.path];
- const hook = path.pop();
- const { data, submit, state } = useFetcher();
-
- if (hook !== "useMutation" && hook !== "useQuery") {
- throw new Error(`Invalid hook ${hook}`);
- }
-
- const method = path.join(".");
-
- const previousDataRef = useRef(data);
- const onSuccessRef = useRef<(data: unknown) => void>();
-
- // There's an occasional issue where React skips `useEffect(, [data])`, possibly due to a race condition.
- // To frequently replicate this issue:
- // 1. Open dashboard
- // 1. Create 20 projects
- // 2. Turn on CPU 6x slowdown in Chrome dev tools
-
- // Upon creating a new project, you'll find that it doesn't redirect to the new project page if dependency doesn't contain `state`.
- // The problem is that `useEffect` with only `data` or `data?.id` as a dependency is not triggered.
-
- // Some working fixes:
- // 1. Non-remix fetch - using createTrpcFetchProxy
- // 2. Use this code inside useEffect:
- // if (ref.current !== data?.projectId) { doRedirect(); }; ref.current = data?.projectId;
- // 3. Use useState as shown below
- //
- // Some observations:
- // The issue seems related to the amount of rendering, possibly due to concurrent React's features.
- // It's also related to Remix's useFetcher, which may be using setState or something similar
- // in a way that's not compatible with concurrent React.
- useEffect(() => {
- if (data !== previousDataRef.current) {
- previousDataRef.current = data;
- onSuccessRef.current?.(data);
- }
- }, [data, state]);
-
- const remixSubmit = useCallback(
- (input: never, onSuccess: (data: unknown) => void) => {
- onSuccessRef.current = onSuccess;
- submit(
- // stringify input as otherwise we loose type safety
- // (remix will add key: values as FormData entries or as SearchParams
- { input: JSON.stringify(input) },
- {
- method: hook === "useMutation" ? "post" : "get",
- action: getPath(method),
- }
- );
- },
- [submit, hook, method]
- );
-
- return {
- [hook === "useMutation" ? "send" : "load"]: remixSubmit,
- data: data,
- state,
- };
- }) as never;
-
-export const createTrpcFetchProxy = <Router extends AnyRouter>(
- getPath: (method: string) => string
-): {
- [Procedure in keyof Router["_def"]["record"]]: Router["_def"]["record"][Procedure] extends AnyMutationProcedure
- ? {
- useMutation: () => {
- send: (
- input: inferRouterInputs<Router>[Procedure],
- onSuccess?: (data: inferRouterOutputs<Router>[Procedure]) => void
- ) => void;
- data?: inferRouterOutputs<Router>[Procedure];
- state: "idle" | "submitting";
- error?: string | undefined;
- };
- }
- : {
- useQuery: () => {
- load: (
- input: inferRouterInputs<Router>[Procedure],
- onSuccess?: (data: inferRouterOutputs<Router>[Procedure]) => void
- ) => void;
- data?: inferRouterOutputs<Router>[Procedure];
- state: "idle" | "submitting";
- error?: string | undefined;
- };
- };
-} =>
- createRecursiveProxy((options) => {
- const path = [...options.path];
- const hook = path.pop();
- const [data, setData] = useState(undefined);
- const [state, setState] = useState<"idle" | "submitting">("idle");
- const [error, setError] = useState<string | undefined>(undefined);
-
- if (hook !== "useMutation" && hook !== "useQuery") {
- throw new Error(`Invalid hook ${hook}`);
- }
-
- const method = path.join(".");
-
- const submit = useMemo(() => {
- let requestId = 0;
-
- return async (input: never, onSuccess?: (data: unknown) => void) => {
- try {
- setState("submitting");
- requestId += 1;
- const currentRequestId = requestId;
-
- if (process.env.NODE_ENV !== "production") {
- await new Promise((resolve) => setTimeout(resolve, 1000));
- }
-
- const response = await fetch(getPath(method), {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify(input ?? null),
- });
-
- // Newer request has been made, ignore this one
- // In the future to support optimistic updates we can call onComplete with the requestId order
- if (currentRequestId !== requestId) {
- return;
- }
-
- if (response.ok) {
- const data = await response.json();
- setData(data);
- setError(undefined);
- onSuccess?.(data);
- return;
- }
-
- // Error handling
- const message = await response.text();
- setError(message.slice(0, 200));
- } catch (error) {
- if (error instanceof Error) {
- setError(error.message);
- return;
- }
- setError("Unknown error");
- } finally {
- setState("idle");
- }
- };
- }, [method]);
-
- return {
- [hook === "useMutation" ? "send" : "load"]: submit,
- data: data,
- state,
- error,
- };
- }) as never;
diff --git a/apps/builder/app/shared/remix/trpc-remix-request.server.ts b/apps/builder/app/shared/remix/trpc-remix-request.server.ts
deleted file mode 100644
index 0e7a0864e3..0000000000
--- a/apps/builder/app/shared/remix/trpc-remix-request.server.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import type { ActionArgs } from "@remix-run/node";
-import type { AnyRouter } from "@trpc/server";
-
-export const handleTrpcRemixAction = async <Router extends AnyRouter>({
- router,
- params,
- request,
- context,
-}: {
- router: Router;
- params: ActionArgs["params"];
- request: Request;
- context: Router["_def"]["_config"]["$types"]["ctx"];
-}) => {
- const { method } = params;
-
- if (typeof method !== "string") {
- throw new Error("Missing method");
- }
-
- let input: never;
-
- if (request.method === "GET") {
- const url = new URL(request.url);
- const inputRaw = url.searchParams.get("input");
- if (typeof inputRaw !== "string") {
- throw new Error(`Bad method name ${inputRaw}`);
- }
- input = JSON.parse(inputRaw) as never;
- } else {
- if (request.headers.get("Content-Type") !== "application/json") {
- const formData = await request.formData();
- const inputRaw = formData.get("input");
- if (typeof inputRaw !== "string") {
- throw new Error(`Bad method name ${inputRaw}`);
- }
- input = JSON.parse(inputRaw) as never;
- } else {
- input = (await request.json()) as never;
- }
- }
-
- const caller = router.createCaller(context);
- const allowedProcedures = Object.keys(router["_def"].record);
-
- if (allowedProcedures.includes(method) === false) {
- throw new Error(`Unknown RPC method "${method}"`);
- }
-
- const fn = caller[method];
-
- if (typeof fn === "function") {
- return await fn(input);
- }
-
- throw new Error(`Unknown RPC method "${method}"`);
-};
diff --git a/apps/builder/app/shared/share-project/share-project-container.tsx b/apps/builder/app/shared/share-project/share-project-container.tsx
index b1ea5ac141..28db714319 100644
--- a/apps/builder/app/shared/share-project/share-project-container.tsx
+++ b/apps/builder/app/shared/share-project/share-project-container.tsx
@@ -1,20 +1,22 @@
import { ShareProject, type LinkOptions } from "./share-project";
-import { createTrpcRemixProxy } from "~/shared/remix/trpc-remix-proxy";
-import type { AuthorizationTokensRouter } from "@webstudio-is/authorization-token";
-import { authorizationTokenPath, builderUrl } from "~/shared/router-utils";
+import { builderUrl } from "~/shared/router-utils";
import { useEffect, useRef, useState } from "react";
import { useDebouncedCallback } from "use-debounce";
import type { Project } from "@webstudio-is/prisma-client";
-
-const trpc = createTrpcRemixProxy<AuthorizationTokensRouter>(
- authorizationTokenPath
-);
+import { trpcClient } from "../trpc/trpc-client";
const useShareProjectContainer = (projectId: Project["id"]) => {
- const { data, load, state: loadState } = trpc.findMany.useQuery();
- const { send: createToken, state: createState } = trpc.create.useMutation();
- const { send: removeToken, state: removeState } = trpc.remove.useMutation();
- const { send: updateToken, state: updateState } = trpc.update.useMutation();
+ const {
+ data,
+ load,
+ state: loadState,
+ } = trpcClient.authorizationToken.findMany.useQuery();
+ const { send: createToken, state: createState } =
+ trpcClient.authorizationToken.create.useMutation();
+ const { send: removeToken, state: removeState } =
+ trpcClient.authorizationToken.remove.useMutation();
+ const { send: updateToken, state: updateState } =
+ trpcClient.authorizationToken.update.useMutation();
const [links, setLinks] = useState(data ?? []);
const deletingLinks = useRef(new Set<string>());
@@ -57,11 +59,18 @@ const useShareProjectContainer = (projectId: Project["id"]) => {
};
const handleCreate = () => {
- createToken({
- projectId: projectId,
- relation: "viewers",
- name: "Custom link",
- });
+ createToken(
+ {
+ projectId: projectId,
+ relation: "viewers",
+ name: "Custom link",
+ },
+ () => {
+ load({ projectId }, (data) => {
+ setLinks(data ?? []);
+ });
+ }
+ );
};
const isPending =
diff --git a/apps/builder/app/shared/trpc/trpc-client.ts b/apps/builder/app/shared/trpc/trpc-client.ts
new file mode 100644
index 0000000000..2dd7efcad7
--- /dev/null
+++ b/apps/builder/app/shared/trpc/trpc-client.ts
@@ -0,0 +1,142 @@
+import type { AppRouter } from "~/services/trcp-router.server";
+import { createTRPCProxyClient, httpBatchLink } from "@trpc/client";
+
+import type {
+ AnyMutationProcedure,
+ AnyRouter,
+ inferRouterInputs,
+ inferRouterOutputs,
+} from "@trpc/server";
+// eslint-disable-next-line import/no-internal-modules
+import { createRecursiveProxy } from "@trpc/server/shared";
+import { useMemo, useState } from "react";
+import { $authToken } from "../nano-states";
+
+const client = createTRPCProxyClient<AppRouter>({
+ links: [
+ httpBatchLink({
+ url: "/trpc",
+ // You can pass any HTTP headers you wish here
+ async headers(opts) {
+ const authToken = $authToken.get();
+
+ // Pass token to api call
+ return {
+ "x-auth-token": authToken,
+ };
+ },
+ }),
+ ],
+});
+
+type Procedures<T> = T extends AnyRouter
+ ? {
+ [Procedure in keyof T["_def"]["record"]]: T["_def"]["record"][Procedure] extends AnyMutationProcedure
+ ? {
+ useMutation: () => {
+ send: (
+ input: inferRouterInputs<T>[Procedure],
+ onSuccess?: (data: inferRouterOutputs<T>[Procedure]) => void
+ ) => void;
+ data?: inferRouterOutputs<T>[Procedure];
+ state: "idle" | "submitting";
+ error?: string | undefined;
+ };
+ }
+ : {
+ useQuery: () => {
+ load: (
+ input: inferRouterInputs<T>[Procedure],
+ onSuccess?: (data: inferRouterOutputs<T>[Procedure]) => void
+ ) => void;
+ data?: inferRouterOutputs<T>[Procedure];
+ state: "idle" | "submitting";
+ error?: string | undefined;
+ };
+ };
+ }
+ : never;
+
+type Client = Record<
+ string,
+ Record<
+ string,
+ { query: (args: unknown) => unknown; mutate: (args: unknown) => unknown }
+ >
+>;
+
+export const trpcClient: {
+ [SubRoute in keyof AppRouter["_def"]["record"]]: Procedures<
+ AppRouter["_def"]["record"][SubRoute]
+ >;
+} = createRecursiveProxy((options) => {
+ const path = [...options.path];
+ const hook = path.pop();
+ const [data, setData] = useState<unknown>(undefined);
+ const [state, setState] = useState<"idle" | "submitting">("idle");
+ const [error, setError] = useState<string | undefined>(undefined);
+
+ if (hook !== "useMutation" && hook !== "useQuery") {
+ throw new Error(`Invalid hook ${hook}`);
+ }
+
+ // const method = path.join(".");
+ if (path.length !== 2) {
+ throw new Error(`Invalid path ${path}`);
+ }
+
+ const [namespace, method] = path;
+
+ const submit = useMemo(() => {
+ let requestId = 0;
+
+ return async (input: never, onSuccess?: (data: unknown) => void) => {
+ requestId += 1;
+ const currentRequestId = requestId;
+ try {
+ setState("submitting");
+
+ // if (process.env.NODE_ENV !== "production") {
+ // await new Promise((resolve) => setTimeout(resolve, 1000));
+ // }
+
+ const result = await (client as unknown as Client)[namespace][method][
+ hook === "useMutation" ? "mutate" : "query"
+ ](input);
+
+ // Newer request has been made, ignore this one
+ // In the future to support optimistic updates we can call onComplete with the requestId order
+ if (currentRequestId !== requestId) {
+ return;
+ }
+
+ setData(result);
+ setError(undefined);
+ onSuccess?.(result);
+ } catch (error) {
+ if (currentRequestId !== requestId) {
+ return;
+ }
+
+ console.error("TRPC ERROR", error);
+
+ if (error instanceof Error) {
+ setError(error.message);
+ return;
+ }
+ setError("Unknown error");
+ } finally {
+ if (currentRequestId === requestId) {
+ setState("idle");
+ }
+ }
+ };
+ }, [hook, namespace, method]);
+
+ return {
+ [hook === "useMutation" ? "send" : "load"]: submit,
+ data: data,
+ state,
+ error,
+ };
+}) as never;