Merge pull request #3702 from fosrl/dev

1.22.2

cli/commands/clearExitNodes.ts

@@ -23,7 +23,7 @@ export const clearExitNodes: CommandModule<
             // Delete all exit nodes
             const deletedCount = await db
                 .delete(exitNodes)
-                .where(eq(exitNodes.exitNodeId, exitNodes.exitNodeId)).returning();; // delete all
+                .where(eq(exitNodes.exitNodeId, exitNodes.exitNodeId))  .returning();; // delete all
 
             console.log(`Deleted ${deletedCount.length} exit node(s) from the database`);
 

messages/en-US.json

@@ -152,7 +152,7 @@
     "siteResourcesHowToAccess": "How to access",
     "siteResourcesTargetsOnSite": "Targets on this site",
     "siteSetting": "{siteName} Settings",
-    "siteNewtTunnel": "Pangolin Site (Recommended)",
+    "siteNewtTunnel": "Newt Site (Recommended)",
     "siteNewtTunnelDescription": "Easiest way to create an entrypoint into any network. No extra setup.",
     "siteWg": "Basic WireGuard",
     "siteWgDescription": "Use any WireGuard client to establish a tunnel. Manual NAT setup required.",
@@ -2898,7 +2898,7 @@
     "editInternalResourceDialogAlias": "Alias",
     "editInternalResourceDialogAliasDescription": "An optional internal DNS alias for this resource.",
     "createInternalResourceDialogNoSitesAvailable": "No Sites Available",
-    "createInternalResourceDialogNoSitesAvailableDescription": "You need to have at least one site with a subnet configured to create private resources.",
+    "createInternalResourceDialogNoSitesAvailableDescription": "You need to have at least one Newt site with a subnet configured to create private resources.",
     "createInternalResourceDialogClose": "Close",
     "createInternalResourceDialogCreateClientResource": "Create Private Resource",
     "createInternalResourceDialogCreateClientResourceDescription": "Create a new resource that will only be accessible to clients connected to the organization",
@@ -3767,7 +3767,6 @@
     "noData": "No Data",
     "machineClients": "Machine Clients",
     "install": "Install",
-    "downloadInstaller": "Download Installer",
     "run": "Run",
     "envFile": "Environment File",
     "serviceFile": "Service File",
@@ -4364,6 +4363,5 @@
     "rdpUnicodeKeyboardMode": "Unicode keyboard mode",
     "sessionToolbarShow": "Show toolbar",
     "sessionToolbarHide": "Hide toolbar",
-    "actionUpdateSiteApprovals": "Update Site Approvals",
-    "check": "Check"
+    "actionUpdateSiteApprovals": "Update Site Approvals"
 }

server/lib/dbRetry.ts

