mirror of
https://github.com/fosrl/pangolin.git
synced 2026-04-01 07:26:38 +00:00
Merge branch 'main' into dev
This commit is contained in:
@@ -9,6 +9,7 @@ import { buildClientConfigurationForNewtClient } from "./buildConfiguration";
|
||||
import { convertTargetsIfNessicary } from "../client/targets";
|
||||
import { canCompress } from "@server/lib/clientVersionChecks";
|
||||
|
||||
<<<<<<< HEAD
|
||||
const inputSchema = z.object({
|
||||
publicKey: z.string(),
|
||||
port: z.int().positive(),
|
||||
@@ -17,6 +18,8 @@ const inputSchema = z.object({
|
||||
|
||||
type Input = z.infer<typeof inputSchema>;
|
||||
|
||||
=======
|
||||
>>>>>>> main
|
||||
export const handleGetConfigMessage: MessageHandler = async (context) => {
|
||||
const { message, client, sendToClient } = context;
|
||||
const newt = client as Newt;
|
||||
@@ -35,6 +38,7 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
|
||||
return;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
const parsed = inputSchema.safeParse(message.data);
|
||||
if (!parsed.success) {
|
||||
logger.error(
|
||||
@@ -45,6 +49,9 @@ export const handleGetConfigMessage: MessageHandler = async (context) => {
|
||||
}
|
||||
|
||||
const { publicKey, port, chainId } = message.data as Input;
|
||||
=======
|
||||
const { publicKey, port, chainId } = message.data;
|
||||
>>>>>>> main
|
||||
const siteId = newt.siteId;
|
||||
|
||||
// Get the current site data
|
||||
|
||||
Reference in New Issue
Block a user