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