@@ -71,7 +71,7 @@ export async function withRetry<T>(
                 const jitter = Math.random() * baseDelay;
                 const delay = baseDelay + jitter;
                 logger.warn(
-                    `Transient DB issue in ${context}, retrying attempt ${attempt}/${maxRetries} after ${delay.toFixed(0)}ms`,
+                    `Transient DB error in ${context}, retrying attempt ${attempt}/${maxRetries} after ${delay.toFixed(0)}ms`,
                     { code: error?.code ?? error?.cause?.code }
                 );
                 await new Promise((resolve) => setTimeout(resolve, delay));

server/lib/readConfigFile.ts

@@ -348,8 +348,8 @@ export const configSchema = z
                     .optional()
                     .pipe(z.string())
                     .transform((url) => url.toLowerCase()),
-                subnet_group: z.string().optional().default("100.89.137.0/18"),
-                block_size: z.number().positive().gt(0).optional().default(22),
+                subnet_group: z.string().optional().default("100.89.137.0/20"),
+                block_size: z.number().positive().gt(0).optional().default(24),
                 site_block_size: z
                     .number()
                     .positive()

server/private/routers/hybrid.ts

@@ -2478,12 +2478,7 @@ hybridRouter.post(
                 destinations: destinations
             });
         } catch (error) {
-            if (!(
-                error instanceof Error &&
-                error.message === "Exit node not allowed"
-            )) {
-                logger.error(error);
-            }
+            logger.error(error);
             return next(
                 createHttpError(
                     HttpCode.INTERNAL_SERVER_ERROR,

server/private/routers/remoteExitNode/exitNodeEvents.ts

@@ -1,23 +0,0 @@
-/*
- * This file is part of a proprietary work.
- *
- * Copyright (c) 2025-2026 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 { EventEmitter } from "events";
-
-export interface ExitNodeOnlineEvent {
-    exitNodeId: number;
-    endpoint: string;
-}
-
-export const EXIT_NODE_ONLINE_EVENT = "exit-node-online";
-
-export const exitNodeEvents = new EventEmitter();

server/private/routers/remoteExitNode/exitNodeReconnectScheduler.ts

@@ -12,27 +12,11 @@
  */
 
 import axios from "axios";
-import { db, newts, sites } from "@server/db";
+import { db, exitNodes, newts, sites } from "@server/db";
 import { eq } from "drizzle-orm";
 import logger from "@server/logger";
 import redisManager from "#private/lib/redis";
-import { sendToClient } from "../ws";
-import {
-    exitNodeEvents,
-    EXIT_NODE_ONLINE_EVENT,
-    ExitNodeOnlineEvent
-} from "./exitNodeEvents";
-
-exitNodeEvents.on(
-    EXIT_NODE_ONLINE_EVENT,
-    ({ exitNodeId, endpoint }: ExitNodeOnlineEvent) => {
-        scheduleExitNodeReconnect(exitNodeId, endpoint).catch((error) => {
-            logger.error("Failed to schedule exit node reconnect", {
-                error
-            });
-        });
-    }
-);
+// import { sendToClient } from "#private/routers/ws";
 
 const INITIAL_DELAY_MS = 15 * 1000; // 15 seconds before first check
 const CHECK_INTERVAL_MS = 10 * 1000; // Check every 10 seconds
@@ -42,7 +26,7 @@ const REDIS_HASH_PREFIX = "exit-node-reconnect:";
 
 interface PendingReconnect {
     startTime: number;
-    endpoint: string;
+    reachableAt: string;
 }
 
 // In-memory tracking for this node
@@ -56,15 +40,15 @@ let schedulerInterval: NodeJS.Timeout | null = null;
  */
 export async function scheduleExitNodeReconnect(
     exitNodeId: number,
-    endpoint: string
+    reachableAt: string
 ): Promise<void> {
     logger.info(
-        `Scheduling newt reconnect for exit node ${exitNodeId} (endpoint: ${endpoint})`
+        `Scheduling newt reconnect for exit node ${exitNodeId} (reachableAt: ${reachableAt})`
     );
 
     const entry: PendingReconnect = {
         startTime: Date.now(),
-        endpoint
+        reachableAt
     };
 
     pendingReconnects.set(exitNodeId, entry);
@@ -79,8 +63,8 @@ export async function scheduleExitNodeReconnect(
         );
         await redisManager.hset(
             `${REDIS_HASH_PREFIX}${exitNodeId}`,
-            "endpoint",
-            endpoint
+            "reachableAt",
+            reachableAt
         );
     }
 }
@@ -117,14 +101,14 @@ async function processPendingReconnects(): Promise<void> {
                     `${REDIS_HASH_PREFIX}${id}`,
                     "startTime"
                 );
-                const endpoint = await redisManager.hget(
+                const reachableAt = await redisManager.hget(
                     `${REDIS_HASH_PREFIX}${id}`,
-                    "endpoint"
+                    "reachableAt"
                 );
-                if (startTimeStr && endpoint) {
+                if (startTimeStr && reachableAt) {
                     toProcess.set(id, {
                         startTime: parseInt(startTimeStr, 10),
-                        endpoint
+                        reachableAt
                     });
                 }
             }
@@ -151,7 +135,7 @@ async function processPendingReconnects(): Promise<void> {
         }
 
         // Check if the exit node HTTP endpoint is reachable
-        const pingUrl = `http://${entry.endpoint}/ping`;
+        const pingUrl = `${entry.reachableAt}/ping`;
         try {
             await axios.get(pingUrl, { timeout: 5000 });
         } catch {
@@ -166,47 +150,47 @@ async function processPendingReconnects(): Promise<void> {
             `Exit node ${exitNodeId} is reachable. Sending newt/wg/reconnect to connected newts.`
         );
 
-        await sendReconnectToNewts(exitNodeId);
+        // await sendReconnectToNewts(exitNodeId);
         await removePending(exitNodeId);
     }
 }
 
-async function sendReconnectToNewts(exitNodeId: number): Promise<void> {
-    try {
-        const connectedNewts = await db
-            .select({ newtId: newts.newtId })
-            .from(newts)
-            .innerJoin(sites, eq(newts.siteId, sites.siteId))
-            .where(eq(sites.exitNodeId, exitNodeId));
+// async function sendReconnectToNewts(exitNodeId: number): Promise<void> {
+// try {
+//         const connectedNewts = await db
+//             .select({ newtId: newts.newtId })
+//             .from(newts)
+//             .innerJoin(sites, eq(newts.siteId, sites.siteId))
+//             .where(eq(sites.exitNodeId, exitNodeId));
 
-        if (connectedNewts.length === 0) {
-            logger.debug(
-                `No newts found for exit node ${exitNodeId}, nothing to reconnect`
-            );
-            return;
-        }
+//         if (connectedNewts.length === 0) {
+//             logger.debug(
+//                 `No newts found for exit node ${exitNodeId}, nothing to reconnect`
+//             );
+//             return;
+//         }
 
-        logger.info(
-            `Sending newt/wg/reconnect to ${connectedNewts.length} newt(s) for exit node ${exitNodeId}`
-        );
+//         logger.info(
+//             `Sending newt/wg/reconnect to ${connectedNewts.length} newt(s) for exit node ${exitNodeId}`
+//         );
 
-        const reconnectMessage = {
-            type: "newt/wg/reconnect",
-            data: {}
-        };
+//         const reconnectMessage = {
+//             type: "newt/wg/reconnect",
+//             data: {}
+//         };
 
-        await Promise.allSettled(
-            connectedNewts.map(({ newtId }) =>
-                sendToClient(newtId, reconnectMessage)
-            )
-        );
-    } catch (error) {
-        logger.error(
-            `Failed to send reconnect messages for exit node ${exitNodeId}`,
-            { error }
-        );
-    }
-}
+//         await Promise.allSettled(
+//             connectedNewts.map(({ newtId }) =>
+//                 sendToClient(newtId, reconnectMessage)
+//             )
+//         );
+//     } catch (error) {
+//         logger.error(
+//             `Failed to send reconnect messages for exit node ${exitNodeId}`,
+//             { error }
+//         );
+//     }
+// }
 
 async function removePending(exitNodeId: number): Promise<void> {
     pendingReconnects.delete(exitNodeId);

server/private/routers/remoteExitNode/handleRemoteExitNodePingMessage.ts

@@ -16,7 +16,7 @@ import { MessageHandler } from "@server/routers/ws";
 import { RemoteExitNode } from "@server/db";
 import { eq } from "drizzle-orm";
 import logger from "@server/logger";
-import { exitNodeEvents, EXIT_NODE_ONLINE_EVENT } from "./exitNodeEvents";
+import { scheduleExitNodeReconnect } from "./exitNodeReconnectScheduler";
 
 /**
  * Handles ping messages from clients and responds with pong
@@ -40,7 +40,7 @@ export const handleRemoteExitNodePingMessage: MessageHandler = async (
     try {
         // Fetch the current state before updating so we can detect the offline→online transition
         const [currentExitNode] = await db
-            .select({ online: exitNodes.online, endpoint: exitNodes.endpoint })
+            .select({ online: exitNodes.online, reachableAt: exitNodes.reachableAt })
             .from(exitNodes)
             .where(eq(exitNodes.exitNodeId, remoteExitNode.exitNodeId))
             .limit(1);
@@ -55,14 +55,12 @@ export const handleRemoteExitNodePingMessage: MessageHandler = async (
             .where(eq(exitNodes.exitNodeId, remoteExitNode.exitNodeId));
 
         // If the exit node was offline and is now coming online, schedule newt reconnects
-        if (
-            currentExitNode &&
-            !currentExitNode.online &&
-            currentExitNode.endpoint
-        ) {
-            exitNodeEvents.emit(EXIT_NODE_ONLINE_EVENT, {
-                exitNodeId: remoteExitNode.exitNodeId,
-                endpoint: currentExitNode.endpoint
+        if (currentExitNode && !currentExitNode.online && currentExitNode.reachableAt) {
+            scheduleExitNodeReconnect(
+                remoteExitNode.exitNodeId,
+                currentExitNode.reachableAt
+            ).catch((error) => {
+                logger.error("Failed to schedule exit node reconnect", { error });
             });
         }
     } catch (error) {

server/routers/olm/handleOlmServerInitAddPeerHandshake.ts

@@ -85,7 +85,7 @@ export const handleOlmServerInitAddPeerHandshake: MessageHandler = async (
             );
 
         if (!resources || resources.length === 0) {
-            logger.warn(
+            logger.error(
                 `handleOlmServerInitAddPeerHandshake: Resource not found`
             );
             await sendCancel();
@@ -94,7 +94,7 @@ export const handleOlmServerInitAddPeerHandshake: MessageHandler = async (
 
         if (resources.length > 1) {
             // error but this should not happen because the nice id cant contain a dot and the alias has to have a dot and both have to be unique within the org so there should never be multiple matches
-            logger.warn(
+            logger.error(
                 `handleOlmServerInitAddPeerHandshake: Multiple resources found matching the criteria`
             );
             return;
@@ -119,7 +119,7 @@ export const handleOlmServerInitAddPeerHandshake: MessageHandler = async (
             );
 
         if (currentResourceAssociationCaches.length === 0) {
-            logger.warn(
+            logger.error(
                 `handleOlmServerInitAddPeerHandshake: Client ${client.clientId} does not have access to resource ${resource.siteResourceId}`
             );
             await sendCancel();
@@ -127,7 +127,7 @@ export const handleOlmServerInitAddPeerHandshake: MessageHandler = async (
         }
 
         if (!resource.networkId) {
-            logger.warn(
+            logger.error(
                 `handleOlmServerInitAddPeerHandshake: Resource ${resource.siteResourceId} has no network`
             );
             await sendCancel();
@@ -141,7 +141,7 @@ export const handleOlmServerInitAddPeerHandshake: MessageHandler = async (
             .where(eq(siteNetworks.networkId, resource.networkId));
 
         if (!siteRows || siteRows.length === 0) {
-            logger.warn(
+            logger.error(
                 `handleOlmServerInitAddPeerHandshake: No sites found for resource ${resource.siteResourceId}`
             );
             await sendCancel();
@@ -164,7 +164,9 @@ export const handleOlmServerInitAddPeerHandshake: MessageHandler = async (
     }
 
     if (sitesToProcess.length === 0) {
-        logger.warn(`handleOlmServerInitAddPeerHandshake: No sites to process`);
+        logger.error(
+            `handleOlmServerInitAddPeerHandshake: No sites to process`
+        );
         await sendCancel();
         return;
     }
@@ -191,7 +193,7 @@ export const handleOlmServerInitAddPeerHandshake: MessageHandler = async (
         }
 
         if (!site.exitNodeId) {
-            logger.warn(
+            logger.error(
                 `handleOlmServerInitAddPeerHandshake: Site ${site.siteId} has no exit node, skipping`
             );
             continue;
@@ -203,7 +205,7 @@ export const handleOlmServerInitAddPeerHandshake: MessageHandler = async (
             .where(eq(exitNodes.exitNodeId, site.exitNodeId));
 
         if (!exitNode) {
-            logger.warn(
+            logger.error(
                 `handleOlmServerInitAddPeerHandshake: Exit node not found for site ${site.siteId}, skipping`
             );
             continue;
@@ -227,7 +229,7 @@ export const handleOlmServerInitAddPeerHandshake: MessageHandler = async (
     }
 
     if (!handshakeInitiated) {
-        logger.warn(
+        logger.error(
             `handleOlmServerInitAddPeerHandshake: No accessible sites with valid exit nodes found, cancelling chain`
         );
         await sendCancel();

src/app/[orgId]/layout.tsx

@@ -104,7 +104,7 @@ export default async function OrgLayout(props: {
             subscriptionStatus = subRes.data.data;
         } catch (error) {
             // If subscription fetch fails, keep subscriptionStatus as null
-            // console.error("Failed to fetch subscription status:", error);
+            console.error("Failed to fetch subscription status:", error);
         }
     }
 

src/components/newt-install-commands.tsx

@@ -8,7 +8,6 @@ import {
     SettingsSectionTitle
 } from "./Settings";
 import { CheckboxWithLabel } from "./ui/checkbox";
-import { Button } from "./ui/button";
 import { OptionSelect, type OptionSelectOption } from "./OptionSelect";
 import { useState } from "react";
 import {
@@ -19,14 +18,11 @@ import {
     FaLinux,
     FaWindows
 } from "react-icons/fa";
-import { Download, ExternalLink } from "lucide-react";
+import { ExternalLink } from "lucide-react";
 import { SiKubernetes, SiNixos } from "react-icons/si";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 
-export type CommandItem =
-    | string
-    | { title: string; command: string }
-    | { title: string; link: string };
+export type CommandItem = string | { title: string; command: string };
 
 const PLATFORMS = [
     "linux",
@@ -45,12 +41,14 @@ export type NewtSiteInstallCommandsProps = {
     id: string;
     secret: string;
     endpoint: string;
+    version?: string;
 };
 
 export function NewtSiteInstallCommands({
     id,
     secret,
-    endpoint
+    endpoint,
+    version = "latest"
 }: NewtSiteInstallCommandsProps) {
     const t = useTranslations();
     const { env } = useEnvContext();
@@ -90,39 +88,25 @@ export function NewtSiteInstallCommands({
             Run: [
                 {
                     title: t("install"),
-                    command: `curl -fsSL https://static.pangolin.net/get-cli.sh | bash`
+                    command: `curl -fsSL https://static.pangolin.net/get-newt.sh | bash`
                 },
                 {
                     title: t("run"),
-                    command: `${runAsRootPrefix}pangolin up site --id ${id} --secret ${secret} --endpoint ${endpoint}${acceptClientsFlag}${disableSshFlag}`
+                    command: `${runAsRootPrefix}newt --id ${id} --secret ${secret} --endpoint ${endpoint}${acceptClientsFlag}${disableSshFlag}`
                 }
             ],
-            "Auto Systemd Service": [
+            "Systemd Service": [
                 {
                     title: t("install"),
-                    command: `curl -fsSL https://static.pangolin.net/get-cli.sh | bash`
-                },
-                {
-                    title: t("run"),
-                    command: `sudo pangolin service install site --id ${id} --secret ${secret} --endpoint ${endpoint}${acceptClientsFlag}${disableSshFlag}`
-                },
-                {
-                    title: t("check"),
-                    command: `sudo pangolin service status site`
-                }
-            ],
-            "Manual Systemd Service": [
-                {
-                    title: t("install"),
-                    command: `curl -fsSL https://static.pangolin.net/get-cli.sh | bash`
+                    command: `curl -fsSL https://static.pangolin.net/get-newt.sh | bash`
                 },
                 {
                     title: t("envFile"),
                     command: `# Create the directory and environment file
-sudo install -d -m 0755 /etc/pangolin
-sudo tee /etc/pangolin/pangolin-site.env > /dev/null << 'EOF'
-SITE_ID=${id}
-SITE_SECRET=${secret}
+sudo install -d -m 0755 /etc/newt
+sudo tee /etc/newt/newt.env > /dev/null << 'EOF'
+NEWT_ID=${id}
+NEWT_SECRET=${secret}
 PANGOLIN_ENDPOINT=${endpoint}${
                         !acceptClients
                             ? `
@@ -135,11 +119,11 @@ DISABLE_SSH=true`
                             : ""
                     }
 EOF
-sudo chmod 600 /etc/pangolin/pangolin-site.env`
+sudo chmod 600 /etc/newt/newt.env`
                 },
                 {
                     title: t("serviceFile"),
-                    command: `sudo tee /etc/systemd/system/pangolin-site.service > /dev/null << 'EOF'
+                    command: `sudo tee /etc/systemd/system/newt.service > /dev/null << 'EOF'
 [Unit]
 Description=Newt
 Wants=network-online.target
@@ -149,8 +133,8 @@ After=network-online.target
 Type=simple
 User=root
 Group=root
-EnvironmentFile=/etc/pangolin/pangolin-site.env
-ExecStart=/home/owen/fossorial/cli/bin/pangolin up site
+EnvironmentFile=/etc/newt/newt.env
+ExecStart=/usr/local/bin/newt
 Restart=always
 RestartSec=2
 UMask=0077
@@ -164,7 +148,7 @@ EOF`
                 {
                     title: t("enableAndStart"),
                     command: `sudo systemctl daemon-reload
-sudo systemctl enable --now pangolin-site`
+sudo systemctl enable --now newt`
                 }
             ]
         },
@@ -172,51 +156,23 @@ sudo systemctl enable --now pangolin-site`
             Run: [
                 {
                     title: t("install"),
-                    command: `curl -fsSL https://static.pangolin.net/get-cli.sh | bash`
+                    command: `curl -fsSL https://static.pangolin.net/get-newt.sh | bash`
                 },
                 {
                     title: t("run"),
-                    command: `pangolin up site --id ${id} --secret ${secret} --endpoint ${endpoint}${acceptClientsFlag}`
-                }
-            ],
-            Service: [
-                {
-                    title: t("install"),
-                    command: `curl -fsSL https://static.pangolin.net/get-cli.sh | bash`
-                },
-                {
-                    title: t("run"),
-                    command: `sudo pangolin service install site --id ${id} --secret ${secret} --endpoint ${endpoint}${acceptClientsFlag}${disableSshFlag}`
-                },
-                {
-                    title: t("check"),
-                    command: `sudo pangolin service status site`
+                    command: `newt --id ${id} --secret ${secret} --endpoint ${endpoint}${acceptClientsFlag}`
                 }
             ]
         },
         windows: {
-            Run: [
+            x64: [
                 {
                     title: t("install"),
-                    link: `https://github.com/fosrl/cli/releases/latest/download/pangolin-cli_windows_installer.msi`
+                    command: `curl -o newt.exe -L "https://github.com/fosrl/newt/releases/download/${version}/newt_windows_amd64.exe"`
                 },
                 {
                     title: t("run"),
-                    command: `pangolin up site --id ${id} --secret ${secret} --endpoint ${endpoint}${acceptClientsFlag}`
-                }
-            ],
-            Service: [
-                {
-                    title: t("install"),
-                    link: `https://github.com/fosrl/cli/releases/latest/download/pangolin-cli_windows_installer.msi`
-                },
-                {
-                    title: t("run"),
-                    command: `pangolin service install site --id ${id} --secret ${secret} --endpoint ${endpoint}${acceptClientsFlag}${disableSshFlag}`
-                },
-                {
-                    title: t("check"),
-                    command: `pangolin service status site`
+                    command: `newt.exe --id ${id} --secret ${secret} --endpoint ${endpoint}${acceptClientsFlag}`
                 }
             ]
         },
@@ -224,20 +180,19 @@ sudo systemctl enable --now pangolin-site`
             "Docker Compose": [
                 `services:
   newt:
-    image: fosrl/pangolin-cli
+    image: fosrl/newt
     container_name: newt
     restart: unless-stopped
     environment:
       - PANGOLIN_ENDPOINT=${endpoint}
-      - SITE_ID=${id}
-      - SITE_SECRET=${secret}${acceptClientsEnv}`
+      - NEWT_ID=${id}
+      - NEWT_SECRET=${secret}${acceptClientsEnv}`
             ],
             "Docker Run": [
-                `docker run -dit --network host fosrl/pangolin-cli up site --id ${id} --secret ${secret} --endpoint ${endpoint}${acceptClientsFlag}`
+                `docker run -dit --network host fosrl/newt --id ${id} --secret ${secret} --endpoint ${endpoint}${acceptClientsFlag}`
             ]
         },
         kubernetes: {
-            // we are leaving this using newt until we change it to use the cli
             "Helm Chart": [
                 `helm repo add fossorial https://charts.fossorial.io`,
                 `helm repo update fossorial`,
@@ -261,15 +216,15 @@ sudo systemctl enable --now pangolin-site`
         podman: {
             "Podman Quadlet": [
                 `[Unit]
-Description=Pangolin Site Container
+Description=Newt container
 
 [Container]
-ContainerName=pangolin-site
-Image=docker.io/fosrl/pangolin-cli
+ContainerName=newt
+Image=docker.io/fosrl/newt
 Environment=PANGOLIN_ENDPOINT=${endpoint}
-Environment=SITE_ID=${id}
-Environment=SITE_SECRET=${secret}${!acceptClients ? "\nEnvironment=DISABLE_CLIENTS=true" : ""}
-# Secret=pangolin-secret,type=env,target=SITE_SECRET
+Environment=NEWT_ID=${id}
+Environment=NEWT_SECRET=${secret}${!acceptClients ? "\nEnvironment=DISABLE_CLIENTS=true" : ""}
+# Secret=newt-secret,type=env,target=NEWT_SECRET
 
 [Service]
 Restart=always
@@ -278,12 +233,12 @@ Restart=always
 WantedBy=default.target`
             ],
             "Podman Run": [
-                `podman run -dit docker.io/fosrl/pangolin-cli up site --id ${id} --secret ${secret} --endpoint ${endpoint}${acceptClientsFlag}`
+                `podman run -dit docker.io/fosrl/newt --id ${id} --secret ${secret} --endpoint ${endpoint}${acceptClientsFlag}`
             ]
         },
         nixos: {
             Flake: [
-                `${runAsRootPrefix}nix run 'nixpkgs#pangolin-cli' -- up site --id ${id} --secret ${secret} --endpoint ${endpoint}${acceptClientsFlag}${disableSshFlag}`
+                `${runAsRootPrefix}nix run 'nixpkgs#fosrl-newt' -- --id ${id} --secret ${secret} --endpoint ${endpoint}${acceptClientsFlag}${disableSshFlag}`
             ]
         }
     };
@@ -322,7 +277,9 @@ WantedBy=default.target`
                 />
 
                 <OptionSelect<string>
-                    label={t("method")}
+                    label={
+                        platform === "windows" ? t("architecture") : t("method")
+                    }
                     options={getArchitectures(platform).map((arch) => ({
                         value: arch,
                         label: arch
@@ -420,23 +377,14 @@ WantedBy=default.target`
                     )}
                     <div className="mt-2 space-y-3">
                         {commands.map((item, index) => {
-                            const isLink =
-                                typeof item !== "string" && "link" in item;
                             const commandText =
-                                typeof item === "string"
-                                    ? item
-                                    : isLink
-                                      ? undefined
-                                      : item.command;
-                            const linkHref = isLink
-                                ? (item as { link: string }).link
-                                : undefined;
+                                typeof item === "string" ? item : item.command;
                             const title =
                                 typeof item === "string"
                                     ? undefined
                                     : item.title;
 
-                            const key = `${title ?? ""}::${commandText ?? linkHref}`;
+                            const key = `${title ?? ""}::${commandText}`;
 
                             return (
                                 <div key={key}>
@@ -445,23 +393,10 @@ WantedBy=default.target`
                                             {title}
                                         </p>
                                     )}
-                                    {isLink ? (
-                                        <Button
-                                            asChild
-                                            variant="outline"
-                                            className="w-full"
-                                        >
-                                            <a href={linkHref}>
-                                                <Download className="h-4 w-4 mr-2" />
-                                                {t("downloadInstaller")}
-                                            </a>
-                                        </Button>
-                                    ) : (
-                                        <CopyTextBox
-                                            text={commandText!}
-                                            outline={true}
-                                        />
-                                    )}
+                                    <CopyTextBox
+                                        text={commandText}
+                                        outline={true}
+                                    />
                                 </div>
                             );
                         })}
@@ -521,11 +456,11 @@ function getPlatformName(platformName: Platform) {
 function getArchitectures(platform: Platform) {
     switch (platform) {
         case "linux":
-            return ["Run", "Auto Systemd Service", "Manual Systemd Service"];
+            return ["Run", "Systemd Service"];
         case "macos":
-            return ["Run", "Service"];
+            return ["Run"];
         case "windows":
-            return ["Run", "Service"];
+            return ["x64"];
         case "docker":
             return ["Docker Compose", "Docker Run"];
         case "kubernetes":

src/components/olm-install-commands.tsx

@@ -1,4 +1,4 @@
-import { Download, Terminal } from "lucide-react";
+import { Terminal } from "lucide-react";
 import { useTranslations } from "next-intl";
 import { useState } from "react";
 import { FaDocker, FaWindows } from "react-icons/fa";
@@ -10,13 +10,9 @@ import {
     SettingsSectionHeader,
     SettingsSectionTitle
 } from "./Settings";
-import { Button } from "./ui/button";
 import { OptionSelect, type OptionSelectOption } from "./OptionSelect";
 
-export type CommandItem =
-    | string
-    | { title: string; command: string }
-    | { title: string; link: string };
+export type CommandItem = string | { title: string; command: string };
 
 const PLATFORMS = ["unix", "docker", "windows"] as const;
 
@@ -26,12 +22,14 @@ export type OlmInstallCommandsProps = {
     id: string;
     secret: string;
     endpoint: string;
+    version?: string;
 };
 
 export function OlmInstallCommands({
     id,
     secret,
-    endpoint
+    endpoint,
+    version = "latest"
 }: OlmInstallCommandsProps) {
     const t = useTranslations();
 
@@ -42,28 +40,14 @@ export function OlmInstallCommands({
 
     const commandList: Record<Platform, Record<string, CommandItem[]>> = {
         unix: {
-            Run: [
+            All: [
                 {
                     title: t("install"),
                     command: `curl -fsSL https://static.pangolin.net/get-cli.sh | sudo bash`
                 },
                 {
                     title: t("run"),
-                    command: `sudo pangolin up client --id ${id} --secret ${secret} --endpoint ${endpoint} --attach`
-                }
-            ],
-            Service: [
-                {
-                    title: t("install"),
-                    command: `curl -fsSL https://static.pangolin.net/get-cli.sh | bash`
-                },
-                {
-                    title: t("run"),
-                    command: `sudo pangolin service install client --id ${id} --secret ${secret} --endpoint ${endpoint}`
-                },
-                {
-                    title: t("check"),
-                    command: `sudo pangolin service status client`
+                    command: `sudo pangolin up --id ${id} --secret ${secret} --endpoint ${endpoint} --attach`
                 }
             ]
         },
@@ -89,28 +73,15 @@ export function OlmInstallCommands({
             ]
         },
         windows: {
-            Run: [
+            x64: [
                 {
                     title: t("install"),
-                    link: `https://github.com/fosrl/cli/releases/latest/download/pangolin-cli_windows_installer.msi`
+                    command: `# Download and run the installer to install Olm first\n
+curl -o olm.exe -L "https://github.com/fosrl/olm/releases/download/${version}/olm_windows_installer.exe"`
                 },
                 {
                     title: t("run"),
-                    command: `pangolin up client --id ${id} --secret ${secret} --endpoint ${endpoint}`
-                }
-            ],
-            Service: [
-                {
-                    title: t("install"),
-                    link: `https://github.com/fosrl/cli/releases/latest/download/pangolin-cli_windows_installer.msi`
-                },
-                {
-                    title: t("run"),
-                    command: `pangolin service install client --id ${id} --secret ${secret} --endpoint ${endpoint}`
-                },
-                {
-                    title: t("check"),
-                    command: `pangolin service status client`
+                    command: `olm.exe --id ${id} --secret ${secret} --endpoint ${endpoint}`
                 }
             ]
         }
@@ -150,7 +121,9 @@ export function OlmInstallCommands({
                 />
 
                 <OptionSelect<string>
-                    label={t("method")}
+                    label={
+                        platform === "docker" ? t("method") : t("architecture")
+                    }
                     options={getArchitectures(platform).map((arch) => ({
                         value: arch,
                         label: arch
@@ -165,17 +138,8 @@ export function OlmInstallCommands({
                     <p className="font-semibold mb-3">{t("commands")}</p>
                     <div className="mt-2 space-y-3">
                         {commands.map((item, index) => {
-                            const isLink =
-                                typeof item !== "string" && "link" in item;
                             const commandText =
-                                typeof item === "string"
-                                    ? item
-                                    : isLink
-                                      ? undefined
-                                      : item.command;
-                            const linkHref = isLink
-                                ? (item as { link: string }).link
-                                : undefined;
+                                typeof item === "string" ? item : item.command;
                             const title =
                                 typeof item === "string"
                                     ? undefined
@@ -188,23 +152,10 @@ export function OlmInstallCommands({
                                             {title}
                                         </p>
                                     )}
-                                    {isLink ? (
-                                        <Button
-                                            asChild
-                                            variant="outline"
-                                            className="w-full"
-                                        >
-                                            <a href={linkHref}>
-                                                <Download className="h-4 w-4 mr-2" />
-                                                {t("downloadInstaller")}
-                                            </a>
-                                        </Button>
-                                    ) : (
-                                        <CopyTextBox
-                                            text={commandText!}
-                                            outline={true}
-                                        />
-                                    )}
+                                    <CopyTextBox
+                                        text={commandText}
+                                        outline={true}
+                                    />
                                 </div>
                             );
                         })}
@@ -218,13 +169,13 @@ export function OlmInstallCommands({
 function getArchitectures(platform: Platform) {
     switch (platform) {
         case "unix":
-            return ["Run", "Service"];
+            return ["All"];
         case "windows":
-            return ["Run", "Service"];
+            return ["x64"];
         case "docker":
             return ["Docker Compose", "Docker Run"];
         default:
-            return ["Run"];
+            return ["x64"];
     }
 }
 

tsconfig.enterprise.json

@@ -14,7 +14,7 @@
         "moduleResolution": "bundler",
         "resolveJsonModule": true,
         "isolatedModules": true,
-        "jsx": "react-jsx",
+        "jsx": "preserve",
         "incremental": true,
         "paths": {
             "@server/*": [