Chungus 2.0

server/routers/domain/createOrgDomain.ts

@@ -9,8 +9,8 @@ import { fromError } from "zod-validation-error";
 import { subdomainSchema } from "@server/lib/schemas";
 import { generateId } from "@server/auth/sessions/app";
 import { eq, and } from "drizzle-orm";
-import { usageService } from "@server/lib/private/billing/usageService";
-import { FeatureId } from "@server/lib/private/billing";
+import { usageService } from "@server/lib/billing/usageService";
+import { FeatureId } from "@server/lib/billing";
 import { isSecondLevelDomain, isValidDomain } from "@server/lib/validators";
 import { build } from "@server/build";
 import config from "@server/lib/config";

server/routers/domain/deleteOrgDomain.ts

@@ -7,8 +7,8 @@ import createHttpError from "http-errors";
 import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
 import { and, eq } from "drizzle-orm";
-import { usageService } from "@server/lib/private/billing/usageService";
-import { FeatureId } from "@server/lib/private/billing";
+import { usageService } from "@server/lib/billing/usageService";
+import { FeatureId } from "@server/lib/billing";
 
 const paramsSchema = z
     .object({

server/routers/domain/index.ts

@@ -1,6 +1,4 @@
 export * from "./listDomains";
 export * from "./createOrgDomain";
 export * from "./deleteOrgDomain";
-export * from "./privateListDomainNamespaces";
-export * from "./privateCheckDomainNamespaceAvailability";
 export * from "./restartOrgDomain";

server/routers/domain/privateCheckDomainNamespaceAvailability.ts

@@ -1,127 +0,0 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-
-import { Request, Response, NextFunction } from "express";
-import { z } from "zod";
-import response from "@server/lib/response";
-import HttpCode from "@server/types/HttpCode";
-import createHttpError from "http-errors";
-import logger from "@server/logger";
-import { fromError } from "zod-validation-error";
-import { OpenAPITags, registry } from "@server/openApi";
-import { db, domainNamespaces, resources } from "@server/db";
-import { inArray } from "drizzle-orm";
-
-const paramsSchema = z.object({}).strict();
-
-const querySchema = z
-    .object({
-        subdomain: z.string()
-    })
-    .strict();
-
-export type CheckDomainAvailabilityResponse = {
-    available: boolean;
-    options: {
-        domainNamespaceId: string;
-        domainId: string;
-        fullDomain: string;
-    }[];
-};
-
-registry.registerPath({
-    method: "get",
-    path: "/domain/check-namespace-availability",
-    description: "Check if a domain namespace is available based on subdomain",
-    tags: [OpenAPITags.Domain],
-    request: {
-        params: paramsSchema,
-        query: querySchema
-    },
-    responses: {}
-});
-
-export async function checkDomainNamespaceAvailability(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        const parsedQuery = querySchema.safeParse(req.query);
-        if (!parsedQuery.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedQuery.error).toString()
-                )
-            );
-        }
-        const { subdomain } = parsedQuery.data;
-
-        const namespaces = await db.select().from(domainNamespaces);
-        let possibleDomains = namespaces.map((ns) => {
-            const desired = `${subdomain}.${ns.domainNamespaceId}`;
-            return {
-                fullDomain: desired,
-                domainId: ns.domainId,
-                domainNamespaceId: ns.domainNamespaceId
-            };
-        });
-
-        if (!possibleDomains.length) {
-            return response<CheckDomainAvailabilityResponse>(res, {
-                data: {
-                    available: false,
-                    options: []
-                },
-                success: true,
-                error: false,
-                message: "No domain namespaces available",
-                status: HttpCode.OK
-            });
-        }
-
-        const existingResources = await db
-            .select()
-            .from(resources)
-            .where(
-                inArray(
-                    resources.fullDomain,
-                    possibleDomains.map((d) => d.fullDomain)
-                )
-            );
-
-        possibleDomains = possibleDomains.filter(
-            (domain) =>
-                !existingResources.some(
-                    (resource) => resource.fullDomain === domain.fullDomain
-                )
-        );
-
-        return response<CheckDomainAvailabilityResponse>(res, {
-            data: {
-                available: possibleDomains.length > 0,
-                options: possibleDomains
-            },
-            success: true,
-            error: false,
-            message: "Domain namespaces checked successfully",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
-        );
-    }
-}

server/routers/domain/privateListDomainNamespaces.ts

@@ -1,130 +0,0 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025 Fossorial, Inc.
- * All rights reserved.
- *
- * This file is licensed under the Fossorial Commercial License.
- * You may not use this file except in compliance with the License.
- * Unauthorized use, copying, modification, or distribution is strictly prohibited.
- *
- * This file is not licensed under the AGPLv3.
- */
-
-import { Request, Response, NextFunction } from "express";
-import { z } from "zod";
-import { db, domainNamespaces } from "@server/db";
-import { domains } from "@server/db";
-import response from "@server/lib/response";
-import HttpCode from "@server/types/HttpCode";
-import createHttpError from "http-errors";
-import { eq, sql } from "drizzle-orm";
-import logger from "@server/logger";
-import { fromError } from "zod-validation-error";
-import { OpenAPITags, registry } from "@server/openApi";
-
-const paramsSchema = z.object({}).strict();
-
-const querySchema = z
-    .object({
-        limit: z
-            .string()
-            .optional()
-            .default("1000")
-            .transform(Number)
-            .pipe(z.number().int().nonnegative()),
-        offset: z
-            .string()
-            .optional()
-            .default("0")
-            .transform(Number)
-            .pipe(z.number().int().nonnegative())
-    })
-    .strict();
-
-async function query(limit: number, offset: number) {
-    const res = await db
-        .select({
-            domainNamespaceId: domainNamespaces.domainNamespaceId,
-            domainId: domainNamespaces.domainId
-        })
-        .from(domainNamespaces)
-        .innerJoin(
-            domains,
-            eq(domains.domainId, domainNamespaces.domainNamespaceId)
-        )
-        .limit(limit)
-        .offset(offset);
-    return res;
-}
-
-export type ListDomainNamespacesResponse = {
-    domainNamespaces: NonNullable<Awaited<ReturnType<typeof query>>>;
-    pagination: { total: number; limit: number; offset: number };
-};
-
-registry.registerPath({
-    method: "get",
-    path: "/domains/namepaces",
-    description: "List all domain namespaces in the system",
-    tags: [OpenAPITags.Domain],
-    request: {
-        query: querySchema
-    },
-    responses: {}
-});
-
-export async function listDomainNamespaces(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        const parsedQuery = querySchema.safeParse(req.query);
-        if (!parsedQuery.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedQuery.error).toString()
-                )
-            );
-        }
-        const { limit, offset } = parsedQuery.data;
-
-        const parsedParams = paramsSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error).toString()
-                )
-            );
-        }
-
-        const domainNamespacesList = await query(limit, offset);
-
-        const [{ count }] = await db
-            .select({ count: sql<number>`count(*)` })
-            .from(domainNamespaces);
-
-        return response<ListDomainNamespacesResponse>(res, {
-            data: {
-                domainNamespaces: domainNamespacesList,
-                pagination: {
-                    total: count,
-                    limit,
-                    offset
-                }
-            },
-            success: true,
-            error: false,
-            message: "Namespaces retrieved successfully",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
-        );
-    }
-}